From f7179a52ad855399eb0435639f3432864c891d06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= <cesarjosegl@gmail.com>
Date: Wed, 11 Dec 2019 15:50:12 -0400
Subject: [PATCH 01/17] S7Protocol dst-tsap <-> src-tsap

---
 .../java/s7/connection/S7PlcConnection.java   | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
index 0de64839f4a..60947066f60 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
@@ -20,6 +20,12 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 import io.netty.buffer.Unpooled;
 import io.netty.channel.*;
+import java.net.InetAddress;
+import java.util.Collections;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.configuration2.SystemConfiguration;
 import org.apache.commons.lang3.StringUtils;
@@ -32,7 +38,6 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.api.model.PlcField;
 import org.apache.plc4x.java.base.connection.ChannelFactory;
 import org.apache.plc4x.java.base.connection.NettyPlcConnection;
-import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
 import org.apache.plc4x.java.base.events.ConnectEvent;
 import org.apache.plc4x.java.base.events.ConnectedEvent;
 import org.apache.plc4x.java.base.messages.*;
@@ -50,16 +55,10 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.s7.netty.util.S7PlcFieldHandler;
 import org.apache.plc4x.java.s7.types.S7ControllerType;
 import org.apache.plc4x.java.s7.utils.S7TsapIdEncoder;
+import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.net.InetAddress;
-import java.util.Collections;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
 /**
  * Class implementing the Connection handling for Siemens S7.
  * The adressing of Values in S7 works as follows:
@@ -170,9 +169,11 @@ public boolean canWrite() {
 
     @Override
     protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
-        short calledTsapId = S7TsapIdEncoder.encodeS7TsapId(DeviceGroup.OS, 0, 0);
-        short callingTsapId = S7TsapIdEncoder.encodeS7TsapId(DeviceGroup.PG_OR_PC, rack, slot);
-
+        //short calledTsapId = S7TsapIdEncoder.encodeS7TsapId(DeviceGroup.OS, 0, 0);
+        //short callingTsapId = S7TsapIdEncoder.encodeS7TsapId(DeviceGroup.PG_OR_PC, rack, slot);
+        short calledTsapId = S7TsapIdEncoder.encodeS7TsapId(DeviceGroup.PG_OR_PC, rack, slot);
+        short callingTsapId = S7TsapIdEncoder.encodeS7TsapId(DeviceGroup.OS, 0, 0);
+        
         return new ChannelInitializer() {
             @Override
             protected void initChannel(Channel channel) {

From ac6857476a7942247aea348e2616aaa0b9656e3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= <cesarjosegl@gmail.com>
Date: Fri, 13 Dec 2019 23:38:05 -0400
Subject: [PATCH 02/17] Initial work to incorporate the handling of Alarms in
 the S7 protocol of PLC4X

---
 .../java/s7/connection/S7PlcConnection.java   | 60 ++++++++++++-
 .../plc4x/java/s7/netty/Plc4XS7Protocol.java  | 85 +++++++++++++++----
 .../plc4x/java/s7/netty/S7Protocol.java       | 34 ++++++--
 ...CpuMessageSubscriptionResponsePayload.java | 21 +++++
 .../CpuMessageSubscriptionServicePayload.java | 72 ++++++++++++++++
 .../model/payloads/CpuServicesPayload.java    |  5 +-
 .../java/s7/netty/model/types/AlarmType.java  | 81 ++++++++++++++++++
 .../CpuServicesParameterSubFunctionGroup.java |  8 +-
 .../s7/netty/model/types/PushEventType.java   | 67 +++++++++++++++
 .../model/types/SubscribedEventType.java      | 76 +++++++++++++++++
 .../java/s7/netty/util/S7PlcEventHandler.java | 38 +++++++++
 .../java/s7/netty/util/S7SizeHelper.java      | 12 ++-
 vim.exe.stackdump                             | 19 +++++
 13 files changed, 547 insertions(+), 31 deletions(-)
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuMessageSubscriptionResponsePayload.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuMessageSubscriptionServicePayload.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/AlarmType.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/PushEventType.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SubscribedEventType.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcEventHandler.java
 create mode 100644 vim.exe.stackdump

diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
index 60947066f60..7ce24fa7c34 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
@@ -21,11 +21,13 @@ Licensed to the Apache Software Foundation (ASF) under one
 import io.netty.buffer.Unpooled;
 import io.netty.channel.*;
 import java.net.InetAddress;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import java.util.function.Consumer;
 import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.configuration2.SystemConfiguration;
 import org.apache.commons.lang3.StringUtils;
@@ -33,9 +35,16 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
 import org.apache.plc4x.java.api.messages.PlcReadRequest;
 import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse;
+import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcUnsubscriptionResponse;
 import org.apache.plc4x.java.api.messages.PlcWriteRequest;
 import org.apache.plc4x.java.api.messages.PlcWriteResponse;
+import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
 import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
 import org.apache.plc4x.java.base.connection.ChannelFactory;
 import org.apache.plc4x.java.base.connection.NettyPlcConnection;
 import org.apache.plc4x.java.base.events.ConnectEvent;
@@ -52,6 +61,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.s7.netty.S7Protocol;
 import org.apache.plc4x.java.s7.netty.model.types.MemoryArea;
 import org.apache.plc4x.java.s7.netty.strategies.DefaultS7MessageProcessor;
+import org.apache.plc4x.java.s7.netty.util.S7PlcEventHandler;
 import org.apache.plc4x.java.s7.netty.util.S7PlcFieldHandler;
 import org.apache.plc4x.java.s7.types.S7ControllerType;
 import org.apache.plc4x.java.s7.utils.S7TsapIdEncoder;
@@ -77,7 +87,7 @@ Licensed to the Apache Software Foundation (ASF) under one
  * where the {bit-offset} is optional.
  * All Available Memory Areas for this mode are defined in the {@link MemoryArea} enum.
  */
-public class S7PlcConnection extends NettyPlcConnection implements PlcReader, PlcWriter {
+public class S7PlcConnection extends NettyPlcConnection implements PlcReader, PlcWriter, PlcSubscriber {
 
     private static final int ISO_ON_TCP_PORT = 102;
 
@@ -284,6 +294,16 @@ public PlcWriteRequest.Builder writeRequestBuilder() {
         return new DefaultPlcWriteRequest.Builder(this, new S7PlcFieldHandler());
     }
 
+    @Override
+    public PlcSubscriptionRequest.Builder subscriptionRequestBuilder() {
+        return new DefaultPlcSubscriptionRequest.Builder(this, new S7PlcEventHandler());
+    }    
+    
+    @Override
+    public PlcUnsubscriptionRequest.Builder unsubscriptionRequestBuilder() {
+        return new DefaultPlcUnsubscriptionRequest.Builder(this);
+    }
+
     @Override
     public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
         InternalPlcReadRequest internalReadRequest = checkInternal(readRequest, InternalPlcReadRequest.class);
@@ -314,4 +334,42 @@ public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
             .thenApply(PlcWriteResponse.class::cast);
     }
 
+    @Override
+    public CompletableFuture<PlcSubscriptionResponse> subscribe(PlcSubscriptionRequest subscriptionRequest) {
+        InternalPlcSubscriptionRequest internalSubsRequest = checkInternal(subscriptionRequest, InternalPlcSubscriptionRequest.class);
+        CompletableFuture<InternalPlcSubscriptionResponse> future = new CompletableFuture<>();
+        PlcRequestContainer<InternalPlcSubscriptionRequest, InternalPlcSubscriptionResponse> container =
+            new PlcRequestContainer<>(internalSubsRequest, future);
+        channel.writeAndFlush(container).addListener(f -> {
+            if (!f.isSuccess()) {
+                future.completeExceptionally(f.cause());
+            }
+        });        
+        return future.thenApply(PlcSubscriptionResponse.class::cast);       
+    }
+
+    @Override
+    public CompletableFuture<PlcUnsubscriptionResponse> unsubscribe(PlcUnsubscriptionRequest unsubscriptionRequest) {
+        InternalPlcUnsubscriptionRequest internalUnsubsRequest = checkInternal(unsubscriptionRequest, InternalPlcUnsubscriptionRequest.class);
+        CompletableFuture<InternalPlcUnsubscriptionResponse> future = new CompletableFuture<>();
+        PlcRequestContainer<InternalPlcUnsubscriptionRequest, InternalPlcUnsubscriptionResponse> container =
+            new PlcRequestContainer<>(internalUnsubsRequest, future);
+        channel.writeAndFlush(container).addListener(f -> {
+            if (!f.isSuccess()) {
+                future.completeExceptionally(f.cause());
+            }
+        });        
+        return future.thenApply(PlcUnsubscriptionResponse.class::cast);        
+    }
+
+    @Override
+    public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer, Collection<PlcSubscriptionHandle> handles) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public void unregister(PlcConsumerRegistration registration) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
 }
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
index 6c789dd96fa..86e91bc669d 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
@@ -21,12 +21,28 @@ Licensed to the Apache Software Foundation (ASF) under one
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
+import java.io.IOException;
+import java.lang.reflect.Array;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.plc4x.java.api.exceptions.*;
 import org.apache.plc4x.java.api.messages.PlcReadRequest;
 import org.apache.plc4x.java.api.messages.PlcRequest;
 import org.apache.plc4x.java.api.messages.PlcResponse;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
 import org.apache.plc4x.java.api.messages.PlcWriteRequest;
 import org.apache.plc4x.java.api.model.PlcField;
 import org.apache.plc4x.java.api.types.PlcResponseCode;
@@ -39,31 +55,20 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.s7.netty.model.messages.S7Message;
 import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
 import org.apache.plc4x.java.s7.netty.model.messages.S7ResponseMessage;
+import org.apache.plc4x.java.s7.netty.model.params.CpuServicesParameter;
+import org.apache.plc4x.java.s7.netty.model.params.CpuServicesRequestParameter;
+import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
 import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
 import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
 import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuMessageSubscriptionServicePayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
 import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
 import org.apache.plc4x.java.s7.netty.model.types.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.lang.reflect.Array;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.temporal.ChronoUnit;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
 /**
  * This layer transforms between {@link PlcRequestContainer}s {@link S7Message}s.
  * And stores all "in-flight" requests in an internal structure ({@link Plc4XS7Protocol#requests}).
@@ -153,9 +158,57 @@ protected void encode(ChannelHandlerContext ctx, PlcRequestContainer msg, List<O
             encodeReadRequest(msg, out);
         } else if (request instanceof PlcWriteRequest) {
             encodeWriteRequest(msg, out);
+        } else if (request instanceof PlcSubscriptionRequest) {
+            encodeSubcriptionRequest(msg, out);
+        } else if (request instanceof PlcUnsubscriptionRequest) {
+            encodeUnsubcriptionRequest(msg, out);
         }
     }
 
+    private void encodeSubcriptionRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
+        byte subsevent = 0;
+        List<S7Parameter> parameterItems = new LinkedList<>();
+        List<S7Payload> payloadItems = new LinkedList<>();
+         
+        PlcSubscriptionRequest subsRequest = (PlcSubscriptionRequest)  msg.getRequest();
+        
+        for (String fieldName : subsRequest.getFieldNames()) {                        
+            if ( subsRequest.getField(fieldName) instanceof SubscribedEventType){
+                 SubscribedEventType event = (SubscribedEventType) subsRequest.getField(fieldName);
+                 subsevent = (byte) (subsevent | event.getCode());
+            }
+        }
+        
+        CpuServicesParameter cpuservice = new CpuServicesRequestParameter(CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
+            CpuServicesParameterSubFunctionGroup.MESSAGE_SERVICE, (byte) 0x00);
+        
+        parameterItems.add(cpuservice);
+        
+       
+        S7Payload Data = new CpuMessageSubscriptionServicePayload(DataTransportErrorCode.OK,
+                                DataTransportSize.OCTET_STRING,
+                                subsevent,
+                                new String("HmiRtm  "),
+                                AlarmType.ALARM_S_INITIATE);
+        payloadItems.add(Data);
+
+        
+        S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.USER_DATA,
+            (short) tpduGenerator.getAndIncrement(), 
+            parameterItems,
+            payloadItems, 
+            msg);
+
+        requests.put(s7ReadRequest.getTpduReference(), msg);
+
+        out.add(s7ReadRequest);            
+  
+    }
+    
+    private void encodeUnsubcriptionRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
+        
+    }    
+    
     private void encodeReadRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
         List<VarParameterItem> parameterItems = new LinkedList<>();
 
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
index 8195542815a..7770c2a228f 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
@@ -25,6 +25,9 @@ Licensed to the Apache Software Foundation (ASF) under one
 import io.netty.handler.codec.MessageToMessageDecoder;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.PromiseCombiner;
+import java.lang.reflect.Field;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
 import org.apache.plc4x.java.api.exceptions.PlcProtocolPayloadTooBigException;
@@ -41,6 +44,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.s7.netty.model.params.*;
 import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
 import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuMessageSubscriptionServicePayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.CpuServicesPayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
 import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
@@ -54,10 +58,6 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.lang.reflect.Field;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-
 /**
  * Communication Layer between the Application level ({@link Plc4XS7Protocol}) and the lower level (tcp) that sends and receives {@link S7Message}s.
  * This layer also handles the control over the "wire", i.e., the queues of incoming and outgoing messages.
@@ -230,7 +230,11 @@ private void encodePayloads(S7Message in, ByteBuf buf) throws PlcProtocolExcepti
                         encodeWriteVarPayload((VarPayload) payload, buf, !payloadIterator.hasNext());
                         break;
                     case CPU_SERVICES:
-                        encodeCpuServicesPayload((CpuServicesPayload) payload, buf);
+                        if (payload instanceof CpuServicesPayload) {
+                            encodeCpuServicesPayload((CpuServicesPayload) payload, buf);
+                        } else if (payload instanceof CpuMessageSubscriptionServicePayload) {
+                            encodeCpuMessageSubcriptionPayload((CpuMessageSubscriptionServicePayload) payload, buf);
+                        }
                         break;
                     default:
                         throw new PlcProtocolException("Writing payloads of type " +
@@ -254,8 +258,28 @@ private void encodeWriteVarPayload(VarPayload varPayload, ByteBuf buf, boolean l
         }
     }
 
+    private void encodeCpuMessageSubcriptionPayload(CpuMessageSubscriptionServicePayload cpuServicesPayload, ByteBuf buf)
+        throws PlcProtocolException {
+        buf.writeByte(cpuServicesPayload.getReturnCode().getCode());
+        buf.writeByte(cpuServicesPayload.getDataTransportSize().getCode());
+        if ((cpuServicesPayload.getSubscribedEvents() & 0x80) == 0){
+            buf.writeShort(0x000A);
+        } else {
+            buf.writeShort(0x000C);  
+        };
+        buf.writeByte(cpuServicesPayload.getSubscribedEvents());
+        buf.writeByte(0x00);
+        buf.writeBytes(cpuServicesPayload.getId().getBytes());
+        if ((cpuServicesPayload.getSubscribedEvents() & 0x80) == 0x80){
+            buf.writeByte(cpuServicesPayload.getAlarm().getCode());
+            buf.writeByte(0x00);
+        }
+        System.out.println("Paso por aqui....");
+    }    
+    
     private void encodeCpuServicesPayload(CpuServicesPayload cpuServicesPayload, ByteBuf buf)
             throws PlcProtocolException {
+
         buf.writeByte(cpuServicesPayload.getReturnCode().getCode());
         // This seems to be constantly set to this.
         buf.writeByte(DataTransportSize.OCTET_STRING.getCode());
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuMessageSubscriptionResponsePayload.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuMessageSubscriptionResponsePayload.java
new file mode 100644
index 00000000000..25213130e86
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuMessageSubscriptionResponsePayload.java
@@ -0,0 +1,21 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.apache.plc4x.java.s7.netty.model.payloads;
+
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class CpuMessageSubscriptionResponsePayload implements S7Payload  {
+
+    @Override
+    public ParameterType getType() {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuMessageSubscriptionServicePayload.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuMessageSubscriptionServicePayload.java
new file mode 100644
index 00000000000..b742e4c2489
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuMessageSubscriptionServicePayload.java
@@ -0,0 +1,72 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.payloads;
+
+import org.apache.plc4x.java.s7.netty.model.types.AlarmType;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class CpuMessageSubscriptionServicePayload implements S7Payload {
+
+    private final DataTransportErrorCode returnCode;
+    private final DataTransportSize dataTransportSize;
+    private final byte SubscribedEvents;
+    private final String Id; //8 bytes string
+    private final AlarmType alarm;
+
+
+    public CpuMessageSubscriptionServicePayload (DataTransportErrorCode returnCode, DataTransportSize dataTransportSize, byte SubscribedEvents, String Id, AlarmType alarm) {
+        this.returnCode = returnCode;
+        this.dataTransportSize = dataTransportSize;
+        this.SubscribedEvents = SubscribedEvents;
+        this.Id = Id;
+        this.alarm = alarm;
+    }
+    
+    @Override
+    public ParameterType getType() {
+        return ParameterType.CPU_SERVICES;
+    }
+
+    public DataTransportErrorCode getReturnCode() {
+        return returnCode;
+    }
+
+    public DataTransportSize getDataTransportSize() {
+        return dataTransportSize;
+    }
+
+    public byte getSubscribedEvents() {
+        return SubscribedEvents;
+    }
+
+    public String getId() {
+        return Id;
+    }
+  
+    public AlarmType getAlarm() {
+        return alarm;
+    }    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuServicesPayload.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuServicesPayload.java
index f62b991594c..43a33abfe97 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuServicesPayload.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuServicesPayload.java
@@ -18,14 +18,13 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.plc4x.java.s7.netty.model.payloads;
 
+import java.util.Collections;
+import java.util.List;
 import org.apache.plc4x.java.s7.netty.model.payloads.ssls.SslDataRecord;
 import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
 import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
 import org.apache.plc4x.java.s7.netty.model.types.SslId;
 
-import java.util.Collections;
-import java.util.List;
-
 public class CpuServicesPayload implements S7Payload {
 
     private DataTransportErrorCode returnCode;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/AlarmType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/AlarmType.java
new file mode 100644
index 00000000000..9fb87785fb0
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/AlarmType.java
@@ -0,0 +1,81 @@
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.plc4x.java.api.model.PlcField;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum AlarmType implements PlcField {
+    
+    SCAN_ABORT("SCAN_ABORT", (byte) 0x00),
+    SCAN_INITIATE("SCAN_INITIATE", (byte) 0x01),
+    ALARM_ABORT("ALARM_ABORT", (byte) 0x04),
+    ALARM_INITIATE("ALARM_INITIATE", (byte) 0x05),
+    ALARM_S_ABORT("ALARM_S_ABORT", (byte) 0x08),
+    ALARM_S_INITIATE("ALARM_S_INITIATE", (byte) 0x09),
+    NONE("NONE", (byte) 0xff),
+    ;
+    
+    
+    private static final Map<Byte, AlarmType> map;
+    
+    static {
+        map = new HashMap<>();
+        for (AlarmType subevent : AlarmType.values()) {
+            map.put(subevent.code, subevent);
+        }
+    }    
+    
+    private final String event;
+    private final byte code;
+    
+    AlarmType(String event, byte code){
+        this.event = event;
+        this.code = code;
+    }
+    
+    public String getEvent(){
+        return event;
+    }    
+    
+    public byte getCode() {
+        return code;
+    }    
+    
+    public static AlarmType valueOfEvent(String event) {
+        for (AlarmType value : AlarmType.values()) {
+            if(value.getEvent().equals(event)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static AlarmType valueOf(byte code) {
+        return map.get(code);
+    }
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterSubFunctionGroup.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterSubFunctionGroup.java
index a99b6e83a15..f7e1b161acf 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterSubFunctionGroup.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterSubFunctionGroup.java
@@ -18,15 +18,15 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.plc4x.java.s7.netty.model.types;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.HashMap;
 import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public enum CpuServicesParameterSubFunctionGroup {
 
-    READ_SSL((byte) 0x01);
+    READ_SSL((byte) 0x01),
+    MESSAGE_SERVICE((byte) 0x02);
 
     private static final Logger logger = LoggerFactory.getLogger(CpuServicesParameterSubFunctionGroup.class);
 
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/PushEventType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/PushEventType.java
new file mode 100644
index 00000000000..ca9e0b01cbe
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/PushEventType.java
@@ -0,0 +1,67 @@
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.plc4x.java.api.model.PlcField;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum PushEventType implements PlcField {
+    
+    ALARM_SQ("ALARM_SQ"),
+    ALARM_S("ALARM_S"),
+    ALARM_SC("ALARM_SC"),
+    ALARM_DQ("ALARM_DQ"),
+    ALARM_D("ALARM_D"),
+    NOTIFY_8P("NOTIFY_8P"),
+    ALARM("ALARM"),
+    ALARM_8("ALARM_8"),
+    ALARM_8P("ALARM_8P"),
+    NOTIFY("NOTIFY");
+    
+    private static final Map<String, PushEventType> map;
+    
+    static {
+        map = new HashMap<>();
+        for (PushEventType s7event : PushEventType.values()) {
+            map.put(s7event.event, s7event);
+        }
+    }
+    
+    private final String event;
+
+    PushEventType(String event){
+        this.event = event;
+    }
+    
+    public String getEvent(){
+        return event;
+    }
+    
+    public static PushEventType valueOfEvent(String event) {
+         return map.get(event);
+    }
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SubscribedEventType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SubscribedEventType.java
new file mode 100644
index 00000000000..d963343b844
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SubscribedEventType.java
@@ -0,0 +1,76 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.plc4x.java.api.model.PlcField;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum SubscribedEventType implements PlcField {
+    
+    MODE("MODE", (byte) 0x01),
+    SYS("SYS", (byte) 0x02),
+    USR("USR", (byte) 0x04),
+    ALM("ALM", (byte) 0x80);
+    
+    private static final Map<Byte, SubscribedEventType> map;
+    
+    static {
+        map = new HashMap<>();
+        for (SubscribedEventType subevent : SubscribedEventType.values()) {
+            map.put(subevent.code, subevent);
+        }
+    }    
+    
+    private final String event;
+    private final byte code;
+    
+    SubscribedEventType(String event, byte code){
+        this.event = event;
+        this.code = code;
+    }
+    
+    public String getEvent(){
+        return event;
+    }    
+    
+    public byte getCode() {
+        return code;
+    }    
+    
+    public static SubscribedEventType valueOfEvent(String event) {
+        for (SubscribedEventType value : SubscribedEventType.values()) {
+            if(value.getEvent().equals(event)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static SubscribedEventType valueOf(byte code) {
+        return map.get(code);
+    }
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcEventHandler.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcEventHandler.java
new file mode 100644
index 00000000000..c009caee8fa
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcEventHandler.java
@@ -0,0 +1,38 @@
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty.util;
+
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.connection.DefaultPlcFieldHandler;
+import org.apache.plc4x.java.s7.netty.model.types.SubscribedEventType;
+
+/**
+ *
+ * 
+ */
+public class S7PlcEventHandler extends DefaultPlcFieldHandler {
+
+    @Override
+    public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
+        return SubscribedEventType.valueOfEvent(fieldQuery);
+    }
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelper.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelper.java
index 0967866390b..4a3313d32e7 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelper.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelper.java
@@ -18,11 +18,13 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.plc4x.java.s7.netty.util;
 
+import java.util.List;
 import org.apache.plc4x.java.s7.netty.model.params.CpuServicesRequestParameter;
 import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
 import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
 import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
 import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuMessageSubscriptionServicePayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.CpuServicesPayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
 import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
@@ -32,8 +34,6 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.List;
-
 public class S7SizeHelper {
 
     private static final Logger logger = LoggerFactory.getLogger(S7SizeHelper.class);
@@ -75,6 +75,14 @@ public static short getPayloadsLength(List<S7Payload> payloads) {
                     }
                     return length;
                 }
+            } else if(payload instanceof CpuMessageSubscriptionServicePayload) {
+                CpuMessageSubscriptionServicePayload submsg = (CpuMessageSubscriptionServicePayload) payload;
+                if ((submsg.getSubscribedEvents() & 0x80) == 0x00){
+                    return 14;
+                } else {
+                    return 16;                    
+                }
+  
             }
         }
         return l;
diff --git a/vim.exe.stackdump b/vim.exe.stackdump
new file mode 100644
index 00000000000..1eb2c6b7748
--- /dev/null
+++ b/vim.exe.stackdump
@@ -0,0 +1,19 @@
+Stack trace:
+Frame        Function    Args
+00180000000  0018006137E (0018024DB99, 0018024E199, 000FFFFC530, 000FFFFB6C0)
+00180000000  00180049229 (CCCCCC00009CC1, FF783B00767676, D6D661000CC616, 0000152ACFC)
+00180000000  00180049262 (0018024DB76, 000FFFFC428, 000FFFFC530, 76767600CCCCCC)
+00180000000  00180045E73 (00000000000, 00180000000, 00000000000, 001800004F4)
+00180000000  0018006F6E1 (CCCCCC00009CC1, FF783B00767676, D6D661000CC616, 9E00B4005648E7)
+00180000000  0018007056E (00000000000, 0010067ED68, 00000000000, 00000000000)
+00180000000  00180072B34 (00000000000, 00000000008, 00000000000, 00000000000)
+00000000000  00180146933 (0010067ED60, 00000000008, 00000000000, 00000000000)
+00000000000  0018012C3DB (0010067ED60, 00000000008, 00000000000, 00000000000)
+00000000000  001004F2A94 (001005773A5, 00100685748, 00000000000, 0010068574C)
+00000000000  0010058A496 (00000000008, 00000000000, 00000000000, 00000000000)
+00000000000  001005783AE (00000000000, 006000BEAE0, 00000000000, 00100000000)
+00000000000  001005EAAF3 (0018021EFA0, 00000000000, 0018012C3DB, 00180339FA0)
+00000000000  001005F5FE4 (00000000020, 0018030FA20, 0018004A818, 001800497E0)
+000FFFFCCD0  0018004A884 (00000000000, 00000000000, 00000000000, 00000000000)
+00000000000  00180048343 (00000000000, 00000000000, 00000000000, 00000000000)
+End of stack trace (more stack frames may be present)

From e1c5b987056c8826f0d0be11f9630bd7e7fae5db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= <cesarjosegl@gmail.com>
Date: Fri, 20 Dec 2019 19:58:47 -0400
Subject: [PATCH 03/17] Receive push messages. lack of debugging and mounting
 the infrastructure for the management of subscribers.

---
 .../plc4x/java/s7/netty/Plc4XS7Protocol.java  |  30 ++
 .../plc4x/java/s7/netty/S7Protocol.java       | 394 ++++++++++++++++--
 .../params/CpuServicesPushParameter.java      |  51 +++
 .../params/CpuServicesRequestParameter.java   |   7 +-
 .../params/CpuServicesResponseParameter.java  |   9 +-
 .../model/payloads/AlarmMessagePayload.java   |  79 ++++
 ...CpuMessageSubscriptionResponsePayload.java |  46 +-
 .../CpuMessageSubscriptionServicePayload.java |   7 +-
 .../payloads/items/AlarmMessageItem.java      | 100 +++++
 .../payloads/items/AssociatedValueItem.java   |  64 +++
 .../payloads/items/MessageObjectItem.java     | 158 +++++++
 .../CpuServicesParameterSubFunctionGroup.java |  17 +-
 12 files changed, 911 insertions(+), 51 deletions(-)
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesPushParameter.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/AlarmMessagePayload.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AlarmMessageItem.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AssociatedValueItem.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/MessageObjectItem.java

diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
index 86e91bc669d..8c2e44b8342 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
@@ -19,6 +19,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 package org.apache.plc4x.java.s7.netty;
 
 import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import java.io.IOException;
@@ -61,9 +62,12 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
 import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
 import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.AlarmMessagePayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.CpuMessageSubscriptionServicePayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
 import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.MessageObjectItem;
 import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
 import org.apache.plc4x.java.s7.netty.model.types.*;
 import org.slf4j.Logger;
@@ -453,13 +457,16 @@ byte[] encodeWriteRequestStringField(BaseDefaultFieldItem fieldItem, boolean isU
     @Override
     protected void decode(ChannelHandlerContext ctx, S7Message msg, List<Object> out) throws PlcException {
         // We're currently just expecting responses.
+        logger.info("Message Type: " + msg.getMessageType());
         if (!(msg instanceof S7ResponseMessage)) {
+            logger.info("Aborta decode: " + msg.getMessageType());
             return;
         }
         S7ResponseMessage responseMessage = (S7ResponseMessage) msg;
         short tpduReference = responseMessage.getTpduReference();
         if (requests.containsKey(tpduReference)) {
             // As every response has a matching request, get this request based on the tpdu.
+            logger.info("tpduReference: " + tpduReference);
             PlcRequestContainer requestContainer = requests.remove(tpduReference);
             PlcRequest request = requestContainer.getRequest();
 
@@ -469,12 +476,35 @@ protected void decode(ChannelHandlerContext ctx, S7Message msg, List<Object> out
                 response = decodeReadResponse(responseMessage, requestContainer);
             } else if (request instanceof PlcWriteRequest) {
                 response = decodeWriteResponse(responseMessage, requestContainer);
+            } else if (request instanceof PlcSubscriptionRequest) {
+                logger.info("Debo verificar si la suscripciĆ³n fu exitosa...");  
+            } else {
+                logger.info("Existe la solicitud del cliente, pero no es una respuesta valida...");
             }
 
             // Confirm the response being handled.
             if (response != null) {
                 requestContainer.getResponseFuture().complete(response);
+            } else {
+                logger.info("No se pudo procesar el mensaje...");
             }
+        } else {
+            logger.info("Posible mensaje PUSH...");
+            List<S7Payload> payloads = msg.getPayloads();
+            for (S7Payload payload:payloads){
+                if (payload instanceof AlarmMessagePayload){
+                    logger.info("S7PayLoad tipo AlarmMessagePayload: " + payload.toString());
+                    AlarmMessagePayload alarm = (AlarmMessagePayload) payload;
+                    List<MessageObjectItem> msgobjects = alarm.getMsg().getMsgItems();
+                    for (MessageObjectItem msgobject:msgobjects){
+                        logger.info("Item tipo MessageObjectItem: " + msgobject.toString() + " Size: " + msgobject.getComingValues().size());
+                        List<AssociatedValueItem> items = msgobject.getComingValues();
+                        for (AssociatedValueItem item:items){
+                            logger.info("ReturnCode :" + item.getReturnCode() + " Length: " + item.getLength() + " Data: " + ByteBufUtil.hexDump(item.getData()));
+                        }
+                    }
+                }
+            }            
         }
     }
 
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
index 7770c2a228f..7a1964bf7b7 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
@@ -44,10 +44,14 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.s7.netty.model.params.*;
 import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
 import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.AlarmMessagePayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.CpuMessageSubscriptionServicePayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.CpuServicesPayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
 import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.AlarmMessageItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.MessageObjectItem;
 import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
 import org.apache.plc4x.java.s7.netty.model.payloads.ssls.SslDataRecord;
 import org.apache.plc4x.java.s7.netty.model.payloads.ssls.SslModuleIdentificationDataRecord;
@@ -274,7 +278,6 @@ private void encodeCpuMessageSubcriptionPayload(CpuMessageSubscriptionServicePay
             buf.writeByte(cpuServicesPayload.getAlarm().getCode());
             buf.writeByte(0x00);
         }
-        System.out.println("Paso por aqui....");
     }    
     
     private void encodeCpuServicesPayload(CpuServicesPayload cpuServicesPayload, ByteBuf buf)
@@ -483,7 +486,9 @@ protected void decode(ChannelHandlerContext ctx, IsoTPMessage in, List<Object> o
         short userDataLength = userData.readShort();
         byte errorClass = 0;
         byte errorCode = 0;
+        
         if (isResponse) {
+            logger.info("Mensaje de respuesta");
             errorClass = userData.readByte();
             errorCode = userData.readByte();
         }
@@ -499,6 +504,7 @@ protected void decode(ChannelHandlerContext ctx, IsoTPMessage in, List<Object> o
             }
             i += S7SizeHelper.getParameterLength(parameter);
         }
+        //TODO: Se pierden dos bytes de la Data
 
         List<S7Payload> s7Payloads = decodePayloads(userData, isResponse, userDataLength, s7Parameters);
 
@@ -549,21 +555,28 @@ protected void decode(ChannelHandlerContext ctx, IsoTPMessage in, List<Object> o
 
         } else {
             // CpuService responses are encoded as requests.
+            // 
             for (S7Parameter s7Parameter : s7Parameters) {
                 // Only if we have a response parameter, the payload is a response payload.
                 if(s7Parameter instanceof CpuServicesResponseParameter) {
+                   logger.info("*** Aqui verifica el tipo del s7Parameter...");
                     for (S7Payload s7Payload : s7Payloads) {
                         if(s7Payload instanceof CpuServicesPayload) {
                             CpuServicesPayload cpuServicesPayload = (CpuServicesPayload) s7Payload;
-
                             // Remove the current response from the list of unconfirmed messages.
+                            logger.info("*** Aqui verifica el tipo del Payload...");
                             sentButUnacknowledgedTpdus.remove(tpduReference);
 
                             handleIdentifyRemote(ctx, cpuServicesPayload);
                         }
                     }
+                } else if (s7Parameter instanceof CpuServicesPushParameter){
+                    logger.info("*** MENSAGE PUSH ***");
+                    out.add(new S7ResponseMessage(messageType, tpduReference, s7Parameters, s7Payloads, errorClass, errorCode)); 
+                    return;
                 }
             }
+            logger.info("Envia el mensaje a la proxima capa como S7RequestMessage");
             out.add(new S7RequestMessage(messageType, tpduReference, s7Parameters, s7Payloads, null));
         }
     }
@@ -639,7 +652,7 @@ private List<S7Payload> decodePayloads(ByteBuf userData, boolean isResponse, sho
                 VarPayload varPayload = decodeVarPayload(userData, isResponse, userDataLength, readWriteVarParameter);
                 s7Payloads.add(varPayload);
             } else if(s7Parameter instanceof CpuServicesParameter) {
-                CpuServicesPayload cpuServicesPayload = decodeCpuServicesPayload(userData);
+                S7Payload cpuServicesPayload = decodeCpuServicesPayload((CpuServicesParameter)s7Parameter, userData);
                 s7Payloads.add(cpuServicesPayload);
             }
         }
@@ -684,43 +697,92 @@ else if ((readWriteVarParameter.getType() == ParameterType.READ_VAR) && isRespon
         return new VarPayload(readWriteVarParameter.getType(), payloadItems);
     }
 
-    private CpuServicesPayload decodeCpuServicesPayload(ByteBuf userData) {
-        DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
-        DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
-        if(dataTransportSize != DataTransportSize.OCTET_STRING) {
-            // TODO: Output an error.
-        }
-        short length = userData.readShort();
-        SslId sslId = SslId.valueOf(userData.readShort());
-        short sslIndex = userData.readShort();
-        // If the length is 4 there is no `partial list length in bytes` and `partial list count` parameters.
-        if(length == 4) {
-            return new CpuServicesPayload(returnCode, sslId, sslIndex);
-        }
-        // If the length is not 4, then it has to be at least 8.
-        else if(length >= 8) {
-            // TODO: We should probably ensure we don't read more than this.
-            // Skip the partial list length in words.
-            userData.skipBytes(2);
-            short partialListCount = userData.readShort();
-            List<SslDataRecord> sslDataRecords = new LinkedList<>();
-            for(int i = 0; i < partialListCount; i++) {
-                short index = userData.readShort();
-                byte[] articleNumberBytes = new byte[20];
-                userData.readBytes(articleNumberBytes);
-                String articleNumber = new String(articleNumberBytes, StandardCharsets.UTF_8).trim();
-                short bgType = userData.readShort();
-                short moduleOrOsVersion = userData.readShort();
-                short pgDescriptionFileVersion = userData.readShort();
-                sslDataRecords.add(new SslModuleIdentificationDataRecord(
-                    index, articleNumber, bgType, moduleOrOsVersion, pgDescriptionFileVersion));
+    private S7Payload decodeCpuServicesPayload(CpuServicesParameter parameter, ByteBuf userData) {
+        
+        switch(parameter.getSubFunctionGroup()){
+            case READ_SSL: {
+                DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
+                DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
+                if(dataTransportSize != DataTransportSize.OCTET_STRING) {
+                        // TODO: Output an error.
+                }
+                short length = userData.readShort();                
+                SslId sslId = SslId.valueOf(userData.readShort());
+                short sslIndex = userData.readShort();
+                // If the length is 4 there is no `partial list length in bytes` and `partial list count` parameters.
+                if(length == 4) {
+                    return new CpuServicesPayload(returnCode, sslId, sslIndex);
+                }
+                // If the length is not 4, then it has to be at least 8.
+                else if(length >= 8) {
+                    // TODO: We should probably ensure we don't read more than this.
+                    // Skip the partial list length in words.
+                    userData.skipBytes(2);
+                    short partialListCount = userData.readShort();
+                    List<SslDataRecord> sslDataRecords = new LinkedList<>();
+                    for(int i = 0; i < partialListCount; i++) {
+                        short index = userData.readShort();
+                        byte[] articleNumberBytes = new byte[20];
+                        userData.readBytes(articleNumberBytes);
+                        String articleNumber = new String(articleNumberBytes, StandardCharsets.UTF_8).trim();
+                        short bgType = userData.readShort();
+                        short moduleOrOsVersion = userData.readShort();
+                        short pgDescriptionFileVersion = userData.readShort();
+                        sslDataRecords.add(new SslModuleIdentificationDataRecord(
+                            index, articleNumber, bgType, moduleOrOsVersion, pgDescriptionFileVersion));
+                    }
+                    return new CpuServicesPayload(returnCode, sslId, sslIndex, sslDataRecords);
+                }
+                // In all other cases, it's probably an error.
+                else {
+                    // TODO: Output an error.
+                }                
             }
-            return new CpuServicesPayload(returnCode, sslId, sslIndex, sslDataRecords);
-        }
-        // In all other cases, it's probably an error.
-        else {
-            // TODO: Output an error.
+                break;
+            case MESSAGE_SERVICE:{  
+                AlarmMessagePayload msg = decodeMessageServicePayload(parameter, userData); 
+                return msg;            
+            }
+            case DIAG_MESSAGE:;
+                break;
+            case ALARM8:;
+                break;
+            case NOTIFY:;
+                break;
+            case ALARM8_LOCK:;
+                break;
+            case ALARM8_UNLOCK:;
+                break;
+            case SCAN:;
+                break;
+            case ALARM_ACK:{  
+                AlarmMessagePayload msg = decodeMessageServiceAckPayload(parameter, userData);                
+                return msg;            
+            }
+            case ALARM_ACK_IND:;
+                break;
+            case ALARM8_LOCK_IND:;
+                break;
+            case ALARM8_UNLOCK_IND:;
+                break;
+            case ALARM_SQ_IND:{  
+                AlarmMessagePayload msg = decodeMessageServicePushPayload(parameter, userData);                
+                return msg;            
+            }
+            case ALARM_S_IND: {
+                AlarmMessagePayload msg = decodeMessageServicePushPayload(parameter, userData);
+                return msg;
+            }
+            case ALARM_QUERY:{
+                AlarmMessagePayload msg = decodeMessageServiceQueryPayload(parameter, userData);
+                return msg;
+            }
+            case NOTIFY8:;
+                break;
+            default:;
+                break;
         }
+        
         return null;
     }
 
@@ -760,6 +822,7 @@ private S7Parameter decodeParameter(ByteBuf in, boolean isResponse) {
     }
 
     private CpuServicesParameter decodeCpuServicesParameter(ByteBuf in) {
+        logger.info("decodeCpuServicesParameter: \r\n " + ByteBufUtil.prettyHexDump(in) );
         if(in.readShort() != 0x0112) {
             if (logger.isErrorEnabled()) {
                 logger.error("Expecting 0x0112 for CPU_SERVICES parameter");
@@ -777,17 +840,26 @@ private CpuServicesParameter decodeCpuServicesParameter(ByteBuf in) {
         in.readByte();
         byte typeAndFunctionGroup = in.readByte();
         // If bit 7 is set, it's a request (if bit 8 is set it's a response).
-        boolean requestParameter = (typeAndFunctionGroup & 0x64) != 0;
+        //Must be for request: 0x40 for check X100 0X00
+        //For Push message is 0000 XXXX, Request is 0100 XXXX, Response 1000 XXXX       
+        boolean pushParameter = (typeAndFunctionGroup & 0xF0) == 0;
+        boolean requestParameter = (typeAndFunctionGroup & 0x40) != 0;
+        boolean responseParameter = (typeAndFunctionGroup & 0x80) != 0;
         // The last 4 bits contain the function group value.
-        typeAndFunctionGroup = (byte) (typeAndFunctionGroup & 0xF);
+        typeAndFunctionGroup = (byte) (typeAndFunctionGroup & 0x0F);
         CpuServicesParameterFunctionGroup functionGroup =
             CpuServicesParameterFunctionGroup.valueOf(typeAndFunctionGroup);
         CpuServicesParameterSubFunctionGroup subFunctionGroup =
             CpuServicesParameterSubFunctionGroup.valueOf(in.readByte());
         byte sequenceNumber = in.readByte();
-        if(!requestParameter) {
+        if(pushParameter) {
+            logger.info("Es un parametro push...");
+            return new CpuServicesPushParameter(functionGroup, subFunctionGroup, sequenceNumber);            
+        } else if (requestParameter) {
+            logger.info("Es un parametro de peticiĆ³n...");
             return new CpuServicesRequestParameter(functionGroup, subFunctionGroup, sequenceNumber);
         } else {
+            logger.info("Es un parametro de respuesta...");
             byte dataUnitReferenceNumber = in.readByte();
             boolean lastDataUnit = in.readByte() == 0x00;
             ParameterError error = ParameterError.valueOf(in.readShort());
@@ -834,7 +906,247 @@ private List<VarParameterItem> decodeReadWriteVarParameter(ByteBuf in, byte numI
 
         return items;
     }
+    
+    private AlarmMessagePayload decodeMessageServicePayload(CpuServicesParameter parameter, ByteBuf userData){
+        logger.info("userData: \r\n" + ByteBufUtil.prettyHexDump(userData) );
+        DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
+        DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
+        int length = userData.readShort();
+        byte result = userData.readByte();
+        byte unknown = userData.readByte();
+        AlarmType alarmtype = null;
+        
+        if (length>2) {
+            alarmtype = AlarmType.valueOf(userData.readByte());
+            unknown = userData.readByte();
+            unknown = userData.readByte();                        
+        } else {
+            //Free dummy byte
+
+        }
+        
+       return new AlarmMessagePayload(returnCode,
+                        dataTransportSize,
+                        alarmtype,
+                        length,
+                        null);
+    }
+    
+    private AlarmMessagePayload decodeMessageServicePushPayload(CpuServicesParameter parameter, ByteBuf userData){
+        logger.info("Push userData: \r\n " + ByteBufUtil.prettyHexDump(userData) );
+        List<MessageObjectItem> MessageObjects = new LinkedList<>();
+        List<ByteBuf> values = new LinkedList<>();
+        int length;
+        //Alarm message
+        Calendar timestamp;
+        Byte FunctionID;
+        byte NumberOfMessgaeObjects;
+        //
+        DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
+        DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
+        length = userData.readShort();
+        
+        //It is assumed that you have synchronized the time of your PLC with PC.
+        //
+        timestamp = Calendar.getInstance();
+        timestamp.set(2000 + userData.readByte(), 
+                userData.readByte()-1, 
+                userData.readByte(), 
+                userData.readByte(), 
+                userData.readByte(), 
+                userData.readByte());
+        int milliseconds = (userData.readShort() & 0xfff8) >> 3;
+        timestamp.setTimeInMillis(timestamp.getTimeInMillis() + milliseconds);
+        
+        FunctionID = userData.readByte();
+        NumberOfMessgaeObjects = userData.readByte();
+        logger.info("NumberOfMessgaeObjects = " + NumberOfMessgaeObjects);
+        for (int i = 0; i < NumberOfMessgaeObjects; i++){
+            {
+                byte VariableSpecification = userData.readByte();
+                byte Length = userData.readByte();
+                VariableAddressingMode SyntaxID = VariableAddressingMode.valueOf(userData.readByte());
+                byte NumberOfValues = userData.readByte();
+                int EventID = userData.readInt();
+                byte EventState = userData.readByte();
+                byte State = userData.readByte();
+                byte AckStateGoing = userData.readByte();
+                byte AckStateComming = userData.readByte();
+                
+                List<AssociatedValueItem> AssociatedValues = new LinkedList<>();
+                
+                logger.info("NumberOfValues = " + NumberOfValues);
+                        
+                for (int j = 0; j < NumberOfValues; j++){
+                    {
+                        DataTransportErrorCode valueCode = DataTransportErrorCode.valueOf(userData.readByte());
+                        DataTransportSize valueTransportSize = DataTransportSize.valueOf(userData.readByte());
+                        int valueLength = userData.readShort();
+                        //Max length of value is 12 bytes
+                        valueLength = (valueLength >> 4)*2;
+                        logger.info("Numero de valores transferidos = " + valueLength + " Valores disponibles: " + userData.readableBytes());
+                        ByteBuf Data = userData.readBytes(valueLength);
+                        AssociatedValues.add(new AssociatedValueItem(valueCode,
+                                                valueTransportSize,
+                                                valueLength,
+                                                Data));
+                    }
+                }
+                
+                MessageObjects.add( new MessageObjectItem(VariableSpecification,
+                                            Length,
+                                            SyntaxID,
+                                            NumberOfValues,
+                                            EventID,
+                                            EventState,
+                                            State,
+                                            AckStateGoing,
+                                            AckStateComming,
+                                            AssociatedValues));
+                
+            }
 
+           return new AlarmMessagePayload(returnCode,
+                            dataTransportSize,
+                            parameter.getSubFunctionGroup(),
+                            length,
+                            new AlarmMessageItem(timestamp,
+                                    FunctionID,
+                                    NumberOfMessgaeObjects,
+                                    MessageObjects));
+            
+        }
+        
+        
+      return null;  
+    };
+
+    private AlarmMessagePayload decodeMessageServiceQueryPayload(CpuServicesParameter parameter, ByteBuf userData){
+        List<MessageObjectItem> MessageObjects = new LinkedList<>();
+        int length;
+        byte FunctionID;
+        byte NumberOfMessageObjects; //Say 1, but I have 2 messages? Why?
+        DataTransportErrorCode AlarmReturnCode;
+        DataTransportSize AlarmTransportSize;
+        int CompleteDataLength;
+        
+        //Data section
+        DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
+        DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
+        length = userData.readShort(); //Number of message objects?
+        
+        //Alarm message information
+        FunctionID = userData.readByte();
+        NumberOfMessageObjects = userData.readByte();
+        AlarmReturnCode = DataTransportErrorCode.valueOf(userData.readByte());
+        AlarmTransportSize = DataTransportSize.valueOf(userData.readByte());
+        CompleteDataLength = userData.readShort();
+        
+        //Message Object
+        for (int i = 0; i < NumberOfMessageObjects; i++){
+            byte LengthOfDataSet = userData.readByte();
+            int Unknown_1 = userData.readShort();
+            Object AlarmType = CpuServicesParameterSubFunctionGroup.valueOf(userData.readByte());
+            int EnentID = userData.readShort();
+            int Unknown_2 = userData.readShort();
+            byte EventState =  userData.readByte();
+            byte AckStateGoing = userData.readByte();
+            byte AckStateComing = userData.readByte();  
+            Calendar timestampComing;
+            
+            timestampComing = Calendar.getInstance();
+            timestampComing.set(2000 + userData.readByte(), 
+                    userData.readByte()-1, 
+                    userData.readByte(), 
+                    userData.readByte(), 
+                    userData.readByte(), 
+                    userData.readByte());
+            int milliseconds = (userData.readInt() & 0xfff8) >> 3;
+            timestampComing.setTimeInMillis(timestampComing.getTimeInMillis() + milliseconds);            
+            
+            List<AssociatedValueItem> ComingValues = new LinkedList<>();
+            
+            int NumberOfValues = 1;
+            
+            for (int j = 0; j < NumberOfValues; j++){
+                DataTransportErrorCode valueCode = DataTransportErrorCode.valueOf(userData.readByte());
+                DataTransportSize valueTransportSize = DataTransportSize.valueOf(userData.readByte());
+                int valueLength = userData.readInt();
+                ByteBuf Data = userData.readBytes(valueLength);
+                ComingValues.add(new AssociatedValueItem(valueCode,
+                                        valueTransportSize,
+                                        valueLength,
+                                        Data));                
+            }
+                                   
+            Calendar timestampGoing;
+            
+            timestampGoing = Calendar.getInstance();
+            timestampGoing.set(2000 + userData.readByte(), 
+                    userData.readByte()-1, 
+                    userData.readByte(), 
+                    userData.readByte(), 
+                    userData.readByte(), 
+                    userData.readByte());
+            milliseconds = (userData.readInt() & 0xfff8) >> 3;
+            timestampGoing.setTimeInMillis(timestampGoing.getTimeInMillis() + milliseconds); 
+            
+            List<AssociatedValueItem> GoingValues = new LinkedList<>();
+            
+            for (int j = 0; j < NumberOfValues; j++){
+                DataTransportErrorCode valueCode = DataTransportErrorCode.valueOf(userData.readByte());
+                DataTransportSize valueTransportSize = DataTransportSize.valueOf(userData.readByte());
+                int valueLength = userData.readInt();
+                ByteBuf Data = userData.readBytes(valueLength);
+                GoingValues.add(new AssociatedValueItem(valueCode,
+                                        valueTransportSize,
+                                        valueLength,
+                                        Data));                
+            }            
+                    
+            return new AlarmMessagePayload(returnCode,
+                        dataTransportSize,
+                        CpuServicesParameterSubFunctionGroup.ALARM_QUERY,
+                        length,
+                        new AlarmMessageItem(FunctionID,
+                                NumberOfMessageObjects,
+                                AlarmReturnCode,
+                                AlarmTransportSize,
+                                CompleteDataLength,
+                                MessageObjects));                 
+        }        
+        return null;
+    }    
+    
+    private AlarmMessagePayload decodeMessageServiceAckPayload(CpuServicesParameter parameter, ByteBuf userData){
+        List<MessageObjectItem> MessageObjects = new LinkedList<>();
+        //Data section
+        DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
+        DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
+        int length = userData.readShort(); //Number of message objects?
+        
+        //Alarm message section
+        byte FunctionID = userData.readByte();
+        byte NumberOfMessageObjects = userData.readByte();
+        
+        //In the next leve if is != null -> Success
+        if (userData.readByte() != 0xff) {
+            MessageObjects = null;
+        }
+        
+        return new AlarmMessagePayload(returnCode,
+                    dataTransportSize,
+                    CpuServicesParameterSubFunctionGroup.ALARM_QUERY,
+                    length,
+                    new AlarmMessageItem(FunctionID,
+                            NumberOfMessageObjects,
+                            null,
+                            null,
+                            0,
+                            MessageObjects));        
+        
+    }    
+    
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // Helpers
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesPushParameter.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesPushParameter.java
new file mode 100644
index 00000000000..8d02c60925d
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesPushParameter.java
@@ -0,0 +1,51 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.params;
+
+import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterFunctionGroup;
+import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterSubFunctionGroup;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterError;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class CpuServicesPushParameter extends CpuServicesParameter {
+    
+    private byte dataUnitReferenceNumber;
+    private boolean lastDataUnit;
+    private ParameterError error;
+    
+    public CpuServicesPushParameter(CpuServicesParameterFunctionGroup functionGroup, CpuServicesParameterSubFunctionGroup subFunctionGroup, byte sequenceNumber) {
+        super(functionGroup, subFunctionGroup, sequenceNumber);
+    }
+
+    public byte getDataUnitReferenceNumber() {
+        return dataUnitReferenceNumber;
+    }
+
+    public boolean isLastDataUnit() {
+        return lastDataUnit;
+    }
+
+    public ParameterError getError() {
+        return error;
+    }
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesRequestParameter.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesRequestParameter.java
index 21a0484745b..ee9509fdfb1 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesRequestParameter.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesRequestParameter.java
@@ -18,12 +18,15 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.plc4x.java.s7.netty.model.params;
 
-import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterSubFunctionGroup;
 import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterFunctionGroup;
+import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterSubFunctionGroup;
 
 public class CpuServicesRequestParameter extends CpuServicesParameter {
 
-    public CpuServicesRequestParameter(CpuServicesParameterFunctionGroup functionGroup, CpuServicesParameterSubFunctionGroup subFunctionGroup, byte sequenceNumber) {
+    public CpuServicesRequestParameter(CpuServicesParameterFunctionGroup functionGroup, 
+            CpuServicesParameterSubFunctionGroup subFunctionGroup, 
+            byte sequenceNumber) {
+        
         super(functionGroup, subFunctionGroup, sequenceNumber);
     }
 
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesResponseParameter.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesResponseParameter.java
index 69fb0b63db3..35182022f9b 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesResponseParameter.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesResponseParameter.java
@@ -18,8 +18,8 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.plc4x.java.s7.netty.model.params;
 
-import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterSubFunctionGroup;
 import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterFunctionGroup;
+import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterSubFunctionGroup;
 import org.apache.plc4x.java.s7.netty.model.types.ParameterError;
 
 public class CpuServicesResponseParameter extends CpuServicesParameter {
@@ -28,7 +28,12 @@ public class CpuServicesResponseParameter extends CpuServicesParameter {
     private boolean lastDataUnit;
     private ParameterError error;
 
-    public CpuServicesResponseParameter(CpuServicesParameterFunctionGroup functionGroup, CpuServicesParameterSubFunctionGroup subFunctionGroup, byte sequenceNumber, byte dataUnitReferenceNumber, boolean lastDataUnit, ParameterError error) {
+    public CpuServicesResponseParameter(CpuServicesParameterFunctionGroup functionGroup, 
+            CpuServicesParameterSubFunctionGroup subFunctionGroup,
+            byte sequenceNumber, 
+            byte dataUnitReferenceNumber, 
+            boolean lastDataUnit, ParameterError error) {
+        
         super(functionGroup, subFunctionGroup, sequenceNumber);
         this.dataUnitReferenceNumber = dataUnitReferenceNumber;
         this.lastDataUnit = lastDataUnit;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/AlarmMessagePayload.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/AlarmMessagePayload.java
new file mode 100644
index 00000000000..77bbf5262f6
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/AlarmMessagePayload.java
@@ -0,0 +1,79 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.payloads;
+
+import org.apache.plc4x.java.s7.netty.model.payloads.items.AlarmMessageItem;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class AlarmMessagePayload implements S7Payload {
+    
+    private final DataTransportErrorCode returnCode;
+    private final DataTransportSize dataTransportSize;
+    private final Object msgtype; 
+    private final Integer length;
+    private final AlarmMessageItem msg;    
+
+    public AlarmMessagePayload(DataTransportErrorCode returnCode, 
+            DataTransportSize dataTransportSize, 
+            Object msgtype, 
+            Integer length,
+            AlarmMessageItem msg) {
+        this.returnCode = returnCode;
+        this.dataTransportSize = dataTransportSize;
+        this.msgtype = msgtype;
+        this.length = length;
+        this.msg = msg;
+    }
+
+
+    @Override
+    public ParameterType getType() {
+        return ParameterType.CPU_SERVICES;
+    }
+
+    public DataTransportErrorCode getReturnCode() {
+        return returnCode;
+    }
+
+    public DataTransportSize getDataTransportSize() {
+        return dataTransportSize;
+    }
+
+    public Object getMsgtype() {
+        return msgtype;
+    }
+
+    public Integer getLength() {
+        return length;
+    }
+
+    public AlarmMessageItem getMsg() {
+        return msg;
+    }
+    
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuMessageSubscriptionResponsePayload.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuMessageSubscriptionResponsePayload.java
index 25213130e86..ff52f4f5919 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuMessageSubscriptionResponsePayload.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuMessageSubscriptionResponsePayload.java
@@ -1,10 +1,27 @@
 /*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
 package org.apache.plc4x.java.s7.netty.model.payloads;
 
+import org.apache.plc4x.java.s7.netty.model.types.AlarmType;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
 import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
 
 /**
@@ -13,6 +30,27 @@
  */
 public class CpuMessageSubscriptionResponsePayload implements S7Payload  {
 
+    private final DataTransportErrorCode returnCode;
+    private final DataTransportSize dataTransportSize;
+    private final int Length;
+    private final byte Result;
+    private final AlarmType alarm;
+
+    public CpuMessageSubscriptionResponsePayload(DataTransportErrorCode returnCode, 
+            DataTransportSize dataTransportSize, 
+            int Length, 
+            byte Result, 
+            AlarmType alarm) {
+        
+        this.returnCode = returnCode;
+        this.dataTransportSize = dataTransportSize;
+        this.Length = Length;
+        this.Result = Result;
+        this.alarm = alarm;
+    }
+    
+    
+    
     @Override
     public ParameterType getType() {
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuMessageSubscriptionServicePayload.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuMessageSubscriptionServicePayload.java
index b742e4c2489..df234ac112b 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuMessageSubscriptionServicePayload.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuMessageSubscriptionServicePayload.java
@@ -36,7 +36,12 @@ public class CpuMessageSubscriptionServicePayload implements S7Payload {
     private final AlarmType alarm;
 
 
-    public CpuMessageSubscriptionServicePayload (DataTransportErrorCode returnCode, DataTransportSize dataTransportSize, byte SubscribedEvents, String Id, AlarmType alarm) {
+    public CpuMessageSubscriptionServicePayload (DataTransportErrorCode returnCode,
+            DataTransportSize dataTransportSize, 
+            byte SubscribedEvents, 
+            String Id, 
+            AlarmType alarm) {
+        
         this.returnCode = returnCode;
         this.dataTransportSize = dataTransportSize;
         this.SubscribedEvents = SubscribedEvents;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AlarmMessageItem.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AlarmMessageItem.java
new file mode 100644
index 00000000000..5cdefec32b1
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AlarmMessageItem.java
@@ -0,0 +1,100 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.payloads.items;
+
+import java.util.Calendar;
+import java.util.List;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class AlarmMessageItem {
+    private final DataTransportErrorCode returnCode;
+    private final DataTransportSize dataTransportSize;
+    private final Calendar timestamp;
+    private final byte function;
+    private final byte objects;
+    private final int Length;
+    private final List<MessageObjectItem> msgItems; 
+
+    public AlarmMessageItem(Calendar timestamp, 
+            byte function, 
+            byte objects, 
+            List<MessageObjectItem> msgItems) {
+        
+        this.timestamp = timestamp;
+        this.function = function;
+        this.objects = objects;
+        this.msgItems = msgItems;
+        this.returnCode = null;
+        this.dataTransportSize = null;
+        this.Length = 0;
+    }
+    
+    public AlarmMessageItem(byte function,
+            byte objects,
+            DataTransportErrorCode returnCode,
+            DataTransportSize dataTransportSize,
+            int Length,
+            List<MessageObjectItem> msgItems){
+        this.function = function;
+        this.objects = objects;
+        this.returnCode = returnCode;
+        this.dataTransportSize = dataTransportSize;
+        this.Length = Length;
+        this.timestamp = null; 
+        this.msgItems = msgItems;
+    };
+            
+            
+
+    public DataTransportErrorCode getReturnCode() {
+        return returnCode;
+    }
+
+    public DataTransportSize getDataTransportSize() {
+        return dataTransportSize;
+    }
+
+    public Calendar getTimestamp() {
+        return timestamp;
+    }
+
+    public byte getFunction() {
+        return function;
+    }
+
+    public byte getObjects() {
+        return objects;
+    }
+
+    public int getLength() {
+        return Length;
+    }
+
+    public List<MessageObjectItem> getMsgItems() {
+        return msgItems;
+    }
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AssociatedValueItem.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AssociatedValueItem.java
new file mode 100644
index 00000000000..c9676afd2e6
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AssociatedValueItem.java
@@ -0,0 +1,64 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.payloads.items;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class AssociatedValueItem {
+    private final DataTransportErrorCode returnCode;
+    private final DataTransportSize dataTransportSize;
+    private final int Length;
+    private final ByteBuf Data;   
+
+    public AssociatedValueItem(DataTransportErrorCode returnCode, DataTransportSize dataTransportSize, int Length, ByteBuf Data) {
+        this.returnCode = returnCode;
+        this.dataTransportSize = dataTransportSize;
+        this.Length = Length;
+        this.Data = Data;
+    }
+
+    public DataTransportErrorCode getReturnCode() {
+        return returnCode;
+    }
+
+    public DataTransportSize getDataTransportSize() {
+        return dataTransportSize;
+    }
+
+    public int getLength() {
+        return Length;
+    }
+
+    public ByteBuf getData() {
+        return Data;
+    }
+
+
+
+
+
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/MessageObjectItem.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/MessageObjectItem.java
new file mode 100644
index 00000000000..a8c36458766
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/MessageObjectItem.java
@@ -0,0 +1,158 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.payloads.items;
+
+import java.util.Calendar;
+import java.util.List;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class MessageObjectItem {
+    
+    private final byte VariableSpecification;
+    private final byte Length;
+    private final Object SyntaxID;
+    private final byte NumberOfValues;
+    private final int EventID;
+    private final byte EventState;
+    private final byte State;
+    private final byte AckStateGoing;
+    private final byte AckStateComming;
+    private final Calendar TimestampComing;
+    private final Calendar TimestampGoing;
+    private final List<AssociatedValueItem> ComingValues;
+    private final List<AssociatedValueItem> GoingValues;     
+
+    public MessageObjectItem(byte VariableSpecification, 
+            byte Length, 
+            Object SyntaxID, 
+            byte NumberOfValues, 
+            int EventID, 
+            byte EventState, 
+            byte State, 
+            byte AckStateGoing, 
+            byte AckStateComming, 
+            List<AssociatedValueItem> Values) {
+        
+        this.VariableSpecification = VariableSpecification;
+        this.Length = Length;
+        this.SyntaxID = SyntaxID;
+        this.NumberOfValues = NumberOfValues;
+        this.EventID = EventID;
+        this.EventState = EventState;
+        this.State = State;
+        this.AckStateGoing = AckStateGoing;
+        this.AckStateComming = AckStateComming;
+        this.TimestampComing = null;
+        this.ComingValues = Values;
+        this.TimestampGoing = null;               
+        this.GoingValues = null;
+    }
+    
+    public MessageObjectItem(byte VariableSpecification, 
+            byte Length, 
+            Object SyntaxID, 
+            byte NumberOfValues, 
+            int EventID, 
+            byte EventState, 
+            byte State, 
+            byte AckStateGoing, 
+            byte AckStateComming,
+            Calendar TimestampComing,
+            List<AssociatedValueItem> ComingValues,
+            Calendar TimestampGoing,
+            List<AssociatedValueItem> GoingValues) {
+        
+        this.VariableSpecification = VariableSpecification;
+        this.Length = Length;
+        this.SyntaxID = SyntaxID;
+        this.NumberOfValues = NumberOfValues;
+        this.EventID = EventID;
+        this.EventState = EventState;
+        this.State = State;
+        this.AckStateGoing = AckStateGoing;
+        this.AckStateComming = AckStateComming;
+        this.TimestampComing = TimestampComing;
+        this.ComingValues = ComingValues;
+        this.TimestampGoing = TimestampGoing;               
+        this.GoingValues = GoingValues;
+    }    
+
+    public byte getVariableSpecification() {
+        return VariableSpecification;
+    }
+
+    public byte getLength() {
+        return Length;
+    }
+
+    public Object getSyntaxID() {
+        return SyntaxID;
+    }
+
+    public byte getNumberOfValues() {
+        return NumberOfValues;
+    }
+
+    public int getEventID() {
+        return EventID;
+    }
+
+    public byte getEventState() {
+        return EventState;
+    }
+
+    public byte getState() {
+        return State;
+    }
+
+    public byte getAckStateGoing() {
+        return AckStateGoing;
+    }
+
+    public byte getAckStateComming() {
+        return AckStateComming;
+    }
+
+    public Calendar getTimestampComing() {
+        return TimestampComing;
+    }
+
+    public Calendar getTimestampGoing() {
+        return TimestampGoing;
+    }
+
+    public List<AssociatedValueItem> getComingValues() {
+        return ComingValues;
+    }
+
+    public List<AssociatedValueItem> getGoingValues() {
+        return GoingValues;
+    }
+
+
+
+    
+ 
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterSubFunctionGroup.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterSubFunctionGroup.java
index f7e1b161acf..5b679a5fe0f 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterSubFunctionGroup.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterSubFunctionGroup.java
@@ -26,7 +26,22 @@ Licensed to the Apache Software Foundation (ASF) under one
 public enum CpuServicesParameterSubFunctionGroup {
 
     READ_SSL((byte) 0x01),
-    MESSAGE_SERVICE((byte) 0x02);
+    MESSAGE_SERVICE((byte) 0x02),
+    DIAG_MESSAGE((byte) 0x03),
+    ALARM_S((byte) 0x04),
+    ALARM8((byte) 0x05),
+    NOTIFY((byte) 0x06),
+    ALARM8_LOCK((byte) 0x07),
+    ALARM8_UNLOCK((byte) 0x08),
+    SCAN((byte) 0x04),
+    ALARM_ACK((byte) 0x0b),
+    ALARM_ACK_IND((byte) 0x0c),    
+    ALARM8_LOCK_IND((byte) 0x0d),
+    ALARM8_UNLOCK_IND((byte) 0x0e),
+    ALARM_SQ_IND((byte) 0x11),  
+    ALARM_S_IND((byte) 0x12),    
+    ALARM_QUERY((byte) 0x13),    
+    NOTIFY8((byte) 0x16); //TODO
 
     private static final Logger logger = LoggerFactory.getLogger(CpuServicesParameterSubFunctionGroup.class);
 

From b0a7efadf69b091645ca97fb3ce9a08099c4d841 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= <cesarjosegl@gmail.com>
Date: Fri, 27 Dec 2019 22:49:21 -0400
Subject: [PATCH 04/17] Progress for handling alarms and Push messages from the
 S7 PLC.

---
 .../java/s7/connection/S7PlcConnection.java   |  78 ++-
 .../plc4x/java/s7/netty/Plc4XS7Protocol.java  |  28 +-
 .../plc4x/java/s7/netty/S7Protocol.java       |  80 +--
 .../plc4x/java/s7/netty/events/S7Alarm.java   | 498 ++++++++++++++++++
 .../s7/netty/model/types/AlarmQueryType.java  |  74 +++
 5 files changed, 716 insertions(+), 42 deletions(-)
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/events/S7Alarm.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/AlarmQueryType.java

diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
index 7ce24fa7c34..7653b061862 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
@@ -23,6 +23,8 @@ Licensed to the Apache Software Foundation (ASF) under one
 import java.net.InetAddress;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -59,6 +61,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.s7.model.S7Field;
 import org.apache.plc4x.java.s7.netty.Plc4XS7Protocol;
 import org.apache.plc4x.java.s7.netty.S7Protocol;
+import org.apache.plc4x.java.s7.netty.model.payloads.AlarmMessagePayload;
 import org.apache.plc4x.java.s7.netty.model.types.MemoryArea;
 import org.apache.plc4x.java.s7.netty.strategies.DefaultS7MessageProcessor;
 import org.apache.plc4x.java.s7.netty.util.S7PlcEventHandler;
@@ -105,6 +108,9 @@ public class S7PlcConnection extends NettyPlcConnection implements PlcReader, Pl
     private final short paramMaxAmqCallee;
     private final S7ControllerType paramControllerType;
 
+    private BlockingQueue<AlarmMessagePayload> alarmsqueue;
+    private AlarmsLoop alarmsloopthread;
+
     public S7PlcConnection(InetAddress address, int rack, int slot, String params) {
         this(new TcpSocketChannelFactory(address, ISO_ON_TCP_PORT), rack, slot, params);
 
@@ -165,6 +171,20 @@ public S7PlcConnection(ChannelFactory channelFactory, int rack, int slot, String
         this.paramMaxAmqCaller = curParamMaxAmqCaller;
         this.paramMaxAmqCallee = curParamMaxAmqCallee;
         this.paramControllerType = curParamControllerType;
+        
+            
+        /*
+         * Take into account that the size of this buffer depends on the final device.
+         * S7-300 goes from 20 to 300 and for S7-400 it goes from 300 to 10000. 
+         * Depending on the configuration of the alarm system, a large number of 
+         * them should be expected when starting the connection. 
+         * (Examples of this are PCS7 and Braumat).
+         * Alarm filtering, ack, etc. must be performed by the client application.
+        */
+        this.alarmsqueue = new ArrayBlockingQueue<>(1024);
+        
+        alarmsloopthread = new AlarmsLoop(channel,this.alarmsqueue);
+
     }
 
     @Override
@@ -176,6 +196,8 @@ public boolean canRead() {
     public boolean canWrite() {
         return true;
     }
+    
+    
 
     @Override
     protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
@@ -203,7 +225,7 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
                 pipeline.addLast(new IsoTPProtocol(callingTsapId, calledTsapId, TpduSize.valueForGivenSize(paramPduSize)));
                 pipeline.addLast(new S7Protocol(paramMaxAmqCaller, paramMaxAmqCallee, paramPduSize, paramControllerType,
                     new DefaultS7MessageProcessor()));
-                pipeline.addLast(new Plc4XS7Protocol());
+                pipeline.addLast(new Plc4XS7Protocol(alarmsqueue));
             }
         };
     }
@@ -243,8 +265,16 @@ public S7ControllerType getParamControllerType() {
         return paramControllerType;
     }
 
+    @Override
+    public void connect() throws PlcConnectionException {
+        super.connect(); 
+        alarmsloopthread.start();
+    }
+
+    
     @Override
     public void close() throws PlcConnectionException {
+        alarmsloopthread.cancel();
         if ((channel != null) && channel.isOpen()) {
             // Send the PLC a message that the connection is being closed.
             DisconnectRequestTpdu disconnectRequest = new DisconnectRequestTpdu(
@@ -372,4 +402,50 @@ public void unregister(PlcConsumerRegistration registration) {
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
     }
 
+    private class AlarmsLoop extends Thread {
+        private volatile boolean cancelled;
+        private final Channel channel;
+        private boolean alarmquery;
+        private int delay;
+        private final BlockingQueue<AlarmMessagePayload> alarmsqueue;
+        
+        AlarmsLoop(Channel channel, BlockingQueue<AlarmMessagePayload> alarmsqueue) {
+            this.channel = channel;
+            this.alarmsqueue = alarmsqueue;
+            this.alarmquery = true;
+            this.delay = 1;
+        }
+        
+        @Override
+        public void run() {
+            while (!cancelled) { 
+                try {
+                    AlarmMessagePayload alarm = alarmsqueue.poll(delay, TimeUnit.SECONDS);
+                    if (alarm != null){
+                        logger.info("Alarm type: " + alarm.getMsgtype() + " NĆŗmero de alarmas: " + alarm.getMsg().getObjects());
+                        
+                    } else {
+                        if (alarmquery){
+                            //TODO Send alarm query to plc
+                        } else {
+                            
+                        }
+                    }
+                } catch (InterruptedException ex) {
+                    logger.info(ex.getLocalizedMessage());
+                }
+            }
+            logger.info("Closing the alarm loop.");
+        }
+        
+        public void cancel() {
+            cancelled = true;  
+        }
+
+        public boolean isCancelled() {
+            return cancelled;
+        }
+        
+    }    
+    
 }
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
index 8c2e44b8342..ab34621ad23 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
@@ -19,7 +19,6 @@ Licensed to the Apache Software Foundation (ASF) under one
 package org.apache.plc4x.java.s7.netty;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufUtil;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import java.io.IOException;
@@ -32,6 +31,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import java.time.LocalTime;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
+import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -66,8 +66,6 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.s7.netty.model.payloads.CpuMessageSubscriptionServicePayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
 import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.MessageObjectItem;
 import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
 import org.apache.plc4x.java.s7.netty.model.types.*;
 import org.slf4j.Logger;
@@ -88,10 +86,24 @@ public class Plc4XS7Protocol extends PlcMessageToMessageCodec<S7Message, PlcRequ
     private static final AtomicInteger tpduGenerator = new AtomicInteger(10);
 
     private Map<Short, PlcRequestContainer> requests;
+    
+    private final BlockingQueue<AlarmMessagePayload> alarmsqueue;
 
     public Plc4XS7Protocol() {
         this.requests = new HashMap<>();
+        this.alarmsqueue = null;
+    }
+    /*
+    * @param s7Type
+    * 
+    */
+    public Plc4XS7Protocol(BlockingQueue<AlarmMessagePayload> alarmsqueue) {
+        this.requests = new HashMap<>();
+        //We need check the device here
+        this.alarmsqueue = alarmsqueue;
     }
+    
+    
 
     /**
      * If this protocol layer catches an {@link S7ConnectedEvent} from the protocol layer beneath,
@@ -490,11 +502,16 @@ protected void decode(ChannelHandlerContext ctx, S7Message msg, List<Object> out
             }
         } else {
             logger.info("Posible mensaje PUSH...");
-            List<S7Payload> payloads = msg.getPayloads();
+            List<S7Payload> payloads = msg.getPayloads();  
+            //TODO: Use alarmsqueue.addAll() method
             for (S7Payload payload:payloads){
                 if (payload instanceof AlarmMessagePayload){
                     logger.info("S7PayLoad tipo AlarmMessagePayload: " + payload.toString());
                     AlarmMessagePayload alarm = (AlarmMessagePayload) payload;
+                    if (!alarmsqueue.offer(alarm)){
+                        logger.info("Alarm queue buffer is full.");
+                    };
+                    /*
                     List<MessageObjectItem> msgobjects = alarm.getMsg().getMsgItems();
                     for (MessageObjectItem msgobject:msgobjects){
                         logger.info("Item tipo MessageObjectItem: " + msgobject.toString() + " Size: " + msgobject.getComingValues().size());
@@ -503,6 +520,7 @@ protected void decode(ChannelHandlerContext ctx, S7Message msg, List<Object> out
                             logger.info("ReturnCode :" + item.getReturnCode() + " Length: " + item.getLength() + " Data: " + ByteBufUtil.hexDump(item.getData()));
                         }
                     }
+                    */
                 }
             }            
         }
@@ -923,5 +941,7 @@ private static int convertByteToBcd(byte incomingByte) {
         int dec = (incomingByte >> 4) * 10;
         return dec + (incomingByte & 0x0f);
     }
+    
+
 
 }
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
index 7a1964bf7b7..50f86aa772f 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
@@ -400,6 +400,7 @@ private void encodeCpuServicesParameter(ByteBuf buf, CpuServicesParameter parame
         // This is a mixture of request/response and function group .
         byte nextByte = (byte) (((parameter instanceof CpuServicesRequestParameter) ?
             (byte) 0x40 : (byte) 0x80) | parameter.getFunctionGroup().getCode());
+        //TODO for ALARM_QUERY bypass the next byte
         buf.writeByte(nextByte);
         buf.writeByte(parameter.getSubFunctionGroup().getCode());
         buf.writeByte(parameter.getSequenceNumber());
@@ -701,44 +702,9 @@ private S7Payload decodeCpuServicesPayload(CpuServicesParameter parameter, ByteB
         
         switch(parameter.getSubFunctionGroup()){
             case READ_SSL: {
-                DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
-                DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
-                if(dataTransportSize != DataTransportSize.OCTET_STRING) {
-                        // TODO: Output an error.
-                }
-                short length = userData.readShort();                
-                SslId sslId = SslId.valueOf(userData.readShort());
-                short sslIndex = userData.readShort();
-                // If the length is 4 there is no `partial list length in bytes` and `partial list count` parameters.
-                if(length == 4) {
-                    return new CpuServicesPayload(returnCode, sslId, sslIndex);
-                }
-                // If the length is not 4, then it has to be at least 8.
-                else if(length >= 8) {
-                    // TODO: We should probably ensure we don't read more than this.
-                    // Skip the partial list length in words.
-                    userData.skipBytes(2);
-                    short partialListCount = userData.readShort();
-                    List<SslDataRecord> sslDataRecords = new LinkedList<>();
-                    for(int i = 0; i < partialListCount; i++) {
-                        short index = userData.readShort();
-                        byte[] articleNumberBytes = new byte[20];
-                        userData.readBytes(articleNumberBytes);
-                        String articleNumber = new String(articleNumberBytes, StandardCharsets.UTF_8).trim();
-                        short bgType = userData.readShort();
-                        short moduleOrOsVersion = userData.readShort();
-                        short pgDescriptionFileVersion = userData.readShort();
-                        sslDataRecords.add(new SslModuleIdentificationDataRecord(
-                            index, articleNumber, bgType, moduleOrOsVersion, pgDescriptionFileVersion));
-                    }
-                    return new CpuServicesPayload(returnCode, sslId, sslIndex, sslDataRecords);
-                }
-                // In all other cases, it's probably an error.
-                else {
-                    // TODO: Output an error.
-                }                
+                CpuServicesPayload msg = decodeReadSslPayload(parameter, userData);
+                return msg;
             }
-                break;
             case MESSAGE_SERVICE:{  
                 AlarmMessagePayload msg = decodeMessageServicePayload(parameter, userData); 
                 return msg;            
@@ -907,6 +873,46 @@ private List<VarParameterItem> decodeReadWriteVarParameter(ByteBuf in, byte numI
         return items;
     }
     
+    private CpuServicesPayload decodeReadSslPayload(CpuServicesParameter parameter, ByteBuf userData){
+        DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
+        DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
+        if(dataTransportSize != DataTransportSize.OCTET_STRING) {
+                // TODO: Output an error.
+        }
+        short length = userData.readShort();                
+        SslId sslId = SslId.valueOf(userData.readShort());
+        short sslIndex = userData.readShort();
+        // If the length is 4 there is no `partial list length in bytes` and `partial list count` parameters.
+        if(length == 4) {
+            return new CpuServicesPayload(returnCode, sslId, sslIndex);
+        }
+        // If the length is not 4, then it has to be at least 8.
+        else if(length >= 8) {
+            // TODO: We should probably ensure we don't read more than this.
+            // Skip the partial list length in words.
+            userData.skipBytes(2);
+            short partialListCount = userData.readShort();
+            List<SslDataRecord> sslDataRecords = new LinkedList<>();
+            for(int i = 0; i < partialListCount; i++) {
+                short index = userData.readShort();
+                byte[] articleNumberBytes = new byte[20];
+                userData.readBytes(articleNumberBytes);
+                String articleNumber = new String(articleNumberBytes, StandardCharsets.UTF_8).trim();
+                short bgType = userData.readShort();
+                short moduleOrOsVersion = userData.readShort();
+                short pgDescriptionFileVersion = userData.readShort();
+                sslDataRecords.add(new SslModuleIdentificationDataRecord(
+                    index, articleNumber, bgType, moduleOrOsVersion, pgDescriptionFileVersion));
+            }
+            return new CpuServicesPayload(returnCode, sslId, sslIndex, sslDataRecords);
+        }
+        // In all other cases, it's probably an error.
+        else {
+            // TODO: Output an error.
+        }   
+        return null;   
+    }    
+    
     private AlarmMessagePayload decodeMessageServicePayload(CpuServicesParameter parameter, ByteBuf userData){
         logger.info("userData: \r\n" + ByteBufUtil.prettyHexDump(userData) );
         DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/events/S7Alarm.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/events/S7Alarm.java
new file mode 100644
index 00000000000..07b951e7778
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/events/S7Alarm.java
@@ -0,0 +1,498 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.events;
+
+import io.netty.buffer.ByteBuf;
+import static io.netty.buffer.Unpooled.buffer;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.Collection;
+import java.util.Hashtable;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.MessageObjectItem;
+
+/**
+ * The S7Alarm object is a wrapper around MessageObjectItem to maintain 
+ * compatibility with the top layer.
+ * At this point we can have any of the Push messages generated by the PLC for 
+ * an event or a query request from the application, usually executed when the 
+ * connection is initiated. The messages from the PLC can be of type:
+ * . Alarm
+ * . Alarm_8
+ * . Alarm_8P
+ * . Alarm_S
+ * . Alarm_SQ
+ * . Alarm_D
+ * . Alarm_DQ
+ * . Alarm_DQ
+ * . Notify
+ * . Notify_8P
+ * To correctly evaluate the message, the "Subfunction" and "SyntaxId" field 
+ * must be evaluated. In the case of the "Subfunction =" ALARM_QUERY "query, 
+ * the type will be stored in" SyntaxId "
+ * 
+ * @author cgarcia
+ */
+public class S7Alarm implements PlcSubscriptionEvent {
+    
+    private final MessageObjectItem s7alarm;
+    
+    private static final String SIG_1 = "SIG_1";
+    private static final String SIG_2 = "SIG_2";
+    private static final String SIG_3 = "SIG_3";
+    private static final String SIG_4 = "SIG_4";
+    private static final String SIG_5 = "SIG_5";
+    private static final String SIG_6 = "SIG_6";
+    private static final String SIG_7 = "SIG_7";
+    private static final String SIG_8 = "SIG_8";
+    
+    private static final Hashtable<String,Integer> SIGS = new Hashtable<String,Integer>() 
+    {{ put(SIG_1, 0);     
+       put(SIG_2, 1);     
+       put(SIG_3, 2);     
+       put(SIG_4, 3);     
+       put(SIG_5, 4);     
+       put(SIG_6, 5);
+       put(SIG_7, 6);
+       put(SIG_8, 7);}};
+    
+
+    public S7Alarm(MessageObjectItem s7alarm) {
+        this.s7alarm = s7alarm;
+    }
+    
+    @Override
+    public Instant getTimestamp() {
+        return s7alarm.getTimestampComing().toInstant();
+    }
+
+    @Override
+    public PlcReadRequest getRequest() {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public int getNumberOfValues(String name) {
+        return s7alarm.getComingValues().size();
+    }
+
+    @Override
+    public Object getObject(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Object getObject(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Object> getAllObjects(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidBoolean(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidBoolean(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Boolean getBoolean(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Boolean getBoolean(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Boolean> getAllBooleans(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidByte(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidByte(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Byte getByte(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Byte getByte(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Byte> getAllBytes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidShort(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidShort(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Short getShort(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Short getShort(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Short> getAllShorts(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Integer getInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Integer getInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Integer> getAllIntegers(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<BigInteger> getAllBigIntegers(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidLong(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidLong(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Long getLong(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Long getLong(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Long> getAllLongs(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidFloat(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidFloat(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Float getFloat(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Float getFloat(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Float> getAllFloats(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDouble(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDouble(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Double getDouble(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Double getDouble(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Double> getAllDoubles(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<BigDecimal> getAllBigDecimals(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidString(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidString(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public String getString(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public String getString(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<String> getAllStrings(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public LocalTime getTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public LocalTime getTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<LocalTime> getAllTimes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDate(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDate(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public LocalDate getDate(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public LocalDate getDate(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<LocalDate> getAllDates(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDateTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDateTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<LocalDateTime> getAllDateTimes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidByteArray(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidByteArray(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Byte[] getByteArray(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Byte[] getByteArray(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Byte[]> getAllByteArrays(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<String> getFieldNames() {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public PlcField getField(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public PlcResponseCode getResponseCode(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+    
+    public ByteBuf getData(String name) {
+        return s7alarm.getComingValues().get(0).getData();
+    }
+    
+    public ByteBuf getAllData() {
+        ByteBuf copy = buffer(12);
+        for(AssociatedValueItem item:s7alarm.getComingValues() ){
+            copy.writeBytes(item.getData());
+        }
+        return copy;
+    }
+    
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/AlarmQueryType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/AlarmQueryType.java
new file mode 100644
index 00000000000..7dac7ac5a9f
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/AlarmQueryType.java
@@ -0,0 +1,74 @@
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum AlarmQueryType {
+    
+    SCAN("SCAN", (byte) 0x01),
+    ALARM_8("ALARM_8", (byte) 0x02),
+    ALARM_S("ALARM_S", (byte) 0x04),
+    NONE("NONE", (byte) 0x00);
+    
+    
+    private static final Map<Byte, AlarmQueryType> map;
+    
+    static {
+        map = new HashMap<>();
+        for (AlarmQueryType  subevent : AlarmQueryType .values()) {
+            map.put(subevent.code, subevent);
+        }
+    }    
+    
+    private final String event;
+    private final byte code;
+    
+    AlarmQueryType(String event, byte code){
+        this.event = event;
+        this.code = code;
+    }
+    
+    public String getEvent(){
+        return event;
+    }    
+    
+    public byte getCode() {
+        return code;
+    }    
+    
+    public static AlarmQueryType  valueOfEvent(String event) {
+        for (AlarmQueryType  value : AlarmQueryType .values()) {
+            if(value.getEvent().equals(event)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static AlarmQueryType  valueOf(byte code) {
+        return map.get(code);
+    }    
+}

From 93d6e890686e97cde10a99012d25799fe1734a36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= <cesarjosegl@gmail.com>
Date: Tue, 7 Jan 2020 19:19:27 -0400
Subject: [PATCH 05/17] ALARM_S reception and PLC diagnostic messages are
 working. Preparation to perform alarm recognition from the application level.

---
 .../java/s7/connection/S7PlcConnection.java   |  36 +-
 .../apache/plc4x/java/s7/model/S7Field.java   |  15 +-
 .../plc4x/java/s7/netty/Plc4XS7Protocol.java  |  61 ++-
 .../plc4x/java/s7/netty/S7Protocol.java       | 247 ++++++---
 .../netty/model/messages/S7PushMessage.java   |  28 +
 .../params/CpuDiagnosticPushParameter.java    |  87 ++++
 .../params/CpuServicesPushParameter.java      |   5 +
 .../model/payloads/AlarmMessagePayload.java   |  13 +-
 .../payloads/CpuDiagnosticMessagePayload.java |  82 +++
 .../payloads/items/AlarmMessageItem.java      |  20 +-
 .../payloads/items/AssociatedValueItem.java   |  13 +-
 .../items/CpuDiagnosticMessageItem.java       |  95 ++++
 .../payloads/items/MessageObjectItem.java     |  20 +
 .../netty/model/types/CpuCurrentModeType.java |  83 +++
 ...ServicesParameterSubFunctionGroupType.java |  79 +++
 .../model/types/CpuUserDataMethodType.java    |  77 +++
 ...CpuUserDataParameterFunctionGroupType.java |  83 +++
 .../model/types/CpuUserDataParameterType.java |  80 +++
 .../s7/netty/model/types/ParameterType.java   |   6 +-
 .../java/s7/netty/util/S7SizeHelper.java      |   2 +
 .../java/s7/utils/S7DiagnosticEventId.java    | 492 ++++++++++++++++++
 .../plc4x/java/s7/utils/S7ParamErrorCode.java | 276 ++++++++++
 22 files changed, 1781 insertions(+), 119 deletions(-)
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7PushMessage.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuDiagnosticPushParameter.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuDiagnosticMessagePayload.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/CpuDiagnosticMessageItem.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuCurrentModeType.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuCyclicServicesParameterSubFunctionGroupType.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuUserDataMethodType.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuUserDataParameterFunctionGroupType.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuUserDataParameterType.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7DiagnosticEventId.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7ParamErrorCode.java

diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
index 7653b061862..3c7de57905a 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
@@ -61,7 +61,11 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.s7.model.S7Field;
 import org.apache.plc4x.java.s7.netty.Plc4XS7Protocol;
 import org.apache.plc4x.java.s7.netty.S7Protocol;
+import org.apache.plc4x.java.s7.netty.model.messages.S7PushMessage;
+import org.apache.plc4x.java.s7.netty.model.params.CpuDiagnosticPushParameter;
+import org.apache.plc4x.java.s7.netty.model.params.CpuServicesPushParameter;
 import org.apache.plc4x.java.s7.netty.model.payloads.AlarmMessagePayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuDiagnosticMessagePayload;
 import org.apache.plc4x.java.s7.netty.model.types.MemoryArea;
 import org.apache.plc4x.java.s7.netty.strategies.DefaultS7MessageProcessor;
 import org.apache.plc4x.java.s7.netty.util.S7PlcEventHandler;
@@ -108,7 +112,7 @@ public class S7PlcConnection extends NettyPlcConnection implements PlcReader, Pl
     private final short paramMaxAmqCallee;
     private final S7ControllerType paramControllerType;
 
-    private BlockingQueue<AlarmMessagePayload> alarmsqueue;
+    private BlockingQueue<S7PushMessage> alarmsqueue;
     private AlarmsLoop alarmsloopthread;
 
     public S7PlcConnection(InetAddress address, int rack, int slot, String params) {
@@ -171,8 +175,7 @@ public S7PlcConnection(ChannelFactory channelFactory, int rack, int slot, String
         this.paramMaxAmqCaller = curParamMaxAmqCaller;
         this.paramMaxAmqCallee = curParamMaxAmqCallee;
         this.paramControllerType = curParamControllerType;
-        
-            
+                    
         /*
          * Take into account that the size of this buffer depends on the final device.
          * S7-300 goes from 20 to 300 and for S7-400 it goes from 300 to 10000. 
@@ -197,8 +200,6 @@ public boolean canWrite() {
         return true;
     }
     
-    
-
     @Override
     protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
         //short calledTsapId = S7TsapIdEncoder.encodeS7TsapId(DeviceGroup.OS, 0, 0);
@@ -407,9 +408,9 @@ private class AlarmsLoop extends Thread {
         private final Channel channel;
         private boolean alarmquery;
         private int delay;
-        private final BlockingQueue<AlarmMessagePayload> alarmsqueue;
+        private final BlockingQueue<S7PushMessage> alarmsqueue;
         
-        AlarmsLoop(Channel channel, BlockingQueue<AlarmMessagePayload> alarmsqueue) {
+        AlarmsLoop(Channel channel, BlockingQueue<S7PushMessage> alarmsqueue) {
             this.channel = channel;
             this.alarmsqueue = alarmsqueue;
             this.alarmquery = true;
@@ -420,10 +421,23 @@ private class AlarmsLoop extends Thread {
         public void run() {
             while (!cancelled) { 
                 try {
-                    AlarmMessagePayload alarm = alarmsqueue.poll(delay, TimeUnit.SECONDS);
-                    if (alarm != null){
-                        logger.info("Alarm type: " + alarm.getMsgtype() + " NĆŗmero de alarmas: " + alarm.getMsg().getObjects());
-                        
+                    S7PushMessage msg = alarmsqueue.poll(delay, TimeUnit.SECONDS);
+                    if (msg != null){
+                        if (msg instanceof AlarmMessagePayload){
+                            AlarmMessagePayload themsg = (AlarmMessagePayload) msg;
+                            logger.info("AlarmMessagePayload: " + themsg);
+                        } else if (msg instanceof CpuDiagnosticPushParameter) {
+                            CpuDiagnosticPushParameter themsg = (CpuDiagnosticPushParameter) msg;
+                            logger.info("CpuDiagnosticPushParameter: " + themsg);;
+                        } else if (msg instanceof CpuDiagnosticMessagePayload) {
+                            CpuDiagnosticMessagePayload themsg = (CpuDiagnosticMessagePayload) msg;
+                            logger.info("CpuDiagnosticMessagePayload: " + themsg);
+                        } else if (msg instanceof CpuServicesPushParameter) {
+                            CpuServicesPushParameter themsg = (CpuServicesPushParameter) msg;
+                            logger.info("CpuServicesPushParameter: " + themsg);
+                        } else {
+                            logger.info("Object type: " + msg.getClass());
+                        }                       
                     } else {
                         if (alarmquery){
                             //TODO Send alarm query to plc
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java
index 04620844b0a..13e2dd93370 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java
@@ -18,17 +18,16 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.plc4x.java.s7.model;
 
-import org.apache.commons.lang3.NotImplementedException;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.s7.netty.model.types.MemoryArea;
-import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
-
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.apache.commons.lang3.NotImplementedException;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.s7.netty.model.types.MemoryArea;
+import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
 
 public class S7Field implements PlcField {
 
@@ -39,6 +38,10 @@ public class S7Field implements PlcField {
     //blockNumber usually has its max hat around 64000 --> 5digits
     private static final Pattern DATA_BLOCK_ADDRESS_PATTERN =
         Pattern.compile("^%DB(?<blockNumber>\\d{1,5}).DB(?<transferSizeCode>[XBWD]?)(?<byteOffset>\\d{1,7})(.(?<bitOffset>[0-7]))?:(?<dataType>[a-zA-Z_]+)(\\[(?<numElements>\\d+)])?");
+    
+    //Event Subscription 
+    private static final Pattern EVENT_SUBSCRIPTION_TYPE_PATTERN = 
+        Pattern.compile("MODE SYS USR ALM");
 
     private static final String DATA_TYPE = "dataType";
     private static final String TRANSFER_SIZE_CODE = "transferSizeCode";
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
index ab34621ad23..05f6df97b48 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
@@ -54,6 +54,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.s7.model.S7Field;
 import org.apache.plc4x.java.s7.netty.events.S7ConnectedEvent;
 import org.apache.plc4x.java.s7.netty.model.messages.S7Message;
+import org.apache.plc4x.java.s7.netty.model.messages.S7PushMessage;
 import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
 import org.apache.plc4x.java.s7.netty.model.messages.S7ResponseMessage;
 import org.apache.plc4x.java.s7.netty.model.params.CpuServicesParameter;
@@ -87,7 +88,7 @@ public class Plc4XS7Protocol extends PlcMessageToMessageCodec<S7Message, PlcRequ
 
     private Map<Short, PlcRequestContainer> requests;
     
-    private final BlockingQueue<AlarmMessagePayload> alarmsqueue;
+    private final BlockingQueue<S7PushMessage> alarmsqueue;
 
     public Plc4XS7Protocol() {
         this.requests = new HashMap<>();
@@ -97,7 +98,7 @@ public Plc4XS7Protocol() {
     * @param s7Type
     * 
     */
-    public Plc4XS7Protocol(BlockingQueue<AlarmMessagePayload> alarmsqueue) {
+    public Plc4XS7Protocol(BlockingQueue<S7PushMessage> alarmsqueue) {
         this.requests = new HashMap<>();
         //We need check the device here
         this.alarmsqueue = alarmsqueue;
@@ -222,7 +223,7 @@ private void encodeSubcriptionRequest(PlcRequestContainer msg, List<Object> out)
     }
     
     private void encodeUnsubcriptionRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
-        
+        //TODO : Perform subscription termination 
     }    
     
     private void encodeReadRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
@@ -460,7 +461,7 @@ byte[] encodeWriteRequestStringField(BaseDefaultFieldItem fieldItem, boolean isU
         // TODO: Implement this ...
         return new byte[0];
     }
-
+    
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // Decoding
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -469,16 +470,16 @@ byte[] encodeWriteRequestStringField(BaseDefaultFieldItem fieldItem, boolean isU
     @Override
     protected void decode(ChannelHandlerContext ctx, S7Message msg, List<Object> out) throws PlcException {
         // We're currently just expecting responses.
-        logger.info("Message Type: " + msg.getMessageType());
+
         if (!(msg instanceof S7ResponseMessage)) {
             logger.info("Aborta decode: " + msg.getMessageType());
             return;
         }
+        
         S7ResponseMessage responseMessage = (S7ResponseMessage) msg;
         short tpduReference = responseMessage.getTpduReference();
         if (requests.containsKey(tpduReference)) {
             // As every response has a matching request, get this request based on the tpdu.
-            logger.info("tpduReference: " + tpduReference);
             PlcRequestContainer requestContainer = requests.remove(tpduReference);
             PlcRequest request = requestContainer.getRequest();
 
@@ -489,43 +490,40 @@ protected void decode(ChannelHandlerContext ctx, S7Message msg, List<Object> out
             } else if (request instanceof PlcWriteRequest) {
                 response = decodeWriteResponse(responseMessage, requestContainer);
             } else if (request instanceof PlcSubscriptionRequest) {
-                logger.info("Debo verificar si la suscripciĆ³n fu exitosa...");  
+                response = decodeSubscriptionResponse(responseMessage, requestContainer);
             } else {
-                logger.info("Existe la solicitud del cliente, pero no es una respuesta valida...");
+                logger.info("There is the client's request, but it is not a valid response....");
             }
 
             // Confirm the response being handled.
             if (response != null) {
                 requestContainer.getResponseFuture().complete(response);
             } else {
-                logger.info("No se pudo procesar el mensaje...");
+                logger.info("The message could not be processed...");
             }
         } else {
-            logger.info("Posible mensaje PUSH...");
+            //PUSH Message
+            List<S7Parameter> parameters = msg.getParameters();
+            for (S7Parameter parameter:parameters){
+                if (parameter instanceof S7PushMessage){
+                    if (!alarmsqueue.offer((S7PushMessage) parameter)){
+                        logger.info("Alarm queue buffer is full.");
+                    };                    
+                }    
+            }
+            
             List<S7Payload> payloads = msg.getPayloads();  
             //TODO: Use alarmsqueue.addAll() method
             for (S7Payload payload:payloads){
-                if (payload instanceof AlarmMessagePayload){
-                    logger.info("S7PayLoad tipo AlarmMessagePayload: " + payload.toString());
-                    AlarmMessagePayload alarm = (AlarmMessagePayload) payload;
-                    if (!alarmsqueue.offer(alarm)){
+                if (payload instanceof S7PushMessage){
+                    if (!alarmsqueue.offer((S7PushMessage) payload)){
                         logger.info("Alarm queue buffer is full.");
                     };
-                    /*
-                    List<MessageObjectItem> msgobjects = alarm.getMsg().getMsgItems();
-                    for (MessageObjectItem msgobject:msgobjects){
-                        logger.info("Item tipo MessageObjectItem: " + msgobject.toString() + " Size: " + msgobject.getComingValues().size());
-                        List<AssociatedValueItem> items = msgobject.getComingValues();
-                        for (AssociatedValueItem item:items){
-                            logger.info("ReturnCode :" + item.getReturnCode() + " Length: " + item.getLength() + " Data: " + ByteBufUtil.hexDump(item.getData()));
-                        }
-                    }
-                    */
                 }
             }            
         }
     }
-
+        // TODO: Check if it is a CPU service response and proceed as applicable.
     @SuppressWarnings("unchecked")
     private PlcResponse decodeReadResponse(S7ResponseMessage responseMessage, PlcRequestContainer requestContainer) throws PlcProtocolException {
         InternalPlcReadRequest plcReadRequest = (InternalPlcReadRequest) requestContainer.getRequest();
@@ -841,6 +839,19 @@ private PlcResponse decodeWriteResponse(S7ResponseMessage responseMessage, PlcRe
         return new DefaultPlcWriteResponse(plcWriteRequest, values);
     }
 
+    private PlcResponse decodeSubscriptionResponse(S7ResponseMessage responseMessage, PlcRequestContainer requestContainer) throws PlcProtocolException {
+        InternalPlcSubscriptionRequest subsRequest = (InternalPlcSubscriptionRequest) requestContainer.getRequest();
+        List<S7Payload> payloads = responseMessage.getPayloads();
+        for (S7Payload payload:payloads){
+            if(payload instanceof AlarmMessagePayload) {  
+                logger.info("OK. Si pasa el mensaje como un Payload...: " + ((AlarmMessagePayload) payload).getReturnCode());
+                //logger.info("Alarm Type...: " + ((AlarmMessagePayload) payload).getMsgtype());                
+            }
+        }
+        return new DefaultPlcSubscriptionResponse(subsRequest, null);
+    }
+    
+    
     private PlcResponseCode decodeResponseCode(DataTransportErrorCode dataTransportErrorCode) {
         if (dataTransportErrorCode == null) {
             return PlcResponseCode.INTERNAL_ERROR;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
index 50f86aa772f..914abe9f912 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
@@ -27,6 +27,10 @@ Licensed to the Apache Software Foundation (ASF) under one
 import io.netty.util.concurrent.PromiseCombiner;
 import java.lang.reflect.Field;
 import java.nio.charset.StandardCharsets;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
@@ -45,12 +49,14 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
 import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
 import org.apache.plc4x.java.s7.netty.model.payloads.AlarmMessagePayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuDiagnosticMessagePayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.CpuMessageSubscriptionServicePayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.CpuServicesPayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
 import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.items.AlarmMessageItem;
 import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.CpuDiagnosticMessageItem;
 import org.apache.plc4x.java.s7.netty.model.payloads.items.MessageObjectItem;
 import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
 import org.apache.plc4x.java.s7.netty.model.payloads.ssls.SslDataRecord;
@@ -489,7 +495,6 @@ protected void decode(ChannelHandlerContext ctx, IsoTPMessage in, List<Object> o
         byte errorCode = 0;
         
         if (isResponse) {
-            logger.info("Mensaje de respuesta");
             errorClass = userData.readByte();
             errorCode = userData.readByte();
         }
@@ -555,30 +560,29 @@ protected void decode(ChannelHandlerContext ctx, IsoTPMessage in, List<Object> o
             }
 
         } else {
-            // CpuService responses are encoded as requests.
-            // 
+            // !CpuService responses are encoded as requests. 
+            // No!, we need check in the next layer Plc4XS7Protocol like response
             for (S7Parameter s7Parameter : s7Parameters) {
                 // Only if we have a response parameter, the payload is a response payload.
                 if(s7Parameter instanceof CpuServicesResponseParameter) {
-                   logger.info("*** Aqui verifica el tipo del s7Parameter...");
+
                     for (S7Payload s7Payload : s7Payloads) {
                         if(s7Payload instanceof CpuServicesPayload) {
                             CpuServicesPayload cpuServicesPayload = (CpuServicesPayload) s7Payload;
                             // Remove the current response from the list of unconfirmed messages.
-                            logger.info("*** Aqui verifica el tipo del Payload...");
+
                             sentButUnacknowledgedTpdus.remove(tpduReference);
 
                             handleIdentifyRemote(ctx, cpuServicesPayload);
                         }
                     }
                 } else if (s7Parameter instanceof CpuServicesPushParameter){
-                    logger.info("*** MENSAGE PUSH ***");
-                    out.add(new S7ResponseMessage(messageType, tpduReference, s7Parameters, s7Payloads, errorClass, errorCode)); 
-                    return;
+                    //*** MENSAGE PUSH ***"
+                    //out.add(new S7ResponseMessage(messageType, tpduReference, s7Parameters, s7Payloads, errorClass, errorCode)); 
                 }
-            }
-            logger.info("Envia el mensaje a la proxima capa como S7RequestMessage");
-            out.add(new S7RequestMessage(messageType, tpduReference, s7Parameters, s7Payloads, null));
+            }            
+            //out.add(new S7RequestMessage(messageType, tpduReference, s7Parameters, s7Payloads, null));
+            out.add(new S7ResponseMessage(messageType, tpduReference, s7Parameters, s7Payloads, errorClass, errorCode)); 
         }
     }
 
@@ -655,6 +659,9 @@ private List<S7Payload> decodePayloads(ByteBuf userData, boolean isResponse, sho
             } else if(s7Parameter instanceof CpuServicesParameter) {
                 S7Payload cpuServicesPayload = decodeCpuServicesPayload((CpuServicesParameter)s7Parameter, userData);
                 s7Payloads.add(cpuServicesPayload);
+            } else if (s7Parameter instanceof CpuServicesPushParameter){
+                S7Payload cpuServicesPayload = decodeCpuServicesPayload((CpuServicesParameter)s7Parameter, userData);
+                s7Payloads.add(cpuServicesPayload);                
             }
         }
         return s7Payloads;
@@ -702,15 +709,17 @@ private S7Payload decodeCpuServicesPayload(CpuServicesParameter parameter, ByteB
         
         switch(parameter.getSubFunctionGroup()){
             case READ_SSL: {
-                CpuServicesPayload msg = decodeReadSslPayload(parameter, userData);
-                return msg;
+                CpuServicesPayload payload = decodeReadSslPayload(parameter, userData);
+                return payload;
             }
             case MESSAGE_SERVICE:{  
-                AlarmMessagePayload msg = decodeMessageServicePayload(parameter, userData); 
-                return msg;            
+                AlarmMessagePayload payload = decodeMessageServicePayload(parameter, userData); 
+                return payload;            
+            }
+            case DIAG_MESSAGE:{
+                CpuDiagnosticMessagePayload payload = decodeCpuDiagnosticMessagePayload(parameter, userData);
+                return payload;
             }
-            case DIAG_MESSAGE:;
-                break;
             case ALARM8:;
                 break;
             case NOTIFY:;
@@ -722,8 +731,8 @@ private S7Payload decodeCpuServicesPayload(CpuServicesParameter parameter, ByteB
             case SCAN:;
                 break;
             case ALARM_ACK:{  
-                AlarmMessagePayload msg = decodeMessageServiceAckPayload(parameter, userData);                
-                return msg;            
+                AlarmMessagePayload payload = decodeMessageServiceAckPayload(parameter, userData);                
+                return payload;            
             }
             case ALARM_ACK_IND:;
                 break;
@@ -732,16 +741,16 @@ private S7Payload decodeCpuServicesPayload(CpuServicesParameter parameter, ByteB
             case ALARM8_UNLOCK_IND:;
                 break;
             case ALARM_SQ_IND:{  
-                AlarmMessagePayload msg = decodeMessageServicePushPayload(parameter, userData);                
-                return msg;            
+                AlarmMessagePayload payload = decodeMessageServicePushPayload(parameter, userData);                
+                return payload;            
             }
             case ALARM_S_IND: {
-                AlarmMessagePayload msg = decodeMessageServicePushPayload(parameter, userData);
-                return msg;
+                AlarmMessagePayload payload = decodeMessageServicePushPayload(parameter, userData);
+                return payload;
             }
             case ALARM_QUERY:{
-                AlarmMessagePayload msg = decodeMessageServiceQueryPayload(parameter, userData);
-                return msg;
+                AlarmMessagePayload payload = decodeMessageServiceQueryPayload(parameter, userData);
+                return payload;
             }
             case NOTIFY8:;
                 break;
@@ -761,6 +770,8 @@ private S7Parameter decodeParameter(ByteBuf in, boolean isResponse) {
         switch (parameterType) {
             case CPU_SERVICES:
                 return decodeCpuServicesParameter(in);
+            case MODE_TRANSITION:
+                return decodePushModeTransitionParameter(in);
             case READ_VAR:
             case WRITE_VAR:
                 List<VarParameterItem> varParameterItems;
@@ -788,13 +799,14 @@ private S7Parameter decodeParameter(ByteBuf in, boolean isResponse) {
     }
 
     private CpuServicesParameter decodeCpuServicesParameter(ByteBuf in) {
-        logger.info("decodeCpuServicesParameter: \r\n " + ByteBufUtil.prettyHexDump(in) );
+        
         if(in.readShort() != 0x0112) {
             if (logger.isErrorEnabled()) {
                 logger.error("Expecting 0x0112 for CPU_SERVICES parameter");
             }
             return null;
         }
+        
         byte parameterLength = in.readByte();
         if((parameterLength != 4) && (parameterLength != 8)) {
             if (logger.isErrorEnabled()) {
@@ -819,13 +831,10 @@ private CpuServicesParameter decodeCpuServicesParameter(ByteBuf in) {
             CpuServicesParameterSubFunctionGroup.valueOf(in.readByte());
         byte sequenceNumber = in.readByte();
         if(pushParameter) {
-            logger.info("Es un parametro push...");
             return new CpuServicesPushParameter(functionGroup, subFunctionGroup, sequenceNumber);            
         } else if (requestParameter) {
-            logger.info("Es un parametro de peticiĆ³n...");
             return new CpuServicesRequestParameter(functionGroup, subFunctionGroup, sequenceNumber);
         } else {
-            logger.info("Es un parametro de respuesta...");
             byte dataUnitReferenceNumber = in.readByte();
             boolean lastDataUnit = in.readByte() == 0x00;
             ParameterError error = ParameterError.valueOf(in.readShort());
@@ -834,6 +843,32 @@ private CpuServicesParameter decodeCpuServicesParameter(ByteBuf in) {
         }
     }
 
+    private CpuDiagnosticPushParameter decodePushModeTransitionParameter(ByteBuf in) {
+
+        if(in.readShort() != 0x0010) {
+            if (logger.isErrorEnabled()) {
+                logger.error("Expecting 0x0010 for MODE_TRANSITION parameter");
+            }
+            return null;
+        }
+        
+        byte parameterLength = in.readByte();
+        if((parameterLength != 16)) {
+            if (logger.isErrorEnabled()) {
+                logger.error("Parameter length should be 16, but was {}", parameterLength);
+            }
+            return null;
+        }   
+        CpuUserDataMethodType usermethodtype = CpuUserDataMethodType.valueOf(in.readByte());
+        byte typeandfunc = in.readByte();
+        CpuUserDataParameterType userparamtype = CpuUserDataParameterType.valueOf((byte)(typeandfunc >> 4));
+        CpuUserDataParameterFunctionGroupType userfunction =  CpuUserDataParameterFunctionGroupType.valueOf((byte)(typeandfunc & 0x0f));
+        CpuCurrentModeType cpumode = CpuCurrentModeType.valueOf(in.readByte());
+        byte sequencenumber = in.readByte();
+        return new CpuDiagnosticPushParameter(usermethodtype, userparamtype, userfunction, cpumode, sequencenumber);
+    }    
+    
+    
     private List<VarParameterItem> decodeReadWriteVarParameter(ByteBuf in, byte numItems) {
         List<VarParameterItem> items = new LinkedList<>();
         for (int i = 0; i < numItems; i++) {
@@ -914,7 +949,7 @@ else if(length >= 8) {
     }    
     
     private AlarmMessagePayload decodeMessageServicePayload(CpuServicesParameter parameter, ByteBuf userData){
-        logger.info("userData: \r\n" + ByteBufUtil.prettyHexDump(userData) );
+
         DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
         DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
         int length = userData.readShort();
@@ -938,13 +973,44 @@ private AlarmMessagePayload decodeMessageServicePayload(CpuServicesParameter par
                         null);
     }
     
+    private CpuDiagnosticMessagePayload decodeCpuDiagnosticMessagePayload(CpuServicesParameter parameter, ByteBuf userData){
+
+        LocalDateTime timestamp;
+        DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
+        DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
+        int length = userData.readShort(); //TODO: Validate userData length
+        short EventID = userData.readShort();
+        byte PriorityClass = userData.readByte();
+        byte ObNumber = userData.readByte();
+        short DatID = userData.readShort();
+        short Info1 =  userData.readShort();
+        int Info2 =  userData.readInt();
+        
+        //It is assumed that you have synchronized the time of your PLC with PC.
+        //TODO: Write util function for translate S7 DateTime
+        timestamp = readDateAndTime(userData);
+        
+        CpuDiagnosticMessageItem diagnosticitem = new CpuDiagnosticMessageItem(EventID,
+                                                        PriorityClass,
+                                                        ObNumber,
+                                                        DatID,
+                                                        Info1,
+                                                        Info2,
+                                                        timestamp);
+        
+        return new CpuDiagnosticMessagePayload(returnCode,
+                                    dataTransportSize,
+                                    length,
+                                    diagnosticitem);
+    }    
+    
     private AlarmMessagePayload decodeMessageServicePushPayload(CpuServicesParameter parameter, ByteBuf userData){
-        logger.info("Push userData: \r\n " + ByteBufUtil.prettyHexDump(userData) );
+
         List<MessageObjectItem> MessageObjects = new LinkedList<>();
         List<ByteBuf> values = new LinkedList<>();
         int length;
         //Alarm message
-        Calendar timestamp;
+        LocalDateTime timestamp;
         Byte FunctionID;
         byte NumberOfMessgaeObjects;
         //
@@ -954,19 +1020,11 @@ private AlarmMessagePayload decodeMessageServicePushPayload(CpuServicesParameter
         
         //It is assumed that you have synchronized the time of your PLC with PC.
         //
-        timestamp = Calendar.getInstance();
-        timestamp.set(2000 + userData.readByte(), 
-                userData.readByte()-1, 
-                userData.readByte(), 
-                userData.readByte(), 
-                userData.readByte(), 
-                userData.readByte());
-        int milliseconds = (userData.readShort() & 0xfff8) >> 3;
-        timestamp.setTimeInMillis(timestamp.getTimeInMillis() + milliseconds);
+        timestamp = readDateAndTime(userData);
         
         FunctionID = userData.readByte();
         NumberOfMessgaeObjects = userData.readByte();
-        logger.info("NumberOfMessgaeObjects = " + NumberOfMessgaeObjects);
+
         for (int i = 0; i < NumberOfMessgaeObjects; i++){
             {
                 byte VariableSpecification = userData.readByte();
@@ -980,8 +1038,6 @@ private AlarmMessagePayload decodeMessageServicePushPayload(CpuServicesParameter
                 byte AckStateComming = userData.readByte();
                 
                 List<AssociatedValueItem> AssociatedValues = new LinkedList<>();
-                
-                logger.info("NumberOfValues = " + NumberOfValues);
                         
                 for (int j = 0; j < NumberOfValues; j++){
                     {
@@ -990,8 +1046,9 @@ private AlarmMessagePayload decodeMessageServicePushPayload(CpuServicesParameter
                         int valueLength = userData.readShort();
                         //Max length of value is 12 bytes
                         valueLength = (valueLength >> 4)*2;
-                        logger.info("Numero de valores transferidos = " + valueLength + " Valores disponibles: " + userData.readableBytes());
+                        
                         ByteBuf Data = userData.readBytes(valueLength);
+                        
                         AssociatedValues.add(new AssociatedValueItem(valueCode,
                                                 valueTransportSize,
                                                 valueLength,
@@ -1058,17 +1115,9 @@ private AlarmMessagePayload decodeMessageServiceQueryPayload(CpuServicesParamete
             byte EventState =  userData.readByte();
             byte AckStateGoing = userData.readByte();
             byte AckStateComing = userData.readByte();  
-            Calendar timestampComing;
+            LocalDateTime timestampComing;
             
-            timestampComing = Calendar.getInstance();
-            timestampComing.set(2000 + userData.readByte(), 
-                    userData.readByte()-1, 
-                    userData.readByte(), 
-                    userData.readByte(), 
-                    userData.readByte(), 
-                    userData.readByte());
-            int milliseconds = (userData.readInt() & 0xfff8) >> 3;
-            timestampComing.setTimeInMillis(timestampComing.getTimeInMillis() + milliseconds);            
+            timestampComing = readDateAndTime(userData);       
             
             List<AssociatedValueItem> ComingValues = new LinkedList<>();
             
@@ -1085,17 +1134,9 @@ private AlarmMessagePayload decodeMessageServiceQueryPayload(CpuServicesParamete
                                         Data));                
             }
                                    
-            Calendar timestampGoing;
+            LocalDateTime timestampGoing;
             
-            timestampGoing = Calendar.getInstance();
-            timestampGoing.set(2000 + userData.readByte(), 
-                    userData.readByte()-1, 
-                    userData.readByte(), 
-                    userData.readByte(), 
-                    userData.readByte(), 
-                    userData.readByte());
-            milliseconds = (userData.readInt() & 0xfff8) >> 3;
-            timestampGoing.setTimeInMillis(timestampGoing.getTimeInMillis() + milliseconds); 
+            timestampGoing = readDateAndTime(userData); 
             
             List<AssociatedValueItem> GoingValues = new LinkedList<>();
             
@@ -1216,4 +1257,80 @@ private S7ControllerType lookupControllerType(String articleNumber) {
         }
     }
 
+    /*
+     * Date and time of day (BCD coded).
+     *          +----------------+
+     * Byte n   | Year   0 to 99 |
+     *          +----------------+
+     * Byte n+1 | Month  0 to 12 |
+     *          +----------------+
+     * Byte n+2 | Day    0 to 31 |    
+     *          +----------------+
+     * Byte n+3 | Hour   0 to 23 |    
+     *          +----------------+  
+     * Byte n+4 | Minute 0 to 59 |  
+     *          +----------------+
+     * Byte n+5 | Second 0 to 59 |     
+     *          +----------------+
+     * Byte n+6 | ms    0 to 999 |
+     * Byte n+7 | X X X X X D O W|    
+     *          +----------------+    
+     * DOW: Day of weed (last 3 bits)
+    */
+    private LocalDateTime readDateAndTime(ByteBuf data) {
+        //from Plc4XS7Protocol
+
+        int year=convertByteToBcd(data.readByte());
+        int month=convertByteToBcd(data.readByte());
+        int day=convertByteToBcd(data.readByte());
+        int hour=convertByteToBcd(data.readByte());
+        int minute=convertByteToBcd(data.readByte());
+        int second=convertByteToBcd(data.readByte());        
+        int milliseconds = (data.readShort() & 0xfff0) >> 4;
+        
+        int cen = ((milliseconds & 0x0f00) >> 8) * 100;
+        int dec = ((milliseconds & 0x00f0) >> 4) * 10;
+        milliseconds = cen + dec + (milliseconds & 0x000f);
+        int nanoseconds = milliseconds * 1000000;
+        
+        //data-type ranges from 1990 up to 2089
+        if(year>=90){
+            year+=1900;
+        }
+        else{
+            year+=2000;
+        }
+
+        return LocalDateTime.of(year,month,day,hour,minute,second, nanoseconds);
+    }
+
+    private LocalTime readTimeOfDay(ByteBuf data) {
+        //per definition for Date_And_Time only the first 6 bytes are used
+
+        int millisSinsMidnight = data.readInt();
+
+        return LocalTime.now().withHour(0).withMinute(0).withSecond(0).withNano(0).plus(millisSinsMidnight, ChronoUnit.MILLIS);
+
+    }
+
+    private LocalDate readDate(ByteBuf data) {
+        //per definition for Date_And_Time only the first 6 bytes are used
+
+        int daysSince1990 = data.readUnsignedShort();
+
+        System.out.println(daysSince1990);
+        return LocalDate.now().withYear(1990).withDayOfMonth(1).withMonth(1).plus(daysSince1990, ChronoUnit.DAYS);
+
+    }
+
+    /**
+     * converts incoming byte to an integer regarding used BCD format
+     * @param incomingByte
+     * @return converted BCD number
+     */
+    private static int convertByteToBcd(byte incomingByte) {
+        int dec = (incomingByte >> 4) * 10;
+        return dec + (incomingByte & 0x0f);
+    }    
+    
 }
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7PushMessage.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7PushMessage.java
new file mode 100644
index 00000000000..29835684d3c
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7PushMessage.java
@@ -0,0 +1,28 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.messages;
+
+/**
+ *
+ * @author cgarcia
+ */
+public interface S7PushMessage {
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuDiagnosticPushParameter.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuDiagnosticPushParameter.java
new file mode 100644
index 00000000000..40b364a54c9
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuDiagnosticPushParameter.java
@@ -0,0 +1,87 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.params;
+
+import org.apache.plc4x.java.s7.netty.model.messages.S7PushMessage;
+import org.apache.plc4x.java.s7.netty.model.types.CpuCurrentModeType;
+import org.apache.plc4x.java.s7.netty.model.types.CpuUserDataMethodType;
+import org.apache.plc4x.java.s7.netty.model.types.CpuUserDataParameterFunctionGroupType;
+import org.apache.plc4x.java.s7.netty.model.types.CpuUserDataParameterType;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class CpuDiagnosticPushParameter implements S7Parameter, S7PushMessage {
+    
+    private CpuUserDataMethodType Method;
+    private CpuUserDataParameterType parameterType;
+    private CpuUserDataParameterFunctionGroupType ParameterFunction;
+    private CpuCurrentModeType CurrentMode;
+    private byte sequenceNumber;
+
+    public CpuDiagnosticPushParameter(
+            CpuUserDataMethodType Method, 
+            CpuUserDataParameterType ParameterType, 
+            CpuUserDataParameterFunctionGroupType ParameterFunction, 
+            CpuCurrentModeType CurrentMode, 
+            byte sequenceNumber) {
+        this.Method = Method;
+        this.parameterType = ParameterType;
+        this.ParameterFunction = ParameterFunction;
+        this.CurrentMode = CurrentMode;
+        this.sequenceNumber = sequenceNumber;
+    }
+
+    public CpuUserDataMethodType getMethod() {
+        return Method;
+    }
+
+    public CpuUserDataParameterType getParameterType() {
+        return parameterType;
+    }
+
+    public CpuUserDataParameterFunctionGroupType getParameterFunction() {
+        return ParameterFunction;
+    }
+
+    public CpuCurrentModeType getCurrentMode() {
+        return CurrentMode;
+    }
+
+    @Override
+    public ParameterType getType() {
+        return ParameterType.MODE_TRANSITION;
+    }
+
+    @Override
+    public String toString() {
+        return "CpuDiagnosticPushParameter{" + "Method=" + Method 
+                + ", parameterType=" + parameterType 
+                + ", ParameterFunction=" + ParameterFunction 
+                + ", CurrentMode=" + CurrentMode 
+                + ", sequenceNumber=" + sequenceNumber 
+                + '}';
+    }
+
+
+
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesPushParameter.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesPushParameter.java
index 8d02c60925d..36b93c25b10 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesPushParameter.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesPushParameter.java
@@ -47,5 +47,10 @@ public boolean isLastDataUnit() {
     public ParameterError getError() {
         return error;
     }
+
+    @Override
+    public String toString() {
+        return "CpuServicesPushParameter{" + "dataUnitReferenceNumber=" + dataUnitReferenceNumber + ", lastDataUnit=" + lastDataUnit + ", error=" + error + '}';
+    }
     
 }
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/AlarmMessagePayload.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/AlarmMessagePayload.java
index 77bbf5262f6..1689b705c4d 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/AlarmMessagePayload.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/AlarmMessagePayload.java
@@ -19,6 +19,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 package org.apache.plc4x.java.s7.netty.model.payloads;
 
+import org.apache.plc4x.java.s7.netty.model.messages.S7PushMessage;
 import org.apache.plc4x.java.s7.netty.model.payloads.items.AlarmMessageItem;
 import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
 import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
@@ -28,7 +29,7 @@ Licensed to the Apache Software Foundation (ASF) under one
  *
  * @author cgarcia
  */
-public class AlarmMessagePayload implements S7Payload {
+public class AlarmMessagePayload implements S7Payload, S7PushMessage {
     
     private final DataTransportErrorCode returnCode;
     private final DataTransportSize dataTransportSize;
@@ -73,6 +74,16 @@ public Integer getLength() {
     public AlarmMessageItem getMsg() {
         return msg;
     }
+
+    @Override
+    public String toString() {
+        return "AlarmMessagePayload{" + "returnCode=" + returnCode 
+                + ", dataTransportSize=" + dataTransportSize 
+                + ", msgtype=" + msgtype 
+                + ", length=" + length 
+                + ", msg=" + msg 
+                + '}';
+    }
     
     
     
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuDiagnosticMessagePayload.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuDiagnosticMessagePayload.java
new file mode 100644
index 00000000000..fbf5c35ee54
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuDiagnosticMessagePayload.java
@@ -0,0 +1,82 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.payloads;
+
+import org.apache.plc4x.java.s7.netty.model.messages.S7PushMessage;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.CpuDiagnosticMessageItem;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class CpuDiagnosticMessagePayload implements S7Payload, S7PushMessage {
+    
+    private final DataTransportErrorCode returnCode;
+    private final DataTransportSize dataTransportSize;
+    private final Integer length;
+    private final CpuDiagnosticMessageItem msg;    
+
+    public CpuDiagnosticMessagePayload(DataTransportErrorCode returnCode, DataTransportSize dataTransportSize, Integer length, CpuDiagnosticMessageItem msg) {
+        this.returnCode = returnCode;
+        this.dataTransportSize = dataTransportSize;
+        this.length = length;
+        this.msg = msg;
+    }
+
+    public DataTransportErrorCode getReturnCode() {
+        return returnCode;
+    }
+
+    public DataTransportSize getDataTransportSize() {
+        return dataTransportSize;
+    }
+
+    public Integer getLength() {
+        return length;
+    }
+
+    public CpuDiagnosticMessageItem getMsg() {
+        return msg;
+    }
+
+    @Override
+    public ParameterType getType() {
+        return ParameterType.CPU_SERVICES;
+    }
+
+    @Override
+    public String toString() {
+        return "CpuDiagnosticMessagePayload{" + "returnCode=" + returnCode 
+                + ", dataTransportSize=" + dataTransportSize 
+                + ", length=" + length 
+                + ", msg=" + msg 
+                + '}';
+    }
+
+
+
+
+    
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AlarmMessageItem.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AlarmMessageItem.java
index 5cdefec32b1..50afe30be52 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AlarmMessageItem.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AlarmMessageItem.java
@@ -19,7 +19,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 package org.apache.plc4x.java.s7.netty.model.payloads.items;
 
-import java.util.Calendar;
+import java.time.LocalDateTime;
 import java.util.List;
 import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
 import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
@@ -31,13 +31,13 @@ Licensed to the Apache Software Foundation (ASF) under one
 public class AlarmMessageItem {
     private final DataTransportErrorCode returnCode;
     private final DataTransportSize dataTransportSize;
-    private final Calendar timestamp;
+    private final LocalDateTime timestamp;
     private final byte function;
     private final byte objects;
     private final int Length;
     private final List<MessageObjectItem> msgItems; 
 
-    public AlarmMessageItem(Calendar timestamp, 
+    public AlarmMessageItem(LocalDateTime timestamp, 
             byte function, 
             byte objects, 
             List<MessageObjectItem> msgItems) {
@@ -76,7 +76,7 @@ public DataTransportSize getDataTransportSize() {
         return dataTransportSize;
     }
 
-    public Calendar getTimestamp() {
+    public LocalDateTime getTimestamp() {
         return timestamp;
     }
 
@@ -95,6 +95,18 @@ public int getLength() {
     public List<MessageObjectItem> getMsgItems() {
         return msgItems;
     }
+
+    @Override
+    public String toString() {
+        return "AlarmMessageItem{" + "returnCode=" + returnCode 
+                + ", dataTransportSize=" + dataTransportSize 
+                + ", timestamp=" + timestamp 
+                + ", function=" + function 
+                + ", objects=" + objects 
+                + ", Length=" + Length 
+                + ", msgItems=" + msgItems 
+                + '}';
+    }
     
     
 }
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AssociatedValueItem.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AssociatedValueItem.java
index c9676afd2e6..dfee604a861 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AssociatedValueItem.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AssociatedValueItem.java
@@ -20,6 +20,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 package org.apache.plc4x.java.s7.netty.model.payloads.items;
 
 import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
 import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
 import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
 
@@ -56,9 +57,13 @@ public ByteBuf getData() {
         return Data;
     }
 
-
-
-
-
+    @Override
+    public String toString() {
+        return "AssociatedValueItem{" + "returnCode=" + returnCode 
+                + ", dataTransportSize=" + dataTransportSize 
+                + ", Length=" + Length 
+                + ", Data=" + ByteBufUtil.hexDump(Data) 
+                + '}';
+    }
 
 }
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/CpuDiagnosticMessageItem.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/CpuDiagnosticMessageItem.java
new file mode 100644
index 00000000000..0ed066d9177
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/CpuDiagnosticMessageItem.java
@@ -0,0 +1,95 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.payloads.items;
+
+import java.time.LocalDateTime;
+
+/**
+ * Diagnostic message from PLC, is transfer by payload.
+ * EventID: System specific messages W#16#8xyz and W#16#9xyz.
+ *          User messages W#16#Axyz and W#16#Bxyz
+ *          where x=0 output event, x=1 input event
+ *          and yz hex number in message handler.
+ * 
+ * @author cgarcia
+ */
+public class CpuDiagnosticMessageItem {
+    
+    private final Short EventID;
+    private final Byte PriorityClass;
+    private final Byte ObNumber;
+    private final Short DatID;   
+    private final Short Info1;   
+    private final Integer Info2; 
+    private LocalDateTime TimeStamp;
+    
+    public CpuDiagnosticMessageItem(Short EventID, Byte PriorityClass, Byte ObNumber, Short DatID, Short Info1, Integer Info2, LocalDateTime TimeStamp) {
+        this.EventID = EventID;
+        this.PriorityClass = PriorityClass;
+        this.ObNumber = ObNumber;
+        this.DatID = DatID;
+        this.Info1 = Info1;
+        this.Info2 = Info2;
+        this.TimeStamp = TimeStamp;
+    }
+
+    public Short getEventID() {
+        return EventID;
+    }
+
+    public Byte getPriorityClass() {
+        return PriorityClass;
+    }
+
+    public Byte getObNumber() {
+        return ObNumber;
+    }
+
+    public Short getDatID() {
+        return DatID;
+    }
+
+    public Short getInfo1() {
+        return Info1;
+    }
+
+    public Integer getInfo2() {
+        return Info2;
+    }
+
+    public LocalDateTime getTimeStamp() {
+        return TimeStamp;
+    }
+
+    @Override
+    public String toString() {
+        return "CpuDiagnosticMessageItem{" + "EventID=" + EventID 
+                + ", PriorityClass=" + PriorityClass 
+                + ", ObNumber=" + ObNumber 
+                + ", DatID=" + DatID 
+                + ", Info1=" + Info1 
+                + ", Info2=" + Info2 
+                + ", TimeStamp=" + TimeStamp 
+                + '}';
+    }
+
+
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/MessageObjectItem.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/MessageObjectItem.java
index a8c36458766..081b3460619 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/MessageObjectItem.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/MessageObjectItem.java
@@ -19,6 +19,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 package org.apache.plc4x.java.s7.netty.model.payloads.items;
 
+import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 import java.util.List;
 
@@ -149,6 +150,25 @@ public List<AssociatedValueItem> getGoingValues() {
         return GoingValues;
     }
 
+    @Override
+    public String toString() {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss.SSS");
+        return "MessageObjectItem{" + "VariableSpecification=" + VariableSpecification 
+                + ", Length=" + Length 
+                + ", SyntaxID=" + SyntaxID 
+                + ", NumberOfValues=" + NumberOfValues 
+                + ", EventID=" + EventID 
+                + ", EventState=" + EventState 
+                + ", State=" + State 
+                + ", AckStateGoing=" + AckStateGoing 
+                + ", AckStateComming=" + AckStateComming 
+                + ", TimestampComing=" + TimestampComing
+                + ", TimestampGoing="  + TimestampGoing 
+                + ", ComingValues=" + ComingValues 
+                + ", GoingValues=" + GoingValues 
+                + '}';
+    }
+
 
 
     
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuCurrentModeType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuCurrentModeType.java
new file mode 100644
index 00000000000..626c205ace9
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuCurrentModeType.java
@@ -0,0 +1,83 @@
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.plc4x.java.api.model.PlcField;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum CpuCurrentModeType implements PlcField {
+    
+    STOP("STOP", (byte) 0x00),
+    WARM_RESTART("WARM_RESTART", (byte) 0x01),
+    RUN("RUN", (byte) 0x02),
+    HOT_RESTART("HOT_RESTART", (byte) 0x03),
+    HOLD("HOLD", (byte) 0x04),
+    COLD_RESTART("COLD_RESTART", (byte) 0x06),
+    RUN_R("RUN_R", (byte) 0x09),
+    LINK_UP("LINK_UP", (byte) 0x0b),
+    UPDATE("UPDATE", (byte) 0x0c),
+    ;
+    
+    
+    private static final Map<Byte, CpuCurrentModeType> map;
+    
+    static {
+        map = new HashMap<>();
+        for (CpuCurrentModeType subevent : CpuCurrentModeType.values()) {
+            map.put(subevent.code, subevent);
+        }
+    }    
+    
+    private final String event;
+    private final byte code;
+    
+    CpuCurrentModeType(String event, byte code){
+        this.event = event;
+        this.code = code;
+    }
+    
+    public String getEvent(){
+        return event;
+    }    
+    
+    public byte getCode() {
+        return code;
+    }    
+    
+    public static CpuCurrentModeType valueOfEvent(String event) {
+        for (CpuCurrentModeType value : CpuCurrentModeType.values()) {
+            if(value.getEvent().equals(event)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static CpuCurrentModeType valueOf(byte code) {
+        return map.get(code);
+    }
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuCyclicServicesParameterSubFunctionGroupType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuCyclicServicesParameterSubFunctionGroupType.java
new file mode 100644
index 00000000000..0ad38d55aa2
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuCyclicServicesParameterSubFunctionGroupType.java
@@ -0,0 +1,79 @@
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.plc4x.java.api.model.PlcField;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum CpuCyclicServicesParameterSubFunctionGroupType implements PlcField {
+    
+    CYCLIC_TRANSFER("CYCLIC_TRANSFER", (byte) 0x01),
+    CYCLIC_UNSUBSCRIBE("CYCLIC_UNSUBSCRIBE", (byte) 0x04),
+    CYCLIC_CHANGE("CYCLIC_CHANGE", (byte) 0x05),
+    CYCLIC_CHANGE_MODIFY("CYCLIC_CHANGE_MODIFY", (byte) 0x07),
+    CYCLIC_RDREC("CYCLIC_RDREC", (byte) 0x08),
+    ;
+    
+    
+    private static final Map<Byte, CpuCyclicServicesParameterSubFunctionGroupType> map;
+    
+    static {
+        map = new HashMap<>();
+        for (CpuCyclicServicesParameterSubFunctionGroupType subevent : CpuCyclicServicesParameterSubFunctionGroupType.values()) {
+            map.put(subevent.code, subevent);
+        }
+    }    
+    
+    private final String event;
+    private final byte code;
+    
+    CpuCyclicServicesParameterSubFunctionGroupType(String event, byte code){
+        this.event = event;
+        this.code = code;
+    }
+    
+    public String getEvent(){
+        return event;
+    }    
+    
+    public byte getCode() {
+        return code;
+    }    
+    
+    public static CpuCyclicServicesParameterSubFunctionGroupType valueOfEvent(String event) {
+        for (CpuCyclicServicesParameterSubFunctionGroupType value : CpuCyclicServicesParameterSubFunctionGroupType.values()) {
+            if(value.getEvent().equals(event)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static CpuCyclicServicesParameterSubFunctionGroupType valueOf(byte code) {
+        return map.get(code);
+    }
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuUserDataMethodType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuUserDataMethodType.java
new file mode 100644
index 00000000000..7043e7d7de2
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuUserDataMethodType.java
@@ -0,0 +1,77 @@
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.plc4x.java.api.model.PlcField;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum CpuUserDataMethodType implements PlcField {
+    
+    UNDEF("UNDEF", (byte) 0x00),
+    REQUEST("REQUEST", (byte) 0x11),
+    RESPONSE("RESPONSE", (byte) 0x12),
+    ;
+    
+    
+    private static final Map<Byte, CpuUserDataMethodType> map;
+    
+    static {
+        map = new HashMap<>();
+        for (CpuUserDataMethodType subevent : CpuUserDataMethodType.values()) {
+            map.put(subevent.code, subevent);
+        }
+    }    
+    
+    private final String event;
+    private final byte code;
+    
+    CpuUserDataMethodType(String event, byte code){
+        this.event = event;
+        this.code = code;
+    }
+    
+    public String getEvent(){
+        return event;
+    }    
+    
+    public byte getCode() {
+        return code;
+    }    
+    
+    public static CpuUserDataMethodType valueOfEvent(String event) {
+        for (CpuUserDataMethodType value : CpuUserDataMethodType.values()) {
+            if(value.getEvent().equals(event)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static CpuUserDataMethodType valueOf(byte code) {
+        return map.get(code);
+    }
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuUserDataParameterFunctionGroupType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuUserDataParameterFunctionGroupType.java
new file mode 100644
index 00000000000..b392d26947d
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuUserDataParameterFunctionGroupType.java
@@ -0,0 +1,83 @@
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.plc4x.java.api.model.PlcField;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum CpuUserDataParameterFunctionGroupType implements PlcField {
+    
+    MODE_TRANSITION("MODE_TRANSITION", (byte) 0x00),
+    PROG_COMMANDS("PROG", (byte) 0x01),
+    CYCLIC_SERVICES("CYCLIC_SERVICES", (byte) 0x02),
+    BLOCK_FUNCTIONS("BLOCK", (byte) 0x03),
+    CPU_FUNCTIONS("CPU_FUNCTIONS", (byte) 0x04),
+    SECURITY("SECURITY", (byte) 0x05),
+    PBC("PBC", (byte) 0x06),
+    TIME_FUNCTIONS("TIME_FUNCTIONS", (byte) 0x07),
+    NCPRG("NCPRG", (byte) 0x0f),
+    ;
+    
+    
+    private static final Map<Byte, CpuUserDataParameterFunctionGroupType> map;
+    
+    static {
+        map = new HashMap<>();
+        for (CpuUserDataParameterFunctionGroupType subevent : CpuUserDataParameterFunctionGroupType.values()) {
+            map.put(subevent.code, subevent);
+        }
+    }    
+    
+    private final String event;
+    private final byte code;
+    
+    CpuUserDataParameterFunctionGroupType(String event, byte code){
+        this.event = event;
+        this.code = code;
+    }
+    
+    public String getEvent(){
+        return event;
+    }    
+    
+    public byte getCode() {
+        return code;
+    }    
+    
+    public static CpuUserDataParameterFunctionGroupType valueOfEvent(String event) {
+        for (CpuUserDataParameterFunctionGroupType value : CpuUserDataParameterFunctionGroupType.values()) {
+            if(value.getEvent().equals(event)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static CpuUserDataParameterFunctionGroupType valueOf(byte code) {
+        return map.get(code);
+    }
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuUserDataParameterType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuUserDataParameterType.java
new file mode 100644
index 00000000000..d51fc26ff1a
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuUserDataParameterType.java
@@ -0,0 +1,80 @@
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.plc4x.java.api.model.PlcField;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum CpuUserDataParameterType implements PlcField {
+    
+    PUSH("PUSH", (byte) 0x00),
+    REQUEST("REQUEST", (byte) 0x04),
+    RESPONSE("RESPONSE", (byte) 0x08),
+    NCPUSH("BLOCK", (byte) 0x03),
+    NCREQUEST("CPU_FUNCTIONS", (byte) 0x07),
+    NCRESPONSE("SECURITY", (byte) 0x0B),
+    ;
+    
+    
+    private static final Map<Byte, CpuUserDataParameterType> map;
+    
+    static {
+        map = new HashMap<>();
+        for (CpuUserDataParameterType subevent : CpuUserDataParameterType.values()) {
+            map.put(subevent.code, subevent);
+        }
+    }    
+    
+    private final String event;
+    private final byte code;
+    
+    CpuUserDataParameterType(String event, byte code){
+        this.event = event;
+        this.code = code;
+    }
+    
+    public String getEvent(){
+        return event;
+    }    
+    
+    public byte getCode() {
+        return code;
+    }    
+    
+    public static CpuUserDataParameterType valueOfEvent(String event) {
+        for (CpuUserDataParameterType value : CpuUserDataParameterType.values()) {
+            if(value.getEvent().equals(event)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static CpuUserDataParameterType valueOf(byte code) {
+        return map.get(code);
+    }
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterType.java
index 16a565cf619..ed7da61b4a3 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterType.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterType.java
@@ -18,17 +18,17 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.plc4x.java.s7.netty.model.types;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.HashMap;
 import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * (Values determined by evaluating generated ".pcap" files)
  */
 public enum ParameterType {
     CPU_SERVICES((byte) 0x00),
+    MODE_TRANSITION((byte) 0x01),
     READ_VAR((byte) 0x04),
     WRITE_VAR((byte) 0x05),
     REQUEST_DOWNLOAD((byte) 0x1A),
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelper.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelper.java
index 4a3313d32e7..0010d7871c1 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelper.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelper.java
@@ -94,6 +94,8 @@ public static short getParameterLength(S7Parameter parameter) {
         }
 
         switch (parameter.getType()) {
+            case MODE_TRANSITION:
+                return 8;
             case READ_VAR:
             case WRITE_VAR:
                 return getReadWriteVarParameterLength((VarParameter) parameter);
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7DiagnosticEventId.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7DiagnosticEventId.java
new file mode 100644
index 00000000000..087ae85d53b
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7DiagnosticEventId.java
@@ -0,0 +1,492 @@
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.utils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum S7DiagnosticEventId {
+
+    EVENTID_0x113A((short) 0x113A, "Start request for cyclic interrupt OB with special handling (S7-300 only)"),
+    EVENTID_0x1155((short) 0x1155, "Status alarm for PROFIBUS DP"),
+    EVENTID_0x1156((short) 0x1156, "Update interrupt for PROFIBUS DP"),
+    EVENTID_0x1157((short) 0x1157, "Manufacturer interrupt for PROFIBUS DP"),
+    EVENTID_0x1158((short) 0x1158, "Status interrupt for PROFINET IO"),
+    EVENTID_0x1159((short) 0x1159, "Update interrupt for PROFINET IO"),
+    EVENTID_0x115A((short) 0x115A, "Manufacturer interrupt for PROFINET IO"),
+    EVENTID_0x115B((short) 0x115B, "IO: Profile-specific interrupt"),
+    EVENTID_0x116A((short) 0x116A, "Technology synchronization interrupt"),
+    EVENTID_0x1381((short) 0x1381, "Request for manual warm restart"),
+    EVENTID_0x1382((short) 0x1382, "Request for automatic warm restart"),
+    EVENTID_0x1383((short) 0x1383, "Request for manual hot restart"),
+    EVENTID_0x1384((short) 0x1384, "Request for automatic hot restart"),
+    EVENTID_0x1385((short) 0x1385, "Request for manual cold restart"),
+    EVENTID_0x1386((short) 0x1386, "Request for automatic cold restart"),
+    EVENTID_0x1387((short) 0x1387, "Master CPU: request for manual cold restart"),
+    EVENTID_0x1388((short) 0x1388, "Master CPU: request for automatic cold restart"),
+    EVENTID_0x138A((short) 0x138A, "Master CPU: request for manual warm restart"),
+    EVENTID_0x138B((short) 0x138B, "Master CPU: request for automatic warm restart"),
+    EVENTID_0x138C((short) 0x138C, "Standby CPU: request for manual hot restart"),
+    EVENTID_0x138D((short) 0x138D, "Standby CPU: request for automatic hot restart"),
+    EVENTID_0x2521((short) 0x2521, "BCD conversion error"),
+    EVENTID_0x2522((short) 0x2522, "Area length error when reading"),
+    EVENTID_0x2523((short) 0x2523, "Area length error when writing"),
+    EVENTID_0x2524((short) 0x2524, "Area error when reading"),
+    EVENTID_0x2525((short) 0x2525, "Area error when writing"),
+    EVENTID_0x2526((short) 0x2526, "Timer number error"),
+    EVENTID_0x2527((short) 0x2527, "Counter number error"),
+    EVENTID_0x2528((short) 0x2528, "Alignment error when reading"),
+    EVENTID_0x2529((short) 0x2529, "Alignment error when writing"),
+    EVENTID_0x2530((short) 0x2530, "Write error when accessing the DB"),
+    EVENTID_0x2531((short) 0x2531, "Write error when accessing the DI"),
+    EVENTID_0x2532((short) 0x2532, "Block number error when opening a DB"),
+    EVENTID_0x2533((short) 0x2533, "Block number error when opening a DI"),
+    EVENTID_0x2534((short) 0x2534, "Block number error when calling an FC"),
+    EVENTID_0x2535((short) 0x2535, "Block number error when calling an FB"),
+    EVENTID_0x253A((short) 0x253A, "DB not loaded"),
+    EVENTID_0x253C((short) 0x253C, "FC not loaded"),
+    EVENTID_0x253D((short) 0x253D, "SFC not loaded"),
+    EVENTID_0x253E((short) 0x253E, "FB not loaded"),
+    EVENTID_0x253F((short) 0x253F, "SFB not loaded"),
+    EVENTID_0x2942((short) 0x2942, "I/O access error, reading"),
+    EVENTID_0x2943((short) 0x2943, "I/O access error, writing"),
+    EVENTID_0x3267((short) 0x3267, "End of module reconfiguration"),
+    EVENTID_0x3367((short) 0x3367, "Start of module reconfiguration"),
+    EVENTID_0x34A4((short) 0x34A4, "PROFInet Interface DB can be addressed again"),
+    EVENTID_0x3501((short) 0x3501, "Cycle time exceeded"),
+    EVENTID_0x3502((short) 0x3502, "User interface (OB or FRB) request error"),
+    EVENTID_0x3503((short) 0x3503, "Delay too long processing a priority class"),
+    EVENTID_0x3505((short) 0x3505, "Time-of-day interrupt(s) skipped due to new clock setting"),
+    EVENTID_0x3506((short) 0x3506, "Time-of-day interrupt(s) skipped when changing to RUN after HOLD"),
+    EVENTID_0x3507((short) 0x3507, "Multiple OB request errors caused internal buffer overflow"),
+    EVENTID_0x3508((short) 0x3508, "Synchronous cycle interrupt-timing error"),
+    EVENTID_0x3509((short) 0x3509, "Interrupt loss due to excess interrupt load"),
+    EVENTID_0x350A((short) 0x350A, "Resume RUN mode after CiR"),
+    EVENTID_0x350B((short) 0x350B, "Technology synchronization interrupt - timing error"),
+    EVENTID_0x3571((short) 0x3571, "Nesting depth too high in nesting levels"),
+    EVENTID_0x3572((short) 0x3572, "Nesting depth for Master Control Relays too high"),
+    EVENTID_0x3573((short) 0x3573, "Nesting depth too high after synchronous errors"),
+    EVENTID_0x3574((short) 0x3574, "Nesting depth for block calls (U stack) too high"),
+    EVENTID_0x3575((short) 0x3575, "Nesting depth for block calls (B stack) too high"),
+    EVENTID_0x3576((short) 0x3576, "Local data allocation error"),
+    EVENTID_0x3578((short) 0x3578, "Unknown instruction"),
+    EVENTID_0x357A((short) 0x357A, "Jump instruction to target outside of the block"),
+    EVENTID_0x3582((short) 0x3582, "Memory error detected and corrected by operating system"),
+    EVENTID_0x3583((short) 0x3583, "Accumulation of detected and corrected memo errors"),
+    EVENTID_0x3585((short) 0x3585, "Error in the PC operating system (only for LC RTX)"),
+    EVENTID_0x3587((short) 0x3587, "Multi-bit memory error detected and corrected"),
+    EVENTID_0x35A1((short) 0x35A1, "User interface (OB or FRB) not found"),
+    EVENTID_0x35A2((short) 0x35A2, "OB not loaded (started by SFC or operating system due to configuration)"),
+    EVENTID_0x35A3((short) 0x35A3, "Error when operating system accesses a block"),
+    EVENTID_0x35A4((short) 0x35A4, "PROFInet Interface DB cannot be addressed"),
+    EVENTID_0x35D2((short) 0x35D2, "Diagnostic entries cannot be sent at present"),
+    EVENTID_0x35D3((short) 0x35D3, "Synchronization frames cannot be sent"),
+    EVENTID_0x35D4((short) 0x35D4, "Illegal time jump resulting from synchronization"),
+    EVENTID_0x35D5((short) 0x35D5, "Error adopting the synchronization time"),
+    EVENTID_0x35E1((short) 0x35E1, "Incorrect frame ID in GD"),
+    EVENTID_0x35E2((short) 0x35E2, "GD packet status cannot be entered in DB"),
+    EVENTID_0x35E3((short) 0x35E3, "Frame length error in GD"),
+    EVENTID_0x35E4((short) 0x35E4, "Illegal GD packet number received"),
+    EVENTID_0x35E5((short) 0x35E5, "Error accessing DB in communication SFBs for configured S7 connections"),
+    EVENTID_0x35E6((short) 0x35E6, "GD total status cannot be entered in DB"),
+    EVENTID_0x3821((short) 0x3821, "BATTF: failure on at least one backup battery of the central rack, problem eliminated"),
+    EVENTID_0x3822((short) 0x3822, "BAF: failure of backup voltage on central rack, problem eliminated"),
+    EVENTID_0x3823((short) 0x3823, "24 volt supply failure on central rack, problem eliminated"),
+    EVENTID_0x3825((short) 0x3825, "BATTF: failure on at least one backup battery of the redundant central rack, problem eliminated"),
+    EVENTID_0x3826((short) 0x3826, "BAF: failure of backup voltage on redundant central rack, problem eliminated"),
+    EVENTID_0x3827((short) 0x3827, "24 volt supply failure on redundant central rack, problem eliminated"),
+    EVENTID_0x3831((short) 0x3831, "BATTF: failure of at least one backup battery of the expansion rack, problem eliminated"),
+    EVENTID_0x3832((short) 0x3832, "BAF: failure of backup voltage on expansion rack, problem eliminated"),
+    EVENTID_0x3833((short) 0x3833, "24 volt supply failure on at least one expansion rack, problem eliminated"),
+    EVENTID_0x3842((short) 0x3842, "Module OK"),
+    EVENTID_0x3854((short) 0x3854, "PROFINET IO interface submodule/submodule and matches the configured interface submodule/submodule"),
+    EVENTID_0x3855((short) 0x3855, "PROFINET IO interface submodule/submodule inserted, but does not match the configured interface submodule/submodule"),
+    EVENTID_0x3856((short) 0x3856, "PROFINET IO interface submodule/submodule inserted, but error in module parameter assignment"),
+    EVENTID_0x3858((short) 0x3858, "PROFINET IO interface submodule access error corrected"),
+    EVENTID_0x3861((short) 0x3861, "Module/interface module inserted, module type OK"),
+    EVENTID_0x3863((short) 0x3863, "Module/interface module plugged in, but wrong module type"),
+    EVENTID_0x3864((short) 0x3864, "Module/interface module plugged in, but causing problem (type ID unreadable)"),
+    EVENTID_0x3865((short) 0x3865, "Module plugged in, but error in module parameter assignment"),
+    EVENTID_0x3866((short) 0x3866, "Module can be addressed again, load voltage error removed"),
+    EVENTID_0x3881((short) 0x3881, "Interface error leaving state"),
+    EVENTID_0x3884((short) 0x3884, "Interface module plugged in"),
+    EVENTID_0x38B3((short) 0x38B3, "I/O access error when updating the process image input table"),
+    EVENTID_0x38B4((short) 0x38B4, "I/O access error when transferring the process image to the output modules"),
+    EVENTID_0x38C1((short) 0x38C1, "Expansion rack operational again (1 to 21), leaving state"),
+    EVENTID_0x38C2((short) 0x38C2, "Expansion rack operational again but mismatch between setpoint and actual configuration"),
+    EVENTID_0x38C4((short) 0x38C4, "Distributed I/Os: station failure, leaving state"),
+    EVENTID_0x38C5((short) 0x38C5, "Distributed I/Os: station fault, leaving state"),
+    EVENTID_0x38C6((short) 0x38C6, "Expansion rack operational again, but error(s) in module parameter assignment"),
+    EVENTID_0x38C7((short) 0x38C7, "DP: station operational again, but error(s) in module parameter assignment"),
+    EVENTID_0x38C8((short) 0x38C8, "DP: station operational again, but mismatch between setpoint and actual configuration"),
+    EVENTID_0x38CB((short) 0x38CB, "PROFINET IO station operational again"),
+    EVENTID_0x38CC((short) 0x38CC, "PROFINET IO station error corrected"),
+    EVENTID_0x3921((short) 0x3921, "BATTF: failure on at least one backup battery of the central rack"),
+    EVENTID_0x3922((short) 0x3922, "BAF: failure of backup voltage on central rack"),
+    EVENTID_0x3923((short) 0x3923, "24 volt supply failure on central rack"),
+    EVENTID_0x3925((short) 0x3925, "BATTF: failure on at least one backup battery of the redundant central rack"),
+    EVENTID_0x3926((short) 0x3926, "BAF: failure of backup voltage on redundant central rack"),
+    EVENTID_0x3927((short) 0x3927, "24 volt supply failure on redundant central rack"),
+    EVENTID_0x3931((short) 0x3931, "BATTF: failure of at least one backup battery of the expansion rack"),
+    EVENTID_0x3932((short) 0x3932, "BAF: failure of backup voltage on expansion rack"),
+    EVENTID_0x3933((short) 0x3933, "24 volt supply failure on at least one expansion rack"),
+    EVENTID_0x3942((short) 0x3942, "Module error"),
+    EVENTID_0x3951((short) 0x3951, "PROFINET IO submodule removed"),
+    EVENTID_0x3954((short) 0x3954, "PROFINET IO interface submodule/submodule removed"),
+    EVENTID_0x3961((short) 0x3961, "Module/interface module removed, cannot be addressed"),
+    EVENTID_0x3966((short) 0x3966, "Module cannot be addressed, load voltage error"),
+    EVENTID_0x3968((short) 0x3968, "Module reconfiguration has ended with error"),
+    EVENTID_0x3981((short) 0x3981, "Interface error entering state"),
+    EVENTID_0x3984((short) 0x3984, "Interface module removed"),
+    EVENTID_0x3986((short) 0x3986, "Performance of an H-Sync link negatively affected"),
+    EVENTID_0x39B1((short) 0x39B1, "I/O access error when updating the process image input table"),
+    EVENTID_0x39B2((short) 0x39B2, "I/O access error when transferring the process image to the output modules"),
+    EVENTID_0x39B3((short) 0x39B3, "I/O access error when updating the process image input table"),
+    EVENTID_0x39B4((short) 0x39B4, "I/O access error when transferring the process image to the output modules"),
+    EVENTID_0x39C1((short) 0x39C1, "Expansion rack failure (1 to 21), entering state"),
+    EVENTID_0x39C3((short) 0x39C3, "Distributed I/Os: master system failure entering state"),
+    EVENTID_0x39C4((short) 0x39C4, "Distributed I/Os: station failure, entering state"),
+    EVENTID_0x39C5((short) 0x39C5, "Distributed I/Os: station fault, entering state"),
+    EVENTID_0x39CA((short) 0x39CA, "PROFINET IO system failure"),
+    EVENTID_0x39CB((short) 0x39CB, "PROFINET IO station failure"),
+    EVENTID_0x39CC((short) 0x39CC, "PROFINET IO station error"),
+    EVENTID_0x39CD((short) 0x39CD, "PROFINET IO station operational again, but expected configuration does not match actual configuration"),
+    EVENTID_0x39CE((short) 0x39CE, "PROFINET IO station operational again, but error(s) in module parameter assignment"),
+    EVENTID_0x42F3((short) 0x42F3, "Checksum error detected and corrected by the operating system"),
+    EVENTID_0x42F4((short) 0x42F4, "Standby CPU: connection/update via SFC90 is locked in the master CPU"),
+    EVENTID_0x4300((short) 0x4300, "Backed-up power on"),
+    EVENTID_0x4301((short) 0x4301, "Mode transition from STOP to STARTUP"),
+    EVENTID_0x4302((short) 0x4302, "Mode transition from STARTUP to RUN"),
+    EVENTID_0x4303((short) 0x4303, "STOP caused by stop switch being activated"),
+    EVENTID_0x4304((short) 0x4304, "STOP caused by PG STOP operation or by SFB 20 STOP"),
+    EVENTID_0x4305((short) 0x4305, "HOLD: breakpoint reached"),
+    EVENTID_0x4306((short) 0x4306, "HOLD: breakpoint exited"),
+    EVENTID_0x4307((short) 0x4307, "Memory reset started by PG operation"),
+    EVENTID_0x4308((short) 0x4308, "Memory reset started by switch setting"),
+    EVENTID_0x4309((short) 0x4309, "Memory reset started automatically (power on not backed up)"),
+    EVENTID_0x430A((short) 0x430A, "HOLD exited, transition to STOP"),
+    EVENTID_0x430D((short) 0x430D, "STOP caused by other CPU in multicomputing"),
+    EVENTID_0x430E((short) 0x430E, "Memory reset executed"),
+    EVENTID_0x430F((short) 0x430F, "STOP on the module due to STOP on a CPU"),
+    EVENTID_0x4318((short) 0x4318, "Start of CiR"),
+    EVENTID_0x4319((short) 0x4319, "CiR completed"),
+    EVENTID_0x4357((short) 0x4357, "Module watchdog started"),
+    EVENTID_0x4358((short) 0x4358, "All modules are ready for operation"),
+    EVENTID_0x43B0((short) 0x43B0, "Firmware update was successful"),
+    EVENTID_0x43B4((short) 0x43B4, "Error in firmware fuse"),
+    EVENTID_0x43B6((short) 0x43B6, "Firmware updates canceled by redundant modules"),
+    EVENTID_0x43D3((short) 0x43D3, "STOP on standby CPU"),
+    EVENTID_0x43DC((short) 0x43DC, "Abort during link-up with switchover"),
+    EVENTID_0x43DE((short) 0x43DE, "Updating aborted due to monitoring time being exceeded during the n-th attempt, new update attempt initiated"),
+    EVENTID_0x43DF((short) 0x43DF, "Updating aborted for final time due to monitoring time being exceeded after completing the maximum amount of attempts. User intervention required"),
+    EVENTID_0x43E0((short) 0x43E0, "Change from solo mode after link-up"),
+    EVENTID_0x43E1((short) 0x43E1, "Change from link-up after updating"),
+    EVENTID_0x43E2((short) 0x43E2, "Change from updating to redundant mode"),
+    EVENTID_0x43E3((short) 0x43E3, "Master CPU: change from redundant mode to solo mode"),
+    EVENTID_0x43E4((short) 0x43E4, "Standby CPU: change from redundant mode after error-search mode"),
+    EVENTID_0x43E5((short) 0x43E5, "Standby CPU: change from error-search mode after link-up or STOP"),
+    EVENTID_0x43E6((short) 0x43E6, "Link-up aborted on the standby CPU"),
+    EVENTID_0x43E7((short) 0x43E7, "Updating aborted on the standby CPU"),
+    EVENTID_0x43E8((short) 0x43E8, "Standby CPU: change from link-up after startup"),
+    EVENTID_0x43E9((short) 0x43E9, "Standby CPU: change from startup after updating"),
+    EVENTID_0x43F1((short) 0x43F1, "Reserve-master switchover"),
+    EVENTID_0x43F2((short) 0x43F2, "Coupling of incompatible H-CPUs blocked by system program"),
+    EVENTID_0x4510((short) 0x4510, "STOP violation of the CPU's data range"),
+    EVENTID_0x4520((short) 0x4520, "DEFECTIVE: STOP not possible"),
+    EVENTID_0x4521((short) 0x4521, "DEFECTIVE: failure of instruction processing processor"),
+    EVENTID_0x4522((short) 0x4522, "DEFECTIVE: failure of clock chip"),
+    EVENTID_0x4523((short) 0x4523, "DEFECTIVE: failure of clock pulse generator"),
+    EVENTID_0x4524((short) 0x4524, "DEFECTIVE: failure of timer update function"),
+    EVENTID_0x4525((short) 0x4525, "DEFECTIVE: failure of multicomputing synchronization"),
+    EVENTID_0x4527((short) 0x4527, "DEFECTIVE: failure of I/O access monitoring"),
+    EVENTID_0x4528((short) 0x4528, "DEFECTIVE: failure of scan time monitoring"),
+    EVENTID_0x4530((short) 0x4530, "DEFECTIVE: memory test error in internal memory"),
+    EVENTID_0x4532((short) 0x4532, "DEFECTIVE: failure of core resources"),
+    EVENTID_0x4536((short) 0x4536, "DEFECTIVE: switch defective"),
+    EVENTID_0x4540((short) 0x4540, "STOP: Memory expansion of the internal work memory has gaps. First memory expansion too small or missing"),
+    EVENTID_0x4541((short) 0x4541, "STOP caused by priority class system"),
+    EVENTID_0x4542((short) 0x4542, "STOP caused by object management system"),
+    EVENTID_0x4543((short) 0x4543, "STOP caused by test functions"),
+    EVENTID_0x4544((short) 0x4544, "STOP caused by diagnostic system"),
+    EVENTID_0x4545((short) 0x4545, "STOP caused by communication system"),
+    EVENTID_0x4546((short) 0x4546, "STOP caused by CPU memory management"),
+    EVENTID_0x4547((short) 0x4547, "STOP caused by process image management"),
+    EVENTID_0x4548((short) 0x4548, "STOP caused by I/O management"),
+    EVENTID_0x454A((short) 0x454A, "STOP caused by configuration: an OB deselected with STEP 7 was being loaded into the CPU during STARTUP"),
+    EVENTID_0x4550((short) 0x4550, "DEFECTIVE: internal system error"),
+    EVENTID_0x4555((short) 0x4555, "No restart possible, monitoring time elapsed"),
+    EVENTID_0x4556((short) 0x4556, "STOP: memory reset request from communication system / due to data inconsistency"),
+    EVENTID_0x4562((short) 0x4562, "STOP caused by programming error (OB not loaded or not possible)"),
+    EVENTID_0x4563((short) 0x4563, "STOP caused by I/O access error (OB not loaded or not possible)"),
+    EVENTID_0x4567((short) 0x4567, "STOP caused by H event"),
+    EVENTID_0x4568((short) 0x4568, "STOP caused by time error (OB not loaded or not possible)"),
+    EVENTID_0x456A((short) 0x456A, "STOP caused by diagnostic interrupt (OB not loaded or not possible)"),
+    EVENTID_0x456B((short) 0x456B, "STOP caused by removing/inserting module (OB not loaded or not possible)"),
+    EVENTID_0x456C((short) 0x456C, "STOP caused by CPU hardware error (OB not loaded or not possible, or no FRB)"),
+    EVENTID_0x456D((short) 0x456D, "STOP caused by program sequence error (OB not loaded or not possible)"),
+    EVENTID_0x456E((short) 0x456E, "STOP caused by communication error (OB not loaded or not possible)"),
+    EVENTID_0x456F((short) 0x456F, "STOP caused by rack failure OB (OB not loaded or not possible)"),
+    EVENTID_0x4570((short) 0x4570, "STOP caused by process interrupt (OB not loaded or not possible)"),
+    EVENTID_0x4571((short) 0x4571, "STOP caused by nesting stack error"),
+    EVENTID_0x4572((short) 0x4572, "STOP caused by master control relay stack error"),
+    EVENTID_0x4573((short) 0x4573, "STOP caused by exceeding the nesting depth for synchronous errors"),
+    EVENTID_0x4574((short) 0x4574, "STOP caused by exceeding interrupt stack nesting depth in the priority class stack"),
+    EVENTID_0x4575((short) 0x4575, "STOP caused by exceeding block stack nesting depth in the priority class stack"),
+    EVENTID_0x4576((short) 0x4576, "STOP caused by error when allocating the local data"),
+    EVENTID_0x4578((short) 0x4578, "STOP caused by unknown opcode"),
+    EVENTID_0x457A((short) 0x457A, "STOP caused by code length error"),
+    EVENTID_0x457B((short) 0x457B, "STOP caused by DB not being loaded on on-board I/Os"),
+    EVENTID_0x457D((short) 0x457D, "Reset/clear request because the version of the internal interface to the integrated technology was changed"),
+    EVENTID_0x457F((short) 0x457F, "STOP caused by STOP command"),
+    EVENTID_0x4580((short) 0x4580, "STOP: back-up buffer contents inconsistent (no transition to RUN)"),
+    EVENTID_0x4590((short) 0x4590, "STOP caused by overloading the internal functions"),
+    EVENTID_0x45D5((short) 0x45D5, "LINK-UP rejected due to mismatched CPU memory configuration of the sub-PLC"),
+    EVENTID_0x45D6((short) 0x45D6, "LINK-UP rejected due to mismatched system program of the sub-PLC"),
+    EVENTID_0x45D8((short) 0x45D8, "DEFECTIVE: hardware fault detected due to other error"),
+    EVENTID_0x45D9((short) 0x45D9, "STOP due to SYNC module error"),
+    EVENTID_0x45DA((short) 0x45DA, "STOP due to synchronization error between H CPUs"),
+    EVENTID_0x45DD((short) 0x45DD, "LINK-UP rejected due to running test or other online functions"),
+    EVENTID_0x4926((short) 0x4926, "DEFECTIVE: failure of the watchdog for I/O access"),
+    EVENTID_0x4931((short) 0x4931, "STOP or DEFECTIVE: memory test error in memory submodule"),
+    EVENTID_0x4933((short) 0x4933, "Checksum error"),
+    EVENTID_0x4934((short) 0x4934, "DEFECTIVE: memory not available"),
+    EVENTID_0x4935((short) 0x4935, "DEFECTIVE: cancelled by watchdog/processor exceptions"),
+    EVENTID_0x4949((short) 0x4949, "STOP caused by continuous hardware interrupt"),
+    EVENTID_0x494D((short) 0x494D, "STOP caused by I/O error"),
+    EVENTID_0x494E((short) 0x494E, "STOP caused by power failure"),
+    EVENTID_0x494F((short) 0x494F, "STOP caused by configuration error"),
+    EVENTID_0x4959((short) 0x4959, "One or more modules not ready for operation"),
+    EVENTID_0x497C((short) 0x497C, "STOP caused by integrated technology"),
+    EVENTID_0x49A0((short) 0x49A0, "STOP caused by parameter assignment error or non-permissible variation of setpoint and actual extension: Start-up blocked"),
+    EVENTID_0x49A1((short) 0x49A1, "STOP caused by parameter assignment error: memory reset request"),
+    EVENTID_0x49A2((short) 0x49A2, "STOP caused by error in parameter modification: startup disabled"),
+    EVENTID_0x49A3((short) 0x49A3, "STOP caused by error in parameter modification: memory reset request"),
+    EVENTID_0x49A4((short) 0x49A4, "STOP: inconsistency in configuration data"),
+    EVENTID_0x49A5((short) 0x49A5, "STOP: distributed I/Os: inconsistency in the loaded configuration information"),
+    EVENTID_0x49A6((short) 0x49A6, "STOP: distributed I/Os: invalid configuration information"),
+    EVENTID_0x49A7((short) 0x49A7, "STOP: distributed I/Os: no configuration information"),
+    EVENTID_0x49A8((short) 0x49A8, "STOP: error indicated by the interface module for the distributed I/Os"),
+    EVENTID_0x49B1((short) 0x49B1, "Firmware update data incorrect"),
+    EVENTID_0x49B2((short) 0x49B2, "Firmware update: hardware version does not match firmware"),
+    EVENTID_0x49B3((short) 0x49B3, "Firmware update: module type does not match firmware"),
+    EVENTID_0x49D0((short) 0x49D0, "LINK-UP aborted due to violation of coordination rules"),
+    EVENTID_0x49D1((short) 0x49D1, "LINK-UP/UPDATE sequence aborted"),
+    EVENTID_0x49D2((short) 0x49D2, "Standby CPU changed to STOP due to STOP on the master CPU during link-up"),
+    EVENTID_0x49D4((short) 0x49D4, "STOP on a master, since partner CPU is also a master (link-up error)"),
+    EVENTID_0x49D7((short) 0x49D7, "LINK-UP rejected due to change in user program or in configuration"),
+    EVENTID_0x510F((short) 0x510F, "A problem as occurred with WinLC. This problem has caused the CPU to go into STOP mode or has caused a fault in the CPU"),
+    EVENTID_0x530D((short) 0x530D, "New startup information in the STOP mode"),
+    EVENTID_0x5311((short) 0x5311, "Startup despite Not Ready message from module(s)"),
+    EVENTID_0x5371((short) 0x5371, "Distributed I/Os: end of the synchronization with a DP master"),
+    EVENTID_0x5380((short) 0x5380, "Diagnostic buffer entries of interrupt and asynchronous errors disabled"),
+    EVENTID_0x5395((short) 0x5395, "Distributed I/Os: reset of a DP master"),
+    EVENTID_0x53A2((short) 0x53A2, "Download of technology firmware successful"),
+    EVENTID_0x53A4((short) 0x53A4, "Download of technology DB not successful"),
+    EVENTID_0x53FF((short) 0x53FF, "Reset to factory setting"),
+    EVENTID_0x5445((short) 0x5445, "Start of System reconfiguration in RUN mode"),
+    EVENTID_0x5481((short) 0x5481, "All licenses for runtime software are complete again"),
+    EVENTID_0x5498((short) 0x5498, "No more inconsistency with DP master systems due to CiR"),
+    EVENTID_0x5545((short) 0x5545, "Start of System reconfiguration in RUN mode"),
+    EVENTID_0x5581((short) 0x5581, "One or several licenses for runtime software are missing"),
+    EVENTID_0x558A((short) 0x558A, "Difference between the MLFB of the configured and inserted CPU"),
+    EVENTID_0x558B((short) 0x558B, "Difference in the firmware version of the configured and inserted CPU"),
+    EVENTID_0x5598((short) 0x5598, "Start of possible inconsistency with DP master systems due to CiR"),
+    EVENTID_0x55A5((short) 0x55A5, "Version conflict: internal interface with integrated technology"),
+    EVENTID_0x55A6((short) 0x55A6, "The maximum number of technology objects has been exceeded"),
+    EVENTID_0x55A7((short) 0x55A7, "A technology DB of this type is already present"),
+    EVENTID_0x5879((short) 0x5879, "Diagnostic message from DP interface: EXTF LED off"),
+    EVENTID_0x5960((short) 0x5960, "Parameter assignment error when switching"),
+    EVENTID_0x5961((short) 0x5961, "Parameter assignment error"),
+    EVENTID_0x5962((short) 0x5962, "Parameter assignment error preventing startup"),
+    EVENTID_0x5963((short) 0x5963, "Parameter assignment error with memory reset request"),
+    EVENTID_0x5966((short) 0x5966, "Parameter assignment error when switching"),
+    EVENTID_0x5969((short) 0x5969, "Parameter assignment error with startup blocked"),
+    EVENTID_0x596A((short) 0x596A, "PROFINET IO: IP address of an IO device already present"),
+    EVENTID_0x596B((short) 0x596B, "IP address of an Ethernet interface already exists"),
+    EVENTID_0x596C((short) 0x596C, "Name of an Ethernet interface already exists"),
+    EVENTID_0x596D((short) 0x596D, "The existing network configuration does not mach the system requirements or configuration"),
+    EVENTID_0x5979((short) 0x5979, "Diagnostic message from DP interface: EXTF LED on"),
+    EVENTID_0x597C((short) 0x597C, "DP Global Control command failed or moved"),
+    EVENTID_0x59A0((short) 0x59A0, "The interrupt can not be associated in the CPU"),
+    EVENTID_0x59A1((short) 0x59A1, "Configuration error in the integrated technology"),
+    EVENTID_0x59A3((short) 0x59A3, "Error when downloading the integrated technology"),
+    EVENTID_0x6253((short) 0x6253, "Firmware update: End of firmware download over the network"),
+    EVENTID_0x6316((short) 0x6316, "Interface error when starting programmable controller"),
+    EVENTID_0x6353((short) 0x6353, "Firmware update: Start of firmware download over the network"),
+    EVENTID_0x6390((short) 0x6390, "Formatting of Micro Memory Card complete"),
+    EVENTID_0x6500((short) 0x6500, "Connection ID exists twice on module"),
+    EVENTID_0x6501((short) 0x6501, "Connection resources inadequate"),
+    EVENTID_0x6502((short) 0x6502, "Error in the connection description"),
+    EVENTID_0x6510((short) 0x6510, "CFB structure error detected in instance DB when evaluating EPROM"),
+    EVENTID_0x6514((short) 0x6514, "GD packet number exists twice on the module"),
+    EVENTID_0x6515((short) 0x6515, "Inconsistent length specifications in GD configuration information"),
+    EVENTID_0x6521((short) 0x6521, "No memory submodule and no internal memory available"),
+    EVENTID_0x6522((short) 0x6522, "Illegal memory submodule: replace submodule and reset memory"),
+    EVENTID_0x6523((short) 0x6523, "Memory reset request due to error accessing submodule"),
+    EVENTID_0x6524((short) 0x6524, "Memory reset request due to error in block header"),
+    EVENTID_0x6526((short) 0x6526, "Memory reset request due to memory replacement"),
+    EVENTID_0x6527((short) 0x6527, "Memory replaced, therefore restart not possible"),
+    EVENTID_0x6528((short) 0x6528, "Object handling function in the STOP/HOLD mode, no restart possible"),
+    EVENTID_0x6529((short) 0x6529, "No startup possible during the load"),
+    EVENTID_0x652A((short) 0x652A, "No startup because block exists twice in user memory user program function"),
+    EVENTID_0x652B((short) 0x652B, "No startup because block is too long for submodule - replace submodule"),
+    EVENTID_0x652C((short) 0x652C, "No startup due to illegal OB on submodule"),
+    EVENTID_0x6532((short) 0x6532, "No startup because illegal configuration information on submodule"),
+    EVENTID_0x6533((short) 0x6533, "Memory reset request because of invalid submodule content"),
+    EVENTID_0x6534((short) 0x6534, "No startup: block exists more than once on submodule"),
+    EVENTID_0x6535((short) 0x6535, "No startup: not enough memory to transfer block from submodule"),
+    EVENTID_0x6536((short) 0x6536, "No startup: submodule contains an illegal block number"),
+    EVENTID_0x6537((short) 0x6537, "No startup: submodule contains a block with an illegal length"),
+    EVENTID_0x6538((short) 0x6538, "Local data or write-protection ID (for DB) of a block illegal for CPU"),
+    EVENTID_0x6539((short) 0x6539, "Illegal command in block (detected by compiler)"),
+    EVENTID_0x653A((short) 0x653A, "Memory reset request because local OB data on submodule too short"),
+    EVENTID_0x6543((short) 0x6543, "No startup: illegal block type"),
+    EVENTID_0x6544((short) 0x6544, "No startup: attribute relevant for processing illegal"),
+    EVENTID_0x6545((short) 0x6545, "Source language illegal"),
+    EVENTID_0x6546((short) 0x6546, "Maximum amount of configuration information reached"),
+    EVENTID_0x6547((short) 0x6547, "Parameter assignment error assigning parameters to modules (not on P bus, cancel download)"),
+    EVENTID_0x6548((short) 0x6548, "Plausibility error during block check"),
+    EVENTID_0x6549((short) 0x6549, "Structure error in block"),
+    EVENTID_0x6550((short) 0x6550, "A block has an error in the CRC"),
+    EVENTID_0x6551((short) 0x6551, "A block has no CRC"),
+    EVENTID_0x6560((short) 0x6560, "SCAN overflow"),
+    EVENTID_0x6805((short) 0x6805, "Resource problem on configured connections, eliminated"),
+    EVENTID_0x6881((short) 0x6881, "Interface error leaving state"),
+    EVENTID_0x6905((short) 0x6905, "Resource problem on configured connections"),
+    EVENTID_0x6981((short) 0x6981, "Interface error entering state"),
+    EVENTID_0x72A2((short) 0x72A2, "Failure of a DP master or a DP master system"),
+    EVENTID_0x72A3((short) 0x72A3, "Redundancy restored on the DP slave"),
+    EVENTID_0x72DB((short) 0x72DB, "Safety program: safety mode disabled"),
+    EVENTID_0x72E0((short) 0x72E0, "Loss of redundancy in communication, problem eliminated"),
+    EVENTID_0x7301((short) 0x7301, "Loss of redundancy (1 of 2) due to failure of a CPU"),
+    EVENTID_0x7302((short) 0x7302, "Loss of redundancy (1 of 2) due to STOP on the standby triggered by user"),
+    EVENTID_0x7303((short) 0x7303, "H system (1 of 2) changed to redundant mode"),
+    EVENTID_0x7323((short) 0x7323, "Discrepancy found in operating system data"),
+    EVENTID_0x7331((short) 0x7331, "Standby-master switchover due to master failure"),
+    EVENTID_0x7333((short) 0x7333, "Standby-master switchover due to system modification during runtime"),
+    EVENTID_0x7334((short) 0x7334, "Standby-master switchover due to communication error at the synchronization module"),
+    EVENTID_0x7340((short) 0x7340, "Synchronization error in user program due to elapsed wait time"),
+    EVENTID_0x7341((short) 0x7341, "Synchronization error in user program due to waiting at different synchronization points"),
+    EVENTID_0x7342((short) 0x7342, "Synchronization error in operating system due to waiting at different synchronization points"),
+    EVENTID_0x7343((short) 0x7343, "Synchronization error in operating system due to elapsed wait time"),
+    EVENTID_0x7344((short) 0x7344, "Synchronization error in operating system due to incorrect data"),
+    EVENTID_0x734A((short) 0x734A, "The \"Re-enable\" job triggered by SFC 90 \"H_CTRL\" was executed"),
+    EVENTID_0x73A3((short) 0x73A3, "Loss of redundancy on the DP slave"),
+    EVENTID_0x73C1((short) 0x73C1, "Update process canceled"),
+    EVENTID_0x73C2((short) 0x73C2, "Updating aborted due to monitoring time being exceeded during the n-th attempt (1 = n = max. possible number of update attempts after abort due to excessive monitoring time)"),
+    EVENTID_0x73D8((short) 0x73D8, "Safety mode disabled"),
+    EVENTID_0x73DB((short) 0x73DB, "Safety program: safety mode enabled"),
+    EVENTID_0x73E0((short) 0x73E0, "Loss of redundancy in communication"),
+    EVENTID_0x74DD((short) 0x74DD, "Safety program: Shutdown of a fail-save runtime group disabled"),
+    EVENTID_0x74DE((short) 0x74DE, "Safety program: Shutdown of the F program disabled"),
+    EVENTID_0x74DF((short) 0x74DF, "Start of F program initialization"),
+    EVENTID_0x7520((short) 0x7520, "Error in RAM comparison"),
+    EVENTID_0x7521((short) 0x7521, "Error in comparison of process image output value"),
+    EVENTID_0x7522((short) 0x7522, "Error in comparison of memory bits, timers, or counters"),
+    EVENTID_0x75D1((short) 0x75D1, "Safety program: Internal CPU error"),
+    EVENTID_0x75D2((short) 0x75D2, "Safety program error: Cycle time time-out"),
+    EVENTID_0x75D6((short) 0x75D6, "Data corrupted in safety program prior to the output to F I/O"),
+    EVENTID_0x75D7((short) 0x75D7, "Data corrupted in safety program prior to the output to partner F-CPU"),
+    EVENTID_0x75D9((short) 0x75D9, "Invalid REAL number in a DB"),
+    EVENTID_0x75DA((short) 0x75DA, "Safety program: Error in safety data format"),
+    EVENTID_0x75DC((short) 0x75DC, "Runtime group, internal protocol error"),
+    EVENTID_0x75DD((short) 0x75DD, "Safety program: Shutdown of a fail-save runtime group enabled"),
+    EVENTID_0x75DE((short) 0x75DE, "Safety program: Shutdown of the F program enabled"),
+    EVENTID_0x75DF((short) 0x75DF, "End of F program initialization"),
+    EVENTID_0x75E1((short) 0x75E1, "Safety program: Error in FB \"F_PLK\" or \"F_PLK_O\" or \"F_CYC_CO\" or \"F_TEST\" or \"F_TESTC\""),
+    EVENTID_0x75E2((short) 0x75E2, "Safety program: Area length error"),
+    EVENTID_0x7852((short) 0x7852, "SYNC module inserted"),
+    EVENTID_0x7855((short) 0x7855, "SYNC module eliminated"),
+    EVENTID_0x78D3((short) 0x78D3, "Communication error between PROFIsafe and F I/O"),
+    EVENTID_0x78D4((short) 0x78D4, "Error in safety relevant communication between F CPUs"),
+    EVENTID_0x78D5((short) 0x78D5, "Error in safety relevant communication between F CPUs"),
+    EVENTID_0x78E3((short) 0x78E3, "F-I/O device input channel depassivated"),
+    EVENTID_0x78E4((short) 0x78E4, "F-I/O device output channel depassivated"),
+    EVENTID_0x78E5((short) 0x78E5, "F-I/O device depassivated"),
+    EVENTID_0x7934((short) 0x7934, "Standby-master switchover due to connection problem at the SYNC module"),
+    EVENTID_0x7950((short) 0x7950, "Synchronization module missing"),
+    EVENTID_0x7951((short) 0x7951, "Change at the SYNC module without Power On"),
+    EVENTID_0x7952((short) 0x7952, "SYNC module removed"),
+    EVENTID_0x7953((short) 0x7953, "Change at the SYNC-module without reset"),
+    EVENTID_0x7954((short) 0x7954, "SYNC module: rack number assigned twice"),
+    EVENTID_0x7955((short) 0x7955, "SYNC module error"),
+    EVENTID_0x7956((short) 0x7956, "Illegal rack number set on SYNC module"),
+    EVENTID_0x7960((short) 0x7960, "Redundant I/O: Time-out of discrepancy time at digital input, error is not yet localized"),
+    EVENTID_0x7961((short) 0x7961, "Redundant I/O, digital input error: Signal change after expiration of the discrepancy time"),
+    EVENTID_0x7962((short) 0x7962, "Redundant I/O: Digital input error"),
+    EVENTID_0x796F((short) 0x796F, "Redundant I/O: The I/O was globally disabled"),
+    EVENTID_0x7970((short) 0x7970, "Redundant I/O: Digital output error"),
+    EVENTID_0x7980((short) 0x7980, "Redundant I/O: Time-out of discrepancy time at analog input"),
+    EVENTID_0x7981((short) 0x7981, "Redundant I/O: Analog input error"),
+    EVENTID_0x7990((short) 0x7990, "Redundant I/O: Analog output error"),
+    EVENTID_0x79D3((short) 0x79D3, "Communication error between PROFIsafe and F I/O"),
+    EVENTID_0x79D4((short) 0x79D4, "Error in safety relevant communication between F CPUs"),
+    EVENTID_0x79D5((short) 0x79D5, "Error in safety relevant communication between F CPUs"),
+    EVENTID_0x79E3((short) 0x79E3, "F-I/O device input channel passivated"),
+    EVENTID_0x79E4((short) 0x79E4, "F-I/O device output channel passivated"),
+    EVENTID_0x79E5((short) 0x79E5, "F-I/O device passivated"),
+    EVENTID_0x79E6((short) 0x79E6, "Inconsistent safety program"),
+    EVENTID_0x79E7((short) 0x79E7, "Simulation block (F system block) loaded"),
+    EVENTID_0x0000((short) 0x0000, "NULL"),;
+
+    
+    
+    private static final Map<Short, S7DiagnosticEventId> map;
+    
+    static {
+        map = new HashMap<>();
+        for (S7DiagnosticEventId  subevent : S7DiagnosticEventId .values()) {
+            map.put(subevent.code, subevent);
+        }
+    }    
+    
+    private final String event;
+    private final short code;
+    
+    S7DiagnosticEventId(short code, String event){
+        this.event = event;
+        this.code = code;
+    }
+    
+    public String getEvent(){
+        return event;
+    }    
+    
+    public short getCode() {
+        return code;
+    }    
+    
+    public static S7DiagnosticEventId  valueOfEvent(String event) {
+        for (S7DiagnosticEventId  value : S7DiagnosticEventId .values()) {
+            if(value.getEvent().equals(event)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static S7DiagnosticEventId  valueOf(short code) {
+        return map.get(code);
+    }    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7ParamErrorCode.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7ParamErrorCode.java
new file mode 100644
index 00000000000..9fe86d25e0f
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7ParamErrorCode.java
@@ -0,0 +1,276 @@
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.utils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum S7ParamErrorCode {
+
+    ERROR_0x0000((short) 0x0000, "No error"),
+    ERROR_0x0110((short) 0x0110, "Invalid block number"),
+    ERROR_0x0111((short) 0x0111, "Invalid request length"),
+    ERROR_0x0112((short) 0x0112, "Invalid parameter"),
+    ERROR_0x0113((short) 0x0113, "Invalid block type"),
+    ERROR_0x0114((short) 0x0114, "Block not found"),
+    ERROR_0x0115((short) 0x0115, "Block already exists"),
+    ERROR_0x0116((short) 0x0116, "Block is write-protected"),
+    ERROR_0x0117((short) 0x0117, "The block/operating system update is too large"),
+    ERROR_0x0118((short) 0x0118, "Invalid block number"),
+    ERROR_0x0119((short) 0x0119, "Incorrect password entered"),
+    ERROR_0x011A((short) 0x011A, "PG resource error"),
+    ERROR_0x011B((short) 0x011B, "PLC resource error"),
+    ERROR_0x011C((short) 0x011C, "Protocol error"),
+    ERROR_0x011D((short) 0x011D, "Too many blocks (module-related restriction)"),
+    ERROR_0x011E((short) 0x011E, "There is no longer a connection to the database, or S7DOS handle is invalid"),
+    ERROR_0x011F((short) 0x011F, "Result buffer too small"),
+    ERROR_0x0120((short) 0x0120, "End of block list"),
+    ERROR_0x0140((short) 0x0140, "Insufficient memory available"),
+    ERROR_0x0141((short) 0x0141, "Job cannot be processed because of a lack of resources"),
+    ERROR_0x8001((short) 0x8001, "The requested service cannot be performed while the block is in the current status"),
+    ERROR_0x8003((short) 0x8003, "S7 protocol error: Error occurred while transferring the block"),
+    ERROR_0x8100((short) 0x8100, "Application, general error: Service unknown to remote module"),
+    ERROR_0x8104((short) 0x8104, "This service is not implemented on the module or a frame error was reported"),
+    ERROR_0x8204((short) 0x8204, "The type specification for the object is inconsistent"),
+    ERROR_0x8205((short) 0x8205, "A copied block already exists and is not linked"),
+    ERROR_0x8301((short) 0x8301, "Insufficient memory space or work memory on the module, or specified storage medium not accessible"),
+    ERROR_0x8302((short) 0x8302, "Too few resources available or the processor resources are not available"),
+    ERROR_0x8304((short) 0x8304, "No further parallel upload possible. There is a resource bottleneck"),
+    ERROR_0x8305((short) 0x8305, "Function not available"),
+    ERROR_0x8306((short) 0x8306, "Insufficient work memory (for copying, linking, loading AWP)"),
+    ERROR_0x8307((short) 0x8307, "Not enough retentive work memory (for copying, linking, loading AWP)"),
+    ERROR_0x8401((short) 0x8401, "S7 protocol error: Invalid service sequence (for example, loading or uploading a block)"),
+    ERROR_0x8402((short) 0x8402, "Service cannot execute owing to status of the addressed object"),
+    ERROR_0x8404((short) 0x8404, "S7 protocol: The function cannot be performed"),
+    ERROR_0x8405((short) 0x8405, "Remote block is in DISABLE state (CFB). The function cannot be performed"),
+    ERROR_0x8500((short) 0x8500, "S7 protocol error: Wrong frames"),
+    ERROR_0x8503((short) 0x8503, "Alarm from the module: Service canceled prematurely"),
+    ERROR_0x8701((short) 0x8701, "Error addressing the object on the communications partner (for example, area length error)"),
+    ERROR_0x8702((short) 0x8702, "The requested service is not supported by the module"),
+    ERROR_0x8703((short) 0x8703, "Access to object refused"),
+    ERROR_0x8704((short) 0x8704, "Access error: Object damaged"),
+    ERROR_0xD001((short) 0xD001, "Protocol error: Illegal job number"),
+    ERROR_0xD002((short) 0xD002, "Parameter error: Illegal job variant"),
+    ERROR_0xD003((short) 0xD003, "Parameter error: Debugging function not supported by module"),
+    ERROR_0xD004((short) 0xD004, "Parameter error: Illegal job status"),
+    ERROR_0xD005((short) 0xD005, "Parameter error: Illegal job termination"),
+    ERROR_0xD006((short) 0xD006, "Parameter error: Illegal link disconnection ID"),
+    ERROR_0xD007((short) 0xD007, "Parameter error: Illegal number of buffer elements"),
+    ERROR_0xD008((short) 0xD008, "Parameter error: Illegal scan rate"),
+    ERROR_0xD009((short) 0xD009, "Parameter error: Illegal number of executions"),
+    ERROR_0xD00A((short) 0xD00A, "Parameter error: Illegal trigger event"),
+    ERROR_0xD00B((short) 0xD00B, "Parameter error: Illegal trigger condition"),
+    ERROR_0xD011((short) 0xD011, "Parameter error in path of the call environment: Block does not exist"),
+    ERROR_0xD012((short) 0xD012, "Parameter error: Wrong address in block"),
+    ERROR_0xD014((short) 0xD014, "Parameter error: Block being deleted/overwritten"),
+    ERROR_0xD015((short) 0xD015, "Parameter error: Illegal tag address"),
+    ERROR_0xD016((short) 0xD016, "Parameter error: Test jobs not possible, because of errors in user program"),
+    ERROR_0xD017((short) 0xD017, "Parameter error: Illegal trigger number"),
+    ERROR_0xD025((short) 0xD025, "Parameter error: Invalid path"),
+    ERROR_0xD026((short) 0xD026, "Parameter error: Illegal access type"),
+    ERROR_0xD027((short) 0xD027, "Parameter error: This number of data blocks is not permitted"),
+    ERROR_0xD031((short) 0xD031, "Internal protocol error"),
+    ERROR_0xD032((short) 0xD032, "Parameter error: Wrong result buffer length"),
+    ERROR_0xD033((short) 0xD033, "Protocol error: Wrong job length"),
+    ERROR_0xD03F((short) 0xD03F, "Coding error: Error in parameter section (for example, reserve bytes not equal to 0)"),
+    ERROR_0xD041((short) 0xD041, "Data error: Illegal status list ID"),
+    ERROR_0xD042((short) 0xD042, "Data error: Illegal tag address"),
+    ERROR_0xD043((short) 0xD043, "Data error: Referenced job not found, check job data"),
+    ERROR_0xD044((short) 0xD044, "Data error: Illegal tag value, check job data"),
+    ERROR_0xD045((short) 0xD045, "Data error: Exiting the ODIS control is not allowed in HOLD"),
+    ERROR_0xD046((short) 0xD046, "Data error: Illegal measuring stage during run-time measurement"),
+    ERROR_0xD047((short) 0xD047, "Data error: Illegal hierarchy in 'Read job list'"),
+    ERROR_0xD048((short) 0xD048, "Data error: Illegal deletion ID in 'Delete job'"),
+    ERROR_0xD049((short) 0xD049, "Invalid substitute ID in 'Replace job'"),
+    ERROR_0xD04A((short) 0xD04A, "Error executing 'program status'"),
+    ERROR_0xD05F((short) 0xD05F, "Coding error: Error in data section (for example, reserve bytes not equal to 0, ...)"),
+    ERROR_0xD061((short) 0xD061, "Resource error: No memory space for job"),
+    ERROR_0xD062((short) 0xD062, "Resource error: Job list full"),
+    ERROR_0xD063((short) 0xD063, "Resource error: Trigger event occupied"),
+    ERROR_0xD064((short) 0xD064, "Resource error: Not enough memory space for one result buffer element"),
+    ERROR_0xD065((short) 0xD065, "Resource error: Not enough memory space for several  result buffer elements"),
+    ERROR_0xD066((short) 0xD066, "Resource error: The timer available for run-time measurement is occupied by another job"),
+    ERROR_0xD067((short) 0xD067, "Resource error: Too many 'modify tag' jobs active (in particular multi-processor operation)"),
+    ERROR_0xD081((short) 0xD081, "Function not permitted in current mode"),
+    ERROR_0xD082((short) 0xD082, "Mode error: Cannot exit HOLD mode"),
+    ERROR_0xD0A1((short) 0xD0A1, "Function not permitted in current protection level"),
+    ERROR_0xD0A2((short) 0xD0A2, "Function not possible at present, because a function is running that modifies memory"),
+    ERROR_0xD0A3((short) 0xD0A3, "Too many 'modify tag' jobs active on the I/O (in particular multi-processor operation)"),
+    ERROR_0xD0A4((short) 0xD0A4, "Forcing' has already been established"),
+    ERROR_0xD0A5((short) 0xD0A5, "Referenced job not found"),
+    ERROR_0xD0A6((short) 0xD0A6, "Job cannot be disabled/enabled"),
+    ERROR_0xD0A7((short) 0xD0A7, "Job cannot be deleted, for example because it is currently being read"),
+    ERROR_0xD0A8((short) 0xD0A8, "Job cannot be replaced, for example because it is currently being read or deleted"),
+    ERROR_0xD0A9((short) 0xD0A9, "Job cannot be read, for example because it is currently being deleted"),
+    ERROR_0xD0AA((short) 0xD0AA, "Time limit exceeded in processing operation"),
+    ERROR_0xD0AB((short) 0xD0AB, "Invalid job parameters in process operation"),
+    ERROR_0xD0AC((short) 0xD0AC, "Invalid job data in process operation"),
+    ERROR_0xD0AD((short) 0xD0AD, "Operating mode already set"),
+    ERROR_0xD0AE((short) 0xD0AE, "The job was set up over a different connection and can only be handled over this connection"),
+    ERROR_0xD0C1((short) 0xD0C1, "At least one error has been detected while accessing the tag(s)"),
+    ERROR_0xD0C2((short) 0xD0C2, "Change to STOP/HOLD mode"),
+    ERROR_0xD0C3((short) 0xD0C3, "At least one error was detected while accessing the tag(s). Mode change to STOP/HOLD"),
+    ERROR_0xD0C4((short) 0xD0C4, "Timeout during run-time measurement"),
+    ERROR_0xD0C5((short) 0xD0C5, "Display of block stack inconsistent, because blocks were deleted/reloaded"),
+    ERROR_0xD0C6((short) 0xD0C6, "Job was automatically deleted as the jobs it referenced have been deleted"),
+    ERROR_0xD0C7((short) 0xD0C7, "The job was automatically deleted because STOP mode was exited"),
+    ERROR_0xD0C8((short) 0xD0C8, "Block status' aborted because of inconsistencies between test job and running program"),
+    ERROR_0xD0C9((short) 0xD0C9, "Exit the status area by resetting OB90"),
+    ERROR_0xD0CA((short) 0xD0CA, "Exiting the status range by resetting OB90 and access error reading tags before exiting"),
+    ERROR_0xD0CB((short) 0xD0CB, "The output disable for the peripheral outputs has been activated again"),
+    ERROR_0xD0CC((short) 0xD0CC, "The amount of data for the debugging functions is restricted by the time limit"),
+    ERROR_0xD201((short) 0xD201, "Syntax error in block name"),
+    ERROR_0xD202((short) 0xD202, "Syntax error in function parameters"),
+    ERROR_0xD205((short) 0xD205, "Linked block already exists in RAM: Conditional copying is not possible"),
+    ERROR_0xD206((short) 0xD206, "Linked block already exists in EPROM: Conditional copying is not possible"),
+    ERROR_0xD208((short) 0xD208, "Maximum number of copied (not linked) blocks on module exceeded"),
+    ERROR_0xD209((short) 0xD209, "(At least) one of the given blocks not found on the module"),
+    ERROR_0xD20A((short) 0xD20A, "The maximum number of blocks that can be linked with one job was exceeded"),
+    ERROR_0xD20B((short) 0xD20B, "The maximum number of blocks that can be deleted with one job was exceeded"),
+    ERROR_0xD20C((short) 0xD20C, "OB cannot be copied because the associated priority class does not exist"),
+    ERROR_0xD20D((short) 0xD20D, "SDB cannot be interpreted (for example, unknown number)"),
+    ERROR_0xD20E((short) 0xD20E, "No (further) block available"),
+    ERROR_0xD20F((short) 0xD20F, "Module-specific maximum block size exceeded"),
+    ERROR_0xD210((short) 0xD210, "Invalid block number"),
+    ERROR_0xD212((short) 0xD212, "Incorrect header attribute (run-time relevant)"),
+    ERROR_0xD213((short) 0xD213, "Too many SDBs. Note the restrictions on the module being used"),
+    ERROR_0xD216((short) 0xD216, "Invalid user program - reset module"),
+    ERROR_0xD217((short) 0xD217, "Protection level specified in module properties not permitted"),
+    ERROR_0xD218((short) 0xD218, "Incorrect attribute (active/passive)"),
+    ERROR_0xD219((short) 0xD219, "Incorrect block lengths (for example, incorrect length of first section or of the whole block)"),
+    ERROR_0xD21A((short) 0xD21A, "Incorrect local data length or write-protection code faulty"),
+    ERROR_0xD21B((short) 0xD21B, "Module cannot compress or compression was interrupted early"),
+    ERROR_0xD21D((short) 0xD21D, "The volume of dynamic project data transferred is illegal"),
+    ERROR_0xD21E((short) 0xD21E, "Unable to assign parameters to a module (such as FM, CP). The system data could not be linked"),
+    ERROR_0xD220((short) 0xD220, "Invalid programming language. Note the restrictions on the module being used"),
+    ERROR_0xD221((short) 0xD221, "The system data for connections or routing are not valid"),
+    ERROR_0xD222((short) 0xD222, "The system data of the global data definition contain invalid parameters"),
+    ERROR_0xD223((short) 0xD223, "Error in instance data block for communication function block or maximum number of instance DBs exceeded"),
+    ERROR_0xD224((short) 0xD224, "The SCAN system data block contains invalid parameters"),
+    ERROR_0xD225((short) 0xD225, "The DP system data block contains invalid parameters"),
+    ERROR_0xD226((short) 0xD226, "A structural error occurred in a block"),
+    ERROR_0xD230((short) 0xD230, "A structural error occurred in a block"),
+    ERROR_0xD231((short) 0xD231, "At least one loaded OB cannot be copied because the associated priority class does not exist"),
+    ERROR_0xD232((short) 0xD232, "At least one block number of a loaded block is illegal"),
+    ERROR_0xD234((short) 0xD234, "Block exists twice in the specified memory medium or in the job"),
+    ERROR_0xD235((short) 0xD235, "The block contains an incorrect checksum"),
+    ERROR_0xD236((short) 0xD236, "The block does not contain a checksum"),
+    ERROR_0xD237((short) 0xD237, "You are about to load the block twice, i.e. a block with the same time stamp already exists on the CPU"),
+    ERROR_0xD238((short) 0xD238, "At least one of the blocks specified is not a DB"),
+    ERROR_0xD239((short) 0xD239, "At least one of the DBs specified is not available as a linked variant in the load memory"),
+    ERROR_0xD23A((short) 0xD23A, "At least one of the specified DBs is considerably different from the copied and linked variant"),
+    ERROR_0xD240((short) 0xD240, "Coordination rules violated"),
+    ERROR_0xD241((short) 0xD241, "The function is not permitted in the current protection level"),
+    ERROR_0xD242((short) 0xD242, "Protection violation while processing F blocks"),
+    ERROR_0xD250((short) 0xD250, "Update and module ID or version do not match"),
+    ERROR_0xD251((short) 0xD251, "Incorrect sequence of operating system components"),
+    ERROR_0xD252((short) 0xD252, "Checksum error"),
+    ERROR_0xD253((short) 0xD253, "No executable loader available; update only possible using a memory card"),
+    ERROR_0xD254((short) 0xD254, "Storage error in operating system"),
+    ERROR_0xD280((short) 0xD280, "Error compiling block in S7-300 CPU"),
+    ERROR_0xD2A1((short) 0xD2A1, "Another block function or a trigger on a block is active"),
+    ERROR_0xD2A2((short) 0xD2A2, "A trigger is active on a block. Complete the debugging function first"),
+    ERROR_0xD2A3((short) 0xD2A3, "The block is not active (linked), the block is occupied or the block is currently marked for deletion"),
+    ERROR_0xD2A4((short) 0xD2A4, "The block is already being processed by another block function"),
+    ERROR_0xD2A6((short) 0xD2A6, "It is not possible to save and change the user program simultaneously"),
+    ERROR_0xD2A7((short) 0xD2A7, "The block has the attribute 'unlinked' or is not processed"),
+    ERROR_0xD2A8((short) 0xD2A8, "An active debugging function is preventing parameters from being assigned to the CPU"),
+    ERROR_0xD2A9((short) 0xD2A9, "New parameters are being assigned to the CPU"),
+    ERROR_0xD2AA((short) 0xD2AA, "New parameters are currently being assigned to the modules"),
+    ERROR_0xD2AB((short) 0xD2AB, "The dynamic configuration limits are currently being changed"),
+    ERROR_0xD2AC((short) 0xD2AC, "A running active or deactivate assignment (SFC 12) is temporarily preventing R-KiR process"),
+    ERROR_0xD2B0((short) 0xD2B0, "An error occurred while configuring in RUN (CiR)"),
+    ERROR_0xD2C0((short) 0xD2C0, "The maximum number of technological objects has been exceeded"),
+    ERROR_0xD2C1((short) 0xD2C1, "The same technology data block already exists on the module"),
+    ERROR_0xD2C2((short) 0xD2C2, "Downloading the user program or downloading the hardware configuration is not possible"),
+    ERROR_0xD401((short) 0xD401, "Information function unavailable"),
+    ERROR_0xD402((short) 0xD402, "Information function unavailable"),
+    ERROR_0xD403((short) 0xD403, "Service has already been logged on/off (Diagnostics/PMC)"),
+    ERROR_0xD404((short) 0xD404, "Maximum number of nodes reached. No more logons possible for diagnostics/PMC"),
+    ERROR_0xD405((short) 0xD405, "Service not supported or syntax error in function parameters"),
+    ERROR_0xD406((short) 0xD406, "Required information currently unavailable"),
+    ERROR_0xD407((short) 0xD407, "Diagnostics error occurred"),
+    ERROR_0xD408((short) 0xD408, "Update aborted"),
+    ERROR_0xD409((short) 0xD409, "Error on DP bus"),
+    ERROR_0xD601((short) 0xD601, "Syntax error in function parameter"),
+    ERROR_0xD602((short) 0xD602, "Incorrect password entered"),
+    ERROR_0xD603((short) 0xD603, "The connection has already been legitimized"),
+    ERROR_0xD604((short) 0xD604, "The connection has already been enabled"),
+    ERROR_0xD605((short) 0xD605, "Legitimization not possible because password does not exist"),
+    ERROR_0xD801((short) 0xD801, "At least one tag address is invalid"),
+    ERROR_0xD802((short) 0xD802, "Specified job does not exist"),
+    ERROR_0xD803((short) 0xD803, "Illegal job status"),
+    ERROR_0xD804((short) 0xD804, "Illegal cycle time (illegal time base or multiple)"),
+    ERROR_0xD805((short) 0xD805, "No more cyclic read jobs can be set up"),
+    ERROR_0xD806((short) 0xD806, "The referenced job is in a state in which the requested function cannot be performed"),
+    ERROR_0xD807((short) 0xD807, "Function aborted due to overload, meaning executing the read cycle takes longer than the set scan cycle time"),
+    ERROR_0xDC01((short) 0xDC01, "Date and/or time invalid"),
+    ERROR_0xE201((short) 0xE201, "CPU is already the master"),
+    ERROR_0xE202((short) 0xE202, "Connect and update not possible due to different user program in flash module"),
+    ERROR_0xE203((short) 0xE203, "Connect and update not possible due to different firmware"),
+    ERROR_0xE204((short) 0xE204, "Connect and update not possible due to different memory configuration"),
+    ERROR_0xE205((short) 0xE205, "Connect/update aborted due to synchronization error"),
+    ERROR_0xE206((short) 0xE206, "Connect/update denied due to coordination violation"),
+    ERROR_0xEF01((short) 0xEF01, "S7 protocol error: Error at ID2; only 00H permitted in job"),
+    ERROR_0xEF02((short) 0xEF02, "S7 protocol error: Error at ID2; set of resources does not exist"),;
+
+    
+    private static final Map<Short, S7ParamErrorCode> map;
+    
+    static {
+        map = new HashMap<>();
+        for (S7ParamErrorCode  subevent : S7ParamErrorCode .values()) {
+            map.put(subevent.code, subevent);
+        }
+    }    
+    
+    private final String event;
+    private final short code;
+    
+    S7ParamErrorCode(short code, String event){
+        this.event = event;
+        this.code = code;
+    }
+    
+    public String getEvent(){
+        return event;
+    }    
+    
+    public short getCode() {
+        return code;
+    }    
+    
+    public static S7ParamErrorCode  valueOfEvent(String event) {
+        for (S7ParamErrorCode  value : S7ParamErrorCode .values()) {
+            if(value.getEvent().equals(event)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static S7ParamErrorCode  valueOf(short code) {
+        return map.get(code);
+    }    
+}

From d26cabc62aea1484ce2e85c746756b7bd23cdee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= <cesarjosegl@gmail.com>
Date: Mon, 20 Jan 2020 17:13:45 -0400
Subject: [PATCH 06/17] Recibing events. Next translate in standard message

---
 .../java/s7/connection/S7PlcConnection.java   | 119 ++-
 .../apache/plc4x/java/s7/model/S7Field.java   |   6 +-
 .../java/s7/model/S7SubscriptionField.java    | 166 +++++
 .../plc4x/java/s7/netty/Plc4XS7Protocol.java  | 396 +++++++++-
 .../plc4x/java/s7/netty/S7Protocol.java       | 688 +++++++++++++-----
 .../plc4x/java/s7/netty/events/S7Alarm.java   |   5 +-
 .../CpuCyclicServicesRequestParameter.java    |  60 ++
 .../CpuCyclicServicesResponseParameter.java   |  50 ++
 .../params/CpuServicesResponseParameter.java  |  10 +
 .../model/payloads/AlarmMessagePayload.java   |  11 +
 .../CpuCyclicServicesRequestPayload.java      |  91 +++
 .../CpuCyclicServicesResponsePayload.java     |  84 +++
 .../CpuCyclicServicesUnsubscribePayload.java  |  79 ++
 .../s7/netty/model/payloads/VarPayload.java   |   5 +-
 .../payloads/items/AlarmMessageItem.java      |  24 +-
 .../payloads/items/MessageObjectItem.java     | 158 +++-
 .../payloads/items/S7AnyVarPayloadItem.java   |  95 +++
 .../types/CpuCyclicServiceTimeBaseType.java   |  76 ++
 .../CpuServicesParameterFunctionGroup.java    |  15 +-
 .../s7/netty/model/types/ParameterType.java   |   1 +
 .../java/s7/netty/model/types/QueryType.java  |  73 ++
 .../model/types/VariableAddressingMode.java   |   2 +
 ...ndler.java => S7PlcFieldEventHandler.java} |   9 +-
 .../java/s7/netty/util/S7SizeHelper.java      |  15 +
 .../S7CyclicServicesSubscriptionHandle.java   |  83 +++
 .../S7DiagnosticSubscriptionHandle.java       |  46 ++
 .../s7/types/S7SubscriptionFieldType.java     |  34 +
 27 files changed, 2150 insertions(+), 251 deletions(-)
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7SubscriptionField.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuCyclicServicesRequestParameter.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuCyclicServicesResponseParameter.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesRequestPayload.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesResponsePayload.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesUnsubscribePayload.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/S7AnyVarPayloadItem.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuCyclicServiceTimeBaseType.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/QueryType.java
 rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/{S7PlcEventHandler.java => S7PlcFieldEventHandler.java} (78%)
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7CyclicServicesSubscriptionHandle.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7DiagnosticSubscriptionHandle.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/types/S7SubscriptionFieldType.java

diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
index 3c7de57905a..b4cc4499790 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
@@ -18,11 +18,15 @@ Licensed to the Apache Software Foundation (ASF) under one
  */
 package org.apache.plc4x.java.s7.connection;
 
+import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.*;
 import java.net.InetAddress;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CompletableFuture;
@@ -33,6 +37,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.configuration2.SystemConfiguration;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
 import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
 import org.apache.plc4x.java.api.messages.PlcReadRequest;
@@ -47,6 +52,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
 import org.apache.plc4x.java.api.model.PlcField;
 import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
 import org.apache.plc4x.java.base.connection.ChannelFactory;
 import org.apache.plc4x.java.base.connection.NettyPlcConnection;
 import org.apache.plc4x.java.base.events.ConnectEvent;
@@ -65,11 +71,14 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.s7.netty.model.params.CpuDiagnosticPushParameter;
 import org.apache.plc4x.java.s7.netty.model.params.CpuServicesPushParameter;
 import org.apache.plc4x.java.s7.netty.model.payloads.AlarmMessagePayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuCyclicServicesResponsePayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.CpuDiagnosticMessagePayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
 import org.apache.plc4x.java.s7.netty.model.types.MemoryArea;
 import org.apache.plc4x.java.s7.netty.strategies.DefaultS7MessageProcessor;
-import org.apache.plc4x.java.s7.netty.util.S7PlcEventHandler;
+import org.apache.plc4x.java.s7.netty.util.S7PlcFieldEventHandler;
 import org.apache.plc4x.java.s7.netty.util.S7PlcFieldHandler;
+import org.apache.plc4x.java.s7.protocol.S7CyclicServicesSubscriptionHandle;
 import org.apache.plc4x.java.s7.types.S7ControllerType;
 import org.apache.plc4x.java.s7.utils.S7TsapIdEncoder;
 import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
@@ -113,7 +122,12 @@ public class S7PlcConnection extends NettyPlcConnection implements PlcReader, Pl
     private final S7ControllerType paramControllerType;
 
     private BlockingQueue<S7PushMessage> alarmsqueue;
-    private AlarmsLoop alarmsloopthread;
+    
+    Map<Consumer, Collection<PlcSubscriptionHandle>> cyclicServicesSubscriptions = new HashMap();
+    
+    Map<Byte, PlcSubscriptionHandle> cyclicServicesHandles = new HashMap();
+    
+    private EventLoop alarmsloopthread;
 
     public S7PlcConnection(InetAddress address, int rack, int slot, String params) {
         this(new TcpSocketChannelFactory(address, ISO_ON_TCP_PORT), rack, slot, params);
@@ -186,7 +200,10 @@ public S7PlcConnection(ChannelFactory channelFactory, int rack, int slot, String
         */
         this.alarmsqueue = new ArrayBlockingQueue<>(1024);
         
-        alarmsloopthread = new AlarmsLoop(channel,this.alarmsqueue);
+        alarmsloopthread = new EventLoop(channel,
+                                this.alarmsqueue,
+                                cyclicServicesSubscriptions,
+                                cyclicServicesHandles);
 
     }
 
@@ -327,7 +344,7 @@ public PlcWriteRequest.Builder writeRequestBuilder() {
 
     @Override
     public PlcSubscriptionRequest.Builder subscriptionRequestBuilder() {
-        return new DefaultPlcSubscriptionRequest.Builder(this, new S7PlcEventHandler());
+        return new DefaultPlcSubscriptionRequest.Builder(this, new S7PlcFieldEventHandler());
     }    
     
     @Override
@@ -367,35 +384,59 @@ public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
 
     @Override
     public CompletableFuture<PlcSubscriptionResponse> subscribe(PlcSubscriptionRequest subscriptionRequest) {
+        
         InternalPlcSubscriptionRequest internalSubsRequest = checkInternal(subscriptionRequest, InternalPlcSubscriptionRequest.class);
+        
         CompletableFuture<InternalPlcSubscriptionResponse> future = new CompletableFuture<>();
+        
         PlcRequestContainer<InternalPlcSubscriptionRequest, InternalPlcSubscriptionResponse> container =
             new PlcRequestContainer<>(internalSubsRequest, future);
+        
         channel.writeAndFlush(container).addListener(f -> {
             if (!f.isSuccess()) {
                 future.completeExceptionally(f.cause());
             }
-        });        
+        });       
+        
         return future.thenApply(PlcSubscriptionResponse.class::cast);       
     }
 
     @Override
     public CompletableFuture<PlcUnsubscriptionResponse> unsubscribe(PlcUnsubscriptionRequest unsubscriptionRequest) {
+        
         InternalPlcUnsubscriptionRequest internalUnsubsRequest = checkInternal(unsubscriptionRequest, InternalPlcUnsubscriptionRequest.class);
+        
         CompletableFuture<InternalPlcUnsubscriptionResponse> future = new CompletableFuture<>();
+        
         PlcRequestContainer<InternalPlcUnsubscriptionRequest, InternalPlcUnsubscriptionResponse> container =
             new PlcRequestContainer<>(internalUnsubsRequest, future);
+        
         channel.writeAndFlush(container).addListener(f -> {
             if (!f.isSuccess()) {
                 future.completeExceptionally(f.cause());
             }
-        });        
+        });      
+        
         return future.thenApply(PlcUnsubscriptionResponse.class::cast);        
     }
 
     @Override
     public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer, Collection<PlcSubscriptionHandle> handles) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        //Add any handler to 
+        handles.forEach(handle ->{
+            if (handle instanceof S7CyclicServicesSubscriptionHandle) {
+                S7CyclicServicesSubscriptionHandle s7handle = (S7CyclicServicesSubscriptionHandle) handle;
+                if (!cyclicServicesHandles.containsKey(s7handle.getJobId())){
+                    cyclicServicesHandles.put(s7handle.getJobId(), s7handle);
+                }
+            }
+        });
+        
+        if (!cyclicServicesSubscriptions.containsKey(consumer)){
+            cyclicServicesSubscriptions.put(consumer, handles);
+        }
+        
+        return null;
     }
 
     @Override
@@ -403,25 +444,33 @@ public void unregister(PlcConsumerRegistration registration) {
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
     }
 
-    private class AlarmsLoop extends Thread {
+    private class EventLoop extends Thread {
         private volatile boolean cancelled;
         private final Channel channel;
         private boolean alarmquery;
         private int delay;
+        private final Map<Consumer, Collection<PlcSubscriptionHandle>> cyclicServicesSubscriptions;        
+        private final Map<Byte, PlcSubscriptionHandle> cyclicServicesHandles;
         private final BlockingQueue<S7PushMessage> alarmsqueue;
         
-        AlarmsLoop(Channel channel, BlockingQueue<S7PushMessage> alarmsqueue) {
+        EventLoop(Channel channel, 
+                BlockingQueue<S7PushMessage> alarmsqueue, 
+                Map<Consumer, Collection<PlcSubscriptionHandle>> cyclicServicesSubscriptions,
+                Map<Byte, PlcSubscriptionHandle> cyclicServicesHandles) {
             this.channel = channel;
             this.alarmsqueue = alarmsqueue;
+            this.cyclicServicesSubscriptions = cyclicServicesSubscriptions;
+            this.cyclicServicesHandles = cyclicServicesHandles;
             this.alarmquery = true;
-            this.delay = 1;
+            this.delay = 1000;
         }
         
         @Override
         public void run() {
             while (!cancelled) { 
                 try {
-                    S7PushMessage msg = alarmsqueue.poll(delay, TimeUnit.SECONDS);
+                    S7PushMessage msg = alarmsqueue.poll(delay, TimeUnit.MILLISECONDS);
+                    
                     if (msg != null){
                         if (msg instanceof AlarmMessagePayload){
                             AlarmMessagePayload themsg = (AlarmMessagePayload) msg;
@@ -435,6 +484,16 @@ public void run() {
                         } else if (msg instanceof CpuServicesPushParameter) {
                             CpuServicesPushParameter themsg = (CpuServicesPushParameter) msg;
                             logger.info("CpuServicesPushParameter: " + themsg);
+                        } else if (msg instanceof CpuCyclicServicesResponsePayload) {
+                            CpuCyclicServicesResponsePayload themsg = (CpuCyclicServicesResponsePayload) msg;
+                            logger.debug("CpuCyclicServicesResponsePayload: " + themsg + " JobId:" + themsg.getJobId());
+                            
+                            S7CyclicServicesSubscriptionHandle handle = 
+                                    (S7CyclicServicesSubscriptionHandle) cyclicServicesHandles.get(themsg.getJobId());
+                            if (handle != null) {
+                                UpdateCyclicServicesData(handle, themsg);                            
+                            };
+                            
                         } else {
                             logger.info("Object type: " + msg.getClass());
                         }                       
@@ -445,6 +504,9 @@ public void run() {
                             
                         }
                     }
+                    
+                    
+                    
                 } catch (InterruptedException ex) {
                     logger.info(ex.getLocalizedMessage());
                 }
@@ -452,6 +514,41 @@ public void run() {
             logger.info("Closing the alarm loop.");
         }
         
+        private void UpdateCyclicServicesData(S7CyclicServicesSubscriptionHandle handle,CpuCyclicServicesResponsePayload themsg){
+            
+            Map<String, AssociatedValueItem> items = handle.getItems();
+            Collection<AssociatedValueItem> values = items.values();
+            List<AssociatedValueItem> newvalues = themsg.getItems();
+            int i = 0;
+            synchronized(values) {
+                for (AssociatedValueItem value:values){
+                    AssociatedValueItem newvalue = newvalues.get(i);
+                    value.getData().setBytes(0, newvalue.getData());
+                    i++;                
+                }
+            }
+            
+            cyclicServicesSubscriptions.forEach((consumer,handles)->{
+                if (handles.contains(handle)){
+                    handles.forEach((exehandle)->{
+                        Map<String, Pair<PlcResponseCode, ByteBuf>> fields = new HashMap<>();
+                        S7CyclicServicesSubscriptionHandle exe2handle = (S7CyclicServicesSubscriptionHandle) exehandle;
+                        Map<String, AssociatedValueItem> values2consumer = exe2handle.getItems();
+                        
+                        //PlcSubscriptionEvent event = new DefaultPlcSubscriptionEvent(Instant.now(), fields);
+                        
+                        values2consumer.forEach((index, itemvalue)->{
+                            consumer.accept(null);
+                            //logger.info("Procesando valores : " + index + "\r\n" + ByteBufUtil.prettyHexDump(itemvalue.getData()));
+                        });
+                        //Pair<PlcResponseCode, ByteBuf> newPair = new ImmutablePair<>(PlcResponseCode, stringItem);
+                        //exehandle
+                    });
+                }
+            });
+            
+        }              
+        
         public void cancel() {
             cancelled = true;  
         }
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java
index 13e2dd93370..3e55238677c 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java
@@ -39,10 +39,8 @@ public class S7Field implements PlcField {
     private static final Pattern DATA_BLOCK_ADDRESS_PATTERN =
         Pattern.compile("^%DB(?<blockNumber>\\d{1,5}).DB(?<transferSizeCode>[XBWD]?)(?<byteOffset>\\d{1,7})(.(?<bitOffset>[0-7]))?:(?<dataType>[a-zA-Z_]+)(\\[(?<numElements>\\d+)])?");
     
-    //Event Subscription 
-    private static final Pattern EVENT_SUBSCRIPTION_TYPE_PATTERN = 
-        Pattern.compile("MODE SYS USR ALM");
 
+            
     private static final String DATA_TYPE = "dataType";
     private static final String TRANSFER_SIZE_CODE = "transferSizeCode";
     private static final String BLOCK_NUMBER = "blockNumber";
@@ -186,6 +184,8 @@ public static S7Field of(String fieldString) {
                 return new S7Field(dataType, memoryArea, (short) 0, byteOffset, bitOffset, numElements);
             }
         }
+        
+        
         throw new PlcInvalidFieldException("Unable to parse address: " + fieldString);
     }
 
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7SubscriptionField.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7SubscriptionField.java
new file mode 100644
index 00000000000..07c24d57663
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7SubscriptionField.java
@@ -0,0 +1,166 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.model;
+
+import java.util.ArrayList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.s7.netty.model.types.AlarmQueryType;
+import org.apache.plc4x.java.s7.netty.model.types.SubscribedEventType;
+import org.apache.plc4x.java.s7.types.S7SubscriptionFieldType;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7SubscriptionField implements PlcField {
+
+    //Event Subscription 
+    private static final Pattern EVENT_SUBSCRIPTION_TYPE_PATTERN = 
+        Pattern.compile("(^MODE)|(^SYS)|(^USR)|(^ALM)");
+    
+    //Event ack
+    private static final Pattern EVENT_ALARM_ACK_PATTERN = 
+        Pattern.compile("(^ACK:)(((?:,{0,1})(16#[0-9a-fA-F]{8}))+)");
+    
+    //Query alarms from PLC.
+    //TODO: Query SCAN 
+    private static final Pattern EVENT_ALARM_QUERY_PATTERN = 
+        Pattern.compile("(^QUERY:)((ALARM_S)|(ALARM_8))");    
+       
+    private final S7SubscriptionFieldType fieldtype;
+    private final SubscribedEventType eventtype;
+    private final S7Field s7field;    
+    private final ArrayList<Integer> ackalarms;
+    private final AlarmQueryType alarmquerytype;
+    
+    public S7SubscriptionField(S7SubscriptionFieldType fieldtype, SubscribedEventType eventtype){
+        this.fieldtype = fieldtype;
+        this.eventtype = eventtype;
+        this.s7field = null;
+        this.ackalarms = null;
+        this.alarmquerytype = null;
+    }
+       
+    public S7SubscriptionField(S7SubscriptionFieldType fieldtype, ArrayList<Integer> ackalarms){
+        this.fieldtype = fieldtype;
+        this.eventtype = null;
+        this.s7field   = null;
+        this.ackalarms = ackalarms;
+        this.alarmquerytype = null;
+    }    
+
+    public S7SubscriptionField(S7SubscriptionFieldType fieldtype, AlarmQueryType alarmquerytype){
+        this.fieldtype = fieldtype;
+        this.eventtype = null;
+        this.s7field = null;
+        this.ackalarms = null;  
+        this.alarmquerytype = alarmquerytype;        
+    }     
+    
+    public S7SubscriptionField(S7SubscriptionFieldType fieldtype, S7Field s7field){
+        this.fieldtype = fieldtype;
+        this.eventtype = null;
+        this.s7field = s7field;
+        this.ackalarms = null;  
+        this.alarmquerytype = null;        
+    }     
+
+    public S7SubscriptionFieldType getFieldtype() {
+        return fieldtype;
+    }
+
+    public SubscribedEventType getEventtype() {
+        return eventtype;
+    }
+
+    public S7Field getS7field() {
+        return s7field;
+    }
+
+    public ArrayList<Integer> getAckalarms() {
+        return ackalarms;
+    }
+
+    public AlarmQueryType getAlarmquerytype() {
+        return alarmquerytype;
+    }
+           
+    public static boolean matches(String fieldString) {
+        return EVENT_SUBSCRIPTION_TYPE_PATTERN.matcher(fieldString).matches() ||
+            EVENT_ALARM_ACK_PATTERN.matcher(fieldString).matches() ||
+            EVENT_ALARM_QUERY_PATTERN.matcher(fieldString).matches() ||
+                S7Field.matches(fieldString);
+    }     
+    
+    public static S7SubscriptionField of(String fieldString) {
+        {
+            Matcher matcher = EVENT_SUBSCRIPTION_TYPE_PATTERN.matcher(fieldString);
+            if (matcher.matches()){
+                return new S7SubscriptionField(S7SubscriptionFieldType.EVENT_SUBSCRIPTION,
+                            SubscribedEventType.valueOf(fieldString));
+            }
+        }
+        
+        {
+            //TODO: Actually only ALARM_S (SIG_1)
+            Matcher matcher = EVENT_ALARM_ACK_PATTERN.matcher(fieldString);
+            if (matcher.matches()){
+                String EventIds = matcher.group(2);
+                String[] arrStrEventId = EventIds.split(",");
+                ArrayList<Integer> arrEventId = new ArrayList<>();
+                for (String EventId:arrStrEventId){
+                    EventId = EventId.replaceAll("16#", "");
+                    arrEventId.add(Integer.parseInt(EventId, 16));                    
+                }
+                return new S7SubscriptionField(S7SubscriptionFieldType.ALARM_ACK,
+                            arrEventId);
+                
+            }            
+        }
+        
+        {
+            //TODO: Support for ALARM_8            
+            Matcher matcher = EVENT_ALARM_QUERY_PATTERN.matcher(fieldString); 
+            if (matcher.matches()){
+            return new S7SubscriptionField(S7SubscriptionFieldType.ALARM_QUERY,
+                            AlarmQueryType.ALARM_S);    
+            }
+        }
+        
+        {
+            if (S7Field.matches(fieldString)){
+                S7Field s7field = S7Field.of(fieldString);
+                switch(s7field.getDataType()) {
+                    case BYTE:
+                        
+                    default:;
+                    
+                }
+                return new S7SubscriptionField(S7SubscriptionFieldType.CYCLIC_SUBSCRIPTION,
+                            s7field);                
+            }
+        }
+        throw new PlcInvalidFieldException("Unable to parse address: " + fieldString);        
+    }
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
index 05f6df97b48..35a426a6e86 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
@@ -20,12 +20,15 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelHandlerContext;
 import java.io.IOException;
 import java.lang.reflect.Array;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -34,6 +37,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
+import java.util.logging.Level;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import org.apache.commons.lang3.tuple.ImmutablePair;
@@ -46,29 +50,41 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
 import org.apache.plc4x.java.api.messages.PlcWriteRequest;
 import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
 import org.apache.plc4x.java.api.types.PlcResponseCode;
 import org.apache.plc4x.java.base.PlcMessageToMessageCodec;
 import org.apache.plc4x.java.base.events.ConnectedEvent;
 import org.apache.plc4x.java.base.messages.*;
 import org.apache.plc4x.java.base.messages.items.*;
+import org.apache.plc4x.java.base.model.SubscriptionPlcField;
 import org.apache.plc4x.java.s7.model.S7Field;
+import org.apache.plc4x.java.s7.model.S7SubscriptionField;
 import org.apache.plc4x.java.s7.netty.events.S7ConnectedEvent;
 import org.apache.plc4x.java.s7.netty.model.messages.S7Message;
 import org.apache.plc4x.java.s7.netty.model.messages.S7PushMessage;
 import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
 import org.apache.plc4x.java.s7.netty.model.messages.S7ResponseMessage;
+import org.apache.plc4x.java.s7.netty.model.params.CpuCyclicServicesRequestParameter;
 import org.apache.plc4x.java.s7.netty.model.params.CpuServicesParameter;
 import org.apache.plc4x.java.s7.netty.model.params.CpuServicesRequestParameter;
+import org.apache.plc4x.java.s7.netty.model.params.CpuServicesResponseParameter;
 import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
 import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
 import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
 import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
 import org.apache.plc4x.java.s7.netty.model.payloads.AlarmMessagePayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuCyclicServicesRequestPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuCyclicServicesResponsePayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.CpuMessageSubscriptionServicePayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
 import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.AlarmMessageItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.MessageObjectItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.S7AnyVarPayloadItem;
 import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
 import org.apache.plc4x.java.s7.netty.model.types.*;
+import org.apache.plc4x.java.s7.protocol.S7CyclicServicesSubscriptionHandle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -171,6 +187,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E
     @Override
     protected void encode(ChannelHandlerContext ctx, PlcRequestContainer msg, List<Object> out) throws PlcException {
         PlcRequest request = msg.getRequest();
+
         if (request instanceof PlcReadRequest) {
             encodeReadRequest(msg, out);
         } else if (request instanceof PlcWriteRequest) {
@@ -182,7 +199,48 @@ protected void encode(ChannelHandlerContext ctx, PlcRequestContainer msg, List<O
         }
     }
 
+    //TODO: Todo el proceso de suscripcion a eventos, suscripcion de variable y reconocimientos de alarmas
+    // se ejecuta aqui. Se debe separar en funciones bien definidas.
+    // Subscripcion a Eventos
+    // Reconocimiento de alarmas
+    // Consulta de alarmas.
+    // Subscripcion a eventos ciclicos
+    // 
     private void encodeSubcriptionRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
+        //Chequear el campo prueba que ya incluyte la informaciĆ³n del tipo
+                
+        PlcSubscriptionRequest subsRequest = (PlcSubscriptionRequest)  msg.getRequest();        
+
+        if ( subsRequest.getFields().get(0) instanceof S7SubscriptionField){  
+
+            S7SubscriptionField event = (S7SubscriptionField) subsRequest.getFields().get(0);
+
+            switch(event.getFieldtype()){
+                case EVENT_SUBSCRIPTION:;
+                    encodeEventSubcriptionRequest(msg, out);
+                    break;
+                case EVENT_UNSUBSCRIPTION:;
+                    encodeEventUnSubcriptionRequest(msg, out);
+                    break;
+                case ALARM_ACK:;
+                    encodeAlarmAckRequest(msg, out);
+                    break;
+                case ALARM_QUERY:;
+                    encodeAlarmQueryRequest(msg, out);
+                    break;
+                case CYCLIC_SUBSCRIPTION:;
+                    encodeCycledSubscriptionRequest(msg, out);
+                    break;
+                case CYCLIC_UNSUBSCRIPTION:;
+                    break;                     
+                default:;                     
+             };
+
+        };            
+    }
+    
+    //TODO: Suppport for ALARM_8
+    private void encodeEventSubcriptionRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
         byte subsevent = 0;
         List<S7Parameter> parameterItems = new LinkedList<>();
         List<S7Payload> payloadItems = new LinkedList<>();
@@ -190,9 +248,9 @@ private void encodeSubcriptionRequest(PlcRequestContainer msg, List<Object> out)
         PlcSubscriptionRequest subsRequest = (PlcSubscriptionRequest)  msg.getRequest();
         
         for (String fieldName : subsRequest.getFieldNames()) {                        
-            if ( subsRequest.getField(fieldName) instanceof SubscribedEventType){
-                 SubscribedEventType event = (SubscribedEventType) subsRequest.getField(fieldName);
-                 subsevent = (byte) (subsevent | event.getCode());
+            if ( subsRequest.getField(fieldName) instanceof S7SubscriptionField){
+                 S7SubscriptionField event = (S7SubscriptionField) subsRequest.getField(fieldName);
+                 subsevent = (byte) (subsevent | event.getEventtype().getCode());
             }
         }
         
@@ -218,8 +276,209 @@ private void encodeSubcriptionRequest(PlcRequestContainer msg, List<Object> out)
 
         requests.put(s7ReadRequest.getTpduReference(), msg);
 
-        out.add(s7ReadRequest);            
-  
+        out.add(s7ReadRequest);         
+    }    
+    
+    private void encodeEventUnSubcriptionRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
+        byte subsevent = 0;
+        List<S7Parameter> parameterItems = new LinkedList<>();
+        List<S7Payload> payloadItems = new LinkedList<>();
+         
+        PlcSubscriptionRequest subsRequest = (PlcSubscriptionRequest)  msg.getRequest();
+        
+        for (String fieldName : subsRequest.getFieldNames()) {                        
+            if ( subsRequest.getField(fieldName) instanceof S7SubscriptionField){
+                 S7SubscriptionField event = (S7SubscriptionField) subsRequest.getField(fieldName);
+                 subsevent = (byte) (subsevent | event.getEventtype().getCode());
+            }
+        }
+        
+        CpuServicesParameter cpuservice = new CpuServicesRequestParameter(CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
+            CpuServicesParameterSubFunctionGroup.MESSAGE_SERVICE, (byte) 0x00);
+        
+        parameterItems.add(cpuservice);
+        
+       
+        S7Payload Data = new CpuMessageSubscriptionServicePayload(DataTransportErrorCode.OK,
+                                DataTransportSize.OCTET_STRING,
+                                subsevent,
+                                new String("HmiRtm  "),
+                                AlarmType.ALARM_S_INITIATE);
+        payloadItems.add(Data);
+
+        
+        S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.USER_DATA,
+            (short) tpduGenerator.getAndIncrement(), 
+            parameterItems,
+            payloadItems, 
+            msg);
+
+        requests.put(s7ReadRequest.getTpduReference(), msg);
+
+        out.add(s7ReadRequest);         
+    }  
+    
+    //TODO: Check for ALARM_D and ALARM_8
+    private void encodeAlarmAckRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
+        byte subsevent = 0;
+        List<S7Parameter> parameterItems = new LinkedList<>();
+        List<S7Payload> payloadItems = new LinkedList<>();
+         
+        PlcSubscriptionRequest subsRequest = (PlcSubscriptionRequest)  msg.getRequest();
+        S7SubscriptionField event = (S7SubscriptionField) subsRequest.getFields().get(0);
+
+        
+        CpuServicesParameter cpuservice = new CpuServicesRequestParameter(CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
+            CpuServicesParameterSubFunctionGroup.ALARM_ACK, (byte) 0x00);
+
+        parameterItems.add(cpuservice);
+        
+        
+        ArrayList<Object> items = new ArrayList<>();
+        for(Integer eventid:event.getAckalarms()){
+            items.add(new MessageObjectItem((byte) 0x12,
+                            (byte) 0x08,
+                            VariableAddressingMode.ALARM_ACK, 
+                            (byte) 0x00,
+                            eventid,
+                            (byte) 0x01,
+                            (byte) 0x01)); //ONLY for Alarm_SQ
+        }
+
+        AlarmMessageItem messageitem = new  AlarmMessageItem((byte) 0x09,
+                                                (byte) items.size(),
+                                                items)     ;
+        
+        S7Payload Data = new AlarmMessagePayload(DataTransportErrorCode.OK,
+                                DataTransportSize.OCTET_STRING,
+                                (2+items.size()*10),
+                                messageitem);
+        payloadItems.add(Data);
+
+        
+        S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.USER_DATA,
+            (short) tpduGenerator.getAndIncrement(), 
+            parameterItems,
+            payloadItems, 
+            msg);
+
+        requests.put(s7ReadRequest.getTpduReference(), msg);
+
+        out.add(s7ReadRequest);         
+    }   
+    
+    //TODO: Check for ALARM_D and ALARM_8
+    private void encodeAlarmQueryRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
+
+        byte subsevent = 0;
+        List<S7Parameter> parameterItems = new LinkedList<>();
+        List<S7Payload> payloadItems = new LinkedList<>();
+         
+        PlcSubscriptionRequest subsRequest = (PlcSubscriptionRequest)  msg.getRequest();
+        S7SubscriptionField event = (S7SubscriptionField) subsRequest.getFields().get(0);
+        
+        CpuServicesParameter cpuservice = new CpuServicesRequestParameter(CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
+            CpuServicesParameterSubFunctionGroup.ALARM_QUERY, (byte) 0x00);
+
+        parameterItems.add(cpuservice);
+        
+        ArrayList<Object> items = new ArrayList<>();
+        
+        //TODO: Multiple AlarmQueryType from the same request.
+        items.add(new MessageObjectItem((byte) 0x12,
+                        (byte) 0x08,
+                        VariableAddressingMode.ALARM_QUERYREQ, 
+                        QueryType.BYALARMTYPE,
+                        event.getAlarmquerytype())); //ONLY for Alarm_S
+
+
+        AlarmMessageItem messageitem = new  AlarmMessageItem((byte) 0x00,
+                                                (byte) items.size(),
+                                                items)     ;
+        
+        S7Payload Data = new AlarmMessagePayload(DataTransportErrorCode.OK,
+                                DataTransportSize.OCTET_STRING,
+                                (2+items.size()*10),
+                                messageitem);
+        payloadItems.add(Data);
+
+
+        S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.USER_DATA,
+            (short) tpduGenerator.getAndIncrement(), 
+            parameterItems,
+            payloadItems, 
+            msg);
+
+        requests.put(s7ReadRequest.getTpduReference(), msg);
+
+        out.add(s7ReadRequest);         
+    }    
+    
+    private void encodeCycledSubscriptionRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
+        List<S7Parameter> parameterItems = new LinkedList<>();
+        List<S7Payload> payloads = new LinkedList<>();        
+        DefaultPlcSubscriptionRequest prueba = (DefaultPlcSubscriptionRequest)  msg.getRequest();
+        List<SubscriptionPlcField> fields = prueba.getSubscriptionFields();
+        Optional<Duration> optionalduration = prueba.getSubscriptionFields().get(0).getDuration();
+        Duration duration  = optionalduration.get();
+        
+        List<S7AnyVarPayloadItem> payloadItems = new LinkedList<>();
+        
+        fields.forEach((action) ->{
+            PlcField field = action.getPlcField();
+            if (!(field instanceof S7SubscriptionField)) {
+                logger.info("The field should have been of type S7SubscriptionField");
+                return;
+            }  
+            S7SubscriptionField subsS7Field = (S7SubscriptionField) field; 
+            S7Field s7Field = subsS7Field.getS7field();
+            S7AnyVarPayloadItem varPayloadItem = new S7AnyVarPayloadItem(
+                SpecificationType.VARIABLE_SPECIFICATION, s7Field.getMemoryArea(),
+                s7Field.getDataType(),
+                s7Field.getNumElements(), s7Field.getBlockNumber(), s7Field.getByteOffset(), (byte) s7Field.getBitOffset());
+            payloadItems.add(varPayloadItem);            
+        });
+        
+        //TODO: Play with Time factor. Actually only 1..9
+        CpuCyclicServiceTimeBaseType timeBase = null;
+        byte timefactor = 0x00;
+        if (duration.getSeconds() == 0) {
+            timeBase = CpuCyclicServiceTimeBaseType.TB_100_MS;
+            timefactor = (byte) (duration.toMillis() / 100);
+        } else if (duration.getSeconds() <= 9) {
+            timeBase = CpuCyclicServiceTimeBaseType.TB_1_SEC;
+            timefactor = (byte) duration.getSeconds();            
+        } else if (duration.getSeconds() <= 90) {
+            timeBase = CpuCyclicServiceTimeBaseType.TB_10_SEC;
+            timefactor = (byte) (duration.getSeconds() / 10);  
+        }
+        
+        CpuCyclicServicesRequestPayload payload = new CpuCyclicServicesRequestPayload(DataTransportErrorCode.OK,
+                                                        DataTransportSize.OCTET_STRING,
+                                                        (4+payloadItems.size()*12),
+                                                        payloadItems.size(),
+                                                        timeBase,
+                                                        timefactor,
+                                                        payloadItems);
+                                                        
+        payloads.add(payload);
+        
+        CpuCyclicServicesRequestParameter parameter = new CpuCyclicServicesRequestParameter(CpuUserDataMethodType.REQUEST,
+                                                            CpuServicesParameterFunctionGroup.CYCLIC_SERVICES,
+                                                            CpuCyclicServicesParameterSubFunctionGroupType.CYCLIC_TRANSFER,
+                                                            (byte) 0x00);
+        parameterItems.add(parameter);
+        
+
+        
+        // Assemble the request.
+        S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.USER_DATA,
+            (short) tpduGenerator.getAndIncrement(), parameterItems,
+            payloads, msg);
+
+        requests.put(s7ReadRequest.getTpduReference(), msg);
+
+        out.add(s7ReadRequest);        
     }
     
     private void encodeUnsubcriptionRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
@@ -227,6 +486,7 @@ private void encodeUnsubcriptionRequest(PlcRequestContainer msg, List<Object> ou
     }    
     
     private void encodeReadRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
+
         List<VarParameterItem> parameterItems = new LinkedList<>();
 
         PlcReadRequest readRequest = (PlcReadRequest) msg.getRequest();
@@ -491,15 +751,53 @@ protected void decode(ChannelHandlerContext ctx, S7Message msg, List<Object> out
                 response = decodeWriteResponse(responseMessage, requestContainer);
             } else if (request instanceof PlcSubscriptionRequest) {
                 response = decodeSubscriptionResponse(responseMessage, requestContainer);
+                
+                if (response == null){ //Fragmented message? Query again!
+                    requests.put(tpduReference, requestContainer);
+                    List<S7Parameter> parameterItems = new LinkedList<>();
+                    List<S7Payload> payloadItems = new LinkedList<>();
+                    
+                    AlarmMessagePayload payload = new AlarmMessagePayload(DataTransportErrorCode.NOT_FOUND,
+                                                                            DataTransportSize.NULL,
+                                                                            0x0000,
+                                                                            null);
+                    payloadItems.add(payload);
+                    
+                    //TODO: Check multiple parameters
+                    CpuServicesParameter cpuservice = new CpuServicesResponseParameter(CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
+                    CpuServicesParameterSubFunctionGroup.ALARM_QUERY, ((CpuServicesParameter) msg.getParameters().get(0)).getSequenceNumber());
+
+                    parameterItems.add(cpuservice); 
+                    
+                    S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.USER_DATA,
+                        msg.getTpduReference(), 
+                        parameterItems,
+                        payloadItems, 
+                        null);  
+
+                    try {
+                        ChannelFuture future = ctx.writeAndFlush(s7ReadRequest);
+                        future.addListener(new ChannelFutureListener() {
+                            public void operationComplete(ChannelFuture future) {
+                                logger.debug("Request fragment ALARM_QUERY done: " + future.isSuccess());
+                            }
+                        });                        
+                        //out.add(s7ReadRequest);
+                        //ctx.pipeline().
+                    } catch (Exception ex) {
+                        java.util.logging.Logger.getLogger(Plc4XS7Protocol.class.getName()).log(Level.SEVERE, null, ex);
+                    }
+                    
+                }
             } else {
-                logger.info("There is the client's request, but it is not a valid response....");
+                logger.debug("There is the client's request, but it is not a valid response....");
             }
 
             // Confirm the response being handled.
             if (response != null) {
                 requestContainer.getResponseFuture().complete(response);
             } else {
-                logger.info("The message could not be processed...");
+                logger.debug("The message could not be processed...");
             }
         } else {
             //PUSH Message
@@ -513,7 +811,7 @@ protected void decode(ChannelHandlerContext ctx, S7Message msg, List<Object> out
             }
             
             List<S7Payload> payloads = msg.getPayloads();  
-            //TODO: Use alarmsqueue.addAll() method
+            //TODO: Use alarmsqueue.addAll() method using streams
             for (S7Payload payload:payloads){
                 if (payload instanceof S7PushMessage){
                     if (!alarmsqueue.offer((S7PushMessage) payload)){
@@ -523,7 +821,8 @@ protected void decode(ChannelHandlerContext ctx, S7Message msg, List<Object> out
             }            
         }
     }
-        // TODO: Check if it is a CPU service response and proceed as applicable.
+    
+    // TODO: Check if it is a CPU service response and proceed as applicable.
     @SuppressWarnings("unchecked")
     private PlcResponse decodeReadResponse(S7ResponseMessage responseMessage, PlcRequestContainer requestContainer) throws PlcProtocolException {
         InternalPlcReadRequest plcReadRequest = (InternalPlcReadRequest) requestContainer.getRequest();
@@ -839,16 +1138,83 @@ private PlcResponse decodeWriteResponse(S7ResponseMessage responseMessage, PlcRe
         return new DefaultPlcWriteResponse(plcWriteRequest, values);
     }
 
+
     private PlcResponse decodeSubscriptionResponse(S7ResponseMessage responseMessage, PlcRequestContainer requestContainer) throws PlcProtocolException {
-        InternalPlcSubscriptionRequest subsRequest = (InternalPlcSubscriptionRequest) requestContainer.getRequest();
+        InternalPlcSubscriptionRequest subsRequest = (InternalPlcSubscriptionRequest) requestContainer.getRequest(); 
+        //TODO: Try multiple ALARM_ACK in the same request and multiple EVENT_ID.
+        S7SubscriptionField event = (S7SubscriptionField) subsRequest.getFields().get(0);
+        
+        //TODO: Multiple parameters. Try with S7400. At this point if we have embedded more parameter will be lost.
+        CpuServicesResponseParameter parameter = (CpuServicesResponseParameter) responseMessage.getParameters().get(0);
+
         List<S7Payload> payloads = responseMessage.getPayloads();
+        
+        Map<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> values = new HashMap<>();
+
+        //May be only one iteration?:
         for (S7Payload payload:payloads){
-            if(payload instanceof AlarmMessagePayload) {  
-                logger.info("OK. Si pasa el mensaje como un Payload...: " + ((AlarmMessagePayload) payload).getReturnCode());
-                //logger.info("Alarm Type...: " + ((AlarmMessagePayload) payload).getMsgtype());                
-            }
+            if (payload instanceof AlarmMessagePayload) {
+                AlarmMessagePayload payloadItem = (AlarmMessagePayload) payload;   
+                switch(parameter.getSubFunctionGroup()){
+                    case ALARM_ACK:{
+                        List<Object> items = payloadItem.getMsg().getMsgItems();
+                        ArrayList<Integer> eventids = event.getAckalarms();
+                        int index = 0;
+                        for (Object item:items){
+                            // A ack response contains only the return code for every item.
+                            // Is direct response for the ALARM_ACK, don't pass to
+                            // push message handler.
+                            //subsBuilder2.addEventField("MyAck", "ACK:16#60000001,16#60000002,16#60000003");
+                            values.put("16#"+Integer.toHexString(eventids.get(index)), new ImmutablePair(decodeResponseCode((DataTransportErrorCode) item),null));                    
+                            index++;
+                        }                       
+                    }
+                    break;
+                    case ALARM_QUERY:{
+                        if (payloadItem.getMsg() == null) {
+                            return null;   
+                        } 
+
+                        if (payloadItem instanceof S7PushMessage){
+                            if (payloadItem.getMsg().getMsgItems().size() > 0){
+                                if (!alarmsqueue.offer((S7PushMessage) payload)){
+                                    logger.info("decodeSubscriptionResponse: Alarm queue buffer is full.");
+                                };
+                            };
+                        } else {
+                            logger.debug("Check for ALARM_QUERY not attended: " + payloadItem);   
+                        }                    
+                    }
+                    break;
+                    default:;
+                } 
+            } else if (payload instanceof CpuCyclicServicesResponsePayload) {
+                    CpuCyclicServicesResponsePayload  cyclicPayloadItem = (CpuCyclicServicesResponsePayload) payload;
+                    //
+                    //
+                    logger.info("CpuCyclicServicesResponsePayload: " + subsRequest.getFieldNames().toString());
+                    List<AssociatedValueItem> valueitems = cyclicPayloadItem.getItems();
+                    Map<String,AssociatedValueItem> items = new LinkedHashMap();
+                    int i=0;
+                    if (parameter.getError().getCode() == 0x0000){                    
+                        for (String fieldname:subsRequest.getFieldNames()){
+                            items.put(fieldname, valueitems.get(i));
+                            i++;                        
+                        };
+                    };
+                   
+                    S7CyclicServicesSubscriptionHandle handler = new S7CyclicServicesSubscriptionHandle("UNO", 
+                                                                        parameter.getSequenceNumber(),
+                                                                        parameter.getError().getCode(),
+                                                                        items);
+                                        
+                    for (String fieldname:subsRequest.getFieldNames()){
+                        logger.info("*****" + fieldname);
+                        values.put(fieldname, new ImmutablePair(decodeResponseCode(items.get(fieldname).getReturnCode()), handler));                    
+                    }
+                }  
         }
-        return new DefaultPlcSubscriptionResponse(subsRequest, null);
+        return new DefaultPlcSubscriptionResponse(subsRequest, values);
     }
     
     
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
index 914abe9f912..f3c8ed912ae 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
@@ -33,6 +33,8 @@ Licensed to the Apache Software Foundation (ASF) under one
 import java.time.temporal.ChronoUnit;
 import java.util.*;
 import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
 import org.apache.plc4x.java.api.exceptions.PlcProtocolPayloadTooBigException;
 import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
@@ -49,6 +51,8 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
 import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
 import org.apache.plc4x.java.s7.netty.model.payloads.AlarmMessagePayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuCyclicServicesRequestPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuCyclicServicesResponsePayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.CpuDiagnosticMessagePayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.CpuMessageSubscriptionServicePayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.CpuServicesPayload;
@@ -58,6 +62,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
 import org.apache.plc4x.java.s7.netty.model.payloads.items.CpuDiagnosticMessageItem;
 import org.apache.plc4x.java.s7.netty.model.payloads.items.MessageObjectItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.S7AnyVarPayloadItem;
 import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
 import org.apache.plc4x.java.s7.netty.model.payloads.ssls.SslDataRecord;
 import org.apache.plc4x.java.s7.netty.model.payloads.ssls.SslModuleIdentificationDataRecord;
@@ -109,6 +114,8 @@ protected void decode(ChannelHandlerContext ctx, Object msg, List<Object> out) {
     // For being able to respect the max AMQ restrictions.
     private PendingWriteQueue queue;
     private Map<Short, DataTpdu> sentButUnacknowledgedTpdus;
+    
+    private Map<Short, Pair<LocalDateTime, Queue<ByteBuf>>> fragmentedData;
 
     public S7Protocol(short requestedMaxAmqCaller, short requestedMaxAmqCallee, short requestedPduSize,
                       S7ControllerType controllerType, S7MessageProcessor messageProcessor) {
@@ -118,6 +125,7 @@ public S7Protocol(short requestedMaxAmqCaller, short requestedMaxAmqCallee, shor
         this.controllerType = controllerType;
         this.messageProcessor = messageProcessor;
         sentButUnacknowledgedTpdus = new HashMap<>();
+        fragmentedData = new HashMap<>();
     }
 
     @Override
@@ -225,8 +233,9 @@ private void writeS7Message(Channel channel, PromiseCombiner promiseCombiner,
             ChannelPromise subPromise = new DefaultChannelPromise(channel);
             // The tpduRef was 0x01 but had to be changed to 0x00 in order to support Siemens LOGO devices.
             queue.add(new DataTpdu(true, (byte) 0x00, Collections.emptyList(), buf, message), subPromise);
+            
             promiseCombiner.add((Future) subPromise);
-            logger.debug("S7 Message with id {}Ā queued", message.getTpduReference());
+            logger.debug("writeS7Message: S7 Message with id {}Ā queued", message.getTpduReference());
         }
     }
 
@@ -239,11 +248,15 @@ private void encodePayloads(S7Message in, ByteBuf buf) throws PlcProtocolExcepti
                     case WRITE_VAR:
                         encodeWriteVarPayload((VarPayload) payload, buf, !payloadIterator.hasNext());
                         break;
-                    case CPU_SERVICES:
+                    case CPU_SERVICES: 
                         if (payload instanceof CpuServicesPayload) {
                             encodeCpuServicesPayload((CpuServicesPayload) payload, buf);
                         } else if (payload instanceof CpuMessageSubscriptionServicePayload) {
                             encodeCpuMessageSubcriptionPayload((CpuMessageSubscriptionServicePayload) payload, buf);
+                        } else if (payload instanceof AlarmMessagePayload) {
+                             encodeAlarmMessagePayload((AlarmMessagePayload) payload, buf);
+                        } else if (payload instanceof CpuCyclicServicesRequestPayload){
+                            encodeCpuCyclicSubscriptionPayload((CpuCyclicServicesRequestPayload) payload, buf);
                         }
                         break;
                     default:
@@ -268,23 +281,6 @@ private void encodeWriteVarPayload(VarPayload varPayload, ByteBuf buf, boolean l
         }
     }
 
-    private void encodeCpuMessageSubcriptionPayload(CpuMessageSubscriptionServicePayload cpuServicesPayload, ByteBuf buf)
-        throws PlcProtocolException {
-        buf.writeByte(cpuServicesPayload.getReturnCode().getCode());
-        buf.writeByte(cpuServicesPayload.getDataTransportSize().getCode());
-        if ((cpuServicesPayload.getSubscribedEvents() & 0x80) == 0){
-            buf.writeShort(0x000A);
-        } else {
-            buf.writeShort(0x000C);  
-        };
-        buf.writeByte(cpuServicesPayload.getSubscribedEvents());
-        buf.writeByte(0x00);
-        buf.writeBytes(cpuServicesPayload.getId().getBytes());
-        if ((cpuServicesPayload.getSubscribedEvents() & 0x80) == 0x80){
-            buf.writeByte(cpuServicesPayload.getAlarm().getCode());
-            buf.writeByte(0x00);
-        }
-    }    
     
     private void encodeCpuServicesPayload(CpuServicesPayload cpuServicesPayload, ByteBuf buf)
             throws PlcProtocolException {
@@ -330,8 +326,112 @@ private void encodeCpuServicesPayload(CpuServicesPayload cpuServicesPayload, Byt
                 }
             }*/
         }
-    }
+    }    
+    
+    private void encodeCpuMessageSubcriptionPayload(CpuMessageSubscriptionServicePayload cpuServicesPayload, ByteBuf buf)
+        throws PlcProtocolException {
+        buf.writeByte(cpuServicesPayload.getReturnCode().getCode());
+        buf.writeByte(cpuServicesPayload.getDataTransportSize().getCode());
+        if ((cpuServicesPayload.getSubscribedEvents() & 0x80) == 0){
+            buf.writeShort(0x000A);
+        } else {
+            buf.writeShort(0x000C);  
+        };
+        buf.writeByte(cpuServicesPayload.getSubscribedEvents());
+        buf.writeByte(0x00);
+        buf.writeBytes(cpuServicesPayload.getId().getBytes());
+        if ((cpuServicesPayload.getSubscribedEvents() & 0x80) == 0x80){
+            buf.writeByte(cpuServicesPayload.getAlarm().getCode());
+            buf.writeByte(0x00);
+        }
+    }  
+    
+    //TODO: Agregar ALARM_ACK
+    private void encodeAlarmMessagePayload(AlarmMessagePayload payload, ByteBuf buf) {
+
+       AlarmMessageItem alarmitem = payload.getMsg();
+       
+       buf.writeByte(payload.getReturnCode().getCode());
+       buf.writeByte(payload.getDataTransportSize().getCode());
+       buf.writeShort(payload.getLength());
+       
+       //Response for fragmented PLC response
+       //Check Plc4XS7Protocol. decode method
+       if (alarmitem == null) { return; };
+       List<Object> items = alarmitem.getMsgItems();
+       
+       buf.writeByte(alarmitem.getFunction());
+       buf.writeByte(alarmitem.getObjects());
+       
+       for(Object thisitem:items){
+           MessageObjectItem item = (MessageObjectItem) thisitem;
+           switch (item.getSyntaxID()) {
+                case S7ANY:;
+                 logger.debug("encodeAlarmMessagePayload: S7ANY no supportesd");
+                break;
+                case PBC_R_ID:;
+                 logger.debug("encodeAlarmMessagePayload: PBC_R_ID no supportesd");                
+                break;                        
+                case ALARM_LOCKFREE:;
+                 logger.debug("encodeAlarmMessagePayload: ALARM_LOCKFREE no supportesd");                
+                break;                        
+                case ALARM_IND:;
+                 logger.debug("encodeAlarmMessagePayload: ALARM_IND no supportesd");                
+                break;                        
+                case ALARM_ACK:{
+                   logger.debug("encodeAlarmMessagePayload: ALARM_ACK");
+                   buf.writeByte(item.getVariableSpecification());
+                   buf.writeByte(item.getLength());
+                   buf.writeByte(item.getSyntaxID().getCode());
+                   buf.writeByte(item.getNumberOfValues());
+                   buf.writeInt(item.getEventID());
+                   buf.writeByte(item.getAckStateGoing());
+                   buf.writeByte(item.getAckStateComming());                    
+                };
+                break;                        
+                case ALARM_QUERYREQ:{
+                   logger.debug("encodeAlarmMessagePayload: ALARM_QUERYREQ");                    
+                   buf.writeByte(item.getVariableSpecification());
+                   buf.writeByte(item.getLength());
+                   buf.writeByte(item.getSyntaxID().getCode());
+                   buf.writeByte(0x00); //Unknown/Reserved
+                   buf.writeByte(item.getQuerytype().getCode());
+                   buf.writeByte(0x34); //Unknown/Reserved
+                   buf.writeInt(item.getAlarmtype().getCode());                     
+                };
+                break;                        
+                case NOTIFY_IND:;
+                 logger.debug("encodeAlarmMessagePayload: NOTIFY_IND no supportesd");                
+                break;                        
+                case NIC:;
+                 logger.debug("encodeAlarmMessagePayload: NIC no supportesd");                
+                break;                        
+                case DRIVEESANY:;
+                 logger.debug("encodeAlarmMessagePayload: DRIVEESANY no supportesd");                
+                break;                        
+                case DBREAD:;
+                 logger.debug("encodeAlarmMessagePayload: DBREAD no supportesd");                
+                break;                        
+                case SYM1200:;
+                 logger.debug("encodeAlarmMessagePayload: SYM1200 no supportesd");                
+                break;                        
+               default:;               
+           }
+       }         
+    }    
 
+   private void encodeCpuCyclicSubscriptionPayload(CpuCyclicServicesRequestPayload payload, ByteBuf buf) {
+       buf.writeByte(payload.getReturnCode().getCode());
+       buf.writeByte(payload.getDataTransportSize().getCode());
+       buf.writeShort(payload.getLength());
+       buf.writeShort(payload.getItemCount());
+       buf.writeByte(payload.getTimeBase().getCode());
+       buf.writeByte(payload.getTimeFactor());
+       payload.getItems().forEach((anyvar)->{
+           encodeS7AnyPayloadItem(anyvar,buf);
+       });       
+   }    
+    
     private void encodeParameters(S7Message in, ByteBuf buf) throws PlcProtocolException {
         for (S7Parameter s7Parameter : in.getParameters()) {
             buf.writeByte(s7Parameter.getType().getCode());
@@ -377,7 +477,7 @@ private void encodeParameterSetupCommunication(ByteBuf buf, SetupCommunicationPa
         buf.writeByte((byte) 0x00);
         buf.writeShort(s7Parameter.getMaxAmqCaller());
         buf.writeShort(s7Parameter.getMaxAmqCallee());
-        buf.writeShort(s7Parameter.getPduLength());
+        buf.writeShort(s7Parameter.getPduLength());        
     }
 
     private void encodeParameterReadWriteVar(ByteBuf buf, VarParameter s7Parameter) throws PlcProtocolException {
@@ -400,15 +500,26 @@ private void encodeCpuServicesParameter(ByteBuf buf, CpuServicesParameter parame
         buf.writeByte(0x01);
         buf.writeByte(0x12);
         // Length of the parameter.
+        
         buf.writeByte((parameter instanceof CpuServicesRequestParameter) ? 0x04 : 0x08);
         // Is this a request or a response?
         buf.writeByte((parameter instanceof CpuServicesRequestParameter) ? 0x11 : 0x12);
         // This is a mixture of request/response and function group .
         byte nextByte = (byte) (((parameter instanceof CpuServicesRequestParameter) ?
             (byte) 0x40 : (byte) 0x80) | parameter.getFunctionGroup().getCode());
-        //TODO for ALARM_QUERY bypass the next byte
+        
+        //For fragmented response
+        if ((parameter instanceof CpuServicesResponseParameter) && 
+                (parameter.getSequenceNumber() != 0)){
+            nextByte = (byte) (0x40 + parameter.getFunctionGroup().getCode());
+        }
+        
         buf.writeByte(nextByte);
-        buf.writeByte(parameter.getSubFunctionGroup().getCode());
+        if (parameter instanceof CpuCyclicServicesRequestParameter) {
+            buf.writeByte(((CpuCyclicServicesRequestParameter) parameter).getCyclicSubFunction().getCode());
+        } else {
+            buf.writeByte(parameter.getSubFunctionGroup().getCode());
+        }
         buf.writeByte(parameter.getSequenceNumber());
 
         // A response parameter has some more fields.
@@ -419,8 +530,17 @@ private void encodeCpuServicesParameter(ByteBuf buf, CpuServicesParameter parame
             buf.writeByte(responseParameter.isLastDataUnit() ? 0x00 : 0x01);
             buf.writeShort(responseParameter.getError().getCode());
         }*/
+        //R: if parameter.getSequenceNumber() == 2 then is fragment message query
+        //   from Plc4XS7Protocol decode method.
+        if (parameter.getSequenceNumber() != 0x00) {
+            buf.writeByte(0x00); //DataUnitReferenceNumber
+            buf.writeByte(0x00); //LastDataUnit
+            buf.writeShort(0x0000); //Error code
+        }
+        
     }
 
+    //TODO: Refactor S7AnyVarParameterItem to S7AnyVarItem
     private void encodeS7AnyParameterItem(ByteBuf buf, S7AnyVarParameterItem s7AnyRequestItem) {
         buf.writeByte(s7AnyRequestItem.getSpecificationType().getCode());
         // Length of this item (excluding spec type and length)
@@ -441,11 +561,34 @@ private void encodeS7AnyParameterItem(ByteBuf buf, S7AnyVarParameterItem s7AnyRe
                 (s7AnyRequestItem.getByteOffset() & 0x1F) << 3)
                 | (s7AnyRequestItem.getBitOffset() & 0x07)));
     }
+    
+    //TODO: Refactor S7AnyVarPayloadItem to S7AnyVarItem
+    private void encodeS7AnyPayloadItem(S7AnyVarPayloadItem s7AnyRequestItem, ByteBuf buf) {
+        buf.writeByte(s7AnyRequestItem.getSpecificationType().getCode());
+        // Length of this item (excluding spec type and length)
+        buf.writeByte((byte) 0x0a);
+        buf.writeByte(s7AnyRequestItem.getAddressingMode().getCode());
+        buf.writeByte(s7AnyRequestItem.getDataType().getTypeCode());
 
+        buf.writeShort(encodeNumElements(s7AnyRequestItem));
+        buf.writeShort(s7AnyRequestItem.getDataBlockNumber());
+        buf.writeByte(s7AnyRequestItem.getMemoryArea().getCode());
+        // A S7 address is 3 bytes long. Unfortunately the byte-offset is NOT located in
+        // byte 1 and byte 2 and the bit offset in byte 3. Siemens used the last 3 bits of
+        // byte 3 for the bit-offset and the remaining 5 bits of byte 3 to contain the lowest
+        // 5 bits of the byte-offset. The highest 5 bits of byte 1 are probably left unused
+        // for future extensions.
+        buf.writeShort((short) (s7AnyRequestItem.getByteOffset() >> 5));
+        buf.writeByte((byte) ((
+                (s7AnyRequestItem.getByteOffset() & 0x1F) << 3)
+                | (s7AnyRequestItem.getBitOffset() & 0x07)));
+    }
+        
     /**
      * this is a workaround for the date and time types, as native requests with the datatypes are
      * @return
      */
+        //TODO: Refactor S7AnyVarParameterItem to S7AnyVarItem
     private short encodeNumElements(S7AnyVarParameterItem s7AnyVarParameterItem){
         switch (s7AnyVarParameterItem.getDataType()){
             case DATE_AND_TIME:
@@ -456,7 +599,24 @@ private short encodeNumElements(S7AnyVarParameterItem s7AnyVarParameterItem){
                 return (short) s7AnyVarParameterItem.getNumElements();
         }
 
-    }
+    }    
+    
+    /**
+     * this is a workaround for the date and time types, as native requests with the datatypes are
+     * @return
+     */
+    //TODO: Refactor S7AnyVarPayloadItem to S7AnyVarItem
+    private short encodeNumElements(S7AnyVarPayloadItem s7AnyVarParameterItem){
+        switch (s7AnyVarParameterItem.getDataType()){
+            case DATE_AND_TIME:
+            case TIME_OF_DAY:
+            case DATE:
+                return (short) (s7AnyVarParameterItem.getNumElements()*s7AnyVarParameterItem.getDataType().getSizeInBytes());
+            default:
+                return (short) s7AnyVarParameterItem.getNumElements();
+        }
+
+    }  
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // Decoding
@@ -486,6 +646,8 @@ protected void decode(ChannelHandlerContext ctx, IsoTPMessage in, List<Object> o
         }
 
         MessageType messageType = MessageType.valueOf(userData.readByte());
+        //Some response maybe USER_DATA
+        //Header: Userdata. Parameter:(Response)->(CPU functions)->(ALARM ack)
         boolean isResponse = messageType == MessageType.ACK_DATA;
         userData.readShort();  // Reserved (is always constant 0x0000)
         short tpduReference = userData.readShort();
@@ -510,11 +672,20 @@ protected void decode(ChannelHandlerContext ctx, IsoTPMessage in, List<Object> o
             }
             i += S7SizeHelper.getParameterLength(parameter);
         }
-        //TODO: Se pierden dos bytes de la Data
 
         List<S7Payload> s7Payloads = decodePayloads(userData, isResponse, userDataLength, s7Parameters);
 
         logger.debug("S7 Message with id {}Ā received", tpduReference);
+        
+        //Case: USER_DATA
+        if (messageType == MessageType.USER_DATA){
+            if (s7Parameters.get(0) instanceof CpuServicesResponseParameter){
+                CpuServicesResponseParameter parameter = (CpuServicesResponseParameter) s7Parameters.get(0);
+                if (parameter.getSubFunctionGroup() == CpuServicesParameterSubFunctionGroup.ALARM_ACK){
+                    isResponse = true;
+                }
+            }
+        };
 
         if (isResponse) {
             S7ResponseMessage responseMessage = new S7ResponseMessage(
@@ -522,6 +693,7 @@ protected void decode(ChannelHandlerContext ctx, IsoTPMessage in, List<Object> o
 
             // Remove the current response from the list of unconfirmed messages.
             DataTpdu requestTpdu = sentButUnacknowledgedTpdus.remove(tpduReference);
+            logger.debug("decode: S7 Message with id {}Ā remove", tpduReference);
 
             // Get the corresponding request message.
             S7RequestMessage requestMessage = (requestTpdu != null) ? (S7RequestMessage) requestTpdu.getParent() : null;
@@ -567,13 +739,17 @@ protected void decode(ChannelHandlerContext ctx, IsoTPMessage in, List<Object> o
                 if(s7Parameter instanceof CpuServicesResponseParameter) {
 
                     for (S7Payload s7Payload : s7Payloads) {
-                        if(s7Payload instanceof CpuServicesPayload) {
+                        if((s7Payload instanceof CpuServicesPayload)) {
                             CpuServicesPayload cpuServicesPayload = (CpuServicesPayload) s7Payload;
                             // Remove the current response from the list of unconfirmed messages.
-
                             sentButUnacknowledgedTpdus.remove(tpduReference);
-
+                            logger.debug("CpuServicesPayload: S7 Message with id {}Ā remove", tpduReference);  
+   
                             handleIdentifyRemote(ctx, cpuServicesPayload);
+ 
+                        } else {
+                            sentButUnacknowledgedTpdus.remove(tpduReference);
+                            logger.debug("CpuCyclicServicesResponsePayload: S7 Message with id {}Ā remove", tpduReference); 
                         }
                     }
                 } else if (s7Parameter instanceof CpuServicesPushParameter){
@@ -707,57 +883,78 @@ else if ((readWriteVarParameter.getType() == ParameterType.READ_VAR) && isRespon
 
     private S7Payload decodeCpuServicesPayload(CpuServicesParameter parameter, ByteBuf userData) {
         
-        switch(parameter.getSubFunctionGroup()){
-            case READ_SSL: {
-                CpuServicesPayload payload = decodeReadSslPayload(parameter, userData);
-                return payload;
-            }
-            case MESSAGE_SERVICE:{  
-                AlarmMessagePayload payload = decodeMessageServicePayload(parameter, userData); 
-                return payload;            
-            }
-            case DIAG_MESSAGE:{
-                CpuDiagnosticMessagePayload payload = decodeCpuDiagnosticMessagePayload(parameter, userData);
-                return payload;
-            }
-            case ALARM8:;
-                break;
-            case NOTIFY:;
-                break;
-            case ALARM8_LOCK:;
-                break;
-            case ALARM8_UNLOCK:;
-                break;
-            case SCAN:;
-                break;
-            case ALARM_ACK:{  
-                AlarmMessagePayload payload = decodeMessageServiceAckPayload(parameter, userData);                
-                return payload;            
-            }
-            case ALARM_ACK_IND:;
-                break;
-            case ALARM8_LOCK_IND:;
-                break;
-            case ALARM8_UNLOCK_IND:;
-                break;
-            case ALARM_SQ_IND:{  
-                AlarmMessagePayload payload = decodeMessageServicePushPayload(parameter, userData);                
-                return payload;            
-            }
-            case ALARM_S_IND: {
-                AlarmMessagePayload payload = decodeMessageServicePushPayload(parameter, userData);
-                return payload;
-            }
-            case ALARM_QUERY:{
-                AlarmMessagePayload payload = decodeMessageServiceQueryPayload(parameter, userData);
-                return payload;
+        if (parameter.getFunctionGroup() == CpuServicesParameterFunctionGroup.CPU_FUNCTIONS) {
+            switch(parameter.getSubFunctionGroup()){
+                case READ_SSL: {
+                    CpuServicesPayload payload = decodeReadSslPayload(parameter, userData);
+                    return payload;
+                }
+                case MESSAGE_SERVICE:{  
+                    AlarmMessagePayload payload = decodeMessageServicePayload(parameter, userData); 
+                    return payload;            
+                }
+                case DIAG_MESSAGE:{
+                    CpuDiagnosticMessagePayload payload = decodeCpuDiagnosticMessagePayload(parameter, userData);
+                    return payload;
+                }
+                case ALARM8:;
+                    break;
+                case NOTIFY:;
+                    break;
+                case ALARM8_LOCK:;
+                    break;
+                case ALARM8_UNLOCK:;
+                    break;
+                case SCAN:;
+                    break;
+                case ALARM_ACK:{  
+                    AlarmMessagePayload payload = decodeMessageServiceAckPayload(parameter, userData);                
+                    return payload;            
+                }
+                case ALARM_ACK_IND:{
+                    AlarmMessagePayload payload = decodeMessageServicePushPayload(parameter, userData);
+                    return payload;
+                }
+                case ALARM8_LOCK_IND:;
+                    break;
+                case ALARM8_UNLOCK_IND:;
+                    break;
+                case ALARM_SQ_IND:{  
+                    AlarmMessagePayload payload = decodeMessageServicePushPayload(parameter, userData);                
+                    return payload;            
+                }
+                case ALARM_S_IND: {
+                    AlarmMessagePayload payload = decodeMessageServicePushPayload(parameter, userData);
+                    return payload;
+                }
+                case ALARM_QUERY:{
+                    AlarmMessagePayload payload = decodeMessageServiceQueryPayload(parameter, userData);
+                    return payload;
+                }
+                case NOTIFY8:;
+                    break;
+                default:;
+                    break;
+            } 
+            
+        } else if (parameter.getFunctionGroup() == CpuServicesParameterFunctionGroup.CYCLIC_SERVICES) {
+            if (parameter instanceof CpuCyclicServicesResponseParameter){
+                CpuCyclicServicesResponseParameter pushparameter = (CpuCyclicServicesResponseParameter) parameter;
+                switch(pushparameter.getSubCycFunctionGroup()){
+                    case CYCLIC_CHANGE:;
+                        break;
+                    case CYCLIC_CHANGE_MODIFY:;
+                        break;
+                    case CYCLIC_RDREC:;    
+                        break;
+                    case CYCLIC_TRANSFER: 
+                        CpuCyclicServicesResponsePayload payload = decodeCyclicServiceResponsePayload(pushparameter, userData);
+                        return payload;
+                    case CYCLIC_UNSUBSCRIBE:;    
+                        break;                        
+                }
             }
-            case NOTIFY8:;
-                break;
-            default:;
-                break;
         }
-        
         return null;
     }
 
@@ -799,7 +996,7 @@ private S7Parameter decodeParameter(ByteBuf in, boolean isResponse) {
     }
 
     private CpuServicesParameter decodeCpuServicesParameter(ByteBuf in) {
-        
+        //logger.info("decodeParameter... \r\n" + ByteBufUtil.prettyHexDump(in));        
         if(in.readShort() != 0x0112) {
             if (logger.isErrorEnabled()) {
                 logger.error("Expecting 0x0112 for CPU_SERVICES parameter");
@@ -815,6 +1012,7 @@ private CpuServicesParameter decodeCpuServicesParameter(ByteBuf in) {
             return null;
         }
         // Skipping this as it sort of contains redundant information.
+        // TODO: We need check the next byte for push message (Request/Response)
         in.readByte();
         byte typeAndFunctionGroup = in.readByte();
         // If bit 7 is set, it's a request (if bit 8 is set it's a response).
@@ -823,17 +1021,33 @@ private CpuServicesParameter decodeCpuServicesParameter(ByteBuf in) {
         boolean pushParameter = (typeAndFunctionGroup & 0xF0) == 0;
         boolean requestParameter = (typeAndFunctionGroup & 0x40) != 0;
         boolean responseParameter = (typeAndFunctionGroup & 0x80) != 0;
+        
         // The last 4 bits contain the function group value.
         typeAndFunctionGroup = (byte) (typeAndFunctionGroup & 0x0F);
+        
         CpuServicesParameterFunctionGroup functionGroup =
             CpuServicesParameterFunctionGroup.valueOf(typeAndFunctionGroup);
+        
         CpuServicesParameterSubFunctionGroup subFunctionGroup =
             CpuServicesParameterSubFunctionGroup.valueOf(in.readByte());
+        
         byte sequenceNumber = in.readByte();
-        if(pushParameter) {
-            return new CpuServicesPushParameter(functionGroup, subFunctionGroup, sequenceNumber);            
+        
+        if(pushParameter || (responseParameter && functionGroup == CpuServicesParameterFunctionGroup.CYCLIC_SERVICES)) {
+            if (functionGroup == CpuServicesParameterFunctionGroup.CYCLIC_SERVICES ) {
+               CpuCyclicServicesParameterSubFunctionGroupType subCycFunctionGroup = 
+                       CpuCyclicServicesParameterSubFunctionGroupType.valueOf(subFunctionGroup.getCode());
+               byte dataUnitReferenceNumber = in.readByte();
+               boolean lastDataUnit = in.readByte() == 0x00;
+               ParameterError error = ParameterError.valueOf(in.readShort());
+
+                return new CpuCyclicServicesResponseParameter(functionGroup, subCycFunctionGroup, sequenceNumber,
+                            dataUnitReferenceNumber, lastDataUnit, error);               
+            } else {
+                return new CpuServicesPushParameter(functionGroup, subFunctionGroup, sequenceNumber);            
+            }
         } else if (requestParameter) {
-            return new CpuServicesRequestParameter(functionGroup, subFunctionGroup, sequenceNumber);
+            return new CpuServicesRequestParameter(functionGroup, subFunctionGroup, sequenceNumber);            
         } else {
             byte dataUnitReferenceNumber = in.readByte();
             boolean lastDataUnit = in.readByte() == 0x00;
@@ -866,8 +1080,7 @@ private CpuDiagnosticPushParameter decodePushModeTransitionParameter(ByteBuf in)
         CpuCurrentModeType cpumode = CpuCurrentModeType.valueOf(in.readByte());
         byte sequencenumber = in.readByte();
         return new CpuDiagnosticPushParameter(usermethodtype, userparamtype, userfunction, cpumode, sequencenumber);
-    }    
-    
+    }        
     
     private List<VarParameterItem> decodeReadWriteVarParameter(ByteBuf in, byte numItems) {
         List<VarParameterItem> items = new LinkedList<>();
@@ -1006,7 +1219,7 @@ private CpuDiagnosticMessagePayload decodeCpuDiagnosticMessagePayload(CpuService
     
     private AlarmMessagePayload decodeMessageServicePushPayload(CpuServicesParameter parameter, ByteBuf userData){
 
-        List<MessageObjectItem> MessageObjects = new LinkedList<>();
+        List<Object> MessageObjects = new LinkedList<>();
         List<ByteBuf> values = new LinkedList<>();
         int length;
         //Alarm message
@@ -1032,11 +1245,18 @@ private AlarmMessagePayload decodeMessageServicePushPayload(CpuServicesParameter
                 VariableAddressingMode SyntaxID = VariableAddressingMode.valueOf(userData.readByte());
                 byte NumberOfValues = userData.readByte();
                 int EventID = userData.readInt();
-                byte EventState = userData.readByte();
-                byte State = userData.readByte();
+                
+                byte EventState = 0x00;
+                byte State = 0x00;
+                if (parameter.getSubFunctionGroup() != CpuServicesParameterSubFunctionGroup.ALARM_ACK_IND) {                                          
+                    EventState = userData.readByte();                
+                    State = userData.readByte();
+                }
+                
                 byte AckStateGoing = userData.readByte();
                 byte AckStateComming = userData.readByte();
                 
+                //TODO: If NumberOfValues == 0 then AssociatedValues is null
                 List<AssociatedValueItem> AssociatedValues = new LinkedList<>();
                         
                 for (int j = 0; j < NumberOfValues; j++){
@@ -1067,106 +1287,177 @@ private AlarmMessagePayload decodeMessageServicePushPayload(CpuServicesParameter
                                             AckStateComming,
                                             AssociatedValues));
                 
-            }
-
-           return new AlarmMessagePayload(returnCode,
-                            dataTransportSize,
-                            parameter.getSubFunctionGroup(),
-                            length,
-                            new AlarmMessageItem(timestamp,
-                                    FunctionID,
-                                    NumberOfMessgaeObjects,
-                                    MessageObjects));
-            
+            }            
         }
         
-        
-      return null;  
+        return new AlarmMessagePayload(returnCode,
+                        dataTransportSize,
+                        parameter.getSubFunctionGroup(),
+                        length,
+                        new AlarmMessageItem(timestamp,
+                                FunctionID,
+                                NumberOfMessgaeObjects,
+                                MessageObjects));  
     };
 
     private AlarmMessagePayload decodeMessageServiceQueryPayload(CpuServicesParameter parameter, ByteBuf userData){
-        List<MessageObjectItem> MessageObjects = new LinkedList<>();
+  
+        List<Object> MessageObjects = new LinkedList<>();
+        CpuServicesResponseParameter thisparameter = null;
         int length;
         byte FunctionID;
         byte NumberOfMessageObjects; //Say 1, but I have 2 messages? Why?
         DataTransportErrorCode AlarmReturnCode;
         DataTransportSize AlarmTransportSize;
         int CompleteDataLength;
+        short dataUnitReferenceNumber = 0x0000;
+        boolean lastdataunit = true;
         
         //Data section
         DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
         DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
         length = userData.readShort(); //Number of message objects?
         
-        //Alarm message information
-        FunctionID = userData.readByte();
-        NumberOfMessageObjects = userData.readByte();
-        AlarmReturnCode = DataTransportErrorCode.valueOf(userData.readByte());
-        AlarmTransportSize = DataTransportSize.valueOf(userData.readByte());
-        CompleteDataLength = userData.readShort();
+        if (parameter instanceof CpuServicesResponseParameter){
+            thisparameter = (CpuServicesResponseParameter) parameter;
+            dataUnitReferenceNumber = (short) thisparameter.getDataUnitReferenceNumber();
+            lastdataunit = thisparameter.isLastDataUnit();
+        }
         
-        //Message Object
-        for (int i = 0; i < NumberOfMessageObjects; i++){
-            byte LengthOfDataSet = userData.readByte();
-            int Unknown_1 = userData.readShort();
-            Object AlarmType = CpuServicesParameterSubFunctionGroup.valueOf(userData.readByte());
-            int EnentID = userData.readShort();
-            int Unknown_2 = userData.readShort();
-            byte EventState =  userData.readByte();
-            byte AckStateGoing = userData.readByte();
-            byte AckStateComing = userData.readByte();  
-            LocalDateTime timestampComing;
-            
-            timestampComing = readDateAndTime(userData);       
-            
-            List<AssociatedValueItem> ComingValues = new LinkedList<>();
-            
-            int NumberOfValues = 1;
+        //Fragmente code
+        //The next Level query again.
+
+        if ((length > 2) && (!lastdataunit)){
             
-            for (int j = 0; j < NumberOfValues; j++){
-                DataTransportErrorCode valueCode = DataTransportErrorCode.valueOf(userData.readByte());
-                DataTransportSize valueTransportSize = DataTransportSize.valueOf(userData.readByte());
-                int valueLength = userData.readInt();
-                ByteBuf Data = userData.readBytes(valueLength);
-                ComingValues.add(new AssociatedValueItem(valueCode,
-                                        valueTransportSize,
-                                        valueLength,
-                                        Data));                
+            //Is alway a CpuServicesResponseParameter instance?
+            //CpuServicesResponseParameter thisparameter = (CpuServicesResponseParameter) parameter;
+            Pair<LocalDateTime, Queue<ByteBuf>> fragments = fragmentedData.get(dataUnitReferenceNumber);
+            if (fragments != null) {
+                Queue<ByteBuf> bytebufqueue = fragments.getValue();
+                bytebufqueue.add(userData);
+            } else {
+                Queue<ByteBuf> bytebufqueue = new ArrayDeque();
+                bytebufqueue.add(userData);
+                Pair<LocalDateTime, Queue<ByteBuf>> firtsfragment = new ImmutablePair(LocalDateTime.now(), bytebufqueue);
+                fragmentedData.put(dataUnitReferenceNumber, firtsfragment);
             }
-                                   
-            LocalDateTime timestampGoing;
-            
-            timestampGoing = readDateAndTime(userData); 
-            
-            List<AssociatedValueItem> GoingValues = new LinkedList<>();
             
-            for (int j = 0; j < NumberOfValues; j++){
-                DataTransportErrorCode valueCode = DataTransportErrorCode.valueOf(userData.readByte());
-                DataTransportSize valueTransportSize = DataTransportSize.valueOf(userData.readByte());
-                int valueLength = userData.readInt();
-                ByteBuf Data = userData.readBytes(valueLength);
-                GoingValues.add(new AssociatedValueItem(valueCode,
-                                        valueTransportSize,
-                                        valueLength,
-                                        Data));                
-            }            
-                    
             return new AlarmMessagePayload(returnCode,
                         dataTransportSize,
                         CpuServicesParameterSubFunctionGroup.ALARM_QUERY,
                         length,
-                        new AlarmMessageItem(FunctionID,
-                                NumberOfMessageObjects,
-                                AlarmReturnCode,
-                                AlarmTransportSize,
-                                CompleteDataLength,
-                                MessageObjects));                 
+                        null);             
+        }
+        
+        //Reemsable the fragments       
+        if (dataUnitReferenceNumber != 0x0000){
+            Pair<LocalDateTime, Queue<ByteBuf>> fragments = fragmentedData.get(dataUnitReferenceNumber);
+            if (fragments != null){ 
+                Queue<ByteBuf> bytebufqueue = fragments.getValue();
+                ByteBuf payload = bytebufqueue.remove();
+                for(ByteBuf nextpayload:bytebufqueue){
+                    if (nextpayload != null) { 
+                        payload.writeBytes(nextpayload);
+                        nextpayload.release();                          
+                    };
+                }               
+                payload.writeBytes(userData);
+                userData.clear();                 
+                userData.writeBytes(payload);                
+                payload.release();               
+                fragmentedData.remove(dataUnitReferenceNumber);
+            }            
         }        
-        return null;
+ 
+        //Alarm message information
+        FunctionID = userData.readByte();
+        NumberOfMessageObjects = userData.readByte();
+        AlarmReturnCode = DataTransportErrorCode.valueOf(userData.readByte());
+        AlarmTransportSize = DataTransportSize.valueOf(userData.readByte());
+        CompleteDataLength = userData.readShort();
+        
+        //Message Object
+        if (AlarmReturnCode == DataTransportErrorCode.OK){
+            ///length = 1+2+1+4+2+1+1+1+8+1+1+2+8+1+1+2 = 35
+            while (userData.isReadable(35)){              
+                byte LengthOfDataSet = userData.readByte();
+                int Unknown = userData.readShort();
+                AlarmQueryType AlarmType = AlarmQueryType.valueOf(userData.readByte());
+                int EnentID = userData.readInt();
+                Unknown = userData.readByte();
+                byte EventState =  userData.readByte();
+                byte AckStateGoing = userData.readByte();
+                byte AckStateComing = userData.readByte();  
+                
+                LocalDateTime timestampComing = null;
+                LocalDateTime timestampGoing = null;
+      
+                List<AssociatedValueItem> ComingValues = new LinkedList<>();
+                List<AssociatedValueItem> GoingValues = new LinkedList<>();
+               
+                switch(AlarmType){
+                    case ALARM_S:{
+                        //Coming data
+                        timestampComing = readDateAndTime(userData);                         
+                        DataTransportErrorCode valueCode = DataTransportErrorCode.valueOf(userData.readByte());
+                        DataTransportSize valueTransportSize = DataTransportSize.valueOf(userData.readByte());
+                        
+                        int valueLength = userData.readShort() / 8;
+                        
+                        ByteBuf Data = userData.readBytes(valueLength);
+                        ComingValues.add(new AssociatedValueItem(valueCode,
+                                                valueTransportSize,
+                                                valueLength,
+                                                Data));   
+                        //Going data
+                        timestampGoing = readDateAndTime(userData);
+                        
+                        valueCode = DataTransportErrorCode.valueOf(userData.readByte());
+                        valueTransportSize = DataTransportSize.valueOf(userData.readByte());
+                        
+                        valueLength = userData.readShort() / 8;;
+                        
+                        Data = userData.readBytes(valueLength);
+                        GoingValues.add(new AssociatedValueItem(valueCode,
+                                                valueTransportSize,
+                                                valueLength,
+                                                Data));                            
+                        }
+                    break;
+                    case ALARM_8: {
+                        //TODO: Decode values for ALARM_8
+                    }
+                    break;
+                    default:;                    
+                }
+              MessageObjects.add(new MessageObjectItem(LengthOfDataSet,
+                                        AlarmType,
+                                        EnentID,
+                                        EventState,
+                                        AckStateGoing,
+                                        AckStateComing,
+                                        timestampComing,
+                                        ComingValues,
+                                        timestampGoing,
+                                        GoingValues));
+            }    
+        }
+        
+        return new AlarmMessagePayload(returnCode,
+                    dataTransportSize,
+                    CpuServicesParameterSubFunctionGroup.ALARM_QUERY,
+                    length,
+                    new AlarmMessageItem(FunctionID,
+                            NumberOfMessageObjects,
+                            AlarmReturnCode,
+                            AlarmTransportSize,
+                            CompleteDataLength,
+                            MessageObjects));                 
+
     }    
     
     private AlarmMessagePayload decodeMessageServiceAckPayload(CpuServicesParameter parameter, ByteBuf userData){
-        List<MessageObjectItem> MessageObjects = new LinkedList<>();
+        List<Object> MessageObjects = new LinkedList<>();
         //Data section
         DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
         DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
@@ -1177,9 +1468,9 @@ private AlarmMessagePayload decodeMessageServiceAckPayload(CpuServicesParameter
         byte NumberOfMessageObjects = userData.readByte();
         
         //In the next leve if is != null -> Success
-        if (userData.readByte() != 0xff) {
-            MessageObjects = null;
-        }
+        for(int i=0; i< NumberOfMessageObjects; i++) {
+            MessageObjects.add(DataTransportErrorCode.valueOf(userData.readByte()));
+        };
         
         return new AlarmMessagePayload(returnCode,
                     dataTransportSize,
@@ -1187,43 +1478,93 @@ private AlarmMessagePayload decodeMessageServiceAckPayload(CpuServicesParameter
                     length,
                     new AlarmMessageItem(FunctionID,
                             NumberOfMessageObjects,
-                            null,
-                            null,
-                            0,
                             MessageObjects));        
         
     }    
     
+    
+    private CpuCyclicServicesResponsePayload decodeCyclicServiceResponsePayload(CpuCyclicServicesResponseParameter parameter, ByteBuf userData){
+        logger.info("decodeCyclicServiceResponsePayload :\r\n" + ByteBufUtil.prettyHexDump(userData));
+        DataTransportErrorCode AlarmReturnCode;
+        DataTransportSize AlarmTransportSize;
+        int length;
+        int itemcount;
+        
+        //Data section
+        DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
+        DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
+        length = userData.readShort(); //Number of bytes
+        userData.readByte(); //TODO: Sometimes is 0x00 another 0x01, Blinking when I have TIA running
+        itemcount = (length==0?0x0000:userData.readByte());
+        List<AssociatedValueItem> Values = new LinkedList<>();
+        try {
+        for (int i=0; i < itemcount; i++ ){                         
+            DataTransportErrorCode valueCode = DataTransportErrorCode.valueOf(userData.readByte());
+            DataTransportSize valueTransportSize = DataTransportSize.valueOf(userData.readByte());
+                        
+            int valueLength = userData.readShort() / 8;  
+            if ((valueLength % 2 != 0) && (userData.isReadable(valueLength+1))) {
+
+                userData.readByte(); //Fill byte for odd number of bytes
+            }
+
+            ByteBuf Data = userData.readBytes(valueLength);
+            
+            Values.add(new AssociatedValueItem(valueCode,
+                            valueTransportSize,
+                            valueLength,
+                            Data));            
+        }
+        } catch (Exception e) {
+            logger.info(e.getMessage());
+            return null;
+        }
+        
+        return new CpuCyclicServicesResponsePayload(
+                    returnCode,
+                    dataTransportSize,
+                    parameter.getSequenceNumber(),
+                    length,
+                    itemcount,
+                    Values);
+                
+
+    }    
+    
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // Helpers
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
     private synchronized void trySendingMessages(ChannelHandlerContext ctx) {
-        while(sentButUnacknowledgedTpdus.size() < maxAmqCaller) {
+        //logger.info("trySendingMessages {} < {}",sentButUnacknowledgedTpdus.size(),maxAmqCaller);
+        while(sentButUnacknowledgedTpdus.size() <= maxAmqCaller) {
             // Get the TPDU that is up next in the queue.
             DataTpdu curTpdu = (DataTpdu) queue.current();
 
             if (curTpdu != null) {
                 // Send the TPDU.
                 try {
+                    //logger.info("trySendingMessages: Trata de enviar todos los mensajes...");
                     ChannelFuture channelFuture = queue.removeAndWrite();
                     ctx.flush();
                     if (channelFuture == null) {
                         break;
                     }
                 } catch (Exception e) {
-                    logger.error("Error sending more queues messages", e);
+                    logger.debug("trySendingMessages: Error sending more queues messages", e);
                     ctx.fireExceptionCaught(e);
                 }
 
                 if(curTpdu.getParent() != null) {
+                    //logger.info("Tiene un pariente...");
                     // Add it to the list of sentButUnacknowledgedTpdus.
                     // (It seems that the S7 drops the value of the COTP reference id, so we have to use the S7 one)
                     S7RequestMessage s7RequestMessage = (S7RequestMessage) curTpdu.getParent();
+                    
                     sentButUnacknowledgedTpdus.put(s7RequestMessage.getTpduReference(), curTpdu);
 
-                    logger.debug("S7 Message with id {}Ā sent", s7RequestMessage.getTpduReference());
+                    logger.debug("trySendingMessages: S7 Message with id {}Ā sent", s7RequestMessage.getTpduReference());
                 }
                 // TODO: Perhaps remove this.
                 break;
@@ -1262,9 +1603,9 @@ private S7ControllerType lookupControllerType(String articleNumber) {
      *          +----------------+
      * Byte n   | Year   0 to 99 |
      *          +----------------+
-     * Byte n+1 | Month  0 to 12 |
+     * Byte n+1 | Month  1 to 12 |
      *          +----------------+
-     * Byte n+2 | Day    0 to 31 |    
+     * Byte n+2 | Day    1 to 31 |    
      *          +----------------+
      * Byte n+3 | Hour   0 to 23 |    
      *          +----------------+  
@@ -1279,10 +1620,11 @@ private S7ControllerType lookupControllerType(String articleNumber) {
     */
     private LocalDateTime readDateAndTime(ByteBuf data) {
         //from Plc4XS7Protocol
-
         int year=convertByteToBcd(data.readByte());
-        int month=convertByteToBcd(data.readByte());
-        int day=convertByteToBcd(data.readByte());
+        byte themonth = data.readByte();
+        int month=convertByteToBcd(themonth==0x00?0x01:themonth);
+        byte theday = data.readByte();
+        int day=convertByteToBcd(theday==0x00?0x01:theday);
         int hour=convertByteToBcd(data.readByte());
         int minute=convertByteToBcd(data.readByte());
         int second=convertByteToBcd(data.readByte());        
@@ -1300,9 +1642,10 @@ private LocalDateTime readDateAndTime(ByteBuf data) {
         else{
             year+=2000;
         }
-
+        
         return LocalDateTime.of(year,month,day,hour,minute,second, nanoseconds);
     }
+    
 
     private LocalTime readTimeOfDay(ByteBuf data) {
         //per definition for Date_And_Time only the first 6 bytes are used
@@ -1332,5 +1675,6 @@ private static int convertByteToBcd(byte incomingByte) {
         int dec = (incomingByte >> 4) * 10;
         return dec + (incomingByte & 0x0f);
     }    
+
     
 }
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/events/S7Alarm.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/events/S7Alarm.java
index 07b951e7778..3f429779c98 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/events/S7Alarm.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/events/S7Alarm.java
@@ -27,6 +27,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.time.ZoneOffset;
 import java.util.Collection;
 import java.util.Hashtable;
 import org.apache.plc4x.java.api.messages.PlcReadRequest;
@@ -87,8 +88,8 @@ public S7Alarm(MessageObjectItem s7alarm) {
     }
     
     @Override
-    public Instant getTimestamp() {
-        return s7alarm.getTimestampComing().toInstant();
+    public Instant getTimestamp() {        
+        return s7alarm.getTimestampComing().toInstant(ZoneOffset.UTC);
     }
 
     @Override
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuCyclicServicesRequestParameter.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuCyclicServicesRequestParameter.java
new file mode 100644
index 00000000000..9c2dd231f5c
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuCyclicServicesRequestParameter.java
@@ -0,0 +1,60 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.params;
+
+import org.apache.plc4x.java.s7.netty.model.types.CpuCyclicServicesParameterSubFunctionGroupType;
+import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterFunctionGroup;
+import org.apache.plc4x.java.s7.netty.model.types.CpuUserDataMethodType;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class CpuCyclicServicesRequestParameter extends CpuServicesRequestParameter {
+    private CpuUserDataMethodType Method;    
+    private CpuCyclicServicesParameterSubFunctionGroupType cyclicSubFunction;
+
+    public CpuCyclicServicesRequestParameter(CpuUserDataMethodType Method, 
+            CpuServicesParameterFunctionGroup functionGroup, 
+            CpuCyclicServicesParameterSubFunctionGroupType cyclicSubFunction, 
+            byte sequenceNumber) {
+        super(functionGroup, null, sequenceNumber);
+        this.Method = Method;
+        this.cyclicSubFunction = cyclicSubFunction;
+    }
+
+    public CpuUserDataMethodType getMethod() {
+        return Method;
+    }
+
+    public CpuCyclicServicesParameterSubFunctionGroupType getCyclicSubFunction() {
+        return cyclicSubFunction;
+    }
+    
+    /*
+    * TODO: The parameter type is not consistent for all posible objects. Must be evaluated.
+    */
+    @Override
+    public ParameterType getType() {        
+        return ParameterType.CPU_SERVICES;
+    }
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuCyclicServicesResponseParameter.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuCyclicServicesResponseParameter.java
new file mode 100644
index 00000000000..9208ca04fd5
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuCyclicServicesResponseParameter.java
@@ -0,0 +1,50 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.params;
+
+import org.apache.plc4x.java.s7.netty.model.types.CpuCyclicServicesParameterSubFunctionGroupType;
+import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterFunctionGroup;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterError;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+
+public class CpuCyclicServicesResponseParameter extends CpuServicesResponseParameter {
+
+    private CpuCyclicServicesParameterSubFunctionGroupType subCycFunctionGroup;
+
+    public CpuCyclicServicesResponseParameter(
+            CpuServicesParameterFunctionGroup functionGroup,              
+            CpuCyclicServicesParameterSubFunctionGroupType subCycFunctionGroup, 
+            byte sequenceNumber,
+            byte dataUnitReferenceNumber, 
+            boolean lastDataUnit, 
+            ParameterError error) {
+        super(functionGroup, null, sequenceNumber, dataUnitReferenceNumber, lastDataUnit, error);
+        this.subCycFunctionGroup = subCycFunctionGroup;
+    }
+
+    public CpuCyclicServicesParameterSubFunctionGroupType getSubCycFunctionGroup() {
+        return subCycFunctionGroup;
+    }
+
+    @Override
+    public ParameterType getType() {
+        return ParameterType.CPU_SERVICES;
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesResponseParameter.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesResponseParameter.java
index 35182022f9b..e46a54c74cc 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesResponseParameter.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesResponseParameter.java
@@ -28,6 +28,16 @@ public class CpuServicesResponseParameter extends CpuServicesParameter {
     private boolean lastDataUnit;
     private ParameterError error;
 
+    public CpuServicesResponseParameter(CpuServicesParameterFunctionGroup functionGroup, 
+            CpuServicesParameterSubFunctionGroup subFunctionGroup,
+            byte sequenceNumber) {
+        
+        super(functionGroup, subFunctionGroup, sequenceNumber);
+        this.dataUnitReferenceNumber = 0x00;
+        this.lastDataUnit = false;
+        this.error = null;
+    }    
+    
     public CpuServicesResponseParameter(CpuServicesParameterFunctionGroup functionGroup, 
             CpuServicesParameterSubFunctionGroup subFunctionGroup,
             byte sequenceNumber, 
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/AlarmMessagePayload.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/AlarmMessagePayload.java
index 1689b705c4d..5416aa8b877 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/AlarmMessagePayload.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/AlarmMessagePayload.java
@@ -37,6 +37,17 @@ public class AlarmMessagePayload implements S7Payload, S7PushMessage {
     private final Integer length;
     private final AlarmMessageItem msg;    
 
+    public AlarmMessagePayload(DataTransportErrorCode returnCode, 
+            DataTransportSize dataTransportSize, 
+            Integer length,
+            AlarmMessageItem msg) {
+        this.returnCode = returnCode;
+        this.dataTransportSize = dataTransportSize;
+        this.msgtype = null;
+        this.length = length;
+        this.msg = msg;
+    }    
+    
     public AlarmMessagePayload(DataTransportErrorCode returnCode, 
             DataTransportSize dataTransportSize, 
             Object msgtype, 
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesRequestPayload.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesRequestPayload.java
new file mode 100644
index 00000000000..1d1eeacb735
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesRequestPayload.java
@@ -0,0 +1,91 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.payloads;
+
+import java.util.List;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.S7AnyVarPayloadItem;
+import org.apache.plc4x.java.s7.netty.model.types.CpuCyclicServiceTimeBaseType;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class CpuCyclicServicesRequestPayload implements S7Payload {
+    private final DataTransportErrorCode returnCode;
+    private final DataTransportSize dataTransportSize;
+    private final int length;
+    private final int itemCount;
+    private final CpuCyclicServiceTimeBaseType timeBase;
+    private final byte timeFactor;
+    private final List<S7AnyVarPayloadItem> items;    
+
+    public CpuCyclicServicesRequestPayload(DataTransportErrorCode returnCode, 
+            DataTransportSize dataTransportSize, 
+            int length, 
+            int itemCount, 
+            CpuCyclicServiceTimeBaseType timeBase, 
+            byte timeFactor, 
+            List<S7AnyVarPayloadItem> items) {
+        this.returnCode = returnCode;
+        this.dataTransportSize = dataTransportSize;
+        this.length = length;
+        this.itemCount = itemCount;
+        this.timeBase = timeBase;
+        this.timeFactor = timeFactor;
+        this.items = items;
+    }
+
+    public DataTransportErrorCode getReturnCode() {
+        return returnCode;
+    }
+
+    public DataTransportSize getDataTransportSize() {
+        return dataTransportSize;
+    }
+
+    public int getLength() {
+        return length;
+    }
+
+    public int getItemCount() {
+        return itemCount;
+    }
+
+    public CpuCyclicServiceTimeBaseType getTimeBase() {
+        return timeBase;
+    }
+
+    public byte getTimeFactor() {
+        return timeFactor;
+    }
+
+    public List<S7AnyVarPayloadItem> getItems() {
+        return items;
+    }
+
+    @Override
+    public ParameterType getType() {
+        return ParameterType.CPU_SERVICES;
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesResponsePayload.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesResponsePayload.java
new file mode 100644
index 00000000000..a7cf4e8ed7e
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesResponsePayload.java
@@ -0,0 +1,84 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.payloads;
+
+import java.util.List;
+import org.apache.plc4x.java.s7.netty.model.messages.S7PushMessage;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class CpuCyclicServicesResponsePayload implements S7Payload, S7PushMessage {
+    private final DataTransportErrorCode returnCode;
+    private final DataTransportSize dataTransportSize;
+    private final byte jobId;
+    private final int length;
+    private final int itemCount;
+    private final List<AssociatedValueItem> items;    
+
+    public CpuCyclicServicesResponsePayload(DataTransportErrorCode returnCode, 
+            DataTransportSize dataTransportSize, 
+            byte jobId, 
+            int length, 
+            int itemCount, 
+            List<AssociatedValueItem> items) {
+        this.returnCode = returnCode;
+        this.dataTransportSize = dataTransportSize;
+        this.jobId = jobId;
+        this.length = length;
+        this.itemCount = itemCount;
+        this.items = items;
+    }
+
+    public DataTransportErrorCode getReturnCode() {
+        return returnCode;
+    }
+
+    public DataTransportSize getDataTransportSize() {
+        return dataTransportSize;
+    }
+
+    public int getLength() {
+        return length;
+    }
+
+    public byte getJobId() {
+        return jobId;
+    }    
+    
+    public int getItemCount() {
+        return itemCount;
+    }
+
+    public List<AssociatedValueItem> getItems() {
+        return items;
+    }
+
+    @Override
+    public ParameterType getType() {
+        return ParameterType.CPU_SERVICES;
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesUnsubscribePayload.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesUnsubscribePayload.java
new file mode 100644
index 00000000000..fa1cdd74dc6
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesUnsubscribePayload.java
@@ -0,0 +1,79 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.payloads;
+
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class CpuCyclicServicesUnsubscribePayload implements S7Payload {
+    private final DataTransportErrorCode returnCode;
+    private final DataTransportSize dataTransportSize;
+    private final int length;
+    private final byte function;
+    private final byte jobId;
+
+    public CpuCyclicServicesUnsubscribePayload(DataTransportErrorCode returnCode, 
+            DataTransportSize dataTransportSize, 
+            int length, 
+            byte function, 
+            byte jobId) {
+        this.returnCode = returnCode;
+        this.dataTransportSize = dataTransportSize;
+        this.length = length;
+        this.function = function;
+        this.jobId = jobId;
+    }
+
+    public DataTransportErrorCode getReturnCode() {
+        return returnCode;
+    }
+
+    public DataTransportSize getDataTransportSize() {
+        return dataTransportSize;
+    }
+
+    public int getLength() {
+        return length;
+    }
+
+    public byte getFunction() {
+        return function;
+    }
+
+    public byte getJobId() {
+        return jobId;
+    }
+
+    
+
+
+
+
+    @Override
+    public ParameterType getType() {
+        return ParameterType.CPU_SERVICES;
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/VarPayload.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/VarPayload.java
index 0167fb75e08..9c094d35348 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/VarPayload.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/VarPayload.java
@@ -18,11 +18,10 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.plc4x.java.s7.netty.model.payloads;
 
-import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
-import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
-
 import java.util.ArrayList;
 import java.util.List;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
 
 /**
  * Used for writes to S7 as part of a Valid {@link org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage} together
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AlarmMessageItem.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AlarmMessageItem.java
index 50afe30be52..d5dfc56fdb2 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AlarmMessageItem.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AlarmMessageItem.java
@@ -35,12 +35,26 @@ public class AlarmMessageItem {
     private final byte function;
     private final byte objects;
     private final int Length;
-    private final List<MessageObjectItem> msgItems; 
-
+    private final List<Object> msgItems; 
+   
+    
+    public AlarmMessageItem(byte function, 
+            byte objects, 
+            List<Object> msgItems) {
+        
+        this.timestamp = null;
+        this.function = function;
+        this.objects = objects;
+        this.msgItems = msgItems;
+        this.returnCode = null;
+        this.dataTransportSize = null;
+        this.Length = 0;
+    }    
+    
     public AlarmMessageItem(LocalDateTime timestamp, 
             byte function, 
             byte objects, 
-            List<MessageObjectItem> msgItems) {
+            List<Object> msgItems) {
         
         this.timestamp = timestamp;
         this.function = function;
@@ -56,7 +70,7 @@ public AlarmMessageItem(byte function,
             DataTransportErrorCode returnCode,
             DataTransportSize dataTransportSize,
             int Length,
-            List<MessageObjectItem> msgItems){
+            List<Object> msgItems){
         this.function = function;
         this.objects = objects;
         this.returnCode = returnCode;
@@ -92,7 +106,7 @@ public int getLength() {
         return Length;
     }
 
-    public List<MessageObjectItem> getMsgItems() {
+    public List<Object> getMsgItems() {
         return msgItems;
     }
 
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/MessageObjectItem.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/MessageObjectItem.java
index 081b3460619..752e5ddacea 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/MessageObjectItem.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/MessageObjectItem.java
@@ -19,9 +19,11 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 package org.apache.plc4x.java.s7.netty.model.payloads.items;
 
-import java.time.format.DateTimeFormatter;
-import java.util.Calendar;
+import java.time.LocalDateTime;
 import java.util.List;
+import org.apache.plc4x.java.s7.netty.model.types.AlarmQueryType;
+import org.apache.plc4x.java.s7.netty.model.types.QueryType;
+import org.apache.plc4x.java.s7.netty.model.types.VariableAddressingMode;
 
 /**
  *
@@ -31,21 +33,102 @@ public class MessageObjectItem {
     
     private final byte VariableSpecification;
     private final byte Length;
-    private final Object SyntaxID;
+    private final VariableAddressingMode SyntaxID;
     private final byte NumberOfValues;
     private final int EventID;
     private final byte EventState;
     private final byte State;
     private final byte AckStateGoing;
     private final byte AckStateComming;
-    private final Calendar TimestampComing;
-    private final Calendar TimestampGoing;
+    private final LocalDateTime TimestampComing;
+    private final LocalDateTime TimestampGoing;
     private final List<AssociatedValueItem> ComingValues;
-    private final List<AssociatedValueItem> GoingValues;     
+    private final List<AssociatedValueItem> GoingValues;  
+    //For Query alarms.
+    private final QueryType querytype;
+    private final AlarmQueryType alarmtype;
+     
+    //For Query request
+    public MessageObjectItem(byte VariableSpecification, 
+            byte Length, 
+            VariableAddressingMode SyntaxID, 
+            QueryType querytype, 
+            AlarmQueryType alarmtype) {
+        
+        this.VariableSpecification = VariableSpecification;
+        this.Length = Length;
+        this.SyntaxID = SyntaxID;
+        this.NumberOfValues = 0x00;
+        this.EventID = 0x0000;
+        this.EventState = 0x00;
+        this.State = 0x00;
+        this.AckStateGoing = 0x00;
+        this.AckStateComming = 0x00;
+        this.TimestampComing = null;
+        this.ComingValues = null;
+        this.TimestampGoing = null;               
+        this.GoingValues = null;
+        this.querytype = querytype;
+        this.alarmtype = alarmtype;
+    }   
+    
+    //For Query reply
+    public MessageObjectItem(byte Length, 
+            AlarmQueryType alarmtype, 
+            int EventID, 
+            byte EventState, 
+            byte AckStateGoing, 
+            byte AckStateComming, 
+            LocalDateTime TimestampComing,
+            List<AssociatedValueItem> ComingValues,
+            LocalDateTime TimestampGoing, 
+            List<AssociatedValueItem> GoingValues) {
+        
+        this.VariableSpecification = 0x00;
+        this.Length = Length;
+        this.SyntaxID = null;
+        this.NumberOfValues = 0x00;
+        this.EventID = EventID;
+        this.EventState = EventState;
+        this.State = 0x00;
+        this.AckStateGoing = AckStateGoing;
+        this.AckStateComming = AckStateComming;
+        this.TimestampComing = TimestampComing;
+        this.ComingValues = ComingValues;
+        this.TimestampGoing = TimestampGoing;               
+        this.GoingValues = GoingValues;
+        this.querytype = null;
+        this.alarmtype = alarmtype;        
+    }    
 
     public MessageObjectItem(byte VariableSpecification, 
             byte Length, 
-            Object SyntaxID, 
+            VariableAddressingMode SyntaxID, 
+            byte NumberOfValues, 
+            int EventID, 
+            byte AckStateGoing, 
+            byte AckStateComming) {
+        
+        this.VariableSpecification = VariableSpecification;
+        this.Length = Length;
+        this.SyntaxID = SyntaxID;
+        this.NumberOfValues = NumberOfValues;
+        this.EventID = EventID;
+        this.EventState = 0x00;
+        this.State = 0x00;
+        this.AckStateGoing = AckStateGoing;
+        this.AckStateComming = AckStateComming;
+        this.TimestampComing = null;
+        this.ComingValues = null;
+        this.TimestampGoing = null;               
+        this.GoingValues = null;
+        this.querytype = null;
+        this.alarmtype = null;
+    }    
+    
+    public MessageObjectItem(byte VariableSpecification, 
+            byte Length, 
+            VariableAddressingMode SyntaxID, 
             byte NumberOfValues, 
             int EventID, 
             byte EventState, 
@@ -67,20 +150,22 @@ public MessageObjectItem(byte VariableSpecification,
         this.ComingValues = Values;
         this.TimestampGoing = null;               
         this.GoingValues = null;
+        this.querytype = null;
+        this.alarmtype = null;        
     }
     
     public MessageObjectItem(byte VariableSpecification, 
             byte Length, 
-            Object SyntaxID, 
+            VariableAddressingMode SyntaxID, 
             byte NumberOfValues, 
             int EventID, 
             byte EventState, 
             byte State, 
             byte AckStateGoing, 
             byte AckStateComming,
-            Calendar TimestampComing,
+            LocalDateTime TimestampComing,
             List<AssociatedValueItem> ComingValues,
-            Calendar TimestampGoing,
+            LocalDateTime TimestampGoing,
             List<AssociatedValueItem> GoingValues) {
         
         this.VariableSpecification = VariableSpecification;
@@ -96,8 +181,10 @@ public MessageObjectItem(byte VariableSpecification,
         this.ComingValues = ComingValues;
         this.TimestampGoing = TimestampGoing;               
         this.GoingValues = GoingValues;
+        this.querytype = null;
+        this.alarmtype = null;        
     }    
-
+    
     public byte getVariableSpecification() {
         return VariableSpecification;
     }
@@ -106,7 +193,7 @@ public byte getLength() {
         return Length;
     }
 
-    public Object getSyntaxID() {
+    public VariableAddressingMode getSyntaxID() {
         return SyntaxID;
     }
 
@@ -134,11 +221,11 @@ public byte getAckStateComming() {
         return AckStateComming;
     }
 
-    public Calendar getTimestampComing() {
+    public LocalDateTime getTimestampComing() {
         return TimestampComing;
     }
 
-    public Calendar getTimestampGoing() {
+    public LocalDateTime getTimestampGoing() {
         return TimestampGoing;
     }
 
@@ -150,29 +237,34 @@ public List<AssociatedValueItem> getGoingValues() {
         return GoingValues;
     }
 
+    public QueryType getQuerytype() {
+        return querytype;
+    }
+
+    public AlarmQueryType getAlarmtype() {
+        return alarmtype;
+    }
+
     @Override
     public String toString() {
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss.SSS");
-        return "MessageObjectItem{" + "VariableSpecification=" + VariableSpecification 
-                + ", Length=" + Length 
-                + ", SyntaxID=" + SyntaxID 
-                + ", NumberOfValues=" + NumberOfValues 
-                + ", EventID=" + EventID 
-                + ", EventState=" + EventState 
-                + ", State=" + State 
-                + ", AckStateGoing=" + AckStateGoing 
-                + ", AckStateComming=" + AckStateComming 
-                + ", TimestampComing=" + TimestampComing
-                + ", TimestampGoing="  + TimestampGoing 
-                + ", ComingValues=" + ComingValues 
-                + ", GoingValues=" + GoingValues 
-                + '}';
+        return "MessageObjectItem{" + "VariableSpecification=" + VariableSpecification +
+                ", Length=" + Length +
+                ", SyntaxID=" + SyntaxID +
+                ", NumberOfValues=" + NumberOfValues +
+                ", EventID=" + EventID +
+                ", EventState=" + EventState +
+                ", State=" + State +
+                ", AckStateGoing=" + AckStateGoing +
+                ", AckStateComming=" + AckStateComming +
+                ", TimestampComing=" + TimestampComing +
+                ", TimestampGoing=" + TimestampGoing +
+                ", ComingValues=" + ComingValues +
+                ", GoingValues=" + GoingValues +
+                ", querytype=" + querytype +
+                ", alarmtype=" + alarmtype + '}';
     }
+        
 
 
-
-    
- 
-    
     
 }
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/S7AnyVarPayloadItem.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/S7AnyVarPayloadItem.java
new file mode 100644
index 00000000000..512cbced5a9
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/S7AnyVarPayloadItem.java
@@ -0,0 +1,95 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.payloads.items;
+
+import org.apache.plc4x.java.s7.netty.model.params.items.*;
+import org.apache.plc4x.java.s7.netty.model.types.MemoryArea;
+import org.apache.plc4x.java.s7.netty.model.types.SpecificationType;
+import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
+import org.apache.plc4x.java.s7.netty.model.types.VariableAddressingMode;
+
+/**
+ * "Low-level" description of S7 Address range and the necessary size for transportation of values.
+ * Is used as Arguments of {@link org.apache.plc4x.java.s7.netty.model.params.VarParameter} object.
+ *
+ * Contains the information to read one or more sequential values of the same datatype starting from given offset in a memory region
+ * and also contains the transportation size of the datatype read.
+ *
+ * In detail:
+ * <ul>
+ *     <li>transportSize - {@link TransportSize} of the datatype</li>
+ *     <li>numElements - number of consecutive elements to be read</li>
+ *     <li>dataBlockNumber - number of the datablock</li>
+ *     <li>bit / byteOffset where the adress starts</li>
+ * </ul>
+ */
+public class S7AnyVarPayloadItem implements VarParameterItem {
+
+    private final SpecificationType specificationType;
+    private final MemoryArea memoryArea;
+    private final TransportSize dataType;
+    private final int numElements;
+    private final int dataBlockNumber;
+    private final int byteOffset;
+    private final byte bitOffset;
+
+    public S7AnyVarPayloadItem(SpecificationType specificationType, MemoryArea memoryArea, TransportSize dataType, int numElements, int dataBlockNumber, int byteOffset, byte bitOffset) {
+        this.specificationType = specificationType;
+        this.memoryArea = memoryArea;
+        this.dataType = dataType;
+        this.numElements = numElements;
+        this.dataBlockNumber = dataBlockNumber;
+        this.byteOffset = byteOffset;
+        this.bitOffset = bitOffset;
+    }
+
+    @Override
+    public VariableAddressingMode getAddressingMode() {
+        return VariableAddressingMode.S7ANY;
+    }
+
+    public SpecificationType getSpecificationType() {
+        return specificationType;
+    }
+
+    public MemoryArea getMemoryArea() {
+        return memoryArea;
+    }
+
+    public TransportSize getDataType() {
+        return dataType;
+    }
+
+    public int getNumElements() {
+        return numElements;
+    }
+
+    public int getDataBlockNumber() {
+        return dataBlockNumber;
+    }
+
+    public int getByteOffset() {
+        return byteOffset;
+    }
+
+    public byte getBitOffset() {
+        return bitOffset;
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuCyclicServiceTimeBaseType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuCyclicServiceTimeBaseType.java
new file mode 100644
index 00000000000..add0100ae72
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuCyclicServiceTimeBaseType.java
@@ -0,0 +1,76 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.plc4x.java.api.model.PlcField;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum CpuCyclicServiceTimeBaseType implements PlcField {
+    
+    TB_100_MS("100 MS", (byte) 0x00),
+    TB_1_SEC("1 SECOND", (byte) 0x01),
+    TB_10_SEC("10 SECONDS", (byte) 0x02);
+    
+    
+    private static final Map<Byte, CpuCyclicServiceTimeBaseType> map;
+    
+    static {
+        map = new HashMap<>();
+        for (CpuCyclicServiceTimeBaseType subevent : CpuCyclicServiceTimeBaseType.values()) {
+            map.put(subevent.code, subevent);
+        }
+    }    
+    
+    private final String event;
+    private final byte code;
+    
+    CpuCyclicServiceTimeBaseType(String event, byte code){
+        this.event = event;
+        this.code = code;
+    }
+    
+    public String getEvent(){
+        return event;
+    }    
+    
+    public byte getCode() {
+        return code;
+    }    
+    
+    public static CpuCyclicServiceTimeBaseType valueOfEvent(String event) {
+        for (CpuCyclicServiceTimeBaseType value : CpuCyclicServiceTimeBaseType.values()) {
+            if(value.getEvent().equals(event)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static CpuCyclicServiceTimeBaseType valueOf(byte code) {
+        return map.get(code);
+    }
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterFunctionGroup.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterFunctionGroup.java
index 25f5ac07e78..e01f91dced1 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterFunctionGroup.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterFunctionGroup.java
@@ -18,15 +18,22 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.plc4x.java.s7.netty.model.types;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.HashMap;
 import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public enum CpuServicesParameterFunctionGroup {
 
-    CPU_FUNCTIONS((byte) 0x04);
+    MODE_TRANSITION((byte) 0x00),
+    PROGRAMMER_COMMANDS((byte) 0x01),
+    CYCLIC_SERVICES((byte) 0x02),
+    BLOCK_FUNCTIONS((byte) 0x03),
+    CPU_FUNCTIONS((byte) 0x04),
+    SECURITY((byte) 0x05),
+    PCB_BSEND_BRECV((byte) 0x06),
+    TIMER_FUNCTIONS((byte) 0x07),
+    NC_PROGRAMMING((byte) 0x0f);
 
     private static final Logger logger = LoggerFactory.getLogger(CpuServicesParameterFunctionGroup.class);
 
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterType.java
index ed7da61b4a3..629124f73e9 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterType.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterType.java
@@ -31,6 +31,7 @@ public enum ParameterType {
     MODE_TRANSITION((byte) 0x01),
     READ_VAR((byte) 0x04),
     WRITE_VAR((byte) 0x05),
+    ALARM_ACK((byte) 0x0b),
     REQUEST_DOWNLOAD((byte) 0x1A),
     DOWNLOAD_BLOCK((byte) 0x1B),
     DOWNLOAD_ENDED((byte) 0x1C),
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/QueryType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/QueryType.java
new file mode 100644
index 00000000000..9ee92e22c7b
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/QueryType.java
@@ -0,0 +1,73 @@
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum QueryType {
+    
+    BYALARMTYPE("BYALARMTYPE", (byte) 0x01),
+    BYEVENTID("BYEVENTID", (byte) 0x02),
+    NONE("NONE", (byte) 0x00);
+    
+    
+    private static final Map<Byte, QueryType> map;
+    
+    static {
+        map = new HashMap<>();
+        for (QueryType  subevent : QueryType .values()) {
+            map.put(subevent.code, subevent);
+        }
+    }    
+    
+    private final String event;
+    private final byte code;
+    
+    QueryType(String event, byte code){
+        this.event = event;
+        this.code = code;
+    }
+    
+    public String getEvent(){
+        return event;
+    }    
+    
+    public byte getCode() {
+        return code;
+    }    
+    
+    public static QueryType  valueOfEvent(String event) {
+        for (QueryType  value : QueryType .values()) {
+            if(value.getEvent().equals(event)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static QueryType  valueOf(byte code) {
+        return map.get(code);
+    }    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/VariableAddressingMode.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/VariableAddressingMode.java
index 5a2af697272..0e5b241ab61 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/VariableAddressingMode.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/VariableAddressingMode.java
@@ -24,6 +24,8 @@ Licensed to the Apache Software Foundation (ASF) under one
 /**
  * (Values determined by evaluating generated ".pcap" files)
  * Renamed from "SyntaxId".
+ * 
+ * Is the same DataItemSyntaxIdType
  */
 public enum VariableAddressingMode {
     S7ANY((byte) 0x10),
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcEventHandler.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldEventHandler.java
similarity index 78%
rename from plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcEventHandler.java
rename to plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldEventHandler.java
index c009caee8fa..560944aef22 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcEventHandler.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldEventHandler.java
@@ -22,17 +22,20 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
 import org.apache.plc4x.java.api.model.PlcField;
 import org.apache.plc4x.java.base.connection.DefaultPlcFieldHandler;
-import org.apache.plc4x.java.s7.netty.model.types.SubscribedEventType;
+import org.apache.plc4x.java.s7.model.S7SubscriptionField;
 
 /**
  *
  * 
  */
-public class S7PlcEventHandler extends DefaultPlcFieldHandler {
+public class S7PlcFieldEventHandler extends DefaultPlcFieldHandler {
 
     @Override
     public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
-        return SubscribedEventType.valueOfEvent(fieldQuery);
+        if (S7SubscriptionField.matches(fieldQuery)) {
+            return S7SubscriptionField.of(fieldQuery);
+        }
+        throw new PlcInvalidFieldException(fieldQuery);
     }
     
 }
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelper.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelper.java
index 0010d7871c1..45076458a5b 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelper.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelper.java
@@ -19,11 +19,14 @@ Licensed to the Apache Software Foundation (ASF) under one
 package org.apache.plc4x.java.s7.netty.util;
 
 import java.util.List;
+import org.apache.plc4x.java.s7.netty.model.params.CpuCyclicServicesRequestParameter;
 import org.apache.plc4x.java.s7.netty.model.params.CpuServicesRequestParameter;
 import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
 import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
 import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
 import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.AlarmMessagePayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuCyclicServicesRequestPayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.CpuMessageSubscriptionServicePayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.CpuServicesPayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
@@ -83,6 +86,16 @@ public static short getPayloadsLength(List<S7Payload> payloads) {
                     return 16;                    
                 }
   
+            } else if(payload instanceof AlarmMessagePayload) {
+                AlarmMessagePayload data = (AlarmMessagePayload) payload;
+                l += data.getLength();
+                l += 0x04; //TODO: Check for other combinations
+                return l;
+            } else if(payload instanceof CpuCyclicServicesRequestPayload) {
+                CpuCyclicServicesRequestPayload data = (CpuCyclicServicesRequestPayload) payload;
+                l += data.getLength();
+                l += 0x04; //TODO: Check for other combinations
+                return l;
             }
         }
         return l;
@@ -104,6 +117,8 @@ public static short getParameterLength(S7Parameter parameter) {
             case CPU_SERVICES:
                 if(parameter instanceof CpuServicesRequestParameter) {
                     return 8;
+                } else if(parameter instanceof CpuCyclicServicesRequestParameter) {
+                    return 8;   
                 } else {
                     return 12;
                 }
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7CyclicServicesSubscriptionHandle.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7CyclicServicesSubscriptionHandle.java
new file mode 100644
index 00000000000..81d20ff8915
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7CyclicServicesSubscriptionHandle.java
@@ -0,0 +1,83 @@
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+package org.apache.plc4x.java.s7.protocol;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Consumer;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
+import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7CyclicServicesSubscriptionHandle implements PlcSubscriptionHandle {
+    Set<Consumer<PlcSubscriptionEvent>> consumers = new HashSet<>();
+        
+    //CyClic Services information hanler
+    private final String fieldName; //Subscription id from the request
+    private final byte jobId; //Job-Id from cyclic subscriotion
+    private final short error; //Register the error from the suscription.
+    private Map<String,AssociatedValueItem> items;
+
+    public S7CyclicServicesSubscriptionHandle(String fieldName, 
+            byte jobId, 
+            short error, 
+            Map<String,AssociatedValueItem> items) {
+        this.fieldName = fieldName;
+        this.jobId = jobId;
+        this.error = error;
+        this.items = items;
+    }
+
+    public Set<Consumer<PlcSubscriptionEvent>> getConsumers() {
+        return consumers;
+    }
+
+    public String getFieldName() {
+        return fieldName;
+    }
+    
+    public byte getJobId() {
+        return jobId;
+    }
+
+    public short getError() {
+        return error;
+    }
+    
+    public AssociatedValueItem getValueItem(String index){
+        return items.get(index);
+    }
+
+    public Map<String, AssociatedValueItem> getItems() {
+        return items;
+    }
+                           
+    @Override
+    public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer) {
+        consumers.add(consumer);
+        return () -> {consumers.remove(consumer);};
+    }
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7DiagnosticSubscriptionHandle.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7DiagnosticSubscriptionHandle.java
new file mode 100644
index 00000000000..139242a2288
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7DiagnosticSubscriptionHandle.java
@@ -0,0 +1,46 @@
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+package org.apache.plc4x.java.s7.protocol;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Consumer;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
+import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+import org.apache.plc4x.java.s7.netty.model.types.SubscribedEventType;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7DiagnosticSubscriptionHandle implements PlcSubscriptionHandle {
+    Set<Consumer<PlcSubscriptionEvent>> consumers = new HashSet<>();
+    
+    //Diagnostic events
+    List<SubscribedEventType> subscribedevents; 
+        
+    @Override
+    public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer) {
+        consumers.add(consumer);
+        return () -> {consumers.remove(consumer);};
+    }
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/types/S7SubscriptionFieldType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/types/S7SubscriptionFieldType.java
new file mode 100644
index 00000000000..60afd253fad
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/types/S7SubscriptionFieldType.java
@@ -0,0 +1,34 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.types;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum S7SubscriptionFieldType {
+   
+    EVENT_SUBSCRIPTION,
+    EVENT_UNSUBSCRIPTION,
+    ALARM_ACK,
+    ALARM_QUERY,
+    CYCLIC_SUBSCRIPTION,
+    CYCLIC_UNSUBSCRIPTION;
+    
+}

From 5671bf9cdfd3161a5342be800e445343ff7d33b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= <cesarjosegl@gmail.com>
Date: Mon, 3 Feb 2020 02:35:22 -0400
Subject: [PATCH 07/17] Working in the user Event system.

---
 .../java/s7/connection/S7PlcConnection.java   |  92 +++-
 .../base/messages/DefaultPlcReadResponse.java |  13 +-
 .../apache/plc4x/java/s7/model/S7Field.java   |   4 +-
 .../plc4x/java/s7/model/S7SslField.java       |  72 +++
 .../plc4x/java/s7/netty/Plc4XS7Protocol.java  | 321 +++++++++---
 .../plc4x/java/s7/netty/S7Protocol.java       | 147 ++++--
 .../CpuCyclicServicesRequestPayload.java      |  34 +-
 .../model/payloads/CpuServicesPayload.java    |  16 +
 .../java/s7/netty/model/types/SslId.java      |  13 +-
 .../java/s7/netty/util/S7PlcFieldHandler.java |  17 +-
 .../java/s7/protocol/S7ByteReadResponse.java  | 480 +++++++++++++++++
 .../S7CyclicServicesSubscriptionHandle.java   |   4 +-
 .../S7DiagnosticSubscriptionHandle.java       |  44 +-
 .../java/s7/protocol/event/S7Alarm8Event.java |  28 +
 .../s7/protocol/event/S7Alarm8pEvent.java     |  28 +
 .../java/s7/protocol/event/S7AlarmDEvent.java |  28 +
 .../s7/protocol/event/S7AlarmDQEvent.java     |  28 +
 .../java/s7/protocol/event/S7AlarmEvent.java  |  14 +
 .../java/s7/protocol/event/S7AlarmSEvent.java | 434 ++++++++++++++++
 .../s7/protocol/event/S7AlarmSQEvent.java     |  28 +
 .../plc4x/java/s7/protocol/event/S7Event.java |  30 ++
 .../java/s7/protocol/event/S7ModeEvent.java   | 487 ++++++++++++++++++
 .../s7/protocol/event/S7Notify8pEvent.java    |  28 +
 .../java/s7/protocol/event/S7NotifyEvent.java |  14 +
 .../java/s7/protocol/event/S7SysEvent.java    | 477 +++++++++++++++++
 .../java/s7/protocol/event/S7UserEvent.java   |  28 +
 .../java/s7/utils/S7DiagnosticEventId.java    | 215 +++++++-
 .../plc4x/java/s7/utils/S7SslHelper.java      |  28 +
 28 files changed, 2972 insertions(+), 180 deletions(-)
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7SslField.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7ByteReadResponse.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Alarm8Event.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Alarm8pEvent.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmDEvent.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmDQEvent.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmEvent.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmSEvent.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmSQEvent.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Event.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7ModeEvent.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Notify8pEvent.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7NotifyEvent.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7SysEvent.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7UserEvent.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7SslHelper.java

diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
index b4cc4499790..a8cec59e299 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
@@ -22,6 +22,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import io.netty.buffer.Unpooled;
 import io.netty.channel.*;
 import java.net.InetAddress;
+import java.time.Instant;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -75,10 +76,14 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.s7.netty.model.payloads.CpuDiagnosticMessagePayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
 import org.apache.plc4x.java.s7.netty.model.types.MemoryArea;
+import org.apache.plc4x.java.s7.netty.model.types.SubscribedEventType;
 import org.apache.plc4x.java.s7.netty.strategies.DefaultS7MessageProcessor;
 import org.apache.plc4x.java.s7.netty.util.S7PlcFieldEventHandler;
 import org.apache.plc4x.java.s7.netty.util.S7PlcFieldHandler;
 import org.apache.plc4x.java.s7.protocol.S7CyclicServicesSubscriptionHandle;
+import org.apache.plc4x.java.s7.protocol.S7DiagnosticSubscriptionHandle;
+import org.apache.plc4x.java.s7.protocol.event.S7ModeEvent;
+import org.apache.plc4x.java.s7.protocol.event.S7SysEvent;
 import org.apache.plc4x.java.s7.types.S7ControllerType;
 import org.apache.plc4x.java.s7.utils.S7TsapIdEncoder;
 import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
@@ -125,7 +130,8 @@ public class S7PlcConnection extends NettyPlcConnection implements PlcReader, Pl
     
     Map<Consumer, Collection<PlcSubscriptionHandle>> cyclicServicesSubscriptions = new HashMap();
     
-    Map<Byte, PlcSubscriptionHandle> cyclicServicesHandles = new HashMap();
+    Map<SubscribedEventType, Map<Short, PlcSubscriptionHandle>> pushEventHandles = new HashMap();    
+    Map<Short, PlcSubscriptionHandle> cyclicServicesHandles = new HashMap();
     
     private EventLoop alarmsloopthread;
 
@@ -200,9 +206,20 @@ public S7PlcConnection(ChannelFactory channelFactory, int rack, int slot, String
         */
         this.alarmsqueue = new ArrayBlockingQueue<>(1024);
         
+        Map<Short, PlcSubscriptionHandle> usrEventHandle = new HashMap();
+        Map<Short, PlcSubscriptionHandle> sysEventHandle = new HashMap();
+        Map<Short, PlcSubscriptionHandle> modeEventHandle = new HashMap();
+        Map<Short, PlcSubscriptionHandle> almEventHandle = new HashMap();
+        
+        pushEventHandles.put(SubscribedEventType.USR, usrEventHandle);
+        pushEventHandles.put(SubscribedEventType.SYS, usrEventHandle);
+        pushEventHandles.put(SubscribedEventType.MODE, modeEventHandle);
+        pushEventHandles.put(SubscribedEventType.ALM, almEventHandle);
+        
         alarmsloopthread = new EventLoop(channel,
                                 this.alarmsqueue,
                                 cyclicServicesSubscriptions,
+                                pushEventHandles,
                                 cyclicServicesHandles);
 
     }
@@ -427,9 +444,19 @@ public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer,
             if (handle instanceof S7CyclicServicesSubscriptionHandle) {
                 S7CyclicServicesSubscriptionHandle s7handle = (S7CyclicServicesSubscriptionHandle) handle;
                 if (!cyclicServicesHandles.containsKey(s7handle.getJobId())){
-                    cyclicServicesHandles.put(s7handle.getJobId(), s7handle);
+                    cyclicServicesHandles.put((short) s7handle.getJobId(), s7handle);
                 }
             }
+            
+            if (handle instanceof S7DiagnosticSubscriptionHandle) {
+                S7DiagnosticSubscriptionHandle s7handle = (S7DiagnosticSubscriptionHandle) handle; 
+                s7handle.getConsumers().add(consumer);
+                s7handle.getSubscribedevents().forEach((event)->{
+                    pushEventHandles.get(event).put(s7handle.getJobId(), s7handle);
+                    logger.info("Suscripcion: " + s7handle.getSubscribedevents().toString()); 
+                });
+                
+            }
         });
         
         if (!cyclicServicesSubscriptions.containsKey(consumer)){
@@ -449,17 +476,20 @@ private class EventLoop extends Thread {
         private final Channel channel;
         private boolean alarmquery;
         private int delay;
-        private final Map<Consumer, Collection<PlcSubscriptionHandle>> cyclicServicesSubscriptions;        
-        private final Map<Byte, PlcSubscriptionHandle> cyclicServicesHandles;
+        private final Map<Consumer, Collection<PlcSubscriptionHandle>> cyclicServicesSubscriptions; 
+        private final Map<SubscribedEventType, Map<Short, PlcSubscriptionHandle>> pushEventHandles;        
+        private final Map<Short, PlcSubscriptionHandle> cyclicServicesHandles;
         private final BlockingQueue<S7PushMessage> alarmsqueue;
         
         EventLoop(Channel channel, 
                 BlockingQueue<S7PushMessage> alarmsqueue, 
                 Map<Consumer, Collection<PlcSubscriptionHandle>> cyclicServicesSubscriptions,
-                Map<Byte, PlcSubscriptionHandle> cyclicServicesHandles) {
+                Map<SubscribedEventType, Map<Short, PlcSubscriptionHandle>> pushEventHandles,
+                Map<Short, PlcSubscriptionHandle> cyclicServicesHandles) {
             this.channel = channel;
             this.alarmsqueue = alarmsqueue;
             this.cyclicServicesSubscriptions = cyclicServicesSubscriptions;
+            this.pushEventHandles = pushEventHandles;
             this.cyclicServicesHandles = cyclicServicesHandles;
             this.alarmquery = true;
             this.delay = 1000;
@@ -475,15 +505,22 @@ public void run() {
                         if (msg instanceof AlarmMessagePayload){
                             AlarmMessagePayload themsg = (AlarmMessagePayload) msg;
                             logger.info("AlarmMessagePayload: " + themsg);
-                        } else if (msg instanceof CpuDiagnosticPushParameter) {
+                            dispathAlmEvents(pushEventHandles.get(SubscribedEventType.ALM), themsg); 
+                            
+                        } else if (msg instanceof CpuDiagnosticPushParameter) {                            
                             CpuDiagnosticPushParameter themsg = (CpuDiagnosticPushParameter) msg;
-                            logger.info("CpuDiagnosticPushParameter: " + themsg);;
+                            logger.info("CpuDiagnosticPushParameter: " + themsg);  
+                            dispathModeEvents(pushEventHandles.get(SubscribedEventType.MODE), themsg);
+                            
                         } else if (msg instanceof CpuDiagnosticMessagePayload) {
                             CpuDiagnosticMessagePayload themsg = (CpuDiagnosticMessagePayload) msg;
                             logger.info("CpuDiagnosticMessagePayload: " + themsg);
+                            dispathSysEvents(pushEventHandles.get(SubscribedEventType.SYS), themsg);  
+                            
                         } else if (msg instanceof CpuServicesPushParameter) {
                             CpuServicesPushParameter themsg = (CpuServicesPushParameter) msg;
                             logger.info("CpuServicesPushParameter: " + themsg);
+                            
                         } else if (msg instanceof CpuCyclicServicesResponsePayload) {
                             CpuCyclicServicesResponsePayload themsg = (CpuCyclicServicesResponsePayload) msg;
                             logger.debug("CpuCyclicServicesResponsePayload: " + themsg + " JobId:" + themsg.getJobId());
@@ -504,9 +541,7 @@ public void run() {
                             
                         }
                     }
-                    
-                    
-                    
+                                                            
                 } catch (InterruptedException ex) {
                     logger.info(ex.getLocalizedMessage());
                 }
@@ -514,6 +549,39 @@ public void run() {
             logger.info("Closing the alarm loop.");
         }
         
+        private void dispathSysEvents(Map<Short, PlcSubscriptionHandle> handles, CpuDiagnosticMessagePayload payload)
+        {
+            handles.forEach((index,handle)->{
+                S7DiagnosticSubscriptionHandle thehandle = (S7DiagnosticSubscriptionHandle) handle;
+                thehandle.getConsumers().forEach((consumer)->{
+                    S7SysEvent event = new S7SysEvent(payload.getMsg());
+                    consumer.accept(event);
+                });
+            });              
+        }        
+        
+        private void dispathModeEvents(Map<Short, PlcSubscriptionHandle> handles, CpuDiagnosticPushParameter parameter)
+        {
+            handles.forEach((index,handle)->{
+                S7DiagnosticSubscriptionHandle thehandle = (S7DiagnosticSubscriptionHandle) handle;
+                thehandle.getConsumers().forEach((consumer)->{
+                    S7ModeEvent event = new S7ModeEvent(Instant.now(), parameter);
+                    consumer.accept(event);
+                });
+            });              
+        }        
+        
+        private void dispathAlmEvents(Map<Short, PlcSubscriptionHandle> handles, AlarmMessagePayload payload)
+        {
+            handles.forEach((index,handle)->{
+                S7DiagnosticSubscriptionHandle thehandle = (S7DiagnosticSubscriptionHandle) handle;
+                thehandle.getConsumers().forEach((consumer)->{
+                    consumer.accept(null);
+                });
+            });              
+        } 
+        
+        
         private void UpdateCyclicServicesData(S7CyclicServicesSubscriptionHandle handle,CpuCyclicServicesResponsePayload themsg){
             
             Map<String, AssociatedValueItem> items = handle.getItems();
@@ -538,7 +606,9 @@ private void UpdateCyclicServicesData(S7CyclicServicesSubscriptionHandle handle,
                         //PlcSubscriptionEvent event = new DefaultPlcSubscriptionEvent(Instant.now(), fields);
                         
                         values2consumer.forEach((index, itemvalue)->{
-                            consumer.accept(null);
+                            if (consumer != null) {
+                                consumer.accept(null);
+                            };
                             //logger.info("Procesando valores : " + index + "\r\n" + ByteBufUtil.prettyHexDump(itemvalue.getData()));
                         });
                         //Pair<PlcResponseCode, ByteBuf> newPair = new ImmutablePair<>(PlcResponseCode, stringItem);
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadResponse.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadResponse.java
index bb7675988bf..42dacf137b8 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadResponse.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadResponse.java
@@ -18,19 +18,18 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.plc4x.java.base.messages;
 
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.*;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
 
 public class DefaultPlcReadResponse implements InternalPlcReadResponse {
 
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java
index 3e55238677c..f3a3de06da1 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java
@@ -38,9 +38,7 @@ public class S7Field implements PlcField {
     //blockNumber usually has its max hat around 64000 --> 5digits
     private static final Pattern DATA_BLOCK_ADDRESS_PATTERN =
         Pattern.compile("^%DB(?<blockNumber>\\d{1,5}).DB(?<transferSizeCode>[XBWD]?)(?<byteOffset>\\d{1,7})(.(?<bitOffset>[0-7]))?:(?<dataType>[a-zA-Z_]+)(\\[(?<numElements>\\d+)])?");
-    
-
-            
+                
     private static final String DATA_TYPE = "dataType";
     private static final String TRANSFER_SIZE_CODE = "transferSizeCode";
     private static final String BLOCK_NUMBER = "blockNumber";
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7SslField.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7SslField.java
new file mode 100644
index 00000000000..75d58ec295d
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7SslField.java
@@ -0,0 +1,72 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.model;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.model.PlcField;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7SslField implements PlcField {
+    
+   //SZL_ID=0xYYYY;INDEX=0xZZZZ
+    private static final Pattern SSL_ADDRESS_PATTERN =
+        Pattern.compile("^SSL_ID=(?<sslId>16#[0-9a-fA-F]{4});INDEX=(?<index>16#[0-9a-fA-F]{4})");  
+    
+    private static final String SSL_ID = "sslId";    
+    private static final String INDEX = "index";    
+    
+    private final int szlId;
+    private final int index;
+
+    public S7SslField(int sslId, int index) {
+        this.szlId = sslId;
+        this.index = index;
+    }
+
+    public int getSslId() {
+        return szlId;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+          
+    public static boolean matches(String fieldString) {
+        System.out.println("fieldString: " + fieldString);
+        return SSL_ADDRESS_PATTERN.matcher(fieldString).matches();      
+    }   
+    
+    public static S7SslField of(String fieldString) {
+        Matcher matcher = SSL_ADDRESS_PATTERN.matcher(fieldString); 
+        if (matcher.matches()){
+            String strSxlId = matcher.group(SSL_ID);
+            String strIndex = matcher.group(INDEX);
+            strSxlId = strSxlId.replaceAll("16#", "");
+            strIndex = strIndex.replaceAll("16#", "");
+            return new S7SslField(Integer.parseInt(strSxlId, 16),Integer.parseInt(strIndex, 16));
+        }  
+        throw new PlcInvalidFieldException("Unable to parse address: " + fieldString); 
+    }    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
index 35a426a6e86..a49ee84882e 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
@@ -56,8 +56,10 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.base.events.ConnectedEvent;
 import org.apache.plc4x.java.base.messages.*;
 import org.apache.plc4x.java.base.messages.items.*;
+import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
 import org.apache.plc4x.java.base.model.SubscriptionPlcField;
 import org.apache.plc4x.java.s7.model.S7Field;
+import org.apache.plc4x.java.s7.model.S7SslField;
 import org.apache.plc4x.java.s7.model.S7SubscriptionField;
 import org.apache.plc4x.java.s7.netty.events.S7ConnectedEvent;
 import org.apache.plc4x.java.s7.netty.model.messages.S7Message;
@@ -76,6 +78,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.s7.netty.model.payloads.CpuCyclicServicesRequestPayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.CpuCyclicServicesResponsePayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.CpuMessageSubscriptionServicePayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuServicesPayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
 import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.items.AlarmMessageItem;
@@ -84,7 +87,9 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.s7.netty.model.payloads.items.S7AnyVarPayloadItem;
 import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
 import org.apache.plc4x.java.s7.netty.model.types.*;
+import org.apache.plc4x.java.s7.protocol.S7ByteReadResponse;
 import org.apache.plc4x.java.s7.protocol.S7CyclicServicesSubscriptionHandle;
+import org.apache.plc4x.java.s7.protocol.S7DiagnosticSubscriptionHandle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -195,7 +200,7 @@ protected void encode(ChannelHandlerContext ctx, PlcRequestContainer msg, List<O
         } else if (request instanceof PlcSubscriptionRequest) {
             encodeSubcriptionRequest(msg, out);
         } else if (request instanceof PlcUnsubscriptionRequest) {
-            encodeUnsubcriptionRequest(msg, out);
+            encodeUnSubcriptionRequest(msg, out);
         }
     }
 
@@ -232,6 +237,7 @@ private void encodeSubcriptionRequest(PlcRequestContainer msg, List<Object> out)
                     encodeCycledSubscriptionRequest(msg, out);
                     break;
                 case CYCLIC_UNSUBSCRIPTION:;
+                    encodeCycledUnSubscriptionRequest(msg, out);
                     break;                     
                 default:;                     
              };
@@ -279,45 +285,7 @@ private void encodeEventSubcriptionRequest(PlcRequestContainer msg, List<Object>
         out.add(s7ReadRequest);         
     }    
     
-    private void encodeEventUnSubcriptionRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
-        byte subsevent = 0;
-        List<S7Parameter> parameterItems = new LinkedList<>();
-        List<S7Payload> payloadItems = new LinkedList<>();
-         
-        PlcSubscriptionRequest subsRequest = (PlcSubscriptionRequest)  msg.getRequest();
-        
-        for (String fieldName : subsRequest.getFieldNames()) {                        
-            if ( subsRequest.getField(fieldName) instanceof S7SubscriptionField){
-                 S7SubscriptionField event = (S7SubscriptionField) subsRequest.getField(fieldName);
-                 subsevent = (byte) (subsevent | event.getEventtype().getCode());
-            }
-        }
-        
-        CpuServicesParameter cpuservice = new CpuServicesRequestParameter(CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
-            CpuServicesParameterSubFunctionGroup.MESSAGE_SERVICE, (byte) 0x00);
-        
-        parameterItems.add(cpuservice);
-        
-       
-        S7Payload Data = new CpuMessageSubscriptionServicePayload(DataTransportErrorCode.OK,
-                                DataTransportSize.OCTET_STRING,
-                                subsevent,
-                                new String("HmiRtm  "),
-                                AlarmType.ALARM_S_INITIATE);
-        payloadItems.add(Data);
-
-        
-        S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.USER_DATA,
-            (short) tpduGenerator.getAndIncrement(), 
-            parameterItems,
-            payloadItems, 
-            msg);
-
-        requests.put(s7ReadRequest.getTpduReference(), msg);
-
-        out.add(s7ReadRequest);         
-    }  
-    
+ 
     //TODO: Check for ALARM_D and ALARM_8
     private void encodeAlarmAckRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
         byte subsevent = 0;
@@ -481,27 +449,131 @@ private void encodeCycledSubscriptionRequest(PlcRequestContainer msg, List<Objec
         out.add(s7ReadRequest);        
     }
     
-    private void encodeUnsubcriptionRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
-        //TODO : Perform subscription termination 
-    }    
+    private void encodeUnSubcriptionRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
+        //Chequear el campo prueba que ya incluyte la informaciĆ³n del tipo
+        InternalPlcUnsubscriptionRequest subsRequest = (InternalPlcUnsubscriptionRequest)  msg.getRequest();  
+        Collection<? extends InternalPlcSubscriptionHandle> handles = subsRequest.getInternalPlcSubscriptionHandles();
+        handles.forEach((handle)->{
+            if (handle instanceof S7CyclicServicesSubscriptionHandle) {
+                try {
+                    encodeCycledUnSubscriptionRequest(msg,out);
+                } catch (PlcException ex) {
+                    logger.info(ex.toString());
+                }
+            }
+        });
+
+    } 
     
+    private void encodeEventUnSubcriptionRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
+        byte subsevent = 0;
+        List<S7Parameter> parameterItems = new LinkedList<>();
+        List<S7Payload> payloadItems = new LinkedList<>();
+         
+        PlcSubscriptionRequest subsRequest = (PlcSubscriptionRequest)  msg.getRequest();
+        
+        for (String fieldName : subsRequest.getFieldNames()) {                        
+            if ( subsRequest.getField(fieldName) instanceof S7SubscriptionField){
+                 S7SubscriptionField event = (S7SubscriptionField) subsRequest.getField(fieldName);
+                 subsevent = (byte) (subsevent | event.getEventtype().getCode());
+            }
+        }
+        
+        CpuServicesParameter cpuservice = new CpuServicesRequestParameter(CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
+            CpuServicesParameterSubFunctionGroup.MESSAGE_SERVICE, (byte) 0x00);
+        
+        parameterItems.add(cpuservice);
+        
+       
+        S7Payload Data = new CpuMessageSubscriptionServicePayload(DataTransportErrorCode.OK,
+                                DataTransportSize.OCTET_STRING,
+                                subsevent,
+                                new String("HmiRtm  "),
+                                AlarmType.ALARM_S_INITIATE);
+        payloadItems.add(Data);
+
+        
+        S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.USER_DATA,
+            (short) tpduGenerator.getAndIncrement(), 
+            parameterItems,
+            payloadItems, 
+            msg);
+
+        requests.put(s7ReadRequest.getTpduReference(), msg);
+
+        out.add(s7ReadRequest);         
+    }  
+       
+    private void encodeCycledUnSubscriptionRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
+ 
+        List<S7Parameter> parameterItems = new LinkedList<>();
+        List<S7Payload> payloads = new LinkedList<>();
+        byte jobId = 0x00;
+        
+        DefaultPlcUnsubscriptionRequest prueba = (DefaultPlcUnsubscriptionRequest)  msg.getRequest();
+   
+        Collection<? extends InternalPlcSubscriptionHandle> handles = prueba.getInternalPlcSubscriptionHandles();
+ 
+        for(InternalPlcSubscriptionHandle ihandle:handles){
+            S7CyclicServicesSubscriptionHandle s7handle = (S7CyclicServicesSubscriptionHandle) ihandle;
+            jobId = s7handle.getJobId();
+            break;
+        } 
+ 
+
+        CpuCyclicServicesRequestPayload payload = new CpuCyclicServicesRequestPayload(DataTransportErrorCode.OK,
+                                                        DataTransportSize.OCTET_STRING,
+                                                        (byte) 0x02,
+                                                        (byte) 0x05,
+                                                        jobId);
+                                                        
+        payloads.add(payload);
+
+        CpuCyclicServicesRequestParameter parameter = new CpuCyclicServicesRequestParameter(CpuUserDataMethodType.REQUEST,
+                                                            CpuServicesParameterFunctionGroup.CYCLIC_SERVICES,
+                                                            CpuCyclicServicesParameterSubFunctionGroupType.CYCLIC_UNSUBSCRIBE,
+                                                            (byte) 0x00);
+        parameterItems.add(parameter);
+        
+
+        
+        // Assemble the request.
+        S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.USER_DATA,
+            (short) tpduGenerator.getAndIncrement(), parameterItems,
+            payloads, msg);
+
+        requests.put(s7ReadRequest.getTpduReference(), msg);
+
+        out.add(s7ReadRequest);
+       
+    }
+        
     private void encodeReadRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
 
         List<VarParameterItem> parameterItems = new LinkedList<>();
 
         PlcReadRequest readRequest = (PlcReadRequest) msg.getRequest();
+        
         for (String fieldName : readRequest.getFieldNames()) {
             PlcField field = readRequest.getField(fieldName);
-            if (!(field instanceof S7Field)) {
-                throw new PlcProtocolException("The field should have been of type S7Field");
-            }
-            S7Field s7Field = (S7Field) field;
+            
+            if ((field instanceof S7SslField)) {
+                S7SslField szlfield = (S7SslField) field;
+                encodeSslReadRequest(msg,szlfield,out);
+                return;
+            } else {
+                if (!(field instanceof S7Field)) {
+                    throw new PlcProtocolException("The field should have been of type S7Field");
+                }
 
-            VarParameterItem varParameterItem = new S7AnyVarParameterItem(
-                SpecificationType.VARIABLE_SPECIFICATION, s7Field.getMemoryArea(),
-                s7Field.getDataType(),
-                s7Field.getNumElements(), s7Field.getBlockNumber(), s7Field.getByteOffset(), (byte) s7Field.getBitOffset());
-            parameterItems.add(varParameterItem);
+                S7Field s7Field = (S7Field) field;
+
+                VarParameterItem varParameterItem = new S7AnyVarParameterItem(
+                    SpecificationType.VARIABLE_SPECIFICATION, s7Field.getMemoryArea(),
+                    s7Field.getDataType(),
+                    s7Field.getNumElements(), s7Field.getBlockNumber(), s7Field.getByteOffset(), (byte) s7Field.getBitOffset());
+                parameterItems.add(varParameterItem);
+            }
         }
         VarParameter readVarParameter = new VarParameter(ParameterType.READ_VAR, parameterItems);
 
@@ -515,6 +587,22 @@ private void encodeReadRequest(PlcRequestContainer msg, List<Object> out) throws
         out.add(s7ReadRequest);
     }
 
+    private void encodeSslReadRequest(PlcRequestContainer msg, S7SslField sslfield, List<Object> out) throws PlcException {
+        
+        S7RequestMessage szlRequestMessage = new S7RequestMessage(MessageType.USER_DATA,
+                (short) tpduGenerator.getAndIncrement(),
+            Collections.singletonList(new CpuServicesRequestParameter(
+                CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
+                CpuServicesParameterSubFunctionGroup.READ_SSL, (byte) 0)),
+            Collections.singletonList(new CpuServicesPayload(DataTransportErrorCode.OK, SslId.valueOf((short) (sslfield.getSslId() & 0x01FF)),
+                (short) sslfield.getIndex())), null); 
+        
+        requests.put(szlRequestMessage.getTpduReference(), msg);
+
+        out.add(szlRequestMessage);        
+    }    
+    
+    
     private void encodeWriteRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
         List<VarParameterItem> parameterItems = new LinkedList<>();
         List<VarPayloadItem> payloadItems = new LinkedList<>();
@@ -743,7 +831,6 @@ protected void decode(ChannelHandlerContext ctx, S7Message msg, List<Object> out
             PlcRequestContainer requestContainer = requests.remove(tpduReference);
             PlcRequest request = requestContainer.getRequest();
 
-            // Handle the response.
             PlcResponse response = null;
             if (request instanceof PlcReadRequest) {
                 response = decodeReadResponse(responseMessage, requestContainer);
@@ -789,15 +876,17 @@ public void operationComplete(ChannelFuture future) {
                     }
                     
                 }
+            } else if (request instanceof PlcUnsubscriptionRequest) {
+                response = decodeUnSubscriptionResponse(responseMessage, requestContainer);
             } else {
-                logger.debug("There is the client's request, but it is not a valid response....");
+                logger.info("There is the client's request, but it is not a valid response....");
             }
 
             // Confirm the response being handled.
             if (response != null) {
                 requestContainer.getResponseFuture().complete(response);
             } else {
-                logger.debug("The message could not be processed...");
+                logger.info("The message could not be processed...");
             }
         } else {
             //PUSH Message
@@ -805,7 +894,7 @@ public void operationComplete(ChannelFuture future) {
             for (S7Parameter parameter:parameters){
                 if (parameter instanceof S7PushMessage){
                     if (!alarmsqueue.offer((S7PushMessage) parameter)){
-                        logger.info("Alarm queue buffer is full.");
+                        logger.info("Event queue buffer is full.");
                     };                    
                 }    
             }
@@ -815,7 +904,7 @@ public void operationComplete(ChannelFuture future) {
             for (S7Payload payload:payloads){
                 if (payload instanceof S7PushMessage){
                     if (!alarmsqueue.offer((S7PushMessage) payload)){
-                        logger.info("Alarm queue buffer is full.");
+                        logger.info("Event queue buffer is full.");
                     };
                 }
             }            
@@ -826,7 +915,11 @@ public void operationComplete(ChannelFuture future) {
     @SuppressWarnings("unchecked")
     private PlcResponse decodeReadResponse(S7ResponseMessage responseMessage, PlcRequestContainer requestContainer) throws PlcProtocolException {
         InternalPlcReadRequest plcReadRequest = (InternalPlcReadRequest) requestContainer.getRequest();
-
+        
+        if (responseMessage.getPayloads().get(0) instanceof CpuServicesPayload){
+            return decodeSslReadResponse(responseMessage, requestContainer);
+        }
+        
         VarPayload payload = responseMessage.getPayload(VarPayload.class)
             .orElseThrow(() -> new PlcProtocolException("No VarPayload supplied"));
 
@@ -836,6 +929,7 @@ private PlcResponse decodeReadResponse(S7ResponseMessage responseMessage, PlcReq
         // way to know how to interpret the responses is by aligning them with the
         // items from the request as this information is not returned by the PLC.
         if (plcReadRequest.getNumberOfFields() != payload.getItems().size()) {
+            logger.info("Excepcion: " + plcReadRequest.getFieldNames().toString());
             throw new PlcProtocolException(
                 "The number of requested items doesn't match the number of returned items");
         }
@@ -959,6 +1053,32 @@ private PlcResponse decodeReadResponse(S7ResponseMessage responseMessage, PlcReq
 
         return new DefaultPlcReadResponse(plcReadRequest, values);
     }
+    
+    private PlcResponse decodeSslReadResponse(S7ResponseMessage responseMessage, PlcRequestContainer requestContainer) throws PlcProtocolException {
+        InternalPlcReadRequest plcReadRequest = (InternalPlcReadRequest) requestContainer.getRequest();
+        
+        Map<String, Pair<PlcResponseCode, ByteBuf>> values = new HashMap<>();
+        
+        List<S7Payload> payloads = responseMessage.getPayloads();
+        payloads.forEach((payload)->{
+            CpuServicesPayload s7payload = (CpuServicesPayload) payload;});    
+             
+        int index = 0;
+        for (String requestName : plcReadRequest.getFieldNames()) {
+
+            CpuServicesPayload payload = (CpuServicesPayload) payloads.get(index);  
+
+            Pair<PlcResponseCode, ByteBuf> result = new ImmutablePair<>( 
+                    decodeResponseCode(payload.getReturnCode()), 
+                    payload.getSslPayload());
+
+            values.put(requestName, result);
+
+            index++;
+        }
+     
+        return new S7ByteReadResponse(plcReadRequest, values);
+    }    
 
     BaseDefaultFieldItem decodeReadResponseBitField(S7Field field, ByteBuf data) {
         Boolean[] booleans = readAllValues(Boolean.class, field, i -> data.readByte() != 0x00);
@@ -1140,6 +1260,7 @@ private PlcResponse decodeWriteResponse(S7ResponseMessage responseMessage, PlcRe
 
 
     private PlcResponse decodeSubscriptionResponse(S7ResponseMessage responseMessage, PlcRequestContainer requestContainer) throws PlcProtocolException {
+
         InternalPlcSubscriptionRequest subsRequest = (InternalPlcSubscriptionRequest) requestContainer.getRequest(); 
         //TODO: Try multiple ALARM_ACK in the same request and multiple EVENT_ID.
         S7SubscriptionField event = (S7SubscriptionField) subsRequest.getFields().get(0);
@@ -1153,9 +1274,35 @@ private PlcResponse decodeSubscriptionResponse(S7ResponseMessage responseMessage
 
         //May be only one iteration?:
         for (S7Payload payload:payloads){
+
             if (payload instanceof AlarmMessagePayload) {
                 AlarmMessagePayload payloadItem = (AlarmMessagePayload) payload;   
                 switch(parameter.getSubFunctionGroup()){
+                    case MESSAGE_SERVICE:{
+                        List<SubscribedEventType> items = new ArrayList();
+                        PlcResponseCode responseCode = decodeResponseCode(((AlarmMessagePayload) payload).getReturnCode());
+
+                        if (responseCode == PlcResponseCode.OK) {
+                            subsRequest.getFields().forEach((field)->{
+                                S7SubscriptionField s7field = (S7SubscriptionField) field;
+                                items.add(s7field.getEventtype());
+                            });
+                        };    
+                        
+                        S7DiagnosticSubscriptionHandle handler = new S7DiagnosticSubscriptionHandle(
+                                                                        "MS",
+                                                                        responseMessage.getTpduReference(),
+                                                                        responseCode,
+                                                                        items);
+                            
+                        LinkedHashSet<String> fieldnames = subsRequest.getFieldNames();  
+                        
+                        fieldnames.forEach((fieldname)->{
+                            values.put(fieldname, new ImmutablePair(responseCode, handler)); 
+                        });
+                            
+                        }    
+                    break;
                     case ALARM_ACK:{
                         List<Object> items = payloadItem.getMsg().getMsgItems();
                         ArrayList<Integer> eventids = event.getAckalarms();
@@ -1189,35 +1336,53 @@ private PlcResponse decodeSubscriptionResponse(S7ResponseMessage responseMessage
                     default:;
                 } 
             } else if (payload instanceof CpuCyclicServicesResponsePayload) {
+                              
                     CpuCyclicServicesResponsePayload  cyclicPayloadItem = (CpuCyclicServicesResponsePayload) payload;
                     //
                     //
-                    logger.info("CpuCyclicServicesResponsePayload: " + subsRequest.getFieldNames().toString());
-                    List<AssociatedValueItem> valueitems = cyclicPayloadItem.getItems();
-                    Map<String,AssociatedValueItem> items = new LinkedHashMap();
-                    int i=0;
-                    if (parameter.getError().getCode() == 0x0000){                    
-                        for (String fieldname:subsRequest.getFieldNames()){
-                            items.put(fieldname, valueitems.get(i));
-                            i++;                        
+                    if (cyclicPayloadItem.getItems().size() != 0) {
+                    
+                        List<AssociatedValueItem> valueitems = cyclicPayloadItem.getItems();
+                        Map<String,AssociatedValueItem> items = new LinkedHashMap();
+                        int i=0;
+                        if (parameter.getError().getCode() == 0x0000){                    
+                            for (String fieldname:subsRequest.getFieldNames()){
+                                items.put(fieldname, valueitems.get(i));
+                                i++;                        
+                            };
                         };
-                    };
-                   
-                    S7CyclicServicesSubscriptionHandle handler = new S7CyclicServicesSubscriptionHandle("UNO", 
-                                                                        parameter.getSequenceNumber(),
-                                                                        parameter.getError().getCode(),
-                                                                        items);
-                                        
-                    for (String fieldname:subsRequest.getFieldNames()){
-                        logger.info("*****" + fieldname);
-                        values.put(fieldname, new ImmutablePair(decodeResponseCode(items.get(fieldname).getReturnCode()), handler));                    
-                    }
-                }  
+
+                        S7CyclicServicesSubscriptionHandle handler = new S7CyclicServicesSubscriptionHandle("UNO", 
+                                                                            parameter.getSequenceNumber(),
+                                                                            parameter.getError().getCode(),
+                                                                            items);
+                        // Return quality code for alarm 
+                        for (String fieldname:subsRequest.getFieldNames()){
+                            values.put(fieldname, new ImmutablePair(decodeResponseCode(items.get(fieldname).getReturnCode()), handler));                    
+                        }
+
+                    
+                    } else {
+                        logger.info("Must return values...?");
+                    } 
+                    
+                } else {
+                    logger.info("Payload not defined...");
+            } 
         }
         return new DefaultPlcSubscriptionResponse(subsRequest, values);
     }
     
     
+    private PlcResponse decodeUnSubscriptionResponse(S7ResponseMessage responseMessage, PlcRequestContainer requestContainer) throws PlcProtocolException {
+        DefaultPlcUnsubscriptionRequest unSubsRequest = (DefaultPlcUnsubscriptionRequest) requestContainer.getRequest();
+        //TODO: Multiple parameters. Try with S7400. At this point if we have embedded more parameter will be lost.
+        CpuServicesResponseParameter parameter = (CpuServicesResponseParameter) responseMessage.getParameters().get(0);
+        InternalPlcUnsubscriptionRequest request = (InternalPlcUnsubscriptionRequest) requestContainer.getRequest();
+
+        return new DefaultPlcUnsubscriptionResponse(request);
+    }    
+    
     private PlcResponseCode decodeResponseCode(DataTransportErrorCode dataTransportErrorCode) {
         if (dataTransportErrorCode == null) {
             return PlcResponseCode.INTERNAL_ERROR;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
index f3c8ed912ae..064858ffa78 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
@@ -26,7 +26,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.PromiseCombiner;
 import java.lang.reflect.Field;
-import java.nio.charset.StandardCharsets;
+import java.nio.charset.Charset;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -64,8 +64,6 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.s7.netty.model.payloads.items.MessageObjectItem;
 import org.apache.plc4x.java.s7.netty.model.payloads.items.S7AnyVarPayloadItem;
 import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.ssls.SslDataRecord;
-import org.apache.plc4x.java.s7.netty.model.payloads.ssls.SslModuleIdentificationDataRecord;
 import org.apache.plc4x.java.s7.netty.model.types.*;
 import org.apache.plc4x.java.s7.netty.strategies.S7MessageProcessor;
 import org.apache.plc4x.java.s7.netty.util.S7SizeHelper;
@@ -420,16 +418,23 @@ private void encodeAlarmMessagePayload(AlarmMessagePayload payload, ByteBuf buf)
        }         
     }    
 
-   private void encodeCpuCyclicSubscriptionPayload(CpuCyclicServicesRequestPayload payload, ByteBuf buf) {
-       buf.writeByte(payload.getReturnCode().getCode());
-       buf.writeByte(payload.getDataTransportSize().getCode());
-       buf.writeShort(payload.getLength());
-       buf.writeShort(payload.getItemCount());
-       buf.writeByte(payload.getTimeBase().getCode());
-       buf.writeByte(payload.getTimeFactor());
-       payload.getItems().forEach((anyvar)->{
-           encodeS7AnyPayloadItem(anyvar,buf);
-       });       
+    private void encodeCpuCyclicSubscriptionPayload(CpuCyclicServicesRequestPayload payload, ByteBuf buf) {
+        buf.writeByte(payload.getReturnCode().getCode());
+        buf.writeByte(payload.getDataTransportSize().getCode());
+        buf.writeShort(payload.getLength());
+        //Unsuscription
+        if (payload.getLength() == 2) {
+            buf.writeByte(payload.getFunction());
+            buf.writeByte(payload.getJobId());
+        } else {
+           //Suscription message
+           buf.writeShort(payload.getItemCount());
+           buf.writeByte(payload.getTimeBase().getCode());
+           buf.writeByte(payload.getTimeFactor());
+           payload.getItems().forEach((anyvar)->{
+               encodeS7AnyPayloadItem(anyvar,buf);
+           });     
+       };
    }    
     
     private void encodeParameters(S7Message in, ByteBuf buf) throws PlcProtocolException {
@@ -655,7 +660,7 @@ protected void decode(ChannelHandlerContext ctx, IsoTPMessage in, List<Object> o
         short userDataLength = userData.readShort();
         byte errorClass = 0;
         byte errorCode = 0;
-        
+
         if (isResponse) {
             errorClass = userData.readByte();
             errorCode = userData.readByte();
@@ -672,14 +677,21 @@ protected void decode(ChannelHandlerContext ctx, IsoTPMessage in, List<Object> o
             }
             i += S7SizeHelper.getParameterLength(parameter);
         }
-
+        
         List<S7Payload> s7Payloads = decodePayloads(userData, isResponse, userDataLength, s7Parameters);
-
         logger.debug("S7 Message with id {}Ā received", tpduReference);
         
-        //Case: USER_DATA
+        //Case: USER_DATA CpuCyclicServicesResponseParameter
         if (messageType == MessageType.USER_DATA){
-            if (s7Parameters.get(0) instanceof CpuServicesResponseParameter){
+            if (s7Parameters.get(0) instanceof CpuCyclicServicesResponseParameter){
+                CpuCyclicServicesResponseParameter parameter = (CpuCyclicServicesResponseParameter) s7Parameters.get(0);
+                if (parameter.getSubCycFunctionGroup() == CpuCyclicServicesParameterSubFunctionGroupType.CYCLIC_UNSUBSCRIBE){
+                    isResponse = true;
+                }
+            }
+            
+            //TODO: Check for other combinations
+            if (s7Parameters.get(0) instanceof CpuServicesResponseParameter){                
                 CpuServicesResponseParameter parameter = (CpuServicesResponseParameter) s7Parameters.get(0);
                 if (parameter.getSubFunctionGroup() == CpuServicesParameterSubFunctionGroup.ALARM_ACK){
                     isResponse = true;
@@ -715,7 +727,6 @@ protected void decode(ChannelHandlerContext ctx, IsoTPMessage in, List<Object> o
 
                 if(responseMessage != null) {
                     out.add(responseMessage);
-
                     // If this is a USER_DATA packet the probability is high that this is
                     // a response to the identification request, we have to handle that.
                     if(responseMessage.getMessageType() == MessageType.USER_DATA) {
@@ -802,6 +813,7 @@ private void handleSetupCommunications(ChannelHandlerContext ctx, SetupCommunica
 
     private void handleIdentifyRemote(ChannelHandlerContext ctx, CpuServicesPayload cpuServicesPayload) {
         controllerType = S7ControllerType.ANY;
+        /*
         for (SslDataRecord sslDataRecord : cpuServicesPayload.getSslDataRecords()) {
             if(sslDataRecord instanceof SslModuleIdentificationDataRecord) {
                 SslModuleIdentificationDataRecord sslModuleIdentificationDataRecord =
@@ -810,6 +822,13 @@ private void handleIdentifyRemote(ChannelHandlerContext ctx, CpuServicesPayload
                     controllerType = lookupControllerType(sslModuleIdentificationDataRecord.getArticleNumber());
                 }
             }
+        */
+        if (cpuServicesPayload.getSslId() == SslId.MODULE_IDENTIFICATION) {
+            if ((cpuServicesPayload.getSslIndex() == 0x0000) || (cpuServicesPayload.getSslIndex() == 0x0001)){
+                ByteBuf payload = cpuServicesPayload.getSslPayload();
+                CharSequence MlfB = payload.getCharSequence(6, 20, Charset.defaultCharset());
+                controllerType = lookupControllerType(MlfB.toString());
+            }
         }
         if(logger.isDebugEnabled()) {
             logger.debug("Successfully connected to S7: {}", controllerType.name());
@@ -837,7 +856,7 @@ private List<S7Payload> decodePayloads(ByteBuf userData, boolean isResponse, sho
                 s7Payloads.add(cpuServicesPayload);
             } else if (s7Parameter instanceof CpuServicesPushParameter){
                 S7Payload cpuServicesPayload = decodeCpuServicesPayload((CpuServicesParameter)s7Parameter, userData);
-                s7Payloads.add(cpuServicesPayload);                
+                s7Payloads.add(cpuServicesPayload); 
             }
         }
         return s7Payloads;
@@ -947,11 +966,15 @@ private S7Payload decodeCpuServicesPayload(CpuServicesParameter parameter, ByteB
                         break;
                     case CYCLIC_RDREC:;    
                         break;
-                    case CYCLIC_TRANSFER: 
+                    case CYCLIC_TRANSFER: {
+                        CpuCyclicServicesResponsePayload payload = decodeCyclicServiceResponsePayload(pushparameter, userData);
+                        return payload;
+                    }
+                    case CYCLIC_UNSUBSCRIBE:{   
                         CpuCyclicServicesResponsePayload payload = decodeCyclicServiceResponsePayload(pushparameter, userData);
                         return payload;
-                    case CYCLIC_UNSUBSCRIBE:;    
-                        break;                        
+                    }
+                    default: logger.info("decodeCpuServicesPayload: No Sub Cyc Function Group.");
                 }
             }
         }
@@ -1124,10 +1147,21 @@ private List<VarParameterItem> decodeReadWriteVarParameter(ByteBuf in, byte numI
     private CpuServicesPayload decodeReadSslPayload(CpuServicesParameter parameter, ByteBuf userData){
         DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
         DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
+        short length;
+        
         if(dataTransportSize != DataTransportSize.OCTET_STRING) {
-                // TODO: Output an error.
+            if(dataTransportSize == DataTransportSize.NULL) {
+                length = userData.readShort();
+                if (length == 0x0000) {
+                    return new CpuServicesPayload(returnCode, SslId.NULL, (short) 0x0000);
+                } else {
+                // TODO: Output an error.                    
+                }
+                
+            }   
         }
-        short length = userData.readShort();                
+        
+        length = userData.readShort();                
         SslId sslId = SslId.valueOf(userData.readShort());
         short sslIndex = userData.readShort();
         // If the length is 4 there is no `partial list length in bytes` and `partial list count` parameters.
@@ -1136,8 +1170,11 @@ private CpuServicesPayload decodeReadSslPayload(CpuServicesParameter parameter,
         }
         // If the length is not 4, then it has to be at least 8.
         else if(length >= 8) {
+            
             // TODO: We should probably ensure we don't read more than this.
             // Skip the partial list length in words.
+            // TODO: Transfer all Payload to the client app. Use helper class.
+            /*
             userData.skipBytes(2);
             short partialListCount = userData.readShort();
             List<SslDataRecord> sslDataRecords = new LinkedList<>();
@@ -1152,12 +1189,16 @@ else if(length >= 8) {
                 sslDataRecords.add(new SslModuleIdentificationDataRecord(
                     index, articleNumber, bgType, moduleOrOsVersion, pgDescriptionFileVersion));
             }
-            return new CpuServicesPayload(returnCode, sslId, sslIndex, sslDataRecords);
+            */
+            ByteBuf payload = Unpooled.copiedBuffer(userData);
+                            
+            return new CpuServicesPayload(returnCode, sslId, sslIndex, payload);
         }
         // In all other cases, it's probably an error.
         else {
             // TODO: Output an error.
         }   
+
         return null;   
     }    
     
@@ -1484,42 +1525,46 @@ private AlarmMessagePayload decodeMessageServiceAckPayload(CpuServicesParameter
     
     
     private CpuCyclicServicesResponsePayload decodeCyclicServiceResponsePayload(CpuCyclicServicesResponseParameter parameter, ByteBuf userData){
-        logger.info("decodeCyclicServiceResponsePayload :\r\n" + ByteBufUtil.prettyHexDump(userData));
+        //logger.info("decodeCyclicServiceResponsePayload :\r\n" + ByteBufUtil.prettyHexDump(userData));
         DataTransportErrorCode AlarmReturnCode;
         DataTransportSize AlarmTransportSize;
         int length;
-        int itemcount;
+        int itemcount = 0;
+        List<AssociatedValueItem> Values = new LinkedList<>();
         
         //Data section
         DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
         DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
         length = userData.readShort(); //Number of bytes
-        userData.readByte(); //TODO: Sometimes is 0x00 another 0x01, Blinking when I have TIA running
-        itemcount = (length==0?0x0000:userData.readByte());
-        List<AssociatedValueItem> Values = new LinkedList<>();
-        try {
-        for (int i=0; i < itemcount; i++ ){                         
-            DataTransportErrorCode valueCode = DataTransportErrorCode.valueOf(userData.readByte());
-            DataTransportSize valueTransportSize = DataTransportSize.valueOf(userData.readByte());
-                        
-            int valueLength = userData.readShort() / 8;  
-            if ((valueLength % 2 != 0) && (userData.isReadable(valueLength+1))) {
+        
+        //Check for Unsubscribe
+        if (length != 0x0000) {
+            userData.readByte(); //TODO: Sometimes is 0x00 another 0x01, Blinking when I have TIA running
+            itemcount = (length==0?0x0000:userData.readByte());
+            try {
+                for (int i=0; i < itemcount; i++ ){                         
+                    DataTransportErrorCode valueCode = DataTransportErrorCode.valueOf(userData.readByte());
+                    DataTransportSize valueTransportSize = DataTransportSize.valueOf(userData.readByte());
+
+                    int valueLength = userData.readShort() / 8;  
+                    if ((valueLength % 2 != 0) && (userData.isReadable(valueLength+1))) {
+
+                        userData.readByte(); //Fill byte for odd number of bytes
+                    }
 
-                userData.readByte(); //Fill byte for odd number of bytes
-            }
+                    ByteBuf Data = userData.readBytes(valueLength);
 
-            ByteBuf Data = userData.readBytes(valueLength);
-            
-            Values.add(new AssociatedValueItem(valueCode,
-                            valueTransportSize,
-                            valueLength,
-                            Data));            
-        }
-        } catch (Exception e) {
-            logger.info(e.getMessage());
-            return null;
+                    Values.add(new AssociatedValueItem(valueCode,
+                                    valueTransportSize,
+                                    valueLength,
+                                    Data));            
+                }
+            } catch (Exception e) {
+                logger.info(e.getMessage());
+                return null;
+            }
         }
-        
+
         return new CpuCyclicServicesResponsePayload(
                     returnCode,
                     dataTransportSize,
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesRequestPayload.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesRequestPayload.java
index 1d1eeacb735..aeffe15cd10 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesRequestPayload.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesRequestPayload.java
@@ -37,8 +37,11 @@ public class CpuCyclicServicesRequestPayload implements S7Payload {
     private final int itemCount;
     private final CpuCyclicServiceTimeBaseType timeBase;
     private final byte timeFactor;
-    private final List<S7AnyVarPayloadItem> items;    
-
+    private final List<S7AnyVarPayloadItem> items;  
+    //For Cancel Subcription
+    private final byte function;
+    private final byte jobId;
+    
     public CpuCyclicServicesRequestPayload(DataTransportErrorCode returnCode, 
             DataTransportSize dataTransportSize, 
             int length, 
@@ -53,8 +56,27 @@ public CpuCyclicServicesRequestPayload(DataTransportErrorCode returnCode,
         this.timeBase = timeBase;
         this.timeFactor = timeFactor;
         this.items = items;
+        this.function = 0x00;
+        this.jobId = 0x00;
     }
 
+
+    public CpuCyclicServicesRequestPayload(DataTransportErrorCode returnCode, 
+            DataTransportSize dataTransportSize, 
+            int length,
+            byte function,
+            byte jobId) {
+        this.returnCode = returnCode;
+        this.dataTransportSize = dataTransportSize;
+        this.length = length;
+        this.itemCount = 0x00;
+        this.timeBase = null;
+        this.timeFactor = 0x00;
+        this.items = null;
+        this.function = function;
+        this.jobId = jobId;
+    }
+    
     public DataTransportErrorCode getReturnCode() {
         return returnCode;
     }
@@ -83,6 +105,14 @@ public List<S7AnyVarPayloadItem> getItems() {
         return items;
     }
 
+    public byte getFunction() {
+        return function;
+    }
+
+    public byte getJobId() {
+        return jobId;
+    }
+    
     @Override
     public ParameterType getType() {
         return ParameterType.CPU_SERVICES;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuServicesPayload.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuServicesPayload.java
index 43a33abfe97..8f1e1b1a608 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuServicesPayload.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuServicesPayload.java
@@ -18,6 +18,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.plc4x.java.s7.netty.model.payloads;
 
+import io.netty.buffer.ByteBuf;
 import java.util.Collections;
 import java.util.List;
 import org.apache.plc4x.java.s7.netty.model.payloads.ssls.SslDataRecord;
@@ -31,12 +32,14 @@ public class CpuServicesPayload implements S7Payload {
     private SslId sslId;
     private short sslIndex;
     private List<SslDataRecord> sslDataRecords;
+    private ByteBuf sslPayload;
 
     public CpuServicesPayload(DataTransportErrorCode returnCode, SslId sslId, short sslIndex) {
         this.returnCode = returnCode;
         this.sslId = sslId;
         this.sslIndex = sslIndex;
         this.sslDataRecords = Collections.emptyList();
+        this.sslPayload = null;        
     }
 
     public CpuServicesPayload(DataTransportErrorCode returnCode, SslId sslId, short sslIndex, List<SslDataRecord> sslDataRecords) {
@@ -44,7 +47,16 @@ public CpuServicesPayload(DataTransportErrorCode returnCode, SslId sslId, short
         this.sslId = sslId;
         this.sslIndex = sslIndex;
         this.sslDataRecords = sslDataRecords;
+        this.sslPayload = null;        
     }
+    
+    public CpuServicesPayload(DataTransportErrorCode returnCode, SslId sslId, short sslIndex, ByteBuf sslPayload) {
+        this.returnCode = returnCode;
+        this.sslId = sslId;
+        this.sslIndex = sslIndex;
+        this.sslDataRecords = null;
+        this.sslPayload = sslPayload;
+    }    
 
     @Override
     public ParameterType getType() {
@@ -67,4 +79,8 @@ public List<SslDataRecord> getSslDataRecords() {
         return sslDataRecords;
     }
 
+    public ByteBuf getSslPayload() {
+        return sslPayload;
+    }
+       
 }
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SslId.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SslId.java
index f8fc6c30512..9dbf00a9bcb 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SslId.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SslId.java
@@ -18,11 +18,10 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.plc4x.java.s7.netty.model.types;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.HashMap;
 import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An SSL ID is a short value build up the following way:
@@ -44,12 +43,14 @@ public enum SslId {
     USER_MEMORY_AREAS((short) 0x0013),
     SYSTEM_AREAS((short) 0x0014),
     BLOCK_TYPES((short) 0x0015),
+    COMPONENT_IDENTIFICATION((short) 0x001c),
     INTERRUPT_STATUS((short) 0x0022),
     ASSIGNMENT_BETWEEN_PROCESS_IMAGE_PARTITIONS_AND_OBS((short) 0x0025),
     COMPUTATION_STATUS_DATA((short) 0x0032),
     H_CPU_GROUP_INFORMATION((short) 0x0071),
     STATUS_OF_THE_MODULE_LEDS((short) 0x0074),
     SWITCHED_DP_SLAVES_IN_THE_H_SYSTEM((short) 0x0075),
+    DP_MASTER_SYSTEM_INFORMATION((short) 0x0090),    
     MODULE_STATUS_INFORMATION((short) 0x0091),
     RACK_STATION_STATUS_INFORMATION_1((short) 0x0092),
     RACK_STATION_STATUS_INFORMATION_2((short) 0x0094),
@@ -60,11 +61,11 @@ public enum SslId {
     MODULE_DIAGNOSTIC_INFORMATION_DATA_RECORD_0((short) 0x00B1),
     MODULE_DIAGNOSTIC_INFORMATION_DATA_RECORD_1_GEOGRAPHICAL_ADDRESS((short) 0x00B2),
     MODULE_DIAGNOSTIC_INFORMATION_DATA_RECORD_1_LOGICAL_ADDRESS((short) 0x00B3),
-    DIAGNOSTIC_DATA_OF_A_DP_SLAVE((short) 0x00B4),
-
+    DIAGNOSTIC_DATA_OF_A_DP_SLAVE((short) 0x00B4),    
     IDENTIFICATION_OF_ALL_COMPONENTS((short) 0x001c),
     INFORMATION_ABOUT_COMMUNICATION_UNIT((short) 0x0131),
-    CURRENT_MODE_TRANSITION((short) 0x0424);
+    CURRENT_MODE_TRANSITION((short) 0x0424),
+    NULL((short) 0x0000);
 
     private static final Logger logger = LoggerFactory.getLogger(SslId.class);
 
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandler.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandler.java
index dd65567c259..2799e49ce6f 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandler.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandler.java
@@ -18,19 +18,19 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.plc4x.java.s7.netty.util;
 
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.connection.DefaultPlcFieldHandler;
-import org.apache.plc4x.java.base.messages.items.*;
-import org.apache.plc4x.java.s7.model.S7Field;
-
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
 import java.util.BitSet;
 import java.util.LinkedList;
 import java.util.List;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.connection.DefaultPlcFieldHandler;
+import org.apache.plc4x.java.base.messages.items.*;
+import org.apache.plc4x.java.s7.model.S7Field;
+import org.apache.plc4x.java.s7.model.S7SslField;
 
 public class S7PlcFieldHandler extends DefaultPlcFieldHandler {
 
@@ -39,6 +39,9 @@ public PlcField createField(String fieldQuery) {
         if (S7Field.matches(fieldQuery)) {
             return S7Field.of(fieldQuery);
         }
+        if (S7SslField.matches(fieldQuery)) {
+            return S7SslField.of(fieldQuery);
+        }        
         throw new PlcInvalidFieldException(fieldQuery);
     }
 
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7ByteReadResponse.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7ByteReadResponse.java
new file mode 100644
index 00000000000..27f27c966d2
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7ByteReadResponse.java
@@ -0,0 +1,480 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.protocol;
+
+import io.netty.buffer.ByteBuf;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Objects;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.messages.InternalPlcReadRequest;
+import org.apache.plc4x.java.base.messages.InternalPlcReadResponse;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7ByteReadResponse implements InternalPlcReadResponse{
+    
+    private final InternalPlcReadRequest request;
+    private final Map<String, Pair<PlcResponseCode, ByteBuf>> values;        
+
+    public S7ByteReadResponse(InternalPlcReadRequest request, Map<String, Pair<PlcResponseCode, ByteBuf>> values) {
+        this.request = request;
+        this.values = values;
+    }
+
+    /**
+     *
+     * @return
+     */
+    @Override
+    public Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> getValues() {
+        return null;
+    }
+   
+    public Map<String, Pair<PlcResponseCode, ByteBuf>> getByteBufValues() {
+        return values;
+    }   
+    
+    public ByteBuf getByteBufValues(String name) {
+     ByteBuf bytebuf = getByteBufInternal(name);         
+    return bytebuf;
+    }  
+
+    @Override
+    public InternalPlcReadRequest  getRequest() {
+        return request;
+    }
+
+    @Override
+    public int getNumberOfValues(String name) {
+        ByteBuf bytebuf = getByteBufInternal(name);
+        return bytebuf.capacity();
+    }
+
+    @Override
+    public Object getObject(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Object getObject(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<Object> getAllObjects(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidBoolean(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidBoolean(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Boolean getBoolean(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Boolean getBoolean(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<Boolean> getAllBooleans(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidByte(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidByte(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Byte getByte(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Byte getByte(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<Byte> getAllBytes(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidShort(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidShort(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Short getShort(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Short getShort(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<Short> getAllShorts(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Integer getInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Integer getInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<Integer> getAllIntegers(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<BigInteger> getAllBigIntegers(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidLong(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidLong(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Long getLong(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Long getLong(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<Long> getAllLongs(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidFloat(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidFloat(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Float getFloat(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Float getFloat(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<Float> getAllFloats(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidDouble(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidDouble(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Double getDouble(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Double getDouble(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<Double> getAllDoubles(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<BigDecimal> getAllBigDecimals(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidString(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidString(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public String getString(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public String getString(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<String> getAllStrings(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public LocalTime getTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public LocalTime getTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<LocalTime> getAllTimes(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidDate(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidDate(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public LocalDate getDate(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public LocalDate getDate(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<LocalDate> getAllDates(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidDateTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidDateTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<LocalDateTime> getAllDateTimes(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidByteArray(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidByteArray(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Byte[] getByteArray(String name) {
+        ByteBuf bytebuf = getByteBufInternal(name);
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Byte[] getByteArray(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<Byte[]> getAllByteArrays(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<String> getFieldNames() {
+        return request.getFieldNames();
+    }
+
+    @Override
+    public PlcField getField(String name) {
+        return request.getField(name);
+    }
+
+    @Override
+    public PlcResponseCode getResponseCode(String name) {
+        if (values.get(name) == null) {
+            throw new PlcInvalidFieldException(name);
+        }
+        return values.get(name).getKey();
+    }
+    
+    protected ByteBuf getByteBufInternal(String name) {
+        Objects.requireNonNull(name, "Name argument required");
+        // If this field doesn't exist, ignore it.
+        if (values.get(name) == null) {
+            throw new PlcInvalidFieldException(name);
+        }
+        if (values.get(name).getKey() != PlcResponseCode.OK) {
+            throw new PlcRuntimeException("Field '" + name + "' could not be fetched, response was " + values.get(name).getKey());
+        }
+        // No need to check for "null" as this is already captured by the constructors.
+        return values.get(name).getValue();
+    }    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7CyclicServicesSubscriptionHandle.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7CyclicServicesSubscriptionHandle.java
index 81d20ff8915..c0137eb577d 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7CyclicServicesSubscriptionHandle.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7CyclicServicesSubscriptionHandle.java
@@ -24,14 +24,14 @@ Licensed to the Apache Software Foundation (ASF) under one
 import java.util.function.Consumer;
 import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
 import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
-import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
 import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
 
 /**
  *
  * @author cgarcia
  */
-public class S7CyclicServicesSubscriptionHandle implements PlcSubscriptionHandle {
+public class S7CyclicServicesSubscriptionHandle implements InternalPlcSubscriptionHandle {
     Set<Consumer<PlcSubscriptionEvent>> consumers = new HashSet<>();
         
     //CyClic Services information hanler
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7DiagnosticSubscriptionHandle.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7DiagnosticSubscriptionHandle.java
index 139242a2288..e681537d9b8 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7DiagnosticSubscriptionHandle.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7DiagnosticSubscriptionHandle.java
@@ -24,19 +24,53 @@ Licensed to the Apache Software Foundation (ASF) under one
 import java.util.function.Consumer;
 import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
 import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
-import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
 import org.apache.plc4x.java.s7.netty.model.types.SubscribedEventType;
 
 /**
  *
  * @author cgarcia
  */
-public class S7DiagnosticSubscriptionHandle implements PlcSubscriptionHandle {
+public class S7DiagnosticSubscriptionHandle implements InternalPlcSubscriptionHandle{
     Set<Consumer<PlcSubscriptionEvent>> consumers = new HashSet<>();
     
-    //Diagnostic events
-    List<SubscribedEventType> subscribedevents; 
-        
+    //CyClic Services information hanler
+    private final String fieldName; //Subscription id from the request
+    private final short jobId; //Job-Id from cyclic subscriotion
+    private final PlcResponseCode error; //Register the error from the suscription.       
+    private final List<SubscribedEventType> subscribedevents;     //Diagnostic events
+
+    public S7DiagnosticSubscriptionHandle(String fieldName, 
+            short jobId, 
+            PlcResponseCode error, 
+            List<SubscribedEventType> subscribedevents) {
+        this.fieldName = fieldName;
+        this.jobId = jobId;
+        this.error = error;
+        this.subscribedevents = subscribedevents;
+    }
+
+    public String getFieldName() {
+        return fieldName;
+    }
+
+    public short getJobId() {
+        return jobId;
+    }
+
+    public PlcResponseCode getError() {
+        return error;
+    }
+
+    public List<SubscribedEventType> getSubscribedevents() {
+        return subscribedevents;
+    }
+
+    public Set<Consumer<PlcSubscriptionEvent>> getConsumers() {
+        return consumers;
+    }            
+    
     @Override
     public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer) {
         consumers.add(consumer);
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Alarm8Event.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Alarm8Event.java
new file mode 100644
index 00000000000..d6664a37e94
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Alarm8Event.java
@@ -0,0 +1,28 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.protocol.event;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7Alarm8Event {
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Alarm8pEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Alarm8pEvent.java
new file mode 100644
index 00000000000..e4aaec2aad8
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Alarm8pEvent.java
@@ -0,0 +1,28 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.protocol.event;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7Alarm8pEvent {
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmDEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmDEvent.java
new file mode 100644
index 00000000000..f8e57d26b7a
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmDEvent.java
@@ -0,0 +1,28 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.protocol.event;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7AlarmDEvent {
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmDQEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmDQEvent.java
new file mode 100644
index 00000000000..a8dc38654e8
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmDQEvent.java
@@ -0,0 +1,28 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.protocol.event;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7AlarmDQEvent {
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmEvent.java
new file mode 100644
index 00000000000..a98d7465aa2
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmEvent.java
@@ -0,0 +1,14 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.apache.plc4x.java.s7.protocol.event;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7AlarmEvent {
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmSEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmSEvent.java
new file mode 100644
index 00000000000..0c2542ac1f2
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmSEvent.java
@@ -0,0 +1,434 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.protocol.event;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.Collection;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7AlarmSEvent implements S7Event {
+
+    @Override
+    public Instant getTimestamp() {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public PlcReadRequest getRequest() {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public int getNumberOfValues(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Object getObject(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Object getObject(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Object> getAllObjects(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidBoolean(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidBoolean(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Boolean getBoolean(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Boolean getBoolean(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Boolean> getAllBooleans(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidByte(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidByte(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Byte getByte(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Byte getByte(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Byte> getAllBytes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidShort(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidShort(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Short getShort(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Short getShort(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Short> getAllShorts(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Integer getInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Integer getInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Integer> getAllIntegers(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<BigInteger> getAllBigIntegers(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidLong(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidLong(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Long getLong(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Long getLong(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Long> getAllLongs(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidFloat(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidFloat(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Float getFloat(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Float getFloat(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Float> getAllFloats(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDouble(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDouble(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Double getDouble(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Double getDouble(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Double> getAllDoubles(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<BigDecimal> getAllBigDecimals(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidString(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidString(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public String getString(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public String getString(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<String> getAllStrings(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public LocalTime getTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public LocalTime getTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<LocalTime> getAllTimes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDate(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDate(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public LocalDate getDate(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public LocalDate getDate(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<LocalDate> getAllDates(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDateTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDateTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<LocalDateTime> getAllDateTimes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidByteArray(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidByteArray(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Byte[] getByteArray(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Byte[] getByteArray(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Byte[]> getAllByteArrays(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<String> getFieldNames() {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public PlcField getField(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public PlcResponseCode getResponseCode(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmSQEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmSQEvent.java
new file mode 100644
index 00000000000..f87189d3f00
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmSQEvent.java
@@ -0,0 +1,28 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.protocol.event;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7AlarmSQEvent {
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Event.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Event.java
new file mode 100644
index 00000000000..7a509ef22b0
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Event.java
@@ -0,0 +1,30 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.protocol.event;
+
+import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
+
+/**
+ *
+ * @author cgarcia
+ */
+public interface S7Event extends PlcSubscriptionEvent{
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7ModeEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7ModeEvent.java
new file mode 100644
index 00000000000..869faf4f826
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7ModeEvent.java
@@ -0,0 +1,487 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.protocol.event;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.s7.netty.model.params.CpuDiagnosticPushParameter;
+import org.apache.plc4x.java.s7.netty.model.types.CpuCurrentModeType;
+import org.apache.plc4x.java.s7.netty.model.types.CpuUserDataMethodType;
+import org.apache.plc4x.java.s7.netty.model.types.CpuUserDataParameterFunctionGroupType;
+import org.apache.plc4x.java.s7.netty.model.types.CpuUserDataParameterType;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7ModeEvent implements S7Event {
+    
+    public static final String METHOD = "METHOD";
+    public static final String TYPE = "TYPE";
+    public static final String FUNCTION = "FUNCTION";
+    public static final String CURRENT_MODE = "CURRENT_MODE";
+    
+    private final Instant timeStamp;
+    private Map<String, Object> map = new HashMap();
+
+    public S7ModeEvent(Instant timeStamp, CpuDiagnosticPushParameter parameter) {
+      map.put(METHOD, parameter.getMethod());
+      map.put(TYPE, parameter.getParameterType());
+      map.put(FUNCTION, parameter.getParameterFunction());
+      map.put(CURRENT_MODE, parameter.getCurrentMode());
+      this.timeStamp = timeStamp;
+    }
+
+    @Override
+    public Instant getTimestamp() {
+        return timeStamp;
+    }
+
+    @Override
+    public PlcReadRequest getRequest() {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public int getNumberOfValues(String name) {
+        return 0x01; 
+    }
+
+    @Override
+    public Object getObject(String name) {
+        Object object = map.get(name);
+        return object;
+    }
+
+    @Override
+    public Object getObject(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Object> getAllObjects(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBoolean(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBoolean(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Boolean getBoolean(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Boolean getBoolean(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Boolean> getAllBooleans(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidByte(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidByte(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Byte getByte(String name) {
+        Object object = map.get(name);
+        if (object != null) {
+            if (object instanceof CpuUserDataMethodType){
+                return ((CpuUserDataMethodType) object).getCode();
+            } else if (object instanceof CpuUserDataParameterType) {
+                return ((CpuUserDataParameterType) object).getCode();
+            } else if (object instanceof CpuUserDataParameterFunctionGroupType) {
+                return ((CpuUserDataParameterFunctionGroupType) object).getCode();
+            } else if (object instanceof CpuCurrentModeType) {
+                return ((CpuCurrentModeType) object).getCode();
+            }
+        }
+        return 0x00;
+    }
+
+    @Override
+    public Byte getByte(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Byte> getAllBytes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidShort(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidShort(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Short getShort(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Short getShort(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Short> getAllShorts(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Integer getInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Integer getInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Integer> getAllIntegers(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<BigInteger> getAllBigIntegers(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidLong(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidLong(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Long getLong(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Long getLong(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Long> getAllLongs(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidFloat(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidFloat(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Float getFloat(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Float getFloat(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Float> getAllFloats(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDouble(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDouble(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Double getDouble(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Double getDouble(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Double> getAllDoubles(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<BigDecimal> getAllBigDecimals(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidString(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidString(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public String getString(String name) {
+        Object object = map.get(name);
+        if (object != null) {
+            if (object instanceof CpuUserDataMethodType){
+                return ((CpuUserDataMethodType) object).getEvent();
+            } else if (object instanceof CpuUserDataParameterType) {
+                return ((CpuUserDataParameterType) object).getEvent();
+            } else if (object instanceof CpuUserDataParameterFunctionGroupType) {
+                return ((CpuUserDataParameterFunctionGroupType) object).getEvent();
+            } else if (object instanceof CpuCurrentModeType) {
+                return ((CpuCurrentModeType) object).getEvent();
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public String getString(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<String> getAllStrings(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalTime getTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalTime getTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<LocalTime> getAllTimes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDate(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDate(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalDate getDate(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalDate getDate(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<LocalDate> getAllDates(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDateTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDateTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<LocalDateTime> getAllDateTimes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidByteArray(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidByteArray(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Byte[] getByteArray(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Byte[] getByteArray(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Byte[]> getAllByteArrays(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<String> getFieldNames() {
+        return map.keySet(); 
+    }
+
+    @Override
+    public PlcField getField(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public PlcResponseCode getResponseCode(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public String toString() {
+        return "S7ModeEvent{" + "timeStamp=" + timeStamp + ", map=" + map + '}';
+    }
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Notify8pEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Notify8pEvent.java
new file mode 100644
index 00000000000..9afcf2fa86e
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Notify8pEvent.java
@@ -0,0 +1,28 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.protocol.event;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7Notify8pEvent {
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7NotifyEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7NotifyEvent.java
new file mode 100644
index 00000000000..56e27c15e73
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7NotifyEvent.java
@@ -0,0 +1,14 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.apache.plc4x.java.s7.protocol.event;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7NotifyEvent {
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7SysEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7SysEvent.java
new file mode 100644
index 00000000000..c24a18aa223
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7SysEvent.java
@@ -0,0 +1,477 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.protocol.event;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneOffset;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.CpuDiagnosticMessageItem;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7SysEvent implements S7Event{
+ 
+    public static final String EVENT_ID = "EVENT_ID";
+    public static final String PRIORITY_CLASS = "PRIORITY_CLASS";
+    public static final String OB_NUMBER = "OB_NUMBER";
+    public static final String DAT_ID = "DAT_ID";
+    public static final String INFO1 = "INFO1";
+    public static final String INFO2 = "INFO2";
+    
+    private final Instant timeStamp;
+    private Map<String, Object> map = new HashMap();
+
+    public S7SysEvent(CpuDiagnosticMessageItem item) {
+        map.put(EVENT_ID, item.getEventID());
+        map.put(PRIORITY_CLASS, item.getPriorityClass());
+        map.put(OB_NUMBER, item.getObNumber());
+        map.put(DAT_ID, item.getDatID());
+        map.put(INFO1, item.getInfo1());
+        map.put(INFO2, item.getInfo2());
+        this.timeStamp = item.getTimeStamp().toInstant(ZoneOffset.UTC);
+    }
+
+    @Override
+    public Instant getTimestamp() {
+        return timeStamp; 
+    }
+
+    @Override
+    public PlcReadRequest getRequest() {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public int getNumberOfValues(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Object getObject(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Object getObject(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Object> getAllObjects(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBoolean(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBoolean(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Boolean getBoolean(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Boolean getBoolean(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Boolean> getAllBooleans(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidByte(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidByte(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Byte getByte(String name) {
+        Object object = map.get(name);
+        if (object instanceof Byte){
+            return (Byte) object;
+        }
+        return null;
+    }
+
+    @Override
+    public Byte getByte(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Byte> getAllBytes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidShort(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidShort(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Short getShort(String name) {
+        Object object = map.get(name);
+        if (object instanceof Short){
+            return (Short) object;
+        }
+        return null;
+    }
+
+    @Override
+    public Short getShort(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Short> getAllShorts(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Integer getInteger(String name) {
+        Object object = map.get(name);
+        if (object instanceof Integer){
+            return (Integer) object;
+        }
+        return null; 
+    }
+
+    @Override
+    public Integer getInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Integer> getAllIntegers(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<BigInteger> getAllBigIntegers(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidLong(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidLong(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Long getLong(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Long getLong(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Long> getAllLongs(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidFloat(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidFloat(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Float getFloat(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Float getFloat(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Float> getAllFloats(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDouble(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDouble(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Double getDouble(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Double getDouble(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Double> getAllDoubles(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<BigDecimal> getAllBigDecimals(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidString(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidString(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public String getString(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public String getString(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<String> getAllStrings(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalTime getTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalTime getTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<LocalTime> getAllTimes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDate(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDate(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalDate getDate(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalDate getDate(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<LocalDate> getAllDates(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDateTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDateTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<LocalDateTime> getAllDateTimes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidByteArray(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidByteArray(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Byte[] getByteArray(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Byte[] getByteArray(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Byte[]> getAllByteArrays(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<String> getFieldNames() {
+        return map.keySet();
+    }
+
+    @Override
+    public PlcField getField(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public PlcResponseCode getResponseCode(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public String toString() {
+        return "S7SysEvent{" + "timeStamp=" + timeStamp + ", map=" + map + '}';
+    }
+    
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7UserEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7UserEvent.java
new file mode 100644
index 00000000000..ed5ffbe9801
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7UserEvent.java
@@ -0,0 +1,28 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.protocol.event;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7UserEvent {
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7DiagnosticEventId.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7DiagnosticEventId.java
index 087ae85d53b..741ac4417e6 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7DiagnosticEventId.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7DiagnosticEventId.java
@@ -23,7 +23,32 @@ Licensed to the Apache Software Foundation (ASF) under one
 import java.util.Map;
 
 /**
- *
+ *  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+ *  |15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1|
+ *  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+ *  \__________/\__________/\____________________/
+ *   Event class     IDs         Event number
+ * 
+ *   Event Class:
+ *      1   Standard OB Events
+ *      2   Synchronous errors
+ *      3   Asynchronous errors
+ *      4   Mode transition
+ *      5   Run-time events
+ *      6   Communications events
+ *      7   Events for fail-safe and fault tolerant systems
+ *      8   Standardized diagnostic data on modules
+ *      9   Predefined user events
+ *    A,B   Freely definable events
+ *  C,D,E   Reserved
+ *      F   Events for modules other than CPUs (for example, CPs, FMs)
+ * 
+ *  IDs (Bit)
+ *      8   0:Event leaving state, 1:Event entering state
+ *      9   1:Entry in diagnostic buffer
+ *     10   1:Internal error
+ *     11   1:External error
+ * 
  * @author cgarcia
  */
 public enum S7DiagnosticEventId {
@@ -37,6 +62,8 @@ public enum S7DiagnosticEventId {
     EVENTID_0x115A((short) 0x115A, "Manufacturer interrupt for PROFINET IO"),
     EVENTID_0x115B((short) 0x115B, "IO: Profile-specific interrupt"),
     EVENTID_0x116A((short) 0x116A, "Technology synchronization interrupt"),
+    
+    //Event Class 1 - Standard OB Events
     EVENTID_0x1381((short) 0x1381, "Request for manual warm restart"),
     EVENTID_0x1382((short) 0x1382, "Request for automatic warm restart"),
     EVENTID_0x1383((short) 0x1383, "Request for manual hot restart"),
@@ -49,6 +76,8 @@ public enum S7DiagnosticEventId {
     EVENTID_0x138B((short) 0x138B, "Master CPU: request for automatic warm restart"),
     EVENTID_0x138C((short) 0x138C, "Standby CPU: request for manual hot restart"),
     EVENTID_0x138D((short) 0x138D, "Standby CPU: request for automatic hot restart"),
+    
+    //Event Class 2 - Synchronous Errors
     EVENTID_0x2521((short) 0x2521, "BCD conversion error"),
     EVENTID_0x2522((short) 0x2522, "Area length error when reading"),
     EVENTID_0x2523((short) 0x2523, "Area length error when writing"),
@@ -71,9 +100,9 @@ public enum S7DiagnosticEventId {
     EVENTID_0x253F((short) 0x253F, "SFB not loaded"),
     EVENTID_0x2942((short) 0x2942, "I/O access error, reading"),
     EVENTID_0x2943((short) 0x2943, "I/O access error, writing"),
-    EVENTID_0x3267((short) 0x3267, "End of module reconfiguration"),
-    EVENTID_0x3367((short) 0x3367, "Start of module reconfiguration"),
-    EVENTID_0x34A4((short) 0x34A4, "PROFInet Interface DB can be addressed again"),
+
+    
+    //Event Class 3 - Asynchronous Errors
     EVENTID_0x3501((short) 0x3501, "Cycle time exceeded"),
     EVENTID_0x3502((short) 0x3502, "User interface (OB or FRB) request error"),
     EVENTID_0x3503((short) 0x3503, "Delay too long processing a priority class"),
@@ -174,7 +203,9 @@ public enum S7DiagnosticEventId {
     EVENTID_0x39CD((short) 0x39CD, "PROFINET IO station operational again, but expected configuration does not match actual configuration"),
     EVENTID_0x39CE((short) 0x39CE, "PROFINET IO station operational again, but error(s) in module parameter assignment"),
     EVENTID_0x42F3((short) 0x42F3, "Checksum error detected and corrected by the operating system"),
-    EVENTID_0x42F4((short) 0x42F4, "Standby CPU: connection/update via SFC90 is locked in the master CPU"),
+
+    
+    //Event Class 4 - Stop Events and Other Mode Changes
     EVENTID_0x4300((short) 0x4300, "Backed-up power on"),
     EVENTID_0x4301((short) 0x4301, "Mode transition from STOP to STARTUP"),
     EVENTID_0x4302((short) 0x4302, "Mode transition from STARTUP to RUN"),
@@ -295,15 +326,17 @@ public enum S7DiagnosticEventId {
     EVENTID_0x49D2((short) 0x49D2, "Standby CPU changed to STOP due to STOP on the master CPU during link-up"),
     EVENTID_0x49D4((short) 0x49D4, "STOP on a master, since partner CPU is also a master (link-up error)"),
     EVENTID_0x49D7((short) 0x49D7, "LINK-UP rejected due to change in user program or in configuration"),
-    EVENTID_0x510F((short) 0x510F, "A problem as occurred with WinLC. This problem has caused the CPU to go into STOP mode or has caused a fault in the CPU"),
+    EVENTID_0x42F4((short) 0x42F4, "Standby CPU: connection/update via SFC90 is locked in the master CPU"),
+            
+    //Event Class 5 - Mode Run-time Events
     EVENTID_0x530D((short) 0x530D, "New startup information in the STOP mode"),
+    EVENTID_0x510F((short) 0x510F, "A problem as occurred with WinLC. This problem has caused the CPU to go into STOP mode or has caused a fault in the CPU"),    
     EVENTID_0x5311((short) 0x5311, "Startup despite Not Ready message from module(s)"),
     EVENTID_0x5371((short) 0x5371, "Distributed I/Os: end of the synchronization with a DP master"),
     EVENTID_0x5380((short) 0x5380, "Diagnostic buffer entries of interrupt and asynchronous errors disabled"),
     EVENTID_0x5395((short) 0x5395, "Distributed I/Os: reset of a DP master"),
     EVENTID_0x53A2((short) 0x53A2, "Download of technology firmware successful"),
     EVENTID_0x53A4((short) 0x53A4, "Download of technology DB not successful"),
-    EVENTID_0x53FF((short) 0x53FF, "Reset to factory setting"),
     EVENTID_0x5445((short) 0x5445, "Start of System reconfiguration in RUN mode"),
     EVENTID_0x5481((short) 0x5481, "All licenses for runtime software are complete again"),
     EVENTID_0x5498((short) 0x5498, "No more inconsistency with DP master systems due to CiR"),
@@ -331,7 +364,11 @@ public enum S7DiagnosticEventId {
     EVENTID_0x59A0((short) 0x59A0, "The interrupt can not be associated in the CPU"),
     EVENTID_0x59A1((short) 0x59A1, "Configuration error in the integrated technology"),
     EVENTID_0x59A3((short) 0x59A3, "Error when downloading the integrated technology"),
-    EVENTID_0x6253((short) 0x6253, "Firmware update: End of firmware download over the network"),
+    EVENTID_0x53FF((short) 0x53FF, "Reset to factory setting"),
+    
+
+    
+    //Event Class 6 - Communication Events
     EVENTID_0x6316((short) 0x6316, "Interface error when starting programmable controller"),
     EVENTID_0x6353((short) 0x6353, "Firmware update: Start of firmware download over the network"),
     EVENTID_0x6390((short) 0x6390, "Formatting of Micro Memory Card complete"),
@@ -370,11 +407,14 @@ public enum S7DiagnosticEventId {
     EVENTID_0x6549((short) 0x6549, "Structure error in block"),
     EVENTID_0x6550((short) 0x6550, "A block has an error in the CRC"),
     EVENTID_0x6551((short) 0x6551, "A block has no CRC"),
+    EVENTID_0x6253((short) 0x6253, "Firmware update: End of firmware download over the network"),    
     EVENTID_0x6560((short) 0x6560, "SCAN overflow"),
     EVENTID_0x6805((short) 0x6805, "Resource problem on configured connections, eliminated"),
     EVENTID_0x6881((short) 0x6881, "Interface error leaving state"),
     EVENTID_0x6905((short) 0x6905, "Resource problem on configured connections"),
     EVENTID_0x6981((short) 0x6981, "Interface error entering state"),
+    
+    //Event Class 7 - H/F Events
     EVENTID_0x72A2((short) 0x72A2, "Failure of a DP master or a DP master system"),
     EVENTID_0x72A3((short) 0x72A3, "Redundancy restored on the DP slave"),
     EVENTID_0x72DB((short) 0x72DB, "Safety program: safety mode disabled"),
@@ -448,17 +488,168 @@ public enum S7DiagnosticEventId {
     EVENTID_0x79E5((short) 0x79E5, "F-I/O device passivated"),
     EVENTID_0x79E6((short) 0x79E6, "Inconsistent safety program"),
     EVENTID_0x79E7((short) 0x79E7, "Simulation block (F system block) loaded"),
+    EVENTID_0x73E8((short) 0x73E8, "Consistency of the safety program verified by testing"),
+    EVENTID_0x73E9((short) 0x73E9, "Consistency of the safety program cannot be checked"),
+    
+    //Event Class 8 - Diagnostic Events for Modules
+    EVENTID_0x8x00((short) 0x8000, "Module fault/OK"),
+    EVENTID_0x8x01((short) 0x8001, "Internal error"),
+    EVENTID_0x8x02((short) 0x8002, "External error"),
+    EVENTID_0x8x03((short) 0x8003, "Channel error"),
+    EVENTID_0x8x04((short) 0x8004, "External error"),
+    EVENTID_0x8x05((short) 0x8005, "No front connector"),
+    EVENTID_0x8x06((short) 0x8006, "No parameter assignment"),
+    EVENTID_0x8x07((short) 0x8007, "Incorrect parameters in module"),  
+    EVENTID_0x8x30((short) 0x8030, "User submodule incorrect/not found"),
+    EVENTID_0x8x31((short) 0x8031, "Communication problem"),
+    EVENTID_0x8x32((short) 0x8032, "Operating mode: RUN/STOP (STOP: entering state, RUN: leaving state)"),
+    EVENTID_0x8x33((short) 0x8033, "Time monitoring responded (watchdog)"),
+    EVENTID_0x8x34((short) 0x8034, "Internal module power failure"),
+    EVENTID_0x8x35((short) 0x8035, "BATTF: battery exhausted"),
+    EVENTID_0x8x36((short) 0x8036, "Total backup failed"),
+    EVENTID_0x8x40((short) 0x8040, "Expansion rack failed"),
+    EVENTID_0x8x41((short) 0x8041, "Processor failure"),
+    EVENTID_0x8x42((short) 0x8042, "EPROM error"),
+    EVENTID_0x8x43((short) 0x8043, "RAM error"),
+    EVENTID_0x8x44((short) 0x8044, "ADC/DAC error"),
+    EVENTID_0x8x45((short) 0x8045, "Fuse blown"),
+    EVENTID_0x8x46((short) 0x8046, "Hardware interrupt lost"),    
+    EVENTID_0x8x50((short) 0x8050, "Configuration/parameter assignment error. Analog input"), 
+    EVENTID_0x8x51((short) 0x8051, "Common mode error"), 
+    EVENTID_0x8x52((short) 0x8052, "Short circuit to phase"),
+    EVENTID_0x8x53((short) 0x8053, "Short circuit to ground"),
+    EVENTID_0x8x54((short) 0x8054, "Wire break"),
+    EVENTID_0x8x55((short) 0x8055, "Reference channel error"),
+    EVENTID_0x8x56((short) 0x8056, "Below measuring range"),
+    EVENTID_0x8x57((short) 0x8057, "Above measuring range"),
+    EVENTID_0x8x60((short) 0x8060, "Configuration/parameter assignment error. Analog output"),
+    EVENTID_0x8x61((short) 0x8061, "Common mode error"),
+    EVENTID_0x8x62((short) 0x8062, "Short circuit to phase"),
+    EVENTID_0x8x63((short) 0x8063, "Short circuit to ground"),
+    EVENTID_0x8x64((short) 0x8064, "Wire break"),
+    EVENTID_0x8x66((short) 0x8066, "No load voltage"),
+    EVENTID_0x8x70((short) 0x8070, "Configuration/parameter assignment error. Digital input"),
+    EVENTID_0x8x71((short) 0x8071, "Chassis ground fault"),
+    EVENTID_0x8x72((short) 0x8072, "Short circuit to phase (sensor)"),
+    EVENTID_0x8x73((short) 0x8073, "Short circuit to ground (sensor)"),
+    EVENTID_0x8x74((short) 0x8074, "Wire break"),
+    EVENTID_0x8x75((short) 0x8075, "No sensor power supply"),
+    EVENTID_0x8x80((short) 0x8080, "Configuration/parameter assignment error. Digital output"),
+    EVENTID_0x8x81((short) 0x8081, "Chassis ground fault"),
+    EVENTID_0x8x82((short) 0x8082, "Short circuit to phase"),
+    EVENTID_0x8x83((short) 0x8083, "Short circuit to ground"),
+    EVENTID_0x8x84((short) 0x8084, "Wire break"),
+    EVENTID_0x8x85((short) 0x8085, "Fuse tripped"),
+    EVENTID_0x8x86((short) 0x8086, "No load voltage"),
+    EVENTID_0x8x87((short) 0x8087, "Excess temperature"),
+    EVENTID_0x8xB0((short) 0x80B0, "Counter module, signal A faulty. FM"),
+    EVENTID_0x8xB1((short) 0x80B1, "Counter module, signal B faulty"),
+    EVENTID_0x8xB2((short) 0x80B2, "Counter module, signal N faulty"),
+    EVENTID_0x8xB3((short) 0x80B3, "Counter module, incorrect value passed between the channels"),
+    EVENTID_0x8xB4((short) 0x80B4, "Counter module, 5.2 V sensor supply faulty"),
+    EVENTID_0x8xB5((short) 0x80B5, "Counter module, 24 V sensor supply faulty"),
+    
+    //Event Class 9 - Standard User Events
+    EVENTID_0x9001((short) 0x9001, "Automatic mode"),
+    EVENTID_0x9101((short) 0x9101, "Manual mode"),
+    EVENTID_0x9x02((short) 0x9002, "OPEN/CLOSED, ON/OFF"),
+    EVENTID_0x9x03((short) 0x9003, "Manual command enable"),
+    EVENTID_0x9x04((short) 0x9004, "Unit protective command (OPEN/CLOSED)"),
+    EVENTID_0x9x05((short) 0x9005, "Process enable"),
+    EVENTID_0x9x06((short) 0x9006, "System protection command"),
+    EVENTID_0x9x07((short) 0x9007, "Process value monitoring responded"),
+    EVENTID_0x9x08((short) 0x9008, "Manipulated variable monitoring responded"),
+    EVENTID_0x9x09((short) 0x9009, "System deviation greater than permitted"),
+    EVENTID_0x9x0A((short) 0x900A, "Limit position error"),
+    EVENTID_0x9x0B((short) 0x900B, "Runtime error"),
+    EVENTID_0x9x0C((short) 0x900C, "Command execution error (sequencer)"),
+    EVENTID_0x9x0D((short) 0x900D, "Operating status running > OPEN"),
+    EVENTID_0x9x0E((short) 0x900E, "Operating status running > CLOSED"),
+    EVENTID_0x9x0F((short) 0x900F, "Command blocking"),
+    EVENTID_0x9x11((short) 0x9011, "Process status OPEN/ON"),
+    EVENTID_0x9x12((short) 0x9012, "Process status CLOSED/OFF"),
+    EVENTID_0x9x13((short) 0x9013, "Process status intermediate position"),
+    EVENTID_0x9x14((short) 0x9014, "Process status ON via AUTO"),
+    EVENTID_0x9x15((short) 0x9015, "Process status ON via manual"),
+    EVENTID_0x9x16((short) 0x9016, "Process status ON via protective command"),
+    EVENTID_0x9x17((short) 0x9017, "Process status OFF via AUTO"),
+    EVENTID_0x9x18((short) 0x9018, "Process status OFF via manual"),
+    EVENTID_0x9x19((short) 0x9019, "Process status OFF via protective command"),
+    EVENTID_0x9x21((short) 0x9021, "Function error on approach"),
+    EVENTID_0x9x22((short) 0x9022, "Function error on leaving"),
+    EVENTID_0x9x31((short) 0x9031, "Actuator (DE/WE) limit position OPEN"),
+    EVENTID_0x9x32((short) 0x9032, "Actuator (DE/WE) limit position not OPEN"),
+    EVENTID_0x9x33((short) 0x9033, "Actuator (DE/WE) limit position CLOSED"),
+    EVENTID_0x9x34((short) 0x9034, "Actuator (DE/WE) limit position not CLOSED"),
+    EVENTID_0x9x41((short) 0x9041, "Illegal status, tolerance time elapsed"),
+    EVENTID_0x9x42((short) 0x9042, "Illegal status, tolerance time not elapsed"),
+    EVENTID_0x9x43((short) 0x9043, "Interlock error, tolerance time = 0"),
+    EVENTID_0x9x44((short) 0x9044, "Interlock error, tolerance time > 0"),
+    EVENTID_0x9x45((short) 0x9045, "No reaction"),
+    EVENTID_0x9x46((short) 0x9046, "Final status exited illegally, tolerance time = 0"),
+    EVENTID_0x9x47((short) 0x9047, "Final status exited illegally, tolerance time > 0"),
+    EVENTID_0x9x50((short) 0x9050, "Upper limit of signal range USR"),
+    EVENTID_0x9x51((short) 0x9051, "Upper limit of measuring range UMR"),
+    EVENTID_0x9x52((short) 0x9052, "Lower limit of signal range LSR"),
+    EVENTID_0x9x53((short) 0x9053, "Lower limit of measuring range LMR"),
+    EVENTID_0x9x54((short) 0x9054, "Upper alarm limit UAL"),
+    EVENTID_0x9x55((short) 0x9055, "Upper warning limit UWL"),
+    EVENTID_0x9x56((short) 0x9056, "Upper tolerance limit UTL"),
+    EVENTID_0x9x57((short) 0x9057, "Lower tolerance limit LTL"),
+    EVENTID_0x9x58((short) 0x9058, "Lower warning limit LWL"),
+    EVENTID_0x9x59((short) 0x9059, "Lower alarm limit LAL"),
+    EVENTID_0x9x60((short) 0x9060, "GRAPH7 step entering/leaving"),
+    EVENTID_0x9x61((short) 0x9061, "GRAPH7 interlock error"),
+    EVENTID_0x9x62((short) 0x9062, "GRAPH7 execution error"),
+    EVENTID_0x9x63((short) 0x9063, "GRAPH7 error noted"),
+    EVENTID_0x9x64((short) 0x9064, "GRAPH7 error acknowledged"),
+    EVENTID_0x9x70((short) 0x9070, "Trend exceeded in positive direction"),
+    EVENTID_0x9x71((short) 0x9071, "Trend exceeded in negative direction"),
+    EVENTID_0x9x72((short) 0x9072, "No reaction"),
+    EVENTID_0x9x73((short) 0x9073, "Final state exited illegally"),
+    EVENTID_0x9x80((short) 0x9080, "Limit value exceeded, tolerance time = 0"),
+    EVENTID_0x9x81((short) 0x9081, "Limit value exceeded, tolerance time > 0"),
+    EVENTID_0x9x82((short) 0x9082, "Below limit value, tolerance time = 0"),
+    EVENTID_0x9x83((short) 0x9083, "Below limit value, tolerance time > 0"),
+    EVENTID_0x9x84((short) 0x9084, "Gradient exceeded, tolerance time = 0"),
+    EVENTID_0x9x85((short) 0x9085, "Gradient exceeded, tolerance time > 0"),
+    EVENTID_0x9x86((short) 0x9086, "Below gradient, tolerance time = 0"),
+    EVENTID_0x9x87((short) 0x9087, "Below gradient, tolerance time > 0"),
+    EVENTID_0x9090((short) 0x9090, "User parameter assignment error entering/leaving"),
+    EVENTID_0x9190((short) 0x9190, "User parameter assignment error entering/leaving"),
+    EVENTID_0x91F0((short) 0x91F0, "Overflow"),
+    EVENTID_0x91F1((short) 0x91F1, "Underflow"),
+    EVENTID_0x91F2((short) 0x91F2, "Division by 0"),
+    EVENTID_0x91F3((short) 0x91F3, "Illegal calculation operation"),
+    
+    //Event Classes A and B - Free User Events
+    
+    
+    //Event Classes C,D & E - Reserved Event Classes
+    
+    //Event Classes F -  Reserved for modules not in central 
+    //                   rack (for example, CPs or FMs)
+    
     EVENTID_0x0000((short) 0x0000, "NULL"),;
 
     
     
     private static final Map<Short, S7DiagnosticEventId> map;
     
+    private static final Map<Short, String> idstr;
+    
     static {
         map = new HashMap<>();
+        idstr = new HashMap<>();
         for (S7DiagnosticEventId  subevent : S7DiagnosticEventId .values()) {
             map.put(subevent.code, subevent);
         }
+       
+        idstr.put((short) 0x0000, "Event leaving state. ");
+        idstr.put((short) 0x0100, "Event entering state. ");
+        idstr.put((short) 0x0200, "Entry in diagnostic buffer. ");
+        idstr.put((short) 0x0400, "Internal error. ");
+        idstr.put((short) 0x0800, "External error. ");
     }    
     
     private final String event;
@@ -470,6 +661,7 @@ public enum S7DiagnosticEventId {
     }
     
     public String getEvent(){
+        short id = (short) (code & 0x0F00);
         return event;
     }    
     
@@ -487,6 +679,13 @@ public static S7DiagnosticEventId  valueOfEvent(String event) {
     }
 
     public static S7DiagnosticEventId  valueOf(short code) {
+        
+        if ((code > 0x8000) & (code < 0xA000)){
+            if ((code != 0x9101) & (code != 0x9190) & (code != 0x91F0)
+                    & (code != 0x91F1) & (code != 0x91F2)
+                    & (code != 0x91F3))
+            code = (short) (code & 0xF0FF);
+        }
         return map.get(code);
     }    
 }
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7SslHelper.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7SslHelper.java
new file mode 100644
index 00000000000..61965a3507a
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7SslHelper.java
@@ -0,0 +1,28 @@
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.utils;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7SslHelper {
+    
+}

From f269e26210ee1ad4d1fffc62a4bce03872148a8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= <cesarjosegl@gmail.com>
Date: Tue, 4 Feb 2020 23:34:14 -0400
Subject: [PATCH 08/17] Asynchronous events are working.

---
 .../java/s7/connection/S7PlcConnection.java   |  60 +-
 .../java/s7/model/S7SubscriptionField.java    |   2 +-
 .../plc4x/java/s7/netty/Plc4XS7Protocol.java  |  42 +-
 .../plc4x/java/s7/netty/S7Protocol.java       |  66 +-
 .../model/payloads/AlarmMessagePayload.java   |   2 +-
 .../payloads/items/MessageObjectItem.java     |  64 ++
 .../CpuServicesParameterSubFunctionGroup.java |   3 +-
 .../model/types/SubscribedEventType.java      |   3 +-
 .../java/s7/protocol/event/S7Alarm8Event.java |  28 -
 .../s7/protocol/event/S7Alarm8pEvent.java     |  28 -
 .../java/s7/protocol/event/S7AlarmDEvent.java |  28 -
 .../s7/protocol/event/S7AlarmDQEvent.java     |  28 -
 .../java/s7/protocol/event/S7AlarmEvent.java  | 638 +++++++++++++++++-
 .../java/s7/protocol/event/S7AlarmSEvent.java | 434 ------------
 .../s7/protocol/event/S7AlarmSQEvent.java     |  28 -
 .../plc4x/java/s7/protocol/event/S7Event.java |  27 +-
 .../java/s7/protocol/event/S7ModeEvent.java   |  35 +-
 .../s7/protocol/event/S7Notify8pEvent.java    |  28 -
 .../java/s7/protocol/event/S7NotifyEvent.java |  14 -
 .../java/s7/protocol/event/S7SysEvent.java    |  45 +-
 20 files changed, 904 insertions(+), 699 deletions(-)
 delete mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Alarm8Event.java
 delete mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Alarm8pEvent.java
 delete mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmDEvent.java
 delete mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmDQEvent.java
 delete mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmSEvent.java
 delete mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmSQEvent.java
 delete mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Notify8pEvent.java
 delete mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7NotifyEvent.java

diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
index a8cec59e299..0a214df8187 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
@@ -75,6 +75,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.s7.netty.model.payloads.CpuCyclicServicesResponsePayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.CpuDiagnosticMessagePayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
+import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterSubFunctionGroup;
 import org.apache.plc4x.java.s7.netty.model.types.MemoryArea;
 import org.apache.plc4x.java.s7.netty.model.types.SubscribedEventType;
 import org.apache.plc4x.java.s7.netty.strategies.DefaultS7MessageProcessor;
@@ -82,6 +83,8 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.s7.netty.util.S7PlcFieldHandler;
 import org.apache.plc4x.java.s7.protocol.S7CyclicServicesSubscriptionHandle;
 import org.apache.plc4x.java.s7.protocol.S7DiagnosticSubscriptionHandle;
+import org.apache.plc4x.java.s7.protocol.event.S7AlarmEvent;
+import org.apache.plc4x.java.s7.protocol.event.S7Event;
 import org.apache.plc4x.java.s7.protocol.event.S7ModeEvent;
 import org.apache.plc4x.java.s7.protocol.event.S7SysEvent;
 import org.apache.plc4x.java.s7.types.S7ControllerType;
@@ -212,9 +215,10 @@ public S7PlcConnection(ChannelFactory channelFactory, int rack, int slot, String
         Map<Short, PlcSubscriptionHandle> almEventHandle = new HashMap();
         
         pushEventHandles.put(SubscribedEventType.USR, usrEventHandle);
-        pushEventHandles.put(SubscribedEventType.SYS, usrEventHandle);
+        pushEventHandles.put(SubscribedEventType.SYS, sysEventHandle);
         pushEventHandles.put(SubscribedEventType.MODE, modeEventHandle);
-        pushEventHandles.put(SubscribedEventType.ALM, almEventHandle);
+        pushEventHandles.put(SubscribedEventType.ALM_S, almEventHandle);
+        pushEventHandles.put(SubscribedEventType.ALM_8, almEventHandle);
         
         alarmsloopthread = new EventLoop(channel,
                                 this.alarmsqueue,
@@ -453,7 +457,6 @@ public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer,
                 s7handle.getConsumers().add(consumer);
                 s7handle.getSubscribedevents().forEach((event)->{
                     pushEventHandles.get(event).put(s7handle.getJobId(), s7handle);
-                    logger.info("Suscripcion: " + s7handle.getSubscribedevents().toString()); 
                 });
                 
             }
@@ -504,18 +507,23 @@ public void run() {
                     if (msg != null){
                         if (msg instanceof AlarmMessagePayload){
                             AlarmMessagePayload themsg = (AlarmMessagePayload) msg;
-                            logger.info("AlarmMessagePayload: " + themsg);
-                            dispathAlmEvents(pushEventHandles.get(SubscribedEventType.ALM), themsg); 
+                            logger.debug("AlarmMessagePayload: " + themsg);
+                            dispathAlmEvents(pushEventHandles.get(SubscribedEventType.ALM_8), themsg); 
                             
                         } else if (msg instanceof CpuDiagnosticPushParameter) {                            
                             CpuDiagnosticPushParameter themsg = (CpuDiagnosticPushParameter) msg;
-                            logger.info("CpuDiagnosticPushParameter: " + themsg);  
+                            logger.debug("CpuDiagnosticPushParameter: " + themsg);  
                             dispathModeEvents(pushEventHandles.get(SubscribedEventType.MODE), themsg);
                             
                         } else if (msg instanceof CpuDiagnosticMessagePayload) {
                             CpuDiagnosticMessagePayload themsg = (CpuDiagnosticMessagePayload) msg;
-                            logger.info("CpuDiagnosticMessagePayload: " + themsg);
-                            dispathSysEvents(pushEventHandles.get(SubscribedEventType.SYS), themsg);  
+                            logger.debug("CpuDiagnosticMessagePayload: " + themsg);
+                            int EventID = Short.toUnsignedInt(themsg.getMsg().getEventID());
+                            if ((EventID >= 0x0A000) & (EventID <= 0x0BFFF)) {
+                                dispathSysEvents(pushEventHandles.get(SubscribedEventType.USR), themsg);  
+                            } else {
+                                dispathSysEvents(pushEventHandles.get(SubscribedEventType.SYS), themsg);                                
+                            }
                             
                         } else if (msg instanceof CpuServicesPushParameter) {
                             CpuServicesPushParameter themsg = (CpuServicesPushParameter) msg;
@@ -549,6 +557,29 @@ public void run() {
             logger.info("Closing the alarm loop.");
         }
         
+        private void dispathAlmEvents(Map<Short, PlcSubscriptionHandle> handles, AlarmMessagePayload payload)
+        {          
+            List<S7Event> alarmsEvent = null;
+            Object object = payload.getMsgtype();
+            if (object != null) {
+                if (object instanceof CpuServicesParameterSubFunctionGroup) {
+                    CpuServicesParameterSubFunctionGroup subFunction = (CpuServicesParameterSubFunctionGroup) object;
+                    alarmsEvent = S7AlarmEvent.getAlarmsEvents(subFunction, payload);
+                }
+            }     
+            
+            for (PlcSubscriptionHandle handle:handles.values()){ 
+                S7DiagnosticSubscriptionHandle s7handle = (S7DiagnosticSubscriptionHandle) handle;
+                for (Consumer consumer:s7handle.getConsumers()){ 
+                    if (alarmsEvent != null) {
+                        for (S7Event event:alarmsEvent) {
+                            consumer.accept(event);
+                        }
+                    }
+                };
+            };              
+        }         
+        
         private void dispathSysEvents(Map<Short, PlcSubscriptionHandle> handles, CpuDiagnosticMessagePayload payload)
         {
             handles.forEach((index,handle)->{
@@ -569,18 +600,7 @@ private void dispathModeEvents(Map<Short, PlcSubscriptionHandle> handles, CpuDia
                     consumer.accept(event);
                 });
             });              
-        }        
-        
-        private void dispathAlmEvents(Map<Short, PlcSubscriptionHandle> handles, AlarmMessagePayload payload)
-        {
-            handles.forEach((index,handle)->{
-                S7DiagnosticSubscriptionHandle thehandle = (S7DiagnosticSubscriptionHandle) handle;
-                thehandle.getConsumers().forEach((consumer)->{
-                    consumer.accept(null);
-                });
-            });              
-        } 
-        
+        }              
         
         private void UpdateCyclicServicesData(S7CyclicServicesSubscriptionHandle handle,CpuCyclicServicesResponsePayload themsg){
             
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7SubscriptionField.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7SubscriptionField.java
index 07c24d57663..8630fca14a4 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7SubscriptionField.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7SubscriptionField.java
@@ -35,7 +35,7 @@ public class S7SubscriptionField implements PlcField {
 
     //Event Subscription 
     private static final Pattern EVENT_SUBSCRIPTION_TYPE_PATTERN = 
-        Pattern.compile("(^MODE)|(^SYS)|(^USR)|(^ALM)");
+        Pattern.compile("(^MODE)|(^SYS)|(^USR)|(^ALM_S)|(^ALM_8)");
     
     //Event ack
     private static final Pattern EVENT_ALARM_ACK_PATTERN = 
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
index a49ee84882e..0ffd6fec45f 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
@@ -250,6 +250,7 @@ private void encodeEventSubcriptionRequest(PlcRequestContainer msg, List<Object>
         byte subsevent = 0;
         List<S7Parameter> parameterItems = new LinkedList<>();
         List<S7Payload> payloadItems = new LinkedList<>();
+        AlarmType alarmType = AlarmType.ALARM_S_INITIATE;
          
         PlcSubscriptionRequest subsRequest = (PlcSubscriptionRequest)  msg.getRequest();
         
@@ -257,6 +258,9 @@ private void encodeEventSubcriptionRequest(PlcRequestContainer msg, List<Object>
             if ( subsRequest.getField(fieldName) instanceof S7SubscriptionField){
                  S7SubscriptionField event = (S7SubscriptionField) subsRequest.getField(fieldName);
                  subsevent = (byte) (subsevent | event.getEventtype().getCode());
+                 if (event.getEventtype() == SubscribedEventType.ALM_8) {
+                    alarmType = AlarmType.ALARM_INITIATE;
+                 }
             }
         }
         
@@ -270,8 +274,11 @@ private void encodeEventSubcriptionRequest(PlcRequestContainer msg, List<Object>
                                 DataTransportSize.OCTET_STRING,
                                 subsevent,
                                 new String("HmiRtm  "),
-                                AlarmType.ALARM_S_INITIATE);
+                                alarmType);
+  
+        
         payloadItems.add(Data);
+      
 
         
         S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.USER_DATA,
@@ -469,6 +476,7 @@ private void encodeEventUnSubcriptionRequest(PlcRequestContainer msg, List<Objec
         byte subsevent = 0;
         List<S7Parameter> parameterItems = new LinkedList<>();
         List<S7Payload> payloadItems = new LinkedList<>();
+        AlarmType alarmType = AlarmType.ALARM_S_INITIATE;
          
         PlcSubscriptionRequest subsRequest = (PlcSubscriptionRequest)  msg.getRequest();
         
@@ -476,6 +484,9 @@ private void encodeEventUnSubcriptionRequest(PlcRequestContainer msg, List<Objec
             if ( subsRequest.getField(fieldName) instanceof S7SubscriptionField){
                  S7SubscriptionField event = (S7SubscriptionField) subsRequest.getField(fieldName);
                  subsevent = (byte) (subsevent | event.getEventtype().getCode());
+                 if (event.getEventtype() == SubscribedEventType.ALM_8) {
+                    alarmType = AlarmType.ALARM_INITIATE;
+                 }                 
             }
         }
         
@@ -489,7 +500,8 @@ private void encodeEventUnSubcriptionRequest(PlcRequestContainer msg, List<Objec
                                 DataTransportSize.OCTET_STRING,
                                 subsevent,
                                 new String("HmiRtm  "),
-                                AlarmType.ALARM_S_INITIATE);
+                                alarmType);
+        
         payloadItems.add(Data);
 
         
@@ -1304,17 +1316,21 @@ private PlcResponse decodeSubscriptionResponse(S7ResponseMessage responseMessage
                         }    
                     break;
                     case ALARM_ACK:{
-                        List<Object> items = payloadItem.getMsg().getMsgItems();
-                        ArrayList<Integer> eventids = event.getAckalarms();
-                        int index = 0;
-                        for (Object item:items){
-                            // A ack response contains only the return code for every item.
-                            // Is direct response for the ALARM_ACK, don't pass to
-                            // push message handler.
-                            //subsBuilder2.addEventField("MyAck", "ACK:16#60000001,16#60000002,16#60000003");
-                            values.put("16#"+Integer.toHexString(eventids.get(index)), new ImmutablePair(decodeResponseCode((DataTransportErrorCode) item),null));                    
-                            index++;
-                        }                       
+                        if (payloadItem.getLength() != 0) {
+                            List<Object> items = payloadItem.getMsg().getMsgItems();                            
+                            ArrayList<Integer> eventids = event.getAckalarms();
+                            int index = 0;
+                            for (Object item:items){
+                                // A ack response contains only the return code for every item.
+                                // Is direct response for the ALARM_ACK, don't pass to
+                                // push message handler.
+                                //subsBuilder2.addEventField("MyAck", "ACK:16#60000001,16#60000002,16#60000003");
+                                values.put("16#"+Integer.toHexString(eventids.get(index)), new ImmutablePair(decodeResponseCode((DataTransportErrorCode) item),null));                    
+                                index++;
+                            }    
+                        } else {
+                            values.put("ERROR", new ImmutablePair(PlcResponseCode.NOT_FOUND,null));                                                
+                        }
                     }
                     break;
                     case ALARM_QUERY:{
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
index 064858ffa78..5ecfdc0d81f 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
@@ -917,14 +917,20 @@ private S7Payload decodeCpuServicesPayload(CpuServicesParameter parameter, ByteB
                     return payload;
                 }
                 case ALARM8:;
+                    logger.info("decode ALARM8.....");
+                    
                     break;
                 case NOTIFY:;
+                    logger.info("decode NOTIFY.....");
                     break;
                 case ALARM8_LOCK:;
+                    logger.info("decode ALARM8_LOCK.....");
                     break;
                 case ALARM8_UNLOCK:;
+                    logger.info("decode ALARM8_UNLOCK.....");
                     break;
                 case SCAN:;
+                    logger.info("decode SCAN.....");
                     break;
                 case ALARM_ACK:{  
                     AlarmMessagePayload payload = decodeMessageServiceAckPayload(parameter, userData);                
@@ -935,8 +941,10 @@ private S7Payload decodeCpuServicesPayload(CpuServicesParameter parameter, ByteB
                     return payload;
                 }
                 case ALARM8_LOCK_IND:;
+                    logger.info("decode ALARM8_LOCK_IND.....");
                     break;
                 case ALARM8_UNLOCK_IND:;
+                    logger.info("decode ALARM8_UNLOCK_IND.....");
                     break;
                 case ALARM_SQ_IND:{  
                     AlarmMessagePayload payload = decodeMessageServicePushPayload(parameter, userData);                
@@ -950,8 +958,10 @@ private S7Payload decodeCpuServicesPayload(CpuServicesParameter parameter, ByteB
                     AlarmMessagePayload payload = decodeMessageServiceQueryPayload(parameter, userData);
                     return payload;
                 }
-                case NOTIFY8:;
-                    break;
+                case NOTIFY8: {
+                    AlarmMessagePayload payload = decodeMessageServicePushPayload(parameter, userData);
+                    return payload;
+                }
                 default:;
                     break;
             } 
@@ -1259,7 +1269,6 @@ private CpuDiagnosticMessagePayload decodeCpuDiagnosticMessagePayload(CpuService
     }    
     
     private AlarmMessagePayload decodeMessageServicePushPayload(CpuServicesParameter parameter, ByteBuf userData){
-
         List<Object> MessageObjects = new LinkedList<>();
         List<ByteBuf> values = new LinkedList<>();
         int length;
@@ -1267,13 +1276,18 @@ private AlarmMessagePayload decodeMessageServicePushPayload(CpuServicesParameter
         LocalDateTime timestamp;
         Byte FunctionID;
         byte NumberOfMessgaeObjects;
+        byte EventGoing = 0x00;
+        byte EventComming = 0x00;
+        byte EventLastChange = 0x00;
+        
+        
         //
         DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
         DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
         length = userData.readShort();
         
         //It is assumed that you have synchronized the time of your PLC with PC.
-        //
+        //The most important field.
         timestamp = readDateAndTime(userData);
         
         FunctionID = userData.readByte();
@@ -1297,6 +1311,17 @@ private AlarmMessagePayload decodeMessageServicePushPayload(CpuServicesParameter
                 byte AckStateGoing = userData.readByte();
                 byte AckStateComming = userData.readByte();
                 
+                switch(parameter.getSubFunctionGroup()){
+                    case ALARM8:
+                    case NOTIFY8:
+                    case NOTIFY:
+                        EventGoing  = userData.readByte(); 
+                        EventComming  = userData.readByte(); 
+                        EventLastChange  = userData.readByte(); 
+                        userData.readByte(); //Reserved = 0x00
+                        break;                    
+                }                
+                
                 //TODO: If NumberOfValues == 0 then AssociatedValues is null
                 List<AssociatedValueItem> AssociatedValues = new LinkedList<>();
                         
@@ -1326,6 +1351,9 @@ private AlarmMessagePayload decodeMessageServicePushPayload(CpuServicesParameter
                                             State,
                                             AckStateGoing,
                                             AckStateComming,
+                                            EventGoing,
+                                            EventComming, 
+                                            EventLastChange,                        
                                             AssociatedValues));
                 
             }            
@@ -1504,23 +1532,31 @@ private AlarmMessagePayload decodeMessageServiceAckPayload(CpuServicesParameter
         DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
         int length = userData.readShort(); //Number of message objects?
         
-        //Alarm message section
-        byte FunctionID = userData.readByte();
-        byte NumberOfMessageObjects = userData.readByte();
+        if (returnCode == DataTransportErrorCode.OK) {
         
-        //In the next leve if is != null -> Success
-        for(int i=0; i< NumberOfMessageObjects; i++) {
-            MessageObjects.add(DataTransportErrorCode.valueOf(userData.readByte()));
-        };
+            //Alarm message section
+            byte FunctionID = userData.readByte();
+            byte NumberOfMessageObjects = userData.readByte();
+
+            //In the next leve if is != null -> Success
+            for(int i=0; i< NumberOfMessageObjects; i++) {
+                MessageObjects.add(DataTransportErrorCode.valueOf(userData.readByte()));
+            };
+
+            return new AlarmMessagePayload(returnCode,
+                        dataTransportSize,
+                        CpuServicesParameterSubFunctionGroup.ALARM_QUERY,
+                        length,
+                        new AlarmMessageItem(FunctionID,
+                                NumberOfMessageObjects,
+                                MessageObjects)); 
+        }
         
         return new AlarmMessagePayload(returnCode,
                     dataTransportSize,
                     CpuServicesParameterSubFunctionGroup.ALARM_QUERY,
                     length,
-                    new AlarmMessageItem(FunctionID,
-                            NumberOfMessageObjects,
-                            MessageObjects));        
-        
+                    null);                 
     }    
     
     
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/AlarmMessagePayload.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/AlarmMessagePayload.java
index 5416aa8b877..ffe817b4e2b 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/AlarmMessagePayload.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/AlarmMessagePayload.java
@@ -30,7 +30,7 @@ Licensed to the Apache Software Foundation (ASF) under one
  * @author cgarcia
  */
 public class AlarmMessagePayload implements S7Payload, S7PushMessage {
-    
+        
     private final DataTransportErrorCode returnCode;
     private final DataTransportSize dataTransportSize;
     private final Object msgtype; 
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/MessageObjectItem.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/MessageObjectItem.java
index 752e5ddacea..a8effbc48f3 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/MessageObjectItem.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/MessageObjectItem.java
@@ -40,6 +40,9 @@ public class MessageObjectItem {
     private final byte State;
     private final byte AckStateGoing;
     private final byte AckStateComming;
+    private final byte EventGoing;
+    private final byte EventComming;
+    private final byte EventLastChange;
     private final LocalDateTime TimestampComing;
     private final LocalDateTime TimestampGoing;
     private final List<AssociatedValueItem> ComingValues;
@@ -64,6 +67,9 @@ public MessageObjectItem(byte VariableSpecification,
         this.State = 0x00;
         this.AckStateGoing = 0x00;
         this.AckStateComming = 0x00;
+        this.EventGoing = 0x00;
+        this.EventComming = 0x00;
+        this.EventLastChange = 0x00;
         this.TimestampComing = null;
         this.ComingValues = null;
         this.TimestampGoing = null;               
@@ -93,6 +99,9 @@ public MessageObjectItem(byte Length,
         this.State = 0x00;
         this.AckStateGoing = AckStateGoing;
         this.AckStateComming = AckStateComming;
+        this.EventGoing = 0x00;
+        this.EventComming = 0x00;
+        this.EventLastChange = 0x00;        
         this.TimestampComing = TimestampComing;
         this.ComingValues = ComingValues;
         this.TimestampGoing = TimestampGoing;               
@@ -118,6 +127,9 @@ public MessageObjectItem(byte VariableSpecification,
         this.State = 0x00;
         this.AckStateGoing = AckStateGoing;
         this.AckStateComming = AckStateComming;
+        this.EventGoing = 0x00;
+        this.EventComming = 0x00;
+        this.EventLastChange = 0x00;        
         this.TimestampComing = null;
         this.ComingValues = null;
         this.TimestampGoing = null;               
@@ -146,6 +158,9 @@ public MessageObjectItem(byte VariableSpecification,
         this.State = State;
         this.AckStateGoing = AckStateGoing;
         this.AckStateComming = AckStateComming;
+        this.EventGoing = 0x00;
+        this.EventComming = 0x00;
+        this.EventLastChange = 0x00;        
         this.TimestampComing = null;
         this.ComingValues = Values;
         this.TimestampGoing = null;               
@@ -177,6 +192,9 @@ public MessageObjectItem(byte VariableSpecification,
         this.State = State;
         this.AckStateGoing = AckStateGoing;
         this.AckStateComming = AckStateComming;
+        this.EventGoing = 0x00;
+        this.EventComming = 0x00;
+        this.EventLastChange = 0x00;        
         this.TimestampComing = TimestampComing;
         this.ComingValues = ComingValues;
         this.TimestampGoing = TimestampGoing;               
@@ -185,6 +203,40 @@ public MessageObjectItem(byte VariableSpecification,
         this.alarmtype = null;        
     }    
     
+    public MessageObjectItem(byte VariableSpecification, 
+            byte Length, 
+            VariableAddressingMode SyntaxID, 
+            byte NumberOfValues, 
+            int EventID, 
+            byte EventState, 
+            byte State, 
+            byte AckStateGoing, 
+            byte AckStateComming,
+            byte EventGoing,
+            byte EventComming,
+            byte EventLastChange,
+            List<AssociatedValueItem> ComingValues) {
+        
+        this.VariableSpecification = VariableSpecification;
+        this.Length = Length;
+        this.SyntaxID = SyntaxID;
+        this.NumberOfValues = NumberOfValues;
+        this.EventID = EventID;
+        this.EventState = EventState;
+        this.State = State;
+        this.AckStateGoing = AckStateGoing;
+        this.AckStateComming = AckStateComming;
+        this.EventGoing = 0x00;
+        this.EventComming = 0x00;
+        this.EventLastChange = 0x00;        
+        this.TimestampComing = null;
+        this.ComingValues = ComingValues;
+        this.TimestampGoing = null;               
+        this.GoingValues = null;
+        this.querytype = null;
+        this.alarmtype = null;        
+    }     
+    
     public byte getVariableSpecification() {
         return VariableSpecification;
     }
@@ -225,6 +277,18 @@ public LocalDateTime getTimestampComing() {
         return TimestampComing;
     }
 
+    public byte getEventGoing() {
+        return EventGoing;
+    }
+
+    public byte getEventComming() {
+        return EventComming;
+    }
+
+    public byte getEventLastChange() {
+        return EventLastChange;
+    }
+    
     public LocalDateTime getTimestampGoing() {
         return TimestampGoing;
     }
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterSubFunctionGroup.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterSubFunctionGroup.java
index 5b679a5fe0f..10ebcfd48c2 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterSubFunctionGroup.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterSubFunctionGroup.java
@@ -41,7 +41,8 @@ public enum CpuServicesParameterSubFunctionGroup {
     ALARM_SQ_IND((byte) 0x11),  
     ALARM_S_IND((byte) 0x12),    
     ALARM_QUERY((byte) 0x13),    
-    NOTIFY8((byte) 0x16); //TODO
+    NOTIFY8((byte) 0x16),
+    NONE((byte) 0x00); //TODO
 
     private static final Logger logger = LoggerFactory.getLogger(CpuServicesParameterSubFunctionGroup.class);
 
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SubscribedEventType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SubscribedEventType.java
index d963343b844..3c64845a23c 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SubscribedEventType.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SubscribedEventType.java
@@ -32,7 +32,8 @@ public enum SubscribedEventType implements PlcField {
     MODE("MODE", (byte) 0x01),
     SYS("SYS", (byte) 0x02),
     USR("USR", (byte) 0x04),
-    ALM("ALM", (byte) 0x80);
+    ALM_S("ALM_S", (byte) 0x80),
+    ALM_8("ALM_8", (byte) 0x80);
     
     private static final Map<Byte, SubscribedEventType> map;
     
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Alarm8Event.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Alarm8Event.java
deleted file mode 100644
index d6664a37e94..00000000000
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Alarm8Event.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.protocol.event;
-
-/**
- *
- * @author cgarcia
- */
-public class S7Alarm8Event {
-    
-}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Alarm8pEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Alarm8pEvent.java
deleted file mode 100644
index e4aaec2aad8..00000000000
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Alarm8pEvent.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.protocol.event;
-
-/**
- *
- * @author cgarcia
- */
-public class S7Alarm8pEvent {
-    
-}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmDEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmDEvent.java
deleted file mode 100644
index f8e57d26b7a..00000000000
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmDEvent.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.protocol.event;
-
-/**
- *
- * @author cgarcia
- */
-public class S7AlarmDEvent {
-    
-}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmDQEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmDQEvent.java
deleted file mode 100644
index a8dc38654e8..00000000000
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmDQEvent.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.protocol.event;
-
-/**
- *
- * @author cgarcia
- */
-public class S7AlarmDQEvent {
-    
-}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmEvent.java
index a98d7465aa2..93affa6aa31 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmEvent.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmEvent.java
@@ -1,14 +1,642 @@
 /*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
 package org.apache.plc4x.java.s7.protocol.event;
 
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneOffset;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.s7.netty.model.payloads.AlarmMessagePayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.AlarmMessageItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.MessageObjectItem;
+import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterSubFunctionGroup;
+
 /**
  *
  * @author cgarcia
  */
-public class S7AlarmEvent {
+public class S7AlarmEvent implements S7Event {
+    
+    public enum Fields{
+        MAP,
+        
+        TYPE,
+        TIMESTAMP,
+        TIMESTAMP_GOING,
+        TIMESTAMP_COMING,        
+        
+        EVENT_ID,
+        EVENT_STATE,
+        STATE,
+        ACKSTATE_GOING,
+        ACKSTATE_COMING,
+        EVENT_GOING,
+        EVENT_COMING,
+        EVENT_LAST_CHANGE,
+    
+        SIG,
+        SIG_1,
+        SIG_2,
+        SIG_3,
+        SIG_4,    
+        SIG_5,
+        SIG_6,
+        SIG_7,
+        SIG_8,
+
+        SIG_STATE,
+        SIG_1_STATE,
+        SIG_2_STATE,
+        SIG_3_STATE,
+        SIG_4_STATE,    
+        SIG_5_STATE,
+        SIG_6_STATE,
+        SIG_7_STATE,
+        SIG_8_STATE,    
+
+        SIG_DATA,
+        SIG_1_DATA,
+        SIG_2_DATA,
+        SIG_3_DATA,
+        SIG_4_DATA,    
+        SIG_5_DATA,
+        SIG_6_DATA,
+        SIG_7_DATA,
+        SIG_8_DATA,
+        SIG_1_DATA_GOING,
+        SIG_2_DATA_GOING,
+        SIG_3_DATA_GOING,
+        SIG_4_DATA_GOING,    
+        SIG_5_DATA_GOING,
+        SIG_6_DATA_GOING,
+        SIG_7_DATA_GOING,
+        SIG_8_DATA_GOING,
+        SIG_1_DATA_COMING,
+        SIG_2_DATA_COMING,
+        SIG_3_DATA_COMING,
+        SIG_4_DATA_COMING,    
+        SIG_5_DATA_COMING,
+        SIG_6_DATA_COMING,
+        SIG_7_DATA_COMING,
+        SIG_8_DATA_COMING,
+        
+    }
+
+    //private final Instant timeStamp;
+    private final Map<String, Object> map; 
+
+    public S7AlarmEvent(Map<String, Object> map) {
+        this.map = map;                      
+    }
+    
+    public static List<S7Event> getAlarmsEvents(CpuServicesParameterSubFunctionGroup subFunction, 
+                                        AlarmMessagePayload payload){
+        List<S7Event> alarmEvents = new ArrayList();
+        Map<String, Object> map = new HashMap(); 
+        Instant timeStamp;
+        int index = 0;
+        AssociatedValueItem itemValue;
+        byte[] datos;
+
+        AlarmMessageItem msgItem = payload.getMsg();
+        List<Object> objects = msgItem.getMsgItems();
+        for (Object object:objects){
+            MessageObjectItem item = (MessageObjectItem) object;
+            alarmEvents.add(createAlarmEvent(subFunction, msgItem, item));
+        }
+
+        return alarmEvents;
+    }
+
+    private static S7AlarmEvent createAlarmEvent(CpuServicesParameterSubFunctionGroup subFunction,
+                                    AlarmMessageItem msgItem,
+                                    MessageObjectItem message){
+        Map<String, Object> map = new HashMap();
+        AssociatedValueItem itemValue;
+        byte[] datos;
+        
+        switch(subFunction){
+            case ALARM_QUERY:{
+                switch(message.getAlarmtype()){
+                    case ALARM_S:
+                        map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.ALARM_S.getCode()); 
+                        map.put(Fields.EVENT_ID.name(), message.getEventID());
+                        map.put(Fields.EVENT_STATE.name(), message.getEventState());
+                        map.put(Fields.ACKSTATE_GOING.name(), message.getAckStateGoing());
+                        map.put(Fields.ACKSTATE_COMING.name(), message.getAckStateComming()); 
+                        
+                        map.put(Fields.TIMESTAMP_GOING.name(), message.getTimestampGoing().toInstant(ZoneOffset.UTC));
+                        
+                        AssociatedValueItem itemg = message.getComingValues().get(0);
+                        datos = new byte[itemg.getLength()];
+                        if (itemg.getLength() != 0) {
+                            itemg.getData().getBytes(0, datos);
+                        };
+                        map.put(Fields.SIG_1_DATA_GOING.name(), datos);                        
+                        
+                        map.put(Fields.TIMESTAMP_COMING.name(), message.getTimestampComing().toInstant(ZoneOffset.UTC));
+                        
+                        AssociatedValueItem itemc = message.getComingValues().get(0);
+                        datos = new byte[itemc.getLength()];                        
+                        if (itemc.getLength() != 0) {
+                            itemc.getData().getBytes(0, datos);                        
+                        }
+                        map.put(Fields.SIG_1_DATA_COMING.name(), datos);                        
+                        break;
+                        
+                    case ALARM_8:
+                        
+                        map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.ALARM8);
+                        break;
+                    case SCAN:
+                        map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.SCAN);
+                        break;
+                    case NONE:
+                        map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.NONE);
+                        break;
+                    default:;
+                }                
+            }
+            break;
+            case ALARM_ACK_IND:;
+            break;
+            case ALARM_SQ_IND:             
+            case ALARM_S_IND:{
+                map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.ALARM_S_IND.getCode()); 
+                map.put(Fields.TIMESTAMP.name(), msgItem.getTimestamp().toInstant(ZoneOffset.UTC));
+                map.put(Fields.EVENT_ID.name(), message.getEventID());
+                map.put(Fields.EVENT_STATE.name(), message.getEventState());
+                map.put(Fields.STATE.name(), message.getState());
+                map.put(Fields.ACKSTATE_GOING.name(), message.getAckStateGoing());
+                map.put(Fields.ACKSTATE_COMING.name(), message.getAckStateComming()); 
+                AssociatedValueItem itemc = message.getComingValues().get(0);
+                datos = new byte[itemc.getLength()];
+                if (itemc.getLength() != 0) {
+                    itemc.getData().getBytes(0, datos);                        
+                }
+                map.put(Fields.SIG_1_DATA.name(), datos);                 
+            };
+            break;
+            case NOTIFY8:{
+                map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.NOTIFY8.getCode());
+                map.put(Fields.TIMESTAMP.name(), msgItem.getTimestamp().toInstant(ZoneOffset.UTC));
+                map.put(Fields.EVENT_ID.name(), message.getEventID());
+                map.put(Fields.EVENT_STATE.name(), message.getEventState());
+                map.put(Fields.STATE.name(), message.getState());
+                map.put(Fields.ACKSTATE_GOING.name(), message.getAckStateGoing());
+                map.put(Fields.ACKSTATE_COMING.name(), message.getAckStateComming());
+                map.put(Fields.EVENT_GOING.name(), message.getEventGoing());
+                map.put(Fields.EVENT_COMING.name(), message.getEventComming());                
+                map.put(Fields.EVENT_LAST_CHANGE.name(), message.getEventLastChange());  
+                for(int i = 0; i < message.getNumberOfValues(); i++){                
+                    itemValue = message.getComingValues().get(i);
+                    datos = new byte[itemValue.getLength()];
+                    map.put("SIG_"+ (i+1) +"_STATE", itemValue.getReturnCode().getCode());
+                    itemValue.getData().getBytes(0, datos);
+                    map.put("SIG_"+ (i+1) +"_DATA", datos);
+                }                  
+            }
+            break;
+        }
+                
+        return new S7AlarmEvent(map);
+    }
+    
+    
+    
+    @Override
+    public Instant getTimestamp() {
+        return (Instant) map.get(Fields.TIMESTAMP.name());
+    }
+
+    @Override
+    public PlcReadRequest getRequest() {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+        
+    @Override
+    public int getNumberOfValues(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Object getObject(String name) {
+        switch(Fields.valueOf(name)){
+            case MAP: return map;
+            default:;
+        }
+        return null;
+    }
+
+    @Override
+    public Object getObject(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<Object> getAllObjects(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidBoolean(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidBoolean(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Boolean getBoolean(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Boolean getBoolean(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<Boolean> getAllBooleans(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidByte(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidByte(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Byte getByte(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Byte getByte(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<Byte> getAllBytes(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidShort(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidShort(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Short getShort(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Short getShort(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<Short> getAllShorts(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Integer getInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Integer getInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<Integer> getAllIntegers(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<BigInteger> getAllBigIntegers(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidLong(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidLong(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Long getLong(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Long getLong(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<Long> getAllLongs(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidFloat(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidFloat(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Float getFloat(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Float getFloat(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<Float> getAllFloats(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidDouble(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidDouble(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Double getDouble(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Double getDouble(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<Double> getAllDoubles(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<BigDecimal> getAllBigDecimals(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidString(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidString(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public String getString(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public String getString(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<String> getAllStrings(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public LocalTime getTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public LocalTime getTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<LocalTime> getAllTimes(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidDate(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidDate(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public LocalDate getDate(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public LocalDate getDate(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<LocalDate> getAllDates(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidDateTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidDateTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<LocalDateTime> getAllDateTimes(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidByteArray(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidByteArray(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Byte[] getByteArray(String name) {
+        return (Byte[]) map.get(name);
+    }
+
+    @Override
+    public Byte[] getByteArray(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<Byte[]> getAllByteArrays(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<String> getFieldNames() {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public PlcField getField(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public PlcResponseCode getResponseCode(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Map<String, Object> getMap() {
+        return map;
+    }
+    
+        
     
 }
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmSEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmSEvent.java
deleted file mode 100644
index 0c2542ac1f2..00000000000
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmSEvent.java
+++ /dev/null
@@ -1,434 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.protocol.event;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.Collection;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-
-/**
- *
- * @author cgarcia
- */
-public class S7AlarmSEvent implements S7Event {
-
-    @Override
-    public Instant getTimestamp() {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public PlcReadRequest getRequest() {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public int getNumberOfValues(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Object getObject(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Object getObject(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<Object> getAllObjects(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidBoolean(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidBoolean(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Boolean getBoolean(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Boolean getBoolean(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<Boolean> getAllBooleans(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidByte(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidByte(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Byte getByte(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Byte getByte(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<Byte> getAllBytes(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidShort(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidShort(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Short getShort(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Short getShort(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<Short> getAllShorts(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Integer getInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Integer getInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<Integer> getAllIntegers(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidBigInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidBigInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public BigInteger getBigInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public BigInteger getBigInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<BigInteger> getAllBigIntegers(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidLong(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidLong(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Long getLong(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Long getLong(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<Long> getAllLongs(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidFloat(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidFloat(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Float getFloat(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Float getFloat(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<Float> getAllFloats(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidDouble(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidDouble(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Double getDouble(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Double getDouble(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<Double> getAllDoubles(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidBigDecimal(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidBigDecimal(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public BigDecimal getBigDecimal(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public BigDecimal getBigDecimal(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<BigDecimal> getAllBigDecimals(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidString(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidString(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public String getString(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public String getString(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<String> getAllStrings(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public LocalTime getTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public LocalTime getTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<LocalTime> getAllTimes(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidDate(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidDate(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public LocalDate getDate(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public LocalDate getDate(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<LocalDate> getAllDates(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidDateTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidDateTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public LocalDateTime getDateTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public LocalDateTime getDateTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<LocalDateTime> getAllDateTimes(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidByteArray(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidByteArray(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Byte[] getByteArray(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Byte[] getByteArray(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<Byte[]> getAllByteArrays(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<String> getFieldNames() {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public PlcField getField(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public PlcResponseCode getResponseCode(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-    
-}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmSQEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmSQEvent.java
deleted file mode 100644
index f87189d3f00..00000000000
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmSQEvent.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.protocol.event;
-
-/**
- *
- * @author cgarcia
- */
-public class S7AlarmSQEvent {
-    
-}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Event.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Event.java
index 7a509ef22b0..04c9fe619a8 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Event.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Event.java
@@ -19,12 +19,37 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 package org.apache.plc4x.java.s7.protocol.event;
 
+import java.util.Map;
 import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
 
 /**
- *
+ * Like JMS but different.
+ * Maintain the same pattern as JMS MapMessage. 
+ * S7Event is a Map whose key is a String and its value is an 
+ * Object of primitive values.
+ * Classes derived from the S7Event must respect the following 
+ * conversion table.
+ * 
+ *  |        | boolean byte short char int long float double String byte[]
+ *  |--------+-------------------------------------------------------------
+ *  |boolean |    X                                            X
+ *  |byte    |          X     X         X   X                  X
+ *  |short   |                X         X   X                  X
+ *  |char    |                     X                           X
+ *  |int     |                          X   X                  X
+ *  |long    |                              X                  X
+ *  |float   |                                    X     X      X
+ *  |double  |                                          X      X
+ *  |String  |    X     X     X         X   X     X     X      X
+ *  |byte[]  |                                                        X
+ *  |--------+-------------------------------------------------------------
+ * 
  * @author cgarcia
  */
 public interface S7Event extends PlcSubscriptionEvent{
     
+        
+    public Map<String, Object> getMap();
+    
+    
 }
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7ModeEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7ModeEvent.java
index 869faf4f826..2493925e08a 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7ModeEvent.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7ModeEvent.java
@@ -43,19 +43,22 @@ Licensed to the Apache Software Foundation (ASF) under one
  */
 public class S7ModeEvent implements S7Event {
     
-    public static final String METHOD = "METHOD";
-    public static final String TYPE = "TYPE";
-    public static final String FUNCTION = "FUNCTION";
-    public static final String CURRENT_MODE = "CURRENT_MODE";
-    
+    public enum Fields{
+        MAP,
+        METHOD,
+        TYPE,
+        FUNCTION,
+        CURRENT_MODE
+    }
+   
     private final Instant timeStamp;
     private Map<String, Object> map = new HashMap();
 
     public S7ModeEvent(Instant timeStamp, CpuDiagnosticPushParameter parameter) {
-      map.put(METHOD, parameter.getMethod());
-      map.put(TYPE, parameter.getParameterType());
-      map.put(FUNCTION, parameter.getParameterFunction());
-      map.put(CURRENT_MODE, parameter.getCurrentMode());
+      map.put(Fields.METHOD.name(), parameter.getMethod());
+      map.put(Fields.TYPE.name(), parameter.getParameterType());
+      map.put(Fields.FUNCTION.name(), parameter.getParameterFunction());
+      map.put(Fields.CURRENT_MODE.name(), parameter.getCurrentMode());
       this.timeStamp = timeStamp;
     }
 
@@ -76,8 +79,11 @@ public int getNumberOfValues(String name) {
 
     @Override
     public Object getObject(String name) {
-        Object object = map.get(name);
-        return object;
+        switch(Fields.valueOf(name)){
+            case MAP: return map;
+            default:;
+        }
+        return null;
     }
 
     @Override
@@ -483,5 +489,12 @@ public PlcResponseCode getResponseCode(String name) {
     public String toString() {
         return "S7ModeEvent{" + "timeStamp=" + timeStamp + ", map=" + map + '}';
     }
+
+    @Override
+    public Map<String, Object> getMap() {
+        return map;
+    }
+ 
+    
     
 }
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Notify8pEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Notify8pEvent.java
deleted file mode 100644
index 9afcf2fa86e..00000000000
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Notify8pEvent.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.protocol.event;
-
-/**
- *
- * @author cgarcia
- */
-public class S7Notify8pEvent {
-    
-}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7NotifyEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7NotifyEvent.java
deleted file mode 100644
index 56e27c15e73..00000000000
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7NotifyEvent.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.apache.plc4x.java.s7.protocol.event;
-
-/**
- *
- * @author cgarcia
- */
-public class S7NotifyEvent {
-    
-}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7SysEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7SysEvent.java
index c24a18aa223..30890622f28 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7SysEvent.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7SysEvent.java
@@ -40,24 +40,28 @@ Licensed to the Apache Software Foundation (ASF) under one
  */
 public class S7SysEvent implements S7Event{
  
-    public static final String EVENT_ID = "EVENT_ID";
-    public static final String PRIORITY_CLASS = "PRIORITY_CLASS";
-    public static final String OB_NUMBER = "OB_NUMBER";
-    public static final String DAT_ID = "DAT_ID";
-    public static final String INFO1 = "INFO1";
-    public static final String INFO2 = "INFO2";
+    public enum Fields{
+        TIMESTAMP,
+        EVENT_ID,
+        PRIORITY_CLASS,
+        OB_NUMBER,
+        DAT_ID,
+        INFO1,
+        INFO2       
+    }
     
     private final Instant timeStamp;
     private Map<String, Object> map = new HashMap();
 
     public S7SysEvent(CpuDiagnosticMessageItem item) {
-        map.put(EVENT_ID, item.getEventID());
-        map.put(PRIORITY_CLASS, item.getPriorityClass());
-        map.put(OB_NUMBER, item.getObNumber());
-        map.put(DAT_ID, item.getDatID());
-        map.put(INFO1, item.getInfo1());
-        map.put(INFO2, item.getInfo2());
+        map.put(Fields.EVENT_ID.name(), item.getEventID());
+        map.put(Fields.PRIORITY_CLASS.name(), item.getPriorityClass());
+        map.put(Fields.OB_NUMBER.name(), item.getObNumber());
+        map.put(Fields.DAT_ID.name(), item.getDatID());
+        map.put(Fields.INFO1.name(), item.getInfo1());
+        map.put(Fields.INFO2.name(), item.getInfo2());
         this.timeStamp = item.getTimeStamp().toInstant(ZoneOffset.UTC);
+        map.put(Fields.TIMESTAMP.name(),this.timeStamp);
     }
 
     @Override
@@ -77,7 +81,11 @@ public int getNumberOfValues(String name) {
 
     @Override
     public Object getObject(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
+        switch(S7AlarmEvent.Fields.valueOf(name)){
+            case MAP: return map;
+            default:;
+        }
+        return null;
     }
 
     @Override
@@ -339,7 +347,11 @@ public boolean isValidString(String name, int index) {
 
     @Override
     public String getString(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
+        Object object = map.get(name);
+        if (object instanceof Integer){
+            return object.toString();
+        }
+        return null;         
     }
 
     @Override
@@ -471,6 +483,11 @@ public PlcResponseCode getResponseCode(String name) {
     public String toString() {
         return "S7SysEvent{" + "timeStamp=" + timeStamp + ", map=" + map + '}';
     }
+
+    @Override
+    public Map<String, Object> getMap() {
+        return map;
+    }
     
     
     

From 30aa0e23392f9ea95361d16949b7bf3771627bc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= <cesarjosegl@gmail.com>
Date: Wed, 26 Feb 2020 07:53:40 -0400
Subject: [PATCH 09/17] Fix some write problems.

---
 .../plc4x/java/s7/model/S7SslField.java       |    1 -
 .../plc4x/java/s7/netty/Plc4XS7Protocol.java  |   45 +-
 .../plc4x/java/s7/netty/S7Protocol.java       |  217 +++-
 .../model/payloads/items/VarPayloadItem.java  |   10 +
 .../model/types/DataTransportErrorCode.java   |    6 +-
 .../s7/netty/model/types/TransportSize.java   |   33 +-
 .../java/s7/netty/util/S7SizeHelper.java      |    5 +-
 .../java/s7/protocol/S7ByteReadResponse.java  |    4 +-
 .../java/s7/utils/S7DiagnosticEventId.java    |   46 +-
 .../plc4x/java/s7/utils/S7SslHelper.java      | 1118 ++++++++++++++++-
 10 files changed, 1363 insertions(+), 122 deletions(-)

diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7SslField.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7SslField.java
index 75d58ec295d..cfed69a72b8 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7SslField.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7SslField.java
@@ -54,7 +54,6 @@ public int getIndex() {
     }
           
     public static boolean matches(String fieldString) {
-        System.out.println("fieldString: " + fieldString);
         return SSL_ADDRESS_PATTERN.matcher(fieldString).matches();      
     }   
     
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
index 0ffd6fec45f..1140cc941ed 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
@@ -846,11 +846,39 @@ protected void decode(ChannelHandlerContext ctx, S7Message msg, List<Object> out
             PlcResponse response = null;
             if (request instanceof PlcReadRequest) {
                 response = decodeReadResponse(responseMessage, requestContainer);
+                //If responseMessage is SSL type and response is null
+                //At moments Alarms and SSL request must be fragmented
+                if (response == null){ //Fragmented message? Query again!
+                    if (responseMessage.getPayloads().get(0) instanceof CpuServicesPayload){
+                        requests.put(tpduReference, requestContainer);
+                        S7RequestMessage sslRequestMessage = new S7RequestMessage(MessageType.USER_DATA,
+                                msg.getTpduReference(),
+                            Collections.singletonList(new  CpuServicesResponseParameter(
+                                CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
+                                CpuServicesParameterSubFunctionGroup.READ_SSL, 
+                                ((CpuServicesParameter) msg.getParameters().get(0)).getSequenceNumber())),
+                            Collections.singletonList(new CpuServicesPayload(DataTransportErrorCode.NOT_FOUND, 
+                                    SslId.NULL,
+                                (short) 0x0000)), null); 
+                        try {
+                            ChannelFuture future = ctx.writeAndFlush(sslRequestMessage);
+                            future.addListener(new ChannelFutureListener() {
+                                public void operationComplete(ChannelFuture future) {
+                                    logger.info("Request fragment READ_SSL done: " + future.isSuccess());
+                                }
+                            });                        
+                        } catch (Exception ex) {
+                            java.util.logging.Logger.getLogger(Plc4XS7Protocol.class.getName()).log(Level.SEVERE, null, ex);
+                        }
+                    }
+                }
+                
             } else if (request instanceof PlcWriteRequest) {
                 response = decodeWriteResponse(responseMessage, requestContainer);
             } else if (request instanceof PlcSubscriptionRequest) {
                 response = decodeSubscriptionResponse(responseMessage, requestContainer);
                 
+                //At moments Alarms and SSL request must be fragmented
                 if (response == null){ //Fragmented message? Query again!
                     requests.put(tpduReference, requestContainer);
                     List<S7Parameter> parameterItems = new LinkedList<>();
@@ -861,13 +889,13 @@ protected void decode(ChannelHandlerContext ctx, S7Message msg, List<Object> out
                                                                             0x0000,
                                                                             null);
                     payloadItems.add(payload);
-                    
+
                     //TODO: Check multiple parameters
                     CpuServicesParameter cpuservice = new CpuServicesResponseParameter(CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
                     CpuServicesParameterSubFunctionGroup.ALARM_QUERY, ((CpuServicesParameter) msg.getParameters().get(0)).getSequenceNumber());
 
                     parameterItems.add(cpuservice); 
-                    
+
                     S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.USER_DATA,
                         msg.getTpduReference(), 
                         parameterItems,
@@ -1069,9 +1097,17 @@ private PlcResponse decodeReadResponse(S7ResponseMessage responseMessage, PlcReq
     private PlcResponse decodeSslReadResponse(S7ResponseMessage responseMessage, PlcRequestContainer requestContainer) throws PlcProtocolException {
         InternalPlcReadRequest plcReadRequest = (InternalPlcReadRequest) requestContainer.getRequest();
         
-        Map<String, Pair<PlcResponseCode, ByteBuf>> values = new HashMap<>();
-        
+        Map<String, Pair<PlcResponseCode, ByteBuf>> values = new HashMap<>();                
         List<S7Payload> payloads = responseMessage.getPayloads();
+        
+        if (payloads.get(0) instanceof CpuServicesPayload){
+            CpuServicesPayload payload = (CpuServicesPayload) payloads.get(0); 
+            if (payload.getSslPayload() == null) {
+                logger.debug("decodeSslReadResponse: Check for fragment payload");
+                return null;
+            }
+        }
+        
         payloads.forEach((payload)->{
             CpuServicesPayload s7payload = (CpuServicesPayload) payload;});    
              
@@ -1083,7 +1119,6 @@ private PlcResponse decodeSslReadResponse(S7ResponseMessage responseMessage, Plc
             Pair<PlcResponseCode, ByteBuf> result = new ImmutablePair<>( 
                     decodeResponseCode(payload.getReturnCode()), 
                     payload.getSslPayload());
-
             values.put(requestName, result);
 
             index++;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
index 5ecfdc0d81f..ad3591c5bc4 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
@@ -265,64 +265,94 @@ private void encodePayloads(S7Message in, ByteBuf buf) throws PlcProtocolExcepti
         }
     }
 
+    /*
+    * 
+    */
     private void encodeWriteVarPayload(VarPayload varPayload, ByteBuf buf, boolean lastItem) {
         for (VarPayloadItem payloadItem : varPayload.getItems()) {
             buf.writeByte(payloadItem.getReturnCode().getCode());
             buf.writeByte(payloadItem.getDataTransportSize().getCode());
-            // TODO: Check if this is correct?!?! Might be problems with sizeInBits = true/false
-            buf.writeShort(payloadItem.getData().length);
-            buf.writeBytes(payloadItem.getData());
+            //TODO: Check if this is correct?!?! Might be problems with sizeInBits = true/false
+            //TODO: This field is in BCD
+            switch (payloadItem.getDataTransportSize()){
+                case BIT: 
+                    //Check for bits length
+                    buf.writeShort(payloadItem.getData().length);                    
+                    break;
+                case BYTE_WORD_DWORD: 
+                case INTEGER:
+                    //Length in bits
+                    buf.writeShort(payloadItem.getData().length * 8);                      
+                    break;
+                case  NULL:
+                    break;
+                case DINTEGER:                    
+                case OCTET_STRING:
+                case REAL:
+                    //Length in bytes
+                    buf.writeShort(payloadItem.getData().length);                     
+                    break;
+            }           
+            buf.writeBytes(payloadItem.getData());            
             // if this is not the last item and it's payload is exactly one byte, we need to output a fill-byte.
             if((payloadItem.getData().length == 1) && !lastItem) {
                 buf.writeByte(0x00);
             }
+            
+            System.out.println("encodeWriteVarPayload ByteBuf:... \r\n" + ByteBufUtil.prettyHexDump(buf));
+            
         }
     }
-
     
     private void encodeCpuServicesPayload(CpuServicesPayload cpuServicesPayload, ByteBuf buf)
             throws PlcProtocolException {
 
         buf.writeByte(cpuServicesPayload.getReturnCode().getCode());
+
+        if (cpuServicesPayload.getReturnCode() == DataTransportErrorCode.NOT_FOUND) {
+            buf.writeByte(DataTransportSize.NULL.getCode()); 
+            buf.writeShort(0x0000);
         // This seems to be constantly set to this.
-        buf.writeByte(DataTransportSize.OCTET_STRING.getCode());
+        } else {
+            buf.writeByte(DataTransportSize.OCTET_STRING.getCode());
 
-        // A request payload is simple.
-        if (cpuServicesPayload.getSslDataRecords().isEmpty()) {
-            buf.writeShort(4);
-            buf.writeShort(cpuServicesPayload.getSslId().getCode());
-            buf.writeShort(cpuServicesPayload.getSslIndex());
-        }
-        // The response payload contains a lot more information.
-        else {
-            throw new PlcProtocolException("Unexpected SZL Data Records");
-            /*short length = 8;
-            short sizeOfDataItem = 0;
-            for (SslDataRecord sslDataRecord : cpuServicesPayload.getSslDataRecords()) {
-                sizeOfDataItem = (short) (sslDataRecord.getLengthInWords() * (short) 2);
-                length += sizeOfDataItem;
+            // A request payload is simple.
+            if (cpuServicesPayload.getSslDataRecords().isEmpty()) {
+                buf.writeShort(4);
+                buf.writeShort(cpuServicesPayload.getSslId().getCode());
+                buf.writeShort(cpuServicesPayload.getSslIndex());
             }
-            buf.writeShort(length);
-            buf.writeShort(cpuServicesPayload.getSslId().getCode());
-            buf.writeShort(cpuServicesPayload.getSslIndex());
-            buf.writeShort(sizeOfDataItem);
-            buf.writeShort(cpuServicesPayload.getSslDataRecords().size());
-            // Output any sort of ssl list items, if there are any.
-            for (SslDataRecord sslDataRecord : cpuServicesPayload.getSslDataRecords()) {
-                if(sslDataRecord instanceof SslModuleIdentificationDataRecord) {
-                    SslModuleIdentificationDataRecord midr = (SslModuleIdentificationDataRecord) sslDataRecord;
-                    buf.writeShort(midr.getIndex());
-                    byte[] articleNumberBytes = midr.getArticleNumber().getBytes(StandardCharsets.UTF_8);
-                    // An array full of 20 spaces.
-                    byte[] data = new byte[]{0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-                        0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20};
-                    // Copy max 20 bytes from the article number into the dest array.
-                    System.arraycopy(articleNumberBytes, 0, data, 0, 20);
-                    buf.writeBytes(data);
-                    buf.writeShort(midr.getModuleOrOsVersion());
-                    buf.writeShort(midr.getPgDescriptionFileVersion());
+            // The response payload contains a lot more information.
+            else {
+                throw new PlcProtocolException("Unexpected SZL Data Records");
+                /*short length = 8;
+                short sizeOfDataItem = 0;
+                for (SslDataRecord sslDataRecord : cpuServicesPayload.getSslDataRecords()) {
+                    sizeOfDataItem = (short) (sslDataRecord.getLengthInWords() * (short) 2);
+                    length += sizeOfDataItem;
                 }
-            }*/
+                buf.writeShort(length);
+                buf.writeShort(cpuServicesPayload.getSslId().getCode());
+                buf.writeShort(cpuServicesPayload.getSslIndex());
+                buf.writeShort(sizeOfDataItem);
+                buf.writeShort(cpuServicesPayload.getSslDataRecords().size());
+                // Output any sort of ssl list items, if there are any.
+                for (SslDataRecord sslDataRecord : cpuServicesPayload.getSslDataRecords()) {
+                    if(sslDataRecord instanceof SslModuleIdentificationDataRecord) {
+                        SslModuleIdentificationDataRecord midr = (SslModuleIdentificationDataRecord) sslDataRecord;
+                        buf.writeShort(midr.getIndex());
+                        byte[] articleNumberBytes = midr.getArticleNumber().getBytes(StandardCharsets.UTF_8);
+                        // An array full of 20 spaces.
+                        byte[] data = new byte[]{0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+                            0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20};
+                        // Copy max 20 bytes from the article number into the dest array.
+                        System.arraycopy(articleNumberBytes, 0, data, 0, 20);
+                        buf.writeBytes(data);
+                        buf.writeShort(midr.getModuleOrOsVersion());
+                        buf.writeShort(midr.getPgDescriptionFileVersion());
+                    }
+                }*/
+            }
         }
     }    
     
@@ -1060,7 +1090,7 @@ private CpuServicesParameter decodeCpuServicesParameter(ByteBuf in) {
         
         CpuServicesParameterFunctionGroup functionGroup =
             CpuServicesParameterFunctionGroup.valueOf(typeAndFunctionGroup);
-        
+
         CpuServicesParameterSubFunctionGroup subFunctionGroup =
             CpuServicesParameterSubFunctionGroup.valueOf(in.readByte());
         
@@ -1073,6 +1103,7 @@ private CpuServicesParameter decodeCpuServicesParameter(ByteBuf in) {
                byte dataUnitReferenceNumber = in.readByte();
                boolean lastDataUnit = in.readByte() == 0x00;
                ParameterError error = ParameterError.valueOf(in.readShort());
+               logger.info("decodeParameter.: " + error);
 
                 return new CpuCyclicServicesResponseParameter(functionGroup, subCycFunctionGroup, sequenceNumber,
                             dataUnitReferenceNumber, lastDataUnit, error);               
@@ -1085,6 +1116,7 @@ private CpuServicesParameter decodeCpuServicesParameter(ByteBuf in) {
             byte dataUnitReferenceNumber = in.readByte();
             boolean lastDataUnit = in.readByte() == 0x00;
             ParameterError error = ParameterError.valueOf(in.readShort());
+
             return new CpuServicesResponseParameter(functionGroup, subFunctionGroup, sequenceNumber,
                 dataUnitReferenceNumber, lastDataUnit, error);
         }
@@ -1154,11 +1186,23 @@ private List<VarParameterItem> decodeReadWriteVarParameter(ByteBuf in, byte numI
         return items;
     }
     
-    private CpuServicesPayload decodeReadSslPayload(CpuServicesParameter parameter, ByteBuf userData){
+    private CpuServicesPayload decodeReadSslPayload(CpuServicesParameter parameter, ByteBuf userData){ 
+        //logger.info("decodeReadSslPayload: \r\n" + ByteBufUtil.prettyHexDump(userData));
+        CpuServicesResponseParameter thisparameter = null;
+        short length;
+        short dataUnitReferenceNumber = 0x0000;
+        boolean lastdataunit = true;
+        
         DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
         DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
-        short length;
+
         
+        if (parameter instanceof CpuServicesResponseParameter){           
+            thisparameter = (CpuServicesResponseParameter) parameter;
+            dataUnitReferenceNumber = (short) thisparameter.getDataUnitReferenceNumber();
+            lastdataunit = thisparameter.isLastDataUnit();
+        }        
+        /*
         if(dataTransportSize != DataTransportSize.OCTET_STRING) {
             if(dataTransportSize == DataTransportSize.NULL) {
                 length = userData.readShort();
@@ -1170,39 +1214,78 @@ private CpuServicesPayload decodeReadSslPayload(CpuServicesParameter parameter,
                 
             }   
         }
+          */      
+        length = userData.readShort();         
+        //If is fragment message 
+        SslId sslId = SslId.NULL;
+        short sslIndex = 0x0000;
+        
+        
+        //Check for service not found
+        if (returnCode == DataTransportErrorCode.NOT_FOUND && !lastdataunit){
+            userData.clear();           
+            if (thisparameter != null){               
+                userData.writeShort(thisparameter.getError().getCode());
+            } else {
+                userData.writeShort(ParameterError.PROTOCOL_ERROR.getCode());
+            }
+           return new CpuServicesPayload(returnCode, sslId, sslIndex, userData);            
+        }        
         
-        length = userData.readShort();                
-        SslId sslId = SslId.valueOf(userData.readShort());
-        short sslIndex = userData.readShort();
         // If the length is 4 there is no `partial list length in bytes` and `partial list count` parameters.
         if(length == 4) {
+            //logger.info("decodeReadSslPayload: error response.");
+            sslId = SslId.valueOf(userData.readShort());
+            sslIndex = userData.readShort();            
             return new CpuServicesPayload(returnCode, sslId, sslIndex);
         }
         // If the length is not 4, then it has to be at least 8.
-        else if(length >= 8) {
+        else if((length >= 8) || ((length == 0) && lastdataunit)) {                                           
+            if (!lastdataunit) {   
+                //TODO: Work with two fragments, we need test with 3 and more
+                Pair<LocalDateTime, Queue<ByteBuf>> fragments = fragmentedData.get(dataUnitReferenceNumber);
+                if (fragments != null) {
+                    Queue<ByteBuf> bytebufqueue = fragments.getValue();
+                    bytebufqueue.add(userData);
+                } else {
+                    sslId = SslId.valueOf(userData.readShort());
+                    sslIndex = userData.readShort();                       
+                    Queue<ByteBuf> bytebufqueue = new ArrayDeque();
+                    bytebufqueue.add(userData);
+                    Pair<LocalDateTime, Queue<ByteBuf>> firtsfragment = new ImmutablePair(LocalDateTime.now(), bytebufqueue);
+                    fragmentedData.put(dataUnitReferenceNumber, firtsfragment);
+                } 
+                return new CpuServicesPayload(returnCode, sslId, sslIndex);   
+            }
+            
+            //Reemsable the fragments   
             
-            // TODO: We should probably ensure we don't read more than this.
-            // Skip the partial list length in words.
-            // TODO: Transfer all Payload to the client app. Use helper class.
-            /*
-            userData.skipBytes(2);
-            short partialListCount = userData.readShort();
-            List<SslDataRecord> sslDataRecords = new LinkedList<>();
-            for(int i = 0; i < partialListCount; i++) {
-                short index = userData.readShort();
-                byte[] articleNumberBytes = new byte[20];
-                userData.readBytes(articleNumberBytes);
-                String articleNumber = new String(articleNumberBytes, StandardCharsets.UTF_8).trim();
-                short bgType = userData.readShort();
-                short moduleOrOsVersion = userData.readShort();
-                short pgDescriptionFileVersion = userData.readShort();
-                sslDataRecords.add(new SslModuleIdentificationDataRecord(
-                    index, articleNumber, bgType, moduleOrOsVersion, pgDescriptionFileVersion));
+            if (dataUnitReferenceNumber != 0x0000){
+                Pair<LocalDateTime, Queue<ByteBuf>> fragments = fragmentedData.get(dataUnitReferenceNumber);
+                if (fragments != null){ 
+                    Queue<ByteBuf> bytebufqueue = fragments.getValue();
+                    ByteBuf payload = bytebufqueue.remove();
+                    for(ByteBuf nextpayload:bytebufqueue){
+                        if (nextpayload != null) { 
+                            payload.writeBytes(nextpayload);
+                            nextpayload.release();                          
+                        };
+                    }               
+                    payload.writeBytes(userData);
+                    userData.clear();                 
+                    userData.writeBytes(payload);                
+                    payload.release();               
+                    fragmentedData.remove(dataUnitReferenceNumber);
+                    returnCode = DataTransportErrorCode.OK;
+                }                  
+            } else {
+                sslId = SslId.valueOf(userData.readShort());
+                sslIndex = userData.readShort();                  
             }
-            */
-            ByteBuf payload = Unpooled.copiedBuffer(userData);
-                            
-            return new CpuServicesPayload(returnCode, sslId, sslIndex, payload);
+
+            //TODO: sslId & sslIndex in this point dont care, we need check!
+            return new CpuServicesPayload(returnCode, sslId, sslIndex, userData);
+            
         }
         // In all other cases, it's probably an error.
         else {
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/VarPayloadItem.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/VarPayloadItem.java
index bfc30d943e3..9cf9b9b39d6 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/VarPayloadItem.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/VarPayloadItem.java
@@ -45,4 +45,14 @@ public byte[] getData() {
         return data;
     }
 
+    @Override
+    public String toString() {
+        return "VarPayloadItem{" + 
+                "returnCode=" + returnCode + 
+                ", dataTransportSize=" + dataTransportSize + 
+                ", data=" + data.length + '}';
+    }
+
+    
+    
 }
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportErrorCode.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportErrorCode.java
index bbbd3f5980c..90159606ef0 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportErrorCode.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportErrorCode.java
@@ -18,11 +18,10 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.plc4x.java.s7.netty.model.types;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.HashMap;
 import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public enum DataTransportErrorCode {
     RESERVED((byte) 0x00),
@@ -30,6 +29,7 @@ public enum DataTransportErrorCode {
     ACCESS_DENIED((byte) 0x03),
     INVALID_ADDRESS((byte) 0x05),
     DATA_TYPE_NOT_SUPPORTED((byte) 0x06),
+    DATA_TYPE_INCONSISTENT((byte) 0x07),
     NOT_FOUND((byte) 0x0A);
 
     private static final Logger logger = LoggerFactory.getLogger(DataTransportErrorCode.class);
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/TransportSize.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/TransportSize.java
index 2f806ed86d5..93e96462069 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/TransportSize.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/TransportSize.java
@@ -18,9 +18,8 @@ Licensed to the Apache Software Foundation (ASF) under one
  */
 package org.apache.plc4x.java.s7.netty.model.types;
 
-import org.apache.plc4x.java.s7.types.S7ControllerType;
-
 import java.util.*;
+import org.apache.plc4x.java.s7.types.S7ControllerType;
 
 public enum TransportSize {
 
@@ -46,17 +45,17 @@ public enum TransportSize {
     // Integers
     // -----------------------------------------
     // Signed Int
-    INT(0x05, "W", 2, null, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
+    INT(0x05, "W", 2, null, DataTransportSize.INTEGER, S7ControllerType.ANY),
     // Unsigned Int
-    UINT(0x05, "W", 2, INT, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
+    UINT(0x05, "W", 2, INT, DataTransportSize.INTEGER, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
     // (Signed) Small Int
-    SINT(0x02, "B", 1, INT, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
+    SINT(0x02, "B", 1, INT, DataTransportSize.INTEGER, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
     // Unsigned Small Int
-    USINT(0x02, "B", 1, INT, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
+    USINT(0x02, "B", 1, INT, DataTransportSize.INTEGER, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
     // Double Precision Int
-    DINT(0x07, "D", 4, INT, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
+    DINT(0x07, "D", 4, INT, DataTransportSize.INTEGER, S7ControllerType.ANY),
     // Unsigned Double Precision Int
-    UDINT(0x07, "D", 4, INT, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
+    UDINT(0x07, "D", 4, INT, DataTransportSize.INTEGER, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
     // Only got a basic TIA license (S7-1500 needed to find this out)
     // TODO: Find the code
     LINT(0x00, "X", 8, INT, null, S7ControllerType.S7_1500),
@@ -67,7 +66,7 @@ public enum TransportSize {
     // -----------------------------------------
     // Reals
     // -----------------------------------------
-    REAL(0x08, "D", 4, null, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
+    REAL(0x08, "D", 4, null, DataTransportSize.REAL, S7ControllerType.ANY),
     // TODO: Find the code
     LREAL(0x00, "X", 8, REAL, null, S7ControllerType.S7_1200, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
 
@@ -75,7 +74,7 @@ public enum TransportSize {
     // Durations
     // -----------------------------------------
     // IEC time
-    TIME(0x0B, "X", 4, null, null, S7ControllerType.ANY),
+    TIME(0x0B, "D", 4, null, DataTransportSize.INTEGER, S7ControllerType.ANY),
     // TODO: Find the code
     LTIME(0x00, "X", 8, TIME, null, S7ControllerType.S7_1500),
 
@@ -83,32 +82,32 @@ public enum TransportSize {
     // Date
     // -----------------------------------------
     // IEC date (yyyy-m-d)
-    DATE(0x02, "X", 2, null, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
+    DATE(0x02, "W", 2, null, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
 
     // -----------------------------------------
     // Time of day
     // -----------------------------------------
     // Time (hh:mm:ss.S)
-    TIME_OF_DAY(0x02, "X", 4, null, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
+    TIME_OF_DAY(0x02, "D", 4, null, DataTransportSize.INTEGER, S7ControllerType.ANY),
 
     // -----------------------------------------
     // Date and time of day
     // -----------------------------------------
-    DATE_AND_TIME(0x02, "X", 8, null, null, S7ControllerType.S7_1500, S7ControllerType.S7_300, S7ControllerType.S7_400),
+    DATE_AND_TIME(0x02, "X", 8, null, DataTransportSize.INTEGER, S7ControllerType.S7_1500, S7ControllerType.S7_300, S7ControllerType.S7_400),
 
     // -----------------------------------------
     // ASCII Strings
     // -----------------------------------------
     // Single-byte character
-    CHAR(0x03, "B", 1, null, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
+    CHAR(0x03, "B", 1, null, DataTransportSize.OCTET_STRING, S7ControllerType.ANY),
     // Double-byte character
     // TODO: Find the code (Perhaps 0x13)
-    WCHAR(0x13, "X", 2, null, null, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
+    WCHAR(0x13, "B", 2, null, null, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
     // Variable-length single-byte character string
-    STRING(0x03, "X", 1, null, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
+    STRING(0x03, "B", 1, null, DataTransportSize.OCTET_STRING, S7ControllerType.ANY),
     // Variable-length double-byte character string
     // TODO: Find the code (Perhaps 0x13)
-    WSTRING(0x00, "X", 1, null, null, S7ControllerType.S7_1200, S7ControllerType.S7_1500);
+    WSTRING(0x00, "B", 1, null, DataTransportSize.OCTET_STRING, S7ControllerType.S7_1200, S7ControllerType.S7_1500);
 
     /* TO BE CONTINUED */
 
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelper.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelper.java
index 45076458a5b..f1f5849666a 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelper.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelper.java
@@ -33,6 +33,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
 import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
 import org.apache.plc4x.java.s7.netty.model.payloads.ssls.SslDataRecord;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
 import org.apache.plc4x.java.s7.netty.model.types.VariableAddressingMode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -69,7 +70,9 @@ public static short getPayloadsLength(List<S7Payload> payloads) {
                 }
             } else if(payload instanceof CpuServicesPayload) {
                 CpuServicesPayload cpuServicesPayload = (CpuServicesPayload) payload;
-                if(cpuServicesPayload.getSslDataRecords().isEmpty()) {
+                if(cpuServicesPayload.getReturnCode() == DataTransportErrorCode.NOT_FOUND ){
+                    return 4;
+                } else  if(cpuServicesPayload.getSslDataRecords().isEmpty()) {
                     return 8;
                 } else {
                     short length = 0;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7ByteReadResponse.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7ByteReadResponse.java
index 27f27c966d2..655cd21945d 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7ByteReadResponse.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7ByteReadResponse.java
@@ -30,7 +30,6 @@ Licensed to the Apache Software Foundation (ASF) under one
 import java.util.Objects;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
 import org.apache.plc4x.java.api.model.PlcField;
 import org.apache.plc4x.java.api.types.PlcResponseCode;
 import org.apache.plc4x.java.base.messages.InternalPlcReadRequest;
@@ -470,9 +469,12 @@ protected ByteBuf getByteBufInternal(String name) {
         if (values.get(name) == null) {
             throw new PlcInvalidFieldException(name);
         }
+        //TODO: Check for error respont
+        /*
         if (values.get(name).getKey() != PlcResponseCode.OK) {
             throw new PlcRuntimeException("Field '" + name + "' could not be fetched, response was " + values.get(name).getKey());
         }
+        */
         // No need to check for "null" as this is already captured by the constructors.
         return values.get(name).getValue();
     }    
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7DiagnosticEventId.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7DiagnosticEventId.java
index 741ac4417e6..e03890fbccd 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7DiagnosticEventId.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7DiagnosticEventId.java
@@ -630,7 +630,7 @@ public enum S7DiagnosticEventId {
     //Event Classes F -  Reserved for modules not in central 
     //                   rack (for example, CPs or FMs)
     
-    EVENTID_0x0000((short) 0x0000, "NULL"),;
+    EVENTID_0x0000((short) 0x0000, "NULL: Check for user information.");
 
     
     
@@ -641,8 +641,8 @@ public enum S7DiagnosticEventId {
     static {
         map = new HashMap<>();
         idstr = new HashMap<>();
-        for (S7DiagnosticEventId  subevent : S7DiagnosticEventId .values()) {
-            map.put(subevent.code, subevent);
+        for (S7DiagnosticEventId  event : S7DiagnosticEventId.values()) {
+            map.put(event.code, event);
         }
        
         idstr.put((short) 0x0000, "Event leaving state. ");
@@ -652,40 +652,34 @@ public enum S7DiagnosticEventId {
         idstr.put((short) 0x0800, "External error. ");
     }    
     
-    private final String event;
+    private final String description;
     private final short code;
     
-    S7DiagnosticEventId(short code, String event){
-        this.event = event;
-        this.code = code;
+    S7DiagnosticEventId(final short code, final String description){
+        this.code = code;        
+        this.description = description;
     }
     
-    public String getEvent(){
-        short id = (short) (code & 0x0F00);
-        return event;
+    public String getDescription(){
+        //short id = (short) (code & 0x0F00);
+        return description;
     }    
     
     public short getCode() {
         return code;
     }    
-    
-    public static S7DiagnosticEventId  valueOfEvent(String event) {
-        for (S7DiagnosticEventId  value : S7DiagnosticEventId .values()) {
-            if(value.getEvent().equals(event)) {
-                return value;
-            }
-        }
-        return null;
-    }
 
     public static S7DiagnosticEventId  valueOf(short code) {
         
-        if ((code > 0x8000) & (code < 0xA000)){
-            if ((code != 0x9101) & (code != 0x9190) & (code != 0x91F0)
-                    & (code != 0x91F1) & (code != 0x91F2)
-                    & (code != 0x91F3))
-            code = (short) (code & 0xF0FF);
-        }
-        return map.get(code);
+        Integer intcode = Short.toUnsignedInt(code);
+        
+        if ((intcode > 0x8000) && (intcode < 0xA000)){
+            if ((intcode != 0x9101) && (intcode != 0x9190) && (intcode != 0x91F0)
+                    && (intcode != 0x91F1) && (intcode != 0x91F2)
+                    && (intcode != 0x91F3))
+            intcode = (intcode & 0xF0FF);
+        } else if (((intcode >= 0xA000) && (intcode <= 0xBFFF))) intcode = 0x0000;
+                
+        return map.get(intcode.shortValue());
     }    
 }
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7SslHelper.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7SslHelper.java
index 61965a3507a..d667769f698 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7SslHelper.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7SslHelper.java
@@ -19,10 +19,1126 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 package org.apache.plc4x.java.s7.utils;
 
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
- *
+ *  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+ *  |15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1|
+ *  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+ *  \__________/\__________/\____________________/
+ *   Module      Number of   Number of the partial 
+ *   class       the partial list
+ *               list 
+ *               extract
+ * 
+ *  <b>Module Class:</b>
+ *  +--------------+-----------------+ 
+ *  | Module class | Coding (Binary) |
+ *  +--------------|-----------------+
+ *  |     CPU      |      0000       | 
+ *  +--------------|-----------------+
+ *  |     IM       |      0100       | 
+ *  +--------------|-----------------+
+ *  |     FM       |      1000       | 
+ *  +--------------|-----------------+
+ *  |     CP       |      1100       | 
+ *  +--------------|-----------------+
+ * 
+ *  <b>Possible SSL Partial Lists:</b>
+ *  +-----------------------------------------------------------|--------------+
+ *  | Module class                                              |    SSL-ID    |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Module identification                                     |    16#xy11   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | CPU characteristics                                       |    16#xy12   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | User memory areas                                         |    16#xy13   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | System areas                                              |    16#xy14   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Block types                                               |    16#xy15   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Interrupt status                                          |    16#xy22   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Assignment between process image partitions and OBs       |    16#xy25   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Communication status data                                 |    16#xy32   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | H CPU group information                                   |    16#xy71   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Status of the module LEDs                                 |    16#xy74   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Switched DP slaves in the H-system                        |    16#xy75   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Module status information                                 |    16#xy91   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Rack / station status information                         |    16#xy92   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Rack / station status information                         |    16#xy94   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Extended DP master system / PROFINET IO system information|    16#xy95   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Module status information, PROFINET IO and PROFIBUS DP    |    16#xy96   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Tool changer information (PROFINET IO)                    |    16#xy9C   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Diagnostic buffer of the CPU                              |    16#xyA0   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Module diagnostic information (data record 0)             |    16#xyB1   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Module diagnostic information (data record 1),            |    16#xyB2   |
+ *  | geographical address                                      |              |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Module diagnostic information (data record 1),            |    16#xyB3   |
+ *  | logical address                                           |              |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Diagnostic data of a DP slave                             |    16#xyB4   |
+ *  +-----------------------------------------------------------|--------------+
+ * 
+ * 
  * @author cgarcia
  */
+
 public class S7SslHelper {
     
+    /**
+     * 
+     */
+    public enum OB {
+        FREE_CYC(0X0000,"OB1 Free cycle"),
+        
+        //Time of day
+        TOD_INT0(0X000A,"OB10 Time of day interrupt"),
+        TOD_INT1(0X000B,"OB11 Time of day interrupt"),
+        TOD_INT2(0X000C,"OB12 Time of day interrupt"),
+        TOD_INT3(0X000D,"OB13 Time of day interrupt"),
+        TOD_INT4(0X000E,"OB14 Time of day interrupt"),
+        TOD_INT5(0X000F,"OB15 Time of day interrupt"),
+        TOD_INT6(0X0010,"OB16 Time of day interrupt"),
+        TOD_INT7(0X0011,"OB17 Time of day interrupt"),        
+        
+        //Time delay
+        DEL_INT0(0X0014,"OB20 Time delay interrupt"),
+        DEL_INT1(0X0015,"OB21 Time delay interrupt"),
+        DEL_INT2(0X0016,"OB22 Time delay interrupt"),
+        DEL_INT3(0X0017,"OB23 Time delay interrupt"),        
+        
+        //Cyclic
+        CYC_INT0(0X001E,"OB30 Cyclic interrupt"),
+        CYC_INT1(0X001F,"OB31 Cyclic interrupt"),
+        CYC_INT2(0X0020,"OB32 Cyclic interrupt"),
+        CYC_INT3(0X0021,"OB33 Cyclic interrupt"),
+        CYC_INT4(0X0022,"OB34 Cyclic interrupt"),
+        CYC_INT5(0X0023,"OB35 Cyclic interrupt"),
+        CYC_INT6(0X0024,"OB36 Cyclic interrupt"),
+        CYC_INT7(0X0025,"OB37 Cyclic interrupt"),
+        CYC_INT8(0X0026,"OB38 Cyclic interrupt"),
+                
+        //Hardware interrupts
+        HW_INT0(0X0028,"OB40 Hardware interrupt"),
+        HW_INT1(0X0029,"OB41 Hardware interrupt"),
+        HW_INT2(0X002A,"OB42 Hardware interrupt"),
+        HW_INT3(0X002B,"OB43 Hardware interrupt"),
+        HW_INT4(0X002C,"OB44 Hardware interrupt"),
+        HW_INT5(0X002D,"OB45 Hardware interrupt"),
+        HW_INT6(0X002E,"OB46 Hardware interrupt"),
+        HW_INT7(0X002F,"OB47 Hardware interrupt"),
+        
+        //Startup
+        BACKGROUND(0X005A,"OB90 Background"),
+        COMPLETE_RESTART(0X0064,"OB100 Startup"),
+        RESTART(0X0064,"OB101 Background"),
+        COLD_RESTART(0X005A,"OB101 Background"),
+        
+        //Fault interrupts
+        CYC_FLT(0X0051,"OB80 Time execution error interrupt"),
+        PS_FLT(0X0051,"OB81 Power supply interrupt"),
+        IO_FLT1(0X0052,"OB82 Module diagnostic interrupt"),
+        IO_FLT2(0X0053,"OB83 Module change interrupt"),
+        CPU_FLT(0X0054,"OB84 CPU hardware error interrupt"),        
+        OBNL_FLT(0X0055,"OB85 Program execution error interrupt"),
+        RACK_FLT(0X0056,"OB86 Rack fault interrupt"),
+        COMM_FLT(0X0057,"OB87 Communication error interrupt"),        
+        BREAKUP_ERR(0X0058,"OB88 Process interrupt"),        
+        SYNC_ERR(0X0079,"OB120 Synchronous error interrupt"),
+        PROG_ERR(0X0079,"OB121 Program error interrupt"),
+        MOD_ERR(0X007A,"OB122 Module error interrupt");
+
+        private int code;
+        private String description;
+
+        private static final Map<Integer, OB> map;
+
+        static {
+            map = new HashMap<>();
+            for (OB obid : OB.values()) {
+                map.put(obid.code, obid);
+            }
+        }         
+        
+        OB(final int code, final String description){
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getCode(){
+            return code;
+        }
+
+        public String getDescription(){
+            return description;
+        }
+
+        public static OB valueOf(int code) {
+            return map.get(code);
+        }            
+        
+        
+    }    
+    
+    
+    /**
+     * 
+     */
+    public enum MODULE{
+        CPU(0X00),
+        IM(0X04),
+        FM(0X80),
+        CP(0XC0);
+        
+        private int code;
+        
+        MODULE(final int code){
+            this.code = code;
+        }
+        
+        public int getCode(){
+            return code;
+        }        
+    }
+    
+    /**
+     * 
+     */
+    public enum LED_ID {
+        SF(0X0001,"Group error"),
+        INTF(0X0002,"Internal error"),
+        EXTF(0X0003,"External error"),        
+        RUN(0X0004,"RUN"),        
+        STOP(0X0005,"STOP"),        
+        FRCE(0X0006,"Force"),        
+        CRST(0X0007,"Cold restart"),        
+        BAF(0X0008,"Battery fault"),        
+        USR(0X0009,"User defined"),        
+        USR1(0X000A,"User defined"),        
+        BUS1F(0X000B,"Bus error interface 1"),
+        BUS2F(0X000C,"Bus error interface 2"),
+        REDF(0X000D,"Redundancy error"),
+        MSTR(0X000E,"Master"),
+        RACK0(0X000F,"Rack number 0"),
+        RACK1(0X0010,"Rack number 1"),
+        RACK2(0X0011,"Rack number 2"),
+        IFM1F(0X0012,"Interface error interface module 1"),
+        IFM2F(0X0013,"Interface error interface module 2"),
+        BUS3F(0X0014,"Bus error interface 3"),
+        MAINT(0X0015,"Maintenance demand"),
+        DC24V(0X0016,"DC24V"),
+        BUS5F(0X0017,"Bus error interface 5"),
+        BUS8F(0X0018,"Bus error interface 8"),
+        IF(0X0080,"Init failure"),
+        UF(0X0081,"User failure"),
+        MF(0X0082,"Monitoring failure"),
+        CF(0X0083,"Communication failure"),
+        TF(0X0084,"Task failure"),
+        APPL_STATE_RED(0X00EC,"APPL_STATE_RED"),
+        APPL_STATE_GREEN(0X00ED,"APPL_STATE_GREEN");
+
+        private int code;
+        private String description;
+
+        private static final Map<Integer, LED_ID> map;
+
+        static {
+            map = new HashMap<>();
+            for (LED_ID ledid : LED_ID.values()) {
+                map.put(ledid.code, ledid);
+            }
+        }         
+        
+        LED_ID(final int code, final String description){
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getCode(){
+            return code;
+        }
+
+        public String getDescription(){
+            return description;
+        }
+
+        public static LED_ID valueOf(int code) {
+            return map.get(code);
+        }            
+        
+        
+    }
+        
+    /**
+     * 
+     */
+    public enum CPU_CHARACTERISTICS {
+        CH_0x0000(0X0000,"MC7 processing unit (group with index 0000)"),
+        CH_0x0001(0X0001,"MC7 processing generating code"),
+        CH_0x0002(0X0002,"MC7 interpreter"),
+        
+        CH_0x0100(0X0100,"Time system (group with index 0100)"),
+        CH_0x0101(0X0101,"1 ms resolution"),
+        CH_0x0102(0X0102,"10 ms resolution"),
+        CH_0x0103(0X0103,"No real time clock"),
+        CH_0x0104(0X0104,"BCD time-of-day format"),
+        CH_0x0105(0X0105,"All time-of-day functions"),
+        CH_0x0106(0X0106,"SFC 78 \"OB_RT\" is available"),
+        
+        CH_0x0200(0X0200,"System response (group with index 0200)"),
+        CH_0x0201(0X0201,"Capable of multiprocessor mode"),
+        CH_0x0202(0X0202,"Cold restart, warm restart and hot restart possible"),
+        CH_0x0203(0X0203,"Cold restart and hot restart possible"),
+        CH_0x0204(0X0204,"Warm restart and hot restart possible"),
+        CH_0x0205(0X0205,"Only warm restart possible"),
+        CH_0x0206(0X0206,"New distributed I/O configuration is possible during\n" +
+                            "RUN by using predefined resources"),
+        CH_0x0207(0X0207,"H-CPU in stand-alone mode: New distributed I/O configuration\n" +
+                            "is possible during RUN by using predefined resources"),
+        CH_0x0208(0X0208,"For taking motion control functionality into account"),
+        
+        CH_0x0300(0X0300,"MC7 Language description of the CPU (group with index 0300)"),
+        CH_0x0301(0X0301,"Reserved"),
+        CH_0x0302(0X0302,"All 32 bit fixed-point instructions"),
+        CH_0x0303(0X0303,"All floating-point instructions"),
+        CH_0x0304(0X0304,"sin, asin, cos, acos, tan, atan, sqr, sqrt, ln, exp"),
+        CH_0x0305(0X0305,"Accumulator 3/accumulator 4 with corresponding instructions\n" +
+                            "(ENT,PUSH,POP,LEAVE)"),
+        CH_0x0306(0X0306,"Master Control Relay instructions"),
+        CH_0x0307(0X0307,"Address register 1 exists with corresponding instructions"),
+        CH_0x0308(0X0308,"Address register 2 exists with corresponding instructions"),
+        CH_0x0309(0X0309,"Operations for area-crossing addressing"),
+        CH_0x030A(0X030A,"Operations for area-internal addressing"),
+        CH_0x030B(0X030B,"All memory-indirect addressing instructions for bit memory (M)"),
+        CH_0x030C(0X030C,"All memory-indirect addressing instructions for data blocks (DB)"),
+        CH_0x030D(0X030D,"All memory-indirect addressing instructions for data blocks (DI)"),
+        CH_0x030E(0X030E,"All memory-indirect addressing instructions for local data (L)"),
+        CH_0x030F(0X030F,"All instructions for parameter transfer in FCs"),
+        CH_0x0310(0X0310,"Memory bit edge instructions for process image input (I)"),
+        CH_0x0311(0X0311,"Memory bit edge instructions for process image output (Q)"),
+        CH_0x0312(0X0312,"Memory bit edge instructions for bit memory (M)"),
+        CH_0x0313(0X0313,"Memory bit edge instructions for data blocks (DB)"),
+        CH_0x0314(0X0314,"Memory bit edge instructions for data blocks (DI)"),
+        CH_0x0315(0X0315,"Memory bit edge instructions for local data (L)"),
+        CH_0x0316(0X0316,"Dynamic evaluation of the FC bit"),
+        CH_0x0317(0X0317,"Dynamic local data area with the corresponding instructions"),
+        CH_0x0318(0X0318,"Reserved"),
+        CH_0x0319(0X0319,"Reserved"),
+        
+        CH_0x0401(0X0401,"SFC 87 \"C_DIAG\" is available"),
+        CH_0x0402(0X0402,"SFC 88 \"C_CNTRL\" is available)");
+
+        private int code;
+        private String description;
+
+        private static final Map<Integer, CPU_CHARACTERISTICS > map;
+
+        static {
+            map = new HashMap<>();
+            for (CPU_CHARACTERISTICS  cpuc : CPU_CHARACTERISTICS.values()) {
+                map.put(cpuc.code, cpuc);
+            }
+        }         
+        
+        CPU_CHARACTERISTICS(final int code, final String description){
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getCode(){
+            return code;
+        }
+
+        public String getDescription(){
+            return description;
+        }
+
+        public static CPU_CHARACTERISTICS valueOf(int code) {
+            return map.get(code);
+        }            
+        
+        
+    }    
+            
+    /**
+     *
+     */
+    public enum SSL {
+    ID_0x0011(0x0011,"Module identification."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY11(data);
+        }  
+        
+    },
+    ID_0x0012(0x0012,"CPU characteristics ."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY12(data);
+        }
+        
+    },
+    ID_0x0013(0x0013,"User memory areas."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY13(data);
+        }
+        
+    },
+    ID_0x0014(0x0014,"System areas."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY14(data);
+        }
+        
+    },
+    ID_0x0015(0x0015,"Block types."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY15(data);
+        }
+        
+    },
+    ID_0x001C(0x001C,"Component identification."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY1C(data);
+        }
+        
+    },    
+    ID_0x0022(0x0022,"Interrupt status."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY22(data);
+        }
+        
+    },
+    ID_0x0025(0x0025,"Assignment between process image partitions and OBs."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY25(data);
+        }
+        
+    },
+    ID_0x0032(0x0032,"Communication status data."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY32(data);
+        }
+        
+    },
+    ID_0x0071(0x0071,"H CPU group information."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY71(data);
+        }
+        
+    },
+    ID_0x0074(0x0074,"Status of the module LEDs."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY74(data);
+        }
+        
+    },
+    ID_0x0075(0x0075,"Switched DP slaves in the H-system."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY75(data);
+        }
+        
+    },
+    ID_0x0090(0x0090,"DP Master System Information."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY90(data);
+        }
+        
+    },    
+    ID_0x0091(0x0091,"Module status information."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY91(data);
+        }
+        
+    },
+    ID_0x0092(0x0092,"Rack / station status information."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY92(data);
+        }
+        
+    },
+    ID_0x0094(0x0094,"Rack / station status information."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY94(data);
+        }
+        
+    },    
+    ID_0x0095(0x0095,"Extended DP master system / PROFINET IO system information."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY95(data);
+        }
+        
+    },
+    ID_0x0096(0x0096,"Module status information, PROFINET IO and PROFIBUS DP."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY96(data);
+        }
+        
+    },
+    ID_0x009C(0x009C,"Tool changer information (PROFINET IO)."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY9C(data);
+        }
+        
+    },
+    ID_0x00A0(0x00A0,"Diagnostic buffer of the CPU."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXYA0(data);
+        }
+        
+    },
+    ID_0x00B1(0x00B1,"Module diagnostic information (data record 0) ."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXYB1(data);
+        }
+        
+    },
+    ID_0x00B2(0x00B2,"Module diagnostic information (data record 1),geographical address."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXYB2(data);
+        }
+        
+    },
+    ID_0x00B3(0x00B3,"Module diagnostic information (data record 1),logical address."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXYB3(data);
+        }
+        
+    },
+    ID_0x00B4(0x00B4,"Diagnostic data of a DP slave."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXYB4(data);
+        }
+        
+    };
+
+    private int code;
+    private String description;
+    
+    private static final Map<Integer, SSL> map;
+    
+    static {
+        map = new HashMap<>();
+        for (SSL subssl : SSL.values()) {
+            map.put(subssl.code, subssl);
+        }
+    }    
+    
+    SSL(final int code, final String description){
+        this.code = code;
+        this.description = description;
+    }
+    
+    public int getCode(){
+        return code;
+    }
+    
+    public String getDescription(){
+        return description;
+    }
+    
+    public static SSL valueOf(int code) {
+        return map.get(code);
+    }    
+    
+    public abstract StringBuilder execute(ByteBuf data);
+    
+    private static StringBuilder ID_0xXY11(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        int ssl_length = data.readShort();
+        int ssl_count = data.readShort();
+        try {
+            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");
+            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");
+            for (int i=1; i <= ssl_count; i++){
+                sb.append("Data Record: ").append(i).append("\r\n");
+
+                sb.append("Index: ").append(data.readShort()).append("\r\n");
+                byte[] bytestr = new byte[20];
+                data.readBytes(bytestr, 0, 20);
+                sb.append("Mlfb (Order number): ").append(new String(bytestr)).append("\r\n");
+                sb.append("BGTyp (Moduler type ID): ").append(data.readShort()).append("\r\n");                
+                sb.append("Ausbg (Version of the module/hardware version): ").append(data.readShort()).append("\r\n");
+                sb.append("Ausbe (Firmware version): ").append(data.readShort()).append("\r\n");
+            }
+        } catch (Exception ex){
+            sb.append(ex.toString());
+        }
+        return sb;
+    }    
+    
+    private static StringBuilder ID_0xXY12(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        int ssl_length = data.readShort();
+        int ssl_count = data.readShort();
+        try {
+            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");
+            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");
+            for (int i=1; i <= ssl_count; i++){
+                sb.append("Data Record: ").append(i).append("\r\n");
+                int code = data.readShort();
+                sb.append(CPU_CHARACTERISTICS.valueOf(code)).append(": ").
+                        append(CPU_CHARACTERISTICS.valueOf(code).getDescription()).append("\r\n");
+            }
+        } catch (Exception ex){
+            sb.append(ex.toString());
+        }
+        return sb;
+    }        
+    
+    private static StringBuilder ID_0xXY13(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        int ssl_length = data.readShort();
+        int ssl_count = data.readShort();
+        try {
+            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");
+            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");
+            for (int i=1; i <= ssl_count; i++){
+                sb.append("Data Record: ").append(i).append("\r\n");
+                sb.append("Index: ").append(data.readShort()).append("\r\n");
+                int code = data.readShort();
+                int size = data.readInt();
+                int mode = data.readShort();
+                int granu = data.readShort();
+                int ber1 = data.readInt();
+                int be1egt1 = data.readInt();
+                int block1 = data.readInt();
+                int ber2 = data.readInt();
+                int be1egt2 = data.readInt();
+                int block2 = data.readInt();
+                
+                switch(code){
+                    case 0x0001:sb.append("Code (Memory Type): ").append("Volatile memory (RAM)\r\n");
+                        break;
+                    case 0x0002:sb.append("Code (Memory Type): ").append("Non-volatile memory (FEPROM)\r\n");
+                        break;
+                    case 0x0003:sb.append("Code (Memory Type): ").append("mixed memory (RAM + FEPROM)\r\n");
+                        break;
+                }
+                sb.append("Size (Total size of the selected memory (total of area 1 and area 2)): ").append(size).append("\r\n"); 
+                
+                sb.append("Mode (Volatile memory area): ").append(((mode & 0x0001) != 0)).append("\r\n"); 
+                sb.append("Mode (Non-volatile memory area): ").append(((mode & 0x0002) != 0)).append("\r\n"); 
+                sb.append("Mode (Mixed memory area): ").append(((mode & 0x0004) != 0)).append("\r\n"); 
+                sb.append("Mode (Code and data separate): ").append(((mode & 0x0008) != 0)).append("\r\n");
+                sb.append("Mode (Code and data together): ").append(((mode & 0x0010) != 0)).append("\r\n");
+                
+                sb.append("Granu (Always zero): ").append(granu).append("\r\n"); 
+                
+                sb.append("Ber1 (Size of the volatile memory area in bytes): ").append(ber1).append("\r\n");  
+                sb.append("Belegt1 (Size of the volatile memory area being used): ").append(be1egt1).append("\r\n");
+                sb.append("Block1 (Largest free block in the volatile memory area): ").append(block1).append("\r\n");
+                
+                sb.append("Ber2 (Size of the non-volatile memory area in bytes): ").append(ber2).append("\r\n");  
+                sb.append("Belegt2 (Size of the non-volatile memory area being used): ").append(be1egt2).append("\r\n");
+                sb.append("Block2 (Largest free block in the non-volatile memory area): ").append(block2).append("\r\n");                
+                               
+            }
+        } catch (Exception ex){
+            sb.append(ex.toString());
+        }
+        return sb;
+    }        
+     
+    private static StringBuilder ID_0xXY14(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        int ssl_length = data.readShort();
+        int ssl_count = data.readShort();
+        try {
+            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");
+            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");
+            for (int i=1; i <= ssl_count; i++){
+                int index = data.readShort(); 
+                int code = data.readShort();
+                int quantity = data.readShort();
+                int reman = data.readShort();
+                
+                sb.append("Data Record: ").append(i).append("\r\n");
+                sb.append("Index: ").append(index).append(" System area: ");
+                switch(index) {
+                    case 0x0001: sb.append("PII (number in bytes)").append("\r\n");
+                        break;
+                    case 0x0002: sb.append("PIQ (number in bytes))").append("\r\n");
+                        break;
+                    case 0x0003: sb.append("memory (number in bits)").append("\r\n");
+                        break;
+                    case 0x0004: sb.append("timers (number)").append("\r\n");
+                        break;
+                    case 0x0005: sb.append("counter (number)").append("\r\n");
+                        break;
+                    case 0x0006: sb.append("number of bytes in the logical address area)").append("\r\n");
+                        break;
+                    case 0x0007: sb.append("local data (entire local data area of the CPU in bytes)").append("\r\n");
+                        break;
+                    case 0x0008: sb.append("memory (number in bytes)").append("\r\n");
+                        break;
+                    case 0x0009: sb.append("local data (entire local data area of the CPU in Kbytes)").append("\r\n");
+                        break;                        
+                }
+                sb.append("Code: ").append(code).append(" Memory type: ");
+                switch(code) {
+                    case 0x0001: sb.append("volatile memory (RAM)").append("\r\n");
+                        break;
+                    case 0x0002: sb.append("non-volatile memory (FEPROM)").append("\r\n");
+                        break; 
+                    case 0x0003: sb.append("mixed memory (RAM and FEPROM)").append("\r\n");
+                        break;                        
+                }
+                sb.append("Quantity: ").append(quantity).append("\r\n");
+                sb.append("Reman: ").append(reman).append("\r\n");
+            }
+        } catch (Exception ex){
+            sb.append(ex.toString());
+        }
+        return sb;
+    }    
+       
+    private static StringBuilder ID_0xXY15(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        int ssl_length = data.readShort();
+        int ssl_count = data.readShort();
+        try {
+            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");;
+            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");;
+
+            for (int i=1; i <= ssl_count; i++){
+                sb.append("Data Record: ").append(i).append("\r\n");
+                int type = data.readShort();
+                switch(type){
+                    case 0x0800: sb.append("Block type: OB\r\n");
+                        break;
+                    case 0x0A00: sb.append("Block type: DB\r\n");
+                        break;
+                    case 0x0B00: sb.append("Block type: SDB\r\n");
+                        break;
+                    case 0x0C00: sb.append("Block type: FC\r\n");
+                        break;
+                    case 0x0E00: sb.append("Block type: FB\r\n");
+                        break;
+                    default: 
+                } 
+                sb.append("Maximum number of blocks of the type: ").append(data.readShort()).append("\r\n"); ;           
+                sb.append("Maximum total size of the object to be loaded in Kbytes: ").append(data.readShort()).append("\r\n"); ;
+                sb.append("Maximum length of the work memory part of a block in bytes: ").append(data.readInt()).append("\r\n"); ;                
+            }
+        } catch (Exception ex){
+            sb.append(ex.toString());
+        }
+        return sb;
+    }
+          
+    private static StringBuilder ID_0xXY1C(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        int ssl_length = data.readShort();
+        int ssl_count = data.readShort();
+       try {
+            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");;
+            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");;
+
+            for (int i=1; i <= ssl_count; i++){
+                sb.append("Data Record: ").append(i).append("\r\n");
+                int index = data.getShort(data.readerIndex());
+                int index_b0 = data.readByte();
+                int index_b1 = data.readByte();
+                sb.append("Index: ").append(index).append("\r\n");                
+                sb.append("Index b1: ").append(index_b1).append("\r\n");
+                
+                switch(index_b1){
+                    case 0x01: 
+                    case 0x02: { 
+                        byte[] strbyte = new byte[24];
+                        data.readBytes(strbyte, 0, 24);
+                        sb.append("Name: ").append(new String(strbyte)).append("\r\n");
+                        ByteBuf  data2 = data.readSlice(8);   
+                        sb.append("Reserved: ").append(ByteBufUtil.hexDump(data2)).append("\r\n");                      
+                    };
+                        break;                        
+                    case 0x03: {
+                        byte[] strbyte = new byte[32];                        
+                        data.readBytes(strbyte, 0, 32);
+                        sb.append("Tag: ").append(new String(strbyte)).append("\r\n");                        
+                    };
+                        break;                        
+                    case 0x04: {
+                        byte[] strbyte = new byte[26];                        
+                        data.readBytes(strbyte, 0, 26);
+                        sb.append("Copyright: ").append(new String(strbyte)).append("\r\n");   
+                        ByteBuf  data2 = data.readSlice(6);   
+                        sb.append("Reserved: ").append(ByteBufUtil.hexDump(data2)).append("\r\n");                     
+                    };
+                        break;                        
+                    case 0x05: {
+                        byte[] strbyte = new byte[24];                        
+                        data.readBytes(strbyte, 0, 24);
+                        sb.append("Serial: ").append(new String(strbyte)).append("\r\n");   
+                        ByteBuf  data2 = data.readSlice(8);   
+                        sb.append("Reserved: ").append(ByteBufUtil.hexDump(data2)).append("\r\n");                         
+                    };
+                        break;                        
+                    case 0x06: {
+                        
+                    };
+                        break;                        
+                    case 0x07: {
+                        byte[] strbyte = new byte[32];                        
+                        data.readBytes(strbyte, 0, 32);
+                        sb.append("Cpu type: ").append(new String(strbyte)).append("\r\n");                          
+                    };
+                        break;                        
+                    case 0x08: {
+                        byte[] strbyte = new byte[32];                        
+                        data.readBytes(strbyte, 0, 32);
+                        sb.append("Serial mc/mmc: ").append(new String(strbyte)).append("\r\n");                         
+                    };
+                        break;                        
+                    case 0x09: {
+                        sb.append("Manufacturer ID: ").append(data.readShort()).append("\r\n");  
+                        sb.append("Profile ID: ").append(data.readShort()).append("\r\n");   
+                        sb.append("Profile specific type: ").append(data.readShort()).append("\r\n");
+                        ByteBuf  data2 = data.readSlice(26);
+                        sb.append("Reserved: ").append(ByteBufUtil.hexDump(data2)).append("\r\n");                        
+                    };
+                        break;                        
+                    case 0x0A: {
+                        byte[] strbyte = new byte[26];                        
+                        data.readBytes(strbyte, 0, 26);
+                        sb.append("OEM copyright: ").append(new String(strbyte)).append("\r\n");                        
+                        sb.append("OEM ID: ").append(data.readShort()).append("\r\n");
+                        sb.append("OEM add ID: ").append(data.readInt()).append("\r\n");
+                    };
+                        break;                        
+                    case 0x0B: {
+                        byte[] strbyte = new byte[32];                        
+                        data.readBytes(strbyte, 0, 32);
+                        sb.append("Location ID: ").append(new String(strbyte)).append("\r\n");                         
+                    };
+                        break;                        
+                    case 0x0C: {
+                        byte[] strbyte = new byte[10];                        
+                        data.readBytes(strbyte, 0, 10);
+                        sb.append("Order number sync module 1: ").append(new String(strbyte)).append("\r\n"); 
+                        data.readShort();
+                        byte[] strbyte2 = new byte[2]; 
+                        data.readBytes(strbyte2, 0, 2);
+                        sb.append("Product version: ").append(new String(strbyte2)).append("\r\n");                         
+                        data.readByte();
+                        ByteBuf  data2 = data.readSlice(17);
+                        sb.append("Vendor serial: ").append(ByteBufUtil.hexDump(data2)).append("\r\n");                         
+                    };
+                        break;                        
+                    case 0x0D: {
+                        byte[] strbyte = new byte[10];                        
+                        data.readBytes(strbyte, 0, 10);
+                        sb.append("Order number sync module 2: ").append(new String(strbyte)).append("\r\n"); 
+                        data.readShort();
+                        byte[] strbyte2 = new byte[2]; 
+                        data.readBytes(strbyte2, 0, 2);
+                        sb.append("Product version: ").append(new String(strbyte2)).append("\r\n");                         
+                        data.readByte();
+                        ByteBuf  data2 = data.readSlice(17);                        
+                        sb.append("Vendor serial: ").append(ByteBufUtil.hexDump(data2)).append("\r\n");                        
+                    };
+                        break;                        
+                    case 0x0E: {
+                        byte[] strbyte = new byte[18];                        
+                        data.readBytes(strbyte, 0, 18);
+                        sb.append("Serial number: ").append(new String(strbyte)).append("\r\n"); 
+                        ByteBuf  data2 = data.readSlice(14); 
+                        sb.append("Reserved: ").append(ByteBufUtil.hexDump(data2)).append("\r\n");                         
+                    };
+                        break;                        
+                }
+                
+            }
+        } catch (Exception ex){
+            sb.append(ex.toString());
+        }        
+        return sb;
+    }      
+    
+    private static StringBuilder ID_0xXY22(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        int ssl_length = data.readShort();
+        int ssl_count = data.readShort();        
+        
+        try {
+            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");;
+            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");;
+
+            for (int i=1; i <= ssl_count; i++){
+                sb.append("Data Record: ").append(i).append("\r\n");
+                ByteBuf  infobytes = data.readSlice(20);
+                short al1 = data.readShort();
+                short al2 = data.readShort();
+                int al3  = data.readInt();
+                sb.append("Info: ").append(ByteBufUtil.hexDump(infobytes)).append("\r\n");
+                sb.append("al 1: ").append(Integer.toHexString(al1)).append("\r\n");
+                sb.append("al 2: ").append(Integer.toHexString(al2)).append("\r\n");
+                sb.append("al 3: ").append(Integer.toHexString(al3)).append("\r\n");
+            }        
+        }catch (Exception ex){
+            sb.append(ex.toString());
+        }        
+        return sb;
+
+    }   
+    
+    private static StringBuilder ID_0xXY25(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    } 
+    
+    private static StringBuilder ID_0xXY32(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }     
+    
+    private static StringBuilder ID_0xXY71(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }     
+
+    private static StringBuilder ID_0xXY74(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        int ssl_length = data.readShort();
+        int ssl_count = data.readShort();
+        try {
+            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");
+            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");
+            for (int i=1; i <= ssl_count; i++){
+                sb.append("Data Record: ").append(i).append("\r\n");
+                int cpu_type = data.readByte();
+                int led_id = data.readByte();
+                boolean led_onoff = (data.readByte() != 0x00);
+                int led_flashing = data.readByte();
+                
+                sb.append("Rack number: ").append((cpu_type & 0x07)).append("\r\n");
+                sb.append("CPU Type: ").append((cpu_type & 0x08) == 0x00?"Standby":"Master").append("\r\n");
+                sb.append("LED ID: ").append(LED_ID.valueOf(led_id)).append(" (").append(LED_ID.valueOf(led_id).description).append(")\r\n");
+                sb.append("LED status: ").append(led_onoff).append("\r\n");
+                switch(led_flashing){
+                    case 0x00: sb.append("LED flashing: not.").append("\r\n");
+                        break; 
+                    case 0x01: sb.append("LED blinking: normally (2 Hz).").append("\r\n");
+                        break;
+                    case 0x02: sb.append("LED blinking: slowly (0.5 Hz).").append("\r\n");
+                        break;
+                    default: sb.append("LED blinking: no information.").append("\r\n");
+                }
+            }
+        } catch (Exception ex){
+            sb.append(ex.toString());
+        }
+        return sb;
+    }  
+    
+    private static StringBuilder ID_0xXY75(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }      
+    
+    private static StringBuilder ID_0xXY90(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }     
+    
+    private static StringBuilder ID_0xXY91(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }   
+    
+    private static StringBuilder ID_0xXY92(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }  
+
+    private static StringBuilder ID_0xXY94(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }     
+    
+    private static StringBuilder ID_0xXY95(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }   
+    
+    private static StringBuilder ID_0xXY96(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }      
+    
+    private static StringBuilder ID_0xXY9C(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }      
+    
+    private static StringBuilder ID_0xXYA0(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        int ssl_length = data.readShort();
+        int ssl_count = data.readShort(); 
+        
+        try{
+            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");
+            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");
+            int i = 1;
+            while(data.isReadable()){
+                sb.append("Data Record: ").append(i).append("\r\n");
+                Short  id = data.readShort();
+  
+                sb.append("ID: ").append(id).append("\r\n");  
+                ByteBuf infobytes = data.readSlice(10);
+                sb.append("Info: ").append(ByteBufUtil.hexDump(infobytes)).append("\r\n");
+                infobytes = data.readSlice(8);
+                sb.append("Timestamp: ").append(readDateAndTime(infobytes).toString()).append("\r\n");
+                sb.append("Desc: ").append(S7DiagnosticEventId.valueOf(id).getDescription()).append("\r\n");
+                i++;
+            }
+        } catch (Exception ex){
+            sb.append(ex.toString());
+        }        
+
+        return sb;
+    }      
+    
+    private static StringBuilder ID_0xXYB1(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }  
+
+    private static StringBuilder ID_0xXYB2(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }  
+
+    private static StringBuilder ID_0xXYB3(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }  
+
+    private static StringBuilder ID_0xXYB4(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }      
+    
+    /*
+     * Date and time of day (BCD coded).
+     *          +----------------+
+     * Byte n   | Year   0 to 99 |
+     *          +----------------+
+     * Byte n+1 | Month  1 to 12 |
+     *          +----------------+
+     * Byte n+2 | Day    1 to 31 |    
+     *          +----------------+
+     * Byte n+3 | Hour   0 to 23 |    
+     *          +----------------+  
+     * Byte n+4 | Minute 0 to 59 |  
+     *          +----------------+
+     * Byte n+5 | Second 0 to 59 |     
+     *          +----------------+
+     * Byte n+6 | ms    0 to 999 |
+     * Byte n+7 | X X X X X D O W|    
+     *          +----------------+    
+     * DOW: Day of weed (last 3 bits)
+    */
+    private static LocalDateTime readDateAndTime(ByteBuf data) {
+        //from Plc4XS7Protocol
+        int year=convertByteToBcd(data.readByte());
+        byte themonth = data.readByte();
+        int month=convertByteToBcd(themonth==0x00?0x01:themonth);
+        byte theday = data.readByte();
+        int day=convertByteToBcd(theday==0x00?0x01:theday);
+        int hour=convertByteToBcd(data.readByte());
+        int minute=convertByteToBcd(data.readByte());
+        int second=convertByteToBcd(data.readByte());        
+        int milliseconds = (data.readShort() & 0xfff0) >> 4;
+        
+        int cen = ((milliseconds & 0x0f00) >> 8) * 100;
+        int dec = ((milliseconds & 0x00f0) >> 4) * 10;
+        milliseconds = cen + dec + (milliseconds & 0x000f);
+        int nanoseconds = milliseconds * 1000000;
+        
+        //data-type ranges from 1990 up to 2089
+        if(year>=90){
+            year+=1900;
+        }
+        else{
+            year+=2000;
+        }
+        
+        return LocalDateTime.of(year,month,day,hour,minute,second, nanoseconds);
+    }    
+    
+    
+   /**
+     * converts incoming byte to an integer regarding used BCD format
+     * @param incomingByte
+     * @return converted BCD number
+     */
+    private static int convertByteToBcd(byte incomingByte) {
+        int dec = (incomingByte >> 4) * 10;
+        return dec + (incomingByte & 0x0f);
+    }    
+
+        
+}
+
+
+
+
 }

From d81d405ab5c9e66a9ae1e06a2da026cf88d29e10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= <cesarjosegl@gmail.com>
Date: Mon, 9 Mar 2020 15:08:19 -0400
Subject: [PATCH 10/17] Modified the message delivery. STRINGS management, BITS
 fixes and missing S7 types.

---
 .../java/api/messages/PlcReadResponse.java    |  11 +
 .../java/api/messages/PlcWriteRequest.java    |   3 +
 .../java/s7/connection/S7PlcConnection.java   |   5 +-
 .../connection/DefaultPlcFieldHandler.java    |   5 +
 .../java/base/connection/PlcFieldHandler.java |   2 +
 .../base/messages/DefaultPlcReadResponse.java |  34 +
 .../base/messages/DefaultPlcWriteRequest.java |  41 +-
 .../messages/items/BaseDefaultFieldItem.java  |  14 +-
 .../messages/items/DefaultByteFieldItem.java  |   3 +-
 .../items/DefaultDurationFieldItem.java       |  54 ++
 .../items/DefaultIntegerFieldItem.java        |  15 +-
 .../items/DefaultLocalDateFieldItem.java      |   8 +-
 .../items/DefaultLocalTimeFieldItem.java      |   8 +-
 .../items/DefaultStringFieldItem.java         |  11 +
 .../apache/plc4x/java/s7/model/S7Field.java   |  22 +-
 .../plc4x/java/s7/netty/Plc4XS7Protocol.java  | 584 +++++++++++-----
 .../plc4x/java/s7/netty/S7Protocol.java       |  67 +-
 .../plc4x/java/s7/netty/events/S7Alarm.java   |  29 +
 .../model/messages/S7RequestMessage.java      |  33 +-
 .../s7/netty/model/types/TransportSize.java   |  24 +-
 .../strategies/DefaultS7MessageProcessor.java |  44 +-
 .../LongS7MessageProcessorCodec.java          | 655 ++++++++++++++++++
 .../java/s7/netty/util/S7PlcFieldHandler.java | 122 +++-
 .../netty/util/S7ResponseSizeEstimator.java   |  14 +-
 .../java/s7/netty/util/S7SizeHelper.java      |   6 +
 .../java/s7/protocol/S7ByteReadResponse.java  |  26 +
 .../java/s7/protocol/event/S7AlarmEvent.java  |  29 +
 .../java/s7/protocol/event/S7ModeEvent.java   |  26 +
 .../java/s7/protocol/event/S7SysEvent.java    |  26 +
 .../utils/{S7SslHelper.java => S7Helper.java} | 203 +++++-
 30 files changed, 1882 insertions(+), 242 deletions(-)
 create mode 100644 plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultDurationFieldItem.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/LongS7MessageProcessorCodec.java
 rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/{S7SslHelper.java => S7Helper.java} (87%)

diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadResponse.java
index e160b166708..82d6e655335 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadResponse.java
@@ -20,6 +20,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -170,6 +171,16 @@ public interface PlcReadResponse extends PlcFieldResponse {
     LocalDateTime getDateTime(String name, int index);
 
     Collection<LocalDateTime> getAllDateTimes(String name);
+    
+    boolean isValidDuration(String name);
+
+    boolean isValidDuration(String name, int index);    
+    
+    Duration getDuration(String name);
+
+    Duration getDuration(String name, int index);
+
+    Collection<Duration> getAllDuration(String name);    
 
     boolean isValidByteArray(String name);
 
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java
index 95de45872eb..5d5a494299f 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java
@@ -20,6 +20,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -62,6 +63,8 @@ interface Builder extends PlcRequestBuilder {
         PlcWriteRequest.Builder addItem(String name, String fieldQuery, LocalDate... values);
 
         PlcWriteRequest.Builder addItem(String name, String fieldQuery, LocalDateTime... values);
+        
+        PlcWriteRequest.Builder addItem(String name, String fieldQuery, Duration... values);        
 
         PlcWriteRequest.Builder addItem(String name, String fieldQuery, byte[]... values);
 
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
index 0a214df8187..4e3b8c589d2 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
@@ -78,7 +78,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterSubFunctionGroup;
 import org.apache.plc4x.java.s7.netty.model.types.MemoryArea;
 import org.apache.plc4x.java.s7.netty.model.types.SubscribedEventType;
-import org.apache.plc4x.java.s7.netty.strategies.DefaultS7MessageProcessor;
+import org.apache.plc4x.java.s7.netty.strategies.LongS7MessageProcessorCodec;
 import org.apache.plc4x.java.s7.netty.util.S7PlcFieldEventHandler;
 import org.apache.plc4x.java.s7.netty.util.S7PlcFieldHandler;
 import org.apache.plc4x.java.s7.protocol.S7CyclicServicesSubscriptionHandle;
@@ -263,7 +263,8 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
                 pipeline.addLast(new IsoOnTcpProtocol());
                 pipeline.addLast(new IsoTPProtocol(callingTsapId, calledTsapId, TpduSize.valueForGivenSize(paramPduSize)));
                 pipeline.addLast(new S7Protocol(paramMaxAmqCaller, paramMaxAmqCallee, paramPduSize, paramControllerType,
-                    new DefaultS7MessageProcessor()));
+                    null)); //null <-> new DefaultS7MessageProcessor()
+                pipeline.addLast(new LongS7MessageProcessorCodec());
                 pipeline.addLast(new Plc4XS7Protocol(alarmsqueue));
             }
         };
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/DefaultPlcFieldHandler.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/DefaultPlcFieldHandler.java
index 6b90bab98a5..70dcd03633e 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/DefaultPlcFieldHandler.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/DefaultPlcFieldHandler.java
@@ -93,6 +93,11 @@ public BaseDefaultFieldItem encodeDate(PlcField field, Object[] values) {
     public BaseDefaultFieldItem encodeDateTime(PlcField field, Object[] values) {
         throw new PlcRuntimeException("Invalid encoder for type " + field);
     }
+    
+    @Override
+    public BaseDefaultFieldItem encodeDuration(PlcField field, Object[] values) {
+        throw new PlcRuntimeException("Invalid encoder for type " + field);
+    }    
 
     @Override
     public BaseDefaultFieldItem encodeByteArray(PlcField field, Object[] values) {
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/PlcFieldHandler.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/PlcFieldHandler.java
index 146e6850bc4..b83d29f90b8 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/PlcFieldHandler.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/PlcFieldHandler.java
@@ -54,6 +54,8 @@ public interface PlcFieldHandler {
     BaseDefaultFieldItem encodeDate(PlcField field, Object[] values);
 
     BaseDefaultFieldItem encodeDateTime(PlcField field, Object[] values);
+    
+    BaseDefaultFieldItem encodeDuration(PlcField field, Object[] values);    
 
     BaseDefaultFieldItem encodeByteArray(PlcField field, Object[] values);
 
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadResponse.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadResponse.java
index 42dacf137b8..035cf89b524 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadResponse.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadResponse.java
@@ -20,6 +20,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -531,6 +532,39 @@ public Collection<LocalDateTime> getAllDateTimes(String name) {
         return values;
     }
 
+    @Override
+    public boolean isValidDuration(String name) {
+        return isValidDuration(name, 0);
+    }
+
+    @Override
+    public boolean isValidDuration(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.isValidDateTime(index);        
+    }
+
+    @Override
+    public Duration getDuration(String name) {
+        return getDuration(name, 0);
+    }
+
+    @Override
+    public Duration getDuration(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.getDuration(index);
+    }
+
+    @Override
+    public Collection<Duration> getAllDuration(String name) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        int num = fieldInternal.getNumberOfValues();
+        List<Duration> values = new ArrayList<>(num);
+        for (int i = 0; i < num; i++) {
+            values.add(fieldInternal.getDuration(i));
+        }
+        return values;
+    }
+
     @Override
     public boolean isValidByteArray(String name) {
         BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java
index 641bc7eb5f0..af74e05d2b5 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java
@@ -18,18 +18,9 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.plc4x.java.base.messages;
 
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.commons.lang3.tuple.Triple;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.messages.PlcWriteResponse;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.connection.PlcFieldHandler;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -37,6 +28,15 @@ Licensed to the Apache Software Foundation (ASF) under one
 import java.util.concurrent.CompletableFuture;
 import java.util.function.BiFunction;
 import java.util.stream.Collectors;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.commons.lang3.tuple.Triple;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteResponse;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.connection.PlcFieldHandler;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
 
 public class DefaultPlcWriteRequest implements InternalPlcWriteRequest, InternalPlcFieldRequest {
 
@@ -126,20 +126,23 @@ public Builder(PlcWriter writer, PlcFieldHandler fieldHandler) {
             fields = new TreeMap<>();
             handlerMap = new HashMap<>();
             handlerMap.put(Boolean.class, fieldHandler::encodeBoolean);
-            handlerMap.put(Byte.class, fieldHandler::encodeByte);
+            handlerMap.put(Byte.class, fieldHandler::encodeByte);            
             handlerMap.put(Short.class, fieldHandler::encodeShort);
-            handlerMap.put(Integer.class, fieldHandler::encodeInteger);
+            handlerMap.put(Integer.class, fieldHandler::encodeInteger);            
             handlerMap.put(BigInteger.class, fieldHandler::encodeBigInteger);
             handlerMap.put(Long.class, fieldHandler::encodeLong);
             handlerMap.put(Float.class, fieldHandler::encodeFloat);
             handlerMap.put(Double.class, fieldHandler::encodeDouble);
             handlerMap.put(BigDecimal.class, fieldHandler::encodeBigDecimal);
+            handlerMap.put(Character.class, fieldHandler::encodeString);
             handlerMap.put(String.class, fieldHandler::encodeString);
             handlerMap.put(LocalTime.class, fieldHandler::encodeTime);
             handlerMap.put(LocalDate.class, fieldHandler::encodeDate);
             handlerMap.put(LocalDateTime.class, fieldHandler::encodeDateTime);
-            handlerMap.put(byte[].class, fieldHandler::encodeByteArray);
-            handlerMap.put(Byte[].class, fieldHandler::encodeByteArray);
+            handlerMap.put(Duration.class, fieldHandler::encodeDuration);
+            //handlerMap.put(byte[].class, fieldHandler::encodeByteArray);
+            //handlerMap.put(Byte[].class, fieldHandler::encodeByteArray);
+            //handlerMap.put(Object[].class, fieldHandler::encodeByteArray);
         }
 
         @Override
@@ -186,7 +189,7 @@ public Builder addItem(String name, String fieldQuery, Double... values) {
         public Builder addItem(String name, String fieldQuery, BigDecimal... values) {
             return addItem(name, fieldQuery, values, fieldHandler::encodeBigDecimal);
         }
-
+      
         @Override
         public Builder addItem(String name, String fieldQuery, String... values) {
             return addItem(name, fieldQuery, values, fieldHandler::encodeString);
@@ -206,6 +209,11 @@ public Builder addItem(String name, String fieldQuery, LocalDate... values) {
         public Builder addItem(String name, String fieldQuery, LocalDateTime... values) {
             return addItem(name, fieldQuery, values, fieldHandler::encodeDateTime);
         }
+        
+        @Override
+        public Builder addItem(String name, String fieldQuery, Duration... values) {
+            return addItem(name, fieldQuery, values, fieldHandler::encodeDuration);
+        }        
 
         @Override
         public Builder addItem(String name, String fieldQuery, byte[]... values) {
@@ -216,6 +224,9 @@ public Builder addItem(String name, String fieldQuery, byte[]... values) {
         public Builder addItem(String name, String fieldQuery, Byte[]... values) {
             return addItem(name, fieldQuery, values, fieldHandler::encodeByteArray);
         }
+      
+        //@Override
+     
 
         @Override
         public <T> Builder addItem(String name, String fieldQuery, T... values) {
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/BaseDefaultFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/BaseDefaultFieldItem.java
index 4abcda54689..24c6d2868be 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/BaseDefaultFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/BaseDefaultFieldItem.java
@@ -18,16 +18,16 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.plc4x.java.base.messages.items;
 
-import org.apache.plc4x.java.api.exceptions.PlcFieldRangeException;
-import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
-
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.Arrays;
 import java.util.Objects;
+import org.apache.plc4x.java.api.exceptions.PlcFieldRangeException;
+import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
 
 public abstract class BaseDefaultFieldItem<T> {
 
@@ -146,6 +146,14 @@ public boolean isValidDateTime(int index) {
     public LocalDateTime getDateTime(int index) {
         throw new PlcIncompatibleDatatypeException(LocalDateTime.class, index);
     }
+    
+    public boolean isValidDuration(int index) {
+        return false;
+    }
+
+    public Duration getDuration(int index) {
+        throw new PlcIncompatibleDatatypeException(LocalDateTime.class, index);
+    }    
 
     public boolean isValidByteArray(int index) {
         return false;
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultByteFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultByteFieldItem.java
index 6e00e83f29e..2eb7ccf4050 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultByteFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultByteFieldItem.java
@@ -18,10 +18,9 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.plc4x.java.base.messages.items;
 
-import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
-
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
 
 public class DefaultByteFieldItem extends BaseDefaultFieldItem<Byte> {
 
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultDurationFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultDurationFieldItem.java
new file mode 100644
index 00000000000..542fd70496f
--- /dev/null
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultDurationFieldItem.java
@@ -0,0 +1,54 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.messages.items;
+
+import java.time.Duration;
+import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class DefaultDurationFieldItem extends BaseDefaultFieldItem<Duration> {
+
+    public DefaultDurationFieldItem(Duration... values) {
+        super(values);
+    }
+    
+    @Override
+    public Object getObject(int index) {
+        return getValue(index);
+    }
+
+    @Override
+    public boolean isValidDuration(int index) {
+        return getValue(index) != null;
+    }  
+        
+    @Override
+    public Duration getDuration(int index) {
+        if (!isValidDuration(index)) {
+            throw new PlcIncompatibleDatatypeException(Duration.class, index);
+        }
+        return getValue(index);
+    }    
+    
+    
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultIntegerFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultIntegerFieldItem.java
index f998a7bdfdf..6d59c102756 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultIntegerFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultIntegerFieldItem.java
@@ -18,17 +18,17 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.plc4x.java.base.messages.items;
 
-import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
-
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.time.LocalTime;
+import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
 
 public class DefaultIntegerFieldItem extends BaseDefaultFieldItem<Integer> {
 
     public DefaultIntegerFieldItem(Integer... values) {
         super(values);
     }
-
+   
     @Override
     public Object getObject(int index) {
         return getValue(index);
@@ -149,5 +149,14 @@ public BigDecimal getBigDecimal(int index) {
         return new BigDecimal(getValue(index));
     }
 
+    @Override
+    public LocalTime getTime(int index) {
+        System.out.println("DefaultIntegerFieldItem: getTime");
+        return super.getTime(index); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    
+    
+    
 }
 
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLocalDateFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLocalDateFieldItem.java
index 70cb68c7ef8..aaf6f215696 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLocalDateFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLocalDateFieldItem.java
@@ -18,9 +18,8 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.plc4x.java.base.messages.items;
 
-import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
-
 import java.time.LocalDate;
+import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
 
 public class DefaultLocalDateFieldItem extends BaseDefaultFieldItem<LocalDate> {
 
@@ -38,6 +37,11 @@ public boolean isValidDate(int index) {
         return getValue(index) != null;
     }
 
+    @Override
+    public Short getShort(int index) {
+        return super.getShort(index); 
+    }
+    
     @Override
     public LocalDate getDate(int index) {
         if (!isValidDate(index)) {
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLocalTimeFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLocalTimeFieldItem.java
index 59c7d8b57b2..15f45930ec6 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLocalTimeFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLocalTimeFieldItem.java
@@ -18,9 +18,8 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.plc4x.java.base.messages.items;
 
-import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
-
 import java.time.LocalTime;
+import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
 
 public class DefaultLocalTimeFieldItem extends BaseDefaultFieldItem<LocalTime> {
 
@@ -38,6 +37,11 @@ public boolean isValidTime(int index) {
         return getValue(index) != null;
     }
 
+    @Override
+    public Integer getInteger(int index) {             
+        return super.getInteger(index);
+    }
+                       
     @Override
     public LocalTime getTime(int index) {
         if (!isValidTime(index)) {
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultStringFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultStringFieldItem.java
index ee443196e5a..35b5ded4439 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultStringFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultStringFieldItem.java
@@ -31,11 +31,22 @@ public Object getObject(int index) {
         return getValue(index);
     }
 
+    @Override
+    public boolean isValidByte(int index) {
+        return getValue(index) != null; 
+    }
+   
     @Override
     public boolean isValidString(int index) {
         return getValue(index) != null;
     }
 
+    @Override
+    public Byte getByte(int index) {
+        return (byte) ((String) getValue(index)).charAt(0);
+    }
+    
+    
     @Override
     public String getString(int index) {
         if (!isValidString(index)) {
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java
index f3a3de06da1..d132c6fc02b 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java
@@ -18,6 +18,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.plc4x.java.s7.model;
 
+import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -33,11 +34,12 @@ public class S7Field implements PlcField {
 
     //byteOffset theoretically can reach up to 2097151 ... see checkByteOffset() below --> 7digits
     private static final Pattern ADDRESS_PATTERN =
-        Pattern.compile("^%(?<memoryArea>.)(?<transferSizeCode>[XBWD]?)(?<byteOffset>\\d{1,7})(.(?<bitOffset>[0-7]))?:(?<dataType>[a-zA-Z_]+)(\\[(?<numElements>\\d+)])?");
+        Pattern.compile("^%(?<memoryArea>.)(?<transferSizeCode>[XBWD]?)(?<byteOffset>\\d{1,7})(.(?<bitOffset>[0-7]))?:(?<dataType>[a-zA-Z_5][S5TIME]+)(\\[(?<numElements>\\d+)])?");
 
     //blockNumber usually has its max hat around 64000 --> 5digits
+    //TODO: S5TIME non include;
     private static final Pattern DATA_BLOCK_ADDRESS_PATTERN =
-        Pattern.compile("^%DB(?<blockNumber>\\d{1,5}).DB(?<transferSizeCode>[XBWD]?)(?<byteOffset>\\d{1,7})(.(?<bitOffset>[0-7]))?:(?<dataType>[a-zA-Z_]+)(\\[(?<numElements>\\d+)])?");
+        Pattern.compile("^%DB(?<blockNumber>\\d{1,5}).DB(?<transferSizeCode>[XBWD]?)(?<byteOffset>\\d{1,7})(.(?<bitOffset>[0-7]))?:(?<dataType>[a-zA-Z_5]+)(\\[(?<numElements>\\d+)])?");
                 
     private static final String DATA_TYPE = "dataType";
     private static final String TRANSFER_SIZE_CODE = "transferSizeCode";
@@ -121,8 +123,13 @@ public Class<?> getDefaultJavaType() {
                 return LocalDateTime.class;
             case DATE:
                 return LocalDate.class;
+            case S5TIME:
+                return Duration.class;
+            case TIME:
+                return Duration.class;
+            case TOD:
             case TIME_OF_DAY:
-                return LocalTime.class;
+                return LocalTime.class;                
             default:
                 throw new NotImplementedException("The response type for datatype " + dataType + " is not yet implemented");
         }
@@ -174,7 +181,12 @@ public static S7Field of(String fieldString) {
                 if(matcher.group(NUM_ELEMENTS) != null) {
                     numElements = Integer.parseInt(matcher.group(NUM_ELEMENTS));
                 }
+                
                 numElements = calcNumberOfElementsForIndividualTypes(numElements,dataType);
+                if(dataType.equals(TransportSize.STRING)){
+                    numElements  = 1;
+                }
+                
                 if(!transferSizeCode.isEmpty() && !dataType.getSizeCode().equals(transferSizeCode)) {
                     throw new PlcInvalidFieldException("Transfer size code '" + transferSizeCode +
                         "' doesn't match specified data type '" + dataType.name() + "'");
@@ -219,8 +231,10 @@ private static int checkByteOffset(int byteOffset){
      * @param dataType detected Transport-Size that represents the data-type
      * @return corrected numElements if nessesary
      */
+    //TODO: 
     private static int calcNumberOfElementsForIndividualTypes(int numElements, TransportSize dataType){
-
+        
+        //TODO: for this version STRING is write like CHAR
         if(dataType.equals(TransportSize.STRING)){
             //on valid String-length add two byte because of S7-representation of Strings
             if(numElements>1 && numElements<=254){
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
index 1140cc941ed..a33b6d63dc2 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
@@ -19,10 +19,11 @@ Licensed to the Apache Software Foundation (ASF) under one
 package org.apache.plc4x.java.s7.netty;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
+import io.netty.buffer.PooledByteBufAllocator;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.AttributeKey;
 import java.io.IOException;
 import java.lang.reflect.Array;
 import java.math.BigInteger;
@@ -32,7 +33,6 @@ Licensed to the Apache Software Foundation (ASF) under one
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -90,6 +90,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.s7.protocol.S7ByteReadResponse;
 import org.apache.plc4x.java.s7.protocol.S7CyclicServicesSubscriptionHandle;
 import org.apache.plc4x.java.s7.protocol.S7DiagnosticSubscriptionHandle;
+import org.apache.plc4x.java.s7.utils.S7Helper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -105,14 +106,25 @@ Licensed to the Apache Software Foundation (ASF) under one
 public class Plc4XS7Protocol extends PlcMessageToMessageCodec<S7Message, PlcRequestContainer> {
     private static final Logger logger = LoggerFactory.getLogger( Plc4XS7Protocol.class );
 
-    private static final AtomicInteger tpduGenerator = new AtomicInteger(10);
+    public static final AtomicInteger tpduGenerator = new AtomicInteger(10);
+    private final AttributeKey<AtomicInteger> tpduGeneratorKey = AttributeKey.valueOf("tpduGeneratorKey");
 
     private Map<Short, PlcRequestContainer> requests;
     
+    /* 
+     * Each layer of Netty must do its work, it sends the Requests and must 
+     * verify the answers.
+     * Special case of the array bits, I need to know if additional messages 
+     * were created.
+     * Key:Tpdu, Left:Item row, Rigth: Num of Items created-1
+    */
+    private final  Map<Short, Map<Short, Integer>> requestBitArray;
+    
     private final BlockingQueue<S7PushMessage> alarmsqueue;
 
     public Plc4XS7Protocol() {
         this.requests = new HashMap<>();
+        this.requestBitArray = new HashMap<>();      
         this.alarmsqueue = null;
     }
     /*
@@ -121,12 +133,11 @@ public Plc4XS7Protocol() {
     */
     public Plc4XS7Protocol(BlockingQueue<S7PushMessage> alarmsqueue) {
         this.requests = new HashMap<>();
+        this.requestBitArray = new HashMap<>();
         //We need check the device here
         this.alarmsqueue = alarmsqueue;
     }
-    
-    
-
+        
     /**
      * If this protocol layer catches an {@link S7ConnectedEvent} from the protocol layer beneath,
      * the connection establishment is finished.
@@ -137,6 +148,7 @@ public Plc4XS7Protocol(BlockingQueue<S7PushMessage> alarmsqueue) {
      */
     @Override
     public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+        ctx.channel().attr(tpduGeneratorKey).set(tpduGenerator);
         if (evt instanceof S7ConnectedEvent) {
             ctx.channel().pipeline().fireUserEventTriggered(new ConnectedEvent());
         } else {
@@ -566,6 +578,9 @@ private void encodeReadRequest(PlcRequestContainer msg, List<Object> out) throws
 
         PlcReadRequest readRequest = (PlcReadRequest) msg.getRequest();
         
+        Short itemRow = 0;
+        Short tpdu = (short) tpduGenerator.getAndIncrement();
+        
         for (String fieldName : readRequest.getFieldNames()) {
             PlcField field = readRequest.getField(fieldName);
             
@@ -579,19 +594,36 @@ private void encodeReadRequest(PlcRequestContainer msg, List<Object> out) throws
                 }
 
                 S7Field s7Field = (S7Field) field;
+                if(!(readRequest instanceof DefaultPlcReadRequest)) {
+                    throw new PlcException("The writeRequest should have been of type DefaultPlcWriteRequest");
+                }
+                
+                if (s7Field.getDataType() == TransportSize.BOOL){
+                    encodeWriteRequestBitFieldAndArray( tpdu,
+                            itemRow,
+                            null,
+                            s7Field, 
+                            parameterItems, 
+                            Collections.EMPTY_LIST);                                         
+                } else {
+                
+                    VarParameterItem varParameterItem = new S7AnyVarParameterItem(
+                        SpecificationType.VARIABLE_SPECIFICATION, s7Field.getMemoryArea(),
+                        s7Field.getDataType(),
+                        s7Field.getNumElements(), s7Field.getBlockNumber(), s7Field.getByteOffset(), (byte) s7Field.getBitOffset());
+                    parameterItems.add(varParameterItem);
+                }
+                
 
-                VarParameterItem varParameterItem = new S7AnyVarParameterItem(
-                    SpecificationType.VARIABLE_SPECIFICATION, s7Field.getMemoryArea(),
-                    s7Field.getDataType(),
-                    s7Field.getNumElements(), s7Field.getBlockNumber(), s7Field.getByteOffset(), (byte) s7Field.getBitOffset());
-                parameterItems.add(varParameterItem);
             }
+            itemRow++;
         }
+        
         VarParameter readVarParameter = new VarParameter(ParameterType.READ_VAR, parameterItems);
 
         // Assemble the request.
         S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.JOB,
-            (short) tpduGenerator.getAndIncrement(), Collections.singletonList(readVarParameter),
+            tpdu, Collections.singletonList(readVarParameter),
             Collections.emptyList(), msg);
 
         requests.put(s7ReadRequest.getTpduReference(), msg);
@@ -614,12 +646,15 @@ private void encodeSslReadRequest(PlcRequestContainer msg, S7SslField sslfield,
         out.add(szlRequestMessage);        
     }    
     
-    
+    // TODO: 
     private void encodeWriteRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
         List<VarParameterItem> parameterItems = new LinkedList<>();
         List<VarPayloadItem> payloadItems = new LinkedList<>();
 
         PlcWriteRequest writeRequest = (PlcWriteRequest) msg.getRequest();
+        
+        Short itemRow = 0;
+        Short tpdu = (short) tpduGenerator.getAndIncrement();
         for (String fieldName : writeRequest.getFieldNames()) {
             PlcField field = writeRequest.getField(fieldName);
             if (!(field instanceof S7Field)) {
@@ -634,106 +669,206 @@ private void encodeWriteRequest(PlcRequestContainer msg, List<Object> out) throw
             // The number of elements provided in the request must match the number defined in the field, or
             // bad things are going to happen.
             // An exception is STRINGS, as they are implemented as byte arrays
+            // TODO: Calculate the number of correct elements for a "STRING", 
+            //       since it will be written to the PLC as a string of "CHAR" elements.
             if (s7Field.getDataType() != TransportSize.STRING &&
                 writeRequest.getNumberOfValues(fieldName) != s7Field.getNumElements()) {
                 throw new PlcException("The number of values provided doesn't match the number specified by the field.");
             }
-            VarParameterItem varParameterItem = new S7AnyVarParameterItem(
-                SpecificationType.VARIABLE_SPECIFICATION, s7Field.getMemoryArea(),
-                s7Field.getDataType(),
-                s7Field.getNumElements(), s7Field.getBlockNumber(), s7Field.getByteOffset(), (byte) s7Field.getBitOffset());
-            parameterItems.add(varParameterItem);
+            
+            //TODO: Bit Arrays: One item request for every bit
+            
+            if (s7Field.getDataType() == TransportSize.BOOL) {
+                
+                encodeWriteRequestBitFieldAndArray( tpdu,
+                        itemRow,
+                        fieldItem,
+                        s7Field, 
+                        parameterItems, 
+                        payloadItems);            
+                
+            } else {
 
-            DataTransportSize dataTransportSize = s7Field.getDataType().getDataTransportSize();
+                VarParameterItem varParameterItem = new S7AnyVarParameterItem(
+                    SpecificationType.VARIABLE_SPECIFICATION, s7Field.getMemoryArea(),
+                    s7Field.getDataType(),
+                    (s7Field.getDataType() == TransportSize.STRING)?fieldItem.getString(0).length()+2:s7Field.getNumElements(), 
+                    s7Field.getBlockNumber(), 
+                    s7Field.getByteOffset(),
+                    (byte) s7Field.getBitOffset());
 
-            // TODO: Checkout if the payload items are sort of a flatMap of all request items.
-            byte[] byteData;
-            switch(s7Field.getDataType()) {
-                // -----------------------------------------
-                // Bit
-                // -----------------------------------------
-                case BOOL:
-                    byteData = encodeWriteRequestBitField(fieldItem);
-                    break;
-                // -----------------------------------------
-                // Signed integer values
-                // -----------------------------------------
-                case BYTE:
-                case SINT:
-                case CHAR:  // 1 byte
-                    byteData = encodeWriteRequestByteField(fieldItem, true);
-                    break;
-                case WORD:
-                case INT:
-                case WCHAR:  // 2 byte (16 bit)
-                    byteData = encodeWriteRequestShortField(fieldItem, true);
-                    break;
-                case DWORD:
-                case DINT:  // 4 byte (32 bit)
-                    byteData = encodeWriteRequestIntegerField(fieldItem, true);
-                    break;
-                case LWORD:
-                case LINT:  // 8 byte (64 bit)
-                    byteData = encodeWriteRequestLongField(fieldItem, true);
-                    break;
-                // -----------------------------------------
-                // Unsigned integer values
-                // -----------------------------------------
-                // 8 bit:
-                case USINT:
-                    byteData = encodeWriteRequestByteField(fieldItem, false);
-                    break;
-                // 16 bit:
-                case UINT:
-                    byteData = encodeWriteRequestShortField(fieldItem, false);
-                    break;
-                // 32 bit:
-                case UDINT:
-                    byteData = encodeWriteRequestIntegerField(fieldItem, false);
-                    break;
-                // 64 bit:
-                case ULINT:
-                    byteData = encodeWriteRequestLongField(fieldItem, false);
-                    break;
-                // -----------------------------------------
-                // Floating point values
-                // -----------------------------------------
-                case REAL:
-                    byteData = encodeWriteRequestFloatField(fieldItem);
-                    break;
-                case LREAL:
-                    byteData = encodeWriteRequestDoubleField(fieldItem);
-                    break;
-                // -----------------------------------------
-                // Characters & Strings
-                // -----------------------------------------
-                case STRING:
-                    byteData = encodeWriteRequestStringField(fieldItem, false);
-                    break;
-                case WSTRING:
-                    byteData = encodeWriteRequestStringField(fieldItem, true);
-                    break;
-                default:
-                    throw new PlcProtocolException("Unsupported type " + s7Field.getDataType());
-            }
+                parameterItems.add(varParameterItem);
 
-            VarPayloadItem varPayloadItem = new VarPayloadItem(
+                DataTransportSize dataTransportSize = s7Field.getDataType().getDataTransportSize();
+
+                // TODO: Checkout if the payload items are sort of a flatMap of all request items.
+                byte[] byteData = null;
+                switch(s7Field.getDataType()) {
+                    // -----------------------------------------
+                    // Bit
+                    // -----------------------------------------
+                    case BOOL:
+                        //byteData = encodeWriteRequestBitField(fieldItem);
+                        break;
+                    // -----------------------------------------
+                    // Signed integer values
+                    // -----------------------------------------
+                    case BYTE:
+                    case SINT:
+                    case CHAR:  // 1 byte
+                        byteData = encodeWriteRequestByteField(fieldItem, true);
+                        break;                
+                    case WORD:
+                    case INT:
+                    case WCHAR:  // 2 byte (16 bit)
+                        byteData = encodeWriteRequestShortField(fieldItem, true);
+                        break;
+                    case DWORD:
+                    case DINT:  // 4 byte (32 bit)
+                        byteData = encodeWriteRequestIntegerField(fieldItem, true);
+                        break;
+                    case LWORD:
+                    case LINT:  // 8 byte (64 bit)
+                        byteData = encodeWriteRequestLongField(fieldItem, true);
+                        break;
+                    // -----------------------------------------
+                    // Unsigned integer values
+                    // -----------------------------------------
+                    // 8 bit:
+                    case USINT:
+                        byteData = encodeWriteRequestByteField(fieldItem, false);
+                        break;
+                    // 16 bit:
+                    case UINT:
+                        byteData = encodeWriteRequestShortField(fieldItem, false);
+                        break;
+                    // 32 bit:
+                    case UDINT:
+                        byteData = encodeWriteRequestIntegerField(fieldItem, false);
+                        break;
+                    // 64 bit:
+                    case ULINT:
+                        byteData = encodeWriteRequestLongField(fieldItem, false);
+                        break;
+                    // -----------------------------------------
+                    // Floating point values
+                    // -----------------------------------------
+                    case REAL:
+                        byteData = encodeWriteRequestFloatField(fieldItem);
+                        break;
+                    case LREAL:
+                        byteData = encodeWriteRequestDoubleField(fieldItem);
+                        break;
+                    // -----------------------------------------
+                    // Characters & Strings
+                    // -----------------------------------------
+                    case STRING:
+                        byteData = encodeWriteRequestStringField(fieldItem, false);
+                        break;
+                    case WSTRING:
+                        byteData = encodeWriteRequestStringField(fieldItem, true);
+                        break;
+                    // -----------------------------------------
+                    // Date & Time
+                    // -----------------------------------------
+                    case S5TIME:
+                        byteData = encodeWriteRequestS5TimeField(fieldItem, false);
+                        break;
+                    case TIME:  // 4 byte (32 bit)
+                        byteData = encodeWriteRequestTimeField(fieldItem, false);
+                        break;
+                    case TOD:
+                    case TIME_OF_DAY:
+                        byteData = encodeWriteRequestTodField(fieldItem, true);
+                        break;
+                    case DATE:  // 2 byte (16 bit)
+                        byteData = encodeWriteRequestDateField(fieldItem, true);
+                        break; 
+                    case DT:                        
+                    case DATE_AND_TIME:  // 8 byte (64 bit)
+                        byteData = encodeWriteRequestDateTimeField(fieldItem, true);
+                        break;                    
+                    default:
+                        throw new PlcProtocolException("Unsupported type.. " + s7Field.getDataType());
+                }
+
+                VarPayloadItem varPayloadItem = new VarPayloadItem(
                 DataTransportErrorCode.RESERVED, dataTransportSize, byteData);
 
-            payloadItems.add(varPayloadItem);
-        }
+                payloadItems.add(varPayloadItem);
+            }
+            itemRow++;
+        };
+        
         VarParameter writeVarParameter = new VarParameter(ParameterType.WRITE_VAR, parameterItems);
         VarPayload writeVarPayload = new VarPayload(ParameterType.WRITE_VAR, payloadItems);
 
         // Assemble the request.
         S7RequestMessage s7WriteRequest = new S7RequestMessage(MessageType.JOB,
-            (short) tpduGenerator.getAndIncrement(), Collections.singletonList(writeVarParameter),
+            tpdu, Collections.singletonList(writeVarParameter),
             Collections.singletonList(writeVarPayload), msg);
 
         requests.put(s7WriteRequest.getTpduReference(), msg);
 
         out.add(s7WriteRequest);
     }
+    
+    
+    void encodeWriteRequestBitFieldAndArray(Short tpdu,
+            Short itemRow,
+            BaseDefaultFieldItem fieldItem,
+            S7Field s7Field, 
+            List<VarParameterItem> parameterItems, 
+            List<VarPayloadItem> payloadItems){
+        
+        int curParameterByteOffset = s7Field.getByteOffset();
+        byte curParameterBitOffset = (byte) s7Field.getBitOffset();
+        byte curPayloadBitOffset = 0; 
+        
+        //Only BITS arrays
+        if (s7Field.getNumElements() > 1) {
+            requestBitArray.computeIfAbsent(tpdu, 
+                    k->new HashMap()).put(itemRow,s7Field.getNumElements()-1);
+        }
+
+        for (int i = 0; i < s7Field.getNumElements(); i++) {
+
+            VarParameterItem varParameterItem = new S7AnyVarParameterItem(
+                SpecificationType.VARIABLE_SPECIFICATION, s7Field.getMemoryArea(),
+                s7Field.getDataType(),
+                (short) 1, 
+                s7Field.getBlockNumber(), 
+                curParameterByteOffset,
+                curParameterBitOffset);
+
+            // Create a one-byte byte array and set it to 0x01, if the corresponding bit
+            // was 1 else set it to 0x00.
+            byte[] elementData = new byte[1];
+                                   
+            parameterItems.add(varParameterItem);
+            
+            if (!(payloadItems == Collections.EMPTY_LIST)){
+                elementData[0] = (byte) (fieldItem.getBoolean(i)?0x01:0x00);                  
+                VarPayloadItem itemPayload = new VarPayloadItem(
+                    DataTransportErrorCode.RESERVED,
+                    s7Field.getDataType().getDataTransportSize(),
+                        elementData);            
+                payloadItems.add(itemPayload);
+            }
+            
+            // Calculate the new memory and bit offset.
+            curParameterBitOffset++;
+            if ((i > 0) && ((curParameterBitOffset % 8) == 0)) {
+                curParameterByteOffset++;
+                curParameterBitOffset = 0;
+            }
+            curPayloadBitOffset++;
+            if ((i > 0) && ((curPayloadBitOffset % 8) == 0)) {
+                curPayloadBitOffset = 0;
+            }                                    
+        }            
+    }
+    
 
     byte[] encodeWriteRequestBitField(BaseDefaultFieldItem fieldItem) {
         int numBytes = fieldItem.getNumberOfValues() >> 3 / 8;
@@ -816,12 +951,62 @@ byte[] encodeWriteRequestDoubleField(BaseDefaultFieldItem fieldItem) {
         }
         return buffer.array();
     }
-
+    
     byte[] encodeWriteRequestStringField(BaseDefaultFieldItem fieldItem, boolean isUtf16) {
         // TODO: Implement this ...
-        return new byte[0];
+        String str = fieldItem.getString(0);
+        ByteBuffer buffer = ByteBuffer.allocate(str.length()+2);
+        buffer.put((byte)254);
+        buffer.put((byte)str.length());
+        buffer.put(str.getBytes());
+        return buffer.array();
     }
     
+    byte[] encodeWriteRequestS5TimeField(BaseDefaultFieldItem fieldItem, boolean signed) {
+        int numBytes = fieldItem.getNumberOfValues() * 2;
+        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
+        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
+            buffer.putShort(S7Helper.DurationToS5Time(fieldItem.getDuration(i)));
+        }
+        return buffer.array();
+    }    
+    
+    byte[] encodeWriteRequestTimeField(BaseDefaultFieldItem fieldItem, boolean signed) {
+        int numBytes = fieldItem.getNumberOfValues() * 4;
+        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
+        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
+            buffer.putInt(S7Helper.DurationToS7Time(fieldItem.getDuration(i)));
+        }
+        return buffer.array();
+    } 
+    
+    byte[] encodeWriteRequestTodField(BaseDefaultFieldItem fieldItem, boolean signed) {
+        int numBytes = fieldItem.getNumberOfValues() * 4;
+        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
+        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
+            buffer.putInt(S7Helper.LocalTimeToS7Tod(fieldItem.getTime(i)));
+        }
+        return buffer.array();
+    }
+    
+     byte[] encodeWriteRequestDateField(BaseDefaultFieldItem fieldItem, boolean signed) {
+        int numBytes = fieldItem.getNumberOfValues() * 2;
+        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
+        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
+            buffer.putShort(S7Helper.LocalDateToS7Date(fieldItem.getDate(i)));
+        }
+        return buffer.array();
+    }  
+     
+     byte[] encodeWriteRequestDateTimeField(BaseDefaultFieldItem fieldItem, boolean signed) {
+        int numBytes = fieldItem.getNumberOfValues() * 8;
+        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
+        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
+            buffer.put(S7Helper.LocalDateTimeToS7DateTime(fieldItem.getDateTime(i)));
+        }
+        return buffer.array();
+    }      
+    
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // Decoding
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -838,6 +1023,7 @@ protected void decode(ChannelHandlerContext ctx, S7Message msg, List<Object> out
         
         S7ResponseMessage responseMessage = (S7ResponseMessage) msg;
         short tpduReference = responseMessage.getTpduReference();
+
         if (requests.containsKey(tpduReference)) {
             // As every response has a matching request, get this request based on the tpdu.
             PlcRequestContainer requestContainer = requests.remove(tpduReference);
@@ -955,7 +1141,8 @@ public void operationComplete(ChannelFuture future) {
     @SuppressWarnings("unchecked")
     private PlcResponse decodeReadResponse(S7ResponseMessage responseMessage, PlcRequestContainer requestContainer) throws PlcProtocolException {
         InternalPlcReadRequest plcReadRequest = (InternalPlcReadRequest) requestContainer.getRequest();
-        
+        Map<Short, Integer> splitItems  = null;
+                
         if (responseMessage.getPayloads().get(0) instanceof CpuServicesPayload){
             return decodeSslReadResponse(responseMessage, requestContainer);
         }
@@ -968,45 +1155,80 @@ private PlcResponse decodeReadResponse(S7ResponseMessage responseMessage, PlcReq
         // If the numbers of items don't match, we're in big trouble as the only
         // way to know how to interpret the responses is by aligning them with the
         // items from the request as this information is not returned by the PLC.
-        if (plcReadRequest.getNumberOfFields() != payload.getItems().size()) {
+
+        short tpdu = responseMessage.getTpduReference();
+        
+        int[] fieldOffset= new int[1];
+        fieldOffset[0] = 0;
+        if (requestBitArray.containsKey(tpdu)){
+            splitItems = requestBitArray.remove(tpdu);
+            splitItems.forEach((key,length) -> {
+                fieldOffset[0] += length;
+            });
+        }
+        
+        if ((plcReadRequest.getNumberOfFields()+fieldOffset[0]) != payload.getItems().size()) {
             logger.info("Excepcion: " + plcReadRequest.getFieldNames().toString());
             throw new PlcProtocolException(
-                "The number of requested items doesn't match the number of returned items");
+                "The number of requested items doesn't match the number of returned items Request: " + 
+                        (plcReadRequest.getNumberOfFields()+fieldOffset[0]) +
+                        " Payload: " + 
+                        payload.getItems().size());
         }
 
+
+        
         Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> values = new HashMap<>();
         List<VarPayloadItem> payloadItems = payload.getItems();
-        int index = 0;
+        short index = 0;
+        short itemRow = 0;
         for (String fieldName : plcReadRequest.getFieldNames()) {
             S7Field field = (S7Field) plcReadRequest.getField(fieldName);
-            VarPayloadItem payloadItem = payloadItems.get(index);
+            VarPayloadItem payloadItem = payloadItems.get(itemRow);
 
             PlcResponseCode responseCode = decodeResponseCode(payloadItem.getReturnCode());
             BaseDefaultFieldItem fieldItem = null;
-            ByteBuf data = Unpooled.wrappedBuffer(payloadItem.getData());
+
+            //ByteBuf data = Unpooled.copiedBuffer(payloadItem.getData());
+            ByteBuf data = PooledByteBufAllocator.DEFAULT.buffer();
+            if (payloadItem.getData() != null){
+                data.writeBytes(payloadItem.getData());
+            }
+            
             if (responseCode == PlcResponseCode.OK) {
                 try {
                     switch (field.getDataType()) {
                         // -----------------------------------------
                         // Bit
+                        // 1 responseMessage
                         // -----------------------------------------
                         case BOOL:
-                            fieldItem = decodeReadResponseBitField(field, data);
+                            if (splitItems != null){
+                                if (splitItems.containsKey(index)){
+                                    short endRow = (short)(itemRow + splitItems.get(index));
+                                    for(short i=itemRow; i<=endRow; i++){
+                                        payloadItem = payloadItems.get(i);
+                                        data.writeBytes(payloadItem.getData());
+                                    }
+                                    itemRow = endRow;
+                                }
+                            }
+                            fieldItem = decodeReadResponseBitField(field, data);                                                            
                             break;
                         // -----------------------------------------
                         // Bit-strings
                         // -----------------------------------------
                         case BYTE:  // 1 byte
-                            fieldItem = decodeReadResponseByteBitStringField(field, data);
+                            fieldItem = decodeReadResponseSignedByteField(field, data);
                             break;
                         case WORD:  // 2 byte (16 bit)
-                            fieldItem = decodeReadResponseShortBitStringField(field, data);
+                            fieldItem = decodeReadResponseSignedShortField(field, data);
                             break;
                         case DWORD:  // 4 byte (32 bit)
-                            fieldItem = decodeReadResponseIntegerBitStringField(field, data);
+                            fieldItem = decodeReadResponseSignedIntegerField(field, data);
                             break;
                         case LWORD:  // 8 byte (64 bit)
-                            fieldItem = decodeReadResponseLongBitStringField(field, data);
+                            fieldItem = decodeReadResponseSignedLongField(field, data);
                             break;
                         // -----------------------------------------
                         // Integers
@@ -1025,7 +1247,13 @@ private PlcResponse decodeReadResponse(S7ResponseMessage responseMessage, PlcReq
                         case UINT:
                             fieldItem = decodeReadResponseUnsignedShortField(field, data);
                             break;
+                        case S5TIME:
+                            fieldItem = decodeReadResponseS5Time(field, data);
+                            break;
                         // 32 bit:
+                        case TIME:
+                            fieldItem = decodeReadResponseTime(field, data);
+                            break;
                         case DINT:
                             fieldItem = decodeReadResponseSignedIntegerField(field, data);
                             break;
@@ -1066,11 +1294,13 @@ private PlcResponse decodeReadResponse(S7ResponseMessage responseMessage, PlcReq
                         // -----------------------------------------
                         // TIA Date-Formats
                         // -----------------------------------------
+                        case DT:
                         case DATE_AND_TIME:
                             fieldItem = decodeReadResponseDateAndTime(field, data);
                             break;
+                        case TOD:
                         case TIME_OF_DAY:
-                            fieldItem = decodeReadResponseTimeOfDay(field, data);
+                            fieldItem = decodeReadResponseTimeOfDay(field, data);                            
                             break;
                         case DATE:
                             fieldItem = decodeReadResponseDate(field, data);
@@ -1089,6 +1319,7 @@ private PlcResponse decodeReadResponse(S7ResponseMessage responseMessage, PlcReq
             Pair<PlcResponseCode, BaseDefaultFieldItem> result = new ImmutablePair<>(responseCode, fieldItem);
             values.put(fieldName, result);
             index++;
+            itemRow++;
         }
 
         return new DefaultPlcReadResponse(plcReadRequest, values);
@@ -1234,20 +1465,30 @@ BaseDefaultFieldItem decodeReadResponseVarLengthStringField(boolean isUtf16, Byt
         return decodeReadResponseFixedLengthStringField(currentLength, isUtf16, data);
     }
 
-    BaseDefaultFieldItem decodeReadResponseDateAndTime(S7Field field,ByteBuf data) {
-        LocalDateTime[] localDateTimes = readAllValues(LocalDateTime.class,field, i -> readDateAndTime(data));
-        return new DefaultLocalDateTimeFieldItem(localDateTimes);
+    BaseDefaultFieldItem decodeReadResponseS5Time(S7Field field,ByteBuf data) {
+        Duration[] durations = readAllValues(Duration.class,field, i -> readS5TimeToDuration(data));
+        return new DefaultDurationFieldItem(durations);
     }
-
+    
+    BaseDefaultFieldItem decodeReadResponseTime(S7Field field,ByteBuf data) {
+        Duration[] durations = readAllValues(Duration.class,field, i -> readS7TimeToDuration(data));
+        return new DefaultDurationFieldItem(durations);
+    }
+    
     BaseDefaultFieldItem decodeReadResponseTimeOfDay(S7Field field,ByteBuf data) {
         LocalTime[] localTimes = readAllValues(LocalTime.class,field, i -> readTimeOfDay(data));
         return new DefaultLocalTimeFieldItem(localTimes);
     }
 
     BaseDefaultFieldItem decodeReadResponseDate(S7Field field,ByteBuf data) {
-        LocalDate[] localTimes = readAllValues(LocalDate.class,field, i -> readDate(data));
-        return new DefaultLocalDateFieldItem(localTimes);
+        LocalDate[] localDates = readAllValues(LocalDate.class,field, i -> readDate(data));
+        return new DefaultLocalDateFieldItem(localDates);
     }
+    
+    BaseDefaultFieldItem decodeReadResponseDateAndTime(S7Field field,ByteBuf data) {
+        LocalDateTime[] localDateTimes = readAllValues(LocalDateTime.class,field, i -> readDateAndTime(data));
+        return new DefaultLocalDateTimeFieldItem(localDateTimes);
+    }    
 
     // Returns a 32 bit unsigned value : from 0 to 4294967295 (2^32-1)
     public static int getUDIntAt(byte[] buffer, int pos) {
@@ -1276,31 +1517,81 @@ private static <T> T[] readAllValues(Class<T> clazz, S7Field field, Function<Int
     @SuppressWarnings("unchecked")
     private PlcResponse decodeWriteResponse(S7ResponseMessage responseMessage, PlcRequestContainer requestContainer) throws PlcProtocolException {
         InternalPlcWriteRequest plcWriteRequest = (InternalPlcWriteRequest) requestContainer.getRequest();
+        Map<Short, Integer> splitItems  = null;
+        
+        
+        //TODO: if the PLC Send a error, It send only the Header with PDUR and error code.
+        //      in this condition we send a error to the client, no a exception.
         VarPayload payload = responseMessage.getPayload(VarPayload.class)
             .orElseThrow(() -> new PlcProtocolException("No VarPayload supplied"));
 
         // TODO: Checkout if the payload items are sort of a flatMap of all request items.
+        // TODO: Check for array response, no payload items presents, Why?
 
         // If the numbers of items don't match, we're in big trouble as the only
         // way to know how to interpret the responses is by aligning them with the
         // items from the request as this information is not returned by the PLC.
-        if (plcWriteRequest.getNumberOfFields() != payload.getItems().size()) {
-            throw new PlcProtocolException(
-                "The number of requested items doesn't match the number of returned items");
+        // If we write BitsArray -> We need to add the number of items created 
+        // for individual requests.
+        int[] numberOfFields = new int[1];
+        numberOfFields[0] = 0;
+        short tpdu = responseMessage.getTpduReference();
+        if (requestBitArray.containsKey(tpdu)) {
+            splitItems = requestBitArray.remove(tpdu);
+            splitItems.forEach((key,length)->{                
+                numberOfFields[0] += length;
+            }); 
+            numberOfFields[0] += plcWriteRequest.getNumberOfFields();
+        } else {
+            numberOfFields[0] = plcWriteRequest.getNumberOfFields();
         }
 
+        if (numberOfFields[0] != payload.getItems().size()) {
+            throw new PlcProtocolException(
+                "The number of requested items doesn't match the number of returned items Request: " +
+                       numberOfFields[0] +
+                        " " +
+                       payload.getItems().size());
+        }
+        
         Map<String, PlcResponseCode> values = new HashMap<>();
         List<VarPayloadItem> payloadItems = payload.getItems();
-        int index = 0;
-        for (String fieldName : plcWriteRequest.getFieldNames()) {
-            VarPayloadItem payloadItem = payloadItems.get(index);
 
-            // A write response contains only the return code for every item.
-            PlcResponseCode responseCode = decodeResponseCode(payloadItem.getReturnCode());
+        short sFieldCount = 0;
+        short sPayloadCount = 0;
+        
+        for (String fieldName : plcWriteRequest.getFieldNames()) {
+            
+            VarPayloadItem payloadItem = payloadItems.get(sPayloadCount);
+            PlcResponseCode responseCode = decodeResponseCode(payloadItem.getReturnCode());            
+            
+            if (splitItems != null) {     
+             
+                if (splitItems.containsKey(sFieldCount)) {
+  
+                    int numberOfItems = splitItems.get(sFieldCount);                                        
+                    responseCode = decodeResponseCode(payloadItem.getReturnCode());
+                    for (short i=sPayloadCount; i<=(short)(sPayloadCount+numberOfItems); i++){
+                        if (payloadItem.getReturnCode() != DataTransportErrorCode.OK) {
+                            responseCode = decodeResponseCode(payloadItem.getReturnCode());
+                        };                        
+                        payloadItem = payloadItems.get(i);
+                    }
+                    sPayloadCount += (short) numberOfItems+1; 
+                } else {
+                    responseCode = decodeResponseCode(payloadItem.getReturnCode());
+                    sPayloadCount++;                   
+                }
+                
+            } else {
+                sPayloadCount++; 
+            }
 
             values.put(fieldName, responseCode);
-            index++;
+
+            sFieldCount++; 
         }
+        
 
         return new DefaultPlcWriteResponse(plcWriteRequest, values);
     }
@@ -1447,6 +1738,8 @@ private PlcResponseCode decodeResponseCode(DataTransportErrorCode dataTransportE
                 return PlcResponseCode.INVALID_ADDRESS;
             case DATA_TYPE_NOT_SUPPORTED:
                 return PlcResponseCode.INVALID_DATATYPE;
+            case ACCESS_DENIED:
+                return PlcResponseCode.ACCESS_DENIED;
             default:
                 return PlcResponseCode.INTERNAL_ERROR;
         }
@@ -1481,48 +1774,25 @@ private static BigInteger readUnsigned64BitInteger(ByteBuf data) {
         return new BigInteger(bytes);
     }
 
+    //TODO: millisoconds
     LocalDateTime readDateAndTime(ByteBuf data) {
-        //per definition for Date_And_Time only the first 6 bytes are used
-
-        int year=convertByteToBcd(data.readByte());
-        int month=convertByteToBcd(data.readByte());
-        int day=convertByteToBcd(data.readByte());
-        int hour=convertByteToBcd(data.readByte());
-        int minute=convertByteToBcd(data.readByte());
-        int second=convertByteToBcd(data.readByte());
-        //skip the last 2 bytes no information present
-        data.readByte();
-        data.readByte();
-
-        //data-type ranges from 1990 up to 2089
-        if(year>=90){
-            year+=1900;
-        }
-        else{
-            year+=2000;
-        }
-
-        return LocalDateTime.of(year,month,day,hour,minute,second);
+        return S7Helper.S7DateTimeToLocalDateTime(data);
     }
 
+    Duration readS5TimeToDuration(ByteBuf data){
+        return S7Helper.S5TimeToDuration(data.readShort());        
+    };
+    
+    Duration readS7TimeToDuration(ByteBuf data){
+        return S7Helper.S7TimeToDuration(data.readInt());        
+    };
+    
     LocalTime readTimeOfDay(ByteBuf data) {
-        //per definition for Date_And_Time only the first 6 bytes are used
-
-        int millisSinsMidnight = data.readInt();
-
-
-        return LocalTime.now().withHour(0).withMinute(0).withSecond(0).withNano(0).plus(millisSinsMidnight, ChronoUnit.MILLIS);
-
+        return S7Helper.S7TodToLocalTime(data.readInt());
     }
 
     LocalDate readDate(ByteBuf data) {
-        //per definition for Date_And_Time only the first 6 bytes are used
-
-        int daysSince1990 = data.readUnsignedShort();
-
-        System.out.println(daysSince1990);
-        return LocalDate.now().withYear(1990).withDayOfMonth(1).withMonth(1).plus(daysSince1990, ChronoUnit.DAYS);
-
+        return S7Helper.S7DateToLocalDate(data.readShort());
     }
 
     /**
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
index ad3591c5bc4..78f1c446d89 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
@@ -23,6 +23,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import io.netty.buffer.Unpooled;
 import io.netty.channel.*;
 import io.netty.handler.codec.MessageToMessageDecoder;
+import io.netty.util.AttributeKey;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.PromiseCombiner;
 import java.lang.reflect.Field;
@@ -103,6 +104,7 @@ protected void decode(ChannelHandlerContext ctx, Object msg, List<Object> out) {
     private short maxAmqCaller;
     private short maxAmqCallee;
     private short pduSize;
+    private final AttributeKey<Short> pduSizeKey = AttributeKey.valueOf("pduSizeKey");    
     private S7ControllerType controllerType;
 
     // For detecting the lower layers.
@@ -113,6 +115,11 @@ protected void decode(ChannelHandlerContext ctx, Object msg, List<Object> out) {
     private PendingWriteQueue queue;
     private Map<Short, DataTpdu> sentButUnacknowledgedTpdus;
     
+    /*
+     * All fragmentsof data send by PLC are stored here,
+     * until the PLC indicates that it is the last one,
+     * then a single message is assembled.
+    */    
     private Map<Short, Pair<LocalDateTime, Queue<ByteBuf>>> fragmentedData;
 
     public S7Protocol(short requestedMaxAmqCaller, short requestedMaxAmqCallee, short requestedPduSize,
@@ -129,6 +136,8 @@ public S7Protocol(short requestedMaxAmqCaller, short requestedMaxAmqCallee, shor
     @Override
     public void channelRegistered(ChannelHandlerContext ctx) {
         this.queue = new PendingWriteQueue(ctx);
+        ctx.channel().attr(pduSizeKey).set(pduSize);
+        
         try {
             Field prevField = FieldUtils.getField(ctx.getClass(), "prev", true);
             if(prevField != null) {
@@ -188,6 +197,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
                 S7Message in = (S7Message) msg;
 
                 // Give message processors to process the incoming message.
+                //TODO: messageProcessor move to netty next layer, no a plugin code
                 Collection<? extends S7Message> messages;
                 if ((messageProcessor != null) && (in instanceof S7RequestMessage)) {
                     messages = messageProcessor.processRequest((S7RequestMessage) in, pduSize);
@@ -226,7 +236,7 @@ private void writeS7Message(Channel channel, PromiseCombiner promiseCombiner,
 
         // Check if the message doesn't exceed the negotiated maximum size.
         if (buf.writerIndex() > pduSize) {
-            throw new PlcProtocolPayloadTooBigException("s7", pduSize, buf.writerIndex(), message);
+            throw new PlcProtocolPayloadTooBigException("s7:"+message.getTpduReference(), pduSize, buf.writerIndex(), message);
         } else {
             ChannelPromise subPromise = new DefaultChannelPromise(channel);
             // The tpduRef was 0x01 but had to be changed to 0x00 in order to support Siemens LOGO devices.
@@ -244,7 +254,7 @@ private void encodePayloads(S7Message in, ByteBuf buf) throws PlcProtocolExcepti
                 S7Payload payload = payloadIterator.next();
                 switch (payload.getType()) {
                     case WRITE_VAR:
-                        encodeWriteVarPayload((VarPayload) payload, buf, !payloadIterator.hasNext());
+                        encodeWriteVarPayload((VarPayload) payload, buf, payloadIterator.hasNext());
                         break;
                     case CPU_SERVICES: 
                         if (payload instanceof CpuServicesPayload) {
@@ -269,7 +279,10 @@ private void encodePayloads(S7Message in, ByteBuf buf) throws PlcProtocolExcepti
     * 
     */
     private void encodeWriteVarPayload(VarPayload varPayload, ByteBuf buf, boolean lastItem) {
-        for (VarPayloadItem payloadItem : varPayload.getItems()) {
+        
+        //All payloads for the request come here
+        int i=1;
+        for (VarPayloadItem payloadItem : varPayload.getItems()) {            
             buf.writeByte(payloadItem.getReturnCode().getCode());
             buf.writeByte(payloadItem.getDataTransportSize().getCode());
             //TODO: Check if this is correct?!?! Might be problems with sizeInBits = true/false
@@ -293,14 +306,16 @@ private void encodeWriteVarPayload(VarPayload varPayload, ByteBuf buf, boolean l
                     buf.writeShort(payloadItem.getData().length);                     
                     break;
             }           
-            buf.writeBytes(payloadItem.getData());            
+            buf.writeBytes(payloadItem.getData());  
+
             // if this is not the last item and it's payload is exactly one byte, we need to output a fill-byte.
-            if((payloadItem.getData().length == 1) && !lastItem) {
-                buf.writeByte(0x00);
-            }
-            
-            System.out.println("encodeWriteVarPayload ByteBuf:... \r\n" + ByteBufUtil.prettyHexDump(buf));
+            //if((payloadItem.getData().length == 1) && (!lastItem)) {
+          
+            if((payloadItem.getData().length == 1) && (varPayload.getItems().size() > i) || (payloadItem.getData().length % 2 != 0)) {
+                buf.writeByte(0x00); 
+            }  
             
+            i++;            
         }
     }
     
@@ -581,7 +596,9 @@ private void encodeS7AnyParameterItem(ByteBuf buf, S7AnyVarParameterItem s7AnyRe
         // Length of this item (excluding spec type and length)
         buf.writeByte((byte) 0x0a);
         buf.writeByte(s7AnyRequestItem.getAddressingMode().getCode());
-        buf.writeByte(s7AnyRequestItem.getDataType().getTypeCode());
+        //buf.writeByte(s7AnyRequestItem.getDataType().getTypeCode());
+        
+        buf.writeByte(s7AnyRequestItem.getDataType().getBaseType().getTypeCode());
 
         buf.writeShort(encodeNumElements(s7AnyRequestItem));
         buf.writeShort(s7AnyRequestItem.getDataBlockNumber());
@@ -603,7 +620,8 @@ private void encodeS7AnyPayloadItem(S7AnyVarPayloadItem s7AnyRequestItem, ByteBu
         // Length of this item (excluding spec type and length)
         buf.writeByte((byte) 0x0a);
         buf.writeByte(s7AnyRequestItem.getAddressingMode().getCode());
-        buf.writeByte(s7AnyRequestItem.getDataType().getTypeCode());
+        //buf.writeByte(s7AnyRequestItem.getDataType().getTypeCode());
+        buf.writeByte(s7AnyRequestItem.getDataType().getBaseType().getTypeCode());
 
         buf.writeShort(encodeNumElements(s7AnyRequestItem));
         buf.writeShort(s7AnyRequestItem.getDataBlockNumber());
@@ -626,7 +644,9 @@ private void encodeS7AnyPayloadItem(S7AnyVarPayloadItem s7AnyRequestItem, ByteBu
         //TODO: Refactor S7AnyVarParameterItem to S7AnyVarItem
     private short encodeNumElements(S7AnyVarParameterItem s7AnyVarParameterItem){
         switch (s7AnyVarParameterItem.getDataType()){
+            case DT:
             case DATE_AND_TIME:
+            case TOD:
             case TIME_OF_DAY:
             case DATE:
                 return (short) (s7AnyVarParameterItem.getNumElements()*s7AnyVarParameterItem.getDataType().getSizeInBytes());
@@ -644,13 +664,17 @@ private short encodeNumElements(S7AnyVarParameterItem s7AnyVarParameterItem){
     private short encodeNumElements(S7AnyVarPayloadItem s7AnyVarParameterItem){
         switch (s7AnyVarParameterItem.getDataType()){
             case DATE_AND_TIME:
+            case TOD:
             case TIME_OF_DAY:
             case DATE:
-                return (short) (s7AnyVarParameterItem.getNumElements()*s7AnyVarParameterItem.getDataType().getSizeInBytes());
+            case DT:
+                return (short) (s7AnyVarParameterItem.getNumElements()*s7AnyVarParameterItem.getDataType().getSizeInBytes());               
+            case STRING:
+               break; 
             default:
                 return (short) s7AnyVarParameterItem.getNumElements();
         }
-
+        return 0;
     }  
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -671,7 +695,7 @@ protected void decode(ChannelHandlerContext ctx, IsoTPMessage in, List<Object> o
         if (userData.readableBytes() == 0) {
             return;
         }
-
+                      
         if (userData.readByte() != S7_PROTOCOL_MAGIC_NUMBER) {
             logger.warn("Expecting S7 protocol magic number.");
             if (logger.isDebugEnabled()) {
@@ -679,11 +703,14 @@ protected void decode(ChannelHandlerContext ctx, IsoTPMessage in, List<Object> o
             }
             return;
         }
-
+                
         MessageType messageType = MessageType.valueOf(userData.readByte());
         //Some response maybe USER_DATA
         //Header: Userdata. Parameter:(Response)->(CPU functions)->(ALARM ack)
-        boolean isResponse = messageType == MessageType.ACK_DATA;
+           
+        //The driver freezes if it does not recognize 
+        //the MessageType.ACK type in response
+        boolean isResponse = (messageType == MessageType.ACK_DATA) || (messageType == MessageType.ACK);        
         userData.readShort();  // Reserved (is always constant 0x0000)
         short tpduReference = userData.readShort();
         short headerParametersLength = userData.readShort();
@@ -691,7 +718,8 @@ protected void decode(ChannelHandlerContext ctx, IsoTPMessage in, List<Object> o
         byte errorClass = 0;
         byte errorCode = 0;
 
-        if (isResponse) {
+        //If the PLC response qith error then messagetype == MessageType.ACK
+        if (isResponse) {            
             errorClass = userData.readByte();
             errorCode = userData.readByte();
         }
@@ -807,6 +835,8 @@ private void handleSetupCommunications(ChannelHandlerContext ctx, SetupCommunica
         maxAmqCaller = setupCommunicationParameter.getMaxAmqCaller();
         maxAmqCallee = setupCommunicationParameter.getMaxAmqCallee();
         pduSize = setupCommunicationParameter.getPduLength();
+        
+        ctx.channel().attr(pduSizeKey).set(pduSize);
 
         if(logger.isInfoEnabled()) {
             logger.info("S7Connection established pdu-size {}, max-amq-caller {}, " +
@@ -900,6 +930,7 @@ private VarPayload decodeVarPayload(ByteBuf userData, boolean isResponse, short
         int i = 0;
         while (i < userDataLength) {
             DataTransportErrorCode dataTransportErrorCode = DataTransportErrorCode.valueOf(userData.readByte());
+
             // This is a response to a WRITE_VAR request (It only contains the return code for every sent item.
             if ((readWriteVarParameter.getType() == ParameterType.WRITE_VAR) && isResponse) {
                 // Initialize a rudimentary payload (This is updated in the Plc4XS7Protocol class
@@ -1702,7 +1733,7 @@ private CpuCyclicServicesResponsePayload decodeCyclicServiceResponsePayload(CpuC
 
     private synchronized void trySendingMessages(ChannelHandlerContext ctx) {
         //logger.info("trySendingMessages {} < {}",sentButUnacknowledgedTpdus.size(),maxAmqCaller);
-        while(sentButUnacknowledgedTpdus.size() <= maxAmqCaller) {
+        while(sentButUnacknowledgedTpdus.size() < maxAmqCaller) {
             // Get the TPDU that is up next in the queue.
             DataTpdu curTpdu = (DataTpdu) queue.current();
 
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/events/S7Alarm.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/events/S7Alarm.java
index 3f429779c98..a368ffc9405 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/events/S7Alarm.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/events/S7Alarm.java
@@ -23,6 +23,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import static io.netty.buffer.Unpooled.buffer;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -485,6 +486,34 @@ public PlcResponseCode getResponseCode(String name) {
     public ByteBuf getData(String name) {
         return s7alarm.getComingValues().get(0).getData();
     }
+
+    @Override
+    public boolean isValidDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDuration(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Duration getDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Duration getDuration(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Duration> getAllDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+    
+    
+    
     
     public ByteBuf getAllData() {
         ByteBuf copy = buffer(12);
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7RequestMessage.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7RequestMessage.java
index 1fcd0efd712..a06bebd4541 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7RequestMessage.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7RequestMessage.java
@@ -18,12 +18,13 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.plc4x.java.s7.netty.model.messages;
 
+import java.util.List;
 import org.apache.plc4x.java.base.messages.PlcProtocolMessage;
 import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
 import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
 import org.apache.plc4x.java.s7.netty.model.types.MessageType;
-
-import java.util.List;
+import org.apache.plc4x.java.s7.netty.util.S7ResponseSizeEstimator;
+import org.apache.plc4x.java.s7.netty.util.S7SizeHelper;
 
 /**
  * Container Object for Requests to S7 which additionally stores information if the request was acknowledged (by the PLC?).
@@ -33,11 +34,14 @@ Licensed to the Apache Software Foundation (ASF) under one
 public class S7RequestMessage extends S7Message {
 
     private boolean acknowledged;
+    private int requestSize;
 
     public S7RequestMessage(MessageType messageType, short tpduReference, List<S7Parameter> s7Parameters,
                             List<S7Payload> s7Payloads, PlcProtocolMessage parent) {
         super(messageType, tpduReference, s7Parameters, s7Payloads, parent);
         acknowledged = false;
+        
+        this.requestSize = CalcSize();
     }
 
     public boolean isAcknowledged() {
@@ -47,5 +51,30 @@ public boolean isAcknowledged() {
     public void setAcknowledged(boolean acknowledged) {
         this.acknowledged = acknowledged;
     }
+    
+    public int getRequestSize() {
+        return this.requestSize;
+    }   
+    
+    private int CalcSize(){
+        int size = 0;
+        S7Parameter parameter = this.getParameters().get(0);
+        switch (parameter.getType()) {
+            case READ_VAR:
+                size = S7ResponseSizeEstimator.getEstimatedResponseMessageSize(this);                
+                break;
+            case WRITE_VAR:
+                size = 10 + 
+                S7SizeHelper.getParametersLength(this.getParameters()) + 
+                S7SizeHelper.getPayloadsLength(this.getPayloads());
+                break;
+            case SETUP_COMMUNICATION:
+                return 8;
+            default:
+                ;
+        }        
+        return size;
+    }
+    
 
 }
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/TransportSize.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/TransportSize.java
index 93e96462069..9e4b11144f4 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/TransportSize.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/TransportSize.java
@@ -36,7 +36,7 @@ public enum TransportSize {
     // -----------------------------------------
     BYTE(0x02, "B", 1, null, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
     WORD(0x04, "W", 2, null, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
-    DWORD(0x06, "D", 4, WORD, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
+    DWORD(0x06, "D", 4, null, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
     // Only got a basic TIA license (S7-1500 needed to find this out)
     // TODO: Find the code
     LWORD(0x00, "X", 8, null, null, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
@@ -53,7 +53,7 @@ public enum TransportSize {
     // Unsigned Small Int
     USINT(0x02, "B", 1, INT, DataTransportSize.INTEGER, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
     // Double Precision Int
-    DINT(0x07, "D", 4, INT, DataTransportSize.INTEGER, S7ControllerType.ANY),
+    DINT(0x07, "D", 4, null, DataTransportSize.INTEGER, S7ControllerType.ANY),
     // Unsigned Double Precision Int
     UDINT(0x07, "D", 4, INT, DataTransportSize.INTEGER, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
     // Only got a basic TIA license (S7-1500 needed to find this out)
@@ -74,7 +74,7 @@ public enum TransportSize {
     // Durations
     // -----------------------------------------
     // IEC time
-    TIME(0x0B, "D", 4, null, DataTransportSize.INTEGER, S7ControllerType.ANY),
+    TIME(0x0B, "D", 1, DWORD, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
     // TODO: Find the code
     LTIME(0x00, "X", 8, TIME, null, S7ControllerType.S7_1500),
 
@@ -82,18 +82,26 @@ public enum TransportSize {
     // Date
     // -----------------------------------------
     // IEC date (yyyy-m-d)
-    DATE(0x02, "W", 2, null, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
+    DATE(0x02, "W", 1, WORD, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
 
     // -----------------------------------------
     // Time of day
     // -----------------------------------------
     // Time (hh:mm:ss.S)
-    TIME_OF_DAY(0x02, "D", 4, null, DataTransportSize.INTEGER, S7ControllerType.ANY),
+    TOD(0x02, "D", 4, BYTE, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
+    TIME_OF_DAY(0x02, "D", 4, BYTE, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
+    
+    // -----------------------------------------
+    // Simatic S5 time
+    // Base time 10,100,1000,10000 mseg.
+    // -----------------------------------------
+    S5TIME(0x0C, "W", 1, WORD, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
 
     // -----------------------------------------
     // Date and time of day
     // -----------------------------------------
-    DATE_AND_TIME(0x02, "X", 8, null, DataTransportSize.INTEGER, S7ControllerType.S7_1500, S7ControllerType.S7_300, S7ControllerType.S7_400),
+    DT(0x02, "X", 8, BYTE, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.S7_1500, S7ControllerType.S7_300, S7ControllerType.S7_400),
+    DATE_AND_TIME(0x02, "X", 8, BYTE, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.S7_1500, S7ControllerType.S7_300, S7ControllerType.S7_400),
 
     // -----------------------------------------
     // ASCII Strings
@@ -160,7 +168,7 @@ public boolean isBaseType() {
         return baseType == null;
     }
 
-    TransportSize getBaseType() {
+    public TransportSize getBaseType() {
         // If this is a base-type itself, the baseType is null, in all
         // other cases it is set.
         if (baseType == null) {
@@ -170,7 +178,7 @@ TransportSize getBaseType() {
         }
     }
 
-    TransportSize getSubType(String sizeCode) {
+    public TransportSize getSubType(String sizeCode) {
         // Try to find a sub-type with this base type for which the size code matches.
         for (TransportSize value : values()) {
             if ((value.baseType == this) && (value.sizeCode != null) && (value.sizeCode.equals(sizeCode))) {
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessor.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessor.java
index 4e83e14f5cc..5e1e77e36df 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessor.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessor.java
@@ -18,6 +18,8 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.plc4x.java.s7.netty.strategies;
 
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.commons.lang3.NotImplementedException;
 import org.apache.plc4x.java.api.exceptions.PlcException;
 import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
@@ -39,9 +41,6 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.s7.netty.util.S7RequestSizeCalculator;
 import org.apache.plc4x.java.s7.netty.util.S7ResponseSizeEstimator;
 
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-
 /**
  * While a SetupCommunication message is no problem, when reading or writing data,
  * situations could arise that have to be handled. The following situations have to
@@ -286,21 +285,51 @@ private void processBooleanWriteVarParameter(S7RequestMessage request, VarParame
         }
     }
 
+    //TODO: STRING: S7 native string (kmVENEZUELA) where k=254 & m=9
+    //TODO: %MB200:BYTE[250] -> %MB200..%MB299, %MB300..%MB399, %MB400..%MB449,        
     private void processNonBooleanWriteVarParameter(S7RequestMessage request, VarParameter varParameter, VarPayload varPayload,
                                             S7AnyVarParameterItem s7AnyVarParameterItem, VarPayloadItem varPayloadItem,
                                             int byteOffset, S7CompositeRequestMessage compositeRequestMessage) {
         int curByteOffset = byteOffset;
         int payloadPosition = 0;
-        for (int i = 0; i < s7AnyVarParameterItem.getNumElements(); i++) {
-            int elementSize = s7AnyVarParameterItem.getDataType().getSizeInBytes();
-
+        int numElements = 1;
+        
+        //Check for size
+        if (varPayloadItem.getData().length > 100){
+            numElements = s7AnyVarParameterItem.getNumElements();
+        };
+        
+        for (int i = 0; i < numElements; i++) {
+
+            int elementSize = 1;
+            elementSize = (s7AnyVarParameterItem.getDataType() == TransportSize.STRING)?
+                    varPayloadItem.getData().length:s7AnyVarParameterItem.getDataType().getSizeInBytes();
+            
+            short auxElements = 1;
+            /*
+            auxElements = (s7AnyVarParameterItem.getDataType() == TransportSize.STRING)?
+                    (short) varPayloadItem.getData().length:(short) 0x01;            
+            */
             // Create a new message with only one single value item in the var parameter.
+            //TODO: For ARRAYs, check the size, for break the message
+            int divisor = (s7AnyVarParameterItem.getDataType().getBaseType()== null)?
+                            s7AnyVarParameterItem.getDataType().getSizeInBytes():
+                            s7AnyVarParameterItem.getDataType().getSizeInBytes()*
+                            s7AnyVarParameterItem.getDataType().getBaseType().getSizeInBytes();
+            
+            auxElements = (short) (varPayloadItem.getData().length / divisor);
+ 
+            if (auxElements != 1){
+                elementSize = varPayloadItem.getData().length;
+            }
+                                    
             VarParameterItem itemParameter = new S7AnyVarParameterItem(
                 s7AnyVarParameterItem.getSpecificationType(),
                 s7AnyVarParameterItem.getMemoryArea(),
-                s7AnyVarParameterItem.getDataType(), (short) 1,
+                s7AnyVarParameterItem.getDataType(), auxElements,
                 s7AnyVarParameterItem.getDataBlockNumber(),
                 curByteOffset, (byte) 0);
+            
             S7Parameter subVarParameter = new VarParameter(varParameter.getType(),
                 Collections.singletonList(itemParameter));
 
@@ -354,6 +383,7 @@ public S7ResponseMessage processResponse(S7RequestMessage request, S7ResponseMes
         }
     }
 
+    //TODO: bad S7ResponseMessage when write ARRAYS, the payload is not the ReturnCode
     private S7ResponseMessage getMergedResponseMessage(S7RequestMessage requestMessage,
                                                        Collection<? extends S7ResponseMessage> responses) {
         MessageType messageType = null;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/LongS7MessageProcessorCodec.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/LongS7MessageProcessorCodec.java
new file mode 100644
index 00000000000..c89beb459dc
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/LongS7MessageProcessorCodec.java
@@ -0,0 +1,655 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.strategies;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageCodec;
+import io.netty.util.AttributeKey;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.plc4x.java.base.messages.PlcProtocolMessage;
+import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
+import org.apache.plc4x.java.s7.netty.model.messages.S7ResponseMessage;
+import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
+import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
+import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
+import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
+import org.apache.plc4x.java.s7.netty.model.types.MessageType;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class LongS7MessageProcessorCodec extends
+             MessageToMessageCodec<S7ResponseMessage, S7RequestMessage>{
+    
+    private static final Logger LOGGER = LoggerFactory.getLogger(LongS7MessageProcessorCodec.class );
+    private final AttributeKey<Short> pduSizeKey = AttributeKey.valueOf("pduSizeKey");
+    private final AttributeKey<AtomicInteger> tpduGeneratorKey = AttributeKey.valueOf("tpduGeneratorKey");
+    
+    private final Map<Short, S7CompositeRequestMessage> compRequestMessages;
+    
+    private Short pduSize = 0;
+    private AtomicInteger tpduGenerator;
+
+    public LongS7MessageProcessorCodec() {
+        this.compRequestMessages = new LinkedHashMap<>(10);
+    }
+             
+    @Override
+    protected void encode(ChannelHandlerContext ctx, S7RequestMessage request, List<Object> out) throws Exception {
+        pduSize = ctx.channel().attr(pduSizeKey).get();
+        tpduGenerator = ctx.channel().attr(tpduGeneratorKey).get();
+        
+        Optional<VarParameter> varParameterOptional = request.getParameter(VarParameter.class);
+        if (varParameterOptional.isPresent()) {
+            VarParameter varParameter = varParameterOptional.get();
+            /* Requests whose size is larger than the psuSize should be 
+            *processed or if it is smaller than this but contains a number 
+            *of elements greater than 18 */
+            if ((pduSize < 1024) && (tpduGenerator != null) && (
+                    (request.getRequestSize() > pduSize) ||
+                    ((request.getRequestSize() < pduSize) && (varParameter.getItems().size() > 18)))){
+                if (varParameter.getType() == ParameterType.READ_VAR){
+                    LinkedHashMap<Short, S7RequestMessage> splitRequest = SplitLongReadRequestMessageGroup(request);
+                    out.addAll(splitRequest.values());
+                    return;                    
+                } else if(varParameter.getType() == ParameterType.WRITE_VAR){
+                    LinkedHashMap<Short, S7RequestMessage> splitRequest = SplitLongWriteRequestMessageGroup(request);
+                    out.addAll(splitRequest.values());
+                    return;
+                }
+            }       
+        }
+        out.add(request);
+    }
+
+    @Override
+    protected void decode(ChannelHandlerContext ctx, S7ResponseMessage response, List<Object> out) throws Exception {
+        S7CompositeRequestMessage compRequestMessage = compRequestMessages.get(response.getTpduReference());
+        if (compRequestMessage != null) {
+            compRequestMessage.addResponseMessage(response);
+            if (compRequestMessage.isCompleted()){
+                S7ResponseMessage res = AssemblyResponseMessage(compRequestMessage, response);
+                out.add(res);
+                return;
+            }
+        }
+        out.add(response);
+    }
+    
+    /************************************************************************
+    * SPLIT SECTION
+    ************************************************************************/
+    
+    /*
+    * This method split original S7RequestMessage using 80% rule.
+    * Another problem when tpduGenerator returns to zero (short type).
+    * TODO: split for individual item when item.size > pduSize
+    */
+    private LinkedHashMap<Short, S7RequestMessage> SplitLongWriteRequestMessageGroup(S7RequestMessage request){
+        
+        boolean firtsRow = true;
+        S7CompositeRequestMessage compRequestMessage = new S7CompositeRequestMessage(request);
+
+        compRequestMessages.put(request.getTpduReference(), compRequestMessage);
+
+        List<S7RequestMessage> splitRequests = new LinkedList<>();
+
+        Optional<VarParameter> varParameterOptional = request.getParameter(VarParameter.class);        
+        VarParameter parameters =  varParameterOptional.get();
+                
+        Optional<VarPayload> varPayloadOptional = request.getPayload(VarPayload.class); 
+        VarPayload payloads = varPayloadOptional.get();
+               
+        short itemSize = 0;
+        short actualSize = 0;
+        short maxItemSize = (short) Math.round(pduSize * 0.8);
+        
+        S7Parameter parameter = null;
+        S7Payload payload = null;
+       
+        List<VarParameterItem> parameterItems = (LinkedList)parameters.getItems();
+        List<VarPayloadItem> payloadItems  = (LinkedList)payloads.getItems();
+        List<VarParameterItem> splitParameters = new LinkedList<>();
+        List<VarPayloadItem> splitPayloads = new LinkedList<>();
+                       
+        S7AnyVarParameterItem s7AnyVarParameterItem = null;
+        
+        //No se estan generando en orden
+        Iterator<VarParameterItem> itParameter = parameterItems.iterator();
+        Iterator<VarPayloadItem> itPayload = payloadItems.iterator();
+        int i = 0;
+        while (itParameter.hasNext()) {
+                                    
+            VarParameterItem varParameterItem = itParameter.next();
+            VarPayloadItem varPayloadItem = itPayload.next();            
+                        
+            if (varParameterItem instanceof S7AnyVarParameterItem) {
+                s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameterItem;
+            }
+
+            //TODO: for odd size count the fill 0x00 byte
+            itemSize = (short)(28 + varPayloadItem.getData().length); //Header+Parameter+data
+            actualSize = (short)(28 + 14*(splitPayloads.size()));//Header+Parameter
+            for(VarPayloadItem item:splitPayloads){
+                actualSize = (short) (actualSize +item.getData().length); //+=data.length
+            };
+            
+            LOGGER.debug("SplitLongWriteRequestMessageGroup itemSize: " + itemSize + " actualSize: " + actualSize);
+            
+            //TODO: Item size is > pduSize the Split is in the user layer. 
+            if (itemSize > pduSize){
+                //TODO: Evaluate that the fractional message should be blocked 
+                //      by the next layer. The response message indicating poor 
+                //      quality must also be generated at this point.
+                if (!splitParameters.isEmpty()){
+                    PrepareMessagesToNextLayer(request.getMessageType(),
+                    parameters.getType(),
+                    splitParameters,
+                    splitPayloads,
+                    compRequestMessage); 
+                    
+                    splitParameters = new LinkedList<>();
+                    splitPayloads = new LinkedList<>();                    
+                }
+                
+                short tpdu = PrepareMessagesToNextLayer(request.getMessageType(),
+                                parameters.getType(),
+                                Collections.singletonList(varParameterItem),
+                                Collections.singletonList(varPayloadItem),
+                                compRequestMessage);                 
+                
+                VarParameter writeVarParameter = new VarParameter(parameters.getType(), 
+                        Collections.singletonList(varParameterItem));
+                VarPayload writeVarPayload = new VarPayload(parameters.getType(), 
+                        Collections.singletonList(varPayloadItem));
+                //This message generates an "error" from the PLC, which is discarded.
+                S7RequestMessage splitRequest = new S7RequestMessage(request.getMessageType(),
+                    tpdu, Collections.singletonList(writeVarParameter),
+                    Collections.EMPTY_LIST, compRequestMessage);
+                                              
+                VarParameter ackVarParameter = new VarParameter(parameters.getType(), 
+                    Collections.singletonList(
+                        new S7AnyVarParameterItem(null, null, null, 0x01, (short) 0, (short) 0, (byte) 0)));
+                VarPayload ackVarPayload = new VarPayload(parameters.getType(), 
+                        Collections.singletonList( new VarPayloadItem(DataTransportErrorCode.ACCESS_DENIED, null, null)));                
+                
+                S7ResponseMessage responseMessage = new S7ResponseMessage(
+                    MessageType.ACK_DATA, 
+                    splitRequest.getTpduReference(), 
+                    Collections.singletonList(ackVarParameter), 
+                    Collections.singletonList(ackVarPayload), 
+                    (byte) 0x81, //Application relationship 
+                    (byte) 0x04); //Service no implemented or frame error
+               /* 
+                compRequestMessage.getResponseMessages().put(
+                        responseMessage.getTpduReference(), 
+                        responseMessage);
+                */
+               
+                compRequestMessage.getRequestMessages().put(splitRequest.getTpduReference(),splitRequest);  
+                compRequestMessages.put(splitRequest.getTpduReference(), compRequestMessage);
+                //A fault response is generated, with poor quality, allowing 
+                //to follow the writing process for the other Items.
+                
+                //throw new Plc4XNettyException("Write item request size bigger than " + pduSize+
+                //            " bytes. Split the Item in smaller units."); 
+                
+            } else if ((itemSize > maxItemSize) && ((itemSize <  pduSize))){
+                //TODO: Add a S7RequestMessage to the list                               
+                PrepareMessagesToNextLayer(request.getMessageType(),
+                        parameters.getType(),
+                        splitParameters,
+                        splitPayloads,
+                        compRequestMessage); 
+                
+            } else if (!firtsRow){
+               
+                if ((((itemSize + actualSize) >= maxItemSize) && 
+                     ((itemSize + actualSize) <= pduSize)) || 
+                        (!itParameter.hasNext())){  
+                    splitParameters.add(varParameterItem);
+                    splitPayloads.add(varPayloadItem);  
+                    
+                    PrepareMessagesToNextLayer(request.getMessageType(),
+                            parameters.getType(),
+                            splitParameters,
+                            splitPayloads,
+                            compRequestMessage); 
+                    
+                    splitParameters = new LinkedList<>();
+                    splitPayloads = new LinkedList<>();
+                } else if (((itemSize + actualSize) >= pduSize)){  
+                    PrepareMessagesToNextLayer(request.getMessageType(),
+                            parameters.getType(),
+                            splitParameters,
+                            splitPayloads,
+                            compRequestMessage); 
+                    splitParameters = new LinkedList<>();
+                    splitPayloads = new LinkedList<>(); 
+                    splitParameters.add(varParameterItem);
+                    splitPayloads.add(varPayloadItem);                      
+                }
+                else {
+                    splitParameters.add(varParameterItem);
+                    splitPayloads.add(varPayloadItem);                    
+                }                
+            } else {
+                splitParameters.add(varParameterItem);
+                splitPayloads.add(varPayloadItem);
+            }
+            firtsRow = false;
+        }
+                        
+        if (!splitParameters.isEmpty()){
+            PrepareMessagesToNextLayer(request.getMessageType(),
+                    parameters.getType(),
+                    splitParameters,
+                    splitPayloads,
+                    compRequestMessage);        
+        }
+   
+        return compRequestMessage.getRequestMessages();
+    };
+
+    private LinkedHashMap<Short, S7RequestMessage> SplitLongReadRequestMessageGroup(S7RequestMessage request){
+
+        S7CompositeRequestMessage compRequestMessage = new S7CompositeRequestMessage(request);      
+        compRequestMessages.put(request.getTpduReference(), compRequestMessage);
+        
+        Optional<VarParameter> varParameterOptional = request.getParameter(VarParameter.class);        
+        VarParameter parameters =  varParameterOptional.get();                
+        
+        boolean firtsRow = true;
+        short itemSize = 0;
+        short actualSize = 0;
+        short maxItemSize = (short) Math.round(pduSize * 0.8);        
+        
+        
+        List<VarParameterItem> parameterItems = parameters.getItems();
+
+        List<VarParameterItem> splitParameters = new LinkedList<>();
+        List<VarPayloadItem> splitPayloads = new LinkedList<>();
+
+        for (int i = 0; i < parameterItems.size(); i++) {
+            
+            VarParameterItem varParameterItem = parameterItems.get(i);
+            
+            itemSize = (short)(2 + getEstimatedResponseReadVarPayloadItemSize(varParameterItem));
+            actualSize = 0;
+            for(VarParameterItem item:splitParameters){
+                actualSize = (short) (actualSize + getEstimatedResponseReadVarPayloadItemSize(item)); //+=data.length
+            };     
+            
+            //TODO: Item size is > pduSize the Split is in the user layer. 
+            if (itemSize > pduSize){
+                //TODO: Evaluate that the fractional message should be blocked 
+                //      by the next layer. The response message indicating poor 
+                //      quality must also be generated at this point.
+                if (!splitParameters.isEmpty()){
+                    PrepareMessagesToNextLayer(request.getMessageType(),
+                    parameters.getType(),
+                    splitParameters,
+                    Collections.EMPTY_LIST,
+                    compRequestMessage); 
+                    
+                    splitParameters = new LinkedList<>();
+                    splitPayloads = new LinkedList<>();                    
+                }                
+                
+                short tpdu = PrepareMessagesToNextLayer(request.getMessageType(),
+                                parameters.getType(),
+                                Collections.singletonList(varParameterItem),
+                                Collections.EMPTY_LIST,
+                                compRequestMessage);                 
+                
+                //throw new Plc4XNettyException("Read item request size bigger than " + pduSize+
+                //            " bytes. Split the Item in smaller units."); 
+                
+            } else if ((itemSize > maxItemSize) && ((itemSize <  pduSize))){
+                
+                if (!splitParameters.isEmpty()){
+                    PrepareMessagesToNextLayer(request.getMessageType(),
+                    parameters.getType(),
+                    splitParameters,
+                    Collections.EMPTY_LIST,
+                    compRequestMessage); 
+                    
+                    splitParameters = new LinkedList<>();
+                    splitPayloads = new LinkedList<>();                    
+                }                                     
+                
+                VarParameter writeVarParameter = new VarParameter(parameters.getType(), 
+                        Collections.singletonList(varParameterItem ));
+                
+                S7RequestMessage splitRequest = new S7RequestMessage(request.getMessageType(),
+                    (short) tpduGenerator.getAndIncrement(), Collections.singletonList(writeVarParameter),
+                    Collections.EMPTY_LIST, compRequestMessage);
+                
+                compRequestMessage.getRequestMessages().put(splitRequest.getTpduReference(),splitRequest);  
+                compRequestMessages.put(splitRequest.getTpduReference(), compRequestMessage); 
+                itemSize = 0;
+                
+            }  else if (!firtsRow){
+                              
+                if ((((itemSize + actualSize) >= maxItemSize) && 
+                     ((itemSize + actualSize) <= pduSize)) ||
+                       (splitParameters.size() > 16) ){  
+                      
+                    splitParameters.add(varParameterItem);
+                    
+                    VarParameter writeVarParameter = new VarParameter(parameters.getType(), splitParameters);
+
+                    S7RequestMessage splitRequest = new S7RequestMessage(request.getMessageType(),
+                        (short) tpduGenerator.getAndIncrement(), Collections.singletonList(writeVarParameter),
+                        Collections.EMPTY_LIST, compRequestMessage);
+
+                    compRequestMessage.getRequestMessages().put(splitRequest.getTpduReference(),splitRequest); 
+                    compRequestMessages.put(splitRequest.getTpduReference(), compRequestMessage);
+                    
+                    splitParameters = new LinkedList<>();                                   
+                    splitPayloads = new LinkedList<>();
+                    itemSize = 0;
+                    
+                } else if ((((itemSize + actualSize) >= maxItemSize) && 
+                     ((itemSize + actualSize) > pduSize))){ 
+                    
+                    if (!splitParameters.isEmpty()){
+                        PrepareMessagesToNextLayer(request.getMessageType(),
+                        parameters.getType(),
+                        splitParameters,
+                        Collections.EMPTY_LIST,
+                        compRequestMessage); 
+
+                        splitParameters = new LinkedList<>();
+                        splitPayloads = new LinkedList<>();                    
+                    }                                  
+                    
+                    VarParameter writeVarParameter = new VarParameter(parameters.getType(), 
+                            Collections.singletonList(varParameterItem ));
+
+                    S7RequestMessage splitRequest = new S7RequestMessage(request.getMessageType(),
+                        (short) tpduGenerator.getAndIncrement(), Collections.singletonList(writeVarParameter),
+                        Collections.EMPTY_LIST, compRequestMessage);
+
+                    compRequestMessage.getRequestMessages().put(splitRequest.getTpduReference(),splitRequest);  
+                    compRequestMessages.put(splitRequest.getTpduReference(), compRequestMessage); 
+                    itemSize = 0;
+                    
+                }  else {
+                    splitParameters.add(varParameterItem);                   
+                }                 
+                
+            } else {
+                splitParameters.add(varParameterItem);
+            }
+            
+            if((i == (parameterItems.size() - 1)) && (splitParameters.size() !=0)){
+                VarParameter writeVarParameter = new VarParameter(parameters.getType(), splitParameters);
+
+                S7RequestMessage splitRequest = new S7RequestMessage(request.getMessageType(),
+                    (short) tpduGenerator.getAndIncrement(), Collections.singletonList(writeVarParameter),
+                    Collections.EMPTY_LIST, compRequestMessage);
+
+                compRequestMessage.getRequestMessages().put(splitRequest.getTpduReference(),splitRequest); 
+                compRequestMessages.put(splitRequest.getTpduReference(), compRequestMessage);
+
+                splitParameters = new LinkedList<>();                                   
+                splitPayloads = new LinkedList<>();
+                itemSize = 0;                   
+            }
+            
+            firtsRow = false;          
+     
+        }        
+                
+        return compRequestMessage.getRequestMessages();       
+    }    
+    
+    
+    /************************************************************************
+    * ASSEMBLY RESPONSE MESSAGE
+    ************************************************************************/
+    
+    /*
+    * Try to assemble a response message from the response fragments.
+    * Since the PLC can handle at least two requests and depending on 
+    * the load of its CPUs, the response order is not granted.
+    * TODO: If the connection is lost, the queue is invalid and must be deleted.
+    * TODO: The PLC reporta error, only the header is send. 
+    *       Example Error Class 0x81, Error code 0x04
+    */
+    private S7ResponseMessage AssemblyResponseMessage(S7CompositeRequestMessage compRequestMessage, 
+            S7ResponseMessage response){
+        
+        List<S7Parameter> splitParameters = new LinkedList<>();
+        List<S7Payload> splitPayloads = new LinkedList<>();
+        List<VarPayloadItem> payloadItems = new LinkedList<>();
+        
+        ParameterType parameterType = ParameterType.WRITE_VAR;
+        int numParameters = 0x000;
+        short tpduReference = 0x0000;
+                
+        LinkedHashMap<Short, S7RequestMessage> requestMessages =
+                compRequestMessage.getRequestMessages();
+        
+        LinkedHashMap<Short, S7ResponseMessage> responseMessages =
+                compRequestMessage.getResponseMessages();
+        
+        tpduReference =((S7RequestMessage) compRequestMessage.getParent()).getTpduReference();
+        //Always the firts element is the response the pdu number    
+        Iterator<Entry<Short, S7RequestMessage>> iterRequest = requestMessages.entrySet().iterator();
+        
+        while(iterRequest.hasNext()){
+
+            Entry<Short, S7RequestMessage> itemRequest = iterRequest.next();
+            S7ResponseMessage msgResponse = (S7ResponseMessage) responseMessages.get(itemRequest.getKey());
+                        
+            //If no present we have a error code in the Header
+            Optional<VarParameter> varParameterOptional = msgResponse.getParameter(VarParameter.class); 
+            if (varParameterOptional.isPresent()){
+                VarParameter parameters =  varParameterOptional.get();
+                parameterType = parameters.getType();
+                //Como extraer los parametros del mensaje de respuesta            
+                List<VarParameterItem> varParameterItems = parameters.getItems();
+
+                S7AnyVarParameterItem s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameterItems.get(0);
+
+                numParameters += s7AnyVarParameterItem.getNumElements();
+
+                List<S7Payload> payloads = msgResponse.getPayloads();
+                
+                splitPayloads.addAll(payloads);                
+            } else {
+                //Error from PLC
+                LOGGER.info("Error for tpud " + msgResponse.getTpduReference() +
+                            " Error class: " + msgResponse.getErrorClass() +
+                            " Error code" + msgResponse.getErrorCode());
+                S7RequestMessage msgRequest = (S7RequestMessage) requestMessages.get(msgResponse.getTpduReference());
+
+                VarParameter requestParameters = (VarParameter) msgRequest.getParameters().get(0);
+                parameterType = requestParameters.getType();
+                List<VarParameterItem> varParameterItems = requestParameters.getItems();
+                S7AnyVarParameterItem s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameterItems.get(0);  
+                numParameters += s7AnyVarParameterItem.getNumElements();  
+                VarPayload ackVarPayload = new VarPayload(requestParameters.getType(), 
+                    Collections.singletonList( new VarPayloadItem(DataTransportErrorCode.ACCESS_DENIED, null, null)));                     
+                splitPayloads.addAll(Collections.singletonList(ackVarPayload)); 
+                                
+            }
+
+        }
+
+        //Clean request messages
+        Set<Short> setKeys = requestMessages.keySet();
+        setKeys.forEach(key->{compRequestMessages.remove(key);});
+        compRequestMessages.remove(tpduReference);
+                
+        List<VarParameterItem> varParameterItems;
+        varParameterItems = Collections.singletonList(
+                        new S7AnyVarParameterItem(null, null, null, numParameters , (short) 0, (short) 0, (byte) 0));
+
+        S7Parameter s7Parameter = new VarParameter(parameterType, varParameterItems);
+        
+        splitParameters.add(s7Parameter); 
+        
+        for(S7Payload s7Payload:splitPayloads){
+            VarPayload varPayload = (VarPayload) s7Payload;
+            payloadItems.addAll(varPayload.getItems());            
+        }
+                       
+        S7ResponseMessage res = new S7ResponseMessage(response.getMessageType(),
+                tpduReference,
+                splitParameters,
+                Collections.singletonList(new VarPayload(parameterType, payloadItems)), 
+                (byte)0x00, (byte)0x00);
+
+        return res;
+    }
+    
+    /************************************************************************
+    * UTILITYS
+    ************************************************************************/    
+    
+
+    static class S7CompositeRequestMessage implements PlcProtocolMessage {
+
+        private S7RequestMessage originalRequest;
+        private LinkedHashMap<Short, S7RequestMessage> requestMessages;
+        private LinkedHashMap<Short, S7ResponseMessage> responseMessages;
+
+        S7CompositeRequestMessage(S7RequestMessage originalRequest) {
+            this.originalRequest = originalRequest;
+            this.requestMessages = new LinkedHashMap<>();
+            this.responseMessages = new LinkedHashMap<>();
+        }
+
+        @Override
+        public PlcProtocolMessage getParent() {
+            return originalRequest;
+        }
+
+        /**
+         * A {@link S7CompositeRequestMessage} is only acknowledged, if all children are acknowledged.
+         *
+         * @return true if all children are acknowledged.
+         */
+        private boolean isAcknowledged() {
+            /*
+            for (S7RequestMessage requestMessage : requestMessages) {
+                if(!requestMessage.isAcknowledged()) {
+                    return false;
+                }
+            }*/
+            return true;
+        }
+
+        void addRequestMessage(S7RequestMessage requestMessage) {
+            requestMessages.put(requestMessage.getTpduReference(),requestMessage);
+        }
+
+        public LinkedHashMap getRequestMessages() {
+            return requestMessages;
+        }
+
+        private void addResponseMessage(S7ResponseMessage responseMessage) {
+            responseMessages.putIfAbsent(responseMessage.getTpduReference(),responseMessage);
+        }
+
+        public LinkedHashMap getResponseMessages() {
+            return  responseMessages;
+        }
+        
+        public boolean isCompleted(){            
+            return ((requestMessages.size() - responseMessages.size()) == 0) ;
+        }
+    }
+    
+    //TODO: Use BaseType for length calculation. (Ok)
+    //TODO: For S7 STRING, maximum length is 254 -> One STRING request -> S7RequestMessage. HMI used CHAR array's 
+    private static short getEstimatedResponseReadVarPayloadItemSize(VarParameterItem varParameterItem) {
+        // A var payload item always has a minimum size of 4 bytes (return code, transport size, size (two bytes))
+        short length = 4;
+        short base =0;
+        S7AnyVarParameterItem s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameterItem;
+        
+        base = (s7AnyVarParameterItem.getDataType().getBaseType() == null)?
+                (short) s7AnyVarParameterItem.getDataType().getSizeInBytes():
+                (short)(s7AnyVarParameterItem.getDataType().getSizeInBytes() *
+                s7AnyVarParameterItem.getDataType().getBaseType().getSizeInBytes());
+        
+        length +=
+            s7AnyVarParameterItem.getNumElements() * base;
+        // It seems that bit payloads need a additional separating 0x00 byte.
+        if(s7AnyVarParameterItem.getDataType() == TransportSize.BOOL) {
+            length += 1;
+        }
+        return length;
+    }
+
+
+    private short PrepareMessagesToNextLayer(MessageType msgType,
+            ParameterType parameter,
+            List<VarParameterItem> splitParameters,
+            List<VarPayloadItem> splitPayloads,
+            S7CompositeRequestMessage compMsg){
+            
+            VarParameter writeVarParameter = new VarParameter(parameter, splitParameters);
+            VarPayload writeVarPayload = new VarPayload(parameter, splitPayloads); 
+            
+            short tpdu = (short) tpduGenerator.getAndIncrement();                        
+            
+            LOGGER.debug("SendMessagesToNextLayer tpdu: " + tpdu + 
+                    " Parameters:" + splitParameters.size() +
+                    " Payloads: " + splitPayloads.size());
+            
+            S7RequestMessage splitRequest = new S7RequestMessage(msgType,
+                tpdu,
+                Collections.singletonList(writeVarParameter),
+                (splitPayloads == Collections.EMPTY_LIST)?
+                        Collections.EMPTY_LIST:
+                        Collections.singletonList(writeVarPayload),
+                compMsg);            
+
+            compMsg.getRequestMessages().put(splitRequest.getTpduReference(),splitRequest);  
+            compRequestMessages.put(splitRequest.getTpduReference(), compMsg);
+            
+            return tpdu;
+    }
+    
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandler.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandler.java
index 2799e49ce6f..bc52e72d390 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandler.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandler.java
@@ -21,6 +21,10 @@ Licensed to the Apache Software Foundation (ASF) under one
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.BitSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -41,7 +45,7 @@ public PlcField createField(String fieldQuery) {
         }
         if (S7SslField.matches(fieldQuery)) {
             return S7SslField.of(fieldQuery);
-        }        
+        }  
         throw new PlcInvalidFieldException(fieldQuery);
     }
 
@@ -83,6 +87,7 @@ public BaseDefaultFieldItem encodeShort(PlcField field, Object[] values) {
             case WORD:
             case INT:
             case UINT:
+            case DATE: //TODO: Check for S71200/S71500
                 return internalEncodeInteger(field, values);
             default:
                 throw new PlcRuntimeException("Invalid encoder for type " + s7Field.getDataType().name());
@@ -96,9 +101,10 @@ public BaseDefaultFieldItem encodeInteger(PlcField field, Object[] values) {
             case DWORD:
             case DINT:
             case UDINT:
+            case TIME: //TODO: Check for S71200/S71500
                 return internalEncodeInteger(field, values);
             default:
-                throw new PlcRuntimeException("Invalid encoder for type " + s7Field.getDataType().name());
+                throw new PlcRuntimeException("encodeInteger: Invalid encoder for type " + s7Field.getDataType().name());
         }
     }
 
@@ -122,6 +128,8 @@ public BaseDefaultFieldItem encodeLong(PlcField field, Object[] values) {
             case LWORD:
             case LINT:
             case ULINT:
+            case DT:
+            case DATE_AND_TIME:
                 return internalEncodeInteger(field, values);
             default:
                 throw new PlcRuntimeException("Invalid encoder for type " + s7Field.getDataType().name());
@@ -160,7 +168,7 @@ public BaseDefaultFieldItem encodeString(PlcField field, Object[] values) {
             case WSTRING:
                 return internalEncodeString(field, values);
             default:
-                throw new PlcRuntimeException("Invalid encoder for type " + s7Field.getDataType().name());
+                throw new PlcRuntimeException("encodeString: Invalid encoder for type " + s7Field.getDataType().name());
         }
     }
 
@@ -169,9 +177,11 @@ public BaseDefaultFieldItem encodeTime(PlcField field, Object[] values) {
         S7Field s7Field = (S7Field) field;
         switch (s7Field.getDataType()) {
             case TIME:
+            case TOD:
+            case TIME_OF_DAY:                
                 return internalEncodeTemporal(field, values);
             default:
-                throw new PlcRuntimeException("Invalid encoder for type " + s7Field.getDataType().name());
+                throw new PlcRuntimeException("encodeTime: Invalid encoder for type " + s7Field.getDataType().name());
         }
     }
 
@@ -182,7 +192,7 @@ public BaseDefaultFieldItem encodeDate(PlcField field, Object[] values) {
             case DATE:
                 return internalEncodeTemporal(field, values);
             default:
-                throw new PlcRuntimeException("Invalid encoder for type " + s7Field.getDataType().name());
+                throw new PlcRuntimeException("encodeDate: Invalid encoder for type " + s7Field.getDataType().name());
         }
     }
 
@@ -190,12 +200,25 @@ public BaseDefaultFieldItem encodeDate(PlcField field, Object[] values) {
     public BaseDefaultFieldItem encodeDateTime(PlcField field, Object[] values) {
         S7Field s7Field = (S7Field) field;
         switch (s7Field.getDataType()) {
+            case DT:
             case DATE_AND_TIME:
                 return internalEncodeTemporal(field, values);
             default:
-                throw new PlcRuntimeException("Invalid encoder for type " + s7Field.getDataType().name());
+                throw new PlcRuntimeException("encodeDateTime: Invalid encoder for type " + s7Field.getDataType().name());
         }
     }
+    
+    @Override
+    public BaseDefaultFieldItem encodeDuration(PlcField field, Object[] values) {
+        S7Field s7Field = (S7Field) field;
+        switch (s7Field.getDataType()) {
+            case TIME:          
+            case S5TIME:
+                return internalEncodeTemporal(field, values);
+            default:
+                throw new PlcRuntimeException("encodeDuration: Invalid encoder for type " + s7Field.getDataType().name());
+        }
+    }    
 
     private BaseDefaultFieldItem internalEncodeBoolean(PlcField field, Object[] values) {
         S7Field s7Field = (S7Field) field;
@@ -265,6 +288,7 @@ private BaseDefaultFieldItem internalEncodeInteger(PlcField field, Object[] valu
                 valueType = Byte[].class;
                 castedValues = new Byte[values.length];
                 break;
+            case DATE:
             case WORD:
                 minValue = BigInteger.valueOf((long) Short.MIN_VALUE);
                 maxValue = BigInteger.valueOf((long) Short.MAX_VALUE);
@@ -272,6 +296,9 @@ private BaseDefaultFieldItem internalEncodeInteger(PlcField field, Object[] valu
                 valueType = Short[].class;
                 castedValues = new Short[values.length];
                 break;
+            case TIME:
+            case TOD:
+            case TIME_OF_DAY:
             case DWORD:
                 minValue = BigInteger.valueOf((long) Integer.MIN_VALUE);
                 maxValue = BigInteger.valueOf((long) Integer.MAX_VALUE);
@@ -279,6 +306,8 @@ private BaseDefaultFieldItem internalEncodeInteger(PlcField field, Object[] valu
                 valueType = Integer[].class;
                 castedValues = new Integer[values.length];
                 break;
+            case DT:
+            case DATE_AND_TIME:
             case LWORD:
                 minValue = BigInteger.valueOf(Long.MIN_VALUE);
                 maxValue = BigInteger.valueOf(Long.MAX_VALUE);
@@ -489,7 +518,7 @@ private BaseDefaultFieldItem internalEncodeString(PlcField field, Object[] value
         List<String> stringValues = new LinkedList<>();
         for (Object value : values) {
             if (value instanceof String) {
-                String stringValue = (String) value;
+                String stringValue = (String) value;                
                 if (stringValue.length() > maxLength) {
                     throw new IllegalArgumentException(
                         "String length " + stringValue.length() + " exceeds allowed maximum for type "
@@ -506,6 +535,14 @@ else if (value instanceof Byte) {
                 } else {
                     stringValues.add(new String(stringBytes, StandardCharsets.UTF_8));
                 }
+            } else if (value instanceof Character) {
+                Character characterValue = (Character) value;
+                byte[] stringBytes = new byte[]{(byte) characterValue.charValue()};
+                if (encoding16Bit) {
+                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_16));
+                } else {
+                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_8));
+                }                
             } else if (value instanceof Short) {
                 Short shortValue = (Short) value;
                 byte[] stringBytes = new byte[2];
@@ -557,17 +594,84 @@ else if (value instanceof Byte) {
 
     private BaseDefaultFieldItem internalEncodeTemporal(PlcField field, Object[] values) {
         S7Field s7Field = (S7Field) field;
+        BigInteger minValue;
+        BigInteger maxValue;
+        Class<? extends BaseDefaultFieldItem> fieldType = null;
+        Class<?> valueType = null;
+        Object[] castedValues = null;        
         switch (s7Field.getDataType()) {
+            case S5TIME:
+                // TODO: Check new type
+                minValue = BigInteger.valueOf(0x0000);
+                maxValue = BigInteger.valueOf(0x3999);  
+                fieldType = DefaultDurationFieldItem.class;
+                valueType = Duration[].class;
+                castedValues = new Duration[values.length];
+                for (int i=0; i<values.length; i++){
+                    castedValues[i]  = (Duration) values[i];                
+                };
+                break;
             case TIME:
                 // TODO: I think I should implement this some time ...
+                minValue = BigInteger.valueOf((long) Integer.MIN_VALUE);
+                maxValue = BigInteger.valueOf((long) Integer.MAX_VALUE);
+                fieldType = DefaultDurationFieldItem.class;
+                valueType = Duration[].class;
+                castedValues = new Duration[values.length];
+                for (int i=0; i<values.length; i++){
+                    castedValues[i]  = (Duration) values[i];
+                }
+                break;
             case DATE:
                 // TODO: I think I should implement this some time ...
+
+                minValue = BigInteger.valueOf(0x0000);
+                maxValue = BigInteger.valueOf(0xFFFF);
+                fieldType = DefaultLocalDateFieldItem.class;
+                valueType = LocalDate[].class;
+                castedValues = new LocalDate[values.length];
+                for (int i=0; i<values.length; i++){
+                    castedValues[i]  = (LocalDate) values[i];
+                }      
+                break;
+            case TOD:    
+            case TIME_OF_DAY:
+                // TODO: I think I should implement this some time ...  
+                minValue = BigInteger.valueOf((long) Integer.MIN_VALUE);
+                maxValue = BigInteger.valueOf((long) Integer.MAX_VALUE);
+                fieldType = DefaultLocalTimeFieldItem.class;
+                valueType = LocalTime[].class;
+                castedValues = new LocalTime[values.length];
+                for (int i=0; i<values.length; i++){
+                    castedValues[i]  = (LocalTime) values[i];
+                }      
+                break; 
+            case DT:
             case DATE_AND_TIME:
-                return new DefaultLocalDateTimeFieldItem();
+                // TODO: I think I should implement this some time ...  
+                minValue = BigInteger.valueOf((long) Integer.MIN_VALUE);
+                maxValue = BigInteger.valueOf((long) Integer.MAX_VALUE);
+                fieldType = DefaultLocalDateTimeFieldItem.class;
+                valueType = LocalDateTime[].class;
+                castedValues = new LocalDateTime[values.length];
+                for (int i=0; i<values.length; i++){
+                    castedValues[i]  = (LocalDateTime) values[i];
+                }      
+                break;      
             default:
                 throw new IllegalArgumentException(
                     "Cannot assign temporal values to " + s7Field.getDataType().name() + " fields.");
-        }
+        };
+        
+        
+        
+        
+        // Create the field item.
+        try {
+            return fieldType.getDeclaredConstructor(valueType).newInstance(new Object[]{castedValues});
+        } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+            throw new PlcRuntimeException("Error initializing field class " + fieldType.getSimpleName(), e);
+        }        
     }
 
 }
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7ResponseSizeEstimator.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7ResponseSizeEstimator.java
index 121ea0bc3dc..db8fe06cf88 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7ResponseSizeEstimator.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7ResponseSizeEstimator.java
@@ -18,6 +18,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.plc4x.java.s7.netty.util;
 
+import java.util.List;
 import org.apache.commons.lang3.NotImplementedException;
 import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
 import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
@@ -27,8 +28,6 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
 import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
 
-import java.util.List;
-
 /**
  * When sending S7 messages we have to also pay attention to the expected size
  * of a response for a given request. This helper estimates this response size
@@ -142,12 +141,21 @@ private static short getEstimatedResponseReadVarPayloadSize(VarParameter varPara
         return length;
     }
 
+    //TODO: Use BaseType for length calculation. (Ok)
+    //TODO: For S7 STRING, maximum length is 254 -> One STRING request -> S7RequestMessage. HMI used CHAR array's 
     private static short getEstimatedResponseReadVarPayloadItemSize(VarParameterItem varParameterItem) {
         // A var payload item always has a minimum size of 4 bytes (return code, transport size, size (two bytes))
         short length = 4;
+        short base =0;
         S7AnyVarParameterItem s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameterItem;
+        
+        base = (s7AnyVarParameterItem.getDataType().getBaseType() == null)?
+                (short) s7AnyVarParameterItem.getDataType().getSizeInBytes():
+                (short)(s7AnyVarParameterItem.getDataType().getSizeInBytes() *
+                s7AnyVarParameterItem.getDataType().getBaseType().getSizeInBytes());
+        
         length +=
-            s7AnyVarParameterItem.getNumElements() * s7AnyVarParameterItem.getDataType().getSizeInBytes();
+            s7AnyVarParameterItem.getNumElements() * base;
         // It seems that bit payloads need a additional separating 0x00 byte.
         if(s7AnyVarParameterItem.getDataType() == TransportSize.BOOL) {
             length += 1;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelper.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelper.java
index f1f5849666a..47505d11be2 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelper.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelper.java
@@ -65,8 +65,14 @@ public static short getPayloadsLength(List<S7Payload> payloads) {
         for (S7Payload payload : payloads) {
             if(payload instanceof VarPayload) {
                 VarPayload varPayload = (VarPayload) payload;
+                int i=1;
                 for (VarPayloadItem payloadItem : varPayload.getItems()) {
+                    //Check for "Fill Byte"
+                    if((payloadItem.getData().length == 1) && (varPayload.getItems().size() > i) || (payloadItem.getData().length % 2 != 0)) {
+                        l += 1;
+                    }
                     l += getPayloadLength(payloadItem);
+                    i++;
                 }
             } else if(payload instanceof CpuServicesPayload) {
                 CpuServicesPayload cpuServicesPayload = (CpuServicesPayload) payload;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7ByteReadResponse.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7ByteReadResponse.java
index 655cd21945d..5c43374836b 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7ByteReadResponse.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7ByteReadResponse.java
@@ -22,6 +22,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import io.netty.buffer.ByteBuf;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -462,6 +463,31 @@ public PlcResponseCode getResponseCode(String name) {
         }
         return values.get(name).getKey();
     }
+
+    @Override
+    public boolean isValidDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDuration(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Duration getDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Duration getDuration(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Duration> getAllDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }            
     
     protected ByteBuf getByteBufInternal(String name) {
         Objects.requireNonNull(name, "Name argument required");
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmEvent.java
index 93affa6aa31..ed1f0144fa1 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmEvent.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmEvent.java
@@ -21,6 +21,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -632,6 +633,34 @@ public PlcResponseCode getResponseCode(String name) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
+    @Override
+    public boolean isValidDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDuration(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Duration getDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Duration getDuration(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Duration> getAllDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    
+    
+    
     @Override
     public Map<String, Object> getMap() {
         return map;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7ModeEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7ModeEvent.java
index 2493925e08a..c3eeb4557ef 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7ModeEvent.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7ModeEvent.java
@@ -21,6 +21,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -485,6 +486,31 @@ public PlcResponseCode getResponseCode(String name) {
         throw new UnsupportedOperationException("Not supported yet."); 
     }
 
+    @Override
+    public boolean isValidDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDuration(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Duration getDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Duration getDuration(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Duration> getAllDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+    
     @Override
     public String toString() {
         return "S7ModeEvent{" + "timeStamp=" + timeStamp + ", map=" + map + '}';
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7SysEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7SysEvent.java
index 30890622f28..7bb537da9a3 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7SysEvent.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7SysEvent.java
@@ -21,6 +21,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -479,6 +480,31 @@ public PlcResponseCode getResponseCode(String name) {
         throw new UnsupportedOperationException("Not supported yet."); 
     }
 
+    @Override
+    public boolean isValidDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDuration(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Duration getDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Duration getDuration(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Duration> getAllDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+    
     @Override
     public String toString() {
         return "S7SysEvent{" + "timeStamp=" + timeStamp + ", map=" + map + '}';
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7SslHelper.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7Helper.java
similarity index 87%
rename from plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7SslHelper.java
rename to plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7Helper.java
index d667769f698..7d5e80bdf7c 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7SslHelper.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7Helper.java
@@ -21,7 +21,11 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
+import java.time.Duration;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.temporal.ChronoUnit;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -103,7 +107,7 @@ Licensed to the Apache Software Foundation (ASF) under one
  * @author cgarcia
  */
 
-public class S7SslHelper {
+public class S7Helper {
     
     /**
      * 
@@ -1123,7 +1127,7 @@ private static LocalDateTime readDateAndTime(ByteBuf data) {
         
         return LocalDateTime.of(year,month,day,hour,minute,second, nanoseconds);
     }    
-    
+  
     
    /**
      * converts incoming byte to an integer regarding used BCD format
@@ -1133,12 +1137,201 @@ private static LocalDateTime readDateAndTime(ByteBuf data) {
     private static int convertByteToBcd(byte incomingByte) {
         int dec = (incomingByte >> 4) * 10;
         return dec + (incomingByte & 0x0f);
-    }    
-
+    }  
+    
+   /**
+     * converts incoming Short to an integer regarding used BCD format
+     * @param incomingShort
+     * @return converted BCD number
+     */
+    private static short convertShortToBcd(short incomingShort) {
         
-}
+        short res =(short)  ((incomingShort >> 8) * 100 +
+                            (incomingShort >> 4) * 10 +
+                            (incomingShort & 0x0f));
+        return res;
+    }      
+        
+ }
+    
+    /*
+    *
+    */
+    public static Duration S5TimeToDuration(Short data) {
+        Duration res;
+        short t = data;
+        long tv = (short)(((t & 0x000F))+((t & 0x00F0)>>4)*10+((t & 0x0F00) >> 8)*100);       
+        long tb = (short)(10*Math.pow(10,((t & 0xF000) >> 12)));
+        long totalms = tv*tb;
+        if (totalms <= 9990000 ){
+            res = Duration.ofMillis(totalms);
+        } else {
+            res = Duration.ofMillis(9990000);
+        }            
+        return res;
+    }
+    
+    /*
+    * 
+    */
+    public static Short DurationToS5Time(Duration data) {
+        short tv = 0;
+        short tb = 0x0000_0000;
+        short s5time = 0x0000;
+        long totalms = data.toMillis();
+        
+        if ((totalms >= 0) && (totalms <= 9990000)) {
+            
+            if ((totalms>=0) && ((totalms<=9990))){
+                tb = 0x0000_0000; //10 ms
+                tv = (short)(totalms / 10);                
+            } else  if ((totalms>9990) && ((totalms<=99900))){                 
+                tb = 0x0000_0001;// 100 ms
+                tv = (short)(totalms / 100);
+            } else if ((totalms>99900) && ((totalms<=999000))){
+                tb = 0x0000_0002;//1000 ms
+                tv = (short)(totalms / 1000);                
+            } else if ((totalms>999000) && ((totalms<=9990000))){
+                tb = 0x0000_0003;//10000 ms
+                tv = (short)(totalms / 10000);                
+            }            
+           
+            short uni = (short)(tv % 10);
+            short dec = (short)((tv / 10) % 10);
+            short cen = (short)((tv / 100) % 10);
 
+            s5time = (short)(((tb)<<12) | (cen << 8) | (dec << 4) | (uni));
+        }
+        return s5time;
+    }   
 
+    public static Duration S7TimeToDuration(Integer data) {
+        Duration res = Duration.ZERO;
+        if (data>= 0){
+            res = res.plusMillis((long) data);
+        } else {
+            long ms = 0x8000_0000  - (data & 0x8000_0000);
+            res = res.minusMillis((long) data);
+        }
+        
+        return res;
+    }  
+    
+    public static Integer DurationToS7Time(Duration data) {
+        Integer res = 0x0000_0000;
+        if (data.isNegative()){
+            res = (int) data.toMillis() + 0x8000_0000;
+        } else {
+            res = (int) data.toMillis();            
+        }
+        return res;
+    } 
 
+    public static LocalTime S7TodToLocalTime(Integer data) {
+        if (data > 0x0526_5bff) data=0x0526_5bff;
+        if (data < 0) data=0x0000_0000;
+        LocalTime res = LocalTime.MIDNIGHT.plusNanos((long)data*1_000_000);
+        return res;
+    }  
 
+    public static Integer LocalTimeToS7Tod(LocalTime data) {        
+        return (int)(data.toNanoOfDay() / 1_000_000);
+    }
+    
+    public static LocalDate S7DateToLocalDate(Short data) {
+        LocalDate res = LocalDate.of(1990, 1, 1);
+        res = res.plusDays((long) data);
+        return res;
+    }
+    
+    public static Short LocalDateToS7Date(LocalDate data) {
+        LocalDate ini = LocalDate.of(1990, 1, 1);
+        long resl  = ChronoUnit.DAYS.between(ini, data);
+        short res = (short) resl;
+        return res;
+    }  
+    
+    /*
+     * Date and time of day (BCD coded).
+     *          +----------------+
+     * Byte n   | Year   0 to 99 |
+     *          +----------------+
+     * Byte n+1 | Month  1 to 12 |
+     *          +----------------+
+     * Byte n+2 | Day    1 to 31 |    
+     *          +----------------+
+     * Byte n+3 | Hour   0 to 23 |    
+     *          +----------------+  
+     * Byte n+4 | Minute 0 to 59 |  
+     *          +----------------+
+     * Byte n+5 | Second 0 to 59 |     
+     *          +----------------+
+     * Byte n+6 | ms    0 to 999 |
+     * Byte n+7 | X X X X X D O W|    
+     *          +----------------+    
+     * DOW: Day of weed (last 3 bits)
+    */
+    public static LocalDateTime S7DateTimeToLocalDateTime(ByteBuf data) {
+        //from Plc4XS7Protocol
+        int year=   byteBCDToInt(data.readByte());       
+        int month=  byteBCDToInt(data.readByte());
+        int day =   byteBCDToInt(data.readByte());
+        int hour=   byteBCDToInt(data.readByte());
+        int minute= byteBCDToInt(data.readByte());
+        int second= byteBCDToInt(data.readByte());   
+        int millih= byteBCDToInt(data.readByte()) * 10;
+        
+        int milll= (data.readByte() >> 4);
+         
+        int milliseconds = millih + milll;
+        int nanoseconds = milliseconds * 1000000;
+        //At this point a dont need the day of week
+        //data-type ranges from 1990 up to 2089
+        if(year>=90){
+            year+=1900;
+        }
+        else{
+            year+=2000;
+        }
+        
+        return LocalDateTime.of(year,month,day,hour,minute,second, nanoseconds);
+    }    
+  
+    public static byte[] LocalDateTimeToS7DateTime(LocalDateTime data) {
+        byte[] res = new byte[8];
+        
+        res[0] = convertByteToBcd((data.getYear() % 100));
+        res[1] = convertByteToBcd(data.getMonthValue());
+        res[2] = convertByteToBcd(data.getDayOfMonth());
+        res[3] = convertByteToBcd(data.getHour());
+        res[4] = convertByteToBcd(data.getMinute());
+        res[5] = convertByteToBcd(data.getSecond());
+        
+        long ms = (long)(data.getNano() / 1_000_000);
+        res[6] = (byte)((int)(((ms / 100) << 4) | ((ms / 10)%10))) ;
+        //Java:1 (Monday) to 7 (Sunday)->S7:1 (Sunday) to 7 (Saturday)        
+        byte dayofweek = (byte)((data.getDayOfWeek().getValue()<7)?
+                                data.getDayOfWeek().getValue()+1:
+                                (byte)0x01);
+        res[7] = (byte)(((ms % 10) << 4) | ((byte)(dayofweek)));
+                
+        return res;
+    }
+   
+    
+   /**
+     * converts incoming byte to an integer regarding used BCD format
+     * @param incomingByte
+     * @return converted BCD number
+     */
+    private static byte convertByteToBcd(int incomingByte) {
+        byte dec = (byte)((incomingByte / 10) % 10);
+        return (byte)((dec << 4) | (incomingByte % 10));
+    } 
+
+    private static int byteBCDToInt(byte bcd){
+        int res=(bcd>>4)*10 + (bcd & 0x0f);
+        return res;
+    }
+    
 }

From 1f4acc3bc8fb2fd7c8c47866b08a430d07f6c268 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= <cesarjosegl@gmail.com>
Date: Wed, 11 Mar 2020 13:08:29 -0400
Subject: [PATCH 11/17] Fix Read CHAR[] only read one char.

---
 .../java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
index a33b6d63dc2..cf9ffd27cfb 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
@@ -1280,7 +1280,7 @@ private PlcResponse decodeReadResponse(S7ResponseMessage responseMessage, PlcReq
                         // Characters & Strings
                         // -----------------------------------------
                         case CHAR: // 1 byte (8 bit)
-                            fieldItem = decodeReadResponseFixedLengthStringField(1, false, data);
+                            fieldItem = decodeReadResponseFixedLengthStringField(field.getNumElements(), false, data);
                             break;
                         case WCHAR: // 2 byte
                             fieldItem = decodeReadResponseFixedLengthStringField(1, true, data);

From 0df720a539b0a79dd7bd47ee25a6da62677ff3e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= <cesarjosegl@gmail.com>
Date: Wed, 11 Mar 2020 19:35:43 -0400
Subject: [PATCH 12/17] Fix S7Field parsing.

---
 .../src/main/java/org/apache/plc4x/java/s7/model/S7Field.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java
index d132c6fc02b..b72722348a0 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java
@@ -34,7 +34,7 @@ public class S7Field implements PlcField {
 
     //byteOffset theoretically can reach up to 2097151 ... see checkByteOffset() below --> 7digits
     private static final Pattern ADDRESS_PATTERN =
-        Pattern.compile("^%(?<memoryArea>.)(?<transferSizeCode>[XBWD]?)(?<byteOffset>\\d{1,7})(.(?<bitOffset>[0-7]))?:(?<dataType>[a-zA-Z_5][S5TIME]+)(\\[(?<numElements>\\d+)])?");
+        Pattern.compile("^%(?<memoryArea>.)(?<transferSizeCode>[XBWD]?)(?<byteOffset>\\d{1,7})(.(?<bitOffset>[0-7]))?:(?<dataType>[a-zA-Z_5]+)(\\[(?<numElements>\\d+)])?");
 
     //blockNumber usually has its max hat around 64000 --> 5digits
     //TODO: S5TIME non include;

From 8ff17709b93a9c36ff00c5c33372f7a57253d903 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= <cesarjosegl@gmail.com>
Date: Tue, 24 Mar 2020 00:25:40 -0400
Subject: [PATCH 13/17] ALARM_S type alarm acknowledgment reception fixed.

---
 plc4j/drivers/pom.xml                         |  1 -
 .../apache/plc4x/java/s7/model/S7Field.java   |  3 ++
 .../plc4x/java/s7/netty/Plc4XS7Protocol.java  |  8 ++-
 .../plc4x/java/s7/netty/S7Protocol.java       | 53 ++++++++++++++-----
 .../java/s7/netty/model/types/SslId.java      |  6 ++-
 .../java/s7/protocol/event/S7AlarmEvent.java  | 10 +++-
 plc4j/utils/pom.xml                           |  2 -
 7 files changed, 63 insertions(+), 20 deletions(-)

diff --git a/plc4j/drivers/pom.xml b/plc4j/drivers/pom.xml
index d346db205b2..611ed29d3cb 100644
--- a/plc4j/drivers/pom.xml
+++ b/plc4j/drivers/pom.xml
@@ -39,7 +39,6 @@
     <module>ethernet-ip</module>
     <module>modbus</module>
     <module>s7</module>
-    <module>simulated</module>
 	<module>opcua</module>
   </modules>
 
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java
index b72722348a0..58ac2387ac8 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java
@@ -102,6 +102,9 @@ public static boolean matches(String fieldString) {
     @Override
     public Class<?> getDefaultJavaType() {
         switch (dataType){
+            case BYTE:
+                return Byte.class;
+            case CHAR:
             case STRING:
                 return String.class;
             case USINT:
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
index cf9ffd27cfb..e4377debc8c 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
@@ -1669,7 +1669,13 @@ private PlcResponse decodeSubscriptionResponse(S7ResponseMessage responseMessage
                                 if (!alarmsqueue.offer((S7PushMessage) payload)){
                                     logger.info("decodeSubscriptionResponse: Alarm queue buffer is full.");
                                 };
-                            };
+                            }
+                            PlcResponseCode responseCode = decodeResponseCode(((AlarmMessagePayload) payload).getReturnCode());
+                            LinkedHashSet<String> fieldnames = subsRequest.getFieldNames();                                  
+                            fieldnames.forEach((fieldname)->{
+                                values.put(fieldname, new ImmutablePair(responseCode, null));                                    
+                            });                              
+                            
                         } else {
                             logger.debug("Check for ALARM_QUERY not attended: " + payloadItem);   
                         }                    
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
index 78f1c446d89..1a3c8653a47 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
@@ -964,6 +964,7 @@ else if ((readWriteVarParameter.getType() == ParameterType.READ_VAR) && isRespon
     private S7Payload decodeCpuServicesPayload(CpuServicesParameter parameter, ByteBuf userData) {
         
         if (parameter.getFunctionGroup() == CpuServicesParameterFunctionGroup.CPU_FUNCTIONS) {
+            logger.info("decodeCpuServicesPayload: " + parameter.getSubFunctionGroup());
             switch(parameter.getSubFunctionGroup()){
                 case READ_SSL: {
                     CpuServicesPayload payload = decodeReadSslPayload(parameter, userData);
@@ -1327,21 +1328,23 @@ else if((length >= 8) || ((length == 0) && lastdataunit)) {
     }    
     
     private AlarmMessagePayload decodeMessageServicePayload(CpuServicesParameter parameter, ByteBuf userData){
-
+        //logger.info(ByteBufUtil.prettyHexDump(userData));
+        AlarmType alarmtype = null;
         DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
         DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
         int length = userData.readShort();
-        byte result = userData.readByte();
-        byte unknown = userData.readByte();
-        AlarmType alarmtype = null;
-        
-        if (length>2) {
-            alarmtype = AlarmType.valueOf(userData.readByte());
-            unknown = userData.readByte();
-            unknown = userData.readByte();                        
-        } else {
-            //Free dummy byte
+        if (length != 0){
+            byte result = userData.readByte();
+            byte unknown = userData.readByte();
+
+            if (length>2) {
+                alarmtype = AlarmType.valueOf(userData.readByte());
+                unknown = userData.readByte();
+                unknown = userData.readByte();                        
+            } else {
+                //Free dummy byte
 
+            }
         }
         
        return new AlarmMessagePayload(returnCode,
@@ -1484,7 +1487,7 @@ private AlarmMessagePayload decodeMessageServicePushPayload(CpuServicesParameter
     };
 
     private AlarmMessagePayload decodeMessageServiceQueryPayload(CpuServicesParameter parameter, ByteBuf userData){
-  
+      
         List<Object> MessageObjects = new LinkedList<>();
         CpuServicesResponseParameter thisparameter = null;
         int length;
@@ -1507,9 +1510,33 @@ private AlarmMessagePayload decodeMessageServiceQueryPayload(CpuServicesParamete
             lastdataunit = thisparameter.isLastDataUnit();
         }
         
+        //Response to query
+        if ((length == 6) && 
+            lastdataunit && 
+            (thisparameter.getSubFunctionGroup() == CpuServicesParameterSubFunctionGroup.ALARM_QUERY)){
+            //Alarm message information
+            FunctionID = userData.readByte();
+            NumberOfMessageObjects = userData.readByte();
+            AlarmReturnCode = DataTransportErrorCode.valueOf(userData.readByte());
+            AlarmTransportSize = DataTransportSize.valueOf(userData.readByte());
+            CompleteDataLength = userData.readShort();    
+            
+            return new AlarmMessagePayload(returnCode,
+                    dataTransportSize,
+                    CpuServicesParameterSubFunctionGroup.ALARM_QUERY,
+                    length,
+                    new AlarmMessageItem(FunctionID,
+                            NumberOfMessageObjects,
+                            AlarmReturnCode,
+                            AlarmTransportSize,
+                            CompleteDataLength,
+                            MessageObjects));              
+            
+        }        
+        
         //Fragmente code
         //The next Level query again.
-
+                
         if ((length > 2) && (!lastdataunit)){
             
             //Is alway a CpuServicesResponseParameter instance?
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SslId.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SslId.java
index 9dbf00a9bcb..26d42c27175 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SslId.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SslId.java
@@ -43,7 +43,11 @@ public enum SslId {
     USER_MEMORY_AREAS((short) 0x0013),
     SYSTEM_AREAS((short) 0x0014),
     BLOCK_TYPES((short) 0x0015),
-    COMPONENT_IDENTIFICATION((short) 0x001c),
+    COMPONENT_IDENTIFICATION_ALL((short) 0x001c),
+    COMPONENT_IDENTIFICATION_INDV((short) 0x0011c),
+    COMPONENT_IDENTIFICATION_ALL_H((short) 0x0021c),
+    COMPONENT_IDENTIFICATION_INDV_H((short) 0x0031c),
+    COMPONENT_IDENTIFICATION_PARTIAL((short) 0x00F1c),
     INTERRUPT_STATUS((short) 0x0022),
     ASSIGNMENT_BETWEEN_PROCESS_IMAGE_PARTITIONS_AND_OBS((short) 0x0025),
     COMPUTATION_STATUS_DATA((short) 0x0032),
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmEvent.java
index ed1f0144fa1..4c9785f4932 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmEvent.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmEvent.java
@@ -174,8 +174,7 @@ private static S7AlarmEvent createAlarmEvent(CpuServicesParameterSubFunctionGrou
                         map.put(Fields.SIG_1_DATA_COMING.name(), datos);                        
                         break;
                         
-                    case ALARM_8:
-                        
+                    case ALARM_8:                        
                         map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.ALARM8);
                         break;
                     case SCAN:
@@ -189,6 +188,13 @@ private static S7AlarmEvent createAlarmEvent(CpuServicesParameterSubFunctionGrou
             }
             break;
             case ALARM_ACK_IND:;
+                map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.ALARM_S_IND.getCode()); 
+                map.put(Fields.TIMESTAMP.name(), msgItem.getTimestamp().toInstant(ZoneOffset.UTC));
+                map.put(Fields.EVENT_ID.name(), message.getEventID()); 
+                map.put(Fields.EVENT_STATE.name(), message.getEventState());
+                map.put(Fields.STATE.name(), message.getState());
+                map.put(Fields.ACKSTATE_GOING.name(), message.getAckStateGoing());
+                map.put(Fields.ACKSTATE_COMING.name(), message.getAckStateComming());                 
             break;
             case ALARM_SQ_IND:             
             case ALARM_S_IND:{
diff --git a/plc4j/utils/pom.xml b/plc4j/utils/pom.xml
index c9fa3701ccf..658966f7f91 100644
--- a/plc4j/utils/pom.xml
+++ b/plc4j/utils/pom.xml
@@ -45,8 +45,6 @@
 
     <!-- Utilities used externally by users -->
     <module>connection-pool</module>
-    <module>opm</module>
-    <module>scraper</module>
   </modules>
 
   <profiles>

From e96609de6712fa1f0223636b786883b9baa864cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= <cesarjosegl@gmail.com>
Date: Sat, 28 Mar 2020 21:39:41 -0400
Subject: [PATCH 14/17] Fix S7 cyclic subscription.

---
 .../java/s7/connection/S7PlcConnection.java   | 106 ++--
 plc4j/pom.xml                                 |   1 -
 .../plc4x/java/s7/netty/Plc4XS7Protocol.java  |  22 +-
 .../plc4x/java/s7/netty/S7Protocol.java       |  41 +-
 .../CpuServicesParameterSubFunctionGroup.java |   4 +-
 .../S7CyclicServicesSubscriptionHandle.java   |  16 +-
 .../java/s7/protocol/event/S7AlarmEvent.java  |  29 +-
 .../s7/protocol/event/S7CyclicValueEvent.java | 475 ++++++++++++++++++
 .../apache/plc4x/java/s7/utils/S7Helper.java  |  22 +
 9 files changed, 633 insertions(+), 83 deletions(-)
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7CyclicValueEvent.java

diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
index 4e3b8c589d2..9ef18d53747 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
@@ -18,7 +18,6 @@ Licensed to the Apache Software Foundation (ASF) under one
  */
 package org.apache.plc4x.java.s7.connection;
 
-import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.*;
 import java.net.InetAddress;
@@ -38,7 +37,6 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.configuration2.SystemConfiguration;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
 import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
 import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
 import org.apache.plc4x.java.api.messages.PlcReadRequest;
@@ -53,7 +51,6 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
 import org.apache.plc4x.java.api.model.PlcField;
 import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
 import org.apache.plc4x.java.base.connection.ChannelFactory;
 import org.apache.plc4x.java.base.connection.NettyPlcConnection;
 import org.apache.plc4x.java.base.events.ConnectEvent;
@@ -84,6 +81,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.s7.protocol.S7CyclicServicesSubscriptionHandle;
 import org.apache.plc4x.java.s7.protocol.S7DiagnosticSubscriptionHandle;
 import org.apache.plc4x.java.s7.protocol.event.S7AlarmEvent;
+import org.apache.plc4x.java.s7.protocol.event.S7CyclicValueEvent;
 import org.apache.plc4x.java.s7.protocol.event.S7Event;
 import org.apache.plc4x.java.s7.protocol.event.S7ModeEvent;
 import org.apache.plc4x.java.s7.protocol.event.S7SysEvent;
@@ -134,7 +132,7 @@ public class S7PlcConnection extends NettyPlcConnection implements PlcReader, Pl
     Map<Consumer, Collection<PlcSubscriptionHandle>> cyclicServicesSubscriptions = new HashMap();
     
     Map<SubscribedEventType, Map<Short, PlcSubscriptionHandle>> pushEventHandles = new HashMap();    
-    Map<Short, PlcSubscriptionHandle> cyclicServicesHandles = new HashMap();
+    Map<Short, Collection<PlcSubscriptionHandle>> cyclicServicesHandles = new HashMap();
     
     private EventLoop alarmsloopthread;
 
@@ -445,14 +443,21 @@ public CompletableFuture<PlcUnsubscriptionResponse> unsubscribe(PlcUnsubscriptio
     @Override
     public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer, Collection<PlcSubscriptionHandle> handles) {
         //Add any handler to 
-        handles.forEach(handle ->{
-            if (handle instanceof S7CyclicServicesSubscriptionHandle) {
-                S7CyclicServicesSubscriptionHandle s7handle = (S7CyclicServicesSubscriptionHandle) handle;
-                if (!cyclicServicesHandles.containsKey(s7handle.getJobId())){
-                    cyclicServicesHandles.put((short) s7handle.getJobId(), s7handle);
-                }
+        Object objHandle = handles.toArray()[0];
+
+        if (objHandle instanceof S7CyclicServicesSubscriptionHandle) {
+            S7CyclicServicesSubscriptionHandle firtsHandle = (S7CyclicServicesSubscriptionHandle) objHandle;
+            handles.forEach(handle ->{            
+                S7CyclicServicesSubscriptionHandle s7handle = (S7CyclicServicesSubscriptionHandle) handle; 
+                s7handle.getConsumers().add(consumer);                           
+            });
+            
+            if (!cyclicServicesHandles.containsKey(firtsHandle.getJobId())){
+                cyclicServicesHandles.put((short) firtsHandle.getJobId(), handles);
             }
+        }
             
+        handles.forEach(handle ->{            
             if (handle instanceof S7DiagnosticSubscriptionHandle) {
                 S7DiagnosticSubscriptionHandle s7handle = (S7DiagnosticSubscriptionHandle) handle; 
                 s7handle.getConsumers().add(consumer);
@@ -482,14 +487,14 @@ private class EventLoop extends Thread {
         private int delay;
         private final Map<Consumer, Collection<PlcSubscriptionHandle>> cyclicServicesSubscriptions; 
         private final Map<SubscribedEventType, Map<Short, PlcSubscriptionHandle>> pushEventHandles;        
-        private final Map<Short, PlcSubscriptionHandle> cyclicServicesHandles;
+        private final Map<Short, Collection<PlcSubscriptionHandle>> cyclicServicesHandles;
         private final BlockingQueue<S7PushMessage> alarmsqueue;
         
         EventLoop(Channel channel, 
                 BlockingQueue<S7PushMessage> alarmsqueue, 
                 Map<Consumer, Collection<PlcSubscriptionHandle>> cyclicServicesSubscriptions,
                 Map<SubscribedEventType, Map<Short, PlcSubscriptionHandle>> pushEventHandles,
-                Map<Short, PlcSubscriptionHandle> cyclicServicesHandles) {
+                Map<Short, Collection<PlcSubscriptionHandle>> cyclicServicesHandles) {
             this.channel = channel;
             this.alarmsqueue = alarmsqueue;
             this.cyclicServicesSubscriptions = cyclicServicesSubscriptions;
@@ -528,16 +533,45 @@ public void run() {
                             
                         } else if (msg instanceof CpuServicesPushParameter) {
                             CpuServicesPushParameter themsg = (CpuServicesPushParameter) msg;
-                            logger.info("CpuServicesPushParameter: " + themsg);
+                            logger.debug("CpuServicesPushParameter: " + themsg);
                             
                         } else if (msg instanceof CpuCyclicServicesResponsePayload) {
                             CpuCyclicServicesResponsePayload themsg = (CpuCyclicServicesResponsePayload) msg;
                             logger.debug("CpuCyclicServicesResponsePayload: " + themsg + " JobId:" + themsg.getJobId());
                             
-                            S7CyclicServicesSubscriptionHandle handle = 
-                                    (S7CyclicServicesSubscriptionHandle) cyclicServicesHandles.get(themsg.getJobId());
-                            if (handle != null) {
-                                UpdateCyclicServicesData(handle, themsg);                            
+                            Collection<PlcSubscriptionHandle> handles =  cyclicServicesHandles.get((short)themsg.getJobId());
+                            if (handles != null) {
+                                int i=0;
+                                for(PlcSubscriptionHandle handle:handles) {
+                                    AssociatedValueItem itemValue = ((S7CyclicServicesSubscriptionHandle) handle).getValueItem();
+                                    AssociatedValueItem newValue = themsg.getItems().get(i);
+                                    synchronized(newValue) {
+                                        itemValue.getData().setBytes(0, newValue.getData());
+                                    }                                    
+                                    i++;
+                                }; 
+                                
+                                if (cyclicServicesSubscriptions.containsValue(handles)){
+                                    Map<String, AssociatedValueItem> eventData = new HashMap();
+                                    synchronized(handles){
+                                        for (PlcSubscriptionHandle  handle:handles){
+                                            S7CyclicServicesSubscriptionHandle s7Handle = (S7CyclicServicesSubscriptionHandle) handle;
+                                            AssociatedValueItem newItem = new AssociatedValueItem(s7Handle.getValueItem().getReturnCode(),
+                                                                                    s7Handle.getValueItem().getDataTransportSize(),
+                                                                                    s7Handle.getValueItem().getLength(),
+                                                                                    s7Handle.getValueItem().getData().copy());
+                                            eventData.put(s7Handle.getFieldName(), newItem);                                        
+                                        }
+                                    };
+                                    
+                                    S7CyclicServicesSubscriptionHandle s7Handle = 
+                                            (S7CyclicServicesSubscriptionHandle) handles.toArray()[0];
+                                    Consumer<PlcSubscriptionEvent> consumer = 
+                                            (Consumer<PlcSubscriptionEvent> )s7Handle.getConsumers().toArray()[0];
+                                    S7CyclicValueEvent event = new S7CyclicValueEvent(eventData);
+                                    consumer.accept(event);
+                                }; 
+                                
                             };
                             
                         } else {
@@ -603,38 +637,20 @@ private void dispathModeEvents(Map<Short, PlcSubscriptionHandle> handles, CpuDia
             });              
         }              
         
-        private void UpdateCyclicServicesData(S7CyclicServicesSubscriptionHandle handle,CpuCyclicServicesResponsePayload themsg){
-            
-            Map<String, AssociatedValueItem> items = handle.getItems();
-            Collection<AssociatedValueItem> values = items.values();
-            List<AssociatedValueItem> newvalues = themsg.getItems();
-            int i = 0;
-            synchronized(values) {
-                for (AssociatedValueItem value:values){
-                    AssociatedValueItem newvalue = newvalues.get(i);
-                    value.getData().setBytes(0, newvalue.getData());
-                    i++;                
-                }
+        private void UpdateCyclicServicesData(S7CyclicServicesSubscriptionHandle handle, AssociatedValueItem newValue){
+            AssociatedValueItem itemValue = handle.getValueItem();
+
+            synchronized(newValue) {
+                itemValue.getData().setBytes(0, newValue.getData());
             }
             
             cyclicServicesSubscriptions.forEach((consumer,handles)->{
                 if (handles.contains(handle)){
-                    handles.forEach((exehandle)->{
-                        Map<String, Pair<PlcResponseCode, ByteBuf>> fields = new HashMap<>();
-                        S7CyclicServicesSubscriptionHandle exe2handle = (S7CyclicServicesSubscriptionHandle) exehandle;
-                        Map<String, AssociatedValueItem> values2consumer = exe2handle.getItems();
-                        
-                        //PlcSubscriptionEvent event = new DefaultPlcSubscriptionEvent(Instant.now(), fields);
-                        
-                        values2consumer.forEach((index, itemvalue)->{
-                            if (consumer != null) {
-                                consumer.accept(null);
-                            };
-                            //logger.info("Procesando valores : " + index + "\r\n" + ByteBufUtil.prettyHexDump(itemvalue.getData()));
-                        });
-                        //Pair<PlcResponseCode, ByteBuf> newPair = new ImmutablePair<>(PlcResponseCode, stringItem);
-                        //exehandle
-                    });
+                   
+                    if (consumer != null) {
+                        consumer.accept(null);
+                    };                    
+                    
                 }
             });
             
diff --git a/plc4j/pom.xml b/plc4j/pom.xml
index 58645bd9d7f..62f2f98442a 100644
--- a/plc4j/pom.xml
+++ b/plc4j/pom.xml
@@ -40,7 +40,6 @@
     <module>utils</module>
 
     <module>examples</module>
-    <module>integrations</module>
     <module>karaf-features</module>
   </modules>
 
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
index e4377debc8c..dee0b1a99cc 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
@@ -1696,22 +1696,24 @@ private PlcResponse decodeSubscriptionResponse(S7ResponseMessage responseMessage
                         if (parameter.getError().getCode() == 0x0000){                    
                             for (String fieldname:subsRequest.getFieldNames()){
                                 items.put(fieldname, valueitems.get(i));
+                                S7CyclicServicesSubscriptionHandle handler = new S7CyclicServicesSubscriptionHandle(fieldname, 
+                                                                            parameter.getSequenceNumber(),
+                                                                            parameter.getError().getCode(),
+                                                                            valueitems.get(i));  
+                                values.put(fieldname, 
+                                        new ImmutablePair(decodeResponseCode(valueitems.get(i).getReturnCode()), 
+                                                handler));                                 
                                 i++;                        
                             };
                         };
-
-                        S7CyclicServicesSubscriptionHandle handler = new S7CyclicServicesSubscriptionHandle("UNO", 
-                                                                            parameter.getSequenceNumber(),
-                                                                            parameter.getError().getCode(),
-                                                                            items);
+                    
+                    } else {
+                        logger.info("At least one wrong address was requested.");
                         // Return quality code for alarm 
                         for (String fieldname:subsRequest.getFieldNames()){
-                            values.put(fieldname, new ImmutablePair(decodeResponseCode(items.get(fieldname).getReturnCode()), handler));                    
+                            values.put(fieldname, new ImmutablePair(PlcResponseCode.INVALID_ADDRESS, null));                    
                         }
-
-                    
-                    } else {
-                        logger.info("Must return values...?");
+                        
                     } 
                     
                 } else {
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
index 1a3c8653a47..ba3168304ae 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
@@ -419,7 +419,7 @@ private void encodeAlarmMessagePayload(AlarmMessagePayload payload, ByteBuf buf)
                  logger.debug("encodeAlarmMessagePayload: ALARM_LOCKFREE no supportesd");                
                 break;                        
                 case ALARM_IND:;
-                 logger.debug("encodeAlarmMessagePayload: ALARM_IND no supportesd");                
+                 logger.debug("encodeAlarmMessagePayload: ALARM no supportesd");                
                 break;                        
                 case ALARM_ACK:{
                    logger.debug("encodeAlarmMessagePayload: ALARM_ACK");
@@ -924,6 +924,7 @@ private List<S7Payload> decodePayloads(ByteBuf userData, boolean isResponse, sho
 
     private VarPayload decodeVarPayload(ByteBuf userData, boolean isResponse, short userDataLength,
                                         VarParameter readWriteVarParameter) {
+        //System.out.println("decodeVarPayload:\r\n" + ByteBufUtil.prettyHexDump(userData));
         List<VarPayloadItem> payloadItems = new LinkedList<>();
 
         // Just keep on reading payloads until the provided length is read.
@@ -962,9 +963,7 @@ else if ((readWriteVarParameter.getType() == ParameterType.READ_VAR) && isRespon
     }
 
     private S7Payload decodeCpuServicesPayload(CpuServicesParameter parameter, ByteBuf userData) {
-        
         if (parameter.getFunctionGroup() == CpuServicesParameterFunctionGroup.CPU_FUNCTIONS) {
-            logger.info("decodeCpuServicesPayload: " + parameter.getSubFunctionGroup());
             switch(parameter.getSubFunctionGroup()){
                 case READ_SSL: {
                     CpuServicesPayload payload = decodeReadSslPayload(parameter, userData);
@@ -1024,6 +1023,10 @@ private S7Payload decodeCpuServicesPayload(CpuServicesParameter parameter, ByteB
                     AlarmMessagePayload payload = decodeMessageServicePushPayload(parameter, userData);
                     return payload;
                 }
+                case ALARM: {
+                    AlarmMessagePayload payload = decodeMessageServicePushPayload(parameter, userData);
+                    return payload;
+                }                
                 default:;
                     break;
             } 
@@ -1135,9 +1138,8 @@ private CpuServicesParameter decodeCpuServicesParameter(ByteBuf in) {
                byte dataUnitReferenceNumber = in.readByte();
                boolean lastDataUnit = in.readByte() == 0x00;
                ParameterError error = ParameterError.valueOf(in.readShort());
-               logger.info("decodeParameter.: " + error);
-
-                return new CpuCyclicServicesResponseParameter(functionGroup, subCycFunctionGroup, sequenceNumber,
+               
+               return new CpuCyclicServicesResponseParameter(functionGroup, subCycFunctionGroup, sequenceNumber,
                             dataUnitReferenceNumber, lastDataUnit, error);               
             } else {
                 return new CpuServicesPushParameter(functionGroup, subFunctionGroup, sequenceNumber);            
@@ -1386,6 +1388,7 @@ private CpuDiagnosticMessagePayload decodeCpuDiagnosticMessagePayload(CpuService
     }    
     
     private AlarmMessagePayload decodeMessageServicePushPayload(CpuServicesParameter parameter, ByteBuf userData){
+
         List<Object> MessageObjects = new LinkedList<>();
         List<ByteBuf> values = new LinkedList<>();
         int length;
@@ -1491,11 +1494,11 @@ private AlarmMessagePayload decodeMessageServiceQueryPayload(CpuServicesParamete
         List<Object> MessageObjects = new LinkedList<>();
         CpuServicesResponseParameter thisparameter = null;
         int length;
-        byte FunctionID;
-        byte NumberOfMessageObjects; //Say 1, but I have 2 messages? Why?
-        DataTransportErrorCode AlarmReturnCode;
-        DataTransportSize AlarmTransportSize;
-        int CompleteDataLength;
+        byte FunctionID = 0x00;
+        byte NumberOfMessageObjects = 0x00; //Say 1, but I have 2 messages? Why?
+        DataTransportErrorCode AlarmReturnCode = DataTransportErrorCode.RESERVED;
+        DataTransportSize AlarmTransportSize = DataTransportSize.NULL;
+        int CompleteDataLength = 0x0000;
         short dataUnitReferenceNumber = 0x0000;
         boolean lastdataunit = true;
         
@@ -1510,6 +1513,22 @@ private AlarmMessagePayload decodeMessageServiceQueryPayload(CpuServicesParamete
             lastdataunit = thisparameter.isLastDataUnit();
         }
         
+        //Response to query from S7-1500
+        if ((length == 0) && 
+            lastdataunit && 
+            (thisparameter.getSubFunctionGroup() == CpuServicesParameterSubFunctionGroup.ALARM_QUERY)){
+            return new AlarmMessagePayload(returnCode,
+                    dataTransportSize,
+                    CpuServicesParameterSubFunctionGroup.ALARM_QUERY,
+                    length,
+                    new AlarmMessageItem(FunctionID,
+                            NumberOfMessageObjects,
+                            AlarmReturnCode,
+                            AlarmTransportSize,
+                            CompleteDataLength,
+                            MessageObjects));              
+        }        
+        
         //Response to query
         if ((length == 6) && 
             lastdataunit && 
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterSubFunctionGroup.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterSubFunctionGroup.java
index 10ebcfd48c2..e388e91f76d 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterSubFunctionGroup.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterSubFunctionGroup.java
@@ -28,12 +28,12 @@ public enum CpuServicesParameterSubFunctionGroup {
     READ_SSL((byte) 0x01),
     MESSAGE_SERVICE((byte) 0x02),
     DIAG_MESSAGE((byte) 0x03),
-    ALARM_S((byte) 0x04),
+    ALARM((byte) 0x04),
     ALARM8((byte) 0x05),
     NOTIFY((byte) 0x06),
     ALARM8_LOCK((byte) 0x07),
     ALARM8_UNLOCK((byte) 0x08),
-    SCAN((byte) 0x04),
+    SCAN((byte) 0x09),
     ALARM_ACK((byte) 0x0b),
     ALARM_ACK_IND((byte) 0x0c),    
     ALARM8_LOCK_IND((byte) 0x0d),
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7CyclicServicesSubscriptionHandle.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7CyclicServicesSubscriptionHandle.java
index c0137eb577d..11dbf684c06 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7CyclicServicesSubscriptionHandle.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7CyclicServicesSubscriptionHandle.java
@@ -19,7 +19,6 @@ Licensed to the Apache Software Foundation (ASF) under one
 package org.apache.plc4x.java.s7.protocol;
 
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 import java.util.function.Consumer;
 import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
@@ -32,22 +31,23 @@ Licensed to the Apache Software Foundation (ASF) under one
  * @author cgarcia
  */
 public class S7CyclicServicesSubscriptionHandle implements InternalPlcSubscriptionHandle {
+    
     Set<Consumer<PlcSubscriptionEvent>> consumers = new HashSet<>();
         
     //CyClic Services information hanler
     private final String fieldName; //Subscription id from the request
     private final byte jobId; //Job-Id from cyclic subscriotion
     private final short error; //Register the error from the suscription.
-    private Map<String,AssociatedValueItem> items;
+    private final AssociatedValueItem item;
 
     public S7CyclicServicesSubscriptionHandle(String fieldName, 
             byte jobId, 
             short error, 
-            Map<String,AssociatedValueItem> items) {
+            AssociatedValueItem item) {
         this.fieldName = fieldName;
         this.jobId = jobId;
         this.error = error;
-        this.items = items;
+        this.item = item;
     }
 
     public Set<Consumer<PlcSubscriptionEvent>> getConsumers() {
@@ -66,12 +66,8 @@ public short getError() {
         return error;
     }
     
-    public AssociatedValueItem getValueItem(String index){
-        return items.get(index);
-    }
-
-    public Map<String, AssociatedValueItem> getItems() {
-        return items;
+    public AssociatedValueItem getValueItem(){
+        return item;
     }
                            
     @Override
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmEvent.java
index 4c9785f4932..cb16056e89a 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmEvent.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmEvent.java
@@ -144,12 +144,11 @@ private static S7AlarmEvent createAlarmEvent(CpuServicesParameterSubFunctionGrou
         Map<String, Object> map = new HashMap();
         AssociatedValueItem itemValue;
         byte[] datos;
-        
-        switch(subFunction){
+        switch(subFunction){    
             case ALARM_QUERY:{
                 switch(message.getAlarmtype()){
                     case ALARM_S:
-                        map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.ALARM_S.getCode()); 
+                        map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.ALARM_S_IND.getCode()); 
                         map.put(Fields.EVENT_ID.name(), message.getEventID());
                         map.put(Fields.EVENT_STATE.name(), message.getEventState());
                         map.put(Fields.ACKSTATE_GOING.name(), message.getAckStateGoing());
@@ -188,7 +187,7 @@ private static S7AlarmEvent createAlarmEvent(CpuServicesParameterSubFunctionGrou
             }
             break;
             case ALARM_ACK_IND:;
-                map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.ALARM_S_IND.getCode()); 
+                map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.ALARM_ACK_IND.getCode()); 
                 map.put(Fields.TIMESTAMP.name(), msgItem.getTimestamp().toInstant(ZoneOffset.UTC));
                 map.put(Fields.EVENT_ID.name(), message.getEventID()); 
                 map.put(Fields.EVENT_STATE.name(), message.getEventState());
@@ -233,6 +232,28 @@ private static S7AlarmEvent createAlarmEvent(CpuServicesParameterSubFunctionGrou
                 }                  
             }
             break;
+            case ALARM: {   
+                map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.ALARM.getCode());
+                map.put(Fields.TIMESTAMP.name(), msgItem.getTimestamp().toInstant(ZoneOffset.UTC));
+                map.put(Fields.EVENT_ID.name(), message.getEventID());
+                map.put(Fields.EVENT_STATE.name(), message.getEventState());
+                map.put(Fields.STATE.name(), message.getState());
+                map.put(Fields.ACKSTATE_GOING.name(), message.getAckStateGoing());
+                map.put(Fields.ACKSTATE_COMING.name(), message.getAckStateComming()); 
+                for(int i = 0; i < message.getNumberOfValues(); i++){                
+                    itemValue = message.getComingValues().get(i);
+                    datos = new byte[itemValue.getLength()];
+                    map.put("SIG_"+ (i+1) +"_STATE", itemValue.getReturnCode().getCode());
+                    itemValue.getData().getBytes(0, datos);
+                    map.put("SIG_"+ (i+1) +"_DATA", datos);
+                }                  
+            }
+            break;
+            case ALARM8: {
+                System.out.println("PROCESANDO ALARM 8");
+            }
+            break;
+                
         }
                 
         return new S7AlarmEvent(map);
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7CyclicValueEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7CyclicValueEvent.java
new file mode 100644
index 00000000000..a5a51d4c7a5
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7CyclicValueEvent.java
@@ -0,0 +1,475 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.protocol.event;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.Collection;
+import java.util.Map;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
+import static org.apache.plc4x.java.s7.utils.S7Helper.decodeResponseCode;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7CyclicValueEvent implements PlcSubscriptionEvent {
+
+    private final Map<String, AssociatedValueItem> items;
+    private final Instant instant;
+    
+    public S7CyclicValueEvent(Map<String, AssociatedValueItem> items) {
+        this.items = items;
+        this.instant = Instant.now();
+    }
+
+    @Override
+    public Instant getTimestamp() {
+        return instant;
+    }
+
+    @Override
+    public PlcReadRequest getRequest() {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public int getNumberOfValues(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Object getObject(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Object getObject(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Object> getAllObjects(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBoolean(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBoolean(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Boolean getBoolean(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Boolean getBoolean(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Boolean> getAllBooleans(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidByte(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidByte(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Byte getByte(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Byte getByte(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Byte> getAllBytes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidShort(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidShort(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Short getShort(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Short getShort(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Short> getAllShorts(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Integer getInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Integer getInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Integer> getAllIntegers(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<BigInteger> getAllBigIntegers(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidLong(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidLong(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Long getLong(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Long getLong(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Long> getAllLongs(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidFloat(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidFloat(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Float getFloat(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Float getFloat(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Float> getAllFloats(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDouble(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDouble(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Double getDouble(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Double getDouble(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Double> getAllDoubles(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<BigDecimal> getAllBigDecimals(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidString(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidString(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public String getString(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public String getString(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<String> getAllStrings(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalTime getTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalTime getTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<LocalTime> getAllTimes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDate(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDate(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalDate getDate(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalDate getDate(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<LocalDate> getAllDates(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDateTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDateTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<LocalDateTime> getAllDateTimes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDuration(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Duration getDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Duration getDuration(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Duration> getAllDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidByteArray(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidByteArray(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Byte[] getByteArray(String name) {
+        byte[] bytes = new byte[items.get(name).getData().readableBytes()];
+        items.get(name).getData().duplicate().readBytes(bytes);
+        return ArrayUtils.toObject(bytes); 
+    }
+
+    @Override
+    public Byte[] getByteArray(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Byte[]> getAllByteArrays(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<String> getFieldNames() {
+        return items.keySet();
+    }
+
+    @Override
+    public PlcField getField(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public PlcResponseCode getResponseCode(String name) {
+        return decodeResponseCode(items.get(name).getReturnCode());
+    }
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7Helper.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7Helper.java
index 7d5e80bdf7c..66fbf405c1f 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7Helper.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7Helper.java
@@ -28,6 +28,8 @@ Licensed to the Apache Software Foundation (ASF) under one
 import java.time.temporal.ChronoUnit;
 import java.util.HashMap;
 import java.util.Map;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
 
 /**
  *  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
@@ -1334,4 +1336,24 @@ private static int byteBCDToInt(byte bcd){
         return res;
     }
     
+    public static PlcResponseCode decodeResponseCode(DataTransportErrorCode dataTransportErrorCode) {
+        if (dataTransportErrorCode == null) {
+            return PlcResponseCode.INTERNAL_ERROR;
+        }
+        switch (dataTransportErrorCode) {
+            case OK:
+                return PlcResponseCode.OK;
+            case NOT_FOUND:
+                return PlcResponseCode.NOT_FOUND;
+            case INVALID_ADDRESS:
+                return PlcResponseCode.INVALID_ADDRESS;
+            case DATA_TYPE_NOT_SUPPORTED:
+                return PlcResponseCode.INVALID_DATATYPE;
+            case ACCESS_DENIED:
+                return PlcResponseCode.ACCESS_DENIED;
+            default:
+                return PlcResponseCode.INTERNAL_ERROR;
+        }
+    }    
+    
 }

From a64f0358384b63dd1cca9cf2b74c37d640b79450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= <cesarjosegl@gmail.com>
Date: Mon, 4 May 2020 23:37:38 -0400
Subject: [PATCH 15/17] Some PR in Modbus driver for compatibility of S7
 driver.

---
 .../connection/BaseModbusPlcConnection.java   |  10 +
 .../connection/ModbusTcpPlcConnection.java    |   2 +-
 .../SingleItemToSingleRequestProtocol.java    |  19 +-
 .../DefaultModbusByteArrayFieldItem.java      | 155 ++++++--
 .../java/modbus/model/CoilModbusField.java    |   7 +-
 .../plc4x/java/modbus/model/ModbusField.java  |   7 +-
 .../model/ReadDiscreteInputsModbusField.java  |   9 +-
 .../ReadHoldingRegistersModbusField.java      |   7 +-
 .../model/ReadInputRegistersModbusField.java  |   7 +-
 .../modbus/model/RegisterModbusField.java     |   7 +-
 .../modbus/netty/Plc4XModbusProtocol.java     |  45 ++-
 .../modbus/util/ModbusPlcFieldHandler.java    | 334 +++++++++++++++++-
 .../modbus/netty/Plc4XModbusProtocolTest.java |   2 +-
 13 files changed, 539 insertions(+), 72 deletions(-)

diff --git a/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java b/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java
index 713acd5cd91..bac1c3862ab 100644
--- a/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java
+++ b/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java
@@ -36,6 +36,9 @@ public abstract class BaseModbusPlcConnection extends NettyPlcConnection impleme
 
     private static final Logger logger = LoggerFactory.getLogger(BaseModbusPlcConnection.class);
 
+    // This slaveId defaults to 0 which is a broadcast.
+    private short slaveId = 0;
+
     BaseModbusPlcConnection(ChannelFactory channelFactory, String params) {
         super(channelFactory);
 
@@ -46,6 +49,9 @@ public abstract class BaseModbusPlcConnection extends NettyPlcConnection impleme
                 if (paramElements.length == 2) {
                     String paramValue = paramElements[1];
                     switch (paramName) {
+                        case "slaveId": {
+                            slaveId = Short.parseShort(paramValue);
+                        }
                         default:
                             logger.debug("Unknown parameter {} with value {}", paramName, paramValue);
                     }
@@ -104,4 +110,8 @@ public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
             .thenApply(PlcWriteResponse.class::cast);
     }
 
+    public short getSlaveId() {
+        return slaveId;
+    }
+
 }
diff --git a/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/ModbusTcpPlcConnection.java b/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/ModbusTcpPlcConnection.java
index da2c99f6e23..3fb196b4597 100644
--- a/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/ModbusTcpPlcConnection.java
+++ b/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/ModbusTcpPlcConnection.java
@@ -69,7 +69,7 @@ protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupC
             @Override
             protected void initChannel(Channel channel) {
                 channel.pipeline().addLast(new ModbusTcpCodec(new ModbusRequestEncoder(), new ModbusResponseDecoder()));
-                channel.pipeline().addLast(new Plc4XModbusProtocol());
+                channel.pipeline().addLast(new Plc4XModbusProtocol(getSlaveId()));
                 channel.pipeline().addLast(new SingleItemToSingleRequestProtocol(ModbusTcpPlcConnection.this, ModbusTcpPlcConnection.this, null, timer, null, false));
             }
         };
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java
index 69f7f646681..99c4781e0b0 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java
@@ -23,6 +23,11 @@ Licensed to the Apache Software Foundation (ASF) under one
 import io.netty.util.Timer;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.PromiseCombiner;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.lang3.tuple.Triple;
 import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
@@ -37,12 +42,6 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.stream.Collectors;
-
 /**
  * This layer can be used to split a {@link org.apache.plc4x.java.api.messages.PlcRequest} which addresses multiple {@link PlcField}s into multiple subsequent {@link org.apache.plc4x.java.api.messages.PlcRequest}s.
  */
@@ -160,7 +159,7 @@ public void channelUnregistered(ChannelHandlerContext ctx) throws Exception {
     public void channelInactive(ChannelHandlerContext ctx) throws Exception {
         // Send everything so we get a proper failure for those pending writes
         this.queue.removeAndWriteAll();
-        this.timer.stop();
+        //this.timer.stop();
         this.scheduledTimeouts.clear();
         this.sentButUnacknowledgedSubContainer.clear();
         this.correlationToParentContainer.clear();
@@ -181,7 +180,7 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception {
     protected void tryFinish(Integer currentTdpu, InternalPlcResponse msg, CompletableFuture<InternalPlcResponse> originalResponseFuture) {
         deliveredItems.incrementAndGet();
         PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> subPlcRequestContainer = sentButUnacknowledgedSubContainer.remove(currentTdpu);
-        LOGGER.info("{} got acknowledged", subPlcRequestContainer);
+        LOGGER.debug("{} got acknowledged", subPlcRequestContainer);
         PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> originalPlcRequestContainer = correlationToParentContainer.remove(currentTdpu);
         if (originalPlcRequestContainer == null) {
             LOGGER.warn("Unrelated package received {}", msg);
@@ -325,7 +324,9 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
                         ChannelPromise subPromise = new DefaultChannelPromise(promise.channel());
 
                         Integer tdpu = correlationIdGenerator.getAndIncrement();
-                        CompletableFuture<InternalPlcResponse> correlatedCompletableFuture = new CompletableFuture<>()
+                        CompletableFuture<InternalPlcResponse> correlatedCompletableFuture = new CompletableFuture<>();
+                        // Important: don't chain to above as we want the above to be completed not the result of when complete
+                        correlatedCompletableFuture
                             .thenApply(InternalPlcResponse.class::cast)
                             .whenComplete((internalPlcResponse, throwable) -> {
                                 if (throwable != null) {
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/messages/items/DefaultModbusByteArrayFieldItem.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/messages/items/DefaultModbusByteArrayFieldItem.java
index 4b3002fdbe2..4f335c9f920 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/messages/items/DefaultModbusByteArrayFieldItem.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/messages/items/DefaultModbusByteArrayFieldItem.java
@@ -18,13 +18,14 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.plc4x.java.modbus.messages.items;
 
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.plc4x.java.base.messages.items.DefaultByteArrayFieldItem;
-
-import java.nio.ByteBuffer;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
 import java.nio.ByteOrder;
+import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.stream.Stream;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.plc4x.java.base.messages.items.DefaultByteArrayFieldItem;
 
 /**
  * default implementation for DefaultByteArrayFieldItem for Usage within Modbus module
@@ -40,11 +41,16 @@ public class DefaultModbusByteArrayFieldItem extends DefaultByteArrayFieldItem {
     private ByteOrder byteOrder;
 
     private Byte[] completeByteArray;
+    private byte[] backend;
+    
+    private ByteBuf byteBuf = null;
 
     public DefaultModbusByteArrayFieldItem(Byte[]... values) {
         super(values);
         this.byteOrder = DEFAULT_ENDIANNESS;
         this.completeByteArray = Arrays.stream(getValues()).flatMap(Stream::of).toArray(Byte[]::new);
+        this.backend = ArrayUtils.toPrimitive(completeByteArray);
+        byteBuf = Unpooled.wrappedBuffer(backend);
     }
 
     @Override
@@ -60,17 +66,25 @@ public boolean isValidByteArray(int index) {
 
     @Override
     public Byte[] getByteArray(int index) {
-        return getValue(index);
+        return getByteArrayFromIndex(index);
     }
 
     @Override
     public boolean isValidShort(int index) {
-        return this.completeByteArray.length >= shortIndexToByteIndex(index) + SHORT_BYTES;
+        try{
+            short b = byteBuf.getShort(index*Short.BYTES);
+            return true;
+        } catch(Exception ex){
+            return false;
+        }
     }
 
     @Override
     public Short getShort(int index) {
-        return getShort(index, this.byteOrder);
+        if (!isValidShort(index)){
+            return null;
+        }
+        return byteBuf.getShort(index*Short.BYTES);
     }
 
     /**
@@ -84,10 +98,12 @@ public Short getShort(int index, ByteOrder byteOrder) {
         if (!isValidShort(index)) {
             return null;
         }
-        return ByteBuffer
-            .wrap(ArrayUtils.toPrimitive(getByteArrayFromIndex(shortIndexToByteIndex(index))))
-            .order(byteOrder)
-            .getShort();
+        if (byteOrder.equals(ByteOrder.LITTLE_ENDIAN)) {
+            return byteBuf.getShortLE(index*Short.BYTES);            
+        } else {
+            return byteBuf.getShort(index*Short.BYTES);            
+        }
+
     }
 
     /**
@@ -103,12 +119,20 @@ private static int shortIndexToByteIndex(int shortIndex) {
 
     @Override
     public boolean isValidInteger(int index) {
-        return this.completeByteArray.length >= intIndexToByteIndex(index) + INTEGER_BYTES;
+        try{
+            int b = byteBuf.getInt(index*Integer.BYTES);
+            return true;
+        } catch(Exception ex){
+            return false;
+        }
     }
 
     @Override
     public Integer getInteger(int index) {
-        return getInteger(index, this.byteOrder);
+        if (!isValidInteger(index)){
+            return null;
+        }
+        return byteBuf.getInt(index*Integer.BYTES);
     }
 
     /**
@@ -122,10 +146,11 @@ public Integer getInteger(int index, ByteOrder byteOrder) {
         if (!isValidInteger(index)) {
             return null;
         }
-        return ByteBuffer
-            .wrap(ArrayUtils.toPrimitive(getByteArrayFromIndex(intIndexToByteIndex(index))))
-            .order(byteOrder)
-            .getInt();
+        if (byteOrder.equals(ByteOrder.LITTLE_ENDIAN)) {
+            return byteBuf.getIntLE(index*Integer.BYTES);            
+        } else {
+            return byteBuf.getInt(index*Integer.BYTES);            
+        }
     }
 
     /**
@@ -141,12 +166,20 @@ private static int intIndexToByteIndex(int intIndex) {
 
     @Override
     public boolean isValidLong(int index) {
-        return this.completeByteArray.length >= longIndexToByteIndex(index) + LONG_BYTES;
+        try{
+            long b = byteBuf.getLong(index*Long.BYTES);
+            return true;
+        } catch(Exception ex){
+            return false;
+        }
     }
 
     @Override
     public Long getLong(int index) {
-        return getLong(index, this.byteOrder);
+        if (!isValidLong(index)){
+            return null;
+        }
+        return byteBuf.getLong(index*Long.BYTES);
     }
 
     /**
@@ -160,10 +193,11 @@ public Long getLong(int index, ByteOrder byteOrder) {
         if (!isValidLong(index)) {
             return null;
         }
-        return ByteBuffer
-            .wrap(ArrayUtils.toPrimitive(getByteArrayFromIndex(longIndexToByteIndex(index))))
-            .order(byteOrder)
-            .getLong();
+        if (byteOrder.equals(ByteOrder.LITTLE_ENDIAN)) {
+            return byteBuf.getLongLE(index*Long.BYTES);            
+        } else {
+            return byteBuf.getLong(index*Long.BYTES);            
+        }
     }
 
     /**
@@ -214,7 +248,80 @@ public int hashCode() {
 
     //ToDo: Implement conversion for Float and Unsigned-Datatypes
 
-    //ToDo: Add exceptions to avoid unwanted states --> e.g. neg indexes
+    @Override
+    public boolean isValidByte(int index) {
+        try{
+            byte b = byteBuf.getByte(index);
+            return true;
+        } catch(Exception ex){
+            return false;
+        }
+    }
+    
+    @Override
+    public Byte getByte(int index) {
+        if (!isValidByte(index)){
+            return null;
+        }
+        return byteBuf.getByte(index);
+    }
+    
+    @Override
+    public boolean isValidFloat(int index) {
+        try{
+            float f = byteBuf.getFloat(index*Float.BYTES);
+            return true;
+        } catch(Exception ex){
+            return false;
+        }
+    }
+
+    @Override
+    public Float getFloat(int index) {
+        if (!isValidFloat(index)){
+            return null;
+        }
+        return byteBuf.getFloat(index*Float.BYTES);
+    }
+  
+    @Override
+    public boolean isValidDouble(int index) {
+        try{
+            double f = byteBuf.getDouble(index*Double.BYTES);
+            return true;
+        } catch(Exception ex){
+            return false;
+        }
+    }
 
+    @Override
+    public Double getDouble(int index) {
+        if (!isValidDouble(index)){
+            return null;
+        }
+        return byteBuf.getDouble(index*Double.BYTES);
+    }    
+  
+    //TODO: index or index*2? String is byte oriented.
+    @Override
+    public boolean isValidString(int index) {
+        try{
+            CharSequence s = byteBuf.getCharSequence(index*2, byteBuf.readableBytes(), Charset.defaultCharset());
+            return true;
+        } catch(Exception ex){
+            return false;
+        }
+    }
+
+    @Override
+    public String getString(int index) {
+        if (!isValidString(index)){
+            return null;
+        }
+        CharSequence s = byteBuf.getCharSequence(index*2, byteBuf.readableBytes(), Charset.defaultCharset());        
+        return s.toString();
+    }    
+    
+    
 }
 
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/CoilModbusField.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/CoilModbusField.java
index adb7600d5ee..48acc403893 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/CoilModbusField.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/CoilModbusField.java
@@ -18,10 +18,9 @@ Licensed to the Apache Software Foundation (ASF) under one
  */
 package org.apache.plc4x.java.modbus.model;
 
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
 
 public class CoilModbusField extends ModbusField {
 
@@ -40,6 +39,10 @@ public static CoilModbusField of(String addressString) throws PlcInvalidFieldExc
 
         String quantityString = matcher.group("quantity");
         Integer quantity = quantityString != null ? Integer.valueOf(quantityString) : null;
+        if (quantity != null){ 
+            if ((quantity < 0) || (quantity > 2000)) throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN);
+        }
+        
         return new CoilModbusField(address, quantity);
     }
 }
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ModbusField.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ModbusField.java
index 3254e02bee3..c0d4eca0051 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ModbusField.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ModbusField.java
@@ -18,14 +18,13 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.plc4x.java.modbus.model;
 
-import org.apache.plc4x.java.api.model.PlcField;
-
 import java.util.Objects;
 import java.util.regex.Pattern;
+import org.apache.plc4x.java.api.model.PlcField;
 
 public abstract class ModbusField implements PlcField {
 
-    public static final Pattern ADDRESS_PATTERN = Pattern.compile("(?<address>\\d+)(\\[(?<quantity>\\d)])?");
+    public static final Pattern ADDRESS_PATTERN = Pattern.compile("(?<address>\\d+)(\\[(?<quantity>\\d+?)])?");
 
     private final int address;
 
@@ -68,7 +67,7 @@ public int hashCode() {
     public String toString() {
         return "ModbusField{" +
             "address=" + address +
-            "quantity=" + quantity +
+            ",quantity=" + quantity +
             '}';
     }
 }
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadDiscreteInputsModbusField.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadDiscreteInputsModbusField.java
index 00cb49598ab..18ce8d54191 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadDiscreteInputsModbusField.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadDiscreteInputsModbusField.java
@@ -18,10 +18,9 @@ Licensed to the Apache Software Foundation (ASF) under one
  */
 package org.apache.plc4x.java.modbus.model;
 
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
 
 public class ReadDiscreteInputsModbusField extends ModbusField {
 
@@ -39,7 +38,11 @@ public static ReadDiscreteInputsModbusField of(String addressString) throws PlcI
         int address = Integer.parseInt(matcher.group("address"));
 
         String quantityString = matcher.group("quantity");
-        Integer quantity = quantityString != null ? Integer.valueOf(quantityString) : null;
+        Integer quantity = quantityString != null ? Integer.valueOf(quantityString) : null;  
+        if (quantity != null) {
+            if ((quantity < 0) || (quantity > 2000)) throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN);
+        }
+        
         return new ReadDiscreteInputsModbusField(address, quantity);
     }
 }
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadHoldingRegistersModbusField.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadHoldingRegistersModbusField.java
index 9f51e1eb67a..b21f50fa83b 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadHoldingRegistersModbusField.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadHoldingRegistersModbusField.java
@@ -18,10 +18,9 @@ Licensed to the Apache Software Foundation (ASF) under one
  */
 package org.apache.plc4x.java.modbus.model;
 
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
 
 public class ReadHoldingRegistersModbusField extends ModbusField {
 
@@ -40,6 +39,10 @@ public static ReadHoldingRegistersModbusField of(String addressString) throws Pl
 
         String quantityString = matcher.group("quantity");
         Integer quantity = quantityString != null ? Integer.valueOf(quantityString) : null;
+        if (quantity != null) {
+            if ((quantity < 0) || (quantity > 125)) throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN);   
+        }
+        
         return new ReadHoldingRegistersModbusField(address, quantity);
     }
 }
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadInputRegistersModbusField.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadInputRegistersModbusField.java
index 3b61343760d..53d7b7ccbae 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadInputRegistersModbusField.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadInputRegistersModbusField.java
@@ -18,10 +18,9 @@ Licensed to the Apache Software Foundation (ASF) under one
  */
 package org.apache.plc4x.java.modbus.model;
 
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
 
 public class ReadInputRegistersModbusField extends ModbusField {
 
@@ -40,6 +39,10 @@ public static ReadInputRegistersModbusField of(String addressString) throws PlcI
 
         String quantityString = matcher.group("quantity");
         Integer quantity = quantityString != null ? Integer.valueOf(quantityString) : null;
+        if (quantity != null) {
+            if ((quantity < 0) || (quantity > 125)) throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN); 
+        }
+        
         return new ReadInputRegistersModbusField(address, quantity);
     }
 }
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/RegisterModbusField.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/RegisterModbusField.java
index 06973641285..67eb0ba4692 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/RegisterModbusField.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/RegisterModbusField.java
@@ -18,10 +18,9 @@ Licensed to the Apache Software Foundation (ASF) under one
  */
 package org.apache.plc4x.java.modbus.model;
 
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
 
 // TODO: Default to {@link ReadHoldingRegistersModbusField}
 public class RegisterModbusField extends ModbusField {
@@ -41,6 +40,10 @@ public static RegisterModbusField of(String addressString) throws PlcInvalidFiel
 
         String quantityString = matcher.group("quantity");
         Integer quantity = quantityString != null ? Integer.valueOf(quantityString) : null;
+        if (quantity != null){
+            if ((quantity < 0) || (quantity > 125)) throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN);   
+        }
+        
         return new RegisterModbusField(address, quantity);
     }
 }
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocol.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocol.java
index 12be747bb8d..8ddd1647209 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocol.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocol.java
@@ -26,6 +26,11 @@ Licensed to the Apache Software Foundation (ASF) under one
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToMessageCodec;
+import java.math.BigInteger;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
@@ -45,12 +50,6 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.math.BigInteger;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicInteger;
-
 
 public class Plc4XModbusProtocol extends MessageToMessageCodec<ModbusTcpPayload, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse>> {
 
@@ -60,6 +59,12 @@ public class Plc4XModbusProtocol extends MessageToMessageCodec<ModbusTcpPayload,
 
     private final ConcurrentMap<Short, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse>> requestsMap = new ConcurrentHashMap<>();
 
+    private final short slaveId;
+
+    public Plc4XModbusProtocol(short slaveId) {
+        this.slaveId = slaveId;
+    }
+
     @Override
     protected void encode(ChannelHandlerContext ctx, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> msg, List<Object> out) throws Exception {
         LOGGER.trace("(<--OUT): {}, {}, {}", ctx, msg, out);
@@ -89,8 +94,6 @@ private void encodeWriteRequest(PlcRequestContainer<InternalPlcRequest, Internal
             LOGGER.warn("Supplied number of values [{}] don't match t the addressed quantity of [{}]", field.getQuantity(), quantity);
         }
 
-        short unitId = 0;
-
         /*
          * It seems that in Modbus, there are only two types of resources, that can be accessed:
          * - Register: 2 byte value
@@ -137,7 +140,9 @@ private void encodeWriteRequest(PlcRequestContainer<InternalPlcRequest, Internal
                 byte[] bytesToWrite = produceCoilValues(Arrays.asList(request.getFieldItem(fieldName).getValues()));
                 // As each coil value represents a bit, the number of bytes needed
                 // equals "ceil(quantity/8)" (a 3 bit shift is a division by 8 ... the +1 is the "ceil")
-                int requiredLength = (quantity >> 3) + 1;
+                // (8/8)+1 = 2, but must be 1;
+                int temp = quantity - 1;
+                int requiredLength = (temp >> 3) + 1;
                 if (bytesToWrite.length != requiredLength) {
                     throw new PlcProtocolException(
                         "Invalid coil values created. Should be big enough to transport N bits. Was " +
@@ -163,7 +168,7 @@ private void encodeWriteRequest(PlcRequestContainer<InternalPlcRequest, Internal
         }
         short transactionId = (short) this.transactionId.getAndIncrement();
         requestsMap.put(transactionId, msg);
-        out.add(new ModbusTcpPayload(transactionId, unitId, modbusRequest));
+        out.add(new ModbusTcpPayload(transactionId, slaveId, modbusRequest));
     }
 
     private void encodeReadRequest(PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> msg, List<Object> out) throws PlcException {
@@ -178,8 +183,6 @@ private void encodeReadRequest(PlcRequestContainer<InternalPlcRequest, InternalP
 
         ModbusField field = (ModbusField) request.getField(fieldName);
         int quantity = field.getQuantity();
-        // TODO: the unit the should be used for multiple Requests
-        short unitId = 0;
 
         ModbusPdu modbusRequest;
         if (field instanceof CoilModbusField) {
@@ -202,7 +205,7 @@ private void encodeReadRequest(PlcRequestContainer<InternalPlcRequest, InternalP
         }
         short transactionId = (short) this.transactionId.getAndIncrement();
         requestsMap.put(transactionId, msg);
-        out.add(new ModbusTcpPayload(transactionId, unitId, modbusRequest));
+        out.add(new ModbusTcpPayload(transactionId, slaveId, modbusRequest));
     }
 
     @SuppressWarnings("unchecked")
@@ -330,8 +333,10 @@ private boolean produceCoilValue(List<?> values) throws PlcProtocolException {
 
     private byte[] produceCoilValues(List<?> values) throws PlcProtocolException {
         List<Byte> coils = new LinkedList<>();
+        int items = values.size();
         byte actualCoil = 0;
         int i = 7;
+        
         for (Object value : values) {
             final boolean coilSet;
             if (value.getClass() == Boolean.class) {
@@ -381,13 +386,17 @@ private byte[] produceCoilValues(List<?> values) throws PlcProtocolException {
                 throw new PlcUnsupportedDataTypeException(value.getClass());
             }
             byte coilToSet = coilSet ? (byte) 1 : (byte) 0;
-            actualCoil = (byte) (actualCoil & 0xff | coilToSet << i);
-            i--;
-            if (i < 0) {
+            int pos = 7 - i;
+            actualCoil = (byte) (actualCoil & 0xff | coilToSet << pos);
+            items--;
+            i--; 
+            if ((items!=0) && (i < 0)) {
                 coils.add(actualCoil);
                 actualCoil = 0;
-                i = 8;
+                i = 7;
             }
+            if (items==0) coils.add(actualCoil);            
+            
         }
         if (coils.isEmpty()) {
             // We only have one coil
@@ -523,4 +532,4 @@ private DefaultModbusByteArrayFieldItem produceRegisterValueList(ByteBuf byteBuf
         }
         return new DefaultModbusByteArrayFieldItem(data.toArray(new Byte[0][0]));
     }
-}
+}
\ No newline at end of file
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/util/ModbusPlcFieldHandler.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/util/ModbusPlcFieldHandler.java
index eaf3912a852..1edea540441 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/util/ModbusPlcFieldHandler.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/util/ModbusPlcFieldHandler.java
@@ -18,6 +18,18 @@ Licensed to the Apache Software Foundation (ASF) under one
  */
 package org.apache.plc4x.java.modbus.util;
 
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneOffset;
+import java.util.BitSet;
+import java.util.LinkedList;
+import java.util.List;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
 import org.apache.plc4x.java.api.model.PlcField;
@@ -27,10 +39,6 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.modbus.messages.items.DefaultModbusByteArrayFieldItem;
 import org.apache.plc4x.java.modbus.model.*;
 
-import java.util.BitSet;
-import java.util.LinkedList;
-import java.util.List;
-
 public class ModbusPlcFieldHandler extends DefaultPlcFieldHandler {
 
     @Override
@@ -111,4 +119,322 @@ public BaseDefaultFieldItem encodeByteArray(PlcField field, Object[] values) {
         }
         return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
     }
+
+    @Override
+    public BaseDefaultFieldItem encodeShort(PlcField field, Object[] values) {
+        int size = Short.BYTES;   
+        ModbusField modbusField = (ModbusField) field;
+        List<Byte[]> byteArrays = new LinkedList<>();        
+        byte[] backend = new byte[values.length * size];
+        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
+        byteBuf.clear();
+        if ((modbusField.getQuantity()*2/size) == values.length) {  
+            for (int i = 0; i < values.length; i++) {
+                if (values[i] instanceof Short){
+                    byteBuf.writeShort((Short) values[i]);
+                }
+            }
+            
+            BytesToRegisters(backend, byteArrays);     
+            
+            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
+        } else {
+            throw new IllegalArgumentException(
+                "Value of type " + values.getClass().getName() +
+                    " is not assignable to " + modbusField + " fields.");                    
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeLong(PlcField field, Object[] values) {
+        int size = Long.BYTES;          
+        ModbusField modbusField = (ModbusField) field;
+        List<Byte[]> byteArrays = new LinkedList<>();        
+        byte[] backend = new byte[values.length * size];
+        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
+        byteBuf.clear();
+        if ((modbusField.getQuantity()*2/size) == values.length) {  
+            for (int i = 0; i < values.length; i++) {
+                if (values[i] instanceof Long){
+                    byteBuf.writeLong((Long) values[i]);
+                }
+            }
+            
+            BytesToRegisters(backend, byteArrays);     
+            
+            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
+        } else {
+            throw new IllegalArgumentException(
+                "Value of type " + values.getClass().getName() +
+                    " is not assignable to " + modbusField + " fields.");                    
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDouble(PlcField field, Object[] values) {
+        int size = Double.BYTES;          
+        ModbusField modbusField = (ModbusField) field;
+        List<Byte[]> byteArrays = new LinkedList<>();        
+        byte[] backend = new byte[values.length * size];
+        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
+        byteBuf.clear();
+        if ((modbusField.getQuantity()*2/size) == values.length) {  
+            for (int i = 0; i < values.length; i++) {
+                if (values[i] instanceof Double){
+                    byteBuf.writeDouble((Double) values[i]);
+                }
+            }
+            
+            BytesToRegisters(backend, byteArrays);     
+            
+            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
+        } else {
+            throw new IllegalArgumentException(
+                "Value of type " + values.getClass().getName() +
+                    " is not assignable to " + modbusField + " fields.");                    
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeInteger(PlcField field, Object[] values) {
+        int size = Integer.BYTES;         
+        ModbusField modbusField = (ModbusField) field;
+        List<Byte[]> byteArrays = new LinkedList<>();        
+        byte[] backend = new byte[values.length * size];
+        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
+        byteBuf.clear();
+        if ((modbusField.getQuantity()*2/size) == values.length) {  
+            for (int i = 0; i < values.length; i++) {
+                if (values[i] instanceof Integer){
+                    byteBuf.writeInt((Integer) values[i]);
+                }
+            }
+            
+            BytesToRegisters(backend, byteArrays);     
+            
+            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
+        } else {
+            throw new IllegalArgumentException(
+                "Value of type " + values.getClass().getName() +
+                    " is not assignable to " + modbusField + " fields.");                    
+        }
+    }
+    
+    @Override
+    public BaseDefaultFieldItem encodeFloat(PlcField field, Object[] values) {
+        int size = Float.BYTES;        
+        ModbusField modbusField = (ModbusField) field;
+        List<Byte[]> byteArrays = new LinkedList<>();        
+        byte[] backend = new byte[values.length * size];
+        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
+        byteBuf.clear();
+        if ((modbusField.getQuantity()*2/size) == values.length) {  
+            for (int i = 0; i < values.length; i++) {
+                if (values[i] instanceof Float){
+                    byteBuf.writeFloat((Float) values[i]);
+                }
+            }
+            
+            BytesToRegisters(backend, byteArrays);
+            
+            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
+        } else {
+            throw new IllegalArgumentException(
+                "Value of type " + values.getClass().getName() +
+                    " is not assignable to " + modbusField + " fields.");                    
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDuration(PlcField field, Object[] values) {
+        int size = Long.BYTES;
+        ModbusField modbusField = (ModbusField) field;
+        List<Byte[]> byteArrays = new LinkedList<>();        
+        byte[] backend = new byte[values.length * size];
+        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
+        byteBuf.clear();
+        if ((modbusField.getQuantity()*2/size) == values.length) {  
+            for (int i = 0; i < values.length; i++) {
+                if (values[i] instanceof Duration){
+                    byteBuf.writeLong(((Duration) values[i]).toNanos());
+                }
+            }
+            
+            BytesToRegisters(backend, byteArrays);
+            
+            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
+        } else {
+            throw new IllegalArgumentException(
+                "Value of type " + values.getClass().getName() +
+                    " is not assignable to " + modbusField + " fields.");                    
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeTime(PlcField field, Object[] values) {
+        int size = Long.BYTES;        
+        ModbusField modbusField = (ModbusField) field;
+        List<Byte[]> byteArrays = new LinkedList<>();        
+        byte[] backend = new byte[values.length * size];
+        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
+        byteBuf.clear();
+        if ((modbusField.getQuantity()*2/size) == values.length) {  
+            for (int i = 0; i < values.length; i++) {
+                if (values[i] instanceof LocalTime){
+                    byteBuf.writeLong(((LocalTime) values[i]).toNanoOfDay());
+                }
+            }
+            
+            BytesToRegisters(backend, byteArrays);     
+            
+            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
+        } else {
+            throw new IllegalArgumentException(
+                "Value of type " + values.getClass().getName() +
+                    " is not assignable to " + modbusField + " fields.");                    
+        }
+    }
+    
+    @Override
+    public BaseDefaultFieldItem encodeDate(PlcField field, Object[] values) {
+        int size = Long.BYTES;        
+        ModbusField modbusField = (ModbusField) field;
+        List<Byte[]> byteArrays = new LinkedList<>();        
+        byte[] backend = new byte[values.length * size];
+        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
+        byteBuf.clear();
+        if ((modbusField.getQuantity()*2/size) == values.length) {   
+            for (int i = 0; i < values.length; i++) {
+                if (values[i] instanceof LocalDate){
+                    byteBuf.writeLong(((LocalDate) values[i]).toEpochDay());
+                }
+            }
+            
+            BytesToRegisters(backend, byteArrays);     
+            
+            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
+        } else {
+            throw new IllegalArgumentException(
+                "Value of type " + values.getClass().getName() +
+                    " is not assignable to " + modbusField + " fields.");                    
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDateTime(PlcField field, Object[] values) {
+        int size = Long.BYTES;        
+        ModbusField modbusField = (ModbusField) field;
+        List<Byte[]> byteArrays = new LinkedList<>();        
+        byte[] backend = new byte[values.length * size];
+        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
+        byteBuf.clear();
+        if ((modbusField.getQuantity()*2/size) == values.length) {   
+            for (int i = 0; i < values.length; i++) {
+                if (values[i] instanceof LocalDateTime){
+                    byteBuf.writeLong(((LocalDateTime) values[i]).toEpochSecond(ZoneOffset.UTC));
+                }
+            }
+            
+            BytesToRegisters(backend, byteArrays);     
+            
+            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
+        } else {
+            throw new IllegalArgumentException(
+                "Value of type " + values.getClass().getName() +
+                    " is not assignable to " + modbusField + " fields.");                    
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeBigDecimal(PlcField field, Object[] values) {
+        int size = 4; //BigInteger
+        ModbusField modbusField = (ModbusField) field;
+        List<Byte[]> byteArrays = new LinkedList<>();        
+        byte[] backend = new byte[values.length * size];
+        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
+        byteBuf.clear();
+        if ((modbusField.getQuantity()*2/size) == values.length) {   
+            for (int i = 0; i < values.length; i++) {
+                if (values[i] instanceof BigDecimal){
+                    byteBuf.writeBytes(((BigDecimal) values[i]).toBigInteger().toByteArray());
+                }
+            }
+            
+            BytesToRegisters(backend, byteArrays);     
+            
+            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
+        } else {
+            throw new IllegalArgumentException(
+                "Value of type " + values.getClass().getName() +
+                    " is not assignable to " + modbusField + " fields.");                    
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeBigInteger(PlcField field, Object[] values) {
+        int size = 4; //BigInteger
+        ModbusField modbusField = (ModbusField) field;
+        List<Byte[]> byteArrays = new LinkedList<>();        
+        byte[] backend = new byte[values.length * size];
+        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
+        byteBuf.clear();
+        if ((modbusField.getQuantity()*2/size) == values.length) {   
+            for (int i = 0; i < values.length; i++) {
+                if (values[i] instanceof BigInteger){
+                    byteBuf.writeBytes(((BigInteger) values[i]).toByteArray());
+                }
+            }
+            
+            BytesToRegisters(backend, byteArrays);     
+            
+            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
+        } else {
+            throw new IllegalArgumentException(
+                "Value of type " + values.getClass().getName() +
+                    " is not assignable to " + modbusField + " fields.");                    
+        }
+    }
+    
+    @Override
+    public BaseDefaultFieldItem encodeString(PlcField field, Object[] values) {
+        int size = 0; //BigInteger
+        ModbusField modbusField = (ModbusField) field;
+        List<Byte[]> byteArrays = new LinkedList<>();  
+        for (Object value:values) size+=((String) value).getBytes().length;
+        size+=((size % 2) == 0)?0:1;
+        byte[] backend = new byte[values.length * size];
+        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
+        byteBuf.clear();
+
+        if ((modbusField.getQuantity()*2) == values.length) {   
+            for (int i = 0; i < values.length; i++) {
+                if (values[i] instanceof String){
+                    byteBuf.writeBytes(((String) values[i]).getBytes());
+                }
+            }
+            if(byteBuf.readableBytes()<size) byteBuf.writeByte(0);
+            BytesToRegisters(backend, byteArrays);
+            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
+        } else {
+            throw new IllegalArgumentException(
+                "Value of type " + values.getClass().getName() +
+                    " is not assignable to " + modbusField + " fields.");                    
+        }
+    }
+    
+    
+    private static void BytesToRegisters(byte[] backend, List<Byte[]> registers){
+        Byte[] tempBytes = null;        
+        int quantity = (backend.length) / 2;
+        for (int j=0; j < quantity; j++){
+            tempBytes = new Byte[2];
+            tempBytes[0] = backend[(j*2)];
+            tempBytes[1] = backend[((j*2+1))];
+            registers.add(tempBytes);
+        }        
+    }
+   
+    
+    
+    
 }
diff --git a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocolTest.java b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocolTest.java
index a746a23887d..30b37a23289 100644
--- a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocolTest.java
+++ b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocolTest.java
@@ -158,7 +158,7 @@ private static byte[] cutRegister(byte[] right) {
 
     @Before
     public void setUp() {
-        SUT = new Plc4XModbusProtocol();
+        SUT = new Plc4XModbusProtocol((short) 1);
     }
 
     @Test

From 4b2ae76a5077cd59196e900cb159e32d68f3af89 Mon Sep 17 00:00:00 2001
From: Cesar Garcia <cesar.garcia@ceos.com.ve>
Date: Sat, 12 Dec 2020 15:31:49 -0400
Subject: [PATCH 16/17] Prueba

---
 .dockerignore                                 |   40 +-
 .editorconfig                                 |   62 +-
 .gitignore                                    |  338 +-
 .gitlab-ci.yml                                |   96 +-
 .mvn/extensions.xml                           |   54 +-
 .mvn/wrapper/MavenWrapperDownloader.java      |  234 +-
 .mvn/wrapper/maven-wrapper.properties         |   38 +-
 .travis.yml                                   |   60 +-
 DEVELOPMENT.md                                |   98 +-
 Dockerfile                                    |  228 +-
 Jenkinsfile                                   |  618 +--
 LICENSE                                       |  444 +-
 NOTICE                                        |   26 +-
 README.md                                     |  560 +-
 RELEASE_NOTES                                 |  472 +-
 Sometimes-Failling-Tests.md                   |   64 +-
 build-reproducible.sh                         |  136 +-
 build-utils/language-base-freemarker/pom.xml  |  110 +-
 .../freemarker/FreemarkerLanguageOutput.java  |  258 +-
 .../FreemarkerLanguageTemplateHelper.java     |   46 +-
 build-utils/language-java/pom.xml             |  114 +-
 .../language/java/JavaLanguageOutput.java     |  114 +-
 .../java/JavaLanguageTemplateHelper.java      | 1300 ++---
 ...gins.codegenerator.language.LanguageOutput |   38 +-
 .../templates/java/enum-template.ftlh         |  196 +-
 .../resources/templates/java/io-template.ftlh |  862 +--
 .../templates/java/pojo-template.ftlh         |  416 +-
 build-utils/pom.xml                           |   86 +-
 build-utils/protocol-base-mspec/pom.xml       |  136 +-
 .../codegenerator/language/mspec/MSpec.g4     |  456 +-
 .../language/mspec/expression/Expression.g4   |  222 +-
 .../expression/ExpressionStringListener.java  |  696 +--
 .../expression/ExpressionStringParser.java    |   96 +-
 .../DefaultComplexTypeDefinition.java         |  184 +-
 ...ultDiscriminatedComplexTypeDefinition.java |  100 +-
 .../DefaultEnumTypeDefinition.java            |  138 +-
 .../model/definitions/DefaultEnumValue.java   |  106 +-
 .../definitions/DefaultTypeDefinition.java    |  120 +-
 .../mspec/model/fields/DefaultArrayField.java |  128 +-
 .../model/fields/DefaultChecksumField.java    |  110 +-
 .../mspec/model/fields/DefaultConstField.java |  110 +-
 .../fields/DefaultDiscriminatorField.java     |   98 +-
 .../mspec/model/fields/DefaultEnumField.java  |  102 +-
 .../model/fields/DefaultImplicitField.java    |  110 +-
 .../model/fields/DefaultManualArrayField.java |  164 +-
 .../model/fields/DefaultManualField.java      |  138 +-
 .../model/fields/DefaultOptionalField.java    |  114 +-
 .../model/fields/DefaultPaddingField.java     |  126 +-
 .../model/fields/DefaultReservedField.java    |   98 +-
 .../model/fields/DefaultSimpleField.java      |  102 +-
 .../model/fields/DefaultSwitchField.java      |  112 +-
 .../model/fields/DefaultTaggedField.java      |   72 +-
 .../model/fields/DefaultVirtualField.java     |  110 +-
 .../DefaultComplexTypeReference.java          |   74 +-
 .../DefaultSimpleTypeReference.java           |   88 +-
 .../DefaultSimpleVarLengthTypeReference.java  |   60 +-
 .../mspec/parser/MessageFormatListener.java   |  938 ++--
 .../mspec/parser/MessageFormatParser.java     |  100 +-
 .../src/remote-resources/LICENSE              |    6 +-
 .../src/remote-resources/UNLICENSE            |   46 +-
 build-utils/protocol-test/pom.xml             |  170 +-
 .../plc4x/protocol/test/TestProtocol.java     |   90 +-
 ...4x.plugins.codegenerator.protocol.Protocol |   36 +-
 .../main/resources/protocols/test/test.mspec  |  140 +-
 .../src/site/asciidoc/index.adoc              |  236 +-
 build-utils/protocol-test/src/site/site.xml   |  288 +-
 compare-reproducible.sh                       |   82 +-
 jenkins.pom                                   |  176 +-
 licenses/UNLICENSE                            |   46 +-
 media/logos/SVG/PLC4X logo without mascot.svg |  116 +-
 media/logos/SVG/logo PLC4X black line.svg     | 3194 +++++------
 .../logos/SVG/logo PLC4X color CMYK@300x.svg  | 2982 +++++-----
 media/logos/SVG/logo PLC4X on dark bg.svg     | 2982 +++++-----
 media/logos/SVG/logo PLC4X white line.svg     | 3194 +++++------
 .../SVG/mascot color with apache feather.svg  | 4922 ++++++++--------
 .../SVG/mascot color without feather.svg      | 2804 +++++-----
 mvnw                                          |  610 +-
 mvnw.cmd                                      |  342 +-
 plc4j/api/pom.xml                             |   96 +-
 .../apache/plc4x/java/PlcDriverManager.java   |  212 +-
 .../apache/plc4x/java/api/PlcConnection.java  |  210 +-
 .../api/authentication/PlcAuthentication.java |   44 +-
 .../PlcUsernamePasswordAuthentication.java    |  138 +-
 .../exceptions/PlcConnectionException.java    |   80 +-
 .../java/api/exceptions/PlcException.java     |   88 +-
 .../exceptions/PlcFieldRangeException.java    |   56 +-
 .../PlcIncompatibleDatatypeException.java     |   56 +-
 .../exceptions/PlcInvalidFieldException.java  |  100 +-
 .../java/api/exceptions/PlcIoException.java   |   86 +-
 .../PlcNotImplementedException.java           |   60 +-
 .../api/exceptions/PlcProtocolException.java  |   90 +-
 .../PlcProtocolPayloadTooBigException.java    |  106 +-
 .../api/exceptions/PlcRuntimeException.java   |   88 +-
 .../api/exceptions/PlcTimeoutException.java   |   92 +-
 .../PlcUnsupportedDataTypeException.java      |   92 +-
 .../PlcUnsupportedOperationException.java     |   54 +-
 .../PlcUnsupportedProtocolException.java      |   72 +-
 .../java/api/messages/PlcFieldRequest.java    |   80 +-
 .../java/api/messages/PlcFieldResponse.java   |   82 +-
 .../plc4x/java/api/messages/PlcMessage.java   |   52 +-
 .../java/api/messages/PlcReadRequest.java     |   82 +-
 .../java/api/messages/PlcReadResponse.java    |  390 +-
 .../plc4x/java/api/messages/PlcRequest.java   |   56 +-
 .../java/api/messages/PlcRequestBuilder.java  |   46 +-
 .../plc4x/java/api/messages/PlcResponse.java  |   54 +-
 .../api/messages/PlcSubscriptionEvent.java    |   56 +-
 .../api/messages/PlcSubscriptionRequest.java  |  134 +-
 .../api/messages/PlcSubscriptionResponse.java |   68 +-
 .../messages/PlcUnsubscriptionRequest.java    |   98 +-
 .../messages/PlcUnsubscriptionResponse.java   |   52 +-
 .../java/api/messages/PlcWriteRequest.java    |  152 +-
 .../java/api/messages/PlcWriteResponse.java   |   52 +-
 .../api/metadata/PlcConnectionMetadata.java   |   84 +-
 .../api/model/PlcConsumerRegistration.java    |   48 +-
 .../apache/plc4x/java/api/model/PlcField.java |  102 +-
 .../java/api/model/PlcSubscriptionHandle.java |   74 +-
 .../java/api/types/PlcClientDatatype.java     |   70 +-
 .../plc4x/java/api/types/PlcResponseCode.java |   62 +-
 .../java/api/types/PlcSubscriptionType.java   |   84 +-
 .../org/apache/plc4x/java/spi/PlcDriver.java  |  122 +-
 plc4j/api/src/site/asciidoc/design.adoc       |  102 +-
 .../plc4x/java/PlcDriverManagerTest.java      |  234 +-
 ...PlcUsernamePasswordAuthenticationTest.java |  116 +-
 .../java/api/connection/PlcReaderTest.java    |  116 +-
 .../java/api/connection/PlcWriterTest.java    |   72 +-
 .../PlcConnectionExceptionTest.java           |  110 +-
 .../java/api/exceptions/PlcExceptionTest.java |  110 +-
 .../PlcFieldRangeExceptionTest.java           |   70 +-
 .../PlcIncompatibleDatatypeExceptionTest.java |   68 +-
 .../PlcInvalidFieldExceptionTest.java         |  116 +-
 .../api/exceptions/PlcIoExceptionTest.java    |  110 +-
 .../PlcNotImplementedExceptionTest.java       |   68 +-
 .../exceptions/PlcProtocolExceptionTest.java  |  110 +-
 ...PlcProtocolPayloadTooBigExceptionTest.java |   82 +-
 .../exceptions/PlcRuntimeExceptionTest.java   |  110 +-
 .../exceptions/PlcTimeoutExceptionTest.java   |   76 +-
 .../PlcUnsupportedDataTypeExceptionTest.java  |  124 +-
 .../PlcUnsupportedOperationExceptionTest.java |   68 +-
 .../java/api/messages/APIMessageTests.java    |  536 +-
 .../messages/PlcProprietaryRequestTest.java   |   88 +-
 .../messages/PlcProprietaryResponseTest.java  |  108 +-
 .../java/api/messages/PlcReadRequestTest.java |  216 +-
 .../api/messages/PlcReadResponseTest.java     |   84 +-
 .../java/api/messages/PlcRequestTest.java     |  212 +-
 .../java/api/messages/PlcResponseTest.java    |  180 +-
 .../messages/PlcSubscriptionEventTest.java    |  116 +-
 .../messages/PlcSubscriptionRequestTest.java  |   58 +-
 .../messages/PlcSubscriptionResponseTest.java |   76 +-
 .../PlcUnsubscriptionRequestTest.java         |  150 +-
 .../PlcUnsubscriptionResponseTest.java        |   58 +-
 .../api/messages/PlcWriteRequestTest.java     |  224 +-
 .../api/messages/PlcWriteResponseTest.java    |   94 +-
 .../java/api/messages/mock/MockField.java     |  104 +-
 .../specific/TypeSafePlcReadRequestTest.java  |  152 +-
 .../specific/TypeSafePlcReadResponseTest.java |  164 +-
 .../specific/TypeSafePlcWriteRequestTest.java |  152 +-
 .../TypeSafePlcWriteResponseTest.java         |  134 +-
 .../java/api/types/PlcClientDatatypeTest.java |   90 +-
 .../java/api/types/PlcResponseCodeTest.java   |   76 +-
 .../api/types/PlcSubscriptionTypeTest.java    |   70 +-
 .../plc4x/java/mock/DuplicateMockDriver.java  |   46 +-
 .../apache/plc4x/java/mock/MockDriver.java    |  110 +-
 .../plc4x/java/mock/MockPlcConnection.java    |   58 +-
 .../org.apache.plc4x.java.spi.PlcDriver       |   38 +-
 .../org.apache.plc4x.java.spi.PlcDriver       |   38 +-
 plc4j/drivers/ab-eth/pom.xml                  |  264 +-
 .../apache/plc4x/java/abeth/AbEthDriver.java  |  144 +-
 .../abeth/connection/AbEthFieldHandler.java   |   72 +-
 .../abeth/connection/AbEthPlcConnection.java  |  316 +-
 .../plc4x/java/abeth/model/AbEthField.java    |  210 +-
 .../java/abeth/model/types/FileType.java      |  130 +-
 .../java/abeth/protocol/AbEthProtocol.java    |  122 +-
 .../abeth/protocol/Plc4xAbEthProtocol.java    |  502 +-
 .../org.apache.plc4x.java.spi.PlcDriver       |   38 +-
 .../plc4x/protocol/abeth/AbEthTest.java       |   60 +-
 .../resources/testsuite/AbEthTestsuite.xml    |  322 +-
 plc4j/drivers/ads/pom.xml                     |  216 +-
 .../apache/plc4x/java/ads/AdsPlcDriver.java   |  216 +-
 .../connection/AdsAbstractPlcConnection.java  |  498 +-
 .../ads/connection/AdsConnectionFactory.java  |  116 +-
 .../connection/AdsSerialPlcConnection.java    |  140 +-
 .../ads/connection/AdsTcpPlcConnection.java   |  750 +--
 .../org.apache.plc4x.java.spi.PlcDriver       |   38 +-
 .../plc4x/java/ads/AdsPlcDriverTest.java      |  328 +-
 .../adslib/ADSClientNotificationExample.java  |  566 +-
 .../apache/plc4x/java/ads/adslib/AdsLib.java  | 1130 ++--
 .../plc4x/java/ads/adslib/AmsRequest.java     |  102 +-
 .../plc4x/java/ads/adslib/AmsRouter.java      |  768 +--
 .../apache/plc4x/java/ads/adslib/Output.java  |   76 +-
 .../plc4x/java/ads/adslib/package-info.java   |   46 +-
 .../AdsAbstractPlcConnectionTest.java         |  698 +--
 .../connection/AdsConnectionFactoryTest.java  |  328 +-
 .../AdsSerialPlcConnectionTest.java           |  484 +-
 .../connection/AdsTcpPlcConnectionTests.java  |  380 +-
 plc4j/drivers/ethernet-ip/pom.xml             |  236 +-
 .../java/ethernetip/EtherNetIpPlcDriver.java  |  166 +-
 .../BaseEtherNetIpPlcConnection.java          |  214 +-
 .../EtherNetIpTcpPlcConnection.java           |  168 +-
 .../org.apache.plc4x.java.spi.PlcDriver       |   38 +-
 .../plc4x/java/ethernetip/EnipTest.java       |  130 +-
 .../ethernetip/ManualPlc4XEtherNetIpTest.java |  110 +-
 plc4j/drivers/modbus/pom.xml                  |  200 +-
 .../plc4x/java/modbus/ModbusPlcDriver.java    |  190 +-
 .../connection/BaseModbusPlcConnection.java   |  234 +-
 .../connection/ModbusConnectionFactory.java   |   80 +-
 .../connection/ModbusSerialPlcConnection.java |   94 +-
 .../connection/ModbusTcpPlcConnection.java    |  162 +-
 .../org.apache.plc4x.java.spi.PlcDriver       |   38 +-
 .../java/modbus/ModbusPlcDriverTest.java      |  250 +-
 .../BaseModbusPlcConnectionTest.java          |  310 +-
 .../ModbusConnectionFactoryTest.java          |  188 +-
 .../ModbusSerialPlcConnectionTest.java        |  432 +-
 .../ModbusTcpPlcConnectionTests.java          |  118 +-
 plc4j/drivers/opcua/pom.xml                   |  182 +-
 .../plc4x/java/opcua/OpcuaPlcDriver.java      |  192 +-
 .../connection/BaseOpcuaPlcConnection.java    |  190 +-
 .../connection/OpcuaConnectionFactory.java    |   78 +-
 .../connection/OpcuaTcpPlcConnection.java     |  928 ++--
 .../plc4x/java/opcua/protocol/OpcuaField.java |  236 +-
 .../opcua/protocol/OpcuaPlcFieldHandler.java  |  302 +-
 .../protocol/OpcuaSubsriptionHandle.java      |  164 +-
 .../opcua/protocol/model/OpcuaDataTypes.java  |   92 +-
 .../protocol/model/OpcuaIdentifierType.java   |   98 +-
 .../org.apache.plc4x.java.spi.PlcDriver       |   38 +-
 .../plc4x/java/opcua/ManualPLC4XOpcua.java    |  290 +-
 .../plc4x/java/opcua/OpcuaPlcDriverTest.java  |  134 +-
 .../apache/plc4x/java/opcua/UtilsTest.java    |   80 +-
 .../connection/OpcuaTcpPlcConnectionTest.java |   72 +-
 .../java/opcua/protocol/OpcuaFieldTest.java   |  102 +-
 .../protocol/OpcuaPlcFieldHandlerTest.java    |   72 +-
 .../protocol/OpcuaSubscriptionHandleTest.java |   72 +-
 plc4j/drivers/pom.xml                         |   90 +-
 plc4j/drivers/s7/README.md                    |   64 +-
 plc4j/drivers/s7/pom.xml                      |  284 +-
 .../org/apache/plc4x/java/s7/S7PlcDriver.java |  198 +-
 .../java/s7/connection/S7PlcConnection.java   | 1381 ++---
 .../org.apache.plc4x.java.spi.PlcDriver       |   38 +-
 .../org/apache/plc4x/java/s7/BenchmarkS7.java |  180 +-
 .../apache/plc4x/java/s7/S7PlcDriverTest.java |  162 +-
 .../java/s7/connection/S7PlcConnectionIT.java |  274 +-
 .../s7/connection/S7PlcConnectionTests.java   |  184 +-
 .../s7/connection/S7PlcTestConnection.java    |  406 +-
 .../s7/connection/issues/PLC4X47Test.java     |  102 +-
 plc4j/drivers/simulated/pom.xml               |  134 +-
 .../java/simulated/SimulatedPlcDriver.java    |  130 +-
 .../connection/SimulatedPlcConnection.java    |  438 +-
 .../java/simulated/connection/TestDevice.java |  398 +-
 .../java/simulated/connection/TestField.java  |  256 +-
 .../connection/TestFieldHandler.java          |  348 +-
 .../simulated/connection/TestFieldItem.java   |   70 +-
 .../java/simulated/connection/TestType.java   |   56 +-
 .../org.apache.plc4x.java.spi.PlcDriver       |   76 +-
 .../simulated/SimulatedPlcDriverTest.java     |  112 +-
 .../SimulatedPlcConnectionTest.java           |  488 +-
 .../simulated/connection/TestDeviceTest.java  |  112 +-
 .../connection/TestFieldHandlerTest.java      |  264 +-
 .../connection/TestFieldItemTest.java         |   60 +-
 .../simulated/connection/TestFieldTest.java   |  122 +-
 plc4j/examples/dummy-driver/pom.xml           |  190 +-
 .../examples/dummydriver/DummyDriver.java     |  134 +-
 .../connection/DummyConnection.java           |  156 +-
 .../dummydriver/model/DummyField.java         |   70 +-
 .../dummydriver/netty/DummyProtocol.java      |  150 +-
 .../org.apache.plc4x.java.spi.PlcDriver       |   38 +-
 plc4j/examples/hello-cloud-azure/pom.xml      |  288 +-
 .../java/examples/cloud/azure/CliOptions.java |  198 +-
 .../cloud/azure/S7PlcToAzureIoTHubSample.java |  172 +-
 plc4j/examples/hello-cloud-google/README.md   |  122 +-
 plc4j/examples/hello-cloud-google/pom.xml     |  298 +-
 .../examples/cloud/google/CliOptions.java     |  442 +-
 .../google/S7PlcToGoogleIoTCoreSample.java    |  572 +-
 .../src/main/resources/logback.xml            |   78 +-
 .../kafka-connector.yml                       |   68 +-
 .../examples/hello-connectivity-kafka/pom.xml |  400 +-
 .../hello-connectivity-kafka/server.sh        |   62 +-
 .../connectivity/kafka/KafkaConnector.java    |  270 +-
 .../kafka/model/Configuration.java            |  112 +-
 .../connectivity/kafka/model/KafkaConfig.java |  114 +-
 .../connectivity/kafka/model/PlcConfig.java   |  114 +-
 .../kafka/model/PlcFieldConfig.java           |  138 +-
 .../kafka/model/PlcMemoryBlock.java           |   82 +-
 .../src/main/resources/logback.xml            |   70 +-
 .../mqtt-connector.yml                        |   70 +-
 .../examples/hello-connectivity-mqtt/pom.xml  |  306 +-
 .../connectivity/mqtt/MqttConnector.java      |  308 +-
 .../mqtt/model/Configuration.java             |  112 +-
 .../connectivity/mqtt/model/MqttConfig.java   |  112 +-
 .../connectivity/mqtt/model/PlcConfig.java    |  114 +-
 .../mqtt/model/PlcFieldConfig.java            |  138 +-
 .../mqtt/model/PlcMemoryBlock.java            |   82 +-
 .../src/main/resources/logback.xml            |   70 +-
 .../examples/hello-integration-edgent/pom.xml |  256 +-
 .../integration/edgent/CliOptions.java        |  198 +-
 .../integration/edgent/PlcLogger.java         |  118 +-
 .../src/main/resources/logback.xml            |   70 +-
 .../examples/hello-integration-iotdb/pom.xml  |  270 +-
 .../integration/iotdb/CliOptions.java         |  376 +-
 .../examples/integration/iotdb/PlcLogger.java |  278 +-
 .../src/main/resources/logback.xml            |   70 +-
 plc4j/examples/hello-opm/pom.xml              |  244 +-
 .../java/examples/helloopm/HelloOpm.java      |  216 +-
 .../hello-opm/src/main/resources/logback.xml  |   70 +-
 .../hello-storage-elasticsearch/README.adoc   |  132 +-
 .../hello-storage-elasticsearch/pom.xml       |  384 +-
 .../storage/elasticsearch/CliOptions.java     |  162 +-
 .../elasticsearch/ElasticsearchStorage.java   |  534 +-
 .../src/main/resources/log4j2.xml             |   68 +-
 .../src/main/resources/logback.xml            |   78 +-
 plc4j/examples/hello-webapp/client/pom.xml    |  272 +-
 .../client/src/main/royale/HelloPLC4X.mxml    |  208 +-
 .../src/main/royale/service/RobotService.as   |  182 +-
 plc4j/examples/hello-webapp/pom.xml           |  174 +-
 plc4j/examples/hello-webapp/service/pom.xml   |  222 +-
 .../robot/controllers/RobotController.java    |  210 +-
 plc4j/examples/hello-webapp/webapp/pom.xml    |  282 +-
 .../plc4x/examples/robot/Application.java     |   64 +-
 .../src/main/resources/application.properties |   50 +-
 plc4j/examples/hello-world-plc4x/pom.xml      |  258 +-
 .../java/examples/helloplc4x/CliOptions.java  |  168 +-
 .../java/examples/helloplc4x/HelloPlc4x.java  |  228 +-
 .../src/main/resources/logback.xml            |   70 +-
 plc4j/examples/pom.xml                        |  238 +-
 plc4j/integrations/apache-calcite/pom.xml     |  192 +-
 .../java/org/apache/plc4x/Plc4xBaseTable.java |  396 +-
 .../java/org/apache/plc4x/Plc4xSchema.java    |  210 +-
 .../org/apache/plc4x/Plc4xSchemaFactory.java  |  138 +-
 .../org/apache/plc4x/Plc4xStreamTable.java    |   90 +-
 .../java/org/apache/plc4x/Plc4xTable.java     |   78 +-
 .../org/apache/plc4x/DriverManagerTest.java   |  176 +-
 .../org/apache/plc4x/Plc4XBaseTableTest.java  |  102 +-
 .../apache/plc4x/Plc4xSchemaFactoryTest.java  |   68 +-
 .../src/test/resources/example.yml            |   62 +-
 .../src/test/resources/logback.xml            |   74 +-
 .../src/test/resources/model.json             |   78 +-
 plc4j/integrations/apache-camel/pom.xml       |  362 +-
 .../apache-camel/src/main/docs/PLC4X.adoc     |   42 +-
 .../org/apache/plc4x/camel/Constants.java     |   58 +-
 .../apache/plc4x/camel/Plc4XComponent.java    |   78 +-
 .../org/apache/plc4x/camel/Plc4XConsumer.java |  250 +-
 .../org/apache/plc4x/camel/Plc4XEndpoint.java |  272 +-
 .../plc4x/camel/Plc4XPollingConsumer.java     |  270 +-
 .../org/apache/plc4x/camel/Plc4XProducer.java |  220 +-
 .../services/org/apache/camel/component/plc4x |   36 +-
 .../org/apache/plc4x/camel/ConstantsTest.java |   72 +-
 .../org/apache/plc4x/camel/ManualTest.java    |  162 +-
 .../org/apache/plc4x/camel/MockDriver.java    |  206 +-
 .../plc4x/camel/Plc4XComponentTest.java       |  130 +-
 .../apache/plc4x/camel/Plc4XConsumerTest.java |  104 +-
 .../apache/plc4x/camel/Plc4XEndpointTest.java |  110 +-
 .../plc4x/camel/Plc4XPollingConsumerTest.java |  128 +-
 .../apache/plc4x/camel/Plc4XProducerTest.java |  228 +-
 .../org.apache.plc4x.java.spi.PlcDriver       |   36 +-
 .../src/test/resources/log4j2.properties      |   48 +-
 .../src/test/resources/logback.xml            |   74 +-
 plc4j/integrations/apache-edgent/pom.xml      |  162 +-
 .../plc4x/edgent/PlcConnectionAdapter.java    |  744 +--
 .../org/apache/plc4x/edgent/PlcFunctions.java |  658 +--
 .../org/apache/plc4x/edgent/package-info.java |   48 +-
 .../edgent/PlcConnectionAdapterTest.java      | 1104 ++--
 .../apache/plc4x/edgent/PlcFunctionsTest.java |  288 +-
 .../plc4x/edgent/mock/MockConnection.java     |  310 +-
 .../apache/plc4x/edgent/mock/MockDriver.java  |   96 +-
 .../apache/plc4x/edgent/mock/MockField.java   |  124 +-
 .../plc4x/edgent/mock/MockFieldHandler.java   |  208 +-
 .../plc4x/edgent/mock/MockFieldItem.java      |   68 +-
 .../org.apache.plc4x.java.spi.PlcDriver       |   38 +-
 plc4j/integrations/apache-kafka/README.md     |  194 +-
 .../config/plc4x-source.properties            |  100 +-
 plc4j/integrations/apache-kafka/pom.xml       |  302 +-
 .../plc4x/kafka/Plc4xSourceConnector.java     |  552 +-
 .../apache/plc4x/kafka/Plc4xSourceTask.java   |  562 +-
 .../apache/plc4x/kafka/config/Defaults.java   |   66 +-
 .../org/apache/plc4x/kafka/config/Job.java    |   96 +-
 .../plc4x/kafka/config/JobReference.java      |   78 +-
 .../org/apache/plc4x/kafka/config/Source.java |   90 +-
 .../plc4x/kafka/config/SourceConfig.java      |  214 +-
 .../exceptions/ConfigurationException.java    |   62 +-
 .../apache/plc4x/kafka/util/VersionUtil.java  |   64 +-
 .../plc4x/kafka/config/SourceConfigTest.java  |  164 +-
 .../nifi-plc4x-nar/false-positives.xml        |   54 +-
 .../apache-nifi/nifi-plc4x-nar/pom.xml        |  208 +-
 .../apache-nifi/nifi-plc4x-processors/pom.xml |   94 +-
 .../apache/plc4x/nifi/BasePlc4xProcessor.java |  314 +-
 .../apache/plc4x/nifi/Plc4xSinkProcessor.java |  162 +-
 .../plc4x/nifi/Plc4xSourceProcessor.java      |  158 +-
 .../org.apache.nifi.processor.Processor       |   32 +-
 .../plc4x4nifi/Plc4xSinkProcessorTest.java    |   80 +-
 .../plc4x4nifi/Plc4xSourceProcessorTest.java  |   84 +-
 plc4j/integrations/apache-nifi/pom.xml        |  232 +-
 plc4j/integrations/logstash-plugin/README.md  |  138 +-
 plc4j/integrations/logstash-plugin/pom.xml    |  552 +-
 .../src/gem/lib/logstash-input-plc4x_jars.rb  |   42 +-
 .../src/gem/lib/logstash/inputs/plc4x.rb      |   58 +-
 .../src/gem/logstash-input-plc4x.gemspec      |   82 +-
 .../java/org/apache/plc4x/logstash/Plc4x.java |  340 +-
 .../apache/plc4x/logstash/Plc4xInputTest.java |  150 +-
 plc4j/integrations/pom.xml                    |  102 +-
 plc4j/karaf-features/README.md                |   82 +-
 plc4j/karaf-features/karaf-itest/pom.xml      |  374 +-
 .../org/apache/plc4x/karaf/FeatureIT.java     |  198 +-
 .../resources/etc/org.ops4j.pax.logging.cfg   |  140 +-
 plc4j/karaf-features/pom.xml                  |  172 +-
 plc4j/karaf-features/s7/pom.xml               |  202 +-
 .../s7/src/main/feature/feature.xml           |   96 +-
 .../org/apache/plc4x/karaf/FeatureTest.java   |  182 +-
 plc4j/pom.xml                                 |  690 +--
 plc4j/protocols/ads/LINKS.md                  |   38 +-
 plc4j/protocols/ads/pom.xml                   |  220 +-
 .../ads/api/commands/AdsAbstractRequest.java  |   80 +-
 .../ads/api/commands/AdsAbstractResponse.java |   80 +-
 .../AdsAddDeviceNotificationRequest.java      |  388 +-
 .../AdsAddDeviceNotificationResponse.java     |  226 +-
 .../java/ads/api/commands/AdsCommandType.java |   72 +-
 .../AdsDeleteDeviceNotificationRequest.java   |  192 +-
 .../AdsDeleteDeviceNotificationResponse.java  |  192 +-
 .../AdsDeviceNotificationRequest.java         |  294 +-
 .../AdsDeviceNotificationResponse.java        |   80 +-
 .../commands/AdsReadDeviceInfoRequest.java    |  114 +-
 .../commands/AdsReadDeviceInfoResponse.java   |  304 +-
 .../java/ads/api/commands/AdsReadRequest.java |  258 +-
 .../ads/api/commands/AdsReadResponse.java     |  274 +-
 .../ads/api/commands/AdsReadStateRequest.java |  114 +-
 .../api/commands/AdsReadStateResponse.java    |  246 +-
 .../ads/api/commands/AdsReadWriteRequest.java |  320 +-
 .../api/commands/AdsReadWriteResponse.java    |  266 +-
 .../api/commands/AdsWriteControlRequest.java  |  298 +-
 .../api/commands/AdsWriteControlResponse.java |  190 +-
 .../ads/api/commands/AdsWriteRequest.java     |  296 +-
 .../ads/api/commands/AdsWriteResponse.java    |  192 +-
 .../java/ads/api/commands/UnknownCommand.java |  176 +-
 .../java/ads/api/commands/package-info.java   |   42 +-
 .../commands/types/AdsNotificationSample.java |  232 +-
 .../ads/api/commands/types/AdsReturnCode.java |  474 +-
 .../api/commands/types/AdsStampHeader.java    |  226 +-
 .../java/ads/api/commands/types/AdsState.java |  170 +-
 .../ads/api/commands/types/CycleTime.java     |  118 +-
 .../java/ads/api/commands/types/Data.java     |  124 +-
 .../java/ads/api/commands/types/Device.java   |  170 +-
 .../ads/api/commands/types/DeviceState.java   |  118 +-
 .../ads/api/commands/types/IndexGroup.java    |  246 +-
 .../ads/api/commands/types/IndexOffset.java   |  146 +-
 .../java/ads/api/commands/types/Length.java   |  130 +-
 .../ads/api/commands/types/MajorVersion.java  |  136 +-
 .../java/ads/api/commands/types/MaxDelay.java |  118 +-
 .../ads/api/commands/types/MinorVersion.java  |  138 +-
 .../commands/types/NotificationHandle.java    |  118 +-
 .../ads/api/commands/types/ReadLength.java    |  118 +-
 .../java/ads/api/commands/types/Result.java   |  148 +-
 .../ads/api/commands/types/SampleSize.java    |  130 +-
 .../java/ads/api/commands/types/Samples.java  |  120 +-
 .../java/ads/api/commands/types/Stamps.java   |  118 +-
 .../ads/api/commands/types/TimeStamp.java     |  344 +-
 .../api/commands/types/TransmissionMode.java  |  154 +-
 .../java/ads/api/commands/types/Version.java  |  120 +-
 .../ads/api/commands/types/WriteLength.java   |  128 +-
 .../ads/api/commands/types/package-info.java  |   42 +-
 .../plc4x/java/ads/api/generic/AdsData.java   |   64 +-
 .../plc4x/java/ads/api/generic/AmsHeader.java |  450 +-
 .../plc4x/java/ads/api/generic/AmsPacket.java |  184 +-
 .../java/ads/api/generic/package-info.java    |   42 +-
 .../java/ads/api/generic/types/AmsError.java  |  146 +-
 .../java/ads/api/generic/types/AmsNetId.java  |  180 +-
 .../java/ads/api/generic/types/AmsPort.java   |  264 +-
 .../java/ads/api/generic/types/Command.java   |  252 +-
 .../ads/api/generic/types/DataLength.java     |  128 +-
 .../java/ads/api/generic/types/Invoke.java    |  122 +-
 .../java/ads/api/generic/types/State.java     |  406 +-
 .../ads/api/generic/types/package-info.java   |   42 +-
 .../plc4x/java/ads/api/package-info.java      |   44 +-
 .../api/serial/AmsSerialAcknowledgeFrame.java |  346 +-
 .../java/ads/api/serial/AmsSerialFrame.java   |  398 +-
 .../ads/api/serial/AmsSerialResetFrame.java   |  370 +-
 .../java/ads/api/serial/package-info.java     |   42 +-
 .../plc4x/java/ads/api/serial/types/CRC.java  |  118 +-
 .../ads/api/serial/types/FragmentNumber.java  |  138 +-
 .../ads/api/serial/types/MagicCookie.java     |  118 +-
 .../ads/api/serial/types/ReceiverAddress.java |  142 +-
 .../api/serial/types/TransmitterAddress.java  |  144 +-
 .../java/ads/api/serial/types/UserData.java   |  144 +-
 .../ads/api/serial/types/UserDataLength.java  |  138 +-
 .../ads/api/serial/types/package-info.java    |   42 +-
 .../plc4x/java/ads/api/tcp/AmsTCPPacket.java  |  188 +-
 .../plc4x/java/ads/api/tcp/AmsTcpHeader.java  |  278 +-
 .../plc4x/java/ads/api/tcp/package-info.java  |   42 +-
 .../java/ads/api/tcp/types/TcpLength.java     |  122 +-
 .../java/ads/api/tcp/types/UserData.java      |  124 +-
 .../java/ads/api/tcp/types/package-info.java  |   42 +-
 .../java/ads/api/util/ByteBufSupplier.java    |   54 +-
 .../plc4x/java/ads/api/util/ByteReadable.java |  108 +-
 .../plc4x/java/ads/api/util/ByteValue.java    |  208 +-
 .../java/ads/api/util/LengthSupplier.java     |   50 +-
 .../ads/api/util/UnsignedIntLEByteValue.java  |  208 +-
 .../api/util/UnsignedShortLEByteValue.java    |  208 +-
 .../plc4x/java/ads/api/util/package-info.java |   42 +-
 .../plc4x/java/ads/model/AdsDataType.java     | 1154 ++--
 .../apache/plc4x/java/ads/model/AdsField.java |   52 +-
 .../java/ads/model/AdsPlcFieldHandler.java    | 2030 +++----
 .../java/ads/model/AdsSubscriptionHandle.java |  170 +-
 .../plc4x/java/ads/model/DirectAdsField.java  |  282 +-
 .../java/ads/model/SymbolicAdsField.java      |  210 +-
 .../plc4x/java/ads/model/package-info.java    |   42 +-
 .../ads/protocol/Ads2PayloadProtocol.java     |  772 +--
 .../ads/protocol/Payload2SerialProtocol.java  |  352 +-
 .../ads/protocol/Payload2TcpProtocol.java     |  138 +-
 .../java/ads/protocol/Plc4x2AdsProtocol.java  |  902 +--
 .../ads/protocol/exception/AdsException.java  |  114 +-
 .../AdsProtocolOverflowException.java         |   64 +-
 .../plc4x/java/ads/protocol/package-info.java |   42 +-
 .../java/ads/protocol/util/DigestUtil.java    |  118 +-
 .../protocol/util/LittleEndianDecoder.java    |  714 +--
 .../protocol/util/LittleEndianEncoder.java    |  570 +-
 .../util/SingleMessageRateLimiter.java        |  248 +-
 .../java/ads/protocol/util/package-info.java  |   42 +-
 .../ads/src/site/asciidoc/index.adoc          |  170 +-
 .../util/LittleEndianDecoderSpec.groovy       |  198 +-
 .../util/LittleEndianEncoderSpec.groovy       |  106 +-
 .../org/apache/plc4x/java/ads/AdsDumper.java  |  228 +-
 .../plc4x/java/ads/ManualPlc4XAdsTest.java    |  188 +-
 .../AdsDeviceNotificationResponseTest.java    |   58 +-
 .../commands/CommandFactoryMethodTest.java    |  218 +-
 .../types/AdsNotificationSampleTest.java      |  136 +-
 .../commands/types/AdsStampHeaderTest.java    |  178 +-
 .../types/CommandTypesFactoryMethodTest.java  |  312 +-
 .../ads/api/commands/types/DeviceTest.java    |   72 +-
 .../ads/api/commands/types/LengthTest.java    |  118 +-
 .../api/commands/types/ReadLengthTest.java    |  120 +-
 .../api/commands/types/SampleSizeTest.java    |  120 +-
 .../ads/api/commands/types/SamplesTest.java   |  120 +-
 .../api/commands/types/WriteLengthTest.java   |  124 +-
 .../api/generic/GenericFactoryMethodTest.java |  172 +-
 .../ads/api/generic/types/AmsErrorTest.java   |  194 +-
 .../ads/api/generic/types/AmsNetIdTest.java   |  118 +-
 .../ads/api/generic/types/AmsPortTest.java    |  150 +-
 .../ads/api/generic/types/CommandTest.java    |  112 +-
 .../ads/api/generic/types/DataLengthTest.java |  152 +-
 .../types/GenericTypesFactoryMethodTest.java  |  180 +-
 .../java/ads/api/generic/types/StateTest.java |  108 +-
 .../ads/api/generic/types/TcpLengthTest.java  |  124 +-
 .../api/serial/SerialFactoryMethodTest.java   |  166 +-
 .../types/GenericTypesFactoryMethodTest.java  |  184 +-
 .../ads/api/tcp/TcpFactoryMethodTest.java     |  172 +-
 .../types/GenericTypesFactoryMethodTest.java  |  174 +-
 .../java/ads/api/util/ByteValueTest.java      |  290 +-
 .../ads/model/AdsPlcFieldHandlerTest.java     | 1180 ++--
 .../java/ads/model/DirectAdsFieldTest.java    |  140 +-
 .../ads/protocol/AbstractProtocolTest.java    |  302 +-
 .../ads/protocol/Ads2PayloadProtocolTest.java |  196 +-
 ...SerialProtocolExampleConversationTest.java |  456 +-
 .../protocol/Payload2SerialProtocolTest.java  |  224 +-
 .../ads/protocol/Payload2TcpProtocolTest.java |  222 +-
 .../ads/protocol/Plc4x2AdsProtocolTest.java   |  510 +-
 .../ads/protocol/util/DigestUtilTest.java     |  290 +-
 .../ads/src/test/resources/logback.xml        |   74 +-
 plc4j/protocols/benchmarks/README.md          |   58 +-
 plc4j/protocols/benchmarks/pom.xml            |  302 +-
 .../ads/protocol/ADSProtocolBenchmark.java    |  328 +-
 .../benchmarks/src/main/resources/logback.xml |   70 +-
 plc4j/protocols/delta-v/pom.xml               |  312 +-
 plc4j/protocols/driver-bases/base/pom.xml     |  200 +-
 .../GeneratedDriverByteToMessageCodec.java    |  158 +-
 .../java/base/PlcByteToMessageCodec.java      |  118 +-
 .../java/base/PlcMessageToMessageCodec.java   |  120 +-
 .../connection/AbstractPlcConnection.java     |  210 +-
 .../java/base/connection/ChannelFactory.java  |   66 +-
 .../connection/DefaultPlcFieldHandler.java    |  212 +-
 .../base/connection/NettyPlcConnection.java   |  264 +-
 .../java/base/connection/PlcFieldHandler.java |  124 +-
 .../plc4x/java/base/events/ConnectEvent.java  |   44 +-
 .../java/base/events/ConnectedEvent.java      |   44 +-
 .../DefaultPlcProprietaryRequest.java         |   86 +-
 .../DefaultPlcProprietaryResponse.java        |   84 +-
 .../base/messages/DefaultPlcReadRequest.java  |  226 +-
 .../base/messages/DefaultPlcReadResponse.java | 1232 ++--
 .../messages/DefaultPlcSubscriptionEvent.java |  110 +-
 .../DefaultPlcSubscriptionRequest.java        |  336 +-
 .../DefaultPlcSubscriptionResponse.java       |  180 +-
 .../DefaultPlcUnsubscriptionRequest.java      |  180 +-
 .../DefaultPlcUnsubscriptionResponse.java     |   72 +-
 .../base/messages/DefaultPlcWriteRequest.java |  572 +-
 .../messages/DefaultPlcWriteResponse.java     |  124 +-
 .../messages/InternalPlcFieldRequest.java     |   62 +-
 .../messages/InternalPlcFieldResponse.java    |   52 +-
 .../base/messages/InternalPlcMessage.java     |   46 +-
 .../InternalPlcProprietaryRequest.java        |   44 +-
 .../InternalPlcProprietaryResponse.java       |   42 +-
 .../base/messages/InternalPlcReadRequest.java |   52 +-
 .../messages/InternalPlcReadResponse.java     |   62 +-
 .../base/messages/InternalPlcRequest.java     |   48 +-
 .../base/messages/InternalPlcResponse.java    |   50 +-
 .../InternalPlcSubscriptionEvent.java         |   50 +-
 .../InternalPlcSubscriptionRequest.java       |   72 +-
 .../InternalPlcSubscriptionResponse.java      |   60 +-
 .../InternalPlcUnsubscriptionRequest.java     |   58 +-
 .../InternalPlcUnsubscriptionResponse.java    |   50 +-
 .../messages/InternalPlcWriteRequest.java     |   72 +-
 .../messages/InternalPlcWriteResponse.java    |   56 +-
 .../base/messages/PlcProprietaryRequest.java  |   50 +-
 .../base/messages/PlcProprietaryResponse.java |   50 +-
 .../base/messages/PlcProprietarySender.java   |   50 +-
 .../base/messages/PlcProtocolMessage.java     |   50 +-
 .../java/base/messages/PlcRawMessage.java     |   92 +-
 .../plc4x/java/base/messages/PlcReader.java   |   80 +-
 .../base/messages/PlcRequestContainer.java    |  170 +-
 .../java/base/messages/PlcSubscriber.java     |  126 +-
 .../plc4x/java/base/messages/PlcWriter.java   |   80 +-
 .../messages/items/BaseDefaultFieldItem.java  |  402 +-
 .../items/DefaultBigDecimalFieldItem.java     |  342 +-
 .../items/DefaultBigIntegerFieldItem.java     |  342 +-
 .../items/DefaultBooleanFieldItem.java        |  368 +-
 .../items/DefaultByteArrayFieldItem.java      |  116 +-
 .../messages/items/DefaultByteFieldItem.java  |  300 +-
 .../items/DefaultDoubleFieldItem.java         |  316 +-
 .../items/DefaultDurationFieldItem.java       |  108 +-
 .../messages/items/DefaultFloatFieldItem.java |  312 +-
 .../items/DefaultIntegerFieldItem.java        |  324 +-
 .../items/DefaultLocalDateFieldItem.java      |  108 +-
 .../items/DefaultLocalDateTimeFieldItem.java  |  156 +-
 .../items/DefaultLocalTimeFieldItem.java      |  108 +-
 .../messages/items/DefaultLongFieldItem.java  |  308 +-
 .../messages/items/DefaultShortFieldItem.java |  302 +-
 .../items/DefaultStringFieldItem.java         |  118 +-
 .../model/DefaultPlcConsumerRegistration.java |  170 +-
 .../model/DefaultPlcSubscriptionHandle.java   |  124 +-
 .../InternalPlcConsumerRegistration.java      |   64 +-
 .../model/InternalPlcSubscriptionHandle.java  |   50 +-
 .../java/base/model/SubscriptionPlcField.java |  110 +-
 .../SingleItemToSingleRequestProtocol.java    | 1292 ++---
 .../DefaultPlcReadResponseSpec.groovy         |  172 +-
 .../messages/items/DefaultItemsSpec.groovy    |  434 +-
 .../connection/AbstractPlcConnectionTest.java |  200 +-
 .../connection/NettyPlcConnectionTest.java    |  184 +-
 .../DefaultPlcProprietaryRequestTest.java     |   94 +-
 .../DefaultPlcProprietaryResponseTest.java    |   98 +-
 .../messages/DefaultPlcReadRequestTest.java   |  230 +-
 .../messages/DefaultPlcReadResponseTest.java  |  238 +-
 .../DefaultPlcSubscriptionEventTest.java      |  134 +-
 .../DefaultPlcSubscriptionRequestTest.java    |  312 +-
 .../DefaultPlcSubscriptionResponseTest.java   |  246 +-
 .../DefaultPlcUnsubscriptionRequestTest.java  |  180 +-
 .../DefaultPlcUnsubscriptionResponseTest.java |   94 +-
 .../messages/DefaultPlcWriteRequestTest.java  |  138 +-
 .../messages/DefaultPlcWriteResponseTest.java |  180 +-
 .../java/base/messages/PlcRawMessageTest.java |  112 +-
 .../messages/PlcRequestContainerTest.java     |  162 +-
 .../items/DefaultLongFieldItemTest.java       |  226 +-
 .../DefaultPlcConsumerRegistrationTest.java   |  174 +-
 .../DefaultPlcSubscriptionHandleTest.java     |  144 +-
 .../base/model/SubscriptionPlcFieldTest.java  |  134 +-
 ...SingleItemToSingleRequestProtocolTest.java | 1456 ++---
 ...framework.report.IReportCreator.properties |  130 +-
 .../driver-bases/pcap-socket/pom.xml          |  132 +-
 .../base/connection/PcapChannelFactory.java   |  202 +-
 plc4j/protocols/driver-bases/pom.xml          |   90 +-
 .../protocols/driver-bases/raw-socket/pom.xml |  132 +-
 .../connection/RawSocketChannelFactory.java   |  220 +-
 plc4j/protocols/driver-bases/serial/pom.xml   |  160 +-
 .../connection/connection/SerialChannel.java  | 1270 ++---
 .../connection/SerialChannelFactory.java      |  166 +-
 .../connection/SerialChannelHandler.java      |  344 +-
 .../connection/SerialPollingSelector.java     |  352 +-
 .../connection/SerialSelectionKey.java        |  160 +-
 .../connection/SerialSelectorProvider.java    |  136 +-
 .../connection/SerialSocketAddress.java       |   94 +-
 .../connection/SerialSocketChannel.java       |  316 +-
 .../connection/SerialChannelFactoryTest.java  |  220 +-
 plc4j/protocols/driver-bases/tcp/pom.xml      |  122 +-
 .../connection/TcpSocketChannelFactory.java   |  224 +-
 plc4j/protocols/driver-bases/test/pom.xml     |  192 +-
 .../apache/plc4x/java/mock/MockDevice.java    |  100 +-
 .../org/apache/plc4x/java/mock/MockField.java |   98 +-
 .../plc4x/java/mock/MockFieldHandler.java     |  206 +-
 .../apache/plc4x/java/mock/MockFieldItem.java |   68 +-
 .../plc4x/java/mock/PlcMockConnection.java    |  386 +-
 .../apache/plc4x/java/mock/PlcMockDriver.java |  124 +-
 .../java/mock/connection/MockConnection.java  |   82 +-
 .../mock/connection/TestChannelFactory.java   |   90 +-
 .../mock/connection/tcp/TcpHexDumper.java     |  296 +-
 .../protocol/Plc4XSupportedDataTypes.java     |  514 +-
 .../apache/plc4x/java/mock/util/Assert.java   |  172 +-
 .../apache/plc4x/java/mock/util/HexUtil.java  |   98 +-
 ...framework.report.IReportCreator.properties |  130 +-
 .../org.apache.plc4x.java.spi.PlcDriver       |   38 +-
 .../plc4x/java/mock/MockFieldHandlerTest.java |  220 +-
 .../plc4x/java/mock/MockFieldItemTest.java    |   60 +-
 .../apache/plc4x/java/mock/MockFieldTest.java |   94 +-
 .../java/mock/PlcMockConnectionTest.java      |  326 +-
 .../plc4x/java/mock/PlcMockDriverTest.java    |  190 +-
 plc4j/protocols/driver-bases/udp/pom.xml      |  122 +-
 .../connection/UdpSocketChannelFactory.java   |  220 +-
 plc4j/protocols/ethernet-ip/pom.xml           |  246 +-
 .../ethernetip/model/EtherNetIpField.java     |  204 +-
 .../java/ethernetip/netty/EnipCodec.java      |  114 +-
 .../netty/Plc4XEtherNetIpProtocol.java        |  994 ++--
 .../events/EtherNetIpConnectedEvent.java      |   44 +-
 .../netty/util/EnipPlcFieldHandler.java       |  220 +-
 .../ethernet-ip/src/site/asciidoc/index.adoc  |  158 +-
 plc4j/protocols/iso-on-tcp/pom.xml            |  148 +-
 .../isoontcp/protocol/IsoOnTcpProtocol.java   |  245 +-
 .../protocol/model/IsoOnTcpMessage.java       |   60 +-
 .../protocol/IsoOnTcpProtocolTest.java        |  338 +-
 plc4j/protocols/iso-tp/pom.xml                |  146 +-
 .../java/isotp/protocol/IsoTPProtocol.java    |  892 +--
 .../protocol/events/IsoTPConnectedEvent.java  |   44 +-
 .../isotp/protocol/model/IsoTPMessage.java    |   76 +-
 .../model/params/CalledTsapParameter.java     |   68 +-
 .../model/params/CallingTsapParameter.java    |   68 +-
 .../model/params/ChecksumParameter.java       |   80 +-
 ...connectAdditionalInformationParameter.java |   82 +-
 .../protocol/model/params/Parameter.java      |   54 +-
 .../model/params/TpduSizeParameter.java       |   82 +-
 .../protocol/model/params/TsapParameter.java  |   72 +-
 .../model/tpdus/ConnectionConfirmTpdu.java    |   68 +-
 .../model/tpdus/ConnectionRequestTpdu.java    |   68 +-
 .../protocol/model/tpdus/ConnectionTpdu.java  |  106 +-
 .../protocol/model/tpdus/CustomTpdu.java      |   66 +-
 .../isotp/protocol/model/tpdus/DataTpdu.java  |  102 +-
 .../model/tpdus/DisconnectConfirmTpdu.java    |   66 +-
 .../model/tpdus/DisconnectRequestTpdu.java    |   82 +-
 .../protocol/model/tpdus/DisconnectTpdu.java  |   92 +-
 .../isotp/protocol/model/tpdus/ErrorTpdu.java |   94 +-
 .../java/isotp/protocol/model/tpdus/Tpdu.java |  128 +-
 .../protocol/model/types/DeviceGroup.java     |  102 +-
 .../model/types/DisconnectReason.java         |  128 +-
 .../protocol/model/types/ParameterCode.java   |  150 +-
 .../protocol/model/types/ProtocolClass.java   |  106 +-
 .../protocol/model/types/RejectCause.java     |  104 +-
 .../isotp/protocol/model/types/TpduCode.java  |  124 +-
 .../isotp/protocol/model/types/TpduSize.java  |  156 +-
 .../isotp/protocol/IsoTPProtocolTest.java     | 1270 ++---
 .../protocol/model/IsoTPMessageTests.java     |  120 +-
 .../protocol/model/params/ParameterTests.java |  122 +-
 .../model/params/TsapParameterTests.java      |  118 +-
 .../protocol/model/tpdus/IsotpModelTests.java |  368 +-
 .../protocol/model/types/IsotpTypeTests.java  |  430 +-
 plc4j/protocols/modbus/pom.xml                |  256 +-
 .../DefaultModbusByteArrayFieldItem.java      |  654 +--
 .../java/modbus/model/CoilModbusField.java    |   96 +-
 .../model/MaskWriteRegisterModbusField.java   |  182 +-
 .../plc4x/java/modbus/model/ModbusField.java  |  146 +-
 .../model/ReadDiscreteInputsModbusField.java  |   96 +-
 .../ReadHoldingRegistersModbusField.java      |   96 +-
 .../model/ReadInputRegistersModbusField.java  |   96 +-
 .../modbus/model/RegisterModbusField.java     |   98 +-
 .../modbus/netty/Plc4XModbusProtocol.java     | 1068 ++--
 .../modbus/util/ModbusPlcFieldHandler.java    |  880 +--
 .../java/modbus/ManualPlc4XModbusTest.java    |  276 +-
 .../DefaultModbusByteArrayFieldItemTest.java  |  270 +-
 .../modbus/netty/Plc4XModbusProtocolTest.java |  818 +--
 .../modbus/src/test/resources/logback.xml     |   74 +-
 plc4j/protocols/pom.xml                       |  176 +-
 plc4j/protocols/s7/LINKS.md                   |   48 +-
 plc4j/protocols/s7/pom.xml                    |  208 +-
 .../apache/plc4x/java/s7/model/S7Field.java   |  528 +-
 .../plc4x/java/s7/model/S7SslField.java       |  142 +-
 .../java/s7/model/S7SubscriptionField.java    |  332 +-
 .../java/s7/netty/Plc4XNettyException.java    |   74 +-
 .../plc4x/java/s7/netty/Plc4XS7Protocol.java  | 3636 ++++++------
 .../s7/netty/S7HEmbeddedChannelFactory.java   |   45 +
 .../apache/plc4x/java/s7/netty/S7HProxy.java  |  343 ++
 .../plc4x/java/s7/netty/S7HProxyHelper.java   |   74 +
 .../plc4x/java/s7/netty/S7Protocol.java       | 3854 ++++++-------
 .../plc4x/java/s7/netty/events/S7Alarm.java   | 1056 ++--
 .../s7/netty/events/S7ConnectedEvent.java     |   44 +-
 .../s7/netty/model/messages/S7Message.java    |  196 +-
 .../netty/model/messages/S7PushMessage.java   |   56 +-
 .../model/messages/S7RequestMessage.java      |  160 +-
 .../model/messages/S7ResponseMessage.java     |  100 +-
 .../SetupCommunicationRequestMessage.java     |   70 +-
 .../CpuCyclicServicesRequestParameter.java    |  120 +-
 .../CpuCyclicServicesResponseParameter.java   |  100 +-
 .../params/CpuDiagnosticPushParameter.java    |  174 +-
 .../model/params/CpuServicesParameter.java    |  108 +-
 .../params/CpuServicesPushParameter.java      |  112 +-
 .../params/CpuServicesRequestParameter.java   |   66 +-
 .../params/CpuServicesResponseParameter.java  |  130 +-
 .../s7/netty/model/params/S7Parameter.java    |   54 +-
 .../params/SetupCommunicationParameter.java   |  104 +-
 .../s7/netty/model/params/VarParameter.java   |  108 +-
 .../params/items/S7AnyVarParameterItem.java   |  188 +-
 .../model/params/items/VarParameterItem.java  |   54 +-
 .../model/payloads/AlarmMessagePayload.java   |  202 +-
 .../CpuCyclicServicesRequestPayload.java      |  242 +-
 .../CpuCyclicServicesResponsePayload.java     |  168 +-
 .../CpuCyclicServicesUnsubscribePayload.java  |  158 +-
 .../payloads/CpuDiagnosticMessagePayload.java |  164 +-
 ...CpuMessageSubscriptionResponsePayload.java |  118 +-
 .../CpuMessageSubscriptionServicePayload.java |  154 +-
 .../model/payloads/CpuServicesPayload.java    |  172 +-
 .../s7/netty/model/payloads/S7Payload.java    |   54 +-
 .../s7/netty/model/payloads/VarPayload.java   |  118 +-
 .../payloads/items/AlarmMessageItem.java      |  252 +-
 .../payloads/items/AssociatedValueItem.java   |  138 +-
 .../items/CpuDiagnosticMessageItem.java       |  190 +-
 .../payloads/items/MessageObjectItem.java     |  668 +--
 .../payloads/items/S7AnyVarPayloadItem.java   |  190 +-
 .../model/payloads/items/VarPayloadItem.java  |  116 +-
 .../model/payloads/ssls/SslDataRecord.java    |   50 +-
 .../SslModuleIdentificationDataRecord.java    |  132 +-
 .../s7/netty/model/types/AlarmQueryType.java  |  148 +-
 .../java/s7/netty/model/types/AlarmType.java  |  162 +-
 .../netty/model/types/CpuCurrentModeType.java |  166 +-
 .../types/CpuCyclicServiceTimeBaseType.java   |  152 +-
 ...ServicesParameterSubFunctionGroupType.java |  158 +-
 .../CpuServicesParameterFunctionGroup.java    |  130 +-
 .../CpuServicesParameterSubFunctionGroup.java |  148 +-
 .../model/types/CpuUserDataMethodType.java    |  154 +-
 ...CpuUserDataParameterFunctionGroupType.java |  166 +-
 .../model/types/CpuUserDataParameterType.java |  160 +-
 .../model/types/DataTransportErrorCode.java   |  124 +-
 .../netty/model/types/DataTransportSize.java  |  128 +-
 .../netty/model/types/HeaderErrorClass.java   |  110 +-
 .../java/s7/netty/model/types/MemoryArea.java |  166 +-
 .../s7/netty/model/types/MessageType.java     |  110 +-
 .../s7/netty/model/types/ParameterError.java  |  140 +-
 .../s7/netty/model/types/ParameterType.java   |  144 +-
 .../s7/netty/model/types/PushEventType.java   |  134 +-
 .../java/s7/netty/model/types/QueryType.java  |  146 +-
 .../netty/model/types/SpecificationType.java  |  104 +-
 .../java/s7/netty/model/types/SslId.java      |  204 +-
 .../model/types/SubscribedEventType.java      |  154 +-
 .../s7/netty/model/types/TransportSize.java   |  404 +-
 .../model/types/VariableAddressingMode.java   |  130 +-
 .../strategies/DefaultS7MessageProcessor.java | 1052 ++--
 .../LongS7MessageProcessorCodec.java          | 1310 ++---
 .../netty/strategies/S7MessageProcessor.java  |   76 +-
 .../s7/netty/util/S7PlcFieldEventHandler.java |   82 +-
 .../java/s7/netty/util/S7PlcFieldHandler.java | 1354 ++---
 .../netty/util/S7RequestSizeCalculator.java   |  316 +-
 .../netty/util/S7ResponseSizeEstimator.java   |  358 +-
 .../java/s7/netty/util/S7SizeHelper.java      |  354 +-
 .../java/s7/protocol/S7ByteReadResponse.java  | 1016 ++--
 .../S7CyclicServicesSubscriptionHandle.java   |  158 +-
 .../S7DiagnosticSubscriptionHandle.java       |  160 +-
 .../java/s7/protocol/event/S7AlarmEvent.java  | 1396 ++---
 .../s7/protocol/event/S7CyclicValueEvent.java |  950 ++--
 .../plc4x/java/s7/protocol/event/S7Event.java |  110 +-
 .../java/s7/protocol/event/S7ModeEvent.java   | 1052 ++--
 .../java/s7/protocol/event/S7SysEvent.java    | 1040 ++--
 .../java/s7/protocol/event/S7UserEvent.java   |   56 +-
 .../plc4x/java/s7/types/S7ControllerType.java |   62 +-
 .../s7/types/S7SubscriptionFieldType.java     |   68 +-
 .../java/s7/utils/S7DiagnosticEventId.java    | 1370 ++---
 .../apache/plc4x/java/s7/utils/S7Helper.java  | 2718 ++++-----
 .../plc4x/java/s7/utils/S7ParamErrorCode.java |  552 +-
 .../plc4x/java/s7/utils/S7TsapIdEncoder.java  |   96 +-
 .../protocols/s7/src/site/asciidoc/index.adoc |  200 +-
 .../java/s7/netty/Plc4XS7ProtocolSpec.groovy  |  556 +-
 .../org/apache/plc4x/java/issues/PLC4X56.java |  162 +-
 .../apache/plc4x/java/s7/PcapGenerator.java   |  636 +--
 .../plc4x/java/s7/model/S7FieldTests.java     |  204 +-
 .../java/s7/netty/Plc4XS7ProtocolTest.java    |  368 +-
 .../plc4x/java/s7/netty/S7ProtocolTest.java   |  848 +--
 .../netty/model/messages/S7MessageTests.java  |  380 +-
 .../netty/model/params/S7ParameterTests.java  |  158 +-
 .../netty/model/payloads/S7PayloadTests.java  |  262 +-
 .../s7/netty/model/types/S7TypeTests.java     |  298 +-
 .../DefaultS7MessageProcessorTest.java        | 1862 +++----
 .../s7/netty/util/S7PlcFieldHandlerTest.java  |  732 +--
 .../util/S7RequestSizeCalculatorTest.java     |  280 +-
 .../util/S7ResponseSizeEstimatorTest.java     |  242 +-
 .../java/s7/netty/util/S7SizeHelperTest.java  |  238 +-
 .../plc4x/java/s7/types/S7DataTypeTest.java   |  112 +-
 .../java/s7/utils/S7TsapIdEncoderTest.java    |  134 +-
 ...framework.report.IReportCreator.properties |  130 +-
 .../s7/src/test/resources/logback.xml         |   70 +-
 .../developers/implementing-drivers.adoc      |  496 +-
 plc4j/protocols/src/site/site.xml             |   58 +-
 plc4j/src/site/asciidoc/index.adoc            |  200 +-
 .../site/asciidoc/users/gettingstarted.adoc   |  356 +-
 plc4j/utils/connection-pool/pom.xml           |  100 +-
 .../java/utils/connectionpool/PoolKey.java    |  144 +-
 .../utils/connectionpool/PoolKeyFactory.java  |  208 +-
 .../PooledPlcConnectionFactory.java           |   92 +-
 .../PooledPlcDriverManager.java               |  350 +-
 .../connectionpool/PoolKeyFactoryTest.java    |  184 +-
 .../connectionpool/PooledDummyDriver.java     |  104 +-
 .../PooledPlcDriverManagerTest.java           |  732 +--
 .../org.apache.plc4x.java.spi.PlcDriver       |   38 +-
 .../src/test/resources/logback.xml            |   66 +-
 plc4j/utils/driver-base-java/pom.xml          |   82 +-
 .../jinahya/bit/io/MyDefaultBitInput.java     |   70 +-
 .../plc4x/java/utils/EvaluationHelper.java    |  106 +-
 .../org/apache/plc4x/java/utils/Message.java  |   52 +-
 .../apache/plc4x/java/utils/MessageIO.java    |   46 +-
 .../apache/plc4x/java/utils/MessageInput.java |   50 +-
 .../plc4x/java/utils/MessageOutput.java       |   50 +-
 .../plc4x/java/utils/ParseException.java      |   64 +-
 .../apache/plc4x/java/utils/ReadBuffer.java   |  438 +-
 .../apache/plc4x/java/utils/WriteBuffer.java  |  416 +-
 plc4j/utils/interop/pom.xml                   |  430 +-
 plc4j/utils/interop/src/assembly/assembly.xml |   80 +-
 .../org/apache/plc4x/interop/impl/Client.java |  120 +-
 .../apache/plc4x/interop/impl/Handler.java    |  320 +-
 .../org/apache/plc4x/interop/impl/Server.java |  182 +-
 plc4j/utils/opm/pom.xml                       |  204 +-
 .../apache/plc4x/java/opm/AliasRegistry.java  |   98 +-
 .../apache/plc4x/java/opm/OPMException.java   |   74 +-
 .../org/apache/plc4x/java/opm/OpmUtils.java   |  184 +-
 .../org/apache/plc4x/java/opm/PlcEntity.java  |   66 +-
 .../plc4x/java/opm/PlcEntityInterceptor.java  | 1138 ++--
 .../plc4x/java/opm/PlcEntityManager.java      |  450 +-
 .../org/apache/plc4x/java/opm/PlcField.java   |   70 +-
 .../plc4x/java/opm/SimpleAliasRegistry.java   |  150 +-
 .../opm/src/site/asciidoc/opm/using-opm.adoc  |  122 +-
 plc4j/utils/opm/src/site/site.xml             |   58 +-
 .../plc4x/java/opm/ConnectedEntityTest.java   |  236 +-
 .../plc4x/java/opm/OPMExceptionTest.java      |   82 +-
 .../apache/plc4x/java/opm/OpmUtilsTest.java   |  130 +-
 .../java/opm/PlcEntityInterceptorTest.java    |  426 +-
 .../java/opm/PlcEntityManagerComplexTest.java |  918 +--
 .../plc4x/java/opm/PlcEntityManagerTest.java  |  634 +--
 .../java/opm/SimpleAliasRegistryTest.java     |  156 +-
 .../utils/opm/src/test/resources/logback.xml  |   70 +-
 plc4j/utils/pcap-sockets/pom.xml              |  178 +-
 .../pcapsockets/PcapSocketException.java      |   68 +-
 .../pcapsockets/netty/PacketHandler.java      |   54 +-
 .../pcapsockets/netty/PcapSocketAddress.java  |  120 +-
 .../pcapsockets/netty/PcapSocketChannel.java  |  602 +-
 .../netty/PcapSocketChannelConfig.java        |  184 +-
 .../netty/PcapSocketChannelOption.java        |   78 +-
 .../pcapsockets/netty/TcpIpPacketHandler.java |   82 +-
 .../pcapsockets/netty/UdpIpPacketHandler.java |   82 +-
 plc4j/utils/pom.xml                           |  116 +-
 plc4j/utils/protocol-test-utils/pom.xml       |  142 +-
 .../test/ProtocolTestsuiteRunner.java         |  350 +-
 .../ProtocolTestsuiteException.java           |   64 +-
 .../test/model/ProtocolTestsuite.java         |   96 +-
 .../plc4x/protocol/test/model/Testcase.java   |  122 +-
 .../src/main/resources/schemas/testsuite.xsd  |  108 +-
 plc4j/utils/raw-sockets/pom.xml               |  200 +-
 .../utils/rawsockets/RawSocketException.java  |   68 +-
 .../rawsockets/attic/RawEthernetSocket.java   |  300 +-
 .../utils/rawsockets/attic/RawIpSocket.java   | 1258 ++---
 .../rawsockets/attic/RawSocketListener.java   |   44 +-
 .../utils/rawsockets/netty/PacketHandler.java |   54 +-
 .../rawsockets/netty/RawSocketAddress.java    |   90 +-
 .../rawsockets/netty/RawSocketChannel.java    |  562 +-
 .../netty/RawSocketChannelConfig.java         |  132 +-
 .../netty/RawSocketChannelOption.java         |   64 +-
 .../rawsockets/netty/RawSocketIpAddress.java  |   92 +-
 .../rawsockets/netty/TcpIpPacketHandler.java  |   82 +-
 .../rawsockets/netty/UdpIpPacketHandler.java  |   82 +-
 .../src/remote-resources/META-INF/LICENSE     |   16 +-
 .../src/remote-resources/META-INF/NOTICE      |    8 +-
 .../rawsockets/attic/RawIpSocketTest.java     |  196 +-
 .../netty/RawSocketChannelTest.java           |  202 +-
 plc4j/utils/scraper/README.md                 |   40 +-
 plc4j/utils/scraper/pom.xml                   |  288 +-
 .../plc4x/java/scraper/ResultHandler.java     |   76 +-
 .../apache/plc4x/java/scraper/ScrapeJob.java  |   96 +-
 .../plc4x/java/scraper/ScrapeJobImpl.java     |  136 +-
 .../apache/plc4x/java/scraper/Scraper.java    |   82 +-
 .../plc4x/java/scraper/ScraperImpl.java       |  362 +-
 .../plc4x/java/scraper/ScraperTask.java       |   98 +-
 .../plc4x/java/scraper/ScraperTaskImpl.java   |  468 +-
 .../java/scraper/config/JobConfiguration.java |   78 +-
 .../config/JobConfigurationClassicImpl.java   |   98 +-
 .../JobConfigurationClassicImplBuilder.java   |  132 +-
 .../scraper/config/JobConfigurationImpl.java  |  168 +-
 .../scraper/config/ScraperConfiguration.java  |  162 +-
 .../ScraperConfigurationClassicImpl.java      |  172 +-
 ...craperConfigurationClassicImplBuilder.java |  108 +-
 .../JobConfigurationTriggeredImpl.java        |   94 +-
 .../JobConfigurationTriggeredImplBuilder.java |  142 +-
 .../ScraperConfigurationTriggeredImpl.java    |  254 +-
 ...aperConfigurationTriggeredImplBuilder.java |  100 +-
 .../ScraperConfigurationException.java        |   86 +-
 .../scraper/exception/ScraperException.java   |   74 +-
 .../TriggeredScrapeJobImpl.java               |  148 +-
 .../TriggeredScraperImpl.java                 |  734 +--
 .../TriggeredScraperMBean.java                |   66 +-
 .../TriggeredScraperTask.java                 |  546 +-
 .../TriggeredScraperTaskMBean.java            |   70 +-
 .../triggerhandler/TriggerConfiguration.java  | 1442 ++---
 .../triggerhandler/TriggerHandler.java        |   46 +-
 .../triggerhandler/TriggerHandlerImpl.java    |  226 +-
 .../collector/TriggerCollector.java           |  130 +-
 .../collector/TriggerCollectorImpl.java       |  646 +--
 .../util/PercentageAboveThreshold.java        |  116 +-
 .../plc4x/java/s7/ManualS7PlcDriverMT.java    |  410 +-
 .../scraper/ScraperConfigurationTest.java     |  408 +-
 .../plc4x/java/scraper/ScraperRunner.java     |   80 +-
 .../plc4x/java/scraper/ScraperTaskTest.java   |  224 +-
 .../plc4x/java/scraper/ScraperTest.java       |  348 +-
 .../java/scraper/TriggeredScraperRunner.java  |  110 +-
 .../scraper/TriggeredScraperRunnerModbus.java |  138 +-
 .../ScraperConfigurationBuilderTest.java      |  136 +-
 .../TriggeredScraperImplTest.java             |  234 +-
 .../TriggerConfigurationTest.java             |  300 +-
 .../scraper/src/test/resources/config.json    |   34 +-
 .../scraper/src/test/resources/config.yml     |   56 +-
 .../scraper/src/test/resources/example.yml    |   86 +-
 .../resources/example_triggered_scraper.yml   |  146 +-
 .../example_triggered_scraper_modbus.yml      |   60 +-
 .../test/resources/example_with_strings.yml   |   82 +-
 .../src/test/resources/logback-test.xml       |   76 +-
 .../scraper/src/test/resources/logback.xml    |   70 +-
 .../test/resources/mock-scraper-config.yml    |  112 +-
 plc4j/utils/test-utils/pom.xml                |  114 +-
 .../java/org/apache/plc4x/test/FastTests.java |   44 +-
 .../plc4x/test/RequireInternetConnection.java |   66 +-
 .../RequireInternetConnectionCondition.java   |   90 +-
 .../plc4x/test/RequireNonCaptureAllDns.java   |   66 +-
 .../RequireNonCaptureAllDnsCondition.java     |   80 +-
 .../org/apache/plc4x/test/RequirePcap.java    |   66 +-
 .../plc4x/test/RequirePcapCondition.java      |  114 +-
 .../org/apache/plc4x/test/RequirePcapNg.java  |   66 +-
 .../plc4x/test/RequirePcapNgCondition.java    |  138 +-
 .../test-utils/src/main/resources/logback.xml |   70 +-
 pom.xml                                       | 3878 ++++++-------
 protocols/ab-eth/pom.xml                      |   84 +-
 .../plc4x/protocol/abeth/ABETHProtocol.java   |   92 +-
 ...4x.plugins.codegenerator.protocol.Protocol |   36 +-
 .../resources/protocols/abeth/ab-eth.mspec    |  168 +-
 protocols/bacnetip/pom.xml                    |   84 +-
 .../protocol/bacnetip/BacNetIpProtocol.java   |   94 +-
 ...4x.plugins.codegenerator.protocol.Protocol |   36 +-
 .../protocols/bacnetip/bacnetip.mspec         | 1354 ++---
 protocols/df1/pom.xml                         |   84 +-
 .../plc4x/protocol/df1/Df1Protocol.java       |   92 +-
 ...4x.plugins.codegenerator.protocol.Protocol |   36 +-
 .../main/resources/protocols/df1/df1.mspec    |  106 +-
 protocols/knxnetip/pom.xml                    |   84 +-
 .../protocol/knxnetip/KnxNetIpProtocol.java   |   92 +-
 ...4x.plugins.codegenerator.protocol.Protocol |   36 +-
 .../protocols/knxnetip/knxnetip.mspec         |  602 +-
 .../knxnetip/src/site/asciidoc/index.adoc     |  112 +-
 .../plc4x/protocols/knxnetip/protocol.tdml    | 1208 ++--
 protocols/pom.xml                             |  418 +-
 protocols/proxy/pom.xml                       |   68 +-
 protocols/proxy/src/main/java/.keepMe         |   38 +-
 .../plc4x/protocols/proxy/interop.thrift      |  186 +-
 protocols/s7/pom.xml                          |   84 +-
 .../apache/plc4x/protocol/s7/S7Protocol.java  |   92 +-
 ...4x.plugins.codegenerator.protocol.Protocol |   36 +-
 .../src/main/resources/protocols/s7/s7.mspec  |  734 +--
 .../apache/plc4x/protocols/s7/protocol.tdml   | 4930 ++++++++---------
 sandbox/code-gen/pom.xml                      |  140 +-
 sandbox/code-gen/src/main/antlr4/imaginary.g4 |  296 +-
 .../org/apache/plc4x/codegen/DFDLUtil.java    |  192 +-
 .../org/apache/plc4x/codegen/api/Buffer.java  |   62 +-
 .../plc4x/codegen/ast/AbstractNode.java       |   64 +-
 .../codegen/ast/AssignementExpression.java    |   94 +-
 .../plc4x/codegen/ast/BinaryExpression.java   |  122 +-
 .../org/apache/plc4x/codegen/ast/Block.java   |  106 +-
 .../plc4x/codegen/ast/BlockBuilder.java       |   96 +-
 .../plc4x/codegen/ast/CallExpression.java     |  124 +-
 .../plc4x/codegen/ast/ClassDeclaration.java   |  146 +-
 .../apache/plc4x/codegen/ast/CodeWriter.java  |  150 +-
 .../plc4x/codegen/ast/ConstantExpression.java |   92 +-
 .../codegen/ast/ConstructorDeclaration.java   |   82 +-
 .../codegen/ast/DeclarationStatement.java     |  102 +-
 .../plc4x/codegen/ast/ExceptionType.java      |   80 +-
 .../apache/plc4x/codegen/ast/Expression.java  |   54 +-
 .../apache/plc4x/codegen/ast/Expressions.java |  648 +--
 .../plc4x/codegen/ast/FieldDeclaration.java   |  112 +-
 .../plc4x/codegen/ast/FieldReference.java     |   88 +-
 .../apache/plc4x/codegen/ast/FileNode.java    |   86 +-
 .../apache/plc4x/codegen/ast/Generator.java   |  152 +-
 .../apache/plc4x/codegen/ast/IfStatement.java |  120 +-
 .../plc4x/codegen/ast/JavaGenerator.java      |  656 +--
 .../apache/plc4x/codegen/ast/LineComment.java |   86 +-
 .../org/apache/plc4x/codegen/ast/Method.java  |  142 +-
 .../plc4x/codegen/ast/MethodDefinition.java   |  146 +-
 .../apache/plc4x/codegen/ast/Modifier.java    |   50 +-
 .../plc4x/codegen/ast/NewExpression.java      |   96 +-
 .../org/apache/plc4x/codegen/ast/Node.java    |   54 +-
 .../apache/plc4x/codegen/ast/NodeVisitor.java |   56 +-
 .../codegen/ast/ParameterExpression.java      |   82 +-
 .../apache/plc4x/codegen/ast/Primitive.java   |  116 +-
 .../plc4x/codegen/ast/PythonGenerator.java    |  636 +--
 .../plc4x/codegen/ast/ReturnStatement.java    |   80 +-
 .../apache/plc4x/codegen/ast/Statement.java   |   44 +-
 .../plc4x/codegen/ast/TypeDefinition.java     |   86 +-
 .../apache/plc4x/codegen/ast/TypeUtil.java    |   58 +-
 .../apache/plc4x/codegen/ast/UnknownType.java |   92 +-
 .../codegen/python/AbstractNodeVisitor.java   |  454 +-
 .../apache/plc4x/codegen/python/AddNode.java  |   60 +-
 .../plc4x/codegen/python/AliasNode.java       |  104 +-
 .../plc4x/codegen/python/AnnAssignerNode.java |  148 +-
 .../apache/plc4x/codegen/python/ArgNode.java  |  104 +-
 .../plc4x/codegen/python/ArgumentsNode.java   |   92 +-
 .../plc4x/codegen/python/AssignNode.java      |  110 +-
 .../plc4x/codegen/python/AttributeNode.java   |  126 +-
 .../plc4x/codegen/python/AugAssignNode.java   |  126 +-
 .../plc4x/codegen/python/BinOpNode.java       |  126 +-
 .../apache/plc4x/codegen/python/CallNode.java |  132 +-
 .../plc4x/codegen/python/ClassDefNode.java    |  146 +-
 .../plc4x/codegen/python/CodePrinter.java     |  148 +-
 .../plc4x/codegen/python/CompareNode.java     |  132 +-
 .../plc4x/codegen/python/ContextNode.java     |   44 +-
 .../apache/plc4x/codegen/python/EqNode.java   |   56 +-
 .../apache/plc4x/codegen/python/ExprNode.java |   82 +-
 .../plc4x/codegen/python/FunctionDefNode.java |  158 +-
 .../apache/plc4x/codegen/python/IfNode.java   |  132 +-
 .../plc4x/codegen/python/ImportFromNode.java  |  132 +-
 .../plc4x/codegen/python/KeywordNode.java     |  104 +-
 .../plc4x/codegen/python/LineEntryNode.java   |   92 +-
 .../apache/plc4x/codegen/python/ListNode.java |  110 +-
 .../apache/plc4x/codegen/python/LoadNode.java |   56 +-
 .../plc4x/codegen/python/ModuleNode.java      |   86 +-
 .../apache/plc4x/codegen/python/MultNode.java |   56 +-
 .../codegen/python/NameConstantNode.java      |   82 +-
 .../apache/plc4x/codegen/python/NameNode.java |  104 +-
 .../org/apache/plc4x/codegen/python/Node.java |   58 +-
 .../plc4x/codegen/python/NodeVisitor.java     |  172 +-
 .../plc4x/codegen/python/NotEqNode.java       |   56 +-
 .../apache/plc4x/codegen/python/NumNode.java  |   82 +-
 .../apache/plc4x/codegen/python/PassNode.java |   56 +-
 .../plc4x/codegen/python/ReturnNode.java      |   82 +-
 .../plc4x/codegen/python/StoreNode.java       |   56 +-
 .../apache/plc4x/codegen/python/StrNode.java  |   82 +-
 .../plc4x/codegen/python/TupleNode.java       |  110 +-
 .../plc4x/codegen/python/WhileNode.java       |  132 +-
 .../apache/plc4x/codegen/util/BufferUtil.java |   90 +-
 .../plc4x/codegen/util/EnumFactory.java       |  306 +-
 .../plc4x/codegen/util/PojoFactory.java       |  240 +-
 .../code-gen/src/main/resources/example.json  |  282 +-
 .../code-gen/src/main/resources/example2.json | 4256 +++++++-------
 .../apache/plc4x/codegen/DFDLUtilTest.java    |   74 +-
 .../apache/plc4x/codegen/ModuleNodeTest.java  |  374 +-
 .../org/apache/plc4x/codegen/PojoBuilder.java |   70 +-
 .../plc4x/codegen/ast/JavaGeneratorTest.java  |  626 +--
 .../codegen/ast/PythonGeneratorTest.java      |  196 +-
 .../plc4x/codegen/util/EnumFactoryTest.java   |  178 +-
 .../org/apache/plc4x/codegen/util/MyPojo.java |  128 +-
 .../plc4x/codegen/util/PojoFactoryTest.java   |  126 +-
 .../src/test/resources/protocol.dfdl.xsd      | 1816 +++---
 sandbox/plc-simulator/pom.xml                 |  254 +-
 .../apache/plc4x/simulator/PlcSimulator.java  |  236 +-
 .../plc4x/simulator/server/ServerModule.java  |   64 +-
 .../plc4x/simulator/server/s7/S7Server.java   |  138 +-
 .../simulator/server/s7/S7ServerModule.java   |  110 +-
 .../server/s7/protocol/S7Step7Protocol.java   |  152 +-
 .../s7/protocol/S7Step7ServerProtocol.java    |  456 +-
 .../simulation/SimulationModule.java          |   86 +-
 .../watertank/WaterTankSimulationModule.java  |  120 +-
 ...apache.plc4x.simulator.server.ServerModule |   38 +-
 ...lc4x.simulator.simulation.SimulationModule |   38 +-
 .../src/main/resources/logback.xml            |   70 +-
 sandbox/plc4cpp/CMakeLists.txt                |  118 +-
 sandbox/plc4cpp/README.md                     |   92 +-
 sandbox/plc4cpp/api/CMakeLists.txt            |  140 +-
 .../org/apache/plc4x/cpp/PlcConnection.cpp    |  164 +-
 .../cpp/org/apache/plc4x/cpp/PlcConnection.h  |  336 +-
 .../org/apache/plc4x/cpp/PlcDriverManager.cpp |  374 +-
 .../org/apache/plc4x/cpp/PlcDriverManager.h   |  140 +-
 .../apache/plc4x/cpp/api/PlcConnection.cpp    |  162 +-
 .../org/apache/plc4x/cpp/api/PlcConnection.h  |  318 +-
 .../api/authentication/PlcAuthentication.cpp  |  100 +-
 .../api/authentication/PlcAuthentication.h    |   94 +-
 .../PlcUsernamePasswordAuthentication.cpp     |  192 +-
 .../PlcUsernamePasswordAuthentication.h       |  130 +-
 .../api/exceptions/PlcConnectionException.cpp |   78 +-
 .../api/exceptions/PlcConnectionException.h   |  106 +-
 .../plc4x/cpp/api/exceptions/PlcException.cpp |  112 +-
 .../plc4x/cpp/api/exceptions/PlcException.h   |  116 +-
 .../api/exceptions/PlcFieldRangeException.cpp |   90 +-
 .../api/exceptions/PlcFieldRangeException.h   |   96 +-
 .../PlcIncompatibleDatatypeException.cpp      |   90 +-
 .../PlcIncompatibleDatatypeException.h        |  100 +-
 .../exceptions/PlcInvalidFieldException.cpp   |  126 +-
 .../api/exceptions/PlcInvalidFieldException.h |  112 +-
 .../cpp/api/exceptions/PlcIoException.cpp     |   80 +-
 .../plc4x/cpp/api/exceptions/PlcIoException.h |  110 +-
 .../exceptions/PlcNotImplementedException.cpp |   80 +-
 .../exceptions/PlcNotImplementedException.h   |  106 +-
 .../api/exceptions/PlcProtocolException.cpp   |   80 +-
 .../cpp/api/exceptions/PlcProtocolException.h |  116 +-
 .../PlcProtocolPayloadTooBigException.cpp     |  138 +-
 .../PlcProtocolPayloadTooBigException.h       |  126 +-
 .../api/exceptions/PlcRuntimeException.cpp    |  102 +-
 .../cpp/api/exceptions/PlcRuntimeException.h  |  118 +-
 .../api/exceptions/PlcTimeoutException.cpp    |  102 +-
 .../cpp/api/exceptions/PlcTimeoutException.h  |  138 +-
 .../PlcUnsupportedDataTypeException.cpp       |   80 +-
 .../PlcUnsupportedDataTypeException.h         |  106 +-
 .../PlcUnsupportedOperationException.cpp      |   80 +-
 .../PlcUnsupportedOperationException.h        |  110 +-
 .../cpp/api/messages/PlcFieldRequest.cpp      |   80 +-
 .../plc4x/cpp/api/messages/PlcFieldRequest.h  |  126 +-
 .../cpp/api/messages/PlcFieldResponse.cpp     |   80 +-
 .../plc4x/cpp/api/messages/PlcFieldResponse.h |  134 +-
 .../plc4x/cpp/api/messages/PlcMessage.cpp     |   80 +-
 .../plc4x/cpp/api/messages/PlcMessage.h       |  104 +-
 .../plc4x/cpp/api/messages/PlcReadRequest.cpp |   94 +-
 .../plc4x/cpp/api/messages/PlcReadRequest.h   |  134 +-
 .../api/messages/PlcReadRequestBuilder.cpp    |   80 +-
 .../cpp/api/messages/PlcReadRequestBuilder.h  |  114 +-
 .../cpp/api/messages/PlcReadResponse.cpp      |   80 +-
 .../plc4x/cpp/api/messages/PlcReadResponse.h  |  272 +-
 .../plc4x/cpp/api/messages/PlcRequest.cpp     |   80 +-
 .../plc4x/cpp/api/messages/PlcRequest.h       |  110 +-
 .../cpp/api/messages/PlcRequestBuilder.cpp    |   80 +-
 .../cpp/api/messages/PlcRequestBuilder.h      |  108 +-
 .../plc4x/cpp/api/messages/PlcResponse.cpp    |   80 +-
 .../plc4x/cpp/api/messages/PlcResponse.h      |  110 +-
 .../cpp/api/messages/PlcSubscriptionEvent.cpp |   80 +-
 .../cpp/api/messages/PlcSubscriptionEvent.h   |  116 +-
 .../api/messages/PlcSubscriptionRequest.cpp   |   80 +-
 .../cpp/api/messages/PlcSubscriptionRequest.h |  176 +-
 .../api/messages/PlcSubscriptionResponse.cpp  |   80 +-
 .../api/messages/PlcSubscriptionResponse.h    |  124 +-
 .../api/messages/PlcUnsubscriptionRequest.cpp |   80 +-
 .../api/messages/PlcUnsubscriptionRequest.h   |  122 +-
 .../messages/PlcUnsubscriptionResponse.cpp    |   80 +-
 .../api/messages/PlcUnsubscriptionResponse.h  |  108 +-
 .../cpp/api/messages/PlcWriteRequest.cpp      |   80 +-
 .../plc4x/cpp/api/messages/PlcWriteRequest.h  |  172 +-
 .../cpp/api/messages/PlcWriteResponse.cpp     |   80 +-
 .../plc4x/cpp/api/messages/PlcWriteResponse.h |  104 +-
 .../apache/plc4x/cpp/api/messages/REQUEST.cpp |   78 +-
 .../apache/plc4x/cpp/api/messages/REQUEST.h   |   98 +-
 .../plc4x/cpp/api/messages/RESPONSE.cpp       |   78 +-
 .../apache/plc4x/cpp/api/messages/RESPONSE.h  |   94 +-
 .../cpp/api/messages/RequestTemplate.cpp      |   78 +-
 .../plc4x/cpp/api/messages/RequestTemplate.h  |   96 +-
 .../cpp/api/messages/ResponseTemplate.cpp     |   78 +-
 .../plc4x/cpp/api/messages/ResponseTemplate.h |   92 +-
 .../api/metadata/PlcConnectionMetadata.cpp    |   78 +-
 .../cpp/api/metadata/PlcConnectionMetadata.h  |  132 +-
 .../apache/plc4x/cpp/api/model/Consumer.cpp   |   80 +-
 .../org/apache/plc4x/cpp/api/model/Consumer.h |  122 +-
 .../cpp/api/model/PlcConsumerRegistration.cpp |   80 +-
 .../cpp/api/model/PlcConsumerRegistration.h   |   96 +-
 .../apache/plc4x/cpp/api/model/PlcField.cpp   |   80 +-
 .../org/apache/plc4x/cpp/api/model/PlcField.h |  118 +-
 .../cpp/api/model/PlcSubscriptionHandle.cpp   |   80 +-
 .../cpp/api/model/PlcSubscriptionHandle.h     |  122 +-
 .../plc4x/cpp/api/types/PlcClientDataType.cpp |   80 +-
 .../plc4x/cpp/api/types/PlcClientDataType.h   |  110 +-
 .../plc4x/cpp/api/types/PlcResponseCode.cpp   |   80 +-
 .../plc4x/cpp/api/types/PlcResponseCode.h     |  100 +-
 .../cpp/api/types/PlcSubscriptionType.cpp     |   80 +-
 .../plc4x/cpp/api/types/PlcSubscriptionType.h |  116 +-
 .../plc4x/cpp/api/types/ValueTypeObject.cpp   |   82 +-
 .../plc4x/cpp/api/types/ValueTypeObject.h     |   98 +-
 .../org/apache/plc4x/cpp/spi/PlcDriver.cpp    |   72 +-
 .../cpp/org/apache/plc4x/cpp/spi/PlcDriver.h  |  170 +-
 sandbox/plc4cpp/drivers/CMakeLists.txt        |   52 +-
 sandbox/plc4cpp/drivers/proxy/CMakeLists.txt  |   94 +-
 .../apache/plc4x/cpp/proxy/ProxyDriver.cpp    |  178 +-
 .../org/apache/plc4x/cpp/proxy/ProxyDriver.h  |  174 +-
 .../cpp/proxy/connection/ProxyConnection.cpp  |  118 +-
 .../cpp/proxy/connection/ProxyConnection.h    |  272 +-
 .../org/apache/plc4x/cpp/proxy/dllexports.cpp |   78 +-
 .../org/apache/plc4x/cpp/proxy/dllexports.h   |   56 +-
 sandbox/plc4cpp/drivers/s7/CMakeLists.txt     |   86 +-
 .../org/apache/plc4x/cpp/s7/S7PlcDriver.cpp   |  186 +-
 .../cpp/org/apache/plc4x/cpp/s7/S7PlcDriver.h |  174 +-
 .../cpp/s7/connection/S7PlcConnection.cpp     |  266 +-
 .../plc4x/cpp/s7/connection/S7PlcConnection.h |  296 +-
 .../org/apache/plc4x/cpp/s7/dllexports.cpp    |   78 +-
 .../cpp/org/apache/plc4x/cpp/s7/dllexports.h  |   56 +-
 sandbox/plc4cpp/examples/CMakeLists.txt       |   40 +-
 .../examples/hello-world-plc4x/CMakeLists.txt |   54 +-
 .../cpp/examples/helloplc4x/helloplc4x.cpp    |  244 +-
 sandbox/plc4cpp/integrations/CMakeLists.txt   |   40 +-
 .../integrations/apache-mynewt/CMakeLists.txt |   40 +-
 .../integrations/edgex-foundry/CMakeLists.txt |   40 +-
 sandbox/plc4cpp/pom.xml                       |  688 +--
 sandbox/plc4cpp/protocols/CMakeLists.txt      |   40 +-
 .../protocols/driver-bases/CMakeLists.txt     |   40 +-
 .../driver-bases/base/CMakeLists.txt          |  136 +-
 .../base/connection/AbstractPlcConnection.cpp |  164 +-
 .../base/connection/AbstractPlcConnection.h   |  156 +-
 .../cpp/base/connection/BoostConnection.cpp   | 1008 ++--
 .../cpp/base/connection/BoostConnection.h     |  238 +-
 .../cpp/base/connection/ChannelFactory.cpp    |   78 +-
 .../cpp/base/connection/ChannelFactory.h      |  116 +-
 .../connection/DefaultPlcFieldHandler.cpp     |  222 +-
 .../base/connection/DefaultPlcFieldHandler.h  |  190 +-
 .../cpp/base/connection/PlcFieldHandler.cpp   |   78 +-
 .../cpp/base/connection/PlcFieldHandler.h     |  196 +-
 .../plc4x/cpp/base/events/ConnectEvent.cpp    |   78 +-
 .../plc4x/cpp/base/events/ConnectEvent.h      |   96 +-
 .../plc4x/cpp/base/events/ConnectedEvent.cpp  |   78 +-
 .../plc4x/cpp/base/events/ConnectedEvent.h    |   94 +-
 .../base/messages/DefaultPlcReadRequest.cpp   |  288 +-
 .../cpp/base/messages/DefaultPlcReadRequest.h |  198 +-
 .../base/messages/DefaultPlcWriteRequest.cpp  |  234 +-
 .../base/messages/DefaultPlcWriteRequest.h    |  158 +-
 .../base/messages/InternalPlcFieldRequest.cpp |   84 +-
 .../base/messages/InternalPlcFieldRequest.h   |  106 +-
 .../messages/InternalPlcFieldResponse.cpp     |   78 +-
 .../base/messages/InternalPlcFieldResponse.h  |  104 +-
 .../InternalPlcProprietaryRequest.cpp         |   80 +-
 .../messages/InternalPlcProprietaryRequest.h  |  102 +-
 .../InternalPlcProprietaryResponse.cpp        |   80 +-
 .../messages/InternalPlcProprietaryResponse.h |  102 +-
 .../base/messages/InternalPlcReadRequest.cpp  |   78 +-
 .../base/messages/InternalPlcReadRequest.h    |  106 +-
 .../cpp/base/messages/InternalPlcRequest.cpp  |   78 +-
 .../cpp/base/messages/InternalPlcRequest.h    |  104 +-
 .../cpp/base/messages/InternalPlcResponse.cpp |   78 +-
 .../cpp/base/messages/InternalPlcResponse.h   |  104 +-
 .../base/messages/InternalPlcWriteRequest.cpp |   78 +-
 .../base/messages/InternalPlcWriteRequest.h   |  118 +-
 .../base/messages/PlcProprietaryRequest.cpp   |   78 +-
 .../cpp/base/messages/PlcProprietaryRequest.h |  106 +-
 .../base/messages/PlcProprietaryResponse.cpp  |   80 +-
 .../base/messages/PlcProprietaryResponse.h    |  104 +-
 .../plc4x/cpp/base/messages/PlcReader.cpp     |   78 +-
 .../plc4x/cpp/base/messages/PlcReader.h       |   96 +-
 .../plc4x/cpp/base/messages/PlcWriter.cpp     |   78 +-
 .../plc4x/cpp/base/messages/PlcWriter.h       |  108 +-
 .../messages/items/BaseDefaultFieldItem.cpp   |   86 +-
 .../messages/items/BaseDefaultFieldItem.h     |  272 +-
 .../items/DefaultBigDecimalFieldItem.cpp      |  392 +-
 .../items/DefaultBigDecimalFieldItem.h        |  166 +-
 .../items/DefaultBigIntegerFieldItem.cpp      |  402 +-
 .../items/DefaultBigIntegerFieldItem.h        |  168 +-
 .../items/DefaultBooleanFieldItem.cpp         |  378 +-
 .../messages/items/DefaultBooleanFieldItem.h  |  160 +-
 .../items/DefaultByteArrayFieldItem.cpp       |  392 +-
 .../items/DefaultByteArrayFieldItem.h         |  160 +-
 .../messages/items/DefaultByteFieldItem.cpp   |  390 +-
 .../messages/items/DefaultByteFieldItem.h     |  160 +-
 .../messages/items/DefaultDoubleFieldItem.cpp |  392 +-
 .../messages/items/DefaultDoubleFieldItem.h   |  160 +-
 .../messages/items/DefaultFloatFieldItem.cpp  |  392 +-
 .../messages/items/DefaultFloatFieldItem.h    |  160 +-
 .../items/DefaultIntegerFieldItem.cpp         |  392 +-
 .../messages/items/DefaultIntegerFieldItem.h  |  160 +-
 .../items/DefaultLocalDateFieldItem.cpp       |  392 +-
 .../items/DefaultLocalDateFieldItem.h         |  160 +-
 .../items/DefaultLocalDateTimeFieldItem.cpp   |  190 +-
 .../items/DefaultLocalDateTimeFieldItem.h     |  140 +-
 .../items/DefaultLocalTimeFieldItem.cpp       |  190 +-
 .../items/DefaultLocalTimeFieldItem.h         |  140 +-
 .../messages/items/DefaultLongFieldItem.cpp   |  392 +-
 .../messages/items/DefaultLongFieldItem.h     |  162 +-
 .../messages/items/DefaultShortFieldItem.cpp  |  392 +-
 .../messages/items/DefaultShortFieldItem.h    |  162 +-
 .../messages/items/DefaultStringFieldItem.cpp |  118 +-
 .../messages/items/DefaultStringFieldItem.h   |  130 +-
 .../plc4x/cpp/s7/types/S7ControllerType.h     |  128 +-
 sandbox/plc4cpp/utils/CMakeLists.txt          |   44 +-
 sandbox/plc4cpp/utils/logger/CMakeLists.txt   |   62 +-
 .../apache/plc4x/cpp/utils/logger/BLogger.cpp |  950 ++--
 .../apache/plc4x/cpp/utils/logger/BLogger.h   |  312 +-
 .../apache/plc4x/cpp/utils/logger/DatDmp.cpp  |  286 +-
 .../apache/plc4x/cpp/utils/logger/DatDmp.h    |  176 +-
 .../plc4x/cpp/utils/logger/DbgTrace.cpp       |  104 +-
 .../apache/plc4x/cpp/utils/logger/DbgTrace.h  |  108 +-
 .../plc4x/cpp/utils/logger/ErrorCategory.cpp  |  142 +-
 .../plc4x/cpp/utils/logger/ErrorCategory.h    |  248 +-
 .../cpp/utils/logger/ErrorInfoException.cpp   |  342 +-
 .../cpp/utils/logger/ErrorInfoException.h     |  164 +-
 .../apache/plc4x/cpp/utils/logger/ExLog.cpp   |  286 +-
 .../org/apache/plc4x/cpp/utils/logger/ExLog.h |  142 +-
 .../plc4cpp/utils/systemconfig/CMakeLists.txt |   48 +-
 .../systemconfig/SystemConfiguration.cpp      |  128 +-
 .../utils/systemconfig/SystemConfiguration.h  |  138 +-
 sandbox/plc4net/.gitignore                    |  686 +--
 sandbox/plc4net/api/PlcDriverManager.cs       |  206 +-
 sandbox/plc4net/api/api.csproj                |   54 +-
 sandbox/plc4net/api/api/IPlcConnection.cs     |  176 +-
 sandbox/plc4net/api/api/IPlcDriver.cs         |  112 +-
 .../api/authentication/IPlcAuthentication.cs  |   56 +-
 .../PlcUsernamePasswordAuthentication.cs      |   94 +-
 .../api/metadata/IPlcConnectionMetadata.cs    |   76 +-
 .../api/exceptions/PlcConnectionException.cs  |   98 +-
 .../plc4net/api/exceptions/PlcException.cs    |   98 +-
 .../exceptions/PlcInvalidFieldException.cs    |   90 +-
 .../plc4net/api/messages/IPlcFieldRequest.cs  |  102 +-
 .../plc4net/api/messages/IPlcFieldResponse.cs |   96 +-
 sandbox/plc4net/api/messages/IPlcMessage.cs   |   56 +-
 .../plc4net/api/messages/IPlcReadRequest.cs   |   56 +-
 .../api/messages/IPlcReadRequestBuilder.cs    |   68 +-
 .../plc4net/api/messages/IPlcReadResponse.cs  |   56 +-
 sandbox/plc4net/api/messages/IPlcRequest.cs   |   70 +-
 .../api/messages/IPlcRequestBuilder.cs        |   66 +-
 sandbox/plc4net/api/messages/IPlcResponse.cs  |   64 +-
 .../api/messages/IPlcSubscriptionEventArgs.cs |   68 +-
 .../api/messages/IPlcSubscriptionRequest.cs   |   56 +-
 .../IPlcSubscriptionRequestBuilder.cs         |  106 +-
 .../api/messages/IPlcSubscriptionResponse.cs  |   82 +-
 .../api/messages/IPlcUnsubscriptionRequest.cs |   56 +-
 .../IPlcUnsubscriptionRequestBuilder.cs       |   88 +-
 .../messages/IPlcUnsubscriptionResponse.cs    |   56 +-
 .../plc4net/api/messages/IPlcWriteRequest.cs  |   62 +-
 .../api/messages/IPlcWriteRequestBuilder.cs   |  266 +-
 sandbox/plc4net/api/model/IPlcField.cs        |   76 +-
 .../api/model/IPlcSubscriptionHandle.cs       |   68 +-
 sandbox/plc4net/api/pom.xml                   |  142 +-
 sandbox/plc4net/api/types/PlcResponseCode.cs  |   68 +-
 .../plc4net.driver/plc4net.driver.csproj      |   58 +-
 sandbox/plc4net/plc4net.driver/pom.xml        |  134 +-
 sandbox/plc4net/plc4net.sln                   |   88 +-
 sandbox/plc4net/pom.xml                       |   90 +-
 sandbox/plc4py/README.md                      |  116 +-
 sandbox/plc4py/pom.xml                        |  436 +-
 sandbox/plc4py/setup.py                       |  132 +-
 sandbox/plc4py/src/assembly/python.xml        |   92 +-
 sandbox/plc4py/src/main/python/__init__.py    |   34 +-
 .../plc4py/src/main/python/org/__init__.py    |   34 +-
 .../src/main/python/org/apache/__init__.py    |   34 +-
 .../python/org/apache/plc4x/InteropClient.py  |   90 +-
 .../python/org/apache/plc4x/PlcConnection.py  |  148 +-
 .../org/apache/plc4x/PlcDriverManager.py      |  158 +-
 .../main/python/org/apache/plc4x/__init__.py  |   34 +-
 .../plc4py/src/main/resources/lib/log4j2.xml  |   62 +-
 sandbox/plc4py/src/test/python/__init__.py    |   52 +-
 .../plc4py/src/test/python/org/__init__.py    |   52 +-
 .../src/test/python/org/apache/__init__.py    |   52 +-
 .../test/python/org/apache/plc4x/__init__.py  |   34 +-
 .../org/apache/plc4x/test_PlcDriverManager.py |  284 +-
 sandbox/pom.xml                               |  150 +-
 sandbox/streampipes-connectors/READMME.adoc   |   96 +-
 .../streampipes-connectors/env/development    |   54 +-
 sandbox/streampipes-connectors/pom.xml        |  398 +-
 .../streampipes/bacnetip/BacNetIpAdapter.java |  744 +--
 .../bacnetip/config/ConfigKeys.java           |   62 +-
 .../bacnetip/config/ConnectWorkerConfig.java  |  166 +-
 sandbox/test-java-bacnetip-driver/pom.xml     |  236 +-
 .../java/bacnetip/PassiveBacNetIpDriver.java  |  152 +-
 .../connection/BacNetIpFieldHandler.java      |   72 +-
 .../PassiveBacNetIpPlcConnection.java         |  236 +-
 .../java/bacnetip/model/BacNetIpField.java    |   94 +-
 .../bacnetip/protocol/BacNetIpProtocol.java   |  124 +-
 .../bacnetip/protocol/HelloWorldProtocol.java |  144 +-
 .../org.apache.plc4x.java.spi.PlcDriver       |   38 +-
 .../java/bacnetip/ManualBacNetDecoder.java    |   70 +-
 .../bacnetip/PassiveBacNetIpDriverManual.java |   84 +-
 sandbox/test-java-df1-driver/README.adoc      |   68 +-
 sandbox/test-java-df1-driver/pom.xml          |  338 +-
 .../apache/plc4x/java/df1/DF1PlcDriver.java   |  148 +-
 .../org/apache/plc4x/java/df1/Df1Field.java   |  124 +-
 .../df1/connection/BaseDf1Connection.java     |   68 +-
 .../df1/connection/SerialDf1Connection.java   |  296 +-
 .../plc4x/java/df1/fields/DataType.java       |   88 +-
 .../plc4x/java/df1/protocol/Df1Protocol.java  |  314 +-
 .../java/df1/protocol/Plc4XDf1Protocol.java   |  344 +-
 .../apache/plc4x/java/df1/util/DF1Utils.java  |  316 +-
 .../plc4x/java/df1/util/Df1FieldHandler.java  |   78 +-
 .../org.apache.plc4x.java.spi.PlcDriver       |   38 +-
 .../plc4x/java/df1/DF1PlcDriverTest.java      |   86 +-
 .../protocol/df1/BenchmarkGeneratedDf1.java   |  162 +-
 .../protocol/df1/BenchmarkManualDf1.java      |  478 +-
 .../apache/plc4x/protocol/df1/Df1Test.java    |   60 +-
 .../plc4x/protocol/df1/EndToEndTest.java      |  112 +-
 .../org/apache/plc4x/protocol/df1/IOTest.java |  198 +-
 .../test/resources/testsuite/Df1Testsuite.xml |  200 +-
 sandbox/test-java-knxnetip-driver/pom.xml     |  232 +-
 .../apache/plc4x/java/knxnetip/IOTest.java    |  204 +-
 .../plc4x/java/knxnetip/KNXNetIpTest.java     |   60 +-
 .../resources/testsuite/KNXNetIPTestsuite.xml | 1086 ++--
 sandbox/test-java-passive-s7-driver/pom.xml   |  200 +-
 .../javapassive/s7/PassiveS7PlcDriver.java    |  180 +-
 .../s7/connection/PassiveS7PlcConnection.java |  198 +-
 .../s7/protocol/HelloWorldProtocol.java       |   96 +-
 .../s7/protocol/PassiveS7Protocol.java        |  124 +-
 .../org.apache.plc4x.java.spi.PlcDriver       |   38 +-
 .../java/BenchmarkGeneratedPassiveS7.java     |   90 +-
 sandbox/test-java-s7-driver/pom.xml           |  180 +-
 .../src/test/java/BenchmarkGeneratedS7.java   |  142 +-
 src/main/script/prerequisiteCheck.groovy      |  730 +--
 src/remote-resources/NOTICE                   |   50 +-
 src/site/asciidoc/developers/building.adoc    |  256 +-
 src/site/asciidoc/developers/ci.adoc          |  124 +-
 .../asciidoc/developers/code-gen/index.adoc   |  792 +--
 .../code-gen/language/freemarker.adoc         |  232 +-
 .../developers/code-gen/protocol/df1.adoc     |  186 +-
 .../developers/code-gen/protocol/mspec.adoc   |  702 +--
 src/site/asciidoc/developers/conferences.adoc |   98 +-
 .../asciidoc/developers/contributing.adoc     |  404 +-
 src/site/asciidoc/developers/decisions.adoc   |  132 +-
 src/site/asciidoc/developers/issues.adoc      |   38 +-
 src/site/asciidoc/developers/jqassistant.adoc |  252 +-
 src/site/asciidoc/developers/maturity.adoc    |  152 +-
 src/site/asciidoc/developers/preparing.adoc   |  788 +--
 .../developers/release-build-tools.adoc       |  920 +--
 src/site/asciidoc/developers/release.adoc     | 1036 ++--
 src/site/asciidoc/developers/sonar.adoc       |   38 +-
 src/site/asciidoc/developers/team.adoc        |  110 +-
 src/site/asciidoc/developers/vm.adoc          |  190 +-
 src/site/asciidoc/developers/vpn.adoc         |  378 +-
 src/site/asciidoc/developers/website.adoc     |  396 +-
 src/site/asciidoc/developers/wiki.adoc        |   38 +-
 .../writing-driver/writing-driver.adoc        |  112 +-
 src/site/asciidoc/index.adoc                  |  202 +-
 src/site/asciidoc/protocols/ab-eth/index.adoc |   64 +-
 src/site/asciidoc/protocols/ads/index.adoc    |   50 +-
 .../asciidoc/protocols/delta-v/index.adoc     |  394 +-
 .../asciidoc/protocols/delta-v/read-data.adoc | 3310 +++++------
 .../delta-v/reverse-engineering.adoc          |  502 +-
 .../asciidoc/protocols/ehtercat/index.adoc    |   56 +-
 .../asciidoc/protocols/ethernet-ip/index.adoc |   60 +-
 src/site/asciidoc/protocols/features.adoc     |  172 +-
 src/site/asciidoc/protocols/index.adoc        |   98 +-
 src/site/asciidoc/protocols/modbus/index.adoc |   52 +-
 src/site/asciidoc/protocols/opc-ua/index.adoc |   56 +-
 src/site/asciidoc/protocols/s7/index.adoc     |  578 +-
 .../asciidoc/protocols/s7/s7comm-plus.adoc    |   74 +-
 src/site/asciidoc/protocols/s7/s7comm.adoc    |  286 +-
 src/site/asciidoc/users/download.adoc         |  266 +-
 src/site/asciidoc/users/gettingstarted.adoc   |   46 +-
 src/site/asciidoc/users/industry40.adoc       |  248 +-
 src/site/asciidoc/users/opm.adoc              |  144 +-
 src/site/asciidoc/users/security.adoc         |   50 +-
 src/site/asciidoc/users/testing.adoc          |  328 +-
 src/site/resources-filtered/plc4x-doap.rdf    |  224 +-
 .../css/bootstrap-responsive.min.css          |   38 +-
 src/site/resources/css/site.css               |  186 +-
 .../resources/images/apache_nifi_logo.svg     |   36 +-
 src/site/resources/plc4x-pmc.rdf              |  156 +-
 src/site/site.xml                             |  294 +-
 tools/README.md                               |  142 +-
 tools/boost/pom.xml                           |  284 +-
 tools/boost/src/assembly/bundle.xml           |   78 +-
 tools/check_sigs.sh                           |  134 +-
 tools/clean-site.sh                           |   68 +-
 tools/common.sh                               |  404 +-
 tools/download_staged_release.sh              |  274 +-
 tools/logstash/pom.xml                        |  210 +-
 tools/pom.xml                                 |  110 +-
 tools/thrift/pom.xml                          |  676 +--
 tools/thrift/src/assembly/compiler.xml        |   84 +-
 tools/thrift/src/assembly/cpp.xml             |  110 +-
 tools/thrift/src/assembly/python.xml          |   84 +-
 vim.exe.stackdump                             |   36 +-
 1522 files changed, 169448 insertions(+), 168886 deletions(-)
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7HEmbeddedChannelFactory.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7HProxy.java
 create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7HProxyHelper.java

diff --git a/.dockerignore b/.dockerignore
index 8e24f8bb909..cef3f4a9186 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,21 +1,21 @@
-#
-# 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
-#
-#    http://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.
-#
-
-Dockerfile
-.dockerignore
-.git/**
+#
+# 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
+#
+#    http://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.
+#
+
+Dockerfile
+.dockerignore
+.git/**
 **/target/**
\ No newline at end of file
diff --git a/.editorconfig b/.editorconfig
index df7383c37b0..a84ad446e94 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,31 +1,31 @@
-#
-# 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
-#
-#    http://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.
-#
-
-[*]
-charset=utf-8
-end_of_line=lf
-insert_final_newline=false
-indent_style=space
-indent_size=4
-
-[{*.yml,*.yaml}]
-indent_style=space
-indent_size=2
-
-[*.xml]
-indent_style=space
-indent_size=2
+#
+# 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
+#
+#    http://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.
+#
+
+[*]
+charset=utf-8
+end_of_line=lf
+insert_final_newline=false
+indent_style=space
+indent_size=4
+
+[{*.yml,*.yaml}]
+indent_style=space
+indent_size=2
+
+[*.xml]
+indent_style=space
+indent_size=2
diff --git a/.gitignore b/.gitignore
index 124d53fa947..e7b7c185646 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,170 +1,170 @@
-# User-specific stuff:
-.idea/**
-*.iml
-.vscode/**
-
-# Sensitive or high-churn files:
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.xml
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-### Java template
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# Package Files #
-*.jar
-*.war
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-# Asciidoctor plugin
-.asciidoctor
-
-### Maven template
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-.mvn/timing.properties
-
-### Eclipse template
-.metadata
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.settings/
-.loadpath
-.recommenders
-.project
-.classpath
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# STS (Spring Tool Suite)
-.springBeans
-
-# Scala IDE specific (Scala & Java development for Eclipse)
-.cache-main
-.scala_dependencies
-.worksheet
-
-# Emacs backup files
-*~
-.scannerwork
-
-spock-reports
-
-# Other exclusions
-
-.DS_Store
-elasticsearch-data/
-jqassistant/
-
-# Exclude the C++ libs
-plc4cpp/libs/libs/
-plc4cpp/.idea/
-plc4cpp/cmake-build-debug/
-
-    # Ignore VisualStudio related files
-**/CMakeSettings.json
-**/.vs/**
-
-# Exclude temporary python stuff
-plc4py/venv/
-**/__pycache__/**/*
-/plc4cpp/.vscode/ipch
-
-# Exclude gradle stuff
-.gradle
-/build/
-
-# Ignore Gradle GUI config
-gradle-app.setting
-
-# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
-!gradle-wrapper.jar
-
-# Cache of project
-.gradletasknamecache
-
-# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
-# gradle/wrapper/gradle-wrapper.properties
-
-exclude ruby specifics:
-
-*.gem
-*.rbc
-/.config
-/coverage/
-/InstalledFiles
-/pkg/
-/spec/reports/
-/spec/examples.txt
-/test/tmp/
-/test/version_tmp/
-/tmp/
-
-# Used by dotenv library to load environment variables.
-# .env
-
-# Ignore Byebug command history file.
-.byebug_history
-
-## Specific to RubyMotion:
-.dat*
-.repl_history
-build/
-*.bridgesupport
-build-iPhoneOS/
-build-iPhoneSimulator/
-
-## Specific to RubyMotion (use of CocoaPods):
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# vendor/Pods/
-
-## Documentation cache and generated files:
-/.yardoc/
-/_yardoc/
-/doc/
-/rdoc/
-
-## Environment normalization:
-/.bundle/
-/vendor/bundle
-/lib/bundler/man/
-
-# for a library or gem, you might want to ignore these files since the code is
-# intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
-
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+# User-specific stuff:
+.idea/**
+*.iml
+.vscode/**
+
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+### Java template
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# Package Files #
+*.jar
+*.war
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# Asciidoctor plugin
+.asciidoctor
+
+### Maven template
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+
+### Eclipse template
+.metadata
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
+.project
+.classpath
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
+
+# Emacs backup files
+*~
+.scannerwork
+
+spock-reports
+
+# Other exclusions
+
+.DS_Store
+elasticsearch-data/
+jqassistant/
+
+# Exclude the C++ libs
+plc4cpp/libs/libs/
+plc4cpp/.idea/
+plc4cpp/cmake-build-debug/
+
+    # Ignore VisualStudio related files
+**/CMakeSettings.json
+**/.vs/**
+
+# Exclude temporary python stuff
+plc4py/venv/
+**/__pycache__/**/*
+/plc4cpp/.vscode/ipch
+
+# Exclude gradle stuff
+.gradle
+/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
+
+exclude ruby specifics:
+
+*.gem
+*.rbc
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/spec/examples.txt
+/test/tmp/
+/test/version_tmp/
+/tmp/
+
+# Used by dotenv library to load environment variables.
+# .env
+
+# Ignore Byebug command history file.
+.byebug_history
+
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+*.bridgesupport
+build-iPhoneOS/
+build-iPhoneSimulator/
+
+## Specific to RubyMotion (use of CocoaPods):
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# vendor/Pods/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalization:
+/.bundle/
+/vendor/bundle
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 64a03f04cbd..a191e41f564 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,48 +1,48 @@
-#
-# 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
-#
-#    http://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.
-#
-
-image: maven:3-jdk-8
-
-# Asciidoctor requires some tools for generating the documentation
-before_script:
-  - apt-get update
-  - apt-get install -y python-seqdiag python-nwdiag
-
-stages:
-  - build
-  - stage-site
-
-build:
-  stage: build
-  script:
-  - mvn clean package site site:stage
-  artifacts:
-    paths:
-    - target/staging
-
-# Have gitlab publish the content of the target/staging directory as gitlab pages website
-# NOTE: Don't ask me why I have to rename it that way ...
-pages:
-  stage: stage-site
-  script:
-  - mkdir public
-  - mv target/staging/* public/
-  artifacts:
-    paths:
-    - public
-  only:
-  - master
+#
+# 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
+#
+#    http://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.
+#
+
+image: maven:3-jdk-8
+
+# Asciidoctor requires some tools for generating the documentation
+before_script:
+  - apt-get update
+  - apt-get install -y python-seqdiag python-nwdiag
+
+stages:
+  - build
+  - stage-site
+
+build:
+  stage: build
+  script:
+  - mvn clean package site site:stage
+  artifacts:
+    paths:
+    - target/staging
+
+# Have gitlab publish the content of the target/staging directory as gitlab pages website
+# NOTE: Don't ask me why I have to rename it that way ...
+pages:
+  stage: stage-site
+  script:
+  - mkdir public
+  - mv target/staging/* public/
+  artifacts:
+    paths:
+    - public
+  only:
+  - master
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index acf6e3fd534..a3572edef10 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
-  <!-- Currently causing a NPE when executing goals not bound to a specific maven lifecycle phase -->
-  <!--extension>
-    <groupId>com.soebes.maven.extensions</groupId>
-    <artifactId>maven-buildtime-profiler</artifactId>
-    <version>0.1.0</version>
-  </extension-->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
+  <!-- Currently causing a NPE when executing goals not bound to a specific maven lifecycle phase -->
+  <!--extension>
+    <groupId>com.soebes.maven.extensions</groupId>
+    <artifactId>maven-buildtime-profiler</artifactId>
+    <version>0.1.0</version>
+  </extension-->
 </extensions>
\ No newline at end of file
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java
index a2fae998bed..de90d650419 100644
--- a/.mvn/wrapper/MavenWrapperDownloader.java
+++ b/.mvn/wrapper/MavenWrapperDownloader.java
@@ -1,117 +1,117 @@
-/*
- * Copyright 2007-present the original author or authors.
- *
- * Licensed 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
- *
- *      http://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.
- */
-import java.net.*;
-import java.io.*;
-import java.nio.channels.*;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
-    private static final String WRAPPER_VERSION = "0.5.2";
-    /**
-     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
-     */
-    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
-        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
-
-    /**
-     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
-     * use instead of the default one.
-     */
-    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
-        ".mvn/wrapper/maven-wrapper.properties";
-
-    /**
-     * Path where the maven-wrapper.jar will be saved to.
-     */
-    private static final String MAVEN_WRAPPER_JAR_PATH =
-        ".mvn/wrapper/maven-wrapper.jar";
-
-    /**
-     * Name of the property which should be used to override the default download url for the wrapper.
-     */
-    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
-    public static void main(String args[]) {
-        System.out.println("- Downloader started");
-        File baseDirectory = new File(args[0]);
-        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
-
-        // If the maven-wrapper.properties exists, read it and check if it contains a custom
-        // wrapperUrl parameter.
-        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
-        String url = DEFAULT_DOWNLOAD_URL;
-        if(mavenWrapperPropertyFile.exists()) {
-            FileInputStream mavenWrapperPropertyFileInputStream = null;
-            try {
-                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
-                Properties mavenWrapperProperties = new Properties();
-                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
-                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
-            } catch (IOException e) {
-                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
-            } finally {
-                try {
-                    if(mavenWrapperPropertyFileInputStream != null) {
-                        mavenWrapperPropertyFileInputStream.close();
-                    }
-                } catch (IOException e) {
-                    // Ignore ...
-                }
-            }
-        }
-        System.out.println("- Downloading from: " + url);
-
-        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
-        if(!outputFile.getParentFile().exists()) {
-            if(!outputFile.getParentFile().mkdirs()) {
-                System.out.println(
-                    "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
-            }
-        }
-        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
-        try {
-            downloadFileFromURL(url, outputFile);
-            System.out.println("Done");
-            System.exit(0);
-        } catch (Throwable e) {
-            System.out.println("- Error downloading");
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
-        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
-            String username = System.getenv("MVNW_USERNAME");
-            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
-            Authenticator.setDefault(new Authenticator() {
-                @Override
-                protected PasswordAuthentication getPasswordAuthentication() {
-                    return new PasswordAuthentication(username, password);
-                }
-            });
-        }
-        URL website = new URL(urlString);
-        ReadableByteChannel rbc;
-        rbc = Channels.newChannel(website.openStream());
-        FileOutputStream fos = new FileOutputStream(destination);
-        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
-        fos.close();
-        rbc.close();
-    }
-
-}
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed 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
+ *
+ *      http://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.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.2";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+        ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+        ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                    "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index e8975771b15..7d74bae7716 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1,19 +1,19 @@
-# 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
-#
-#   http://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.
-
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.2/maven-wrapper-0.5.2.jar
+# 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
+#
+#   http://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.
+
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.2/maven-wrapper-0.5.2.jar
diff --git a/.travis.yml b/.travis.yml
index 271456fc470..a386b9fe5bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,30 +1,30 @@
-#                                                                                                                                                                                                  
-# 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                                                                                                                                            
-#                                                                                                                                                                                                  
-#    http://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.                                                                                                                                                                   
-#                                                                                                                                                                                                  
-
-language: java
-
-env:
-   - MAVEN_OPTS="-Xms512m -Xmx512m"
-
-matrix:
-   fast_finish: true
-
-install: true
-
-script:
-    - jdk_switcher use oraclejdk8
-    - mvn clean install site:site
+#                                                                                                                                                                                                  
+# 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                                                                                                                                            
+#                                                                                                                                                                                                  
+#    http://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.                                                                                                                                                                   
+#                                                                                                                                                                                                  
+
+language: java
+
+env:
+   - MAVEN_OPTS="-Xms512m -Xmx512m"
+
+matrix:
+   fast_finish: true
+
+install: true
+
+script:
+    - jdk_switcher use oraclejdk8
+    - mvn clean install site:site
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 2c5316949dd..b8e11e93605 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -1,50 +1,50 @@
-<!--
-
-  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
-
-      http://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.
-
--->
-# Concepts (open for discussion)
-
-## Requirements
-
-- Maven >= 3.3.1 
-- Java >= 8
-
-## General
-
-- All modules should use only one primary build system
-- It should be super-easy for new contributors to get started (A new contributor should be able to checkout and build with a core testsuite with a simple: 'mvn package' run)
-- New code should only be accepted, if there are tests (Currently the java part of the build is configured to fail if the code coverage is below 90%)
-
-## Java Specific
-
-- Development should be done in Java 8
-- Providing Java 7 compatible versions should be possible by using the retrolambda plugin
-  - Usage of default implementations does cause more problems than it solves in this case. 
-
-## IDE specific
-- For formatting there is a .editorconfig defined. Intellij Idea come with a plugin for this pre-installed, for eclipse an installation is required (http://editorconfig.org/).
-- Import organizing uses the Intellij Idea default:
-  - Import order
-    - all other imports
-    - blank
-    - import javax.*
-    - import java.*
-    - blank
-    - all other static imports
-  - Star imports
-    - number of imports needed for .* = 5
+<!--
+
+  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
+
+      http://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.
+
+-->
+# Concepts (open for discussion)
+
+## Requirements
+
+- Maven >= 3.3.1 
+- Java >= 8
+
+## General
+
+- All modules should use only one primary build system
+- It should be super-easy for new contributors to get started (A new contributor should be able to checkout and build with a core testsuite with a simple: 'mvn package' run)
+- New code should only be accepted, if there are tests (Currently the java part of the build is configured to fail if the code coverage is below 90%)
+
+## Java Specific
+
+- Development should be done in Java 8
+- Providing Java 7 compatible versions should be possible by using the retrolambda plugin
+  - Usage of default implementations does cause more problems than it solves in this case. 
+
+## IDE specific
+- For formatting there is a .editorconfig defined. Intellij Idea come with a plugin for this pre-installed, for eclipse an installation is required (http://editorconfig.org/).
+- Import organizing uses the Intellij Idea default:
+  - Import order
+    - all other imports
+    - blank
+    - import javax.*
+    - import java.*
+    - blank
+    - all other static imports
+  - Star imports
+    - number of imports needed for .* = 5
     - number of static-imports needed for .* = 3
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 00a96bbc1be..871e17a0107 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,114 +1,114 @@
-#  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
-#
-#      http://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.
-
-##########################################################################################
-# Build PLC4X
-##########################################################################################
-
-# This is the image we'll use to execute the build (and give it the name 'build').
-# (This image is based on Ubuntu)
-# Fixed version of this in order to have a fixed JDK version
-FROM azul/zulu-openjdk:8.42.0.21 as build
-
-# Install some stuff we need to run the build
-RUN apt update -y
-
-# Install general purpose tools
-RUN apt install -y make libpcap-dev libc-dev
-
-# Requied for "with-boost" profile
-RUN apt install -y bison flex gcc g++
-
-# Required for "with-cpp" profile
-RUN apt install -y gcc g++
-
-# Required for "with-dotnet" profile
-RUN apt install -y wget
-RUN wget -q https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
-RUN dpkg -i packages-microsoft-prod.deb
-RUN apt install -y software-properties-common
-RUN add-apt-repository universe -y
-RUN apt install -y apt-transport-https
-RUN apt update -y
-RUN apt install -y dotnet-sdk-2.2
-
-# Required for the general build
-RUN apt install -y git
-
-# Required for "with-proxies"
-RUN apt install -y bison flex gcc g++
-
-# Required for "with-python" profile
-RUN apt install -y python-setuptools python
-
-# Copy the project into the docker container
-COPY . /ws/
-
-# Change the working directory (where commands are executed) into the new "ws" directory
-WORKDIR /ws
-
-# Tell Maven to fetch all needed dependencies first, so they can get cached
-# (Tried a patched version of the plugin to allow exclusion of inner artifacts.
-# See https://issues.apache.org/jira/browse/MDEP-568 for details)
-RUN ./mvnw -P with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash com.offbytwo.maven.plugins:maven-dependency-plugin:3.1.1.MDEP568:go-offline -DexcludeGroupIds=org.apache.plc4x,org.apache.plc4x.examples,org.apache.plc4x.sandbox
-# Build everything with all tests
-RUN ./mvnw -P with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash install
-
-# Get the version of the project and save it in a local file on the container
-RUN ./mvnw org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.version -DforceStdout -q -pl . > project_version
-
-##########################################################################################
-# Build a demo container
-##########################################################################################
-
-# Move the file to a place we can reference it from without a version
-RUN PROJECT_VERSION=`cat project_version`; mv plc4j/examples/hello-storage-elasticsearch/target/plc4j-hello-storage-elasticsearch-$PROJECT_VERSION-uber-jar.jar plc4xdemo.jar
-
-# Build a highly optimized JRE
-FROM alpine:3.10 as packager
-
-# Install regular JDK
-RUN apk update
-RUN apk --no-cache add openjdk11-jdk openjdk11-jmods
-
-# build minimal JRE
-ENV JAVA_MINIMAL="/opt/java-minimal"
-RUN /usr/lib/jvm/java-11-openjdk/bin/jlink \
-    --verbose \
-    --add-modules \
-        java.base,java.sql,java.naming,java.desktop,java.management,java.security.jgss,java.instrument \
-    --compress 2 --strip-debug --no-header-files --no-man-pages \
-    --release-info="add:IMPLEMENTOR=radistao:IMPLEMENTOR_VERSION=radistao_JRE" \
-    --output "$JAVA_MINIMAL"
-
-# Now create an actuall deployment container
-FROM alpine:3.10
-
-# Install our optimized JRE
-ENV JAVA_HOME=/opt/java-minimal
-ENV PATH="$PATH:$JAVA_HOME/bin"
-COPY --from=packager "$JAVA_HOME" "$JAVA_HOME"
-
-# Prepare the demo by copying the example artifact from the 'build' container into this new one.
-COPY --from=build /ws/plc4xdemo.jar /plc4xdemo.jar
-
-# Let runtime know which ports we will be listening on
-EXPOSE 9200 9300
-
-# Allow for extra options to be passed to the jar using PLC4X_OPTIONS env variable
-ENV PLC4X_OPTIONS ""
-
-# This will be executed as soon as the container is started.
-ENTRYPOINT ["sh", "-c", "[ -f /run/plc4xdemo.env ] && . /run/plc4xdemo.env ; java -jar /plc4xdemo.jar $PLC4X_OPTIONS"]
+#  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
+#
+#      http://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.
+
+##########################################################################################
+# Build PLC4X
+##########################################################################################
+
+# This is the image we'll use to execute the build (and give it the name 'build').
+# (This image is based on Ubuntu)
+# Fixed version of this in order to have a fixed JDK version
+FROM azul/zulu-openjdk:8.42.0.21 as build
+
+# Install some stuff we need to run the build
+RUN apt update -y
+
+# Install general purpose tools
+RUN apt install -y make libpcap-dev libc-dev
+
+# Requied for "with-boost" profile
+RUN apt install -y bison flex gcc g++
+
+# Required for "with-cpp" profile
+RUN apt install -y gcc g++
+
+# Required for "with-dotnet" profile
+RUN apt install -y wget
+RUN wget -q https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
+RUN dpkg -i packages-microsoft-prod.deb
+RUN apt install -y software-properties-common
+RUN add-apt-repository universe -y
+RUN apt install -y apt-transport-https
+RUN apt update -y
+RUN apt install -y dotnet-sdk-2.2
+
+# Required for the general build
+RUN apt install -y git
+
+# Required for "with-proxies"
+RUN apt install -y bison flex gcc g++
+
+# Required for "with-python" profile
+RUN apt install -y python-setuptools python
+
+# Copy the project into the docker container
+COPY . /ws/
+
+# Change the working directory (where commands are executed) into the new "ws" directory
+WORKDIR /ws
+
+# Tell Maven to fetch all needed dependencies first, so they can get cached
+# (Tried a patched version of the plugin to allow exclusion of inner artifacts.
+# See https://issues.apache.org/jira/browse/MDEP-568 for details)
+RUN ./mvnw -P with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash com.offbytwo.maven.plugins:maven-dependency-plugin:3.1.1.MDEP568:go-offline -DexcludeGroupIds=org.apache.plc4x,org.apache.plc4x.examples,org.apache.plc4x.sandbox
+# Build everything with all tests
+RUN ./mvnw -P with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash install
+
+# Get the version of the project and save it in a local file on the container
+RUN ./mvnw org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.version -DforceStdout -q -pl . > project_version
+
+##########################################################################################
+# Build a demo container
+##########################################################################################
+
+# Move the file to a place we can reference it from without a version
+RUN PROJECT_VERSION=`cat project_version`; mv plc4j/examples/hello-storage-elasticsearch/target/plc4j-hello-storage-elasticsearch-$PROJECT_VERSION-uber-jar.jar plc4xdemo.jar
+
+# Build a highly optimized JRE
+FROM alpine:3.10 as packager
+
+# Install regular JDK
+RUN apk update
+RUN apk --no-cache add openjdk11-jdk openjdk11-jmods
+
+# build minimal JRE
+ENV JAVA_MINIMAL="/opt/java-minimal"
+RUN /usr/lib/jvm/java-11-openjdk/bin/jlink \
+    --verbose \
+    --add-modules \
+        java.base,java.sql,java.naming,java.desktop,java.management,java.security.jgss,java.instrument \
+    --compress 2 --strip-debug --no-header-files --no-man-pages \
+    --release-info="add:IMPLEMENTOR=radistao:IMPLEMENTOR_VERSION=radistao_JRE" \
+    --output "$JAVA_MINIMAL"
+
+# Now create an actuall deployment container
+FROM alpine:3.10
+
+# Install our optimized JRE
+ENV JAVA_HOME=/opt/java-minimal
+ENV PATH="$PATH:$JAVA_HOME/bin"
+COPY --from=packager "$JAVA_HOME" "$JAVA_HOME"
+
+# Prepare the demo by copying the example artifact from the 'build' container into this new one.
+COPY --from=build /ws/plc4xdemo.jar /plc4xdemo.jar
+
+# Let runtime know which ports we will be listening on
+EXPOSE 9200 9300
+
+# Allow for extra options to be passed to the jar using PLC4X_OPTIONS env variable
+ENV PLC4X_OPTIONS ""
+
+# This will be executed as soon as the container is started.
+ENTRYPOINT ["sh", "-c", "[ -f /run/plc4xdemo.env ] && . /run/plc4xdemo.env ; java -jar /plc4xdemo.jar $PLC4X_OPTIONS"]
diff --git a/Jenkinsfile b/Jenkinsfile
index 989f0114e28..2f5fbc2a805 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,309 +1,309 @@
-#!groovy
-
-/*
- *
- *  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
- *
- *      http://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.
- *
- */
-pipeline {
-
-    agent {
-        node {
-            label 'plc4x'
-        }
-    }
-
-    environment {
-        // It seems the login the jenkins slave uses, doesn't pick up the environment changes,
-        // so we have to try to manually add theme here.
-        MAVEN_HOME = '/opt/maven'
-        PATH = "${MAVEN_HOME}/bin:${env.PATH}"
-
-        PLC4X_BUILD_ON_JENKINS = true
-        JENKINS_PROFILE = 'jenkins-build'
-        // On non develop build we don't want to pollute the global m2 repo
-        MVN_LOCAL_REPO_OPT = '-Dmaven.repo.local=.repository'
-        // Test failures will be handled by the jenkins junit steps and mark the build as unstable.
-        MVN_TEST_FAIL_IGNORE = '-Dmaven.test.failure.ignore=true'
-
-        SONARCLOUD_PARAMS = "-Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_plc4x -Dsonar.branch.name=develop"
-    }
-
-    tools {
-        maven 'Maven 3 (latest)'
-        jdk 'JDK 1.8 (latest)'
-    }
-
-    options {
-        // Kill this job after one hour.
-        timeout(time: 24, unit: 'HOURS')
-        // When we have test-fails e.g. we don't need to run the remaining steps
-        skipStagesAfterUnstable()
-        buildDiscarder(logRotator(numToKeepStr: '5', artifactNumToKeepStr: '3'))
-    }
-
-    stages {
-        stage('Initialization') {
-            steps {
-                echo 'Building Branch: ' + env.BRANCH_NAME
-                echo 'Using PATH = ' + env.PATH
-            }
-        }
-
-        stage('Cleanup') {
-            steps {
-                echo 'Cleaning up the workspace'
-                deleteDir()
-            }
-        }
-
-        stage('Checkout') {
-            steps {
-                echo 'Checking out branch ' + env.BRANCH_NAME
-                checkout scm
-            }
-        }
-
-        stage('Build') {
-            when {
-                expression {
-                    env.BRANCH_NAME != 'develop'
-                }
-            }
-            steps {
-                echo 'Building'
-                //sh 'mvn -P${JENKINS_PROFILE},skip-prerequisite-check,development,with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash ${MVN_TEST_FAIL_IGNORE} ${MVN_LOCAL_REPO_OPT} clean install'
-                sh 'mvn -P${JENKINS_PROFILE},skip-prerequisite-check,development,with-sandbox,with-logstash ${MVN_TEST_FAIL_IGNORE} ${MVN_LOCAL_REPO_OPT} clean install'
-            }
-            post {
-                always {
-                    junit(testResults: '**/surefire-reports/*.xml', allowEmptyResults: true)
-                    junit(testResults: '**/failsafe-reports/*.xml', allowEmptyResults: true)
-                }
-            }
-        }
-
-        stage('Build develop') {
-            when {
-                branch 'develop'
-            }
-            steps {
-                echo 'Building'
-                // Clean up the snapshots directory.
-                dir("local-snapshots-dir/") {
-                    deleteDir()
-                }
-
-                // We'll deploy to a relative directory so we can save
-                // that and deploy in a later step on a different node
-                //sh 'mvn -U -P${JENKINS_PROFILE},skip-prerequisite-check,development,with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash ${MVN_TEST_FAIL_IGNORE} ${JQASSISTANT_NEO4J_VERSION} -DaltDeploymentRepository=snapshot-repo::default::file:./local-snapshots-dir clean deploy'
-                sh 'mvn -U -P${JENKINS_PROFILE},skip-prerequisite-check,development,with-sandbox,with-logstash ${MVN_TEST_FAIL_IGNORE} ${JQASSISTANT_NEO4J_VERSION} -DaltDeploymentRepository=snapshot-repo::default::file:./local-snapshots-dir clean deploy'
-
-                // Stash the build results so we can deploy them on another node
-                stash name: 'plc4x-build-snapshots', includes: 'local-snapshots-dir/**'
-            }
-            post {
-                always {
-                    junit(testResults: '**/surefire-reports/*.xml', allowEmptyResults: true)
-                    junit(testResults: '**/failsafe-reports/*.xml', allowEmptyResults: true)
-                }
-            }
-        }
-
-        stage('Code Quality') {
-            when {
-                branch 'develop'
-            }
-            steps {
-                echo 'Checking Code Quality on SonarCloud'
-                withCredentials([string(credentialsId: 'chris-sonarcloud-token', variable: 'SONAR_TOKEN')]) {
-                    //sh 'mvn -P${JENKINS_PROFILE},skip-prerequisite-check,with-python,with-proxies,with-sandbox,with-logstash sonar:sonar ${SONARCLOUD_PARAMS} -Dsonar.login=${SONAR_TOKEN}'
-                    sh 'mvn -P${JENKINS_PROFILE},skip-prerequisite-check,with-sandbox,with-logstash sonar:sonar ${SONARCLOUD_PARAMS} -Dsonar.login=${SONAR_TOKEN}'
-                }
-            }
-        }
-
-        stage('Deploy') {
-            when {
-                branch 'develop'
-            }
-            // Only the official build nodes have the credentials to deploy setup.
-            agent {
-                node {
-                    label 'nexus-deploy'
-                }
-            }
-            steps {
-                echo 'Deploying'
-                // Clean up the snapshots directory.
-                dir("local-snapshots-dir/") {
-                    deleteDir()
-                }
-
-                // Unstash the previously stashed build results.
-                unstash name: 'plc4x-build-snapshots'
-
-                // Deploy the artifacts using the wagon-maven-plugin.
-                sh 'mvn -f jenkins.pom -X -P deploy-snapshots wagon:upload'
-
-                // Clean up the snapshots directory (freeing up more space after deploying).
-                dir("local-snapshots-dir/") {
-                    deleteDir()
-                }
-            }
-        }
-
-        stage('Build site') {
-            when {
-                branch 'develop'
-            }
-            steps {
-                echo 'Building Site'
-                //sh 'mvn -P${JENKINS_PROFILE},skip-prerequisite-check,with-proxies,with-logstash site'
-                sh 'mvn -P${JENKINS_PROFILE},skip-prerequisite-check,with-logstash site'
-            }
-        }
-
-        stage('Stage site') {
-            when {
-                branch 'develop'
-            }
-            steps {
-                echo 'Staging Site'
-                // Build a directory containing the aggregated website.
-                //sh 'mvn -P${JENKINS_PROFILE},skip-prerequisite-check,with-proxies,with-logstash site:stage'
-                sh 'mvn -P${JENKINS_PROFILE},skip-prerequisite-check,with-logstash site:stage'
-                // Make sure the script is executable.
-                sh 'chmod +x tools/clean-site.sh'
-                // Remove some redundant resources, which shouldn't be required.
-                sh 'tools/clean-site.sh'
-                // Stash the generated site so we can publish it on the 'git-website' node.
-                stash includes: 'target/staging/**/*', name: 'plc4x-site'
-            }
-        }
-
-        stage('Deploy site') {
-            when {
-                branch 'develop'
-            }
-            // Only the nodes labeled 'git-websites' have the credentials to commit to the.
-            agent {
-                node {
-                    label 'git-websites'
-                }
-            }
-            steps {
-                echo 'Deploying Site'
-                // Clean up the site directory.
-                dir("target/staging") {
-                    deleteDir()
-                }
-
-                // Unstash the previously stashed site.
-                unstash 'plc4x-site'
-                // Publish the site with the scm-publish plugin.
-                sh 'mvn -f jenkins.pom -X -P deploy-site scm-publish:publish-scm'
-
-                // Clean up the snapshots directory (freeing up more space after deploying).
-                dir("target/staging") {
-                    deleteDir()
-                }
-            }
-        }
-    }
-
-    // Send out notifications on unsuccessful builds.
-    post {
-        // If this build failed, send an email to the list.
-        failure {
-            script {
-                if(env.BRANCH_NAME == "develop") {
-                    emailext(
-                        subject: "[BUILD-FAILURE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'",
-                        body: """
-BUILD-FAILURE: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]':
-
-Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]</a>"
-""",
-                        to: "dev@plc4x.apache.org",
-                        recipientProviders: [[$class: 'DevelopersRecipientProvider']]
-                    )
-                }
-            }
-        }
-
-        // If this build didn't fail, but there were failing tests, send an email to the list.
-        unstable {
-            script {
-                if(env.BRANCH_NAME == "develop") {
-                    emailext(
-                        subject: "[BUILD-UNSTABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'",
-                        body: """
-BUILD-UNSTABLE: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]':
-
-Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]</a>"
-""",
-                        to: "dev@plc4x.apache.org",
-                        recipientProviders: [[$class: 'DevelopersRecipientProvider']]
-                    )
-                }
-            }
-        }
-
-        // Send an email, if the last build was not successful and this one is.
-        success {
-            // Cleanup the build directory if the build was successful
-            // (in this cae we probably don't have to do any post-build analysis)
-            deleteDir()
-            script {
-                if ((env.BRANCH_NAME == "develop") && (currentBuild.previousBuild != null) && (currentBuild.previousBuild.result != 'SUCCESS')) {
-                    emailext (
-                        subject: "[BUILD-STABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'",
-                        body: """
-BUILD-STABLE: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]':
-
-Is back to normal.
-""",
-                        to: "dev@plc4x.apache.org",
-                        recipientProviders: [[$class: 'DevelopersRecipientProvider']]
-                    )
-                }
-            }
-        }
-
-        always {
-            script {
-                if(env.BRANCH_NAME == "master") {
-                    // Double check if something was really changed as sometimes the
-                    // build just runs without any changes.
-                    if(currentBuild.changeSets.size() > 0) {
-                        emailext(
-                            subject: "[COMMIT-TO-MASTER]: A commit to the master branch was made'",
-                            body: """
-COMMIT-TO-MASTER: A commit to the master branch was made:
-
-Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]</a>"
-""",
-                            to: "dev@plc4x.apache.org",
-                            recipientProviders: [[$class: 'DevelopersRecipientProvider']]
-                        )
-                    }
-                }
-            }
-        }
-    }
-
-}
+#!groovy
+
+/*
+ *
+ *  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
+ *
+ *      http://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.
+ *
+ */
+pipeline {
+
+    agent {
+        node {
+            label 'plc4x'
+        }
+    }
+
+    environment {
+        // It seems the login the jenkins slave uses, doesn't pick up the environment changes,
+        // so we have to try to manually add theme here.
+        MAVEN_HOME = '/opt/maven'
+        PATH = "${MAVEN_HOME}/bin:${env.PATH}"
+
+        PLC4X_BUILD_ON_JENKINS = true
+        JENKINS_PROFILE = 'jenkins-build'
+        // On non develop build we don't want to pollute the global m2 repo
+        MVN_LOCAL_REPO_OPT = '-Dmaven.repo.local=.repository'
+        // Test failures will be handled by the jenkins junit steps and mark the build as unstable.
+        MVN_TEST_FAIL_IGNORE = '-Dmaven.test.failure.ignore=true'
+
+        SONARCLOUD_PARAMS = "-Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_plc4x -Dsonar.branch.name=develop"
+    }
+
+    tools {
+        maven 'Maven 3 (latest)'
+        jdk 'JDK 1.8 (latest)'
+    }
+
+    options {
+        // Kill this job after one hour.
+        timeout(time: 24, unit: 'HOURS')
+        // When we have test-fails e.g. we don't need to run the remaining steps
+        skipStagesAfterUnstable()
+        buildDiscarder(logRotator(numToKeepStr: '5', artifactNumToKeepStr: '3'))
+    }
+
+    stages {
+        stage('Initialization') {
+            steps {
+                echo 'Building Branch: ' + env.BRANCH_NAME
+                echo 'Using PATH = ' + env.PATH
+            }
+        }
+
+        stage('Cleanup') {
+            steps {
+                echo 'Cleaning up the workspace'
+                deleteDir()
+            }
+        }
+
+        stage('Checkout') {
+            steps {
+                echo 'Checking out branch ' + env.BRANCH_NAME
+                checkout scm
+            }
+        }
+
+        stage('Build') {
+            when {
+                expression {
+                    env.BRANCH_NAME != 'develop'
+                }
+            }
+            steps {
+                echo 'Building'
+                //sh 'mvn -P${JENKINS_PROFILE},skip-prerequisite-check,development,with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash ${MVN_TEST_FAIL_IGNORE} ${MVN_LOCAL_REPO_OPT} clean install'
+                sh 'mvn -P${JENKINS_PROFILE},skip-prerequisite-check,development,with-sandbox,with-logstash ${MVN_TEST_FAIL_IGNORE} ${MVN_LOCAL_REPO_OPT} clean install'
+            }
+            post {
+                always {
+                    junit(testResults: '**/surefire-reports/*.xml', allowEmptyResults: true)
+                    junit(testResults: '**/failsafe-reports/*.xml', allowEmptyResults: true)
+                }
+            }
+        }
+
+        stage('Build develop') {
+            when {
+                branch 'develop'
+            }
+            steps {
+                echo 'Building'
+                // Clean up the snapshots directory.
+                dir("local-snapshots-dir/") {
+                    deleteDir()
+                }
+
+                // We'll deploy to a relative directory so we can save
+                // that and deploy in a later step on a different node
+                //sh 'mvn -U -P${JENKINS_PROFILE},skip-prerequisite-check,development,with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash ${MVN_TEST_FAIL_IGNORE} ${JQASSISTANT_NEO4J_VERSION} -DaltDeploymentRepository=snapshot-repo::default::file:./local-snapshots-dir clean deploy'
+                sh 'mvn -U -P${JENKINS_PROFILE},skip-prerequisite-check,development,with-sandbox,with-logstash ${MVN_TEST_FAIL_IGNORE} ${JQASSISTANT_NEO4J_VERSION} -DaltDeploymentRepository=snapshot-repo::default::file:./local-snapshots-dir clean deploy'
+
+                // Stash the build results so we can deploy them on another node
+                stash name: 'plc4x-build-snapshots', includes: 'local-snapshots-dir/**'
+            }
+            post {
+                always {
+                    junit(testResults: '**/surefire-reports/*.xml', allowEmptyResults: true)
+                    junit(testResults: '**/failsafe-reports/*.xml', allowEmptyResults: true)
+                }
+            }
+        }
+
+        stage('Code Quality') {
+            when {
+                branch 'develop'
+            }
+            steps {
+                echo 'Checking Code Quality on SonarCloud'
+                withCredentials([string(credentialsId: 'chris-sonarcloud-token', variable: 'SONAR_TOKEN')]) {
+                    //sh 'mvn -P${JENKINS_PROFILE},skip-prerequisite-check,with-python,with-proxies,with-sandbox,with-logstash sonar:sonar ${SONARCLOUD_PARAMS} -Dsonar.login=${SONAR_TOKEN}'
+                    sh 'mvn -P${JENKINS_PROFILE},skip-prerequisite-check,with-sandbox,with-logstash sonar:sonar ${SONARCLOUD_PARAMS} -Dsonar.login=${SONAR_TOKEN}'
+                }
+            }
+        }
+
+        stage('Deploy') {
+            when {
+                branch 'develop'
+            }
+            // Only the official build nodes have the credentials to deploy setup.
+            agent {
+                node {
+                    label 'nexus-deploy'
+                }
+            }
+            steps {
+                echo 'Deploying'
+                // Clean up the snapshots directory.
+                dir("local-snapshots-dir/") {
+                    deleteDir()
+                }
+
+                // Unstash the previously stashed build results.
+                unstash name: 'plc4x-build-snapshots'
+
+                // Deploy the artifacts using the wagon-maven-plugin.
+                sh 'mvn -f jenkins.pom -X -P deploy-snapshots wagon:upload'
+
+                // Clean up the snapshots directory (freeing up more space after deploying).
+                dir("local-snapshots-dir/") {
+                    deleteDir()
+                }
+            }
+        }
+
+        stage('Build site') {
+            when {
+                branch 'develop'
+            }
+            steps {
+                echo 'Building Site'
+                //sh 'mvn -P${JENKINS_PROFILE},skip-prerequisite-check,with-proxies,with-logstash site'
+                sh 'mvn -P${JENKINS_PROFILE},skip-prerequisite-check,with-logstash site'
+            }
+        }
+
+        stage('Stage site') {
+            when {
+                branch 'develop'
+            }
+            steps {
+                echo 'Staging Site'
+                // Build a directory containing the aggregated website.
+                //sh 'mvn -P${JENKINS_PROFILE},skip-prerequisite-check,with-proxies,with-logstash site:stage'
+                sh 'mvn -P${JENKINS_PROFILE},skip-prerequisite-check,with-logstash site:stage'
+                // Make sure the script is executable.
+                sh 'chmod +x tools/clean-site.sh'
+                // Remove some redundant resources, which shouldn't be required.
+                sh 'tools/clean-site.sh'
+                // Stash the generated site so we can publish it on the 'git-website' node.
+                stash includes: 'target/staging/**/*', name: 'plc4x-site'
+            }
+        }
+
+        stage('Deploy site') {
+            when {
+                branch 'develop'
+            }
+            // Only the nodes labeled 'git-websites' have the credentials to commit to the.
+            agent {
+                node {
+                    label 'git-websites'
+                }
+            }
+            steps {
+                echo 'Deploying Site'
+                // Clean up the site directory.
+                dir("target/staging") {
+                    deleteDir()
+                }
+
+                // Unstash the previously stashed site.
+                unstash 'plc4x-site'
+                // Publish the site with the scm-publish plugin.
+                sh 'mvn -f jenkins.pom -X -P deploy-site scm-publish:publish-scm'
+
+                // Clean up the snapshots directory (freeing up more space after deploying).
+                dir("target/staging") {
+                    deleteDir()
+                }
+            }
+        }
+    }
+
+    // Send out notifications on unsuccessful builds.
+    post {
+        // If this build failed, send an email to the list.
+        failure {
+            script {
+                if(env.BRANCH_NAME == "develop") {
+                    emailext(
+                        subject: "[BUILD-FAILURE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'",
+                        body: """
+BUILD-FAILURE: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]':
+
+Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]</a>"
+""",
+                        to: "dev@plc4x.apache.org",
+                        recipientProviders: [[$class: 'DevelopersRecipientProvider']]
+                    )
+                }
+            }
+        }
+
+        // If this build didn't fail, but there were failing tests, send an email to the list.
+        unstable {
+            script {
+                if(env.BRANCH_NAME == "develop") {
+                    emailext(
+                        subject: "[BUILD-UNSTABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'",
+                        body: """
+BUILD-UNSTABLE: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]':
+
+Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]</a>"
+""",
+                        to: "dev@plc4x.apache.org",
+                        recipientProviders: [[$class: 'DevelopersRecipientProvider']]
+                    )
+                }
+            }
+        }
+
+        // Send an email, if the last build was not successful and this one is.
+        success {
+            // Cleanup the build directory if the build was successful
+            // (in this cae we probably don't have to do any post-build analysis)
+            deleteDir()
+            script {
+                if ((env.BRANCH_NAME == "develop") && (currentBuild.previousBuild != null) && (currentBuild.previousBuild.result != 'SUCCESS')) {
+                    emailext (
+                        subject: "[BUILD-STABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'",
+                        body: """
+BUILD-STABLE: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]':
+
+Is back to normal.
+""",
+                        to: "dev@plc4x.apache.org",
+                        recipientProviders: [[$class: 'DevelopersRecipientProvider']]
+                    )
+                }
+            }
+        }
+
+        always {
+            script {
+                if(env.BRANCH_NAME == "master") {
+                    // Double check if something was really changed as sometimes the
+                    // build just runs without any changes.
+                    if(currentBuild.changeSets.size() > 0) {
+                        emailext(
+                            subject: "[COMMIT-TO-MASTER]: A commit to the master branch was made'",
+                            body: """
+COMMIT-TO-MASTER: A commit to the master branch was made:
+
+Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]</a>"
+""",
+                            to: "dev@plc4x.apache.org",
+                            recipientProviders: [[$class: 'DevelopersRecipientProvider']]
+                        )
+                    }
+                }
+            }
+        }
+    }
+
+}
diff --git a/LICENSE b/LICENSE
index 033d5d4c161..1495f33117a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,222 +1,222 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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
-
-       http://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.
-
-===============================================================
-
-The files:
-plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawEthernetSocket.java
-plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawIpSocket.java
-plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawSocketListener.java
-Are copyrighted by the The Netty Project which is distributed under the Apache 2.0 license.
-
-The files:
-.mvn/wrapper/MavenWrapperDownloader.java
-mvnw
-mvnw.cmd
-Are provided from the Github Project: https://github.com/takari/maven-wrapper
-which is distributed under the Apache 2.0 license.
-
-The file:
-build-utils/protocol-base-mspec/src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/Expression.g4
-is licensed under the Category A: "UNLICENSE" which is available here:
-UNLICENSE file in the licenses directory.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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
+
+       http://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.
+
+===============================================================
+
+The files:
+plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawEthernetSocket.java
+plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawIpSocket.java
+plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawSocketListener.java
+Are copyrighted by the The Netty Project which is distributed under the Apache 2.0 license.
+
+The files:
+.mvn/wrapper/MavenWrapperDownloader.java
+mvnw
+mvnw.cmd
+Are provided from the Github Project: https://github.com/takari/maven-wrapper
+which is distributed under the Apache 2.0 license.
+
+The file:
+build-utils/protocol-base-mspec/src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/Expression.g4
+is licensed under the Category A: "UNLICENSE" which is available here:
+UNLICENSE file in the licenses directory.
diff --git a/NOTICE b/NOTICE
index 6ff3737bfe3..30bbeb42320 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,13 +1,13 @@
-Apache PLC4X
-Copyright 2017-2019 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-----------------------------------------------
-
-This product includes software developed at
-The Netty project (https://netty.io/).
-
-This product includes software developed at
-The Milo project (https://github.com/eclipse/milo).
+Apache PLC4X
+Copyright 2017-2019 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+----------------------------------------------
+
+This product includes software developed at
+The Netty project (https://netty.io/).
+
+This product includes software developed at
+The Milo project (https://github.com/eclipse/milo).
diff --git a/README.md b/README.md
index 80504de21d6..4c4f85ecf69 100644
--- a/README.md
+++ b/README.md
@@ -1,280 +1,280 @@
-<!--
-
-  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
-
-      http://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.
-
--->
-[![Maven central](https://img.shields.io/maven-central/v/org.apache.plc4x/plc4j-api.svg)](https://img.shields.io/maven-central/v/org.apache.plc4x/plc4j-api.svg)
-[![License](https://img.shields.io/github/license/apache/plc4x.svg)](http://www.apache.org/licenses/LICENSE-2.0)
-[![Last commit](https://img.shields.io/github/last-commit/apache/plc4x.svg)]()
-[![Twitter](https://img.shields.io/twitter/follow/ApachePLC4X.svg?label=Follow&style=social)](https://twitter.com/ApachePLC4X)
-
-
-<h1 align="center">
-  <br>
-   <img src="https://plc4x.apache.org/images/apache_plc4x_logo.png" 
-   alt="Apache PLC4X Logo" title="Apache PLC4X Logo"/>
-  <br>
-</h1>
-<h3 align="center">The Industrial IoT adapter</h3>
-<h4 align="center">The ultimate goal of PLC4X is to create a set of libraries, that allow unified access to any type of
- PLC</h4>
-
-***
-
-# Table of contents
-
-  * [About PLC4X](#about-apache-plc4x)
-  * [Getting Started](#getting-started)
-  * [Developers](#developers)
-  * [Community](#community)
-  * [Contributing](#contributing)
-  * [Licensing](#licensing)
-
-***
-
-## About Apache PLC4X
-
-Apache PLC4X is an effort to create a set of libraries for communicating with industrial grade programmable logic controllers (PLCs) in a uniform way.
-We are planning on shipping libraries for usage in:
-
-1. Java
-2. C/C++ (not ready for usage)
-3. C# (.Net) (not ready for usage)
-4. Python (not ready for usage)
-
-PLC4X also integrates with other Apache projects, such as:
-
-* [Apache Calcite](https://calcite.apache.org/)
-* [Apache Camel](https://camel.apache.org/)
-* [Apache Edgent](https://edgent.apache.org/)
-* [Apache Kafka-Connect](https://kafka.apache.org)
-* [Apache Karaf](https://karaf.apache.org/)
-* [Apache NiFi](https://nifi.apache.org/)
-
-## Getting started
-
-Depending on the programming language, the usage will differ, therefore please go to the 
-[Getting Started](https://plc4x.apache.org/users/gettingstarted.html) on the PLC4X website to look up 
-the language of choice.
-
-### Java
-
-See the PLC4J user guide on the website to start using PLC4X in your Java application:
-[https://plc4x.apache.org/plc4j/users/gettingstarted.html](https://plc4x.apache.org/plc4j/users/gettingstarted.html)
-
-## Developers
-
-### Environment
-
-Currently the project is configured to require the following software:
-
-1. Java 8 JDK: For running Maven in general as well as compiling the Java and Scala modules `JAVA_HOME` configured to
- point to that.
-2. libpcap/WinPcap for raw socket tests in Java or use of `passive-mode` drivers
-3. (Optional) Graphwiz: For generating the graphs in the documentation (http://www.graphviz.org/)
-4. Git (even when working on the source distribution)
-
-With this setup you will be able to build the Java part of PLC4X excluding the "proxy" drivers and servers.
-For a full build of PLC4X with all options the following has to be provided:
-
-#### Linux
-
-On a clean Ubuntu 18.04 the following software needs to be installed:
-
-```
-    sudo apt install python-setuptools gcc g++ make libpcap-dev
-```
-
-If you're building a source-distribution and haven't installed git yet, be sure to do so:
-
-```
-    sudo get install git
-```
-
-In order to build the .Net version, please install the .Net package according to this guide:
-
-https://dev.to/carlos487/installing-dotnet-core-in-ubuntu-1804-7lp
-
-#### Mac
-
-Make sure `Homebrew` ist installed in order to update `Bison` to a newer version (the version 2.3 installed per default is too old)
-
-```
-    /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-```
-
-Then update `Bison`:
-
-```
-    brew install bison
-    brew link bison --force
-    echo 'export PATH="/usr/local/opt/bison/bin:$PATH"' >> ~/.bash_profile
-```
-
-Install `Python 2.7`:
-
-```
-    brew install python@2
-```
-
-Be sure to re-open the command window or the changes will not apply.
-
-If you're going to build the `with-dotnet` profile you also need to install DotNet.
-Please download it from: https://dotnet.microsoft.com/download and run the installer.
-
-LibPCAP is also installed via Homebrew:
-
-```
-    brew install libpcap
-```
-
-#### Windows
-
-Some tools need to be installed before being able to build on Windows:
-
-* WinBuilds (for `with-cpp`, `with-proxies` profiles)
-* Bison (for `with-cpp` profiles)
-* Flex (for `with-cpp` profiles)
-* Python 2.7 (for `with-python`, `with-proxies` profiles)
-* Dotnet (for `with-dotnet` profiles)
-* WinPCAP
-* OpenSSL
-
-He have tested `WinBuilds` with the bundle of: http://win-builds.org/doku.php/download_and_installation_from_windows
-Run the installer as "Administrator" or you won't be able to install it to "C:\Program Files" or the 32 Bit counterpart.
-When running the installer, make sure to select the options:
-* Native Windows
-* x86_64
-Not quite sure which elements are really needed, better just install all of them.
-If the installer fails to do something complaining about having to use a different mirror, enter "http://win-builds.org/1.5.0" as mirror address.
-
-WARNING: If you don't use the installer version of the distribution. The build will probably fail and it will be pretty
-impossible to see the problem. When manually executing the command, a popup will appear complaining about not being able
-to find some DLL. So if you are having these problems, please try using the installer instead of manually unpacking
-the archive.
-
-For `Bison`, please download the Setup installer version from here: http://gnuwin32.sourceforge.net/packages/bison.htm (When using the zip version the bison.exe couldn't find some DLL files)
-It seems the official 2.4.1 version has issues when installed in a directory which's path contains spaces. Please make sure you replace the exe with a patched version form here: http://marin.jb.free.fr/bison/bison-2.4.1-modified.zip
-(More infos on this issue here: https://sourceforge.net/p/gnuwin32/bugs/473/)
-
-Please download the `Flex` compiler from here: http://gnuwin32.sourceforge.net/packages/flex.htm (Ideally download the binary zip distribution)
-
-You can get `Python` from here: https://www.python.org/downloads/release/python-2716/
-
-For `.Net`, you need the `Developer Pack` in order to build .Net applications. So be sure to get a reasonably fresh installation from https://dotnet.microsoft.com
-
-If you're building a source-distribution and haven't installed git yet, be sure to do so.
-
-The windows version of the PCAP library can be found here: https://sourceforge.net/projects/winpcap413-176/
-(In order to read PCAPNG files we require a libpcap version 1.1.0 or greater. The default
-Windows version is 1.0. At this location there is a patched version based on libpcap 1.7.4)
-
-Last not least we need to install OpenSSL, which is available from here: https://indy.fulgan.com/SSL/
-The letter at the end of the version is sort of a "sub-minor" version, so I usually just take the version with the highest letter.
-
-Make sure the `bin` directories of containing the executables `mingw32-make.exe`, `bison.exe` and `flex.exe` are all on your systems `PATH` as well as the directory containing the `openssl.exe`.
-
-### Building with Docker
-
-If you don't want to bother setting up the environment on your normal system and you have Docker installed, you can also build everything in a Docker container:
-
-```
-   docker build -t plc4x .
-
-   docker run -p 9200:9200 -p 9300:9300 --name plc4x plc4x
-```
-
-### Getting Started
-
-You must have Java 8 installed on your system and connectivity to Maven Central
-(for downloading external third party dependencies). Maven will be automatically
-downloaded and installed by the maven wrapper `mvnw`.
-
-Build PLC4X Java jars and install them in your local maven repository
-
-```
-./mvnw install # add -DskipTests to omit running the tests
-```
-
-You can now construct Java applications that use PLC4X. The PLC4X examples
-are a good place to start and are available inside the `plc4j/examples`
-directory.
-
-The `C++` drivers are still under development and still not really usable. 
-Therefore they are located in the so-called `sandbox`. 
-If you want to build them, this has to be enabled by activating the `with-sandbox` and `with-cpp` maven profiles:
-
-```
-./mvnw -P with-sandbox,with-cpp install  # add -DskipTests to omit running the tests
-```
-
-Same applies for the `C# / .Net` implementation with `with-dotnet` profiles.
-
-```
-./mvnw -P with-sandbox,with-dotnet install  # add -DskipTests to omit running the tests
-```
-
-The Python implementation is currently in a somewhat unclean state and still needs refactoring.
-In order to be able to build the Python module, you currently need to activate the:
-`with-sandbox`, `with-python` and `with-proxies` profiles.
-
-```
-./mvnw -P with-sandbox,with-python,with-proxies install  # add -DskipTests to omit running the tests
-```
-
-In order to build everything the following command should work:
-
-```
-./mvnw -P with-boost,with-cpp,with-dotnet,with-logstash,with-proxies,with-python,with-sandbox install
-```
-
-## Community
-
-Join the PLC4X community by using one of the following channels. We'll be glad to help!
-
-### Mailing Lists
-
-Subscribe to the following mailing lists: 
-* Apache PLC4X Developer List: [dev-subscribe@plc4x.apache.org](mailto:dev-subscribe@plc4x.apache.org)
-* Apache PLC4X Commits List: [commit-subscribe@plc4x.apache.org](mailto:commit-subscribe@plc4x.apache.org)
-* Apache PLC4X Jira Notification List: [issues-subscribe@plc4x.apache.org](mailto:issues-subscribe@plc4x.apache.org)
-
-See also: [https://plc4x.apache.org/mailing-lists.html](https://plc4x.apache.org/mailing-lists.html)
-
-### Twitter
-
-Get the latest PLC4X news on Twitter: [https://twitter.com/ApachePlc4x](https://twitter.com/ApachePlc4x)
-
-## Contributing
-
-There are multiple forms in which you can become involved with the PLC4X project.
-
-These usually are, but are not limited to:
-
-* Submitting Pull Requests
-* Filing Bug-Reports
-* Active communication on our mailing lists
-* Promoting the project (articles, blog posts, talks at conferences)
-* Documentation
-
-We are a very friendly bunch and donā€™t be afraid to step forward.
-If you'd like to contribute to PLC4X, have a look at our 
-[contribution guide](https://plc4x.apache.org/developers/contributing.html)!
-
-
-## Licensing
-
-Apache PLC4X is released under the Apache License Version 2.0.
+<!--
+
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://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.
+
+-->
+[![Maven central](https://img.shields.io/maven-central/v/org.apache.plc4x/plc4j-api.svg)](https://img.shields.io/maven-central/v/org.apache.plc4x/plc4j-api.svg)
+[![License](https://img.shields.io/github/license/apache/plc4x.svg)](http://www.apache.org/licenses/LICENSE-2.0)
+[![Last commit](https://img.shields.io/github/last-commit/apache/plc4x.svg)]()
+[![Twitter](https://img.shields.io/twitter/follow/ApachePLC4X.svg?label=Follow&style=social)](https://twitter.com/ApachePLC4X)
+
+
+<h1 align="center">
+  <br>
+   <img src="https://plc4x.apache.org/images/apache_plc4x_logo.png" 
+   alt="Apache PLC4X Logo" title="Apache PLC4X Logo"/>
+  <br>
+</h1>
+<h3 align="center">The Industrial IoT adapter</h3>
+<h4 align="center">The ultimate goal of PLC4X is to create a set of libraries, that allow unified access to any type of
+ PLC</h4>
+
+***
+
+# Table of contents
+
+  * [About PLC4X](#about-apache-plc4x)
+  * [Getting Started](#getting-started)
+  * [Developers](#developers)
+  * [Community](#community)
+  * [Contributing](#contributing)
+  * [Licensing](#licensing)
+
+***
+
+## About Apache PLC4X
+
+Apache PLC4X is an effort to create a set of libraries for communicating with industrial grade programmable logic controllers (PLCs) in a uniform way.
+We are planning on shipping libraries for usage in:
+
+1. Java
+2. C/C++ (not ready for usage)
+3. C# (.Net) (not ready for usage)
+4. Python (not ready for usage)
+
+PLC4X also integrates with other Apache projects, such as:
+
+* [Apache Calcite](https://calcite.apache.org/)
+* [Apache Camel](https://camel.apache.org/)
+* [Apache Edgent](https://edgent.apache.org/)
+* [Apache Kafka-Connect](https://kafka.apache.org)
+* [Apache Karaf](https://karaf.apache.org/)
+* [Apache NiFi](https://nifi.apache.org/)
+
+## Getting started
+
+Depending on the programming language, the usage will differ, therefore please go to the 
+[Getting Started](https://plc4x.apache.org/users/gettingstarted.html) on the PLC4X website to look up 
+the language of choice.
+
+### Java
+
+See the PLC4J user guide on the website to start using PLC4X in your Java application:
+[https://plc4x.apache.org/plc4j/users/gettingstarted.html](https://plc4x.apache.org/plc4j/users/gettingstarted.html)
+
+## Developers
+
+### Environment
+
+Currently the project is configured to require the following software:
+
+1. Java 8 JDK: For running Maven in general as well as compiling the Java and Scala modules `JAVA_HOME` configured to
+ point to that.
+2. libpcap/WinPcap for raw socket tests in Java or use of `passive-mode` drivers
+3. (Optional) Graphwiz: For generating the graphs in the documentation (http://www.graphviz.org/)
+4. Git (even when working on the source distribution)
+
+With this setup you will be able to build the Java part of PLC4X excluding the "proxy" drivers and servers.
+For a full build of PLC4X with all options the following has to be provided:
+
+#### Linux
+
+On a clean Ubuntu 18.04 the following software needs to be installed:
+
+```
+    sudo apt install python-setuptools gcc g++ make libpcap-dev
+```
+
+If you're building a source-distribution and haven't installed git yet, be sure to do so:
+
+```
+    sudo get install git
+```
+
+In order to build the .Net version, please install the .Net package according to this guide:
+
+https://dev.to/carlos487/installing-dotnet-core-in-ubuntu-1804-7lp
+
+#### Mac
+
+Make sure `Homebrew` ist installed in order to update `Bison` to a newer version (the version 2.3 installed per default is too old)
+
+```
+    /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+```
+
+Then update `Bison`:
+
+```
+    brew install bison
+    brew link bison --force
+    echo 'export PATH="/usr/local/opt/bison/bin:$PATH"' >> ~/.bash_profile
+```
+
+Install `Python 2.7`:
+
+```
+    brew install python@2
+```
+
+Be sure to re-open the command window or the changes will not apply.
+
+If you're going to build the `with-dotnet` profile you also need to install DotNet.
+Please download it from: https://dotnet.microsoft.com/download and run the installer.
+
+LibPCAP is also installed via Homebrew:
+
+```
+    brew install libpcap
+```
+
+#### Windows
+
+Some tools need to be installed before being able to build on Windows:
+
+* WinBuilds (for `with-cpp`, `with-proxies` profiles)
+* Bison (for `with-cpp` profiles)
+* Flex (for `with-cpp` profiles)
+* Python 2.7 (for `with-python`, `with-proxies` profiles)
+* Dotnet (for `with-dotnet` profiles)
+* WinPCAP
+* OpenSSL
+
+He have tested `WinBuilds` with the bundle of: http://win-builds.org/doku.php/download_and_installation_from_windows
+Run the installer as "Administrator" or you won't be able to install it to "C:\Program Files" or the 32 Bit counterpart.
+When running the installer, make sure to select the options:
+* Native Windows
+* x86_64
+Not quite sure which elements are really needed, better just install all of them.
+If the installer fails to do something complaining about having to use a different mirror, enter "http://win-builds.org/1.5.0" as mirror address.
+
+WARNING: If you don't use the installer version of the distribution. The build will probably fail and it will be pretty
+impossible to see the problem. When manually executing the command, a popup will appear complaining about not being able
+to find some DLL. So if you are having these problems, please try using the installer instead of manually unpacking
+the archive.
+
+For `Bison`, please download the Setup installer version from here: http://gnuwin32.sourceforge.net/packages/bison.htm (When using the zip version the bison.exe couldn't find some DLL files)
+It seems the official 2.4.1 version has issues when installed in a directory which's path contains spaces. Please make sure you replace the exe with a patched version form here: http://marin.jb.free.fr/bison/bison-2.4.1-modified.zip
+(More infos on this issue here: https://sourceforge.net/p/gnuwin32/bugs/473/)
+
+Please download the `Flex` compiler from here: http://gnuwin32.sourceforge.net/packages/flex.htm (Ideally download the binary zip distribution)
+
+You can get `Python` from here: https://www.python.org/downloads/release/python-2716/
+
+For `.Net`, you need the `Developer Pack` in order to build .Net applications. So be sure to get a reasonably fresh installation from https://dotnet.microsoft.com
+
+If you're building a source-distribution and haven't installed git yet, be sure to do so.
+
+The windows version of the PCAP library can be found here: https://sourceforge.net/projects/winpcap413-176/
+(In order to read PCAPNG files we require a libpcap version 1.1.0 or greater. The default
+Windows version is 1.0. At this location there is a patched version based on libpcap 1.7.4)
+
+Last not least we need to install OpenSSL, which is available from here: https://indy.fulgan.com/SSL/
+The letter at the end of the version is sort of a "sub-minor" version, so I usually just take the version with the highest letter.
+
+Make sure the `bin` directories of containing the executables `mingw32-make.exe`, `bison.exe` and `flex.exe` are all on your systems `PATH` as well as the directory containing the `openssl.exe`.
+
+### Building with Docker
+
+If you don't want to bother setting up the environment on your normal system and you have Docker installed, you can also build everything in a Docker container:
+
+```
+   docker build -t plc4x .
+
+   docker run -p 9200:9200 -p 9300:9300 --name plc4x plc4x
+```
+
+### Getting Started
+
+You must have Java 8 installed on your system and connectivity to Maven Central
+(for downloading external third party dependencies). Maven will be automatically
+downloaded and installed by the maven wrapper `mvnw`.
+
+Build PLC4X Java jars and install them in your local maven repository
+
+```
+./mvnw install # add -DskipTests to omit running the tests
+```
+
+You can now construct Java applications that use PLC4X. The PLC4X examples
+are a good place to start and are available inside the `plc4j/examples`
+directory.
+
+The `C++` drivers are still under development and still not really usable. 
+Therefore they are located in the so-called `sandbox`. 
+If you want to build them, this has to be enabled by activating the `with-sandbox` and `with-cpp` maven profiles:
+
+```
+./mvnw -P with-sandbox,with-cpp install  # add -DskipTests to omit running the tests
+```
+
+Same applies for the `C# / .Net` implementation with `with-dotnet` profiles.
+
+```
+./mvnw -P with-sandbox,with-dotnet install  # add -DskipTests to omit running the tests
+```
+
+The Python implementation is currently in a somewhat unclean state and still needs refactoring.
+In order to be able to build the Python module, you currently need to activate the:
+`with-sandbox`, `with-python` and `with-proxies` profiles.
+
+```
+./mvnw -P with-sandbox,with-python,with-proxies install  # add -DskipTests to omit running the tests
+```
+
+In order to build everything the following command should work:
+
+```
+./mvnw -P with-boost,with-cpp,with-dotnet,with-logstash,with-proxies,with-python,with-sandbox install
+```
+
+## Community
+
+Join the PLC4X community by using one of the following channels. We'll be glad to help!
+
+### Mailing Lists
+
+Subscribe to the following mailing lists: 
+* Apache PLC4X Developer List: [dev-subscribe@plc4x.apache.org](mailto:dev-subscribe@plc4x.apache.org)
+* Apache PLC4X Commits List: [commit-subscribe@plc4x.apache.org](mailto:commit-subscribe@plc4x.apache.org)
+* Apache PLC4X Jira Notification List: [issues-subscribe@plc4x.apache.org](mailto:issues-subscribe@plc4x.apache.org)
+
+See also: [https://plc4x.apache.org/mailing-lists.html](https://plc4x.apache.org/mailing-lists.html)
+
+### Twitter
+
+Get the latest PLC4X news on Twitter: [https://twitter.com/ApachePlc4x](https://twitter.com/ApachePlc4x)
+
+## Contributing
+
+There are multiple forms in which you can become involved with the PLC4X project.
+
+These usually are, but are not limited to:
+
+* Submitting Pull Requests
+* Filing Bug-Reports
+* Active communication on our mailing lists
+* Promoting the project (articles, blog posts, talks at conferences)
+* Documentation
+
+We are a very friendly bunch and donā€™t be afraid to step forward.
+If you'd like to contribute to PLC4X, have a look at our 
+[contribution guide](https://plc4x.apache.org/developers/contributing.html)!
+
+
+## Licensing
+
+Apache PLC4X is released under the Apache License Version 2.0.
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 80528f8ff22..185bacb0acc 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,236 +1,236 @@
-==============================================================
-(Unreleased) Apache PLC4X 0.6.0-SNAPSHOT
-==============================================================
-
-New Features
-------------
-
-Incompatible changes
---------------------
-
-- Moved the C++, C# and Python drivers into the `sandbox`
-
-Bug Fixes
----------
-
-==============================================================
-Apache PLC4X 0.6.0-SNAPSHOT
-==============================================================
-
-This is the first release containing our new generaed drivers (AB-ETH)
-
-New Features
-------------
-
-- Implemented a new Apache Kafka Connect integration module
-- Implemented a new Apache NiFi integration module
-- Implemented a new Logstash integration module
-- Implemented a driver for the AB-ETH protocol
-- Implemented Apache Karaf features for S7 OSGI drivers
-- PLC4X-121	Develop Code Generation to allow Generated Drivers in multiple Languages
-
-Sandbox (Beta-Features)
-- Implemented a new BACnet/IP passive mode driver
-- Implemented a new Serial DF1 driver
-
-Incompatible changes
---------------------
-
-Bug Fixes
----------
-
-- PLC4X-104	S7 Driver Datatype TIME_OF_DAY causes ArrayOutOfBoundException
-- PLC4X-134	S7 is terminating the connection during handshake
-- PLC4X-139	PLC4X leaks sockets in case of connection problems
-- PLC4X-141	String with real length of greater 127 throw an exception
-- PLC4X-144	When requesting invalid addresses, the DefaultS7MessageProcessor produces errors
-
-==============================================================
-Apache PLC4X 0.4.0
-==============================================================
-
-This is the first release of Apache PLC4X as top-level project.
-
-New Features
-------------
-
-- The PlcConnection now supports a `ping` method to allow checking if an existing connection is still alive.
-- Support of the OPC-UA protocol with the `opc-ua-driver`.
-- Other Languages Support:
--- Added first versions of a C# .Net PLC4X API (`plc4net`)
--- Added first versions of a Python PLC4X API (`plc4py`)
-- Added an Interop server which allows to relay requests from other languages to a Java Server
-
-Incompatible changes
---------------------
-
-- ElasticSearch example was updated to use ElasticSearch 7.0.1, this might cause problems with older Kibana versions.
-
-Bug Fixes
----------
-
-
-==============================================================
-Apache PLC4X (incubating) 0.3.1
-==============================================================
-
-This is a bugfix-release, that fixes some problems with S7 driver.
-
-Bug Fixes
----------
-
-- The S7 driver didn't correctly handle "fill-bytes" in multi-item read-responses and multi-item write-requests
-- PLC4X-83: fixed NPE when reading odd-length array of one-byte base types
-- PLC4X-82: renamed flags "F" to Siemens Standard "M" (Marker)
-- PLC4X-84: Fixed a bug in the DefaultS7MessageProcessor which didn't correctly merge together split up items
-
-
-==============================================================
-Apache PLC4X (incubating) 0.3.0
-==============================================================
-
-This is the third official release of Apache PLC4X.
-
-Some new features have been added (e.g. plc-scraper) multiple
-new integrations are included (apache-karaf, apache-calcite)
-and a lot of (technical) refactoring has been done to prepare
-future work on adapters in different languages.
-
-New Features
-------------
-
-- Object PLC Mapping (OPM) now has a Alias Registry to allow
-  variable substitution at runtime and write support
-- New module `plc-scraper` for applications that have to
-  scrape a lot of sps fields with high frequency
-- New integration `apache-karaf` to enable plc4j in a karaf
-  runtime environment
-
-Incompatible changes
---------------------
-- The 'plc4j-core' module has been merged into 'plc4j-api'.
-  So there is no 'plc4j-core' module anymore. Just remove that
-  dependency.
-- The driver artifact names have changed so if you were using
-  a `plc4j-protocol-{name}` you now need to change this to
-  `plc4j-driver-{name}`
-
-Bug Fixes
----------
-
-PLC4X-75    Fixing dependency to the wrap url-handler
-PLC4X-76    When receiving responses with more than 512 byte,
-            the IsoOnTcp protocol doesn't work
-PLC4X-77    When the last item in a request is a DINT, the
-            DefaultS7MessageProcessor dies
-PLC4X-78    Write operations seem to fail
--           Fixed a Bug where S7 was not able to read arrays.
-
-
-==============================================================
-Apache PLC4X (incubating) 0.2.0
-==============================================================
-
-This is the second official release of Apache PLC4X.
-
-Especially have we addressed all issues reported during
-our first release, that were of non-technical nature.
-These were tracked in:
-
-PLC4X-60	Fix findings by the last release
-
-New Features
-------------
-A new connection-pool was added, which allows automatic
-pooling and reuse of PLC connections.
-
-A new OPM module was added, which allows JPA like read-
-communication using POJOs, very similar to JPA.
-
-A stub of a new driver for the Emerson DeltaV protocol
-has been added, but is not yet a fully functional PLC4X
-driver. This is also a first test of our new `passive-
-mode-driver` concept.
-
-Incompatible changes
---------------------
-
-We have refactored the API in order to eliminate the
-need of passing `x-requests` to `x-methods` and added
-an `execute` method to each request type. This greatly
-simplifies the client code. However this requires
-refactoring of applications using the direct PLC4X API.
-
-Miscellaneous changes
----------------------
-
-We have increased the test coverage greatly and fixed
-a lot of little errors we found on the way.
-
-Known Issues
-------------
-
-Bug Fixes
----------
-
-PLC4X-56	[S7] S7Field does not recognize addresses
-            with numElements present
-PLC4X-57	[S7] Response for address with numElements
-            contains only first item
-PLC4X-61	Installation fails plc4j-protocoll-ethernetip
-            needs license
-PLC4X-62	Modbus results deliver null-Value due to missing
-            implementation of getShort, getLong ...
-
-
-
-==============================================================
-Apache PLC4X (incubating) 0.1.0
-==============================================================
-
-This is the first official release of Apache PLC4X.
-It contains drivers for the following protocols:
-- Siemens S7comm (0x32)
-- Beckhoff ADS
-- Modbus
-- EtherNet/IP
-
-However the Siemens driver definitely is the most
-mature driver, the rest should be treated experimental.
-
-New Features
-------------
-
-PLC4X-29	[S7] Implement PDU Fragmentation
-PLC4X-39	Extend the Edgent integration with the new Subscription features of PLC4X
-
-Incompatible changes
---------------------
-
-- NONE -
-
-Miscellaneous changes
----------------------  
-
-- NONE -
-
-Known Issues
-------------
-
-- NONE -
-
-Most drivers should be treated experimental and are not near production ready.
-The S7 driver is probably the furthest implemented and tested driver and hereby can be 
-considered to be the most mature.
-
-Bug Fixes
----------
-
-PLC4X-20	Jacoco doesn't seem to be working at all
-PLC4X-21	Code coverage doesn't seem to work
-PLC4X-47	S7 driver silently ignores surplus ReadRequestItems
-PLC4X-48	S7 driver failes to parse response with multiple items
-
-
-
-
+==============================================================
+(Unreleased) Apache PLC4X 0.6.0-SNAPSHOT
+==============================================================
+
+New Features
+------------
+
+Incompatible changes
+--------------------
+
+- Moved the C++, C# and Python drivers into the `sandbox`
+
+Bug Fixes
+---------
+
+==============================================================
+Apache PLC4X 0.6.0-SNAPSHOT
+==============================================================
+
+This is the first release containing our new generaed drivers (AB-ETH)
+
+New Features
+------------
+
+- Implemented a new Apache Kafka Connect integration module
+- Implemented a new Apache NiFi integration module
+- Implemented a new Logstash integration module
+- Implemented a driver for the AB-ETH protocol
+- Implemented Apache Karaf features for S7 OSGI drivers
+- PLC4X-121	Develop Code Generation to allow Generated Drivers in multiple Languages
+
+Sandbox (Beta-Features)
+- Implemented a new BACnet/IP passive mode driver
+- Implemented a new Serial DF1 driver
+
+Incompatible changes
+--------------------
+
+Bug Fixes
+---------
+
+- PLC4X-104	S7 Driver Datatype TIME_OF_DAY causes ArrayOutOfBoundException
+- PLC4X-134	S7 is terminating the connection during handshake
+- PLC4X-139	PLC4X leaks sockets in case of connection problems
+- PLC4X-141	String with real length of greater 127 throw an exception
+- PLC4X-144	When requesting invalid addresses, the DefaultS7MessageProcessor produces errors
+
+==============================================================
+Apache PLC4X 0.4.0
+==============================================================
+
+This is the first release of Apache PLC4X as top-level project.
+
+New Features
+------------
+
+- The PlcConnection now supports a `ping` method to allow checking if an existing connection is still alive.
+- Support of the OPC-UA protocol with the `opc-ua-driver`.
+- Other Languages Support:
+-- Added first versions of a C# .Net PLC4X API (`plc4net`)
+-- Added first versions of a Python PLC4X API (`plc4py`)
+- Added an Interop server which allows to relay requests from other languages to a Java Server
+
+Incompatible changes
+--------------------
+
+- ElasticSearch example was updated to use ElasticSearch 7.0.1, this might cause problems with older Kibana versions.
+
+Bug Fixes
+---------
+
+
+==============================================================
+Apache PLC4X (incubating) 0.3.1
+==============================================================
+
+This is a bugfix-release, that fixes some problems with S7 driver.
+
+Bug Fixes
+---------
+
+- The S7 driver didn't correctly handle "fill-bytes" in multi-item read-responses and multi-item write-requests
+- PLC4X-83: fixed NPE when reading odd-length array of one-byte base types
+- PLC4X-82: renamed flags "F" to Siemens Standard "M" (Marker)
+- PLC4X-84: Fixed a bug in the DefaultS7MessageProcessor which didn't correctly merge together split up items
+
+
+==============================================================
+Apache PLC4X (incubating) 0.3.0
+==============================================================
+
+This is the third official release of Apache PLC4X.
+
+Some new features have been added (e.g. plc-scraper) multiple
+new integrations are included (apache-karaf, apache-calcite)
+and a lot of (technical) refactoring has been done to prepare
+future work on adapters in different languages.
+
+New Features
+------------
+
+- Object PLC Mapping (OPM) now has a Alias Registry to allow
+  variable substitution at runtime and write support
+- New module `plc-scraper` for applications that have to
+  scrape a lot of sps fields with high frequency
+- New integration `apache-karaf` to enable plc4j in a karaf
+  runtime environment
+
+Incompatible changes
+--------------------
+- The 'plc4j-core' module has been merged into 'plc4j-api'.
+  So there is no 'plc4j-core' module anymore. Just remove that
+  dependency.
+- The driver artifact names have changed so if you were using
+  a `plc4j-protocol-{name}` you now need to change this to
+  `plc4j-driver-{name}`
+
+Bug Fixes
+---------
+
+PLC4X-75    Fixing dependency to the wrap url-handler
+PLC4X-76    When receiving responses with more than 512 byte,
+            the IsoOnTcp protocol doesn't work
+PLC4X-77    When the last item in a request is a DINT, the
+            DefaultS7MessageProcessor dies
+PLC4X-78    Write operations seem to fail
+-           Fixed a Bug where S7 was not able to read arrays.
+
+
+==============================================================
+Apache PLC4X (incubating) 0.2.0
+==============================================================
+
+This is the second official release of Apache PLC4X.
+
+Especially have we addressed all issues reported during
+our first release, that were of non-technical nature.
+These were tracked in:
+
+PLC4X-60	Fix findings by the last release
+
+New Features
+------------
+A new connection-pool was added, which allows automatic
+pooling and reuse of PLC connections.
+
+A new OPM module was added, which allows JPA like read-
+communication using POJOs, very similar to JPA.
+
+A stub of a new driver for the Emerson DeltaV protocol
+has been added, but is not yet a fully functional PLC4X
+driver. This is also a first test of our new `passive-
+mode-driver` concept.
+
+Incompatible changes
+--------------------
+
+We have refactored the API in order to eliminate the
+need of passing `x-requests` to `x-methods` and added
+an `execute` method to each request type. This greatly
+simplifies the client code. However this requires
+refactoring of applications using the direct PLC4X API.
+
+Miscellaneous changes
+---------------------
+
+We have increased the test coverage greatly and fixed
+a lot of little errors we found on the way.
+
+Known Issues
+------------
+
+Bug Fixes
+---------
+
+PLC4X-56	[S7] S7Field does not recognize addresses
+            with numElements present
+PLC4X-57	[S7] Response for address with numElements
+            contains only first item
+PLC4X-61	Installation fails plc4j-protocoll-ethernetip
+            needs license
+PLC4X-62	Modbus results deliver null-Value due to missing
+            implementation of getShort, getLong ...
+
+
+
+==============================================================
+Apache PLC4X (incubating) 0.1.0
+==============================================================
+
+This is the first official release of Apache PLC4X.
+It contains drivers for the following protocols:
+- Siemens S7comm (0x32)
+- Beckhoff ADS
+- Modbus
+- EtherNet/IP
+
+However the Siemens driver definitely is the most
+mature driver, the rest should be treated experimental.
+
+New Features
+------------
+
+PLC4X-29	[S7] Implement PDU Fragmentation
+PLC4X-39	Extend the Edgent integration with the new Subscription features of PLC4X
+
+Incompatible changes
+--------------------
+
+- NONE -
+
+Miscellaneous changes
+---------------------  
+
+- NONE -
+
+Known Issues
+------------
+
+- NONE -
+
+Most drivers should be treated experimental and are not near production ready.
+The S7 driver is probably the furthest implemented and tested driver and hereby can be 
+considered to be the most mature.
+
+Bug Fixes
+---------
+
+PLC4X-20	Jacoco doesn't seem to be working at all
+PLC4X-21	Code coverage doesn't seem to work
+PLC4X-47	S7 driver silently ignores surplus ReadRequestItems
+PLC4X-48	S7 driver failes to parse response with multiple items
+
+
+
+
diff --git a/Sometimes-Failling-Tests.md b/Sometimes-Failling-Tests.md
index 818bfa31d52..017bfac5c56 100644
--- a/Sometimes-Failling-Tests.md
+++ b/Sometimes-Failling-Tests.md
@@ -1,32 +1,32 @@
-<!--
-
-  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
-
-      http://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.
-
--->
-
-# Sometimes Failing Tests
-
-This File contains the names and outputs of some tests that have been seen to fail without direct code-changes.
-It's sort of a collection of places we should keep an eye out for improving tests-
-
-## Module: plc4l-opm
-
-[ERROR]   ConnectedEntityTest.useCache_timeout_refetches:83
-mockDevice.read(<any>);
-Wanted 2 times:
--> at org.apache.plc4x.java.opm.ConnectedEntityTest.useCache_timeout_refetches(ConnectedEntityTest.java:83)
-But was 1 time:
--> at org.apache.plc4x.java.mock.PlcMockConnection.lambda$null$0(PlcMockConnection.java:111)
+<!--
+
+  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
+
+      http://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.
+
+-->
+
+# Sometimes Failing Tests
+
+This File contains the names and outputs of some tests that have been seen to fail without direct code-changes.
+It's sort of a collection of places we should keep an eye out for improving tests-
+
+## Module: plc4l-opm
+
+[ERROR]   ConnectedEntityTest.useCache_timeout_refetches:83
+mockDevice.read(<any>);
+Wanted 2 times:
+-> at org.apache.plc4x.java.opm.ConnectedEntityTest.useCache_timeout_refetches(ConnectedEntityTest.java:83)
+But was 1 time:
+-> at org.apache.plc4x.java.mock.PlcMockConnection.lambda$null$0(PlcMockConnection.java:111)
diff --git a/build-reproducible.sh b/build-reproducible.sh
index 885dbf5992b..8cc0081bd40 100755
--- a/build-reproducible.sh
+++ b/build-reproducible.sh
@@ -1,68 +1,68 @@
-#!/bin/bash
-# ----------------------------------------------------------------------------
-# 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
-#
-#    http://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.
-# ----------------------------------------------------------------------------
-
-# Run a standard build
-function build() {
-  echo "Building ..."
-  mvn -U -P apache-release,with-boost,with-dotnet,with-cpp,with-python,with-proxies,with-sandbox,with-logstash -DaltDeploymentRepository=snapshot-repo::default::file:./local-snapshots-dir clean deploy
-  echo "Done"
-}
-
-# Just remove all the metadata information and all the hashes and signatures
-function clean() {
-  echo "Cleaning ..."
-  cd local-snapshots-dir || exit
-  find ./ -name "*.asc" -exec rm -rf {} \;
-  find ./ -name "*.md5" -exec rm -rf {} \;
-  find ./ -name "*.sha1" -exec rm -rf {} \;
-  find ./ -name "maven-metadata.xml" -exec rm -rf {} \;
-  find ./ -name "maven-metadata.xml.md5" -exec rm -rf {} \;
-  find ./ -name "maven-metadata.xml.sha1" -exec rm -rf {} \;
-  cd ..
-  echo "Done"
-  pwd
-}
-
-# Rename all snapshot files to not contain the timestamps
-function renameArtifacts() {
-  echo "Renaming ..."
-  cd local-snapshots-dir || exit
-  # Remove the timestamp from the file-names
-  find . -type f | rename 's/-\d{8}\.\d{6}-\d{1,2}//'
-  cd ..
-  echo "Done"
-  pwd
-}
-
-# Package the remaiing files into one tgz archive
-function packageDirectory() {
-  echo "Packaging ..."
-  tar -cvf reproducible-build-candidate.tgz local-snapshots-dir/
-  echo "Done"
-  pwd
-}
-
-# Remove any pre-existing directory
-rm -r local-snapshots-dir
-
-build
-clean
-renameArtifacts
-packageDirectory
+#!/bin/bash
+# ----------------------------------------------------------------------------
+# 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
+#
+#    http://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.
+# ----------------------------------------------------------------------------
+
+# Run a standard build
+function build() {
+  echo "Building ..."
+  mvn -U -P apache-release,with-boost,with-dotnet,with-cpp,with-python,with-proxies,with-sandbox,with-logstash -DaltDeploymentRepository=snapshot-repo::default::file:./local-snapshots-dir clean deploy
+  echo "Done"
+}
+
+# Just remove all the metadata information and all the hashes and signatures
+function clean() {
+  echo "Cleaning ..."
+  cd local-snapshots-dir || exit
+  find ./ -name "*.asc" -exec rm -rf {} \;
+  find ./ -name "*.md5" -exec rm -rf {} \;
+  find ./ -name "*.sha1" -exec rm -rf {} \;
+  find ./ -name "maven-metadata.xml" -exec rm -rf {} \;
+  find ./ -name "maven-metadata.xml.md5" -exec rm -rf {} \;
+  find ./ -name "maven-metadata.xml.sha1" -exec rm -rf {} \;
+  cd ..
+  echo "Done"
+  pwd
+}
+
+# Rename all snapshot files to not contain the timestamps
+function renameArtifacts() {
+  echo "Renaming ..."
+  cd local-snapshots-dir || exit
+  # Remove the timestamp from the file-names
+  find . -type f | rename 's/-\d{8}\.\d{6}-\d{1,2}//'
+  cd ..
+  echo "Done"
+  pwd
+}
+
+# Package the remaiing files into one tgz archive
+function packageDirectory() {
+  echo "Packaging ..."
+  tar -cvf reproducible-build-candidate.tgz local-snapshots-dir/
+  echo "Done"
+  pwd
+}
+
+# Remove any pre-existing directory
+rm -r local-snapshots-dir
+
+build
+clean
+renameArtifacts
+packageDirectory
diff --git a/build-utils/language-base-freemarker/pom.xml b/build-utils/language-base-freemarker/pom.xml
index 6d01362a086..fe703adface 100644
--- a/build-utils/language-base-freemarker/pom.xml
+++ b/build-utils/language-base-freemarker/pom.xml
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4x-build-utils</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4x-build-utils-language-base-freemarker</artifactId>
-
-  <name>PLC4X: Build Utils: Language Base: Freemarker</name>
-  <description>Base code for building language outputs based on Freemarker</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x.plugins</groupId>
-      <artifactId>plc4x-code-generation-language-base</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.freemarker</groupId>
-      <artifactId>freemarker</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-text</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4x-build-utils</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4x-build-utils-language-base-freemarker</artifactId>
+
+  <name>PLC4X: Build Utils: Language Base: Freemarker</name>
+  <description>Base code for building language outputs based on Freemarker</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x.plugins</groupId>
+      <artifactId>plc4x-code-generation-language-base</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.freemarker</groupId>
+      <artifactId>freemarker</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-text</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/build-utils/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/FreemarkerLanguageOutput.java b/build-utils/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/FreemarkerLanguageOutput.java
index 5ca25bca445..dde911c34ff 100644
--- a/build-utils/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/FreemarkerLanguageOutput.java
+++ b/build-utils/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/FreemarkerLanguageOutput.java
@@ -1,129 +1,129 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.protocol.freemarker;
-
-import freemarker.cache.ClassTemplateLoader;
-import freemarker.core.ParseException;
-import freemarker.template.*;
-import org.apache.plc4x.plugins.codegenerator.language.LanguageOutput;
-import org.apache.plc4x.plugins.codegenerator.types.definitions.EnumTypeDefinition;
-import org.apache.plc4x.plugins.codegenerator.types.definitions.TypeDefinition;
-import org.apache.plc4x.plugins.codegenerator.types.exceptions.GenerationException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.*;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public abstract class FreemarkerLanguageOutput implements LanguageOutput {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(FreemarkerLanguageOutput.class);
-
-    @Override
-    public void generate(File outputDir, String languageName, String protocolName, String outputFlavor, Map<String, TypeDefinition> types)
-        throws GenerationException {
-
-        try {
-            // Configure the Freemarker template engine
-            Configuration freemarkerConfiguration = getFreemarkerConfiguration();
-
-            ClassTemplateLoader classTemplateLoader = new ClassTemplateLoader(FreemarkerLanguageOutput.class, "/");
-            freemarkerConfiguration.setTemplateLoader(classTemplateLoader);
-
-            // Initialize all templates
-            List<Template> complexTypesTemplateList = getComplexTypeTemplates(freemarkerConfiguration);
-            List<Template> enumTypesTemplateList = getEnumTypeTemplates(freemarkerConfiguration);
-
-            // Iterate over the types and have content generated for each one
-            for (Map.Entry<String, TypeDefinition> typeEntry : types.entrySet()) {
-                LOGGER.info("Generating type " + typeEntry.getKey());
-
-                // Prepare a new generation context
-                Map<String, Object> typeContext = new HashMap<>();
-                typeContext.put("languageName", languageName);
-                typeContext.put("protocolName", protocolName);
-                typeContext.put("outputFlavor", outputFlavor);
-                typeContext.put("typeName", typeEntry.getKey());
-                typeContext.put("type", typeEntry.getValue());
-                typeContext.put("helper", getHelper(types));
-
-                List<Template> templateList = (typeEntry.getValue() instanceof EnumTypeDefinition) ?
-                    enumTypesTemplateList : complexTypesTemplateList;
-                for(Template template : templateList) {
-                    // Create a variable size output location where the template can generate it's content to
-                    ByteArrayOutputStream output = new ByteArrayOutputStream();
-
-                    // Have Freemarker generate the output
-                    template.process(typeContext, new OutputStreamWriter(output));
-
-                    // Create the means to read in the generated output back in again
-                    try(BufferedReader input = new BufferedReader(new InputStreamReader(
-                            new ByteArrayInputStream(output.toByteArray())))) {
-
-                        // Extract the output path from the first line of the generated content
-                        String outputFileName = input.readLine();
-                        File outputFile = new File(outputDir, outputFileName);
-
-                        // Create any missing directories
-                        if (!outputFile.getParentFile().exists() && !outputFile.getParentFile().mkdirs()) {
-                            throw new GenerationException(
-                                "Unable to create output directory " + outputFile.getParent());
-                        }
-
-                        // Output the rest to that file
-                        BufferedWriter outputFileWriter = Files.newBufferedWriter(
-                            outputFile.toPath(), StandardCharsets.UTF_8);
-                        String line;
-                        while ((line = input.readLine()) != null) {
-                            outputFileWriter.write(line);
-                            outputFileWriter.newLine();
-                        }
-                        outputFileWriter.flush();
-                    }
-                }
-            }
-        } catch (TemplateNotFoundException | TemplateException | MalformedTemplateNameException | ParseException e) {
-            throw new GenerationException("Error resolving template", e);
-        } catch (IOException e) {
-            throw new GenerationException("Error generating sources", e);
-        }
-    }
-
-    private Configuration getFreemarkerConfiguration() throws IOException {
-        Configuration configuration = new Configuration(Configuration.VERSION_2_3_28);
-        configuration.setDefaultEncoding("UTF-8");
-        configuration.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
-        configuration.setLogTemplateExceptions(false);
-        configuration.setWrapUncheckedExceptions(true);
-        configuration.setDirectoryForTemplateLoading(new File("/"));
-        return configuration;
-    }
-
-    protected abstract List<Template> getComplexTypeTemplates(Configuration freemarkerConfiguration) throws IOException;
-
-    protected abstract List<Template> getEnumTypeTemplates(Configuration freemarkerConfiguration) throws IOException;
-
-    protected abstract FreemarkerLanguageTemplateHelper getHelper(Map<String, TypeDefinition> types);
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.protocol.freemarker;
+
+import freemarker.cache.ClassTemplateLoader;
+import freemarker.core.ParseException;
+import freemarker.template.*;
+import org.apache.plc4x.plugins.codegenerator.language.LanguageOutput;
+import org.apache.plc4x.plugins.codegenerator.types.definitions.EnumTypeDefinition;
+import org.apache.plc4x.plugins.codegenerator.types.definitions.TypeDefinition;
+import org.apache.plc4x.plugins.codegenerator.types.exceptions.GenerationException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public abstract class FreemarkerLanguageOutput implements LanguageOutput {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(FreemarkerLanguageOutput.class);
+
+    @Override
+    public void generate(File outputDir, String languageName, String protocolName, String outputFlavor, Map<String, TypeDefinition> types)
+        throws GenerationException {
+
+        try {
+            // Configure the Freemarker template engine
+            Configuration freemarkerConfiguration = getFreemarkerConfiguration();
+
+            ClassTemplateLoader classTemplateLoader = new ClassTemplateLoader(FreemarkerLanguageOutput.class, "/");
+            freemarkerConfiguration.setTemplateLoader(classTemplateLoader);
+
+            // Initialize all templates
+            List<Template> complexTypesTemplateList = getComplexTypeTemplates(freemarkerConfiguration);
+            List<Template> enumTypesTemplateList = getEnumTypeTemplates(freemarkerConfiguration);
+
+            // Iterate over the types and have content generated for each one
+            for (Map.Entry<String, TypeDefinition> typeEntry : types.entrySet()) {
+                LOGGER.info("Generating type " + typeEntry.getKey());
+
+                // Prepare a new generation context
+                Map<String, Object> typeContext = new HashMap<>();
+                typeContext.put("languageName", languageName);
+                typeContext.put("protocolName", protocolName);
+                typeContext.put("outputFlavor", outputFlavor);
+                typeContext.put("typeName", typeEntry.getKey());
+                typeContext.put("type", typeEntry.getValue());
+                typeContext.put("helper", getHelper(types));
+
+                List<Template> templateList = (typeEntry.getValue() instanceof EnumTypeDefinition) ?
+                    enumTypesTemplateList : complexTypesTemplateList;
+                for(Template template : templateList) {
+                    // Create a variable size output location where the template can generate it's content to
+                    ByteArrayOutputStream output = new ByteArrayOutputStream();
+
+                    // Have Freemarker generate the output
+                    template.process(typeContext, new OutputStreamWriter(output));
+
+                    // Create the means to read in the generated output back in again
+                    try(BufferedReader input = new BufferedReader(new InputStreamReader(
+                            new ByteArrayInputStream(output.toByteArray())))) {
+
+                        // Extract the output path from the first line of the generated content
+                        String outputFileName = input.readLine();
+                        File outputFile = new File(outputDir, outputFileName);
+
+                        // Create any missing directories
+                        if (!outputFile.getParentFile().exists() && !outputFile.getParentFile().mkdirs()) {
+                            throw new GenerationException(
+                                "Unable to create output directory " + outputFile.getParent());
+                        }
+
+                        // Output the rest to that file
+                        BufferedWriter outputFileWriter = Files.newBufferedWriter(
+                            outputFile.toPath(), StandardCharsets.UTF_8);
+                        String line;
+                        while ((line = input.readLine()) != null) {
+                            outputFileWriter.write(line);
+                            outputFileWriter.newLine();
+                        }
+                        outputFileWriter.flush();
+                    }
+                }
+            }
+        } catch (TemplateNotFoundException | TemplateException | MalformedTemplateNameException | ParseException e) {
+            throw new GenerationException("Error resolving template", e);
+        } catch (IOException e) {
+            throw new GenerationException("Error generating sources", e);
+        }
+    }
+
+    private Configuration getFreemarkerConfiguration() throws IOException {
+        Configuration configuration = new Configuration(Configuration.VERSION_2_3_28);
+        configuration.setDefaultEncoding("UTF-8");
+        configuration.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
+        configuration.setLogTemplateExceptions(false);
+        configuration.setWrapUncheckedExceptions(true);
+        configuration.setDirectoryForTemplateLoading(new File("/"));
+        return configuration;
+    }
+
+    protected abstract List<Template> getComplexTypeTemplates(Configuration freemarkerConfiguration) throws IOException;
+
+    protected abstract List<Template> getEnumTypeTemplates(Configuration freemarkerConfiguration) throws IOException;
+
+    protected abstract FreemarkerLanguageTemplateHelper getHelper(Map<String, TypeDefinition> types);
+
+}
diff --git a/build-utils/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/FreemarkerLanguageTemplateHelper.java b/build-utils/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/FreemarkerLanguageTemplateHelper.java
index 6b70cd46f05..dc8a4e9bb16 100644
--- a/build-utils/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/FreemarkerLanguageTemplateHelper.java
+++ b/build-utils/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/FreemarkerLanguageTemplateHelper.java
@@ -1,23 +1,23 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.protocol.freemarker;
-
-public interface FreemarkerLanguageTemplateHelper {
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.protocol.freemarker;
+
+public interface FreemarkerLanguageTemplateHelper {
+}
diff --git a/build-utils/language-java/pom.xml b/build-utils/language-java/pom.xml
index 2152416149a..52029f5da59 100644
--- a/build-utils/language-java/pom.xml
+++ b/build-utils/language-java/pom.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4x-build-utils</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4x-build-utils-language-java</artifactId>
-
-  <name>PLC4X: Build Utils: Language: Java</name>
-  <description>Code generation template for generating Java code</description>
-
-  <dependencies>
-    <!-- We are using the Freemarker module to generate Java code -->
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-build-utils-language-base-freemarker</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x.plugins</groupId>
-      <artifactId>plc4x-code-generation-types-base</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.freemarker</groupId>
-      <artifactId>freemarker</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-text</artifactId>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4x-build-utils</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4x-build-utils-language-java</artifactId>
+
+  <name>PLC4X: Build Utils: Language: Java</name>
+  <description>Code generation template for generating Java code</description>
+
+  <dependencies>
+    <!-- We are using the Freemarker module to generate Java code -->
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-build-utils-language-base-freemarker</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x.plugins</groupId>
+      <artifactId>plc4x-code-generation-types-base</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.freemarker</groupId>
+      <artifactId>freemarker</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-text</artifactId>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/build-utils/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageOutput.java b/build-utils/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageOutput.java
index 82a79d7a747..f42dbc4cd45 100644
--- a/build-utils/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageOutput.java
+++ b/build-utils/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageOutput.java
@@ -1,57 +1,57 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.language.java;
-
-import freemarker.template.*;
-import org.apache.plc4x.plugins.codegenerator.protocol.freemarker.FreemarkerLanguageOutput;
-import org.apache.plc4x.plugins.codegenerator.protocol.freemarker.FreemarkerLanguageTemplateHelper;
-import org.apache.plc4x.plugins.codegenerator.types.definitions.TypeDefinition;
-
-import java.io.*;
-import java.util.*;
-
-public class JavaLanguageOutput extends FreemarkerLanguageOutput {
-
-    @Override
-    public String getName() {
-        return "Java";
-    }
-
-    @Override
-    public List<String> supportedOutputFlavors() {
-        return Arrays.asList("read-write", "read-only", "passive");
-    }
-
-    protected List<Template> getComplexTypeTemplates(Configuration freemarkerConfiguration) throws IOException {
-        return Arrays.asList(
-            freemarkerConfiguration.getTemplate("templates/java/pojo-template.ftlh"),
-            freemarkerConfiguration.getTemplate("templates/java/io-template.ftlh"));
-    }
-
-    protected List<Template> getEnumTypeTemplates(Configuration freemarkerConfiguration) throws IOException {
-        return Collections.singletonList(
-            freemarkerConfiguration.getTemplate("templates/java/enum-template.ftlh"));
-    }
-
-    protected FreemarkerLanguageTemplateHelper getHelper(Map<String, TypeDefinition> types) {
-        return new JavaLanguageTemplateHelper(types);
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.language.java;
+
+import freemarker.template.*;
+import org.apache.plc4x.plugins.codegenerator.protocol.freemarker.FreemarkerLanguageOutput;
+import org.apache.plc4x.plugins.codegenerator.protocol.freemarker.FreemarkerLanguageTemplateHelper;
+import org.apache.plc4x.plugins.codegenerator.types.definitions.TypeDefinition;
+
+import java.io.*;
+import java.util.*;
+
+public class JavaLanguageOutput extends FreemarkerLanguageOutput {
+
+    @Override
+    public String getName() {
+        return "Java";
+    }
+
+    @Override
+    public List<String> supportedOutputFlavors() {
+        return Arrays.asList("read-write", "read-only", "passive");
+    }
+
+    protected List<Template> getComplexTypeTemplates(Configuration freemarkerConfiguration) throws IOException {
+        return Arrays.asList(
+            freemarkerConfiguration.getTemplate("templates/java/pojo-template.ftlh"),
+            freemarkerConfiguration.getTemplate("templates/java/io-template.ftlh"));
+    }
+
+    protected List<Template> getEnumTypeTemplates(Configuration freemarkerConfiguration) throws IOException {
+        return Collections.singletonList(
+            freemarkerConfiguration.getTemplate("templates/java/enum-template.ftlh"));
+    }
+
+    protected FreemarkerLanguageTemplateHelper getHelper(Map<String, TypeDefinition> types) {
+        return new JavaLanguageTemplateHelper(types);
+    }
+
+}
diff --git a/build-utils/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java b/build-utils/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java
index 0fc603fb03a..6bfa76e5458 100644
--- a/build-utils/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java
+++ b/build-utils/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java
@@ -1,650 +1,650 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.language.java;
-
-import org.apache.commons.lang3.math.NumberUtils;
-import org.apache.commons.text.WordUtils;
-import org.apache.plc4x.plugins.codegenerator.protocol.freemarker.FreemarkerLanguageTemplateHelper;
-import org.apache.plc4x.plugins.codegenerator.types.definitions.*;
-import org.apache.plc4x.plugins.codegenerator.types.fields.*;
-import org.apache.plc4x.plugins.codegenerator.types.references.ComplexTypeReference;
-import org.apache.plc4x.plugins.codegenerator.types.references.SimpleTypeReference;
-import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
-import org.apache.plc4x.plugins.codegenerator.types.terms.*;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class JavaLanguageTemplateHelper implements FreemarkerLanguageTemplateHelper {
-
-    private final Map<String, TypeDefinition> types;
-
-    public JavaLanguageTemplateHelper(Map<String, TypeDefinition> types) {
-        this.types = types;
-    }
-
-    public String packageName(String protocolName, String languageName, String languageFlavorName) {
-        return "org.apache.plc4x." + String.join("", languageName.split("\\-")) + "." +
-            String.join("", protocolName.split("\\-")) + "." +
-            String.join("", languageFlavorName.split("\\-"));
-    }
-
-    public String getLanguageTypeNameForField(TypedField field) {
-        boolean optional = field instanceof OptionalField;
-        return getLanguageTypeNameForField(field, !optional);
-    }
-
-    public String getNonPrimitiveLanguageTypeNameForField(TypedField field) {
-        return getLanguageTypeNameForField(field, false);
-    }
-
-    private String getLanguageTypeNameForField(TypedField field, boolean allowPrimitive) {
-        TypeReference typeReference = field.getType();
-        return getLanguageTypeName(typeReference, allowPrimitive);
-    }
-
-    public String getLanguageTypeNameForSpecType(TypeReference typeReference) {
-        return getLanguageTypeName(typeReference, true);
-    }
-
-    public String getLanguageTypeName(TypeReference typeReference, boolean allowPrimitive) {
-        if(typeReference instanceof SimpleTypeReference) {
-            SimpleTypeReference simpleTypeReference = (SimpleTypeReference) typeReference;
-            switch (simpleTypeReference.getBaseType()) {
-                case BIT: {
-                    return allowPrimitive ? "boolean" : "Boolean";
-                }
-                case UINT: {
-                    if (simpleTypeReference.getSize() <= 4) {
-                        return allowPrimitive ? "byte" : "Byte";
-                    }
-                    if (simpleTypeReference.getSize() <= 8) {
-                        return allowPrimitive ? "short" : "Short";
-                    }
-                    if (simpleTypeReference.getSize() <= 16) {
-                        return allowPrimitive ? "int" : "Integer";
-                    }
-                    if (simpleTypeReference.getSize() <= 32) {
-                        return allowPrimitive ? "long" : "Long";
-                    }
-                    return "BigInteger";
-                }
-                case INT: {
-                    if (simpleTypeReference.getSize() <= 8) {
-                        return allowPrimitive ? "byte" : "Byte";
-                    }
-                    if (simpleTypeReference.getSize() <= 16) {
-                        return allowPrimitive ? "short" : "Short";
-                    }
-                    if (simpleTypeReference.getSize() <= 32) {
-                        return allowPrimitive ? "int" : "Integer";
-                    }
-                    if (simpleTypeReference.getSize() <= 64) {
-                        return allowPrimitive ? "long" : "Long";
-                    }
-                    return "BigInteger";
-                }
-                case FLOAT: {
-                    if (simpleTypeReference.getSize() <= 32) {
-                        return allowPrimitive ? "float" : "Float";
-                    }
-                    if (simpleTypeReference.getSize() <= 64) {
-                        return allowPrimitive ? "double" : "Double";
-                    }
-                    return "BigDecimal";
-                }
-                case STRING: {
-                    return "String";
-                }
-            }
-            return "Hurz";
-        } else {
-            return ((ComplexTypeReference) typeReference).getName();
-        }
-    }
-
-    public String getNullValueForType(TypeReference typeReference) {
-        if(typeReference instanceof SimpleTypeReference) {
-            SimpleTypeReference simpleTypeReference = (SimpleTypeReference) typeReference;
-            switch (simpleTypeReference.getBaseType()) {
-                case BIT: {
-                    return "false";
-                }
-                case UINT: {
-                    if (simpleTypeReference.getSize() <= 16) {
-                        return "0";
-                    }
-                    if (simpleTypeReference.getSize() <= 32) {
-                        return "0l";
-                    }
-                    return "null";
-                }
-                case INT: {
-                    if (simpleTypeReference.getSize() <= 32) {
-                        return "0";
-                    }
-                    if (simpleTypeReference.getSize() <= 64) {
-                        return "0l";
-                    }
-                    return "null";
-                }
-                case FLOAT: {
-                    if (simpleTypeReference.getSize() <= 32) {
-                        return "0.0f";
-                    }
-                    if (simpleTypeReference.getSize() <= 64) {
-                        return "0.0";
-                    }
-                    return "null";
-                }
-                case STRING: {
-                    return "null";
-                }
-            }
-            return "Hurz";
-        } else {
-            return "null";
-        }
-    }
-
-    public String getArgumentType(TypeReference typeReference, int index) {
-        if(typeReference instanceof ComplexTypeReference) {
-            ComplexTypeReference complexTypeReference = (ComplexTypeReference) typeReference;
-            if(!types.containsKey(complexTypeReference.getName())) {
-                throw new RuntimeException("Could not find definition of complex type " + complexTypeReference.getName());
-            }
-            TypeDefinition complexTypeDefinition = types.get(complexTypeReference.getName());
-            if(complexTypeDefinition.getParserArguments().length <= index) {
-                throw new RuntimeException("Type " + complexTypeReference.getName() + " specifies too few parser arguments");
-            }
-            return getLanguageTypeNameForSpecType(complexTypeDefinition.getParserArguments()[index].getType());
-        }
-        return "Hurz";
-    }
-
-    public String getReadBufferReadMethodCall(SimpleTypeReference simpleTypeReference) {
-        switch (simpleTypeReference.getBaseType()) {
-            case BIT: {
-                return "readBit()";
-            }
-            case UINT: {
-                if (simpleTypeReference.getSize() <= 4) {
-                    return "readUnsignedByte(" + simpleTypeReference.getSize() + ")";
-                }
-                if (simpleTypeReference.getSize() <= 8) {
-                    return "readUnsignedShort(" + simpleTypeReference.getSize() + ")";
-                }
-                if (simpleTypeReference.getSize() <= 16) {
-                    return "readUnsignedInt(" + simpleTypeReference.getSize() + ")";
-                }
-                if (simpleTypeReference.getSize() <= 32) {
-                    return "readUnsignedLong(" + simpleTypeReference.getSize() + ")";
-                }
-                return "readUnsignedBigInteger" + simpleTypeReference.getSize() + ")";
-            }
-            case INT: {
-                if (simpleTypeReference.getSize() <= 8) {
-                    return "readByte(" + simpleTypeReference.getSize() + ")";
-                }
-                if (simpleTypeReference.getSize() <= 16) {
-                    return "readShort(" + simpleTypeReference.getSize() + ")";
-                }
-                if (simpleTypeReference.getSize() <= 32) {
-                    return "readInt(" + simpleTypeReference.getSize() + ")";
-                }
-                if (simpleTypeReference.getSize() <= 64) {
-                    return "readLong(" + simpleTypeReference.getSize() + ")";
-                }
-                return "readBigInteger(" + simpleTypeReference.getSize() + ")";
-            }
-            case FLOAT: {
-                if (simpleTypeReference.getSize() <= 32) {
-                    return "readFloat(" + simpleTypeReference.getSize() + ")";
-                }
-                if (simpleTypeReference.getSize() <= 64) {
-                    return "readDouble(" + simpleTypeReference.getSize() + ")";
-                }
-                return "readBigDecimal(" + simpleTypeReference.getSize() + ")";
-            }
-            case STRING: {
-                return "readString(" + simpleTypeReference.getSize() + ")";
-            }
-        }
-        return "Hurz";
-    }
-
-    public String getWriteBufferReadMethodCall(SimpleTypeReference simpleTypeReference, String fieldName) {
-        switch (simpleTypeReference.getBaseType()) {
-            case BIT: {
-                return "writeBit((boolean) " + fieldName + ")";
-            }
-            case UINT: {
-                if (simpleTypeReference.getSize() <= 4) {
-                    return "writeUnsignedByte(" + simpleTypeReference.getSize() + ", ((Number) " + fieldName + ").byteValue())";
-                }
-                if (simpleTypeReference.getSize() <= 8) {
-                    return "writeUnsignedShort(" + simpleTypeReference.getSize() + ", ((Number) " + fieldName + ").shortValue())";
-                }
-                if (simpleTypeReference.getSize() <= 16) {
-                    return "writeUnsignedInt(" + simpleTypeReference.getSize() + ", ((Number) " + fieldName + ").intValue())";
-                }
-                if (simpleTypeReference.getSize() <= 32) {
-                    return "writeUnsignedLong(" + simpleTypeReference.getSize() + ", ((Number) " + fieldName + ").longValue())";
-                }
-                return "writeUnsignedBigInteger" + simpleTypeReference.getSize() + ", (BigInteger) " + fieldName + ")";
-            }
-            case INT: {
-                if (simpleTypeReference.getSize() <= 8) {
-                    return "writeByte(" + simpleTypeReference.getSize() + ", ((Number) " + fieldName + ").byteValue())";
-                }
-                if (simpleTypeReference.getSize() <= 16) {
-                    return "writeShort(" + simpleTypeReference.getSize() + ", ((Number) " + fieldName + ").shortValue())";
-                }
-                if (simpleTypeReference.getSize() <= 32) {
-                    return "writeInt(" + simpleTypeReference.getSize() + ", ((Number) " + fieldName + ").intValue())";
-                }
-                if (simpleTypeReference.getSize() <= 64) {
-                    return "writeLong(" + simpleTypeReference.getSize() + ", ((Number) " + fieldName + ").longValue())";
-                }
-                return "writeBigInteger(" + simpleTypeReference.getSize() + ", (BigInteger) " + fieldName + ")";
-            }
-            case FLOAT: {
-                if (simpleTypeReference.getSize() <= 32) {
-                    return "writeFloat(" + simpleTypeReference.getSize() + ", (float) " + fieldName + ")";
-                }
-                if (simpleTypeReference.getSize() <= 64) {
-                    return "writeDouble(" + simpleTypeReference.getSize() + ", (double) " + fieldName + ")";
-                }
-                return "writeBigDecimal(" + simpleTypeReference.getSize() + ", (BigDecimal) " + fieldName + ")";
-            }
-            case STRING: {
-                return "writeString(" + simpleTypeReference.getSize() + ", (String) " + fieldName + ")";
-            }
-        }
-        return "Hurz";
-    }
-
-    public String getReadMethodName(SimpleTypeReference simpleTypeReference) {
-        String languageTypeName = getLanguageTypeNameForSpecType(simpleTypeReference);
-        languageTypeName = languageTypeName.substring(0, 1).toUpperCase() + languageTypeName.substring(1);
-        if(simpleTypeReference.getBaseType().equals(SimpleTypeReference.SimpleBaseType.UINT)) {
-            return "readUnsigned" + languageTypeName;
-        } else {
-            return "read" + languageTypeName;
-
-        }
-    }
-
-    public Collection<ComplexTypeReference> getComplexTypes(ComplexTypeDefinition complexTypeDefinition) {
-        Map<String, ComplexTypeReference> types = new HashMap<>();
-        for (Field field : complexTypeDefinition.getFields()) {
-            if(field instanceof TypedField) {
-                TypedField typedField = (TypedField) field;
-                if(typedField.getType() instanceof ComplexTypeReference) {
-                    ComplexTypeReference complexTypeReference = (ComplexTypeReference) typedField.getType();
-                    types.put(complexTypeReference.getName(),  complexTypeReference);
-                }
-            } else if(field instanceof SwitchField) {
-                SwitchField switchField = (SwitchField) field;
-                for (DiscriminatedComplexTypeDefinition cas : switchField.getCases()) {
-                    types.put(cas.getName(), new ComplexTypeReference() {
-                        @Override
-                        public String getName() {
-                            return cas.getName();
-                        }
-                    });
-                }
-            }
-        }
-        return types.values();
-    }
-
-    public Collection<ComplexTypeReference> getEnumTypes(ComplexTypeDefinition complexTypeDefinition) {
-        Map<String, ComplexTypeReference> types = new HashMap<>();
-        for (Field field : complexTypeDefinition.getFields()) {
-            if(field instanceof EnumField) {
-                EnumField enumField = (EnumField) field;
-                if(enumField.getType() instanceof ComplexTypeReference) {
-                    ComplexTypeReference complexTypeReference = (ComplexTypeReference) enumField.getType();
-                    types.put(complexTypeReference.getName(),  complexTypeReference);
-                }
-            }
-        }
-        for (Field field : complexTypeDefinition.getParentPropertyFields()) {
-            if(field instanceof EnumField) {
-                EnumField enumField = (EnumField) field;
-                if(enumField.getType() instanceof ComplexTypeReference) {
-                    ComplexTypeReference complexTypeReference = (ComplexTypeReference) enumField.getType();
-                    types.put(complexTypeReference.getName(),  complexTypeReference);
-                }
-            }
-        }
-        return types.values();
-    }
-
-    public boolean isSimpleType(TypeReference typeReference) {
-        return typeReference instanceof SimpleTypeReference;
-    }
-
-    public boolean isDiscriminatedType(TypeDefinition typeDefinition) {
-        return typeDefinition instanceof DiscriminatedComplexTypeDefinition;
-    }
-
-    public boolean isCountArray(ArrayField arrayField) {
-        return arrayField.getLoopType() == ArrayField.LoopType.COUNT;
-    }
-
-    public boolean isLengthArray(ArrayField arrayField) {
-        return arrayField.getLoopType() == ArrayField.LoopType.LENGTH;
-    }
-
-    public boolean isTerminatedArray(ArrayField arrayField) {
-        return arrayField.getLoopType() == ArrayField.LoopType.TERMINATED;
-    }
-
-    public boolean isCountArray(ManualArrayField arrayField) {
-        return arrayField.getLoopType() == ManualArrayField.LoopType.COUNT;
-    }
-
-    public boolean isLengthArray(ManualArrayField arrayField) {
-        return arrayField.getLoopType() == ManualArrayField.LoopType.LENGTH;
-    }
-
-    public boolean isTerminatedArray(ManualArrayField arrayField) {
-        return arrayField.getLoopType() == ManualArrayField.LoopType.TERMINATED;
-    }
-
-    public String toSwitchExpression(String expression) {
-        StringBuilder sb = new StringBuilder();
-        Pattern pattern = Pattern.compile("([^\\.]*)\\.([a-zA-Z\\d]+)(.*)");
-        Matcher matcher;
-        while ((matcher = pattern.matcher(expression)).matches()) {
-            String prefix = matcher.group(1);
-            String middle = matcher.group(2);
-            sb.append(prefix).append(".get").append(WordUtils.capitalize(middle)).append("()");
-            expression = matcher.group(3);
-        }
-        sb.append(expression);
-        return sb.toString();
-    }
-
-    public String toDeserializationExpression(Term term, Argument[] parserArguments) {
-        return toExpression(term, term1 -> toVariableDeserializationExpression(term1, parserArguments));
-    }
-
-    public String toSerializationExpression(Term term, Argument[] parserArguments) {
-        return toExpression(term, term1 -> toVariableSerializationExpression(term1, parserArguments));
-    }
-
-    private String toExpression(Term term, Function<Term, String> variableExpressionGenerator) {
-        if(term == null) {
-            return "";
-        }
-        if(term instanceof Literal) {
-            if(term instanceof NullLiteral) {
-                return "null";
-            } else if(term instanceof BooleanLiteral) {
-                return Boolean.toString(((BooleanLiteral) term).getValue());
-            } else if(term instanceof NumericLiteral) {
-                return ((NumericLiteral) term).getNumber().toString();
-            } else if(term instanceof StringLiteral) {
-                return "\"" + ((StringLiteral) term).getValue() + "\"";
-            } else if(term instanceof VariableLiteral) {
-                return variableExpressionGenerator.apply(term);
-            } else {
-                throw new RuntimeException("Unsupported Literal type " + term.getClass().getName());
-            }
-        } else if (term instanceof UnaryTerm) {
-            UnaryTerm ut = (UnaryTerm) term;
-            Term a = ut.getA();
-            switch(ut.getOperation()) {
-                case "!":
-                    return "!(" + toExpression(a, variableExpressionGenerator) + ")";
-                case "-":
-                    return "-(" + toExpression(a, variableExpressionGenerator) + ")";
-                case "()":
-                    return "(" + toExpression(a, variableExpressionGenerator) + ")";
-                default:
-                    throw new RuntimeException("Unsupported unary operation type " + ut.getOperation());
-            }
-        } else if (term instanceof BinaryTerm) {
-            BinaryTerm bt = (BinaryTerm) term;
-            Term a = bt.getA();
-            Term b = bt.getB();
-            String operation = bt.getOperation();
-            return "(" + toExpression(a, variableExpressionGenerator) + ") " + operation + " (" + toExpression(b, variableExpressionGenerator) + ")";
-        } else if (term instanceof TernaryTerm) {
-            TernaryTerm tt = (TernaryTerm) term;
-            if("if".equals(tt.getOperation())) {
-                Term a = tt.getA();
-                Term b = tt.getB();
-                Term c = tt.getC();
-                return "((" +  toExpression(a, variableExpressionGenerator) + ") ? " + toExpression(b, variableExpressionGenerator) + " : " + toExpression(c, variableExpressionGenerator) + ")";
-            } else {
-                throw new RuntimeException("Unsupported ternary operation type " + tt.getOperation());
-            }
-        } else {
-            throw new RuntimeException("Unsupported Term type " + term.getClass().getName());
-        }
-    }
-
-    private String toVariableDeserializationExpression(Term term, Argument[] parserArguments) {
-        VariableLiteral vl = (VariableLiteral) term;
-        // CAST expressions are special as we need to add a ".class" to the second parameter in Java.
-        if("CAST".equals(vl.getName())) {
-            StringBuilder sb = new StringBuilder(vl.getName());
-            if((vl.getArgs() == null) || (vl.getArgs().size() != 2)) {
-                throw new RuntimeException("A CAST expression expects exactly two arguments.");
-            }
-            sb.append("(").append(toVariableDeserializationExpression(vl.getArgs().get(0), parserArguments))
-                .append(", ").append(((VariableLiteral) vl.getArgs().get(1)).getName()).append(".class)");
-            return sb.toString() + ((vl.getChild() != null) ? "." + toVariableExpressionRest(vl.getChild()) : "");
-        }
-        else if("STATIC_CALL".equals(vl.getName())) {
-            StringBuilder sb = new StringBuilder();
-            if(!(vl.getArgs().get(0) instanceof StringLiteral)) {
-                throw new RuntimeException("Expecting the first argument of a 'STATIC_CALL' to be a StringLiteral");
-            }
-            String methodName = ((StringLiteral) vl.getArgs().get(0)).getValue();
-            methodName = methodName.substring(1, methodName.length() - 1);
-            sb.append(methodName).append("(");
-            for(int i = 1; i < vl.getArgs().size(); i++) {
-                Term arg = vl.getArgs().get(i);
-                if(i > 1) {
-                    sb.append(", ");
-                }
-                if(arg instanceof VariableLiteral) {
-                    VariableLiteral va = (VariableLiteral) arg;
-                    // "io" is the default name of the reader argument which is always available.
-                    boolean isDeserializerArg = "io".equals(va.getName());
-                    if(parserArguments != null) {
-                        for (Argument parserArgument : parserArguments) {
-                            if (parserArgument.getName().equals(va.getName())) {
-                                isDeserializerArg = true;
-                                break;
-                            }
-                        }
-                    }
-                    if(isDeserializerArg) {
-                        sb.append(va.getName() + ((va.getChild() != null) ? "." + toVariableExpressionRest(va.getChild()) : ""));
-                    } else {
-                        sb.append(toVariableDeserializationExpression(va, null));
-                    }
-                } else if(arg instanceof StringLiteral) {
-                    sb.append(((StringLiteral) arg).getValue());
-                }
-            }
-            sb.append(")");
-            return sb.toString();
-        }
-        // All uppercase names are not fields, but utility methods.
-        else if(vl.getName().equals(vl.getName().toUpperCase())) {
-            StringBuilder sb = new StringBuilder(vl.getName());
-            if(vl.getArgs() != null) {
-                sb.append("(");
-                boolean firstArg = true;
-                for(Term arg : vl.getArgs()) {
-                    if(!firstArg) {
-                        sb.append(", ");
-                    }
-                    sb.append(toVariableDeserializationExpression(arg, parserArguments));
-                    firstArg = false;
-                }
-                sb.append(")");
-            }
-            if(vl.getIndex() != VariableLiteral.NO_INDEX) {
-                sb.append("[").append(vl.getIndex()).append("]");
-            }
-            return sb.toString() + ((vl.getChild() != null) ? "." + toVariableExpressionRest(vl.getChild()) : "");
-        }
-        return vl.getName() + ((vl.getChild() != null) ? "." + toVariableExpressionRest(vl.getChild()) : "");
-    }
-
-    private String toVariableSerializationExpression(Term term, Argument[] parserArguments) {
-        VariableLiteral vl = (VariableLiteral) term;
-        if("STATIC_CALL".equals(vl.getName())) {
-            StringBuilder sb = new StringBuilder();
-            if(!(vl.getArgs().get(0) instanceof StringLiteral)) {
-                throw new RuntimeException("Expecting the first argument of a 'STATIC_CALL' to be a StringLiteral");
-            }
-            String methodName = ((StringLiteral) vl.getArgs().get(0)).getValue();
-            methodName = methodName.substring(1, methodName.length() - 1);
-            sb.append(methodName).append("(");
-            for(int i = 1; i < vl.getArgs().size(); i++) {
-                Term arg = vl.getArgs().get(i);
-                if(i > 1) {
-                    sb.append(", ");
-                }
-                if(arg instanceof VariableLiteral) {
-                    VariableLiteral va = (VariableLiteral) arg;
-                    // "io" and "value" are always available in every parser.
-                    boolean isSerializerArg = "io".equals(va.getName()) || "value".equals(va.getName()) || "element".equals(va.getName());
-                    if(parserArguments != null) {
-                        for (Argument parserArgument : parserArguments) {
-                            if (parserArgument.getName().equals(va.getName())) {
-                                isSerializerArg = true;
-                                break;
-                            }
-                        }
-                    }
-                    if(isSerializerArg) {
-                        sb.append(va.getName() + ((va.getChild() != null) ? "." + toVariableExpressionRest(va.getChild()) : ""));
-                    } else {
-                        sb.append(toVariableSerializationExpression(va, null));
-                    }
-                } else if(arg instanceof StringLiteral) {
-                    sb.append(((StringLiteral) arg).getValue());
-                }
-            }
-            sb.append(")");
-            return sb.toString();
-        }
-        // All uppercase names are not fields, but utility methods.
-        else if(vl.getName().equals(vl.getName().toUpperCase())) {
-            StringBuilder sb = new StringBuilder(vl.getName());
-            if(vl.getArgs() != null) {
-                sb.append("(");
-                boolean firstArg = true;
-                for(Term arg : vl.getArgs()) {
-                    if(!firstArg) {
-                        sb.append(", ");
-                    }
-
-                    if(arg instanceof VariableLiteral) {
-                        VariableLiteral va = (VariableLiteral) arg;
-                        boolean isSerializerArg = false;
-                        if(parserArguments != null) {
-                            for (Argument parserArgument : parserArguments) {
-                                if (parserArgument.getName().equals(va.getName())) {
-                                    isSerializerArg = true;
-                                    break;
-                                }
-                            }
-                        }
-                        if(isSerializerArg) {
-                            sb.append(va.getName() + ((va.getChild() != null) ? "." + toVariableExpressionRest(va.getChild()) : ""));
-                        } else {
-                            sb.append(toVariableSerializationExpression(va, null));
-                        }
-                    } else if(arg instanceof StringLiteral) {
-                        sb.append(((StringLiteral) arg).getValue());
-                    }
-                    firstArg = false;
-                }
-                sb.append(")");
-            }
-            return sb.toString();
-        }
-        boolean isSerializerArg = false;
-        if(parserArguments != null) {
-            for (Argument parserArgument : parserArguments) {
-                if (parserArgument.getName().equals(vl.getName())) {
-                    isSerializerArg = true;
-                    break;
-                }
-            }
-        }
-        if(isSerializerArg) {
-            return vl.getName() + ((vl.getChild() != null) ? "." + toVariableExpressionRest(vl.getChild()) : "");
-        } else {
-            return "value." + toVariableExpressionRest(vl);
-        }
-    }
-
-    private String toVariableExpressionRest(VariableLiteral vl) {
-        return "get" + WordUtils.capitalize(vl.getName()) + "()" + ((vl.isIndexed() ? "[" + vl.getIndex() + "]" : "") +
-            ((vl.getChild() != null) ? "." + toVariableExpressionRest(vl.getChild()) : ""));
-    }
-
-    public String escapeValue(TypeReference typeReference, String valueString) {
-        if(valueString == null) {
-            return null;
-        }
-        if(typeReference instanceof SimpleTypeReference) {
-            SimpleTypeReference simpleTypeReference = (SimpleTypeReference) typeReference;
-            switch (simpleTypeReference.getBaseType()) {
-                case UINT:
-                case INT:
-                    // If it's a one character string and is numeric, output it as char.
-                    if(!NumberUtils.isParsable(valueString) && (valueString.length() == 1)) {
-                        return "'" + valueString + "'";
-                    }
-                    break;
-                case STRING:
-                    return "\"" + valueString + "\"";
-            }
-        }
-        return valueString;
-    }
-
-    public SimpleTypeReference getEnumBaseType(TypeReference enumType) {
-        if(!(enumType instanceof ComplexTypeReference)) {
-            throw new RuntimeException("type reference for enum types must be of type complex type");
-        }
-        ComplexTypeReference complexType = (ComplexTypeReference) enumType;
-        EnumTypeDefinition enumTypeDefinition = (EnumTypeDefinition) types.get(complexType.getName());
-        return (SimpleTypeReference) enumTypeDefinition.getType();
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.language.java;
+
+import org.apache.commons.lang3.math.NumberUtils;
+import org.apache.commons.text.WordUtils;
+import org.apache.plc4x.plugins.codegenerator.protocol.freemarker.FreemarkerLanguageTemplateHelper;
+import org.apache.plc4x.plugins.codegenerator.types.definitions.*;
+import org.apache.plc4x.plugins.codegenerator.types.fields.*;
+import org.apache.plc4x.plugins.codegenerator.types.references.ComplexTypeReference;
+import org.apache.plc4x.plugins.codegenerator.types.references.SimpleTypeReference;
+import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
+import org.apache.plc4x.plugins.codegenerator.types.terms.*;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class JavaLanguageTemplateHelper implements FreemarkerLanguageTemplateHelper {
+
+    private final Map<String, TypeDefinition> types;
+
+    public JavaLanguageTemplateHelper(Map<String, TypeDefinition> types) {
+        this.types = types;
+    }
+
+    public String packageName(String protocolName, String languageName, String languageFlavorName) {
+        return "org.apache.plc4x." + String.join("", languageName.split("\\-")) + "." +
+            String.join("", protocolName.split("\\-")) + "." +
+            String.join("", languageFlavorName.split("\\-"));
+    }
+
+    public String getLanguageTypeNameForField(TypedField field) {
+        boolean optional = field instanceof OptionalField;
+        return getLanguageTypeNameForField(field, !optional);
+    }
+
+    public String getNonPrimitiveLanguageTypeNameForField(TypedField field) {
+        return getLanguageTypeNameForField(field, false);
+    }
+
+    private String getLanguageTypeNameForField(TypedField field, boolean allowPrimitive) {
+        TypeReference typeReference = field.getType();
+        return getLanguageTypeName(typeReference, allowPrimitive);
+    }
+
+    public String getLanguageTypeNameForSpecType(TypeReference typeReference) {
+        return getLanguageTypeName(typeReference, true);
+    }
+
+    public String getLanguageTypeName(TypeReference typeReference, boolean allowPrimitive) {
+        if(typeReference instanceof SimpleTypeReference) {
+            SimpleTypeReference simpleTypeReference = (SimpleTypeReference) typeReference;
+            switch (simpleTypeReference.getBaseType()) {
+                case BIT: {
+                    return allowPrimitive ? "boolean" : "Boolean";
+                }
+                case UINT: {
+                    if (simpleTypeReference.getSize() <= 4) {
+                        return allowPrimitive ? "byte" : "Byte";
+                    }
+                    if (simpleTypeReference.getSize() <= 8) {
+                        return allowPrimitive ? "short" : "Short";
+                    }
+                    if (simpleTypeReference.getSize() <= 16) {
+                        return allowPrimitive ? "int" : "Integer";
+                    }
+                    if (simpleTypeReference.getSize() <= 32) {
+                        return allowPrimitive ? "long" : "Long";
+                    }
+                    return "BigInteger";
+                }
+                case INT: {
+                    if (simpleTypeReference.getSize() <= 8) {
+                        return allowPrimitive ? "byte" : "Byte";
+                    }
+                    if (simpleTypeReference.getSize() <= 16) {
+                        return allowPrimitive ? "short" : "Short";
+                    }
+                    if (simpleTypeReference.getSize() <= 32) {
+                        return allowPrimitive ? "int" : "Integer";
+                    }
+                    if (simpleTypeReference.getSize() <= 64) {
+                        return allowPrimitive ? "long" : "Long";
+                    }
+                    return "BigInteger";
+                }
+                case FLOAT: {
+                    if (simpleTypeReference.getSize() <= 32) {
+                        return allowPrimitive ? "float" : "Float";
+                    }
+                    if (simpleTypeReference.getSize() <= 64) {
+                        return allowPrimitive ? "double" : "Double";
+                    }
+                    return "BigDecimal";
+                }
+                case STRING: {
+                    return "String";
+                }
+            }
+            return "Hurz";
+        } else {
+            return ((ComplexTypeReference) typeReference).getName();
+        }
+    }
+
+    public String getNullValueForType(TypeReference typeReference) {
+        if(typeReference instanceof SimpleTypeReference) {
+            SimpleTypeReference simpleTypeReference = (SimpleTypeReference) typeReference;
+            switch (simpleTypeReference.getBaseType()) {
+                case BIT: {
+                    return "false";
+                }
+                case UINT: {
+                    if (simpleTypeReference.getSize() <= 16) {
+                        return "0";
+                    }
+                    if (simpleTypeReference.getSize() <= 32) {
+                        return "0l";
+                    }
+                    return "null";
+                }
+                case INT: {
+                    if (simpleTypeReference.getSize() <= 32) {
+                        return "0";
+                    }
+                    if (simpleTypeReference.getSize() <= 64) {
+                        return "0l";
+                    }
+                    return "null";
+                }
+                case FLOAT: {
+                    if (simpleTypeReference.getSize() <= 32) {
+                        return "0.0f";
+                    }
+                    if (simpleTypeReference.getSize() <= 64) {
+                        return "0.0";
+                    }
+                    return "null";
+                }
+                case STRING: {
+                    return "null";
+                }
+            }
+            return "Hurz";
+        } else {
+            return "null";
+        }
+    }
+
+    public String getArgumentType(TypeReference typeReference, int index) {
+        if(typeReference instanceof ComplexTypeReference) {
+            ComplexTypeReference complexTypeReference = (ComplexTypeReference) typeReference;
+            if(!types.containsKey(complexTypeReference.getName())) {
+                throw new RuntimeException("Could not find definition of complex type " + complexTypeReference.getName());
+            }
+            TypeDefinition complexTypeDefinition = types.get(complexTypeReference.getName());
+            if(complexTypeDefinition.getParserArguments().length <= index) {
+                throw new RuntimeException("Type " + complexTypeReference.getName() + " specifies too few parser arguments");
+            }
+            return getLanguageTypeNameForSpecType(complexTypeDefinition.getParserArguments()[index].getType());
+        }
+        return "Hurz";
+    }
+
+    public String getReadBufferReadMethodCall(SimpleTypeReference simpleTypeReference) {
+        switch (simpleTypeReference.getBaseType()) {
+            case BIT: {
+                return "readBit()";
+            }
+            case UINT: {
+                if (simpleTypeReference.getSize() <= 4) {
+                    return "readUnsignedByte(" + simpleTypeReference.getSize() + ")";
+                }
+                if (simpleTypeReference.getSize() <= 8) {
+                    return "readUnsignedShort(" + simpleTypeReference.getSize() + ")";
+                }
+                if (simpleTypeReference.getSize() <= 16) {
+                    return "readUnsignedInt(" + simpleTypeReference.getSize() + ")";
+                }
+                if (simpleTypeReference.getSize() <= 32) {
+                    return "readUnsignedLong(" + simpleTypeReference.getSize() + ")";
+                }
+                return "readUnsignedBigInteger" + simpleTypeReference.getSize() + ")";
+            }
+            case INT: {
+                if (simpleTypeReference.getSize() <= 8) {
+                    return "readByte(" + simpleTypeReference.getSize() + ")";
+                }
+                if (simpleTypeReference.getSize() <= 16) {
+                    return "readShort(" + simpleTypeReference.getSize() + ")";
+                }
+                if (simpleTypeReference.getSize() <= 32) {
+                    return "readInt(" + simpleTypeReference.getSize() + ")";
+                }
+                if (simpleTypeReference.getSize() <= 64) {
+                    return "readLong(" + simpleTypeReference.getSize() + ")";
+                }
+                return "readBigInteger(" + simpleTypeReference.getSize() + ")";
+            }
+            case FLOAT: {
+                if (simpleTypeReference.getSize() <= 32) {
+                    return "readFloat(" + simpleTypeReference.getSize() + ")";
+                }
+                if (simpleTypeReference.getSize() <= 64) {
+                    return "readDouble(" + simpleTypeReference.getSize() + ")";
+                }
+                return "readBigDecimal(" + simpleTypeReference.getSize() + ")";
+            }
+            case STRING: {
+                return "readString(" + simpleTypeReference.getSize() + ")";
+            }
+        }
+        return "Hurz";
+    }
+
+    public String getWriteBufferReadMethodCall(SimpleTypeReference simpleTypeReference, String fieldName) {
+        switch (simpleTypeReference.getBaseType()) {
+            case BIT: {
+                return "writeBit((boolean) " + fieldName + ")";
+            }
+            case UINT: {
+                if (simpleTypeReference.getSize() <= 4) {
+                    return "writeUnsignedByte(" + simpleTypeReference.getSize() + ", ((Number) " + fieldName + ").byteValue())";
+                }
+                if (simpleTypeReference.getSize() <= 8) {
+                    return "writeUnsignedShort(" + simpleTypeReference.getSize() + ", ((Number) " + fieldName + ").shortValue())";
+                }
+                if (simpleTypeReference.getSize() <= 16) {
+                    return "writeUnsignedInt(" + simpleTypeReference.getSize() + ", ((Number) " + fieldName + ").intValue())";
+                }
+                if (simpleTypeReference.getSize() <= 32) {
+                    return "writeUnsignedLong(" + simpleTypeReference.getSize() + ", ((Number) " + fieldName + ").longValue())";
+                }
+                return "writeUnsignedBigInteger" + simpleTypeReference.getSize() + ", (BigInteger) " + fieldName + ")";
+            }
+            case INT: {
+                if (simpleTypeReference.getSize() <= 8) {
+                    return "writeByte(" + simpleTypeReference.getSize() + ", ((Number) " + fieldName + ").byteValue())";
+                }
+                if (simpleTypeReference.getSize() <= 16) {
+                    return "writeShort(" + simpleTypeReference.getSize() + ", ((Number) " + fieldName + ").shortValue())";
+                }
+                if (simpleTypeReference.getSize() <= 32) {
+                    return "writeInt(" + simpleTypeReference.getSize() + ", ((Number) " + fieldName + ").intValue())";
+                }
+                if (simpleTypeReference.getSize() <= 64) {
+                    return "writeLong(" + simpleTypeReference.getSize() + ", ((Number) " + fieldName + ").longValue())";
+                }
+                return "writeBigInteger(" + simpleTypeReference.getSize() + ", (BigInteger) " + fieldName + ")";
+            }
+            case FLOAT: {
+                if (simpleTypeReference.getSize() <= 32) {
+                    return "writeFloat(" + simpleTypeReference.getSize() + ", (float) " + fieldName + ")";
+                }
+                if (simpleTypeReference.getSize() <= 64) {
+                    return "writeDouble(" + simpleTypeReference.getSize() + ", (double) " + fieldName + ")";
+                }
+                return "writeBigDecimal(" + simpleTypeReference.getSize() + ", (BigDecimal) " + fieldName + ")";
+            }
+            case STRING: {
+                return "writeString(" + simpleTypeReference.getSize() + ", (String) " + fieldName + ")";
+            }
+        }
+        return "Hurz";
+    }
+
+    public String getReadMethodName(SimpleTypeReference simpleTypeReference) {
+        String languageTypeName = getLanguageTypeNameForSpecType(simpleTypeReference);
+        languageTypeName = languageTypeName.substring(0, 1).toUpperCase() + languageTypeName.substring(1);
+        if(simpleTypeReference.getBaseType().equals(SimpleTypeReference.SimpleBaseType.UINT)) {
+            return "readUnsigned" + languageTypeName;
+        } else {
+            return "read" + languageTypeName;
+
+        }
+    }
+
+    public Collection<ComplexTypeReference> getComplexTypes(ComplexTypeDefinition complexTypeDefinition) {
+        Map<String, ComplexTypeReference> types = new HashMap<>();
+        for (Field field : complexTypeDefinition.getFields()) {
+            if(field instanceof TypedField) {
+                TypedField typedField = (TypedField) field;
+                if(typedField.getType() instanceof ComplexTypeReference) {
+                    ComplexTypeReference complexTypeReference = (ComplexTypeReference) typedField.getType();
+                    types.put(complexTypeReference.getName(),  complexTypeReference);
+                }
+            } else if(field instanceof SwitchField) {
+                SwitchField switchField = (SwitchField) field;
+                for (DiscriminatedComplexTypeDefinition cas : switchField.getCases()) {
+                    types.put(cas.getName(), new ComplexTypeReference() {
+                        @Override
+                        public String getName() {
+                            return cas.getName();
+                        }
+                    });
+                }
+            }
+        }
+        return types.values();
+    }
+
+    public Collection<ComplexTypeReference> getEnumTypes(ComplexTypeDefinition complexTypeDefinition) {
+        Map<String, ComplexTypeReference> types = new HashMap<>();
+        for (Field field : complexTypeDefinition.getFields()) {
+            if(field instanceof EnumField) {
+                EnumField enumField = (EnumField) field;
+                if(enumField.getType() instanceof ComplexTypeReference) {
+                    ComplexTypeReference complexTypeReference = (ComplexTypeReference) enumField.getType();
+                    types.put(complexTypeReference.getName(),  complexTypeReference);
+                }
+            }
+        }
+        for (Field field : complexTypeDefinition.getParentPropertyFields()) {
+            if(field instanceof EnumField) {
+                EnumField enumField = (EnumField) field;
+                if(enumField.getType() instanceof ComplexTypeReference) {
+                    ComplexTypeReference complexTypeReference = (ComplexTypeReference) enumField.getType();
+                    types.put(complexTypeReference.getName(),  complexTypeReference);
+                }
+            }
+        }
+        return types.values();
+    }
+
+    public boolean isSimpleType(TypeReference typeReference) {
+        return typeReference instanceof SimpleTypeReference;
+    }
+
+    public boolean isDiscriminatedType(TypeDefinition typeDefinition) {
+        return typeDefinition instanceof DiscriminatedComplexTypeDefinition;
+    }
+
+    public boolean isCountArray(ArrayField arrayField) {
+        return arrayField.getLoopType() == ArrayField.LoopType.COUNT;
+    }
+
+    public boolean isLengthArray(ArrayField arrayField) {
+        return arrayField.getLoopType() == ArrayField.LoopType.LENGTH;
+    }
+
+    public boolean isTerminatedArray(ArrayField arrayField) {
+        return arrayField.getLoopType() == ArrayField.LoopType.TERMINATED;
+    }
+
+    public boolean isCountArray(ManualArrayField arrayField) {
+        return arrayField.getLoopType() == ManualArrayField.LoopType.COUNT;
+    }
+
+    public boolean isLengthArray(ManualArrayField arrayField) {
+        return arrayField.getLoopType() == ManualArrayField.LoopType.LENGTH;
+    }
+
+    public boolean isTerminatedArray(ManualArrayField arrayField) {
+        return arrayField.getLoopType() == ManualArrayField.LoopType.TERMINATED;
+    }
+
+    public String toSwitchExpression(String expression) {
+        StringBuilder sb = new StringBuilder();
+        Pattern pattern = Pattern.compile("([^\\.]*)\\.([a-zA-Z\\d]+)(.*)");
+        Matcher matcher;
+        while ((matcher = pattern.matcher(expression)).matches()) {
+            String prefix = matcher.group(1);
+            String middle = matcher.group(2);
+            sb.append(prefix).append(".get").append(WordUtils.capitalize(middle)).append("()");
+            expression = matcher.group(3);
+        }
+        sb.append(expression);
+        return sb.toString();
+    }
+
+    public String toDeserializationExpression(Term term, Argument[] parserArguments) {
+        return toExpression(term, term1 -> toVariableDeserializationExpression(term1, parserArguments));
+    }
+
+    public String toSerializationExpression(Term term, Argument[] parserArguments) {
+        return toExpression(term, term1 -> toVariableSerializationExpression(term1, parserArguments));
+    }
+
+    private String toExpression(Term term, Function<Term, String> variableExpressionGenerator) {
+        if(term == null) {
+            return "";
+        }
+        if(term instanceof Literal) {
+            if(term instanceof NullLiteral) {
+                return "null";
+            } else if(term instanceof BooleanLiteral) {
+                return Boolean.toString(((BooleanLiteral) term).getValue());
+            } else if(term instanceof NumericLiteral) {
+                return ((NumericLiteral) term).getNumber().toString();
+            } else if(term instanceof StringLiteral) {
+                return "\"" + ((StringLiteral) term).getValue() + "\"";
+            } else if(term instanceof VariableLiteral) {
+                return variableExpressionGenerator.apply(term);
+            } else {
+                throw new RuntimeException("Unsupported Literal type " + term.getClass().getName());
+            }
+        } else if (term instanceof UnaryTerm) {
+            UnaryTerm ut = (UnaryTerm) term;
+            Term a = ut.getA();
+            switch(ut.getOperation()) {
+                case "!":
+                    return "!(" + toExpression(a, variableExpressionGenerator) + ")";
+                case "-":
+                    return "-(" + toExpression(a, variableExpressionGenerator) + ")";
+                case "()":
+                    return "(" + toExpression(a, variableExpressionGenerator) + ")";
+                default:
+                    throw new RuntimeException("Unsupported unary operation type " + ut.getOperation());
+            }
+        } else if (term instanceof BinaryTerm) {
+            BinaryTerm bt = (BinaryTerm) term;
+            Term a = bt.getA();
+            Term b = bt.getB();
+            String operation = bt.getOperation();
+            return "(" + toExpression(a, variableExpressionGenerator) + ") " + operation + " (" + toExpression(b, variableExpressionGenerator) + ")";
+        } else if (term instanceof TernaryTerm) {
+            TernaryTerm tt = (TernaryTerm) term;
+            if("if".equals(tt.getOperation())) {
+                Term a = tt.getA();
+                Term b = tt.getB();
+                Term c = tt.getC();
+                return "((" +  toExpression(a, variableExpressionGenerator) + ") ? " + toExpression(b, variableExpressionGenerator) + " : " + toExpression(c, variableExpressionGenerator) + ")";
+            } else {
+                throw new RuntimeException("Unsupported ternary operation type " + tt.getOperation());
+            }
+        } else {
+            throw new RuntimeException("Unsupported Term type " + term.getClass().getName());
+        }
+    }
+
+    private String toVariableDeserializationExpression(Term term, Argument[] parserArguments) {
+        VariableLiteral vl = (VariableLiteral) term;
+        // CAST expressions are special as we need to add a ".class" to the second parameter in Java.
+        if("CAST".equals(vl.getName())) {
+            StringBuilder sb = new StringBuilder(vl.getName());
+            if((vl.getArgs() == null) || (vl.getArgs().size() != 2)) {
+                throw new RuntimeException("A CAST expression expects exactly two arguments.");
+            }
+            sb.append("(").append(toVariableDeserializationExpression(vl.getArgs().get(0), parserArguments))
+                .append(", ").append(((VariableLiteral) vl.getArgs().get(1)).getName()).append(".class)");
+            return sb.toString() + ((vl.getChild() != null) ? "." + toVariableExpressionRest(vl.getChild()) : "");
+        }
+        else if("STATIC_CALL".equals(vl.getName())) {
+            StringBuilder sb = new StringBuilder();
+            if(!(vl.getArgs().get(0) instanceof StringLiteral)) {
+                throw new RuntimeException("Expecting the first argument of a 'STATIC_CALL' to be a StringLiteral");
+            }
+            String methodName = ((StringLiteral) vl.getArgs().get(0)).getValue();
+            methodName = methodName.substring(1, methodName.length() - 1);
+            sb.append(methodName).append("(");
+            for(int i = 1; i < vl.getArgs().size(); i++) {
+                Term arg = vl.getArgs().get(i);
+                if(i > 1) {
+                    sb.append(", ");
+                }
+                if(arg instanceof VariableLiteral) {
+                    VariableLiteral va = (VariableLiteral) arg;
+                    // "io" is the default name of the reader argument which is always available.
+                    boolean isDeserializerArg = "io".equals(va.getName());
+                    if(parserArguments != null) {
+                        for (Argument parserArgument : parserArguments) {
+                            if (parserArgument.getName().equals(va.getName())) {
+                                isDeserializerArg = true;
+                                break;
+                            }
+                        }
+                    }
+                    if(isDeserializerArg) {
+                        sb.append(va.getName() + ((va.getChild() != null) ? "." + toVariableExpressionRest(va.getChild()) : ""));
+                    } else {
+                        sb.append(toVariableDeserializationExpression(va, null));
+                    }
+                } else if(arg instanceof StringLiteral) {
+                    sb.append(((StringLiteral) arg).getValue());
+                }
+            }
+            sb.append(")");
+            return sb.toString();
+        }
+        // All uppercase names are not fields, but utility methods.
+        else if(vl.getName().equals(vl.getName().toUpperCase())) {
+            StringBuilder sb = new StringBuilder(vl.getName());
+            if(vl.getArgs() != null) {
+                sb.append("(");
+                boolean firstArg = true;
+                for(Term arg : vl.getArgs()) {
+                    if(!firstArg) {
+                        sb.append(", ");
+                    }
+                    sb.append(toVariableDeserializationExpression(arg, parserArguments));
+                    firstArg = false;
+                }
+                sb.append(")");
+            }
+            if(vl.getIndex() != VariableLiteral.NO_INDEX) {
+                sb.append("[").append(vl.getIndex()).append("]");
+            }
+            return sb.toString() + ((vl.getChild() != null) ? "." + toVariableExpressionRest(vl.getChild()) : "");
+        }
+        return vl.getName() + ((vl.getChild() != null) ? "." + toVariableExpressionRest(vl.getChild()) : "");
+    }
+
+    private String toVariableSerializationExpression(Term term, Argument[] parserArguments) {
+        VariableLiteral vl = (VariableLiteral) term;
+        if("STATIC_CALL".equals(vl.getName())) {
+            StringBuilder sb = new StringBuilder();
+            if(!(vl.getArgs().get(0) instanceof StringLiteral)) {
+                throw new RuntimeException("Expecting the first argument of a 'STATIC_CALL' to be a StringLiteral");
+            }
+            String methodName = ((StringLiteral) vl.getArgs().get(0)).getValue();
+            methodName = methodName.substring(1, methodName.length() - 1);
+            sb.append(methodName).append("(");
+            for(int i = 1; i < vl.getArgs().size(); i++) {
+                Term arg = vl.getArgs().get(i);
+                if(i > 1) {
+                    sb.append(", ");
+                }
+                if(arg instanceof VariableLiteral) {
+                    VariableLiteral va = (VariableLiteral) arg;
+                    // "io" and "value" are always available in every parser.
+                    boolean isSerializerArg = "io".equals(va.getName()) || "value".equals(va.getName()) || "element".equals(va.getName());
+                    if(parserArguments != null) {
+                        for (Argument parserArgument : parserArguments) {
+                            if (parserArgument.getName().equals(va.getName())) {
+                                isSerializerArg = true;
+                                break;
+                            }
+                        }
+                    }
+                    if(isSerializerArg) {
+                        sb.append(va.getName() + ((va.getChild() != null) ? "." + toVariableExpressionRest(va.getChild()) : ""));
+                    } else {
+                        sb.append(toVariableSerializationExpression(va, null));
+                    }
+                } else if(arg instanceof StringLiteral) {
+                    sb.append(((StringLiteral) arg).getValue());
+                }
+            }
+            sb.append(")");
+            return sb.toString();
+        }
+        // All uppercase names are not fields, but utility methods.
+        else if(vl.getName().equals(vl.getName().toUpperCase())) {
+            StringBuilder sb = new StringBuilder(vl.getName());
+            if(vl.getArgs() != null) {
+                sb.append("(");
+                boolean firstArg = true;
+                for(Term arg : vl.getArgs()) {
+                    if(!firstArg) {
+                        sb.append(", ");
+                    }
+
+                    if(arg instanceof VariableLiteral) {
+                        VariableLiteral va = (VariableLiteral) arg;
+                        boolean isSerializerArg = false;
+                        if(parserArguments != null) {
+                            for (Argument parserArgument : parserArguments) {
+                                if (parserArgument.getName().equals(va.getName())) {
+                                    isSerializerArg = true;
+                                    break;
+                                }
+                            }
+                        }
+                        if(isSerializerArg) {
+                            sb.append(va.getName() + ((va.getChild() != null) ? "." + toVariableExpressionRest(va.getChild()) : ""));
+                        } else {
+                            sb.append(toVariableSerializationExpression(va, null));
+                        }
+                    } else if(arg instanceof StringLiteral) {
+                        sb.append(((StringLiteral) arg).getValue());
+                    }
+                    firstArg = false;
+                }
+                sb.append(")");
+            }
+            return sb.toString();
+        }
+        boolean isSerializerArg = false;
+        if(parserArguments != null) {
+            for (Argument parserArgument : parserArguments) {
+                if (parserArgument.getName().equals(vl.getName())) {
+                    isSerializerArg = true;
+                    break;
+                }
+            }
+        }
+        if(isSerializerArg) {
+            return vl.getName() + ((vl.getChild() != null) ? "." + toVariableExpressionRest(vl.getChild()) : "");
+        } else {
+            return "value." + toVariableExpressionRest(vl);
+        }
+    }
+
+    private String toVariableExpressionRest(VariableLiteral vl) {
+        return "get" + WordUtils.capitalize(vl.getName()) + "()" + ((vl.isIndexed() ? "[" + vl.getIndex() + "]" : "") +
+            ((vl.getChild() != null) ? "." + toVariableExpressionRest(vl.getChild()) : ""));
+    }
+
+    public String escapeValue(TypeReference typeReference, String valueString) {
+        if(valueString == null) {
+            return null;
+        }
+        if(typeReference instanceof SimpleTypeReference) {
+            SimpleTypeReference simpleTypeReference = (SimpleTypeReference) typeReference;
+            switch (simpleTypeReference.getBaseType()) {
+                case UINT:
+                case INT:
+                    // If it's a one character string and is numeric, output it as char.
+                    if(!NumberUtils.isParsable(valueString) && (valueString.length() == 1)) {
+                        return "'" + valueString + "'";
+                    }
+                    break;
+                case STRING:
+                    return "\"" + valueString + "\"";
+            }
+        }
+        return valueString;
+    }
+
+    public SimpleTypeReference getEnumBaseType(TypeReference enumType) {
+        if(!(enumType instanceof ComplexTypeReference)) {
+            throw new RuntimeException("type reference for enum types must be of type complex type");
+        }
+        ComplexTypeReference complexType = (ComplexTypeReference) enumType;
+        EnumTypeDefinition enumTypeDefinition = (EnumTypeDefinition) types.get(complexType.getName());
+        return (SimpleTypeReference) enumTypeDefinition.getType();
+    }
+
+}
diff --git a/build-utils/language-java/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.language.LanguageOutput b/build-utils/language-java/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.language.LanguageOutput
index 924bc01486b..4c441df1e11 100644
--- a/build-utils/language-java/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.language.LanguageOutput
+++ b/build-utils/language-java/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.language.LanguageOutput
@@ -1,19 +1,19 @@
-#
-# 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
-#
-#     http://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.
-#
-org.apache.plc4x.language.java.JavaLanguageOutput
+#
+# 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
+#
+#     http://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.
+#
+org.apache.plc4x.language.java.JavaLanguageOutput
diff --git a/build-utils/language-java/src/main/resources/templates/java/enum-template.ftlh b/build-utils/language-java/src/main/resources/templates/java/enum-template.ftlh
index 62c4f34a447..166c30e8f5c 100644
--- a/build-utils/language-java/src/main/resources/templates/java/enum-template.ftlh
+++ b/build-utils/language-java/src/main/resources/templates/java/enum-template.ftlh
@@ -1,99 +1,99 @@
-<#--
-  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
-
-      http://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.
--->
-${helper.packageName(protocolName, languageName, outputFlavor)?replace(".", "/")}/types/${typeName}.java
-/*
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-*/
-
-package ${helper.packageName(protocolName, languageName, outputFlavor)}.types;
-
-import org.apache.plc4x.java.utils.Message;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public enum ${typeName} {
-
-<#list type.enumValues as enumValue>
-    ${enumValue.name}((${helper.getLanguageTypeName(type.type, true)}) ${enumValue.value}<#if type.constantNames?has_content>, <#list type.constantNames as constantName>(${helper.getLanguageTypeName(type.getConstantType(constantName), true)}) ${helper.escapeValue(type.getConstantType(constantName), enumValue.getConstant(constantName))?no_esc}<#sep>, </#sep></#list></#if>)<#sep>,
-</#sep></#list>;
-
-    private static final Logger logger = LoggerFactory.getLogger(${typeName}.class);
-
-    private static final Map<${helper.getLanguageTypeName(type.type, false)}, ${typeName}> map;
-    static {
-        map = new HashMap<>();
-        for (${typeName} value : ${typeName}.values()) {
-            map.put((${helper.getLanguageTypeName(type.type, true)}) value.getValue(), value);
-        }
-    }
-
-    private ${helper.getLanguageTypeName(type.type, true)} value;
-    <#if type.constantNames?has_content>
-        <#list type.constantNames as constantName>
-    private ${helper.getLanguageTypeName(type.getConstantType(constantName), true)} ${constantName};
-        </#list>
-    </#if>
-
-    ${typeName}(${helper.getLanguageTypeName(type.type, true)} value<#if type.constantNames?has_content>, <#list type.constantNames as constantName>${helper.getLanguageTypeName(type.getConstantType(constantName), true)} ${constantName}<#sep>, </#sep></#list></#if>) {
-        this.value = value;
-        <#if type.constantNames?has_content>
-            <#list type.constantNames as constantName>
-        this.${constantName} = ${constantName};
-            </#list>
-        </#if>
-    }
-
-    public ${helper.getLanguageTypeName(type.type, true)} getValue() {
-        return value;
-    }
-
-    <#if type.constantNames?has_content>
-        <#list type.constantNames as constantName>
-    public ${helper.getLanguageTypeName(type.getConstantType(constantName), true)} get${constantName?cap_first}() {
-        return ${constantName};
-    }
-
-        </#list>
-    </#if>
-    public static ${typeName} valueOf(${helper.getLanguageTypeName(type.type, true)} value) {
-        if (!map.containsKey(value)) {
-            logger.error("No ${typeName} for value {}", value);
-        }
-        return map.get(value);
-    }
-
+<#--
+  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
+
+      http://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.
+-->
+${helper.packageName(protocolName, languageName, outputFlavor)?replace(".", "/")}/types/${typeName}.java
+/*
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+*/
+
+package ${helper.packageName(protocolName, languageName, outputFlavor)}.types;
+
+import org.apache.plc4x.java.utils.Message;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum ${typeName} {
+
+<#list type.enumValues as enumValue>
+    ${enumValue.name}((${helper.getLanguageTypeName(type.type, true)}) ${enumValue.value}<#if type.constantNames?has_content>, <#list type.constantNames as constantName>(${helper.getLanguageTypeName(type.getConstantType(constantName), true)}) ${helper.escapeValue(type.getConstantType(constantName), enumValue.getConstant(constantName))?no_esc}<#sep>, </#sep></#list></#if>)<#sep>,
+</#sep></#list>;
+
+    private static final Logger logger = LoggerFactory.getLogger(${typeName}.class);
+
+    private static final Map<${helper.getLanguageTypeName(type.type, false)}, ${typeName}> map;
+    static {
+        map = new HashMap<>();
+        for (${typeName} value : ${typeName}.values()) {
+            map.put((${helper.getLanguageTypeName(type.type, true)}) value.getValue(), value);
+        }
+    }
+
+    private ${helper.getLanguageTypeName(type.type, true)} value;
+    <#if type.constantNames?has_content>
+        <#list type.constantNames as constantName>
+    private ${helper.getLanguageTypeName(type.getConstantType(constantName), true)} ${constantName};
+        </#list>
+    </#if>
+
+    ${typeName}(${helper.getLanguageTypeName(type.type, true)} value<#if type.constantNames?has_content>, <#list type.constantNames as constantName>${helper.getLanguageTypeName(type.getConstantType(constantName), true)} ${constantName}<#sep>, </#sep></#list></#if>) {
+        this.value = value;
+        <#if type.constantNames?has_content>
+            <#list type.constantNames as constantName>
+        this.${constantName} = ${constantName};
+            </#list>
+        </#if>
+    }
+
+    public ${helper.getLanguageTypeName(type.type, true)} getValue() {
+        return value;
+    }
+
+    <#if type.constantNames?has_content>
+        <#list type.constantNames as constantName>
+    public ${helper.getLanguageTypeName(type.getConstantType(constantName), true)} get${constantName?cap_first}() {
+        return ${constantName};
+    }
+
+        </#list>
+    </#if>
+    public static ${typeName} valueOf(${helper.getLanguageTypeName(type.type, true)} value) {
+        if (!map.containsKey(value)) {
+            logger.error("No ${typeName} for value {}", value);
+        }
+        return map.get(value);
+    }
+
 }
\ No newline at end of file
diff --git a/build-utils/language-java/src/main/resources/templates/java/io-template.ftlh b/build-utils/language-java/src/main/resources/templates/java/io-template.ftlh
index b71893558b9..c028e1c6f72 100644
--- a/build-utils/language-java/src/main/resources/templates/java/io-template.ftlh
+++ b/build-utils/language-java/src/main/resources/templates/java/io-template.ftlh
@@ -1,432 +1,432 @@
-<#--
-  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
-
-      http://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.
--->
-${helper.packageName(protocolName, languageName, outputFlavor)?replace(".", "/")}/io/${typeName}IO.java
-/*
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-*/
-
-package ${helper.packageName(protocolName, languageName, outputFlavor)}.io;
-
-import ${helper.packageName(protocolName, languageName, outputFlavor)}.*;
-<#if helper.getComplexTypes(type)?has_content>import ${helper.packageName(protocolName, languageName, outputFlavor)}.io.*;</#if>
-<#if helper.getEnumTypes(type)?has_content>import ${helper.packageName(protocolName, languageName, outputFlavor)}.types.*;</#if>
-import org.apache.plc4x.java.utils.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.*;
-
-public class ${typeName}IO {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(${typeName}IO.class);
-
-    public static ${typeName}<#if helper.isDiscriminatedType(type)>Builder</#if> parse(ReadBuffer io<#if type.parserArguments?has_content>, <#list type.parserArguments as parserArgument>${helper.getLanguageTypeName(parserArgument.type, false)} ${parserArgument.name}<#sep>, </#sep></#list></#if>) throws ParseException {
-        int startPos = io.getPos();
-        int curPos;
-<#list type.fields as field>
-<#switch field.typeName>
-    <#case "array">
-
-        // Array field (${field.name})
-        <#-- Only update curPos if the length expression uses it -->
-        <#if field.loopExpression.contains("curPos")>
-        curPos = io.getPos() - startPos;
-        </#if>
-        <#-- If this is a count array, we can directly initialize an array with the given size -->
-        <#if helper.isCountArray(field)>
-        // Count array
-        int _${field.name}Count = ${helper.toDeserializationExpression(field.loopExpression, type.parserArguments)?no_esc};
-        ${helper.getLanguageTypeNameForField(field)}[] ${field.name} = new ${helper.getLanguageTypeNameForField(field)}[_${field.name}Count];
-        for(int i = 0; i < _${field.name}Count; i++) {
-            ${field.name}[i] = <#if helper.isSimpleType(field.type)>io.${helper.getReadBufferReadMethodCall(field.type)}<#else>${field.type.name}IO.parse(io<#if field.params?has_content>, <#list field.params as parserArgument>(${helper.getArgumentType(field.type, parserArgument?index)}) (${helper.toDeserializationExpression(parserArgument, type.parserArguments)?no_esc})<#sep>, </#sep></#list></#if>)</#if>;
-        }
-        <#-- In all other cases do we have to work with a list, that is later converted to an array -->
-        <#else>
-            <#-- For a length array, we read data till the read position of the buffer reaches a given position -->
-            <#if helper.isLengthArray(field)>
-        // Length array
-        int _${field.name}Length = ${helper.toDeserializationExpression(field.loopExpression, type.parserArguments)?no_esc};
-        List<${helper.getNonPrimitiveLanguageTypeNameForField(field)}> _${field.name}List = new LinkedList<>();
-        int ${field.name}EndPos = io.getPos() + _${field.name}Length;
-        while(io.getPos() < ${field.name}EndPos) {
-            _${field.name}List.add(<#if helper.isSimpleType(field.type)>io.${helper.getReadBufferReadMethodCall(field.type)}<#else>${field.type.name}IO.parse(io<#if field.params?has_content>, <#list field.params as parserArgument>(${helper.getArgumentType(field.type, parserArgument?index)}) (${helper.toDeserializationExpression(parserArgument, type.parserArguments)?no_esc})<#sep>, </#sep></#list></#if>)</#if>);
-            <#-- After parsing, update the current position, but only if it's needed -->
-            <#if field.loopExpression.contains("curPos")>
-            curPos = io.getPos() - startPos;
-            </#if>
-        }
-            <#-- A terminated array keeps on reading data as long as the termination expression evaluates to false -->
-            <#elseif helper.isTerminatedArray(field)>
-        // Terminated array
-        List<${helper.getNonPrimitiveLanguageTypeNameForField(field)}> _${field.name}List = new LinkedList<>();
-        while(!((boolean) (${helper.toDeserializationExpression(field.loopExpression, type.parserArguments)?no_esc}))) {
-            _${field.name}List.add(<#if helper.isSimpleType(field.type)>io.${helper.getReadBufferReadMethodCall(field.type)}<#else>${field.type.name}IO.parse(io<#if field.params?has_content>, <#list field.params as parserArgument>(${helper.getArgumentType(field.type, parserArgument?index)}) (${helper.toDeserializationExpression(parserArgument, type.parserArguments)?no_esc})<#sep>, </#sep></#list></#if>)</#if>);
-
-            <#-- After parsing, update the current position, but only if it's needed -->
-            <#if field.loopExpression.contains("curPos")>
-            curPos = io.getPos() - startPos;
-            </#if>
-        }
-            </#if>
-            <#--
-                Convert the list into an array. However if the array is of a primitive
-                type we have to iterate over it's elements and explicitly cast them.
-                Otherwise a simple toArray call is fine.
-            -->
-            <#if helper.isSimpleType(field.type)>
-        ${helper.getLanguageTypeNameForField(field)}[] ${field.name} = new ${helper.getLanguageTypeNameForField(field)}[_${field.name}List.size()];
-        for(int i = 0; i < _${field.name}List.size(); i++) {
-            ${field.name}[i] = (${helper.getLanguageTypeNameForField(field)}) _${field.name}List.get(i);
-        }
-            <#else>
-        ${helper.getLanguageTypeNameForField(field)}[] ${field.name} = _${field.name}List.toArray(new ${helper.getNonPrimitiveLanguageTypeNameForField(field)}[0]);
-            </#if>
-        </#if>
-        <#break>
-    <#case "checksum">
-
-        // Checksum Field (${field.name})
-        ${helper.getLanguageTypeNameForField(field)} ${field.name} = io.${helper.getReadMethodName(field.type)}(${field.type.size});
-        ${helper.getLanguageTypeNameForField(field)} _${field.name}Ref = (${helper.getLanguageTypeNameForField(field)}) (${helper.toDeserializationExpression(field.checksumExpression, type.parserArguments)});
-        if(${field.name} != _${field.name}Ref) {
-            throw new ParseException(String.format("Checksum verification failed. Expected %04X but got %04X",_${field.name}Ref & 0xFFFF, ${field.name} & 0xFFFF));
-        }
-        <#break>
-    <#case "const">
-
-        // Const Field (${field.name})
-        ${helper.getLanguageTypeNameForField(field)} ${field.name} = io.${helper.getReadMethodName(field.type)}(${field.type.size});
-        if(${field.name} != ${typeName}.${field.name?upper_case}) {
-            throw new ParseException("Expected constant value " + ${typeName}.${field.name?upper_case} + " but got " + ${field.name});
-        }
-        <#break>
-    <#case "enum">
-
-        // Enum field (${field.name})
-        ${helper.getLanguageTypeNameForField(field)} ${field.name} = ${helper.getLanguageTypeNameForField(field)}.valueOf(io.${helper.getReadMethodName(helper.getEnumBaseType(field.type))}(${helper.getEnumBaseType(field.type).size}));
-        <#break>
-    <#case "discriminator">
-
-        // Discriminator Field (${field.name}) (Used as input to a switch field)
-        ${helper.getLanguageTypeNameForField(field)} ${field.name} = io.${helper.getReadMethodName(field.type)}(${field.type.size});
-        <#break>
-    <#case "implicit">
-
-        // Implicit Field (${field.name}) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
-        ${helper.getLanguageTypeNameForField(field)} ${field.name} = io.${helper.getReadMethodName(field.type)}(${field.type.size});
-        <#break>
-    <#case "manualArray">
-
-        // Manual Array Field (${field.name})
-        <#-- Only update curPos if the length expression uses it -->
-        <#if field.loopExpression.contains("curPos")>
-        curPos = io.getPos() - startPos;
-        </#if>
-        <#-- If this is a count array, we can directly initialize an array with the given size -->
-        <#if helper.isCountArray(field)>
-        // Count array
-        int _${field.name}Count = ${helper.toDeserializationExpression(field.loopExpression, type.parserArguments)};
-        ${helper.getLanguageTypeNameForField(field)}[] ${field.name} = new ${helper.getLanguageTypeNameForField(field)}[_${field.name}Count];
-        for(int i = 0; i < _${field.name}Count; i++) {
-            ${field.name}[i] = (${helper.getLanguageTypeNameForField(field)}) (${helper.toDeserializationExpression(field.deserializationExpression, type.parserArguments)});
-        }
-        <#-- In all other cases do we have to work with a list, that is later converted to an array -->
-        <#else>
-            <#-- For a length array, we read data till the read position of the buffer reaches a given position -->
-            <#if helper.isLengthArray(field)>
-        // Length array
-        int _${field.name}Length = ${helper.toDeserializationExpression(field.loopExpression, type.parserArguments)};
-        List<${helper.getNonPrimitiveLanguageTypeNameForField(field)}> _${field.name}List = new LinkedList<>();
-        int ${field.name}EndPos = io.getPos() + _${field.name}Length;
-        while(io.getPos() < ${field.name}EndPos) {
-            _${field.name}List.add((${helper.getLanguageTypeNameForField(field)}) (${helper.toDeserializationExpression(field.deserializationExpression, type.parserArguments)}));
-            <#-- After parsing, update the current position, but only if it's needed -->
-            <#if field.loopExpression.contains("curPos")>
-            curPos = io.getPos() - startPos;
-            </#if>
-        }
-            <#-- A terminated array keeps on reading data as long as the termination expression evaluates to false -->
-            <#elseif helper.isTerminatedArray(field)>
-        // Terminated array
-        List<${helper.getNonPrimitiveLanguageTypeNameForField(field)}> _${field.name}List = new LinkedList<>();
-        while(!((boolean) (${helper.toDeserializationExpression(field.loopExpression, type.parserArguments)}))) {
-            _${field.name}List.add((${helper.getLanguageTypeNameForField(field)}) (${helper.toDeserializationExpression(field.deserializationExpression, type.parserArguments)}));
-
-            <#-- After parsing, update the current position, but only if it's needed -->
-            <#if field.loopExpression.contains("curPos")>
-            curPos = io.getPos() - startPos;
-            </#if>
-        }
-            </#if>
-            <#--
-                Convert the list into an array. However if the array is of a primitive
-                type we have to iterate over it's elements and explicitly cast them.
-                Otherwise a simple toArray call is fine.
-            -->
-            <#if helper.isSimpleType(field.type)>
-        ${helper.getLanguageTypeNameForField(field)}[] ${field.name} = new ${helper.getLanguageTypeNameForField(field)}[_${field.name}List.size()];
-        for(int i = 0; i < _${field.name}List.size(); i++) {
-            ${field.name}[i] = (${helper.getLanguageTypeNameForField(field)}) _${field.name}List.get(i);
-        }
-            <#else>
-        ${helper.getLanguageTypeNameForField(field)}[] ${field.name} = _${field.name}List.toArray(new ${helper.getNonPrimitiveLanguageTypeNameForField(field)}[0]);
-            </#if>
-        </#if>
-        <#break>
-    <#case "manual">
-
-        // Manual Field (${field.name})
-        ${helper.getLanguageTypeNameForField(field)} ${field.name} = (${helper.getLanguageTypeNameForField(field)}) (${helper.toDeserializationExpression(field.deserializationExpression, type.parserArguments)});
-        <#break>
-    <#case "optional">
-
-        // Optional Field (${field.name}) (Can be skipped, if a given expression evaluates to false)
-        <#if field.conditionExpression.contains("curPos")>
-        curPos = io.getPos() - startPos;
-        </#if>
-        ${helper.getLanguageTypeNameForField(field)} ${field.name} = null;
-        if(${helper.toDeserializationExpression(field.conditionExpression, type.parserArguments)?no_esc}) {
-            ${field.name} = <#if helper.isSimpleType(field.type)>io.${helper.getReadBufferReadMethodCall(field.type)}<#else>${field.type.name}IO.parse(io<#if field.params?has_content>, <#list field.params as parserArgument>(${helper.getArgumentType(field.type, parserArgument?index)}) (${helper.toDeserializationExpression(parserArgument, type.parserArguments)})<#sep>, </#sep></#list></#if>)</#if>;
-        }
-        <#break>
-    <#case "padding">
-
-        // Padding Field (${field.name})
-        boolean _${field.name}NeedsPadding = (boolean) (${helper.toDeserializationExpression(field.paddingCondition, type.parserArguments)});
-        if(_${field.name}NeedsPadding) {
-            // Just read the padding data and ignore it
-            io.${helper.getReadBufferReadMethodCall(field.type)};
-        }
-        <#break>
-    <#case "reserved">
-
-        // Reserved Field (Compartmentalized so the "reserved" variable can't leak)
-        {
-            ${helper.getLanguageTypeNameForField(field)} reserved = io.${helper.getReadBufferReadMethodCall(field.type)};
-            if(reserved != ${field.referenceValue}) {
-                LOGGER.info("Expected constant value " + ${field.referenceValue} + " but got " + reserved + " for reserved field.");
-            }
-        }
-        <#break>
-    <#case "simple">
-
-        // Simple Field (${field.name})
-        ${helper.getLanguageTypeNameForField(field)} ${field.name} = <#if helper.isSimpleType(field.type)>io.${helper.getReadBufferReadMethodCall(field.type)}<#else>${field.type.name}IO.parse(io<#if field.params?has_content>, <#list field.params as parserArgument>(${helper.getArgumentType(field.type, parserArgument?index)}) (${helper.toDeserializationExpression(parserArgument, type.parserArguments)})<#sep>, </#sep></#list></#if>)</#if>;
-        <#break>
-    <#case "switch">
-
-        // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
-        ${typeName}Builder builder = null;
-        <#list field.cases as case>
-        <#if case.discriminatorValues?has_content>if(<#list case.discriminatorValues as discriminatorValue>EvaluationHelper.equals(${helper.toSwitchExpression(field.discriminatorNames[discriminatorValue?index])}, ${discriminatorValue})<#sep> && </#sep></#list>) </#if>{
-            builder = ${case.name}IO.parse(io<#if case.parserArguments?has_content>, <#list case.parserArguments as parserArgument>${parserArgument.name}<#sep>, </#sep></#list></#if>);
-        }<#sep> else </#sep>
-        </#list>
-        if (builder == null) {
-            throw new ParseException("Unsupported case for discriminated type");
-        }
-        <#break>
-</#switch>
-</#list>
-
-        // Create the instance
-        <#if helper.isDiscriminatedType(type)>
-        return new ${typeName}Builder(<#list type.propertyFields as field>${field.name}<#sep>, </#sep></#list>);
-        <#elseif type.abstract>
-        return builder.build(<#list type.propertyFields as field>${field.name}<#sep>, </#sep></#list>);
-        <#else>
-        return new ${typeName}(<#list type.propertyFields as field>${field.name}<#sep>, </#sep></#list>);
-        </#if>
-    }
-
-<#if outputFlavor != "passive">
-    public static void serialize(WriteBuffer io, ${typeName} value) throws ParseException {
-<#list type.fields as field>
-<#switch field.typeName>
-    <#case "array">
-
-        // Array Field (${field.name})
-        if(value.get${field.name?cap_first}() != null) {
-            for(${helper.getLanguageTypeNameForField(field)} element : value.get${field.name?cap_first}()) {
-                <#if helper.isSimpleType(field.type)>
-                io.${helper.getWriteBufferReadMethodCall(field.type, "element")};
-                <#else>
-                ${field.type.name}IO.serialize(io, element);
-                </#if>
-            }
-        }
-        <#break>
-    <#case "checksum">
-
-        // Checksum Field (${field.name}) (Calculated)
-        ${helper.getLanguageTypeNameForField(field)} ${field.name} = (${helper.getLanguageTypeNameForField(field)}) (${helper.toSerializationExpression(field.checksumExpression, type.parserArguments)});
-        io.${helper.getWriteBufferReadMethodCall(field.type, "(" + field.name + ")")?no_esc};
-        <#break>
-    <#case "const">
-
-        // Const Field (${field.name})
-        io.${helper.getWriteBufferReadMethodCall(field.type, field.referenceValue)};
-        <#break>
-    <#case "discriminator">
-
-        // Discriminator Field (${field.name}) (Used as input to a switch field)
-        ${helper.getLanguageTypeNameForField(field)} ${field.name} = (${helper.getLanguageTypeNameForField(field)}) value.getDiscriminatorValues()[0];
-        io.${helper.getWriteBufferReadMethodCall(field.type, "(" + field.name + ")")};
-        <#break>
-    <#case "enum">
-
-        // Enum field (${field.name})
-        ${helper.getLanguageTypeNameForField(field)} ${field.name} = (${helper.getLanguageTypeNameForField(field)}) value.get${field.name?cap_first}();
-        io.${helper.getWriteBufferReadMethodCall(helper.getEnumBaseType(field.type), "(" + field.name + ".getValue())")};
-        <#break>
-    <#case "implicit">
-
-        // Implicit Field (${field.name}) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
-        ${helper.getLanguageTypeNameForField(field)} ${field.name} = (${helper.getLanguageTypeNameForField(field)}) (${helper.toSerializationExpression(field.serializationExpression, type.parserArguments)});
-        io.${helper.getWriteBufferReadMethodCall(field.type, "(" + field.name + ")")?no_esc};
-        <#break>
-    <#case "manualArray">
-
-        // Manual Array Field (${field.name})
-        if(value.get${field.name?cap_first}() != null) {
-            for(${helper.getLanguageTypeNameForField(field)} element : value.get${field.name?cap_first}()) {
-                ${helper.toSerializationExpression(field.serializationExpression, type.parserArguments)};
-            }
-        }
-        <#break>
-    <#case "manual">
-
-        // Manual Field (${field.name})
-        ${helper.getLanguageTypeNameForField(field)} ${field.name} = (${helper.getLanguageTypeNameForField(field)}) (${helper.toSerializationExpression(field.serializationExpression, type.parserArguments)});
-         io.${helper.getWriteBufferReadMethodCall(field.type, "(" + field.name + ")")?no_esc};
-       <#break>
-    <#case "optional">
-
-        // Optional Field (${field.name}) (Can be skipped, if the value is null)
-        ${helper.getLanguageTypeNameForField(field)} ${field.name} = null;
-        if(value.get${field.name?cap_first}() != null) {
-            ${field.name} = (${helper.getLanguageTypeNameForField(field)}) value.get${field.name?cap_first}();
-            <#if helper.isSimpleType(field.type)>
-            io.${helper.getWriteBufferReadMethodCall(field.type, "(" + field.name + ")")};
-            <#else>
-            ${field.type.name}IO.serialize(io, ${field.name});
-            </#if>
-        }
-        <#break>
-    <#case "padding">
-
-        // Padding Field (${field.name})
-        boolean _${field.name}NeedsPadding = (boolean) (${helper.toSerializationExpression(field.paddingCondition, type.parserArguments)});
-        if(_${field.name}NeedsPadding) {
-            ${helper.getLanguageTypeNameForField(field)} _${field.name}PaddingValue = (${helper.getLanguageTypeNameForField(field)}) (${helper.toSerializationExpression(field.paddingValue, type.parserArguments)});
-            io.${helper.getWriteBufferReadMethodCall(field.type, "(_" + field.name + "PaddingValue)")?no_esc};
-        }
-        <#break>
-    <#case "reserved">
-
-        // Reserved Field
-        io.${helper.getWriteBufferReadMethodCall(field.type, field.referenceValue)};
-        <#break>
-    <#case "simple">
-
-        // Simple Field (${field.name})
-        ${helper.getLanguageTypeNameForField(field)} ${field.name} = (${helper.getLanguageTypeNameForField(field)}) value.get${field.name?cap_first}();
-        <#if helper.isSimpleType(field.type)>
-        io.${helper.getWriteBufferReadMethodCall(field.type, "(" + field.name + ")")};
-        <#else>
-        ${field.type.name}IO.serialize(io, ${field.name});
-        </#if>
-        <#break>
-    <#case "switch">
-
-        // Switch field (Depending on the discriminator values, passes the instantiation to a sub-type)
-        <#list field.cases as case>
-        if(value instanceof ${case.name}) {
-            ${case.name}IO.serialize(io, (${case.name}) value);
-        }<#sep> else </#sep>
-        </#list>
-        <#break>
-</#switch>
-</#list>
-    }
-</#if>
-
-    private static int COUNT(Object obj) {
-        if(obj.getClass().isArray()) {
-            Object[] arr = (Object[]) obj;
-            return arr.length;
-        } else if(obj instanceof Collection) {
-            Collection col = (Collection) obj;
-            return col.size();
-        }
-        throw new RuntimeException("Unable to count object of type " + obj.getClass().getName());
-    }
-
-    private static <T> T CAST(Object obj, Class<T> clazz) {
-        try {
-            return clazz.cast(obj);
-        } catch(ClassCastException e) {
-            throw new RuntimeException("Unable to cast object of type " + obj.getClass().getName() + " to " + clazz.getName());
-        }
-    }
-
-<#if type.abstract>
-    public static interface ${typeName}Builder {
-        ${typeName} build(<#list type.propertyFields as field>${helper.getLanguageTypeNameForField(field)}<#if field.loopType??>[]</#if> ${field.name}<#sep>, </#sep></#list>);
-    }
-
-</#if>
-<#if helper.isDiscriminatedType(type)>
-    public static class ${typeName}Builder implements ${type.parentType.name}IO.${type.parentType.name}Builder {
-        <#if type.propertyFields?has_content>
-        <#list type.propertyFields as field>
-        private final ${helper.getLanguageTypeNameForField(field)}<#if field.loopType??>[]</#if> ${field.name};
-        </#list>
-        </#if>
-
-        public ${typeName}Builder(<#list type.propertyFields as field>${helper.getLanguageTypeNameForField(field)}<#if field.loopType??>[]</#if> ${field.name}<#sep>, </#sep></#list>) {
-            <#list type.propertyFields as field>
-            this.${field.name} = ${field.name};
-            </#list>
-        }
-
-        public ${typeName} build(<#list type.parentType.propertyFields as field>${helper.getLanguageTypeNameForField(field)}<#if field.loopType??>[]</#if> ${field.name}<#sep>, </#sep></#list>) {
-            return new ${typeName}(<#list type.getAllPropertyFields() as field>${field.name}<#sep>, </#sep></#list>);
-        }
-    }
-
-</#if>
+<#--
+  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
+
+      http://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.
+-->
+${helper.packageName(protocolName, languageName, outputFlavor)?replace(".", "/")}/io/${typeName}IO.java
+/*
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+*/
+
+package ${helper.packageName(protocolName, languageName, outputFlavor)}.io;
+
+import ${helper.packageName(protocolName, languageName, outputFlavor)}.*;
+<#if helper.getComplexTypes(type)?has_content>import ${helper.packageName(protocolName, languageName, outputFlavor)}.io.*;</#if>
+<#if helper.getEnumTypes(type)?has_content>import ${helper.packageName(protocolName, languageName, outputFlavor)}.types.*;</#if>
+import org.apache.plc4x.java.utils.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.*;
+
+public class ${typeName}IO {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(${typeName}IO.class);
+
+    public static ${typeName}<#if helper.isDiscriminatedType(type)>Builder</#if> parse(ReadBuffer io<#if type.parserArguments?has_content>, <#list type.parserArguments as parserArgument>${helper.getLanguageTypeName(parserArgument.type, false)} ${parserArgument.name}<#sep>, </#sep></#list></#if>) throws ParseException {
+        int startPos = io.getPos();
+        int curPos;
+<#list type.fields as field>
+<#switch field.typeName>
+    <#case "array">
+
+        // Array field (${field.name})
+        <#-- Only update curPos if the length expression uses it -->
+        <#if field.loopExpression.contains("curPos")>
+        curPos = io.getPos() - startPos;
+        </#if>
+        <#-- If this is a count array, we can directly initialize an array with the given size -->
+        <#if helper.isCountArray(field)>
+        // Count array
+        int _${field.name}Count = ${helper.toDeserializationExpression(field.loopExpression, type.parserArguments)?no_esc};
+        ${helper.getLanguageTypeNameForField(field)}[] ${field.name} = new ${helper.getLanguageTypeNameForField(field)}[_${field.name}Count];
+        for(int i = 0; i < _${field.name}Count; i++) {
+            ${field.name}[i] = <#if helper.isSimpleType(field.type)>io.${helper.getReadBufferReadMethodCall(field.type)}<#else>${field.type.name}IO.parse(io<#if field.params?has_content>, <#list field.params as parserArgument>(${helper.getArgumentType(field.type, parserArgument?index)}) (${helper.toDeserializationExpression(parserArgument, type.parserArguments)?no_esc})<#sep>, </#sep></#list></#if>)</#if>;
+        }
+        <#-- In all other cases do we have to work with a list, that is later converted to an array -->
+        <#else>
+            <#-- For a length array, we read data till the read position of the buffer reaches a given position -->
+            <#if helper.isLengthArray(field)>
+        // Length array
+        int _${field.name}Length = ${helper.toDeserializationExpression(field.loopExpression, type.parserArguments)?no_esc};
+        List<${helper.getNonPrimitiveLanguageTypeNameForField(field)}> _${field.name}List = new LinkedList<>();
+        int ${field.name}EndPos = io.getPos() + _${field.name}Length;
+        while(io.getPos() < ${field.name}EndPos) {
+            _${field.name}List.add(<#if helper.isSimpleType(field.type)>io.${helper.getReadBufferReadMethodCall(field.type)}<#else>${field.type.name}IO.parse(io<#if field.params?has_content>, <#list field.params as parserArgument>(${helper.getArgumentType(field.type, parserArgument?index)}) (${helper.toDeserializationExpression(parserArgument, type.parserArguments)?no_esc})<#sep>, </#sep></#list></#if>)</#if>);
+            <#-- After parsing, update the current position, but only if it's needed -->
+            <#if field.loopExpression.contains("curPos")>
+            curPos = io.getPos() - startPos;
+            </#if>
+        }
+            <#-- A terminated array keeps on reading data as long as the termination expression evaluates to false -->
+            <#elseif helper.isTerminatedArray(field)>
+        // Terminated array
+        List<${helper.getNonPrimitiveLanguageTypeNameForField(field)}> _${field.name}List = new LinkedList<>();
+        while(!((boolean) (${helper.toDeserializationExpression(field.loopExpression, type.parserArguments)?no_esc}))) {
+            _${field.name}List.add(<#if helper.isSimpleType(field.type)>io.${helper.getReadBufferReadMethodCall(field.type)}<#else>${field.type.name}IO.parse(io<#if field.params?has_content>, <#list field.params as parserArgument>(${helper.getArgumentType(field.type, parserArgument?index)}) (${helper.toDeserializationExpression(parserArgument, type.parserArguments)?no_esc})<#sep>, </#sep></#list></#if>)</#if>);
+
+            <#-- After parsing, update the current position, but only if it's needed -->
+            <#if field.loopExpression.contains("curPos")>
+            curPos = io.getPos() - startPos;
+            </#if>
+        }
+            </#if>
+            <#--
+                Convert the list into an array. However if the array is of a primitive
+                type we have to iterate over it's elements and explicitly cast them.
+                Otherwise a simple toArray call is fine.
+            -->
+            <#if helper.isSimpleType(field.type)>
+        ${helper.getLanguageTypeNameForField(field)}[] ${field.name} = new ${helper.getLanguageTypeNameForField(field)}[_${field.name}List.size()];
+        for(int i = 0; i < _${field.name}List.size(); i++) {
+            ${field.name}[i] = (${helper.getLanguageTypeNameForField(field)}) _${field.name}List.get(i);
+        }
+            <#else>
+        ${helper.getLanguageTypeNameForField(field)}[] ${field.name} = _${field.name}List.toArray(new ${helper.getNonPrimitiveLanguageTypeNameForField(field)}[0]);
+            </#if>
+        </#if>
+        <#break>
+    <#case "checksum">
+
+        // Checksum Field (${field.name})
+        ${helper.getLanguageTypeNameForField(field)} ${field.name} = io.${helper.getReadMethodName(field.type)}(${field.type.size});
+        ${helper.getLanguageTypeNameForField(field)} _${field.name}Ref = (${helper.getLanguageTypeNameForField(field)}) (${helper.toDeserializationExpression(field.checksumExpression, type.parserArguments)});
+        if(${field.name} != _${field.name}Ref) {
+            throw new ParseException(String.format("Checksum verification failed. Expected %04X but got %04X",_${field.name}Ref & 0xFFFF, ${field.name} & 0xFFFF));
+        }
+        <#break>
+    <#case "const">
+
+        // Const Field (${field.name})
+        ${helper.getLanguageTypeNameForField(field)} ${field.name} = io.${helper.getReadMethodName(field.type)}(${field.type.size});
+        if(${field.name} != ${typeName}.${field.name?upper_case}) {
+            throw new ParseException("Expected constant value " + ${typeName}.${field.name?upper_case} + " but got " + ${field.name});
+        }
+        <#break>
+    <#case "enum">
+
+        // Enum field (${field.name})
+        ${helper.getLanguageTypeNameForField(field)} ${field.name} = ${helper.getLanguageTypeNameForField(field)}.valueOf(io.${helper.getReadMethodName(helper.getEnumBaseType(field.type))}(${helper.getEnumBaseType(field.type).size}));
+        <#break>
+    <#case "discriminator">
+
+        // Discriminator Field (${field.name}) (Used as input to a switch field)
+        ${helper.getLanguageTypeNameForField(field)} ${field.name} = io.${helper.getReadMethodName(field.type)}(${field.type.size});
+        <#break>
+    <#case "implicit">
+
+        // Implicit Field (${field.name}) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
+        ${helper.getLanguageTypeNameForField(field)} ${field.name} = io.${helper.getReadMethodName(field.type)}(${field.type.size});
+        <#break>
+    <#case "manualArray">
+
+        // Manual Array Field (${field.name})
+        <#-- Only update curPos if the length expression uses it -->
+        <#if field.loopExpression.contains("curPos")>
+        curPos = io.getPos() - startPos;
+        </#if>
+        <#-- If this is a count array, we can directly initialize an array with the given size -->
+        <#if helper.isCountArray(field)>
+        // Count array
+        int _${field.name}Count = ${helper.toDeserializationExpression(field.loopExpression, type.parserArguments)};
+        ${helper.getLanguageTypeNameForField(field)}[] ${field.name} = new ${helper.getLanguageTypeNameForField(field)}[_${field.name}Count];
+        for(int i = 0; i < _${field.name}Count; i++) {
+            ${field.name}[i] = (${helper.getLanguageTypeNameForField(field)}) (${helper.toDeserializationExpression(field.deserializationExpression, type.parserArguments)});
+        }
+        <#-- In all other cases do we have to work with a list, that is later converted to an array -->
+        <#else>
+            <#-- For a length array, we read data till the read position of the buffer reaches a given position -->
+            <#if helper.isLengthArray(field)>
+        // Length array
+        int _${field.name}Length = ${helper.toDeserializationExpression(field.loopExpression, type.parserArguments)};
+        List<${helper.getNonPrimitiveLanguageTypeNameForField(field)}> _${field.name}List = new LinkedList<>();
+        int ${field.name}EndPos = io.getPos() + _${field.name}Length;
+        while(io.getPos() < ${field.name}EndPos) {
+            _${field.name}List.add((${helper.getLanguageTypeNameForField(field)}) (${helper.toDeserializationExpression(field.deserializationExpression, type.parserArguments)}));
+            <#-- After parsing, update the current position, but only if it's needed -->
+            <#if field.loopExpression.contains("curPos")>
+            curPos = io.getPos() - startPos;
+            </#if>
+        }
+            <#-- A terminated array keeps on reading data as long as the termination expression evaluates to false -->
+            <#elseif helper.isTerminatedArray(field)>
+        // Terminated array
+        List<${helper.getNonPrimitiveLanguageTypeNameForField(field)}> _${field.name}List = new LinkedList<>();
+        while(!((boolean) (${helper.toDeserializationExpression(field.loopExpression, type.parserArguments)}))) {
+            _${field.name}List.add((${helper.getLanguageTypeNameForField(field)}) (${helper.toDeserializationExpression(field.deserializationExpression, type.parserArguments)}));
+
+            <#-- After parsing, update the current position, but only if it's needed -->
+            <#if field.loopExpression.contains("curPos")>
+            curPos = io.getPos() - startPos;
+            </#if>
+        }
+            </#if>
+            <#--
+                Convert the list into an array. However if the array is of a primitive
+                type we have to iterate over it's elements and explicitly cast them.
+                Otherwise a simple toArray call is fine.
+            -->
+            <#if helper.isSimpleType(field.type)>
+        ${helper.getLanguageTypeNameForField(field)}[] ${field.name} = new ${helper.getLanguageTypeNameForField(field)}[_${field.name}List.size()];
+        for(int i = 0; i < _${field.name}List.size(); i++) {
+            ${field.name}[i] = (${helper.getLanguageTypeNameForField(field)}) _${field.name}List.get(i);
+        }
+            <#else>
+        ${helper.getLanguageTypeNameForField(field)}[] ${field.name} = _${field.name}List.toArray(new ${helper.getNonPrimitiveLanguageTypeNameForField(field)}[0]);
+            </#if>
+        </#if>
+        <#break>
+    <#case "manual">
+
+        // Manual Field (${field.name})
+        ${helper.getLanguageTypeNameForField(field)} ${field.name} = (${helper.getLanguageTypeNameForField(field)}) (${helper.toDeserializationExpression(field.deserializationExpression, type.parserArguments)});
+        <#break>
+    <#case "optional">
+
+        // Optional Field (${field.name}) (Can be skipped, if a given expression evaluates to false)
+        <#if field.conditionExpression.contains("curPos")>
+        curPos = io.getPos() - startPos;
+        </#if>
+        ${helper.getLanguageTypeNameForField(field)} ${field.name} = null;
+        if(${helper.toDeserializationExpression(field.conditionExpression, type.parserArguments)?no_esc}) {
+            ${field.name} = <#if helper.isSimpleType(field.type)>io.${helper.getReadBufferReadMethodCall(field.type)}<#else>${field.type.name}IO.parse(io<#if field.params?has_content>, <#list field.params as parserArgument>(${helper.getArgumentType(field.type, parserArgument?index)}) (${helper.toDeserializationExpression(parserArgument, type.parserArguments)})<#sep>, </#sep></#list></#if>)</#if>;
+        }
+        <#break>
+    <#case "padding">
+
+        // Padding Field (${field.name})
+        boolean _${field.name}NeedsPadding = (boolean) (${helper.toDeserializationExpression(field.paddingCondition, type.parserArguments)});
+        if(_${field.name}NeedsPadding) {
+            // Just read the padding data and ignore it
+            io.${helper.getReadBufferReadMethodCall(field.type)};
+        }
+        <#break>
+    <#case "reserved">
+
+        // Reserved Field (Compartmentalized so the "reserved" variable can't leak)
+        {
+            ${helper.getLanguageTypeNameForField(field)} reserved = io.${helper.getReadBufferReadMethodCall(field.type)};
+            if(reserved != ${field.referenceValue}) {
+                LOGGER.info("Expected constant value " + ${field.referenceValue} + " but got " + reserved + " for reserved field.");
+            }
+        }
+        <#break>
+    <#case "simple">
+
+        // Simple Field (${field.name})
+        ${helper.getLanguageTypeNameForField(field)} ${field.name} = <#if helper.isSimpleType(field.type)>io.${helper.getReadBufferReadMethodCall(field.type)}<#else>${field.type.name}IO.parse(io<#if field.params?has_content>, <#list field.params as parserArgument>(${helper.getArgumentType(field.type, parserArgument?index)}) (${helper.toDeserializationExpression(parserArgument, type.parserArguments)})<#sep>, </#sep></#list></#if>)</#if>;
+        <#break>
+    <#case "switch">
+
+        // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
+        ${typeName}Builder builder = null;
+        <#list field.cases as case>
+        <#if case.discriminatorValues?has_content>if(<#list case.discriminatorValues as discriminatorValue>EvaluationHelper.equals(${helper.toSwitchExpression(field.discriminatorNames[discriminatorValue?index])}, ${discriminatorValue})<#sep> && </#sep></#list>) </#if>{
+            builder = ${case.name}IO.parse(io<#if case.parserArguments?has_content>, <#list case.parserArguments as parserArgument>${parserArgument.name}<#sep>, </#sep></#list></#if>);
+        }<#sep> else </#sep>
+        </#list>
+        if (builder == null) {
+            throw new ParseException("Unsupported case for discriminated type");
+        }
+        <#break>
+</#switch>
+</#list>
+
+        // Create the instance
+        <#if helper.isDiscriminatedType(type)>
+        return new ${typeName}Builder(<#list type.propertyFields as field>${field.name}<#sep>, </#sep></#list>);
+        <#elseif type.abstract>
+        return builder.build(<#list type.propertyFields as field>${field.name}<#sep>, </#sep></#list>);
+        <#else>
+        return new ${typeName}(<#list type.propertyFields as field>${field.name}<#sep>, </#sep></#list>);
+        </#if>
+    }
+
+<#if outputFlavor != "passive">
+    public static void serialize(WriteBuffer io, ${typeName} value) throws ParseException {
+<#list type.fields as field>
+<#switch field.typeName>
+    <#case "array">
+
+        // Array Field (${field.name})
+        if(value.get${field.name?cap_first}() != null) {
+            for(${helper.getLanguageTypeNameForField(field)} element : value.get${field.name?cap_first}()) {
+                <#if helper.isSimpleType(field.type)>
+                io.${helper.getWriteBufferReadMethodCall(field.type, "element")};
+                <#else>
+                ${field.type.name}IO.serialize(io, element);
+                </#if>
+            }
+        }
+        <#break>
+    <#case "checksum">
+
+        // Checksum Field (${field.name}) (Calculated)
+        ${helper.getLanguageTypeNameForField(field)} ${field.name} = (${helper.getLanguageTypeNameForField(field)}) (${helper.toSerializationExpression(field.checksumExpression, type.parserArguments)});
+        io.${helper.getWriteBufferReadMethodCall(field.type, "(" + field.name + ")")?no_esc};
+        <#break>
+    <#case "const">
+
+        // Const Field (${field.name})
+        io.${helper.getWriteBufferReadMethodCall(field.type, field.referenceValue)};
+        <#break>
+    <#case "discriminator">
+
+        // Discriminator Field (${field.name}) (Used as input to a switch field)
+        ${helper.getLanguageTypeNameForField(field)} ${field.name} = (${helper.getLanguageTypeNameForField(field)}) value.getDiscriminatorValues()[0];
+        io.${helper.getWriteBufferReadMethodCall(field.type, "(" + field.name + ")")};
+        <#break>
+    <#case "enum">
+
+        // Enum field (${field.name})
+        ${helper.getLanguageTypeNameForField(field)} ${field.name} = (${helper.getLanguageTypeNameForField(field)}) value.get${field.name?cap_first}();
+        io.${helper.getWriteBufferReadMethodCall(helper.getEnumBaseType(field.type), "(" + field.name + ".getValue())")};
+        <#break>
+    <#case "implicit">
+
+        // Implicit Field (${field.name}) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
+        ${helper.getLanguageTypeNameForField(field)} ${field.name} = (${helper.getLanguageTypeNameForField(field)}) (${helper.toSerializationExpression(field.serializationExpression, type.parserArguments)});
+        io.${helper.getWriteBufferReadMethodCall(field.type, "(" + field.name + ")")?no_esc};
+        <#break>
+    <#case "manualArray">
+
+        // Manual Array Field (${field.name})
+        if(value.get${field.name?cap_first}() != null) {
+            for(${helper.getLanguageTypeNameForField(field)} element : value.get${field.name?cap_first}()) {
+                ${helper.toSerializationExpression(field.serializationExpression, type.parserArguments)};
+            }
+        }
+        <#break>
+    <#case "manual">
+
+        // Manual Field (${field.name})
+        ${helper.getLanguageTypeNameForField(field)} ${field.name} = (${helper.getLanguageTypeNameForField(field)}) (${helper.toSerializationExpression(field.serializationExpression, type.parserArguments)});
+         io.${helper.getWriteBufferReadMethodCall(field.type, "(" + field.name + ")")?no_esc};
+       <#break>
+    <#case "optional">
+
+        // Optional Field (${field.name}) (Can be skipped, if the value is null)
+        ${helper.getLanguageTypeNameForField(field)} ${field.name} = null;
+        if(value.get${field.name?cap_first}() != null) {
+            ${field.name} = (${helper.getLanguageTypeNameForField(field)}) value.get${field.name?cap_first}();
+            <#if helper.isSimpleType(field.type)>
+            io.${helper.getWriteBufferReadMethodCall(field.type, "(" + field.name + ")")};
+            <#else>
+            ${field.type.name}IO.serialize(io, ${field.name});
+            </#if>
+        }
+        <#break>
+    <#case "padding">
+
+        // Padding Field (${field.name})
+        boolean _${field.name}NeedsPadding = (boolean) (${helper.toSerializationExpression(field.paddingCondition, type.parserArguments)});
+        if(_${field.name}NeedsPadding) {
+            ${helper.getLanguageTypeNameForField(field)} _${field.name}PaddingValue = (${helper.getLanguageTypeNameForField(field)}) (${helper.toSerializationExpression(field.paddingValue, type.parserArguments)});
+            io.${helper.getWriteBufferReadMethodCall(field.type, "(_" + field.name + "PaddingValue)")?no_esc};
+        }
+        <#break>
+    <#case "reserved">
+
+        // Reserved Field
+        io.${helper.getWriteBufferReadMethodCall(field.type, field.referenceValue)};
+        <#break>
+    <#case "simple">
+
+        // Simple Field (${field.name})
+        ${helper.getLanguageTypeNameForField(field)} ${field.name} = (${helper.getLanguageTypeNameForField(field)}) value.get${field.name?cap_first}();
+        <#if helper.isSimpleType(field.type)>
+        io.${helper.getWriteBufferReadMethodCall(field.type, "(" + field.name + ")")};
+        <#else>
+        ${field.type.name}IO.serialize(io, ${field.name});
+        </#if>
+        <#break>
+    <#case "switch">
+
+        // Switch field (Depending on the discriminator values, passes the instantiation to a sub-type)
+        <#list field.cases as case>
+        if(value instanceof ${case.name}) {
+            ${case.name}IO.serialize(io, (${case.name}) value);
+        }<#sep> else </#sep>
+        </#list>
+        <#break>
+</#switch>
+</#list>
+    }
+</#if>
+
+    private static int COUNT(Object obj) {
+        if(obj.getClass().isArray()) {
+            Object[] arr = (Object[]) obj;
+            return arr.length;
+        } else if(obj instanceof Collection) {
+            Collection col = (Collection) obj;
+            return col.size();
+        }
+        throw new RuntimeException("Unable to count object of type " + obj.getClass().getName());
+    }
+
+    private static <T> T CAST(Object obj, Class<T> clazz) {
+        try {
+            return clazz.cast(obj);
+        } catch(ClassCastException e) {
+            throw new RuntimeException("Unable to cast object of type " + obj.getClass().getName() + " to " + clazz.getName());
+        }
+    }
+
+<#if type.abstract>
+    public static interface ${typeName}Builder {
+        ${typeName} build(<#list type.propertyFields as field>${helper.getLanguageTypeNameForField(field)}<#if field.loopType??>[]</#if> ${field.name}<#sep>, </#sep></#list>);
+    }
+
+</#if>
+<#if helper.isDiscriminatedType(type)>
+    public static class ${typeName}Builder implements ${type.parentType.name}IO.${type.parentType.name}Builder {
+        <#if type.propertyFields?has_content>
+        <#list type.propertyFields as field>
+        private final ${helper.getLanguageTypeNameForField(field)}<#if field.loopType??>[]</#if> ${field.name};
+        </#list>
+        </#if>
+
+        public ${typeName}Builder(<#list type.propertyFields as field>${helper.getLanguageTypeNameForField(field)}<#if field.loopType??>[]</#if> ${field.name}<#sep>, </#sep></#list>) {
+            <#list type.propertyFields as field>
+            this.${field.name} = ${field.name};
+            </#list>
+        }
+
+        public ${typeName} build(<#list type.parentType.propertyFields as field>${helper.getLanguageTypeNameForField(field)}<#if field.loopType??>[]</#if> ${field.name}<#sep>, </#sep></#list>) {
+            return new ${typeName}(<#list type.getAllPropertyFields() as field>${field.name}<#sep>, </#sep></#list>);
+        }
+    }
+
+</#if>
 }
\ No newline at end of file
diff --git a/build-utils/language-java/src/main/resources/templates/java/pojo-template.ftlh b/build-utils/language-java/src/main/resources/templates/java/pojo-template.ftlh
index a5c1e602393..162539102ae 100644
--- a/build-utils/language-java/src/main/resources/templates/java/pojo-template.ftlh
+++ b/build-utils/language-java/src/main/resources/templates/java/pojo-template.ftlh
@@ -1,209 +1,209 @@
-<#--
-  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
-
-      http://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.
--->
-${helper.packageName(protocolName, languageName, outputFlavor)?replace(".", "/")}/${typeName}.java
-/*
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-*/
-
-package ${helper.packageName(protocolName, languageName, outputFlavor)};
-
-<#if helper.getEnumTypes(type)?has_content>import ${helper.packageName(protocolName, languageName, outputFlavor)}.types.*;</#if>
-
-import com.fasterxml.jackson.annotation.*;
-import org.apache.plc4x.java.utils.Message;
-
-<#if type.abstract>@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "className")</#if>
-public<#if type.abstract> abstract</#if> class ${typeName}<#if type.parentType??> extends ${type.parentType.name}</#if> implements Message {
-
-<#if helper.isDiscriminatedType(type)>
-
-    // Discriminator values used by the parser to determine the type to be used. All values have to apply.
-    public static final Object[] DISCRIMINATOR_VALUES = new Object[] {
-    <#list type.discriminatorValues as discriminatorValue>
-        <#-- There are rare occasions where the discriminator is defined by a parser argument, in this case we currently can't detect the type -->
-        <#if type.discriminatorField??>(${helper.getLanguageTypeNameForField(type.discriminatorField)}) </#if>${discriminatorValue}<#sep>, </#sep>
-    </#list>
-    };
-</#if>
-<#if type.constFields?has_content>
-
-    // Constant values.
-<#list type.constFields as field>
-    public static final ${helper.getLanguageTypeNameForField(field)} ${field.name?upper_case} = ${field.referenceValue};
-</#list>
-</#if>
-<#-- Prpoerty fields are fields that require a property in the pojo -->
-<#if type.propertyFields?has_content>
-
-    // Properties.
-<#list type.propertyFields as field>
-    private final ${helper.getLanguageTypeNameForField(field)}<#if field.loopType??>[]</#if> ${field.name};
-</#list>
-</#if>
-
-    @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
-    <#-- getAllPropertyFields() returns not only the property fields of this type but also of it's parents -->
-    public ${typeName}(<#list type.getAllPropertyFields() as field>@JsonProperty("${field.name}") ${helper.getLanguageTypeNameForField(field)}<#if field.loopType??>[]</#if> ${field.name}<#sep>, </#sep></#list>) {
-<#if type.getParentPropertyFields()?has_content>
-        super(<#list type.getParentPropertyFields() as field>${field.name}<#sep>, </#sep></#list>);
-</#if>
-<#list type.propertyFields as field>
-        this.${field.name} = ${field.name};
-</#list>
-    }
-<#if type.abstract>
-
-    public abstract Object[] getDiscriminatorValues();
-</#if>
-<#if helper.isDiscriminatedType(type)>
-
-    @JsonIgnore
-    public Object[] getDiscriminatorValues() {
-        return DISCRIMINATOR_VALUES;
-    }
-</#if>
-
-<#list type.propertyFields as field>
-    public ${helper.getLanguageTypeNameForField(field)}<#if field.loopType??>[]</#if> get${field.name?cap_first}() {
-        return ${field.name};
-    }
-
-</#list>
-<#list type.virtualFields as field>
-    public ${helper.getLanguageTypeNameForField(field)}<#if field.loopType??>[]</#if> get${field.name?cap_first}() {
-        return (${helper.getLanguageTypeNameForField(field)}) (${helper.toDeserializationExpression(field.valueExpression, type.parserArguments)});
-    }
-
-</#list>
-    @Override
-    @JsonIgnore
-    public int getLengthInBytes() {
-        int lengthInBits = <#if type.parentType??>super.getLengthInBytes() * 8<#else>0</#if>;
-<#list type.fields as field>
-<#switch field.typeName>
-    <#case "array">
-
-        // Array field
-        <#if helper.isSimpleType(field.type)>
-        lengthInBits += ${field.type.size} * ${field.name}.length;
-        <#else>
-        if(${field.name} != null) {
-            for(Message element : ${field.name}) {
-                lengthInBits += element.getLengthInBytes() * 8;
-            }
-        }
-        </#if>
-        <#break>
-    <#case "checksum">
-
-        // Checksum Field (${field.name})
-        lengthInBits += ${field.type.size};
-        <#break>
-    <#case "const">
-
-        // Const Field (${field.name})
-        lengthInBits += ${field.type.size};
-        <#break>
-    <#case "discriminator">
-
-        // Discriminator Field (${field.name})
-        lengthInBits += ${field.type.size};
-        <#break>
-    <#case "enum">
-
-        // Enum Field (${field.name})
-        lengthInBits += ${helper.getEnumBaseType(field.type).size};
-        <#break>
-    <#case "implicit">
-
-        // Implicit Field (${field.name})
-        lengthInBits += ${field.type.size};
-        <#break>
-    <#case "manualArray">
-
-        // Manual Array Field (${field.name})
-        lengthInBits += ${helper.toDeserializationExpression(field.lengthExpression, null)} * 8;
-        <#break>
-    <#case "manual">
-
-        // Manual Field (${field.name})
-        lengthInBits += ${helper.toDeserializationExpression(field.lengthExpression, null)} * 8;
-        <#break>
-    <#case "optional">
-
-        // Optional Field (${field.name})
-        if(${field.name} != null) {
-        <#if helper.isSimpleType(field.type)>
-            lengthInBits += ${field.type.size};
-        <#else>
-            lengthInBits += ${field.name}.getLengthInBytes() * 8;
-        </#if>
-        }
-        <#break>
-    <#case "padding">
-
-        // Padding Field (${field.name})
-        if((boolean) (${helper.toDeserializationExpression(field.paddingCondition, type.parserArguments)})) {
-            lengthInBits += ${field.type.size};
-        }
-        <#break>
-    <#case "reserved">
-
-        // Reserved Field
-        lengthInBits += ${field.type.size};
-        <#break>
-    <#case "simple">
-
-        // Simple field (${field.name})
-        <#if helper.isSimpleType(field.type)>
-        lengthInBits += ${field.type.size};
-        <#else>
-        lengthInBits += ${field.name}.getLengthInBytes() * 8;
-        </#if>
-        <#break>
-    <#case "switch">
-
-        // Length of sub-type elements will be added by sub-type...
-        <#break>
-    <#case "virtual">
-
-        // A virtual field doesn't have any in- or output.
-        <#break>
-</#switch>
-</#list>
-
-        return lengthInBits / 8;
-    }
-
+<#--
+  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
+
+      http://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.
+-->
+${helper.packageName(protocolName, languageName, outputFlavor)?replace(".", "/")}/${typeName}.java
+/*
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+*/
+
+package ${helper.packageName(protocolName, languageName, outputFlavor)};
+
+<#if helper.getEnumTypes(type)?has_content>import ${helper.packageName(protocolName, languageName, outputFlavor)}.types.*;</#if>
+
+import com.fasterxml.jackson.annotation.*;
+import org.apache.plc4x.java.utils.Message;
+
+<#if type.abstract>@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "className")</#if>
+public<#if type.abstract> abstract</#if> class ${typeName}<#if type.parentType??> extends ${type.parentType.name}</#if> implements Message {
+
+<#if helper.isDiscriminatedType(type)>
+
+    // Discriminator values used by the parser to determine the type to be used. All values have to apply.
+    public static final Object[] DISCRIMINATOR_VALUES = new Object[] {
+    <#list type.discriminatorValues as discriminatorValue>
+        <#-- There are rare occasions where the discriminator is defined by a parser argument, in this case we currently can't detect the type -->
+        <#if type.discriminatorField??>(${helper.getLanguageTypeNameForField(type.discriminatorField)}) </#if>${discriminatorValue}<#sep>, </#sep>
+    </#list>
+    };
+</#if>
+<#if type.constFields?has_content>
+
+    // Constant values.
+<#list type.constFields as field>
+    public static final ${helper.getLanguageTypeNameForField(field)} ${field.name?upper_case} = ${field.referenceValue};
+</#list>
+</#if>
+<#-- Prpoerty fields are fields that require a property in the pojo -->
+<#if type.propertyFields?has_content>
+
+    // Properties.
+<#list type.propertyFields as field>
+    private final ${helper.getLanguageTypeNameForField(field)}<#if field.loopType??>[]</#if> ${field.name};
+</#list>
+</#if>
+
+    @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
+    <#-- getAllPropertyFields() returns not only the property fields of this type but also of it's parents -->
+    public ${typeName}(<#list type.getAllPropertyFields() as field>@JsonProperty("${field.name}") ${helper.getLanguageTypeNameForField(field)}<#if field.loopType??>[]</#if> ${field.name}<#sep>, </#sep></#list>) {
+<#if type.getParentPropertyFields()?has_content>
+        super(<#list type.getParentPropertyFields() as field>${field.name}<#sep>, </#sep></#list>);
+</#if>
+<#list type.propertyFields as field>
+        this.${field.name} = ${field.name};
+</#list>
+    }
+<#if type.abstract>
+
+    public abstract Object[] getDiscriminatorValues();
+</#if>
+<#if helper.isDiscriminatedType(type)>
+
+    @JsonIgnore
+    public Object[] getDiscriminatorValues() {
+        return DISCRIMINATOR_VALUES;
+    }
+</#if>
+
+<#list type.propertyFields as field>
+    public ${helper.getLanguageTypeNameForField(field)}<#if field.loopType??>[]</#if> get${field.name?cap_first}() {
+        return ${field.name};
+    }
+
+</#list>
+<#list type.virtualFields as field>
+    public ${helper.getLanguageTypeNameForField(field)}<#if field.loopType??>[]</#if> get${field.name?cap_first}() {
+        return (${helper.getLanguageTypeNameForField(field)}) (${helper.toDeserializationExpression(field.valueExpression, type.parserArguments)});
+    }
+
+</#list>
+    @Override
+    @JsonIgnore
+    public int getLengthInBytes() {
+        int lengthInBits = <#if type.parentType??>super.getLengthInBytes() * 8<#else>0</#if>;
+<#list type.fields as field>
+<#switch field.typeName>
+    <#case "array">
+
+        // Array field
+        <#if helper.isSimpleType(field.type)>
+        lengthInBits += ${field.type.size} * ${field.name}.length;
+        <#else>
+        if(${field.name} != null) {
+            for(Message element : ${field.name}) {
+                lengthInBits += element.getLengthInBytes() * 8;
+            }
+        }
+        </#if>
+        <#break>
+    <#case "checksum">
+
+        // Checksum Field (${field.name})
+        lengthInBits += ${field.type.size};
+        <#break>
+    <#case "const">
+
+        // Const Field (${field.name})
+        lengthInBits += ${field.type.size};
+        <#break>
+    <#case "discriminator">
+
+        // Discriminator Field (${field.name})
+        lengthInBits += ${field.type.size};
+        <#break>
+    <#case "enum">
+
+        // Enum Field (${field.name})
+        lengthInBits += ${helper.getEnumBaseType(field.type).size};
+        <#break>
+    <#case "implicit">
+
+        // Implicit Field (${field.name})
+        lengthInBits += ${field.type.size};
+        <#break>
+    <#case "manualArray">
+
+        // Manual Array Field (${field.name})
+        lengthInBits += ${helper.toDeserializationExpression(field.lengthExpression, null)} * 8;
+        <#break>
+    <#case "manual">
+
+        // Manual Field (${field.name})
+        lengthInBits += ${helper.toDeserializationExpression(field.lengthExpression, null)} * 8;
+        <#break>
+    <#case "optional">
+
+        // Optional Field (${field.name})
+        if(${field.name} != null) {
+        <#if helper.isSimpleType(field.type)>
+            lengthInBits += ${field.type.size};
+        <#else>
+            lengthInBits += ${field.name}.getLengthInBytes() * 8;
+        </#if>
+        }
+        <#break>
+    <#case "padding">
+
+        // Padding Field (${field.name})
+        if((boolean) (${helper.toDeserializationExpression(field.paddingCondition, type.parserArguments)})) {
+            lengthInBits += ${field.type.size};
+        }
+        <#break>
+    <#case "reserved">
+
+        // Reserved Field
+        lengthInBits += ${field.type.size};
+        <#break>
+    <#case "simple">
+
+        // Simple field (${field.name})
+        <#if helper.isSimpleType(field.type)>
+        lengthInBits += ${field.type.size};
+        <#else>
+        lengthInBits += ${field.name}.getLengthInBytes() * 8;
+        </#if>
+        <#break>
+    <#case "switch">
+
+        // Length of sub-type elements will be added by sub-type...
+        <#break>
+    <#case "virtual">
+
+        // A virtual field doesn't have any in- or output.
+        <#break>
+</#switch>
+</#list>
+
+        return lengthInBits / 8;
+    }
+
 }
\ No newline at end of file
diff --git a/build-utils/pom.xml b/build-utils/pom.xml
index c0564b217f0..228d6169301 100644
--- a/build-utils/pom.xml
+++ b/build-utils/pom.xml
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4x-parent</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4x-build-utils</artifactId>
-  <packaging>pom</packaging>
-
-  <name>PLC4X: Build Utils</name>
-  <description>Some build related utilities.</description>
-
-  <modules>
-    <module>language-base-freemarker</module>
-    <module>protocol-base-mspec</module>
-
-    <module>language-java</module>
-    <module>protocol-test</module>
-  </modules>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4x-parent</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4x-build-utils</artifactId>
+  <packaging>pom</packaging>
+
+  <name>PLC4X: Build Utils</name>
+  <description>Some build related utilities.</description>
+
+  <modules>
+    <module>language-base-freemarker</module>
+    <module>protocol-base-mspec</module>
+
+    <module>language-java</module>
+    <module>protocol-test</module>
+  </modules>
+
 </project>
\ No newline at end of file
diff --git a/build-utils/protocol-base-mspec/pom.xml b/build-utils/protocol-base-mspec/pom.xml
index db361a846fe..69e523e609e 100644
--- a/build-utils/protocol-base-mspec/pom.xml
+++ b/build-utils/protocol-base-mspec/pom.xml
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4x-build-utils</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId>
-
-  <name>PLC4X: Build Utils: Protocol Base: MSpec</name>
-  <description>Base stuff for building protocols using our custom MSpec format.</description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.antlr</groupId>
-        <artifactId>antlr4-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>antlr</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>antlr4</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x.plugins</groupId>
-      <artifactId>plc4x-code-generation-protocol-base</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.antlr</groupId>
-      <artifactId>antlr4-runtime</artifactId>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4x-build-utils</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId>
+
+  <name>PLC4X: Build Utils: Protocol Base: MSpec</name>
+  <description>Base stuff for building protocols using our custom MSpec format.</description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.antlr</groupId>
+        <artifactId>antlr4-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>antlr</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>antlr4</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x.plugins</groupId>
+      <artifactId>plc4x-code-generation-protocol-base</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.antlr</groupId>
+      <artifactId>antlr4-runtime</artifactId>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/build-utils/protocol-base-mspec/src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/MSpec.g4 b/build-utils/protocol-base-mspec/src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/MSpec.g4
index 8d058ca374b..5b4ac22fd6d 100644
--- a/build-utils/protocol-base-mspec/src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/MSpec.g4
+++ b/build-utils/protocol-base-mspec/src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/MSpec.g4
@@ -1,229 +1,229 @@
-grammar MSpec;
-/*
- 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
-
-     http://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.
-*/
-
-file
- : complexTypeDefinition* EOF
- ;
-
-complexTypeDefinition
- : COMMENT
- | LBRACKET complexType RBRACKET
- ;
-
-complexType
- : 'type' name=idExpression (LBRACKET params=argumentList RBRACKET)? fieldDefinition+
- | 'discriminatedType' name=idExpression (LBRACKET params=argumentList RBRACKET)? fieldDefinition+
- | 'enum' type=typeReference name=idExpression (LBRACKET params=argumentList RBRACKET)? enumValues=enumValueDefinition+
- ;
-
-
-fieldDefinition
- : LBRACKET field (LBRACKET params=multipleExpressions RBRACKET)? RBRACKET
- ;
-
-field
- : arrayField
- | checksumField
- | constField
- | discriminatorField
- | enumField
- | implicitField
- | manualArrayField
- | manualField
- | optionalField
- | paddingField
- | reservedField
- | simpleField
- | typeSwitchField
- | virtualField
- ;
-
-arrayField
- : 'array' type=typeReference name=idExpression loopType=arrayType loopExpression=expression
- ;
-
-checksumField
- : 'checksum' type=dataType name=idExpression checksumExpression=expression
- ;
-
-constField
- : 'const' type=dataType name=idExpression expected=expression
- ;
-
-discriminatorField
- : 'discriminator' type=dataType name=idExpression
- ;
-
-enumField
- : 'enum' type=typeReference name=idExpression
- ;
-
-implicitField
- : 'implicit' type=dataType name=idExpression serializationExpression=expression
- ;
-
-manualArrayField
- : 'manualArray' type=typeReference name=idExpression loopType=arrayType loopExpression=expression deserializationExpression=expression serializationExpression=expression lengthExpression=expression
- ;
-
-manualField
- : 'manual' type=typeReference name=idExpression deserializationExpression=expression serializationExpression=expression lengthExpression=expression
- ;
-
-optionalField
- : 'optional' type=typeReference name=idExpression condition=expression
- ;
-
-paddingField
- : 'padding' type=dataType name=idExpression paddingValue=expression paddingCondition=expression
- ;
-
-reservedField
- : 'reserved' type=dataType expected=expression
- ;
-
-simpleField
- : 'simple' type=typeReference name=idExpression
- ;
-
-typeSwitchField
- : 'typeSwitch' discriminators=multipleExpressions caseStatement*
- ;
-
-virtualField
- : 'virtual' type=typeReference name=idExpression valueExpression=expression
- ;
-
-enumValueDefinition
- : LBRACKET valueExpression=expression name=IDENTIFIER (LBRACKET constantValueExpressions=multipleExpressions RBRACKET)? RBRACKET
- ;
-
-
-typeReference
- : complexTypeReference=IDENTIFIER
- | simpleTypeReference=dataType
- ;
-
-caseStatement
- : LBRACKET (discriminatorValues=multipleExpressions)? name=IDENTIFIER (LBRACKET params=argumentList RBRACKET)? fieldDefinition* RBRACKET
- ;
-
-dataType
- : base='bit'
- | base='int' size=INTEGER_LITERAL
- | base='uint' size=INTEGER_LITERAL
- | base='float' size=INTEGER_LITERAL
- | base='string'
- ;
-
-argument
- : type=typeReference name=idExpression
- ;
-
-argumentList
- : argument (',' argument)*
- ;
-
-expression
- : TICK expr=innerExpression TICK
- ;
-
-multipleExpressions
- : expression (',' expression)*
- ;
-
-innerExpression
- : 'A' | 'B' | 'C' | 'D' | 'E' | 'F'
- | HEX_LITERAL
- | INTEGER_LITERAL
- | (IDENTIFIER | arrayType) ('(' (innerExpression (',' innerExpression)* )? ')')? ('[' innerExpression ']')?
- | innerExpression '.' innerExpression // Field Reference or method call
- | innerExpression '[' + INTEGER_LITERAL + ']' // Array index
- | innerExpression BinaryOperator innerExpression  // Addition
- | innerExpression '?' innerExpression ':' innerExpression
- | '(' innerExpression ')'
- | '"' innerExpression '"'
- | '!' innerExpression
- ;
-
-COMMENT
- : K_COMMENT [a-zA-Z0-9,.'":;()/ \t\r\n\u000C-]*
- | '//' [a-zA-Z0-9,.'":;()/ \t-]*
- ;
-
-INTEGER_LITERAL
- : [0-9]+
- ;
-
-HEX_LITERAL
- : HexNumeral
- ;
-
-fragment HexNumeral
- : '0' [xX] HexDigit HexDigit?;
-
-fragment HexDigit
- : [0-9a-fA-F]
-;
-
-arrayType
- : 'count'
- | 'length'
- | 'terminated'
- ;
-
-idExpression
- : TICK id=IDENTIFIER TICK
- ;
-
-fragment K_COMMENT : '<--';
-
-TICK : '\'';
-TIMES : 'x';
-LBRACKET : '[';
-RBRACKET : ']';
-LCBRACKET : '{';
-RCBRACKET : '}';
-
-BinaryOperator
- : '+'
- | '-'
- | '/'
- | '*'
- | '=='
- | '!='
- | '>'
- | '<'
- | '>='
- | '<='
- | '&&'
- | '||'
- | '%'
- ;
-
-ZERO : '0';
-HEX_VALUE : [0-9A-F];
-
-IDENTIFIER
- : [A-Za-z0-9_-]+
- ;
-
-WS  :  [ \t\r\n\u000C]+ -> skip
+grammar MSpec;
+/*
+ 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
+
+     http://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.
+*/
+
+file
+ : complexTypeDefinition* EOF
+ ;
+
+complexTypeDefinition
+ : COMMENT
+ | LBRACKET complexType RBRACKET
+ ;
+
+complexType
+ : 'type' name=idExpression (LBRACKET params=argumentList RBRACKET)? fieldDefinition+
+ | 'discriminatedType' name=idExpression (LBRACKET params=argumentList RBRACKET)? fieldDefinition+
+ | 'enum' type=typeReference name=idExpression (LBRACKET params=argumentList RBRACKET)? enumValues=enumValueDefinition+
+ ;
+
+
+fieldDefinition
+ : LBRACKET field (LBRACKET params=multipleExpressions RBRACKET)? RBRACKET
+ ;
+
+field
+ : arrayField
+ | checksumField
+ | constField
+ | discriminatorField
+ | enumField
+ | implicitField
+ | manualArrayField
+ | manualField
+ | optionalField
+ | paddingField
+ | reservedField
+ | simpleField
+ | typeSwitchField
+ | virtualField
+ ;
+
+arrayField
+ : 'array' type=typeReference name=idExpression loopType=arrayType loopExpression=expression
+ ;
+
+checksumField
+ : 'checksum' type=dataType name=idExpression checksumExpression=expression
+ ;
+
+constField
+ : 'const' type=dataType name=idExpression expected=expression
+ ;
+
+discriminatorField
+ : 'discriminator' type=dataType name=idExpression
+ ;
+
+enumField
+ : 'enum' type=typeReference name=idExpression
+ ;
+
+implicitField
+ : 'implicit' type=dataType name=idExpression serializationExpression=expression
+ ;
+
+manualArrayField
+ : 'manualArray' type=typeReference name=idExpression loopType=arrayType loopExpression=expression deserializationExpression=expression serializationExpression=expression lengthExpression=expression
+ ;
+
+manualField
+ : 'manual' type=typeReference name=idExpression deserializationExpression=expression serializationExpression=expression lengthExpression=expression
+ ;
+
+optionalField
+ : 'optional' type=typeReference name=idExpression condition=expression
+ ;
+
+paddingField
+ : 'padding' type=dataType name=idExpression paddingValue=expression paddingCondition=expression
+ ;
+
+reservedField
+ : 'reserved' type=dataType expected=expression
+ ;
+
+simpleField
+ : 'simple' type=typeReference name=idExpression
+ ;
+
+typeSwitchField
+ : 'typeSwitch' discriminators=multipleExpressions caseStatement*
+ ;
+
+virtualField
+ : 'virtual' type=typeReference name=idExpression valueExpression=expression
+ ;
+
+enumValueDefinition
+ : LBRACKET valueExpression=expression name=IDENTIFIER (LBRACKET constantValueExpressions=multipleExpressions RBRACKET)? RBRACKET
+ ;
+
+
+typeReference
+ : complexTypeReference=IDENTIFIER
+ | simpleTypeReference=dataType
+ ;
+
+caseStatement
+ : LBRACKET (discriminatorValues=multipleExpressions)? name=IDENTIFIER (LBRACKET params=argumentList RBRACKET)? fieldDefinition* RBRACKET
+ ;
+
+dataType
+ : base='bit'
+ | base='int' size=INTEGER_LITERAL
+ | base='uint' size=INTEGER_LITERAL
+ | base='float' size=INTEGER_LITERAL
+ | base='string'
+ ;
+
+argument
+ : type=typeReference name=idExpression
+ ;
+
+argumentList
+ : argument (',' argument)*
+ ;
+
+expression
+ : TICK expr=innerExpression TICK
+ ;
+
+multipleExpressions
+ : expression (',' expression)*
+ ;
+
+innerExpression
+ : 'A' | 'B' | 'C' | 'D' | 'E' | 'F'
+ | HEX_LITERAL
+ | INTEGER_LITERAL
+ | (IDENTIFIER | arrayType) ('(' (innerExpression (',' innerExpression)* )? ')')? ('[' innerExpression ']')?
+ | innerExpression '.' innerExpression // Field Reference or method call
+ | innerExpression '[' + INTEGER_LITERAL + ']' // Array index
+ | innerExpression BinaryOperator innerExpression  // Addition
+ | innerExpression '?' innerExpression ':' innerExpression
+ | '(' innerExpression ')'
+ | '"' innerExpression '"'
+ | '!' innerExpression
+ ;
+
+COMMENT
+ : K_COMMENT [a-zA-Z0-9,.'":;()/ \t\r\n\u000C-]*
+ | '//' [a-zA-Z0-9,.'":;()/ \t-]*
+ ;
+
+INTEGER_LITERAL
+ : [0-9]+
+ ;
+
+HEX_LITERAL
+ : HexNumeral
+ ;
+
+fragment HexNumeral
+ : '0' [xX] HexDigit HexDigit?;
+
+fragment HexDigit
+ : [0-9a-fA-F]
+;
+
+arrayType
+ : 'count'
+ | 'length'
+ | 'terminated'
+ ;
+
+idExpression
+ : TICK id=IDENTIFIER TICK
+ ;
+
+fragment K_COMMENT : '<--';
+
+TICK : '\'';
+TIMES : 'x';
+LBRACKET : '[';
+RBRACKET : ']';
+LCBRACKET : '{';
+RCBRACKET : '}';
+
+BinaryOperator
+ : '+'
+ | '-'
+ | '/'
+ | '*'
+ | '=='
+ | '!='
+ | '>'
+ | '<'
+ | '>='
+ | '<='
+ | '&&'
+ | '||'
+ | '%'
+ ;
+
+ZERO : '0';
+HEX_VALUE : [0-9A-F];
+
+IDENTIFIER
+ : [A-Za-z0-9_-]+
+ ;
+
+WS  :  [ \t\r\n\u000C]+ -> skip
 ;
\ No newline at end of file
diff --git a/build-utils/protocol-base-mspec/src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/Expression.g4 b/build-utils/protocol-base-mspec/src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/Expression.g4
index 7e8c288b58d..2db9f5f243e 100644
--- a/build-utils/protocol-base-mspec/src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/Expression.g4
+++ b/build-utils/protocol-base-mspec/src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/Expression.g4
@@ -1,112 +1,112 @@
-grammar Expression;
-/*
-
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <http://unlicense.org/>
-
-Borrowed part of this Grammar:
-https://github.com/bkiers/tiny-language-antlr4/blob/master/src/main/antlr4/tl/antlr4/TL.g4
-
-*/
-
-expressionString
- : expression EOF
- ;
-
-expression
- : '-' expression                                       #unaryMinusExpression
- | '!' expression                                       #notExpression
- | <assoc=right> expression '^' expression              #powerExpression
- | expression op=( '*' | '/' | '%' ) expression         #multExpression
- | expression op=( '+' | '-' ) expression               #addExpression
- | expression op=( '>=' | '<=' | '>' | '<' ) expression #compExpression
- | expression op=( '==' | '!=' ) expression             #eqExpression
- | expression '&&' expression                           #andExpression
- | expression '||' expression                           #orExpression
- | expression '?' expression ':' expression             #ifExpression
- | Number                                               #numberExpression
- | Bool                                                 #boolExpression
- | Null                                                 #nullExpression
- | identifierSegment                                    #identifierExpression
- | String indexes?                                      #stringExpression
- | '(' expression ')' indexes?                          #expressionExpression
- ;
-
-identifierSegment
- : name=Identifier args=identifierSegmentArguments? index=identifierSegmentIndexes? ('.' rest=identifierSegmentRest)?
- ;
-
-identifierSegmentArguments
- : arguments
- ;
-
-identifierSegmentIndexes
- : indexes
- ;
-
-identifierSegmentRest
- : identifierSegment
- ;
-
-arguments
- : '(' (expression (',' expression)*)? ')'
- ;
-
-indexes
- : ( '[' expression ']' )+
- ;
-
-Null     : 'null';
-
-Bool
- : 'true'
- | 'false'
- ;
-
-Number
- : Int ( '.' Digit* )?
- ;
-
-Identifier
- : [a-zA-Z_] [a-zA-Z_0-9]*
- ;
-
-String
- : ["] ( ~["\r\n\\] | '\\' ~[\r\n] )* ["]
- | ['] ( ~['\r\n\\] | '\\' ~[\r\n] )* [']
- ;
-
-Space
- : [ \t\r\n\u000C] -> skip
- ;
-
-fragment Int
- : [1-9] Digit*
- | '0'
- ;
-
-fragment Digit
- : [0-9]
+grammar Expression;
+/*
+
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <http://unlicense.org/>
+
+Borrowed part of this Grammar:
+https://github.com/bkiers/tiny-language-antlr4/blob/master/src/main/antlr4/tl/antlr4/TL.g4
+
+*/
+
+expressionString
+ : expression EOF
+ ;
+
+expression
+ : '-' expression                                       #unaryMinusExpression
+ | '!' expression                                       #notExpression
+ | <assoc=right> expression '^' expression              #powerExpression
+ | expression op=( '*' | '/' | '%' ) expression         #multExpression
+ | expression op=( '+' | '-' ) expression               #addExpression
+ | expression op=( '>=' | '<=' | '>' | '<' ) expression #compExpression
+ | expression op=( '==' | '!=' ) expression             #eqExpression
+ | expression '&&' expression                           #andExpression
+ | expression '||' expression                           #orExpression
+ | expression '?' expression ':' expression             #ifExpression
+ | Number                                               #numberExpression
+ | Bool                                                 #boolExpression
+ | Null                                                 #nullExpression
+ | identifierSegment                                    #identifierExpression
+ | String indexes?                                      #stringExpression
+ | '(' expression ')' indexes?                          #expressionExpression
+ ;
+
+identifierSegment
+ : name=Identifier args=identifierSegmentArguments? index=identifierSegmentIndexes? ('.' rest=identifierSegmentRest)?
+ ;
+
+identifierSegmentArguments
+ : arguments
+ ;
+
+identifierSegmentIndexes
+ : indexes
+ ;
+
+identifierSegmentRest
+ : identifierSegment
+ ;
+
+arguments
+ : '(' (expression (',' expression)*)? ')'
+ ;
+
+indexes
+ : ( '[' expression ']' )+
+ ;
+
+Null     : 'null';
+
+Bool
+ : 'true'
+ | 'false'
+ ;
+
+Number
+ : Int ( '.' Digit* )?
+ ;
+
+Identifier
+ : [a-zA-Z_] [a-zA-Z_0-9]*
+ ;
+
+String
+ : ["] ( ~["\r\n\\] | '\\' ~[\r\n] )* ["]
+ | ['] ( ~['\r\n\\] | '\\' ~[\r\n] )* [']
+ ;
+
+Space
+ : [ \t\r\n\u000C] -> skip
+ ;
+
+fragment Int
+ : [1-9] Digit*
+ | '0'
+ ;
+
+fragment Digit
+ : [0-9]
  ;
\ No newline at end of file
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/ExpressionStringListener.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/ExpressionStringListener.java
index bec1f9d2be9..9d57d0bc060 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/ExpressionStringListener.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/ExpressionStringListener.java
@@ -1,348 +1,348 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.language.mspec.expression;
-
-import org.apache.plc4x.plugins.codegenerator.types.terms.*;
-
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Stack;
-
-public class ExpressionStringListener extends ExpressionBaseListener {
-
-    private Stack<List<Term>> parserContexts;
-
-    private Term root;
-
-    public Term getRoot() {
-        return root;
-    }
-
-    @Override
-    public void enterExpressionString(ExpressionParser.ExpressionStringContext ctx) {
-        parserContexts = new Stack<>();
-        parserContexts.push(new LinkedList<>());
-    }
-
-    @Override
-    public void exitExpressionString(ExpressionParser.ExpressionStringContext ctx) {
-        List<Term> roots = parserContexts.pop();
-        if(roots.isEmpty()) {
-            throw new RuntimeException("Empty Expression not supported.");
-        }
-        if(roots.size() != 1) {
-            throw new RuntimeException("Expression can only contain one root term.");
-        }
-        root = roots.get(0);
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////////
-    // Literals
-    /////////////////////////////////////////////////////////////////////////////////////////
-
-    @Override
-    public void exitNullExpression(ExpressionParser.NullExpressionContext ctx) {
-        parserContexts.peek().add(new NullLiteral());
-    }
-
-    @Override
-    public void exitBoolExpression(ExpressionParser.BoolExpressionContext ctx) {
-        parserContexts.peek().add(new BooleanLiteral(Boolean.valueOf(ctx.getText())));
-    }
-
-    @Override
-    public void exitNumberExpression(ExpressionParser.NumberExpressionContext ctx) {
-        String strValue = ctx.Number().getText();
-        if(strValue.contains(".")) {
-            parserContexts.peek().add(new NumericLiteral(Double.valueOf(strValue)));
-        } else {
-            parserContexts.peek().add(new NumericLiteral(Long.valueOf(strValue)));
-        }
-    }
-
-    @Override
-    public void exitStringExpression(ExpressionParser.StringExpressionContext ctx) {
-        parserContexts.peek().add(new StringLiteral(ctx.getText()));
-    }
-
-    @Override
-    public void enterIdentifierSegment(ExpressionParser.IdentifierSegmentContext ctx) {
-        parserContexts.push(new LinkedList<>());
-    }
-
-    @Override
-    public void exitIdentifierSegment(ExpressionParser.IdentifierSegmentContext ctx) {
-        List<Term> args = parserContexts.pop();
-        ArgsContext argsContext = null;
-        IndexContext indexContext = null;
-        RestContext restContext = null;
-        for (Term arg : args) {
-            if(arg instanceof ArgsContext) {
-                argsContext = (ArgsContext) arg;
-            } else if(arg instanceof IndexContext) {
-                indexContext = (IndexContext) arg;
-            } else if(arg instanceof RestContext) {
-                restContext = (RestContext) arg;
-            }
-        }
-
-        String name = ctx.name.getText();
-
-        int index = VariableLiteral.NO_INDEX;
-        if(indexContext != null) {
-            index = indexContext.getFirst().getNumber().intValue();
-        }
-        VariableLiteral rest = null;
-        if(restContext != null) {
-            rest = restContext.getFirst();
-        }
-        parserContexts.peek().add(new VariableLiteral(name, argsContext, index, rest));
-    }
-
-    @Override
-    public void enterIdentifierSegmentArguments(ExpressionParser.IdentifierSegmentArgumentsContext ctx) {
-        parserContexts.push(new LinkedList<>());
-    }
-
-    @Override
-    public void exitIdentifierSegmentArguments(ExpressionParser.IdentifierSegmentArgumentsContext ctx) {
-        List<Term> args = parserContexts.pop();
-        parserContexts.peek().add(new ArgsContext(args));
-    }
-
-    @Override
-    public void enterIdentifierSegmentIndexes(ExpressionParser.IdentifierSegmentIndexesContext ctx) {
-        parserContexts.push(new LinkedList<>());
-    }
-
-    @Override
-    public void exitIdentifierSegmentIndexes(ExpressionParser.IdentifierSegmentIndexesContext ctx) {
-        List<Term> args = parserContexts.pop();
-        parserContexts.peek().add(new IndexContext(args));
-    }
-
-    @Override
-    public void enterIdentifierSegmentRest(ExpressionParser.IdentifierSegmentRestContext ctx) {
-        parserContexts.push(new LinkedList<>());
-    }
-
-    @Override
-    public void exitIdentifierSegmentRest(ExpressionParser.IdentifierSegmentRestContext ctx) {
-        List<Term> args = parserContexts.pop();
-        parserContexts.peek().add(new RestContext(args));
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////////
-    // Unary Terms
-    /////////////////////////////////////////////////////////////////////////////////////////
-
-    @Override
-    public void enterNotExpression(ExpressionParser.NotExpressionContext ctx) {
-        parserContexts.push(new LinkedList<>());
-    }
-
-    @Override
-    public void exitNotExpression(ExpressionParser.NotExpressionContext ctx) {
-        UnaryTerm ut = getUnaryTerm("!", parserContexts.pop());
-        parserContexts.peek().add(ut);
-    }
-
-    @Override
-    public void enterUnaryMinusExpression(ExpressionParser.UnaryMinusExpressionContext ctx) {
-        parserContexts.push(new LinkedList<>());
-    }
-
-    @Override
-    public void exitUnaryMinusExpression(ExpressionParser.UnaryMinusExpressionContext ctx) {
-        UnaryTerm ut = getUnaryTerm("-", parserContexts.pop());
-        parserContexts.peek().add(ut);
-    }
-
-    @Override
-    public void enterExpressionExpression(ExpressionParser.ExpressionExpressionContext ctx) {
-        parserContexts.push(new LinkedList<>());
-    }
-
-    @Override
-    public void exitExpressionExpression(ExpressionParser.ExpressionExpressionContext ctx) {
-        UnaryTerm ut = getUnaryTerm("()", parserContexts.pop());
-        parserContexts.peek().add(ut);
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////////
-    // Binary Terms
-    /////////////////////////////////////////////////////////////////////////////////////////
-
-    @Override
-    public void enterOrExpression(ExpressionParser.OrExpressionContext ctx) {
-        parserContexts.push(new LinkedList<>());
-    }
-
-    @Override
-    public void exitOrExpression(ExpressionParser.OrExpressionContext ctx) {
-        BinaryTerm bt = getBinaryTerm("||", parserContexts.pop());
-        parserContexts.peek().add(bt);
-    }
-
-    @Override
-    public void enterPowerExpression(ExpressionParser.PowerExpressionContext ctx) {
-        parserContexts.push(new LinkedList<>());
-    }
-
-    @Override
-    public void exitPowerExpression(ExpressionParser.PowerExpressionContext ctx) {
-        BinaryTerm bt = getBinaryTerm("^", parserContexts.pop());
-        parserContexts.peek().add(bt);
-    }
-
-    @Override
-    public void enterEqExpression(ExpressionParser.EqExpressionContext ctx) {
-        parserContexts.push(new LinkedList<>());
-    }
-
-    @Override
-    public void exitEqExpression(ExpressionParser.EqExpressionContext ctx) {
-        BinaryTerm bt = getBinaryTerm(ctx.op.getText(), parserContexts.pop());
-        parserContexts.peek().add(bt);
-    }
-
-    @Override
-    public void enterAndExpression(ExpressionParser.AndExpressionContext ctx) {
-        parserContexts.push(new LinkedList<>());
-    }
-
-    @Override
-    public void exitAndExpression(ExpressionParser.AndExpressionContext ctx) {
-        BinaryTerm bt = getBinaryTerm("&&", parserContexts.pop());
-        parserContexts.peek().add(bt);
-    }
-
-    @Override
-    public void enterAddExpression(ExpressionParser.AddExpressionContext ctx) {
-        parserContexts.push(new LinkedList<>());
-    }
-
-    @Override
-    public void exitAddExpression(ExpressionParser.AddExpressionContext ctx) {
-        BinaryTerm bt = getBinaryTerm(ctx.op.getText(), parserContexts.pop());
-        parserContexts.peek().add(bt);
-    }
-
-    @Override
-    public void enterCompExpression(ExpressionParser.CompExpressionContext ctx) {
-        parserContexts.push(new LinkedList<>());
-    }
-
-    @Override
-    public void exitCompExpression(ExpressionParser.CompExpressionContext ctx) {
-        BinaryTerm bt = getBinaryTerm(ctx.op.getText(), parserContexts.pop());
-        parserContexts.peek().add(bt);
-    }
-
-    @Override
-    public void enterMultExpression(ExpressionParser.MultExpressionContext ctx) {
-        parserContexts.push(new LinkedList<>());
-    }
-
-    @Override
-    public void exitMultExpression(ExpressionParser.MultExpressionContext ctx) {
-        BinaryTerm bt = getBinaryTerm(ctx.op.getText(), parserContexts.pop());
-        parserContexts.peek().add(bt);
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////////
-    // Ternary Terms
-    /////////////////////////////////////////////////////////////////////////////////////////
-
-    @Override
-    public void enterIfExpression(ExpressionParser.IfExpressionContext ctx) {
-        parserContexts.push(new LinkedList<>());
-    }
-
-    @Override
-    public void exitIfExpression(ExpressionParser.IfExpressionContext ctx) {
-        TernaryTerm tt = getTernaryTerm("if", parserContexts.pop());
-        parserContexts.peek().add(tt);
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////////
-    // Helpers
-    /////////////////////////////////////////////////////////////////////////////////////////
-
-    private UnaryTerm getUnaryTerm(String op, List<Term> terms) {
-        if(terms.size() != 1) {
-            throw new RuntimeException(op + " should be a unary operation");
-        }
-        Term a = terms.get(0);
-        return new UnaryTerm(a, op);
-    }
-
-    private BinaryTerm getBinaryTerm(String op, List<Term> terms) {
-        if(terms.size() != 2) {
-            throw new RuntimeException(op + " should be a binary operation");
-        }
-        Term a = terms.get(0);
-        Term b = terms.get(1);
-        return new BinaryTerm(a, b, op);
-    }
-
-    private TernaryTerm getTernaryTerm(String op, List<Term> terms) {
-        if(terms.size() != 3) {
-            throw new RuntimeException(op + " should be a ternary operation");
-        }
-        Term a = terms.get(0);
-        Term b = terms.get(1);
-        Term c = terms.get(2);
-        return new TernaryTerm(a, b, c, op);
-    }
-
-    static class ArgsContext extends LinkedList<Term> implements Term {
-        public ArgsContext(Collection c) {
-            super(c);
-        }
-
-        @Override
-        public boolean contains(String str) {
-            return false;
-        }
-    }
-    static class IndexContext extends LinkedList<NumericLiteral> implements Term {
-        public IndexContext(Collection c) {
-            super(c);
-        }
-
-        @Override
-        public boolean contains(String str) {
-            return false;
-        }
-    }
-    static class RestContext extends LinkedList<VariableLiteral> implements Term {
-        public RestContext(Collection c) {
-            super(c);
-        }
-
-        @Override
-        public boolean contains(String str) {
-            return false;
-        }
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.language.mspec.expression;
+
+import org.apache.plc4x.plugins.codegenerator.types.terms.*;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Stack;
+
+public class ExpressionStringListener extends ExpressionBaseListener {
+
+    private Stack<List<Term>> parserContexts;
+
+    private Term root;
+
+    public Term getRoot() {
+        return root;
+    }
+
+    @Override
+    public void enterExpressionString(ExpressionParser.ExpressionStringContext ctx) {
+        parserContexts = new Stack<>();
+        parserContexts.push(new LinkedList<>());
+    }
+
+    @Override
+    public void exitExpressionString(ExpressionParser.ExpressionStringContext ctx) {
+        List<Term> roots = parserContexts.pop();
+        if(roots.isEmpty()) {
+            throw new RuntimeException("Empty Expression not supported.");
+        }
+        if(roots.size() != 1) {
+            throw new RuntimeException("Expression can only contain one root term.");
+        }
+        root = roots.get(0);
+    }
+
+    /////////////////////////////////////////////////////////////////////////////////////////
+    // Literals
+    /////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void exitNullExpression(ExpressionParser.NullExpressionContext ctx) {
+        parserContexts.peek().add(new NullLiteral());
+    }
+
+    @Override
+    public void exitBoolExpression(ExpressionParser.BoolExpressionContext ctx) {
+        parserContexts.peek().add(new BooleanLiteral(Boolean.valueOf(ctx.getText())));
+    }
+
+    @Override
+    public void exitNumberExpression(ExpressionParser.NumberExpressionContext ctx) {
+        String strValue = ctx.Number().getText();
+        if(strValue.contains(".")) {
+            parserContexts.peek().add(new NumericLiteral(Double.valueOf(strValue)));
+        } else {
+            parserContexts.peek().add(new NumericLiteral(Long.valueOf(strValue)));
+        }
+    }
+
+    @Override
+    public void exitStringExpression(ExpressionParser.StringExpressionContext ctx) {
+        parserContexts.peek().add(new StringLiteral(ctx.getText()));
+    }
+
+    @Override
+    public void enterIdentifierSegment(ExpressionParser.IdentifierSegmentContext ctx) {
+        parserContexts.push(new LinkedList<>());
+    }
+
+    @Override
+    public void exitIdentifierSegment(ExpressionParser.IdentifierSegmentContext ctx) {
+        List<Term> args = parserContexts.pop();
+        ArgsContext argsContext = null;
+        IndexContext indexContext = null;
+        RestContext restContext = null;
+        for (Term arg : args) {
+            if(arg instanceof ArgsContext) {
+                argsContext = (ArgsContext) arg;
+            } else if(arg instanceof IndexContext) {
+                indexContext = (IndexContext) arg;
+            } else if(arg instanceof RestContext) {
+                restContext = (RestContext) arg;
+            }
+        }
+
+        String name = ctx.name.getText();
+
+        int index = VariableLiteral.NO_INDEX;
+        if(indexContext != null) {
+            index = indexContext.getFirst().getNumber().intValue();
+        }
+        VariableLiteral rest = null;
+        if(restContext != null) {
+            rest = restContext.getFirst();
+        }
+        parserContexts.peek().add(new VariableLiteral(name, argsContext, index, rest));
+    }
+
+    @Override
+    public void enterIdentifierSegmentArguments(ExpressionParser.IdentifierSegmentArgumentsContext ctx) {
+        parserContexts.push(new LinkedList<>());
+    }
+
+    @Override
+    public void exitIdentifierSegmentArguments(ExpressionParser.IdentifierSegmentArgumentsContext ctx) {
+        List<Term> args = parserContexts.pop();
+        parserContexts.peek().add(new ArgsContext(args));
+    }
+
+    @Override
+    public void enterIdentifierSegmentIndexes(ExpressionParser.IdentifierSegmentIndexesContext ctx) {
+        parserContexts.push(new LinkedList<>());
+    }
+
+    @Override
+    public void exitIdentifierSegmentIndexes(ExpressionParser.IdentifierSegmentIndexesContext ctx) {
+        List<Term> args = parserContexts.pop();
+        parserContexts.peek().add(new IndexContext(args));
+    }
+
+    @Override
+    public void enterIdentifierSegmentRest(ExpressionParser.IdentifierSegmentRestContext ctx) {
+        parserContexts.push(new LinkedList<>());
+    }
+
+    @Override
+    public void exitIdentifierSegmentRest(ExpressionParser.IdentifierSegmentRestContext ctx) {
+        List<Term> args = parserContexts.pop();
+        parserContexts.peek().add(new RestContext(args));
+    }
+
+    /////////////////////////////////////////////////////////////////////////////////////////
+    // Unary Terms
+    /////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void enterNotExpression(ExpressionParser.NotExpressionContext ctx) {
+        parserContexts.push(new LinkedList<>());
+    }
+
+    @Override
+    public void exitNotExpression(ExpressionParser.NotExpressionContext ctx) {
+        UnaryTerm ut = getUnaryTerm("!", parserContexts.pop());
+        parserContexts.peek().add(ut);
+    }
+
+    @Override
+    public void enterUnaryMinusExpression(ExpressionParser.UnaryMinusExpressionContext ctx) {
+        parserContexts.push(new LinkedList<>());
+    }
+
+    @Override
+    public void exitUnaryMinusExpression(ExpressionParser.UnaryMinusExpressionContext ctx) {
+        UnaryTerm ut = getUnaryTerm("-", parserContexts.pop());
+        parserContexts.peek().add(ut);
+    }
+
+    @Override
+    public void enterExpressionExpression(ExpressionParser.ExpressionExpressionContext ctx) {
+        parserContexts.push(new LinkedList<>());
+    }
+
+    @Override
+    public void exitExpressionExpression(ExpressionParser.ExpressionExpressionContext ctx) {
+        UnaryTerm ut = getUnaryTerm("()", parserContexts.pop());
+        parserContexts.peek().add(ut);
+    }
+
+    /////////////////////////////////////////////////////////////////////////////////////////
+    // Binary Terms
+    /////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void enterOrExpression(ExpressionParser.OrExpressionContext ctx) {
+        parserContexts.push(new LinkedList<>());
+    }
+
+    @Override
+    public void exitOrExpression(ExpressionParser.OrExpressionContext ctx) {
+        BinaryTerm bt = getBinaryTerm("||", parserContexts.pop());
+        parserContexts.peek().add(bt);
+    }
+
+    @Override
+    public void enterPowerExpression(ExpressionParser.PowerExpressionContext ctx) {
+        parserContexts.push(new LinkedList<>());
+    }
+
+    @Override
+    public void exitPowerExpression(ExpressionParser.PowerExpressionContext ctx) {
+        BinaryTerm bt = getBinaryTerm("^", parserContexts.pop());
+        parserContexts.peek().add(bt);
+    }
+
+    @Override
+    public void enterEqExpression(ExpressionParser.EqExpressionContext ctx) {
+        parserContexts.push(new LinkedList<>());
+    }
+
+    @Override
+    public void exitEqExpression(ExpressionParser.EqExpressionContext ctx) {
+        BinaryTerm bt = getBinaryTerm(ctx.op.getText(), parserContexts.pop());
+        parserContexts.peek().add(bt);
+    }
+
+    @Override
+    public void enterAndExpression(ExpressionParser.AndExpressionContext ctx) {
+        parserContexts.push(new LinkedList<>());
+    }
+
+    @Override
+    public void exitAndExpression(ExpressionParser.AndExpressionContext ctx) {
+        BinaryTerm bt = getBinaryTerm("&&", parserContexts.pop());
+        parserContexts.peek().add(bt);
+    }
+
+    @Override
+    public void enterAddExpression(ExpressionParser.AddExpressionContext ctx) {
+        parserContexts.push(new LinkedList<>());
+    }
+
+    @Override
+    public void exitAddExpression(ExpressionParser.AddExpressionContext ctx) {
+        BinaryTerm bt = getBinaryTerm(ctx.op.getText(), parserContexts.pop());
+        parserContexts.peek().add(bt);
+    }
+
+    @Override
+    public void enterCompExpression(ExpressionParser.CompExpressionContext ctx) {
+        parserContexts.push(new LinkedList<>());
+    }
+
+    @Override
+    public void exitCompExpression(ExpressionParser.CompExpressionContext ctx) {
+        BinaryTerm bt = getBinaryTerm(ctx.op.getText(), parserContexts.pop());
+        parserContexts.peek().add(bt);
+    }
+
+    @Override
+    public void enterMultExpression(ExpressionParser.MultExpressionContext ctx) {
+        parserContexts.push(new LinkedList<>());
+    }
+
+    @Override
+    public void exitMultExpression(ExpressionParser.MultExpressionContext ctx) {
+        BinaryTerm bt = getBinaryTerm(ctx.op.getText(), parserContexts.pop());
+        parserContexts.peek().add(bt);
+    }
+
+    /////////////////////////////////////////////////////////////////////////////////////////
+    // Ternary Terms
+    /////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void enterIfExpression(ExpressionParser.IfExpressionContext ctx) {
+        parserContexts.push(new LinkedList<>());
+    }
+
+    @Override
+    public void exitIfExpression(ExpressionParser.IfExpressionContext ctx) {
+        TernaryTerm tt = getTernaryTerm("if", parserContexts.pop());
+        parserContexts.peek().add(tt);
+    }
+
+    /////////////////////////////////////////////////////////////////////////////////////////
+    // Helpers
+    /////////////////////////////////////////////////////////////////////////////////////////
+
+    private UnaryTerm getUnaryTerm(String op, List<Term> terms) {
+        if(terms.size() != 1) {
+            throw new RuntimeException(op + " should be a unary operation");
+        }
+        Term a = terms.get(0);
+        return new UnaryTerm(a, op);
+    }
+
+    private BinaryTerm getBinaryTerm(String op, List<Term> terms) {
+        if(terms.size() != 2) {
+            throw new RuntimeException(op + " should be a binary operation");
+        }
+        Term a = terms.get(0);
+        Term b = terms.get(1);
+        return new BinaryTerm(a, b, op);
+    }
+
+    private TernaryTerm getTernaryTerm(String op, List<Term> terms) {
+        if(terms.size() != 3) {
+            throw new RuntimeException(op + " should be a ternary operation");
+        }
+        Term a = terms.get(0);
+        Term b = terms.get(1);
+        Term c = terms.get(2);
+        return new TernaryTerm(a, b, c, op);
+    }
+
+    static class ArgsContext extends LinkedList<Term> implements Term {
+        public ArgsContext(Collection c) {
+            super(c);
+        }
+
+        @Override
+        public boolean contains(String str) {
+            return false;
+        }
+    }
+    static class IndexContext extends LinkedList<NumericLiteral> implements Term {
+        public IndexContext(Collection c) {
+            super(c);
+        }
+
+        @Override
+        public boolean contains(String str) {
+            return false;
+        }
+    }
+    static class RestContext extends LinkedList<VariableLiteral> implements Term {
+        public RestContext(Collection c) {
+            super(c);
+        }
+
+        @Override
+        public boolean contains(String str) {
+            return false;
+        }
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/ExpressionStringParser.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/ExpressionStringParser.java
index 76c131dee1d..3007f2e1c72 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/ExpressionStringParser.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/ExpressionStringParser.java
@@ -1,48 +1,48 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.language.mspec.expression;
-
-import org.antlr.v4.runtime.CharStreams;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.tree.ParseTree;
-import org.antlr.v4.runtime.tree.ParseTreeWalker;
-import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-public class ExpressionStringParser {
-
-    public Term parse(InputStream source) {
-        try {
-            ExpressionLexer lexer = new ExpressionLexer(CharStreams.fromStream(source));
-            CommonTokenStream tokens = new CommonTokenStream(lexer);
-            ExpressionParser parser = new ExpressionParser(tokens);
-            ParseTree tree = parser.expressionString();
-            ParseTreeWalker walker = new ParseTreeWalker();
-            ExpressionStringListener listener = new ExpressionStringListener();
-            walker.walk(listener, tree);
-            return listener.getRoot();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.language.mspec.expression;
+
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.antlr.v4.runtime.tree.ParseTreeWalker;
+import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class ExpressionStringParser {
+
+    public Term parse(InputStream source) {
+        try {
+            ExpressionLexer lexer = new ExpressionLexer(CharStreams.fromStream(source));
+            CommonTokenStream tokens = new CommonTokenStream(lexer);
+            ExpressionParser parser = new ExpressionParser(tokens);
+            ParseTree tree = parser.expressionString();
+            ParseTreeWalker walker = new ParseTreeWalker();
+            ExpressionStringListener listener = new ExpressionStringListener();
+            walker.walk(listener, tree);
+            return listener.getRoot();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultComplexTypeDefinition.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultComplexTypeDefinition.java
index 4dbf73db1e3..4b8ffcbb785 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultComplexTypeDefinition.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultComplexTypeDefinition.java
@@ -1,92 +1,92 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.language.mspec.model.definitions;
-
-import org.apache.plc4x.plugins.codegenerator.types.definitions.Argument;
-import org.apache.plc4x.plugins.codegenerator.types.definitions.ComplexTypeDefinition;
-import org.apache.plc4x.plugins.codegenerator.types.fields.*;
-
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class DefaultComplexTypeDefinition extends DefaultTypeDefinition implements ComplexTypeDefinition {
-
-    private final boolean isAbstract;
-    private final List<Field> fields;
-
-    public DefaultComplexTypeDefinition(String name, Argument[] parserArguments, String[] tags, boolean isAbstract, List<Field> fields) {
-        super(name, parserArguments, tags);
-        this.isAbstract = isAbstract;
-        this.fields = fields;
-    }
-
-    public boolean isAbstract() {
-        return isAbstract;
-    }
-
-    public List<Field> getFields() {
-        return fields;
-    }
-
-    @Override
-    public List<SimpleField> getSimpleFields() {
-        return fields.stream().filter(field -> field instanceof SimpleField).map(
-            field -> (SimpleField) field).collect(Collectors.toList());
-    }
-
-    @Override
-    public List<ConstField> getConstFields() {
-        return fields.stream().filter(field -> field instanceof ConstField).map(
-            field -> (ConstField) field).collect(Collectors.toList());
-    }
-
-    @Override
-    public List<PropertyField> getPropertyFields() {
-        return fields.stream().filter(field -> ((field instanceof PropertyField) && !(field instanceof ConstField) && !(field instanceof VirtualField))).map(field -> (PropertyField) field)
-            .collect(Collectors.toList());
-    }
-
-    @Override
-    public List<VirtualField> getVirtualFields() {
-        return fields.stream().filter(field -> (field instanceof VirtualField)).map(field -> (VirtualField) field)
-            .collect(Collectors.toList());
-    }
-
-    @Override
-    public List<PropertyField> getAllPropertyFields() {
-        List<PropertyField> fields = new LinkedList<>();
-        if(getParentType() != null) {
-            fields.addAll(((ComplexTypeDefinition)getParentType()).getAllPropertyFields());
-        }
-        fields.addAll(getPropertyFields());
-        return fields;
-    }
-
-    @Override
-    public List<PropertyField> getParentPropertyFields() {
-        if(getParentType() != null) {
-            return ((ComplexTypeDefinition)getParentType()).getAllPropertyFields();
-        }
-        return Collections.emptyList();
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.language.mspec.model.definitions;
+
+import org.apache.plc4x.plugins.codegenerator.types.definitions.Argument;
+import org.apache.plc4x.plugins.codegenerator.types.definitions.ComplexTypeDefinition;
+import org.apache.plc4x.plugins.codegenerator.types.fields.*;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class DefaultComplexTypeDefinition extends DefaultTypeDefinition implements ComplexTypeDefinition {
+
+    private final boolean isAbstract;
+    private final List<Field> fields;
+
+    public DefaultComplexTypeDefinition(String name, Argument[] parserArguments, String[] tags, boolean isAbstract, List<Field> fields) {
+        super(name, parserArguments, tags);
+        this.isAbstract = isAbstract;
+        this.fields = fields;
+    }
+
+    public boolean isAbstract() {
+        return isAbstract;
+    }
+
+    public List<Field> getFields() {
+        return fields;
+    }
+
+    @Override
+    public List<SimpleField> getSimpleFields() {
+        return fields.stream().filter(field -> field instanceof SimpleField).map(
+            field -> (SimpleField) field).collect(Collectors.toList());
+    }
+
+    @Override
+    public List<ConstField> getConstFields() {
+        return fields.stream().filter(field -> field instanceof ConstField).map(
+            field -> (ConstField) field).collect(Collectors.toList());
+    }
+
+    @Override
+    public List<PropertyField> getPropertyFields() {
+        return fields.stream().filter(field -> ((field instanceof PropertyField) && !(field instanceof ConstField) && !(field instanceof VirtualField))).map(field -> (PropertyField) field)
+            .collect(Collectors.toList());
+    }
+
+    @Override
+    public List<VirtualField> getVirtualFields() {
+        return fields.stream().filter(field -> (field instanceof VirtualField)).map(field -> (VirtualField) field)
+            .collect(Collectors.toList());
+    }
+
+    @Override
+    public List<PropertyField> getAllPropertyFields() {
+        List<PropertyField> fields = new LinkedList<>();
+        if(getParentType() != null) {
+            fields.addAll(((ComplexTypeDefinition)getParentType()).getAllPropertyFields());
+        }
+        fields.addAll(getPropertyFields());
+        return fields;
+    }
+
+    @Override
+    public List<PropertyField> getParentPropertyFields() {
+        if(getParentType() != null) {
+            return ((ComplexTypeDefinition)getParentType()).getAllPropertyFields();
+        }
+        return Collections.emptyList();
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultDiscriminatedComplexTypeDefinition.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultDiscriminatedComplexTypeDefinition.java
index 65aac2bca23..12ff3fe65da 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultDiscriminatedComplexTypeDefinition.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultDiscriminatedComplexTypeDefinition.java
@@ -1,50 +1,50 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.language.mspec.model.definitions;
-
-import org.apache.plc4x.plugins.codegenerator.types.definitions.Argument;
-import org.apache.plc4x.plugins.codegenerator.types.definitions.DiscriminatedComplexTypeDefinition;
-import org.apache.plc4x.plugins.codegenerator.types.fields.DiscriminatorField;
-import org.apache.plc4x.plugins.codegenerator.types.fields.Field;
-
-import java.util.List;
-
-public class DefaultDiscriminatedComplexTypeDefinition extends DefaultComplexTypeDefinition implements DiscriminatedComplexTypeDefinition {
-
-    private final String[] discriminatorValues;
-
-    public DefaultDiscriminatedComplexTypeDefinition(String name, Argument[] parserArguments, String[] tags, String[] discriminatorValues, List<Field> fields) {
-        super(name, parserArguments, tags, false, fields);
-        this.discriminatorValues = discriminatorValues;
-    }
-
-    public DiscriminatorField getDiscriminatorField() {
-        // For a discriminated type, the discriminator is always defined in the parent type,
-        // which is always a DefaultComplexTypeDefinition instance.
-        return ((DefaultComplexTypeDefinition) getParentType()).getFields().stream().filter(
-            field -> field instanceof DiscriminatorField).map(
-                field -> (DiscriminatorField) field).findFirst().orElse(null);
-    }
-
-    public String[] getDiscriminatorValues() {
-        return discriminatorValues;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.language.mspec.model.definitions;
+
+import org.apache.plc4x.plugins.codegenerator.types.definitions.Argument;
+import org.apache.plc4x.plugins.codegenerator.types.definitions.DiscriminatedComplexTypeDefinition;
+import org.apache.plc4x.plugins.codegenerator.types.fields.DiscriminatorField;
+import org.apache.plc4x.plugins.codegenerator.types.fields.Field;
+
+import java.util.List;
+
+public class DefaultDiscriminatedComplexTypeDefinition extends DefaultComplexTypeDefinition implements DiscriminatedComplexTypeDefinition {
+
+    private final String[] discriminatorValues;
+
+    public DefaultDiscriminatedComplexTypeDefinition(String name, Argument[] parserArguments, String[] tags, String[] discriminatorValues, List<Field> fields) {
+        super(name, parserArguments, tags, false, fields);
+        this.discriminatorValues = discriminatorValues;
+    }
+
+    public DiscriminatorField getDiscriminatorField() {
+        // For a discriminated type, the discriminator is always defined in the parent type,
+        // which is always a DefaultComplexTypeDefinition instance.
+        return ((DefaultComplexTypeDefinition) getParentType()).getFields().stream().filter(
+            field -> field instanceof DiscriminatorField).map(
+                field -> (DiscriminatorField) field).findFirst().orElse(null);
+    }
+
+    public String[] getDiscriminatorValues() {
+        return discriminatorValues;
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultEnumTypeDefinition.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultEnumTypeDefinition.java
index b81136c311a..a186cd4a088 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultEnumTypeDefinition.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultEnumTypeDefinition.java
@@ -1,69 +1,69 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.language.mspec.model.definitions;
-
-import org.apache.plc4x.plugins.codegenerator.types.definitions.Argument;
-import org.apache.plc4x.plugins.codegenerator.types.definitions.EnumTypeDefinition;
-import org.apache.plc4x.plugins.codegenerator.types.enums.EnumValue;
-import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class DefaultEnumTypeDefinition extends DefaultTypeDefinition implements EnumTypeDefinition {
-
-    private final TypeReference type;
-    private final EnumValue[] enumValues;
-    private final Map<String, TypeReference> constants;
-
-    public DefaultEnumTypeDefinition(String name, TypeReference type, EnumValue[] enumValues,
-                                     Argument[] constants, String[] tags) {
-        super(name, constants, tags);
-        this.type = type;
-        this.enumValues = enumValues;
-        this.constants = new HashMap<>();
-        if(constants != null) {
-            for (Argument constant : constants) {
-                this.constants.put(constant.getName(), constant.getType());
-            }
-        }
-    }
-
-    @Override
-    public TypeReference getType() {
-        return type;
-    }
-
-    @Override
-    public EnumValue[] getEnumValues() {
-        return enumValues;
-    }
-
-    @Override
-    public String[] getConstantNames() {
-        return constants.keySet().toArray(new String[0]);
-    }
-
-    @Override
-    public TypeReference getConstantType(String constantName) {
-        return constants.get(constantName);
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.language.mspec.model.definitions;
+
+import org.apache.plc4x.plugins.codegenerator.types.definitions.Argument;
+import org.apache.plc4x.plugins.codegenerator.types.definitions.EnumTypeDefinition;
+import org.apache.plc4x.plugins.codegenerator.types.enums.EnumValue;
+import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class DefaultEnumTypeDefinition extends DefaultTypeDefinition implements EnumTypeDefinition {
+
+    private final TypeReference type;
+    private final EnumValue[] enumValues;
+    private final Map<String, TypeReference> constants;
+
+    public DefaultEnumTypeDefinition(String name, TypeReference type, EnumValue[] enumValues,
+                                     Argument[] constants, String[] tags) {
+        super(name, constants, tags);
+        this.type = type;
+        this.enumValues = enumValues;
+        this.constants = new HashMap<>();
+        if(constants != null) {
+            for (Argument constant : constants) {
+                this.constants.put(constant.getName(), constant.getType());
+            }
+        }
+    }
+
+    @Override
+    public TypeReference getType() {
+        return type;
+    }
+
+    @Override
+    public EnumValue[] getEnumValues() {
+        return enumValues;
+    }
+
+    @Override
+    public String[] getConstantNames() {
+        return constants.keySet().toArray(new String[0]);
+    }
+
+    @Override
+    public TypeReference getConstantType(String constantName) {
+        return constants.get(constantName);
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultEnumValue.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultEnumValue.java
index 0c42136a585..20fecb4fd4e 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultEnumValue.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultEnumValue.java
@@ -1,53 +1,53 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.language.mspec.model.definitions;
-
-import org.apache.plc4x.plugins.codegenerator.types.enums.EnumValue;
-
-import java.util.Map;
-
-public class DefaultEnumValue implements EnumValue {
-
-    private final String value;
-    private final String name;
-    private final Map<String, String> constants;
-
-    public DefaultEnumValue(String value, String name, Map<String, String> constants) {
-        this.value = value;
-        this.name = name;
-        this.constants = constants;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public String getValue() {
-        return value;
-    }
-
-    @Override
-    public String getConstant(String name) {
-        return constants.get(name);
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.language.mspec.model.definitions;
+
+import org.apache.plc4x.plugins.codegenerator.types.enums.EnumValue;
+
+import java.util.Map;
+
+public class DefaultEnumValue implements EnumValue {
+
+    private final String value;
+    private final String name;
+    private final Map<String, String> constants;
+
+    public DefaultEnumValue(String value, String name, Map<String, String> constants) {
+        this.value = value;
+        this.name = name;
+        this.constants = constants;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+
+    @Override
+    public String getConstant(String name) {
+        return constants.get(name);
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultTypeDefinition.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultTypeDefinition.java
index c4ebb227c28..a6580d053be 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultTypeDefinition.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultTypeDefinition.java
@@ -1,60 +1,60 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.language.mspec.model.definitions;
-
-
-import org.apache.plc4x.plugins.codegenerator.types.definitions.Argument;
-import org.apache.plc4x.plugins.codegenerator.types.definitions.TypeDefinition;
-
-public abstract class DefaultTypeDefinition {
-
-    private final String name;
-    private final Argument[] parserArguments;
-    private final String[] tags;
-    private TypeDefinition parentType;
-
-    public DefaultTypeDefinition(String name, Argument[] parserArguments, String[] tags) {
-        this.name = name;
-        this.parserArguments = parserArguments;
-        this.tags = tags;
-        this.parentType = null;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public Argument[] getParserArguments() {
-        return parserArguments;
-    }
-
-    public String[] getTags() {
-        return tags;
-    }
-
-    public TypeDefinition getParentType() {
-        return parentType;
-    }
-
-    public void setParentType(TypeDefinition parentType) {
-        this.parentType = parentType;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.language.mspec.model.definitions;
+
+
+import org.apache.plc4x.plugins.codegenerator.types.definitions.Argument;
+import org.apache.plc4x.plugins.codegenerator.types.definitions.TypeDefinition;
+
+public abstract class DefaultTypeDefinition {
+
+    private final String name;
+    private final Argument[] parserArguments;
+    private final String[] tags;
+    private TypeDefinition parentType;
+
+    public DefaultTypeDefinition(String name, Argument[] parserArguments, String[] tags) {
+        this.name = name;
+        this.parserArguments = parserArguments;
+        this.tags = tags;
+        this.parentType = null;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Argument[] getParserArguments() {
+        return parserArguments;
+    }
+
+    public String[] getTags() {
+        return tags;
+    }
+
+    public TypeDefinition getParentType() {
+        return parentType;
+    }
+
+    public void setParentType(TypeDefinition parentType) {
+        this.parentType = parentType;
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultArrayField.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultArrayField.java
index c59a30f9597..660c891f641 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultArrayField.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultArrayField.java
@@ -1,64 +1,64 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
-
-import org.apache.plc4x.plugins.codegenerator.types.fields.ArrayField;
-import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
-import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
-
-public class DefaultArrayField extends DefaultTaggedField implements ArrayField {
-
-    private final TypeReference type;
-    private final String name;
-    private final LoopType loopType;
-    private final Term loopExpression;
-    private final Term[] params;
-
-    public DefaultArrayField(String[] tags, TypeReference type, String name, LoopType loopType, Term loopExpression, Term[] params) {
-        super(tags);
-        this.type = type;
-        this.name = name;
-        this.loopType = loopType;
-        this.loopExpression = loopExpression;
-        this.params = params;
-    }
-
-    public TypeReference getType() {
-        return type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public LoopType getLoopType() {
-        return loopType;
-    }
-
-    public Term getLoopExpression() {
-        return loopExpression;
-    }
-
-    @Override
-    public Term[] getParams() {
-        return params;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
+
+import org.apache.plc4x.plugins.codegenerator.types.fields.ArrayField;
+import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
+import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
+
+public class DefaultArrayField extends DefaultTaggedField implements ArrayField {
+
+    private final TypeReference type;
+    private final String name;
+    private final LoopType loopType;
+    private final Term loopExpression;
+    private final Term[] params;
+
+    public DefaultArrayField(String[] tags, TypeReference type, String name, LoopType loopType, Term loopExpression, Term[] params) {
+        super(tags);
+        this.type = type;
+        this.name = name;
+        this.loopType = loopType;
+        this.loopExpression = loopExpression;
+        this.params = params;
+    }
+
+    public TypeReference getType() {
+        return type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public LoopType getLoopType() {
+        return loopType;
+    }
+
+    public Term getLoopExpression() {
+        return loopExpression;
+    }
+
+    @Override
+    public Term[] getParams() {
+        return params;
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultChecksumField.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultChecksumField.java
index 6730a84b411..063ac426c9b 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultChecksumField.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultChecksumField.java
@@ -1,55 +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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
-
-import org.apache.plc4x.plugins.codegenerator.types.fields.ChecksumField;
-import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
-import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
-
-public class DefaultChecksumField extends DefaultTaggedField implements ChecksumField {
-
-    private final TypeReference type;
-    private final String name;
-    private final Term checksumExpression;
-
-    public DefaultChecksumField(String[] tags, TypeReference type, String name, Term checksumExpression) {
-        super(tags);
-        this.type = type;
-        this.name = name;
-        this.checksumExpression = checksumExpression;
-    }
-
-    public TypeReference getType() {
-        return type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public Term getChecksumExpression() {
-        return checksumExpression;
-    }
-
-    public Term[] getParams() {
-        return new Term[0];
-    }
-
-}
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
+
+import org.apache.plc4x.plugins.codegenerator.types.fields.ChecksumField;
+import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
+import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
+
+public class DefaultChecksumField extends DefaultTaggedField implements ChecksumField {
+
+    private final TypeReference type;
+    private final String name;
+    private final Term checksumExpression;
+
+    public DefaultChecksumField(String[] tags, TypeReference type, String name, Term checksumExpression) {
+        super(tags);
+        this.type = type;
+        this.name = name;
+        this.checksumExpression = checksumExpression;
+    }
+
+    public TypeReference getType() {
+        return type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Term getChecksumExpression() {
+        return checksumExpression;
+    }
+
+    public Term[] getParams() {
+        return new Term[0];
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultConstField.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultConstField.java
index cdc42340764..f9ee8b5d600 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultConstField.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultConstField.java
@@ -1,55 +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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
-
-import org.apache.plc4x.plugins.codegenerator.types.fields.ConstField;
-import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
-import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
-
-public class DefaultConstField extends DefaultTaggedField implements ConstField {
-
-    private final TypeReference type;
-    private final String name;
-    private final Object referenceValue;
-
-    public DefaultConstField(String[] tags, TypeReference type, String name, Object referenceValue) {
-        super(tags);
-        this.type = type;
-        this.name = name;
-        this.referenceValue = referenceValue;
-    }
-
-    public TypeReference getType() {
-        return type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public Object getReferenceValue() {
-        return referenceValue;
-    }
-
-    public Term[] getParams() {
-        return new Term[0];
-    }
-
-}
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
+
+import org.apache.plc4x.plugins.codegenerator.types.fields.ConstField;
+import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
+import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
+
+public class DefaultConstField extends DefaultTaggedField implements ConstField {
+
+    private final TypeReference type;
+    private final String name;
+    private final Object referenceValue;
+
+    public DefaultConstField(String[] tags, TypeReference type, String name, Object referenceValue) {
+        super(tags);
+        this.type = type;
+        this.name = name;
+        this.referenceValue = referenceValue;
+    }
+
+    public TypeReference getType() {
+        return type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Object getReferenceValue() {
+        return referenceValue;
+    }
+
+    public Term[] getParams() {
+        return new Term[0];
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultDiscriminatorField.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultDiscriminatorField.java
index af77605ed3c..9fd7405d3d0 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultDiscriminatorField.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultDiscriminatorField.java
@@ -1,49 +1,49 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
-
-import org.apache.plc4x.plugins.codegenerator.types.fields.DiscriminatorField;
-import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
-import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
-
-public class DefaultDiscriminatorField extends DefaultTaggedField implements DiscriminatorField {
-
-    private final TypeReference type;
-    private final String name;
-
-    public DefaultDiscriminatorField(String[] tags, TypeReference type, String name) {
-        super(tags);
-        this.type = type;
-        this.name = name;
-    }
-
-    public TypeReference getType() {
-        return type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public Term[] getParams() {
-        return new Term[0];
-    }
-
-}
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
+
+import org.apache.plc4x.plugins.codegenerator.types.fields.DiscriminatorField;
+import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
+import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
+
+public class DefaultDiscriminatorField extends DefaultTaggedField implements DiscriminatorField {
+
+    private final TypeReference type;
+    private final String name;
+
+    public DefaultDiscriminatorField(String[] tags, TypeReference type, String name) {
+        super(tags);
+        this.type = type;
+        this.name = name;
+    }
+
+    public TypeReference getType() {
+        return type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Term[] getParams() {
+        return new Term[0];
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultEnumField.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultEnumField.java
index 97c791299fa..789e9c239d3 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultEnumField.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultEnumField.java
@@ -1,51 +1,51 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
-
-import org.apache.plc4x.plugins.codegenerator.types.fields.EnumField;
-import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
-import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
-
-public class DefaultEnumField extends DefaultTaggedField implements EnumField {
-
-    private final TypeReference type;
-    private final String name;
-    private final Term[] params;
-
-    public DefaultEnumField(String[] tags, TypeReference type, String name, Term[] params) {
-        super(tags);
-        this.type = type;
-        this.name = name;
-        this.params = params;
-    }
-
-    public TypeReference getType() {
-        return type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public Term[] getParams() {
-        return params;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
+
+import org.apache.plc4x.plugins.codegenerator.types.fields.EnumField;
+import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
+import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
+
+public class DefaultEnumField extends DefaultTaggedField implements EnumField {
+
+    private final TypeReference type;
+    private final String name;
+    private final Term[] params;
+
+    public DefaultEnumField(String[] tags, TypeReference type, String name, Term[] params) {
+        super(tags);
+        this.type = type;
+        this.name = name;
+        this.params = params;
+    }
+
+    public TypeReference getType() {
+        return type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Term[] getParams() {
+        return params;
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultImplicitField.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultImplicitField.java
index 02c416ef00b..c66779d21a4 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultImplicitField.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultImplicitField.java
@@ -1,55 +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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
-
-import org.apache.plc4x.plugins.codegenerator.types.fields.ImplicitField;
-import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
-import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
-
-public class DefaultImplicitField extends DefaultTaggedField implements ImplicitField {
-
-    private final TypeReference type;
-    private final String name;
-    private final Term serializationExpression;
-
-    public DefaultImplicitField(String[] tags, TypeReference type, String name, Term serializationExpression) {
-        super(tags);
-        this.type = type;
-        this.name = name;
-        this.serializationExpression = serializationExpression;
-    }
-
-    public TypeReference getType() {
-        return type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public Term getSerializationExpression() {
-        return serializationExpression;
-    }
-
-    public Term[] getParams() {
-        return new Term[0];
-    }
-
-}
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
+
+import org.apache.plc4x.plugins.codegenerator.types.fields.ImplicitField;
+import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
+import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
+
+public class DefaultImplicitField extends DefaultTaggedField implements ImplicitField {
+
+    private final TypeReference type;
+    private final String name;
+    private final Term serializationExpression;
+
+    public DefaultImplicitField(String[] tags, TypeReference type, String name, Term serializationExpression) {
+        super(tags);
+        this.type = type;
+        this.name = name;
+        this.serializationExpression = serializationExpression;
+    }
+
+    public TypeReference getType() {
+        return type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Term getSerializationExpression() {
+        return serializationExpression;
+    }
+
+    public Term[] getParams() {
+        return new Term[0];
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultManualArrayField.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultManualArrayField.java
index a108d3eca99..baea50a94a1 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultManualArrayField.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultManualArrayField.java
@@ -1,82 +1,82 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
-
-import org.apache.plc4x.plugins.codegenerator.types.fields.ManualArrayField;
-import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
-import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
-
-public class DefaultManualArrayField extends DefaultTaggedField implements ManualArrayField {
-
-    private final TypeReference type;
-    private final String name;
-    private final LoopType loopType;
-    private final Term loopExpression;
-    private final Term serializationExpression;
-    private final Term deserializationExpression;
-    private final Term lengthExpression;
-    private final Term[] params;
-
-    public DefaultManualArrayField(String[] tags, TypeReference type, String name, LoopType loopType, Term loopExpression, Term serializationExpression, Term deserializationExpression, Term lengthExpression, Term[] params) {
-        super(tags);
-        this.type = type;
-        this.name = name;
-        this.loopType = loopType;
-        this.loopExpression = loopExpression;
-        this.serializationExpression = serializationExpression;
-        this.deserializationExpression = deserializationExpression;
-        this.lengthExpression = lengthExpression;
-        this.params = params;
-    }
-
-    public TypeReference getType() {
-        return type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public LoopType getLoopType() {
-        return loopType;
-    }
-
-    public Term getLoopExpression() {
-        return loopExpression;
-    }
-
-    public Term getSerializationExpression() {
-        return serializationExpression;
-    }
-
-    public Term getDeserializationExpression() {
-        return deserializationExpression;
-    }
-
-    public Term getLengthExpression() {
-        return lengthExpression;
-    }
-
-    @Override
-    public Term[] getParams() {
-        return params;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
+
+import org.apache.plc4x.plugins.codegenerator.types.fields.ManualArrayField;
+import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
+import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
+
+public class DefaultManualArrayField extends DefaultTaggedField implements ManualArrayField {
+
+    private final TypeReference type;
+    private final String name;
+    private final LoopType loopType;
+    private final Term loopExpression;
+    private final Term serializationExpression;
+    private final Term deserializationExpression;
+    private final Term lengthExpression;
+    private final Term[] params;
+
+    public DefaultManualArrayField(String[] tags, TypeReference type, String name, LoopType loopType, Term loopExpression, Term serializationExpression, Term deserializationExpression, Term lengthExpression, Term[] params) {
+        super(tags);
+        this.type = type;
+        this.name = name;
+        this.loopType = loopType;
+        this.loopExpression = loopExpression;
+        this.serializationExpression = serializationExpression;
+        this.deserializationExpression = deserializationExpression;
+        this.lengthExpression = lengthExpression;
+        this.params = params;
+    }
+
+    public TypeReference getType() {
+        return type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public LoopType getLoopType() {
+        return loopType;
+    }
+
+    public Term getLoopExpression() {
+        return loopExpression;
+    }
+
+    public Term getSerializationExpression() {
+        return serializationExpression;
+    }
+
+    public Term getDeserializationExpression() {
+        return deserializationExpression;
+    }
+
+    public Term getLengthExpression() {
+        return lengthExpression;
+    }
+
+    @Override
+    public Term[] getParams() {
+        return params;
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultManualField.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultManualField.java
index 3cbd33705ab..111265e8d7f 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultManualField.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultManualField.java
@@ -1,69 +1,69 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
-
-import org.apache.plc4x.plugins.codegenerator.types.fields.ManualField;
-import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
-import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
-
-public class DefaultManualField extends DefaultTaggedField implements ManualField {
-
-    private final TypeReference type;
-    private final String name;
-    private final Term serializationExpression;
-    private final Term deserializationExpression;
-    private final Term lengthExpression;
-    private final Term[] params;
-
-    public DefaultManualField(String[] tags, TypeReference type, String name, Term serializationExpression, Term deserializationExpression, Term lengthExpression, Term[] params) {
-        super(tags);
-        this.type = type;
-        this.name = name;
-        this.serializationExpression = serializationExpression;
-        this.deserializationExpression = deserializationExpression;
-        this.lengthExpression = lengthExpression;
-        this.params = params;
-    }
-
-    public TypeReference getType() {
-        return type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public Term getSerializationExpression() {
-        return serializationExpression;
-    }
-
-    public Term getDeserializationExpression() {
-        return deserializationExpression;
-    }
-
-    public Term getLengthExpression() {
-        return lengthExpression;
-    }
-
-    public Term[] getParams() {
-        return params;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
+
+import org.apache.plc4x.plugins.codegenerator.types.fields.ManualField;
+import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
+import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
+
+public class DefaultManualField extends DefaultTaggedField implements ManualField {
+
+    private final TypeReference type;
+    private final String name;
+    private final Term serializationExpression;
+    private final Term deserializationExpression;
+    private final Term lengthExpression;
+    private final Term[] params;
+
+    public DefaultManualField(String[] tags, TypeReference type, String name, Term serializationExpression, Term deserializationExpression, Term lengthExpression, Term[] params) {
+        super(tags);
+        this.type = type;
+        this.name = name;
+        this.serializationExpression = serializationExpression;
+        this.deserializationExpression = deserializationExpression;
+        this.lengthExpression = lengthExpression;
+        this.params = params;
+    }
+
+    public TypeReference getType() {
+        return type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Term getSerializationExpression() {
+        return serializationExpression;
+    }
+
+    public Term getDeserializationExpression() {
+        return deserializationExpression;
+    }
+
+    public Term getLengthExpression() {
+        return lengthExpression;
+    }
+
+    public Term[] getParams() {
+        return params;
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultOptionalField.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultOptionalField.java
index 4e5b7b3ac06..dfde70c59fb 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultOptionalField.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultOptionalField.java
@@ -1,57 +1,57 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
-
-import org.apache.plc4x.plugins.codegenerator.types.fields.OptionalField;
-import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
-import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
-
-public class DefaultOptionalField extends DefaultTaggedField implements OptionalField {
-
-    private final TypeReference type;
-    private final String name;
-    private final Term conditionExpression;
-    private final Term[] params;
-
-    public DefaultOptionalField(String[] tags, TypeReference type, String name, Term conditionExpression, Term[] params) {
-        super(tags);
-        this.type = type;
-        this.name = name;
-        this.conditionExpression = conditionExpression;
-        this.params = params;
-    }
-
-    public TypeReference getType() {
-        return type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public Term getConditionExpression() {
-        return conditionExpression;
-    }
-
-    public Term[] getParams() {
-        return params;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
+
+import org.apache.plc4x.plugins.codegenerator.types.fields.OptionalField;
+import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
+import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
+
+public class DefaultOptionalField extends DefaultTaggedField implements OptionalField {
+
+    private final TypeReference type;
+    private final String name;
+    private final Term conditionExpression;
+    private final Term[] params;
+
+    public DefaultOptionalField(String[] tags, TypeReference type, String name, Term conditionExpression, Term[] params) {
+        super(tags);
+        this.type = type;
+        this.name = name;
+        this.conditionExpression = conditionExpression;
+        this.params = params;
+    }
+
+    public TypeReference getType() {
+        return type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Term getConditionExpression() {
+        return conditionExpression;
+    }
+
+    public Term[] getParams() {
+        return params;
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultPaddingField.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultPaddingField.java
index 7d1023f1b08..c73bf288035 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultPaddingField.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultPaddingField.java
@@ -1,63 +1,63 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
-
-import org.apache.plc4x.plugins.codegenerator.types.fields.PaddingField;
-import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
-import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
-
-public class DefaultPaddingField extends DefaultTaggedField implements PaddingField {
-
-    private final TypeReference type;
-    private final String name;
-    private final Term paddingValue;
-    private final Term paddingCondition;
-    private final Term[] params;
-
-    public DefaultPaddingField(String[] tags, TypeReference type, String name, Term paddingValue, Term paddingCondition, Term[] params) {
-        super(tags);
-        this.type = type;
-        this.name = name;
-        this.paddingValue = paddingValue;
-        this.paddingCondition = paddingCondition;
-        this.params = params;
-    }
-
-    public TypeReference getType() {
-        return type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public Term getPaddingValue() {
-        return paddingValue;
-    }
-
-    public Term getPaddingCondition() {
-        return paddingCondition;
-    }
-
-    public Term[] getParams() {
-        return params;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
+
+import org.apache.plc4x.plugins.codegenerator.types.fields.PaddingField;
+import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
+import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
+
+public class DefaultPaddingField extends DefaultTaggedField implements PaddingField {
+
+    private final TypeReference type;
+    private final String name;
+    private final Term paddingValue;
+    private final Term paddingCondition;
+    private final Term[] params;
+
+    public DefaultPaddingField(String[] tags, TypeReference type, String name, Term paddingValue, Term paddingCondition, Term[] params) {
+        super(tags);
+        this.type = type;
+        this.name = name;
+        this.paddingValue = paddingValue;
+        this.paddingCondition = paddingCondition;
+        this.params = params;
+    }
+
+    public TypeReference getType() {
+        return type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Term getPaddingValue() {
+        return paddingValue;
+    }
+
+    public Term getPaddingCondition() {
+        return paddingCondition;
+    }
+
+    public Term[] getParams() {
+        return params;
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultReservedField.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultReservedField.java
index 6cb1c1c14fe..84919983ac4 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultReservedField.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultReservedField.java
@@ -1,49 +1,49 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
-
-import org.apache.plc4x.plugins.codegenerator.types.fields.ReservedField;
-import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
-import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
-
-public class DefaultReservedField extends DefaultTaggedField implements ReservedField {
-
-    private final TypeReference type;
-    private final Object referenceValue;
-
-    public DefaultReservedField(String[] tags, TypeReference type, Object referenceValue) {
-        super(tags);
-        this.type = type;
-        this.referenceValue = referenceValue;
-    }
-
-    public TypeReference getType() {
-        return type;
-    }
-
-    public Object getReferenceValue() {
-        return referenceValue;
-    }
-
-    public Term[] getParams() {
-        return new Term[0];
-    }
-
-}
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
+
+import org.apache.plc4x.plugins.codegenerator.types.fields.ReservedField;
+import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
+import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
+
+public class DefaultReservedField extends DefaultTaggedField implements ReservedField {
+
+    private final TypeReference type;
+    private final Object referenceValue;
+
+    public DefaultReservedField(String[] tags, TypeReference type, Object referenceValue) {
+        super(tags);
+        this.type = type;
+        this.referenceValue = referenceValue;
+    }
+
+    public TypeReference getType() {
+        return type;
+    }
+
+    public Object getReferenceValue() {
+        return referenceValue;
+    }
+
+    public Term[] getParams() {
+        return new Term[0];
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultSimpleField.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultSimpleField.java
index 46f85a74596..54d544e76e8 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultSimpleField.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultSimpleField.java
@@ -1,51 +1,51 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
-
-import org.apache.plc4x.plugins.codegenerator.types.fields.SimpleField;
-import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
-import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
-
-public class DefaultSimpleField extends DefaultTaggedField implements SimpleField {
-
-    private final TypeReference type;
-    private final String name;
-    private final Term[] params;
-
-    public DefaultSimpleField(String[] tags, TypeReference type, String name, Term[] params) {
-        super(tags);
-        this.type = type;
-        this.name = name;
-        this.params = params;
-    }
-
-    public TypeReference getType() {
-        return type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public Term[] getParams() {
-        return params;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
+
+import org.apache.plc4x.plugins.codegenerator.types.fields.SimpleField;
+import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
+import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
+
+public class DefaultSimpleField extends DefaultTaggedField implements SimpleField {
+
+    private final TypeReference type;
+    private final String name;
+    private final Term[] params;
+
+    public DefaultSimpleField(String[] tags, TypeReference type, String name, Term[] params) {
+        super(tags);
+        this.type = type;
+        this.name = name;
+        this.params = params;
+    }
+
+    public TypeReference getType() {
+        return type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Term[] getParams() {
+        return params;
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultSwitchField.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultSwitchField.java
index a7e8a8f9594..eac08dbb607 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultSwitchField.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultSwitchField.java
@@ -1,56 +1,56 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
-
-
-import org.apache.plc4x.plugins.codegenerator.types.definitions.DiscriminatedComplexTypeDefinition;
-import org.apache.plc4x.plugins.codegenerator.types.fields.SwitchField;
-import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
-
-import java.util.LinkedList;
-import java.util.List;
-
-public class DefaultSwitchField implements SwitchField {
-
-    private final String[] discriminatorNames;
-    private final List<DiscriminatedComplexTypeDefinition> cases;
-
-    public DefaultSwitchField(String[] discriminatorNames) {
-        this.discriminatorNames = discriminatorNames;
-        this.cases = new LinkedList<>();
-    }
-
-    public String[] getDiscriminatorNames() {
-        return discriminatorNames;
-    }
-
-    public void addCase(DiscriminatedComplexTypeDefinition caseType) {
-        cases.add(caseType);
-    }
-
-    public List<DiscriminatedComplexTypeDefinition> getCases() {
-        return cases;
-    }
-
-    public Term[] getParams() {
-        return new Term[0];
-    }
-
-}
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
+
+
+import org.apache.plc4x.plugins.codegenerator.types.definitions.DiscriminatedComplexTypeDefinition;
+import org.apache.plc4x.plugins.codegenerator.types.fields.SwitchField;
+import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class DefaultSwitchField implements SwitchField {
+
+    private final String[] discriminatorNames;
+    private final List<DiscriminatedComplexTypeDefinition> cases;
+
+    public DefaultSwitchField(String[] discriminatorNames) {
+        this.discriminatorNames = discriminatorNames;
+        this.cases = new LinkedList<>();
+    }
+
+    public String[] getDiscriminatorNames() {
+        return discriminatorNames;
+    }
+
+    public void addCase(DiscriminatedComplexTypeDefinition caseType) {
+        cases.add(caseType);
+    }
+
+    public List<DiscriminatedComplexTypeDefinition> getCases() {
+        return cases;
+    }
+
+    public Term[] getParams() {
+        return new Term[0];
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultTaggedField.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultTaggedField.java
index 30834de567c..7ed9b843547 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultTaggedField.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultTaggedField.java
@@ -1,36 +1,36 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
-
-import org.apache.plc4x.plugins.codegenerator.types.fields.TaggedField;
-
-public abstract class DefaultTaggedField implements TaggedField {
-
-    private final String[] tags;
-
-    public DefaultTaggedField(String[] tags) {
-        this.tags = tags;
-    }
-
-    @Override
-    public String[] getTags() {
-        return tags;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
+
+import org.apache.plc4x.plugins.codegenerator.types.fields.TaggedField;
+
+public abstract class DefaultTaggedField implements TaggedField {
+
+    private final String[] tags;
+
+    public DefaultTaggedField(String[] tags) {
+        this.tags = tags;
+    }
+
+    @Override
+    public String[] getTags() {
+        return tags;
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultVirtualField.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultVirtualField.java
index 07a26cc1964..2498a72074e 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultVirtualField.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultVirtualField.java
@@ -1,55 +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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
-
-import org.apache.plc4x.plugins.codegenerator.types.fields.VirtualField;
-import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
-import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
-
-public class DefaultVirtualField extends DefaultTaggedField implements VirtualField {
-
-    private final TypeReference type;
-    private final String name;
-    private final Term valueExpression;
-
-    public DefaultVirtualField(String[] tags, TypeReference type, String name, Term valueExpression) {
-        super(tags);
-        this.type = type;
-        this.name = name;
-        this.valueExpression = valueExpression;
-    }
-
-    public TypeReference getType() {
-        return type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public Term getValueExpression() {
-        return valueExpression;
-    }
-
-    public Term[] getParams() {
-        return new Term[0];
-    }
-
-}
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields;
+
+import org.apache.plc4x.plugins.codegenerator.types.fields.VirtualField;
+import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
+import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
+
+public class DefaultVirtualField extends DefaultTaggedField implements VirtualField {
+
+    private final TypeReference type;
+    private final String name;
+    private final Term valueExpression;
+
+    public DefaultVirtualField(String[] tags, TypeReference type, String name, Term valueExpression) {
+        super(tags);
+        this.type = type;
+        this.name = name;
+        this.valueExpression = valueExpression;
+    }
+
+    public TypeReference getType() {
+        return type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Term getValueExpression() {
+        return valueExpression;
+    }
+
+    public Term[] getParams() {
+        return new Term[0];
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/references/DefaultComplexTypeReference.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/references/DefaultComplexTypeReference.java
index 90a1260af6a..3e4e2879c8e 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/references/DefaultComplexTypeReference.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/references/DefaultComplexTypeReference.java
@@ -1,37 +1,37 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.language.mspec.model.references;
-
-import org.apache.plc4x.plugins.codegenerator.types.references.ComplexTypeReference;
-
-public class DefaultComplexTypeReference implements ComplexTypeReference {
-
-    private final String name;
-
-    public DefaultComplexTypeReference(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.language.mspec.model.references;
+
+import org.apache.plc4x.plugins.codegenerator.types.references.ComplexTypeReference;
+
+public class DefaultComplexTypeReference implements ComplexTypeReference {
+
+    private final String name;
+
+    public DefaultComplexTypeReference(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/references/DefaultSimpleTypeReference.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/references/DefaultSimpleTypeReference.java
index a1f3aea153b..07498c59161 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/references/DefaultSimpleTypeReference.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/references/DefaultSimpleTypeReference.java
@@ -1,44 +1,44 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.language.mspec.model.references;
-
-import org.apache.plc4x.plugins.codegenerator.types.references.SimpleTypeReference;
-
-public class DefaultSimpleTypeReference implements SimpleTypeReference {
-
-    private final SimpleBaseType baseType;
-    private final int size;
-
-    public DefaultSimpleTypeReference(SimpleBaseType baseType, int size) {
-        this.baseType = baseType;
-        this.size = size;
-    }
-
-    @Override
-    public SimpleBaseType getBaseType() {
-        return baseType;
-    }
-
-    @Override
-    public int getSize() {
-        return size;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.language.mspec.model.references;
+
+import org.apache.plc4x.plugins.codegenerator.types.references.SimpleTypeReference;
+
+public class DefaultSimpleTypeReference implements SimpleTypeReference {
+
+    private final SimpleBaseType baseType;
+    private final int size;
+
+    public DefaultSimpleTypeReference(SimpleBaseType baseType, int size) {
+        this.baseType = baseType;
+        this.size = size;
+    }
+
+    @Override
+    public SimpleBaseType getBaseType() {
+        return baseType;
+    }
+
+    @Override
+    public int getSize() {
+        return size;
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/references/DefaultSimpleVarLengthTypeReference.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/references/DefaultSimpleVarLengthTypeReference.java
index dd3f8e47a44..41c4fc195db 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/references/DefaultSimpleVarLengthTypeReference.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/references/DefaultSimpleVarLengthTypeReference.java
@@ -1,30 +1,30 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.language.mspec.model.references;
-
-import org.apache.plc4x.plugins.codegenerator.types.references.SimpleVarLengthTypeReference;
-
-public class DefaultSimpleVarLengthTypeReference extends DefaultSimpleTypeReference implements SimpleVarLengthTypeReference {
-
-    public DefaultSimpleVarLengthTypeReference(SimpleBaseType baseType) {
-        super(baseType, -1);
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.language.mspec.model.references;
+
+import org.apache.plc4x.plugins.codegenerator.types.references.SimpleVarLengthTypeReference;
+
+public class DefaultSimpleVarLengthTypeReference extends DefaultSimpleTypeReference implements SimpleVarLengthTypeReference {
+
+    public DefaultSimpleVarLengthTypeReference(SimpleBaseType baseType) {
+        super(baseType, -1);
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatListener.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatListener.java
index 74ff1cf408d..02e0392fb89 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatListener.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatListener.java
@@ -1,469 +1,469 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.language.mspec.parser;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.plc4x.plugins.codegenerator.language.mspec.MSpecBaseListener;
-import org.apache.plc4x.plugins.codegenerator.language.mspec.MSpecParser;
-import org.apache.plc4x.plugins.codegenerator.language.mspec.expression.ExpressionStringParser;
-import org.apache.plc4x.plugins.codegenerator.language.mspec.model.definitions.DefaultComplexTypeDefinition;
-import org.apache.plc4x.plugins.codegenerator.language.mspec.model.definitions.DefaultDiscriminatedComplexTypeDefinition;
-import org.apache.plc4x.plugins.codegenerator.language.mspec.model.definitions.DefaultEnumTypeDefinition;
-import org.apache.plc4x.plugins.codegenerator.language.mspec.model.definitions.DefaultEnumValue;
-import org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields.*;
-import org.apache.plc4x.plugins.codegenerator.language.mspec.model.references.DefaultComplexTypeReference;
-import org.apache.plc4x.plugins.codegenerator.language.mspec.model.references.DefaultSimpleTypeReference;
-import org.apache.plc4x.plugins.codegenerator.types.definitions.Argument;
-import org.apache.plc4x.plugins.codegenerator.types.definitions.DiscriminatedComplexTypeDefinition;
-import org.apache.plc4x.plugins.codegenerator.types.definitions.TypeDefinition;
-import org.apache.plc4x.plugins.codegenerator.types.enums.EnumValue;
-import org.apache.plc4x.plugins.codegenerator.types.fields.ArrayField;
-import org.apache.plc4x.plugins.codegenerator.types.fields.Field;
-import org.apache.plc4x.plugins.codegenerator.types.fields.ManualArrayField;
-import org.apache.plc4x.plugins.codegenerator.types.fields.SwitchField;
-import org.apache.plc4x.plugins.codegenerator.types.references.ComplexTypeReference;
-import org.apache.plc4x.plugins.codegenerator.types.references.SimpleTypeReference;
-import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
-import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
-
-import java.io.InputStream;
-import java.nio.charset.Charset;
-import java.util.*;
-
-public class MessageFormatListener extends MSpecBaseListener {
-
-    private Deque<List<Field>> parserContexts;
-
-    private Deque<List<EnumValue>> enumContexts;
-
-    private Map<String, TypeDefinition> types;
-
-    public Map<String, TypeDefinition> getTypes() {
-        return types;
-    }
-
-    @Override
-    public void enterFile(MSpecParser.FileContext ctx) {
-        parserContexts = new LinkedList<>();
-        enumContexts = new LinkedList<>();
-        types = new HashMap<>();
-    }
-
-    @Override
-    public void enterComplexType(MSpecParser.ComplexTypeContext ctx) {
-        if(ctx.enumValues != null) {
-            List<EnumValue> enumContext = new LinkedList<>();
-            enumContexts.push(enumContext);
-        } else {
-            List<Field> parserContext = new LinkedList<>();
-            parserContexts.push(parserContext);
-        }
-    }
-
-    @Override
-    public void exitComplexType(MSpecParser.ComplexTypeContext ctx) {
-        String typeName = ctx.name.id.getText();
-        Argument[] parserArguments = null;
-        if(ctx.params != null) {
-            parserArguments = getParserArguments(ctx.params.argument());
-        }
-
-        if(ctx.enumValues != null) {
-            TypeReference type = getTypeReference(ctx.type);
-            EnumValue[] enumValues = getEnumValues();
-            DefaultEnumTypeDefinition enumType = new DefaultEnumTypeDefinition(typeName, type, enumValues,
-                parserArguments, null);
-            types.put(typeName, enumType);
-            enumContexts.pop();
-        } else {
-            // If the type has sub-types it's an abstract type.
-            SwitchField switchField = getSwitchField();
-            boolean abstractType = switchField != null;
-            DefaultComplexTypeDefinition type = new DefaultComplexTypeDefinition(typeName, parserArguments, null,
-                abstractType, parserContexts.peek());
-            types.put(typeName, type);
-
-            // Set the parent type for all sub-types.
-            if (switchField != null) {
-                for (DiscriminatedComplexTypeDefinition subtype : switchField.getCases()) {
-                    if (subtype instanceof DefaultDiscriminatedComplexTypeDefinition) {
-                        ((DefaultDiscriminatedComplexTypeDefinition) subtype).setParentType(type);
-                    }
-                }
-            }
-            parserContexts.pop();
-        }
-    }
-
-    @Override
-    public void enterArrayField(MSpecParser.ArrayFieldContext ctx) {
-        TypeReference type = getTypeReference(ctx.type);
-        String name = ctx.name.id.getText();
-        ArrayField.LoopType loopType = ArrayField.LoopType.valueOf(ctx.loopType.getText().toUpperCase());
-        String loopExpressionString = ctx.loopExpression.expr.getText();
-        Term loopExpression =  getExpressionTerm(loopExpressionString);
-        Term[] params = getFieldParams((MSpecParser.FieldDefinitionContext) ctx.parent.parent);
-        Field field = new DefaultArrayField(null, type, name, loopType, loopExpression, params);
-        if(parserContexts.peek() != null) {
-            parserContexts.peek().add(field);
-        }
-    }
-
-    @Override
-    public void enterChecksumField(MSpecParser.ChecksumFieldContext ctx) {
-        SimpleTypeReference type = getSimpleTypeReference(ctx.type);
-        String name = ctx.name.id.getText();
-        String checksumExpressionString = ctx.checksumExpression.expr.getText();
-        Term checksumExpression = getExpressionTerm(checksumExpressionString);
-        Field field = new DefaultChecksumField(null, type, name, checksumExpression);
-        if(parserContexts.peek() != null) {
-            parserContexts.peek().add(field);
-        }
-    }
-
-    @Override
-    public void enterConstField(MSpecParser.ConstFieldContext ctx) {
-        SimpleTypeReference type = getSimpleTypeReference(ctx.type);
-        String name = ctx.name.id.getText();
-        String expected = ctx.expected.expr.getText();
-        Field field = new DefaultConstField(null, type, name, expected);
-        if(parserContexts.peek() != null) {
-            parserContexts.peek().add(field);
-        }
-    }
-
-    @Override
-    public void enterDiscriminatorField(MSpecParser.DiscriminatorFieldContext ctx) {
-        SimpleTypeReference type = getSimpleTypeReference(ctx.type);
-        String name = ctx.name.id.getText();
-        Field field = new DefaultDiscriminatorField(null, type, name);
-        if(parserContexts.peek() != null) {
-            parserContexts.peek().add(field);
-        }
-    }
-
-    @Override
-    public void enterEnumField(MSpecParser.EnumFieldContext ctx) {
-        ComplexTypeReference type = new DefaultComplexTypeReference(ctx.type.complexTypeReference.getText());
-        String name = ctx.name.id.getText();
-        Term[] params = getFieldParams((MSpecParser.FieldDefinitionContext) ctx.parent.parent);
-        Field field = new DefaultEnumField(null, type, name, params);
-        if(parserContexts.peek() != null) {
-            parserContexts.peek().add(field);
-        }
-    }
-
-    @Override
-    public void enterImplicitField(MSpecParser.ImplicitFieldContext ctx) {
-        SimpleTypeReference type = getSimpleTypeReference(ctx.type);
-        String name = ctx.name.id.getText();
-        String serializationExpressionString = ctx.serializationExpression.expr.getText();
-        Term serializationExpression = getExpressionTerm(serializationExpressionString);
-        Field field = new DefaultImplicitField(null, type, name, serializationExpression);
-        if(parserContexts.peek() != null) {
-            parserContexts.peek().add(field);
-        }
-    }
-
-    @Override
-    public void enterManualArrayField(MSpecParser.ManualArrayFieldContext ctx) {
-        TypeReference type = getTypeReference(ctx.type);
-        String name = ctx.name.id.getText();
-        ManualArrayField.LoopType loopType = ManualArrayField.LoopType.valueOf(
-            ctx.loopType.getText().toUpperCase());
-        String loopExpressionString = ctx.loopExpression.expr.getText();
-        Term loopExpression =  getExpressionTerm(loopExpressionString);
-        String serializationExpressionString = ctx.serializationExpression.expr.getText();
-        Term serializationExpression = getExpressionTerm(serializationExpressionString);
-        String deserializationExpressionString = ctx.deserializationExpression.expr.getText();
-        Term deserializationExpression = getExpressionTerm(deserializationExpressionString);
-        String lengthExpressionString = ctx.lengthExpression.expr.getText();
-        Term lengthExpression =  getExpressionTerm(lengthExpressionString);
-        Term[] params = getFieldParams((MSpecParser.FieldDefinitionContext) ctx.parent.parent);
-        Field field = new DefaultManualArrayField(null, type, name, loopType, loopExpression, serializationExpression,
-            deserializationExpression, lengthExpression, params);
-        if(parserContexts.peek() != null) {
-            parserContexts.peek().add(field);
-        }
-    }
-
-    @Override
-    public void enterManualField(MSpecParser.ManualFieldContext ctx) {
-        TypeReference type = getTypeReference(ctx.type);
-        String name = ctx.name.id.getText();
-        String serializationExpressionString = ctx.serializationExpression.expr.getText();
-        Term serializationExpression = getExpressionTerm(serializationExpressionString);
-        String deserializationExpressionString = ctx.deserializationExpression.expr.getText();
-        Term deserializationExpression = getExpressionTerm(deserializationExpressionString);
-        String lengthExpressionString = ctx.lengthExpression.expr.getText();
-        Term lengthExpression =  getExpressionTerm(lengthExpressionString);
-        Term[] params = getFieldParams((MSpecParser.FieldDefinitionContext) ctx.parent.parent);
-        Field field = new DefaultManualField(null, type, name, serializationExpression, deserializationExpression,
-            lengthExpression, params);
-        if(parserContexts.peek() != null) {
-            parserContexts.peek().add(field);
-        }
-    }
-
-    @Override
-    public void enterOptionalField(MSpecParser.OptionalFieldContext ctx) {
-        TypeReference type = getTypeReference(ctx.type);
-        String name = ctx.name.id.getText();
-        String conditionExpressionString = ctx.condition.expr.getText();
-        Term conditionExpression = getExpressionTerm(conditionExpressionString);
-        Term[] params = getFieldParams((MSpecParser.FieldDefinitionContext) ctx.parent.parent);
-        Field field = new DefaultOptionalField(null, type, name, conditionExpression, params);
-        if(parserContexts.peek() != null) {
-            parserContexts.peek().add(field);
-        }
-    }
-
-    @Override
-    public void enterPaddingField(MSpecParser.PaddingFieldContext ctx) {
-        SimpleTypeReference type = getSimpleTypeReference(ctx.type);
-        String name = ctx.name.id.getText();
-        String paddingValueString = ctx.paddingValue.expr.getText();
-        Term paddingValue = getExpressionTerm(paddingValueString);
-        String paddingConditionString = ctx.paddingCondition.expr.getText();
-        Term paddingCondition = getExpressionTerm(paddingConditionString);
-        Term[] params = getFieldParams((MSpecParser.FieldDefinitionContext) ctx.parent.parent);
-        Field field = new DefaultPaddingField(null, type, name, paddingValue, paddingCondition, params);
-        if(parserContexts.peek() != null) {
-            parserContexts.peek().add(field);
-        }
-    }
-
-    @Override
-    public void enterReservedField(MSpecParser.ReservedFieldContext ctx) {
-        SimpleTypeReference type = getSimpleTypeReference(ctx.type);
-        String expected = ctx.expected.expr.getText();
-        Field field = new DefaultReservedField(null, type, expected);
-        if(parserContexts.peek() != null) {
-            parserContexts.peek().add(field);
-        }
-    }
-
-    @Override
-    public void enterSimpleField(MSpecParser.SimpleFieldContext ctx) {
-        TypeReference type = getTypeReference(ctx.type);
-        String name = ctx.name.id.getText();
-        Term[] params = getFieldParams((MSpecParser.FieldDefinitionContext) ctx.parent.parent);
-        Field field = new DefaultSimpleField(null, type, name, params);
-        if(parserContexts.peek() != null) {
-            parserContexts.peek().add(field);
-        }
-    }
-
-    @Override
-    public void enterTypeSwitchField(MSpecParser.TypeSwitchFieldContext ctx) {
-        int numDiscriminators = ctx.discriminators.expression().size();
-        String[] discriminatorNames = new String[numDiscriminators];
-        for(int i = 0; i < numDiscriminators; i++) {
-            discriminatorNames[i] = ctx.discriminators.expression().get(i).expr.getText();
-        }
-        DefaultSwitchField field = new DefaultSwitchField(discriminatorNames);
-        if(parserContexts.peek() != null) {
-            parserContexts.peek().add(field);
-        }
-    }
-
-    @Override
-    public void enterVirtualField(MSpecParser.VirtualFieldContext ctx) {
-        TypeReference type = getTypeReference(ctx.type);
-        String name = ctx.name.id.getText();
-        String valueExpressionString = ctx.valueExpression.expr.getText();
-        Term valueExpression = getExpressionTerm(valueExpressionString);
-        Field field = new DefaultVirtualField(null, type, name, valueExpression);
-        if(parserContexts.peek() != null) {
-            parserContexts.peek().add(field);
-        }
-    }
-
-    @Override
-    public void enterCaseStatement(MSpecParser.CaseStatementContext ctx) {
-        List<Field> parserContext = new LinkedList<>();
-        parserContexts.push(parserContext);
-    }
-
-    @Override
-    public void exitCaseStatement(MSpecParser.CaseStatementContext ctx) {
-        String typeName = ctx.name.getText();
-        List<Argument> parserArguments = new LinkedList<>();
-        // Add all the arguments from the parent type.
-        if(((MSpecParser.ComplexTypeContext) ctx.parent.parent.parent.parent).params != null) {
-            parserArguments.addAll(Arrays.asList(getParserArguments(
-                ((MSpecParser.ComplexTypeContext) ctx.parent.parent.parent.parent).params.argument())));
-        }
-        // Add all eventually existing local arguments.
-        if(ctx.argumentList() != null) {
-            parserArguments.addAll(Arrays.asList(getParserArguments(ctx.argumentList().argument())));
-        }
-
-        String[] discriminatorValues;
-        if(ctx.discriminatorValues != null) {
-            List<MSpecParser.ExpressionContext> expressions = ctx.discriminatorValues.expression();
-            discriminatorValues = new String[expressions.size()];
-            for (int i = 0; i < expressions.size(); i++) {
-                discriminatorValues[i] = expressions.get(i).expr.getText();
-            }
-        } else {
-            discriminatorValues = new String[0];
-        }
-        DefaultDiscriminatedComplexTypeDefinition type =
-            new DefaultDiscriminatedComplexTypeDefinition(typeName, parserArguments.toArray(new Argument[0]), null,
-                discriminatorValues, parserContexts.pop());
-
-        // Add the type to the switch field definition.
-        DefaultSwitchField switchField = getSwitchField();
-        if(switchField == null) {
-            throw new RuntimeException("This shouldn't have happened");
-        }
-        switchField.addCase(type);
-
-        // Add the type to the type list.
-        types.put(typeName, type);
-    }
-
-    @Override
-    public void enterEnumValueDefinition(MSpecParser.EnumValueDefinitionContext ctx) {
-        String value = unquoteString(ctx.valueExpression.getText());
-        String name = ctx.name.getText();
-        Map<String, String> constants = null;
-        if(ctx.constantValueExpressions != null) {
-            MSpecParser.ComplexTypeContext parentCtx = (MSpecParser.ComplexTypeContext) ctx.parent;
-            int numConstantValues = parentCtx.params.argument().size();
-            int numExpressionValues = ctx.constantValueExpressions.expression().size();
-            // This only works if we provide exactly the same number of expressions as we defined constants
-            if(numConstantValues != numExpressionValues) {
-                throw new RuntimeException("Number of constant value expressions doesn't match the number of " +
-                    "defined constants. Expecting " + numConstantValues + " but got " + numExpressionValues);
-            }
-
-            // Build a map of the constant expressions (With the constant name as key)
-            constants = new HashMap<>();
-            for (int i = 0; i < numConstantValues; i++) {
-                MSpecParser.ArgumentContext argumentContext = parentCtx.params.argument(i);
-                String constantName = argumentContext.name.getText();
-                constantName = constantName.substring(1, constantName.length() - 1);
-                MSpecParser.ExpressionContext expression = ctx.constantValueExpressions.expression(i);
-                String constant = unquoteString(expression.getText());
-                constants.put(constantName, constant);
-            }
-        }
-        final DefaultEnumValue enumValue = new DefaultEnumValue(value, name, constants);
-        this.enumContexts.peek().add(enumValue);
-    }
-
-    private Term getExpressionTerm(String expressionString) {
-        InputStream inputStream = IOUtils.toInputStream(expressionString, Charset.defaultCharset());
-        ExpressionStringParser parser = new ExpressionStringParser();
-        try {
-            return parser.parse(inputStream);
-        } catch (Exception e) {
-            throw new RuntimeException("Error parsing expression: '" + expressionString + "'", e);
-        }
-    }
-
-    private TypeReference getTypeReference(MSpecParser.TypeReferenceContext ctx) {
-        if(ctx.simpleTypeReference != null) {
-            SimpleTypeReference.SimpleBaseType simpleBaseType = SimpleTypeReference.SimpleBaseType.valueOf(
-                ctx.simpleTypeReference.base.getText().toUpperCase());
-            if(ctx.simpleTypeReference.size != null) {
-                int size = Integer.parseInt(ctx.simpleTypeReference.size.getText());
-                return new DefaultSimpleTypeReference(simpleBaseType, size);
-            } else {
-                return new DefaultSimpleTypeReference(simpleBaseType, 1);
-            }
-        } else {
-            return new DefaultComplexTypeReference(ctx.complexTypeReference.getText());
-        }
-    }
-
-    private SimpleTypeReference getSimpleTypeReference(MSpecParser.DataTypeContext ctx) {
-        SimpleTypeReference.SimpleBaseType simpleBaseType =
-            SimpleTypeReference.SimpleBaseType.valueOf(ctx.base.getText().toUpperCase());
-        if(ctx.size != null) {
-            int size = Integer.parseInt(ctx.size.getText());
-            return new DefaultSimpleTypeReference(simpleBaseType, size);
-        } else {
-            return new DefaultSimpleTypeReference(simpleBaseType, 1);
-        }
-    }
-
-    private DefaultSwitchField getSwitchField() {
-        for (Field field : Objects.requireNonNull(parserContexts.peek())) {
-            if(field instanceof DefaultSwitchField) {
-                return (DefaultSwitchField) field;
-            }
-        }
-        return null;
-    }
-
-    private EnumValue[] getEnumValues() {
-        return Objects.requireNonNull(enumContexts.peek()).toArray(new EnumValue[0]);
-    }
-
-    private Argument[] getParserArguments(List<MSpecParser.ArgumentContext> params) {
-        Argument[] parserArguments = new Argument[params.size()];
-        for (int i = 0; i < params.size(); i++) {
-            TypeReference type = getTypeReference(params.get(i).type);
-            String name = params.get(i).name.id.getText();
-            parserArguments[i] = new Argument(type, name);
-        }
-        return parserArguments;
-    }
-
-    private Term[] getFieldParams(MSpecParser.FieldDefinitionContext parentCtx) {
-        Term[] params = null;
-        if(parentCtx.params != null) {
-            params = new Term[parentCtx.params.expression().size()];
-            for(int i = 0; i < parentCtx.params.expression().size(); i++) {
-                params[i] = parseExpression(parentCtx.params.expression().get(i).expr.getText());
-            }
-        }
-        return params;
-    }
-
-    private Term parseExpression(String expressionString) {
-        InputStream inputStream = IOUtils.toInputStream(expressionString, Charset.defaultCharset());
-        ExpressionStringParser parser = new ExpressionStringParser();
-        try {
-            return parser.parse(inputStream);
-        } catch (Exception e) {
-            throw new RuntimeException("Error parsing expression: '" + expressionString + "'", e);
-        }
-    }
-
-    private String unquoteString(String quotedString) {
-        if(quotedString != null && quotedString.length() > 2) {
-            return quotedString.substring(1, quotedString.length() - 1);
-        }
-        return quotedString;
-    }
-
-    public static void main(String[] args) {
-        //Term term = new ExpressionStringParser().parse(IOUtils.toInputStream("CAST(CAST(parameter,S7ParameterUserData).items(hurz)[0],S7ParameterUserDataItemCPUFunctions).cpuFunctionType", Charset.defaultCharset()));
-        //Term term = new ExpressionStringParser().parse(IOUtils.toInputStream("CAST(parameter,S7ParameterUserData).items(hurz)[0]", Charset.defaultCharset()));
-        Term term = new ExpressionStringParser().parse(IOUtils.toInputStream("payload.lengthInBytes+4", Charset.defaultCharset()));
-
-        System.out.println(term);
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.language.mspec.parser;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.plc4x.plugins.codegenerator.language.mspec.MSpecBaseListener;
+import org.apache.plc4x.plugins.codegenerator.language.mspec.MSpecParser;
+import org.apache.plc4x.plugins.codegenerator.language.mspec.expression.ExpressionStringParser;
+import org.apache.plc4x.plugins.codegenerator.language.mspec.model.definitions.DefaultComplexTypeDefinition;
+import org.apache.plc4x.plugins.codegenerator.language.mspec.model.definitions.DefaultDiscriminatedComplexTypeDefinition;
+import org.apache.plc4x.plugins.codegenerator.language.mspec.model.definitions.DefaultEnumTypeDefinition;
+import org.apache.plc4x.plugins.codegenerator.language.mspec.model.definitions.DefaultEnumValue;
+import org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields.*;
+import org.apache.plc4x.plugins.codegenerator.language.mspec.model.references.DefaultComplexTypeReference;
+import org.apache.plc4x.plugins.codegenerator.language.mspec.model.references.DefaultSimpleTypeReference;
+import org.apache.plc4x.plugins.codegenerator.types.definitions.Argument;
+import org.apache.plc4x.plugins.codegenerator.types.definitions.DiscriminatedComplexTypeDefinition;
+import org.apache.plc4x.plugins.codegenerator.types.definitions.TypeDefinition;
+import org.apache.plc4x.plugins.codegenerator.types.enums.EnumValue;
+import org.apache.plc4x.plugins.codegenerator.types.fields.ArrayField;
+import org.apache.plc4x.plugins.codegenerator.types.fields.Field;
+import org.apache.plc4x.plugins.codegenerator.types.fields.ManualArrayField;
+import org.apache.plc4x.plugins.codegenerator.types.fields.SwitchField;
+import org.apache.plc4x.plugins.codegenerator.types.references.ComplexTypeReference;
+import org.apache.plc4x.plugins.codegenerator.types.references.SimpleTypeReference;
+import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
+import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
+
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.*;
+
+public class MessageFormatListener extends MSpecBaseListener {
+
+    private Deque<List<Field>> parserContexts;
+
+    private Deque<List<EnumValue>> enumContexts;
+
+    private Map<String, TypeDefinition> types;
+
+    public Map<String, TypeDefinition> getTypes() {
+        return types;
+    }
+
+    @Override
+    public void enterFile(MSpecParser.FileContext ctx) {
+        parserContexts = new LinkedList<>();
+        enumContexts = new LinkedList<>();
+        types = new HashMap<>();
+    }
+
+    @Override
+    public void enterComplexType(MSpecParser.ComplexTypeContext ctx) {
+        if(ctx.enumValues != null) {
+            List<EnumValue> enumContext = new LinkedList<>();
+            enumContexts.push(enumContext);
+        } else {
+            List<Field> parserContext = new LinkedList<>();
+            parserContexts.push(parserContext);
+        }
+    }
+
+    @Override
+    public void exitComplexType(MSpecParser.ComplexTypeContext ctx) {
+        String typeName = ctx.name.id.getText();
+        Argument[] parserArguments = null;
+        if(ctx.params != null) {
+            parserArguments = getParserArguments(ctx.params.argument());
+        }
+
+        if(ctx.enumValues != null) {
+            TypeReference type = getTypeReference(ctx.type);
+            EnumValue[] enumValues = getEnumValues();
+            DefaultEnumTypeDefinition enumType = new DefaultEnumTypeDefinition(typeName, type, enumValues,
+                parserArguments, null);
+            types.put(typeName, enumType);
+            enumContexts.pop();
+        } else {
+            // If the type has sub-types it's an abstract type.
+            SwitchField switchField = getSwitchField();
+            boolean abstractType = switchField != null;
+            DefaultComplexTypeDefinition type = new DefaultComplexTypeDefinition(typeName, parserArguments, null,
+                abstractType, parserContexts.peek());
+            types.put(typeName, type);
+
+            // Set the parent type for all sub-types.
+            if (switchField != null) {
+                for (DiscriminatedComplexTypeDefinition subtype : switchField.getCases()) {
+                    if (subtype instanceof DefaultDiscriminatedComplexTypeDefinition) {
+                        ((DefaultDiscriminatedComplexTypeDefinition) subtype).setParentType(type);
+                    }
+                }
+            }
+            parserContexts.pop();
+        }
+    }
+
+    @Override
+    public void enterArrayField(MSpecParser.ArrayFieldContext ctx) {
+        TypeReference type = getTypeReference(ctx.type);
+        String name = ctx.name.id.getText();
+        ArrayField.LoopType loopType = ArrayField.LoopType.valueOf(ctx.loopType.getText().toUpperCase());
+        String loopExpressionString = ctx.loopExpression.expr.getText();
+        Term loopExpression =  getExpressionTerm(loopExpressionString);
+        Term[] params = getFieldParams((MSpecParser.FieldDefinitionContext) ctx.parent.parent);
+        Field field = new DefaultArrayField(null, type, name, loopType, loopExpression, params);
+        if(parserContexts.peek() != null) {
+            parserContexts.peek().add(field);
+        }
+    }
+
+    @Override
+    public void enterChecksumField(MSpecParser.ChecksumFieldContext ctx) {
+        SimpleTypeReference type = getSimpleTypeReference(ctx.type);
+        String name = ctx.name.id.getText();
+        String checksumExpressionString = ctx.checksumExpression.expr.getText();
+        Term checksumExpression = getExpressionTerm(checksumExpressionString);
+        Field field = new DefaultChecksumField(null, type, name, checksumExpression);
+        if(parserContexts.peek() != null) {
+            parserContexts.peek().add(field);
+        }
+    }
+
+    @Override
+    public void enterConstField(MSpecParser.ConstFieldContext ctx) {
+        SimpleTypeReference type = getSimpleTypeReference(ctx.type);
+        String name = ctx.name.id.getText();
+        String expected = ctx.expected.expr.getText();
+        Field field = new DefaultConstField(null, type, name, expected);
+        if(parserContexts.peek() != null) {
+            parserContexts.peek().add(field);
+        }
+    }
+
+    @Override
+    public void enterDiscriminatorField(MSpecParser.DiscriminatorFieldContext ctx) {
+        SimpleTypeReference type = getSimpleTypeReference(ctx.type);
+        String name = ctx.name.id.getText();
+        Field field = new DefaultDiscriminatorField(null, type, name);
+        if(parserContexts.peek() != null) {
+            parserContexts.peek().add(field);
+        }
+    }
+
+    @Override
+    public void enterEnumField(MSpecParser.EnumFieldContext ctx) {
+        ComplexTypeReference type = new DefaultComplexTypeReference(ctx.type.complexTypeReference.getText());
+        String name = ctx.name.id.getText();
+        Term[] params = getFieldParams((MSpecParser.FieldDefinitionContext) ctx.parent.parent);
+        Field field = new DefaultEnumField(null, type, name, params);
+        if(parserContexts.peek() != null) {
+            parserContexts.peek().add(field);
+        }
+    }
+
+    @Override
+    public void enterImplicitField(MSpecParser.ImplicitFieldContext ctx) {
+        SimpleTypeReference type = getSimpleTypeReference(ctx.type);
+        String name = ctx.name.id.getText();
+        String serializationExpressionString = ctx.serializationExpression.expr.getText();
+        Term serializationExpression = getExpressionTerm(serializationExpressionString);
+        Field field = new DefaultImplicitField(null, type, name, serializationExpression);
+        if(parserContexts.peek() != null) {
+            parserContexts.peek().add(field);
+        }
+    }
+
+    @Override
+    public void enterManualArrayField(MSpecParser.ManualArrayFieldContext ctx) {
+        TypeReference type = getTypeReference(ctx.type);
+        String name = ctx.name.id.getText();
+        ManualArrayField.LoopType loopType = ManualArrayField.LoopType.valueOf(
+            ctx.loopType.getText().toUpperCase());
+        String loopExpressionString = ctx.loopExpression.expr.getText();
+        Term loopExpression =  getExpressionTerm(loopExpressionString);
+        String serializationExpressionString = ctx.serializationExpression.expr.getText();
+        Term serializationExpression = getExpressionTerm(serializationExpressionString);
+        String deserializationExpressionString = ctx.deserializationExpression.expr.getText();
+        Term deserializationExpression = getExpressionTerm(deserializationExpressionString);
+        String lengthExpressionString = ctx.lengthExpression.expr.getText();
+        Term lengthExpression =  getExpressionTerm(lengthExpressionString);
+        Term[] params = getFieldParams((MSpecParser.FieldDefinitionContext) ctx.parent.parent);
+        Field field = new DefaultManualArrayField(null, type, name, loopType, loopExpression, serializationExpression,
+            deserializationExpression, lengthExpression, params);
+        if(parserContexts.peek() != null) {
+            parserContexts.peek().add(field);
+        }
+    }
+
+    @Override
+    public void enterManualField(MSpecParser.ManualFieldContext ctx) {
+        TypeReference type = getTypeReference(ctx.type);
+        String name = ctx.name.id.getText();
+        String serializationExpressionString = ctx.serializationExpression.expr.getText();
+        Term serializationExpression = getExpressionTerm(serializationExpressionString);
+        String deserializationExpressionString = ctx.deserializationExpression.expr.getText();
+        Term deserializationExpression = getExpressionTerm(deserializationExpressionString);
+        String lengthExpressionString = ctx.lengthExpression.expr.getText();
+        Term lengthExpression =  getExpressionTerm(lengthExpressionString);
+        Term[] params = getFieldParams((MSpecParser.FieldDefinitionContext) ctx.parent.parent);
+        Field field = new DefaultManualField(null, type, name, serializationExpression, deserializationExpression,
+            lengthExpression, params);
+        if(parserContexts.peek() != null) {
+            parserContexts.peek().add(field);
+        }
+    }
+
+    @Override
+    public void enterOptionalField(MSpecParser.OptionalFieldContext ctx) {
+        TypeReference type = getTypeReference(ctx.type);
+        String name = ctx.name.id.getText();
+        String conditionExpressionString = ctx.condition.expr.getText();
+        Term conditionExpression = getExpressionTerm(conditionExpressionString);
+        Term[] params = getFieldParams((MSpecParser.FieldDefinitionContext) ctx.parent.parent);
+        Field field = new DefaultOptionalField(null, type, name, conditionExpression, params);
+        if(parserContexts.peek() != null) {
+            parserContexts.peek().add(field);
+        }
+    }
+
+    @Override
+    public void enterPaddingField(MSpecParser.PaddingFieldContext ctx) {
+        SimpleTypeReference type = getSimpleTypeReference(ctx.type);
+        String name = ctx.name.id.getText();
+        String paddingValueString = ctx.paddingValue.expr.getText();
+        Term paddingValue = getExpressionTerm(paddingValueString);
+        String paddingConditionString = ctx.paddingCondition.expr.getText();
+        Term paddingCondition = getExpressionTerm(paddingConditionString);
+        Term[] params = getFieldParams((MSpecParser.FieldDefinitionContext) ctx.parent.parent);
+        Field field = new DefaultPaddingField(null, type, name, paddingValue, paddingCondition, params);
+        if(parserContexts.peek() != null) {
+            parserContexts.peek().add(field);
+        }
+    }
+
+    @Override
+    public void enterReservedField(MSpecParser.ReservedFieldContext ctx) {
+        SimpleTypeReference type = getSimpleTypeReference(ctx.type);
+        String expected = ctx.expected.expr.getText();
+        Field field = new DefaultReservedField(null, type, expected);
+        if(parserContexts.peek() != null) {
+            parserContexts.peek().add(field);
+        }
+    }
+
+    @Override
+    public void enterSimpleField(MSpecParser.SimpleFieldContext ctx) {
+        TypeReference type = getTypeReference(ctx.type);
+        String name = ctx.name.id.getText();
+        Term[] params = getFieldParams((MSpecParser.FieldDefinitionContext) ctx.parent.parent);
+        Field field = new DefaultSimpleField(null, type, name, params);
+        if(parserContexts.peek() != null) {
+            parserContexts.peek().add(field);
+        }
+    }
+
+    @Override
+    public void enterTypeSwitchField(MSpecParser.TypeSwitchFieldContext ctx) {
+        int numDiscriminators = ctx.discriminators.expression().size();
+        String[] discriminatorNames = new String[numDiscriminators];
+        for(int i = 0; i < numDiscriminators; i++) {
+            discriminatorNames[i] = ctx.discriminators.expression().get(i).expr.getText();
+        }
+        DefaultSwitchField field = new DefaultSwitchField(discriminatorNames);
+        if(parserContexts.peek() != null) {
+            parserContexts.peek().add(field);
+        }
+    }
+
+    @Override
+    public void enterVirtualField(MSpecParser.VirtualFieldContext ctx) {
+        TypeReference type = getTypeReference(ctx.type);
+        String name = ctx.name.id.getText();
+        String valueExpressionString = ctx.valueExpression.expr.getText();
+        Term valueExpression = getExpressionTerm(valueExpressionString);
+        Field field = new DefaultVirtualField(null, type, name, valueExpression);
+        if(parserContexts.peek() != null) {
+            parserContexts.peek().add(field);
+        }
+    }
+
+    @Override
+    public void enterCaseStatement(MSpecParser.CaseStatementContext ctx) {
+        List<Field> parserContext = new LinkedList<>();
+        parserContexts.push(parserContext);
+    }
+
+    @Override
+    public void exitCaseStatement(MSpecParser.CaseStatementContext ctx) {
+        String typeName = ctx.name.getText();
+        List<Argument> parserArguments = new LinkedList<>();
+        // Add all the arguments from the parent type.
+        if(((MSpecParser.ComplexTypeContext) ctx.parent.parent.parent.parent).params != null) {
+            parserArguments.addAll(Arrays.asList(getParserArguments(
+                ((MSpecParser.ComplexTypeContext) ctx.parent.parent.parent.parent).params.argument())));
+        }
+        // Add all eventually existing local arguments.
+        if(ctx.argumentList() != null) {
+            parserArguments.addAll(Arrays.asList(getParserArguments(ctx.argumentList().argument())));
+        }
+
+        String[] discriminatorValues;
+        if(ctx.discriminatorValues != null) {
+            List<MSpecParser.ExpressionContext> expressions = ctx.discriminatorValues.expression();
+            discriminatorValues = new String[expressions.size()];
+            for (int i = 0; i < expressions.size(); i++) {
+                discriminatorValues[i] = expressions.get(i).expr.getText();
+            }
+        } else {
+            discriminatorValues = new String[0];
+        }
+        DefaultDiscriminatedComplexTypeDefinition type =
+            new DefaultDiscriminatedComplexTypeDefinition(typeName, parserArguments.toArray(new Argument[0]), null,
+                discriminatorValues, parserContexts.pop());
+
+        // Add the type to the switch field definition.
+        DefaultSwitchField switchField = getSwitchField();
+        if(switchField == null) {
+            throw new RuntimeException("This shouldn't have happened");
+        }
+        switchField.addCase(type);
+
+        // Add the type to the type list.
+        types.put(typeName, type);
+    }
+
+    @Override
+    public void enterEnumValueDefinition(MSpecParser.EnumValueDefinitionContext ctx) {
+        String value = unquoteString(ctx.valueExpression.getText());
+        String name = ctx.name.getText();
+        Map<String, String> constants = null;
+        if(ctx.constantValueExpressions != null) {
+            MSpecParser.ComplexTypeContext parentCtx = (MSpecParser.ComplexTypeContext) ctx.parent;
+            int numConstantValues = parentCtx.params.argument().size();
+            int numExpressionValues = ctx.constantValueExpressions.expression().size();
+            // This only works if we provide exactly the same number of expressions as we defined constants
+            if(numConstantValues != numExpressionValues) {
+                throw new RuntimeException("Number of constant value expressions doesn't match the number of " +
+                    "defined constants. Expecting " + numConstantValues + " but got " + numExpressionValues);
+            }
+
+            // Build a map of the constant expressions (With the constant name as key)
+            constants = new HashMap<>();
+            for (int i = 0; i < numConstantValues; i++) {
+                MSpecParser.ArgumentContext argumentContext = parentCtx.params.argument(i);
+                String constantName = argumentContext.name.getText();
+                constantName = constantName.substring(1, constantName.length() - 1);
+                MSpecParser.ExpressionContext expression = ctx.constantValueExpressions.expression(i);
+                String constant = unquoteString(expression.getText());
+                constants.put(constantName, constant);
+            }
+        }
+        final DefaultEnumValue enumValue = new DefaultEnumValue(value, name, constants);
+        this.enumContexts.peek().add(enumValue);
+    }
+
+    private Term getExpressionTerm(String expressionString) {
+        InputStream inputStream = IOUtils.toInputStream(expressionString, Charset.defaultCharset());
+        ExpressionStringParser parser = new ExpressionStringParser();
+        try {
+            return parser.parse(inputStream);
+        } catch (Exception e) {
+            throw new RuntimeException("Error parsing expression: '" + expressionString + "'", e);
+        }
+    }
+
+    private TypeReference getTypeReference(MSpecParser.TypeReferenceContext ctx) {
+        if(ctx.simpleTypeReference != null) {
+            SimpleTypeReference.SimpleBaseType simpleBaseType = SimpleTypeReference.SimpleBaseType.valueOf(
+                ctx.simpleTypeReference.base.getText().toUpperCase());
+            if(ctx.simpleTypeReference.size != null) {
+                int size = Integer.parseInt(ctx.simpleTypeReference.size.getText());
+                return new DefaultSimpleTypeReference(simpleBaseType, size);
+            } else {
+                return new DefaultSimpleTypeReference(simpleBaseType, 1);
+            }
+        } else {
+            return new DefaultComplexTypeReference(ctx.complexTypeReference.getText());
+        }
+    }
+
+    private SimpleTypeReference getSimpleTypeReference(MSpecParser.DataTypeContext ctx) {
+        SimpleTypeReference.SimpleBaseType simpleBaseType =
+            SimpleTypeReference.SimpleBaseType.valueOf(ctx.base.getText().toUpperCase());
+        if(ctx.size != null) {
+            int size = Integer.parseInt(ctx.size.getText());
+            return new DefaultSimpleTypeReference(simpleBaseType, size);
+        } else {
+            return new DefaultSimpleTypeReference(simpleBaseType, 1);
+        }
+    }
+
+    private DefaultSwitchField getSwitchField() {
+        for (Field field : Objects.requireNonNull(parserContexts.peek())) {
+            if(field instanceof DefaultSwitchField) {
+                return (DefaultSwitchField) field;
+            }
+        }
+        return null;
+    }
+
+    private EnumValue[] getEnumValues() {
+        return Objects.requireNonNull(enumContexts.peek()).toArray(new EnumValue[0]);
+    }
+
+    private Argument[] getParserArguments(List<MSpecParser.ArgumentContext> params) {
+        Argument[] parserArguments = new Argument[params.size()];
+        for (int i = 0; i < params.size(); i++) {
+            TypeReference type = getTypeReference(params.get(i).type);
+            String name = params.get(i).name.id.getText();
+            parserArguments[i] = new Argument(type, name);
+        }
+        return parserArguments;
+    }
+
+    private Term[] getFieldParams(MSpecParser.FieldDefinitionContext parentCtx) {
+        Term[] params = null;
+        if(parentCtx.params != null) {
+            params = new Term[parentCtx.params.expression().size()];
+            for(int i = 0; i < parentCtx.params.expression().size(); i++) {
+                params[i] = parseExpression(parentCtx.params.expression().get(i).expr.getText());
+            }
+        }
+        return params;
+    }
+
+    private Term parseExpression(String expressionString) {
+        InputStream inputStream = IOUtils.toInputStream(expressionString, Charset.defaultCharset());
+        ExpressionStringParser parser = new ExpressionStringParser();
+        try {
+            return parser.parse(inputStream);
+        } catch (Exception e) {
+            throw new RuntimeException("Error parsing expression: '" + expressionString + "'", e);
+        }
+    }
+
+    private String unquoteString(String quotedString) {
+        if(quotedString != null && quotedString.length() > 2) {
+            return quotedString.substring(1, quotedString.length() - 1);
+        }
+        return quotedString;
+    }
+
+    public static void main(String[] args) {
+        //Term term = new ExpressionStringParser().parse(IOUtils.toInputStream("CAST(CAST(parameter,S7ParameterUserData).items(hurz)[0],S7ParameterUserDataItemCPUFunctions).cpuFunctionType", Charset.defaultCharset()));
+        //Term term = new ExpressionStringParser().parse(IOUtils.toInputStream("CAST(parameter,S7ParameterUserData).items(hurz)[0]", Charset.defaultCharset()));
+        Term term = new ExpressionStringParser().parse(IOUtils.toInputStream("payload.lengthInBytes+4", Charset.defaultCharset()));
+
+        System.out.println(term);
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatParser.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatParser.java
index bdd99fba3f6..6dcc424e1dd 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatParser.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatParser.java
@@ -1,50 +1,50 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.plugins.codegenerator.language.mspec.parser;
-
-import org.antlr.v4.runtime.CharStreams;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.tree.ParseTree;
-import org.antlr.v4.runtime.tree.ParseTreeWalker;
-import org.apache.plc4x.plugins.codegenerator.language.mspec.MSpecLexer;
-import org.apache.plc4x.plugins.codegenerator.language.mspec.MSpecParser;
-import org.apache.plc4x.plugins.codegenerator.types.definitions.TypeDefinition;
-
-import java.io.InputStream;
-import java.util.Map;
-
-public class MessageFormatParser {
-
-    public Map<String, TypeDefinition> parse(InputStream source) {
-        try {
-            MSpecLexer lexer = new MSpecLexer(CharStreams.fromStream(source));
-            CommonTokenStream tokens = new CommonTokenStream(lexer);
-            MSpecParser parser = new MSpecParser(tokens);
-            ParseTree tree = parser.file();
-            ParseTreeWalker walker = new ParseTreeWalker();
-            MessageFormatListener listener = new MessageFormatListener();
-            walker.walk(listener, tree);
-            return listener.getTypes();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.plugins.codegenerator.language.mspec.parser;
+
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.antlr.v4.runtime.tree.ParseTreeWalker;
+import org.apache.plc4x.plugins.codegenerator.language.mspec.MSpecLexer;
+import org.apache.plc4x.plugins.codegenerator.language.mspec.MSpecParser;
+import org.apache.plc4x.plugins.codegenerator.types.definitions.TypeDefinition;
+
+import java.io.InputStream;
+import java.util.Map;
+
+public class MessageFormatParser {
+
+    public Map<String, TypeDefinition> parse(InputStream source) {
+        try {
+            MSpecLexer lexer = new MSpecLexer(CharStreams.fromStream(source));
+            CommonTokenStream tokens = new CommonTokenStream(lexer);
+            MSpecParser parser = new MSpecParser(tokens);
+            ParseTree tree = parser.file();
+            ParseTreeWalker walker = new ParseTreeWalker();
+            MessageFormatListener listener = new MessageFormatListener();
+            walker.walk(listener, tree);
+            return listener.getTypes();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/build-utils/protocol-base-mspec/src/remote-resources/LICENSE b/build-utils/protocol-base-mspec/src/remote-resources/LICENSE
index 497b8a95fd9..67813efd9c3 100644
--- a/build-utils/protocol-base-mspec/src/remote-resources/LICENSE
+++ b/build-utils/protocol-base-mspec/src/remote-resources/LICENSE
@@ -1,3 +1,3 @@
-src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/Expression.g4
-is licensed under the Category A: "UNLICENSE" which is available here:
-UNLICENSE file parallel to this file.
+src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/Expression.g4
+is licensed under the Category A: "UNLICENSE" which is available here:
+UNLICENSE file parallel to this file.
diff --git a/build-utils/protocol-base-mspec/src/remote-resources/UNLICENSE b/build-utils/protocol-base-mspec/src/remote-resources/UNLICENSE
index c32dd18f5b7..bfdcf390001 100644
--- a/build-utils/protocol-base-mspec/src/remote-resources/UNLICENSE
+++ b/build-utils/protocol-base-mspec/src/remote-resources/UNLICENSE
@@ -1,24 +1,24 @@
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
 For more information, please refer to <https://unlicense.org/>
\ No newline at end of file
diff --git a/build-utils/protocol-test/pom.xml b/build-utils/protocol-test/pom.xml
index a21801a9aab..6617dfbd1ce 100644
--- a/build-utils/protocol-test/pom.xml
+++ b/build-utils/protocol-test/pom.xml
@@ -1,86 +1,86 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4x-build-utils</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4x-build-utils-protocol-test</artifactId>
-
-  <name>PLC4X: Build Utils: Protocol Test: (Documentation)</name>
-  <description>Fake protocol intended for demonstrating the different features and aspects of MSpec.</description>
-
-  <build>
-    <plugins>
-      <!-- Use the plc4x-maven-plugin to generate code which is only used for documentation -->
-      <plugin>
-        <groupId>org.apache.plc4x.plugins</groupId>
-        <artifactId>plc4x-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>test</id>
-            <!-- We need to run this after the compilation -->
-            <phase>process-classes</phase>
-            <goals>
-              <goal>generate-driver</goal>
-            </goals>
-            <configuration>
-              <protocolName>test</protocolName>
-              <languageName>java</languageName>
-              <outputFlavor>read-write</outputFlavor>
-              <!-- Redirect the output somewhere non-default -->
-              <outputDir>${project.build.directory}/generated-site-resources/plc4x/</outputDir>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <!-- JavaDoc will try to document the generated code, which is not really valid code -->
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-build-utils-language-java</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4x-build-utils</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4x-build-utils-protocol-test</artifactId>
+
+  <name>PLC4X: Build Utils: Protocol Test: (Documentation)</name>
+  <description>Fake protocol intended for demonstrating the different features and aspects of MSpec.</description>
+
+  <build>
+    <plugins>
+      <!-- Use the plc4x-maven-plugin to generate code which is only used for documentation -->
+      <plugin>
+        <groupId>org.apache.plc4x.plugins</groupId>
+        <artifactId>plc4x-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>test</id>
+            <!-- We need to run this after the compilation -->
+            <phase>process-classes</phase>
+            <goals>
+              <goal>generate-driver</goal>
+            </goals>
+            <configuration>
+              <protocolName>test</protocolName>
+              <languageName>java</languageName>
+              <outputFlavor>read-write</outputFlavor>
+              <!-- Redirect the output somewhere non-default -->
+              <outputDir>${project.build.directory}/generated-site-resources/plc4x/</outputDir>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <!-- JavaDoc will try to document the generated code, which is not really valid code -->
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-build-utils-language-java</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/build-utils/protocol-test/src/main/java/org/apache/plc4x/protocol/test/TestProtocol.java b/build-utils/protocol-test/src/main/java/org/apache/plc4x/protocol/test/TestProtocol.java
index ed9c17d6470..98c6492308d 100644
--- a/build-utils/protocol-test/src/main/java/org/apache/plc4x/protocol/test/TestProtocol.java
+++ b/build-utils/protocol-test/src/main/java/org/apache/plc4x/protocol/test/TestProtocol.java
@@ -1,45 +1,45 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.protocol.test;
-
-import org.apache.plc4x.plugins.codegenerator.language.mspec.parser.MessageFormatParser;
-import org.apache.plc4x.plugins.codegenerator.protocol.Protocol;
-import org.apache.plc4x.plugins.codegenerator.types.definitions.TypeDefinition;
-import org.apache.plc4x.plugins.codegenerator.types.exceptions.GenerationException;
-
-import java.io.InputStream;
-import java.util.Map;
-
-public class TestProtocol implements Protocol {
-
-    @Override
-    public String getName() {
-        return "test";
-    }
-
-    @Override
-    public Map<String, TypeDefinition> getTypeDefinitions() throws GenerationException {
-        InputStream schemaInputStream = TestProtocol.class.getResourceAsStream("/protocols/test/test.mspec");
-        if(schemaInputStream == null) {
-            throw new GenerationException("Error loading message-format schema for protocol '" + getName() + "'");
-        }
-        return new MessageFormatParser().parse(schemaInputStream);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.protocol.test;
+
+import org.apache.plc4x.plugins.codegenerator.language.mspec.parser.MessageFormatParser;
+import org.apache.plc4x.plugins.codegenerator.protocol.Protocol;
+import org.apache.plc4x.plugins.codegenerator.types.definitions.TypeDefinition;
+import org.apache.plc4x.plugins.codegenerator.types.exceptions.GenerationException;
+
+import java.io.InputStream;
+import java.util.Map;
+
+public class TestProtocol implements Protocol {
+
+    @Override
+    public String getName() {
+        return "test";
+    }
+
+    @Override
+    public Map<String, TypeDefinition> getTypeDefinitions() throws GenerationException {
+        InputStream schemaInputStream = TestProtocol.class.getResourceAsStream("/protocols/test/test.mspec");
+        if(schemaInputStream == null) {
+            throw new GenerationException("Error loading message-format schema for protocol '" + getName() + "'");
+        }
+        return new MessageFormatParser().parse(schemaInputStream);
+    }
+
+}
diff --git a/build-utils/protocol-test/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol b/build-utils/protocol-test/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol
index c70341234d5..774358c58af 100644
--- a/build-utils/protocol-test/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol
+++ b/build-utils/protocol-test/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol
@@ -1,19 +1,19 @@
-#
-# 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
-#
-#     http://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.
-#
+#
+# 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
+#
+#     http://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.
+#
 org.apache.plc4x.protocol.test.TestProtocol
\ No newline at end of file
diff --git a/build-utils/protocol-test/src/main/resources/protocols/test/test.mspec b/build-utils/protocol-test/src/main/resources/protocols/test/test.mspec
index 1b9713f21f8..fc792ef8dad 100644
--- a/build-utils/protocol-test/src/main/resources/protocols/test/test.mspec
+++ b/build-utils/protocol-test/src/main/resources/protocols/test/test.mspec
@@ -1,70 +1,70 @@
-//
-// 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
-//
-//     http://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.
-//
-
-////////////////////////////////////////////////////////////////
-// Simple Type
-////////////////////////////////////////////////////////////////
-
-[type 'SimpleType'
-    [array         uint 8 'arrCount'      count      '5']
-    [array         uint 8 'arrLen'        length     '6']
-    [array         uint 8 'arrTerm'       terminated                'terminationExpression']
-    [checksum      uint 8 'crc'           'checksumExpression']
-    [const         uint 8 'con'           '0x03']
-    [implicit      uint 8 'impl'          'serializationExpression']
-    [manualArray   uint 8 'manArrayCount' count                     'loopExpression'            'serializationExpression' 'deserializationExpression' 'lengthExpression']
-    [manualArray   uint 8 'manArrayLen'   length                    'loopExpression'            'serializationExpression' 'deserializationExpression' 'lengthExpression']
-    [manualArray   uint 8 'manArrayTerm'  terminated                'loopExpression'            'serializationExpression' 'deserializationExpression' 'lengthExpression']
-    [manual        uint 8 'man'           'serializationExpression' 'deserializationExpression' 'lengthExpression']
-    [optional      uint 8 'opt'           'optionalExpression']
-    [padding       uint 8 'pad'           '0'                       'paddingExpression']
-    [reserved      uint 8 '0x00']
-    [simple        uint 8 'simp']
-    [virtual       uint 8 'virt'          'valueExpression']
-]
-
-////////////////////////////////////////////////////////////////
-// Discriminated Type
-////////////////////////////////////////////////////////////////
-
-[discriminatedType 'DiscriminatedType'
-    [discriminator uint 8 'discr']
-    [typeSwitch 'discr'
-        ['0x01' DiscriminatedTypeA
-            [simple        uint 8 'simpA']
-        ]
-        ['0x02' DiscriminatedTypeA
-            [simple        uint 8 'simpB']
-        ]
-        ['0x03' DiscriminatedTypeA
-            [simple        uint 8 'simpC']
-        ]
-    ]
-]
-
-////////////////////////////////////////////////////////////////
-// Arguments Type
-////////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////////
-// Discriminated Type with multiple conditions
-////////////////////////////////////////////////////////////////
-
-
+//
+// 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
+//
+//     http://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.
+//
+
+////////////////////////////////////////////////////////////////
+// Simple Type
+////////////////////////////////////////////////////////////////
+
+[type 'SimpleType'
+    [array         uint 8 'arrCount'      count      '5']
+    [array         uint 8 'arrLen'        length     '6']
+    [array         uint 8 'arrTerm'       terminated                'terminationExpression']
+    [checksum      uint 8 'crc'           'checksumExpression']
+    [const         uint 8 'con'           '0x03']
+    [implicit      uint 8 'impl'          'serializationExpression']
+    [manualArray   uint 8 'manArrayCount' count                     'loopExpression'            'serializationExpression' 'deserializationExpression' 'lengthExpression']
+    [manualArray   uint 8 'manArrayLen'   length                    'loopExpression'            'serializationExpression' 'deserializationExpression' 'lengthExpression']
+    [manualArray   uint 8 'manArrayTerm'  terminated                'loopExpression'            'serializationExpression' 'deserializationExpression' 'lengthExpression']
+    [manual        uint 8 'man'           'serializationExpression' 'deserializationExpression' 'lengthExpression']
+    [optional      uint 8 'opt'           'optionalExpression']
+    [padding       uint 8 'pad'           '0'                       'paddingExpression']
+    [reserved      uint 8 '0x00']
+    [simple        uint 8 'simp']
+    [virtual       uint 8 'virt'          'valueExpression']
+]
+
+////////////////////////////////////////////////////////////////
+// Discriminated Type
+////////////////////////////////////////////////////////////////
+
+[discriminatedType 'DiscriminatedType'
+    [discriminator uint 8 'discr']
+    [typeSwitch 'discr'
+        ['0x01' DiscriminatedTypeA
+            [simple        uint 8 'simpA']
+        ]
+        ['0x02' DiscriminatedTypeA
+            [simple        uint 8 'simpB']
+        ]
+        ['0x03' DiscriminatedTypeA
+            [simple        uint 8 'simpC']
+        ]
+    ]
+]
+
+////////////////////////////////////////////////////////////////
+// Arguments Type
+////////////////////////////////////////////////////////////////
+
+
+////////////////////////////////////////////////////////////////
+// Discriminated Type with multiple conditions
+////////////////////////////////////////////////////////////////
+
+
diff --git a/build-utils/protocol-test/src/site/asciidoc/index.adoc b/build-utils/protocol-test/src/site/asciidoc/index.adoc
index 26318f9ae3f..f21f8143ed4 100644
--- a/build-utils/protocol-test/src/site/asciidoc/index.adoc
+++ b/build-utils/protocol-test/src/site/asciidoc/index.adoc
@@ -1,118 +1,118 @@
-//
-//  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
-//
-//      http://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.
-//
-:imagesdir: images/
-:icons: font
-:mspecdir: ../../main/resources
-:sourcedir: ../../../target/generated-site-resources/plc4x
-
-== MSpec Code-Generation Documentation
-
-=== Simple types
-
-Some times no matter what content is coming, the same type is used. In this case a `type` is used:
-
-[source]
-----
-include::{mspecdir}/protocols/test/test.mspec[lines=24..40]
-----
-
-The code generator will create simple POJOs as well as serializers and parsers from this specification.
-
-=== Discriminated types
-
-There are however cases, where the content of the packet determines it's type.
-In these case a `discriminatedType` must be used.
-Each `discriminatedType` must have one `discriminator` field and one `typeSwitch` field to define the sub-types.
-
-[source]
-----
-include::{mspecdir}/protocols/test/test.mspec[lines=46..59]
-----
-
-In contrast to the simple types, in this case a base-type POJO will be created, which contains all the fields all sub-types share.
-However these types are generated as abstract types.
-The subtypes then extend these base-types.
-
-=== Field types
-
-In this section comes a description of all the different types of fields supported by the code generator.
-
-==== array
-
-An `array` field will generate an array property.
-There are 3 variants of arrays which differ in the rule for how many elements the array should contain.
-
-Right now these are:
-- `count`: An explicit number of element will be read
-- `length`: The number of bytes the entire array will consume (The parser will continue reading elements until the given number of bytes are read)
-- `terminated`: The parser will continue to read elements until a given exit termination condition is `true`.
-
-[source]
-----
-include::{mspecdir}/protocols/test/test.mspec[lines=25..27]
-----
-
-The general structure is:
-
-[source]
-----
-[array {simple-type|complex-type} '{name}' {count|length|terminated} '{expression}']
-----
-
-Above definition generates the following code:
-
-In the Pojo:
-[source,java]
-----
-include::{sourcedir}/org/apache/plc4x/java/test/readwrite/SimpleType.java[lines=33..35;55..64;96..109;149..150]
-----
-
-In the IO component:
-
-[source,java]
-----
-include::{sourcedir}/org/apache/plc4x/java/test/readwrite/io/SimpleTypeIO.java[lines=36..71;148..175;232]
-----
-
-==== checksum
-
-==== const
-
-==== implicit
-
-==== manualArray
-
-==== manual
-
-==== optional
-
-==== padding
-
-==== reserved
-
-==== simple
-
-==== virtual
-
-
-
-
-
-[source,java]
-----
-include::{sourcedir}/org/apache/plc4x/java/test/readwrite/SimpleType.java[]
-----
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://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.
+//
+:imagesdir: images/
+:icons: font
+:mspecdir: ../../main/resources
+:sourcedir: ../../../target/generated-site-resources/plc4x
+
+== MSpec Code-Generation Documentation
+
+=== Simple types
+
+Some times no matter what content is coming, the same type is used. In this case a `type` is used:
+
+[source]
+----
+include::{mspecdir}/protocols/test/test.mspec[lines=24..40]
+----
+
+The code generator will create simple POJOs as well as serializers and parsers from this specification.
+
+=== Discriminated types
+
+There are however cases, where the content of the packet determines it's type.
+In these case a `discriminatedType` must be used.
+Each `discriminatedType` must have one `discriminator` field and one `typeSwitch` field to define the sub-types.
+
+[source]
+----
+include::{mspecdir}/protocols/test/test.mspec[lines=46..59]
+----
+
+In contrast to the simple types, in this case a base-type POJO will be created, which contains all the fields all sub-types share.
+However these types are generated as abstract types.
+The subtypes then extend these base-types.
+
+=== Field types
+
+In this section comes a description of all the different types of fields supported by the code generator.
+
+==== array
+
+An `array` field will generate an array property.
+There are 3 variants of arrays which differ in the rule for how many elements the array should contain.
+
+Right now these are:
+- `count`: An explicit number of element will be read
+- `length`: The number of bytes the entire array will consume (The parser will continue reading elements until the given number of bytes are read)
+- `terminated`: The parser will continue to read elements until a given exit termination condition is `true`.
+
+[source]
+----
+include::{mspecdir}/protocols/test/test.mspec[lines=25..27]
+----
+
+The general structure is:
+
+[source]
+----
+[array {simple-type|complex-type} '{name}' {count|length|terminated} '{expression}']
+----
+
+Above definition generates the following code:
+
+In the Pojo:
+[source,java]
+----
+include::{sourcedir}/org/apache/plc4x/java/test/readwrite/SimpleType.java[lines=33..35;55..64;96..109;149..150]
+----
+
+In the IO component:
+
+[source,java]
+----
+include::{sourcedir}/org/apache/plc4x/java/test/readwrite/io/SimpleTypeIO.java[lines=36..71;148..175;232]
+----
+
+==== checksum
+
+==== const
+
+==== implicit
+
+==== manualArray
+
+==== manual
+
+==== optional
+
+==== padding
+
+==== reserved
+
+==== simple
+
+==== virtual
+
+
+
+
+
+[source,java]
+----
+include::{sourcedir}/org/apache/plc4x/java/test/readwrite/SimpleType.java[]
+----
diff --git a/build-utils/protocol-test/src/site/site.xml b/build-utils/protocol-test/src/site/site.xml
index 9781b26a521..c56d62e460f 100644
--- a/build-utils/protocol-test/src/site/site.xml
+++ b/build-utils/protocol-test/src/site/site.xml
@@ -1,145 +1,145 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- 
- 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
- 
- http://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.
- 
- -->
-<project name="PLC4X">
-
-  <skin>
-    <groupId>io.github.devacfr.maven.skins</groupId>
-    <artifactId>reflow-maven-skin</artifactId>
-    <version>${reflow.skin.version}</version>
-  </skin>
-
-  <!-- Hide the publish date as this will cause changes on every generated page every day -->
-  <publishDate position="none"/>
-  <!-- Hide the version as we are usually deploying the develop version -->
-  <version position="none" />
-
-  <!--
-      Details on how to configure the reflow skin:
-      http://andriusvelykis.github.io/reflow-maven-skin/skin/
-  -->
-  <custom>
-    <reflowSkin>
-      <localResources>true</localResources>
-      <absoluteResourceURL>https://plc4x.apache.org/</absoluteResourceURL>
-      <titleTemplate>Apache PLC4X® - %2$s</titleTemplate>
-      <slogan position="bannerLeft">The industrial IoT adapter</slogan>
-      <showApacheEvents>true</showApacheEvents>
-      <toc>top</toc>
-      <bottomNav maxSpan="12">
-        <column>reports</column>
-        <column>Apache</column>
-        <column>modules</column>
-        <column>Protocols</column>
-      </bottomNav>
-      <brand>
-        <name>Apache PLC4X</name>
-        <href>https://plc4x.apache.org/</href>
-      </brand>
-      <breadcrumbs>true</breadcrumbs>
-      <highlightJs>true</highlightJs>
-      <pages>
-        <developer-info>
-          <toc>sidebar</toc>
-        </developer-info>
-      </pages>
-    </reflowSkin>
-  </custom>
-
-  <poweredBy>
-    <logo name="Apache Software Foundation" img="https://www.apache.org/images/asf_logo.png" href="https://www.apache.org/"/>
-  </poweredBy>
-
-  <bannerLeft>
-      <name>Apache PLC4X</name>
-      <src>https://plc4x.apache.org/images/apache_plc4x_logo.png</src>
-      <href>https://plc4x.apache.org/</href>
-  </bannerLeft>
-
-  <bannerRight>
-    <name>Apache Software Foundation</name>
-    <src>https://plc4x.apache.org/images/apache_logo.png</src>
-    <!--src>./images/apache_logo.png</src-->
-    <href>http://www.apache.org/</href>
-  </bannerRight>
-
-  <body>
-    <head>
-      <![CDATA[
-        <script>
-          document.addEventListener("DOMContentLoaded", function(event) {
-            /* Add an image for promoting Apache events below the right banner */
-            $("#bannerRight").append('<p id="apacheEvents"><a href="//www.apache.org/events/current-event.html"><img src="//www.apache.org/events/current-event-234x60.png"/></a></p>');
-            /* Append the trademarks info to the copyright section */
-            $(".copyright").append('<p>Apache PLC4X, PLC4X, Apache, the Apache feather logo, and the Apache PLC4X project logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>');
-          });
-        </script>
-      ]]>
-    </head>
-
-    <menu name="Users">
-      <item name="Download" href="users/download.html"/>
-      <item name="Getting Started" href="users/gettingstarted.html"/>
-      <item name="Object PLC Mapping (OPM)" href="users/opm.html"/>
-      <item name="Industry 4.0 with Apache" href="users/industry40.html"/>
-      <item name="Security" href="users/security.html"/>
-    </menu>
-    <menu name="Developers">
-      <item name="Bug &amp; Issue Tracker" href="developers/issues.html"/>
-      <item name="Building PLC4X" href="developers/building.html"/>
-      <item name="Code Analysis" href="developers/sonar.html"/>
-      <item name="Code Generation" href="developers/code-gen/index.html">
-        <item name="Protocol: MSpec Format" href="developers/code-gen/protocol/mspec.html"/>
-        <item name="Language: Apache Freemarker" href="developers/code-gen/language/freemarker.html"/>
-        <item name="Example: DF1 MSpec" href="developers/code-gen/protocol/df1.html"/>
-      </item>
-      <item name="Continuous Integration" href="developers/ci.html"/>
-      <item name="Contributing" href="developers/contributing.html"/>
-      <item name="Decision Making" href="developers/decisions.html"/>
-      <!--item name="JQassistant" href="developers/jqassistant.html"/-->
-      <item name="Maturity" href="developers/maturity.html"/>
-      <item name="Preparing your Computer" href="developers/preparing.html"/>
-      <item name="Releasing" href="developers/release.html"/>
-      <item name="Team" href="developers/team.html"/>
-      <item name="VM Access" href="developers/vm.html"/>
-      <item name="VPN Access" href="developers/vpn.html"/>
-      <item name="Website" href="developers/website.html"/>
-      <item name="Wiki" href="developers/wiki.html"/>
-    </menu>
-    <menu name="Protocols">
-      <item name="Features" href="protocols/features.html"/>
-      <item name="ADS" href="protocols/ads/index.html"/>
-      <item name="DeltaV" href="protocols/delta-v/index.html"/>
-      <item name="EtherNet/IP" href="protocols/ethernet-ip/index.html"/>
-      <item name="Modbus" href="protocols/modbus/index.html"/>
-      <item name="OPC-UA" href="protocols/opc-ua/index.html"/>
-      <item name="S7" href="protocols/s7/index.html"/>
-    </menu>
-    <menu name="Reports" ref="reports" inherit="bottom"/>
-    <menu name="Apache" inherit="bottom">
-      <item name="Apache Software Foundation" href="http://www.apache.org/"/>
-      <item name="How Apache Works" href="https://www.apache.org/foundation/how-it-works.html"/>
-      <item name="License" href="http://www.apache.org/licenses/"/>
-      <item name="Sponsoring Apache" href="http://www.apache.org/foundation/sponsorship.html"/>
-      <item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/>
-    </menu>
-    <menu ref="modules" inherit="bottom"/>
-  </body>
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 
+ 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
+ 
+ http://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.
+ 
+ -->
+<project name="PLC4X">
+
+  <skin>
+    <groupId>io.github.devacfr.maven.skins</groupId>
+    <artifactId>reflow-maven-skin</artifactId>
+    <version>${reflow.skin.version}</version>
+  </skin>
+
+  <!-- Hide the publish date as this will cause changes on every generated page every day -->
+  <publishDate position="none"/>
+  <!-- Hide the version as we are usually deploying the develop version -->
+  <version position="none" />
+
+  <!--
+      Details on how to configure the reflow skin:
+      http://andriusvelykis.github.io/reflow-maven-skin/skin/
+  -->
+  <custom>
+    <reflowSkin>
+      <localResources>true</localResources>
+      <absoluteResourceURL>https://plc4x.apache.org/</absoluteResourceURL>
+      <titleTemplate>Apache PLC4X® - %2$s</titleTemplate>
+      <slogan position="bannerLeft">The industrial IoT adapter</slogan>
+      <showApacheEvents>true</showApacheEvents>
+      <toc>top</toc>
+      <bottomNav maxSpan="12">
+        <column>reports</column>
+        <column>Apache</column>
+        <column>modules</column>
+        <column>Protocols</column>
+      </bottomNav>
+      <brand>
+        <name>Apache PLC4X</name>
+        <href>https://plc4x.apache.org/</href>
+      </brand>
+      <breadcrumbs>true</breadcrumbs>
+      <highlightJs>true</highlightJs>
+      <pages>
+        <developer-info>
+          <toc>sidebar</toc>
+        </developer-info>
+      </pages>
+    </reflowSkin>
+  </custom>
+
+  <poweredBy>
+    <logo name="Apache Software Foundation" img="https://www.apache.org/images/asf_logo.png" href="https://www.apache.org/"/>
+  </poweredBy>
+
+  <bannerLeft>
+      <name>Apache PLC4X</name>
+      <src>https://plc4x.apache.org/images/apache_plc4x_logo.png</src>
+      <href>https://plc4x.apache.org/</href>
+  </bannerLeft>
+
+  <bannerRight>
+    <name>Apache Software Foundation</name>
+    <src>https://plc4x.apache.org/images/apache_logo.png</src>
+    <!--src>./images/apache_logo.png</src-->
+    <href>http://www.apache.org/</href>
+  </bannerRight>
+
+  <body>
+    <head>
+      <![CDATA[
+        <script>
+          document.addEventListener("DOMContentLoaded", function(event) {
+            /* Add an image for promoting Apache events below the right banner */
+            $("#bannerRight").append('<p id="apacheEvents"><a href="//www.apache.org/events/current-event.html"><img src="//www.apache.org/events/current-event-234x60.png"/></a></p>');
+            /* Append the trademarks info to the copyright section */
+            $(".copyright").append('<p>Apache PLC4X, PLC4X, Apache, the Apache feather logo, and the Apache PLC4X project logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>');
+          });
+        </script>
+      ]]>
+    </head>
+
+    <menu name="Users">
+      <item name="Download" href="users/download.html"/>
+      <item name="Getting Started" href="users/gettingstarted.html"/>
+      <item name="Object PLC Mapping (OPM)" href="users/opm.html"/>
+      <item name="Industry 4.0 with Apache" href="users/industry40.html"/>
+      <item name="Security" href="users/security.html"/>
+    </menu>
+    <menu name="Developers">
+      <item name="Bug &amp; Issue Tracker" href="developers/issues.html"/>
+      <item name="Building PLC4X" href="developers/building.html"/>
+      <item name="Code Analysis" href="developers/sonar.html"/>
+      <item name="Code Generation" href="developers/code-gen/index.html">
+        <item name="Protocol: MSpec Format" href="developers/code-gen/protocol/mspec.html"/>
+        <item name="Language: Apache Freemarker" href="developers/code-gen/language/freemarker.html"/>
+        <item name="Example: DF1 MSpec" href="developers/code-gen/protocol/df1.html"/>
+      </item>
+      <item name="Continuous Integration" href="developers/ci.html"/>
+      <item name="Contributing" href="developers/contributing.html"/>
+      <item name="Decision Making" href="developers/decisions.html"/>
+      <!--item name="JQassistant" href="developers/jqassistant.html"/-->
+      <item name="Maturity" href="developers/maturity.html"/>
+      <item name="Preparing your Computer" href="developers/preparing.html"/>
+      <item name="Releasing" href="developers/release.html"/>
+      <item name="Team" href="developers/team.html"/>
+      <item name="VM Access" href="developers/vm.html"/>
+      <item name="VPN Access" href="developers/vpn.html"/>
+      <item name="Website" href="developers/website.html"/>
+      <item name="Wiki" href="developers/wiki.html"/>
+    </menu>
+    <menu name="Protocols">
+      <item name="Features" href="protocols/features.html"/>
+      <item name="ADS" href="protocols/ads/index.html"/>
+      <item name="DeltaV" href="protocols/delta-v/index.html"/>
+      <item name="EtherNet/IP" href="protocols/ethernet-ip/index.html"/>
+      <item name="Modbus" href="protocols/modbus/index.html"/>
+      <item name="OPC-UA" href="protocols/opc-ua/index.html"/>
+      <item name="S7" href="protocols/s7/index.html"/>
+    </menu>
+    <menu name="Reports" ref="reports" inherit="bottom"/>
+    <menu name="Apache" inherit="bottom">
+      <item name="Apache Software Foundation" href="http://www.apache.org/"/>
+      <item name="How Apache Works" href="https://www.apache.org/foundation/how-it-works.html"/>
+      <item name="License" href="http://www.apache.org/licenses/"/>
+      <item name="Sponsoring Apache" href="http://www.apache.org/foundation/sponsorship.html"/>
+      <item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/>
+    </menu>
+    <menu ref="modules" inherit="bottom"/>
+  </body>
+
 </project>
\ No newline at end of file
diff --git a/compare-reproducible.sh b/compare-reproducible.sh
index 1d8bb4d56ce..44e9c95a84b 100755
--- a/compare-reproducible.sh
+++ b/compare-reproducible.sh
@@ -1,41 +1,41 @@
-#!/bin/bash
-# ----------------------------------------------------------------------------
-# 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
-#
-#    http://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.
-# ----------------------------------------------------------------------------
-
-# Unpack the two archives (into separate directories.
-unpack() {
-  basedir=${1%.*}
-  echo "Unpacking file $1 to $basedir ..."
-  mkdir $basedir
-  tar zxvf $1 --directory $basedir
-  echo "Done"
-}
-
-# Traverse through the direcoties and check them for binary equality
-function compare() {
-  echo "Compariong ..."
-  diff --recursive $1 $2
-  echo "Done"
-  pwd
-}
-
-unpack $1
-unpack $2
-compare ${1%.*} ${2%.*} > compare.log
-
+#!/bin/bash
+# ----------------------------------------------------------------------------
+# 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
+#
+#    http://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.
+# ----------------------------------------------------------------------------
+
+# Unpack the two archives (into separate directories.
+unpack() {
+  basedir=${1%.*}
+  echo "Unpacking file $1 to $basedir ..."
+  mkdir $basedir
+  tar zxvf $1 --directory $basedir
+  echo "Done"
+}
+
+# Traverse through the direcoties and check them for binary equality
+function compare() {
+  echo "Compariong ..."
+  diff --recursive $1 $2
+  echo "Done"
+  pwd
+}
+
+unpack $1
+unpack $2
+compare ${1%.*} ${2%.*} > compare.log
+
diff --git a/jenkins.pom b/jenkins.pom
index 8fd4a3e3115..83783d12a25 100644
--- a/jenkins.pom
+++ b/jenkins.pom
@@ -1,89 +1,89 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache</groupId>
-        <artifactId>apache</artifactId>
-        <version>21</version>
-    </parent>
-
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4x-jenkins-tools</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <name>PLC4X: Jenkins Tools</name>
-    <description>Set of helpers to do individual tasks only needed on our Jenkins build.</description>
-
-    <distributionManagement>
-        <site>
-            <id>apache.website</id>
-            <url>scm:git:https://gitbox.apache.org/repos/asf/plc4x-website.git</url>
-        </site>
-    </distributionManagement>
-
-    <profiles>
-        <!--
-            This profile is used to deploy all the artifacts in the
-            'local-snapshots-dir' to Apache's SNAPSHOT repo.
-        -->
-        <profile>
-            <id>deploy-snapshots</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>wagon-maven-plugin</artifactId>
-                        <version>2.0.0</version>
-                        <configuration>
-                            <fromDir>${project.basedir}/local-snapshots-dir</fromDir>
-                            <includes>**</includes>
-                            <serverId>apache.snapshots.https</serverId>
-                            <url>${distMgmtSnapshotsUrl}</url>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>deploy-site</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-scm-publish-plugin</artifactId>
-                        <configuration>
-                            <!-- mono-module doesn't require site:stage -->
-                            <content>${project.build.directory}/staging</content>
-                            <!-- branch where to deploy -->
-                            <scmBranch>asf-site</scmBranch>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache</groupId>
+        <artifactId>apache</artifactId>
+        <version>21</version>
+    </parent>
+
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4x-jenkins-tools</artifactId>
+    <version>0.2.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>PLC4X: Jenkins Tools</name>
+    <description>Set of helpers to do individual tasks only needed on our Jenkins build.</description>
+
+    <distributionManagement>
+        <site>
+            <id>apache.website</id>
+            <url>scm:git:https://gitbox.apache.org/repos/asf/plc4x-website.git</url>
+        </site>
+    </distributionManagement>
+
+    <profiles>
+        <!--
+            This profile is used to deploy all the artifacts in the
+            'local-snapshots-dir' to Apache's SNAPSHOT repo.
+        -->
+        <profile>
+            <id>deploy-snapshots</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>wagon-maven-plugin</artifactId>
+                        <version>2.0.0</version>
+                        <configuration>
+                            <fromDir>${project.basedir}/local-snapshots-dir</fromDir>
+                            <includes>**</includes>
+                            <serverId>apache.snapshots.https</serverId>
+                            <url>${distMgmtSnapshotsUrl}</url>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>deploy-site</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-scm-publish-plugin</artifactId>
+                        <configuration>
+                            <!-- mono-module doesn't require site:stage -->
+                            <content>${project.build.directory}/staging</content>
+                            <!-- branch where to deploy -->
+                            <scmBranch>asf-site</scmBranch>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 </project>
\ No newline at end of file
diff --git a/licenses/UNLICENSE b/licenses/UNLICENSE
index c32dd18f5b7..bfdcf390001 100644
--- a/licenses/UNLICENSE
+++ b/licenses/UNLICENSE
@@ -1,24 +1,24 @@
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
 For more information, please refer to <https://unlicense.org/>
\ No newline at end of file
diff --git a/media/logos/SVG/PLC4X logo without mascot.svg b/media/logos/SVG/PLC4X logo without mascot.svg
index 4d9dcb0b5c4..5844cbf4799 100644
--- a/media/logos/SVG/PLC4X logo without mascot.svg	
+++ b/media/logos/SVG/PLC4X logo without mascot.svg	
@@ -1,59 +1,59 @@
-<!--
-    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
-
-         http://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.
--->
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.47 69.79">
-    <defs>
-        <style>
-            .cls-1{fill:#6d4a54;}.cls-2{fill:#694650;}.cls-3{fill:url(#linear-gradient);}.cls-4{fill:url(#New_Gradient_Swatch_3);}
-        </style>
-        <linearGradient id="linear-gradient" x1="160.21" y1="100.54" x2="160.51" y2="14.79"
-                        gradientUnits="userSpaceOnUse">
-            <stop offset="0.32" stop-color="#9d2064"/>
-            <stop offset="0.63" stop-color="#c92039"/>
-            <stop offset="0.75" stop-color="#cd2035"/>
-            <stop offset="1" stop-color="#e77927"/>
-        </linearGradient>
-        <linearGradient id="New_Gradient_Swatch_3" x1="208.98" y1="100.71" x2="209.28" y2="14.96"
-                        xlink:href="#linear-gradient"/>
-    </defs>
-    <title>PLC4X logo without mascot</title>
-    <g id="Layer_2" data-name="Layer 2">
-        <g id="Layer_1-2" data-name="Layer 1">
-            <path class="cls-1"
-                  d="M43.83,33.15c0,12.19-7.61,19.05-19.48,19.05H15.07V65.39c0,2.39-.84,3.24-3.2,3.24H3.2c-2.36,0-3.2-.85-3.2-3.24V17.11c0-2.39.84-3.24,3.2-3.24H24.27C36.07,13.87,43.83,20.89,43.83,33.15Zm-15.6-.07c0-3.4-2.06-5.71-5.63-5.71H15.07V38.71H22.6A5.25,5.25,0,0,0,28.23,33.08Z"/>
-            <path class="cls-1"
-                  d="M62.39,17.11v38H80.65c2.44,0,3.28.77,3.28,3.24v7c0,2.39-.84,3.24-3.28,3.24H50.52c-2.36,0-3.19-.85-3.19-3.24V17.11c0-2.39.83-3.24,3.19-3.24H59.2C61.56,13.87,62.39,14.72,62.39,17.11Z"/>
-            <path class="cls-1"
-                  d="M109.68,12.71c11.72,0,19.1,4.86,22.22,13.5.84,2.24.23,3.39-2.05,4.17l-8.14,2.93c-2.36.69-3.2.31-4.11-2.09-1.3-3.47-3.58-5-7.92-5-5.93,0-8.29,2.62-8.29,8v14c0,5.4,2.36,8,8.29,8,4.27,0,6.7-1.7,8-5,.84-2.39,1.83-2.93,4.11-2.09l8.07,2.93c2.28.78,2.89,1.93,2.05,4.17-3.12,8.64-10.5,13.5-22.22,13.5-14.91,0-23.35-8.26-23.35-21.6V34.31C86.33,21,94.77,12.71,109.68,12.71Z"/>
-            <path class="cls-2"
-                  d="M190.08,7.13h-.29c-.23,0-.3,0-.35-.18l-.73-1.87h-3.08L184.89,7c0,.14-.11.18-.35.18h-.26c-.15,0-.18-.07-.13-.19L186.78.28A.21.21,0,0,1,187,.11h.3c.14,0,.2,0,.25.16l2.64,6.67C190.27,7.06,190.24,7.13,190.08,7.13Zm-2.76-5.66a2.82,2.82,0,0,1-.13-.68h-.05a2.82,2.82,0,0,1-.13.68l-1.18,3h2.68Z"/>
-            <path class="cls-2"
-                  d="M198.72,2.32A2,2,0,0,1,196.5,4.5h-2.12V6.93c0,.15,0,.2-.19.2h-.33c-.15,0-.19,0-.19-.2V.33c0-.14,0-.19.19-.19h2.64A2,2,0,0,1,198.72,2.32Zm-.75,0A1.4,1.4,0,0,0,196.42.81h-2v3h2A1.41,1.41,0,0,0,198,2.32Z"/>
-            <path class="cls-2"
-                  d="M207.12,7.13h-.28c-.24,0-.31,0-.36-.18l-.72-1.87h-3.09L201.94,7c-.05.14-.12.18-.36.18h-.25c-.16,0-.19-.07-.14-.19L203.83.28c0-.14.1-.17.24-.17h.31c.14,0,.19,0,.24.16l2.64,6.67C207.31,7.06,207.28,7.13,207.12,7.13Zm-2.75-5.66a2.57,2.57,0,0,1-.14-.68h0a2.82,2.82,0,0,1-.13.68l-1.18,3h2.68Z"/>
-            <path class="cls-2"
-                  d="M213.05,0a2.37,2.37,0,0,1,2.62,1.68c.05.15,0,.21-.13.26l-.3.11c-.14,0-.2,0-.25-.12A1.73,1.73,0,0,0,213.05.66c-1.31,0-2,.67-2,1.8V4.8c0,1.12.7,1.8,2,1.8A1.74,1.74,0,0,0,215,5.3c.06-.13.12-.16.26-.12l.3.11c.14,0,.17.11.12.25a2.37,2.37,0,0,1-2.63,1.72c-1.74,0-2.7-.93-2.7-2.47V2.47C210.35.93,211.29,0,213.05,0Z"/>
-            <path class="cls-2"
-                  d="M224.55.33v6.6c0,.15-.05.2-.2.2H224c-.15,0-.2,0-.2-.2v-3h-3.74v3c0,.15-.05.2-.19.2h-.33c-.15,0-.2,0-.2-.2V.33c0-.14,0-.19.2-.19h.33c.14,0,.19,0,.19.19V3.25h3.74V.33c0-.14,0-.19.2-.19h.32C224.5.14,224.55.19,224.55.33Z"/>
-            <path class="cls-2"
-                  d="M233,.33V.61c0,.15-.05.2-.2.2h-3.46V3.25h3c.15,0,.2,0,.2.19v.28c0,.15-.05.2-.2.2h-3V6.46H233c.14,0,.19,0,.19.19v.28c0,.15,0,.2-.19.2h-4.11c-.15,0-.2,0-.2-.2V.33c0-.14.05-.19.2-.19h4C233,.14,233,.19,233,.33Z"/>
-            <path class="cls-3"
-                  d="M184.29,49.31v5.43c0,2.4-.84,3.26-3.21,3.26h-3.91v7.67c0,2.41-.84,3.26-3.21,3.26h-7.88c-2.45,0-3.21-.85-3.21-3.26V58H139.68c-2.37,0-3.21-.86-3.21-3.26V49.62c0-2.56.15-3.49,1.68-5.27L161.41,16.2a5.31,5.31,0,0,1,5-2.33H174c2.37,0,3.21.85,3.21,3.26V46.05h3.91C183.45,46.05,184.29,46.91,184.29,49.31ZM162.87,33l-10.71,13.1h10.71Z"/>
-            <path class="cls-4"
-                  d="M232.18,68.93h-9.79c-4,0-4.9-.23-6.35-2.87l-7.27-12.72-7,12.72c-1.45,2.41-2.22,2.87-6.35,2.87H186c-2.29,0-2.83-1.4-1.6-3.26l15.76-24.81L185.13,17c-1.15-1.7-.61-3.1,1.53-3.1h9.18c3.9,0,4.82.31,6.28,2.72L209,28.53l6.81-11.94c1.45-2.56,2.45-2.72,5.89-2.72h9.79c2.22,0,2.61,1.4,1.53,3.1L217.88,40.86l16,24.81C235,67.38,234.55,68.93,232.18,68.93Z"/>
-        </g>
-    </g>
+<!--
+    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
+
+         http://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.
+-->
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.47 69.79">
+    <defs>
+        <style>
+            .cls-1{fill:#6d4a54;}.cls-2{fill:#694650;}.cls-3{fill:url(#linear-gradient);}.cls-4{fill:url(#New_Gradient_Swatch_3);}
+        </style>
+        <linearGradient id="linear-gradient" x1="160.21" y1="100.54" x2="160.51" y2="14.79"
+                        gradientUnits="userSpaceOnUse">
+            <stop offset="0.32" stop-color="#9d2064"/>
+            <stop offset="0.63" stop-color="#c92039"/>
+            <stop offset="0.75" stop-color="#cd2035"/>
+            <stop offset="1" stop-color="#e77927"/>
+        </linearGradient>
+        <linearGradient id="New_Gradient_Swatch_3" x1="208.98" y1="100.71" x2="209.28" y2="14.96"
+                        xlink:href="#linear-gradient"/>
+    </defs>
+    <title>PLC4X logo without mascot</title>
+    <g id="Layer_2" data-name="Layer 2">
+        <g id="Layer_1-2" data-name="Layer 1">
+            <path class="cls-1"
+                  d="M43.83,33.15c0,12.19-7.61,19.05-19.48,19.05H15.07V65.39c0,2.39-.84,3.24-3.2,3.24H3.2c-2.36,0-3.2-.85-3.2-3.24V17.11c0-2.39.84-3.24,3.2-3.24H24.27C36.07,13.87,43.83,20.89,43.83,33.15Zm-15.6-.07c0-3.4-2.06-5.71-5.63-5.71H15.07V38.71H22.6A5.25,5.25,0,0,0,28.23,33.08Z"/>
+            <path class="cls-1"
+                  d="M62.39,17.11v38H80.65c2.44,0,3.28.77,3.28,3.24v7c0,2.39-.84,3.24-3.28,3.24H50.52c-2.36,0-3.19-.85-3.19-3.24V17.11c0-2.39.83-3.24,3.19-3.24H59.2C61.56,13.87,62.39,14.72,62.39,17.11Z"/>
+            <path class="cls-1"
+                  d="M109.68,12.71c11.72,0,19.1,4.86,22.22,13.5.84,2.24.23,3.39-2.05,4.17l-8.14,2.93c-2.36.69-3.2.31-4.11-2.09-1.3-3.47-3.58-5-7.92-5-5.93,0-8.29,2.62-8.29,8v14c0,5.4,2.36,8,8.29,8,4.27,0,6.7-1.7,8-5,.84-2.39,1.83-2.93,4.11-2.09l8.07,2.93c2.28.78,2.89,1.93,2.05,4.17-3.12,8.64-10.5,13.5-22.22,13.5-14.91,0-23.35-8.26-23.35-21.6V34.31C86.33,21,94.77,12.71,109.68,12.71Z"/>
+            <path class="cls-2"
+                  d="M190.08,7.13h-.29c-.23,0-.3,0-.35-.18l-.73-1.87h-3.08L184.89,7c0,.14-.11.18-.35.18h-.26c-.15,0-.18-.07-.13-.19L186.78.28A.21.21,0,0,1,187,.11h.3c.14,0,.2,0,.25.16l2.64,6.67C190.27,7.06,190.24,7.13,190.08,7.13Zm-2.76-5.66a2.82,2.82,0,0,1-.13-.68h-.05a2.82,2.82,0,0,1-.13.68l-1.18,3h2.68Z"/>
+            <path class="cls-2"
+                  d="M198.72,2.32A2,2,0,0,1,196.5,4.5h-2.12V6.93c0,.15,0,.2-.19.2h-.33c-.15,0-.19,0-.19-.2V.33c0-.14,0-.19.19-.19h2.64A2,2,0,0,1,198.72,2.32Zm-.75,0A1.4,1.4,0,0,0,196.42.81h-2v3h2A1.41,1.41,0,0,0,198,2.32Z"/>
+            <path class="cls-2"
+                  d="M207.12,7.13h-.28c-.24,0-.31,0-.36-.18l-.72-1.87h-3.09L201.94,7c-.05.14-.12.18-.36.18h-.25c-.16,0-.19-.07-.14-.19L203.83.28c0-.14.1-.17.24-.17h.31c.14,0,.19,0,.24.16l2.64,6.67C207.31,7.06,207.28,7.13,207.12,7.13Zm-2.75-5.66a2.57,2.57,0,0,1-.14-.68h0a2.82,2.82,0,0,1-.13.68l-1.18,3h2.68Z"/>
+            <path class="cls-2"
+                  d="M213.05,0a2.37,2.37,0,0,1,2.62,1.68c.05.15,0,.21-.13.26l-.3.11c-.14,0-.2,0-.25-.12A1.73,1.73,0,0,0,213.05.66c-1.31,0-2,.67-2,1.8V4.8c0,1.12.7,1.8,2,1.8A1.74,1.74,0,0,0,215,5.3c.06-.13.12-.16.26-.12l.3.11c.14,0,.17.11.12.25a2.37,2.37,0,0,1-2.63,1.72c-1.74,0-2.7-.93-2.7-2.47V2.47C210.35.93,211.29,0,213.05,0Z"/>
+            <path class="cls-2"
+                  d="M224.55.33v6.6c0,.15-.05.2-.2.2H224c-.15,0-.2,0-.2-.2v-3h-3.74v3c0,.15-.05.2-.19.2h-.33c-.15,0-.2,0-.2-.2V.33c0-.14,0-.19.2-.19h.33c.14,0,.19,0,.19.19V3.25h3.74V.33c0-.14,0-.19.2-.19h.32C224.5.14,224.55.19,224.55.33Z"/>
+            <path class="cls-2"
+                  d="M233,.33V.61c0,.15-.05.2-.2.2h-3.46V3.25h3c.15,0,.2,0,.2.19v.28c0,.15-.05.2-.2.2h-3V6.46H233c.14,0,.19,0,.19.19v.28c0,.15,0,.2-.19.2h-4.11c-.15,0-.2,0-.2-.2V.33c0-.14.05-.19.2-.19h4C233,.14,233,.19,233,.33Z"/>
+            <path class="cls-3"
+                  d="M184.29,49.31v5.43c0,2.4-.84,3.26-3.21,3.26h-3.91v7.67c0,2.41-.84,3.26-3.21,3.26h-7.88c-2.45,0-3.21-.85-3.21-3.26V58H139.68c-2.37,0-3.21-.86-3.21-3.26V49.62c0-2.56.15-3.49,1.68-5.27L161.41,16.2a5.31,5.31,0,0,1,5-2.33H174c2.37,0,3.21.85,3.21,3.26V46.05h3.91C183.45,46.05,184.29,46.91,184.29,49.31ZM162.87,33l-10.71,13.1h10.71Z"/>
+            <path class="cls-4"
+                  d="M232.18,68.93h-9.79c-4,0-4.9-.23-6.35-2.87l-7.27-12.72-7,12.72c-1.45,2.41-2.22,2.87-6.35,2.87H186c-2.29,0-2.83-1.4-1.6-3.26l15.76-24.81L185.13,17c-1.15-1.7-.61-3.1,1.53-3.1h9.18c3.9,0,4.82.31,6.28,2.72L209,28.53l6.81-11.94c1.45-2.56,2.45-2.72,5.89-2.72h9.79c2.22,0,2.61,1.4,1.53,3.1L217.88,40.86l16,24.81C235,67.38,234.55,68.93,232.18,68.93Z"/>
+        </g>
+    </g>
 </svg>
\ No newline at end of file
diff --git a/media/logos/SVG/logo PLC4X black line.svg b/media/logos/SVG/logo PLC4X black line.svg
index f0c34ee5ab6..0bd0ed8d359 100644
--- a/media/logos/SVG/logo PLC4X black line.svg	
+++ b/media/logos/SVG/logo PLC4X black line.svg	
@@ -1,1598 +1,1598 @@
-<!--
-    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
-
-         http://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.
--->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 326.17 105.33">
-    <defs>
-        <style>
-            .cls-1{fill:#231f20;}.cls-2{isolation:isolate;}.cls-3{clip-path:url(#clip-path);}.cls-4{clip-path:url(#clip-path-2);}.cls-5{clip-path:url(#clip-path-3);}.cls-6{clip-path:url(#clip-path-4);}.cls-7{opacity:0.35;mix-blend-mode:screen;}.cls-8{clip-path:url(#clip-path-5);}.cls-9{clip-path:url(#clip-path-6);}.cls-10{clip-path:url(#clip-path-7);}.cls-11{clip-path:url(#clip-path-8);}.cls-12{clip-path:url(#clip-path-9);}.cls-13{clip-path:url(#clip-path-10);}.cls-14{clip-path:url(#clip-path-11);}.cls-15{clip-path:url(#clip-path-12);}.cls-16{clip-path:url(#clip-path-13);}.cls-17{clip-path:url(#clip-path-14);}
-        </style>
-        <clipPath id="clip-path">
-            <path class="cls-1"
-                  d="M275.72,63.08v5.4c0,2.39-.83,3.23-3.19,3.23h-3.88v7.64c0,2.39-.84,3.24-3.2,3.24h-7.83c-2.44,0-3.2-.85-3.2-3.24V71.71H231.36c-2.35,0-3.19-.84-3.19-3.23v-5.1c0-2.54.15-3.47,1.67-5.24l23.13-28c1.53-1.77,2.44-2.31,5-2.31h7.53c2.36,0,3.2.85,3.2,3.24V59.84h3.88C274.89,59.84,275.72,60.69,275.72,63.08ZM254.42,46.8l-10.65,13h10.65Z"/>
-        </clipPath>
-        <clipPath id="clip-path-2">
-            <path class="cls-1"
-                  d="M323.36,82.59h-9.74c-4,0-4.87-.23-6.32-2.85l-7.23-12.65-7,12.65c-1.44,2.39-2.2,2.85-6.31,2.85H277.4c-2.28,0-2.82-1.39-1.6-3.24l15.68-24.68L276.56,30.92c-1.14-1.7-.61-3.09,1.52-3.09h9.13c3.88,0,4.8.31,6.24,2.7l6.85,11.88,6.77-11.88c1.45-2.55,2.44-2.7,5.86-2.7h9.74c2.21,0,2.59,1.39,1.52,3.09L309.13,54.67,325,79.35C326.17,81.05,325.72,82.59,323.36,82.59Z"/>
-        </clipPath>
-        <clipPath id="clip-path-3">
-            <path class="cls-1"
-                  d="M47.8,58a1.32,1.32,0,0,1,.83-.09h0s0,0,0-.08c-.81-.5-1.62-1-2.54-1.59a1.65,1.65,0,0,1-.28.6l2,1.21S47.78,58,47.8,58Z"/>
-        </clipPath>
-        <clipPath id="clip-path-4">
-            <path class="cls-1"
-                  d="M.71,22.52A23.24,23.24,0,0,0,4.2,28l3.72-1a44.55,44.55,0,0,1-3.84-4.84A2.07,2.07,0,0,1,4,22a2.14,2.14,0,0,1,.13.19,40.79,40.79,0,0,0,4,4.62,65.5,65.5,0,0,0,.73-7c-3.61-1.54-5.64-.6-5.64-.6S0,20.26.71,22.52Z"/>
-        </clipPath>
-        <clipPath id="clip-path-5">
-            <path class="cls-1"
-                  d="M15.3,34.21c-.88-.77-1.73-1.53-2.55-2.3s-1.68-1.59-2.47-2.38l-.14-.14Q9,28.21,7.92,27.05L4.2,28l.4.51c.51.65,1.07,1.34,1.67,2s1.39,1.63,2.15,2.47,1.45,1.58,2.23,2.38,1.34,1.38,2,2.08l.08.07,5-1.24C17,35.64,16.12,34.92,15.3,34.21Z"/>
-        </clipPath>
-        <clipPath id="clip-path-6">
-            <path class="cls-1"
-                  d="M38.35,50.5,40.68,52l0,0,.34.22,2.12,1.32A4.78,4.78,0,0,1,45.6,52.3a3.85,3.85,0,0,0-2.81.61c.92-3.28.74-6.34-1.35-8.38a5.09,5.09,0,0,0-.6-.52,3.27,3.27,0,0,1,.42,3.34h0A9.18,9.18,0,0,0,38.62,42c-.33-.33-.7-.66-1.12-1a7.42,7.42,0,0,1,.64,7.34l-.22,1.9Z"/>
-        </clipPath>
-        <clipPath id="clip-path-7">
-            <path class="cls-1"
-                  d="M34.4,48.68c-.94-.64-1.89-1.29-2.84-2L28.8,44.77c-.93-.66-1.85-1.33-2.77-2s-1.87-1.39-2.8-2.1l-2.72-2.12-1-.77L17.9,36.42l-.09-.07-5,1.24a1.21,1.21,0,0,0,.16.16c.74.73,1.51,1.47,2.3,2.2s1.61,1.47,2.44,2.19,1.42,1.22,2.14,1.81l.44.35c.91.74,1.79,1.42,2.65,2s1.91,1.36,2.81,1.94c.59.38,1.16.74,1.71,1.07l1.42.81c1.12.62,2.25,1.19,3.38,1.7l5.07-1.24L35,49.11Z"/>
-        </clipPath>
-        <clipPath id="clip-path-8">
-            <path class="cls-1"
-                  d="M32.38,51.94a35.59,35.59,0,0,0,4.19,1.59l.15,0a9.39,9.39,0,0,0-2.87,2.11,13.22,13.22,0,0,1,6.51-1.21,6,6,0,0,1-1.17,2.8,6.07,6.07,0,0,0,2.09-2.14A7.3,7.3,0,0,0,42.2,59a7.63,7.63,0,0,1,.19-4.26C46,57,45,56.36,48.1,58.16c.1.05.29,0,.4,0,.34.19,1,.77,1.4,1a1.14,1.14,0,0,0-.58-1c-.88-.5-.78-.29-8.25-5.09l-.64-.41-.18-.12c-.78-.5-1.58-1-2.39-1.56l-.56-.37h0l-5.07,1.24Z"/>
-        </clipPath>
-        <clipPath id="clip-path-9">
-            <path class="cls-1"
-                  d="M18.28,36.08a3.51,3.51,0,0,0,.36.29l1.11.9,1.26,1,.66.51,2.06,1.57c.88.66,1.79,1.33,2.74,2s1.84,1.33,2.81,2l2.86,2,2.72,1.83.13.09,2.86,1.89.07,0,.22-1.9s0,.07,0,.11a13.6,13.6,0,0,0-2.34-8A18,18,0,0,0,33,37.29,28.37,28.37,0,0,0,30.1,35c-.94-.66-2-1.33-3.09-2a7,7,0,0,1,.2,1.87c0,.12,0,.24,0,.36l0,.37h0A8.26,8.26,0,0,0,24,30.29,7.68,7.68,0,0,1,24.48,33c0,.15,0,.3,0,.45a.49.49,0,0,0,0,.12h0a8.75,8.75,0,0,0-.61-2.08c-.06-.13-.12-.26-.19-.39s-.21-.37-.33-.56-.15-.22-.24-.34a7.63,7.63,0,0,0-.66-.76l-.23-.22L21.85,29c-.52-.42-1-.77-1.39-1.06l-.58-.38-.2-.13c-.2-.13-.38-.23-.54-.32a3.88,3.88,0,0,0-.58-.27h0a1.49,1.49,0,0,1,.11.28A8.89,8.89,0,0,1,19,29.82l.21-1.74L19,29.82v0a2.45,2.45,0,0,1,0,.27v-.05l-.7,6Z"/>
-        </clipPath>
-        <clipPath id="clip-path-10">
-            <path class="cls-1"
-                  d="M8,26.83c.67.7,1.45,1.47,2.32,2.32l.14.13c.77.73,1.61,1.51,2.53,2.34s1.66,1.47,2.6,2.26S17.3,35.29,18.22,36l.7-6a7.26,7.26,0,0,0-1.76-3.76c-.24-.26-.49-.53-.75-.79-.79-.81-1.68-1.63-2.58-2.39a31.59,31.59,0,0,0-2.54-1.95c-.51-.35-1-.64-1.42-.87s-.75-.37-1.1-.52A65.5,65.5,0,0,1,8,26.83Z"/>
-        </clipPath>
-        <clipPath id="clip-path-11">
-            <path class="cls-1" d="M27.2,35.21l0,.37h0Z"/>
-        </clipPath>
-        <clipPath id="clip-path-12">
-            <path class="cls-1" d="M24.45,33.6a.49.49,0,0,1,0-.12.49.49,0,0,0,0,.12Z"/>
-        </clipPath>
-        <clipPath id="clip-path-13">
-            <polygon class="cls-1" points="24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59"/>
-        </clipPath>
-        <clipPath id="clip-path-14">
-            <path class="cls-1" d="M27.25,35.08c0,.12,0,.24,0,.36h0C27.24,35.32,27.24,35.2,27.25,35.08Z"/>
-        </clipPath>
-    </defs>
-    <title>logo PLC4X black line</title>
-    <g class="cls-2">
-        <g id="Layer_2" data-name="Layer 2">
-            <g id="Layer_1-2" data-name="Layer 1">
-                <path class="cls-1"
-                      d="M135.53,47.11c0,12.19-7.61,19-19.48,19h-9.29V79.35c0,2.39-.83,3.24-3.19,3.24H94.89c-2.36,0-3.19-.85-3.19-3.24V31.07c0-2.39.83-3.24,3.19-3.24H116C127.76,27.83,135.53,34.85,135.53,47.11ZM119.93,47c0-3.39-2.06-5.7-5.63-5.7h-7.54V52.66h7.54A5.25,5.25,0,0,0,119.93,47Z"/>
-                <path class="cls-1"
-                      d="M154.09,31.07v38h18.26c2.44,0,3.27.77,3.27,3.24v7c0,2.39-.83,3.24-3.27,3.24H142.22c-2.36,0-3.2-.85-3.2-3.24V31.07c0-2.39.84-3.24,3.2-3.24h8.67C153.25,27.83,154.09,28.68,154.09,31.07Z"/>
-                <path class="cls-1"
-                      d="M201.38,26.67c11.72,0,19.1,4.86,22.22,13.5.84,2.24.23,3.39-2,4.16l-8.15,2.94c-2.35.69-3.19.3-4.1-2.09-1.3-3.47-3.58-5-7.92-5-5.93,0-8.29,2.62-8.29,8v14c0,5.4,2.36,8,8.29,8,4.26,0,6.7-1.7,8-5,.84-2.4,1.83-2.94,4.11-2.09l8.07,2.93c2.28.78,2.89,1.93,2,4.17-3.12,8.64-10.5,13.5-22.22,13.5-14.91,0-23.36-8.26-23.36-21.6V48.27C178,34.93,186.47,26.67,201.38,26.67Z"/>
-                <path class="cls-1"
-                      d="M275.72,63.08v5.4c0,2.39-.83,3.23-3.19,3.23h-3.88v7.64c0,2.39-.84,3.24-3.2,3.24h-7.83c-2.44,0-3.2-.85-3.2-3.24V71.71H231.36c-2.35,0-3.19-.84-3.19-3.23v-5.1c0-2.54.15-3.47,1.67-5.24l23.13-28c1.53-1.77,2.44-2.31,5-2.31h7.53c2.36,0,3.2.85,3.2,3.24V59.84h3.88C274.89,59.84,275.72,60.69,275.72,63.08ZM254.42,46.8l-10.65,13h10.65Z"/>
-                <g class="cls-3">
-                    <polygon class="cls-1" points="243.77 58.95 254.42 58.99 254.42 59.84 243.77 59.84 243.77 58.95"/>
-                    <polygon class="cls-1" points="243.77 57.66 254.42 57.7 254.42 58.99 243.77 58.95 243.77 57.66"/>
-                    <polygon class="cls-1" points="243.77 56.37 254.42 56.41 254.42 57.7 243.77 57.66 243.77 56.37"/>
-                    <polygon class="cls-1" points="243.77 55.08 254.42 55.11 254.42 56.41 243.77 56.37 243.77 55.08"/>
-                    <polygon class="cls-1" points="243.77 53.78 254.42 53.82 254.42 55.11 243.77 55.08 243.77 53.78"/>
-                    <polygon class="cls-1" points="243.77 52.49 254.42 52.53 254.42 53.82 243.77 53.78 243.77 52.49"/>
-                    <polygon class="cls-1" points="243.77 51.2 254.42 51.24 254.42 52.53 243.77 52.49 243.77 51.2"/>
-                    <polygon class="cls-1" points="243.77 49.91 254.42 49.95 254.42 51.24 243.77 51.2 243.77 49.91"/>
-                    <polygon class="cls-1" points="243.77 49.68 254.42 49.71 254.42 49.95 243.77 49.91 243.77 49.68"/>
-                    <polygon class="cls-1" points="243.77 49.44 254.42 49.48 254.42 49.71 243.77 49.68 243.77 49.44"/>
-                    <polygon class="cls-1" points="243.77 49.21 254.42 49.25 254.42 49.48 243.77 49.44 243.77 49.21"/>
-                    <polygon class="cls-1" points="243.77 48.98 254.42 49.02 254.42 49.25 243.77 49.21 243.77 48.98"/>
-                    <polygon class="cls-1" points="243.77 48.74 254.42 48.78 254.42 49.02 243.77 48.98 243.77 48.74"/>
-                    <polygon class="cls-1" points="243.77 48.51 254.42 48.55 254.42 48.78 243.77 48.74 243.77 48.51"/>
-                    <polygon class="cls-1" points="243.77 48.28 254.42 48.32 254.42 48.55 243.77 48.51 243.77 48.28"/>
-                    <polygon class="cls-1" points="243.77 48.05 254.42 48.08 254.42 48.32 243.77 48.28 243.77 48.05"/>
-                    <polygon class="cls-1" points="243.77 47.81 254.42 47.85 254.42 48.08 243.77 48.05 243.77 47.81"/>
-                    <polygon class="cls-1" points="243.77 47.58 254.42 47.62 254.42 47.85 243.77 47.81 243.77 47.58"/>
-                    <polygon class="cls-1" points="243.77 47.35 254.42 47.38 254.42 47.62 243.77 47.58 243.77 47.35"/>
-                    <polygon class="cls-1" points="243.77 47.11 254.42 47.15 254.42 47.38 243.77 47.35 243.77 47.11"/>
-                    <polygon class="cls-1" points="243.77 46.88 254.42 46.92 254.42 47.15 243.77 47.11 243.77 46.88"/>
-                    <polygon class="cls-1" points="254.42 46.92 243.77 46.88 243.77 46.8 254.42 46.8 254.42 46.92"/>
-                    <polygon class="cls-1" points="228.17 82.47 261.4 82.59 228.17 82.59 228.17 82.47"/>
-                    <polygon class="cls-1"
-                             points="228.17 82.26 275.73 82.42 275.73 82.59 261.4 82.59 228.17 82.47 228.17 82.26"/>
-                    <polygon class="cls-1" points="228.17 82.04 275.73 82.21 275.73 82.42 228.17 82.26 228.17 82.04"/>
-                    <polygon class="cls-1" points="228.17 81.82 275.73 81.99 275.73 82.21 228.17 82.04 228.17 81.82"/>
-                    <polygon class="cls-1" points="228.17 81.61 275.73 81.77 275.73 81.99 228.17 81.82 228.17 81.61"/>
-                    <polygon class="cls-1" points="228.17 81.39 275.73 81.56 275.73 81.77 228.17 81.61 228.17 81.39"/>
-                    <polygon class="cls-1" points="228.17 81.17 275.73 81.34 275.73 81.56 228.17 81.39 228.17 81.17"/>
-                    <polygon class="cls-1" points="228.17 80.96 275.73 81.12 275.73 81.34 228.17 81.17 228.17 80.96"/>
-                    <polygon class="cls-1" points="228.17 80.74 275.73 80.91 275.73 81.12 228.17 80.96 228.17 80.74"/>
-                    <polygon class="cls-1" points="228.17 80.53 275.73 80.69 275.73 80.91 228.17 80.74 228.17 80.53"/>
-                    <polygon class="cls-1" points="228.17 80.31 275.73 80.48 275.73 80.69 228.17 80.53 228.17 80.31"/>
-                    <polygon class="cls-1" points="228.17 80.09 275.73 80.26 275.73 80.48 228.17 80.31 228.17 80.09"/>
-                    <polygon class="cls-1" points="228.17 79.88 275.73 80.04 275.73 80.26 228.17 80.09 228.17 79.88"/>
-                    <polygon class="cls-1" points="228.17 79.66 275.73 79.83 275.73 80.04 228.17 79.88 228.17 79.66"/>
-                    <polygon class="cls-1" points="228.17 79.44 275.73 79.61 275.73 79.83 228.17 79.66 228.17 79.44"/>
-                    <polygon class="cls-1" points="228.17 79.23 275.73 79.39 275.73 79.61 228.17 79.44 228.17 79.23"/>
-                    <polygon class="cls-1" points="228.17 79.01 275.73 79.18 275.73 79.39 228.17 79.23 228.17 79.01"/>
-                    <polygon class="cls-1" points="228.17 78.8 275.73 78.96 275.73 79.18 228.17 79.01 228.17 78.8"/>
-                    <polygon class="cls-1" points="228.17 78.58 275.73 78.75 275.73 78.96 228.17 78.8 228.17 78.58"/>
-                    <polygon class="cls-1" points="228.17 78.36 275.73 78.53 275.73 78.75 228.17 78.58 228.17 78.36"/>
-                    <polygon class="cls-1" points="228.17 78.15 275.73 78.31 275.73 78.53 228.17 78.36 228.17 78.15"/>
-                    <polygon class="cls-1" points="228.17 77.93 275.73 78.1 275.73 78.31 228.17 78.15 228.17 77.93"/>
-                    <polygon class="cls-1" points="228.17 77.71 275.73 77.88 275.73 78.1 228.17 77.93 228.17 77.71"/>
-                    <polygon class="cls-1" points="228.17 77.5 275.73 77.66 275.73 77.88 228.17 77.71 228.17 77.5"/>
-                    <polygon class="cls-1" points="228.17 77.28 275.73 77.45 275.73 77.66 228.17 77.5 228.17 77.28"/>
-                    <polygon class="cls-1" points="228.17 77.06 275.73 77.23 275.73 77.45 228.17 77.28 228.17 77.06"/>
-                    <polygon class="cls-1" points="228.17 76.85 275.73 77.01 275.73 77.23 228.17 77.06 228.17 76.85"/>
-                    <polygon class="cls-1" points="228.17 76.63 275.73 76.8 275.73 77.01 228.17 76.85 228.17 76.63"/>
-                    <polygon class="cls-1" points="228.17 76.42 275.73 76.58 275.73 76.8 228.17 76.63 228.17 76.42"/>
-                    <polygon class="cls-1" points="228.17 76.2 275.73 76.36 275.73 76.58 228.17 76.42 228.17 76.2"/>
-                    <polygon class="cls-1" points="228.17 75.98 275.73 76.15 275.73 76.36 228.17 76.2 228.17 75.98"/>
-                    <polygon class="cls-1" points="228.17 75.77 275.73 75.93 275.73 76.15 228.17 75.98 228.17 75.77"/>
-                    <polygon class="cls-1" points="228.17 75.55 275.73 75.72 275.73 75.93 228.17 75.77 228.17 75.55"/>
-                    <polygon class="cls-1" points="228.17 75.33 275.73 75.5 275.73 75.72 228.17 75.55 228.17 75.33"/>
-                    <polygon class="cls-1" points="228.17 75.12 275.73 75.28 275.73 75.5 228.17 75.33 228.17 75.12"/>
-                    <polygon class="cls-1" points="228.17 74.9 275.73 75.07 275.73 75.28 228.17 75.12 228.17 74.9"/>
-                    <polygon class="cls-1" points="228.17 74.69 275.73 74.85 275.73 75.07 228.17 74.9 228.17 74.69"/>
-                    <polygon class="cls-1" points="228.17 74.47 275.73 74.63 275.73 74.85 228.17 74.69 228.17 74.47"/>
-                    <polygon class="cls-1" points="228.17 74.25 275.73 74.42 275.73 74.63 228.17 74.47 228.17 74.25"/>
-                    <polygon class="cls-1" points="228.17 74.03 275.73 74.2 275.73 74.42 228.17 74.25 228.17 74.03"/>
-                    <polygon class="cls-1" points="228.17 73.82 275.73 73.98 275.73 74.2 228.17 74.03 228.17 73.82"/>
-                    <polygon class="cls-1" points="228.17 73.6 275.73 73.77 275.73 73.98 228.17 73.82 228.17 73.6"/>
-                    <polygon class="cls-1" points="228.17 73.39 275.73 73.55 275.73 73.77 228.17 73.6 228.17 73.39"/>
-                    <polygon class="cls-1" points="228.17 73.17 275.73 73.34 275.73 73.55 228.17 73.39 228.17 73.17"/>
-                    <polygon class="cls-1" points="228.17 72.95 275.73 73.12 275.73 73.34 228.17 73.17 228.17 72.95"/>
-                    <polygon class="cls-1" points="228.17 72.74 275.73 72.9 275.73 73.12 228.17 72.95 228.17 72.74"/>
-                    <polygon class="cls-1" points="228.17 72.52 275.73 72.69 275.73 72.9 228.17 72.74 228.17 72.52"/>
-                    <polygon class="cls-1" points="228.17 72.31 275.73 72.47 275.73 72.69 228.17 72.52 228.17 72.31"/>
-                    <polygon class="cls-1" points="228.17 72.09 275.73 72.25 275.73 72.47 228.17 72.31 228.17 72.09"/>
-                    <polygon class="cls-1" points="228.17 71.87 275.73 72.04 275.73 72.25 228.17 72.09 228.17 71.87"/>
-                    <polygon class="cls-1" points="228.17 71.66 275.73 71.82 275.73 72.04 228.17 71.87 228.17 71.66"/>
-                    <polygon class="cls-1" points="228.17 71.44 275.73 71.61 275.73 71.82 228.17 71.66 228.17 71.44"/>
-                    <polygon class="cls-1" points="228.17 71.22 275.73 71.39 275.73 71.61 228.17 71.44 228.17 71.22"/>
-                    <polygon class="cls-1" points="228.17 71.01 275.73 71.17 275.73 71.39 228.17 71.22 228.17 71.01"/>
-                    <polygon class="cls-1" points="228.17 70.79 275.73 70.96 275.73 71.17 228.17 71.01 228.17 70.79"/>
-                    <polygon class="cls-1" points="228.17 70.57 275.73 70.74 275.73 70.96 228.17 70.79 228.17 70.57"/>
-                    <polygon class="cls-1" points="228.17 70.36 275.73 70.52 275.73 70.74 228.17 70.57 228.17 70.36"/>
-                    <polygon class="cls-1" points="228.17 70.14 275.73 70.31 275.73 70.52 228.17 70.36 228.17 70.14"/>
-                    <polygon class="cls-1" points="228.17 69.92 275.73 70.09 275.73 70.31 228.17 70.14 228.17 69.92"/>
-                    <polygon class="cls-1" points="228.17 69.71 275.73 69.88 275.73 70.09 228.17 69.92 228.17 69.71"/>
-                    <polygon class="cls-1" points="228.17 69.49 275.73 69.66 275.73 69.88 228.17 69.71 228.17 69.49"/>
-                    <polygon class="cls-1" points="228.17 69.28 275.73 69.44 275.73 69.66 228.17 69.49 228.17 69.28"/>
-                    <polygon class="cls-1" points="228.17 69.06 275.73 69.23 275.73 69.44 228.17 69.28 228.17 69.06"/>
-                    <polygon class="cls-1" points="228.17 68.84 275.73 69.01 275.73 69.23 228.17 69.06 228.17 68.84"/>
-                    <polygon class="cls-1" points="228.17 68.63 275.73 68.79 275.73 69.01 228.17 68.84 228.17 68.63"/>
-                    <polygon class="cls-1" points="228.17 68.41 275.73 68.58 275.73 68.79 228.17 68.63 228.17 68.41"/>
-                    <polygon class="cls-1" points="228.17 68.19 275.73 68.36 275.73 68.58 228.17 68.41 228.17 68.19"/>
-                    <polygon class="cls-1" points="228.17 67.98 275.73 68.14 275.73 68.36 228.17 68.19 228.17 67.98"/>
-                    <polygon class="cls-1" points="228.17 67.76 275.73 67.93 275.73 68.14 228.17 67.98 228.17 67.76"/>
-                    <polygon class="cls-1" points="228.17 67.55 275.73 67.71 275.73 67.93 228.17 67.76 228.17 67.55"/>
-                    <polygon class="cls-1" points="228.17 67.33 275.73 67.5 275.73 67.71 228.17 67.55 228.17 67.33"/>
-                    <polygon class="cls-1" points="228.17 67.11 275.73 67.28 275.73 67.5 228.17 67.33 228.17 67.11"/>
-                    <polygon class="cls-1" points="228.17 66.9 275.73 67.06 275.73 67.28 228.17 67.11 228.17 66.9"/>
-                    <polygon class="cls-1" points="228.17 66.68 275.73 66.85 275.73 67.06 228.17 66.9 228.17 66.68"/>
-                    <polygon class="cls-1" points="228.17 66.46 275.73 66.63 275.73 66.85 228.17 66.68 228.17 66.46"/>
-                    <polygon class="cls-1" points="228.17 66.25 275.73 66.41 275.73 66.63 228.17 66.46 228.17 66.25"/>
-                    <polygon class="cls-1" points="228.17 66.03 275.73 66.2 275.73 66.41 228.17 66.25 228.17 66.03"/>
-                    <polygon class="cls-1" points="228.17 65.81 275.73 65.98 275.73 66.2 228.17 66.03 228.17 65.81"/>
-                    <polygon class="cls-1" points="228.17 65.6 275.73 65.77 275.73 65.98 228.17 65.81 228.17 65.6"/>
-                    <polygon class="cls-1" points="228.17 65.38 275.73 65.55 275.73 65.77 228.17 65.6 228.17 65.38"/>
-                    <polygon class="cls-1" points="228.17 65.17 275.73 65.33 275.73 65.55 228.17 65.38 228.17 65.17"/>
-                    <polygon class="cls-1" points="228.17 64.95 275.73 65.12 275.73 65.33 228.17 65.17 228.17 64.95"/>
-                    <polygon class="cls-1" points="228.17 64.73 275.73 64.9 275.73 65.12 228.17 64.95 228.17 64.73"/>
-                    <polygon class="cls-1" points="228.17 64.52 275.73 64.68 275.73 64.9 228.17 64.73 228.17 64.52"/>
-                    <polygon class="cls-1" points="228.17 64.3 275.73 64.47 275.73 64.68 228.17 64.52 228.17 64.3"/>
-                    <polygon class="cls-1" points="228.17 64.08 275.73 64.25 275.73 64.47 228.17 64.3 228.17 64.08"/>
-                    <polygon class="cls-1" points="228.17 63.87 275.73 64.03 275.73 64.25 228.17 64.08 228.17 63.87"/>
-                    <polygon class="cls-1" points="228.17 63.65 275.73 63.82 275.73 64.03 228.17 63.87 228.17 63.65"/>
-                    <polygon class="cls-1" points="228.17 63.44 275.73 63.6 275.73 63.82 228.17 63.65 228.17 63.44"/>
-                    <polygon class="cls-1" points="228.17 63.22 275.73 63.38 275.73 63.6 228.17 63.44 228.17 63.22"/>
-                    <polygon class="cls-1" points="228.17 63 275.73 63.17 275.73 63.38 228.17 63.22 228.17 63"/>
-                    <polygon class="cls-1" points="228.17 62.79 275.73 62.95 275.73 63.17 228.17 63 228.17 62.79"/>
-                    <polygon class="cls-1" points="228.17 62.57 275.73 62.74 275.73 62.95 228.17 62.79 228.17 62.57"/>
-                    <polygon class="cls-1" points="228.17 62.35 275.73 62.52 275.73 62.74 228.17 62.57 228.17 62.35"/>
-                    <polygon class="cls-1" points="228.17 62.14 275.73 62.3 275.73 62.52 228.17 62.35 228.17 62.14"/>
-                    <polygon class="cls-1" points="228.17 61.92 275.73 62.09 275.73 62.3 228.17 62.14 228.17 61.92"/>
-                    <polygon class="cls-1" points="228.17 61.7 275.73 61.87 275.73 62.09 228.17 61.92 228.17 61.7"/>
-                    <polygon class="cls-1" points="228.17 61.49 275.73 61.65 275.73 61.87 228.17 61.7 228.17 61.49"/>
-                    <polygon class="cls-1" points="228.17 61.27 275.73 61.44 275.73 61.65 228.17 61.49 228.17 61.27"/>
-                    <polygon class="cls-1" points="228.17 61.05 275.73 61.22 275.73 61.44 228.17 61.27 228.17 61.05"/>
-                    <polygon class="cls-1" points="228.17 60.84 275.73 61.01 275.73 61.22 228.17 61.05 228.17 60.84"/>
-                    <polygon class="cls-1" points="228.17 60.62 275.73 60.79 275.73 61.01 228.17 60.84 228.17 60.62"/>
-                    <polygon class="cls-1" points="228.17 60.41 275.73 60.57 275.73 60.79 228.17 60.62 228.17 60.41"/>
-                    <polygon class="cls-1" points="228.17 60.19 275.73 60.36 275.73 60.57 228.17 60.41 228.17 60.19"/>
-                    <polygon class="cls-1" points="228.17 58.9 275.73 59.06 275.73 60.36 228.17 60.19 228.17 58.9"/>
-                    <polygon class="cls-1" points="228.17 57.61 275.73 57.77 275.73 59.06 228.17 58.9 228.17 57.61"/>
-                    <polygon class="cls-1" points="228.17 56.31 275.73 56.48 275.73 57.77 228.17 57.61 228.17 56.31"/>
-                    <polygon class="cls-1" points="228.17 55.02 275.73 55.19 275.73 56.48 228.17 56.31 228.17 55.02"/>
-                    <polygon class="cls-1" points="228.17 53.73 275.73 53.9 275.73 55.19 228.17 55.02 228.17 53.73"/>
-                    <polygon class="cls-1" points="228.17 52.44 275.73 52.6 275.73 53.9 228.17 53.73 228.17 52.44"/>
-                    <polygon class="cls-1" points="228.17 51.15 275.73 51.31 275.73 52.6 228.17 52.44 228.17 51.15"/>
-                    <polygon class="cls-1" points="228.17 49.85 275.73 50.02 275.73 51.31 228.17 51.15 228.17 49.85"/>
-                    <polygon class="cls-1" points="228.17 49.62 275.73 49.79 275.73 50.02 228.17 49.85 228.17 49.62"/>
-                    <polygon class="cls-1" points="228.17 49.39 275.73 49.55 275.73 49.79 228.17 49.62 228.17 49.39"/>
-                    <polygon class="cls-1" points="228.17 49.16 275.73 49.32 275.73 49.55 228.17 49.39 228.17 49.16"/>
-                    <polygon class="cls-1" points="228.17 48.92 275.73 49.09 275.73 49.32 228.17 49.16 228.17 48.92"/>
-                    <polygon class="cls-1" points="228.17 48.69 275.73 48.86 275.73 49.09 228.17 48.92 228.17 48.69"/>
-                    <polygon class="cls-1" points="228.17 48.46 275.73 48.62 275.73 48.86 228.17 48.69 228.17 48.46"/>
-                    <polygon class="cls-1" points="228.17 48.22 275.73 48.39 275.73 48.62 228.17 48.46 228.17 48.22"/>
-                    <polygon class="cls-1" points="228.17 47.99 275.73 48.16 275.73 48.39 228.17 48.22 228.17 47.99"/>
-                    <polygon class="cls-1" points="228.17 47.76 275.73 47.92 275.73 48.16 228.17 47.99 228.17 47.76"/>
-                    <polygon class="cls-1" points="228.17 47.52 275.73 47.69 275.73 47.92 228.17 47.76 228.17 47.52"/>
-                    <polygon class="cls-1" points="228.17 47.29 275.73 47.46 275.73 47.69 228.17 47.52 228.17 47.29"/>
-                    <polygon class="cls-1" points="228.17 47.06 275.73 47.23 275.73 47.46 228.17 47.29 228.17 47.06"/>
-                    <polygon class="cls-1" points="228.17 46.83 275.73 46.99 275.73 47.23 228.17 47.06 228.17 46.83"/>
-                    <polygon class="cls-1" points="228.17 46.59 275.73 46.76 275.73 46.99 228.17 46.83 228.17 46.59"/>
-                    <polygon class="cls-1" points="228.17 46.36 275.73 46.53 275.73 46.76 228.17 46.59 228.17 46.36"/>
-                    <polygon class="cls-1" points="228.17 46.13 275.73 46.29 275.73 46.53 228.17 46.36 228.17 46.13"/>
-                    <polygon class="cls-1" points="228.17 45.89 275.73 46.06 275.73 46.29 228.17 46.13 228.17 45.89"/>
-                    <polygon class="cls-1" points="228.17 45.66 275.73 45.83 275.73 46.06 228.17 45.89 228.17 45.66"/>
-                    <polygon class="cls-1" points="228.17 45.43 275.73 45.59 275.73 45.83 228.17 45.66 228.17 45.43"/>
-                    <polygon class="cls-1" points="228.17 45.2 275.73 45.36 275.73 45.59 228.17 45.43 228.17 45.2"/>
-                    <polygon class="cls-1" points="228.17 44.96 275.73 45.13 275.73 45.36 228.17 45.2 228.17 44.96"/>
-                    <polygon class="cls-1" points="228.17 44.73 275.73 44.9 275.73 45.13 228.17 44.96 228.17 44.73"/>
-                    <polygon class="cls-1" points="228.17 44.5 275.73 44.66 275.73 44.9 228.17 44.73 228.17 44.5"/>
-                    <polygon class="cls-1" points="228.17 44.26 275.73 44.43 275.73 44.66 228.17 44.5 228.17 44.26"/>
-                    <polygon class="cls-1" points="228.17 44.03 275.73 44.2 275.73 44.43 228.17 44.26 228.17 44.03"/>
-                    <polygon class="cls-1" points="228.17 43.8 275.73 43.96 275.73 44.2 228.17 44.03 228.17 43.8"/>
-                    <polygon class="cls-1" points="228.17 43.56 275.73 43.73 275.73 43.96 228.17 43.8 228.17 43.56"/>
-                    <polygon class="cls-1" points="228.17 43.33 275.73 43.5 275.73 43.73 228.17 43.56 228.17 43.33"/>
-                    <polygon class="cls-1" points="228.17 43.1 275.73 43.27 275.73 43.5 228.17 43.33 228.17 43.1"/>
-                    <polygon class="cls-1" points="228.17 42.87 275.73 43.03 275.73 43.27 228.17 43.1 228.17 42.87"/>
-                    <polygon class="cls-1" points="228.17 42.63 275.73 42.8 275.73 43.03 228.17 42.87 228.17 42.63"/>
-                    <polygon class="cls-1" points="228.17 42.4 275.73 42.57 275.73 42.8 228.17 42.63 228.17 42.4"/>
-                    <polygon class="cls-1" points="228.17 42.17 275.73 42.33 275.73 42.57 228.17 42.4 228.17 42.17"/>
-                    <polygon class="cls-1" points="228.17 41.93 275.73 42.1 275.73 42.33 228.17 42.17 228.17 41.93"/>
-                    <polygon class="cls-1" points="228.17 41.7 275.73 41.87 275.73 42.1 228.17 41.93 228.17 41.7"/>
-                    <polygon class="cls-1" points="228.17 41.47 275.73 41.63 275.73 41.87 228.17 41.7 228.17 41.47"/>
-                    <polygon class="cls-1" points="228.17 41.23 275.73 41.4 275.73 41.63 228.17 41.47 228.17 41.23"/>
-                    <polygon class="cls-1" points="228.17 41 275.73 41.17 275.73 41.4 228.17 41.23 228.17 41"/>
-                    <polygon class="cls-1" points="228.17 40.77 275.73 40.94 275.73 41.17 228.17 41 228.17 40.77"/>
-                    <polygon class="cls-1" points="228.17 40.54 275.73 40.7 275.73 40.94 228.17 40.77 228.17 40.54"/>
-                    <polygon class="cls-1" points="228.17 40.3 275.73 40.47 275.73 40.7 228.17 40.54 228.17 40.3"/>
-                    <polygon class="cls-1" points="228.17 40.07 275.73 40.24 275.73 40.47 228.17 40.3 228.17 40.07"/>
-                    <polygon class="cls-1" points="228.17 39.84 275.73 40 275.73 40.24 228.17 40.07 228.17 39.84"/>
-                    <polygon class="cls-1" points="228.17 39.6 275.73 39.77 275.73 40 228.17 39.84 228.17 39.6"/>
-                    <polygon class="cls-1" points="228.17 39.37 275.73 39.54 275.73 39.77 228.17 39.6 228.17 39.37"/>
-                    <polygon class="cls-1" points="228.17 39.14 275.73 39.3 275.73 39.54 228.17 39.37 228.17 39.14"/>
-                    <polygon class="cls-1" points="228.17 38.91 275.73 39.07 275.73 39.3 228.17 39.14 228.17 38.91"/>
-                    <polygon class="cls-1" points="228.17 38.67 275.73 38.84 275.73 39.07 228.17 38.91 228.17 38.67"/>
-                    <polygon class="cls-1" points="228.17 38.44 275.73 38.61 275.73 38.84 228.17 38.67 228.17 38.44"/>
-                    <polygon class="cls-1" points="228.17 38.21 275.73 38.37 275.73 38.61 228.17 38.44 228.17 38.21"/>
-                    <polygon class="cls-1" points="228.17 37.97 275.73 38.14 275.73 38.37 228.17 38.21 228.17 37.97"/>
-                    <polygon class="cls-1" points="228.17 37.74 275.73 37.91 275.73 38.14 228.17 37.97 228.17 37.74"/>
-                    <polygon class="cls-1" points="228.17 37.51 275.73 37.67 275.73 37.91 228.17 37.74 228.17 37.51"/>
-                    <polygon class="cls-1" points="228.17 37.27 275.73 37.44 275.73 37.67 228.17 37.51 228.17 37.27"/>
-                    <polygon class="cls-1" points="228.17 37.04 275.73 37.21 275.73 37.44 228.17 37.27 228.17 37.04"/>
-                    <polygon class="cls-1" points="228.17 36.81 275.73 36.98 275.73 37.21 228.17 37.04 228.17 36.81"/>
-                    <polygon class="cls-1" points="228.17 36.58 275.73 36.74 275.73 36.98 228.17 36.81 228.17 36.58"/>
-                    <polygon class="cls-1" points="228.17 36.34 275.73 36.51 275.73 36.74 228.17 36.58 228.17 36.34"/>
-                    <polygon class="cls-1" points="228.17 36.11 275.73 36.28 275.73 36.51 228.17 36.34 228.17 36.11"/>
-                    <polygon class="cls-1" points="228.17 35.88 275.73 36.04 275.73 36.28 228.17 36.11 228.17 35.88"/>
-                    <polygon class="cls-1" points="228.17 35.65 275.73 35.81 275.73 36.04 228.17 35.88 228.17 35.65"/>
-                    <polygon class="cls-1" points="228.17 35.41 275.73 35.58 275.73 35.81 228.17 35.65 228.17 35.41"/>
-                    <polygon class="cls-1" points="228.17 35.18 275.73 35.34 275.73 35.58 228.17 35.41 228.17 35.18"/>
-                    <polygon class="cls-1" points="228.17 34.95 275.73 35.11 275.73 35.34 228.17 35.18 228.17 34.95"/>
-                    <polygon class="cls-1" points="228.17 34.71 275.73 34.88 275.73 35.11 228.17 34.95 228.17 34.71"/>
-                    <polygon class="cls-1" points="228.17 34.48 275.73 34.65 275.73 34.88 228.17 34.71 228.17 34.48"/>
-                    <polygon class="cls-1" points="228.17 34.25 275.73 34.41 275.73 34.65 228.17 34.48 228.17 34.25"/>
-                    <polygon class="cls-1" points="228.17 34.01 275.73 34.18 275.73 34.41 228.17 34.25 228.17 34.01"/>
-                    <polygon class="cls-1" points="228.17 33.78 275.73 33.95 275.73 34.18 228.17 34.01 228.17 33.78"/>
-                    <polygon class="cls-1" points="228.17 33.55 275.73 33.71 275.73 33.95 228.17 33.78 228.17 33.55"/>
-                    <polygon class="cls-1" points="228.17 33.31 275.73 33.48 275.73 33.71 228.17 33.55 228.17 33.31"/>
-                    <polygon class="cls-1" points="228.17 33.08 275.73 33.25 275.73 33.48 228.17 33.31 228.17 33.08"/>
-                    <polygon class="cls-1" points="228.17 32.85 275.73 33.02 275.73 33.25 228.17 33.08 228.17 32.85"/>
-                    <polygon class="cls-1" points="228.17 32.62 275.73 32.78 275.73 33.02 228.17 32.85 228.17 32.62"/>
-                    <polygon class="cls-1" points="228.17 32.38 275.73 32.55 275.73 32.78 228.17 32.62 228.17 32.38"/>
-                    <polygon class="cls-1" points="228.17 32.15 275.73 32.32 275.73 32.55 228.17 32.38 228.17 32.15"/>
-                    <polygon class="cls-1" points="228.17 31.92 275.73 32.08 275.73 32.32 228.17 32.15 228.17 31.92"/>
-                    <polygon class="cls-1" points="228.17 31.68 275.73 31.85 275.73 32.08 228.17 31.92 228.17 31.68"/>
-                    <polygon class="cls-1" points="228.17 31.45 275.73 31.62 275.73 31.85 228.17 31.68 228.17 31.45"/>
-                    <polygon class="cls-1" points="228.17 31.22 275.73 31.39 275.73 31.62 228.17 31.45 228.17 31.22"/>
-                    <polygon class="cls-1" points="228.17 30.99 275.73 31.15 275.73 31.39 228.17 31.22 228.17 30.99"/>
-                    <polygon class="cls-1" points="228.17 30.75 275.73 30.92 275.73 31.15 228.17 30.99 228.17 30.75"/>
-                    <polygon class="cls-1" points="228.17 30.52 275.73 30.69 275.73 30.92 228.17 30.75 228.17 30.52"/>
-                    <polygon class="cls-1" points="228.17 30.29 275.73 30.45 275.73 30.69 228.17 30.52 228.17 30.29"/>
-                    <polygon class="cls-1" points="228.17 30.05 275.73 30.22 275.73 30.45 228.17 30.29 228.17 30.05"/>
-                    <polygon class="cls-1" points="228.17 29.82 275.73 29.99 275.73 30.22 228.17 30.05 228.17 29.82"/>
-                    <polygon class="cls-1" points="228.17 29.59 275.73 29.75 275.73 29.99 228.17 29.82 228.17 29.59"/>
-                    <polygon class="cls-1" points="228.17 29.36 275.73 29.52 275.73 29.75 228.17 29.59 228.17 29.36"/>
-                    <polygon class="cls-1" points="228.17 29.12 275.73 29.29 275.73 29.52 228.17 29.36 228.17 29.12"/>
-                    <polygon class="cls-1" points="228.17 28.89 275.73 29.06 275.73 29.29 228.17 29.12 228.17 28.89"/>
-                    <polygon class="cls-1" points="228.17 28.66 275.73 28.82 275.73 29.06 228.17 28.89 228.17 28.66"/>
-                    <polygon class="cls-1" points="275.73 28.82 228.17 28.66 228.17 27.83 275.73 27.83 275.73 28.82"/>
-                </g>
-                <path class="cls-1"
-                      d="M323.36,82.59h-9.74c-4,0-4.87-.23-6.32-2.85l-7.23-12.65-7,12.65c-1.44,2.39-2.2,2.85-6.31,2.85H277.4c-2.28,0-2.82-1.39-1.6-3.24l15.68-24.68L276.56,30.92c-1.14-1.7-.61-3.09,1.52-3.09h9.13c3.88,0,4.8.31,6.24,2.7l6.85,11.88,6.77-11.88c1.45-2.55,2.44-2.7,5.86-2.7h9.74c2.21,0,2.59,1.39,1.52,3.09L309.13,54.67,325,79.35C326.17,81.05,325.72,82.59,323.36,82.59Z"/>
-                <g class="cls-4">
-                    <polygon class="cls-1" points="274.58 82.42 323.27 82.59 274.58 82.59 274.58 82.42"/>
-                    <polygon class="cls-1"
-                             points="274.58 82.2 326.17 82.38 326.17 82.59 323.27 82.59 274.58 82.42 274.58 82.2"/>
-                    <polygon class="cls-1" points="274.58 81.99 326.17 82.17 326.17 82.38 274.58 82.2 274.58 81.99"/>
-                    <polygon class="cls-1" points="274.58 81.77 326.17 81.95 326.17 82.17 274.58 81.99 274.58 81.77"/>
-                    <polygon class="cls-1" points="274.58 81.55 326.17 81.73 326.17 81.95 274.58 81.77 274.58 81.55"/>
-                    <polygon class="cls-1" points="274.58 81.34 326.17 81.52 326.17 81.73 274.58 81.55 274.58 81.34"/>
-                    <polygon class="cls-1" points="274.58 81.12 326.17 81.3 326.17 81.52 274.58 81.34 274.58 81.12"/>
-                    <polygon class="cls-1" points="274.58 80.9 326.17 81.08 326.17 81.3 274.58 81.12 274.58 80.9"/>
-                    <polygon class="cls-1" points="274.58 80.69 326.17 80.87 326.17 81.08 274.58 80.9 274.58 80.69"/>
-                    <polygon class="cls-1" points="274.58 80.47 326.17 80.65 326.17 80.87 274.58 80.69 274.58 80.47"/>
-                    <polygon class="cls-1" points="274.58 80.25 326.17 80.44 326.17 80.65 274.58 80.47 274.58 80.25"/>
-                    <polygon class="cls-1" points="274.58 80.04 326.17 80.22 326.17 80.44 274.58 80.25 274.58 80.04"/>
-                    <polygon class="cls-1" points="274.58 79.82 326.17 80 326.17 80.22 274.58 80.04 274.58 79.82"/>
-                    <polygon class="cls-1" points="274.58 79.61 326.17 79.79 326.17 80 274.58 79.82 274.58 79.61"/>
-                    <polygon class="cls-1" points="274.58 79.39 326.17 79.57 326.17 79.79 274.58 79.61 274.58 79.39"/>
-                    <polygon class="cls-1" points="274.58 79.17 326.17 79.35 326.17 79.57 274.58 79.39 274.58 79.17"/>
-                    <polygon class="cls-1" points="274.58 78.96 326.17 79.14 326.17 79.35 274.58 79.17 274.58 78.96"/>
-                    <polygon class="cls-1" points="274.58 78.74 326.17 78.92 326.17 79.14 274.58 78.96 274.58 78.74"/>
-                    <polygon class="cls-1" points="274.58 78.52 326.17 78.7 326.17 78.92 274.58 78.74 274.58 78.52"/>
-                    <polygon class="cls-1" points="274.58 78.31 326.17 78.49 326.17 78.7 274.58 78.52 274.58 78.31"/>
-                    <polygon class="cls-1" points="274.58 78.09 326.17 78.27 326.17 78.49 274.58 78.31 274.58 78.09"/>
-                    <polygon class="cls-1" points="274.58 77.88 326.17 78.06 326.17 78.27 274.58 78.09 274.58 77.88"/>
-                    <polygon class="cls-1" points="274.58 77.66 326.17 77.84 326.17 78.06 274.58 77.88 274.58 77.66"/>
-                    <polygon class="cls-1" points="274.58 77.44 326.17 77.62 326.17 77.84 274.58 77.66 274.58 77.44"/>
-                    <polygon class="cls-1" points="274.58 77.23 326.17 77.41 326.17 77.62 274.58 77.44 274.58 77.23"/>
-                    <polygon class="cls-1" points="274.58 77.01 326.17 77.19 326.17 77.41 274.58 77.23 274.58 77.01"/>
-                    <polygon class="cls-1" points="274.58 76.79 326.17 76.97 326.17 77.19 274.58 77.01 274.58 76.79"/>
-                    <polygon class="cls-1" points="274.58 76.58 326.17 76.76 326.17 76.97 274.58 76.79 274.58 76.58"/>
-                    <polygon class="cls-1" points="274.58 76.36 326.17 76.54 326.17 76.76 274.58 76.58 274.58 76.36"/>
-                    <polygon class="cls-1" points="274.58 76.14 326.17 76.33 326.17 76.54 274.58 76.36 274.58 76.14"/>
-                    <polygon class="cls-1" points="274.58 75.93 326.17 76.11 326.17 76.33 274.58 76.14 274.58 75.93"/>
-                    <polygon class="cls-1" points="274.58 75.71 326.17 75.89 326.17 76.11 274.58 75.93 274.58 75.71"/>
-                    <polygon class="cls-1" points="274.58 75.5 326.17 75.68 326.17 75.89 274.58 75.71 274.58 75.5"/>
-                    <polygon class="cls-1" points="274.58 75.28 326.17 75.46 326.17 75.68 274.58 75.5 274.58 75.28"/>
-                    <polygon class="cls-1" points="274.58 75.06 326.17 75.24 326.17 75.46 274.58 75.28 274.58 75.06"/>
-                    <polygon class="cls-1" points="274.58 74.85 326.17 75.03 326.17 75.24 274.58 75.06 274.58 74.85"/>
-                    <polygon class="cls-1" points="274.58 74.63 326.17 74.81 326.17 75.03 274.58 74.85 274.58 74.63"/>
-                    <polygon class="cls-1" points="274.58 74.41 326.17 74.59 326.17 74.81 274.58 74.63 274.58 74.41"/>
-                    <polygon class="cls-1" points="274.58 74.2 326.17 74.38 326.17 74.59 274.58 74.41 274.58 74.2"/>
-                    <polygon class="cls-1" points="274.58 73.98 326.17 74.16 326.17 74.38 274.58 74.2 274.58 73.98"/>
-                    <polygon class="cls-1" points="274.58 73.77 326.17 73.94 326.17 74.16 274.58 73.98 274.58 73.77"/>
-                    <polygon class="cls-1" points="274.58 73.55 326.17 73.73 326.17 73.94 274.58 73.77 274.58 73.55"/>
-                    <polygon class="cls-1" points="274.58 73.33 326.17 73.51 326.17 73.73 274.58 73.55 274.58 73.33"/>
-                    <polygon class="cls-1" points="274.58 73.12 326.17 73.3 326.17 73.51 274.58 73.33 274.58 73.12"/>
-                    <polygon class="cls-1" points="274.58 72.9 326.17 73.08 326.17 73.3 274.58 73.12 274.58 72.9"/>
-                    <polygon class="cls-1" points="274.58 72.68 326.17 72.86 326.17 73.08 274.58 72.9 274.58 72.68"/>
-                    <polygon class="cls-1" points="274.58 72.47 326.17 72.65 326.17 72.86 274.58 72.68 274.58 72.47"/>
-                    <polygon class="cls-1" points="274.58 72.25 326.17 72.43 326.17 72.65 274.58 72.47 274.58 72.25"/>
-                    <polygon class="cls-1" points="274.58 72.03 326.17 72.22 326.17 72.43 274.58 72.25 274.58 72.03"/>
-                    <polygon class="cls-1" points="274.58 71.82 326.17 72 326.17 72.22 274.58 72.03 274.58 71.82"/>
-                    <polygon class="cls-1" points="274.58 71.6 326.17 71.78 326.17 72 274.58 71.82 274.58 71.6"/>
-                    <polygon class="cls-1" points="274.58 71.39 326.17 71.57 326.17 71.78 274.58 71.6 274.58 71.39"/>
-                    <polygon class="cls-1" points="274.58 71.17 326.17 71.35 326.17 71.57 274.58 71.39 274.58 71.17"/>
-                    <polygon class="cls-1" points="274.58 70.95 326.17 71.13 326.17 71.35 274.58 71.17 274.58 70.95"/>
-                    <polygon class="cls-1" points="274.58 70.74 326.17 70.92 326.17 71.13 274.58 70.95 274.58 70.74"/>
-                    <polygon class="cls-1" points="274.58 70.52 326.17 70.7 326.17 70.92 274.58 70.74 274.58 70.52"/>
-                    <polygon class="cls-1" points="274.58 70.3 326.17 70.48 326.17 70.7 274.58 70.52 274.58 70.3"/>
-                    <polygon class="cls-1" points="274.58 70.09 326.17 70.27 326.17 70.48 274.58 70.3 274.58 70.09"/>
-                    <polygon class="cls-1" points="274.58 69.87 326.17 70.05 326.17 70.27 274.58 70.09 274.58 69.87"/>
-                    <polygon class="cls-1" points="274.58 69.66 326.17 69.83 326.17 70.05 274.58 69.87 274.58 69.66"/>
-                    <polygon class="cls-1" points="274.58 69.44 326.17 69.62 326.17 69.83 274.58 69.66 274.58 69.44"/>
-                    <polygon class="cls-1" points="274.58 69.22 326.17 69.4 326.17 69.62 274.58 69.44 274.58 69.22"/>
-                    <polygon class="cls-1" points="274.58 69.01 326.17 69.19 326.17 69.4 274.58 69.22 274.58 69.01"/>
-                    <polygon class="cls-1" points="274.58 68.79 326.17 68.97 326.17 69.19 274.58 69.01 274.58 68.79"/>
-                    <polygon class="cls-1" points="274.58 68.57 326.17 68.75 326.17 68.97 274.58 68.79 274.58 68.57"/>
-                    <polygon class="cls-1" points="274.58 68.36 326.17 68.54 326.17 68.75 274.58 68.57 274.58 68.36"/>
-                    <polygon class="cls-1" points="274.58 68.14 326.17 68.32 326.17 68.54 274.58 68.36 274.58 68.14"/>
-                    <polygon class="cls-1" points="274.58 67.92 326.17 68.1 326.17 68.32 274.58 68.14 274.58 67.92"/>
-                    <polygon class="cls-1" points="274.58 67.71 326.17 67.89 326.17 68.1 274.58 67.92 274.58 67.71"/>
-                    <polygon class="cls-1" points="274.58 67.49 326.17 67.67 326.17 67.89 274.58 67.71 274.58 67.49"/>
-                    <polygon class="cls-1" points="274.58 67.28 326.17 67.46 326.17 67.67 274.58 67.49 274.58 67.28"/>
-                    <polygon class="cls-1" points="274.58 67.06 326.17 67.24 326.17 67.46 274.58 67.28 274.58 67.06"/>
-                    <polygon class="cls-1" points="274.58 66.84 326.17 67.02 326.17 67.24 274.58 67.06 274.58 66.84"/>
-                    <polygon class="cls-1" points="274.58 66.63 326.17 66.81 326.17 67.02 274.58 66.84 274.58 66.63"/>
-                    <polygon class="cls-1" points="274.58 66.41 326.17 66.59 326.17 66.81 274.58 66.63 274.58 66.41"/>
-                    <polygon class="cls-1" points="274.58 66.19 326.17 66.37 326.17 66.59 274.58 66.41 274.58 66.19"/>
-                    <polygon class="cls-1" points="274.58 65.98 326.17 66.16 326.17 66.37 274.58 66.19 274.58 65.98"/>
-                    <polygon class="cls-1" points="274.58 65.76 326.17 65.94 326.17 66.16 274.58 65.98 274.58 65.76"/>
-                    <polygon class="cls-1" points="274.58 65.54 326.17 65.72 326.17 65.94 274.58 65.76 274.58 65.54"/>
-                    <polygon class="cls-1" points="274.58 65.33 326.17 65.51 326.17 65.72 274.58 65.54 274.58 65.33"/>
-                    <polygon class="cls-1" points="274.58 65.11 326.17 65.29 326.17 65.51 274.58 65.33 274.58 65.11"/>
-                    <polygon class="cls-1" points="274.58 64.9 326.17 65.08 326.17 65.29 274.58 65.11 274.58 64.9"/>
-                    <polygon class="cls-1" points="274.58 64.68 326.17 64.86 326.17 65.08 274.58 64.9 274.58 64.68"/>
-                    <polygon class="cls-1" points="274.58 64.46 326.17 64.64 326.17 64.86 274.58 64.68 274.58 64.46"/>
-                    <polygon class="cls-1" points="274.58 64.25 326.17 64.43 326.17 64.64 274.58 64.46 274.58 64.25"/>
-                    <polygon class="cls-1" points="274.58 64.03 326.17 64.21 326.17 64.43 274.58 64.25 274.58 64.03"/>
-                    <polygon class="cls-1" points="274.58 63.81 326.17 63.99 326.17 64.21 274.58 64.03 274.58 63.81"/>
-                    <polygon class="cls-1" points="274.58 63.6 326.17 63.78 326.17 63.99 274.58 63.81 274.58 63.6"/>
-                    <polygon class="cls-1" points="274.58 63.38 326.17 63.56 326.17 63.78 274.58 63.6 274.58 63.38"/>
-                    <polygon class="cls-1" points="274.58 63.16 326.17 63.34 326.17 63.56 274.58 63.38 274.58 63.16"/>
-                    <polygon class="cls-1" points="274.58 62.95 326.17 63.13 326.17 63.34 274.58 63.16 274.58 62.95"/>
-                    <polygon class="cls-1" points="274.58 62.73 326.17 62.91 326.17 63.13 274.58 62.95 274.58 62.73"/>
-                    <polygon class="cls-1" points="274.58 62.52 326.17 62.7 326.17 62.91 274.58 62.73 274.58 62.52"/>
-                    <polygon class="cls-1" points="274.58 62.3 326.17 62.48 326.17 62.7 274.58 62.52 274.58 62.3"/>
-                    <polygon class="cls-1" points="274.58 62.08 326.17 62.26 326.17 62.48 274.58 62.3 274.58 62.08"/>
-                    <polygon class="cls-1" points="274.58 61.87 326.17 62.05 326.17 62.26 274.58 62.08 274.58 61.87"/>
-                    <polygon class="cls-1" points="274.58 61.65 326.17 61.83 326.17 62.05 274.58 61.87 274.58 61.65"/>
-                    <polygon class="cls-1" points="274.58 61.43 326.17 61.61 326.17 61.83 274.58 61.65 274.58 61.43"/>
-                    <polygon class="cls-1" points="274.58 61.22 326.17 61.4 326.17 61.61 274.58 61.43 274.58 61.22"/>
-                    <polygon class="cls-1" points="274.58 61 326.17 61.18 326.17 61.4 274.58 61.22 274.58 61"/>
-                    <polygon class="cls-1" points="274.58 60.78 326.17 60.97 326.17 61.18 274.58 61 274.58 60.78"/>
-                    <polygon class="cls-1" points="274.58 60.57 326.17 60.75 326.17 60.97 274.58 60.78 274.58 60.57"/>
-                    <polygon class="cls-1" points="274.58 60.35 326.17 60.53 326.17 60.75 274.58 60.57 274.58 60.35"/>
-                    <polygon class="cls-1" points="274.58 59.06 326.17 59.24 326.17 60.53 274.58 60.35 274.58 59.06"/>
-                    <polygon class="cls-1" points="274.58 57.77 326.17 57.95 326.17 59.24 274.58 59.06 274.58 57.77"/>
-                    <polygon class="cls-1" points="274.58 56.48 326.17 56.66 326.17 57.95 274.58 57.77 274.58 56.48"/>
-                    <polygon class="cls-1" points="274.58 55.19 326.17 55.37 326.17 56.66 274.58 56.48 274.58 55.19"/>
-                    <polygon class="cls-1" points="274.58 53.89 326.17 54.07 326.17 55.37 274.58 55.19 274.58 53.89"/>
-                    <polygon class="cls-1" points="274.58 52.6 326.17 52.78 326.17 54.07 274.58 53.89 274.58 52.6"/>
-                    <polygon class="cls-1" points="274.58 51.31 326.17 51.49 326.17 52.78 274.58 52.6 274.58 51.31"/>
-                    <polygon class="cls-1" points="274.58 50.02 326.17 50.2 326.17 51.49 274.58 51.31 274.58 50.02"/>
-                    <polygon class="cls-1" points="274.58 49.78 326.17 49.96 326.17 50.2 274.58 50.02 274.58 49.78"/>
-                    <polygon class="cls-1" points="274.58 49.55 326.17 49.73 326.17 49.96 274.58 49.78 274.58 49.55"/>
-                    <polygon class="cls-1" points="274.58 49.32 326.17 49.5 326.17 49.73 274.58 49.55 274.58 49.32"/>
-                    <polygon class="cls-1" points="274.58 49.09 326.17 49.27 326.17 49.5 274.58 49.32 274.58 49.09"/>
-                    <polygon class="cls-1" points="274.58 48.85 326.17 49.03 326.17 49.27 274.58 49.09 274.58 48.85"/>
-                    <polygon class="cls-1" points="274.58 48.62 326.17 48.8 326.17 49.03 274.58 48.85 274.58 48.62"/>
-                    <polygon class="cls-1" points="274.58 48.39 326.17 48.57 326.17 48.8 274.58 48.62 274.58 48.39"/>
-                    <polygon class="cls-1" points="274.58 48.15 326.17 48.33 326.17 48.57 274.58 48.39 274.58 48.15"/>
-                    <polygon class="cls-1" points="274.58 47.92 326.17 48.1 326.17 48.33 274.58 48.15 274.58 47.92"/>
-                    <polygon class="cls-1" points="274.58 47.69 326.17 47.87 326.17 48.1 274.58 47.92 274.58 47.69"/>
-                    <polygon class="cls-1" points="274.58 47.45 326.17 47.63 326.17 47.87 274.58 47.69 274.58 47.45"/>
-                    <polygon class="cls-1" points="274.58 47.22 326.17 47.4 326.17 47.63 274.58 47.45 274.58 47.22"/>
-                    <polygon class="cls-1" points="274.58 46.99 326.17 47.17 326.17 47.4 274.58 47.22 274.58 46.99"/>
-                    <polygon class="cls-1" points="274.58 46.76 326.17 46.94 326.17 47.17 274.58 46.99 274.58 46.76"/>
-                    <polygon class="cls-1" points="274.58 46.52 326.17 46.7 326.17 46.94 274.58 46.76 274.58 46.52"/>
-                    <polygon class="cls-1" points="274.58 46.29 326.17 46.47 326.17 46.7 274.58 46.52 274.58 46.29"/>
-                    <polygon class="cls-1" points="274.58 46.06 326.17 46.24 326.17 46.47 274.58 46.29 274.58 46.06"/>
-                    <polygon class="cls-1" points="274.58 45.82 326.17 46 326.17 46.24 274.58 46.06 274.58 45.82"/>
-                    <polygon class="cls-1" points="274.58 45.59 326.17 45.77 326.17 46 274.58 45.82 274.58 45.59"/>
-                    <polygon class="cls-1" points="274.58 45.36 326.17 45.54 326.17 45.77 274.58 45.59 274.58 45.36"/>
-                    <polygon class="cls-1" points="274.58 45.13 326.17 45.3 326.17 45.54 274.58 45.36 274.58 45.13"/>
-                    <polygon class="cls-1" points="274.58 44.89 326.17 45.07 326.17 45.3 274.58 45.13 274.58 44.89"/>
-                    <polygon class="cls-1" points="274.58 44.66 326.17 44.84 326.17 45.07 274.58 44.89 274.58 44.66"/>
-                    <polygon class="cls-1" points="274.58 44.43 326.17 44.61 326.17 44.84 274.58 44.66 274.58 44.43"/>
-                    <polygon class="cls-1" points="274.58 44.19 326.17 44.37 326.17 44.61 274.58 44.43 274.58 44.19"/>
-                    <polygon class="cls-1" points="274.58 43.96 326.17 44.14 326.17 44.37 274.58 44.19 274.58 43.96"/>
-                    <polygon class="cls-1" points="274.58 43.73 326.17 43.91 326.17 44.14 274.58 43.96 274.58 43.73"/>
-                    <polygon class="cls-1" points="274.58 43.49 326.17 43.67 326.17 43.91 274.58 43.73 274.58 43.49"/>
-                    <polygon class="cls-1" points="274.58 43.26 326.17 43.44 326.17 43.67 274.58 43.49 274.58 43.26"/>
-                    <polygon class="cls-1" points="274.58 43.03 326.17 43.21 326.17 43.44 274.58 43.26 274.58 43.03"/>
-                    <polygon class="cls-1" points="274.58 42.8 326.17 42.98 326.17 43.21 274.58 43.03 274.58 42.8"/>
-                    <polygon class="cls-1" points="274.58 42.56 326.17 42.74 326.17 42.98 274.58 42.8 274.58 42.56"/>
-                    <polygon class="cls-1" points="274.58 42.33 326.17 42.51 326.17 42.74 274.58 42.56 274.58 42.33"/>
-                    <polygon class="cls-1" points="274.58 42.1 326.17 42.28 326.17 42.51 274.58 42.33 274.58 42.1"/>
-                    <polygon class="cls-1" points="274.58 41.86 326.17 42.04 326.17 42.28 274.58 42.1 274.58 41.86"/>
-                    <polygon class="cls-1" points="274.58 41.63 326.17 41.81 326.17 42.04 274.58 41.86 274.58 41.63"/>
-                    <polygon class="cls-1" points="274.58 41.4 326.17 41.58 326.17 41.81 274.58 41.63 274.58 41.4"/>
-                    <polygon class="cls-1" points="274.58 41.16 326.17 41.34 326.17 41.58 274.58 41.4 274.58 41.16"/>
-                    <polygon class="cls-1" points="274.58 40.93 326.17 41.11 326.17 41.34 274.58 41.16 274.58 40.93"/>
-                    <polygon class="cls-1" points="274.58 40.7 326.17 40.88 326.17 41.11 274.58 40.93 274.58 40.7"/>
-                    <polygon class="cls-1" points="274.58 40.47 326.17 40.65 326.17 40.88 274.58 40.7 274.58 40.47"/>
-                    <polygon class="cls-1" points="274.58 40.23 326.17 40.41 326.17 40.65 274.58 40.47 274.58 40.23"/>
-                    <polygon class="cls-1" points="274.58 40 326.17 40.18 326.17 40.41 274.58 40.23 274.58 40"/>
-                    <polygon class="cls-1" points="274.58 39.77 326.17 39.95 326.17 40.18 274.58 40 274.58 39.77"/>
-                    <polygon class="cls-1" points="274.58 39.53 326.17 39.71 326.17 39.95 274.58 39.77 274.58 39.53"/>
-                    <polygon class="cls-1" points="274.58 39.3 326.17 39.48 326.17 39.71 274.58 39.53 274.58 39.3"/>
-                    <polygon class="cls-1" points="274.58 39.07 326.17 39.25 326.17 39.48 274.58 39.3 274.58 39.07"/>
-                    <polygon class="cls-1" points="274.58 38.84 326.17 39.02 326.17 39.25 274.58 39.07 274.58 38.84"/>
-                    <polygon class="cls-1" points="274.58 38.6 326.17 38.78 326.17 39.02 274.58 38.84 274.58 38.6"/>
-                    <polygon class="cls-1" points="274.58 38.37 326.17 38.55 326.17 38.78 274.58 38.6 274.58 38.37"/>
-                    <polygon class="cls-1" points="274.58 38.14 326.17 38.32 326.17 38.55 274.58 38.37 274.58 38.14"/>
-                    <polygon class="cls-1" points="274.58 37.9 326.17 38.08 326.17 38.32 274.58 38.14 274.58 37.9"/>
-                    <polygon class="cls-1" points="274.58 37.67 326.17 37.85 326.17 38.08 274.58 37.9 274.58 37.67"/>
-                    <polygon class="cls-1" points="274.58 37.44 326.17 37.62 326.17 37.85 274.58 37.67 274.58 37.44"/>
-                    <polygon class="cls-1" points="274.58 37.2 326.17 37.38 326.17 37.62 274.58 37.44 274.58 37.2"/>
-                    <polygon class="cls-1" points="274.58 36.97 326.17 37.15 326.17 37.38 274.58 37.2 274.58 36.97"/>
-                    <polygon class="cls-1" points="274.58 36.74 326.17 36.92 326.17 37.15 274.58 36.97 274.58 36.74"/>
-                    <polygon class="cls-1" points="274.58 36.51 326.17 36.69 326.17 36.92 274.58 36.74 274.58 36.51"/>
-                    <polygon class="cls-1" points="274.58 36.27 326.17 36.45 326.17 36.69 274.58 36.51 274.58 36.27"/>
-                    <polygon class="cls-1" points="274.58 36.04 326.17 36.22 326.17 36.45 274.58 36.27 274.58 36.04"/>
-                    <polygon class="cls-1" points="274.58 35.81 326.17 35.99 326.17 36.22 274.58 36.04 274.58 35.81"/>
-                    <polygon class="cls-1" points="274.58 35.57 326.17 35.75 326.17 35.99 274.58 35.81 274.58 35.57"/>
-                    <polygon class="cls-1" points="274.58 35.34 326.17 35.52 326.17 35.75 274.58 35.57 274.58 35.34"/>
-                    <polygon class="cls-1" points="274.58 35.11 326.17 35.29 326.17 35.52 274.58 35.34 274.58 35.11"/>
-                    <polygon class="cls-1" points="274.58 34.88 326.17 35.05 326.17 35.29 274.58 35.11 274.58 34.88"/>
-                    <polygon class="cls-1" points="274.58 34.64 326.17 34.82 326.17 35.05 274.58 34.88 274.58 34.64"/>
-                    <polygon class="cls-1" points="274.58 34.41 326.17 34.59 326.17 34.82 274.58 34.64 274.58 34.41"/>
-                    <polygon class="cls-1" points="274.58 34.18 326.17 34.36 326.17 34.59 274.58 34.41 274.58 34.18"/>
-                    <polygon class="cls-1" points="274.58 33.94 326.17 34.12 326.17 34.36 274.58 34.18 274.58 33.94"/>
-                    <polygon class="cls-1" points="274.58 33.71 326.17 33.89 326.17 34.12 274.58 33.94 274.58 33.71"/>
-                    <polygon class="cls-1" points="274.58 33.48 326.17 33.66 326.17 33.89 274.58 33.71 274.58 33.48"/>
-                    <polygon class="cls-1" points="274.58 33.24 326.17 33.42 326.17 33.66 274.58 33.48 274.58 33.24"/>
-                    <polygon class="cls-1" points="274.58 33.01 326.17 33.19 326.17 33.42 274.58 33.24 274.58 33.01"/>
-                    <polygon class="cls-1" points="274.58 32.78 326.17 32.96 326.17 33.19 274.58 33.01 274.58 32.78"/>
-                    <polygon class="cls-1" points="274.58 32.55 326.17 32.73 326.17 32.96 274.58 32.78 274.58 32.55"/>
-                    <polygon class="cls-1" points="274.58 32.31 326.17 32.49 326.17 32.73 274.58 32.55 274.58 32.31"/>
-                    <polygon class="cls-1" points="274.58 32.08 326.17 32.26 326.17 32.49 274.58 32.31 274.58 32.08"/>
-                    <polygon class="cls-1" points="274.58 31.85 326.17 32.03 326.17 32.26 274.58 32.08 274.58 31.85"/>
-                    <polygon class="cls-1" points="274.58 31.61 326.17 31.79 326.17 32.03 274.58 31.85 274.58 31.61"/>
-                    <polygon class="cls-1" points="274.58 31.38 326.17 31.56 326.17 31.79 274.58 31.61 274.58 31.38"/>
-                    <polygon class="cls-1" points="274.58 31.15 326.17 31.33 326.17 31.56 274.58 31.38 274.58 31.15"/>
-                    <polygon class="cls-1" points="274.58 30.91 326.17 31.09 326.17 31.33 274.58 31.15 274.58 30.91"/>
-                    <polygon class="cls-1" points="274.58 30.68 326.17 30.86 326.17 31.09 274.58 30.91 274.58 30.68"/>
-                    <polygon class="cls-1" points="274.58 30.45 326.17 30.63 326.17 30.86 274.58 30.68 274.58 30.45"/>
-                    <polygon class="cls-1" points="274.58 30.22 326.17 30.4 326.17 30.63 274.58 30.45 274.58 30.22"/>
-                    <polygon class="cls-1" points="274.58 29.98 326.17 30.16 326.17 30.4 274.58 30.22 274.58 29.98"/>
-                    <polygon class="cls-1" points="274.58 29.75 326.17 29.93 326.17 30.16 274.58 29.98 274.58 29.75"/>
-                    <polygon class="cls-1" points="274.58 29.52 326.17 29.7 326.17 29.93 274.58 29.75 274.58 29.52"/>
-                    <polygon class="cls-1" points="274.58 29.28 326.17 29.46 326.17 29.7 274.58 29.52 274.58 29.28"/>
-                    <polygon class="cls-1" points="274.58 29.05 326.17 29.23 326.17 29.46 274.58 29.28 274.58 29.05"/>
-                    <polygon class="cls-1" points="274.58 28.82 326.17 29 326.17 29.23 274.58 29.05 274.58 28.82"/>
-                    <polygon class="cls-1" points="326.17 29 274.58 28.82 274.58 27.83 326.17 27.83 326.17 29"/>
-                </g>
-                <path class="cls-1"
-                      d="M281.78,21.08h-.29c-.23,0-.3,0-.35-.17L280.41,19h-3.08l-.74,1.87c0,.13-.12.17-.35.17H276c-.16,0-.19-.06-.14-.18l2.64-6.67c0-.13.11-.16.25-.16h.3c.14,0,.2,0,.25.15l2.64,6.68C282,21,281.93,21.08,281.78,21.08ZM279,15.42a2.46,2.46,0,0,1-.14-.67h-.05a3,3,0,0,1-.12.67l-1.18,3h2.67Z"/>
-                <path class="cls-1"
-                      d="M290.42,16.28a2,2,0,0,1-2.22,2.18h-2.12v2.43c0,.15-.05.19-.19.19h-.33c-.15,0-.2,0-.2-.19v-6.6c0-.14.05-.19.2-.19h2.64A2,2,0,0,1,290.42,16.28Zm-.76,0a1.4,1.4,0,0,0-1.54-1.51h-2.05v3h2.05A1.4,1.4,0,0,0,289.66,16.28Z"/>
-                <path class="cls-1"
-                      d="M298.82,21.08h-.28c-.24,0-.31,0-.36-.17L297.45,19h-3.08l-.74,1.87c-.05.13-.11.17-.35.17H293c-.15,0-.18-.06-.13-.18l2.63-6.67c.05-.13.11-.16.25-.16h.31a.21.21,0,0,1,.24.15L299,20.9C299,21,299,21.08,298.82,21.08Zm-2.75-5.66a2.46,2.46,0,0,1-.14-.67h-.05a2.7,2.7,0,0,1-.13.67l-1.18,3h2.68Z"/>
-                <path class="cls-1"
-                      d="M304.75,14a2.37,2.37,0,0,1,2.62,1.68c.05.15,0,.21-.13.26l-.31.11c-.13,0-.19,0-.24-.12a1.73,1.73,0,0,0-1.94-1.27c-1.31,0-2,.67-2,1.8v2.34c0,1.12.7,1.8,2,1.8a1.74,1.74,0,0,0,1.95-1.3c.06-.13.12-.16.25-.12l.31.11c.14.05.17.11.12.25a2.39,2.39,0,0,1-2.63,1.72c-1.74,0-2.71-.93-2.71-2.47V16.43C302,14.89,303,14,304.75,14Z"/>
-                <path class="cls-1"
-                      d="M316.25,14.29v6.6c0,.15-.05.19-.2.19h-.32c-.15,0-.2,0-.2-.19v-3h-3.74v3c0,.15-.05.19-.2.19h-.32c-.15,0-.2,0-.2-.19v-6.6c0-.14.05-.19.2-.19h.32c.15,0,.2.05.2.19v2.92h3.74V14.29c0-.14.05-.19.2-.19h.32C316.2,14.1,316.25,14.15,316.25,14.29Z"/>
-                <path class="cls-1"
-                      d="M324.72,14.29v.28c0,.15-.05.2-.2.2h-3.47v2.44h3c.14,0,.19.05.19.19v.28c0,.15,0,.2-.19.2h-3v2.53h3.6c.13,0,.18.05.18.2v.28c0,.15-.05.19-.18.19h-4.12c-.14,0-.19,0-.19-.19v-6.6c0-.14.05-.19.19-.19h4C324.67,14.1,324.72,14.15,324.72,14.29Z"/>
-                <path class="cls-1" d="M71.18,83.58h0Z"/>
-                <path class="cls-1" d="M63.24,64s0,0,0,0S63.25,64,63.24,64Z"/>
-                <path class="cls-1" d="M61.12,82.93s0,0,0,.08h0l0,0Z"/>
-                <path class="cls-1" d="M59.69,69.29s.08.12,0,0Z"/>
-                <path class="cls-1" d="M52.11,65.19a.09.09,0,0,0,0,0s0,0,0,0S52.09,65.21,52.11,65.19Z"/>
-                <path class="cls-1" d="M50.38,2.18h0Z"/>
-                <rect class="cls-1" x="47.2" y="72.88" width="0.01" height="0.01"/>
-                <path class="cls-1" d="M46.28,6.58h0a7.14,7.14,0,0,0-.56.54A7.14,7.14,0,0,1,46.28,6.58Z"/>
-                <path class="cls-1" d="M41.39,80.56a2.77,2.77,0,0,1-.1.26"/>
-                <path class="cls-1" d="M63.24,64s0,0,0,0S63.25,64,63.24,64Z"/>
-                <path class="cls-1" d="M59.69,69.29s.08.12,0,0Z"/>
-                <path class="cls-1" d="M52.11,65.19a.09.09,0,0,0,0,0s0,0,0,0S52.09,65.21,52.11,65.19Z"/>
-                <path class="cls-1" d="M50.38,2.18h0Z"/>
-                <rect class="cls-1" x="47.2" y="72.88" width="0.01" height="0.01"/>
-                <path class="cls-1" d="M46.28,6.58h0a7.14,7.14,0,0,0-.56.54A7.14,7.14,0,0,1,46.28,6.58Z"/>
-                <path class="cls-1" d="M65,78.76l-.2,0c0,.14.06.29.09.42C65,79,65,78.89,65,78.76Z"/>
-                <path class="cls-1" d="M71.18,83.58h0Z"/>
-                <path class="cls-1" d="M63.24,64s0,0,0,0S63.25,64,63.24,64Z"/>
-                <path class="cls-1" d="M61.12,82.93s0,0,0,.08h0l0,0Z"/>
-                <path class="cls-1" d="M59.69,69.29s.08.12,0,0Z"/>
-                <path class="cls-1" d="M52.11,65.19a.09.09,0,0,0,0,0s0,0,0,0S52.09,65.21,52.11,65.19Z"/>
-                <path class="cls-1" d="M50.38,2.18h0Z"/>
-                <rect class="cls-1" x="47.2" y="72.88" width="0.01" height="0.01"/>
-                <path class="cls-1" d="M46.28,6.58h0a7.14,7.14,0,0,0-.56.54A7.14,7.14,0,0,1,46.28,6.58Z"/>
-                <path class="cls-1" d="M61.12,82.93s0,0,0,.08h0l0,0Z"/>
-                <path class="cls-1"
-                      d="M47.8,58a1.32,1.32,0,0,1,.83-.09h0s0,0,0-.08c-.81-.5-1.62-1-2.54-1.59a1.65,1.65,0,0,1-.28.6l2,1.21S47.78,58,47.8,58Z"/>
-                <g class="cls-5">
-                    <polygon class="cls-1" points="48.62 58.08 48.63 58.07 48.63 58.08 48.62 58.08"/>
-                    <polygon class="cls-1" points="48.34 58.08 48.63 57.7 48.63 58.07 48.62 58.08 48.34 58.08"/>
-                    <polygon class="cls-1" points="48.05 58.08 48.63 57.32 48.63 57.7 48.34 58.08 48.05 58.08"/>
-                    <polygon class="cls-1" points="47.77 58.08 48.63 56.95 48.63 57.32 48.05 58.08 47.77 58.08"/>
-                    <polygon class="cls-1" points="47.49 58.08 48.63 56.58 48.63 56.95 47.77 58.08 47.49 58.08"/>
-                    <polygon class="cls-1"
-                             points="47.2 58.08 48.58 56.27 48.63 56.27 48.63 56.58 47.49 58.08 47.2 58.08"/>
-                    <polygon class="cls-1" points="46.92 58.08 48.3 56.27 48.58 56.27 47.2 58.08 46.92 58.08"/>
-                    <polygon class="cls-1" points="46.63 58.08 48.01 56.27 48.3 56.27 46.92 58.08 46.63 58.08"/>
-                    <polygon class="cls-1" points="46.35 58.08 47.73 56.27 48.01 56.27 46.63 58.08 46.35 58.08"/>
-                    <polygon class="cls-1" points="46.06 58.08 47.45 56.27 47.73 56.27 46.35 58.08 46.06 58.08"/>
-                    <polygon class="cls-1"
-                             points="45.8 58.05 47.16 56.27 47.45 56.27 46.06 58.08 45.8 58.08 45.8 58.05"/>
-                    <polygon class="cls-1" points="45.8 57.67 46.88 56.27 47.16 56.27 45.8 58.05 45.8 57.67"/>
-                    <polygon class="cls-1" points="45.8 57.3 46.59 56.27 46.88 56.27 45.8 57.67 45.8 57.3"/>
-                    <polygon class="cls-1" points="45.8 56.93 46.31 56.27 46.59 56.27 45.8 57.3 45.8 56.93"/>
-                    <polygon class="cls-1" points="45.8 56.56 46.02 56.27 46.31 56.27 45.8 56.93 45.8 56.56"/>
-                    <polygon class="cls-1" points="46.02 56.27 45.8 56.56 45.8 56.27 46.02 56.27"/>
-                </g>
-                <path class="cls-1"
-                      d="M.71,22.52A23.24,23.24,0,0,0,4.2,28l3.72-1a44.55,44.55,0,0,1-3.84-4.84A2.07,2.07,0,0,1,4,22a2.14,2.14,0,0,1,.13.19,40.79,40.79,0,0,0,4,4.62,65.5,65.5,0,0,0,.73-7c-3.61-1.54-5.64-.6-5.64-.6S0,20.26.71,22.52Z"/>
-                <g class="cls-6">
-                    <polygon class="cls-1" points="0 26.86 8.77 26.47 8.77 28.04 0 28.04 0 26.86"/>
-                    <polygon class="cls-1" points="0 24.72 8.77 24.33 8.77 26.47 0 26.86 0 24.72"/>
-                    <polygon class="cls-1" points="0 22.58 8.77 22.19 8.77 24.33 0 24.72 0 22.58"/>
-                    <polygon class="cls-1" points="0 22.41 8.77 22.02 8.77 22.19 0 22.58 0 22.41"/>
-                    <polygon class="cls-1" points="0 22.25 8.77 21.86 8.77 22.02 0 22.41 0 22.25"/>
-                    <polygon class="cls-1" points="0 22.08 8.77 21.69 8.77 21.86 0 22.25 0 22.08"/>
-                    <polygon class="cls-1" points="0 21.92 8.77 21.53 8.77 21.69 0 22.08 0 21.92"/>
-                    <polygon class="cls-1" points="0 21.75 8.77 21.37 8.77 21.53 0 21.92 0 21.75"/>
-                    <polygon class="cls-1" points="0 21.59 8.77 21.2 8.77 21.37 0 21.75 0 21.59"/>
-                    <polygon class="cls-1" points="0 21.43 8.77 21.04 8.77 21.2 0 21.59 0 21.43"/>
-                    <polygon class="cls-1" points="0 21.26 8.77 20.87 8.77 21.04 0 21.43 0 21.26"/>
-                    <polygon class="cls-1" points="0 21.1 8.77 20.71 8.77 20.87 0 21.26 0 21.1"/>
-                    <polygon class="cls-1" points="0 20.93 8.77 20.55 8.77 20.71 0 21.1 0 20.93"/>
-                    <polygon class="cls-1" points="0 20.77 8.77 20.38 8.77 20.55 0 20.93 0 20.77"/>
-                    <polygon class="cls-1" points="0 20.61 8.77 20.22 8.77 20.38 0 20.77 0 20.61"/>
-                    <polygon class="cls-1" points="0 20.44 8.77 20.05 8.77 20.22 0 20.61 0 20.44"/>
-                    <polygon class="cls-1" points="0 20.28 8.77 19.89 8.77 20.05 0 20.44 0 20.28"/>
-                    <polygon class="cls-1" points="0 20.11 8.77 19.73 8.77 19.89 0 20.28 0 20.11"/>
-                    <polygon class="cls-1" points="0 19.95 8.77 19.56 8.77 19.73 0 20.11 0 19.95"/>
-                    <polygon class="cls-1" points="0 19.79 8.77 19.4 8.77 19.56 0 19.95 0 19.79"/>
-                    <polygon class="cls-1" points="0 19.62 8.77 19.23 8.77 19.4 0 19.79 0 19.62"/>
-                    <polygon class="cls-1" points="0 19.46 8.77 19.07 8.77 19.23 0 19.62 0 19.46"/>
-                    <polygon class="cls-1" points="0 19.29 8.77 18.9 8.77 19.07 0 19.46 0 19.29"/>
-                    <polygon class="cls-1" points="0 19.13 8.77 18.74 8.77 18.9 0 19.29 0 19.13"/>
-                    <polygon class="cls-1" points="0 18.96 8.77 18.58 8.77 18.74 0 19.13 0 18.96"/>
-                    <polygon class="cls-1" points="0 18.8 8.77 18.41 8.77 18.58 0 18.96 0 18.8"/>
-                    <polygon class="cls-1" points="0 18.64 8.46 18.26 8.77 18.26 8.77 18.41 0 18.8 0 18.64"/>
-                    <polygon class="cls-1" points="0 18.47 4.75 18.26 8.46 18.26 0 18.64 0 18.47"/>
-                    <polygon class="cls-1" points="0 18.31 1.05 18.26 4.75 18.26 0 18.47 0 18.31"/>
-                    <polygon class="cls-1" points="1.05 18.26 0 18.31 0 18.26 1.05 18.26"/>
-                </g>
-                <path class="cls-1" d="M19,29.86v0l0,.26v.05A2.45,2.45,0,0,0,19,29.86Z"/>
-                <path class="cls-1" d="M24.48,33c0,.15,0,.3,0,.45C24.47,33.33,24.48,33.18,24.48,33Z"/>
-                <polygon class="cls-1" points="24.45 33.6 24.45 33.6 24.45 33.59 24.45 33.6"/>
-                <path class="cls-1" d="M27.21,34.85c0,.23,0,.47,0,.72h0l0-.37C27.21,35.09,27.21,35,27.21,34.85Z"/>
-                <g class="cls-7">
-                    <path class="cls-1" d="M27.21,34.85c0,.23,0,.47,0,.72h0l0-.37C27.21,35.09,27.21,35,27.21,34.85Z"/>
-                </g>
-                <path class="cls-1" d="M24.45,33.59h0a.49.49,0,0,1,0-.12c0-.15,0-.3,0-.45l0,.56Z"/>
-                <g class="cls-7">
-                    <path class="cls-1" d="M24.45,33.59h0a.49.49,0,0,1,0-.12c0-.15,0-.3,0-.45l0,.56Z"/>
-                </g>
-                <path class="cls-1"
-                      d="M15.3,34.21c-.88-.77-1.73-1.53-2.55-2.3s-1.68-1.59-2.47-2.38l-.14-.14Q9,28.21,7.92,27.05L4.2,28l.4.51c.51.65,1.07,1.34,1.67,2s1.39,1.63,2.15,2.47,1.45,1.58,2.23,2.38,1.34,1.38,2,2.08l.08.07,5-1.24C17,35.64,16.12,34.92,15.3,34.21Z"/>
-                <g class="cls-8">
-                    <polygon class="cls-1" points="17.7 37.59 17.81 37.45 17.81 37.59 17.7 37.59"/>
-                    <polygon class="cls-1" points="17.48 37.59 17.81 37.17 17.81 37.45 17.7 37.59 17.48 37.59"/>
-                    <polygon class="cls-1" points="17.26 37.59 17.81 36.89 17.81 37.17 17.48 37.59 17.26 37.59"/>
-                    <polygon class="cls-1" points="17.04 37.59 17.81 36.61 17.81 36.89 17.26 37.59 17.04 37.59"/>
-                    <polygon class="cls-1" points="16.82 37.59 17.81 36.33 17.81 36.61 17.04 37.59 16.82 37.59"/>
-                    <polygon class="cls-1" points="16.6 37.59 17.81 36.04 17.81 36.33 16.82 37.59 16.6 37.59"/>
-                    <polygon class="cls-1" points="16.38 37.59 17.81 35.76 17.81 36.04 16.6 37.59 16.38 37.59"/>
-                    <polygon class="cls-1" points="16.16 37.59 17.81 35.48 17.81 35.76 16.38 37.59 16.16 37.59"/>
-                    <polygon class="cls-1" points="15.94 37.59 17.81 35.2 17.81 35.48 16.16 37.59 15.94 37.59"/>
-                    <polygon class="cls-1" points="15.72 37.59 17.81 34.91 17.81 35.2 15.94 37.59 15.72 37.59"/>
-                    <polygon class="cls-1" points="15.5 37.59 17.81 34.63 17.81 34.91 15.72 37.59 15.5 37.59"/>
-                    <polygon class="cls-1" points="15.28 37.59 17.81 34.35 17.81 34.63 15.5 37.59 15.28 37.59"/>
-                    <polygon class="cls-1" points="15.06 37.59 17.81 34.07 17.81 34.35 15.28 37.59 15.06 37.59"/>
-                    <polygon class="cls-1" points="14.84 37.59 17.81 33.79 17.81 34.07 15.06 37.59 14.84 37.59"/>
-                    <polygon class="cls-1" points="14.62 37.59 17.81 33.5 17.81 33.79 14.84 37.59 14.62 37.59"/>
-                    <polygon class="cls-1" points="14.4 37.59 17.81 33.22 17.81 33.5 14.62 37.59 14.4 37.59"/>
-                    <polygon class="cls-1" points="14.18 37.59 17.81 32.94 17.81 33.22 14.4 37.59 14.18 37.59"/>
-                    <polygon class="cls-1" points="13.96 37.59 17.81 32.66 17.81 32.94 14.18 37.59 13.96 37.59"/>
-                    <polygon class="cls-1"
-                             points="13.74 37.59 17.75 32.45 17.81 32.5 17.81 32.66 13.96 37.59 13.74 37.59"/>
-                    <polygon class="cls-1" points="13.52 37.59 17.61 32.35 17.75 32.45 13.74 37.59 13.52 37.59"/>
-                    <polygon class="cls-1" points="13.3 37.59 17.48 32.24 17.61 32.35 13.52 37.59 13.3 37.59"/>
-                    <polygon class="cls-1" points="13.08 37.59 17.34 32.13 17.48 32.24 13.3 37.59 13.08 37.59"/>
-                    <polygon class="cls-1" points="12.86 37.59 17.2 32.03 17.34 32.13 13.08 37.59 12.86 37.59"/>
-                    <polygon class="cls-1" points="12.63 37.59 17.07 31.92 17.2 32.03 12.86 37.59 12.63 37.59"/>
-                    <polygon class="cls-1" points="12.41 37.59 16.93 31.81 17.07 31.92 12.63 37.59 12.41 37.59"/>
-                    <polygon class="cls-1" points="12.19 37.59 16.79 31.71 16.93 31.81 12.41 37.59 12.19 37.59"/>
-                    <polygon class="cls-1" points="11.97 37.59 16.66 31.6 16.79 31.71 12.19 37.59 11.97 37.59"/>
-                    <polygon class="cls-1" points="11.75 37.59 16.52 31.49 16.66 31.6 11.97 37.59 11.75 37.59"/>
-                    <polygon class="cls-1" points="11.53 37.59 16.38 31.39 16.52 31.49 11.75 37.59 11.53 37.59"/>
-                    <polygon class="cls-1" points="11.31 37.59 16.25 31.28 16.38 31.39 11.53 37.59 11.31 37.59"/>
-                    <polygon class="cls-1" points="11.09 37.59 16.11 31.17 16.25 31.28 11.31 37.59 11.09 37.59"/>
-                    <polygon class="cls-1" points="10.87 37.59 15.97 31.07 16.11 31.17 11.09 37.59 10.87 37.59"/>
-                    <polygon class="cls-1" points="10.65 37.59 15.84 30.96 15.97 31.07 10.87 37.59 10.65 37.59"/>
-                    <polygon class="cls-1" points="10.43 37.59 15.7 30.85 15.84 30.96 10.65 37.59 10.43 37.59"/>
-                    <polygon class="cls-1" points="10.21 37.59 15.56 30.74 15.7 30.85 10.43 37.59 10.21 37.59"/>
-                    <polygon class="cls-1" points="9.99 37.59 15.43 30.64 15.56 30.74 10.21 37.59 9.99 37.59"/>
-                    <polygon class="cls-1" points="9.86 37.59 9.8 37.55 15.29 30.53 15.43 30.64 9.99 37.59 9.86 37.59"/>
-                    <rect class="cls-1" x="8.02" y="33.9" width="8.91" height="0.17"
-                          transform="translate(-21.99 22.9) rotate(-52)"/>
-                    <rect class="cls-1" x="7.89" y="33.79" width="8.91" height="0.17"
-                          transform="translate(-21.95 22.75) rotate(-52)"/>
-                    <rect class="cls-1" x="7.75" y="33.69" width="8.91" height="0.17"
-                          transform="translate(-21.92 22.6) rotate(-52)"/>
-                    <rect class="cls-1" x="7.61" y="33.58" width="8.91" height="0.17"
-                          transform="translate(-21.89 22.45) rotate(-52)"/>
-                    <rect class="cls-1" x="7.48" y="33.47" width="8.91" height="0.17"
-                          transform="translate(-21.86 22.3) rotate(-52)"/>
-                    <rect class="cls-1" x="7.34" y="33.36" width="8.91" height="0.17"
-                          transform="translate(-21.83 22.15) rotate(-52)"/>
-                    <rect class="cls-1" x="7.2" y="33.26" width="8.91" height="0.17"
-                          transform="translate(-21.8 22) rotate(-52)"/>
-                    <rect class="cls-1" x="7.07" y="33.15" width="8.91" height="0.17"
-                          transform="translate(-21.76 21.85) rotate(-52)"/>
-                    <rect class="cls-1" x="6.93" y="33.04" width="8.91" height="0.17"
-                          transform="translate(-21.73 21.7) rotate(-52)"/>
-                    <rect class="cls-1" x="6.79" y="32.94" width="8.91" height="0.17"
-                          transform="translate(-21.7 21.55) rotate(-52)"/>
-                    <rect class="cls-1" x="6.66" y="32.83" width="8.91" height="0.17"
-                          transform="translate(-21.67 21.41) rotate(-52)"/>
-                    <rect class="cls-1" x="6.52" y="32.72" width="8.91" height="0.17"
-                          transform="translate(-21.64 21.26) rotate(-52)"/>
-                    <rect class="cls-1" x="6.38" y="32.62" width="8.91" height="0.17"
-                          transform="translate(-21.61 21.11) rotate(-52)"/>
-                    <rect class="cls-1" x="6.24" y="32.51" width="8.91" height="0.17"
-                          transform="translate(-21.57 20.96) rotate(-52)"/>
-                    <rect class="cls-1" x="6.11" y="32.4" width="8.91" height="0.17"
-                          transform="translate(-21.54 20.81) rotate(-52)"/>
-                    <rect class="cls-1" x="5.97" y="32.3" width="8.91" height="0.17"
-                          transform="translate(-21.51 20.66) rotate(-52)"/>
-                    <rect class="cls-1" x="5.83" y="32.19" width="8.91" height="0.17"
-                          transform="translate(-21.48 20.51) rotate(-52)"/>
-                    <rect class="cls-1" x="5.7" y="32.08" width="8.91" height="0.17"
-                          transform="translate(-21.45 20.36) rotate(-52)"/>
-                    <rect class="cls-1" x="5.56" y="31.97" width="8.91" height="0.17"
-                          transform="translate(-21.42 20.21) rotate(-52)"/>
-                    <rect class="cls-1" x="5.42" y="31.87" width="8.91" height="0.17"
-                          transform="translate(-21.38 20.06) rotate(-52)"/>
-                    <rect class="cls-1" x="5.29" y="31.76" width="8.91" height="0.17"
-                          transform="translate(-21.35 19.92) rotate(-52)"/>
-                    <rect class="cls-1" x="5.15" y="31.65" width="8.91" height="0.17"
-                          transform="translate(-21.32 19.77) rotate(-52)"/>
-                    <rect class="cls-1" x="5.01" y="31.55" width="8.91" height="0.17"
-                          transform="translate(-21.29 19.62) rotate(-52)"/>
-                    <rect class="cls-1" x="4.88" y="31.44" width="8.91" height="0.17"
-                          transform="translate(-21.26 19.47) rotate(-52)"/>
-                    <rect class="cls-1" x="4.74" y="31.33" width="8.91" height="0.17"
-                          transform="translate(-21.23 19.32) rotate(-52)"/>
-                    <rect class="cls-1" x="4.6" y="31.23" width="8.91" height="0.17"
-                          transform="translate(-21.19 19.17) rotate(-52)"/>
-                    <rect class="cls-1" x="4.46" y="31.12" width="8.91" height="0.17"
-                          transform="translate(-21.16 19.02) rotate(-52)"/>
-                    <rect class="cls-1" x="4.33" y="31.01" width="8.91" height="0.17"
-                          transform="translate(-21.13 18.87) rotate(-52)"/>
-                    <rect class="cls-1" x="4.19" y="30.9" width="8.91" height="0.17"
-                          transform="translate(-21.1 18.72) rotate(-52)"/>
-                    <rect class="cls-1" x="4.05" y="30.8" width="8.91" height="0.17"
-                          transform="translate(-21.07 18.58) rotate(-52)"/>
-                    <rect class="cls-1" x="3.92" y="30.69" width="8.91" height="0.17"
-                          transform="translate(-21.04 18.43) rotate(-52)"/>
-                    <rect class="cls-1" x="3.78" y="30.58" width="8.91" height="0.17"
-                          transform="translate(-21 18.28) rotate(-52)"/>
-                    <polygon class="cls-1"
-                             points="5.42 34.13 5.29 34.02 10.73 27.05 10.83 27.05 10.91 27.11 5.42 34.13"/>
-                    <polygon class="cls-1" points="5.29 34.02 5.15 33.91 10.52 27.05 10.73 27.05 5.29 34.02"/>
-                    <polygon class="cls-1" points="5.15 33.91 5.01 33.81 10.29 27.05 10.52 27.05 5.15 33.91"/>
-                    <polygon class="cls-1" points="5.01 33.81 4.88 33.7 10.07 27.05 10.29 27.05 5.01 33.81"/>
-                    <polygon class="cls-1" points="4.88 33.7 4.74 33.59 9.85 27.05 10.07 27.05 4.88 33.7"/>
-                    <polygon class="cls-1" points="4.74 33.59 4.6 33.48 9.63 27.05 9.85 27.05 4.74 33.59"/>
-                    <polygon class="cls-1" points="4.6 33.48 4.46 33.38 9.41 27.05 9.63 27.05 4.6 33.48"/>
-                    <polygon class="cls-1" points="4.46 33.38 4.33 33.27 9.19 27.05 9.41 27.05 4.46 33.38"/>
-                    <polygon class="cls-1" points="4.33 33.27 4.2 33.17 4.2 33.16 8.97 27.05 9.19 27.05 4.33 33.27"/>
-                    <polygon class="cls-1" points="4.2 32.87 8.75 27.05 8.97 27.05 4.2 33.16 4.2 32.87"/>
-                    <polygon class="cls-1" points="4.2 32.59 8.53 27.05 8.75 27.05 4.2 32.87 4.2 32.59"/>
-                    <polygon class="cls-1" points="4.2 32.31 8.31 27.05 8.53 27.05 4.2 32.59 4.2 32.31"/>
-                    <polygon class="cls-1" points="4.2 32.03 8.09 27.05 8.31 27.05 4.2 32.31 4.2 32.03"/>
-                    <polygon class="cls-1" points="4.2 31.75 7.87 27.05 8.09 27.05 4.2 32.03 4.2 31.75"/>
-                    <polygon class="cls-1" points="4.2 31.46 7.65 27.05 7.87 27.05 4.2 31.75 4.2 31.46"/>
-                    <polygon class="cls-1" points="7.65 27.05 4.2 31.46 4.2 27.05 7.65 27.05"/>
-                </g>
-                <path class="cls-1"
-                      d="M38.35,50.5,40.68,52l0,0,.34.22,2.12,1.32A4.78,4.78,0,0,1,45.6,52.3a3.85,3.85,0,0,0-2.81.61c.92-3.28.74-6.34-1.35-8.38a5.09,5.09,0,0,0-.6-.52,3.27,3.27,0,0,1,.42,3.34h0A9.18,9.18,0,0,0,38.62,42c-.33-.33-.7-.66-1.12-1a7.42,7.42,0,0,1,.64,7.34l-.22,1.9Z"/>
-                <g class="cls-9">
-                    <polygon class="cls-1" points="45.57 53.56 45.6 53.51 45.6 53.56 45.57 53.56"/>
-                    <polygon class="cls-1" points="45.23 53.56 45.6 53.08 45.6 53.51 45.57 53.56 45.23 53.56"/>
-                    <polygon class="cls-1" points="44.89 53.56 45.6 52.65 45.6 53.08 45.23 53.56 44.89 53.56"/>
-                    <polygon class="cls-1" points="44.56 53.56 45.6 52.22 45.6 52.65 44.89 53.56 44.56 53.56"/>
-                    <polygon class="cls-1" points="44.22 53.56 45.6 51.79 45.6 52.22 44.56 53.56 44.22 53.56"/>
-                    <polygon class="cls-1" points="43.88 53.56 45.6 51.36 45.6 51.79 44.22 53.56 43.88 53.56"/>
-                    <polygon class="cls-1" points="43.55 53.56 45.6 50.93 45.6 51.36 43.88 53.56 43.55 53.56"/>
-                    <polygon class="cls-1" points="43.21 53.56 45.6 50.5 45.6 50.93 43.55 53.56 43.21 53.56"/>
-                    <polygon class="cls-1" points="42.87 53.56 45.6 50.07 45.6 50.5 43.21 53.56 42.87 53.56"/>
-                    <polygon class="cls-1" points="42.54 53.56 45.6 49.63 45.6 50.07 42.87 53.56 42.54 53.56"/>
-                    <polygon class="cls-1" points="42.2 53.56 45.6 49.2 45.6 49.63 42.54 53.56 42.2 53.56"/>
-                    <polygon class="cls-1" points="41.86 53.56 45.6 48.77 45.6 49.2 42.2 53.56 41.86 53.56"/>
-                    <polygon class="cls-1" points="41.53 53.56 45.6 48.34 45.6 48.77 41.86 53.56 41.53 53.56"/>
-                    <polygon class="cls-1" points="41.19 53.56 45.6 47.91 45.6 48.34 41.53 53.56 41.19 53.56"/>
-                    <polygon class="cls-1" points="40.85 53.56 45.6 47.48 45.6 47.91 41.19 53.56 40.85 53.56"/>
-                    <polygon class="cls-1" points="40.52 53.56 45.6 47.05 45.6 47.48 40.85 53.56 40.52 53.56"/>
-                    <polygon class="cls-1" points="40.18 53.56 45.6 46.62 45.6 47.05 40.52 53.56 40.18 53.56"/>
-                    <polygon class="cls-1" points="39.84 53.56 45.6 46.19 45.6 46.62 40.18 53.56 39.84 53.56"/>
-                    <polygon class="cls-1" points="39.51 53.56 45.6 45.76 45.6 46.19 39.84 53.56 39.51 53.56"/>
-                    <polygon class="cls-1"
-                             points="39.29 53.56 39.22 53.51 45.6 45.33 45.6 45.76 39.51 53.56 39.29 53.56"/>
-                    <polygon class="cls-1"
-                             points="39.22 53.51 39.01 53.34 45.53 44.99 45.6 45.05 45.6 45.33 39.22 53.51"/>
-                    <rect class="cls-1" x="36.86" y="48.95" width="10.6" height="0.27"
-                          transform="translate(-22.47 52.09) rotate(-52)"/>
-                    <rect class="cls-1" x="36.66" y="48.79" width="10.6" height="0.27"
-                          transform="translate(-22.42 51.87) rotate(-52)"/>
-                    <rect class="cls-1" x="36.45" y="48.62" width="10.6" height="0.27"
-                          transform="translate(-22.38 51.64) rotate(-52)"/>
-                    <rect class="cls-1" x="36.24" y="48.46" width="10.6" height="0.27"
-                          transform="translate(-22.33 51.41) rotate(-52)"/>
-                    <rect class="cls-1" x="36.03" y="48.3" width="10.6" height="0.27"
-                          transform="translate(-22.28 51.18) rotate(-52)"/>
-                    <rect class="cls-1" x="35.82" y="48.14" width="10.6" height="0.27"
-                          transform="translate(-22.23 50.96) rotate(-52)"/>
-                    <rect class="cls-1" x="35.61" y="47.97" width="10.6" height="0.27"
-                          transform="translate(-22.18 50.73) rotate(-52)"/>
-                    <polygon class="cls-1"
-                             points="37.54 52.2 37.5 52.16 37.5 51.82 43.86 43.68 44.07 43.85 37.54 52.2"/>
-                    <polygon class="cls-1" points="37.5 51.39 43.65 43.52 43.86 43.68 37.5 51.82 37.5 51.39"/>
-                    <polygon class="cls-1" points="37.5 50.96 43.44 43.36 43.65 43.52 37.5 51.39 37.5 50.96"/>
-                    <polygon class="cls-1" points="37.5 50.53 43.23 43.19 43.44 43.36 37.5 50.96 37.5 50.53"/>
-                    <polygon class="cls-1" points="37.5 50.1 43.02 43.03 43.23 43.19 37.5 50.53 37.5 50.1"/>
-                    <polygon class="cls-1" points="37.5 49.67 42.81 42.87 43.02 43.03 37.5 50.1 37.5 49.67"/>
-                    <polygon class="cls-1" points="37.5 49.24 42.61 42.7 42.81 42.87 37.5 49.67 37.5 49.24"/>
-                    <polygon class="cls-1" points="37.5 48.81 42.4 42.54 42.61 42.7 37.5 49.24 37.5 48.81"/>
-                    <polygon class="cls-1" points="37.5 48.38 42.19 42.38 42.4 42.54 37.5 48.81 37.5 48.38"/>
-                    <polygon class="cls-1" points="37.5 47.95 41.98 42.21 42.19 42.38 37.5 48.38 37.5 47.95"/>
-                    <polygon class="cls-1" points="37.5 47.52 41.77 42.05 41.98 42.21 37.5 47.95 37.5 47.52"/>
-                    <polygon class="cls-1" points="37.5 47.09 41.56 41.89 41.77 42.05 37.5 47.52 37.5 47.09"/>
-                    <polygon class="cls-1" points="37.5 46.66 41.35 41.72 41.56 41.89 37.5 47.09 37.5 46.66"/>
-                    <polygon class="cls-1" points="37.5 46.22 41.14 41.56 41.35 41.72 37.5 46.66 37.5 46.22"/>
-                    <polygon class="cls-1" points="37.5 45.79 40.93 41.4 41.14 41.56 37.5 46.22 37.5 45.79"/>
-                    <polygon class="cls-1" points="37.5 45.36 40.73 41.23 40.93 41.4 37.5 45.79 37.5 45.36"/>
-                    <polygon class="cls-1" points="37.5 44.93 40.52 41.07 40.73 41.23 37.5 45.36 37.5 44.93"/>
-                    <polygon class="cls-1" points="37.5 44.5 40.25 40.98 40.41 40.98 40.52 41.07 37.5 44.93 37.5 44.5"/>
-                    <polygon class="cls-1" points="37.5 44.07 39.91 40.98 40.25 40.98 37.5 44.5 37.5 44.07"/>
-                    <polygon class="cls-1" points="37.5 43.64 39.57 40.98 39.91 40.98 37.5 44.07 37.5 43.64"/>
-                    <polygon class="cls-1" points="37.5 43.21 39.24 40.98 39.57 40.98 37.5 43.64 37.5 43.21"/>
-                    <polygon class="cls-1" points="37.5 42.78 38.9 40.98 39.24 40.98 37.5 43.21 37.5 42.78"/>
-                    <polygon class="cls-1" points="37.5 42.35 38.56 40.98 38.9 40.98 37.5 42.78 37.5 42.35"/>
-                    <polygon class="cls-1" points="37.5 41.92 38.23 40.98 38.56 40.98 37.5 42.35 37.5 41.92"/>
-                    <polygon class="cls-1" points="37.5 41.48 37.89 40.98 38.23 40.98 37.5 41.92 37.5 41.48"/>
-                    <polygon class="cls-1" points="37.5 41.05 37.55 40.98 37.89 40.98 37.5 41.48 37.5 41.05"/>
-                    <polygon class="cls-1" points="37.55 40.98 37.5 41.05 37.5 40.98 37.55 40.98"/>
-                </g>
-                <path class="cls-1"
-                      d="M34.4,48.68c-.94-.64-1.89-1.29-2.84-2L28.8,44.77c-.93-.66-1.85-1.33-2.77-2s-1.87-1.39-2.8-2.1l-2.72-2.12-1-.77L17.9,36.42l-.09-.07-5,1.24a1.21,1.21,0,0,0,.16.16c.74.73,1.51,1.47,2.3,2.2s1.61,1.47,2.44,2.19,1.42,1.22,2.14,1.81l.44.35c.91.74,1.79,1.42,2.65,2s1.91,1.36,2.81,1.94c.59.38,1.16.74,1.71,1.07l1.42.81c1.12.62,2.25,1.19,3.38,1.7l5.07-1.24L35,49.11Z"/>
-                <g class="cls-10">
-                    <polygon class="cls-1" points="37.11 51.87 37.29 51.64 37.29 51.87 37.11 51.87"/>
-                    <polygon class="cls-1" points="36.91 51.87 37.29 51.37 37.29 51.64 37.11 51.87 36.91 51.87"/>
-                    <polygon class="cls-1" points="36.7 51.87 37.29 51.11 37.29 51.37 36.91 51.87 36.7 51.87"/>
-                    <polygon class="cls-1" points="36.5 51.87 37.29 50.85 37.29 51.11 36.7 51.87 36.5 51.87"/>
-                    <polygon class="cls-1" points="36.29 51.87 37.29 50.59 37.29 50.85 36.5 51.87 36.29 51.87"/>
-                    <polygon class="cls-1" points="36.09 51.87 37.29 50.33 37.29 50.59 36.29 51.87 36.09 51.87"/>
-                    <polygon class="cls-1" points="35.88 51.87 37.29 50.06 37.29 50.33 36.09 51.87 35.88 51.87"/>
-                    <polygon class="cls-1" points="35.68 51.87 37.29 49.8 37.29 50.06 35.88 51.87 35.68 51.87"/>
-                    <polygon class="cls-1" points="35.47 51.87 37.29 49.54 37.29 49.8 35.68 51.87 35.47 51.87"/>
-                    <polygon class="cls-1" points="35.27 51.87 37.29 49.28 37.29 49.54 35.47 51.87 35.27 51.87"/>
-                    <polygon class="cls-1" points="35.06 51.87 37.29 49.02 37.29 49.28 35.27 51.87 35.06 51.87"/>
-                    <polygon class="cls-1" points="34.86 51.87 37.29 48.75 37.29 49.02 35.06 51.87 34.86 51.87"/>
-                    <polygon class="cls-1" points="34.66 51.87 37.29 48.49 37.29 48.75 34.86 51.87 34.66 51.87"/>
-                    <polygon class="cls-1"
-                             points="34.45 51.87 37.23 48.3 37.29 48.34 37.29 48.49 34.66 51.87 34.45 51.87"/>
-                    <polygon class="cls-1" points="34.24 51.87 37.11 48.2 37.23 48.3 34.45 51.87 34.24 51.87"/>
-                    <polygon class="cls-1" points="34.04 51.87 36.98 48.1 37.11 48.2 34.24 51.87 34.04 51.87"/>
-                    <polygon class="cls-1" points="33.84 51.87 36.85 48 36.98 48.1 34.04 51.87 33.84 51.87"/>
-                    <polygon class="cls-1" points="33.63 51.87 36.73 47.9 36.85 48 33.84 51.87 33.63 51.87"/>
-                    <polygon class="cls-1" points="33.43 51.87 36.6 47.8 36.73 47.9 33.63 51.87 33.43 51.87"/>
-                    <polygon class="cls-1" points="33.22 51.87 36.47 47.7 36.6 47.8 33.43 51.87 33.22 51.87"/>
-                    <polygon class="cls-1" points="33.02 51.87 36.34 47.61 36.47 47.7 33.22 51.87 33.02 51.87"/>
-                    <polygon class="cls-1" points="32.81 51.87 36.22 47.51 36.34 47.61 33.02 51.87 32.81 51.87"/>
-                    <polygon class="cls-1" points="32.61 51.87 36.09 47.41 36.22 47.51 32.81 51.87 32.61 51.87"/>
-                    <polygon class="cls-1" points="32.4 51.87 35.96 47.31 36.09 47.41 32.61 51.87 32.4 51.87"/>
-                    <polygon class="cls-1" points="32.2 51.87 35.84 47.21 35.96 47.31 32.4 51.87 32.2 51.87"/>
-                    <polygon class="cls-1" points="31.99 51.87 35.71 47.11 35.84 47.21 32.2 51.87 31.99 51.87"/>
-                    <polygon class="cls-1" points="31.79 51.87 35.58 47.01 35.71 47.11 31.99 51.87 31.79 51.87"/>
-                    <polygon class="cls-1" points="31.58 51.87 35.45 46.91 35.58 47.01 31.79 51.87 31.58 51.87"/>
-                    <polygon class="cls-1" points="31.38 51.87 35.33 46.81 35.45 46.91 31.58 51.87 31.38 51.87"/>
-                    <polygon class="cls-1" points="31.17 51.87 35.2 46.71 35.33 46.81 31.38 51.87 31.17 51.87"/>
-                    <polygon class="cls-1" points="30.97 51.87 35.07 46.61 35.2 46.71 31.17 51.87 30.97 51.87"/>
-                    <polygon class="cls-1" points="30.77 51.87 34.95 46.51 35.07 46.61 30.97 51.87 30.77 51.87"/>
-                    <polygon class="cls-1" points="30.56 51.87 34.82 46.41 34.95 46.51 30.77 51.87 30.56 51.87"/>
-                    <polygon class="cls-1" points="30.36 51.87 34.69 46.31 34.82 46.41 30.56 51.87 30.36 51.87"/>
-                    <polygon class="cls-1" points="30.15 51.87 34.56 46.22 34.69 46.31 30.36 51.87 30.15 51.87"/>
-                    <polygon class="cls-1" points="29.95 51.87 34.44 46.12 34.56 46.22 30.15 51.87 29.95 51.87"/>
-                    <polygon class="cls-1" points="29.74 51.87 34.31 46.02 34.44 46.12 29.95 51.87 29.74 51.87"/>
-                    <polygon class="cls-1" points="29.54 51.87 34.18 45.92 34.31 46.02 29.74 51.87 29.54 51.87"/>
-                    <polygon class="cls-1" points="29.33 51.87 34.06 45.82 34.18 45.92 29.54 51.87 29.33 51.87"/>
-                    <polygon class="cls-1" points="29.13 51.87 33.93 45.72 34.06 45.82 29.33 51.87 29.13 51.87"/>
-                    <polygon class="cls-1" points="28.92 51.87 33.8 45.62 33.93 45.72 29.13 51.87 28.92 51.87"/>
-                    <polygon class="cls-1" points="28.72 51.87 33.67 45.52 33.8 45.62 28.92 51.87 28.72 51.87"/>
-                    <polygon class="cls-1" points="28.51 51.87 33.55 45.42 33.67 45.52 28.72 51.87 28.51 51.87"/>
-                    <polygon class="cls-1" points="28.31 51.87 33.42 45.32 33.55 45.42 28.51 51.87 28.31 51.87"/>
-                    <polygon class="cls-1" points="28.1 51.87 33.29 45.22 33.42 45.32 28.31 51.87 28.1 51.87"/>
-                    <polygon class="cls-1" points="27.9 51.87 33.17 45.12 33.29 45.22 28.1 51.87 27.9 51.87"/>
-                    <polygon class="cls-1" points="27.69 51.87 33.04 45.02 33.17 45.12 27.9 51.87 27.69 51.87"/>
-                    <polygon class="cls-1" points="27.49 51.87 32.91 44.92 33.04 45.02 27.69 51.87 27.49 51.87"/>
-                    <polygon class="cls-1" points="27.29 51.87 32.78 44.83 32.91 44.92 27.49 51.87 27.29 51.87"/>
-                    <polygon class="cls-1" points="27.08 51.87 32.66 44.73 32.78 44.83 27.29 51.87 27.08 51.87"/>
-                    <polygon class="cls-1"
-                             points="26.99 51.87 26.92 51.81 32.53 44.63 32.66 44.73 27.08 51.87 26.99 51.87"/>
-                    <rect class="cls-1" x="25.1" y="48.09" width="9.12" height="0.16"
-                          transform="translate(-26.56 41.89) rotate(-52)"/>
-                    <rect class="cls-1" x="24.98" y="47.99" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -26.53, 41.75)"/>
-                    <rect class="cls-1" x="24.85" y="47.89" width="9.12" height="0.16"
-                          transform="translate(-26.5 41.61) rotate(-52)"/>
-                    <rect class="cls-1" x="24.72" y="47.79" width="9.12" height="0.16"
-                          transform="translate(-26.47 41.47) rotate(-52)"/>
-                    <rect class="cls-1" x="24.59" y="47.69" width="9.12" height="0.16"
-                          transform="translate(-26.44 41.33) rotate(-52)"/>
-                    <rect class="cls-1" x="24.47" y="47.59" width="9.12" height="0.16"
-                          transform="translate(-26.41 41.2) rotate(-52)"/>
-                    <rect class="cls-1" x="24.34" y="47.49" width="9.12" height="0.16"
-                          transform="translate(-26.38 41.06) rotate(-52)"/>
-                    <rect class="cls-1" x="24.21" y="47.39" width="9.12" height="0.16"
-                          transform="translate(-26.35 40.92) rotate(-52)"/>
-                    <rect class="cls-1" x="24.09" y="47.29" width="9.12" height="0.16"
-                          transform="translate(-26.32 40.78) rotate(-52)"/>
-                    <rect class="cls-1" x="23.96" y="47.19" width="9.12" height="0.16"
-                          transform="translate(-26.29 40.64) rotate(-52)"/>
-                    <rect class="cls-1" x="23.83" y="47.09" width="9.12" height="0.16"
-                          transform="translate(-26.26 40.5) rotate(-52)"/>
-                    <rect class="cls-1" x="23.7" y="47" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -26.23, 40.37)"/>
-                    <rect class="cls-1" x="23.58" y="46.9" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -26.2, 40.23)"/>
-                    <rect class="cls-1" x="23.45" y="46.8" width="9.12" height="0.16"
-                          transform="translate(-26.18 40.09) rotate(-52)"/>
-                    <rect class="cls-1" x="23.32" y="46.7" width="9.12" height="0.16"
-                          transform="translate(-26.15 39.95) rotate(-52)"/>
-                    <rect class="cls-1" x="23.2" y="46.6" width="9.12" height="0.16"
-                          transform="translate(-26.12 39.81) rotate(-52)"/>
-                    <rect class="cls-1" x="23.07" y="46.5" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -26.09, 39.67)"/>
-                    <rect class="cls-1" x="22.94" y="46.4" width="9.12" height="0.16"
-                          transform="translate(-26.06 39.54) rotate(-52)"/>
-                    <rect class="cls-1" x="22.81" y="46.3" width="9.12" height="0.16"
-                          transform="translate(-26.03 39.4) rotate(-52)"/>
-                    <rect class="cls-1" x="22.69" y="46.2" width="9.12" height="0.16"
-                          transform="translate(-26 39.26) rotate(-52)"/>
-                    <rect class="cls-1" x="22.56" y="46.1" width="9.12" height="0.16"
-                          transform="translate(-25.97 39.12) rotate(-52)"/>
-                    <rect class="cls-1" x="22.43" y="46" width="9.12" height="0.16"
-                          transform="translate(-25.94 38.98) rotate(-52)"/>
-                    <rect class="cls-1" x="22.31" y="45.9" width="9.12" height="0.16"
-                          transform="translate(-25.91 38.84) rotate(-52)"/>
-                    <rect class="cls-1" x="22.18" y="45.8" width="9.12" height="0.16"
-                          transform="translate(-25.88 38.71) rotate(-52)"/>
-                    <rect class="cls-1" x="22.05" y="45.7" width="9.12" height="0.16"
-                          transform="translate(-25.85 38.57) rotate(-52)"/>
-                    <rect class="cls-1" x="21.92" y="45.6" width="9.12" height="0.16"
-                          transform="translate(-25.82 38.43) rotate(-52)"/>
-                    <rect class="cls-1" x="21.8" y="45.51" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.79, 38.29)"/>
-                    <rect class="cls-1" x="21.67" y="45.41" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.76, 38.15)"/>
-                    <rect class="cls-1" x="21.54" y="45.31" width="9.12" height="0.16"
-                          transform="translate(-25.73 38.01) rotate(-52)"/>
-                    <rect class="cls-1" x="21.42" y="45.21" width="9.12" height="0.16"
-                          transform="translate(-25.7 37.88) rotate(-52)"/>
-                    <rect class="cls-1" x="21.29" y="45.11" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.68, 37.74)"/>
-                    <rect class="cls-1" x="21.16" y="45.01" width="9.12" height="0.16"
-                          transform="translate(-25.65 37.6) rotate(-52)"/>
-                    <rect class="cls-1" x="21.03" y="44.91" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.62, 37.46)"/>
-                    <rect class="cls-1" x="20.91" y="44.81" width="9.12" height="0.16"
-                          transform="translate(-25.59 37.32) rotate(-52)"/>
-                    <rect class="cls-1" x="20.78" y="44.71" width="9.12" height="0.16"
-                          transform="translate(-25.56 37.18) rotate(-52)"/>
-                    <rect class="cls-1" x="20.65" y="44.61" width="9.12" height="0.16"
-                          transform="translate(-25.53 37.05) rotate(-52)"/>
-                    <rect class="cls-1" x="20.53" y="44.51" width="9.12" height="0.16"
-                          transform="translate(-25.5 36.91) rotate(-52)"/>
-                    <rect class="cls-1" x="20.4" y="44.41" width="9.12" height="0.16"
-                          transform="translate(-25.47 36.77) rotate(-52)"/>
-                    <rect class="cls-1" x="20.27" y="44.31" width="9.12" height="0.16"
-                          transform="translate(-25.44 36.63) rotate(-52)"/>
-                    <rect class="cls-1" x="20.14" y="44.21" width="9.12" height="0.16"
-                          transform="translate(-25.41 36.49) rotate(-52)"/>
-                    <rect class="cls-1" x="20.02" y="44.11" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.38, 36.35)"/>
-                    <rect class="cls-1" x="19.89" y="44.02" width="9.12" height="0.16"
-                          transform="translate(-25.35 36.21) rotate(-52)"/>
-                    <rect class="cls-1" x="19.76" y="43.92" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.32, 36.08)"/>
-                    <rect class="cls-1" x="19.64" y="43.82" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.29, 35.94)"/>
-                    <rect class="cls-1" x="19.51" y="43.72" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.26, 35.8)"/>
-                    <rect class="cls-1" x="19.38" y="43.62" width="9.12" height="0.16"
-                          transform="translate(-25.23 35.66) rotate(-52)"/>
-                    <rect class="cls-1" x="19.25" y="43.52" width="9.12" height="0.16"
-                          transform="translate(-25.21 35.52) rotate(-52)"/>
-                    <rect class="cls-1" x="19.13" y="43.42" width="9.12" height="0.16"
-                          transform="translate(-25.18 35.38) rotate(-52)"/>
-                    <rect class="cls-1" x="19" y="43.32" width="9.12" height="0.16"
-                          transform="translate(-25.15 35.25) rotate(-52)"/>
-                    <rect class="cls-1" x="18.87" y="43.22" width="9.12" height="0.16"
-                          transform="translate(-25.12 35.11) rotate(-52)"/>
-                    <rect class="cls-1" x="18.75" y="43.12" width="9.12" height="0.16"
-                          transform="translate(-25.09 34.97) rotate(-52)"/>
-                    <rect class="cls-1" x="18.62" y="43.02" width="9.12" height="0.16"
-                          transform="translate(-25.06 34.83) rotate(-52)"/>
-                    <rect class="cls-1" x="18.49" y="42.92" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.03, 34.69)"/>
-                    <rect class="cls-1" x="18.37" y="42.82" width="9.12" height="0.16"
-                          transform="translate(-25 34.55) rotate(-52)"/>
-                    <rect class="cls-1" x="18.24" y="42.72" width="9.12" height="0.16"
-                          transform="translate(-24.97 34.42) rotate(-52)"/>
-                    <rect class="cls-1" x="18.11" y="42.63" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -24.94, 34.28)"/>
-                    <rect class="cls-1" x="17.98" y="42.53" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -24.91, 34.14)"/>
-                    <rect class="cls-1" x="17.86" y="42.43" width="9.12" height="0.16"
-                          transform="translate(-24.88 34) rotate(-52)"/>
-                    <rect class="cls-1" x="17.73" y="42.33" width="9.12" height="0.16"
-                          transform="translate(-24.85 33.86) rotate(-52)"/>
-                    <rect class="cls-1" x="17.6" y="42.23" width="9.12" height="0.16"
-                          transform="translate(-24.82 33.72) rotate(-52)"/>
-                    <rect class="cls-1" x="17.48" y="42.13" width="9.12" height="0.16"
-                          transform="translate(-24.79 33.59) rotate(-52)"/>
-                    <rect class="cls-1" x="17.35" y="42.03" width="9.12" height="0.16"
-                          transform="translate(-24.76 33.45) rotate(-52)"/>
-                    <rect class="cls-1" x="17.22" y="41.93" width="9.12" height="0.16"
-                          transform="translate(-24.73 33.31) rotate(-52)"/>
-                    <rect class="cls-1" x="17.09" y="41.83" width="9.12" height="0.16"
-                          transform="translate(-24.71 33.17) rotate(-52)"/>
-                    <rect class="cls-1" x="16.97" y="41.73" width="9.12" height="0.16"
-                          transform="translate(-24.68 33.03) rotate(-52)"/>
-                    <rect class="cls-1" x="16.52" y="40.98" width="9.12" height="0.96"
-                          transform="translate(-24.57 32.55) rotate(-52)"/>
-                    <rect class="cls-1" x="15.76" y="40.39" width="9.12" height="0.96"
-                          transform="translate(-24.4 31.72) rotate(-52)"/>
-                    <rect class="cls-1" x="15" y="39.8" width="9.12" height="0.96"
-                          transform="translate(-24.22 30.9) rotate(-52)"/>
-                    <polygon class="cls-1"
-                             points="16.38 43.57 15.62 42.98 20.8 36.35 21.94 36.35 21.99 36.39 16.38 43.57"/>
-                    <polygon class="cls-1" points="15.62 42.98 14.86 42.39 19.58 36.35 20.8 36.35 15.62 42.98"/>
-                    <polygon class="cls-1" points="14.86 42.39 14.1 41.8 18.35 36.35 19.58 36.35 14.86 42.39"/>
-                    <polygon class="cls-1" points="14.1 41.8 13.34 41.2 17.13 36.35 18.35 36.35 14.1 41.8"/>
-                    <polygon class="cls-1"
-                             points="13.34 41.2 12.77 40.76 12.77 40.37 15.91 36.35 17.13 36.35 13.34 41.2"/>
-                    <polygon class="cls-1" points="12.77 40.09 15.69 36.35 15.91 36.35 12.77 40.37 12.77 40.09"/>
-                    <polygon class="cls-1" points="12.77 39.8 15.47 36.35 15.69 36.35 12.77 40.09 12.77 39.8"/>
-                    <polygon class="cls-1" points="12.77 39.52 15.25 36.35 15.47 36.35 12.77 39.8 12.77 39.52"/>
-                    <polygon class="cls-1" points="12.77 39.24 15.03 36.35 15.25 36.35 12.77 39.52 12.77 39.24"/>
-                    <polygon class="cls-1" points="12.77 38.96 14.8 36.35 15.03 36.35 12.77 39.24 12.77 38.96"/>
-                    <polygon class="cls-1" points="12.77 38.68 14.59 36.35 14.8 36.35 12.77 38.96 12.77 38.68"/>
-                    <polygon class="cls-1" points="12.77 38.39 14.37 36.35 14.59 36.35 12.77 38.68 12.77 38.39"/>
-                    <polygon class="cls-1" points="12.77 38.11 14.14 36.35 14.37 36.35 12.77 38.39 12.77 38.11"/>
-                    <polygon class="cls-1" points="12.77 37.83 13.92 36.35 14.14 36.35 12.77 38.11 12.77 37.83"/>
-                    <polygon class="cls-1" points="12.77 37.55 13.7 36.35 13.92 36.35 12.77 37.83 12.77 37.55"/>
-                    <polygon class="cls-1" points="12.77 37.27 13.48 36.35 13.7 36.35 12.77 37.55 12.77 37.27"/>
-                    <polygon class="cls-1" points="12.77 36.98 13.26 36.35 13.48 36.35 12.77 37.27 12.77 36.98"/>
-                    <polygon class="cls-1" points="12.77 36.7 13.04 36.35 13.26 36.35 12.77 36.98 12.77 36.7"/>
-                    <polygon class="cls-1" points="12.77 36.42 12.82 36.35 13.04 36.35 12.77 36.7 12.77 36.42"/>
-                    <polygon class="cls-1" points="12.82 36.35 12.77 36.42 12.77 36.35 12.82 36.35"/>
-                </g>
-                <path class="cls-1"
-                      d="M32.38,51.94a35.59,35.59,0,0,0,4.19,1.59l.15,0a9.39,9.39,0,0,0-2.87,2.11,13.22,13.22,0,0,1,6.51-1.21,6,6,0,0,1-1.17,2.8,6.07,6.07,0,0,0,2.09-2.14A7.3,7.3,0,0,0,42.2,59a7.63,7.63,0,0,1,.19-4.26C46,57,45,56.36,48.1,58.16c.1.05.29,0,.4,0,.34.19,1,.77,1.4,1a1.14,1.14,0,0,0-.58-1c-.88-.5-.78-.29-8.25-5.09l-.64-.41-.18-.12c-.78-.5-1.58-1-2.39-1.56l-.56-.37h0l-5.07,1.24Z"/>
-                <g class="cls-11">
-                    <path class="cls-1"
-                          d="M53.16,59.69A10.3,10.3,0,0,1,55.88,61V59.89l-2.24-1.74-1,1.27A5.12,5.12,0,0,0,53.16,59.69Z"/>
-                    <path class="cls-1"
-                          d="M53.09,62.25a14.26,14.26,0,0,1-1.83-1L50,62.82h4.35C53.92,62.64,53.5,62.46,53.09,62.25Z"/>
-                    <path class="cls-1" d="M47.76,59.73l-2.41,3.09h.29l2.34-3A.73.73,0,0,1,47.76,59.73Z"/>
-                    <path class="cls-1" d="M47.6,59.55l-2.55,3.27h.3l2.41-3.09A.55.55,0,0,1,47.6,59.55Z"/>
-                    <path class="cls-1" d="M47.51,59.29l-2.76,3.53h.3l2.55-3.27A.62.62,0,0,1,47.51,59.29Z"/>
-                    <path class="cls-1" d="M47.59,58.81l-3.13,4h.29l2.76-3.53A.91.91,0,0,1,47.59,58.81Z"/>
-                    <path class="cls-1"
-                          d="M47.91,58.4l2.29-2.94L50,55.32l-5.86,7.5h.3l3.13-4A.92.92,0,0,1,47.91,58.4Z"/>
-                    <polygon class="cls-1" points="43.86 62.82 49.83 55.17 50.02 55.32 44.16 62.82 43.86 62.82"/>
-                    <polygon class="cls-1" points="43.57 62.82 49.65 55.03 49.83 55.17 43.86 62.82 43.57 62.82"/>
-                    <polygon class="cls-1" points="43.27 62.82 49.47 54.88 49.65 55.03 43.57 62.82 43.27 62.82"/>
-                    <polygon class="cls-1" points="42.97 62.82 49.28 54.74 49.47 54.88 43.27 62.82 42.97 62.82"/>
-                    <polygon class="cls-1" points="42.68 62.82 49.1 54.6 49.28 54.74 42.97 62.82 42.68 62.82"/>
-                    <polygon class="cls-1" points="42.38 62.82 48.91 54.45 49.1 54.6 42.68 62.82 42.38 62.82"/>
-                    <polygon class="cls-1" points="42.08 62.82 48.73 54.31 48.91 54.45 42.38 62.82 42.08 62.82"/>
-                    <polygon class="cls-1" points="41.78 62.82 48.54 54.16 48.73 54.31 42.08 62.82 41.78 62.82"/>
-                    <polygon class="cls-1" points="41.49 62.82 48.36 54.02 48.54 54.16 41.78 62.82 41.49 62.82"/>
-                    <polygon class="cls-1" points="41.19 62.82 48.18 53.88 48.36 54.02 41.49 62.82 41.19 62.82"/>
-                    <polygon class="cls-1" points="40.9 62.82 47.99 53.73 48.18 53.88 41.19 62.82 40.9 62.82"/>
-                    <polygon class="cls-1" points="40.6 62.82 47.81 53.59 47.99 53.73 40.9 62.82 40.6 62.82"/>
-                    <polygon class="cls-1" points="40.3 62.82 47.62 53.45 47.81 53.59 40.6 62.82 40.3 62.82"/>
-                    <polygon class="cls-1"
-                             points="40.05 62.82 40.02 62.79 47.44 53.3 47.62 53.45 40.3 62.82 40.05 62.82"/>
-                    <rect class="cls-1" x="37.62" y="57.86" width="12.04" height="0.23"
-                          transform="translate(-28.91 56.67) rotate(-52)"/>
-                    <rect class="cls-1" x="37.43" y="57.71" width="12.04" height="0.23"
-                          transform="translate(-28.87 56.47) rotate(-52)"/>
-                    <rect class="cls-1" x="37.25" y="57.57" width="12.04" height="0.23"
-                          transform="translate(-28.83 56.27) rotate(-52)"/>
-                    <rect class="cls-1" x="37.06" y="57.43" width="12.04" height="0.23"
-                          transform="translate(-28.79 56.07) rotate(-52)"/>
-                    <rect class="cls-1" x="36.88" y="57.28" width="12.04" height="0.23"
-                          transform="translate(-28.74 55.87) rotate(-52)"/>
-                    <rect class="cls-1" x="36.7" y="57.14" width="12.04" height="0.23"
-                          transform="translate(-28.7 55.67) rotate(-52)"/>
-                    <rect class="cls-1" x="36.51" y="56.99" width="12.04" height="0.23"
-                          transform="translate(-28.66 55.47) rotate(-52)"/>
-                    <rect class="cls-1" x="36.33" y="56.85" width="12.04" height="0.23"
-                          transform="translate(-28.61 55.27) rotate(-52)"/>
-                    <rect class="cls-1" x="36.14" y="56.71" width="12.04" height="0.23"
-                          transform="translate(-28.57 55.07) rotate(-52)"/>
-                    <rect class="cls-1" x="35.96" y="56.56" width="12.04" height="0.23"
-                          transform="translate(-28.53 54.87) rotate(-52)"/>
-                    <rect class="cls-1" x="35.77" y="56.42" width="12.04" height="0.23"
-                          transform="translate(-28.49 54.67) rotate(-52)"/>
-                    <rect class="cls-1" x="35.59" y="56.27" width="12.04" height="0.23"
-                          transform="translate(-28.44 54.47) rotate(-52)"/>
-                    <rect class="cls-1" x="35.41" y="56.13" width="12.04" height="0.23"
-                          transform="translate(-28.4 54.27) rotate(-52)"/>
-                    <rect class="cls-1" x="35.22" y="55.99" width="12.04" height="0.23"
-                          transform="translate(-28.36 54.06) rotate(-52)"/>
-                    <rect class="cls-1" x="35.04" y="55.84" width="12.04" height="0.23"
-                          transform="translate(-28.32 53.86) rotate(-52)"/>
-                    <rect class="cls-1" x="34.85" y="55.7" width="12.04" height="0.23"
-                          transform="translate(-28.27 53.66) rotate(-52)"/>
-                    <rect class="cls-1" x="34.67" y="55.55" width="12.04" height="0.23"
-                          transform="translate(-28.23 53.46) rotate(-52)"/>
-                    <rect class="cls-1" x="34.48" y="55.41" width="12.04" height="0.23"
-                          transform="translate(-28.19 53.26) rotate(-52)"/>
-                    <polygon class="cls-1" points="36.71 60.2 36.52 60.06 43.9 50.62 44 50.62 44.12 50.71 36.71 60.2"/>
-                    <polygon class="cls-1" points="36.52 60.06 36.34 59.91 43.6 50.62 43.9 50.62 36.52 60.06"/>
-                    <polygon class="cls-1" points="36.34 59.91 36.15 59.77 43.3 50.62 43.6 50.62 36.34 59.91"/>
-                    <polygon class="cls-1" points="36.15 59.77 35.97 59.63 43.01 50.62 43.3 50.62 36.15 59.77"/>
-                    <polygon class="cls-1" points="35.97 59.63 35.78 59.48 42.71 50.62 43.01 50.62 35.97 59.63"/>
-                    <polygon class="cls-1" points="35.78 59.48 35.6 59.34 42.41 50.62 42.71 50.62 35.78 59.48"/>
-                    <polygon class="cls-1" points="35.6 59.34 35.42 59.19 42.12 50.62 42.41 50.62 35.6 59.34"/>
-                    <polygon class="cls-1" points="35.42 59.19 35.23 59.05 41.82 50.62 42.12 50.62 35.42 59.19"/>
-                    <polygon class="cls-1" points="35.23 59.05 35.05 58.91 41.52 50.62 41.82 50.62 35.23 59.05"/>
-                    <polygon class="cls-1" points="35.05 58.91 34.86 58.76 41.23 50.62 41.52 50.62 35.05 58.91"/>
-                    <polygon class="cls-1" points="34.86 58.76 34.68 58.62 40.93 50.62 41.23 50.62 34.86 58.76"/>
-                    <polygon class="cls-1" points="34.68 58.62 34.49 58.47 40.63 50.62 40.93 50.62 34.68 58.62"/>
-                    <polygon class="cls-1" points="34.49 58.47 34.31 58.33 40.34 50.62 40.63 50.62 34.49 58.47"/>
-                    <polygon class="cls-1" points="34.31 58.33 34.13 58.19 40.04 50.62 40.34 50.62 34.31 58.33"/>
-                    <polygon class="cls-1" points="34.13 58.19 33.94 58.04 39.74 50.62 40.04 50.62 34.13 58.19"/>
-                    <polygon class="cls-1" points="33.94 58.04 33.76 57.9 39.45 50.62 39.74 50.62 33.94 58.04"/>
-                    <polygon class="cls-1" points="33.76 57.9 33.57 57.75 39.15 50.62 39.45 50.62 33.76 57.9"/>
-                    <polygon class="cls-1" points="33.57 57.75 33.39 57.61 38.85 50.62 39.15 50.62 33.57 57.75"/>
-                    <polygon class="cls-1" points="33.39 57.61 33.2 57.47 38.56 50.62 38.85 50.62 33.39 57.61"/>
-                    <polygon class="cls-1" points="33.2 57.47 33.02 57.32 38.26 50.62 38.56 50.62 33.2 57.47"/>
-                    <polygon class="cls-1" points="33.02 57.32 32.84 57.18 37.96 50.62 38.26 50.62 33.02 57.32"/>
-                    <polygon class="cls-1" points="32.84 57.18 32.65 57.03 37.66 50.62 37.96 50.62 32.84 57.18"/>
-                    <polygon class="cls-1" points="32.65 57.03 32.47 56.89 37.37 50.62 37.66 50.62 32.65 57.03"/>
-                    <polygon class="cls-1" points="32.47 56.89 32.28 56.75 37.07 50.62 37.37 50.62 32.47 56.89"/>
-                    <polygon class="cls-1"
-                             points="32.28 56.75 32.22 56.7 32.22 56.44 36.77 50.62 37.07 50.62 32.28 56.75"/>
-                    <polygon class="cls-1" points="32.22 56.06 36.48 50.62 36.77 50.62 32.22 56.44 32.22 56.06"/>
-                    <polygon class="cls-1" points="32.22 55.68 36.18 50.62 36.48 50.62 32.22 56.06 32.22 55.68"/>
-                    <polygon class="cls-1" points="32.22 55.3 35.88 50.62 36.18 50.62 32.22 55.68 32.22 55.3"/>
-                    <polygon class="cls-1" points="32.22 54.92 35.59 50.62 35.88 50.62 32.22 55.3 32.22 54.92"/>
-                    <polygon class="cls-1" points="32.22 54.54 35.29 50.62 35.59 50.62 32.22 54.92 32.22 54.54"/>
-                    <polygon class="cls-1" points="32.22 54.16 34.99 50.62 35.29 50.62 32.22 54.54 32.22 54.16"/>
-                    <polygon class="cls-1" points="32.22 53.78 34.7 50.62 34.99 50.62 32.22 54.16 32.22 53.78"/>
-                    <polygon class="cls-1" points="32.22 53.4 34.4 50.62 34.7 50.62 32.22 53.78 32.22 53.4"/>
-                    <polygon class="cls-1" points="32.22 53.02 34.1 50.62 34.4 50.62 32.22 53.4 32.22 53.02"/>
-                    <polygon class="cls-1" points="32.22 52.64 33.81 50.62 34.1 50.62 32.22 53.02 32.22 52.64"/>
-                    <polygon class="cls-1" points="32.22 52.26 33.51 50.62 33.81 50.62 32.22 52.64 32.22 52.26"/>
-                    <polygon class="cls-1" points="32.22 51.88 33.21 50.62 33.51 50.62 32.22 52.26 32.22 51.88"/>
-                    <polygon class="cls-1" points="32.22 51.5 32.92 50.62 33.21 50.62 32.22 51.88 32.22 51.5"/>
-                    <polygon class="cls-1" points="32.22 51.12 32.62 50.62 32.92 50.62 32.22 51.5 32.22 51.12"/>
-                    <polygon class="cls-1" points="32.22 50.74 32.32 50.62 32.62 50.62 32.22 51.12 32.22 50.74"/>
-                    <polygon class="cls-1" points="32.32 50.62 32.22 50.74 32.22 50.62 32.32 50.62"/>
-                </g>
-                <path class="cls-1"
-                      d="M18.28,36.08a3.51,3.51,0,0,0,.36.29l1.11.9,1.26,1,.66.51,2.06,1.57c.88.66,1.79,1.33,2.74,2s1.84,1.33,2.81,2l2.86,2,2.72,1.83.13.09,2.86,1.89.07,0,.22-1.9s0,.07,0,.11a13.6,13.6,0,0,0-2.34-8A18,18,0,0,0,33,37.29,28.37,28.37,0,0,0,30.1,35c-.94-.66-2-1.33-3.09-2a7,7,0,0,1,.2,1.87c0,.12,0,.24,0,.36l0,.37h0A8.26,8.26,0,0,0,24,30.29,7.68,7.68,0,0,1,24.48,33c0,.15,0,.3,0,.45a.49.49,0,0,0,0,.12h0a8.75,8.75,0,0,0-.61-2.08c-.06-.13-.12-.26-.19-.39s-.21-.37-.33-.56-.15-.22-.24-.34a7.63,7.63,0,0,0-.66-.76l-.23-.22L21.85,29c-.52-.42-1-.77-1.39-1.06l-.58-.38-.2-.13c-.2-.13-.38-.23-.54-.32a3.88,3.88,0,0,0-.58-.27h0a1.49,1.49,0,0,1,.11.28A8.89,8.89,0,0,1,19,29.82l.21-1.74L19,29.82v0a2.45,2.45,0,0,1,0,.27v-.05l-.7,6Z"/>
-                <g class="cls-12">
-                    <polygon class="cls-1" points="38.19 50.22 38.33 50.04 38.33 50.22 38.19 50.22"/>
-                    <polygon class="cls-1" points="37.99 50.22 38.33 49.78 38.33 50.04 38.19 50.22 37.99 50.22"/>
-                    <polygon class="cls-1" points="37.78 50.22 38.33 49.52 38.33 49.78 37.99 50.22 37.78 50.22"/>
-                    <polygon class="cls-1" points="37.58 50.22 38.33 49.26 38.33 49.52 37.78 50.22 37.58 50.22"/>
-                    <polygon class="cls-1" points="37.37 50.22 38.33 48.99 38.33 49.26 37.58 50.22 37.37 50.22"/>
-                    <polygon class="cls-1" points="37.17 50.22 38.33 48.73 38.33 48.99 37.37 50.22 37.17 50.22"/>
-                    <polygon class="cls-1" points="36.96 50.22 38.33 48.47 38.33 48.73 37.17 50.22 36.96 50.22"/>
-                    <polygon class="cls-1" points="36.76 50.22 38.33 48.21 38.33 48.47 36.96 50.22 36.76 50.22"/>
-                    <polygon class="cls-1" points="36.55 50.22 38.33 47.95 38.33 48.21 36.76 50.22 36.55 50.22"/>
-                    <polygon class="cls-1" points="36.35 50.22 38.33 47.68 38.33 47.95 36.55 50.22 36.35 50.22"/>
-                    <polygon class="cls-1" points="36.14 50.22 38.33 47.42 38.33 47.68 36.35 50.22 36.14 50.22"/>
-                    <polygon class="cls-1" points="35.94 50.22 38.33 47.16 38.33 47.42 36.14 50.22 35.94 50.22"/>
-                    <polygon class="cls-1" points="35.73 50.22 38.33 46.9 38.33 47.16 35.94 50.22 35.73 50.22"/>
-                    <polygon class="cls-1" points="35.53 50.22 38.33 46.63 38.33 46.9 35.73 50.22 35.53 50.22"/>
-                    <polygon class="cls-1" points="35.33 50.22 38.33 46.37 38.33 46.63 35.53 50.22 35.33 50.22"/>
-                    <polygon class="cls-1" points="35.12 50.22 38.33 46.11 38.33 46.37 35.33 50.22 35.12 50.22"/>
-                    <polygon class="cls-1" points="34.92 50.22 38.33 45.85 38.33 46.11 35.12 50.22 34.92 50.22"/>
-                    <polygon class="cls-1" points="34.71 50.22 38.33 45.59 38.33 45.85 34.92 50.22 34.71 50.22"/>
-                    <polygon class="cls-1" points="34.51 50.22 38.33 45.32 38.33 45.59 34.71 50.22 34.51 50.22"/>
-                    <polygon class="cls-1" points="34.3 50.22 38.33 45.06 38.33 45.32 34.51 50.22 34.3 50.22"/>
-                    <polygon class="cls-1" points="34.1 50.22 38.33 44.8 38.33 45.06 34.3 50.22 34.1 50.22"/>
-                    <polygon class="cls-1" points="33.89 50.22 38.33 44.54 38.33 44.8 34.1 50.22 33.89 50.22"/>
-                    <polygon class="cls-1" points="33.69 50.22 38.33 44.28 38.33 44.54 33.89 50.22 33.69 50.22"/>
-                    <polygon class="cls-1" points="33.48 50.22 38.33 44.01 38.33 44.28 33.69 50.22 33.48 50.22"/>
-                    <polygon class="cls-1"
-                             points="33.42 50.22 33.33 50.15 38.33 43.75 38.33 44.01 33.48 50.22 33.42 50.22"/>
-                    <polygon class="cls-1" points="33.33 50.15 33.2 50.05 38.33 43.49 38.33 43.75 33.33 50.15"/>
-                    <polygon class="cls-1" points="33.2 50.05 33.08 49.95 38.33 43.23 38.33 43.49 33.2 50.05"/>
-                    <polygon class="cls-1" points="33.08 49.95 32.95 49.86 38.33 42.97 38.33 43.23 33.08 49.95"/>
-                    <polygon class="cls-1" points="32.95 49.86 32.82 49.76 38.33 42.7 38.33 42.97 32.95 49.86"/>
-                    <polygon class="cls-1" points="32.82 49.76 32.7 49.66 38.33 42.44 38.33 42.7 32.82 49.76"/>
-                    <polygon class="cls-1" points="32.7 49.66 32.57 49.56 38.33 42.18 38.33 42.44 32.7 49.66"/>
-                    <polygon class="cls-1" points="32.57 49.56 32.44 49.46 38.33 41.92 38.33 42.18 32.57 49.56"/>
-                    <polygon class="cls-1" points="32.44 49.46 32.31 49.36 38.33 41.66 38.33 41.92 32.44 49.46"/>
-                    <polygon class="cls-1" points="32.31 49.36 32.19 49.26 38.33 41.39 38.33 41.66 32.31 49.36"/>
-                    <polygon class="cls-1" points="32.19 49.26 32.06 49.16 38.33 41.13 38.33 41.39 32.19 49.26"/>
-                    <polygon class="cls-1" points="32.06 49.16 31.93 49.06 38.33 40.87 38.33 41.13 32.06 49.16"/>
-                    <polygon class="cls-1" points="31.93 49.06 31.8 48.96 38.33 40.61 38.33 40.87 31.93 49.06"/>
-                    <polygon class="cls-1" points="31.8 48.96 31.68 48.86 38.33 40.34 38.33 40.61 31.8 48.96"/>
-                    <polygon class="cls-1" points="31.68 48.86 31.55 48.76 38.33 40.08 38.33 40.34 31.68 48.86"/>
-                    <polygon class="cls-1" points="31.55 48.76 31.42 48.66 38.33 39.82 38.33 40.08 31.55 48.76"/>
-                    <polygon class="cls-1" points="31.42 48.66 31.3 48.56 38.33 39.56 38.33 39.82 31.42 48.66"/>
-                    <polygon class="cls-1" points="31.3 48.56 31.17 48.47 38.33 39.3 38.33 39.56 31.3 48.56"/>
-                    <polygon class="cls-1"
-                             points="31.17 48.47 31.04 48.37 38.31 39.06 38.33 39.08 38.33 39.3 31.17 48.47"/>
-                    <rect class="cls-1" x="28.71" y="43.58" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -21.1, 44.06)"/>
-                    <rect class="cls-1" x="28.58" y="43.48" width="11.81" height="0.16"
-                          transform="translate(-21.08 43.92) rotate(-52)"/>
-                    <rect class="cls-1" x="28.46" y="43.38" width="11.81" height="0.16"
-                          transform="translate(-21.05 43.78) rotate(-52)"/>
-                    <rect class="cls-1" x="28.33" y="43.29" width="11.81" height="0.16"
-                          transform="translate(-21.02 43.64) rotate(-52)"/>
-                    <rect class="cls-1" x="28.2" y="43.19" width="11.81" height="0.16"
-                          transform="translate(-20.99 43.51) rotate(-52)"/>
-                    <rect class="cls-1" x="28.07" y="43.09" width="11.81" height="0.16"
-                          transform="translate(-20.96 43.37) rotate(-52)"/>
-                    <rect class="cls-1" x="27.95" y="42.99" width="11.81" height="0.16"
-                          transform="translate(-20.93 43.23) rotate(-52)"/>
-                    <rect class="cls-1" x="27.82" y="42.89" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -20.9, 43.09)"/>
-                    <rect class="cls-1" x="27.69" y="42.79" width="11.81" height="0.16"
-                          transform="translate(-20.87 42.95) rotate(-52)"/>
-                    <rect class="cls-1" x="27.57" y="42.69" width="11.81" height="0.16"
-                          transform="translate(-20.84 42.81) rotate(-52)"/>
-                    <rect class="cls-1" x="27.44" y="42.59" width="11.81" height="0.16"
-                          transform="translate(-20.81 42.68) rotate(-52)"/>
-                    <rect class="cls-1" x="27.31" y="42.49" width="11.81" height="0.16"
-                          transform="translate(-20.78 42.54) rotate(-52)"/>
-                    <rect class="cls-1" x="27.18" y="42.39" width="11.81" height="0.16"
-                          transform="translate(-20.75 42.4) rotate(-52)"/>
-                    <rect class="cls-1" x="27.06" y="42.29" width="11.81" height="0.16"
-                          transform="translate(-20.72 42.26) rotate(-52)"/>
-                    <rect class="cls-1" x="26.93" y="42.19" width="11.81" height="0.16"
-                          transform="translate(-20.69 42.12) rotate(-52)"/>
-                    <rect class="cls-1" x="26.8" y="42.09" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -20.66, 41.98)"/>
-                    <rect class="cls-1" x="26.68" y="41.99" width="11.81" height="0.16"
-                          transform="translate(-20.63 41.84) rotate(-52)"/>
-                    <rect class="cls-1" x="26.55" y="41.89" width="11.81" height="0.16"
-                          transform="translate(-20.6 41.71) rotate(-52)"/>
-                    <rect class="cls-1" x="26.42" y="41.8" width="11.81" height="0.16"
-                          transform="translate(-20.58 41.57) rotate(-52)"/>
-                    <rect class="cls-1" x="26.29" y="41.7" width="11.81" height="0.16"
-                          transform="translate(-20.55 41.43) rotate(-52)"/>
-                    <rect class="cls-1" x="26.17" y="41.6" width="11.81" height="0.16"
-                          transform="translate(-20.52 41.29) rotate(-52)"/>
-                    <rect class="cls-1" x="26.04" y="41.5" width="11.81" height="0.16"
-                          transform="translate(-20.49 41.15) rotate(-52)"/>
-                    <rect class="cls-1" x="25.91" y="41.4" width="11.81" height="0.16"
-                          transform="translate(-20.46 41.01) rotate(-52)"/>
-                    <rect class="cls-1" x="25.79" y="41.3" width="11.81" height="0.16"
-                          transform="translate(-20.43 40.88) rotate(-52)"/>
-                    <rect class="cls-1" x="25.66" y="41.2" width="11.81" height="0.16"
-                          transform="translate(-20.4 40.74) rotate(-52)"/>
-                    <rect class="cls-1" x="25.53" y="41.1" width="11.81" height="0.16"
-                          transform="translate(-20.37 40.6) rotate(-52)"/>
-                    <rect class="cls-1" x="25.4" y="41" width="11.81" height="0.16"
-                          transform="translate(-20.34 40.46) rotate(-52)"/>
-                    <rect class="cls-1" x="25.28" y="40.9" width="11.81" height="0.16"
-                          transform="translate(-20.31 40.32) rotate(-52)"/>
-                    <rect class="cls-1" x="25.15" y="40.8" width="11.81" height="0.16"
-                          transform="translate(-20.28 40.18) rotate(-52)"/>
-                    <rect class="cls-1" x="25.02" y="40.7" width="11.81" height="0.16"
-                          transform="translate(-20.25 40.05) rotate(-52)"/>
-                    <rect class="cls-1" x="24.9" y="40.6" width="11.81" height="0.16"
-                          transform="translate(-20.22 39.91) rotate(-52)"/>
-                    <rect class="cls-1" x="24.77" y="40.5" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -20.19, 39.77)"/>
-                    <rect class="cls-1" x="24.64" y="40.41" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -20.16, 39.63)"/>
-                    <rect class="cls-1" x="24.51" y="40.31" width="11.81" height="0.16"
-                          transform="translate(-20.13 39.49) rotate(-52)"/>
-                    <rect class="cls-1" x="24.39" y="40.21" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -20.1, 39.35)"/>
-                    <rect class="cls-1" x="24.26" y="40.11" width="11.81" height="0.16"
-                          transform="translate(-20.08 39.22) rotate(-52)"/>
-                    <rect class="cls-1" x="24.13" y="40.01" width="11.81" height="0.16"
-                          transform="translate(-20.05 39.08) rotate(-52)"/>
-                    <rect class="cls-1" x="24.01" y="39.91" width="11.81" height="0.16"
-                          transform="translate(-20.02 38.94) rotate(-52)"/>
-                    <rect class="cls-1" x="23.88" y="39.81" width="11.81" height="0.16"
-                          transform="translate(-19.99 38.8) rotate(-52)"/>
-                    <rect class="cls-1" x="23.75" y="39.71" width="11.81" height="0.16"
-                          transform="translate(-19.96 38.66) rotate(-52)"/>
-                    <rect class="cls-1" x="23.62" y="39.61" width="11.81" height="0.16"
-                          transform="translate(-19.93 38.52) rotate(-52)"/>
-                    <rect class="cls-1" x="23.5" y="39.51" width="11.81" height="0.16"
-                          transform="translate(-19.9 38.39) rotate(-52)"/>
-                    <rect class="cls-1" x="23.37" y="39.41" width="11.81" height="0.16"
-                          transform="translate(-19.87 38.25) rotate(-52)"/>
-                    <rect class="cls-1" x="23.24" y="39.31" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.84, 38.11)"/>
-                    <rect class="cls-1" x="23.12" y="39.21" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.81, 37.97)"/>
-                    <rect class="cls-1" x="22.99" y="39.11" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.78, 37.83)"/>
-                    <rect class="cls-1" x="22.86" y="39.01" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.75, 37.69)"/>
-                    <rect class="cls-1" x="22.73" y="38.92" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.72, 37.56)"/>
-                    <rect class="cls-1" x="22.61" y="38.82" width="11.81" height="0.16"
-                          transform="translate(-19.69 37.42) rotate(-52)"/>
-                    <rect class="cls-1" x="22.48" y="38.72" width="11.81" height="0.16"
-                          transform="translate(-19.66 37.28) rotate(-52)"/>
-                    <rect class="cls-1" x="22.35" y="38.62" width="11.81" height="0.16"
-                          transform="translate(-19.63 37.14) rotate(-52)"/>
-                    <rect class="cls-1" x="22.23" y="38.52" width="11.81" height="0.16"
-                          transform="translate(-19.61 37) rotate(-52)"/>
-                    <rect class="cls-1" x="22.1" y="38.42" width="11.81" height="0.16"
-                          transform="translate(-19.58 36.86) rotate(-52)"/>
-                    <rect class="cls-1" x="21.97" y="38.32" width="11.81" height="0.16"
-                          transform="translate(-19.55 36.73) rotate(-52)"/>
-                    <rect class="cls-1" x="21.84" y="38.22" width="11.81" height="0.16"
-                          transform="translate(-19.52 36.59) rotate(-52)"/>
-                    <rect class="cls-1" x="21.72" y="38.12" width="11.81" height="0.16"
-                          transform="translate(-19.49 36.45) rotate(-52)"/>
-                    <rect class="cls-1" x="21.59" y="38.02" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.46, 36.31)"/>
-                    <rect class="cls-1" x="21.46" y="37.92" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.43, 36.17)"/>
-                    <rect class="cls-1" x="21.34" y="37.82" width="11.81" height="0.16"
-                          transform="translate(-19.4 36.03) rotate(-52)"/>
-                    <rect class="cls-1" x="21.21" y="37.72" width="11.81" height="0.16"
-                          transform="translate(-19.37 35.9) rotate(-52)"/>
-                    <rect class="cls-1" x="21.08" y="37.62" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.34, 35.76)"/>
-                    <rect class="cls-1" x="20.95" y="37.52" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.31, 35.62)"/>
-                    <rect class="cls-1" x="20.83" y="37.43" width="11.81" height="0.16"
-                          transform="translate(-19.28 35.48) rotate(-52)"/>
-                    <rect class="cls-1" x="20.7" y="37.33" width="11.81" height="0.16"
-                          transform="translate(-19.25 35.34) rotate(-52)"/>
-                    <rect class="cls-1" x="20.57" y="37.23" width="11.81" height="0.16"
-                          transform="translate(-19.22 35.2) rotate(-52)"/>
-                    <rect class="cls-1" x="20.45" y="37.13" width="11.81" height="0.16"
-                          transform="translate(-19.19 35.07) rotate(-52)"/>
-                    <rect class="cls-1" x="20.32" y="37.03" width="11.81" height="0.16"
-                          transform="translate(-19.16 34.93) rotate(-52)"/>
-                    <rect class="cls-1" x="20.19" y="36.93" width="11.81" height="0.16"
-                          transform="translate(-19.13 34.79) rotate(-52)"/>
-                    <rect class="cls-1" x="20.06" y="36.83" width="11.81" height="0.16"
-                          transform="translate(-19.11 34.65) rotate(-52)"/>
-                    <rect class="cls-1" x="19.94" y="36.73" width="11.81" height="0.16"
-                          transform="translate(-19.08 34.51) rotate(-52)"/>
-                    <rect class="cls-1" x="19.81" y="36.63" width="11.81" height="0.16"
-                          transform="translate(-19.05 34.37) rotate(-52)"/>
-                    <rect class="cls-1" x="19.68" y="36.53" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.02, 34.24)"/>
-                    <rect class="cls-1" x="19.24" y="35.78" width="11.81" height="0.96"
-                          transform="translate(-18.91 33.75) rotate(-52)"/>
-                    <rect class="cls-1" x="18.48" y="35.19" width="11.81" height="0.96"
-                          transform="translate(-18.74 32.93) rotate(-52)"/>
-                    <rect class="cls-1" x="17.72" y="34.6" width="11.81" height="0.96"
-                          transform="translate(-18.56 32.1) rotate(-52)"/>
-                    <rect class="cls-1" x="16.96" y="34" width="11.81" height="0.96"
-                          transform="translate(-18.39 31.27) rotate(-52)"/>
-                    <polygon class="cls-1"
-                             points="18.85 38.84 18.22 38.35 18.22 38.09 25.36 28.95 26.12 29.54 18.85 38.84"/>
-                    <polygon class="cls-1" points="18.22 36.52 24.6 28.35 25.36 28.95 18.22 38.09 18.22 36.52"/>
-                    <polygon class="cls-1" points="18.22 34.96 23.84 27.76 24.6 28.35 18.22 36.52 18.22 34.96"/>
-                    <polygon class="cls-1" points="18.22 33.39 23.08 27.16 23.84 27.76 18.22 34.96 18.22 33.39"/>
-                    <polygon class="cls-1" points="18.22 33.11 22.95 27.06 23.08 27.16 18.22 33.39 18.22 33.11"/>
-                    <polygon class="cls-1" points="18.22 32.83 22.81 26.95 22.95 27.06 18.22 33.11 18.22 32.83"/>
-                    <polygon class="cls-1" points="18.22 32.55 22.67 26.84 22.81 26.95 18.22 32.83 18.22 32.55"/>
-                    <polygon class="cls-1"
-                             points="18.22 32.26 22.5 26.79 22.6 26.79 22.67 26.84 18.22 32.55 18.22 32.26"/>
-                    <polygon class="cls-1" points="18.22 31.98 22.27 26.79 22.5 26.79 18.22 32.26 18.22 31.98"/>
-                    <polygon class="cls-1" points="18.22 31.7 22.05 26.79 22.27 26.79 18.22 31.98 18.22 31.7"/>
-                    <polygon class="cls-1" points="18.22 31.42 21.84 26.79 22.05 26.79 18.22 31.7 18.22 31.42"/>
-                    <polygon class="cls-1" points="18.22 31.14 21.61 26.79 21.84 26.79 18.22 31.42 18.22 31.14"/>
-                    <polygon class="cls-1" points="18.22 30.85 21.39 26.79 21.61 26.79 18.22 31.14 18.22 30.85"/>
-                    <polygon class="cls-1" points="18.22 30.57 21.17 26.79 21.39 26.79 18.22 30.85 18.22 30.57"/>
-                    <polygon class="cls-1" points="18.22 30.29 20.95 26.79 21.17 26.79 18.22 30.57 18.22 30.29"/>
-                    <polygon class="cls-1" points="18.22 30.01 20.73 26.79 20.95 26.79 18.22 30.29 18.22 30.01"/>
-                    <polygon class="cls-1" points="18.22 29.73 20.51 26.79 20.73 26.79 18.22 30.01 18.22 29.73"/>
-                    <polygon class="cls-1" points="18.22 29.44 20.29 26.79 20.51 26.79 18.22 29.73 18.22 29.44"/>
-                    <polygon class="cls-1" points="18.22 29.16 20.07 26.79 20.29 26.79 18.22 29.44 18.22 29.16"/>
-                    <polygon class="cls-1" points="18.22 28.88 19.85 26.79 20.07 26.79 18.22 29.16 18.22 28.88"/>
-                    <polygon class="cls-1" points="18.22 28.6 19.63 26.79 19.85 26.79 18.22 28.88 18.22 28.6"/>
-                    <polygon class="cls-1" points="18.22 28.31 19.41 26.79 19.63 26.79 18.22 28.6 18.22 28.31"/>
-                    <polygon class="cls-1" points="18.22 28.03 19.19 26.79 19.41 26.79 18.22 28.31 18.22 28.03"/>
-                    <polygon class="cls-1" points="18.22 27.75 18.97 26.79 19.19 26.79 18.22 28.03 18.22 27.75"/>
-                    <polygon class="cls-1" points="18.22 27.47 18.75 26.79 18.97 26.79 18.22 27.75 18.22 27.47"/>
-                    <polygon class="cls-1" points="18.22 27.18 18.53 26.79 18.75 26.79 18.22 27.47 18.22 27.18"/>
-                    <polygon class="cls-1" points="18.22 26.9 18.31 26.79 18.53 26.79 18.22 27.18 18.22 26.9"/>
-                    <polygon class="cls-1" points="18.31 26.79 18.22 26.9 18.22 26.79 18.31 26.79"/>
-                </g>
-                <path class="cls-1"
-                      d="M8,26.83c.67.7,1.45,1.47,2.32,2.32l.14.13c.77.73,1.61,1.51,2.53,2.34s1.66,1.47,2.6,2.26S17.3,35.29,18.22,36l.7-6a7.26,7.26,0,0,0-1.76-3.76c-.24-.26-.49-.53-.75-.79-.79-.81-1.68-1.63-2.58-2.39a31.59,31.59,0,0,0-2.54-1.95c-.51-.35-1-.64-1.42-.87s-.75-.37-1.1-.52A65.5,65.5,0,0,1,8,26.83Z"/>
-                <g class="cls-13">
-                    <polygon class="cls-1" points="18.73 36.04 18.92 35.8 18.92 36.04 18.73 36.04"/>
-                    <polygon class="cls-1" points="18.51 36.04 18.92 35.51 18.92 35.8 18.73 36.04 18.51 36.04"/>
-                    <polygon class="cls-1" points="18.29 36.04 18.92 35.23 18.92 35.51 18.51 36.04 18.29 36.04"/>
-                    <polygon class="cls-1" points="18.07 36.04 18.92 34.95 18.92 35.23 18.29 36.04 18.07 36.04"/>
-                    <polygon class="cls-1" points="17.85 36.04 18.92 34.67 18.92 34.95 18.07 36.04 17.85 36.04"/>
-                    <polygon class="cls-1" points="17.63 36.04 18.92 34.38 18.92 34.67 17.85 36.04 17.63 36.04"/>
-                    <polygon class="cls-1" points="17.41 36.04 18.92 34.1 18.92 34.38 17.63 36.04 17.41 36.04"/>
-                    <polygon class="cls-1" points="17.19 36.04 18.92 33.82 18.92 34.1 17.41 36.04 17.19 36.04"/>
-                    <polygon class="cls-1" points="16.97 36.04 18.92 33.54 18.92 33.82 17.19 36.04 16.97 36.04"/>
-                    <polygon class="cls-1" points="16.75 36.04 18.92 33.26 18.92 33.54 16.97 36.04 16.75 36.04"/>
-                    <polygon class="cls-1" points="16.53 36.04 18.92 32.97 18.92 33.26 16.75 36.04 16.53 36.04"/>
-                    <polygon class="cls-1" points="16.31 36.04 18.92 32.69 18.92 32.97 16.53 36.04 16.31 36.04"/>
-                    <polygon class="cls-1" points="16.09 36.04 18.92 32.41 18.92 32.69 16.31 36.04 16.09 36.04"/>
-                    <polygon class="cls-1" points="15.87 36.04 18.92 32.13 18.92 32.41 16.09 36.04 15.87 36.04"/>
-                    <polygon class="cls-1" points="15.65 36.04 18.92 31.85 18.92 32.13 15.87 36.04 15.65 36.04"/>
-                    <polygon class="cls-1" points="15.43 36.04 18.92 31.56 18.92 31.85 15.65 36.04 15.43 36.04"/>
-                    <polygon class="cls-1"
-                             points="15.31 36.04 15.25 35.98 18.92 31.28 18.92 31.56 15.43 36.04 15.31 36.04"/>
-                    <polygon class="cls-1" points="15.25 35.98 15.11 35.88 18.92 31 18.92 31.28 15.25 35.98"/>
-                    <polygon class="cls-1" points="15.11 35.88 14.97 35.77 18.92 30.72 18.92 31 15.11 35.88"/>
-                    <polygon class="cls-1" points="14.97 35.77 14.84 35.66 18.92 30.43 18.92 30.72 14.97 35.77"/>
-                    <polygon class="cls-1" points="14.84 35.66 14.7 35.56 18.92 30.15 18.92 30.43 14.84 35.66"/>
-                    <polygon class="cls-1" points="14.7 35.56 14.56 35.45 18.92 29.87 18.92 30.15 14.7 35.56"/>
-                    <polygon class="cls-1" points="14.56 35.45 14.43 35.34 18.92 29.59 18.92 29.87 14.56 35.45"/>
-                    <polygon class="cls-1" points="14.43 35.34 14.29 35.24 18.92 29.31 18.92 29.59 14.43 35.34"/>
-                    <polygon class="cls-1" points="14.29 35.24 14.15 35.13 18.92 29.02 18.92 29.31 14.29 35.24"/>
-                    <polygon class="cls-1" points="14.15 35.13 14.02 35.02 18.92 28.74 18.92 29.02 14.15 35.13"/>
-                    <polygon class="cls-1" points="14.02 35.02 13.88 34.92 18.92 28.46 18.92 28.74 14.02 35.02"/>
-                    <polygon class="cls-1" points="13.88 34.92 13.74 34.81 18.92 28.18 18.92 28.46 13.88 34.92"/>
-                    <polygon class="cls-1" points="13.74 34.81 13.6 34.7 18.92 27.89 18.92 28.18 13.74 34.81"/>
-                    <polygon class="cls-1" points="13.6 34.7 13.47 34.59 18.92 27.61 18.92 27.89 13.6 34.7"/>
-                    <polygon class="cls-1" points="13.47 34.59 13.33 34.49 18.92 27.33 18.92 27.61 13.47 34.59"/>
-                    <polygon class="cls-1" points="13.33 34.49 13.19 34.38 18.92 27.05 18.92 27.33 13.33 34.49"/>
-                    <polygon class="cls-1" points="13.19 34.38 13.06 34.27 18.92 26.77 18.92 27.05 13.19 34.38"/>
-                    <polygon class="cls-1" points="13.06 34.27 12.92 34.17 18.92 26.48 18.92 26.77 13.06 34.27"/>
-                    <polygon class="cls-1" points="12.92 34.17 12.78 34.06 18.92 26.2 18.92 26.48 12.92 34.17"/>
-                    <polygon class="cls-1" points="12.78 34.06 12.65 33.95 18.92 25.92 18.92 26.2 12.78 34.06"/>
-                    <polygon class="cls-1" points="12.65 33.95 12.51 33.85 18.92 25.64 18.92 25.92 12.65 33.95"/>
-                    <polygon class="cls-1" points="12.51 33.85 12.37 33.74 18.92 25.36 18.92 25.64 12.51 33.85"/>
-                    <polygon class="cls-1" points="12.37 33.74 12.23 33.63 18.92 25.07 18.92 25.36 12.37 33.74"/>
-                    <polygon class="cls-1"
-                             points="12.23 33.63 12.1 33.52 18.92 24.79 18.92 24.79 18.92 25.07 12.23 33.63"/>
-                    <rect class="cls-1" x="9.9" y="29.02" width="11.08" height="0.17"
-                          transform="translate(-17 23.36) rotate(-52)"/>
-                    <rect class="cls-1" x="9.76" y="28.91" width="11.08" height="0.17"
-                          transform="translate(-16.97 23.21) rotate(-52)"/>
-                    <rect class="cls-1" x="9.63" y="28.8" width="11.08" height="0.17"
-                          transform="translate(-16.94 23.06) rotate(-52)"/>
-                    <rect class="cls-1" x="9.49" y="28.7" width="11.08" height="0.17"
-                          transform="translate(-16.91 22.91) rotate(-52)"/>
-                    <rect class="cls-1" x="9.35" y="28.59" width="11.08" height="0.17"
-                          transform="translate(-16.87 22.76) rotate(-52)"/>
-                    <rect class="cls-1" x="9.22" y="28.48" width="11.08" height="0.17"
-                          transform="translate(-16.84 22.61) rotate(-52)"/>
-                    <rect class="cls-1" x="9.08" y="28.38" width="11.08" height="0.17"
-                          transform="translate(-16.81 22.46) rotate(-52)"/>
-                    <rect class="cls-1" x="8.94" y="28.27" width="11.08" height="0.17"
-                          transform="translate(-16.78 22.31) rotate(-52)"/>
-                    <rect class="cls-1" x="8.81" y="28.16" width="11.08" height="0.17"
-                          transform="translate(-16.75 22.16) rotate(-52)"/>
-                    <rect class="cls-1" x="8.67" y="28.06" width="11.08" height="0.17"
-                          transform="translate(-16.72 22.01) rotate(-52)"/>
-                    <rect class="cls-1" x="8.53" y="27.95" width="11.08" height="0.17"
-                          transform="translate(-16.68 21.87) rotate(-52)"/>
-                    <rect class="cls-1" x="8.39" y="27.84" width="11.08" height="0.17"
-                          transform="translate(-16.65 21.72) rotate(-52)"/>
-                    <rect class="cls-1" x="8.26" y="27.74" width="11.08" height="0.17"
-                          transform="translate(-16.62 21.57) rotate(-52)"/>
-                    <rect class="cls-1" x="8.12" y="27.63" width="11.08" height="0.17"
-                          transform="translate(-16.59 21.42) rotate(-52)"/>
-                    <rect class="cls-1" x="7.98" y="27.52" width="11.08" height="0.17"
-                          transform="translate(-16.56 21.27) rotate(-52)"/>
-                    <rect class="cls-1" x="7.85" y="27.41" width="11.08" height="0.17"
-                          transform="translate(-16.53 21.12) rotate(-52)"/>
-                    <rect class="cls-1" x="7.71" y="27.31" width="11.08" height="0.17"
-                          transform="translate(-16.49 20.97) rotate(-52)"/>
-                    <rect class="cls-1" x="7.57" y="27.2" width="11.08" height="0.17"
-                          transform="translate(-16.46 20.82) rotate(-52)"/>
-                    <rect class="cls-1" x="7.44" y="27.09" width="11.08" height="0.17"
-                          transform="translate(-16.43 20.67) rotate(-52)"/>
-                    <rect class="cls-1" x="7.3" y="26.99" width="11.08" height="0.17"
-                          transform="translate(-16.4 20.52) rotate(-52)"/>
-                    <rect class="cls-1" x="7.16" y="26.88" width="11.08" height="0.17"
-                          transform="translate(-16.37 20.38) rotate(-52)"/>
-                    <rect class="cls-1" x="7.03" y="26.77" width="11.08" height="0.17"
-                          transform="translate(-16.34 20.23) rotate(-52)"/>
-                    <rect class="cls-1" x="6.89" y="26.67" width="11.08" height="0.17"
-                          transform="translate(-16.3 20.08) rotate(-52)"/>
-                    <rect class="cls-1" x="6.75" y="26.56" width="11.08" height="0.17"
-                          transform="translate(-16.27 19.93) rotate(-52)"/>
-                    <rect class="cls-1" x="6.61" y="26.45" width="11.08" height="0.17"
-                          transform="translate(-16.24 19.78) rotate(-52)"/>
-                    <rect class="cls-1" x="6.48" y="26.34" width="11.08" height="0.17"
-                          transform="translate(-16.21 19.63) rotate(-52)"/>
-                    <rect class="cls-1" x="6.34" y="26.24" width="11.08" height="0.17"
-                          transform="translate(-16.18 19.48) rotate(-52)"/>
-                    <rect class="cls-1" x="6.2" y="26.13" width="11.08" height="0.17"
-                          transform="translate(-16.15 19.33) rotate(-52)"/>
-                    <rect class="cls-1" x="6.07" y="26.02" width="11.08" height="0.17"
-                          transform="translate(-16.11 19.18) rotate(-52)"/>
-                    <polygon class="cls-1"
-                             points="8.13 30.42 8.04 30.36 8.04 30.25 14.81 21.58 14.95 21.69 8.13 30.42"/>
-                    <polygon class="cls-1" points="8.04 29.97 14.68 21.48 14.81 21.58 8.04 30.25 8.04 29.97"/>
-                    <polygon class="cls-1" points="8.04 29.69 14.54 21.37 14.68 21.48 8.04 29.97 8.04 29.69"/>
-                    <polygon class="cls-1" points="8.04 29.41 14.4 21.26 14.54 21.37 8.04 29.69 8.04 29.41"/>
-                    <polygon class="cls-1" points="8.04 29.13 14.27 21.16 14.4 21.26 8.04 29.41 8.04 29.13"/>
-                    <polygon class="cls-1" points="8.04 28.84 14.13 21.05 14.27 21.16 8.04 29.13 8.04 28.84"/>
-                    <polygon class="cls-1" points="8.04 28.56 13.99 20.94 14.13 21.05 8.04 28.84 8.04 28.56"/>
-                    <polygon class="cls-1" points="8.04 28.28 13.86 20.84 13.99 20.94 8.04 28.56 8.04 28.28"/>
-                    <polygon class="cls-1" points="8.04 28 13.72 20.73 13.86 20.84 8.04 28.28 8.04 28"/>
-                    <polygon class="cls-1" points="8.04 27.71 13.58 20.62 13.72 20.73 8.04 28 8.04 27.71"/>
-                    <polygon class="cls-1" points="8.04 27.43 13.45 20.51 13.58 20.62 8.04 27.71 8.04 27.43"/>
-                    <polygon class="cls-1" points="8.04 27.15 13.31 20.41 13.45 20.51 8.04 27.43 8.04 27.15"/>
-                    <polygon class="cls-1" points="12.54 19.8 13.31 20.41 8.04 27.15 8.04 19.8 12.54 19.8"/>
-                </g>
-                <path class="cls-1" d="M27.2,35.21l0,.37h0Z"/>
-                <g class="cls-7">
-                    <path class="cls-1" d="M27.2,35.21l0,.37h0Z"/>
-                </g>
-                <path class="cls-1" d="M27.2,35.21l0,.37h0Z"/>
-                <g class="cls-14">
-                    <polygon class="cls-1" points="27.17 35.5 27.2 35.47 27.2 35.58 27.17 35.58 27.17 35.5"/>
-                    <polygon class="cls-1"
-                             points="27.17 35.24 27.2 35.21 27.2 35.21 27.2 35.47 27.17 35.5 27.17 35.24"/>
-                    <polygon class="cls-1" points="27.2 35.21 27.17 35.24 27.17 35.21 27.2 35.21"/>
-                </g>
-                <path class="cls-1" d="M24.45,33.6a.49.49,0,0,1,0-.12.49.49,0,0,0,0,.12Z"/>
-                <g class="cls-7">
-                    <path class="cls-1" d="M24.45,33.6a.49.49,0,0,1,0-.12.49.49,0,0,0,0,.12Z"/>
-                </g>
-                <path class="cls-1" d="M24.45,33.6a.49.49,0,0,1,0-.12.49.49,0,0,0,0,.12Z"/>
-                <g class="cls-15">
-                    <rect class="cls-1" x="24.45" y="33.48" width="0.01" height="0.11"/>
-                </g>
-                <polygon class="cls-1"
-                         points="24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59"/>
-                <g class="cls-7">
-                    <polygon class="cls-1"
-                             points="24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59"/>
-                </g>
-                <polygon class="cls-1"
-                         points="24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59"/>
-                <g class="cls-16">
-                    <rect class="cls-1" x="24.45" y="33.59"/>
-                </g>
-                <path class="cls-1"
-                      d="M7.46,17.64l.17,0,.09-.4,1.13.26,0-.18L7.77,17.1l.09-.41-.17,0ZM8,15.34,8.8,16l-1,.24,0,.22,1.29.3,0-.17-1-.24,1-.23,0-.12-.79-.65,1,.24,0-.17-1.29-.3Z"/>
-                <path class="cls-1" d="M27.26,34.72c0,.23,0,.47,0,.72h0c0-.12,0-.24,0-.36S27.26,34.84,27.26,34.72Z"/>
-                <g class="cls-7">
-                    <path class="cls-1"
-                          d="M27.26,34.72c0,.23,0,.47,0,.72h0c0-.12,0-.24,0-.36S27.26,34.84,27.26,34.72Z"/>
-                </g>
-                <path class="cls-1" d="M27.25,35.08c0,.12,0,.24,0,.36h0C27.24,35.32,27.24,35.2,27.25,35.08Z"/>
-                <g class="cls-7">
-                    <path class="cls-1" d="M27.25,35.08c0,.12,0,.24,0,.36h0C27.24,35.32,27.24,35.2,27.25,35.08Z"/>
-                </g>
-                <path class="cls-1" d="M27.25,35.08c0,.12,0,.24,0,.36h0C27.24,35.32,27.24,35.2,27.25,35.08Z"/>
-                <g class="cls-17">
-                    <polygon class="cls-1" points="27.22 35.37 27.25 35.34 27.25 35.45 27.22 35.45 27.22 35.37"/>
-                    <polygon class="cls-1"
-                             points="27.22 35.11 27.25 35.08 27.25 35.08 27.25 35.34 27.22 35.37 27.22 35.11"/>
-                    <polygon class="cls-1" points="27.25 35.08 27.22 35.11 27.22 35.08 27.25 35.08"/>
-                </g>
-                <path class="cls-1" d="M85.72,6.06a0,0,0,0,1,0,0l-.06,0h0v0Z"/>
-                <path class="cls-1" d="M85.25,18.53l-.06,0c0-.09,0-.14,0-.14S85.23,18.47,85.25,18.53Z"/>
-                <path class="cls-1" d="M74.35,22.72l.09,0-.1.1A.13.13,0,0,1,74.35,22.72Z"/>
-                <path class="cls-1" d="M70.18,47.29h0v0Z"/>
-                <path class="cls-1" d="M85.72,6.06a0,0,0,0,1,0,0l-.06,0h0v0Z"/>
-                <path class="cls-1" d="M85.25,18.53l-.06,0c0-.09,0-.14,0-.14S85.23,18.47,85.25,18.53Z"/>
-                <path class="cls-1" d="M74.35,22.72l.09,0-.1.1A.13.13,0,0,1,74.35,22.72Z"/>
-                <path class="cls-1" d="M70.18,47.29h0v0Z"/>
-                <path class="cls-1" d="M85.72,6.06a0,0,0,0,1,0,0l-.06,0h0v0Z"/>
-                <path class="cls-1" d="M85.25,18.53l-.06,0c0-.09,0-.14,0-.14S85.23,18.47,85.25,18.53Z"/>
-                <path class="cls-1" d="M74.35,22.72l.09,0-.1.1A.13.13,0,0,1,74.35,22.72Z"/>
-                <path class="cls-1" d="M70.18,47.29h0v0Z"/>
-                <path class="cls-1"
-                      d="M66.07,26.73a1.09,1.09,0,0,1-.08-.15l-.25-.45a.58.58,0,0,0-.11-.15,4.4,4.4,0,0,0-.86-1,5.4,5.4,0,0,0-.77-.47c-1.8.11-3.27,2.14-3.41,4.74a5.66,5.66,0,0,0,1.91,4.87h.86a9.55,9.55,0,0,0,2.5-.35s-.1-.08-.14,0a6.09,6.09,0,0,0,.76-.27,5.68,5.68,0,0,0,1-3.4A21.07,21.07,0,0,0,66.07,26.73Zm-2.73,2.08a.18.18,0,1,1,0-.26A.17.17,0,0,1,63.34,28.81Zm0-.91a.92.92,0,0,1-1.29,0,.91.91,0,0,1,1.29-1.29A.92.92,0,0,1,63.31,27.9Z"/>
-                <path class="cls-1"
-                      d="M74,24.53c-.27,1.61-.34,2.7-.35,2.77s-.17,1.29-.27,3.11h0a2.34,2.34,0,0,0,1,1.46h0a.33.33,0,0,0,.1,0l.29,0A15.3,15.3,0,0,1,74,24.53Z"/>
-                <path class="cls-1"
-                      d="M76.68,22.06h0a5.8,5.8,0,0,0-2.18.61h0l-.1.1h0c-.1.37-.18.74-.24,1.1s-.08.43-.11.64a15.3,15.3,0,0,0,.83,7.33A14.87,14.87,0,0,0,77,31.51c.31-.08.62-.16,1-.27a5.92,5.92,0,0,0,1.7-4.14C79.7,24.93,78.27,22.56,76.68,22.06Zm-2.37,5.65a.2.2,0,0,1-.19-.2.2.2,0,0,1,.19-.19.2.2,0,1,1,0,.39Zm1.17-.86a.8.8,0,0,1-1.09-.35.81.81,0,0,1,.36-1.09.8.8,0,0,1,1.09.35A.81.81,0,0,1,75.48,26.85Z"/>
-                <path class="cls-1"
-                      d="M86.48,6.12a3.52,3.52,0,0,0-.09-.85c0-.06-.25,0-.5.07l-.27.12h0a5.52,5.52,0,0,0-1.28.38A10.49,10.49,0,0,1,83,6.33a2.49,2.49,0,0,1-.44.09l.5.72a1.39,1.39,0,0,1,.24-.35,2.85,2.85,0,0,1,1.1-.74,1.71,1.71,0,0,1,1.14-.11l0,.22a4.81,4.81,0,0,1-.09,1.42c-.17.71-.35,1.44-.41,1.87-.32-.59-.63-1-.7-1a11.42,11.42,0,0,0,.56,1.74c.15.43.27.86.35,1.19s.1.55.11.57.06.24.1.54a9,9,0,0,1,0,1.22,9.48,9.48,0,0,0-.1,1.82,5.29,5.29,0,0,0,.56-1.76,6.33,6.33,0,0,0,.18-1.31,6.26,6.26,0,0,0,0-.64s-.06-.27-.18-.6A9.92,9.92,0,0,0,85.38,10c-.06-.1-.11-.21-.16-.31a13.38,13.38,0,0,0,.94-1.93A4.77,4.77,0,0,0,86.48,6.12Zm-.81,0h0v0l.07,0v0Z"/>
-                <path class="cls-1"
-                      d="M78.1,42.37a5.52,5.52,0,0,1,1.61,0l.79.1.8.06c.46,0,1.07.11,1.67.19a15.35,15.35,0,0,1,1.64.3,3.54,3.54,0,0,0,.75.15s-.23-.22-.67-.4a11,11,0,0,0-1.63-.5c-.61-.15-1.22-.27-1.68-.34s-.79-.11-.81-.12l-.82,0a5.87,5.87,0,0,0-.83,0,5.75,5.75,0,0,0-.92.18,8.88,8.88,0,0,0-1.33.48,2.91,2.91,0,0,0,0-.31c0-.15-.06-.29-.1-.43l.6-.13c.54-.13,1.09-.22,1.51-.28l.72-.09s.29-.06.7-.1A10.13,10.13,0,0,1,81.58,41a16.53,16.53,0,0,0,2.22.11,7.06,7.06,0,0,0-2.19-.57A10.16,10.16,0,0,0,80,40.45c-.44,0-.74,0-.76,0l-.73.15a14,14,0,0,0-1.52.43l-.59.2a6.93,6.93,0,0,0-.26-.7h0a1.1,1.1,0,0,0-.33-.45c-.14-.07-.22,0-.22,0s.07,0,.14.13a1.23,1.23,0,0,1,.17.42c0,.22.11.48.16.77A3.61,3.61,0,0,0,75,42a4,4,0,0,0,1.17-.24c0,.12,0,.25,0,.37a2.18,2.18,0,0,1,0,.51c-.27.14-.43.26-.41.28s.14,0,.37-.06a3.1,3.1,0,0,1-.15.46h0c-.64.18-1.22.49-1.18.58s.45,0,1-.09c-.11.17-.19.26-.19.27a5.31,5.31,0,0,1-.42.55,6.92,6.92,0,0,1-1.1,1,2.7,2.7,0,0,1-1.35.44c-.4,0-.69,0-.7,0s.27.15.7.2a2.83,2.83,0,0,0,1-.07h0a2.41,2.41,0,0,0,.56-.22,7,7,0,0,0,1.28-1,6.18,6.18,0,0,0,.52-.59,4.13,4.13,0,0,0,.38-.71h.44l.38,0,.38,0,.84.17a5.18,5.18,0,0,0,1.26.27c0-.08-.5-.45-1.11-.7a8.07,8.07,0,0,0-.85-.33l-.33-.07-.13,0a4.09,4.09,0,0,0-.7,0,3.7,3.7,0,0,0,.06-.48A13.16,13.16,0,0,1,78.1,42.37Z"/>
-                <path class="cls-1"
-                      d="M75.11,43.39c.12,0,.21-.06.27-.2a.77.77,0,0,0,.05-.38.17.17,0,0,0-.05-.12s-.08,0-.12,0-.22.12-.21.14-.12-.11-.14-.08a.37.37,0,0,0,0,.38A.33.33,0,0,0,75.11,43.39Z"/>
-                <path class="cls-1"
-                      d="M74.62,41.76a.53.53,0,0,0,.21-.35.17.17,0,0,0,0-.12.13.13,0,0,0-.13,0c-.17,0-.25.09-.25.12s-.13-.11-.14-.1l-.06.08a.56.56,0,0,0-.13.24.19.19,0,0,0,.13.24A.48.48,0,0,0,74.62,41.76Z"/>
-                <path class="cls-1"
-                      d="M70.36,60c-.17,0-.32,0-.31.05s.12,0,.27.11l.24.1c.06,0,0,0,0,0s0,0-.06,0l-.11.12a.56.56,0,0,1-.24.17c-.09,0-.15,0-.16-.1s0-.16,0-.17-.07,0-.1.16a.27.27,0,0,0,0,.23.39.39,0,0,0,.26.11,1,1,0,0,0,.57-.29,3.52,3.52,0,0,0,.29-.4,3.56,3.56,0,0,0-.45-.13Z"/>
-                <path class="cls-1"
-                      d="M69.44,45.81a1.8,1.8,0,0,0,.81-.09.68.68,0,0,0,.31.18,1.77,1.77,0,0,0,.91,0,3.42,3.42,0,0,0,.69-.28h0a.47.47,0,0,0,.24.08.76.76,0,0,0,.55-.18c.2-.21.36-.4.42-.45s0,0,0,0h0a0,0,0,0,0,0-.05h-.06s-.09,0-.14,0-.27.2-.39.27a.58.58,0,0,1-.44.13.16.16,0,0,0,0-.14c0-.09-.09-.09-.09-.08a.3.3,0,0,1,0,.09s-.08.09-.18.13a3.33,3.33,0,0,1-.78.22,1.59,1.59,0,0,1-.76,0l-.07,0,.33-.2a1.49,1.49,0,0,0,.27-.23l.13-.12a2,2,0,0,0,.13-.18.45.45,0,0,0,.08-.38.4.4,0,0,0-.29-.21,1.32,1.32,0,0,0-.57,0,.56.56,0,0,0-.38.21.54.54,0,0,0-.08.25s0,.07,0,.08,0,0,.08-.06a.84.84,0,0,1,.12-.19.4.4,0,0,1,.29-.1,1.29,1.29,0,0,1,.41,0s.1,0,.11.1a.2.2,0,0,1-.06.15l-.07.06-.11.1a2.2,2.2,0,0,1-.25.17,1.69,1.69,0,0,1-1.19.29.46.46,0,0,1-.35-.31,1.46,1.46,0,0,1-.1-.57,1.5,1.5,0,0,1,.4-.95,2.5,2.5,0,0,1,.94-.59,3.41,3.41,0,0,1,.58-.19,1.19,1.19,0,0,1,.26-.05h.07l.25.05a1.53,1.53,0,0,0,.29,0l.23-.08.21-.07.11,0h0a3.26,3.26,0,0,1,.88,0,1.13,1.13,0,0,1,.38.12,1.4,1.4,0,0,1,.32.28c.18.22.25.47.11.6l-.18.15a1.07,1.07,0,0,0-.18.19.34.34,0,0,0-.07.11.42.42,0,0,0,0,.1.19.19,0,0,0,0,.08v0a.38.38,0,0,1-.07.21l-.08.08s-.09.06-.09,0,.11-.22,0-.31a.55.55,0,0,0-.38.14c-.07.06-.1.09-.09.1s0,0,.13,0l.14,0,.08,0h0s0,0,0,0c0,.2,0,.17,0,.22a.36.36,0,0,1,0,.11.83.83,0,0,0-.06.21s0,0,0,0h.12a.65.65,0,0,0,.16-.09.57.57,0,0,0,.23-.3c.1-.48.22-.52.54-.74a.69.69,0,0,0,.22-.62,1.19,1.19,0,0,0-.24-.55,1.73,1.73,0,0,0-.41-.4,1.4,1.4,0,0,0-.56-.22,3.59,3.59,0,0,0-1,0,.47.47,0,0,0-.16,0l-.11,0-.2.07-.17,0h-.12l-.12,0a.83.83,0,0,0-.29,0,3,3,0,0,0-.37,0,4.1,4.1,0,0,0-.69.2l-.36.18a2.37,2.37,0,0,0-.79.63,2,2,0,0,0-.49,1.33,1.84,1.84,0,0,0,.19.79A1,1,0,0,0,69.44,45.81Z"/>
-                <path class="cls-1"
-                      d="M69.25,67.14a1,1,0,0,0-.2,0,3.56,3.56,0,0,0-.62.34c-.28.19-.53.42-.5.45s.31-.12.62-.25a3.27,3.27,0,0,1,.41-.17l.19-.06s.07,0,.07,0,0,0,0,0,0,.14,0,.22,0,.18-.07.25-.16.14-.18.17,0,0,.09,0,.16-.05.22-.12a1.74,1.74,0,0,0,.14-.27,2.09,2.09,0,0,0,.13-.37C69.6,67.18,69.39,67.1,69.25,67.14Z"/>
-                <path class="cls-1"
-                      d="M69.93,63.14l-.33,0a1.15,1.15,0,0,0-.31,0,3.87,3.87,0,0,0-1,.41,1.55,1.55,0,0,1-.32.14c-.07,0-.12,0-.12,0s0,0,.13,0a1.25,1.25,0,0,0,.36-.09,5.22,5.22,0,0,1,1-.31h.57l0,0h0l-.09,0a4.78,4.78,0,0,0-.92.64c-.16.12-.31.24-.45.23a.8.8,0,0,1-.38-.23.78.78,0,0,1-.2-.26.12.12,0,0,1,0-.11s-.09,0-.1.12a.63.63,0,0,0,.18.34.9.9,0,0,0,.45.32.84.84,0,0,0,.6-.22,4.68,4.68,0,0,1,.91-.55l.11,0,.18-.06.3-.09a.88.88,0,0,0,.2-.1s.18-.11,0-.29A1.78,1.78,0,0,0,69.93,63.14Z"/>
-                <path class="cls-1"
-                      d="M67.31,42.55a.85.85,0,0,0-.25-.37.41.41,0,0,0-.24-.1h0a.3.3,0,0,0-.22.11.9.9,0,0,0-.18.34s.07,0,.15.07l-.16.15s0,0,0,0l0,0,.29,0,.32,0a.37.37,0,0,0,.23-.05A.2.2,0,0,0,67.31,42.55Z"/>
-                <path class="cls-1"
-                      d="M66.41,45c-.06-.06-.14-.09-.16-.06a2.06,2.06,0,0,0-.29.45A.58.58,0,0,0,66,46a.73.73,0,0,0,1.11-.38.58.58,0,0,0-.25-.49C66.63,45,66.41,45,66.41,45Z"/>
-                <path class="cls-1"
-                      d="M64.58,43.12h0l.06,0a.19.19,0,0,0,.09-.05.08.08,0,0,0,0,0,.29.29,0,0,0-.28-.48h0a.25.25,0,0,0-.18.14.33.33,0,0,0,0,.06v0s0,0,0,0C64.22,43,64.35,43.21,64.58,43.12Z"/>
-                <path class="cls-1"
-                      d="M64.8,63.18h-.32a3.24,3.24,0,0,0-.67,0,.81.81,0,0,0-.52.46c-.07.17-.08.29-.06.3a2.44,2.44,0,0,0,.94-.07,1.7,1.7,0,0,0,.62-.28l.07,0a.11.11,0,0,0,.06,0s0,0,.09-.08a.18.18,0,0,0-.06-.23C64.81,63.17,64.82,63.2,64.8,63.18Zm-.7.49c-.35.12-.73.21-.84.26.07-.09.25-.46.6-.5a3.94,3.94,0,0,1,.6,0A1.13,1.13,0,0,1,64.1,63.67Z"/>
-                <path class="cls-1"
-                      d="M63.86,66.3a2.15,2.15,0,0,0-.52-.13l-.36,0a1,1,0,0,0-.78.31,1.22,1.22,0,0,0-.36,1,2.13,2.13,0,0,1,.52-.88.73.73,0,0,1,.59-.17l.35,0a2.92,2.92,0,0,1,.45.08l0,0v0a.5.5,0,0,1-.07.08c-.1.11-.24.24-.33.32-.34.14-.68.19-.68.22a1.18,1.18,0,0,0,.77,0,3.25,3.25,0,0,0,.42-.31l.09-.1a.5.5,0,0,0,.1-.19C64.1,66.45,64,66.34,63.86,66.3Z"/>
-                <path class="cls-1"
-                      d="M60.42,68.86c-.32-.14-.6,0-.57,0s.07,0,.16,0a.86.86,0,0,1,.28.11s0,.06,0,.06-.05,0-.05,0a1.49,1.49,0,0,1-.46.07.49.49,0,0,1-.19,0c-.06,0,.05,0,.05.07l0,.07s0,0,0,0,0,0,0,0,0,0,0,0l.09,0a1.23,1.23,0,0,0,.41,0l.19,0a.58.58,0,0,0,.25-.12.26.26,0,0,0,.07-.24A.4.4,0,0,0,60.42,68.86Zm-.71.46s0,0,0,0S59.77,69.41,59.71,69.32Z"/>
-                <path class="cls-1"
-                      d="M58,62.47a.81.81,0,0,0-.31-.06,2.63,2.63,0,0,0-.77.06c-.26,0-.52.06-.73.08l-.15,0-.06,0s-.05.07,0,.08.09.06.09.06,0,0,0-.07h.18a3.58,3.58,0,0,0,.74,0,3.3,3.3,0,0,1,.72,0l.18,0h0s0,0,0,0-.35.38-.54.42a.72.72,0,0,1-.34-.05l-.33-.1a1.21,1.21,0,0,0-.33-.06s.1.09.28.18l.32.15a.91.91,0,0,0,.43.11.83.83,0,0,0,.42-.2L58,63a.59.59,0,0,0,.18-.14.24.24,0,0,0,.05-.17.2.2,0,0,0-.07-.15A.37.37,0,0,0,58,62.47Z"/>
-                <path class="cls-1"
-                      d="M68,32.6a9.45,9.45,0,0,1-.92.58c-.18.1-.39.2-.62.3s-.48.18-.76.26l-.06,0-.28.05h0a6.6,6.6,0,0,1-.84.16l-.14,0h-.21l-.5,0-.55,0a3.85,3.85,0,0,1-.48,0A15.57,15.57,0,0,1,60,33.73a25,25,0,0,1-2.47-.64A9.23,9.23,0,0,1,55.11,32l0,0-.84-.59-.41-.32-.28-.22v-.09l0-.24c0-.16.08-.32.13-.48a6.91,6.91,0,0,1,.37-.95,10.46,10.46,0,0,1,2.48-3.28,8.38,8.38,0,0,1,3.31-2.09,4.94,4.94,0,0,1,3.44.5l.66.32a6.68,6.68,0,0,1,.78.47,4.36,4.36,0,0,1,.85,1,1,1,0,0,1,.12.15l.24.45.08.15a21.9,21.9,0,0,1,1.45,3.34A13.61,13.61,0,0,1,68,31.84s0,.75,0,.76a3.9,3.9,0,0,0,.18-2,16.49,16.49,0,0,0-.59-2.52,10.8,10.8,0,0,0-1.14-2.52,5.56,5.56,0,0,0-1.16-1.29,11.65,11.65,0,0,0-1.62-.88,7.72,7.72,0,0,0-1.87-.59,4.76,4.76,0,0,0-2.12.1,6.69,6.69,0,0,0-2,1,12.1,12.1,0,0,0-1.67,1.36,11.5,11.5,0,0,0-2.57,3.55,10,10,0,0,0-.38,1c-.05.18-.09.36-.13.54s0,.18,0,.29,0,.29,0,.43l.33.27.21.16c.14.1.28.22.43.32l.86.58h0a9.39,9.39,0,0,0,2.61,1.13,23,23,0,0,0,2.54.58,12.77,12.77,0,0,0,4.43.18,7.53,7.53,0,0,0,2.83-1A2.43,2.43,0,0,0,68,32.6Z"/>
-                <path class="cls-1"
-                      d="M70,34.8a14.28,14.28,0,0,0,.16-3.36,31.65,31.65,0,0,0-.28-3.67A11.8,11.8,0,0,0,68.67,24a8.88,8.88,0,0,0-2.61-3h0l0,0a9.26,9.26,0,0,0-5.51-2,27.83,27.83,0,0,0-4.85.52,17.35,17.35,0,0,0-3.33,1c-.8.34-1.23.63-1.3.65a16.69,16.69,0,0,0-1.49,1.06,25.2,25.2,0,0,0-3.12,3,24.7,24.7,0,0,0-1.78,2.24l-.42.61-.32.47-.2.29-.1.15c0,.05.06.09.08.14l.47.54.28.33.55.6a47.56,47.56,0,0,0,4.91,4.66,25,25,0,0,0,2.8,2l.74.43.76.38c.51.24,1,.45,1.49.67,2,.84,3.79,1.61,5.42,2.14.36.11.69.21,1,.29a9.31,9.31,0,0,0,1.26.28,7.51,7.51,0,0,0,1.82,0c1-.08,1.55-.41,1.49-.47s-.13.05-.38.1a5.26,5.26,0,0,1-1.13.1A6.89,6.89,0,0,1,63.45,41a15.08,15.08,0,0,1-2.18-.67C59.7,39.76,57.9,38.94,56,38c-.48-.22-1-.45-1.45-.7l-.7-.38c-.23-.14-.47-.28-.69-.43a24.1,24.1,0,0,1-2.66-2,48.11,48.11,0,0,1-4.69-4.67l-.52-.6L45,29l0,0s0,0,0-.05v0l.11-.14c.14-.21.29-.41.43-.61A25.21,25.21,0,0,1,47.32,26a24.3,24.3,0,0,1,3-2.81c.79-.61,1.31-.89,1.36-.94s.44-.27,1.14-.58a16.12,16.12,0,0,1,3.07-1,29,29,0,0,1,4.62-.59A8.32,8.32,0,0,1,65.4,21.8l0,0a7.92,7.92,0,0,1,2.42,2.63A11,11,0,0,1,69,27.9a34.74,34.74,0,0,1,.39,3.57,13.85,13.85,0,0,1,0,3.23,13.51,13.51,0,0,1-1.65,4.65c-.3.52-.57.92-.76,1.2a3,3,0,0,0-.29.42c0,.05.6-.44,1.3-1.47A12.55,12.55,0,0,0,70,34.8Z"/>
-                <path class="cls-1"
-                      d="M90.87,87.6c-.14-.21-.33-.38-.48-.58a5.28,5.28,0,0,0-1.18-.92,4.88,4.88,0,0,0-2.86-.55,9.6,9.6,0,0,0-2.69.7c-.85.33-1.63.75-2.4,1.13s-1.55.77-2.3,1.15c-3,1.57-5.75,3.1-8.4,4.3a32.68,32.68,0,0,1-7.44,2.52,18.8,18.8,0,0,1-6,.23L56,95.41l-1-.25-1.6-.4c-.43-.11-.76-.18-1-.23L52,94.46a1.07,1.07,0,0,0,.32.12l.48.16s0-.06,0-.06,0,0,0,.07l.43.13,1.59.46.9.26a1.69,1.69,0,0,1,.6.93,5.24,5.24,0,0,1-.28,2.94,8.63,8.63,0,0,1-1.71,2.47,12,12,0,0,0-.9,1.1c-.53-.11-1.06-.23-1.57-.37a13.43,13.43,0,0,1-3.16-1.31c-.18-.09-.35-.19-.52-.29l.67-.25a10,10,0,0,0,2.89-1.66,3.85,3.85,0,0,0,1-1.49,4.4,4.4,0,0,0,.25-1.53,3.81,3.81,0,0,0-.22-1.39h-.06a9.38,9.38,0,0,1,0,1.39,3.69,3.69,0,0,1-1.34,2.67,9.58,9.58,0,0,1-2.79,1.45c-.41.15-.76.26-1,.33l-.16,0h0l-.22-.15-.35-.24c-.18-.13-.42-.3-.62-.47-.43-.33-.9-.78-1.34-1.17,0,.53,0,1,0,1.56l-.81-1.7-.39-.84-.56.74-.6.77-.08.1s0,.06,0,0v-.06l-.06-.3L42.08,97c-.06-.31-.13-.61-.2-.92l-.1-.47a3,3,0,0,0-.16-.56c-.08-.17-.27-.8-.48-1.5.22,0,.49.08.78.11a6.32,6.32,0,0,0,1.56,0,5.66,5.66,0,0,0,1.69-.54,3,3,0,0,0,1.24-.86,3.87,3.87,0,0,0,.58-.93c.08-.24.16-.46.23-.66.13-.39.25-.72.32-1,.17.33.29.52.29.54s.21.33.53.77a18.44,18.44,0,0,0,1.22,1.54A7.72,7.72,0,0,0,51,93.86a2.27,2.27,0,0,0,.79.37s0,0,0,0-.28-.23-.66-.57a8.81,8.81,0,0,1-1.26-1.39c-.42-.55-.8-1.14-1.08-1.59l-.46-.78a7.06,7.06,0,0,1-.47-.75,6.25,6.25,0,0,1-.6-1.76,14.28,14.28,0,0,1-.1-2.73h0a5.07,5.07,0,0,0-.37,2.64,1.56,1.56,0,0,0-.15.06c-.21.07-.51.15-.88.24a20.91,20.91,0,0,1-2.75.35,3.89,3.89,0,0,1-2.53-.76,3.19,3.19,0,0,1-.64-.65,6,6,0,0,1,.15-1,29.43,29.43,0,0,1,.88-3c.18-.43.37-.84.57-1.24-.09-.16-.14-.31-.2-.41h0c0,.11.11.25.2.41a3,3,0,0,0,.29.44,3.72,3.72,0,0,0,2.33,1.41,6.18,6.18,0,0,0,2.67-.18,6.1,6.1,0,0,0,.81-.28,3.61,3.61,0,0,0-.38,1.69c.11,0,.35-1,1.22-2.28a29.25,29.25,0,0,1,3.88-4.15c.76-.73,1.48-1.54,2.12-2.29a26.07,26.07,0,0,0,1.67-2.17,13,13,0,0,0,1-1.73,1,1,0,0,1,.07-.15c.15.56.42,1.41.67,2.29.21.72.42,1.45.54,2s.19.91.2.92,0,.11,0,.27.06.4.1.68c.08.56.17,1.32.26,2.07.12,1.12.24,2.22.33,2.71h0l-.28.11s-.55.27-.56.29c-.83.53-1.27.84-2,1.3a2.9,2.9,0,0,0-.78.34,1.43,1.43,0,0,0-.81,0,1.34,1.34,0,0,0-.68.72,2.37,2.37,0,0,0-.18.55,2.14,2.14,0,0,0-.06.31.86.86,0,0,0,0,.16v.23c.18.27.36.56.55.86,0,.06.09.06.14.08l.17,0,.23.06.45.1.93.18c.09,0,.14,0,.3,0h.2l.08,0h0a.14.14,0,0,0,.08,0l.44-.34,2.82-2.14c.19-.56.37-1,.49-1.36l.18-.52a1.47,1.47,0,0,1,0-.17v-.13h0v0h0v0h0a.28.28,0,0,0,0-.11l0,0c.1-.32.25-.76.43-1.28s.38-1.14.59-1.79c.11-.32.23-.66.34-1l.18-.51h0l0,0h0a1.06,1.06,0,0,0,.07-.22V78l0-.28a52.52,52.52,0,0,0,.29-5.39h.06c0,.15,0,.34.06.57,0,.61.14,1.49.24,2.56.05.54.11,1.12.17,1.74l.06.48,0,.24,0,.13c0,.06,0,.17.05.21.08.3.15.6.23.92.31,1.39.66,2.89,1,4.43l2,1,2.58,0a3,3,0,0,0,1.34-.21,1.61,1.61,0,0,0,.55-.48c.13-.18.23-.35.34-.53s.2-.34.29-.52a2.73,2.73,0,0,0,.13-.29.69.69,0,0,0,0-.39A1.79,1.79,0,0,0,71.73,81a1.56,1.56,0,0,0-.52-.34,1.08,1.08,0,0,0-.64,0,6.59,6.59,0,0,0-.92.45,9.28,9.28,0,0,1-1.53.68,6.81,6.81,0,0,1-1.29.11,3.92,3.92,0,0,0-.51.07,3.63,3.63,0,0,1-.2-.57,9.13,9.13,0,0,1-.25-2.8,7,7,0,0,1,.65-2.7,3.7,3.7,0,0,0,.16-.4.8.8,0,0,0,0-.44l0-.12c.25-.25.52-.54.79-.86a11.06,11.06,0,0,0,1-1.36c.25-.38.39-.65.4-.66s.14-.3.32-.72.39-1,.59-1.52a14.79,14.79,0,0,0,.53-1.69c.39-.57.75-1.13,1.07-1.68a15.68,15.68,0,0,0,2-5.15,1,1,0,0,0,.4,0,2.14,2.14,0,0,0,.48-.27,1.17,1.17,0,0,0,.24-.21.55.55,0,0,0,.14-.35,1.59,1.59,0,0,0-.18-.64,2.35,2.35,0,0,0-.29-.49,1.17,1.17,0,0,0-.34-.28c-.11-.06-.18-.07-.18-.08s-.09.07-.1.16v0a.21.21,0,0,0,0,.13.61.61,0,0,1,.36.23,2,2,0,0,1,.47.93c0,.16-.12.29-.27.41a1.92,1.92,0,0,1-.41.3.86.86,0,0,1-.34.09,4.88,4.88,0,0,0,.08-.61,6.06,6.06,0,0,0,.06-1c0-.18,0-.34,0-.48s0-.18,0-.26a2.49,2.49,0,0,0-.09-.6c-.07,0,0,.85-.2,2.3a15.37,15.37,0,0,1-2.22,5.6,28.34,28.34,0,0,1-2.4,3.28,5.89,5.89,0,0,1-3.79,1.9,16.42,16.42,0,0,1-2.35.22,15.88,15.88,0,0,1-2.4-.12,10.2,10.2,0,0,1-4.36-2L54.93,69h0a1.6,1.6,0,0,0,.26-1.3.18.18,0,0,0-.19-.11h-.83l-.21,0,.06.2s0,.12-.22.24l-.13-.13a6.9,6.9,0,0,1-1.1-1.62l-.18-.35q-.15-.32-.27-.63h0s0,0,0,0a6.44,6.44,0,0,1-.24-.61,1,1,0,0,0,.21.11.26.26,0,0,1,.1,0,.23.23,0,0,1,.13.16c0,.13-.14.23-.2.29a0,0,0,0,0,0,0,.24.24,0,0,0,.14,0,.37.37,0,0,0,.27-.31.48.48,0,0,0-.17-.41.36.36,0,0,0-.18-.11,1.48,1.48,0,0,1-.42-.19s0,0-.05,0A21.33,21.33,0,0,1,51,61.33c-.16-.74-.28-1.48-.38-2.2l.12,0c.26-.08.66-.2,1.21-.39a10.51,10.51,0,0,0,2.11-1c.41-.26.83-.56,1.28-.91l.74-.6c.31-.25.48-.46.79-.72a6.55,6.55,0,0,1,.56-.6l0,0a7.67,7.67,0,0,1-1,.07c-.4,0-.82.08-1.16.09l-.82,0A9.68,9.68,0,0,1,53,55a5.38,5.38,0,0,1-1.85-.65,3.29,3.29,0,0,1-.67-.53c0-.29.08-.58.13-.86a15.28,15.28,0,0,1,.42-1.65,4.78,4.78,0,0,0,.81.2,6.94,6.94,0,0,0,2-.08l.62-.09.81-.14.89-.16.48-.09c.12,0,0,0,0-.06s-.14,0-.15,0-.17-.1-.17-.11l-.17-.07a3.84,3.84,0,0,1-.8-.43,2.34,2.34,0,0,1-.38-.28c-.09-.07-.16-.16-.24-.23a4.26,4.26,0,0,1-.43-.57c-.08-.16-.16-.3-.22-.45a10.08,10.08,0,0,1-.55-1.74l-.18-.75c.18-.35.3-.6.37-.74h0c.27.09.49.14.74.2,1.07.27,2.13.53,3.16.82l-.57.44a17.91,17.91,0,0,0-2.42,2,20.84,20.84,0,0,0,2.69-1.65l1-.64c.58.17,1.14.34,1.69.52l.67.22-.09.07a13.14,13.14,0,0,0-1.21,1.12,8.94,8.94,0,0,0-1.49,1.81h0a15.19,15.19,0,0,0,1.8-1.48c.45-.37.91-.73,1.27-1l.45-.3a16.2,16.2,0,0,0,3.42,1,9.28,9.28,0,0,0,2,0v0a1,1,0,0,0,.19.14,3.7,3.7,0,0,0,.44.28,1.73,1.73,0,0,0,.47.15,2.79,2.79,0,0,0,1.18,0,6.28,6.28,0,0,0,.66-.23s.07.17.12.33a.27.27,0,0,1,.08.19h0v0a1.16,1.16,0,0,1-.18.51,1.92,1.92,0,0,1-.18.29A2.32,2.32,0,0,1,68.3,51l-.51.09-.61.1a4.7,4.7,0,0,0-.71.14l-.16,0-.09,0s0,.06,0,.08a1.84,1.84,0,0,0,.15.35,2.13,2.13,0,0,0,.52.6,3.18,3.18,0,0,0,.58.35,3.49,3.49,0,0,0,1.12.31A6.5,6.5,0,0,0,70.32,53c.37-.07.64-.13.85-.19h0l.31.84c.07.18.13.35.19.52l-.08.1a2.71,2.71,0,0,1-1,.68,3.82,3.82,0,0,1-1.73.24l-1.06-.09c-.25,0-.58-.08-.94-.17s-.83-.23-1.29-.36l.11.14,0,0v0l0,0,.35.32a9.75,9.75,0,0,0,.74.64l.43.32.29.18a5.33,5.33,0,0,0,.56.32,5.15,5.15,0,0,0,2.26.61,5.47,5.47,0,0,0,2.27-.2c.29.78.45,1.29.55,1.28s.09-.4,0-1c.08-.35.21-.93.38-1.5s.28-.88.38-1.27a3,3,0,0,0,.08-.71s0-.08,0-.22a1.42,1.42,0,0,0-.24-.51,2.22,2.22,0,0,0-1.29-.7l-.4-.13c-.21-.81-.44-1.57-.62-2.2s-.46-1.5-.56-1.87a1.08,1.08,0,0,1-.06-.18H71a4.87,4.87,0,0,0,1-.18,2.84,2.84,0,0,0,1.33-.85c.29-.32.39-.57.36-.6h0c-.07,0-.24.22-.49.41a3.22,3.22,0,0,1-1.28.58,4.44,4.44,0,0,1-1.4,0l-.2,0a2.7,2.7,0,0,0,.53-.46,2.11,2.11,0,0,0,.41-.59,1.07,1.07,0,0,0,.1-.24c-.06-.06-.26.3-.68.65a3.92,3.92,0,0,1-1.83.81,7.36,7.36,0,0,1-2,.12,4.51,4.51,0,0,1-.92-.2l-.26-.08a2.87,2.87,0,0,1-.58-.27l-.29-.22,0,0s0,0,0,0a.29.29,0,0,0-.41-.42s0,0,0,0l0,.07-.48-.41a12,12,0,0,1,1.08-.68c.37-.18.66-.24.66-.29s-.31-.07-.75,0a9.59,9.59,0,0,0-1.34.61l0,0-1.07-.94.69-.23c1.49-.49,3-.87,3-1s0,0-.11,0a15.13,15.13,0,0,0-2.27.37c-.25,0-.49.1-.74.16l-1,.27c-.47-.39-.81-.64-.86-.58a5.35,5.35,0,0,0,.58.66l-.8.25c-.58.19-1,.36-1,.37a8.64,8.64,0,0,0-1,.5l-.41.28c-1.2-.39-2.46-.76-3.71-1.11-.23-.07-.49-.13-.67-.2s-.43-.18-.65-.28l-1.32-.59L52,43.61c.7-.19,1.36-.35,1.9-.47.78-.17,1.32-.22,1.35-.23s.56-.1,1.36-.19a20.23,20.23,0,0,1,2.88-.07A23,23,0,0,1,62.3,43c.68.12,1.15.24,1.27.24s0,0,0,0a4.16,4.16,0,0,0-1.24-.48l-.62-.16a19.94,19.94,0,0,0-2.27-.37,18.9,18.9,0,0,0-3-.06,12.09,12.09,0,0,0-1.41.14s-.59.08-1.38.29-1.56.44-2.44.75h0l-1.73-.82c-1.65-.8-3.19-1.57-4.49-2.27-.65-.35-1.24-.68-1.75-1s-.9-.59-1.29-.87c-.75-.51-1.19-.82-1.24-.86s-1-.64-2.44-1.54L35.8,34.37l-.12-.07s0,0,0-.07h0l.09,0,.28-.17.76-.44,1.6-.89-3.6-1-1-.27-.32-.07.2-.15.14-.1.42-.28,2-1.39L37,29l0,0L37,29l-.1,0-.18-.07-.38-.15-1.38-.52L34.49,28l-.12,0a.15.15,0,0,1-.09-.06.24.24,0,0,1,0-.36l.15-.16.16-.2c.11-.13.21-.27.3-.4a5.62,5.62,0,0,0,.51-.83,10.1,10.1,0,0,0,.7-1.67,14.9,14.9,0,0,0,.64-2.93,10,10,0,0,0,0-2.16c.91.8,1.49,1.23,1.56,1.16s-1.09-1.61-2.85-3.75a30.91,30.91,0,0,1-2.47-4l-.15-.29,0-.07v0L32.79,12c-.07-.19-.13-.39-.2-.6a12.83,12.83,0,0,1-.29-1.26,11.6,11.6,0,0,1-.18-1.3c0-.22,0-.44,0-.64s0-.21,0-.31a.66.66,0,0,1,0-.14V7.72a.49.49,0,0,1,.08-.18c.05,0,.11,0,.19-.07l.54-.13.66-.13c.89-.16,1.78-.3,2.64-.4s1.71-.18,2.45-.2a13.41,13.41,0,0,1,2.07.24c1.36.24,2.51.52,3.32.72l1,.26.22-.23c.1-.09.18-.19.28-.29s.12-.12.17-.19a7.14,7.14,0,0,1,.56-.54,3.63,3.63,0,0,1,.46-.34A.9.9,0,0,1,47,6.16L47.19,6a20.75,20.75,0,0,1,2.49-1.59c.48-.26,1-.51,1.49-.74l.5-.22.55.1a11.74,11.74,0,0,1,2.58.83,10.61,10.61,0,0,1,1.59.91c.27.19.56.38.86.6l.45.34c.19.14.38.29.58.46l.25.23a2.52,2.52,0,0,1,.74.52c.1.16,0,0,0-.11a2.6,2.6,0,0,1,0-.26,1,1,0,0,1,0-.3c-.37-1.25-.69-2.31-.95-3.18-.14-.42-.25-.8-.37-1.13l1,0c.88,0,1.62.08,2.15.13l.9.08.57,0,.17.15A8.16,8.16,0,0,1,65,7a4.46,4.46,0,0,0,.17.54,39.58,39.58,0,0,1,.28-4.77l.58,0h.76l.45,0a2.92,2.92,0,0,0,.44-.06c.45-.07.88-.17,1.32-.25l.28.29a6.8,6.8,0,0,1,1,1.53c.08.17.17.36.24.55a5.8,5.8,0,0,1,.21.89c0,.3.08.62.12.94,0,.16.05.33.07.49l0,.25,0,.13s0,0,0,0l.15-.49a15.41,15.41,0,0,1,.75-2,8.45,8.45,0,0,1,.67-1.2,3.69,3.69,0,0,1,.72-.78,6.43,6.43,0,0,1,.73-.48,3.27,3.27,0,0,1,.42-.21,16.23,16.23,0,0,1,2.16.54c.85.29,1.61.62,2.26.86s.93.34,1.23.42c.36.4.64.68.84.87s.34.29.38.27,0-.18-.19-.43l-.36-.61s0,0,0,0l.4,0h.49c.5,0,1-.09,1.58-.16a15.37,15.37,0,0,1,1.63-.14,2.89,2.89,0,0,1,1.36.23c.66.32.78,1.28.84,1.91a11.5,11.5,0,0,1,0,1.16s.06.78,0,1.87A25.11,25.11,0,0,1,86.7,13a29.25,29.25,0,0,1-1,3.84,7.62,7.62,0,0,0-.54,1.75s0,0,.09,0c0,.31,0,1.08,0,1.84,0,.5-.06,1-.1,1.38s-.07.63-.07.65,0,.27-.08.64a11.17,11.17,0,0,1-.21,1.19V24c0-.29,0-.63,0-1a7.16,7.16,0,0,0-.42-1.35,4.79,4.79,0,0,0-1-1.34A6.94,6.94,0,0,0,81.87,19,6.82,6.82,0,0,0,78,18.11a4.21,4.21,0,0,0-2,.82,6.4,6.4,0,0,0-1.47,1.42,5.3,5.3,0,0,0-.85,1.74c-.18.57-.31,1.11-.42,1.62a32.86,32.86,0,0,0-.55,3.49c0,.08-.16,1.47-.21,3.51a15.86,15.86,0,0,0,1.33,7.34l.12.23.15.28a.6.6,0,0,0,.68.32,1.42,1.42,0,0,0,.32-.07,2.76,2.76,0,0,0,.3-.15l.42-.29c.54-.39,1-.78,1.53-1.17,1-.77,1.87-1.51,2.62-2.17a15.16,15.16,0,0,0,2.53-2.64,1.54,1.54,0,0,0,.09-.24l.38.46c0,.07.1.12.08.11h0c-.07.06-.19.15-.31.27a5.54,5.54,0,0,0-.83,1.07c-.52.93-1.07,2.09-1.78,3.18a8.35,8.35,0,0,1-1.16,1.48,7.12,7.12,0,0,1-1.32,1,12.63,12.63,0,0,0-1.39.88A4,4,0,0,0,77.78,40l.72-.37a4.41,4.41,0,0,0,.78-.52,9.16,9.16,0,0,0,1.36-1.48c.81-1.09,1.47-2.3,2-3.11a4.89,4.89,0,0,1,.72-.85l.24-.19c.14-.1.25-.15.26-.16l.09-.06s0-.07.1-.39v0c0-.09,0-.2.08-.35h0l2.52-.84-1.65-1-.47-.27-.15-.08a1.94,1.94,0,0,1,.13-.2c.12-.16.25-.32.36-.48l.69-.91c.43-.58.8-1.09,1-1.46l.23-.33-.35.13c-.31.11-1.54.25-2.19.34a2.62,2.62,0,0,0-.4.06c.1,0,1.52,0,2.28-.11-.28.29-.62.65-1,1.06s-.49.56-.76.85l-.41.46-.65.76,1.2.78.15.13-.15,0h0l-.28.08-1.11.31-.51.14c.12-.37.29-.94.47-1.56.29-1,.59-2.12.81-2.93h0c-.16.57-.37,1.26-.6,1.85-.06.17-.13.34-.19.49-.53,1.21-.65,2.28-1,2.71s-.56.71-.56.71c-.44.36-1.09.88-1.86,1.48S78,36,77,36.76c-.5.36-1,.74-1.55,1.09l-.41.26-.14.07-.15,0s-.11,0-.12-.07L74.52,38l-.1-.22a13.5,13.5,0,0,1-1-3.66,14.36,14.36,0,0,1-.13-1.69.54.54,0,0,0,.17.07,3.86,3.86,0,0,0,1.09,0,15.52,15.52,0,0,0,2.54-.42,14,14,0,0,0,3.33-1.35,6,6,0,0,0,.83-.59,2.73,2.73,0,0,0,.38-.38.58.58,0,0,0,.1-.12l.09-.16c0-.09.06-.19.08-.27a7.18,7.18,0,0,0,.15-2.11,4.53,4.53,0,0,0-.64-2,11.8,11.8,0,0,0-1.13-1.66,4.19,4.19,0,0,0-1.46-1.21,4.57,4.57,0,0,0-1.65-.42,4.48,4.48,0,0,0-2.45.42l-.32.2,0-.09a4.39,4.39,0,0,1,.69-1.51,5.45,5.45,0,0,1,1.25-1.29A3.61,3.61,0,0,1,78,18.81a6.21,6.21,0,0,1,3.58.71,6.62,6.62,0,0,1,1.33,1.08,4.69,4.69,0,0,1,1,1.17A10.2,10.2,0,0,1,84.37,23c0,.4.09.74.13,1s.08.54.11.7v0a14.12,14.12,0,0,0-.43,1.68,3.35,3.35,0,0,0,.26-.57c.14-.35.31-.82.46-1.31s.25-1,.31-1.36.1-.64.1-.65,0-.28.06-.67,0-.89,0-1.39a12.72,12.72,0,0,0-.14-1.91l0,0a.79.79,0,0,1,0-.14s0,0,0,.09a8.88,8.88,0,0,0,.88-1.45,21.5,21.5,0,0,0,1.48-3.82,22.89,22.89,0,0,0,.78-4.09,18.2,18.2,0,0,0,.09-2s0-.5-.12-1.26A5.66,5.66,0,0,0,88,4.57a2.48,2.48,0,0,0-1.28-1.4A3.79,3.79,0,0,0,84.85,3a17.19,17.19,0,0,0-1.7.29l-1.54.32-1.29.24c-.26-.2-.61-.45-1.06-.74A23.2,23.2,0,0,0,77.1,1.78,13.9,13.9,0,0,0,75,.91L74.13.66,73.34.45l-.4-.11c-.17,0-.35-.08-.51-.1a10.33,10.33,0,0,0-1.83,0c-.69,0-1.35.11-2,.18-.44,0-.85.1-1.23.13a1.72,1.72,0,0,1-.31,0,2.61,2.61,0,0,1-.28,0L66.14.47l-.42,0L64.89.34C63.71.2,62.8.11,62.39.07l-.23,0-.93,0c-.58,0-1.37,0-2.31,0-.71,0-1.49.09-2.33.19l-.88.11a15.68,15.68,0,0,0-3.64,1l-.46.22-.41.21-.81.46a0,0,0,0,1,0,0h0c-.51.31-1,.62-1.46,1a15.45,15.45,0,0,0-2.4,2.07l-.29.31A.27.27,0,0,0,46,5.37l-1.38-.31c-.86-.17-2.06-.42-3.54-.61a14.83,14.83,0,0,0-2.53-.15c-.89.07-1.76.2-2.67.35s-1.82.34-2.75.58l-.71.19-.37.1-.18.05-.27.1a1.78,1.78,0,0,0-1,.62,2.26,2.26,0,0,0-.37,1.11c0,.1,0,.22,0,.3v.21c0,.13,0,.27,0,.4s0,.52.08.77q.12.75.3,1.47c.13.48.27.94.44,1.4.1.23.18.45.29.67l.08.19a.75.75,0,0,0,.07.12l0,.07.18.29a27.93,27.93,0,0,0,3,4c.73.71,1.38,1.31,1.92,1.79h0a16.86,16.86,0,0,1-.25,2.24,16.17,16.17,0,0,1-.79,2.8,8.25,8.25,0,0,1-1.86,3,.92.92,0,0,0-.12,1.26,1,1,0,0,0,.28.23,2.56,2.56,0,0,0,.31.14l.44.18.26.12.17.07c.05,0,.12,0,.13.07l-.16.09-.15.1-.07,0-.21.13-.85.54-2.59,1.66,3.41,1,.59.17.18,0,0,0,.16.06-.15.07a3.36,3.36,0,0,0-.48.28l-.34.24a1.12,1.12,0,0,0-.27.26c-.09.1-.08.18-.13.28s-.09.19,0,.28a2.36,2.36,0,0,0,.15.25l.22.26c.18.16.43.31.6.44L37.65,37,40,38.59l1.24.82c.35.24.85.58,1.38.88s1.16.65,1.82,1c1.34.68,2.92,1.42,4.61,2.18l.79.35a13,13,0,0,0-1.67.83c-.69.41-1.05.84-1,.88a9.81,9.81,0,0,1,1.13-.66,17.15,17.15,0,0,1,2.08-.81l1.27.55.84.35-.9,1.87c-.32.68-.71,1.44-1.16,2.44-.07.16-.13.32-.2.49a14.45,14.45,0,0,0-1.45.77c-.52.33-1.08.69-1.58,1l-.68.52-.29.23a.74.74,0,0,1-.13.12l-.14.13a.83.83,0,0,0-.25.67,1.42,1.42,0,0,0,0,.25,2.53,2.53,0,0,0,.13.35,4.26,4.26,0,0,0,.45.71c.46.53,1.14.89,1.6,1.4a3.2,3.2,0,0,1,.79,1.74c0,.14.06.26.08.37s0,.08,0,.12l0,0,0,0h0s0,0,0,0h0v0s0,0,0,0l0,0v0h0v0h0s-.06,0-.07,0h0a.94.94,0,0,0-.55-.2,1.41,1.41,0,0,0-.41.07.26.26,0,0,0,0-.21c0-.08,0-.15-.05-.25s0-.46-.2-.63-.24,0-.35,0a1.68,1.68,0,0,0-.36.28l-.33.27a1.48,1.48,0,0,0-.29.36,6.14,6.14,0,0,0-.4.86,4.7,4.7,0,0,0-.18.47,1.07,1.07,0,0,0,0,.64,1.51,1.51,0,0,0,.91.83,5,5,0,0,0,1.13.28A9.11,9.11,0,0,0,48.9,61a2.51,2.51,0,0,0,.65-.08l.19-.07c0,.22.09.45.15.68a21.2,21.2,0,0,0,1.6,4.74c.14.29.29.57.46.85A12.34,12.34,0,0,1,50.62,69s-.21.21-.51.49l-.17.19c-.93,1-1.84,2.08-2.76,3.12h0s0,0,0,0h0c-.6.66-1.27,1.33-1.88,2-.46.46-.89.94-1.33,1.42l-.81,1.19c-.33.57-.65,1.13-1,1.67a.83.83,0,0,0-.08.12c-.11.22-.34.76-.52,1.2l-.1.19a2.77,2.77,0,0,1-.1.26h0v0l0,.05h0a24.24,24.24,0,0,0-1.39,4.43c-.07.32-.12.6-.17.89l-.06.36v.06a6.75,6.75,0,0,0,.25,3.24h0v0a4.91,4.91,0,0,0,.39,1,11.84,11.84,0,0,1-.41-2.9c0-.27,0-.55,0-.83a2.08,2.08,0,0,0,.41.35,4.1,4.1,0,0,0,2.8.74,14.86,14.86,0,0,0,2.79-.51,3.91,3.91,0,0,0,1-.4.28.28,0,0,0,0,.09,6.53,6.53,0,0,0,.51,2l.1.19c-.11.24-.25.57-.43,1-.09.2-.17.42-.27.65a2.74,2.74,0,0,1-.39.64,3.62,3.62,0,0,1-1.36.93,5.12,5.12,0,0,1-3.07.42,8.94,8.94,0,0,1-1-.17c-.25-.82-.49-1.62-.57-1.81.12.47.93,3.59,1,4.08A25.2,25.2,0,0,1,42,99.92c.12.34.23.69.33,1l.15.08c.15,0,.36-.23.54-.46l.58-.73,0-.07c.51,1,1,2.12,1.53,3.2l1.12,2.35-.07-2.6c0-.49,0-1,0-1.48v-.16s0-.11,0-.11l.12.09.45.31c.5.33,1,.64,1.55.93a14.77,14.77,0,0,0,3.39,1.37,66.05,66.05,0,0,0,7.18,1.22l.9.13.18,0h.53l.31,0,1.84-.15c1.22-.11,2.45-.26,3.67-.45s2.44-.42,3.65-.71a18.53,18.53,0,0,0,3.56-1.23l3.05-1.22c.91-.18,2-.36,3-.59.49-.14,1-.25,1.48-.43l.74-.25.71-.31a16.1,16.1,0,0,0,5.06-3.38,12.81,12.81,0,0,0,3.22-5,12,12,0,0,0,.4-1.42,6.21,6.21,0,0,0,.13-.73l0-.36a1.76,1.76,0,0,0,0-.48Zm-19.73-4h0Zm-5.06-1.5h0Zm-1.3-10a9.59,9.59,0,0,0,2.31-.74,5.08,5.08,0,0,0,1.66-1.26c-.17.32-.34.62-.48.87s-.36.64-.37.65-.14.29-.32.69-.45.9-.74,1.38a10.11,10.11,0,0,0-1.16,2c0,.07.15,0,.33-.16a1.48,1.48,0,0,1,0,.27,25.11,25.11,0,0,0-.33,2.81c-.06,1.31-.06,2.23-.08,2.83,0,.32,0,.54,0,.69a.13.13,0,0,1,0,.06v0h0l.32-.06H66c.2,0,.48,0,.84,0a5.61,5.61,0,0,0,1.34,0,9.05,9.05,0,0,0,1.64-.62,7.83,7.83,0,0,1,.86-.38.73.73,0,0,1,.73.28,1.2,1.2,0,0,1,.31.65.85.85,0,0,0-.4-.16,1.51,1.51,0,0,0-.56.08.3.3,0,0,0-.17.09s0,0,0,0,0,0,.08,0a.38.38,0,0,1,.16,0,2.13,2.13,0,0,1,.5,0,.69.69,0,0,1,.42.35.46.46,0,0,1,0,.08l.29-.14h0l-.3.13a.28.28,0,0,0,0-.07l-.08.15c-.09.16-.19.32-.3.49l0,.07h0v0a1,1,0,0,0-.3-.23,0,0,0,0,0,0,0h-.06a1,1,0,0,0-.36-.06h-.19a.11.11,0,0,0-.08,0,.37.37,0,0,0-.17,0s0,0,0,0l0,0s0,0,.07,0a.39.39,0,0,1,.15,0h.1a1.64,1.64,0,0,1,.39.14.59.59,0,0,1,.18.17,1,1,0,0,1,.09.18,0,0,0,0,0,0,0,.28.28,0,0,1,0,.11h0l.27.19a.23.23,0,0,0,0-.1.28.28,0,0,1,0,.11l-.27-.19h0a.89.89,0,0,0,0-.11,0,0,0,0,1,0,0l-.09.11a1,1,0,0,1-.36.3,2.26,2.26,0,0,1-1.07.11l-2.42,0-1.5-.82q-.07-.43-.18-.87h0L64.82,79c0-.17-.07-.33-.11-.5l0-.25-.08-.29c0-.29-.06-.57-.08-.84,0-.62-.1-1.2-.15-1.73-.08-1.07-.14-1.95-.19-2.56,0-.25,0-.46,0-.61Zm5.4-24.77ZM69,48.9a1.31,1.31,0,0,1-1-.09.9.9,0,0,1-.27-.2.34.34,0,0,1,0-.15h0c.25-.08.49-.17.69-.25a8.55,8.55,0,0,0,1.35-.5h0c0,.06.07.12.1.13l.06,0,0,0h0a.76.76,0,0,1,.2.16v.08c0,.1-.13.22-.13.22l-.26.18A1.66,1.66,0,0,1,69,48.9Zm1.16,3.38a3.93,3.93,0,0,1-1.47.4,2.64,2.64,0,0,1-1.53-.43,1.27,1.27,0,0,1-.36-.37.57.57,0,0,1-.12-.23s0,0,.07,0l.12,0,.48,0,1.08-.1a2.94,2.94,0,0,0,1.93-.82l.47,1.26A4.92,4.92,0,0,1,70.15,52.28ZM72.08,57a10.19,10.19,0,0,1-1.62-.09,5.15,5.15,0,0,1-2.09-.67l-.53-.33-.23-.17-.08-.07-.14-.12,0-.05.08,0,.16,0,.18,0a10.67,10.67,0,0,0,1.09.12,4.36,4.36,0,0,0,2-.22,3.23,3.23,0,0,0,1.07-.67l.73,2a.66.66,0,0,0,0,.15A4.82,4.82,0,0,0,72.08,57Zm.32-4.22a1.84,1.84,0,0,1,.95.61,1.06,1.06,0,0,1,.11.44.79.79,0,0,1,0,.14,3.19,3.19,0,0,1,0,.4c0,.31-.19.81-.25,1.28,0,.21-.06.42-.08.62-.15-.86-.4-1.9-.66-2.93l-.16-.6Zm-5.09-4.62-.39.06Zm-2.62-.61a3.65,3.65,0,0,0,1,.49,4,4,0,0,0,1.07.17h.08a9.52,9.52,0,0,1-1.93-.13,15.12,15.12,0,0,1-2.81-.9l1.3-.85A14.16,14.16,0,0,0,64.69,47.56Zm-4.61-1.88s.38-.18.93-.4l1-.37c.3.33.66.7,1,1.08l-1.14.62-.53.3-1.12-.44-1.06-.37C59.68,45.84,60.05,45.69,60.08,45.68Zm14.37-23h0a5.88,5.88,0,0,1,2.18-.61h.51a4.3,4.3,0,0,1,1.53.45A3.85,3.85,0,0,1,80,23.66a6.79,6.79,0,0,1,1.6,3.48,7,7,0,0,1-.18,1.95.65.65,0,0,1-.07.21l0,.06-.07.08a2.46,2.46,0,0,1-.33.31,5.84,5.84,0,0,1-.77.53,11.78,11.78,0,0,1-2.26,1,9.85,9.85,0,0,1-1,.27,15.42,15.42,0,0,1-2.43.38h-.11a3.21,3.21,0,0,1-.81-.06.4.4,0,0,0-.29.05c0-.39,0-.77,0-1.13a3.25,3.25,0,0,1,0-.33h0c.09-1.82.25-3,.26-3.11s.1-1.45.46-3.41c.06-.36.15-.73.24-1.11,0,0,0,0,0-.06ZM70.79,2.15A8.43,8.43,0,0,1,72.26,2a1.48,1.48,0,0,1,.31,0l.41.05a3.64,3.64,0,0,0,.44.07l-.42.4a4.62,4.62,0,0,0-.72,1,13.45,13.45,0,0,0-.62,1.26c-.13.34-.28.75-.43,1.18a2.55,2.55,0,0,0-.08.26s0,.07,0,0V6.22l0-.16,0-.32q0-.3-.06-.57a3,3,0,0,0-.1-.5,5.46,5.46,0,0,0-.21-.61,12.39,12.39,0,0,0-.83-1.76C70.17,2.25,70.48,2.19,70.79,2.15Zm-6.13.63c.1.73.2,1.81.27,3.32a13.48,13.48,0,0,0-1.45-3.37ZM56,2.5c.41,0,.81,0,1.2,0,.19.34.39.77.61,1.28.31.7.73,1.82,1,2.46,0,0,.06.15.12.31s0,.17.09.27.11.28,0,.12-.28-.28-.58-.53l-.16-.13L57.85,6l-.45-.34L56.52,5a13.29,13.29,0,0,0-1.62-1A20.13,20.13,0,0,0,52.84,3,14.93,14.93,0,0,1,56,2.5ZM49.21,54.7c-.11-.18-.22-.34-.31-.51L48.81,54l-.05-.12v0h0l.27-.17.28-.18C49.27,53.92,49.23,54.3,49.21,54.7Zm1,5h0Zm.64-4.61A7.34,7.34,0,0,0,53,55.5a11.87,11.87,0,0,0,1.45,0l.82-.06.63-.07.55-.14.34-.08,0,0-.55.45a17.59,17.59,0,0,1-2.47,1.68,7.11,7.11,0,0,1-2.05.64,9.74,9.74,0,0,1-1.23.12h-.11q-.06-.6-.09-1.17a14.88,14.88,0,0,1,0-2Zm.72-5.31c.41-.88.85-1.72,1.17-2.38a1.42,1.42,0,0,1,.08-.18s0,0,0,0c.22.44.46,1,.85,1.69a4.45,4.45,0,0,0,.81,1,3.11,3.11,0,0,0,.28.23l.21.16a3.66,3.66,0,0,0,.52.28l.09,0,.14,0s.15,0,.05,0l-.29,0L55,50.9l-.51,0-.61,0a4.74,4.74,0,0,1-1.79-.19,3,3,0,0,1-.72-.4C51.45,50.17,51.53,50,51.62,49.77Zm-2,10.37c0,.12-.38.24-.71.24a7.76,7.76,0,0,1-1.08,0,4.52,4.52,0,0,1-1-.2,1.07,1.07,0,0,1-.64-.48.59.59,0,0,1,0-.35,4.29,4.29,0,0,1,.13-.44,8.29,8.29,0,0,1,.32-.82,1.08,1.08,0,0,1,.21-.29l.26-.25.18-.19c.06-.05.15-.13.22-.08s.08.27.15.39.11.27.07.34l-.1.11,0,0a1.08,1.08,0,0,0-.54.38.41.41,0,0,0,0,.34.48.48,0,0,0,.12.2,1,1,0,0,0,.13.14s.11,0,.15-.09.08-.15.05-.17l-.09-.08c0-.07-.1-.14-.07-.21s.2-.17.38-.26a1.52,1.52,0,0,1,.57-.18.85.85,0,0,1,.54.19c.16.12.32.23.43.33s.09.47.13.47a.35.35,0,0,0,.07-.14.2.2,0,0,0,0-.11v-.07a.47.47,0,0,0-.12-.23,1.81,1.81,0,0,0-.24-.24h0a.09.09,0,0,0,0-.06.19.19,0,0,0,0-.09,1.13,1.13,0,0,0,0-.18c0-.12,0-.26,0-.41a4.3,4.3,0,0,0-.1-1,3.19,3.19,0,0,0-.53-1.12c-.51-.68-1.18-1.14-1.43-1.53a2.61,2.61,0,0,1-.27-.52,1.23,1.23,0,0,1-.06-.21s0,0,0-.06l.07-.08L46.9,53l.25-.24.6-.56c.45-.39.94-.8,1.42-1.18.32-.27.64-.52.91-.72a15.8,15.8,0,0,0-.54,1.93h0l-1,.65-.26.18c-.19.13-.42.25-.48.45a.91.91,0,0,0,.06.68c.06.14.08.17.12.25l.11.2c.16.26.34.5.53.76l.29.39.16.19.07.08h0c0,.06,0,.1,0,.16.06.58.12,1.2.18,1.84l.09.83,0,.29.07.58s0,0,0,0,0,.1.05.17h0v0h0v0h0v0h0v0a.08.08,0,0,1,0,.07ZM59.77,72.28a14.62,14.62,0,0,0,2.55.07c.19,0,.38,0,.57,0-.06.31-.12.77-.21,1.34-.15,1.07-.37,2.5-.58,3.94l0,.21s0,.07,0,.1v0h0s0,0,0,0l0,.09-.21.5c-.14.34-.26.66-.39,1l-.69,1.76c-.2.52-.37,1-.48,1.27,0,.08-.06.15-.08.22v0l0,.07s0,0,0,0v0c0,.09,0,.13,0,.14s-.21.68-.51,1.63c-.34.27-.72.6-1.12.93L57,86.86l-.18.16-.09.07,0,0h0a1.48,1.48,0,0,1-.14-.25.6.6,0,0,1-.09-.28.36.36,0,0,1,0-.12.63.63,0,0,1,.18-.38c.13-.18.26-.34.29-.37-.09-.21-.89.56-.79.71a.82.82,0,0,0,.21.57l.11.12L55.59,87l-.45-.07-.19,0a.76.76,0,0,1,0-.15.77.77,0,0,1,.08-.29c0-.08.06-.12.06-.13a2,2,0,0,1,.23-.4c.14-.19.35-.32.33-.36s-.28,0-.49.19a1.33,1.33,0,0,0-.26.28.84.84,0,0,0-.1.15,1.12,1.12,0,0,0-.1.5c-.09-.12-.19-.24-.27-.36v-.21a2.45,2.45,0,0,1,0-.27,3.12,3.12,0,0,1,.1-.48,1.14,1.14,0,0,1,.45-.64,1,1,0,0,1,.7-.18c.08.16,2-.6,2-.62a12.54,12.54,0,0,0,1.75-1.15h0a9.25,9.25,0,0,0,.26-3,26.88,26.88,0,0,0-.13-3.16s-.1-.45-.29-1-.47-1.27-.77-2-.65-1.46-.92-2A9.7,9.7,0,0,0,59.77,72.28ZM54.3,67.85c.18,0,.47,0,.64,0a1.35,1.35,0,0,1-.2.91l0,0c-.23-.2-.46-.4-.67-.61A.79.79,0,0,0,54.3,67.85ZM43.9,77.71c.58-.72,1.15-1.38,1.7-2l0,0h0a3.12,3.12,0,0,0,.88.8,2.41,2.41,0,0,0,1.19.34c.35,0,.59-.17.54-.25s-.2-.11-.43-.24a3.82,3.82,0,0,1-.74-.59,2.66,2.66,0,0,1-.44-.74l-.09-.31a.73.73,0,0,0,0-.08,0,0,0,0,0,0,0h0a.73.73,0,0,1,0,.08l.23-.25c.28-.3.55-.57.82-.83,0,0,0,0,0,0a3.3,3.3,0,0,0,.85.86c.89.61,1.9.71,1.94.55s-.79-.61-1.33-1.25a2.72,2.72,0,0,1-.53-.93l0-.1.72-.68.42-.4a1.7,1.7,0,0,0,.62.75,1.87,1.87,0,0,0,.39.23l.38.17a4.64,4.64,0,0,0,.69.23c.42.1.73.06.74,0s-.22-.2-.54-.43c-.16-.11-.34-.25-.52-.4l-.3-.23a3,3,0,0,1-.25-.24.75.75,0,0,1-.13-.82,1.35,1.35,0,0,1,.16-.3l.07-.16.57-.53,0,0v0l.05.12a1.37,1.37,0,0,0,.29.31,4.06,4.06,0,0,0,.57.35c.43.22.95.29,1,.1s-.19-.47-.4-.81l-.28-.46c-.12-.16-.12-.15-.12-.16s-.08-.07-.15-.42c0,0,0-.08,0-.12a2.77,2.77,0,0,0,.31-.53l.19.21a17.72,17.72,0,0,0,2,1.68c.35.25.71.49,1.08.71,0,.08-.08.18-.13.3a13.28,13.28,0,0,1-.83,1.59c-.4.64-.92,1.38-1.51,2.14s-1.24,1.57-1.94,2.33c-.89,1-1.81,2-2.56,2.9a5.43,5.43,0,0,1-.79.09A7.9,7.9,0,0,1,46,80a3.24,3.24,0,0,1-1.08-.5,2.52,2.52,0,0,1-.68-.76,2.58,2.58,0,0,1-.34-1,.08.08,0,0,1,0,0,.16.16,0,0,0,0-.07h0ZM42.23,80c.41-.63.85-1.22,1.28-1.78,0,0,0,0,0,0a3.6,3.6,0,0,0,.33.72,2.93,2.93,0,0,0,.83.86,3.65,3.65,0,0,0,1.24.51,7.09,7.09,0,0,0,2.39.11A5.51,5.51,0,0,0,49,80.3a9.44,9.44,0,0,0-1,1.5,7.28,7.28,0,0,0-.36.76c-.2,0-.52.13-.91.2a6.19,6.19,0,0,1-2.55,0,3.4,3.4,0,0,1-2.05-1.35,3.09,3.09,0,0,1-.37-.72Q42,80.33,42.23,80Zm20.29,23.94c-.6,0-1.21.1-1.81.13l-.32,0h-.3l-.19,0-.9-.14c-1.61-.25-3.22-.45-4.78-.74,0,0,0,0,0,0,.14-.2.37-.47.64-.8a8.93,8.93,0,0,0,1.69-2.72,5.16,5.16,0,0,0,.08-3.17,1.82,1.82,0,0,0-.56-.8l1,.17a18.79,18.79,0,0,0,6.09-.11c.31,0,.63-.11,1-.19a2.52,2.52,0,0,1,.75.57,4.16,4.16,0,0,1,.9,1.32,3.55,3.55,0,0,1,.13,1.79,6,6,0,0,1-.17.92,6.78,6.78,0,0,1-.33.85c-.25.54-.53,1-.77,1.47s-.44.8-.59,1-.1.21-.14.28ZM90.58,88.7l0,.34c0,.23-.06.46-.12.68A10.14,10.14,0,0,1,90,91.05,12,12,0,0,1,87,95.75a15.53,15.53,0,0,1-4.84,3.18l-.68.28-.7.23c-.46.17-1,.28-1.42.41-1,.21-1.92.36-3,.57l-3.17,1.25h0a18.09,18.09,0,0,1-3.4,1.13c-1.17.28-2.36.5-3.56.68l-1.45.19.49-1c.23-.45.5-1,.74-1.55a5.19,5.19,0,0,0,.46-1.93,3.85,3.85,0,0,0-.25-2,4.18,4.18,0,0,0-1.06-1.36,3,3,0,0,0-.66-.44,35.84,35.84,0,0,0,6.35-2.19c2.68-1.18,5.48-2.68,8.47-4.21.76-.37,1.51-.77,2.29-1.13s1.57-.78,2.37-1.09a8.86,8.86,0,0,1,2.52-.62,4.17,4.17,0,0,1,2.46.48,4.33,4.33,0,0,1,1,.81,5.17,5.17,0,0,1,.42.51l.31.47A1,1,0,0,1,90.58,88.7Z"/>
-                <path class="cls-1"
-                      d="M40.9,11.45c-.23.24-.37.42-.38.43l-.3.48a5.39,5.39,0,0,0-.5,1.1,3.59,3.59,0,0,0-.2,1.17c0,.33,0,.54.09.54s.16-.82.54-1.54a6.13,6.13,0,0,1,.58-.94l.32-.42s.12-.18.31-.42a9.63,9.63,0,0,1,.73-.85c.56-.6,1.21-1.1,1.17-1.18s-.2,0-.45.15h0A2.51,2.51,0,0,0,41.65,9,4.34,4.34,0,0,0,39.05,9c-1.58.35-3.24.51-3.24.73a8.18,8.18,0,0,0,3.37.27,3.38,3.38,0,0,1,1.91.28,1.31,1.31,0,0,1,.4.32c.07.1.09.15.1.16h0v.09A6.38,6.38,0,0,0,40.9,11.45Z"/>
-            </g>
-        </g>
-    </g>
+<!--
+    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
+
+         http://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.
+-->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 326.17 105.33">
+    <defs>
+        <style>
+            .cls-1{fill:#231f20;}.cls-2{isolation:isolate;}.cls-3{clip-path:url(#clip-path);}.cls-4{clip-path:url(#clip-path-2);}.cls-5{clip-path:url(#clip-path-3);}.cls-6{clip-path:url(#clip-path-4);}.cls-7{opacity:0.35;mix-blend-mode:screen;}.cls-8{clip-path:url(#clip-path-5);}.cls-9{clip-path:url(#clip-path-6);}.cls-10{clip-path:url(#clip-path-7);}.cls-11{clip-path:url(#clip-path-8);}.cls-12{clip-path:url(#clip-path-9);}.cls-13{clip-path:url(#clip-path-10);}.cls-14{clip-path:url(#clip-path-11);}.cls-15{clip-path:url(#clip-path-12);}.cls-16{clip-path:url(#clip-path-13);}.cls-17{clip-path:url(#clip-path-14);}
+        </style>
+        <clipPath id="clip-path">
+            <path class="cls-1"
+                  d="M275.72,63.08v5.4c0,2.39-.83,3.23-3.19,3.23h-3.88v7.64c0,2.39-.84,3.24-3.2,3.24h-7.83c-2.44,0-3.2-.85-3.2-3.24V71.71H231.36c-2.35,0-3.19-.84-3.19-3.23v-5.1c0-2.54.15-3.47,1.67-5.24l23.13-28c1.53-1.77,2.44-2.31,5-2.31h7.53c2.36,0,3.2.85,3.2,3.24V59.84h3.88C274.89,59.84,275.72,60.69,275.72,63.08ZM254.42,46.8l-10.65,13h10.65Z"/>
+        </clipPath>
+        <clipPath id="clip-path-2">
+            <path class="cls-1"
+                  d="M323.36,82.59h-9.74c-4,0-4.87-.23-6.32-2.85l-7.23-12.65-7,12.65c-1.44,2.39-2.2,2.85-6.31,2.85H277.4c-2.28,0-2.82-1.39-1.6-3.24l15.68-24.68L276.56,30.92c-1.14-1.7-.61-3.09,1.52-3.09h9.13c3.88,0,4.8.31,6.24,2.7l6.85,11.88,6.77-11.88c1.45-2.55,2.44-2.7,5.86-2.7h9.74c2.21,0,2.59,1.39,1.52,3.09L309.13,54.67,325,79.35C326.17,81.05,325.72,82.59,323.36,82.59Z"/>
+        </clipPath>
+        <clipPath id="clip-path-3">
+            <path class="cls-1"
+                  d="M47.8,58a1.32,1.32,0,0,1,.83-.09h0s0,0,0-.08c-.81-.5-1.62-1-2.54-1.59a1.65,1.65,0,0,1-.28.6l2,1.21S47.78,58,47.8,58Z"/>
+        </clipPath>
+        <clipPath id="clip-path-4">
+            <path class="cls-1"
+                  d="M.71,22.52A23.24,23.24,0,0,0,4.2,28l3.72-1a44.55,44.55,0,0,1-3.84-4.84A2.07,2.07,0,0,1,4,22a2.14,2.14,0,0,1,.13.19,40.79,40.79,0,0,0,4,4.62,65.5,65.5,0,0,0,.73-7c-3.61-1.54-5.64-.6-5.64-.6S0,20.26.71,22.52Z"/>
+        </clipPath>
+        <clipPath id="clip-path-5">
+            <path class="cls-1"
+                  d="M15.3,34.21c-.88-.77-1.73-1.53-2.55-2.3s-1.68-1.59-2.47-2.38l-.14-.14Q9,28.21,7.92,27.05L4.2,28l.4.51c.51.65,1.07,1.34,1.67,2s1.39,1.63,2.15,2.47,1.45,1.58,2.23,2.38,1.34,1.38,2,2.08l.08.07,5-1.24C17,35.64,16.12,34.92,15.3,34.21Z"/>
+        </clipPath>
+        <clipPath id="clip-path-6">
+            <path class="cls-1"
+                  d="M38.35,50.5,40.68,52l0,0,.34.22,2.12,1.32A4.78,4.78,0,0,1,45.6,52.3a3.85,3.85,0,0,0-2.81.61c.92-3.28.74-6.34-1.35-8.38a5.09,5.09,0,0,0-.6-.52,3.27,3.27,0,0,1,.42,3.34h0A9.18,9.18,0,0,0,38.62,42c-.33-.33-.7-.66-1.12-1a7.42,7.42,0,0,1,.64,7.34l-.22,1.9Z"/>
+        </clipPath>
+        <clipPath id="clip-path-7">
+            <path class="cls-1"
+                  d="M34.4,48.68c-.94-.64-1.89-1.29-2.84-2L28.8,44.77c-.93-.66-1.85-1.33-2.77-2s-1.87-1.39-2.8-2.1l-2.72-2.12-1-.77L17.9,36.42l-.09-.07-5,1.24a1.21,1.21,0,0,0,.16.16c.74.73,1.51,1.47,2.3,2.2s1.61,1.47,2.44,2.19,1.42,1.22,2.14,1.81l.44.35c.91.74,1.79,1.42,2.65,2s1.91,1.36,2.81,1.94c.59.38,1.16.74,1.71,1.07l1.42.81c1.12.62,2.25,1.19,3.38,1.7l5.07-1.24L35,49.11Z"/>
+        </clipPath>
+        <clipPath id="clip-path-8">
+            <path class="cls-1"
+                  d="M32.38,51.94a35.59,35.59,0,0,0,4.19,1.59l.15,0a9.39,9.39,0,0,0-2.87,2.11,13.22,13.22,0,0,1,6.51-1.21,6,6,0,0,1-1.17,2.8,6.07,6.07,0,0,0,2.09-2.14A7.3,7.3,0,0,0,42.2,59a7.63,7.63,0,0,1,.19-4.26C46,57,45,56.36,48.1,58.16c.1.05.29,0,.4,0,.34.19,1,.77,1.4,1a1.14,1.14,0,0,0-.58-1c-.88-.5-.78-.29-8.25-5.09l-.64-.41-.18-.12c-.78-.5-1.58-1-2.39-1.56l-.56-.37h0l-5.07,1.24Z"/>
+        </clipPath>
+        <clipPath id="clip-path-9">
+            <path class="cls-1"
+                  d="M18.28,36.08a3.51,3.51,0,0,0,.36.29l1.11.9,1.26,1,.66.51,2.06,1.57c.88.66,1.79,1.33,2.74,2s1.84,1.33,2.81,2l2.86,2,2.72,1.83.13.09,2.86,1.89.07,0,.22-1.9s0,.07,0,.11a13.6,13.6,0,0,0-2.34-8A18,18,0,0,0,33,37.29,28.37,28.37,0,0,0,30.1,35c-.94-.66-2-1.33-3.09-2a7,7,0,0,1,.2,1.87c0,.12,0,.24,0,.36l0,.37h0A8.26,8.26,0,0,0,24,30.29,7.68,7.68,0,0,1,24.48,33c0,.15,0,.3,0,.45a.49.49,0,0,0,0,.12h0a8.75,8.75,0,0,0-.61-2.08c-.06-.13-.12-.26-.19-.39s-.21-.37-.33-.56-.15-.22-.24-.34a7.63,7.63,0,0,0-.66-.76l-.23-.22L21.85,29c-.52-.42-1-.77-1.39-1.06l-.58-.38-.2-.13c-.2-.13-.38-.23-.54-.32a3.88,3.88,0,0,0-.58-.27h0a1.49,1.49,0,0,1,.11.28A8.89,8.89,0,0,1,19,29.82l.21-1.74L19,29.82v0a2.45,2.45,0,0,1,0,.27v-.05l-.7,6Z"/>
+        </clipPath>
+        <clipPath id="clip-path-10">
+            <path class="cls-1"
+                  d="M8,26.83c.67.7,1.45,1.47,2.32,2.32l.14.13c.77.73,1.61,1.51,2.53,2.34s1.66,1.47,2.6,2.26S17.3,35.29,18.22,36l.7-6a7.26,7.26,0,0,0-1.76-3.76c-.24-.26-.49-.53-.75-.79-.79-.81-1.68-1.63-2.58-2.39a31.59,31.59,0,0,0-2.54-1.95c-.51-.35-1-.64-1.42-.87s-.75-.37-1.1-.52A65.5,65.5,0,0,1,8,26.83Z"/>
+        </clipPath>
+        <clipPath id="clip-path-11">
+            <path class="cls-1" d="M27.2,35.21l0,.37h0Z"/>
+        </clipPath>
+        <clipPath id="clip-path-12">
+            <path class="cls-1" d="M24.45,33.6a.49.49,0,0,1,0-.12.49.49,0,0,0,0,.12Z"/>
+        </clipPath>
+        <clipPath id="clip-path-13">
+            <polygon class="cls-1" points="24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59"/>
+        </clipPath>
+        <clipPath id="clip-path-14">
+            <path class="cls-1" d="M27.25,35.08c0,.12,0,.24,0,.36h0C27.24,35.32,27.24,35.2,27.25,35.08Z"/>
+        </clipPath>
+    </defs>
+    <title>logo PLC4X black line</title>
+    <g class="cls-2">
+        <g id="Layer_2" data-name="Layer 2">
+            <g id="Layer_1-2" data-name="Layer 1">
+                <path class="cls-1"
+                      d="M135.53,47.11c0,12.19-7.61,19-19.48,19h-9.29V79.35c0,2.39-.83,3.24-3.19,3.24H94.89c-2.36,0-3.19-.85-3.19-3.24V31.07c0-2.39.83-3.24,3.19-3.24H116C127.76,27.83,135.53,34.85,135.53,47.11ZM119.93,47c0-3.39-2.06-5.7-5.63-5.7h-7.54V52.66h7.54A5.25,5.25,0,0,0,119.93,47Z"/>
+                <path class="cls-1"
+                      d="M154.09,31.07v38h18.26c2.44,0,3.27.77,3.27,3.24v7c0,2.39-.83,3.24-3.27,3.24H142.22c-2.36,0-3.2-.85-3.2-3.24V31.07c0-2.39.84-3.24,3.2-3.24h8.67C153.25,27.83,154.09,28.68,154.09,31.07Z"/>
+                <path class="cls-1"
+                      d="M201.38,26.67c11.72,0,19.1,4.86,22.22,13.5.84,2.24.23,3.39-2,4.16l-8.15,2.94c-2.35.69-3.19.3-4.1-2.09-1.3-3.47-3.58-5-7.92-5-5.93,0-8.29,2.62-8.29,8v14c0,5.4,2.36,8,8.29,8,4.26,0,6.7-1.7,8-5,.84-2.4,1.83-2.94,4.11-2.09l8.07,2.93c2.28.78,2.89,1.93,2,4.17-3.12,8.64-10.5,13.5-22.22,13.5-14.91,0-23.36-8.26-23.36-21.6V48.27C178,34.93,186.47,26.67,201.38,26.67Z"/>
+                <path class="cls-1"
+                      d="M275.72,63.08v5.4c0,2.39-.83,3.23-3.19,3.23h-3.88v7.64c0,2.39-.84,3.24-3.2,3.24h-7.83c-2.44,0-3.2-.85-3.2-3.24V71.71H231.36c-2.35,0-3.19-.84-3.19-3.23v-5.1c0-2.54.15-3.47,1.67-5.24l23.13-28c1.53-1.77,2.44-2.31,5-2.31h7.53c2.36,0,3.2.85,3.2,3.24V59.84h3.88C274.89,59.84,275.72,60.69,275.72,63.08ZM254.42,46.8l-10.65,13h10.65Z"/>
+                <g class="cls-3">
+                    <polygon class="cls-1" points="243.77 58.95 254.42 58.99 254.42 59.84 243.77 59.84 243.77 58.95"/>
+                    <polygon class="cls-1" points="243.77 57.66 254.42 57.7 254.42 58.99 243.77 58.95 243.77 57.66"/>
+                    <polygon class="cls-1" points="243.77 56.37 254.42 56.41 254.42 57.7 243.77 57.66 243.77 56.37"/>
+                    <polygon class="cls-1" points="243.77 55.08 254.42 55.11 254.42 56.41 243.77 56.37 243.77 55.08"/>
+                    <polygon class="cls-1" points="243.77 53.78 254.42 53.82 254.42 55.11 243.77 55.08 243.77 53.78"/>
+                    <polygon class="cls-1" points="243.77 52.49 254.42 52.53 254.42 53.82 243.77 53.78 243.77 52.49"/>
+                    <polygon class="cls-1" points="243.77 51.2 254.42 51.24 254.42 52.53 243.77 52.49 243.77 51.2"/>
+                    <polygon class="cls-1" points="243.77 49.91 254.42 49.95 254.42 51.24 243.77 51.2 243.77 49.91"/>
+                    <polygon class="cls-1" points="243.77 49.68 254.42 49.71 254.42 49.95 243.77 49.91 243.77 49.68"/>
+                    <polygon class="cls-1" points="243.77 49.44 254.42 49.48 254.42 49.71 243.77 49.68 243.77 49.44"/>
+                    <polygon class="cls-1" points="243.77 49.21 254.42 49.25 254.42 49.48 243.77 49.44 243.77 49.21"/>
+                    <polygon class="cls-1" points="243.77 48.98 254.42 49.02 254.42 49.25 243.77 49.21 243.77 48.98"/>
+                    <polygon class="cls-1" points="243.77 48.74 254.42 48.78 254.42 49.02 243.77 48.98 243.77 48.74"/>
+                    <polygon class="cls-1" points="243.77 48.51 254.42 48.55 254.42 48.78 243.77 48.74 243.77 48.51"/>
+                    <polygon class="cls-1" points="243.77 48.28 254.42 48.32 254.42 48.55 243.77 48.51 243.77 48.28"/>
+                    <polygon class="cls-1" points="243.77 48.05 254.42 48.08 254.42 48.32 243.77 48.28 243.77 48.05"/>
+                    <polygon class="cls-1" points="243.77 47.81 254.42 47.85 254.42 48.08 243.77 48.05 243.77 47.81"/>
+                    <polygon class="cls-1" points="243.77 47.58 254.42 47.62 254.42 47.85 243.77 47.81 243.77 47.58"/>
+                    <polygon class="cls-1" points="243.77 47.35 254.42 47.38 254.42 47.62 243.77 47.58 243.77 47.35"/>
+                    <polygon class="cls-1" points="243.77 47.11 254.42 47.15 254.42 47.38 243.77 47.35 243.77 47.11"/>
+                    <polygon class="cls-1" points="243.77 46.88 254.42 46.92 254.42 47.15 243.77 47.11 243.77 46.88"/>
+                    <polygon class="cls-1" points="254.42 46.92 243.77 46.88 243.77 46.8 254.42 46.8 254.42 46.92"/>
+                    <polygon class="cls-1" points="228.17 82.47 261.4 82.59 228.17 82.59 228.17 82.47"/>
+                    <polygon class="cls-1"
+                             points="228.17 82.26 275.73 82.42 275.73 82.59 261.4 82.59 228.17 82.47 228.17 82.26"/>
+                    <polygon class="cls-1" points="228.17 82.04 275.73 82.21 275.73 82.42 228.17 82.26 228.17 82.04"/>
+                    <polygon class="cls-1" points="228.17 81.82 275.73 81.99 275.73 82.21 228.17 82.04 228.17 81.82"/>
+                    <polygon class="cls-1" points="228.17 81.61 275.73 81.77 275.73 81.99 228.17 81.82 228.17 81.61"/>
+                    <polygon class="cls-1" points="228.17 81.39 275.73 81.56 275.73 81.77 228.17 81.61 228.17 81.39"/>
+                    <polygon class="cls-1" points="228.17 81.17 275.73 81.34 275.73 81.56 228.17 81.39 228.17 81.17"/>
+                    <polygon class="cls-1" points="228.17 80.96 275.73 81.12 275.73 81.34 228.17 81.17 228.17 80.96"/>
+                    <polygon class="cls-1" points="228.17 80.74 275.73 80.91 275.73 81.12 228.17 80.96 228.17 80.74"/>
+                    <polygon class="cls-1" points="228.17 80.53 275.73 80.69 275.73 80.91 228.17 80.74 228.17 80.53"/>
+                    <polygon class="cls-1" points="228.17 80.31 275.73 80.48 275.73 80.69 228.17 80.53 228.17 80.31"/>
+                    <polygon class="cls-1" points="228.17 80.09 275.73 80.26 275.73 80.48 228.17 80.31 228.17 80.09"/>
+                    <polygon class="cls-1" points="228.17 79.88 275.73 80.04 275.73 80.26 228.17 80.09 228.17 79.88"/>
+                    <polygon class="cls-1" points="228.17 79.66 275.73 79.83 275.73 80.04 228.17 79.88 228.17 79.66"/>
+                    <polygon class="cls-1" points="228.17 79.44 275.73 79.61 275.73 79.83 228.17 79.66 228.17 79.44"/>
+                    <polygon class="cls-1" points="228.17 79.23 275.73 79.39 275.73 79.61 228.17 79.44 228.17 79.23"/>
+                    <polygon class="cls-1" points="228.17 79.01 275.73 79.18 275.73 79.39 228.17 79.23 228.17 79.01"/>
+                    <polygon class="cls-1" points="228.17 78.8 275.73 78.96 275.73 79.18 228.17 79.01 228.17 78.8"/>
+                    <polygon class="cls-1" points="228.17 78.58 275.73 78.75 275.73 78.96 228.17 78.8 228.17 78.58"/>
+                    <polygon class="cls-1" points="228.17 78.36 275.73 78.53 275.73 78.75 228.17 78.58 228.17 78.36"/>
+                    <polygon class="cls-1" points="228.17 78.15 275.73 78.31 275.73 78.53 228.17 78.36 228.17 78.15"/>
+                    <polygon class="cls-1" points="228.17 77.93 275.73 78.1 275.73 78.31 228.17 78.15 228.17 77.93"/>
+                    <polygon class="cls-1" points="228.17 77.71 275.73 77.88 275.73 78.1 228.17 77.93 228.17 77.71"/>
+                    <polygon class="cls-1" points="228.17 77.5 275.73 77.66 275.73 77.88 228.17 77.71 228.17 77.5"/>
+                    <polygon class="cls-1" points="228.17 77.28 275.73 77.45 275.73 77.66 228.17 77.5 228.17 77.28"/>
+                    <polygon class="cls-1" points="228.17 77.06 275.73 77.23 275.73 77.45 228.17 77.28 228.17 77.06"/>
+                    <polygon class="cls-1" points="228.17 76.85 275.73 77.01 275.73 77.23 228.17 77.06 228.17 76.85"/>
+                    <polygon class="cls-1" points="228.17 76.63 275.73 76.8 275.73 77.01 228.17 76.85 228.17 76.63"/>
+                    <polygon class="cls-1" points="228.17 76.42 275.73 76.58 275.73 76.8 228.17 76.63 228.17 76.42"/>
+                    <polygon class="cls-1" points="228.17 76.2 275.73 76.36 275.73 76.58 228.17 76.42 228.17 76.2"/>
+                    <polygon class="cls-1" points="228.17 75.98 275.73 76.15 275.73 76.36 228.17 76.2 228.17 75.98"/>
+                    <polygon class="cls-1" points="228.17 75.77 275.73 75.93 275.73 76.15 228.17 75.98 228.17 75.77"/>
+                    <polygon class="cls-1" points="228.17 75.55 275.73 75.72 275.73 75.93 228.17 75.77 228.17 75.55"/>
+                    <polygon class="cls-1" points="228.17 75.33 275.73 75.5 275.73 75.72 228.17 75.55 228.17 75.33"/>
+                    <polygon class="cls-1" points="228.17 75.12 275.73 75.28 275.73 75.5 228.17 75.33 228.17 75.12"/>
+                    <polygon class="cls-1" points="228.17 74.9 275.73 75.07 275.73 75.28 228.17 75.12 228.17 74.9"/>
+                    <polygon class="cls-1" points="228.17 74.69 275.73 74.85 275.73 75.07 228.17 74.9 228.17 74.69"/>
+                    <polygon class="cls-1" points="228.17 74.47 275.73 74.63 275.73 74.85 228.17 74.69 228.17 74.47"/>
+                    <polygon class="cls-1" points="228.17 74.25 275.73 74.42 275.73 74.63 228.17 74.47 228.17 74.25"/>
+                    <polygon class="cls-1" points="228.17 74.03 275.73 74.2 275.73 74.42 228.17 74.25 228.17 74.03"/>
+                    <polygon class="cls-1" points="228.17 73.82 275.73 73.98 275.73 74.2 228.17 74.03 228.17 73.82"/>
+                    <polygon class="cls-1" points="228.17 73.6 275.73 73.77 275.73 73.98 228.17 73.82 228.17 73.6"/>
+                    <polygon class="cls-1" points="228.17 73.39 275.73 73.55 275.73 73.77 228.17 73.6 228.17 73.39"/>
+                    <polygon class="cls-1" points="228.17 73.17 275.73 73.34 275.73 73.55 228.17 73.39 228.17 73.17"/>
+                    <polygon class="cls-1" points="228.17 72.95 275.73 73.12 275.73 73.34 228.17 73.17 228.17 72.95"/>
+                    <polygon class="cls-1" points="228.17 72.74 275.73 72.9 275.73 73.12 228.17 72.95 228.17 72.74"/>
+                    <polygon class="cls-1" points="228.17 72.52 275.73 72.69 275.73 72.9 228.17 72.74 228.17 72.52"/>
+                    <polygon class="cls-1" points="228.17 72.31 275.73 72.47 275.73 72.69 228.17 72.52 228.17 72.31"/>
+                    <polygon class="cls-1" points="228.17 72.09 275.73 72.25 275.73 72.47 228.17 72.31 228.17 72.09"/>
+                    <polygon class="cls-1" points="228.17 71.87 275.73 72.04 275.73 72.25 228.17 72.09 228.17 71.87"/>
+                    <polygon class="cls-1" points="228.17 71.66 275.73 71.82 275.73 72.04 228.17 71.87 228.17 71.66"/>
+                    <polygon class="cls-1" points="228.17 71.44 275.73 71.61 275.73 71.82 228.17 71.66 228.17 71.44"/>
+                    <polygon class="cls-1" points="228.17 71.22 275.73 71.39 275.73 71.61 228.17 71.44 228.17 71.22"/>
+                    <polygon class="cls-1" points="228.17 71.01 275.73 71.17 275.73 71.39 228.17 71.22 228.17 71.01"/>
+                    <polygon class="cls-1" points="228.17 70.79 275.73 70.96 275.73 71.17 228.17 71.01 228.17 70.79"/>
+                    <polygon class="cls-1" points="228.17 70.57 275.73 70.74 275.73 70.96 228.17 70.79 228.17 70.57"/>
+                    <polygon class="cls-1" points="228.17 70.36 275.73 70.52 275.73 70.74 228.17 70.57 228.17 70.36"/>
+                    <polygon class="cls-1" points="228.17 70.14 275.73 70.31 275.73 70.52 228.17 70.36 228.17 70.14"/>
+                    <polygon class="cls-1" points="228.17 69.92 275.73 70.09 275.73 70.31 228.17 70.14 228.17 69.92"/>
+                    <polygon class="cls-1" points="228.17 69.71 275.73 69.88 275.73 70.09 228.17 69.92 228.17 69.71"/>
+                    <polygon class="cls-1" points="228.17 69.49 275.73 69.66 275.73 69.88 228.17 69.71 228.17 69.49"/>
+                    <polygon class="cls-1" points="228.17 69.28 275.73 69.44 275.73 69.66 228.17 69.49 228.17 69.28"/>
+                    <polygon class="cls-1" points="228.17 69.06 275.73 69.23 275.73 69.44 228.17 69.28 228.17 69.06"/>
+                    <polygon class="cls-1" points="228.17 68.84 275.73 69.01 275.73 69.23 228.17 69.06 228.17 68.84"/>
+                    <polygon class="cls-1" points="228.17 68.63 275.73 68.79 275.73 69.01 228.17 68.84 228.17 68.63"/>
+                    <polygon class="cls-1" points="228.17 68.41 275.73 68.58 275.73 68.79 228.17 68.63 228.17 68.41"/>
+                    <polygon class="cls-1" points="228.17 68.19 275.73 68.36 275.73 68.58 228.17 68.41 228.17 68.19"/>
+                    <polygon class="cls-1" points="228.17 67.98 275.73 68.14 275.73 68.36 228.17 68.19 228.17 67.98"/>
+                    <polygon class="cls-1" points="228.17 67.76 275.73 67.93 275.73 68.14 228.17 67.98 228.17 67.76"/>
+                    <polygon class="cls-1" points="228.17 67.55 275.73 67.71 275.73 67.93 228.17 67.76 228.17 67.55"/>
+                    <polygon class="cls-1" points="228.17 67.33 275.73 67.5 275.73 67.71 228.17 67.55 228.17 67.33"/>
+                    <polygon class="cls-1" points="228.17 67.11 275.73 67.28 275.73 67.5 228.17 67.33 228.17 67.11"/>
+                    <polygon class="cls-1" points="228.17 66.9 275.73 67.06 275.73 67.28 228.17 67.11 228.17 66.9"/>
+                    <polygon class="cls-1" points="228.17 66.68 275.73 66.85 275.73 67.06 228.17 66.9 228.17 66.68"/>
+                    <polygon class="cls-1" points="228.17 66.46 275.73 66.63 275.73 66.85 228.17 66.68 228.17 66.46"/>
+                    <polygon class="cls-1" points="228.17 66.25 275.73 66.41 275.73 66.63 228.17 66.46 228.17 66.25"/>
+                    <polygon class="cls-1" points="228.17 66.03 275.73 66.2 275.73 66.41 228.17 66.25 228.17 66.03"/>
+                    <polygon class="cls-1" points="228.17 65.81 275.73 65.98 275.73 66.2 228.17 66.03 228.17 65.81"/>
+                    <polygon class="cls-1" points="228.17 65.6 275.73 65.77 275.73 65.98 228.17 65.81 228.17 65.6"/>
+                    <polygon class="cls-1" points="228.17 65.38 275.73 65.55 275.73 65.77 228.17 65.6 228.17 65.38"/>
+                    <polygon class="cls-1" points="228.17 65.17 275.73 65.33 275.73 65.55 228.17 65.38 228.17 65.17"/>
+                    <polygon class="cls-1" points="228.17 64.95 275.73 65.12 275.73 65.33 228.17 65.17 228.17 64.95"/>
+                    <polygon class="cls-1" points="228.17 64.73 275.73 64.9 275.73 65.12 228.17 64.95 228.17 64.73"/>
+                    <polygon class="cls-1" points="228.17 64.52 275.73 64.68 275.73 64.9 228.17 64.73 228.17 64.52"/>
+                    <polygon class="cls-1" points="228.17 64.3 275.73 64.47 275.73 64.68 228.17 64.52 228.17 64.3"/>
+                    <polygon class="cls-1" points="228.17 64.08 275.73 64.25 275.73 64.47 228.17 64.3 228.17 64.08"/>
+                    <polygon class="cls-1" points="228.17 63.87 275.73 64.03 275.73 64.25 228.17 64.08 228.17 63.87"/>
+                    <polygon class="cls-1" points="228.17 63.65 275.73 63.82 275.73 64.03 228.17 63.87 228.17 63.65"/>
+                    <polygon class="cls-1" points="228.17 63.44 275.73 63.6 275.73 63.82 228.17 63.65 228.17 63.44"/>
+                    <polygon class="cls-1" points="228.17 63.22 275.73 63.38 275.73 63.6 228.17 63.44 228.17 63.22"/>
+                    <polygon class="cls-1" points="228.17 63 275.73 63.17 275.73 63.38 228.17 63.22 228.17 63"/>
+                    <polygon class="cls-1" points="228.17 62.79 275.73 62.95 275.73 63.17 228.17 63 228.17 62.79"/>
+                    <polygon class="cls-1" points="228.17 62.57 275.73 62.74 275.73 62.95 228.17 62.79 228.17 62.57"/>
+                    <polygon class="cls-1" points="228.17 62.35 275.73 62.52 275.73 62.74 228.17 62.57 228.17 62.35"/>
+                    <polygon class="cls-1" points="228.17 62.14 275.73 62.3 275.73 62.52 228.17 62.35 228.17 62.14"/>
+                    <polygon class="cls-1" points="228.17 61.92 275.73 62.09 275.73 62.3 228.17 62.14 228.17 61.92"/>
+                    <polygon class="cls-1" points="228.17 61.7 275.73 61.87 275.73 62.09 228.17 61.92 228.17 61.7"/>
+                    <polygon class="cls-1" points="228.17 61.49 275.73 61.65 275.73 61.87 228.17 61.7 228.17 61.49"/>
+                    <polygon class="cls-1" points="228.17 61.27 275.73 61.44 275.73 61.65 228.17 61.49 228.17 61.27"/>
+                    <polygon class="cls-1" points="228.17 61.05 275.73 61.22 275.73 61.44 228.17 61.27 228.17 61.05"/>
+                    <polygon class="cls-1" points="228.17 60.84 275.73 61.01 275.73 61.22 228.17 61.05 228.17 60.84"/>
+                    <polygon class="cls-1" points="228.17 60.62 275.73 60.79 275.73 61.01 228.17 60.84 228.17 60.62"/>
+                    <polygon class="cls-1" points="228.17 60.41 275.73 60.57 275.73 60.79 228.17 60.62 228.17 60.41"/>
+                    <polygon class="cls-1" points="228.17 60.19 275.73 60.36 275.73 60.57 228.17 60.41 228.17 60.19"/>
+                    <polygon class="cls-1" points="228.17 58.9 275.73 59.06 275.73 60.36 228.17 60.19 228.17 58.9"/>
+                    <polygon class="cls-1" points="228.17 57.61 275.73 57.77 275.73 59.06 228.17 58.9 228.17 57.61"/>
+                    <polygon class="cls-1" points="228.17 56.31 275.73 56.48 275.73 57.77 228.17 57.61 228.17 56.31"/>
+                    <polygon class="cls-1" points="228.17 55.02 275.73 55.19 275.73 56.48 228.17 56.31 228.17 55.02"/>
+                    <polygon class="cls-1" points="228.17 53.73 275.73 53.9 275.73 55.19 228.17 55.02 228.17 53.73"/>
+                    <polygon class="cls-1" points="228.17 52.44 275.73 52.6 275.73 53.9 228.17 53.73 228.17 52.44"/>
+                    <polygon class="cls-1" points="228.17 51.15 275.73 51.31 275.73 52.6 228.17 52.44 228.17 51.15"/>
+                    <polygon class="cls-1" points="228.17 49.85 275.73 50.02 275.73 51.31 228.17 51.15 228.17 49.85"/>
+                    <polygon class="cls-1" points="228.17 49.62 275.73 49.79 275.73 50.02 228.17 49.85 228.17 49.62"/>
+                    <polygon class="cls-1" points="228.17 49.39 275.73 49.55 275.73 49.79 228.17 49.62 228.17 49.39"/>
+                    <polygon class="cls-1" points="228.17 49.16 275.73 49.32 275.73 49.55 228.17 49.39 228.17 49.16"/>
+                    <polygon class="cls-1" points="228.17 48.92 275.73 49.09 275.73 49.32 228.17 49.16 228.17 48.92"/>
+                    <polygon class="cls-1" points="228.17 48.69 275.73 48.86 275.73 49.09 228.17 48.92 228.17 48.69"/>
+                    <polygon class="cls-1" points="228.17 48.46 275.73 48.62 275.73 48.86 228.17 48.69 228.17 48.46"/>
+                    <polygon class="cls-1" points="228.17 48.22 275.73 48.39 275.73 48.62 228.17 48.46 228.17 48.22"/>
+                    <polygon class="cls-1" points="228.17 47.99 275.73 48.16 275.73 48.39 228.17 48.22 228.17 47.99"/>
+                    <polygon class="cls-1" points="228.17 47.76 275.73 47.92 275.73 48.16 228.17 47.99 228.17 47.76"/>
+                    <polygon class="cls-1" points="228.17 47.52 275.73 47.69 275.73 47.92 228.17 47.76 228.17 47.52"/>
+                    <polygon class="cls-1" points="228.17 47.29 275.73 47.46 275.73 47.69 228.17 47.52 228.17 47.29"/>
+                    <polygon class="cls-1" points="228.17 47.06 275.73 47.23 275.73 47.46 228.17 47.29 228.17 47.06"/>
+                    <polygon class="cls-1" points="228.17 46.83 275.73 46.99 275.73 47.23 228.17 47.06 228.17 46.83"/>
+                    <polygon class="cls-1" points="228.17 46.59 275.73 46.76 275.73 46.99 228.17 46.83 228.17 46.59"/>
+                    <polygon class="cls-1" points="228.17 46.36 275.73 46.53 275.73 46.76 228.17 46.59 228.17 46.36"/>
+                    <polygon class="cls-1" points="228.17 46.13 275.73 46.29 275.73 46.53 228.17 46.36 228.17 46.13"/>
+                    <polygon class="cls-1" points="228.17 45.89 275.73 46.06 275.73 46.29 228.17 46.13 228.17 45.89"/>
+                    <polygon class="cls-1" points="228.17 45.66 275.73 45.83 275.73 46.06 228.17 45.89 228.17 45.66"/>
+                    <polygon class="cls-1" points="228.17 45.43 275.73 45.59 275.73 45.83 228.17 45.66 228.17 45.43"/>
+                    <polygon class="cls-1" points="228.17 45.2 275.73 45.36 275.73 45.59 228.17 45.43 228.17 45.2"/>
+                    <polygon class="cls-1" points="228.17 44.96 275.73 45.13 275.73 45.36 228.17 45.2 228.17 44.96"/>
+                    <polygon class="cls-1" points="228.17 44.73 275.73 44.9 275.73 45.13 228.17 44.96 228.17 44.73"/>
+                    <polygon class="cls-1" points="228.17 44.5 275.73 44.66 275.73 44.9 228.17 44.73 228.17 44.5"/>
+                    <polygon class="cls-1" points="228.17 44.26 275.73 44.43 275.73 44.66 228.17 44.5 228.17 44.26"/>
+                    <polygon class="cls-1" points="228.17 44.03 275.73 44.2 275.73 44.43 228.17 44.26 228.17 44.03"/>
+                    <polygon class="cls-1" points="228.17 43.8 275.73 43.96 275.73 44.2 228.17 44.03 228.17 43.8"/>
+                    <polygon class="cls-1" points="228.17 43.56 275.73 43.73 275.73 43.96 228.17 43.8 228.17 43.56"/>
+                    <polygon class="cls-1" points="228.17 43.33 275.73 43.5 275.73 43.73 228.17 43.56 228.17 43.33"/>
+                    <polygon class="cls-1" points="228.17 43.1 275.73 43.27 275.73 43.5 228.17 43.33 228.17 43.1"/>
+                    <polygon class="cls-1" points="228.17 42.87 275.73 43.03 275.73 43.27 228.17 43.1 228.17 42.87"/>
+                    <polygon class="cls-1" points="228.17 42.63 275.73 42.8 275.73 43.03 228.17 42.87 228.17 42.63"/>
+                    <polygon class="cls-1" points="228.17 42.4 275.73 42.57 275.73 42.8 228.17 42.63 228.17 42.4"/>
+                    <polygon class="cls-1" points="228.17 42.17 275.73 42.33 275.73 42.57 228.17 42.4 228.17 42.17"/>
+                    <polygon class="cls-1" points="228.17 41.93 275.73 42.1 275.73 42.33 228.17 42.17 228.17 41.93"/>
+                    <polygon class="cls-1" points="228.17 41.7 275.73 41.87 275.73 42.1 228.17 41.93 228.17 41.7"/>
+                    <polygon class="cls-1" points="228.17 41.47 275.73 41.63 275.73 41.87 228.17 41.7 228.17 41.47"/>
+                    <polygon class="cls-1" points="228.17 41.23 275.73 41.4 275.73 41.63 228.17 41.47 228.17 41.23"/>
+                    <polygon class="cls-1" points="228.17 41 275.73 41.17 275.73 41.4 228.17 41.23 228.17 41"/>
+                    <polygon class="cls-1" points="228.17 40.77 275.73 40.94 275.73 41.17 228.17 41 228.17 40.77"/>
+                    <polygon class="cls-1" points="228.17 40.54 275.73 40.7 275.73 40.94 228.17 40.77 228.17 40.54"/>
+                    <polygon class="cls-1" points="228.17 40.3 275.73 40.47 275.73 40.7 228.17 40.54 228.17 40.3"/>
+                    <polygon class="cls-1" points="228.17 40.07 275.73 40.24 275.73 40.47 228.17 40.3 228.17 40.07"/>
+                    <polygon class="cls-1" points="228.17 39.84 275.73 40 275.73 40.24 228.17 40.07 228.17 39.84"/>
+                    <polygon class="cls-1" points="228.17 39.6 275.73 39.77 275.73 40 228.17 39.84 228.17 39.6"/>
+                    <polygon class="cls-1" points="228.17 39.37 275.73 39.54 275.73 39.77 228.17 39.6 228.17 39.37"/>
+                    <polygon class="cls-1" points="228.17 39.14 275.73 39.3 275.73 39.54 228.17 39.37 228.17 39.14"/>
+                    <polygon class="cls-1" points="228.17 38.91 275.73 39.07 275.73 39.3 228.17 39.14 228.17 38.91"/>
+                    <polygon class="cls-1" points="228.17 38.67 275.73 38.84 275.73 39.07 228.17 38.91 228.17 38.67"/>
+                    <polygon class="cls-1" points="228.17 38.44 275.73 38.61 275.73 38.84 228.17 38.67 228.17 38.44"/>
+                    <polygon class="cls-1" points="228.17 38.21 275.73 38.37 275.73 38.61 228.17 38.44 228.17 38.21"/>
+                    <polygon class="cls-1" points="228.17 37.97 275.73 38.14 275.73 38.37 228.17 38.21 228.17 37.97"/>
+                    <polygon class="cls-1" points="228.17 37.74 275.73 37.91 275.73 38.14 228.17 37.97 228.17 37.74"/>
+                    <polygon class="cls-1" points="228.17 37.51 275.73 37.67 275.73 37.91 228.17 37.74 228.17 37.51"/>
+                    <polygon class="cls-1" points="228.17 37.27 275.73 37.44 275.73 37.67 228.17 37.51 228.17 37.27"/>
+                    <polygon class="cls-1" points="228.17 37.04 275.73 37.21 275.73 37.44 228.17 37.27 228.17 37.04"/>
+                    <polygon class="cls-1" points="228.17 36.81 275.73 36.98 275.73 37.21 228.17 37.04 228.17 36.81"/>
+                    <polygon class="cls-1" points="228.17 36.58 275.73 36.74 275.73 36.98 228.17 36.81 228.17 36.58"/>
+                    <polygon class="cls-1" points="228.17 36.34 275.73 36.51 275.73 36.74 228.17 36.58 228.17 36.34"/>
+                    <polygon class="cls-1" points="228.17 36.11 275.73 36.28 275.73 36.51 228.17 36.34 228.17 36.11"/>
+                    <polygon class="cls-1" points="228.17 35.88 275.73 36.04 275.73 36.28 228.17 36.11 228.17 35.88"/>
+                    <polygon class="cls-1" points="228.17 35.65 275.73 35.81 275.73 36.04 228.17 35.88 228.17 35.65"/>
+                    <polygon class="cls-1" points="228.17 35.41 275.73 35.58 275.73 35.81 228.17 35.65 228.17 35.41"/>
+                    <polygon class="cls-1" points="228.17 35.18 275.73 35.34 275.73 35.58 228.17 35.41 228.17 35.18"/>
+                    <polygon class="cls-1" points="228.17 34.95 275.73 35.11 275.73 35.34 228.17 35.18 228.17 34.95"/>
+                    <polygon class="cls-1" points="228.17 34.71 275.73 34.88 275.73 35.11 228.17 34.95 228.17 34.71"/>
+                    <polygon class="cls-1" points="228.17 34.48 275.73 34.65 275.73 34.88 228.17 34.71 228.17 34.48"/>
+                    <polygon class="cls-1" points="228.17 34.25 275.73 34.41 275.73 34.65 228.17 34.48 228.17 34.25"/>
+                    <polygon class="cls-1" points="228.17 34.01 275.73 34.18 275.73 34.41 228.17 34.25 228.17 34.01"/>
+                    <polygon class="cls-1" points="228.17 33.78 275.73 33.95 275.73 34.18 228.17 34.01 228.17 33.78"/>
+                    <polygon class="cls-1" points="228.17 33.55 275.73 33.71 275.73 33.95 228.17 33.78 228.17 33.55"/>
+                    <polygon class="cls-1" points="228.17 33.31 275.73 33.48 275.73 33.71 228.17 33.55 228.17 33.31"/>
+                    <polygon class="cls-1" points="228.17 33.08 275.73 33.25 275.73 33.48 228.17 33.31 228.17 33.08"/>
+                    <polygon class="cls-1" points="228.17 32.85 275.73 33.02 275.73 33.25 228.17 33.08 228.17 32.85"/>
+                    <polygon class="cls-1" points="228.17 32.62 275.73 32.78 275.73 33.02 228.17 32.85 228.17 32.62"/>
+                    <polygon class="cls-1" points="228.17 32.38 275.73 32.55 275.73 32.78 228.17 32.62 228.17 32.38"/>
+                    <polygon class="cls-1" points="228.17 32.15 275.73 32.32 275.73 32.55 228.17 32.38 228.17 32.15"/>
+                    <polygon class="cls-1" points="228.17 31.92 275.73 32.08 275.73 32.32 228.17 32.15 228.17 31.92"/>
+                    <polygon class="cls-1" points="228.17 31.68 275.73 31.85 275.73 32.08 228.17 31.92 228.17 31.68"/>
+                    <polygon class="cls-1" points="228.17 31.45 275.73 31.62 275.73 31.85 228.17 31.68 228.17 31.45"/>
+                    <polygon class="cls-1" points="228.17 31.22 275.73 31.39 275.73 31.62 228.17 31.45 228.17 31.22"/>
+                    <polygon class="cls-1" points="228.17 30.99 275.73 31.15 275.73 31.39 228.17 31.22 228.17 30.99"/>
+                    <polygon class="cls-1" points="228.17 30.75 275.73 30.92 275.73 31.15 228.17 30.99 228.17 30.75"/>
+                    <polygon class="cls-1" points="228.17 30.52 275.73 30.69 275.73 30.92 228.17 30.75 228.17 30.52"/>
+                    <polygon class="cls-1" points="228.17 30.29 275.73 30.45 275.73 30.69 228.17 30.52 228.17 30.29"/>
+                    <polygon class="cls-1" points="228.17 30.05 275.73 30.22 275.73 30.45 228.17 30.29 228.17 30.05"/>
+                    <polygon class="cls-1" points="228.17 29.82 275.73 29.99 275.73 30.22 228.17 30.05 228.17 29.82"/>
+                    <polygon class="cls-1" points="228.17 29.59 275.73 29.75 275.73 29.99 228.17 29.82 228.17 29.59"/>
+                    <polygon class="cls-1" points="228.17 29.36 275.73 29.52 275.73 29.75 228.17 29.59 228.17 29.36"/>
+                    <polygon class="cls-1" points="228.17 29.12 275.73 29.29 275.73 29.52 228.17 29.36 228.17 29.12"/>
+                    <polygon class="cls-1" points="228.17 28.89 275.73 29.06 275.73 29.29 228.17 29.12 228.17 28.89"/>
+                    <polygon class="cls-1" points="228.17 28.66 275.73 28.82 275.73 29.06 228.17 28.89 228.17 28.66"/>
+                    <polygon class="cls-1" points="275.73 28.82 228.17 28.66 228.17 27.83 275.73 27.83 275.73 28.82"/>
+                </g>
+                <path class="cls-1"
+                      d="M323.36,82.59h-9.74c-4,0-4.87-.23-6.32-2.85l-7.23-12.65-7,12.65c-1.44,2.39-2.2,2.85-6.31,2.85H277.4c-2.28,0-2.82-1.39-1.6-3.24l15.68-24.68L276.56,30.92c-1.14-1.7-.61-3.09,1.52-3.09h9.13c3.88,0,4.8.31,6.24,2.7l6.85,11.88,6.77-11.88c1.45-2.55,2.44-2.7,5.86-2.7h9.74c2.21,0,2.59,1.39,1.52,3.09L309.13,54.67,325,79.35C326.17,81.05,325.72,82.59,323.36,82.59Z"/>
+                <g class="cls-4">
+                    <polygon class="cls-1" points="274.58 82.42 323.27 82.59 274.58 82.59 274.58 82.42"/>
+                    <polygon class="cls-1"
+                             points="274.58 82.2 326.17 82.38 326.17 82.59 323.27 82.59 274.58 82.42 274.58 82.2"/>
+                    <polygon class="cls-1" points="274.58 81.99 326.17 82.17 326.17 82.38 274.58 82.2 274.58 81.99"/>
+                    <polygon class="cls-1" points="274.58 81.77 326.17 81.95 326.17 82.17 274.58 81.99 274.58 81.77"/>
+                    <polygon class="cls-1" points="274.58 81.55 326.17 81.73 326.17 81.95 274.58 81.77 274.58 81.55"/>
+                    <polygon class="cls-1" points="274.58 81.34 326.17 81.52 326.17 81.73 274.58 81.55 274.58 81.34"/>
+                    <polygon class="cls-1" points="274.58 81.12 326.17 81.3 326.17 81.52 274.58 81.34 274.58 81.12"/>
+                    <polygon class="cls-1" points="274.58 80.9 326.17 81.08 326.17 81.3 274.58 81.12 274.58 80.9"/>
+                    <polygon class="cls-1" points="274.58 80.69 326.17 80.87 326.17 81.08 274.58 80.9 274.58 80.69"/>
+                    <polygon class="cls-1" points="274.58 80.47 326.17 80.65 326.17 80.87 274.58 80.69 274.58 80.47"/>
+                    <polygon class="cls-1" points="274.58 80.25 326.17 80.44 326.17 80.65 274.58 80.47 274.58 80.25"/>
+                    <polygon class="cls-1" points="274.58 80.04 326.17 80.22 326.17 80.44 274.58 80.25 274.58 80.04"/>
+                    <polygon class="cls-1" points="274.58 79.82 326.17 80 326.17 80.22 274.58 80.04 274.58 79.82"/>
+                    <polygon class="cls-1" points="274.58 79.61 326.17 79.79 326.17 80 274.58 79.82 274.58 79.61"/>
+                    <polygon class="cls-1" points="274.58 79.39 326.17 79.57 326.17 79.79 274.58 79.61 274.58 79.39"/>
+                    <polygon class="cls-1" points="274.58 79.17 326.17 79.35 326.17 79.57 274.58 79.39 274.58 79.17"/>
+                    <polygon class="cls-1" points="274.58 78.96 326.17 79.14 326.17 79.35 274.58 79.17 274.58 78.96"/>
+                    <polygon class="cls-1" points="274.58 78.74 326.17 78.92 326.17 79.14 274.58 78.96 274.58 78.74"/>
+                    <polygon class="cls-1" points="274.58 78.52 326.17 78.7 326.17 78.92 274.58 78.74 274.58 78.52"/>
+                    <polygon class="cls-1" points="274.58 78.31 326.17 78.49 326.17 78.7 274.58 78.52 274.58 78.31"/>
+                    <polygon class="cls-1" points="274.58 78.09 326.17 78.27 326.17 78.49 274.58 78.31 274.58 78.09"/>
+                    <polygon class="cls-1" points="274.58 77.88 326.17 78.06 326.17 78.27 274.58 78.09 274.58 77.88"/>
+                    <polygon class="cls-1" points="274.58 77.66 326.17 77.84 326.17 78.06 274.58 77.88 274.58 77.66"/>
+                    <polygon class="cls-1" points="274.58 77.44 326.17 77.62 326.17 77.84 274.58 77.66 274.58 77.44"/>
+                    <polygon class="cls-1" points="274.58 77.23 326.17 77.41 326.17 77.62 274.58 77.44 274.58 77.23"/>
+                    <polygon class="cls-1" points="274.58 77.01 326.17 77.19 326.17 77.41 274.58 77.23 274.58 77.01"/>
+                    <polygon class="cls-1" points="274.58 76.79 326.17 76.97 326.17 77.19 274.58 77.01 274.58 76.79"/>
+                    <polygon class="cls-1" points="274.58 76.58 326.17 76.76 326.17 76.97 274.58 76.79 274.58 76.58"/>
+                    <polygon class="cls-1" points="274.58 76.36 326.17 76.54 326.17 76.76 274.58 76.58 274.58 76.36"/>
+                    <polygon class="cls-1" points="274.58 76.14 326.17 76.33 326.17 76.54 274.58 76.36 274.58 76.14"/>
+                    <polygon class="cls-1" points="274.58 75.93 326.17 76.11 326.17 76.33 274.58 76.14 274.58 75.93"/>
+                    <polygon class="cls-1" points="274.58 75.71 326.17 75.89 326.17 76.11 274.58 75.93 274.58 75.71"/>
+                    <polygon class="cls-1" points="274.58 75.5 326.17 75.68 326.17 75.89 274.58 75.71 274.58 75.5"/>
+                    <polygon class="cls-1" points="274.58 75.28 326.17 75.46 326.17 75.68 274.58 75.5 274.58 75.28"/>
+                    <polygon class="cls-1" points="274.58 75.06 326.17 75.24 326.17 75.46 274.58 75.28 274.58 75.06"/>
+                    <polygon class="cls-1" points="274.58 74.85 326.17 75.03 326.17 75.24 274.58 75.06 274.58 74.85"/>
+                    <polygon class="cls-1" points="274.58 74.63 326.17 74.81 326.17 75.03 274.58 74.85 274.58 74.63"/>
+                    <polygon class="cls-1" points="274.58 74.41 326.17 74.59 326.17 74.81 274.58 74.63 274.58 74.41"/>
+                    <polygon class="cls-1" points="274.58 74.2 326.17 74.38 326.17 74.59 274.58 74.41 274.58 74.2"/>
+                    <polygon class="cls-1" points="274.58 73.98 326.17 74.16 326.17 74.38 274.58 74.2 274.58 73.98"/>
+                    <polygon class="cls-1" points="274.58 73.77 326.17 73.94 326.17 74.16 274.58 73.98 274.58 73.77"/>
+                    <polygon class="cls-1" points="274.58 73.55 326.17 73.73 326.17 73.94 274.58 73.77 274.58 73.55"/>
+                    <polygon class="cls-1" points="274.58 73.33 326.17 73.51 326.17 73.73 274.58 73.55 274.58 73.33"/>
+                    <polygon class="cls-1" points="274.58 73.12 326.17 73.3 326.17 73.51 274.58 73.33 274.58 73.12"/>
+                    <polygon class="cls-1" points="274.58 72.9 326.17 73.08 326.17 73.3 274.58 73.12 274.58 72.9"/>
+                    <polygon class="cls-1" points="274.58 72.68 326.17 72.86 326.17 73.08 274.58 72.9 274.58 72.68"/>
+                    <polygon class="cls-1" points="274.58 72.47 326.17 72.65 326.17 72.86 274.58 72.68 274.58 72.47"/>
+                    <polygon class="cls-1" points="274.58 72.25 326.17 72.43 326.17 72.65 274.58 72.47 274.58 72.25"/>
+                    <polygon class="cls-1" points="274.58 72.03 326.17 72.22 326.17 72.43 274.58 72.25 274.58 72.03"/>
+                    <polygon class="cls-1" points="274.58 71.82 326.17 72 326.17 72.22 274.58 72.03 274.58 71.82"/>
+                    <polygon class="cls-1" points="274.58 71.6 326.17 71.78 326.17 72 274.58 71.82 274.58 71.6"/>
+                    <polygon class="cls-1" points="274.58 71.39 326.17 71.57 326.17 71.78 274.58 71.6 274.58 71.39"/>
+                    <polygon class="cls-1" points="274.58 71.17 326.17 71.35 326.17 71.57 274.58 71.39 274.58 71.17"/>
+                    <polygon class="cls-1" points="274.58 70.95 326.17 71.13 326.17 71.35 274.58 71.17 274.58 70.95"/>
+                    <polygon class="cls-1" points="274.58 70.74 326.17 70.92 326.17 71.13 274.58 70.95 274.58 70.74"/>
+                    <polygon class="cls-1" points="274.58 70.52 326.17 70.7 326.17 70.92 274.58 70.74 274.58 70.52"/>
+                    <polygon class="cls-1" points="274.58 70.3 326.17 70.48 326.17 70.7 274.58 70.52 274.58 70.3"/>
+                    <polygon class="cls-1" points="274.58 70.09 326.17 70.27 326.17 70.48 274.58 70.3 274.58 70.09"/>
+                    <polygon class="cls-1" points="274.58 69.87 326.17 70.05 326.17 70.27 274.58 70.09 274.58 69.87"/>
+                    <polygon class="cls-1" points="274.58 69.66 326.17 69.83 326.17 70.05 274.58 69.87 274.58 69.66"/>
+                    <polygon class="cls-1" points="274.58 69.44 326.17 69.62 326.17 69.83 274.58 69.66 274.58 69.44"/>
+                    <polygon class="cls-1" points="274.58 69.22 326.17 69.4 326.17 69.62 274.58 69.44 274.58 69.22"/>
+                    <polygon class="cls-1" points="274.58 69.01 326.17 69.19 326.17 69.4 274.58 69.22 274.58 69.01"/>
+                    <polygon class="cls-1" points="274.58 68.79 326.17 68.97 326.17 69.19 274.58 69.01 274.58 68.79"/>
+                    <polygon class="cls-1" points="274.58 68.57 326.17 68.75 326.17 68.97 274.58 68.79 274.58 68.57"/>
+                    <polygon class="cls-1" points="274.58 68.36 326.17 68.54 326.17 68.75 274.58 68.57 274.58 68.36"/>
+                    <polygon class="cls-1" points="274.58 68.14 326.17 68.32 326.17 68.54 274.58 68.36 274.58 68.14"/>
+                    <polygon class="cls-1" points="274.58 67.92 326.17 68.1 326.17 68.32 274.58 68.14 274.58 67.92"/>
+                    <polygon class="cls-1" points="274.58 67.71 326.17 67.89 326.17 68.1 274.58 67.92 274.58 67.71"/>
+                    <polygon class="cls-1" points="274.58 67.49 326.17 67.67 326.17 67.89 274.58 67.71 274.58 67.49"/>
+                    <polygon class="cls-1" points="274.58 67.28 326.17 67.46 326.17 67.67 274.58 67.49 274.58 67.28"/>
+                    <polygon class="cls-1" points="274.58 67.06 326.17 67.24 326.17 67.46 274.58 67.28 274.58 67.06"/>
+                    <polygon class="cls-1" points="274.58 66.84 326.17 67.02 326.17 67.24 274.58 67.06 274.58 66.84"/>
+                    <polygon class="cls-1" points="274.58 66.63 326.17 66.81 326.17 67.02 274.58 66.84 274.58 66.63"/>
+                    <polygon class="cls-1" points="274.58 66.41 326.17 66.59 326.17 66.81 274.58 66.63 274.58 66.41"/>
+                    <polygon class="cls-1" points="274.58 66.19 326.17 66.37 326.17 66.59 274.58 66.41 274.58 66.19"/>
+                    <polygon class="cls-1" points="274.58 65.98 326.17 66.16 326.17 66.37 274.58 66.19 274.58 65.98"/>
+                    <polygon class="cls-1" points="274.58 65.76 326.17 65.94 326.17 66.16 274.58 65.98 274.58 65.76"/>
+                    <polygon class="cls-1" points="274.58 65.54 326.17 65.72 326.17 65.94 274.58 65.76 274.58 65.54"/>
+                    <polygon class="cls-1" points="274.58 65.33 326.17 65.51 326.17 65.72 274.58 65.54 274.58 65.33"/>
+                    <polygon class="cls-1" points="274.58 65.11 326.17 65.29 326.17 65.51 274.58 65.33 274.58 65.11"/>
+                    <polygon class="cls-1" points="274.58 64.9 326.17 65.08 326.17 65.29 274.58 65.11 274.58 64.9"/>
+                    <polygon class="cls-1" points="274.58 64.68 326.17 64.86 326.17 65.08 274.58 64.9 274.58 64.68"/>
+                    <polygon class="cls-1" points="274.58 64.46 326.17 64.64 326.17 64.86 274.58 64.68 274.58 64.46"/>
+                    <polygon class="cls-1" points="274.58 64.25 326.17 64.43 326.17 64.64 274.58 64.46 274.58 64.25"/>
+                    <polygon class="cls-1" points="274.58 64.03 326.17 64.21 326.17 64.43 274.58 64.25 274.58 64.03"/>
+                    <polygon class="cls-1" points="274.58 63.81 326.17 63.99 326.17 64.21 274.58 64.03 274.58 63.81"/>
+                    <polygon class="cls-1" points="274.58 63.6 326.17 63.78 326.17 63.99 274.58 63.81 274.58 63.6"/>
+                    <polygon class="cls-1" points="274.58 63.38 326.17 63.56 326.17 63.78 274.58 63.6 274.58 63.38"/>
+                    <polygon class="cls-1" points="274.58 63.16 326.17 63.34 326.17 63.56 274.58 63.38 274.58 63.16"/>
+                    <polygon class="cls-1" points="274.58 62.95 326.17 63.13 326.17 63.34 274.58 63.16 274.58 62.95"/>
+                    <polygon class="cls-1" points="274.58 62.73 326.17 62.91 326.17 63.13 274.58 62.95 274.58 62.73"/>
+                    <polygon class="cls-1" points="274.58 62.52 326.17 62.7 326.17 62.91 274.58 62.73 274.58 62.52"/>
+                    <polygon class="cls-1" points="274.58 62.3 326.17 62.48 326.17 62.7 274.58 62.52 274.58 62.3"/>
+                    <polygon class="cls-1" points="274.58 62.08 326.17 62.26 326.17 62.48 274.58 62.3 274.58 62.08"/>
+                    <polygon class="cls-1" points="274.58 61.87 326.17 62.05 326.17 62.26 274.58 62.08 274.58 61.87"/>
+                    <polygon class="cls-1" points="274.58 61.65 326.17 61.83 326.17 62.05 274.58 61.87 274.58 61.65"/>
+                    <polygon class="cls-1" points="274.58 61.43 326.17 61.61 326.17 61.83 274.58 61.65 274.58 61.43"/>
+                    <polygon class="cls-1" points="274.58 61.22 326.17 61.4 326.17 61.61 274.58 61.43 274.58 61.22"/>
+                    <polygon class="cls-1" points="274.58 61 326.17 61.18 326.17 61.4 274.58 61.22 274.58 61"/>
+                    <polygon class="cls-1" points="274.58 60.78 326.17 60.97 326.17 61.18 274.58 61 274.58 60.78"/>
+                    <polygon class="cls-1" points="274.58 60.57 326.17 60.75 326.17 60.97 274.58 60.78 274.58 60.57"/>
+                    <polygon class="cls-1" points="274.58 60.35 326.17 60.53 326.17 60.75 274.58 60.57 274.58 60.35"/>
+                    <polygon class="cls-1" points="274.58 59.06 326.17 59.24 326.17 60.53 274.58 60.35 274.58 59.06"/>
+                    <polygon class="cls-1" points="274.58 57.77 326.17 57.95 326.17 59.24 274.58 59.06 274.58 57.77"/>
+                    <polygon class="cls-1" points="274.58 56.48 326.17 56.66 326.17 57.95 274.58 57.77 274.58 56.48"/>
+                    <polygon class="cls-1" points="274.58 55.19 326.17 55.37 326.17 56.66 274.58 56.48 274.58 55.19"/>
+                    <polygon class="cls-1" points="274.58 53.89 326.17 54.07 326.17 55.37 274.58 55.19 274.58 53.89"/>
+                    <polygon class="cls-1" points="274.58 52.6 326.17 52.78 326.17 54.07 274.58 53.89 274.58 52.6"/>
+                    <polygon class="cls-1" points="274.58 51.31 326.17 51.49 326.17 52.78 274.58 52.6 274.58 51.31"/>
+                    <polygon class="cls-1" points="274.58 50.02 326.17 50.2 326.17 51.49 274.58 51.31 274.58 50.02"/>
+                    <polygon class="cls-1" points="274.58 49.78 326.17 49.96 326.17 50.2 274.58 50.02 274.58 49.78"/>
+                    <polygon class="cls-1" points="274.58 49.55 326.17 49.73 326.17 49.96 274.58 49.78 274.58 49.55"/>
+                    <polygon class="cls-1" points="274.58 49.32 326.17 49.5 326.17 49.73 274.58 49.55 274.58 49.32"/>
+                    <polygon class="cls-1" points="274.58 49.09 326.17 49.27 326.17 49.5 274.58 49.32 274.58 49.09"/>
+                    <polygon class="cls-1" points="274.58 48.85 326.17 49.03 326.17 49.27 274.58 49.09 274.58 48.85"/>
+                    <polygon class="cls-1" points="274.58 48.62 326.17 48.8 326.17 49.03 274.58 48.85 274.58 48.62"/>
+                    <polygon class="cls-1" points="274.58 48.39 326.17 48.57 326.17 48.8 274.58 48.62 274.58 48.39"/>
+                    <polygon class="cls-1" points="274.58 48.15 326.17 48.33 326.17 48.57 274.58 48.39 274.58 48.15"/>
+                    <polygon class="cls-1" points="274.58 47.92 326.17 48.1 326.17 48.33 274.58 48.15 274.58 47.92"/>
+                    <polygon class="cls-1" points="274.58 47.69 326.17 47.87 326.17 48.1 274.58 47.92 274.58 47.69"/>
+                    <polygon class="cls-1" points="274.58 47.45 326.17 47.63 326.17 47.87 274.58 47.69 274.58 47.45"/>
+                    <polygon class="cls-1" points="274.58 47.22 326.17 47.4 326.17 47.63 274.58 47.45 274.58 47.22"/>
+                    <polygon class="cls-1" points="274.58 46.99 326.17 47.17 326.17 47.4 274.58 47.22 274.58 46.99"/>
+                    <polygon class="cls-1" points="274.58 46.76 326.17 46.94 326.17 47.17 274.58 46.99 274.58 46.76"/>
+                    <polygon class="cls-1" points="274.58 46.52 326.17 46.7 326.17 46.94 274.58 46.76 274.58 46.52"/>
+                    <polygon class="cls-1" points="274.58 46.29 326.17 46.47 326.17 46.7 274.58 46.52 274.58 46.29"/>
+                    <polygon class="cls-1" points="274.58 46.06 326.17 46.24 326.17 46.47 274.58 46.29 274.58 46.06"/>
+                    <polygon class="cls-1" points="274.58 45.82 326.17 46 326.17 46.24 274.58 46.06 274.58 45.82"/>
+                    <polygon class="cls-1" points="274.58 45.59 326.17 45.77 326.17 46 274.58 45.82 274.58 45.59"/>
+                    <polygon class="cls-1" points="274.58 45.36 326.17 45.54 326.17 45.77 274.58 45.59 274.58 45.36"/>
+                    <polygon class="cls-1" points="274.58 45.13 326.17 45.3 326.17 45.54 274.58 45.36 274.58 45.13"/>
+                    <polygon class="cls-1" points="274.58 44.89 326.17 45.07 326.17 45.3 274.58 45.13 274.58 44.89"/>
+                    <polygon class="cls-1" points="274.58 44.66 326.17 44.84 326.17 45.07 274.58 44.89 274.58 44.66"/>
+                    <polygon class="cls-1" points="274.58 44.43 326.17 44.61 326.17 44.84 274.58 44.66 274.58 44.43"/>
+                    <polygon class="cls-1" points="274.58 44.19 326.17 44.37 326.17 44.61 274.58 44.43 274.58 44.19"/>
+                    <polygon class="cls-1" points="274.58 43.96 326.17 44.14 326.17 44.37 274.58 44.19 274.58 43.96"/>
+                    <polygon class="cls-1" points="274.58 43.73 326.17 43.91 326.17 44.14 274.58 43.96 274.58 43.73"/>
+                    <polygon class="cls-1" points="274.58 43.49 326.17 43.67 326.17 43.91 274.58 43.73 274.58 43.49"/>
+                    <polygon class="cls-1" points="274.58 43.26 326.17 43.44 326.17 43.67 274.58 43.49 274.58 43.26"/>
+                    <polygon class="cls-1" points="274.58 43.03 326.17 43.21 326.17 43.44 274.58 43.26 274.58 43.03"/>
+                    <polygon class="cls-1" points="274.58 42.8 326.17 42.98 326.17 43.21 274.58 43.03 274.58 42.8"/>
+                    <polygon class="cls-1" points="274.58 42.56 326.17 42.74 326.17 42.98 274.58 42.8 274.58 42.56"/>
+                    <polygon class="cls-1" points="274.58 42.33 326.17 42.51 326.17 42.74 274.58 42.56 274.58 42.33"/>
+                    <polygon class="cls-1" points="274.58 42.1 326.17 42.28 326.17 42.51 274.58 42.33 274.58 42.1"/>
+                    <polygon class="cls-1" points="274.58 41.86 326.17 42.04 326.17 42.28 274.58 42.1 274.58 41.86"/>
+                    <polygon class="cls-1" points="274.58 41.63 326.17 41.81 326.17 42.04 274.58 41.86 274.58 41.63"/>
+                    <polygon class="cls-1" points="274.58 41.4 326.17 41.58 326.17 41.81 274.58 41.63 274.58 41.4"/>
+                    <polygon class="cls-1" points="274.58 41.16 326.17 41.34 326.17 41.58 274.58 41.4 274.58 41.16"/>
+                    <polygon class="cls-1" points="274.58 40.93 326.17 41.11 326.17 41.34 274.58 41.16 274.58 40.93"/>
+                    <polygon class="cls-1" points="274.58 40.7 326.17 40.88 326.17 41.11 274.58 40.93 274.58 40.7"/>
+                    <polygon class="cls-1" points="274.58 40.47 326.17 40.65 326.17 40.88 274.58 40.7 274.58 40.47"/>
+                    <polygon class="cls-1" points="274.58 40.23 326.17 40.41 326.17 40.65 274.58 40.47 274.58 40.23"/>
+                    <polygon class="cls-1" points="274.58 40 326.17 40.18 326.17 40.41 274.58 40.23 274.58 40"/>
+                    <polygon class="cls-1" points="274.58 39.77 326.17 39.95 326.17 40.18 274.58 40 274.58 39.77"/>
+                    <polygon class="cls-1" points="274.58 39.53 326.17 39.71 326.17 39.95 274.58 39.77 274.58 39.53"/>
+                    <polygon class="cls-1" points="274.58 39.3 326.17 39.48 326.17 39.71 274.58 39.53 274.58 39.3"/>
+                    <polygon class="cls-1" points="274.58 39.07 326.17 39.25 326.17 39.48 274.58 39.3 274.58 39.07"/>
+                    <polygon class="cls-1" points="274.58 38.84 326.17 39.02 326.17 39.25 274.58 39.07 274.58 38.84"/>
+                    <polygon class="cls-1" points="274.58 38.6 326.17 38.78 326.17 39.02 274.58 38.84 274.58 38.6"/>
+                    <polygon class="cls-1" points="274.58 38.37 326.17 38.55 326.17 38.78 274.58 38.6 274.58 38.37"/>
+                    <polygon class="cls-1" points="274.58 38.14 326.17 38.32 326.17 38.55 274.58 38.37 274.58 38.14"/>
+                    <polygon class="cls-1" points="274.58 37.9 326.17 38.08 326.17 38.32 274.58 38.14 274.58 37.9"/>
+                    <polygon class="cls-1" points="274.58 37.67 326.17 37.85 326.17 38.08 274.58 37.9 274.58 37.67"/>
+                    <polygon class="cls-1" points="274.58 37.44 326.17 37.62 326.17 37.85 274.58 37.67 274.58 37.44"/>
+                    <polygon class="cls-1" points="274.58 37.2 326.17 37.38 326.17 37.62 274.58 37.44 274.58 37.2"/>
+                    <polygon class="cls-1" points="274.58 36.97 326.17 37.15 326.17 37.38 274.58 37.2 274.58 36.97"/>
+                    <polygon class="cls-1" points="274.58 36.74 326.17 36.92 326.17 37.15 274.58 36.97 274.58 36.74"/>
+                    <polygon class="cls-1" points="274.58 36.51 326.17 36.69 326.17 36.92 274.58 36.74 274.58 36.51"/>
+                    <polygon class="cls-1" points="274.58 36.27 326.17 36.45 326.17 36.69 274.58 36.51 274.58 36.27"/>
+                    <polygon class="cls-1" points="274.58 36.04 326.17 36.22 326.17 36.45 274.58 36.27 274.58 36.04"/>
+                    <polygon class="cls-1" points="274.58 35.81 326.17 35.99 326.17 36.22 274.58 36.04 274.58 35.81"/>
+                    <polygon class="cls-1" points="274.58 35.57 326.17 35.75 326.17 35.99 274.58 35.81 274.58 35.57"/>
+                    <polygon class="cls-1" points="274.58 35.34 326.17 35.52 326.17 35.75 274.58 35.57 274.58 35.34"/>
+                    <polygon class="cls-1" points="274.58 35.11 326.17 35.29 326.17 35.52 274.58 35.34 274.58 35.11"/>
+                    <polygon class="cls-1" points="274.58 34.88 326.17 35.05 326.17 35.29 274.58 35.11 274.58 34.88"/>
+                    <polygon class="cls-1" points="274.58 34.64 326.17 34.82 326.17 35.05 274.58 34.88 274.58 34.64"/>
+                    <polygon class="cls-1" points="274.58 34.41 326.17 34.59 326.17 34.82 274.58 34.64 274.58 34.41"/>
+                    <polygon class="cls-1" points="274.58 34.18 326.17 34.36 326.17 34.59 274.58 34.41 274.58 34.18"/>
+                    <polygon class="cls-1" points="274.58 33.94 326.17 34.12 326.17 34.36 274.58 34.18 274.58 33.94"/>
+                    <polygon class="cls-1" points="274.58 33.71 326.17 33.89 326.17 34.12 274.58 33.94 274.58 33.71"/>
+                    <polygon class="cls-1" points="274.58 33.48 326.17 33.66 326.17 33.89 274.58 33.71 274.58 33.48"/>
+                    <polygon class="cls-1" points="274.58 33.24 326.17 33.42 326.17 33.66 274.58 33.48 274.58 33.24"/>
+                    <polygon class="cls-1" points="274.58 33.01 326.17 33.19 326.17 33.42 274.58 33.24 274.58 33.01"/>
+                    <polygon class="cls-1" points="274.58 32.78 326.17 32.96 326.17 33.19 274.58 33.01 274.58 32.78"/>
+                    <polygon class="cls-1" points="274.58 32.55 326.17 32.73 326.17 32.96 274.58 32.78 274.58 32.55"/>
+                    <polygon class="cls-1" points="274.58 32.31 326.17 32.49 326.17 32.73 274.58 32.55 274.58 32.31"/>
+                    <polygon class="cls-1" points="274.58 32.08 326.17 32.26 326.17 32.49 274.58 32.31 274.58 32.08"/>
+                    <polygon class="cls-1" points="274.58 31.85 326.17 32.03 326.17 32.26 274.58 32.08 274.58 31.85"/>
+                    <polygon class="cls-1" points="274.58 31.61 326.17 31.79 326.17 32.03 274.58 31.85 274.58 31.61"/>
+                    <polygon class="cls-1" points="274.58 31.38 326.17 31.56 326.17 31.79 274.58 31.61 274.58 31.38"/>
+                    <polygon class="cls-1" points="274.58 31.15 326.17 31.33 326.17 31.56 274.58 31.38 274.58 31.15"/>
+                    <polygon class="cls-1" points="274.58 30.91 326.17 31.09 326.17 31.33 274.58 31.15 274.58 30.91"/>
+                    <polygon class="cls-1" points="274.58 30.68 326.17 30.86 326.17 31.09 274.58 30.91 274.58 30.68"/>
+                    <polygon class="cls-1" points="274.58 30.45 326.17 30.63 326.17 30.86 274.58 30.68 274.58 30.45"/>
+                    <polygon class="cls-1" points="274.58 30.22 326.17 30.4 326.17 30.63 274.58 30.45 274.58 30.22"/>
+                    <polygon class="cls-1" points="274.58 29.98 326.17 30.16 326.17 30.4 274.58 30.22 274.58 29.98"/>
+                    <polygon class="cls-1" points="274.58 29.75 326.17 29.93 326.17 30.16 274.58 29.98 274.58 29.75"/>
+                    <polygon class="cls-1" points="274.58 29.52 326.17 29.7 326.17 29.93 274.58 29.75 274.58 29.52"/>
+                    <polygon class="cls-1" points="274.58 29.28 326.17 29.46 326.17 29.7 274.58 29.52 274.58 29.28"/>
+                    <polygon class="cls-1" points="274.58 29.05 326.17 29.23 326.17 29.46 274.58 29.28 274.58 29.05"/>
+                    <polygon class="cls-1" points="274.58 28.82 326.17 29 326.17 29.23 274.58 29.05 274.58 28.82"/>
+                    <polygon class="cls-1" points="326.17 29 274.58 28.82 274.58 27.83 326.17 27.83 326.17 29"/>
+                </g>
+                <path class="cls-1"
+                      d="M281.78,21.08h-.29c-.23,0-.3,0-.35-.17L280.41,19h-3.08l-.74,1.87c0,.13-.12.17-.35.17H276c-.16,0-.19-.06-.14-.18l2.64-6.67c0-.13.11-.16.25-.16h.3c.14,0,.2,0,.25.15l2.64,6.68C282,21,281.93,21.08,281.78,21.08ZM279,15.42a2.46,2.46,0,0,1-.14-.67h-.05a3,3,0,0,1-.12.67l-1.18,3h2.67Z"/>
+                <path class="cls-1"
+                      d="M290.42,16.28a2,2,0,0,1-2.22,2.18h-2.12v2.43c0,.15-.05.19-.19.19h-.33c-.15,0-.2,0-.2-.19v-6.6c0-.14.05-.19.2-.19h2.64A2,2,0,0,1,290.42,16.28Zm-.76,0a1.4,1.4,0,0,0-1.54-1.51h-2.05v3h2.05A1.4,1.4,0,0,0,289.66,16.28Z"/>
+                <path class="cls-1"
+                      d="M298.82,21.08h-.28c-.24,0-.31,0-.36-.17L297.45,19h-3.08l-.74,1.87c-.05.13-.11.17-.35.17H293c-.15,0-.18-.06-.13-.18l2.63-6.67c.05-.13.11-.16.25-.16h.31a.21.21,0,0,1,.24.15L299,20.9C299,21,299,21.08,298.82,21.08Zm-2.75-5.66a2.46,2.46,0,0,1-.14-.67h-.05a2.7,2.7,0,0,1-.13.67l-1.18,3h2.68Z"/>
+                <path class="cls-1"
+                      d="M304.75,14a2.37,2.37,0,0,1,2.62,1.68c.05.15,0,.21-.13.26l-.31.11c-.13,0-.19,0-.24-.12a1.73,1.73,0,0,0-1.94-1.27c-1.31,0-2,.67-2,1.8v2.34c0,1.12.7,1.8,2,1.8a1.74,1.74,0,0,0,1.95-1.3c.06-.13.12-.16.25-.12l.31.11c.14.05.17.11.12.25a2.39,2.39,0,0,1-2.63,1.72c-1.74,0-2.71-.93-2.71-2.47V16.43C302,14.89,303,14,304.75,14Z"/>
+                <path class="cls-1"
+                      d="M316.25,14.29v6.6c0,.15-.05.19-.2.19h-.32c-.15,0-.2,0-.2-.19v-3h-3.74v3c0,.15-.05.19-.2.19h-.32c-.15,0-.2,0-.2-.19v-6.6c0-.14.05-.19.2-.19h.32c.15,0,.2.05.2.19v2.92h3.74V14.29c0-.14.05-.19.2-.19h.32C316.2,14.1,316.25,14.15,316.25,14.29Z"/>
+                <path class="cls-1"
+                      d="M324.72,14.29v.28c0,.15-.05.2-.2.2h-3.47v2.44h3c.14,0,.19.05.19.19v.28c0,.15,0,.2-.19.2h-3v2.53h3.6c.13,0,.18.05.18.2v.28c0,.15-.05.19-.18.19h-4.12c-.14,0-.19,0-.19-.19v-6.6c0-.14.05-.19.19-.19h4C324.67,14.1,324.72,14.15,324.72,14.29Z"/>
+                <path class="cls-1" d="M71.18,83.58h0Z"/>
+                <path class="cls-1" d="M63.24,64s0,0,0,0S63.25,64,63.24,64Z"/>
+                <path class="cls-1" d="M61.12,82.93s0,0,0,.08h0l0,0Z"/>
+                <path class="cls-1" d="M59.69,69.29s.08.12,0,0Z"/>
+                <path class="cls-1" d="M52.11,65.19a.09.09,0,0,0,0,0s0,0,0,0S52.09,65.21,52.11,65.19Z"/>
+                <path class="cls-1" d="M50.38,2.18h0Z"/>
+                <rect class="cls-1" x="47.2" y="72.88" width="0.01" height="0.01"/>
+                <path class="cls-1" d="M46.28,6.58h0a7.14,7.14,0,0,0-.56.54A7.14,7.14,0,0,1,46.28,6.58Z"/>
+                <path class="cls-1" d="M41.39,80.56a2.77,2.77,0,0,1-.1.26"/>
+                <path class="cls-1" d="M63.24,64s0,0,0,0S63.25,64,63.24,64Z"/>
+                <path class="cls-1" d="M59.69,69.29s.08.12,0,0Z"/>
+                <path class="cls-1" d="M52.11,65.19a.09.09,0,0,0,0,0s0,0,0,0S52.09,65.21,52.11,65.19Z"/>
+                <path class="cls-1" d="M50.38,2.18h0Z"/>
+                <rect class="cls-1" x="47.2" y="72.88" width="0.01" height="0.01"/>
+                <path class="cls-1" d="M46.28,6.58h0a7.14,7.14,0,0,0-.56.54A7.14,7.14,0,0,1,46.28,6.58Z"/>
+                <path class="cls-1" d="M65,78.76l-.2,0c0,.14.06.29.09.42C65,79,65,78.89,65,78.76Z"/>
+                <path class="cls-1" d="M71.18,83.58h0Z"/>
+                <path class="cls-1" d="M63.24,64s0,0,0,0S63.25,64,63.24,64Z"/>
+                <path class="cls-1" d="M61.12,82.93s0,0,0,.08h0l0,0Z"/>
+                <path class="cls-1" d="M59.69,69.29s.08.12,0,0Z"/>
+                <path class="cls-1" d="M52.11,65.19a.09.09,0,0,0,0,0s0,0,0,0S52.09,65.21,52.11,65.19Z"/>
+                <path class="cls-1" d="M50.38,2.18h0Z"/>
+                <rect class="cls-1" x="47.2" y="72.88" width="0.01" height="0.01"/>
+                <path class="cls-1" d="M46.28,6.58h0a7.14,7.14,0,0,0-.56.54A7.14,7.14,0,0,1,46.28,6.58Z"/>
+                <path class="cls-1" d="M61.12,82.93s0,0,0,.08h0l0,0Z"/>
+                <path class="cls-1"
+                      d="M47.8,58a1.32,1.32,0,0,1,.83-.09h0s0,0,0-.08c-.81-.5-1.62-1-2.54-1.59a1.65,1.65,0,0,1-.28.6l2,1.21S47.78,58,47.8,58Z"/>
+                <g class="cls-5">
+                    <polygon class="cls-1" points="48.62 58.08 48.63 58.07 48.63 58.08 48.62 58.08"/>
+                    <polygon class="cls-1" points="48.34 58.08 48.63 57.7 48.63 58.07 48.62 58.08 48.34 58.08"/>
+                    <polygon class="cls-1" points="48.05 58.08 48.63 57.32 48.63 57.7 48.34 58.08 48.05 58.08"/>
+                    <polygon class="cls-1" points="47.77 58.08 48.63 56.95 48.63 57.32 48.05 58.08 47.77 58.08"/>
+                    <polygon class="cls-1" points="47.49 58.08 48.63 56.58 48.63 56.95 47.77 58.08 47.49 58.08"/>
+                    <polygon class="cls-1"
+                             points="47.2 58.08 48.58 56.27 48.63 56.27 48.63 56.58 47.49 58.08 47.2 58.08"/>
+                    <polygon class="cls-1" points="46.92 58.08 48.3 56.27 48.58 56.27 47.2 58.08 46.92 58.08"/>
+                    <polygon class="cls-1" points="46.63 58.08 48.01 56.27 48.3 56.27 46.92 58.08 46.63 58.08"/>
+                    <polygon class="cls-1" points="46.35 58.08 47.73 56.27 48.01 56.27 46.63 58.08 46.35 58.08"/>
+                    <polygon class="cls-1" points="46.06 58.08 47.45 56.27 47.73 56.27 46.35 58.08 46.06 58.08"/>
+                    <polygon class="cls-1"
+                             points="45.8 58.05 47.16 56.27 47.45 56.27 46.06 58.08 45.8 58.08 45.8 58.05"/>
+                    <polygon class="cls-1" points="45.8 57.67 46.88 56.27 47.16 56.27 45.8 58.05 45.8 57.67"/>
+                    <polygon class="cls-1" points="45.8 57.3 46.59 56.27 46.88 56.27 45.8 57.67 45.8 57.3"/>
+                    <polygon class="cls-1" points="45.8 56.93 46.31 56.27 46.59 56.27 45.8 57.3 45.8 56.93"/>
+                    <polygon class="cls-1" points="45.8 56.56 46.02 56.27 46.31 56.27 45.8 56.93 45.8 56.56"/>
+                    <polygon class="cls-1" points="46.02 56.27 45.8 56.56 45.8 56.27 46.02 56.27"/>
+                </g>
+                <path class="cls-1"
+                      d="M.71,22.52A23.24,23.24,0,0,0,4.2,28l3.72-1a44.55,44.55,0,0,1-3.84-4.84A2.07,2.07,0,0,1,4,22a2.14,2.14,0,0,1,.13.19,40.79,40.79,0,0,0,4,4.62,65.5,65.5,0,0,0,.73-7c-3.61-1.54-5.64-.6-5.64-.6S0,20.26.71,22.52Z"/>
+                <g class="cls-6">
+                    <polygon class="cls-1" points="0 26.86 8.77 26.47 8.77 28.04 0 28.04 0 26.86"/>
+                    <polygon class="cls-1" points="0 24.72 8.77 24.33 8.77 26.47 0 26.86 0 24.72"/>
+                    <polygon class="cls-1" points="0 22.58 8.77 22.19 8.77 24.33 0 24.72 0 22.58"/>
+                    <polygon class="cls-1" points="0 22.41 8.77 22.02 8.77 22.19 0 22.58 0 22.41"/>
+                    <polygon class="cls-1" points="0 22.25 8.77 21.86 8.77 22.02 0 22.41 0 22.25"/>
+                    <polygon class="cls-1" points="0 22.08 8.77 21.69 8.77 21.86 0 22.25 0 22.08"/>
+                    <polygon class="cls-1" points="0 21.92 8.77 21.53 8.77 21.69 0 22.08 0 21.92"/>
+                    <polygon class="cls-1" points="0 21.75 8.77 21.37 8.77 21.53 0 21.92 0 21.75"/>
+                    <polygon class="cls-1" points="0 21.59 8.77 21.2 8.77 21.37 0 21.75 0 21.59"/>
+                    <polygon class="cls-1" points="0 21.43 8.77 21.04 8.77 21.2 0 21.59 0 21.43"/>
+                    <polygon class="cls-1" points="0 21.26 8.77 20.87 8.77 21.04 0 21.43 0 21.26"/>
+                    <polygon class="cls-1" points="0 21.1 8.77 20.71 8.77 20.87 0 21.26 0 21.1"/>
+                    <polygon class="cls-1" points="0 20.93 8.77 20.55 8.77 20.71 0 21.1 0 20.93"/>
+                    <polygon class="cls-1" points="0 20.77 8.77 20.38 8.77 20.55 0 20.93 0 20.77"/>
+                    <polygon class="cls-1" points="0 20.61 8.77 20.22 8.77 20.38 0 20.77 0 20.61"/>
+                    <polygon class="cls-1" points="0 20.44 8.77 20.05 8.77 20.22 0 20.61 0 20.44"/>
+                    <polygon class="cls-1" points="0 20.28 8.77 19.89 8.77 20.05 0 20.44 0 20.28"/>
+                    <polygon class="cls-1" points="0 20.11 8.77 19.73 8.77 19.89 0 20.28 0 20.11"/>
+                    <polygon class="cls-1" points="0 19.95 8.77 19.56 8.77 19.73 0 20.11 0 19.95"/>
+                    <polygon class="cls-1" points="0 19.79 8.77 19.4 8.77 19.56 0 19.95 0 19.79"/>
+                    <polygon class="cls-1" points="0 19.62 8.77 19.23 8.77 19.4 0 19.79 0 19.62"/>
+                    <polygon class="cls-1" points="0 19.46 8.77 19.07 8.77 19.23 0 19.62 0 19.46"/>
+                    <polygon class="cls-1" points="0 19.29 8.77 18.9 8.77 19.07 0 19.46 0 19.29"/>
+                    <polygon class="cls-1" points="0 19.13 8.77 18.74 8.77 18.9 0 19.29 0 19.13"/>
+                    <polygon class="cls-1" points="0 18.96 8.77 18.58 8.77 18.74 0 19.13 0 18.96"/>
+                    <polygon class="cls-1" points="0 18.8 8.77 18.41 8.77 18.58 0 18.96 0 18.8"/>
+                    <polygon class="cls-1" points="0 18.64 8.46 18.26 8.77 18.26 8.77 18.41 0 18.8 0 18.64"/>
+                    <polygon class="cls-1" points="0 18.47 4.75 18.26 8.46 18.26 0 18.64 0 18.47"/>
+                    <polygon class="cls-1" points="0 18.31 1.05 18.26 4.75 18.26 0 18.47 0 18.31"/>
+                    <polygon class="cls-1" points="1.05 18.26 0 18.31 0 18.26 1.05 18.26"/>
+                </g>
+                <path class="cls-1" d="M19,29.86v0l0,.26v.05A2.45,2.45,0,0,0,19,29.86Z"/>
+                <path class="cls-1" d="M24.48,33c0,.15,0,.3,0,.45C24.47,33.33,24.48,33.18,24.48,33Z"/>
+                <polygon class="cls-1" points="24.45 33.6 24.45 33.6 24.45 33.59 24.45 33.6"/>
+                <path class="cls-1" d="M27.21,34.85c0,.23,0,.47,0,.72h0l0-.37C27.21,35.09,27.21,35,27.21,34.85Z"/>
+                <g class="cls-7">
+                    <path class="cls-1" d="M27.21,34.85c0,.23,0,.47,0,.72h0l0-.37C27.21,35.09,27.21,35,27.21,34.85Z"/>
+                </g>
+                <path class="cls-1" d="M24.45,33.59h0a.49.49,0,0,1,0-.12c0-.15,0-.3,0-.45l0,.56Z"/>
+                <g class="cls-7">
+                    <path class="cls-1" d="M24.45,33.59h0a.49.49,0,0,1,0-.12c0-.15,0-.3,0-.45l0,.56Z"/>
+                </g>
+                <path class="cls-1"
+                      d="M15.3,34.21c-.88-.77-1.73-1.53-2.55-2.3s-1.68-1.59-2.47-2.38l-.14-.14Q9,28.21,7.92,27.05L4.2,28l.4.51c.51.65,1.07,1.34,1.67,2s1.39,1.63,2.15,2.47,1.45,1.58,2.23,2.38,1.34,1.38,2,2.08l.08.07,5-1.24C17,35.64,16.12,34.92,15.3,34.21Z"/>
+                <g class="cls-8">
+                    <polygon class="cls-1" points="17.7 37.59 17.81 37.45 17.81 37.59 17.7 37.59"/>
+                    <polygon class="cls-1" points="17.48 37.59 17.81 37.17 17.81 37.45 17.7 37.59 17.48 37.59"/>
+                    <polygon class="cls-1" points="17.26 37.59 17.81 36.89 17.81 37.17 17.48 37.59 17.26 37.59"/>
+                    <polygon class="cls-1" points="17.04 37.59 17.81 36.61 17.81 36.89 17.26 37.59 17.04 37.59"/>
+                    <polygon class="cls-1" points="16.82 37.59 17.81 36.33 17.81 36.61 17.04 37.59 16.82 37.59"/>
+                    <polygon class="cls-1" points="16.6 37.59 17.81 36.04 17.81 36.33 16.82 37.59 16.6 37.59"/>
+                    <polygon class="cls-1" points="16.38 37.59 17.81 35.76 17.81 36.04 16.6 37.59 16.38 37.59"/>
+                    <polygon class="cls-1" points="16.16 37.59 17.81 35.48 17.81 35.76 16.38 37.59 16.16 37.59"/>
+                    <polygon class="cls-1" points="15.94 37.59 17.81 35.2 17.81 35.48 16.16 37.59 15.94 37.59"/>
+                    <polygon class="cls-1" points="15.72 37.59 17.81 34.91 17.81 35.2 15.94 37.59 15.72 37.59"/>
+                    <polygon class="cls-1" points="15.5 37.59 17.81 34.63 17.81 34.91 15.72 37.59 15.5 37.59"/>
+                    <polygon class="cls-1" points="15.28 37.59 17.81 34.35 17.81 34.63 15.5 37.59 15.28 37.59"/>
+                    <polygon class="cls-1" points="15.06 37.59 17.81 34.07 17.81 34.35 15.28 37.59 15.06 37.59"/>
+                    <polygon class="cls-1" points="14.84 37.59 17.81 33.79 17.81 34.07 15.06 37.59 14.84 37.59"/>
+                    <polygon class="cls-1" points="14.62 37.59 17.81 33.5 17.81 33.79 14.84 37.59 14.62 37.59"/>
+                    <polygon class="cls-1" points="14.4 37.59 17.81 33.22 17.81 33.5 14.62 37.59 14.4 37.59"/>
+                    <polygon class="cls-1" points="14.18 37.59 17.81 32.94 17.81 33.22 14.4 37.59 14.18 37.59"/>
+                    <polygon class="cls-1" points="13.96 37.59 17.81 32.66 17.81 32.94 14.18 37.59 13.96 37.59"/>
+                    <polygon class="cls-1"
+                             points="13.74 37.59 17.75 32.45 17.81 32.5 17.81 32.66 13.96 37.59 13.74 37.59"/>
+                    <polygon class="cls-1" points="13.52 37.59 17.61 32.35 17.75 32.45 13.74 37.59 13.52 37.59"/>
+                    <polygon class="cls-1" points="13.3 37.59 17.48 32.24 17.61 32.35 13.52 37.59 13.3 37.59"/>
+                    <polygon class="cls-1" points="13.08 37.59 17.34 32.13 17.48 32.24 13.3 37.59 13.08 37.59"/>
+                    <polygon class="cls-1" points="12.86 37.59 17.2 32.03 17.34 32.13 13.08 37.59 12.86 37.59"/>
+                    <polygon class="cls-1" points="12.63 37.59 17.07 31.92 17.2 32.03 12.86 37.59 12.63 37.59"/>
+                    <polygon class="cls-1" points="12.41 37.59 16.93 31.81 17.07 31.92 12.63 37.59 12.41 37.59"/>
+                    <polygon class="cls-1" points="12.19 37.59 16.79 31.71 16.93 31.81 12.41 37.59 12.19 37.59"/>
+                    <polygon class="cls-1" points="11.97 37.59 16.66 31.6 16.79 31.71 12.19 37.59 11.97 37.59"/>
+                    <polygon class="cls-1" points="11.75 37.59 16.52 31.49 16.66 31.6 11.97 37.59 11.75 37.59"/>
+                    <polygon class="cls-1" points="11.53 37.59 16.38 31.39 16.52 31.49 11.75 37.59 11.53 37.59"/>
+                    <polygon class="cls-1" points="11.31 37.59 16.25 31.28 16.38 31.39 11.53 37.59 11.31 37.59"/>
+                    <polygon class="cls-1" points="11.09 37.59 16.11 31.17 16.25 31.28 11.31 37.59 11.09 37.59"/>
+                    <polygon class="cls-1" points="10.87 37.59 15.97 31.07 16.11 31.17 11.09 37.59 10.87 37.59"/>
+                    <polygon class="cls-1" points="10.65 37.59 15.84 30.96 15.97 31.07 10.87 37.59 10.65 37.59"/>
+                    <polygon class="cls-1" points="10.43 37.59 15.7 30.85 15.84 30.96 10.65 37.59 10.43 37.59"/>
+                    <polygon class="cls-1" points="10.21 37.59 15.56 30.74 15.7 30.85 10.43 37.59 10.21 37.59"/>
+                    <polygon class="cls-1" points="9.99 37.59 15.43 30.64 15.56 30.74 10.21 37.59 9.99 37.59"/>
+                    <polygon class="cls-1" points="9.86 37.59 9.8 37.55 15.29 30.53 15.43 30.64 9.99 37.59 9.86 37.59"/>
+                    <rect class="cls-1" x="8.02" y="33.9" width="8.91" height="0.17"
+                          transform="translate(-21.99 22.9) rotate(-52)"/>
+                    <rect class="cls-1" x="7.89" y="33.79" width="8.91" height="0.17"
+                          transform="translate(-21.95 22.75) rotate(-52)"/>
+                    <rect class="cls-1" x="7.75" y="33.69" width="8.91" height="0.17"
+                          transform="translate(-21.92 22.6) rotate(-52)"/>
+                    <rect class="cls-1" x="7.61" y="33.58" width="8.91" height="0.17"
+                          transform="translate(-21.89 22.45) rotate(-52)"/>
+                    <rect class="cls-1" x="7.48" y="33.47" width="8.91" height="0.17"
+                          transform="translate(-21.86 22.3) rotate(-52)"/>
+                    <rect class="cls-1" x="7.34" y="33.36" width="8.91" height="0.17"
+                          transform="translate(-21.83 22.15) rotate(-52)"/>
+                    <rect class="cls-1" x="7.2" y="33.26" width="8.91" height="0.17"
+                          transform="translate(-21.8 22) rotate(-52)"/>
+                    <rect class="cls-1" x="7.07" y="33.15" width="8.91" height="0.17"
+                          transform="translate(-21.76 21.85) rotate(-52)"/>
+                    <rect class="cls-1" x="6.93" y="33.04" width="8.91" height="0.17"
+                          transform="translate(-21.73 21.7) rotate(-52)"/>
+                    <rect class="cls-1" x="6.79" y="32.94" width="8.91" height="0.17"
+                          transform="translate(-21.7 21.55) rotate(-52)"/>
+                    <rect class="cls-1" x="6.66" y="32.83" width="8.91" height="0.17"
+                          transform="translate(-21.67 21.41) rotate(-52)"/>
+                    <rect class="cls-1" x="6.52" y="32.72" width="8.91" height="0.17"
+                          transform="translate(-21.64 21.26) rotate(-52)"/>
+                    <rect class="cls-1" x="6.38" y="32.62" width="8.91" height="0.17"
+                          transform="translate(-21.61 21.11) rotate(-52)"/>
+                    <rect class="cls-1" x="6.24" y="32.51" width="8.91" height="0.17"
+                          transform="translate(-21.57 20.96) rotate(-52)"/>
+                    <rect class="cls-1" x="6.11" y="32.4" width="8.91" height="0.17"
+                          transform="translate(-21.54 20.81) rotate(-52)"/>
+                    <rect class="cls-1" x="5.97" y="32.3" width="8.91" height="0.17"
+                          transform="translate(-21.51 20.66) rotate(-52)"/>
+                    <rect class="cls-1" x="5.83" y="32.19" width="8.91" height="0.17"
+                          transform="translate(-21.48 20.51) rotate(-52)"/>
+                    <rect class="cls-1" x="5.7" y="32.08" width="8.91" height="0.17"
+                          transform="translate(-21.45 20.36) rotate(-52)"/>
+                    <rect class="cls-1" x="5.56" y="31.97" width="8.91" height="0.17"
+                          transform="translate(-21.42 20.21) rotate(-52)"/>
+                    <rect class="cls-1" x="5.42" y="31.87" width="8.91" height="0.17"
+                          transform="translate(-21.38 20.06) rotate(-52)"/>
+                    <rect class="cls-1" x="5.29" y="31.76" width="8.91" height="0.17"
+                          transform="translate(-21.35 19.92) rotate(-52)"/>
+                    <rect class="cls-1" x="5.15" y="31.65" width="8.91" height="0.17"
+                          transform="translate(-21.32 19.77) rotate(-52)"/>
+                    <rect class="cls-1" x="5.01" y="31.55" width="8.91" height="0.17"
+                          transform="translate(-21.29 19.62) rotate(-52)"/>
+                    <rect class="cls-1" x="4.88" y="31.44" width="8.91" height="0.17"
+                          transform="translate(-21.26 19.47) rotate(-52)"/>
+                    <rect class="cls-1" x="4.74" y="31.33" width="8.91" height="0.17"
+                          transform="translate(-21.23 19.32) rotate(-52)"/>
+                    <rect class="cls-1" x="4.6" y="31.23" width="8.91" height="0.17"
+                          transform="translate(-21.19 19.17) rotate(-52)"/>
+                    <rect class="cls-1" x="4.46" y="31.12" width="8.91" height="0.17"
+                          transform="translate(-21.16 19.02) rotate(-52)"/>
+                    <rect class="cls-1" x="4.33" y="31.01" width="8.91" height="0.17"
+                          transform="translate(-21.13 18.87) rotate(-52)"/>
+                    <rect class="cls-1" x="4.19" y="30.9" width="8.91" height="0.17"
+                          transform="translate(-21.1 18.72) rotate(-52)"/>
+                    <rect class="cls-1" x="4.05" y="30.8" width="8.91" height="0.17"
+                          transform="translate(-21.07 18.58) rotate(-52)"/>
+                    <rect class="cls-1" x="3.92" y="30.69" width="8.91" height="0.17"
+                          transform="translate(-21.04 18.43) rotate(-52)"/>
+                    <rect class="cls-1" x="3.78" y="30.58" width="8.91" height="0.17"
+                          transform="translate(-21 18.28) rotate(-52)"/>
+                    <polygon class="cls-1"
+                             points="5.42 34.13 5.29 34.02 10.73 27.05 10.83 27.05 10.91 27.11 5.42 34.13"/>
+                    <polygon class="cls-1" points="5.29 34.02 5.15 33.91 10.52 27.05 10.73 27.05 5.29 34.02"/>
+                    <polygon class="cls-1" points="5.15 33.91 5.01 33.81 10.29 27.05 10.52 27.05 5.15 33.91"/>
+                    <polygon class="cls-1" points="5.01 33.81 4.88 33.7 10.07 27.05 10.29 27.05 5.01 33.81"/>
+                    <polygon class="cls-1" points="4.88 33.7 4.74 33.59 9.85 27.05 10.07 27.05 4.88 33.7"/>
+                    <polygon class="cls-1" points="4.74 33.59 4.6 33.48 9.63 27.05 9.85 27.05 4.74 33.59"/>
+                    <polygon class="cls-1" points="4.6 33.48 4.46 33.38 9.41 27.05 9.63 27.05 4.6 33.48"/>
+                    <polygon class="cls-1" points="4.46 33.38 4.33 33.27 9.19 27.05 9.41 27.05 4.46 33.38"/>
+                    <polygon class="cls-1" points="4.33 33.27 4.2 33.17 4.2 33.16 8.97 27.05 9.19 27.05 4.33 33.27"/>
+                    <polygon class="cls-1" points="4.2 32.87 8.75 27.05 8.97 27.05 4.2 33.16 4.2 32.87"/>
+                    <polygon class="cls-1" points="4.2 32.59 8.53 27.05 8.75 27.05 4.2 32.87 4.2 32.59"/>
+                    <polygon class="cls-1" points="4.2 32.31 8.31 27.05 8.53 27.05 4.2 32.59 4.2 32.31"/>
+                    <polygon class="cls-1" points="4.2 32.03 8.09 27.05 8.31 27.05 4.2 32.31 4.2 32.03"/>
+                    <polygon class="cls-1" points="4.2 31.75 7.87 27.05 8.09 27.05 4.2 32.03 4.2 31.75"/>
+                    <polygon class="cls-1" points="4.2 31.46 7.65 27.05 7.87 27.05 4.2 31.75 4.2 31.46"/>
+                    <polygon class="cls-1" points="7.65 27.05 4.2 31.46 4.2 27.05 7.65 27.05"/>
+                </g>
+                <path class="cls-1"
+                      d="M38.35,50.5,40.68,52l0,0,.34.22,2.12,1.32A4.78,4.78,0,0,1,45.6,52.3a3.85,3.85,0,0,0-2.81.61c.92-3.28.74-6.34-1.35-8.38a5.09,5.09,0,0,0-.6-.52,3.27,3.27,0,0,1,.42,3.34h0A9.18,9.18,0,0,0,38.62,42c-.33-.33-.7-.66-1.12-1a7.42,7.42,0,0,1,.64,7.34l-.22,1.9Z"/>
+                <g class="cls-9">
+                    <polygon class="cls-1" points="45.57 53.56 45.6 53.51 45.6 53.56 45.57 53.56"/>
+                    <polygon class="cls-1" points="45.23 53.56 45.6 53.08 45.6 53.51 45.57 53.56 45.23 53.56"/>
+                    <polygon class="cls-1" points="44.89 53.56 45.6 52.65 45.6 53.08 45.23 53.56 44.89 53.56"/>
+                    <polygon class="cls-1" points="44.56 53.56 45.6 52.22 45.6 52.65 44.89 53.56 44.56 53.56"/>
+                    <polygon class="cls-1" points="44.22 53.56 45.6 51.79 45.6 52.22 44.56 53.56 44.22 53.56"/>
+                    <polygon class="cls-1" points="43.88 53.56 45.6 51.36 45.6 51.79 44.22 53.56 43.88 53.56"/>
+                    <polygon class="cls-1" points="43.55 53.56 45.6 50.93 45.6 51.36 43.88 53.56 43.55 53.56"/>
+                    <polygon class="cls-1" points="43.21 53.56 45.6 50.5 45.6 50.93 43.55 53.56 43.21 53.56"/>
+                    <polygon class="cls-1" points="42.87 53.56 45.6 50.07 45.6 50.5 43.21 53.56 42.87 53.56"/>
+                    <polygon class="cls-1" points="42.54 53.56 45.6 49.63 45.6 50.07 42.87 53.56 42.54 53.56"/>
+                    <polygon class="cls-1" points="42.2 53.56 45.6 49.2 45.6 49.63 42.54 53.56 42.2 53.56"/>
+                    <polygon class="cls-1" points="41.86 53.56 45.6 48.77 45.6 49.2 42.2 53.56 41.86 53.56"/>
+                    <polygon class="cls-1" points="41.53 53.56 45.6 48.34 45.6 48.77 41.86 53.56 41.53 53.56"/>
+                    <polygon class="cls-1" points="41.19 53.56 45.6 47.91 45.6 48.34 41.53 53.56 41.19 53.56"/>
+                    <polygon class="cls-1" points="40.85 53.56 45.6 47.48 45.6 47.91 41.19 53.56 40.85 53.56"/>
+                    <polygon class="cls-1" points="40.52 53.56 45.6 47.05 45.6 47.48 40.85 53.56 40.52 53.56"/>
+                    <polygon class="cls-1" points="40.18 53.56 45.6 46.62 45.6 47.05 40.52 53.56 40.18 53.56"/>
+                    <polygon class="cls-1" points="39.84 53.56 45.6 46.19 45.6 46.62 40.18 53.56 39.84 53.56"/>
+                    <polygon class="cls-1" points="39.51 53.56 45.6 45.76 45.6 46.19 39.84 53.56 39.51 53.56"/>
+                    <polygon class="cls-1"
+                             points="39.29 53.56 39.22 53.51 45.6 45.33 45.6 45.76 39.51 53.56 39.29 53.56"/>
+                    <polygon class="cls-1"
+                             points="39.22 53.51 39.01 53.34 45.53 44.99 45.6 45.05 45.6 45.33 39.22 53.51"/>
+                    <rect class="cls-1" x="36.86" y="48.95" width="10.6" height="0.27"
+                          transform="translate(-22.47 52.09) rotate(-52)"/>
+                    <rect class="cls-1" x="36.66" y="48.79" width="10.6" height="0.27"
+                          transform="translate(-22.42 51.87) rotate(-52)"/>
+                    <rect class="cls-1" x="36.45" y="48.62" width="10.6" height="0.27"
+                          transform="translate(-22.38 51.64) rotate(-52)"/>
+                    <rect class="cls-1" x="36.24" y="48.46" width="10.6" height="0.27"
+                          transform="translate(-22.33 51.41) rotate(-52)"/>
+                    <rect class="cls-1" x="36.03" y="48.3" width="10.6" height="0.27"
+                          transform="translate(-22.28 51.18) rotate(-52)"/>
+                    <rect class="cls-1" x="35.82" y="48.14" width="10.6" height="0.27"
+                          transform="translate(-22.23 50.96) rotate(-52)"/>
+                    <rect class="cls-1" x="35.61" y="47.97" width="10.6" height="0.27"
+                          transform="translate(-22.18 50.73) rotate(-52)"/>
+                    <polygon class="cls-1"
+                             points="37.54 52.2 37.5 52.16 37.5 51.82 43.86 43.68 44.07 43.85 37.54 52.2"/>
+                    <polygon class="cls-1" points="37.5 51.39 43.65 43.52 43.86 43.68 37.5 51.82 37.5 51.39"/>
+                    <polygon class="cls-1" points="37.5 50.96 43.44 43.36 43.65 43.52 37.5 51.39 37.5 50.96"/>
+                    <polygon class="cls-1" points="37.5 50.53 43.23 43.19 43.44 43.36 37.5 50.96 37.5 50.53"/>
+                    <polygon class="cls-1" points="37.5 50.1 43.02 43.03 43.23 43.19 37.5 50.53 37.5 50.1"/>
+                    <polygon class="cls-1" points="37.5 49.67 42.81 42.87 43.02 43.03 37.5 50.1 37.5 49.67"/>
+                    <polygon class="cls-1" points="37.5 49.24 42.61 42.7 42.81 42.87 37.5 49.67 37.5 49.24"/>
+                    <polygon class="cls-1" points="37.5 48.81 42.4 42.54 42.61 42.7 37.5 49.24 37.5 48.81"/>
+                    <polygon class="cls-1" points="37.5 48.38 42.19 42.38 42.4 42.54 37.5 48.81 37.5 48.38"/>
+                    <polygon class="cls-1" points="37.5 47.95 41.98 42.21 42.19 42.38 37.5 48.38 37.5 47.95"/>
+                    <polygon class="cls-1" points="37.5 47.52 41.77 42.05 41.98 42.21 37.5 47.95 37.5 47.52"/>
+                    <polygon class="cls-1" points="37.5 47.09 41.56 41.89 41.77 42.05 37.5 47.52 37.5 47.09"/>
+                    <polygon class="cls-1" points="37.5 46.66 41.35 41.72 41.56 41.89 37.5 47.09 37.5 46.66"/>
+                    <polygon class="cls-1" points="37.5 46.22 41.14 41.56 41.35 41.72 37.5 46.66 37.5 46.22"/>
+                    <polygon class="cls-1" points="37.5 45.79 40.93 41.4 41.14 41.56 37.5 46.22 37.5 45.79"/>
+                    <polygon class="cls-1" points="37.5 45.36 40.73 41.23 40.93 41.4 37.5 45.79 37.5 45.36"/>
+                    <polygon class="cls-1" points="37.5 44.93 40.52 41.07 40.73 41.23 37.5 45.36 37.5 44.93"/>
+                    <polygon class="cls-1" points="37.5 44.5 40.25 40.98 40.41 40.98 40.52 41.07 37.5 44.93 37.5 44.5"/>
+                    <polygon class="cls-1" points="37.5 44.07 39.91 40.98 40.25 40.98 37.5 44.5 37.5 44.07"/>
+                    <polygon class="cls-1" points="37.5 43.64 39.57 40.98 39.91 40.98 37.5 44.07 37.5 43.64"/>
+                    <polygon class="cls-1" points="37.5 43.21 39.24 40.98 39.57 40.98 37.5 43.64 37.5 43.21"/>
+                    <polygon class="cls-1" points="37.5 42.78 38.9 40.98 39.24 40.98 37.5 43.21 37.5 42.78"/>
+                    <polygon class="cls-1" points="37.5 42.35 38.56 40.98 38.9 40.98 37.5 42.78 37.5 42.35"/>
+                    <polygon class="cls-1" points="37.5 41.92 38.23 40.98 38.56 40.98 37.5 42.35 37.5 41.92"/>
+                    <polygon class="cls-1" points="37.5 41.48 37.89 40.98 38.23 40.98 37.5 41.92 37.5 41.48"/>
+                    <polygon class="cls-1" points="37.5 41.05 37.55 40.98 37.89 40.98 37.5 41.48 37.5 41.05"/>
+                    <polygon class="cls-1" points="37.55 40.98 37.5 41.05 37.5 40.98 37.55 40.98"/>
+                </g>
+                <path class="cls-1"
+                      d="M34.4,48.68c-.94-.64-1.89-1.29-2.84-2L28.8,44.77c-.93-.66-1.85-1.33-2.77-2s-1.87-1.39-2.8-2.1l-2.72-2.12-1-.77L17.9,36.42l-.09-.07-5,1.24a1.21,1.21,0,0,0,.16.16c.74.73,1.51,1.47,2.3,2.2s1.61,1.47,2.44,2.19,1.42,1.22,2.14,1.81l.44.35c.91.74,1.79,1.42,2.65,2s1.91,1.36,2.81,1.94c.59.38,1.16.74,1.71,1.07l1.42.81c1.12.62,2.25,1.19,3.38,1.7l5.07-1.24L35,49.11Z"/>
+                <g class="cls-10">
+                    <polygon class="cls-1" points="37.11 51.87 37.29 51.64 37.29 51.87 37.11 51.87"/>
+                    <polygon class="cls-1" points="36.91 51.87 37.29 51.37 37.29 51.64 37.11 51.87 36.91 51.87"/>
+                    <polygon class="cls-1" points="36.7 51.87 37.29 51.11 37.29 51.37 36.91 51.87 36.7 51.87"/>
+                    <polygon class="cls-1" points="36.5 51.87 37.29 50.85 37.29 51.11 36.7 51.87 36.5 51.87"/>
+                    <polygon class="cls-1" points="36.29 51.87 37.29 50.59 37.29 50.85 36.5 51.87 36.29 51.87"/>
+                    <polygon class="cls-1" points="36.09 51.87 37.29 50.33 37.29 50.59 36.29 51.87 36.09 51.87"/>
+                    <polygon class="cls-1" points="35.88 51.87 37.29 50.06 37.29 50.33 36.09 51.87 35.88 51.87"/>
+                    <polygon class="cls-1" points="35.68 51.87 37.29 49.8 37.29 50.06 35.88 51.87 35.68 51.87"/>
+                    <polygon class="cls-1" points="35.47 51.87 37.29 49.54 37.29 49.8 35.68 51.87 35.47 51.87"/>
+                    <polygon class="cls-1" points="35.27 51.87 37.29 49.28 37.29 49.54 35.47 51.87 35.27 51.87"/>
+                    <polygon class="cls-1" points="35.06 51.87 37.29 49.02 37.29 49.28 35.27 51.87 35.06 51.87"/>
+                    <polygon class="cls-1" points="34.86 51.87 37.29 48.75 37.29 49.02 35.06 51.87 34.86 51.87"/>
+                    <polygon class="cls-1" points="34.66 51.87 37.29 48.49 37.29 48.75 34.86 51.87 34.66 51.87"/>
+                    <polygon class="cls-1"
+                             points="34.45 51.87 37.23 48.3 37.29 48.34 37.29 48.49 34.66 51.87 34.45 51.87"/>
+                    <polygon class="cls-1" points="34.24 51.87 37.11 48.2 37.23 48.3 34.45 51.87 34.24 51.87"/>
+                    <polygon class="cls-1" points="34.04 51.87 36.98 48.1 37.11 48.2 34.24 51.87 34.04 51.87"/>
+                    <polygon class="cls-1" points="33.84 51.87 36.85 48 36.98 48.1 34.04 51.87 33.84 51.87"/>
+                    <polygon class="cls-1" points="33.63 51.87 36.73 47.9 36.85 48 33.84 51.87 33.63 51.87"/>
+                    <polygon class="cls-1" points="33.43 51.87 36.6 47.8 36.73 47.9 33.63 51.87 33.43 51.87"/>
+                    <polygon class="cls-1" points="33.22 51.87 36.47 47.7 36.6 47.8 33.43 51.87 33.22 51.87"/>
+                    <polygon class="cls-1" points="33.02 51.87 36.34 47.61 36.47 47.7 33.22 51.87 33.02 51.87"/>
+                    <polygon class="cls-1" points="32.81 51.87 36.22 47.51 36.34 47.61 33.02 51.87 32.81 51.87"/>
+                    <polygon class="cls-1" points="32.61 51.87 36.09 47.41 36.22 47.51 32.81 51.87 32.61 51.87"/>
+                    <polygon class="cls-1" points="32.4 51.87 35.96 47.31 36.09 47.41 32.61 51.87 32.4 51.87"/>
+                    <polygon class="cls-1" points="32.2 51.87 35.84 47.21 35.96 47.31 32.4 51.87 32.2 51.87"/>
+                    <polygon class="cls-1" points="31.99 51.87 35.71 47.11 35.84 47.21 32.2 51.87 31.99 51.87"/>
+                    <polygon class="cls-1" points="31.79 51.87 35.58 47.01 35.71 47.11 31.99 51.87 31.79 51.87"/>
+                    <polygon class="cls-1" points="31.58 51.87 35.45 46.91 35.58 47.01 31.79 51.87 31.58 51.87"/>
+                    <polygon class="cls-1" points="31.38 51.87 35.33 46.81 35.45 46.91 31.58 51.87 31.38 51.87"/>
+                    <polygon class="cls-1" points="31.17 51.87 35.2 46.71 35.33 46.81 31.38 51.87 31.17 51.87"/>
+                    <polygon class="cls-1" points="30.97 51.87 35.07 46.61 35.2 46.71 31.17 51.87 30.97 51.87"/>
+                    <polygon class="cls-1" points="30.77 51.87 34.95 46.51 35.07 46.61 30.97 51.87 30.77 51.87"/>
+                    <polygon class="cls-1" points="30.56 51.87 34.82 46.41 34.95 46.51 30.77 51.87 30.56 51.87"/>
+                    <polygon class="cls-1" points="30.36 51.87 34.69 46.31 34.82 46.41 30.56 51.87 30.36 51.87"/>
+                    <polygon class="cls-1" points="30.15 51.87 34.56 46.22 34.69 46.31 30.36 51.87 30.15 51.87"/>
+                    <polygon class="cls-1" points="29.95 51.87 34.44 46.12 34.56 46.22 30.15 51.87 29.95 51.87"/>
+                    <polygon class="cls-1" points="29.74 51.87 34.31 46.02 34.44 46.12 29.95 51.87 29.74 51.87"/>
+                    <polygon class="cls-1" points="29.54 51.87 34.18 45.92 34.31 46.02 29.74 51.87 29.54 51.87"/>
+                    <polygon class="cls-1" points="29.33 51.87 34.06 45.82 34.18 45.92 29.54 51.87 29.33 51.87"/>
+                    <polygon class="cls-1" points="29.13 51.87 33.93 45.72 34.06 45.82 29.33 51.87 29.13 51.87"/>
+                    <polygon class="cls-1" points="28.92 51.87 33.8 45.62 33.93 45.72 29.13 51.87 28.92 51.87"/>
+                    <polygon class="cls-1" points="28.72 51.87 33.67 45.52 33.8 45.62 28.92 51.87 28.72 51.87"/>
+                    <polygon class="cls-1" points="28.51 51.87 33.55 45.42 33.67 45.52 28.72 51.87 28.51 51.87"/>
+                    <polygon class="cls-1" points="28.31 51.87 33.42 45.32 33.55 45.42 28.51 51.87 28.31 51.87"/>
+                    <polygon class="cls-1" points="28.1 51.87 33.29 45.22 33.42 45.32 28.31 51.87 28.1 51.87"/>
+                    <polygon class="cls-1" points="27.9 51.87 33.17 45.12 33.29 45.22 28.1 51.87 27.9 51.87"/>
+                    <polygon class="cls-1" points="27.69 51.87 33.04 45.02 33.17 45.12 27.9 51.87 27.69 51.87"/>
+                    <polygon class="cls-1" points="27.49 51.87 32.91 44.92 33.04 45.02 27.69 51.87 27.49 51.87"/>
+                    <polygon class="cls-1" points="27.29 51.87 32.78 44.83 32.91 44.92 27.49 51.87 27.29 51.87"/>
+                    <polygon class="cls-1" points="27.08 51.87 32.66 44.73 32.78 44.83 27.29 51.87 27.08 51.87"/>
+                    <polygon class="cls-1"
+                             points="26.99 51.87 26.92 51.81 32.53 44.63 32.66 44.73 27.08 51.87 26.99 51.87"/>
+                    <rect class="cls-1" x="25.1" y="48.09" width="9.12" height="0.16"
+                          transform="translate(-26.56 41.89) rotate(-52)"/>
+                    <rect class="cls-1" x="24.98" y="47.99" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -26.53, 41.75)"/>
+                    <rect class="cls-1" x="24.85" y="47.89" width="9.12" height="0.16"
+                          transform="translate(-26.5 41.61) rotate(-52)"/>
+                    <rect class="cls-1" x="24.72" y="47.79" width="9.12" height="0.16"
+                          transform="translate(-26.47 41.47) rotate(-52)"/>
+                    <rect class="cls-1" x="24.59" y="47.69" width="9.12" height="0.16"
+                          transform="translate(-26.44 41.33) rotate(-52)"/>
+                    <rect class="cls-1" x="24.47" y="47.59" width="9.12" height="0.16"
+                          transform="translate(-26.41 41.2) rotate(-52)"/>
+                    <rect class="cls-1" x="24.34" y="47.49" width="9.12" height="0.16"
+                          transform="translate(-26.38 41.06) rotate(-52)"/>
+                    <rect class="cls-1" x="24.21" y="47.39" width="9.12" height="0.16"
+                          transform="translate(-26.35 40.92) rotate(-52)"/>
+                    <rect class="cls-1" x="24.09" y="47.29" width="9.12" height="0.16"
+                          transform="translate(-26.32 40.78) rotate(-52)"/>
+                    <rect class="cls-1" x="23.96" y="47.19" width="9.12" height="0.16"
+                          transform="translate(-26.29 40.64) rotate(-52)"/>
+                    <rect class="cls-1" x="23.83" y="47.09" width="9.12" height="0.16"
+                          transform="translate(-26.26 40.5) rotate(-52)"/>
+                    <rect class="cls-1" x="23.7" y="47" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -26.23, 40.37)"/>
+                    <rect class="cls-1" x="23.58" y="46.9" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -26.2, 40.23)"/>
+                    <rect class="cls-1" x="23.45" y="46.8" width="9.12" height="0.16"
+                          transform="translate(-26.18 40.09) rotate(-52)"/>
+                    <rect class="cls-1" x="23.32" y="46.7" width="9.12" height="0.16"
+                          transform="translate(-26.15 39.95) rotate(-52)"/>
+                    <rect class="cls-1" x="23.2" y="46.6" width="9.12" height="0.16"
+                          transform="translate(-26.12 39.81) rotate(-52)"/>
+                    <rect class="cls-1" x="23.07" y="46.5" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -26.09, 39.67)"/>
+                    <rect class="cls-1" x="22.94" y="46.4" width="9.12" height="0.16"
+                          transform="translate(-26.06 39.54) rotate(-52)"/>
+                    <rect class="cls-1" x="22.81" y="46.3" width="9.12" height="0.16"
+                          transform="translate(-26.03 39.4) rotate(-52)"/>
+                    <rect class="cls-1" x="22.69" y="46.2" width="9.12" height="0.16"
+                          transform="translate(-26 39.26) rotate(-52)"/>
+                    <rect class="cls-1" x="22.56" y="46.1" width="9.12" height="0.16"
+                          transform="translate(-25.97 39.12) rotate(-52)"/>
+                    <rect class="cls-1" x="22.43" y="46" width="9.12" height="0.16"
+                          transform="translate(-25.94 38.98) rotate(-52)"/>
+                    <rect class="cls-1" x="22.31" y="45.9" width="9.12" height="0.16"
+                          transform="translate(-25.91 38.84) rotate(-52)"/>
+                    <rect class="cls-1" x="22.18" y="45.8" width="9.12" height="0.16"
+                          transform="translate(-25.88 38.71) rotate(-52)"/>
+                    <rect class="cls-1" x="22.05" y="45.7" width="9.12" height="0.16"
+                          transform="translate(-25.85 38.57) rotate(-52)"/>
+                    <rect class="cls-1" x="21.92" y="45.6" width="9.12" height="0.16"
+                          transform="translate(-25.82 38.43) rotate(-52)"/>
+                    <rect class="cls-1" x="21.8" y="45.51" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.79, 38.29)"/>
+                    <rect class="cls-1" x="21.67" y="45.41" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.76, 38.15)"/>
+                    <rect class="cls-1" x="21.54" y="45.31" width="9.12" height="0.16"
+                          transform="translate(-25.73 38.01) rotate(-52)"/>
+                    <rect class="cls-1" x="21.42" y="45.21" width="9.12" height="0.16"
+                          transform="translate(-25.7 37.88) rotate(-52)"/>
+                    <rect class="cls-1" x="21.29" y="45.11" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.68, 37.74)"/>
+                    <rect class="cls-1" x="21.16" y="45.01" width="9.12" height="0.16"
+                          transform="translate(-25.65 37.6) rotate(-52)"/>
+                    <rect class="cls-1" x="21.03" y="44.91" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.62, 37.46)"/>
+                    <rect class="cls-1" x="20.91" y="44.81" width="9.12" height="0.16"
+                          transform="translate(-25.59 37.32) rotate(-52)"/>
+                    <rect class="cls-1" x="20.78" y="44.71" width="9.12" height="0.16"
+                          transform="translate(-25.56 37.18) rotate(-52)"/>
+                    <rect class="cls-1" x="20.65" y="44.61" width="9.12" height="0.16"
+                          transform="translate(-25.53 37.05) rotate(-52)"/>
+                    <rect class="cls-1" x="20.53" y="44.51" width="9.12" height="0.16"
+                          transform="translate(-25.5 36.91) rotate(-52)"/>
+                    <rect class="cls-1" x="20.4" y="44.41" width="9.12" height="0.16"
+                          transform="translate(-25.47 36.77) rotate(-52)"/>
+                    <rect class="cls-1" x="20.27" y="44.31" width="9.12" height="0.16"
+                          transform="translate(-25.44 36.63) rotate(-52)"/>
+                    <rect class="cls-1" x="20.14" y="44.21" width="9.12" height="0.16"
+                          transform="translate(-25.41 36.49) rotate(-52)"/>
+                    <rect class="cls-1" x="20.02" y="44.11" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.38, 36.35)"/>
+                    <rect class="cls-1" x="19.89" y="44.02" width="9.12" height="0.16"
+                          transform="translate(-25.35 36.21) rotate(-52)"/>
+                    <rect class="cls-1" x="19.76" y="43.92" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.32, 36.08)"/>
+                    <rect class="cls-1" x="19.64" y="43.82" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.29, 35.94)"/>
+                    <rect class="cls-1" x="19.51" y="43.72" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.26, 35.8)"/>
+                    <rect class="cls-1" x="19.38" y="43.62" width="9.12" height="0.16"
+                          transform="translate(-25.23 35.66) rotate(-52)"/>
+                    <rect class="cls-1" x="19.25" y="43.52" width="9.12" height="0.16"
+                          transform="translate(-25.21 35.52) rotate(-52)"/>
+                    <rect class="cls-1" x="19.13" y="43.42" width="9.12" height="0.16"
+                          transform="translate(-25.18 35.38) rotate(-52)"/>
+                    <rect class="cls-1" x="19" y="43.32" width="9.12" height="0.16"
+                          transform="translate(-25.15 35.25) rotate(-52)"/>
+                    <rect class="cls-1" x="18.87" y="43.22" width="9.12" height="0.16"
+                          transform="translate(-25.12 35.11) rotate(-52)"/>
+                    <rect class="cls-1" x="18.75" y="43.12" width="9.12" height="0.16"
+                          transform="translate(-25.09 34.97) rotate(-52)"/>
+                    <rect class="cls-1" x="18.62" y="43.02" width="9.12" height="0.16"
+                          transform="translate(-25.06 34.83) rotate(-52)"/>
+                    <rect class="cls-1" x="18.49" y="42.92" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.03, 34.69)"/>
+                    <rect class="cls-1" x="18.37" y="42.82" width="9.12" height="0.16"
+                          transform="translate(-25 34.55) rotate(-52)"/>
+                    <rect class="cls-1" x="18.24" y="42.72" width="9.12" height="0.16"
+                          transform="translate(-24.97 34.42) rotate(-52)"/>
+                    <rect class="cls-1" x="18.11" y="42.63" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -24.94, 34.28)"/>
+                    <rect class="cls-1" x="17.98" y="42.53" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -24.91, 34.14)"/>
+                    <rect class="cls-1" x="17.86" y="42.43" width="9.12" height="0.16"
+                          transform="translate(-24.88 34) rotate(-52)"/>
+                    <rect class="cls-1" x="17.73" y="42.33" width="9.12" height="0.16"
+                          transform="translate(-24.85 33.86) rotate(-52)"/>
+                    <rect class="cls-1" x="17.6" y="42.23" width="9.12" height="0.16"
+                          transform="translate(-24.82 33.72) rotate(-52)"/>
+                    <rect class="cls-1" x="17.48" y="42.13" width="9.12" height="0.16"
+                          transform="translate(-24.79 33.59) rotate(-52)"/>
+                    <rect class="cls-1" x="17.35" y="42.03" width="9.12" height="0.16"
+                          transform="translate(-24.76 33.45) rotate(-52)"/>
+                    <rect class="cls-1" x="17.22" y="41.93" width="9.12" height="0.16"
+                          transform="translate(-24.73 33.31) rotate(-52)"/>
+                    <rect class="cls-1" x="17.09" y="41.83" width="9.12" height="0.16"
+                          transform="translate(-24.71 33.17) rotate(-52)"/>
+                    <rect class="cls-1" x="16.97" y="41.73" width="9.12" height="0.16"
+                          transform="translate(-24.68 33.03) rotate(-52)"/>
+                    <rect class="cls-1" x="16.52" y="40.98" width="9.12" height="0.96"
+                          transform="translate(-24.57 32.55) rotate(-52)"/>
+                    <rect class="cls-1" x="15.76" y="40.39" width="9.12" height="0.96"
+                          transform="translate(-24.4 31.72) rotate(-52)"/>
+                    <rect class="cls-1" x="15" y="39.8" width="9.12" height="0.96"
+                          transform="translate(-24.22 30.9) rotate(-52)"/>
+                    <polygon class="cls-1"
+                             points="16.38 43.57 15.62 42.98 20.8 36.35 21.94 36.35 21.99 36.39 16.38 43.57"/>
+                    <polygon class="cls-1" points="15.62 42.98 14.86 42.39 19.58 36.35 20.8 36.35 15.62 42.98"/>
+                    <polygon class="cls-1" points="14.86 42.39 14.1 41.8 18.35 36.35 19.58 36.35 14.86 42.39"/>
+                    <polygon class="cls-1" points="14.1 41.8 13.34 41.2 17.13 36.35 18.35 36.35 14.1 41.8"/>
+                    <polygon class="cls-1"
+                             points="13.34 41.2 12.77 40.76 12.77 40.37 15.91 36.35 17.13 36.35 13.34 41.2"/>
+                    <polygon class="cls-1" points="12.77 40.09 15.69 36.35 15.91 36.35 12.77 40.37 12.77 40.09"/>
+                    <polygon class="cls-1" points="12.77 39.8 15.47 36.35 15.69 36.35 12.77 40.09 12.77 39.8"/>
+                    <polygon class="cls-1" points="12.77 39.52 15.25 36.35 15.47 36.35 12.77 39.8 12.77 39.52"/>
+                    <polygon class="cls-1" points="12.77 39.24 15.03 36.35 15.25 36.35 12.77 39.52 12.77 39.24"/>
+                    <polygon class="cls-1" points="12.77 38.96 14.8 36.35 15.03 36.35 12.77 39.24 12.77 38.96"/>
+                    <polygon class="cls-1" points="12.77 38.68 14.59 36.35 14.8 36.35 12.77 38.96 12.77 38.68"/>
+                    <polygon class="cls-1" points="12.77 38.39 14.37 36.35 14.59 36.35 12.77 38.68 12.77 38.39"/>
+                    <polygon class="cls-1" points="12.77 38.11 14.14 36.35 14.37 36.35 12.77 38.39 12.77 38.11"/>
+                    <polygon class="cls-1" points="12.77 37.83 13.92 36.35 14.14 36.35 12.77 38.11 12.77 37.83"/>
+                    <polygon class="cls-1" points="12.77 37.55 13.7 36.35 13.92 36.35 12.77 37.83 12.77 37.55"/>
+                    <polygon class="cls-1" points="12.77 37.27 13.48 36.35 13.7 36.35 12.77 37.55 12.77 37.27"/>
+                    <polygon class="cls-1" points="12.77 36.98 13.26 36.35 13.48 36.35 12.77 37.27 12.77 36.98"/>
+                    <polygon class="cls-1" points="12.77 36.7 13.04 36.35 13.26 36.35 12.77 36.98 12.77 36.7"/>
+                    <polygon class="cls-1" points="12.77 36.42 12.82 36.35 13.04 36.35 12.77 36.7 12.77 36.42"/>
+                    <polygon class="cls-1" points="12.82 36.35 12.77 36.42 12.77 36.35 12.82 36.35"/>
+                </g>
+                <path class="cls-1"
+                      d="M32.38,51.94a35.59,35.59,0,0,0,4.19,1.59l.15,0a9.39,9.39,0,0,0-2.87,2.11,13.22,13.22,0,0,1,6.51-1.21,6,6,0,0,1-1.17,2.8,6.07,6.07,0,0,0,2.09-2.14A7.3,7.3,0,0,0,42.2,59a7.63,7.63,0,0,1,.19-4.26C46,57,45,56.36,48.1,58.16c.1.05.29,0,.4,0,.34.19,1,.77,1.4,1a1.14,1.14,0,0,0-.58-1c-.88-.5-.78-.29-8.25-5.09l-.64-.41-.18-.12c-.78-.5-1.58-1-2.39-1.56l-.56-.37h0l-5.07,1.24Z"/>
+                <g class="cls-11">
+                    <path class="cls-1"
+                          d="M53.16,59.69A10.3,10.3,0,0,1,55.88,61V59.89l-2.24-1.74-1,1.27A5.12,5.12,0,0,0,53.16,59.69Z"/>
+                    <path class="cls-1"
+                          d="M53.09,62.25a14.26,14.26,0,0,1-1.83-1L50,62.82h4.35C53.92,62.64,53.5,62.46,53.09,62.25Z"/>
+                    <path class="cls-1" d="M47.76,59.73l-2.41,3.09h.29l2.34-3A.73.73,0,0,1,47.76,59.73Z"/>
+                    <path class="cls-1" d="M47.6,59.55l-2.55,3.27h.3l2.41-3.09A.55.55,0,0,1,47.6,59.55Z"/>
+                    <path class="cls-1" d="M47.51,59.29l-2.76,3.53h.3l2.55-3.27A.62.62,0,0,1,47.51,59.29Z"/>
+                    <path class="cls-1" d="M47.59,58.81l-3.13,4h.29l2.76-3.53A.91.91,0,0,1,47.59,58.81Z"/>
+                    <path class="cls-1"
+                          d="M47.91,58.4l2.29-2.94L50,55.32l-5.86,7.5h.3l3.13-4A.92.92,0,0,1,47.91,58.4Z"/>
+                    <polygon class="cls-1" points="43.86 62.82 49.83 55.17 50.02 55.32 44.16 62.82 43.86 62.82"/>
+                    <polygon class="cls-1" points="43.57 62.82 49.65 55.03 49.83 55.17 43.86 62.82 43.57 62.82"/>
+                    <polygon class="cls-1" points="43.27 62.82 49.47 54.88 49.65 55.03 43.57 62.82 43.27 62.82"/>
+                    <polygon class="cls-1" points="42.97 62.82 49.28 54.74 49.47 54.88 43.27 62.82 42.97 62.82"/>
+                    <polygon class="cls-1" points="42.68 62.82 49.1 54.6 49.28 54.74 42.97 62.82 42.68 62.82"/>
+                    <polygon class="cls-1" points="42.38 62.82 48.91 54.45 49.1 54.6 42.68 62.82 42.38 62.82"/>
+                    <polygon class="cls-1" points="42.08 62.82 48.73 54.31 48.91 54.45 42.38 62.82 42.08 62.82"/>
+                    <polygon class="cls-1" points="41.78 62.82 48.54 54.16 48.73 54.31 42.08 62.82 41.78 62.82"/>
+                    <polygon class="cls-1" points="41.49 62.82 48.36 54.02 48.54 54.16 41.78 62.82 41.49 62.82"/>
+                    <polygon class="cls-1" points="41.19 62.82 48.18 53.88 48.36 54.02 41.49 62.82 41.19 62.82"/>
+                    <polygon class="cls-1" points="40.9 62.82 47.99 53.73 48.18 53.88 41.19 62.82 40.9 62.82"/>
+                    <polygon class="cls-1" points="40.6 62.82 47.81 53.59 47.99 53.73 40.9 62.82 40.6 62.82"/>
+                    <polygon class="cls-1" points="40.3 62.82 47.62 53.45 47.81 53.59 40.6 62.82 40.3 62.82"/>
+                    <polygon class="cls-1"
+                             points="40.05 62.82 40.02 62.79 47.44 53.3 47.62 53.45 40.3 62.82 40.05 62.82"/>
+                    <rect class="cls-1" x="37.62" y="57.86" width="12.04" height="0.23"
+                          transform="translate(-28.91 56.67) rotate(-52)"/>
+                    <rect class="cls-1" x="37.43" y="57.71" width="12.04" height="0.23"
+                          transform="translate(-28.87 56.47) rotate(-52)"/>
+                    <rect class="cls-1" x="37.25" y="57.57" width="12.04" height="0.23"
+                          transform="translate(-28.83 56.27) rotate(-52)"/>
+                    <rect class="cls-1" x="37.06" y="57.43" width="12.04" height="0.23"
+                          transform="translate(-28.79 56.07) rotate(-52)"/>
+                    <rect class="cls-1" x="36.88" y="57.28" width="12.04" height="0.23"
+                          transform="translate(-28.74 55.87) rotate(-52)"/>
+                    <rect class="cls-1" x="36.7" y="57.14" width="12.04" height="0.23"
+                          transform="translate(-28.7 55.67) rotate(-52)"/>
+                    <rect class="cls-1" x="36.51" y="56.99" width="12.04" height="0.23"
+                          transform="translate(-28.66 55.47) rotate(-52)"/>
+                    <rect class="cls-1" x="36.33" y="56.85" width="12.04" height="0.23"
+                          transform="translate(-28.61 55.27) rotate(-52)"/>
+                    <rect class="cls-1" x="36.14" y="56.71" width="12.04" height="0.23"
+                          transform="translate(-28.57 55.07) rotate(-52)"/>
+                    <rect class="cls-1" x="35.96" y="56.56" width="12.04" height="0.23"
+                          transform="translate(-28.53 54.87) rotate(-52)"/>
+                    <rect class="cls-1" x="35.77" y="56.42" width="12.04" height="0.23"
+                          transform="translate(-28.49 54.67) rotate(-52)"/>
+                    <rect class="cls-1" x="35.59" y="56.27" width="12.04" height="0.23"
+                          transform="translate(-28.44 54.47) rotate(-52)"/>
+                    <rect class="cls-1" x="35.41" y="56.13" width="12.04" height="0.23"
+                          transform="translate(-28.4 54.27) rotate(-52)"/>
+                    <rect class="cls-1" x="35.22" y="55.99" width="12.04" height="0.23"
+                          transform="translate(-28.36 54.06) rotate(-52)"/>
+                    <rect class="cls-1" x="35.04" y="55.84" width="12.04" height="0.23"
+                          transform="translate(-28.32 53.86) rotate(-52)"/>
+                    <rect class="cls-1" x="34.85" y="55.7" width="12.04" height="0.23"
+                          transform="translate(-28.27 53.66) rotate(-52)"/>
+                    <rect class="cls-1" x="34.67" y="55.55" width="12.04" height="0.23"
+                          transform="translate(-28.23 53.46) rotate(-52)"/>
+                    <rect class="cls-1" x="34.48" y="55.41" width="12.04" height="0.23"
+                          transform="translate(-28.19 53.26) rotate(-52)"/>
+                    <polygon class="cls-1" points="36.71 60.2 36.52 60.06 43.9 50.62 44 50.62 44.12 50.71 36.71 60.2"/>
+                    <polygon class="cls-1" points="36.52 60.06 36.34 59.91 43.6 50.62 43.9 50.62 36.52 60.06"/>
+                    <polygon class="cls-1" points="36.34 59.91 36.15 59.77 43.3 50.62 43.6 50.62 36.34 59.91"/>
+                    <polygon class="cls-1" points="36.15 59.77 35.97 59.63 43.01 50.62 43.3 50.62 36.15 59.77"/>
+                    <polygon class="cls-1" points="35.97 59.63 35.78 59.48 42.71 50.62 43.01 50.62 35.97 59.63"/>
+                    <polygon class="cls-1" points="35.78 59.48 35.6 59.34 42.41 50.62 42.71 50.62 35.78 59.48"/>
+                    <polygon class="cls-1" points="35.6 59.34 35.42 59.19 42.12 50.62 42.41 50.62 35.6 59.34"/>
+                    <polygon class="cls-1" points="35.42 59.19 35.23 59.05 41.82 50.62 42.12 50.62 35.42 59.19"/>
+                    <polygon class="cls-1" points="35.23 59.05 35.05 58.91 41.52 50.62 41.82 50.62 35.23 59.05"/>
+                    <polygon class="cls-1" points="35.05 58.91 34.86 58.76 41.23 50.62 41.52 50.62 35.05 58.91"/>
+                    <polygon class="cls-1" points="34.86 58.76 34.68 58.62 40.93 50.62 41.23 50.62 34.86 58.76"/>
+                    <polygon class="cls-1" points="34.68 58.62 34.49 58.47 40.63 50.62 40.93 50.62 34.68 58.62"/>
+                    <polygon class="cls-1" points="34.49 58.47 34.31 58.33 40.34 50.62 40.63 50.62 34.49 58.47"/>
+                    <polygon class="cls-1" points="34.31 58.33 34.13 58.19 40.04 50.62 40.34 50.62 34.31 58.33"/>
+                    <polygon class="cls-1" points="34.13 58.19 33.94 58.04 39.74 50.62 40.04 50.62 34.13 58.19"/>
+                    <polygon class="cls-1" points="33.94 58.04 33.76 57.9 39.45 50.62 39.74 50.62 33.94 58.04"/>
+                    <polygon class="cls-1" points="33.76 57.9 33.57 57.75 39.15 50.62 39.45 50.62 33.76 57.9"/>
+                    <polygon class="cls-1" points="33.57 57.75 33.39 57.61 38.85 50.62 39.15 50.62 33.57 57.75"/>
+                    <polygon class="cls-1" points="33.39 57.61 33.2 57.47 38.56 50.62 38.85 50.62 33.39 57.61"/>
+                    <polygon class="cls-1" points="33.2 57.47 33.02 57.32 38.26 50.62 38.56 50.62 33.2 57.47"/>
+                    <polygon class="cls-1" points="33.02 57.32 32.84 57.18 37.96 50.62 38.26 50.62 33.02 57.32"/>
+                    <polygon class="cls-1" points="32.84 57.18 32.65 57.03 37.66 50.62 37.96 50.62 32.84 57.18"/>
+                    <polygon class="cls-1" points="32.65 57.03 32.47 56.89 37.37 50.62 37.66 50.62 32.65 57.03"/>
+                    <polygon class="cls-1" points="32.47 56.89 32.28 56.75 37.07 50.62 37.37 50.62 32.47 56.89"/>
+                    <polygon class="cls-1"
+                             points="32.28 56.75 32.22 56.7 32.22 56.44 36.77 50.62 37.07 50.62 32.28 56.75"/>
+                    <polygon class="cls-1" points="32.22 56.06 36.48 50.62 36.77 50.62 32.22 56.44 32.22 56.06"/>
+                    <polygon class="cls-1" points="32.22 55.68 36.18 50.62 36.48 50.62 32.22 56.06 32.22 55.68"/>
+                    <polygon class="cls-1" points="32.22 55.3 35.88 50.62 36.18 50.62 32.22 55.68 32.22 55.3"/>
+                    <polygon class="cls-1" points="32.22 54.92 35.59 50.62 35.88 50.62 32.22 55.3 32.22 54.92"/>
+                    <polygon class="cls-1" points="32.22 54.54 35.29 50.62 35.59 50.62 32.22 54.92 32.22 54.54"/>
+                    <polygon class="cls-1" points="32.22 54.16 34.99 50.62 35.29 50.62 32.22 54.54 32.22 54.16"/>
+                    <polygon class="cls-1" points="32.22 53.78 34.7 50.62 34.99 50.62 32.22 54.16 32.22 53.78"/>
+                    <polygon class="cls-1" points="32.22 53.4 34.4 50.62 34.7 50.62 32.22 53.78 32.22 53.4"/>
+                    <polygon class="cls-1" points="32.22 53.02 34.1 50.62 34.4 50.62 32.22 53.4 32.22 53.02"/>
+                    <polygon class="cls-1" points="32.22 52.64 33.81 50.62 34.1 50.62 32.22 53.02 32.22 52.64"/>
+                    <polygon class="cls-1" points="32.22 52.26 33.51 50.62 33.81 50.62 32.22 52.64 32.22 52.26"/>
+                    <polygon class="cls-1" points="32.22 51.88 33.21 50.62 33.51 50.62 32.22 52.26 32.22 51.88"/>
+                    <polygon class="cls-1" points="32.22 51.5 32.92 50.62 33.21 50.62 32.22 51.88 32.22 51.5"/>
+                    <polygon class="cls-1" points="32.22 51.12 32.62 50.62 32.92 50.62 32.22 51.5 32.22 51.12"/>
+                    <polygon class="cls-1" points="32.22 50.74 32.32 50.62 32.62 50.62 32.22 51.12 32.22 50.74"/>
+                    <polygon class="cls-1" points="32.32 50.62 32.22 50.74 32.22 50.62 32.32 50.62"/>
+                </g>
+                <path class="cls-1"
+                      d="M18.28,36.08a3.51,3.51,0,0,0,.36.29l1.11.9,1.26,1,.66.51,2.06,1.57c.88.66,1.79,1.33,2.74,2s1.84,1.33,2.81,2l2.86,2,2.72,1.83.13.09,2.86,1.89.07,0,.22-1.9s0,.07,0,.11a13.6,13.6,0,0,0-2.34-8A18,18,0,0,0,33,37.29,28.37,28.37,0,0,0,30.1,35c-.94-.66-2-1.33-3.09-2a7,7,0,0,1,.2,1.87c0,.12,0,.24,0,.36l0,.37h0A8.26,8.26,0,0,0,24,30.29,7.68,7.68,0,0,1,24.48,33c0,.15,0,.3,0,.45a.49.49,0,0,0,0,.12h0a8.75,8.75,0,0,0-.61-2.08c-.06-.13-.12-.26-.19-.39s-.21-.37-.33-.56-.15-.22-.24-.34a7.63,7.63,0,0,0-.66-.76l-.23-.22L21.85,29c-.52-.42-1-.77-1.39-1.06l-.58-.38-.2-.13c-.2-.13-.38-.23-.54-.32a3.88,3.88,0,0,0-.58-.27h0a1.49,1.49,0,0,1,.11.28A8.89,8.89,0,0,1,19,29.82l.21-1.74L19,29.82v0a2.45,2.45,0,0,1,0,.27v-.05l-.7,6Z"/>
+                <g class="cls-12">
+                    <polygon class="cls-1" points="38.19 50.22 38.33 50.04 38.33 50.22 38.19 50.22"/>
+                    <polygon class="cls-1" points="37.99 50.22 38.33 49.78 38.33 50.04 38.19 50.22 37.99 50.22"/>
+                    <polygon class="cls-1" points="37.78 50.22 38.33 49.52 38.33 49.78 37.99 50.22 37.78 50.22"/>
+                    <polygon class="cls-1" points="37.58 50.22 38.33 49.26 38.33 49.52 37.78 50.22 37.58 50.22"/>
+                    <polygon class="cls-1" points="37.37 50.22 38.33 48.99 38.33 49.26 37.58 50.22 37.37 50.22"/>
+                    <polygon class="cls-1" points="37.17 50.22 38.33 48.73 38.33 48.99 37.37 50.22 37.17 50.22"/>
+                    <polygon class="cls-1" points="36.96 50.22 38.33 48.47 38.33 48.73 37.17 50.22 36.96 50.22"/>
+                    <polygon class="cls-1" points="36.76 50.22 38.33 48.21 38.33 48.47 36.96 50.22 36.76 50.22"/>
+                    <polygon class="cls-1" points="36.55 50.22 38.33 47.95 38.33 48.21 36.76 50.22 36.55 50.22"/>
+                    <polygon class="cls-1" points="36.35 50.22 38.33 47.68 38.33 47.95 36.55 50.22 36.35 50.22"/>
+                    <polygon class="cls-1" points="36.14 50.22 38.33 47.42 38.33 47.68 36.35 50.22 36.14 50.22"/>
+                    <polygon class="cls-1" points="35.94 50.22 38.33 47.16 38.33 47.42 36.14 50.22 35.94 50.22"/>
+                    <polygon class="cls-1" points="35.73 50.22 38.33 46.9 38.33 47.16 35.94 50.22 35.73 50.22"/>
+                    <polygon class="cls-1" points="35.53 50.22 38.33 46.63 38.33 46.9 35.73 50.22 35.53 50.22"/>
+                    <polygon class="cls-1" points="35.33 50.22 38.33 46.37 38.33 46.63 35.53 50.22 35.33 50.22"/>
+                    <polygon class="cls-1" points="35.12 50.22 38.33 46.11 38.33 46.37 35.33 50.22 35.12 50.22"/>
+                    <polygon class="cls-1" points="34.92 50.22 38.33 45.85 38.33 46.11 35.12 50.22 34.92 50.22"/>
+                    <polygon class="cls-1" points="34.71 50.22 38.33 45.59 38.33 45.85 34.92 50.22 34.71 50.22"/>
+                    <polygon class="cls-1" points="34.51 50.22 38.33 45.32 38.33 45.59 34.71 50.22 34.51 50.22"/>
+                    <polygon class="cls-1" points="34.3 50.22 38.33 45.06 38.33 45.32 34.51 50.22 34.3 50.22"/>
+                    <polygon class="cls-1" points="34.1 50.22 38.33 44.8 38.33 45.06 34.3 50.22 34.1 50.22"/>
+                    <polygon class="cls-1" points="33.89 50.22 38.33 44.54 38.33 44.8 34.1 50.22 33.89 50.22"/>
+                    <polygon class="cls-1" points="33.69 50.22 38.33 44.28 38.33 44.54 33.89 50.22 33.69 50.22"/>
+                    <polygon class="cls-1" points="33.48 50.22 38.33 44.01 38.33 44.28 33.69 50.22 33.48 50.22"/>
+                    <polygon class="cls-1"
+                             points="33.42 50.22 33.33 50.15 38.33 43.75 38.33 44.01 33.48 50.22 33.42 50.22"/>
+                    <polygon class="cls-1" points="33.33 50.15 33.2 50.05 38.33 43.49 38.33 43.75 33.33 50.15"/>
+                    <polygon class="cls-1" points="33.2 50.05 33.08 49.95 38.33 43.23 38.33 43.49 33.2 50.05"/>
+                    <polygon class="cls-1" points="33.08 49.95 32.95 49.86 38.33 42.97 38.33 43.23 33.08 49.95"/>
+                    <polygon class="cls-1" points="32.95 49.86 32.82 49.76 38.33 42.7 38.33 42.97 32.95 49.86"/>
+                    <polygon class="cls-1" points="32.82 49.76 32.7 49.66 38.33 42.44 38.33 42.7 32.82 49.76"/>
+                    <polygon class="cls-1" points="32.7 49.66 32.57 49.56 38.33 42.18 38.33 42.44 32.7 49.66"/>
+                    <polygon class="cls-1" points="32.57 49.56 32.44 49.46 38.33 41.92 38.33 42.18 32.57 49.56"/>
+                    <polygon class="cls-1" points="32.44 49.46 32.31 49.36 38.33 41.66 38.33 41.92 32.44 49.46"/>
+                    <polygon class="cls-1" points="32.31 49.36 32.19 49.26 38.33 41.39 38.33 41.66 32.31 49.36"/>
+                    <polygon class="cls-1" points="32.19 49.26 32.06 49.16 38.33 41.13 38.33 41.39 32.19 49.26"/>
+                    <polygon class="cls-1" points="32.06 49.16 31.93 49.06 38.33 40.87 38.33 41.13 32.06 49.16"/>
+                    <polygon class="cls-1" points="31.93 49.06 31.8 48.96 38.33 40.61 38.33 40.87 31.93 49.06"/>
+                    <polygon class="cls-1" points="31.8 48.96 31.68 48.86 38.33 40.34 38.33 40.61 31.8 48.96"/>
+                    <polygon class="cls-1" points="31.68 48.86 31.55 48.76 38.33 40.08 38.33 40.34 31.68 48.86"/>
+                    <polygon class="cls-1" points="31.55 48.76 31.42 48.66 38.33 39.82 38.33 40.08 31.55 48.76"/>
+                    <polygon class="cls-1" points="31.42 48.66 31.3 48.56 38.33 39.56 38.33 39.82 31.42 48.66"/>
+                    <polygon class="cls-1" points="31.3 48.56 31.17 48.47 38.33 39.3 38.33 39.56 31.3 48.56"/>
+                    <polygon class="cls-1"
+                             points="31.17 48.47 31.04 48.37 38.31 39.06 38.33 39.08 38.33 39.3 31.17 48.47"/>
+                    <rect class="cls-1" x="28.71" y="43.58" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -21.1, 44.06)"/>
+                    <rect class="cls-1" x="28.58" y="43.48" width="11.81" height="0.16"
+                          transform="translate(-21.08 43.92) rotate(-52)"/>
+                    <rect class="cls-1" x="28.46" y="43.38" width="11.81" height="0.16"
+                          transform="translate(-21.05 43.78) rotate(-52)"/>
+                    <rect class="cls-1" x="28.33" y="43.29" width="11.81" height="0.16"
+                          transform="translate(-21.02 43.64) rotate(-52)"/>
+                    <rect class="cls-1" x="28.2" y="43.19" width="11.81" height="0.16"
+                          transform="translate(-20.99 43.51) rotate(-52)"/>
+                    <rect class="cls-1" x="28.07" y="43.09" width="11.81" height="0.16"
+                          transform="translate(-20.96 43.37) rotate(-52)"/>
+                    <rect class="cls-1" x="27.95" y="42.99" width="11.81" height="0.16"
+                          transform="translate(-20.93 43.23) rotate(-52)"/>
+                    <rect class="cls-1" x="27.82" y="42.89" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -20.9, 43.09)"/>
+                    <rect class="cls-1" x="27.69" y="42.79" width="11.81" height="0.16"
+                          transform="translate(-20.87 42.95) rotate(-52)"/>
+                    <rect class="cls-1" x="27.57" y="42.69" width="11.81" height="0.16"
+                          transform="translate(-20.84 42.81) rotate(-52)"/>
+                    <rect class="cls-1" x="27.44" y="42.59" width="11.81" height="0.16"
+                          transform="translate(-20.81 42.68) rotate(-52)"/>
+                    <rect class="cls-1" x="27.31" y="42.49" width="11.81" height="0.16"
+                          transform="translate(-20.78 42.54) rotate(-52)"/>
+                    <rect class="cls-1" x="27.18" y="42.39" width="11.81" height="0.16"
+                          transform="translate(-20.75 42.4) rotate(-52)"/>
+                    <rect class="cls-1" x="27.06" y="42.29" width="11.81" height="0.16"
+                          transform="translate(-20.72 42.26) rotate(-52)"/>
+                    <rect class="cls-1" x="26.93" y="42.19" width="11.81" height="0.16"
+                          transform="translate(-20.69 42.12) rotate(-52)"/>
+                    <rect class="cls-1" x="26.8" y="42.09" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -20.66, 41.98)"/>
+                    <rect class="cls-1" x="26.68" y="41.99" width="11.81" height="0.16"
+                          transform="translate(-20.63 41.84) rotate(-52)"/>
+                    <rect class="cls-1" x="26.55" y="41.89" width="11.81" height="0.16"
+                          transform="translate(-20.6 41.71) rotate(-52)"/>
+                    <rect class="cls-1" x="26.42" y="41.8" width="11.81" height="0.16"
+                          transform="translate(-20.58 41.57) rotate(-52)"/>
+                    <rect class="cls-1" x="26.29" y="41.7" width="11.81" height="0.16"
+                          transform="translate(-20.55 41.43) rotate(-52)"/>
+                    <rect class="cls-1" x="26.17" y="41.6" width="11.81" height="0.16"
+                          transform="translate(-20.52 41.29) rotate(-52)"/>
+                    <rect class="cls-1" x="26.04" y="41.5" width="11.81" height="0.16"
+                          transform="translate(-20.49 41.15) rotate(-52)"/>
+                    <rect class="cls-1" x="25.91" y="41.4" width="11.81" height="0.16"
+                          transform="translate(-20.46 41.01) rotate(-52)"/>
+                    <rect class="cls-1" x="25.79" y="41.3" width="11.81" height="0.16"
+                          transform="translate(-20.43 40.88) rotate(-52)"/>
+                    <rect class="cls-1" x="25.66" y="41.2" width="11.81" height="0.16"
+                          transform="translate(-20.4 40.74) rotate(-52)"/>
+                    <rect class="cls-1" x="25.53" y="41.1" width="11.81" height="0.16"
+                          transform="translate(-20.37 40.6) rotate(-52)"/>
+                    <rect class="cls-1" x="25.4" y="41" width="11.81" height="0.16"
+                          transform="translate(-20.34 40.46) rotate(-52)"/>
+                    <rect class="cls-1" x="25.28" y="40.9" width="11.81" height="0.16"
+                          transform="translate(-20.31 40.32) rotate(-52)"/>
+                    <rect class="cls-1" x="25.15" y="40.8" width="11.81" height="0.16"
+                          transform="translate(-20.28 40.18) rotate(-52)"/>
+                    <rect class="cls-1" x="25.02" y="40.7" width="11.81" height="0.16"
+                          transform="translate(-20.25 40.05) rotate(-52)"/>
+                    <rect class="cls-1" x="24.9" y="40.6" width="11.81" height="0.16"
+                          transform="translate(-20.22 39.91) rotate(-52)"/>
+                    <rect class="cls-1" x="24.77" y="40.5" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -20.19, 39.77)"/>
+                    <rect class="cls-1" x="24.64" y="40.41" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -20.16, 39.63)"/>
+                    <rect class="cls-1" x="24.51" y="40.31" width="11.81" height="0.16"
+                          transform="translate(-20.13 39.49) rotate(-52)"/>
+                    <rect class="cls-1" x="24.39" y="40.21" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -20.1, 39.35)"/>
+                    <rect class="cls-1" x="24.26" y="40.11" width="11.81" height="0.16"
+                          transform="translate(-20.08 39.22) rotate(-52)"/>
+                    <rect class="cls-1" x="24.13" y="40.01" width="11.81" height="0.16"
+                          transform="translate(-20.05 39.08) rotate(-52)"/>
+                    <rect class="cls-1" x="24.01" y="39.91" width="11.81" height="0.16"
+                          transform="translate(-20.02 38.94) rotate(-52)"/>
+                    <rect class="cls-1" x="23.88" y="39.81" width="11.81" height="0.16"
+                          transform="translate(-19.99 38.8) rotate(-52)"/>
+                    <rect class="cls-1" x="23.75" y="39.71" width="11.81" height="0.16"
+                          transform="translate(-19.96 38.66) rotate(-52)"/>
+                    <rect class="cls-1" x="23.62" y="39.61" width="11.81" height="0.16"
+                          transform="translate(-19.93 38.52) rotate(-52)"/>
+                    <rect class="cls-1" x="23.5" y="39.51" width="11.81" height="0.16"
+                          transform="translate(-19.9 38.39) rotate(-52)"/>
+                    <rect class="cls-1" x="23.37" y="39.41" width="11.81" height="0.16"
+                          transform="translate(-19.87 38.25) rotate(-52)"/>
+                    <rect class="cls-1" x="23.24" y="39.31" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.84, 38.11)"/>
+                    <rect class="cls-1" x="23.12" y="39.21" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.81, 37.97)"/>
+                    <rect class="cls-1" x="22.99" y="39.11" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.78, 37.83)"/>
+                    <rect class="cls-1" x="22.86" y="39.01" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.75, 37.69)"/>
+                    <rect class="cls-1" x="22.73" y="38.92" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.72, 37.56)"/>
+                    <rect class="cls-1" x="22.61" y="38.82" width="11.81" height="0.16"
+                          transform="translate(-19.69 37.42) rotate(-52)"/>
+                    <rect class="cls-1" x="22.48" y="38.72" width="11.81" height="0.16"
+                          transform="translate(-19.66 37.28) rotate(-52)"/>
+                    <rect class="cls-1" x="22.35" y="38.62" width="11.81" height="0.16"
+                          transform="translate(-19.63 37.14) rotate(-52)"/>
+                    <rect class="cls-1" x="22.23" y="38.52" width="11.81" height="0.16"
+                          transform="translate(-19.61 37) rotate(-52)"/>
+                    <rect class="cls-1" x="22.1" y="38.42" width="11.81" height="0.16"
+                          transform="translate(-19.58 36.86) rotate(-52)"/>
+                    <rect class="cls-1" x="21.97" y="38.32" width="11.81" height="0.16"
+                          transform="translate(-19.55 36.73) rotate(-52)"/>
+                    <rect class="cls-1" x="21.84" y="38.22" width="11.81" height="0.16"
+                          transform="translate(-19.52 36.59) rotate(-52)"/>
+                    <rect class="cls-1" x="21.72" y="38.12" width="11.81" height="0.16"
+                          transform="translate(-19.49 36.45) rotate(-52)"/>
+                    <rect class="cls-1" x="21.59" y="38.02" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.46, 36.31)"/>
+                    <rect class="cls-1" x="21.46" y="37.92" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.43, 36.17)"/>
+                    <rect class="cls-1" x="21.34" y="37.82" width="11.81" height="0.16"
+                          transform="translate(-19.4 36.03) rotate(-52)"/>
+                    <rect class="cls-1" x="21.21" y="37.72" width="11.81" height="0.16"
+                          transform="translate(-19.37 35.9) rotate(-52)"/>
+                    <rect class="cls-1" x="21.08" y="37.62" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.34, 35.76)"/>
+                    <rect class="cls-1" x="20.95" y="37.52" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.31, 35.62)"/>
+                    <rect class="cls-1" x="20.83" y="37.43" width="11.81" height="0.16"
+                          transform="translate(-19.28 35.48) rotate(-52)"/>
+                    <rect class="cls-1" x="20.7" y="37.33" width="11.81" height="0.16"
+                          transform="translate(-19.25 35.34) rotate(-52)"/>
+                    <rect class="cls-1" x="20.57" y="37.23" width="11.81" height="0.16"
+                          transform="translate(-19.22 35.2) rotate(-52)"/>
+                    <rect class="cls-1" x="20.45" y="37.13" width="11.81" height="0.16"
+                          transform="translate(-19.19 35.07) rotate(-52)"/>
+                    <rect class="cls-1" x="20.32" y="37.03" width="11.81" height="0.16"
+                          transform="translate(-19.16 34.93) rotate(-52)"/>
+                    <rect class="cls-1" x="20.19" y="36.93" width="11.81" height="0.16"
+                          transform="translate(-19.13 34.79) rotate(-52)"/>
+                    <rect class="cls-1" x="20.06" y="36.83" width="11.81" height="0.16"
+                          transform="translate(-19.11 34.65) rotate(-52)"/>
+                    <rect class="cls-1" x="19.94" y="36.73" width="11.81" height="0.16"
+                          transform="translate(-19.08 34.51) rotate(-52)"/>
+                    <rect class="cls-1" x="19.81" y="36.63" width="11.81" height="0.16"
+                          transform="translate(-19.05 34.37) rotate(-52)"/>
+                    <rect class="cls-1" x="19.68" y="36.53" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.02, 34.24)"/>
+                    <rect class="cls-1" x="19.24" y="35.78" width="11.81" height="0.96"
+                          transform="translate(-18.91 33.75) rotate(-52)"/>
+                    <rect class="cls-1" x="18.48" y="35.19" width="11.81" height="0.96"
+                          transform="translate(-18.74 32.93) rotate(-52)"/>
+                    <rect class="cls-1" x="17.72" y="34.6" width="11.81" height="0.96"
+                          transform="translate(-18.56 32.1) rotate(-52)"/>
+                    <rect class="cls-1" x="16.96" y="34" width="11.81" height="0.96"
+                          transform="translate(-18.39 31.27) rotate(-52)"/>
+                    <polygon class="cls-1"
+                             points="18.85 38.84 18.22 38.35 18.22 38.09 25.36 28.95 26.12 29.54 18.85 38.84"/>
+                    <polygon class="cls-1" points="18.22 36.52 24.6 28.35 25.36 28.95 18.22 38.09 18.22 36.52"/>
+                    <polygon class="cls-1" points="18.22 34.96 23.84 27.76 24.6 28.35 18.22 36.52 18.22 34.96"/>
+                    <polygon class="cls-1" points="18.22 33.39 23.08 27.16 23.84 27.76 18.22 34.96 18.22 33.39"/>
+                    <polygon class="cls-1" points="18.22 33.11 22.95 27.06 23.08 27.16 18.22 33.39 18.22 33.11"/>
+                    <polygon class="cls-1" points="18.22 32.83 22.81 26.95 22.95 27.06 18.22 33.11 18.22 32.83"/>
+                    <polygon class="cls-1" points="18.22 32.55 22.67 26.84 22.81 26.95 18.22 32.83 18.22 32.55"/>
+                    <polygon class="cls-1"
+                             points="18.22 32.26 22.5 26.79 22.6 26.79 22.67 26.84 18.22 32.55 18.22 32.26"/>
+                    <polygon class="cls-1" points="18.22 31.98 22.27 26.79 22.5 26.79 18.22 32.26 18.22 31.98"/>
+                    <polygon class="cls-1" points="18.22 31.7 22.05 26.79 22.27 26.79 18.22 31.98 18.22 31.7"/>
+                    <polygon class="cls-1" points="18.22 31.42 21.84 26.79 22.05 26.79 18.22 31.7 18.22 31.42"/>
+                    <polygon class="cls-1" points="18.22 31.14 21.61 26.79 21.84 26.79 18.22 31.42 18.22 31.14"/>
+                    <polygon class="cls-1" points="18.22 30.85 21.39 26.79 21.61 26.79 18.22 31.14 18.22 30.85"/>
+                    <polygon class="cls-1" points="18.22 30.57 21.17 26.79 21.39 26.79 18.22 30.85 18.22 30.57"/>
+                    <polygon class="cls-1" points="18.22 30.29 20.95 26.79 21.17 26.79 18.22 30.57 18.22 30.29"/>
+                    <polygon class="cls-1" points="18.22 30.01 20.73 26.79 20.95 26.79 18.22 30.29 18.22 30.01"/>
+                    <polygon class="cls-1" points="18.22 29.73 20.51 26.79 20.73 26.79 18.22 30.01 18.22 29.73"/>
+                    <polygon class="cls-1" points="18.22 29.44 20.29 26.79 20.51 26.79 18.22 29.73 18.22 29.44"/>
+                    <polygon class="cls-1" points="18.22 29.16 20.07 26.79 20.29 26.79 18.22 29.44 18.22 29.16"/>
+                    <polygon class="cls-1" points="18.22 28.88 19.85 26.79 20.07 26.79 18.22 29.16 18.22 28.88"/>
+                    <polygon class="cls-1" points="18.22 28.6 19.63 26.79 19.85 26.79 18.22 28.88 18.22 28.6"/>
+                    <polygon class="cls-1" points="18.22 28.31 19.41 26.79 19.63 26.79 18.22 28.6 18.22 28.31"/>
+                    <polygon class="cls-1" points="18.22 28.03 19.19 26.79 19.41 26.79 18.22 28.31 18.22 28.03"/>
+                    <polygon class="cls-1" points="18.22 27.75 18.97 26.79 19.19 26.79 18.22 28.03 18.22 27.75"/>
+                    <polygon class="cls-1" points="18.22 27.47 18.75 26.79 18.97 26.79 18.22 27.75 18.22 27.47"/>
+                    <polygon class="cls-1" points="18.22 27.18 18.53 26.79 18.75 26.79 18.22 27.47 18.22 27.18"/>
+                    <polygon class="cls-1" points="18.22 26.9 18.31 26.79 18.53 26.79 18.22 27.18 18.22 26.9"/>
+                    <polygon class="cls-1" points="18.31 26.79 18.22 26.9 18.22 26.79 18.31 26.79"/>
+                </g>
+                <path class="cls-1"
+                      d="M8,26.83c.67.7,1.45,1.47,2.32,2.32l.14.13c.77.73,1.61,1.51,2.53,2.34s1.66,1.47,2.6,2.26S17.3,35.29,18.22,36l.7-6a7.26,7.26,0,0,0-1.76-3.76c-.24-.26-.49-.53-.75-.79-.79-.81-1.68-1.63-2.58-2.39a31.59,31.59,0,0,0-2.54-1.95c-.51-.35-1-.64-1.42-.87s-.75-.37-1.1-.52A65.5,65.5,0,0,1,8,26.83Z"/>
+                <g class="cls-13">
+                    <polygon class="cls-1" points="18.73 36.04 18.92 35.8 18.92 36.04 18.73 36.04"/>
+                    <polygon class="cls-1" points="18.51 36.04 18.92 35.51 18.92 35.8 18.73 36.04 18.51 36.04"/>
+                    <polygon class="cls-1" points="18.29 36.04 18.92 35.23 18.92 35.51 18.51 36.04 18.29 36.04"/>
+                    <polygon class="cls-1" points="18.07 36.04 18.92 34.95 18.92 35.23 18.29 36.04 18.07 36.04"/>
+                    <polygon class="cls-1" points="17.85 36.04 18.92 34.67 18.92 34.95 18.07 36.04 17.85 36.04"/>
+                    <polygon class="cls-1" points="17.63 36.04 18.92 34.38 18.92 34.67 17.85 36.04 17.63 36.04"/>
+                    <polygon class="cls-1" points="17.41 36.04 18.92 34.1 18.92 34.38 17.63 36.04 17.41 36.04"/>
+                    <polygon class="cls-1" points="17.19 36.04 18.92 33.82 18.92 34.1 17.41 36.04 17.19 36.04"/>
+                    <polygon class="cls-1" points="16.97 36.04 18.92 33.54 18.92 33.82 17.19 36.04 16.97 36.04"/>
+                    <polygon class="cls-1" points="16.75 36.04 18.92 33.26 18.92 33.54 16.97 36.04 16.75 36.04"/>
+                    <polygon class="cls-1" points="16.53 36.04 18.92 32.97 18.92 33.26 16.75 36.04 16.53 36.04"/>
+                    <polygon class="cls-1" points="16.31 36.04 18.92 32.69 18.92 32.97 16.53 36.04 16.31 36.04"/>
+                    <polygon class="cls-1" points="16.09 36.04 18.92 32.41 18.92 32.69 16.31 36.04 16.09 36.04"/>
+                    <polygon class="cls-1" points="15.87 36.04 18.92 32.13 18.92 32.41 16.09 36.04 15.87 36.04"/>
+                    <polygon class="cls-1" points="15.65 36.04 18.92 31.85 18.92 32.13 15.87 36.04 15.65 36.04"/>
+                    <polygon class="cls-1" points="15.43 36.04 18.92 31.56 18.92 31.85 15.65 36.04 15.43 36.04"/>
+                    <polygon class="cls-1"
+                             points="15.31 36.04 15.25 35.98 18.92 31.28 18.92 31.56 15.43 36.04 15.31 36.04"/>
+                    <polygon class="cls-1" points="15.25 35.98 15.11 35.88 18.92 31 18.92 31.28 15.25 35.98"/>
+                    <polygon class="cls-1" points="15.11 35.88 14.97 35.77 18.92 30.72 18.92 31 15.11 35.88"/>
+                    <polygon class="cls-1" points="14.97 35.77 14.84 35.66 18.92 30.43 18.92 30.72 14.97 35.77"/>
+                    <polygon class="cls-1" points="14.84 35.66 14.7 35.56 18.92 30.15 18.92 30.43 14.84 35.66"/>
+                    <polygon class="cls-1" points="14.7 35.56 14.56 35.45 18.92 29.87 18.92 30.15 14.7 35.56"/>
+                    <polygon class="cls-1" points="14.56 35.45 14.43 35.34 18.92 29.59 18.92 29.87 14.56 35.45"/>
+                    <polygon class="cls-1" points="14.43 35.34 14.29 35.24 18.92 29.31 18.92 29.59 14.43 35.34"/>
+                    <polygon class="cls-1" points="14.29 35.24 14.15 35.13 18.92 29.02 18.92 29.31 14.29 35.24"/>
+                    <polygon class="cls-1" points="14.15 35.13 14.02 35.02 18.92 28.74 18.92 29.02 14.15 35.13"/>
+                    <polygon class="cls-1" points="14.02 35.02 13.88 34.92 18.92 28.46 18.92 28.74 14.02 35.02"/>
+                    <polygon class="cls-1" points="13.88 34.92 13.74 34.81 18.92 28.18 18.92 28.46 13.88 34.92"/>
+                    <polygon class="cls-1" points="13.74 34.81 13.6 34.7 18.92 27.89 18.92 28.18 13.74 34.81"/>
+                    <polygon class="cls-1" points="13.6 34.7 13.47 34.59 18.92 27.61 18.92 27.89 13.6 34.7"/>
+                    <polygon class="cls-1" points="13.47 34.59 13.33 34.49 18.92 27.33 18.92 27.61 13.47 34.59"/>
+                    <polygon class="cls-1" points="13.33 34.49 13.19 34.38 18.92 27.05 18.92 27.33 13.33 34.49"/>
+                    <polygon class="cls-1" points="13.19 34.38 13.06 34.27 18.92 26.77 18.92 27.05 13.19 34.38"/>
+                    <polygon class="cls-1" points="13.06 34.27 12.92 34.17 18.92 26.48 18.92 26.77 13.06 34.27"/>
+                    <polygon class="cls-1" points="12.92 34.17 12.78 34.06 18.92 26.2 18.92 26.48 12.92 34.17"/>
+                    <polygon class="cls-1" points="12.78 34.06 12.65 33.95 18.92 25.92 18.92 26.2 12.78 34.06"/>
+                    <polygon class="cls-1" points="12.65 33.95 12.51 33.85 18.92 25.64 18.92 25.92 12.65 33.95"/>
+                    <polygon class="cls-1" points="12.51 33.85 12.37 33.74 18.92 25.36 18.92 25.64 12.51 33.85"/>
+                    <polygon class="cls-1" points="12.37 33.74 12.23 33.63 18.92 25.07 18.92 25.36 12.37 33.74"/>
+                    <polygon class="cls-1"
+                             points="12.23 33.63 12.1 33.52 18.92 24.79 18.92 24.79 18.92 25.07 12.23 33.63"/>
+                    <rect class="cls-1" x="9.9" y="29.02" width="11.08" height="0.17"
+                          transform="translate(-17 23.36) rotate(-52)"/>
+                    <rect class="cls-1" x="9.76" y="28.91" width="11.08" height="0.17"
+                          transform="translate(-16.97 23.21) rotate(-52)"/>
+                    <rect class="cls-1" x="9.63" y="28.8" width="11.08" height="0.17"
+                          transform="translate(-16.94 23.06) rotate(-52)"/>
+                    <rect class="cls-1" x="9.49" y="28.7" width="11.08" height="0.17"
+                          transform="translate(-16.91 22.91) rotate(-52)"/>
+                    <rect class="cls-1" x="9.35" y="28.59" width="11.08" height="0.17"
+                          transform="translate(-16.87 22.76) rotate(-52)"/>
+                    <rect class="cls-1" x="9.22" y="28.48" width="11.08" height="0.17"
+                          transform="translate(-16.84 22.61) rotate(-52)"/>
+                    <rect class="cls-1" x="9.08" y="28.38" width="11.08" height="0.17"
+                          transform="translate(-16.81 22.46) rotate(-52)"/>
+                    <rect class="cls-1" x="8.94" y="28.27" width="11.08" height="0.17"
+                          transform="translate(-16.78 22.31) rotate(-52)"/>
+                    <rect class="cls-1" x="8.81" y="28.16" width="11.08" height="0.17"
+                          transform="translate(-16.75 22.16) rotate(-52)"/>
+                    <rect class="cls-1" x="8.67" y="28.06" width="11.08" height="0.17"
+                          transform="translate(-16.72 22.01) rotate(-52)"/>
+                    <rect class="cls-1" x="8.53" y="27.95" width="11.08" height="0.17"
+                          transform="translate(-16.68 21.87) rotate(-52)"/>
+                    <rect class="cls-1" x="8.39" y="27.84" width="11.08" height="0.17"
+                          transform="translate(-16.65 21.72) rotate(-52)"/>
+                    <rect class="cls-1" x="8.26" y="27.74" width="11.08" height="0.17"
+                          transform="translate(-16.62 21.57) rotate(-52)"/>
+                    <rect class="cls-1" x="8.12" y="27.63" width="11.08" height="0.17"
+                          transform="translate(-16.59 21.42) rotate(-52)"/>
+                    <rect class="cls-1" x="7.98" y="27.52" width="11.08" height="0.17"
+                          transform="translate(-16.56 21.27) rotate(-52)"/>
+                    <rect class="cls-1" x="7.85" y="27.41" width="11.08" height="0.17"
+                          transform="translate(-16.53 21.12) rotate(-52)"/>
+                    <rect class="cls-1" x="7.71" y="27.31" width="11.08" height="0.17"
+                          transform="translate(-16.49 20.97) rotate(-52)"/>
+                    <rect class="cls-1" x="7.57" y="27.2" width="11.08" height="0.17"
+                          transform="translate(-16.46 20.82) rotate(-52)"/>
+                    <rect class="cls-1" x="7.44" y="27.09" width="11.08" height="0.17"
+                          transform="translate(-16.43 20.67) rotate(-52)"/>
+                    <rect class="cls-1" x="7.3" y="26.99" width="11.08" height="0.17"
+                          transform="translate(-16.4 20.52) rotate(-52)"/>
+                    <rect class="cls-1" x="7.16" y="26.88" width="11.08" height="0.17"
+                          transform="translate(-16.37 20.38) rotate(-52)"/>
+                    <rect class="cls-1" x="7.03" y="26.77" width="11.08" height="0.17"
+                          transform="translate(-16.34 20.23) rotate(-52)"/>
+                    <rect class="cls-1" x="6.89" y="26.67" width="11.08" height="0.17"
+                          transform="translate(-16.3 20.08) rotate(-52)"/>
+                    <rect class="cls-1" x="6.75" y="26.56" width="11.08" height="0.17"
+                          transform="translate(-16.27 19.93) rotate(-52)"/>
+                    <rect class="cls-1" x="6.61" y="26.45" width="11.08" height="0.17"
+                          transform="translate(-16.24 19.78) rotate(-52)"/>
+                    <rect class="cls-1" x="6.48" y="26.34" width="11.08" height="0.17"
+                          transform="translate(-16.21 19.63) rotate(-52)"/>
+                    <rect class="cls-1" x="6.34" y="26.24" width="11.08" height="0.17"
+                          transform="translate(-16.18 19.48) rotate(-52)"/>
+                    <rect class="cls-1" x="6.2" y="26.13" width="11.08" height="0.17"
+                          transform="translate(-16.15 19.33) rotate(-52)"/>
+                    <rect class="cls-1" x="6.07" y="26.02" width="11.08" height="0.17"
+                          transform="translate(-16.11 19.18) rotate(-52)"/>
+                    <polygon class="cls-1"
+                             points="8.13 30.42 8.04 30.36 8.04 30.25 14.81 21.58 14.95 21.69 8.13 30.42"/>
+                    <polygon class="cls-1" points="8.04 29.97 14.68 21.48 14.81 21.58 8.04 30.25 8.04 29.97"/>
+                    <polygon class="cls-1" points="8.04 29.69 14.54 21.37 14.68 21.48 8.04 29.97 8.04 29.69"/>
+                    <polygon class="cls-1" points="8.04 29.41 14.4 21.26 14.54 21.37 8.04 29.69 8.04 29.41"/>
+                    <polygon class="cls-1" points="8.04 29.13 14.27 21.16 14.4 21.26 8.04 29.41 8.04 29.13"/>
+                    <polygon class="cls-1" points="8.04 28.84 14.13 21.05 14.27 21.16 8.04 29.13 8.04 28.84"/>
+                    <polygon class="cls-1" points="8.04 28.56 13.99 20.94 14.13 21.05 8.04 28.84 8.04 28.56"/>
+                    <polygon class="cls-1" points="8.04 28.28 13.86 20.84 13.99 20.94 8.04 28.56 8.04 28.28"/>
+                    <polygon class="cls-1" points="8.04 28 13.72 20.73 13.86 20.84 8.04 28.28 8.04 28"/>
+                    <polygon class="cls-1" points="8.04 27.71 13.58 20.62 13.72 20.73 8.04 28 8.04 27.71"/>
+                    <polygon class="cls-1" points="8.04 27.43 13.45 20.51 13.58 20.62 8.04 27.71 8.04 27.43"/>
+                    <polygon class="cls-1" points="8.04 27.15 13.31 20.41 13.45 20.51 8.04 27.43 8.04 27.15"/>
+                    <polygon class="cls-1" points="12.54 19.8 13.31 20.41 8.04 27.15 8.04 19.8 12.54 19.8"/>
+                </g>
+                <path class="cls-1" d="M27.2,35.21l0,.37h0Z"/>
+                <g class="cls-7">
+                    <path class="cls-1" d="M27.2,35.21l0,.37h0Z"/>
+                </g>
+                <path class="cls-1" d="M27.2,35.21l0,.37h0Z"/>
+                <g class="cls-14">
+                    <polygon class="cls-1" points="27.17 35.5 27.2 35.47 27.2 35.58 27.17 35.58 27.17 35.5"/>
+                    <polygon class="cls-1"
+                             points="27.17 35.24 27.2 35.21 27.2 35.21 27.2 35.47 27.17 35.5 27.17 35.24"/>
+                    <polygon class="cls-1" points="27.2 35.21 27.17 35.24 27.17 35.21 27.2 35.21"/>
+                </g>
+                <path class="cls-1" d="M24.45,33.6a.49.49,0,0,1,0-.12.49.49,0,0,0,0,.12Z"/>
+                <g class="cls-7">
+                    <path class="cls-1" d="M24.45,33.6a.49.49,0,0,1,0-.12.49.49,0,0,0,0,.12Z"/>
+                </g>
+                <path class="cls-1" d="M24.45,33.6a.49.49,0,0,1,0-.12.49.49,0,0,0,0,.12Z"/>
+                <g class="cls-15">
+                    <rect class="cls-1" x="24.45" y="33.48" width="0.01" height="0.11"/>
+                </g>
+                <polygon class="cls-1"
+                         points="24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59"/>
+                <g class="cls-7">
+                    <polygon class="cls-1"
+                             points="24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59"/>
+                </g>
+                <polygon class="cls-1"
+                         points="24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59"/>
+                <g class="cls-16">
+                    <rect class="cls-1" x="24.45" y="33.59"/>
+                </g>
+                <path class="cls-1"
+                      d="M7.46,17.64l.17,0,.09-.4,1.13.26,0-.18L7.77,17.1l.09-.41-.17,0ZM8,15.34,8.8,16l-1,.24,0,.22,1.29.3,0-.17-1-.24,1-.23,0-.12-.79-.65,1,.24,0-.17-1.29-.3Z"/>
+                <path class="cls-1" d="M27.26,34.72c0,.23,0,.47,0,.72h0c0-.12,0-.24,0-.36S27.26,34.84,27.26,34.72Z"/>
+                <g class="cls-7">
+                    <path class="cls-1"
+                          d="M27.26,34.72c0,.23,0,.47,0,.72h0c0-.12,0-.24,0-.36S27.26,34.84,27.26,34.72Z"/>
+                </g>
+                <path class="cls-1" d="M27.25,35.08c0,.12,0,.24,0,.36h0C27.24,35.32,27.24,35.2,27.25,35.08Z"/>
+                <g class="cls-7">
+                    <path class="cls-1" d="M27.25,35.08c0,.12,0,.24,0,.36h0C27.24,35.32,27.24,35.2,27.25,35.08Z"/>
+                </g>
+                <path class="cls-1" d="M27.25,35.08c0,.12,0,.24,0,.36h0C27.24,35.32,27.24,35.2,27.25,35.08Z"/>
+                <g class="cls-17">
+                    <polygon class="cls-1" points="27.22 35.37 27.25 35.34 27.25 35.45 27.22 35.45 27.22 35.37"/>
+                    <polygon class="cls-1"
+                             points="27.22 35.11 27.25 35.08 27.25 35.08 27.25 35.34 27.22 35.37 27.22 35.11"/>
+                    <polygon class="cls-1" points="27.25 35.08 27.22 35.11 27.22 35.08 27.25 35.08"/>
+                </g>
+                <path class="cls-1" d="M85.72,6.06a0,0,0,0,1,0,0l-.06,0h0v0Z"/>
+                <path class="cls-1" d="M85.25,18.53l-.06,0c0-.09,0-.14,0-.14S85.23,18.47,85.25,18.53Z"/>
+                <path class="cls-1" d="M74.35,22.72l.09,0-.1.1A.13.13,0,0,1,74.35,22.72Z"/>
+                <path class="cls-1" d="M70.18,47.29h0v0Z"/>
+                <path class="cls-1" d="M85.72,6.06a0,0,0,0,1,0,0l-.06,0h0v0Z"/>
+                <path class="cls-1" d="M85.25,18.53l-.06,0c0-.09,0-.14,0-.14S85.23,18.47,85.25,18.53Z"/>
+                <path class="cls-1" d="M74.35,22.72l.09,0-.1.1A.13.13,0,0,1,74.35,22.72Z"/>
+                <path class="cls-1" d="M70.18,47.29h0v0Z"/>
+                <path class="cls-1" d="M85.72,6.06a0,0,0,0,1,0,0l-.06,0h0v0Z"/>
+                <path class="cls-1" d="M85.25,18.53l-.06,0c0-.09,0-.14,0-.14S85.23,18.47,85.25,18.53Z"/>
+                <path class="cls-1" d="M74.35,22.72l.09,0-.1.1A.13.13,0,0,1,74.35,22.72Z"/>
+                <path class="cls-1" d="M70.18,47.29h0v0Z"/>
+                <path class="cls-1"
+                      d="M66.07,26.73a1.09,1.09,0,0,1-.08-.15l-.25-.45a.58.58,0,0,0-.11-.15,4.4,4.4,0,0,0-.86-1,5.4,5.4,0,0,0-.77-.47c-1.8.11-3.27,2.14-3.41,4.74a5.66,5.66,0,0,0,1.91,4.87h.86a9.55,9.55,0,0,0,2.5-.35s-.1-.08-.14,0a6.09,6.09,0,0,0,.76-.27,5.68,5.68,0,0,0,1-3.4A21.07,21.07,0,0,0,66.07,26.73Zm-2.73,2.08a.18.18,0,1,1,0-.26A.17.17,0,0,1,63.34,28.81Zm0-.91a.92.92,0,0,1-1.29,0,.91.91,0,0,1,1.29-1.29A.92.92,0,0,1,63.31,27.9Z"/>
+                <path class="cls-1"
+                      d="M74,24.53c-.27,1.61-.34,2.7-.35,2.77s-.17,1.29-.27,3.11h0a2.34,2.34,0,0,0,1,1.46h0a.33.33,0,0,0,.1,0l.29,0A15.3,15.3,0,0,1,74,24.53Z"/>
+                <path class="cls-1"
+                      d="M76.68,22.06h0a5.8,5.8,0,0,0-2.18.61h0l-.1.1h0c-.1.37-.18.74-.24,1.1s-.08.43-.11.64a15.3,15.3,0,0,0,.83,7.33A14.87,14.87,0,0,0,77,31.51c.31-.08.62-.16,1-.27a5.92,5.92,0,0,0,1.7-4.14C79.7,24.93,78.27,22.56,76.68,22.06Zm-2.37,5.65a.2.2,0,0,1-.19-.2.2.2,0,0,1,.19-.19.2.2,0,1,1,0,.39Zm1.17-.86a.8.8,0,0,1-1.09-.35.81.81,0,0,1,.36-1.09.8.8,0,0,1,1.09.35A.81.81,0,0,1,75.48,26.85Z"/>
+                <path class="cls-1"
+                      d="M86.48,6.12a3.52,3.52,0,0,0-.09-.85c0-.06-.25,0-.5.07l-.27.12h0a5.52,5.52,0,0,0-1.28.38A10.49,10.49,0,0,1,83,6.33a2.49,2.49,0,0,1-.44.09l.5.72a1.39,1.39,0,0,1,.24-.35,2.85,2.85,0,0,1,1.1-.74,1.71,1.71,0,0,1,1.14-.11l0,.22a4.81,4.81,0,0,1-.09,1.42c-.17.71-.35,1.44-.41,1.87-.32-.59-.63-1-.7-1a11.42,11.42,0,0,0,.56,1.74c.15.43.27.86.35,1.19s.1.55.11.57.06.24.1.54a9,9,0,0,1,0,1.22,9.48,9.48,0,0,0-.1,1.82,5.29,5.29,0,0,0,.56-1.76,6.33,6.33,0,0,0,.18-1.31,6.26,6.26,0,0,0,0-.64s-.06-.27-.18-.6A9.92,9.92,0,0,0,85.38,10c-.06-.1-.11-.21-.16-.31a13.38,13.38,0,0,0,.94-1.93A4.77,4.77,0,0,0,86.48,6.12Zm-.81,0h0v0l.07,0v0Z"/>
+                <path class="cls-1"
+                      d="M78.1,42.37a5.52,5.52,0,0,1,1.61,0l.79.1.8.06c.46,0,1.07.11,1.67.19a15.35,15.35,0,0,1,1.64.3,3.54,3.54,0,0,0,.75.15s-.23-.22-.67-.4a11,11,0,0,0-1.63-.5c-.61-.15-1.22-.27-1.68-.34s-.79-.11-.81-.12l-.82,0a5.87,5.87,0,0,0-.83,0,5.75,5.75,0,0,0-.92.18,8.88,8.88,0,0,0-1.33.48,2.91,2.91,0,0,0,0-.31c0-.15-.06-.29-.1-.43l.6-.13c.54-.13,1.09-.22,1.51-.28l.72-.09s.29-.06.7-.1A10.13,10.13,0,0,1,81.58,41a16.53,16.53,0,0,0,2.22.11,7.06,7.06,0,0,0-2.19-.57A10.16,10.16,0,0,0,80,40.45c-.44,0-.74,0-.76,0l-.73.15a14,14,0,0,0-1.52.43l-.59.2a6.93,6.93,0,0,0-.26-.7h0a1.1,1.1,0,0,0-.33-.45c-.14-.07-.22,0-.22,0s.07,0,.14.13a1.23,1.23,0,0,1,.17.42c0,.22.11.48.16.77A3.61,3.61,0,0,0,75,42a4,4,0,0,0,1.17-.24c0,.12,0,.25,0,.37a2.18,2.18,0,0,1,0,.51c-.27.14-.43.26-.41.28s.14,0,.37-.06a3.1,3.1,0,0,1-.15.46h0c-.64.18-1.22.49-1.18.58s.45,0,1-.09c-.11.17-.19.26-.19.27a5.31,5.31,0,0,1-.42.55,6.92,6.92,0,0,1-1.1,1,2.7,2.7,0,0,1-1.35.44c-.4,0-.69,0-.7,0s.27.15.7.2a2.83,2.83,0,0,0,1-.07h0a2.41,2.41,0,0,0,.56-.22,7,7,0,0,0,1.28-1,6.18,6.18,0,0,0,.52-.59,4.13,4.13,0,0,0,.38-.71h.44l.38,0,.38,0,.84.17a5.18,5.18,0,0,0,1.26.27c0-.08-.5-.45-1.11-.7a8.07,8.07,0,0,0-.85-.33l-.33-.07-.13,0a4.09,4.09,0,0,0-.7,0,3.7,3.7,0,0,0,.06-.48A13.16,13.16,0,0,1,78.1,42.37Z"/>
+                <path class="cls-1"
+                      d="M75.11,43.39c.12,0,.21-.06.27-.2a.77.77,0,0,0,.05-.38.17.17,0,0,0-.05-.12s-.08,0-.12,0-.22.12-.21.14-.12-.11-.14-.08a.37.37,0,0,0,0,.38A.33.33,0,0,0,75.11,43.39Z"/>
+                <path class="cls-1"
+                      d="M74.62,41.76a.53.53,0,0,0,.21-.35.17.17,0,0,0,0-.12.13.13,0,0,0-.13,0c-.17,0-.25.09-.25.12s-.13-.11-.14-.1l-.06.08a.56.56,0,0,0-.13.24.19.19,0,0,0,.13.24A.48.48,0,0,0,74.62,41.76Z"/>
+                <path class="cls-1"
+                      d="M70.36,60c-.17,0-.32,0-.31.05s.12,0,.27.11l.24.1c.06,0,0,0,0,0s0,0-.06,0l-.11.12a.56.56,0,0,1-.24.17c-.09,0-.15,0-.16-.1s0-.16,0-.17-.07,0-.1.16a.27.27,0,0,0,0,.23.39.39,0,0,0,.26.11,1,1,0,0,0,.57-.29,3.52,3.52,0,0,0,.29-.4,3.56,3.56,0,0,0-.45-.13Z"/>
+                <path class="cls-1"
+                      d="M69.44,45.81a1.8,1.8,0,0,0,.81-.09.68.68,0,0,0,.31.18,1.77,1.77,0,0,0,.91,0,3.42,3.42,0,0,0,.69-.28h0a.47.47,0,0,0,.24.08.76.76,0,0,0,.55-.18c.2-.21.36-.4.42-.45s0,0,0,0h0a0,0,0,0,0,0-.05h-.06s-.09,0-.14,0-.27.2-.39.27a.58.58,0,0,1-.44.13.16.16,0,0,0,0-.14c0-.09-.09-.09-.09-.08a.3.3,0,0,1,0,.09s-.08.09-.18.13a3.33,3.33,0,0,1-.78.22,1.59,1.59,0,0,1-.76,0l-.07,0,.33-.2a1.49,1.49,0,0,0,.27-.23l.13-.12a2,2,0,0,0,.13-.18.45.45,0,0,0,.08-.38.4.4,0,0,0-.29-.21,1.32,1.32,0,0,0-.57,0,.56.56,0,0,0-.38.21.54.54,0,0,0-.08.25s0,.07,0,.08,0,0,.08-.06a.84.84,0,0,1,.12-.19.4.4,0,0,1,.29-.1,1.29,1.29,0,0,1,.41,0s.1,0,.11.1a.2.2,0,0,1-.06.15l-.07.06-.11.1a2.2,2.2,0,0,1-.25.17,1.69,1.69,0,0,1-1.19.29.46.46,0,0,1-.35-.31,1.46,1.46,0,0,1-.1-.57,1.5,1.5,0,0,1,.4-.95,2.5,2.5,0,0,1,.94-.59,3.41,3.41,0,0,1,.58-.19,1.19,1.19,0,0,1,.26-.05h.07l.25.05a1.53,1.53,0,0,0,.29,0l.23-.08.21-.07.11,0h0a3.26,3.26,0,0,1,.88,0,1.13,1.13,0,0,1,.38.12,1.4,1.4,0,0,1,.32.28c.18.22.25.47.11.6l-.18.15a1.07,1.07,0,0,0-.18.19.34.34,0,0,0-.07.11.42.42,0,0,0,0,.1.19.19,0,0,0,0,.08v0a.38.38,0,0,1-.07.21l-.08.08s-.09.06-.09,0,.11-.22,0-.31a.55.55,0,0,0-.38.14c-.07.06-.1.09-.09.1s0,0,.13,0l.14,0,.08,0h0s0,0,0,0c0,.2,0,.17,0,.22a.36.36,0,0,1,0,.11.83.83,0,0,0-.06.21s0,0,0,0h.12a.65.65,0,0,0,.16-.09.57.57,0,0,0,.23-.3c.1-.48.22-.52.54-.74a.69.69,0,0,0,.22-.62,1.19,1.19,0,0,0-.24-.55,1.73,1.73,0,0,0-.41-.4,1.4,1.4,0,0,0-.56-.22,3.59,3.59,0,0,0-1,0,.47.47,0,0,0-.16,0l-.11,0-.2.07-.17,0h-.12l-.12,0a.83.83,0,0,0-.29,0,3,3,0,0,0-.37,0,4.1,4.1,0,0,0-.69.2l-.36.18a2.37,2.37,0,0,0-.79.63,2,2,0,0,0-.49,1.33,1.84,1.84,0,0,0,.19.79A1,1,0,0,0,69.44,45.81Z"/>
+                <path class="cls-1"
+                      d="M69.25,67.14a1,1,0,0,0-.2,0,3.56,3.56,0,0,0-.62.34c-.28.19-.53.42-.5.45s.31-.12.62-.25a3.27,3.27,0,0,1,.41-.17l.19-.06s.07,0,.07,0,0,0,0,0,0,.14,0,.22,0,.18-.07.25-.16.14-.18.17,0,0,.09,0,.16-.05.22-.12a1.74,1.74,0,0,0,.14-.27,2.09,2.09,0,0,0,.13-.37C69.6,67.18,69.39,67.1,69.25,67.14Z"/>
+                <path class="cls-1"
+                      d="M69.93,63.14l-.33,0a1.15,1.15,0,0,0-.31,0,3.87,3.87,0,0,0-1,.41,1.55,1.55,0,0,1-.32.14c-.07,0-.12,0-.12,0s0,0,.13,0a1.25,1.25,0,0,0,.36-.09,5.22,5.22,0,0,1,1-.31h.57l0,0h0l-.09,0a4.78,4.78,0,0,0-.92.64c-.16.12-.31.24-.45.23a.8.8,0,0,1-.38-.23.78.78,0,0,1-.2-.26.12.12,0,0,1,0-.11s-.09,0-.1.12a.63.63,0,0,0,.18.34.9.9,0,0,0,.45.32.84.84,0,0,0,.6-.22,4.68,4.68,0,0,1,.91-.55l.11,0,.18-.06.3-.09a.88.88,0,0,0,.2-.1s.18-.11,0-.29A1.78,1.78,0,0,0,69.93,63.14Z"/>
+                <path class="cls-1"
+                      d="M67.31,42.55a.85.85,0,0,0-.25-.37.41.41,0,0,0-.24-.1h0a.3.3,0,0,0-.22.11.9.9,0,0,0-.18.34s.07,0,.15.07l-.16.15s0,0,0,0l0,0,.29,0,.32,0a.37.37,0,0,0,.23-.05A.2.2,0,0,0,67.31,42.55Z"/>
+                <path class="cls-1"
+                      d="M66.41,45c-.06-.06-.14-.09-.16-.06a2.06,2.06,0,0,0-.29.45A.58.58,0,0,0,66,46a.73.73,0,0,0,1.11-.38.58.58,0,0,0-.25-.49C66.63,45,66.41,45,66.41,45Z"/>
+                <path class="cls-1"
+                      d="M64.58,43.12h0l.06,0a.19.19,0,0,0,.09-.05.08.08,0,0,0,0,0,.29.29,0,0,0-.28-.48h0a.25.25,0,0,0-.18.14.33.33,0,0,0,0,.06v0s0,0,0,0C64.22,43,64.35,43.21,64.58,43.12Z"/>
+                <path class="cls-1"
+                      d="M64.8,63.18h-.32a3.24,3.24,0,0,0-.67,0,.81.81,0,0,0-.52.46c-.07.17-.08.29-.06.3a2.44,2.44,0,0,0,.94-.07,1.7,1.7,0,0,0,.62-.28l.07,0a.11.11,0,0,0,.06,0s0,0,.09-.08a.18.18,0,0,0-.06-.23C64.81,63.17,64.82,63.2,64.8,63.18Zm-.7.49c-.35.12-.73.21-.84.26.07-.09.25-.46.6-.5a3.94,3.94,0,0,1,.6,0A1.13,1.13,0,0,1,64.1,63.67Z"/>
+                <path class="cls-1"
+                      d="M63.86,66.3a2.15,2.15,0,0,0-.52-.13l-.36,0a1,1,0,0,0-.78.31,1.22,1.22,0,0,0-.36,1,2.13,2.13,0,0,1,.52-.88.73.73,0,0,1,.59-.17l.35,0a2.92,2.92,0,0,1,.45.08l0,0v0a.5.5,0,0,1-.07.08c-.1.11-.24.24-.33.32-.34.14-.68.19-.68.22a1.18,1.18,0,0,0,.77,0,3.25,3.25,0,0,0,.42-.31l.09-.1a.5.5,0,0,0,.1-.19C64.1,66.45,64,66.34,63.86,66.3Z"/>
+                <path class="cls-1"
+                      d="M60.42,68.86c-.32-.14-.6,0-.57,0s.07,0,.16,0a.86.86,0,0,1,.28.11s0,.06,0,.06-.05,0-.05,0a1.49,1.49,0,0,1-.46.07.49.49,0,0,1-.19,0c-.06,0,.05,0,.05.07l0,.07s0,0,0,0,0,0,0,0,0,0,0,0l.09,0a1.23,1.23,0,0,0,.41,0l.19,0a.58.58,0,0,0,.25-.12.26.26,0,0,0,.07-.24A.4.4,0,0,0,60.42,68.86Zm-.71.46s0,0,0,0S59.77,69.41,59.71,69.32Z"/>
+                <path class="cls-1"
+                      d="M58,62.47a.81.81,0,0,0-.31-.06,2.63,2.63,0,0,0-.77.06c-.26,0-.52.06-.73.08l-.15,0-.06,0s-.05.07,0,.08.09.06.09.06,0,0,0-.07h.18a3.58,3.58,0,0,0,.74,0,3.3,3.3,0,0,1,.72,0l.18,0h0s0,0,0,0-.35.38-.54.42a.72.72,0,0,1-.34-.05l-.33-.1a1.21,1.21,0,0,0-.33-.06s.1.09.28.18l.32.15a.91.91,0,0,0,.43.11.83.83,0,0,0,.42-.2L58,63a.59.59,0,0,0,.18-.14.24.24,0,0,0,.05-.17.2.2,0,0,0-.07-.15A.37.37,0,0,0,58,62.47Z"/>
+                <path class="cls-1"
+                      d="M68,32.6a9.45,9.45,0,0,1-.92.58c-.18.1-.39.2-.62.3s-.48.18-.76.26l-.06,0-.28.05h0a6.6,6.6,0,0,1-.84.16l-.14,0h-.21l-.5,0-.55,0a3.85,3.85,0,0,1-.48,0A15.57,15.57,0,0,1,60,33.73a25,25,0,0,1-2.47-.64A9.23,9.23,0,0,1,55.11,32l0,0-.84-.59-.41-.32-.28-.22v-.09l0-.24c0-.16.08-.32.13-.48a6.91,6.91,0,0,1,.37-.95,10.46,10.46,0,0,1,2.48-3.28,8.38,8.38,0,0,1,3.31-2.09,4.94,4.94,0,0,1,3.44.5l.66.32a6.68,6.68,0,0,1,.78.47,4.36,4.36,0,0,1,.85,1,1,1,0,0,1,.12.15l.24.45.08.15a21.9,21.9,0,0,1,1.45,3.34A13.61,13.61,0,0,1,68,31.84s0,.75,0,.76a3.9,3.9,0,0,0,.18-2,16.49,16.49,0,0,0-.59-2.52,10.8,10.8,0,0,0-1.14-2.52,5.56,5.56,0,0,0-1.16-1.29,11.65,11.65,0,0,0-1.62-.88,7.72,7.72,0,0,0-1.87-.59,4.76,4.76,0,0,0-2.12.1,6.69,6.69,0,0,0-2,1,12.1,12.1,0,0,0-1.67,1.36,11.5,11.5,0,0,0-2.57,3.55,10,10,0,0,0-.38,1c-.05.18-.09.36-.13.54s0,.18,0,.29,0,.29,0,.43l.33.27.21.16c.14.1.28.22.43.32l.86.58h0a9.39,9.39,0,0,0,2.61,1.13,23,23,0,0,0,2.54.58,12.77,12.77,0,0,0,4.43.18,7.53,7.53,0,0,0,2.83-1A2.43,2.43,0,0,0,68,32.6Z"/>
+                <path class="cls-1"
+                      d="M70,34.8a14.28,14.28,0,0,0,.16-3.36,31.65,31.65,0,0,0-.28-3.67A11.8,11.8,0,0,0,68.67,24a8.88,8.88,0,0,0-2.61-3h0l0,0a9.26,9.26,0,0,0-5.51-2,27.83,27.83,0,0,0-4.85.52,17.35,17.35,0,0,0-3.33,1c-.8.34-1.23.63-1.3.65a16.69,16.69,0,0,0-1.49,1.06,25.2,25.2,0,0,0-3.12,3,24.7,24.7,0,0,0-1.78,2.24l-.42.61-.32.47-.2.29-.1.15c0,.05.06.09.08.14l.47.54.28.33.55.6a47.56,47.56,0,0,0,4.91,4.66,25,25,0,0,0,2.8,2l.74.43.76.38c.51.24,1,.45,1.49.67,2,.84,3.79,1.61,5.42,2.14.36.11.69.21,1,.29a9.31,9.31,0,0,0,1.26.28,7.51,7.51,0,0,0,1.82,0c1-.08,1.55-.41,1.49-.47s-.13.05-.38.1a5.26,5.26,0,0,1-1.13.1A6.89,6.89,0,0,1,63.45,41a15.08,15.08,0,0,1-2.18-.67C59.7,39.76,57.9,38.94,56,38c-.48-.22-1-.45-1.45-.7l-.7-.38c-.23-.14-.47-.28-.69-.43a24.1,24.1,0,0,1-2.66-2,48.11,48.11,0,0,1-4.69-4.67l-.52-.6L45,29l0,0s0,0,0-.05v0l.11-.14c.14-.21.29-.41.43-.61A25.21,25.21,0,0,1,47.32,26a24.3,24.3,0,0,1,3-2.81c.79-.61,1.31-.89,1.36-.94s.44-.27,1.14-.58a16.12,16.12,0,0,1,3.07-1,29,29,0,0,1,4.62-.59A8.32,8.32,0,0,1,65.4,21.8l0,0a7.92,7.92,0,0,1,2.42,2.63A11,11,0,0,1,69,27.9a34.74,34.74,0,0,1,.39,3.57,13.85,13.85,0,0,1,0,3.23,13.51,13.51,0,0,1-1.65,4.65c-.3.52-.57.92-.76,1.2a3,3,0,0,0-.29.42c0,.05.6-.44,1.3-1.47A12.55,12.55,0,0,0,70,34.8Z"/>
+                <path class="cls-1"
+                      d="M90.87,87.6c-.14-.21-.33-.38-.48-.58a5.28,5.28,0,0,0-1.18-.92,4.88,4.88,0,0,0-2.86-.55,9.6,9.6,0,0,0-2.69.7c-.85.33-1.63.75-2.4,1.13s-1.55.77-2.3,1.15c-3,1.57-5.75,3.1-8.4,4.3a32.68,32.68,0,0,1-7.44,2.52,18.8,18.8,0,0,1-6,.23L56,95.41l-1-.25-1.6-.4c-.43-.11-.76-.18-1-.23L52,94.46a1.07,1.07,0,0,0,.32.12l.48.16s0-.06,0-.06,0,0,0,.07l.43.13,1.59.46.9.26a1.69,1.69,0,0,1,.6.93,5.24,5.24,0,0,1-.28,2.94,8.63,8.63,0,0,1-1.71,2.47,12,12,0,0,0-.9,1.1c-.53-.11-1.06-.23-1.57-.37a13.43,13.43,0,0,1-3.16-1.31c-.18-.09-.35-.19-.52-.29l.67-.25a10,10,0,0,0,2.89-1.66,3.85,3.85,0,0,0,1-1.49,4.4,4.4,0,0,0,.25-1.53,3.81,3.81,0,0,0-.22-1.39h-.06a9.38,9.38,0,0,1,0,1.39,3.69,3.69,0,0,1-1.34,2.67,9.58,9.58,0,0,1-2.79,1.45c-.41.15-.76.26-1,.33l-.16,0h0l-.22-.15-.35-.24c-.18-.13-.42-.3-.62-.47-.43-.33-.9-.78-1.34-1.17,0,.53,0,1,0,1.56l-.81-1.7-.39-.84-.56.74-.6.77-.08.1s0,.06,0,0v-.06l-.06-.3L42.08,97c-.06-.31-.13-.61-.2-.92l-.1-.47a3,3,0,0,0-.16-.56c-.08-.17-.27-.8-.48-1.5.22,0,.49.08.78.11a6.32,6.32,0,0,0,1.56,0,5.66,5.66,0,0,0,1.69-.54,3,3,0,0,0,1.24-.86,3.87,3.87,0,0,0,.58-.93c.08-.24.16-.46.23-.66.13-.39.25-.72.32-1,.17.33.29.52.29.54s.21.33.53.77a18.44,18.44,0,0,0,1.22,1.54A7.72,7.72,0,0,0,51,93.86a2.27,2.27,0,0,0,.79.37s0,0,0,0-.28-.23-.66-.57a8.81,8.81,0,0,1-1.26-1.39c-.42-.55-.8-1.14-1.08-1.59l-.46-.78a7.06,7.06,0,0,1-.47-.75,6.25,6.25,0,0,1-.6-1.76,14.28,14.28,0,0,1-.1-2.73h0a5.07,5.07,0,0,0-.37,2.64,1.56,1.56,0,0,0-.15.06c-.21.07-.51.15-.88.24a20.91,20.91,0,0,1-2.75.35,3.89,3.89,0,0,1-2.53-.76,3.19,3.19,0,0,1-.64-.65,6,6,0,0,1,.15-1,29.43,29.43,0,0,1,.88-3c.18-.43.37-.84.57-1.24-.09-.16-.14-.31-.2-.41h0c0,.11.11.25.2.41a3,3,0,0,0,.29.44,3.72,3.72,0,0,0,2.33,1.41,6.18,6.18,0,0,0,2.67-.18,6.1,6.1,0,0,0,.81-.28,3.61,3.61,0,0,0-.38,1.69c.11,0,.35-1,1.22-2.28a29.25,29.25,0,0,1,3.88-4.15c.76-.73,1.48-1.54,2.12-2.29a26.07,26.07,0,0,0,1.67-2.17,13,13,0,0,0,1-1.73,1,1,0,0,1,.07-.15c.15.56.42,1.41.67,2.29.21.72.42,1.45.54,2s.19.91.2.92,0,.11,0,.27.06.4.1.68c.08.56.17,1.32.26,2.07.12,1.12.24,2.22.33,2.71h0l-.28.11s-.55.27-.56.29c-.83.53-1.27.84-2,1.3a2.9,2.9,0,0,0-.78.34,1.43,1.43,0,0,0-.81,0,1.34,1.34,0,0,0-.68.72,2.37,2.37,0,0,0-.18.55,2.14,2.14,0,0,0-.06.31.86.86,0,0,0,0,.16v.23c.18.27.36.56.55.86,0,.06.09.06.14.08l.17,0,.23.06.45.1.93.18c.09,0,.14,0,.3,0h.2l.08,0h0a.14.14,0,0,0,.08,0l.44-.34,2.82-2.14c.19-.56.37-1,.49-1.36l.18-.52a1.47,1.47,0,0,1,0-.17v-.13h0v0h0v0h0a.28.28,0,0,0,0-.11l0,0c.1-.32.25-.76.43-1.28s.38-1.14.59-1.79c.11-.32.23-.66.34-1l.18-.51h0l0,0h0a1.06,1.06,0,0,0,.07-.22V78l0-.28a52.52,52.52,0,0,0,.29-5.39h.06c0,.15,0,.34.06.57,0,.61.14,1.49.24,2.56.05.54.11,1.12.17,1.74l.06.48,0,.24,0,.13c0,.06,0,.17.05.21.08.3.15.6.23.92.31,1.39.66,2.89,1,4.43l2,1,2.58,0a3,3,0,0,0,1.34-.21,1.61,1.61,0,0,0,.55-.48c.13-.18.23-.35.34-.53s.2-.34.29-.52a2.73,2.73,0,0,0,.13-.29.69.69,0,0,0,0-.39A1.79,1.79,0,0,0,71.73,81a1.56,1.56,0,0,0-.52-.34,1.08,1.08,0,0,0-.64,0,6.59,6.59,0,0,0-.92.45,9.28,9.28,0,0,1-1.53.68,6.81,6.81,0,0,1-1.29.11,3.92,3.92,0,0,0-.51.07,3.63,3.63,0,0,1-.2-.57,9.13,9.13,0,0,1-.25-2.8,7,7,0,0,1,.65-2.7,3.7,3.7,0,0,0,.16-.4.8.8,0,0,0,0-.44l0-.12c.25-.25.52-.54.79-.86a11.06,11.06,0,0,0,1-1.36c.25-.38.39-.65.4-.66s.14-.3.32-.72.39-1,.59-1.52a14.79,14.79,0,0,0,.53-1.69c.39-.57.75-1.13,1.07-1.68a15.68,15.68,0,0,0,2-5.15,1,1,0,0,0,.4,0,2.14,2.14,0,0,0,.48-.27,1.17,1.17,0,0,0,.24-.21.55.55,0,0,0,.14-.35,1.59,1.59,0,0,0-.18-.64,2.35,2.35,0,0,0-.29-.49,1.17,1.17,0,0,0-.34-.28c-.11-.06-.18-.07-.18-.08s-.09.07-.1.16v0a.21.21,0,0,0,0,.13.61.61,0,0,1,.36.23,2,2,0,0,1,.47.93c0,.16-.12.29-.27.41a1.92,1.92,0,0,1-.41.3.86.86,0,0,1-.34.09,4.88,4.88,0,0,0,.08-.61,6.06,6.06,0,0,0,.06-1c0-.18,0-.34,0-.48s0-.18,0-.26a2.49,2.49,0,0,0-.09-.6c-.07,0,0,.85-.2,2.3a15.37,15.37,0,0,1-2.22,5.6,28.34,28.34,0,0,1-2.4,3.28,5.89,5.89,0,0,1-3.79,1.9,16.42,16.42,0,0,1-2.35.22,15.88,15.88,0,0,1-2.4-.12,10.2,10.2,0,0,1-4.36-2L54.93,69h0a1.6,1.6,0,0,0,.26-1.3.18.18,0,0,0-.19-.11h-.83l-.21,0,.06.2s0,.12-.22.24l-.13-.13a6.9,6.9,0,0,1-1.1-1.62l-.18-.35q-.15-.32-.27-.63h0s0,0,0,0a6.44,6.44,0,0,1-.24-.61,1,1,0,0,0,.21.11.26.26,0,0,1,.1,0,.23.23,0,0,1,.13.16c0,.13-.14.23-.2.29a0,0,0,0,0,0,0,.24.24,0,0,0,.14,0,.37.37,0,0,0,.27-.31.48.48,0,0,0-.17-.41.36.36,0,0,0-.18-.11,1.48,1.48,0,0,1-.42-.19s0,0-.05,0A21.33,21.33,0,0,1,51,61.33c-.16-.74-.28-1.48-.38-2.2l.12,0c.26-.08.66-.2,1.21-.39a10.51,10.51,0,0,0,2.11-1c.41-.26.83-.56,1.28-.91l.74-.6c.31-.25.48-.46.79-.72a6.55,6.55,0,0,1,.56-.6l0,0a7.67,7.67,0,0,1-1,.07c-.4,0-.82.08-1.16.09l-.82,0A9.68,9.68,0,0,1,53,55a5.38,5.38,0,0,1-1.85-.65,3.29,3.29,0,0,1-.67-.53c0-.29.08-.58.13-.86a15.28,15.28,0,0,1,.42-1.65,4.78,4.78,0,0,0,.81.2,6.94,6.94,0,0,0,2-.08l.62-.09.81-.14.89-.16.48-.09c.12,0,0,0,0-.06s-.14,0-.15,0-.17-.1-.17-.11l-.17-.07a3.84,3.84,0,0,1-.8-.43,2.34,2.34,0,0,1-.38-.28c-.09-.07-.16-.16-.24-.23a4.26,4.26,0,0,1-.43-.57c-.08-.16-.16-.3-.22-.45a10.08,10.08,0,0,1-.55-1.74l-.18-.75c.18-.35.3-.6.37-.74h0c.27.09.49.14.74.2,1.07.27,2.13.53,3.16.82l-.57.44a17.91,17.91,0,0,0-2.42,2,20.84,20.84,0,0,0,2.69-1.65l1-.64c.58.17,1.14.34,1.69.52l.67.22-.09.07a13.14,13.14,0,0,0-1.21,1.12,8.94,8.94,0,0,0-1.49,1.81h0a15.19,15.19,0,0,0,1.8-1.48c.45-.37.91-.73,1.27-1l.45-.3a16.2,16.2,0,0,0,3.42,1,9.28,9.28,0,0,0,2,0v0a1,1,0,0,0,.19.14,3.7,3.7,0,0,0,.44.28,1.73,1.73,0,0,0,.47.15,2.79,2.79,0,0,0,1.18,0,6.28,6.28,0,0,0,.66-.23s.07.17.12.33a.27.27,0,0,1,.08.19h0v0a1.16,1.16,0,0,1-.18.51,1.92,1.92,0,0,1-.18.29A2.32,2.32,0,0,1,68.3,51l-.51.09-.61.1a4.7,4.7,0,0,0-.71.14l-.16,0-.09,0s0,.06,0,.08a1.84,1.84,0,0,0,.15.35,2.13,2.13,0,0,0,.52.6,3.18,3.18,0,0,0,.58.35,3.49,3.49,0,0,0,1.12.31A6.5,6.5,0,0,0,70.32,53c.37-.07.64-.13.85-.19h0l.31.84c.07.18.13.35.19.52l-.08.1a2.71,2.71,0,0,1-1,.68,3.82,3.82,0,0,1-1.73.24l-1.06-.09c-.25,0-.58-.08-.94-.17s-.83-.23-1.29-.36l.11.14,0,0v0l0,0,.35.32a9.75,9.75,0,0,0,.74.64l.43.32.29.18a5.33,5.33,0,0,0,.56.32,5.15,5.15,0,0,0,2.26.61,5.47,5.47,0,0,0,2.27-.2c.29.78.45,1.29.55,1.28s.09-.4,0-1c.08-.35.21-.93.38-1.5s.28-.88.38-1.27a3,3,0,0,0,.08-.71s0-.08,0-.22a1.42,1.42,0,0,0-.24-.51,2.22,2.22,0,0,0-1.29-.7l-.4-.13c-.21-.81-.44-1.57-.62-2.2s-.46-1.5-.56-1.87a1.08,1.08,0,0,1-.06-.18H71a4.87,4.87,0,0,0,1-.18,2.84,2.84,0,0,0,1.33-.85c.29-.32.39-.57.36-.6h0c-.07,0-.24.22-.49.41a3.22,3.22,0,0,1-1.28.58,4.44,4.44,0,0,1-1.4,0l-.2,0a2.7,2.7,0,0,0,.53-.46,2.11,2.11,0,0,0,.41-.59,1.07,1.07,0,0,0,.1-.24c-.06-.06-.26.3-.68.65a3.92,3.92,0,0,1-1.83.81,7.36,7.36,0,0,1-2,.12,4.51,4.51,0,0,1-.92-.2l-.26-.08a2.87,2.87,0,0,1-.58-.27l-.29-.22,0,0s0,0,0,0a.29.29,0,0,0-.41-.42s0,0,0,0l0,.07-.48-.41a12,12,0,0,1,1.08-.68c.37-.18.66-.24.66-.29s-.31-.07-.75,0a9.59,9.59,0,0,0-1.34.61l0,0-1.07-.94.69-.23c1.49-.49,3-.87,3-1s0,0-.11,0a15.13,15.13,0,0,0-2.27.37c-.25,0-.49.1-.74.16l-1,.27c-.47-.39-.81-.64-.86-.58a5.35,5.35,0,0,0,.58.66l-.8.25c-.58.19-1,.36-1,.37a8.64,8.64,0,0,0-1,.5l-.41.28c-1.2-.39-2.46-.76-3.71-1.11-.23-.07-.49-.13-.67-.2s-.43-.18-.65-.28l-1.32-.59L52,43.61c.7-.19,1.36-.35,1.9-.47.78-.17,1.32-.22,1.35-.23s.56-.1,1.36-.19a20.23,20.23,0,0,1,2.88-.07A23,23,0,0,1,62.3,43c.68.12,1.15.24,1.27.24s0,0,0,0a4.16,4.16,0,0,0-1.24-.48l-.62-.16a19.94,19.94,0,0,0-2.27-.37,18.9,18.9,0,0,0-3-.06,12.09,12.09,0,0,0-1.41.14s-.59.08-1.38.29-1.56.44-2.44.75h0l-1.73-.82c-1.65-.8-3.19-1.57-4.49-2.27-.65-.35-1.24-.68-1.75-1s-.9-.59-1.29-.87c-.75-.51-1.19-.82-1.24-.86s-1-.64-2.44-1.54L35.8,34.37l-.12-.07s0,0,0-.07h0l.09,0,.28-.17.76-.44,1.6-.89-3.6-1-1-.27-.32-.07.2-.15.14-.1.42-.28,2-1.39L37,29l0,0L37,29l-.1,0-.18-.07-.38-.15-1.38-.52L34.49,28l-.12,0a.15.15,0,0,1-.09-.06.24.24,0,0,1,0-.36l.15-.16.16-.2c.11-.13.21-.27.3-.4a5.62,5.62,0,0,0,.51-.83,10.1,10.1,0,0,0,.7-1.67,14.9,14.9,0,0,0,.64-2.93,10,10,0,0,0,0-2.16c.91.8,1.49,1.23,1.56,1.16s-1.09-1.61-2.85-3.75a30.91,30.91,0,0,1-2.47-4l-.15-.29,0-.07v0L32.79,12c-.07-.19-.13-.39-.2-.6a12.83,12.83,0,0,1-.29-1.26,11.6,11.6,0,0,1-.18-1.3c0-.22,0-.44,0-.64s0-.21,0-.31a.66.66,0,0,1,0-.14V7.72a.49.49,0,0,1,.08-.18c.05,0,.11,0,.19-.07l.54-.13.66-.13c.89-.16,1.78-.3,2.64-.4s1.71-.18,2.45-.2a13.41,13.41,0,0,1,2.07.24c1.36.24,2.51.52,3.32.72l1,.26.22-.23c.1-.09.18-.19.28-.29s.12-.12.17-.19a7.14,7.14,0,0,1,.56-.54,3.63,3.63,0,0,1,.46-.34A.9.9,0,0,1,47,6.16L47.19,6a20.75,20.75,0,0,1,2.49-1.59c.48-.26,1-.51,1.49-.74l.5-.22.55.1a11.74,11.74,0,0,1,2.58.83,10.61,10.61,0,0,1,1.59.91c.27.19.56.38.86.6l.45.34c.19.14.38.29.58.46l.25.23a2.52,2.52,0,0,1,.74.52c.1.16,0,0,0-.11a2.6,2.6,0,0,1,0-.26,1,1,0,0,1,0-.3c-.37-1.25-.69-2.31-.95-3.18-.14-.42-.25-.8-.37-1.13l1,0c.88,0,1.62.08,2.15.13l.9.08.57,0,.17.15A8.16,8.16,0,0,1,65,7a4.46,4.46,0,0,0,.17.54,39.58,39.58,0,0,1,.28-4.77l.58,0h.76l.45,0a2.92,2.92,0,0,0,.44-.06c.45-.07.88-.17,1.32-.25l.28.29a6.8,6.8,0,0,1,1,1.53c.08.17.17.36.24.55a5.8,5.8,0,0,1,.21.89c0,.3.08.62.12.94,0,.16.05.33.07.49l0,.25,0,.13s0,0,0,0l.15-.49a15.41,15.41,0,0,1,.75-2,8.45,8.45,0,0,1,.67-1.2,3.69,3.69,0,0,1,.72-.78,6.43,6.43,0,0,1,.73-.48,3.27,3.27,0,0,1,.42-.21,16.23,16.23,0,0,1,2.16.54c.85.29,1.61.62,2.26.86s.93.34,1.23.42c.36.4.64.68.84.87s.34.29.38.27,0-.18-.19-.43l-.36-.61s0,0,0,0l.4,0h.49c.5,0,1-.09,1.58-.16a15.37,15.37,0,0,1,1.63-.14,2.89,2.89,0,0,1,1.36.23c.66.32.78,1.28.84,1.91a11.5,11.5,0,0,1,0,1.16s.06.78,0,1.87A25.11,25.11,0,0,1,86.7,13a29.25,29.25,0,0,1-1,3.84,7.62,7.62,0,0,0-.54,1.75s0,0,.09,0c0,.31,0,1.08,0,1.84,0,.5-.06,1-.1,1.38s-.07.63-.07.65,0,.27-.08.64a11.17,11.17,0,0,1-.21,1.19V24c0-.29,0-.63,0-1a7.16,7.16,0,0,0-.42-1.35,4.79,4.79,0,0,0-1-1.34A6.94,6.94,0,0,0,81.87,19,6.82,6.82,0,0,0,78,18.11a4.21,4.21,0,0,0-2,.82,6.4,6.4,0,0,0-1.47,1.42,5.3,5.3,0,0,0-.85,1.74c-.18.57-.31,1.11-.42,1.62a32.86,32.86,0,0,0-.55,3.49c0,.08-.16,1.47-.21,3.51a15.86,15.86,0,0,0,1.33,7.34l.12.23.15.28a.6.6,0,0,0,.68.32,1.42,1.42,0,0,0,.32-.07,2.76,2.76,0,0,0,.3-.15l.42-.29c.54-.39,1-.78,1.53-1.17,1-.77,1.87-1.51,2.62-2.17a15.16,15.16,0,0,0,2.53-2.64,1.54,1.54,0,0,0,.09-.24l.38.46c0,.07.1.12.08.11h0c-.07.06-.19.15-.31.27a5.54,5.54,0,0,0-.83,1.07c-.52.93-1.07,2.09-1.78,3.18a8.35,8.35,0,0,1-1.16,1.48,7.12,7.12,0,0,1-1.32,1,12.63,12.63,0,0,0-1.39.88A4,4,0,0,0,77.78,40l.72-.37a4.41,4.41,0,0,0,.78-.52,9.16,9.16,0,0,0,1.36-1.48c.81-1.09,1.47-2.3,2-3.11a4.89,4.89,0,0,1,.72-.85l.24-.19c.14-.1.25-.15.26-.16l.09-.06s0-.07.1-.39v0c0-.09,0-.2.08-.35h0l2.52-.84-1.65-1-.47-.27-.15-.08a1.94,1.94,0,0,1,.13-.2c.12-.16.25-.32.36-.48l.69-.91c.43-.58.8-1.09,1-1.46l.23-.33-.35.13c-.31.11-1.54.25-2.19.34a2.62,2.62,0,0,0-.4.06c.1,0,1.52,0,2.28-.11-.28.29-.62.65-1,1.06s-.49.56-.76.85l-.41.46-.65.76,1.2.78.15.13-.15,0h0l-.28.08-1.11.31-.51.14c.12-.37.29-.94.47-1.56.29-1,.59-2.12.81-2.93h0c-.16.57-.37,1.26-.6,1.85-.06.17-.13.34-.19.49-.53,1.21-.65,2.28-1,2.71s-.56.71-.56.71c-.44.36-1.09.88-1.86,1.48S78,36,77,36.76c-.5.36-1,.74-1.55,1.09l-.41.26-.14.07-.15,0s-.11,0-.12-.07L74.52,38l-.1-.22a13.5,13.5,0,0,1-1-3.66,14.36,14.36,0,0,1-.13-1.69.54.54,0,0,0,.17.07,3.86,3.86,0,0,0,1.09,0,15.52,15.52,0,0,0,2.54-.42,14,14,0,0,0,3.33-1.35,6,6,0,0,0,.83-.59,2.73,2.73,0,0,0,.38-.38.58.58,0,0,0,.1-.12l.09-.16c0-.09.06-.19.08-.27a7.18,7.18,0,0,0,.15-2.11,4.53,4.53,0,0,0-.64-2,11.8,11.8,0,0,0-1.13-1.66,4.19,4.19,0,0,0-1.46-1.21,4.57,4.57,0,0,0-1.65-.42,4.48,4.48,0,0,0-2.45.42l-.32.2,0-.09a4.39,4.39,0,0,1,.69-1.51,5.45,5.45,0,0,1,1.25-1.29A3.61,3.61,0,0,1,78,18.81a6.21,6.21,0,0,1,3.58.71,6.62,6.62,0,0,1,1.33,1.08,4.69,4.69,0,0,1,1,1.17A10.2,10.2,0,0,1,84.37,23c0,.4.09.74.13,1s.08.54.11.7v0a14.12,14.12,0,0,0-.43,1.68,3.35,3.35,0,0,0,.26-.57c.14-.35.31-.82.46-1.31s.25-1,.31-1.36.1-.64.1-.65,0-.28.06-.67,0-.89,0-1.39a12.72,12.72,0,0,0-.14-1.91l0,0a.79.79,0,0,1,0-.14s0,0,0,.09a8.88,8.88,0,0,0,.88-1.45,21.5,21.5,0,0,0,1.48-3.82,22.89,22.89,0,0,0,.78-4.09,18.2,18.2,0,0,0,.09-2s0-.5-.12-1.26A5.66,5.66,0,0,0,88,4.57a2.48,2.48,0,0,0-1.28-1.4A3.79,3.79,0,0,0,84.85,3a17.19,17.19,0,0,0-1.7.29l-1.54.32-1.29.24c-.26-.2-.61-.45-1.06-.74A23.2,23.2,0,0,0,77.1,1.78,13.9,13.9,0,0,0,75,.91L74.13.66,73.34.45l-.4-.11c-.17,0-.35-.08-.51-.1a10.33,10.33,0,0,0-1.83,0c-.69,0-1.35.11-2,.18-.44,0-.85.1-1.23.13a1.72,1.72,0,0,1-.31,0,2.61,2.61,0,0,1-.28,0L66.14.47l-.42,0L64.89.34C63.71.2,62.8.11,62.39.07l-.23,0-.93,0c-.58,0-1.37,0-2.31,0-.71,0-1.49.09-2.33.19l-.88.11a15.68,15.68,0,0,0-3.64,1l-.46.22-.41.21-.81.46a0,0,0,0,1,0,0h0c-.51.31-1,.62-1.46,1a15.45,15.45,0,0,0-2.4,2.07l-.29.31A.27.27,0,0,0,46,5.37l-1.38-.31c-.86-.17-2.06-.42-3.54-.61a14.83,14.83,0,0,0-2.53-.15c-.89.07-1.76.2-2.67.35s-1.82.34-2.75.58l-.71.19-.37.1-.18.05-.27.1a1.78,1.78,0,0,0-1,.62,2.26,2.26,0,0,0-.37,1.11c0,.1,0,.22,0,.3v.21c0,.13,0,.27,0,.4s0,.52.08.77q.12.75.3,1.47c.13.48.27.94.44,1.4.1.23.18.45.29.67l.08.19a.75.75,0,0,0,.07.12l0,.07.18.29a27.93,27.93,0,0,0,3,4c.73.71,1.38,1.31,1.92,1.79h0a16.86,16.86,0,0,1-.25,2.24,16.17,16.17,0,0,1-.79,2.8,8.25,8.25,0,0,1-1.86,3,.92.92,0,0,0-.12,1.26,1,1,0,0,0,.28.23,2.56,2.56,0,0,0,.31.14l.44.18.26.12.17.07c.05,0,.12,0,.13.07l-.16.09-.15.1-.07,0-.21.13-.85.54-2.59,1.66,3.41,1,.59.17.18,0,0,0,.16.06-.15.07a3.36,3.36,0,0,0-.48.28l-.34.24a1.12,1.12,0,0,0-.27.26c-.09.1-.08.18-.13.28s-.09.19,0,.28a2.36,2.36,0,0,0,.15.25l.22.26c.18.16.43.31.6.44L37.65,37,40,38.59l1.24.82c.35.24.85.58,1.38.88s1.16.65,1.82,1c1.34.68,2.92,1.42,4.61,2.18l.79.35a13,13,0,0,0-1.67.83c-.69.41-1.05.84-1,.88a9.81,9.81,0,0,1,1.13-.66,17.15,17.15,0,0,1,2.08-.81l1.27.55.84.35-.9,1.87c-.32.68-.71,1.44-1.16,2.44-.07.16-.13.32-.2.49a14.45,14.45,0,0,0-1.45.77c-.52.33-1.08.69-1.58,1l-.68.52-.29.23a.74.74,0,0,1-.13.12l-.14.13a.83.83,0,0,0-.25.67,1.42,1.42,0,0,0,0,.25,2.53,2.53,0,0,0,.13.35,4.26,4.26,0,0,0,.45.71c.46.53,1.14.89,1.6,1.4a3.2,3.2,0,0,1,.79,1.74c0,.14.06.26.08.37s0,.08,0,.12l0,0,0,0h0s0,0,0,0h0v0s0,0,0,0l0,0v0h0v0h0s-.06,0-.07,0h0a.94.94,0,0,0-.55-.2,1.41,1.41,0,0,0-.41.07.26.26,0,0,0,0-.21c0-.08,0-.15-.05-.25s0-.46-.2-.63-.24,0-.35,0a1.68,1.68,0,0,0-.36.28l-.33.27a1.48,1.48,0,0,0-.29.36,6.14,6.14,0,0,0-.4.86,4.7,4.7,0,0,0-.18.47,1.07,1.07,0,0,0,0,.64,1.51,1.51,0,0,0,.91.83,5,5,0,0,0,1.13.28A9.11,9.11,0,0,0,48.9,61a2.51,2.51,0,0,0,.65-.08l.19-.07c0,.22.09.45.15.68a21.2,21.2,0,0,0,1.6,4.74c.14.29.29.57.46.85A12.34,12.34,0,0,1,50.62,69s-.21.21-.51.49l-.17.19c-.93,1-1.84,2.08-2.76,3.12h0s0,0,0,0h0c-.6.66-1.27,1.33-1.88,2-.46.46-.89.94-1.33,1.42l-.81,1.19c-.33.57-.65,1.13-1,1.67a.83.83,0,0,0-.08.12c-.11.22-.34.76-.52,1.2l-.1.19a2.77,2.77,0,0,1-.1.26h0v0l0,.05h0a24.24,24.24,0,0,0-1.39,4.43c-.07.32-.12.6-.17.89l-.06.36v.06a6.75,6.75,0,0,0,.25,3.24h0v0a4.91,4.91,0,0,0,.39,1,11.84,11.84,0,0,1-.41-2.9c0-.27,0-.55,0-.83a2.08,2.08,0,0,0,.41.35,4.1,4.1,0,0,0,2.8.74,14.86,14.86,0,0,0,2.79-.51,3.91,3.91,0,0,0,1-.4.28.28,0,0,0,0,.09,6.53,6.53,0,0,0,.51,2l.1.19c-.11.24-.25.57-.43,1-.09.2-.17.42-.27.65a2.74,2.74,0,0,1-.39.64,3.62,3.62,0,0,1-1.36.93,5.12,5.12,0,0,1-3.07.42,8.94,8.94,0,0,1-1-.17c-.25-.82-.49-1.62-.57-1.81.12.47.93,3.59,1,4.08A25.2,25.2,0,0,1,42,99.92c.12.34.23.69.33,1l.15.08c.15,0,.36-.23.54-.46l.58-.73,0-.07c.51,1,1,2.12,1.53,3.2l1.12,2.35-.07-2.6c0-.49,0-1,0-1.48v-.16s0-.11,0-.11l.12.09.45.31c.5.33,1,.64,1.55.93a14.77,14.77,0,0,0,3.39,1.37,66.05,66.05,0,0,0,7.18,1.22l.9.13.18,0h.53l.31,0,1.84-.15c1.22-.11,2.45-.26,3.67-.45s2.44-.42,3.65-.71a18.53,18.53,0,0,0,3.56-1.23l3.05-1.22c.91-.18,2-.36,3-.59.49-.14,1-.25,1.48-.43l.74-.25.71-.31a16.1,16.1,0,0,0,5.06-3.38,12.81,12.81,0,0,0,3.22-5,12,12,0,0,0,.4-1.42,6.21,6.21,0,0,0,.13-.73l0-.36a1.76,1.76,0,0,0,0-.48Zm-19.73-4h0Zm-5.06-1.5h0Zm-1.3-10a9.59,9.59,0,0,0,2.31-.74,5.08,5.08,0,0,0,1.66-1.26c-.17.32-.34.62-.48.87s-.36.64-.37.65-.14.29-.32.69-.45.9-.74,1.38a10.11,10.11,0,0,0-1.16,2c0,.07.15,0,.33-.16a1.48,1.48,0,0,1,0,.27,25.11,25.11,0,0,0-.33,2.81c-.06,1.31-.06,2.23-.08,2.83,0,.32,0,.54,0,.69a.13.13,0,0,1,0,.06v0h0l.32-.06H66c.2,0,.48,0,.84,0a5.61,5.61,0,0,0,1.34,0,9.05,9.05,0,0,0,1.64-.62,7.83,7.83,0,0,1,.86-.38.73.73,0,0,1,.73.28,1.2,1.2,0,0,1,.31.65.85.85,0,0,0-.4-.16,1.51,1.51,0,0,0-.56.08.3.3,0,0,0-.17.09s0,0,0,0,0,0,.08,0a.38.38,0,0,1,.16,0,2.13,2.13,0,0,1,.5,0,.69.69,0,0,1,.42.35.46.46,0,0,1,0,.08l.29-.14h0l-.3.13a.28.28,0,0,0,0-.07l-.08.15c-.09.16-.19.32-.3.49l0,.07h0v0a1,1,0,0,0-.3-.23,0,0,0,0,0,0,0h-.06a1,1,0,0,0-.36-.06h-.19a.11.11,0,0,0-.08,0,.37.37,0,0,0-.17,0s0,0,0,0l0,0s0,0,.07,0a.39.39,0,0,1,.15,0h.1a1.64,1.64,0,0,1,.39.14.59.59,0,0,1,.18.17,1,1,0,0,1,.09.18,0,0,0,0,0,0,0,.28.28,0,0,1,0,.11h0l.27.19a.23.23,0,0,0,0-.1.28.28,0,0,1,0,.11l-.27-.19h0a.89.89,0,0,0,0-.11,0,0,0,0,1,0,0l-.09.11a1,1,0,0,1-.36.3,2.26,2.26,0,0,1-1.07.11l-2.42,0-1.5-.82q-.07-.43-.18-.87h0L64.82,79c0-.17-.07-.33-.11-.5l0-.25-.08-.29c0-.29-.06-.57-.08-.84,0-.62-.1-1.2-.15-1.73-.08-1.07-.14-1.95-.19-2.56,0-.25,0-.46,0-.61Zm5.4-24.77ZM69,48.9a1.31,1.31,0,0,1-1-.09.9.9,0,0,1-.27-.2.34.34,0,0,1,0-.15h0c.25-.08.49-.17.69-.25a8.55,8.55,0,0,0,1.35-.5h0c0,.06.07.12.1.13l.06,0,0,0h0a.76.76,0,0,1,.2.16v.08c0,.1-.13.22-.13.22l-.26.18A1.66,1.66,0,0,1,69,48.9Zm1.16,3.38a3.93,3.93,0,0,1-1.47.4,2.64,2.64,0,0,1-1.53-.43,1.27,1.27,0,0,1-.36-.37.57.57,0,0,1-.12-.23s0,0,.07,0l.12,0,.48,0,1.08-.1a2.94,2.94,0,0,0,1.93-.82l.47,1.26A4.92,4.92,0,0,1,70.15,52.28ZM72.08,57a10.19,10.19,0,0,1-1.62-.09,5.15,5.15,0,0,1-2.09-.67l-.53-.33-.23-.17-.08-.07-.14-.12,0-.05.08,0,.16,0,.18,0a10.67,10.67,0,0,0,1.09.12,4.36,4.36,0,0,0,2-.22,3.23,3.23,0,0,0,1.07-.67l.73,2a.66.66,0,0,0,0,.15A4.82,4.82,0,0,0,72.08,57Zm.32-4.22a1.84,1.84,0,0,1,.95.61,1.06,1.06,0,0,1,.11.44.79.79,0,0,1,0,.14,3.19,3.19,0,0,1,0,.4c0,.31-.19.81-.25,1.28,0,.21-.06.42-.08.62-.15-.86-.4-1.9-.66-2.93l-.16-.6Zm-5.09-4.62-.39.06Zm-2.62-.61a3.65,3.65,0,0,0,1,.49,4,4,0,0,0,1.07.17h.08a9.52,9.52,0,0,1-1.93-.13,15.12,15.12,0,0,1-2.81-.9l1.3-.85A14.16,14.16,0,0,0,64.69,47.56Zm-4.61-1.88s.38-.18.93-.4l1-.37c.3.33.66.7,1,1.08l-1.14.62-.53.3-1.12-.44-1.06-.37C59.68,45.84,60.05,45.69,60.08,45.68Zm14.37-23h0a5.88,5.88,0,0,1,2.18-.61h.51a4.3,4.3,0,0,1,1.53.45A3.85,3.85,0,0,1,80,23.66a6.79,6.79,0,0,1,1.6,3.48,7,7,0,0,1-.18,1.95.65.65,0,0,1-.07.21l0,.06-.07.08a2.46,2.46,0,0,1-.33.31,5.84,5.84,0,0,1-.77.53,11.78,11.78,0,0,1-2.26,1,9.85,9.85,0,0,1-1,.27,15.42,15.42,0,0,1-2.43.38h-.11a3.21,3.21,0,0,1-.81-.06.4.4,0,0,0-.29.05c0-.39,0-.77,0-1.13a3.25,3.25,0,0,1,0-.33h0c.09-1.82.25-3,.26-3.11s.1-1.45.46-3.41c.06-.36.15-.73.24-1.11,0,0,0,0,0-.06ZM70.79,2.15A8.43,8.43,0,0,1,72.26,2a1.48,1.48,0,0,1,.31,0l.41.05a3.64,3.64,0,0,0,.44.07l-.42.4a4.62,4.62,0,0,0-.72,1,13.45,13.45,0,0,0-.62,1.26c-.13.34-.28.75-.43,1.18a2.55,2.55,0,0,0-.08.26s0,.07,0,0V6.22l0-.16,0-.32q0-.3-.06-.57a3,3,0,0,0-.1-.5,5.46,5.46,0,0,0-.21-.61,12.39,12.39,0,0,0-.83-1.76C70.17,2.25,70.48,2.19,70.79,2.15Zm-6.13.63c.1.73.2,1.81.27,3.32a13.48,13.48,0,0,0-1.45-3.37ZM56,2.5c.41,0,.81,0,1.2,0,.19.34.39.77.61,1.28.31.7.73,1.82,1,2.46,0,0,.06.15.12.31s0,.17.09.27.11.28,0,.12-.28-.28-.58-.53l-.16-.13L57.85,6l-.45-.34L56.52,5a13.29,13.29,0,0,0-1.62-1A20.13,20.13,0,0,0,52.84,3,14.93,14.93,0,0,1,56,2.5ZM49.21,54.7c-.11-.18-.22-.34-.31-.51L48.81,54l-.05-.12v0h0l.27-.17.28-.18C49.27,53.92,49.23,54.3,49.21,54.7Zm1,5h0Zm.64-4.61A7.34,7.34,0,0,0,53,55.5a11.87,11.87,0,0,0,1.45,0l.82-.06.63-.07.55-.14.34-.08,0,0-.55.45a17.59,17.59,0,0,1-2.47,1.68,7.11,7.11,0,0,1-2.05.64,9.74,9.74,0,0,1-1.23.12h-.11q-.06-.6-.09-1.17a14.88,14.88,0,0,1,0-2Zm.72-5.31c.41-.88.85-1.72,1.17-2.38a1.42,1.42,0,0,1,.08-.18s0,0,0,0c.22.44.46,1,.85,1.69a4.45,4.45,0,0,0,.81,1,3.11,3.11,0,0,0,.28.23l.21.16a3.66,3.66,0,0,0,.52.28l.09,0,.14,0s.15,0,.05,0l-.29,0L55,50.9l-.51,0-.61,0a4.74,4.74,0,0,1-1.79-.19,3,3,0,0,1-.72-.4C51.45,50.17,51.53,50,51.62,49.77Zm-2,10.37c0,.12-.38.24-.71.24a7.76,7.76,0,0,1-1.08,0,4.52,4.52,0,0,1-1-.2,1.07,1.07,0,0,1-.64-.48.59.59,0,0,1,0-.35,4.29,4.29,0,0,1,.13-.44,8.29,8.29,0,0,1,.32-.82,1.08,1.08,0,0,1,.21-.29l.26-.25.18-.19c.06-.05.15-.13.22-.08s.08.27.15.39.11.27.07.34l-.1.11,0,0a1.08,1.08,0,0,0-.54.38.41.41,0,0,0,0,.34.48.48,0,0,0,.12.2,1,1,0,0,0,.13.14s.11,0,.15-.09.08-.15.05-.17l-.09-.08c0-.07-.1-.14-.07-.21s.2-.17.38-.26a1.52,1.52,0,0,1,.57-.18.85.85,0,0,1,.54.19c.16.12.32.23.43.33s.09.47.13.47a.35.35,0,0,0,.07-.14.2.2,0,0,0,0-.11v-.07a.47.47,0,0,0-.12-.23,1.81,1.81,0,0,0-.24-.24h0a.09.09,0,0,0,0-.06.19.19,0,0,0,0-.09,1.13,1.13,0,0,0,0-.18c0-.12,0-.26,0-.41a4.3,4.3,0,0,0-.1-1,3.19,3.19,0,0,0-.53-1.12c-.51-.68-1.18-1.14-1.43-1.53a2.61,2.61,0,0,1-.27-.52,1.23,1.23,0,0,1-.06-.21s0,0,0-.06l.07-.08L46.9,53l.25-.24.6-.56c.45-.39.94-.8,1.42-1.18.32-.27.64-.52.91-.72a15.8,15.8,0,0,0-.54,1.93h0l-1,.65-.26.18c-.19.13-.42.25-.48.45a.91.91,0,0,0,.06.68c.06.14.08.17.12.25l.11.2c.16.26.34.5.53.76l.29.39.16.19.07.08h0c0,.06,0,.1,0,.16.06.58.12,1.2.18,1.84l.09.83,0,.29.07.58s0,0,0,0,0,.1.05.17h0v0h0v0h0v0h0v0a.08.08,0,0,1,0,.07ZM59.77,72.28a14.62,14.62,0,0,0,2.55.07c.19,0,.38,0,.57,0-.06.31-.12.77-.21,1.34-.15,1.07-.37,2.5-.58,3.94l0,.21s0,.07,0,.1v0h0s0,0,0,0l0,.09-.21.5c-.14.34-.26.66-.39,1l-.69,1.76c-.2.52-.37,1-.48,1.27,0,.08-.06.15-.08.22v0l0,.07s0,0,0,0v0c0,.09,0,.13,0,.14s-.21.68-.51,1.63c-.34.27-.72.6-1.12.93L57,86.86l-.18.16-.09.07,0,0h0a1.48,1.48,0,0,1-.14-.25.6.6,0,0,1-.09-.28.36.36,0,0,1,0-.12.63.63,0,0,1,.18-.38c.13-.18.26-.34.29-.37-.09-.21-.89.56-.79.71a.82.82,0,0,0,.21.57l.11.12L55.59,87l-.45-.07-.19,0a.76.76,0,0,1,0-.15.77.77,0,0,1,.08-.29c0-.08.06-.12.06-.13a2,2,0,0,1,.23-.4c.14-.19.35-.32.33-.36s-.28,0-.49.19a1.33,1.33,0,0,0-.26.28.84.84,0,0,0-.1.15,1.12,1.12,0,0,0-.1.5c-.09-.12-.19-.24-.27-.36v-.21a2.45,2.45,0,0,1,0-.27,3.12,3.12,0,0,1,.1-.48,1.14,1.14,0,0,1,.45-.64,1,1,0,0,1,.7-.18c.08.16,2-.6,2-.62a12.54,12.54,0,0,0,1.75-1.15h0a9.25,9.25,0,0,0,.26-3,26.88,26.88,0,0,0-.13-3.16s-.1-.45-.29-1-.47-1.27-.77-2-.65-1.46-.92-2A9.7,9.7,0,0,0,59.77,72.28ZM54.3,67.85c.18,0,.47,0,.64,0a1.35,1.35,0,0,1-.2.91l0,0c-.23-.2-.46-.4-.67-.61A.79.79,0,0,0,54.3,67.85ZM43.9,77.71c.58-.72,1.15-1.38,1.7-2l0,0h0a3.12,3.12,0,0,0,.88.8,2.41,2.41,0,0,0,1.19.34c.35,0,.59-.17.54-.25s-.2-.11-.43-.24a3.82,3.82,0,0,1-.74-.59,2.66,2.66,0,0,1-.44-.74l-.09-.31a.73.73,0,0,0,0-.08,0,0,0,0,0,0,0h0a.73.73,0,0,1,0,.08l.23-.25c.28-.3.55-.57.82-.83,0,0,0,0,0,0a3.3,3.3,0,0,0,.85.86c.89.61,1.9.71,1.94.55s-.79-.61-1.33-1.25a2.72,2.72,0,0,1-.53-.93l0-.1.72-.68.42-.4a1.7,1.7,0,0,0,.62.75,1.87,1.87,0,0,0,.39.23l.38.17a4.64,4.64,0,0,0,.69.23c.42.1.73.06.74,0s-.22-.2-.54-.43c-.16-.11-.34-.25-.52-.4l-.3-.23a3,3,0,0,1-.25-.24.75.75,0,0,1-.13-.82,1.35,1.35,0,0,1,.16-.3l.07-.16.57-.53,0,0v0l.05.12a1.37,1.37,0,0,0,.29.31,4.06,4.06,0,0,0,.57.35c.43.22.95.29,1,.1s-.19-.47-.4-.81l-.28-.46c-.12-.16-.12-.15-.12-.16s-.08-.07-.15-.42c0,0,0-.08,0-.12a2.77,2.77,0,0,0,.31-.53l.19.21a17.72,17.72,0,0,0,2,1.68c.35.25.71.49,1.08.71,0,.08-.08.18-.13.3a13.28,13.28,0,0,1-.83,1.59c-.4.64-.92,1.38-1.51,2.14s-1.24,1.57-1.94,2.33c-.89,1-1.81,2-2.56,2.9a5.43,5.43,0,0,1-.79.09A7.9,7.9,0,0,1,46,80a3.24,3.24,0,0,1-1.08-.5,2.52,2.52,0,0,1-.68-.76,2.58,2.58,0,0,1-.34-1,.08.08,0,0,1,0,0,.16.16,0,0,0,0-.07h0ZM42.23,80c.41-.63.85-1.22,1.28-1.78,0,0,0,0,0,0a3.6,3.6,0,0,0,.33.72,2.93,2.93,0,0,0,.83.86,3.65,3.65,0,0,0,1.24.51,7.09,7.09,0,0,0,2.39.11A5.51,5.51,0,0,0,49,80.3a9.44,9.44,0,0,0-1,1.5,7.28,7.28,0,0,0-.36.76c-.2,0-.52.13-.91.2a6.19,6.19,0,0,1-2.55,0,3.4,3.4,0,0,1-2.05-1.35,3.09,3.09,0,0,1-.37-.72Q42,80.33,42.23,80Zm20.29,23.94c-.6,0-1.21.1-1.81.13l-.32,0h-.3l-.19,0-.9-.14c-1.61-.25-3.22-.45-4.78-.74,0,0,0,0,0,0,.14-.2.37-.47.64-.8a8.93,8.93,0,0,0,1.69-2.72,5.16,5.16,0,0,0,.08-3.17,1.82,1.82,0,0,0-.56-.8l1,.17a18.79,18.79,0,0,0,6.09-.11c.31,0,.63-.11,1-.19a2.52,2.52,0,0,1,.75.57,4.16,4.16,0,0,1,.9,1.32,3.55,3.55,0,0,1,.13,1.79,6,6,0,0,1-.17.92,6.78,6.78,0,0,1-.33.85c-.25.54-.53,1-.77,1.47s-.44.8-.59,1-.1.21-.14.28ZM90.58,88.7l0,.34c0,.23-.06.46-.12.68A10.14,10.14,0,0,1,90,91.05,12,12,0,0,1,87,95.75a15.53,15.53,0,0,1-4.84,3.18l-.68.28-.7.23c-.46.17-1,.28-1.42.41-1,.21-1.92.36-3,.57l-3.17,1.25h0a18.09,18.09,0,0,1-3.4,1.13c-1.17.28-2.36.5-3.56.68l-1.45.19.49-1c.23-.45.5-1,.74-1.55a5.19,5.19,0,0,0,.46-1.93,3.85,3.85,0,0,0-.25-2,4.18,4.18,0,0,0-1.06-1.36,3,3,0,0,0-.66-.44,35.84,35.84,0,0,0,6.35-2.19c2.68-1.18,5.48-2.68,8.47-4.21.76-.37,1.51-.77,2.29-1.13s1.57-.78,2.37-1.09a8.86,8.86,0,0,1,2.52-.62,4.17,4.17,0,0,1,2.46.48,4.33,4.33,0,0,1,1,.81,5.17,5.17,0,0,1,.42.51l.31.47A1,1,0,0,1,90.58,88.7Z"/>
+                <path class="cls-1"
+                      d="M40.9,11.45c-.23.24-.37.42-.38.43l-.3.48a5.39,5.39,0,0,0-.5,1.1,3.59,3.59,0,0,0-.2,1.17c0,.33,0,.54.09.54s.16-.82.54-1.54a6.13,6.13,0,0,1,.58-.94l.32-.42s.12-.18.31-.42a9.63,9.63,0,0,1,.73-.85c.56-.6,1.21-1.1,1.17-1.18s-.2,0-.45.15h0A2.51,2.51,0,0,0,41.65,9,4.34,4.34,0,0,0,39.05,9c-1.58.35-3.24.51-3.24.73a8.18,8.18,0,0,0,3.37.27,3.38,3.38,0,0,1,1.91.28,1.31,1.31,0,0,1,.4.32c.07.1.09.15.1.16h0v.09A6.38,6.38,0,0,0,40.9,11.45Z"/>
+            </g>
+        </g>
+    </g>
 </svg>
\ No newline at end of file
diff --git a/media/logos/SVG/logo PLC4X color CMYK@300x.svg b/media/logos/SVG/logo PLC4X color CMYK@300x.svg
index 1f9b833c21c..bdd6c65db11 100644
--- a/media/logos/SVG/logo PLC4X color CMYK@300x.svg	
+++ b/media/logos/SVG/logo PLC4X color CMYK@300x.svg	
@@ -1,1492 +1,1492 @@
-<!--
-    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
-
-         http://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.
--->
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 325.53 105.92">
-    <defs>
-        <style>
-            .cls-1{fill:none;}.cls-2{isolation:isolate;}.cls-3{fill:#6d4a54;}.cls-4{fill:#694650;}.cls-5{opacity:0.13;}.cls-15,.cls-5{mix-blend-mode:multiply;}.cls-6{fill:#3c2517;}.cls-7{fill:#644c53;}.cls-8{fill:#a66870;}.cls-9{fill:#f2e8df;}.cls-10{fill:#744a54;}.cls-11{fill:#231f20;}.cls-12{fill:#fff;}.cls-13{fill:#473439;}.cls-14{fill:#f7b2c6;}.cls-15{opacity:0.15;}.cls-16{fill:#3e362f;}.cls-17{fill:#f4f0d2;}.cls-18{fill:#97646d;}.cls-19{fill:#96636a;}.cls-20{fill:#8f8280;}.cls-21{fill:#dbd3d1;}.cls-22{fill:#c4869a;}.cls-23{fill:#a6938f;}.cls-24{fill:#bd2330;}.cls-25,.cls-50{opacity:0.35;mix-blend-mode:screen;}.cls-26{clip-path:url(#clip-path);}.cls-27{fill:#68308b;}.cls-28{fill:#682f8a;}.cls-29{fill:#692f8a;}.cls-30{fill:#6a2f89;}.cls-31{fill:#6b2f89;}.cls-32{fill:#6c2f88;}.cls-33{fill:#6c2e88;}.cls-34{fill:#6d2e87;}.cls-35{fill:#6e2e87;}.cls-36{fill:#6e2e86;}.cls-37{fill:#6f2e86;}.cls-38{fill:#702e85;}.cls-39{fill:#702d85;}.cls-40{fill:#712d85;}.cls-41{fill:#722d84;}.cls-42{clip-path:url(#clip-path-2);}.cls-43{fill:#c7203a;}.cls-44{fill:#c8203a;}.cls-45{fill:#c82039;}.cls-46{fill:url(#linear-gradient);}.cls-47{fill:url(#New_Gradient_Swatch_3);}.cls-48{fill:url(#New_Gradient_Swatch_6);}.cls-49,.cls-50{fill:#bc2331;}.cls-51{fill:url(#New_Gradient_Swatch_3-2);}.cls-52{fill:url(#New_Gradient_Swatch_5);}.cls-53{fill:url(#New_Gradient_Swatch_3-3);}.cls-54{fill:url(#New_Gradient_Swatch_5-2);}.cls-55{fill:url(#New_Gradient_Swatch_3-4);}.cls-56{fill:url(#New_Gradient_Swatch_3-5);}.cls-57{fill:url(#New_Gradient_Swatch_3-6);}.cls-58{fill:url(#New_Gradient_Swatch_3-7);}.cls-59{fill:url(#New_Gradient_Swatch_3-8);}.cls-60{fill:#6e7071;}
-        </style>
-        <clipPath id="clip-path">
-            <path class="cls-1"
-                  d="M47.35,58a1.74,1.74,0,0,1,.92-.09V58s0-.14,0-.16l-2.63-1.61a1.4,1.4,0,0,1-.27.58c.66.41,1.31.79,2,1.2Z"/>
-        </clipPath>
-        <clipPath id="clip-path-2">
-            <path class="cls-1" d="M26.79,35.08c0,.12,0,.24,0,.37h0C26.78,35.32,26.79,35.2,26.79,35.08Z"/>
-        </clipPath>
-        <linearGradient id="linear-gradient" x1="251.28" y1="114.16" x2="251.58" y2="28.41"
-                        gradientUnits="userSpaceOnUse">
-            <stop offset="0.32" stop-color="#9d2064"/>
-            <stop offset="0.63" stop-color="#c92039"/>
-            <stop offset="0.75" stop-color="#cd2035"/>
-            <stop offset="1" stop-color="#e77927"/>
-        </linearGradient>
-        <linearGradient id="New_Gradient_Swatch_3" x1="300.05" y1="114.33" x2="300.35" y2="28.58"
-                        xlink:href="#linear-gradient"/>
-        <linearGradient id="New_Gradient_Swatch_6" x1="-7176.48" y1="-1345.82" x2="-7167.47" y2="-1335.28"
-                        gradientTransform="translate(-4822.37 -5452.12) rotate(-142)" gradientUnits="userSpaceOnUse">
-            <stop offset="0" stop-color="#f49624"/>
-            <stop offset="0.31" stop-color="#f79823"/>
-            <stop offset="0.84" stop-color="#e77927"/>
-        </linearGradient>
-        <linearGradient id="New_Gradient_Swatch_3-2" x1="-7243.18" y1="-1346.98" x2="-7178.89" y2="-1346.98"
-                        gradientTransform="translate(-4822.37 -5452.12) rotate(-142)" xlink:href="#linear-gradient"/>
-        <linearGradient id="New_Gradient_Swatch_5" x1="-7235.42" y1="-1340.53" x2="-7197.11" y2="-1340.53"
-                        gradientTransform="translate(-4822.37 -5452.12) rotate(-142)" gradientUnits="userSpaceOnUse">
-            <stop offset="0" stop-color="#272761"/>
-            <stop offset="0.1" stop-color="#66318b"/>
-            <stop offset="0.79" stop-color="#9f2065"/>
-            <stop offset="0.95" stop-color="#cd2032"/>
-        </linearGradient>
-        <linearGradient id="New_Gradient_Swatch_3-3" x1="-7239.57" y1="-1347.58" x2="-7175.28" y2="-1347.58"
-                        gradientTransform="translate(-4822.37 -5452.12) rotate(-142)" xlink:href="#linear-gradient"/>
-        <linearGradient id="New_Gradient_Swatch_5-2" x1="-7234.74" y1="-1347.22" x2="-7201.18" y2="-1347.22"
-                        xlink:href="#New_Gradient_Swatch_5"/>
-        <linearGradient id="New_Gradient_Swatch_3-4" x1="-7239.57" y1="-1340.92" x2="-7175.28" y2="-1340.92"
-                        gradientTransform="translate(-4822.37 -5452.12) rotate(-142)" xlink:href="#linear-gradient"/>
-        <linearGradient id="New_Gradient_Swatch_3-5" x1="-7243.56" y1="-1341.26" x2="-7179.26" y2="-1341.26"
-                        gradientTransform="translate(-4822.37 -5452.12) rotate(-142)" xlink:href="#linear-gradient"/>
-        <linearGradient id="New_Gradient_Swatch_3-6" x1="-7239.57" y1="-1338.95" x2="-7175.28" y2="-1338.95"
-                        gradientTransform="translate(-4822.37 -5452.12) rotate(-142)" xlink:href="#linear-gradient"/>
-        <linearGradient id="New_Gradient_Swatch_3-7" x1="-7239.57" y1="-1339.17" x2="-7175.28" y2="-1339.17"
-                        gradientTransform="translate(-4822.37 -5452.12) rotate(-142)" xlink:href="#linear-gradient"/>
-        <linearGradient id="New_Gradient_Swatch_3-8" x1="-7203.45" y1="-1339.22" x2="-7189.24" y2="-1339.22"
-                        gradientTransform="translate(-4822.37 -5452.12) rotate(-142)" xlink:href="#linear-gradient"/>
-    </defs>
-    <title>Asset 1</title>
-    <g class="cls-2">
-        <g id="Layer_2" data-name="Layer 2">
-            <g id="Layer_1-2" data-name="Layer 1">
-                <path class="cls-3"
-                      d="M134.89,46.77c0,12.19-7.6,19-19.47,19h-9.29V79c0,2.39-.83,3.24-3.19,3.24H94.26c-2.36,0-3.19-.85-3.19-3.24V30.73c0-2.39.83-3.24,3.19-3.24h21.08C127.13,27.49,134.89,34.51,134.89,46.77ZM119.3,46.7c0-3.4-2.06-5.71-5.63-5.71h-7.54V52.33h7.54A5.25,5.25,0,0,0,119.3,46.7Z"/>
-                <path class="cls-3"
-                      d="M153.46,30.73v38h18.26c2.44,0,3.27.78,3.27,3.24v7c0,2.39-.83,3.24-3.27,3.24H141.59c-2.36,0-3.2-.85-3.2-3.24V30.73c0-2.39.84-3.24,3.2-3.24h8.67C152.62,27.49,153.46,28.34,153.46,30.73Z"/>
-                <path class="cls-3"
-                      d="M200.75,26.34c11.72,0,19.1,4.85,22.22,13.49.84,2.24.23,3.4-2.05,4.17l-8.15,2.93c-2.35.69-3.19.31-4.1-2.08-1.3-3.47-3.58-5-7.92-5-5.93,0-8.29,2.62-8.29,8v14c0,5.4,2.36,8,8.29,8,4.26,0,6.7-1.7,8-5,.84-2.39,1.83-2.93,4.11-2.08l8.07,2.93c2.28.77,2.89,1.92,2.05,4.16-3.12,8.64-10.5,13.5-22.22,13.5-14.91,0-23.36-8.25-23.36-21.6V47.93C177.39,34.59,185.84,26.34,200.75,26.34Z"/>
-                <path class="cls-4"
-                      d="M281.15,20.75h-.29c-.23,0-.3,0-.35-.18l-.73-1.87H276.7L276,20.57c0,.14-.12.18-.35.18h-.26c-.16,0-.19-.07-.14-.19l2.64-6.66a.21.21,0,0,1,.25-.17h.3c.14,0,.2,0,.25.16l2.63,6.67C281.33,20.68,281.3,20.75,281.15,20.75Zm-2.76-5.66a2.57,2.57,0,0,1-.14-.68h-.05a3.14,3.14,0,0,1-.12.68l-1.18,3h2.67Z"/>
-                <path class="cls-4"
-                      d="M289.79,15.94a2,2,0,0,1-2.22,2.18h-2.12v2.43c0,.15-.05.2-.2.2h-.32c-.15,0-.2-.05-.2-.2V14c0-.15,0-.2.2-.2h2.64A2,2,0,0,1,289.79,15.94Zm-.76,0a1.4,1.4,0,0,0-1.54-1.51h-2.05v3h2.05A1.4,1.4,0,0,0,289,15.94Z"/>
-                <path class="cls-4"
-                      d="M298.19,20.75h-.29c-.23,0-.3,0-.35-.18l-.73-1.87h-3.08L293,20.57c-.05.14-.11.18-.35.18h-.26c-.15,0-.18-.07-.13-.19l2.63-6.66a.21.21,0,0,1,.25-.17h.3c.14,0,.2,0,.25.16l2.64,6.67C298.38,20.68,298.35,20.75,298.19,20.75Zm-2.76-5.66a2.82,2.82,0,0,1-.13-.68h-.05a2.82,2.82,0,0,1-.13.68l-1.18,3h2.68Z"/>
-                <path class="cls-4"
-                      d="M304.12,13.62a2.38,2.38,0,0,1,2.62,1.68c.05.15,0,.21-.13.26l-.31.11c-.13,0-.19,0-.24-.12a1.73,1.73,0,0,0-1.94-1.27c-1.31,0-2,.67-2,1.8v2.34c0,1.13.7,1.8,2,1.8a1.74,1.74,0,0,0,1.95-1.29c.06-.14.12-.17.25-.13l.31.12c.14,0,.17.1.12.24a2.39,2.39,0,0,1-2.63,1.72c-1.74,0-2.71-.93-2.71-2.47V16.09C301.41,14.56,302.36,13.62,304.12,13.62Z"/>
-                <path class="cls-4"
-                      d="M315.62,14v6.59c0,.15-.05.2-.2.2h-.32c-.15,0-.2-.05-.2-.2v-3h-3.74v3c0,.15-.05.2-.2.2h-.32c-.15,0-.2-.05-.2-.2V14c0-.15.05-.2.2-.2H311c.15,0,.2.05.2.2v2.91h3.74V14c0-.15.05-.2.2-.2h.32C315.57,13.76,315.62,13.81,315.62,14Z"/>
-                <path class="cls-4"
-                      d="M324.09,14v.27c0,.15,0,.2-.2.2h-3.47v2.44h3c.14,0,.19.05.19.2v.27c0,.15-.05.2-.19.2h-3v2.54H324c.13,0,.18.05.18.19v.28c0,.15-.05.2-.18.2H319.9c-.15,0-.19-.05-.19-.2V14c0-.15,0-.2.19-.2h4C324,13.76,324.09,13.81,324.09,14Z"/>
-                <g class="cls-5">
-                    <path class="cls-6"
-                          d="M90.45,87.94s2.46,8-7.72,13.13c-14.94,7.5-25,5.06-34,1-1.17-.52-2,.19-3.07-7.68s2.64,3.24,3.21,3.31,23.75-.42,23.75-.42Z"/>
-                </g>
-                <path class="cls-7"
-                      d="M90.87,88.31a1.76,1.76,0,0,1,0,.48l0,.36a6.21,6.21,0,0,1-.13.73,10.36,10.36,0,0,1-.4,1.42,12.7,12.7,0,0,1-3.22,5A16.1,16.1,0,0,1,82,99.69l-.71.31-.74.25c-.48.18-1,.29-1.48.43-1,.23-2.06.41-3,.59l-3,1.22a18.53,18.53,0,0,1-3.56,1.23c-1.21.29-2.43.53-3.65.71s-2.45.34-3.67.45l-1.84.15-.31,0h-.53l-.18,0-.9-.13a65.47,65.47,0,0,1-7.17-1.22,14.85,14.85,0,0,1-3.4-1.37c-.53-.29-1-.6-1.55-.93l-.45-.31L45.7,101s0,.08,0,.11v.16c0,.49,0,1,0,1.48l.07,2.6L44.69,103c-.52-1.08-1-2.15-1.53-3.2l0,.07-.58.73c-.18.23-.39.49-.54.46l-.15-.08c-.1-.35-.21-.7-.33-1A25.2,25.2,0,0,0,41,95.33c-.11-.49-.92-3.61-1-4.08.08.19.32,1,.57,1.81h-.07l.12.49.1,0c.21.7.4,1.33.48,1.5a3,3,0,0,1,.16.56l.1.47c.07.31.14.61.2.92L42,98.89l.06.3v.06s0,0,0,0l.08-.1.6-.77.56-.74.4.84.8,1.7c0-.52,0-1,0-1.56.44.39.91.84,1.34,1.17.2.17.44.34.62.47l.35.24.22.15-.25.07a.15.15,0,0,0-.09.13.17.17,0,0,0,0,.24c.07.06.14.13.13.2a.13.13,0,0,0,.13.06l.41-.13.37-.13c.17.1.34.2.52.29a13.43,13.43,0,0,0,3.16,1.31c.51.14,1,.26,1.57.37a.28.28,0,0,0-.05.08c0,.09,0,.23.2.31s.32.1.36,0l.19-.29c1.56.29,3.17.49,4.78.74l.9.14.19,0h.3l.32,0c.6,0,1.21-.08,1.81-.13l1.4-.14a1.63,1.63,0,0,1-.09.16c0,.11.05.25.22.32s.33,0,.38,0l.2-.41.06-.12,1.45-.19c1.2-.18,2.4-.4,3.56-.68a18.09,18.09,0,0,0,3.4-1.13h0l3.17-1.25c1.09-.21,2-.36,3-.57.47-.13,1-.24,1.42-.41l.7-.23.68-.28a15.53,15.53,0,0,0,4.84-3.18,12,12,0,0,0,3.07-4.7A10.14,10.14,0,0,0,90,89.72a5.09,5.09,0,0,0,.12-.68l.05-.34a1,1,0,0,0,0-.21L89.83,88a5.17,5.17,0,0,0-.42-.51,4.33,4.33,0,0,0-1-.81A4.17,4.17,0,0,0,86,86.22a8.86,8.86,0,0,0-2.52.62c-.8.31-1.58.72-2.37,1.09s-1.53.76-2.29,1.13c-3,1.53-5.79,3-8.47,4.21A35.84,35.84,0,0,1,64,95.46a1.26,1.26,0,0,0-.42-.13c-.31,0-.46.11-.44.12a1.06,1.06,0,0,1,.42,0l.17.06c-.32.08-.64.14-1,.19a18.79,18.79,0,0,1-6.09.11l-1-.17-.08-.05a.61.61,0,0,0-.37-.15s.07.06.17.15l-.9-.26-1.59-.46-.43-.13s0-.07,0-.07,0,0,0,.06l-.48-.16a1.22,1.22,0,0,1-.32-.12l.34.07,1,.23,1.6.4,1,.25,1.18.17a18.8,18.8,0,0,0,6-.23,32.68,32.68,0,0,0,7.44-2.52c2.65-1.2,5.42-2.73,8.4-4.3.75-.38,1.51-.78,2.3-1.15s1.55-.8,2.4-1.13a9.6,9.6,0,0,1,2.69-.7,4.88,4.88,0,0,1,2.86.55,5.28,5.28,0,0,1,1.18.92c.16.2.34.37.48.58Z"/>
-                <path class="cls-8"
-                      d="M90.14,88.49a1,1,0,0,1,0,.21l-.05.34a5.09,5.09,0,0,1-.12.68,10.14,10.14,0,0,1-.39,1.33,12,12,0,0,1-3.07,4.7,15.53,15.53,0,0,1-4.84,3.18l-.68.28-.7.23c-.46.17-1,.28-1.42.41-1,.21-1.92.36-3,.57l-3.17,1.25h0a18.09,18.09,0,0,1-3.4,1.13c-1.16.28-2.36.5-3.56.68l-1.45.19c.13-.25.3-.58.5-1s.49-1,.73-1.55a5.19,5.19,0,0,0,.46-1.93,3.85,3.85,0,0,0-.25-2,4.18,4.18,0,0,0-1.06-1.36,3,3,0,0,0-.66-.44,35.84,35.84,0,0,0,6.35-2.19c2.68-1.18,5.48-2.68,8.47-4.21.76-.37,1.51-.77,2.29-1.13s1.57-.78,2.37-1.09A8.86,8.86,0,0,1,86,86.22a4.17,4.17,0,0,1,2.46.48,4.33,4.33,0,0,1,1,.81,5.17,5.17,0,0,1,.42.51Z"/>
-                <path class="cls-7"
-                      d="M88,7.18a18.2,18.2,0,0,1-.09,2,22.89,22.89,0,0,1-.78,4.09,21.5,21.5,0,0,1-1.48,3.82,8.88,8.88,0,0,1-.88,1.45c0-.06,0-.09,0-.09a.79.79,0,0,0,0,.14h0s-.07.05-.09,0a7.62,7.62,0,0,1,.54-1.75,29.25,29.25,0,0,0,1-3.84,25.11,25.11,0,0,0,.48-3.95c0-1.09,0-1.82,0-1.87a11.5,11.5,0,0,0,0-1.16c-.05-.63-.18-1.59-.84-1.91a2.89,2.89,0,0,0-1.36-.23,15.37,15.37,0,0,0-1.63.14c-.54.07-1.08.11-1.58.16h-.48l-.46,0c.17.27.3.49.39.65s.22.4.19.43-.17-.08-.38-.27S80,4.6,79.66,4.2l.23.06c.19.06.32.08.34,0s0-.15-.18-.32l-.19-.16,1.29-.24,1.54-.32A17.19,17.19,0,0,1,84.39,3a3.84,3.84,0,0,1,1.9.21,2.49,2.49,0,0,1,1.27,1.4,5.66,5.66,0,0,1,.34,1.35C88,6.68,88,7.14,88,7.18Z"/>
-                <path class="cls-9"
-                      d="M86.7,7.22s.06.78,0,1.87A25.11,25.11,0,0,1,86.24,13a29.25,29.25,0,0,1-1,3.84,7.62,7.62,0,0,0-.54,1.75s0,0,.09,0c0,.31,0,1.08,0,1.84,0,.5-.06,1-.1,1.38s-.07.63-.07.65,0,.27-.08.64-.11.76-.2,1.19c0-.09,0-.19,0-.3,0-.29,0-.63,0-1a7.16,7.16,0,0,0-.42-1.35,5,5,0,0,0-1-1.34A7.31,7.31,0,0,0,81.41,19a6.82,6.82,0,0,0-3.92-.93,4.21,4.21,0,0,0-2,.82A6.4,6.4,0,0,0,74,20.35a5.3,5.3,0,0,0-.85,1.74c-.18.57-.31,1.11-.42,1.62a32.86,32.86,0,0,0-.55,3.49c0,.08-.16,1.47-.21,3.51a15.86,15.86,0,0,0,1.33,7.34l.12.23.15.28a.6.6,0,0,0,.68.32,1.42,1.42,0,0,0,.32-.07,2.76,2.76,0,0,0,.3-.15l.42-.29c.54-.39,1-.78,1.53-1.17,1-.77,1.87-1.51,2.62-2.17A15.16,15.16,0,0,0,82,32.39a1.54,1.54,0,0,0,.09-.24l.38.46c.05.07.1.12.08.11h0l-.31.27a5.54,5.54,0,0,0-.83,1.07c-.52.93-1.07,2.09-1.78,3.18a8.35,8.35,0,0,1-1.16,1.48,7.12,7.12,0,0,1-1.32,1,12.63,12.63,0,0,0-1.39.88h0a1.1,1.1,0,0,0-.33-.45c-.14-.07-.22,0-.22,0s.07,0,.14.13a1.23,1.23,0,0,1,.17.42c.06.22.11.48.16.77a4,4,0,0,0-1.12.58c0,.08.52-.07,1.17-.23,0,.12,0,.25,0,.37a2.18,2.18,0,0,1,0,.51c-.27.14-.43.26-.41.28s.14,0,.37-.06a3.1,3.1,0,0,1-.15.46h0c-.64.18-1.22.49-1.18.58s.45,0,.95-.09c-.11.17-.18.26-.18.27s-.16.24-.43.55a7.27,7.27,0,0,1-1.09,1,2.76,2.76,0,0,1-1.36.44c-.4,0-.68,0-.7,0s.27.15.7.2a3,3,0,0,0,1-.07v.06a4.89,4.89,0,0,0-.52.42,3.16,3.16,0,0,1-1.28.58,4.38,4.38,0,0,1-1.39,0l-.21,0a2.7,2.7,0,0,0,.53-.46,2.11,2.11,0,0,0,.41-.59,1.07,1.07,0,0,0,.1-.24c-.06-.06-.26.3-.68.65a3.92,3.92,0,0,1-1.83.81,7.36,7.36,0,0,1-2,.12,4.51,4.51,0,0,1-.92-.2l-.26-.08a2.87,2.87,0,0,1-.58-.27c-.34-.24-.77-.62-1.21-1,.4-.27.78-.52,1.08-.68s.66-.24.66-.29-.31-.07-.75,0a9.59,9.59,0,0,0-1.34.61l0,0-1.07-.94.69-.23c1.49-.49,3-.87,3-1s0,0-.11,0l.46-.79.29,0,.32,0a.37.37,0,0,0,.23-.05.2.2,0,0,0,.08-.24.85.85,0,0,0-.25-.37.41.41,0,0,0-.24-.1h0l-1.6-.64c1-.08,1.55-.41,1.49-.47s.6-.44,1.3-1.47a12.55,12.55,0,0,0,2-4.7,14.28,14.28,0,0,0,.16-3.36,31.65,31.65,0,0,0-.28-3.67A11.8,11.8,0,0,0,68.21,24a8.88,8.88,0,0,0-2.61-3h0l0,0a9.26,9.26,0,0,0-5.51-2,27.83,27.83,0,0,0-4.85.52,17.8,17.8,0,0,0-3.33,1c-.79.34-1.23.63-1.3.65a16.69,16.69,0,0,0-1.49,1.06,25.2,25.2,0,0,0-3.12,3,24.7,24.7,0,0,0-1.78,2.24l-.42.61-.32.47-.2.29-.1.15c0,.05.06.09.08.14l.47.54L44,30l.55.6a47.56,47.56,0,0,0,4.91,4.66,25.94,25.94,0,0,0,2.8,2l.74.43.76.38c.51.24,1,.45,1.49.67,2,.84,3.79,1.61,5.42,2.14.36.11.69.21,1,.29l-.38,1.42A19.94,19.94,0,0,0,59,42.18a18.9,18.9,0,0,0-3-.06,11.45,11.45,0,0,0-1.4.14,13.73,13.73,0,0,0-1.39.29c-.7.19-1.56.44-2.44.75h0l-1.73-.82c-1.65-.8-3.19-1.57-4.49-2.27-.65-.35-1.24-.68-1.75-1s-.9-.59-1.29-.87c-.75-.51-1.19-.82-1.24-.86s-1-.64-2.44-1.54l-2.53-1.58-.12-.07s0,0,.05-.07h0l.08,0,.28-.17.76-.44L38,32.67l-3.61-1-1-.27-.32-.07.2-.15.14-.1.42-.28,2-1.39.67-.45,0,0,0,0-.09,0-.19-.07-.38-.15-1.38-.52L34,28l-.12,0a.15.15,0,0,1-.09-.06.24.24,0,0,1,0-.36l.15-.16.16-.2c.11-.13.21-.27.3-.4A5.62,5.62,0,0,0,35,26a11.13,11.13,0,0,0,.71-1.67,15.55,15.55,0,0,0,.63-2.93,10,10,0,0,0,0-2.16c.92.8,1.49,1.23,1.56,1.16s-1.09-1.61-2.85-3.75a32,32,0,0,1-2.47-4l-.15-.29,0-.07v0L32.33,12c-.07-.19-.13-.39-.2-.6a12.83,12.83,0,0,1-.29-1.26,11.6,11.6,0,0,1-.18-1.3c0-.22,0-.44,0-.64s0-.21,0-.31a.66.66,0,0,1,0-.14V7.72a.49.49,0,0,1,.08-.18c.05,0,.11,0,.19-.07l.54-.13.66-.13c.89-.16,1.78-.3,2.64-.4s1.71-.18,2.45-.2a13.41,13.41,0,0,1,2.07.24c1.36.24,2.51.52,3.32.72l1,.26.22-.23a3.83,3.83,0,0,0,.28-.29c.06-.07.12-.12.17-.19s.37-.37.56-.54h0a3.63,3.63,0,0,1,.46-.34.9.9,0,0,1,.21-.08L46.73,6a20.75,20.75,0,0,1,2.49-1.59c.48-.26,1-.51,1.49-.74l.51-.22.54.1a11.74,11.74,0,0,1,2.58.83,10.61,10.61,0,0,1,1.59.91c.27.19.56.38.86.6l.45.34c.19.14.38.29.58.46l.25.23a2.52,2.52,0,0,1,.74.52c.1.16,0,0,0-.11a2.46,2.46,0,0,1,0-.26,1.11,1.11,0,0,1,0-.3c-.37-1.25-.69-2.31-.95-3.18-.13-.42-.25-.8-.37-1.13l1,0c.88,0,1.63.08,2.15.13l.9.08.57,0,.17.15a8.67,8.67,0,0,1,2.17,4.3c0,.19.07.36.08.43v0l.29,0v0A45.57,45.57,0,0,1,65,2.81l.58,0h.76l.45,0a2.92,2.92,0,0,0,.44-.06c.45-.07.88-.17,1.32-.25l.28.29a6.8,6.8,0,0,1,1,1.53c.08.17.17.36.24.55a5.8,5.8,0,0,1,.21.89c0,.3.08.62.13.94l.06.49,0,.25,0,.13s0,0,0,0l.15-.49a15.41,15.41,0,0,1,.75-2,8.45,8.45,0,0,1,.67-1.2,3.69,3.69,0,0,1,.72-.78,6.43,6.43,0,0,1,.73-.48A3.27,3.27,0,0,1,74,2.38a16.23,16.23,0,0,1,2.16.54c.85.29,1.62.62,2.26.86s.93.34,1.23.42c.36.4.64.68.84.87s.34.29.38.27,0-.18-.19-.43-.22-.38-.39-.65l.46,0h.48c.5,0,1-.09,1.58-.16a15.37,15.37,0,0,1,1.63-.14,2.89,2.89,0,0,1,1.36.23c.66.32.79,1.28.84,1.91A11.5,11.5,0,0,1,86.7,7.22ZM86,6.12a3.52,3.52,0,0,0-.09-.85c0-.06-.25,0-.5.07l-.28.12h0a5.33,5.33,0,0,0-1.27.38,11.1,11.1,0,0,1-1.32.49,2.49,2.49,0,0,1-.44.09l.5.72a1.39,1.39,0,0,1,.24-.35A2.85,2.85,0,0,1,84,6.05a1.71,1.71,0,0,1,1.14-.11l0,.22A4.49,4.49,0,0,1,85,7.58c-.17.71-.35,1.44-.41,1.87-.32-.59-.63-1-.7-1a11.42,11.42,0,0,0,.56,1.74c.15.43.27.86.35,1.19s.1.55.11.57a4.42,4.42,0,0,1,.1.54,7.64,7.64,0,0,1,0,1.22,9.48,9.48,0,0,0-.1,1.82,5.29,5.29,0,0,0,.56-1.76,6.33,6.33,0,0,0,.18-1.31,6.26,6.26,0,0,0,0-.64s-.06-.26-.18-.6A9.92,9.92,0,0,0,84.92,10c-.06-.1-.11-.21-.16-.31a13.38,13.38,0,0,0,.94-1.93A4.77,4.77,0,0,0,86,6.12ZM74.92,43.19a.77.77,0,0,0,0-.38.17.17,0,0,0,0-.12s-.08,0-.12,0-.22.12-.21.14-.12-.11-.14-.08a.37.37,0,0,0,0,.38.33.33,0,0,0,.23.23C74.77,43.41,74.86,43.33,74.92,43.19Zm-.76-1.43a.5.5,0,0,0,.21-.35.17.17,0,0,0,0-.12.13.13,0,0,0-.13,0c-.17,0-.25.09-.25.12s-.13-.11-.14-.1l-.06.08a.56.56,0,0,0-.13.24.19.19,0,0,0,.13.24A.48.48,0,0,0,74.16,41.76Zm-.2,2a.69.69,0,0,0,.22-.62,1.19,1.19,0,0,0-.24-.55,1.73,1.73,0,0,0-.41-.4A1.34,1.34,0,0,0,73,42a3.59,3.59,0,0,0-1,0l-.16,0-.11,0-.2.07-.17,0h-.11l-.13,0a.83.83,0,0,0-.29,0,3,3,0,0,0-.37,0,4.5,4.5,0,0,0-.69.2l-.36.18a2.37,2.37,0,0,0-.79.63,2,2,0,0,0-.49,1.33,2,2,0,0,0,.19.79,1,1,0,0,0,.72.56,1.8,1.8,0,0,0,.81-.09.68.68,0,0,0,.31.18,1.77,1.77,0,0,0,.91,0,3.42,3.42,0,0,0,.69-.28h0a.47.47,0,0,0,.24.08.76.76,0,0,0,.55-.18c.21-.21.36-.4.42-.45s0,0,0,0h0A0,0,0,0,0,73,45l-.06,0v0s.09,0,.12,0a.51.51,0,0,0,.16-.09.57.57,0,0,0,.23-.3C73.52,44.05,73.64,44,74,43.79Zm-7.28,1.85a.58.58,0,0,0-.25-.49C66.17,45,66,45,66,45s-.14-.09-.15-.06a1.86,1.86,0,0,0-.3.45.58.58,0,0,0,.07.61.73.73,0,0,0,1.11-.38ZM41.63,11c.57-.6,1.21-1.1,1.17-1.18s-.2,0-.45.15h0A2.51,2.51,0,0,0,41.19,9,4.34,4.34,0,0,0,38.59,9c-1.58.35-3.23.51-3.23.73a8.12,8.12,0,0,0,3.36.27,3.36,3.36,0,0,1,1.91.28,1.31,1.31,0,0,1,.4.32,1.43,1.43,0,0,1,.1.16s0,0,.13,0a9,9,0,0,0-.82.75c-.23.24-.37.42-.38.43l-.3.48a5.39,5.39,0,0,0-.5,1.1,3.59,3.59,0,0,0-.2,1.17c0,.33,0,.54.09.54s.16-.82.54-1.54a6.13,6.13,0,0,1,.58-.94l.32-.42s.12-.18.31-.42A9.63,9.63,0,0,1,41.63,11Z"/>
-                <path class="cls-7"
-                      d="M86.37,27l-.22.33c-.26.37-.62.88-1.06,1.46l-.69.91c-.11.16-.24.32-.36.48a1.94,1.94,0,0,0-.13.2l.15.08.47.27,1.65,1-2.52.84s-.26-.26-.51-.53l-.21.76.72-.23h0c0,.15-.06.26-.08.35v0c-.08.32-.09.37-.1.39l-.09.06s-.12.06-.26.16l-.24.19a4.89,4.89,0,0,0-.72.85c-.5.81-1.17,2-2,3.11a9.16,9.16,0,0,1-1.36,1.48,4.41,4.41,0,0,1-.78.52c-.25.14-.5.26-.72.37a4,4,0,0,1-1.58.54,12.63,12.63,0,0,1,1.39-.88,7.12,7.12,0,0,0,1.32-1,8.35,8.35,0,0,0,1.16-1.48c.71-1.09,1.26-2.25,1.78-3.18A5.54,5.54,0,0,1,82.22,33l.31-.27h0s0,0-.08-.11l-.38-.46s0-.11.07-.17l.51-.14,1.11-.31.28-.08h0l.15,0-.15-.13-1.2-.78.66-.76.4-.46c.27-.29.52-.58.76-.85s.71-.77,1-1.06l.37-.05-.13-.2-.24.25c-.76.07-2.18.14-2.28.11.13,0,2.18-.26,2.59-.4Z"/>
-                <path class="cls-10" d="M86,27.13l.13.2-.37.05Z"/>
-                <path class="cls-7"
-                      d="M85.93,5.27a3.52,3.52,0,0,1,.09.85,4.77,4.77,0,0,1-.32,1.66,13.38,13.38,0,0,1-.94,1.93l-.14-.26h0c.06-.43.24-1.16.41-1.87a4.49,4.49,0,0,0,.09-1.42l0-.22a.2.2,0,0,1,.08,0,.38.38,0,0,1,.09.08l-.07,0v0h0l.06,0a0,0,0,0,1,0,0,.57.57,0,0,1,.11-.1l-.12.07v0l.7-.38a.77.77,0,0,0-.67-.23h-.14l.28-.12C85.68,5.23,85.92,5.21,85.93,5.27Z"/>
-                <path class="cls-7"
-                      d="M86,5.68l-.7.38A.38.38,0,0,0,85.17,6a.2.2,0,0,0-.08,0,3.17,3.17,0,0,0-.1-.38s.06,0,.15-.1h.15A.77.77,0,0,1,86,5.68Z"/>
-                <path class="cls-7"
-                      d="M85.64,12.47a6.33,6.33,0,0,1-.18,1.31,5.29,5.29,0,0,1-.56,1.76,9.48,9.48,0,0,1,.1-1.82,7.64,7.64,0,0,0,0-1.22,4.42,4.42,0,0,0-.1-.54s0-.24-.11-.57-.2-.76-.35-1.19a11.42,11.42,0,0,1-.56-1.74c.07,0,.38.4.7,1h0c0,.22,0,.35,0,.37s.07,0,.13-.11c0,.1.1.21.16.31a9.92,9.92,0,0,1,.49,1.21c.12.34.17.59.18.6A6.26,6.26,0,0,1,85.64,12.47Z"/>
-                <path class="cls-7" d="M85.27,6.09,85.39,6a.57.57,0,0,0-.11.1A0,0,0,0,0,85.27,6.09Z"/>
-                <path class="cls-11" d="M85.26,6.06v0l-.06,0h0v0Z"/>
-                <path class="cls-7"
-                      d="M85.14,5.46c-.09,0-.15.08-.15.1a3.17,3.17,0,0,1,.1.38A1.71,1.71,0,0,0,84,6.05a2.85,2.85,0,0,0-1.1.74,1.39,1.39,0,0,0-.24.35l-.5-.72a2.49,2.49,0,0,0,.44-.09,11.1,11.1,0,0,0,1.32-.49A5.33,5.33,0,0,1,85.14,5.46Z"/>
-                <path class="cls-9"
-                      d="M85.71,27.38c-.28.29-.62.65-1,1.06s-.49.56-.76.85l-.4.46-.66.76-.28-.09c.29-1,.59-2.12.81-2.93C83.53,27.52,85,27.45,85.71,27.38Z"/>
-                <path class="cls-7"
-                      d="M84.93,20.44c0,.5,0,1,0,1.39s-.06.65-.06.67,0,.27-.1.65-.18.88-.31,1.36-.32,1-.46,1.31a3.35,3.35,0,0,1-.26.57,14.12,14.12,0,0,1,.43-1.68c0,.13,0,.19,0,.19s0-.22,0-.61.16-.85.2-1.19.07-.63.08-.64,0-.27.07-.65.08-.88.1-1.38c0-.76,0-1.53,0-1.84h0l.05,0A12.72,12.72,0,0,1,84.93,20.44Z"/>
-                <path class="cls-7"
-                      d="M84.23,42.73c.44.18.69.36.67.4a3.54,3.54,0,0,1-.75-.15,15.35,15.35,0,0,0-1.64-.3c-.6-.08-1.21-.15-1.67-.19l-.8-.06-.79-.1a5.52,5.52,0,0,0-1.61,0,13.16,13.16,0,0,0-1.43.34V42.4a8.88,8.88,0,0,1,1.33-.48,5.75,5.75,0,0,1,.92-.18,5.87,5.87,0,0,1,.83,0l.82,0s.34,0,.81.12,1.07.19,1.68.34A11,11,0,0,1,84.23,42.73Z"/>
-                <path class="cls-11" d="M84.79,18.53l-.05,0a.79.79,0,0,1,0-.14S84.78,18.47,84.79,18.53Z"/>
-                <path class="cls-7" d="M84.62,9.45l.14.26c-.06.08-.11.12-.13.11S84.59,9.67,84.62,9.45Z"/>
-                <path class="cls-9"
-                      d="M84.25,31.42l-.15,0h0l-.28.08-1.11.31-.51.14c.13-.37.29-.94.47-1.56l.28.09,1.2.78Z"/>
-                <path class="cls-7"
-                      d="M84.24,24c0,.11,0,.21,0,.3a.85.85,0,0,0,0,.17l-.06.25c0-.16-.07-.39-.11-.7s-.08-.63-.13-1a10.2,10.2,0,0,0-.47-1.21,4.69,4.69,0,0,0-1-1.17,6.62,6.62,0,0,0-1.33-1.08,6.21,6.21,0,0,0-3.58-.71,3.61,3.61,0,0,0-1.61.73,5.45,5.45,0,0,0-1.25,1.29A4.39,4.39,0,0,0,74,22.34l0,.09a3.44,3.44,0,0,0-.71.65s.21-.15.63-.36c0,0,0,0,0,.06-.86.76-1.1,1.77-1.2,4a11.17,11.17,0,0,0,.24,3.6h0a3.25,3.25,0,0,0,0,.33c0,.36,0,.74,0,1.13a.27.27,0,0,0-.15.18.32.32,0,0,0,.15.35A14.36,14.36,0,0,0,73,34.1a13.5,13.5,0,0,0,1,3.66l.1.22.08.16c0,.07.07.08.12.07l.15,0,.14-.07.41-.26c.53-.35,1.05-.73,1.55-1.09,1-.72,1.92-1.42,2.71-2s1.42-1.12,1.86-1.48c0,0,.21-.28.56-.71s.46-1.5,1-2.71c.06-.15.13-.32.19-.49.23-.59.44-1.28.6-1.85h0c-.22.81-.52,2-.81,2.93-.18.62-.34,1.19-.47,1.56L82,32l.09.12a1.54,1.54,0,0,1-.09.24A15.16,15.16,0,0,1,79.46,35c-.75.66-1.64,1.4-2.62,2.17-.49.39-1,.78-1.53,1.17l-.42.29a2.76,2.76,0,0,1-.3.15,1.42,1.42,0,0,1-.32.07.6.6,0,0,1-.68-.32l-.15-.28-.12-.23A15.86,15.86,0,0,1,72,30.71c.05-2,.2-3.43.21-3.51a32.86,32.86,0,0,1,.55-3.49c.11-.51.24-1.05.42-1.62A5.3,5.3,0,0,1,74,20.35a6.4,6.4,0,0,1,1.47-1.42,4.21,4.21,0,0,1,2-.82,6.82,6.82,0,0,1,3.92.93,7.31,7.31,0,0,1,1.39,1.22,5,5,0,0,1,1,1.34A7.16,7.16,0,0,1,84.2,23C84.22,23.36,84.23,23.7,84.24,24Z"/>
-                <path class="cls-10" d="M84.25,24.29c0,.39,0,.62,0,.61s0-.06,0-.19l.06-.25A.85.85,0,0,1,84.25,24.29Z"/>
-                <path class="cls-8"
-                      d="M84,24c0,.31.08.54.11.7a14.12,14.12,0,0,0-.43,1.68v0h0a.3.3,0,0,1,0,.11.39.39,0,0,1,0,.13s0,.06,0,.1,0,.18-.08.28a1.21,1.21,0,0,1,0,.18,1.8,1.8,0,0,1,0,.19s0,0,0,0a.42.42,0,0,0,0,.06,0,0,0,0,1,0,0c-.16.57-.37,1.26-.6,1.85l-1.35-.11a7.18,7.18,0,0,0,.15-2.11,4.53,4.53,0,0,0-.64-2,11.8,11.8,0,0,0-1.13-1.66,4.19,4.19,0,0,0-1.46-1.21,5,5,0,0,0-4.1,0l-.32.2,0-.09a4.39,4.39,0,0,1,.69-1.51,5.45,5.45,0,0,1,1.25-1.29,3.61,3.61,0,0,1,1.61-.73,6.21,6.21,0,0,1,3.58.71,6.62,6.62,0,0,1,1.33,1.08,4.69,4.69,0,0,1,1,1.17A10.2,10.2,0,0,1,83.91,23C84,23.38,84,23.72,84,24Z"/>
-                <path class="cls-10" d="M83.43,27.47v0h0A0,0,0,0,0,83.43,27.47Z"/>
-                <path class="cls-7" d="M83.66,32.5l-.72.23.21-.76C83.4,32.24,83.63,32.48,83.66,32.5Z"/>
-                <path class="cls-7"
-                      d="M83.34,41.11A14.82,14.82,0,0,1,81.12,41a10.13,10.13,0,0,0-1.52.06c-.41,0-.69.1-.7.1l-.72.09c-.42.06-1,.15-1.51.28l-.6.13c0-.13-.07-.26-.11-.38l.59-.2a14,14,0,0,1,1.52-.43l.73-.15s.32,0,.76,0a10.16,10.16,0,0,1,1.59.09A7.06,7.06,0,0,1,83.34,41.11Z"/>
-                <path class="cls-8"
-                      d="M81.47,29.23l1.35.11c-.06.17-.13.34-.19.49-.53,1.21-.65,2.28-1,2.71s-.56.71-.56.71c-.44.36-1.08.88-1.86,1.48s-1.71,1.31-2.71,2c-.5.36-1,.74-1.55,1.09l-.41.26-.14.07-.15,0c-.05,0-.11,0-.12-.07L74.06,38l-.1-.22a13.5,13.5,0,0,1-1-3.66,14.36,14.36,0,0,1-.13-1.69.54.54,0,0,0,.17.07,3.86,3.86,0,0,0,1.09,0,15.52,15.52,0,0,0,2.54-.42A14,14,0,0,0,80,30.75a6.71,6.71,0,0,0,.84-.59,4.54,4.54,0,0,0,.38-.38,1.25,1.25,0,0,0,.09-.12l.09-.16C81.42,29.41,81.45,29.31,81.47,29.23Z"/>
-                <path class="cls-10" d="M82,32l.16-.05c0,.06-.05.12-.07.17Z"/>
-                <path class="cls-7"
-                      d="M81.62,27.12a7.18,7.18,0,0,1-.15,2.11c0,.08,0,.18-.08.27l-.09.16a1.25,1.25,0,0,1-.09.12,4.54,4.54,0,0,1-.38.38,6.71,6.71,0,0,1-.84.59,14,14,0,0,1-3.33,1.35,15.52,15.52,0,0,1-2.54.42,3.86,3.86,0,0,1-1.09,0,.54.54,0,0,1-.17-.07,4.68,4.68,0,0,1,0-.53.4.4,0,0,1,.29-.05,3.21,3.21,0,0,0,.81.06h0a2.69,2.69,0,0,0,1.72.23,3.31,3.31,0,0,0,1.76-.88,11.78,11.78,0,0,0,2.26-1,5.84,5.84,0,0,0,.77-.53,2.46,2.46,0,0,0,.33-.31l.07-.08s0,0,0-.06a.65.65,0,0,0,.07-.21,7,7,0,0,0,.18-1.95,6.79,6.79,0,0,0-1.6-3.48,3.85,3.85,0,0,0-1.31-1.15,4.3,4.3,0,0,0-1.53-.45h-.51a1.81,1.81,0,0,0-1.52.15,4.26,4.26,0,0,0-.7.47h0l-.1,0c0-.09,0-.19.08-.29l.32-.2a5,5,0,0,1,4.1,0,4.19,4.19,0,0,1,1.46,1.21A11.8,11.8,0,0,1,81,25.1,4.53,4.53,0,0,1,81.62,27.12Z"/>
-                <path class="cls-12"
-                      d="M81.16,27.14A7,7,0,0,1,81,29.09a.65.65,0,0,1-.07.21s0,0,0,.06l-.07.08a2.46,2.46,0,0,1-.33.31,5.84,5.84,0,0,1-.77.53,11.78,11.78,0,0,1-2.26,1,5.92,5.92,0,0,0,1.7-4.14c.09-2.17-1.34-4.54-2.93-5h.5a4.3,4.3,0,0,1,1.53.45,3.85,3.85,0,0,1,1.31,1.15A6.79,6.79,0,0,1,81.16,27.14Z"/>
-                <path class="cls-10" d="M80.05,4c.16.17.21.27.18.32s-.15,0-.34,0l-.23-.06q-.14-.13-.27-.3l.47-.09Z"/>
-                <path class="cls-7"
-                      d="M79.86,3.81l-.47.09q.14.16.27.3c-.3-.08-.72-.23-1.23-.42S77,3.21,76.17,2.92A16.23,16.23,0,0,0,74,2.38a2.93,2.93,0,0,1,.9-.32L74.49,1l0-.06a14.46,14.46,0,0,1,2.14.87A24.26,24.26,0,0,1,78.8,3.07C79.25,3.36,79.6,3.61,79.86,3.81Z"/>
-                <path class="cls-7"
-                      d="M78.17,43.57c.6.25,1.15.62,1.1.7A5.18,5.18,0,0,1,78,44l-.84-.17-.38,0-.38,0H76a3.49,3.49,0,0,0,.18-.57,4.09,4.09,0,0,1,.7,0l.13,0,.33.07A9.1,9.1,0,0,1,78.17,43.57Z"/>
-                <path class="cls-13"
-                      d="M76.22,22.06c1.59.5,3,2.87,2.93,5a5.92,5.92,0,0,1-1.7,4.14c-.33.11-.64.2-.94.27a15.51,15.51,0,0,1-2.44.38H74a2.34,2.34,0,0,1-1-1.47h0c.1-1.82.25-3,.26-3.11s.1-1.45.46-3.41c.06-.36.15-.73.24-1.11a.36.36,0,0,1,.11-.1h0a5.88,5.88,0,0,1,2.18-.61Z"/>
-                <path class="cls-7"
-                      d="M76.51,31.51c.3-.07.61-.16.94-.27a3.31,3.31,0,0,1-1.76.88A2.69,2.69,0,0,1,74,31.89h.1A15.51,15.51,0,0,0,76.51,31.51Z"/>
-                <path class="cls-7" d="M76.21,42.4v.31l-.56.16a1.7,1.7,0,0,1,0-.22A4.25,4.25,0,0,1,76.21,42.4Z"/>
-                <path class="cls-7"
-                      d="M76.17,42.09a2.91,2.91,0,0,1,0,.31,4.25,4.25,0,0,0-.52.25,2.18,2.18,0,0,0,0-.51c0-.12,0-.25,0-.37l.41-.11C76.11,41.8,76.14,41.94,76.17,42.09Z"/>
-                <path class="cls-7" d="M76.21,42.71a3.7,3.7,0,0,1-.06.48,4,4,0,0,0-.65.14,3.1,3.1,0,0,0,.15-.46Z"/>
-                <path class="cls-7"
-                      d="M76.15,43.19a3.49,3.49,0,0,1-.18.57h0l-.41,0-.32,0a2.7,2.7,0,0,0,.17-.31l.09-.18A4,4,0,0,1,76.15,43.19Z"/>
-                <path class="cls-7" d="M76,41.28c0,.12.08.25.11.38l-.41.11c0-.12,0-.24,0-.35Z"/>
-                <path class="cls-7"
-                      d="M76,41.28l-.35.14c0-.29-.1-.55-.16-.77a1.23,1.23,0,0,0-.17-.42c-.07-.08-.14-.1-.14-.13s.08-.05.22,0a1.1,1.1,0,0,1,.33.45h0A5.14,5.14,0,0,1,76,41.28Z"/>
-                <path class="cls-7"
-                      d="M74.69,22.21a1.81,1.81,0,0,1,1.52-.15,5.88,5.88,0,0,0-2.18.61h0A4.26,4.26,0,0,1,74.69,22.21Z"/>
-                <path class="cls-7"
-                      d="M75.56,43.79l.41,0a4.13,4.13,0,0,1-.38.71,6.18,6.18,0,0,1-.52.59,7,7,0,0,1-1.28,1,2.41,2.41,0,0,1-.56.22,3,3,0,0,1-1,.07c-.43-.05-.7-.15-.7-.2s.3,0,.7,0a2.76,2.76,0,0,0,1.36-.44,7.27,7.27,0,0,0,1.09-1c.27-.31.41-.54.43-.55s.07-.1.18-.27Z"/>
-                <path class="cls-7"
-                      d="M75.69,42.65a1.7,1.7,0,0,0,0,.22c-.23.06-.36.09-.37.06S75.42,42.79,75.69,42.65Z"/>
-                <path class="cls-7" d="M75.61,41.42c0,.11,0,.23,0,.35-.65.16-1.15.31-1.17.23A4,4,0,0,1,75.61,41.42Z"/>
-                <path class="cls-7" d="M75.5,43.33l-.09.18a2.7,2.7,0,0,1-.17.31c-.5.07-.93.16-.95.09s.54-.4,1.18-.58Z"/>
-                <path class="cls-7"
-                      d="M75,42.81a.77.77,0,0,1,0,.38c-.06.14-.15.22-.27.2a.33.33,0,0,1-.23-.23.37.37,0,0,1,0-.38s.08,0,.14.08c-.12.11,0,.43.13.4s.22-.54.14-.51a2.65,2.65,0,0,0-.27.11s.06-.07.21-.14.09,0,.12,0A.17.17,0,0,1,75,42.81Z"/>
-                <path class="cls-7"
-                      d="M74.49,1l.42,1.09a2.93,2.93,0,0,0-.9.32l-.69-.13L73,2.19,73.22,2A9.11,9.11,0,0,1,74.49,1Z"/>
-                <path class="cls-7"
-                      d="M74.61,42.87a.55.55,0,0,0,.06.08h0v0s0,0,0,0,0,.07.06,0l0-.09s0,0,0-.06,0,0,0,0A.36.36,0,0,1,74.61,42.87Zm.25-.12c.08,0,0,.49-.14.51s-.25-.29-.13-.4A2.65,2.65,0,0,1,74.86,42.75Z"/>
-                <path class="cls-7"
-                      d="M74.79,42.87s0,.05,0,.06l0,.09s-.07,0-.06,0,0,0,0,0v0h0a.55.55,0,0,1-.06-.08.36.36,0,0,0,.14,0S74.79,42.85,74.79,42.87Z"/>
-                <path class="cls-7"
-                      d="M74.51.91l0,.06a9.11,9.11,0,0,0-1.27,1L73,2.19a3.64,3.64,0,0,1-.44-.07l-.41-.05a1.48,1.48,0,0,0-.31,0,8.43,8.43,0,0,0-1.47.11c-.31,0-.62.1-.92.15l0,0a4.35,4.35,0,0,0-.7-1,1.22,1.22,0,0,0-.45-.3L68.16.37c.63-.07,1.29-.15,2-.18A10.33,10.33,0,0,1,72,.24c.16,0,.34.07.51.1l.4.11.79.21Z"/>
-                <path class="cls-7"
-                      d="M74.37,41.41a.5.5,0,0,1-.21.35.48.48,0,0,1-.4.09.19.19,0,0,1-.13-.24.56.56,0,0,1,.13-.24l.06-.08s.08,0,.14.1c-.27.26-.24.39,0,.33s.46-.46.23-.39l-.23.06s.08-.07.25-.12a.13.13,0,0,1,.13,0A.17.17,0,0,1,74.37,41.41Z"/>
-                <path class="cls-7"
-                      d="M74.19,41.33c.23-.07,0,.35-.23.39s-.27-.07,0-.33a.46.46,0,0,1,.11.12s0,0,0,0,0,.05,0,0a.46.46,0,0,0,.07-.07s0-.11,0-.09-.16,0-.17,0Z"/>
-                <path class="cls-7"
-                      d="M74.18,43.17a.69.69,0,0,1-.22.62c-.32.22-.44.26-.54.74a.57.57,0,0,1-.23.3.51.51,0,0,1-.16.09s-.09,0-.12,0,0,0,0,0a.83.83,0,0,1,.06-.21.36.36,0,0,0,0-.11s0,0,0-.22c0,0,0,0,0,0h0l-.08,0-.14,0c-.08,0-.13,0-.13,0s0,0,.09-.1a.55.55,0,0,1,.38-.14c.1.09,0,.21,0,.31s.06,0,.09,0l.08-.08a.38.38,0,0,0,.07-.21v0a.19.19,0,0,1,0-.08.42.42,0,0,1,0-.1.34.34,0,0,1,.07-.11,1.62,1.62,0,0,1,.18-.19l.18-.15c.15-.13.07-.38-.11-.6a1.4,1.4,0,0,0-.32-.28,1.06,1.06,0,0,0-.38-.12,3.17,3.17,0,0,0-.87,0H72l-.11,0-.21.07-.23.08a1.53,1.53,0,0,1-.29,0l-.25-.05h-.06a1.17,1.17,0,0,0-.27.05,3.85,3.85,0,0,0-.58.19,2.5,2.5,0,0,0-.94.59,1.5,1.5,0,0,0-.4.95,1.46,1.46,0,0,0,.1.57.46.46,0,0,0,.35.31,1.69,1.69,0,0,0,1.19-.29,2.2,2.2,0,0,0,.25-.17l.11-.1.07-.06a.2.2,0,0,0,.06-.15c0-.06-.07-.08-.11-.1a1.29,1.29,0,0,0-.41,0,.4.4,0,0,0-.29.1.84.84,0,0,0-.12.19s-.07.07-.08.06,0,0,0-.08a.54.54,0,0,1,.08-.25.56.56,0,0,1,.38-.21,1.32,1.32,0,0,1,.57,0,.4.4,0,0,1,.29.21.42.42,0,0,1-.08.38,2,2,0,0,1-.13.18l-.12.12a2,2,0,0,1-.28.23l-.33.2a.28.28,0,0,1-.15-.15.21.21,0,0,0-.16.07c-.07.06-.12.12-.11.13l.08.1a1.8,1.8,0,0,1-.81.09,1,1,0,0,1-.72-.56,2,2,0,0,1-.19-.79,2,2,0,0,1,.49-1.33,2.37,2.37,0,0,1,.79-.63l.36-.18a4.5,4.5,0,0,1,.69-.2,3,3,0,0,1,.37,0,.83.83,0,0,1,.29,0l.13,0h.11l.17,0,.2-.07.11,0,.16,0a3.59,3.59,0,0,1,1,0,1.34,1.34,0,0,1,.56.22,1.73,1.73,0,0,1,.41.4A1.19,1.19,0,0,1,74.18,43.17Z"/>
-                <path class="cls-7"
-                      d="M74.13,41.41s.05.05,0,.09a.46.46,0,0,1-.07.07s-.07,0,0,0,0,0,0,0a.46.46,0,0,0-.11-.12S74.06,41.41,74.13,41.41Z"/>
-                <path class="cls-7"
-                      d="M73.32,2.25l.69.13a3.27,3.27,0,0,0-.42.21,6.43,6.43,0,0,0-.73.48,3.69,3.69,0,0,0-.72.78,8.45,8.45,0,0,0-.67,1.2,15.41,15.41,0,0,0-.75,2l-.15.49s0,0,0,0l0-.13,0-.25-.06-.49c-.05-.32-.09-.64-.13-.94a5.8,5.8,0,0,0-.21-.89c-.07-.19-.16-.38-.24-.55a6.8,6.8,0,0,0-1-1.53l-.28-.29.87-.18a12.39,12.39,0,0,1,.83,1.76,5.46,5.46,0,0,1,.21.61,3,3,0,0,1,.1.5q0,.27.06.57l0,.32,0,.16V6.3s0,0,0,0A2.55,2.55,0,0,1,70.77,6c.15-.43.3-.84.43-1.18a13.45,13.45,0,0,1,.62-1.26,4.62,4.62,0,0,1,.72-1l.42-.4Z"/>
-                <path class="cls-12" d="M73.89,22.72l.1,0a.36.36,0,0,0-.11.1S73.89,22.74,73.89,22.72Z"/>
-                <path class="cls-7" d="M74,22.43c0,.1,0,.2-.08.29-.42.21-.6.36-.63.36A3.44,3.44,0,0,1,74,22.43Z"/>
-                <path class="cls-12"
-                      d="M74,31.89a3.21,3.21,0,0,1-.81-.06.4.4,0,0,0-.29.05c0-.39,0-.77,0-1.13a3.25,3.25,0,0,1,0-.33A2.34,2.34,0,0,0,74,31.89Z"/>
-                <path class="cls-7"
-                      d="M74,60.42a.55.55,0,0,1-.14.35,1.17,1.17,0,0,1-.24.21,2.14,2.14,0,0,1-.48.27.83.83,0,0,1-.4,0,.13.13,0,0,0,0-.06.86.86,0,0,0,.34-.09,2.23,2.23,0,0,0,.42-.3c.14-.12.28-.25.26-.41a2,2,0,0,0-.47-.93.61.61,0,0,0-.36-.23.21.21,0,0,1,0-.13v0c0-.09,0-.16.1-.16s.07,0,.18.08a1.17,1.17,0,0,1,.34.28,2.35,2.35,0,0,1,.29.49A1.59,1.59,0,0,1,74,60.42Z"/>
-                <path class="cls-9"
-                      d="M73.8,60.42c0,.16-.12.29-.26.41a2.23,2.23,0,0,1-.42.3.86.86,0,0,1-.34.09,4.88,4.88,0,0,0,.08-.61,6.06,6.06,0,0,0,.06-1c0-.18,0-.34,0-.48h0a.21.21,0,0,0,0,.13.61.61,0,0,1,.36.23A2,2,0,0,1,73.8,60.42Z"/>
-                <path class="cls-7"
-                      d="M73.88,22.78c-.09.38-.18.75-.24,1.11-.36,2-.44,3.33-.46,3.41s-.16,1.29-.26,3.11a11.17,11.17,0,0,1-.24-3.6C72.78,24.55,73,23.54,73.88,22.78Z"/>
-                <path class="cls-14"
-                      d="M73.59,42.9c.18.22.26.47.11.6l-.18.15a1.62,1.62,0,0,0-.18.19.34.34,0,0,0-.07.11.42.42,0,0,0,0,.1.19.19,0,0,0,0,.08v0a.38.38,0,0,1-.07.21l-.08.08s-.09.06-.09,0,.12-.22,0-.31a.55.55,0,0,0-.38.14c-.07.06-.1.09-.09.1s0,0,.13,0l.14,0,.08,0h0s0,0,0,0c0,.2,0,.17,0,.22a.36.36,0,0,1,0,.11.83.83,0,0,0-.06.21s0,0,0,0v0c-.05,0-.09,0-.14,0s-.27.2-.39.27a.58.58,0,0,1-.44.13.16.16,0,0,0,0-.14c0-.09-.09-.09-.09-.08a.3.3,0,0,1,0,.09s-.08.09-.18.13a3.33,3.33,0,0,1-.78.22,1.59,1.59,0,0,1-.76,0l-.07,0,.33-.2a2,2,0,0,0,.28-.23l.12-.12a2,2,0,0,0,.13-.18.42.42,0,0,0,.08-.38.4.4,0,0,0-.29-.21,1.32,1.32,0,0,0-.57,0,.56.56,0,0,0-.38.21.54.54,0,0,0-.08.25s0,.07,0,.08,0,0,.08-.06a.84.84,0,0,1,.12-.19.4.4,0,0,1,.29-.1,1.29,1.29,0,0,1,.41,0s.1,0,.11.1a.2.2,0,0,1-.06.15l-.07.06-.11.1a2.2,2.2,0,0,1-.25.17,1.69,1.69,0,0,1-1.19.29.46.46,0,0,1-.35-.31,1.46,1.46,0,0,1-.1-.57,1.5,1.5,0,0,1,.4-.95,2.5,2.5,0,0,1,.94-.59,3.85,3.85,0,0,1,.58-.19,1.17,1.17,0,0,1,.27-.05h.06l.25.05a1.53,1.53,0,0,0,.29,0l.23-.08.21-.07.11,0H72a3.17,3.17,0,0,1,.87,0,1.06,1.06,0,0,1,.38.12A1.4,1.4,0,0,1,73.59,42.9Z"/>
-                <path class="cls-7"
-                      d="M73.66,53.78a3,3,0,0,1-.08.71c-.1.39-.26.81-.38,1.27s-.3,1.15-.38,1.5c0-.17,0-.36-.09-.56s0-.28-.07-.42,0-.41.08-.62c.06-.47.2-1,.25-1.28a2,2,0,0,0,0-.4.79.79,0,0,0,0-.14.91.91,0,0,0-.11-.44,1.84,1.84,0,0,0-.94-.61l-.11,0c0-.18-.09-.36-.15-.53l.4.13a2.22,2.22,0,0,1,1.29.7,1.42,1.42,0,0,1,.24.51C73.65,53.7,73.65,53.78,73.66,53.78Z"/>
-                <path class="cls-7"
-                      d="M73.25,46.34s-.07.28-.36.6a2.84,2.84,0,0,1-1.33.85,4.87,4.87,0,0,1-1,.18v0a.33.33,0,0,0-.32-.31l-.49.2v-.4l.12-.09.21,0a4.38,4.38,0,0,0,1.39,0,3.16,3.16,0,0,0,1.28-.58,4.89,4.89,0,0,1,.52-.42Z"/>
-                <path class="cls-9"
-                      d="M73,54a2,2,0,0,1,0,.4c0,.31-.19.81-.25,1.28,0,.21-.06.42-.08.62-.15-.86-.4-1.9-.66-2.93l-.16-.6.11,0a1.84,1.84,0,0,1,.94.61.91.91,0,0,1,.11.44A.79.79,0,0,1,73,54Z"/>
-                <path class="cls-7"
-                      d="M72.92,45c-.06,0-.21.24-.42.45a.76.76,0,0,1-.55.18.47.47,0,0,1-.24-.08.2.2,0,0,0,.09-.06.47.47,0,0,0,.13-.11h0a.58.58,0,0,0,.44-.13c.12-.07.27-.2.39-.27s.09-.06.14,0L73,45A0,0,0,0,1,73,45h0S73,45.06,72.92,45Z"/>
-                <path class="cls-7"
-                      d="M72.92,59.13c0,.14,0,.3,0,.48a6.06,6.06,0,0,1-.06,1,4.88,4.88,0,0,1-.08.61h-.14s0,0,.13.05a15.64,15.64,0,0,1-2,5.16c-.32.55-.68,1.11-1.07,1.68.08-.34.11-.56.06-.59a8.26,8.26,0,0,0-1.23,2l-.28.52v0a5.08,5.08,0,0,1-1.66,1.26,9.59,9.59,0,0,1-2.31.74l-.66.11v-.09c0-.08,0-.14,0-.17v0h-1s0,.18,0,.44h-.07c0-.27,0-.42-.08-.43s-.06.16-.11.45c-.19,0-.38,0-.57,0a14.62,14.62,0,0,1-2.55-.07,9.7,9.7,0,0,1-2.18-.62,4.84,4.84,0,0,0-.26-.43s0,0,0,0S57,71,57,71l-1.24-.44a3.26,3.26,0,0,1-.11.33c-.37-.22-.73-.46-1.08-.71a17.72,17.72,0,0,1-2-1.68l-.19-.21a.76.76,0,0,0,.12-.61A8.22,8.22,0,0,1,52,66.29l.13-.07a6.9,6.9,0,0,0,1.1,1.62l.14.13,0,0,.16.24.09-.06c.21.21.44.41.67.61a.23.23,0,0,1-.18,0l-.15.25a.57.57,0,0,0,.28.08.42.42,0,0,0,.28-.1l.61.47a10.2,10.2,0,0,0,4.36,2,15.88,15.88,0,0,0,2.4.12,16.42,16.42,0,0,0,2.35-.22A5.89,5.89,0,0,0,68,69.45a28.34,28.34,0,0,0,2.4-3.28,15.37,15.37,0,0,0,2.22-5.6c.23-1.45.13-2.3.2-2.3a2.49,2.49,0,0,1,.09.6C72.9,59,72.91,59,72.92,59.13Z"/>
-                <path class="cls-10"
-                      d="M72.86,31.88a4.68,4.68,0,0,0,0,.53.32.32,0,0,1-.15-.35A.27.27,0,0,1,72.86,31.88Z"/>
-                <path class="cls-7"
-                      d="M72.82,57.26c.07.61.05,1,0,1s-.26-.5-.55-1.28h0a.66.66,0,0,1,0-.15l-.73-2,.14-.14a3.1,3.1,0,0,0,.37-.46.27.27,0,0,0-.16-.38c-.17-.08-.34-.06-.4,0s-.07.11-.2.27c-.06-.17-.12-.34-.19-.52l-.31-.84.11,0,.33-.08L70.81,52a3.28,3.28,0,0,0,1,.73l.16.6c.26,1,.51,2.07.66,2.93a2.62,2.62,0,0,0,0,1.31S72.77,57.47,72.82,57.26Z"/>
-                <path class="cls-9"
-                      d="M72.25,57c.29.78.46,1.29.55,1.28-.07,0,0,.85-.2,2.3a15.37,15.37,0,0,1-2.22,5.6A28.34,28.34,0,0,1,68,69.45a5.89,5.89,0,0,1-3.79,1.9,16.42,16.42,0,0,1-2.35.22,15.88,15.88,0,0,1-2.4-.12,10.2,10.2,0,0,1-4.36-2L54.47,69h0a1.6,1.6,0,0,0,.26-1.3.18.18,0,0,0-.19-.11h-.83l-.21,0,.06.2s0,.12-.21.24l-.14-.13a6.9,6.9,0,0,1-1.1-1.62l-.18-.35q-.15-.32-.27-.63a.24.24,0,0,0,.14,0,.37.37,0,0,0,.27-.31.48.48,0,0,0-.17-.41.36.36,0,0,0-.18-.11,1.48,1.48,0,0,1-.42-.19s0,0-.05,0a23,23,0,0,1-.76-2.84c-.16-.74-.28-1.48-.38-2.2l.12,0c.26-.08.66-.2,1.22-.39a10.72,10.72,0,0,0,2.1-1c.41-.26.83-.56,1.28-.91l.74-.6c.31-.25.48-.46.79-.72a6.55,6.55,0,0,1,.56-.6l0,0A7.67,7.67,0,0,1,56,55c-.4,0-.82.08-1.16.09l-.82,0a9.68,9.68,0,0,1-1.4-.1,5.38,5.38,0,0,1-1.85-.65,3.29,3.29,0,0,1-.67-.53c0-.29.08-.58.13-.86a15.28,15.28,0,0,1,.42-1.65,4.78,4.78,0,0,0,.81.2,6.94,6.94,0,0,0,2-.08l.62-.09.81-.14.89-.16.48-.09c.12,0,0,0,0-.06s-.14,0-.15,0-.17-.1-.17-.11l-.17-.07,1.7-.25h0a15.19,15.19,0,0,0,1.8-1.48c.45-.37.91-.73,1.27-1l.45-.3a16.2,16.2,0,0,0,3.42,1,9.28,9.28,0,0,0,2,0v0a1,1,0,0,0,.19.14,3.7,3.7,0,0,0,.44.28,1.84,1.84,0,0,0,.47.15,2.79,2.79,0,0,0,1.18,0,6.28,6.28,0,0,0,.66-.23s.07.17.12.33a.27.27,0,0,1,.08.19h0v0a1.16,1.16,0,0,1-.18.51,1.92,1.92,0,0,1-.18.29,2.28,2.28,0,0,1-1.25.69l-.51.09-.61.1a4.7,4.7,0,0,0-.71.14l-.16,0-.09,0s0,.06,0,.08a1.84,1.84,0,0,0,.15.35,2.3,2.3,0,0,0,.52.6,3.18,3.18,0,0,0,.58.35,3.49,3.49,0,0,0,1.12.31A6.5,6.5,0,0,0,69.86,53c.37-.07.64-.13.85-.19h0l.31.84c.07.18.13.35.19.52l-.08.1a2.71,2.71,0,0,1-1,.68,3.82,3.82,0,0,1-1.73.24l-1-.09c-.26,0-.59-.08-1-.17s-.83-.23-1.29-.36l.11.14,0,0v0l0,0,.35.32a9.75,9.75,0,0,0,.74.64l.43.32.29.18a5.33,5.33,0,0,0,.56.32,5.15,5.15,0,0,0,2.26.61A5.47,5.47,0,0,0,72.25,57Zm-1.92,3.55a3.52,3.52,0,0,0,.29-.4,3.56,3.56,0,0,0-.45-.13l-.27,0c-.16,0-.32,0-.3.05a2.64,2.64,0,0,0,.26.11l.24.1c.06,0,0,0,.05,0s0,0-.06,0l-.11.12a.56.56,0,0,1-.24.17c-.09,0-.15,0-.16-.1s0-.16,0-.17-.07,0-.1.16a.27.27,0,0,0,0,.23.39.39,0,0,0,.26.11A1,1,0,0,0,70.33,60.54Zm-.14,3s.18-.11,0-.29a1.78,1.78,0,0,0-.74-.06l-.33,0a1.15,1.15,0,0,0-.31,0,3.87,3.87,0,0,0-1,.41,1.55,1.55,0,0,1-.32.14c-.07,0-.12,0-.12,0s-.09,0-.1.12a.63.63,0,0,0,.18.34.9.9,0,0,0,.45.32.84.84,0,0,0,.6-.22,4.68,4.68,0,0,1,.91-.55l.11,0,.18-.06.3-.09A.88.88,0,0,0,70.19,63.49Zm-1.1,3.9c0-.21-.16-.29-.3-.25a1,1,0,0,0-.2,0,3.56,3.56,0,0,0-.62.34c-.28.19-.53.42-.5.45s.31-.12.62-.25a4,4,0,0,1,.41-.17l.19-.06s.07,0,.07,0,0,0,0,0,0,.14,0,.22-.05.18-.07.25-.16.14-.18.17,0,0,.09,0,.16-.05.22-.12a1.74,1.74,0,0,0,.14-.27A2.09,2.09,0,0,0,69.09,67.39Zm-4.54-3.93a.18.18,0,0,0-.06-.23c-.14-.06-.13,0-.15,0H64a3.24,3.24,0,0,0-.67,0,.81.81,0,0,0-.52.46c-.07.17-.08.29-.06.3a2.44,2.44,0,0,0,.94-.07,1.63,1.63,0,0,0,.62-.28l.07,0a.11.11,0,0,0,.06,0S64.51,63.53,64.55,63.46Zm-.92,3.12c0-.13-.12-.24-.23-.28a2.15,2.15,0,0,0-.52-.13l-.36,0a1,1,0,0,0-.78.31,1.22,1.22,0,0,0-.36,1,2.13,2.13,0,0,1,.52-.88.73.73,0,0,1,.59-.17l.35,0a2.92,2.92,0,0,1,.45.08l0,0v0a.5.5,0,0,1-.07.08c-.1.11-.24.24-.33.32-.34.14-.68.19-.68.22a1.18,1.18,0,0,0,.77,0,3.25,3.25,0,0,0,.42-.31l.09-.1A.5.5,0,0,0,63.63,66.58ZM60.11,69.3a.26.26,0,0,0,.07-.24.4.4,0,0,0-.22-.2c-.31-.14-.6,0-.57,0s.07,0,.16,0a.86.86,0,0,1,.28.11s0,.06,0,.06,0,0,0,0a1.49,1.49,0,0,1-.46.07.49.49,0,0,1-.19,0c-.06,0,.05,0,.05.07a.23.23,0,0,1,0,.07s0,0,0,0,0,0,0,0,0,0,0,0l.1,0a1.16,1.16,0,0,0,.4,0l.19,0A.58.58,0,0,0,60.11,69.3ZM57.7,62.89a.24.24,0,0,0,0-.17.2.2,0,0,0-.07-.15.37.37,0,0,0-.16-.1.81.81,0,0,0-.31-.06,2.63,2.63,0,0,0-.77.06c-.26,0-.52.06-.73.08l-.15,0-.06,0s0,.07,0,.08.09.06.09.06,0,0,0-.07h.18a3.66,3.66,0,0,0,.75,0,3.23,3.23,0,0,1,.71,0l.19,0h0s0,0,0,0-.35.38-.54.42a.67.67,0,0,1-.33-.05l-.34-.1A1.21,1.21,0,0,0,55.8,63s.1.09.29.18l.31.15a.91.91,0,0,0,.43.11.83.83,0,0,0,.42-.2l.27-.21A.59.59,0,0,0,57.7,62.89Z"/>
-                <path class="cls-7"
-                      d="M72.73,56.7c0,.2.06.39.09.56s-.09.33-.11.33a2.62,2.62,0,0,1,0-1.31C72.69,56.42,72.71,56.56,72.73,56.7Z"/>
-                <path class="cls-7" d="M72.78,61.22a.13.13,0,0,1,0,.06c-.09,0-.13,0-.13-.05Z"/>
-                <path class="cls-8"
-                      d="M73,2.19l-.42.4a4.62,4.62,0,0,0-.72,1,13.45,13.45,0,0,0-.62,1.26c-.13.34-.28.75-.43,1.18a2.55,2.55,0,0,0-.08.26s0,.07,0,0V6.22l0-.16,0-.32q0-.3-.06-.57a3,3,0,0,0-.1-.5,5.46,5.46,0,0,0-.21-.61,12.39,12.39,0,0,0-.83-1.76c.3,0,.61-.11.92-.15A8.43,8.43,0,0,1,71.8,2a1.48,1.48,0,0,1,.31,0l.41.05A3.64,3.64,0,0,0,73,2.19Z"/>
-                <path class="cls-7"
-                      d="M72.25,57h0a5.47,5.47,0,0,1-2.27.2,5.15,5.15,0,0,1-2.26-.61,5.33,5.33,0,0,1-.56-.32l-.29-.18-.43-.32a9.75,9.75,0,0,1-.74-.64l-.35-.32,0,0v0l0,0-.11-.14c.46.13.94.28,1.29.36s.69.13,1,.17l1,.09a3.82,3.82,0,0,0,1.73-.24,2.71,2.71,0,0,0,1-.68l.08-.1c.09.23.17.45.25.68a3.23,3.23,0,0,1-1.07.67,4.36,4.36,0,0,1-2,.22,10.19,10.19,0,0,1-1.08-.12l-.19,0-.16,0-.08,0,0,.05a.77.77,0,0,0,.13.12l.08.07.24.17c.17.12.35.22.52.33a5.15,5.15,0,0,0,2.09.67,10.19,10.19,0,0,0,1.62.09A4.86,4.86,0,0,1,72.25,57Z"/>
-                <path class="cls-8"
-                      d="M72.2,56.83a.66.66,0,0,0,0,.15,4.86,4.86,0,0,0-.63,0A10.19,10.19,0,0,1,70,56.92a5.15,5.15,0,0,1-2.09-.67c-.17-.11-.35-.21-.52-.33l-.24-.17-.08-.07a.77.77,0,0,1-.13-.12l0-.05.08,0,.16,0,.19,0a10.19,10.19,0,0,0,1.08.12,4.36,4.36,0,0,0,2-.22,3.23,3.23,0,0,0,1.07-.67Z"/>
-                <path class="cls-7"
-                      d="M71.82,53.86a.27.27,0,0,1,.16.38,3.1,3.1,0,0,1-.37.46l-.14.14c-.08-.23-.16-.45-.25-.68.13-.16.19-.26.2-.27S71.65,53.78,71.82,53.86Z"/>
-                <path class="cls-7"
-                      d="M71.75,45.41s0,0,0,0a.05.05,0,0,1-.06.06s0,0,0,.05h0a3.42,3.42,0,0,1-.69.28,1.77,1.77,0,0,1-.91,0,.68.68,0,0,1-.31-.18,2.07,2.07,0,0,0,.34-.15l.07,0a1.59,1.59,0,0,0,.76,0,3.33,3.33,0,0,0,.78-.22c.1,0,.17-.09.18-.13a.3.3,0,0,0,0-.09s.06,0,.09.08a.16.16,0,0,1,0,.14h0s-.05,0-.05,0a.3.3,0,0,0-.1.07h0A.08.08,0,0,0,71.75,45.41Z"/>
-                <path class="cls-7"
-                      d="M71.88,45.38s0,0,.05,0a.47.47,0,0,1-.13.11.2.2,0,0,1-.09.06h0s0,0,0-.05a.05.05,0,0,0,.06-.06h0A.3.3,0,0,1,71.88,45.38Z"/>
-                <path class="cls-7"
-                      d="M71.69,52.22c.06.17.1.35.15.53a3.28,3.28,0,0,1-1-.73h0l-.19-.36-.06.07c-.08-.11-.11-.19-.09-.21S71,51.94,71.69,52.22Z"/>
-                <path class="cls-7"
-                      d="M65,82.21h0q.11.44.18.87l1.5.82,2.42,0a2.26,2.26,0,0,0,1.07-.11,1,1,0,0,0,.36-.3l.09-.11a0,0,0,0,0,0,0,.89.89,0,0,1,0,.11h0l.27.19c.08-.1,0-.36-.13-.59l0-.08c.11-.17.21-.33.3-.49l.08-.15a.28.28,0,0,1,0,.07l.3-.13a1.54,1.54,0,0,0-.17-.23.86.86,0,0,0-.14-.13,1.18,1.18,0,0,0-.32-.66.73.73,0,0,0-.73-.28,7.83,7.83,0,0,0-.86.38,9.05,9.05,0,0,1-1.64.62,5.61,5.61,0,0,1-1.34,0c-.36,0-.64,0-.84,0h-.1l.21,0,.16,0h.08V82h0c.14,0,.3,0,.48-.06a6.81,6.81,0,0,0,1.29-.11,9.28,9.28,0,0,0,1.53-.68,6.59,6.59,0,0,1,.92-.45,1.08,1.08,0,0,1,.64,0,1.56,1.56,0,0,1,.52.34,1.79,1.79,0,0,1,.53,1.14.69.69,0,0,1,0,.39,2.73,2.73,0,0,1-.13.29c-.09.18-.19.35-.29.52s-.21.35-.34.53a1.52,1.52,0,0,1-.55.48,3,3,0,0,1-1.34.21l-2.58,0c-.66-.35-1.33-.69-2-1-.35-1.54-.7-3-1-4.43-.08-.32-.15-.62-.23-.92,0,0,0-.15-.05-.21l0-.13,0-.24-.06-.48c-.06-.62-.12-1.2-.17-1.74-.1-1.07-.19-2-.24-2.56,0-.23,0-.42-.05-.57.32,0,.65-.07,1-.12,0,.15,0,.36,0,.61,0,.61.11,1.49.2,2.56,0,.53.09,1.11.14,1.73,0,.27,0,.55.08.84l.08.29,0,.25c0,.17.08.33.11.5L65,82.2Zm5.66,1.37h0S70.66,83.57,70.68,83.58Z"/>
-                <path class="cls-10" d="M71.77,45.45s0,0,0,0A.08.08,0,0,1,71.77,45.45Z"/>
-                <path class="cls-10"
-                      d="M71.58,82.36l-.3.13a.28.28,0,0,0,0-.07l0-.07c0-.06,0-.06,0-.17s0-.12,0-.18a.86.86,0,0,1,.14.13A1.54,1.54,0,0,1,71.58,82.36Z"/>
-                <path class="cls-10"
-                      d="M71.29,82.18c0,.11,0,.11,0,.17l0,.07a.69.69,0,0,0-.42-.35,1.72,1.72,0,0,0-.5,0,.38.38,0,0,0-.16,0s-.07,0-.08,0,0,0,0,0a.27.27,0,0,1,.17-.09,1.51,1.51,0,0,1,.56-.08.88.88,0,0,1,.41.16C71.28,82.06,71.28,82.12,71.29,82.18Z"/>
-                <path class="cls-9"
-                      d="M71.24,82.42l-.08.15c-.09.16-.19.32-.3.49l0,.08a1.05,1.05,0,0,0-.31-.28,1.38,1.38,0,0,0-.6-.08c-.16,0-.26,0-.26,0s.1.06.25.09a1.51,1.51,0,0,1,.48.16.84.84,0,0,1,.26.35l-.09.11a1,1,0,0,1-.36.3,2.26,2.26,0,0,1-1.07.11l-2.42,0-1.5-.82q-.08-.43-.18-.87h.08l.32-.06h.12c.2,0,.48,0,.84,0a5.61,5.61,0,0,0,1.34,0,9.05,9.05,0,0,0,1.64-.62,7.83,7.83,0,0,1,.86-.38.73.73,0,0,1,.73.28,1.18,1.18,0,0,1,.32.66.88.88,0,0,0-.41-.16,1.51,1.51,0,0,0-.56.08.27.27,0,0,0-.17.09s-.06,0,0,0,0,0,.08,0a.38.38,0,0,1,.16,0,1.72,1.72,0,0,1,.5,0A.69.69,0,0,1,71.24,82.42Z"/>
-                <path class="cls-7"
-                      d="M70.81,52l.35.67-.33.08-.11,0h0c-.12-.31-.23-.63-.35-.93l.06,0,.13-.1a2.64,2.64,0,0,0,.25.29Z"/>
-                <path class="cls-7"
-                      d="M71.07,50c.19.63.41,1.39.62,2.2-.68-.28-1.18-.74-1.23-.7s0,.1.09.21l-.13.1-.06,0-.47-1.26a2.71,2.71,0,0,0,.46-.57,1.65,1.65,0,0,0,.18-.37l-1.06-.17h0a.27.27,0,0,0-.08-.19c0-.16-.1-.28-.12-.33a6,6,0,0,0,1.06-.57.41.41,0,0,0,.19-.24C70.61,48.52,70.86,49.32,71.07,50Z"/>
-                <path class="cls-10"
-                      d="M70.82,83.14c.17.23.21.49.13.59l-.27-.19h0a.89.89,0,0,0,0-.11,0,0,0,0,1,0,0C70.69,83.32,70.76,83.23,70.82,83.14Z"/>
-                <path class="cls-7"
-                      d="M70.2,46.69c.42-.35.62-.71.68-.65a1.07,1.07,0,0,1-.1.24,2.11,2.11,0,0,1-.41.59,2.7,2.7,0,0,1-.53.46h0l-.08,0h0v-.12h-.15l-.09,0h0a.2.2,0,0,0-.09.06.28.28,0,0,0-.13.25v.05c-.3.06-.85.19-1.4.36a7.15,7.15,0,0,1-1.37.28h-.17a4,4,0,0,1-1.07-.17,3.65,3.65,0,0,1-1-.49,15.58,15.58,0,0,1-1.3-1.21l.17-.11.26-.17c.44.38.87.76,1.21,1a2.87,2.87,0,0,0,.58.27l.26.08a4.51,4.51,0,0,0,.92.2,7.36,7.36,0,0,0,2-.12A3.92,3.92,0,0,0,70.2,46.69Z"/>
-                <path class="cls-10" d="M70.61,51.66l.19.36a2.64,2.64,0,0,1-.25-.29Z"/>
-                <path class="cls-11" d="M70.72,83.58h0s0,0,0,0Z"/>
-                <path class="cls-7"
-                      d="M70.54,47.93v0h-.09s0,0-.11,0A1.36,1.36,0,0,1,70,48a1.48,1.48,0,0,1-.31,0l-.16,0h0s.12,0,.12,0l.07,0h.06v0l.49-.2A.33.33,0,0,1,70.54,47.93Z"/>
-                <path class="cls-10" d="M70.45,48h.09a.52.52,0,0,1,0,.18A1.08,1.08,0,0,1,70.45,48Z"/>
-                <path class="cls-7"
-                      d="M70.36,51.87c.12.3.23.62.35.93-.21.06-.48.12-.85.19a6.5,6.5,0,0,1-1.71.12A3.49,3.49,0,0,1,67,52.8a3.18,3.18,0,0,1-.58-.35,2.3,2.3,0,0,1-.52-.6,1.84,1.84,0,0,1-.15-.35s0-.07,0-.08l.09,0,.16,0a4.7,4.7,0,0,1,.71-.14l.61-.1.51-.09a2.28,2.28,0,0,0,1.25-.69,1.92,1.92,0,0,0,.18-.29,1.16,1.16,0,0,0,.18-.51v0h0l.42,1.11a2.94,2.94,0,0,1-1.93.82l-1.08.1-.48,0-.12,0s-.11,0-.07,0a.57.57,0,0,0,.12.23,1.41,1.41,0,0,0,.36.37,2.64,2.64,0,0,0,1.53.43,3.93,3.93,0,0,0,1.47-.4A4.92,4.92,0,0,0,70.36,51.87Z"/>
-                <path class="cls-7" d="M69.47,49.5l1.06.17a1.65,1.65,0,0,1-.18.37,2.71,2.71,0,0,1-.46.57Z"/>
-                <path class="cls-7"
-                      d="M70.45,48a1.08,1.08,0,0,0,.06.18.41.41,0,0,1-.19.24,6,6,0,0,1-1.06.57l0,0c0-.16.2-.4.57-.53a1.51,1.51,0,0,0,.53-.42Z"/>
-                <path class="cls-10" d="M70.45,48h-.11C70.4,47.93,70.43,47.92,70.45,48Z"/>
-                <path class="cls-7"
-                      d="M70,48a1.36,1.36,0,0,0,.35,0,1.51,1.51,0,0,1-.53.42c-.37.13-.62.37-.57.53l0,0a6.28,6.28,0,0,1-.66.23,2.79,2.79,0,0,1-1.18,0,1.84,1.84,0,0,1-.47-.15,3.7,3.7,0,0,1-.44-.28,1,1,0,0,1-.19-.14v0h.08a6.07,6.07,0,0,0,.83-.17h0a.34.34,0,0,0,0,.15.9.9,0,0,0,.27.2,1.32,1.32,0,0,0,1,.09,1.66,1.66,0,0,0,.79-.36l.26-.18s.13-.12.13-.22v-.08a.76.76,0,0,0-.2-.16l.16,0A1.48,1.48,0,0,0,70,48Z"/>
-                <path class="cls-7"
-                      d="M70.62,60.14a3.52,3.52,0,0,1-.29.4,1,1,0,0,1-.57.29.39.39,0,0,1-.26-.11.27.27,0,0,1,0-.23c0-.12.09-.17.1-.16s0,.08,0,.17.07.11.16.1a.56.56,0,0,0,.24-.17l.11-.12s0,0,.06,0,0,0-.05,0l-.24-.1A2.64,2.64,0,0,1,69.6,60s.14-.07.3-.05l.27,0A3.56,3.56,0,0,1,70.62,60.14Z"/>
-                <path class="cls-7"
-                      d="M70.21,63.2c.16.18,0,.28,0,.29a.88.88,0,0,1-.2.1l-.3.09-.18.06-.11,0a4.68,4.68,0,0,0-.91.55.84.84,0,0,1-.6.22.9.9,0,0,1-.45-.32.63.63,0,0,1-.18-.34c0-.12.1-.13.1-.12a.15.15,0,0,0,0,.11.78.78,0,0,0,.2.26.8.8,0,0,0,.38.23c.14,0,.29-.11.45-.23a4.78,4.78,0,0,1,.92-.64l.09,0h0l0,0h-.57a5.22,5.22,0,0,0-1,.31,1.25,1.25,0,0,1-.36.09c-.09,0-.14,0-.13,0s0,0,.12,0a1.55,1.55,0,0,0,.32-.14,3.87,3.87,0,0,1,1-.41,1.15,1.15,0,0,1,.31,0l.33,0A1.78,1.78,0,0,1,70.21,63.2Z"/>
-                <path class="cls-8"
-                      d="M69.89,50.61l.47,1.26a4.92,4.92,0,0,1-.67.41,3.93,3.93,0,0,1-1.47.4,2.64,2.64,0,0,1-1.53-.43,1.41,1.41,0,0,1-.36-.37.57.57,0,0,1-.12-.23s0,0,.07,0l.12,0,.48,0,1.08-.1a2.94,2.94,0,0,0,1.93-.82Z"/>
-                <path class="cls-7"
-                      d="M70,45.42a.28.28,0,0,0,.15.15,2.07,2.07,0,0,1-.34.15l-.08-.1s0-.07.11-.13A.21.21,0,0,1,70,45.42Z"/>
-                <path class="cls-7"
-                      d="M69.81,67.53s0,.25-.06.59c-.39.57-.83,1.14-1.29,1.72l-.16.21.28-.52A8.26,8.26,0,0,1,69.81,67.53Z"/>
-                <path class="cls-7" d="M69.81,47.32h0l-.12.09v-.09h0v0h0Z"/>
-                <path class="cls-7" d="M69.73,47.82v0h0Z"/>
-                <path class="cls-7"
-                      d="M69.72,47.42v.4l0,0h0a1.21,1.21,0,0,0,0-.14.21.21,0,0,1,0-.11s0,0,0,0,0,0,0,0l0,0Z"/>
-                <path class="cls-11" d="M69.72,47.3h0v0Z"/>
-                <path class="cls-7" d="M69.72,47.33v.09l-.09.06a.47.47,0,0,0,.07-.12Z"/>
-                <path class="cls-7"
-                      d="M69.72,47.32h0l0,0a.47.47,0,0,1-.07.12l-.17.09a.51.51,0,0,0-.23,0v-.05a.28.28,0,0,1,.13-.25.2.2,0,0,1,.09-.06h0l.09,0h.15v.14Z"/>
-                <path class="cls-9"
-                      d="M69.72,48.06v.08c0,.1-.13.22-.13.22l-.26.18a1.66,1.66,0,0,1-.79.36,1.32,1.32,0,0,1-1-.09.9.9,0,0,1-.27-.2.34.34,0,0,1,0-.15h0c.25-.08.49-.17.69-.25a8.55,8.55,0,0,0,1.35-.5c0,.06.07.12.1.13l.06,0,0,0h0A.76.76,0,0,1,69.72,48.06Z"/>
-                <path class="cls-7"
-                      d="M69.65,31.44a14.28,14.28,0,0,1-.16,3.36,12.55,12.55,0,0,1-2,4.7c-.7,1-1.25,1.52-1.3,1.47a3,3,0,0,1,.29-.42c.19-.28.46-.68.76-1.2a13.51,13.51,0,0,0,1.65-4.65,13.85,13.85,0,0,0,0-3.23,34.74,34.74,0,0,0-.39-3.57,11,11,0,0,0-1.17-3.44A7.92,7.92,0,0,0,65,21.83l0,0a8.32,8.32,0,0,0-4.87-1.68,29.13,29.13,0,0,0-4.62.59,16.12,16.12,0,0,0-3.07,1c-.7.31-1.08.56-1.14.58s-.57.33-1.36.94a24.3,24.3,0,0,0-3,2.81,25.21,25.21,0,0,0-1.74,2.1c-.14.2-.29.4-.43.61l-.11.14v0s0,0,0,.05l0,0,.23.27.52.6A48.11,48.11,0,0,0,50,34.5a24.1,24.1,0,0,0,2.66,2c.22.15.46.29.69.43l.7.38c.48.25,1,.48,1.45.7,1.92.92,3.72,1.74,5.29,2.33A15.08,15.08,0,0,0,63,41a6.93,6.93,0,0,0,1.74.15,5.22,5.22,0,0,0,1.12-.1c.25,0,.37-.11.38-.1s-.48.39-1.49.47a7.51,7.51,0,0,1-1.82,0,9.31,9.31,0,0,1-1.26-.28c-.33-.08-.66-.18-1-.29-1.63-.53-3.47-1.3-5.42-2.14-.49-.22-1-.43-1.49-.67L53,37.65l-.74-.43a25.94,25.94,0,0,1-2.8-2,47.56,47.56,0,0,1-4.91-4.66L44,30l-.28-.33-.47-.54c0-.05-.11-.09-.08-.14l.1-.15.2-.29.32-.47.42-.61A24.7,24.7,0,0,1,46,25.19a25.2,25.2,0,0,1,3.12-3,16.69,16.69,0,0,1,1.49-1.06c.07,0,.51-.31,1.3-.65a17.8,17.8,0,0,1,3.33-1A27.83,27.83,0,0,1,60.05,19a9.26,9.26,0,0,1,5.51,2l0,0h0a8.88,8.88,0,0,1,2.61,3,11.8,11.8,0,0,1,1.16,3.75A31.65,31.65,0,0,1,69.65,31.44Z"/>
-                <path class="cls-7"
-                      d="M69.67,47.84h0l-.07,0s-.12,0-.12,0l0,0-.06,0s-.07-.07-.1-.13c.12-.07.19-.11.19-.13l.17-.09,0,0s0,0,0,0,0,0,0,0a.21.21,0,0,0,0,.11A1.21,1.21,0,0,1,69.67,47.84Z"/>
-                <path class="cls-10" d="M69.26,47.67a1.24,1.24,0,0,0,.2-.1s-.07.06-.19.13v0Z"/>
-                <path class="cls-10" d="M69.46,47.57a1.24,1.24,0,0,1-.2.1.11.11,0,0,1,0-.08A.51.51,0,0,1,69.46,47.57Z"/>
-                <path class="cls-9"
-                      d="M69.39,63.42h0l0,0h0l-.09,0a4.78,4.78,0,0,0-.92.64c-.16.12-.31.24-.45.23a.8.8,0,0,1-.38-.23.78.78,0,0,1-.2-.26.15.15,0,0,1,0-.11s0,0,.13,0a1.25,1.25,0,0,0,.36-.09,5.22,5.22,0,0,1,1-.31h.53Z"/>
-                <path class="cls-7"
-                      d="M69.39,2.28l0,0-.87.18a1.85,1.85,0,0,0-.46-.33c-.06,0-.1,0-.11,0s0-.07,0-.09A.15.15,0,0,1,68,2l.24-1a1.22,1.22,0,0,1,.45.3A4.35,4.35,0,0,1,69.39,2.28Z"/>
-                <path class="cls-7"
-                      d="M69.75,68.12a14.79,14.79,0,0,1-.53,1.69c-.2.56-.42,1.11-.59,1.52s-.3.7-.32.72-.15.28-.4.66a11.06,11.06,0,0,1-1,1.36c-.27.32-.54.61-.79.86a1.41,1.41,0,0,1-.1-.18l-.63.62s0,0,.08,0,0,0,0,.05v.07c-.18.15-.31.23-.33.16a10.11,10.11,0,0,1,1.16-2c.29-.48.55-1,.74-1.38s.31-.67.32-.69.16-.27.37-.65.31-.55.48-.87v0l.16-.21C68.92,69.26,69.36,68.69,69.75,68.12Z"/>
-                <path class="cls-7"
-                      d="M67.46,48.33l-.29-.1s-.15.06-.49.23a2.48,2.48,0,0,0-.59,0s.19.14.23.2a9.28,9.28,0,0,1-2,0,16.2,16.2,0,0,1-3.42-1,1.4,1.4,0,0,0,.17-.1l.52-.35a15.12,15.12,0,0,0,2.81.9,9.52,9.52,0,0,0,1.93.13h.09a8,8,0,0,0,2-.27,4.8,4.8,0,0,0,.78-.28v0a8.55,8.55,0,0,1-1.35.5c-.2.08-.44.17-.69.25,0,0,0-.06.08-.08l.09,0Z"/>
-                <path class="cls-7"
-                      d="M69.26,47.67h0a4.8,4.8,0,0,1-.78.28,8,8,0,0,1-2,.27A7.15,7.15,0,0,0,67.83,48c.55-.17,1.1-.3,1.4-.36A.11.11,0,0,0,69.26,47.67Z"/>
-                <path class="cls-7"
-                      d="M68.79,67.14c.14,0,.35,0,.3.25a2.09,2.09,0,0,1-.13.37,1.74,1.74,0,0,1-.14.27c-.06.07-.15.14-.22.12s-.09,0-.09,0,.13,0,.18-.17,0-.15.07-.25,0-.24,0-.22,0,0,0,0-.07,0-.07,0l-.19.06a4,4,0,0,0-.41.17c-.31.13-.59.29-.62.25s.22-.26.5-.45a3.56,3.56,0,0,1,.62-.34A1,1,0,0,1,68.79,67.14Z"/>
-                <path class="cls-8"
-                      d="M69,31.47a13.85,13.85,0,0,1,0,3.23,13.51,13.51,0,0,1-1.65,4.65c-.3.52-.57.92-.76,1.2a3,3,0,0,0-.29.42s-.13.05-.38.1a5.22,5.22,0,0,1-1.12.1A6.93,6.93,0,0,1,63,41a15.08,15.08,0,0,1-2.18-.67c-1.57-.59-3.37-1.41-5.29-2.33-.48-.22-1-.45-1.45-.7l-.7-.38c-.23-.14-.47-.28-.69-.43a24.1,24.1,0,0,1-2.66-2,48.11,48.11,0,0,1-4.69-4.67l-.52-.6L44.58,29l0,0s0,0,0-.05v0l.11-.14c.14-.21.29-.41.43-.61A25.21,25.21,0,0,1,46.86,26a24.3,24.3,0,0,1,3-2.81c.79-.61,1.31-.89,1.36-.94s.44-.27,1.14-.58a16.12,16.12,0,0,1,3.07-1,29.13,29.13,0,0,1,4.62-.59,8.32,8.32,0,0,1,4.87,1.68l0,0a7.92,7.92,0,0,1,2.42,2.63,11,11,0,0,1,1.17,3.44A34.74,34.74,0,0,1,69,31.47Zm-1.4,1.13a3.9,3.9,0,0,0,.18-2,16.49,16.49,0,0,0-.59-2.52A10.8,10.8,0,0,0,66,25.61a5.56,5.56,0,0,0-1.16-1.29,11.65,11.65,0,0,0-1.62-.88,7.72,7.72,0,0,0-1.87-.59,4.76,4.76,0,0,0-2.12.1,6.51,6.51,0,0,0-1.94,1,12.46,12.46,0,0,0-4.25,4.91,10,10,0,0,0-.38,1c-.05.18-.09.36-.13.54s0,.18,0,.29,0,.29,0,.43l.33.27.21.16c.14.1.28.22.43.32l.86.58h0a9.39,9.39,0,0,0,2.61,1.13,23,23,0,0,0,2.54.58,12.77,12.77,0,0,0,4.43.18,7.53,7.53,0,0,0,2.83-1A2.43,2.43,0,0,0,67.56,32.6Z"/>
-                <path class="cls-7"
-                      d="M68.16.37l.08.64L68,2A.15.15,0,0,0,68,2s0,.06,0,.09,0,0,.11,0a1.85,1.85,0,0,1,.46.33c-.44.08-.87.18-1.32.25a2.92,2.92,0,0,1-.44.06l-.45,0h-.76l-.58,0c.09-.9.17-1.29.17-1.29l.1-1.1.42,0,.66.05a2.61,2.61,0,0,0,.28,0,1.72,1.72,0,0,0,.31,0C67.32.47,67.72.42,68.16.37Z"/>
-                <path class="cls-9"
-                      d="M68.29,70.07c-.17.32-.34.62-.48.87s-.36.64-.37.65-.14.29-.32.69-.45.9-.74,1.38a10.11,10.11,0,0,0-1.16,2c0,.07.15,0,.33-.16a1.48,1.48,0,0,1,0,.27,25.11,25.11,0,0,0-.33,2.81c-.06,1.31-.06,2.23-.08,2.83,0,.32,0,.54,0,.69a.13.13,0,0,1,0,.06v0H65L64.36,79c0-.17-.07-.33-.11-.5l0-.25-.08-.29c0-.29-.06-.57-.08-.84-.05-.62-.1-1.2-.14-1.73-.09-1.07-.15-1.95-.2-2.56,0-.25,0-.46,0-.61l.66-.11a9.59,9.59,0,0,0,2.31-.74A5.08,5.08,0,0,0,68.29,70.07Z"/>
-                <path class="cls-7"
-                      d="M67.74,30.65a3.9,3.9,0,0,1-.18,2s0-.75,0-.76a13.61,13.61,0,0,0-.48-1.77l0-.21s0-.1,0-.15c-.43-1.11-.53-1.34-.86-2.07l-.4-.8a5.25,5.25,0,0,0-1.66-2.12l-.29-.18h-.29l-.66-.32a4.94,4.94,0,0,0-3.44-.5,8.38,8.38,0,0,0-3.31,2.09,10.46,10.46,0,0,0-2.48,3.28,6.91,6.91,0,0,0-.37.95c-.05.16-.09.32-.13.48l0,.24v.09l.28.22.41.32.84.59,0,0a9.23,9.23,0,0,0,2.41,1.09,25,25,0,0,0,2.47.64,15.7,15.7,0,0,0,2.66.35l.3.16a.24.24,0,0,1,.17-.07c.35,0,.7-.06,1.05-.07l.06-.06h.16l.14,0A2.23,2.23,0,0,0,65,34a1.88,1.88,0,0,0,.24-.18,5.65,5.65,0,0,0,.65-.15l.17-.16c.23-.1.44-.2.62-.3a9.45,9.45,0,0,0,.92-.58,2.43,2.43,0,0,1-.85.72,7.53,7.53,0,0,1-2.83,1,12.77,12.77,0,0,1-4.43-.18,23,23,0,0,1-2.54-.58,9.39,9.39,0,0,1-2.61-1.13h0l-.86-.58c-.15-.1-.29-.22-.43-.32l-.21-.16-.33-.27c0-.14,0-.29,0-.43s0-.19,0-.29.08-.36.13-.54a10,10,0,0,1,.38-1,12.46,12.46,0,0,1,4.25-4.91,6.51,6.51,0,0,1,1.94-1,4.76,4.76,0,0,1,2.12-.1,7.72,7.72,0,0,1,1.87.59,11.65,11.65,0,0,1,1.62.88A5.56,5.56,0,0,1,66,25.61a10.8,10.8,0,0,1,1.14,2.52A16.49,16.49,0,0,1,67.74,30.65Z"/>
-                <path class="cls-12"
-                      d="M67.54,31.84s0,.75,0,.76a9.45,9.45,0,0,1-.92.58c-.18.1-.39.2-.62.3a5.74,5.74,0,0,0,1-3.41A13.61,13.61,0,0,1,67.54,31.84Z"/>
-                <path class="cls-7"
-                      d="M67.46,48.33H67.4l-.09,0s-.08.05-.08.08a6.07,6.07,0,0,1-.83.17h-.08c0-.06-.23-.15-.23-.2a2.48,2.48,0,0,1,.59,0c.34-.17.49-.23.49-.23Z"/>
-                <path class="cls-7"
-                      d="M67.08,29.86l0,.21a21.9,21.9,0,0,0-1.45-3.34l-.08-.15-.24-.45L65.17,26a4.12,4.12,0,0,0-.85-1,6.68,6.68,0,0,0-.78-.47h.29l.29.18a5.25,5.25,0,0,1,1.66,2.12l.4.8c.33.73.43,1,.86,2.07C67.06,29.76,67.06,29.82,67.08,29.86Z"/>
-                <path class="cls-13"
-                      d="M67.06,30.07a5.74,5.74,0,0,1-1,3.41c-.23.09-.48.18-.76.26l.14-.11a10.05,10.05,0,0,1-2.5.35H62a5.25,5.25,0,0,1-1.9-4.7c.14-2.6,1.6-4.63,3.4-4.74a6.68,6.68,0,0,1,.78.47,4.12,4.12,0,0,1,.85,1l.12.15.24.45.08.15A21.9,21.9,0,0,1,67.06,30.07Z"/>
-                <path class="cls-7"
-                      d="M66.85,42.55a.2.2,0,0,1-.08.24.37.37,0,0,1-.23.05l-.32,0-.29,0,0,0,.67,0c.3,0,.16-.28-.11-.48s-.38.34-.38.34-.15-.05-.15-.07a.83.83,0,0,1,.18-.34.3.3,0,0,1,.22-.11h0a.41.41,0,0,1,.24.1A.85.85,0,0,1,66.85,42.55Z"/>
-                <path class="cls-7"
-                      d="M66.47,42.26c.27.2.41.48.11.48l-.67,0s0,0,0,0l.27-.06.31,0a.16.16,0,0,0,.1,0s0,0,0-.06a.84.84,0,0,0-.19-.18c-.08,0,0,0-.07,0a.62.62,0,0,0-.09.23s-.08,0-.17,0S66.21,42.06,66.47,42.26Z"/>
-                <path class="cls-7"
-                      d="M66.43,45.15a.58.58,0,0,1,.25.49.73.73,0,0,1-1.11.38.58.58,0,0,1-.07-.61,1.86,1.86,0,0,1,.3-.45s.09,0,.15.06c-.22.26-.51.64-.27.91s1,0,.9-.45A.74.74,0,0,0,66,45S66.17,45,66.43,45.15Z"/>
-                <path class="cls-7"
-                      d="M66.61,42.57s0,0,0,.06a.16.16,0,0,1-.1,0l-.31,0-.27.06.16-.15c.09,0,.17,0,.17,0a.62.62,0,0,1,.09-.23s0,0,.07,0A.84.84,0,0,1,66.61,42.57Z"/>
-                <path class="cls-7"
-                      d="M66.58,45.48c.15.42-.66.72-.9.45s0-.65.27-.91A.74.74,0,0,1,66.58,45.48Zm-.08.13a.45.45,0,0,0-.16-.36A1,1,0,0,0,66,45c.07.06.1.11.09.14a1.3,1.3,0,0,0-.27.36.29.29,0,0,0,0,.32c0,.07.23.08.39,0A.44.44,0,0,0,66.5,45.61Z"/>
-                <path class="cls-7"
-                      d="M66.34,45.25a.34.34,0,0,1-.17.63c-.16,0-.35,0-.39,0a.29.29,0,0,1,0-.32,1.3,1.3,0,0,1,.27-.36s0-.08-.09-.14A1,1,0,0,1,66.34,45.25Z"/>
-                <path class="cls-9"
-                      d="M66.43,48.23h-.06a9.52,9.52,0,0,1-1.93-.13,15.12,15.12,0,0,1-2.81-.9l1.3-.85a15.58,15.58,0,0,0,1.3,1.21,3.65,3.65,0,0,0,1,.49,4,4,0,0,0,1.07.17Z"/>
-                <path class="cls-9"
-                      d="M64.74,41.44l1.6.64a.3.3,0,0,0-.22.11.83.83,0,0,0-.18.34s.07,0,.15.07l-.16.15s0,0,0,0l0,0-.46.79A15.13,15.13,0,0,0,63.2,44l-.09-.75s0,0,0,0a4.16,4.16,0,0,0-1.24-.48l-.62-.16.38-1.42a9.31,9.31,0,0,0,1.26.28A7.51,7.51,0,0,0,64.74,41.44Z"/>
-                <path class="cls-7"
-                      d="M66.2,75.05a.8.8,0,0,1,0,.44,2.38,2.38,0,0,1-.16.4,7,7,0,0,0-.65,2.7,9.46,9.46,0,0,0,.25,2.8,3.66,3.66,0,0,0,.19.57,4,4,0,0,1-.6.09s0,0,0,0l.14,0h0l-.32.06h0v0a.13.13,0,0,0,0-.06c0-.15,0-.37,0-.69,0-.6,0-1.52.08-2.83a25.11,25.11,0,0,1,.33-2.81,1.48,1.48,0,0,0,0-.27l.28-.25.32-.32Z"/>
-                <path class="cls-7"
-                      d="M66.05,74.75a1.41,1.41,0,0,0,.1.18l-.32.32-.28.25v-.07c0-.06,0,0,0-.05s-.08,0-.08,0Z"/>
-                <path class="cls-7"
-                      d="M66,33.48l-.17.16a5.65,5.65,0,0,1-.65.15l.06,0C65.54,33.66,65.79,33.57,66,33.48Z"/>
-                <path class="cls-7"
-                      d="M65.67,97.26a3.85,3.85,0,0,1,.25,2,5.19,5.19,0,0,1-.46,1.93c-.24.58-.51,1.1-.73,1.55s-.37.7-.5,1l-.77.09c0-.07.08-.17.14-.28s.35-.62.59-1,.52-.93.77-1.47a6.78,6.78,0,0,0,.33-.85,5,5,0,0,0,.17-.92,3.55,3.55,0,0,0-.13-1.79,4.16,4.16,0,0,0-.9-1.32,2.52,2.52,0,0,0-.75-.57c.09,0,.17,0,.27-.06a3,3,0,0,1,.66.44A4.18,4.18,0,0,1,65.67,97.26Z"/>
-                <path class="cls-10" d="M65.89,82h0v0l0,0h0V82Z"/>
-                <path class="cls-10" d="M65.88,82v0h-.08l-.16,0-.21,0h0l-.14,0s-.07-.06,0,0a4,4,0,0,0,.6-.09h0Z"/>
-                <path class="cls-7"
-                      d="M65.47,43.58c.07,0,.11,0,.11,0s-1.5.47-3,1l-.69.23-.48-.41,1-.27c.25-.06.49-.12.74-.16A15.13,15.13,0,0,1,65.47,43.58Z"/>
-                <path class="cls-9"
-                      d="M65.33,97.41a3.55,3.55,0,0,1,.13,1.79,5,5,0,0,1-.17.92A6.78,6.78,0,0,1,65,101c-.25.54-.53,1-.77,1.47s-.44.8-.59,1-.1.21-.14.28l-1.4.14c-.6,0-1.21.1-1.81.13l-.32,0h-.3l-.19,0-.9-.14c-1.61-.25-3.22-.45-4.78-.74,0,0,0,0,0,0,.14-.2.37-.47.64-.8a8.93,8.93,0,0,0,1.69-2.72,5.16,5.16,0,0,0,.08-3.17,1.82,1.82,0,0,0-.56-.8l1,.17a18.79,18.79,0,0,0,6.09-.11c.31,0,.63-.11,1-.19a2.52,2.52,0,0,1,.75.57A4.16,4.16,0,0,1,65.33,97.41Z"/>
-                <path class="cls-13"
-                      d="M65.4,33.63l-.14.11-.34.1h0a15.44,15.44,0,0,1-2,.14A10.05,10.05,0,0,0,65.4,33.63Z"/>
-                <path class="cls-7"
-                      d="M65.26.42l-.1,1.1H64a11.34,11.34,0,0,1,.22,1.25L63,2.73l-.24-.39A8,8,0,0,0,62,1.39l-.26-.28.16-1c.41,0,1.32.13,2.5.27Z"/>
-                <path class="cls-13" d="M65.26,33.74l-.06,0-.28.05Z"/>
-                <path class="cls-7"
-                      d="M64.92,33.84l.28-.05A1.88,1.88,0,0,1,65,34a2.23,2.23,0,0,1-.89,0,6.6,6.6,0,0,0,.84-.16Z"/>
-                <path class="cls-7" d="M64,1.53h1.17s-.08.39-.17,1.29l-.74,0h0A11.34,11.34,0,0,0,64,1.53Z"/>
-                <polygon class="cls-10" points="65.02 82.2 65.02 82.21 65.02 82.21 65.02 82.2"/>
-                <path class="cls-7"
-                      d="M64.35,45.15c.44-.12.74-.09.75,0s-.29.11-.66.29-.68.41-1.08.68L63,45.76A9.59,9.59,0,0,1,64.35,45.15Z"/>
-                <path class="cls-7"
-                      d="M65,2.81a45.57,45.57,0,0,0-.18,4.74s0-.24-.1-.46-.15-.68-.24-1c-.07-1.51-.17-2.59-.26-3.32h0Z"/>
-                <path class="cls-11" d="M64.81,7.55v0l-.29,0v0Z"/>
-                <path class="cls-10"
-                      d="M64.81,7.55l-.3,0c0-.53,0-1,0-1.48q.14.47.24,1C64.76,7.31,64.81,7.52,64.81,7.55Z"/>
-                <path class="cls-7"
-                      d="M62.78,64s0,0,0,0,.49-.14.84-.26a1,1,0,0,0,.36-.2,3.94,3.94,0,0,0-.6,0c-.35,0-.53.41-.6.5S62.78,63.94,62.78,64Zm1.71-.72a.18.18,0,0,1,.06.23c0,.07-.06.06-.09.08a.11.11,0,0,1-.06,0l-.07,0a1.63,1.63,0,0,1-.62.28,2.44,2.44,0,0,1-.94.07s0-.13.06-.3a.81.81,0,0,1,.52-.46,3.24,3.24,0,0,1,.67,0h.32S64.35,63.17,64.49,63.23Zm-.12.18s0,0,0,0a.21.21,0,0,1-.06-.1s0,0,0,0l-.13.07a.53.53,0,0,1-.14.12l.28,0h0A.49.49,0,0,1,64.37,63.41Z"/>
-                <path class="cls-7"
-                      d="M64.47,6.1c0,.46,0,1,0,1.48,0-.07,0-.24-.08-.43a8.67,8.67,0,0,0-2.17-4.3l-.17-.15.93,0A13.48,13.48,0,0,1,64.47,6.1Z"/>
-                <path class="cls-9"
-                      d="M64.39,63.38s0,0,0,0a.49.49,0,0,0,0,.11h0l-.28,0a.53.53,0,0,0,.14-.12l.13-.07s0,0,0,0A.21.21,0,0,0,64.39,63.38Z"/>
-                <path class="cls-13"
-                      d="M64.91,33.84a6.6,6.6,0,0,1-.84.16H64a.29.29,0,0,0-.24,0h-.05l-.5,0-.55,0a3.85,3.85,0,0,1-.48,0L62,34h.86A15.44,15.44,0,0,0,64.91,33.84Z"/>
-                <path class="cls-8" d="M64.21,2.78c.09.73.19,1.81.26,3.32A13.48,13.48,0,0,0,63,2.73Z"/>
-                <path class="cls-7"
-                      d="M64.23,103.68l-.06.12-.2.41c0,.09-.21.1-.38,0s-.27-.21-.22-.32a1.63,1.63,0,0,0,.09-.16Z"/>
-                <path class="cls-13" d="M64.07,34l-.14,0h-.16A.29.29,0,0,1,64,34Z"/>
-                <path class="cls-7"
-                      d="M64,95.46c-.1,0-.18.05-.27.06l-.17-.06a1.06,1.06,0,0,0-.42,0s.13-.15.44-.12A1.26,1.26,0,0,1,64,95.46Z"/>
-                <path class="cls-7"
-                      d="M63.72,34.05h.05l-.06.06c-.35,0-.7,0-1.05.07a.24.24,0,0,0-.17.07l-.3-.16a3.85,3.85,0,0,0,.48,0l.55,0Z"/>
-                <path class="cls-9"
-                      d="M64,63.47a1,1,0,0,1-.36.2c-.35.12-.73.21-.84.26.07-.09.25-.46.6-.5A3.94,3.94,0,0,1,64,63.47Z"/>
-                <path class="cls-7"
-                      d="M63.66,72.09v.09c-.32,0-.65.09-1,.12,0-.26,0-.4,0-.44h1v0S63.65,72,63.66,72.09Z"/>
-                <path class="cls-7"
-                      d="M63.4,66.3c.11,0,.24.15.23.28a.5.5,0,0,1-.1.19l-.09.1a3.25,3.25,0,0,1-.42.31,1.18,1.18,0,0,1-.77,0s.34-.08.68-.22c.09-.08.23-.21.33-.32a.5.5,0,0,0,.07-.08v0l0,0a2.92,2.92,0,0,0-.45-.08l-.35,0a.73.73,0,0,0-.59.17,2.13,2.13,0,0,0-.52.88,1.22,1.22,0,0,1,.36-1,1,1,0,0,1,.78-.31l.36,0A2.15,2.15,0,0,1,63.4,66.3Z"/>
-                <path class="cls-7" d="M63.36,46.07l-.26.17-.17.11-.29-.29a.46.46,0,0,0-.07-.07l.3-.16.14-.07Z"/>
-                <path class="cls-9"
-                      d="M63.11,43.2l.09.75c-.25,0-.49.1-.74.16l-1,.27c-.47-.39-.81-.64-.86-.58a6.65,6.65,0,0,0,.58.66l-.8.25c-.58.19-1,.36-1,.37a8.64,8.64,0,0,0-1,.5l-.41.28c-1.2-.39-2.46-.76-3.71-1.11-.23-.07-.49-.13-.67-.2L53,44.27l-1.32-.59-.15-.07c.7-.19,1.36-.35,1.9-.47.78-.17,1.32-.22,1.35-.23s.56-.1,1.36-.19A20.23,20.23,0,0,1,59,42.65a23,23,0,0,1,2.86.31C62.52,43.08,63,43.2,63.11,43.2Z"/>
-                <path class="cls-7"
-                      d="M63.14,43.19s0,0,0,0-.59-.12-1.27-.24A23,23,0,0,0,59,42.65a20.23,20.23,0,0,0-2.88.07c-.8.09-1.33.17-1.36.19s-.57.06-1.35.23c-.54.12-1.2.28-1.9.47l-.68-.31c.88-.31,1.74-.56,2.44-.75a13.73,13.73,0,0,1,1.39-.29,11.45,11.45,0,0,1,1.4-.14,18.9,18.9,0,0,1,3,.06,19.94,19.94,0,0,1,2.27.37l.62.16A4.16,4.16,0,0,1,63.14,43.19Z"/>
-                <path class="cls-12"
-                      d="M62.88,24.22l.66.32c-1.8.11-3.26,2.14-3.4,4.74A5.25,5.25,0,0,0,62,34l.15.1a15.7,15.7,0,0,1-2.66-.35,25,25,0,0,1-2.47-.64A9.23,9.23,0,0,1,54.65,32l0,0-.84-.59-.41-.32-.28-.22v-.09l0-.24c0-.16.08-.32.13-.48a6.91,6.91,0,0,1,.37-.95,10.46,10.46,0,0,1,2.48-3.28,8.38,8.38,0,0,1,3.31-2.09A4.94,4.94,0,0,1,62.88,24.22Z"/>
-                <path class="cls-7" d="M63,45.76l-.14.07-.3.16-1-1.08.35-.12,1.07.94Z"/>
-                <path class="cls-7" d="M62.64,46.06l.29.29-1.3.85-.73-.29.53-.3L62.57,46A.46.46,0,0,1,62.64,46.06Z"/>
-                <path class="cls-7"
-                      d="M62.78,2.34l.24.39-.93,0a3.36,3.36,0,0,0-.69-.49l-.29-.14.66-1,.26.28A8,8,0,0,1,62.78,2.34Z"/>
-                <path class="cls-11" d="M62.78,64s0,0,0,0S62.79,64,62.78,64Z"/>
-                <path class="cls-7"
-                      d="M61.64,77.81l0,0,0,0,0,.07h0v-.07l0-.26c.22-1.44.43-2.87.58-3.94l.21-1.34.19,0a52.52,52.52,0,0,1-.29,5.39l0,.28v.08a1.94,1.94,0,0,1-.06.22h0s0,0,0,0l0,0h0l0,0,0,0h0s0,0,0,0l-.1-.09h0v0l0,0,0,0,0,0h0A.8.8,0,0,0,61.64,77.81Z"/>
-                <path class="cls-7" d="M62.62,72.3l-.19,0c0-.29.08-.45.11-.45S62.61,72,62.62,72.3Z"/>
-                <path class="cls-9"
-                      d="M61.86,72.35c.19,0,.38,0,.57,0l-.21,1.34c-.15,1.07-.36,2.5-.58,3.94l0,.26v.07h0s0,0,0,0l0,.09-.21.5c-.14.34-.26.66-.39,1l-.69,1.76c-.2.52-.37,1-.48,1.27,0,.08-.06.15-.08.22v0l0,.07s0,0,0,0l0,0c0,.09,0,.13,0,.14l-.51,1.63c-.33.27-.71.6-1.12.93l-1.39,1.19-.18.16-.09.07,0,0h0a2.8,2.8,0,0,1-.14-.25A.6.6,0,0,1,56,86.6a.36.36,0,0,1,0-.12.61.61,0,0,1,.19-.38,3.53,3.53,0,0,1,.28-.37c-.09-.21-.89.56-.79.71a.82.82,0,0,0,.21.57l.11.12L55.13,87l-.45-.07-.19,0a.76.76,0,0,1,0-.15.77.77,0,0,1,.08-.29c0-.08.06-.12.06-.13a2,2,0,0,1,.23-.4c.14-.19.35-.32.33-.36s-.28,0-.49.19a1.33,1.33,0,0,0-.26.28.84.84,0,0,0-.1.15,1,1,0,0,0-.08.53L54,86.34v-.21a2.45,2.45,0,0,1,0-.27,3.12,3.12,0,0,1,.1-.48,1.14,1.14,0,0,1,.45-.64,1,1,0,0,1,.7-.18c.08.16,2-.6,2-.62A12.54,12.54,0,0,0,59,82.79h0a9.25,9.25,0,0,0,.26-3,24.51,24.51,0,0,0-.13-3.16s-.1-.45-.29-1-.47-1.27-.76-2-.66-1.46-.93-2a9.7,9.7,0,0,0,2.18.62A14.62,14.62,0,0,0,61.86,72.35Z"/>
-                <path class="cls-10" d="M62.23,78.28s0,0,0,0l0,0h0Z"/>
-                <path class="cls-7"
-                      d="M62.22,78.31l-.18.51c-.11.34-.23.68-.34,1l-.59,1.79c-.18.52-.32,1-.43,1.28l0,0c-.18,0-.51.09-.51.1h-.52s0-.06,0-.09,0,0,0,0l0-.07v0c0-.07.05-.14.08-.22.11-.32.28-.75.48-1.27l.69-1.76c.13-.33.25-.65.39-1l.21-.5,0-.09s0,0,0,0,0,.12.07.11,0-.12.07-.08h.12l0,0,0,0,0,0v0h0l.1.09s0,0,0,0h0l0,0,0,0h0Z"/>
-                <path class="cls-7"
-                      d="M61.93.07l-.16,1-.66,1,.29.14a3.36,3.36,0,0,1,.69.49l-.57,0-.9-.08c-.52,0-1.27-.11-2.15-.13l-1,0c-.1-.29-.19-.54-.29-.77s-.12-.25-.18-.36a1.51,1.51,0,0,0-.3-.36L56.41.66,56.16.43l0-.21C57,.12,57.75.06,58.46,0c.94,0,1.73,0,2.31,0l.93,0Z"/>
-                <path class="cls-7" d="M61.9,44.79l-.35.12c-.13-.14-.24-.27-.36-.39l0-.06.28-.08Z"/>
-                <path class="cls-10"
-                      d="M61.66,77.83l0,0a.8.8,0,0,1,.17.15h-.08c-.06,0-.07.07-.07.08s-.06-.07-.07-.11l0-.07Z"/>
-                <path class="cls-9"
-                      d="M61.55,44.91l1,1.08-1.14.62-.53.3-1.12-.44-1.06-.37c.5-.26.87-.41.9-.42s.38-.18.93-.4Z"/>
-                <path class="cls-7" d="M61.42,44.38l-.28.08a6.65,6.65,0,0,1-.58-.66C60.61,43.74,61,44,61.42,44.38Z"/>
-                <path class="cls-7"
-                      d="M61.19,44.52c.12.12.23.25.36.39l-1,.37c-.55.22-.92.39-.93.4s-.4.16-.9.42c-.24-.08-.48-.17-.73-.24l.41-.28a8.64,8.64,0,0,1,1-.5s.41-.18,1-.37l.8-.25Z"/>
-                <path class="cls-7" d="M60.9,46.91l.73.29-.52.35a1.4,1.4,0,0,1-.17.1l-.73-.26.36-.27.19-.12Z"/>
-                <path class="cls-7"
-                      d="M60.21,47.39l.73.26-.45.3c-.36.24-.82.6-1.27,1a15.19,15.19,0,0,1-1.8,1.48h0a8.94,8.94,0,0,1,1.49-1.81,13.14,13.14,0,0,1,1.21-1.12Z"/>
-                <path class="cls-7"
-                      d="M60.9,46.91l-.14.09-.19.12-.36.27-.67-.22c-.55-.18-1.11-.35-1.69-.52h0l.44-.3.39-.24h0l1.06.37Z"/>
-                <path class="cls-10" d="M60.68,82.89a.06.06,0,0,0,0,0h0Z"/>
-                <path class="cls-11" d="M60.66,82.93a.19.19,0,0,1,0,.08h0l0,0Z"/>
-                <path class="cls-10" d="M60.66,82.93l0,.11h-.47S60.48,83,60.66,82.93Z"/>
-                <polygon class="cls-10" points="60.64 83.01 60.62 83.08 60.62 83.06 60.62 83.04 60.64 83.01"/>
-                <path class="cls-7"
-                      d="M60.62,83.08h0v0h0v.13a1.47,1.47,0,0,0,0,.17l-.18.52c-.12.33-.3.8-.49,1.36L57,87.43l-.43.34a.2.2,0,0,1-.09,0h0l-.08,0h-.2l-.3,0L55,87.62l-.45-.1-.24-.06-.17,0s-.12,0-.14-.08c-.19-.3-.37-.59-.55-.86v-.23a.86.86,0,0,1,0-.16,2.14,2.14,0,0,1,.06-.31,2.37,2.37,0,0,1,.18-.55,1.34,1.34,0,0,1,.68-.72,1.43,1.43,0,0,1,.81,0h0a1,1,0,0,0-.7.18,1.14,1.14,0,0,0-.45.64,3.12,3.12,0,0,0-.1.48,2.45,2.45,0,0,0,0,.27v.21l.29.39a.06.06,0,0,0,0,0c0,.3.27.48.3.45s0-.15-.07-.31l.19,0,.45.07.91.12c.15.14.3.22.33.19a.65.65,0,0,0-.1-.19h0l0,0,.09-.07.18-.16L58,85.67c.41-.33.79-.66,1.12-.93l.51-1.63s0,0,0-.14l0,0s0,.06,0,.09h1v0Z"/>
-                <path class="cls-9"
-                      d="M60.21,47.39l-.09.07a13.14,13.14,0,0,0-1.21,1.12,8.94,8.94,0,0,0-1.49,1.81l-1.7.25a3.84,3.84,0,0,1-.8-.43,2.34,2.34,0,0,1-.38-.28c-.09-.07-.16-.16-.24-.23a3.46,3.46,0,0,1-.42-.57l.33-.19a20.84,20.84,0,0,0,2.69-1.65l1-.64c.58.17,1.14.34,1.69.52Z"/>
-                <path class="cls-7"
-                      d="M60.18,69.06a.26.26,0,0,1-.07.24.58.58,0,0,1-.25.12l-.19,0a1.16,1.16,0,0,1-.4,0l-.1,0s0,0,0,0,0,0,0,0,0,0,0,0a.23.23,0,0,0,0-.07s-.11-.06-.05-.07a.49.49,0,0,0,.19,0,1.49,1.49,0,0,0,.46-.07s0,0,0,0,0,0,0-.06a.86.86,0,0,0-.28-.11c-.09,0-.14,0-.16,0s.26-.19.57,0A.4.4,0,0,1,60.18,69.06Zm-.93.26c.06.09,0,0,0,0Z"/>
-                <path class="cls-11" d="M59.23,69.29s.08.12,0,0Z"/>
-                <path class="cls-7"
-                      d="M59.11,76.62a24.51,24.51,0,0,1,.13,3.16,9.25,9.25,0,0,1-.26,3,.08.08,0,0,0,0-.06s.11-.25-.11-.2c-.1-.49-.22-1.59-.34-2.71-.09-.75-.18-1.51-.26-2.07,0-.28-.07-.51-.1-.68s0-.25,0-.27-.06-.37-.2-.92-.33-1.28-.54-2c-.25-.88-.52-1.73-.67-2.29h0l0-.07.37.16c.27.51.62,1.24.93,2s.57,1.42.76,2S59.1,76.6,59.11,76.62Z"/>
-                <path class="cls-10" d="M58.89,82.52c.22,0,.08.15.11.2a.08.08,0,0,1,0,.06h0s-.06-.1-.09-.27Z"/>
-                <path class="cls-7"
-                      d="M58.89,82.52c0,.17.06.27.09.27a12.54,12.54,0,0,1-1.75,1.15s-1.93.78-2,.62h0a2.9,2.9,0,0,1,.78-.34c.77-.46,1.21-.77,2-1.3l.56-.29A1.41,1.41,0,0,1,58.89,82.52Z"/>
-                <path class="cls-7"
-                      d="M58.84,7.31c0,.08.07.27,0,.11a2.52,2.52,0,0,0-.74-.52l-.25-.23c-.2-.17-.39-.32-.58-.46l-.45-.34c-.3-.22-.59-.41-.86-.6a10.61,10.61,0,0,0-1.59-.91,11.74,11.74,0,0,0-2.58-.83l-.54-.1.28-.12.4-.16L52.27,3l.11,0a20.13,20.13,0,0,1,2.06.95,13.29,13.29,0,0,1,1.62,1l.88.65.45.34.36.28.15.13c.3.25.55.5.58.53s0,0,0-.12l-.09-.27c-.06-.16-.1-.27-.12-.31-.23-.64-.65-1.76-1-2.46-.22-.51-.42-.94-.61-1.28h.82c.12.33.24.71.37,1.13.26.87.58,1.93.95,3.18a1.11,1.11,0,0,0,0,.3A2.46,2.46,0,0,0,58.84,7.31Z"/>
-                <path class="cls-7"
-                      d="M58.72,46.1h0l-.39.24-.44.3h0l-.65-.18.35-.27.42-.33h0C58.24,45.93,58.48,46,58.72,46.1Z"/>
-                <path class="cls-8"
-                      d="M58.47,6.77c0,.08.11.28,0,.12s-.28-.28-.58-.53l-.15-.13L57.39,6l-.45-.34L56.06,5a13.29,13.29,0,0,0-1.62-1A20.13,20.13,0,0,0,52.38,3a14.93,14.93,0,0,1,3.11-.49c.41,0,.81,0,1.2,0,.19.34.39.77.61,1.28.31.7.73,1.82,1,2.46,0,0,.06.15.12.31Z"/>
-                <path class="cls-7"
-                      d="M58,45.86h0l-.42.33-.35.27c-1-.29-2.09-.55-3.16-.82-.25-.06-.47-.11-.74-.2h0l.07-.14-1.18-.58-.11.23-.84-.35L50,44.06l.61-.19.92-.26.15.07,1.32.59.65.28c.18.07.44.13.67.2C55.53,45.1,56.79,45.47,58,45.86Z"/>
-                <path class="cls-7" d="M57.2,46.47l.65.18-1,.64a20.84,20.84,0,0,1-2.69,1.65,17.91,17.91,0,0,1,2.42-2Z"/>
-                <path class="cls-7"
-                      d="M55.54,62.68s0,.07,0,.07,0,0-.09-.06,0-.07,0-.08l.06,0,.15,0c.21,0,.47,0,.73-.08a2.63,2.63,0,0,1,.77-.06.81.81,0,0,1,.31.06.37.37,0,0,1,.16.1.2.2,0,0,1,.07.15.24.24,0,0,1,0,.17.59.59,0,0,1-.18.14l-.27.21a.83.83,0,0,1-.42.2.91.91,0,0,1-.43-.11l-.31-.15c-.19-.09-.3-.15-.29-.18a1.21,1.21,0,0,1,.33.06l.34.1a.67.67,0,0,0,.33.05c.19,0,.37-.29.54-.42s0,0,0,0h0l-.19,0a3.23,3.23,0,0,0-.71,0,3.66,3.66,0,0,1-.75,0Z"/>
-                <path class="cls-7"
-                      d="M56.24,1.76s0,0,0,0l0-.05Zm1-.09c.1.23.19.48.29.77h-.82A3.89,3.89,0,0,0,56.44,2l-.17-.23,0,0s0,0,0,0h0l-.05,0-.38-.2-.29-.14.67-1,.25.23.33.29a1.51,1.51,0,0,1,.3.36C57.1,1.42,57.17,1.55,57.22,1.67Z"/>
-                <path class="cls-9"
-                      d="M57.2,46.47l-.57.44a17.91,17.91,0,0,0-2.42,2l-.33.19a3.84,3.84,0,0,1-.23-.45,11,11,0,0,1-.55-1.74c-.07-.3-.12-.54-.18-.75.18-.35.3-.6.37-.74h0c.27.09.49.14.74.2C55.11,45.92,56.17,46.18,57.2,46.47Z"/>
-                <path class="cls-7" d="M57.13,71.66l-.37-.16a2.2,2.2,0,0,0,.11-.27A4.84,4.84,0,0,1,57.13,71.66Z"/>
-                <path class="cls-7"
-                      d="M55.72,70.58,57,71s0,.07-.07.19,0,0,0,0c-.12-.2-.21-.31-.26-.29s0,.22.09.53a10.16,10.16,0,0,1-1.09-.56A3.26,3.26,0,0,0,55.72,70.58Z"/>
-                <path class="cls-7"
-                      d="M56.9,54.9l0,0a6.55,6.55,0,0,0-.56.6c-.31.26-.48.47-.79.72l-.74.6c-.45.35-.87.65-1.28.91a10.72,10.72,0,0,1-2.1,1c-.56.19-1,.31-1.22.39l-.12,0c0-.36-.1-.73-.13-1.08h.11a9.74,9.74,0,0,0,1.23-.12,7,7,0,0,0,2.05-.64,17.59,17.59,0,0,0,2.47-1.68l.55-.45,0,0-.34.08-.55.14-.63.07-.82.06a11.87,11.87,0,0,1-1.45,0,7.34,7.34,0,0,1-2.14-.42l-.51-.21a9.46,9.46,0,0,1,.12-1.07,3.29,3.29,0,0,0,.67.53,5.38,5.38,0,0,0,1.85.65,9.68,9.68,0,0,0,1.4.1l.82,0c.34,0,.76-.05,1.16-.09A7.67,7.67,0,0,0,56.9,54.9Z"/>
-                <path class="cls-7"
-                      d="M56.87,71.23a2.2,2.2,0,0,1-.11.27.09.09,0,0,1-.06,0c-.08-.31-.12-.51-.09-.53S56.75,71,56.87,71.23Z"/>
-                <path class="cls-10" d="M56.76,71.5l0,.07,0-.1A.09.09,0,0,0,56.76,71.5Z"/>
-                <path class="cls-7"
-                      d="M56.73,71.57h0a1,1,0,0,0-.07.15,13,13,0,0,1-1,1.73A26.07,26.07,0,0,1,54,75.63c-.64.75-1.36,1.56-2.12,2.29A29.25,29.25,0,0,0,48,82.07c-.87,1.27-1.11,2.3-1.22,2.28a3.61,3.61,0,0,1,.38-1.69,1,1,0,0,0,.31-.15s-.1,0-.26,0a7.28,7.28,0,0,1,.36-.76,9.44,9.44,0,0,1,1-1.5.89.89,0,0,0,.35-.16.82.82,0,0,0-.26,0c.75-1,1.67-1.94,2.56-2.9.71-.76,1.34-1.55,1.94-2.33a24.19,24.19,0,0,0,1.51-2.14,13.28,13.28,0,0,0,.83-1.59c.05-.12.09-.22.13-.3a10.16,10.16,0,0,0,1.09.56Z"/>
-                <path class="cls-7"
-                      d="M56.44,2a3.89,3.89,0,0,1,.25.42c-.39,0-.79,0-1.2,0A14.93,14.93,0,0,0,52.38,3l-.5-.19c-.68-.24-1.17-.39-1.49-.48l-.47-.14h0c.26-.16.53-.31.8-.46l.41-.21.46-.22A15.68,15.68,0,0,1,55.25.33l.88-.11,0,.21-.67,1,.29.14.38.2.05,0h0s0,0,0,0l0,0Z"/>
-                <path class="cls-7"
-                      d="M55.72,86.44c-.1-.15.7-.92.79-.71a3.53,3.53,0,0,0-.28.37.61.61,0,0,0-.19.38.36.36,0,0,0,0,.12.6.6,0,0,0,.09.28,2.8,2.8,0,0,0,.14.25s0,0-.23,0L55.93,87A.82.82,0,0,1,55.72,86.44Z"/>
-                <path class="cls-8"
-                      d="M56.37,55.13l0,0-.55.45a17.59,17.59,0,0,1-2.47,1.68,7,7,0,0,1-2.05.64,9.74,9.74,0,0,1-1.23.12H50q-.06-.6-.09-1.17a14.88,14.88,0,0,1,0-2l.51.21a7.34,7.34,0,0,0,2.14.42,11.87,11.87,0,0,0,1.45,0l.82-.06.63-.07.55-.14Z"/>
-                <path class="cls-10"
-                      d="M56.27,87.13a.65.65,0,0,1,.1.19s-.18,0-.33-.19C56.23,87.14,56.24,87.16,56.27,87.13Z"/>
-                <path class="cls-10" d="M56.29,1.68l0,.05s0,0,0,0Z"/>
-                <path class="cls-7"
-                      d="M56.19,96.45a5.16,5.16,0,0,1-.08,3.17,8.93,8.93,0,0,1-1.69,2.72c-.27.33-.5.6-.64.8,0,0,0,0,0,0l-.7-.13a12,12,0,0,1,.9-1.1,8.63,8.63,0,0,0,1.71-2.47A5.24,5.24,0,0,0,56,96.53a1.69,1.69,0,0,0-.6-.93l.11,0,.17,0A1.82,1.82,0,0,1,56.19,96.45Z"/>
-                <path class="cls-7"
-                      d="M56.21,50.87s.11,0,0,.06l-.48.09-.89.16-.81.14-.62.09a6.94,6.94,0,0,1-2,.08,4.78,4.78,0,0,1-.81-.2c.1-.31.2-.62.31-.9a3,3,0,0,0,.72.4,4.77,4.77,0,0,0,1.8.19l.6,0,.51,0,.55-.08.29,0c.1,0,0,0-.05,0l-.14,0-.09,0a3.66,3.66,0,0,1-.52-.28l-.21-.16a3.11,3.11,0,0,1-.28-.23,4.45,4.45,0,0,1-.81-1c-.39-.68-.63-1.25-.85-1.69,0,0,0,0,0,0l.51-1c.06.21.11.45.18.75a11,11,0,0,0,.55,1.74,3.84,3.84,0,0,0,.23.45,3.46,3.46,0,0,0,.42.57c.08.07.15.16.24.23a2.34,2.34,0,0,0,.38.28,3.84,3.84,0,0,0,.8.43l.17.07s.16.09.17.11S56.18,50.86,56.21,50.87Z"/>
-                <path class="cls-8"
-                      d="M56,96.53a5.24,5.24,0,0,1-.28,2.94A8.63,8.63,0,0,1,54,101.94a12,12,0,0,0-.9,1.1c-.53-.11-1.06-.23-1.57-.37a13.43,13.43,0,0,1-3.16-1.31c-.18-.09-.35-.19-.52-.29l.68-.25a10.08,10.08,0,0,0,2.88-1.66,3.85,3.85,0,0,0,1-1.49,4.18,4.18,0,0,0,.25-1.53,3.81,3.81,0,0,0-.22-1.39l.43.13,1.59.46.9.26A1.69,1.69,0,0,1,56,96.53Z"/>
-                <path class="cls-7" d="M55.63,95.65l-.17,0-.11,0c-.1-.09-.17-.13-.17-.15a.61.61,0,0,1,.37.15Z"/>
-                <path class="cls-9"
-                      d="M55.61,70.91c0,.08-.08.18-.13.3a13.28,13.28,0,0,1-.83,1.59,24.19,24.19,0,0,1-1.51,2.14c-.6.78-1.23,1.57-1.94,2.33-.89,1-1.81,2-2.56,2.9a5.43,5.43,0,0,1-.79.09A7.9,7.9,0,0,1,45.54,80a3.24,3.24,0,0,1-1.08-.5,2.52,2.52,0,0,1-.68-.76,2.58,2.58,0,0,1-.34-1c.59-.73,1.17-1.41,1.72-2a3,3,0,0,0,.88.8,2.43,2.43,0,0,0,1.19.35c.36,0,.59-.17.54-.26s-.2-.1-.43-.24a3.75,3.75,0,0,1-.74-.58,2.57,2.57,0,0,1-.44-.75l-.09-.31.23-.24c.29-.31.57-.6.85-.86a3.46,3.46,0,0,0,.85.86c.89.61,1.9.71,1.94.55s-.79-.61-1.33-1.25a2.72,2.72,0,0,1-.53-.93l0-.1.72-.68.42-.4a1.7,1.7,0,0,0,.62.75,1.87,1.87,0,0,0,.39.23l.38.17a4.64,4.64,0,0,0,.69.23c.42.1.73.06.74,0s-.22-.2-.54-.43c-.16-.11-.34-.25-.52-.4l-.3-.23a3,3,0,0,1-.25-.24.75.75,0,0,1-.13-.82,2,2,0,0,1,.16-.3l0-.07h0a.05.05,0,0,1,0,0l.65-.61,0,0v0l0,.12a1.73,1.73,0,0,0,.29.31,4.06,4.06,0,0,0,.57.35c.43.22,1,.29,1,.1s-.19-.47-.4-.81l-.28-.46a.48.48,0,0,1,0-.13.66.66,0,0,1-.24-.45s0-.08,0-.12a2.77,2.77,0,0,0,.31-.53l.19.21a17.72,17.72,0,0,0,2,1.68C54.88,70.45,55.24,70.69,55.61,70.91Z"/>
-                <path class="cls-8"
-                      d="M55.33,50.73s.15,0,.05,0l-.29,0-.55.08-.51,0-.6,0a4.77,4.77,0,0,1-1.8-.19,3,3,0,0,1-.72-.4c.08-.22.17-.42.25-.62.41-.88.85-1.72,1.17-2.38l.08-.18s0,0,0,0c.22.44.46,1,.85,1.69a4.45,4.45,0,0,0,.81,1,3.11,3.11,0,0,0,.28.23l.21.16a3.66,3.66,0,0,0,.52.28l.09,0Z"/>
-                <path class="cls-7"
-                      d="M55.18,85.58s-.19.17-.33.36a2,2,0,0,0-.23.4s0,0-.06.13a.77.77,0,0,0-.08.29.76.76,0,0,0,0,.15h0s-.07,0-.1,0l-.12-.15a1,1,0,0,1,.08-.53.84.84,0,0,1,.1-.15,1.33,1.33,0,0,1,.26-.28C54.9,85.6,55.17,85.53,55.18,85.58Z"/>
-                <path class="cls-7"
-                      d="M54.74,67.67a1.6,1.6,0,0,1-.26,1.3h0l-.23-.18,0,0a1.35,1.35,0,0,0,.2-.91c-.17,0-.46,0-.64,0a.71.71,0,0,1-.27.33L53.36,68c.18-.12.21-.21.21-.24l-.06-.2.21,0h.83A.18.18,0,0,1,54.74,67.67Z"/>
-                <path class="cls-10"
-                      d="M54.49,86.91c0,.16.09.28.07.31s-.26-.15-.3-.45a.06.06,0,0,1,0,0l.12.15s.07,0,.1,0Z"/>
-                <path class="cls-9"
-                      d="M54.48,67.85a1.35,1.35,0,0,1-.2.91l0,0c-.23-.2-.46-.4-.67-.61a.71.71,0,0,0,.27-.33C54,67.86,54.31,67.86,54.48,67.85Z"/>
-                <path class="cls-7" d="M54.47,69h0a.42.42,0,0,1-.28.1.57.57,0,0,1-.28-.08l.15-.25a.23.23,0,0,0,.18,0Z"/>
-                <path class="cls-7"
-                      d="M53.06,103l.7.13-.19.29c0,.07-.2.05-.36,0s-.25-.22-.2-.31A.28.28,0,0,1,53.06,103Z"/>
-                <path class="cls-7" d="M53.57,68.18l-.09.06L53.32,68l0,0Z"/>
-                <path class="cls-7" d="M52.18,44.73l1.18.58-.07.14-.71-.28L52.07,45Z"/>
-                <path class="cls-7"
-                      d="M53.29,45.45c-.07.14-.19.39-.37.74,0-.12-.06-.22-.09-.31a1.06,1.06,0,0,0-.16-.34.82.82,0,0,0-.21-.19l-.53,1a4.45,4.45,0,0,1,.48.83l-.08.18c-.32.66-.76,1.5-1.17,2.38-.08.2-.17.4-.25.62a.94.94,0,0,1-.24-.28l-.81.85a3,3,0,0,0,.74.33,15.28,15.28,0,0,0-.42,1.65c0,.28-.1.57-.13.86a1.11,1.11,0,0,1-.26-.32l-.89.75a4,4,0,0,0,1,.64,14.88,14.88,0,0,0,0,2q0,.57.09,1.17h-.31v0c0-.78-.1-1.54-.14-2.26l-.24-.29-.14-.19a3.52,3.52,0,0,0-.27-.37l-.14-.21c0-.4.06-.78.11-1.15l.88-.55-.56-.82a.34.34,0,0,1-.1.06,15.8,15.8,0,0,1,.54-1.93c.51-.4.85-.67.82-.73s-.27,0-.63.18c.07-.17.13-.33.2-.49.45-1,.84-1.76,1.16-2.44l.9-1.87.51.21Z"/>
-                <path class="cls-7"
-                      d="M52.6,70c.21.34.45.64.4.81s-.57.12-1-.1a4.06,4.06,0,0,1-.57-.35,1.73,1.73,0,0,1-.29-.31l0-.12v0A7.59,7.59,0,0,0,52,68.84s0,.09,0,.12a.66.66,0,0,0,.24.45.48.48,0,0,0,0,.13Z"/>
-                <path class="cls-7"
-                      d="M52.83,45.88c0,.09.06.19.09.31l-.51,1a4.45,4.45,0,0,0-.48-.83l.53-1a.82.82,0,0,1,.21.19A1.06,1.06,0,0,1,52.83,45.88Z"/>
-                <path class="cls-7"
-                      d="M52.65,96.14a4.18,4.18,0,0,1-.25,1.53,3.85,3.85,0,0,1-1,1.49,10.08,10.08,0,0,1-2.88,1.66l-.68.25c-.24-.14-.48-.28-.71-.44l.16,0c.25-.07.6-.18,1-.33a9.58,9.58,0,0,0,2.79-1.45,3.65,3.65,0,0,0,1.34-2.67,9.38,9.38,0,0,0,0-1.39h.06A3.81,3.81,0,0,1,52.65,96.14Z"/>
-                <path class="cls-7"
-                      d="M52.45,67.7a.76.76,0,0,1-.12.61,7,7,0,0,1-.84-1.15c.4-.68.44-1,.5-.87A8.22,8.22,0,0,0,52.45,67.7Z"/>
-                <path class="cls-10" d="M52.43,94.75h-.06s0-.06,0-.06S52.4,94.71,52.43,94.75Z"/>
-                <path class="cls-9"
-                      d="M52.37,94.74a9.38,9.38,0,0,1,0,1.39,3.65,3.65,0,0,1-1.34,2.67,9.58,9.58,0,0,1-2.79,1.45c-.41.15-.76.26-1,.33l-.16,0h0l-.22-.15-.35-.24c-.18-.13-.42-.3-.62-.47-.43-.33-.9-.78-1.34-1.17,0,.53,0,1,0,1.56l-.8-1.7-.4-.84-.56.74-.6.77-.08.1s0,.06,0,0v-.06l-.06-.3L41.62,97c-.06-.31-.13-.61-.2-.92l-.1-.47a3,3,0,0,0-.16-.56c-.08-.17-.27-.8-.48-1.5.22,0,.49.08.78.11a6.4,6.4,0,0,0,1.57,0,5.69,5.69,0,0,0,1.68-.54A3,3,0,0,0,46,92.25a3.87,3.87,0,0,0,.58-.93c.08-.24.16-.46.23-.66.14-.39.25-.72.32-1,.17.33.29.52.29.54s.22.33.53.77a18.44,18.44,0,0,0,1.22,1.54,7.72,7.72,0,0,0,1.46,1.31,2.27,2.27,0,0,0,.79.37l.19.23h0a1.22,1.22,0,0,0,.32.12Z"/>
-                <path class="cls-7"
-                      d="M52.38,3l-.11,0-.37.13-.4.16-.28.12a9.5,9.5,0,0,0-1-.09h-.46l.12-1.15h0l.47.14c.32.09.81.24,1.49.48Z"/>
-                <path class="cls-7"
-                      d="M49.82,59.63h0l0-.49c0-.38,0-.75-.08-1.11h0l.13,1.16.27-.07c.1.72.22,1.46.38,2.2a23,23,0,0,0,.76,2.84A1.05,1.05,0,0,0,51,64c-.11,0-.19,0-.18,0s.07,0,.13.08l.21.24a.67.67,0,0,0,.25.2,6.44,6.44,0,0,0,.24.61s0,0,0,0h0q.12.32.27.63l.18.35-.13.07c-.06-.11-.1.19-.5.87-.17-.28-.32-.56-.46-.85a21.2,21.2,0,0,1-1.6-4.74c-.06-.23-.1-.46-.15-.68a1,1,0,0,0,.47-.43.8.8,0,0,0,.1-.45.78.78,0,0,0,0-.22l0-.07,0,0h0l0,0v0Z"/>
-                <path class="cls-7"
-                      d="M52.33,68.31a2.77,2.77,0,0,1-.31.53c0-.3,0-.63-.14-.72s-.56.2-.75.71a1.49,1.49,0,0,0-.1.8,1,1,0,0,0,.06.28l0,0-.65.61a1.77,1.77,0,0,1-.36-.26L50,70.16l-.44-.49,0,0,.17-.19c.3-.28.48-.45.51-.49a12.34,12.34,0,0,0,1.33-1.81A7,7,0,0,0,52.33,68.31Z"/>
-                <path class="cls-7"
-                      d="M51.91,64.51a.48.48,0,0,1,.17.41.37.37,0,0,1-.27.31.24.24,0,0,1-.14,0,0,0,0,0,1,0,0c.06-.06.23-.16.2-.29a.23.23,0,0,0-.13-.16.26.26,0,0,0-.1,0,1,1,0,0,1-.21-.11c0-.14-.11-.28-.15-.42,0,0,0,0,.05,0a1.48,1.48,0,0,0,.42.19A.36.36,0,0,1,51.91,64.51Z"/>
-                <path class="cls-7"
-                      d="M51.47,72.61c.32.23.55.35.54.43s-.32.14-.74,0a4.64,4.64,0,0,1-.69-.23l-.38-.17a1.87,1.87,0,0,1-.39-.23,1.7,1.7,0,0,1-.62-.75l1.23-1.16a.05.05,0,0,0,0,0h0l0,.07a2,2,0,0,0-.16.3.75.75,0,0,0,.13.82,3,3,0,0,0,.25.24l.3.23C51.13,72.36,51.31,72.5,51.47,72.61Z"/>
-                <path class="cls-7"
-                      d="M51.88,68.12c.12.09.1.42.14.72a7.59,7.59,0,0,1-.93,1.07,1,1,0,0,1-.06-.28,1.49,1.49,0,0,1,.1-.8C51.32,68.32,51.74,68,51.88,68.12Z"/>
-                <path class="cls-11" d="M51.65,65.2a0,0,0,0,0,0,0h0S51.64,65.21,51.65,65.2Z"/>
-                <path class="cls-7" d="M51.49,43.61l-.92.26-.61.19-.54-.24c.32-.14.66-.27,1-.39l.38-.13h0Z"/>
-                <path class="cls-7"
-                      d="M51.26,64.17c0,.14.1.28.15.42a.67.67,0,0,1-.25-.2L51,64.15c-.06-.05-.12-.05-.13-.08s.07-.07.18,0A1.05,1.05,0,0,1,51.26,64.17Z"/>
-                <path class="cls-7"
-                      d="M47.19,89.26a2.24,2.24,0,0,0-.17.33l-.1-.19a6.53,6.53,0,0,1-.51-2,.28.28,0,0,1,0-.09c.13-.07.18-.12.17-.14l-.17.07a5.07,5.07,0,0,1,.37-2.64h0a14.28,14.28,0,0,0,.1,2.73,6.25,6.25,0,0,0,.6,1.76,7.06,7.06,0,0,0,.47.75l.46.78c.28.45.66,1,1.08,1.59a8.81,8.81,0,0,0,1.26,1.39c.38.34.68.52.66.57s0,0,0,0a2.27,2.27,0,0,1-.79-.37,7.72,7.72,0,0,1-1.46-1.31A18.44,18.44,0,0,1,47.9,91c-.31-.44-.51-.75-.53-.77s-.12-.21-.29-.54A1.34,1.34,0,0,0,47.19,89.26Z"/>
-                <path class="cls-7"
-                      d="M51.22,3.43l-.51.22c-.52.23-1,.48-1.49.74A20.75,20.75,0,0,0,46.73,6l-.24.18a.9.9,0,0,0-.21.08,3.63,3.63,0,0,0-.46.34,1.67,1.67,0,0,0-.06-1c.09-.1.18-.21.28-.31a15.45,15.45,0,0,1,2.4-2.07c.45-.34,1-.65,1.46-1l-.12,1.15h.46A9.5,9.5,0,0,1,51.22,3.43Z"/>
-                <path class="cls-7"
-                      d="M50.81,43.3l-.38.13c-.35.12-.69.25-1,.39l-.79-.35c-1.69-.76-3.27-1.5-4.61-2.18-.66-.35-1.28-.68-1.82-1s-1-.64-1.38-.88l-1.24-.82L37.19,37l-2.51-1.64c-.17-.13-.42-.28-.6-.44l-.22-.26a2.36,2.36,0,0,1-.15-.25c-.06-.09,0-.21,0-.28s0-.18.13-.28a1.12,1.12,0,0,1,.27-.26l.34-.24a3.36,3.36,0,0,1,.48-.28l.15-.07L35,33l-.05,0-.18,0-.59-.17-3.4-1,2.59-1.66.84-.54.21-.13.07,0,.16-.1.15-.09s-.08-.05-.13-.07L34.45,29l-.26-.12-.44-.18s-.22-.08-.31-.14a1,1,0,0,1-.28-.23.92.92,0,0,1,.12-1.26,8.12,8.12,0,0,0,1.86-3,16.17,16.17,0,0,0,.79-2.8,15.29,15.29,0,0,0,.25-2.24l.16.14h0a10,10,0,0,1,0,2.16,15.55,15.55,0,0,1-.63,2.93A11.13,11.13,0,0,1,35,26a5.62,5.62,0,0,1-.51.83c-.09.13-.19.27-.3.4l-.16.2-.15.16a.24.24,0,0,0,0,.36.15.15,0,0,0,.09.06L34,28l.45.17,1.38.52.38.15.19.07.09,0,0,0,0,0-.67.45-2,1.39-.42.28-.14.1-.2.15.32.07,1,.27,3.61,1-1.61.89-.76.44-.28.17-.08,0h0s-.06,0-.05.07l.12.07L37.87,36c1.45.9,2.36,1.5,2.44,1.54s.49.35,1.24.86c.39.28.77.55,1.29.87s1.1.64,1.75,1c1.3.7,2.84,1.47,4.49,2.27Z"/>
-                <path class="cls-7"
-                      d="M50.91,50.39c-.11.28-.21.59-.31.9a3,3,0,0,1-.74-.33l.81-.85A.94.94,0,0,0,50.91,50.39Z"/>
-                <path class="cls-7"
-                      d="M50.44,49.58c0,.06-.31.33-.82.73.06-.19.13-.37.19-.55C50.17,49.6,50.42,49.53,50.44,49.58Z"/>
-                <path class="cls-7"
-                      d="M50.06,70.28a1.77,1.77,0,0,0,.36.26L49.19,71.7s0-.07,0-.11a1.89,1.89,0,0,1,0-1,3,3,0,0,1,.19-.61l.08-.16s0,0,0,0,0,0,0-.06a.35.35,0,0,1,.08-.1l.44.49Z"/>
-                <path class="cls-7"
-                      d="M50.05,53.8a9.46,9.46,0,0,0-.12,1.07,4,4,0,0,1-1-.64l.89-.75A1.11,1.11,0,0,0,50.05,53.8Z"/>
-                <path class="cls-7" d="M50,58.05c0,.35.08.72.13,1.08l-.27.07L49.72,58H50Z"/>
-                <path class="cls-7"
-                      d="M49.42,43.82l.54.24a17.15,17.15,0,0,0-2.08.81,9.81,9.81,0,0,0-1.13.66s.31-.47,1-.88A13,13,0,0,1,49.42,43.82Z"/>
-                <path class="cls-7"
-                      d="M48.61,73.81c.54.64,1.4,1.07,1.33,1.25s-1,.06-1.94-.55a3.46,3.46,0,0,1-.85-.86c.31-.31.62-.6.9-.87l0,.1A2.72,2.72,0,0,0,48.61,73.81Z"/>
-                <path class="cls-11" d="M49.92,2.18h0Z"/>
-                <path class="cls-7"
-                      d="M49.85,60a.8.8,0,0,1-.1.45,1,1,0,0,1-.47.43l-.15-.78a.08.08,0,0,0,0-.07v0l.14-.08h0l.05,0h0l0,0,0,0a.06.06,0,0,0,0,0l.13-.07h0l.12,0h0l0,0,0,.07A.78.78,0,0,1,49.85,60Z"/>
-                <path class="cls-10" d="M49.82,59.63l0,0h0Z"/>
-                <path class="cls-7"
-                      d="M49.81,49.76c-.06.18-.13.36-.19.55-.27.2-.59.45-.91.72-.48.38-1,.79-1.42,1.18l-.6.56-.25.24-.11.11-.07.08s0,0,0,.06a1.23,1.23,0,0,0,.06.21,2.61,2.61,0,0,0,.27.52c.25.39.92.85,1.43,1.53a3.19,3.19,0,0,1,.53,1.12,4.3,4.3,0,0,1,.1,1c0,.15,0,.29,0,.41a1.13,1.13,0,0,1,0,.18.19.19,0,0,1,0,.09.09.09,0,0,1,0,.06h0l-.11-.09h0s0,0,0,0h0s0,0,0,0l-.05,0s0-.07,0-.12-.05-.23-.08-.37A3.2,3.2,0,0,0,47.51,56c-.46-.51-1.14-.87-1.6-1.4a4.26,4.26,0,0,1-.45-.71c-.08-.19-.12-.33-.13-.35a1.42,1.42,0,0,1,0-.25.83.83,0,0,1,.25-.67c.05,0,.09-.09.15-.13a1.36,1.36,0,0,0,.12-.12l.29-.23.68-.52c.5-.36,1.06-.72,1.58-1A14.45,14.45,0,0,1,49.81,49.76Z"/>
-                <path class="cls-10" d="M49.79,59.65v0l0,0h0Z"/>
-                <path class="cls-7"
-                      d="M49.79,59.64h0l-.12.06h0l-.13.07a.06.06,0,0,1,0,0l0,0,0,0h0l-.05,0h0l-.14,0h0a.45.45,0,0,1,0-.17s0,0,0,0L49,59.21l-.12-1.12c-.06-.64-.12-1.26-.17-1.84a11.37,11.37,0,0,1,0-1.55l.14.21a3.52,3.52,0,0,1,.27.37l.14.19.24.29c0,.72.09,1.48.14,2.26v0c0,.36.06.73.08,1.11Z"/>
-                <path class="cls-10" d="M49.78,59.66h0l-.12,0Z"/>
-                <path class="cls-7"
-                      d="M49.18,52.18l.56.82-.88.55c0-.28.08-.56.13-.83l.09-.47h0A.34.34,0,0,0,49.18,52.18Z"/>
-                <path class="cls-9"
-                      d="M49.62,50.31a15.8,15.8,0,0,0-.54,1.93h0l-1,.65-.27.18c-.18.13-.42.25-.48.45a1,1,0,0,0,.06.68c.06.14.08.17.12.25l.12.2a8.57,8.57,0,0,0,.52.76l.29.39.16.19.07.08h0a.88.88,0,0,0,0,.16c0,.22,0,.46,0,.7,0,.63.1,1.27.19,1.91h0a.47.47,0,0,0-.12-.23,1.81,1.81,0,0,0-.24-.24h0a.09.09,0,0,0,0-.06.19.19,0,0,0,0-.09,1.13,1.13,0,0,0,0-.18c0-.12,0-.26,0-.41a4.3,4.3,0,0,0-.1-1,3.19,3.19,0,0,0-.53-1.12c-.51-.68-1.18-1.14-1.43-1.53a2.61,2.61,0,0,1-.27-.52,1.23,1.23,0,0,1-.06-.21s0,0,0-.06l.07-.08.11-.11.25-.24.6-.56c.45-.39.94-.8,1.42-1.18C49,50.76,49.35,50.51,49.62,50.31Z"/>
-                <path class="cls-7"
-                      d="M49.48,69.65l0,0a.35.35,0,0,0-.08.1s0,.06,0,.06,0,0,0,0l-.08.16a3,3,0,0,0-.19.61,1.89,1.89,0,0,0,0,1s0,.07,0,.11l-.42.4-.72.68c0-.1,0-.18-.06-.25a.82.82,0,0,0-.09-.26l-.77.42-.13.07-.16.08-.1,0h0l-.07-.05C47.61,71.76,48.53,70.69,49.48,69.65Z"/>
-                <path class="cls-7"
-                      d="M49.13,60.11l.15.78-.19.07a2.46,2.46,0,0,1-.65.08A9.23,9.23,0,0,1,47.26,61a4.84,4.84,0,0,1-1.12-.28,1.5,1.5,0,0,1-.92-.83,1.07,1.07,0,0,1,0-.64,4.7,4.7,0,0,1,.18-.47,6.14,6.14,0,0,1,.4-.86,1.48,1.48,0,0,1,.29-.36l.33-.27a1.68,1.68,0,0,1,.36-.28c.11,0,.24-.11.35,0s.15.43.2.63,0,.17.05.25a.3.3,0,0,1,0,.21l-.23.07.1-.11c0-.07,0-.2-.07-.34s0-.27-.15-.39-.16,0-.22.08l-.18.19-.26.25a1.08,1.08,0,0,0-.21.29,8.29,8.29,0,0,0-.32.82,4.29,4.29,0,0,0-.13.44.59.59,0,0,0,0,.35,1.07,1.07,0,0,0,.64.48,4.52,4.52,0,0,0,1,.2,7.76,7.76,0,0,0,1.08,0c.33,0,.69-.12.71-.24Z"/>
-                <path class="cls-10" d="M49.14,60l.14,0-.14.08h0Z"/>
-                <path class="cls-10" d="M49.14,60v0a.08.08,0,0,1,0,.07c0-.11,0-.21,0-.31a.45.45,0,0,0,0,.17h0Z"/>
-                <path class="cls-9"
-                      d="M49.09,59.8c0,.1,0,.2,0,.31v0c0,.12-.38.24-.71.24a7.76,7.76,0,0,1-1.08,0,4.52,4.52,0,0,1-1-.2,1.07,1.07,0,0,1-.64-.48.59.59,0,0,1,0-.35,4.29,4.29,0,0,1,.13-.44,8.29,8.29,0,0,1,.32-.82,1.08,1.08,0,0,1,.21-.29l.26-.25.18-.19c.06-.05.15-.13.22-.08s.08.27.15.39.11.27.07.34l-.1.11,0,0a1.08,1.08,0,0,0-.54.38.41.41,0,0,0,0,.34.62.62,0,0,0,.12.2,1,1,0,0,0,.13.14s.11,0,.15-.09.08-.15.06-.17l-.1-.08c0-.07-.1-.14-.07-.21s.2-.17.38-.26a1.52,1.52,0,0,1,.57-.18.85.85,0,0,1,.54.19c.16.12.32.23.44.33s.08.47.12.47a.35.35,0,0,0,.07-.14.35.35,0,0,0,0-.18h0q.06.47.15.93S49.08,59.79,49.09,59.8Z"/>
-                <path class="cls-10"
-                      d="M49,59.21l.07.58q-.09-.47-.15-.93c-.09-.64-.15-1.28-.19-1.91,0-.24,0-.48,0-.7.05.58.11,1.2.17,1.84Z"/>
-                <path class="cls-7"
-                      d="M49.08,52.25l-.09.47c-.05.27-.1.55-.13.83l-.28.18-.27.17h0v0l.05.12.09.15c.09.17.2.33.31.51a11.37,11.37,0,0,0,0,1.55.88.88,0,0,1,0-.16h0L48.63,56l-.16-.19-.29-.39a8.57,8.57,0,0,1-.52-.76l-.12-.2c0-.08-.06-.11-.12-.25a1,1,0,0,1-.06-.68c.06-.2.3-.32.48-.45l.27-.18Z"/>
-                <path class="cls-7"
-                      d="M48.94,58.86a.35.35,0,0,1,0,.18.35.35,0,0,1-.07.14s.11-.25-.12-.47-.28-.21-.44-.33a.85.85,0,0,0-.54-.19,1.52,1.52,0,0,0-.57.18c-.18.09-.35.18-.38.26s0,.14.07.21l.1.08s0,.1-.06.17-.12.11-.15.09a1,1,0,0,1-.13-.14.62.62,0,0,1-.12-.2.41.41,0,0,1,0-.34,1.08,1.08,0,0,1,.54-.38l0,0c-.08.09-.15.13-.14.15s.14,0,.35-.19c0,0,0,0,0,0a1.29,1.29,0,0,1,.4-.07.94.94,0,0,1,.55.2v.07a.32.32,0,0,0,0,.09s0,.09.16.12a.2.2,0,0,0,.09,0,1.81,1.81,0,0,1,.24.24A.47.47,0,0,1,48.94,58.86Z"/>
-                <path class="cls-7" d="M48.64,80.17a.82.82,0,0,1,.26,0,.89.89,0,0,1-.35.16Z"/>
-                <path class="cls-7"
-                      d="M48.64,80.17l-.09.13a5.51,5.51,0,0,1-.69.14,7.09,7.09,0,0,1-2.39-.11,3.52,3.52,0,0,1-1.23-.51,2.69,2.69,0,0,1-.83-.86,3.21,3.21,0,0,1-.34-.72c.08-.11.17-.21.25-.31l.12-.15a2.58,2.58,0,0,0,.34,1,2.52,2.52,0,0,0,.68.76,3.24,3.24,0,0,0,1.08.5,7.9,7.9,0,0,0,2.31.26A5.43,5.43,0,0,0,48.64,80.17Z"/>
-                <path class="cls-7"
-                      d="M48.47,58.3l.11.09a.2.2,0,0,1-.09,0c-.17,0-.13-.09-.16-.12a.32.32,0,0,1,0-.09v-.07l.1.07h0v0l0,0s0,0,0,0Z"/>
-                <path class="cls-10" d="M48.49,58.26s0,0,0,0l-.07-.06h0v0l.05,0s0,0,0,0Z"/>
-                <path class="cls-10" d="M48.47,58.29h0v0s0,0,0,0l0,0v0h0Z"/>
-                <path class="cls-7" d="M48.4,58.22h0l-.1-.07h0s0,0,.07,0h0Z"/>
-                <path class="cls-8"
-                      d="M47.86,80.44a5.51,5.51,0,0,0,.69-.14,9.44,9.44,0,0,0-1,1.5,7.28,7.28,0,0,0-.36.76c-.2,0-.52.13-.91.2a6.19,6.19,0,0,1-2.55,0,3.4,3.4,0,0,1-2.05-1.35,2.85,2.85,0,0,1-.37-.66q.21-.39.45-.75c.41-.63.86-1.22,1.3-1.79a3.21,3.21,0,0,0,.34.72,2.69,2.69,0,0,0,.83.86,3.52,3.52,0,0,0,1.23.51A7.09,7.09,0,0,0,47.86,80.44Z"/>
-                <path class="cls-7"
-                      d="M48,72.53c0,.07,0,.15.06.25-.28.27-.59.56-.9.87a2,2,0,0,1-.17-.27c-.1-.19-.17-.35-.21-.44l0-.06h0l.1,0,.16-.08.13-.07.77-.42A.82.82,0,0,1,48,72.53Z"/>
-                <path class="cls-7"
-                      d="M47.77,76.63c0,.09-.18.27-.54.26A2.43,2.43,0,0,1,46,76.54a3,3,0,0,1-.88-.8l.91-1,.09.31a2.57,2.57,0,0,0,.44.75,3.75,3.75,0,0,0,.74.58C47.57,76.53,47.73,76.55,47.77,76.63Z"/>
-                <path class="cls-7"
-                      d="M47.81,101.07l-.37.13-.41.13a.13.13,0,0,1-.13-.06c0-.07-.06-.14-.13-.2a.17.17,0,0,1,0-.24.15.15,0,0,1,.09-.13l.25-.07h0C47.33,100.79,47.57,100.93,47.81,101.07Z"/>
-                <path class="cls-7" d="M47.2,82.56c.16,0,.25-.07.26,0a1,1,0,0,1-.31.15A.47.47,0,0,1,47.2,82.56Z"/>
-                <path class="cls-7" d="M47.35,58s0,0,0,0c-.21.19-.34.19-.35.19s.06-.06.14-.15Z"/>
-                <path class="cls-7"
-                      d="M47.2,82.56a.47.47,0,0,0-.05.1,6.1,6.1,0,0,1-.81.28,6.18,6.18,0,0,1-2.67.18,3.68,3.68,0,0,1-2.33-1.42,2.41,2.41,0,0,1-.28-.43c.08-.16.16-.33.26-.49a2.85,2.85,0,0,0,.37.66,3.4,3.4,0,0,0,2.05,1.35,6.19,6.19,0,0,0,2.55,0C46.68,82.69,47,82.61,47.2,82.56Z"/>
-                <path class="cls-7" d="M47.19,89.26a1.34,1.34,0,0,1-.11.44L47,89.59A2.24,2.24,0,0,1,47.19,89.26Z"/>
-                <path class="cls-7"
-                      d="M47,89.59l.06.11c-.07.24-.18.57-.32,1-.07.2-.15.42-.23.66a3.87,3.87,0,0,1-.58.93,3,3,0,0,1-1.24.86,5.69,5.69,0,0,1-1.68.54,6.4,6.4,0,0,1-1.57,0c-.29,0-.56-.07-.78-.11l-.15-.5a8.75,8.75,0,0,0,1,.17,5.82,5.82,0,0,0,1.46,0,5.93,5.93,0,0,0,1.6-.46,3.62,3.62,0,0,0,1.36-.93,2.74,2.74,0,0,0,.39-.64c.1-.23.18-.45.27-.65C46.77,90.16,46.91,89.83,47,89.59Z"/>
-                <path class="cls-7"
-                      d="M47,73.38a2,2,0,0,0,.17.27c-.28.26-.56.55-.85.86l-.23.24a.73.73,0,0,0,0-.08,1.87,1.87,0,0,0-.64.16,2,2,0,0,0-.6.27,3.81,3.81,0,0,0,.28.54l.07.1c-.55.63-1.13,1.31-1.72,2a.08.08,0,0,1,0,0,.24.24,0,0,0-.26-.18.22.22,0,0,0-.2.26,1.93,1.93,0,0,0,.1.41c-.44.57-.89,1.16-1.3,1.79q-.24.36-.45.75l0-.07a2.69,2.69,0,0,1-.11-.33.16.16,0,0,0-.09-.12h0c.15-.35.32-.69.48-1l.08-.11c.38-.54.7-1.11,1-1.68l.82-1.19c.43-.48.86-1,1.32-1.41.64-.65,1.26-1.34,1.87-2l.07.05h0l0,.06C46.81,73,46.88,73.19,47,73.38Z"/>
-                <path class="cls-8"
-                      d="M46.92,89.4l.1.19c-.11.24-.25.57-.43,1-.09.2-.17.42-.27.65a2.74,2.74,0,0,1-.39.64,3.62,3.62,0,0,1-1.36.93,5.93,5.93,0,0,1-1.6.46,5.82,5.82,0,0,1-1.46,0,8.75,8.75,0,0,1-1-.17c-.25-.82-.49-1.62-.57-1.81l-.13-.34h0a11.84,11.84,0,0,1-.41-2.9c0-.27,0-.55,0-.83a2.08,2.08,0,0,0,.41.35,4.1,4.1,0,0,0,2.8.74,14.86,14.86,0,0,0,2.79-.51,3.91,3.91,0,0,0,1-.4.28.28,0,0,0,0,.09A6.53,6.53,0,0,0,46.92,89.4Z"/>
-                <path class="cls-9"
-                      d="M46.77,84.35v.3a5.07,5.07,0,0,0-.37,2.64,1.56,1.56,0,0,0-.15.06c-.21.07-.51.15-.88.24a20.91,20.91,0,0,1-2.75.35,3.89,3.89,0,0,1-2.53-.76,3.19,3.19,0,0,1-.64-.65,5,5,0,0,1,.16-1,27.15,27.15,0,0,1,.87-3c.18-.43.37-.84.58-1.24a2.41,2.41,0,0,0,.28.43,3.68,3.68,0,0,0,2.33,1.42,6.18,6.18,0,0,0,2.67-.18,6.1,6.1,0,0,0,.81-.28A3.61,3.61,0,0,0,46.77,84.35Z"/>
-                <rect class="cls-11" x="46.74" y="72.88" width="0.01" height="0.01"/>
-                <path class="cls-7" d="M46.57,87.22s0,.07-.17.14,0,0,0-.07Z"/>
-                <path class="cls-7"
-                      d="M46.4,87.29s0,0,0,.07a3.91,3.91,0,0,1-1,.4,14.86,14.86,0,0,1-2.79.51,4.1,4.1,0,0,1-2.8-.74,2.08,2.08,0,0,1-.41-.35c0-.22,0-.44,0-.65a3.19,3.19,0,0,0,.64.65,3.89,3.89,0,0,0,2.53.76,20.91,20.91,0,0,0,2.75-.35c.37-.09.67-.17.88-.24A1.56,1.56,0,0,1,46.4,87.29Z"/>
-                <path class="cls-7"
-                      d="M46.05,74.67a.73.73,0,0,1,0,.08l-.91,1-.07-.1a3.81,3.81,0,0,1-.28-.54,2,2,0,0,1,.6-.27A1.87,1.87,0,0,1,46.05,74.67Z"/>
-                <path class="cls-7"
-                      d="M45.76,5.53a1.67,1.67,0,0,1,.06,1c-.2.17-.38.36-.56.54s-.11.12-.17.19a3.83,3.83,0,0,1-.28.29h-.05a.27.27,0,0,1-.12-.15.29.29,0,0,1,0-.11,1.24,1.24,0,0,1,.07-.27A6.56,6.56,0,0,1,45.76,5.53Z"/>
-                <path class="cls-11" d="M45.82,6.58h0c-.19.17-.37.36-.56.54C45.44,6.94,45.62,6.75,45.82,6.58Z"/>
-                <path class="cls-7"
-                      d="M45.56,5.37a.31.31,0,0,1,.2.16,6.56,6.56,0,0,0-1,1.53,1.24,1.24,0,0,0-.07.27.29.29,0,0,0,0,.11.27.27,0,0,0,.12.15h.05l-.22.23-1-.26c-.81-.2-2-.48-3.32-.72a13.41,13.41,0,0,0-2.07-.24c-.74,0-1.59.1-2.45.2s-1.75.24-2.64.4l-.66.13-.54.13c-.08,0-.14,0-.19.07a.49.49,0,0,0-.08.18v.07a.66.66,0,0,0,0,.14c0,.1,0,.2,0,.31s0,.42,0,.64a11.6,11.6,0,0,0,.18,1.3,12.83,12.83,0,0,0,.29,1.26c.07.21.13.41.2.6l.05.13v0l0,.07.15.29a32,32,0,0,0,2.47,4c1.76,2.14,3,3.61,2.85,3.75s-.64-.36-1.56-1.16h0a1.72,1.72,0,0,0-.11-.56s0,.15,0,.41c-.54-.48-1.19-1.08-1.92-1.79a27.93,27.93,0,0,1-3-4L31.12,13l0-.07a.75.75,0,0,1-.07-.12l-.08-.19c-.11-.22-.19-.44-.29-.67-.17-.46-.31-.92-.44-1.4s-.22-1-.3-1.47c0-.25-.06-.51-.08-.77s0-.27,0-.4V7.69c0-.07,0-.19,0-.29a2.26,2.26,0,0,1,.37-1.11,1.82,1.82,0,0,1,1-.62l.27-.1.18-.05.37-.1.71-.19c.93-.24,1.85-.42,2.75-.58s1.78-.28,2.67-.35a14.83,14.83,0,0,1,2.53.15c1.48.19,2.68.44,3.54.61Z"/>
-                <path class="cls-7"
-                      d="M43.43,77.75a.08.08,0,0,0,0,0l-.12.15c-.08.1-.17.2-.25.31a1.93,1.93,0,0,1-.1-.41.22.22,0,0,1,.2-.26A.24.24,0,0,1,43.43,77.75Z"/>
-                <path class="cls-7"
-                      d="M42.8,9.82c0,.08-.6.58-1.17,1.18a9.63,9.63,0,0,0-.73.85c-.19.24-.3.42-.31.42l-.32.42a6.13,6.13,0,0,0-.58.94c-.38.72-.45,1.54-.54,1.54s-.1-.21-.09-.54a3.59,3.59,0,0,1,.2-1.17,5.39,5.39,0,0,1,.5-1.1l.3-.48s.15-.19.38-.43a9,9,0,0,1,.82-.75h0l.56-.18c.37-.12.59-.39.52-.55C42.6,9.85,42.78,9.78,42.8,9.82Z"/>
-                <path class="cls-10"
-                      d="M42.35,10c.07.16-.15.43-.52.55l-.56.18a.12.12,0,0,1,0,0A7.84,7.84,0,0,1,42.35,10Z"/>
-                <path class="cls-7"
-                      d="M42.34,10h0a7.84,7.84,0,0,0-1,.68.12.12,0,0,0,0,0h0c-.08,0-.12,0-.13,0a1.43,1.43,0,0,0-.1-.16,1.31,1.31,0,0,0-.4-.32A3.36,3.36,0,0,0,38.72,10a8.12,8.12,0,0,1-3.36-.27c0-.22,1.65-.38,3.23-.73a4.34,4.34,0,0,1,2.6.08A2.51,2.51,0,0,1,42.34,10Z"/>
-                <path class="cls-7"
-                      d="M41.29,80.71l0,.07c-.1.16-.18.33-.26.49a2.75,2.75,0,0,1-.23-.45c0-.09.07-.17.1-.25a0,0,0,0,0,0,0l.13-.28h0a.16.16,0,0,1,.09.12A2.69,2.69,0,0,0,41.29,80.71Z"/>
-                <path class="cls-11" d="M41.07,80.26h0l-.13.28.13-.28Z"/>
-                <path class="cls-11" d="M40.93,80.57c0,.08-.06.16-.1.25h0Z"/>
-                <path class="cls-7"
-                      d="M40.83,80.82a2.75,2.75,0,0,0,.23.45c-.21.4-.4.81-.58,1.24a27.15,27.15,0,0,0-.87,3,5,5,0,0,0-.16,1,2.57,2.57,0,0,1-.19-.29l0,0c0-.29.1-.57.17-.89A24.6,24.6,0,0,1,40.83,80.82Z"/>
-                <path class="cls-7" d="M40.53,93.06l.15.5-.1,0-.12-.49Z"/>
-                <circle class="cls-9" cx="74.66" cy="26.13" r="0.81"/>
-                <circle class="cls-9" cx="62.2" cy="27.25" r="0.91"/>
-                <circle class="cls-9" cx="62.76" cy="28.68" r="0.18"/>
-                <circle class="cls-9" cx="73.86" cy="27.51" r="0.19"/>
-                <path class="cls-7"
-                      d="M64.13,43.12l.07,0a.29.29,0,0,0-.16-.56h0c-.1,0-.18.12-.21.2v0c-.09.37.47.53.56.16v0l-.21.2h0L64,42.54l-.06,0c-.35.14-.2.7.15.56Z"/>
-                <path class="cls-7" d="M63.92,46.39l0,0a.29.29,0,0,0,.41.41l0,0a.29.29,0,0,0-.41-.41Z"/>
-                <path class="cls-8"
-                      d="M90.14,88.49a1,1,0,0,1,0,.21l-.05.34a5.09,5.09,0,0,1-.12.68,10.14,10.14,0,0,1-.39,1.33,12,12,0,0,1-3.07,4.7,15.53,15.53,0,0,1-4.84,3.18l-.68.28-.7.23c-.46.17-1,.28-1.42.41-1,.21-1.92.36-3,.57l-3.17,1.25h0a18.09,18.09,0,0,1-3.4,1.13c-1.16.28-2.36.5-3.56.68l-1.45.19c.13-.25.3-.58.5-1s.49-1,.73-1.55a5.19,5.19,0,0,0,.46-1.93,3.85,3.85,0,0,0-.25-2,4.18,4.18,0,0,0-1.06-1.36,3,3,0,0,0-.66-.44,35.84,35.84,0,0,0,6.35-2.19c2.68-1.18,5.48-2.68,8.47-4.21.76-.37,1.51-.77,2.29-1.13s1.57-.78,2.37-1.09A8.86,8.86,0,0,1,86,86.22a4.17,4.17,0,0,1,2.46.48,4.33,4.33,0,0,1,1,.81,5.17,5.17,0,0,1,.42.51Z"/>
-                <path class="cls-9"
-                      d="M86.7,7.22s.06.78,0,1.87A25.11,25.11,0,0,1,86.24,13a29.25,29.25,0,0,1-1,3.84,7.62,7.62,0,0,0-.54,1.75s0,0,.09,0c0,.31,0,1.08,0,1.84,0,.5-.06,1-.1,1.38s-.07.63-.07.65,0,.27-.08.64-.11.76-.2,1.19c0-.09,0-.19,0-.3,0-.29,0-.63,0-1a7.16,7.16,0,0,0-.42-1.35,5,5,0,0,0-1-1.34A7.31,7.31,0,0,0,81.41,19a6.82,6.82,0,0,0-3.92-.93,4.21,4.21,0,0,0-2,.82A6.4,6.4,0,0,0,74,20.35a5.3,5.3,0,0,0-.85,1.74c-.18.57-.31,1.11-.42,1.62a32.86,32.86,0,0,0-.55,3.49c0,.08-.16,1.47-.21,3.51a15.86,15.86,0,0,0,1.33,7.34l.12.23.15.28a.6.6,0,0,0,.68.32,1.42,1.42,0,0,0,.32-.07,2.76,2.76,0,0,0,.3-.15l.42-.29c.54-.39,1-.78,1.53-1.17,1-.77,1.87-1.51,2.62-2.17A15.16,15.16,0,0,0,82,32.39a1.54,1.54,0,0,0,.09-.24l.38.46c.05.07.1.12.08.11h0l-.31.27a5.54,5.54,0,0,0-.83,1.07c-.52.93-1.07,2.09-1.78,3.18a8.35,8.35,0,0,1-1.16,1.48,7.12,7.12,0,0,1-1.32,1,12.63,12.63,0,0,0-1.39.88h0a1.1,1.1,0,0,0-.33-.45c-.14-.07-.22,0-.22,0s.07,0,.14.13a1.23,1.23,0,0,1,.17.42c.06.22.11.48.16.77a4,4,0,0,0-1.12.58c0,.08.52-.07,1.17-.23,0,.12,0,.25,0,.37a2.18,2.18,0,0,1,0,.51c-.27.14-.43.26-.41.28s.14,0,.37-.06a3.1,3.1,0,0,1-.15.46h0c-.64.18-1.22.49-1.18.58s.45,0,.95-.09c-.11.17-.18.26-.18.27s-.16.24-.43.55a7.27,7.27,0,0,1-1.09,1,2.76,2.76,0,0,1-1.36.44c-.4,0-.68,0-.7,0s.27.15.7.2a3,3,0,0,0,1-.07v.06a4.89,4.89,0,0,0-.52.42,3.16,3.16,0,0,1-1.28.58,4.38,4.38,0,0,1-1.39,0l-.21,0a2.7,2.7,0,0,0,.53-.46,2.11,2.11,0,0,0,.41-.59,1.07,1.07,0,0,0,.1-.24c-.06-.06-.26.3-.68.65a3.92,3.92,0,0,1-1.83.81,7.36,7.36,0,0,1-2,.12,4.51,4.51,0,0,1-.92-.2l-.26-.08a2.87,2.87,0,0,1-.58-.27c-.34-.24-.77-.62-1.21-1,.4-.27.78-.52,1.08-.68s.66-.24.66-.29-.31-.07-.75,0a9.59,9.59,0,0,0-1.34.61l0,0-1.07-.94.69-.23c1.49-.49,3-.87,3-1s0,0-.11,0l.46-.79.29,0,.32,0a.37.37,0,0,0,.23-.05.2.2,0,0,0,.08-.24.85.85,0,0,0-.25-.37.41.41,0,0,0-.24-.1h0l-1.6-.64c1-.08,1.55-.41,1.49-.47s.6-.44,1.3-1.47a12.55,12.55,0,0,0,2-4.7,14.28,14.28,0,0,0,.16-3.36,31.65,31.65,0,0,0-.28-3.67A11.8,11.8,0,0,0,68.21,24a8.88,8.88,0,0,0-2.61-3h0l0,0a9.26,9.26,0,0,0-5.51-2,27.83,27.83,0,0,0-4.85.52,17.8,17.8,0,0,0-3.33,1c-.79.34-1.23.63-1.3.65a16.69,16.69,0,0,0-1.49,1.06,25.2,25.2,0,0,0-3.12,3,24.7,24.7,0,0,0-1.78,2.24l-.42.61-.32.47-.2.29-.1.15c0,.05.06.09.08.14l.47.54L44,30l.55.6a47.56,47.56,0,0,0,4.91,4.66,25.94,25.94,0,0,0,2.8,2l.74.43.76.38c.51.24,1,.45,1.49.67,2,.84,3.79,1.61,5.42,2.14.36.11.69.21,1,.29l-.38,1.42A19.94,19.94,0,0,0,59,42.18a18.9,18.9,0,0,0-3-.06,11.45,11.45,0,0,0-1.4.14,13.73,13.73,0,0,0-1.39.29c-.7.19-1.56.44-2.44.75h0l-1.73-.82c-1.65-.8-3.19-1.57-4.49-2.27-.65-.35-1.24-.68-1.75-1s-.9-.59-1.29-.87c-.75-.51-1.19-.82-1.24-.86s-1-.64-2.44-1.54l-2.53-1.58-.12-.07s0,0,.05-.07h0l.08,0,.28-.17.76-.44L38,32.67l-3.61-1-1-.27-.32-.07.2-.15.14-.1.42-.28,2-1.39.67-.45,0,0,0,0-.09,0-.19-.07-.38-.15-1.38-.52L34,28l-.12,0a.15.15,0,0,1-.09-.06.24.24,0,0,1,0-.36l.15-.16.16-.2c.11-.13.21-.27.3-.4A5.62,5.62,0,0,0,35,26a11.13,11.13,0,0,0,.71-1.67,15.55,15.55,0,0,0,.63-2.93,10,10,0,0,0,0-2.16c.92.8,1.49,1.23,1.56,1.16s-1.09-1.61-2.85-3.75a32,32,0,0,1-2.47-4l-.15-.29,0-.07v0L32.33,12c-.07-.19-.13-.39-.2-.6a12.83,12.83,0,0,1-.29-1.26,11.6,11.6,0,0,1-.18-1.3c0-.22,0-.44,0-.64s0-.21,0-.31a.66.66,0,0,1,0-.14V7.72a.49.49,0,0,1,.08-.18c.05,0,.11,0,.19-.07l.54-.13.66-.13c.89-.16,1.78-.3,2.64-.4s1.71-.18,2.45-.2a13.41,13.41,0,0,1,2.07.24c1.36.24,2.51.52,3.32.72l1,.26.22-.23a3.83,3.83,0,0,0,.28-.29c.06-.07.12-.12.17-.19s.37-.37.56-.54h0a3.63,3.63,0,0,1,.46-.34.9.9,0,0,1,.21-.08L46.73,6a20.75,20.75,0,0,1,2.49-1.59c.48-.26,1-.51,1.49-.74l.51-.22.54.1a11.74,11.74,0,0,1,2.58.83,10.61,10.61,0,0,1,1.59.91c.27.19.56.38.86.6l.45.34c.19.14.38.29.58.46l.25.23a2.52,2.52,0,0,1,.74.52c.1.16,0,0,0-.11a2.46,2.46,0,0,1,0-.26,1.11,1.11,0,0,1,0-.3c-.37-1.25-.69-2.31-.95-3.18-.13-.42-.25-.8-.37-1.13l1,0c.88,0,1.63.08,2.15.13l.9.08.57,0,.17.15a8.67,8.67,0,0,1,2.17,4.3c0,.19.07.36.08.43v0l.29,0v0A45.57,45.57,0,0,1,65,2.81l.58,0h.76l.45,0a2.92,2.92,0,0,0,.44-.06c.45-.07.88-.17,1.32-.25l.28.29a6.8,6.8,0,0,1,1,1.53c.08.17.17.36.24.55a5.8,5.8,0,0,1,.21.89c0,.3.08.62.13.94l.06.49,0,.25,0,.13s0,0,0,0l.15-.49a15.41,15.41,0,0,1,.75-2,8.45,8.45,0,0,1,.67-1.2,3.69,3.69,0,0,1,.72-.78,6.43,6.43,0,0,1,.73-.48A3.27,3.27,0,0,1,74,2.38a16.23,16.23,0,0,1,2.16.54c.85.29,1.62.62,2.26.86s.93.34,1.23.42c.36.4.64.68.84.87s.34.29.38.27,0-.18-.19-.43-.22-.38-.39-.65l.46,0h.48c.5,0,1-.09,1.58-.16a15.37,15.37,0,0,1,1.63-.14,2.89,2.89,0,0,1,1.36.23c.66.32.79,1.28.84,1.91A11.5,11.5,0,0,1,86.7,7.22ZM86,6.12a3.52,3.52,0,0,0-.09-.85c0-.06-.25,0-.5.07l-.28.12h0a5.33,5.33,0,0,0-1.27.38,11.1,11.1,0,0,1-1.32.49,2.49,2.49,0,0,1-.44.09l.5.72a1.39,1.39,0,0,1,.24-.35A2.85,2.85,0,0,1,84,6.05a1.71,1.71,0,0,1,1.14-.11l0,.22A4.49,4.49,0,0,1,85,7.58c-.17.71-.35,1.44-.41,1.87-.32-.59-.63-1-.7-1a11.42,11.42,0,0,0,.56,1.74c.15.43.27.86.35,1.19s.1.55.11.57a4.42,4.42,0,0,1,.1.54,7.64,7.64,0,0,1,0,1.22,9.48,9.48,0,0,0-.1,1.82,5.29,5.29,0,0,0,.56-1.76,6.33,6.33,0,0,0,.18-1.31,6.26,6.26,0,0,0,0-.64s-.06-.26-.18-.6A9.92,9.92,0,0,0,84.92,10c-.06-.1-.11-.21-.16-.31a13.38,13.38,0,0,0,.94-1.93A4.77,4.77,0,0,0,86,6.12ZM74.92,43.19a.77.77,0,0,0,0-.38.17.17,0,0,0,0-.12s-.08,0-.12,0-.22.12-.21.14-.12-.11-.14-.08a.37.37,0,0,0,0,.38.33.33,0,0,0,.23.23C74.77,43.41,74.86,43.33,74.92,43.19Zm-.76-1.43a.5.5,0,0,0,.21-.35.17.17,0,0,0,0-.12.13.13,0,0,0-.13,0c-.17,0-.25.09-.25.12s-.13-.11-.14-.1l-.06.08a.56.56,0,0,0-.13.24.19.19,0,0,0,.13.24A.48.48,0,0,0,74.16,41.76Zm-.2,2a.69.69,0,0,0,.22-.62,1.19,1.19,0,0,0-.24-.55,1.73,1.73,0,0,0-.41-.4A1.34,1.34,0,0,0,73,42a3.59,3.59,0,0,0-1,0l-.16,0-.11,0-.2.07-.17,0h-.11l-.13,0a.83.83,0,0,0-.29,0,3,3,0,0,0-.37,0,4.5,4.5,0,0,0-.69.2l-.36.18a2.37,2.37,0,0,0-.79.63,2,2,0,0,0-.49,1.33,2,2,0,0,0,.19.79,1,1,0,0,0,.72.56,1.8,1.8,0,0,0,.81-.09.68.68,0,0,0,.31.18,1.77,1.77,0,0,0,.91,0,3.42,3.42,0,0,0,.69-.28h0a.47.47,0,0,0,.24.08.76.76,0,0,0,.55-.18c.21-.21.36-.4.42-.45s0,0,0,0h0A0,0,0,0,0,73,45l-.06,0v0s.09,0,.12,0a.51.51,0,0,0,.16-.09.57.57,0,0,0,.23-.3C73.52,44.05,73.64,44,74,43.79Zm-7.28,1.85a.58.58,0,0,0-.25-.49C66.17,45,66,45,66,45s-.14-.09-.15-.06a1.86,1.86,0,0,0-.3.45.58.58,0,0,0,.07.61.73.73,0,0,0,1.11-.38ZM41.63,11c.57-.6,1.21-1.1,1.17-1.18s-.2,0-.45.15h0A2.51,2.51,0,0,0,41.19,9,4.34,4.34,0,0,0,38.59,9c-1.58.35-3.23.51-3.23.73a8.12,8.12,0,0,0,3.36.27,3.36,3.36,0,0,1,1.91.28,1.31,1.31,0,0,1,.4.32,1.43,1.43,0,0,1,.1.16s0,0,.13,0a9,9,0,0,0-.82.75c-.23.24-.37.42-.38.43l-.3.48a5.39,5.39,0,0,0-.5,1.1,3.59,3.59,0,0,0-.2,1.17c0,.33,0,.54.09.54s.16-.82.54-1.54a6.13,6.13,0,0,1,.58-.94l.32-.42s.12-.18.31-.42A9.63,9.63,0,0,1,41.63,11Z"/>
-                <path class="cls-11" d="M85.26,6.06v0l-.06,0h0v0Z"/>
-                <path class="cls-9"
-                      d="M85.71,27.38c-.28.29-.62.65-1,1.06s-.49.56-.76.85l-.4.46-.66.76-.28-.09c.29-1,.59-2.12.81-2.93C83.53,27.52,85,27.45,85.71,27.38Z"/>
-                <path class="cls-11" d="M84.79,18.53l-.05,0a.79.79,0,0,1,0-.14S84.78,18.47,84.79,18.53Z"/>
-                <path class="cls-9"
-                      d="M84.25,31.42l-.15,0h0l-.28.08-1.11.31-.51.14c.13-.37.29-.94.47-1.56l.28.09,1.2.78Z"/>
-                <path class="cls-10" d="M84.25,24.29c0,.39,0,.62,0,.61s0-.06,0-.19l.06-.25A.85.85,0,0,1,84.25,24.29Z"/>
-                <path class="cls-8"
-                      d="M84,24c0,.31.08.54.11.7a14.12,14.12,0,0,0-.43,1.68v0h0a.3.3,0,0,1,0,.11.39.39,0,0,1,0,.13s0,.06,0,.1,0,.18-.08.28a1.21,1.21,0,0,1,0,.18,1.8,1.8,0,0,1,0,.19s0,0,0,0a.42.42,0,0,0,0,.06,0,0,0,0,1,0,0c-.16.57-.37,1.26-.6,1.85l-1.35-.11a7.18,7.18,0,0,0,.15-2.11,4.53,4.53,0,0,0-.64-2,11.8,11.8,0,0,0-1.13-1.66,4.19,4.19,0,0,0-1.46-1.21,5,5,0,0,0-4.1,0l-.32.2,0-.09a4.39,4.39,0,0,1,.69-1.51,5.45,5.45,0,0,1,1.25-1.29,3.61,3.61,0,0,1,1.61-.73,6.21,6.21,0,0,1,3.58.71,6.62,6.62,0,0,1,1.33,1.08,4.69,4.69,0,0,1,1,1.17A10.2,10.2,0,0,1,83.91,23C84,23.38,84,23.72,84,24Z"/>
-                <path class="cls-10" d="M83.43,27.47v0h0A0,0,0,0,0,83.43,27.47Z"/>
-                <path class="cls-8"
-                      d="M81.47,29.23l1.35.11c-.06.17-.13.34-.19.49-.53,1.21-.65,2.28-1,2.71s-.56.71-.56.71c-.44.36-1.08.88-1.86,1.48s-1.71,1.31-2.71,2c-.5.36-1,.74-1.55,1.09l-.41.26-.14.07-.15,0c-.05,0-.11,0-.12-.07L74.06,38l-.1-.22a13.5,13.5,0,0,1-1-3.66,14.36,14.36,0,0,1-.13-1.69.54.54,0,0,0,.17.07,3.86,3.86,0,0,0,1.09,0,15.52,15.52,0,0,0,2.54-.42A14,14,0,0,0,80,30.75a6.71,6.71,0,0,0,.84-.59,4.54,4.54,0,0,0,.38-.38,1.25,1.25,0,0,0,.09-.12l.09-.16C81.42,29.41,81.45,29.31,81.47,29.23Z"/>
-                <path class="cls-10" d="M82,32l.16-.05c0,.06-.05.12-.07.17Z"/>
-                <path class="cls-12"
-                      d="M81.16,27.14A7,7,0,0,1,81,29.09a.65.65,0,0,1-.07.21s0,0,0,.06l-.07.08a2.46,2.46,0,0,1-.33.31,5.84,5.84,0,0,1-.77.53,11.78,11.78,0,0,1-2.26,1,5.92,5.92,0,0,0,1.7-4.14c.09-2.17-1.34-4.54-2.93-5h.5a4.3,4.3,0,0,1,1.53.45,3.85,3.85,0,0,1,1.31,1.15A6.79,6.79,0,0,1,81.16,27.14Z"/>
-                <path class="cls-13"
-                      d="M76.22,22.06c1.59.5,3,2.87,2.93,5a5.92,5.92,0,0,1-1.7,4.14c-.33.11-.64.2-.94.27a15.51,15.51,0,0,1-2.44.38H74a2.34,2.34,0,0,1-1-1.47h0c.1-1.82.25-3,.26-3.11s.1-1.45.46-3.41c.06-.36.15-.73.24-1.11a.36.36,0,0,1,.11-.1h0a5.88,5.88,0,0,1,2.18-.61Z"/>
-                <path class="cls-12" d="M73.89,22.72l.1,0a.36.36,0,0,0-.11.1S73.89,22.74,73.89,22.72Z"/>
-                <path class="cls-12"
-                      d="M74,31.89a3.21,3.21,0,0,1-.81-.06.4.4,0,0,0-.29.05c0-.39,0-.77,0-1.13a3.25,3.25,0,0,1,0-.33A2.34,2.34,0,0,0,74,31.89Z"/>
-                <path class="cls-9"
-                      d="M73.8,60.42c0,.16-.12.29-.26.41a2.23,2.23,0,0,1-.42.3.86.86,0,0,1-.34.09,4.88,4.88,0,0,0,.08-.61,6.06,6.06,0,0,0,.06-1c0-.18,0-.34,0-.48h0a.21.21,0,0,0,0,.13.61.61,0,0,1,.36.23A2,2,0,0,1,73.8,60.42Z"/>
-                <path class="cls-14"
-                      d="M73.59,42.9c.18.22.26.47.11.6l-.18.15a1.62,1.62,0,0,0-.18.19.34.34,0,0,0-.07.11.42.42,0,0,0,0,.1.19.19,0,0,0,0,.08v0a.38.38,0,0,1-.07.21l-.08.08s-.09.06-.09,0,.12-.22,0-.31a.55.55,0,0,0-.38.14c-.07.06-.1.09-.09.1s0,0,.13,0l.14,0,.08,0h0s0,0,0,0c0,.2,0,.17,0,.22a.36.36,0,0,1,0,.11.83.83,0,0,0-.06.21s0,0,0,0v0c-.05,0-.09,0-.14,0s-.27.2-.39.27a.58.58,0,0,1-.44.13.16.16,0,0,0,0-.14c0-.09-.09-.09-.09-.08a.3.3,0,0,1,0,.09s-.08.09-.18.13a3.33,3.33,0,0,1-.78.22,1.59,1.59,0,0,1-.76,0l-.07,0,.33-.2a2,2,0,0,0,.28-.23l.12-.12a2,2,0,0,0,.13-.18.42.42,0,0,0,.08-.38.4.4,0,0,0-.29-.21,1.32,1.32,0,0,0-.57,0,.56.56,0,0,0-.38.21.54.54,0,0,0-.08.25s0,.07,0,.08,0,0,.08-.06a.84.84,0,0,1,.12-.19.4.4,0,0,1,.29-.1,1.29,1.29,0,0,1,.41,0s.1,0,.11.1a.2.2,0,0,1-.06.15l-.07.06-.11.1a2.2,2.2,0,0,1-.25.17,1.69,1.69,0,0,1-1.19.29.46.46,0,0,1-.35-.31,1.46,1.46,0,0,1-.1-.57,1.5,1.5,0,0,1,.4-.95,2.5,2.5,0,0,1,.94-.59,3.85,3.85,0,0,1,.58-.19,1.17,1.17,0,0,1,.27-.05h.06l.25.05a1.53,1.53,0,0,0,.29,0l.23-.08.21-.07.11,0H72a3.17,3.17,0,0,1,.87,0,1.06,1.06,0,0,1,.38.12A1.4,1.4,0,0,1,73.59,42.9Z"/>
-                <path class="cls-9"
-                      d="M73,54a2,2,0,0,1,0,.4c0,.31-.19.81-.25,1.28,0,.21-.06.42-.08.62-.15-.86-.4-1.9-.66-2.93l-.16-.6.11,0a1.84,1.84,0,0,1,.94.61.91.91,0,0,1,.11.44A.79.79,0,0,1,73,54Z"/>
-                <path class="cls-9"
-                      d="M72.25,57c.29.78.46,1.29.55,1.28-.07,0,0,.85-.2,2.3a15.37,15.37,0,0,1-2.22,5.6A28.34,28.34,0,0,1,68,69.45a5.89,5.89,0,0,1-3.79,1.9,16.42,16.42,0,0,1-2.35.22,15.88,15.88,0,0,1-2.4-.12,10.2,10.2,0,0,1-4.36-2L54.47,69h0a1.6,1.6,0,0,0,.26-1.3.18.18,0,0,0-.19-.11h-.83l-.21,0,.06.2s0,.12-.21.24l-.14-.13a6.9,6.9,0,0,1-1.1-1.62l-.18-.35q-.15-.32-.27-.63a.24.24,0,0,0,.14,0,.37.37,0,0,0,.27-.31.48.48,0,0,0-.17-.41.36.36,0,0,0-.18-.11,1.48,1.48,0,0,1-.42-.19s0,0-.05,0a23,23,0,0,1-.76-2.84c-.16-.74-.28-1.48-.38-2.2l.12,0c.26-.08.66-.2,1.22-.39a10.72,10.72,0,0,0,2.1-1c.41-.26.83-.56,1.28-.91l.74-.6c.31-.25.48-.46.79-.72a6.55,6.55,0,0,1,.56-.6l0,0A7.67,7.67,0,0,1,56,55c-.4,0-.82.08-1.16.09l-.82,0a9.68,9.68,0,0,1-1.4-.1,5.38,5.38,0,0,1-1.85-.65,3.29,3.29,0,0,1-.67-.53c0-.29.08-.58.13-.86a15.28,15.28,0,0,1,.42-1.65,4.78,4.78,0,0,0,.81.2,6.94,6.94,0,0,0,2-.08l.62-.09.81-.14.89-.16.48-.09c.12,0,0,0,0-.06s-.14,0-.15,0-.17-.1-.17-.11l-.17-.07,1.7-.25h0a15.19,15.19,0,0,0,1.8-1.48c.45-.37.91-.73,1.27-1l.45-.3a16.2,16.2,0,0,0,3.42,1,9.28,9.28,0,0,0,2,0v0a1,1,0,0,0,.19.14,3.7,3.7,0,0,0,.44.28,1.84,1.84,0,0,0,.47.15,2.79,2.79,0,0,0,1.18,0,6.28,6.28,0,0,0,.66-.23s.07.17.12.33a.27.27,0,0,1,.08.19h0v0a1.16,1.16,0,0,1-.18.51,1.92,1.92,0,0,1-.18.29,2.28,2.28,0,0,1-1.25.69l-.51.09-.61.1a4.7,4.7,0,0,0-.71.14l-.16,0-.09,0s0,.06,0,.08a1.84,1.84,0,0,0,.15.35,2.3,2.3,0,0,0,.52.6,3.18,3.18,0,0,0,.58.35,3.49,3.49,0,0,0,1.12.31A6.5,6.5,0,0,0,69.86,53c.37-.07.64-.13.85-.19h0l.31.84c.07.18.13.35.19.52l-.08.1a2.71,2.71,0,0,1-1,.68,3.82,3.82,0,0,1-1.73.24l-1-.09c-.26,0-.59-.08-1-.17s-.83-.23-1.29-.36l.11.14,0,0v0l0,0,.35.32a9.75,9.75,0,0,0,.74.64l.43.32.29.18a5.33,5.33,0,0,0,.56.32,5.15,5.15,0,0,0,2.26.61A5.47,5.47,0,0,0,72.25,57Zm-1.92,3.55a3.52,3.52,0,0,0,.29-.4,3.56,3.56,0,0,0-.45-.13l-.27,0c-.16,0-.32,0-.3.05a2.64,2.64,0,0,0,.26.11l.24.1c.06,0,0,0,.05,0s0,0-.06,0l-.11.12a.56.56,0,0,1-.24.17c-.09,0-.15,0-.16-.1s0-.16,0-.17-.07,0-.1.16a.27.27,0,0,0,0,.23.39.39,0,0,0,.26.11A1,1,0,0,0,70.33,60.54Zm-.14,3s.18-.11,0-.29a1.78,1.78,0,0,0-.74-.06l-.33,0a1.15,1.15,0,0,0-.31,0,3.87,3.87,0,0,0-1,.41,1.55,1.55,0,0,1-.32.14c-.07,0-.12,0-.12,0s-.09,0-.1.12a.63.63,0,0,0,.18.34.9.9,0,0,0,.45.32.84.84,0,0,0,.6-.22,4.68,4.68,0,0,1,.91-.55l.11,0,.18-.06.3-.09A.88.88,0,0,0,70.19,63.49Zm-1.1,3.9c0-.21-.16-.29-.3-.25a1,1,0,0,0-.2,0,3.56,3.56,0,0,0-.62.34c-.28.19-.53.42-.5.45s.31-.12.62-.25a4,4,0,0,1,.41-.17l.19-.06s.07,0,.07,0,0,0,0,0,0,.14,0,.22-.05.18-.07.25-.16.14-.18.17,0,0,.09,0,.16-.05.22-.12a1.74,1.74,0,0,0,.14-.27A2.09,2.09,0,0,0,69.09,67.39Zm-4.54-3.93a.18.18,0,0,0-.06-.23c-.14-.06-.13,0-.15,0H64a3.24,3.24,0,0,0-.67,0,.81.81,0,0,0-.52.46c-.07.17-.08.29-.06.3a2.44,2.44,0,0,0,.94-.07,1.63,1.63,0,0,0,.62-.28l.07,0a.11.11,0,0,0,.06,0S64.51,63.53,64.55,63.46Zm-.92,3.12c0-.13-.12-.24-.23-.28a2.15,2.15,0,0,0-.52-.13l-.36,0a1,1,0,0,0-.78.31,1.22,1.22,0,0,0-.36,1,2.13,2.13,0,0,1,.52-.88.73.73,0,0,1,.59-.17l.35,0a2.92,2.92,0,0,1,.45.08l0,0v0a.5.5,0,0,1-.07.08c-.1.11-.24.24-.33.32-.34.14-.68.19-.68.22a1.18,1.18,0,0,0,.77,0,3.25,3.25,0,0,0,.42-.31l.09-.1A.5.5,0,0,0,63.63,66.58ZM60.11,69.3a.26.26,0,0,0,.07-.24.4.4,0,0,0-.22-.2c-.31-.14-.6,0-.57,0s.07,0,.16,0a.86.86,0,0,1,.28.11s0,.06,0,.06,0,0,0,0a1.49,1.49,0,0,1-.46.07.49.49,0,0,1-.19,0c-.06,0,.05,0,.05.07a.23.23,0,0,1,0,.07s0,0,0,0,0,0,0,0,0,0,0,0l.1,0a1.16,1.16,0,0,0,.4,0l.19,0A.58.58,0,0,0,60.11,69.3ZM57.7,62.89a.24.24,0,0,0,0-.17.2.2,0,0,0-.07-.15.37.37,0,0,0-.16-.1.81.81,0,0,0-.31-.06,2.63,2.63,0,0,0-.77.06c-.26,0-.52.06-.73.08l-.15,0-.06,0s0,.07,0,.08.09.06.09.06,0,0,0-.07h.18a3.66,3.66,0,0,0,.75,0,3.23,3.23,0,0,1,.71,0l.19,0h0s0,0,0,0-.35.38-.54.42a.67.67,0,0,1-.33-.05l-.34-.1A1.21,1.21,0,0,0,55.8,63s.1.09.29.18l.31.15a.91.91,0,0,0,.43.11.83.83,0,0,0,.42-.2l.27-.21A.59.59,0,0,0,57.7,62.89Z"/>
-                <path class="cls-8"
-                      d="M73,2.19l-.42.4a4.62,4.62,0,0,0-.72,1,13.45,13.45,0,0,0-.62,1.26c-.13.34-.28.75-.43,1.18a2.55,2.55,0,0,0-.08.26s0,.07,0,0V6.22l0-.16,0-.32q0-.3-.06-.57a3,3,0,0,0-.1-.5,5.46,5.46,0,0,0-.21-.61,12.39,12.39,0,0,0-.83-1.76c.3,0,.61-.11.92-.15A8.43,8.43,0,0,1,71.8,2a1.48,1.48,0,0,1,.31,0l.41.05A3.64,3.64,0,0,0,73,2.19Z"/>
-                <path class="cls-8"
-                      d="M72.2,56.83a.66.66,0,0,0,0,.15,4.86,4.86,0,0,0-.63,0A10.19,10.19,0,0,1,70,56.92a5.15,5.15,0,0,1-2.09-.67c-.17-.11-.35-.21-.52-.33l-.24-.17-.08-.07a.77.77,0,0,1-.13-.12l0-.05.08,0,.16,0,.19,0a10.19,10.19,0,0,0,1.08.12,4.36,4.36,0,0,0,2-.22,3.23,3.23,0,0,0,1.07-.67Z"/>
-                <path class="cls-10" d="M71.77,45.45s0,0,0,0A.08.08,0,0,1,71.77,45.45Z"/>
-                <g id="_Group_" data-name="&lt;Group&gt;">
-                    <path class="cls-9"
-                          d="M70.82,83.14a1.05,1.05,0,0,0-.31-.28,1.38,1.38,0,0,0-.6-.08c-.16,0-.25,0-.25,0s.09.06.24.09a1.66,1.66,0,0,1,.49.16.82.82,0,0,1,.25.35l-.09.11a1,1,0,0,1-.36.3,2.26,2.26,0,0,1-1.07.11l-2.42,0-1.49-.82L65,82.21h.07l.32-.06h.12c.2,0,.48,0,.84,0a5.7,5.7,0,0,0,1.35,0,9.26,9.26,0,0,0,1.63-.62,7.83,7.83,0,0,1,.86-.38.72.72,0,0,1,.73.28,1.18,1.18,0,0,1,.32.66.89.89,0,0,0-.4-.16,1.53,1.53,0,0,0-.57.08.3.3,0,0,0-.17.09s0,0,0,0,0,0,.08,0a.38.38,0,0,1,.16,0,2.13,2.13,0,0,1,.5,0,.72.72,0,0,1,.43.35l-.09.15-.29.49A.35.35,0,0,0,70.82,83.14Z"/>
-                </g>
-                <path class="cls-8"
-                      d="M69.89,50.61l.47,1.26a4.92,4.92,0,0,1-.67.41,3.93,3.93,0,0,1-1.47.4,2.64,2.64,0,0,1-1.53-.43,1.41,1.41,0,0,1-.36-.37.57.57,0,0,1-.12-.23s0,0,.07,0l.12,0,.48,0,1.08-.1a2.94,2.94,0,0,0,1.93-.82Z"/>
-                <path class="cls-11" d="M69.72,47.3h0v0Z"/>
-                <path class="cls-9"
-                      d="M69.72,48.06v.08c0,.1-.13.22-.13.22l-.26.18a1.66,1.66,0,0,1-.79.36,1.32,1.32,0,0,1-1-.09.9.9,0,0,1-.27-.2.34.34,0,0,1,0-.15h0c.25-.08.49-.17.69-.25a8.55,8.55,0,0,0,1.35-.5c0,.06.07.12.1.13l.06,0,0,0h0A.76.76,0,0,1,69.72,48.06Z"/>
-                <path class="cls-10" d="M69.26,47.67a1.24,1.24,0,0,0,.2-.1s-.07.06-.19.13v0Z"/>
-                <path class="cls-9"
-                      d="M69.39,63.42h0l0,0h0l-.09,0a4.78,4.78,0,0,0-.92.64c-.16.12-.31.24-.45.23a.8.8,0,0,1-.38-.23.78.78,0,0,1-.2-.26.15.15,0,0,1,0-.11s0,0,.13,0a1.25,1.25,0,0,0,.36-.09,5.22,5.22,0,0,1,1-.31h.53Z"/>
-                <path class="cls-8"
-                      d="M69,31.47a13.85,13.85,0,0,1,0,3.23,13.51,13.51,0,0,1-1.65,4.65c-.3.52-.57.92-.76,1.2a3,3,0,0,0-.29.42s-.13.05-.38.1a5.22,5.22,0,0,1-1.12.1A6.93,6.93,0,0,1,63,41a15.08,15.08,0,0,1-2.18-.67c-1.57-.59-3.37-1.41-5.29-2.33-.48-.22-1-.45-1.45-.7l-.7-.38c-.23-.14-.47-.28-.69-.43a24.1,24.1,0,0,1-2.66-2,48.11,48.11,0,0,1-4.69-4.67l-.52-.6L44.58,29l0,0s0,0,0-.05v0l.11-.14c.14-.21.29-.41.43-.61A25.21,25.21,0,0,1,46.86,26a24.3,24.3,0,0,1,3-2.81c.79-.61,1.31-.89,1.36-.94s.44-.27,1.14-.58a16.12,16.12,0,0,1,3.07-1,29.13,29.13,0,0,1,4.62-.59,8.32,8.32,0,0,1,4.87,1.68l0,0a7.92,7.92,0,0,1,2.42,2.63,11,11,0,0,1,1.17,3.44A34.74,34.74,0,0,1,69,31.47Zm-1.4,1.13a3.9,3.9,0,0,0,.18-2,16.49,16.49,0,0,0-.59-2.52A10.8,10.8,0,0,0,66,25.61a5.56,5.56,0,0,0-1.16-1.29,11.65,11.65,0,0,0-1.62-.88,7.72,7.72,0,0,0-1.87-.59,4.76,4.76,0,0,0-2.12.1,6.51,6.51,0,0,0-1.94,1,12.46,12.46,0,0,0-4.25,4.91,10,10,0,0,0-.38,1c-.05.18-.09.36-.13.54s0,.18,0,.29,0,.29,0,.43l.33.27.21.16c.14.1.28.22.43.32l.86.58h0a9.39,9.39,0,0,0,2.61,1.13,23,23,0,0,0,2.54.58,12.77,12.77,0,0,0,4.43.18,7.53,7.53,0,0,0,2.83-1A2.43,2.43,0,0,0,67.56,32.6Z"/>
-                <path class="cls-9"
-                      d="M68.29,70.07c-.17.32-.34.62-.48.87s-.36.64-.37.65-.14.29-.32.69-.45.9-.74,1.38a10.11,10.11,0,0,0-1.16,2c0,.07.15,0,.33-.16a1.48,1.48,0,0,1,0,.27,25.11,25.11,0,0,0-.33,2.81c-.06,1.31-.06,2.23-.08,2.83,0,.32,0,.54,0,.69a.13.13,0,0,1,0,.06v0H65L64.36,79c0-.17-.07-.33-.11-.5l0-.25-.08-.29c0-.29-.06-.57-.08-.84-.05-.62-.1-1.2-.14-1.73-.09-1.07-.15-1.95-.2-2.56,0-.25,0-.46,0-.61l.66-.11a9.59,9.59,0,0,0,2.31-.74A5.08,5.08,0,0,0,68.29,70.07Z"/>
-                <path class="cls-12"
-                      d="M67.54,31.84s0,.75,0,.76a9.45,9.45,0,0,1-.92.58c-.18.1-.39.2-.62.3a5.74,5.74,0,0,0,1-3.41A13.61,13.61,0,0,1,67.54,31.84Z"/>
-                <path class="cls-13"
-                      d="M67.06,30.07a5.74,5.74,0,0,1-1,3.41c-.23.09-.48.18-.76.26l.14-.11a10.05,10.05,0,0,1-2.5.35H62a5.25,5.25,0,0,1-1.9-4.7c.14-2.6,1.6-4.63,3.4-4.74a6.68,6.68,0,0,1,.78.47,4.12,4.12,0,0,1,.85,1l.12.15.24.45.08.15A21.9,21.9,0,0,1,67.06,30.07Z"/>
-                <path class="cls-9"
-                      d="M66.43,48.23h-.06a9.52,9.52,0,0,1-1.93-.13,15.12,15.12,0,0,1-2.81-.9l1.3-.85a15.58,15.58,0,0,0,1.3,1.21,3.65,3.65,0,0,0,1,.49,4,4,0,0,0,1.07.17Z"/>
-                <path class="cls-9"
-                      d="M64.74,41.44l1.6.64a.3.3,0,0,0-.22.11.83.83,0,0,0-.18.34s.07,0,.15.07l-.16.15s0,0,0,0l0,0-.46.79A15.13,15.13,0,0,0,63.2,44l-.09-.75s0,0,0,0a4.16,4.16,0,0,0-1.24-.48l-.62-.16.38-1.42a9.31,9.31,0,0,0,1.26.28A7.51,7.51,0,0,0,64.74,41.44Z"/>
-                <path class="cls-9"
-                      d="M65.33,97.41a3.55,3.55,0,0,1,.13,1.79,5,5,0,0,1-.17.92A6.78,6.78,0,0,1,65,101c-.25.54-.53,1-.77,1.47s-.44.8-.59,1-.1.21-.14.28l-1.4.14c-.6,0-1.21.1-1.81.13l-.32,0h-.3l-.19,0-.9-.14c-1.61-.25-3.22-.45-4.78-.74,0,0,0,0,0,0,.14-.2.37-.47.64-.8a8.93,8.93,0,0,0,1.69-2.72,5.16,5.16,0,0,0,.08-3.17,1.82,1.82,0,0,0-.56-.8l1,.17a18.79,18.79,0,0,0,6.09-.11c.31,0,.63-.11,1-.19a2.52,2.52,0,0,1,.75.57A4.16,4.16,0,0,1,65.33,97.41Z"/>
-                <path class="cls-13"
-                      d="M65.4,33.63l-.14.11-.34.1h0a15.44,15.44,0,0,1-2,.14A10.05,10.05,0,0,0,65.4,33.63Z"/>
-                <path class="cls-13" d="M65.26,33.74l-.06,0-.28.05Z"/>
-                <path class="cls-11" d="M64.81,7.55v0l-.29,0v0Z"/>
-                <path class="cls-9"
-                      d="M64.39,63.38s0,0,0,0a.49.49,0,0,0,0,.11h0l-.28,0a.53.53,0,0,0,.14-.12l.13-.07s0,0,0,0A.21.21,0,0,0,64.39,63.38Z"/>
-                <path class="cls-13"
-                      d="M64.91,33.84a6.6,6.6,0,0,1-.84.16H64a.29.29,0,0,0-.24,0h-.05l-.5,0-.55,0a3.85,3.85,0,0,1-.48,0L62,34h.86A15.44,15.44,0,0,0,64.91,33.84Z"/>
-                <path class="cls-8" d="M64.21,2.78c.09.73.19,1.81.26,3.32A13.48,13.48,0,0,0,63,2.73Z"/>
-                <path class="cls-13" d="M64.07,34l-.14,0h-.16A.29.29,0,0,1,64,34Z"/>
-                <path class="cls-9"
-                      d="M64,63.47a1,1,0,0,1-.36.2c-.35.12-.73.21-.84.26.07-.09.25-.46.6-.5A3.94,3.94,0,0,1,64,63.47Z"/>
-                <path class="cls-9"
-                      d="M63.11,43.2l.09.75c-.25,0-.49.1-.74.16l-1,.27c-.47-.39-.81-.64-.86-.58a6.65,6.65,0,0,0,.58.66l-.8.25c-.58.19-1,.36-1,.37a8.64,8.64,0,0,0-1,.5l-.41.28c-1.2-.39-2.46-.76-3.71-1.11-.23-.07-.49-.13-.67-.2L53,44.27l-1.32-.59-.15-.07c.7-.19,1.36-.35,1.9-.47.78-.17,1.32-.22,1.35-.23s.56-.1,1.36-.19A20.23,20.23,0,0,1,59,42.65a23,23,0,0,1,2.86.31C62.52,43.08,63,43.2,63.11,43.2Z"/>
-                <path class="cls-12"
-                      d="M62.88,24.22l.66.32c-1.8.11-3.26,2.14-3.4,4.74A5.25,5.25,0,0,0,62,34l.15.1a15.7,15.7,0,0,1-2.66-.35,25,25,0,0,1-2.47-.64A9.23,9.23,0,0,1,54.65,32l0,0-.84-.59-.41-.32-.28-.22v-.09l0-.24c0-.16.08-.32.13-.48a6.91,6.91,0,0,1,.37-.95,10.46,10.46,0,0,1,2.48-3.28,8.38,8.38,0,0,1,3.31-2.09A4.94,4.94,0,0,1,62.88,24.22Z"/>
-                <path class="cls-11" d="M62.78,64s0,0,0,0S62.79,64,62.78,64Z"/>
-                <path class="cls-9"
-                      d="M61.86,72.35c.19,0,.38,0,.57,0l-.21,1.34c-.15,1.07-.36,2.5-.58,3.94l0,.26v.07h0s0,0,0,0l0,.09-.21.5c-.14.34-.26.66-.39,1l-.69,1.76c-.2.52-.37,1-.48,1.27,0,.08-.06.15-.08.22v0l0,.07s0,0,0,0l0,0c0,.09,0,.13,0,.14l-.51,1.63c-.33.27-.71.6-1.12.93l-1.39,1.19-.18.16-.09.07,0,0h0a2.8,2.8,0,0,1-.14-.25A.6.6,0,0,1,56,86.6a.36.36,0,0,1,0-.12.61.61,0,0,1,.19-.38,3.53,3.53,0,0,1,.28-.37c-.09-.21-.89.56-.79.71a.82.82,0,0,0,.21.57l.11.12L55.13,87l-.45-.07-.19,0a.76.76,0,0,1,0-.15.77.77,0,0,1,.08-.29c0-.08.06-.12.06-.13a2,2,0,0,1,.23-.4c.14-.19.35-.32.33-.36s-.28,0-.49.19a1.33,1.33,0,0,0-.26.28.84.84,0,0,0-.1.15,1,1,0,0,0-.08.53L54,86.34v-.21a2.45,2.45,0,0,1,0-.27,3.12,3.12,0,0,1,.1-.48,1.14,1.14,0,0,1,.45-.64,1,1,0,0,1,.7-.18c.08.16,2-.6,2-.62A12.54,12.54,0,0,0,59,82.79h0a9.25,9.25,0,0,0,.26-3,24.51,24.51,0,0,0-.13-3.16s-.1-.45-.29-1-.47-1.27-.76-2-.66-1.46-.93-2a9.7,9.7,0,0,0,2.18.62A14.62,14.62,0,0,0,61.86,72.35Z"/>
-                <path class="cls-9"
-                      d="M61.55,44.91l1,1.08-1.14.62-.53.3-1.12-.44-1.06-.37c.5-.26.87-.41.9-.42s.38-.18.93-.4Z"/>
-                <path class="cls-9"
-                      d="M60.21,47.39l-.09.07a13.14,13.14,0,0,0-1.21,1.12,8.94,8.94,0,0,0-1.49,1.81l-1.7.25a3.84,3.84,0,0,1-.8-.43,2.34,2.34,0,0,1-.38-.28c-.09-.07-.16-.16-.24-.23a3.46,3.46,0,0,1-.42-.57l.33-.19a20.84,20.84,0,0,0,2.69-1.65l1-.64c.58.17,1.14.34,1.69.52Z"/>
-                <path class="cls-11" d="M59.23,69.29s.08.12,0,0Z"/>
-                <path class="cls-8"
-                      d="M58.47,6.77c0,.08.11.28,0,.12s-.28-.28-.58-.53l-.15-.13L57.39,6l-.45-.34L56.06,5a13.29,13.29,0,0,0-1.62-1A20.13,20.13,0,0,0,52.38,3a14.93,14.93,0,0,1,3.11-.49c.41,0,.81,0,1.2,0,.19.34.39.77.61,1.28.31.7.73,1.82,1,2.46,0,0,.06.15.12.31Z"/>
-                <path class="cls-9"
-                      d="M57.2,46.47l-.57.44a17.91,17.91,0,0,0-2.42,2l-.33.19a3.84,3.84,0,0,1-.23-.45,11,11,0,0,1-.55-1.74c-.07-.3-.12-.54-.18-.75.18-.35.3-.6.37-.74h0c.27.09.49.14.74.2C55.11,45.92,56.17,46.18,57.2,46.47Z"/>
-                <path class="cls-10" d="M56.76,71.5l0,.07,0-.1A.09.09,0,0,0,56.76,71.5Z"/>
-                <path class="cls-8"
-                      d="M56.37,55.13l0,0-.55.45a17.59,17.59,0,0,1-2.47,1.68,7,7,0,0,1-2.05.64,9.74,9.74,0,0,1-1.23.12H50q-.06-.6-.09-1.17a14.88,14.88,0,0,1,0-2l.51.21a7.34,7.34,0,0,0,2.14.42,11.87,11.87,0,0,0,1.45,0l.82-.06.63-.07.55-.14Z"/>
-                <path class="cls-10" d="M56.29,1.68l0,.05s0,0,0,0Z"/>
-                <path class="cls-8"
-                      d="M56,96.53a5.24,5.24,0,0,1-.28,2.94A8.63,8.63,0,0,1,54,101.94a12,12,0,0,0-.9,1.1c-.53-.11-1.06-.23-1.57-.37a13.43,13.43,0,0,1-3.16-1.31c-.18-.09-.35-.19-.52-.29l.68-.25a10.08,10.08,0,0,0,2.88-1.66,3.85,3.85,0,0,0,1-1.49,4.18,4.18,0,0,0,.25-1.53,3.81,3.81,0,0,0-.22-1.39l.43.13,1.59.46.9.26A1.69,1.69,0,0,1,56,96.53Z"/>
-                <path class="cls-9"
-                      d="M55.61,70.91c0,.08-.08.18-.13.3a13.28,13.28,0,0,1-.83,1.59,24.19,24.19,0,0,1-1.51,2.14c-.6.78-1.23,1.57-1.94,2.33-.89,1-1.81,2-2.56,2.9a5.43,5.43,0,0,1-.79.09A7.9,7.9,0,0,1,45.54,80a3.24,3.24,0,0,1-1.08-.5,2.52,2.52,0,0,1-.68-.76,2.58,2.58,0,0,1-.34-1c.59-.73,1.17-1.41,1.72-2a3,3,0,0,0,.88.8,2.43,2.43,0,0,0,1.19.35c.36,0,.59-.17.54-.26s-.2-.1-.43-.24a3.75,3.75,0,0,1-.74-.58,2.57,2.57,0,0,1-.44-.75l-.09-.31.23-.24c.29-.31.57-.6.85-.86a3.46,3.46,0,0,0,.85.86c.89.61,1.9.71,1.94.55s-.79-.61-1.33-1.25a2.72,2.72,0,0,1-.53-.93l0-.1.72-.68.42-.4a1.7,1.7,0,0,0,.62.75,1.87,1.87,0,0,0,.39.23l.38.17a4.64,4.64,0,0,0,.69.23c.42.1.73.06.74,0s-.22-.2-.54-.43c-.16-.11-.34-.25-.52-.4l-.3-.23a3,3,0,0,1-.25-.24.75.75,0,0,1-.13-.82,2,2,0,0,1,.16-.3l0-.07h0a.05.05,0,0,1,0,0l.65-.61,0,0v0l0,.12a1.73,1.73,0,0,0,.29.31,4.06,4.06,0,0,0,.57.35c.43.22,1,.29,1,.1s-.19-.47-.4-.81l-.28-.46a.48.48,0,0,1,0-.13.66.66,0,0,1-.24-.45s0-.08,0-.12a2.77,2.77,0,0,0,.31-.53l.19.21a17.72,17.72,0,0,0,2,1.68C54.88,70.45,55.24,70.69,55.61,70.91Z"/>
-                <path class="cls-8"
-                      d="M55.33,50.73s.15,0,.05,0l-.29,0-.55.08-.51,0-.6,0a4.77,4.77,0,0,1-1.8-.19,3,3,0,0,1-.72-.4c.08-.22.17-.42.25-.62.41-.88.85-1.72,1.17-2.38l.08-.18s0,0,0,0c.22.44.46,1,.85,1.69a4.45,4.45,0,0,0,.81,1,3.11,3.11,0,0,0,.28.23l.21.16a3.66,3.66,0,0,0,.52.28l.09,0Z"/>
-                <path class="cls-9"
-                      d="M54.48,67.85a1.35,1.35,0,0,1-.2.91l0,0c-.23-.2-.46-.4-.67-.61a.71.71,0,0,0,.27-.33C54,67.86,54.31,67.86,54.48,67.85Z"/>
-                <path class="cls-10" d="M52.43,94.75h-.06s0-.06,0-.06S52.4,94.71,52.43,94.75Z"/>
-                <path class="cls-9"
-                      d="M52.37,94.74a9.38,9.38,0,0,1,0,1.39,3.65,3.65,0,0,1-1.34,2.67,9.58,9.58,0,0,1-2.79,1.45c-.41.15-.76.26-1,.33l-.16,0h0l-.22-.15-.35-.24c-.18-.13-.42-.3-.62-.47-.43-.33-.9-.78-1.34-1.17,0,.53,0,1,0,1.56l-.8-1.7-.4-.84-.56.74-.6.77-.08.1s0,.06,0,0v-.06l-.06-.3L41.62,97c-.06-.31-.13-.61-.2-.92l-.1-.47a3,3,0,0,0-.16-.56c-.08-.17-.27-.8-.48-1.5.22,0,.49.08.78.11a6.4,6.4,0,0,0,1.57,0,5.69,5.69,0,0,0,1.68-.54A3,3,0,0,0,46,92.25a3.87,3.87,0,0,0,.58-.93c.08-.24.16-.46.23-.66.14-.39.25-.72.32-1,.17.33.29.52.29.54s.22.33.53.77a18.44,18.44,0,0,0,1.22,1.54,7.72,7.72,0,0,0,1.46,1.31,2.27,2.27,0,0,0,.79.37l.19.23h0a1.22,1.22,0,0,0,.32.12Z"/>
-                <path class="cls-11" d="M51.65,65.2a0,0,0,0,0,0,0h0S51.64,65.21,51.65,65.2Z"/>
-                <path class="cls-11" d="M49.92,2.18h0Z"/>
-                <path class="cls-10" d="M49.82,59.63l0,0h0Z"/>
-                <path class="cls-10" d="M49.79,59.65v0l0,0h0Z"/>
-                <path class="cls-10" d="M49.78,59.66h0l-.12,0Z"/>
-                <path class="cls-9"
-                      d="M49.62,50.31a15.8,15.8,0,0,0-.54,1.93h0l-1,.65-.27.18c-.18.13-.42.25-.48.45a1,1,0,0,0,.06.68c.06.14.08.17.12.25l.12.2a8.57,8.57,0,0,0,.52.76l.29.39.16.19.07.08h0a.88.88,0,0,0,0,.16c0,.22,0,.46,0,.7,0,.63.1,1.27.19,1.91h0a.47.47,0,0,0-.12-.23,1.81,1.81,0,0,0-.24-.24h0a.09.09,0,0,0,0-.06.19.19,0,0,0,0-.09,1.13,1.13,0,0,0,0-.18c0-.12,0-.26,0-.41a4.3,4.3,0,0,0-.1-1,3.19,3.19,0,0,0-.53-1.12c-.51-.68-1.18-1.14-1.43-1.53a2.61,2.61,0,0,1-.27-.52,1.23,1.23,0,0,1-.06-.21s0,0,0-.06l.07-.08.11-.11.25-.24.6-.56c.45-.39.94-.8,1.42-1.18C49,50.76,49.35,50.51,49.62,50.31Z"/>
-                <path class="cls-10" d="M49.14,60l.14,0-.14.08h0Z"/>
-                <path class="cls-10" d="M49.14,60v0a.08.08,0,0,1,0,.07c0-.11,0-.21,0-.31a.45.45,0,0,0,0,.17h0Z"/>
-                <path class="cls-9"
-                      d="M49.09,59.8c0,.1,0,.2,0,.31v0c0,.12-.38.24-.71.24a7.76,7.76,0,0,1-1.08,0,4.52,4.52,0,0,1-1-.2,1.07,1.07,0,0,1-.64-.48.59.59,0,0,1,0-.35,4.29,4.29,0,0,1,.13-.44,8.29,8.29,0,0,1,.32-.82,1.08,1.08,0,0,1,.21-.29l.26-.25.18-.19c.06-.05.15-.13.22-.08s.08.27.15.39.11.27.07.34l-.1.11,0,0a1.08,1.08,0,0,0-.54.38.41.41,0,0,0,0,.34.62.62,0,0,0,.12.2,1,1,0,0,0,.13.14s.11,0,.15-.09.08-.15.06-.17l-.1-.08c0-.07-.1-.14-.07-.21s.2-.17.38-.26a1.52,1.52,0,0,1,.57-.18.85.85,0,0,1,.54.19c.16.12.32.23.44.33s.08.47.12.47a.35.35,0,0,0,.07-.14.35.35,0,0,0,0-.18h0q.06.47.15.93S49.08,59.79,49.09,59.8Z"/>
-                <path class="cls-10"
-                      d="M49,59.21l.07.58q-.09-.47-.15-.93c-.09-.64-.15-1.28-.19-1.91,0-.24,0-.48,0-.7.05.58.11,1.2.17,1.84Z"/>
-                <path class="cls-10" d="M48.49,58.26s0,0,0,0l-.07-.06h0v0l.05,0s0,0,0,0Z"/>
-                <path class="cls-10" d="M48.47,58.29h0v0s0,0,0,0l0,0v0h0Z"/>
-                <path class="cls-8"
-                      d="M47.86,80.44a5.51,5.51,0,0,0,.69-.14,9.44,9.44,0,0,0-1,1.5,7.28,7.28,0,0,0-.36.76c-.2,0-.52.13-.91.2a6.19,6.19,0,0,1-2.55,0,3.4,3.4,0,0,1-2.05-1.35,2.85,2.85,0,0,1-.37-.66q.21-.39.45-.75c.41-.63.86-1.22,1.3-1.79a3.21,3.21,0,0,0,.34.72,2.69,2.69,0,0,0,.83.86,3.52,3.52,0,0,0,1.23.51A7.09,7.09,0,0,0,47.86,80.44Z"/>
-                <path class="cls-8"
-                      d="M46.92,89.4l.1.19c-.11.24-.25.57-.43,1-.09.2-.17.42-.27.65a2.74,2.74,0,0,1-.39.64,3.62,3.62,0,0,1-1.36.93,5.93,5.93,0,0,1-1.6.46,5.82,5.82,0,0,1-1.46,0,8.75,8.75,0,0,1-1-.17c-.25-.82-.49-1.62-.57-1.81l-.13-.34h0a11.84,11.84,0,0,1-.41-2.9c0-.27,0-.55,0-.83a2.08,2.08,0,0,0,.41.35,4.1,4.1,0,0,0,2.8.74,14.86,14.86,0,0,0,2.79-.51,3.91,3.91,0,0,0,1-.4.28.28,0,0,0,0,.09A6.53,6.53,0,0,0,46.92,89.4Z"/>
-                <path class="cls-9"
-                      d="M46.77,84.35v.3a5.07,5.07,0,0,0-.37,2.64,1.56,1.56,0,0,0-.15.06c-.21.07-.51.15-.88.24a20.91,20.91,0,0,1-2.75.35,3.89,3.89,0,0,1-2.53-.76,3.19,3.19,0,0,1-.64-.65,5,5,0,0,1,.16-1,27.15,27.15,0,0,1,.87-3c.18-.43.37-.84.58-1.24a2.41,2.41,0,0,0,.28.43,3.68,3.68,0,0,0,2.33,1.42,6.18,6.18,0,0,0,2.67-.18,6.1,6.1,0,0,0,.81-.28A3.61,3.61,0,0,0,46.77,84.35Z"/>
-                <rect class="cls-11" x="46.74" y="72.88" width="0.01" height="0.01"/>
-                <path class="cls-11" d="M45.82,6.58h0c-.19.17-.37.36-.56.54C45.44,6.94,45.62,6.75,45.82,6.58Z"/>
-                <path class="cls-11" d="M41.07,80.26h0l-.13.28.13-.28Z"/>
-                <path class="cls-11" d="M40.93,80.57c0,.08-.06.16-.1.25h0Z"/>
-                <circle class="cls-9" cx="74.66" cy="26.13" r="0.81"/>
-                <circle class="cls-9" cx="62.2" cy="27.25" r="0.91"/>
-                <circle class="cls-9" cx="62.76" cy="28.68" r="0.18"/>
-                <circle class="cls-9" cx="73.86" cy="27.51" r="0.19"/>
-                <path class="cls-7"
-                      d="M70.82,83.14c-.06.09-.13.18-.18.27a.84.84,0,0,0-.26-.35,1.51,1.51,0,0,0-.48-.16c-.15,0-.25-.07-.25-.09s.1,0,.26,0a1.38,1.38,0,0,1,.6.08A1.05,1.05,0,0,1,70.82,83.14Z"/>
-                <g class="cls-15">
-                    <path class="cls-16"
-                          d="M62,78.53c-.61,0-1.23-.08-1.85-.1-.18,4.39-4.9,5.19-6,9C59.4,89.88,62.24,83.56,62,78.53Z"/>
-                </g>
-                <path class="cls-17" d="M64.57,78.76l-.2,0,.09.42C64.5,79,64.54,78.89,64.57,78.76Z"/>
-                <g class="cls-15">
-                    <path class="cls-16"
-                          d="M64.7,84.59c1.51.89,3.08.4,5.35-.19C67.22,83,65.16,82,64.46,79.16,63.88,81.24,63.73,83.12,64.7,84.59Z"/>
-                </g>
-                <path class="cls-18"
-                      d="M70.3,93.27A35.84,35.84,0,0,1,64,95.46a3,3,0,0,1,.66.44,5.22,5.22,0,0,1,.63.68A36.81,36.81,0,0,0,77.4,89.76C74.92,91,72.56,92.27,70.3,93.27Z"/>
-                <path class="cls-8"
-                      d="M81.74,95.5a17.57,17.57,0,0,1,5.85-2.33c-1.17,0-2.34-.59-1.76-1.76a17.83,17.83,0,0,1,4.27-3L89.83,88a5.17,5.17,0,0,0-.42-.51,4.33,4.33,0,0,0-1-.81A4.17,4.17,0,0,0,86,86.22a8.86,8.86,0,0,0-2.52.62c-.8.31-1.58.72-2.37,1.09s-1.53.76-2.29,1.13l-1.37.7a36.81,36.81,0,0,1-12.16,6.82,3.29,3.29,0,0,1,.43.68,3.85,3.85,0,0,1,.25,2,5.19,5.19,0,0,1-.46,1.93c-.24.58-.51,1.1-.73,1.55s-.37.7-.5,1l1.45-.19c.87-.13,1.73-.29,2.59-.47,4.9-2.2,9.71-4.79,14.64-6.35C81.74,96.67,81.15,96.09,81.74,95.5Z"/>
-                <path class="cls-19"
-                      d="M90.12,88.42a17.83,17.83,0,0,0-4.27,3c-.58,1.17.58,1.76,1.75,1.76a17.39,17.39,0,0,0-5.84,2.33c-.59.59,0,1.17,1.17,1.17C78,98.22,73.19,100.81,68.29,103l1-.21a18.09,18.09,0,0,0,3.4-1.13h0l3.17-1.25c1.09-.21,2-.36,3-.58a14.28,14.28,0,0,0,1.42-.4L81,99.2l.69-.28a15.82,15.82,0,0,0,4.84-3.18A12.22,12.22,0,0,0,89.58,91,10.61,10.61,0,0,0,90,89.71c.06-.22.08-.45.12-.68l0-.34a1,1,0,0,0,0-.21Z"/>
-                <path class="cls-19"
-                      d="M67.64,103.22l.62-.28c1.39-.63,2.81-1.3,4.17-1.94a88.63,88.63,0,0,1,10.1-4.29,1.23,1.23,0,0,1-1-.56.66.66,0,0,1,.22-.71,16.8,16.8,0,0,1,5.43-2.24,1.92,1.92,0,0,1-1.38-.72,1.13,1.13,0,0,1,0-1.11l0,0a18.14,18.14,0,0,1,4.29-3l.06,0,.09.15s0,.08,0,.11a1,1,0,0,0,0,.12l0,.34a2,2,0,0,0,0,.24,3.54,3.54,0,0,1-.08.45l-.1.37a6.74,6.74,0,0,1-.29,1,12.26,12.26,0,0,1-3.09,4.72A15.7,15.7,0,0,1,81.7,99l-.69.28-.7.24c-.33.12-.69.21-1,.3l-.39.1c-.69.16-1.36.28-2.07.4l-.95.18-.83.33-2.32.92h0a17.78,17.78,0,0,1-3.42,1.14l-.7.15ZM85.91,91.44a1,1,0,0,0,0,1,2,2,0,0,0,1.71.67h.6l-.58.15a17.44,17.44,0,0,0-5.82,2.32.52.52,0,0,0-.17.54c.13.3.63.5,1.3.5h.47l-.45.14a84.44,84.44,0,0,0-10.46,4.4c-1.17.55-2.37,1.12-3.57,1.67l.33-.07a17.86,17.86,0,0,0,3.38-1.13l0,0h0l2.31-.91.84-.33,1-.18c.7-.13,1.37-.25,2-.4l.39-.1c.34-.09.69-.18,1-.3l.7-.23.68-.28a15.79,15.79,0,0,0,4.82-3.16A12.17,12.17,0,0,0,89.51,91a6.89,6.89,0,0,0,.29-1c0-.13.06-.26.1-.38a3,3,0,0,0,.08-.43L90,89l.06-.34c0-.06,0-.09,0-.12a.08.08,0,0,0,0,0A18.18,18.18,0,0,0,85.91,91.44Z"/>
-                <path class="cls-20"
-                      d="M40.06,11.88s.15-.19.38-.43a9,9,0,0,1,.82-.75c-.08,0-.12,0-.13,0a1.43,1.43,0,0,0-.1-.16,1.31,1.31,0,0,0-.4-.32A3.36,3.36,0,0,0,38.72,10l-.47,0a7.66,7.66,0,0,1,1.18,3,6.75,6.75,0,0,1,.33-.66Z"/>
-                <path class="cls-9" d="M70.37,46.87a2.7,2.7,0,0,1-.53.46l.21,0,.14,0c.07-.19.14-.38.22-.57Z"/>
-                <path class="cls-9" d="M82.08,32.15a1.16,1.16,0,0,1-.06.15l.23.05Z"/>
-                <path class="cls-21"
-                      d="M71.44,47.34a3.37,3.37,0,0,0,1.28-.58,4.89,4.89,0,0,1,.52-.42v-.06a3,3,0,0,1-1,.07c-.43-.05-.7-.15-.7-.2s.3,0,.7,0a2.76,2.76,0,0,0,1.36-.44,7.27,7.27,0,0,0,1.09-1c.27-.31.41-.54.43-.55s.07-.1.18-.27c-.5.07-.93.16-.95.09s.54-.4,1.18-.58h0a3.1,3.1,0,0,0,.15-.46c-.23.06-.36.09-.37.06s.14-.14.41-.28a2.18,2.18,0,0,0,0-.51c0-.12,0-.25,0-.37-.65.16-1.15.31-1.17.23a4,4,0,0,1,1.12-.58c0-.29-.1-.55-.16-.77a1.23,1.23,0,0,0-.17-.42c-.07-.08-.14-.1-.14-.13s.08-.05.22,0a1.1,1.1,0,0,1,.33.45h0a12.63,12.63,0,0,1,1.39-.88,7.12,7.12,0,0,0,1.32-1,8.35,8.35,0,0,0,1.16-1.48c.71-1.09,1.26-2.25,1.78-3.18A5.54,5.54,0,0,1,82.22,33l.31-.27h0s0,0-.08-.11l-.21-.26L82,32.3l0,.09A15.16,15.16,0,0,1,79.46,35c-.75.66-1.64,1.4-2.62,2.17-.49.39-1,.78-1.53,1.17l-.42.29a2.76,2.76,0,0,1-.3.15,1.42,1.42,0,0,1-.32.07.6.6,0,0,1-.68-.32l-.15-.28-.12-.23A15.86,15.86,0,0,1,72,30.71c.05-2,.2-3.43.21-3.51a32.86,32.86,0,0,1,.55-3.49c.1-.49.23-1,.4-1.58C70.34,28.44,70.66,35.59,72.5,42A4,4,0,0,1,73,42a1.34,1.34,0,0,1,.56.22,1.73,1.73,0,0,1,.41.4,1.19,1.19,0,0,1,.24.55.69.69,0,0,1-.22.62c-.32.22-.44.26-.54.74a.57.57,0,0,1-.23.3.51.51,0,0,1-.16.09s-.09,0-.12,0v0L73,45A0,0,0,0,1,73,45h0s0,0,0,0-.21.24-.42.45a.76.76,0,0,1-.55.18.47.47,0,0,1-.24-.08h0a3.42,3.42,0,0,1-.69.28h0c0,.1-.18.13-.22.23.1-.12.06-.07.09,0a1.07,1.07,0,0,1-.1.24,2,2,0,0,1-.33.47c-.09.19-.46.4-.61.58A4.65,4.65,0,0,0,71.44,47.34Zm3-4.56s.08,0,.14.08.06-.07.21-.14.09,0,.12,0a.17.17,0,0,1,0,.12.77.77,0,0,1,0,.38c-.06.14-.15.22-.27.2a.33.33,0,0,1-.23-.23A.37.37,0,0,1,74.45,42.78Zm-.29-1a.48.48,0,0,1-.4.09.19.19,0,0,1-.13-.24.56.56,0,0,1,.13-.24l.06-.08s.08,0,.14.1.08-.07.25-.12a.13.13,0,0,1,.13,0,.17.17,0,0,1,0,.12A.5.5,0,0,1,74.16,41.76Z"/>
-                <path class="cls-9"
-                      d="M74,2.39l-.38.2a6.43,6.43,0,0,0-.73.48,3.69,3.69,0,0,0-.72.78,8.45,8.45,0,0,0-.67,1.2,15.41,15.41,0,0,0-.75,2l-.15.49s0,0,0,0l0-.13,0-.25-.06-.49c-.05-.32-.09-.64-.13-.94a5.8,5.8,0,0,0-.21-.89c-.07-.19-.16-.38-.24-.55a6.8,6.8,0,0,0-1-1.53l-.28-.29-.19,0c-1,1.2-2.84,1.58-3.51,2.75q0,1,0,2.28v0l-.29,0v0c0-.07,0-.24-.08-.43a8.67,8.67,0,0,0-2.17-4.3l-.17-.15-.57,0-.9-.08-.14,0a5.47,5.47,0,0,0-1.92,3.28q.13.44.27.9a1.11,1.11,0,0,0,0,.3,2.46,2.46,0,0,0,0,.26c0,.08.07.27,0,.11a2.52,2.52,0,0,0-.74-.52l-.25-.23c-.2-.17-.39-.32-.58-.46l-.45-.34c-.3-.22-.59-.41-.86-.6a10.61,10.61,0,0,0-1.59-.91,11.74,11.74,0,0,0-2.58-.83l-.54-.1-.51.22c-.52.23-1,.48-1.49.74A20.75,20.75,0,0,0,46.73,6l-.24.18a.9.9,0,0,0-.21.08,3.63,3.63,0,0,0-.46.34h0c-.19.17-.37.36-.56.54s-.11.12-.17.19a3.83,3.83,0,0,1-.28.29l-.22.23-1-.26c-.81-.2-2-.48-3.32-.72a13.41,13.41,0,0,0-2.07-.24c-.74,0-1.59.1-2.45.2s-1.75.24-2.64.4l-.66.13-.54.13h-.06c1.47,3.3,2.26,6.86,6,7.93a7.55,7.55,0,0,0-1.07,3.35c.74.92,1.17,1.5,1.08,1.59s-.47-.23-1.14-.8v.07a8.06,8.06,0,0,1,0,1.47v0c-.33,3-1.87,6.18,2.33,6.6-.58,1.17-2.33,1.76-2.33,2.92.58,1.17,2.33,1.17,4.09,1.17a15.68,15.68,0,0,1-3.51,2.93c2,.85,3.44,2.55,4.94,4.13l.59.38c.51.31,1.1.64,1.75,1,1.3.7,2.84,1.47,4.49,2.27l1.73.82h0c.88-.31,1.74-.56,2.44-.75a13.73,13.73,0,0,1,1.39-.29,11.45,11.45,0,0,1,1.4-.14,18.9,18.9,0,0,1,3,.06,19.94,19.94,0,0,1,2.27.37l.38-1.42c-.33-.08-.66-.18-1-.29-1.63-.53-3.47-1.3-5.42-2.14-.49-.22-1-.43-1.49-.67L53,37.65l-.74-.43a25.94,25.94,0,0,1-2.8-2,47.56,47.56,0,0,1-4.91-4.66L44,30l-.28-.33-.47-.54c0-.05-.11-.09-.08-.14l.1-.15.2-.29.32-.47.42-.61A24.7,24.7,0,0,1,46,25.19a25.2,25.2,0,0,1,3.12-3,16.69,16.69,0,0,1,1.49-1.06c.07,0,.51-.31,1.3-.65a17.8,17.8,0,0,1,3.33-1A27.83,27.83,0,0,1,60.05,19a9.26,9.26,0,0,1,5.51,2l0,0h0a8.88,8.88,0,0,1,2.61,3,11.8,11.8,0,0,1,1.16,3.75,31.65,31.65,0,0,1,.28,3.67,14.28,14.28,0,0,1-.16,3.36,12.55,12.55,0,0,1-2,4.7c-.7,1-1.25,1.52-1.3,1.47s-.48.39-1.49.47l1.6.64h0a.41.41,0,0,1,.24.1.85.85,0,0,1,.25.37.2.2,0,0,1-.08.24.37.37,0,0,1-.23.05l-.32,0-.29,0-.46.79c.07,0,.11,0,.11,0s-1.5.47-3,1l-.69.23,1.07.94,0,0a9.59,9.59,0,0,1,1.34-.61c.44-.12.74-.09.75,0s-.29.11-.66.29-.68.41-1.08.68c.44.38.87.76,1.21,1a2.87,2.87,0,0,0,.58.27l.26.08a4.51,4.51,0,0,0,.92.2,7.36,7.36,0,0,0,2-.12,3.92,3.92,0,0,0,1.83-.81,4.46,4.46,0,0,0,.49-.49l.12-.31a1.55,1.55,0,0,1-.71,0,.68.68,0,0,1-.31-.18,1.8,1.8,0,0,1-.81.09,1,1,0,0,1-.72-.56,2,2,0,0,1-.19-.79,2,2,0,0,1,.49-1.33,2.37,2.37,0,0,1,.79-.63l.36-.18a4.5,4.5,0,0,1,.69-.2,3,3,0,0,1,.37,0,.83.83,0,0,1,.29,0l.13,0h.11l.17,0,.2-.07.11,0,.16,0a5.15,5.15,0,0,1,.56,0c-1.84-6.36-2.16-13.51.65-19.82,0,0,0,0,0,0A5.41,5.41,0,0,1,73.61,21a7.63,7.63,0,0,0-1.81,4.35A7.63,7.63,0,0,1,73.61,21a5.47,5.47,0,0,1,.41-.65,6.4,6.4,0,0,1,1.47-1.42,5.29,5.29,0,0,1,1.25-.65,8.66,8.66,0,0,0,2.66-2.87C82.67,9.69,78.8,5.69,74,2.39ZM41.63,11a9.63,9.63,0,0,0-.73.85c-.19.24-.3.42-.31.42l-.32.42a6.13,6.13,0,0,0-.58.94,5,5,0,0,0-.23.55,4.8,4.8,0,0,1-2.15,3.57v0a4.8,4.8,0,0,0,2.15-3.57,8.84,8.84,0,0,1-.31,1s-.1-.21-.09-.54a3.59,3.59,0,0,1,.2-1.17c.05-.15.11-.3.17-.44a7.66,7.66,0,0,0-1.18-3,6.88,6.88,0,0,1-2.89-.29c0-.17,1-.32,2.28-.54a9.4,9.4,0,0,0-2.08-1.91,9.4,9.4,0,0,1,2.08,1.91l1-.19a4.34,4.34,0,0,1,2.6.08,2.51,2.51,0,0,1,1.15.93h0c.25-.12.43-.19.45-.15S42.2,10.4,41.63,11ZM66.25,46.1a.62.62,0,0,1-.68-.08.58.58,0,0,1-.07-.61,1.86,1.86,0,0,1,.3-.45s.09,0,.15.06.22-.05.48.13a.58.58,0,0,1,.25.49A.61.61,0,0,1,66.25,46.1Z"/>
-                <path class="cls-9"
-                      d="M68.35,2.52c-.37.07-.75.15-1.13.21a2.92,2.92,0,0,1-.44.06l-.45,0h-.76l-.58,0c-.06.59-.12,1.4-.15,2.46C65.51,4.1,67.39,3.72,68.35,2.52Z"/>
-                <path class="cls-9"
-                      d="M60.48,2.57c-.51,0-1.2-.09-2-.11l-1,0c.12.33.24.71.37,1.13.2.66.42,1.41.68,2.28A5.47,5.47,0,0,1,60.48,2.57Z"/>
-                <path class="cls-21"
-                      d="M37.31,34.71a15.68,15.68,0,0,0,3.51-2.93c-1.76,0-3.51,0-4.09-1.17,0-1.16,1.75-1.75,2.33-2.92-4.93-.49-2-4.73-2.31-8.14l-.41-.36a10,10,0,0,1,0,2.16,15.55,15.55,0,0,1-.63,2.93A11.13,11.13,0,0,1,35,26a5.62,5.62,0,0,1-.51.83c-.09.13-.19.27-.3.4l-.16.2-.15.16a.24.24,0,0,0,0,.36.15.15,0,0,0,.09.06L34,28l.45.17,1.38.52.38.15.19.07.09,0,0,0,0,0-.67.45-2,1.39-.42.28-.14.1-.2.15.32.07,1,.27,3.61,1-1.61.89-.76.44-.28.17-.08,0h0s-.06,0-.05.07l.12.07L37.87,36c1.45.9,2.36,1.5,2.44,1.54s.49.35,1.24.86l.7.49C40.75,37.26,39.31,35.56,37.31,34.71Z"/>
-                <path class="cls-21"
-                      d="M85.19,10.64a4.89,4.89,0,0,1,.22.59c.12.34.17.59.18.6a6.26,6.26,0,0,1,0,.64,6.33,6.33,0,0,1-.18,1.31,5.29,5.29,0,0,1-.56,1.76,9.48,9.48,0,0,1,.1-1.82,7.64,7.64,0,0,0,0-1.22,4.42,4.42,0,0,0-.1-.54s0-.24-.11-.57-.2-.76-.35-1.19c-.23-.71-.51-1.4-.56-1.64C83.55,8,83.09,7.51,82.68,7a.92.92,0,0,0-.07.13l-.5-.72h.11a4.11,4.11,0,0,1-.48-.93,4.11,4.11,0,0,0,.48.93l.33-.08a11.1,11.1,0,0,0,1.32-.49,5.33,5.33,0,0,1,1.27-.38h0l.28-.12c.25-.11.49-.13.5-.07a3.52,3.52,0,0,1,.09.85,4.77,4.77,0,0,1-.32,1.66,13.38,13.38,0,0,1-.94,1.93c0,.1.1.21.16.31s.19.42.27.62c1-.39.84-1.94,1.54-2.62,0-.48,0-.77,0-.8a11.5,11.5,0,0,0,0-1.16c-.05-.63-.18-1.59-.84-1.91a2.89,2.89,0,0,0-1.36-.23,15.37,15.37,0,0,0-1.63.14c-.54.07-1.08.11-1.58.16h-.48l-.46,0c.17.27.3.49.39.65s.22.4.19.43-.17-.08-.38-.27S80,4.6,79.66,4.2c-.3-.08-.72-.23-1.23-.42S77,3.21,76.17,2.92A16.23,16.23,0,0,0,74,2.38h0c4.83,3.3,8.7,7.3,5.43,13a8.66,8.66,0,0,1-2.66,2.87,3.43,3.43,0,0,1,.75-.17,6.82,6.82,0,0,1,3.92.93,7.31,7.31,0,0,1,1.39,1.22,5,5,0,0,1,1,1.34A7.16,7.16,0,0,1,84.2,23c0,.41,0,.75,0,1,0,.11,0,.21,0,.3.09-.43.16-.85.2-1.19s.07-.63.08-.64,0-.27.07-.65.08-.88.1-1.38c0-.76,0-1.53,0-1.84,0,0-.07.05-.09,0a7.62,7.62,0,0,1,.54-1.75,29.25,29.25,0,0,0,1-3.84,25.11,25.11,0,0,0,.48-3.95c0-.42,0-.78,0-1.07C86,8.7,86.19,10.25,85.19,10.64Z"/>
-                <path class="cls-20"
-                      d="M83.92,8.46c.07,0,.38.4.7,1,.06-.43.24-1.16.41-1.87a4.49,4.49,0,0,0,.09-1.42l0-.22A1.71,1.71,0,0,0,84,6.05a2.85,2.85,0,0,0-1.1.74,1.91,1.91,0,0,0-.17.22c.41.5.87,1,1.24,1.55A.16.16,0,0,1,83.92,8.46Z"/>
-                <path class="cls-11" d="M85.26,6.06v0l-.06,0h0v0Z"/>
-                <path class="cls-9"
-                      d="M85.71,27.38c-.28.29-.62.65-1,1.06s-.49.56-.76.85l-.4.46-.66.76-.28-.09c.29-1,.59-2.12.81-2.93C83.53,27.52,85,27.45,85.71,27.38Z"/>
-                <path class="cls-11" d="M84.79,18.53l-.05,0a.79.79,0,0,1,0-.14S84.78,18.47,84.79,18.53Z"/>
-                <path class="cls-9"
-                      d="M84.25,31.42l-.15,0h0l-.28.08-1.11.31-.51.14c.13-.37.29-.94.47-1.56l.28.09,1.2.78Z"/>
-                <path class="cls-10" d="M74,22.34l0,.09h0c.09-.3.19-.59.3-.88A4.89,4.89,0,0,0,74,22.34Z"/>
-                <path class="cls-4"
-                      d="M79.22,18.87a6.68,6.68,0,0,0-1.67-.06,3.61,3.61,0,0,0-1.61.73,5.45,5.45,0,0,0-1.25,1.29,4.81,4.81,0,0,0-.42.72c-.11.29-.21.58-.3.88l.32-.2A3.78,3.78,0,0,1,76,21.8,7.14,7.14,0,0,1,79.22,18.87Z"/>
-                <path class="cls-10"
-                      d="M84.15,24.71c0-.16-.07-.39-.11-.7s-.08-.63-.13-1a10.2,10.2,0,0,0-.47-1.21,4.69,4.69,0,0,0-1-1.17,6.62,6.62,0,0,0-1.33-1.08,5.54,5.54,0,0,0-1.91-.65A7.14,7.14,0,0,0,76,21.8a6.12,6.12,0,0,1,.74,0,4.52,4.52,0,0,1,1.65.42,4.19,4.19,0,0,1,1.46,1.21A11.8,11.8,0,0,1,81,25.1a4.53,4.53,0,0,1,.64,2,7.18,7.18,0,0,1-.15,2.11l1.35.11c.23-.59.44-1.28.6-1.85a0,0,0,0,0,0,0,.42.42,0,0,1,0-.06s0,0,0,0a1.8,1.8,0,0,0,0-.19,1.21,1.21,0,0,0,0-.18c0-.1,0-.2.08-.28s0-.07,0-.1a.39.39,0,0,0,0-.13.3.3,0,0,0,0-.11h0v0A14.12,14.12,0,0,1,84.15,24.71Z"/>
-                <path class="cls-4"
-                      d="M74.12,32.52a3.86,3.86,0,0,1-1.09,0,.54.54,0,0,1-.17-.07A14.36,14.36,0,0,0,73,34.1a13.5,13.5,0,0,0,1,3.66l.1.22.08.16c0,.07.07.08.12.07l.15,0,.14-.07.41-.26c.53-.35,1.05-.73,1.55-1.09l.52-.38a14.39,14.39,0,0,1-2.43-3.91Z"/>
-                <path class="cls-10"
-                      d="M81.47,29.23c0,.08,0,.18-.08.27l-.09.16a1.25,1.25,0,0,1-.09.12,4.54,4.54,0,0,1-.38.38,6.71,6.71,0,0,1-.84.59,14,14,0,0,1-3.33,1.35,13.35,13.35,0,0,1-2.06.37A14.39,14.39,0,0,0,77,36.38c.8-.59,1.54-1.15,2.19-1.65s1.42-1.12,1.86-1.48c0,0,.21-.28.56-.71s.46-1.5,1-2.71c.06-.15.13-.32.19-.49Z"/>
-                <path class="cls-12"
-                      d="M79.3,23.34a3.92,3.92,0,0,0-1-.83,4.3,4.3,0,0,0-1.53-.45h-.5c1.59.5,3,2.87,2.93,5a5.92,5.92,0,0,1-1.7,4.14,12.06,12.06,0,0,0,2.08-.86C80.62,28.42,80,25.69,79.3,23.34Z"/>
-                <path class="cls-9"
-                      d="M81.16,27.14a6.79,6.79,0,0,0-1.6-3.48,4,4,0,0,0-.26-.32c.73,2.35,1.32,5.08.23,7l.18-.1a5.84,5.84,0,0,0,.77-.53,2.46,2.46,0,0,0,.33-.31l.07-.08s0,0,0-.06a.65.65,0,0,0,.07-.21A7,7,0,0,0,81.16,27.14Z"/>
-                <path class="cls-12" d="M73.89,22.72l.1,0a.36.36,0,0,0-.11.1S73.89,22.74,73.89,22.72Z"/>
-                <path class="cls-9"
-                      d="M74,31.89a3.21,3.21,0,0,1-.81-.06.4.4,0,0,0-.29.05c0-.39,0-.77,0-1.13a3.25,3.25,0,0,1,0-.33A2.34,2.34,0,0,0,74,31.89Z"/>
-                <path class="cls-9"
-                      d="M73.71,60.12a2.19,2.19,0,0,0-.38-.63.61.61,0,0,0-.36-.23.21.21,0,0,1,0-.13h0c0,.14,0,.3,0,.48s0,.43,0,.67A1.75,1.75,0,0,0,73.71,60.12Z"/>
-                <path class="cls-21"
-                      d="M72.89,60.28c0,.11,0,.21,0,.33a4.88,4.88,0,0,1-.08.61.86.86,0,0,0,.34-.09,2.23,2.23,0,0,0,.42-.3c.14-.12.28-.25.26-.41a1.71,1.71,0,0,0-.09-.3A1.75,1.75,0,0,1,72.89,60.28Z"/>
-                <path class="cls-22"
-                      d="M70.08,44.3a.28.28,0,0,1,.13,0,1.32,1.32,0,0,1,.57,0,.4.4,0,0,1,.29.21.42.42,0,0,1-.08.38,2,2,0,0,1-.13.18l-.12.12a2,2,0,0,1-.28.23l-.33.2.07,0a1.59,1.59,0,0,0,.76,0,3.33,3.33,0,0,0,.78-.22c.1,0,.17-.09.18-.13a.3.3,0,0,0,0-.09s.06,0,.09.08a.16.16,0,0,1,0,.14.58.58,0,0,0,.44-.13c.12-.07.27-.2.39-.27s.09-.06.14,0v0s0,0,0,0a.83.83,0,0,1,.06-.21.36.36,0,0,0,0-.11s0,0,0-.22c0,0,0,0,0,0h0l-.08,0-.14,0c-.08,0-.13,0-.13,0s0,0,.09-.1a.55.55,0,0,1,.38-.14c.1.09,0,.21,0,.31s.06,0,.09,0l.08-.08c-.15-.25,0-1.07-.46-.91a1.35,1.35,0,0,1-.53,0C71.49,43.38,70.27,43.13,70.08,44.3Z"/>
-                <path class="cls-14"
-                      d="M73.59,42.9a1.4,1.4,0,0,0-.32-.28,1.06,1.06,0,0,0-.38-.12,3.17,3.17,0,0,0-.87,0H72l-.11,0-.21.07-.23.08a1.53,1.53,0,0,1-.29,0l-.25-.05h-.06a1.17,1.17,0,0,0-.27.05,3.85,3.85,0,0,0-.58.19,2.5,2.5,0,0,0-.94.59,1.5,1.5,0,0,0-.4.95,1.46,1.46,0,0,0,.1.57.46.46,0,0,0,.35.31,1.69,1.69,0,0,0,1.19-.29,2.2,2.2,0,0,0,.25-.17l.11-.1.07-.06a.2.2,0,0,0,.06-.15c0-.06-.07-.08-.11-.1a1.29,1.29,0,0,0-.41,0,.47.47,0,0,0-.17,0,.81.81,0,0,0,0,.16.81.81,0,0,1,0-.16.35.35,0,0,0-.12.07.84.84,0,0,0-.12.19s-.07.07-.08.06,0,0,0-.08a.54.54,0,0,1,.08-.25.51.51,0,0,1,.25-.17c.22-1.32,1.67-.38,2.45-.83.7-.11.41.56.61.9h0a.38.38,0,0,0,.07-.21v0a.19.19,0,0,1,0-.08.42.42,0,0,1,0-.1.34.34,0,0,1,.07-.11,1.62,1.62,0,0,1,.18-.19l.18-.15C73.85,43.37,73.78,43.12,73.59,42.9Z"/>
-                <path class="cls-21"
-                      d="M73,54a2,2,0,0,1,0,.4c0,.31-.19.81-.25,1.28,0,.21-.06.42-.08.62-.15-.86-.4-1.9-.66-2.93l-.16-.6.11,0a1.84,1.84,0,0,1,.94.61.91.91,0,0,1,.11.44A.79.79,0,0,1,73,54Z"/>
-                <path class="cls-21"
-                      d="M68.24,53.11h-.09A3.49,3.49,0,0,1,67,52.8a3.18,3.18,0,0,1-.58-.35,2.3,2.3,0,0,1-.52-.6,1.84,1.84,0,0,1-.15-.35s0-.07,0-.08l.09,0,.16,0a4.7,4.7,0,0,1,.71-.14l.61-.1.51-.09a2.28,2.28,0,0,0,1.25-.69,1.92,1.92,0,0,0,.18-.29,1.16,1.16,0,0,0,.18-.51v0h0a.27.27,0,0,0-.08-.19c0-.16-.1-.28-.12-.33a6.28,6.28,0,0,1-.66.23,2.79,2.79,0,0,1-1.18,0,1.84,1.84,0,0,1-.47-.15,3.7,3.7,0,0,1-.44-.28,1,1,0,0,1-.19-.14v0a9.28,9.28,0,0,1-2,0,16.2,16.2,0,0,1-3.42-1l-.45.3c-.23.15-.5.36-.78.58C62.11,51.1,65.12,53.17,68.24,53.11Z"/>
-                <path class="cls-9"
-                      d="M67.12,65.69c.22-.36.44-.76.65-1.19a1,1,0,0,1-.33-.27.63.63,0,0,1-.18-.34c0-.12.1-.13.1-.12s0,0,.12,0a1.55,1.55,0,0,0,.32-.14c.13-.07.28-.15.46-.23A9.51,9.51,0,0,0,68.8,57a5.17,5.17,0,0,1-1.08-.43,5.33,5.33,0,0,1-.56-.32l-.29-.18-.43-.32a9.75,9.75,0,0,1-.74-.64l-.35-.32,0,0v0l0,0-.11-.14c.46.13.94.28,1.29.36s.69.13,1,.17l.28,0a4.65,4.65,0,0,0-.55-.53,4.65,4.65,0,0,1,.55.53l.77.07a3.82,3.82,0,0,0,1.73-.24,2.71,2.71,0,0,0,1-.68l.08-.1c-.06-.17-.12-.34-.19-.52l-.31-.84h0c-.21.06-.48.12-.85.19a6.85,6.85,0,0,1-1.62.12c-3.12.06-6.13-2-8.53-4.58l-.49.39a15.19,15.19,0,0,1-1.8,1.48h0l-1.7.25.17.07s.16.09.17.11.12,0,.15,0,.11,0,0,.06l-.48.09-.89.16-.81.14-.62.09a6.94,6.94,0,0,1-2,.08,4.78,4.78,0,0,1-.81-.2,15.28,15.28,0,0,0-.42,1.65c0,.28-.1.57-.13.86a3.29,3.29,0,0,0,.67.53,5.38,5.38,0,0,0,1.85.65,9.68,9.68,0,0,0,1.4.1l.82,0c.34,0,.76-.05,1.16-.09a7.67,7.67,0,0,0,.95-.07l0,0a6.55,6.55,0,0,0-.56.6c-.31.26-.48.47-.79.72l-.74.6c-.45.35-.87.65-1.28.91a10.72,10.72,0,0,1-2.1,1c-.56.19-1,.31-1.22.39l-.12,0c.1.72.22,1.46.38,2.2a23,23,0,0,0,.76,2.84s0,0,.05,0a1.48,1.48,0,0,0,.42.19.36.36,0,0,1,.18.11.48.48,0,0,1,.17.41.37.37,0,0,1-.27.31.24.24,0,0,1-.14,0q.12.32.27.63l.18.35a6.9,6.9,0,0,0,1.1,1.62l.14.13c.18-.12.21-.21.21-.24l-.06-.2.21,0h.83a.18.18,0,0,1,.19.11,1.6,1.6,0,0,1-.26,1.3h0l.61.47a11.74,11.74,0,0,0,2.54,1.47l.15,0C61.86,71.54,64.79,68.61,67.12,65.69Zm-4.29-2a.81.81,0,0,1,.52-.46,3.24,3.24,0,0,1,.67,0h.32s0,0,.15,0a.18.18,0,0,1,.06.23c0,.07-.06.06-.09.08a.11.11,0,0,1-.06,0l-.07,0a1.63,1.63,0,0,1-.62.28,2.44,2.44,0,0,1-.94.07S62.76,63.83,62.83,63.66Zm-1.09,2.78a1,1,0,0,1,.78-.31l.36,0a2.15,2.15,0,0,1,.52.13c.11,0,.24.15.23.28a.5.5,0,0,1-.1.19l-.09.1a3.25,3.25,0,0,1-.42.31,1.18,1.18,0,0,1-.77,0s.34-.08.68-.22c.09-.08.23-.21.33-.32a.5.5,0,0,0,.07-.08v0l0,0a2.92,2.92,0,0,0-.45-.08l-.35,0a.73.73,0,0,0-.59.17,2.13,2.13,0,0,0-.52.88A1.22,1.22,0,0,1,61.74,66.44Zm-2.61,2.71a.42.42,0,0,0,.18,0,1.49,1.49,0,0,0,.46-.07s0,0,0,0,0,0,0-.06a.86.86,0,0,0-.28-.11c-.09,0-.14,0-.16,0s.26-.19.57,0a.4.4,0,0,1,.22.2.26.26,0,0,1-.07.24.58.58,0,0,1-.25.12l-.19,0a1.16,1.16,0,0,1-.4,0l-.1,0s0,0,0,0,0,0,0,0,0,0,0,0a.23.23,0,0,0,0-.07S59.06,69.16,59.13,69.15ZM57.7,62.89a.59.59,0,0,1-.18.14l-.27.21a.83.83,0,0,1-.42.2.91.91,0,0,1-.43-.11l-.31-.15c-.19-.09-.3-.15-.29-.18a1.21,1.21,0,0,1,.33.06l.34.1a.67.67,0,0,0,.33.05c.19,0,.37-.29.54-.42s0,0,0,0h0l-.19,0a3.23,3.23,0,0,0-.71,0,3.66,3.66,0,0,1-.75,0h-.18s0,.07,0,.07,0,0-.09-.06,0-.07,0-.08l.06,0,.15,0c.21,0,.47,0,.73-.08a2.63,2.63,0,0,1,.77-.06.81.81,0,0,1,.31.06.37.37,0,0,1,.16.1.2.2,0,0,1,.07.15A.24.24,0,0,1,57.7,62.89Z"/>
-                <path class="cls-21"
-                      d="M72.25,57a5.47,5.47,0,0,1-2.27.2A5.21,5.21,0,0,1,68.8,57a9.51,9.51,0,0,1-.54,6.37,2.93,2.93,0,0,1,.57-.18,1.15,1.15,0,0,1,.31,0l.33,0a1.78,1.78,0,0,1,.74.06c.16.18,0,.28,0,.29a.88.88,0,0,1-.2.1l-.3.09-.18.06-.11,0a4.68,4.68,0,0,0-.91.55.84.84,0,0,1-.6.22.33.33,0,0,1-.12,0c-.21.43-.43.83-.65,1.19-2.33,2.92-5.26,5.85-9.35,5.26l-.15,0a8.41,8.41,0,0,0,1.82.53,15.88,15.88,0,0,0,2.4.12,16.42,16.42,0,0,0,2.35-.22A5.89,5.89,0,0,0,68,69.45a28.34,28.34,0,0,0,2.4-3.28,15.37,15.37,0,0,0,2.22-5.6c.23-1.45.13-2.3.2-2.3C72.71,58.28,72.54,57.77,72.25,57ZM69,67.76a1.74,1.74,0,0,1-.14.27c0,.07-.15.14-.22.12s-.09,0-.09,0,.13,0,.18-.17,0-.15.07-.25,0-.24,0-.22,0,0,0,0-.08,0-.08,0l-.19.06a4,4,0,0,0-.41.17c-.31.13-.59.29-.62.25s.22-.26.5-.45a3.56,3.56,0,0,1,.62-.34,1,1,0,0,1,.2,0c.14,0,.35,0,.3.25A2.09,2.09,0,0,1,69,67.76Zm1.37-7.22a1,1,0,0,1-.57.29.39.39,0,0,1-.26-.11.27.27,0,0,1,0-.23c0-.12.09-.17.1-.16s0,.08,0,.17.07.11.16.1a.56.56,0,0,0,.24-.17l.11-.12s0,0,.06,0,0,0-.05,0l-.24-.1A2.64,2.64,0,0,1,69.6,60s.14-.07.3-.05l.27,0a3.56,3.56,0,0,1,.45.13A3.52,3.52,0,0,1,70.33,60.54Z"/>
-                <path class="cls-4"
-                      d="M73,2.19l-.42.4a4.62,4.62,0,0,0-.72,1,13.45,13.45,0,0,0-.62,1.26c-.13.34-.28.75-.43,1.18a2.55,2.55,0,0,0-.08.26s0,.07,0,0V6.22l0-.16,0-.32q0-.3-.06-.57a3,3,0,0,0-.1-.5,5.46,5.46,0,0,0-.21-.61,12.39,12.39,0,0,0-.83-1.76c.3,0,.61-.11.92-.15A8.43,8.43,0,0,1,71.8,2a1.48,1.48,0,0,1,.31,0l.41.05A3.64,3.64,0,0,0,73,2.19Z"/>
-                <path class="cls-8"
-                      d="M72.2,56.83a.66.66,0,0,0,0,.15,4.86,4.86,0,0,0-.63,0A10.19,10.19,0,0,1,70,56.92a5.15,5.15,0,0,1-2.09-.67c-.17-.11-.35-.21-.52-.33l-.24-.17-.08-.07a.77.77,0,0,1-.13-.12l0-.05.08,0,.16,0,.19,0a10.19,10.19,0,0,0,1.08.12,4.36,4.36,0,0,0,2-.22,3.23,3.23,0,0,0,1.07-.67Z"/>
-                <path class="cls-21"
-                      d="M70.86,81.84a.88.88,0,0,1,.41.16,1.21,1.21,0,0,0-.23-.53c-.18.11-.35.27-.52.39A1.22,1.22,0,0,1,70.86,81.84Z"/>
-                <path class="cls-9"
-                      d="M70.22,81.06a7.83,7.83,0,0,0-.86.38,9.05,9.05,0,0,1-1.64.62,5.61,5.61,0,0,1-1.34,0c-.36,0-.64,0-.84,0h-.12l-.32.06H65q.11.44.18.87l.09,0a16.47,16.47,0,0,0,5.1.56,1.33,1.33,0,0,0,.16-.17l.09-.11a.84.84,0,0,0-.26-.35,1.51,1.51,0,0,0-.48-.16c-.15,0-.25-.07-.25-.09s0,0,.06,0a.6.6,0,0,1-.25-.15.6.6,0,0,0,.25.15h.2a1.92,1.92,0,0,1,.33,0,3.09,3.09,0,0,1,.85-.1l.07-.12.08-.15a.69.69,0,0,0-.42-.35,1.72,1.72,0,0,0-.5,0,.38.38,0,0,0-.16,0s-.07,0-.08,0h0l0,0a.27.27,0,0,1,.17-.09l.22-.06c.17-.12.34-.28.52-.39a.81.81,0,0,0-.82-.41Z"/>
-                <path class="cls-21"
-                      d="M70.24,82.79a1.08,1.08,0,0,1,.27.07,1.05,1.05,0,0,1,.31.28l0-.08.23-.37A3.09,3.09,0,0,0,70.24,82.79Z"/>
-                <path class="cls-21"
-                      d="M65.29,83.13l1.41.77,2.42,0a2.26,2.26,0,0,0,1.07-.11,1,1,0,0,0,.2-.13A18.56,18.56,0,0,1,65.29,83.13Z"/>
-                <path class="cls-11" d="M70.72,83.58h0s0,0,0,0Z"/>
-                <path class="cls-8"
-                      d="M66.33,51.88a1.41,1.41,0,0,0,.36.37,2.64,2.64,0,0,0,1.53.43,3.93,3.93,0,0,0,1.47-.4,4.92,4.92,0,0,0,.67-.41l-.47-1.26a2.94,2.94,0,0,1-1.93.82l-1.08.1-.48,0-.12,0s-.11,0-.07,0A.57.57,0,0,0,66.33,51.88Z"/>
-                <path class="cls-11" d="M69.72,47.3h0v0Z"/>
-                <path class="cls-9"
-                      d="M69.72,48.06v.08c0,.1-.13.22-.13.22l-.26.18a1.66,1.66,0,0,1-.79.36,1.32,1.32,0,0,1-1-.09.9.9,0,0,1-.27-.2.34.34,0,0,1,0-.15h0c.25-.08.49-.17.69-.25a8.55,8.55,0,0,0,1.35-.5c0,.06.07.12.1.13l.06,0,0,0h0A.76.76,0,0,1,69.72,48.06Z"/>
-                <path class="cls-9"
-                      d="M69.39,63.42h0l0,0h0l-.09,0a4.78,4.78,0,0,0-.92.64c-.16.12-.31.24-.45.23a.8.8,0,0,1-.38-.23.78.78,0,0,1-.2-.26.15.15,0,0,1,0-.11s0,0,.13,0a1.25,1.25,0,0,0,.36-.09,5.22,5.22,0,0,1,1-.31h.53Z"/>
-                <path class="cls-4"
-                      d="M69,31.47a34.74,34.74,0,0,0-.39-3.57,11,11,0,0,0-1.17-3.44A7.92,7.92,0,0,0,65,21.83l0,0A9.1,9.1,0,0,0,63,20.71c.63.43,1,.95.63,1.72A2.58,2.58,0,0,1,62,23a11.14,11.14,0,0,1,1.27.46,11.65,11.65,0,0,1,1.62.88A5.56,5.56,0,0,1,66,25.61a10.8,10.8,0,0,1,1.14,2.52,16.49,16.49,0,0,1,.59,2.52,3.9,3.9,0,0,1-.18,2s-.16.24-.57.53c-.88,3.64-4.89,6-8.72,6.17.9.39,1.75.75,2.54,1.05A15.08,15.08,0,0,0,63,41a6.93,6.93,0,0,0,1.74.15,5.22,5.22,0,0,0,1.12-.1c.25,0,.37-.11.38-.1a3,3,0,0,1,.29-.42c.19-.28.46-.68.76-1.2a13.51,13.51,0,0,0,1.65-4.65A13.85,13.85,0,0,0,69,31.47Z"/>
-                <path class="cls-10"
-                      d="M67,33.13l-.28.19a7.53,7.53,0,0,1-2.83,1,12.77,12.77,0,0,1-4.43-.18,23,23,0,0,1-2.54-.58,9.39,9.39,0,0,1-2.61-1.13h0l-.86-.58c-.15-.1-.29-.22-.43-.32l-.21-.16-.33-.27c0-.14,0-.29,0-.43s0-.19,0-.29.08-.36.13-.54a10,10,0,0,1,.38-1,12.46,12.46,0,0,1,4.25-4.91,6.51,6.51,0,0,1,1.94-1,4.76,4.76,0,0,1,2.12-.1A5.29,5.29,0,0,1,62,23a2.58,2.58,0,0,0,1.66-.55c.38-.77,0-1.29-.63-1.72a7.77,7.77,0,0,0-2.92-.59,29,29,0,0,0-4.62.59,20,20,0,0,0-2,.55c-4.69,2.54-5.84,9.65-2.1,12.86a35.13,35.13,0,0,0,6.93,5.17h0C62.1,39.12,66.11,36.77,67,33.13Z"/>
-                <path class="cls-4"
-                      d="M53.44,21.26c-.4.14-.76.28-1.06.41-.7.31-1.08.56-1.14.58s-.57.33-1.36.94a24.3,24.3,0,0,0-3,2.81,25.21,25.21,0,0,0-1.74,2.1c-.14.2-.29.4-.43.61l-.11.14v0s0,0,0,.05l0,0,.23.27.52.6A48.11,48.11,0,0,0,50,34.5a24.1,24.1,0,0,0,2.66,2c.22.15.46.29.69.43l.7.38c.48.25,1,.48,1.45.7.95.45,1.87.88,2.75,1.27a35.13,35.13,0,0,1-6.93-5.17C47.6,30.91,48.75,23.8,53.44,21.26Z"/>
-                <path class="cls-21"
-                      d="M67.37,71.75l.07-.16s.16-.27.37-.65.31-.55.48-.87a5.08,5.08,0,0,1-1.66,1.26,9.59,9.59,0,0,1-2.31.74l-.66.11c0,.15,0,.36,0,.61,0,.61.11,1.49.2,2.56,0,.53.09,1.11.14,1.73,0,.27,0,.55.08.84l.08.29,0,.25c0,.17.08.33.11.5l0,.19C64.54,76.14,64.55,72.7,67.37,71.75Z"/>
-                <path class="cls-9"
-                      d="M64.4,79.15c.2,1,.41,2,.62,3h.07v0a.13.13,0,0,0,0-.06c0-.15,0-.37,0-.69,0-.6,0-1.52.08-2.83a25.11,25.11,0,0,1,.33-2.81,1.48,1.48,0,0,0,0-.27c-.18.15-.31.23-.33.16a10.11,10.11,0,0,1,1.16-2c.29-.48.55-1,.74-1.38.1-.23.19-.41.25-.53C64.55,72.7,64.54,76.14,64.4,79.15Z"/>
-                <path class="cls-12"
-                      d="M67.54,31.84s0,.75,0,.76a9.45,9.45,0,0,1-.92.58c-.18.1-.39.2-.62.3a5.74,5.74,0,0,0,1-3.41A13.61,13.61,0,0,1,67.54,31.84Z"/>
-                <path class="cls-13"
-                      d="M67.06,30.07a5.74,5.74,0,0,1-1,3.41c-.23.09-.48.18-.76.26l.14-.11a10.05,10.05,0,0,1-2.5.35H62a5.25,5.25,0,0,1-1.9-4.7c.14-2.6,1.6-4.63,3.4-4.74a6.68,6.68,0,0,1,.78.47,4.12,4.12,0,0,1,.85,1l.12.15.24.45.08.15A21.9,21.9,0,0,1,67.06,30.07Z"/>
-                <path class="cls-9"
-                      d="M66.43,48.23h-.06a9.52,9.52,0,0,1-1.93-.13,15.12,15.12,0,0,1-2.81-.9l1.3-.85a15.58,15.58,0,0,0,1.3,1.21,3.65,3.65,0,0,0,1,.49,4,4,0,0,0,1.07.17Z"/>
-                <path class="cls-9"
-                      d="M64.74,41.44l1.6.64a.3.3,0,0,0-.22.11.83.83,0,0,0-.18.34s.07,0,.15.07l-.16.15s0,0,0,0l0,0-.46.79A15.13,15.13,0,0,0,63.2,44l-.09-.75s0,0,0,0a4.16,4.16,0,0,0-1.24-.48l-.62-.16.38-1.42a9.31,9.31,0,0,0,1.26.28A7.51,7.51,0,0,0,64.74,41.44Z"/>
-                <path class="cls-9"
-                      d="M56.11,99.62a8.93,8.93,0,0,1-1.69,2.72c-.27.33-.5.6-.64.8,0,0,0,0,0,0,1.56.29,3.17.49,4.78.74l.9.14.19,0h.3l.32,0c.6,0,1.21-.08,1.81-.13l1.4-.14c0-.07.08-.17.14-.28s.35-.62.59-1,.52-.93.77-1.47a6.78,6.78,0,0,0,.33-.85,5,5,0,0,0,.17-.92,3.55,3.55,0,0,0-.13-1.79,3.19,3.19,0,0,0-.4-.73A29.32,29.32,0,0,1,56.4,98,7.53,7.53,0,0,1,56.11,99.62Z"/>
-                <path class="cls-21"
-                      d="M63.68,95.52c-.32.07-.64.14-1,.19a18.79,18.79,0,0,1-6.09.11l-1-.17a1.82,1.82,0,0,1,.56.8A3.81,3.81,0,0,1,56.4,98a29.32,29.32,0,0,0,8.53-1.29,5,5,0,0,0-.5-.59A2.52,2.52,0,0,0,63.68,95.52Z"/>
-                <path class="cls-13"
-                      d="M65.4,33.63l-.14.11-.34.1h0a15.44,15.44,0,0,1-2,.14A10.05,10.05,0,0,0,65.4,33.63Z"/>
-                <path class="cls-13" d="M65.26,33.74l-.06,0-.28.05Z"/>
-                <path class="cls-11" d="M64.81,7.55v0l-.29,0v0Z"/>
-                <path class="cls-9"
-                      d="M64.39,63.38s0,0,0,0a.49.49,0,0,0,0,.11h0l-.28,0a.53.53,0,0,0,.14-.12l.13-.07s0,0,0,0A.21.21,0,0,0,64.39,63.38Z"/>
-                <path class="cls-13"
-                      d="M64.91,33.84a6.6,6.6,0,0,1-.84.16H64a.29.29,0,0,0-.24,0h-.05l-.5,0-.55,0a3.85,3.85,0,0,1-.48,0L62,34h.86A15.44,15.44,0,0,0,64.91,33.84Z"/>
-                <path class="cls-4" d="M64.21,2.78c.09.73.19,1.81.26,3.32A13.48,13.48,0,0,0,63,2.73Z"/>
-                <path class="cls-13" d="M64.07,34l-.14,0h-.16A.29.29,0,0,1,64,34Z"/>
-                <path class="cls-9"
-                      d="M64,63.47a1,1,0,0,1-.36.2c-.35.12-.73.21-.84.26.07-.09.25-.46.6-.5A3.94,3.94,0,0,1,64,63.47Z"/>
-                <path class="cls-9"
-                      d="M63.11,43.2l.09.75c-.25,0-.49.1-.74.16l-1,.27c-.47-.39-.81-.64-.86-.58a6.65,6.65,0,0,0,.58.66l-.8.25c-.58.19-1,.36-1,.37a8.64,8.64,0,0,0-1,.5l-.41.28c-1.2-.39-2.46-.76-3.71-1.11-.23-.07-.49-.13-.67-.2L53,44.27l-1.32-.59-.15-.07c.7-.19,1.36-.35,1.9-.47.78-.17,1.32-.22,1.35-.23s.56-.1,1.36-.19A20.23,20.23,0,0,1,59,42.65a23,23,0,0,1,2.86.31C62.52,43.08,63,43.2,63.11,43.2Z"/>
-                <path class="cls-9"
-                      d="M58.34,24.17a10.38,10.38,0,0,0-2.21,1.64,10.46,10.46,0,0,0-2.48,3.28,6.91,6.91,0,0,0-.37.95c-.05.16-.09.32-.13.48l0,.24v.09l.28.22.41.32.84.59,0,0a7.78,7.78,0,0,0,2,.94C55.22,30.34,55.79,26.77,58.34,24.17Z"/>
-                <path class="cls-12"
-                      d="M60.14,29.28c.14-2.6,1.6-4.63,3.4-4.74l-.66-.32a4.94,4.94,0,0,0-3.44-.5,5.42,5.42,0,0,0-1.1.45c-2.55,2.6-3.12,6.17-1.72,8.77l.44.15a25,25,0,0,0,2.47.64,15.7,15.7,0,0,0,2.66.35L62,34A5.25,5.25,0,0,1,60.14,29.28Z"/>
-                <path class="cls-11" d="M62.78,64s0,0,0,0S62.79,64,62.78,64Z"/>
-                <path class="cls-21"
-                      d="M56.06,86.71a.77.77,0,0,0,.07.17,2.8,2.8,0,0,0,.14.25h0l0,0,.09-.07.18-.16L58,85.67l1.12-.93.39-1.26A10.16,10.16,0,0,1,56.06,86.71Z"/>
-                <path class="cls-21"
-                      d="M56.23,86.1a.61.61,0,0,0-.19.38.36.36,0,0,0,0,.12.52.52,0,0,0,0,.11A10,10,0,0,0,58.24,85a5.44,5.44,0,0,1-1.86.9A1.91,1.91,0,0,0,56.23,86.1Z"/>
-                <path class="cls-21"
-                      d="M54.78,86a1.85,1.85,0,0,0-.16.3s0,0-.06.13a.77.77,0,0,0-.08.29.76.76,0,0,0,0,.15l.19,0,.45.07.91.12L55.93,87a.82.82,0,0,1-.21-.57c0-.07.11-.28.3-.46A4.7,4.7,0,0,1,54.78,86Z"/>
-                <path class="cls-21"
-                      d="M54,86.13v.21l.29.39a1,1,0,0,1,.08-.53.84.84,0,0,1,.1-.15l0,0a4.05,4.05,0,0,1-.5-.12A2.11,2.11,0,0,0,54,86.13Z"/>
-                <path class="cls-9"
-                      d="M61.28,75c0-.91-1.08-1.83-1.83-2.75h-.14a9.7,9.7,0,0,1-2.18-.62c.27.51.62,1.24.93,2s.57,1.42.76,2,.28,1,.29,1a24.51,24.51,0,0,1,.13,3.16,9.25,9.25,0,0,1-.26,3h0a12.54,12.54,0,0,1-1.75,1.15s-1.93.78-2,.62a1,1,0,0,0-.7.18,1.14,1.14,0,0,0-.45.64,3.12,3.12,0,0,0-.1.48v0a4.05,4.05,0,0,0,.5.12,2.28,2.28,0,0,1,.22-.23c.21-.17.48-.24.49-.2s-.19.18-.33.37a.86.86,0,0,0-.07.1A4.7,4.7,0,0,0,56,86c.21-.2.45-.36.49-.25l-.13.16a5.44,5.44,0,0,0,1.86-.9,9.79,9.79,0,0,0,1.23-1.51c.07-.22.11-.35.12-.37s0,0,0-.14l0,0s0,0,0,0l0-.07v0c0-.07.05-.14.08-.22.11-.32.28-.75.48-1.27l.69-1.76c.09-.25.19-.5.29-.74A13.51,13.51,0,0,0,61.28,75Z"/>
-                <path class="cls-21"
-                      d="M61.86,72.35a15,15,0,0,1-2.41-.06c.75.92,1.83,1.84,1.83,2.75a13.51,13.51,0,0,1-.05,3.76c0-.09.07-.16.1-.25l.21-.5,0-.09s0,0,0,0h0v-.07l0-.26c.22-1.44.43-2.87.58-3.94l.21-1.34C62.24,72.33,62.05,72.35,61.86,72.35Z"/>
-                <path class="cls-9"
-                      d="M61.55,44.91l1,1.08-1.14.62-.53.3-1.12-.44-1.06-.37c.5-.26.87-.41.9-.42s.38-.18.93-.4Z"/>
-                <path class="cls-11" d="M60.66,82.93a.19.19,0,0,1,0,.08h0l0,0Z"/>
-                <path class="cls-23"
-                      d="M60.21,47.39l-.67-.22c-.44-.15-.89-.28-1.34-.41.36.47.75.93,1.15,1.39.27-.26.54-.5.77-.69Z"/>
-                <path class="cls-9"
-                      d="M57.85,46.65l-1,.64a20.84,20.84,0,0,1-2.69,1.65l-.33.19a3.46,3.46,0,0,0,.42.57c.08.07.15.16.24.23a2.34,2.34,0,0,0,.38.28,3.84,3.84,0,0,0,.8.43l1.7-.25a8.94,8.94,0,0,1,1.49-1.81c.14-.15.29-.29.44-.43-.4-.46-.79-.92-1.15-1.39Z"/>
-                <path class="cls-11" d="M59.23,69.29s.08.12,0,0Z"/>
-                <path class="cls-4"
-                      d="M58.47,6.77c0,.08.11.28,0,.12s-.28-.28-.58-.53l-.15-.13L57.39,6l-.45-.34L56.06,5a13.29,13.29,0,0,0-1.62-1A20.13,20.13,0,0,0,52.38,3a14.93,14.93,0,0,1,3.11-.49c.41,0,.81,0,1.2,0,.19.34.39.77.61,1.28.31.7.73,1.82,1,2.46,0,0,.06.15.12.31Z"/>
-                <path class="cls-9"
-                      d="M53.3,45.45h0c-.07.14-.19.39-.37.74.06.21.11.45.18.75a11,11,0,0,0,.55,1.74,3.84,3.84,0,0,0,.23.45l.33-.19a17.91,17.91,0,0,1,2.42-2l.57-.44c-1-.29-2.09-.55-3.16-.82C53.79,45.59,53.57,45.54,53.3,45.45Z"/>
-                <path class="cls-8"
-                      d="M56.37,55.13l0,0-.55.45a17.59,17.59,0,0,1-2.47,1.68,7,7,0,0,1-2.05.64,9.74,9.74,0,0,1-1.23.12H50q-.06-.6-.09-1.17a14.88,14.88,0,0,1,0-2l.51.21a7.34,7.34,0,0,0,2.14.42,11.87,11.87,0,0,0,1.45,0l.82-.06.63-.07.55-.14Z"/>
-                <path class="cls-8"
-                      d="M51.37,99.16a10.08,10.08,0,0,1-2.88,1.66l-.68.25c.17.1.34.2.52.29a13.43,13.43,0,0,0,3.16,1.31c.51.14,1,.26,1.57.37a12,12,0,0,1,.9-1.1,8.63,8.63,0,0,0,1.71-2.47A7.56,7.56,0,0,0,56,98a28,28,0,0,1-3.62-.3A3.85,3.85,0,0,1,51.37,99.16Z"/>
-                <path class="cls-18"
-                      d="M56,96.53a1.77,1.77,0,0,0-.6-.94c-.32-.08-.62-.16-.9-.25l-1.59-.46-.43-.13a3.81,3.81,0,0,1,.22,1.39,4.18,4.18,0,0,1-.25,1.53h0A28,28,0,0,0,56,98,3.55,3.55,0,0,0,56,96.53Z"/>
-                <path class="cls-9"
-                      d="M53.22,69.16c-.24-.21-.47-.41-.7-.64l-.19-.21a2.77,2.77,0,0,1-.31.53s0,.09,0,.12a.66.66,0,0,0,.24.45.48.48,0,0,0,0,.13l.28.46c.21.34.45.64.4.81s-.57.12-1-.1a4.06,4.06,0,0,1-.57-.35,1.73,1.73,0,0,1-.29-.31l0-.12v0l0,0-.65.61a.05.05,0,0,0,0,0h0l0,.07a2,2,0,0,0-.16.3.75.75,0,0,0,.13.82,3,3,0,0,0,.25.24l.3.23c.18.15.36.29.52.4.32.23.55.35.54.43s-.32.14-.74,0a4.64,4.64,0,0,1-.69-.23l-.38-.17a1.87,1.87,0,0,1-.39-.23,1.7,1.7,0,0,1-.62-.75l-.42.4-.72.68,0,.1a2.72,2.72,0,0,0,.53.93c.54.64,1.4,1.07,1.33,1.25s-1,.06-1.94-.55a3.46,3.46,0,0,1-.85-.86c-.28.26-.56.55-.85.86l-.23.24.09.31a2.57,2.57,0,0,0,.44.75,3.75,3.75,0,0,0,.74.58c.23.14.39.16.43.24s-.18.27-.54.26A2.43,2.43,0,0,1,46,76.54a3,3,0,0,1-.88-.8c-.55.63-1.13,1.31-1.72,2a2.58,2.58,0,0,0,.34,1,2.52,2.52,0,0,0,.68.76,3.24,3.24,0,0,0,1.08.5l.19,0C49.53,77,53.38,73.65,53.22,69.16Z"/>
-                <path class="cls-21"
-                      d="M54.53,70.2c-.46-.33-.89-.68-1.31-1C53.38,73.65,49.53,77,45.73,80a7.91,7.91,0,0,0,2.12.22,5.43,5.43,0,0,0,.79-.09c.75-1,1.67-1.94,2.56-2.9.71-.76,1.34-1.55,1.94-2.33a24.19,24.19,0,0,0,1.51-2.14,13.28,13.28,0,0,0,.83-1.59c.05-.12.09-.22.13-.3C55.24,70.69,54.88,70.45,54.53,70.2Z"/>
-                <path class="cls-8"
-                      d="M55.33,50.73s.15,0,.05,0l-.29,0-.55.08-.51,0-.6,0a4.77,4.77,0,0,1-1.8-.19,3,3,0,0,1-.72-.4c.08-.22.17-.42.25-.62.41-.88.85-1.72,1.17-2.38l.08-.18s0,0,0,0c.22.44.46,1,.85,1.69a4.45,4.45,0,0,0,.81,1,3.11,3.11,0,0,0,.28.23l.21.16a3.66,3.66,0,0,0,.52.28l.09,0Z"/>
-                <path class="cls-9"
-                      d="M54.48,67.85a1.35,1.35,0,0,1-.2.91l0,0c-.23-.2-.46-.4-.67-.61a.71.71,0,0,0,.27-.33C54,67.86,54.31,67.86,54.48,67.85Z"/>
-                <path class="cls-9"
-                      d="M44.76,93.09l0,0a5.69,5.69,0,0,1-1.68.54,6.4,6.4,0,0,1-1.57,0c-.29,0-.56-.07-.78-.11.21.7.4,1.33.48,1.5a3,3,0,0,1,.16.56l.1.47c.07.31.14.61.2.92L42,98.89l.06.3v.06s0,0,0,0l.08-.1.6-.77.56-.74.4.84.8,1.7c0-.52,0-1,0-1.56.44.39.91.84,1.34,1.17.2.17.44.34.62.47l.35.24.22.15h0l.16,0c.25-.07.6-.18,1-.33a9.58,9.58,0,0,0,2.79-1.45A3.1,3.1,0,0,0,52,97.61c-.61-.1-1.22-.21-1.84-.35A8.67,8.67,0,0,1,44.76,93.09Z"/>
-                <path class="cls-21"
-                      d="M52.37,94.74l-.48-.16a1.22,1.22,0,0,1-.32-.12h0l-.19-.23a2.27,2.27,0,0,1-.79-.37,7.72,7.72,0,0,1-1.46-1.31A18.44,18.44,0,0,1,47.9,91c-.31-.44-.51-.75-.53-.77s-.12-.21-.29-.54c-.07.24-.18.57-.32,1-.07.2-.15.42-.23.66a3.87,3.87,0,0,1-.58.93,3.1,3.1,0,0,1-1.19.84,8.67,8.67,0,0,0,5.41,4.17c.62.14,1.23.25,1.84.35a4.13,4.13,0,0,0,.39-1.48A9.38,9.38,0,0,0,52.37,94.74Z"/>
-                <path class="cls-11" d="M51.65,65.2a0,0,0,0,0,0,0h0S51.64,65.21,51.65,65.2Z"/>
-                <path class="cls-11" d="M49.92,2.18h0Z"/>
-                <path class="cls-21"
-                      d="M46.46,53l0,0-.11.11-.07.08s0,0,0,.06a1.23,1.23,0,0,0,.06.21,2.61,2.61,0,0,0,.27.52c.25.39.92.85,1.43,1.53a3.19,3.19,0,0,1,.53,1.12,4.3,4.3,0,0,1,.1,1c0,.15,0,.29,0,.41a1.13,1.13,0,0,1,0,.18.19.19,0,0,1,0,.09.09.09,0,0,1,0,.06h0a1.81,1.81,0,0,1,.24.24.47.47,0,0,1,.12.23h0c-.09-.64-.15-1.28-.19-1.91,0-.24,0-.48,0-.7,0-.06,0-.1,0-.16h0L48.63,56l-.16-.19-.29-.39a8.57,8.57,0,0,1-.52-.76l-.12-.2c0-.08-.06-.11-.12-.25a1,1,0,0,1-.06-.68c.06-.2.3-.32.48-.45l.27-.18,1-.65h0a16.36,16.36,0,0,1,.47-1.71C48.48,51.65,48.39,53.72,46.46,53Z"/>
-                <path class="cls-9"
-                      d="M48.71,51c-.48.38-1,.79-1.42,1.18l-.6.56-.23.22c1.93.73,2-1.34,3.09-2.46a1.87,1.87,0,0,1,.07-.22C49.35,50.51,49,50.76,48.71,51Z"/>
-                <path class="cls-9"
-                      d="M48.42,59.84a1.18,1.18,0,0,0,.09-1.3l-.22-.16a.85.85,0,0,0-.54-.19,1.52,1.52,0,0,0-.57.18c-.18.09-.35.18-.38.26s0,.14.07.21l.1.08s0,.1-.06.17-.12.11-.15.09a1,1,0,0,1-.13-.14.62.62,0,0,1-.12-.2.41.41,0,0,1,0-.34,1.08,1.08,0,0,1,.54-.38l0,0,.1-.11c0-.07,0-.2-.07-.34s0-.27-.15-.39-.16,0-.22.08l-.18.19-.26.25a1.08,1.08,0,0,0-.21.29c-.06.12-.11.26-.17.4C46.45,59.42,47.11,60.28,48.42,59.84Z"/>
-                <path class="cls-21"
-                      d="M49.09,59.8s0,0,0,0q-.09-.47-.15-.93h0a.35.35,0,0,1,0,.18.35.35,0,0,1-.07.14s.11-.25-.13-.47l-.21-.17a1.18,1.18,0,0,1-.09,1.3c-1.31.44-2-.42-2.46-1.37-.05.13-.1.28-.15.42a4.29,4.29,0,0,0-.13.44.59.59,0,0,0,0,.35,1.07,1.07,0,0,0,.64.48,4.52,4.52,0,0,0,1,.2,7.76,7.76,0,0,0,1.08,0c.33,0,.69-.12.71-.24v0C49.12,60,49.1,59.9,49.09,59.8Z"/>
-                <path class="cls-8"
-                      d="M45.47,80.33a3.52,3.52,0,0,1-1.23-.51,2.69,2.69,0,0,1-.83-.86,3.21,3.21,0,0,1-.34-.72c-.44.57-.89,1.16-1.3,1.79q-.24.36-.45.75a2.85,2.85,0,0,0,.37.66,3.4,3.4,0,0,0,2.05,1.35,4.13,4.13,0,0,0,.69.11A11.59,11.59,0,0,1,46,80.42C45.84,80.39,45.65,80.37,45.47,80.33Z"/>
-                <path class="cls-18"
-                      d="M46.29,82.76c.39-.07.71-.15.91-.2a7.28,7.28,0,0,1,.36-.76,9.44,9.44,0,0,1,1-1.5,5.51,5.51,0,0,1-.69.14,6.71,6.71,0,0,1-1.84,0,11.59,11.59,0,0,0-1.59,2.48A7.15,7.15,0,0,0,46.29,82.76Z"/>
-                <path class="cls-8"
-                      d="M42.63,88.27a4.1,4.1,0,0,1-2.8-.74,2.08,2.08,0,0,1-.41-.35c0,.28,0,.56,0,.83a11.84,11.84,0,0,0,.41,2.9h0l.13.34c.08.19.32,1,.57,1.81a8.75,8.75,0,0,0,1,.17,5.82,5.82,0,0,0,1.46,0,5.93,5.93,0,0,0,1.6-.46l0,0a10.9,10.9,0,0,1-1.24-4.6Z"/>
-                <path class="cls-18"
-                      d="M45.93,91.88a2.74,2.74,0,0,0,.39-.64c.1-.23.18-.45.27-.66.18-.42.32-.75.43-1l-.1-.19a6.53,6.53,0,0,1-.51-2,.28.28,0,0,1,0-.09,3.91,3.91,0,0,1-1,.4,14.78,14.78,0,0,1-2.06.43,10.9,10.9,0,0,0,1.24,4.6A3.46,3.46,0,0,0,45.93,91.88Z"/>
-                <path class="cls-9"
-                      d="M44.3,83.18a4.48,4.48,0,0,1-.63-.06,3.68,3.68,0,0,1-2.33-1.42,2.41,2.41,0,0,1-.28-.43c-.21.4-.4.81-.58,1.24a27.15,27.15,0,0,0-.87,3,5,5,0,0,0-.16,1,3.19,3.19,0,0,0,.64.65,3.89,3.89,0,0,0,2.53.76l.74-.06A11.13,11.13,0,0,1,44.3,83.18Z"/>
-                <path class="cls-21"
-                      d="M46.25,87.35a1.56,1.56,0,0,1,.15-.06,5.07,5.07,0,0,1,.37-2.64v-.3a3.61,3.61,0,0,1,.38-1.69,6.1,6.1,0,0,1-.81.28,6.61,6.61,0,0,1-2,.24,11.13,11.13,0,0,0-.94,4.7c.74-.07,1.45-.18,2-.29C45.74,87.5,46,87.42,46.25,87.35Z"/>
-                <rect class="cls-11" x="46.74" y="72.88" width="0.01" height="0.01"/>
-                <path class="cls-11" d="M45.82,6.58h0c-.19.17-.37.36-.56.54C45.44,6.94,45.62,6.75,45.82,6.58Z"/>
-                <path class="cls-11" d="M41.07,80.26h0l-.13.28.13-.28Z"/>
-                <path class="cls-11" d="M40.93,80.57c0,.08-.06.16-.1.25h0Z"/>
-                <circle class="cls-9" cx="62.2" cy="27.25" r="0.91"/>
-                <circle class="cls-9" cx="62.76" cy="28.68" r="0.18"/>
-                <path class="cls-13" d="M73.88,22.78h0Z"/>
-                <path class="cls-13"
-                      d="M77.45,31.24a5.92,5.92,0,0,0,1.7-4.14c.09-2.17-1.34-4.54-2.93-5h0a5.88,5.88,0,0,0-2.18.61h0a.36.36,0,0,0-.11.1h0c-.09.37-.18.75-.24,1.1s-.08.43-.11.64a15.3,15.3,0,0,0,.83,7.33,13.51,13.51,0,0,0,2.15-.35C76.81,31.44,77.12,31.35,77.45,31.24Z"/>
-                <path class="cls-13"
-                      d="M73.53,24.53c-.26,1.61-.34,2.7-.35,2.77s-.16,1.29-.26,3.11h0a2.34,2.34,0,0,0,1,1.47h.11l.29,0A15.3,15.3,0,0,1,73.53,24.53Z"/>
-                <path class="cls-9"
-                      d="M74.29,25.41a.81.81,0,0,0-.36,1.09.8.8,0,0,0,1.09.35.81.81,0,0,0,.36-1.09A.8.8,0,0,0,74.29,25.41Z"/>
-                <circle class="cls-9" cx="73.86" cy="27.51" r="0.19"/>
-                <g id="_Group_2" data-name="&lt;Group&gt;">
-                    <path class="cls-4" d="M85.28,6.09,85.39,6l-.11.1Z"/>
-                    <path class="cls-4"
-                          d="M86,5.69l-.7.38A.22.22,0,0,0,85.18,6l-.09,0a3.17,3.17,0,0,0-.1-.38s.06,0,.15-.1h.15A.73.73,0,0,1,86,5.69Z"/>
-                    <path class="cls-4"
-                          d="M84.76,9.71l-.14-.25h0c.06-.43.24-1.16.42-1.86a4.84,4.84,0,0,0,.08-1.43l0-.22.09,0a.22.22,0,0,1,.08.09l-.07,0h0l.07,0v0l.11-.1-.11.07,0,0,.7-.38a.73.73,0,0,0-.67-.24h-.13l.27-.12c.26-.11.49-.13.5-.07a2.64,2.64,0,0,1,.09.85,4.77,4.77,0,0,1-.32,1.66A11.52,11.52,0,0,1,84.76,9.71Z"/>
-                    <path class="cls-4" d="M84.62,9.46l.14.25c-.06.09-.1.12-.13.11S84.59,9.67,84.62,9.46Z"/>
-                    <path class="cls-4"
-                          d="M84.7,20.43c0-.76,0-1.53,0-1.84h0l.05,0a11.48,11.48,0,0,1,.14,1.91c0,.5,0,1,0,1.39s-.06.65-.06.67a5.15,5.15,0,0,1-.1.65c-.06.38-.18.88-.31,1.37s-.32.95-.46,1.3a3.35,3.35,0,0,1-.26.57,16.82,16.82,0,0,1,.43-1.68c0,.13,0,.19.06.19s0-.22,0-.61a11.2,11.2,0,0,0,.2-1.18c0-.38.07-.64.08-.65s0-.27.07-.65S84.68,20.93,84.7,20.43Z"/>
-                    <path class="cls-4"
-                          d="M84.49,10.2a10.26,10.26,0,0,1-.56-1.74,3,3,0,0,1,.69,1h0c0,.21,0,.34,0,.36s.07,0,.13-.11l.16.31a12.08,12.08,0,0,1,.5,1.21c.11.34.16.59.17.6a4,4,0,0,1,0,.64,6.24,6.24,0,0,1-.18,1.31,4.82,4.82,0,0,1-.56,1.76,10.51,10.51,0,0,1,.1-1.82,7.64,7.64,0,0,0,0-1.22,4.42,4.42,0,0,0-.1-.54,4.71,4.71,0,0,0-.11-.57C84.76,11.06,84.63,10.63,84.49,10.2Z"/>
-                    <path class="cls-4"
-                          d="M85.09,5.94A1.71,1.71,0,0,0,84,6.05a2.93,2.93,0,0,0-1.1.74,1.14,1.14,0,0,0-.23.35l-.51-.72a2.32,2.32,0,0,0,.44-.09,11.1,11.1,0,0,0,1.32-.49,5.33,5.33,0,0,1,1.27-.38c-.09,0-.15.08-.15.1A3.17,3.17,0,0,1,85.09,5.94Z"/>
-                    <path class="cls-4" d="M82.94,32.73l.21-.76c.26.27.48.51.51.53Z"/>
-                    <path class="cls-4"
-                          d="M84.39,3a3.84,3.84,0,0,1,1.9.21,2.52,2.52,0,0,1,1.27,1.4,5.66,5.66,0,0,1,.34,1.35c.1.76.12,1.22.12,1.26a18.41,18.41,0,0,1-.09,2,23,23,0,0,1-.78,4.08,21.5,21.5,0,0,1-1.48,3.82,8.88,8.88,0,0,1-.88,1.45q0-.09,0-.09s0,0,0,.14h0s-.07.05-.08,0a6.85,6.85,0,0,1,.53-1.75,30.59,30.59,0,0,0,1.06-3.83,26.5,26.5,0,0,0,.47-4c0-1.08,0-1.82,0-1.87s0-.49,0-1.15-.19-1.59-.85-1.92a2.89,2.89,0,0,0-1.36-.23c-.52,0-1.08.08-1.62.14s-1.09.11-1.59.16l-.18,0h-.3l-.45,0,.38.65c.15.25.22.4.19.43s-.16-.08-.37-.27S80,4.6,79.66,4.2l.23.06c.19.06.32.08.35,0s0-.15-.18-.32l-.2-.16,1.29-.24c.48-.1,1-.19,1.54-.32S83.8,3,84.39,3Z"/>
-                    <path class="cls-4"
-                          d="M84.9,43.13s-.31-.05-.75-.15-1-.21-1.63-.3-1.21-.15-1.68-.19l-.8-.06-.79-.1a5.52,5.52,0,0,0-1.61,0,13.75,13.75,0,0,0-1.43.34V42.4a9.31,9.31,0,0,1,1.33-.48,6.1,6.1,0,0,1,.93-.18,7.85,7.85,0,0,1,.83,0l.81,0s.34,0,.81.12,1.08.19,1.68.34a11.12,11.12,0,0,1,1.64.5C84.67,42.91,84.93,43.09,84.9,43.13Z"/>
-                    <path class="cls-4"
-                          d="M78.18,41.25c-.42.06-1,.15-1.51.28l-.6.13c0-.13-.07-.26-.11-.38l.59-.2a14.38,14.38,0,0,1,1.52-.42l.73-.16s.32,0,.76,0a10.16,10.16,0,0,1,1.59.09,7.39,7.39,0,0,1,2.19.57A14.82,14.82,0,0,1,81.12,41a9.93,9.93,0,0,0-1.51.06c-.42,0-.69.1-.71.1Z"/>
-                    <path class="cls-4"
-                          d="M76.85,43.15l.14,0,.32.08a6.78,6.78,0,0,1,.86.32c.61.25,1.15.62,1.1.7A4.81,4.81,0,0,1,78,44l-.85-.17-.38,0-.38,0a3.22,3.22,0,0,0-.44,0h0a3.49,3.49,0,0,0,.18-.57A2.84,2.84,0,0,1,76.85,43.15Z"/>
-                    <path class="cls-4"
-                          d="M85.09,28.75l-.69.91q-.16.24-.36.48a1.94,1.94,0,0,0-.13.2l.16.08.46.27,1.65,1-2.52.84s-.25-.26-.51-.53l-.21.76.72-.23h0c0,.15-.06.27-.08.35v0a2.72,2.72,0,0,0-.09.4l-.1.05s-.12.06-.26.16l-.24.2a4.43,4.43,0,0,0-.71.84c-.51.82-1.18,2-2,3.11a9.16,9.16,0,0,1-1.36,1.48,4.07,4.07,0,0,1-.78.52c-.25.14-.5.26-.72.37a4,4,0,0,1-1.58.54,12.63,12.63,0,0,1,1.39-.88,7.12,7.12,0,0,0,1.32-1,8.35,8.35,0,0,0,1.16-1.48c.71-1.09,1.26-2.25,1.78-3.18A5.54,5.54,0,0,1,82.22,33l.31-.27h0l-.09-.11-.38-.46a1.11,1.11,0,0,1,.07-.16l.51-.15,1.11-.31.28-.08h.06l.14,0-.14-.13-1.21-.78.66-.76.4-.46.77-.85c.36-.41.7-.77,1-1.06l.37-.05-.13-.2-.24.25a21.2,21.2,0,0,1-2.28.11l.4-.06c.65-.09,1.88-.23,2.19-.34l.35-.13-.22.33C85.9,27.66,85.53,28.17,85.09,28.75Z"/>
-                    <path class="cls-4"
-                          d="M75.67,41.77l.4-.11c0,.14.07.28.1.43a2.91,2.91,0,0,1,0,.31c-.2.09-.38.17-.52.25a2.83,2.83,0,0,0,0-.51C75.69,42,75.68,41.89,75.67,41.77Z"/>
-                    <path class="cls-4"
-                          d="M76.07,41.66l-.4.11c0-.12,0-.24-.06-.35l.35-.14C76,41.4,76,41.53,76.07,41.66Z"/>
-                    <path class="cls-4" d="M76.21,42.71l-.56.16a1.43,1.43,0,0,0,0-.22c.14-.08.32-.16.52-.25Z"/>
-                    <path class="cls-4"
-                          d="M76.15,43.19a4.23,4.23,0,0,0-.65.14,2.76,2.76,0,0,0,.15-.46l.56-.16A3.5,3.5,0,0,1,76.15,43.19Z"/>
-                    <path class="cls-4"
-                          d="M75.5,43.33a4.23,4.23,0,0,1,.65-.14,3.49,3.49,0,0,1-.18.57h0l-.41,0-.32,0a1.72,1.72,0,0,0,.17-.31S75.47,43.39,75.5,43.33Z"/>
-                    <path class="cls-4"
-                          d="M75.28,42.94s.14-.15.41-.29a1.43,1.43,0,0,1,0,.22C75.43,42.93,75.29,43,75.28,42.94Z"/>
-                    <path class="cls-4"
-                          d="M75.7,40.59a4.54,4.54,0,0,1,.26.69l-.35.14a5.9,5.9,0,0,0-.16-.76,1.3,1.3,0,0,0-.17-.43c-.07-.08-.14-.1-.14-.13s.09-.05.22,0a1.17,1.17,0,0,1,.33.45h0Z"/>
-                    <path class="cls-4"
-                          d="M74.49,42a3.61,3.61,0,0,1,1.12-.59c0,.11,0,.23.06.35A4.1,4.1,0,0,1,74.49,42Z"/>
-                    <path class="cls-4"
-                          d="M74.79,42.87s0,.05,0,.07a.19.19,0,0,1,0,.08c0,.06-.07,0-.06,0l0,0h0l0,0a.55.55,0,0,1-.06-.08.64.64,0,0,0,.14,0S74.79,42.85,74.79,42.87Z"/>
-                    <path class="cls-4"
-                          d="M74.79,42.94s0,0,0-.07,0,0,0,0a.64.64,0,0,1-.14,0,.55.55,0,0,0,.06.08l0,0h0l0,0s0,.08.06,0A.19.19,0,0,0,74.79,42.94Zm.07-.19c.09,0,0,.49-.14.51s-.25-.29-.12-.4A2.17,2.17,0,0,1,74.86,42.75Z"/>
-                    <path class="cls-4"
-                          d="M74.29,43.91c0-.09.54-.4,1.18-.58h0c0,.06-.06.13-.09.18a1.72,1.72,0,0,1-.17.31C74.74,43.89,74.31,44,74.29,43.91Z"/>
-                    <path class="cls-4"
-                          d="M78.44,3.79c-.65-.24-1.42-.58-2.27-.86A14.81,14.81,0,0,0,74,2.38a3,3,0,0,1,.91-.32L74.49,1l0-.06a13.47,13.47,0,0,1,2.14.88A22.21,22.21,0,0,1,78.8,3.07c.45.29.81.55,1.06.74l-.47.09.27.3C79.36,4.12,78.94,4,78.44,3.79Z"/>
-                    <path class="cls-4"
-                          d="M74.72,43.26c.12,0,.23-.53.14-.51a2.17,2.17,0,0,0-.26.11s.05-.07.21-.13.08-.06.11,0a.2.2,0,0,1,.06.11.79.79,0,0,1-.06.38c-.06.14-.14.22-.27.2a.32.32,0,0,1-.22-.23.37.37,0,0,1,0-.38s.09,0,.15.08C74.47,43,74.6,43.29,74.72,43.26Z"/>
-                    <path class="cls-4"
-                          d="M77.45,31.24a3.28,3.28,0,0,1-1.76.88A2.6,2.6,0,0,1,74,31.89h.09a15.51,15.51,0,0,0,2.44-.38A9.68,9.68,0,0,0,77.45,31.24Z"/>
-                    <path class="cls-4" d="M74.07,41.57s-.07,0,0,0l0,0s0-.07-.11-.13.1,0,.17,0,.06.05,0,.09Z"/>
-                    <path class="cls-4"
-                          d="M74.69,22.21a1.86,1.86,0,0,1,1.52-.15,6.14,6.14,0,0,0-2.18.61l0,0A4.29,4.29,0,0,1,74.69,22.21Z"/>
-                    <path class="cls-4"
-                          d="M74,41.73c-.24.05-.27-.07,0-.34.06.06.11.11.11.13l0,0s0,.05,0,0l.08-.07s0-.11,0-.09-.16,0-.17,0l.23-.06C74.42,41.26,74.2,41.68,74,41.73Z"/>
-                    <path class="cls-4"
-                          d="M73.26,23.08a3.33,3.33,0,0,1,.72-.65l-.09.3C73.47,22.93,73.29,23.08,73.26,23.08Z"/>
-                    <path class="cls-4"
-                          d="M73.77,41.85a.19.19,0,0,1-.14-.24.7.7,0,0,1,.13-.24l.06-.08s.08,0,.14.1c-.27.27-.24.39,0,.34s.46-.47.23-.4l-.23.06s.09-.07.26-.12a.11.11,0,0,1,.12,0,.18.18,0,0,1,0,.13.48.48,0,0,1-.21.34A.43.43,0,0,1,73.77,41.85Z"/>
-                    <path class="cls-4"
-                          d="M74.92,2.06a3,3,0,0,0-.91.32l-.69-.13L73,2.2,73.22,2a10.26,10.26,0,0,1,1.27-1Z"/>
-                    <path class="cls-4"
-                          d="M72.92,30.41a11.14,11.14,0,0,1-.24-3.6c.1-2.25.34-3.27,1.2-4q-.13.57-.24,1.11c-.35,2-.44,3.33-.46,3.41S73,28.59,72.92,30.41Z"/>
-                    <path class="cls-4"
-                          d="M75.69,32.12a3.28,3.28,0,0,0,1.76-.88,11.5,11.5,0,0,0,2.27-1,6.48,6.48,0,0,0,.76-.53,3.39,3.39,0,0,0,.34-.31l.07-.08a.2.2,0,0,0,0-.06.65.65,0,0,0,.07-.21,6.92,6.92,0,0,0,.18-1.94,6.71,6.71,0,0,0-1.6-3.49,3.85,3.85,0,0,0-1.31-1.15,4,4,0,0,0-1.53-.44,2.77,2.77,0,0,0-.5,0h0a1.86,1.86,0,0,0-1.52.15,4.29,4.29,0,0,0-.7.48h0l-.1,0,.09-.3a2,2,0,0,1,.31-.19,4.42,4.42,0,0,1,2.46-.43,4.52,4.52,0,0,1,1.64.42,4.31,4.31,0,0,1,1.47,1.21A12.67,12.67,0,0,1,81,25.1a4.57,4.57,0,0,1,.64,2,7.53,7.53,0,0,1-.14,2.11c0,.08-.06.18-.09.27a.89.89,0,0,1-.09.16,1.25,1.25,0,0,1-.09.12,4.54,4.54,0,0,1-.38.38,6.71,6.71,0,0,1-.84.59,13.24,13.24,0,0,1-3.33,1.35,14.5,14.5,0,0,1-2.54.42,3.91,3.91,0,0,1-1.09,0,.44.44,0,0,1-.17-.07,4.68,4.68,0,0,1,0-.53.41.41,0,0,1,.29-.05,3.21,3.21,0,0,0,.81.06h0A2.6,2.6,0,0,0,75.69,32.12Z"/>
-                    <path class="cls-4"
-                          d="M72.77,61.29a.2.2,0,0,0,0-.07.72.72,0,0,0,.34-.09,2,2,0,0,0,.42-.29c.14-.13.28-.26.26-.42a2,2,0,0,0-.47-.93.68.68,0,0,0-.35-.23s0-.06,0-.13v0c0-.09,0-.16.09-.15a.51.51,0,0,1,.18.07,1.05,1.05,0,0,1,.34.28,2.35,2.35,0,0,1,.29.49,1.59,1.59,0,0,1,.18.64.5.5,0,0,1-.14.35.93.93,0,0,1-.24.21,1.78,1.78,0,0,1-.48.27A1,1,0,0,1,72.77,61.29Z"/>
-                    <path class="cls-4"
-                          d="M76,43.77a4.27,4.27,0,0,1-.38.7,4.1,4.1,0,0,1-.52.59,7,7,0,0,1-1.28,1,2.41,2.41,0,0,1-.56.22h0a3,3,0,0,1-1,.06c-.43-.05-.69-.15-.69-.2s.29,0,.7,0a2.85,2.85,0,0,0,1.35-.43,7.85,7.85,0,0,0,1.09-1,5.12,5.12,0,0,0,.43-.55s.07-.1.18-.27l.32,0Z"/>
-                    <path class="cls-4" d="M72.77,61.29c-.09,0-.13,0-.13-.06h.14A.2.2,0,0,1,72.77,61.29Z"/>
-                    <path class="cls-4"
-                          d="M72.71,57.59c-.09,0-.11-.59,0-1.31,0,.14,0,.28.07.42s.05.39.08.56S72.74,57.59,72.71,57.59Z"/>
-                    <path class="cls-4"
-                          d="M84.24,24c0,.12,0,.22,0,.3s0,.11,0,.17l-.06.25c0-.15-.07-.39-.11-.7s-.08-.63-.13-1a10.2,10.2,0,0,0-.47-1.21,4.69,4.69,0,0,0-1-1.17,6.62,6.62,0,0,0-1.33-1.08,6.21,6.21,0,0,0-3.58-.71,3.57,3.57,0,0,0-1.61.74,5.42,5.42,0,0,0-1.25,1.28A4.48,4.48,0,0,0,74,22.34a.29.29,0,0,0,0,.09,3.33,3.33,0,0,0-.72.65s.21-.15.63-.35a.43.43,0,0,0,0,.05c-.86.76-1.1,1.78-1.2,4a11.14,11.14,0,0,0,.24,3.6h0c0,.1,0,.22,0,.33,0,.36,0,.74,0,1.13a.3.3,0,0,0-.15.18.31.31,0,0,0,.15.35A14.36,14.36,0,0,0,73,34.1a13.87,13.87,0,0,0,1,3.66l.1.22.08.16c0,.07.07.08.12.07l.15,0,.14-.07.41-.25c.53-.36,1.05-.74,1.55-1.1,1-.72,1.93-1.42,2.71-2s1.42-1.12,1.86-1.48c0,0,.21-.28.56-.71s.46-1.5,1-2.7l.2-.5c.22-.59.43-1.28.59-1.85h0c-.22.81-.52,2-.81,2.94-.17.62-.34,1.18-.47,1.56L82,32l.09.12a1.54,1.54,0,0,1-.09.24A15.16,15.16,0,0,1,79.46,35c-.74.66-1.64,1.4-2.61,2.17-.5.39-1,.78-1.54,1.17l-.42.29-.29.15a1.68,1.68,0,0,1-.33.07.6.6,0,0,1-.68-.32l-.15-.28-.11-.23A15.75,15.75,0,0,1,72,30.71c.05-2,.2-3.42.21-3.51s.13-1.47.55-3.49c.11-.5.24-1.05.42-1.62A5.3,5.3,0,0,1,74,20.35a6.45,6.45,0,0,1,1.48-1.42,4.18,4.18,0,0,1,2-.82,6.78,6.78,0,0,1,3.92.93,7,7,0,0,1,1.39,1.23,5,5,0,0,1,1,1.33A7.9,7.9,0,0,1,84.2,23C84.22,23.36,84.24,23.7,84.24,24Z"/>
-                    <path class="cls-4"
-                          d="M72.09,52.35a2.24,2.24,0,0,1,1.3.71,1.19,1.19,0,0,1,.23.5c0,.14,0,.22,0,.23a2.94,2.94,0,0,1-.08.7c-.1.39-.26.81-.38,1.27s-.29,1.15-.38,1.5c0-.17,0-.36-.08-.56s0-.28-.07-.42,0-.41.07-.62c.07-.47.2-1,.25-1.28a2,2,0,0,0,0-.4.79.79,0,0,0,0-.14.91.91,0,0,0-.11-.44,1.86,1.86,0,0,0-.94-.61l-.11,0c0-.18-.09-.36-.14-.53C71.82,52.27,72,52.31,72.09,52.35Z"/>
-                    <path class="cls-4"
-                          d="M72.5,45.47a.71.71,0,0,1-.55.18.47.47,0,0,1-.24-.08.33.33,0,0,0,.1-.06.63.63,0,0,0,.12-.11h0a.57.57,0,0,0,.43-.13c.13-.07.27-.2.39-.27s.09-.06.15,0h0A0,0,0,0,1,73,45h0s0,0,0,0S72.71,45.26,72.5,45.47Z"/>
-                    <path class="cls-4"
-                          d="M71.81,45.51a.33.33,0,0,1-.1.06h0s0,0,0-.05.06,0,.06,0h0a.2.2,0,0,1,.1-.07h.05A.63.63,0,0,1,71.81,45.51Z"/>
-                    <path class="cls-4"
-                          d="M71.82,53.86a.27.27,0,0,1,.16.38,3.1,3.1,0,0,1-.37.46l-.14.14c-.08-.22-.16-.45-.25-.68a3,3,0,0,0,.21-.27C71.49,53.8,71.65,53.79,71.82,53.86Z"/>
-                    <path class="cls-4"
-                          d="M72,53.35c.26,1,.51,2.07.67,2.93-.07.72,0,1.31,0,1.31s.06-.12.11-.33c.07.61.05,1,0,1s-.26-.5-.55-1.27h0s0-.1,0-.15l-.73-2,.14-.14a3.1,3.1,0,0,0,.37-.46.27.27,0,0,0-.16-.38c-.17-.07-.33-.06-.39,0a3,3,0,0,1-.21.27L71,53.65c-.11-.28-.22-.57-.32-.85l.12,0,.32-.08L70.81,52a3.57,3.57,0,0,0,1,.72Z"/>
-                    <path class="cls-4"
-                          d="M70.71,52.8c-.11-.31-.23-.63-.35-.93a.13.13,0,0,0,.06,0l.13-.1a2,2,0,0,0,.25.29h0l.35.66-.32.08-.12,0Z"/>
-                    <path class="cls-4"
-                          d="M71.7,52.22c0,.17.1.35.14.53a3.57,3.57,0,0,1-1-.72h0l-.19-.36-.06.07c-.08-.11-.11-.19-.09-.21S71,51.94,71.7,52.22Z"/>
-                    <path class="cls-4"
-                          d="M69.85,4.31a6.58,6.58,0,0,0-1-1.54,4,4,0,0,0-.28-.29l.87-.17a12.66,12.66,0,0,1,.84,1.75c.07.19.14.4.2.61a4.48,4.48,0,0,1,.11.5c0,.18,0,.38,0,.57l0,.32,0,.16V6.3s0,0,0,0,0-.14.08-.26c.15-.43.3-.83.43-1.17a12.54,12.54,0,0,1,.62-1.27,5,5,0,0,1,.72-1c.15-.14.29-.28.42-.39l.36,0,.69.13a4,4,0,0,0-.41.21,7,7,0,0,0-.74.48,3.42,3.42,0,0,0-.71.78,8,8,0,0,0-.68,1.2,16.59,16.59,0,0,0-.75,2l-.15.49s0,0,0,0V7.42l0-.25-.06-.49c-.05-.32-.09-.64-.13-.94a4.54,4.54,0,0,0-.21-.88A4,4,0,0,0,69.85,4.31Z"/>
-                    <path class="cls-4"
-                          d="M69.89,50.61l-.42-1.11,1.06.18a1.27,1.27,0,0,1-.18.36A2.48,2.48,0,0,1,69.89,50.61Z"/>
-                    <path class="cls-4"
-                          d="M72,45.26a.18.18,0,0,1,0,.14h-.06a.2.2,0,0,0-.1.07h0s0,0,0-.05,0,.05,0,.05,0,0-.06,0,0,0,0,.05h0a3.42,3.42,0,0,1-.69.28,1.86,1.86,0,0,1-.9.06.66.66,0,0,1-.31-.19,2.41,2.41,0,0,0,.33-.15s0,0,.07,0a1.59,1.59,0,0,0,.76,0,3.33,3.33,0,0,0,.78-.22c.1,0,.17-.09.18-.13a.3.3,0,0,0,0-.09S72,45.17,72,45.26Z"/>
-                    <path class="cls-4"
-                          d="M73.26,46.34s-.08.28-.37.61a2.91,2.91,0,0,1-1.33.84,4.65,4.65,0,0,1-1,.18v0a.33.33,0,0,0-.32-.31l-.49.2v-.4l.12-.09.21,0a4.11,4.11,0,0,0,1.39,0,3.16,3.16,0,0,0,1.28-.58c.26-.19.42-.37.5-.41h0Z"/>
-                    <path class="cls-4"
-                          d="M69.71,45.62s0-.07.11-.13.14-.08.16-.06a.32.32,0,0,0,.15.14,2.41,2.41,0,0,1-.33.15A.44.44,0,0,1,69.71,45.62Z"/>
-                    <path class="cls-4" d="M69.72,47.42v-.09h0s0,0,0,0h0l.08,0h0Z"/>
-                    <path class="cls-4" d="M69.68,47.85l0,0v0h0Z"/>
-                    <path class="cls-4"
-                          d="M69.64,47.71a.29.29,0,0,1,0-.11s0-.05,0-.05,0,0,0,0a0,0,0,0,0,0,0l.09-.06v.4l0,0h0A.35.35,0,0,0,69.64,47.71Z"/>
-                    <path class="cls-4" d="M69.72,47.42l-.09.06a.47.47,0,0,0,.07-.12s0,0,0,0Z"/>
-                    <path class="cls-4"
-                          d="M69.39,49.29,69.26,49a6.28,6.28,0,0,0,1.06-.56.45.45,0,0,0,.19-.24c.1.36.35,1.17.56,1.86s.41,1.39.63,2.2c-.69-.28-1.19-.74-1.24-.7s0,.1.09.21l-.13.1a.13.13,0,0,1-.06,0c-.17-.45-.32-.88-.47-1.26a2.48,2.48,0,0,0,.46-.57,1.27,1.27,0,0,0,.18-.36l-1.06-.18h0A.32.32,0,0,0,69.39,49.29Z"/>
-                    <path class="cls-4"
-                          d="M69.53,47.9h.07l.07,0h.06v0l.49-.2a.33.33,0,0,1,.32.31v0h-.09c0-.06,0,0-.1,0s-.25,0-.36,0l-.31,0Z"/>
-                    <path class="cls-4"
-                          d="M69.5,60.72a.27.27,0,0,1,0-.23c0-.12.09-.17.11-.16s0,.08,0,.17.08.11.16.1a.56.56,0,0,0,.24-.17l.11-.12s0,0,.06,0,0,0,0,0l-.25-.1A2.64,2.64,0,0,1,69.6,60s.14-.07.3-.05l.27,0,.45.13a2.71,2.71,0,0,1-.29.4,1,1,0,0,1-.57.29A.36.36,0,0,1,69.5,60.72Z"/>
-                    <path class="cls-4"
-                          d="M69.25,48.92c-.06-.16.19-.4.56-.53a1.8,1.8,0,0,0,.54-.41h.1s0,.07.06.18a.45.45,0,0,1-.19.24,6.28,6.28,0,0,1-1.06.56A.08.08,0,0,1,69.25,48.92Z"/>
-                    <path class="cls-4"
-                          d="M69.37,47.83a.38.38,0,0,1-.1-.13c.12-.07.19-.11.19-.13l.17-.09a0,0,0,0,1,0,0s0,0,0,0,0,0,0,.05a.29.29,0,0,0,0,.11.35.35,0,0,1,0,.13h0l-.07,0h-.12l0,0Z"/>
-                    <path class="cls-4"
-                          d="M69.23,47.6v-.06a.31.31,0,0,1,.13-.25l.09-.06h0l.09,0h.15v.14h0s0,0,0,0a.47.47,0,0,1-.07.12l-.17.09A.66.66,0,0,0,69.23,47.6Z"/>
-                    <path class="cls-4"
-                          d="M68.24,1a1.3,1.3,0,0,1,.46.3,4.37,4.37,0,0,1,.69,1l0,0-.87.17a1.94,1.94,0,0,0-.46-.33c-.06,0-.1,0-.11,0s0-.07,0-.09A.28.28,0,0,0,68,2Z"/>
-                    <path class="cls-4"
-                          d="M69.8,45.72a1.71,1.71,0,0,1-.82.09,1,1,0,0,1-.72-.56,2,2,0,0,1-.19-.79,2.09,2.09,0,0,1,.49-1.33,2.62,2.62,0,0,1,.79-.63l.36-.18a6.43,6.43,0,0,1,.69-.2l.37,0a.8.8,0,0,1,.29,0l.13,0h.11l.17,0,.2-.06.11,0a.53.53,0,0,1,.16,0,3.67,3.67,0,0,1,1,0,1.51,1.51,0,0,1,.55.22,2,2,0,0,1,.42.4,1.29,1.29,0,0,1,.24.56.71.71,0,0,1-.23.61c-.32.22-.44.26-.53.74a.66.66,0,0,1-.24.31l-.16.08-.08,0h0s0,0,0,0,0-.13.06-.2a.25.25,0,0,0,0-.12s0,0,0-.22c0,0,0,0,0,0h0l-.09,0-.14,0c-.08,0-.12,0-.13,0s0,0,.09-.09a.48.48,0,0,1,.38-.14c.1.08,0,.2,0,.3s0,0,.08,0a.34.34,0,0,0,.08-.09.3.3,0,0,0,.07-.21v0s0-.06,0-.08a.42.42,0,0,1,0-.1l.07-.11a1.7,1.7,0,0,1,.19-.19l.17-.15c.15-.13.08-.38-.11-.6a1.18,1.18,0,0,0-.32-.27,1.07,1.07,0,0,0-.38-.13,3.62,3.62,0,0,0-.87,0H72l-.11.05-.21.07-.23.07a1.51,1.51,0,0,1-.29,0l-.25-.05h-.06l-.27.05a3.85,3.85,0,0,0-.58.19,2.5,2.5,0,0,0-.94.59,1.5,1.5,0,0,0-.4.95,1.46,1.46,0,0,0,.1.57.49.49,0,0,0,.36.32,1.74,1.74,0,0,0,1.18-.3,2.2,2.2,0,0,0,.25-.17l.12-.1.06-.06a.15.15,0,0,0,.06-.15s-.07-.08-.11-.09a1,1,0,0,0-.41,0,.48.48,0,0,0-.29.1.84.84,0,0,0-.12.19s-.07.07-.08.06,0,0,0-.08a.85.85,0,0,1,.09-.25.57.57,0,0,1,.37-.21,1.32,1.32,0,0,1,.57,0,.42.42,0,0,1,.29.21.39.39,0,0,1-.08.38,1.13,1.13,0,0,1-.12.18l-.13.13a2.09,2.09,0,0,1-.28.22,2.63,2.63,0,0,1-.33.2.32.32,0,0,1-.15-.14s-.1,0-.16.06-.12.12-.11.13A.44.44,0,0,0,69.8,45.72Z"/>
-                    <path class="cls-4"
-                          d="M69.75,68.12c-.39.57-.83,1.15-1.29,1.72l-.16.22.29-.52c.55-1,1.09-2.06,1.22-2S69.84,67.78,69.75,68.12Z"/>
-                    <path class="cls-4"
-                          d="M69.39,2.28a4.37,4.37,0,0,0-.69-1,1.3,1.3,0,0,0-.46-.3L68.16.37c.63-.07,1.3-.14,2-.18A11.5,11.5,0,0,1,72,.24l.5.1.4.11.79.21.84.25,0,.06a10.26,10.26,0,0,0-1.27,1L73,2.2l-.44-.07-.4-.06a1.66,1.66,0,0,0-.32,0,9.62,9.62,0,0,0-1.47.11l-.92.16Z"/>
-                    <path class="cls-4"
-                          d="M68.82,68a.29.29,0,0,1-.22.13c-.06,0-.08,0-.08,0s.12,0,.17-.17,0-.15.07-.25a1.26,1.26,0,0,0,0-.22s0,0,0,0-.07,0-.07,0l-.2.06c-.11,0-.27.1-.41.17a3.36,3.36,0,0,1-.62.26s.22-.27.5-.46a3.56,3.56,0,0,1,.62-.34,1,1,0,0,1,.2,0c.15,0,.36,0,.3.26a2.46,2.46,0,0,1-.12.36C68.92,67.85,68.88,67.94,68.82,68Z"/>
-                    <path class="cls-4"
-                          d="M68.36,64.15a4.44,4.44,0,0,1,.92-.65l.09,0h0l0,0h-.28a1.32,1.32,0,0,0-.28,0,4.71,4.71,0,0,0-1,.3,1.18,1.18,0,0,1-.36.09c-.09,0-.14,0-.13,0s0,0,.13,0a1.25,1.25,0,0,0,.31-.14,4,4,0,0,1,1-.41,1.15,1.15,0,0,1,.31,0h.33a1.65,1.65,0,0,1,.74.05.19.19,0,0,1,0,.3l-.2.09-.3.09-.17.06-.12,0a5.36,5.36,0,0,0-.91.55.64.64,0,0,1-1-.1.63.63,0,0,1-.18-.34c0-.12.1-.13.1-.12a.15.15,0,0,0,0,.11.7.7,0,0,0,.2.26.8.8,0,0,0,.38.23A.82.82,0,0,0,68.36,64.15Z"/>
-                    <path class="cls-4"
-                          d="M69.26,47.68a4.48,4.48,0,0,1-.78.28,8,8,0,0,1-2,.27A6.46,6.46,0,0,0,67.83,48a12.74,12.74,0,0,1,1.4-.35.11.11,0,0,0,0,.07Z"/>
-                    <path class="cls-4"
-                          d="M66.51,48.79a1.56,1.56,0,0,1-.19-.14v0h.09a6.24,6.24,0,0,0,.82-.17h0a.26.26,0,0,0,0,.15.73.73,0,0,0,.26.2,1.32,1.32,0,0,0,1,.09,1.53,1.53,0,0,0,.79-.36,2.4,2.4,0,0,0,.26-.18s.13-.12.13-.22v-.08a1.59,1.59,0,0,0-.19-.16l.15,0L70,48c.11,0,.23,0,.36,0a1.8,1.8,0,0,1-.54.41c-.37.13-.62.37-.56.53a.08.08,0,0,0,0,0,6.28,6.28,0,0,1-.66.23,2.65,2.65,0,0,1-1.18,0,2.6,2.6,0,0,1-.47-.16A3.7,3.7,0,0,1,66.51,48.79Z"/>
-                    <path class="cls-4"
-                          d="M66.32,48.63c0-.06-.22-.15-.22-.2a2,2,0,0,1,.59,0,5.19,5.19,0,0,1,.48-.24l.29.1H67.4l-.09,0a.2.2,0,0,0-.08.08,6.24,6.24,0,0,1-.82.17Z"/>
-                    <path class="cls-4"
-                          d="M66.26,42.61s-.08,0-.16,0,.11-.54.38-.34.4.48.11.48l-.68,0s0,0,0,0a1.43,1.43,0,0,1,.28,0l.3,0a.23.23,0,0,0,.1,0s0,0,0-.06a2.23,2.23,0,0,0-.2-.18c-.08,0,0,0-.07,0A.61.61,0,0,0,66.26,42.61Z"/>
-                    <path class="cls-4"
-                          d="M66.1,42.6c.08,0,.16,0,.16,0a.61.61,0,0,1,.09-.22s0,0,.07,0a2.23,2.23,0,0,1,.2.18s0,0,0,.06a.23.23,0,0,1-.1,0l-.3,0a1.43,1.43,0,0,0-.28,0Z"/>
-                    <path class="cls-4"
-                          d="M65.93,51.85a2.07,2.07,0,0,1-.15-.34s0-.07,0-.09l.09,0,.16,0a4.87,4.87,0,0,1,.72-.13l.6-.11.51-.09a2.22,2.22,0,0,0,1.25-.69,2.55,2.55,0,0,0,.18-.28,1.42,1.42,0,0,0,.19-.52v0h0l.42,1.11a3.23,3.23,0,0,1-.27.23,3.36,3.36,0,0,1-1.66.6l-1.08.1-.47,0-.13,0s-.11,0-.07,0a1.34,1.34,0,0,0,.12.24,1.54,1.54,0,0,0,.36.36,2.64,2.64,0,0,0,1.53.43,3.75,3.75,0,0,0,1.47-.4,3.19,3.19,0,0,0,.67-.41c.12.3.24.62.35.93-.21.06-.48.12-.84.19a6.2,6.2,0,0,1-1.72.12A3.44,3.44,0,0,1,67,52.8a2.93,2.93,0,0,1-.59-.35A2.3,2.3,0,0,1,65.93,51.85Z"/>
-                    <path class="cls-4"
-                          d="M65.93,42.79l0,0,.68,0c.29,0,.15-.28-.11-.48s-.38.34-.38.34-.16-.05-.16-.07a.9.9,0,0,1,.18-.34.3.3,0,0,1,.23-.11h0a.41.41,0,0,1,.24.1,1,1,0,0,1,.26.37.22.22,0,0,1-.09.25.43.43,0,0,1-.23,0l-.32,0Z"/>
-                    <path class="cls-4"
-                          d="M65.79,45.53a1.65,1.65,0,0,1,.26-.36s0-.08-.08-.14a1.14,1.14,0,0,1,.38.22.47.47,0,0,1,.15.36.43.43,0,0,1-.33.27c-.16,0-.35,0-.39,0A.27.27,0,0,1,65.79,45.53Z"/>
-                    <path class="cls-4"
-                          d="M65.79,45.53a.27.27,0,0,0,0,.32c0,.07.23.08.39,0a.43.43,0,0,0,.33-.27.47.47,0,0,0-.15-.36A1.14,1.14,0,0,0,66,45c.06.06.1.12.08.14A1.65,1.65,0,0,0,65.79,45.53Zm-.11.4c-.24-.26,0-.64.27-.91a.74.74,0,0,1,.63.46C66.73,45.91,65.92,46.2,65.68,45.93Z"/>
-                    <path class="cls-4"
-                          d="M65.57,46a.58.58,0,0,1-.07-.61,1.86,1.86,0,0,1,.3-.45s.09,0,.15.06c-.22.27-.51.65-.27.91s1,0,.9-.45A.74.74,0,0,0,66,45a.6.6,0,0,1,.48.13.61.61,0,0,1,.26.49.64.64,0,0,1-.44.46A.62.62,0,0,1,65.57,46Z"/>
-                    <path class="cls-4"
-                          d="M65.42,75.37l.63-.61s0,0,.1.17l-.32.32-.28.25v-.07c0-.05,0,0,0-.05S65.42,75.36,65.42,75.37Z"/>
-                    <path class="cls-4" d="M65.85,33.64a3.88,3.88,0,0,1-.65.15l.06,0,.76-.27Z"/>
-                    <path class="cls-4"
-                          d="M65.22,75.66a10.11,10.11,0,0,1,1.16-2c.29-.48.55-1,.74-1.38l.32-.69s.16-.27.37-.65.31-.55.48-.87h0l.16-.22c.46-.57.9-1.15,1.29-1.72a15.52,15.52,0,0,1-.53,1.7c-.2.55-.42,1.1-.59,1.52l-.31.71s-.16.29-.41.67a11.85,11.85,0,0,1-1,1.35c-.27.32-.54.61-.79.86-.07-.13-.1-.16-.1-.17l-.63.61s.06,0,.08,0,0,0,0,.05v.07C65.37,75.65,65.24,75.73,65.22,75.66Z"/>
-                    <path class="cls-4"
-                          d="M65.15,54.56c.47.13.94.28,1.29.36s.7.13,1,.17l1,.09a3.82,3.82,0,0,0,1.73-.24,2.6,2.6,0,0,0,1-.68.58.58,0,0,0,.08-.1c.09.23.17.46.25.68a3.23,3.23,0,0,1-1.07.67,4.34,4.34,0,0,1-2,.22,10.49,10.49,0,0,1-1.08-.12l-.19,0-.16,0-.08,0,0,.05.13.13.08.06.24.17c.17.12.35.22.52.33a5.17,5.17,0,0,0,2.1.68,11.22,11.22,0,0,0,1.62.08,4.73,4.73,0,0,1,.62,0h0a5.76,5.76,0,0,1-2.27.19,5.19,5.19,0,0,1-2.25-.6,6.32,6.32,0,0,1-.56-.33l-.3-.18c-.14-.11-.29-.21-.42-.32a8.09,8.09,0,0,1-.75-.64l-.35-.32,0,0,0,0,0,0Z"/>
-                    <path class="cls-4"
-                          d="M65.1,82.1c0-.15,0-.37,0-.69,0-.6,0-1.52.08-2.83a25.11,25.11,0,0,1,.33-2.81,1.48,1.48,0,0,0,0-.27l.28-.25.32-.32a.73.73,0,0,1,0,.12.8.8,0,0,1,0,.44,2.9,2.9,0,0,1-.16.41,7,7,0,0,0-.65,2.7,9.38,9.38,0,0,0,.25,2.79,2.5,2.5,0,0,0,.2.57c-.39.06-.59.13-.61.09s0,0,.06,0a.25.25,0,0,0,.13,0h0l-.32.06h0V82.1Z"/>
-                    <path class="cls-4"
-                          d="M65,2.81c.09-.9.17-1.29.17-1.29l.1-1.1.43,0,.65.05a2.59,2.59,0,0,0,.28,0h.31L68.16.37l.08.64L68,2A.28.28,0,0,1,68,2s0,.07,0,.09,0,0,.11,0a1.94,1.94,0,0,1,.46.33c-.43.08-.87.18-1.32.25a3,3,0,0,1-.43.06l-.46,0h-.76Z"/>
-                    <path class="cls-4"
-                          d="M65,34a2.23,2.23,0,0,1-.89,0,6.6,6.6,0,0,0,.84-.16h0l.27-.05A1.88,1.88,0,0,1,65,34Z"/>
-                    <path class="cls-4" d="M64.36,42.92a.25.25,0,0,1,0,.09.08.08,0,0,1,0,0l-.08.05v0l.17-.18Z"/>
-                    <path class="cls-4"
-                          d="M64.47,6.11c-.07-1.52-.17-2.6-.26-3.32h0l.74,0c-.09,1-.19,2.51-.18,4.74,0,0,0-.24-.09-.46S64.56,6.42,64.47,6.11Z"/>
-                    <path class="cls-4"
-                          d="M64.19,43.08c0-.19-.09-.36-.15-.55a.29.29,0,0,1,.28.48.25.25,0,0,0,0-.09v0Z"/>
-                    <path class="cls-4" d="M64.28,43.05a.2.2,0,0,1-.15.07l.07,0Z"/>
-                    <path class="cls-4" d="M64.19,43.08v0h0Z"/>
-                    <path class="cls-4" d="M64.21,2.79A11.32,11.32,0,0,0,64,1.53h1.17s-.08.39-.17,1.29l-.74,0Z"/>
-                    <path class="cls-4"
-                          d="M63.8,42.74l0-.06a.31.31,0,0,1,.15-.12l.05,0h0c.06.19.1.36.15.55l0,0h0l-.07,0h0a.28.28,0,0,1-.33-.35Z"/>
-                    <path class="cls-4" d="M64,42.56a.31.31,0,0,0-.15.12.25.25,0,0,1,.18-.14h0Z"/>
-                    <path class="cls-4" d="M64.28,46.85a.3.3,0,0,1-.44-.37Z"/>
-                    <path class="cls-4" d="M63.92,46.38a.3.3,0,0,1,.42.42l0,0,0,0-.44-.37a.19.19,0,0,1,.06-.07Z"/>
-                    <path class="cls-4"
-                          d="M63.54,24.54h.29l.29.18a5.29,5.29,0,0,1,1.67,2.12l.39.8c.34.73.43,1,.86,2.07,0,.05,0,.11,0,.15v.21a22.94,22.94,0,0,0-1.45-3.34l-.09-.15-.24-.45L65.17,26a4.33,4.33,0,0,0-.85-1A6.68,6.68,0,0,0,63.54,24.54Z"/>
-                    <path class="cls-4" d="M64.13,43.12c-.26.1-.4-.17-.33-.38v0A.28.28,0,0,0,64.13,43.12Z"/>
-                    <path class="cls-4"
-                          d="M70.72,83.58h0Zm-8-10.71c0-.22,0-.42-.05-.57.32,0,.65-.06,1-.12,0,.16,0,.36,0,.61,0,.62.12,1.49.2,2.56,0,.53.09,1.11.14,1.73l.09.84c0,.14.05.21.07.3l0,.24c0,.17.08.34.11.5.22,1,.44,2.16.67,3.24h0l.18.87,1.49.82,2.42,0a2.26,2.26,0,0,0,1.07-.11,1,1,0,0,0,.36-.3l.09-.11a0,0,0,0,0,0,0,.28.28,0,0,1,0,.11h0l.27.19c.09-.1,0-.36-.13-.59a.35.35,0,0,1,.05-.08l.29-.49.09-.15,0,.08.3-.14a1.31,1.31,0,0,0-.17-.23L71.27,82a1.18,1.18,0,0,0-.32-.66.72.72,0,0,0-.73-.28,7.83,7.83,0,0,0-.86.38,9.26,9.26,0,0,1-1.63.62,5.7,5.7,0,0,1-1.35,0c-.36,0-.64,0-.84,0h-.09l.21,0,.15,0h.09V82h0l.48-.06a6,6,0,0,0,1.28-.11,9.28,9.28,0,0,0,1.53-.68,6.59,6.59,0,0,1,.92-.45,1.08,1.08,0,0,1,.64,0,1.4,1.4,0,0,1,.52.33,1.76,1.76,0,0,1,.53,1.14.67.67,0,0,1,0,.39c-.06.12-.09.2-.14.29s-.19.35-.29.52-.21.35-.34.53a1.52,1.52,0,0,1-.55.48,3,3,0,0,1-1.34.21l-2.58,0-2-1c-.35-1.53-.69-3-1-4.43-.08-.31-.15-.62-.23-.92a1.12,1.12,0,0,1,0-.21l0-.13,0-.24c0-.16,0-.32-.06-.48-.06-.62-.12-1.2-.17-1.74C62.88,74.36,62.79,73.48,62.74,72.87Z"/>
-                    <path class="cls-4"
-                          d="M63.36,46.07c-.12-.1-.23-.21-.35-.3a11.07,11.07,0,0,1,1.34-.62c.44-.12.75-.09.75,0s-.29.11-.66.29S63.76,45.81,63.36,46.07Z"/>
-                    <path class="cls-4"
-                          d="M63.6,103.49c.15-.25.35-.62.6-1s.51-.93.76-1.47a5.53,5.53,0,0,0,.33-.85,5,5,0,0,0,.17-.92,3.56,3.56,0,0,0-.12-1.79,4.35,4.35,0,0,0-.91-1.32,2.7,2.7,0,0,0-.75-.57,1.31,1.31,0,0,0,.27-.06,2.77,2.77,0,0,1,.66.45,4.13,4.13,0,0,1,1.06,1.35,4,4,0,0,1,.26,2,9.76,9.76,0,0,1-.14,1,6.81,6.81,0,0,1-.33.93c-.24.57-.5,1.09-.73,1.54s-.37.7-.5,1c-.26,0-.51.07-.77.09A2.4,2.4,0,0,0,63.6,103.49Z"/>
-                    <path class="cls-4"
-                          d="M63.59,104.25c-.17-.07-.27-.21-.22-.32a.65.65,0,0,0,.09-.16c.26,0,.51,0,.77-.09l-.06.12-.2.41C63.93,104.3,63.76,104.31,63.59,104.25Z"/>
-                    <path class="cls-4"
-                          d="M64.23,47.57a15.8,15.8,0,0,1-1.3-1.22l.17-.11.26-.17.48.41a.3.3,0,0,0,.44.37l.3.22a2.59,2.59,0,0,0,.57.27l.26.09a4.17,4.17,0,0,0,.92.19,7.45,7.45,0,0,0,2-.12,3.88,3.88,0,0,0,1.82-.81c.43-.35.62-.71.68-.65a.68.68,0,0,1-.1.25,2.24,2.24,0,0,1-.41.58,2.7,2.7,0,0,1-.53.46h0l-.08,0h0v-.11h-.15l-.09,0h0l-.09.06a.31.31,0,0,0-.13.25v.06a12.74,12.74,0,0,0-1.4.35,6.46,6.46,0,0,1-1.37.28h-.17a4,4,0,0,1-1.07-.17A3.79,3.79,0,0,1,64.23,47.57Z"/>
-                    <path class="cls-4"
-                          d="M62.69,72.3c0-.26,0-.4,0-.44h.57l.37,0h0v0a1.23,1.23,0,0,0,0,.17v.09C63.34,72.24,63,72.27,62.69,72.3Z"/>
-                    <path class="cls-4" d="M62.58,46l.29-.15.14-.07c.12.09.23.2.35.3l-.26.17-.17.11-.28-.29Z"/>
-                    <path class="cls-4"
-                          d="M63.09,95.46s.13-.16.44-.13a1.26,1.26,0,0,1,.42.13,1.31,1.31,0,0,1-.27.06l-.17-.06A.8.8,0,0,0,63.09,95.46Z"/>
-                    <path class="cls-4"
-                          d="M62.26,2.86l-.17-.16.94,0a13.83,13.83,0,0,1,1.44,3.38c0,.45,0,.94,0,1.47,0-.06,0-.24-.09-.43A8.5,8.5,0,0,0,62.26,2.86Z"/>
-                    <path class="cls-4" d="M62.58,46l-1-1.08.35-.12,1.07.94s0,0,0,0l-.14.07Z"/>
-                    <path class="cls-4"
-                          d="M64,63.47l.28,0h0a.3.3,0,0,1,0-.11s0,0,0,0a.45.45,0,0,1-.06-.09s0,0,0,0l-.13.08Zm-1.18.2a.82.82,0,0,1,.52-.47,3.31,3.31,0,0,1,.68,0,2.66,2.66,0,0,1,.31,0,.29.29,0,0,1,.15,0,.18.18,0,0,1,.06.23c0,.07-.06.06-.09.08l0,0a.1.1,0,0,0-.08,0,1.63,1.63,0,0,1-.62.28,2.44,2.44,0,0,1-.94.07S62.76,63.84,62.83,63.67Zm0,.28a0,0,0,0,0,0,0h0c.11,0,.49-.14.85-.26a1.07,1.07,0,0,0,.35-.2,3.94,3.94,0,0,0-.6,0c-.35,0-.53.41-.6.5h0S62.79,63.94,62.79,64Z"/>
-                    <path class="cls-4"
-                          d="M62.2,34.09h.47l.55,0,.5,0h.05l-.05.06c-.35,0-.71,0-1.06.07a.26.26,0,0,0-.17.07A2.64,2.64,0,0,1,62.2,34.09Z"/>
-                    <path class="cls-4" d="M61.63,47.2l-.73-.29.54-.3c.31-.18.72-.39,1.14-.62l.07.07.28.29Z"/>
-                    <path class="cls-4" d="M62.43,72.32c0-.29.08-.45.11-.45s.07.16.08.44Z"/>
-                    <path class="cls-4"
-                          d="M62.78,2.34A7.83,7.83,0,0,0,62,1.39l-.26-.28.16-1c.41,0,1.32.13,2.5.27l.83.08-.1,1.1H64a11.32,11.32,0,0,1,.22,1.26L63,2.73Z"/>
-                    <path class="cls-4"
-                          d="M61.6,77.87l0-.27c.21-1.44.42-2.87.58-3.94.08-.56.15-1,.2-1.34h.19c0,.91-.08,3.14-.28,5.39l0,.27v.08a.92.92,0,0,1-.06.22h0s0,0,0,0h0a0,0,0,0,0,0,0h0s0,0,0,0l0,0h0l0,0a.75.75,0,0,1-.09-.09h0l0,0,0,0,0,0H61.8a.66.66,0,0,0-.16-.15l0,0,0,0,0,.07h0Z"/>
-                    <path class="cls-4"
-                          d="M61.41,2.21l-.3-.14.66-1,.26.28a7.83,7.83,0,0,1,.75,1l.25.39-.94,0A3.67,3.67,0,0,0,61.41,2.21Z"/>
-                    <path class="cls-4"
-                          d="M61.9,44.79l-.48-.4,1-.28c.25-.06.5-.12.74-.16a15.2,15.2,0,0,1,2.28-.37c.07,0,.11,0,.11,0s-1.51.48-3,1Z"/>
-                    <path class="cls-4"
-                          d="M64.36,48.6a16.2,16.2,0,0,1-3.42-1,.67.67,0,0,0,.17-.1l.52-.35a14.41,14.41,0,0,0,2.81.9,9.52,9.52,0,0,0,1.93.13h.09a8,8,0,0,0,2-.27,4.48,4.48,0,0,0,.78-.28v0a8.75,8.75,0,0,1-1.34.5c-.21.08-.44.17-.7.25a.2.2,0,0,1,.08-.08l.09,0h.06l-.29-.1a5.19,5.19,0,0,0-.48.24,2,2,0,0,0-.59,0s.18.14.22.2A9.28,9.28,0,0,1,64.36,48.6Z"/>
-                    <path class="cls-4"
-                          d="M61.38,67.49a1.22,1.22,0,0,1,.36-1,1,1,0,0,1,.78-.31l.37,0a3.49,3.49,0,0,1,.52.13c.1,0,.23.15.22.28a.39.39,0,0,1-.1.19l-.09.1a2.68,2.68,0,0,1-.42.31,1.18,1.18,0,0,1-.77,0s.34-.07.68-.21c.1-.09.24-.22.34-.33l.06-.08v0l-.05,0a2.34,2.34,0,0,0-.45-.07l-.35-.06a.73.73,0,0,0-.59.17A2.13,2.13,0,0,0,61.38,67.49Z"/>
-                    <path class="cls-4" d="M61.55,44.91l-.35-.38-.06-.07.28-.07.48.4Z"/>
-                    <path class="cls-4" d="M61.14,44.46a6.65,6.65,0,0,1-.58-.66c0-.06.39.19.86.59Z"/>
-                    <path class="cls-4" d="M60.21,47.4l.37-.28.18-.12.14-.09.73.29-.52.35a.67.67,0,0,1-.17.1Z"/>
-                    <path class="cls-4"
-                          d="M59.77,82.57c.12-.31.29-.75.48-1.27l.69-1.76.39-1,.21-.51,0-.09s0,0,0,0,0,.12.07.11,0-.11.07-.08h.12l0,0,0,0,0,0h0a.75.75,0,0,0,.09.09l0,0h0l0,0s0,0,0,0h0a0,0,0,0,1,0,0h0l-.18.5c-.11.34-.22.68-.34,1l-.59,1.79c-.18.52-.32,1-.43,1.28l0,0c-.18,0-.51.09-.51.1h-.51a.19.19,0,0,1,0-.08s0,0,0-.06l0-.07v0C59.71,82.72,59.74,82.65,59.77,82.57Z"/>
-                    <path class="cls-4"
-                          d="M59.25,69.32c.06.09,0,0,0,0S59.24,69.31,59.25,69.32Zm0,.09-.1,0s0,0,0,0,0,0,0,0,0,0,0,0a.42.42,0,0,0-.06-.08s-.11-.06,0-.06a.62.62,0,0,0,.18,0,1.17,1.17,0,0,0,.46-.07s0,0,0,0,0,0,0,0a.88.88,0,0,0-.28-.12c-.08,0-.14,0-.15,0s.25-.19.56,0c.09,0,.2.11.22.2a.25.25,0,0,1-.07.24.58.58,0,0,1-.25.12l-.19,0A1.16,1.16,0,0,1,59.27,69.41Z"/>
-                    <path class="cls-4"
-                          d="M59.54,47.17c-.55-.18-1.11-.35-1.69-.52h0l.44-.3.4-.24h0l1.06.37,1.12.44-.14.09-.18.12-.37.28Z"/>
-                    <path class="cls-4"
-                          d="M59.23,48.92a17.23,17.23,0,0,1-1.8,1.48h0a8.94,8.94,0,0,1,1.49-1.81c.42-.42.85-.83,1.21-1.12a.47.47,0,0,1,.09-.06l.73.25-.45.3A15.49,15.49,0,0,0,59.23,48.92Z"/>
-                    <path class="cls-4"
-                          d="M58.4,45.58a9.83,9.83,0,0,1,1-.5s.41-.17,1-.37l.8-.25.06.07.35.38c-.37.13-.71.26-1,.38-.55.21-.91.38-.93.39s-.4.16-.9.42c-.24-.08-.48-.17-.73-.24C58.14,45.77,58.27,45.67,58.4,45.58Z"/>
-                    <path class="cls-4" d="M57.85,46.65l-.65-.18.35-.27.43-.33h0c.25.07.49.16.73.24h0l-.4.24-.44.3Z"/>
-                    <path class="cls-4" d="M56.76,71.51l.12-.28c.07.12.16.26.25.43C57,71.62,56.88,71.56,56.76,71.51Z"/>
-                    <path class="cls-4"
-                          d="M57.4,73.87c-.25-.87-.52-1.73-.67-2.29h0l0-.07c.12,0,.24.11.37.15.27.51.62,1.24.93,2s.58,1.42.76,2a9,9,0,0,1,.29,1,24.29,24.29,0,0,1,.13,3.15,9.73,9.73,0,0,1-.25,3,.13.13,0,0,0,0-.06s.11-.25-.11-.2c-.1-.49-.21-1.59-.34-2.71-.09-.75-.18-1.51-.25-2.07,0-.28-.08-.51-.11-.68s0-.25,0-.26,0-.38-.19-.93S57.61,74.59,57.4,73.87Z"/>
-                    <path class="cls-4" d="M56.7,71.48c-.08-.32-.12-.52-.09-.54s.14.09.27.29l-.12.28Z"/>
-                    <path class="cls-4"
-                          d="M56.13.22C57,.12,57.75.06,58.46,0c.94,0,1.74,0,2.31,0l.93,0,.23,0-.16,1-.66,1,.3.14a3.67,3.67,0,0,1,.68.49l-.57,0-.9-.08c-.52,0-1.27-.11-2.15-.13l-1,0c-.1-.29-.19-.54-.29-.77s-.12-.25-.18-.36a1.29,1.29,0,0,0-.3-.35l-.33-.3L56.16.44Z"/>
-                    <path class="cls-4"
-                          d="M56.26,1.74h0Zm-.48-.2L55.5,1.4l.66-1,.25.22.33.3a1.29,1.29,0,0,1,.3.35c.06.11.13.24.18.36s.19.48.29.77h-.82A3.89,3.89,0,0,0,56.44,2l-.17-.23h0s0,0,0,0h0l-.06,0Z"/>
-                    <path class="cls-4" d="M56.26,1.73h0Z"/>
-                    <path class="cls-4"
-                          d="M55.72,86.44c-.1-.15.71-.92.79-.71l-.28.37c-.19.22-.19.36-.18.38a.23.23,0,0,0,0,.12.85.85,0,0,0,.09.29c0,.08.1.17.14.24s0,0-.22,0a.68.68,0,0,1-.12-.12A.82.82,0,0,1,55.72,86.44Z"/>
-                    <path class="cls-4"
-                          d="M56.7,71.48a11.29,11.29,0,0,1-1.09-.57,3.26,3.26,0,0,0,.11-.33L57,71a1.52,1.52,0,0,0-.07.18s0,0,0,0c-.13-.2-.22-.31-.27-.29S56.62,71.16,56.7,71.48Z"/>
-                    <path class="cls-4"
-                          d="M55.54,62.68s0,.07,0,.07,0,0-.1,0,0-.08,0-.09l.07,0,.14,0c.21,0,.47,0,.73-.08a2.69,2.69,0,0,1,.78-.06,1.59,1.59,0,0,1,.3.06.37.37,0,0,1,.16.1.2.2,0,0,1,.07.15.23.23,0,0,1,0,.17.7.7,0,0,1-.17.14l-.27.21a.92.92,0,0,1-.42.2.82.82,0,0,1-.44-.11l-.31-.14c-.18-.1-.3-.16-.29-.18s.14,0,.33.05l.34.1a.72.72,0,0,0,.34.05c.18,0,.36-.29.53-.42s0,0,0,0h0l-.19,0a2.74,2.74,0,0,0-.71,0,4.44,4.44,0,0,1-.75,0Z"/>
-                    <path class="cls-4"
-                          d="M55.22,84.56a2.87,2.87,0,0,1,.79-.34c.77-.46,1.2-.77,2-1.3l.57-.29.28-.11c0,.17.06.27.09.27a12,12,0,0,1-1.75,1.15s-1.93.78-2,.62Z"/>
-                    <path class="cls-4"
-                          d="M55.18,95.46s.16,0,.37.14l.08.05-.17,0a.38.38,0,0,0-.1,0C55.26,95.51,55.18,95.47,55.18,95.46Z"/>
-                    <path class="cls-4"
-                          d="M54.85,85.94a1.91,1.91,0,0,0-.22.4l-.07.13a1.12,1.12,0,0,0-.07.29.45.45,0,0,0,0,.16h0s-.07,0-.1,0l-.12-.16a1,1,0,0,1,.08-.53,1.62,1.62,0,0,1,.1-.15,1.1,1.1,0,0,1,.26-.27c.21-.18.48-.25.49-.2S55,85.75,54.85,85.94Z"/>
-                    <path class="cls-4"
-                          d="M54.21,48.94a17.91,17.91,0,0,1,2.42-2l.57-.44.65.18-1,.64A20.84,20.84,0,0,1,54.21,48.94Z"/>
-                    <path class="cls-4"
-                          d="M53.91,69l.15-.25a.23.23,0,0,0,.18,0l.23.18h0a.42.42,0,0,1-.28.1A.57.57,0,0,1,53.91,69Z"/>
-                    <path class="cls-4"
-                          d="M54,87.35c-.18-.29-.37-.59-.55-.86v-.23s0-.12,0-.16l.06-.31a2.37,2.37,0,0,1,.18-.55,1.34,1.34,0,0,1,.68-.72,1.55,1.55,0,0,1,.81,0h0a.92.92,0,0,0-.69.19,1,1,0,0,0-.45.63,2.25,2.25,0,0,0-.11.48,2.45,2.45,0,0,0,0,.27v.21l.29.39a.06.06,0,0,0,0,0c0,.3.27.48.3.45s0-.15-.06-.3l.18,0,.45.07.92.12c.14.14.29.22.32.19s0-.09-.1-.19h0l0,0,.09-.08.18-.16L58,85.68l1.12-.94.51-1.63s0,0,0-.14v0a.19.19,0,0,0,0,.08h.86l.12,0h0v0h0v0h0l0,.08v0a1.43,1.43,0,0,1,0,.17l-.18.52-.49,1.36c-.79.59-1.79,1.36-2.82,2.15l-.43.33a.25.25,0,0,1-.08,0h0l-.09,0h-.07l-.13,0a1.43,1.43,0,0,1-.29,0c-.32,0-.63-.12-.93-.18l-.45-.1-.24-.06-.17,0S54.05,87.41,54,87.35Z"/>
-                    <path class="cls-4"
-                          d="M53.76,103.17l-.7-.13A11,11,0,0,1,54,102a8.63,8.63,0,0,0,1.71-2.48A5.15,5.15,0,0,0,56,96.53a1.75,1.75,0,0,0-.59-.93.38.38,0,0,1,.1,0l.17,0a1.8,1.8,0,0,1,.56.8,5.16,5.16,0,0,1-.08,3.17,9,9,0,0,1-1.68,2.72c-.28.34-.51.6-.65.8C53.78,103.16,53.77,103.17,53.76,103.17Z"/>
-                    <path class="cls-4"
-                          d="M50.81,43.3c.88-.31,1.75-.56,2.44-.74s1.36-.29,1.39-.3.59-.09,1.41-.14a18.94,18.94,0,0,1,3,.06,17.42,17.42,0,0,1,2.26.38l.62.15a4.16,4.16,0,0,1,1.24.48s0,0,0,0-.59-.12-1.26-.23A21.45,21.45,0,0,0,59,42.65a20.34,20.34,0,0,0-2.89.07c-.8.09-1.33.17-1.36.19s-.57.06-1.35.24c-.54.11-1.2.27-1.9.46Z"/>
-                    <path class="cls-4"
-                          d="M53.36,68c.18-.12.21-.21.21-.24l-.06-.19.21,0h.84a.17.17,0,0,1,.18.12A1.55,1.55,0,0,1,54.48,69h0l-.23-.18,0,0a1.4,1.4,0,0,0,.21-.91c-.17,0-.47,0-.65,0a.67.67,0,0,1-.27.33Z"/>
-                    <path class="cls-4" d="M53.57,68.18l-.08.06L53.32,68l0,0Z"/>
-                    <path class="cls-4"
-                          d="M53,103.12a.59.59,0,0,1,.05-.08l.7.13-.19.29c0,.07-.2.05-.36,0S53,103.21,53,103.12Z"/>
-                    <path class="cls-4"
-                          d="M52.49,30.69c0-.11,0-.19,0-.29s.09-.36.13-.54c.11-.35.24-.7.38-1a11.22,11.22,0,0,1,2.58-3.54,11,11,0,0,1,1.67-1.37,6.51,6.51,0,0,1,1.94-1,4.91,4.91,0,0,1,2.12-.1,7.73,7.73,0,0,1,1.87.6,10.16,10.16,0,0,1,1.62.87A5.34,5.34,0,0,1,66,25.61a10.8,10.8,0,0,1,1.14,2.52,16.49,16.49,0,0,1,.59,2.52,3.9,3.9,0,0,1-.18,2s0-.75,0-.76a17.77,17.77,0,0,0-.48-1.77v-.21s0-.1,0-.15c-.43-1.11-.52-1.34-.86-2.07l-.39-.8a5.29,5.29,0,0,0-1.67-2.12l-.29-.18h-.29l-.65-.32a5,5,0,0,0-3.45-.5,8.45,8.45,0,0,0-3.31,2.09,10.62,10.62,0,0,0-2.48,3.28,6.91,6.91,0,0,0-.37.95c-.05.16-.09.32-.13.48l0,.24,0,.09.28.22.41.32.85.6h0a9.23,9.23,0,0,0,2.41,1.09,22.51,22.51,0,0,0,2.47.64,15.88,15.88,0,0,0,2.67.36,2.64,2.64,0,0,0,.29.15.26.26,0,0,1,.17-.07c.35,0,.71-.06,1.06-.07l.05-.06h.16l.14,0A2.23,2.23,0,0,0,65,34a1.88,1.88,0,0,0,.24-.18,3.88,3.88,0,0,0,.65-.15l.17-.16c.23-.1.44-.2.62-.3a9.45,9.45,0,0,0,.92-.58s-.23.33-.85.72a7.36,7.36,0,0,1-2.83,1,12.77,12.77,0,0,1-4.43-.18,23.55,23.55,0,0,1-2.54-.58,9.39,9.39,0,0,1-2.61-1.13h0l-.86-.58L53,31.55l-.21-.16-.34-.27C52.46,31,52.48,30.83,52.49,30.69Z"/>
-                    <path class="cls-4"
-                          d="M52.42,47.22a6.31,6.31,0,0,0-.48-.84l.52-1a.82.82,0,0,1,.21.19,1.35,1.35,0,0,1,.17.34,2.81,2.81,0,0,1,.08.31C52.78,46.47,52.61,46.81,52.42,47.22Z"/>
-                    <path class="cls-4"
-                          d="M52.33,68.31a.74.74,0,0,0,.12-.6A9.85,9.85,0,0,1,52,66.3l.13-.07a7,7,0,0,0,1.1,1.61l.14.13,0,0,.17.24.08-.06c.21.21.44.41.67.61a.23.23,0,0,1-.18,0l-.15.25a.57.57,0,0,0,.28.08.42.42,0,0,0,.28-.1l.61.47a10.13,10.13,0,0,0,4.36,2,13.65,13.65,0,0,0,2.4.12,16.42,16.42,0,0,0,2.35-.22A5.89,5.89,0,0,0,68,69.45a27.21,27.21,0,0,0,2.4-3.28,15.19,15.19,0,0,0,2.22-5.6c.23-1.45.13-2.3.2-2.3a2.49,2.49,0,0,1,.09.6,2.06,2.06,0,0,1,0,.26c0,.15,0,.3,0,.48a6.06,6.06,0,0,1-.06,1,4.65,4.65,0,0,1-.08.61h-.14s0,0,.13.06a15.6,15.6,0,0,1-2,5.15c-.32.55-.67,1.11-1.07,1.68.09-.34.12-.56.06-.58s-.67,1-1.22,2l-.29.52h0a4.94,4.94,0,0,1-1.66,1.26,9.17,9.17,0,0,1-2.31.74l-.66.11v-.09a1.23,1.23,0,0,1,0-.17v0h0l-.37,0h-.57s0,.18,0,.44h-.07c0-.28,0-.43-.08-.44s-.06.16-.11.45a5.44,5.44,0,0,1-.57,0,14.65,14.65,0,0,1-2.55-.07,8.75,8.75,0,0,1-2.18-.62c-.09-.17-.18-.31-.25-.43s0,0,0,0A1.52,1.52,0,0,1,57,71l-1.24-.45a3.26,3.26,0,0,1-.11.33c-.37-.22-.73-.46-1.08-.71a16.79,16.79,0,0,1-2-1.68Z"/>
-                    <path class="cls-4" d="M52.07,45l.11-.23,1.18.58-.07.14c-.27-.09-.47-.18-.7-.28Z"/>
-                    <path class="cls-4"
-                          d="M51.43,70.37a2.09,2.09,0,0,1-.29-.32l0-.12v0A7,7,0,0,0,52,68.85l0,.11a.66.66,0,0,0,.24.45.48.48,0,0,0,0,.13l.28.46c.21.34.45.64.4.81s-.57.12-1-.1A4.77,4.77,0,0,1,51.43,70.37Z"/>
-                    <path class="cls-4"
-                          d="M51.49,67.16c.41-.68.45-1,.5-.86a9.85,9.85,0,0,0,.46,1.41.74.74,0,0,1-.12.6A7.68,7.68,0,0,1,51.49,67.16Z"/>
-                    <path class="cls-4"
-                          d="M54.34,4.36a11.85,11.85,0,0,0-2.57-.83l-.55-.1.28-.12.4-.16L52.27,3l.11,0a19.19,19.19,0,0,1,2.06.95,13.77,13.77,0,0,1,1.62,1l.88.65L57.4,6l.35.28.15.13c.3.25.55.51.58.54s0-.05,0-.13l-.09-.27a2.94,2.94,0,0,0-.12-.31c-.23-.64-.65-1.76-1-2.46a12.09,12.09,0,0,0-.61-1.28h.82c.12.33.24.71.37,1.13.26.88.58,1.93.95,3.18a1.15,1.15,0,0,0,0,.3,1.22,1.22,0,0,0,0,.26c0,.08.07.27,0,.11a2.37,2.37,0,0,0-.74-.52l-.25-.23c-.2-.17-.39-.32-.58-.46l-.45-.34-.86-.6A11.57,11.57,0,0,0,54.34,4.36Z"/>
-                    <path class="cls-4"
-                          d="M51.23,44.61,50,44.06l.61-.19.92-.26.15.07,1.33.59.64.28c.19.07.44.13.67.2,1.25.35,2.51.72,3.71,1.11h0l-.43.33-.35.27c-1-.28-2.09-.55-3.16-.82-.24-.06-.47-.11-.74-.2h0l.07-.14-1.18-.58-.11.23C51.79,44.84,51.52,44.72,51.23,44.61Z"/>
-                    <path class="cls-4"
-                          d="M51.62,64.7a.76.76,0,0,1-.21-.1c0-.15-.11-.29-.15-.43l.06,0a1.51,1.51,0,0,0,.41.18.48.48,0,0,1,.18.11.45.45,0,0,1,.17.41.37.37,0,0,1-.27.31.24.24,0,0,1-.14,0,.08.08,0,0,1,0,0c.06-.06.23-.15.2-.29a.23.23,0,0,0-.13-.16A.26.26,0,0,0,51.62,64.7Z"/>
-                    <path class="cls-4"
-                          d="M51,69.63a1.49,1.49,0,0,1,.1-.8c.19-.51.61-.83.75-.71s.1.42.14.73a7,7,0,0,1-.93,1.06A1.33,1.33,0,0,1,51,69.63Z"/>
-                    <path class="cls-4"
-                          d="M50.6,51.3c.1-.32.2-.62.31-.91a3.17,3.17,0,0,0,.72.4,4.79,4.79,0,0,0,1.8.19l.6,0,.51,0,.55-.08.3,0c.09,0,0,0-.06,0l-.14,0-.09,0a2.87,2.87,0,0,1-.52-.28l-.21-.16a3.11,3.11,0,0,1-.28-.23,4.39,4.39,0,0,1-.8-1c-.39-.68-.64-1.25-.86-1.69v0c.19-.41.36-.75.5-1,.06.21.11.45.18.75a11.83,11.83,0,0,0,.55,1.74,3.84,3.84,0,0,0,.23.45,3.46,3.46,0,0,0,.42.57l.24.23a2.34,2.34,0,0,0,.38.28,3.42,3.42,0,0,0,.8.43l.17.07s.16.09.17.11.12,0,.15,0,.12,0,0,.06l-.48.09-.88.16-.82.14-.62.09a6.94,6.94,0,0,1-2,.08A4.88,4.88,0,0,1,50.6,51.3Z"/>
-                    <path class="cls-4"
-                          d="M51.26,64.17c0,.14.1.28.15.43a.82.82,0,0,1-.25-.21,3,3,0,0,0-.21-.24c-.06-.05-.12-.05-.12-.08s.06-.07.17,0A.91.91,0,0,1,51.26,64.17Z"/>
-                    <path class="cls-4"
-                          d="M50.6,51.3a3.49,3.49,0,0,1-.74-.34l.81-.85a1.15,1.15,0,0,0,.24.28C50.8,50.68,50.7,51,50.6,51.3Z"/>
-                    <path class="cls-4" d="M49.42,43.82c.32-.14.66-.26,1-.39l.38-.13h0l.68.31-.92.26-.61.19Z"/>
-                    <path class="cls-4"
-                          d="M50,70.16l-.44-.48,0,0,.17-.19c.3-.28.48-.45.51-.49a11.63,11.63,0,0,0,1.33-1.81,7.68,7.68,0,0,0,.84,1.15,3.15,3.15,0,0,1-.31.54c0-.31,0-.64-.14-.73s-.56.2-.75.71a1.49,1.49,0,0,0-.1.8,1.33,1.33,0,0,0,.06.28l0,0-.65.61a1.43,1.43,0,0,1-.35-.26Z"/>
-                    <path class="cls-4"
-                          d="M50.39,2.32l-.47-.14h0c.26-.16.53-.31.8-.45l.41-.22.46-.22A15.63,15.63,0,0,1,55.26.33l.87-.11,0,.22-.66,1,.28.14.38.2.06,0h0s0,0,0,0h0l.17.23a3.89,3.89,0,0,1,.25.42l-1.19,0A15.6,15.6,0,0,0,52.38,3l-.5-.19C51.21,2.56,50.71,2.41,50.39,2.32Z"/>
-                    <path class="cls-4"
-                          d="M50,58.05h.1a9.74,9.74,0,0,0,1.23-.12,7.16,7.16,0,0,0,2.06-.64,17.43,17.43,0,0,0,2.46-1.67l.55-.45,0,0-.34.08-.55.14-.63.07-.82.06a11.87,11.87,0,0,1-1.45,0,7.41,7.41,0,0,1-2.14-.42l-.51-.21a9.46,9.46,0,0,1,.12-1.07,3.14,3.14,0,0,0,.68.53,5.23,5.23,0,0,0,1.84.65,9.72,9.72,0,0,0,1.41.1l.81,0c.34,0,.76-.05,1.16-.09a7.92,7.92,0,0,0,1-.07l0,0a7.13,7.13,0,0,0-.56.59c-.31.26-.48.48-.79.72l-.74.6c-.45.35-.87.65-1.28.91a10.47,10.47,0,0,1-2.1,1c-.56.2-1,.31-1.21.39l-.13,0C50.07,58.77,50,58.4,50,58.05Z"/>
-                    <path class="cls-4"
-                          d="M49.19,71.7l1.23-1.16,0,0h0a.22.22,0,0,0-.06.07,1.38,1.38,0,0,0-.15.3.73.73,0,0,0,.12.82,3.33,3.33,0,0,0,.26.24l.29.23.52.4c.33.23.55.35.54.43s-.32.14-.74,0a5.06,5.06,0,0,1-.69-.23l-.37-.17a2,2,0,0,1-1-1Z"/>
-                    <path class="cls-4"
-                          d="M49.78,3.34,49.9,2.2s0,0,0,0l.47.14c.32.09.82.24,1.49.48l.5.19-.11,0-.37.12-.4.16-.28.12a9.6,9.6,0,0,0-1-.09h-.47Z"/>
-                    <path class="cls-4"
-                          d="M49.62,50.31c.06-.19.13-.37.19-.55.37-.16.61-.23.64-.18S50.13,49.91,49.62,50.31Z"/>
-                    <path class="cls-4"
-                          d="M49.93,54.87a4.15,4.15,0,0,1-1-.63l.9-.76a.84.84,0,0,0,.25.32A9.46,9.46,0,0,0,49.93,54.87Z"/>
-                    <path class="cls-4" d="M50.12,59.13l-.26.08L49.73,58H50C50,58.4,50.07,58.77,50.12,59.13Z"/>
-                    <path class="cls-4"
-                          d="M49.28,60.89c0-.26-.1-.52-.14-.78a.15.15,0,0,0,0-.07v0l.14-.08h0l.05,0h0l0,0,0,0,0,0a.06.06,0,0,0,0,0l.14-.06h0l.12,0h0l0,0,0,.06a1.66,1.66,0,0,1,0,.22.9.9,0,0,1-.58.88Z"/>
-                    <path class="cls-4"
-                          d="M51,66.31a21.2,21.2,0,0,1-1.6-4.74l-.15-.68a.9.9,0,0,0,.58-.88,1.66,1.66,0,0,0,0-.22l0-.06,0,0h0s0,0,0,0v-.05h0l0-.49c0-.38,0-.75-.07-1.11h0l.13,1.17.26-.08c.1.72.23,1.46.38,2.2a24.87,24.87,0,0,0,.76,2.84A.91.91,0,0,0,51,64c-.11,0-.19,0-.17,0s.06,0,.12.08a3,3,0,0,1,.21.24.82.82,0,0,0,.25.21q.11.3.24.6s0,0,0,0h0q.12.32.27.63l.18.36L52,66.3c-.05-.11-.09.18-.5.86C51.32,66.88,51.17,66.6,51,66.31Z"/>
-                    <path class="cls-4"
-                          d="M49.15,71.59a2,2,0,0,1,0-1,3.18,3.18,0,0,1,.19-.61l.08-.16,0,0s0,0,0-.06a.38.38,0,0,1,.08-.09l.44.48.12.12a1.43,1.43,0,0,0,.35.26L49.19,71.7A.49.49,0,0,0,49.15,71.59Z"/>
-                    <path class="cls-4" d="M48.86,53.55c0-.28.08-.56.13-.83l.09-.47h0a.34.34,0,0,0,.1-.06l.56.82Z"/>
-                    <path class="cls-4"
-                          d="M48.76,54.7a10.92,10.92,0,0,1,.1-1.15l.88-.55-.56-.82a.34.34,0,0,1-.1.06,15.8,15.8,0,0,1,.54-1.93c.51-.4.85-.67.83-.73s-.27,0-.64.18c.07-.17.13-.33.2-.49.45-1,.84-1.76,1.16-2.44l.9-1.87.52.21c.23.1.43.19.7.28-.07.14-.19.39-.37.74a2.81,2.81,0,0,0-.08-.31,1.35,1.35,0,0,0-.17-.34.82.82,0,0,0-.21-.19l-.52,1a6.31,6.31,0,0,1,.48.84l-.09.18c-.32.65-.76,1.49-1.17,2.37-.08.2-.17.4-.25.62a1.15,1.15,0,0,1-.24-.28l-.81.85a3.49,3.49,0,0,0,.74.34,14.52,14.52,0,0,0-.42,1.64c0,.28-.1.57-.13.86a.84.84,0,0,1-.25-.32l-.9.76a4.15,4.15,0,0,0,1,.63,16.73,16.73,0,0,0,0,2c0,.38.05.78.1,1.17h-.31v0c-.06-.78-.1-1.54-.15-2.26l-.23-.29-.14-.19c-.09-.13-.19-.25-.27-.37S48.8,54.77,48.76,54.7Z"/>
-                    <path class="cls-4"
-                          d="M48.73,56.25a11.36,11.36,0,0,1,0-1.55c0,.07.09.14.14.21s.18.24.27.37l.14.19.23.29c.05.72.09,1.48.15,2.26v0c0,.36.05.73.07,1.11l0,.49h0l-.12.06h0l-.14.06a.06.06,0,0,1,0,0l0,0,0,0,0,0h0l-.05,0h0l-.14,0h0c0-.06,0-.14,0-.17s0,0,0,0L49,59.21l0-.29-.09-.83C48.84,57.45,48.78,56.83,48.73,56.25Z"/>
-                    <path class="cls-4" d="M48.64,80.17a1.56,1.56,0,0,1,.26,0,.89.89,0,0,1-.35.16Z"/>
-                    <path class="cls-4"
-                          d="M47.81,101.07c-.24-.14-.47-.28-.71-.44l.16,0c.25-.07.6-.18,1-.32a10,10,0,0,0,2.79-1.45,3.65,3.65,0,0,0,1.34-2.68,8.14,8.14,0,0,0,0-1.39h.06a4,4,0,0,1,.23,1.4,4.38,4.38,0,0,1-.26,1.52,3.68,3.68,0,0,1-1,1.49,10,10,0,0,1-2.88,1.66Z"/>
-                    <path class="cls-4" d="M48.4,58.23l-.09-.07h0s0,0,.07,0h0v0Z"/>
-                    <path class="cls-4"
-                          d="M48.4,58.23v0s0,0,0,0,0,0,0,0,0,0,0,0l.1.09a.13.13,0,0,1-.09.06c-.17,0-.13-.1-.16-.13a.29.29,0,0,1,0-.09.09.09,0,0,1,0-.07l.09.07Z"/>
-                    <path class="cls-4"
-                          d="M47.42,54.21a1,1,0,0,1-.06-.68c.06-.2.3-.32.48-.45l.27-.18,1-.65-.09.47c-.05.27-.09.55-.13.83l-.27.18-.28.17h0s0,0,0,0a.87.87,0,0,1,.05.12l.09.16c.09.16.2.32.32.5a11.36,11.36,0,0,0,0,1.55c0-.06,0-.1,0-.15v0L48.63,56l-.15-.19c-.1-.14-.2-.26-.3-.39a7.32,7.32,0,0,1-.52-.76l-.11-.2A2.59,2.59,0,0,1,47.42,54.21Z"/>
-                    <path class="cls-4"
-                          d="M48,74.51a3.3,3.3,0,0,1-.85-.86c.31-.31.62-.6.9-.87a.38.38,0,0,1,0,.1,2.77,2.77,0,0,0,.54.93c.53.64,1.39,1.07,1.32,1.25S48.9,75.12,48,74.51Z"/>
-                    <path class="cls-4"
-                          d="M50,44.06a19,19,0,0,0-2.08.81,8.24,8.24,0,0,0-1.12.66c-.06,0,.3-.47,1-.88a12.8,12.8,0,0,1,1.66-.83Z"/>
-                    <path class="cls-4"
-                          d="M48,82.07c-.87,1.27-1.11,2.3-1.23,2.28a3.73,3.73,0,0,1,.38-1.68,1.1,1.1,0,0,0,.31-.16.91.91,0,0,0-.26,0,6.33,6.33,0,0,1,.36-.75,9.07,9.07,0,0,1,1-1.51.89.89,0,0,0,.35-.16,1.56,1.56,0,0,0-.26,0c.75-1,1.67-1.94,2.56-2.89.71-.77,1.34-1.56,1.94-2.34a22.81,22.81,0,0,0,1.51-2.14,10.85,10.85,0,0,0,.83-1.59c.05-.11.09-.22.13-.3a11.29,11.29,0,0,0,1.09.57l0,.1h0l-.07.15a13.21,13.21,0,0,1-1,1.73A24.75,24.75,0,0,1,54,75.63c-.64.75-1.36,1.56-2.12,2.29A28.55,28.55,0,0,0,48,82.07Z"/>
-                    <path class="cls-4"
-                          d="M47.46,82.51a1.1,1.1,0,0,1-.31.16,1.17,1.17,0,0,1,.05-.11A.91.91,0,0,1,47.46,82.51Z"/>
-                    <path class="cls-4"
-                          d="M47,73.32a4.91,4.91,0,0,1-.21-.45l.07,0a1.19,1.19,0,0,0,.16-.08l.13-.07.77-.42a.82.82,0,0,1,.09.26c0,.07,0,.16.06.25-.28.27-.59.56-.9.87a.08.08,0,0,1,0,0l0,0A2.92,2.92,0,0,1,47,73.32Z"/>
-                    <path class="cls-4" d="M47,89.59c.1-.21.16-.33.18-.32a1.6,1.6,0,0,1-.12.43Z"/>
-                    <path class="cls-4" d="M47,58.25s.06-.06.14-.14l.23-.08,0,0C47.13,58.25,47,58.25,47,58.25Z"/>
-                    <path class="cls-4"
-                          d="M46.77,101.07a.17.17,0,0,1,0-.24.15.15,0,0,1,.09-.13l.26-.07h0c.24.16.47.3.71.44l-.36.13-.42.13a.13.13,0,0,1-.13-.06C46.91,101.2,46.84,101.13,46.77,101.07Z"/>
-                    <path class="cls-4"
-                          d="M46.71,72.79c.92-1.05,1.84-2.12,2.77-3.14l0,0a.38.38,0,0,0-.08.09s0,.06,0,.06l0,0-.08.16a3.18,3.18,0,0,0-.19.61,2,2,0,0,0,0,1,.49.49,0,0,1,0,.11l-.42.4c-.22.22-.46.45-.72.68,0-.09,0-.18-.06-.25a.82.82,0,0,0-.09-.26l-.77.42-.13.07a1.19,1.19,0,0,1-.16.08l-.07,0a.08.08,0,0,1,0-.05h0Z"/>
-                    <path class="cls-4"
-                          d="M46.51,58.84a.45.45,0,0,1,0-.34,1.08,1.08,0,0,1,.54-.38h0c-.08.08-.15.12-.14.14s.15,0,.35-.19l0,0a1.29,1.29,0,0,1,.4-.07,1.08,1.08,0,0,1,.56.2.09.09,0,0,0,0,.07.29.29,0,0,0,0,.09s0,.09.16.13a.13.13,0,0,0,.09-.06,1.9,1.9,0,0,1,.25.24.45.45,0,0,1,.11.23v.07a.37.37,0,0,1,0,.11c0,.1-.07.14-.08.14s.12-.25-.12-.47-.28-.21-.44-.33a.84.84,0,0,0-.53-.19,1.7,1.7,0,0,0-.58.18c-.18.09-.35.18-.38.26s0,.14.07.21a.44.44,0,0,0,.1.08s0,.1-.06.17-.12.12-.15.09a.57.57,0,0,1-.13-.14A.62.62,0,0,1,46.51,58.84Z"/>
-                    <path class="cls-4"
-                          d="M46.93,89.4a6.24,6.24,0,0,1-.52-2v-.08c.12-.08.17-.13.16-.15l-.17.07a5.1,5.1,0,0,1,.37-2.64h0a15.28,15.28,0,0,0,.1,2.73,6.13,6.13,0,0,0,.61,1.76c.24.43.45.73.46.75l.47.78c.28.45.65,1,1.07,1.59a9.39,9.39,0,0,0,1.26,1.4c.38.33.68.52.66.56s0,0,0,0a2.12,2.12,0,0,1-.79-.37,7.45,7.45,0,0,1-1.47-1.31A18.44,18.44,0,0,1,47.9,91c-.31-.44-.51-.75-.52-.77s-.13-.21-.3-.54a1.6,1.6,0,0,0,.12-.43s-.08.11-.18.32Z"/>
-                    <path class="cls-4"
-                          d="M46.77,72.87a4.91,4.91,0,0,0,.21.45,2.92,2.92,0,0,0,.17.27l0,0c-.06-.08-.1-.15-.15-.23s-.17-.35-.21-.44a.11.11,0,0,1,0-.06h0Z"/>
-                    <path class="cls-4" d="M46.74,72.87l-.07-.05,0,0h0l0,0h0a.08.08,0,0,0,0,.05h0Z"/>
-                    <path class="cls-4" d="M46.4,87.29l.17-.07s0,.07-.16.15A.12.12,0,0,1,46.4,87.29Z"/>
-                    <path class="cls-4"
-                          d="M45.91,54.56a3.89,3.89,0,0,1-.45-.71,2.33,2.33,0,0,1-.12-.34.63.63,0,0,1,0-.26.79.79,0,0,1,.24-.67c.05,0,.09-.09.15-.13l.13-.11.28-.24c.21-.17.44-.34.69-.52.49-.35,1.05-.72,1.57-1a12.93,12.93,0,0,1,1.45-.78c-.06.18-.13.36-.19.55-.27.2-.58.45-.91.72s-1,.79-1.42,1.18l-.6.56-.25.24-.11.12s-.08.08-.06.07a.32.32,0,0,1,0,.06,1,1,0,0,0,.06.21,3.27,3.27,0,0,0,.27.52c.25.39.93.85,1.43,1.53a3,3,0,0,1,.53,1.12,5,5,0,0,1,.11,1,2.75,2.75,0,0,1,0,.41.55.55,0,0,1,0,.17.29.29,0,0,1,0,.09l0,.06h0l-.1-.09h0v0h0s0,0,0,0l-.05,0s0-.07,0-.12,0-.23-.07-.37A3.36,3.36,0,0,0,47.52,56C47.05,55.45,46.37,55.1,45.91,54.56Z"/>
-                    <path class="cls-4"
-                          d="M46,76.54a2.82,2.82,0,0,1-.87-.8l.9-1c0,.07,0,.17.1.31a2.39,2.39,0,0,0,.43.74,3.75,3.75,0,0,0,.74.58c.23.14.39.17.43.24s-.18.27-.53.26A2.44,2.44,0,0,1,46,76.54Z"/>
-                    <path class="cls-4"
-                          d="M45.76,5.53c.09-.1.18-.21.28-.31a15.45,15.45,0,0,1,2.4-2.07A16.65,16.65,0,0,1,49.9,2.2l-.12,1.14h.47a9.6,9.6,0,0,1,1,.09l-.51.22c-.52.23-1,.49-1.49.74A20.75,20.75,0,0,0,46.73,6l-.24.18a.9.9,0,0,0-.21.08,3.63,3.63,0,0,0-.46.34A1.67,1.67,0,0,0,45.76,5.53Z"/>
-                    <path class="cls-4"
-                          d="M45.4,58.74a6.14,6.14,0,0,1,.4-.86,1.74,1.74,0,0,1,.3-.36l.32-.27a3.58,3.58,0,0,1,.36-.28c.11,0,.25-.11.35,0s.15.44.21.63,0,.17,0,.25a.3.3,0,0,1,0,.21l-.23.08.1-.12c.05-.07,0-.19-.07-.34s0-.27-.15-.39-.16,0-.21.08a1.7,1.7,0,0,0-.19.19c-.05.06-.18.17-.26.25a1.36,1.36,0,0,0-.21.29,6.41,6.41,0,0,0-.31.82,3.15,3.15,0,0,0-.14.44.59.59,0,0,0,0,.35,1.07,1.07,0,0,0,.65.48,4.32,4.32,0,0,0,1,.2,9.74,9.74,0,0,0,1.08,0c.33,0,.69-.13.71-.25a0,0,0,0,0,0,0c0,.26.1.52.14.78L49.1,61a2.59,2.59,0,0,1-.66.08A9,9,0,0,1,47.27,61a5,5,0,0,1-1.13-.28,1.53,1.53,0,0,1-.92-.83,1,1,0,0,1,0-.64A3.61,3.61,0,0,1,45.4,58.74Z"/>
-                    <path class="cls-4"
-                          d="M45.1,75.57a2.12,2.12,0,0,1-.27-.49,3.87,3.87,0,0,1,.58-.25,1.87,1.87,0,0,1,.64-.16.66.66,0,0,1,0,.09l-.9,1,0,0,0,0Z"/>
-                    <path class="cls-4"
-                          d="M44.65,7.44a.23.23,0,0,1,0-.11.88.88,0,0,1,.08-.27,6.19,6.19,0,0,1,1-1.53,1.67,1.67,0,0,1,.06,1,7,7,0,0,0-.55.54l-.18.19a3.83,3.83,0,0,1-.28.29h-.05A.22.22,0,0,1,44.65,7.44Z"/>
-                    <path class="cls-4"
-                          d="M44.83,75.08a2.12,2.12,0,0,0,.27.49l.07.11,0,0a.43.43,0,0,0,0-.07,3.39,3.39,0,0,1-.29-.54Z"/>
-                    <path class="cls-4"
-                          d="M44.18,27.43a27.31,27.31,0,0,1,4.9-5.25c.85-.68,1.44-1,1.49-1.06s.51-.31,1.3-.64a16.4,16.4,0,0,1,3.33-1A27.87,27.87,0,0,1,60.05,19a9.27,9.27,0,0,1,5.51,2h0s0,0,0,0a8.75,8.75,0,0,1,2.61,3,11.8,11.8,0,0,1,1.16,3.75,31.73,31.73,0,0,1,.29,3.67,14.82,14.82,0,0,1-.17,3.36,12.48,12.48,0,0,1-2,4.7c-.7,1-1.25,1.52-1.29,1.47s.09-.14.28-.42.46-.68.76-1.2a13.51,13.51,0,0,0,1.65-4.65,13.84,13.84,0,0,0,0-3.23,34.26,34.26,0,0,0-.39-3.56,11,11,0,0,0-1.17-3.45A7.82,7.82,0,0,0,65,21.83l0,0a8.39,8.39,0,0,0-4.87-1.68,27.82,27.82,0,0,0-4.61.6,15.09,15.09,0,0,0-3.07,1c-.71.31-1.09.57-1.14.58a15.64,15.64,0,0,0-1.37.94,23.75,23.75,0,0,0-3,2.82,23.49,23.49,0,0,0-1.74,2.09c-.14.2-.29.4-.43.61l-.11.14v0s0,0,0,.05l0,0,.23.27.52.6A49.34,49.34,0,0,0,50,34.51a26.4,26.4,0,0,0,2.66,2l.69.43.71.38c.47.25,1,.48,1.45.71,1.91.91,3.71,1.73,5.29,2.32A15,15,0,0,0,63,41a7.58,7.58,0,0,0,1.74.16,5.82,5.82,0,0,0,1.12-.11c.25,0,.37-.11.39-.1s-.49.39-1.5.47a7,7,0,0,1-1.82,0,11,11,0,0,1-1.26-.27l-1-.3c-1.63-.53-3.48-1.29-5.43-2.14-.49-.22-1-.43-1.49-.67L53,37.65l-.74-.43a25.94,25.94,0,0,1-2.8-2,47.56,47.56,0,0,1-4.91-4.66L44,30l-.28-.32-.46-.55s-.12-.09-.09-.14l.1-.14.2-.3.32-.46Z"/>
-                    <path class="cls-4"
-                          d="M43.41,79a3.21,3.21,0,0,1-.34-.72l.25-.31.12-.15a2.58,2.58,0,0,0,.34,1,2.44,2.44,0,0,0,.69.76,3.07,3.07,0,0,0,1.08.5,7.83,7.83,0,0,0,2.3.26,5.43,5.43,0,0,0,.79-.09l-.09.13a5.16,5.16,0,0,1-.69.14,7.09,7.09,0,0,1-2.39-.11,3.52,3.52,0,0,1-1.23-.51A2.69,2.69,0,0,1,43.41,79Z"/>
-                    <path class="cls-4"
-                          d="M43.32,77.93l-.25.31s0,0,0,0h0a2.09,2.09,0,0,1-.1-.41.22.22,0,0,1,.2-.2.26.26,0,0,1,.27.18v0Z"/>
-                    <path class="cls-4"
-                          d="M43,77.77a2.09,2.09,0,0,0,.1.41h0a1.76,1.76,0,0,1-.09-.36A.06.06,0,0,1,43,77.77Z"/>
-                    <path class="cls-4"
-                          d="M41.34,81.71a3.93,3.93,0,0,1-.28-.44l.26-.49a3.27,3.27,0,0,0,.37.66,3.35,3.35,0,0,0,2.05,1.35,6.19,6.19,0,0,0,2.55,0c.4-.07.71-.15.91-.2a1.17,1.17,0,0,0-.05.11,8,8,0,0,1-.81.28,6.31,6.31,0,0,1-2.66.17A3.74,3.74,0,0,1,41.34,81.71Z"/>
-                    <path class="cls-4"
-                          d="M40.83,80.82a2.6,2.6,0,0,0,.1-.25l0,0,.12-.28h0a.22.22,0,0,1,.1.13v0a2.52,2.52,0,0,0,.1.3l0,.07-.26.49A2.4,2.4,0,0,1,40.83,80.82Z"/>
-                    <path class="cls-4"
-                          d="M41.09,80.2s0,0,0,0h0l.48-1,.09-.12c.37-.54.69-1.1,1-1.67l.82-1.19c.43-.48.86-1,1.32-1.42.64-.65,1.26-1.33,1.87-2l0,0,0,0,.07.05h0a.11.11,0,0,0,0,.06c0,.09.11.25.21.44s.09.15.15.23c-.27.26-.54.53-.83.84l-.23.24a.73.73,0,0,0,0-.08,1.63,1.63,0,0,0-.64.16,2,2,0,0,0-.6.27.11.11,0,0,1,0,0l0,0a3.39,3.39,0,0,0,.29.54.43.43,0,0,1,0,.07c-.55.62-1.12,1.28-1.7,2v0a.26.26,0,0,0-.27-.17.22.22,0,0,0-.2.26.06.06,0,0,0,0,.06,1.76,1.76,0,0,0,.09.36c-.44.56-.88,1.15-1.29,1.78q-.24.36-.45.75l0-.08c0-.1-.06-.18-.08-.23s0-.08,0-.09A.2.2,0,0,0,41.09,80.2Z"/>
-                    <path class="cls-4"
-                          d="M43,93.66a6.89,6.89,0,0,1-1.57,0c-.29,0-.56-.07-.78-.11l-.15-.5a9.19,9.19,0,0,0,1,.17,5.82,5.82,0,0,0,1.46,0,6,6,0,0,0,1.61-.46,3.58,3.58,0,0,0,1.35-.93,2.74,2.74,0,0,0,.39-.64c.1-.23.19-.45.27-.65.18-.42.32-.76.43-1l.06.11c-.07.24-.18.57-.32,1-.07.2-.14.42-.23.66a4.16,4.16,0,0,1-.57.93,3.15,3.15,0,0,1-1.24.86A6.19,6.19,0,0,1,43,93.66Z"/>
-                    <path class="cls-4" d="M40.58,93.54c0-.16-.08-.33-.11-.49h.06l.15.5Z"/>
-                    <path class="cls-4"
-                          d="M40.47,93.05c0,.16.07.33.11.49l.1,0c.21.7.41,1.33.48,1.5a2.87,2.87,0,0,1,.16.57l.1.46c.07.31.14.61.2.92L42,98.89l.06.3,0,.07s0,0,0,0l.08-.1.6-.77.57-.74.39.84.8,1.7c0-.52,0-1,0-1.56.44.39.92.84,1.34,1.17.2.17.44.34.62.47l.35.24a1.82,1.82,0,0,0,.23.15l-.26.07a.15.15,0,0,0-.09.13.17.17,0,0,0,0,.24c.07.06.14.13.13.2a.13.13,0,0,0,.13.06l.42-.13.36-.13.52.3a13.84,13.84,0,0,0,3.16,1.3c.52.14,1,.26,1.57.37a.59.59,0,0,0-.05.08c0,.09,0,.23.2.31s.32.1.36,0l.19-.29c1.56.29,3.17.49,4.78.74l.9.14.2,0h.29l.32,0c.6,0,1.21-.08,1.81-.13l1.4-.14a.65.65,0,0,1-.09.16c0,.11.05.25.22.32s.34,0,.38,0l.2-.41.06-.12,1.45-.19c1.2-.18,2.4-.4,3.57-.68a18.23,18.23,0,0,0,3.39-1.13h0l3.17-1.25c1.09-.21,2-.36,3-.57.47-.13,1-.24,1.42-.41l.7-.23.68-.28a15.53,15.53,0,0,0,4.84-3.18,12,12,0,0,0,3.07-4.7A9.71,9.71,0,0,0,90,89.72a5.09,5.09,0,0,0,.12-.68l.05-.34c0-.12,0-.14,0-.21L89.84,88a5.27,5.27,0,0,0-.43-.51,4.5,4.5,0,0,0-1-.81A4.22,4.22,0,0,0,86,86.22a8.86,8.86,0,0,0-2.52.62c-.8.31-1.58.72-2.36,1.09s-1.54.76-2.29,1.13c-3,1.53-5.8,3-8.48,4.21A35,35,0,0,1,64,95.46a1.26,1.26,0,0,0-.42-.13c-.31,0-.46.11-.44.13a.8.8,0,0,1,.42,0l.17.06c-.32.08-.64.14-1,.19a18.51,18.51,0,0,1-6.09.11l-1-.17-.08-.05c-.21-.14-.36-.16-.37-.14s.08.05.18.14c-.33-.09-.63-.17-.91-.26l-1.59-.46-.43-.13s0-.07,0-.07,0,0,0,.06c-.19-.07-.36-.11-.48-.16a.93.93,0,0,1-.32-.12l.34.07,1,.23,1.6.4,1,.26,1.18.16a18.8,18.8,0,0,0,6-.23,32.75,32.75,0,0,0,7.45-2.52c2.64-1.2,5.41-2.73,8.4-4.3.74-.38,1.5-.78,2.29-1.15s1.55-.8,2.4-1.13a9.58,9.58,0,0,1,2.7-.7,4.68,4.68,0,0,1,4,1.48,6.57,6.57,0,0,1,.48.57l.47.71a2.27,2.27,0,0,1,0,.48l0,.36a6.17,6.17,0,0,1-.12.73,12.06,12.06,0,0,1-.41,1.42,12.74,12.74,0,0,1-3.22,5A16.24,16.24,0,0,1,82,99.69l-.71.31-.74.25c-.47.18-1,.29-1.48.43-1,.23-2.06.41-3,.59L73,102.49a18.53,18.53,0,0,1-3.56,1.23c-1.21.29-2.43.53-3.65.72s-2.45.33-3.67.45l-1.84.14-.31,0h-.53l-.17,0-.9-.13a65.24,65.24,0,0,1-7.18-1.22,15,15,0,0,1-3.4-1.37c-.53-.29-1-.6-1.55-.93l-.45-.31L45.7,101s0,.08,0,.11v.16c0,.5,0,1,0,1.48l.07,2.6L44.69,103c-.52-1.08-1-2.15-1.53-3.2l0,.07-.57.73c-.19.23-.4.49-.55.46a.47.47,0,0,1-.14-.08c-.1-.35-.21-.7-.34-1A25.2,25.2,0,0,0,41,95.33c-.11-.49-.92-3.6-1-4.08.08.2.33,1,.57,1.81Z"/>
-                    <path class="cls-4" d="M39.44,89.93l.39,1A5.41,5.41,0,0,1,39.44,89.93Z"/>
-                    <path class="cls-4"
-                          d="M39.41,85.33a25.39,25.39,0,0,1,1.42-4.51,2.4,2.4,0,0,0,.23.45c-.21.4-.39.81-.58,1.24a27.15,27.15,0,0,0-.87,3,4.39,4.39,0,0,0-.15,1,2.53,2.53,0,0,1-.2-.29h0C39.29,85.93,39.34,85.65,39.41,85.33Z"/>
-                    <path class="cls-4"
-                          d="M39.42,88a11.84,11.84,0,0,0,.41,2.9l-.39-1v0h0C39.47,89.6,39.43,88.85,39.42,88Z"/>
-                    <path class="cls-4"
-                          d="M39.42,87.18c0-.22,0-.44,0-.65a2.86,2.86,0,0,0,.63.65,3.84,3.84,0,0,0,2.53.76,19.34,19.34,0,0,0,2.75-.35,8.41,8.41,0,0,0,.88-.24l.15-.06a.12.12,0,0,0,0,.08,4.27,4.27,0,0,1-1,.39,14.74,14.74,0,0,1-2.78.51,4.12,4.12,0,0,1-2.81-.74A2.42,2.42,0,0,1,39.42,87.18Z"/>
-                    <path class="cls-4"
-                          d="M39.26,13.46a7.16,7.16,0,0,1,.5-1.1l.3-.48s.16-.19.38-.42a7.8,7.8,0,0,1,.82-.76h0l.55-.18c.37-.12.59-.39.52-.54.26-.13.43-.2.45-.16s-.6.58-1.16,1.18c-.28.3-.55.6-.74.85s-.3.42-.31.42l-.32.42a5.8,5.8,0,0,0-.58,1c-.38.71-.45,1.53-.54,1.53s-.1-.21-.09-.53A3.89,3.89,0,0,1,39.26,13.46Z"/>
-                    <path class="cls-4"
-                          d="M39.18,86.58l.06-.35h0a2.53,2.53,0,0,0,.2.29c0,.21,0,.43,0,.65a1.7,1.7,0,0,1-.19-.19c0-.12,0-.23,0-.35S39.18,86.6,39.18,86.58Z"/>
-                    <path class="cls-4"
-                          d="M39.42,88c0,.84,0,1.59,0,1.87a6.64,6.64,0,0,1-.24-3.24c0,.12,0,.23,0,.35a1.7,1.7,0,0,0,.19.19C39.41,87.46,39.41,87.74,39.42,88Z"/>
-                    <path class="cls-4"
-                          d="M38.59,9a4.26,4.26,0,0,1,2.6.09,2.39,2.39,0,0,1,1.15.92v0a6.79,6.79,0,0,0-1,.67l0,0h0c-.07,0-.12,0-.13,0a1,1,0,0,0-.1-.15,1.23,1.23,0,0,0-.39-.33A3.42,3.42,0,0,0,38.72,10a8.12,8.12,0,0,1-3.36-.27C35.36,9.46,37,9.3,38.59,9Z"/>
-                    <path class="cls-4"
-                          d="M35.87,29.44l-2,1.39-.42.28-.14.1-.2.15.32.07,1,.27,3.6,1c-.55.29-1.08.59-1.6.88l-.76.44-.29.17-.08.06h0s-.07,0-.06.07l.13.07c.94.6,1.8,1.13,2.52,1.58,1.45.9,2.36,1.5,2.44,1.54l1.24.86c.39.28.78.55,1.3.87s1.09.64,1.74,1c1.3.7,2.84,1.47,4.49,2.27l1.73.82-.38.13c-.35.13-.69.25-1,.39l-.79-.35c-1.69-.76-3.26-1.5-4.6-2.18-.67-.35-1.28-.68-1.83-1s-1-.64-1.38-.88l-1.24-.82L37.19,37c-.72-.46-1.56-1-2.51-1.64-.17-.13-.42-.28-.6-.44l-.22-.26a2.36,2.36,0,0,1-.15-.25c-.06-.09,0-.21,0-.28s0-.18.13-.28a1.33,1.33,0,0,1,.27-.25,2.16,2.16,0,0,1,.35-.24c.53-.34.4-.24.48-.28l.14-.07L35,33l-.05,0-.18,0-.58-.17-3.41-1,2.59-1.66.84-.53.21-.14.08,0,.15-.09.15-.1s-.08,0-.13-.07L34.46,29l-.27-.11-.44-.19a1.91,1.91,0,0,1-.31-.14,1,1,0,0,1-.28-.22.94.94,0,0,1,.12-1.27,8,8,0,0,0,1.86-3,15.93,15.93,0,0,0,.79-2.8,15.29,15.29,0,0,0,.25-2.24l.17.14h0a10.82,10.82,0,0,1-.05,2.15,15.55,15.55,0,0,1-.63,2.93A11.21,11.21,0,0,1,35,26a8.05,8.05,0,0,1-.51.83c-.1.13-.2.27-.31.4l-.16.2-.15.16a.25.25,0,0,0,0,.37.19.19,0,0,0,.09.05L34,28l.44.16,1.38.53.38.14.19.07.1,0,0,0s0,0,0,0Z"/>
-                    <path class="cls-4"
-                          d="M32.58,12.56a32,32,0,0,0,2.47,4c1.76,2.14,3,3.61,2.86,3.75s-.65-.35-1.56-1.15h0a1.86,1.86,0,0,0-.12-.56s0,.15,0,.41c-.54-.48-1.19-1.08-1.92-1.79a27.18,27.18,0,0,1-2.95-4L31.12,13l0-.07a.75.75,0,0,1-.07-.12l-.08-.19c-.1-.22-.19-.44-.28-.67a12.67,12.67,0,0,1-.44-1.4,14.19,14.19,0,0,1-.31-1.47c0-.25-.06-.51-.08-.77s0-.27,0-.4V7.7c0-.08,0-.2,0-.3a2.26,2.26,0,0,1,.37-1.11,1.92,1.92,0,0,1,1-.62l.27-.1.19-.05.36-.1.71-.19c.94-.23,1.85-.42,2.75-.58s1.78-.28,2.68-.34a13.89,13.89,0,0,1,2.52.14c1.49.19,2.69.44,3.54.62l1.38.3a.32.32,0,0,1,.2.16,6.19,6.19,0,0,0-1,1.53.88.88,0,0,0-.08.27.23.23,0,0,0,0,.11.22.22,0,0,0,.11.15h.05l-.22.23-1-.26c-.82-.2-2-.48-3.32-.72a13.68,13.68,0,0,0-2.08-.24c-.74,0-1.59.1-2.44.2s-1.76.24-2.65.4l-.66.14-.54.12a.4.4,0,0,0-.19.07.4.4,0,0,0-.07.19v.06a.66.66,0,0,0,0,.14c0,.11,0,.2,0,.31s0,.42,0,.64c0,.44.1.87.18,1.3a10.51,10.51,0,0,0,.3,1.26c.06.21.12.41.19.6l.05.13v0l0,.07Z"/>
-                </g>
-                <path class="cls-7"
-                      d="M71.58,82.36l-.3.13a.28.28,0,0,0,0-.07l0-.07c0-.06,0-.06,0-.17s0-.12,0-.18a.86.86,0,0,1,.14.13A1.54,1.54,0,0,1,71.58,82.36Z"/>
-                <path class="cls-7"
-                      d="M71.29,82.18c0,.11,0,.11,0,.17l0,.07a.69.69,0,0,0-.42-.35,1.72,1.72,0,0,0-.5,0,.38.38,0,0,0-.16,0s-.07,0-.08,0,0,0,0,0a.27.27,0,0,1,.17-.09,1.51,1.51,0,0,1,.56-.08.88.88,0,0,1,.41.16C71.28,82.06,71.28,82.12,71.29,82.18Z"/>
-                <path class="cls-7"
-                      d="M70.79,83.29c0,.1,0,.1-.05.15l0,.06a.76.76,0,0,0-.33-.45,2,2,0,0,0-.47-.15.46.46,0,0,0-.16,0,.1.1,0,0,1-.08,0s0,0,.07,0a.28.28,0,0,1,.18,0,1.56,1.56,0,0,1,.57.08.83.83,0,0,1,.35.26C70.81,83.17,70.8,83.22,70.79,83.29Z"/>
-                <path class="cls-7"
-                      d="M70.82,83.14c.17.23.21.49.13.59l-.27-.19h0a.89.89,0,0,0,0-.11,0,0,0,0,1,0,0C70.69,83.32,70.76,83.23,70.82,83.14Z"/>
-                <path class="cls-7" d="M70.72,83.58h0s0,0,0,0Z"/>
-                <path class="cls-10" d="M65.89,82h0v0l0,0h0V82Z"/>
-                <path class="cls-7" d="M65.88,82v0h-.08l-.16,0-.21,0h0l-.14,0s-.07-.06,0,0a4,4,0,0,0,.6-.09h0Z"/>
-                <polygon class="cls-10" points="65.02 82.2 65.02 82.21 65.02 82.21 65.02 82.2"/>
-                <path class="cls-10" d="M62.23,78.28s0,0,0,0l0,0h0Z"/>
-                <path class="cls-10"
-                      d="M61.66,77.83l0,0a.8.8,0,0,1,.17.15h-.08c-.06,0-.07.07-.07.08s-.06-.07-.07-.11l0-.07Z"/>
-                <path class="cls-10" d="M60.68,82.89a.06.06,0,0,0,0,0h0Z"/>
-                <path class="cls-11" d="M60.66,82.93a.19.19,0,0,1,0,.08h0l0,0Z"/>
-                <path class="cls-7" d="M60.66,82.93l0,.11h-.47S60.48,83,60.66,82.93Z"/>
-                <polygon class="cls-10" points="60.64 83.01 60.62 83.08 60.62 83.06 60.62 83.04 60.64 83.01"/>
-                <path class="cls-7" d="M58.89,82.52c.22,0,.08.15.11.2a.08.08,0,0,1,0,.06h0s-.06-.1-.09-.27Z"/>
-                <path class="cls-10"
-                      d="M56.27,87.13a.65.65,0,0,1,.1.19s-.18,0-.33-.19C56.23,87.14,56.24,87.16,56.27,87.13Z"/>
-                <path class="cls-10"
-                      d="M54.49,86.91c0,.16.09.28.07.31s-.26-.15-.3-.45a.06.06,0,0,1,0,0l.12.15s.07,0,.1,0Z"/>
-                <path class="cls-10" d="M86,27.13l.13.2-.37.05Z"/>
-                <path class="cls-10" d="M80.05,4c.16.17.21.27.18.32s-.15,0-.34,0l-.23-.06q-.14-.13-.27-.3l.47-.09Z"/>
-                <path class="cls-10"
-                      d="M72.86,31.88a4.68,4.68,0,0,0,0,.53.32.32,0,0,1-.15-.35A.27.27,0,0,1,72.86,31.88Z"/>
-                <path class="cls-10" d="M70.61,51.66l.19.36a2.64,2.64,0,0,1-.25-.29Z"/>
-                <path class="cls-10" d="M70.45,48h.09a.52.52,0,0,1,0,.18A1.08,1.08,0,0,1,70.45,48Z"/>
-                <path class="cls-10" d="M70.45,48h-.11C70.4,47.93,70.43,47.92,70.45,48Z"/>
-                <path class="cls-10" d="M69.46,47.57a1.24,1.24,0,0,1-.2.1.11.11,0,0,1,0-.08A.51.51,0,0,1,69.46,47.57Z"/>
-                <path class="cls-10"
-                      d="M64.81,7.55l-.3,0c0-.53,0-1,0-1.48q.14.47.24,1C64.76,7.31,64.81,7.52,64.81,7.55Z"/>
-                <path class="cls-10"
-                      d="M42.35,10c.07.16-.15.43-.52.55l-.56.18a.12.12,0,0,1,0,0A7.84,7.84,0,0,1,42.35,10Z"/>
-                <path class="cls-24" d="M26.81,34.72c0,.23,0,.47,0,.72h0c0-.13,0-.25,0-.37S26.8,34.84,26.81,34.72Z"/>
-                <g class="cls-25">
-                    <path class="cls-24"
-                          d="M26.81,34.72c0,.23,0,.47,0,.72h0c0-.13,0-.25,0-.37S26.8,34.84,26.81,34.72Z"/>
-                </g>
-                <g class="cls-26">
-                    <polygon class="cls-27" points="48.26 58.07 48.27 58.06 48.27 58.07 48.26 58.07"/>
-                    <polygon class="cls-28" points="47.97 58.07 48.27 57.69 48.27 58.06 48.26 58.07 47.97 58.07"/>
-                    <polygon class="cls-29" points="47.67 58.07 48.27 57.31 48.27 57.69 47.97 58.07 47.67 58.07"/>
-                    <polygon class="cls-30" points="47.38 58.07 48.27 56.93 48.27 57.31 47.67 58.07 47.38 58.07"/>
-                    <polygon class="cls-30" points="47.09 58.07 48.27 56.56 48.27 56.93 47.38 58.07 47.09 58.07"/>
-                    <polygon class="cls-31"
-                             points="46.79 58.07 48.22 56.24 48.27 56.24 48.27 56.56 47.09 58.07 46.79 58.07"/>
-                    <polygon class="cls-32" points="46.5 58.07 47.93 56.24 48.22 56.24 46.79 58.07 46.5 58.07"/>
-                    <polygon class="cls-33" points="46.2 58.07 47.63 56.24 47.93 56.24 46.5 58.07 46.2 58.07"/>
-                    <polygon class="cls-34" points="45.91 58.07 47.34 56.24 47.63 56.24 46.2 58.07 45.91 58.07"/>
-                    <polygon class="cls-35" points="45.62 58.07 47.04 56.24 47.34 56.24 45.91 58.07 45.62 58.07"/>
-                    <polygon class="cls-36"
-                             points="45.34 58.04 46.75 56.24 47.04 56.24 45.62 58.07 45.34 58.07 45.34 58.04"/>
-                    <polygon class="cls-37" points="45.34 57.67 46.45 56.24 46.75 56.24 45.34 58.04 45.34 57.67"/>
-                    <polygon class="cls-38" points="45.34 57.29 46.16 56.24 46.45 56.24 45.34 57.67 45.34 57.29"/>
-                    <polygon class="cls-39" points="45.34 56.91 45.87 56.24 46.16 56.24 45.34 57.29 45.34 56.91"/>
-                    <polygon class="cls-40" points="45.34 56.54 45.57 56.24 45.87 56.24 45.34 56.91 45.34 56.54"/>
-                    <polygon class="cls-41" points="45.57 56.24 45.34 56.54 45.34 56.24 45.57 56.24"/>
-                </g>
-                <path class="cls-24" d="M26.79,35.08c0,.12,0,.24,0,.37h0C26.78,35.32,26.79,35.2,26.79,35.08Z"/>
-                <g class="cls-25">
-                    <path class="cls-24" d="M26.79,35.08c0,.12,0,.24,0,.37h0C26.78,35.32,26.79,35.2,26.79,35.08Z"/>
-                </g>
-                <g class="cls-42">
-                    <polygon class="cls-43" points="26.77 35.37 26.79 35.34 26.79 35.45 26.77 35.45 26.77 35.37"/>
-                    <polygon class="cls-44"
-                             points="26.77 35.11 26.79 35.08 26.79 35.08 26.79 35.34 26.77 35.37 26.77 35.11"/>
-                    <polygon class="cls-45" points="26.79 35.08 26.77 35.11 26.77 35.08 26.79 35.08"/>
-                </g>
-                <path class="cls-46"
-                      d="M275.36,62.93v5.43c0,2.4-.85,3.26-3.22,3.26h-3.9V79.3c0,2.4-.84,3.25-3.21,3.25h-7.88c-2.45,0-3.22-.85-3.22-3.25V71.62H230.75c-2.37,0-3.21-.86-3.21-3.26V63.24c0-2.56.15-3.49,1.68-5.27l23.26-28.15c1.53-1.78,2.45-2.33,5-2.33H265c2.37,0,3.21.86,3.21,3.26V59.68h3.9C274.51,59.68,275.36,60.53,275.36,62.93ZM253.93,46.57,243.22,59.68h10.71Z"/>
-                <path class="cls-47"
-                      d="M323.25,82.55h-9.79c-4,0-4.9-.23-6.35-2.87L299.84,67l-7,12.72c-1.45,2.41-2.22,2.87-6.35,2.87H277c-2.3,0-2.83-1.39-1.61-3.25l15.76-24.82-15-23.89c-1.15-1.7-.62-3.1,1.53-3.1h9.18c3.9,0,4.82.31,6.27,2.72l6.89,11.94,6.81-11.94c1.45-2.56,2.44-2.72,5.89-2.72h9.79c2.22,0,2.6,1.4,1.53,3.1L308.94,54.48l16,24.82C326.08,81,325.62,82.55,323.25,82.55Z"/>
-                <path class="cls-48"
-                      d="M.11,22.35a23,23,0,0,0,3.52,5.58l3.76-1A45.48,45.48,0,0,1,3.51,22a2.07,2.07,0,0,1-.13-.19c0,.07.09.13.13.19a40,40,0,0,0,4,4.67,66.77,66.77,0,0,0,.74-7.1C4.6,18.05,2.55,19,2.55,19S-.62,20.07.11,22.35Z"/>
-                <path class="cls-1" d="M18.54,29.78v-.05l0,.27,0,.05C18.53,30,18.54,29.87,18.54,29.78Z"/>
-                <path class="cls-1" d="M24.13,33c0,.15,0,.3,0,.46C24.12,33.28,24.13,33.13,24.13,33Z"/>
-                <path class="cls-1"
-                      d="M34.76,48.41l-.13-.09c-1-.63-1.86-1.25-2.75-1.86s-2-1.35-2.89-2-1.94-1.37-2.85-2-1.88-1.37-2.76-2c-.72-.54-1.42-1.07-2.09-1.59l-.67-.51-1.27-1-1.13-.9-.36-.29-.06,0,0,.22-.39.1.09.07,1.66,1.36,1,.78,2.75,2.15c.94.71,1.88,1.42,2.83,2.12s1.86,1.37,2.8,2,1.86,1.33,2.79,2,1.92,1.34,2.88,2l.64.44,2.27,1.52.61-.15,0-.25-.07,0Z"/>
-                <polygon class="cls-1" points="24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55"/>
-                <path class="cls-49" d="M26.89,34.82c0,.24,0,.48,0,.73h0c0-.12,0-.24,0-.37S26.89,34.94,26.89,34.82Z"/>
-                <path class="cls-50" d="M26.89,34.82c0,.24,0,.48,0,.73h0c0-.12,0-.24,0-.37S26.89,34.94,26.89,34.82Z"/>
-                <path class="cls-49" d="M24.1,33.55h0s0-.08,0-.12,0-.31,0-.46q0,.27,0,.57Z"/>
-                <path class="cls-50" d="M24.1,33.55h0s0-.08,0-.12,0-.31,0-.46q0,.27,0,.57Z"/>
-                <path class="cls-51"
-                      d="M14.85,34.17c-.89-.77-1.75-1.55-2.58-2.32s-1.7-1.61-2.5-2.41a.93.93,0,0,0-.14-.14c-.78-.8-1.53-1.58-2.24-2.37l-3.76,1,.4.52c.52.66,1.09,1.35,1.69,2.07S7.13,32.16,7.9,33s1.47,1.6,2.25,2.41,1.35,1.4,2.06,2.1a.3.3,0,0,1,.08.08l5.1-1.26C16.53,35.62,15.68,34.89,14.85,34.17Z"/>
-                <path class="cls-52"
-                      d="M38.15,50.64l2.36,1.52,0,0,.34.22L43,53.74a4.77,4.77,0,0,1,2.46-1.27,3.82,3.82,0,0,0-2.84.61c.92-3.32.74-6.41-1.37-8.47a6.27,6.27,0,0,0-.61-.53,3.28,3.28,0,0,1,.42,3.37h0a9.2,9.2,0,0,0-2.66-5.4c-.34-.33-.71-.67-1.13-1a7.52,7.52,0,0,1,.64,7.42l-.22,1.92Z"/>
-                <path class="cls-53"
-                      d="M34.17,48.8q-1.44-1-2.88-2c-.93-.64-1.86-1.3-2.79-2s-1.87-1.34-2.8-2-1.89-1.41-2.83-2.12l-2.75-2.15-1-.78-1.66-1.36-.09-.07-5.1,1.26.16.15c.76.74,1.53,1.49,2.33,2.23s1.63,1.48,2.47,2.21,1.43,1.23,2.16,1.83l.44.36c.93.74,1.82,1.43,2.69,2.06s1.93,1.37,2.84,2c.59.39,1.17.75,1.73,1.08l1.44.82c1.13.62,2.27,1.2,3.41,1.72l5.12-1.26-2.27-1.52Z"/>
-                <path class="cls-54"
-                      d="M48.4,58.19a1,1,0,0,0,0-.28c-2.19-1.33-4.59-2.83-7.44-4.66l-.65-.41-.18-.12-2.42-1.58-.56-.37h0L32,52l.16.07a36.52,36.52,0,0,0,4.24,1.62l.15,0a9.33,9.33,0,0,0-2.9,2.13,13.29,13.29,0,0,1,6.58-1.22A6.11,6.11,0,0,1,39,57.5a6,6,0,0,0,2.1-2.16,7.42,7.42,0,0,0,.94,3.89,7.62,7.62,0,0,1,.19-4.31c1.7,1.08,3.26,2,5.11,3.11a1.08,1.08,0,0,1,.6,0,1.51,1.51,0,0,1,.35.17Z"/>
-                <path class="cls-55"
-                      d="M17.86,36.07l.36.29,1.13.9,1.27,1,.67.51c.67.52,1.37,1,2.09,1.59q1.32,1,2.76,2t2.85,2c.93.66,1.89,1.33,2.89,2s1.8,1.23,2.75,1.86l.13.09,2.89,1.91.07,0,.22-1.92a.49.49,0,0,1,0,.11,13.64,13.64,0,0,0-2.37-8,18,18,0,0,0-2.82-3.22A32.33,32.33,0,0,0,29.81,35c-.94-.67-2-1.35-3.12-2a6.73,6.73,0,0,1,.2,1.89c0,.12,0,.24,0,.36s0,.25,0,.37h0a8.36,8.36,0,0,0-3.24-5.34A7.62,7.62,0,0,1,24.13,33c0,.15,0,.3,0,.46s0,.08,0,.12h0a9,9,0,0,0-.61-2.11c-.06-.13-.12-.26-.19-.39a6.42,6.42,0,0,0-.34-.56,3.64,3.64,0,0,0-.24-.35,6.75,6.75,0,0,0-.67-.76l-.23-.23-.35-.29c-.52-.43-1-.78-1.4-1.07-.21-.15-.4-.28-.58-.39l-.21-.14L18.73,27a5.69,5.69,0,0,0-.58-.28h0a1.82,1.82,0,0,1,.11.28,9.11,9.11,0,0,1,.29,2.78l.2-1.76-.2,1.76v.05c0,.09,0,.18,0,.27l0-.05-.71,6Z"/>
-                <path class="cls-56"
-                      d="M7.51,26.71c.68.71,1.46,1.49,2.35,2.35l.14.13c.77.74,1.62,1.52,2.56,2.36s1.68,1.49,2.62,2.29,1.7,1.43,2.62,2.18l.71-6a7.26,7.26,0,0,0-1.78-3.8c-.24-.27-.49-.53-.75-.8-.81-.82-1.71-1.65-2.62-2.42a30.56,30.56,0,0,0-2.57-2,15.55,15.55,0,0,0-1.43-.88c-.38-.2-.75-.37-1.11-.52A66.77,66.77,0,0,1,7.51,26.71Z"/>
-                <path class="cls-49" d="M26.88,35.18c0,.13,0,.25,0,.37h0C26.87,35.43,26.88,35.31,26.88,35.18Z"/>
-                <path class="cls-50" d="M26.88,35.18c0,.13,0,.25,0,.37h0C26.87,35.43,26.88,35.31,26.88,35.18Z"/>
-                <path class="cls-57" d="M26.88,35.18c0,.13,0,.25,0,.37h0C26.87,35.43,26.88,35.31,26.88,35.18Z"/>
-                <path class="cls-49" d="M24.1,33.56s0-.08,0-.12,0,.08,0,.12Z"/>
-                <path class="cls-50" d="M24.1,33.56s0-.08,0-.12,0,.08,0,.12Z"/>
-                <path class="cls-58" d="M24.1,33.56s0-.08,0-.12,0,.08,0,.12Z"/>
-                <polygon class="cls-49" points="24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55"/>
-                <polygon class="cls-50" points="24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55"/>
-                <polygon class="cls-59" points="24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55"/>
-                <path class="cls-60"
-                      d="M6.93,17.42l.17,0,.09-.4,1.14.26.05-.19-1.14-.26.09-.4-.17,0Zm.54-2.33.81.66-1,.25,0,.22,1.31.3,0-.17-1-.24,1-.24,0-.12-.8-.65,1,.24,0-.17-1.31-.3Z"/>
-            </g>
-        </g>
-    </g>
+<!--
+    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
+
+         http://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.
+-->
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 325.53 105.92">
+    <defs>
+        <style>
+            .cls-1{fill:none;}.cls-2{isolation:isolate;}.cls-3{fill:#6d4a54;}.cls-4{fill:#694650;}.cls-5{opacity:0.13;}.cls-15,.cls-5{mix-blend-mode:multiply;}.cls-6{fill:#3c2517;}.cls-7{fill:#644c53;}.cls-8{fill:#a66870;}.cls-9{fill:#f2e8df;}.cls-10{fill:#744a54;}.cls-11{fill:#231f20;}.cls-12{fill:#fff;}.cls-13{fill:#473439;}.cls-14{fill:#f7b2c6;}.cls-15{opacity:0.15;}.cls-16{fill:#3e362f;}.cls-17{fill:#f4f0d2;}.cls-18{fill:#97646d;}.cls-19{fill:#96636a;}.cls-20{fill:#8f8280;}.cls-21{fill:#dbd3d1;}.cls-22{fill:#c4869a;}.cls-23{fill:#a6938f;}.cls-24{fill:#bd2330;}.cls-25,.cls-50{opacity:0.35;mix-blend-mode:screen;}.cls-26{clip-path:url(#clip-path);}.cls-27{fill:#68308b;}.cls-28{fill:#682f8a;}.cls-29{fill:#692f8a;}.cls-30{fill:#6a2f89;}.cls-31{fill:#6b2f89;}.cls-32{fill:#6c2f88;}.cls-33{fill:#6c2e88;}.cls-34{fill:#6d2e87;}.cls-35{fill:#6e2e87;}.cls-36{fill:#6e2e86;}.cls-37{fill:#6f2e86;}.cls-38{fill:#702e85;}.cls-39{fill:#702d85;}.cls-40{fill:#712d85;}.cls-41{fill:#722d84;}.cls-42{clip-path:url(#clip-path-2);}.cls-43{fill:#c7203a;}.cls-44{fill:#c8203a;}.cls-45{fill:#c82039;}.cls-46{fill:url(#linear-gradient);}.cls-47{fill:url(#New_Gradient_Swatch_3);}.cls-48{fill:url(#New_Gradient_Swatch_6);}.cls-49,.cls-50{fill:#bc2331;}.cls-51{fill:url(#New_Gradient_Swatch_3-2);}.cls-52{fill:url(#New_Gradient_Swatch_5);}.cls-53{fill:url(#New_Gradient_Swatch_3-3);}.cls-54{fill:url(#New_Gradient_Swatch_5-2);}.cls-55{fill:url(#New_Gradient_Swatch_3-4);}.cls-56{fill:url(#New_Gradient_Swatch_3-5);}.cls-57{fill:url(#New_Gradient_Swatch_3-6);}.cls-58{fill:url(#New_Gradient_Swatch_3-7);}.cls-59{fill:url(#New_Gradient_Swatch_3-8);}.cls-60{fill:#6e7071;}
+        </style>
+        <clipPath id="clip-path">
+            <path class="cls-1"
+                  d="M47.35,58a1.74,1.74,0,0,1,.92-.09V58s0-.14,0-.16l-2.63-1.61a1.4,1.4,0,0,1-.27.58c.66.41,1.31.79,2,1.2Z"/>
+        </clipPath>
+        <clipPath id="clip-path-2">
+            <path class="cls-1" d="M26.79,35.08c0,.12,0,.24,0,.37h0C26.78,35.32,26.79,35.2,26.79,35.08Z"/>
+        </clipPath>
+        <linearGradient id="linear-gradient" x1="251.28" y1="114.16" x2="251.58" y2="28.41"
+                        gradientUnits="userSpaceOnUse">
+            <stop offset="0.32" stop-color="#9d2064"/>
+            <stop offset="0.63" stop-color="#c92039"/>
+            <stop offset="0.75" stop-color="#cd2035"/>
+            <stop offset="1" stop-color="#e77927"/>
+        </linearGradient>
+        <linearGradient id="New_Gradient_Swatch_3" x1="300.05" y1="114.33" x2="300.35" y2="28.58"
+                        xlink:href="#linear-gradient"/>
+        <linearGradient id="New_Gradient_Swatch_6" x1="-7176.48" y1="-1345.82" x2="-7167.47" y2="-1335.28"
+                        gradientTransform="translate(-4822.37 -5452.12) rotate(-142)" gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#f49624"/>
+            <stop offset="0.31" stop-color="#f79823"/>
+            <stop offset="0.84" stop-color="#e77927"/>
+        </linearGradient>
+        <linearGradient id="New_Gradient_Swatch_3-2" x1="-7243.18" y1="-1346.98" x2="-7178.89" y2="-1346.98"
+                        gradientTransform="translate(-4822.37 -5452.12) rotate(-142)" xlink:href="#linear-gradient"/>
+        <linearGradient id="New_Gradient_Swatch_5" x1="-7235.42" y1="-1340.53" x2="-7197.11" y2="-1340.53"
+                        gradientTransform="translate(-4822.37 -5452.12) rotate(-142)" gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#272761"/>
+            <stop offset="0.1" stop-color="#66318b"/>
+            <stop offset="0.79" stop-color="#9f2065"/>
+            <stop offset="0.95" stop-color="#cd2032"/>
+        </linearGradient>
+        <linearGradient id="New_Gradient_Swatch_3-3" x1="-7239.57" y1="-1347.58" x2="-7175.28" y2="-1347.58"
+                        gradientTransform="translate(-4822.37 -5452.12) rotate(-142)" xlink:href="#linear-gradient"/>
+        <linearGradient id="New_Gradient_Swatch_5-2" x1="-7234.74" y1="-1347.22" x2="-7201.18" y2="-1347.22"
+                        xlink:href="#New_Gradient_Swatch_5"/>
+        <linearGradient id="New_Gradient_Swatch_3-4" x1="-7239.57" y1="-1340.92" x2="-7175.28" y2="-1340.92"
+                        gradientTransform="translate(-4822.37 -5452.12) rotate(-142)" xlink:href="#linear-gradient"/>
+        <linearGradient id="New_Gradient_Swatch_3-5" x1="-7243.56" y1="-1341.26" x2="-7179.26" y2="-1341.26"
+                        gradientTransform="translate(-4822.37 -5452.12) rotate(-142)" xlink:href="#linear-gradient"/>
+        <linearGradient id="New_Gradient_Swatch_3-6" x1="-7239.57" y1="-1338.95" x2="-7175.28" y2="-1338.95"
+                        gradientTransform="translate(-4822.37 -5452.12) rotate(-142)" xlink:href="#linear-gradient"/>
+        <linearGradient id="New_Gradient_Swatch_3-7" x1="-7239.57" y1="-1339.17" x2="-7175.28" y2="-1339.17"
+                        gradientTransform="translate(-4822.37 -5452.12) rotate(-142)" xlink:href="#linear-gradient"/>
+        <linearGradient id="New_Gradient_Swatch_3-8" x1="-7203.45" y1="-1339.22" x2="-7189.24" y2="-1339.22"
+                        gradientTransform="translate(-4822.37 -5452.12) rotate(-142)" xlink:href="#linear-gradient"/>
+    </defs>
+    <title>Asset 1</title>
+    <g class="cls-2">
+        <g id="Layer_2" data-name="Layer 2">
+            <g id="Layer_1-2" data-name="Layer 1">
+                <path class="cls-3"
+                      d="M134.89,46.77c0,12.19-7.6,19-19.47,19h-9.29V79c0,2.39-.83,3.24-3.19,3.24H94.26c-2.36,0-3.19-.85-3.19-3.24V30.73c0-2.39.83-3.24,3.19-3.24h21.08C127.13,27.49,134.89,34.51,134.89,46.77ZM119.3,46.7c0-3.4-2.06-5.71-5.63-5.71h-7.54V52.33h7.54A5.25,5.25,0,0,0,119.3,46.7Z"/>
+                <path class="cls-3"
+                      d="M153.46,30.73v38h18.26c2.44,0,3.27.78,3.27,3.24v7c0,2.39-.83,3.24-3.27,3.24H141.59c-2.36,0-3.2-.85-3.2-3.24V30.73c0-2.39.84-3.24,3.2-3.24h8.67C152.62,27.49,153.46,28.34,153.46,30.73Z"/>
+                <path class="cls-3"
+                      d="M200.75,26.34c11.72,0,19.1,4.85,22.22,13.49.84,2.24.23,3.4-2.05,4.17l-8.15,2.93c-2.35.69-3.19.31-4.1-2.08-1.3-3.47-3.58-5-7.92-5-5.93,0-8.29,2.62-8.29,8v14c0,5.4,2.36,8,8.29,8,4.26,0,6.7-1.7,8-5,.84-2.39,1.83-2.93,4.11-2.08l8.07,2.93c2.28.77,2.89,1.92,2.05,4.16-3.12,8.64-10.5,13.5-22.22,13.5-14.91,0-23.36-8.25-23.36-21.6V47.93C177.39,34.59,185.84,26.34,200.75,26.34Z"/>
+                <path class="cls-4"
+                      d="M281.15,20.75h-.29c-.23,0-.3,0-.35-.18l-.73-1.87H276.7L276,20.57c0,.14-.12.18-.35.18h-.26c-.16,0-.19-.07-.14-.19l2.64-6.66a.21.21,0,0,1,.25-.17h.3c.14,0,.2,0,.25.16l2.63,6.67C281.33,20.68,281.3,20.75,281.15,20.75Zm-2.76-5.66a2.57,2.57,0,0,1-.14-.68h-.05a3.14,3.14,0,0,1-.12.68l-1.18,3h2.67Z"/>
+                <path class="cls-4"
+                      d="M289.79,15.94a2,2,0,0,1-2.22,2.18h-2.12v2.43c0,.15-.05.2-.2.2h-.32c-.15,0-.2-.05-.2-.2V14c0-.15,0-.2.2-.2h2.64A2,2,0,0,1,289.79,15.94Zm-.76,0a1.4,1.4,0,0,0-1.54-1.51h-2.05v3h2.05A1.4,1.4,0,0,0,289,15.94Z"/>
+                <path class="cls-4"
+                      d="M298.19,20.75h-.29c-.23,0-.3,0-.35-.18l-.73-1.87h-3.08L293,20.57c-.05.14-.11.18-.35.18h-.26c-.15,0-.18-.07-.13-.19l2.63-6.66a.21.21,0,0,1,.25-.17h.3c.14,0,.2,0,.25.16l2.64,6.67C298.38,20.68,298.35,20.75,298.19,20.75Zm-2.76-5.66a2.82,2.82,0,0,1-.13-.68h-.05a2.82,2.82,0,0,1-.13.68l-1.18,3h2.68Z"/>
+                <path class="cls-4"
+                      d="M304.12,13.62a2.38,2.38,0,0,1,2.62,1.68c.05.15,0,.21-.13.26l-.31.11c-.13,0-.19,0-.24-.12a1.73,1.73,0,0,0-1.94-1.27c-1.31,0-2,.67-2,1.8v2.34c0,1.13.7,1.8,2,1.8a1.74,1.74,0,0,0,1.95-1.29c.06-.14.12-.17.25-.13l.31.12c.14,0,.17.1.12.24a2.39,2.39,0,0,1-2.63,1.72c-1.74,0-2.71-.93-2.71-2.47V16.09C301.41,14.56,302.36,13.62,304.12,13.62Z"/>
+                <path class="cls-4"
+                      d="M315.62,14v6.59c0,.15-.05.2-.2.2h-.32c-.15,0-.2-.05-.2-.2v-3h-3.74v3c0,.15-.05.2-.2.2h-.32c-.15,0-.2-.05-.2-.2V14c0-.15.05-.2.2-.2H311c.15,0,.2.05.2.2v2.91h3.74V14c0-.15.05-.2.2-.2h.32C315.57,13.76,315.62,13.81,315.62,14Z"/>
+                <path class="cls-4"
+                      d="M324.09,14v.27c0,.15,0,.2-.2.2h-3.47v2.44h3c.14,0,.19.05.19.2v.27c0,.15-.05.2-.19.2h-3v2.54H324c.13,0,.18.05.18.19v.28c0,.15-.05.2-.18.2H319.9c-.15,0-.19-.05-.19-.2V14c0-.15,0-.2.19-.2h4C324,13.76,324.09,13.81,324.09,14Z"/>
+                <g class="cls-5">
+                    <path class="cls-6"
+                          d="M90.45,87.94s2.46,8-7.72,13.13c-14.94,7.5-25,5.06-34,1-1.17-.52-2,.19-3.07-7.68s2.64,3.24,3.21,3.31,23.75-.42,23.75-.42Z"/>
+                </g>
+                <path class="cls-7"
+                      d="M90.87,88.31a1.76,1.76,0,0,1,0,.48l0,.36a6.21,6.21,0,0,1-.13.73,10.36,10.36,0,0,1-.4,1.42,12.7,12.7,0,0,1-3.22,5A16.1,16.1,0,0,1,82,99.69l-.71.31-.74.25c-.48.18-1,.29-1.48.43-1,.23-2.06.41-3,.59l-3,1.22a18.53,18.53,0,0,1-3.56,1.23c-1.21.29-2.43.53-3.65.71s-2.45.34-3.67.45l-1.84.15-.31,0h-.53l-.18,0-.9-.13a65.47,65.47,0,0,1-7.17-1.22,14.85,14.85,0,0,1-3.4-1.37c-.53-.29-1-.6-1.55-.93l-.45-.31L45.7,101s0,.08,0,.11v.16c0,.49,0,1,0,1.48l.07,2.6L44.69,103c-.52-1.08-1-2.15-1.53-3.2l0,.07-.58.73c-.18.23-.39.49-.54.46l-.15-.08c-.1-.35-.21-.7-.33-1A25.2,25.2,0,0,0,41,95.33c-.11-.49-.92-3.61-1-4.08.08.19.32,1,.57,1.81h-.07l.12.49.1,0c.21.7.4,1.33.48,1.5a3,3,0,0,1,.16.56l.1.47c.07.31.14.61.2.92L42,98.89l.06.3v.06s0,0,0,0l.08-.1.6-.77.56-.74.4.84.8,1.7c0-.52,0-1,0-1.56.44.39.91.84,1.34,1.17.2.17.44.34.62.47l.35.24.22.15-.25.07a.15.15,0,0,0-.09.13.17.17,0,0,0,0,.24c.07.06.14.13.13.2a.13.13,0,0,0,.13.06l.41-.13.37-.13c.17.1.34.2.52.29a13.43,13.43,0,0,0,3.16,1.31c.51.14,1,.26,1.57.37a.28.28,0,0,0-.05.08c0,.09,0,.23.2.31s.32.1.36,0l.19-.29c1.56.29,3.17.49,4.78.74l.9.14.19,0h.3l.32,0c.6,0,1.21-.08,1.81-.13l1.4-.14a1.63,1.63,0,0,1-.09.16c0,.11.05.25.22.32s.33,0,.38,0l.2-.41.06-.12,1.45-.19c1.2-.18,2.4-.4,3.56-.68a18.09,18.09,0,0,0,3.4-1.13h0l3.17-1.25c1.09-.21,2-.36,3-.57.47-.13,1-.24,1.42-.41l.7-.23.68-.28a15.53,15.53,0,0,0,4.84-3.18,12,12,0,0,0,3.07-4.7A10.14,10.14,0,0,0,90,89.72a5.09,5.09,0,0,0,.12-.68l.05-.34a1,1,0,0,0,0-.21L89.83,88a5.17,5.17,0,0,0-.42-.51,4.33,4.33,0,0,0-1-.81A4.17,4.17,0,0,0,86,86.22a8.86,8.86,0,0,0-2.52.62c-.8.31-1.58.72-2.37,1.09s-1.53.76-2.29,1.13c-3,1.53-5.79,3-8.47,4.21A35.84,35.84,0,0,1,64,95.46a1.26,1.26,0,0,0-.42-.13c-.31,0-.46.11-.44.12a1.06,1.06,0,0,1,.42,0l.17.06c-.32.08-.64.14-1,.19a18.79,18.79,0,0,1-6.09.11l-1-.17-.08-.05a.61.61,0,0,0-.37-.15s.07.06.17.15l-.9-.26-1.59-.46-.43-.13s0-.07,0-.07,0,0,0,.06l-.48-.16a1.22,1.22,0,0,1-.32-.12l.34.07,1,.23,1.6.4,1,.25,1.18.17a18.8,18.8,0,0,0,6-.23,32.68,32.68,0,0,0,7.44-2.52c2.65-1.2,5.42-2.73,8.4-4.3.75-.38,1.51-.78,2.3-1.15s1.55-.8,2.4-1.13a9.6,9.6,0,0,1,2.69-.7,4.88,4.88,0,0,1,2.86.55,5.28,5.28,0,0,1,1.18.92c.16.2.34.37.48.58Z"/>
+                <path class="cls-8"
+                      d="M90.14,88.49a1,1,0,0,1,0,.21l-.05.34a5.09,5.09,0,0,1-.12.68,10.14,10.14,0,0,1-.39,1.33,12,12,0,0,1-3.07,4.7,15.53,15.53,0,0,1-4.84,3.18l-.68.28-.7.23c-.46.17-1,.28-1.42.41-1,.21-1.92.36-3,.57l-3.17,1.25h0a18.09,18.09,0,0,1-3.4,1.13c-1.16.28-2.36.5-3.56.68l-1.45.19c.13-.25.3-.58.5-1s.49-1,.73-1.55a5.19,5.19,0,0,0,.46-1.93,3.85,3.85,0,0,0-.25-2,4.18,4.18,0,0,0-1.06-1.36,3,3,0,0,0-.66-.44,35.84,35.84,0,0,0,6.35-2.19c2.68-1.18,5.48-2.68,8.47-4.21.76-.37,1.51-.77,2.29-1.13s1.57-.78,2.37-1.09A8.86,8.86,0,0,1,86,86.22a4.17,4.17,0,0,1,2.46.48,4.33,4.33,0,0,1,1,.81,5.17,5.17,0,0,1,.42.51Z"/>
+                <path class="cls-7"
+                      d="M88,7.18a18.2,18.2,0,0,1-.09,2,22.89,22.89,0,0,1-.78,4.09,21.5,21.5,0,0,1-1.48,3.82,8.88,8.88,0,0,1-.88,1.45c0-.06,0-.09,0-.09a.79.79,0,0,0,0,.14h0s-.07.05-.09,0a7.62,7.62,0,0,1,.54-1.75,29.25,29.25,0,0,0,1-3.84,25.11,25.11,0,0,0,.48-3.95c0-1.09,0-1.82,0-1.87a11.5,11.5,0,0,0,0-1.16c-.05-.63-.18-1.59-.84-1.91a2.89,2.89,0,0,0-1.36-.23,15.37,15.37,0,0,0-1.63.14c-.54.07-1.08.11-1.58.16h-.48l-.46,0c.17.27.3.49.39.65s.22.4.19.43-.17-.08-.38-.27S80,4.6,79.66,4.2l.23.06c.19.06.32.08.34,0s0-.15-.18-.32l-.19-.16,1.29-.24,1.54-.32A17.19,17.19,0,0,1,84.39,3a3.84,3.84,0,0,1,1.9.21,2.49,2.49,0,0,1,1.27,1.4,5.66,5.66,0,0,1,.34,1.35C88,6.68,88,7.14,88,7.18Z"/>
+                <path class="cls-9"
+                      d="M86.7,7.22s.06.78,0,1.87A25.11,25.11,0,0,1,86.24,13a29.25,29.25,0,0,1-1,3.84,7.62,7.62,0,0,0-.54,1.75s0,0,.09,0c0,.31,0,1.08,0,1.84,0,.5-.06,1-.1,1.38s-.07.63-.07.65,0,.27-.08.64-.11.76-.2,1.19c0-.09,0-.19,0-.3,0-.29,0-.63,0-1a7.16,7.16,0,0,0-.42-1.35,5,5,0,0,0-1-1.34A7.31,7.31,0,0,0,81.41,19a6.82,6.82,0,0,0-3.92-.93,4.21,4.21,0,0,0-2,.82A6.4,6.4,0,0,0,74,20.35a5.3,5.3,0,0,0-.85,1.74c-.18.57-.31,1.11-.42,1.62a32.86,32.86,0,0,0-.55,3.49c0,.08-.16,1.47-.21,3.51a15.86,15.86,0,0,0,1.33,7.34l.12.23.15.28a.6.6,0,0,0,.68.32,1.42,1.42,0,0,0,.32-.07,2.76,2.76,0,0,0,.3-.15l.42-.29c.54-.39,1-.78,1.53-1.17,1-.77,1.87-1.51,2.62-2.17A15.16,15.16,0,0,0,82,32.39a1.54,1.54,0,0,0,.09-.24l.38.46c.05.07.1.12.08.11h0l-.31.27a5.54,5.54,0,0,0-.83,1.07c-.52.93-1.07,2.09-1.78,3.18a8.35,8.35,0,0,1-1.16,1.48,7.12,7.12,0,0,1-1.32,1,12.63,12.63,0,0,0-1.39.88h0a1.1,1.1,0,0,0-.33-.45c-.14-.07-.22,0-.22,0s.07,0,.14.13a1.23,1.23,0,0,1,.17.42c.06.22.11.48.16.77a4,4,0,0,0-1.12.58c0,.08.52-.07,1.17-.23,0,.12,0,.25,0,.37a2.18,2.18,0,0,1,0,.51c-.27.14-.43.26-.41.28s.14,0,.37-.06a3.1,3.1,0,0,1-.15.46h0c-.64.18-1.22.49-1.18.58s.45,0,.95-.09c-.11.17-.18.26-.18.27s-.16.24-.43.55a7.27,7.27,0,0,1-1.09,1,2.76,2.76,0,0,1-1.36.44c-.4,0-.68,0-.7,0s.27.15.7.2a3,3,0,0,0,1-.07v.06a4.89,4.89,0,0,0-.52.42,3.16,3.16,0,0,1-1.28.58,4.38,4.38,0,0,1-1.39,0l-.21,0a2.7,2.7,0,0,0,.53-.46,2.11,2.11,0,0,0,.41-.59,1.07,1.07,0,0,0,.1-.24c-.06-.06-.26.3-.68.65a3.92,3.92,0,0,1-1.83.81,7.36,7.36,0,0,1-2,.12,4.51,4.51,0,0,1-.92-.2l-.26-.08a2.87,2.87,0,0,1-.58-.27c-.34-.24-.77-.62-1.21-1,.4-.27.78-.52,1.08-.68s.66-.24.66-.29-.31-.07-.75,0a9.59,9.59,0,0,0-1.34.61l0,0-1.07-.94.69-.23c1.49-.49,3-.87,3-1s0,0-.11,0l.46-.79.29,0,.32,0a.37.37,0,0,0,.23-.05.2.2,0,0,0,.08-.24.85.85,0,0,0-.25-.37.41.41,0,0,0-.24-.1h0l-1.6-.64c1-.08,1.55-.41,1.49-.47s.6-.44,1.3-1.47a12.55,12.55,0,0,0,2-4.7,14.28,14.28,0,0,0,.16-3.36,31.65,31.65,0,0,0-.28-3.67A11.8,11.8,0,0,0,68.21,24a8.88,8.88,0,0,0-2.61-3h0l0,0a9.26,9.26,0,0,0-5.51-2,27.83,27.83,0,0,0-4.85.52,17.8,17.8,0,0,0-3.33,1c-.79.34-1.23.63-1.3.65a16.69,16.69,0,0,0-1.49,1.06,25.2,25.2,0,0,0-3.12,3,24.7,24.7,0,0,0-1.78,2.24l-.42.61-.32.47-.2.29-.1.15c0,.05.06.09.08.14l.47.54L44,30l.55.6a47.56,47.56,0,0,0,4.91,4.66,25.94,25.94,0,0,0,2.8,2l.74.43.76.38c.51.24,1,.45,1.49.67,2,.84,3.79,1.61,5.42,2.14.36.11.69.21,1,.29l-.38,1.42A19.94,19.94,0,0,0,59,42.18a18.9,18.9,0,0,0-3-.06,11.45,11.45,0,0,0-1.4.14,13.73,13.73,0,0,0-1.39.29c-.7.19-1.56.44-2.44.75h0l-1.73-.82c-1.65-.8-3.19-1.57-4.49-2.27-.65-.35-1.24-.68-1.75-1s-.9-.59-1.29-.87c-.75-.51-1.19-.82-1.24-.86s-1-.64-2.44-1.54l-2.53-1.58-.12-.07s0,0,.05-.07h0l.08,0,.28-.17.76-.44L38,32.67l-3.61-1-1-.27-.32-.07.2-.15.14-.1.42-.28,2-1.39.67-.45,0,0,0,0-.09,0-.19-.07-.38-.15-1.38-.52L34,28l-.12,0a.15.15,0,0,1-.09-.06.24.24,0,0,1,0-.36l.15-.16.16-.2c.11-.13.21-.27.3-.4A5.62,5.62,0,0,0,35,26a11.13,11.13,0,0,0,.71-1.67,15.55,15.55,0,0,0,.63-2.93,10,10,0,0,0,0-2.16c.92.8,1.49,1.23,1.56,1.16s-1.09-1.61-2.85-3.75a32,32,0,0,1-2.47-4l-.15-.29,0-.07v0L32.33,12c-.07-.19-.13-.39-.2-.6a12.83,12.83,0,0,1-.29-1.26,11.6,11.6,0,0,1-.18-1.3c0-.22,0-.44,0-.64s0-.21,0-.31a.66.66,0,0,1,0-.14V7.72a.49.49,0,0,1,.08-.18c.05,0,.11,0,.19-.07l.54-.13.66-.13c.89-.16,1.78-.3,2.64-.4s1.71-.18,2.45-.2a13.41,13.41,0,0,1,2.07.24c1.36.24,2.51.52,3.32.72l1,.26.22-.23a3.83,3.83,0,0,0,.28-.29c.06-.07.12-.12.17-.19s.37-.37.56-.54h0a3.63,3.63,0,0,1,.46-.34.9.9,0,0,1,.21-.08L46.73,6a20.75,20.75,0,0,1,2.49-1.59c.48-.26,1-.51,1.49-.74l.51-.22.54.1a11.74,11.74,0,0,1,2.58.83,10.61,10.61,0,0,1,1.59.91c.27.19.56.38.86.6l.45.34c.19.14.38.29.58.46l.25.23a2.52,2.52,0,0,1,.74.52c.1.16,0,0,0-.11a2.46,2.46,0,0,1,0-.26,1.11,1.11,0,0,1,0-.3c-.37-1.25-.69-2.31-.95-3.18-.13-.42-.25-.8-.37-1.13l1,0c.88,0,1.63.08,2.15.13l.9.08.57,0,.17.15a8.67,8.67,0,0,1,2.17,4.3c0,.19.07.36.08.43v0l.29,0v0A45.57,45.57,0,0,1,65,2.81l.58,0h.76l.45,0a2.92,2.92,0,0,0,.44-.06c.45-.07.88-.17,1.32-.25l.28.29a6.8,6.8,0,0,1,1,1.53c.08.17.17.36.24.55a5.8,5.8,0,0,1,.21.89c0,.3.08.62.13.94l.06.49,0,.25,0,.13s0,0,0,0l.15-.49a15.41,15.41,0,0,1,.75-2,8.45,8.45,0,0,1,.67-1.2,3.69,3.69,0,0,1,.72-.78,6.43,6.43,0,0,1,.73-.48A3.27,3.27,0,0,1,74,2.38a16.23,16.23,0,0,1,2.16.54c.85.29,1.62.62,2.26.86s.93.34,1.23.42c.36.4.64.68.84.87s.34.29.38.27,0-.18-.19-.43-.22-.38-.39-.65l.46,0h.48c.5,0,1-.09,1.58-.16a15.37,15.37,0,0,1,1.63-.14,2.89,2.89,0,0,1,1.36.23c.66.32.79,1.28.84,1.91A11.5,11.5,0,0,1,86.7,7.22ZM86,6.12a3.52,3.52,0,0,0-.09-.85c0-.06-.25,0-.5.07l-.28.12h0a5.33,5.33,0,0,0-1.27.38,11.1,11.1,0,0,1-1.32.49,2.49,2.49,0,0,1-.44.09l.5.72a1.39,1.39,0,0,1,.24-.35A2.85,2.85,0,0,1,84,6.05a1.71,1.71,0,0,1,1.14-.11l0,.22A4.49,4.49,0,0,1,85,7.58c-.17.71-.35,1.44-.41,1.87-.32-.59-.63-1-.7-1a11.42,11.42,0,0,0,.56,1.74c.15.43.27.86.35,1.19s.1.55.11.57a4.42,4.42,0,0,1,.1.54,7.64,7.64,0,0,1,0,1.22,9.48,9.48,0,0,0-.1,1.82,5.29,5.29,0,0,0,.56-1.76,6.33,6.33,0,0,0,.18-1.31,6.26,6.26,0,0,0,0-.64s-.06-.26-.18-.6A9.92,9.92,0,0,0,84.92,10c-.06-.1-.11-.21-.16-.31a13.38,13.38,0,0,0,.94-1.93A4.77,4.77,0,0,0,86,6.12ZM74.92,43.19a.77.77,0,0,0,0-.38.17.17,0,0,0,0-.12s-.08,0-.12,0-.22.12-.21.14-.12-.11-.14-.08a.37.37,0,0,0,0,.38.33.33,0,0,0,.23.23C74.77,43.41,74.86,43.33,74.92,43.19Zm-.76-1.43a.5.5,0,0,0,.21-.35.17.17,0,0,0,0-.12.13.13,0,0,0-.13,0c-.17,0-.25.09-.25.12s-.13-.11-.14-.1l-.06.08a.56.56,0,0,0-.13.24.19.19,0,0,0,.13.24A.48.48,0,0,0,74.16,41.76Zm-.2,2a.69.69,0,0,0,.22-.62,1.19,1.19,0,0,0-.24-.55,1.73,1.73,0,0,0-.41-.4A1.34,1.34,0,0,0,73,42a3.59,3.59,0,0,0-1,0l-.16,0-.11,0-.2.07-.17,0h-.11l-.13,0a.83.83,0,0,0-.29,0,3,3,0,0,0-.37,0,4.5,4.5,0,0,0-.69.2l-.36.18a2.37,2.37,0,0,0-.79.63,2,2,0,0,0-.49,1.33,2,2,0,0,0,.19.79,1,1,0,0,0,.72.56,1.8,1.8,0,0,0,.81-.09.68.68,0,0,0,.31.18,1.77,1.77,0,0,0,.91,0,3.42,3.42,0,0,0,.69-.28h0a.47.47,0,0,0,.24.08.76.76,0,0,0,.55-.18c.21-.21.36-.4.42-.45s0,0,0,0h0A0,0,0,0,0,73,45l-.06,0v0s.09,0,.12,0a.51.51,0,0,0,.16-.09.57.57,0,0,0,.23-.3C73.52,44.05,73.64,44,74,43.79Zm-7.28,1.85a.58.58,0,0,0-.25-.49C66.17,45,66,45,66,45s-.14-.09-.15-.06a1.86,1.86,0,0,0-.3.45.58.58,0,0,0,.07.61.73.73,0,0,0,1.11-.38ZM41.63,11c.57-.6,1.21-1.1,1.17-1.18s-.2,0-.45.15h0A2.51,2.51,0,0,0,41.19,9,4.34,4.34,0,0,0,38.59,9c-1.58.35-3.23.51-3.23.73a8.12,8.12,0,0,0,3.36.27,3.36,3.36,0,0,1,1.91.28,1.31,1.31,0,0,1,.4.32,1.43,1.43,0,0,1,.1.16s0,0,.13,0a9,9,0,0,0-.82.75c-.23.24-.37.42-.38.43l-.3.48a5.39,5.39,0,0,0-.5,1.1,3.59,3.59,0,0,0-.2,1.17c0,.33,0,.54.09.54s.16-.82.54-1.54a6.13,6.13,0,0,1,.58-.94l.32-.42s.12-.18.31-.42A9.63,9.63,0,0,1,41.63,11Z"/>
+                <path class="cls-7"
+                      d="M86.37,27l-.22.33c-.26.37-.62.88-1.06,1.46l-.69.91c-.11.16-.24.32-.36.48a1.94,1.94,0,0,0-.13.2l.15.08.47.27,1.65,1-2.52.84s-.26-.26-.51-.53l-.21.76.72-.23h0c0,.15-.06.26-.08.35v0c-.08.32-.09.37-.1.39l-.09.06s-.12.06-.26.16l-.24.19a4.89,4.89,0,0,0-.72.85c-.5.81-1.17,2-2,3.11a9.16,9.16,0,0,1-1.36,1.48,4.41,4.41,0,0,1-.78.52c-.25.14-.5.26-.72.37a4,4,0,0,1-1.58.54,12.63,12.63,0,0,1,1.39-.88,7.12,7.12,0,0,0,1.32-1,8.35,8.35,0,0,0,1.16-1.48c.71-1.09,1.26-2.25,1.78-3.18A5.54,5.54,0,0,1,82.22,33l.31-.27h0s0,0-.08-.11l-.38-.46s0-.11.07-.17l.51-.14,1.11-.31.28-.08h0l.15,0-.15-.13-1.2-.78.66-.76.4-.46c.27-.29.52-.58.76-.85s.71-.77,1-1.06l.37-.05-.13-.2-.24.25c-.76.07-2.18.14-2.28.11.13,0,2.18-.26,2.59-.4Z"/>
+                <path class="cls-10" d="M86,27.13l.13.2-.37.05Z"/>
+                <path class="cls-7"
+                      d="M85.93,5.27a3.52,3.52,0,0,1,.09.85,4.77,4.77,0,0,1-.32,1.66,13.38,13.38,0,0,1-.94,1.93l-.14-.26h0c.06-.43.24-1.16.41-1.87a4.49,4.49,0,0,0,.09-1.42l0-.22a.2.2,0,0,1,.08,0,.38.38,0,0,1,.09.08l-.07,0v0h0l.06,0a0,0,0,0,1,0,0,.57.57,0,0,1,.11-.1l-.12.07v0l.7-.38a.77.77,0,0,0-.67-.23h-.14l.28-.12C85.68,5.23,85.92,5.21,85.93,5.27Z"/>
+                <path class="cls-7"
+                      d="M86,5.68l-.7.38A.38.38,0,0,0,85.17,6a.2.2,0,0,0-.08,0,3.17,3.17,0,0,0-.1-.38s.06,0,.15-.1h.15A.77.77,0,0,1,86,5.68Z"/>
+                <path class="cls-7"
+                      d="M85.64,12.47a6.33,6.33,0,0,1-.18,1.31,5.29,5.29,0,0,1-.56,1.76,9.48,9.48,0,0,1,.1-1.82,7.64,7.64,0,0,0,0-1.22,4.42,4.42,0,0,0-.1-.54s0-.24-.11-.57-.2-.76-.35-1.19a11.42,11.42,0,0,1-.56-1.74c.07,0,.38.4.7,1h0c0,.22,0,.35,0,.37s.07,0,.13-.11c0,.1.1.21.16.31a9.92,9.92,0,0,1,.49,1.21c.12.34.17.59.18.6A6.26,6.26,0,0,1,85.64,12.47Z"/>
+                <path class="cls-7" d="M85.27,6.09,85.39,6a.57.57,0,0,0-.11.1A0,0,0,0,0,85.27,6.09Z"/>
+                <path class="cls-11" d="M85.26,6.06v0l-.06,0h0v0Z"/>
+                <path class="cls-7"
+                      d="M85.14,5.46c-.09,0-.15.08-.15.1a3.17,3.17,0,0,1,.1.38A1.71,1.71,0,0,0,84,6.05a2.85,2.85,0,0,0-1.1.74,1.39,1.39,0,0,0-.24.35l-.5-.72a2.49,2.49,0,0,0,.44-.09,11.1,11.1,0,0,0,1.32-.49A5.33,5.33,0,0,1,85.14,5.46Z"/>
+                <path class="cls-9"
+                      d="M85.71,27.38c-.28.29-.62.65-1,1.06s-.49.56-.76.85l-.4.46-.66.76-.28-.09c.29-1,.59-2.12.81-2.93C83.53,27.52,85,27.45,85.71,27.38Z"/>
+                <path class="cls-7"
+                      d="M84.93,20.44c0,.5,0,1,0,1.39s-.06.65-.06.67,0,.27-.1.65-.18.88-.31,1.36-.32,1-.46,1.31a3.35,3.35,0,0,1-.26.57,14.12,14.12,0,0,1,.43-1.68c0,.13,0,.19,0,.19s0-.22,0-.61.16-.85.2-1.19.07-.63.08-.64,0-.27.07-.65.08-.88.1-1.38c0-.76,0-1.53,0-1.84h0l.05,0A12.72,12.72,0,0,1,84.93,20.44Z"/>
+                <path class="cls-7"
+                      d="M84.23,42.73c.44.18.69.36.67.4a3.54,3.54,0,0,1-.75-.15,15.35,15.35,0,0,0-1.64-.3c-.6-.08-1.21-.15-1.67-.19l-.8-.06-.79-.1a5.52,5.52,0,0,0-1.61,0,13.16,13.16,0,0,0-1.43.34V42.4a8.88,8.88,0,0,1,1.33-.48,5.75,5.75,0,0,1,.92-.18,5.87,5.87,0,0,1,.83,0l.82,0s.34,0,.81.12,1.07.19,1.68.34A11,11,0,0,1,84.23,42.73Z"/>
+                <path class="cls-11" d="M84.79,18.53l-.05,0a.79.79,0,0,1,0-.14S84.78,18.47,84.79,18.53Z"/>
+                <path class="cls-7" d="M84.62,9.45l.14.26c-.06.08-.11.12-.13.11S84.59,9.67,84.62,9.45Z"/>
+                <path class="cls-9"
+                      d="M84.25,31.42l-.15,0h0l-.28.08-1.11.31-.51.14c.13-.37.29-.94.47-1.56l.28.09,1.2.78Z"/>
+                <path class="cls-7"
+                      d="M84.24,24c0,.11,0,.21,0,.3a.85.85,0,0,0,0,.17l-.06.25c0-.16-.07-.39-.11-.7s-.08-.63-.13-1a10.2,10.2,0,0,0-.47-1.21,4.69,4.69,0,0,0-1-1.17,6.62,6.62,0,0,0-1.33-1.08,6.21,6.21,0,0,0-3.58-.71,3.61,3.61,0,0,0-1.61.73,5.45,5.45,0,0,0-1.25,1.29A4.39,4.39,0,0,0,74,22.34l0,.09a3.44,3.44,0,0,0-.71.65s.21-.15.63-.36c0,0,0,0,0,.06-.86.76-1.1,1.77-1.2,4a11.17,11.17,0,0,0,.24,3.6h0a3.25,3.25,0,0,0,0,.33c0,.36,0,.74,0,1.13a.27.27,0,0,0-.15.18.32.32,0,0,0,.15.35A14.36,14.36,0,0,0,73,34.1a13.5,13.5,0,0,0,1,3.66l.1.22.08.16c0,.07.07.08.12.07l.15,0,.14-.07.41-.26c.53-.35,1.05-.73,1.55-1.09,1-.72,1.92-1.42,2.71-2s1.42-1.12,1.86-1.48c0,0,.21-.28.56-.71s.46-1.5,1-2.71c.06-.15.13-.32.19-.49.23-.59.44-1.28.6-1.85h0c-.22.81-.52,2-.81,2.93-.18.62-.34,1.19-.47,1.56L82,32l.09.12a1.54,1.54,0,0,1-.09.24A15.16,15.16,0,0,1,79.46,35c-.75.66-1.64,1.4-2.62,2.17-.49.39-1,.78-1.53,1.17l-.42.29a2.76,2.76,0,0,1-.3.15,1.42,1.42,0,0,1-.32.07.6.6,0,0,1-.68-.32l-.15-.28-.12-.23A15.86,15.86,0,0,1,72,30.71c.05-2,.2-3.43.21-3.51a32.86,32.86,0,0,1,.55-3.49c.11-.51.24-1.05.42-1.62A5.3,5.3,0,0,1,74,20.35a6.4,6.4,0,0,1,1.47-1.42,4.21,4.21,0,0,1,2-.82,6.82,6.82,0,0,1,3.92.93,7.31,7.31,0,0,1,1.39,1.22,5,5,0,0,1,1,1.34A7.16,7.16,0,0,1,84.2,23C84.22,23.36,84.23,23.7,84.24,24Z"/>
+                <path class="cls-10" d="M84.25,24.29c0,.39,0,.62,0,.61s0-.06,0-.19l.06-.25A.85.85,0,0,1,84.25,24.29Z"/>
+                <path class="cls-8"
+                      d="M84,24c0,.31.08.54.11.7a14.12,14.12,0,0,0-.43,1.68v0h0a.3.3,0,0,1,0,.11.39.39,0,0,1,0,.13s0,.06,0,.1,0,.18-.08.28a1.21,1.21,0,0,1,0,.18,1.8,1.8,0,0,1,0,.19s0,0,0,0a.42.42,0,0,0,0,.06,0,0,0,0,1,0,0c-.16.57-.37,1.26-.6,1.85l-1.35-.11a7.18,7.18,0,0,0,.15-2.11,4.53,4.53,0,0,0-.64-2,11.8,11.8,0,0,0-1.13-1.66,4.19,4.19,0,0,0-1.46-1.21,5,5,0,0,0-4.1,0l-.32.2,0-.09a4.39,4.39,0,0,1,.69-1.51,5.45,5.45,0,0,1,1.25-1.29,3.61,3.61,0,0,1,1.61-.73,6.21,6.21,0,0,1,3.58.71,6.62,6.62,0,0,1,1.33,1.08,4.69,4.69,0,0,1,1,1.17A10.2,10.2,0,0,1,83.91,23C84,23.38,84,23.72,84,24Z"/>
+                <path class="cls-10" d="M83.43,27.47v0h0A0,0,0,0,0,83.43,27.47Z"/>
+                <path class="cls-7" d="M83.66,32.5l-.72.23.21-.76C83.4,32.24,83.63,32.48,83.66,32.5Z"/>
+                <path class="cls-7"
+                      d="M83.34,41.11A14.82,14.82,0,0,1,81.12,41a10.13,10.13,0,0,0-1.52.06c-.41,0-.69.1-.7.1l-.72.09c-.42.06-1,.15-1.51.28l-.6.13c0-.13-.07-.26-.11-.38l.59-.2a14,14,0,0,1,1.52-.43l.73-.15s.32,0,.76,0a10.16,10.16,0,0,1,1.59.09A7.06,7.06,0,0,1,83.34,41.11Z"/>
+                <path class="cls-8"
+                      d="M81.47,29.23l1.35.11c-.06.17-.13.34-.19.49-.53,1.21-.65,2.28-1,2.71s-.56.71-.56.71c-.44.36-1.08.88-1.86,1.48s-1.71,1.31-2.71,2c-.5.36-1,.74-1.55,1.09l-.41.26-.14.07-.15,0c-.05,0-.11,0-.12-.07L74.06,38l-.1-.22a13.5,13.5,0,0,1-1-3.66,14.36,14.36,0,0,1-.13-1.69.54.54,0,0,0,.17.07,3.86,3.86,0,0,0,1.09,0,15.52,15.52,0,0,0,2.54-.42A14,14,0,0,0,80,30.75a6.71,6.71,0,0,0,.84-.59,4.54,4.54,0,0,0,.38-.38,1.25,1.25,0,0,0,.09-.12l.09-.16C81.42,29.41,81.45,29.31,81.47,29.23Z"/>
+                <path class="cls-10" d="M82,32l.16-.05c0,.06-.05.12-.07.17Z"/>
+                <path class="cls-7"
+                      d="M81.62,27.12a7.18,7.18,0,0,1-.15,2.11c0,.08,0,.18-.08.27l-.09.16a1.25,1.25,0,0,1-.09.12,4.54,4.54,0,0,1-.38.38,6.71,6.71,0,0,1-.84.59,14,14,0,0,1-3.33,1.35,15.52,15.52,0,0,1-2.54.42,3.86,3.86,0,0,1-1.09,0,.54.54,0,0,1-.17-.07,4.68,4.68,0,0,1,0-.53.4.4,0,0,1,.29-.05,3.21,3.21,0,0,0,.81.06h0a2.69,2.69,0,0,0,1.72.23,3.31,3.31,0,0,0,1.76-.88,11.78,11.78,0,0,0,2.26-1,5.84,5.84,0,0,0,.77-.53,2.46,2.46,0,0,0,.33-.31l.07-.08s0,0,0-.06a.65.65,0,0,0,.07-.21,7,7,0,0,0,.18-1.95,6.79,6.79,0,0,0-1.6-3.48,3.85,3.85,0,0,0-1.31-1.15,4.3,4.3,0,0,0-1.53-.45h-.51a1.81,1.81,0,0,0-1.52.15,4.26,4.26,0,0,0-.7.47h0l-.1,0c0-.09,0-.19.08-.29l.32-.2a5,5,0,0,1,4.1,0,4.19,4.19,0,0,1,1.46,1.21A11.8,11.8,0,0,1,81,25.1,4.53,4.53,0,0,1,81.62,27.12Z"/>
+                <path class="cls-12"
+                      d="M81.16,27.14A7,7,0,0,1,81,29.09a.65.65,0,0,1-.07.21s0,0,0,.06l-.07.08a2.46,2.46,0,0,1-.33.31,5.84,5.84,0,0,1-.77.53,11.78,11.78,0,0,1-2.26,1,5.92,5.92,0,0,0,1.7-4.14c.09-2.17-1.34-4.54-2.93-5h.5a4.3,4.3,0,0,1,1.53.45,3.85,3.85,0,0,1,1.31,1.15A6.79,6.79,0,0,1,81.16,27.14Z"/>
+                <path class="cls-10" d="M80.05,4c.16.17.21.27.18.32s-.15,0-.34,0l-.23-.06q-.14-.13-.27-.3l.47-.09Z"/>
+                <path class="cls-7"
+                      d="M79.86,3.81l-.47.09q.14.16.27.3c-.3-.08-.72-.23-1.23-.42S77,3.21,76.17,2.92A16.23,16.23,0,0,0,74,2.38a2.93,2.93,0,0,1,.9-.32L74.49,1l0-.06a14.46,14.46,0,0,1,2.14.87A24.26,24.26,0,0,1,78.8,3.07C79.25,3.36,79.6,3.61,79.86,3.81Z"/>
+                <path class="cls-7"
+                      d="M78.17,43.57c.6.25,1.15.62,1.1.7A5.18,5.18,0,0,1,78,44l-.84-.17-.38,0-.38,0H76a3.49,3.49,0,0,0,.18-.57,4.09,4.09,0,0,1,.7,0l.13,0,.33.07A9.1,9.1,0,0,1,78.17,43.57Z"/>
+                <path class="cls-13"
+                      d="M76.22,22.06c1.59.5,3,2.87,2.93,5a5.92,5.92,0,0,1-1.7,4.14c-.33.11-.64.2-.94.27a15.51,15.51,0,0,1-2.44.38H74a2.34,2.34,0,0,1-1-1.47h0c.1-1.82.25-3,.26-3.11s.1-1.45.46-3.41c.06-.36.15-.73.24-1.11a.36.36,0,0,1,.11-.1h0a5.88,5.88,0,0,1,2.18-.61Z"/>
+                <path class="cls-7"
+                      d="M76.51,31.51c.3-.07.61-.16.94-.27a3.31,3.31,0,0,1-1.76.88A2.69,2.69,0,0,1,74,31.89h.1A15.51,15.51,0,0,0,76.51,31.51Z"/>
+                <path class="cls-7" d="M76.21,42.4v.31l-.56.16a1.7,1.7,0,0,1,0-.22A4.25,4.25,0,0,1,76.21,42.4Z"/>
+                <path class="cls-7"
+                      d="M76.17,42.09a2.91,2.91,0,0,1,0,.31,4.25,4.25,0,0,0-.52.25,2.18,2.18,0,0,0,0-.51c0-.12,0-.25,0-.37l.41-.11C76.11,41.8,76.14,41.94,76.17,42.09Z"/>
+                <path class="cls-7" d="M76.21,42.71a3.7,3.7,0,0,1-.06.48,4,4,0,0,0-.65.14,3.1,3.1,0,0,0,.15-.46Z"/>
+                <path class="cls-7"
+                      d="M76.15,43.19a3.49,3.49,0,0,1-.18.57h0l-.41,0-.32,0a2.7,2.7,0,0,0,.17-.31l.09-.18A4,4,0,0,1,76.15,43.19Z"/>
+                <path class="cls-7" d="M76,41.28c0,.12.08.25.11.38l-.41.11c0-.12,0-.24,0-.35Z"/>
+                <path class="cls-7"
+                      d="M76,41.28l-.35.14c0-.29-.1-.55-.16-.77a1.23,1.23,0,0,0-.17-.42c-.07-.08-.14-.1-.14-.13s.08-.05.22,0a1.1,1.1,0,0,1,.33.45h0A5.14,5.14,0,0,1,76,41.28Z"/>
+                <path class="cls-7"
+                      d="M74.69,22.21a1.81,1.81,0,0,1,1.52-.15,5.88,5.88,0,0,0-2.18.61h0A4.26,4.26,0,0,1,74.69,22.21Z"/>
+                <path class="cls-7"
+                      d="M75.56,43.79l.41,0a4.13,4.13,0,0,1-.38.71,6.18,6.18,0,0,1-.52.59,7,7,0,0,1-1.28,1,2.41,2.41,0,0,1-.56.22,3,3,0,0,1-1,.07c-.43-.05-.7-.15-.7-.2s.3,0,.7,0a2.76,2.76,0,0,0,1.36-.44,7.27,7.27,0,0,0,1.09-1c.27-.31.41-.54.43-.55s.07-.1.18-.27Z"/>
+                <path class="cls-7"
+                      d="M75.69,42.65a1.7,1.7,0,0,0,0,.22c-.23.06-.36.09-.37.06S75.42,42.79,75.69,42.65Z"/>
+                <path class="cls-7" d="M75.61,41.42c0,.11,0,.23,0,.35-.65.16-1.15.31-1.17.23A4,4,0,0,1,75.61,41.42Z"/>
+                <path class="cls-7" d="M75.5,43.33l-.09.18a2.7,2.7,0,0,1-.17.31c-.5.07-.93.16-.95.09s.54-.4,1.18-.58Z"/>
+                <path class="cls-7"
+                      d="M75,42.81a.77.77,0,0,1,0,.38c-.06.14-.15.22-.27.2a.33.33,0,0,1-.23-.23.37.37,0,0,1,0-.38s.08,0,.14.08c-.12.11,0,.43.13.4s.22-.54.14-.51a2.65,2.65,0,0,0-.27.11s.06-.07.21-.14.09,0,.12,0A.17.17,0,0,1,75,42.81Z"/>
+                <path class="cls-7"
+                      d="M74.49,1l.42,1.09a2.93,2.93,0,0,0-.9.32l-.69-.13L73,2.19,73.22,2A9.11,9.11,0,0,1,74.49,1Z"/>
+                <path class="cls-7"
+                      d="M74.61,42.87a.55.55,0,0,0,.06.08h0v0s0,0,0,0,0,.07.06,0l0-.09s0,0,0-.06,0,0,0,0A.36.36,0,0,1,74.61,42.87Zm.25-.12c.08,0,0,.49-.14.51s-.25-.29-.13-.4A2.65,2.65,0,0,1,74.86,42.75Z"/>
+                <path class="cls-7"
+                      d="M74.79,42.87s0,.05,0,.06l0,.09s-.07,0-.06,0,0,0,0,0v0h0a.55.55,0,0,1-.06-.08.36.36,0,0,0,.14,0S74.79,42.85,74.79,42.87Z"/>
+                <path class="cls-7"
+                      d="M74.51.91l0,.06a9.11,9.11,0,0,0-1.27,1L73,2.19a3.64,3.64,0,0,1-.44-.07l-.41-.05a1.48,1.48,0,0,0-.31,0,8.43,8.43,0,0,0-1.47.11c-.31,0-.62.1-.92.15l0,0a4.35,4.35,0,0,0-.7-1,1.22,1.22,0,0,0-.45-.3L68.16.37c.63-.07,1.29-.15,2-.18A10.33,10.33,0,0,1,72,.24c.16,0,.34.07.51.1l.4.11.79.21Z"/>
+                <path class="cls-7"
+                      d="M74.37,41.41a.5.5,0,0,1-.21.35.48.48,0,0,1-.4.09.19.19,0,0,1-.13-.24.56.56,0,0,1,.13-.24l.06-.08s.08,0,.14.1c-.27.26-.24.39,0,.33s.46-.46.23-.39l-.23.06s.08-.07.25-.12a.13.13,0,0,1,.13,0A.17.17,0,0,1,74.37,41.41Z"/>
+                <path class="cls-7"
+                      d="M74.19,41.33c.23-.07,0,.35-.23.39s-.27-.07,0-.33a.46.46,0,0,1,.11.12s0,0,0,0,0,.05,0,0a.46.46,0,0,0,.07-.07s0-.11,0-.09-.16,0-.17,0Z"/>
+                <path class="cls-7"
+                      d="M74.18,43.17a.69.69,0,0,1-.22.62c-.32.22-.44.26-.54.74a.57.57,0,0,1-.23.3.51.51,0,0,1-.16.09s-.09,0-.12,0,0,0,0,0a.83.83,0,0,1,.06-.21.36.36,0,0,0,0-.11s0,0,0-.22c0,0,0,0,0,0h0l-.08,0-.14,0c-.08,0-.13,0-.13,0s0,0,.09-.1a.55.55,0,0,1,.38-.14c.1.09,0,.21,0,.31s.06,0,.09,0l.08-.08a.38.38,0,0,0,.07-.21v0a.19.19,0,0,1,0-.08.42.42,0,0,1,0-.1.34.34,0,0,1,.07-.11,1.62,1.62,0,0,1,.18-.19l.18-.15c.15-.13.07-.38-.11-.6a1.4,1.4,0,0,0-.32-.28,1.06,1.06,0,0,0-.38-.12,3.17,3.17,0,0,0-.87,0H72l-.11,0-.21.07-.23.08a1.53,1.53,0,0,1-.29,0l-.25-.05h-.06a1.17,1.17,0,0,0-.27.05,3.85,3.85,0,0,0-.58.19,2.5,2.5,0,0,0-.94.59,1.5,1.5,0,0,0-.4.95,1.46,1.46,0,0,0,.1.57.46.46,0,0,0,.35.31,1.69,1.69,0,0,0,1.19-.29,2.2,2.2,0,0,0,.25-.17l.11-.1.07-.06a.2.2,0,0,0,.06-.15c0-.06-.07-.08-.11-.1a1.29,1.29,0,0,0-.41,0,.4.4,0,0,0-.29.1.84.84,0,0,0-.12.19s-.07.07-.08.06,0,0,0-.08a.54.54,0,0,1,.08-.25.56.56,0,0,1,.38-.21,1.32,1.32,0,0,1,.57,0,.4.4,0,0,1,.29.21.42.42,0,0,1-.08.38,2,2,0,0,1-.13.18l-.12.12a2,2,0,0,1-.28.23l-.33.2a.28.28,0,0,1-.15-.15.21.21,0,0,0-.16.07c-.07.06-.12.12-.11.13l.08.1a1.8,1.8,0,0,1-.81.09,1,1,0,0,1-.72-.56,2,2,0,0,1-.19-.79,2,2,0,0,1,.49-1.33,2.37,2.37,0,0,1,.79-.63l.36-.18a4.5,4.5,0,0,1,.69-.2,3,3,0,0,1,.37,0,.83.83,0,0,1,.29,0l.13,0h.11l.17,0,.2-.07.11,0,.16,0a3.59,3.59,0,0,1,1,0,1.34,1.34,0,0,1,.56.22,1.73,1.73,0,0,1,.41.4A1.19,1.19,0,0,1,74.18,43.17Z"/>
+                <path class="cls-7"
+                      d="M74.13,41.41s.05.05,0,.09a.46.46,0,0,1-.07.07s-.07,0,0,0,0,0,0,0a.46.46,0,0,0-.11-.12S74.06,41.41,74.13,41.41Z"/>
+                <path class="cls-7"
+                      d="M73.32,2.25l.69.13a3.27,3.27,0,0,0-.42.21,6.43,6.43,0,0,0-.73.48,3.69,3.69,0,0,0-.72.78,8.45,8.45,0,0,0-.67,1.2,15.41,15.41,0,0,0-.75,2l-.15.49s0,0,0,0l0-.13,0-.25-.06-.49c-.05-.32-.09-.64-.13-.94a5.8,5.8,0,0,0-.21-.89c-.07-.19-.16-.38-.24-.55a6.8,6.8,0,0,0-1-1.53l-.28-.29.87-.18a12.39,12.39,0,0,1,.83,1.76,5.46,5.46,0,0,1,.21.61,3,3,0,0,1,.1.5q0,.27.06.57l0,.32,0,.16V6.3s0,0,0,0A2.55,2.55,0,0,1,70.77,6c.15-.43.3-.84.43-1.18a13.45,13.45,0,0,1,.62-1.26,4.62,4.62,0,0,1,.72-1l.42-.4Z"/>
+                <path class="cls-12" d="M73.89,22.72l.1,0a.36.36,0,0,0-.11.1S73.89,22.74,73.89,22.72Z"/>
+                <path class="cls-7" d="M74,22.43c0,.1,0,.2-.08.29-.42.21-.6.36-.63.36A3.44,3.44,0,0,1,74,22.43Z"/>
+                <path class="cls-12"
+                      d="M74,31.89a3.21,3.21,0,0,1-.81-.06.4.4,0,0,0-.29.05c0-.39,0-.77,0-1.13a3.25,3.25,0,0,1,0-.33A2.34,2.34,0,0,0,74,31.89Z"/>
+                <path class="cls-7"
+                      d="M74,60.42a.55.55,0,0,1-.14.35,1.17,1.17,0,0,1-.24.21,2.14,2.14,0,0,1-.48.27.83.83,0,0,1-.4,0,.13.13,0,0,0,0-.06.86.86,0,0,0,.34-.09,2.23,2.23,0,0,0,.42-.3c.14-.12.28-.25.26-.41a2,2,0,0,0-.47-.93.61.61,0,0,0-.36-.23.21.21,0,0,1,0-.13v0c0-.09,0-.16.1-.16s.07,0,.18.08a1.17,1.17,0,0,1,.34.28,2.35,2.35,0,0,1,.29.49A1.59,1.59,0,0,1,74,60.42Z"/>
+                <path class="cls-9"
+                      d="M73.8,60.42c0,.16-.12.29-.26.41a2.23,2.23,0,0,1-.42.3.86.86,0,0,1-.34.09,4.88,4.88,0,0,0,.08-.61,6.06,6.06,0,0,0,.06-1c0-.18,0-.34,0-.48h0a.21.21,0,0,0,0,.13.61.61,0,0,1,.36.23A2,2,0,0,1,73.8,60.42Z"/>
+                <path class="cls-7"
+                      d="M73.88,22.78c-.09.38-.18.75-.24,1.11-.36,2-.44,3.33-.46,3.41s-.16,1.29-.26,3.11a11.17,11.17,0,0,1-.24-3.6C72.78,24.55,73,23.54,73.88,22.78Z"/>
+                <path class="cls-14"
+                      d="M73.59,42.9c.18.22.26.47.11.6l-.18.15a1.62,1.62,0,0,0-.18.19.34.34,0,0,0-.07.11.42.42,0,0,0,0,.1.19.19,0,0,0,0,.08v0a.38.38,0,0,1-.07.21l-.08.08s-.09.06-.09,0,.12-.22,0-.31a.55.55,0,0,0-.38.14c-.07.06-.1.09-.09.1s0,0,.13,0l.14,0,.08,0h0s0,0,0,0c0,.2,0,.17,0,.22a.36.36,0,0,1,0,.11.83.83,0,0,0-.06.21s0,0,0,0v0c-.05,0-.09,0-.14,0s-.27.2-.39.27a.58.58,0,0,1-.44.13.16.16,0,0,0,0-.14c0-.09-.09-.09-.09-.08a.3.3,0,0,1,0,.09s-.08.09-.18.13a3.33,3.33,0,0,1-.78.22,1.59,1.59,0,0,1-.76,0l-.07,0,.33-.2a2,2,0,0,0,.28-.23l.12-.12a2,2,0,0,0,.13-.18.42.42,0,0,0,.08-.38.4.4,0,0,0-.29-.21,1.32,1.32,0,0,0-.57,0,.56.56,0,0,0-.38.21.54.54,0,0,0-.08.25s0,.07,0,.08,0,0,.08-.06a.84.84,0,0,1,.12-.19.4.4,0,0,1,.29-.1,1.29,1.29,0,0,1,.41,0s.1,0,.11.1a.2.2,0,0,1-.06.15l-.07.06-.11.1a2.2,2.2,0,0,1-.25.17,1.69,1.69,0,0,1-1.19.29.46.46,0,0,1-.35-.31,1.46,1.46,0,0,1-.1-.57,1.5,1.5,0,0,1,.4-.95,2.5,2.5,0,0,1,.94-.59,3.85,3.85,0,0,1,.58-.19,1.17,1.17,0,0,1,.27-.05h.06l.25.05a1.53,1.53,0,0,0,.29,0l.23-.08.21-.07.11,0H72a3.17,3.17,0,0,1,.87,0,1.06,1.06,0,0,1,.38.12A1.4,1.4,0,0,1,73.59,42.9Z"/>
+                <path class="cls-7"
+                      d="M73.66,53.78a3,3,0,0,1-.08.71c-.1.39-.26.81-.38,1.27s-.3,1.15-.38,1.5c0-.17,0-.36-.09-.56s0-.28-.07-.42,0-.41.08-.62c.06-.47.2-1,.25-1.28a2,2,0,0,0,0-.4.79.79,0,0,0,0-.14.91.91,0,0,0-.11-.44,1.84,1.84,0,0,0-.94-.61l-.11,0c0-.18-.09-.36-.15-.53l.4.13a2.22,2.22,0,0,1,1.29.7,1.42,1.42,0,0,1,.24.51C73.65,53.7,73.65,53.78,73.66,53.78Z"/>
+                <path class="cls-7"
+                      d="M73.25,46.34s-.07.28-.36.6a2.84,2.84,0,0,1-1.33.85,4.87,4.87,0,0,1-1,.18v0a.33.33,0,0,0-.32-.31l-.49.2v-.4l.12-.09.21,0a4.38,4.38,0,0,0,1.39,0,3.16,3.16,0,0,0,1.28-.58,4.89,4.89,0,0,1,.52-.42Z"/>
+                <path class="cls-9"
+                      d="M73,54a2,2,0,0,1,0,.4c0,.31-.19.81-.25,1.28,0,.21-.06.42-.08.62-.15-.86-.4-1.9-.66-2.93l-.16-.6.11,0a1.84,1.84,0,0,1,.94.61.91.91,0,0,1,.11.44A.79.79,0,0,1,73,54Z"/>
+                <path class="cls-7"
+                      d="M72.92,45c-.06,0-.21.24-.42.45a.76.76,0,0,1-.55.18.47.47,0,0,1-.24-.08.2.2,0,0,0,.09-.06.47.47,0,0,0,.13-.11h0a.58.58,0,0,0,.44-.13c.12-.07.27-.2.39-.27s.09-.06.14,0L73,45A0,0,0,0,1,73,45h0S73,45.06,72.92,45Z"/>
+                <path class="cls-7"
+                      d="M72.92,59.13c0,.14,0,.3,0,.48a6.06,6.06,0,0,1-.06,1,4.88,4.88,0,0,1-.08.61h-.14s0,0,.13.05a15.64,15.64,0,0,1-2,5.16c-.32.55-.68,1.11-1.07,1.68.08-.34.11-.56.06-.59a8.26,8.26,0,0,0-1.23,2l-.28.52v0a5.08,5.08,0,0,1-1.66,1.26,9.59,9.59,0,0,1-2.31.74l-.66.11v-.09c0-.08,0-.14,0-.17v0h-1s0,.18,0,.44h-.07c0-.27,0-.42-.08-.43s-.06.16-.11.45c-.19,0-.38,0-.57,0a14.62,14.62,0,0,1-2.55-.07,9.7,9.7,0,0,1-2.18-.62,4.84,4.84,0,0,0-.26-.43s0,0,0,0S57,71,57,71l-1.24-.44a3.26,3.26,0,0,1-.11.33c-.37-.22-.73-.46-1.08-.71a17.72,17.72,0,0,1-2-1.68l-.19-.21a.76.76,0,0,0,.12-.61A8.22,8.22,0,0,1,52,66.29l.13-.07a6.9,6.9,0,0,0,1.1,1.62l.14.13,0,0,.16.24.09-.06c.21.21.44.41.67.61a.23.23,0,0,1-.18,0l-.15.25a.57.57,0,0,0,.28.08.42.42,0,0,0,.28-.1l.61.47a10.2,10.2,0,0,0,4.36,2,15.88,15.88,0,0,0,2.4.12,16.42,16.42,0,0,0,2.35-.22A5.89,5.89,0,0,0,68,69.45a28.34,28.34,0,0,0,2.4-3.28,15.37,15.37,0,0,0,2.22-5.6c.23-1.45.13-2.3.2-2.3a2.49,2.49,0,0,1,.09.6C72.9,59,72.91,59,72.92,59.13Z"/>
+                <path class="cls-10"
+                      d="M72.86,31.88a4.68,4.68,0,0,0,0,.53.32.32,0,0,1-.15-.35A.27.27,0,0,1,72.86,31.88Z"/>
+                <path class="cls-7"
+                      d="M72.82,57.26c.07.61.05,1,0,1s-.26-.5-.55-1.28h0a.66.66,0,0,1,0-.15l-.73-2,.14-.14a3.1,3.1,0,0,0,.37-.46.27.27,0,0,0-.16-.38c-.17-.08-.34-.06-.4,0s-.07.11-.2.27c-.06-.17-.12-.34-.19-.52l-.31-.84.11,0,.33-.08L70.81,52a3.28,3.28,0,0,0,1,.73l.16.6c.26,1,.51,2.07.66,2.93a2.62,2.62,0,0,0,0,1.31S72.77,57.47,72.82,57.26Z"/>
+                <path class="cls-9"
+                      d="M72.25,57c.29.78.46,1.29.55,1.28-.07,0,0,.85-.2,2.3a15.37,15.37,0,0,1-2.22,5.6A28.34,28.34,0,0,1,68,69.45a5.89,5.89,0,0,1-3.79,1.9,16.42,16.42,0,0,1-2.35.22,15.88,15.88,0,0,1-2.4-.12,10.2,10.2,0,0,1-4.36-2L54.47,69h0a1.6,1.6,0,0,0,.26-1.3.18.18,0,0,0-.19-.11h-.83l-.21,0,.06.2s0,.12-.21.24l-.14-.13a6.9,6.9,0,0,1-1.1-1.62l-.18-.35q-.15-.32-.27-.63a.24.24,0,0,0,.14,0,.37.37,0,0,0,.27-.31.48.48,0,0,0-.17-.41.36.36,0,0,0-.18-.11,1.48,1.48,0,0,1-.42-.19s0,0-.05,0a23,23,0,0,1-.76-2.84c-.16-.74-.28-1.48-.38-2.2l.12,0c.26-.08.66-.2,1.22-.39a10.72,10.72,0,0,0,2.1-1c.41-.26.83-.56,1.28-.91l.74-.6c.31-.25.48-.46.79-.72a6.55,6.55,0,0,1,.56-.6l0,0A7.67,7.67,0,0,1,56,55c-.4,0-.82.08-1.16.09l-.82,0a9.68,9.68,0,0,1-1.4-.1,5.38,5.38,0,0,1-1.85-.65,3.29,3.29,0,0,1-.67-.53c0-.29.08-.58.13-.86a15.28,15.28,0,0,1,.42-1.65,4.78,4.78,0,0,0,.81.2,6.94,6.94,0,0,0,2-.08l.62-.09.81-.14.89-.16.48-.09c.12,0,0,0,0-.06s-.14,0-.15,0-.17-.1-.17-.11l-.17-.07,1.7-.25h0a15.19,15.19,0,0,0,1.8-1.48c.45-.37.91-.73,1.27-1l.45-.3a16.2,16.2,0,0,0,3.42,1,9.28,9.28,0,0,0,2,0v0a1,1,0,0,0,.19.14,3.7,3.7,0,0,0,.44.28,1.84,1.84,0,0,0,.47.15,2.79,2.79,0,0,0,1.18,0,6.28,6.28,0,0,0,.66-.23s.07.17.12.33a.27.27,0,0,1,.08.19h0v0a1.16,1.16,0,0,1-.18.51,1.92,1.92,0,0,1-.18.29,2.28,2.28,0,0,1-1.25.69l-.51.09-.61.1a4.7,4.7,0,0,0-.71.14l-.16,0-.09,0s0,.06,0,.08a1.84,1.84,0,0,0,.15.35,2.3,2.3,0,0,0,.52.6,3.18,3.18,0,0,0,.58.35,3.49,3.49,0,0,0,1.12.31A6.5,6.5,0,0,0,69.86,53c.37-.07.64-.13.85-.19h0l.31.84c.07.18.13.35.19.52l-.08.1a2.71,2.71,0,0,1-1,.68,3.82,3.82,0,0,1-1.73.24l-1-.09c-.26,0-.59-.08-1-.17s-.83-.23-1.29-.36l.11.14,0,0v0l0,0,.35.32a9.75,9.75,0,0,0,.74.64l.43.32.29.18a5.33,5.33,0,0,0,.56.32,5.15,5.15,0,0,0,2.26.61A5.47,5.47,0,0,0,72.25,57Zm-1.92,3.55a3.52,3.52,0,0,0,.29-.4,3.56,3.56,0,0,0-.45-.13l-.27,0c-.16,0-.32,0-.3.05a2.64,2.64,0,0,0,.26.11l.24.1c.06,0,0,0,.05,0s0,0-.06,0l-.11.12a.56.56,0,0,1-.24.17c-.09,0-.15,0-.16-.1s0-.16,0-.17-.07,0-.1.16a.27.27,0,0,0,0,.23.39.39,0,0,0,.26.11A1,1,0,0,0,70.33,60.54Zm-.14,3s.18-.11,0-.29a1.78,1.78,0,0,0-.74-.06l-.33,0a1.15,1.15,0,0,0-.31,0,3.87,3.87,0,0,0-1,.41,1.55,1.55,0,0,1-.32.14c-.07,0-.12,0-.12,0s-.09,0-.1.12a.63.63,0,0,0,.18.34.9.9,0,0,0,.45.32.84.84,0,0,0,.6-.22,4.68,4.68,0,0,1,.91-.55l.11,0,.18-.06.3-.09A.88.88,0,0,0,70.19,63.49Zm-1.1,3.9c0-.21-.16-.29-.3-.25a1,1,0,0,0-.2,0,3.56,3.56,0,0,0-.62.34c-.28.19-.53.42-.5.45s.31-.12.62-.25a4,4,0,0,1,.41-.17l.19-.06s.07,0,.07,0,0,0,0,0,0,.14,0,.22-.05.18-.07.25-.16.14-.18.17,0,0,.09,0,.16-.05.22-.12a1.74,1.74,0,0,0,.14-.27A2.09,2.09,0,0,0,69.09,67.39Zm-4.54-3.93a.18.18,0,0,0-.06-.23c-.14-.06-.13,0-.15,0H64a3.24,3.24,0,0,0-.67,0,.81.81,0,0,0-.52.46c-.07.17-.08.29-.06.3a2.44,2.44,0,0,0,.94-.07,1.63,1.63,0,0,0,.62-.28l.07,0a.11.11,0,0,0,.06,0S64.51,63.53,64.55,63.46Zm-.92,3.12c0-.13-.12-.24-.23-.28a2.15,2.15,0,0,0-.52-.13l-.36,0a1,1,0,0,0-.78.31,1.22,1.22,0,0,0-.36,1,2.13,2.13,0,0,1,.52-.88.73.73,0,0,1,.59-.17l.35,0a2.92,2.92,0,0,1,.45.08l0,0v0a.5.5,0,0,1-.07.08c-.1.11-.24.24-.33.32-.34.14-.68.19-.68.22a1.18,1.18,0,0,0,.77,0,3.25,3.25,0,0,0,.42-.31l.09-.1A.5.5,0,0,0,63.63,66.58ZM60.11,69.3a.26.26,0,0,0,.07-.24.4.4,0,0,0-.22-.2c-.31-.14-.6,0-.57,0s.07,0,.16,0a.86.86,0,0,1,.28.11s0,.06,0,.06,0,0,0,0a1.49,1.49,0,0,1-.46.07.49.49,0,0,1-.19,0c-.06,0,.05,0,.05.07a.23.23,0,0,1,0,.07s0,0,0,0,0,0,0,0,0,0,0,0l.1,0a1.16,1.16,0,0,0,.4,0l.19,0A.58.58,0,0,0,60.11,69.3ZM57.7,62.89a.24.24,0,0,0,0-.17.2.2,0,0,0-.07-.15.37.37,0,0,0-.16-.1.81.81,0,0,0-.31-.06,2.63,2.63,0,0,0-.77.06c-.26,0-.52.06-.73.08l-.15,0-.06,0s0,.07,0,.08.09.06.09.06,0,0,0-.07h.18a3.66,3.66,0,0,0,.75,0,3.23,3.23,0,0,1,.71,0l.19,0h0s0,0,0,0-.35.38-.54.42a.67.67,0,0,1-.33-.05l-.34-.1A1.21,1.21,0,0,0,55.8,63s.1.09.29.18l.31.15a.91.91,0,0,0,.43.11.83.83,0,0,0,.42-.2l.27-.21A.59.59,0,0,0,57.7,62.89Z"/>
+                <path class="cls-7"
+                      d="M72.73,56.7c0,.2.06.39.09.56s-.09.33-.11.33a2.62,2.62,0,0,1,0-1.31C72.69,56.42,72.71,56.56,72.73,56.7Z"/>
+                <path class="cls-7" d="M72.78,61.22a.13.13,0,0,1,0,.06c-.09,0-.13,0-.13-.05Z"/>
+                <path class="cls-8"
+                      d="M73,2.19l-.42.4a4.62,4.62,0,0,0-.72,1,13.45,13.45,0,0,0-.62,1.26c-.13.34-.28.75-.43,1.18a2.55,2.55,0,0,0-.08.26s0,.07,0,0V6.22l0-.16,0-.32q0-.3-.06-.57a3,3,0,0,0-.1-.5,5.46,5.46,0,0,0-.21-.61,12.39,12.39,0,0,0-.83-1.76c.3,0,.61-.11.92-.15A8.43,8.43,0,0,1,71.8,2a1.48,1.48,0,0,1,.31,0l.41.05A3.64,3.64,0,0,0,73,2.19Z"/>
+                <path class="cls-7"
+                      d="M72.25,57h0a5.47,5.47,0,0,1-2.27.2,5.15,5.15,0,0,1-2.26-.61,5.33,5.33,0,0,1-.56-.32l-.29-.18-.43-.32a9.75,9.75,0,0,1-.74-.64l-.35-.32,0,0v0l0,0-.11-.14c.46.13.94.28,1.29.36s.69.13,1,.17l1,.09a3.82,3.82,0,0,0,1.73-.24,2.71,2.71,0,0,0,1-.68l.08-.1c.09.23.17.45.25.68a3.23,3.23,0,0,1-1.07.67,4.36,4.36,0,0,1-2,.22,10.19,10.19,0,0,1-1.08-.12l-.19,0-.16,0-.08,0,0,.05a.77.77,0,0,0,.13.12l.08.07.24.17c.17.12.35.22.52.33a5.15,5.15,0,0,0,2.09.67,10.19,10.19,0,0,0,1.62.09A4.86,4.86,0,0,1,72.25,57Z"/>
+                <path class="cls-8"
+                      d="M72.2,56.83a.66.66,0,0,0,0,.15,4.86,4.86,0,0,0-.63,0A10.19,10.19,0,0,1,70,56.92a5.15,5.15,0,0,1-2.09-.67c-.17-.11-.35-.21-.52-.33l-.24-.17-.08-.07a.77.77,0,0,1-.13-.12l0-.05.08,0,.16,0,.19,0a10.19,10.19,0,0,0,1.08.12,4.36,4.36,0,0,0,2-.22,3.23,3.23,0,0,0,1.07-.67Z"/>
+                <path class="cls-7"
+                      d="M71.82,53.86a.27.27,0,0,1,.16.38,3.1,3.1,0,0,1-.37.46l-.14.14c-.08-.23-.16-.45-.25-.68.13-.16.19-.26.2-.27S71.65,53.78,71.82,53.86Z"/>
+                <path class="cls-7"
+                      d="M71.75,45.41s0,0,0,0a.05.05,0,0,1-.06.06s0,0,0,.05h0a3.42,3.42,0,0,1-.69.28,1.77,1.77,0,0,1-.91,0,.68.68,0,0,1-.31-.18,2.07,2.07,0,0,0,.34-.15l.07,0a1.59,1.59,0,0,0,.76,0,3.33,3.33,0,0,0,.78-.22c.1,0,.17-.09.18-.13a.3.3,0,0,0,0-.09s.06,0,.09.08a.16.16,0,0,1,0,.14h0s-.05,0-.05,0a.3.3,0,0,0-.1.07h0A.08.08,0,0,0,71.75,45.41Z"/>
+                <path class="cls-7"
+                      d="M71.88,45.38s0,0,.05,0a.47.47,0,0,1-.13.11.2.2,0,0,1-.09.06h0s0,0,0-.05a.05.05,0,0,0,.06-.06h0A.3.3,0,0,1,71.88,45.38Z"/>
+                <path class="cls-7"
+                      d="M71.69,52.22c.06.17.1.35.15.53a3.28,3.28,0,0,1-1-.73h0l-.19-.36-.06.07c-.08-.11-.11-.19-.09-.21S71,51.94,71.69,52.22Z"/>
+                <path class="cls-7"
+                      d="M65,82.21h0q.11.44.18.87l1.5.82,2.42,0a2.26,2.26,0,0,0,1.07-.11,1,1,0,0,0,.36-.3l.09-.11a0,0,0,0,0,0,0,.89.89,0,0,1,0,.11h0l.27.19c.08-.1,0-.36-.13-.59l0-.08c.11-.17.21-.33.3-.49l.08-.15a.28.28,0,0,1,0,.07l.3-.13a1.54,1.54,0,0,0-.17-.23.86.86,0,0,0-.14-.13,1.18,1.18,0,0,0-.32-.66.73.73,0,0,0-.73-.28,7.83,7.83,0,0,0-.86.38,9.05,9.05,0,0,1-1.64.62,5.61,5.61,0,0,1-1.34,0c-.36,0-.64,0-.84,0h-.1l.21,0,.16,0h.08V82h0c.14,0,.3,0,.48-.06a6.81,6.81,0,0,0,1.29-.11,9.28,9.28,0,0,0,1.53-.68,6.59,6.59,0,0,1,.92-.45,1.08,1.08,0,0,1,.64,0,1.56,1.56,0,0,1,.52.34,1.79,1.79,0,0,1,.53,1.14.69.69,0,0,1,0,.39,2.73,2.73,0,0,1-.13.29c-.09.18-.19.35-.29.52s-.21.35-.34.53a1.52,1.52,0,0,1-.55.48,3,3,0,0,1-1.34.21l-2.58,0c-.66-.35-1.33-.69-2-1-.35-1.54-.7-3-1-4.43-.08-.32-.15-.62-.23-.92,0,0,0-.15-.05-.21l0-.13,0-.24-.06-.48c-.06-.62-.12-1.2-.17-1.74-.1-1.07-.19-2-.24-2.56,0-.23,0-.42-.05-.57.32,0,.65-.07,1-.12,0,.15,0,.36,0,.61,0,.61.11,1.49.2,2.56,0,.53.09,1.11.14,1.73,0,.27,0,.55.08.84l.08.29,0,.25c0,.17.08.33.11.5L65,82.2Zm5.66,1.37h0S70.66,83.57,70.68,83.58Z"/>
+                <path class="cls-10" d="M71.77,45.45s0,0,0,0A.08.08,0,0,1,71.77,45.45Z"/>
+                <path class="cls-10"
+                      d="M71.58,82.36l-.3.13a.28.28,0,0,0,0-.07l0-.07c0-.06,0-.06,0-.17s0-.12,0-.18a.86.86,0,0,1,.14.13A1.54,1.54,0,0,1,71.58,82.36Z"/>
+                <path class="cls-10"
+                      d="M71.29,82.18c0,.11,0,.11,0,.17l0,.07a.69.69,0,0,0-.42-.35,1.72,1.72,0,0,0-.5,0,.38.38,0,0,0-.16,0s-.07,0-.08,0,0,0,0,0a.27.27,0,0,1,.17-.09,1.51,1.51,0,0,1,.56-.08.88.88,0,0,1,.41.16C71.28,82.06,71.28,82.12,71.29,82.18Z"/>
+                <path class="cls-9"
+                      d="M71.24,82.42l-.08.15c-.09.16-.19.32-.3.49l0,.08a1.05,1.05,0,0,0-.31-.28,1.38,1.38,0,0,0-.6-.08c-.16,0-.26,0-.26,0s.1.06.25.09a1.51,1.51,0,0,1,.48.16.84.84,0,0,1,.26.35l-.09.11a1,1,0,0,1-.36.3,2.26,2.26,0,0,1-1.07.11l-2.42,0-1.5-.82q-.08-.43-.18-.87h.08l.32-.06h.12c.2,0,.48,0,.84,0a5.61,5.61,0,0,0,1.34,0,9.05,9.05,0,0,0,1.64-.62,7.83,7.83,0,0,1,.86-.38.73.73,0,0,1,.73.28,1.18,1.18,0,0,1,.32.66.88.88,0,0,0-.41-.16,1.51,1.51,0,0,0-.56.08.27.27,0,0,0-.17.09s-.06,0,0,0,0,0,.08,0a.38.38,0,0,1,.16,0,1.72,1.72,0,0,1,.5,0A.69.69,0,0,1,71.24,82.42Z"/>
+                <path class="cls-7"
+                      d="M70.81,52l.35.67-.33.08-.11,0h0c-.12-.31-.23-.63-.35-.93l.06,0,.13-.1a2.64,2.64,0,0,0,.25.29Z"/>
+                <path class="cls-7"
+                      d="M71.07,50c.19.63.41,1.39.62,2.2-.68-.28-1.18-.74-1.23-.7s0,.1.09.21l-.13.1-.06,0-.47-1.26a2.71,2.71,0,0,0,.46-.57,1.65,1.65,0,0,0,.18-.37l-1.06-.17h0a.27.27,0,0,0-.08-.19c0-.16-.1-.28-.12-.33a6,6,0,0,0,1.06-.57.41.41,0,0,0,.19-.24C70.61,48.52,70.86,49.32,71.07,50Z"/>
+                <path class="cls-10"
+                      d="M70.82,83.14c.17.23.21.49.13.59l-.27-.19h0a.89.89,0,0,0,0-.11,0,0,0,0,1,0,0C70.69,83.32,70.76,83.23,70.82,83.14Z"/>
+                <path class="cls-7"
+                      d="M70.2,46.69c.42-.35.62-.71.68-.65a1.07,1.07,0,0,1-.1.24,2.11,2.11,0,0,1-.41.59,2.7,2.7,0,0,1-.53.46h0l-.08,0h0v-.12h-.15l-.09,0h0a.2.2,0,0,0-.09.06.28.28,0,0,0-.13.25v.05c-.3.06-.85.19-1.4.36a7.15,7.15,0,0,1-1.37.28h-.17a4,4,0,0,1-1.07-.17,3.65,3.65,0,0,1-1-.49,15.58,15.58,0,0,1-1.3-1.21l.17-.11.26-.17c.44.38.87.76,1.21,1a2.87,2.87,0,0,0,.58.27l.26.08a4.51,4.51,0,0,0,.92.2,7.36,7.36,0,0,0,2-.12A3.92,3.92,0,0,0,70.2,46.69Z"/>
+                <path class="cls-10" d="M70.61,51.66l.19.36a2.64,2.64,0,0,1-.25-.29Z"/>
+                <path class="cls-11" d="M70.72,83.58h0s0,0,0,0Z"/>
+                <path class="cls-7"
+                      d="M70.54,47.93v0h-.09s0,0-.11,0A1.36,1.36,0,0,1,70,48a1.48,1.48,0,0,1-.31,0l-.16,0h0s.12,0,.12,0l.07,0h.06v0l.49-.2A.33.33,0,0,1,70.54,47.93Z"/>
+                <path class="cls-10" d="M70.45,48h.09a.52.52,0,0,1,0,.18A1.08,1.08,0,0,1,70.45,48Z"/>
+                <path class="cls-7"
+                      d="M70.36,51.87c.12.3.23.62.35.93-.21.06-.48.12-.85.19a6.5,6.5,0,0,1-1.71.12A3.49,3.49,0,0,1,67,52.8a3.18,3.18,0,0,1-.58-.35,2.3,2.3,0,0,1-.52-.6,1.84,1.84,0,0,1-.15-.35s0-.07,0-.08l.09,0,.16,0a4.7,4.7,0,0,1,.71-.14l.61-.1.51-.09a2.28,2.28,0,0,0,1.25-.69,1.92,1.92,0,0,0,.18-.29,1.16,1.16,0,0,0,.18-.51v0h0l.42,1.11a2.94,2.94,0,0,1-1.93.82l-1.08.1-.48,0-.12,0s-.11,0-.07,0a.57.57,0,0,0,.12.23,1.41,1.41,0,0,0,.36.37,2.64,2.64,0,0,0,1.53.43,3.93,3.93,0,0,0,1.47-.4A4.92,4.92,0,0,0,70.36,51.87Z"/>
+                <path class="cls-7" d="M69.47,49.5l1.06.17a1.65,1.65,0,0,1-.18.37,2.71,2.71,0,0,1-.46.57Z"/>
+                <path class="cls-7"
+                      d="M70.45,48a1.08,1.08,0,0,0,.06.18.41.41,0,0,1-.19.24,6,6,0,0,1-1.06.57l0,0c0-.16.2-.4.57-.53a1.51,1.51,0,0,0,.53-.42Z"/>
+                <path class="cls-10" d="M70.45,48h-.11C70.4,47.93,70.43,47.92,70.45,48Z"/>
+                <path class="cls-7"
+                      d="M70,48a1.36,1.36,0,0,0,.35,0,1.51,1.51,0,0,1-.53.42c-.37.13-.62.37-.57.53l0,0a6.28,6.28,0,0,1-.66.23,2.79,2.79,0,0,1-1.18,0,1.84,1.84,0,0,1-.47-.15,3.7,3.7,0,0,1-.44-.28,1,1,0,0,1-.19-.14v0h.08a6.07,6.07,0,0,0,.83-.17h0a.34.34,0,0,0,0,.15.9.9,0,0,0,.27.2,1.32,1.32,0,0,0,1,.09,1.66,1.66,0,0,0,.79-.36l.26-.18s.13-.12.13-.22v-.08a.76.76,0,0,0-.2-.16l.16,0A1.48,1.48,0,0,0,70,48Z"/>
+                <path class="cls-7"
+                      d="M70.62,60.14a3.52,3.52,0,0,1-.29.4,1,1,0,0,1-.57.29.39.39,0,0,1-.26-.11.27.27,0,0,1,0-.23c0-.12.09-.17.1-.16s0,.08,0,.17.07.11.16.1a.56.56,0,0,0,.24-.17l.11-.12s0,0,.06,0,0,0-.05,0l-.24-.1A2.64,2.64,0,0,1,69.6,60s.14-.07.3-.05l.27,0A3.56,3.56,0,0,1,70.62,60.14Z"/>
+                <path class="cls-7"
+                      d="M70.21,63.2c.16.18,0,.28,0,.29a.88.88,0,0,1-.2.1l-.3.09-.18.06-.11,0a4.68,4.68,0,0,0-.91.55.84.84,0,0,1-.6.22.9.9,0,0,1-.45-.32.63.63,0,0,1-.18-.34c0-.12.1-.13.1-.12a.15.15,0,0,0,0,.11.78.78,0,0,0,.2.26.8.8,0,0,0,.38.23c.14,0,.29-.11.45-.23a4.78,4.78,0,0,1,.92-.64l.09,0h0l0,0h-.57a5.22,5.22,0,0,0-1,.31,1.25,1.25,0,0,1-.36.09c-.09,0-.14,0-.13,0s0,0,.12,0a1.55,1.55,0,0,0,.32-.14,3.87,3.87,0,0,1,1-.41,1.15,1.15,0,0,1,.31,0l.33,0A1.78,1.78,0,0,1,70.21,63.2Z"/>
+                <path class="cls-8"
+                      d="M69.89,50.61l.47,1.26a4.92,4.92,0,0,1-.67.41,3.93,3.93,0,0,1-1.47.4,2.64,2.64,0,0,1-1.53-.43,1.41,1.41,0,0,1-.36-.37.57.57,0,0,1-.12-.23s0,0,.07,0l.12,0,.48,0,1.08-.1a2.94,2.94,0,0,0,1.93-.82Z"/>
+                <path class="cls-7"
+                      d="M70,45.42a.28.28,0,0,0,.15.15,2.07,2.07,0,0,1-.34.15l-.08-.1s0-.07.11-.13A.21.21,0,0,1,70,45.42Z"/>
+                <path class="cls-7"
+                      d="M69.81,67.53s0,.25-.06.59c-.39.57-.83,1.14-1.29,1.72l-.16.21.28-.52A8.26,8.26,0,0,1,69.81,67.53Z"/>
+                <path class="cls-7" d="M69.81,47.32h0l-.12.09v-.09h0v0h0Z"/>
+                <path class="cls-7" d="M69.73,47.82v0h0Z"/>
+                <path class="cls-7"
+                      d="M69.72,47.42v.4l0,0h0a1.21,1.21,0,0,0,0-.14.21.21,0,0,1,0-.11s0,0,0,0,0,0,0,0l0,0Z"/>
+                <path class="cls-11" d="M69.72,47.3h0v0Z"/>
+                <path class="cls-7" d="M69.72,47.33v.09l-.09.06a.47.47,0,0,0,.07-.12Z"/>
+                <path class="cls-7"
+                      d="M69.72,47.32h0l0,0a.47.47,0,0,1-.07.12l-.17.09a.51.51,0,0,0-.23,0v-.05a.28.28,0,0,1,.13-.25.2.2,0,0,1,.09-.06h0l.09,0h.15v.14Z"/>
+                <path class="cls-9"
+                      d="M69.72,48.06v.08c0,.1-.13.22-.13.22l-.26.18a1.66,1.66,0,0,1-.79.36,1.32,1.32,0,0,1-1-.09.9.9,0,0,1-.27-.2.34.34,0,0,1,0-.15h0c.25-.08.49-.17.69-.25a8.55,8.55,0,0,0,1.35-.5c0,.06.07.12.1.13l.06,0,0,0h0A.76.76,0,0,1,69.72,48.06Z"/>
+                <path class="cls-7"
+                      d="M69.65,31.44a14.28,14.28,0,0,1-.16,3.36,12.55,12.55,0,0,1-2,4.7c-.7,1-1.25,1.52-1.3,1.47a3,3,0,0,1,.29-.42c.19-.28.46-.68.76-1.2a13.51,13.51,0,0,0,1.65-4.65,13.85,13.85,0,0,0,0-3.23,34.74,34.74,0,0,0-.39-3.57,11,11,0,0,0-1.17-3.44A7.92,7.92,0,0,0,65,21.83l0,0a8.32,8.32,0,0,0-4.87-1.68,29.13,29.13,0,0,0-4.62.59,16.12,16.12,0,0,0-3.07,1c-.7.31-1.08.56-1.14.58s-.57.33-1.36.94a24.3,24.3,0,0,0-3,2.81,25.21,25.21,0,0,0-1.74,2.1c-.14.2-.29.4-.43.61l-.11.14v0s0,0,0,.05l0,0,.23.27.52.6A48.11,48.11,0,0,0,50,34.5a24.1,24.1,0,0,0,2.66,2c.22.15.46.29.69.43l.7.38c.48.25,1,.48,1.45.7,1.92.92,3.72,1.74,5.29,2.33A15.08,15.08,0,0,0,63,41a6.93,6.93,0,0,0,1.74.15,5.22,5.22,0,0,0,1.12-.1c.25,0,.37-.11.38-.1s-.48.39-1.49.47a7.51,7.51,0,0,1-1.82,0,9.31,9.31,0,0,1-1.26-.28c-.33-.08-.66-.18-1-.29-1.63-.53-3.47-1.3-5.42-2.14-.49-.22-1-.43-1.49-.67L53,37.65l-.74-.43a25.94,25.94,0,0,1-2.8-2,47.56,47.56,0,0,1-4.91-4.66L44,30l-.28-.33-.47-.54c0-.05-.11-.09-.08-.14l.1-.15.2-.29.32-.47.42-.61A24.7,24.7,0,0,1,46,25.19a25.2,25.2,0,0,1,3.12-3,16.69,16.69,0,0,1,1.49-1.06c.07,0,.51-.31,1.3-.65a17.8,17.8,0,0,1,3.33-1A27.83,27.83,0,0,1,60.05,19a9.26,9.26,0,0,1,5.51,2l0,0h0a8.88,8.88,0,0,1,2.61,3,11.8,11.8,0,0,1,1.16,3.75A31.65,31.65,0,0,1,69.65,31.44Z"/>
+                <path class="cls-7"
+                      d="M69.67,47.84h0l-.07,0s-.12,0-.12,0l0,0-.06,0s-.07-.07-.1-.13c.12-.07.19-.11.19-.13l.17-.09,0,0s0,0,0,0,0,0,0,0a.21.21,0,0,0,0,.11A1.21,1.21,0,0,1,69.67,47.84Z"/>
+                <path class="cls-10" d="M69.26,47.67a1.24,1.24,0,0,0,.2-.1s-.07.06-.19.13v0Z"/>
+                <path class="cls-10" d="M69.46,47.57a1.24,1.24,0,0,1-.2.1.11.11,0,0,1,0-.08A.51.51,0,0,1,69.46,47.57Z"/>
+                <path class="cls-9"
+                      d="M69.39,63.42h0l0,0h0l-.09,0a4.78,4.78,0,0,0-.92.64c-.16.12-.31.24-.45.23a.8.8,0,0,1-.38-.23.78.78,0,0,1-.2-.26.15.15,0,0,1,0-.11s0,0,.13,0a1.25,1.25,0,0,0,.36-.09,5.22,5.22,0,0,1,1-.31h.53Z"/>
+                <path class="cls-7"
+                      d="M69.39,2.28l0,0-.87.18a1.85,1.85,0,0,0-.46-.33c-.06,0-.1,0-.11,0s0-.07,0-.09A.15.15,0,0,1,68,2l.24-1a1.22,1.22,0,0,1,.45.3A4.35,4.35,0,0,1,69.39,2.28Z"/>
+                <path class="cls-7"
+                      d="M69.75,68.12a14.79,14.79,0,0,1-.53,1.69c-.2.56-.42,1.11-.59,1.52s-.3.7-.32.72-.15.28-.4.66a11.06,11.06,0,0,1-1,1.36c-.27.32-.54.61-.79.86a1.41,1.41,0,0,1-.1-.18l-.63.62s0,0,.08,0,0,0,0,.05v.07c-.18.15-.31.23-.33.16a10.11,10.11,0,0,1,1.16-2c.29-.48.55-1,.74-1.38s.31-.67.32-.69.16-.27.37-.65.31-.55.48-.87v0l.16-.21C68.92,69.26,69.36,68.69,69.75,68.12Z"/>
+                <path class="cls-7"
+                      d="M67.46,48.33l-.29-.1s-.15.06-.49.23a2.48,2.48,0,0,0-.59,0s.19.14.23.2a9.28,9.28,0,0,1-2,0,16.2,16.2,0,0,1-3.42-1,1.4,1.4,0,0,0,.17-.1l.52-.35a15.12,15.12,0,0,0,2.81.9,9.52,9.52,0,0,0,1.93.13h.09a8,8,0,0,0,2-.27,4.8,4.8,0,0,0,.78-.28v0a8.55,8.55,0,0,1-1.35.5c-.2.08-.44.17-.69.25,0,0,0-.06.08-.08l.09,0Z"/>
+                <path class="cls-7"
+                      d="M69.26,47.67h0a4.8,4.8,0,0,1-.78.28,8,8,0,0,1-2,.27A7.15,7.15,0,0,0,67.83,48c.55-.17,1.1-.3,1.4-.36A.11.11,0,0,0,69.26,47.67Z"/>
+                <path class="cls-7"
+                      d="M68.79,67.14c.14,0,.35,0,.3.25a2.09,2.09,0,0,1-.13.37,1.74,1.74,0,0,1-.14.27c-.06.07-.15.14-.22.12s-.09,0-.09,0,.13,0,.18-.17,0-.15.07-.25,0-.24,0-.22,0,0,0,0-.07,0-.07,0l-.19.06a4,4,0,0,0-.41.17c-.31.13-.59.29-.62.25s.22-.26.5-.45a3.56,3.56,0,0,1,.62-.34A1,1,0,0,1,68.79,67.14Z"/>
+                <path class="cls-8"
+                      d="M69,31.47a13.85,13.85,0,0,1,0,3.23,13.51,13.51,0,0,1-1.65,4.65c-.3.52-.57.92-.76,1.2a3,3,0,0,0-.29.42s-.13.05-.38.1a5.22,5.22,0,0,1-1.12.1A6.93,6.93,0,0,1,63,41a15.08,15.08,0,0,1-2.18-.67c-1.57-.59-3.37-1.41-5.29-2.33-.48-.22-1-.45-1.45-.7l-.7-.38c-.23-.14-.47-.28-.69-.43a24.1,24.1,0,0,1-2.66-2,48.11,48.11,0,0,1-4.69-4.67l-.52-.6L44.58,29l0,0s0,0,0-.05v0l.11-.14c.14-.21.29-.41.43-.61A25.21,25.21,0,0,1,46.86,26a24.3,24.3,0,0,1,3-2.81c.79-.61,1.31-.89,1.36-.94s.44-.27,1.14-.58a16.12,16.12,0,0,1,3.07-1,29.13,29.13,0,0,1,4.62-.59,8.32,8.32,0,0,1,4.87,1.68l0,0a7.92,7.92,0,0,1,2.42,2.63,11,11,0,0,1,1.17,3.44A34.74,34.74,0,0,1,69,31.47Zm-1.4,1.13a3.9,3.9,0,0,0,.18-2,16.49,16.49,0,0,0-.59-2.52A10.8,10.8,0,0,0,66,25.61a5.56,5.56,0,0,0-1.16-1.29,11.65,11.65,0,0,0-1.62-.88,7.72,7.72,0,0,0-1.87-.59,4.76,4.76,0,0,0-2.12.1,6.51,6.51,0,0,0-1.94,1,12.46,12.46,0,0,0-4.25,4.91,10,10,0,0,0-.38,1c-.05.18-.09.36-.13.54s0,.18,0,.29,0,.29,0,.43l.33.27.21.16c.14.1.28.22.43.32l.86.58h0a9.39,9.39,0,0,0,2.61,1.13,23,23,0,0,0,2.54.58,12.77,12.77,0,0,0,4.43.18,7.53,7.53,0,0,0,2.83-1A2.43,2.43,0,0,0,67.56,32.6Z"/>
+                <path class="cls-7"
+                      d="M68.16.37l.08.64L68,2A.15.15,0,0,0,68,2s0,.06,0,.09,0,0,.11,0a1.85,1.85,0,0,1,.46.33c-.44.08-.87.18-1.32.25a2.92,2.92,0,0,1-.44.06l-.45,0h-.76l-.58,0c.09-.9.17-1.29.17-1.29l.1-1.1.42,0,.66.05a2.61,2.61,0,0,0,.28,0,1.72,1.72,0,0,0,.31,0C67.32.47,67.72.42,68.16.37Z"/>
+                <path class="cls-9"
+                      d="M68.29,70.07c-.17.32-.34.62-.48.87s-.36.64-.37.65-.14.29-.32.69-.45.9-.74,1.38a10.11,10.11,0,0,0-1.16,2c0,.07.15,0,.33-.16a1.48,1.48,0,0,1,0,.27,25.11,25.11,0,0,0-.33,2.81c-.06,1.31-.06,2.23-.08,2.83,0,.32,0,.54,0,.69a.13.13,0,0,1,0,.06v0H65L64.36,79c0-.17-.07-.33-.11-.5l0-.25-.08-.29c0-.29-.06-.57-.08-.84-.05-.62-.1-1.2-.14-1.73-.09-1.07-.15-1.95-.2-2.56,0-.25,0-.46,0-.61l.66-.11a9.59,9.59,0,0,0,2.31-.74A5.08,5.08,0,0,0,68.29,70.07Z"/>
+                <path class="cls-7"
+                      d="M67.74,30.65a3.9,3.9,0,0,1-.18,2s0-.75,0-.76a13.61,13.61,0,0,0-.48-1.77l0-.21s0-.1,0-.15c-.43-1.11-.53-1.34-.86-2.07l-.4-.8a5.25,5.25,0,0,0-1.66-2.12l-.29-.18h-.29l-.66-.32a4.94,4.94,0,0,0-3.44-.5,8.38,8.38,0,0,0-3.31,2.09,10.46,10.46,0,0,0-2.48,3.28,6.91,6.91,0,0,0-.37.95c-.05.16-.09.32-.13.48l0,.24v.09l.28.22.41.32.84.59,0,0a9.23,9.23,0,0,0,2.41,1.09,25,25,0,0,0,2.47.64,15.7,15.7,0,0,0,2.66.35l.3.16a.24.24,0,0,1,.17-.07c.35,0,.7-.06,1.05-.07l.06-.06h.16l.14,0A2.23,2.23,0,0,0,65,34a1.88,1.88,0,0,0,.24-.18,5.65,5.65,0,0,0,.65-.15l.17-.16c.23-.1.44-.2.62-.3a9.45,9.45,0,0,0,.92-.58,2.43,2.43,0,0,1-.85.72,7.53,7.53,0,0,1-2.83,1,12.77,12.77,0,0,1-4.43-.18,23,23,0,0,1-2.54-.58,9.39,9.39,0,0,1-2.61-1.13h0l-.86-.58c-.15-.1-.29-.22-.43-.32l-.21-.16-.33-.27c0-.14,0-.29,0-.43s0-.19,0-.29.08-.36.13-.54a10,10,0,0,1,.38-1,12.46,12.46,0,0,1,4.25-4.91,6.51,6.51,0,0,1,1.94-1,4.76,4.76,0,0,1,2.12-.1,7.72,7.72,0,0,1,1.87.59,11.65,11.65,0,0,1,1.62.88A5.56,5.56,0,0,1,66,25.61a10.8,10.8,0,0,1,1.14,2.52A16.49,16.49,0,0,1,67.74,30.65Z"/>
+                <path class="cls-12"
+                      d="M67.54,31.84s0,.75,0,.76a9.45,9.45,0,0,1-.92.58c-.18.1-.39.2-.62.3a5.74,5.74,0,0,0,1-3.41A13.61,13.61,0,0,1,67.54,31.84Z"/>
+                <path class="cls-7"
+                      d="M67.46,48.33H67.4l-.09,0s-.08.05-.08.08a6.07,6.07,0,0,1-.83.17h-.08c0-.06-.23-.15-.23-.2a2.48,2.48,0,0,1,.59,0c.34-.17.49-.23.49-.23Z"/>
+                <path class="cls-7"
+                      d="M67.08,29.86l0,.21a21.9,21.9,0,0,0-1.45-3.34l-.08-.15-.24-.45L65.17,26a4.12,4.12,0,0,0-.85-1,6.68,6.68,0,0,0-.78-.47h.29l.29.18a5.25,5.25,0,0,1,1.66,2.12l.4.8c.33.73.43,1,.86,2.07C67.06,29.76,67.06,29.82,67.08,29.86Z"/>
+                <path class="cls-13"
+                      d="M67.06,30.07a5.74,5.74,0,0,1-1,3.41c-.23.09-.48.18-.76.26l.14-.11a10.05,10.05,0,0,1-2.5.35H62a5.25,5.25,0,0,1-1.9-4.7c.14-2.6,1.6-4.63,3.4-4.74a6.68,6.68,0,0,1,.78.47,4.12,4.12,0,0,1,.85,1l.12.15.24.45.08.15A21.9,21.9,0,0,1,67.06,30.07Z"/>
+                <path class="cls-7"
+                      d="M66.85,42.55a.2.2,0,0,1-.08.24.37.37,0,0,1-.23.05l-.32,0-.29,0,0,0,.67,0c.3,0,.16-.28-.11-.48s-.38.34-.38.34-.15-.05-.15-.07a.83.83,0,0,1,.18-.34.3.3,0,0,1,.22-.11h0a.41.41,0,0,1,.24.1A.85.85,0,0,1,66.85,42.55Z"/>
+                <path class="cls-7"
+                      d="M66.47,42.26c.27.2.41.48.11.48l-.67,0s0,0,0,0l.27-.06.31,0a.16.16,0,0,0,.1,0s0,0,0-.06a.84.84,0,0,0-.19-.18c-.08,0,0,0-.07,0a.62.62,0,0,0-.09.23s-.08,0-.17,0S66.21,42.06,66.47,42.26Z"/>
+                <path class="cls-7"
+                      d="M66.43,45.15a.58.58,0,0,1,.25.49.73.73,0,0,1-1.11.38.58.58,0,0,1-.07-.61,1.86,1.86,0,0,1,.3-.45s.09,0,.15.06c-.22.26-.51.64-.27.91s1,0,.9-.45A.74.74,0,0,0,66,45S66.17,45,66.43,45.15Z"/>
+                <path class="cls-7"
+                      d="M66.61,42.57s0,0,0,.06a.16.16,0,0,1-.1,0l-.31,0-.27.06.16-.15c.09,0,.17,0,.17,0a.62.62,0,0,1,.09-.23s0,0,.07,0A.84.84,0,0,1,66.61,42.57Z"/>
+                <path class="cls-7"
+                      d="M66.58,45.48c.15.42-.66.72-.9.45s0-.65.27-.91A.74.74,0,0,1,66.58,45.48Zm-.08.13a.45.45,0,0,0-.16-.36A1,1,0,0,0,66,45c.07.06.1.11.09.14a1.3,1.3,0,0,0-.27.36.29.29,0,0,0,0,.32c0,.07.23.08.39,0A.44.44,0,0,0,66.5,45.61Z"/>
+                <path class="cls-7"
+                      d="M66.34,45.25a.34.34,0,0,1-.17.63c-.16,0-.35,0-.39,0a.29.29,0,0,1,0-.32,1.3,1.3,0,0,1,.27-.36s0-.08-.09-.14A1,1,0,0,1,66.34,45.25Z"/>
+                <path class="cls-9"
+                      d="M66.43,48.23h-.06a9.52,9.52,0,0,1-1.93-.13,15.12,15.12,0,0,1-2.81-.9l1.3-.85a15.58,15.58,0,0,0,1.3,1.21,3.65,3.65,0,0,0,1,.49,4,4,0,0,0,1.07.17Z"/>
+                <path class="cls-9"
+                      d="M64.74,41.44l1.6.64a.3.3,0,0,0-.22.11.83.83,0,0,0-.18.34s.07,0,.15.07l-.16.15s0,0,0,0l0,0-.46.79A15.13,15.13,0,0,0,63.2,44l-.09-.75s0,0,0,0a4.16,4.16,0,0,0-1.24-.48l-.62-.16.38-1.42a9.31,9.31,0,0,0,1.26.28A7.51,7.51,0,0,0,64.74,41.44Z"/>
+                <path class="cls-7"
+                      d="M66.2,75.05a.8.8,0,0,1,0,.44,2.38,2.38,0,0,1-.16.4,7,7,0,0,0-.65,2.7,9.46,9.46,0,0,0,.25,2.8,3.66,3.66,0,0,0,.19.57,4,4,0,0,1-.6.09s0,0,0,0l.14,0h0l-.32.06h0v0a.13.13,0,0,0,0-.06c0-.15,0-.37,0-.69,0-.6,0-1.52.08-2.83a25.11,25.11,0,0,1,.33-2.81,1.48,1.48,0,0,0,0-.27l.28-.25.32-.32Z"/>
+                <path class="cls-7"
+                      d="M66.05,74.75a1.41,1.41,0,0,0,.1.18l-.32.32-.28.25v-.07c0-.06,0,0,0-.05s-.08,0-.08,0Z"/>
+                <path class="cls-7"
+                      d="M66,33.48l-.17.16a5.65,5.65,0,0,1-.65.15l.06,0C65.54,33.66,65.79,33.57,66,33.48Z"/>
+                <path class="cls-7"
+                      d="M65.67,97.26a3.85,3.85,0,0,1,.25,2,5.19,5.19,0,0,1-.46,1.93c-.24.58-.51,1.1-.73,1.55s-.37.7-.5,1l-.77.09c0-.07.08-.17.14-.28s.35-.62.59-1,.52-.93.77-1.47a6.78,6.78,0,0,0,.33-.85,5,5,0,0,0,.17-.92,3.55,3.55,0,0,0-.13-1.79,4.16,4.16,0,0,0-.9-1.32,2.52,2.52,0,0,0-.75-.57c.09,0,.17,0,.27-.06a3,3,0,0,1,.66.44A4.18,4.18,0,0,1,65.67,97.26Z"/>
+                <path class="cls-10" d="M65.89,82h0v0l0,0h0V82Z"/>
+                <path class="cls-10" d="M65.88,82v0h-.08l-.16,0-.21,0h0l-.14,0s-.07-.06,0,0a4,4,0,0,0,.6-.09h0Z"/>
+                <path class="cls-7"
+                      d="M65.47,43.58c.07,0,.11,0,.11,0s-1.5.47-3,1l-.69.23-.48-.41,1-.27c.25-.06.49-.12.74-.16A15.13,15.13,0,0,1,65.47,43.58Z"/>
+                <path class="cls-9"
+                      d="M65.33,97.41a3.55,3.55,0,0,1,.13,1.79,5,5,0,0,1-.17.92A6.78,6.78,0,0,1,65,101c-.25.54-.53,1-.77,1.47s-.44.8-.59,1-.1.21-.14.28l-1.4.14c-.6,0-1.21.1-1.81.13l-.32,0h-.3l-.19,0-.9-.14c-1.61-.25-3.22-.45-4.78-.74,0,0,0,0,0,0,.14-.2.37-.47.64-.8a8.93,8.93,0,0,0,1.69-2.72,5.16,5.16,0,0,0,.08-3.17,1.82,1.82,0,0,0-.56-.8l1,.17a18.79,18.79,0,0,0,6.09-.11c.31,0,.63-.11,1-.19a2.52,2.52,0,0,1,.75.57A4.16,4.16,0,0,1,65.33,97.41Z"/>
+                <path class="cls-13"
+                      d="M65.4,33.63l-.14.11-.34.1h0a15.44,15.44,0,0,1-2,.14A10.05,10.05,0,0,0,65.4,33.63Z"/>
+                <path class="cls-7"
+                      d="M65.26.42l-.1,1.1H64a11.34,11.34,0,0,1,.22,1.25L63,2.73l-.24-.39A8,8,0,0,0,62,1.39l-.26-.28.16-1c.41,0,1.32.13,2.5.27Z"/>
+                <path class="cls-13" d="M65.26,33.74l-.06,0-.28.05Z"/>
+                <path class="cls-7"
+                      d="M64.92,33.84l.28-.05A1.88,1.88,0,0,1,65,34a2.23,2.23,0,0,1-.89,0,6.6,6.6,0,0,0,.84-.16Z"/>
+                <path class="cls-7" d="M64,1.53h1.17s-.08.39-.17,1.29l-.74,0h0A11.34,11.34,0,0,0,64,1.53Z"/>
+                <polygon class="cls-10" points="65.02 82.2 65.02 82.21 65.02 82.21 65.02 82.2"/>
+                <path class="cls-7"
+                      d="M64.35,45.15c.44-.12.74-.09.75,0s-.29.11-.66.29-.68.41-1.08.68L63,45.76A9.59,9.59,0,0,1,64.35,45.15Z"/>
+                <path class="cls-7"
+                      d="M65,2.81a45.57,45.57,0,0,0-.18,4.74s0-.24-.1-.46-.15-.68-.24-1c-.07-1.51-.17-2.59-.26-3.32h0Z"/>
+                <path class="cls-11" d="M64.81,7.55v0l-.29,0v0Z"/>
+                <path class="cls-10"
+                      d="M64.81,7.55l-.3,0c0-.53,0-1,0-1.48q.14.47.24,1C64.76,7.31,64.81,7.52,64.81,7.55Z"/>
+                <path class="cls-7"
+                      d="M62.78,64s0,0,0,0,.49-.14.84-.26a1,1,0,0,0,.36-.2,3.94,3.94,0,0,0-.6,0c-.35,0-.53.41-.6.5S62.78,63.94,62.78,64Zm1.71-.72a.18.18,0,0,1,.06.23c0,.07-.06.06-.09.08a.11.11,0,0,1-.06,0l-.07,0a1.63,1.63,0,0,1-.62.28,2.44,2.44,0,0,1-.94.07s0-.13.06-.3a.81.81,0,0,1,.52-.46,3.24,3.24,0,0,1,.67,0h.32S64.35,63.17,64.49,63.23Zm-.12.18s0,0,0,0a.21.21,0,0,1-.06-.1s0,0,0,0l-.13.07a.53.53,0,0,1-.14.12l.28,0h0A.49.49,0,0,1,64.37,63.41Z"/>
+                <path class="cls-7"
+                      d="M64.47,6.1c0,.46,0,1,0,1.48,0-.07,0-.24-.08-.43a8.67,8.67,0,0,0-2.17-4.3l-.17-.15.93,0A13.48,13.48,0,0,1,64.47,6.1Z"/>
+                <path class="cls-9"
+                      d="M64.39,63.38s0,0,0,0a.49.49,0,0,0,0,.11h0l-.28,0a.53.53,0,0,0,.14-.12l.13-.07s0,0,0,0A.21.21,0,0,0,64.39,63.38Z"/>
+                <path class="cls-13"
+                      d="M64.91,33.84a6.6,6.6,0,0,1-.84.16H64a.29.29,0,0,0-.24,0h-.05l-.5,0-.55,0a3.85,3.85,0,0,1-.48,0L62,34h.86A15.44,15.44,0,0,0,64.91,33.84Z"/>
+                <path class="cls-8" d="M64.21,2.78c.09.73.19,1.81.26,3.32A13.48,13.48,0,0,0,63,2.73Z"/>
+                <path class="cls-7"
+                      d="M64.23,103.68l-.06.12-.2.41c0,.09-.21.1-.38,0s-.27-.21-.22-.32a1.63,1.63,0,0,0,.09-.16Z"/>
+                <path class="cls-13" d="M64.07,34l-.14,0h-.16A.29.29,0,0,1,64,34Z"/>
+                <path class="cls-7"
+                      d="M64,95.46c-.1,0-.18.05-.27.06l-.17-.06a1.06,1.06,0,0,0-.42,0s.13-.15.44-.12A1.26,1.26,0,0,1,64,95.46Z"/>
+                <path class="cls-7"
+                      d="M63.72,34.05h.05l-.06.06c-.35,0-.7,0-1.05.07a.24.24,0,0,0-.17.07l-.3-.16a3.85,3.85,0,0,0,.48,0l.55,0Z"/>
+                <path class="cls-9"
+                      d="M64,63.47a1,1,0,0,1-.36.2c-.35.12-.73.21-.84.26.07-.09.25-.46.6-.5A3.94,3.94,0,0,1,64,63.47Z"/>
+                <path class="cls-7"
+                      d="M63.66,72.09v.09c-.32,0-.65.09-1,.12,0-.26,0-.4,0-.44h1v0S63.65,72,63.66,72.09Z"/>
+                <path class="cls-7"
+                      d="M63.4,66.3c.11,0,.24.15.23.28a.5.5,0,0,1-.1.19l-.09.1a3.25,3.25,0,0,1-.42.31,1.18,1.18,0,0,1-.77,0s.34-.08.68-.22c.09-.08.23-.21.33-.32a.5.5,0,0,0,.07-.08v0l0,0a2.92,2.92,0,0,0-.45-.08l-.35,0a.73.73,0,0,0-.59.17,2.13,2.13,0,0,0-.52.88,1.22,1.22,0,0,1,.36-1,1,1,0,0,1,.78-.31l.36,0A2.15,2.15,0,0,1,63.4,66.3Z"/>
+                <path class="cls-7" d="M63.36,46.07l-.26.17-.17.11-.29-.29a.46.46,0,0,0-.07-.07l.3-.16.14-.07Z"/>
+                <path class="cls-9"
+                      d="M63.11,43.2l.09.75c-.25,0-.49.1-.74.16l-1,.27c-.47-.39-.81-.64-.86-.58a6.65,6.65,0,0,0,.58.66l-.8.25c-.58.19-1,.36-1,.37a8.64,8.64,0,0,0-1,.5l-.41.28c-1.2-.39-2.46-.76-3.71-1.11-.23-.07-.49-.13-.67-.2L53,44.27l-1.32-.59-.15-.07c.7-.19,1.36-.35,1.9-.47.78-.17,1.32-.22,1.35-.23s.56-.1,1.36-.19A20.23,20.23,0,0,1,59,42.65a23,23,0,0,1,2.86.31C62.52,43.08,63,43.2,63.11,43.2Z"/>
+                <path class="cls-7"
+                      d="M63.14,43.19s0,0,0,0-.59-.12-1.27-.24A23,23,0,0,0,59,42.65a20.23,20.23,0,0,0-2.88.07c-.8.09-1.33.17-1.36.19s-.57.06-1.35.23c-.54.12-1.2.28-1.9.47l-.68-.31c.88-.31,1.74-.56,2.44-.75a13.73,13.73,0,0,1,1.39-.29,11.45,11.45,0,0,1,1.4-.14,18.9,18.9,0,0,1,3,.06,19.94,19.94,0,0,1,2.27.37l.62.16A4.16,4.16,0,0,1,63.14,43.19Z"/>
+                <path class="cls-12"
+                      d="M62.88,24.22l.66.32c-1.8.11-3.26,2.14-3.4,4.74A5.25,5.25,0,0,0,62,34l.15.1a15.7,15.7,0,0,1-2.66-.35,25,25,0,0,1-2.47-.64A9.23,9.23,0,0,1,54.65,32l0,0-.84-.59-.41-.32-.28-.22v-.09l0-.24c0-.16.08-.32.13-.48a6.91,6.91,0,0,1,.37-.95,10.46,10.46,0,0,1,2.48-3.28,8.38,8.38,0,0,1,3.31-2.09A4.94,4.94,0,0,1,62.88,24.22Z"/>
+                <path class="cls-7" d="M63,45.76l-.14.07-.3.16-1-1.08.35-.12,1.07.94Z"/>
+                <path class="cls-7" d="M62.64,46.06l.29.29-1.3.85-.73-.29.53-.3L62.57,46A.46.46,0,0,1,62.64,46.06Z"/>
+                <path class="cls-7"
+                      d="M62.78,2.34l.24.39-.93,0a3.36,3.36,0,0,0-.69-.49l-.29-.14.66-1,.26.28A8,8,0,0,1,62.78,2.34Z"/>
+                <path class="cls-11" d="M62.78,64s0,0,0,0S62.79,64,62.78,64Z"/>
+                <path class="cls-7"
+                      d="M61.64,77.81l0,0,0,0,0,.07h0v-.07l0-.26c.22-1.44.43-2.87.58-3.94l.21-1.34.19,0a52.52,52.52,0,0,1-.29,5.39l0,.28v.08a1.94,1.94,0,0,1-.06.22h0s0,0,0,0l0,0h0l0,0,0,0h0s0,0,0,0l-.1-.09h0v0l0,0,0,0,0,0h0A.8.8,0,0,0,61.64,77.81Z"/>
+                <path class="cls-7" d="M62.62,72.3l-.19,0c0-.29.08-.45.11-.45S62.61,72,62.62,72.3Z"/>
+                <path class="cls-9"
+                      d="M61.86,72.35c.19,0,.38,0,.57,0l-.21,1.34c-.15,1.07-.36,2.5-.58,3.94l0,.26v.07h0s0,0,0,0l0,.09-.21.5c-.14.34-.26.66-.39,1l-.69,1.76c-.2.52-.37,1-.48,1.27,0,.08-.06.15-.08.22v0l0,.07s0,0,0,0l0,0c0,.09,0,.13,0,.14l-.51,1.63c-.33.27-.71.6-1.12.93l-1.39,1.19-.18.16-.09.07,0,0h0a2.8,2.8,0,0,1-.14-.25A.6.6,0,0,1,56,86.6a.36.36,0,0,1,0-.12.61.61,0,0,1,.19-.38,3.53,3.53,0,0,1,.28-.37c-.09-.21-.89.56-.79.71a.82.82,0,0,0,.21.57l.11.12L55.13,87l-.45-.07-.19,0a.76.76,0,0,1,0-.15.77.77,0,0,1,.08-.29c0-.08.06-.12.06-.13a2,2,0,0,1,.23-.4c.14-.19.35-.32.33-.36s-.28,0-.49.19a1.33,1.33,0,0,0-.26.28.84.84,0,0,0-.1.15,1,1,0,0,0-.08.53L54,86.34v-.21a2.45,2.45,0,0,1,0-.27,3.12,3.12,0,0,1,.1-.48,1.14,1.14,0,0,1,.45-.64,1,1,0,0,1,.7-.18c.08.16,2-.6,2-.62A12.54,12.54,0,0,0,59,82.79h0a9.25,9.25,0,0,0,.26-3,24.51,24.51,0,0,0-.13-3.16s-.1-.45-.29-1-.47-1.27-.76-2-.66-1.46-.93-2a9.7,9.7,0,0,0,2.18.62A14.62,14.62,0,0,0,61.86,72.35Z"/>
+                <path class="cls-10" d="M62.23,78.28s0,0,0,0l0,0h0Z"/>
+                <path class="cls-7"
+                      d="M62.22,78.31l-.18.51c-.11.34-.23.68-.34,1l-.59,1.79c-.18.52-.32,1-.43,1.28l0,0c-.18,0-.51.09-.51.1h-.52s0-.06,0-.09,0,0,0,0l0-.07v0c0-.07.05-.14.08-.22.11-.32.28-.75.48-1.27l.69-1.76c.13-.33.25-.65.39-1l.21-.5,0-.09s0,0,0,0,0,.12.07.11,0-.12.07-.08h.12l0,0,0,0,0,0v0h0l.1.09s0,0,0,0h0l0,0,0,0h0Z"/>
+                <path class="cls-7"
+                      d="M61.93.07l-.16,1-.66,1,.29.14a3.36,3.36,0,0,1,.69.49l-.57,0-.9-.08c-.52,0-1.27-.11-2.15-.13l-1,0c-.1-.29-.19-.54-.29-.77s-.12-.25-.18-.36a1.51,1.51,0,0,0-.3-.36L56.41.66,56.16.43l0-.21C57,.12,57.75.06,58.46,0c.94,0,1.73,0,2.31,0l.93,0Z"/>
+                <path class="cls-7" d="M61.9,44.79l-.35.12c-.13-.14-.24-.27-.36-.39l0-.06.28-.08Z"/>
+                <path class="cls-10"
+                      d="M61.66,77.83l0,0a.8.8,0,0,1,.17.15h-.08c-.06,0-.07.07-.07.08s-.06-.07-.07-.11l0-.07Z"/>
+                <path class="cls-9"
+                      d="M61.55,44.91l1,1.08-1.14.62-.53.3-1.12-.44-1.06-.37c.5-.26.87-.41.9-.42s.38-.18.93-.4Z"/>
+                <path class="cls-7" d="M61.42,44.38l-.28.08a6.65,6.65,0,0,1-.58-.66C60.61,43.74,61,44,61.42,44.38Z"/>
+                <path class="cls-7"
+                      d="M61.19,44.52c.12.12.23.25.36.39l-1,.37c-.55.22-.92.39-.93.4s-.4.16-.9.42c-.24-.08-.48-.17-.73-.24l.41-.28a8.64,8.64,0,0,1,1-.5s.41-.18,1-.37l.8-.25Z"/>
+                <path class="cls-7" d="M60.9,46.91l.73.29-.52.35a1.4,1.4,0,0,1-.17.1l-.73-.26.36-.27.19-.12Z"/>
+                <path class="cls-7"
+                      d="M60.21,47.39l.73.26-.45.3c-.36.24-.82.6-1.27,1a15.19,15.19,0,0,1-1.8,1.48h0a8.94,8.94,0,0,1,1.49-1.81,13.14,13.14,0,0,1,1.21-1.12Z"/>
+                <path class="cls-7"
+                      d="M60.9,46.91l-.14.09-.19.12-.36.27-.67-.22c-.55-.18-1.11-.35-1.69-.52h0l.44-.3.39-.24h0l1.06.37Z"/>
+                <path class="cls-10" d="M60.68,82.89a.06.06,0,0,0,0,0h0Z"/>
+                <path class="cls-11" d="M60.66,82.93a.19.19,0,0,1,0,.08h0l0,0Z"/>
+                <path class="cls-10" d="M60.66,82.93l0,.11h-.47S60.48,83,60.66,82.93Z"/>
+                <polygon class="cls-10" points="60.64 83.01 60.62 83.08 60.62 83.06 60.62 83.04 60.64 83.01"/>
+                <path class="cls-7"
+                      d="M60.62,83.08h0v0h0v.13a1.47,1.47,0,0,0,0,.17l-.18.52c-.12.33-.3.8-.49,1.36L57,87.43l-.43.34a.2.2,0,0,1-.09,0h0l-.08,0h-.2l-.3,0L55,87.62l-.45-.1-.24-.06-.17,0s-.12,0-.14-.08c-.19-.3-.37-.59-.55-.86v-.23a.86.86,0,0,1,0-.16,2.14,2.14,0,0,1,.06-.31,2.37,2.37,0,0,1,.18-.55,1.34,1.34,0,0,1,.68-.72,1.43,1.43,0,0,1,.81,0h0a1,1,0,0,0-.7.18,1.14,1.14,0,0,0-.45.64,3.12,3.12,0,0,0-.1.48,2.45,2.45,0,0,0,0,.27v.21l.29.39a.06.06,0,0,0,0,0c0,.3.27.48.3.45s0-.15-.07-.31l.19,0,.45.07.91.12c.15.14.3.22.33.19a.65.65,0,0,0-.1-.19h0l0,0,.09-.07.18-.16L58,85.67c.41-.33.79-.66,1.12-.93l.51-1.63s0,0,0-.14l0,0s0,.06,0,.09h1v0Z"/>
+                <path class="cls-9"
+                      d="M60.21,47.39l-.09.07a13.14,13.14,0,0,0-1.21,1.12,8.94,8.94,0,0,0-1.49,1.81l-1.7.25a3.84,3.84,0,0,1-.8-.43,2.34,2.34,0,0,1-.38-.28c-.09-.07-.16-.16-.24-.23a3.46,3.46,0,0,1-.42-.57l.33-.19a20.84,20.84,0,0,0,2.69-1.65l1-.64c.58.17,1.14.34,1.69.52Z"/>
+                <path class="cls-7"
+                      d="M60.18,69.06a.26.26,0,0,1-.07.24.58.58,0,0,1-.25.12l-.19,0a1.16,1.16,0,0,1-.4,0l-.1,0s0,0,0,0,0,0,0,0,0,0,0,0a.23.23,0,0,0,0-.07s-.11-.06-.05-.07a.49.49,0,0,0,.19,0,1.49,1.49,0,0,0,.46-.07s0,0,0,0,0,0,0-.06a.86.86,0,0,0-.28-.11c-.09,0-.14,0-.16,0s.26-.19.57,0A.4.4,0,0,1,60.18,69.06Zm-.93.26c.06.09,0,0,0,0Z"/>
+                <path class="cls-11" d="M59.23,69.29s.08.12,0,0Z"/>
+                <path class="cls-7"
+                      d="M59.11,76.62a24.51,24.51,0,0,1,.13,3.16,9.25,9.25,0,0,1-.26,3,.08.08,0,0,0,0-.06s.11-.25-.11-.2c-.1-.49-.22-1.59-.34-2.71-.09-.75-.18-1.51-.26-2.07,0-.28-.07-.51-.1-.68s0-.25,0-.27-.06-.37-.2-.92-.33-1.28-.54-2c-.25-.88-.52-1.73-.67-2.29h0l0-.07.37.16c.27.51.62,1.24.93,2s.57,1.42.76,2S59.1,76.6,59.11,76.62Z"/>
+                <path class="cls-10" d="M58.89,82.52c.22,0,.08.15.11.2a.08.08,0,0,1,0,.06h0s-.06-.1-.09-.27Z"/>
+                <path class="cls-7"
+                      d="M58.89,82.52c0,.17.06.27.09.27a12.54,12.54,0,0,1-1.75,1.15s-1.93.78-2,.62h0a2.9,2.9,0,0,1,.78-.34c.77-.46,1.21-.77,2-1.3l.56-.29A1.41,1.41,0,0,1,58.89,82.52Z"/>
+                <path class="cls-7"
+                      d="M58.84,7.31c0,.08.07.27,0,.11a2.52,2.52,0,0,0-.74-.52l-.25-.23c-.2-.17-.39-.32-.58-.46l-.45-.34c-.3-.22-.59-.41-.86-.6a10.61,10.61,0,0,0-1.59-.91,11.74,11.74,0,0,0-2.58-.83l-.54-.1.28-.12.4-.16L52.27,3l.11,0a20.13,20.13,0,0,1,2.06.95,13.29,13.29,0,0,1,1.62,1l.88.65.45.34.36.28.15.13c.3.25.55.5.58.53s0,0,0-.12l-.09-.27c-.06-.16-.1-.27-.12-.31-.23-.64-.65-1.76-1-2.46-.22-.51-.42-.94-.61-1.28h.82c.12.33.24.71.37,1.13.26.87.58,1.93.95,3.18a1.11,1.11,0,0,0,0,.3A2.46,2.46,0,0,0,58.84,7.31Z"/>
+                <path class="cls-7"
+                      d="M58.72,46.1h0l-.39.24-.44.3h0l-.65-.18.35-.27.42-.33h0C58.24,45.93,58.48,46,58.72,46.1Z"/>
+                <path class="cls-8"
+                      d="M58.47,6.77c0,.08.11.28,0,.12s-.28-.28-.58-.53l-.15-.13L57.39,6l-.45-.34L56.06,5a13.29,13.29,0,0,0-1.62-1A20.13,20.13,0,0,0,52.38,3a14.93,14.93,0,0,1,3.11-.49c.41,0,.81,0,1.2,0,.19.34.39.77.61,1.28.31.7.73,1.82,1,2.46,0,0,.06.15.12.31Z"/>
+                <path class="cls-7"
+                      d="M58,45.86h0l-.42.33-.35.27c-1-.29-2.09-.55-3.16-.82-.25-.06-.47-.11-.74-.2h0l.07-.14-1.18-.58-.11.23-.84-.35L50,44.06l.61-.19.92-.26.15.07,1.32.59.65.28c.18.07.44.13.67.2C55.53,45.1,56.79,45.47,58,45.86Z"/>
+                <path class="cls-7" d="M57.2,46.47l.65.18-1,.64a20.84,20.84,0,0,1-2.69,1.65,17.91,17.91,0,0,1,2.42-2Z"/>
+                <path class="cls-7"
+                      d="M55.54,62.68s0,.07,0,.07,0,0-.09-.06,0-.07,0-.08l.06,0,.15,0c.21,0,.47,0,.73-.08a2.63,2.63,0,0,1,.77-.06.81.81,0,0,1,.31.06.37.37,0,0,1,.16.1.2.2,0,0,1,.07.15.24.24,0,0,1,0,.17.59.59,0,0,1-.18.14l-.27.21a.83.83,0,0,1-.42.2.91.91,0,0,1-.43-.11l-.31-.15c-.19-.09-.3-.15-.29-.18a1.21,1.21,0,0,1,.33.06l.34.1a.67.67,0,0,0,.33.05c.19,0,.37-.29.54-.42s0,0,0,0h0l-.19,0a3.23,3.23,0,0,0-.71,0,3.66,3.66,0,0,1-.75,0Z"/>
+                <path class="cls-7"
+                      d="M56.24,1.76s0,0,0,0l0-.05Zm1-.09c.1.23.19.48.29.77h-.82A3.89,3.89,0,0,0,56.44,2l-.17-.23,0,0s0,0,0,0h0l-.05,0-.38-.2-.29-.14.67-1,.25.23.33.29a1.51,1.51,0,0,1,.3.36C57.1,1.42,57.17,1.55,57.22,1.67Z"/>
+                <path class="cls-9"
+                      d="M57.2,46.47l-.57.44a17.91,17.91,0,0,0-2.42,2l-.33.19a3.84,3.84,0,0,1-.23-.45,11,11,0,0,1-.55-1.74c-.07-.3-.12-.54-.18-.75.18-.35.3-.6.37-.74h0c.27.09.49.14.74.2C55.11,45.92,56.17,46.18,57.2,46.47Z"/>
+                <path class="cls-7" d="M57.13,71.66l-.37-.16a2.2,2.2,0,0,0,.11-.27A4.84,4.84,0,0,1,57.13,71.66Z"/>
+                <path class="cls-7"
+                      d="M55.72,70.58,57,71s0,.07-.07.19,0,0,0,0c-.12-.2-.21-.31-.26-.29s0,.22.09.53a10.16,10.16,0,0,1-1.09-.56A3.26,3.26,0,0,0,55.72,70.58Z"/>
+                <path class="cls-7"
+                      d="M56.9,54.9l0,0a6.55,6.55,0,0,0-.56.6c-.31.26-.48.47-.79.72l-.74.6c-.45.35-.87.65-1.28.91a10.72,10.72,0,0,1-2.1,1c-.56.19-1,.31-1.22.39l-.12,0c0-.36-.1-.73-.13-1.08h.11a9.74,9.74,0,0,0,1.23-.12,7,7,0,0,0,2.05-.64,17.59,17.59,0,0,0,2.47-1.68l.55-.45,0,0-.34.08-.55.14-.63.07-.82.06a11.87,11.87,0,0,1-1.45,0,7.34,7.34,0,0,1-2.14-.42l-.51-.21a9.46,9.46,0,0,1,.12-1.07,3.29,3.29,0,0,0,.67.53,5.38,5.38,0,0,0,1.85.65,9.68,9.68,0,0,0,1.4.1l.82,0c.34,0,.76-.05,1.16-.09A7.67,7.67,0,0,0,56.9,54.9Z"/>
+                <path class="cls-7"
+                      d="M56.87,71.23a2.2,2.2,0,0,1-.11.27.09.09,0,0,1-.06,0c-.08-.31-.12-.51-.09-.53S56.75,71,56.87,71.23Z"/>
+                <path class="cls-10" d="M56.76,71.5l0,.07,0-.1A.09.09,0,0,0,56.76,71.5Z"/>
+                <path class="cls-7"
+                      d="M56.73,71.57h0a1,1,0,0,0-.07.15,13,13,0,0,1-1,1.73A26.07,26.07,0,0,1,54,75.63c-.64.75-1.36,1.56-2.12,2.29A29.25,29.25,0,0,0,48,82.07c-.87,1.27-1.11,2.3-1.22,2.28a3.61,3.61,0,0,1,.38-1.69,1,1,0,0,0,.31-.15s-.1,0-.26,0a7.28,7.28,0,0,1,.36-.76,9.44,9.44,0,0,1,1-1.5.89.89,0,0,0,.35-.16.82.82,0,0,0-.26,0c.75-1,1.67-1.94,2.56-2.9.71-.76,1.34-1.55,1.94-2.33a24.19,24.19,0,0,0,1.51-2.14,13.28,13.28,0,0,0,.83-1.59c.05-.12.09-.22.13-.3a10.16,10.16,0,0,0,1.09.56Z"/>
+                <path class="cls-7"
+                      d="M56.44,2a3.89,3.89,0,0,1,.25.42c-.39,0-.79,0-1.2,0A14.93,14.93,0,0,0,52.38,3l-.5-.19c-.68-.24-1.17-.39-1.49-.48l-.47-.14h0c.26-.16.53-.31.8-.46l.41-.21.46-.22A15.68,15.68,0,0,1,55.25.33l.88-.11,0,.21-.67,1,.29.14.38.2.05,0h0s0,0,0,0l0,0Z"/>
+                <path class="cls-7"
+                      d="M55.72,86.44c-.1-.15.7-.92.79-.71a3.53,3.53,0,0,0-.28.37.61.61,0,0,0-.19.38.36.36,0,0,0,0,.12.6.6,0,0,0,.09.28,2.8,2.8,0,0,0,.14.25s0,0-.23,0L55.93,87A.82.82,0,0,1,55.72,86.44Z"/>
+                <path class="cls-8"
+                      d="M56.37,55.13l0,0-.55.45a17.59,17.59,0,0,1-2.47,1.68,7,7,0,0,1-2.05.64,9.74,9.74,0,0,1-1.23.12H50q-.06-.6-.09-1.17a14.88,14.88,0,0,1,0-2l.51.21a7.34,7.34,0,0,0,2.14.42,11.87,11.87,0,0,0,1.45,0l.82-.06.63-.07.55-.14Z"/>
+                <path class="cls-10"
+                      d="M56.27,87.13a.65.65,0,0,1,.1.19s-.18,0-.33-.19C56.23,87.14,56.24,87.16,56.27,87.13Z"/>
+                <path class="cls-10" d="M56.29,1.68l0,.05s0,0,0,0Z"/>
+                <path class="cls-7"
+                      d="M56.19,96.45a5.16,5.16,0,0,1-.08,3.17,8.93,8.93,0,0,1-1.69,2.72c-.27.33-.5.6-.64.8,0,0,0,0,0,0l-.7-.13a12,12,0,0,1,.9-1.1,8.63,8.63,0,0,0,1.71-2.47A5.24,5.24,0,0,0,56,96.53a1.69,1.69,0,0,0-.6-.93l.11,0,.17,0A1.82,1.82,0,0,1,56.19,96.45Z"/>
+                <path class="cls-7"
+                      d="M56.21,50.87s.11,0,0,.06l-.48.09-.89.16-.81.14-.62.09a6.94,6.94,0,0,1-2,.08,4.78,4.78,0,0,1-.81-.2c.1-.31.2-.62.31-.9a3,3,0,0,0,.72.4,4.77,4.77,0,0,0,1.8.19l.6,0,.51,0,.55-.08.29,0c.1,0,0,0-.05,0l-.14,0-.09,0a3.66,3.66,0,0,1-.52-.28l-.21-.16a3.11,3.11,0,0,1-.28-.23,4.45,4.45,0,0,1-.81-1c-.39-.68-.63-1.25-.85-1.69,0,0,0,0,0,0l.51-1c.06.21.11.45.18.75a11,11,0,0,0,.55,1.74,3.84,3.84,0,0,0,.23.45,3.46,3.46,0,0,0,.42.57c.08.07.15.16.24.23a2.34,2.34,0,0,0,.38.28,3.84,3.84,0,0,0,.8.43l.17.07s.16.09.17.11S56.18,50.86,56.21,50.87Z"/>
+                <path class="cls-8"
+                      d="M56,96.53a5.24,5.24,0,0,1-.28,2.94A8.63,8.63,0,0,1,54,101.94a12,12,0,0,0-.9,1.1c-.53-.11-1.06-.23-1.57-.37a13.43,13.43,0,0,1-3.16-1.31c-.18-.09-.35-.19-.52-.29l.68-.25a10.08,10.08,0,0,0,2.88-1.66,3.85,3.85,0,0,0,1-1.49,4.18,4.18,0,0,0,.25-1.53,3.81,3.81,0,0,0-.22-1.39l.43.13,1.59.46.9.26A1.69,1.69,0,0,1,56,96.53Z"/>
+                <path class="cls-7" d="M55.63,95.65l-.17,0-.11,0c-.1-.09-.17-.13-.17-.15a.61.61,0,0,1,.37.15Z"/>
+                <path class="cls-9"
+                      d="M55.61,70.91c0,.08-.08.18-.13.3a13.28,13.28,0,0,1-.83,1.59,24.19,24.19,0,0,1-1.51,2.14c-.6.78-1.23,1.57-1.94,2.33-.89,1-1.81,2-2.56,2.9a5.43,5.43,0,0,1-.79.09A7.9,7.9,0,0,1,45.54,80a3.24,3.24,0,0,1-1.08-.5,2.52,2.52,0,0,1-.68-.76,2.58,2.58,0,0,1-.34-1c.59-.73,1.17-1.41,1.72-2a3,3,0,0,0,.88.8,2.43,2.43,0,0,0,1.19.35c.36,0,.59-.17.54-.26s-.2-.1-.43-.24a3.75,3.75,0,0,1-.74-.58,2.57,2.57,0,0,1-.44-.75l-.09-.31.23-.24c.29-.31.57-.6.85-.86a3.46,3.46,0,0,0,.85.86c.89.61,1.9.71,1.94.55s-.79-.61-1.33-1.25a2.72,2.72,0,0,1-.53-.93l0-.1.72-.68.42-.4a1.7,1.7,0,0,0,.62.75,1.87,1.87,0,0,0,.39.23l.38.17a4.64,4.64,0,0,0,.69.23c.42.1.73.06.74,0s-.22-.2-.54-.43c-.16-.11-.34-.25-.52-.4l-.3-.23a3,3,0,0,1-.25-.24.75.75,0,0,1-.13-.82,2,2,0,0,1,.16-.3l0-.07h0a.05.05,0,0,1,0,0l.65-.61,0,0v0l0,.12a1.73,1.73,0,0,0,.29.31,4.06,4.06,0,0,0,.57.35c.43.22,1,.29,1,.1s-.19-.47-.4-.81l-.28-.46a.48.48,0,0,1,0-.13.66.66,0,0,1-.24-.45s0-.08,0-.12a2.77,2.77,0,0,0,.31-.53l.19.21a17.72,17.72,0,0,0,2,1.68C54.88,70.45,55.24,70.69,55.61,70.91Z"/>
+                <path class="cls-8"
+                      d="M55.33,50.73s.15,0,.05,0l-.29,0-.55.08-.51,0-.6,0a4.77,4.77,0,0,1-1.8-.19,3,3,0,0,1-.72-.4c.08-.22.17-.42.25-.62.41-.88.85-1.72,1.17-2.38l.08-.18s0,0,0,0c.22.44.46,1,.85,1.69a4.45,4.45,0,0,0,.81,1,3.11,3.11,0,0,0,.28.23l.21.16a3.66,3.66,0,0,0,.52.28l.09,0Z"/>
+                <path class="cls-7"
+                      d="M55.18,85.58s-.19.17-.33.36a2,2,0,0,0-.23.4s0,0-.06.13a.77.77,0,0,0-.08.29.76.76,0,0,0,0,.15h0s-.07,0-.1,0l-.12-.15a1,1,0,0,1,.08-.53.84.84,0,0,1,.1-.15,1.33,1.33,0,0,1,.26-.28C54.9,85.6,55.17,85.53,55.18,85.58Z"/>
+                <path class="cls-7"
+                      d="M54.74,67.67a1.6,1.6,0,0,1-.26,1.3h0l-.23-.18,0,0a1.35,1.35,0,0,0,.2-.91c-.17,0-.46,0-.64,0a.71.71,0,0,1-.27.33L53.36,68c.18-.12.21-.21.21-.24l-.06-.2.21,0h.83A.18.18,0,0,1,54.74,67.67Z"/>
+                <path class="cls-10"
+                      d="M54.49,86.91c0,.16.09.28.07.31s-.26-.15-.3-.45a.06.06,0,0,1,0,0l.12.15s.07,0,.1,0Z"/>
+                <path class="cls-9"
+                      d="M54.48,67.85a1.35,1.35,0,0,1-.2.91l0,0c-.23-.2-.46-.4-.67-.61a.71.71,0,0,0,.27-.33C54,67.86,54.31,67.86,54.48,67.85Z"/>
+                <path class="cls-7" d="M54.47,69h0a.42.42,0,0,1-.28.1.57.57,0,0,1-.28-.08l.15-.25a.23.23,0,0,0,.18,0Z"/>
+                <path class="cls-7"
+                      d="M53.06,103l.7.13-.19.29c0,.07-.2.05-.36,0s-.25-.22-.2-.31A.28.28,0,0,1,53.06,103Z"/>
+                <path class="cls-7" d="M53.57,68.18l-.09.06L53.32,68l0,0Z"/>
+                <path class="cls-7" d="M52.18,44.73l1.18.58-.07.14-.71-.28L52.07,45Z"/>
+                <path class="cls-7"
+                      d="M53.29,45.45c-.07.14-.19.39-.37.74,0-.12-.06-.22-.09-.31a1.06,1.06,0,0,0-.16-.34.82.82,0,0,0-.21-.19l-.53,1a4.45,4.45,0,0,1,.48.83l-.08.18c-.32.66-.76,1.5-1.17,2.38-.08.2-.17.4-.25.62a.94.94,0,0,1-.24-.28l-.81.85a3,3,0,0,0,.74.33,15.28,15.28,0,0,0-.42,1.65c0,.28-.1.57-.13.86a1.11,1.11,0,0,1-.26-.32l-.89.75a4,4,0,0,0,1,.64,14.88,14.88,0,0,0,0,2q0,.57.09,1.17h-.31v0c0-.78-.1-1.54-.14-2.26l-.24-.29-.14-.19a3.52,3.52,0,0,0-.27-.37l-.14-.21c0-.4.06-.78.11-1.15l.88-.55-.56-.82a.34.34,0,0,1-.1.06,15.8,15.8,0,0,1,.54-1.93c.51-.4.85-.67.82-.73s-.27,0-.63.18c.07-.17.13-.33.2-.49.45-1,.84-1.76,1.16-2.44l.9-1.87.51.21Z"/>
+                <path class="cls-7"
+                      d="M52.6,70c.21.34.45.64.4.81s-.57.12-1-.1a4.06,4.06,0,0,1-.57-.35,1.73,1.73,0,0,1-.29-.31l0-.12v0A7.59,7.59,0,0,0,52,68.84s0,.09,0,.12a.66.66,0,0,0,.24.45.48.48,0,0,0,0,.13Z"/>
+                <path class="cls-7"
+                      d="M52.83,45.88c0,.09.06.19.09.31l-.51,1a4.45,4.45,0,0,0-.48-.83l.53-1a.82.82,0,0,1,.21.19A1.06,1.06,0,0,1,52.83,45.88Z"/>
+                <path class="cls-7"
+                      d="M52.65,96.14a4.18,4.18,0,0,1-.25,1.53,3.85,3.85,0,0,1-1,1.49,10.08,10.08,0,0,1-2.88,1.66l-.68.25c-.24-.14-.48-.28-.71-.44l.16,0c.25-.07.6-.18,1-.33a9.58,9.58,0,0,0,2.79-1.45,3.65,3.65,0,0,0,1.34-2.67,9.38,9.38,0,0,0,0-1.39h.06A3.81,3.81,0,0,1,52.65,96.14Z"/>
+                <path class="cls-7"
+                      d="M52.45,67.7a.76.76,0,0,1-.12.61,7,7,0,0,1-.84-1.15c.4-.68.44-1,.5-.87A8.22,8.22,0,0,0,52.45,67.7Z"/>
+                <path class="cls-10" d="M52.43,94.75h-.06s0-.06,0-.06S52.4,94.71,52.43,94.75Z"/>
+                <path class="cls-9"
+                      d="M52.37,94.74a9.38,9.38,0,0,1,0,1.39,3.65,3.65,0,0,1-1.34,2.67,9.58,9.58,0,0,1-2.79,1.45c-.41.15-.76.26-1,.33l-.16,0h0l-.22-.15-.35-.24c-.18-.13-.42-.3-.62-.47-.43-.33-.9-.78-1.34-1.17,0,.53,0,1,0,1.56l-.8-1.7-.4-.84-.56.74-.6.77-.08.1s0,.06,0,0v-.06l-.06-.3L41.62,97c-.06-.31-.13-.61-.2-.92l-.1-.47a3,3,0,0,0-.16-.56c-.08-.17-.27-.8-.48-1.5.22,0,.49.08.78.11a6.4,6.4,0,0,0,1.57,0,5.69,5.69,0,0,0,1.68-.54A3,3,0,0,0,46,92.25a3.87,3.87,0,0,0,.58-.93c.08-.24.16-.46.23-.66.14-.39.25-.72.32-1,.17.33.29.52.29.54s.22.33.53.77a18.44,18.44,0,0,0,1.22,1.54,7.72,7.72,0,0,0,1.46,1.31,2.27,2.27,0,0,0,.79.37l.19.23h0a1.22,1.22,0,0,0,.32.12Z"/>
+                <path class="cls-7"
+                      d="M52.38,3l-.11,0-.37.13-.4.16-.28.12a9.5,9.5,0,0,0-1-.09h-.46l.12-1.15h0l.47.14c.32.09.81.24,1.49.48Z"/>
+                <path class="cls-7"
+                      d="M49.82,59.63h0l0-.49c0-.38,0-.75-.08-1.11h0l.13,1.16.27-.07c.1.72.22,1.46.38,2.2a23,23,0,0,0,.76,2.84A1.05,1.05,0,0,0,51,64c-.11,0-.19,0-.18,0s.07,0,.13.08l.21.24a.67.67,0,0,0,.25.2,6.44,6.44,0,0,0,.24.61s0,0,0,0h0q.12.32.27.63l.18.35-.13.07c-.06-.11-.1.19-.5.87-.17-.28-.32-.56-.46-.85a21.2,21.2,0,0,1-1.6-4.74c-.06-.23-.1-.46-.15-.68a1,1,0,0,0,.47-.43.8.8,0,0,0,.1-.45.78.78,0,0,0,0-.22l0-.07,0,0h0l0,0v0Z"/>
+                <path class="cls-7"
+                      d="M52.33,68.31a2.77,2.77,0,0,1-.31.53c0-.3,0-.63-.14-.72s-.56.2-.75.71a1.49,1.49,0,0,0-.1.8,1,1,0,0,0,.06.28l0,0-.65.61a1.77,1.77,0,0,1-.36-.26L50,70.16l-.44-.49,0,0,.17-.19c.3-.28.48-.45.51-.49a12.34,12.34,0,0,0,1.33-1.81A7,7,0,0,0,52.33,68.31Z"/>
+                <path class="cls-7"
+                      d="M51.91,64.51a.48.48,0,0,1,.17.41.37.37,0,0,1-.27.31.24.24,0,0,1-.14,0,0,0,0,0,1,0,0c.06-.06.23-.16.2-.29a.23.23,0,0,0-.13-.16.26.26,0,0,0-.1,0,1,1,0,0,1-.21-.11c0-.14-.11-.28-.15-.42,0,0,0,0,.05,0a1.48,1.48,0,0,0,.42.19A.36.36,0,0,1,51.91,64.51Z"/>
+                <path class="cls-7"
+                      d="M51.47,72.61c.32.23.55.35.54.43s-.32.14-.74,0a4.64,4.64,0,0,1-.69-.23l-.38-.17a1.87,1.87,0,0,1-.39-.23,1.7,1.7,0,0,1-.62-.75l1.23-1.16a.05.05,0,0,0,0,0h0l0,.07a2,2,0,0,0-.16.3.75.75,0,0,0,.13.82,3,3,0,0,0,.25.24l.3.23C51.13,72.36,51.31,72.5,51.47,72.61Z"/>
+                <path class="cls-7"
+                      d="M51.88,68.12c.12.09.1.42.14.72a7.59,7.59,0,0,1-.93,1.07,1,1,0,0,1-.06-.28,1.49,1.49,0,0,1,.1-.8C51.32,68.32,51.74,68,51.88,68.12Z"/>
+                <path class="cls-11" d="M51.65,65.2a0,0,0,0,0,0,0h0S51.64,65.21,51.65,65.2Z"/>
+                <path class="cls-7" d="M51.49,43.61l-.92.26-.61.19-.54-.24c.32-.14.66-.27,1-.39l.38-.13h0Z"/>
+                <path class="cls-7"
+                      d="M51.26,64.17c0,.14.1.28.15.42a.67.67,0,0,1-.25-.2L51,64.15c-.06-.05-.12-.05-.13-.08s.07-.07.18,0A1.05,1.05,0,0,1,51.26,64.17Z"/>
+                <path class="cls-7"
+                      d="M47.19,89.26a2.24,2.24,0,0,0-.17.33l-.1-.19a6.53,6.53,0,0,1-.51-2,.28.28,0,0,1,0-.09c.13-.07.18-.12.17-.14l-.17.07a5.07,5.07,0,0,1,.37-2.64h0a14.28,14.28,0,0,0,.1,2.73,6.25,6.25,0,0,0,.6,1.76,7.06,7.06,0,0,0,.47.75l.46.78c.28.45.66,1,1.08,1.59a8.81,8.81,0,0,0,1.26,1.39c.38.34.68.52.66.57s0,0,0,0a2.27,2.27,0,0,1-.79-.37,7.72,7.72,0,0,1-1.46-1.31A18.44,18.44,0,0,1,47.9,91c-.31-.44-.51-.75-.53-.77s-.12-.21-.29-.54A1.34,1.34,0,0,0,47.19,89.26Z"/>
+                <path class="cls-7"
+                      d="M51.22,3.43l-.51.22c-.52.23-1,.48-1.49.74A20.75,20.75,0,0,0,46.73,6l-.24.18a.9.9,0,0,0-.21.08,3.63,3.63,0,0,0-.46.34,1.67,1.67,0,0,0-.06-1c.09-.1.18-.21.28-.31a15.45,15.45,0,0,1,2.4-2.07c.45-.34,1-.65,1.46-1l-.12,1.15h.46A9.5,9.5,0,0,1,51.22,3.43Z"/>
+                <path class="cls-7"
+                      d="M50.81,43.3l-.38.13c-.35.12-.69.25-1,.39l-.79-.35c-1.69-.76-3.27-1.5-4.61-2.18-.66-.35-1.28-.68-1.82-1s-1-.64-1.38-.88l-1.24-.82L37.19,37l-2.51-1.64c-.17-.13-.42-.28-.6-.44l-.22-.26a2.36,2.36,0,0,1-.15-.25c-.06-.09,0-.21,0-.28s0-.18.13-.28a1.12,1.12,0,0,1,.27-.26l.34-.24a3.36,3.36,0,0,1,.48-.28l.15-.07L35,33l-.05,0-.18,0-.59-.17-3.4-1,2.59-1.66.84-.54.21-.13.07,0,.16-.1.15-.09s-.08-.05-.13-.07L34.45,29l-.26-.12-.44-.18s-.22-.08-.31-.14a1,1,0,0,1-.28-.23.92.92,0,0,1,.12-1.26,8.12,8.12,0,0,0,1.86-3,16.17,16.17,0,0,0,.79-2.8,15.29,15.29,0,0,0,.25-2.24l.16.14h0a10,10,0,0,1,0,2.16,15.55,15.55,0,0,1-.63,2.93A11.13,11.13,0,0,1,35,26a5.62,5.62,0,0,1-.51.83c-.09.13-.19.27-.3.4l-.16.2-.15.16a.24.24,0,0,0,0,.36.15.15,0,0,0,.09.06L34,28l.45.17,1.38.52.38.15.19.07.09,0,0,0,0,0-.67.45-2,1.39-.42.28-.14.1-.2.15.32.07,1,.27,3.61,1-1.61.89-.76.44-.28.17-.08,0h0s-.06,0-.05.07l.12.07L37.87,36c1.45.9,2.36,1.5,2.44,1.54s.49.35,1.24.86c.39.28.77.55,1.29.87s1.1.64,1.75,1c1.3.7,2.84,1.47,4.49,2.27Z"/>
+                <path class="cls-7"
+                      d="M50.91,50.39c-.11.28-.21.59-.31.9a3,3,0,0,1-.74-.33l.81-.85A.94.94,0,0,0,50.91,50.39Z"/>
+                <path class="cls-7"
+                      d="M50.44,49.58c0,.06-.31.33-.82.73.06-.19.13-.37.19-.55C50.17,49.6,50.42,49.53,50.44,49.58Z"/>
+                <path class="cls-7"
+                      d="M50.06,70.28a1.77,1.77,0,0,0,.36.26L49.19,71.7s0-.07,0-.11a1.89,1.89,0,0,1,0-1,3,3,0,0,1,.19-.61l.08-.16s0,0,0,0,0,0,0-.06a.35.35,0,0,1,.08-.1l.44.49Z"/>
+                <path class="cls-7"
+                      d="M50.05,53.8a9.46,9.46,0,0,0-.12,1.07,4,4,0,0,1-1-.64l.89-.75A1.11,1.11,0,0,0,50.05,53.8Z"/>
+                <path class="cls-7" d="M50,58.05c0,.35.08.72.13,1.08l-.27.07L49.72,58H50Z"/>
+                <path class="cls-7"
+                      d="M49.42,43.82l.54.24a17.15,17.15,0,0,0-2.08.81,9.81,9.81,0,0,0-1.13.66s.31-.47,1-.88A13,13,0,0,1,49.42,43.82Z"/>
+                <path class="cls-7"
+                      d="M48.61,73.81c.54.64,1.4,1.07,1.33,1.25s-1,.06-1.94-.55a3.46,3.46,0,0,1-.85-.86c.31-.31.62-.6.9-.87l0,.1A2.72,2.72,0,0,0,48.61,73.81Z"/>
+                <path class="cls-11" d="M49.92,2.18h0Z"/>
+                <path class="cls-7"
+                      d="M49.85,60a.8.8,0,0,1-.1.45,1,1,0,0,1-.47.43l-.15-.78a.08.08,0,0,0,0-.07v0l.14-.08h0l.05,0h0l0,0,0,0a.06.06,0,0,0,0,0l.13-.07h0l.12,0h0l0,0,0,.07A.78.78,0,0,1,49.85,60Z"/>
+                <path class="cls-10" d="M49.82,59.63l0,0h0Z"/>
+                <path class="cls-7"
+                      d="M49.81,49.76c-.06.18-.13.36-.19.55-.27.2-.59.45-.91.72-.48.38-1,.79-1.42,1.18l-.6.56-.25.24-.11.11-.07.08s0,0,0,.06a1.23,1.23,0,0,0,.06.21,2.61,2.61,0,0,0,.27.52c.25.39.92.85,1.43,1.53a3.19,3.19,0,0,1,.53,1.12,4.3,4.3,0,0,1,.1,1c0,.15,0,.29,0,.41a1.13,1.13,0,0,1,0,.18.19.19,0,0,1,0,.09.09.09,0,0,1,0,.06h0l-.11-.09h0s0,0,0,0h0s0,0,0,0l-.05,0s0-.07,0-.12-.05-.23-.08-.37A3.2,3.2,0,0,0,47.51,56c-.46-.51-1.14-.87-1.6-1.4a4.26,4.26,0,0,1-.45-.71c-.08-.19-.12-.33-.13-.35a1.42,1.42,0,0,1,0-.25.83.83,0,0,1,.25-.67c.05,0,.09-.09.15-.13a1.36,1.36,0,0,0,.12-.12l.29-.23.68-.52c.5-.36,1.06-.72,1.58-1A14.45,14.45,0,0,1,49.81,49.76Z"/>
+                <path class="cls-10" d="M49.79,59.65v0l0,0h0Z"/>
+                <path class="cls-7"
+                      d="M49.79,59.64h0l-.12.06h0l-.13.07a.06.06,0,0,1,0,0l0,0,0,0h0l-.05,0h0l-.14,0h0a.45.45,0,0,1,0-.17s0,0,0,0L49,59.21l-.12-1.12c-.06-.64-.12-1.26-.17-1.84a11.37,11.37,0,0,1,0-1.55l.14.21a3.52,3.52,0,0,1,.27.37l.14.19.24.29c0,.72.09,1.48.14,2.26v0c0,.36.06.73.08,1.11Z"/>
+                <path class="cls-10" d="M49.78,59.66h0l-.12,0Z"/>
+                <path class="cls-7"
+                      d="M49.18,52.18l.56.82-.88.55c0-.28.08-.56.13-.83l.09-.47h0A.34.34,0,0,0,49.18,52.18Z"/>
+                <path class="cls-9"
+                      d="M49.62,50.31a15.8,15.8,0,0,0-.54,1.93h0l-1,.65-.27.18c-.18.13-.42.25-.48.45a1,1,0,0,0,.06.68c.06.14.08.17.12.25l.12.2a8.57,8.57,0,0,0,.52.76l.29.39.16.19.07.08h0a.88.88,0,0,0,0,.16c0,.22,0,.46,0,.7,0,.63.1,1.27.19,1.91h0a.47.47,0,0,0-.12-.23,1.81,1.81,0,0,0-.24-.24h0a.09.09,0,0,0,0-.06.19.19,0,0,0,0-.09,1.13,1.13,0,0,0,0-.18c0-.12,0-.26,0-.41a4.3,4.3,0,0,0-.1-1,3.19,3.19,0,0,0-.53-1.12c-.51-.68-1.18-1.14-1.43-1.53a2.61,2.61,0,0,1-.27-.52,1.23,1.23,0,0,1-.06-.21s0,0,0-.06l.07-.08.11-.11.25-.24.6-.56c.45-.39.94-.8,1.42-1.18C49,50.76,49.35,50.51,49.62,50.31Z"/>
+                <path class="cls-7"
+                      d="M49.48,69.65l0,0a.35.35,0,0,0-.08.1s0,.06,0,.06,0,0,0,0l-.08.16a3,3,0,0,0-.19.61,1.89,1.89,0,0,0,0,1s0,.07,0,.11l-.42.4-.72.68c0-.1,0-.18-.06-.25a.82.82,0,0,0-.09-.26l-.77.42-.13.07-.16.08-.1,0h0l-.07-.05C47.61,71.76,48.53,70.69,49.48,69.65Z"/>
+                <path class="cls-7"
+                      d="M49.13,60.11l.15.78-.19.07a2.46,2.46,0,0,1-.65.08A9.23,9.23,0,0,1,47.26,61a4.84,4.84,0,0,1-1.12-.28,1.5,1.5,0,0,1-.92-.83,1.07,1.07,0,0,1,0-.64,4.7,4.7,0,0,1,.18-.47,6.14,6.14,0,0,1,.4-.86,1.48,1.48,0,0,1,.29-.36l.33-.27a1.68,1.68,0,0,1,.36-.28c.11,0,.24-.11.35,0s.15.43.2.63,0,.17.05.25a.3.3,0,0,1,0,.21l-.23.07.1-.11c0-.07,0-.2-.07-.34s0-.27-.15-.39-.16,0-.22.08l-.18.19-.26.25a1.08,1.08,0,0,0-.21.29,8.29,8.29,0,0,0-.32.82,4.29,4.29,0,0,0-.13.44.59.59,0,0,0,0,.35,1.07,1.07,0,0,0,.64.48,4.52,4.52,0,0,0,1,.2,7.76,7.76,0,0,0,1.08,0c.33,0,.69-.12.71-.24Z"/>
+                <path class="cls-10" d="M49.14,60l.14,0-.14.08h0Z"/>
+                <path class="cls-10" d="M49.14,60v0a.08.08,0,0,1,0,.07c0-.11,0-.21,0-.31a.45.45,0,0,0,0,.17h0Z"/>
+                <path class="cls-9"
+                      d="M49.09,59.8c0,.1,0,.2,0,.31v0c0,.12-.38.24-.71.24a7.76,7.76,0,0,1-1.08,0,4.52,4.52,0,0,1-1-.2,1.07,1.07,0,0,1-.64-.48.59.59,0,0,1,0-.35,4.29,4.29,0,0,1,.13-.44,8.29,8.29,0,0,1,.32-.82,1.08,1.08,0,0,1,.21-.29l.26-.25.18-.19c.06-.05.15-.13.22-.08s.08.27.15.39.11.27.07.34l-.1.11,0,0a1.08,1.08,0,0,0-.54.38.41.41,0,0,0,0,.34.62.62,0,0,0,.12.2,1,1,0,0,0,.13.14s.11,0,.15-.09.08-.15.06-.17l-.1-.08c0-.07-.1-.14-.07-.21s.2-.17.38-.26a1.52,1.52,0,0,1,.57-.18.85.85,0,0,1,.54.19c.16.12.32.23.44.33s.08.47.12.47a.35.35,0,0,0,.07-.14.35.35,0,0,0,0-.18h0q.06.47.15.93S49.08,59.79,49.09,59.8Z"/>
+                <path class="cls-10"
+                      d="M49,59.21l.07.58q-.09-.47-.15-.93c-.09-.64-.15-1.28-.19-1.91,0-.24,0-.48,0-.7.05.58.11,1.2.17,1.84Z"/>
+                <path class="cls-7"
+                      d="M49.08,52.25l-.09.47c-.05.27-.1.55-.13.83l-.28.18-.27.17h0v0l.05.12.09.15c.09.17.2.33.31.51a11.37,11.37,0,0,0,0,1.55.88.88,0,0,1,0-.16h0L48.63,56l-.16-.19-.29-.39a8.57,8.57,0,0,1-.52-.76l-.12-.2c0-.08-.06-.11-.12-.25a1,1,0,0,1-.06-.68c.06-.2.3-.32.48-.45l.27-.18Z"/>
+                <path class="cls-7"
+                      d="M48.94,58.86a.35.35,0,0,1,0,.18.35.35,0,0,1-.07.14s.11-.25-.12-.47-.28-.21-.44-.33a.85.85,0,0,0-.54-.19,1.52,1.52,0,0,0-.57.18c-.18.09-.35.18-.38.26s0,.14.07.21l.1.08s0,.1-.06.17-.12.11-.15.09a1,1,0,0,1-.13-.14.62.62,0,0,1-.12-.2.41.41,0,0,1,0-.34,1.08,1.08,0,0,1,.54-.38l0,0c-.08.09-.15.13-.14.15s.14,0,.35-.19c0,0,0,0,0,0a1.29,1.29,0,0,1,.4-.07.94.94,0,0,1,.55.2v.07a.32.32,0,0,0,0,.09s0,.09.16.12a.2.2,0,0,0,.09,0,1.81,1.81,0,0,1,.24.24A.47.47,0,0,1,48.94,58.86Z"/>
+                <path class="cls-7" d="M48.64,80.17a.82.82,0,0,1,.26,0,.89.89,0,0,1-.35.16Z"/>
+                <path class="cls-7"
+                      d="M48.64,80.17l-.09.13a5.51,5.51,0,0,1-.69.14,7.09,7.09,0,0,1-2.39-.11,3.52,3.52,0,0,1-1.23-.51,2.69,2.69,0,0,1-.83-.86,3.21,3.21,0,0,1-.34-.72c.08-.11.17-.21.25-.31l.12-.15a2.58,2.58,0,0,0,.34,1,2.52,2.52,0,0,0,.68.76,3.24,3.24,0,0,0,1.08.5,7.9,7.9,0,0,0,2.31.26A5.43,5.43,0,0,0,48.64,80.17Z"/>
+                <path class="cls-7"
+                      d="M48.47,58.3l.11.09a.2.2,0,0,1-.09,0c-.17,0-.13-.09-.16-.12a.32.32,0,0,1,0-.09v-.07l.1.07h0v0l0,0s0,0,0,0Z"/>
+                <path class="cls-10" d="M48.49,58.26s0,0,0,0l-.07-.06h0v0l.05,0s0,0,0,0Z"/>
+                <path class="cls-10" d="M48.47,58.29h0v0s0,0,0,0l0,0v0h0Z"/>
+                <path class="cls-7" d="M48.4,58.22h0l-.1-.07h0s0,0,.07,0h0Z"/>
+                <path class="cls-8"
+                      d="M47.86,80.44a5.51,5.51,0,0,0,.69-.14,9.44,9.44,0,0,0-1,1.5,7.28,7.28,0,0,0-.36.76c-.2,0-.52.13-.91.2a6.19,6.19,0,0,1-2.55,0,3.4,3.4,0,0,1-2.05-1.35,2.85,2.85,0,0,1-.37-.66q.21-.39.45-.75c.41-.63.86-1.22,1.3-1.79a3.21,3.21,0,0,0,.34.72,2.69,2.69,0,0,0,.83.86,3.52,3.52,0,0,0,1.23.51A7.09,7.09,0,0,0,47.86,80.44Z"/>
+                <path class="cls-7"
+                      d="M48,72.53c0,.07,0,.15.06.25-.28.27-.59.56-.9.87a2,2,0,0,1-.17-.27c-.1-.19-.17-.35-.21-.44l0-.06h0l.1,0,.16-.08.13-.07.77-.42A.82.82,0,0,1,48,72.53Z"/>
+                <path class="cls-7"
+                      d="M47.77,76.63c0,.09-.18.27-.54.26A2.43,2.43,0,0,1,46,76.54a3,3,0,0,1-.88-.8l.91-1,.09.31a2.57,2.57,0,0,0,.44.75,3.75,3.75,0,0,0,.74.58C47.57,76.53,47.73,76.55,47.77,76.63Z"/>
+                <path class="cls-7"
+                      d="M47.81,101.07l-.37.13-.41.13a.13.13,0,0,1-.13-.06c0-.07-.06-.14-.13-.2a.17.17,0,0,1,0-.24.15.15,0,0,1,.09-.13l.25-.07h0C47.33,100.79,47.57,100.93,47.81,101.07Z"/>
+                <path class="cls-7" d="M47.2,82.56c.16,0,.25-.07.26,0a1,1,0,0,1-.31.15A.47.47,0,0,1,47.2,82.56Z"/>
+                <path class="cls-7" d="M47.35,58s0,0,0,0c-.21.19-.34.19-.35.19s.06-.06.14-.15Z"/>
+                <path class="cls-7"
+                      d="M47.2,82.56a.47.47,0,0,0-.05.1,6.1,6.1,0,0,1-.81.28,6.18,6.18,0,0,1-2.67.18,3.68,3.68,0,0,1-2.33-1.42,2.41,2.41,0,0,1-.28-.43c.08-.16.16-.33.26-.49a2.85,2.85,0,0,0,.37.66,3.4,3.4,0,0,0,2.05,1.35,6.19,6.19,0,0,0,2.55,0C46.68,82.69,47,82.61,47.2,82.56Z"/>
+                <path class="cls-7" d="M47.19,89.26a1.34,1.34,0,0,1-.11.44L47,89.59A2.24,2.24,0,0,1,47.19,89.26Z"/>
+                <path class="cls-7"
+                      d="M47,89.59l.06.11c-.07.24-.18.57-.32,1-.07.2-.15.42-.23.66a3.87,3.87,0,0,1-.58.93,3,3,0,0,1-1.24.86,5.69,5.69,0,0,1-1.68.54,6.4,6.4,0,0,1-1.57,0c-.29,0-.56-.07-.78-.11l-.15-.5a8.75,8.75,0,0,0,1,.17,5.82,5.82,0,0,0,1.46,0,5.93,5.93,0,0,0,1.6-.46,3.62,3.62,0,0,0,1.36-.93,2.74,2.74,0,0,0,.39-.64c.1-.23.18-.45.27-.65C46.77,90.16,46.91,89.83,47,89.59Z"/>
+                <path class="cls-7"
+                      d="M47,73.38a2,2,0,0,0,.17.27c-.28.26-.56.55-.85.86l-.23.24a.73.73,0,0,0,0-.08,1.87,1.87,0,0,0-.64.16,2,2,0,0,0-.6.27,3.81,3.81,0,0,0,.28.54l.07.1c-.55.63-1.13,1.31-1.72,2a.08.08,0,0,1,0,0,.24.24,0,0,0-.26-.18.22.22,0,0,0-.2.26,1.93,1.93,0,0,0,.1.41c-.44.57-.89,1.16-1.3,1.79q-.24.36-.45.75l0-.07a2.69,2.69,0,0,1-.11-.33.16.16,0,0,0-.09-.12h0c.15-.35.32-.69.48-1l.08-.11c.38-.54.7-1.11,1-1.68l.82-1.19c.43-.48.86-1,1.32-1.41.64-.65,1.26-1.34,1.87-2l.07.05h0l0,.06C46.81,73,46.88,73.19,47,73.38Z"/>
+                <path class="cls-8"
+                      d="M46.92,89.4l.1.19c-.11.24-.25.57-.43,1-.09.2-.17.42-.27.65a2.74,2.74,0,0,1-.39.64,3.62,3.62,0,0,1-1.36.93,5.93,5.93,0,0,1-1.6.46,5.82,5.82,0,0,1-1.46,0,8.75,8.75,0,0,1-1-.17c-.25-.82-.49-1.62-.57-1.81l-.13-.34h0a11.84,11.84,0,0,1-.41-2.9c0-.27,0-.55,0-.83a2.08,2.08,0,0,0,.41.35,4.1,4.1,0,0,0,2.8.74,14.86,14.86,0,0,0,2.79-.51,3.91,3.91,0,0,0,1-.4.28.28,0,0,0,0,.09A6.53,6.53,0,0,0,46.92,89.4Z"/>
+                <path class="cls-9"
+                      d="M46.77,84.35v.3a5.07,5.07,0,0,0-.37,2.64,1.56,1.56,0,0,0-.15.06c-.21.07-.51.15-.88.24a20.91,20.91,0,0,1-2.75.35,3.89,3.89,0,0,1-2.53-.76,3.19,3.19,0,0,1-.64-.65,5,5,0,0,1,.16-1,27.15,27.15,0,0,1,.87-3c.18-.43.37-.84.58-1.24a2.41,2.41,0,0,0,.28.43,3.68,3.68,0,0,0,2.33,1.42,6.18,6.18,0,0,0,2.67-.18,6.1,6.1,0,0,0,.81-.28A3.61,3.61,0,0,0,46.77,84.35Z"/>
+                <rect class="cls-11" x="46.74" y="72.88" width="0.01" height="0.01"/>
+                <path class="cls-7" d="M46.57,87.22s0,.07-.17.14,0,0,0-.07Z"/>
+                <path class="cls-7"
+                      d="M46.4,87.29s0,0,0,.07a3.91,3.91,0,0,1-1,.4,14.86,14.86,0,0,1-2.79.51,4.1,4.1,0,0,1-2.8-.74,2.08,2.08,0,0,1-.41-.35c0-.22,0-.44,0-.65a3.19,3.19,0,0,0,.64.65,3.89,3.89,0,0,0,2.53.76,20.91,20.91,0,0,0,2.75-.35c.37-.09.67-.17.88-.24A1.56,1.56,0,0,1,46.4,87.29Z"/>
+                <path class="cls-7"
+                      d="M46.05,74.67a.73.73,0,0,1,0,.08l-.91,1-.07-.1a3.81,3.81,0,0,1-.28-.54,2,2,0,0,1,.6-.27A1.87,1.87,0,0,1,46.05,74.67Z"/>
+                <path class="cls-7"
+                      d="M45.76,5.53a1.67,1.67,0,0,1,.06,1c-.2.17-.38.36-.56.54s-.11.12-.17.19a3.83,3.83,0,0,1-.28.29h-.05a.27.27,0,0,1-.12-.15.29.29,0,0,1,0-.11,1.24,1.24,0,0,1,.07-.27A6.56,6.56,0,0,1,45.76,5.53Z"/>
+                <path class="cls-11" d="M45.82,6.58h0c-.19.17-.37.36-.56.54C45.44,6.94,45.62,6.75,45.82,6.58Z"/>
+                <path class="cls-7"
+                      d="M45.56,5.37a.31.31,0,0,1,.2.16,6.56,6.56,0,0,0-1,1.53,1.24,1.24,0,0,0-.07.27.29.29,0,0,0,0,.11.27.27,0,0,0,.12.15h.05l-.22.23-1-.26c-.81-.2-2-.48-3.32-.72a13.41,13.41,0,0,0-2.07-.24c-.74,0-1.59.1-2.45.2s-1.75.24-2.64.4l-.66.13-.54.13c-.08,0-.14,0-.19.07a.49.49,0,0,0-.08.18v.07a.66.66,0,0,0,0,.14c0,.1,0,.2,0,.31s0,.42,0,.64a11.6,11.6,0,0,0,.18,1.3,12.83,12.83,0,0,0,.29,1.26c.07.21.13.41.2.6l.05.13v0l0,.07.15.29a32,32,0,0,0,2.47,4c1.76,2.14,3,3.61,2.85,3.75s-.64-.36-1.56-1.16h0a1.72,1.72,0,0,0-.11-.56s0,.15,0,.41c-.54-.48-1.19-1.08-1.92-1.79a27.93,27.93,0,0,1-3-4L31.12,13l0-.07a.75.75,0,0,1-.07-.12l-.08-.19c-.11-.22-.19-.44-.29-.67-.17-.46-.31-.92-.44-1.4s-.22-1-.3-1.47c0-.25-.06-.51-.08-.77s0-.27,0-.4V7.69c0-.07,0-.19,0-.29a2.26,2.26,0,0,1,.37-1.11,1.82,1.82,0,0,1,1-.62l.27-.1.18-.05.37-.1.71-.19c.93-.24,1.85-.42,2.75-.58s1.78-.28,2.67-.35a14.83,14.83,0,0,1,2.53.15c1.48.19,2.68.44,3.54.61Z"/>
+                <path class="cls-7"
+                      d="M43.43,77.75a.08.08,0,0,0,0,0l-.12.15c-.08.1-.17.2-.25.31a1.93,1.93,0,0,1-.1-.41.22.22,0,0,1,.2-.26A.24.24,0,0,1,43.43,77.75Z"/>
+                <path class="cls-7"
+                      d="M42.8,9.82c0,.08-.6.58-1.17,1.18a9.63,9.63,0,0,0-.73.85c-.19.24-.3.42-.31.42l-.32.42a6.13,6.13,0,0,0-.58.94c-.38.72-.45,1.54-.54,1.54s-.1-.21-.09-.54a3.59,3.59,0,0,1,.2-1.17,5.39,5.39,0,0,1,.5-1.1l.3-.48s.15-.19.38-.43a9,9,0,0,1,.82-.75h0l.56-.18c.37-.12.59-.39.52-.55C42.6,9.85,42.78,9.78,42.8,9.82Z"/>
+                <path class="cls-10"
+                      d="M42.35,10c.07.16-.15.43-.52.55l-.56.18a.12.12,0,0,1,0,0A7.84,7.84,0,0,1,42.35,10Z"/>
+                <path class="cls-7"
+                      d="M42.34,10h0a7.84,7.84,0,0,0-1,.68.12.12,0,0,0,0,0h0c-.08,0-.12,0-.13,0a1.43,1.43,0,0,0-.1-.16,1.31,1.31,0,0,0-.4-.32A3.36,3.36,0,0,0,38.72,10a8.12,8.12,0,0,1-3.36-.27c0-.22,1.65-.38,3.23-.73a4.34,4.34,0,0,1,2.6.08A2.51,2.51,0,0,1,42.34,10Z"/>
+                <path class="cls-7"
+                      d="M41.29,80.71l0,.07c-.1.16-.18.33-.26.49a2.75,2.75,0,0,1-.23-.45c0-.09.07-.17.1-.25a0,0,0,0,0,0,0l.13-.28h0a.16.16,0,0,1,.09.12A2.69,2.69,0,0,0,41.29,80.71Z"/>
+                <path class="cls-11" d="M41.07,80.26h0l-.13.28.13-.28Z"/>
+                <path class="cls-11" d="M40.93,80.57c0,.08-.06.16-.1.25h0Z"/>
+                <path class="cls-7"
+                      d="M40.83,80.82a2.75,2.75,0,0,0,.23.45c-.21.4-.4.81-.58,1.24a27.15,27.15,0,0,0-.87,3,5,5,0,0,0-.16,1,2.57,2.57,0,0,1-.19-.29l0,0c0-.29.1-.57.17-.89A24.6,24.6,0,0,1,40.83,80.82Z"/>
+                <path class="cls-7" d="M40.53,93.06l.15.5-.1,0-.12-.49Z"/>
+                <circle class="cls-9" cx="74.66" cy="26.13" r="0.81"/>
+                <circle class="cls-9" cx="62.2" cy="27.25" r="0.91"/>
+                <circle class="cls-9" cx="62.76" cy="28.68" r="0.18"/>
+                <circle class="cls-9" cx="73.86" cy="27.51" r="0.19"/>
+                <path class="cls-7"
+                      d="M64.13,43.12l.07,0a.29.29,0,0,0-.16-.56h0c-.1,0-.18.12-.21.2v0c-.09.37.47.53.56.16v0l-.21.2h0L64,42.54l-.06,0c-.35.14-.2.7.15.56Z"/>
+                <path class="cls-7" d="M63.92,46.39l0,0a.29.29,0,0,0,.41.41l0,0a.29.29,0,0,0-.41-.41Z"/>
+                <path class="cls-8"
+                      d="M90.14,88.49a1,1,0,0,1,0,.21l-.05.34a5.09,5.09,0,0,1-.12.68,10.14,10.14,0,0,1-.39,1.33,12,12,0,0,1-3.07,4.7,15.53,15.53,0,0,1-4.84,3.18l-.68.28-.7.23c-.46.17-1,.28-1.42.41-1,.21-1.92.36-3,.57l-3.17,1.25h0a18.09,18.09,0,0,1-3.4,1.13c-1.16.28-2.36.5-3.56.68l-1.45.19c.13-.25.3-.58.5-1s.49-1,.73-1.55a5.19,5.19,0,0,0,.46-1.93,3.85,3.85,0,0,0-.25-2,4.18,4.18,0,0,0-1.06-1.36,3,3,0,0,0-.66-.44,35.84,35.84,0,0,0,6.35-2.19c2.68-1.18,5.48-2.68,8.47-4.21.76-.37,1.51-.77,2.29-1.13s1.57-.78,2.37-1.09A8.86,8.86,0,0,1,86,86.22a4.17,4.17,0,0,1,2.46.48,4.33,4.33,0,0,1,1,.81,5.17,5.17,0,0,1,.42.51Z"/>
+                <path class="cls-9"
+                      d="M86.7,7.22s.06.78,0,1.87A25.11,25.11,0,0,1,86.24,13a29.25,29.25,0,0,1-1,3.84,7.62,7.62,0,0,0-.54,1.75s0,0,.09,0c0,.31,0,1.08,0,1.84,0,.5-.06,1-.1,1.38s-.07.63-.07.65,0,.27-.08.64-.11.76-.2,1.19c0-.09,0-.19,0-.3,0-.29,0-.63,0-1a7.16,7.16,0,0,0-.42-1.35,5,5,0,0,0-1-1.34A7.31,7.31,0,0,0,81.41,19a6.82,6.82,0,0,0-3.92-.93,4.21,4.21,0,0,0-2,.82A6.4,6.4,0,0,0,74,20.35a5.3,5.3,0,0,0-.85,1.74c-.18.57-.31,1.11-.42,1.62a32.86,32.86,0,0,0-.55,3.49c0,.08-.16,1.47-.21,3.51a15.86,15.86,0,0,0,1.33,7.34l.12.23.15.28a.6.6,0,0,0,.68.32,1.42,1.42,0,0,0,.32-.07,2.76,2.76,0,0,0,.3-.15l.42-.29c.54-.39,1-.78,1.53-1.17,1-.77,1.87-1.51,2.62-2.17A15.16,15.16,0,0,0,82,32.39a1.54,1.54,0,0,0,.09-.24l.38.46c.05.07.1.12.08.11h0l-.31.27a5.54,5.54,0,0,0-.83,1.07c-.52.93-1.07,2.09-1.78,3.18a8.35,8.35,0,0,1-1.16,1.48,7.12,7.12,0,0,1-1.32,1,12.63,12.63,0,0,0-1.39.88h0a1.1,1.1,0,0,0-.33-.45c-.14-.07-.22,0-.22,0s.07,0,.14.13a1.23,1.23,0,0,1,.17.42c.06.22.11.48.16.77a4,4,0,0,0-1.12.58c0,.08.52-.07,1.17-.23,0,.12,0,.25,0,.37a2.18,2.18,0,0,1,0,.51c-.27.14-.43.26-.41.28s.14,0,.37-.06a3.1,3.1,0,0,1-.15.46h0c-.64.18-1.22.49-1.18.58s.45,0,.95-.09c-.11.17-.18.26-.18.27s-.16.24-.43.55a7.27,7.27,0,0,1-1.09,1,2.76,2.76,0,0,1-1.36.44c-.4,0-.68,0-.7,0s.27.15.7.2a3,3,0,0,0,1-.07v.06a4.89,4.89,0,0,0-.52.42,3.16,3.16,0,0,1-1.28.58,4.38,4.38,0,0,1-1.39,0l-.21,0a2.7,2.7,0,0,0,.53-.46,2.11,2.11,0,0,0,.41-.59,1.07,1.07,0,0,0,.1-.24c-.06-.06-.26.3-.68.65a3.92,3.92,0,0,1-1.83.81,7.36,7.36,0,0,1-2,.12,4.51,4.51,0,0,1-.92-.2l-.26-.08a2.87,2.87,0,0,1-.58-.27c-.34-.24-.77-.62-1.21-1,.4-.27.78-.52,1.08-.68s.66-.24.66-.29-.31-.07-.75,0a9.59,9.59,0,0,0-1.34.61l0,0-1.07-.94.69-.23c1.49-.49,3-.87,3-1s0,0-.11,0l.46-.79.29,0,.32,0a.37.37,0,0,0,.23-.05.2.2,0,0,0,.08-.24.85.85,0,0,0-.25-.37.41.41,0,0,0-.24-.1h0l-1.6-.64c1-.08,1.55-.41,1.49-.47s.6-.44,1.3-1.47a12.55,12.55,0,0,0,2-4.7,14.28,14.28,0,0,0,.16-3.36,31.65,31.65,0,0,0-.28-3.67A11.8,11.8,0,0,0,68.21,24a8.88,8.88,0,0,0-2.61-3h0l0,0a9.26,9.26,0,0,0-5.51-2,27.83,27.83,0,0,0-4.85.52,17.8,17.8,0,0,0-3.33,1c-.79.34-1.23.63-1.3.65a16.69,16.69,0,0,0-1.49,1.06,25.2,25.2,0,0,0-3.12,3,24.7,24.7,0,0,0-1.78,2.24l-.42.61-.32.47-.2.29-.1.15c0,.05.06.09.08.14l.47.54L44,30l.55.6a47.56,47.56,0,0,0,4.91,4.66,25.94,25.94,0,0,0,2.8,2l.74.43.76.38c.51.24,1,.45,1.49.67,2,.84,3.79,1.61,5.42,2.14.36.11.69.21,1,.29l-.38,1.42A19.94,19.94,0,0,0,59,42.18a18.9,18.9,0,0,0-3-.06,11.45,11.45,0,0,0-1.4.14,13.73,13.73,0,0,0-1.39.29c-.7.19-1.56.44-2.44.75h0l-1.73-.82c-1.65-.8-3.19-1.57-4.49-2.27-.65-.35-1.24-.68-1.75-1s-.9-.59-1.29-.87c-.75-.51-1.19-.82-1.24-.86s-1-.64-2.44-1.54l-2.53-1.58-.12-.07s0,0,.05-.07h0l.08,0,.28-.17.76-.44L38,32.67l-3.61-1-1-.27-.32-.07.2-.15.14-.1.42-.28,2-1.39.67-.45,0,0,0,0-.09,0-.19-.07-.38-.15-1.38-.52L34,28l-.12,0a.15.15,0,0,1-.09-.06.24.24,0,0,1,0-.36l.15-.16.16-.2c.11-.13.21-.27.3-.4A5.62,5.62,0,0,0,35,26a11.13,11.13,0,0,0,.71-1.67,15.55,15.55,0,0,0,.63-2.93,10,10,0,0,0,0-2.16c.92.8,1.49,1.23,1.56,1.16s-1.09-1.61-2.85-3.75a32,32,0,0,1-2.47-4l-.15-.29,0-.07v0L32.33,12c-.07-.19-.13-.39-.2-.6a12.83,12.83,0,0,1-.29-1.26,11.6,11.6,0,0,1-.18-1.3c0-.22,0-.44,0-.64s0-.21,0-.31a.66.66,0,0,1,0-.14V7.72a.49.49,0,0,1,.08-.18c.05,0,.11,0,.19-.07l.54-.13.66-.13c.89-.16,1.78-.3,2.64-.4s1.71-.18,2.45-.2a13.41,13.41,0,0,1,2.07.24c1.36.24,2.51.52,3.32.72l1,.26.22-.23a3.83,3.83,0,0,0,.28-.29c.06-.07.12-.12.17-.19s.37-.37.56-.54h0a3.63,3.63,0,0,1,.46-.34.9.9,0,0,1,.21-.08L46.73,6a20.75,20.75,0,0,1,2.49-1.59c.48-.26,1-.51,1.49-.74l.51-.22.54.1a11.74,11.74,0,0,1,2.58.83,10.61,10.61,0,0,1,1.59.91c.27.19.56.38.86.6l.45.34c.19.14.38.29.58.46l.25.23a2.52,2.52,0,0,1,.74.52c.1.16,0,0,0-.11a2.46,2.46,0,0,1,0-.26,1.11,1.11,0,0,1,0-.3c-.37-1.25-.69-2.31-.95-3.18-.13-.42-.25-.8-.37-1.13l1,0c.88,0,1.63.08,2.15.13l.9.08.57,0,.17.15a8.67,8.67,0,0,1,2.17,4.3c0,.19.07.36.08.43v0l.29,0v0A45.57,45.57,0,0,1,65,2.81l.58,0h.76l.45,0a2.92,2.92,0,0,0,.44-.06c.45-.07.88-.17,1.32-.25l.28.29a6.8,6.8,0,0,1,1,1.53c.08.17.17.36.24.55a5.8,5.8,0,0,1,.21.89c0,.3.08.62.13.94l.06.49,0,.25,0,.13s0,0,0,0l.15-.49a15.41,15.41,0,0,1,.75-2,8.45,8.45,0,0,1,.67-1.2,3.69,3.69,0,0,1,.72-.78,6.43,6.43,0,0,1,.73-.48A3.27,3.27,0,0,1,74,2.38a16.23,16.23,0,0,1,2.16.54c.85.29,1.62.62,2.26.86s.93.34,1.23.42c.36.4.64.68.84.87s.34.29.38.27,0-.18-.19-.43-.22-.38-.39-.65l.46,0h.48c.5,0,1-.09,1.58-.16a15.37,15.37,0,0,1,1.63-.14,2.89,2.89,0,0,1,1.36.23c.66.32.79,1.28.84,1.91A11.5,11.5,0,0,1,86.7,7.22ZM86,6.12a3.52,3.52,0,0,0-.09-.85c0-.06-.25,0-.5.07l-.28.12h0a5.33,5.33,0,0,0-1.27.38,11.1,11.1,0,0,1-1.32.49,2.49,2.49,0,0,1-.44.09l.5.72a1.39,1.39,0,0,1,.24-.35A2.85,2.85,0,0,1,84,6.05a1.71,1.71,0,0,1,1.14-.11l0,.22A4.49,4.49,0,0,1,85,7.58c-.17.71-.35,1.44-.41,1.87-.32-.59-.63-1-.7-1a11.42,11.42,0,0,0,.56,1.74c.15.43.27.86.35,1.19s.1.55.11.57a4.42,4.42,0,0,1,.1.54,7.64,7.64,0,0,1,0,1.22,9.48,9.48,0,0,0-.1,1.82,5.29,5.29,0,0,0,.56-1.76,6.33,6.33,0,0,0,.18-1.31,6.26,6.26,0,0,0,0-.64s-.06-.26-.18-.6A9.92,9.92,0,0,0,84.92,10c-.06-.1-.11-.21-.16-.31a13.38,13.38,0,0,0,.94-1.93A4.77,4.77,0,0,0,86,6.12ZM74.92,43.19a.77.77,0,0,0,0-.38.17.17,0,0,0,0-.12s-.08,0-.12,0-.22.12-.21.14-.12-.11-.14-.08a.37.37,0,0,0,0,.38.33.33,0,0,0,.23.23C74.77,43.41,74.86,43.33,74.92,43.19Zm-.76-1.43a.5.5,0,0,0,.21-.35.17.17,0,0,0,0-.12.13.13,0,0,0-.13,0c-.17,0-.25.09-.25.12s-.13-.11-.14-.1l-.06.08a.56.56,0,0,0-.13.24.19.19,0,0,0,.13.24A.48.48,0,0,0,74.16,41.76Zm-.2,2a.69.69,0,0,0,.22-.62,1.19,1.19,0,0,0-.24-.55,1.73,1.73,0,0,0-.41-.4A1.34,1.34,0,0,0,73,42a3.59,3.59,0,0,0-1,0l-.16,0-.11,0-.2.07-.17,0h-.11l-.13,0a.83.83,0,0,0-.29,0,3,3,0,0,0-.37,0,4.5,4.5,0,0,0-.69.2l-.36.18a2.37,2.37,0,0,0-.79.63,2,2,0,0,0-.49,1.33,2,2,0,0,0,.19.79,1,1,0,0,0,.72.56,1.8,1.8,0,0,0,.81-.09.68.68,0,0,0,.31.18,1.77,1.77,0,0,0,.91,0,3.42,3.42,0,0,0,.69-.28h0a.47.47,0,0,0,.24.08.76.76,0,0,0,.55-.18c.21-.21.36-.4.42-.45s0,0,0,0h0A0,0,0,0,0,73,45l-.06,0v0s.09,0,.12,0a.51.51,0,0,0,.16-.09.57.57,0,0,0,.23-.3C73.52,44.05,73.64,44,74,43.79Zm-7.28,1.85a.58.58,0,0,0-.25-.49C66.17,45,66,45,66,45s-.14-.09-.15-.06a1.86,1.86,0,0,0-.3.45.58.58,0,0,0,.07.61.73.73,0,0,0,1.11-.38ZM41.63,11c.57-.6,1.21-1.1,1.17-1.18s-.2,0-.45.15h0A2.51,2.51,0,0,0,41.19,9,4.34,4.34,0,0,0,38.59,9c-1.58.35-3.23.51-3.23.73a8.12,8.12,0,0,0,3.36.27,3.36,3.36,0,0,1,1.91.28,1.31,1.31,0,0,1,.4.32,1.43,1.43,0,0,1,.1.16s0,0,.13,0a9,9,0,0,0-.82.75c-.23.24-.37.42-.38.43l-.3.48a5.39,5.39,0,0,0-.5,1.1,3.59,3.59,0,0,0-.2,1.17c0,.33,0,.54.09.54s.16-.82.54-1.54a6.13,6.13,0,0,1,.58-.94l.32-.42s.12-.18.31-.42A9.63,9.63,0,0,1,41.63,11Z"/>
+                <path class="cls-11" d="M85.26,6.06v0l-.06,0h0v0Z"/>
+                <path class="cls-9"
+                      d="M85.71,27.38c-.28.29-.62.65-1,1.06s-.49.56-.76.85l-.4.46-.66.76-.28-.09c.29-1,.59-2.12.81-2.93C83.53,27.52,85,27.45,85.71,27.38Z"/>
+                <path class="cls-11" d="M84.79,18.53l-.05,0a.79.79,0,0,1,0-.14S84.78,18.47,84.79,18.53Z"/>
+                <path class="cls-9"
+                      d="M84.25,31.42l-.15,0h0l-.28.08-1.11.31-.51.14c.13-.37.29-.94.47-1.56l.28.09,1.2.78Z"/>
+                <path class="cls-10" d="M84.25,24.29c0,.39,0,.62,0,.61s0-.06,0-.19l.06-.25A.85.85,0,0,1,84.25,24.29Z"/>
+                <path class="cls-8"
+                      d="M84,24c0,.31.08.54.11.7a14.12,14.12,0,0,0-.43,1.68v0h0a.3.3,0,0,1,0,.11.39.39,0,0,1,0,.13s0,.06,0,.1,0,.18-.08.28a1.21,1.21,0,0,1,0,.18,1.8,1.8,0,0,1,0,.19s0,0,0,0a.42.42,0,0,0,0,.06,0,0,0,0,1,0,0c-.16.57-.37,1.26-.6,1.85l-1.35-.11a7.18,7.18,0,0,0,.15-2.11,4.53,4.53,0,0,0-.64-2,11.8,11.8,0,0,0-1.13-1.66,4.19,4.19,0,0,0-1.46-1.21,5,5,0,0,0-4.1,0l-.32.2,0-.09a4.39,4.39,0,0,1,.69-1.51,5.45,5.45,0,0,1,1.25-1.29,3.61,3.61,0,0,1,1.61-.73,6.21,6.21,0,0,1,3.58.71,6.62,6.62,0,0,1,1.33,1.08,4.69,4.69,0,0,1,1,1.17A10.2,10.2,0,0,1,83.91,23C84,23.38,84,23.72,84,24Z"/>
+                <path class="cls-10" d="M83.43,27.47v0h0A0,0,0,0,0,83.43,27.47Z"/>
+                <path class="cls-8"
+                      d="M81.47,29.23l1.35.11c-.06.17-.13.34-.19.49-.53,1.21-.65,2.28-1,2.71s-.56.71-.56.71c-.44.36-1.08.88-1.86,1.48s-1.71,1.31-2.71,2c-.5.36-1,.74-1.55,1.09l-.41.26-.14.07-.15,0c-.05,0-.11,0-.12-.07L74.06,38l-.1-.22a13.5,13.5,0,0,1-1-3.66,14.36,14.36,0,0,1-.13-1.69.54.54,0,0,0,.17.07,3.86,3.86,0,0,0,1.09,0,15.52,15.52,0,0,0,2.54-.42A14,14,0,0,0,80,30.75a6.71,6.71,0,0,0,.84-.59,4.54,4.54,0,0,0,.38-.38,1.25,1.25,0,0,0,.09-.12l.09-.16C81.42,29.41,81.45,29.31,81.47,29.23Z"/>
+                <path class="cls-10" d="M82,32l.16-.05c0,.06-.05.12-.07.17Z"/>
+                <path class="cls-12"
+                      d="M81.16,27.14A7,7,0,0,1,81,29.09a.65.65,0,0,1-.07.21s0,0,0,.06l-.07.08a2.46,2.46,0,0,1-.33.31,5.84,5.84,0,0,1-.77.53,11.78,11.78,0,0,1-2.26,1,5.92,5.92,0,0,0,1.7-4.14c.09-2.17-1.34-4.54-2.93-5h.5a4.3,4.3,0,0,1,1.53.45,3.85,3.85,0,0,1,1.31,1.15A6.79,6.79,0,0,1,81.16,27.14Z"/>
+                <path class="cls-13"
+                      d="M76.22,22.06c1.59.5,3,2.87,2.93,5a5.92,5.92,0,0,1-1.7,4.14c-.33.11-.64.2-.94.27a15.51,15.51,0,0,1-2.44.38H74a2.34,2.34,0,0,1-1-1.47h0c.1-1.82.25-3,.26-3.11s.1-1.45.46-3.41c.06-.36.15-.73.24-1.11a.36.36,0,0,1,.11-.1h0a5.88,5.88,0,0,1,2.18-.61Z"/>
+                <path class="cls-12" d="M73.89,22.72l.1,0a.36.36,0,0,0-.11.1S73.89,22.74,73.89,22.72Z"/>
+                <path class="cls-12"
+                      d="M74,31.89a3.21,3.21,0,0,1-.81-.06.4.4,0,0,0-.29.05c0-.39,0-.77,0-1.13a3.25,3.25,0,0,1,0-.33A2.34,2.34,0,0,0,74,31.89Z"/>
+                <path class="cls-9"
+                      d="M73.8,60.42c0,.16-.12.29-.26.41a2.23,2.23,0,0,1-.42.3.86.86,0,0,1-.34.09,4.88,4.88,0,0,0,.08-.61,6.06,6.06,0,0,0,.06-1c0-.18,0-.34,0-.48h0a.21.21,0,0,0,0,.13.61.61,0,0,1,.36.23A2,2,0,0,1,73.8,60.42Z"/>
+                <path class="cls-14"
+                      d="M73.59,42.9c.18.22.26.47.11.6l-.18.15a1.62,1.62,0,0,0-.18.19.34.34,0,0,0-.07.11.42.42,0,0,0,0,.1.19.19,0,0,0,0,.08v0a.38.38,0,0,1-.07.21l-.08.08s-.09.06-.09,0,.12-.22,0-.31a.55.55,0,0,0-.38.14c-.07.06-.1.09-.09.1s0,0,.13,0l.14,0,.08,0h0s0,0,0,0c0,.2,0,.17,0,.22a.36.36,0,0,1,0,.11.83.83,0,0,0-.06.21s0,0,0,0v0c-.05,0-.09,0-.14,0s-.27.2-.39.27a.58.58,0,0,1-.44.13.16.16,0,0,0,0-.14c0-.09-.09-.09-.09-.08a.3.3,0,0,1,0,.09s-.08.09-.18.13a3.33,3.33,0,0,1-.78.22,1.59,1.59,0,0,1-.76,0l-.07,0,.33-.2a2,2,0,0,0,.28-.23l.12-.12a2,2,0,0,0,.13-.18.42.42,0,0,0,.08-.38.4.4,0,0,0-.29-.21,1.32,1.32,0,0,0-.57,0,.56.56,0,0,0-.38.21.54.54,0,0,0-.08.25s0,.07,0,.08,0,0,.08-.06a.84.84,0,0,1,.12-.19.4.4,0,0,1,.29-.1,1.29,1.29,0,0,1,.41,0s.1,0,.11.1a.2.2,0,0,1-.06.15l-.07.06-.11.1a2.2,2.2,0,0,1-.25.17,1.69,1.69,0,0,1-1.19.29.46.46,0,0,1-.35-.31,1.46,1.46,0,0,1-.1-.57,1.5,1.5,0,0,1,.4-.95,2.5,2.5,0,0,1,.94-.59,3.85,3.85,0,0,1,.58-.19,1.17,1.17,0,0,1,.27-.05h.06l.25.05a1.53,1.53,0,0,0,.29,0l.23-.08.21-.07.11,0H72a3.17,3.17,0,0,1,.87,0,1.06,1.06,0,0,1,.38.12A1.4,1.4,0,0,1,73.59,42.9Z"/>
+                <path class="cls-9"
+                      d="M73,54a2,2,0,0,1,0,.4c0,.31-.19.81-.25,1.28,0,.21-.06.42-.08.62-.15-.86-.4-1.9-.66-2.93l-.16-.6.11,0a1.84,1.84,0,0,1,.94.61.91.91,0,0,1,.11.44A.79.79,0,0,1,73,54Z"/>
+                <path class="cls-9"
+                      d="M72.25,57c.29.78.46,1.29.55,1.28-.07,0,0,.85-.2,2.3a15.37,15.37,0,0,1-2.22,5.6A28.34,28.34,0,0,1,68,69.45a5.89,5.89,0,0,1-3.79,1.9,16.42,16.42,0,0,1-2.35.22,15.88,15.88,0,0,1-2.4-.12,10.2,10.2,0,0,1-4.36-2L54.47,69h0a1.6,1.6,0,0,0,.26-1.3.18.18,0,0,0-.19-.11h-.83l-.21,0,.06.2s0,.12-.21.24l-.14-.13a6.9,6.9,0,0,1-1.1-1.62l-.18-.35q-.15-.32-.27-.63a.24.24,0,0,0,.14,0,.37.37,0,0,0,.27-.31.48.48,0,0,0-.17-.41.36.36,0,0,0-.18-.11,1.48,1.48,0,0,1-.42-.19s0,0-.05,0a23,23,0,0,1-.76-2.84c-.16-.74-.28-1.48-.38-2.2l.12,0c.26-.08.66-.2,1.22-.39a10.72,10.72,0,0,0,2.1-1c.41-.26.83-.56,1.28-.91l.74-.6c.31-.25.48-.46.79-.72a6.55,6.55,0,0,1,.56-.6l0,0A7.67,7.67,0,0,1,56,55c-.4,0-.82.08-1.16.09l-.82,0a9.68,9.68,0,0,1-1.4-.1,5.38,5.38,0,0,1-1.85-.65,3.29,3.29,0,0,1-.67-.53c0-.29.08-.58.13-.86a15.28,15.28,0,0,1,.42-1.65,4.78,4.78,0,0,0,.81.2,6.94,6.94,0,0,0,2-.08l.62-.09.81-.14.89-.16.48-.09c.12,0,0,0,0-.06s-.14,0-.15,0-.17-.1-.17-.11l-.17-.07,1.7-.25h0a15.19,15.19,0,0,0,1.8-1.48c.45-.37.91-.73,1.27-1l.45-.3a16.2,16.2,0,0,0,3.42,1,9.28,9.28,0,0,0,2,0v0a1,1,0,0,0,.19.14,3.7,3.7,0,0,0,.44.28,1.84,1.84,0,0,0,.47.15,2.79,2.79,0,0,0,1.18,0,6.28,6.28,0,0,0,.66-.23s.07.17.12.33a.27.27,0,0,1,.08.19h0v0a1.16,1.16,0,0,1-.18.51,1.92,1.92,0,0,1-.18.29,2.28,2.28,0,0,1-1.25.69l-.51.09-.61.1a4.7,4.7,0,0,0-.71.14l-.16,0-.09,0s0,.06,0,.08a1.84,1.84,0,0,0,.15.35,2.3,2.3,0,0,0,.52.6,3.18,3.18,0,0,0,.58.35,3.49,3.49,0,0,0,1.12.31A6.5,6.5,0,0,0,69.86,53c.37-.07.64-.13.85-.19h0l.31.84c.07.18.13.35.19.52l-.08.1a2.71,2.71,0,0,1-1,.68,3.82,3.82,0,0,1-1.73.24l-1-.09c-.26,0-.59-.08-1-.17s-.83-.23-1.29-.36l.11.14,0,0v0l0,0,.35.32a9.75,9.75,0,0,0,.74.64l.43.32.29.18a5.33,5.33,0,0,0,.56.32,5.15,5.15,0,0,0,2.26.61A5.47,5.47,0,0,0,72.25,57Zm-1.92,3.55a3.52,3.52,0,0,0,.29-.4,3.56,3.56,0,0,0-.45-.13l-.27,0c-.16,0-.32,0-.3.05a2.64,2.64,0,0,0,.26.11l.24.1c.06,0,0,0,.05,0s0,0-.06,0l-.11.12a.56.56,0,0,1-.24.17c-.09,0-.15,0-.16-.1s0-.16,0-.17-.07,0-.1.16a.27.27,0,0,0,0,.23.39.39,0,0,0,.26.11A1,1,0,0,0,70.33,60.54Zm-.14,3s.18-.11,0-.29a1.78,1.78,0,0,0-.74-.06l-.33,0a1.15,1.15,0,0,0-.31,0,3.87,3.87,0,0,0-1,.41,1.55,1.55,0,0,1-.32.14c-.07,0-.12,0-.12,0s-.09,0-.1.12a.63.63,0,0,0,.18.34.9.9,0,0,0,.45.32.84.84,0,0,0,.6-.22,4.68,4.68,0,0,1,.91-.55l.11,0,.18-.06.3-.09A.88.88,0,0,0,70.19,63.49Zm-1.1,3.9c0-.21-.16-.29-.3-.25a1,1,0,0,0-.2,0,3.56,3.56,0,0,0-.62.34c-.28.19-.53.42-.5.45s.31-.12.62-.25a4,4,0,0,1,.41-.17l.19-.06s.07,0,.07,0,0,0,0,0,0,.14,0,.22-.05.18-.07.25-.16.14-.18.17,0,0,.09,0,.16-.05.22-.12a1.74,1.74,0,0,0,.14-.27A2.09,2.09,0,0,0,69.09,67.39Zm-4.54-3.93a.18.18,0,0,0-.06-.23c-.14-.06-.13,0-.15,0H64a3.24,3.24,0,0,0-.67,0,.81.81,0,0,0-.52.46c-.07.17-.08.29-.06.3a2.44,2.44,0,0,0,.94-.07,1.63,1.63,0,0,0,.62-.28l.07,0a.11.11,0,0,0,.06,0S64.51,63.53,64.55,63.46Zm-.92,3.12c0-.13-.12-.24-.23-.28a2.15,2.15,0,0,0-.52-.13l-.36,0a1,1,0,0,0-.78.31,1.22,1.22,0,0,0-.36,1,2.13,2.13,0,0,1,.52-.88.73.73,0,0,1,.59-.17l.35,0a2.92,2.92,0,0,1,.45.08l0,0v0a.5.5,0,0,1-.07.08c-.1.11-.24.24-.33.32-.34.14-.68.19-.68.22a1.18,1.18,0,0,0,.77,0,3.25,3.25,0,0,0,.42-.31l.09-.1A.5.5,0,0,0,63.63,66.58ZM60.11,69.3a.26.26,0,0,0,.07-.24.4.4,0,0,0-.22-.2c-.31-.14-.6,0-.57,0s.07,0,.16,0a.86.86,0,0,1,.28.11s0,.06,0,.06,0,0,0,0a1.49,1.49,0,0,1-.46.07.49.49,0,0,1-.19,0c-.06,0,.05,0,.05.07a.23.23,0,0,1,0,.07s0,0,0,0,0,0,0,0,0,0,0,0l.1,0a1.16,1.16,0,0,0,.4,0l.19,0A.58.58,0,0,0,60.11,69.3ZM57.7,62.89a.24.24,0,0,0,0-.17.2.2,0,0,0-.07-.15.37.37,0,0,0-.16-.1.81.81,0,0,0-.31-.06,2.63,2.63,0,0,0-.77.06c-.26,0-.52.06-.73.08l-.15,0-.06,0s0,.07,0,.08.09.06.09.06,0,0,0-.07h.18a3.66,3.66,0,0,0,.75,0,3.23,3.23,0,0,1,.71,0l.19,0h0s0,0,0,0-.35.38-.54.42a.67.67,0,0,1-.33-.05l-.34-.1A1.21,1.21,0,0,0,55.8,63s.1.09.29.18l.31.15a.91.91,0,0,0,.43.11.83.83,0,0,0,.42-.2l.27-.21A.59.59,0,0,0,57.7,62.89Z"/>
+                <path class="cls-8"
+                      d="M73,2.19l-.42.4a4.62,4.62,0,0,0-.72,1,13.45,13.45,0,0,0-.62,1.26c-.13.34-.28.75-.43,1.18a2.55,2.55,0,0,0-.08.26s0,.07,0,0V6.22l0-.16,0-.32q0-.3-.06-.57a3,3,0,0,0-.1-.5,5.46,5.46,0,0,0-.21-.61,12.39,12.39,0,0,0-.83-1.76c.3,0,.61-.11.92-.15A8.43,8.43,0,0,1,71.8,2a1.48,1.48,0,0,1,.31,0l.41.05A3.64,3.64,0,0,0,73,2.19Z"/>
+                <path class="cls-8"
+                      d="M72.2,56.83a.66.66,0,0,0,0,.15,4.86,4.86,0,0,0-.63,0A10.19,10.19,0,0,1,70,56.92a5.15,5.15,0,0,1-2.09-.67c-.17-.11-.35-.21-.52-.33l-.24-.17-.08-.07a.77.77,0,0,1-.13-.12l0-.05.08,0,.16,0,.19,0a10.19,10.19,0,0,0,1.08.12,4.36,4.36,0,0,0,2-.22,3.23,3.23,0,0,0,1.07-.67Z"/>
+                <path class="cls-10" d="M71.77,45.45s0,0,0,0A.08.08,0,0,1,71.77,45.45Z"/>
+                <g id="_Group_" data-name="&lt;Group&gt;">
+                    <path class="cls-9"
+                          d="M70.82,83.14a1.05,1.05,0,0,0-.31-.28,1.38,1.38,0,0,0-.6-.08c-.16,0-.25,0-.25,0s.09.06.24.09a1.66,1.66,0,0,1,.49.16.82.82,0,0,1,.25.35l-.09.11a1,1,0,0,1-.36.3,2.26,2.26,0,0,1-1.07.11l-2.42,0-1.49-.82L65,82.21h.07l.32-.06h.12c.2,0,.48,0,.84,0a5.7,5.7,0,0,0,1.35,0,9.26,9.26,0,0,0,1.63-.62,7.83,7.83,0,0,1,.86-.38.72.72,0,0,1,.73.28,1.18,1.18,0,0,1,.32.66.89.89,0,0,0-.4-.16,1.53,1.53,0,0,0-.57.08.3.3,0,0,0-.17.09s0,0,0,0,0,0,.08,0a.38.38,0,0,1,.16,0,2.13,2.13,0,0,1,.5,0,.72.72,0,0,1,.43.35l-.09.15-.29.49A.35.35,0,0,0,70.82,83.14Z"/>
+                </g>
+                <path class="cls-8"
+                      d="M69.89,50.61l.47,1.26a4.92,4.92,0,0,1-.67.41,3.93,3.93,0,0,1-1.47.4,2.64,2.64,0,0,1-1.53-.43,1.41,1.41,0,0,1-.36-.37.57.57,0,0,1-.12-.23s0,0,.07,0l.12,0,.48,0,1.08-.1a2.94,2.94,0,0,0,1.93-.82Z"/>
+                <path class="cls-11" d="M69.72,47.3h0v0Z"/>
+                <path class="cls-9"
+                      d="M69.72,48.06v.08c0,.1-.13.22-.13.22l-.26.18a1.66,1.66,0,0,1-.79.36,1.32,1.32,0,0,1-1-.09.9.9,0,0,1-.27-.2.34.34,0,0,1,0-.15h0c.25-.08.49-.17.69-.25a8.55,8.55,0,0,0,1.35-.5c0,.06.07.12.1.13l.06,0,0,0h0A.76.76,0,0,1,69.72,48.06Z"/>
+                <path class="cls-10" d="M69.26,47.67a1.24,1.24,0,0,0,.2-.1s-.07.06-.19.13v0Z"/>
+                <path class="cls-9"
+                      d="M69.39,63.42h0l0,0h0l-.09,0a4.78,4.78,0,0,0-.92.64c-.16.12-.31.24-.45.23a.8.8,0,0,1-.38-.23.78.78,0,0,1-.2-.26.15.15,0,0,1,0-.11s0,0,.13,0a1.25,1.25,0,0,0,.36-.09,5.22,5.22,0,0,1,1-.31h.53Z"/>
+                <path class="cls-8"
+                      d="M69,31.47a13.85,13.85,0,0,1,0,3.23,13.51,13.51,0,0,1-1.65,4.65c-.3.52-.57.92-.76,1.2a3,3,0,0,0-.29.42s-.13.05-.38.1a5.22,5.22,0,0,1-1.12.1A6.93,6.93,0,0,1,63,41a15.08,15.08,0,0,1-2.18-.67c-1.57-.59-3.37-1.41-5.29-2.33-.48-.22-1-.45-1.45-.7l-.7-.38c-.23-.14-.47-.28-.69-.43a24.1,24.1,0,0,1-2.66-2,48.11,48.11,0,0,1-4.69-4.67l-.52-.6L44.58,29l0,0s0,0,0-.05v0l.11-.14c.14-.21.29-.41.43-.61A25.21,25.21,0,0,1,46.86,26a24.3,24.3,0,0,1,3-2.81c.79-.61,1.31-.89,1.36-.94s.44-.27,1.14-.58a16.12,16.12,0,0,1,3.07-1,29.13,29.13,0,0,1,4.62-.59,8.32,8.32,0,0,1,4.87,1.68l0,0a7.92,7.92,0,0,1,2.42,2.63,11,11,0,0,1,1.17,3.44A34.74,34.74,0,0,1,69,31.47Zm-1.4,1.13a3.9,3.9,0,0,0,.18-2,16.49,16.49,0,0,0-.59-2.52A10.8,10.8,0,0,0,66,25.61a5.56,5.56,0,0,0-1.16-1.29,11.65,11.65,0,0,0-1.62-.88,7.72,7.72,0,0,0-1.87-.59,4.76,4.76,0,0,0-2.12.1,6.51,6.51,0,0,0-1.94,1,12.46,12.46,0,0,0-4.25,4.91,10,10,0,0,0-.38,1c-.05.18-.09.36-.13.54s0,.18,0,.29,0,.29,0,.43l.33.27.21.16c.14.1.28.22.43.32l.86.58h0a9.39,9.39,0,0,0,2.61,1.13,23,23,0,0,0,2.54.58,12.77,12.77,0,0,0,4.43.18,7.53,7.53,0,0,0,2.83-1A2.43,2.43,0,0,0,67.56,32.6Z"/>
+                <path class="cls-9"
+                      d="M68.29,70.07c-.17.32-.34.62-.48.87s-.36.64-.37.65-.14.29-.32.69-.45.9-.74,1.38a10.11,10.11,0,0,0-1.16,2c0,.07.15,0,.33-.16a1.48,1.48,0,0,1,0,.27,25.11,25.11,0,0,0-.33,2.81c-.06,1.31-.06,2.23-.08,2.83,0,.32,0,.54,0,.69a.13.13,0,0,1,0,.06v0H65L64.36,79c0-.17-.07-.33-.11-.5l0-.25-.08-.29c0-.29-.06-.57-.08-.84-.05-.62-.1-1.2-.14-1.73-.09-1.07-.15-1.95-.2-2.56,0-.25,0-.46,0-.61l.66-.11a9.59,9.59,0,0,0,2.31-.74A5.08,5.08,0,0,0,68.29,70.07Z"/>
+                <path class="cls-12"
+                      d="M67.54,31.84s0,.75,0,.76a9.45,9.45,0,0,1-.92.58c-.18.1-.39.2-.62.3a5.74,5.74,0,0,0,1-3.41A13.61,13.61,0,0,1,67.54,31.84Z"/>
+                <path class="cls-13"
+                      d="M67.06,30.07a5.74,5.74,0,0,1-1,3.41c-.23.09-.48.18-.76.26l.14-.11a10.05,10.05,0,0,1-2.5.35H62a5.25,5.25,0,0,1-1.9-4.7c.14-2.6,1.6-4.63,3.4-4.74a6.68,6.68,0,0,1,.78.47,4.12,4.12,0,0,1,.85,1l.12.15.24.45.08.15A21.9,21.9,0,0,1,67.06,30.07Z"/>
+                <path class="cls-9"
+                      d="M66.43,48.23h-.06a9.52,9.52,0,0,1-1.93-.13,15.12,15.12,0,0,1-2.81-.9l1.3-.85a15.58,15.58,0,0,0,1.3,1.21,3.65,3.65,0,0,0,1,.49,4,4,0,0,0,1.07.17Z"/>
+                <path class="cls-9"
+                      d="M64.74,41.44l1.6.64a.3.3,0,0,0-.22.11.83.83,0,0,0-.18.34s.07,0,.15.07l-.16.15s0,0,0,0l0,0-.46.79A15.13,15.13,0,0,0,63.2,44l-.09-.75s0,0,0,0a4.16,4.16,0,0,0-1.24-.48l-.62-.16.38-1.42a9.31,9.31,0,0,0,1.26.28A7.51,7.51,0,0,0,64.74,41.44Z"/>
+                <path class="cls-9"
+                      d="M65.33,97.41a3.55,3.55,0,0,1,.13,1.79,5,5,0,0,1-.17.92A6.78,6.78,0,0,1,65,101c-.25.54-.53,1-.77,1.47s-.44.8-.59,1-.1.21-.14.28l-1.4.14c-.6,0-1.21.1-1.81.13l-.32,0h-.3l-.19,0-.9-.14c-1.61-.25-3.22-.45-4.78-.74,0,0,0,0,0,0,.14-.2.37-.47.64-.8a8.93,8.93,0,0,0,1.69-2.72,5.16,5.16,0,0,0,.08-3.17,1.82,1.82,0,0,0-.56-.8l1,.17a18.79,18.79,0,0,0,6.09-.11c.31,0,.63-.11,1-.19a2.52,2.52,0,0,1,.75.57A4.16,4.16,0,0,1,65.33,97.41Z"/>
+                <path class="cls-13"
+                      d="M65.4,33.63l-.14.11-.34.1h0a15.44,15.44,0,0,1-2,.14A10.05,10.05,0,0,0,65.4,33.63Z"/>
+                <path class="cls-13" d="M65.26,33.74l-.06,0-.28.05Z"/>
+                <path class="cls-11" d="M64.81,7.55v0l-.29,0v0Z"/>
+                <path class="cls-9"
+                      d="M64.39,63.38s0,0,0,0a.49.49,0,0,0,0,.11h0l-.28,0a.53.53,0,0,0,.14-.12l.13-.07s0,0,0,0A.21.21,0,0,0,64.39,63.38Z"/>
+                <path class="cls-13"
+                      d="M64.91,33.84a6.6,6.6,0,0,1-.84.16H64a.29.29,0,0,0-.24,0h-.05l-.5,0-.55,0a3.85,3.85,0,0,1-.48,0L62,34h.86A15.44,15.44,0,0,0,64.91,33.84Z"/>
+                <path class="cls-8" d="M64.21,2.78c.09.73.19,1.81.26,3.32A13.48,13.48,0,0,0,63,2.73Z"/>
+                <path class="cls-13" d="M64.07,34l-.14,0h-.16A.29.29,0,0,1,64,34Z"/>
+                <path class="cls-9"
+                      d="M64,63.47a1,1,0,0,1-.36.2c-.35.12-.73.21-.84.26.07-.09.25-.46.6-.5A3.94,3.94,0,0,1,64,63.47Z"/>
+                <path class="cls-9"
+                      d="M63.11,43.2l.09.75c-.25,0-.49.1-.74.16l-1,.27c-.47-.39-.81-.64-.86-.58a6.65,6.65,0,0,0,.58.66l-.8.25c-.58.19-1,.36-1,.37a8.64,8.64,0,0,0-1,.5l-.41.28c-1.2-.39-2.46-.76-3.71-1.11-.23-.07-.49-.13-.67-.2L53,44.27l-1.32-.59-.15-.07c.7-.19,1.36-.35,1.9-.47.78-.17,1.32-.22,1.35-.23s.56-.1,1.36-.19A20.23,20.23,0,0,1,59,42.65a23,23,0,0,1,2.86.31C62.52,43.08,63,43.2,63.11,43.2Z"/>
+                <path class="cls-12"
+                      d="M62.88,24.22l.66.32c-1.8.11-3.26,2.14-3.4,4.74A5.25,5.25,0,0,0,62,34l.15.1a15.7,15.7,0,0,1-2.66-.35,25,25,0,0,1-2.47-.64A9.23,9.23,0,0,1,54.65,32l0,0-.84-.59-.41-.32-.28-.22v-.09l0-.24c0-.16.08-.32.13-.48a6.91,6.91,0,0,1,.37-.95,10.46,10.46,0,0,1,2.48-3.28,8.38,8.38,0,0,1,3.31-2.09A4.94,4.94,0,0,1,62.88,24.22Z"/>
+                <path class="cls-11" d="M62.78,64s0,0,0,0S62.79,64,62.78,64Z"/>
+                <path class="cls-9"
+                      d="M61.86,72.35c.19,0,.38,0,.57,0l-.21,1.34c-.15,1.07-.36,2.5-.58,3.94l0,.26v.07h0s0,0,0,0l0,.09-.21.5c-.14.34-.26.66-.39,1l-.69,1.76c-.2.52-.37,1-.48,1.27,0,.08-.06.15-.08.22v0l0,.07s0,0,0,0l0,0c0,.09,0,.13,0,.14l-.51,1.63c-.33.27-.71.6-1.12.93l-1.39,1.19-.18.16-.09.07,0,0h0a2.8,2.8,0,0,1-.14-.25A.6.6,0,0,1,56,86.6a.36.36,0,0,1,0-.12.61.61,0,0,1,.19-.38,3.53,3.53,0,0,1,.28-.37c-.09-.21-.89.56-.79.71a.82.82,0,0,0,.21.57l.11.12L55.13,87l-.45-.07-.19,0a.76.76,0,0,1,0-.15.77.77,0,0,1,.08-.29c0-.08.06-.12.06-.13a2,2,0,0,1,.23-.4c.14-.19.35-.32.33-.36s-.28,0-.49.19a1.33,1.33,0,0,0-.26.28.84.84,0,0,0-.1.15,1,1,0,0,0-.08.53L54,86.34v-.21a2.45,2.45,0,0,1,0-.27,3.12,3.12,0,0,1,.1-.48,1.14,1.14,0,0,1,.45-.64,1,1,0,0,1,.7-.18c.08.16,2-.6,2-.62A12.54,12.54,0,0,0,59,82.79h0a9.25,9.25,0,0,0,.26-3,24.51,24.51,0,0,0-.13-3.16s-.1-.45-.29-1-.47-1.27-.76-2-.66-1.46-.93-2a9.7,9.7,0,0,0,2.18.62A14.62,14.62,0,0,0,61.86,72.35Z"/>
+                <path class="cls-9"
+                      d="M61.55,44.91l1,1.08-1.14.62-.53.3-1.12-.44-1.06-.37c.5-.26.87-.41.9-.42s.38-.18.93-.4Z"/>
+                <path class="cls-9"
+                      d="M60.21,47.39l-.09.07a13.14,13.14,0,0,0-1.21,1.12,8.94,8.94,0,0,0-1.49,1.81l-1.7.25a3.84,3.84,0,0,1-.8-.43,2.34,2.34,0,0,1-.38-.28c-.09-.07-.16-.16-.24-.23a3.46,3.46,0,0,1-.42-.57l.33-.19a20.84,20.84,0,0,0,2.69-1.65l1-.64c.58.17,1.14.34,1.69.52Z"/>
+                <path class="cls-11" d="M59.23,69.29s.08.12,0,0Z"/>
+                <path class="cls-8"
+                      d="M58.47,6.77c0,.08.11.28,0,.12s-.28-.28-.58-.53l-.15-.13L57.39,6l-.45-.34L56.06,5a13.29,13.29,0,0,0-1.62-1A20.13,20.13,0,0,0,52.38,3a14.93,14.93,0,0,1,3.11-.49c.41,0,.81,0,1.2,0,.19.34.39.77.61,1.28.31.7.73,1.82,1,2.46,0,0,.06.15.12.31Z"/>
+                <path class="cls-9"
+                      d="M57.2,46.47l-.57.44a17.91,17.91,0,0,0-2.42,2l-.33.19a3.84,3.84,0,0,1-.23-.45,11,11,0,0,1-.55-1.74c-.07-.3-.12-.54-.18-.75.18-.35.3-.6.37-.74h0c.27.09.49.14.74.2C55.11,45.92,56.17,46.18,57.2,46.47Z"/>
+                <path class="cls-10" d="M56.76,71.5l0,.07,0-.1A.09.09,0,0,0,56.76,71.5Z"/>
+                <path class="cls-8"
+                      d="M56.37,55.13l0,0-.55.45a17.59,17.59,0,0,1-2.47,1.68,7,7,0,0,1-2.05.64,9.74,9.74,0,0,1-1.23.12H50q-.06-.6-.09-1.17a14.88,14.88,0,0,1,0-2l.51.21a7.34,7.34,0,0,0,2.14.42,11.87,11.87,0,0,0,1.45,0l.82-.06.63-.07.55-.14Z"/>
+                <path class="cls-10" d="M56.29,1.68l0,.05s0,0,0,0Z"/>
+                <path class="cls-8"
+                      d="M56,96.53a5.24,5.24,0,0,1-.28,2.94A8.63,8.63,0,0,1,54,101.94a12,12,0,0,0-.9,1.1c-.53-.11-1.06-.23-1.57-.37a13.43,13.43,0,0,1-3.16-1.31c-.18-.09-.35-.19-.52-.29l.68-.25a10.08,10.08,0,0,0,2.88-1.66,3.85,3.85,0,0,0,1-1.49,4.18,4.18,0,0,0,.25-1.53,3.81,3.81,0,0,0-.22-1.39l.43.13,1.59.46.9.26A1.69,1.69,0,0,1,56,96.53Z"/>
+                <path class="cls-9"
+                      d="M55.61,70.91c0,.08-.08.18-.13.3a13.28,13.28,0,0,1-.83,1.59,24.19,24.19,0,0,1-1.51,2.14c-.6.78-1.23,1.57-1.94,2.33-.89,1-1.81,2-2.56,2.9a5.43,5.43,0,0,1-.79.09A7.9,7.9,0,0,1,45.54,80a3.24,3.24,0,0,1-1.08-.5,2.52,2.52,0,0,1-.68-.76,2.58,2.58,0,0,1-.34-1c.59-.73,1.17-1.41,1.72-2a3,3,0,0,0,.88.8,2.43,2.43,0,0,0,1.19.35c.36,0,.59-.17.54-.26s-.2-.1-.43-.24a3.75,3.75,0,0,1-.74-.58,2.57,2.57,0,0,1-.44-.75l-.09-.31.23-.24c.29-.31.57-.6.85-.86a3.46,3.46,0,0,0,.85.86c.89.61,1.9.71,1.94.55s-.79-.61-1.33-1.25a2.72,2.72,0,0,1-.53-.93l0-.1.72-.68.42-.4a1.7,1.7,0,0,0,.62.75,1.87,1.87,0,0,0,.39.23l.38.17a4.64,4.64,0,0,0,.69.23c.42.1.73.06.74,0s-.22-.2-.54-.43c-.16-.11-.34-.25-.52-.4l-.3-.23a3,3,0,0,1-.25-.24.75.75,0,0,1-.13-.82,2,2,0,0,1,.16-.3l0-.07h0a.05.05,0,0,1,0,0l.65-.61,0,0v0l0,.12a1.73,1.73,0,0,0,.29.31,4.06,4.06,0,0,0,.57.35c.43.22,1,.29,1,.1s-.19-.47-.4-.81l-.28-.46a.48.48,0,0,1,0-.13.66.66,0,0,1-.24-.45s0-.08,0-.12a2.77,2.77,0,0,0,.31-.53l.19.21a17.72,17.72,0,0,0,2,1.68C54.88,70.45,55.24,70.69,55.61,70.91Z"/>
+                <path class="cls-8"
+                      d="M55.33,50.73s.15,0,.05,0l-.29,0-.55.08-.51,0-.6,0a4.77,4.77,0,0,1-1.8-.19,3,3,0,0,1-.72-.4c.08-.22.17-.42.25-.62.41-.88.85-1.72,1.17-2.38l.08-.18s0,0,0,0c.22.44.46,1,.85,1.69a4.45,4.45,0,0,0,.81,1,3.11,3.11,0,0,0,.28.23l.21.16a3.66,3.66,0,0,0,.52.28l.09,0Z"/>
+                <path class="cls-9"
+                      d="M54.48,67.85a1.35,1.35,0,0,1-.2.91l0,0c-.23-.2-.46-.4-.67-.61a.71.71,0,0,0,.27-.33C54,67.86,54.31,67.86,54.48,67.85Z"/>
+                <path class="cls-10" d="M52.43,94.75h-.06s0-.06,0-.06S52.4,94.71,52.43,94.75Z"/>
+                <path class="cls-9"
+                      d="M52.37,94.74a9.38,9.38,0,0,1,0,1.39,3.65,3.65,0,0,1-1.34,2.67,9.58,9.58,0,0,1-2.79,1.45c-.41.15-.76.26-1,.33l-.16,0h0l-.22-.15-.35-.24c-.18-.13-.42-.3-.62-.47-.43-.33-.9-.78-1.34-1.17,0,.53,0,1,0,1.56l-.8-1.7-.4-.84-.56.74-.6.77-.08.1s0,.06,0,0v-.06l-.06-.3L41.62,97c-.06-.31-.13-.61-.2-.92l-.1-.47a3,3,0,0,0-.16-.56c-.08-.17-.27-.8-.48-1.5.22,0,.49.08.78.11a6.4,6.4,0,0,0,1.57,0,5.69,5.69,0,0,0,1.68-.54A3,3,0,0,0,46,92.25a3.87,3.87,0,0,0,.58-.93c.08-.24.16-.46.23-.66.14-.39.25-.72.32-1,.17.33.29.52.29.54s.22.33.53.77a18.44,18.44,0,0,0,1.22,1.54,7.72,7.72,0,0,0,1.46,1.31,2.27,2.27,0,0,0,.79.37l.19.23h0a1.22,1.22,0,0,0,.32.12Z"/>
+                <path class="cls-11" d="M51.65,65.2a0,0,0,0,0,0,0h0S51.64,65.21,51.65,65.2Z"/>
+                <path class="cls-11" d="M49.92,2.18h0Z"/>
+                <path class="cls-10" d="M49.82,59.63l0,0h0Z"/>
+                <path class="cls-10" d="M49.79,59.65v0l0,0h0Z"/>
+                <path class="cls-10" d="M49.78,59.66h0l-.12,0Z"/>
+                <path class="cls-9"
+                      d="M49.62,50.31a15.8,15.8,0,0,0-.54,1.93h0l-1,.65-.27.18c-.18.13-.42.25-.48.45a1,1,0,0,0,.06.68c.06.14.08.17.12.25l.12.2a8.57,8.57,0,0,0,.52.76l.29.39.16.19.07.08h0a.88.88,0,0,0,0,.16c0,.22,0,.46,0,.7,0,.63.1,1.27.19,1.91h0a.47.47,0,0,0-.12-.23,1.81,1.81,0,0,0-.24-.24h0a.09.09,0,0,0,0-.06.19.19,0,0,0,0-.09,1.13,1.13,0,0,0,0-.18c0-.12,0-.26,0-.41a4.3,4.3,0,0,0-.1-1,3.19,3.19,0,0,0-.53-1.12c-.51-.68-1.18-1.14-1.43-1.53a2.61,2.61,0,0,1-.27-.52,1.23,1.23,0,0,1-.06-.21s0,0,0-.06l.07-.08.11-.11.25-.24.6-.56c.45-.39.94-.8,1.42-1.18C49,50.76,49.35,50.51,49.62,50.31Z"/>
+                <path class="cls-10" d="M49.14,60l.14,0-.14.08h0Z"/>
+                <path class="cls-10" d="M49.14,60v0a.08.08,0,0,1,0,.07c0-.11,0-.21,0-.31a.45.45,0,0,0,0,.17h0Z"/>
+                <path class="cls-9"
+                      d="M49.09,59.8c0,.1,0,.2,0,.31v0c0,.12-.38.24-.71.24a7.76,7.76,0,0,1-1.08,0,4.52,4.52,0,0,1-1-.2,1.07,1.07,0,0,1-.64-.48.59.59,0,0,1,0-.35,4.29,4.29,0,0,1,.13-.44,8.29,8.29,0,0,1,.32-.82,1.08,1.08,0,0,1,.21-.29l.26-.25.18-.19c.06-.05.15-.13.22-.08s.08.27.15.39.11.27.07.34l-.1.11,0,0a1.08,1.08,0,0,0-.54.38.41.41,0,0,0,0,.34.62.62,0,0,0,.12.2,1,1,0,0,0,.13.14s.11,0,.15-.09.08-.15.06-.17l-.1-.08c0-.07-.1-.14-.07-.21s.2-.17.38-.26a1.52,1.52,0,0,1,.57-.18.85.85,0,0,1,.54.19c.16.12.32.23.44.33s.08.47.12.47a.35.35,0,0,0,.07-.14.35.35,0,0,0,0-.18h0q.06.47.15.93S49.08,59.79,49.09,59.8Z"/>
+                <path class="cls-10"
+                      d="M49,59.21l.07.58q-.09-.47-.15-.93c-.09-.64-.15-1.28-.19-1.91,0-.24,0-.48,0-.7.05.58.11,1.2.17,1.84Z"/>
+                <path class="cls-10" d="M48.49,58.26s0,0,0,0l-.07-.06h0v0l.05,0s0,0,0,0Z"/>
+                <path class="cls-10" d="M48.47,58.29h0v0s0,0,0,0l0,0v0h0Z"/>
+                <path class="cls-8"
+                      d="M47.86,80.44a5.51,5.51,0,0,0,.69-.14,9.44,9.44,0,0,0-1,1.5,7.28,7.28,0,0,0-.36.76c-.2,0-.52.13-.91.2a6.19,6.19,0,0,1-2.55,0,3.4,3.4,0,0,1-2.05-1.35,2.85,2.85,0,0,1-.37-.66q.21-.39.45-.75c.41-.63.86-1.22,1.3-1.79a3.21,3.21,0,0,0,.34.72,2.69,2.69,0,0,0,.83.86,3.52,3.52,0,0,0,1.23.51A7.09,7.09,0,0,0,47.86,80.44Z"/>
+                <path class="cls-8"
+                      d="M46.92,89.4l.1.19c-.11.24-.25.57-.43,1-.09.2-.17.42-.27.65a2.74,2.74,0,0,1-.39.64,3.62,3.62,0,0,1-1.36.93,5.93,5.93,0,0,1-1.6.46,5.82,5.82,0,0,1-1.46,0,8.75,8.75,0,0,1-1-.17c-.25-.82-.49-1.62-.57-1.81l-.13-.34h0a11.84,11.84,0,0,1-.41-2.9c0-.27,0-.55,0-.83a2.08,2.08,0,0,0,.41.35,4.1,4.1,0,0,0,2.8.74,14.86,14.86,0,0,0,2.79-.51,3.91,3.91,0,0,0,1-.4.28.28,0,0,0,0,.09A6.53,6.53,0,0,0,46.92,89.4Z"/>
+                <path class="cls-9"
+                      d="M46.77,84.35v.3a5.07,5.07,0,0,0-.37,2.64,1.56,1.56,0,0,0-.15.06c-.21.07-.51.15-.88.24a20.91,20.91,0,0,1-2.75.35,3.89,3.89,0,0,1-2.53-.76,3.19,3.19,0,0,1-.64-.65,5,5,0,0,1,.16-1,27.15,27.15,0,0,1,.87-3c.18-.43.37-.84.58-1.24a2.41,2.41,0,0,0,.28.43,3.68,3.68,0,0,0,2.33,1.42,6.18,6.18,0,0,0,2.67-.18,6.1,6.1,0,0,0,.81-.28A3.61,3.61,0,0,0,46.77,84.35Z"/>
+                <rect class="cls-11" x="46.74" y="72.88" width="0.01" height="0.01"/>
+                <path class="cls-11" d="M45.82,6.58h0c-.19.17-.37.36-.56.54C45.44,6.94,45.62,6.75,45.82,6.58Z"/>
+                <path class="cls-11" d="M41.07,80.26h0l-.13.28.13-.28Z"/>
+                <path class="cls-11" d="M40.93,80.57c0,.08-.06.16-.1.25h0Z"/>
+                <circle class="cls-9" cx="74.66" cy="26.13" r="0.81"/>
+                <circle class="cls-9" cx="62.2" cy="27.25" r="0.91"/>
+                <circle class="cls-9" cx="62.76" cy="28.68" r="0.18"/>
+                <circle class="cls-9" cx="73.86" cy="27.51" r="0.19"/>
+                <path class="cls-7"
+                      d="M70.82,83.14c-.06.09-.13.18-.18.27a.84.84,0,0,0-.26-.35,1.51,1.51,0,0,0-.48-.16c-.15,0-.25-.07-.25-.09s.1,0,.26,0a1.38,1.38,0,0,1,.6.08A1.05,1.05,0,0,1,70.82,83.14Z"/>
+                <g class="cls-15">
+                    <path class="cls-16"
+                          d="M62,78.53c-.61,0-1.23-.08-1.85-.1-.18,4.39-4.9,5.19-6,9C59.4,89.88,62.24,83.56,62,78.53Z"/>
+                </g>
+                <path class="cls-17" d="M64.57,78.76l-.2,0,.09.42C64.5,79,64.54,78.89,64.57,78.76Z"/>
+                <g class="cls-15">
+                    <path class="cls-16"
+                          d="M64.7,84.59c1.51.89,3.08.4,5.35-.19C67.22,83,65.16,82,64.46,79.16,63.88,81.24,63.73,83.12,64.7,84.59Z"/>
+                </g>
+                <path class="cls-18"
+                      d="M70.3,93.27A35.84,35.84,0,0,1,64,95.46a3,3,0,0,1,.66.44,5.22,5.22,0,0,1,.63.68A36.81,36.81,0,0,0,77.4,89.76C74.92,91,72.56,92.27,70.3,93.27Z"/>
+                <path class="cls-8"
+                      d="M81.74,95.5a17.57,17.57,0,0,1,5.85-2.33c-1.17,0-2.34-.59-1.76-1.76a17.83,17.83,0,0,1,4.27-3L89.83,88a5.17,5.17,0,0,0-.42-.51,4.33,4.33,0,0,0-1-.81A4.17,4.17,0,0,0,86,86.22a8.86,8.86,0,0,0-2.52.62c-.8.31-1.58.72-2.37,1.09s-1.53.76-2.29,1.13l-1.37.7a36.81,36.81,0,0,1-12.16,6.82,3.29,3.29,0,0,1,.43.68,3.85,3.85,0,0,1,.25,2,5.19,5.19,0,0,1-.46,1.93c-.24.58-.51,1.1-.73,1.55s-.37.7-.5,1l1.45-.19c.87-.13,1.73-.29,2.59-.47,4.9-2.2,9.71-4.79,14.64-6.35C81.74,96.67,81.15,96.09,81.74,95.5Z"/>
+                <path class="cls-19"
+                      d="M90.12,88.42a17.83,17.83,0,0,0-4.27,3c-.58,1.17.58,1.76,1.75,1.76a17.39,17.39,0,0,0-5.84,2.33c-.59.59,0,1.17,1.17,1.17C78,98.22,73.19,100.81,68.29,103l1-.21a18.09,18.09,0,0,0,3.4-1.13h0l3.17-1.25c1.09-.21,2-.36,3-.58a14.28,14.28,0,0,0,1.42-.4L81,99.2l.69-.28a15.82,15.82,0,0,0,4.84-3.18A12.22,12.22,0,0,0,89.58,91,10.61,10.61,0,0,0,90,89.71c.06-.22.08-.45.12-.68l0-.34a1,1,0,0,0,0-.21Z"/>
+                <path class="cls-19"
+                      d="M67.64,103.22l.62-.28c1.39-.63,2.81-1.3,4.17-1.94a88.63,88.63,0,0,1,10.1-4.29,1.23,1.23,0,0,1-1-.56.66.66,0,0,1,.22-.71,16.8,16.8,0,0,1,5.43-2.24,1.92,1.92,0,0,1-1.38-.72,1.13,1.13,0,0,1,0-1.11l0,0a18.14,18.14,0,0,1,4.29-3l.06,0,.09.15s0,.08,0,.11a1,1,0,0,0,0,.12l0,.34a2,2,0,0,0,0,.24,3.54,3.54,0,0,1-.08.45l-.1.37a6.74,6.74,0,0,1-.29,1,12.26,12.26,0,0,1-3.09,4.72A15.7,15.7,0,0,1,81.7,99l-.69.28-.7.24c-.33.12-.69.21-1,.3l-.39.1c-.69.16-1.36.28-2.07.4l-.95.18-.83.33-2.32.92h0a17.78,17.78,0,0,1-3.42,1.14l-.7.15ZM85.91,91.44a1,1,0,0,0,0,1,2,2,0,0,0,1.71.67h.6l-.58.15a17.44,17.44,0,0,0-5.82,2.32.52.52,0,0,0-.17.54c.13.3.63.5,1.3.5h.47l-.45.14a84.44,84.44,0,0,0-10.46,4.4c-1.17.55-2.37,1.12-3.57,1.67l.33-.07a17.86,17.86,0,0,0,3.38-1.13l0,0h0l2.31-.91.84-.33,1-.18c.7-.13,1.37-.25,2-.4l.39-.1c.34-.09.69-.18,1-.3l.7-.23.68-.28a15.79,15.79,0,0,0,4.82-3.16A12.17,12.17,0,0,0,89.51,91a6.89,6.89,0,0,0,.29-1c0-.13.06-.26.1-.38a3,3,0,0,0,.08-.43L90,89l.06-.34c0-.06,0-.09,0-.12a.08.08,0,0,0,0,0A18.18,18.18,0,0,0,85.91,91.44Z"/>
+                <path class="cls-20"
+                      d="M40.06,11.88s.15-.19.38-.43a9,9,0,0,1,.82-.75c-.08,0-.12,0-.13,0a1.43,1.43,0,0,0-.1-.16,1.31,1.31,0,0,0-.4-.32A3.36,3.36,0,0,0,38.72,10l-.47,0a7.66,7.66,0,0,1,1.18,3,6.75,6.75,0,0,1,.33-.66Z"/>
+                <path class="cls-9" d="M70.37,46.87a2.7,2.7,0,0,1-.53.46l.21,0,.14,0c.07-.19.14-.38.22-.57Z"/>
+                <path class="cls-9" d="M82.08,32.15a1.16,1.16,0,0,1-.06.15l.23.05Z"/>
+                <path class="cls-21"
+                      d="M71.44,47.34a3.37,3.37,0,0,0,1.28-.58,4.89,4.89,0,0,1,.52-.42v-.06a3,3,0,0,1-1,.07c-.43-.05-.7-.15-.7-.2s.3,0,.7,0a2.76,2.76,0,0,0,1.36-.44,7.27,7.27,0,0,0,1.09-1c.27-.31.41-.54.43-.55s.07-.1.18-.27c-.5.07-.93.16-.95.09s.54-.4,1.18-.58h0a3.1,3.1,0,0,0,.15-.46c-.23.06-.36.09-.37.06s.14-.14.41-.28a2.18,2.18,0,0,0,0-.51c0-.12,0-.25,0-.37-.65.16-1.15.31-1.17.23a4,4,0,0,1,1.12-.58c0-.29-.1-.55-.16-.77a1.23,1.23,0,0,0-.17-.42c-.07-.08-.14-.1-.14-.13s.08-.05.22,0a1.1,1.1,0,0,1,.33.45h0a12.63,12.63,0,0,1,1.39-.88,7.12,7.12,0,0,0,1.32-1,8.35,8.35,0,0,0,1.16-1.48c.71-1.09,1.26-2.25,1.78-3.18A5.54,5.54,0,0,1,82.22,33l.31-.27h0s0,0-.08-.11l-.21-.26L82,32.3l0,.09A15.16,15.16,0,0,1,79.46,35c-.75.66-1.64,1.4-2.62,2.17-.49.39-1,.78-1.53,1.17l-.42.29a2.76,2.76,0,0,1-.3.15,1.42,1.42,0,0,1-.32.07.6.6,0,0,1-.68-.32l-.15-.28-.12-.23A15.86,15.86,0,0,1,72,30.71c.05-2,.2-3.43.21-3.51a32.86,32.86,0,0,1,.55-3.49c.1-.49.23-1,.4-1.58C70.34,28.44,70.66,35.59,72.5,42A4,4,0,0,1,73,42a1.34,1.34,0,0,1,.56.22,1.73,1.73,0,0,1,.41.4,1.19,1.19,0,0,1,.24.55.69.69,0,0,1-.22.62c-.32.22-.44.26-.54.74a.57.57,0,0,1-.23.3.51.51,0,0,1-.16.09s-.09,0-.12,0v0L73,45A0,0,0,0,1,73,45h0s0,0,0,0-.21.24-.42.45a.76.76,0,0,1-.55.18.47.47,0,0,1-.24-.08h0a3.42,3.42,0,0,1-.69.28h0c0,.1-.18.13-.22.23.1-.12.06-.07.09,0a1.07,1.07,0,0,1-.1.24,2,2,0,0,1-.33.47c-.09.19-.46.4-.61.58A4.65,4.65,0,0,0,71.44,47.34Zm3-4.56s.08,0,.14.08.06-.07.21-.14.09,0,.12,0a.17.17,0,0,1,0,.12.77.77,0,0,1,0,.38c-.06.14-.15.22-.27.2a.33.33,0,0,1-.23-.23A.37.37,0,0,1,74.45,42.78Zm-.29-1a.48.48,0,0,1-.4.09.19.19,0,0,1-.13-.24.56.56,0,0,1,.13-.24l.06-.08s.08,0,.14.1.08-.07.25-.12a.13.13,0,0,1,.13,0,.17.17,0,0,1,0,.12A.5.5,0,0,1,74.16,41.76Z"/>
+                <path class="cls-9"
+                      d="M74,2.39l-.38.2a6.43,6.43,0,0,0-.73.48,3.69,3.69,0,0,0-.72.78,8.45,8.45,0,0,0-.67,1.2,15.41,15.41,0,0,0-.75,2l-.15.49s0,0,0,0l0-.13,0-.25-.06-.49c-.05-.32-.09-.64-.13-.94a5.8,5.8,0,0,0-.21-.89c-.07-.19-.16-.38-.24-.55a6.8,6.8,0,0,0-1-1.53l-.28-.29-.19,0c-1,1.2-2.84,1.58-3.51,2.75q0,1,0,2.28v0l-.29,0v0c0-.07,0-.24-.08-.43a8.67,8.67,0,0,0-2.17-4.3l-.17-.15-.57,0-.9-.08-.14,0a5.47,5.47,0,0,0-1.92,3.28q.13.44.27.9a1.11,1.11,0,0,0,0,.3,2.46,2.46,0,0,0,0,.26c0,.08.07.27,0,.11a2.52,2.52,0,0,0-.74-.52l-.25-.23c-.2-.17-.39-.32-.58-.46l-.45-.34c-.3-.22-.59-.41-.86-.6a10.61,10.61,0,0,0-1.59-.91,11.74,11.74,0,0,0-2.58-.83l-.54-.1-.51.22c-.52.23-1,.48-1.49.74A20.75,20.75,0,0,0,46.73,6l-.24.18a.9.9,0,0,0-.21.08,3.63,3.63,0,0,0-.46.34h0c-.19.17-.37.36-.56.54s-.11.12-.17.19a3.83,3.83,0,0,1-.28.29l-.22.23-1-.26c-.81-.2-2-.48-3.32-.72a13.41,13.41,0,0,0-2.07-.24c-.74,0-1.59.1-2.45.2s-1.75.24-2.64.4l-.66.13-.54.13h-.06c1.47,3.3,2.26,6.86,6,7.93a7.55,7.55,0,0,0-1.07,3.35c.74.92,1.17,1.5,1.08,1.59s-.47-.23-1.14-.8v.07a8.06,8.06,0,0,1,0,1.47v0c-.33,3-1.87,6.18,2.33,6.6-.58,1.17-2.33,1.76-2.33,2.92.58,1.17,2.33,1.17,4.09,1.17a15.68,15.68,0,0,1-3.51,2.93c2,.85,3.44,2.55,4.94,4.13l.59.38c.51.31,1.1.64,1.75,1,1.3.7,2.84,1.47,4.49,2.27l1.73.82h0c.88-.31,1.74-.56,2.44-.75a13.73,13.73,0,0,1,1.39-.29,11.45,11.45,0,0,1,1.4-.14,18.9,18.9,0,0,1,3,.06,19.94,19.94,0,0,1,2.27.37l.38-1.42c-.33-.08-.66-.18-1-.29-1.63-.53-3.47-1.3-5.42-2.14-.49-.22-1-.43-1.49-.67L53,37.65l-.74-.43a25.94,25.94,0,0,1-2.8-2,47.56,47.56,0,0,1-4.91-4.66L44,30l-.28-.33-.47-.54c0-.05-.11-.09-.08-.14l.1-.15.2-.29.32-.47.42-.61A24.7,24.7,0,0,1,46,25.19a25.2,25.2,0,0,1,3.12-3,16.69,16.69,0,0,1,1.49-1.06c.07,0,.51-.31,1.3-.65a17.8,17.8,0,0,1,3.33-1A27.83,27.83,0,0,1,60.05,19a9.26,9.26,0,0,1,5.51,2l0,0h0a8.88,8.88,0,0,1,2.61,3,11.8,11.8,0,0,1,1.16,3.75,31.65,31.65,0,0,1,.28,3.67,14.28,14.28,0,0,1-.16,3.36,12.55,12.55,0,0,1-2,4.7c-.7,1-1.25,1.52-1.3,1.47s-.48.39-1.49.47l1.6.64h0a.41.41,0,0,1,.24.1.85.85,0,0,1,.25.37.2.2,0,0,1-.08.24.37.37,0,0,1-.23.05l-.32,0-.29,0-.46.79c.07,0,.11,0,.11,0s-1.5.47-3,1l-.69.23,1.07.94,0,0a9.59,9.59,0,0,1,1.34-.61c.44-.12.74-.09.75,0s-.29.11-.66.29-.68.41-1.08.68c.44.38.87.76,1.21,1a2.87,2.87,0,0,0,.58.27l.26.08a4.51,4.51,0,0,0,.92.2,7.36,7.36,0,0,0,2-.12,3.92,3.92,0,0,0,1.83-.81,4.46,4.46,0,0,0,.49-.49l.12-.31a1.55,1.55,0,0,1-.71,0,.68.68,0,0,1-.31-.18,1.8,1.8,0,0,1-.81.09,1,1,0,0,1-.72-.56,2,2,0,0,1-.19-.79,2,2,0,0,1,.49-1.33,2.37,2.37,0,0,1,.79-.63l.36-.18a4.5,4.5,0,0,1,.69-.2,3,3,0,0,1,.37,0,.83.83,0,0,1,.29,0l.13,0h.11l.17,0,.2-.07.11,0,.16,0a5.15,5.15,0,0,1,.56,0c-1.84-6.36-2.16-13.51.65-19.82,0,0,0,0,0,0A5.41,5.41,0,0,1,73.61,21a7.63,7.63,0,0,0-1.81,4.35A7.63,7.63,0,0,1,73.61,21a5.47,5.47,0,0,1,.41-.65,6.4,6.4,0,0,1,1.47-1.42,5.29,5.29,0,0,1,1.25-.65,8.66,8.66,0,0,0,2.66-2.87C82.67,9.69,78.8,5.69,74,2.39ZM41.63,11a9.63,9.63,0,0,0-.73.85c-.19.24-.3.42-.31.42l-.32.42a6.13,6.13,0,0,0-.58.94,5,5,0,0,0-.23.55,4.8,4.8,0,0,1-2.15,3.57v0a4.8,4.8,0,0,0,2.15-3.57,8.84,8.84,0,0,1-.31,1s-.1-.21-.09-.54a3.59,3.59,0,0,1,.2-1.17c.05-.15.11-.3.17-.44a7.66,7.66,0,0,0-1.18-3,6.88,6.88,0,0,1-2.89-.29c0-.17,1-.32,2.28-.54a9.4,9.4,0,0,0-2.08-1.91,9.4,9.4,0,0,1,2.08,1.91l1-.19a4.34,4.34,0,0,1,2.6.08,2.51,2.51,0,0,1,1.15.93h0c.25-.12.43-.19.45-.15S42.2,10.4,41.63,11ZM66.25,46.1a.62.62,0,0,1-.68-.08.58.58,0,0,1-.07-.61,1.86,1.86,0,0,1,.3-.45s.09,0,.15.06.22-.05.48.13a.58.58,0,0,1,.25.49A.61.61,0,0,1,66.25,46.1Z"/>
+                <path class="cls-9"
+                      d="M68.35,2.52c-.37.07-.75.15-1.13.21a2.92,2.92,0,0,1-.44.06l-.45,0h-.76l-.58,0c-.06.59-.12,1.4-.15,2.46C65.51,4.1,67.39,3.72,68.35,2.52Z"/>
+                <path class="cls-9"
+                      d="M60.48,2.57c-.51,0-1.2-.09-2-.11l-1,0c.12.33.24.71.37,1.13.2.66.42,1.41.68,2.28A5.47,5.47,0,0,1,60.48,2.57Z"/>
+                <path class="cls-21"
+                      d="M37.31,34.71a15.68,15.68,0,0,0,3.51-2.93c-1.76,0-3.51,0-4.09-1.17,0-1.16,1.75-1.75,2.33-2.92-4.93-.49-2-4.73-2.31-8.14l-.41-.36a10,10,0,0,1,0,2.16,15.55,15.55,0,0,1-.63,2.93A11.13,11.13,0,0,1,35,26a5.62,5.62,0,0,1-.51.83c-.09.13-.19.27-.3.4l-.16.2-.15.16a.24.24,0,0,0,0,.36.15.15,0,0,0,.09.06L34,28l.45.17,1.38.52.38.15.19.07.09,0,0,0,0,0-.67.45-2,1.39-.42.28-.14.1-.2.15.32.07,1,.27,3.61,1-1.61.89-.76.44-.28.17-.08,0h0s-.06,0-.05.07l.12.07L37.87,36c1.45.9,2.36,1.5,2.44,1.54s.49.35,1.24.86l.7.49C40.75,37.26,39.31,35.56,37.31,34.71Z"/>
+                <path class="cls-21"
+                      d="M85.19,10.64a4.89,4.89,0,0,1,.22.59c.12.34.17.59.18.6a6.26,6.26,0,0,1,0,.64,6.33,6.33,0,0,1-.18,1.31,5.29,5.29,0,0,1-.56,1.76,9.48,9.48,0,0,1,.1-1.82,7.64,7.64,0,0,0,0-1.22,4.42,4.42,0,0,0-.1-.54s0-.24-.11-.57-.2-.76-.35-1.19c-.23-.71-.51-1.4-.56-1.64C83.55,8,83.09,7.51,82.68,7a.92.92,0,0,0-.07.13l-.5-.72h.11a4.11,4.11,0,0,1-.48-.93,4.11,4.11,0,0,0,.48.93l.33-.08a11.1,11.1,0,0,0,1.32-.49,5.33,5.33,0,0,1,1.27-.38h0l.28-.12c.25-.11.49-.13.5-.07a3.52,3.52,0,0,1,.09.85,4.77,4.77,0,0,1-.32,1.66,13.38,13.38,0,0,1-.94,1.93c0,.1.1.21.16.31s.19.42.27.62c1-.39.84-1.94,1.54-2.62,0-.48,0-.77,0-.8a11.5,11.5,0,0,0,0-1.16c-.05-.63-.18-1.59-.84-1.91a2.89,2.89,0,0,0-1.36-.23,15.37,15.37,0,0,0-1.63.14c-.54.07-1.08.11-1.58.16h-.48l-.46,0c.17.27.3.49.39.65s.22.4.19.43-.17-.08-.38-.27S80,4.6,79.66,4.2c-.3-.08-.72-.23-1.23-.42S77,3.21,76.17,2.92A16.23,16.23,0,0,0,74,2.38h0c4.83,3.3,8.7,7.3,5.43,13a8.66,8.66,0,0,1-2.66,2.87,3.43,3.43,0,0,1,.75-.17,6.82,6.82,0,0,1,3.92.93,7.31,7.31,0,0,1,1.39,1.22,5,5,0,0,1,1,1.34A7.16,7.16,0,0,1,84.2,23c0,.41,0,.75,0,1,0,.11,0,.21,0,.3.09-.43.16-.85.2-1.19s.07-.63.08-.64,0-.27.07-.65.08-.88.1-1.38c0-.76,0-1.53,0-1.84,0,0-.07.05-.09,0a7.62,7.62,0,0,1,.54-1.75,29.25,29.25,0,0,0,1-3.84,25.11,25.11,0,0,0,.48-3.95c0-.42,0-.78,0-1.07C86,8.7,86.19,10.25,85.19,10.64Z"/>
+                <path class="cls-20"
+                      d="M83.92,8.46c.07,0,.38.4.7,1,.06-.43.24-1.16.41-1.87a4.49,4.49,0,0,0,.09-1.42l0-.22A1.71,1.71,0,0,0,84,6.05a2.85,2.85,0,0,0-1.1.74,1.91,1.91,0,0,0-.17.22c.41.5.87,1,1.24,1.55A.16.16,0,0,1,83.92,8.46Z"/>
+                <path class="cls-11" d="M85.26,6.06v0l-.06,0h0v0Z"/>
+                <path class="cls-9"
+                      d="M85.71,27.38c-.28.29-.62.65-1,1.06s-.49.56-.76.85l-.4.46-.66.76-.28-.09c.29-1,.59-2.12.81-2.93C83.53,27.52,85,27.45,85.71,27.38Z"/>
+                <path class="cls-11" d="M84.79,18.53l-.05,0a.79.79,0,0,1,0-.14S84.78,18.47,84.79,18.53Z"/>
+                <path class="cls-9"
+                      d="M84.25,31.42l-.15,0h0l-.28.08-1.11.31-.51.14c.13-.37.29-.94.47-1.56l.28.09,1.2.78Z"/>
+                <path class="cls-10" d="M74,22.34l0,.09h0c.09-.3.19-.59.3-.88A4.89,4.89,0,0,0,74,22.34Z"/>
+                <path class="cls-4"
+                      d="M79.22,18.87a6.68,6.68,0,0,0-1.67-.06,3.61,3.61,0,0,0-1.61.73,5.45,5.45,0,0,0-1.25,1.29,4.81,4.81,0,0,0-.42.72c-.11.29-.21.58-.3.88l.32-.2A3.78,3.78,0,0,1,76,21.8,7.14,7.14,0,0,1,79.22,18.87Z"/>
+                <path class="cls-10"
+                      d="M84.15,24.71c0-.16-.07-.39-.11-.7s-.08-.63-.13-1a10.2,10.2,0,0,0-.47-1.21,4.69,4.69,0,0,0-1-1.17,6.62,6.62,0,0,0-1.33-1.08,5.54,5.54,0,0,0-1.91-.65A7.14,7.14,0,0,0,76,21.8a6.12,6.12,0,0,1,.74,0,4.52,4.52,0,0,1,1.65.42,4.19,4.19,0,0,1,1.46,1.21A11.8,11.8,0,0,1,81,25.1a4.53,4.53,0,0,1,.64,2,7.18,7.18,0,0,1-.15,2.11l1.35.11c.23-.59.44-1.28.6-1.85a0,0,0,0,0,0,0,.42.42,0,0,1,0-.06s0,0,0,0a1.8,1.8,0,0,0,0-.19,1.21,1.21,0,0,0,0-.18c0-.1,0-.2.08-.28s0-.07,0-.1a.39.39,0,0,0,0-.13.3.3,0,0,0,0-.11h0v0A14.12,14.12,0,0,1,84.15,24.71Z"/>
+                <path class="cls-4"
+                      d="M74.12,32.52a3.86,3.86,0,0,1-1.09,0,.54.54,0,0,1-.17-.07A14.36,14.36,0,0,0,73,34.1a13.5,13.5,0,0,0,1,3.66l.1.22.08.16c0,.07.07.08.12.07l.15,0,.14-.07.41-.26c.53-.35,1.05-.73,1.55-1.09l.52-.38a14.39,14.39,0,0,1-2.43-3.91Z"/>
+                <path class="cls-10"
+                      d="M81.47,29.23c0,.08,0,.18-.08.27l-.09.16a1.25,1.25,0,0,1-.09.12,4.54,4.54,0,0,1-.38.38,6.71,6.71,0,0,1-.84.59,14,14,0,0,1-3.33,1.35,13.35,13.35,0,0,1-2.06.37A14.39,14.39,0,0,0,77,36.38c.8-.59,1.54-1.15,2.19-1.65s1.42-1.12,1.86-1.48c0,0,.21-.28.56-.71s.46-1.5,1-2.71c.06-.15.13-.32.19-.49Z"/>
+                <path class="cls-12"
+                      d="M79.3,23.34a3.92,3.92,0,0,0-1-.83,4.3,4.3,0,0,0-1.53-.45h-.5c1.59.5,3,2.87,2.93,5a5.92,5.92,0,0,1-1.7,4.14,12.06,12.06,0,0,0,2.08-.86C80.62,28.42,80,25.69,79.3,23.34Z"/>
+                <path class="cls-9"
+                      d="M81.16,27.14a6.79,6.79,0,0,0-1.6-3.48,4,4,0,0,0-.26-.32c.73,2.35,1.32,5.08.23,7l.18-.1a5.84,5.84,0,0,0,.77-.53,2.46,2.46,0,0,0,.33-.31l.07-.08s0,0,0-.06a.65.65,0,0,0,.07-.21A7,7,0,0,0,81.16,27.14Z"/>
+                <path class="cls-12" d="M73.89,22.72l.1,0a.36.36,0,0,0-.11.1S73.89,22.74,73.89,22.72Z"/>
+                <path class="cls-9"
+                      d="M74,31.89a3.21,3.21,0,0,1-.81-.06.4.4,0,0,0-.29.05c0-.39,0-.77,0-1.13a3.25,3.25,0,0,1,0-.33A2.34,2.34,0,0,0,74,31.89Z"/>
+                <path class="cls-9"
+                      d="M73.71,60.12a2.19,2.19,0,0,0-.38-.63.61.61,0,0,0-.36-.23.21.21,0,0,1,0-.13h0c0,.14,0,.3,0,.48s0,.43,0,.67A1.75,1.75,0,0,0,73.71,60.12Z"/>
+                <path class="cls-21"
+                      d="M72.89,60.28c0,.11,0,.21,0,.33a4.88,4.88,0,0,1-.08.61.86.86,0,0,0,.34-.09,2.23,2.23,0,0,0,.42-.3c.14-.12.28-.25.26-.41a1.71,1.71,0,0,0-.09-.3A1.75,1.75,0,0,1,72.89,60.28Z"/>
+                <path class="cls-22"
+                      d="M70.08,44.3a.28.28,0,0,1,.13,0,1.32,1.32,0,0,1,.57,0,.4.4,0,0,1,.29.21.42.42,0,0,1-.08.38,2,2,0,0,1-.13.18l-.12.12a2,2,0,0,1-.28.23l-.33.2.07,0a1.59,1.59,0,0,0,.76,0,3.33,3.33,0,0,0,.78-.22c.1,0,.17-.09.18-.13a.3.3,0,0,0,0-.09s.06,0,.09.08a.16.16,0,0,1,0,.14.58.58,0,0,0,.44-.13c.12-.07.27-.2.39-.27s.09-.06.14,0v0s0,0,0,0a.83.83,0,0,1,.06-.21.36.36,0,0,0,0-.11s0,0,0-.22c0,0,0,0,0,0h0l-.08,0-.14,0c-.08,0-.13,0-.13,0s0,0,.09-.1a.55.55,0,0,1,.38-.14c.1.09,0,.21,0,.31s.06,0,.09,0l.08-.08c-.15-.25,0-1.07-.46-.91a1.35,1.35,0,0,1-.53,0C71.49,43.38,70.27,43.13,70.08,44.3Z"/>
+                <path class="cls-14"
+                      d="M73.59,42.9a1.4,1.4,0,0,0-.32-.28,1.06,1.06,0,0,0-.38-.12,3.17,3.17,0,0,0-.87,0H72l-.11,0-.21.07-.23.08a1.53,1.53,0,0,1-.29,0l-.25-.05h-.06a1.17,1.17,0,0,0-.27.05,3.85,3.85,0,0,0-.58.19,2.5,2.5,0,0,0-.94.59,1.5,1.5,0,0,0-.4.95,1.46,1.46,0,0,0,.1.57.46.46,0,0,0,.35.31,1.69,1.69,0,0,0,1.19-.29,2.2,2.2,0,0,0,.25-.17l.11-.1.07-.06a.2.2,0,0,0,.06-.15c0-.06-.07-.08-.11-.1a1.29,1.29,0,0,0-.41,0,.47.47,0,0,0-.17,0,.81.81,0,0,0,0,.16.81.81,0,0,1,0-.16.35.35,0,0,0-.12.07.84.84,0,0,0-.12.19s-.07.07-.08.06,0,0,0-.08a.54.54,0,0,1,.08-.25.51.51,0,0,1,.25-.17c.22-1.32,1.67-.38,2.45-.83.7-.11.41.56.61.9h0a.38.38,0,0,0,.07-.21v0a.19.19,0,0,1,0-.08.42.42,0,0,1,0-.1.34.34,0,0,1,.07-.11,1.62,1.62,0,0,1,.18-.19l.18-.15C73.85,43.37,73.78,43.12,73.59,42.9Z"/>
+                <path class="cls-21"
+                      d="M73,54a2,2,0,0,1,0,.4c0,.31-.19.81-.25,1.28,0,.21-.06.42-.08.62-.15-.86-.4-1.9-.66-2.93l-.16-.6.11,0a1.84,1.84,0,0,1,.94.61.91.91,0,0,1,.11.44A.79.79,0,0,1,73,54Z"/>
+                <path class="cls-21"
+                      d="M68.24,53.11h-.09A3.49,3.49,0,0,1,67,52.8a3.18,3.18,0,0,1-.58-.35,2.3,2.3,0,0,1-.52-.6,1.84,1.84,0,0,1-.15-.35s0-.07,0-.08l.09,0,.16,0a4.7,4.7,0,0,1,.71-.14l.61-.1.51-.09a2.28,2.28,0,0,0,1.25-.69,1.92,1.92,0,0,0,.18-.29,1.16,1.16,0,0,0,.18-.51v0h0a.27.27,0,0,0-.08-.19c0-.16-.1-.28-.12-.33a6.28,6.28,0,0,1-.66.23,2.79,2.79,0,0,1-1.18,0,1.84,1.84,0,0,1-.47-.15,3.7,3.7,0,0,1-.44-.28,1,1,0,0,1-.19-.14v0a9.28,9.28,0,0,1-2,0,16.2,16.2,0,0,1-3.42-1l-.45.3c-.23.15-.5.36-.78.58C62.11,51.1,65.12,53.17,68.24,53.11Z"/>
+                <path class="cls-9"
+                      d="M67.12,65.69c.22-.36.44-.76.65-1.19a1,1,0,0,1-.33-.27.63.63,0,0,1-.18-.34c0-.12.1-.13.1-.12s0,0,.12,0a1.55,1.55,0,0,0,.32-.14c.13-.07.28-.15.46-.23A9.51,9.51,0,0,0,68.8,57a5.17,5.17,0,0,1-1.08-.43,5.33,5.33,0,0,1-.56-.32l-.29-.18-.43-.32a9.75,9.75,0,0,1-.74-.64l-.35-.32,0,0v0l0,0-.11-.14c.46.13.94.28,1.29.36s.69.13,1,.17l.28,0a4.65,4.65,0,0,0-.55-.53,4.65,4.65,0,0,1,.55.53l.77.07a3.82,3.82,0,0,0,1.73-.24,2.71,2.71,0,0,0,1-.68l.08-.1c-.06-.17-.12-.34-.19-.52l-.31-.84h0c-.21.06-.48.12-.85.19a6.85,6.85,0,0,1-1.62.12c-3.12.06-6.13-2-8.53-4.58l-.49.39a15.19,15.19,0,0,1-1.8,1.48h0l-1.7.25.17.07s.16.09.17.11.12,0,.15,0,.11,0,0,.06l-.48.09-.89.16-.81.14-.62.09a6.94,6.94,0,0,1-2,.08,4.78,4.78,0,0,1-.81-.2,15.28,15.28,0,0,0-.42,1.65c0,.28-.1.57-.13.86a3.29,3.29,0,0,0,.67.53,5.38,5.38,0,0,0,1.85.65,9.68,9.68,0,0,0,1.4.1l.82,0c.34,0,.76-.05,1.16-.09a7.67,7.67,0,0,0,.95-.07l0,0a6.55,6.55,0,0,0-.56.6c-.31.26-.48.47-.79.72l-.74.6c-.45.35-.87.65-1.28.91a10.72,10.72,0,0,1-2.1,1c-.56.19-1,.31-1.22.39l-.12,0c.1.72.22,1.46.38,2.2a23,23,0,0,0,.76,2.84s0,0,.05,0a1.48,1.48,0,0,0,.42.19.36.36,0,0,1,.18.11.48.48,0,0,1,.17.41.37.37,0,0,1-.27.31.24.24,0,0,1-.14,0q.12.32.27.63l.18.35a6.9,6.9,0,0,0,1.1,1.62l.14.13c.18-.12.21-.21.21-.24l-.06-.2.21,0h.83a.18.18,0,0,1,.19.11,1.6,1.6,0,0,1-.26,1.3h0l.61.47a11.74,11.74,0,0,0,2.54,1.47l.15,0C61.86,71.54,64.79,68.61,67.12,65.69Zm-4.29-2a.81.81,0,0,1,.52-.46,3.24,3.24,0,0,1,.67,0h.32s0,0,.15,0a.18.18,0,0,1,.06.23c0,.07-.06.06-.09.08a.11.11,0,0,1-.06,0l-.07,0a1.63,1.63,0,0,1-.62.28,2.44,2.44,0,0,1-.94.07S62.76,63.83,62.83,63.66Zm-1.09,2.78a1,1,0,0,1,.78-.31l.36,0a2.15,2.15,0,0,1,.52.13c.11,0,.24.15.23.28a.5.5,0,0,1-.1.19l-.09.1a3.25,3.25,0,0,1-.42.31,1.18,1.18,0,0,1-.77,0s.34-.08.68-.22c.09-.08.23-.21.33-.32a.5.5,0,0,0,.07-.08v0l0,0a2.92,2.92,0,0,0-.45-.08l-.35,0a.73.73,0,0,0-.59.17,2.13,2.13,0,0,0-.52.88A1.22,1.22,0,0,1,61.74,66.44Zm-2.61,2.71a.42.42,0,0,0,.18,0,1.49,1.49,0,0,0,.46-.07s0,0,0,0,0,0,0-.06a.86.86,0,0,0-.28-.11c-.09,0-.14,0-.16,0s.26-.19.57,0a.4.4,0,0,1,.22.2.26.26,0,0,1-.07.24.58.58,0,0,1-.25.12l-.19,0a1.16,1.16,0,0,1-.4,0l-.1,0s0,0,0,0,0,0,0,0,0,0,0,0a.23.23,0,0,0,0-.07S59.06,69.16,59.13,69.15ZM57.7,62.89a.59.59,0,0,1-.18.14l-.27.21a.83.83,0,0,1-.42.2.91.91,0,0,1-.43-.11l-.31-.15c-.19-.09-.3-.15-.29-.18a1.21,1.21,0,0,1,.33.06l.34.1a.67.67,0,0,0,.33.05c.19,0,.37-.29.54-.42s0,0,0,0h0l-.19,0a3.23,3.23,0,0,0-.71,0,3.66,3.66,0,0,1-.75,0h-.18s0,.07,0,.07,0,0-.09-.06,0-.07,0-.08l.06,0,.15,0c.21,0,.47,0,.73-.08a2.63,2.63,0,0,1,.77-.06.81.81,0,0,1,.31.06.37.37,0,0,1,.16.1.2.2,0,0,1,.07.15A.24.24,0,0,1,57.7,62.89Z"/>
+                <path class="cls-21"
+                      d="M72.25,57a5.47,5.47,0,0,1-2.27.2A5.21,5.21,0,0,1,68.8,57a9.51,9.51,0,0,1-.54,6.37,2.93,2.93,0,0,1,.57-.18,1.15,1.15,0,0,1,.31,0l.33,0a1.78,1.78,0,0,1,.74.06c.16.18,0,.28,0,.29a.88.88,0,0,1-.2.1l-.3.09-.18.06-.11,0a4.68,4.68,0,0,0-.91.55.84.84,0,0,1-.6.22.33.33,0,0,1-.12,0c-.21.43-.43.83-.65,1.19-2.33,2.92-5.26,5.85-9.35,5.26l-.15,0a8.41,8.41,0,0,0,1.82.53,15.88,15.88,0,0,0,2.4.12,16.42,16.42,0,0,0,2.35-.22A5.89,5.89,0,0,0,68,69.45a28.34,28.34,0,0,0,2.4-3.28,15.37,15.37,0,0,0,2.22-5.6c.23-1.45.13-2.3.2-2.3C72.71,58.28,72.54,57.77,72.25,57ZM69,67.76a1.74,1.74,0,0,1-.14.27c0,.07-.15.14-.22.12s-.09,0-.09,0,.13,0,.18-.17,0-.15.07-.25,0-.24,0-.22,0,0,0,0-.08,0-.08,0l-.19.06a4,4,0,0,0-.41.17c-.31.13-.59.29-.62.25s.22-.26.5-.45a3.56,3.56,0,0,1,.62-.34,1,1,0,0,1,.2,0c.14,0,.35,0,.3.25A2.09,2.09,0,0,1,69,67.76Zm1.37-7.22a1,1,0,0,1-.57.29.39.39,0,0,1-.26-.11.27.27,0,0,1,0-.23c0-.12.09-.17.1-.16s0,.08,0,.17.07.11.16.1a.56.56,0,0,0,.24-.17l.11-.12s0,0,.06,0,0,0-.05,0l-.24-.1A2.64,2.64,0,0,1,69.6,60s.14-.07.3-.05l.27,0a3.56,3.56,0,0,1,.45.13A3.52,3.52,0,0,1,70.33,60.54Z"/>
+                <path class="cls-4"
+                      d="M73,2.19l-.42.4a4.62,4.62,0,0,0-.72,1,13.45,13.45,0,0,0-.62,1.26c-.13.34-.28.75-.43,1.18a2.55,2.55,0,0,0-.08.26s0,.07,0,0V6.22l0-.16,0-.32q0-.3-.06-.57a3,3,0,0,0-.1-.5,5.46,5.46,0,0,0-.21-.61,12.39,12.39,0,0,0-.83-1.76c.3,0,.61-.11.92-.15A8.43,8.43,0,0,1,71.8,2a1.48,1.48,0,0,1,.31,0l.41.05A3.64,3.64,0,0,0,73,2.19Z"/>
+                <path class="cls-8"
+                      d="M72.2,56.83a.66.66,0,0,0,0,.15,4.86,4.86,0,0,0-.63,0A10.19,10.19,0,0,1,70,56.92a5.15,5.15,0,0,1-2.09-.67c-.17-.11-.35-.21-.52-.33l-.24-.17-.08-.07a.77.77,0,0,1-.13-.12l0-.05.08,0,.16,0,.19,0a10.19,10.19,0,0,0,1.08.12,4.36,4.36,0,0,0,2-.22,3.23,3.23,0,0,0,1.07-.67Z"/>
+                <path class="cls-21"
+                      d="M70.86,81.84a.88.88,0,0,1,.41.16,1.21,1.21,0,0,0-.23-.53c-.18.11-.35.27-.52.39A1.22,1.22,0,0,1,70.86,81.84Z"/>
+                <path class="cls-9"
+                      d="M70.22,81.06a7.83,7.83,0,0,0-.86.38,9.05,9.05,0,0,1-1.64.62,5.61,5.61,0,0,1-1.34,0c-.36,0-.64,0-.84,0h-.12l-.32.06H65q.11.44.18.87l.09,0a16.47,16.47,0,0,0,5.1.56,1.33,1.33,0,0,0,.16-.17l.09-.11a.84.84,0,0,0-.26-.35,1.51,1.51,0,0,0-.48-.16c-.15,0-.25-.07-.25-.09s0,0,.06,0a.6.6,0,0,1-.25-.15.6.6,0,0,0,.25.15h.2a1.92,1.92,0,0,1,.33,0,3.09,3.09,0,0,1,.85-.1l.07-.12.08-.15a.69.69,0,0,0-.42-.35,1.72,1.72,0,0,0-.5,0,.38.38,0,0,0-.16,0s-.07,0-.08,0h0l0,0a.27.27,0,0,1,.17-.09l.22-.06c.17-.12.34-.28.52-.39a.81.81,0,0,0-.82-.41Z"/>
+                <path class="cls-21"
+                      d="M70.24,82.79a1.08,1.08,0,0,1,.27.07,1.05,1.05,0,0,1,.31.28l0-.08.23-.37A3.09,3.09,0,0,0,70.24,82.79Z"/>
+                <path class="cls-21"
+                      d="M65.29,83.13l1.41.77,2.42,0a2.26,2.26,0,0,0,1.07-.11,1,1,0,0,0,.2-.13A18.56,18.56,0,0,1,65.29,83.13Z"/>
+                <path class="cls-11" d="M70.72,83.58h0s0,0,0,0Z"/>
+                <path class="cls-8"
+                      d="M66.33,51.88a1.41,1.41,0,0,0,.36.37,2.64,2.64,0,0,0,1.53.43,3.93,3.93,0,0,0,1.47-.4,4.92,4.92,0,0,0,.67-.41l-.47-1.26a2.94,2.94,0,0,1-1.93.82l-1.08.1-.48,0-.12,0s-.11,0-.07,0A.57.57,0,0,0,66.33,51.88Z"/>
+                <path class="cls-11" d="M69.72,47.3h0v0Z"/>
+                <path class="cls-9"
+                      d="M69.72,48.06v.08c0,.1-.13.22-.13.22l-.26.18a1.66,1.66,0,0,1-.79.36,1.32,1.32,0,0,1-1-.09.9.9,0,0,1-.27-.2.34.34,0,0,1,0-.15h0c.25-.08.49-.17.69-.25a8.55,8.55,0,0,0,1.35-.5c0,.06.07.12.1.13l.06,0,0,0h0A.76.76,0,0,1,69.72,48.06Z"/>
+                <path class="cls-9"
+                      d="M69.39,63.42h0l0,0h0l-.09,0a4.78,4.78,0,0,0-.92.64c-.16.12-.31.24-.45.23a.8.8,0,0,1-.38-.23.78.78,0,0,1-.2-.26.15.15,0,0,1,0-.11s0,0,.13,0a1.25,1.25,0,0,0,.36-.09,5.22,5.22,0,0,1,1-.31h.53Z"/>
+                <path class="cls-4"
+                      d="M69,31.47a34.74,34.74,0,0,0-.39-3.57,11,11,0,0,0-1.17-3.44A7.92,7.92,0,0,0,65,21.83l0,0A9.1,9.1,0,0,0,63,20.71c.63.43,1,.95.63,1.72A2.58,2.58,0,0,1,62,23a11.14,11.14,0,0,1,1.27.46,11.65,11.65,0,0,1,1.62.88A5.56,5.56,0,0,1,66,25.61a10.8,10.8,0,0,1,1.14,2.52,16.49,16.49,0,0,1,.59,2.52,3.9,3.9,0,0,1-.18,2s-.16.24-.57.53c-.88,3.64-4.89,6-8.72,6.17.9.39,1.75.75,2.54,1.05A15.08,15.08,0,0,0,63,41a6.93,6.93,0,0,0,1.74.15,5.22,5.22,0,0,0,1.12-.1c.25,0,.37-.11.38-.1a3,3,0,0,1,.29-.42c.19-.28.46-.68.76-1.2a13.51,13.51,0,0,0,1.65-4.65A13.85,13.85,0,0,0,69,31.47Z"/>
+                <path class="cls-10"
+                      d="M67,33.13l-.28.19a7.53,7.53,0,0,1-2.83,1,12.77,12.77,0,0,1-4.43-.18,23,23,0,0,1-2.54-.58,9.39,9.39,0,0,1-2.61-1.13h0l-.86-.58c-.15-.1-.29-.22-.43-.32l-.21-.16-.33-.27c0-.14,0-.29,0-.43s0-.19,0-.29.08-.36.13-.54a10,10,0,0,1,.38-1,12.46,12.46,0,0,1,4.25-4.91,6.51,6.51,0,0,1,1.94-1,4.76,4.76,0,0,1,2.12-.1A5.29,5.29,0,0,1,62,23a2.58,2.58,0,0,0,1.66-.55c.38-.77,0-1.29-.63-1.72a7.77,7.77,0,0,0-2.92-.59,29,29,0,0,0-4.62.59,20,20,0,0,0-2,.55c-4.69,2.54-5.84,9.65-2.1,12.86a35.13,35.13,0,0,0,6.93,5.17h0C62.1,39.12,66.11,36.77,67,33.13Z"/>
+                <path class="cls-4"
+                      d="M53.44,21.26c-.4.14-.76.28-1.06.41-.7.31-1.08.56-1.14.58s-.57.33-1.36.94a24.3,24.3,0,0,0-3,2.81,25.21,25.21,0,0,0-1.74,2.1c-.14.2-.29.4-.43.61l-.11.14v0s0,0,0,.05l0,0,.23.27.52.6A48.11,48.11,0,0,0,50,34.5a24.1,24.1,0,0,0,2.66,2c.22.15.46.29.69.43l.7.38c.48.25,1,.48,1.45.7.95.45,1.87.88,2.75,1.27a35.13,35.13,0,0,1-6.93-5.17C47.6,30.91,48.75,23.8,53.44,21.26Z"/>
+                <path class="cls-21"
+                      d="M67.37,71.75l.07-.16s.16-.27.37-.65.31-.55.48-.87a5.08,5.08,0,0,1-1.66,1.26,9.59,9.59,0,0,1-2.31.74l-.66.11c0,.15,0,.36,0,.61,0,.61.11,1.49.2,2.56,0,.53.09,1.11.14,1.73,0,.27,0,.55.08.84l.08.29,0,.25c0,.17.08.33.11.5l0,.19C64.54,76.14,64.55,72.7,67.37,71.75Z"/>
+                <path class="cls-9"
+                      d="M64.4,79.15c.2,1,.41,2,.62,3h.07v0a.13.13,0,0,0,0-.06c0-.15,0-.37,0-.69,0-.6,0-1.52.08-2.83a25.11,25.11,0,0,1,.33-2.81,1.48,1.48,0,0,0,0-.27c-.18.15-.31.23-.33.16a10.11,10.11,0,0,1,1.16-2c.29-.48.55-1,.74-1.38.1-.23.19-.41.25-.53C64.55,72.7,64.54,76.14,64.4,79.15Z"/>
+                <path class="cls-12"
+                      d="M67.54,31.84s0,.75,0,.76a9.45,9.45,0,0,1-.92.58c-.18.1-.39.2-.62.3a5.74,5.74,0,0,0,1-3.41A13.61,13.61,0,0,1,67.54,31.84Z"/>
+                <path class="cls-13"
+                      d="M67.06,30.07a5.74,5.74,0,0,1-1,3.41c-.23.09-.48.18-.76.26l.14-.11a10.05,10.05,0,0,1-2.5.35H62a5.25,5.25,0,0,1-1.9-4.7c.14-2.6,1.6-4.63,3.4-4.74a6.68,6.68,0,0,1,.78.47,4.12,4.12,0,0,1,.85,1l.12.15.24.45.08.15A21.9,21.9,0,0,1,67.06,30.07Z"/>
+                <path class="cls-9"
+                      d="M66.43,48.23h-.06a9.52,9.52,0,0,1-1.93-.13,15.12,15.12,0,0,1-2.81-.9l1.3-.85a15.58,15.58,0,0,0,1.3,1.21,3.65,3.65,0,0,0,1,.49,4,4,0,0,0,1.07.17Z"/>
+                <path class="cls-9"
+                      d="M64.74,41.44l1.6.64a.3.3,0,0,0-.22.11.83.83,0,0,0-.18.34s.07,0,.15.07l-.16.15s0,0,0,0l0,0-.46.79A15.13,15.13,0,0,0,63.2,44l-.09-.75s0,0,0,0a4.16,4.16,0,0,0-1.24-.48l-.62-.16.38-1.42a9.31,9.31,0,0,0,1.26.28A7.51,7.51,0,0,0,64.74,41.44Z"/>
+                <path class="cls-9"
+                      d="M56.11,99.62a8.93,8.93,0,0,1-1.69,2.72c-.27.33-.5.6-.64.8,0,0,0,0,0,0,1.56.29,3.17.49,4.78.74l.9.14.19,0h.3l.32,0c.6,0,1.21-.08,1.81-.13l1.4-.14c0-.07.08-.17.14-.28s.35-.62.59-1,.52-.93.77-1.47a6.78,6.78,0,0,0,.33-.85,5,5,0,0,0,.17-.92,3.55,3.55,0,0,0-.13-1.79,3.19,3.19,0,0,0-.4-.73A29.32,29.32,0,0,1,56.4,98,7.53,7.53,0,0,1,56.11,99.62Z"/>
+                <path class="cls-21"
+                      d="M63.68,95.52c-.32.07-.64.14-1,.19a18.79,18.79,0,0,1-6.09.11l-1-.17a1.82,1.82,0,0,1,.56.8A3.81,3.81,0,0,1,56.4,98a29.32,29.32,0,0,0,8.53-1.29,5,5,0,0,0-.5-.59A2.52,2.52,0,0,0,63.68,95.52Z"/>
+                <path class="cls-13"
+                      d="M65.4,33.63l-.14.11-.34.1h0a15.44,15.44,0,0,1-2,.14A10.05,10.05,0,0,0,65.4,33.63Z"/>
+                <path class="cls-13" d="M65.26,33.74l-.06,0-.28.05Z"/>
+                <path class="cls-11" d="M64.81,7.55v0l-.29,0v0Z"/>
+                <path class="cls-9"
+                      d="M64.39,63.38s0,0,0,0a.49.49,0,0,0,0,.11h0l-.28,0a.53.53,0,0,0,.14-.12l.13-.07s0,0,0,0A.21.21,0,0,0,64.39,63.38Z"/>
+                <path class="cls-13"
+                      d="M64.91,33.84a6.6,6.6,0,0,1-.84.16H64a.29.29,0,0,0-.24,0h-.05l-.5,0-.55,0a3.85,3.85,0,0,1-.48,0L62,34h.86A15.44,15.44,0,0,0,64.91,33.84Z"/>
+                <path class="cls-4" d="M64.21,2.78c.09.73.19,1.81.26,3.32A13.48,13.48,0,0,0,63,2.73Z"/>
+                <path class="cls-13" d="M64.07,34l-.14,0h-.16A.29.29,0,0,1,64,34Z"/>
+                <path class="cls-9"
+                      d="M64,63.47a1,1,0,0,1-.36.2c-.35.12-.73.21-.84.26.07-.09.25-.46.6-.5A3.94,3.94,0,0,1,64,63.47Z"/>
+                <path class="cls-9"
+                      d="M63.11,43.2l.09.75c-.25,0-.49.1-.74.16l-1,.27c-.47-.39-.81-.64-.86-.58a6.65,6.65,0,0,0,.58.66l-.8.25c-.58.19-1,.36-1,.37a8.64,8.64,0,0,0-1,.5l-.41.28c-1.2-.39-2.46-.76-3.71-1.11-.23-.07-.49-.13-.67-.2L53,44.27l-1.32-.59-.15-.07c.7-.19,1.36-.35,1.9-.47.78-.17,1.32-.22,1.35-.23s.56-.1,1.36-.19A20.23,20.23,0,0,1,59,42.65a23,23,0,0,1,2.86.31C62.52,43.08,63,43.2,63.11,43.2Z"/>
+                <path class="cls-9"
+                      d="M58.34,24.17a10.38,10.38,0,0,0-2.21,1.64,10.46,10.46,0,0,0-2.48,3.28,6.91,6.91,0,0,0-.37.95c-.05.16-.09.32-.13.48l0,.24v.09l.28.22.41.32.84.59,0,0a7.78,7.78,0,0,0,2,.94C55.22,30.34,55.79,26.77,58.34,24.17Z"/>
+                <path class="cls-12"
+                      d="M60.14,29.28c.14-2.6,1.6-4.63,3.4-4.74l-.66-.32a4.94,4.94,0,0,0-3.44-.5,5.42,5.42,0,0,0-1.1.45c-2.55,2.6-3.12,6.17-1.72,8.77l.44.15a25,25,0,0,0,2.47.64,15.7,15.7,0,0,0,2.66.35L62,34A5.25,5.25,0,0,1,60.14,29.28Z"/>
+                <path class="cls-11" d="M62.78,64s0,0,0,0S62.79,64,62.78,64Z"/>
+                <path class="cls-21"
+                      d="M56.06,86.71a.77.77,0,0,0,.07.17,2.8,2.8,0,0,0,.14.25h0l0,0,.09-.07.18-.16L58,85.67l1.12-.93.39-1.26A10.16,10.16,0,0,1,56.06,86.71Z"/>
+                <path class="cls-21"
+                      d="M56.23,86.1a.61.61,0,0,0-.19.38.36.36,0,0,0,0,.12.52.52,0,0,0,0,.11A10,10,0,0,0,58.24,85a5.44,5.44,0,0,1-1.86.9A1.91,1.91,0,0,0,56.23,86.1Z"/>
+                <path class="cls-21"
+                      d="M54.78,86a1.85,1.85,0,0,0-.16.3s0,0-.06.13a.77.77,0,0,0-.08.29.76.76,0,0,0,0,.15l.19,0,.45.07.91.12L55.93,87a.82.82,0,0,1-.21-.57c0-.07.11-.28.3-.46A4.7,4.7,0,0,1,54.78,86Z"/>
+                <path class="cls-21"
+                      d="M54,86.13v.21l.29.39a1,1,0,0,1,.08-.53.84.84,0,0,1,.1-.15l0,0a4.05,4.05,0,0,1-.5-.12A2.11,2.11,0,0,0,54,86.13Z"/>
+                <path class="cls-9"
+                      d="M61.28,75c0-.91-1.08-1.83-1.83-2.75h-.14a9.7,9.7,0,0,1-2.18-.62c.27.51.62,1.24.93,2s.57,1.42.76,2,.28,1,.29,1a24.51,24.51,0,0,1,.13,3.16,9.25,9.25,0,0,1-.26,3h0a12.54,12.54,0,0,1-1.75,1.15s-1.93.78-2,.62a1,1,0,0,0-.7.18,1.14,1.14,0,0,0-.45.64,3.12,3.12,0,0,0-.1.48v0a4.05,4.05,0,0,0,.5.12,2.28,2.28,0,0,1,.22-.23c.21-.17.48-.24.49-.2s-.19.18-.33.37a.86.86,0,0,0-.07.1A4.7,4.7,0,0,0,56,86c.21-.2.45-.36.49-.25l-.13.16a5.44,5.44,0,0,0,1.86-.9,9.79,9.79,0,0,0,1.23-1.51c.07-.22.11-.35.12-.37s0,0,0-.14l0,0s0,0,0,0l0-.07v0c0-.07.05-.14.08-.22.11-.32.28-.75.48-1.27l.69-1.76c.09-.25.19-.5.29-.74A13.51,13.51,0,0,0,61.28,75Z"/>
+                <path class="cls-21"
+                      d="M61.86,72.35a15,15,0,0,1-2.41-.06c.75.92,1.83,1.84,1.83,2.75a13.51,13.51,0,0,1-.05,3.76c0-.09.07-.16.1-.25l.21-.5,0-.09s0,0,0,0h0v-.07l0-.26c.22-1.44.43-2.87.58-3.94l.21-1.34C62.24,72.33,62.05,72.35,61.86,72.35Z"/>
+                <path class="cls-9"
+                      d="M61.55,44.91l1,1.08-1.14.62-.53.3-1.12-.44-1.06-.37c.5-.26.87-.41.9-.42s.38-.18.93-.4Z"/>
+                <path class="cls-11" d="M60.66,82.93a.19.19,0,0,1,0,.08h0l0,0Z"/>
+                <path class="cls-23"
+                      d="M60.21,47.39l-.67-.22c-.44-.15-.89-.28-1.34-.41.36.47.75.93,1.15,1.39.27-.26.54-.5.77-.69Z"/>
+                <path class="cls-9"
+                      d="M57.85,46.65l-1,.64a20.84,20.84,0,0,1-2.69,1.65l-.33.19a3.46,3.46,0,0,0,.42.57c.08.07.15.16.24.23a2.34,2.34,0,0,0,.38.28,3.84,3.84,0,0,0,.8.43l1.7-.25a8.94,8.94,0,0,1,1.49-1.81c.14-.15.29-.29.44-.43-.4-.46-.79-.92-1.15-1.39Z"/>
+                <path class="cls-11" d="M59.23,69.29s.08.12,0,0Z"/>
+                <path class="cls-4"
+                      d="M58.47,6.77c0,.08.11.28,0,.12s-.28-.28-.58-.53l-.15-.13L57.39,6l-.45-.34L56.06,5a13.29,13.29,0,0,0-1.62-1A20.13,20.13,0,0,0,52.38,3a14.93,14.93,0,0,1,3.11-.49c.41,0,.81,0,1.2,0,.19.34.39.77.61,1.28.31.7.73,1.82,1,2.46,0,0,.06.15.12.31Z"/>
+                <path class="cls-9"
+                      d="M53.3,45.45h0c-.07.14-.19.39-.37.74.06.21.11.45.18.75a11,11,0,0,0,.55,1.74,3.84,3.84,0,0,0,.23.45l.33-.19a17.91,17.91,0,0,1,2.42-2l.57-.44c-1-.29-2.09-.55-3.16-.82C53.79,45.59,53.57,45.54,53.3,45.45Z"/>
+                <path class="cls-8"
+                      d="M56.37,55.13l0,0-.55.45a17.59,17.59,0,0,1-2.47,1.68,7,7,0,0,1-2.05.64,9.74,9.74,0,0,1-1.23.12H50q-.06-.6-.09-1.17a14.88,14.88,0,0,1,0-2l.51.21a7.34,7.34,0,0,0,2.14.42,11.87,11.87,0,0,0,1.45,0l.82-.06.63-.07.55-.14Z"/>
+                <path class="cls-8"
+                      d="M51.37,99.16a10.08,10.08,0,0,1-2.88,1.66l-.68.25c.17.1.34.2.52.29a13.43,13.43,0,0,0,3.16,1.31c.51.14,1,.26,1.57.37a12,12,0,0,1,.9-1.1,8.63,8.63,0,0,0,1.71-2.47A7.56,7.56,0,0,0,56,98a28,28,0,0,1-3.62-.3A3.85,3.85,0,0,1,51.37,99.16Z"/>
+                <path class="cls-18"
+                      d="M56,96.53a1.77,1.77,0,0,0-.6-.94c-.32-.08-.62-.16-.9-.25l-1.59-.46-.43-.13a3.81,3.81,0,0,1,.22,1.39,4.18,4.18,0,0,1-.25,1.53h0A28,28,0,0,0,56,98,3.55,3.55,0,0,0,56,96.53Z"/>
+                <path class="cls-9"
+                      d="M53.22,69.16c-.24-.21-.47-.41-.7-.64l-.19-.21a2.77,2.77,0,0,1-.31.53s0,.09,0,.12a.66.66,0,0,0,.24.45.48.48,0,0,0,0,.13l.28.46c.21.34.45.64.4.81s-.57.12-1-.1a4.06,4.06,0,0,1-.57-.35,1.73,1.73,0,0,1-.29-.31l0-.12v0l0,0-.65.61a.05.05,0,0,0,0,0h0l0,.07a2,2,0,0,0-.16.3.75.75,0,0,0,.13.82,3,3,0,0,0,.25.24l.3.23c.18.15.36.29.52.4.32.23.55.35.54.43s-.32.14-.74,0a4.64,4.64,0,0,1-.69-.23l-.38-.17a1.87,1.87,0,0,1-.39-.23,1.7,1.7,0,0,1-.62-.75l-.42.4-.72.68,0,.1a2.72,2.72,0,0,0,.53.93c.54.64,1.4,1.07,1.33,1.25s-1,.06-1.94-.55a3.46,3.46,0,0,1-.85-.86c-.28.26-.56.55-.85.86l-.23.24.09.31a2.57,2.57,0,0,0,.44.75,3.75,3.75,0,0,0,.74.58c.23.14.39.16.43.24s-.18.27-.54.26A2.43,2.43,0,0,1,46,76.54a3,3,0,0,1-.88-.8c-.55.63-1.13,1.31-1.72,2a2.58,2.58,0,0,0,.34,1,2.52,2.52,0,0,0,.68.76,3.24,3.24,0,0,0,1.08.5l.19,0C49.53,77,53.38,73.65,53.22,69.16Z"/>
+                <path class="cls-21"
+                      d="M54.53,70.2c-.46-.33-.89-.68-1.31-1C53.38,73.65,49.53,77,45.73,80a7.91,7.91,0,0,0,2.12.22,5.43,5.43,0,0,0,.79-.09c.75-1,1.67-1.94,2.56-2.9.71-.76,1.34-1.55,1.94-2.33a24.19,24.19,0,0,0,1.51-2.14,13.28,13.28,0,0,0,.83-1.59c.05-.12.09-.22.13-.3C55.24,70.69,54.88,70.45,54.53,70.2Z"/>
+                <path class="cls-8"
+                      d="M55.33,50.73s.15,0,.05,0l-.29,0-.55.08-.51,0-.6,0a4.77,4.77,0,0,1-1.8-.19,3,3,0,0,1-.72-.4c.08-.22.17-.42.25-.62.41-.88.85-1.72,1.17-2.38l.08-.18s0,0,0,0c.22.44.46,1,.85,1.69a4.45,4.45,0,0,0,.81,1,3.11,3.11,0,0,0,.28.23l.21.16a3.66,3.66,0,0,0,.52.28l.09,0Z"/>
+                <path class="cls-9"
+                      d="M54.48,67.85a1.35,1.35,0,0,1-.2.91l0,0c-.23-.2-.46-.4-.67-.61a.71.71,0,0,0,.27-.33C54,67.86,54.31,67.86,54.48,67.85Z"/>
+                <path class="cls-9"
+                      d="M44.76,93.09l0,0a5.69,5.69,0,0,1-1.68.54,6.4,6.4,0,0,1-1.57,0c-.29,0-.56-.07-.78-.11.21.7.4,1.33.48,1.5a3,3,0,0,1,.16.56l.1.47c.07.31.14.61.2.92L42,98.89l.06.3v.06s0,0,0,0l.08-.1.6-.77.56-.74.4.84.8,1.7c0-.52,0-1,0-1.56.44.39.91.84,1.34,1.17.2.17.44.34.62.47l.35.24.22.15h0l.16,0c.25-.07.6-.18,1-.33a9.58,9.58,0,0,0,2.79-1.45A3.1,3.1,0,0,0,52,97.61c-.61-.1-1.22-.21-1.84-.35A8.67,8.67,0,0,1,44.76,93.09Z"/>
+                <path class="cls-21"
+                      d="M52.37,94.74l-.48-.16a1.22,1.22,0,0,1-.32-.12h0l-.19-.23a2.27,2.27,0,0,1-.79-.37,7.72,7.72,0,0,1-1.46-1.31A18.44,18.44,0,0,1,47.9,91c-.31-.44-.51-.75-.53-.77s-.12-.21-.29-.54c-.07.24-.18.57-.32,1-.07.2-.15.42-.23.66a3.87,3.87,0,0,1-.58.93,3.1,3.1,0,0,1-1.19.84,8.67,8.67,0,0,0,5.41,4.17c.62.14,1.23.25,1.84.35a4.13,4.13,0,0,0,.39-1.48A9.38,9.38,0,0,0,52.37,94.74Z"/>
+                <path class="cls-11" d="M51.65,65.2a0,0,0,0,0,0,0h0S51.64,65.21,51.65,65.2Z"/>
+                <path class="cls-11" d="M49.92,2.18h0Z"/>
+                <path class="cls-21"
+                      d="M46.46,53l0,0-.11.11-.07.08s0,0,0,.06a1.23,1.23,0,0,0,.06.21,2.61,2.61,0,0,0,.27.52c.25.39.92.85,1.43,1.53a3.19,3.19,0,0,1,.53,1.12,4.3,4.3,0,0,1,.1,1c0,.15,0,.29,0,.41a1.13,1.13,0,0,1,0,.18.19.19,0,0,1,0,.09.09.09,0,0,1,0,.06h0a1.81,1.81,0,0,1,.24.24.47.47,0,0,1,.12.23h0c-.09-.64-.15-1.28-.19-1.91,0-.24,0-.48,0-.7,0-.06,0-.1,0-.16h0L48.63,56l-.16-.19-.29-.39a8.57,8.57,0,0,1-.52-.76l-.12-.2c0-.08-.06-.11-.12-.25a1,1,0,0,1-.06-.68c.06-.2.3-.32.48-.45l.27-.18,1-.65h0a16.36,16.36,0,0,1,.47-1.71C48.48,51.65,48.39,53.72,46.46,53Z"/>
+                <path class="cls-9"
+                      d="M48.71,51c-.48.38-1,.79-1.42,1.18l-.6.56-.23.22c1.93.73,2-1.34,3.09-2.46a1.87,1.87,0,0,1,.07-.22C49.35,50.51,49,50.76,48.71,51Z"/>
+                <path class="cls-9"
+                      d="M48.42,59.84a1.18,1.18,0,0,0,.09-1.3l-.22-.16a.85.85,0,0,0-.54-.19,1.52,1.52,0,0,0-.57.18c-.18.09-.35.18-.38.26s0,.14.07.21l.1.08s0,.1-.06.17-.12.11-.15.09a1,1,0,0,1-.13-.14.62.62,0,0,1-.12-.2.41.41,0,0,1,0-.34,1.08,1.08,0,0,1,.54-.38l0,0,.1-.11c0-.07,0-.2-.07-.34s0-.27-.15-.39-.16,0-.22.08l-.18.19-.26.25a1.08,1.08,0,0,0-.21.29c-.06.12-.11.26-.17.4C46.45,59.42,47.11,60.28,48.42,59.84Z"/>
+                <path class="cls-21"
+                      d="M49.09,59.8s0,0,0,0q-.09-.47-.15-.93h0a.35.35,0,0,1,0,.18.35.35,0,0,1-.07.14s.11-.25-.13-.47l-.21-.17a1.18,1.18,0,0,1-.09,1.3c-1.31.44-2-.42-2.46-1.37-.05.13-.1.28-.15.42a4.29,4.29,0,0,0-.13.44.59.59,0,0,0,0,.35,1.07,1.07,0,0,0,.64.48,4.52,4.52,0,0,0,1,.2,7.76,7.76,0,0,0,1.08,0c.33,0,.69-.12.71-.24v0C49.12,60,49.1,59.9,49.09,59.8Z"/>
+                <path class="cls-8"
+                      d="M45.47,80.33a3.52,3.52,0,0,1-1.23-.51,2.69,2.69,0,0,1-.83-.86,3.21,3.21,0,0,1-.34-.72c-.44.57-.89,1.16-1.3,1.79q-.24.36-.45.75a2.85,2.85,0,0,0,.37.66,3.4,3.4,0,0,0,2.05,1.35,4.13,4.13,0,0,0,.69.11A11.59,11.59,0,0,1,46,80.42C45.84,80.39,45.65,80.37,45.47,80.33Z"/>
+                <path class="cls-18"
+                      d="M46.29,82.76c.39-.07.71-.15.91-.2a7.28,7.28,0,0,1,.36-.76,9.44,9.44,0,0,1,1-1.5,5.51,5.51,0,0,1-.69.14,6.71,6.71,0,0,1-1.84,0,11.59,11.59,0,0,0-1.59,2.48A7.15,7.15,0,0,0,46.29,82.76Z"/>
+                <path class="cls-8"
+                      d="M42.63,88.27a4.1,4.1,0,0,1-2.8-.74,2.08,2.08,0,0,1-.41-.35c0,.28,0,.56,0,.83a11.84,11.84,0,0,0,.41,2.9h0l.13.34c.08.19.32,1,.57,1.81a8.75,8.75,0,0,0,1,.17,5.82,5.82,0,0,0,1.46,0,5.93,5.93,0,0,0,1.6-.46l0,0a10.9,10.9,0,0,1-1.24-4.6Z"/>
+                <path class="cls-18"
+                      d="M45.93,91.88a2.74,2.74,0,0,0,.39-.64c.1-.23.18-.45.27-.66.18-.42.32-.75.43-1l-.1-.19a6.53,6.53,0,0,1-.51-2,.28.28,0,0,1,0-.09,3.91,3.91,0,0,1-1,.4,14.78,14.78,0,0,1-2.06.43,10.9,10.9,0,0,0,1.24,4.6A3.46,3.46,0,0,0,45.93,91.88Z"/>
+                <path class="cls-9"
+                      d="M44.3,83.18a4.48,4.48,0,0,1-.63-.06,3.68,3.68,0,0,1-2.33-1.42,2.41,2.41,0,0,1-.28-.43c-.21.4-.4.81-.58,1.24a27.15,27.15,0,0,0-.87,3,5,5,0,0,0-.16,1,3.19,3.19,0,0,0,.64.65,3.89,3.89,0,0,0,2.53.76l.74-.06A11.13,11.13,0,0,1,44.3,83.18Z"/>
+                <path class="cls-21"
+                      d="M46.25,87.35a1.56,1.56,0,0,1,.15-.06,5.07,5.07,0,0,1,.37-2.64v-.3a3.61,3.61,0,0,1,.38-1.69,6.1,6.1,0,0,1-.81.28,6.61,6.61,0,0,1-2,.24,11.13,11.13,0,0,0-.94,4.7c.74-.07,1.45-.18,2-.29C45.74,87.5,46,87.42,46.25,87.35Z"/>
+                <rect class="cls-11" x="46.74" y="72.88" width="0.01" height="0.01"/>
+                <path class="cls-11" d="M45.82,6.58h0c-.19.17-.37.36-.56.54C45.44,6.94,45.62,6.75,45.82,6.58Z"/>
+                <path class="cls-11" d="M41.07,80.26h0l-.13.28.13-.28Z"/>
+                <path class="cls-11" d="M40.93,80.57c0,.08-.06.16-.1.25h0Z"/>
+                <circle class="cls-9" cx="62.2" cy="27.25" r="0.91"/>
+                <circle class="cls-9" cx="62.76" cy="28.68" r="0.18"/>
+                <path class="cls-13" d="M73.88,22.78h0Z"/>
+                <path class="cls-13"
+                      d="M77.45,31.24a5.92,5.92,0,0,0,1.7-4.14c.09-2.17-1.34-4.54-2.93-5h0a5.88,5.88,0,0,0-2.18.61h0a.36.36,0,0,0-.11.1h0c-.09.37-.18.75-.24,1.1s-.08.43-.11.64a15.3,15.3,0,0,0,.83,7.33,13.51,13.51,0,0,0,2.15-.35C76.81,31.44,77.12,31.35,77.45,31.24Z"/>
+                <path class="cls-13"
+                      d="M73.53,24.53c-.26,1.61-.34,2.7-.35,2.77s-.16,1.29-.26,3.11h0a2.34,2.34,0,0,0,1,1.47h.11l.29,0A15.3,15.3,0,0,1,73.53,24.53Z"/>
+                <path class="cls-9"
+                      d="M74.29,25.41a.81.81,0,0,0-.36,1.09.8.8,0,0,0,1.09.35.81.81,0,0,0,.36-1.09A.8.8,0,0,0,74.29,25.41Z"/>
+                <circle class="cls-9" cx="73.86" cy="27.51" r="0.19"/>
+                <g id="_Group_2" data-name="&lt;Group&gt;">
+                    <path class="cls-4" d="M85.28,6.09,85.39,6l-.11.1Z"/>
+                    <path class="cls-4"
+                          d="M86,5.69l-.7.38A.22.22,0,0,0,85.18,6l-.09,0a3.17,3.17,0,0,0-.1-.38s.06,0,.15-.1h.15A.73.73,0,0,1,86,5.69Z"/>
+                    <path class="cls-4"
+                          d="M84.76,9.71l-.14-.25h0c.06-.43.24-1.16.42-1.86a4.84,4.84,0,0,0,.08-1.43l0-.22.09,0a.22.22,0,0,1,.08.09l-.07,0h0l.07,0v0l.11-.1-.11.07,0,0,.7-.38a.73.73,0,0,0-.67-.24h-.13l.27-.12c.26-.11.49-.13.5-.07a2.64,2.64,0,0,1,.09.85,4.77,4.77,0,0,1-.32,1.66A11.52,11.52,0,0,1,84.76,9.71Z"/>
+                    <path class="cls-4" d="M84.62,9.46l.14.25c-.06.09-.1.12-.13.11S84.59,9.67,84.62,9.46Z"/>
+                    <path class="cls-4"
+                          d="M84.7,20.43c0-.76,0-1.53,0-1.84h0l.05,0a11.48,11.48,0,0,1,.14,1.91c0,.5,0,1,0,1.39s-.06.65-.06.67a5.15,5.15,0,0,1-.1.65c-.06.38-.18.88-.31,1.37s-.32.95-.46,1.3a3.35,3.35,0,0,1-.26.57,16.82,16.82,0,0,1,.43-1.68c0,.13,0,.19.06.19s0-.22,0-.61a11.2,11.2,0,0,0,.2-1.18c0-.38.07-.64.08-.65s0-.27.07-.65S84.68,20.93,84.7,20.43Z"/>
+                    <path class="cls-4"
+                          d="M84.49,10.2a10.26,10.26,0,0,1-.56-1.74,3,3,0,0,1,.69,1h0c0,.21,0,.34,0,.36s.07,0,.13-.11l.16.31a12.08,12.08,0,0,1,.5,1.21c.11.34.16.59.17.6a4,4,0,0,1,0,.64,6.24,6.24,0,0,1-.18,1.31,4.82,4.82,0,0,1-.56,1.76,10.51,10.51,0,0,1,.1-1.82,7.64,7.64,0,0,0,0-1.22,4.42,4.42,0,0,0-.1-.54,4.71,4.71,0,0,0-.11-.57C84.76,11.06,84.63,10.63,84.49,10.2Z"/>
+                    <path class="cls-4"
+                          d="M85.09,5.94A1.71,1.71,0,0,0,84,6.05a2.93,2.93,0,0,0-1.1.74,1.14,1.14,0,0,0-.23.35l-.51-.72a2.32,2.32,0,0,0,.44-.09,11.1,11.1,0,0,0,1.32-.49,5.33,5.33,0,0,1,1.27-.38c-.09,0-.15.08-.15.1A3.17,3.17,0,0,1,85.09,5.94Z"/>
+                    <path class="cls-4" d="M82.94,32.73l.21-.76c.26.27.48.51.51.53Z"/>
+                    <path class="cls-4"
+                          d="M84.39,3a3.84,3.84,0,0,1,1.9.21,2.52,2.52,0,0,1,1.27,1.4,5.66,5.66,0,0,1,.34,1.35c.1.76.12,1.22.12,1.26a18.41,18.41,0,0,1-.09,2,23,23,0,0,1-.78,4.08,21.5,21.5,0,0,1-1.48,3.82,8.88,8.88,0,0,1-.88,1.45q0-.09,0-.09s0,0,0,.14h0s-.07.05-.08,0a6.85,6.85,0,0,1,.53-1.75,30.59,30.59,0,0,0,1.06-3.83,26.5,26.5,0,0,0,.47-4c0-1.08,0-1.82,0-1.87s0-.49,0-1.15-.19-1.59-.85-1.92a2.89,2.89,0,0,0-1.36-.23c-.52,0-1.08.08-1.62.14s-1.09.11-1.59.16l-.18,0h-.3l-.45,0,.38.65c.15.25.22.4.19.43s-.16-.08-.37-.27S80,4.6,79.66,4.2l.23.06c.19.06.32.08.35,0s0-.15-.18-.32l-.2-.16,1.29-.24c.48-.1,1-.19,1.54-.32S83.8,3,84.39,3Z"/>
+                    <path class="cls-4"
+                          d="M84.9,43.13s-.31-.05-.75-.15-1-.21-1.63-.3-1.21-.15-1.68-.19l-.8-.06-.79-.1a5.52,5.52,0,0,0-1.61,0,13.75,13.75,0,0,0-1.43.34V42.4a9.31,9.31,0,0,1,1.33-.48,6.1,6.1,0,0,1,.93-.18,7.85,7.85,0,0,1,.83,0l.81,0s.34,0,.81.12,1.08.19,1.68.34a11.12,11.12,0,0,1,1.64.5C84.67,42.91,84.93,43.09,84.9,43.13Z"/>
+                    <path class="cls-4"
+                          d="M78.18,41.25c-.42.06-1,.15-1.51.28l-.6.13c0-.13-.07-.26-.11-.38l.59-.2a14.38,14.38,0,0,1,1.52-.42l.73-.16s.32,0,.76,0a10.16,10.16,0,0,1,1.59.09,7.39,7.39,0,0,1,2.19.57A14.82,14.82,0,0,1,81.12,41a9.93,9.93,0,0,0-1.51.06c-.42,0-.69.1-.71.1Z"/>
+                    <path class="cls-4"
+                          d="M76.85,43.15l.14,0,.32.08a6.78,6.78,0,0,1,.86.32c.61.25,1.15.62,1.1.7A4.81,4.81,0,0,1,78,44l-.85-.17-.38,0-.38,0a3.22,3.22,0,0,0-.44,0h0a3.49,3.49,0,0,0,.18-.57A2.84,2.84,0,0,1,76.85,43.15Z"/>
+                    <path class="cls-4"
+                          d="M85.09,28.75l-.69.91q-.16.24-.36.48a1.94,1.94,0,0,0-.13.2l.16.08.46.27,1.65,1-2.52.84s-.25-.26-.51-.53l-.21.76.72-.23h0c0,.15-.06.27-.08.35v0a2.72,2.72,0,0,0-.09.4l-.1.05s-.12.06-.26.16l-.24.2a4.43,4.43,0,0,0-.71.84c-.51.82-1.18,2-2,3.11a9.16,9.16,0,0,1-1.36,1.48,4.07,4.07,0,0,1-.78.52c-.25.14-.5.26-.72.37a4,4,0,0,1-1.58.54,12.63,12.63,0,0,1,1.39-.88,7.12,7.12,0,0,0,1.32-1,8.35,8.35,0,0,0,1.16-1.48c.71-1.09,1.26-2.25,1.78-3.18A5.54,5.54,0,0,1,82.22,33l.31-.27h0l-.09-.11-.38-.46a1.11,1.11,0,0,1,.07-.16l.51-.15,1.11-.31.28-.08h.06l.14,0-.14-.13-1.21-.78.66-.76.4-.46.77-.85c.36-.41.7-.77,1-1.06l.37-.05-.13-.2-.24.25a21.2,21.2,0,0,1-2.28.11l.4-.06c.65-.09,1.88-.23,2.19-.34l.35-.13-.22.33C85.9,27.66,85.53,28.17,85.09,28.75Z"/>
+                    <path class="cls-4"
+                          d="M75.67,41.77l.4-.11c0,.14.07.28.1.43a2.91,2.91,0,0,1,0,.31c-.2.09-.38.17-.52.25a2.83,2.83,0,0,0,0-.51C75.69,42,75.68,41.89,75.67,41.77Z"/>
+                    <path class="cls-4"
+                          d="M76.07,41.66l-.4.11c0-.12,0-.24-.06-.35l.35-.14C76,41.4,76,41.53,76.07,41.66Z"/>
+                    <path class="cls-4" d="M76.21,42.71l-.56.16a1.43,1.43,0,0,0,0-.22c.14-.08.32-.16.52-.25Z"/>
+                    <path class="cls-4"
+                          d="M76.15,43.19a4.23,4.23,0,0,0-.65.14,2.76,2.76,0,0,0,.15-.46l.56-.16A3.5,3.5,0,0,1,76.15,43.19Z"/>
+                    <path class="cls-4"
+                          d="M75.5,43.33a4.23,4.23,0,0,1,.65-.14,3.49,3.49,0,0,1-.18.57h0l-.41,0-.32,0a1.72,1.72,0,0,0,.17-.31S75.47,43.39,75.5,43.33Z"/>
+                    <path class="cls-4"
+                          d="M75.28,42.94s.14-.15.41-.29a1.43,1.43,0,0,1,0,.22C75.43,42.93,75.29,43,75.28,42.94Z"/>
+                    <path class="cls-4"
+                          d="M75.7,40.59a4.54,4.54,0,0,1,.26.69l-.35.14a5.9,5.9,0,0,0-.16-.76,1.3,1.3,0,0,0-.17-.43c-.07-.08-.14-.1-.14-.13s.09-.05.22,0a1.17,1.17,0,0,1,.33.45h0Z"/>
+                    <path class="cls-4"
+                          d="M74.49,42a3.61,3.61,0,0,1,1.12-.59c0,.11,0,.23.06.35A4.1,4.1,0,0,1,74.49,42Z"/>
+                    <path class="cls-4"
+                          d="M74.79,42.87s0,.05,0,.07a.19.19,0,0,1,0,.08c0,.06-.07,0-.06,0l0,0h0l0,0a.55.55,0,0,1-.06-.08.64.64,0,0,0,.14,0S74.79,42.85,74.79,42.87Z"/>
+                    <path class="cls-4"
+                          d="M74.79,42.94s0,0,0-.07,0,0,0,0a.64.64,0,0,1-.14,0,.55.55,0,0,0,.06.08l0,0h0l0,0s0,.08.06,0A.19.19,0,0,0,74.79,42.94Zm.07-.19c.09,0,0,.49-.14.51s-.25-.29-.12-.4A2.17,2.17,0,0,1,74.86,42.75Z"/>
+                    <path class="cls-4"
+                          d="M74.29,43.91c0-.09.54-.4,1.18-.58h0c0,.06-.06.13-.09.18a1.72,1.72,0,0,1-.17.31C74.74,43.89,74.31,44,74.29,43.91Z"/>
+                    <path class="cls-4"
+                          d="M78.44,3.79c-.65-.24-1.42-.58-2.27-.86A14.81,14.81,0,0,0,74,2.38a3,3,0,0,1,.91-.32L74.49,1l0-.06a13.47,13.47,0,0,1,2.14.88A22.21,22.21,0,0,1,78.8,3.07c.45.29.81.55,1.06.74l-.47.09.27.3C79.36,4.12,78.94,4,78.44,3.79Z"/>
+                    <path class="cls-4"
+                          d="M74.72,43.26c.12,0,.23-.53.14-.51a2.17,2.17,0,0,0-.26.11s.05-.07.21-.13.08-.06.11,0a.2.2,0,0,1,.06.11.79.79,0,0,1-.06.38c-.06.14-.14.22-.27.2a.32.32,0,0,1-.22-.23.37.37,0,0,1,0-.38s.09,0,.15.08C74.47,43,74.6,43.29,74.72,43.26Z"/>
+                    <path class="cls-4"
+                          d="M77.45,31.24a3.28,3.28,0,0,1-1.76.88A2.6,2.6,0,0,1,74,31.89h.09a15.51,15.51,0,0,0,2.44-.38A9.68,9.68,0,0,0,77.45,31.24Z"/>
+                    <path class="cls-4" d="M74.07,41.57s-.07,0,0,0l0,0s0-.07-.11-.13.1,0,.17,0,.06.05,0,.09Z"/>
+                    <path class="cls-4"
+                          d="M74.69,22.21a1.86,1.86,0,0,1,1.52-.15,6.14,6.14,0,0,0-2.18.61l0,0A4.29,4.29,0,0,1,74.69,22.21Z"/>
+                    <path class="cls-4"
+                          d="M74,41.73c-.24.05-.27-.07,0-.34.06.06.11.11.11.13l0,0s0,.05,0,0l.08-.07s0-.11,0-.09-.16,0-.17,0l.23-.06C74.42,41.26,74.2,41.68,74,41.73Z"/>
+                    <path class="cls-4"
+                          d="M73.26,23.08a3.33,3.33,0,0,1,.72-.65l-.09.3C73.47,22.93,73.29,23.08,73.26,23.08Z"/>
+                    <path class="cls-4"
+                          d="M73.77,41.85a.19.19,0,0,1-.14-.24.7.7,0,0,1,.13-.24l.06-.08s.08,0,.14.1c-.27.27-.24.39,0,.34s.46-.47.23-.4l-.23.06s.09-.07.26-.12a.11.11,0,0,1,.12,0,.18.18,0,0,1,0,.13.48.48,0,0,1-.21.34A.43.43,0,0,1,73.77,41.85Z"/>
+                    <path class="cls-4"
+                          d="M74.92,2.06a3,3,0,0,0-.91.32l-.69-.13L73,2.2,73.22,2a10.26,10.26,0,0,1,1.27-1Z"/>
+                    <path class="cls-4"
+                          d="M72.92,30.41a11.14,11.14,0,0,1-.24-3.6c.1-2.25.34-3.27,1.2-4q-.13.57-.24,1.11c-.35,2-.44,3.33-.46,3.41S73,28.59,72.92,30.41Z"/>
+                    <path class="cls-4"
+                          d="M75.69,32.12a3.28,3.28,0,0,0,1.76-.88,11.5,11.5,0,0,0,2.27-1,6.48,6.48,0,0,0,.76-.53,3.39,3.39,0,0,0,.34-.31l.07-.08a.2.2,0,0,0,0-.06.65.65,0,0,0,.07-.21,6.92,6.92,0,0,0,.18-1.94,6.71,6.71,0,0,0-1.6-3.49,3.85,3.85,0,0,0-1.31-1.15,4,4,0,0,0-1.53-.44,2.77,2.77,0,0,0-.5,0h0a1.86,1.86,0,0,0-1.52.15,4.29,4.29,0,0,0-.7.48h0l-.1,0,.09-.3a2,2,0,0,1,.31-.19,4.42,4.42,0,0,1,2.46-.43,4.52,4.52,0,0,1,1.64.42,4.31,4.31,0,0,1,1.47,1.21A12.67,12.67,0,0,1,81,25.1a4.57,4.57,0,0,1,.64,2,7.53,7.53,0,0,1-.14,2.11c0,.08-.06.18-.09.27a.89.89,0,0,1-.09.16,1.25,1.25,0,0,1-.09.12,4.54,4.54,0,0,1-.38.38,6.71,6.71,0,0,1-.84.59,13.24,13.24,0,0,1-3.33,1.35,14.5,14.5,0,0,1-2.54.42,3.91,3.91,0,0,1-1.09,0,.44.44,0,0,1-.17-.07,4.68,4.68,0,0,1,0-.53.41.41,0,0,1,.29-.05,3.21,3.21,0,0,0,.81.06h0A2.6,2.6,0,0,0,75.69,32.12Z"/>
+                    <path class="cls-4"
+                          d="M72.77,61.29a.2.2,0,0,0,0-.07.72.72,0,0,0,.34-.09,2,2,0,0,0,.42-.29c.14-.13.28-.26.26-.42a2,2,0,0,0-.47-.93.68.68,0,0,0-.35-.23s0-.06,0-.13v0c0-.09,0-.16.09-.15a.51.51,0,0,1,.18.07,1.05,1.05,0,0,1,.34.28,2.35,2.35,0,0,1,.29.49,1.59,1.59,0,0,1,.18.64.5.5,0,0,1-.14.35.93.93,0,0,1-.24.21,1.78,1.78,0,0,1-.48.27A1,1,0,0,1,72.77,61.29Z"/>
+                    <path class="cls-4"
+                          d="M76,43.77a4.27,4.27,0,0,1-.38.7,4.1,4.1,0,0,1-.52.59,7,7,0,0,1-1.28,1,2.41,2.41,0,0,1-.56.22h0a3,3,0,0,1-1,.06c-.43-.05-.69-.15-.69-.2s.29,0,.7,0a2.85,2.85,0,0,0,1.35-.43,7.85,7.85,0,0,0,1.09-1,5.12,5.12,0,0,0,.43-.55s.07-.1.18-.27l.32,0Z"/>
+                    <path class="cls-4" d="M72.77,61.29c-.09,0-.13,0-.13-.06h.14A.2.2,0,0,1,72.77,61.29Z"/>
+                    <path class="cls-4"
+                          d="M72.71,57.59c-.09,0-.11-.59,0-1.31,0,.14,0,.28.07.42s.05.39.08.56S72.74,57.59,72.71,57.59Z"/>
+                    <path class="cls-4"
+                          d="M84.24,24c0,.12,0,.22,0,.3s0,.11,0,.17l-.06.25c0-.15-.07-.39-.11-.7s-.08-.63-.13-1a10.2,10.2,0,0,0-.47-1.21,4.69,4.69,0,0,0-1-1.17,6.62,6.62,0,0,0-1.33-1.08,6.21,6.21,0,0,0-3.58-.71,3.57,3.57,0,0,0-1.61.74,5.42,5.42,0,0,0-1.25,1.28A4.48,4.48,0,0,0,74,22.34a.29.29,0,0,0,0,.09,3.33,3.33,0,0,0-.72.65s.21-.15.63-.35a.43.43,0,0,0,0,.05c-.86.76-1.1,1.78-1.2,4a11.14,11.14,0,0,0,.24,3.6h0c0,.1,0,.22,0,.33,0,.36,0,.74,0,1.13a.3.3,0,0,0-.15.18.31.31,0,0,0,.15.35A14.36,14.36,0,0,0,73,34.1a13.87,13.87,0,0,0,1,3.66l.1.22.08.16c0,.07.07.08.12.07l.15,0,.14-.07.41-.25c.53-.36,1.05-.74,1.55-1.1,1-.72,1.93-1.42,2.71-2s1.42-1.12,1.86-1.48c0,0,.21-.28.56-.71s.46-1.5,1-2.7l.2-.5c.22-.59.43-1.28.59-1.85h0c-.22.81-.52,2-.81,2.94-.17.62-.34,1.18-.47,1.56L82,32l.09.12a1.54,1.54,0,0,1-.09.24A15.16,15.16,0,0,1,79.46,35c-.74.66-1.64,1.4-2.61,2.17-.5.39-1,.78-1.54,1.17l-.42.29-.29.15a1.68,1.68,0,0,1-.33.07.6.6,0,0,1-.68-.32l-.15-.28-.11-.23A15.75,15.75,0,0,1,72,30.71c.05-2,.2-3.42.21-3.51s.13-1.47.55-3.49c.11-.5.24-1.05.42-1.62A5.3,5.3,0,0,1,74,20.35a6.45,6.45,0,0,1,1.48-1.42,4.18,4.18,0,0,1,2-.82,6.78,6.78,0,0,1,3.92.93,7,7,0,0,1,1.39,1.23,5,5,0,0,1,1,1.33A7.9,7.9,0,0,1,84.2,23C84.22,23.36,84.24,23.7,84.24,24Z"/>
+                    <path class="cls-4"
+                          d="M72.09,52.35a2.24,2.24,0,0,1,1.3.71,1.19,1.19,0,0,1,.23.5c0,.14,0,.22,0,.23a2.94,2.94,0,0,1-.08.7c-.1.39-.26.81-.38,1.27s-.29,1.15-.38,1.5c0-.17,0-.36-.08-.56s0-.28-.07-.42,0-.41.07-.62c.07-.47.2-1,.25-1.28a2,2,0,0,0,0-.4.79.79,0,0,0,0-.14.91.91,0,0,0-.11-.44,1.86,1.86,0,0,0-.94-.61l-.11,0c0-.18-.09-.36-.14-.53C71.82,52.27,72,52.31,72.09,52.35Z"/>
+                    <path class="cls-4"
+                          d="M72.5,45.47a.71.71,0,0,1-.55.18.47.47,0,0,1-.24-.08.33.33,0,0,0,.1-.06.63.63,0,0,0,.12-.11h0a.57.57,0,0,0,.43-.13c.13-.07.27-.2.39-.27s.09-.06.15,0h0A0,0,0,0,1,73,45h0s0,0,0,0S72.71,45.26,72.5,45.47Z"/>
+                    <path class="cls-4"
+                          d="M71.81,45.51a.33.33,0,0,1-.1.06h0s0,0,0-.05.06,0,.06,0h0a.2.2,0,0,1,.1-.07h.05A.63.63,0,0,1,71.81,45.51Z"/>
+                    <path class="cls-4"
+                          d="M71.82,53.86a.27.27,0,0,1,.16.38,3.1,3.1,0,0,1-.37.46l-.14.14c-.08-.22-.16-.45-.25-.68a3,3,0,0,0,.21-.27C71.49,53.8,71.65,53.79,71.82,53.86Z"/>
+                    <path class="cls-4"
+                          d="M72,53.35c.26,1,.51,2.07.67,2.93-.07.72,0,1.31,0,1.31s.06-.12.11-.33c.07.61.05,1,0,1s-.26-.5-.55-1.27h0s0-.1,0-.15l-.73-2,.14-.14a3.1,3.1,0,0,0,.37-.46.27.27,0,0,0-.16-.38c-.17-.07-.33-.06-.39,0a3,3,0,0,1-.21.27L71,53.65c-.11-.28-.22-.57-.32-.85l.12,0,.32-.08L70.81,52a3.57,3.57,0,0,0,1,.72Z"/>
+                    <path class="cls-4"
+                          d="M70.71,52.8c-.11-.31-.23-.63-.35-.93a.13.13,0,0,0,.06,0l.13-.1a2,2,0,0,0,.25.29h0l.35.66-.32.08-.12,0Z"/>
+                    <path class="cls-4"
+                          d="M71.7,52.22c0,.17.1.35.14.53a3.57,3.57,0,0,1-1-.72h0l-.19-.36-.06.07c-.08-.11-.11-.19-.09-.21S71,51.94,71.7,52.22Z"/>
+                    <path class="cls-4"
+                          d="M69.85,4.31a6.58,6.58,0,0,0-1-1.54,4,4,0,0,0-.28-.29l.87-.17a12.66,12.66,0,0,1,.84,1.75c.07.19.14.4.2.61a4.48,4.48,0,0,1,.11.5c0,.18,0,.38,0,.57l0,.32,0,.16V6.3s0,0,0,0,0-.14.08-.26c.15-.43.3-.83.43-1.17a12.54,12.54,0,0,1,.62-1.27,5,5,0,0,1,.72-1c.15-.14.29-.28.42-.39l.36,0,.69.13a4,4,0,0,0-.41.21,7,7,0,0,0-.74.48,3.42,3.42,0,0,0-.71.78,8,8,0,0,0-.68,1.2,16.59,16.59,0,0,0-.75,2l-.15.49s0,0,0,0V7.42l0-.25-.06-.49c-.05-.32-.09-.64-.13-.94a4.54,4.54,0,0,0-.21-.88A4,4,0,0,0,69.85,4.31Z"/>
+                    <path class="cls-4"
+                          d="M69.89,50.61l-.42-1.11,1.06.18a1.27,1.27,0,0,1-.18.36A2.48,2.48,0,0,1,69.89,50.61Z"/>
+                    <path class="cls-4"
+                          d="M72,45.26a.18.18,0,0,1,0,.14h-.06a.2.2,0,0,0-.1.07h0s0,0,0-.05,0,.05,0,.05,0,0-.06,0,0,0,0,.05h0a3.42,3.42,0,0,1-.69.28,1.86,1.86,0,0,1-.9.06.66.66,0,0,1-.31-.19,2.41,2.41,0,0,0,.33-.15s0,0,.07,0a1.59,1.59,0,0,0,.76,0,3.33,3.33,0,0,0,.78-.22c.1,0,.17-.09.18-.13a.3.3,0,0,0,0-.09S72,45.17,72,45.26Z"/>
+                    <path class="cls-4"
+                          d="M73.26,46.34s-.08.28-.37.61a2.91,2.91,0,0,1-1.33.84,4.65,4.65,0,0,1-1,.18v0a.33.33,0,0,0-.32-.31l-.49.2v-.4l.12-.09.21,0a4.11,4.11,0,0,0,1.39,0,3.16,3.16,0,0,0,1.28-.58c.26-.19.42-.37.5-.41h0Z"/>
+                    <path class="cls-4"
+                          d="M69.71,45.62s0-.07.11-.13.14-.08.16-.06a.32.32,0,0,0,.15.14,2.41,2.41,0,0,1-.33.15A.44.44,0,0,1,69.71,45.62Z"/>
+                    <path class="cls-4" d="M69.72,47.42v-.09h0s0,0,0,0h0l.08,0h0Z"/>
+                    <path class="cls-4" d="M69.68,47.85l0,0v0h0Z"/>
+                    <path class="cls-4"
+                          d="M69.64,47.71a.29.29,0,0,1,0-.11s0-.05,0-.05,0,0,0,0a0,0,0,0,0,0,0l.09-.06v.4l0,0h0A.35.35,0,0,0,69.64,47.71Z"/>
+                    <path class="cls-4" d="M69.72,47.42l-.09.06a.47.47,0,0,0,.07-.12s0,0,0,0Z"/>
+                    <path class="cls-4"
+                          d="M69.39,49.29,69.26,49a6.28,6.28,0,0,0,1.06-.56.45.45,0,0,0,.19-.24c.1.36.35,1.17.56,1.86s.41,1.39.63,2.2c-.69-.28-1.19-.74-1.24-.7s0,.1.09.21l-.13.1a.13.13,0,0,1-.06,0c-.17-.45-.32-.88-.47-1.26a2.48,2.48,0,0,0,.46-.57,1.27,1.27,0,0,0,.18-.36l-1.06-.18h0A.32.32,0,0,0,69.39,49.29Z"/>
+                    <path class="cls-4"
+                          d="M69.53,47.9h.07l.07,0h.06v0l.49-.2a.33.33,0,0,1,.32.31v0h-.09c0-.06,0,0-.1,0s-.25,0-.36,0l-.31,0Z"/>
+                    <path class="cls-4"
+                          d="M69.5,60.72a.27.27,0,0,1,0-.23c0-.12.09-.17.11-.16s0,.08,0,.17.08.11.16.1a.56.56,0,0,0,.24-.17l.11-.12s0,0,.06,0,0,0,0,0l-.25-.1A2.64,2.64,0,0,1,69.6,60s.14-.07.3-.05l.27,0,.45.13a2.71,2.71,0,0,1-.29.4,1,1,0,0,1-.57.29A.36.36,0,0,1,69.5,60.72Z"/>
+                    <path class="cls-4"
+                          d="M69.25,48.92c-.06-.16.19-.4.56-.53a1.8,1.8,0,0,0,.54-.41h.1s0,.07.06.18a.45.45,0,0,1-.19.24,6.28,6.28,0,0,1-1.06.56A.08.08,0,0,1,69.25,48.92Z"/>
+                    <path class="cls-4"
+                          d="M69.37,47.83a.38.38,0,0,1-.1-.13c.12-.07.19-.11.19-.13l.17-.09a0,0,0,0,1,0,0s0,0,0,0,0,0,0,.05a.29.29,0,0,0,0,.11.35.35,0,0,1,0,.13h0l-.07,0h-.12l0,0Z"/>
+                    <path class="cls-4"
+                          d="M69.23,47.6v-.06a.31.31,0,0,1,.13-.25l.09-.06h0l.09,0h.15v.14h0s0,0,0,0a.47.47,0,0,1-.07.12l-.17.09A.66.66,0,0,0,69.23,47.6Z"/>
+                    <path class="cls-4"
+                          d="M68.24,1a1.3,1.3,0,0,1,.46.3,4.37,4.37,0,0,1,.69,1l0,0-.87.17a1.94,1.94,0,0,0-.46-.33c-.06,0-.1,0-.11,0s0-.07,0-.09A.28.28,0,0,0,68,2Z"/>
+                    <path class="cls-4"
+                          d="M69.8,45.72a1.71,1.71,0,0,1-.82.09,1,1,0,0,1-.72-.56,2,2,0,0,1-.19-.79,2.09,2.09,0,0,1,.49-1.33,2.62,2.62,0,0,1,.79-.63l.36-.18a6.43,6.43,0,0,1,.69-.2l.37,0a.8.8,0,0,1,.29,0l.13,0h.11l.17,0,.2-.06.11,0a.53.53,0,0,1,.16,0,3.67,3.67,0,0,1,1,0,1.51,1.51,0,0,1,.55.22,2,2,0,0,1,.42.4,1.29,1.29,0,0,1,.24.56.71.71,0,0,1-.23.61c-.32.22-.44.26-.53.74a.66.66,0,0,1-.24.31l-.16.08-.08,0h0s0,0,0,0,0-.13.06-.2a.25.25,0,0,0,0-.12s0,0,0-.22c0,0,0,0,0,0h0l-.09,0-.14,0c-.08,0-.12,0-.13,0s0,0,.09-.09a.48.48,0,0,1,.38-.14c.1.08,0,.2,0,.3s0,0,.08,0a.34.34,0,0,0,.08-.09.3.3,0,0,0,.07-.21v0s0-.06,0-.08a.42.42,0,0,1,0-.1l.07-.11a1.7,1.7,0,0,1,.19-.19l.17-.15c.15-.13.08-.38-.11-.6a1.18,1.18,0,0,0-.32-.27,1.07,1.07,0,0,0-.38-.13,3.62,3.62,0,0,0-.87,0H72l-.11.05-.21.07-.23.07a1.51,1.51,0,0,1-.29,0l-.25-.05h-.06l-.27.05a3.85,3.85,0,0,0-.58.19,2.5,2.5,0,0,0-.94.59,1.5,1.5,0,0,0-.4.95,1.46,1.46,0,0,0,.1.57.49.49,0,0,0,.36.32,1.74,1.74,0,0,0,1.18-.3,2.2,2.2,0,0,0,.25-.17l.12-.1.06-.06a.15.15,0,0,0,.06-.15s-.07-.08-.11-.09a1,1,0,0,0-.41,0,.48.48,0,0,0-.29.1.84.84,0,0,0-.12.19s-.07.07-.08.06,0,0,0-.08a.85.85,0,0,1,.09-.25.57.57,0,0,1,.37-.21,1.32,1.32,0,0,1,.57,0,.42.42,0,0,1,.29.21.39.39,0,0,1-.08.38,1.13,1.13,0,0,1-.12.18l-.13.13a2.09,2.09,0,0,1-.28.22,2.63,2.63,0,0,1-.33.2.32.32,0,0,1-.15-.14s-.1,0-.16.06-.12.12-.11.13A.44.44,0,0,0,69.8,45.72Z"/>
+                    <path class="cls-4"
+                          d="M69.75,68.12c-.39.57-.83,1.15-1.29,1.72l-.16.22.29-.52c.55-1,1.09-2.06,1.22-2S69.84,67.78,69.75,68.12Z"/>
+                    <path class="cls-4"
+                          d="M69.39,2.28a4.37,4.37,0,0,0-.69-1,1.3,1.3,0,0,0-.46-.3L68.16.37c.63-.07,1.3-.14,2-.18A11.5,11.5,0,0,1,72,.24l.5.1.4.11.79.21.84.25,0,.06a10.26,10.26,0,0,0-1.27,1L73,2.2l-.44-.07-.4-.06a1.66,1.66,0,0,0-.32,0,9.62,9.62,0,0,0-1.47.11l-.92.16Z"/>
+                    <path class="cls-4"
+                          d="M68.82,68a.29.29,0,0,1-.22.13c-.06,0-.08,0-.08,0s.12,0,.17-.17,0-.15.07-.25a1.26,1.26,0,0,0,0-.22s0,0,0,0-.07,0-.07,0l-.2.06c-.11,0-.27.1-.41.17a3.36,3.36,0,0,1-.62.26s.22-.27.5-.46a3.56,3.56,0,0,1,.62-.34,1,1,0,0,1,.2,0c.15,0,.36,0,.3.26a2.46,2.46,0,0,1-.12.36C68.92,67.85,68.88,67.94,68.82,68Z"/>
+                    <path class="cls-4"
+                          d="M68.36,64.15a4.44,4.44,0,0,1,.92-.65l.09,0h0l0,0h-.28a1.32,1.32,0,0,0-.28,0,4.71,4.71,0,0,0-1,.3,1.18,1.18,0,0,1-.36.09c-.09,0-.14,0-.13,0s0,0,.13,0a1.25,1.25,0,0,0,.31-.14,4,4,0,0,1,1-.41,1.15,1.15,0,0,1,.31,0h.33a1.65,1.65,0,0,1,.74.05.19.19,0,0,1,0,.3l-.2.09-.3.09-.17.06-.12,0a5.36,5.36,0,0,0-.91.55.64.64,0,0,1-1-.1.63.63,0,0,1-.18-.34c0-.12.1-.13.1-.12a.15.15,0,0,0,0,.11.7.7,0,0,0,.2.26.8.8,0,0,0,.38.23A.82.82,0,0,0,68.36,64.15Z"/>
+                    <path class="cls-4"
+                          d="M69.26,47.68a4.48,4.48,0,0,1-.78.28,8,8,0,0,1-2,.27A6.46,6.46,0,0,0,67.83,48a12.74,12.74,0,0,1,1.4-.35.11.11,0,0,0,0,.07Z"/>
+                    <path class="cls-4"
+                          d="M66.51,48.79a1.56,1.56,0,0,1-.19-.14v0h.09a6.24,6.24,0,0,0,.82-.17h0a.26.26,0,0,0,0,.15.73.73,0,0,0,.26.2,1.32,1.32,0,0,0,1,.09,1.53,1.53,0,0,0,.79-.36,2.4,2.4,0,0,0,.26-.18s.13-.12.13-.22v-.08a1.59,1.59,0,0,0-.19-.16l.15,0L70,48c.11,0,.23,0,.36,0a1.8,1.8,0,0,1-.54.41c-.37.13-.62.37-.56.53a.08.08,0,0,0,0,0,6.28,6.28,0,0,1-.66.23,2.65,2.65,0,0,1-1.18,0,2.6,2.6,0,0,1-.47-.16A3.7,3.7,0,0,1,66.51,48.79Z"/>
+                    <path class="cls-4"
+                          d="M66.32,48.63c0-.06-.22-.15-.22-.2a2,2,0,0,1,.59,0,5.19,5.19,0,0,1,.48-.24l.29.1H67.4l-.09,0a.2.2,0,0,0-.08.08,6.24,6.24,0,0,1-.82.17Z"/>
+                    <path class="cls-4"
+                          d="M66.26,42.61s-.08,0-.16,0,.11-.54.38-.34.4.48.11.48l-.68,0s0,0,0,0a1.43,1.43,0,0,1,.28,0l.3,0a.23.23,0,0,0,.1,0s0,0,0-.06a2.23,2.23,0,0,0-.2-.18c-.08,0,0,0-.07,0A.61.61,0,0,0,66.26,42.61Z"/>
+                    <path class="cls-4"
+                          d="M66.1,42.6c.08,0,.16,0,.16,0a.61.61,0,0,1,.09-.22s0,0,.07,0a2.23,2.23,0,0,1,.2.18s0,0,0,.06a.23.23,0,0,1-.1,0l-.3,0a1.43,1.43,0,0,0-.28,0Z"/>
+                    <path class="cls-4"
+                          d="M65.93,51.85a2.07,2.07,0,0,1-.15-.34s0-.07,0-.09l.09,0,.16,0a4.87,4.87,0,0,1,.72-.13l.6-.11.51-.09a2.22,2.22,0,0,0,1.25-.69,2.55,2.55,0,0,0,.18-.28,1.42,1.42,0,0,0,.19-.52v0h0l.42,1.11a3.23,3.23,0,0,1-.27.23,3.36,3.36,0,0,1-1.66.6l-1.08.1-.47,0-.13,0s-.11,0-.07,0a1.34,1.34,0,0,0,.12.24,1.54,1.54,0,0,0,.36.36,2.64,2.64,0,0,0,1.53.43,3.75,3.75,0,0,0,1.47-.4,3.19,3.19,0,0,0,.67-.41c.12.3.24.62.35.93-.21.06-.48.12-.84.19a6.2,6.2,0,0,1-1.72.12A3.44,3.44,0,0,1,67,52.8a2.93,2.93,0,0,1-.59-.35A2.3,2.3,0,0,1,65.93,51.85Z"/>
+                    <path class="cls-4"
+                          d="M65.93,42.79l0,0,.68,0c.29,0,.15-.28-.11-.48s-.38.34-.38.34-.16-.05-.16-.07a.9.9,0,0,1,.18-.34.3.3,0,0,1,.23-.11h0a.41.41,0,0,1,.24.1,1,1,0,0,1,.26.37.22.22,0,0,1-.09.25.43.43,0,0,1-.23,0l-.32,0Z"/>
+                    <path class="cls-4"
+                          d="M65.79,45.53a1.65,1.65,0,0,1,.26-.36s0-.08-.08-.14a1.14,1.14,0,0,1,.38.22.47.47,0,0,1,.15.36.43.43,0,0,1-.33.27c-.16,0-.35,0-.39,0A.27.27,0,0,1,65.79,45.53Z"/>
+                    <path class="cls-4"
+                          d="M65.79,45.53a.27.27,0,0,0,0,.32c0,.07.23.08.39,0a.43.43,0,0,0,.33-.27.47.47,0,0,0-.15-.36A1.14,1.14,0,0,0,66,45c.06.06.1.12.08.14A1.65,1.65,0,0,0,65.79,45.53Zm-.11.4c-.24-.26,0-.64.27-.91a.74.74,0,0,1,.63.46C66.73,45.91,65.92,46.2,65.68,45.93Z"/>
+                    <path class="cls-4"
+                          d="M65.57,46a.58.58,0,0,1-.07-.61,1.86,1.86,0,0,1,.3-.45s.09,0,.15.06c-.22.27-.51.65-.27.91s1,0,.9-.45A.74.74,0,0,0,66,45a.6.6,0,0,1,.48.13.61.61,0,0,1,.26.49.64.64,0,0,1-.44.46A.62.62,0,0,1,65.57,46Z"/>
+                    <path class="cls-4"
+                          d="M65.42,75.37l.63-.61s0,0,.1.17l-.32.32-.28.25v-.07c0-.05,0,0,0-.05S65.42,75.36,65.42,75.37Z"/>
+                    <path class="cls-4" d="M65.85,33.64a3.88,3.88,0,0,1-.65.15l.06,0,.76-.27Z"/>
+                    <path class="cls-4"
+                          d="M65.22,75.66a10.11,10.11,0,0,1,1.16-2c.29-.48.55-1,.74-1.38l.32-.69s.16-.27.37-.65.31-.55.48-.87h0l.16-.22c.46-.57.9-1.15,1.29-1.72a15.52,15.52,0,0,1-.53,1.7c-.2.55-.42,1.1-.59,1.52l-.31.71s-.16.29-.41.67a11.85,11.85,0,0,1-1,1.35c-.27.32-.54.61-.79.86-.07-.13-.1-.16-.1-.17l-.63.61s.06,0,.08,0,0,0,0,.05v.07C65.37,75.65,65.24,75.73,65.22,75.66Z"/>
+                    <path class="cls-4"
+                          d="M65.15,54.56c.47.13.94.28,1.29.36s.7.13,1,.17l1,.09a3.82,3.82,0,0,0,1.73-.24,2.6,2.6,0,0,0,1-.68.58.58,0,0,0,.08-.1c.09.23.17.46.25.68a3.23,3.23,0,0,1-1.07.67,4.34,4.34,0,0,1-2,.22,10.49,10.49,0,0,1-1.08-.12l-.19,0-.16,0-.08,0,0,.05.13.13.08.06.24.17c.17.12.35.22.52.33a5.17,5.17,0,0,0,2.1.68,11.22,11.22,0,0,0,1.62.08,4.73,4.73,0,0,1,.62,0h0a5.76,5.76,0,0,1-2.27.19,5.19,5.19,0,0,1-2.25-.6,6.32,6.32,0,0,1-.56-.33l-.3-.18c-.14-.11-.29-.21-.42-.32a8.09,8.09,0,0,1-.75-.64l-.35-.32,0,0,0,0,0,0Z"/>
+                    <path class="cls-4"
+                          d="M65.1,82.1c0-.15,0-.37,0-.69,0-.6,0-1.52.08-2.83a25.11,25.11,0,0,1,.33-2.81,1.48,1.48,0,0,0,0-.27l.28-.25.32-.32a.73.73,0,0,1,0,.12.8.8,0,0,1,0,.44,2.9,2.9,0,0,1-.16.41,7,7,0,0,0-.65,2.7,9.38,9.38,0,0,0,.25,2.79,2.5,2.5,0,0,0,.2.57c-.39.06-.59.13-.61.09s0,0,.06,0a.25.25,0,0,0,.13,0h0l-.32.06h0V82.1Z"/>
+                    <path class="cls-4"
+                          d="M65,2.81c.09-.9.17-1.29.17-1.29l.1-1.1.43,0,.65.05a2.59,2.59,0,0,0,.28,0h.31L68.16.37l.08.64L68,2A.28.28,0,0,1,68,2s0,.07,0,.09,0,0,.11,0a1.94,1.94,0,0,1,.46.33c-.43.08-.87.18-1.32.25a3,3,0,0,1-.43.06l-.46,0h-.76Z"/>
+                    <path class="cls-4"
+                          d="M65,34a2.23,2.23,0,0,1-.89,0,6.6,6.6,0,0,0,.84-.16h0l.27-.05A1.88,1.88,0,0,1,65,34Z"/>
+                    <path class="cls-4" d="M64.36,42.92a.25.25,0,0,1,0,.09.08.08,0,0,1,0,0l-.08.05v0l.17-.18Z"/>
+                    <path class="cls-4"
+                          d="M64.47,6.11c-.07-1.52-.17-2.6-.26-3.32h0l.74,0c-.09,1-.19,2.51-.18,4.74,0,0,0-.24-.09-.46S64.56,6.42,64.47,6.11Z"/>
+                    <path class="cls-4"
+                          d="M64.19,43.08c0-.19-.09-.36-.15-.55a.29.29,0,0,1,.28.48.25.25,0,0,0,0-.09v0Z"/>
+                    <path class="cls-4" d="M64.28,43.05a.2.2,0,0,1-.15.07l.07,0Z"/>
+                    <path class="cls-4" d="M64.19,43.08v0h0Z"/>
+                    <path class="cls-4" d="M64.21,2.79A11.32,11.32,0,0,0,64,1.53h1.17s-.08.39-.17,1.29l-.74,0Z"/>
+                    <path class="cls-4"
+                          d="M63.8,42.74l0-.06a.31.31,0,0,1,.15-.12l.05,0h0c.06.19.1.36.15.55l0,0h0l-.07,0h0a.28.28,0,0,1-.33-.35Z"/>
+                    <path class="cls-4" d="M64,42.56a.31.31,0,0,0-.15.12.25.25,0,0,1,.18-.14h0Z"/>
+                    <path class="cls-4" d="M64.28,46.85a.3.3,0,0,1-.44-.37Z"/>
+                    <path class="cls-4" d="M63.92,46.38a.3.3,0,0,1,.42.42l0,0,0,0-.44-.37a.19.19,0,0,1,.06-.07Z"/>
+                    <path class="cls-4"
+                          d="M63.54,24.54h.29l.29.18a5.29,5.29,0,0,1,1.67,2.12l.39.8c.34.73.43,1,.86,2.07,0,.05,0,.11,0,.15v.21a22.94,22.94,0,0,0-1.45-3.34l-.09-.15-.24-.45L65.17,26a4.33,4.33,0,0,0-.85-1A6.68,6.68,0,0,0,63.54,24.54Z"/>
+                    <path class="cls-4" d="M64.13,43.12c-.26.1-.4-.17-.33-.38v0A.28.28,0,0,0,64.13,43.12Z"/>
+                    <path class="cls-4"
+                          d="M70.72,83.58h0Zm-8-10.71c0-.22,0-.42-.05-.57.32,0,.65-.06,1-.12,0,.16,0,.36,0,.61,0,.62.12,1.49.2,2.56,0,.53.09,1.11.14,1.73l.09.84c0,.14.05.21.07.3l0,.24c0,.17.08.34.11.5.22,1,.44,2.16.67,3.24h0l.18.87,1.49.82,2.42,0a2.26,2.26,0,0,0,1.07-.11,1,1,0,0,0,.36-.3l.09-.11a0,0,0,0,0,0,0,.28.28,0,0,1,0,.11h0l.27.19c.09-.1,0-.36-.13-.59a.35.35,0,0,1,.05-.08l.29-.49.09-.15,0,.08.3-.14a1.31,1.31,0,0,0-.17-.23L71.27,82a1.18,1.18,0,0,0-.32-.66.72.72,0,0,0-.73-.28,7.83,7.83,0,0,0-.86.38,9.26,9.26,0,0,1-1.63.62,5.7,5.7,0,0,1-1.35,0c-.36,0-.64,0-.84,0h-.09l.21,0,.15,0h.09V82h0l.48-.06a6,6,0,0,0,1.28-.11,9.28,9.28,0,0,0,1.53-.68,6.59,6.59,0,0,1,.92-.45,1.08,1.08,0,0,1,.64,0,1.4,1.4,0,0,1,.52.33,1.76,1.76,0,0,1,.53,1.14.67.67,0,0,1,0,.39c-.06.12-.09.2-.14.29s-.19.35-.29.52-.21.35-.34.53a1.52,1.52,0,0,1-.55.48,3,3,0,0,1-1.34.21l-2.58,0-2-1c-.35-1.53-.69-3-1-4.43-.08-.31-.15-.62-.23-.92a1.12,1.12,0,0,1,0-.21l0-.13,0-.24c0-.16,0-.32-.06-.48-.06-.62-.12-1.2-.17-1.74C62.88,74.36,62.79,73.48,62.74,72.87Z"/>
+                    <path class="cls-4"
+                          d="M63.36,46.07c-.12-.1-.23-.21-.35-.3a11.07,11.07,0,0,1,1.34-.62c.44-.12.75-.09.75,0s-.29.11-.66.29S63.76,45.81,63.36,46.07Z"/>
+                    <path class="cls-4"
+                          d="M63.6,103.49c.15-.25.35-.62.6-1s.51-.93.76-1.47a5.53,5.53,0,0,0,.33-.85,5,5,0,0,0,.17-.92,3.56,3.56,0,0,0-.12-1.79,4.35,4.35,0,0,0-.91-1.32,2.7,2.7,0,0,0-.75-.57,1.31,1.31,0,0,0,.27-.06,2.77,2.77,0,0,1,.66.45,4.13,4.13,0,0,1,1.06,1.35,4,4,0,0,1,.26,2,9.76,9.76,0,0,1-.14,1,6.81,6.81,0,0,1-.33.93c-.24.57-.5,1.09-.73,1.54s-.37.7-.5,1c-.26,0-.51.07-.77.09A2.4,2.4,0,0,0,63.6,103.49Z"/>
+                    <path class="cls-4"
+                          d="M63.59,104.25c-.17-.07-.27-.21-.22-.32a.65.65,0,0,0,.09-.16c.26,0,.51,0,.77-.09l-.06.12-.2.41C63.93,104.3,63.76,104.31,63.59,104.25Z"/>
+                    <path class="cls-4"
+                          d="M64.23,47.57a15.8,15.8,0,0,1-1.3-1.22l.17-.11.26-.17.48.41a.3.3,0,0,0,.44.37l.3.22a2.59,2.59,0,0,0,.57.27l.26.09a4.17,4.17,0,0,0,.92.19,7.45,7.45,0,0,0,2-.12,3.88,3.88,0,0,0,1.82-.81c.43-.35.62-.71.68-.65a.68.68,0,0,1-.1.25,2.24,2.24,0,0,1-.41.58,2.7,2.7,0,0,1-.53.46h0l-.08,0h0v-.11h-.15l-.09,0h0l-.09.06a.31.31,0,0,0-.13.25v.06a12.74,12.74,0,0,0-1.4.35,6.46,6.46,0,0,1-1.37.28h-.17a4,4,0,0,1-1.07-.17A3.79,3.79,0,0,1,64.23,47.57Z"/>
+                    <path class="cls-4"
+                          d="M62.69,72.3c0-.26,0-.4,0-.44h.57l.37,0h0v0a1.23,1.23,0,0,0,0,.17v.09C63.34,72.24,63,72.27,62.69,72.3Z"/>
+                    <path class="cls-4" d="M62.58,46l.29-.15.14-.07c.12.09.23.2.35.3l-.26.17-.17.11-.28-.29Z"/>
+                    <path class="cls-4"
+                          d="M63.09,95.46s.13-.16.44-.13a1.26,1.26,0,0,1,.42.13,1.31,1.31,0,0,1-.27.06l-.17-.06A.8.8,0,0,0,63.09,95.46Z"/>
+                    <path class="cls-4"
+                          d="M62.26,2.86l-.17-.16.94,0a13.83,13.83,0,0,1,1.44,3.38c0,.45,0,.94,0,1.47,0-.06,0-.24-.09-.43A8.5,8.5,0,0,0,62.26,2.86Z"/>
+                    <path class="cls-4" d="M62.58,46l-1-1.08.35-.12,1.07.94s0,0,0,0l-.14.07Z"/>
+                    <path class="cls-4"
+                          d="M64,63.47l.28,0h0a.3.3,0,0,1,0-.11s0,0,0,0a.45.45,0,0,1-.06-.09s0,0,0,0l-.13.08Zm-1.18.2a.82.82,0,0,1,.52-.47,3.31,3.31,0,0,1,.68,0,2.66,2.66,0,0,1,.31,0,.29.29,0,0,1,.15,0,.18.18,0,0,1,.06.23c0,.07-.06.06-.09.08l0,0a.1.1,0,0,0-.08,0,1.63,1.63,0,0,1-.62.28,2.44,2.44,0,0,1-.94.07S62.76,63.84,62.83,63.67Zm0,.28a0,0,0,0,0,0,0h0c.11,0,.49-.14.85-.26a1.07,1.07,0,0,0,.35-.2,3.94,3.94,0,0,0-.6,0c-.35,0-.53.41-.6.5h0S62.79,63.94,62.79,64Z"/>
+                    <path class="cls-4"
+                          d="M62.2,34.09h.47l.55,0,.5,0h.05l-.05.06c-.35,0-.71,0-1.06.07a.26.26,0,0,0-.17.07A2.64,2.64,0,0,1,62.2,34.09Z"/>
+                    <path class="cls-4" d="M61.63,47.2l-.73-.29.54-.3c.31-.18.72-.39,1.14-.62l.07.07.28.29Z"/>
+                    <path class="cls-4" d="M62.43,72.32c0-.29.08-.45.11-.45s.07.16.08.44Z"/>
+                    <path class="cls-4"
+                          d="M62.78,2.34A7.83,7.83,0,0,0,62,1.39l-.26-.28.16-1c.41,0,1.32.13,2.5.27l.83.08-.1,1.1H64a11.32,11.32,0,0,1,.22,1.26L63,2.73Z"/>
+                    <path class="cls-4"
+                          d="M61.6,77.87l0-.27c.21-1.44.42-2.87.58-3.94.08-.56.15-1,.2-1.34h.19c0,.91-.08,3.14-.28,5.39l0,.27v.08a.92.92,0,0,1-.06.22h0s0,0,0,0h0a0,0,0,0,0,0,0h0s0,0,0,0l0,0h0l0,0a.75.75,0,0,1-.09-.09h0l0,0,0,0,0,0H61.8a.66.66,0,0,0-.16-.15l0,0,0,0,0,.07h0Z"/>
+                    <path class="cls-4"
+                          d="M61.41,2.21l-.3-.14.66-1,.26.28a7.83,7.83,0,0,1,.75,1l.25.39-.94,0A3.67,3.67,0,0,0,61.41,2.21Z"/>
+                    <path class="cls-4"
+                          d="M61.9,44.79l-.48-.4,1-.28c.25-.06.5-.12.74-.16a15.2,15.2,0,0,1,2.28-.37c.07,0,.11,0,.11,0s-1.51.48-3,1Z"/>
+                    <path class="cls-4"
+                          d="M64.36,48.6a16.2,16.2,0,0,1-3.42-1,.67.67,0,0,0,.17-.1l.52-.35a14.41,14.41,0,0,0,2.81.9,9.52,9.52,0,0,0,1.93.13h.09a8,8,0,0,0,2-.27,4.48,4.48,0,0,0,.78-.28v0a8.75,8.75,0,0,1-1.34.5c-.21.08-.44.17-.7.25a.2.2,0,0,1,.08-.08l.09,0h.06l-.29-.1a5.19,5.19,0,0,0-.48.24,2,2,0,0,0-.59,0s.18.14.22.2A9.28,9.28,0,0,1,64.36,48.6Z"/>
+                    <path class="cls-4"
+                          d="M61.38,67.49a1.22,1.22,0,0,1,.36-1,1,1,0,0,1,.78-.31l.37,0a3.49,3.49,0,0,1,.52.13c.1,0,.23.15.22.28a.39.39,0,0,1-.1.19l-.09.1a2.68,2.68,0,0,1-.42.31,1.18,1.18,0,0,1-.77,0s.34-.07.68-.21c.1-.09.24-.22.34-.33l.06-.08v0l-.05,0a2.34,2.34,0,0,0-.45-.07l-.35-.06a.73.73,0,0,0-.59.17A2.13,2.13,0,0,0,61.38,67.49Z"/>
+                    <path class="cls-4" d="M61.55,44.91l-.35-.38-.06-.07.28-.07.48.4Z"/>
+                    <path class="cls-4" d="M61.14,44.46a6.65,6.65,0,0,1-.58-.66c0-.06.39.19.86.59Z"/>
+                    <path class="cls-4" d="M60.21,47.4l.37-.28.18-.12.14-.09.73.29-.52.35a.67.67,0,0,1-.17.1Z"/>
+                    <path class="cls-4"
+                          d="M59.77,82.57c.12-.31.29-.75.48-1.27l.69-1.76.39-1,.21-.51,0-.09s0,0,0,0,0,.12.07.11,0-.11.07-.08h.12l0,0,0,0,0,0h0a.75.75,0,0,0,.09.09l0,0h0l0,0s0,0,0,0h0a0,0,0,0,1,0,0h0l-.18.5c-.11.34-.22.68-.34,1l-.59,1.79c-.18.52-.32,1-.43,1.28l0,0c-.18,0-.51.09-.51.1h-.51a.19.19,0,0,1,0-.08s0,0,0-.06l0-.07v0C59.71,82.72,59.74,82.65,59.77,82.57Z"/>
+                    <path class="cls-4"
+                          d="M59.25,69.32c.06.09,0,0,0,0S59.24,69.31,59.25,69.32Zm0,.09-.1,0s0,0,0,0,0,0,0,0,0,0,0,0a.42.42,0,0,0-.06-.08s-.11-.06,0-.06a.62.62,0,0,0,.18,0,1.17,1.17,0,0,0,.46-.07s0,0,0,0,0,0,0,0a.88.88,0,0,0-.28-.12c-.08,0-.14,0-.15,0s.25-.19.56,0c.09,0,.2.11.22.2a.25.25,0,0,1-.07.24.58.58,0,0,1-.25.12l-.19,0A1.16,1.16,0,0,1,59.27,69.41Z"/>
+                    <path class="cls-4"
+                          d="M59.54,47.17c-.55-.18-1.11-.35-1.69-.52h0l.44-.3.4-.24h0l1.06.37,1.12.44-.14.09-.18.12-.37.28Z"/>
+                    <path class="cls-4"
+                          d="M59.23,48.92a17.23,17.23,0,0,1-1.8,1.48h0a8.94,8.94,0,0,1,1.49-1.81c.42-.42.85-.83,1.21-1.12a.47.47,0,0,1,.09-.06l.73.25-.45.3A15.49,15.49,0,0,0,59.23,48.92Z"/>
+                    <path class="cls-4"
+                          d="M58.4,45.58a9.83,9.83,0,0,1,1-.5s.41-.17,1-.37l.8-.25.06.07.35.38c-.37.13-.71.26-1,.38-.55.21-.91.38-.93.39s-.4.16-.9.42c-.24-.08-.48-.17-.73-.24C58.14,45.77,58.27,45.67,58.4,45.58Z"/>
+                    <path class="cls-4" d="M57.85,46.65l-.65-.18.35-.27.43-.33h0c.25.07.49.16.73.24h0l-.4.24-.44.3Z"/>
+                    <path class="cls-4" d="M56.76,71.51l.12-.28c.07.12.16.26.25.43C57,71.62,56.88,71.56,56.76,71.51Z"/>
+                    <path class="cls-4"
+                          d="M57.4,73.87c-.25-.87-.52-1.73-.67-2.29h0l0-.07c.12,0,.24.11.37.15.27.51.62,1.24.93,2s.58,1.42.76,2a9,9,0,0,1,.29,1,24.29,24.29,0,0,1,.13,3.15,9.73,9.73,0,0,1-.25,3,.13.13,0,0,0,0-.06s.11-.25-.11-.2c-.1-.49-.21-1.59-.34-2.71-.09-.75-.18-1.51-.25-2.07,0-.28-.08-.51-.11-.68s0-.25,0-.26,0-.38-.19-.93S57.61,74.59,57.4,73.87Z"/>
+                    <path class="cls-4" d="M56.7,71.48c-.08-.32-.12-.52-.09-.54s.14.09.27.29l-.12.28Z"/>
+                    <path class="cls-4"
+                          d="M56.13.22C57,.12,57.75.06,58.46,0c.94,0,1.74,0,2.31,0l.93,0,.23,0-.16,1-.66,1,.3.14a3.67,3.67,0,0,1,.68.49l-.57,0-.9-.08c-.52,0-1.27-.11-2.15-.13l-1,0c-.1-.29-.19-.54-.29-.77s-.12-.25-.18-.36a1.29,1.29,0,0,0-.3-.35l-.33-.3L56.16.44Z"/>
+                    <path class="cls-4"
+                          d="M56.26,1.74h0Zm-.48-.2L55.5,1.4l.66-1,.25.22.33.3a1.29,1.29,0,0,1,.3.35c.06.11.13.24.18.36s.19.48.29.77h-.82A3.89,3.89,0,0,0,56.44,2l-.17-.23h0s0,0,0,0h0l-.06,0Z"/>
+                    <path class="cls-4" d="M56.26,1.73h0Z"/>
+                    <path class="cls-4"
+                          d="M55.72,86.44c-.1-.15.71-.92.79-.71l-.28.37c-.19.22-.19.36-.18.38a.23.23,0,0,0,0,.12.85.85,0,0,0,.09.29c0,.08.1.17.14.24s0,0-.22,0a.68.68,0,0,1-.12-.12A.82.82,0,0,1,55.72,86.44Z"/>
+                    <path class="cls-4"
+                          d="M56.7,71.48a11.29,11.29,0,0,1-1.09-.57,3.26,3.26,0,0,0,.11-.33L57,71a1.52,1.52,0,0,0-.07.18s0,0,0,0c-.13-.2-.22-.31-.27-.29S56.62,71.16,56.7,71.48Z"/>
+                    <path class="cls-4"
+                          d="M55.54,62.68s0,.07,0,.07,0,0-.1,0,0-.08,0-.09l.07,0,.14,0c.21,0,.47,0,.73-.08a2.69,2.69,0,0,1,.78-.06,1.59,1.59,0,0,1,.3.06.37.37,0,0,1,.16.1.2.2,0,0,1,.07.15.23.23,0,0,1,0,.17.7.7,0,0,1-.17.14l-.27.21a.92.92,0,0,1-.42.2.82.82,0,0,1-.44-.11l-.31-.14c-.18-.1-.3-.16-.29-.18s.14,0,.33.05l.34.1a.72.72,0,0,0,.34.05c.18,0,.36-.29.53-.42s0,0,0,0h0l-.19,0a2.74,2.74,0,0,0-.71,0,4.44,4.44,0,0,1-.75,0Z"/>
+                    <path class="cls-4"
+                          d="M55.22,84.56a2.87,2.87,0,0,1,.79-.34c.77-.46,1.2-.77,2-1.3l.57-.29.28-.11c0,.17.06.27.09.27a12,12,0,0,1-1.75,1.15s-1.93.78-2,.62Z"/>
+                    <path class="cls-4"
+                          d="M55.18,95.46s.16,0,.37.14l.08.05-.17,0a.38.38,0,0,0-.1,0C55.26,95.51,55.18,95.47,55.18,95.46Z"/>
+                    <path class="cls-4"
+                          d="M54.85,85.94a1.91,1.91,0,0,0-.22.4l-.07.13a1.12,1.12,0,0,0-.07.29.45.45,0,0,0,0,.16h0s-.07,0-.1,0l-.12-.16a1,1,0,0,1,.08-.53,1.62,1.62,0,0,1,.1-.15,1.1,1.1,0,0,1,.26-.27c.21-.18.48-.25.49-.2S55,85.75,54.85,85.94Z"/>
+                    <path class="cls-4"
+                          d="M54.21,48.94a17.91,17.91,0,0,1,2.42-2l.57-.44.65.18-1,.64A20.84,20.84,0,0,1,54.21,48.94Z"/>
+                    <path class="cls-4"
+                          d="M53.91,69l.15-.25a.23.23,0,0,0,.18,0l.23.18h0a.42.42,0,0,1-.28.1A.57.57,0,0,1,53.91,69Z"/>
+                    <path class="cls-4"
+                          d="M54,87.35c-.18-.29-.37-.59-.55-.86v-.23s0-.12,0-.16l.06-.31a2.37,2.37,0,0,1,.18-.55,1.34,1.34,0,0,1,.68-.72,1.55,1.55,0,0,1,.81,0h0a.92.92,0,0,0-.69.19,1,1,0,0,0-.45.63,2.25,2.25,0,0,0-.11.48,2.45,2.45,0,0,0,0,.27v.21l.29.39a.06.06,0,0,0,0,0c0,.3.27.48.3.45s0-.15-.06-.3l.18,0,.45.07.92.12c.14.14.29.22.32.19s0-.09-.1-.19h0l0,0,.09-.08.18-.16L58,85.68l1.12-.94.51-1.63s0,0,0-.14v0a.19.19,0,0,0,0,.08h.86l.12,0h0v0h0v0h0l0,.08v0a1.43,1.43,0,0,1,0,.17l-.18.52-.49,1.36c-.79.59-1.79,1.36-2.82,2.15l-.43.33a.25.25,0,0,1-.08,0h0l-.09,0h-.07l-.13,0a1.43,1.43,0,0,1-.29,0c-.32,0-.63-.12-.93-.18l-.45-.1-.24-.06-.17,0S54.05,87.41,54,87.35Z"/>
+                    <path class="cls-4"
+                          d="M53.76,103.17l-.7-.13A11,11,0,0,1,54,102a8.63,8.63,0,0,0,1.71-2.48A5.15,5.15,0,0,0,56,96.53a1.75,1.75,0,0,0-.59-.93.38.38,0,0,1,.1,0l.17,0a1.8,1.8,0,0,1,.56.8,5.16,5.16,0,0,1-.08,3.17,9,9,0,0,1-1.68,2.72c-.28.34-.51.6-.65.8C53.78,103.16,53.77,103.17,53.76,103.17Z"/>
+                    <path class="cls-4"
+                          d="M50.81,43.3c.88-.31,1.75-.56,2.44-.74s1.36-.29,1.39-.3.59-.09,1.41-.14a18.94,18.94,0,0,1,3,.06,17.42,17.42,0,0,1,2.26.38l.62.15a4.16,4.16,0,0,1,1.24.48s0,0,0,0-.59-.12-1.26-.23A21.45,21.45,0,0,0,59,42.65a20.34,20.34,0,0,0-2.89.07c-.8.09-1.33.17-1.36.19s-.57.06-1.35.24c-.54.11-1.2.27-1.9.46Z"/>
+                    <path class="cls-4"
+                          d="M53.36,68c.18-.12.21-.21.21-.24l-.06-.19.21,0h.84a.17.17,0,0,1,.18.12A1.55,1.55,0,0,1,54.48,69h0l-.23-.18,0,0a1.4,1.4,0,0,0,.21-.91c-.17,0-.47,0-.65,0a.67.67,0,0,1-.27.33Z"/>
+                    <path class="cls-4" d="M53.57,68.18l-.08.06L53.32,68l0,0Z"/>
+                    <path class="cls-4"
+                          d="M53,103.12a.59.59,0,0,1,.05-.08l.7.13-.19.29c0,.07-.2.05-.36,0S53,103.21,53,103.12Z"/>
+                    <path class="cls-4"
+                          d="M52.49,30.69c0-.11,0-.19,0-.29s.09-.36.13-.54c.11-.35.24-.7.38-1a11.22,11.22,0,0,1,2.58-3.54,11,11,0,0,1,1.67-1.37,6.51,6.51,0,0,1,1.94-1,4.91,4.91,0,0,1,2.12-.1,7.73,7.73,0,0,1,1.87.6,10.16,10.16,0,0,1,1.62.87A5.34,5.34,0,0,1,66,25.61a10.8,10.8,0,0,1,1.14,2.52,16.49,16.49,0,0,1,.59,2.52,3.9,3.9,0,0,1-.18,2s0-.75,0-.76a17.77,17.77,0,0,0-.48-1.77v-.21s0-.1,0-.15c-.43-1.11-.52-1.34-.86-2.07l-.39-.8a5.29,5.29,0,0,0-1.67-2.12l-.29-.18h-.29l-.65-.32a5,5,0,0,0-3.45-.5,8.45,8.45,0,0,0-3.31,2.09,10.62,10.62,0,0,0-2.48,3.28,6.91,6.91,0,0,0-.37.95c-.05.16-.09.32-.13.48l0,.24,0,.09.28.22.41.32.85.6h0a9.23,9.23,0,0,0,2.41,1.09,22.51,22.51,0,0,0,2.47.64,15.88,15.88,0,0,0,2.67.36,2.64,2.64,0,0,0,.29.15.26.26,0,0,1,.17-.07c.35,0,.71-.06,1.06-.07l.05-.06h.16l.14,0A2.23,2.23,0,0,0,65,34a1.88,1.88,0,0,0,.24-.18,3.88,3.88,0,0,0,.65-.15l.17-.16c.23-.1.44-.2.62-.3a9.45,9.45,0,0,0,.92-.58s-.23.33-.85.72a7.36,7.36,0,0,1-2.83,1,12.77,12.77,0,0,1-4.43-.18,23.55,23.55,0,0,1-2.54-.58,9.39,9.39,0,0,1-2.61-1.13h0l-.86-.58L53,31.55l-.21-.16-.34-.27C52.46,31,52.48,30.83,52.49,30.69Z"/>
+                    <path class="cls-4"
+                          d="M52.42,47.22a6.31,6.31,0,0,0-.48-.84l.52-1a.82.82,0,0,1,.21.19,1.35,1.35,0,0,1,.17.34,2.81,2.81,0,0,1,.08.31C52.78,46.47,52.61,46.81,52.42,47.22Z"/>
+                    <path class="cls-4"
+                          d="M52.33,68.31a.74.74,0,0,0,.12-.6A9.85,9.85,0,0,1,52,66.3l.13-.07a7,7,0,0,0,1.1,1.61l.14.13,0,0,.17.24.08-.06c.21.21.44.41.67.61a.23.23,0,0,1-.18,0l-.15.25a.57.57,0,0,0,.28.08.42.42,0,0,0,.28-.1l.61.47a10.13,10.13,0,0,0,4.36,2,13.65,13.65,0,0,0,2.4.12,16.42,16.42,0,0,0,2.35-.22A5.89,5.89,0,0,0,68,69.45a27.21,27.21,0,0,0,2.4-3.28,15.19,15.19,0,0,0,2.22-5.6c.23-1.45.13-2.3.2-2.3a2.49,2.49,0,0,1,.09.6,2.06,2.06,0,0,1,0,.26c0,.15,0,.3,0,.48a6.06,6.06,0,0,1-.06,1,4.65,4.65,0,0,1-.08.61h-.14s0,0,.13.06a15.6,15.6,0,0,1-2,5.15c-.32.55-.67,1.11-1.07,1.68.09-.34.12-.56.06-.58s-.67,1-1.22,2l-.29.52h0a4.94,4.94,0,0,1-1.66,1.26,9.17,9.17,0,0,1-2.31.74l-.66.11v-.09a1.23,1.23,0,0,1,0-.17v0h0l-.37,0h-.57s0,.18,0,.44h-.07c0-.28,0-.43-.08-.44s-.06.16-.11.45a5.44,5.44,0,0,1-.57,0,14.65,14.65,0,0,1-2.55-.07,8.75,8.75,0,0,1-2.18-.62c-.09-.17-.18-.31-.25-.43s0,0,0,0A1.52,1.52,0,0,1,57,71l-1.24-.45a3.26,3.26,0,0,1-.11.33c-.37-.22-.73-.46-1.08-.71a16.79,16.79,0,0,1-2-1.68Z"/>
+                    <path class="cls-4" d="M52.07,45l.11-.23,1.18.58-.07.14c-.27-.09-.47-.18-.7-.28Z"/>
+                    <path class="cls-4"
+                          d="M51.43,70.37a2.09,2.09,0,0,1-.29-.32l0-.12v0A7,7,0,0,0,52,68.85l0,.11a.66.66,0,0,0,.24.45.48.48,0,0,0,0,.13l.28.46c.21.34.45.64.4.81s-.57.12-1-.1A4.77,4.77,0,0,1,51.43,70.37Z"/>
+                    <path class="cls-4"
+                          d="M51.49,67.16c.41-.68.45-1,.5-.86a9.85,9.85,0,0,0,.46,1.41.74.74,0,0,1-.12.6A7.68,7.68,0,0,1,51.49,67.16Z"/>
+                    <path class="cls-4"
+                          d="M54.34,4.36a11.85,11.85,0,0,0-2.57-.83l-.55-.1.28-.12.4-.16L52.27,3l.11,0a19.19,19.19,0,0,1,2.06.95,13.77,13.77,0,0,1,1.62,1l.88.65L57.4,6l.35.28.15.13c.3.25.55.51.58.54s0-.05,0-.13l-.09-.27a2.94,2.94,0,0,0-.12-.31c-.23-.64-.65-1.76-1-2.46a12.09,12.09,0,0,0-.61-1.28h.82c.12.33.24.71.37,1.13.26.88.58,1.93.95,3.18a1.15,1.15,0,0,0,0,.3,1.22,1.22,0,0,0,0,.26c0,.08.07.27,0,.11a2.37,2.37,0,0,0-.74-.52l-.25-.23c-.2-.17-.39-.32-.58-.46l-.45-.34-.86-.6A11.57,11.57,0,0,0,54.34,4.36Z"/>
+                    <path class="cls-4"
+                          d="M51.23,44.61,50,44.06l.61-.19.92-.26.15.07,1.33.59.64.28c.19.07.44.13.67.2,1.25.35,2.51.72,3.71,1.11h0l-.43.33-.35.27c-1-.28-2.09-.55-3.16-.82-.24-.06-.47-.11-.74-.2h0l.07-.14-1.18-.58-.11.23C51.79,44.84,51.52,44.72,51.23,44.61Z"/>
+                    <path class="cls-4"
+                          d="M51.62,64.7a.76.76,0,0,1-.21-.1c0-.15-.11-.29-.15-.43l.06,0a1.51,1.51,0,0,0,.41.18.48.48,0,0,1,.18.11.45.45,0,0,1,.17.41.37.37,0,0,1-.27.31.24.24,0,0,1-.14,0,.08.08,0,0,1,0,0c.06-.06.23-.15.2-.29a.23.23,0,0,0-.13-.16A.26.26,0,0,0,51.62,64.7Z"/>
+                    <path class="cls-4"
+                          d="M51,69.63a1.49,1.49,0,0,1,.1-.8c.19-.51.61-.83.75-.71s.1.42.14.73a7,7,0,0,1-.93,1.06A1.33,1.33,0,0,1,51,69.63Z"/>
+                    <path class="cls-4"
+                          d="M50.6,51.3c.1-.32.2-.62.31-.91a3.17,3.17,0,0,0,.72.4,4.79,4.79,0,0,0,1.8.19l.6,0,.51,0,.55-.08.3,0c.09,0,0,0-.06,0l-.14,0-.09,0a2.87,2.87,0,0,1-.52-.28l-.21-.16a3.11,3.11,0,0,1-.28-.23,4.39,4.39,0,0,1-.8-1c-.39-.68-.64-1.25-.86-1.69v0c.19-.41.36-.75.5-1,.06.21.11.45.18.75a11.83,11.83,0,0,0,.55,1.74,3.84,3.84,0,0,0,.23.45,3.46,3.46,0,0,0,.42.57l.24.23a2.34,2.34,0,0,0,.38.28,3.42,3.42,0,0,0,.8.43l.17.07s.16.09.17.11.12,0,.15,0,.12,0,0,.06l-.48.09-.88.16-.82.14-.62.09a6.94,6.94,0,0,1-2,.08A4.88,4.88,0,0,1,50.6,51.3Z"/>
+                    <path class="cls-4"
+                          d="M51.26,64.17c0,.14.1.28.15.43a.82.82,0,0,1-.25-.21,3,3,0,0,0-.21-.24c-.06-.05-.12-.05-.12-.08s.06-.07.17,0A.91.91,0,0,1,51.26,64.17Z"/>
+                    <path class="cls-4"
+                          d="M50.6,51.3a3.49,3.49,0,0,1-.74-.34l.81-.85a1.15,1.15,0,0,0,.24.28C50.8,50.68,50.7,51,50.6,51.3Z"/>
+                    <path class="cls-4" d="M49.42,43.82c.32-.14.66-.26,1-.39l.38-.13h0l.68.31-.92.26-.61.19Z"/>
+                    <path class="cls-4"
+                          d="M50,70.16l-.44-.48,0,0,.17-.19c.3-.28.48-.45.51-.49a11.63,11.63,0,0,0,1.33-1.81,7.68,7.68,0,0,0,.84,1.15,3.15,3.15,0,0,1-.31.54c0-.31,0-.64-.14-.73s-.56.2-.75.71a1.49,1.49,0,0,0-.1.8,1.33,1.33,0,0,0,.06.28l0,0-.65.61a1.43,1.43,0,0,1-.35-.26Z"/>
+                    <path class="cls-4"
+                          d="M50.39,2.32l-.47-.14h0c.26-.16.53-.31.8-.45l.41-.22.46-.22A15.63,15.63,0,0,1,55.26.33l.87-.11,0,.22-.66,1,.28.14.38.2.06,0h0s0,0,0,0h0l.17.23a3.89,3.89,0,0,1,.25.42l-1.19,0A15.6,15.6,0,0,0,52.38,3l-.5-.19C51.21,2.56,50.71,2.41,50.39,2.32Z"/>
+                    <path class="cls-4"
+                          d="M50,58.05h.1a9.74,9.74,0,0,0,1.23-.12,7.16,7.16,0,0,0,2.06-.64,17.43,17.43,0,0,0,2.46-1.67l.55-.45,0,0-.34.08-.55.14-.63.07-.82.06a11.87,11.87,0,0,1-1.45,0,7.41,7.41,0,0,1-2.14-.42l-.51-.21a9.46,9.46,0,0,1,.12-1.07,3.14,3.14,0,0,0,.68.53,5.23,5.23,0,0,0,1.84.65,9.72,9.72,0,0,0,1.41.1l.81,0c.34,0,.76-.05,1.16-.09a7.92,7.92,0,0,0,1-.07l0,0a7.13,7.13,0,0,0-.56.59c-.31.26-.48.48-.79.72l-.74.6c-.45.35-.87.65-1.28.91a10.47,10.47,0,0,1-2.1,1c-.56.2-1,.31-1.21.39l-.13,0C50.07,58.77,50,58.4,50,58.05Z"/>
+                    <path class="cls-4"
+                          d="M49.19,71.7l1.23-1.16,0,0h0a.22.22,0,0,0-.06.07,1.38,1.38,0,0,0-.15.3.73.73,0,0,0,.12.82,3.33,3.33,0,0,0,.26.24l.29.23.52.4c.33.23.55.35.54.43s-.32.14-.74,0a5.06,5.06,0,0,1-.69-.23l-.37-.17a2,2,0,0,1-1-1Z"/>
+                    <path class="cls-4"
+                          d="M49.78,3.34,49.9,2.2s0,0,0,0l.47.14c.32.09.82.24,1.49.48l.5.19-.11,0-.37.12-.4.16-.28.12a9.6,9.6,0,0,0-1-.09h-.47Z"/>
+                    <path class="cls-4"
+                          d="M49.62,50.31c.06-.19.13-.37.19-.55.37-.16.61-.23.64-.18S50.13,49.91,49.62,50.31Z"/>
+                    <path class="cls-4"
+                          d="M49.93,54.87a4.15,4.15,0,0,1-1-.63l.9-.76a.84.84,0,0,0,.25.32A9.46,9.46,0,0,0,49.93,54.87Z"/>
+                    <path class="cls-4" d="M50.12,59.13l-.26.08L49.73,58H50C50,58.4,50.07,58.77,50.12,59.13Z"/>
+                    <path class="cls-4"
+                          d="M49.28,60.89c0-.26-.1-.52-.14-.78a.15.15,0,0,0,0-.07v0l.14-.08h0l.05,0h0l0,0,0,0,0,0a.06.06,0,0,0,0,0l.14-.06h0l.12,0h0l0,0,0,.06a1.66,1.66,0,0,1,0,.22.9.9,0,0,1-.58.88Z"/>
+                    <path class="cls-4"
+                          d="M51,66.31a21.2,21.2,0,0,1-1.6-4.74l-.15-.68a.9.9,0,0,0,.58-.88,1.66,1.66,0,0,0,0-.22l0-.06,0,0h0s0,0,0,0v-.05h0l0-.49c0-.38,0-.75-.07-1.11h0l.13,1.17.26-.08c.1.72.23,1.46.38,2.2a24.87,24.87,0,0,0,.76,2.84A.91.91,0,0,0,51,64c-.11,0-.19,0-.17,0s.06,0,.12.08a3,3,0,0,1,.21.24.82.82,0,0,0,.25.21q.11.3.24.6s0,0,0,0h0q.12.32.27.63l.18.36L52,66.3c-.05-.11-.09.18-.5.86C51.32,66.88,51.17,66.6,51,66.31Z"/>
+                    <path class="cls-4"
+                          d="M49.15,71.59a2,2,0,0,1,0-1,3.18,3.18,0,0,1,.19-.61l.08-.16,0,0s0,0,0-.06a.38.38,0,0,1,.08-.09l.44.48.12.12a1.43,1.43,0,0,0,.35.26L49.19,71.7A.49.49,0,0,0,49.15,71.59Z"/>
+                    <path class="cls-4" d="M48.86,53.55c0-.28.08-.56.13-.83l.09-.47h0a.34.34,0,0,0,.1-.06l.56.82Z"/>
+                    <path class="cls-4"
+                          d="M48.76,54.7a10.92,10.92,0,0,1,.1-1.15l.88-.55-.56-.82a.34.34,0,0,1-.1.06,15.8,15.8,0,0,1,.54-1.93c.51-.4.85-.67.83-.73s-.27,0-.64.18c.07-.17.13-.33.2-.49.45-1,.84-1.76,1.16-2.44l.9-1.87.52.21c.23.1.43.19.7.28-.07.14-.19.39-.37.74a2.81,2.81,0,0,0-.08-.31,1.35,1.35,0,0,0-.17-.34.82.82,0,0,0-.21-.19l-.52,1a6.31,6.31,0,0,1,.48.84l-.09.18c-.32.65-.76,1.49-1.17,2.37-.08.2-.17.4-.25.62a1.15,1.15,0,0,1-.24-.28l-.81.85a3.49,3.49,0,0,0,.74.34,14.52,14.52,0,0,0-.42,1.64c0,.28-.1.57-.13.86a.84.84,0,0,1-.25-.32l-.9.76a4.15,4.15,0,0,0,1,.63,16.73,16.73,0,0,0,0,2c0,.38.05.78.1,1.17h-.31v0c-.06-.78-.1-1.54-.15-2.26l-.23-.29-.14-.19c-.09-.13-.19-.25-.27-.37S48.8,54.77,48.76,54.7Z"/>
+                    <path class="cls-4"
+                          d="M48.73,56.25a11.36,11.36,0,0,1,0-1.55c0,.07.09.14.14.21s.18.24.27.37l.14.19.23.29c.05.72.09,1.48.15,2.26v0c0,.36.05.73.07,1.11l0,.49h0l-.12.06h0l-.14.06a.06.06,0,0,1,0,0l0,0,0,0,0,0h0l-.05,0h0l-.14,0h0c0-.06,0-.14,0-.17s0,0,0,0L49,59.21l0-.29-.09-.83C48.84,57.45,48.78,56.83,48.73,56.25Z"/>
+                    <path class="cls-4" d="M48.64,80.17a1.56,1.56,0,0,1,.26,0,.89.89,0,0,1-.35.16Z"/>
+                    <path class="cls-4"
+                          d="M47.81,101.07c-.24-.14-.47-.28-.71-.44l.16,0c.25-.07.6-.18,1-.32a10,10,0,0,0,2.79-1.45,3.65,3.65,0,0,0,1.34-2.68,8.14,8.14,0,0,0,0-1.39h.06a4,4,0,0,1,.23,1.4,4.38,4.38,0,0,1-.26,1.52,3.68,3.68,0,0,1-1,1.49,10,10,0,0,1-2.88,1.66Z"/>
+                    <path class="cls-4" d="M48.4,58.23l-.09-.07h0s0,0,.07,0h0v0Z"/>
+                    <path class="cls-4"
+                          d="M48.4,58.23v0s0,0,0,0,0,0,0,0,0,0,0,0l.1.09a.13.13,0,0,1-.09.06c-.17,0-.13-.1-.16-.13a.29.29,0,0,1,0-.09.09.09,0,0,1,0-.07l.09.07Z"/>
+                    <path class="cls-4"
+                          d="M47.42,54.21a1,1,0,0,1-.06-.68c.06-.2.3-.32.48-.45l.27-.18,1-.65-.09.47c-.05.27-.09.55-.13.83l-.27.18-.28.17h0s0,0,0,0a.87.87,0,0,1,.05.12l.09.16c.09.16.2.32.32.5a11.36,11.36,0,0,0,0,1.55c0-.06,0-.1,0-.15v0L48.63,56l-.15-.19c-.1-.14-.2-.26-.3-.39a7.32,7.32,0,0,1-.52-.76l-.11-.2A2.59,2.59,0,0,1,47.42,54.21Z"/>
+                    <path class="cls-4"
+                          d="M48,74.51a3.3,3.3,0,0,1-.85-.86c.31-.31.62-.6.9-.87a.38.38,0,0,1,0,.1,2.77,2.77,0,0,0,.54.93c.53.64,1.39,1.07,1.32,1.25S48.9,75.12,48,74.51Z"/>
+                    <path class="cls-4"
+                          d="M50,44.06a19,19,0,0,0-2.08.81,8.24,8.24,0,0,0-1.12.66c-.06,0,.3-.47,1-.88a12.8,12.8,0,0,1,1.66-.83Z"/>
+                    <path class="cls-4"
+                          d="M48,82.07c-.87,1.27-1.11,2.3-1.23,2.28a3.73,3.73,0,0,1,.38-1.68,1.1,1.1,0,0,0,.31-.16.91.91,0,0,0-.26,0,6.33,6.33,0,0,1,.36-.75,9.07,9.07,0,0,1,1-1.51.89.89,0,0,0,.35-.16,1.56,1.56,0,0,0-.26,0c.75-1,1.67-1.94,2.56-2.89.71-.77,1.34-1.56,1.94-2.34a22.81,22.81,0,0,0,1.51-2.14,10.85,10.85,0,0,0,.83-1.59c.05-.11.09-.22.13-.3a11.29,11.29,0,0,0,1.09.57l0,.1h0l-.07.15a13.21,13.21,0,0,1-1,1.73A24.75,24.75,0,0,1,54,75.63c-.64.75-1.36,1.56-2.12,2.29A28.55,28.55,0,0,0,48,82.07Z"/>
+                    <path class="cls-4"
+                          d="M47.46,82.51a1.1,1.1,0,0,1-.31.16,1.17,1.17,0,0,1,.05-.11A.91.91,0,0,1,47.46,82.51Z"/>
+                    <path class="cls-4"
+                          d="M47,73.32a4.91,4.91,0,0,1-.21-.45l.07,0a1.19,1.19,0,0,0,.16-.08l.13-.07.77-.42a.82.82,0,0,1,.09.26c0,.07,0,.16.06.25-.28.27-.59.56-.9.87a.08.08,0,0,1,0,0l0,0A2.92,2.92,0,0,1,47,73.32Z"/>
+                    <path class="cls-4" d="M47,89.59c.1-.21.16-.33.18-.32a1.6,1.6,0,0,1-.12.43Z"/>
+                    <path class="cls-4" d="M47,58.25s.06-.06.14-.14l.23-.08,0,0C47.13,58.25,47,58.25,47,58.25Z"/>
+                    <path class="cls-4"
+                          d="M46.77,101.07a.17.17,0,0,1,0-.24.15.15,0,0,1,.09-.13l.26-.07h0c.24.16.47.3.71.44l-.36.13-.42.13a.13.13,0,0,1-.13-.06C46.91,101.2,46.84,101.13,46.77,101.07Z"/>
+                    <path class="cls-4"
+                          d="M46.71,72.79c.92-1.05,1.84-2.12,2.77-3.14l0,0a.38.38,0,0,0-.08.09s0,.06,0,.06l0,0-.08.16a3.18,3.18,0,0,0-.19.61,2,2,0,0,0,0,1,.49.49,0,0,1,0,.11l-.42.4c-.22.22-.46.45-.72.68,0-.09,0-.18-.06-.25a.82.82,0,0,0-.09-.26l-.77.42-.13.07a1.19,1.19,0,0,1-.16.08l-.07,0a.08.08,0,0,1,0-.05h0Z"/>
+                    <path class="cls-4"
+                          d="M46.51,58.84a.45.45,0,0,1,0-.34,1.08,1.08,0,0,1,.54-.38h0c-.08.08-.15.12-.14.14s.15,0,.35-.19l0,0a1.29,1.29,0,0,1,.4-.07,1.08,1.08,0,0,1,.56.2.09.09,0,0,0,0,.07.29.29,0,0,0,0,.09s0,.09.16.13a.13.13,0,0,0,.09-.06,1.9,1.9,0,0,1,.25.24.45.45,0,0,1,.11.23v.07a.37.37,0,0,1,0,.11c0,.1-.07.14-.08.14s.12-.25-.12-.47-.28-.21-.44-.33a.84.84,0,0,0-.53-.19,1.7,1.7,0,0,0-.58.18c-.18.09-.35.18-.38.26s0,.14.07.21a.44.44,0,0,0,.1.08s0,.1-.06.17-.12.12-.15.09a.57.57,0,0,1-.13-.14A.62.62,0,0,1,46.51,58.84Z"/>
+                    <path class="cls-4"
+                          d="M46.93,89.4a6.24,6.24,0,0,1-.52-2v-.08c.12-.08.17-.13.16-.15l-.17.07a5.1,5.1,0,0,1,.37-2.64h0a15.28,15.28,0,0,0,.1,2.73,6.13,6.13,0,0,0,.61,1.76c.24.43.45.73.46.75l.47.78c.28.45.65,1,1.07,1.59a9.39,9.39,0,0,0,1.26,1.4c.38.33.68.52.66.56s0,0,0,0a2.12,2.12,0,0,1-.79-.37,7.45,7.45,0,0,1-1.47-1.31A18.44,18.44,0,0,1,47.9,91c-.31-.44-.51-.75-.52-.77s-.13-.21-.3-.54a1.6,1.6,0,0,0,.12-.43s-.08.11-.18.32Z"/>
+                    <path class="cls-4"
+                          d="M46.77,72.87a4.91,4.91,0,0,0,.21.45,2.92,2.92,0,0,0,.17.27l0,0c-.06-.08-.1-.15-.15-.23s-.17-.35-.21-.44a.11.11,0,0,1,0-.06h0Z"/>
+                    <path class="cls-4" d="M46.74,72.87l-.07-.05,0,0h0l0,0h0a.08.08,0,0,0,0,.05h0Z"/>
+                    <path class="cls-4" d="M46.4,87.29l.17-.07s0,.07-.16.15A.12.12,0,0,1,46.4,87.29Z"/>
+                    <path class="cls-4"
+                          d="M45.91,54.56a3.89,3.89,0,0,1-.45-.71,2.33,2.33,0,0,1-.12-.34.63.63,0,0,1,0-.26.79.79,0,0,1,.24-.67c.05,0,.09-.09.15-.13l.13-.11.28-.24c.21-.17.44-.34.69-.52.49-.35,1.05-.72,1.57-1a12.93,12.93,0,0,1,1.45-.78c-.06.18-.13.36-.19.55-.27.2-.58.45-.91.72s-1,.79-1.42,1.18l-.6.56-.25.24-.11.12s-.08.08-.06.07a.32.32,0,0,1,0,.06,1,1,0,0,0,.06.21,3.27,3.27,0,0,0,.27.52c.25.39.93.85,1.43,1.53a3,3,0,0,1,.53,1.12,5,5,0,0,1,.11,1,2.75,2.75,0,0,1,0,.41.55.55,0,0,1,0,.17.29.29,0,0,1,0,.09l0,.06h0l-.1-.09h0v0h0s0,0,0,0l-.05,0s0-.07,0-.12,0-.23-.07-.37A3.36,3.36,0,0,0,47.52,56C47.05,55.45,46.37,55.1,45.91,54.56Z"/>
+                    <path class="cls-4"
+                          d="M46,76.54a2.82,2.82,0,0,1-.87-.8l.9-1c0,.07,0,.17.1.31a2.39,2.39,0,0,0,.43.74,3.75,3.75,0,0,0,.74.58c.23.14.39.17.43.24s-.18.27-.53.26A2.44,2.44,0,0,1,46,76.54Z"/>
+                    <path class="cls-4"
+                          d="M45.76,5.53c.09-.1.18-.21.28-.31a15.45,15.45,0,0,1,2.4-2.07A16.65,16.65,0,0,1,49.9,2.2l-.12,1.14h.47a9.6,9.6,0,0,1,1,.09l-.51.22c-.52.23-1,.49-1.49.74A20.75,20.75,0,0,0,46.73,6l-.24.18a.9.9,0,0,0-.21.08,3.63,3.63,0,0,0-.46.34A1.67,1.67,0,0,0,45.76,5.53Z"/>
+                    <path class="cls-4"
+                          d="M45.4,58.74a6.14,6.14,0,0,1,.4-.86,1.74,1.74,0,0,1,.3-.36l.32-.27a3.58,3.58,0,0,1,.36-.28c.11,0,.25-.11.35,0s.15.44.21.63,0,.17,0,.25a.3.3,0,0,1,0,.21l-.23.08.1-.12c.05-.07,0-.19-.07-.34s0-.27-.15-.39-.16,0-.21.08a1.7,1.7,0,0,0-.19.19c-.05.06-.18.17-.26.25a1.36,1.36,0,0,0-.21.29,6.41,6.41,0,0,0-.31.82,3.15,3.15,0,0,0-.14.44.59.59,0,0,0,0,.35,1.07,1.07,0,0,0,.65.48,4.32,4.32,0,0,0,1,.2,9.74,9.74,0,0,0,1.08,0c.33,0,.69-.13.71-.25a0,0,0,0,0,0,0c0,.26.1.52.14.78L49.1,61a2.59,2.59,0,0,1-.66.08A9,9,0,0,1,47.27,61a5,5,0,0,1-1.13-.28,1.53,1.53,0,0,1-.92-.83,1,1,0,0,1,0-.64A3.61,3.61,0,0,1,45.4,58.74Z"/>
+                    <path class="cls-4"
+                          d="M45.1,75.57a2.12,2.12,0,0,1-.27-.49,3.87,3.87,0,0,1,.58-.25,1.87,1.87,0,0,1,.64-.16.66.66,0,0,1,0,.09l-.9,1,0,0,0,0Z"/>
+                    <path class="cls-4"
+                          d="M44.65,7.44a.23.23,0,0,1,0-.11.88.88,0,0,1,.08-.27,6.19,6.19,0,0,1,1-1.53,1.67,1.67,0,0,1,.06,1,7,7,0,0,0-.55.54l-.18.19a3.83,3.83,0,0,1-.28.29h-.05A.22.22,0,0,1,44.65,7.44Z"/>
+                    <path class="cls-4"
+                          d="M44.83,75.08a2.12,2.12,0,0,0,.27.49l.07.11,0,0a.43.43,0,0,0,0-.07,3.39,3.39,0,0,1-.29-.54Z"/>
+                    <path class="cls-4"
+                          d="M44.18,27.43a27.31,27.31,0,0,1,4.9-5.25c.85-.68,1.44-1,1.49-1.06s.51-.31,1.3-.64a16.4,16.4,0,0,1,3.33-1A27.87,27.87,0,0,1,60.05,19a9.27,9.27,0,0,1,5.51,2h0s0,0,0,0a8.75,8.75,0,0,1,2.61,3,11.8,11.8,0,0,1,1.16,3.75,31.73,31.73,0,0,1,.29,3.67,14.82,14.82,0,0,1-.17,3.36,12.48,12.48,0,0,1-2,4.7c-.7,1-1.25,1.52-1.29,1.47s.09-.14.28-.42.46-.68.76-1.2a13.51,13.51,0,0,0,1.65-4.65,13.84,13.84,0,0,0,0-3.23,34.26,34.26,0,0,0-.39-3.56,11,11,0,0,0-1.17-3.45A7.82,7.82,0,0,0,65,21.83l0,0a8.39,8.39,0,0,0-4.87-1.68,27.82,27.82,0,0,0-4.61.6,15.09,15.09,0,0,0-3.07,1c-.71.31-1.09.57-1.14.58a15.64,15.64,0,0,0-1.37.94,23.75,23.75,0,0,0-3,2.82,23.49,23.49,0,0,0-1.74,2.09c-.14.2-.29.4-.43.61l-.11.14v0s0,0,0,.05l0,0,.23.27.52.6A49.34,49.34,0,0,0,50,34.51a26.4,26.4,0,0,0,2.66,2l.69.43.71.38c.47.25,1,.48,1.45.71,1.91.91,3.71,1.73,5.29,2.32A15,15,0,0,0,63,41a7.58,7.58,0,0,0,1.74.16,5.82,5.82,0,0,0,1.12-.11c.25,0,.37-.11.39-.1s-.49.39-1.5.47a7,7,0,0,1-1.82,0,11,11,0,0,1-1.26-.27l-1-.3c-1.63-.53-3.48-1.29-5.43-2.14-.49-.22-1-.43-1.49-.67L53,37.65l-.74-.43a25.94,25.94,0,0,1-2.8-2,47.56,47.56,0,0,1-4.91-4.66L44,30l-.28-.32-.46-.55s-.12-.09-.09-.14l.1-.14.2-.3.32-.46Z"/>
+                    <path class="cls-4"
+                          d="M43.41,79a3.21,3.21,0,0,1-.34-.72l.25-.31.12-.15a2.58,2.58,0,0,0,.34,1,2.44,2.44,0,0,0,.69.76,3.07,3.07,0,0,0,1.08.5,7.83,7.83,0,0,0,2.3.26,5.43,5.43,0,0,0,.79-.09l-.09.13a5.16,5.16,0,0,1-.69.14,7.09,7.09,0,0,1-2.39-.11,3.52,3.52,0,0,1-1.23-.51A2.69,2.69,0,0,1,43.41,79Z"/>
+                    <path class="cls-4"
+                          d="M43.32,77.93l-.25.31s0,0,0,0h0a2.09,2.09,0,0,1-.1-.41.22.22,0,0,1,.2-.2.26.26,0,0,1,.27.18v0Z"/>
+                    <path class="cls-4"
+                          d="M43,77.77a2.09,2.09,0,0,0,.1.41h0a1.76,1.76,0,0,1-.09-.36A.06.06,0,0,1,43,77.77Z"/>
+                    <path class="cls-4"
+                          d="M41.34,81.71a3.93,3.93,0,0,1-.28-.44l.26-.49a3.27,3.27,0,0,0,.37.66,3.35,3.35,0,0,0,2.05,1.35,6.19,6.19,0,0,0,2.55,0c.4-.07.71-.15.91-.2a1.17,1.17,0,0,0-.05.11,8,8,0,0,1-.81.28,6.31,6.31,0,0,1-2.66.17A3.74,3.74,0,0,1,41.34,81.71Z"/>
+                    <path class="cls-4"
+                          d="M40.83,80.82a2.6,2.6,0,0,0,.1-.25l0,0,.12-.28h0a.22.22,0,0,1,.1.13v0a2.52,2.52,0,0,0,.1.3l0,.07-.26.49A2.4,2.4,0,0,1,40.83,80.82Z"/>
+                    <path class="cls-4"
+                          d="M41.09,80.2s0,0,0,0h0l.48-1,.09-.12c.37-.54.69-1.1,1-1.67l.82-1.19c.43-.48.86-1,1.32-1.42.64-.65,1.26-1.33,1.87-2l0,0,0,0,.07.05h0a.11.11,0,0,0,0,.06c0,.09.11.25.21.44s.09.15.15.23c-.27.26-.54.53-.83.84l-.23.24a.73.73,0,0,0,0-.08,1.63,1.63,0,0,0-.64.16,2,2,0,0,0-.6.27.11.11,0,0,1,0,0l0,0a3.39,3.39,0,0,0,.29.54.43.43,0,0,1,0,.07c-.55.62-1.12,1.28-1.7,2v0a.26.26,0,0,0-.27-.17.22.22,0,0,0-.2.26.06.06,0,0,0,0,.06,1.76,1.76,0,0,0,.09.36c-.44.56-.88,1.15-1.29,1.78q-.24.36-.45.75l0-.08c0-.1-.06-.18-.08-.23s0-.08,0-.09A.2.2,0,0,0,41.09,80.2Z"/>
+                    <path class="cls-4"
+                          d="M43,93.66a6.89,6.89,0,0,1-1.57,0c-.29,0-.56-.07-.78-.11l-.15-.5a9.19,9.19,0,0,0,1,.17,5.82,5.82,0,0,0,1.46,0,6,6,0,0,0,1.61-.46,3.58,3.58,0,0,0,1.35-.93,2.74,2.74,0,0,0,.39-.64c.1-.23.19-.45.27-.65.18-.42.32-.76.43-1l.06.11c-.07.24-.18.57-.32,1-.07.2-.14.42-.23.66a4.16,4.16,0,0,1-.57.93,3.15,3.15,0,0,1-1.24.86A6.19,6.19,0,0,1,43,93.66Z"/>
+                    <path class="cls-4" d="M40.58,93.54c0-.16-.08-.33-.11-.49h.06l.15.5Z"/>
+                    <path class="cls-4"
+                          d="M40.47,93.05c0,.16.07.33.11.49l.1,0c.21.7.41,1.33.48,1.5a2.87,2.87,0,0,1,.16.57l.1.46c.07.31.14.61.2.92L42,98.89l.06.3,0,.07s0,0,0,0l.08-.1.6-.77.57-.74.39.84.8,1.7c0-.52,0-1,0-1.56.44.39.92.84,1.34,1.17.2.17.44.34.62.47l.35.24a1.82,1.82,0,0,0,.23.15l-.26.07a.15.15,0,0,0-.09.13.17.17,0,0,0,0,.24c.07.06.14.13.13.2a.13.13,0,0,0,.13.06l.42-.13.36-.13.52.3a13.84,13.84,0,0,0,3.16,1.3c.52.14,1,.26,1.57.37a.59.59,0,0,0-.05.08c0,.09,0,.23.2.31s.32.1.36,0l.19-.29c1.56.29,3.17.49,4.78.74l.9.14.2,0h.29l.32,0c.6,0,1.21-.08,1.81-.13l1.4-.14a.65.65,0,0,1-.09.16c0,.11.05.25.22.32s.34,0,.38,0l.2-.41.06-.12,1.45-.19c1.2-.18,2.4-.4,3.57-.68a18.23,18.23,0,0,0,3.39-1.13h0l3.17-1.25c1.09-.21,2-.36,3-.57.47-.13,1-.24,1.42-.41l.7-.23.68-.28a15.53,15.53,0,0,0,4.84-3.18,12,12,0,0,0,3.07-4.7A9.71,9.71,0,0,0,90,89.72a5.09,5.09,0,0,0,.12-.68l.05-.34c0-.12,0-.14,0-.21L89.84,88a5.27,5.27,0,0,0-.43-.51,4.5,4.5,0,0,0-1-.81A4.22,4.22,0,0,0,86,86.22a8.86,8.86,0,0,0-2.52.62c-.8.31-1.58.72-2.36,1.09s-1.54.76-2.29,1.13c-3,1.53-5.8,3-8.48,4.21A35,35,0,0,1,64,95.46a1.26,1.26,0,0,0-.42-.13c-.31,0-.46.11-.44.13a.8.8,0,0,1,.42,0l.17.06c-.32.08-.64.14-1,.19a18.51,18.51,0,0,1-6.09.11l-1-.17-.08-.05c-.21-.14-.36-.16-.37-.14s.08.05.18.14c-.33-.09-.63-.17-.91-.26l-1.59-.46-.43-.13s0-.07,0-.07,0,0,0,.06c-.19-.07-.36-.11-.48-.16a.93.93,0,0,1-.32-.12l.34.07,1,.23,1.6.4,1,.26,1.18.16a18.8,18.8,0,0,0,6-.23,32.75,32.75,0,0,0,7.45-2.52c2.64-1.2,5.41-2.73,8.4-4.3.74-.38,1.5-.78,2.29-1.15s1.55-.8,2.4-1.13a9.58,9.58,0,0,1,2.7-.7,4.68,4.68,0,0,1,4,1.48,6.57,6.57,0,0,1,.48.57l.47.71a2.27,2.27,0,0,1,0,.48l0,.36a6.17,6.17,0,0,1-.12.73,12.06,12.06,0,0,1-.41,1.42,12.74,12.74,0,0,1-3.22,5A16.24,16.24,0,0,1,82,99.69l-.71.31-.74.25c-.47.18-1,.29-1.48.43-1,.23-2.06.41-3,.59L73,102.49a18.53,18.53,0,0,1-3.56,1.23c-1.21.29-2.43.53-3.65.72s-2.45.33-3.67.45l-1.84.14-.31,0h-.53l-.17,0-.9-.13a65.24,65.24,0,0,1-7.18-1.22,15,15,0,0,1-3.4-1.37c-.53-.29-1-.6-1.55-.93l-.45-.31L45.7,101s0,.08,0,.11v.16c0,.5,0,1,0,1.48l.07,2.6L44.69,103c-.52-1.08-1-2.15-1.53-3.2l0,.07-.57.73c-.19.23-.4.49-.55.46a.47.47,0,0,1-.14-.08c-.1-.35-.21-.7-.34-1A25.2,25.2,0,0,0,41,95.33c-.11-.49-.92-3.6-1-4.08.08.2.33,1,.57,1.81Z"/>
+                    <path class="cls-4" d="M39.44,89.93l.39,1A5.41,5.41,0,0,1,39.44,89.93Z"/>
+                    <path class="cls-4"
+                          d="M39.41,85.33a25.39,25.39,0,0,1,1.42-4.51,2.4,2.4,0,0,0,.23.45c-.21.4-.39.81-.58,1.24a27.15,27.15,0,0,0-.87,3,4.39,4.39,0,0,0-.15,1,2.53,2.53,0,0,1-.2-.29h0C39.29,85.93,39.34,85.65,39.41,85.33Z"/>
+                    <path class="cls-4"
+                          d="M39.42,88a11.84,11.84,0,0,0,.41,2.9l-.39-1v0h0C39.47,89.6,39.43,88.85,39.42,88Z"/>
+                    <path class="cls-4"
+                          d="M39.42,87.18c0-.22,0-.44,0-.65a2.86,2.86,0,0,0,.63.65,3.84,3.84,0,0,0,2.53.76,19.34,19.34,0,0,0,2.75-.35,8.41,8.41,0,0,0,.88-.24l.15-.06a.12.12,0,0,0,0,.08,4.27,4.27,0,0,1-1,.39,14.74,14.74,0,0,1-2.78.51,4.12,4.12,0,0,1-2.81-.74A2.42,2.42,0,0,1,39.42,87.18Z"/>
+                    <path class="cls-4"
+                          d="M39.26,13.46a7.16,7.16,0,0,1,.5-1.1l.3-.48s.16-.19.38-.42a7.8,7.8,0,0,1,.82-.76h0l.55-.18c.37-.12.59-.39.52-.54.26-.13.43-.2.45-.16s-.6.58-1.16,1.18c-.28.3-.55.6-.74.85s-.3.42-.31.42l-.32.42a5.8,5.8,0,0,0-.58,1c-.38.71-.45,1.53-.54,1.53s-.1-.21-.09-.53A3.89,3.89,0,0,1,39.26,13.46Z"/>
+                    <path class="cls-4"
+                          d="M39.18,86.58l.06-.35h0a2.53,2.53,0,0,0,.2.29c0,.21,0,.43,0,.65a1.7,1.7,0,0,1-.19-.19c0-.12,0-.23,0-.35S39.18,86.6,39.18,86.58Z"/>
+                    <path class="cls-4"
+                          d="M39.42,88c0,.84,0,1.59,0,1.87a6.64,6.64,0,0,1-.24-3.24c0,.12,0,.23,0,.35a1.7,1.7,0,0,0,.19.19C39.41,87.46,39.41,87.74,39.42,88Z"/>
+                    <path class="cls-4"
+                          d="M38.59,9a4.26,4.26,0,0,1,2.6.09,2.39,2.39,0,0,1,1.15.92v0a6.79,6.79,0,0,0-1,.67l0,0h0c-.07,0-.12,0-.13,0a1,1,0,0,0-.1-.15,1.23,1.23,0,0,0-.39-.33A3.42,3.42,0,0,0,38.72,10a8.12,8.12,0,0,1-3.36-.27C35.36,9.46,37,9.3,38.59,9Z"/>
+                    <path class="cls-4"
+                          d="M35.87,29.44l-2,1.39-.42.28-.14.1-.2.15.32.07,1,.27,3.6,1c-.55.29-1.08.59-1.6.88l-.76.44-.29.17-.08.06h0s-.07,0-.06.07l.13.07c.94.6,1.8,1.13,2.52,1.58,1.45.9,2.36,1.5,2.44,1.54l1.24.86c.39.28.78.55,1.3.87s1.09.64,1.74,1c1.3.7,2.84,1.47,4.49,2.27l1.73.82-.38.13c-.35.13-.69.25-1,.39l-.79-.35c-1.69-.76-3.26-1.5-4.6-2.18-.67-.35-1.28-.68-1.83-1s-1-.64-1.38-.88l-1.24-.82L37.19,37c-.72-.46-1.56-1-2.51-1.64-.17-.13-.42-.28-.6-.44l-.22-.26a2.36,2.36,0,0,1-.15-.25c-.06-.09,0-.21,0-.28s0-.18.13-.28a1.33,1.33,0,0,1,.27-.25,2.16,2.16,0,0,1,.35-.24c.53-.34.4-.24.48-.28l.14-.07L35,33l-.05,0-.18,0-.58-.17-3.41-1,2.59-1.66.84-.53.21-.14.08,0,.15-.09.15-.1s-.08,0-.13-.07L34.46,29l-.27-.11-.44-.19a1.91,1.91,0,0,1-.31-.14,1,1,0,0,1-.28-.22.94.94,0,0,1,.12-1.27,8,8,0,0,0,1.86-3,15.93,15.93,0,0,0,.79-2.8,15.29,15.29,0,0,0,.25-2.24l.17.14h0a10.82,10.82,0,0,1-.05,2.15,15.55,15.55,0,0,1-.63,2.93A11.21,11.21,0,0,1,35,26a8.05,8.05,0,0,1-.51.83c-.1.13-.2.27-.31.4l-.16.2-.15.16a.25.25,0,0,0,0,.37.19.19,0,0,0,.09.05L34,28l.44.16,1.38.53.38.14.19.07.1,0,0,0s0,0,0,0Z"/>
+                    <path class="cls-4"
+                          d="M32.58,12.56a32,32,0,0,0,2.47,4c1.76,2.14,3,3.61,2.86,3.75s-.65-.35-1.56-1.15h0a1.86,1.86,0,0,0-.12-.56s0,.15,0,.41c-.54-.48-1.19-1.08-1.92-1.79a27.18,27.18,0,0,1-2.95-4L31.12,13l0-.07a.75.75,0,0,1-.07-.12l-.08-.19c-.1-.22-.19-.44-.28-.67a12.67,12.67,0,0,1-.44-1.4,14.19,14.19,0,0,1-.31-1.47c0-.25-.06-.51-.08-.77s0-.27,0-.4V7.7c0-.08,0-.2,0-.3a2.26,2.26,0,0,1,.37-1.11,1.92,1.92,0,0,1,1-.62l.27-.1.19-.05.36-.1.71-.19c.94-.23,1.85-.42,2.75-.58s1.78-.28,2.68-.34a13.89,13.89,0,0,1,2.52.14c1.49.19,2.69.44,3.54.62l1.38.3a.32.32,0,0,1,.2.16,6.19,6.19,0,0,0-1,1.53.88.88,0,0,0-.08.27.23.23,0,0,0,0,.11.22.22,0,0,0,.11.15h.05l-.22.23-1-.26c-.82-.2-2-.48-3.32-.72a13.68,13.68,0,0,0-2.08-.24c-.74,0-1.59.1-2.44.2s-1.76.24-2.65.4l-.66.14-.54.12a.4.4,0,0,0-.19.07.4.4,0,0,0-.07.19v.06a.66.66,0,0,0,0,.14c0,.11,0,.2,0,.31s0,.42,0,.64c0,.44.1.87.18,1.3a10.51,10.51,0,0,0,.3,1.26c.06.21.12.41.19.6l.05.13v0l0,.07Z"/>
+                </g>
+                <path class="cls-7"
+                      d="M71.58,82.36l-.3.13a.28.28,0,0,0,0-.07l0-.07c0-.06,0-.06,0-.17s0-.12,0-.18a.86.86,0,0,1,.14.13A1.54,1.54,0,0,1,71.58,82.36Z"/>
+                <path class="cls-7"
+                      d="M71.29,82.18c0,.11,0,.11,0,.17l0,.07a.69.69,0,0,0-.42-.35,1.72,1.72,0,0,0-.5,0,.38.38,0,0,0-.16,0s-.07,0-.08,0,0,0,0,0a.27.27,0,0,1,.17-.09,1.51,1.51,0,0,1,.56-.08.88.88,0,0,1,.41.16C71.28,82.06,71.28,82.12,71.29,82.18Z"/>
+                <path class="cls-7"
+                      d="M70.79,83.29c0,.1,0,.1-.05.15l0,.06a.76.76,0,0,0-.33-.45,2,2,0,0,0-.47-.15.46.46,0,0,0-.16,0,.1.1,0,0,1-.08,0s0,0,.07,0a.28.28,0,0,1,.18,0,1.56,1.56,0,0,1,.57.08.83.83,0,0,1,.35.26C70.81,83.17,70.8,83.22,70.79,83.29Z"/>
+                <path class="cls-7"
+                      d="M70.82,83.14c.17.23.21.49.13.59l-.27-.19h0a.89.89,0,0,0,0-.11,0,0,0,0,1,0,0C70.69,83.32,70.76,83.23,70.82,83.14Z"/>
+                <path class="cls-7" d="M70.72,83.58h0s0,0,0,0Z"/>
+                <path class="cls-10" d="M65.89,82h0v0l0,0h0V82Z"/>
+                <path class="cls-7" d="M65.88,82v0h-.08l-.16,0-.21,0h0l-.14,0s-.07-.06,0,0a4,4,0,0,0,.6-.09h0Z"/>
+                <polygon class="cls-10" points="65.02 82.2 65.02 82.21 65.02 82.21 65.02 82.2"/>
+                <path class="cls-10" d="M62.23,78.28s0,0,0,0l0,0h0Z"/>
+                <path class="cls-10"
+                      d="M61.66,77.83l0,0a.8.8,0,0,1,.17.15h-.08c-.06,0-.07.07-.07.08s-.06-.07-.07-.11l0-.07Z"/>
+                <path class="cls-10" d="M60.68,82.89a.06.06,0,0,0,0,0h0Z"/>
+                <path class="cls-11" d="M60.66,82.93a.19.19,0,0,1,0,.08h0l0,0Z"/>
+                <path class="cls-7" d="M60.66,82.93l0,.11h-.47S60.48,83,60.66,82.93Z"/>
+                <polygon class="cls-10" points="60.64 83.01 60.62 83.08 60.62 83.06 60.62 83.04 60.64 83.01"/>
+                <path class="cls-7" d="M58.89,82.52c.22,0,.08.15.11.2a.08.08,0,0,1,0,.06h0s-.06-.1-.09-.27Z"/>
+                <path class="cls-10"
+                      d="M56.27,87.13a.65.65,0,0,1,.1.19s-.18,0-.33-.19C56.23,87.14,56.24,87.16,56.27,87.13Z"/>
+                <path class="cls-10"
+                      d="M54.49,86.91c0,.16.09.28.07.31s-.26-.15-.3-.45a.06.06,0,0,1,0,0l.12.15s.07,0,.1,0Z"/>
+                <path class="cls-10" d="M86,27.13l.13.2-.37.05Z"/>
+                <path class="cls-10" d="M80.05,4c.16.17.21.27.18.32s-.15,0-.34,0l-.23-.06q-.14-.13-.27-.3l.47-.09Z"/>
+                <path class="cls-10"
+                      d="M72.86,31.88a4.68,4.68,0,0,0,0,.53.32.32,0,0,1-.15-.35A.27.27,0,0,1,72.86,31.88Z"/>
+                <path class="cls-10" d="M70.61,51.66l.19.36a2.64,2.64,0,0,1-.25-.29Z"/>
+                <path class="cls-10" d="M70.45,48h.09a.52.52,0,0,1,0,.18A1.08,1.08,0,0,1,70.45,48Z"/>
+                <path class="cls-10" d="M70.45,48h-.11C70.4,47.93,70.43,47.92,70.45,48Z"/>
+                <path class="cls-10" d="M69.46,47.57a1.24,1.24,0,0,1-.2.1.11.11,0,0,1,0-.08A.51.51,0,0,1,69.46,47.57Z"/>
+                <path class="cls-10"
+                      d="M64.81,7.55l-.3,0c0-.53,0-1,0-1.48q.14.47.24,1C64.76,7.31,64.81,7.52,64.81,7.55Z"/>
+                <path class="cls-10"
+                      d="M42.35,10c.07.16-.15.43-.52.55l-.56.18a.12.12,0,0,1,0,0A7.84,7.84,0,0,1,42.35,10Z"/>
+                <path class="cls-24" d="M26.81,34.72c0,.23,0,.47,0,.72h0c0-.13,0-.25,0-.37S26.8,34.84,26.81,34.72Z"/>
+                <g class="cls-25">
+                    <path class="cls-24"
+                          d="M26.81,34.72c0,.23,0,.47,0,.72h0c0-.13,0-.25,0-.37S26.8,34.84,26.81,34.72Z"/>
+                </g>
+                <g class="cls-26">
+                    <polygon class="cls-27" points="48.26 58.07 48.27 58.06 48.27 58.07 48.26 58.07"/>
+                    <polygon class="cls-28" points="47.97 58.07 48.27 57.69 48.27 58.06 48.26 58.07 47.97 58.07"/>
+                    <polygon class="cls-29" points="47.67 58.07 48.27 57.31 48.27 57.69 47.97 58.07 47.67 58.07"/>
+                    <polygon class="cls-30" points="47.38 58.07 48.27 56.93 48.27 57.31 47.67 58.07 47.38 58.07"/>
+                    <polygon class="cls-30" points="47.09 58.07 48.27 56.56 48.27 56.93 47.38 58.07 47.09 58.07"/>
+                    <polygon class="cls-31"
+                             points="46.79 58.07 48.22 56.24 48.27 56.24 48.27 56.56 47.09 58.07 46.79 58.07"/>
+                    <polygon class="cls-32" points="46.5 58.07 47.93 56.24 48.22 56.24 46.79 58.07 46.5 58.07"/>
+                    <polygon class="cls-33" points="46.2 58.07 47.63 56.24 47.93 56.24 46.5 58.07 46.2 58.07"/>
+                    <polygon class="cls-34" points="45.91 58.07 47.34 56.24 47.63 56.24 46.2 58.07 45.91 58.07"/>
+                    <polygon class="cls-35" points="45.62 58.07 47.04 56.24 47.34 56.24 45.91 58.07 45.62 58.07"/>
+                    <polygon class="cls-36"
+                             points="45.34 58.04 46.75 56.24 47.04 56.24 45.62 58.07 45.34 58.07 45.34 58.04"/>
+                    <polygon class="cls-37" points="45.34 57.67 46.45 56.24 46.75 56.24 45.34 58.04 45.34 57.67"/>
+                    <polygon class="cls-38" points="45.34 57.29 46.16 56.24 46.45 56.24 45.34 57.67 45.34 57.29"/>
+                    <polygon class="cls-39" points="45.34 56.91 45.87 56.24 46.16 56.24 45.34 57.29 45.34 56.91"/>
+                    <polygon class="cls-40" points="45.34 56.54 45.57 56.24 45.87 56.24 45.34 56.91 45.34 56.54"/>
+                    <polygon class="cls-41" points="45.57 56.24 45.34 56.54 45.34 56.24 45.57 56.24"/>
+                </g>
+                <path class="cls-24" d="M26.79,35.08c0,.12,0,.24,0,.37h0C26.78,35.32,26.79,35.2,26.79,35.08Z"/>
+                <g class="cls-25">
+                    <path class="cls-24" d="M26.79,35.08c0,.12,0,.24,0,.37h0C26.78,35.32,26.79,35.2,26.79,35.08Z"/>
+                </g>
+                <g class="cls-42">
+                    <polygon class="cls-43" points="26.77 35.37 26.79 35.34 26.79 35.45 26.77 35.45 26.77 35.37"/>
+                    <polygon class="cls-44"
+                             points="26.77 35.11 26.79 35.08 26.79 35.08 26.79 35.34 26.77 35.37 26.77 35.11"/>
+                    <polygon class="cls-45" points="26.79 35.08 26.77 35.11 26.77 35.08 26.79 35.08"/>
+                </g>
+                <path class="cls-46"
+                      d="M275.36,62.93v5.43c0,2.4-.85,3.26-3.22,3.26h-3.9V79.3c0,2.4-.84,3.25-3.21,3.25h-7.88c-2.45,0-3.22-.85-3.22-3.25V71.62H230.75c-2.37,0-3.21-.86-3.21-3.26V63.24c0-2.56.15-3.49,1.68-5.27l23.26-28.15c1.53-1.78,2.45-2.33,5-2.33H265c2.37,0,3.21.86,3.21,3.26V59.68h3.9C274.51,59.68,275.36,60.53,275.36,62.93ZM253.93,46.57,243.22,59.68h10.71Z"/>
+                <path class="cls-47"
+                      d="M323.25,82.55h-9.79c-4,0-4.9-.23-6.35-2.87L299.84,67l-7,12.72c-1.45,2.41-2.22,2.87-6.35,2.87H277c-2.3,0-2.83-1.39-1.61-3.25l15.76-24.82-15-23.89c-1.15-1.7-.62-3.1,1.53-3.1h9.18c3.9,0,4.82.31,6.27,2.72l6.89,11.94,6.81-11.94c1.45-2.56,2.44-2.72,5.89-2.72h9.79c2.22,0,2.6,1.4,1.53,3.1L308.94,54.48l16,24.82C326.08,81,325.62,82.55,323.25,82.55Z"/>
+                <path class="cls-48"
+                      d="M.11,22.35a23,23,0,0,0,3.52,5.58l3.76-1A45.48,45.48,0,0,1,3.51,22a2.07,2.07,0,0,1-.13-.19c0,.07.09.13.13.19a40,40,0,0,0,4,4.67,66.77,66.77,0,0,0,.74-7.1C4.6,18.05,2.55,19,2.55,19S-.62,20.07.11,22.35Z"/>
+                <path class="cls-1" d="M18.54,29.78v-.05l0,.27,0,.05C18.53,30,18.54,29.87,18.54,29.78Z"/>
+                <path class="cls-1" d="M24.13,33c0,.15,0,.3,0,.46C24.12,33.28,24.13,33.13,24.13,33Z"/>
+                <path class="cls-1"
+                      d="M34.76,48.41l-.13-.09c-1-.63-1.86-1.25-2.75-1.86s-2-1.35-2.89-2-1.94-1.37-2.85-2-1.88-1.37-2.76-2c-.72-.54-1.42-1.07-2.09-1.59l-.67-.51-1.27-1-1.13-.9-.36-.29-.06,0,0,.22-.39.1.09.07,1.66,1.36,1,.78,2.75,2.15c.94.71,1.88,1.42,2.83,2.12s1.86,1.37,2.8,2,1.86,1.33,2.79,2,1.92,1.34,2.88,2l.64.44,2.27,1.52.61-.15,0-.25-.07,0Z"/>
+                <polygon class="cls-1" points="24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55"/>
+                <path class="cls-49" d="M26.89,34.82c0,.24,0,.48,0,.73h0c0-.12,0-.24,0-.37S26.89,34.94,26.89,34.82Z"/>
+                <path class="cls-50" d="M26.89,34.82c0,.24,0,.48,0,.73h0c0-.12,0-.24,0-.37S26.89,34.94,26.89,34.82Z"/>
+                <path class="cls-49" d="M24.1,33.55h0s0-.08,0-.12,0-.31,0-.46q0,.27,0,.57Z"/>
+                <path class="cls-50" d="M24.1,33.55h0s0-.08,0-.12,0-.31,0-.46q0,.27,0,.57Z"/>
+                <path class="cls-51"
+                      d="M14.85,34.17c-.89-.77-1.75-1.55-2.58-2.32s-1.7-1.61-2.5-2.41a.93.93,0,0,0-.14-.14c-.78-.8-1.53-1.58-2.24-2.37l-3.76,1,.4.52c.52.66,1.09,1.35,1.69,2.07S7.13,32.16,7.9,33s1.47,1.6,2.25,2.41,1.35,1.4,2.06,2.1a.3.3,0,0,1,.08.08l5.1-1.26C16.53,35.62,15.68,34.89,14.85,34.17Z"/>
+                <path class="cls-52"
+                      d="M38.15,50.64l2.36,1.52,0,0,.34.22L43,53.74a4.77,4.77,0,0,1,2.46-1.27,3.82,3.82,0,0,0-2.84.61c.92-3.32.74-6.41-1.37-8.47a6.27,6.27,0,0,0-.61-.53,3.28,3.28,0,0,1,.42,3.37h0a9.2,9.2,0,0,0-2.66-5.4c-.34-.33-.71-.67-1.13-1a7.52,7.52,0,0,1,.64,7.42l-.22,1.92Z"/>
+                <path class="cls-53"
+                      d="M34.17,48.8q-1.44-1-2.88-2c-.93-.64-1.86-1.3-2.79-2s-1.87-1.34-2.8-2-1.89-1.41-2.83-2.12l-2.75-2.15-1-.78-1.66-1.36-.09-.07-5.1,1.26.16.15c.76.74,1.53,1.49,2.33,2.23s1.63,1.48,2.47,2.21,1.43,1.23,2.16,1.83l.44.36c.93.74,1.82,1.43,2.69,2.06s1.93,1.37,2.84,2c.59.39,1.17.75,1.73,1.08l1.44.82c1.13.62,2.27,1.2,3.41,1.72l5.12-1.26-2.27-1.52Z"/>
+                <path class="cls-54"
+                      d="M48.4,58.19a1,1,0,0,0,0-.28c-2.19-1.33-4.59-2.83-7.44-4.66l-.65-.41-.18-.12-2.42-1.58-.56-.37h0L32,52l.16.07a36.52,36.52,0,0,0,4.24,1.62l.15,0a9.33,9.33,0,0,0-2.9,2.13,13.29,13.29,0,0,1,6.58-1.22A6.11,6.11,0,0,1,39,57.5a6,6,0,0,0,2.1-2.16,7.42,7.42,0,0,0,.94,3.89,7.62,7.62,0,0,1,.19-4.31c1.7,1.08,3.26,2,5.11,3.11a1.08,1.08,0,0,1,.6,0,1.51,1.51,0,0,1,.35.17Z"/>
+                <path class="cls-55"
+                      d="M17.86,36.07l.36.29,1.13.9,1.27,1,.67.51c.67.52,1.37,1,2.09,1.59q1.32,1,2.76,2t2.85,2c.93.66,1.89,1.33,2.89,2s1.8,1.23,2.75,1.86l.13.09,2.89,1.91.07,0,.22-1.92a.49.49,0,0,1,0,.11,13.64,13.64,0,0,0-2.37-8,18,18,0,0,0-2.82-3.22A32.33,32.33,0,0,0,29.81,35c-.94-.67-2-1.35-3.12-2a6.73,6.73,0,0,1,.2,1.89c0,.12,0,.24,0,.36s0,.25,0,.37h0a8.36,8.36,0,0,0-3.24-5.34A7.62,7.62,0,0,1,24.13,33c0,.15,0,.3,0,.46s0,.08,0,.12h0a9,9,0,0,0-.61-2.11c-.06-.13-.12-.26-.19-.39a6.42,6.42,0,0,0-.34-.56,3.64,3.64,0,0,0-.24-.35,6.75,6.75,0,0,0-.67-.76l-.23-.23-.35-.29c-.52-.43-1-.78-1.4-1.07-.21-.15-.4-.28-.58-.39l-.21-.14L18.73,27a5.69,5.69,0,0,0-.58-.28h0a1.82,1.82,0,0,1,.11.28,9.11,9.11,0,0,1,.29,2.78l.2-1.76-.2,1.76v.05c0,.09,0,.18,0,.27l0-.05-.71,6Z"/>
+                <path class="cls-56"
+                      d="M7.51,26.71c.68.71,1.46,1.49,2.35,2.35l.14.13c.77.74,1.62,1.52,2.56,2.36s1.68,1.49,2.62,2.29,1.7,1.43,2.62,2.18l.71-6a7.26,7.26,0,0,0-1.78-3.8c-.24-.27-.49-.53-.75-.8-.81-.82-1.71-1.65-2.62-2.42a30.56,30.56,0,0,0-2.57-2,15.55,15.55,0,0,0-1.43-.88c-.38-.2-.75-.37-1.11-.52A66.77,66.77,0,0,1,7.51,26.71Z"/>
+                <path class="cls-49" d="M26.88,35.18c0,.13,0,.25,0,.37h0C26.87,35.43,26.88,35.31,26.88,35.18Z"/>
+                <path class="cls-50" d="M26.88,35.18c0,.13,0,.25,0,.37h0C26.87,35.43,26.88,35.31,26.88,35.18Z"/>
+                <path class="cls-57" d="M26.88,35.18c0,.13,0,.25,0,.37h0C26.87,35.43,26.88,35.31,26.88,35.18Z"/>
+                <path class="cls-49" d="M24.1,33.56s0-.08,0-.12,0,.08,0,.12Z"/>
+                <path class="cls-50" d="M24.1,33.56s0-.08,0-.12,0,.08,0,.12Z"/>
+                <path class="cls-58" d="M24.1,33.56s0-.08,0-.12,0,.08,0,.12Z"/>
+                <polygon class="cls-49" points="24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55"/>
+                <polygon class="cls-50" points="24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55"/>
+                <polygon class="cls-59" points="24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55"/>
+                <path class="cls-60"
+                      d="M6.93,17.42l.17,0,.09-.4,1.14.26.05-.19-1.14-.26.09-.4-.17,0Zm.54-2.33.81.66-1,.25,0,.22,1.31.3,0-.17-1-.24,1-.24,0-.12-.8-.65,1,.24,0-.17-1.31-.3Z"/>
+            </g>
+        </g>
+    </g>
 </svg>
\ No newline at end of file
diff --git a/media/logos/SVG/logo PLC4X on dark bg.svg b/media/logos/SVG/logo PLC4X on dark bg.svg
index 918a4cec8d9..9f5027b75f0 100644
--- a/media/logos/SVG/logo PLC4X on dark bg.svg	
+++ b/media/logos/SVG/logo PLC4X on dark bg.svg	
@@ -1,1492 +1,1492 @@
-<!--
-    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
-
-         http://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.
--->
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 325.53 105.92">
-    <defs>
-        <style>
-            .cls-1{fill:none;}.cls-2{isolation:isolate;}.cls-3{fill:#f2e8df;}.cls-4{opacity:0.13;}.cls-13,.cls-4{mix-blend-mode:multiply;}.cls-5{fill:#3c2517;}.cls-6{fill:#644c53;}.cls-7{fill:#a66870;}.cls-8{fill:#744a54;}.cls-9{fill:#231f20;}.cls-10{fill:#fff;}.cls-11{fill:#473439;}.cls-12{fill:#f7b2c6;}.cls-13{opacity:0.15;}.cls-14{fill:#3e362f;}.cls-15{fill:#f4f0d2;}.cls-16{fill:#97646d;}.cls-17{fill:#96636a;}.cls-18{fill:#8f8280;}.cls-19{fill:#dbd3d1;}.cls-20{fill:#694650;}.cls-21{fill:#c4869a;}.cls-22{fill:#a6938f;}.cls-23{fill:#bd2330;}.cls-24,.cls-49{opacity:0.35;mix-blend-mode:screen;}.cls-25{clip-path:url(#clip-path);}.cls-26{fill:#68308b;}.cls-27{fill:#682f8a;}.cls-28{fill:#692f8a;}.cls-29{fill:#6a2f89;}.cls-30{fill:#6b2f89;}.cls-31{fill:#6c2f88;}.cls-32{fill:#6c2e88;}.cls-33{fill:#6d2e87;}.cls-34{fill:#6e2e87;}.cls-35{fill:#6e2e86;}.cls-36{fill:#6f2e86;}.cls-37{fill:#702e85;}.cls-38{fill:#702d85;}.cls-39{fill:#712d85;}.cls-40{fill:#722d84;}.cls-41{clip-path:url(#clip-path-2);}.cls-42{fill:#c7203a;}.cls-43{fill:#c8203a;}.cls-44{fill:#c82039;}.cls-45{fill:url(#linear-gradient);}.cls-46{fill:url(#New_Gradient_Swatch_3);}.cls-47{fill:url(#New_Gradient_Swatch_6);}.cls-48,.cls-49{fill:#bc2331;}.cls-50{fill:url(#New_Gradient_Swatch_3-2);}.cls-51{fill:url(#New_Gradient_Swatch_5);}.cls-52{fill:url(#New_Gradient_Swatch_3-3);}.cls-53{fill:url(#New_Gradient_Swatch_5-2);}.cls-54{fill:url(#New_Gradient_Swatch_3-4);}.cls-55{fill:url(#New_Gradient_Swatch_3-5);}.cls-56{fill:url(#New_Gradient_Swatch_3-6);}.cls-57{fill:url(#New_Gradient_Swatch_3-7);}.cls-58{fill:url(#New_Gradient_Swatch_3-8);}.cls-59{fill:#6e7071;}
-        </style>
-        <clipPath id="clip-path">
-            <path class="cls-1"
-                  d="M47.35,58a1.74,1.74,0,0,1,.92-.09V58s0-.14,0-.16l-2.63-1.61a1.4,1.4,0,0,1-.27.58c.66.41,1.31.79,2,1.2Z"/>
-        </clipPath>
-        <clipPath id="clip-path-2">
-            <path class="cls-1" d="M26.79,35.08c0,.12,0,.24,0,.37h0C26.78,35.32,26.79,35.2,26.79,35.08Z"/>
-        </clipPath>
-        <linearGradient id="linear-gradient" x1="251.28" y1="114.16" x2="251.58" y2="28.41"
-                        gradientUnits="userSpaceOnUse">
-            <stop offset="0.32" stop-color="#9d2064"/>
-            <stop offset="0.63" stop-color="#c92039"/>
-            <stop offset="0.75" stop-color="#cd2035"/>
-            <stop offset="1" stop-color="#e77927"/>
-        </linearGradient>
-        <linearGradient id="New_Gradient_Swatch_3" x1="300.05" y1="114.33" x2="300.35" y2="28.58"
-                        xlink:href="#linear-gradient"/>
-        <linearGradient id="New_Gradient_Swatch_6" x1="-8246.19" y1="-964.14" x2="-8237.17" y2="-953.61"
-                        gradientTransform="translate(-5900.3 -5809.9) rotate(-142)" gradientUnits="userSpaceOnUse">
-            <stop offset="0" stop-color="#f49624"/>
-            <stop offset="0.31" stop-color="#f79823"/>
-            <stop offset="0.84" stop-color="#e77927"/>
-        </linearGradient>
-        <linearGradient id="New_Gradient_Swatch_3-2" x1="-8312.88" y1="-965.31" x2="-8248.59" y2="-965.31"
-                        gradientTransform="translate(-5900.3 -5809.9) rotate(-142)" xlink:href="#linear-gradient"/>
-        <linearGradient id="New_Gradient_Swatch_5" x1="-8305.12" y1="-958.86" x2="-8266.81" y2="-958.86"
-                        gradientTransform="translate(-5900.3 -5809.9) rotate(-142)" gradientUnits="userSpaceOnUse">
-            <stop offset="0" stop-color="#272761"/>
-            <stop offset="0.1" stop-color="#66318b"/>
-            <stop offset="0.79" stop-color="#9f2065"/>
-            <stop offset="0.95" stop-color="#cd2032"/>
-        </linearGradient>
-        <linearGradient id="New_Gradient_Swatch_3-3" x1="-8309.27" y1="-965.91" x2="-8244.98" y2="-965.91"
-                        gradientTransform="translate(-5900.3 -5809.9) rotate(-142)" xlink:href="#linear-gradient"/>
-        <linearGradient id="New_Gradient_Swatch_5-2" x1="-8304.44" y1="-965.55" x2="-8270.88" y2="-965.55"
-                        xlink:href="#New_Gradient_Swatch_5"/>
-        <linearGradient id="New_Gradient_Swatch_3-4" x1="-8309.27" y1="-959.25" x2="-8244.98" y2="-959.25"
-                        gradientTransform="translate(-5900.3 -5809.9) rotate(-142)" xlink:href="#linear-gradient"/>
-        <linearGradient id="New_Gradient_Swatch_3-5" x1="-8313.26" y1="-959.58" x2="-8248.97" y2="-959.58"
-                        gradientTransform="translate(-5900.3 -5809.9) rotate(-142)" xlink:href="#linear-gradient"/>
-        <linearGradient id="New_Gradient_Swatch_3-6" x1="-8309.27" y1="-957.27" x2="-8244.98" y2="-957.27"
-                        gradientTransform="translate(-5900.3 -5809.9) rotate(-142)" xlink:href="#linear-gradient"/>
-        <linearGradient id="New_Gradient_Swatch_3-7" x1="-8309.27" y1="-957.5" x2="-8244.98" y2="-957.5"
-                        gradientTransform="translate(-5900.3 -5809.9) rotate(-142)" xlink:href="#linear-gradient"/>
-        <linearGradient id="New_Gradient_Swatch_3-8" x1="-8273.15" y1="-957.55" x2="-8258.94" y2="-957.55"
-                        gradientTransform="translate(-5900.3 -5809.9) rotate(-142)" xlink:href="#linear-gradient"/>
-    </defs>
-    <title>logo PLC4X on dark bg</title>
-    <g class="cls-2">
-        <g id="Layer_2" data-name="Layer 2">
-            <g id="Layer_1-2" data-name="Layer 1">
-                <path class="cls-3"
-                      d="M134.89,46.77c0,12.19-7.6,19-19.47,19h-9.29V79c0,2.39-.83,3.24-3.19,3.24H94.26c-2.36,0-3.19-.85-3.19-3.24V30.73c0-2.39.83-3.24,3.19-3.24h21.08C127.13,27.49,134.89,34.51,134.89,46.77ZM119.3,46.7c0-3.4-2.06-5.71-5.63-5.71h-7.54V52.33h7.54A5.25,5.25,0,0,0,119.3,46.7Z"/>
-                <path class="cls-3"
-                      d="M153.46,30.73v38h18.26c2.44,0,3.27.78,3.27,3.24v7c0,2.39-.83,3.24-3.27,3.24H141.59c-2.36,0-3.2-.85-3.2-3.24V30.73c0-2.39.84-3.24,3.2-3.24h8.67C152.62,27.49,153.46,28.34,153.46,30.73Z"/>
-                <path class="cls-3"
-                      d="M200.75,26.34c11.72,0,19.1,4.85,22.22,13.49.84,2.24.23,3.4-2.05,4.17l-8.15,2.93c-2.35.69-3.19.31-4.1-2.08-1.3-3.47-3.58-5-7.92-5-5.93,0-8.29,2.62-8.29,8v14c0,5.4,2.36,8,8.29,8,4.26,0,6.7-1.7,8-5,.84-2.39,1.83-2.93,4.11-2.08l8.07,2.93c2.28.77,2.89,1.92,2.05,4.16-3.12,8.64-10.5,13.5-22.22,13.5-14.91,0-23.36-8.25-23.36-21.6V47.93C177.39,34.59,185.84,26.34,200.75,26.34Z"/>
-                <path class="cls-3"
-                      d="M281.15,20.75h-.29c-.23,0-.3,0-.35-.18l-.73-1.87H276.7L276,20.57c0,.14-.12.18-.35.18h-.26c-.16,0-.19-.07-.14-.19l2.64-6.66a.21.21,0,0,1,.25-.17h.3c.14,0,.2,0,.25.16l2.63,6.67C281.33,20.68,281.3,20.75,281.15,20.75Zm-2.76-5.66a2.57,2.57,0,0,1-.14-.68h-.05a3.14,3.14,0,0,1-.12.68l-1.18,3h2.67Z"/>
-                <path class="cls-3"
-                      d="M289.79,15.94a2,2,0,0,1-2.22,2.18h-2.12v2.43c0,.15-.05.2-.2.2h-.32c-.15,0-.2-.05-.2-.2V14c0-.15,0-.2.2-.2h2.64A2,2,0,0,1,289.79,15.94Zm-.76,0a1.4,1.4,0,0,0-1.54-1.51h-2.05v3h2.05A1.4,1.4,0,0,0,289,15.94Z"/>
-                <path class="cls-3"
-                      d="M298.19,20.75h-.29c-.23,0-.3,0-.35-.18l-.73-1.87h-3.08L293,20.57c-.05.14-.11.18-.35.18h-.26c-.15,0-.18-.07-.13-.19l2.63-6.66a.21.21,0,0,1,.25-.17h.3c.14,0,.2,0,.25.16l2.64,6.67C298.38,20.68,298.35,20.75,298.19,20.75Zm-2.76-5.66a2.82,2.82,0,0,1-.13-.68h-.05a2.82,2.82,0,0,1-.13.68l-1.18,3h2.68Z"/>
-                <path class="cls-3"
-                      d="M304.12,13.62a2.38,2.38,0,0,1,2.62,1.68c.05.15,0,.21-.13.26l-.31.11c-.13,0-.19,0-.24-.12a1.73,1.73,0,0,0-1.94-1.27c-1.31,0-2,.67-2,1.8v2.34c0,1.13.7,1.8,2,1.8a1.74,1.74,0,0,0,1.95-1.29c.06-.14.12-.17.25-.13l.31.12c.14,0,.17.1.12.24a2.39,2.39,0,0,1-2.63,1.72c-1.74,0-2.71-.93-2.71-2.47V16.09C301.41,14.56,302.36,13.62,304.12,13.62Z"/>
-                <path class="cls-3"
-                      d="M315.62,14v6.59c0,.15-.05.2-.2.2h-.32c-.15,0-.2-.05-.2-.2v-3h-3.74v3c0,.15-.05.2-.2.2h-.32c-.15,0-.2-.05-.2-.2V14c0-.15.05-.2.2-.2H311c.15,0,.2.05.2.2v2.91h3.74V14c0-.15.05-.2.2-.2h.32C315.57,13.76,315.62,13.81,315.62,14Z"/>
-                <path class="cls-3"
-                      d="M324.09,14v.27c0,.15,0,.2-.2.2h-3.47v2.44h3c.14,0,.19.05.19.2v.27c0,.15-.05.2-.19.2h-3v2.54H324c.13,0,.18.05.18.19v.28c0,.15-.05.2-.18.2H319.9c-.15,0-.19-.05-.19-.2V14c0-.15,0-.2.19-.2h4C324,13.76,324.09,13.81,324.09,14Z"/>
-                <g class="cls-4">
-                    <path class="cls-5"
-                          d="M90.45,87.94s2.46,8-7.72,13.13c-14.94,7.5-25,5.06-34,1-1.17-.52-2,.19-3.07-7.68s2.64,3.24,3.21,3.31,23.75-.42,23.75-.42Z"/>
-                </g>
-                <path class="cls-6"
-                      d="M90.87,88.31a1.76,1.76,0,0,1,0,.48l0,.36a6.21,6.21,0,0,1-.13.73,10.36,10.36,0,0,1-.4,1.42,12.7,12.7,0,0,1-3.22,5A16.1,16.1,0,0,1,82,99.69l-.71.31-.74.25c-.48.18-1,.29-1.48.43-1,.23-2.06.41-3,.59l-3,1.22a18.53,18.53,0,0,1-3.56,1.23c-1.21.29-2.43.53-3.65.71s-2.45.34-3.67.45l-1.84.15-.31,0h-.53l-.18,0-.9-.13a65.47,65.47,0,0,1-7.17-1.22,14.85,14.85,0,0,1-3.4-1.37c-.53-.29-1-.6-1.55-.93l-.45-.31L45.7,101s0,.08,0,.11v.16c0,.49,0,1,0,1.48l.07,2.6L44.69,103c-.52-1.08-1-2.15-1.53-3.2l0,.07-.58.73c-.18.23-.39.49-.54.46l-.15-.08c-.1-.35-.21-.7-.33-1A25.2,25.2,0,0,0,41,95.33c-.11-.49-.92-3.61-1-4.08.08.19.32,1,.57,1.81h-.07l.12.49.1,0c.21.7.4,1.33.48,1.5a3,3,0,0,1,.16.56l.1.47c.07.31.14.61.2.92L42,98.89l.06.3v.06s0,0,0,0l.08-.1.6-.77.56-.74.4.84.8,1.7c0-.52,0-1,0-1.56.44.39.91.84,1.34,1.17.2.17.44.34.62.47l.35.24.22.15-.25.07a.15.15,0,0,0-.09.13.17.17,0,0,0,0,.24c.07.06.14.13.13.2a.13.13,0,0,0,.13.06l.41-.13.37-.13c.17.1.34.2.52.29a13.43,13.43,0,0,0,3.16,1.31c.51.14,1,.26,1.57.37a.28.28,0,0,0-.05.08c0,.09,0,.23.2.31s.32.1.36,0l.19-.29c1.56.29,3.17.49,4.78.74l.9.14.19,0h.3l.32,0c.6,0,1.21-.08,1.81-.13l1.4-.14a1.63,1.63,0,0,1-.09.16c0,.11.05.25.22.32s.33,0,.38,0l.2-.41.06-.12,1.45-.19c1.2-.18,2.4-.4,3.56-.68a18.09,18.09,0,0,0,3.4-1.13h0l3.17-1.25c1.09-.21,2-.36,3-.57.47-.13,1-.24,1.42-.41l.7-.23.68-.28a15.53,15.53,0,0,0,4.84-3.18,12,12,0,0,0,3.07-4.7A10.14,10.14,0,0,0,90,89.72a5.09,5.09,0,0,0,.12-.68l.05-.34a1,1,0,0,0,0-.21L89.83,88a5.17,5.17,0,0,0-.42-.51,4.33,4.33,0,0,0-1-.81A4.17,4.17,0,0,0,86,86.22a8.86,8.86,0,0,0-2.52.62c-.8.31-1.58.72-2.37,1.09s-1.53.76-2.29,1.13c-3,1.53-5.79,3-8.47,4.21A35.84,35.84,0,0,1,64,95.46a1.26,1.26,0,0,0-.42-.13c-.31,0-.46.11-.44.12a1.06,1.06,0,0,1,.42,0l.17.06c-.32.08-.64.14-1,.19a18.79,18.79,0,0,1-6.09.11l-1-.17-.08-.05a.61.61,0,0,0-.37-.15s.07.06.17.15l-.9-.26-1.59-.46-.43-.13s0-.07,0-.07,0,0,0,.06l-.48-.16a1.22,1.22,0,0,1-.32-.12l.34.07,1,.23,1.6.4,1,.25,1.18.17a18.8,18.8,0,0,0,6-.23,32.68,32.68,0,0,0,7.44-2.52c2.65-1.2,5.42-2.73,8.4-4.3.75-.38,1.51-.78,2.3-1.15s1.55-.8,2.4-1.13a9.6,9.6,0,0,1,2.69-.7,4.88,4.88,0,0,1,2.86.55,5.28,5.28,0,0,1,1.18.92c.16.2.34.37.48.58Z"/>
-                <path class="cls-7"
-                      d="M90.14,88.49a1,1,0,0,1,0,.21l-.05.34a5.09,5.09,0,0,1-.12.68,10.14,10.14,0,0,1-.39,1.33,12,12,0,0,1-3.07,4.7,15.53,15.53,0,0,1-4.84,3.18l-.68.28-.7.23c-.46.17-1,.28-1.42.41-1,.21-1.92.36-3,.57l-3.17,1.25h0a18.09,18.09,0,0,1-3.4,1.13c-1.16.28-2.36.5-3.56.68l-1.45.19c.13-.25.3-.58.5-1s.49-1,.73-1.55a5.19,5.19,0,0,0,.46-1.93,3.85,3.85,0,0,0-.25-2,4.18,4.18,0,0,0-1.06-1.36,3,3,0,0,0-.66-.44,35.84,35.84,0,0,0,6.35-2.19c2.68-1.18,5.48-2.68,8.47-4.21.76-.37,1.51-.77,2.29-1.13s1.57-.78,2.37-1.09A8.86,8.86,0,0,1,86,86.22a4.17,4.17,0,0,1,2.46.48,4.33,4.33,0,0,1,1,.81,5.17,5.17,0,0,1,.42.51Z"/>
-                <path class="cls-6"
-                      d="M88,7.18a18.2,18.2,0,0,1-.09,2,22.89,22.89,0,0,1-.78,4.09,21.5,21.5,0,0,1-1.48,3.82,8.88,8.88,0,0,1-.88,1.45c0-.06,0-.09,0-.09a.79.79,0,0,0,0,.14h0s-.07.05-.09,0a7.62,7.62,0,0,1,.54-1.75,29.25,29.25,0,0,0,1-3.84,25.11,25.11,0,0,0,.48-3.95c0-1.09,0-1.82,0-1.87a11.5,11.5,0,0,0,0-1.16c-.05-.63-.18-1.59-.84-1.91a2.89,2.89,0,0,0-1.36-.23,15.37,15.37,0,0,0-1.63.14c-.54.07-1.08.11-1.58.16h-.48l-.46,0c.17.27.3.49.39.65s.22.4.19.43-.17-.08-.38-.27S80,4.6,79.66,4.2l.23.06c.19.06.32.08.34,0s0-.15-.18-.32l-.19-.16,1.29-.24,1.54-.32A17.19,17.19,0,0,1,84.39,3a3.84,3.84,0,0,1,1.9.21,2.49,2.49,0,0,1,1.27,1.4,5.66,5.66,0,0,1,.34,1.35C88,6.68,88,7.14,88,7.18Z"/>
-                <path class="cls-3"
-                      d="M86.7,7.22s.06.78,0,1.87A25.11,25.11,0,0,1,86.24,13a29.25,29.25,0,0,1-1,3.84,7.62,7.62,0,0,0-.54,1.75s0,0,.09,0c0,.31,0,1.08,0,1.84,0,.5-.06,1-.1,1.38s-.07.63-.07.65,0,.27-.08.64-.11.76-.2,1.19c0-.09,0-.19,0-.3,0-.29,0-.63,0-1a7.16,7.16,0,0,0-.42-1.35,5,5,0,0,0-1-1.34A7.31,7.31,0,0,0,81.41,19a6.82,6.82,0,0,0-3.92-.93,4.21,4.21,0,0,0-2,.82A6.4,6.4,0,0,0,74,20.35a5.3,5.3,0,0,0-.85,1.74c-.18.57-.31,1.11-.42,1.62a32.86,32.86,0,0,0-.55,3.49c0,.08-.16,1.47-.21,3.51a15.86,15.86,0,0,0,1.33,7.34l.12.23.15.28a.6.6,0,0,0,.68.32,1.42,1.42,0,0,0,.32-.07,2.76,2.76,0,0,0,.3-.15l.42-.29c.54-.39,1-.78,1.53-1.17,1-.77,1.87-1.51,2.62-2.17A15.16,15.16,0,0,0,82,32.39a1.54,1.54,0,0,0,.09-.24l.38.46c.05.07.1.12.08.11h0l-.31.27a5.54,5.54,0,0,0-.83,1.07c-.52.93-1.07,2.09-1.78,3.18a8.35,8.35,0,0,1-1.16,1.48,7.12,7.12,0,0,1-1.32,1,12.63,12.63,0,0,0-1.39.88h0a1.1,1.1,0,0,0-.33-.45c-.14-.07-.22,0-.22,0s.07,0,.14.13a1.23,1.23,0,0,1,.17.42c.06.22.11.48.16.77a4,4,0,0,0-1.12.58c0,.08.52-.07,1.17-.23,0,.12,0,.25,0,.37a2.18,2.18,0,0,1,0,.51c-.27.14-.43.26-.41.28s.14,0,.37-.06a3.1,3.1,0,0,1-.15.46h0c-.64.18-1.22.49-1.18.58s.45,0,.95-.09c-.11.17-.18.26-.18.27s-.16.24-.43.55a7.27,7.27,0,0,1-1.09,1,2.76,2.76,0,0,1-1.36.44c-.4,0-.68,0-.7,0s.27.15.7.2a3,3,0,0,0,1-.07v.06a4.89,4.89,0,0,0-.52.42,3.16,3.16,0,0,1-1.28.58,4.38,4.38,0,0,1-1.39,0l-.21,0a2.7,2.7,0,0,0,.53-.46,2.11,2.11,0,0,0,.41-.59,1.07,1.07,0,0,0,.1-.24c-.06-.06-.26.3-.68.65a3.92,3.92,0,0,1-1.83.81,7.36,7.36,0,0,1-2,.12,4.51,4.51,0,0,1-.92-.2l-.26-.08a2.87,2.87,0,0,1-.58-.27c-.34-.24-.77-.62-1.21-1,.4-.27.78-.52,1.08-.68s.66-.24.66-.29-.31-.07-.75,0a9.59,9.59,0,0,0-1.34.61l0,0-1.07-.94.69-.23c1.49-.49,3-.87,3-1s0,0-.11,0l.46-.79.29,0,.32,0a.37.37,0,0,0,.23-.05.2.2,0,0,0,.08-.24.85.85,0,0,0-.25-.37.41.41,0,0,0-.24-.1h0l-1.6-.64c1-.08,1.55-.41,1.49-.47s.6-.44,1.3-1.47a12.55,12.55,0,0,0,2-4.7,14.28,14.28,0,0,0,.16-3.36,31.65,31.65,0,0,0-.28-3.67A11.8,11.8,0,0,0,68.21,24a8.88,8.88,0,0,0-2.61-3h0l0,0a9.26,9.26,0,0,0-5.51-2,27.83,27.83,0,0,0-4.85.52,17.8,17.8,0,0,0-3.33,1c-.79.34-1.23.63-1.3.65a16.69,16.69,0,0,0-1.49,1.06,25.2,25.2,0,0,0-3.12,3,24.7,24.7,0,0,0-1.78,2.24l-.42.61-.32.47-.2.29-.1.15c0,.05.06.09.08.14l.47.54L44,30l.55.6a47.56,47.56,0,0,0,4.91,4.66,25.94,25.94,0,0,0,2.8,2l.74.43.76.38c.51.24,1,.45,1.49.67,2,.84,3.79,1.61,5.42,2.14.36.11.69.21,1,.29l-.38,1.42A19.94,19.94,0,0,0,59,42.18a18.9,18.9,0,0,0-3-.06,11.45,11.45,0,0,0-1.4.14,13.73,13.73,0,0,0-1.39.29c-.7.19-1.56.44-2.44.75h0l-1.73-.82c-1.65-.8-3.19-1.57-4.49-2.27-.65-.35-1.24-.68-1.75-1s-.9-.59-1.29-.87c-.75-.51-1.19-.82-1.24-.86s-1-.64-2.44-1.54l-2.53-1.58-.12-.07s0,0,.05-.07h0l.08,0,.28-.17.76-.44L38,32.67l-3.61-1-1-.27-.32-.07.2-.15.14-.1.42-.28,2-1.39.67-.45,0,0,0,0-.09,0-.19-.07-.38-.15-1.38-.52L34,28l-.12,0a.15.15,0,0,1-.09-.06.24.24,0,0,1,0-.36l.15-.16.16-.2c.11-.13.21-.27.3-.4A5.62,5.62,0,0,0,35,26a11.13,11.13,0,0,0,.71-1.67,15.55,15.55,0,0,0,.63-2.93,10,10,0,0,0,0-2.16c.92.8,1.49,1.23,1.56,1.16s-1.09-1.61-2.85-3.75a32,32,0,0,1-2.47-4l-.15-.29,0-.07v0L32.33,12c-.07-.19-.13-.39-.2-.6a12.83,12.83,0,0,1-.29-1.26,11.6,11.6,0,0,1-.18-1.3c0-.22,0-.44,0-.64s0-.21,0-.31a.66.66,0,0,1,0-.14V7.72a.49.49,0,0,1,.08-.18c.05,0,.11,0,.19-.07l.54-.13.66-.13c.89-.16,1.78-.3,2.64-.4s1.71-.18,2.45-.2a13.41,13.41,0,0,1,2.07.24c1.36.24,2.51.52,3.32.72l1,.26.22-.23a3.83,3.83,0,0,0,.28-.29c.06-.07.12-.12.17-.19s.37-.37.56-.54h0a3.63,3.63,0,0,1,.46-.34.9.9,0,0,1,.21-.08L46.73,6a20.75,20.75,0,0,1,2.49-1.59c.48-.26,1-.51,1.49-.74l.51-.22.54.1a11.74,11.74,0,0,1,2.58.83,10.61,10.61,0,0,1,1.59.91c.27.19.56.38.86.6l.45.34c.19.14.38.29.58.46l.25.23a2.52,2.52,0,0,1,.74.52c.1.16,0,0,0-.11a2.46,2.46,0,0,1,0-.26,1.11,1.11,0,0,1,0-.3c-.37-1.25-.69-2.31-.95-3.18-.13-.42-.25-.8-.37-1.13l1,0c.88,0,1.63.08,2.15.13l.9.08.57,0,.17.15a8.67,8.67,0,0,1,2.17,4.3c0,.19.07.36.08.43v0l.29,0v0A45.57,45.57,0,0,1,65,2.81l.58,0h.76l.45,0a2.92,2.92,0,0,0,.44-.06c.45-.07.88-.17,1.32-.25l.28.29a6.8,6.8,0,0,1,1,1.53c.08.17.17.36.24.55a5.8,5.8,0,0,1,.21.89c0,.3.08.62.13.94l.06.49,0,.25,0,.13s0,0,0,0l.15-.49a15.41,15.41,0,0,1,.75-2,8.45,8.45,0,0,1,.67-1.2,3.69,3.69,0,0,1,.72-.78,6.43,6.43,0,0,1,.73-.48A3.27,3.27,0,0,1,74,2.38a16.23,16.23,0,0,1,2.16.54c.85.29,1.62.62,2.26.86s.93.34,1.23.42c.36.4.64.68.84.87s.34.29.38.27,0-.18-.19-.43-.22-.38-.39-.65l.46,0h.48c.5,0,1-.09,1.58-.16a15.37,15.37,0,0,1,1.63-.14,2.89,2.89,0,0,1,1.36.23c.66.32.79,1.28.84,1.91A11.5,11.5,0,0,1,86.7,7.22ZM86,6.12a3.52,3.52,0,0,0-.09-.85c0-.06-.25,0-.5.07l-.28.12h0a5.33,5.33,0,0,0-1.27.38,11.1,11.1,0,0,1-1.32.49,2.49,2.49,0,0,1-.44.09l.5.72a1.39,1.39,0,0,1,.24-.35A2.85,2.85,0,0,1,84,6.05a1.71,1.71,0,0,1,1.14-.11l0,.22A4.49,4.49,0,0,1,85,7.58c-.17.71-.35,1.44-.41,1.87-.32-.59-.63-1-.7-1a11.42,11.42,0,0,0,.56,1.74c.15.43.27.86.35,1.19s.1.55.11.57a4.42,4.42,0,0,1,.1.54,7.64,7.64,0,0,1,0,1.22,9.48,9.48,0,0,0-.1,1.82,5.29,5.29,0,0,0,.56-1.76,6.33,6.33,0,0,0,.18-1.31,6.26,6.26,0,0,0,0-.64s-.06-.26-.18-.6A9.92,9.92,0,0,0,84.92,10c-.06-.1-.11-.21-.16-.31a13.38,13.38,0,0,0,.94-1.93A4.77,4.77,0,0,0,86,6.12ZM74.92,43.19a.77.77,0,0,0,0-.38.17.17,0,0,0,0-.12s-.08,0-.12,0-.22.12-.21.14-.12-.11-.14-.08a.37.37,0,0,0,0,.38.33.33,0,0,0,.23.23C74.77,43.41,74.86,43.33,74.92,43.19Zm-.76-1.43a.5.5,0,0,0,.21-.35.17.17,0,0,0,0-.12.13.13,0,0,0-.13,0c-.17,0-.25.09-.25.12s-.13-.11-.14-.1l-.06.08a.56.56,0,0,0-.13.24.19.19,0,0,0,.13.24A.48.48,0,0,0,74.16,41.76Zm-.2,2a.69.69,0,0,0,.22-.62,1.19,1.19,0,0,0-.24-.55,1.73,1.73,0,0,0-.41-.4A1.34,1.34,0,0,0,73,42a3.59,3.59,0,0,0-1,0l-.16,0-.11,0-.2.07-.17,0h-.11l-.13,0a.83.83,0,0,0-.29,0,3,3,0,0,0-.37,0,4.5,4.5,0,0,0-.69.2l-.36.18a2.37,2.37,0,0,0-.79.63,2,2,0,0,0-.49,1.33,2,2,0,0,0,.19.79,1,1,0,0,0,.72.56,1.8,1.8,0,0,0,.81-.09.68.68,0,0,0,.31.18,1.77,1.77,0,0,0,.91,0,3.42,3.42,0,0,0,.69-.28h0a.47.47,0,0,0,.24.08.76.76,0,0,0,.55-.18c.21-.21.36-.4.42-.45s0,0,0,0h0A0,0,0,0,0,73,45l-.06,0v0s.09,0,.12,0a.51.51,0,0,0,.16-.09.57.57,0,0,0,.23-.3C73.52,44.05,73.64,44,74,43.79Zm-7.28,1.85a.58.58,0,0,0-.25-.49C66.17,45,66,45,66,45s-.14-.09-.15-.06a1.86,1.86,0,0,0-.3.45.58.58,0,0,0,.07.61.73.73,0,0,0,1.11-.38ZM41.63,11c.57-.6,1.21-1.1,1.17-1.18s-.2,0-.45.15h0A2.51,2.51,0,0,0,41.19,9,4.34,4.34,0,0,0,38.59,9c-1.58.35-3.23.51-3.23.73a8.12,8.12,0,0,0,3.36.27,3.36,3.36,0,0,1,1.91.28,1.31,1.31,0,0,1,.4.32,1.43,1.43,0,0,1,.1.16s0,0,.13,0a9,9,0,0,0-.82.75c-.23.24-.37.42-.38.43l-.3.48a5.39,5.39,0,0,0-.5,1.1,3.59,3.59,0,0,0-.2,1.17c0,.33,0,.54.09.54s.16-.82.54-1.54a6.13,6.13,0,0,1,.58-.94l.32-.42s.12-.18.31-.42A9.63,9.63,0,0,1,41.63,11Z"/>
-                <path class="cls-6"
-                      d="M86.37,27l-.22.33c-.26.37-.62.88-1.06,1.46l-.69.91c-.11.16-.24.32-.36.48a1.94,1.94,0,0,0-.13.2l.15.08.47.27,1.65,1-2.52.84s-.26-.26-.51-.53l-.21.76.72-.23h0c0,.15-.06.26-.08.35v0c-.08.32-.09.37-.1.39l-.09.06s-.12.06-.26.16l-.24.19a4.89,4.89,0,0,0-.72.85c-.5.81-1.17,2-2,3.11a9.16,9.16,0,0,1-1.36,1.48,4.41,4.41,0,0,1-.78.52c-.25.14-.5.26-.72.37a4,4,0,0,1-1.58.54,12.63,12.63,0,0,1,1.39-.88,7.12,7.12,0,0,0,1.32-1,8.35,8.35,0,0,0,1.16-1.48c.71-1.09,1.26-2.25,1.78-3.18A5.54,5.54,0,0,1,82.22,33l.31-.27h0s0,0-.08-.11l-.38-.46s0-.11.07-.17l.51-.14,1.11-.31.28-.08h0l.15,0-.15-.13-1.2-.78.66-.76.4-.46c.27-.29.52-.58.76-.85s.71-.77,1-1.06l.37-.05-.13-.2-.24.25c-.76.07-2.18.14-2.28.11.13,0,2.18-.26,2.59-.4Z"/>
-                <path class="cls-8" d="M86,27.13l.13.2-.37.05Z"/>
-                <path class="cls-6"
-                      d="M85.93,5.27a3.52,3.52,0,0,1,.09.85,4.77,4.77,0,0,1-.32,1.66,13.38,13.38,0,0,1-.94,1.93l-.14-.26h0c.06-.43.24-1.16.41-1.87a4.49,4.49,0,0,0,.09-1.42l0-.22a.2.2,0,0,1,.08,0,.38.38,0,0,1,.09.08l-.07,0v0h0l.06,0a0,0,0,0,1,0,0,.57.57,0,0,1,.11-.1l-.12.07v0l.7-.38a.77.77,0,0,0-.67-.23h-.14l.28-.12C85.68,5.23,85.92,5.21,85.93,5.27Z"/>
-                <path class="cls-6"
-                      d="M86,5.68l-.7.38A.38.38,0,0,0,85.17,6a.2.2,0,0,0-.08,0,3.17,3.17,0,0,0-.1-.38s.06,0,.15-.1h.15A.77.77,0,0,1,86,5.68Z"/>
-                <path class="cls-6"
-                      d="M85.64,12.47a6.33,6.33,0,0,1-.18,1.31,5.29,5.29,0,0,1-.56,1.76,9.48,9.48,0,0,1,.1-1.82,7.64,7.64,0,0,0,0-1.22,4.42,4.42,0,0,0-.1-.54s0-.24-.11-.57-.2-.76-.35-1.19a11.42,11.42,0,0,1-.56-1.74c.07,0,.38.4.7,1h0c0,.22,0,.35,0,.37s.07,0,.13-.11c0,.1.1.21.16.31a9.92,9.92,0,0,1,.49,1.21c.12.34.17.59.18.6A6.26,6.26,0,0,1,85.64,12.47Z"/>
-                <path class="cls-6" d="M85.27,6.09,85.39,6a.57.57,0,0,0-.11.1A0,0,0,0,0,85.27,6.09Z"/>
-                <path class="cls-9" d="M85.26,6.06v0l-.06,0h0v0Z"/>
-                <path class="cls-6"
-                      d="M85.14,5.46c-.09,0-.15.08-.15.1a3.17,3.17,0,0,1,.1.38A1.71,1.71,0,0,0,84,6.05a2.85,2.85,0,0,0-1.1.74,1.39,1.39,0,0,0-.24.35l-.5-.72a2.49,2.49,0,0,0,.44-.09,11.1,11.1,0,0,0,1.32-.49A5.33,5.33,0,0,1,85.14,5.46Z"/>
-                <path class="cls-3"
-                      d="M85.71,27.38c-.28.29-.62.65-1,1.06s-.49.56-.76.85l-.4.46-.66.76-.28-.09c.29-1,.59-2.12.81-2.93C83.53,27.52,85,27.45,85.71,27.38Z"/>
-                <path class="cls-6"
-                      d="M84.93,20.44c0,.5,0,1,0,1.39s-.06.65-.06.67,0,.27-.1.65-.18.88-.31,1.36-.32,1-.46,1.31a3.35,3.35,0,0,1-.26.57,14.12,14.12,0,0,1,.43-1.68c0,.13,0,.19,0,.19s0-.22,0-.61.16-.85.2-1.19.07-.63.08-.64,0-.27.07-.65.08-.88.1-1.38c0-.76,0-1.53,0-1.84h0l.05,0A12.72,12.72,0,0,1,84.93,20.44Z"/>
-                <path class="cls-6"
-                      d="M84.23,42.73c.44.18.69.36.67.4a3.54,3.54,0,0,1-.75-.15,15.35,15.35,0,0,0-1.64-.3c-.6-.08-1.21-.15-1.67-.19l-.8-.06-.79-.1a5.52,5.52,0,0,0-1.61,0,13.16,13.16,0,0,0-1.43.34V42.4a8.88,8.88,0,0,1,1.33-.48,5.75,5.75,0,0,1,.92-.18,5.87,5.87,0,0,1,.83,0l.82,0s.34,0,.81.12,1.07.19,1.68.34A11,11,0,0,1,84.23,42.73Z"/>
-                <path class="cls-9" d="M84.79,18.53l-.05,0a.79.79,0,0,1,0-.14S84.78,18.47,84.79,18.53Z"/>
-                <path class="cls-6" d="M84.62,9.45l.14.26c-.06.08-.11.12-.13.11S84.59,9.67,84.62,9.45Z"/>
-                <path class="cls-3"
-                      d="M84.25,31.42l-.15,0h0l-.28.08-1.11.31-.51.14c.13-.37.29-.94.47-1.56l.28.09,1.2.78Z"/>
-                <path class="cls-6"
-                      d="M84.24,24c0,.11,0,.21,0,.3a.85.85,0,0,0,0,.17l-.06.25c0-.16-.07-.39-.11-.7s-.08-.63-.13-1a10.2,10.2,0,0,0-.47-1.21,4.69,4.69,0,0,0-1-1.17,6.62,6.62,0,0,0-1.33-1.08,6.21,6.21,0,0,0-3.58-.71,3.61,3.61,0,0,0-1.61.73,5.45,5.45,0,0,0-1.25,1.29A4.39,4.39,0,0,0,74,22.34l0,.09a3.44,3.44,0,0,0-.71.65s.21-.15.63-.36c0,0,0,0,0,.06-.86.76-1.1,1.77-1.2,4a11.17,11.17,0,0,0,.24,3.6h0a3.25,3.25,0,0,0,0,.33c0,.36,0,.74,0,1.13a.27.27,0,0,0-.15.18.32.32,0,0,0,.15.35A14.36,14.36,0,0,0,73,34.1a13.5,13.5,0,0,0,1,3.66l.1.22.08.16c0,.07.07.08.12.07l.15,0,.14-.07.41-.26c.53-.35,1.05-.73,1.55-1.09,1-.72,1.92-1.42,2.71-2s1.42-1.12,1.86-1.48c0,0,.21-.28.56-.71s.46-1.5,1-2.71c.06-.15.13-.32.19-.49.23-.59.44-1.28.6-1.85h0c-.22.81-.52,2-.81,2.93-.18.62-.34,1.19-.47,1.56L82,32l.09.12a1.54,1.54,0,0,1-.09.24A15.16,15.16,0,0,1,79.46,35c-.75.66-1.64,1.4-2.62,2.17-.49.39-1,.78-1.53,1.17l-.42.29a2.76,2.76,0,0,1-.3.15,1.42,1.42,0,0,1-.32.07.6.6,0,0,1-.68-.32l-.15-.28-.12-.23A15.86,15.86,0,0,1,72,30.71c.05-2,.2-3.43.21-3.51a32.86,32.86,0,0,1,.55-3.49c.11-.51.24-1.05.42-1.62A5.3,5.3,0,0,1,74,20.35a6.4,6.4,0,0,1,1.47-1.42,4.21,4.21,0,0,1,2-.82,6.82,6.82,0,0,1,3.92.93,7.31,7.31,0,0,1,1.39,1.22,5,5,0,0,1,1,1.34A7.16,7.16,0,0,1,84.2,23C84.22,23.36,84.23,23.7,84.24,24Z"/>
-                <path class="cls-8" d="M84.25,24.29c0,.39,0,.62,0,.61s0-.06,0-.19l.06-.25A.85.85,0,0,1,84.25,24.29Z"/>
-                <path class="cls-7"
-                      d="M84,24c0,.31.08.54.11.7a14.12,14.12,0,0,0-.43,1.68v0h0a.3.3,0,0,1,0,.11.39.39,0,0,1,0,.13s0,.06,0,.1,0,.18-.08.28a1.21,1.21,0,0,1,0,.18,1.8,1.8,0,0,1,0,.19s0,0,0,0a.42.42,0,0,0,0,.06,0,0,0,0,1,0,0c-.16.57-.37,1.26-.6,1.85l-1.35-.11a7.18,7.18,0,0,0,.15-2.11,4.53,4.53,0,0,0-.64-2,11.8,11.8,0,0,0-1.13-1.66,4.19,4.19,0,0,0-1.46-1.21,5,5,0,0,0-4.1,0l-.32.2,0-.09a4.39,4.39,0,0,1,.69-1.51,5.45,5.45,0,0,1,1.25-1.29,3.61,3.61,0,0,1,1.61-.73,6.21,6.21,0,0,1,3.58.71,6.62,6.62,0,0,1,1.33,1.08,4.69,4.69,0,0,1,1,1.17A10.2,10.2,0,0,1,83.91,23C84,23.38,84,23.72,84,24Z"/>
-                <path class="cls-8" d="M83.43,27.47v0h0A0,0,0,0,0,83.43,27.47Z"/>
-                <path class="cls-6" d="M83.66,32.5l-.72.23.21-.76C83.4,32.24,83.63,32.48,83.66,32.5Z"/>
-                <path class="cls-6"
-                      d="M83.34,41.11A14.82,14.82,0,0,1,81.12,41a10.13,10.13,0,0,0-1.52.06c-.41,0-.69.1-.7.1l-.72.09c-.42.06-1,.15-1.51.28l-.6.13c0-.13-.07-.26-.11-.38l.59-.2a14,14,0,0,1,1.52-.43l.73-.15s.32,0,.76,0a10.16,10.16,0,0,1,1.59.09A7.06,7.06,0,0,1,83.34,41.11Z"/>
-                <path class="cls-7"
-                      d="M81.47,29.23l1.35.11c-.06.17-.13.34-.19.49-.53,1.21-.65,2.28-1,2.71s-.56.71-.56.71c-.44.36-1.08.88-1.86,1.48s-1.71,1.31-2.71,2c-.5.36-1,.74-1.55,1.09l-.41.26-.14.07-.15,0c-.05,0-.11,0-.12-.07L74.06,38l-.1-.22a13.5,13.5,0,0,1-1-3.66,14.36,14.36,0,0,1-.13-1.69.54.54,0,0,0,.17.07,3.86,3.86,0,0,0,1.09,0,15.52,15.52,0,0,0,2.54-.42A14,14,0,0,0,80,30.75a6.71,6.71,0,0,0,.84-.59,4.54,4.54,0,0,0,.38-.38,1.25,1.25,0,0,0,.09-.12l.09-.16C81.42,29.41,81.45,29.31,81.47,29.23Z"/>
-                <path class="cls-8" d="M82,32l.16-.05c0,.06-.05.12-.07.17Z"/>
-                <path class="cls-6"
-                      d="M81.62,27.12a7.18,7.18,0,0,1-.15,2.11c0,.08,0,.18-.08.27l-.09.16a1.25,1.25,0,0,1-.09.12,4.54,4.54,0,0,1-.38.38,6.71,6.71,0,0,1-.84.59,14,14,0,0,1-3.33,1.35,15.52,15.52,0,0,1-2.54.42,3.86,3.86,0,0,1-1.09,0,.54.54,0,0,1-.17-.07,4.68,4.68,0,0,1,0-.53.4.4,0,0,1,.29-.05,3.21,3.21,0,0,0,.81.06h0a2.69,2.69,0,0,0,1.72.23,3.31,3.31,0,0,0,1.76-.88,11.78,11.78,0,0,0,2.26-1,5.84,5.84,0,0,0,.77-.53,2.46,2.46,0,0,0,.33-.31l.07-.08s0,0,0-.06a.65.65,0,0,0,.07-.21,7,7,0,0,0,.18-1.95,6.79,6.79,0,0,0-1.6-3.48,3.85,3.85,0,0,0-1.31-1.15,4.3,4.3,0,0,0-1.53-.45h-.51a1.81,1.81,0,0,0-1.52.15,4.26,4.26,0,0,0-.7.47h0l-.1,0c0-.09,0-.19.08-.29l.32-.2a5,5,0,0,1,4.1,0,4.19,4.19,0,0,1,1.46,1.21A11.8,11.8,0,0,1,81,25.1,4.53,4.53,0,0,1,81.62,27.12Z"/>
-                <path class="cls-10"
-                      d="M81.16,27.14A7,7,0,0,1,81,29.09a.65.65,0,0,1-.07.21s0,0,0,.06l-.07.08a2.46,2.46,0,0,1-.33.31,5.84,5.84,0,0,1-.77.53,11.78,11.78,0,0,1-2.26,1,5.92,5.92,0,0,0,1.7-4.14c.09-2.17-1.34-4.54-2.93-5h.5a4.3,4.3,0,0,1,1.53.45,3.85,3.85,0,0,1,1.31,1.15A6.79,6.79,0,0,1,81.16,27.14Z"/>
-                <path class="cls-8" d="M80.05,4c.16.17.21.27.18.32s-.15,0-.34,0l-.23-.06q-.14-.13-.27-.3l.47-.09Z"/>
-                <path class="cls-6"
-                      d="M79.86,3.81l-.47.09q.14.16.27.3c-.3-.08-.72-.23-1.23-.42S77,3.21,76.17,2.92A16.23,16.23,0,0,0,74,2.38a2.93,2.93,0,0,1,.9-.32L74.49,1l0-.06a14.46,14.46,0,0,1,2.14.87A24.26,24.26,0,0,1,78.8,3.07C79.25,3.36,79.6,3.61,79.86,3.81Z"/>
-                <path class="cls-6"
-                      d="M78.17,43.57c.6.25,1.15.62,1.1.7A5.18,5.18,0,0,1,78,44l-.84-.17-.38,0-.38,0H76a3.49,3.49,0,0,0,.18-.57,4.09,4.09,0,0,1,.7,0l.13,0,.33.07A9.1,9.1,0,0,1,78.17,43.57Z"/>
-                <path class="cls-11"
-                      d="M76.22,22.06c1.59.5,3,2.87,2.93,5a5.92,5.92,0,0,1-1.7,4.14c-.33.11-.64.2-.94.27a15.51,15.51,0,0,1-2.44.38H74a2.34,2.34,0,0,1-1-1.47h0c.1-1.82.25-3,.26-3.11s.1-1.45.46-3.41c.06-.36.15-.73.24-1.11a.36.36,0,0,1,.11-.1h0a5.88,5.88,0,0,1,2.18-.61Z"/>
-                <path class="cls-6"
-                      d="M76.51,31.51c.3-.07.61-.16.94-.27a3.31,3.31,0,0,1-1.76.88A2.69,2.69,0,0,1,74,31.89h.1A15.51,15.51,0,0,0,76.51,31.51Z"/>
-                <path class="cls-6" d="M76.21,42.4v.31l-.56.16a1.7,1.7,0,0,1,0-.22A4.25,4.25,0,0,1,76.21,42.4Z"/>
-                <path class="cls-6"
-                      d="M76.17,42.09a2.91,2.91,0,0,1,0,.31,4.25,4.25,0,0,0-.52.25,2.18,2.18,0,0,0,0-.51c0-.12,0-.25,0-.37l.41-.11C76.11,41.8,76.14,41.94,76.17,42.09Z"/>
-                <path class="cls-6" d="M76.21,42.71a3.7,3.7,0,0,1-.06.48,4,4,0,0,0-.65.14,3.1,3.1,0,0,0,.15-.46Z"/>
-                <path class="cls-6"
-                      d="M76.15,43.19a3.49,3.49,0,0,1-.18.57h0l-.41,0-.32,0a2.7,2.7,0,0,0,.17-.31l.09-.18A4,4,0,0,1,76.15,43.19Z"/>
-                <path class="cls-6" d="M76,41.28c0,.12.08.25.11.38l-.41.11c0-.12,0-.24,0-.35Z"/>
-                <path class="cls-6"
-                      d="M76,41.28l-.35.14c0-.29-.1-.55-.16-.77a1.23,1.23,0,0,0-.17-.42c-.07-.08-.14-.1-.14-.13s.08-.05.22,0a1.1,1.1,0,0,1,.33.45h0A5.14,5.14,0,0,1,76,41.28Z"/>
-                <path class="cls-6"
-                      d="M74.69,22.21a1.81,1.81,0,0,1,1.52-.15,5.88,5.88,0,0,0-2.18.61h0A4.26,4.26,0,0,1,74.69,22.21Z"/>
-                <path class="cls-6"
-                      d="M75.56,43.79l.41,0a4.13,4.13,0,0,1-.38.71,6.18,6.18,0,0,1-.52.59,7,7,0,0,1-1.28,1,2.41,2.41,0,0,1-.56.22,3,3,0,0,1-1,.07c-.43-.05-.7-.15-.7-.2s.3,0,.7,0a2.76,2.76,0,0,0,1.36-.44,7.27,7.27,0,0,0,1.09-1c.27-.31.41-.54.43-.55s.07-.1.18-.27Z"/>
-                <path class="cls-6"
-                      d="M75.69,42.65a1.7,1.7,0,0,0,0,.22c-.23.06-.36.09-.37.06S75.42,42.79,75.69,42.65Z"/>
-                <path class="cls-6" d="M75.61,41.42c0,.11,0,.23,0,.35-.65.16-1.15.31-1.17.23A4,4,0,0,1,75.61,41.42Z"/>
-                <path class="cls-6" d="M75.5,43.33l-.09.18a2.7,2.7,0,0,1-.17.31c-.5.07-.93.16-.95.09s.54-.4,1.18-.58Z"/>
-                <path class="cls-6"
-                      d="M75,42.81a.77.77,0,0,1,0,.38c-.06.14-.15.22-.27.2a.33.33,0,0,1-.23-.23.37.37,0,0,1,0-.38s.08,0,.14.08c-.12.11,0,.43.13.4s.22-.54.14-.51a2.65,2.65,0,0,0-.27.11s.06-.07.21-.14.09,0,.12,0A.17.17,0,0,1,75,42.81Z"/>
-                <path class="cls-6"
-                      d="M74.49,1l.42,1.09a2.93,2.93,0,0,0-.9.32l-.69-.13L73,2.19,73.22,2A9.11,9.11,0,0,1,74.49,1Z"/>
-                <path class="cls-6"
-                      d="M74.61,42.87a.55.55,0,0,0,.06.08h0v0s0,0,0,0,0,.07.06,0l0-.09s0,0,0-.06,0,0,0,0A.36.36,0,0,1,74.61,42.87Zm.25-.12c.08,0,0,.49-.14.51s-.25-.29-.13-.4A2.65,2.65,0,0,1,74.86,42.75Z"/>
-                <path class="cls-6"
-                      d="M74.79,42.87s0,.05,0,.06l0,.09s-.07,0-.06,0,0,0,0,0v0h0a.55.55,0,0,1-.06-.08.36.36,0,0,0,.14,0S74.79,42.85,74.79,42.87Z"/>
-                <path class="cls-6"
-                      d="M74.51.91l0,.06a9.11,9.11,0,0,0-1.27,1L73,2.19a3.64,3.64,0,0,1-.44-.07l-.41-.05a1.48,1.48,0,0,0-.31,0,8.43,8.43,0,0,0-1.47.11c-.31,0-.62.1-.92.15l0,0a4.35,4.35,0,0,0-.7-1,1.22,1.22,0,0,0-.45-.3L68.16.37c.63-.07,1.29-.15,2-.18A10.33,10.33,0,0,1,72,.24c.16,0,.34.07.51.1l.4.11.79.21Z"/>
-                <path class="cls-6"
-                      d="M74.37,41.41a.5.5,0,0,1-.21.35.48.48,0,0,1-.4.09.19.19,0,0,1-.13-.24.56.56,0,0,1,.13-.24l.06-.08s.08,0,.14.1c-.27.26-.24.39,0,.33s.46-.46.23-.39l-.23.06s.08-.07.25-.12a.13.13,0,0,1,.13,0A.17.17,0,0,1,74.37,41.41Z"/>
-                <path class="cls-6"
-                      d="M74.19,41.33c.23-.07,0,.35-.23.39s-.27-.07,0-.33a.46.46,0,0,1,.11.12s0,0,0,0,0,.05,0,0a.46.46,0,0,0,.07-.07s0-.11,0-.09-.16,0-.17,0Z"/>
-                <path class="cls-6"
-                      d="M74.18,43.17a.69.69,0,0,1-.22.62c-.32.22-.44.26-.54.74a.57.57,0,0,1-.23.3.51.51,0,0,1-.16.09s-.09,0-.12,0,0,0,0,0a.83.83,0,0,1,.06-.21.36.36,0,0,0,0-.11s0,0,0-.22c0,0,0,0,0,0h0l-.08,0-.14,0c-.08,0-.13,0-.13,0s0,0,.09-.1a.55.55,0,0,1,.38-.14c.1.09,0,.21,0,.31s.06,0,.09,0l.08-.08a.38.38,0,0,0,.07-.21v0a.19.19,0,0,1,0-.08.42.42,0,0,1,0-.1.34.34,0,0,1,.07-.11,1.62,1.62,0,0,1,.18-.19l.18-.15c.15-.13.07-.38-.11-.6a1.4,1.4,0,0,0-.32-.28,1.06,1.06,0,0,0-.38-.12,3.17,3.17,0,0,0-.87,0H72l-.11,0-.21.07-.23.08a1.53,1.53,0,0,1-.29,0l-.25-.05h-.06a1.17,1.17,0,0,0-.27.05,3.85,3.85,0,0,0-.58.19,2.5,2.5,0,0,0-.94.59,1.5,1.5,0,0,0-.4.95,1.46,1.46,0,0,0,.1.57.46.46,0,0,0,.35.31,1.69,1.69,0,0,0,1.19-.29,2.2,2.2,0,0,0,.25-.17l.11-.1.07-.06a.2.2,0,0,0,.06-.15c0-.06-.07-.08-.11-.1a1.29,1.29,0,0,0-.41,0,.4.4,0,0,0-.29.1.84.84,0,0,0-.12.19s-.07.07-.08.06,0,0,0-.08a.54.54,0,0,1,.08-.25.56.56,0,0,1,.38-.21,1.32,1.32,0,0,1,.57,0,.4.4,0,0,1,.29.21.42.42,0,0,1-.08.38,2,2,0,0,1-.13.18l-.12.12a2,2,0,0,1-.28.23l-.33.2a.28.28,0,0,1-.15-.15.21.21,0,0,0-.16.07c-.07.06-.12.12-.11.13l.08.1a1.8,1.8,0,0,1-.81.09,1,1,0,0,1-.72-.56,2,2,0,0,1-.19-.79,2,2,0,0,1,.49-1.33,2.37,2.37,0,0,1,.79-.63l.36-.18a4.5,4.5,0,0,1,.69-.2,3,3,0,0,1,.37,0,.83.83,0,0,1,.29,0l.13,0h.11l.17,0,.2-.07.11,0,.16,0a3.59,3.59,0,0,1,1,0,1.34,1.34,0,0,1,.56.22,1.73,1.73,0,0,1,.41.4A1.19,1.19,0,0,1,74.18,43.17Z"/>
-                <path class="cls-6"
-                      d="M74.13,41.41s.05.05,0,.09a.46.46,0,0,1-.07.07s-.07,0,0,0,0,0,0,0a.46.46,0,0,0-.11-.12S74.06,41.41,74.13,41.41Z"/>
-                <path class="cls-6"
-                      d="M73.32,2.25l.69.13a3.27,3.27,0,0,0-.42.21,6.43,6.43,0,0,0-.73.48,3.69,3.69,0,0,0-.72.78,8.45,8.45,0,0,0-.67,1.2,15.41,15.41,0,0,0-.75,2l-.15.49s0,0,0,0l0-.13,0-.25-.06-.49c-.05-.32-.09-.64-.13-.94a5.8,5.8,0,0,0-.21-.89c-.07-.19-.16-.38-.24-.55a6.8,6.8,0,0,0-1-1.53l-.28-.29.87-.18a12.39,12.39,0,0,1,.83,1.76,5.46,5.46,0,0,1,.21.61,3,3,0,0,1,.1.5q0,.27.06.57l0,.32,0,.16V6.3s0,0,0,0A2.55,2.55,0,0,1,70.77,6c.15-.43.3-.84.43-1.18a13.45,13.45,0,0,1,.62-1.26,4.62,4.62,0,0,1,.72-1l.42-.4Z"/>
-                <path class="cls-10" d="M73.89,22.72l.1,0a.36.36,0,0,0-.11.1S73.89,22.74,73.89,22.72Z"/>
-                <path class="cls-6" d="M74,22.43c0,.1,0,.2-.08.29-.42.21-.6.36-.63.36A3.44,3.44,0,0,1,74,22.43Z"/>
-                <path class="cls-10"
-                      d="M74,31.89a3.21,3.21,0,0,1-.81-.06.4.4,0,0,0-.29.05c0-.39,0-.77,0-1.13a3.25,3.25,0,0,1,0-.33A2.34,2.34,0,0,0,74,31.89Z"/>
-                <path class="cls-6"
-                      d="M74,60.42a.55.55,0,0,1-.14.35,1.17,1.17,0,0,1-.24.21,2.14,2.14,0,0,1-.48.27.83.83,0,0,1-.4,0,.13.13,0,0,0,0-.06.86.86,0,0,0,.34-.09,2.23,2.23,0,0,0,.42-.3c.14-.12.28-.25.26-.41a2,2,0,0,0-.47-.93.61.61,0,0,0-.36-.23.21.21,0,0,1,0-.13v0c0-.09,0-.16.1-.16s.07,0,.18.08a1.17,1.17,0,0,1,.34.28,2.35,2.35,0,0,1,.29.49A1.59,1.59,0,0,1,74,60.42Z"/>
-                <path class="cls-3"
-                      d="M73.8,60.42c0,.16-.12.29-.26.41a2.23,2.23,0,0,1-.42.3.86.86,0,0,1-.34.09,4.88,4.88,0,0,0,.08-.61,6.06,6.06,0,0,0,.06-1c0-.18,0-.34,0-.48h0a.21.21,0,0,0,0,.13.61.61,0,0,1,.36.23A2,2,0,0,1,73.8,60.42Z"/>
-                <path class="cls-6"
-                      d="M73.88,22.78c-.09.38-.18.75-.24,1.11-.36,2-.44,3.33-.46,3.41s-.16,1.29-.26,3.11a11.17,11.17,0,0,1-.24-3.6C72.78,24.55,73,23.54,73.88,22.78Z"/>
-                <path class="cls-12"
-                      d="M73.59,42.9c.18.22.26.47.11.6l-.18.15a1.62,1.62,0,0,0-.18.19.34.34,0,0,0-.07.11.42.42,0,0,0,0,.1.19.19,0,0,0,0,.08v0a.38.38,0,0,1-.07.21l-.08.08s-.09.06-.09,0,.12-.22,0-.31a.55.55,0,0,0-.38.14c-.07.06-.1.09-.09.1s0,0,.13,0l.14,0,.08,0h0s0,0,0,0c0,.2,0,.17,0,.22a.36.36,0,0,1,0,.11.83.83,0,0,0-.06.21s0,0,0,0v0c-.05,0-.09,0-.14,0s-.27.2-.39.27a.58.58,0,0,1-.44.13.16.16,0,0,0,0-.14c0-.09-.09-.09-.09-.08a.3.3,0,0,1,0,.09s-.08.09-.18.13a3.33,3.33,0,0,1-.78.22,1.59,1.59,0,0,1-.76,0l-.07,0,.33-.2a2,2,0,0,0,.28-.23l.12-.12a2,2,0,0,0,.13-.18.42.42,0,0,0,.08-.38.4.4,0,0,0-.29-.21,1.32,1.32,0,0,0-.57,0,.56.56,0,0,0-.38.21.54.54,0,0,0-.08.25s0,.07,0,.08,0,0,.08-.06a.84.84,0,0,1,.12-.19.4.4,0,0,1,.29-.1,1.29,1.29,0,0,1,.41,0s.1,0,.11.1a.2.2,0,0,1-.06.15l-.07.06-.11.1a2.2,2.2,0,0,1-.25.17,1.69,1.69,0,0,1-1.19.29.46.46,0,0,1-.35-.31,1.46,1.46,0,0,1-.1-.57,1.5,1.5,0,0,1,.4-.95,2.5,2.5,0,0,1,.94-.59,3.85,3.85,0,0,1,.58-.19,1.17,1.17,0,0,1,.27-.05h.06l.25.05a1.53,1.53,0,0,0,.29,0l.23-.08.21-.07.11,0H72a3.17,3.17,0,0,1,.87,0,1.06,1.06,0,0,1,.38.12A1.4,1.4,0,0,1,73.59,42.9Z"/>
-                <path class="cls-6"
-                      d="M73.66,53.78a3,3,0,0,1-.08.71c-.1.39-.26.81-.38,1.27s-.3,1.15-.38,1.5c0-.17,0-.36-.09-.56s0-.28-.07-.42,0-.41.08-.62c.06-.47.2-1,.25-1.28a2,2,0,0,0,0-.4.79.79,0,0,0,0-.14.91.91,0,0,0-.11-.44,1.84,1.84,0,0,0-.94-.61l-.11,0c0-.18-.09-.36-.15-.53l.4.13a2.22,2.22,0,0,1,1.29.7,1.42,1.42,0,0,1,.24.51C73.65,53.7,73.65,53.78,73.66,53.78Z"/>
-                <path class="cls-6"
-                      d="M73.25,46.34s-.07.28-.36.6a2.84,2.84,0,0,1-1.33.85,4.87,4.87,0,0,1-1,.18v0a.33.33,0,0,0-.32-.31l-.49.2v-.4l.12-.09.21,0a4.38,4.38,0,0,0,1.39,0,3.16,3.16,0,0,0,1.28-.58,4.89,4.89,0,0,1,.52-.42Z"/>
-                <path class="cls-3"
-                      d="M73,54a2,2,0,0,1,0,.4c0,.31-.19.81-.25,1.28,0,.21-.06.42-.08.62-.15-.86-.4-1.9-.66-2.93l-.16-.6.11,0a1.84,1.84,0,0,1,.94.61.91.91,0,0,1,.11.44A.79.79,0,0,1,73,54Z"/>
-                <path class="cls-6"
-                      d="M72.92,45c-.06,0-.21.24-.42.45a.76.76,0,0,1-.55.18.47.47,0,0,1-.24-.08.2.2,0,0,0,.09-.06.47.47,0,0,0,.13-.11h0a.58.58,0,0,0,.44-.13c.12-.07.27-.2.39-.27s.09-.06.14,0L73,45A0,0,0,0,1,73,45h0S73,45.06,72.92,45Z"/>
-                <path class="cls-6"
-                      d="M72.92,59.13c0,.14,0,.3,0,.48a6.06,6.06,0,0,1-.06,1,4.88,4.88,0,0,1-.08.61h-.14s0,0,.13.05a15.64,15.64,0,0,1-2,5.16c-.32.55-.68,1.11-1.07,1.68.08-.34.11-.56.06-.59a8.26,8.26,0,0,0-1.23,2l-.28.52v0a5.08,5.08,0,0,1-1.66,1.26,9.59,9.59,0,0,1-2.31.74l-.66.11v-.09c0-.08,0-.14,0-.17v0h-1s0,.18,0,.44h-.07c0-.27,0-.42-.08-.43s-.06.16-.11.45c-.19,0-.38,0-.57,0a14.62,14.62,0,0,1-2.55-.07,9.7,9.7,0,0,1-2.18-.62,4.84,4.84,0,0,0-.26-.43s0,0,0,0S57,71,57,71l-1.24-.44a3.26,3.26,0,0,1-.11.33c-.37-.22-.73-.46-1.08-.71a17.72,17.72,0,0,1-2-1.68l-.19-.21a.76.76,0,0,0,.12-.61A8.22,8.22,0,0,1,52,66.29l.13-.07a6.9,6.9,0,0,0,1.1,1.62l.14.13,0,0,.16.24.09-.06c.21.21.44.41.67.61a.23.23,0,0,1-.18,0l-.15.25a.57.57,0,0,0,.28.08.42.42,0,0,0,.28-.1l.61.47a10.2,10.2,0,0,0,4.36,2,15.88,15.88,0,0,0,2.4.12,16.42,16.42,0,0,0,2.35-.22A5.89,5.89,0,0,0,68,69.45a28.34,28.34,0,0,0,2.4-3.28,15.37,15.37,0,0,0,2.22-5.6c.23-1.45.13-2.3.2-2.3a2.49,2.49,0,0,1,.09.6C72.9,59,72.91,59,72.92,59.13Z"/>
-                <path class="cls-8"
-                      d="M72.86,31.88a4.68,4.68,0,0,0,0,.53.32.32,0,0,1-.15-.35A.27.27,0,0,1,72.86,31.88Z"/>
-                <path class="cls-6"
-                      d="M72.82,57.26c.07.61.05,1,0,1s-.26-.5-.55-1.28h0a.66.66,0,0,1,0-.15l-.73-2,.14-.14a3.1,3.1,0,0,0,.37-.46.27.27,0,0,0-.16-.38c-.17-.08-.34-.06-.4,0s-.07.11-.2.27c-.06-.17-.12-.34-.19-.52l-.31-.84.11,0,.33-.08L70.81,52a3.28,3.28,0,0,0,1,.73l.16.6c.26,1,.51,2.07.66,2.93a2.62,2.62,0,0,0,0,1.31S72.77,57.47,72.82,57.26Z"/>
-                <path class="cls-3"
-                      d="M72.25,57c.29.78.46,1.29.55,1.28-.07,0,0,.85-.2,2.3a15.37,15.37,0,0,1-2.22,5.6A28.34,28.34,0,0,1,68,69.45a5.89,5.89,0,0,1-3.79,1.9,16.42,16.42,0,0,1-2.35.22,15.88,15.88,0,0,1-2.4-.12,10.2,10.2,0,0,1-4.36-2L54.47,69h0a1.6,1.6,0,0,0,.26-1.3.18.18,0,0,0-.19-.11h-.83l-.21,0,.06.2s0,.12-.21.24l-.14-.13a6.9,6.9,0,0,1-1.1-1.62l-.18-.35q-.15-.32-.27-.63a.24.24,0,0,0,.14,0,.37.37,0,0,0,.27-.31.48.48,0,0,0-.17-.41.36.36,0,0,0-.18-.11,1.48,1.48,0,0,1-.42-.19s0,0-.05,0a23,23,0,0,1-.76-2.84c-.16-.74-.28-1.48-.38-2.2l.12,0c.26-.08.66-.2,1.22-.39a10.72,10.72,0,0,0,2.1-1c.41-.26.83-.56,1.28-.91l.74-.6c.31-.25.48-.46.79-.72a6.55,6.55,0,0,1,.56-.6l0,0A7.67,7.67,0,0,1,56,55c-.4,0-.82.08-1.16.09l-.82,0a9.68,9.68,0,0,1-1.4-.1,5.38,5.38,0,0,1-1.85-.65,3.29,3.29,0,0,1-.67-.53c0-.29.08-.58.13-.86a15.28,15.28,0,0,1,.42-1.65,4.78,4.78,0,0,0,.81.2,6.94,6.94,0,0,0,2-.08l.62-.09.81-.14.89-.16.48-.09c.12,0,0,0,0-.06s-.14,0-.15,0-.17-.1-.17-.11l-.17-.07,1.7-.25h0a15.19,15.19,0,0,0,1.8-1.48c.45-.37.91-.73,1.27-1l.45-.3a16.2,16.2,0,0,0,3.42,1,9.28,9.28,0,0,0,2,0v0a1,1,0,0,0,.19.14,3.7,3.7,0,0,0,.44.28,1.84,1.84,0,0,0,.47.15,2.79,2.79,0,0,0,1.18,0,6.28,6.28,0,0,0,.66-.23s.07.17.12.33a.27.27,0,0,1,.08.19h0v0a1.16,1.16,0,0,1-.18.51,1.92,1.92,0,0,1-.18.29,2.28,2.28,0,0,1-1.25.69l-.51.09-.61.1a4.7,4.7,0,0,0-.71.14l-.16,0-.09,0s0,.06,0,.08a1.84,1.84,0,0,0,.15.35,2.3,2.3,0,0,0,.52.6,3.18,3.18,0,0,0,.58.35,3.49,3.49,0,0,0,1.12.31A6.5,6.5,0,0,0,69.86,53c.37-.07.64-.13.85-.19h0l.31.84c.07.18.13.35.19.52l-.08.1a2.71,2.71,0,0,1-1,.68,3.82,3.82,0,0,1-1.73.24l-1-.09c-.26,0-.59-.08-1-.17s-.83-.23-1.29-.36l.11.14,0,0v0l0,0,.35.32a9.75,9.75,0,0,0,.74.64l.43.32.29.18a5.33,5.33,0,0,0,.56.32,5.15,5.15,0,0,0,2.26.61A5.47,5.47,0,0,0,72.25,57Zm-1.92,3.55a3.52,3.52,0,0,0,.29-.4,3.56,3.56,0,0,0-.45-.13l-.27,0c-.16,0-.32,0-.3.05a2.64,2.64,0,0,0,.26.11l.24.1c.06,0,0,0,.05,0s0,0-.06,0l-.11.12a.56.56,0,0,1-.24.17c-.09,0-.15,0-.16-.1s0-.16,0-.17-.07,0-.1.16a.27.27,0,0,0,0,.23.39.39,0,0,0,.26.11A1,1,0,0,0,70.33,60.54Zm-.14,3s.18-.11,0-.29a1.78,1.78,0,0,0-.74-.06l-.33,0a1.15,1.15,0,0,0-.31,0,3.87,3.87,0,0,0-1,.41,1.55,1.55,0,0,1-.32.14c-.07,0-.12,0-.12,0s-.09,0-.1.12a.63.63,0,0,0,.18.34.9.9,0,0,0,.45.32.84.84,0,0,0,.6-.22,4.68,4.68,0,0,1,.91-.55l.11,0,.18-.06.3-.09A.88.88,0,0,0,70.19,63.49Zm-1.1,3.9c0-.21-.16-.29-.3-.25a1,1,0,0,0-.2,0,3.56,3.56,0,0,0-.62.34c-.28.19-.53.42-.5.45s.31-.12.62-.25a4,4,0,0,1,.41-.17l.19-.06s.07,0,.07,0,0,0,0,0,0,.14,0,.22-.05.18-.07.25-.16.14-.18.17,0,0,.09,0,.16-.05.22-.12a1.74,1.74,0,0,0,.14-.27A2.09,2.09,0,0,0,69.09,67.39Zm-4.54-3.93a.18.18,0,0,0-.06-.23c-.14-.06-.13,0-.15,0H64a3.24,3.24,0,0,0-.67,0,.81.81,0,0,0-.52.46c-.07.17-.08.29-.06.3a2.44,2.44,0,0,0,.94-.07,1.63,1.63,0,0,0,.62-.28l.07,0a.11.11,0,0,0,.06,0S64.51,63.53,64.55,63.46Zm-.92,3.12c0-.13-.12-.24-.23-.28a2.15,2.15,0,0,0-.52-.13l-.36,0a1,1,0,0,0-.78.31,1.22,1.22,0,0,0-.36,1,2.13,2.13,0,0,1,.52-.88.73.73,0,0,1,.59-.17l.35,0a2.92,2.92,0,0,1,.45.08l0,0v0a.5.5,0,0,1-.07.08c-.1.11-.24.24-.33.32-.34.14-.68.19-.68.22a1.18,1.18,0,0,0,.77,0,3.25,3.25,0,0,0,.42-.31l.09-.1A.5.5,0,0,0,63.63,66.58ZM60.11,69.3a.26.26,0,0,0,.07-.24.4.4,0,0,0-.22-.2c-.31-.14-.6,0-.57,0s.07,0,.16,0a.86.86,0,0,1,.28.11s0,.06,0,.06,0,0,0,0a1.49,1.49,0,0,1-.46.07.49.49,0,0,1-.19,0c-.06,0,.05,0,.05.07a.23.23,0,0,1,0,.07s0,0,0,0,0,0,0,0,0,0,0,0l.1,0a1.16,1.16,0,0,0,.4,0l.19,0A.58.58,0,0,0,60.11,69.3ZM57.7,62.89a.24.24,0,0,0,0-.17.2.2,0,0,0-.07-.15.37.37,0,0,0-.16-.1.81.81,0,0,0-.31-.06,2.63,2.63,0,0,0-.77.06c-.26,0-.52.06-.73.08l-.15,0-.06,0s0,.07,0,.08.09.06.09.06,0,0,0-.07h.18a3.66,3.66,0,0,0,.75,0,3.23,3.23,0,0,1,.71,0l.19,0h0s0,0,0,0-.35.38-.54.42a.67.67,0,0,1-.33-.05l-.34-.1A1.21,1.21,0,0,0,55.8,63s.1.09.29.18l.31.15a.91.91,0,0,0,.43.11.83.83,0,0,0,.42-.2l.27-.21A.59.59,0,0,0,57.7,62.89Z"/>
-                <path class="cls-6"
-                      d="M72.73,56.7c0,.2.06.39.09.56s-.09.33-.11.33a2.62,2.62,0,0,1,0-1.31C72.69,56.42,72.71,56.56,72.73,56.7Z"/>
-                <path class="cls-6" d="M72.78,61.22a.13.13,0,0,1,0,.06c-.09,0-.13,0-.13-.05Z"/>
-                <path class="cls-7"
-                      d="M73,2.19l-.42.4a4.62,4.62,0,0,0-.72,1,13.45,13.45,0,0,0-.62,1.26c-.13.34-.28.75-.43,1.18a2.55,2.55,0,0,0-.08.26s0,.07,0,0V6.22l0-.16,0-.32q0-.3-.06-.57a3,3,0,0,0-.1-.5,5.46,5.46,0,0,0-.21-.61,12.39,12.39,0,0,0-.83-1.76c.3,0,.61-.11.92-.15A8.43,8.43,0,0,1,71.8,2a1.48,1.48,0,0,1,.31,0l.41.05A3.64,3.64,0,0,0,73,2.19Z"/>
-                <path class="cls-6"
-                      d="M72.25,57h0a5.47,5.47,0,0,1-2.27.2,5.15,5.15,0,0,1-2.26-.61,5.33,5.33,0,0,1-.56-.32l-.29-.18-.43-.32a9.75,9.75,0,0,1-.74-.64l-.35-.32,0,0v0l0,0-.11-.14c.46.13.94.28,1.29.36s.69.13,1,.17l1,.09a3.82,3.82,0,0,0,1.73-.24,2.71,2.71,0,0,0,1-.68l.08-.1c.09.23.17.45.25.68a3.23,3.23,0,0,1-1.07.67,4.36,4.36,0,0,1-2,.22,10.19,10.19,0,0,1-1.08-.12l-.19,0-.16,0-.08,0,0,.05a.77.77,0,0,0,.13.12l.08.07.24.17c.17.12.35.22.52.33a5.15,5.15,0,0,0,2.09.67,10.19,10.19,0,0,0,1.62.09A4.86,4.86,0,0,1,72.25,57Z"/>
-                <path class="cls-7"
-                      d="M72.2,56.83a.66.66,0,0,0,0,.15,4.86,4.86,0,0,0-.63,0A10.19,10.19,0,0,1,70,56.92a5.15,5.15,0,0,1-2.09-.67c-.17-.11-.35-.21-.52-.33l-.24-.17-.08-.07a.77.77,0,0,1-.13-.12l0-.05.08,0,.16,0,.19,0a10.19,10.19,0,0,0,1.08.12,4.36,4.36,0,0,0,2-.22,3.23,3.23,0,0,0,1.07-.67Z"/>
-                <path class="cls-6"
-                      d="M71.82,53.86a.27.27,0,0,1,.16.38,3.1,3.1,0,0,1-.37.46l-.14.14c-.08-.23-.16-.45-.25-.68.13-.16.19-.26.2-.27S71.65,53.78,71.82,53.86Z"/>
-                <path class="cls-6"
-                      d="M71.75,45.41s0,0,0,0a.05.05,0,0,1-.06.06s0,0,0,.05h0a3.42,3.42,0,0,1-.69.28,1.77,1.77,0,0,1-.91,0,.68.68,0,0,1-.31-.18,2.07,2.07,0,0,0,.34-.15l.07,0a1.59,1.59,0,0,0,.76,0,3.33,3.33,0,0,0,.78-.22c.1,0,.17-.09.18-.13a.3.3,0,0,0,0-.09s.06,0,.09.08a.16.16,0,0,1,0,.14h0s-.05,0-.05,0a.3.3,0,0,0-.1.07h0A.08.08,0,0,0,71.75,45.41Z"/>
-                <path class="cls-6"
-                      d="M71.88,45.38s0,0,.05,0a.47.47,0,0,1-.13.11.2.2,0,0,1-.09.06h0s0,0,0-.05a.05.05,0,0,0,.06-.06h0A.3.3,0,0,1,71.88,45.38Z"/>
-                <path class="cls-6"
-                      d="M71.69,52.22c.06.17.1.35.15.53a3.28,3.28,0,0,1-1-.73h0l-.19-.36-.06.07c-.08-.11-.11-.19-.09-.21S71,51.94,71.69,52.22Z"/>
-                <path class="cls-6"
-                      d="M65,82.21h0q.11.44.18.87l1.5.82,2.42,0a2.26,2.26,0,0,0,1.07-.11,1,1,0,0,0,.36-.3l.09-.11a0,0,0,0,0,0,0,.89.89,0,0,1,0,.11h0l.27.19c.08-.1,0-.36-.13-.59l0-.08c.11-.17.21-.33.3-.49l.08-.15a.28.28,0,0,1,0,.07l.3-.13a1.54,1.54,0,0,0-.17-.23.86.86,0,0,0-.14-.13,1.18,1.18,0,0,0-.32-.66.73.73,0,0,0-.73-.28,7.83,7.83,0,0,0-.86.38,9.05,9.05,0,0,1-1.64.62,5.61,5.61,0,0,1-1.34,0c-.36,0-.64,0-.84,0h-.1l.21,0,.16,0h.08V82h0c.14,0,.3,0,.48-.06a6.81,6.81,0,0,0,1.29-.11,9.28,9.28,0,0,0,1.53-.68,6.59,6.59,0,0,1,.92-.45,1.08,1.08,0,0,1,.64,0,1.56,1.56,0,0,1,.52.34,1.79,1.79,0,0,1,.53,1.14.69.69,0,0,1,0,.39,2.73,2.73,0,0,1-.13.29c-.09.18-.19.35-.29.52s-.21.35-.34.53a1.52,1.52,0,0,1-.55.48,3,3,0,0,1-1.34.21l-2.58,0c-.66-.35-1.33-.69-2-1-.35-1.54-.7-3-1-4.43-.08-.32-.15-.62-.23-.92,0,0,0-.15-.05-.21l0-.13,0-.24-.06-.48c-.06-.62-.12-1.2-.17-1.74-.1-1.07-.19-2-.24-2.56,0-.23,0-.42-.05-.57.32,0,.65-.07,1-.12,0,.15,0,.36,0,.61,0,.61.11,1.49.2,2.56,0,.53.09,1.11.14,1.73,0,.27,0,.55.08.84l.08.29,0,.25c0,.17.08.33.11.5L65,82.2Zm5.66,1.37h0S70.66,83.57,70.68,83.58Z"/>
-                <path class="cls-8" d="M71.77,45.45s0,0,0,0A.08.08,0,0,1,71.77,45.45Z"/>
-                <path class="cls-8"
-                      d="M71.58,82.36l-.3.13a.28.28,0,0,0,0-.07l0-.07c0-.06,0-.06,0-.17s0-.12,0-.18a.86.86,0,0,1,.14.13A1.54,1.54,0,0,1,71.58,82.36Z"/>
-                <path class="cls-8"
-                      d="M71.29,82.18c0,.11,0,.11,0,.17l0,.07a.69.69,0,0,0-.42-.35,1.72,1.72,0,0,0-.5,0,.38.38,0,0,0-.16,0s-.07,0-.08,0,0,0,0,0a.27.27,0,0,1,.17-.09,1.51,1.51,0,0,1,.56-.08.88.88,0,0,1,.41.16C71.28,82.06,71.28,82.12,71.29,82.18Z"/>
-                <path class="cls-3"
-                      d="M71.24,82.42l-.08.15c-.09.16-.19.32-.3.49l0,.08a1.05,1.05,0,0,0-.31-.28,1.38,1.38,0,0,0-.6-.08c-.16,0-.26,0-.26,0s.1.06.25.09a1.51,1.51,0,0,1,.48.16.84.84,0,0,1,.26.35l-.09.11a1,1,0,0,1-.36.3,2.26,2.26,0,0,1-1.07.11l-2.42,0-1.5-.82q-.08-.43-.18-.87h.08l.32-.06h.12c.2,0,.48,0,.84,0a5.61,5.61,0,0,0,1.34,0,9.05,9.05,0,0,0,1.64-.62,7.83,7.83,0,0,1,.86-.38.73.73,0,0,1,.73.28,1.18,1.18,0,0,1,.32.66.88.88,0,0,0-.41-.16,1.51,1.51,0,0,0-.56.08.27.27,0,0,0-.17.09s-.06,0,0,0,0,0,.08,0a.38.38,0,0,1,.16,0,1.72,1.72,0,0,1,.5,0A.69.69,0,0,1,71.24,82.42Z"/>
-                <path class="cls-6"
-                      d="M70.81,52l.35.67-.33.08-.11,0h0c-.12-.31-.23-.63-.35-.93l.06,0,.13-.1a2.64,2.64,0,0,0,.25.29Z"/>
-                <path class="cls-6"
-                      d="M71.07,50c.19.63.41,1.39.62,2.2-.68-.28-1.18-.74-1.23-.7s0,.1.09.21l-.13.1-.06,0-.47-1.26a2.71,2.71,0,0,0,.46-.57,1.65,1.65,0,0,0,.18-.37l-1.06-.17h0a.27.27,0,0,0-.08-.19c0-.16-.1-.28-.12-.33a6,6,0,0,0,1.06-.57.41.41,0,0,0,.19-.24C70.61,48.52,70.86,49.32,71.07,50Z"/>
-                <path class="cls-8"
-                      d="M70.82,83.14c.17.23.21.49.13.59l-.27-.19h0a.89.89,0,0,0,0-.11,0,0,0,0,1,0,0C70.69,83.32,70.76,83.23,70.82,83.14Z"/>
-                <path class="cls-6"
-                      d="M70.2,46.69c.42-.35.62-.71.68-.65a1.07,1.07,0,0,1-.1.24,2.11,2.11,0,0,1-.41.59,2.7,2.7,0,0,1-.53.46h0l-.08,0h0v-.12h-.15l-.09,0h0a.2.2,0,0,0-.09.06.28.28,0,0,0-.13.25v.05c-.3.06-.85.19-1.4.36a7.15,7.15,0,0,1-1.37.28h-.17a4,4,0,0,1-1.07-.17,3.65,3.65,0,0,1-1-.49,15.58,15.58,0,0,1-1.3-1.21l.17-.11.26-.17c.44.38.87.76,1.21,1a2.87,2.87,0,0,0,.58.27l.26.08a4.51,4.51,0,0,0,.92.2,7.36,7.36,0,0,0,2-.12A3.92,3.92,0,0,0,70.2,46.69Z"/>
-                <path class="cls-8" d="M70.61,51.66l.19.36a2.64,2.64,0,0,1-.25-.29Z"/>
-                <path class="cls-9" d="M70.72,83.58h0s0,0,0,0Z"/>
-                <path class="cls-6"
-                      d="M70.54,47.93v0h-.09s0,0-.11,0A1.36,1.36,0,0,1,70,48a1.48,1.48,0,0,1-.31,0l-.16,0h0s.12,0,.12,0l.07,0h.06v0l.49-.2A.33.33,0,0,1,70.54,47.93Z"/>
-                <path class="cls-8" d="M70.45,48h.09a.52.52,0,0,1,0,.18A1.08,1.08,0,0,1,70.45,48Z"/>
-                <path class="cls-6"
-                      d="M70.36,51.87c.12.3.23.62.35.93-.21.06-.48.12-.85.19a6.5,6.5,0,0,1-1.71.12A3.49,3.49,0,0,1,67,52.8a3.18,3.18,0,0,1-.58-.35,2.3,2.3,0,0,1-.52-.6,1.84,1.84,0,0,1-.15-.35s0-.07,0-.08l.09,0,.16,0a4.7,4.7,0,0,1,.71-.14l.61-.1.51-.09a2.28,2.28,0,0,0,1.25-.69,1.92,1.92,0,0,0,.18-.29,1.16,1.16,0,0,0,.18-.51v0h0l.42,1.11a2.94,2.94,0,0,1-1.93.82l-1.08.1-.48,0-.12,0s-.11,0-.07,0a.57.57,0,0,0,.12.23,1.41,1.41,0,0,0,.36.37,2.64,2.64,0,0,0,1.53.43,3.93,3.93,0,0,0,1.47-.4A4.92,4.92,0,0,0,70.36,51.87Z"/>
-                <path class="cls-6" d="M69.47,49.5l1.06.17a1.65,1.65,0,0,1-.18.37,2.71,2.71,0,0,1-.46.57Z"/>
-                <path class="cls-6"
-                      d="M70.45,48a1.08,1.08,0,0,0,.06.18.41.41,0,0,1-.19.24,6,6,0,0,1-1.06.57l0,0c0-.16.2-.4.57-.53a1.51,1.51,0,0,0,.53-.42Z"/>
-                <path class="cls-8" d="M70.45,48h-.11C70.4,47.93,70.43,47.92,70.45,48Z"/>
-                <path class="cls-6"
-                      d="M70,48a1.36,1.36,0,0,0,.35,0,1.51,1.51,0,0,1-.53.42c-.37.13-.62.37-.57.53l0,0a6.28,6.28,0,0,1-.66.23,2.79,2.79,0,0,1-1.18,0,1.84,1.84,0,0,1-.47-.15,3.7,3.7,0,0,1-.44-.28,1,1,0,0,1-.19-.14v0h.08a6.07,6.07,0,0,0,.83-.17h0a.34.34,0,0,0,0,.15.9.9,0,0,0,.27.2,1.32,1.32,0,0,0,1,.09,1.66,1.66,0,0,0,.79-.36l.26-.18s.13-.12.13-.22v-.08a.76.76,0,0,0-.2-.16l.16,0A1.48,1.48,0,0,0,70,48Z"/>
-                <path class="cls-6"
-                      d="M70.62,60.14a3.52,3.52,0,0,1-.29.4,1,1,0,0,1-.57.29.39.39,0,0,1-.26-.11.27.27,0,0,1,0-.23c0-.12.09-.17.1-.16s0,.08,0,.17.07.11.16.1a.56.56,0,0,0,.24-.17l.11-.12s0,0,.06,0,0,0-.05,0l-.24-.1A2.64,2.64,0,0,1,69.6,60s.14-.07.3-.05l.27,0A3.56,3.56,0,0,1,70.62,60.14Z"/>
-                <path class="cls-6"
-                      d="M70.21,63.2c.16.18,0,.28,0,.29a.88.88,0,0,1-.2.1l-.3.09-.18.06-.11,0a4.68,4.68,0,0,0-.91.55.84.84,0,0,1-.6.22.9.9,0,0,1-.45-.32.63.63,0,0,1-.18-.34c0-.12.1-.13.1-.12a.15.15,0,0,0,0,.11.78.78,0,0,0,.2.26.8.8,0,0,0,.38.23c.14,0,.29-.11.45-.23a4.78,4.78,0,0,1,.92-.64l.09,0h0l0,0h-.57a5.22,5.22,0,0,0-1,.31,1.25,1.25,0,0,1-.36.09c-.09,0-.14,0-.13,0s0,0,.12,0a1.55,1.55,0,0,0,.32-.14,3.87,3.87,0,0,1,1-.41,1.15,1.15,0,0,1,.31,0l.33,0A1.78,1.78,0,0,1,70.21,63.2Z"/>
-                <path class="cls-7"
-                      d="M69.89,50.61l.47,1.26a4.92,4.92,0,0,1-.67.41,3.93,3.93,0,0,1-1.47.4,2.64,2.64,0,0,1-1.53-.43,1.41,1.41,0,0,1-.36-.37.57.57,0,0,1-.12-.23s0,0,.07,0l.12,0,.48,0,1.08-.1a2.94,2.94,0,0,0,1.93-.82Z"/>
-                <path class="cls-6"
-                      d="M70,45.42a.28.28,0,0,0,.15.15,2.07,2.07,0,0,1-.34.15l-.08-.1s0-.07.11-.13A.21.21,0,0,1,70,45.42Z"/>
-                <path class="cls-6"
-                      d="M69.81,67.53s0,.25-.06.59c-.39.57-.83,1.14-1.29,1.72l-.16.21.28-.52A8.26,8.26,0,0,1,69.81,67.53Z"/>
-                <path class="cls-6" d="M69.81,47.32h0l-.12.09v-.09h0v0h0Z"/>
-                <path class="cls-6" d="M69.73,47.82v0h0Z"/>
-                <path class="cls-6"
-                      d="M69.72,47.42v.4l0,0h0a1.21,1.21,0,0,0,0-.14.21.21,0,0,1,0-.11s0,0,0,0,0,0,0,0l0,0Z"/>
-                <path class="cls-9" d="M69.72,47.3h0v0Z"/>
-                <path class="cls-6" d="M69.72,47.33v.09l-.09.06a.47.47,0,0,0,.07-.12Z"/>
-                <path class="cls-6"
-                      d="M69.72,47.32h0l0,0a.47.47,0,0,1-.07.12l-.17.09a.51.51,0,0,0-.23,0v-.05a.28.28,0,0,1,.13-.25.2.2,0,0,1,.09-.06h0l.09,0h.15v.14Z"/>
-                <path class="cls-3"
-                      d="M69.72,48.06v.08c0,.1-.13.22-.13.22l-.26.18a1.66,1.66,0,0,1-.79.36,1.32,1.32,0,0,1-1-.09.9.9,0,0,1-.27-.2.34.34,0,0,1,0-.15h0c.25-.08.49-.17.69-.25a8.55,8.55,0,0,0,1.35-.5c0,.06.07.12.1.13l.06,0,0,0h0A.76.76,0,0,1,69.72,48.06Z"/>
-                <path class="cls-6"
-                      d="M69.65,31.44a14.28,14.28,0,0,1-.16,3.36,12.55,12.55,0,0,1-2,4.7c-.7,1-1.25,1.52-1.3,1.47a3,3,0,0,1,.29-.42c.19-.28.46-.68.76-1.2a13.51,13.51,0,0,0,1.65-4.65,13.85,13.85,0,0,0,0-3.23,34.74,34.74,0,0,0-.39-3.57,11,11,0,0,0-1.17-3.44A7.92,7.92,0,0,0,65,21.83l0,0a8.32,8.32,0,0,0-4.87-1.68,29.13,29.13,0,0,0-4.62.59,16.12,16.12,0,0,0-3.07,1c-.7.31-1.08.56-1.14.58s-.57.33-1.36.94a24.3,24.3,0,0,0-3,2.81,25.21,25.21,0,0,0-1.74,2.1c-.14.2-.29.4-.43.61l-.11.14v0s0,0,0,.05l0,0,.23.27.52.6A48.11,48.11,0,0,0,50,34.5a24.1,24.1,0,0,0,2.66,2c.22.15.46.29.69.43l.7.38c.48.25,1,.48,1.45.7,1.92.92,3.72,1.74,5.29,2.33A15.08,15.08,0,0,0,63,41a6.93,6.93,0,0,0,1.74.15,5.22,5.22,0,0,0,1.12-.1c.25,0,.37-.11.38-.1s-.48.39-1.49.47a7.51,7.51,0,0,1-1.82,0,9.31,9.31,0,0,1-1.26-.28c-.33-.08-.66-.18-1-.29-1.63-.53-3.47-1.3-5.42-2.14-.49-.22-1-.43-1.49-.67L53,37.65l-.74-.43a25.94,25.94,0,0,1-2.8-2,47.56,47.56,0,0,1-4.91-4.66L44,30l-.28-.33-.47-.54c0-.05-.11-.09-.08-.14l.1-.15.2-.29.32-.47.42-.61A24.7,24.7,0,0,1,46,25.19a25.2,25.2,0,0,1,3.12-3,16.69,16.69,0,0,1,1.49-1.06c.07,0,.51-.31,1.3-.65a17.8,17.8,0,0,1,3.33-1A27.83,27.83,0,0,1,60.05,19a9.26,9.26,0,0,1,5.51,2l0,0h0a8.88,8.88,0,0,1,2.61,3,11.8,11.8,0,0,1,1.16,3.75A31.65,31.65,0,0,1,69.65,31.44Z"/>
-                <path class="cls-6"
-                      d="M69.67,47.84h0l-.07,0s-.12,0-.12,0l0,0-.06,0s-.07-.07-.1-.13c.12-.07.19-.11.19-.13l.17-.09,0,0s0,0,0,0,0,0,0,0a.21.21,0,0,0,0,.11A1.21,1.21,0,0,1,69.67,47.84Z"/>
-                <path class="cls-8" d="M69.26,47.67a1.24,1.24,0,0,0,.2-.1s-.07.06-.19.13v0Z"/>
-                <path class="cls-8" d="M69.46,47.57a1.24,1.24,0,0,1-.2.1.11.11,0,0,1,0-.08A.51.51,0,0,1,69.46,47.57Z"/>
-                <path class="cls-3"
-                      d="M69.39,63.42h0l0,0h0l-.09,0a4.78,4.78,0,0,0-.92.64c-.16.12-.31.24-.45.23a.8.8,0,0,1-.38-.23.78.78,0,0,1-.2-.26.15.15,0,0,1,0-.11s0,0,.13,0a1.25,1.25,0,0,0,.36-.09,5.22,5.22,0,0,1,1-.31h.53Z"/>
-                <path class="cls-6"
-                      d="M69.39,2.28l0,0-.87.18a1.85,1.85,0,0,0-.46-.33c-.06,0-.1,0-.11,0s0-.07,0-.09A.15.15,0,0,1,68,2l.24-1a1.22,1.22,0,0,1,.45.3A4.35,4.35,0,0,1,69.39,2.28Z"/>
-                <path class="cls-6"
-                      d="M69.75,68.12a14.79,14.79,0,0,1-.53,1.69c-.2.56-.42,1.11-.59,1.52s-.3.7-.32.72-.15.28-.4.66a11.06,11.06,0,0,1-1,1.36c-.27.32-.54.61-.79.86a1.41,1.41,0,0,1-.1-.18l-.63.62s0,0,.08,0,0,0,0,.05v.07c-.18.15-.31.23-.33.16a10.11,10.11,0,0,1,1.16-2c.29-.48.55-1,.74-1.38s.31-.67.32-.69.16-.27.37-.65.31-.55.48-.87v0l.16-.21C68.92,69.26,69.36,68.69,69.75,68.12Z"/>
-                <path class="cls-6"
-                      d="M67.46,48.33l-.29-.1s-.15.06-.49.23a2.48,2.48,0,0,0-.59,0s.19.14.23.2a9.28,9.28,0,0,1-2,0,16.2,16.2,0,0,1-3.42-1,1.4,1.4,0,0,0,.17-.1l.52-.35a15.12,15.12,0,0,0,2.81.9,9.52,9.52,0,0,0,1.93.13h.09a8,8,0,0,0,2-.27,4.8,4.8,0,0,0,.78-.28v0a8.55,8.55,0,0,1-1.35.5c-.2.08-.44.17-.69.25,0,0,0-.06.08-.08l.09,0Z"/>
-                <path class="cls-6"
-                      d="M69.26,47.67h0a4.8,4.8,0,0,1-.78.28,8,8,0,0,1-2,.27A7.15,7.15,0,0,0,67.83,48c.55-.17,1.1-.3,1.4-.36A.11.11,0,0,0,69.26,47.67Z"/>
-                <path class="cls-6"
-                      d="M68.79,67.14c.14,0,.35,0,.3.25a2.09,2.09,0,0,1-.13.37,1.74,1.74,0,0,1-.14.27c-.06.07-.15.14-.22.12s-.09,0-.09,0,.13,0,.18-.17,0-.15.07-.25,0-.24,0-.22,0,0,0,0-.07,0-.07,0l-.19.06a4,4,0,0,0-.41.17c-.31.13-.59.29-.62.25s.22-.26.5-.45a3.56,3.56,0,0,1,.62-.34A1,1,0,0,1,68.79,67.14Z"/>
-                <path class="cls-7"
-                      d="M69,31.47a13.85,13.85,0,0,1,0,3.23,13.51,13.51,0,0,1-1.65,4.65c-.3.52-.57.92-.76,1.2a3,3,0,0,0-.29.42s-.13.05-.38.1a5.22,5.22,0,0,1-1.12.1A6.93,6.93,0,0,1,63,41a15.08,15.08,0,0,1-2.18-.67c-1.57-.59-3.37-1.41-5.29-2.33-.48-.22-1-.45-1.45-.7l-.7-.38c-.23-.14-.47-.28-.69-.43a24.1,24.1,0,0,1-2.66-2,48.11,48.11,0,0,1-4.69-4.67l-.52-.6L44.58,29l0,0s0,0,0-.05v0l.11-.14c.14-.21.29-.41.43-.61A25.21,25.21,0,0,1,46.86,26a24.3,24.3,0,0,1,3-2.81c.79-.61,1.31-.89,1.36-.94s.44-.27,1.14-.58a16.12,16.12,0,0,1,3.07-1,29.13,29.13,0,0,1,4.62-.59,8.32,8.32,0,0,1,4.87,1.68l0,0a7.92,7.92,0,0,1,2.42,2.63,11,11,0,0,1,1.17,3.44A34.74,34.74,0,0,1,69,31.47Zm-1.4,1.13a3.9,3.9,0,0,0,.18-2,16.49,16.49,0,0,0-.59-2.52A10.8,10.8,0,0,0,66,25.61a5.56,5.56,0,0,0-1.16-1.29,11.65,11.65,0,0,0-1.62-.88,7.72,7.72,0,0,0-1.87-.59,4.76,4.76,0,0,0-2.12.1,6.51,6.51,0,0,0-1.94,1,12.46,12.46,0,0,0-4.25,4.91,10,10,0,0,0-.38,1c-.05.18-.09.36-.13.54s0,.18,0,.29,0,.29,0,.43l.33.27.21.16c.14.1.28.22.43.32l.86.58h0a9.39,9.39,0,0,0,2.61,1.13,23,23,0,0,0,2.54.58,12.77,12.77,0,0,0,4.43.18,7.53,7.53,0,0,0,2.83-1A2.43,2.43,0,0,0,67.56,32.6Z"/>
-                <path class="cls-6"
-                      d="M68.16.37l.08.64L68,2A.15.15,0,0,0,68,2s0,.06,0,.09,0,0,.11,0a1.85,1.85,0,0,1,.46.33c-.44.08-.87.18-1.32.25a2.92,2.92,0,0,1-.44.06l-.45,0h-.76l-.58,0c.09-.9.17-1.29.17-1.29l.1-1.1.42,0,.66.05a2.61,2.61,0,0,0,.28,0,1.72,1.72,0,0,0,.31,0C67.32.47,67.72.42,68.16.37Z"/>
-                <path class="cls-3"
-                      d="M68.29,70.07c-.17.32-.34.62-.48.87s-.36.64-.37.65-.14.29-.32.69-.45.9-.74,1.38a10.11,10.11,0,0,0-1.16,2c0,.07.15,0,.33-.16a1.48,1.48,0,0,1,0,.27,25.11,25.11,0,0,0-.33,2.81c-.06,1.31-.06,2.23-.08,2.83,0,.32,0,.54,0,.69a.13.13,0,0,1,0,.06v0H65L64.36,79c0-.17-.07-.33-.11-.5l0-.25-.08-.29c0-.29-.06-.57-.08-.84-.05-.62-.1-1.2-.14-1.73-.09-1.07-.15-1.95-.2-2.56,0-.25,0-.46,0-.61l.66-.11a9.59,9.59,0,0,0,2.31-.74A5.08,5.08,0,0,0,68.29,70.07Z"/>
-                <path class="cls-6"
-                      d="M67.74,30.65a3.9,3.9,0,0,1-.18,2s0-.75,0-.76a13.61,13.61,0,0,0-.48-1.77l0-.21s0-.1,0-.15c-.43-1.11-.53-1.34-.86-2.07l-.4-.8a5.25,5.25,0,0,0-1.66-2.12l-.29-.18h-.29l-.66-.32a4.94,4.94,0,0,0-3.44-.5,8.38,8.38,0,0,0-3.31,2.09,10.46,10.46,0,0,0-2.48,3.28,6.91,6.91,0,0,0-.37.95c-.05.16-.09.32-.13.48l0,.24v.09l.28.22.41.32.84.59,0,0a9.23,9.23,0,0,0,2.41,1.09,25,25,0,0,0,2.47.64,15.7,15.7,0,0,0,2.66.35l.3.16a.24.24,0,0,1,.17-.07c.35,0,.7-.06,1.05-.07l.06-.06h.16l.14,0A2.23,2.23,0,0,0,65,34a1.88,1.88,0,0,0,.24-.18,5.65,5.65,0,0,0,.65-.15l.17-.16c.23-.1.44-.2.62-.3a9.45,9.45,0,0,0,.92-.58,2.43,2.43,0,0,1-.85.72,7.53,7.53,0,0,1-2.83,1,12.77,12.77,0,0,1-4.43-.18,23,23,0,0,1-2.54-.58,9.39,9.39,0,0,1-2.61-1.13h0l-.86-.58c-.15-.1-.29-.22-.43-.32l-.21-.16-.33-.27c0-.14,0-.29,0-.43s0-.19,0-.29.08-.36.13-.54a10,10,0,0,1,.38-1,12.46,12.46,0,0,1,4.25-4.91,6.51,6.51,0,0,1,1.94-1,4.76,4.76,0,0,1,2.12-.1,7.72,7.72,0,0,1,1.87.59,11.65,11.65,0,0,1,1.62.88A5.56,5.56,0,0,1,66,25.61a10.8,10.8,0,0,1,1.14,2.52A16.49,16.49,0,0,1,67.74,30.65Z"/>
-                <path class="cls-10"
-                      d="M67.54,31.84s0,.75,0,.76a9.45,9.45,0,0,1-.92.58c-.18.1-.39.2-.62.3a5.74,5.74,0,0,0,1-3.41A13.61,13.61,0,0,1,67.54,31.84Z"/>
-                <path class="cls-6"
-                      d="M67.46,48.33H67.4l-.09,0s-.08.05-.08.08a6.07,6.07,0,0,1-.83.17h-.08c0-.06-.23-.15-.23-.2a2.48,2.48,0,0,1,.59,0c.34-.17.49-.23.49-.23Z"/>
-                <path class="cls-6"
-                      d="M67.08,29.86l0,.21a21.9,21.9,0,0,0-1.45-3.34l-.08-.15-.24-.45L65.17,26a4.12,4.12,0,0,0-.85-1,6.68,6.68,0,0,0-.78-.47h.29l.29.18a5.25,5.25,0,0,1,1.66,2.12l.4.8c.33.73.43,1,.86,2.07C67.06,29.76,67.06,29.82,67.08,29.86Z"/>
-                <path class="cls-11"
-                      d="M67.06,30.07a5.74,5.74,0,0,1-1,3.41c-.23.09-.48.18-.76.26l.14-.11a10.05,10.05,0,0,1-2.5.35H62a5.25,5.25,0,0,1-1.9-4.7c.14-2.6,1.6-4.63,3.4-4.74a6.68,6.68,0,0,1,.78.47,4.12,4.12,0,0,1,.85,1l.12.15.24.45.08.15A21.9,21.9,0,0,1,67.06,30.07Z"/>
-                <path class="cls-6"
-                      d="M66.85,42.55a.2.2,0,0,1-.08.24.37.37,0,0,1-.23.05l-.32,0-.29,0,0,0,.67,0c.3,0,.16-.28-.11-.48s-.38.34-.38.34-.15-.05-.15-.07a.83.83,0,0,1,.18-.34.3.3,0,0,1,.22-.11h0a.41.41,0,0,1,.24.1A.85.85,0,0,1,66.85,42.55Z"/>
-                <path class="cls-6"
-                      d="M66.47,42.26c.27.2.41.48.11.48l-.67,0s0,0,0,0l.27-.06.31,0a.16.16,0,0,0,.1,0s0,0,0-.06a.84.84,0,0,0-.19-.18c-.08,0,0,0-.07,0a.62.62,0,0,0-.09.23s-.08,0-.17,0S66.21,42.06,66.47,42.26Z"/>
-                <path class="cls-6"
-                      d="M66.43,45.15a.58.58,0,0,1,.25.49.73.73,0,0,1-1.11.38.58.58,0,0,1-.07-.61,1.86,1.86,0,0,1,.3-.45s.09,0,.15.06c-.22.26-.51.64-.27.91s1,0,.9-.45A.74.74,0,0,0,66,45S66.17,45,66.43,45.15Z"/>
-                <path class="cls-6"
-                      d="M66.61,42.57s0,0,0,.06a.16.16,0,0,1-.1,0l-.31,0-.27.06.16-.15c.09,0,.17,0,.17,0a.62.62,0,0,1,.09-.23s0,0,.07,0A.84.84,0,0,1,66.61,42.57Z"/>
-                <path class="cls-6"
-                      d="M66.58,45.48c.15.42-.66.72-.9.45s0-.65.27-.91A.74.74,0,0,1,66.58,45.48Zm-.08.13a.45.45,0,0,0-.16-.36A1,1,0,0,0,66,45c.07.06.1.11.09.14a1.3,1.3,0,0,0-.27.36.29.29,0,0,0,0,.32c0,.07.23.08.39,0A.44.44,0,0,0,66.5,45.61Z"/>
-                <path class="cls-6"
-                      d="M66.34,45.25a.34.34,0,0,1-.17.63c-.16,0-.35,0-.39,0a.29.29,0,0,1,0-.32,1.3,1.3,0,0,1,.27-.36s0-.08-.09-.14A1,1,0,0,1,66.34,45.25Z"/>
-                <path class="cls-3"
-                      d="M66.43,48.23h-.06a9.52,9.52,0,0,1-1.93-.13,15.12,15.12,0,0,1-2.81-.9l1.3-.85a15.58,15.58,0,0,0,1.3,1.21,3.65,3.65,0,0,0,1,.49,4,4,0,0,0,1.07.17Z"/>
-                <path class="cls-3"
-                      d="M64.74,41.44l1.6.64a.3.3,0,0,0-.22.11.83.83,0,0,0-.18.34s.07,0,.15.07l-.16.15s0,0,0,0l0,0-.46.79A15.13,15.13,0,0,0,63.2,44l-.09-.75s0,0,0,0a4.16,4.16,0,0,0-1.24-.48l-.62-.16.38-1.42a9.31,9.31,0,0,0,1.26.28A7.51,7.51,0,0,0,64.74,41.44Z"/>
-                <path class="cls-6"
-                      d="M66.2,75.05a.8.8,0,0,1,0,.44,2.38,2.38,0,0,1-.16.4,7,7,0,0,0-.65,2.7,9.46,9.46,0,0,0,.25,2.8,3.66,3.66,0,0,0,.19.57,4,4,0,0,1-.6.09s0,0,0,0l.14,0h0l-.32.06h0v0a.13.13,0,0,0,0-.06c0-.15,0-.37,0-.69,0-.6,0-1.52.08-2.83a25.11,25.11,0,0,1,.33-2.81,1.48,1.48,0,0,0,0-.27l.28-.25.32-.32Z"/>
-                <path class="cls-6"
-                      d="M66.05,74.75a1.41,1.41,0,0,0,.1.18l-.32.32-.28.25v-.07c0-.06,0,0,0-.05s-.08,0-.08,0Z"/>
-                <path class="cls-6"
-                      d="M66,33.48l-.17.16a5.65,5.65,0,0,1-.65.15l.06,0C65.54,33.66,65.79,33.57,66,33.48Z"/>
-                <path class="cls-6"
-                      d="M65.67,97.26a3.85,3.85,0,0,1,.25,2,5.19,5.19,0,0,1-.46,1.93c-.24.58-.51,1.1-.73,1.55s-.37.7-.5,1l-.77.09c0-.07.08-.17.14-.28s.35-.62.59-1,.52-.93.77-1.47a6.78,6.78,0,0,0,.33-.85,5,5,0,0,0,.17-.92,3.55,3.55,0,0,0-.13-1.79,4.16,4.16,0,0,0-.9-1.32,2.52,2.52,0,0,0-.75-.57c.09,0,.17,0,.27-.06a3,3,0,0,1,.66.44A4.18,4.18,0,0,1,65.67,97.26Z"/>
-                <path class="cls-8" d="M65.89,82h0v0l0,0h0V82Z"/>
-                <path class="cls-8" d="M65.88,82v0h-.08l-.16,0-.21,0h0l-.14,0s-.07-.06,0,0a4,4,0,0,0,.6-.09h0Z"/>
-                <path class="cls-6"
-                      d="M65.47,43.58c.07,0,.11,0,.11,0s-1.5.47-3,1l-.69.23-.48-.41,1-.27c.25-.06.49-.12.74-.16A15.13,15.13,0,0,1,65.47,43.58Z"/>
-                <path class="cls-3"
-                      d="M65.33,97.41a3.55,3.55,0,0,1,.13,1.79,5,5,0,0,1-.17.92A6.78,6.78,0,0,1,65,101c-.25.54-.53,1-.77,1.47s-.44.8-.59,1-.1.21-.14.28l-1.4.14c-.6,0-1.21.1-1.81.13l-.32,0h-.3l-.19,0-.9-.14c-1.61-.25-3.22-.45-4.78-.74,0,0,0,0,0,0,.14-.2.37-.47.64-.8a8.93,8.93,0,0,0,1.69-2.72,5.16,5.16,0,0,0,.08-3.17,1.82,1.82,0,0,0-.56-.8l1,.17a18.79,18.79,0,0,0,6.09-.11c.31,0,.63-.11,1-.19a2.52,2.52,0,0,1,.75.57A4.16,4.16,0,0,1,65.33,97.41Z"/>
-                <path class="cls-11"
-                      d="M65.4,33.63l-.14.11-.34.1h0a15.44,15.44,0,0,1-2,.14A10.05,10.05,0,0,0,65.4,33.63Z"/>
-                <path class="cls-6"
-                      d="M65.26.42l-.1,1.1H64a11.34,11.34,0,0,1,.22,1.25L63,2.73l-.24-.39A8,8,0,0,0,62,1.39l-.26-.28.16-1c.41,0,1.32.13,2.5.27Z"/>
-                <path class="cls-11" d="M65.26,33.74l-.06,0-.28.05Z"/>
-                <path class="cls-6"
-                      d="M64.92,33.84l.28-.05A1.88,1.88,0,0,1,65,34a2.23,2.23,0,0,1-.89,0,6.6,6.6,0,0,0,.84-.16Z"/>
-                <path class="cls-6" d="M64,1.53h1.17s-.08.39-.17,1.29l-.74,0h0A11.34,11.34,0,0,0,64,1.53Z"/>
-                <polygon class="cls-8" points="65.02 82.2 65.02 82.21 65.02 82.21 65.02 82.2"/>
-                <path class="cls-6"
-                      d="M64.35,45.15c.44-.12.74-.09.75,0s-.29.11-.66.29-.68.41-1.08.68L63,45.76A9.59,9.59,0,0,1,64.35,45.15Z"/>
-                <path class="cls-6"
-                      d="M65,2.81a45.57,45.57,0,0,0-.18,4.74s0-.24-.1-.46-.15-.68-.24-1c-.07-1.51-.17-2.59-.26-3.32h0Z"/>
-                <path class="cls-9" d="M64.81,7.55v0l-.29,0v0Z"/>
-                <path class="cls-8"
-                      d="M64.81,7.55l-.3,0c0-.53,0-1,0-1.48q.14.47.24,1C64.76,7.31,64.81,7.52,64.81,7.55Z"/>
-                <path class="cls-6"
-                      d="M62.78,64s0,0,0,0,.49-.14.84-.26a1,1,0,0,0,.36-.2,3.94,3.94,0,0,0-.6,0c-.35,0-.53.41-.6.5S62.78,63.94,62.78,64Zm1.71-.72a.18.18,0,0,1,.06.23c0,.07-.06.06-.09.08a.11.11,0,0,1-.06,0l-.07,0a1.63,1.63,0,0,1-.62.28,2.44,2.44,0,0,1-.94.07s0-.13.06-.3a.81.81,0,0,1,.52-.46,3.24,3.24,0,0,1,.67,0h.32S64.35,63.17,64.49,63.23Zm-.12.18s0,0,0,0a.21.21,0,0,1-.06-.1s0,0,0,0l-.13.07a.53.53,0,0,1-.14.12l.28,0h0A.49.49,0,0,1,64.37,63.41Z"/>
-                <path class="cls-6"
-                      d="M64.47,6.1c0,.46,0,1,0,1.48,0-.07,0-.24-.08-.43a8.67,8.67,0,0,0-2.17-4.3l-.17-.15.93,0A13.48,13.48,0,0,1,64.47,6.1Z"/>
-                <path class="cls-3"
-                      d="M64.39,63.38s0,0,0,0a.49.49,0,0,0,0,.11h0l-.28,0a.53.53,0,0,0,.14-.12l.13-.07s0,0,0,0A.21.21,0,0,0,64.39,63.38Z"/>
-                <path class="cls-11"
-                      d="M64.91,33.84a6.6,6.6,0,0,1-.84.16H64a.29.29,0,0,0-.24,0h-.05l-.5,0-.55,0a3.85,3.85,0,0,1-.48,0L62,34h.86A15.44,15.44,0,0,0,64.91,33.84Z"/>
-                <path class="cls-7" d="M64.21,2.78c.09.73.19,1.81.26,3.32A13.48,13.48,0,0,0,63,2.73Z"/>
-                <path class="cls-6"
-                      d="M64.23,103.68l-.06.12-.2.41c0,.09-.21.1-.38,0s-.27-.21-.22-.32a1.63,1.63,0,0,0,.09-.16Z"/>
-                <path class="cls-11" d="M64.07,34l-.14,0h-.16A.29.29,0,0,1,64,34Z"/>
-                <path class="cls-6"
-                      d="M64,95.46c-.1,0-.18.05-.27.06l-.17-.06a1.06,1.06,0,0,0-.42,0s.13-.15.44-.12A1.26,1.26,0,0,1,64,95.46Z"/>
-                <path class="cls-6"
-                      d="M63.72,34.05h.05l-.06.06c-.35,0-.7,0-1.05.07a.24.24,0,0,0-.17.07l-.3-.16a3.85,3.85,0,0,0,.48,0l.55,0Z"/>
-                <path class="cls-3"
-                      d="M64,63.47a1,1,0,0,1-.36.2c-.35.12-.73.21-.84.26.07-.09.25-.46.6-.5A3.94,3.94,0,0,1,64,63.47Z"/>
-                <path class="cls-6"
-                      d="M63.66,72.09v.09c-.32,0-.65.09-1,.12,0-.26,0-.4,0-.44h1v0S63.65,72,63.66,72.09Z"/>
-                <path class="cls-6"
-                      d="M63.4,66.3c.11,0,.24.15.23.28a.5.5,0,0,1-.1.19l-.09.1a3.25,3.25,0,0,1-.42.31,1.18,1.18,0,0,1-.77,0s.34-.08.68-.22c.09-.08.23-.21.33-.32a.5.5,0,0,0,.07-.08v0l0,0a2.92,2.92,0,0,0-.45-.08l-.35,0a.73.73,0,0,0-.59.17,2.13,2.13,0,0,0-.52.88,1.22,1.22,0,0,1,.36-1,1,1,0,0,1,.78-.31l.36,0A2.15,2.15,0,0,1,63.4,66.3Z"/>
-                <path class="cls-6" d="M63.36,46.07l-.26.17-.17.11-.29-.29a.46.46,0,0,0-.07-.07l.3-.16.14-.07Z"/>
-                <path class="cls-3"
-                      d="M63.11,43.2l.09.75c-.25,0-.49.1-.74.16l-1,.27c-.47-.39-.81-.64-.86-.58a6.65,6.65,0,0,0,.58.66l-.8.25c-.58.19-1,.36-1,.37a8.64,8.64,0,0,0-1,.5l-.41.28c-1.2-.39-2.46-.76-3.71-1.11-.23-.07-.49-.13-.67-.2L53,44.27l-1.32-.59-.15-.07c.7-.19,1.36-.35,1.9-.47.78-.17,1.32-.22,1.35-.23s.56-.1,1.36-.19A20.23,20.23,0,0,1,59,42.65a23,23,0,0,1,2.86.31C62.52,43.08,63,43.2,63.11,43.2Z"/>
-                <path class="cls-6"
-                      d="M63.14,43.19s0,0,0,0-.59-.12-1.27-.24A23,23,0,0,0,59,42.65a20.23,20.23,0,0,0-2.88.07c-.8.09-1.33.17-1.36.19s-.57.06-1.35.23c-.54.12-1.2.28-1.9.47l-.68-.31c.88-.31,1.74-.56,2.44-.75a13.73,13.73,0,0,1,1.39-.29,11.45,11.45,0,0,1,1.4-.14,18.9,18.9,0,0,1,3,.06,19.94,19.94,0,0,1,2.27.37l.62.16A4.16,4.16,0,0,1,63.14,43.19Z"/>
-                <path class="cls-10"
-                      d="M62.88,24.22l.66.32c-1.8.11-3.26,2.14-3.4,4.74A5.25,5.25,0,0,0,62,34l.15.1a15.7,15.7,0,0,1-2.66-.35,25,25,0,0,1-2.47-.64A9.23,9.23,0,0,1,54.65,32l0,0-.84-.59-.41-.32-.28-.22v-.09l0-.24c0-.16.08-.32.13-.48a6.91,6.91,0,0,1,.37-.95,10.46,10.46,0,0,1,2.48-3.28,8.38,8.38,0,0,1,3.31-2.09A4.94,4.94,0,0,1,62.88,24.22Z"/>
-                <path class="cls-6" d="M63,45.76l-.14.07-.3.16-1-1.08.35-.12,1.07.94Z"/>
-                <path class="cls-6" d="M62.64,46.06l.29.29-1.3.85-.73-.29.53-.3L62.57,46A.46.46,0,0,1,62.64,46.06Z"/>
-                <path class="cls-6"
-                      d="M62.78,2.34l.24.39-.93,0a3.36,3.36,0,0,0-.69-.49l-.29-.14.66-1,.26.28A8,8,0,0,1,62.78,2.34Z"/>
-                <path class="cls-9" d="M62.78,64s0,0,0,0S62.79,64,62.78,64Z"/>
-                <path class="cls-6"
-                      d="M61.64,77.81l0,0,0,0,0,.07h0v-.07l0-.26c.22-1.44.43-2.87.58-3.94l.21-1.34.19,0a52.52,52.52,0,0,1-.29,5.39l0,.28v.08a1.94,1.94,0,0,1-.06.22h0s0,0,0,0l0,0h0l0,0,0,0h0s0,0,0,0l-.1-.09h0v0l0,0,0,0,0,0h0A.8.8,0,0,0,61.64,77.81Z"/>
-                <path class="cls-6" d="M62.62,72.3l-.19,0c0-.29.08-.45.11-.45S62.61,72,62.62,72.3Z"/>
-                <path class="cls-3"
-                      d="M61.86,72.35c.19,0,.38,0,.57,0l-.21,1.34c-.15,1.07-.36,2.5-.58,3.94l0,.26v.07h0s0,0,0,0l0,.09-.21.5c-.14.34-.26.66-.39,1l-.69,1.76c-.2.52-.37,1-.48,1.27,0,.08-.06.15-.08.22v0l0,.07s0,0,0,0l0,0c0,.09,0,.13,0,.14l-.51,1.63c-.33.27-.71.6-1.12.93l-1.39,1.19-.18.16-.09.07,0,0h0a2.8,2.8,0,0,1-.14-.25A.6.6,0,0,1,56,86.6a.36.36,0,0,1,0-.12.61.61,0,0,1,.19-.38,3.53,3.53,0,0,1,.28-.37c-.09-.21-.89.56-.79.71a.82.82,0,0,0,.21.57l.11.12L55.13,87l-.45-.07-.19,0a.76.76,0,0,1,0-.15.77.77,0,0,1,.08-.29c0-.08.06-.12.06-.13a2,2,0,0,1,.23-.4c.14-.19.35-.32.33-.36s-.28,0-.49.19a1.33,1.33,0,0,0-.26.28.84.84,0,0,0-.1.15,1,1,0,0,0-.08.53L54,86.34v-.21a2.45,2.45,0,0,1,0-.27,3.12,3.12,0,0,1,.1-.48,1.14,1.14,0,0,1,.45-.64,1,1,0,0,1,.7-.18c.08.16,2-.6,2-.62A12.54,12.54,0,0,0,59,82.79h0a9.25,9.25,0,0,0,.26-3,24.51,24.51,0,0,0-.13-3.16s-.1-.45-.29-1-.47-1.27-.76-2-.66-1.46-.93-2a9.7,9.7,0,0,0,2.18.62A14.62,14.62,0,0,0,61.86,72.35Z"/>
-                <path class="cls-8" d="M62.23,78.28s0,0,0,0l0,0h0Z"/>
-                <path class="cls-6"
-                      d="M62.22,78.31l-.18.51c-.11.34-.23.68-.34,1l-.59,1.79c-.18.52-.32,1-.43,1.28l0,0c-.18,0-.51.09-.51.1h-.52s0-.06,0-.09,0,0,0,0l0-.07v0c0-.07.05-.14.08-.22.11-.32.28-.75.48-1.27l.69-1.76c.13-.33.25-.65.39-1l.21-.5,0-.09s0,0,0,0,0,.12.07.11,0-.12.07-.08h.12l0,0,0,0,0,0v0h0l.1.09s0,0,0,0h0l0,0,0,0h0Z"/>
-                <path class="cls-6"
-                      d="M61.93.07l-.16,1-.66,1,.29.14a3.36,3.36,0,0,1,.69.49l-.57,0-.9-.08c-.52,0-1.27-.11-2.15-.13l-1,0c-.1-.29-.19-.54-.29-.77s-.12-.25-.18-.36a1.51,1.51,0,0,0-.3-.36L56.41.66,56.16.43l0-.21C57,.12,57.75.06,58.46,0c.94,0,1.73,0,2.31,0l.93,0Z"/>
-                <path class="cls-6" d="M61.9,44.79l-.35.12c-.13-.14-.24-.27-.36-.39l0-.06.28-.08Z"/>
-                <path class="cls-8"
-                      d="M61.66,77.83l0,0a.8.8,0,0,1,.17.15h-.08c-.06,0-.07.07-.07.08s-.06-.07-.07-.11l0-.07Z"/>
-                <path class="cls-3"
-                      d="M61.55,44.91l1,1.08-1.14.62-.53.3-1.12-.44-1.06-.37c.5-.26.87-.41.9-.42s.38-.18.93-.4Z"/>
-                <path class="cls-6" d="M61.42,44.38l-.28.08a6.65,6.65,0,0,1-.58-.66C60.61,43.74,61,44,61.42,44.38Z"/>
-                <path class="cls-6"
-                      d="M61.19,44.52c.12.12.23.25.36.39l-1,.37c-.55.22-.92.39-.93.4s-.4.16-.9.42c-.24-.08-.48-.17-.73-.24l.41-.28a8.64,8.64,0,0,1,1-.5s.41-.18,1-.37l.8-.25Z"/>
-                <path class="cls-6" d="M60.9,46.91l.73.29-.52.35a1.4,1.4,0,0,1-.17.1l-.73-.26.36-.27.19-.12Z"/>
-                <path class="cls-6"
-                      d="M60.21,47.39l.73.26-.45.3c-.36.24-.82.6-1.27,1a15.19,15.19,0,0,1-1.8,1.48h0a8.94,8.94,0,0,1,1.49-1.81,13.14,13.14,0,0,1,1.21-1.12Z"/>
-                <path class="cls-6"
-                      d="M60.9,46.91l-.14.09-.19.12-.36.27-.67-.22c-.55-.18-1.11-.35-1.69-.52h0l.44-.3.39-.24h0l1.06.37Z"/>
-                <path class="cls-8" d="M60.68,82.89a.06.06,0,0,0,0,0h0Z"/>
-                <path class="cls-9" d="M60.66,82.93a.19.19,0,0,1,0,.08h0l0,0Z"/>
-                <path class="cls-8" d="M60.66,82.93l0,.11h-.47S60.48,83,60.66,82.93Z"/>
-                <polygon class="cls-8" points="60.64 83.01 60.62 83.08 60.62 83.06 60.62 83.04 60.64 83.01"/>
-                <path class="cls-6"
-                      d="M60.62,83.08h0v0h0v.13a1.47,1.47,0,0,0,0,.17l-.18.52c-.12.33-.3.8-.49,1.36L57,87.43l-.43.34a.2.2,0,0,1-.09,0h0l-.08,0h-.2l-.3,0L55,87.62l-.45-.1-.24-.06-.17,0s-.12,0-.14-.08c-.19-.3-.37-.59-.55-.86v-.23a.86.86,0,0,1,0-.16,2.14,2.14,0,0,1,.06-.31,2.37,2.37,0,0,1,.18-.55,1.34,1.34,0,0,1,.68-.72,1.43,1.43,0,0,1,.81,0h0a1,1,0,0,0-.7.18,1.14,1.14,0,0,0-.45.64,3.12,3.12,0,0,0-.1.48,2.45,2.45,0,0,0,0,.27v.21l.29.39a.06.06,0,0,0,0,0c0,.3.27.48.3.45s0-.15-.07-.31l.19,0,.45.07.91.12c.15.14.3.22.33.19a.65.65,0,0,0-.1-.19h0l0,0,.09-.07.18-.16L58,85.67c.41-.33.79-.66,1.12-.93l.51-1.63s0,0,0-.14l0,0s0,.06,0,.09h1v0Z"/>
-                <path class="cls-3"
-                      d="M60.21,47.39l-.09.07a13.14,13.14,0,0,0-1.21,1.12,8.94,8.94,0,0,0-1.49,1.81l-1.7.25a3.84,3.84,0,0,1-.8-.43,2.34,2.34,0,0,1-.38-.28c-.09-.07-.16-.16-.24-.23a3.46,3.46,0,0,1-.42-.57l.33-.19a20.84,20.84,0,0,0,2.69-1.65l1-.64c.58.17,1.14.34,1.69.52Z"/>
-                <path class="cls-6"
-                      d="M60.18,69.06a.26.26,0,0,1-.07.24.58.58,0,0,1-.25.12l-.19,0a1.16,1.16,0,0,1-.4,0l-.1,0s0,0,0,0,0,0,0,0,0,0,0,0a.23.23,0,0,0,0-.07s-.11-.06-.05-.07a.49.49,0,0,0,.19,0,1.49,1.49,0,0,0,.46-.07s0,0,0,0,0,0,0-.06a.86.86,0,0,0-.28-.11c-.09,0-.14,0-.16,0s.26-.19.57,0A.4.4,0,0,1,60.18,69.06Zm-.93.26c.06.09,0,0,0,0Z"/>
-                <path class="cls-9" d="M59.23,69.29s.08.12,0,0Z"/>
-                <path class="cls-6"
-                      d="M59.11,76.62a24.51,24.51,0,0,1,.13,3.16,9.25,9.25,0,0,1-.26,3,.08.08,0,0,0,0-.06s.11-.25-.11-.2c-.1-.49-.22-1.59-.34-2.71-.09-.75-.18-1.51-.26-2.07,0-.28-.07-.51-.1-.68s0-.25,0-.27-.06-.37-.2-.92-.33-1.28-.54-2c-.25-.88-.52-1.73-.67-2.29h0l0-.07.37.16c.27.51.62,1.24.93,2s.57,1.42.76,2S59.1,76.6,59.11,76.62Z"/>
-                <path class="cls-8" d="M58.89,82.52c.22,0,.08.15.11.2a.08.08,0,0,1,0,.06h0s-.06-.1-.09-.27Z"/>
-                <path class="cls-6"
-                      d="M58.89,82.52c0,.17.06.27.09.27a12.54,12.54,0,0,1-1.75,1.15s-1.93.78-2,.62h0a2.9,2.9,0,0,1,.78-.34c.77-.46,1.21-.77,2-1.3l.56-.29A1.41,1.41,0,0,1,58.89,82.52Z"/>
-                <path class="cls-6"
-                      d="M58.84,7.31c0,.08.07.27,0,.11a2.52,2.52,0,0,0-.74-.52l-.25-.23c-.2-.17-.39-.32-.58-.46l-.45-.34c-.3-.22-.59-.41-.86-.6a10.61,10.61,0,0,0-1.59-.91,11.74,11.74,0,0,0-2.58-.83l-.54-.1.28-.12.4-.16L52.27,3l.11,0a20.13,20.13,0,0,1,2.06.95,13.29,13.29,0,0,1,1.62,1l.88.65.45.34.36.28.15.13c.3.25.55.5.58.53s0,0,0-.12l-.09-.27c-.06-.16-.1-.27-.12-.31-.23-.64-.65-1.76-1-2.46-.22-.51-.42-.94-.61-1.28h.82c.12.33.24.71.37,1.13.26.87.58,1.93.95,3.18a1.11,1.11,0,0,0,0,.3A2.46,2.46,0,0,0,58.84,7.31Z"/>
-                <path class="cls-6"
-                      d="M58.72,46.1h0l-.39.24-.44.3h0l-.65-.18.35-.27.42-.33h0C58.24,45.93,58.48,46,58.72,46.1Z"/>
-                <path class="cls-7"
-                      d="M58.47,6.77c0,.08.11.28,0,.12s-.28-.28-.58-.53l-.15-.13L57.39,6l-.45-.34L56.06,5a13.29,13.29,0,0,0-1.62-1A20.13,20.13,0,0,0,52.38,3a14.93,14.93,0,0,1,3.11-.49c.41,0,.81,0,1.2,0,.19.34.39.77.61,1.28.31.7.73,1.82,1,2.46,0,0,.06.15.12.31Z"/>
-                <path class="cls-6"
-                      d="M58,45.86h0l-.42.33-.35.27c-1-.29-2.09-.55-3.16-.82-.25-.06-.47-.11-.74-.2h0l.07-.14-1.18-.58-.11.23-.84-.35L50,44.06l.61-.19.92-.26.15.07,1.32.59.65.28c.18.07.44.13.67.2C55.53,45.1,56.79,45.47,58,45.86Z"/>
-                <path class="cls-6" d="M57.2,46.47l.65.18-1,.64a20.84,20.84,0,0,1-2.69,1.65,17.91,17.91,0,0,1,2.42-2Z"/>
-                <path class="cls-6"
-                      d="M55.54,62.68s0,.07,0,.07,0,0-.09-.06,0-.07,0-.08l.06,0,.15,0c.21,0,.47,0,.73-.08a2.63,2.63,0,0,1,.77-.06.81.81,0,0,1,.31.06.37.37,0,0,1,.16.1.2.2,0,0,1,.07.15.24.24,0,0,1,0,.17.59.59,0,0,1-.18.14l-.27.21a.83.83,0,0,1-.42.2.91.91,0,0,1-.43-.11l-.31-.15c-.19-.09-.3-.15-.29-.18a1.21,1.21,0,0,1,.33.06l.34.1a.67.67,0,0,0,.33.05c.19,0,.37-.29.54-.42s0,0,0,0h0l-.19,0a3.23,3.23,0,0,0-.71,0,3.66,3.66,0,0,1-.75,0Z"/>
-                <path class="cls-6"
-                      d="M56.24,1.76s0,0,0,0l0-.05Zm1-.09c.1.23.19.48.29.77h-.82A3.89,3.89,0,0,0,56.44,2l-.17-.23,0,0s0,0,0,0h0l-.05,0-.38-.2-.29-.14.67-1,.25.23.33.29a1.51,1.51,0,0,1,.3.36C57.1,1.42,57.17,1.55,57.22,1.67Z"/>
-                <path class="cls-3"
-                      d="M57.2,46.47l-.57.44a17.91,17.91,0,0,0-2.42,2l-.33.19a3.84,3.84,0,0,1-.23-.45,11,11,0,0,1-.55-1.74c-.07-.3-.12-.54-.18-.75.18-.35.3-.6.37-.74h0c.27.09.49.14.74.2C55.11,45.92,56.17,46.18,57.2,46.47Z"/>
-                <path class="cls-6" d="M57.13,71.66l-.37-.16a2.2,2.2,0,0,0,.11-.27A4.84,4.84,0,0,1,57.13,71.66Z"/>
-                <path class="cls-6"
-                      d="M55.72,70.58,57,71s0,.07-.07.19,0,0,0,0c-.12-.2-.21-.31-.26-.29s0,.22.09.53a10.16,10.16,0,0,1-1.09-.56A3.26,3.26,0,0,0,55.72,70.58Z"/>
-                <path class="cls-6"
-                      d="M56.9,54.9l0,0a6.55,6.55,0,0,0-.56.6c-.31.26-.48.47-.79.72l-.74.6c-.45.35-.87.65-1.28.91a10.72,10.72,0,0,1-2.1,1c-.56.19-1,.31-1.22.39l-.12,0c0-.36-.1-.73-.13-1.08h.11a9.74,9.74,0,0,0,1.23-.12,7,7,0,0,0,2.05-.64,17.59,17.59,0,0,0,2.47-1.68l.55-.45,0,0-.34.08-.55.14-.63.07-.82.06a11.87,11.87,0,0,1-1.45,0,7.34,7.34,0,0,1-2.14-.42l-.51-.21a9.46,9.46,0,0,1,.12-1.07,3.29,3.29,0,0,0,.67.53,5.38,5.38,0,0,0,1.85.65,9.68,9.68,0,0,0,1.4.1l.82,0c.34,0,.76-.05,1.16-.09A7.67,7.67,0,0,0,56.9,54.9Z"/>
-                <path class="cls-6"
-                      d="M56.87,71.23a2.2,2.2,0,0,1-.11.27.09.09,0,0,1-.06,0c-.08-.31-.12-.51-.09-.53S56.75,71,56.87,71.23Z"/>
-                <path class="cls-8" d="M56.76,71.5l0,.07,0-.1A.09.09,0,0,0,56.76,71.5Z"/>
-                <path class="cls-6"
-                      d="M56.73,71.57h0a1,1,0,0,0-.07.15,13,13,0,0,1-1,1.73A26.07,26.07,0,0,1,54,75.63c-.64.75-1.36,1.56-2.12,2.29A29.25,29.25,0,0,0,48,82.07c-.87,1.27-1.11,2.3-1.22,2.28a3.61,3.61,0,0,1,.38-1.69,1,1,0,0,0,.31-.15s-.1,0-.26,0a7.28,7.28,0,0,1,.36-.76,9.44,9.44,0,0,1,1-1.5.89.89,0,0,0,.35-.16.82.82,0,0,0-.26,0c.75-1,1.67-1.94,2.56-2.9.71-.76,1.34-1.55,1.94-2.33a24.19,24.19,0,0,0,1.51-2.14,13.28,13.28,0,0,0,.83-1.59c.05-.12.09-.22.13-.3a10.16,10.16,0,0,0,1.09.56Z"/>
-                <path class="cls-6"
-                      d="M56.44,2a3.89,3.89,0,0,1,.25.42c-.39,0-.79,0-1.2,0A14.93,14.93,0,0,0,52.38,3l-.5-.19c-.68-.24-1.17-.39-1.49-.48l-.47-.14h0c.26-.16.53-.31.8-.46l.41-.21.46-.22A15.68,15.68,0,0,1,55.25.33l.88-.11,0,.21-.67,1,.29.14.38.2.05,0h0s0,0,0,0l0,0Z"/>
-                <path class="cls-6"
-                      d="M55.72,86.44c-.1-.15.7-.92.79-.71a3.53,3.53,0,0,0-.28.37.61.61,0,0,0-.19.38.36.36,0,0,0,0,.12.6.6,0,0,0,.09.28,2.8,2.8,0,0,0,.14.25s0,0-.23,0L55.93,87A.82.82,0,0,1,55.72,86.44Z"/>
-                <path class="cls-7"
-                      d="M56.37,55.13l0,0-.55.45a17.59,17.59,0,0,1-2.47,1.68,7,7,0,0,1-2.05.64,9.74,9.74,0,0,1-1.23.12H50q-.06-.6-.09-1.17a14.88,14.88,0,0,1,0-2l.51.21a7.34,7.34,0,0,0,2.14.42,11.87,11.87,0,0,0,1.45,0l.82-.06.63-.07.55-.14Z"/>
-                <path class="cls-8"
-                      d="M56.27,87.13a.65.65,0,0,1,.1.19s-.18,0-.33-.19C56.23,87.14,56.24,87.16,56.27,87.13Z"/>
-                <path class="cls-8" d="M56.29,1.68l0,.05s0,0,0,0Z"/>
-                <path class="cls-6"
-                      d="M56.19,96.45a5.16,5.16,0,0,1-.08,3.17,8.93,8.93,0,0,1-1.69,2.72c-.27.33-.5.6-.64.8,0,0,0,0,0,0l-.7-.13a12,12,0,0,1,.9-1.1,8.63,8.63,0,0,0,1.71-2.47A5.24,5.24,0,0,0,56,96.53a1.69,1.69,0,0,0-.6-.93l.11,0,.17,0A1.82,1.82,0,0,1,56.19,96.45Z"/>
-                <path class="cls-6"
-                      d="M56.21,50.87s.11,0,0,.06l-.48.09-.89.16-.81.14-.62.09a6.94,6.94,0,0,1-2,.08,4.78,4.78,0,0,1-.81-.2c.1-.31.2-.62.31-.9a3,3,0,0,0,.72.4,4.77,4.77,0,0,0,1.8.19l.6,0,.51,0,.55-.08.29,0c.1,0,0,0-.05,0l-.14,0-.09,0a3.66,3.66,0,0,1-.52-.28l-.21-.16a3.11,3.11,0,0,1-.28-.23,4.45,4.45,0,0,1-.81-1c-.39-.68-.63-1.25-.85-1.69,0,0,0,0,0,0l.51-1c.06.21.11.45.18.75a11,11,0,0,0,.55,1.74,3.84,3.84,0,0,0,.23.45,3.46,3.46,0,0,0,.42.57c.08.07.15.16.24.23a2.34,2.34,0,0,0,.38.28,3.84,3.84,0,0,0,.8.43l.17.07s.16.09.17.11S56.18,50.86,56.21,50.87Z"/>
-                <path class="cls-7"
-                      d="M56,96.53a5.24,5.24,0,0,1-.28,2.94A8.63,8.63,0,0,1,54,101.94a12,12,0,0,0-.9,1.1c-.53-.11-1.06-.23-1.57-.37a13.43,13.43,0,0,1-3.16-1.31c-.18-.09-.35-.19-.52-.29l.68-.25a10.08,10.08,0,0,0,2.88-1.66,3.85,3.85,0,0,0,1-1.49,4.18,4.18,0,0,0,.25-1.53,3.81,3.81,0,0,0-.22-1.39l.43.13,1.59.46.9.26A1.69,1.69,0,0,1,56,96.53Z"/>
-                <path class="cls-6" d="M55.63,95.65l-.17,0-.11,0c-.1-.09-.17-.13-.17-.15a.61.61,0,0,1,.37.15Z"/>
-                <path class="cls-3"
-                      d="M55.61,70.91c0,.08-.08.18-.13.3a13.28,13.28,0,0,1-.83,1.59,24.19,24.19,0,0,1-1.51,2.14c-.6.78-1.23,1.57-1.94,2.33-.89,1-1.81,2-2.56,2.9a5.43,5.43,0,0,1-.79.09A7.9,7.9,0,0,1,45.54,80a3.24,3.24,0,0,1-1.08-.5,2.52,2.52,0,0,1-.68-.76,2.58,2.58,0,0,1-.34-1c.59-.73,1.17-1.41,1.72-2a3,3,0,0,0,.88.8,2.43,2.43,0,0,0,1.19.35c.36,0,.59-.17.54-.26s-.2-.1-.43-.24a3.75,3.75,0,0,1-.74-.58,2.57,2.57,0,0,1-.44-.75l-.09-.31.23-.24c.29-.31.57-.6.85-.86a3.46,3.46,0,0,0,.85.86c.89.61,1.9.71,1.94.55s-.79-.61-1.33-1.25a2.72,2.72,0,0,1-.53-.93l0-.1.72-.68.42-.4a1.7,1.7,0,0,0,.62.75,1.87,1.87,0,0,0,.39.23l.38.17a4.64,4.64,0,0,0,.69.23c.42.1.73.06.74,0s-.22-.2-.54-.43c-.16-.11-.34-.25-.52-.4l-.3-.23a3,3,0,0,1-.25-.24.75.75,0,0,1-.13-.82,2,2,0,0,1,.16-.3l0-.07h0a.05.05,0,0,1,0,0l.65-.61,0,0v0l0,.12a1.73,1.73,0,0,0,.29.31,4.06,4.06,0,0,0,.57.35c.43.22,1,.29,1,.1s-.19-.47-.4-.81l-.28-.46a.48.48,0,0,1,0-.13.66.66,0,0,1-.24-.45s0-.08,0-.12a2.77,2.77,0,0,0,.31-.53l.19.21a17.72,17.72,0,0,0,2,1.68C54.88,70.45,55.24,70.69,55.61,70.91Z"/>
-                <path class="cls-7"
-                      d="M55.33,50.73s.15,0,.05,0l-.29,0-.55.08-.51,0-.6,0a4.77,4.77,0,0,1-1.8-.19,3,3,0,0,1-.72-.4c.08-.22.17-.42.25-.62.41-.88.85-1.72,1.17-2.38l.08-.18s0,0,0,0c.22.44.46,1,.85,1.69a4.45,4.45,0,0,0,.81,1,3.11,3.11,0,0,0,.28.23l.21.16a3.66,3.66,0,0,0,.52.28l.09,0Z"/>
-                <path class="cls-6"
-                      d="M55.18,85.58s-.19.17-.33.36a2,2,0,0,0-.23.4s0,0-.06.13a.77.77,0,0,0-.08.29.76.76,0,0,0,0,.15h0s-.07,0-.1,0l-.12-.15a1,1,0,0,1,.08-.53.84.84,0,0,1,.1-.15,1.33,1.33,0,0,1,.26-.28C54.9,85.6,55.17,85.53,55.18,85.58Z"/>
-                <path class="cls-6"
-                      d="M54.74,67.67a1.6,1.6,0,0,1-.26,1.3h0l-.23-.18,0,0a1.35,1.35,0,0,0,.2-.91c-.17,0-.46,0-.64,0a.71.71,0,0,1-.27.33L53.36,68c.18-.12.21-.21.21-.24l-.06-.2.21,0h.83A.18.18,0,0,1,54.74,67.67Z"/>
-                <path class="cls-8"
-                      d="M54.49,86.91c0,.16.09.28.07.31s-.26-.15-.3-.45a.06.06,0,0,1,0,0l.12.15s.07,0,.1,0Z"/>
-                <path class="cls-3"
-                      d="M54.48,67.85a1.35,1.35,0,0,1-.2.91l0,0c-.23-.2-.46-.4-.67-.61a.71.71,0,0,0,.27-.33C54,67.86,54.31,67.86,54.48,67.85Z"/>
-                <path class="cls-6" d="M54.47,69h0a.42.42,0,0,1-.28.1.57.57,0,0,1-.28-.08l.15-.25a.23.23,0,0,0,.18,0Z"/>
-                <path class="cls-6"
-                      d="M53.06,103l.7.13-.19.29c0,.07-.2.05-.36,0s-.25-.22-.2-.31A.28.28,0,0,1,53.06,103Z"/>
-                <path class="cls-6" d="M53.57,68.18l-.09.06L53.32,68l0,0Z"/>
-                <path class="cls-6" d="M52.18,44.73l1.18.58-.07.14-.71-.28L52.07,45Z"/>
-                <path class="cls-6"
-                      d="M53.29,45.45c-.07.14-.19.39-.37.74,0-.12-.06-.22-.09-.31a1.06,1.06,0,0,0-.16-.34.82.82,0,0,0-.21-.19l-.53,1a4.45,4.45,0,0,1,.48.83l-.08.18c-.32.66-.76,1.5-1.17,2.38-.08.2-.17.4-.25.62a.94.94,0,0,1-.24-.28l-.81.85a3,3,0,0,0,.74.33,15.28,15.28,0,0,0-.42,1.65c0,.28-.1.57-.13.86a1.11,1.11,0,0,1-.26-.32l-.89.75a4,4,0,0,0,1,.64,14.88,14.88,0,0,0,0,2q0,.57.09,1.17h-.31v0c0-.78-.1-1.54-.14-2.26l-.24-.29-.14-.19a3.52,3.52,0,0,0-.27-.37l-.14-.21c0-.4.06-.78.11-1.15l.88-.55-.56-.82a.34.34,0,0,1-.1.06,15.8,15.8,0,0,1,.54-1.93c.51-.4.85-.67.82-.73s-.27,0-.63.18c.07-.17.13-.33.2-.49.45-1,.84-1.76,1.16-2.44l.9-1.87.51.21Z"/>
-                <path class="cls-6"
-                      d="M52.6,70c.21.34.45.64.4.81s-.57.12-1-.1a4.06,4.06,0,0,1-.57-.35,1.73,1.73,0,0,1-.29-.31l0-.12v0A7.59,7.59,0,0,0,52,68.84s0,.09,0,.12a.66.66,0,0,0,.24.45.48.48,0,0,0,0,.13Z"/>
-                <path class="cls-6"
-                      d="M52.83,45.88c0,.09.06.19.09.31l-.51,1a4.45,4.45,0,0,0-.48-.83l.53-1a.82.82,0,0,1,.21.19A1.06,1.06,0,0,1,52.83,45.88Z"/>
-                <path class="cls-6"
-                      d="M52.65,96.14a4.18,4.18,0,0,1-.25,1.53,3.85,3.85,0,0,1-1,1.49,10.08,10.08,0,0,1-2.88,1.66l-.68.25c-.24-.14-.48-.28-.71-.44l.16,0c.25-.07.6-.18,1-.33a9.58,9.58,0,0,0,2.79-1.45,3.65,3.65,0,0,0,1.34-2.67,9.38,9.38,0,0,0,0-1.39h.06A3.81,3.81,0,0,1,52.65,96.14Z"/>
-                <path class="cls-6"
-                      d="M52.45,67.7a.76.76,0,0,1-.12.61,7,7,0,0,1-.84-1.15c.4-.68.44-1,.5-.87A8.22,8.22,0,0,0,52.45,67.7Z"/>
-                <path class="cls-8" d="M52.43,94.75h-.06s0-.06,0-.06S52.4,94.71,52.43,94.75Z"/>
-                <path class="cls-3"
-                      d="M52.37,94.74a9.38,9.38,0,0,1,0,1.39,3.65,3.65,0,0,1-1.34,2.67,9.58,9.58,0,0,1-2.79,1.45c-.41.15-.76.26-1,.33l-.16,0h0l-.22-.15-.35-.24c-.18-.13-.42-.3-.62-.47-.43-.33-.9-.78-1.34-1.17,0,.53,0,1,0,1.56l-.8-1.7-.4-.84-.56.74-.6.77-.08.1s0,.06,0,0v-.06l-.06-.3L41.62,97c-.06-.31-.13-.61-.2-.92l-.1-.47a3,3,0,0,0-.16-.56c-.08-.17-.27-.8-.48-1.5.22,0,.49.08.78.11a6.4,6.4,0,0,0,1.57,0,5.69,5.69,0,0,0,1.68-.54A3,3,0,0,0,46,92.25a3.87,3.87,0,0,0,.58-.93c.08-.24.16-.46.23-.66.14-.39.25-.72.32-1,.17.33.29.52.29.54s.22.33.53.77a18.44,18.44,0,0,0,1.22,1.54,7.72,7.72,0,0,0,1.46,1.31,2.27,2.27,0,0,0,.79.37l.19.23h0a1.22,1.22,0,0,0,.32.12Z"/>
-                <path class="cls-6"
-                      d="M52.38,3l-.11,0-.37.13-.4.16-.28.12a9.5,9.5,0,0,0-1-.09h-.46l.12-1.15h0l.47.14c.32.09.81.24,1.49.48Z"/>
-                <path class="cls-6"
-                      d="M49.82,59.63h0l0-.49c0-.38,0-.75-.08-1.11h0l.13,1.16.27-.07c.1.72.22,1.46.38,2.2a23,23,0,0,0,.76,2.84A1.05,1.05,0,0,0,51,64c-.11,0-.19,0-.18,0s.07,0,.13.08l.21.24a.67.67,0,0,0,.25.2,6.44,6.44,0,0,0,.24.61s0,0,0,0h0q.12.32.27.63l.18.35-.13.07c-.06-.11-.1.19-.5.87-.17-.28-.32-.56-.46-.85a21.2,21.2,0,0,1-1.6-4.74c-.06-.23-.1-.46-.15-.68a1,1,0,0,0,.47-.43.8.8,0,0,0,.1-.45.78.78,0,0,0,0-.22l0-.07,0,0h0l0,0v0Z"/>
-                <path class="cls-6"
-                      d="M52.33,68.31a2.77,2.77,0,0,1-.31.53c0-.3,0-.63-.14-.72s-.56.2-.75.71a1.49,1.49,0,0,0-.1.8,1,1,0,0,0,.06.28l0,0-.65.61a1.77,1.77,0,0,1-.36-.26L50,70.16l-.44-.49,0,0,.17-.19c.3-.28.48-.45.51-.49a12.34,12.34,0,0,0,1.33-1.81A7,7,0,0,0,52.33,68.31Z"/>
-                <path class="cls-6"
-                      d="M51.91,64.51a.48.48,0,0,1,.17.41.37.37,0,0,1-.27.31.24.24,0,0,1-.14,0,0,0,0,0,1,0,0c.06-.06.23-.16.2-.29a.23.23,0,0,0-.13-.16.26.26,0,0,0-.1,0,1,1,0,0,1-.21-.11c0-.14-.11-.28-.15-.42,0,0,0,0,.05,0a1.48,1.48,0,0,0,.42.19A.36.36,0,0,1,51.91,64.51Z"/>
-                <path class="cls-6"
-                      d="M51.47,72.61c.32.23.55.35.54.43s-.32.14-.74,0a4.64,4.64,0,0,1-.69-.23l-.38-.17a1.87,1.87,0,0,1-.39-.23,1.7,1.7,0,0,1-.62-.75l1.23-1.16a.05.05,0,0,0,0,0h0l0,.07a2,2,0,0,0-.16.3.75.75,0,0,0,.13.82,3,3,0,0,0,.25.24l.3.23C51.13,72.36,51.31,72.5,51.47,72.61Z"/>
-                <path class="cls-6"
-                      d="M51.88,68.12c.12.09.1.42.14.72a7.59,7.59,0,0,1-.93,1.07,1,1,0,0,1-.06-.28,1.49,1.49,0,0,1,.1-.8C51.32,68.32,51.74,68,51.88,68.12Z"/>
-                <path class="cls-9" d="M51.65,65.2a0,0,0,0,0,0,0h0S51.64,65.21,51.65,65.2Z"/>
-                <path class="cls-6" d="M51.49,43.61l-.92.26-.61.19-.54-.24c.32-.14.66-.27,1-.39l.38-.13h0Z"/>
-                <path class="cls-6"
-                      d="M51.26,64.17c0,.14.1.28.15.42a.67.67,0,0,1-.25-.2L51,64.15c-.06-.05-.12-.05-.13-.08s.07-.07.18,0A1.05,1.05,0,0,1,51.26,64.17Z"/>
-                <path class="cls-6"
-                      d="M47.19,89.26a2.24,2.24,0,0,0-.17.33l-.1-.19a6.53,6.53,0,0,1-.51-2,.28.28,0,0,1,0-.09c.13-.07.18-.12.17-.14l-.17.07a5.07,5.07,0,0,1,.37-2.64h0a14.28,14.28,0,0,0,.1,2.73,6.25,6.25,0,0,0,.6,1.76,7.06,7.06,0,0,0,.47.75l.46.78c.28.45.66,1,1.08,1.59a8.81,8.81,0,0,0,1.26,1.39c.38.34.68.52.66.57s0,0,0,0a2.27,2.27,0,0,1-.79-.37,7.72,7.72,0,0,1-1.46-1.31A18.44,18.44,0,0,1,47.9,91c-.31-.44-.51-.75-.53-.77s-.12-.21-.29-.54A1.34,1.34,0,0,0,47.19,89.26Z"/>
-                <path class="cls-6"
-                      d="M51.22,3.43l-.51.22c-.52.23-1,.48-1.49.74A20.75,20.75,0,0,0,46.73,6l-.24.18a.9.9,0,0,0-.21.08,3.63,3.63,0,0,0-.46.34,1.67,1.67,0,0,0-.06-1c.09-.1.18-.21.28-.31a15.45,15.45,0,0,1,2.4-2.07c.45-.34,1-.65,1.46-1l-.12,1.15h.46A9.5,9.5,0,0,1,51.22,3.43Z"/>
-                <path class="cls-6"
-                      d="M50.81,43.3l-.38.13c-.35.12-.69.25-1,.39l-.79-.35c-1.69-.76-3.27-1.5-4.61-2.18-.66-.35-1.28-.68-1.82-1s-1-.64-1.38-.88l-1.24-.82L37.19,37l-2.51-1.64c-.17-.13-.42-.28-.6-.44l-.22-.26a2.36,2.36,0,0,1-.15-.25c-.06-.09,0-.21,0-.28s0-.18.13-.28a1.12,1.12,0,0,1,.27-.26l.34-.24a3.36,3.36,0,0,1,.48-.28l.15-.07L35,33l-.05,0-.18,0-.59-.17-3.4-1,2.59-1.66.84-.54.21-.13.07,0,.16-.1.15-.09s-.08-.05-.13-.07L34.45,29l-.26-.12-.44-.18s-.22-.08-.31-.14a1,1,0,0,1-.28-.23.92.92,0,0,1,.12-1.26,8.12,8.12,0,0,0,1.86-3,16.17,16.17,0,0,0,.79-2.8,15.29,15.29,0,0,0,.25-2.24l.16.14h0a10,10,0,0,1,0,2.16,15.55,15.55,0,0,1-.63,2.93A11.13,11.13,0,0,1,35,26a5.62,5.62,0,0,1-.51.83c-.09.13-.19.27-.3.4l-.16.2-.15.16a.24.24,0,0,0,0,.36.15.15,0,0,0,.09.06L34,28l.45.17,1.38.52.38.15.19.07.09,0,0,0,0,0-.67.45-2,1.39-.42.28-.14.1-.2.15.32.07,1,.27,3.61,1-1.61.89-.76.44-.28.17-.08,0h0s-.06,0-.05.07l.12.07L37.87,36c1.45.9,2.36,1.5,2.44,1.54s.49.35,1.24.86c.39.28.77.55,1.29.87s1.1.64,1.75,1c1.3.7,2.84,1.47,4.49,2.27Z"/>
-                <path class="cls-6"
-                      d="M50.91,50.39c-.11.28-.21.59-.31.9a3,3,0,0,1-.74-.33l.81-.85A.94.94,0,0,0,50.91,50.39Z"/>
-                <path class="cls-6"
-                      d="M50.44,49.58c0,.06-.31.33-.82.73.06-.19.13-.37.19-.55C50.17,49.6,50.42,49.53,50.44,49.58Z"/>
-                <path class="cls-6"
-                      d="M50.06,70.28a1.77,1.77,0,0,0,.36.26L49.19,71.7s0-.07,0-.11a1.89,1.89,0,0,1,0-1,3,3,0,0,1,.19-.61l.08-.16s0,0,0,0,0,0,0-.06a.35.35,0,0,1,.08-.1l.44.49Z"/>
-                <path class="cls-6"
-                      d="M50.05,53.8a9.46,9.46,0,0,0-.12,1.07,4,4,0,0,1-1-.64l.89-.75A1.11,1.11,0,0,0,50.05,53.8Z"/>
-                <path class="cls-6" d="M50,58.05c0,.35.08.72.13,1.08l-.27.07L49.72,58H50Z"/>
-                <path class="cls-6"
-                      d="M49.42,43.82l.54.24a17.15,17.15,0,0,0-2.08.81,9.81,9.81,0,0,0-1.13.66s.31-.47,1-.88A13,13,0,0,1,49.42,43.82Z"/>
-                <path class="cls-6"
-                      d="M48.61,73.81c.54.64,1.4,1.07,1.33,1.25s-1,.06-1.94-.55a3.46,3.46,0,0,1-.85-.86c.31-.31.62-.6.9-.87l0,.1A2.72,2.72,0,0,0,48.61,73.81Z"/>
-                <path class="cls-9" d="M49.92,2.18h0Z"/>
-                <path class="cls-6"
-                      d="M49.85,60a.8.8,0,0,1-.1.45,1,1,0,0,1-.47.43l-.15-.78a.08.08,0,0,0,0-.07v0l.14-.08h0l.05,0h0l0,0,0,0a.06.06,0,0,0,0,0l.13-.07h0l.12,0h0l0,0,0,.07A.78.78,0,0,1,49.85,60Z"/>
-                <path class="cls-8" d="M49.82,59.63l0,0h0Z"/>
-                <path class="cls-6"
-                      d="M49.81,49.76c-.06.18-.13.36-.19.55-.27.2-.59.45-.91.72-.48.38-1,.79-1.42,1.18l-.6.56-.25.24-.11.11-.07.08s0,0,0,.06a1.23,1.23,0,0,0,.06.21,2.61,2.61,0,0,0,.27.52c.25.39.92.85,1.43,1.53a3.19,3.19,0,0,1,.53,1.12,4.3,4.3,0,0,1,.1,1c0,.15,0,.29,0,.41a1.13,1.13,0,0,1,0,.18.19.19,0,0,1,0,.09.09.09,0,0,1,0,.06h0l-.11-.09h0s0,0,0,0h0s0,0,0,0l-.05,0s0-.07,0-.12-.05-.23-.08-.37A3.2,3.2,0,0,0,47.51,56c-.46-.51-1.14-.87-1.6-1.4a4.26,4.26,0,0,1-.45-.71c-.08-.19-.12-.33-.13-.35a1.42,1.42,0,0,1,0-.25.83.83,0,0,1,.25-.67c.05,0,.09-.09.15-.13a1.36,1.36,0,0,0,.12-.12l.29-.23.68-.52c.5-.36,1.06-.72,1.58-1A14.45,14.45,0,0,1,49.81,49.76Z"/>
-                <path class="cls-8" d="M49.79,59.65v0l0,0h0Z"/>
-                <path class="cls-6"
-                      d="M49.79,59.64h0l-.12.06h0l-.13.07a.06.06,0,0,1,0,0l0,0,0,0h0l-.05,0h0l-.14,0h0a.45.45,0,0,1,0-.17s0,0,0,0L49,59.21l-.12-1.12c-.06-.64-.12-1.26-.17-1.84a11.37,11.37,0,0,1,0-1.55l.14.21a3.52,3.52,0,0,1,.27.37l.14.19.24.29c0,.72.09,1.48.14,2.26v0c0,.36.06.73.08,1.11Z"/>
-                <path class="cls-8" d="M49.78,59.66h0l-.12,0Z"/>
-                <path class="cls-6"
-                      d="M49.18,52.18l.56.82-.88.55c0-.28.08-.56.13-.83l.09-.47h0A.34.34,0,0,0,49.18,52.18Z"/>
-                <path class="cls-3"
-                      d="M49.62,50.31a15.8,15.8,0,0,0-.54,1.93h0l-1,.65-.27.18c-.18.13-.42.25-.48.45a1,1,0,0,0,.06.68c.06.14.08.17.12.25l.12.2a8.57,8.57,0,0,0,.52.76l.29.39.16.19.07.08h0a.88.88,0,0,0,0,.16c0,.22,0,.46,0,.7,0,.63.1,1.27.19,1.91h0a.47.47,0,0,0-.12-.23,1.81,1.81,0,0,0-.24-.24h0a.09.09,0,0,0,0-.06.19.19,0,0,0,0-.09,1.13,1.13,0,0,0,0-.18c0-.12,0-.26,0-.41a4.3,4.3,0,0,0-.1-1,3.19,3.19,0,0,0-.53-1.12c-.51-.68-1.18-1.14-1.43-1.53a2.61,2.61,0,0,1-.27-.52,1.23,1.23,0,0,1-.06-.21s0,0,0-.06l.07-.08.11-.11.25-.24.6-.56c.45-.39.94-.8,1.42-1.18C49,50.76,49.35,50.51,49.62,50.31Z"/>
-                <path class="cls-6"
-                      d="M49.48,69.65l0,0a.35.35,0,0,0-.08.1s0,.06,0,.06,0,0,0,0l-.08.16a3,3,0,0,0-.19.61,1.89,1.89,0,0,0,0,1s0,.07,0,.11l-.42.4-.72.68c0-.1,0-.18-.06-.25a.82.82,0,0,0-.09-.26l-.77.42-.13.07-.16.08-.1,0h0l-.07-.05C47.61,71.76,48.53,70.69,49.48,69.65Z"/>
-                <path class="cls-6"
-                      d="M49.13,60.11l.15.78-.19.07a2.46,2.46,0,0,1-.65.08A9.23,9.23,0,0,1,47.26,61a4.84,4.84,0,0,1-1.12-.28,1.5,1.5,0,0,1-.92-.83,1.07,1.07,0,0,1,0-.64,4.7,4.7,0,0,1,.18-.47,6.14,6.14,0,0,1,.4-.86,1.48,1.48,0,0,1,.29-.36l.33-.27a1.68,1.68,0,0,1,.36-.28c.11,0,.24-.11.35,0s.15.43.2.63,0,.17.05.25a.3.3,0,0,1,0,.21l-.23.07.1-.11c0-.07,0-.2-.07-.34s0-.27-.15-.39-.16,0-.22.08l-.18.19-.26.25a1.08,1.08,0,0,0-.21.29,8.29,8.29,0,0,0-.32.82,4.29,4.29,0,0,0-.13.44.59.59,0,0,0,0,.35,1.07,1.07,0,0,0,.64.48,4.52,4.52,0,0,0,1,.2,7.76,7.76,0,0,0,1.08,0c.33,0,.69-.12.71-.24Z"/>
-                <path class="cls-8" d="M49.14,60l.14,0-.14.08h0Z"/>
-                <path class="cls-8" d="M49.14,60v0a.08.08,0,0,1,0,.07c0-.11,0-.21,0-.31a.45.45,0,0,0,0,.17h0Z"/>
-                <path class="cls-3"
-                      d="M49.09,59.8c0,.1,0,.2,0,.31v0c0,.12-.38.24-.71.24a7.76,7.76,0,0,1-1.08,0,4.52,4.52,0,0,1-1-.2,1.07,1.07,0,0,1-.64-.48.59.59,0,0,1,0-.35,4.29,4.29,0,0,1,.13-.44,8.29,8.29,0,0,1,.32-.82,1.08,1.08,0,0,1,.21-.29l.26-.25.18-.19c.06-.05.15-.13.22-.08s.08.27.15.39.11.27.07.34l-.1.11,0,0a1.08,1.08,0,0,0-.54.38.41.41,0,0,0,0,.34.62.62,0,0,0,.12.2,1,1,0,0,0,.13.14s.11,0,.15-.09.08-.15.06-.17l-.1-.08c0-.07-.1-.14-.07-.21s.2-.17.38-.26a1.52,1.52,0,0,1,.57-.18.85.85,0,0,1,.54.19c.16.12.32.23.44.33s.08.47.12.47a.35.35,0,0,0,.07-.14.35.35,0,0,0,0-.18h0q.06.47.15.93S49.08,59.79,49.09,59.8Z"/>
-                <path class="cls-8"
-                      d="M49,59.21l.07.58q-.09-.47-.15-.93c-.09-.64-.15-1.28-.19-1.91,0-.24,0-.48,0-.7.05.58.11,1.2.17,1.84Z"/>
-                <path class="cls-6"
-                      d="M49.08,52.25l-.09.47c-.05.27-.1.55-.13.83l-.28.18-.27.17h0v0l.05.12.09.15c.09.17.2.33.31.51a11.37,11.37,0,0,0,0,1.55.88.88,0,0,1,0-.16h0L48.63,56l-.16-.19-.29-.39a8.57,8.57,0,0,1-.52-.76l-.12-.2c0-.08-.06-.11-.12-.25a1,1,0,0,1-.06-.68c.06-.2.3-.32.48-.45l.27-.18Z"/>
-                <path class="cls-6"
-                      d="M48.94,58.86a.35.35,0,0,1,0,.18.35.35,0,0,1-.07.14s.11-.25-.12-.47-.28-.21-.44-.33a.85.85,0,0,0-.54-.19,1.52,1.52,0,0,0-.57.18c-.18.09-.35.18-.38.26s0,.14.07.21l.1.08s0,.1-.06.17-.12.11-.15.09a1,1,0,0,1-.13-.14.62.62,0,0,1-.12-.2.41.41,0,0,1,0-.34,1.08,1.08,0,0,1,.54-.38l0,0c-.08.09-.15.13-.14.15s.14,0,.35-.19c0,0,0,0,0,0a1.29,1.29,0,0,1,.4-.07.94.94,0,0,1,.55.2v.07a.32.32,0,0,0,0,.09s0,.09.16.12a.2.2,0,0,0,.09,0,1.81,1.81,0,0,1,.24.24A.47.47,0,0,1,48.94,58.86Z"/>
-                <path class="cls-6" d="M48.64,80.17a.82.82,0,0,1,.26,0,.89.89,0,0,1-.35.16Z"/>
-                <path class="cls-6"
-                      d="M48.64,80.17l-.09.13a5.51,5.51,0,0,1-.69.14,7.09,7.09,0,0,1-2.39-.11,3.52,3.52,0,0,1-1.23-.51,2.69,2.69,0,0,1-.83-.86,3.21,3.21,0,0,1-.34-.72c.08-.11.17-.21.25-.31l.12-.15a2.58,2.58,0,0,0,.34,1,2.52,2.52,0,0,0,.68.76,3.24,3.24,0,0,0,1.08.5,7.9,7.9,0,0,0,2.31.26A5.43,5.43,0,0,0,48.64,80.17Z"/>
-                <path class="cls-6"
-                      d="M48.47,58.3l.11.09a.2.2,0,0,1-.09,0c-.17,0-.13-.09-.16-.12a.32.32,0,0,1,0-.09v-.07l.1.07h0v0l0,0s0,0,0,0Z"/>
-                <path class="cls-8" d="M48.49,58.26s0,0,0,0l-.07-.06h0v0l.05,0s0,0,0,0Z"/>
-                <path class="cls-8" d="M48.47,58.29h0v0s0,0,0,0l0,0v0h0Z"/>
-                <path class="cls-6" d="M48.4,58.22h0l-.1-.07h0s0,0,.07,0h0Z"/>
-                <path class="cls-7"
-                      d="M47.86,80.44a5.51,5.51,0,0,0,.69-.14,9.44,9.44,0,0,0-1,1.5,7.28,7.28,0,0,0-.36.76c-.2,0-.52.13-.91.2a6.19,6.19,0,0,1-2.55,0,3.4,3.4,0,0,1-2.05-1.35,2.85,2.85,0,0,1-.37-.66q.21-.39.45-.75c.41-.63.86-1.22,1.3-1.79a3.21,3.21,0,0,0,.34.72,2.69,2.69,0,0,0,.83.86,3.52,3.52,0,0,0,1.23.51A7.09,7.09,0,0,0,47.86,80.44Z"/>
-                <path class="cls-6"
-                      d="M48,72.53c0,.07,0,.15.06.25-.28.27-.59.56-.9.87a2,2,0,0,1-.17-.27c-.1-.19-.17-.35-.21-.44l0-.06h0l.1,0,.16-.08.13-.07.77-.42A.82.82,0,0,1,48,72.53Z"/>
-                <path class="cls-6"
-                      d="M47.77,76.63c0,.09-.18.27-.54.26A2.43,2.43,0,0,1,46,76.54a3,3,0,0,1-.88-.8l.91-1,.09.31a2.57,2.57,0,0,0,.44.75,3.75,3.75,0,0,0,.74.58C47.57,76.53,47.73,76.55,47.77,76.63Z"/>
-                <path class="cls-6"
-                      d="M47.81,101.07l-.37.13-.41.13a.13.13,0,0,1-.13-.06c0-.07-.06-.14-.13-.2a.17.17,0,0,1,0-.24.15.15,0,0,1,.09-.13l.25-.07h0C47.33,100.79,47.57,100.93,47.81,101.07Z"/>
-                <path class="cls-6" d="M47.2,82.56c.16,0,.25-.07.26,0a1,1,0,0,1-.31.15A.47.47,0,0,1,47.2,82.56Z"/>
-                <path class="cls-6" d="M47.35,58s0,0,0,0c-.21.19-.34.19-.35.19s.06-.06.14-.15Z"/>
-                <path class="cls-6"
-                      d="M47.2,82.56a.47.47,0,0,0-.05.1,6.1,6.1,0,0,1-.81.28,6.18,6.18,0,0,1-2.67.18,3.68,3.68,0,0,1-2.33-1.42,2.41,2.41,0,0,1-.28-.43c.08-.16.16-.33.26-.49a2.85,2.85,0,0,0,.37.66,3.4,3.4,0,0,0,2.05,1.35,6.19,6.19,0,0,0,2.55,0C46.68,82.69,47,82.61,47.2,82.56Z"/>
-                <path class="cls-6" d="M47.19,89.26a1.34,1.34,0,0,1-.11.44L47,89.59A2.24,2.24,0,0,1,47.19,89.26Z"/>
-                <path class="cls-6"
-                      d="M47,89.59l.06.11c-.07.24-.18.57-.32,1-.07.2-.15.42-.23.66a3.87,3.87,0,0,1-.58.93,3,3,0,0,1-1.24.86,5.69,5.69,0,0,1-1.68.54,6.4,6.4,0,0,1-1.57,0c-.29,0-.56-.07-.78-.11l-.15-.5a8.75,8.75,0,0,0,1,.17,5.82,5.82,0,0,0,1.46,0,5.93,5.93,0,0,0,1.6-.46,3.62,3.62,0,0,0,1.36-.93,2.74,2.74,0,0,0,.39-.64c.1-.23.18-.45.27-.65C46.77,90.16,46.91,89.83,47,89.59Z"/>
-                <path class="cls-6"
-                      d="M47,73.38a2,2,0,0,0,.17.27c-.28.26-.56.55-.85.86l-.23.24a.73.73,0,0,0,0-.08,1.87,1.87,0,0,0-.64.16,2,2,0,0,0-.6.27,3.81,3.81,0,0,0,.28.54l.07.1c-.55.63-1.13,1.31-1.72,2a.08.08,0,0,1,0,0,.24.24,0,0,0-.26-.18.22.22,0,0,0-.2.26,1.93,1.93,0,0,0,.1.41c-.44.57-.89,1.16-1.3,1.79q-.24.36-.45.75l0-.07a2.69,2.69,0,0,1-.11-.33.16.16,0,0,0-.09-.12h0c.15-.35.32-.69.48-1l.08-.11c.38-.54.7-1.11,1-1.68l.82-1.19c.43-.48.86-1,1.32-1.41.64-.65,1.26-1.34,1.87-2l.07.05h0l0,.06C46.81,73,46.88,73.19,47,73.38Z"/>
-                <path class="cls-7"
-                      d="M46.92,89.4l.1.19c-.11.24-.25.57-.43,1-.09.2-.17.42-.27.65a2.74,2.74,0,0,1-.39.64,3.62,3.62,0,0,1-1.36.93,5.93,5.93,0,0,1-1.6.46,5.82,5.82,0,0,1-1.46,0,8.75,8.75,0,0,1-1-.17c-.25-.82-.49-1.62-.57-1.81l-.13-.34h0a11.84,11.84,0,0,1-.41-2.9c0-.27,0-.55,0-.83a2.08,2.08,0,0,0,.41.35,4.1,4.1,0,0,0,2.8.74,14.86,14.86,0,0,0,2.79-.51,3.91,3.91,0,0,0,1-.4.28.28,0,0,0,0,.09A6.53,6.53,0,0,0,46.92,89.4Z"/>
-                <path class="cls-3"
-                      d="M46.77,84.35v.3a5.07,5.07,0,0,0-.37,2.64,1.56,1.56,0,0,0-.15.06c-.21.07-.51.15-.88.24a20.91,20.91,0,0,1-2.75.35,3.89,3.89,0,0,1-2.53-.76,3.19,3.19,0,0,1-.64-.65,5,5,0,0,1,.16-1,27.15,27.15,0,0,1,.87-3c.18-.43.37-.84.58-1.24a2.41,2.41,0,0,0,.28.43,3.68,3.68,0,0,0,2.33,1.42,6.18,6.18,0,0,0,2.67-.18,6.1,6.1,0,0,0,.81-.28A3.61,3.61,0,0,0,46.77,84.35Z"/>
-                <rect class="cls-9" x="46.74" y="72.88" width="0.01" height="0.01"/>
-                <path class="cls-6" d="M46.57,87.22s0,.07-.17.14,0,0,0-.07Z"/>
-                <path class="cls-6"
-                      d="M46.4,87.29s0,0,0,.07a3.91,3.91,0,0,1-1,.4,14.86,14.86,0,0,1-2.79.51,4.1,4.1,0,0,1-2.8-.74,2.08,2.08,0,0,1-.41-.35c0-.22,0-.44,0-.65a3.19,3.19,0,0,0,.64.65,3.89,3.89,0,0,0,2.53.76,20.91,20.91,0,0,0,2.75-.35c.37-.09.67-.17.88-.24A1.56,1.56,0,0,1,46.4,87.29Z"/>
-                <path class="cls-6"
-                      d="M46.05,74.67a.73.73,0,0,1,0,.08l-.91,1-.07-.1a3.81,3.81,0,0,1-.28-.54,2,2,0,0,1,.6-.27A1.87,1.87,0,0,1,46.05,74.67Z"/>
-                <path class="cls-6"
-                      d="M45.76,5.53a1.67,1.67,0,0,1,.06,1c-.2.17-.38.36-.56.54s-.11.12-.17.19a3.83,3.83,0,0,1-.28.29h-.05a.27.27,0,0,1-.12-.15.29.29,0,0,1,0-.11,1.24,1.24,0,0,1,.07-.27A6.56,6.56,0,0,1,45.76,5.53Z"/>
-                <path class="cls-9" d="M45.82,6.58h0c-.19.17-.37.36-.56.54C45.44,6.94,45.62,6.75,45.82,6.58Z"/>
-                <path class="cls-6"
-                      d="M45.56,5.37a.31.31,0,0,1,.2.16,6.56,6.56,0,0,0-1,1.53,1.24,1.24,0,0,0-.07.27.29.29,0,0,0,0,.11.27.27,0,0,0,.12.15h.05l-.22.23-1-.26c-.81-.2-2-.48-3.32-.72a13.41,13.41,0,0,0-2.07-.24c-.74,0-1.59.1-2.45.2s-1.75.24-2.64.4l-.66.13-.54.13c-.08,0-.14,0-.19.07a.49.49,0,0,0-.08.18v.07a.66.66,0,0,0,0,.14c0,.1,0,.2,0,.31s0,.42,0,.64a11.6,11.6,0,0,0,.18,1.3,12.83,12.83,0,0,0,.29,1.26c.07.21.13.41.2.6l.05.13v0l0,.07.15.29a32,32,0,0,0,2.47,4c1.76,2.14,3,3.61,2.85,3.75s-.64-.36-1.56-1.16h0a1.72,1.72,0,0,0-.11-.56s0,.15,0,.41c-.54-.48-1.19-1.08-1.92-1.79a27.93,27.93,0,0,1-3-4L31.12,13l0-.07a.75.75,0,0,1-.07-.12l-.08-.19c-.11-.22-.19-.44-.29-.67-.17-.46-.31-.92-.44-1.4s-.22-1-.3-1.47c0-.25-.06-.51-.08-.77s0-.27,0-.4V7.69c0-.07,0-.19,0-.29a2.26,2.26,0,0,1,.37-1.11,1.82,1.82,0,0,1,1-.62l.27-.1.18-.05.37-.1.71-.19c.93-.24,1.85-.42,2.75-.58s1.78-.28,2.67-.35a14.83,14.83,0,0,1,2.53.15c1.48.19,2.68.44,3.54.61Z"/>
-                <path class="cls-6"
-                      d="M43.43,77.75a.08.08,0,0,0,0,0l-.12.15c-.08.1-.17.2-.25.31a1.93,1.93,0,0,1-.1-.41.22.22,0,0,1,.2-.26A.24.24,0,0,1,43.43,77.75Z"/>
-                <path class="cls-6"
-                      d="M42.8,9.82c0,.08-.6.58-1.17,1.18a9.63,9.63,0,0,0-.73.85c-.19.24-.3.42-.31.42l-.32.42a6.13,6.13,0,0,0-.58.94c-.38.72-.45,1.54-.54,1.54s-.1-.21-.09-.54a3.59,3.59,0,0,1,.2-1.17,5.39,5.39,0,0,1,.5-1.1l.3-.48s.15-.19.38-.43a9,9,0,0,1,.82-.75h0l.56-.18c.37-.12.59-.39.52-.55C42.6,9.85,42.78,9.78,42.8,9.82Z"/>
-                <path class="cls-8"
-                      d="M42.35,10c.07.16-.15.43-.52.55l-.56.18a.12.12,0,0,1,0,0A7.84,7.84,0,0,1,42.35,10Z"/>
-                <path class="cls-6"
-                      d="M42.34,10h0a7.84,7.84,0,0,0-1,.68.12.12,0,0,0,0,0h0c-.08,0-.12,0-.13,0a1.43,1.43,0,0,0-.1-.16,1.31,1.31,0,0,0-.4-.32A3.36,3.36,0,0,0,38.72,10a8.12,8.12,0,0,1-3.36-.27c0-.22,1.65-.38,3.23-.73a4.34,4.34,0,0,1,2.6.08A2.51,2.51,0,0,1,42.34,10Z"/>
-                <path class="cls-6"
-                      d="M41.29,80.71l0,.07c-.1.16-.18.33-.26.49a2.75,2.75,0,0,1-.23-.45c0-.09.07-.17.1-.25a0,0,0,0,0,0,0l.13-.28h0a.16.16,0,0,1,.09.12A2.69,2.69,0,0,0,41.29,80.71Z"/>
-                <path class="cls-9" d="M41.07,80.26h0l-.13.28.13-.28Z"/>
-                <path class="cls-9" d="M40.93,80.57c0,.08-.06.16-.1.25h0Z"/>
-                <path class="cls-6"
-                      d="M40.83,80.82a2.75,2.75,0,0,0,.23.45c-.21.4-.4.81-.58,1.24a27.15,27.15,0,0,0-.87,3,5,5,0,0,0-.16,1,2.57,2.57,0,0,1-.19-.29l0,0c0-.29.1-.57.17-.89A24.6,24.6,0,0,1,40.83,80.82Z"/>
-                <path class="cls-6" d="M40.53,93.06l.15.5-.1,0-.12-.49Z"/>
-                <circle class="cls-3" cx="74.66" cy="26.13" r="0.81"/>
-                <circle class="cls-3" cx="62.2" cy="27.25" r="0.91"/>
-                <circle class="cls-3" cx="62.76" cy="28.68" r="0.18"/>
-                <circle class="cls-3" cx="73.86" cy="27.51" r="0.19"/>
-                <path class="cls-6"
-                      d="M64.13,43.12l.07,0a.29.29,0,0,0-.16-.56h0c-.1,0-.18.12-.21.2v0c-.09.37.47.53.56.16v0l-.21.2h0L64,42.54l-.06,0c-.35.14-.2.7.15.56Z"/>
-                <path class="cls-6" d="M63.92,46.39l0,0a.29.29,0,0,0,.41.41l0,0a.29.29,0,0,0-.41-.41Z"/>
-                <path class="cls-7"
-                      d="M90.14,88.49a1,1,0,0,1,0,.21l-.05.34a5.09,5.09,0,0,1-.12.68,10.14,10.14,0,0,1-.39,1.33,12,12,0,0,1-3.07,4.7,15.53,15.53,0,0,1-4.84,3.18l-.68.28-.7.23c-.46.17-1,.28-1.42.41-1,.21-1.92.36-3,.57l-3.17,1.25h0a18.09,18.09,0,0,1-3.4,1.13c-1.16.28-2.36.5-3.56.68l-1.45.19c.13-.25.3-.58.5-1s.49-1,.73-1.55a5.19,5.19,0,0,0,.46-1.93,3.85,3.85,0,0,0-.25-2,4.18,4.18,0,0,0-1.06-1.36,3,3,0,0,0-.66-.44,35.84,35.84,0,0,0,6.35-2.19c2.68-1.18,5.48-2.68,8.47-4.21.76-.37,1.51-.77,2.29-1.13s1.57-.78,2.37-1.09A8.86,8.86,0,0,1,86,86.22a4.17,4.17,0,0,1,2.46.48,4.33,4.33,0,0,1,1,.81,5.17,5.17,0,0,1,.42.51Z"/>
-                <path class="cls-3"
-                      d="M86.7,7.22s.06.78,0,1.87A25.11,25.11,0,0,1,86.24,13a29.25,29.25,0,0,1-1,3.84,7.62,7.62,0,0,0-.54,1.75s0,0,.09,0c0,.31,0,1.08,0,1.84,0,.5-.06,1-.1,1.38s-.07.63-.07.65,0,.27-.08.64-.11.76-.2,1.19c0-.09,0-.19,0-.3,0-.29,0-.63,0-1a7.16,7.16,0,0,0-.42-1.35,5,5,0,0,0-1-1.34A7.31,7.31,0,0,0,81.41,19a6.82,6.82,0,0,0-3.92-.93,4.21,4.21,0,0,0-2,.82A6.4,6.4,0,0,0,74,20.35a5.3,5.3,0,0,0-.85,1.74c-.18.57-.31,1.11-.42,1.62a32.86,32.86,0,0,0-.55,3.49c0,.08-.16,1.47-.21,3.51a15.86,15.86,0,0,0,1.33,7.34l.12.23.15.28a.6.6,0,0,0,.68.32,1.42,1.42,0,0,0,.32-.07,2.76,2.76,0,0,0,.3-.15l.42-.29c.54-.39,1-.78,1.53-1.17,1-.77,1.87-1.51,2.62-2.17A15.16,15.16,0,0,0,82,32.39a1.54,1.54,0,0,0,.09-.24l.38.46c.05.07.1.12.08.11h0l-.31.27a5.54,5.54,0,0,0-.83,1.07c-.52.93-1.07,2.09-1.78,3.18a8.35,8.35,0,0,1-1.16,1.48,7.12,7.12,0,0,1-1.32,1,12.63,12.63,0,0,0-1.39.88h0a1.1,1.1,0,0,0-.33-.45c-.14-.07-.22,0-.22,0s.07,0,.14.13a1.23,1.23,0,0,1,.17.42c.06.22.11.48.16.77a4,4,0,0,0-1.12.58c0,.08.52-.07,1.17-.23,0,.12,0,.25,0,.37a2.18,2.18,0,0,1,0,.51c-.27.14-.43.26-.41.28s.14,0,.37-.06a3.1,3.1,0,0,1-.15.46h0c-.64.18-1.22.49-1.18.58s.45,0,.95-.09c-.11.17-.18.26-.18.27s-.16.24-.43.55a7.27,7.27,0,0,1-1.09,1,2.76,2.76,0,0,1-1.36.44c-.4,0-.68,0-.7,0s.27.15.7.2a3,3,0,0,0,1-.07v.06a4.89,4.89,0,0,0-.52.42,3.16,3.16,0,0,1-1.28.58,4.38,4.38,0,0,1-1.39,0l-.21,0a2.7,2.7,0,0,0,.53-.46,2.11,2.11,0,0,0,.41-.59,1.07,1.07,0,0,0,.1-.24c-.06-.06-.26.3-.68.65a3.92,3.92,0,0,1-1.83.81,7.36,7.36,0,0,1-2,.12,4.51,4.51,0,0,1-.92-.2l-.26-.08a2.87,2.87,0,0,1-.58-.27c-.34-.24-.77-.62-1.21-1,.4-.27.78-.52,1.08-.68s.66-.24.66-.29-.31-.07-.75,0a9.59,9.59,0,0,0-1.34.61l0,0-1.07-.94.69-.23c1.49-.49,3-.87,3-1s0,0-.11,0l.46-.79.29,0,.32,0a.37.37,0,0,0,.23-.05.2.2,0,0,0,.08-.24.85.85,0,0,0-.25-.37.41.41,0,0,0-.24-.1h0l-1.6-.64c1-.08,1.55-.41,1.49-.47s.6-.44,1.3-1.47a12.55,12.55,0,0,0,2-4.7,14.28,14.28,0,0,0,.16-3.36,31.65,31.65,0,0,0-.28-3.67A11.8,11.8,0,0,0,68.21,24a8.88,8.88,0,0,0-2.61-3h0l0,0a9.26,9.26,0,0,0-5.51-2,27.83,27.83,0,0,0-4.85.52,17.8,17.8,0,0,0-3.33,1c-.79.34-1.23.63-1.3.65a16.69,16.69,0,0,0-1.49,1.06,25.2,25.2,0,0,0-3.12,3,24.7,24.7,0,0,0-1.78,2.24l-.42.61-.32.47-.2.29-.1.15c0,.05.06.09.08.14l.47.54L44,30l.55.6a47.56,47.56,0,0,0,4.91,4.66,25.94,25.94,0,0,0,2.8,2l.74.43.76.38c.51.24,1,.45,1.49.67,2,.84,3.79,1.61,5.42,2.14.36.11.69.21,1,.29l-.38,1.42A19.94,19.94,0,0,0,59,42.18a18.9,18.9,0,0,0-3-.06,11.45,11.45,0,0,0-1.4.14,13.73,13.73,0,0,0-1.39.29c-.7.19-1.56.44-2.44.75h0l-1.73-.82c-1.65-.8-3.19-1.57-4.49-2.27-.65-.35-1.24-.68-1.75-1s-.9-.59-1.29-.87c-.75-.51-1.19-.82-1.24-.86s-1-.64-2.44-1.54l-2.53-1.58-.12-.07s0,0,.05-.07h0l.08,0,.28-.17.76-.44L38,32.67l-3.61-1-1-.27-.32-.07.2-.15.14-.1.42-.28,2-1.39.67-.45,0,0,0,0-.09,0-.19-.07-.38-.15-1.38-.52L34,28l-.12,0a.15.15,0,0,1-.09-.06.24.24,0,0,1,0-.36l.15-.16.16-.2c.11-.13.21-.27.3-.4A5.62,5.62,0,0,0,35,26a11.13,11.13,0,0,0,.71-1.67,15.55,15.55,0,0,0,.63-2.93,10,10,0,0,0,0-2.16c.92.8,1.49,1.23,1.56,1.16s-1.09-1.61-2.85-3.75a32,32,0,0,1-2.47-4l-.15-.29,0-.07v0L32.33,12c-.07-.19-.13-.39-.2-.6a12.83,12.83,0,0,1-.29-1.26,11.6,11.6,0,0,1-.18-1.3c0-.22,0-.44,0-.64s0-.21,0-.31a.66.66,0,0,1,0-.14V7.72a.49.49,0,0,1,.08-.18c.05,0,.11,0,.19-.07l.54-.13.66-.13c.89-.16,1.78-.3,2.64-.4s1.71-.18,2.45-.2a13.41,13.41,0,0,1,2.07.24c1.36.24,2.51.52,3.32.72l1,.26.22-.23a3.83,3.83,0,0,0,.28-.29c.06-.07.12-.12.17-.19s.37-.37.56-.54h0a3.63,3.63,0,0,1,.46-.34.9.9,0,0,1,.21-.08L46.73,6a20.75,20.75,0,0,1,2.49-1.59c.48-.26,1-.51,1.49-.74l.51-.22.54.1a11.74,11.74,0,0,1,2.58.83,10.61,10.61,0,0,1,1.59.91c.27.19.56.38.86.6l.45.34c.19.14.38.29.58.46l.25.23a2.52,2.52,0,0,1,.74.52c.1.16,0,0,0-.11a2.46,2.46,0,0,1,0-.26,1.11,1.11,0,0,1,0-.3c-.37-1.25-.69-2.31-.95-3.18-.13-.42-.25-.8-.37-1.13l1,0c.88,0,1.63.08,2.15.13l.9.08.57,0,.17.15a8.67,8.67,0,0,1,2.17,4.3c0,.19.07.36.08.43v0l.29,0v0A45.57,45.57,0,0,1,65,2.81l.58,0h.76l.45,0a2.92,2.92,0,0,0,.44-.06c.45-.07.88-.17,1.32-.25l.28.29a6.8,6.8,0,0,1,1,1.53c.08.17.17.36.24.55a5.8,5.8,0,0,1,.21.89c0,.3.08.62.13.94l.06.49,0,.25,0,.13s0,0,0,0l.15-.49a15.41,15.41,0,0,1,.75-2,8.45,8.45,0,0,1,.67-1.2,3.69,3.69,0,0,1,.72-.78,6.43,6.43,0,0,1,.73-.48A3.27,3.27,0,0,1,74,2.38a16.23,16.23,0,0,1,2.16.54c.85.29,1.62.62,2.26.86s.93.34,1.23.42c.36.4.64.68.84.87s.34.29.38.27,0-.18-.19-.43-.22-.38-.39-.65l.46,0h.48c.5,0,1-.09,1.58-.16a15.37,15.37,0,0,1,1.63-.14,2.89,2.89,0,0,1,1.36.23c.66.32.79,1.28.84,1.91A11.5,11.5,0,0,1,86.7,7.22ZM86,6.12a3.52,3.52,0,0,0-.09-.85c0-.06-.25,0-.5.07l-.28.12h0a5.33,5.33,0,0,0-1.27.38,11.1,11.1,0,0,1-1.32.49,2.49,2.49,0,0,1-.44.09l.5.72a1.39,1.39,0,0,1,.24-.35A2.85,2.85,0,0,1,84,6.05a1.71,1.71,0,0,1,1.14-.11l0,.22A4.49,4.49,0,0,1,85,7.58c-.17.71-.35,1.44-.41,1.87-.32-.59-.63-1-.7-1a11.42,11.42,0,0,0,.56,1.74c.15.43.27.86.35,1.19s.1.55.11.57a4.42,4.42,0,0,1,.1.54,7.64,7.64,0,0,1,0,1.22,9.48,9.48,0,0,0-.1,1.82,5.29,5.29,0,0,0,.56-1.76,6.33,6.33,0,0,0,.18-1.31,6.26,6.26,0,0,0,0-.64s-.06-.26-.18-.6A9.92,9.92,0,0,0,84.92,10c-.06-.1-.11-.21-.16-.31a13.38,13.38,0,0,0,.94-1.93A4.77,4.77,0,0,0,86,6.12ZM74.92,43.19a.77.77,0,0,0,0-.38.17.17,0,0,0,0-.12s-.08,0-.12,0-.22.12-.21.14-.12-.11-.14-.08a.37.37,0,0,0,0,.38.33.33,0,0,0,.23.23C74.77,43.41,74.86,43.33,74.92,43.19Zm-.76-1.43a.5.5,0,0,0,.21-.35.17.17,0,0,0,0-.12.13.13,0,0,0-.13,0c-.17,0-.25.09-.25.12s-.13-.11-.14-.1l-.06.08a.56.56,0,0,0-.13.24.19.19,0,0,0,.13.24A.48.48,0,0,0,74.16,41.76Zm-.2,2a.69.69,0,0,0,.22-.62,1.19,1.19,0,0,0-.24-.55,1.73,1.73,0,0,0-.41-.4A1.34,1.34,0,0,0,73,42a3.59,3.59,0,0,0-1,0l-.16,0-.11,0-.2.07-.17,0h-.11l-.13,0a.83.83,0,0,0-.29,0,3,3,0,0,0-.37,0,4.5,4.5,0,0,0-.69.2l-.36.18a2.37,2.37,0,0,0-.79.63,2,2,0,0,0-.49,1.33,2,2,0,0,0,.19.79,1,1,0,0,0,.72.56,1.8,1.8,0,0,0,.81-.09.68.68,0,0,0,.31.18,1.77,1.77,0,0,0,.91,0,3.42,3.42,0,0,0,.69-.28h0a.47.47,0,0,0,.24.08.76.76,0,0,0,.55-.18c.21-.21.36-.4.42-.45s0,0,0,0h0A0,0,0,0,0,73,45l-.06,0v0s.09,0,.12,0a.51.51,0,0,0,.16-.09.57.57,0,0,0,.23-.3C73.52,44.05,73.64,44,74,43.79Zm-7.28,1.85a.58.58,0,0,0-.25-.49C66.17,45,66,45,66,45s-.14-.09-.15-.06a1.86,1.86,0,0,0-.3.45.58.58,0,0,0,.07.61.73.73,0,0,0,1.11-.38ZM41.63,11c.57-.6,1.21-1.1,1.17-1.18s-.2,0-.45.15h0A2.51,2.51,0,0,0,41.19,9,4.34,4.34,0,0,0,38.59,9c-1.58.35-3.23.51-3.23.73a8.12,8.12,0,0,0,3.36.27,3.36,3.36,0,0,1,1.91.28,1.31,1.31,0,0,1,.4.32,1.43,1.43,0,0,1,.1.16s0,0,.13,0a9,9,0,0,0-.82.75c-.23.24-.37.42-.38.43l-.3.48a5.39,5.39,0,0,0-.5,1.1,3.59,3.59,0,0,0-.2,1.17c0,.33,0,.54.09.54s.16-.82.54-1.54a6.13,6.13,0,0,1,.58-.94l.32-.42s.12-.18.31-.42A9.63,9.63,0,0,1,41.63,11Z"/>
-                <path class="cls-9" d="M85.26,6.06v0l-.06,0h0v0Z"/>
-                <path class="cls-3"
-                      d="M85.71,27.38c-.28.29-.62.65-1,1.06s-.49.56-.76.85l-.4.46-.66.76-.28-.09c.29-1,.59-2.12.81-2.93C83.53,27.52,85,27.45,85.71,27.38Z"/>
-                <path class="cls-9" d="M84.79,18.53l-.05,0a.79.79,0,0,1,0-.14S84.78,18.47,84.79,18.53Z"/>
-                <path class="cls-3"
-                      d="M84.25,31.42l-.15,0h0l-.28.08-1.11.31-.51.14c.13-.37.29-.94.47-1.56l.28.09,1.2.78Z"/>
-                <path class="cls-8" d="M84.25,24.29c0,.39,0,.62,0,.61s0-.06,0-.19l.06-.25A.85.85,0,0,1,84.25,24.29Z"/>
-                <path class="cls-7"
-                      d="M84,24c0,.31.08.54.11.7a14.12,14.12,0,0,0-.43,1.68v0h0a.3.3,0,0,1,0,.11.39.39,0,0,1,0,.13s0,.06,0,.1,0,.18-.08.28a1.21,1.21,0,0,1,0,.18,1.8,1.8,0,0,1,0,.19s0,0,0,0a.42.42,0,0,0,0,.06,0,0,0,0,1,0,0c-.16.57-.37,1.26-.6,1.85l-1.35-.11a7.18,7.18,0,0,0,.15-2.11,4.53,4.53,0,0,0-.64-2,11.8,11.8,0,0,0-1.13-1.66,4.19,4.19,0,0,0-1.46-1.21,5,5,0,0,0-4.1,0l-.32.2,0-.09a4.39,4.39,0,0,1,.69-1.51,5.45,5.45,0,0,1,1.25-1.29,3.61,3.61,0,0,1,1.61-.73,6.21,6.21,0,0,1,3.58.71,6.62,6.62,0,0,1,1.33,1.08,4.69,4.69,0,0,1,1,1.17A10.2,10.2,0,0,1,83.91,23C84,23.38,84,23.72,84,24Z"/>
-                <path class="cls-8" d="M83.43,27.47v0h0A0,0,0,0,0,83.43,27.47Z"/>
-                <path class="cls-7"
-                      d="M81.47,29.23l1.35.11c-.06.17-.13.34-.19.49-.53,1.21-.65,2.28-1,2.71s-.56.71-.56.71c-.44.36-1.08.88-1.86,1.48s-1.71,1.31-2.71,2c-.5.36-1,.74-1.55,1.09l-.41.26-.14.07-.15,0c-.05,0-.11,0-.12-.07L74.06,38l-.1-.22a13.5,13.5,0,0,1-1-3.66,14.36,14.36,0,0,1-.13-1.69.54.54,0,0,0,.17.07,3.86,3.86,0,0,0,1.09,0,15.52,15.52,0,0,0,2.54-.42A14,14,0,0,0,80,30.75a6.71,6.71,0,0,0,.84-.59,4.54,4.54,0,0,0,.38-.38,1.25,1.25,0,0,0,.09-.12l.09-.16C81.42,29.41,81.45,29.31,81.47,29.23Z"/>
-                <path class="cls-8" d="M82,32l.16-.05c0,.06-.05.12-.07.17Z"/>
-                <path class="cls-10"
-                      d="M81.16,27.14A7,7,0,0,1,81,29.09a.65.65,0,0,1-.07.21s0,0,0,.06l-.07.08a2.46,2.46,0,0,1-.33.31,5.84,5.84,0,0,1-.77.53,11.78,11.78,0,0,1-2.26,1,5.92,5.92,0,0,0,1.7-4.14c.09-2.17-1.34-4.54-2.93-5h.5a4.3,4.3,0,0,1,1.53.45,3.85,3.85,0,0,1,1.31,1.15A6.79,6.79,0,0,1,81.16,27.14Z"/>
-                <path class="cls-11"
-                      d="M76.22,22.06c1.59.5,3,2.87,2.93,5a5.92,5.92,0,0,1-1.7,4.14c-.33.11-.64.2-.94.27a15.51,15.51,0,0,1-2.44.38H74a2.34,2.34,0,0,1-1-1.47h0c.1-1.82.25-3,.26-3.11s.1-1.45.46-3.41c.06-.36.15-.73.24-1.11a.36.36,0,0,1,.11-.1h0a5.88,5.88,0,0,1,2.18-.61Z"/>
-                <path class="cls-10" d="M73.89,22.72l.1,0a.36.36,0,0,0-.11.1S73.89,22.74,73.89,22.72Z"/>
-                <path class="cls-10"
-                      d="M74,31.89a3.21,3.21,0,0,1-.81-.06.4.4,0,0,0-.29.05c0-.39,0-.77,0-1.13a3.25,3.25,0,0,1,0-.33A2.34,2.34,0,0,0,74,31.89Z"/>
-                <path class="cls-3"
-                      d="M73.8,60.42c0,.16-.12.29-.26.41a2.23,2.23,0,0,1-.42.3.86.86,0,0,1-.34.09,4.88,4.88,0,0,0,.08-.61,6.06,6.06,0,0,0,.06-1c0-.18,0-.34,0-.48h0a.21.21,0,0,0,0,.13.61.61,0,0,1,.36.23A2,2,0,0,1,73.8,60.42Z"/>
-                <path class="cls-12"
-                      d="M73.59,42.9c.18.22.26.47.11.6l-.18.15a1.62,1.62,0,0,0-.18.19.34.34,0,0,0-.07.11.42.42,0,0,0,0,.1.19.19,0,0,0,0,.08v0a.38.38,0,0,1-.07.21l-.08.08s-.09.06-.09,0,.12-.22,0-.31a.55.55,0,0,0-.38.14c-.07.06-.1.09-.09.1s0,0,.13,0l.14,0,.08,0h0s0,0,0,0c0,.2,0,.17,0,.22a.36.36,0,0,1,0,.11.83.83,0,0,0-.06.21s0,0,0,0v0c-.05,0-.09,0-.14,0s-.27.2-.39.27a.58.58,0,0,1-.44.13.16.16,0,0,0,0-.14c0-.09-.09-.09-.09-.08a.3.3,0,0,1,0,.09s-.08.09-.18.13a3.33,3.33,0,0,1-.78.22,1.59,1.59,0,0,1-.76,0l-.07,0,.33-.2a2,2,0,0,0,.28-.23l.12-.12a2,2,0,0,0,.13-.18.42.42,0,0,0,.08-.38.4.4,0,0,0-.29-.21,1.32,1.32,0,0,0-.57,0,.56.56,0,0,0-.38.21.54.54,0,0,0-.08.25s0,.07,0,.08,0,0,.08-.06a.84.84,0,0,1,.12-.19.4.4,0,0,1,.29-.1,1.29,1.29,0,0,1,.41,0s.1,0,.11.1a.2.2,0,0,1-.06.15l-.07.06-.11.1a2.2,2.2,0,0,1-.25.17,1.69,1.69,0,0,1-1.19.29.46.46,0,0,1-.35-.31,1.46,1.46,0,0,1-.1-.57,1.5,1.5,0,0,1,.4-.95,2.5,2.5,0,0,1,.94-.59,3.85,3.85,0,0,1,.58-.19,1.17,1.17,0,0,1,.27-.05h.06l.25.05a1.53,1.53,0,0,0,.29,0l.23-.08.21-.07.11,0H72a3.17,3.17,0,0,1,.87,0,1.06,1.06,0,0,1,.38.12A1.4,1.4,0,0,1,73.59,42.9Z"/>
-                <path class="cls-3"
-                      d="M73,54a2,2,0,0,1,0,.4c0,.31-.19.81-.25,1.28,0,.21-.06.42-.08.62-.15-.86-.4-1.9-.66-2.93l-.16-.6.11,0a1.84,1.84,0,0,1,.94.61.91.91,0,0,1,.11.44A.79.79,0,0,1,73,54Z"/>
-                <path class="cls-3"
-                      d="M72.25,57c.29.78.46,1.29.55,1.28-.07,0,0,.85-.2,2.3a15.37,15.37,0,0,1-2.22,5.6A28.34,28.34,0,0,1,68,69.45a5.89,5.89,0,0,1-3.79,1.9,16.42,16.42,0,0,1-2.35.22,15.88,15.88,0,0,1-2.4-.12,10.2,10.2,0,0,1-4.36-2L54.47,69h0a1.6,1.6,0,0,0,.26-1.3.18.18,0,0,0-.19-.11h-.83l-.21,0,.06.2s0,.12-.21.24l-.14-.13a6.9,6.9,0,0,1-1.1-1.62l-.18-.35q-.15-.32-.27-.63a.24.24,0,0,0,.14,0,.37.37,0,0,0,.27-.31.48.48,0,0,0-.17-.41.36.36,0,0,0-.18-.11,1.48,1.48,0,0,1-.42-.19s0,0-.05,0a23,23,0,0,1-.76-2.84c-.16-.74-.28-1.48-.38-2.2l.12,0c.26-.08.66-.2,1.22-.39a10.72,10.72,0,0,0,2.1-1c.41-.26.83-.56,1.28-.91l.74-.6c.31-.25.48-.46.79-.72a6.55,6.55,0,0,1,.56-.6l0,0A7.67,7.67,0,0,1,56,55c-.4,0-.82.08-1.16.09l-.82,0a9.68,9.68,0,0,1-1.4-.1,5.38,5.38,0,0,1-1.85-.65,3.29,3.29,0,0,1-.67-.53c0-.29.08-.58.13-.86a15.28,15.28,0,0,1,.42-1.65,4.78,4.78,0,0,0,.81.2,6.94,6.94,0,0,0,2-.08l.62-.09.81-.14.89-.16.48-.09c.12,0,0,0,0-.06s-.14,0-.15,0-.17-.1-.17-.11l-.17-.07,1.7-.25h0a15.19,15.19,0,0,0,1.8-1.48c.45-.37.91-.73,1.27-1l.45-.3a16.2,16.2,0,0,0,3.42,1,9.28,9.28,0,0,0,2,0v0a1,1,0,0,0,.19.14,3.7,3.7,0,0,0,.44.28,1.84,1.84,0,0,0,.47.15,2.79,2.79,0,0,0,1.18,0,6.28,6.28,0,0,0,.66-.23s.07.17.12.33a.27.27,0,0,1,.08.19h0v0a1.16,1.16,0,0,1-.18.51,1.92,1.92,0,0,1-.18.29,2.28,2.28,0,0,1-1.25.69l-.51.09-.61.1a4.7,4.7,0,0,0-.71.14l-.16,0-.09,0s0,.06,0,.08a1.84,1.84,0,0,0,.15.35,2.3,2.3,0,0,0,.52.6,3.18,3.18,0,0,0,.58.35,3.49,3.49,0,0,0,1.12.31A6.5,6.5,0,0,0,69.86,53c.37-.07.64-.13.85-.19h0l.31.84c.07.18.13.35.19.52l-.08.1a2.71,2.71,0,0,1-1,.68,3.82,3.82,0,0,1-1.73.24l-1-.09c-.26,0-.59-.08-1-.17s-.83-.23-1.29-.36l.11.14,0,0v0l0,0,.35.32a9.75,9.75,0,0,0,.74.64l.43.32.29.18a5.33,5.33,0,0,0,.56.32,5.15,5.15,0,0,0,2.26.61A5.47,5.47,0,0,0,72.25,57Zm-1.92,3.55a3.52,3.52,0,0,0,.29-.4,3.56,3.56,0,0,0-.45-.13l-.27,0c-.16,0-.32,0-.3.05a2.64,2.64,0,0,0,.26.11l.24.1c.06,0,0,0,.05,0s0,0-.06,0l-.11.12a.56.56,0,0,1-.24.17c-.09,0-.15,0-.16-.1s0-.16,0-.17-.07,0-.1.16a.27.27,0,0,0,0,.23.39.39,0,0,0,.26.11A1,1,0,0,0,70.33,60.54Zm-.14,3s.18-.11,0-.29a1.78,1.78,0,0,0-.74-.06l-.33,0a1.15,1.15,0,0,0-.31,0,3.87,3.87,0,0,0-1,.41,1.55,1.55,0,0,1-.32.14c-.07,0-.12,0-.12,0s-.09,0-.1.12a.63.63,0,0,0,.18.34.9.9,0,0,0,.45.32.84.84,0,0,0,.6-.22,4.68,4.68,0,0,1,.91-.55l.11,0,.18-.06.3-.09A.88.88,0,0,0,70.19,63.49Zm-1.1,3.9c0-.21-.16-.29-.3-.25a1,1,0,0,0-.2,0,3.56,3.56,0,0,0-.62.34c-.28.19-.53.42-.5.45s.31-.12.62-.25a4,4,0,0,1,.41-.17l.19-.06s.07,0,.07,0,0,0,0,0,0,.14,0,.22-.05.18-.07.25-.16.14-.18.17,0,0,.09,0,.16-.05.22-.12a1.74,1.74,0,0,0,.14-.27A2.09,2.09,0,0,0,69.09,67.39Zm-4.54-3.93a.18.18,0,0,0-.06-.23c-.14-.06-.13,0-.15,0H64a3.24,3.24,0,0,0-.67,0,.81.81,0,0,0-.52.46c-.07.17-.08.29-.06.3a2.44,2.44,0,0,0,.94-.07,1.63,1.63,0,0,0,.62-.28l.07,0a.11.11,0,0,0,.06,0S64.51,63.53,64.55,63.46Zm-.92,3.12c0-.13-.12-.24-.23-.28a2.15,2.15,0,0,0-.52-.13l-.36,0a1,1,0,0,0-.78.31,1.22,1.22,0,0,0-.36,1,2.13,2.13,0,0,1,.52-.88.73.73,0,0,1,.59-.17l.35,0a2.92,2.92,0,0,1,.45.08l0,0v0a.5.5,0,0,1-.07.08c-.1.11-.24.24-.33.32-.34.14-.68.19-.68.22a1.18,1.18,0,0,0,.77,0,3.25,3.25,0,0,0,.42-.31l.09-.1A.5.5,0,0,0,63.63,66.58ZM60.11,69.3a.26.26,0,0,0,.07-.24.4.4,0,0,0-.22-.2c-.31-.14-.6,0-.57,0s.07,0,.16,0a.86.86,0,0,1,.28.11s0,.06,0,.06,0,0,0,0a1.49,1.49,0,0,1-.46.07.49.49,0,0,1-.19,0c-.06,0,.05,0,.05.07a.23.23,0,0,1,0,.07s0,0,0,0,0,0,0,0,0,0,0,0l.1,0a1.16,1.16,0,0,0,.4,0l.19,0A.58.58,0,0,0,60.11,69.3ZM57.7,62.89a.24.24,0,0,0,0-.17.2.2,0,0,0-.07-.15.37.37,0,0,0-.16-.1.81.81,0,0,0-.31-.06,2.63,2.63,0,0,0-.77.06c-.26,0-.52.06-.73.08l-.15,0-.06,0s0,.07,0,.08.09.06.09.06,0,0,0-.07h.18a3.66,3.66,0,0,0,.75,0,3.23,3.23,0,0,1,.71,0l.19,0h0s0,0,0,0-.35.38-.54.42a.67.67,0,0,1-.33-.05l-.34-.1A1.21,1.21,0,0,0,55.8,63s.1.09.29.18l.31.15a.91.91,0,0,0,.43.11.83.83,0,0,0,.42-.2l.27-.21A.59.59,0,0,0,57.7,62.89Z"/>
-                <path class="cls-7"
-                      d="M73,2.19l-.42.4a4.62,4.62,0,0,0-.72,1,13.45,13.45,0,0,0-.62,1.26c-.13.34-.28.75-.43,1.18a2.55,2.55,0,0,0-.08.26s0,.07,0,0V6.22l0-.16,0-.32q0-.3-.06-.57a3,3,0,0,0-.1-.5,5.46,5.46,0,0,0-.21-.61,12.39,12.39,0,0,0-.83-1.76c.3,0,.61-.11.92-.15A8.43,8.43,0,0,1,71.8,2a1.48,1.48,0,0,1,.31,0l.41.05A3.64,3.64,0,0,0,73,2.19Z"/>
-                <path class="cls-7"
-                      d="M72.2,56.83a.66.66,0,0,0,0,.15,4.86,4.86,0,0,0-.63,0A10.19,10.19,0,0,1,70,56.92a5.15,5.15,0,0,1-2.09-.67c-.17-.11-.35-.21-.52-.33l-.24-.17-.08-.07a.77.77,0,0,1-.13-.12l0-.05.08,0,.16,0,.19,0a10.19,10.19,0,0,0,1.08.12,4.36,4.36,0,0,0,2-.22,3.23,3.23,0,0,0,1.07-.67Z"/>
-                <path class="cls-8" d="M71.77,45.45s0,0,0,0A.08.08,0,0,1,71.77,45.45Z"/>
-                <g id="_Group_" data-name="&lt;Group&gt;">
-                    <path class="cls-3"
-                          d="M70.82,83.14a1.05,1.05,0,0,0-.31-.28,1.38,1.38,0,0,0-.6-.08c-.16,0-.25,0-.25,0s.09.06.24.09a1.66,1.66,0,0,1,.49.16.82.82,0,0,1,.25.35l-.09.11a1,1,0,0,1-.36.3,2.26,2.26,0,0,1-1.07.11l-2.42,0-1.49-.82L65,82.21h.07l.32-.06h.12c.2,0,.48,0,.84,0a5.7,5.7,0,0,0,1.35,0,9.26,9.26,0,0,0,1.63-.62,7.83,7.83,0,0,1,.86-.38.72.72,0,0,1,.73.28,1.18,1.18,0,0,1,.32.66.89.89,0,0,0-.4-.16,1.53,1.53,0,0,0-.57.08.3.3,0,0,0-.17.09s0,0,0,0,0,0,.08,0a.38.38,0,0,1,.16,0,2.13,2.13,0,0,1,.5,0,.72.72,0,0,1,.43.35l-.09.15-.29.49A.35.35,0,0,0,70.82,83.14Z"/>
-                </g>
-                <path class="cls-7"
-                      d="M69.89,50.61l.47,1.26a4.92,4.92,0,0,1-.67.41,3.93,3.93,0,0,1-1.47.4,2.64,2.64,0,0,1-1.53-.43,1.41,1.41,0,0,1-.36-.37.57.57,0,0,1-.12-.23s0,0,.07,0l.12,0,.48,0,1.08-.1a2.94,2.94,0,0,0,1.93-.82Z"/>
-                <path class="cls-9" d="M69.72,47.3h0v0Z"/>
-                <path class="cls-3"
-                      d="M69.72,48.06v.08c0,.1-.13.22-.13.22l-.26.18a1.66,1.66,0,0,1-.79.36,1.32,1.32,0,0,1-1-.09.9.9,0,0,1-.27-.2.34.34,0,0,1,0-.15h0c.25-.08.49-.17.69-.25a8.55,8.55,0,0,0,1.35-.5c0,.06.07.12.1.13l.06,0,0,0h0A.76.76,0,0,1,69.72,48.06Z"/>
-                <path class="cls-8" d="M69.26,47.67a1.24,1.24,0,0,0,.2-.1s-.07.06-.19.13v0Z"/>
-                <path class="cls-3"
-                      d="M69.39,63.42h0l0,0h0l-.09,0a4.78,4.78,0,0,0-.92.64c-.16.12-.31.24-.45.23a.8.8,0,0,1-.38-.23.78.78,0,0,1-.2-.26.15.15,0,0,1,0-.11s0,0,.13,0a1.25,1.25,0,0,0,.36-.09,5.22,5.22,0,0,1,1-.31h.53Z"/>
-                <path class="cls-7"
-                      d="M69,31.47a13.85,13.85,0,0,1,0,3.23,13.51,13.51,0,0,1-1.65,4.65c-.3.52-.57.92-.76,1.2a3,3,0,0,0-.29.42s-.13.05-.38.1a5.22,5.22,0,0,1-1.12.1A6.93,6.93,0,0,1,63,41a15.08,15.08,0,0,1-2.18-.67c-1.57-.59-3.37-1.41-5.29-2.33-.48-.22-1-.45-1.45-.7l-.7-.38c-.23-.14-.47-.28-.69-.43a24.1,24.1,0,0,1-2.66-2,48.11,48.11,0,0,1-4.69-4.67l-.52-.6L44.58,29l0,0s0,0,0-.05v0l.11-.14c.14-.21.29-.41.43-.61A25.21,25.21,0,0,1,46.86,26a24.3,24.3,0,0,1,3-2.81c.79-.61,1.31-.89,1.36-.94s.44-.27,1.14-.58a16.12,16.12,0,0,1,3.07-1,29.13,29.13,0,0,1,4.62-.59,8.32,8.32,0,0,1,4.87,1.68l0,0a7.92,7.92,0,0,1,2.42,2.63,11,11,0,0,1,1.17,3.44A34.74,34.74,0,0,1,69,31.47Zm-1.4,1.13a3.9,3.9,0,0,0,.18-2,16.49,16.49,0,0,0-.59-2.52A10.8,10.8,0,0,0,66,25.61a5.56,5.56,0,0,0-1.16-1.29,11.65,11.65,0,0,0-1.62-.88,7.72,7.72,0,0,0-1.87-.59,4.76,4.76,0,0,0-2.12.1,6.51,6.51,0,0,0-1.94,1,12.46,12.46,0,0,0-4.25,4.91,10,10,0,0,0-.38,1c-.05.18-.09.36-.13.54s0,.18,0,.29,0,.29,0,.43l.33.27.21.16c.14.1.28.22.43.32l.86.58h0a9.39,9.39,0,0,0,2.61,1.13,23,23,0,0,0,2.54.58,12.77,12.77,0,0,0,4.43.18,7.53,7.53,0,0,0,2.83-1A2.43,2.43,0,0,0,67.56,32.6Z"/>
-                <path class="cls-3"
-                      d="M68.29,70.07c-.17.32-.34.62-.48.87s-.36.64-.37.65-.14.29-.32.69-.45.9-.74,1.38a10.11,10.11,0,0,0-1.16,2c0,.07.15,0,.33-.16a1.48,1.48,0,0,1,0,.27,25.11,25.11,0,0,0-.33,2.81c-.06,1.31-.06,2.23-.08,2.83,0,.32,0,.54,0,.69a.13.13,0,0,1,0,.06v0H65L64.36,79c0-.17-.07-.33-.11-.5l0-.25-.08-.29c0-.29-.06-.57-.08-.84-.05-.62-.1-1.2-.14-1.73-.09-1.07-.15-1.95-.2-2.56,0-.25,0-.46,0-.61l.66-.11a9.59,9.59,0,0,0,2.31-.74A5.08,5.08,0,0,0,68.29,70.07Z"/>
-                <path class="cls-10"
-                      d="M67.54,31.84s0,.75,0,.76a9.45,9.45,0,0,1-.92.58c-.18.1-.39.2-.62.3a5.74,5.74,0,0,0,1-3.41A13.61,13.61,0,0,1,67.54,31.84Z"/>
-                <path class="cls-11"
-                      d="M67.06,30.07a5.74,5.74,0,0,1-1,3.41c-.23.09-.48.18-.76.26l.14-.11a10.05,10.05,0,0,1-2.5.35H62a5.25,5.25,0,0,1-1.9-4.7c.14-2.6,1.6-4.63,3.4-4.74a6.68,6.68,0,0,1,.78.47,4.12,4.12,0,0,1,.85,1l.12.15.24.45.08.15A21.9,21.9,0,0,1,67.06,30.07Z"/>
-                <path class="cls-3"
-                      d="M66.43,48.23h-.06a9.52,9.52,0,0,1-1.93-.13,15.12,15.12,0,0,1-2.81-.9l1.3-.85a15.58,15.58,0,0,0,1.3,1.21,3.65,3.65,0,0,0,1,.49,4,4,0,0,0,1.07.17Z"/>
-                <path class="cls-3"
-                      d="M64.74,41.44l1.6.64a.3.3,0,0,0-.22.11.83.83,0,0,0-.18.34s.07,0,.15.07l-.16.15s0,0,0,0l0,0-.46.79A15.13,15.13,0,0,0,63.2,44l-.09-.75s0,0,0,0a4.16,4.16,0,0,0-1.24-.48l-.62-.16.38-1.42a9.31,9.31,0,0,0,1.26.28A7.51,7.51,0,0,0,64.74,41.44Z"/>
-                <path class="cls-3"
-                      d="M65.33,97.41a3.55,3.55,0,0,1,.13,1.79,5,5,0,0,1-.17.92A6.78,6.78,0,0,1,65,101c-.25.54-.53,1-.77,1.47s-.44.8-.59,1-.1.21-.14.28l-1.4.14c-.6,0-1.21.1-1.81.13l-.32,0h-.3l-.19,0-.9-.14c-1.61-.25-3.22-.45-4.78-.74,0,0,0,0,0,0,.14-.2.37-.47.64-.8a8.93,8.93,0,0,0,1.69-2.72,5.16,5.16,0,0,0,.08-3.17,1.82,1.82,0,0,0-.56-.8l1,.17a18.79,18.79,0,0,0,6.09-.11c.31,0,.63-.11,1-.19a2.52,2.52,0,0,1,.75.57A4.16,4.16,0,0,1,65.33,97.41Z"/>
-                <path class="cls-11"
-                      d="M65.4,33.63l-.14.11-.34.1h0a15.44,15.44,0,0,1-2,.14A10.05,10.05,0,0,0,65.4,33.63Z"/>
-                <path class="cls-11" d="M65.26,33.74l-.06,0-.28.05Z"/>
-                <path class="cls-9" d="M64.81,7.55v0l-.29,0v0Z"/>
-                <path class="cls-3"
-                      d="M64.39,63.38s0,0,0,0a.49.49,0,0,0,0,.11h0l-.28,0a.53.53,0,0,0,.14-.12l.13-.07s0,0,0,0A.21.21,0,0,0,64.39,63.38Z"/>
-                <path class="cls-11"
-                      d="M64.91,33.84a6.6,6.6,0,0,1-.84.16H64a.29.29,0,0,0-.24,0h-.05l-.5,0-.55,0a3.85,3.85,0,0,1-.48,0L62,34h.86A15.44,15.44,0,0,0,64.91,33.84Z"/>
-                <path class="cls-7" d="M64.21,2.78c.09.73.19,1.81.26,3.32A13.48,13.48,0,0,0,63,2.73Z"/>
-                <path class="cls-11" d="M64.07,34l-.14,0h-.16A.29.29,0,0,1,64,34Z"/>
-                <path class="cls-3"
-                      d="M64,63.47a1,1,0,0,1-.36.2c-.35.12-.73.21-.84.26.07-.09.25-.46.6-.5A3.94,3.94,0,0,1,64,63.47Z"/>
-                <path class="cls-3"
-                      d="M63.11,43.2l.09.75c-.25,0-.49.1-.74.16l-1,.27c-.47-.39-.81-.64-.86-.58a6.65,6.65,0,0,0,.58.66l-.8.25c-.58.19-1,.36-1,.37a8.64,8.64,0,0,0-1,.5l-.41.28c-1.2-.39-2.46-.76-3.71-1.11-.23-.07-.49-.13-.67-.2L53,44.27l-1.32-.59-.15-.07c.7-.19,1.36-.35,1.9-.47.78-.17,1.32-.22,1.35-.23s.56-.1,1.36-.19A20.23,20.23,0,0,1,59,42.65a23,23,0,0,1,2.86.31C62.52,43.08,63,43.2,63.11,43.2Z"/>
-                <path class="cls-10"
-                      d="M62.88,24.22l.66.32c-1.8.11-3.26,2.14-3.4,4.74A5.25,5.25,0,0,0,62,34l.15.1a15.7,15.7,0,0,1-2.66-.35,25,25,0,0,1-2.47-.64A9.23,9.23,0,0,1,54.65,32l0,0-.84-.59-.41-.32-.28-.22v-.09l0-.24c0-.16.08-.32.13-.48a6.91,6.91,0,0,1,.37-.95,10.46,10.46,0,0,1,2.48-3.28,8.38,8.38,0,0,1,3.31-2.09A4.94,4.94,0,0,1,62.88,24.22Z"/>
-                <path class="cls-9" d="M62.78,64s0,0,0,0S62.79,64,62.78,64Z"/>
-                <path class="cls-3"
-                      d="M61.86,72.35c.19,0,.38,0,.57,0l-.21,1.34c-.15,1.07-.36,2.5-.58,3.94l0,.26v.07h0s0,0,0,0l0,.09-.21.5c-.14.34-.26.66-.39,1l-.69,1.76c-.2.52-.37,1-.48,1.27,0,.08-.06.15-.08.22v0l0,.07s0,0,0,0l0,0c0,.09,0,.13,0,.14l-.51,1.63c-.33.27-.71.6-1.12.93l-1.39,1.19-.18.16-.09.07,0,0h0a2.8,2.8,0,0,1-.14-.25A.6.6,0,0,1,56,86.6a.36.36,0,0,1,0-.12.61.61,0,0,1,.19-.38,3.53,3.53,0,0,1,.28-.37c-.09-.21-.89.56-.79.71a.82.82,0,0,0,.21.57l.11.12L55.13,87l-.45-.07-.19,0a.76.76,0,0,1,0-.15.77.77,0,0,1,.08-.29c0-.08.06-.12.06-.13a2,2,0,0,1,.23-.4c.14-.19.35-.32.33-.36s-.28,0-.49.19a1.33,1.33,0,0,0-.26.28.84.84,0,0,0-.1.15,1,1,0,0,0-.08.53L54,86.34v-.21a2.45,2.45,0,0,1,0-.27,3.12,3.12,0,0,1,.1-.48,1.14,1.14,0,0,1,.45-.64,1,1,0,0,1,.7-.18c.08.16,2-.6,2-.62A12.54,12.54,0,0,0,59,82.79h0a9.25,9.25,0,0,0,.26-3,24.51,24.51,0,0,0-.13-3.16s-.1-.45-.29-1-.47-1.27-.76-2-.66-1.46-.93-2a9.7,9.7,0,0,0,2.18.62A14.62,14.62,0,0,0,61.86,72.35Z"/>
-                <path class="cls-3"
-                      d="M61.55,44.91l1,1.08-1.14.62-.53.3-1.12-.44-1.06-.37c.5-.26.87-.41.9-.42s.38-.18.93-.4Z"/>
-                <path class="cls-3"
-                      d="M60.21,47.39l-.09.07a13.14,13.14,0,0,0-1.21,1.12,8.94,8.94,0,0,0-1.49,1.81l-1.7.25a3.84,3.84,0,0,1-.8-.43,2.34,2.34,0,0,1-.38-.28c-.09-.07-.16-.16-.24-.23a3.46,3.46,0,0,1-.42-.57l.33-.19a20.84,20.84,0,0,0,2.69-1.65l1-.64c.58.17,1.14.34,1.69.52Z"/>
-                <path class="cls-9" d="M59.23,69.29s.08.12,0,0Z"/>
-                <path class="cls-7"
-                      d="M58.47,6.77c0,.08.11.28,0,.12s-.28-.28-.58-.53l-.15-.13L57.39,6l-.45-.34L56.06,5a13.29,13.29,0,0,0-1.62-1A20.13,20.13,0,0,0,52.38,3a14.93,14.93,0,0,1,3.11-.49c.41,0,.81,0,1.2,0,.19.34.39.77.61,1.28.31.7.73,1.82,1,2.46,0,0,.06.15.12.31Z"/>
-                <path class="cls-3"
-                      d="M57.2,46.47l-.57.44a17.91,17.91,0,0,0-2.42,2l-.33.19a3.84,3.84,0,0,1-.23-.45,11,11,0,0,1-.55-1.74c-.07-.3-.12-.54-.18-.75.18-.35.3-.6.37-.74h0c.27.09.49.14.74.2C55.11,45.92,56.17,46.18,57.2,46.47Z"/>
-                <path class="cls-8" d="M56.76,71.5l0,.07,0-.1A.09.09,0,0,0,56.76,71.5Z"/>
-                <path class="cls-7"
-                      d="M56.37,55.13l0,0-.55.45a17.59,17.59,0,0,1-2.47,1.68,7,7,0,0,1-2.05.64,9.74,9.74,0,0,1-1.23.12H50q-.06-.6-.09-1.17a14.88,14.88,0,0,1,0-2l.51.21a7.34,7.34,0,0,0,2.14.42,11.87,11.87,0,0,0,1.45,0l.82-.06.63-.07.55-.14Z"/>
-                <path class="cls-8" d="M56.29,1.68l0,.05s0,0,0,0Z"/>
-                <path class="cls-7"
-                      d="M56,96.53a5.24,5.24,0,0,1-.28,2.94A8.63,8.63,0,0,1,54,101.94a12,12,0,0,0-.9,1.1c-.53-.11-1.06-.23-1.57-.37a13.43,13.43,0,0,1-3.16-1.31c-.18-.09-.35-.19-.52-.29l.68-.25a10.08,10.08,0,0,0,2.88-1.66,3.85,3.85,0,0,0,1-1.49,4.18,4.18,0,0,0,.25-1.53,3.81,3.81,0,0,0-.22-1.39l.43.13,1.59.46.9.26A1.69,1.69,0,0,1,56,96.53Z"/>
-                <path class="cls-3"
-                      d="M55.61,70.91c0,.08-.08.18-.13.3a13.28,13.28,0,0,1-.83,1.59,24.19,24.19,0,0,1-1.51,2.14c-.6.78-1.23,1.57-1.94,2.33-.89,1-1.81,2-2.56,2.9a5.43,5.43,0,0,1-.79.09A7.9,7.9,0,0,1,45.54,80a3.24,3.24,0,0,1-1.08-.5,2.52,2.52,0,0,1-.68-.76,2.58,2.58,0,0,1-.34-1c.59-.73,1.17-1.41,1.72-2a3,3,0,0,0,.88.8,2.43,2.43,0,0,0,1.19.35c.36,0,.59-.17.54-.26s-.2-.1-.43-.24a3.75,3.75,0,0,1-.74-.58,2.57,2.57,0,0,1-.44-.75l-.09-.31.23-.24c.29-.31.57-.6.85-.86a3.46,3.46,0,0,0,.85.86c.89.61,1.9.71,1.94.55s-.79-.61-1.33-1.25a2.72,2.72,0,0,1-.53-.93l0-.1.72-.68.42-.4a1.7,1.7,0,0,0,.62.75,1.87,1.87,0,0,0,.39.23l.38.17a4.64,4.64,0,0,0,.69.23c.42.1.73.06.74,0s-.22-.2-.54-.43c-.16-.11-.34-.25-.52-.4l-.3-.23a3,3,0,0,1-.25-.24.75.75,0,0,1-.13-.82,2,2,0,0,1,.16-.3l0-.07h0a.05.05,0,0,1,0,0l.65-.61,0,0v0l0,.12a1.73,1.73,0,0,0,.29.31,4.06,4.06,0,0,0,.57.35c.43.22,1,.29,1,.1s-.19-.47-.4-.81l-.28-.46a.48.48,0,0,1,0-.13.66.66,0,0,1-.24-.45s0-.08,0-.12a2.77,2.77,0,0,0,.31-.53l.19.21a17.72,17.72,0,0,0,2,1.68C54.88,70.45,55.24,70.69,55.61,70.91Z"/>
-                <path class="cls-7"
-                      d="M55.33,50.73s.15,0,.05,0l-.29,0-.55.08-.51,0-.6,0a4.77,4.77,0,0,1-1.8-.19,3,3,0,0,1-.72-.4c.08-.22.17-.42.25-.62.41-.88.85-1.72,1.17-2.38l.08-.18s0,0,0,0c.22.44.46,1,.85,1.69a4.45,4.45,0,0,0,.81,1,3.11,3.11,0,0,0,.28.23l.21.16a3.66,3.66,0,0,0,.52.28l.09,0Z"/>
-                <path class="cls-3"
-                      d="M54.48,67.85a1.35,1.35,0,0,1-.2.91l0,0c-.23-.2-.46-.4-.67-.61a.71.71,0,0,0,.27-.33C54,67.86,54.31,67.86,54.48,67.85Z"/>
-                <path class="cls-8" d="M52.43,94.75h-.06s0-.06,0-.06S52.4,94.71,52.43,94.75Z"/>
-                <path class="cls-3"
-                      d="M52.37,94.74a9.38,9.38,0,0,1,0,1.39,3.65,3.65,0,0,1-1.34,2.67,9.58,9.58,0,0,1-2.79,1.45c-.41.15-.76.26-1,.33l-.16,0h0l-.22-.15-.35-.24c-.18-.13-.42-.3-.62-.47-.43-.33-.9-.78-1.34-1.17,0,.53,0,1,0,1.56l-.8-1.7-.4-.84-.56.74-.6.77-.08.1s0,.06,0,0v-.06l-.06-.3L41.62,97c-.06-.31-.13-.61-.2-.92l-.1-.47a3,3,0,0,0-.16-.56c-.08-.17-.27-.8-.48-1.5.22,0,.49.08.78.11a6.4,6.4,0,0,0,1.57,0,5.69,5.69,0,0,0,1.68-.54A3,3,0,0,0,46,92.25a3.87,3.87,0,0,0,.58-.93c.08-.24.16-.46.23-.66.14-.39.25-.72.32-1,.17.33.29.52.29.54s.22.33.53.77a18.44,18.44,0,0,0,1.22,1.54,7.72,7.72,0,0,0,1.46,1.31,2.27,2.27,0,0,0,.79.37l.19.23h0a1.22,1.22,0,0,0,.32.12Z"/>
-                <path class="cls-9" d="M51.65,65.2a0,0,0,0,0,0,0h0S51.64,65.21,51.65,65.2Z"/>
-                <path class="cls-9" d="M49.92,2.18h0Z"/>
-                <path class="cls-8" d="M49.82,59.63l0,0h0Z"/>
-                <path class="cls-8" d="M49.79,59.65v0l0,0h0Z"/>
-                <path class="cls-8" d="M49.78,59.66h0l-.12,0Z"/>
-                <path class="cls-3"
-                      d="M49.62,50.31a15.8,15.8,0,0,0-.54,1.93h0l-1,.65-.27.18c-.18.13-.42.25-.48.45a1,1,0,0,0,.06.68c.06.14.08.17.12.25l.12.2a8.57,8.57,0,0,0,.52.76l.29.39.16.19.07.08h0a.88.88,0,0,0,0,.16c0,.22,0,.46,0,.7,0,.63.1,1.27.19,1.91h0a.47.47,0,0,0-.12-.23,1.81,1.81,0,0,0-.24-.24h0a.09.09,0,0,0,0-.06.19.19,0,0,0,0-.09,1.13,1.13,0,0,0,0-.18c0-.12,0-.26,0-.41a4.3,4.3,0,0,0-.1-1,3.19,3.19,0,0,0-.53-1.12c-.51-.68-1.18-1.14-1.43-1.53a2.61,2.61,0,0,1-.27-.52,1.23,1.23,0,0,1-.06-.21s0,0,0-.06l.07-.08.11-.11.25-.24.6-.56c.45-.39.94-.8,1.42-1.18C49,50.76,49.35,50.51,49.62,50.31Z"/>
-                <path class="cls-8" d="M49.14,60l.14,0-.14.08h0Z"/>
-                <path class="cls-8" d="M49.14,60v0a.08.08,0,0,1,0,.07c0-.11,0-.21,0-.31a.45.45,0,0,0,0,.17h0Z"/>
-                <path class="cls-3"
-                      d="M49.09,59.8c0,.1,0,.2,0,.31v0c0,.12-.38.24-.71.24a7.76,7.76,0,0,1-1.08,0,4.52,4.52,0,0,1-1-.2,1.07,1.07,0,0,1-.64-.48.59.59,0,0,1,0-.35,4.29,4.29,0,0,1,.13-.44,8.29,8.29,0,0,1,.32-.82,1.08,1.08,0,0,1,.21-.29l.26-.25.18-.19c.06-.05.15-.13.22-.08s.08.27.15.39.11.27.07.34l-.1.11,0,0a1.08,1.08,0,0,0-.54.38.41.41,0,0,0,0,.34.62.62,0,0,0,.12.2,1,1,0,0,0,.13.14s.11,0,.15-.09.08-.15.06-.17l-.1-.08c0-.07-.1-.14-.07-.21s.2-.17.38-.26a1.52,1.52,0,0,1,.57-.18.85.85,0,0,1,.54.19c.16.12.32.23.44.33s.08.47.12.47a.35.35,0,0,0,.07-.14.35.35,0,0,0,0-.18h0q.06.47.15.93S49.08,59.79,49.09,59.8Z"/>
-                <path class="cls-8"
-                      d="M49,59.21l.07.58q-.09-.47-.15-.93c-.09-.64-.15-1.28-.19-1.91,0-.24,0-.48,0-.7.05.58.11,1.2.17,1.84Z"/>
-                <path class="cls-8" d="M48.49,58.26s0,0,0,0l-.07-.06h0v0l.05,0s0,0,0,0Z"/>
-                <path class="cls-8" d="M48.47,58.29h0v0s0,0,0,0l0,0v0h0Z"/>
-                <path class="cls-7"
-                      d="M47.86,80.44a5.51,5.51,0,0,0,.69-.14,9.44,9.44,0,0,0-1,1.5,7.28,7.28,0,0,0-.36.76c-.2,0-.52.13-.91.2a6.19,6.19,0,0,1-2.55,0,3.4,3.4,0,0,1-2.05-1.35,2.85,2.85,0,0,1-.37-.66q.21-.39.45-.75c.41-.63.86-1.22,1.3-1.79a3.21,3.21,0,0,0,.34.72,2.69,2.69,0,0,0,.83.86,3.52,3.52,0,0,0,1.23.51A7.09,7.09,0,0,0,47.86,80.44Z"/>
-                <path class="cls-7"
-                      d="M46.92,89.4l.1.19c-.11.24-.25.57-.43,1-.09.2-.17.42-.27.65a2.74,2.74,0,0,1-.39.64,3.62,3.62,0,0,1-1.36.93,5.93,5.93,0,0,1-1.6.46,5.82,5.82,0,0,1-1.46,0,8.75,8.75,0,0,1-1-.17c-.25-.82-.49-1.62-.57-1.81l-.13-.34h0a11.84,11.84,0,0,1-.41-2.9c0-.27,0-.55,0-.83a2.08,2.08,0,0,0,.41.35,4.1,4.1,0,0,0,2.8.74,14.86,14.86,0,0,0,2.79-.51,3.91,3.91,0,0,0,1-.4.28.28,0,0,0,0,.09A6.53,6.53,0,0,0,46.92,89.4Z"/>
-                <path class="cls-3"
-                      d="M46.77,84.35v.3a5.07,5.07,0,0,0-.37,2.64,1.56,1.56,0,0,0-.15.06c-.21.07-.51.15-.88.24a20.91,20.91,0,0,1-2.75.35,3.89,3.89,0,0,1-2.53-.76,3.19,3.19,0,0,1-.64-.65,5,5,0,0,1,.16-1,27.15,27.15,0,0,1,.87-3c.18-.43.37-.84.58-1.24a2.41,2.41,0,0,0,.28.43,3.68,3.68,0,0,0,2.33,1.42,6.18,6.18,0,0,0,2.67-.18,6.1,6.1,0,0,0,.81-.28A3.61,3.61,0,0,0,46.77,84.35Z"/>
-                <rect class="cls-9" x="46.74" y="72.88" width="0.01" height="0.01"/>
-                <path class="cls-9" d="M45.82,6.58h0c-.19.17-.37.36-.56.54C45.44,6.94,45.62,6.75,45.82,6.58Z"/>
-                <path class="cls-9" d="M41.07,80.26h0l-.13.28.13-.28Z"/>
-                <path class="cls-9" d="M40.93,80.57c0,.08-.06.16-.1.25h0Z"/>
-                <circle class="cls-3" cx="74.66" cy="26.13" r="0.81"/>
-                <circle class="cls-3" cx="62.2" cy="27.25" r="0.91"/>
-                <circle class="cls-3" cx="62.76" cy="28.68" r="0.18"/>
-                <circle class="cls-3" cx="73.86" cy="27.51" r="0.19"/>
-                <path class="cls-6"
-                      d="M70.82,83.14c-.06.09-.13.18-.18.27a.84.84,0,0,0-.26-.35,1.51,1.51,0,0,0-.48-.16c-.15,0-.25-.07-.25-.09s.1,0,.26,0a1.38,1.38,0,0,1,.6.08A1.05,1.05,0,0,1,70.82,83.14Z"/>
-                <g class="cls-13">
-                    <path class="cls-14"
-                          d="M62,78.53c-.61,0-1.23-.08-1.85-.1-.18,4.39-4.9,5.19-6,9C59.4,89.88,62.24,83.56,62,78.53Z"/>
-                </g>
-                <path class="cls-15" d="M64.57,78.76l-.2,0,.09.42C64.5,79,64.54,78.89,64.57,78.76Z"/>
-                <g class="cls-13">
-                    <path class="cls-14"
-                          d="M64.7,84.59c1.51.89,3.08.4,5.35-.19C67.22,83,65.16,82,64.46,79.16,63.88,81.24,63.73,83.12,64.7,84.59Z"/>
-                </g>
-                <path class="cls-16"
-                      d="M70.3,93.27A35.84,35.84,0,0,1,64,95.46a3,3,0,0,1,.66.44,5.22,5.22,0,0,1,.63.68A36.81,36.81,0,0,0,77.4,89.76C74.92,91,72.56,92.27,70.3,93.27Z"/>
-                <path class="cls-7"
-                      d="M81.74,95.5a17.57,17.57,0,0,1,5.85-2.33c-1.17,0-2.34-.59-1.76-1.76a17.83,17.83,0,0,1,4.27-3L89.83,88a5.17,5.17,0,0,0-.42-.51,4.33,4.33,0,0,0-1-.81A4.17,4.17,0,0,0,86,86.22a8.86,8.86,0,0,0-2.52.62c-.8.31-1.58.72-2.37,1.09s-1.53.76-2.29,1.13l-1.37.7a36.81,36.81,0,0,1-12.16,6.82,3.29,3.29,0,0,1,.43.68,3.85,3.85,0,0,1,.25,2,5.19,5.19,0,0,1-.46,1.93c-.24.58-.51,1.1-.73,1.55s-.37.7-.5,1l1.45-.19c.87-.13,1.73-.29,2.59-.47,4.9-2.2,9.71-4.79,14.64-6.35C81.74,96.67,81.15,96.09,81.74,95.5Z"/>
-                <path class="cls-17"
-                      d="M90.12,88.42a17.83,17.83,0,0,0-4.27,3c-.58,1.17.58,1.76,1.75,1.76a17.39,17.39,0,0,0-5.84,2.33c-.59.59,0,1.17,1.17,1.17C78,98.22,73.19,100.81,68.29,103l1-.21a18.09,18.09,0,0,0,3.4-1.13h0l3.17-1.25c1.09-.21,2-.36,3-.58a14.28,14.28,0,0,0,1.42-.4L81,99.2l.69-.28a15.82,15.82,0,0,0,4.84-3.18A12.22,12.22,0,0,0,89.58,91,10.61,10.61,0,0,0,90,89.71c.06-.22.08-.45.12-.68l0-.34a1,1,0,0,0,0-.21Z"/>
-                <path class="cls-17"
-                      d="M67.64,103.22l.62-.28c1.39-.63,2.81-1.3,4.17-1.94a88.63,88.63,0,0,1,10.1-4.29,1.23,1.23,0,0,1-1-.56.66.66,0,0,1,.22-.71,16.8,16.8,0,0,1,5.43-2.24,1.92,1.92,0,0,1-1.38-.72,1.13,1.13,0,0,1,0-1.11l0,0a18.14,18.14,0,0,1,4.29-3l.06,0,.09.15s0,.08,0,.11a1,1,0,0,0,0,.12l0,.34a2,2,0,0,0,0,.24,3.54,3.54,0,0,1-.08.45l-.1.37a6.74,6.74,0,0,1-.29,1,12.26,12.26,0,0,1-3.09,4.72A15.7,15.7,0,0,1,81.7,99l-.69.28-.7.24c-.33.12-.69.21-1,.3l-.39.1c-.69.16-1.36.28-2.07.4l-.95.18-.83.33-2.32.92h0a17.78,17.78,0,0,1-3.42,1.14l-.7.15ZM85.91,91.44a1,1,0,0,0,0,1,2,2,0,0,0,1.71.67h.6l-.58.15a17.44,17.44,0,0,0-5.82,2.32.52.52,0,0,0-.17.54c.13.3.63.5,1.3.5h.47l-.45.14a84.44,84.44,0,0,0-10.46,4.4c-1.17.55-2.37,1.12-3.57,1.67l.33-.07a17.86,17.86,0,0,0,3.38-1.13l0,0h0l2.31-.91.84-.33,1-.18c.7-.13,1.37-.25,2-.4l.39-.1c.34-.09.69-.18,1-.3l.7-.23.68-.28a15.79,15.79,0,0,0,4.82-3.16A12.17,12.17,0,0,0,89.51,91a6.89,6.89,0,0,0,.29-1c0-.13.06-.26.1-.38a3,3,0,0,0,.08-.43L90,89l.06-.34c0-.06,0-.09,0-.12a.08.08,0,0,0,0,0A18.18,18.18,0,0,0,85.91,91.44Z"/>
-                <path class="cls-18"
-                      d="M40.06,11.88s.15-.19.38-.43a9,9,0,0,1,.82-.75c-.08,0-.12,0-.13,0a1.43,1.43,0,0,0-.1-.16,1.31,1.31,0,0,0-.4-.32A3.36,3.36,0,0,0,38.72,10l-.47,0a7.66,7.66,0,0,1,1.18,3,6.75,6.75,0,0,1,.33-.66Z"/>
-                <path class="cls-3" d="M70.37,46.87a2.7,2.7,0,0,1-.53.46l.21,0,.14,0c.07-.19.14-.38.22-.57Z"/>
-                <path class="cls-3" d="M82.08,32.15a1.16,1.16,0,0,1-.06.15l.23.05Z"/>
-                <path class="cls-19"
-                      d="M71.44,47.34a3.37,3.37,0,0,0,1.28-.58,4.89,4.89,0,0,1,.52-.42v-.06a3,3,0,0,1-1,.07c-.43-.05-.7-.15-.7-.2s.3,0,.7,0a2.76,2.76,0,0,0,1.36-.44,7.27,7.27,0,0,0,1.09-1c.27-.31.41-.54.43-.55s.07-.1.18-.27c-.5.07-.93.16-.95.09s.54-.4,1.18-.58h0a3.1,3.1,0,0,0,.15-.46c-.23.06-.36.09-.37.06s.14-.14.41-.28a2.18,2.18,0,0,0,0-.51c0-.12,0-.25,0-.37-.65.16-1.15.31-1.17.23a4,4,0,0,1,1.12-.58c0-.29-.1-.55-.16-.77a1.23,1.23,0,0,0-.17-.42c-.07-.08-.14-.1-.14-.13s.08-.05.22,0a1.1,1.1,0,0,1,.33.45h0a12.63,12.63,0,0,1,1.39-.88,7.12,7.12,0,0,0,1.32-1,8.35,8.35,0,0,0,1.16-1.48c.71-1.09,1.26-2.25,1.78-3.18A5.54,5.54,0,0,1,82.22,33l.31-.27h0s0,0-.08-.11l-.21-.26L82,32.3l0,.09A15.16,15.16,0,0,1,79.46,35c-.75.66-1.64,1.4-2.62,2.17-.49.39-1,.78-1.53,1.17l-.42.29a2.76,2.76,0,0,1-.3.15,1.42,1.42,0,0,1-.32.07.6.6,0,0,1-.68-.32l-.15-.28-.12-.23A15.86,15.86,0,0,1,72,30.71c.05-2,.2-3.43.21-3.51a32.86,32.86,0,0,1,.55-3.49c.1-.49.23-1,.4-1.58C70.34,28.44,70.66,35.59,72.5,42A4,4,0,0,1,73,42a1.34,1.34,0,0,1,.56.22,1.73,1.73,0,0,1,.41.4,1.19,1.19,0,0,1,.24.55.69.69,0,0,1-.22.62c-.32.22-.44.26-.54.74a.57.57,0,0,1-.23.3.51.51,0,0,1-.16.09s-.09,0-.12,0v0L73,45A0,0,0,0,1,73,45h0s0,0,0,0-.21.24-.42.45a.76.76,0,0,1-.55.18.47.47,0,0,1-.24-.08h0a3.42,3.42,0,0,1-.69.28h0c0,.1-.18.13-.22.23.1-.12.06-.07.09,0a1.07,1.07,0,0,1-.1.24,2,2,0,0,1-.33.47c-.09.19-.46.4-.61.58A4.65,4.65,0,0,0,71.44,47.34Zm3-4.56s.08,0,.14.08.06-.07.21-.14.09,0,.12,0a.17.17,0,0,1,0,.12.77.77,0,0,1,0,.38c-.06.14-.15.22-.27.2a.33.33,0,0,1-.23-.23A.37.37,0,0,1,74.45,42.78Zm-.29-1a.48.48,0,0,1-.4.09.19.19,0,0,1-.13-.24.56.56,0,0,1,.13-.24l.06-.08s.08,0,.14.1.08-.07.25-.12a.13.13,0,0,1,.13,0,.17.17,0,0,1,0,.12A.5.5,0,0,1,74.16,41.76Z"/>
-                <path class="cls-3"
-                      d="M74,2.39l-.38.2a6.43,6.43,0,0,0-.73.48,3.69,3.69,0,0,0-.72.78,8.45,8.45,0,0,0-.67,1.2,15.41,15.41,0,0,0-.75,2l-.15.49s0,0,0,0l0-.13,0-.25-.06-.49c-.05-.32-.09-.64-.13-.94a5.8,5.8,0,0,0-.21-.89c-.07-.19-.16-.38-.24-.55a6.8,6.8,0,0,0-1-1.53l-.28-.29-.19,0c-1,1.2-2.84,1.58-3.51,2.75q0,1,0,2.28v0l-.29,0v0c0-.07,0-.24-.08-.43a8.67,8.67,0,0,0-2.17-4.3l-.17-.15-.57,0-.9-.08-.14,0a5.47,5.47,0,0,0-1.92,3.28q.13.44.27.9a1.11,1.11,0,0,0,0,.3,2.46,2.46,0,0,0,0,.26c0,.08.07.27,0,.11a2.52,2.52,0,0,0-.74-.52l-.25-.23c-.2-.17-.39-.32-.58-.46l-.45-.34c-.3-.22-.59-.41-.86-.6a10.61,10.61,0,0,0-1.59-.91,11.74,11.74,0,0,0-2.58-.83l-.54-.1-.51.22c-.52.23-1,.48-1.49.74A20.75,20.75,0,0,0,46.73,6l-.24.18a.9.9,0,0,0-.21.08,3.63,3.63,0,0,0-.46.34h0c-.19.17-.37.36-.56.54s-.11.12-.17.19a3.83,3.83,0,0,1-.28.29l-.22.23-1-.26c-.81-.2-2-.48-3.32-.72a13.41,13.41,0,0,0-2.07-.24c-.74,0-1.59.1-2.45.2s-1.75.24-2.64.4l-.66.13-.54.13h-.06c1.47,3.3,2.26,6.86,6,7.93a7.55,7.55,0,0,0-1.07,3.35c.74.92,1.17,1.5,1.08,1.59s-.47-.23-1.14-.8v.07a8.06,8.06,0,0,1,0,1.47v0c-.33,3-1.87,6.18,2.33,6.6-.58,1.17-2.33,1.76-2.33,2.92.58,1.17,2.33,1.17,4.09,1.17a15.68,15.68,0,0,1-3.51,2.93c2,.85,3.44,2.55,4.94,4.13l.59.38c.51.31,1.1.64,1.75,1,1.3.7,2.84,1.47,4.49,2.27l1.73.82h0c.88-.31,1.74-.56,2.44-.75a13.73,13.73,0,0,1,1.39-.29,11.45,11.45,0,0,1,1.4-.14,18.9,18.9,0,0,1,3,.06,19.94,19.94,0,0,1,2.27.37l.38-1.42c-.33-.08-.66-.18-1-.29-1.63-.53-3.47-1.3-5.42-2.14-.49-.22-1-.43-1.49-.67L53,37.65l-.74-.43a25.94,25.94,0,0,1-2.8-2,47.56,47.56,0,0,1-4.91-4.66L44,30l-.28-.33-.47-.54c0-.05-.11-.09-.08-.14l.1-.15.2-.29.32-.47.42-.61A24.7,24.7,0,0,1,46,25.19a25.2,25.2,0,0,1,3.12-3,16.69,16.69,0,0,1,1.49-1.06c.07,0,.51-.31,1.3-.65a17.8,17.8,0,0,1,3.33-1A27.83,27.83,0,0,1,60.05,19a9.26,9.26,0,0,1,5.51,2l0,0h0a8.88,8.88,0,0,1,2.61,3,11.8,11.8,0,0,1,1.16,3.75,31.65,31.65,0,0,1,.28,3.67,14.28,14.28,0,0,1-.16,3.36,12.55,12.55,0,0,1-2,4.7c-.7,1-1.25,1.52-1.3,1.47s-.48.39-1.49.47l1.6.64h0a.41.41,0,0,1,.24.1.85.85,0,0,1,.25.37.2.2,0,0,1-.08.24.37.37,0,0,1-.23.05l-.32,0-.29,0-.46.79c.07,0,.11,0,.11,0s-1.5.47-3,1l-.69.23,1.07.94,0,0a9.59,9.59,0,0,1,1.34-.61c.44-.12.74-.09.75,0s-.29.11-.66.29-.68.41-1.08.68c.44.38.87.76,1.21,1a2.87,2.87,0,0,0,.58.27l.26.08a4.51,4.51,0,0,0,.92.2,7.36,7.36,0,0,0,2-.12,3.92,3.92,0,0,0,1.83-.81,4.46,4.46,0,0,0,.49-.49l.12-.31a1.55,1.55,0,0,1-.71,0,.68.68,0,0,1-.31-.18,1.8,1.8,0,0,1-.81.09,1,1,0,0,1-.72-.56,2,2,0,0,1-.19-.79,2,2,0,0,1,.49-1.33,2.37,2.37,0,0,1,.79-.63l.36-.18a4.5,4.5,0,0,1,.69-.2,3,3,0,0,1,.37,0,.83.83,0,0,1,.29,0l.13,0h.11l.17,0,.2-.07.11,0,.16,0a5.15,5.15,0,0,1,.56,0c-1.84-6.36-2.16-13.51.65-19.82,0,0,0,0,0,0A5.41,5.41,0,0,1,73.61,21a7.63,7.63,0,0,0-1.81,4.35A7.63,7.63,0,0,1,73.61,21a5.47,5.47,0,0,1,.41-.65,6.4,6.4,0,0,1,1.47-1.42,5.29,5.29,0,0,1,1.25-.65,8.66,8.66,0,0,0,2.66-2.87C82.67,9.69,78.8,5.69,74,2.39ZM41.63,11a9.63,9.63,0,0,0-.73.85c-.19.24-.3.42-.31.42l-.32.42a6.13,6.13,0,0,0-.58.94,5,5,0,0,0-.23.55,4.8,4.8,0,0,1-2.15,3.57v0a4.8,4.8,0,0,0,2.15-3.57,8.84,8.84,0,0,1-.31,1s-.1-.21-.09-.54a3.59,3.59,0,0,1,.2-1.17c.05-.15.11-.3.17-.44a7.66,7.66,0,0,0-1.18-3,6.88,6.88,0,0,1-2.89-.29c0-.17,1-.32,2.28-.54a9.4,9.4,0,0,0-2.08-1.91,9.4,9.4,0,0,1,2.08,1.91l1-.19a4.34,4.34,0,0,1,2.6.08,2.51,2.51,0,0,1,1.15.93h0c.25-.12.43-.19.45-.15S42.2,10.4,41.63,11ZM66.25,46.1a.62.62,0,0,1-.68-.08.58.58,0,0,1-.07-.61,1.86,1.86,0,0,1,.3-.45s.09,0,.15.06.22-.05.48.13a.58.58,0,0,1,.25.49A.61.61,0,0,1,66.25,46.1Z"/>
-                <path class="cls-3"
-                      d="M68.35,2.52c-.37.07-.75.15-1.13.21a2.92,2.92,0,0,1-.44.06l-.45,0h-.76l-.58,0c-.06.59-.12,1.4-.15,2.46C65.51,4.1,67.39,3.72,68.35,2.52Z"/>
-                <path class="cls-3"
-                      d="M60.48,2.57c-.51,0-1.2-.09-2-.11l-1,0c.12.33.24.71.37,1.13.2.66.42,1.41.68,2.28A5.47,5.47,0,0,1,60.48,2.57Z"/>
-                <path class="cls-19"
-                      d="M37.31,34.71a15.68,15.68,0,0,0,3.51-2.93c-1.76,0-3.51,0-4.09-1.17,0-1.16,1.75-1.75,2.33-2.92-4.93-.49-2-4.73-2.31-8.14l-.41-.36a10,10,0,0,1,0,2.16,15.55,15.55,0,0,1-.63,2.93A11.13,11.13,0,0,1,35,26a5.62,5.62,0,0,1-.51.83c-.09.13-.19.27-.3.4l-.16.2-.15.16a.24.24,0,0,0,0,.36.15.15,0,0,0,.09.06L34,28l.45.17,1.38.52.38.15.19.07.09,0,0,0,0,0-.67.45-2,1.39-.42.28-.14.1-.2.15.32.07,1,.27,3.61,1-1.61.89-.76.44-.28.17-.08,0h0s-.06,0-.05.07l.12.07L37.87,36c1.45.9,2.36,1.5,2.44,1.54s.49.35,1.24.86l.7.49C40.75,37.26,39.31,35.56,37.31,34.71Z"/>
-                <path class="cls-19"
-                      d="M85.19,10.64a4.89,4.89,0,0,1,.22.59c.12.34.17.59.18.6a6.26,6.26,0,0,1,0,.64,6.33,6.33,0,0,1-.18,1.31,5.29,5.29,0,0,1-.56,1.76,9.48,9.48,0,0,1,.1-1.82,7.64,7.64,0,0,0,0-1.22,4.42,4.42,0,0,0-.1-.54s0-.24-.11-.57-.2-.76-.35-1.19c-.23-.71-.51-1.4-.56-1.64C83.55,8,83.09,7.51,82.68,7a.92.92,0,0,0-.07.13l-.5-.72h.11a4.11,4.11,0,0,1-.48-.93,4.11,4.11,0,0,0,.48.93l.33-.08a11.1,11.1,0,0,0,1.32-.49,5.33,5.33,0,0,1,1.27-.38h0l.28-.12c.25-.11.49-.13.5-.07a3.52,3.52,0,0,1,.09.85,4.77,4.77,0,0,1-.32,1.66,13.38,13.38,0,0,1-.94,1.93c0,.1.1.21.16.31s.19.42.27.62c1-.39.84-1.94,1.54-2.62,0-.48,0-.77,0-.8a11.5,11.5,0,0,0,0-1.16c-.05-.63-.18-1.59-.84-1.91a2.89,2.89,0,0,0-1.36-.23,15.37,15.37,0,0,0-1.63.14c-.54.07-1.08.11-1.58.16h-.48l-.46,0c.17.27.3.49.39.65s.22.4.19.43-.17-.08-.38-.27S80,4.6,79.66,4.2c-.3-.08-.72-.23-1.23-.42S77,3.21,76.17,2.92A16.23,16.23,0,0,0,74,2.38h0c4.83,3.3,8.7,7.3,5.43,13a8.66,8.66,0,0,1-2.66,2.87,3.43,3.43,0,0,1,.75-.17,6.82,6.82,0,0,1,3.92.93,7.31,7.31,0,0,1,1.39,1.22,5,5,0,0,1,1,1.34A7.16,7.16,0,0,1,84.2,23c0,.41,0,.75,0,1,0,.11,0,.21,0,.3.09-.43.16-.85.2-1.19s.07-.63.08-.64,0-.27.07-.65.08-.88.1-1.38c0-.76,0-1.53,0-1.84,0,0-.07.05-.09,0a7.62,7.62,0,0,1,.54-1.75,29.25,29.25,0,0,0,1-3.84,25.11,25.11,0,0,0,.48-3.95c0-.42,0-.78,0-1.07C86,8.7,86.19,10.25,85.19,10.64Z"/>
-                <path class="cls-18"
-                      d="M83.92,8.46c.07,0,.38.4.7,1,.06-.43.24-1.16.41-1.87a4.49,4.49,0,0,0,.09-1.42l0-.22A1.71,1.71,0,0,0,84,6.05a2.85,2.85,0,0,0-1.1.74,1.91,1.91,0,0,0-.17.22c.41.5.87,1,1.24,1.55A.16.16,0,0,1,83.92,8.46Z"/>
-                <path class="cls-9" d="M85.26,6.06v0l-.06,0h0v0Z"/>
-                <path class="cls-3"
-                      d="M85.71,27.38c-.28.29-.62.65-1,1.06s-.49.56-.76.85l-.4.46-.66.76-.28-.09c.29-1,.59-2.12.81-2.93C83.53,27.52,85,27.45,85.71,27.38Z"/>
-                <path class="cls-9" d="M84.79,18.53l-.05,0a.79.79,0,0,1,0-.14S84.78,18.47,84.79,18.53Z"/>
-                <path class="cls-3"
-                      d="M84.25,31.42l-.15,0h0l-.28.08-1.11.31-.51.14c.13-.37.29-.94.47-1.56l.28.09,1.2.78Z"/>
-                <path class="cls-8" d="M74,22.34l0,.09h0c.09-.3.19-.59.3-.88A4.89,4.89,0,0,0,74,22.34Z"/>
-                <path class="cls-20"
-                      d="M79.22,18.87a6.68,6.68,0,0,0-1.67-.06,3.61,3.61,0,0,0-1.61.73,5.45,5.45,0,0,0-1.25,1.29,4.81,4.81,0,0,0-.42.72c-.11.29-.21.58-.3.88l.32-.2A3.78,3.78,0,0,1,76,21.8,7.14,7.14,0,0,1,79.22,18.87Z"/>
-                <path class="cls-8"
-                      d="M84.15,24.71c0-.16-.07-.39-.11-.7s-.08-.63-.13-1a10.2,10.2,0,0,0-.47-1.21,4.69,4.69,0,0,0-1-1.17,6.62,6.62,0,0,0-1.33-1.08,5.54,5.54,0,0,0-1.91-.65A7.14,7.14,0,0,0,76,21.8a6.12,6.12,0,0,1,.74,0,4.52,4.52,0,0,1,1.65.42,4.19,4.19,0,0,1,1.46,1.21A11.8,11.8,0,0,1,81,25.1a4.53,4.53,0,0,1,.64,2,7.18,7.18,0,0,1-.15,2.11l1.35.11c.23-.59.44-1.28.6-1.85a0,0,0,0,0,0,0,.42.42,0,0,1,0-.06s0,0,0,0a1.8,1.8,0,0,0,0-.19,1.21,1.21,0,0,0,0-.18c0-.1,0-.2.08-.28s0-.07,0-.1a.39.39,0,0,0,0-.13.3.3,0,0,0,0-.11h0v0A14.12,14.12,0,0,1,84.15,24.71Z"/>
-                <path class="cls-20"
-                      d="M74.12,32.52a3.86,3.86,0,0,1-1.09,0,.54.54,0,0,1-.17-.07A14.36,14.36,0,0,0,73,34.1a13.5,13.5,0,0,0,1,3.66l.1.22.08.16c0,.07.07.08.12.07l.15,0,.14-.07.41-.26c.53-.35,1.05-.73,1.55-1.09l.52-.38a14.39,14.39,0,0,1-2.43-3.91Z"/>
-                <path class="cls-8"
-                      d="M81.47,29.23c0,.08,0,.18-.08.27l-.09.16a1.25,1.25,0,0,1-.09.12,4.54,4.54,0,0,1-.38.38,6.71,6.71,0,0,1-.84.59,14,14,0,0,1-3.33,1.35,13.35,13.35,0,0,1-2.06.37A14.39,14.39,0,0,0,77,36.38c.8-.59,1.54-1.15,2.19-1.65s1.42-1.12,1.86-1.48c0,0,.21-.28.56-.71s.46-1.5,1-2.71c.06-.15.13-.32.19-.49Z"/>
-                <path class="cls-10"
-                      d="M79.3,23.34a3.92,3.92,0,0,0-1-.83,4.3,4.3,0,0,0-1.53-.45h-.5c1.59.5,3,2.87,2.93,5a5.92,5.92,0,0,1-1.7,4.14,12.06,12.06,0,0,0,2.08-.86C80.62,28.42,80,25.69,79.3,23.34Z"/>
-                <path class="cls-3"
-                      d="M81.16,27.14a6.79,6.79,0,0,0-1.6-3.48,4,4,0,0,0-.26-.32c.73,2.35,1.32,5.08.23,7l.18-.1a5.84,5.84,0,0,0,.77-.53,2.46,2.46,0,0,0,.33-.31l.07-.08s0,0,0-.06a.65.65,0,0,0,.07-.21A7,7,0,0,0,81.16,27.14Z"/>
-                <path class="cls-10" d="M73.89,22.72l.1,0a.36.36,0,0,0-.11.1S73.89,22.74,73.89,22.72Z"/>
-                <path class="cls-3"
-                      d="M74,31.89a3.21,3.21,0,0,1-.81-.06.4.4,0,0,0-.29.05c0-.39,0-.77,0-1.13a3.25,3.25,0,0,1,0-.33A2.34,2.34,0,0,0,74,31.89Z"/>
-                <path class="cls-3"
-                      d="M73.71,60.12a2.19,2.19,0,0,0-.38-.63.61.61,0,0,0-.36-.23.21.21,0,0,1,0-.13h0c0,.14,0,.3,0,.48s0,.43,0,.67A1.75,1.75,0,0,0,73.71,60.12Z"/>
-                <path class="cls-19"
-                      d="M72.89,60.28c0,.11,0,.21,0,.33a4.88,4.88,0,0,1-.08.61.86.86,0,0,0,.34-.09,2.23,2.23,0,0,0,.42-.3c.14-.12.28-.25.26-.41a1.71,1.71,0,0,0-.09-.3A1.75,1.75,0,0,1,72.89,60.28Z"/>
-                <path class="cls-21"
-                      d="M70.08,44.3a.28.28,0,0,1,.13,0,1.32,1.32,0,0,1,.57,0,.4.4,0,0,1,.29.21.42.42,0,0,1-.08.38,2,2,0,0,1-.13.18l-.12.12a2,2,0,0,1-.28.23l-.33.2.07,0a1.59,1.59,0,0,0,.76,0,3.33,3.33,0,0,0,.78-.22c.1,0,.17-.09.18-.13a.3.3,0,0,0,0-.09s.06,0,.09.08a.16.16,0,0,1,0,.14.58.58,0,0,0,.44-.13c.12-.07.27-.2.39-.27s.09-.06.14,0v0s0,0,0,0a.83.83,0,0,1,.06-.21.36.36,0,0,0,0-.11s0,0,0-.22c0,0,0,0,0,0h0l-.08,0-.14,0c-.08,0-.13,0-.13,0s0,0,.09-.1a.55.55,0,0,1,.38-.14c.1.09,0,.21,0,.31s.06,0,.09,0l.08-.08c-.15-.25,0-1.07-.46-.91a1.35,1.35,0,0,1-.53,0C71.49,43.38,70.27,43.13,70.08,44.3Z"/>
-                <path class="cls-12"
-                      d="M73.59,42.9a1.4,1.4,0,0,0-.32-.28,1.06,1.06,0,0,0-.38-.12,3.17,3.17,0,0,0-.87,0H72l-.11,0-.21.07-.23.08a1.53,1.53,0,0,1-.29,0l-.25-.05h-.06a1.17,1.17,0,0,0-.27.05,3.85,3.85,0,0,0-.58.19,2.5,2.5,0,0,0-.94.59,1.5,1.5,0,0,0-.4.95,1.46,1.46,0,0,0,.1.57.46.46,0,0,0,.35.31,1.69,1.69,0,0,0,1.19-.29,2.2,2.2,0,0,0,.25-.17l.11-.1.07-.06a.2.2,0,0,0,.06-.15c0-.06-.07-.08-.11-.1a1.29,1.29,0,0,0-.41,0,.47.47,0,0,0-.17,0,.81.81,0,0,0,0,.16.81.81,0,0,1,0-.16.35.35,0,0,0-.12.07.84.84,0,0,0-.12.19s-.07.07-.08.06,0,0,0-.08a.54.54,0,0,1,.08-.25.51.51,0,0,1,.25-.17c.22-1.32,1.67-.38,2.45-.83.7-.11.41.56.61.9h0a.38.38,0,0,0,.07-.21v0a.19.19,0,0,1,0-.08.42.42,0,0,1,0-.1.34.34,0,0,1,.07-.11,1.62,1.62,0,0,1,.18-.19l.18-.15C73.85,43.37,73.78,43.12,73.59,42.9Z"/>
-                <path class="cls-19"
-                      d="M73,54a2,2,0,0,1,0,.4c0,.31-.19.81-.25,1.28,0,.21-.06.42-.08.62-.15-.86-.4-1.9-.66-2.93l-.16-.6.11,0a1.84,1.84,0,0,1,.94.61.91.91,0,0,1,.11.44A.79.79,0,0,1,73,54Z"/>
-                <path class="cls-19"
-                      d="M68.24,53.11h-.09A3.49,3.49,0,0,1,67,52.8a3.18,3.18,0,0,1-.58-.35,2.3,2.3,0,0,1-.52-.6,1.84,1.84,0,0,1-.15-.35s0-.07,0-.08l.09,0,.16,0a4.7,4.7,0,0,1,.71-.14l.61-.1.51-.09a2.28,2.28,0,0,0,1.25-.69,1.92,1.92,0,0,0,.18-.29,1.16,1.16,0,0,0,.18-.51v0h0a.27.27,0,0,0-.08-.19c0-.16-.1-.28-.12-.33a6.28,6.28,0,0,1-.66.23,2.79,2.79,0,0,1-1.18,0,1.84,1.84,0,0,1-.47-.15,3.7,3.7,0,0,1-.44-.28,1,1,0,0,1-.19-.14v0a9.28,9.28,0,0,1-2,0,16.2,16.2,0,0,1-3.42-1l-.45.3c-.23.15-.5.36-.78.58C62.11,51.1,65.12,53.17,68.24,53.11Z"/>
-                <path class="cls-3"
-                      d="M67.12,65.69c.22-.36.44-.76.65-1.19a1,1,0,0,1-.33-.27.63.63,0,0,1-.18-.34c0-.12.1-.13.1-.12s0,0,.12,0a1.55,1.55,0,0,0,.32-.14c.13-.07.28-.15.46-.23A9.51,9.51,0,0,0,68.8,57a5.17,5.17,0,0,1-1.08-.43,5.33,5.33,0,0,1-.56-.32l-.29-.18-.43-.32a9.75,9.75,0,0,1-.74-.64l-.35-.32,0,0v0l0,0-.11-.14c.46.13.94.28,1.29.36s.69.13,1,.17l.28,0a4.65,4.65,0,0,0-.55-.53,4.65,4.65,0,0,1,.55.53l.77.07a3.82,3.82,0,0,0,1.73-.24,2.71,2.71,0,0,0,1-.68l.08-.1c-.06-.17-.12-.34-.19-.52l-.31-.84h0c-.21.06-.48.12-.85.19a6.85,6.85,0,0,1-1.62.12c-3.12.06-6.13-2-8.53-4.58l-.49.39a15.19,15.19,0,0,1-1.8,1.48h0l-1.7.25.17.07s.16.09.17.11.12,0,.15,0,.11,0,0,.06l-.48.09-.89.16-.81.14-.62.09a6.94,6.94,0,0,1-2,.08,4.78,4.78,0,0,1-.81-.2,15.28,15.28,0,0,0-.42,1.65c0,.28-.1.57-.13.86a3.29,3.29,0,0,0,.67.53,5.38,5.38,0,0,0,1.85.65,9.68,9.68,0,0,0,1.4.1l.82,0c.34,0,.76-.05,1.16-.09a7.67,7.67,0,0,0,.95-.07l0,0a6.55,6.55,0,0,0-.56.6c-.31.26-.48.47-.79.72l-.74.6c-.45.35-.87.65-1.28.91a10.72,10.72,0,0,1-2.1,1c-.56.19-1,.31-1.22.39l-.12,0c.1.72.22,1.46.38,2.2a23,23,0,0,0,.76,2.84s0,0,.05,0a1.48,1.48,0,0,0,.42.19.36.36,0,0,1,.18.11.48.48,0,0,1,.17.41.37.37,0,0,1-.27.31.24.24,0,0,1-.14,0q.12.32.27.63l.18.35a6.9,6.9,0,0,0,1.1,1.62l.14.13c.18-.12.21-.21.21-.24l-.06-.2.21,0h.83a.18.18,0,0,1,.19.11,1.6,1.6,0,0,1-.26,1.3h0l.61.47a11.74,11.74,0,0,0,2.54,1.47l.15,0C61.86,71.54,64.79,68.61,67.12,65.69Zm-4.29-2a.81.81,0,0,1,.52-.46,3.24,3.24,0,0,1,.67,0h.32s0,0,.15,0a.18.18,0,0,1,.06.23c0,.07-.06.06-.09.08a.11.11,0,0,1-.06,0l-.07,0a1.63,1.63,0,0,1-.62.28,2.44,2.44,0,0,1-.94.07S62.76,63.83,62.83,63.66Zm-1.09,2.78a1,1,0,0,1,.78-.31l.36,0a2.15,2.15,0,0,1,.52.13c.11,0,.24.15.23.28a.5.5,0,0,1-.1.19l-.09.1a3.25,3.25,0,0,1-.42.31,1.18,1.18,0,0,1-.77,0s.34-.08.68-.22c.09-.08.23-.21.33-.32a.5.5,0,0,0,.07-.08v0l0,0a2.92,2.92,0,0,0-.45-.08l-.35,0a.73.73,0,0,0-.59.17,2.13,2.13,0,0,0-.52.88A1.22,1.22,0,0,1,61.74,66.44Zm-2.61,2.71a.42.42,0,0,0,.18,0,1.49,1.49,0,0,0,.46-.07s0,0,0,0,0,0,0-.06a.86.86,0,0,0-.28-.11c-.09,0-.14,0-.16,0s.26-.19.57,0a.4.4,0,0,1,.22.2.26.26,0,0,1-.07.24.58.58,0,0,1-.25.12l-.19,0a1.16,1.16,0,0,1-.4,0l-.1,0s0,0,0,0,0,0,0,0,0,0,0,0a.23.23,0,0,0,0-.07S59.06,69.16,59.13,69.15ZM57.7,62.89a.59.59,0,0,1-.18.14l-.27.21a.83.83,0,0,1-.42.2.91.91,0,0,1-.43-.11l-.31-.15c-.19-.09-.3-.15-.29-.18a1.21,1.21,0,0,1,.33.06l.34.1a.67.67,0,0,0,.33.05c.19,0,.37-.29.54-.42s0,0,0,0h0l-.19,0a3.23,3.23,0,0,0-.71,0,3.66,3.66,0,0,1-.75,0h-.18s0,.07,0,.07,0,0-.09-.06,0-.07,0-.08l.06,0,.15,0c.21,0,.47,0,.73-.08a2.63,2.63,0,0,1,.77-.06.81.81,0,0,1,.31.06.37.37,0,0,1,.16.1.2.2,0,0,1,.07.15A.24.24,0,0,1,57.7,62.89Z"/>
-                <path class="cls-19"
-                      d="M72.25,57a5.47,5.47,0,0,1-2.27.2A5.21,5.21,0,0,1,68.8,57a9.51,9.51,0,0,1-.54,6.37,2.93,2.93,0,0,1,.57-.18,1.15,1.15,0,0,1,.31,0l.33,0a1.78,1.78,0,0,1,.74.06c.16.18,0,.28,0,.29a.88.88,0,0,1-.2.1l-.3.09-.18.06-.11,0a4.68,4.68,0,0,0-.91.55.84.84,0,0,1-.6.22.33.33,0,0,1-.12,0c-.21.43-.43.83-.65,1.19-2.33,2.92-5.26,5.85-9.35,5.26l-.15,0a8.41,8.41,0,0,0,1.82.53,15.88,15.88,0,0,0,2.4.12,16.42,16.42,0,0,0,2.35-.22A5.89,5.89,0,0,0,68,69.45a28.34,28.34,0,0,0,2.4-3.28,15.37,15.37,0,0,0,2.22-5.6c.23-1.45.13-2.3.2-2.3C72.71,58.28,72.54,57.77,72.25,57ZM69,67.76a1.74,1.74,0,0,1-.14.27c0,.07-.15.14-.22.12s-.09,0-.09,0,.13,0,.18-.17,0-.15.07-.25,0-.24,0-.22,0,0,0,0-.08,0-.08,0l-.19.06a4,4,0,0,0-.41.17c-.31.13-.59.29-.62.25s.22-.26.5-.45a3.56,3.56,0,0,1,.62-.34,1,1,0,0,1,.2,0c.14,0,.35,0,.3.25A2.09,2.09,0,0,1,69,67.76Zm1.37-7.22a1,1,0,0,1-.57.29.39.39,0,0,1-.26-.11.27.27,0,0,1,0-.23c0-.12.09-.17.1-.16s0,.08,0,.17.07.11.16.1a.56.56,0,0,0,.24-.17l.11-.12s0,0,.06,0,0,0-.05,0l-.24-.1A2.64,2.64,0,0,1,69.6,60s.14-.07.3-.05l.27,0a3.56,3.56,0,0,1,.45.13A3.52,3.52,0,0,1,70.33,60.54Z"/>
-                <path class="cls-20"
-                      d="M73,2.19l-.42.4a4.62,4.62,0,0,0-.72,1,13.45,13.45,0,0,0-.62,1.26c-.13.34-.28.75-.43,1.18a2.55,2.55,0,0,0-.08.26s0,.07,0,0V6.22l0-.16,0-.32q0-.3-.06-.57a3,3,0,0,0-.1-.5,5.46,5.46,0,0,0-.21-.61,12.39,12.39,0,0,0-.83-1.76c.3,0,.61-.11.92-.15A8.43,8.43,0,0,1,71.8,2a1.48,1.48,0,0,1,.31,0l.41.05A3.64,3.64,0,0,0,73,2.19Z"/>
-                <path class="cls-7"
-                      d="M72.2,56.83a.66.66,0,0,0,0,.15,4.86,4.86,0,0,0-.63,0A10.19,10.19,0,0,1,70,56.92a5.15,5.15,0,0,1-2.09-.67c-.17-.11-.35-.21-.52-.33l-.24-.17-.08-.07a.77.77,0,0,1-.13-.12l0-.05.08,0,.16,0,.19,0a10.19,10.19,0,0,0,1.08.12,4.36,4.36,0,0,0,2-.22,3.23,3.23,0,0,0,1.07-.67Z"/>
-                <path class="cls-19"
-                      d="M70.86,81.84a.88.88,0,0,1,.41.16,1.21,1.21,0,0,0-.23-.53c-.18.11-.35.27-.52.39A1.22,1.22,0,0,1,70.86,81.84Z"/>
-                <path class="cls-3"
-                      d="M70.22,81.06a7.83,7.83,0,0,0-.86.38,9.05,9.05,0,0,1-1.64.62,5.61,5.61,0,0,1-1.34,0c-.36,0-.64,0-.84,0h-.12l-.32.06H65q.11.44.18.87l.09,0a16.47,16.47,0,0,0,5.1.56,1.33,1.33,0,0,0,.16-.17l.09-.11a.84.84,0,0,0-.26-.35,1.51,1.51,0,0,0-.48-.16c-.15,0-.25-.07-.25-.09s0,0,.06,0a.6.6,0,0,1-.25-.15.6.6,0,0,0,.25.15h.2a1.92,1.92,0,0,1,.33,0,3.09,3.09,0,0,1,.85-.1l.07-.12.08-.15a.69.69,0,0,0-.42-.35,1.72,1.72,0,0,0-.5,0,.38.38,0,0,0-.16,0s-.07,0-.08,0h0l0,0a.27.27,0,0,1,.17-.09l.22-.06c.17-.12.34-.28.52-.39a.81.81,0,0,0-.82-.41Z"/>
-                <path class="cls-19"
-                      d="M70.24,82.79a1.08,1.08,0,0,1,.27.07,1.05,1.05,0,0,1,.31.28l0-.08.23-.37A3.09,3.09,0,0,0,70.24,82.79Z"/>
-                <path class="cls-19"
-                      d="M65.29,83.13l1.41.77,2.42,0a2.26,2.26,0,0,0,1.07-.11,1,1,0,0,0,.2-.13A18.56,18.56,0,0,1,65.29,83.13Z"/>
-                <path class="cls-9" d="M70.72,83.58h0s0,0,0,0Z"/>
-                <path class="cls-7"
-                      d="M66.33,51.88a1.41,1.41,0,0,0,.36.37,2.64,2.64,0,0,0,1.53.43,3.93,3.93,0,0,0,1.47-.4,4.92,4.92,0,0,0,.67-.41l-.47-1.26a2.94,2.94,0,0,1-1.93.82l-1.08.1-.48,0-.12,0s-.11,0-.07,0A.57.57,0,0,0,66.33,51.88Z"/>
-                <path class="cls-9" d="M69.72,47.3h0v0Z"/>
-                <path class="cls-3"
-                      d="M69.72,48.06v.08c0,.1-.13.22-.13.22l-.26.18a1.66,1.66,0,0,1-.79.36,1.32,1.32,0,0,1-1-.09.9.9,0,0,1-.27-.2.34.34,0,0,1,0-.15h0c.25-.08.49-.17.69-.25a8.55,8.55,0,0,0,1.35-.5c0,.06.07.12.1.13l.06,0,0,0h0A.76.76,0,0,1,69.72,48.06Z"/>
-                <path class="cls-3"
-                      d="M69.39,63.42h0l0,0h0l-.09,0a4.78,4.78,0,0,0-.92.64c-.16.12-.31.24-.45.23a.8.8,0,0,1-.38-.23.78.78,0,0,1-.2-.26.15.15,0,0,1,0-.11s0,0,.13,0a1.25,1.25,0,0,0,.36-.09,5.22,5.22,0,0,1,1-.31h.53Z"/>
-                <path class="cls-20"
-                      d="M69,31.47a34.74,34.74,0,0,0-.39-3.57,11,11,0,0,0-1.17-3.44A7.92,7.92,0,0,0,65,21.83l0,0A9.1,9.1,0,0,0,63,20.71c.63.43,1,.95.63,1.72A2.58,2.58,0,0,1,62,23a11.14,11.14,0,0,1,1.27.46,11.65,11.65,0,0,1,1.62.88A5.56,5.56,0,0,1,66,25.61a10.8,10.8,0,0,1,1.14,2.52,16.49,16.49,0,0,1,.59,2.52,3.9,3.9,0,0,1-.18,2s-.16.24-.57.53c-.88,3.64-4.89,6-8.72,6.17.9.39,1.75.75,2.54,1.05A15.08,15.08,0,0,0,63,41a6.93,6.93,0,0,0,1.74.15,5.22,5.22,0,0,0,1.12-.1c.25,0,.37-.11.38-.1a3,3,0,0,1,.29-.42c.19-.28.46-.68.76-1.2a13.51,13.51,0,0,0,1.65-4.65A13.85,13.85,0,0,0,69,31.47Z"/>
-                <path class="cls-8"
-                      d="M67,33.13l-.28.19a7.53,7.53,0,0,1-2.83,1,12.77,12.77,0,0,1-4.43-.18,23,23,0,0,1-2.54-.58,9.39,9.39,0,0,1-2.61-1.13h0l-.86-.58c-.15-.1-.29-.22-.43-.32l-.21-.16-.33-.27c0-.14,0-.29,0-.43s0-.19,0-.29.08-.36.13-.54a10,10,0,0,1,.38-1,12.46,12.46,0,0,1,4.25-4.91,6.51,6.51,0,0,1,1.94-1,4.76,4.76,0,0,1,2.12-.1A5.29,5.29,0,0,1,62,23a2.58,2.58,0,0,0,1.66-.55c.38-.77,0-1.29-.63-1.72a7.77,7.77,0,0,0-2.92-.59,29,29,0,0,0-4.62.59,20,20,0,0,0-2,.55c-4.69,2.54-5.84,9.65-2.1,12.86a35.13,35.13,0,0,0,6.93,5.17h0C62.1,39.12,66.11,36.77,67,33.13Z"/>
-                <path class="cls-20"
-                      d="M53.44,21.26c-.4.14-.76.28-1.06.41-.7.31-1.08.56-1.14.58s-.57.33-1.36.94a24.3,24.3,0,0,0-3,2.81,25.21,25.21,0,0,0-1.74,2.1c-.14.2-.29.4-.43.61l-.11.14v0s0,0,0,.05l0,0,.23.27.52.6A48.11,48.11,0,0,0,50,34.5a24.1,24.1,0,0,0,2.66,2c.22.15.46.29.69.43l.7.38c.48.25,1,.48,1.45.7.95.45,1.87.88,2.75,1.27a35.13,35.13,0,0,1-6.93-5.17C47.6,30.91,48.75,23.8,53.44,21.26Z"/>
-                <path class="cls-19"
-                      d="M67.37,71.75l.07-.16s.16-.27.37-.65.31-.55.48-.87a5.08,5.08,0,0,1-1.66,1.26,9.59,9.59,0,0,1-2.31.74l-.66.11c0,.15,0,.36,0,.61,0,.61.11,1.49.2,2.56,0,.53.09,1.11.14,1.73,0,.27,0,.55.08.84l.08.29,0,.25c0,.17.08.33.11.5l0,.19C64.54,76.14,64.55,72.7,67.37,71.75Z"/>
-                <path class="cls-3"
-                      d="M64.4,79.15c.2,1,.41,2,.62,3h.07v0a.13.13,0,0,0,0-.06c0-.15,0-.37,0-.69,0-.6,0-1.52.08-2.83a25.11,25.11,0,0,1,.33-2.81,1.48,1.48,0,0,0,0-.27c-.18.15-.31.23-.33.16a10.11,10.11,0,0,1,1.16-2c.29-.48.55-1,.74-1.38.1-.23.19-.41.25-.53C64.55,72.7,64.54,76.14,64.4,79.15Z"/>
-                <path class="cls-10"
-                      d="M67.54,31.84s0,.75,0,.76a9.45,9.45,0,0,1-.92.58c-.18.1-.39.2-.62.3a5.74,5.74,0,0,0,1-3.41A13.61,13.61,0,0,1,67.54,31.84Z"/>
-                <path class="cls-11"
-                      d="M67.06,30.07a5.74,5.74,0,0,1-1,3.41c-.23.09-.48.18-.76.26l.14-.11a10.05,10.05,0,0,1-2.5.35H62a5.25,5.25,0,0,1-1.9-4.7c.14-2.6,1.6-4.63,3.4-4.74a6.68,6.68,0,0,1,.78.47,4.12,4.12,0,0,1,.85,1l.12.15.24.45.08.15A21.9,21.9,0,0,1,67.06,30.07Z"/>
-                <path class="cls-3"
-                      d="M66.43,48.23h-.06a9.52,9.52,0,0,1-1.93-.13,15.12,15.12,0,0,1-2.81-.9l1.3-.85a15.58,15.58,0,0,0,1.3,1.21,3.65,3.65,0,0,0,1,.49,4,4,0,0,0,1.07.17Z"/>
-                <path class="cls-3"
-                      d="M64.74,41.44l1.6.64a.3.3,0,0,0-.22.11.83.83,0,0,0-.18.34s.07,0,.15.07l-.16.15s0,0,0,0l0,0-.46.79A15.13,15.13,0,0,0,63.2,44l-.09-.75s0,0,0,0a4.16,4.16,0,0,0-1.24-.48l-.62-.16.38-1.42a9.31,9.31,0,0,0,1.26.28A7.51,7.51,0,0,0,64.74,41.44Z"/>
-                <path class="cls-3"
-                      d="M56.11,99.62a8.93,8.93,0,0,1-1.69,2.72c-.27.33-.5.6-.64.8,0,0,0,0,0,0,1.56.29,3.17.49,4.78.74l.9.14.19,0h.3l.32,0c.6,0,1.21-.08,1.81-.13l1.4-.14c0-.07.08-.17.14-.28s.35-.62.59-1,.52-.93.77-1.47a6.78,6.78,0,0,0,.33-.85,5,5,0,0,0,.17-.92,3.55,3.55,0,0,0-.13-1.79,3.19,3.19,0,0,0-.4-.73A29.32,29.32,0,0,1,56.4,98,7.53,7.53,0,0,1,56.11,99.62Z"/>
-                <path class="cls-19"
-                      d="M63.68,95.52c-.32.07-.64.14-1,.19a18.79,18.79,0,0,1-6.09.11l-1-.17a1.82,1.82,0,0,1,.56.8A3.81,3.81,0,0,1,56.4,98a29.32,29.32,0,0,0,8.53-1.29,5,5,0,0,0-.5-.59A2.52,2.52,0,0,0,63.68,95.52Z"/>
-                <path class="cls-11"
-                      d="M65.4,33.63l-.14.11-.34.1h0a15.44,15.44,0,0,1-2,.14A10.05,10.05,0,0,0,65.4,33.63Z"/>
-                <path class="cls-11" d="M65.26,33.74l-.06,0-.28.05Z"/>
-                <path class="cls-9" d="M64.81,7.55v0l-.29,0v0Z"/>
-                <path class="cls-3"
-                      d="M64.39,63.38s0,0,0,0a.49.49,0,0,0,0,.11h0l-.28,0a.53.53,0,0,0,.14-.12l.13-.07s0,0,0,0A.21.21,0,0,0,64.39,63.38Z"/>
-                <path class="cls-11"
-                      d="M64.91,33.84a6.6,6.6,0,0,1-.84.16H64a.29.29,0,0,0-.24,0h-.05l-.5,0-.55,0a3.85,3.85,0,0,1-.48,0L62,34h.86A15.44,15.44,0,0,0,64.91,33.84Z"/>
-                <path class="cls-20" d="M64.21,2.78c.09.73.19,1.81.26,3.32A13.48,13.48,0,0,0,63,2.73Z"/>
-                <path class="cls-11" d="M64.07,34l-.14,0h-.16A.29.29,0,0,1,64,34Z"/>
-                <path class="cls-3"
-                      d="M64,63.47a1,1,0,0,1-.36.2c-.35.12-.73.21-.84.26.07-.09.25-.46.6-.5A3.94,3.94,0,0,1,64,63.47Z"/>
-                <path class="cls-3"
-                      d="M63.11,43.2l.09.75c-.25,0-.49.1-.74.16l-1,.27c-.47-.39-.81-.64-.86-.58a6.65,6.65,0,0,0,.58.66l-.8.25c-.58.19-1,.36-1,.37a8.64,8.64,0,0,0-1,.5l-.41.28c-1.2-.39-2.46-.76-3.71-1.11-.23-.07-.49-.13-.67-.2L53,44.27l-1.32-.59-.15-.07c.7-.19,1.36-.35,1.9-.47.78-.17,1.32-.22,1.35-.23s.56-.1,1.36-.19A20.23,20.23,0,0,1,59,42.65a23,23,0,0,1,2.86.31C62.52,43.08,63,43.2,63.11,43.2Z"/>
-                <path class="cls-3"
-                      d="M58.34,24.17a10.38,10.38,0,0,0-2.21,1.64,10.46,10.46,0,0,0-2.48,3.28,6.91,6.91,0,0,0-.37.95c-.05.16-.09.32-.13.48l0,.24v.09l.28.22.41.32.84.59,0,0a7.78,7.78,0,0,0,2,.94C55.22,30.34,55.79,26.77,58.34,24.17Z"/>
-                <path class="cls-10"
-                      d="M60.14,29.28c.14-2.6,1.6-4.63,3.4-4.74l-.66-.32a4.94,4.94,0,0,0-3.44-.5,5.42,5.42,0,0,0-1.1.45c-2.55,2.6-3.12,6.17-1.72,8.77l.44.15a25,25,0,0,0,2.47.64,15.7,15.7,0,0,0,2.66.35L62,34A5.25,5.25,0,0,1,60.14,29.28Z"/>
-                <path class="cls-9" d="M62.78,64s0,0,0,0S62.79,64,62.78,64Z"/>
-                <path class="cls-19"
-                      d="M56.06,86.71a.77.77,0,0,0,.07.17,2.8,2.8,0,0,0,.14.25h0l0,0,.09-.07.18-.16L58,85.67l1.12-.93.39-1.26A10.16,10.16,0,0,1,56.06,86.71Z"/>
-                <path class="cls-19"
-                      d="M56.23,86.1a.61.61,0,0,0-.19.38.36.36,0,0,0,0,.12.52.52,0,0,0,0,.11A10,10,0,0,0,58.24,85a5.44,5.44,0,0,1-1.86.9A1.91,1.91,0,0,0,56.23,86.1Z"/>
-                <path class="cls-19"
-                      d="M54.78,86a1.85,1.85,0,0,0-.16.3s0,0-.06.13a.77.77,0,0,0-.08.29.76.76,0,0,0,0,.15l.19,0,.45.07.91.12L55.93,87a.82.82,0,0,1-.21-.57c0-.07.11-.28.3-.46A4.7,4.7,0,0,1,54.78,86Z"/>
-                <path class="cls-19"
-                      d="M54,86.13v.21l.29.39a1,1,0,0,1,.08-.53.84.84,0,0,1,.1-.15l0,0a4.05,4.05,0,0,1-.5-.12A2.11,2.11,0,0,0,54,86.13Z"/>
-                <path class="cls-3"
-                      d="M61.28,75c0-.91-1.08-1.83-1.83-2.75h-.14a9.7,9.7,0,0,1-2.18-.62c.27.51.62,1.24.93,2s.57,1.42.76,2,.28,1,.29,1a24.51,24.51,0,0,1,.13,3.16,9.25,9.25,0,0,1-.26,3h0a12.54,12.54,0,0,1-1.75,1.15s-1.93.78-2,.62a1,1,0,0,0-.7.18,1.14,1.14,0,0,0-.45.64,3.12,3.12,0,0,0-.1.48v0a4.05,4.05,0,0,0,.5.12,2.28,2.28,0,0,1,.22-.23c.21-.17.48-.24.49-.2s-.19.18-.33.37a.86.86,0,0,0-.07.1A4.7,4.7,0,0,0,56,86c.21-.2.45-.36.49-.25l-.13.16a5.44,5.44,0,0,0,1.86-.9,9.79,9.79,0,0,0,1.23-1.51c.07-.22.11-.35.12-.37s0,0,0-.14l0,0s0,0,0,0l0-.07v0c0-.07.05-.14.08-.22.11-.32.28-.75.48-1.27l.69-1.76c.09-.25.19-.5.29-.74A13.51,13.51,0,0,0,61.28,75Z"/>
-                <path class="cls-19"
-                      d="M61.86,72.35a15,15,0,0,1-2.41-.06c.75.92,1.83,1.84,1.83,2.75a13.51,13.51,0,0,1-.05,3.76c0-.09.07-.16.1-.25l.21-.5,0-.09s0,0,0,0h0v-.07l0-.26c.22-1.44.43-2.87.58-3.94l.21-1.34C62.24,72.33,62.05,72.35,61.86,72.35Z"/>
-                <path class="cls-3"
-                      d="M61.55,44.91l1,1.08-1.14.62-.53.3-1.12-.44-1.06-.37c.5-.26.87-.41.9-.42s.38-.18.93-.4Z"/>
-                <path class="cls-9" d="M60.66,82.93a.19.19,0,0,1,0,.08h0l0,0Z"/>
-                <path class="cls-22"
-                      d="M60.21,47.39l-.67-.22c-.44-.15-.89-.28-1.34-.41.36.47.75.93,1.15,1.39.27-.26.54-.5.77-.69Z"/>
-                <path class="cls-3"
-                      d="M57.85,46.65l-1,.64a20.84,20.84,0,0,1-2.69,1.65l-.33.19a3.46,3.46,0,0,0,.42.57c.08.07.15.16.24.23a2.34,2.34,0,0,0,.38.28,3.84,3.84,0,0,0,.8.43l1.7-.25a8.94,8.94,0,0,1,1.49-1.81c.14-.15.29-.29.44-.43-.4-.46-.79-.92-1.15-1.39Z"/>
-                <path class="cls-9" d="M59.23,69.29s.08.12,0,0Z"/>
-                <path class="cls-20"
-                      d="M58.47,6.77c0,.08.11.28,0,.12s-.28-.28-.58-.53l-.15-.13L57.39,6l-.45-.34L56.06,5a13.29,13.29,0,0,0-1.62-1A20.13,20.13,0,0,0,52.38,3a14.93,14.93,0,0,1,3.11-.49c.41,0,.81,0,1.2,0,.19.34.39.77.61,1.28.31.7.73,1.82,1,2.46,0,0,.06.15.12.31Z"/>
-                <path class="cls-3"
-                      d="M53.3,45.45h0c-.07.14-.19.39-.37.74.06.21.11.45.18.75a11,11,0,0,0,.55,1.74,3.84,3.84,0,0,0,.23.45l.33-.19a17.91,17.91,0,0,1,2.42-2l.57-.44c-1-.29-2.09-.55-3.16-.82C53.79,45.59,53.57,45.54,53.3,45.45Z"/>
-                <path class="cls-7"
-                      d="M56.37,55.13l0,0-.55.45a17.59,17.59,0,0,1-2.47,1.68,7,7,0,0,1-2.05.64,9.74,9.74,0,0,1-1.23.12H50q-.06-.6-.09-1.17a14.88,14.88,0,0,1,0-2l.51.21a7.34,7.34,0,0,0,2.14.42,11.87,11.87,0,0,0,1.45,0l.82-.06.63-.07.55-.14Z"/>
-                <path class="cls-7"
-                      d="M51.37,99.16a10.08,10.08,0,0,1-2.88,1.66l-.68.25c.17.1.34.2.52.29a13.43,13.43,0,0,0,3.16,1.31c.51.14,1,.26,1.57.37a12,12,0,0,1,.9-1.1,8.63,8.63,0,0,0,1.71-2.47A7.56,7.56,0,0,0,56,98a28,28,0,0,1-3.62-.3A3.85,3.85,0,0,1,51.37,99.16Z"/>
-                <path class="cls-16"
-                      d="M56,96.53a1.77,1.77,0,0,0-.6-.94c-.32-.08-.62-.16-.9-.25l-1.59-.46-.43-.13a3.81,3.81,0,0,1,.22,1.39,4.18,4.18,0,0,1-.25,1.53h0A28,28,0,0,0,56,98,3.55,3.55,0,0,0,56,96.53Z"/>
-                <path class="cls-3"
-                      d="M53.22,69.16c-.24-.21-.47-.41-.7-.64l-.19-.21a2.77,2.77,0,0,1-.31.53s0,.09,0,.12a.66.66,0,0,0,.24.45.48.48,0,0,0,0,.13l.28.46c.21.34.45.64.4.81s-.57.12-1-.1a4.06,4.06,0,0,1-.57-.35,1.73,1.73,0,0,1-.29-.31l0-.12v0l0,0-.65.61a.05.05,0,0,0,0,0h0l0,.07a2,2,0,0,0-.16.3.75.75,0,0,0,.13.82,3,3,0,0,0,.25.24l.3.23c.18.15.36.29.52.4.32.23.55.35.54.43s-.32.14-.74,0a4.64,4.64,0,0,1-.69-.23l-.38-.17a1.87,1.87,0,0,1-.39-.23,1.7,1.7,0,0,1-.62-.75l-.42.4-.72.68,0,.1a2.72,2.72,0,0,0,.53.93c.54.64,1.4,1.07,1.33,1.25s-1,.06-1.94-.55a3.46,3.46,0,0,1-.85-.86c-.28.26-.56.55-.85.86l-.23.24.09.31a2.57,2.57,0,0,0,.44.75,3.75,3.75,0,0,0,.74.58c.23.14.39.16.43.24s-.18.27-.54.26A2.43,2.43,0,0,1,46,76.54a3,3,0,0,1-.88-.8c-.55.63-1.13,1.31-1.72,2a2.58,2.58,0,0,0,.34,1,2.52,2.52,0,0,0,.68.76,3.24,3.24,0,0,0,1.08.5l.19,0C49.53,77,53.38,73.65,53.22,69.16Z"/>
-                <path class="cls-19"
-                      d="M54.53,70.2c-.46-.33-.89-.68-1.31-1C53.38,73.65,49.53,77,45.73,80a7.91,7.91,0,0,0,2.12.22,5.43,5.43,0,0,0,.79-.09c.75-1,1.67-1.94,2.56-2.9.71-.76,1.34-1.55,1.94-2.33a24.19,24.19,0,0,0,1.51-2.14,13.28,13.28,0,0,0,.83-1.59c.05-.12.09-.22.13-.3C55.24,70.69,54.88,70.45,54.53,70.2Z"/>
-                <path class="cls-7"
-                      d="M55.33,50.73s.15,0,.05,0l-.29,0-.55.08-.51,0-.6,0a4.77,4.77,0,0,1-1.8-.19,3,3,0,0,1-.72-.4c.08-.22.17-.42.25-.62.41-.88.85-1.72,1.17-2.38l.08-.18s0,0,0,0c.22.44.46,1,.85,1.69a4.45,4.45,0,0,0,.81,1,3.11,3.11,0,0,0,.28.23l.21.16a3.66,3.66,0,0,0,.52.28l.09,0Z"/>
-                <path class="cls-3"
-                      d="M54.48,67.85a1.35,1.35,0,0,1-.2.91l0,0c-.23-.2-.46-.4-.67-.61a.71.71,0,0,0,.27-.33C54,67.86,54.31,67.86,54.48,67.85Z"/>
-                <path class="cls-3"
-                      d="M44.76,93.09l0,0a5.69,5.69,0,0,1-1.68.54,6.4,6.4,0,0,1-1.57,0c-.29,0-.56-.07-.78-.11.21.7.4,1.33.48,1.5a3,3,0,0,1,.16.56l.1.47c.07.31.14.61.2.92L42,98.89l.06.3v.06s0,0,0,0l.08-.1.6-.77.56-.74.4.84.8,1.7c0-.52,0-1,0-1.56.44.39.91.84,1.34,1.17.2.17.44.34.62.47l.35.24.22.15h0l.16,0c.25-.07.6-.18,1-.33a9.58,9.58,0,0,0,2.79-1.45A3.1,3.1,0,0,0,52,97.61c-.61-.1-1.22-.21-1.84-.35A8.67,8.67,0,0,1,44.76,93.09Z"/>
-                <path class="cls-19"
-                      d="M52.37,94.74l-.48-.16a1.22,1.22,0,0,1-.32-.12h0l-.19-.23a2.27,2.27,0,0,1-.79-.37,7.72,7.72,0,0,1-1.46-1.31A18.44,18.44,0,0,1,47.9,91c-.31-.44-.51-.75-.53-.77s-.12-.21-.29-.54c-.07.24-.18.57-.32,1-.07.2-.15.42-.23.66a3.87,3.87,0,0,1-.58.93,3.1,3.1,0,0,1-1.19.84,8.67,8.67,0,0,0,5.41,4.17c.62.14,1.23.25,1.84.35a4.13,4.13,0,0,0,.39-1.48A9.38,9.38,0,0,0,52.37,94.74Z"/>
-                <path class="cls-9" d="M51.65,65.2a0,0,0,0,0,0,0h0S51.64,65.21,51.65,65.2Z"/>
-                <path class="cls-9" d="M49.92,2.18h0Z"/>
-                <path class="cls-19"
-                      d="M46.46,53l0,0-.11.11-.07.08s0,0,0,.06a1.23,1.23,0,0,0,.06.21,2.61,2.61,0,0,0,.27.52c.25.39.92.85,1.43,1.53a3.19,3.19,0,0,1,.53,1.12,4.3,4.3,0,0,1,.1,1c0,.15,0,.29,0,.41a1.13,1.13,0,0,1,0,.18.19.19,0,0,1,0,.09.09.09,0,0,1,0,.06h0a1.81,1.81,0,0,1,.24.24.47.47,0,0,1,.12.23h0c-.09-.64-.15-1.28-.19-1.91,0-.24,0-.48,0-.7,0-.06,0-.1,0-.16h0L48.63,56l-.16-.19-.29-.39a8.57,8.57,0,0,1-.52-.76l-.12-.2c0-.08-.06-.11-.12-.25a1,1,0,0,1-.06-.68c.06-.2.3-.32.48-.45l.27-.18,1-.65h0a16.36,16.36,0,0,1,.47-1.71C48.48,51.65,48.39,53.72,46.46,53Z"/>
-                <path class="cls-3"
-                      d="M48.71,51c-.48.38-1,.79-1.42,1.18l-.6.56-.23.22c1.93.73,2-1.34,3.09-2.46a1.87,1.87,0,0,1,.07-.22C49.35,50.51,49,50.76,48.71,51Z"/>
-                <path class="cls-3"
-                      d="M48.42,59.84a1.18,1.18,0,0,0,.09-1.3l-.22-.16a.85.85,0,0,0-.54-.19,1.52,1.52,0,0,0-.57.18c-.18.09-.35.18-.38.26s0,.14.07.21l.1.08s0,.1-.06.17-.12.11-.15.09a1,1,0,0,1-.13-.14.62.62,0,0,1-.12-.2.41.41,0,0,1,0-.34,1.08,1.08,0,0,1,.54-.38l0,0,.1-.11c0-.07,0-.2-.07-.34s0-.27-.15-.39-.16,0-.22.08l-.18.19-.26.25a1.08,1.08,0,0,0-.21.29c-.06.12-.11.26-.17.4C46.45,59.42,47.11,60.28,48.42,59.84Z"/>
-                <path class="cls-19"
-                      d="M49.09,59.8s0,0,0,0q-.09-.47-.15-.93h0a.35.35,0,0,1,0,.18.35.35,0,0,1-.07.14s.11-.25-.13-.47l-.21-.17a1.18,1.18,0,0,1-.09,1.3c-1.31.44-2-.42-2.46-1.37-.05.13-.1.28-.15.42a4.29,4.29,0,0,0-.13.44.59.59,0,0,0,0,.35,1.07,1.07,0,0,0,.64.48,4.52,4.52,0,0,0,1,.2,7.76,7.76,0,0,0,1.08,0c.33,0,.69-.12.71-.24v0C49.12,60,49.1,59.9,49.09,59.8Z"/>
-                <path class="cls-7"
-                      d="M45.47,80.33a3.52,3.52,0,0,1-1.23-.51,2.69,2.69,0,0,1-.83-.86,3.21,3.21,0,0,1-.34-.72c-.44.57-.89,1.16-1.3,1.79q-.24.36-.45.75a2.85,2.85,0,0,0,.37.66,3.4,3.4,0,0,0,2.05,1.35,4.13,4.13,0,0,0,.69.11A11.59,11.59,0,0,1,46,80.42C45.84,80.39,45.65,80.37,45.47,80.33Z"/>
-                <path class="cls-16"
-                      d="M46.29,82.76c.39-.07.71-.15.91-.2a7.28,7.28,0,0,1,.36-.76,9.44,9.44,0,0,1,1-1.5,5.51,5.51,0,0,1-.69.14,6.71,6.71,0,0,1-1.84,0,11.59,11.59,0,0,0-1.59,2.48A7.15,7.15,0,0,0,46.29,82.76Z"/>
-                <path class="cls-7"
-                      d="M42.63,88.27a4.1,4.1,0,0,1-2.8-.74,2.08,2.08,0,0,1-.41-.35c0,.28,0,.56,0,.83a11.84,11.84,0,0,0,.41,2.9h0l.13.34c.08.19.32,1,.57,1.81a8.75,8.75,0,0,0,1,.17,5.82,5.82,0,0,0,1.46,0,5.93,5.93,0,0,0,1.6-.46l0,0a10.9,10.9,0,0,1-1.24-4.6Z"/>
-                <path class="cls-16"
-                      d="M45.93,91.88a2.74,2.74,0,0,0,.39-.64c.1-.23.18-.45.27-.66.18-.42.32-.75.43-1l-.1-.19a6.53,6.53,0,0,1-.51-2,.28.28,0,0,1,0-.09,3.91,3.91,0,0,1-1,.4,14.78,14.78,0,0,1-2.06.43,10.9,10.9,0,0,0,1.24,4.6A3.46,3.46,0,0,0,45.93,91.88Z"/>
-                <path class="cls-3"
-                      d="M44.3,83.18a4.48,4.48,0,0,1-.63-.06,3.68,3.68,0,0,1-2.33-1.42,2.41,2.41,0,0,1-.28-.43c-.21.4-.4.81-.58,1.24a27.15,27.15,0,0,0-.87,3,5,5,0,0,0-.16,1,3.19,3.19,0,0,0,.64.65,3.89,3.89,0,0,0,2.53.76l.74-.06A11.13,11.13,0,0,1,44.3,83.18Z"/>
-                <path class="cls-19"
-                      d="M46.25,87.35a1.56,1.56,0,0,1,.15-.06,5.07,5.07,0,0,1,.37-2.64v-.3a3.61,3.61,0,0,1,.38-1.69,6.1,6.1,0,0,1-.81.28,6.61,6.61,0,0,1-2,.24,11.13,11.13,0,0,0-.94,4.7c.74-.07,1.45-.18,2-.29C45.74,87.5,46,87.42,46.25,87.35Z"/>
-                <rect class="cls-9" x="46.74" y="72.88" width="0.01" height="0.01"/>
-                <path class="cls-9" d="M45.82,6.58h0c-.19.17-.37.36-.56.54C45.44,6.94,45.62,6.75,45.82,6.58Z"/>
-                <path class="cls-9" d="M41.07,80.26h0l-.13.28.13-.28Z"/>
-                <path class="cls-9" d="M40.93,80.57c0,.08-.06.16-.1.25h0Z"/>
-                <circle class="cls-3" cx="62.2" cy="27.25" r="0.91"/>
-                <circle class="cls-3" cx="62.76" cy="28.68" r="0.18"/>
-                <path class="cls-11" d="M73.88,22.78h0Z"/>
-                <path class="cls-11"
-                      d="M77.45,31.24a5.92,5.92,0,0,0,1.7-4.14c.09-2.17-1.34-4.54-2.93-5h0a5.88,5.88,0,0,0-2.18.61h0a.36.36,0,0,0-.11.1h0c-.09.37-.18.75-.24,1.1s-.08.43-.11.64a15.3,15.3,0,0,0,.83,7.33,13.51,13.51,0,0,0,2.15-.35C76.81,31.44,77.12,31.35,77.45,31.24Z"/>
-                <path class="cls-11"
-                      d="M73.53,24.53c-.26,1.61-.34,2.7-.35,2.77s-.16,1.29-.26,3.11h0a2.34,2.34,0,0,0,1,1.47h.11l.29,0A15.3,15.3,0,0,1,73.53,24.53Z"/>
-                <path class="cls-3"
-                      d="M74.29,25.41a.81.81,0,0,0-.36,1.09.8.8,0,0,0,1.09.35.81.81,0,0,0,.36-1.09A.8.8,0,0,0,74.29,25.41Z"/>
-                <circle class="cls-3" cx="73.86" cy="27.51" r="0.19"/>
-                <g id="_Group_2" data-name="&lt;Group&gt;">
-                    <path class="cls-20" d="M85.28,6.09,85.39,6l-.11.1Z"/>
-                    <path class="cls-20"
-                          d="M86,5.69l-.7.38A.22.22,0,0,0,85.18,6l-.09,0a3.17,3.17,0,0,0-.1-.38s.06,0,.15-.1h.15A.73.73,0,0,1,86,5.69Z"/>
-                    <path class="cls-20"
-                          d="M84.76,9.71l-.14-.25h0c.06-.43.24-1.16.42-1.86a4.84,4.84,0,0,0,.08-1.43l0-.22.09,0a.22.22,0,0,1,.08.09l-.07,0h0l.07,0v0l.11-.1-.11.07,0,0,.7-.38a.73.73,0,0,0-.67-.24h-.13l.27-.12c.26-.11.49-.13.5-.07a2.64,2.64,0,0,1,.09.85,4.77,4.77,0,0,1-.32,1.66A11.52,11.52,0,0,1,84.76,9.71Z"/>
-                    <path class="cls-20" d="M84.62,9.46l.14.25c-.06.09-.1.12-.13.11S84.59,9.67,84.62,9.46Z"/>
-                    <path class="cls-20"
-                          d="M84.7,20.43c0-.76,0-1.53,0-1.84h0l.05,0a11.48,11.48,0,0,1,.14,1.91c0,.5,0,1,0,1.39s-.06.65-.06.67a5.15,5.15,0,0,1-.1.65c-.06.38-.18.88-.31,1.37s-.32.95-.46,1.3a3.35,3.35,0,0,1-.26.57,16.82,16.82,0,0,1,.43-1.68c0,.13,0,.19.06.19s0-.22,0-.61a11.2,11.2,0,0,0,.2-1.18c0-.38.07-.64.08-.65s0-.27.07-.65S84.68,20.93,84.7,20.43Z"/>
-                    <path class="cls-20"
-                          d="M84.49,10.2a10.26,10.26,0,0,1-.56-1.74,3,3,0,0,1,.69,1h0c0,.21,0,.34,0,.36s.07,0,.13-.11l.16.31a12.08,12.08,0,0,1,.5,1.21c.11.34.16.59.17.6a4,4,0,0,1,0,.64,6.24,6.24,0,0,1-.18,1.31,4.82,4.82,0,0,1-.56,1.76,10.51,10.51,0,0,1,.1-1.82,7.64,7.64,0,0,0,0-1.22,4.42,4.42,0,0,0-.1-.54,4.71,4.71,0,0,0-.11-.57C84.76,11.06,84.63,10.63,84.49,10.2Z"/>
-                    <path class="cls-20"
-                          d="M85.09,5.94A1.71,1.71,0,0,0,84,6.05a2.93,2.93,0,0,0-1.1.74,1.14,1.14,0,0,0-.23.35l-.51-.72a2.32,2.32,0,0,0,.44-.09,11.1,11.1,0,0,0,1.32-.49,5.33,5.33,0,0,1,1.27-.38c-.09,0-.15.08-.15.1A3.17,3.17,0,0,1,85.09,5.94Z"/>
-                    <path class="cls-20" d="M82.94,32.73l.21-.76c.26.27.48.51.51.53Z"/>
-                    <path class="cls-20"
-                          d="M84.39,3a3.84,3.84,0,0,1,1.9.21,2.52,2.52,0,0,1,1.27,1.4,5.66,5.66,0,0,1,.34,1.35c.1.76.12,1.22.12,1.26a18.41,18.41,0,0,1-.09,2,23,23,0,0,1-.78,4.08,21.5,21.5,0,0,1-1.48,3.82,8.88,8.88,0,0,1-.88,1.45q0-.09,0-.09s0,0,0,.14h0s-.07.05-.08,0a6.85,6.85,0,0,1,.53-1.75,30.59,30.59,0,0,0,1.06-3.83,26.5,26.5,0,0,0,.47-4c0-1.08,0-1.82,0-1.87s0-.49,0-1.15-.19-1.59-.85-1.92a2.89,2.89,0,0,0-1.36-.23c-.52,0-1.08.08-1.62.14s-1.09.11-1.59.16l-.18,0h-.3l-.45,0,.38.65c.15.25.22.4.19.43s-.16-.08-.37-.27S80,4.6,79.66,4.2l.23.06c.19.06.32.08.35,0s0-.15-.18-.32l-.2-.16,1.29-.24c.48-.1,1-.19,1.54-.32S83.8,3,84.39,3Z"/>
-                    <path class="cls-20"
-                          d="M84.9,43.13s-.31-.05-.75-.15-1-.21-1.63-.3-1.21-.15-1.68-.19l-.8-.06-.79-.1a5.52,5.52,0,0,0-1.61,0,13.75,13.75,0,0,0-1.43.34V42.4a9.31,9.31,0,0,1,1.33-.48,6.1,6.1,0,0,1,.93-.18,7.85,7.85,0,0,1,.83,0l.81,0s.34,0,.81.12,1.08.19,1.68.34a11.12,11.12,0,0,1,1.64.5C84.67,42.91,84.93,43.09,84.9,43.13Z"/>
-                    <path class="cls-20"
-                          d="M78.18,41.25c-.42.06-1,.15-1.51.28l-.6.13c0-.13-.07-.26-.11-.38l.59-.2a14.38,14.38,0,0,1,1.52-.42l.73-.16s.32,0,.76,0a10.16,10.16,0,0,1,1.59.09,7.39,7.39,0,0,1,2.19.57A14.82,14.82,0,0,1,81.12,41a9.93,9.93,0,0,0-1.51.06c-.42,0-.69.1-.71.1Z"/>
-                    <path class="cls-20"
-                          d="M76.85,43.15l.14,0,.32.08a6.78,6.78,0,0,1,.86.32c.61.25,1.15.62,1.1.7A4.81,4.81,0,0,1,78,44l-.85-.17-.38,0-.38,0a3.22,3.22,0,0,0-.44,0h0a3.49,3.49,0,0,0,.18-.57A2.84,2.84,0,0,1,76.85,43.15Z"/>
-                    <path class="cls-20"
-                          d="M85.09,28.75l-.69.91q-.16.24-.36.48a1.94,1.94,0,0,0-.13.2l.16.08.46.27,1.65,1-2.52.84s-.25-.26-.51-.53l-.21.76.72-.23h0c0,.15-.06.27-.08.35v0a2.72,2.72,0,0,0-.09.4l-.1.05s-.12.06-.26.16l-.24.2a4.43,4.43,0,0,0-.71.84c-.51.82-1.18,2-2,3.11a9.16,9.16,0,0,1-1.36,1.48,4.07,4.07,0,0,1-.78.52c-.25.14-.5.26-.72.37a4,4,0,0,1-1.58.54,12.63,12.63,0,0,1,1.39-.88,7.12,7.12,0,0,0,1.32-1,8.35,8.35,0,0,0,1.16-1.48c.71-1.09,1.26-2.25,1.78-3.18A5.54,5.54,0,0,1,82.22,33l.31-.27h0l-.09-.11-.38-.46a1.11,1.11,0,0,1,.07-.16l.51-.15,1.11-.31.28-.08h.06l.14,0-.14-.13-1.21-.78.66-.76.4-.46.77-.85c.36-.41.7-.77,1-1.06l.37-.05-.13-.2-.24.25a21.2,21.2,0,0,1-2.28.11l.4-.06c.65-.09,1.88-.23,2.19-.34l.35-.13-.22.33C85.9,27.66,85.53,28.17,85.09,28.75Z"/>
-                    <path class="cls-20"
-                          d="M75.67,41.77l.4-.11c0,.14.07.28.1.43a2.91,2.91,0,0,1,0,.31c-.2.09-.38.17-.52.25a2.83,2.83,0,0,0,0-.51C75.69,42,75.68,41.89,75.67,41.77Z"/>
-                    <path class="cls-20"
-                          d="M76.07,41.66l-.4.11c0-.12,0-.24-.06-.35l.35-.14C76,41.4,76,41.53,76.07,41.66Z"/>
-                    <path class="cls-20" d="M76.21,42.71l-.56.16a1.43,1.43,0,0,0,0-.22c.14-.08.32-.16.52-.25Z"/>
-                    <path class="cls-20"
-                          d="M76.15,43.19a4.23,4.23,0,0,0-.65.14,2.76,2.76,0,0,0,.15-.46l.56-.16A3.5,3.5,0,0,1,76.15,43.19Z"/>
-                    <path class="cls-20"
-                          d="M75.5,43.33a4.23,4.23,0,0,1,.65-.14,3.49,3.49,0,0,1-.18.57h0l-.41,0-.32,0a1.72,1.72,0,0,0,.17-.31S75.47,43.39,75.5,43.33Z"/>
-                    <path class="cls-20"
-                          d="M75.28,42.94s.14-.15.41-.29a1.43,1.43,0,0,1,0,.22C75.43,42.93,75.29,43,75.28,42.94Z"/>
-                    <path class="cls-20"
-                          d="M75.7,40.59a4.54,4.54,0,0,1,.26.69l-.35.14a5.9,5.9,0,0,0-.16-.76,1.3,1.3,0,0,0-.17-.43c-.07-.08-.14-.1-.14-.13s.09-.05.22,0a1.17,1.17,0,0,1,.33.45h0Z"/>
-                    <path class="cls-20"
-                          d="M74.49,42a3.61,3.61,0,0,1,1.12-.59c0,.11,0,.23.06.35A4.1,4.1,0,0,1,74.49,42Z"/>
-                    <path class="cls-20"
-                          d="M74.79,42.87s0,.05,0,.07a.19.19,0,0,1,0,.08c0,.06-.07,0-.06,0l0,0h0l0,0a.55.55,0,0,1-.06-.08.64.64,0,0,0,.14,0S74.79,42.85,74.79,42.87Z"/>
-                    <path class="cls-20"
-                          d="M74.79,42.94s0,0,0-.07,0,0,0,0a.64.64,0,0,1-.14,0,.55.55,0,0,0,.06.08l0,0h0l0,0s0,.08.06,0A.19.19,0,0,0,74.79,42.94Zm.07-.19c.09,0,0,.49-.14.51s-.25-.29-.12-.4A2.17,2.17,0,0,1,74.86,42.75Z"/>
-                    <path class="cls-20"
-                          d="M74.29,43.91c0-.09.54-.4,1.18-.58h0c0,.06-.06.13-.09.18a1.72,1.72,0,0,1-.17.31C74.74,43.89,74.31,44,74.29,43.91Z"/>
-                    <path class="cls-20"
-                          d="M78.44,3.79c-.65-.24-1.42-.58-2.27-.86A14.81,14.81,0,0,0,74,2.38a3,3,0,0,1,.91-.32L74.49,1l0-.06a13.47,13.47,0,0,1,2.14.88A22.21,22.21,0,0,1,78.8,3.07c.45.29.81.55,1.06.74l-.47.09.27.3C79.36,4.12,78.94,4,78.44,3.79Z"/>
-                    <path class="cls-20"
-                          d="M74.72,43.26c.12,0,.23-.53.14-.51a2.17,2.17,0,0,0-.26.11s.05-.07.21-.13.08-.06.11,0a.2.2,0,0,1,.06.11.79.79,0,0,1-.06.38c-.06.14-.14.22-.27.2a.32.32,0,0,1-.22-.23.37.37,0,0,1,0-.38s.09,0,.15.08C74.47,43,74.6,43.29,74.72,43.26Z"/>
-                    <path class="cls-20"
-                          d="M77.45,31.24a3.28,3.28,0,0,1-1.76.88A2.6,2.6,0,0,1,74,31.89h.09a15.51,15.51,0,0,0,2.44-.38A9.68,9.68,0,0,0,77.45,31.24Z"/>
-                    <path class="cls-20" d="M74.07,41.57s-.07,0,0,0l0,0s0-.07-.11-.13.1,0,.17,0,.06.05,0,.09Z"/>
-                    <path class="cls-20"
-                          d="M74.69,22.21a1.86,1.86,0,0,1,1.52-.15,6.14,6.14,0,0,0-2.18.61l0,0A4.29,4.29,0,0,1,74.69,22.21Z"/>
-                    <path class="cls-20"
-                          d="M74,41.73c-.24.05-.27-.07,0-.34.06.06.11.11.11.13l0,0s0,.05,0,0l.08-.07s0-.11,0-.09-.16,0-.17,0l.23-.06C74.42,41.26,74.2,41.68,74,41.73Z"/>
-                    <path class="cls-20"
-                          d="M73.26,23.08a3.33,3.33,0,0,1,.72-.65l-.09.3C73.47,22.93,73.29,23.08,73.26,23.08Z"/>
-                    <path class="cls-20"
-                          d="M73.77,41.85a.19.19,0,0,1-.14-.24.7.7,0,0,1,.13-.24l.06-.08s.08,0,.14.1c-.27.27-.24.39,0,.34s.46-.47.23-.4l-.23.06s.09-.07.26-.12a.11.11,0,0,1,.12,0,.18.18,0,0,1,0,.13.48.48,0,0,1-.21.34A.43.43,0,0,1,73.77,41.85Z"/>
-                    <path class="cls-20"
-                          d="M74.92,2.06a3,3,0,0,0-.91.32l-.69-.13L73,2.2,73.22,2a10.26,10.26,0,0,1,1.27-1Z"/>
-                    <path class="cls-20"
-                          d="M72.92,30.41a11.14,11.14,0,0,1-.24-3.6c.1-2.25.34-3.27,1.2-4q-.13.57-.24,1.11c-.35,2-.44,3.33-.46,3.41S73,28.59,72.92,30.41Z"/>
-                    <path class="cls-20"
-                          d="M75.69,32.12a3.28,3.28,0,0,0,1.76-.88,11.5,11.5,0,0,0,2.27-1,6.48,6.48,0,0,0,.76-.53,3.39,3.39,0,0,0,.34-.31l.07-.08a.2.2,0,0,0,0-.06.65.65,0,0,0,.07-.21,6.92,6.92,0,0,0,.18-1.94,6.71,6.71,0,0,0-1.6-3.49,3.85,3.85,0,0,0-1.31-1.15,4,4,0,0,0-1.53-.44,2.77,2.77,0,0,0-.5,0h0a1.86,1.86,0,0,0-1.52.15,4.29,4.29,0,0,0-.7.48h0l-.1,0,.09-.3a2,2,0,0,1,.31-.19,4.42,4.42,0,0,1,2.46-.43,4.52,4.52,0,0,1,1.64.42,4.31,4.31,0,0,1,1.47,1.21A12.67,12.67,0,0,1,81,25.1a4.57,4.57,0,0,1,.64,2,7.53,7.53,0,0,1-.14,2.11c0,.08-.06.18-.09.27a.89.89,0,0,1-.09.16,1.25,1.25,0,0,1-.09.12,4.54,4.54,0,0,1-.38.38,6.71,6.71,0,0,1-.84.59,13.24,13.24,0,0,1-3.33,1.35,14.5,14.5,0,0,1-2.54.42,3.91,3.91,0,0,1-1.09,0,.44.44,0,0,1-.17-.07,4.68,4.68,0,0,1,0-.53.41.41,0,0,1,.29-.05,3.21,3.21,0,0,0,.81.06h0A2.6,2.6,0,0,0,75.69,32.12Z"/>
-                    <path class="cls-20"
-                          d="M72.77,61.29a.2.2,0,0,0,0-.07.72.72,0,0,0,.34-.09,2,2,0,0,0,.42-.29c.14-.13.28-.26.26-.42a2,2,0,0,0-.47-.93.68.68,0,0,0-.35-.23s0-.06,0-.13v0c0-.09,0-.16.09-.15a.51.51,0,0,1,.18.07,1.05,1.05,0,0,1,.34.28,2.35,2.35,0,0,1,.29.49,1.59,1.59,0,0,1,.18.64.5.5,0,0,1-.14.35.93.93,0,0,1-.24.21,1.78,1.78,0,0,1-.48.27A1,1,0,0,1,72.77,61.29Z"/>
-                    <path class="cls-20"
-                          d="M76,43.77a4.27,4.27,0,0,1-.38.7,4.1,4.1,0,0,1-.52.59,7,7,0,0,1-1.28,1,2.41,2.41,0,0,1-.56.22h0a3,3,0,0,1-1,.06c-.43-.05-.69-.15-.69-.2s.29,0,.7,0a2.85,2.85,0,0,0,1.35-.43,7.85,7.85,0,0,0,1.09-1,5.12,5.12,0,0,0,.43-.55s.07-.1.18-.27l.32,0Z"/>
-                    <path class="cls-20" d="M72.77,61.29c-.09,0-.13,0-.13-.06h.14A.2.2,0,0,1,72.77,61.29Z"/>
-                    <path class="cls-20"
-                          d="M72.71,57.59c-.09,0-.11-.59,0-1.31,0,.14,0,.28.07.42s.05.39.08.56S72.74,57.59,72.71,57.59Z"/>
-                    <path class="cls-20"
-                          d="M84.24,24c0,.12,0,.22,0,.3s0,.11,0,.17l-.06.25c0-.15-.07-.39-.11-.7s-.08-.63-.13-1a10.2,10.2,0,0,0-.47-1.21,4.69,4.69,0,0,0-1-1.17,6.62,6.62,0,0,0-1.33-1.08,6.21,6.21,0,0,0-3.58-.71,3.57,3.57,0,0,0-1.61.74,5.42,5.42,0,0,0-1.25,1.28A4.48,4.48,0,0,0,74,22.34a.29.29,0,0,0,0,.09,3.33,3.33,0,0,0-.72.65s.21-.15.63-.35a.43.43,0,0,0,0,.05c-.86.76-1.1,1.78-1.2,4a11.14,11.14,0,0,0,.24,3.6h0c0,.1,0,.22,0,.33,0,.36,0,.74,0,1.13a.3.3,0,0,0-.15.18.31.31,0,0,0,.15.35A14.36,14.36,0,0,0,73,34.1a13.87,13.87,0,0,0,1,3.66l.1.22.08.16c0,.07.07.08.12.07l.15,0,.14-.07.41-.25c.53-.36,1.05-.74,1.55-1.1,1-.72,1.93-1.42,2.71-2s1.42-1.12,1.86-1.48c0,0,.21-.28.56-.71s.46-1.5,1-2.7l.2-.5c.22-.59.43-1.28.59-1.85h0c-.22.81-.52,2-.81,2.94-.17.62-.34,1.18-.47,1.56L82,32l.09.12a1.54,1.54,0,0,1-.09.24A15.16,15.16,0,0,1,79.46,35c-.74.66-1.64,1.4-2.61,2.17-.5.39-1,.78-1.54,1.17l-.42.29-.29.15a1.68,1.68,0,0,1-.33.07.6.6,0,0,1-.68-.32l-.15-.28-.11-.23A15.75,15.75,0,0,1,72,30.71c.05-2,.2-3.42.21-3.51s.13-1.47.55-3.49c.11-.5.24-1.05.42-1.62A5.3,5.3,0,0,1,74,20.35a6.45,6.45,0,0,1,1.48-1.42,4.18,4.18,0,0,1,2-.82,6.78,6.78,0,0,1,3.92.93,7,7,0,0,1,1.39,1.23,5,5,0,0,1,1,1.33A7.9,7.9,0,0,1,84.2,23C84.22,23.36,84.24,23.7,84.24,24Z"/>
-                    <path class="cls-20"
-                          d="M72.09,52.35a2.24,2.24,0,0,1,1.3.71,1.19,1.19,0,0,1,.23.5c0,.14,0,.22,0,.23a2.94,2.94,0,0,1-.08.7c-.1.39-.26.81-.38,1.27s-.29,1.15-.38,1.5c0-.17,0-.36-.08-.56s0-.28-.07-.42,0-.41.07-.62c.07-.47.2-1,.25-1.28a2,2,0,0,0,0-.4.79.79,0,0,0,0-.14.91.91,0,0,0-.11-.44,1.86,1.86,0,0,0-.94-.61l-.11,0c0-.18-.09-.36-.14-.53C71.82,52.27,72,52.31,72.09,52.35Z"/>
-                    <path class="cls-20"
-                          d="M72.5,45.47a.71.71,0,0,1-.55.18.47.47,0,0,1-.24-.08.33.33,0,0,0,.1-.06.63.63,0,0,0,.12-.11h0a.57.57,0,0,0,.43-.13c.13-.07.27-.2.39-.27s.09-.06.15,0h0A0,0,0,0,1,73,45h0s0,0,0,0S72.71,45.26,72.5,45.47Z"/>
-                    <path class="cls-20"
-                          d="M71.81,45.51a.33.33,0,0,1-.1.06h0s0,0,0-.05.06,0,.06,0h0a.2.2,0,0,1,.1-.07h.05A.63.63,0,0,1,71.81,45.51Z"/>
-                    <path class="cls-20"
-                          d="M71.82,53.86a.27.27,0,0,1,.16.38,3.1,3.1,0,0,1-.37.46l-.14.14c-.08-.22-.16-.45-.25-.68a3,3,0,0,0,.21-.27C71.49,53.8,71.65,53.79,71.82,53.86Z"/>
-                    <path class="cls-20"
-                          d="M72,53.35c.26,1,.51,2.07.67,2.93-.07.72,0,1.31,0,1.31s.06-.12.11-.33c.07.61.05,1,0,1s-.26-.5-.55-1.27h0s0-.1,0-.15l-.73-2,.14-.14a3.1,3.1,0,0,0,.37-.46.27.27,0,0,0-.16-.38c-.17-.07-.33-.06-.39,0a3,3,0,0,1-.21.27L71,53.65c-.11-.28-.22-.57-.32-.85l.12,0,.32-.08L70.81,52a3.57,3.57,0,0,0,1,.72Z"/>
-                    <path class="cls-20"
-                          d="M70.71,52.8c-.11-.31-.23-.63-.35-.93a.13.13,0,0,0,.06,0l.13-.1a2,2,0,0,0,.25.29h0l.35.66-.32.08-.12,0Z"/>
-                    <path class="cls-20"
-                          d="M71.7,52.22c0,.17.1.35.14.53a3.57,3.57,0,0,1-1-.72h0l-.19-.36-.06.07c-.08-.11-.11-.19-.09-.21S71,51.94,71.7,52.22Z"/>
-                    <path class="cls-20"
-                          d="M69.85,4.31a6.58,6.58,0,0,0-1-1.54,4,4,0,0,0-.28-.29l.87-.17a12.66,12.66,0,0,1,.84,1.75c.07.19.14.4.2.61a4.48,4.48,0,0,1,.11.5c0,.18,0,.38,0,.57l0,.32,0,.16V6.3s0,0,0,0,0-.14.08-.26c.15-.43.3-.83.43-1.17a12.54,12.54,0,0,1,.62-1.27,5,5,0,0,1,.72-1c.15-.14.29-.28.42-.39l.36,0,.69.13a4,4,0,0,0-.41.21,7,7,0,0,0-.74.48,3.42,3.42,0,0,0-.71.78,8,8,0,0,0-.68,1.2,16.59,16.59,0,0,0-.75,2l-.15.49s0,0,0,0V7.42l0-.25-.06-.49c-.05-.32-.09-.64-.13-.94a4.54,4.54,0,0,0-.21-.88A4,4,0,0,0,69.85,4.31Z"/>
-                    <path class="cls-20"
-                          d="M69.89,50.61l-.42-1.11,1.06.18a1.27,1.27,0,0,1-.18.36A2.48,2.48,0,0,1,69.89,50.61Z"/>
-                    <path class="cls-20"
-                          d="M72,45.26a.18.18,0,0,1,0,.14h-.06a.2.2,0,0,0-.1.07h0s0,0,0-.05,0,.05,0,.05,0,0-.06,0,0,0,0,.05h0a3.42,3.42,0,0,1-.69.28,1.86,1.86,0,0,1-.9.06.66.66,0,0,1-.31-.19,2.41,2.41,0,0,0,.33-.15s0,0,.07,0a1.59,1.59,0,0,0,.76,0,3.33,3.33,0,0,0,.78-.22c.1,0,.17-.09.18-.13a.3.3,0,0,0,0-.09S72,45.17,72,45.26Z"/>
-                    <path class="cls-20"
-                          d="M73.26,46.34s-.08.28-.37.61a2.91,2.91,0,0,1-1.33.84,4.65,4.65,0,0,1-1,.18v0a.33.33,0,0,0-.32-.31l-.49.2v-.4l.12-.09.21,0a4.11,4.11,0,0,0,1.39,0,3.16,3.16,0,0,0,1.28-.58c.26-.19.42-.37.5-.41h0Z"/>
-                    <path class="cls-20"
-                          d="M69.71,45.62s0-.07.11-.13.14-.08.16-.06a.32.32,0,0,0,.15.14,2.41,2.41,0,0,1-.33.15A.44.44,0,0,1,69.71,45.62Z"/>
-                    <path class="cls-20" d="M69.72,47.42v-.09h0s0,0,0,0h0l.08,0h0Z"/>
-                    <path class="cls-20" d="M69.68,47.85l0,0v0h0Z"/>
-                    <path class="cls-20"
-                          d="M69.64,47.71a.29.29,0,0,1,0-.11s0-.05,0-.05,0,0,0,0a0,0,0,0,0,0,0l.09-.06v.4l0,0h0A.35.35,0,0,0,69.64,47.71Z"/>
-                    <path class="cls-20" d="M69.72,47.42l-.09.06a.47.47,0,0,0,.07-.12s0,0,0,0Z"/>
-                    <path class="cls-20"
-                          d="M69.39,49.29,69.26,49a6.28,6.28,0,0,0,1.06-.56.45.45,0,0,0,.19-.24c.1.36.35,1.17.56,1.86s.41,1.39.63,2.2c-.69-.28-1.19-.74-1.24-.7s0,.1.09.21l-.13.1a.13.13,0,0,1-.06,0c-.17-.45-.32-.88-.47-1.26a2.48,2.48,0,0,0,.46-.57,1.27,1.27,0,0,0,.18-.36l-1.06-.18h0A.32.32,0,0,0,69.39,49.29Z"/>
-                    <path class="cls-20"
-                          d="M69.53,47.9h.07l.07,0h.06v0l.49-.2a.33.33,0,0,1,.32.31v0h-.09c0-.06,0,0-.1,0s-.25,0-.36,0l-.31,0Z"/>
-                    <path class="cls-20"
-                          d="M69.5,60.72a.27.27,0,0,1,0-.23c0-.12.09-.17.11-.16s0,.08,0,.17.08.11.16.1a.56.56,0,0,0,.24-.17l.11-.12s0,0,.06,0,0,0,0,0l-.25-.1A2.64,2.64,0,0,1,69.6,60s.14-.07.3-.05l.27,0,.45.13a2.71,2.71,0,0,1-.29.4,1,1,0,0,1-.57.29A.36.36,0,0,1,69.5,60.72Z"/>
-                    <path class="cls-20"
-                          d="M69.25,48.92c-.06-.16.19-.4.56-.53a1.8,1.8,0,0,0,.54-.41h.1s0,.07.06.18a.45.45,0,0,1-.19.24,6.28,6.28,0,0,1-1.06.56A.08.08,0,0,1,69.25,48.92Z"/>
-                    <path class="cls-20"
-                          d="M69.37,47.83a.38.38,0,0,1-.1-.13c.12-.07.19-.11.19-.13l.17-.09a0,0,0,0,1,0,0s0,0,0,0,0,0,0,.05a.29.29,0,0,0,0,.11.35.35,0,0,1,0,.13h0l-.07,0h-.12l0,0Z"/>
-                    <path class="cls-20"
-                          d="M69.23,47.6v-.06a.31.31,0,0,1,.13-.25l.09-.06h0l.09,0h.15v.14h0s0,0,0,0a.47.47,0,0,1-.07.12l-.17.09A.66.66,0,0,0,69.23,47.6Z"/>
-                    <path class="cls-20"
-                          d="M68.24,1a1.3,1.3,0,0,1,.46.3,4.37,4.37,0,0,1,.69,1l0,0-.87.17a1.94,1.94,0,0,0-.46-.33c-.06,0-.1,0-.11,0s0-.07,0-.09A.28.28,0,0,0,68,2Z"/>
-                    <path class="cls-20"
-                          d="M69.8,45.72a1.71,1.71,0,0,1-.82.09,1,1,0,0,1-.72-.56,2,2,0,0,1-.19-.79,2.09,2.09,0,0,1,.49-1.33,2.62,2.62,0,0,1,.79-.63l.36-.18a6.43,6.43,0,0,1,.69-.2l.37,0a.8.8,0,0,1,.29,0l.13,0h.11l.17,0,.2-.06.11,0a.53.53,0,0,1,.16,0,3.67,3.67,0,0,1,1,0,1.51,1.51,0,0,1,.55.22,2,2,0,0,1,.42.4,1.29,1.29,0,0,1,.24.56.71.71,0,0,1-.23.61c-.32.22-.44.26-.53.74a.66.66,0,0,1-.24.31l-.16.08-.08,0h0s0,0,0,0,0-.13.06-.2a.25.25,0,0,0,0-.12s0,0,0-.22c0,0,0,0,0,0h0l-.09,0-.14,0c-.08,0-.12,0-.13,0s0,0,.09-.09a.48.48,0,0,1,.38-.14c.1.08,0,.2,0,.3s0,0,.08,0a.34.34,0,0,0,.08-.09.3.3,0,0,0,.07-.21v0s0-.06,0-.08a.42.42,0,0,1,0-.1l.07-.11a1.7,1.7,0,0,1,.19-.19l.17-.15c.15-.13.08-.38-.11-.6a1.18,1.18,0,0,0-.32-.27,1.07,1.07,0,0,0-.38-.13,3.62,3.62,0,0,0-.87,0H72l-.11.05-.21.07-.23.07a1.51,1.51,0,0,1-.29,0l-.25-.05h-.06l-.27.05a3.85,3.85,0,0,0-.58.19,2.5,2.5,0,0,0-.94.59,1.5,1.5,0,0,0-.4.95,1.46,1.46,0,0,0,.1.57.49.49,0,0,0,.36.32,1.74,1.74,0,0,0,1.18-.3,2.2,2.2,0,0,0,.25-.17l.12-.1.06-.06a.15.15,0,0,0,.06-.15s-.07-.08-.11-.09a1,1,0,0,0-.41,0,.48.48,0,0,0-.29.1.84.84,0,0,0-.12.19s-.07.07-.08.06,0,0,0-.08a.85.85,0,0,1,.09-.25.57.57,0,0,1,.37-.21,1.32,1.32,0,0,1,.57,0,.42.42,0,0,1,.29.21.39.39,0,0,1-.08.38,1.13,1.13,0,0,1-.12.18l-.13.13a2.09,2.09,0,0,1-.28.22,2.63,2.63,0,0,1-.33.2.32.32,0,0,1-.15-.14s-.1,0-.16.06-.12.12-.11.13A.44.44,0,0,0,69.8,45.72Z"/>
-                    <path class="cls-20"
-                          d="M69.75,68.12c-.39.57-.83,1.15-1.29,1.72l-.16.22.29-.52c.55-1,1.09-2.06,1.22-2S69.84,67.78,69.75,68.12Z"/>
-                    <path class="cls-20"
-                          d="M69.39,2.28a4.37,4.37,0,0,0-.69-1,1.3,1.3,0,0,0-.46-.3L68.16.37c.63-.07,1.3-.14,2-.18A11.5,11.5,0,0,1,72,.24l.5.1.4.11.79.21.84.25,0,.06a10.26,10.26,0,0,0-1.27,1L73,2.2l-.44-.07-.4-.06a1.66,1.66,0,0,0-.32,0,9.62,9.62,0,0,0-1.47.11l-.92.16Z"/>
-                    <path class="cls-20"
-                          d="M68.82,68a.29.29,0,0,1-.22.13c-.06,0-.08,0-.08,0s.12,0,.17-.17,0-.15.07-.25a1.26,1.26,0,0,0,0-.22s0,0,0,0-.07,0-.07,0l-.2.06c-.11,0-.27.1-.41.17a3.36,3.36,0,0,1-.62.26s.22-.27.5-.46a3.56,3.56,0,0,1,.62-.34,1,1,0,0,1,.2,0c.15,0,.36,0,.3.26a2.46,2.46,0,0,1-.12.36C68.92,67.85,68.88,67.94,68.82,68Z"/>
-                    <path class="cls-20"
-                          d="M68.36,64.15a4.44,4.44,0,0,1,.92-.65l.09,0h0l0,0h-.28a1.32,1.32,0,0,0-.28,0,4.71,4.71,0,0,0-1,.3,1.18,1.18,0,0,1-.36.09c-.09,0-.14,0-.13,0s0,0,.13,0a1.25,1.25,0,0,0,.31-.14,4,4,0,0,1,1-.41,1.15,1.15,0,0,1,.31,0h.33a1.65,1.65,0,0,1,.74.05.19.19,0,0,1,0,.3l-.2.09-.3.09-.17.06-.12,0a5.36,5.36,0,0,0-.91.55.64.64,0,0,1-1-.1.63.63,0,0,1-.18-.34c0-.12.1-.13.1-.12a.15.15,0,0,0,0,.11.7.7,0,0,0,.2.26.8.8,0,0,0,.38.23A.82.82,0,0,0,68.36,64.15Z"/>
-                    <path class="cls-20"
-                          d="M69.26,47.68a4.48,4.48,0,0,1-.78.28,8,8,0,0,1-2,.27A6.46,6.46,0,0,0,67.83,48a12.74,12.74,0,0,1,1.4-.35.11.11,0,0,0,0,.07Z"/>
-                    <path class="cls-20"
-                          d="M66.51,48.79a1.56,1.56,0,0,1-.19-.14v0h.09a6.24,6.24,0,0,0,.82-.17h0a.26.26,0,0,0,0,.15.73.73,0,0,0,.26.2,1.32,1.32,0,0,0,1,.09,1.53,1.53,0,0,0,.79-.36,2.4,2.4,0,0,0,.26-.18s.13-.12.13-.22v-.08a1.59,1.59,0,0,0-.19-.16l.15,0L70,48c.11,0,.23,0,.36,0a1.8,1.8,0,0,1-.54.41c-.37.13-.62.37-.56.53a.08.08,0,0,0,0,0,6.28,6.28,0,0,1-.66.23,2.65,2.65,0,0,1-1.18,0,2.6,2.6,0,0,1-.47-.16A3.7,3.7,0,0,1,66.51,48.79Z"/>
-                    <path class="cls-20"
-                          d="M66.32,48.63c0-.06-.22-.15-.22-.2a2,2,0,0,1,.59,0,5.19,5.19,0,0,1,.48-.24l.29.1H67.4l-.09,0a.2.2,0,0,0-.08.08,6.24,6.24,0,0,1-.82.17Z"/>
-                    <path class="cls-20"
-                          d="M66.26,42.61s-.08,0-.16,0,.11-.54.38-.34.4.48.11.48l-.68,0s0,0,0,0a1.43,1.43,0,0,1,.28,0l.3,0a.23.23,0,0,0,.1,0s0,0,0-.06a2.23,2.23,0,0,0-.2-.18c-.08,0,0,0-.07,0A.61.61,0,0,0,66.26,42.61Z"/>
-                    <path class="cls-20"
-                          d="M66.1,42.6c.08,0,.16,0,.16,0a.61.61,0,0,1,.09-.22s0,0,.07,0a2.23,2.23,0,0,1,.2.18s0,0,0,.06a.23.23,0,0,1-.1,0l-.3,0a1.43,1.43,0,0,0-.28,0Z"/>
-                    <path class="cls-20"
-                          d="M65.93,51.85a2.07,2.07,0,0,1-.15-.34s0-.07,0-.09l.09,0,.16,0a4.87,4.87,0,0,1,.72-.13l.6-.11.51-.09a2.22,2.22,0,0,0,1.25-.69,2.55,2.55,0,0,0,.18-.28,1.42,1.42,0,0,0,.19-.52v0h0l.42,1.11a3.23,3.23,0,0,1-.27.23,3.36,3.36,0,0,1-1.66.6l-1.08.1-.47,0-.13,0s-.11,0-.07,0a1.34,1.34,0,0,0,.12.24,1.54,1.54,0,0,0,.36.36,2.64,2.64,0,0,0,1.53.43,3.75,3.75,0,0,0,1.47-.4,3.19,3.19,0,0,0,.67-.41c.12.3.24.62.35.93-.21.06-.48.12-.84.19a6.2,6.2,0,0,1-1.72.12A3.44,3.44,0,0,1,67,52.8a2.93,2.93,0,0,1-.59-.35A2.3,2.3,0,0,1,65.93,51.85Z"/>
-                    <path class="cls-20"
-                          d="M65.93,42.79l0,0,.68,0c.29,0,.15-.28-.11-.48s-.38.34-.38.34-.16-.05-.16-.07a.9.9,0,0,1,.18-.34.3.3,0,0,1,.23-.11h0a.41.41,0,0,1,.24.1,1,1,0,0,1,.26.37.22.22,0,0,1-.09.25.43.43,0,0,1-.23,0l-.32,0Z"/>
-                    <path class="cls-20"
-                          d="M65.79,45.53a1.65,1.65,0,0,1,.26-.36s0-.08-.08-.14a1.14,1.14,0,0,1,.38.22.47.47,0,0,1,.15.36.43.43,0,0,1-.33.27c-.16,0-.35,0-.39,0A.27.27,0,0,1,65.79,45.53Z"/>
-                    <path class="cls-20"
-                          d="M65.79,45.53a.27.27,0,0,0,0,.32c0,.07.23.08.39,0a.43.43,0,0,0,.33-.27.47.47,0,0,0-.15-.36A1.14,1.14,0,0,0,66,45c.06.06.1.12.08.14A1.65,1.65,0,0,0,65.79,45.53Zm-.11.4c-.24-.26,0-.64.27-.91a.74.74,0,0,1,.63.46C66.73,45.91,65.92,46.2,65.68,45.93Z"/>
-                    <path class="cls-20"
-                          d="M65.57,46a.58.58,0,0,1-.07-.61,1.86,1.86,0,0,1,.3-.45s.09,0,.15.06c-.22.27-.51.65-.27.91s1,0,.9-.45A.74.74,0,0,0,66,45a.6.6,0,0,1,.48.13.61.61,0,0,1,.26.49.64.64,0,0,1-.44.46A.62.62,0,0,1,65.57,46Z"/>
-                    <path class="cls-20"
-                          d="M65.42,75.37l.63-.61s0,0,.1.17l-.32.32-.28.25v-.07c0-.05,0,0,0-.05S65.42,75.36,65.42,75.37Z"/>
-                    <path class="cls-20" d="M65.85,33.64a3.88,3.88,0,0,1-.65.15l.06,0,.76-.27Z"/>
-                    <path class="cls-20"
-                          d="M65.22,75.66a10.11,10.11,0,0,1,1.16-2c.29-.48.55-1,.74-1.38l.32-.69s.16-.27.37-.65.31-.55.48-.87h0l.16-.22c.46-.57.9-1.15,1.29-1.72a15.52,15.52,0,0,1-.53,1.7c-.2.55-.42,1.1-.59,1.52l-.31.71s-.16.29-.41.67a11.85,11.85,0,0,1-1,1.35c-.27.32-.54.61-.79.86-.07-.13-.1-.16-.1-.17l-.63.61s.06,0,.08,0,0,0,0,.05v.07C65.37,75.65,65.24,75.73,65.22,75.66Z"/>
-                    <path class="cls-20"
-                          d="M65.15,54.56c.47.13.94.28,1.29.36s.7.13,1,.17l1,.09a3.82,3.82,0,0,0,1.73-.24,2.6,2.6,0,0,0,1-.68.58.58,0,0,0,.08-.1c.09.23.17.46.25.68a3.23,3.23,0,0,1-1.07.67,4.34,4.34,0,0,1-2,.22,10.49,10.49,0,0,1-1.08-.12l-.19,0-.16,0-.08,0,0,.05.13.13.08.06.24.17c.17.12.35.22.52.33a5.17,5.17,0,0,0,2.1.68,11.22,11.22,0,0,0,1.62.08,4.73,4.73,0,0,1,.62,0h0a5.76,5.76,0,0,1-2.27.19,5.19,5.19,0,0,1-2.25-.6,6.32,6.32,0,0,1-.56-.33l-.3-.18c-.14-.11-.29-.21-.42-.32a8.09,8.09,0,0,1-.75-.64l-.35-.32,0,0,0,0,0,0Z"/>
-                    <path class="cls-20"
-                          d="M65.1,82.1c0-.15,0-.37,0-.69,0-.6,0-1.52.08-2.83a25.11,25.11,0,0,1,.33-2.81,1.48,1.48,0,0,0,0-.27l.28-.25.32-.32a.73.73,0,0,1,0,.12.8.8,0,0,1,0,.44,2.9,2.9,0,0,1-.16.41,7,7,0,0,0-.65,2.7,9.38,9.38,0,0,0,.25,2.79,2.5,2.5,0,0,0,.2.57c-.39.06-.59.13-.61.09s0,0,.06,0a.25.25,0,0,0,.13,0h0l-.32.06h0V82.1Z"/>
-                    <path class="cls-20"
-                          d="M65,2.81c.09-.9.17-1.29.17-1.29l.1-1.1.43,0,.65.05a2.59,2.59,0,0,0,.28,0h.31L68.16.37l.08.64L68,2A.28.28,0,0,1,68,2s0,.07,0,.09,0,0,.11,0a1.94,1.94,0,0,1,.46.33c-.43.08-.87.18-1.32.25a3,3,0,0,1-.43.06l-.46,0h-.76Z"/>
-                    <path class="cls-20"
-                          d="M65,34a2.23,2.23,0,0,1-.89,0,6.6,6.6,0,0,0,.84-.16h0l.27-.05A1.88,1.88,0,0,1,65,34Z"/>
-                    <path class="cls-20" d="M64.36,42.92a.25.25,0,0,1,0,.09.08.08,0,0,1,0,0l-.08.05v0l.17-.18Z"/>
-                    <path class="cls-20"
-                          d="M64.47,6.11c-.07-1.52-.17-2.6-.26-3.32h0l.74,0c-.09,1-.19,2.51-.18,4.74,0,0,0-.24-.09-.46S64.56,6.42,64.47,6.11Z"/>
-                    <path class="cls-20"
-                          d="M64.19,43.08c0-.19-.09-.36-.15-.55a.29.29,0,0,1,.28.48.25.25,0,0,0,0-.09v0Z"/>
-                    <path class="cls-20" d="M64.28,43.05a.2.2,0,0,1-.15.07l.07,0Z"/>
-                    <path class="cls-20" d="M64.19,43.08v0h0Z"/>
-                    <path class="cls-20" d="M64.21,2.79A11.32,11.32,0,0,0,64,1.53h1.17s-.08.39-.17,1.29l-.74,0Z"/>
-                    <path class="cls-20"
-                          d="M63.8,42.74l0-.06a.31.31,0,0,1,.15-.12l.05,0h0c.06.19.1.36.15.55l0,0h0l-.07,0h0a.28.28,0,0,1-.33-.35Z"/>
-                    <path class="cls-20" d="M64,42.56a.31.31,0,0,0-.15.12.25.25,0,0,1,.18-.14h0Z"/>
-                    <path class="cls-20" d="M64.28,46.85a.3.3,0,0,1-.44-.37Z"/>
-                    <path class="cls-20" d="M63.92,46.38a.3.3,0,0,1,.42.42l0,0,0,0-.44-.37a.19.19,0,0,1,.06-.07Z"/>
-                    <path class="cls-20"
-                          d="M63.54,24.54h.29l.29.18a5.29,5.29,0,0,1,1.67,2.12l.39.8c.34.73.43,1,.86,2.07,0,.05,0,.11,0,.15v.21a22.94,22.94,0,0,0-1.45-3.34l-.09-.15-.24-.45L65.17,26a4.33,4.33,0,0,0-.85-1A6.68,6.68,0,0,0,63.54,24.54Z"/>
-                    <path class="cls-20" d="M64.13,43.12c-.26.1-.4-.17-.33-.38v0A.28.28,0,0,0,64.13,43.12Z"/>
-                    <path class="cls-20"
-                          d="M70.72,83.58h0Zm-8-10.71c0-.22,0-.42-.05-.57.32,0,.65-.06,1-.12,0,.16,0,.36,0,.61,0,.62.12,1.49.2,2.56,0,.53.09,1.11.14,1.73l.09.84c0,.14.05.21.07.3l0,.24c0,.17.08.34.11.5.22,1,.44,2.16.67,3.24h0l.18.87,1.49.82,2.42,0a2.26,2.26,0,0,0,1.07-.11,1,1,0,0,0,.36-.3l.09-.11a0,0,0,0,0,0,0,.28.28,0,0,1,0,.11h0l.27.19c.09-.1,0-.36-.13-.59a.35.35,0,0,1,.05-.08l.29-.49.09-.15,0,.08.3-.14a1.31,1.31,0,0,0-.17-.23L71.27,82a1.18,1.18,0,0,0-.32-.66.72.72,0,0,0-.73-.28,7.83,7.83,0,0,0-.86.38,9.26,9.26,0,0,1-1.63.62,5.7,5.7,0,0,1-1.35,0c-.36,0-.64,0-.84,0h-.09l.21,0,.15,0h.09V82h0l.48-.06a6,6,0,0,0,1.28-.11,9.28,9.28,0,0,0,1.53-.68,6.59,6.59,0,0,1,.92-.45,1.08,1.08,0,0,1,.64,0,1.4,1.4,0,0,1,.52.33,1.76,1.76,0,0,1,.53,1.14.67.67,0,0,1,0,.39c-.06.12-.09.2-.14.29s-.19.35-.29.52-.21.35-.34.53a1.52,1.52,0,0,1-.55.48,3,3,0,0,1-1.34.21l-2.58,0-2-1c-.35-1.53-.69-3-1-4.43-.08-.31-.15-.62-.23-.92a1.12,1.12,0,0,1,0-.21l0-.13,0-.24c0-.16,0-.32-.06-.48-.06-.62-.12-1.2-.17-1.74C62.88,74.36,62.79,73.48,62.74,72.87Z"/>
-                    <path class="cls-20"
-                          d="M63.36,46.07c-.12-.1-.23-.21-.35-.3a11.07,11.07,0,0,1,1.34-.62c.44-.12.75-.09.75,0s-.29.11-.66.29S63.76,45.81,63.36,46.07Z"/>
-                    <path class="cls-20"
-                          d="M63.6,103.49c.15-.25.35-.62.6-1s.51-.93.76-1.47a5.53,5.53,0,0,0,.33-.85,5,5,0,0,0,.17-.92,3.56,3.56,0,0,0-.12-1.79,4.35,4.35,0,0,0-.91-1.32,2.7,2.7,0,0,0-.75-.57,1.31,1.31,0,0,0,.27-.06,2.77,2.77,0,0,1,.66.45,4.13,4.13,0,0,1,1.06,1.35,4,4,0,0,1,.26,2,9.76,9.76,0,0,1-.14,1,6.81,6.81,0,0,1-.33.93c-.24.57-.5,1.09-.73,1.54s-.37.7-.5,1c-.26,0-.51.07-.77.09A2.4,2.4,0,0,0,63.6,103.49Z"/>
-                    <path class="cls-20"
-                          d="M63.59,104.25c-.17-.07-.27-.21-.22-.32a.65.65,0,0,0,.09-.16c.26,0,.51,0,.77-.09l-.06.12-.2.41C63.93,104.3,63.76,104.31,63.59,104.25Z"/>
-                    <path class="cls-20"
-                          d="M64.23,47.57a15.8,15.8,0,0,1-1.3-1.22l.17-.11.26-.17.48.41a.3.3,0,0,0,.44.37l.3.22a2.59,2.59,0,0,0,.57.27l.26.09a4.17,4.17,0,0,0,.92.19,7.45,7.45,0,0,0,2-.12,3.88,3.88,0,0,0,1.82-.81c.43-.35.62-.71.68-.65a.68.68,0,0,1-.1.25,2.24,2.24,0,0,1-.41.58,2.7,2.7,0,0,1-.53.46h0l-.08,0h0v-.11h-.15l-.09,0h0l-.09.06a.31.31,0,0,0-.13.25v.06a12.74,12.74,0,0,0-1.4.35,6.46,6.46,0,0,1-1.37.28h-.17a4,4,0,0,1-1.07-.17A3.79,3.79,0,0,1,64.23,47.57Z"/>
-                    <path class="cls-20"
-                          d="M62.69,72.3c0-.26,0-.4,0-.44h.57l.37,0h0v0a1.23,1.23,0,0,0,0,.17v.09C63.34,72.24,63,72.27,62.69,72.3Z"/>
-                    <path class="cls-20" d="M62.58,46l.29-.15.14-.07c.12.09.23.2.35.3l-.26.17-.17.11-.28-.29Z"/>
-                    <path class="cls-20"
-                          d="M63.09,95.46s.13-.16.44-.13a1.26,1.26,0,0,1,.42.13,1.31,1.31,0,0,1-.27.06l-.17-.06A.8.8,0,0,0,63.09,95.46Z"/>
-                    <path class="cls-20"
-                          d="M62.26,2.86l-.17-.16.94,0a13.83,13.83,0,0,1,1.44,3.38c0,.45,0,.94,0,1.47,0-.06,0-.24-.09-.43A8.5,8.5,0,0,0,62.26,2.86Z"/>
-                    <path class="cls-20" d="M62.58,46l-1-1.08.35-.12,1.07.94s0,0,0,0l-.14.07Z"/>
-                    <path class="cls-20"
-                          d="M64,63.47l.28,0h0a.3.3,0,0,1,0-.11s0,0,0,0a.45.45,0,0,1-.06-.09s0,0,0,0l-.13.08Zm-1.18.2a.82.82,0,0,1,.52-.47,3.31,3.31,0,0,1,.68,0,2.66,2.66,0,0,1,.31,0,.29.29,0,0,1,.15,0,.18.18,0,0,1,.06.23c0,.07-.06.06-.09.08l0,0a.1.1,0,0,0-.08,0,1.63,1.63,0,0,1-.62.28,2.44,2.44,0,0,1-.94.07S62.76,63.84,62.83,63.67Zm0,.28a0,0,0,0,0,0,0h0c.11,0,.49-.14.85-.26a1.07,1.07,0,0,0,.35-.2,3.94,3.94,0,0,0-.6,0c-.35,0-.53.41-.6.5h0S62.79,63.94,62.79,64Z"/>
-                    <path class="cls-20"
-                          d="M62.2,34.09h.47l.55,0,.5,0h.05l-.05.06c-.35,0-.71,0-1.06.07a.26.26,0,0,0-.17.07A2.64,2.64,0,0,1,62.2,34.09Z"/>
-                    <path class="cls-20" d="M61.63,47.2l-.73-.29.54-.3c.31-.18.72-.39,1.14-.62l.07.07.28.29Z"/>
-                    <path class="cls-20" d="M62.43,72.32c0-.29.08-.45.11-.45s.07.16.08.44Z"/>
-                    <path class="cls-20"
-                          d="M62.78,2.34A7.83,7.83,0,0,0,62,1.39l-.26-.28.16-1c.41,0,1.32.13,2.5.27l.83.08-.1,1.1H64a11.32,11.32,0,0,1,.22,1.26L63,2.73Z"/>
-                    <path class="cls-20"
-                          d="M61.6,77.87l0-.27c.21-1.44.42-2.87.58-3.94.08-.56.15-1,.2-1.34h.19c0,.91-.08,3.14-.28,5.39l0,.27v.08a.92.92,0,0,1-.06.22h0s0,0,0,0h0a0,0,0,0,0,0,0h0s0,0,0,0l0,0h0l0,0a.75.75,0,0,1-.09-.09h0l0,0,0,0,0,0H61.8a.66.66,0,0,0-.16-.15l0,0,0,0,0,.07h0Z"/>
-                    <path class="cls-20"
-                          d="M61.41,2.21l-.3-.14.66-1,.26.28a7.83,7.83,0,0,1,.75,1l.25.39-.94,0A3.67,3.67,0,0,0,61.41,2.21Z"/>
-                    <path class="cls-20"
-                          d="M61.9,44.79l-.48-.4,1-.28c.25-.06.5-.12.74-.16a15.2,15.2,0,0,1,2.28-.37c.07,0,.11,0,.11,0s-1.51.48-3,1Z"/>
-                    <path class="cls-20"
-                          d="M64.36,48.6a16.2,16.2,0,0,1-3.42-1,.67.67,0,0,0,.17-.1l.52-.35a14.41,14.41,0,0,0,2.81.9,9.52,9.52,0,0,0,1.93.13h.09a8,8,0,0,0,2-.27,4.48,4.48,0,0,0,.78-.28v0a8.75,8.75,0,0,1-1.34.5c-.21.08-.44.17-.7.25a.2.2,0,0,1,.08-.08l.09,0h.06l-.29-.1a5.19,5.19,0,0,0-.48.24,2,2,0,0,0-.59,0s.18.14.22.2A9.28,9.28,0,0,1,64.36,48.6Z"/>
-                    <path class="cls-20"
-                          d="M61.38,67.49a1.22,1.22,0,0,1,.36-1,1,1,0,0,1,.78-.31l.37,0a3.49,3.49,0,0,1,.52.13c.1,0,.23.15.22.28a.39.39,0,0,1-.1.19l-.09.1a2.68,2.68,0,0,1-.42.31,1.18,1.18,0,0,1-.77,0s.34-.07.68-.21c.1-.09.24-.22.34-.33l.06-.08v0l-.05,0a2.34,2.34,0,0,0-.45-.07l-.35-.06a.73.73,0,0,0-.59.17A2.13,2.13,0,0,0,61.38,67.49Z"/>
-                    <path class="cls-20" d="M61.55,44.91l-.35-.38-.06-.07.28-.07.48.4Z"/>
-                    <path class="cls-20" d="M61.14,44.46a6.65,6.65,0,0,1-.58-.66c0-.06.39.19.86.59Z"/>
-                    <path class="cls-20" d="M60.21,47.4l.37-.28.18-.12.14-.09.73.29-.52.35a.67.67,0,0,1-.17.1Z"/>
-                    <path class="cls-20"
-                          d="M59.77,82.57c.12-.31.29-.75.48-1.27l.69-1.76.39-1,.21-.51,0-.09s0,0,0,0,0,.12.07.11,0-.11.07-.08h.12l0,0,0,0,0,0h0a.75.75,0,0,0,.09.09l0,0h0l0,0s0,0,0,0h0a0,0,0,0,1,0,0h0l-.18.5c-.11.34-.22.68-.34,1l-.59,1.79c-.18.52-.32,1-.43,1.28l0,0c-.18,0-.51.09-.51.1h-.51a.19.19,0,0,1,0-.08s0,0,0-.06l0-.07v0C59.71,82.72,59.74,82.65,59.77,82.57Z"/>
-                    <path class="cls-20"
-                          d="M59.25,69.32c.06.09,0,0,0,0S59.24,69.31,59.25,69.32Zm0,.09-.1,0s0,0,0,0,0,0,0,0,0,0,0,0a.42.42,0,0,0-.06-.08s-.11-.06,0-.06a.62.62,0,0,0,.18,0,1.17,1.17,0,0,0,.46-.07s0,0,0,0,0,0,0,0a.88.88,0,0,0-.28-.12c-.08,0-.14,0-.15,0s.25-.19.56,0c.09,0,.2.11.22.2a.25.25,0,0,1-.07.24.58.58,0,0,1-.25.12l-.19,0A1.16,1.16,0,0,1,59.27,69.41Z"/>
-                    <path class="cls-20"
-                          d="M59.54,47.17c-.55-.18-1.11-.35-1.69-.52h0l.44-.3.4-.24h0l1.06.37,1.12.44-.14.09-.18.12-.37.28Z"/>
-                    <path class="cls-20"
-                          d="M59.23,48.92a17.23,17.23,0,0,1-1.8,1.48h0a8.94,8.94,0,0,1,1.49-1.81c.42-.42.85-.83,1.21-1.12a.47.47,0,0,1,.09-.06l.73.25-.45.3A15.49,15.49,0,0,0,59.23,48.92Z"/>
-                    <path class="cls-20"
-                          d="M58.4,45.58a9.83,9.83,0,0,1,1-.5s.41-.17,1-.37l.8-.25.06.07.35.38c-.37.13-.71.26-1,.38-.55.21-.91.38-.93.39s-.4.16-.9.42c-.24-.08-.48-.17-.73-.24C58.14,45.77,58.27,45.67,58.4,45.58Z"/>
-                    <path class="cls-20" d="M57.85,46.65l-.65-.18.35-.27.43-.33h0c.25.07.49.16.73.24h0l-.4.24-.44.3Z"/>
-                    <path class="cls-20" d="M56.76,71.51l.12-.28c.07.12.16.26.25.43C57,71.62,56.88,71.56,56.76,71.51Z"/>
-                    <path class="cls-20"
-                          d="M57.4,73.87c-.25-.87-.52-1.73-.67-2.29h0l0-.07c.12,0,.24.11.37.15.27.51.62,1.24.93,2s.58,1.42.76,2a9,9,0,0,1,.29,1,24.29,24.29,0,0,1,.13,3.15,9.73,9.73,0,0,1-.25,3,.13.13,0,0,0,0-.06s.11-.25-.11-.2c-.1-.49-.21-1.59-.34-2.71-.09-.75-.18-1.51-.25-2.07,0-.28-.08-.51-.11-.68s0-.25,0-.26,0-.38-.19-.93S57.61,74.59,57.4,73.87Z"/>
-                    <path class="cls-20" d="M56.7,71.48c-.08-.32-.12-.52-.09-.54s.14.09.27.29l-.12.28Z"/>
-                    <path class="cls-20"
-                          d="M56.13.22C57,.12,57.75.06,58.46,0c.94,0,1.74,0,2.31,0l.93,0,.23,0-.16,1-.66,1,.3.14a3.67,3.67,0,0,1,.68.49l-.57,0-.9-.08c-.52,0-1.27-.11-2.15-.13l-1,0c-.1-.29-.19-.54-.29-.77s-.12-.25-.18-.36a1.29,1.29,0,0,0-.3-.35l-.33-.3L56.16.44Z"/>
-                    <path class="cls-20"
-                          d="M56.26,1.74h0Zm-.48-.2L55.5,1.4l.66-1,.25.22.33.3a1.29,1.29,0,0,1,.3.35c.06.11.13.24.18.36s.19.48.29.77h-.82A3.89,3.89,0,0,0,56.44,2l-.17-.23h0s0,0,0,0h0l-.06,0Z"/>
-                    <path class="cls-20" d="M56.26,1.73h0Z"/>
-                    <path class="cls-20"
-                          d="M55.72,86.44c-.1-.15.71-.92.79-.71l-.28.37c-.19.22-.19.36-.18.38a.23.23,0,0,0,0,.12.85.85,0,0,0,.09.29c0,.08.1.17.14.24s0,0-.22,0a.68.68,0,0,1-.12-.12A.82.82,0,0,1,55.72,86.44Z"/>
-                    <path class="cls-20"
-                          d="M56.7,71.48a11.29,11.29,0,0,1-1.09-.57,3.26,3.26,0,0,0,.11-.33L57,71a1.52,1.52,0,0,0-.07.18s0,0,0,0c-.13-.2-.22-.31-.27-.29S56.62,71.16,56.7,71.48Z"/>
-                    <path class="cls-20"
-                          d="M55.54,62.68s0,.07,0,.07,0,0-.1,0,0-.08,0-.09l.07,0,.14,0c.21,0,.47,0,.73-.08a2.69,2.69,0,0,1,.78-.06,1.59,1.59,0,0,1,.3.06.37.37,0,0,1,.16.1.2.2,0,0,1,.07.15.23.23,0,0,1,0,.17.7.7,0,0,1-.17.14l-.27.21a.92.92,0,0,1-.42.2.82.82,0,0,1-.44-.11l-.31-.14c-.18-.1-.3-.16-.29-.18s.14,0,.33.05l.34.1a.72.72,0,0,0,.34.05c.18,0,.36-.29.53-.42s0,0,0,0h0l-.19,0a2.74,2.74,0,0,0-.71,0,4.44,4.44,0,0,1-.75,0Z"/>
-                    <path class="cls-20"
-                          d="M55.22,84.56a2.87,2.87,0,0,1,.79-.34c.77-.46,1.2-.77,2-1.3l.57-.29.28-.11c0,.17.06.27.09.27a12,12,0,0,1-1.75,1.15s-1.93.78-2,.62Z"/>
-                    <path class="cls-20"
-                          d="M55.18,95.46s.16,0,.37.14l.08.05-.17,0a.38.38,0,0,0-.1,0C55.26,95.51,55.18,95.47,55.18,95.46Z"/>
-                    <path class="cls-20"
-                          d="M54.85,85.94a1.91,1.91,0,0,0-.22.4l-.07.13a1.12,1.12,0,0,0-.07.29.45.45,0,0,0,0,.16h0s-.07,0-.1,0l-.12-.16a1,1,0,0,1,.08-.53,1.62,1.62,0,0,1,.1-.15,1.1,1.1,0,0,1,.26-.27c.21-.18.48-.25.49-.2S55,85.75,54.85,85.94Z"/>
-                    <path class="cls-20"
-                          d="M54.21,48.94a17.91,17.91,0,0,1,2.42-2l.57-.44.65.18-1,.64A20.84,20.84,0,0,1,54.21,48.94Z"/>
-                    <path class="cls-20"
-                          d="M53.91,69l.15-.25a.23.23,0,0,0,.18,0l.23.18h0a.42.42,0,0,1-.28.1A.57.57,0,0,1,53.91,69Z"/>
-                    <path class="cls-20"
-                          d="M54,87.35c-.18-.29-.37-.59-.55-.86v-.23s0-.12,0-.16l.06-.31a2.37,2.37,0,0,1,.18-.55,1.34,1.34,0,0,1,.68-.72,1.55,1.55,0,0,1,.81,0h0a.92.92,0,0,0-.69.19,1,1,0,0,0-.45.63,2.25,2.25,0,0,0-.11.48,2.45,2.45,0,0,0,0,.27v.21l.29.39a.06.06,0,0,0,0,0c0,.3.27.48.3.45s0-.15-.06-.3l.18,0,.45.07.92.12c.14.14.29.22.32.19s0-.09-.1-.19h0l0,0,.09-.08.18-.16L58,85.68l1.12-.94.51-1.63s0,0,0-.14v0a.19.19,0,0,0,0,.08h.86l.12,0h0v0h0v0h0l0,.08v0a1.43,1.43,0,0,1,0,.17l-.18.52-.49,1.36c-.79.59-1.79,1.36-2.82,2.15l-.43.33a.25.25,0,0,1-.08,0h0l-.09,0h-.07l-.13,0a1.43,1.43,0,0,1-.29,0c-.32,0-.63-.12-.93-.18l-.45-.1-.24-.06-.17,0S54.05,87.41,54,87.35Z"/>
-                    <path class="cls-20"
-                          d="M53.76,103.17l-.7-.13A11,11,0,0,1,54,102a8.63,8.63,0,0,0,1.71-2.48A5.15,5.15,0,0,0,56,96.53a1.75,1.75,0,0,0-.59-.93.38.38,0,0,1,.1,0l.17,0a1.8,1.8,0,0,1,.56.8,5.16,5.16,0,0,1-.08,3.17,9,9,0,0,1-1.68,2.72c-.28.34-.51.6-.65.8C53.78,103.16,53.77,103.17,53.76,103.17Z"/>
-                    <path class="cls-20"
-                          d="M50.81,43.3c.88-.31,1.75-.56,2.44-.74s1.36-.29,1.39-.3.59-.09,1.41-.14a18.94,18.94,0,0,1,3,.06,17.42,17.42,0,0,1,2.26.38l.62.15a4.16,4.16,0,0,1,1.24.48s0,0,0,0-.59-.12-1.26-.23A21.45,21.45,0,0,0,59,42.65a20.34,20.34,0,0,0-2.89.07c-.8.09-1.33.17-1.36.19s-.57.06-1.35.24c-.54.11-1.2.27-1.9.46Z"/>
-                    <path class="cls-20"
-                          d="M53.36,68c.18-.12.21-.21.21-.24l-.06-.19.21,0h.84a.17.17,0,0,1,.18.12A1.55,1.55,0,0,1,54.48,69h0l-.23-.18,0,0a1.4,1.4,0,0,0,.21-.91c-.17,0-.47,0-.65,0a.67.67,0,0,1-.27.33Z"/>
-                    <path class="cls-20" d="M53.57,68.18l-.08.06L53.32,68l0,0Z"/>
-                    <path class="cls-20"
-                          d="M53,103.12a.59.59,0,0,1,.05-.08l.7.13-.19.29c0,.07-.2.05-.36,0S53,103.21,53,103.12Z"/>
-                    <path class="cls-20"
-                          d="M52.49,30.69c0-.11,0-.19,0-.29s.09-.36.13-.54c.11-.35.24-.7.38-1a11.22,11.22,0,0,1,2.58-3.54,11,11,0,0,1,1.67-1.37,6.51,6.51,0,0,1,1.94-1,4.91,4.91,0,0,1,2.12-.1,7.73,7.73,0,0,1,1.87.6,10.16,10.16,0,0,1,1.62.87A5.34,5.34,0,0,1,66,25.61a10.8,10.8,0,0,1,1.14,2.52,16.49,16.49,0,0,1,.59,2.52,3.9,3.9,0,0,1-.18,2s0-.75,0-.76a17.77,17.77,0,0,0-.48-1.77v-.21s0-.1,0-.15c-.43-1.11-.52-1.34-.86-2.07l-.39-.8a5.29,5.29,0,0,0-1.67-2.12l-.29-.18h-.29l-.65-.32a5,5,0,0,0-3.45-.5,8.45,8.45,0,0,0-3.31,2.09,10.62,10.62,0,0,0-2.48,3.28,6.91,6.91,0,0,0-.37.95c-.05.16-.09.32-.13.48l0,.24,0,.09.28.22.41.32.85.6h0a9.23,9.23,0,0,0,2.41,1.09,22.51,22.51,0,0,0,2.47.64,15.88,15.88,0,0,0,2.67.36,2.64,2.64,0,0,0,.29.15.26.26,0,0,1,.17-.07c.35,0,.71-.06,1.06-.07l.05-.06h.16l.14,0A2.23,2.23,0,0,0,65,34a1.88,1.88,0,0,0,.24-.18,3.88,3.88,0,0,0,.65-.15l.17-.16c.23-.1.44-.2.62-.3a9.45,9.45,0,0,0,.92-.58s-.23.33-.85.72a7.36,7.36,0,0,1-2.83,1,12.77,12.77,0,0,1-4.43-.18,23.55,23.55,0,0,1-2.54-.58,9.39,9.39,0,0,1-2.61-1.13h0l-.86-.58L53,31.55l-.21-.16-.34-.27C52.46,31,52.48,30.83,52.49,30.69Z"/>
-                    <path class="cls-20"
-                          d="M52.42,47.22a6.31,6.31,0,0,0-.48-.84l.52-1a.82.82,0,0,1,.21.19,1.35,1.35,0,0,1,.17.34,2.81,2.81,0,0,1,.08.31C52.78,46.47,52.61,46.81,52.42,47.22Z"/>
-                    <path class="cls-20"
-                          d="M52.33,68.31a.74.74,0,0,0,.12-.6A9.85,9.85,0,0,1,52,66.3l.13-.07a7,7,0,0,0,1.1,1.61l.14.13,0,0,.17.24.08-.06c.21.21.44.41.67.61a.23.23,0,0,1-.18,0l-.15.25a.57.57,0,0,0,.28.08.42.42,0,0,0,.28-.1l.61.47a10.13,10.13,0,0,0,4.36,2,13.65,13.65,0,0,0,2.4.12,16.42,16.42,0,0,0,2.35-.22A5.89,5.89,0,0,0,68,69.45a27.21,27.21,0,0,0,2.4-3.28,15.19,15.19,0,0,0,2.22-5.6c.23-1.45.13-2.3.2-2.3a2.49,2.49,0,0,1,.09.6,2.06,2.06,0,0,1,0,.26c0,.15,0,.3,0,.48a6.06,6.06,0,0,1-.06,1,4.65,4.65,0,0,1-.08.61h-.14s0,0,.13.06a15.6,15.6,0,0,1-2,5.15c-.32.55-.67,1.11-1.07,1.68.09-.34.12-.56.06-.58s-.67,1-1.22,2l-.29.52h0a4.94,4.94,0,0,1-1.66,1.26,9.17,9.17,0,0,1-2.31.74l-.66.11v-.09a1.23,1.23,0,0,1,0-.17v0h0l-.37,0h-.57s0,.18,0,.44h-.07c0-.28,0-.43-.08-.44s-.06.16-.11.45a5.44,5.44,0,0,1-.57,0,14.65,14.65,0,0,1-2.55-.07,8.75,8.75,0,0,1-2.18-.62c-.09-.17-.18-.31-.25-.43s0,0,0,0A1.52,1.52,0,0,1,57,71l-1.24-.45a3.26,3.26,0,0,1-.11.33c-.37-.22-.73-.46-1.08-.71a16.79,16.79,0,0,1-2-1.68Z"/>
-                    <path class="cls-20" d="M52.07,45l.11-.23,1.18.58-.07.14c-.27-.09-.47-.18-.7-.28Z"/>
-                    <path class="cls-20"
-                          d="M51.43,70.37a2.09,2.09,0,0,1-.29-.32l0-.12v0A7,7,0,0,0,52,68.85l0,.11a.66.66,0,0,0,.24.45.48.48,0,0,0,0,.13l.28.46c.21.34.45.64.4.81s-.57.12-1-.1A4.77,4.77,0,0,1,51.43,70.37Z"/>
-                    <path class="cls-20"
-                          d="M51.49,67.16c.41-.68.45-1,.5-.86a9.85,9.85,0,0,0,.46,1.41.74.74,0,0,1-.12.6A7.68,7.68,0,0,1,51.49,67.16Z"/>
-                    <path class="cls-20"
-                          d="M54.34,4.36a11.85,11.85,0,0,0-2.57-.83l-.55-.1.28-.12.4-.16L52.27,3l.11,0a19.19,19.19,0,0,1,2.06.95,13.77,13.77,0,0,1,1.62,1l.88.65L57.4,6l.35.28.15.13c.3.25.55.51.58.54s0-.05,0-.13l-.09-.27a2.94,2.94,0,0,0-.12-.31c-.23-.64-.65-1.76-1-2.46a12.09,12.09,0,0,0-.61-1.28h.82c.12.33.24.71.37,1.13.26.88.58,1.93.95,3.18a1.15,1.15,0,0,0,0,.3,1.22,1.22,0,0,0,0,.26c0,.08.07.27,0,.11a2.37,2.37,0,0,0-.74-.52l-.25-.23c-.2-.17-.39-.32-.58-.46l-.45-.34-.86-.6A11.57,11.57,0,0,0,54.34,4.36Z"/>
-                    <path class="cls-20"
-                          d="M51.23,44.61,50,44.06l.61-.19.92-.26.15.07,1.33.59.64.28c.19.07.44.13.67.2,1.25.35,2.51.72,3.71,1.11h0l-.43.33-.35.27c-1-.28-2.09-.55-3.16-.82-.24-.06-.47-.11-.74-.2h0l.07-.14-1.18-.58-.11.23C51.79,44.84,51.52,44.72,51.23,44.61Z"/>
-                    <path class="cls-20"
-                          d="M51.62,64.7a.76.76,0,0,1-.21-.1c0-.15-.11-.29-.15-.43l.06,0a1.51,1.51,0,0,0,.41.18.48.48,0,0,1,.18.11.45.45,0,0,1,.17.41.37.37,0,0,1-.27.31.24.24,0,0,1-.14,0,.08.08,0,0,1,0,0c.06-.06.23-.15.2-.29a.23.23,0,0,0-.13-.16A.26.26,0,0,0,51.62,64.7Z"/>
-                    <path class="cls-20"
-                          d="M51,69.63a1.49,1.49,0,0,1,.1-.8c.19-.51.61-.83.75-.71s.1.42.14.73a7,7,0,0,1-.93,1.06A1.33,1.33,0,0,1,51,69.63Z"/>
-                    <path class="cls-20"
-                          d="M50.6,51.3c.1-.32.2-.62.31-.91a3.17,3.17,0,0,0,.72.4,4.79,4.79,0,0,0,1.8.19l.6,0,.51,0,.55-.08.3,0c.09,0,0,0-.06,0l-.14,0-.09,0a2.87,2.87,0,0,1-.52-.28l-.21-.16a3.11,3.11,0,0,1-.28-.23,4.39,4.39,0,0,1-.8-1c-.39-.68-.64-1.25-.86-1.69v0c.19-.41.36-.75.5-1,.06.21.11.45.18.75a11.83,11.83,0,0,0,.55,1.74,3.84,3.84,0,0,0,.23.45,3.46,3.46,0,0,0,.42.57l.24.23a2.34,2.34,0,0,0,.38.28,3.42,3.42,0,0,0,.8.43l.17.07s.16.09.17.11.12,0,.15,0,.12,0,0,.06l-.48.09-.88.16-.82.14-.62.09a6.94,6.94,0,0,1-2,.08A4.88,4.88,0,0,1,50.6,51.3Z"/>
-                    <path class="cls-20"
-                          d="M51.26,64.17c0,.14.1.28.15.43a.82.82,0,0,1-.25-.21,3,3,0,0,0-.21-.24c-.06-.05-.12-.05-.12-.08s.06-.07.17,0A.91.91,0,0,1,51.26,64.17Z"/>
-                    <path class="cls-20"
-                          d="M50.6,51.3a3.49,3.49,0,0,1-.74-.34l.81-.85a1.15,1.15,0,0,0,.24.28C50.8,50.68,50.7,51,50.6,51.3Z"/>
-                    <path class="cls-20" d="M49.42,43.82c.32-.14.66-.26,1-.39l.38-.13h0l.68.31-.92.26-.61.19Z"/>
-                    <path class="cls-20"
-                          d="M50,70.16l-.44-.48,0,0,.17-.19c.3-.28.48-.45.51-.49a11.63,11.63,0,0,0,1.33-1.81,7.68,7.68,0,0,0,.84,1.15,3.15,3.15,0,0,1-.31.54c0-.31,0-.64-.14-.73s-.56.2-.75.71a1.49,1.49,0,0,0-.1.8,1.33,1.33,0,0,0,.06.28l0,0-.65.61a1.43,1.43,0,0,1-.35-.26Z"/>
-                    <path class="cls-20"
-                          d="M50.39,2.32l-.47-.14h0c.26-.16.53-.31.8-.45l.41-.22.46-.22A15.63,15.63,0,0,1,55.26.33l.87-.11,0,.22-.66,1,.28.14.38.2.06,0h0s0,0,0,0h0l.17.23a3.89,3.89,0,0,1,.25.42l-1.19,0A15.6,15.6,0,0,0,52.38,3l-.5-.19C51.21,2.56,50.71,2.41,50.39,2.32Z"/>
-                    <path class="cls-20"
-                          d="M50,58.05h.1a9.74,9.74,0,0,0,1.23-.12,7.16,7.16,0,0,0,2.06-.64,17.43,17.43,0,0,0,2.46-1.67l.55-.45,0,0-.34.08-.55.14-.63.07-.82.06a11.87,11.87,0,0,1-1.45,0,7.41,7.41,0,0,1-2.14-.42l-.51-.21a9.46,9.46,0,0,1,.12-1.07,3.14,3.14,0,0,0,.68.53,5.23,5.23,0,0,0,1.84.65,9.72,9.72,0,0,0,1.41.1l.81,0c.34,0,.76-.05,1.16-.09a7.92,7.92,0,0,0,1-.07l0,0a7.13,7.13,0,0,0-.56.59c-.31.26-.48.48-.79.72l-.74.6c-.45.35-.87.65-1.28.91a10.47,10.47,0,0,1-2.1,1c-.56.2-1,.31-1.21.39l-.13,0C50.07,58.77,50,58.4,50,58.05Z"/>
-                    <path class="cls-20"
-                          d="M49.19,71.7l1.23-1.16,0,0h0a.22.22,0,0,0-.06.07,1.38,1.38,0,0,0-.15.3.73.73,0,0,0,.12.82,3.33,3.33,0,0,0,.26.24l.29.23.52.4c.33.23.55.35.54.43s-.32.14-.74,0a5.06,5.06,0,0,1-.69-.23l-.37-.17a2,2,0,0,1-1-1Z"/>
-                    <path class="cls-20"
-                          d="M49.78,3.34,49.9,2.2s0,0,0,0l.47.14c.32.09.82.24,1.49.48l.5.19-.11,0-.37.12-.4.16-.28.12a9.6,9.6,0,0,0-1-.09h-.47Z"/>
-                    <path class="cls-20"
-                          d="M49.62,50.31c.06-.19.13-.37.19-.55.37-.16.61-.23.64-.18S50.13,49.91,49.62,50.31Z"/>
-                    <path class="cls-20"
-                          d="M49.93,54.87a4.15,4.15,0,0,1-1-.63l.9-.76a.84.84,0,0,0,.25.32A9.46,9.46,0,0,0,49.93,54.87Z"/>
-                    <path class="cls-20" d="M50.12,59.13l-.26.08L49.73,58H50C50,58.4,50.07,58.77,50.12,59.13Z"/>
-                    <path class="cls-20"
-                          d="M49.28,60.89c0-.26-.1-.52-.14-.78a.15.15,0,0,0,0-.07v0l.14-.08h0l.05,0h0l0,0,0,0,0,0a.06.06,0,0,0,0,0l.14-.06h0l.12,0h0l0,0,0,.06a1.66,1.66,0,0,1,0,.22.9.9,0,0,1-.58.88Z"/>
-                    <path class="cls-20"
-                          d="M51,66.31a21.2,21.2,0,0,1-1.6-4.74l-.15-.68a.9.9,0,0,0,.58-.88,1.66,1.66,0,0,0,0-.22l0-.06,0,0h0s0,0,0,0v-.05h0l0-.49c0-.38,0-.75-.07-1.11h0l.13,1.17.26-.08c.1.72.23,1.46.38,2.2a24.87,24.87,0,0,0,.76,2.84A.91.91,0,0,0,51,64c-.11,0-.19,0-.17,0s.06,0,.12.08a3,3,0,0,1,.21.24.82.82,0,0,0,.25.21q.11.3.24.6s0,0,0,0h0q.12.32.27.63l.18.36L52,66.3c-.05-.11-.09.18-.5.86C51.32,66.88,51.17,66.6,51,66.31Z"/>
-                    <path class="cls-20"
-                          d="M49.15,71.59a2,2,0,0,1,0-1,3.18,3.18,0,0,1,.19-.61l.08-.16,0,0s0,0,0-.06a.38.38,0,0,1,.08-.09l.44.48.12.12a1.43,1.43,0,0,0,.35.26L49.19,71.7A.49.49,0,0,0,49.15,71.59Z"/>
-                    <path class="cls-20" d="M48.86,53.55c0-.28.08-.56.13-.83l.09-.47h0a.34.34,0,0,0,.1-.06l.56.82Z"/>
-                    <path class="cls-20"
-                          d="M48.76,54.7a10.92,10.92,0,0,1,.1-1.15l.88-.55-.56-.82a.34.34,0,0,1-.1.06,15.8,15.8,0,0,1,.54-1.93c.51-.4.85-.67.83-.73s-.27,0-.64.18c.07-.17.13-.33.2-.49.45-1,.84-1.76,1.16-2.44l.9-1.87.52.21c.23.1.43.19.7.28-.07.14-.19.39-.37.74a2.81,2.81,0,0,0-.08-.31,1.35,1.35,0,0,0-.17-.34.82.82,0,0,0-.21-.19l-.52,1a6.31,6.31,0,0,1,.48.84l-.09.18c-.32.65-.76,1.49-1.17,2.37-.08.2-.17.4-.25.62a1.15,1.15,0,0,1-.24-.28l-.81.85a3.49,3.49,0,0,0,.74.34,14.52,14.52,0,0,0-.42,1.64c0,.28-.1.57-.13.86a.84.84,0,0,1-.25-.32l-.9.76a4.15,4.15,0,0,0,1,.63,16.73,16.73,0,0,0,0,2c0,.38.05.78.1,1.17h-.31v0c-.06-.78-.1-1.54-.15-2.26l-.23-.29-.14-.19c-.09-.13-.19-.25-.27-.37S48.8,54.77,48.76,54.7Z"/>
-                    <path class="cls-20"
-                          d="M48.73,56.25a11.36,11.36,0,0,1,0-1.55c0,.07.09.14.14.21s.18.24.27.37l.14.19.23.29c.05.72.09,1.48.15,2.26v0c0,.36.05.73.07,1.11l0,.49h0l-.12.06h0l-.14.06a.06.06,0,0,1,0,0l0,0,0,0,0,0h0l-.05,0h0l-.14,0h0c0-.06,0-.14,0-.17s0,0,0,0L49,59.21l0-.29-.09-.83C48.84,57.45,48.78,56.83,48.73,56.25Z"/>
-                    <path class="cls-20" d="M48.64,80.17a1.56,1.56,0,0,1,.26,0,.89.89,0,0,1-.35.16Z"/>
-                    <path class="cls-20"
-                          d="M47.81,101.07c-.24-.14-.47-.28-.71-.44l.16,0c.25-.07.6-.18,1-.32a10,10,0,0,0,2.79-1.45,3.65,3.65,0,0,0,1.34-2.68,8.14,8.14,0,0,0,0-1.39h.06a4,4,0,0,1,.23,1.4,4.38,4.38,0,0,1-.26,1.52,3.68,3.68,0,0,1-1,1.49,10,10,0,0,1-2.88,1.66Z"/>
-                    <path class="cls-20" d="M48.4,58.23l-.09-.07h0s0,0,.07,0h0v0Z"/>
-                    <path class="cls-20"
-                          d="M48.4,58.23v0s0,0,0,0,0,0,0,0,0,0,0,0l.1.09a.13.13,0,0,1-.09.06c-.17,0-.13-.1-.16-.13a.29.29,0,0,1,0-.09.09.09,0,0,1,0-.07l.09.07Z"/>
-                    <path class="cls-20"
-                          d="M47.42,54.21a1,1,0,0,1-.06-.68c.06-.2.3-.32.48-.45l.27-.18,1-.65-.09.47c-.05.27-.09.55-.13.83l-.27.18-.28.17h0s0,0,0,0a.87.87,0,0,1,.05.12l.09.16c.09.16.2.32.32.5a11.36,11.36,0,0,0,0,1.55c0-.06,0-.1,0-.15v0L48.63,56l-.15-.19c-.1-.14-.2-.26-.3-.39a7.32,7.32,0,0,1-.52-.76l-.11-.2A2.59,2.59,0,0,1,47.42,54.21Z"/>
-                    <path class="cls-20"
-                          d="M48,74.51a3.3,3.3,0,0,1-.85-.86c.31-.31.62-.6.9-.87a.38.38,0,0,1,0,.1,2.77,2.77,0,0,0,.54.93c.53.64,1.39,1.07,1.32,1.25S48.9,75.12,48,74.51Z"/>
-                    <path class="cls-20"
-                          d="M50,44.06a19,19,0,0,0-2.08.81,8.24,8.24,0,0,0-1.12.66c-.06,0,.3-.47,1-.88a12.8,12.8,0,0,1,1.66-.83Z"/>
-                    <path class="cls-20"
-                          d="M48,82.07c-.87,1.27-1.11,2.3-1.23,2.28a3.73,3.73,0,0,1,.38-1.68,1.1,1.1,0,0,0,.31-.16.91.91,0,0,0-.26,0,6.33,6.33,0,0,1,.36-.75,9.07,9.07,0,0,1,1-1.51.89.89,0,0,0,.35-.16,1.56,1.56,0,0,0-.26,0c.75-1,1.67-1.94,2.56-2.89.71-.77,1.34-1.56,1.94-2.34a22.81,22.81,0,0,0,1.51-2.14,10.85,10.85,0,0,0,.83-1.59c.05-.11.09-.22.13-.3a11.29,11.29,0,0,0,1.09.57l0,.1h0l-.07.15a13.21,13.21,0,0,1-1,1.73A24.75,24.75,0,0,1,54,75.63c-.64.75-1.36,1.56-2.12,2.29A28.55,28.55,0,0,0,48,82.07Z"/>
-                    <path class="cls-20"
-                          d="M47.46,82.51a1.1,1.1,0,0,1-.31.16,1.17,1.17,0,0,1,.05-.11A.91.91,0,0,1,47.46,82.51Z"/>
-                    <path class="cls-20"
-                          d="M47,73.32a4.91,4.91,0,0,1-.21-.45l.07,0a1.19,1.19,0,0,0,.16-.08l.13-.07.77-.42a.82.82,0,0,1,.09.26c0,.07,0,.16.06.25-.28.27-.59.56-.9.87a.08.08,0,0,1,0,0l0,0A2.92,2.92,0,0,1,47,73.32Z"/>
-                    <path class="cls-20" d="M47,89.59c.1-.21.16-.33.18-.32a1.6,1.6,0,0,1-.12.43Z"/>
-                    <path class="cls-20" d="M47,58.25s.06-.06.14-.14l.23-.08,0,0C47.13,58.25,47,58.25,47,58.25Z"/>
-                    <path class="cls-20"
-                          d="M46.77,101.07a.17.17,0,0,1,0-.24.15.15,0,0,1,.09-.13l.26-.07h0c.24.16.47.3.71.44l-.36.13-.42.13a.13.13,0,0,1-.13-.06C46.91,101.2,46.84,101.13,46.77,101.07Z"/>
-                    <path class="cls-20"
-                          d="M46.71,72.79c.92-1.05,1.84-2.12,2.77-3.14l0,0a.38.38,0,0,0-.08.09s0,.06,0,.06l0,0-.08.16a3.18,3.18,0,0,0-.19.61,2,2,0,0,0,0,1,.49.49,0,0,1,0,.11l-.42.4c-.22.22-.46.45-.72.68,0-.09,0-.18-.06-.25a.82.82,0,0,0-.09-.26l-.77.42-.13.07a1.19,1.19,0,0,1-.16.08l-.07,0a.08.08,0,0,1,0-.05h0Z"/>
-                    <path class="cls-20"
-                          d="M46.51,58.84a.45.45,0,0,1,0-.34,1.08,1.08,0,0,1,.54-.38h0c-.08.08-.15.12-.14.14s.15,0,.35-.19l0,0a1.29,1.29,0,0,1,.4-.07,1.08,1.08,0,0,1,.56.2.09.09,0,0,0,0,.07.29.29,0,0,0,0,.09s0,.09.16.13a.13.13,0,0,0,.09-.06,1.9,1.9,0,0,1,.25.24.45.45,0,0,1,.11.23v.07a.37.37,0,0,1,0,.11c0,.1-.07.14-.08.14s.12-.25-.12-.47-.28-.21-.44-.33a.84.84,0,0,0-.53-.19,1.7,1.7,0,0,0-.58.18c-.18.09-.35.18-.38.26s0,.14.07.21a.44.44,0,0,0,.1.08s0,.1-.06.17-.12.12-.15.09a.57.57,0,0,1-.13-.14A.62.62,0,0,1,46.51,58.84Z"/>
-                    <path class="cls-20"
-                          d="M46.93,89.4a6.24,6.24,0,0,1-.52-2v-.08c.12-.08.17-.13.16-.15l-.17.07a5.1,5.1,0,0,1,.37-2.64h0a15.28,15.28,0,0,0,.1,2.73,6.13,6.13,0,0,0,.61,1.76c.24.43.45.73.46.75l.47.78c.28.45.65,1,1.07,1.59a9.39,9.39,0,0,0,1.26,1.4c.38.33.68.52.66.56s0,0,0,0a2.12,2.12,0,0,1-.79-.37,7.45,7.45,0,0,1-1.47-1.31A18.44,18.44,0,0,1,47.9,91c-.31-.44-.51-.75-.52-.77s-.13-.21-.3-.54a1.6,1.6,0,0,0,.12-.43s-.08.11-.18.32Z"/>
-                    <path class="cls-20"
-                          d="M46.77,72.87a4.91,4.91,0,0,0,.21.45,2.92,2.92,0,0,0,.17.27l0,0c-.06-.08-.1-.15-.15-.23s-.17-.35-.21-.44a.11.11,0,0,1,0-.06h0Z"/>
-                    <path class="cls-20" d="M46.74,72.87l-.07-.05,0,0h0l0,0h0a.08.08,0,0,0,0,.05h0Z"/>
-                    <path class="cls-20" d="M46.4,87.29l.17-.07s0,.07-.16.15A.12.12,0,0,1,46.4,87.29Z"/>
-                    <path class="cls-20"
-                          d="M45.91,54.56a3.89,3.89,0,0,1-.45-.71,2.33,2.33,0,0,1-.12-.34.63.63,0,0,1,0-.26.79.79,0,0,1,.24-.67c.05,0,.09-.09.15-.13l.13-.11.28-.24c.21-.17.44-.34.69-.52.49-.35,1.05-.72,1.57-1a12.93,12.93,0,0,1,1.45-.78c-.06.18-.13.36-.19.55-.27.2-.58.45-.91.72s-1,.79-1.42,1.18l-.6.56-.25.24-.11.12s-.08.08-.06.07a.32.32,0,0,1,0,.06,1,1,0,0,0,.06.21,3.27,3.27,0,0,0,.27.52c.25.39.93.85,1.43,1.53a3,3,0,0,1,.53,1.12,5,5,0,0,1,.11,1,2.75,2.75,0,0,1,0,.41.55.55,0,0,1,0,.17.29.29,0,0,1,0,.09l0,.06h0l-.1-.09h0v0h0s0,0,0,0l-.05,0s0-.07,0-.12,0-.23-.07-.37A3.36,3.36,0,0,0,47.52,56C47.05,55.45,46.37,55.1,45.91,54.56Z"/>
-                    <path class="cls-20"
-                          d="M46,76.54a2.82,2.82,0,0,1-.87-.8l.9-1c0,.07,0,.17.1.31a2.39,2.39,0,0,0,.43.74,3.75,3.75,0,0,0,.74.58c.23.14.39.17.43.24s-.18.27-.53.26A2.44,2.44,0,0,1,46,76.54Z"/>
-                    <path class="cls-20"
-                          d="M45.76,5.53c.09-.1.18-.21.28-.31a15.45,15.45,0,0,1,2.4-2.07A16.65,16.65,0,0,1,49.9,2.2l-.12,1.14h.47a9.6,9.6,0,0,1,1,.09l-.51.22c-.52.23-1,.49-1.49.74A20.75,20.75,0,0,0,46.73,6l-.24.18a.9.9,0,0,0-.21.08,3.63,3.63,0,0,0-.46.34A1.67,1.67,0,0,0,45.76,5.53Z"/>
-                    <path class="cls-20"
-                          d="M45.4,58.74a6.14,6.14,0,0,1,.4-.86,1.74,1.74,0,0,1,.3-.36l.32-.27a3.58,3.58,0,0,1,.36-.28c.11,0,.25-.11.35,0s.15.44.21.63,0,.17,0,.25a.3.3,0,0,1,0,.21l-.23.08.1-.12c.05-.07,0-.19-.07-.34s0-.27-.15-.39-.16,0-.21.08a1.7,1.7,0,0,0-.19.19c-.05.06-.18.17-.26.25a1.36,1.36,0,0,0-.21.29,6.41,6.41,0,0,0-.31.82,3.15,3.15,0,0,0-.14.44.59.59,0,0,0,0,.35,1.07,1.07,0,0,0,.65.48,4.32,4.32,0,0,0,1,.2,9.74,9.74,0,0,0,1.08,0c.33,0,.69-.13.71-.25a0,0,0,0,0,0,0c0,.26.1.52.14.78L49.1,61a2.59,2.59,0,0,1-.66.08A9,9,0,0,1,47.27,61a5,5,0,0,1-1.13-.28,1.53,1.53,0,0,1-.92-.83,1,1,0,0,1,0-.64A3.61,3.61,0,0,1,45.4,58.74Z"/>
-                    <path class="cls-20"
-                          d="M45.1,75.57a2.12,2.12,0,0,1-.27-.49,3.87,3.87,0,0,1,.58-.25,1.87,1.87,0,0,1,.64-.16.66.66,0,0,1,0,.09l-.9,1,0,0,0,0Z"/>
-                    <path class="cls-20"
-                          d="M44.65,7.44a.23.23,0,0,1,0-.11.88.88,0,0,1,.08-.27,6.19,6.19,0,0,1,1-1.53,1.67,1.67,0,0,1,.06,1,7,7,0,0,0-.55.54l-.18.19a3.83,3.83,0,0,1-.28.29h-.05A.22.22,0,0,1,44.65,7.44Z"/>
-                    <path class="cls-20"
-                          d="M44.83,75.08a2.12,2.12,0,0,0,.27.49l.07.11,0,0a.43.43,0,0,0,0-.07,3.39,3.39,0,0,1-.29-.54Z"/>
-                    <path class="cls-20"
-                          d="M44.18,27.43a27.31,27.31,0,0,1,4.9-5.25c.85-.68,1.44-1,1.49-1.06s.51-.31,1.3-.64a16.4,16.4,0,0,1,3.33-1A27.87,27.87,0,0,1,60.05,19a9.27,9.27,0,0,1,5.51,2h0s0,0,0,0a8.75,8.75,0,0,1,2.61,3,11.8,11.8,0,0,1,1.16,3.75,31.73,31.73,0,0,1,.29,3.67,14.82,14.82,0,0,1-.17,3.36,12.48,12.48,0,0,1-2,4.7c-.7,1-1.25,1.52-1.29,1.47s.09-.14.28-.42.46-.68.76-1.2a13.51,13.51,0,0,0,1.65-4.65,13.84,13.84,0,0,0,0-3.23,34.26,34.26,0,0,0-.39-3.56,11,11,0,0,0-1.17-3.45A7.82,7.82,0,0,0,65,21.83l0,0a8.39,8.39,0,0,0-4.87-1.68,27.82,27.82,0,0,0-4.61.6,15.09,15.09,0,0,0-3.07,1c-.71.31-1.09.57-1.14.58a15.64,15.64,0,0,0-1.37.94,23.75,23.75,0,0,0-3,2.82,23.49,23.49,0,0,0-1.74,2.09c-.14.2-.29.4-.43.61l-.11.14v0s0,0,0,.05l0,0,.23.27.52.6A49.34,49.34,0,0,0,50,34.51a26.4,26.4,0,0,0,2.66,2l.69.43.71.38c.47.25,1,.48,1.45.71,1.91.91,3.71,1.73,5.29,2.32A15,15,0,0,0,63,41a7.58,7.58,0,0,0,1.74.16,5.82,5.82,0,0,0,1.12-.11c.25,0,.37-.11.39-.1s-.49.39-1.5.47a7,7,0,0,1-1.82,0,11,11,0,0,1-1.26-.27l-1-.3c-1.63-.53-3.48-1.29-5.43-2.14-.49-.22-1-.43-1.49-.67L53,37.65l-.74-.43a25.94,25.94,0,0,1-2.8-2,47.56,47.56,0,0,1-4.91-4.66L44,30l-.28-.32-.46-.55s-.12-.09-.09-.14l.1-.14.2-.3.32-.46Z"/>
-                    <path class="cls-20"
-                          d="M43.41,79a3.21,3.21,0,0,1-.34-.72l.25-.31.12-.15a2.58,2.58,0,0,0,.34,1,2.44,2.44,0,0,0,.69.76,3.07,3.07,0,0,0,1.08.5,7.83,7.83,0,0,0,2.3.26,5.43,5.43,0,0,0,.79-.09l-.09.13a5.16,5.16,0,0,1-.69.14,7.09,7.09,0,0,1-2.39-.11,3.52,3.52,0,0,1-1.23-.51A2.69,2.69,0,0,1,43.41,79Z"/>
-                    <path class="cls-20"
-                          d="M43.32,77.93l-.25.31s0,0,0,0h0a2.09,2.09,0,0,1-.1-.41.22.22,0,0,1,.2-.2.26.26,0,0,1,.27.18v0Z"/>
-                    <path class="cls-20"
-                          d="M43,77.77a2.09,2.09,0,0,0,.1.41h0a1.76,1.76,0,0,1-.09-.36A.06.06,0,0,1,43,77.77Z"/>
-                    <path class="cls-20"
-                          d="M41.34,81.71a3.93,3.93,0,0,1-.28-.44l.26-.49a3.27,3.27,0,0,0,.37.66,3.35,3.35,0,0,0,2.05,1.35,6.19,6.19,0,0,0,2.55,0c.4-.07.71-.15.91-.2a1.17,1.17,0,0,0-.05.11,8,8,0,0,1-.81.28,6.31,6.31,0,0,1-2.66.17A3.74,3.74,0,0,1,41.34,81.71Z"/>
-                    <path class="cls-20"
-                          d="M40.83,80.82a2.6,2.6,0,0,0,.1-.25l0,0,.12-.28h0a.22.22,0,0,1,.1.13v0a2.52,2.52,0,0,0,.1.3l0,.07-.26.49A2.4,2.4,0,0,1,40.83,80.82Z"/>
-                    <path class="cls-20"
-                          d="M41.09,80.2s0,0,0,0h0l.48-1,.09-.12c.37-.54.69-1.1,1-1.67l.82-1.19c.43-.48.86-1,1.32-1.42.64-.65,1.26-1.33,1.87-2l0,0,0,0,.07.05h0a.11.11,0,0,0,0,.06c0,.09.11.25.21.44s.09.15.15.23c-.27.26-.54.53-.83.84l-.23.24a.73.73,0,0,0,0-.08,1.63,1.63,0,0,0-.64.16,2,2,0,0,0-.6.27.11.11,0,0,1,0,0l0,0a3.39,3.39,0,0,0,.29.54.43.43,0,0,1,0,.07c-.55.62-1.12,1.28-1.7,2v0a.26.26,0,0,0-.27-.17.22.22,0,0,0-.2.26.06.06,0,0,0,0,.06,1.76,1.76,0,0,0,.09.36c-.44.56-.88,1.15-1.29,1.78q-.24.36-.45.75l0-.08c0-.1-.06-.18-.08-.23s0-.08,0-.09A.2.2,0,0,0,41.09,80.2Z"/>
-                    <path class="cls-20"
-                          d="M43,93.66a6.89,6.89,0,0,1-1.57,0c-.29,0-.56-.07-.78-.11l-.15-.5a9.19,9.19,0,0,0,1,.17,5.82,5.82,0,0,0,1.46,0,6,6,0,0,0,1.61-.46,3.58,3.58,0,0,0,1.35-.93,2.74,2.74,0,0,0,.39-.64c.1-.23.19-.45.27-.65.18-.42.32-.76.43-1l.06.11c-.07.24-.18.57-.32,1-.07.2-.14.42-.23.66a4.16,4.16,0,0,1-.57.93,3.15,3.15,0,0,1-1.24.86A6.19,6.19,0,0,1,43,93.66Z"/>
-                    <path class="cls-20" d="M40.58,93.54c0-.16-.08-.33-.11-.49h.06l.15.5Z"/>
-                    <path class="cls-20"
-                          d="M40.47,93.05c0,.16.07.33.11.49l.1,0c.21.7.41,1.33.48,1.5a2.87,2.87,0,0,1,.16.57l.1.46c.07.31.14.61.2.92L42,98.89l.06.3,0,.07s0,0,0,0l.08-.1.6-.77.57-.74.39.84.8,1.7c0-.52,0-1,0-1.56.44.39.92.84,1.34,1.17.2.17.44.34.62.47l.35.24a1.82,1.82,0,0,0,.23.15l-.26.07a.15.15,0,0,0-.09.13.17.17,0,0,0,0,.24c.07.06.14.13.13.2a.13.13,0,0,0,.13.06l.42-.13.36-.13.52.3a13.84,13.84,0,0,0,3.16,1.3c.52.14,1,.26,1.57.37a.59.59,0,0,0-.05.08c0,.09,0,.23.2.31s.32.1.36,0l.19-.29c1.56.29,3.17.49,4.78.74l.9.14.2,0h.29l.32,0c.6,0,1.21-.08,1.81-.13l1.4-.14a.65.65,0,0,1-.09.16c0,.11.05.25.22.32s.34,0,.38,0l.2-.41.06-.12,1.45-.19c1.2-.18,2.4-.4,3.57-.68a18.23,18.23,0,0,0,3.39-1.13h0l3.17-1.25c1.09-.21,2-.36,3-.57.47-.13,1-.24,1.42-.41l.7-.23.68-.28a15.53,15.53,0,0,0,4.84-3.18,12,12,0,0,0,3.07-4.7A9.71,9.71,0,0,0,90,89.72a5.09,5.09,0,0,0,.12-.68l.05-.34c0-.12,0-.14,0-.21L89.84,88a5.27,5.27,0,0,0-.43-.51,4.5,4.5,0,0,0-1-.81A4.22,4.22,0,0,0,86,86.22a8.86,8.86,0,0,0-2.52.62c-.8.31-1.58.72-2.36,1.09s-1.54.76-2.29,1.13c-3,1.53-5.8,3-8.48,4.21A35,35,0,0,1,64,95.46a1.26,1.26,0,0,0-.42-.13c-.31,0-.46.11-.44.13a.8.8,0,0,1,.42,0l.17.06c-.32.08-.64.14-1,.19a18.51,18.51,0,0,1-6.09.11l-1-.17-.08-.05c-.21-.14-.36-.16-.37-.14s.08.05.18.14c-.33-.09-.63-.17-.91-.26l-1.59-.46-.43-.13s0-.07,0-.07,0,0,0,.06c-.19-.07-.36-.11-.48-.16a.93.93,0,0,1-.32-.12l.34.07,1,.23,1.6.4,1,.26,1.18.16a18.8,18.8,0,0,0,6-.23,32.75,32.75,0,0,0,7.45-2.52c2.64-1.2,5.41-2.73,8.4-4.3.74-.38,1.5-.78,2.29-1.15s1.55-.8,2.4-1.13a9.58,9.58,0,0,1,2.7-.7,4.68,4.68,0,0,1,4,1.48,6.57,6.57,0,0,1,.48.57l.47.71a2.27,2.27,0,0,1,0,.48l0,.36a6.17,6.17,0,0,1-.12.73,12.06,12.06,0,0,1-.41,1.42,12.74,12.74,0,0,1-3.22,5A16.24,16.24,0,0,1,82,99.69l-.71.31-.74.25c-.47.18-1,.29-1.48.43-1,.23-2.06.41-3,.59L73,102.49a18.53,18.53,0,0,1-3.56,1.23c-1.21.29-2.43.53-3.65.72s-2.45.33-3.67.45l-1.84.14-.31,0h-.53l-.17,0-.9-.13a65.24,65.24,0,0,1-7.18-1.22,15,15,0,0,1-3.4-1.37c-.53-.29-1-.6-1.55-.93l-.45-.31L45.7,101s0,.08,0,.11v.16c0,.5,0,1,0,1.48l.07,2.6L44.69,103c-.52-1.08-1-2.15-1.53-3.2l0,.07-.57.73c-.19.23-.4.49-.55.46a.47.47,0,0,1-.14-.08c-.1-.35-.21-.7-.34-1A25.2,25.2,0,0,0,41,95.33c-.11-.49-.92-3.6-1-4.08.08.2.33,1,.57,1.81Z"/>
-                    <path class="cls-20" d="M39.44,89.93l.39,1A5.41,5.41,0,0,1,39.44,89.93Z"/>
-                    <path class="cls-20"
-                          d="M39.41,85.33a25.39,25.39,0,0,1,1.42-4.51,2.4,2.4,0,0,0,.23.45c-.21.4-.39.81-.58,1.24a27.15,27.15,0,0,0-.87,3,4.39,4.39,0,0,0-.15,1,2.53,2.53,0,0,1-.2-.29h0C39.29,85.93,39.34,85.65,39.41,85.33Z"/>
-                    <path class="cls-20"
-                          d="M39.42,88a11.84,11.84,0,0,0,.41,2.9l-.39-1v0h0C39.47,89.6,39.43,88.85,39.42,88Z"/>
-                    <path class="cls-20"
-                          d="M39.42,87.18c0-.22,0-.44,0-.65a2.86,2.86,0,0,0,.63.65,3.84,3.84,0,0,0,2.53.76,19.34,19.34,0,0,0,2.75-.35,8.41,8.41,0,0,0,.88-.24l.15-.06a.12.12,0,0,0,0,.08,4.27,4.27,0,0,1-1,.39,14.74,14.74,0,0,1-2.78.51,4.12,4.12,0,0,1-2.81-.74A2.42,2.42,0,0,1,39.42,87.18Z"/>
-                    <path class="cls-20"
-                          d="M39.26,13.46a7.16,7.16,0,0,1,.5-1.1l.3-.48s.16-.19.38-.42a7.8,7.8,0,0,1,.82-.76h0l.55-.18c.37-.12.59-.39.52-.54.26-.13.43-.2.45-.16s-.6.58-1.16,1.18c-.28.3-.55.6-.74.85s-.3.42-.31.42l-.32.42a5.8,5.8,0,0,0-.58,1c-.38.71-.45,1.53-.54,1.53s-.1-.21-.09-.53A3.89,3.89,0,0,1,39.26,13.46Z"/>
-                    <path class="cls-20"
-                          d="M39.18,86.58l.06-.35h0a2.53,2.53,0,0,0,.2.29c0,.21,0,.43,0,.65a1.7,1.7,0,0,1-.19-.19c0-.12,0-.23,0-.35S39.18,86.6,39.18,86.58Z"/>
-                    <path class="cls-20"
-                          d="M39.42,88c0,.84,0,1.59,0,1.87a6.64,6.64,0,0,1-.24-3.24c0,.12,0,.23,0,.35a1.7,1.7,0,0,0,.19.19C39.41,87.46,39.41,87.74,39.42,88Z"/>
-                    <path class="cls-20"
-                          d="M38.59,9a4.26,4.26,0,0,1,2.6.09,2.39,2.39,0,0,1,1.15.92v0a6.79,6.79,0,0,0-1,.67l0,0h0c-.07,0-.12,0-.13,0a1,1,0,0,0-.1-.15,1.23,1.23,0,0,0-.39-.33A3.42,3.42,0,0,0,38.72,10a8.12,8.12,0,0,1-3.36-.27C35.36,9.46,37,9.3,38.59,9Z"/>
-                    <path class="cls-20"
-                          d="M35.87,29.44l-2,1.39-.42.28-.14.1-.2.15.32.07,1,.27,3.6,1c-.55.29-1.08.59-1.6.88l-.76.44-.29.17-.08.06h0s-.07,0-.06.07l.13.07c.94.6,1.8,1.13,2.52,1.58,1.45.9,2.36,1.5,2.44,1.54l1.24.86c.39.28.78.55,1.3.87s1.09.64,1.74,1c1.3.7,2.84,1.47,4.49,2.27l1.73.82-.38.13c-.35.13-.69.25-1,.39l-.79-.35c-1.69-.76-3.26-1.5-4.6-2.18-.67-.35-1.28-.68-1.83-1s-1-.64-1.38-.88l-1.24-.82L37.19,37c-.72-.46-1.56-1-2.51-1.64-.17-.13-.42-.28-.6-.44l-.22-.26a2.36,2.36,0,0,1-.15-.25c-.06-.09,0-.21,0-.28s0-.18.13-.28a1.33,1.33,0,0,1,.27-.25,2.16,2.16,0,0,1,.35-.24c.53-.34.4-.24.48-.28l.14-.07L35,33l-.05,0-.18,0-.58-.17-3.41-1,2.59-1.66.84-.53.21-.14.08,0,.15-.09.15-.1s-.08,0-.13-.07L34.46,29l-.27-.11-.44-.19a1.91,1.91,0,0,1-.31-.14,1,1,0,0,1-.28-.22.94.94,0,0,1,.12-1.27,8,8,0,0,0,1.86-3,15.93,15.93,0,0,0,.79-2.8,15.29,15.29,0,0,0,.25-2.24l.17.14h0a10.82,10.82,0,0,1-.05,2.15,15.55,15.55,0,0,1-.63,2.93A11.21,11.21,0,0,1,35,26a8.05,8.05,0,0,1-.51.83c-.1.13-.2.27-.31.4l-.16.2-.15.16a.25.25,0,0,0,0,.37.19.19,0,0,0,.09.05L34,28l.44.16,1.38.53.38.14.19.07.1,0,0,0s0,0,0,0Z"/>
-                    <path class="cls-20"
-                          d="M32.58,12.56a32,32,0,0,0,2.47,4c1.76,2.14,3,3.61,2.86,3.75s-.65-.35-1.56-1.15h0a1.86,1.86,0,0,0-.12-.56s0,.15,0,.41c-.54-.48-1.19-1.08-1.92-1.79a27.18,27.18,0,0,1-2.95-4L31.12,13l0-.07a.75.75,0,0,1-.07-.12l-.08-.19c-.1-.22-.19-.44-.28-.67a12.67,12.67,0,0,1-.44-1.4,14.19,14.19,0,0,1-.31-1.47c0-.25-.06-.51-.08-.77s0-.27,0-.4V7.7c0-.08,0-.2,0-.3a2.26,2.26,0,0,1,.37-1.11,1.92,1.92,0,0,1,1-.62l.27-.1.19-.05.36-.1.71-.19c.94-.23,1.85-.42,2.75-.58s1.78-.28,2.68-.34a13.89,13.89,0,0,1,2.52.14c1.49.19,2.69.44,3.54.62l1.38.3a.32.32,0,0,1,.2.16,6.19,6.19,0,0,0-1,1.53.88.88,0,0,0-.08.27.23.23,0,0,0,0,.11.22.22,0,0,0,.11.15h.05l-.22.23-1-.26c-.82-.2-2-.48-3.32-.72a13.68,13.68,0,0,0-2.08-.24c-.74,0-1.59.1-2.44.2s-1.76.24-2.65.4l-.66.14-.54.12a.4.4,0,0,0-.19.07.4.4,0,0,0-.07.19v.06a.66.66,0,0,0,0,.14c0,.11,0,.2,0,.31s0,.42,0,.64c0,.44.1.87.18,1.3a10.51,10.51,0,0,0,.3,1.26c.06.21.12.41.19.6l.05.13v0l0,.07Z"/>
-                </g>
-                <path class="cls-6"
-                      d="M71.58,82.36l-.3.13a.28.28,0,0,0,0-.07l0-.07c0-.06,0-.06,0-.17s0-.12,0-.18a.86.86,0,0,1,.14.13A1.54,1.54,0,0,1,71.58,82.36Z"/>
-                <path class="cls-6"
-                      d="M71.29,82.18c0,.11,0,.11,0,.17l0,.07a.69.69,0,0,0-.42-.35,1.72,1.72,0,0,0-.5,0,.38.38,0,0,0-.16,0s-.07,0-.08,0,0,0,0,0a.27.27,0,0,1,.17-.09,1.51,1.51,0,0,1,.56-.08.88.88,0,0,1,.41.16C71.28,82.06,71.28,82.12,71.29,82.18Z"/>
-                <path class="cls-6"
-                      d="M70.79,83.29c0,.1,0,.1-.05.15l0,.06a.76.76,0,0,0-.33-.45,2,2,0,0,0-.47-.15.46.46,0,0,0-.16,0,.1.1,0,0,1-.08,0s0,0,.07,0a.28.28,0,0,1,.18,0,1.56,1.56,0,0,1,.57.08.83.83,0,0,1,.35.26C70.81,83.17,70.8,83.22,70.79,83.29Z"/>
-                <path class="cls-6"
-                      d="M70.82,83.14c.17.23.21.49.13.59l-.27-.19h0a.89.89,0,0,0,0-.11,0,0,0,0,1,0,0C70.69,83.32,70.76,83.23,70.82,83.14Z"/>
-                <path class="cls-6" d="M70.72,83.58h0s0,0,0,0Z"/>
-                <path class="cls-8" d="M65.89,82h0v0l0,0h0V82Z"/>
-                <path class="cls-6" d="M65.88,82v0h-.08l-.16,0-.21,0h0l-.14,0s-.07-.06,0,0a4,4,0,0,0,.6-.09h0Z"/>
-                <polygon class="cls-8" points="65.02 82.2 65.02 82.21 65.02 82.21 65.02 82.2"/>
-                <path class="cls-8" d="M62.23,78.28s0,0,0,0l0,0h0Z"/>
-                <path class="cls-8"
-                      d="M61.66,77.83l0,0a.8.8,0,0,1,.17.15h-.08c-.06,0-.07.07-.07.08s-.06-.07-.07-.11l0-.07Z"/>
-                <path class="cls-8" d="M60.68,82.89a.06.06,0,0,0,0,0h0Z"/>
-                <path class="cls-9" d="M60.66,82.93a.19.19,0,0,1,0,.08h0l0,0Z"/>
-                <path class="cls-6" d="M60.66,82.93l0,.11h-.47S60.48,83,60.66,82.93Z"/>
-                <polygon class="cls-8" points="60.64 83.01 60.62 83.08 60.62 83.06 60.62 83.04 60.64 83.01"/>
-                <path class="cls-6" d="M58.89,82.52c.22,0,.08.15.11.2a.08.08,0,0,1,0,.06h0s-.06-.1-.09-.27Z"/>
-                <path class="cls-8"
-                      d="M56.27,87.13a.65.65,0,0,1,.1.19s-.18,0-.33-.19C56.23,87.14,56.24,87.16,56.27,87.13Z"/>
-                <path class="cls-8"
-                      d="M54.49,86.91c0,.16.09.28.07.31s-.26-.15-.3-.45a.06.06,0,0,1,0,0l.12.15s.07,0,.1,0Z"/>
-                <path class="cls-8" d="M86,27.13l.13.2-.37.05Z"/>
-                <path class="cls-8" d="M80.05,4c.16.17.21.27.18.32s-.15,0-.34,0l-.23-.06q-.14-.13-.27-.3l.47-.09Z"/>
-                <path class="cls-8"
-                      d="M72.86,31.88a4.68,4.68,0,0,0,0,.53.32.32,0,0,1-.15-.35A.27.27,0,0,1,72.86,31.88Z"/>
-                <path class="cls-8" d="M70.61,51.66l.19.36a2.64,2.64,0,0,1-.25-.29Z"/>
-                <path class="cls-8" d="M70.45,48h.09a.52.52,0,0,1,0,.18A1.08,1.08,0,0,1,70.45,48Z"/>
-                <path class="cls-8" d="M70.45,48h-.11C70.4,47.93,70.43,47.92,70.45,48Z"/>
-                <path class="cls-8" d="M69.46,47.57a1.24,1.24,0,0,1-.2.1.11.11,0,0,1,0-.08A.51.51,0,0,1,69.46,47.57Z"/>
-                <path class="cls-8"
-                      d="M64.81,7.55l-.3,0c0-.53,0-1,0-1.48q.14.47.24,1C64.76,7.31,64.81,7.52,64.81,7.55Z"/>
-                <path class="cls-8"
-                      d="M42.35,10c.07.16-.15.43-.52.55l-.56.18a.12.12,0,0,1,0,0A7.84,7.84,0,0,1,42.35,10Z"/>
-                <path class="cls-23" d="M26.81,34.72c0,.23,0,.47,0,.72h0c0-.13,0-.25,0-.37S26.8,34.84,26.81,34.72Z"/>
-                <g class="cls-24">
-                    <path class="cls-23"
-                          d="M26.81,34.72c0,.23,0,.47,0,.72h0c0-.13,0-.25,0-.37S26.8,34.84,26.81,34.72Z"/>
-                </g>
-                <g class="cls-25">
-                    <polygon class="cls-26" points="48.26 58.07 48.27 58.06 48.27 58.07 48.26 58.07"/>
-                    <polygon class="cls-27" points="47.97 58.07 48.27 57.69 48.27 58.06 48.26 58.07 47.97 58.07"/>
-                    <polygon class="cls-28" points="47.67 58.07 48.27 57.31 48.27 57.69 47.97 58.07 47.67 58.07"/>
-                    <polygon class="cls-29" points="47.38 58.07 48.27 56.93 48.27 57.31 47.67 58.07 47.38 58.07"/>
-                    <polygon class="cls-29" points="47.09 58.07 48.27 56.56 48.27 56.93 47.38 58.07 47.09 58.07"/>
-                    <polygon class="cls-30"
-                             points="46.79 58.07 48.22 56.24 48.27 56.24 48.27 56.56 47.09 58.07 46.79 58.07"/>
-                    <polygon class="cls-31" points="46.5 58.07 47.93 56.24 48.22 56.24 46.79 58.07 46.5 58.07"/>
-                    <polygon class="cls-32" points="46.2 58.07 47.63 56.24 47.93 56.24 46.5 58.07 46.2 58.07"/>
-                    <polygon class="cls-33" points="45.91 58.07 47.34 56.24 47.63 56.24 46.2 58.07 45.91 58.07"/>
-                    <polygon class="cls-34" points="45.62 58.07 47.04 56.24 47.34 56.24 45.91 58.07 45.62 58.07"/>
-                    <polygon class="cls-35"
-                             points="45.34 58.04 46.75 56.24 47.04 56.24 45.62 58.07 45.34 58.07 45.34 58.04"/>
-                    <polygon class="cls-36" points="45.34 57.67 46.45 56.24 46.75 56.24 45.34 58.04 45.34 57.67"/>
-                    <polygon class="cls-37" points="45.34 57.29 46.16 56.24 46.45 56.24 45.34 57.67 45.34 57.29"/>
-                    <polygon class="cls-38" points="45.34 56.91 45.87 56.24 46.16 56.24 45.34 57.29 45.34 56.91"/>
-                    <polygon class="cls-39" points="45.34 56.54 45.57 56.24 45.87 56.24 45.34 56.91 45.34 56.54"/>
-                    <polygon class="cls-40" points="45.57 56.24 45.34 56.54 45.34 56.24 45.57 56.24"/>
-                </g>
-                <path class="cls-23" d="M26.79,35.08c0,.12,0,.24,0,.37h0C26.78,35.32,26.79,35.2,26.79,35.08Z"/>
-                <g class="cls-24">
-                    <path class="cls-23" d="M26.79,35.08c0,.12,0,.24,0,.37h0C26.78,35.32,26.79,35.2,26.79,35.08Z"/>
-                </g>
-                <g class="cls-41">
-                    <polygon class="cls-42" points="26.77 35.37 26.79 35.34 26.79 35.45 26.77 35.45 26.77 35.37"/>
-                    <polygon class="cls-43"
-                             points="26.77 35.11 26.79 35.08 26.79 35.08 26.79 35.34 26.77 35.37 26.77 35.11"/>
-                    <polygon class="cls-44" points="26.79 35.08 26.77 35.11 26.77 35.08 26.79 35.08"/>
-                </g>
-                <path class="cls-45"
-                      d="M275.36,62.93v5.43c0,2.4-.85,3.26-3.22,3.26h-3.9V79.3c0,2.4-.84,3.25-3.21,3.25h-7.88c-2.45,0-3.22-.85-3.22-3.25V71.62H230.75c-2.37,0-3.21-.86-3.21-3.26V63.24c0-2.56.15-3.49,1.68-5.27l23.26-28.15c1.53-1.78,2.45-2.33,5-2.33H265c2.37,0,3.21.86,3.21,3.26V59.68h3.9C274.51,59.68,275.36,60.53,275.36,62.93ZM253.93,46.57,243.22,59.68h10.71Z"/>
-                <path class="cls-46"
-                      d="M323.25,82.55h-9.79c-4,0-4.9-.23-6.35-2.87L299.84,67l-7,12.72c-1.45,2.41-2.22,2.87-6.35,2.87H277c-2.3,0-2.83-1.39-1.61-3.25l15.76-24.82-15-23.89c-1.15-1.7-.62-3.1,1.53-3.1h9.18c3.9,0,4.82.31,6.27,2.72l6.89,11.94,6.81-11.94c1.45-2.56,2.44-2.72,5.89-2.72h9.79c2.22,0,2.6,1.4,1.53,3.1L308.94,54.48l16,24.82C326.08,81,325.62,82.55,323.25,82.55Z"/>
-                <path class="cls-47"
-                      d="M.11,22.35a23,23,0,0,0,3.52,5.58l3.76-1A45.48,45.48,0,0,1,3.51,22a2.07,2.07,0,0,1-.13-.19c0,.07.09.13.13.19a40,40,0,0,0,4,4.67,66.77,66.77,0,0,0,.74-7.1C4.6,18.05,2.55,19,2.55,19S-.62,20.07.11,22.35Z"/>
-                <path class="cls-1" d="M18.54,29.78v-.05l0,.27,0,.05C18.53,30,18.54,29.87,18.54,29.78Z"/>
-                <path class="cls-1" d="M24.13,33c0,.15,0,.3,0,.46C24.12,33.28,24.13,33.13,24.13,33Z"/>
-                <path class="cls-1"
-                      d="M34.76,48.41l-.13-.09c-1-.63-1.86-1.25-2.75-1.86s-2-1.35-2.89-2-1.94-1.37-2.85-2-1.88-1.37-2.76-2c-.72-.54-1.42-1.07-2.09-1.59l-.67-.51-1.27-1-1.13-.9-.36-.29-.06,0,0,.22-.39.1.09.07,1.66,1.36,1,.78,2.75,2.15c.94.71,1.88,1.42,2.83,2.12s1.86,1.37,2.8,2,1.86,1.33,2.79,2,1.92,1.34,2.88,2l.64.44,2.27,1.52.61-.15,0-.25-.07,0Z"/>
-                <polygon class="cls-1" points="24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55"/>
-                <path class="cls-48" d="M26.89,34.82c0,.24,0,.48,0,.73h0c0-.12,0-.24,0-.37S26.89,34.94,26.89,34.82Z"/>
-                <path class="cls-49" d="M26.89,34.82c0,.24,0,.48,0,.73h0c0-.12,0-.24,0-.37S26.89,34.94,26.89,34.82Z"/>
-                <path class="cls-48" d="M24.1,33.55h0s0-.08,0-.12,0-.31,0-.46q0,.27,0,.57Z"/>
-                <path class="cls-49" d="M24.1,33.55h0s0-.08,0-.12,0-.31,0-.46q0,.27,0,.57Z"/>
-                <path class="cls-50"
-                      d="M14.85,34.17c-.89-.77-1.75-1.55-2.58-2.32s-1.7-1.61-2.5-2.41a.93.93,0,0,0-.14-.14c-.78-.8-1.53-1.58-2.24-2.37l-3.76,1,.4.52c.52.66,1.09,1.35,1.69,2.07S7.13,32.16,7.9,33s1.47,1.6,2.25,2.41,1.35,1.4,2.06,2.1a.3.3,0,0,1,.08.08l5.1-1.26C16.53,35.62,15.68,34.89,14.85,34.17Z"/>
-                <path class="cls-51"
-                      d="M38.15,50.64l2.36,1.52,0,0,.34.22L43,53.74a4.77,4.77,0,0,1,2.46-1.27,3.82,3.82,0,0,0-2.84.61c.92-3.32.74-6.41-1.37-8.47a6.27,6.27,0,0,0-.61-.53,3.28,3.28,0,0,1,.42,3.37h0a9.2,9.2,0,0,0-2.66-5.4c-.34-.33-.71-.67-1.13-1a7.52,7.52,0,0,1,.64,7.42l-.22,1.92Z"/>
-                <path class="cls-52"
-                      d="M34.17,48.8q-1.44-1-2.88-2c-.93-.64-1.86-1.3-2.79-2s-1.87-1.34-2.8-2-1.89-1.41-2.83-2.12l-2.75-2.15-1-.78-1.66-1.36-.09-.07-5.1,1.26.16.15c.76.74,1.53,1.49,2.33,2.23s1.63,1.48,2.47,2.21,1.43,1.23,2.16,1.83l.44.36c.93.74,1.82,1.43,2.69,2.06s1.93,1.37,2.84,2c.59.39,1.17.75,1.73,1.08l1.44.82c1.13.62,2.27,1.2,3.41,1.72l5.12-1.26-2.27-1.52Z"/>
-                <path class="cls-53"
-                      d="M48.4,58.19a1,1,0,0,0,0-.28c-2.19-1.33-4.59-2.83-7.44-4.66l-.65-.41-.18-.12-2.42-1.58-.56-.37h0L32,52l.16.07a36.52,36.52,0,0,0,4.24,1.62l.15,0a9.33,9.33,0,0,0-2.9,2.13,13.29,13.29,0,0,1,6.58-1.22A6.11,6.11,0,0,1,39,57.5a6,6,0,0,0,2.1-2.16,7.42,7.42,0,0,0,.94,3.89,7.62,7.62,0,0,1,.19-4.31c1.7,1.08,3.26,2,5.11,3.11a1.08,1.08,0,0,1,.6,0,1.51,1.51,0,0,1,.35.17Z"/>
-                <path class="cls-54"
-                      d="M17.86,36.07l.36.29,1.13.9,1.27,1,.67.51c.67.52,1.37,1,2.09,1.59q1.32,1,2.76,2t2.85,2c.93.66,1.89,1.33,2.89,2s1.8,1.23,2.75,1.86l.13.09,2.89,1.91.07,0,.22-1.92a.49.49,0,0,1,0,.11,13.64,13.64,0,0,0-2.37-8,18,18,0,0,0-2.82-3.22A32.33,32.33,0,0,0,29.81,35c-.94-.67-2-1.35-3.12-2a6.73,6.73,0,0,1,.2,1.89c0,.12,0,.24,0,.36s0,.25,0,.37h0a8.36,8.36,0,0,0-3.24-5.34A7.62,7.62,0,0,1,24.13,33c0,.15,0,.3,0,.46s0,.08,0,.12h0a9,9,0,0,0-.61-2.11c-.06-.13-.12-.26-.19-.39a6.42,6.42,0,0,0-.34-.56,3.64,3.64,0,0,0-.24-.35,6.75,6.75,0,0,0-.67-.76l-.23-.23-.35-.29c-.52-.43-1-.78-1.4-1.07-.21-.15-.4-.28-.58-.39l-.21-.14L18.73,27a5.69,5.69,0,0,0-.58-.28h0a1.82,1.82,0,0,1,.11.28,9.11,9.11,0,0,1,.29,2.78l.2-1.76-.2,1.76v.05c0,.09,0,.18,0,.27l0-.05-.71,6Z"/>
-                <path class="cls-55"
-                      d="M7.51,26.71c.68.71,1.46,1.49,2.35,2.35l.14.13c.77.74,1.62,1.52,2.56,2.36s1.68,1.49,2.62,2.29,1.7,1.43,2.62,2.18l.71-6a7.26,7.26,0,0,0-1.78-3.8c-.24-.27-.49-.53-.75-.8-.81-.82-1.71-1.65-2.62-2.42a30.56,30.56,0,0,0-2.57-2,15.55,15.55,0,0,0-1.43-.88c-.38-.2-.75-.37-1.11-.52A66.77,66.77,0,0,1,7.51,26.71Z"/>
-                <path class="cls-48" d="M26.88,35.18c0,.13,0,.25,0,.37h0C26.87,35.43,26.88,35.31,26.88,35.18Z"/>
-                <path class="cls-49" d="M26.88,35.18c0,.13,0,.25,0,.37h0C26.87,35.43,26.88,35.31,26.88,35.18Z"/>
-                <path class="cls-56" d="M26.88,35.18c0,.13,0,.25,0,.37h0C26.87,35.43,26.88,35.31,26.88,35.18Z"/>
-                <path class="cls-48" d="M24.1,33.56s0-.08,0-.12,0,.08,0,.12Z"/>
-                <path class="cls-49" d="M24.1,33.56s0-.08,0-.12,0,.08,0,.12Z"/>
-                <path class="cls-57" d="M24.1,33.56s0-.08,0-.12,0,.08,0,.12Z"/>
-                <polygon class="cls-48" points="24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55"/>
-                <polygon class="cls-49" points="24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55"/>
-                <polygon class="cls-58" points="24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55"/>
-                <path class="cls-59"
-                      d="M6.93,17.42l.17,0,.09-.4,1.14.26.05-.19-1.14-.26.09-.4-.17,0Zm.54-2.33.81.66-1,.25,0,.22,1.31.3,0-.17-1-.24,1-.24,0-.12-.8-.65,1,.24,0-.17-1.31-.3Z"/>
-            </g>
-        </g>
-    </g>
+<!--
+    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
+
+         http://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.
+-->
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 325.53 105.92">
+    <defs>
+        <style>
+            .cls-1{fill:none;}.cls-2{isolation:isolate;}.cls-3{fill:#f2e8df;}.cls-4{opacity:0.13;}.cls-13,.cls-4{mix-blend-mode:multiply;}.cls-5{fill:#3c2517;}.cls-6{fill:#644c53;}.cls-7{fill:#a66870;}.cls-8{fill:#744a54;}.cls-9{fill:#231f20;}.cls-10{fill:#fff;}.cls-11{fill:#473439;}.cls-12{fill:#f7b2c6;}.cls-13{opacity:0.15;}.cls-14{fill:#3e362f;}.cls-15{fill:#f4f0d2;}.cls-16{fill:#97646d;}.cls-17{fill:#96636a;}.cls-18{fill:#8f8280;}.cls-19{fill:#dbd3d1;}.cls-20{fill:#694650;}.cls-21{fill:#c4869a;}.cls-22{fill:#a6938f;}.cls-23{fill:#bd2330;}.cls-24,.cls-49{opacity:0.35;mix-blend-mode:screen;}.cls-25{clip-path:url(#clip-path);}.cls-26{fill:#68308b;}.cls-27{fill:#682f8a;}.cls-28{fill:#692f8a;}.cls-29{fill:#6a2f89;}.cls-30{fill:#6b2f89;}.cls-31{fill:#6c2f88;}.cls-32{fill:#6c2e88;}.cls-33{fill:#6d2e87;}.cls-34{fill:#6e2e87;}.cls-35{fill:#6e2e86;}.cls-36{fill:#6f2e86;}.cls-37{fill:#702e85;}.cls-38{fill:#702d85;}.cls-39{fill:#712d85;}.cls-40{fill:#722d84;}.cls-41{clip-path:url(#clip-path-2);}.cls-42{fill:#c7203a;}.cls-43{fill:#c8203a;}.cls-44{fill:#c82039;}.cls-45{fill:url(#linear-gradient);}.cls-46{fill:url(#New_Gradient_Swatch_3);}.cls-47{fill:url(#New_Gradient_Swatch_6);}.cls-48,.cls-49{fill:#bc2331;}.cls-50{fill:url(#New_Gradient_Swatch_3-2);}.cls-51{fill:url(#New_Gradient_Swatch_5);}.cls-52{fill:url(#New_Gradient_Swatch_3-3);}.cls-53{fill:url(#New_Gradient_Swatch_5-2);}.cls-54{fill:url(#New_Gradient_Swatch_3-4);}.cls-55{fill:url(#New_Gradient_Swatch_3-5);}.cls-56{fill:url(#New_Gradient_Swatch_3-6);}.cls-57{fill:url(#New_Gradient_Swatch_3-7);}.cls-58{fill:url(#New_Gradient_Swatch_3-8);}.cls-59{fill:#6e7071;}
+        </style>
+        <clipPath id="clip-path">
+            <path class="cls-1"
+                  d="M47.35,58a1.74,1.74,0,0,1,.92-.09V58s0-.14,0-.16l-2.63-1.61a1.4,1.4,0,0,1-.27.58c.66.41,1.31.79,2,1.2Z"/>
+        </clipPath>
+        <clipPath id="clip-path-2">
+            <path class="cls-1" d="M26.79,35.08c0,.12,0,.24,0,.37h0C26.78,35.32,26.79,35.2,26.79,35.08Z"/>
+        </clipPath>
+        <linearGradient id="linear-gradient" x1="251.28" y1="114.16" x2="251.58" y2="28.41"
+                        gradientUnits="userSpaceOnUse">
+            <stop offset="0.32" stop-color="#9d2064"/>
+            <stop offset="0.63" stop-color="#c92039"/>
+            <stop offset="0.75" stop-color="#cd2035"/>
+            <stop offset="1" stop-color="#e77927"/>
+        </linearGradient>
+        <linearGradient id="New_Gradient_Swatch_3" x1="300.05" y1="114.33" x2="300.35" y2="28.58"
+                        xlink:href="#linear-gradient"/>
+        <linearGradient id="New_Gradient_Swatch_6" x1="-8246.19" y1="-964.14" x2="-8237.17" y2="-953.61"
+                        gradientTransform="translate(-5900.3 -5809.9) rotate(-142)" gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#f49624"/>
+            <stop offset="0.31" stop-color="#f79823"/>
+            <stop offset="0.84" stop-color="#e77927"/>
+        </linearGradient>
+        <linearGradient id="New_Gradient_Swatch_3-2" x1="-8312.88" y1="-965.31" x2="-8248.59" y2="-965.31"
+                        gradientTransform="translate(-5900.3 -5809.9) rotate(-142)" xlink:href="#linear-gradient"/>
+        <linearGradient id="New_Gradient_Swatch_5" x1="-8305.12" y1="-958.86" x2="-8266.81" y2="-958.86"
+                        gradientTransform="translate(-5900.3 -5809.9) rotate(-142)" gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#272761"/>
+            <stop offset="0.1" stop-color="#66318b"/>
+            <stop offset="0.79" stop-color="#9f2065"/>
+            <stop offset="0.95" stop-color="#cd2032"/>
+        </linearGradient>
+        <linearGradient id="New_Gradient_Swatch_3-3" x1="-8309.27" y1="-965.91" x2="-8244.98" y2="-965.91"
+                        gradientTransform="translate(-5900.3 -5809.9) rotate(-142)" xlink:href="#linear-gradient"/>
+        <linearGradient id="New_Gradient_Swatch_5-2" x1="-8304.44" y1="-965.55" x2="-8270.88" y2="-965.55"
+                        xlink:href="#New_Gradient_Swatch_5"/>
+        <linearGradient id="New_Gradient_Swatch_3-4" x1="-8309.27" y1="-959.25" x2="-8244.98" y2="-959.25"
+                        gradientTransform="translate(-5900.3 -5809.9) rotate(-142)" xlink:href="#linear-gradient"/>
+        <linearGradient id="New_Gradient_Swatch_3-5" x1="-8313.26" y1="-959.58" x2="-8248.97" y2="-959.58"
+                        gradientTransform="translate(-5900.3 -5809.9) rotate(-142)" xlink:href="#linear-gradient"/>
+        <linearGradient id="New_Gradient_Swatch_3-6" x1="-8309.27" y1="-957.27" x2="-8244.98" y2="-957.27"
+                        gradientTransform="translate(-5900.3 -5809.9) rotate(-142)" xlink:href="#linear-gradient"/>
+        <linearGradient id="New_Gradient_Swatch_3-7" x1="-8309.27" y1="-957.5" x2="-8244.98" y2="-957.5"
+                        gradientTransform="translate(-5900.3 -5809.9) rotate(-142)" xlink:href="#linear-gradient"/>
+        <linearGradient id="New_Gradient_Swatch_3-8" x1="-8273.15" y1="-957.55" x2="-8258.94" y2="-957.55"
+                        gradientTransform="translate(-5900.3 -5809.9) rotate(-142)" xlink:href="#linear-gradient"/>
+    </defs>
+    <title>logo PLC4X on dark bg</title>
+    <g class="cls-2">
+        <g id="Layer_2" data-name="Layer 2">
+            <g id="Layer_1-2" data-name="Layer 1">
+                <path class="cls-3"
+                      d="M134.89,46.77c0,12.19-7.6,19-19.47,19h-9.29V79c0,2.39-.83,3.24-3.19,3.24H94.26c-2.36,0-3.19-.85-3.19-3.24V30.73c0-2.39.83-3.24,3.19-3.24h21.08C127.13,27.49,134.89,34.51,134.89,46.77ZM119.3,46.7c0-3.4-2.06-5.71-5.63-5.71h-7.54V52.33h7.54A5.25,5.25,0,0,0,119.3,46.7Z"/>
+                <path class="cls-3"
+                      d="M153.46,30.73v38h18.26c2.44,0,3.27.78,3.27,3.24v7c0,2.39-.83,3.24-3.27,3.24H141.59c-2.36,0-3.2-.85-3.2-3.24V30.73c0-2.39.84-3.24,3.2-3.24h8.67C152.62,27.49,153.46,28.34,153.46,30.73Z"/>
+                <path class="cls-3"
+                      d="M200.75,26.34c11.72,0,19.1,4.85,22.22,13.49.84,2.24.23,3.4-2.05,4.17l-8.15,2.93c-2.35.69-3.19.31-4.1-2.08-1.3-3.47-3.58-5-7.92-5-5.93,0-8.29,2.62-8.29,8v14c0,5.4,2.36,8,8.29,8,4.26,0,6.7-1.7,8-5,.84-2.39,1.83-2.93,4.11-2.08l8.07,2.93c2.28.77,2.89,1.92,2.05,4.16-3.12,8.64-10.5,13.5-22.22,13.5-14.91,0-23.36-8.25-23.36-21.6V47.93C177.39,34.59,185.84,26.34,200.75,26.34Z"/>
+                <path class="cls-3"
+                      d="M281.15,20.75h-.29c-.23,0-.3,0-.35-.18l-.73-1.87H276.7L276,20.57c0,.14-.12.18-.35.18h-.26c-.16,0-.19-.07-.14-.19l2.64-6.66a.21.21,0,0,1,.25-.17h.3c.14,0,.2,0,.25.16l2.63,6.67C281.33,20.68,281.3,20.75,281.15,20.75Zm-2.76-5.66a2.57,2.57,0,0,1-.14-.68h-.05a3.14,3.14,0,0,1-.12.68l-1.18,3h2.67Z"/>
+                <path class="cls-3"
+                      d="M289.79,15.94a2,2,0,0,1-2.22,2.18h-2.12v2.43c0,.15-.05.2-.2.2h-.32c-.15,0-.2-.05-.2-.2V14c0-.15,0-.2.2-.2h2.64A2,2,0,0,1,289.79,15.94Zm-.76,0a1.4,1.4,0,0,0-1.54-1.51h-2.05v3h2.05A1.4,1.4,0,0,0,289,15.94Z"/>
+                <path class="cls-3"
+                      d="M298.19,20.75h-.29c-.23,0-.3,0-.35-.18l-.73-1.87h-3.08L293,20.57c-.05.14-.11.18-.35.18h-.26c-.15,0-.18-.07-.13-.19l2.63-6.66a.21.21,0,0,1,.25-.17h.3c.14,0,.2,0,.25.16l2.64,6.67C298.38,20.68,298.35,20.75,298.19,20.75Zm-2.76-5.66a2.82,2.82,0,0,1-.13-.68h-.05a2.82,2.82,0,0,1-.13.68l-1.18,3h2.68Z"/>
+                <path class="cls-3"
+                      d="M304.12,13.62a2.38,2.38,0,0,1,2.62,1.68c.05.15,0,.21-.13.26l-.31.11c-.13,0-.19,0-.24-.12a1.73,1.73,0,0,0-1.94-1.27c-1.31,0-2,.67-2,1.8v2.34c0,1.13.7,1.8,2,1.8a1.74,1.74,0,0,0,1.95-1.29c.06-.14.12-.17.25-.13l.31.12c.14,0,.17.1.12.24a2.39,2.39,0,0,1-2.63,1.72c-1.74,0-2.71-.93-2.71-2.47V16.09C301.41,14.56,302.36,13.62,304.12,13.62Z"/>
+                <path class="cls-3"
+                      d="M315.62,14v6.59c0,.15-.05.2-.2.2h-.32c-.15,0-.2-.05-.2-.2v-3h-3.74v3c0,.15-.05.2-.2.2h-.32c-.15,0-.2-.05-.2-.2V14c0-.15.05-.2.2-.2H311c.15,0,.2.05.2.2v2.91h3.74V14c0-.15.05-.2.2-.2h.32C315.57,13.76,315.62,13.81,315.62,14Z"/>
+                <path class="cls-3"
+                      d="M324.09,14v.27c0,.15,0,.2-.2.2h-3.47v2.44h3c.14,0,.19.05.19.2v.27c0,.15-.05.2-.19.2h-3v2.54H324c.13,0,.18.05.18.19v.28c0,.15-.05.2-.18.2H319.9c-.15,0-.19-.05-.19-.2V14c0-.15,0-.2.19-.2h4C324,13.76,324.09,13.81,324.09,14Z"/>
+                <g class="cls-4">
+                    <path class="cls-5"
+                          d="M90.45,87.94s2.46,8-7.72,13.13c-14.94,7.5-25,5.06-34,1-1.17-.52-2,.19-3.07-7.68s2.64,3.24,3.21,3.31,23.75-.42,23.75-.42Z"/>
+                </g>
+                <path class="cls-6"
+                      d="M90.87,88.31a1.76,1.76,0,0,1,0,.48l0,.36a6.21,6.21,0,0,1-.13.73,10.36,10.36,0,0,1-.4,1.42,12.7,12.7,0,0,1-3.22,5A16.1,16.1,0,0,1,82,99.69l-.71.31-.74.25c-.48.18-1,.29-1.48.43-1,.23-2.06.41-3,.59l-3,1.22a18.53,18.53,0,0,1-3.56,1.23c-1.21.29-2.43.53-3.65.71s-2.45.34-3.67.45l-1.84.15-.31,0h-.53l-.18,0-.9-.13a65.47,65.47,0,0,1-7.17-1.22,14.85,14.85,0,0,1-3.4-1.37c-.53-.29-1-.6-1.55-.93l-.45-.31L45.7,101s0,.08,0,.11v.16c0,.49,0,1,0,1.48l.07,2.6L44.69,103c-.52-1.08-1-2.15-1.53-3.2l0,.07-.58.73c-.18.23-.39.49-.54.46l-.15-.08c-.1-.35-.21-.7-.33-1A25.2,25.2,0,0,0,41,95.33c-.11-.49-.92-3.61-1-4.08.08.19.32,1,.57,1.81h-.07l.12.49.1,0c.21.7.4,1.33.48,1.5a3,3,0,0,1,.16.56l.1.47c.07.31.14.61.2.92L42,98.89l.06.3v.06s0,0,0,0l.08-.1.6-.77.56-.74.4.84.8,1.7c0-.52,0-1,0-1.56.44.39.91.84,1.34,1.17.2.17.44.34.62.47l.35.24.22.15-.25.07a.15.15,0,0,0-.09.13.17.17,0,0,0,0,.24c.07.06.14.13.13.2a.13.13,0,0,0,.13.06l.41-.13.37-.13c.17.1.34.2.52.29a13.43,13.43,0,0,0,3.16,1.31c.51.14,1,.26,1.57.37a.28.28,0,0,0-.05.08c0,.09,0,.23.2.31s.32.1.36,0l.19-.29c1.56.29,3.17.49,4.78.74l.9.14.19,0h.3l.32,0c.6,0,1.21-.08,1.81-.13l1.4-.14a1.63,1.63,0,0,1-.09.16c0,.11.05.25.22.32s.33,0,.38,0l.2-.41.06-.12,1.45-.19c1.2-.18,2.4-.4,3.56-.68a18.09,18.09,0,0,0,3.4-1.13h0l3.17-1.25c1.09-.21,2-.36,3-.57.47-.13,1-.24,1.42-.41l.7-.23.68-.28a15.53,15.53,0,0,0,4.84-3.18,12,12,0,0,0,3.07-4.7A10.14,10.14,0,0,0,90,89.72a5.09,5.09,0,0,0,.12-.68l.05-.34a1,1,0,0,0,0-.21L89.83,88a5.17,5.17,0,0,0-.42-.51,4.33,4.33,0,0,0-1-.81A4.17,4.17,0,0,0,86,86.22a8.86,8.86,0,0,0-2.52.62c-.8.31-1.58.72-2.37,1.09s-1.53.76-2.29,1.13c-3,1.53-5.79,3-8.47,4.21A35.84,35.84,0,0,1,64,95.46a1.26,1.26,0,0,0-.42-.13c-.31,0-.46.11-.44.12a1.06,1.06,0,0,1,.42,0l.17.06c-.32.08-.64.14-1,.19a18.79,18.79,0,0,1-6.09.11l-1-.17-.08-.05a.61.61,0,0,0-.37-.15s.07.06.17.15l-.9-.26-1.59-.46-.43-.13s0-.07,0-.07,0,0,0,.06l-.48-.16a1.22,1.22,0,0,1-.32-.12l.34.07,1,.23,1.6.4,1,.25,1.18.17a18.8,18.8,0,0,0,6-.23,32.68,32.68,0,0,0,7.44-2.52c2.65-1.2,5.42-2.73,8.4-4.3.75-.38,1.51-.78,2.3-1.15s1.55-.8,2.4-1.13a9.6,9.6,0,0,1,2.69-.7,4.88,4.88,0,0,1,2.86.55,5.28,5.28,0,0,1,1.18.92c.16.2.34.37.48.58Z"/>
+                <path class="cls-7"
+                      d="M90.14,88.49a1,1,0,0,1,0,.21l-.05.34a5.09,5.09,0,0,1-.12.68,10.14,10.14,0,0,1-.39,1.33,12,12,0,0,1-3.07,4.7,15.53,15.53,0,0,1-4.84,3.18l-.68.28-.7.23c-.46.17-1,.28-1.42.41-1,.21-1.92.36-3,.57l-3.17,1.25h0a18.09,18.09,0,0,1-3.4,1.13c-1.16.28-2.36.5-3.56.68l-1.45.19c.13-.25.3-.58.5-1s.49-1,.73-1.55a5.19,5.19,0,0,0,.46-1.93,3.85,3.85,0,0,0-.25-2,4.18,4.18,0,0,0-1.06-1.36,3,3,0,0,0-.66-.44,35.84,35.84,0,0,0,6.35-2.19c2.68-1.18,5.48-2.68,8.47-4.21.76-.37,1.51-.77,2.29-1.13s1.57-.78,2.37-1.09A8.86,8.86,0,0,1,86,86.22a4.17,4.17,0,0,1,2.46.48,4.33,4.33,0,0,1,1,.81,5.17,5.17,0,0,1,.42.51Z"/>
+                <path class="cls-6"
+                      d="M88,7.18a18.2,18.2,0,0,1-.09,2,22.89,22.89,0,0,1-.78,4.09,21.5,21.5,0,0,1-1.48,3.82,8.88,8.88,0,0,1-.88,1.45c0-.06,0-.09,0-.09a.79.79,0,0,0,0,.14h0s-.07.05-.09,0a7.62,7.62,0,0,1,.54-1.75,29.25,29.25,0,0,0,1-3.84,25.11,25.11,0,0,0,.48-3.95c0-1.09,0-1.82,0-1.87a11.5,11.5,0,0,0,0-1.16c-.05-.63-.18-1.59-.84-1.91a2.89,2.89,0,0,0-1.36-.23,15.37,15.37,0,0,0-1.63.14c-.54.07-1.08.11-1.58.16h-.48l-.46,0c.17.27.3.49.39.65s.22.4.19.43-.17-.08-.38-.27S80,4.6,79.66,4.2l.23.06c.19.06.32.08.34,0s0-.15-.18-.32l-.19-.16,1.29-.24,1.54-.32A17.19,17.19,0,0,1,84.39,3a3.84,3.84,0,0,1,1.9.21,2.49,2.49,0,0,1,1.27,1.4,5.66,5.66,0,0,1,.34,1.35C88,6.68,88,7.14,88,7.18Z"/>
+                <path class="cls-3"
+                      d="M86.7,7.22s.06.78,0,1.87A25.11,25.11,0,0,1,86.24,13a29.25,29.25,0,0,1-1,3.84,7.62,7.62,0,0,0-.54,1.75s0,0,.09,0c0,.31,0,1.08,0,1.84,0,.5-.06,1-.1,1.38s-.07.63-.07.65,0,.27-.08.64-.11.76-.2,1.19c0-.09,0-.19,0-.3,0-.29,0-.63,0-1a7.16,7.16,0,0,0-.42-1.35,5,5,0,0,0-1-1.34A7.31,7.31,0,0,0,81.41,19a6.82,6.82,0,0,0-3.92-.93,4.21,4.21,0,0,0-2,.82A6.4,6.4,0,0,0,74,20.35a5.3,5.3,0,0,0-.85,1.74c-.18.57-.31,1.11-.42,1.62a32.86,32.86,0,0,0-.55,3.49c0,.08-.16,1.47-.21,3.51a15.86,15.86,0,0,0,1.33,7.34l.12.23.15.28a.6.6,0,0,0,.68.32,1.42,1.42,0,0,0,.32-.07,2.76,2.76,0,0,0,.3-.15l.42-.29c.54-.39,1-.78,1.53-1.17,1-.77,1.87-1.51,2.62-2.17A15.16,15.16,0,0,0,82,32.39a1.54,1.54,0,0,0,.09-.24l.38.46c.05.07.1.12.08.11h0l-.31.27a5.54,5.54,0,0,0-.83,1.07c-.52.93-1.07,2.09-1.78,3.18a8.35,8.35,0,0,1-1.16,1.48,7.12,7.12,0,0,1-1.32,1,12.63,12.63,0,0,0-1.39.88h0a1.1,1.1,0,0,0-.33-.45c-.14-.07-.22,0-.22,0s.07,0,.14.13a1.23,1.23,0,0,1,.17.42c.06.22.11.48.16.77a4,4,0,0,0-1.12.58c0,.08.52-.07,1.17-.23,0,.12,0,.25,0,.37a2.18,2.18,0,0,1,0,.51c-.27.14-.43.26-.41.28s.14,0,.37-.06a3.1,3.1,0,0,1-.15.46h0c-.64.18-1.22.49-1.18.58s.45,0,.95-.09c-.11.17-.18.26-.18.27s-.16.24-.43.55a7.27,7.27,0,0,1-1.09,1,2.76,2.76,0,0,1-1.36.44c-.4,0-.68,0-.7,0s.27.15.7.2a3,3,0,0,0,1-.07v.06a4.89,4.89,0,0,0-.52.42,3.16,3.16,0,0,1-1.28.58,4.38,4.38,0,0,1-1.39,0l-.21,0a2.7,2.7,0,0,0,.53-.46,2.11,2.11,0,0,0,.41-.59,1.07,1.07,0,0,0,.1-.24c-.06-.06-.26.3-.68.65a3.92,3.92,0,0,1-1.83.81,7.36,7.36,0,0,1-2,.12,4.51,4.51,0,0,1-.92-.2l-.26-.08a2.87,2.87,0,0,1-.58-.27c-.34-.24-.77-.62-1.21-1,.4-.27.78-.52,1.08-.68s.66-.24.66-.29-.31-.07-.75,0a9.59,9.59,0,0,0-1.34.61l0,0-1.07-.94.69-.23c1.49-.49,3-.87,3-1s0,0-.11,0l.46-.79.29,0,.32,0a.37.37,0,0,0,.23-.05.2.2,0,0,0,.08-.24.85.85,0,0,0-.25-.37.41.41,0,0,0-.24-.1h0l-1.6-.64c1-.08,1.55-.41,1.49-.47s.6-.44,1.3-1.47a12.55,12.55,0,0,0,2-4.7,14.28,14.28,0,0,0,.16-3.36,31.65,31.65,0,0,0-.28-3.67A11.8,11.8,0,0,0,68.21,24a8.88,8.88,0,0,0-2.61-3h0l0,0a9.26,9.26,0,0,0-5.51-2,27.83,27.83,0,0,0-4.85.52,17.8,17.8,0,0,0-3.33,1c-.79.34-1.23.63-1.3.65a16.69,16.69,0,0,0-1.49,1.06,25.2,25.2,0,0,0-3.12,3,24.7,24.7,0,0,0-1.78,2.24l-.42.61-.32.47-.2.29-.1.15c0,.05.06.09.08.14l.47.54L44,30l.55.6a47.56,47.56,0,0,0,4.91,4.66,25.94,25.94,0,0,0,2.8,2l.74.43.76.38c.51.24,1,.45,1.49.67,2,.84,3.79,1.61,5.42,2.14.36.11.69.21,1,.29l-.38,1.42A19.94,19.94,0,0,0,59,42.18a18.9,18.9,0,0,0-3-.06,11.45,11.45,0,0,0-1.4.14,13.73,13.73,0,0,0-1.39.29c-.7.19-1.56.44-2.44.75h0l-1.73-.82c-1.65-.8-3.19-1.57-4.49-2.27-.65-.35-1.24-.68-1.75-1s-.9-.59-1.29-.87c-.75-.51-1.19-.82-1.24-.86s-1-.64-2.44-1.54l-2.53-1.58-.12-.07s0,0,.05-.07h0l.08,0,.28-.17.76-.44L38,32.67l-3.61-1-1-.27-.32-.07.2-.15.14-.1.42-.28,2-1.39.67-.45,0,0,0,0-.09,0-.19-.07-.38-.15-1.38-.52L34,28l-.12,0a.15.15,0,0,1-.09-.06.24.24,0,0,1,0-.36l.15-.16.16-.2c.11-.13.21-.27.3-.4A5.62,5.62,0,0,0,35,26a11.13,11.13,0,0,0,.71-1.67,15.55,15.55,0,0,0,.63-2.93,10,10,0,0,0,0-2.16c.92.8,1.49,1.23,1.56,1.16s-1.09-1.61-2.85-3.75a32,32,0,0,1-2.47-4l-.15-.29,0-.07v0L32.33,12c-.07-.19-.13-.39-.2-.6a12.83,12.83,0,0,1-.29-1.26,11.6,11.6,0,0,1-.18-1.3c0-.22,0-.44,0-.64s0-.21,0-.31a.66.66,0,0,1,0-.14V7.72a.49.49,0,0,1,.08-.18c.05,0,.11,0,.19-.07l.54-.13.66-.13c.89-.16,1.78-.3,2.64-.4s1.71-.18,2.45-.2a13.41,13.41,0,0,1,2.07.24c1.36.24,2.51.52,3.32.72l1,.26.22-.23a3.83,3.83,0,0,0,.28-.29c.06-.07.12-.12.17-.19s.37-.37.56-.54h0a3.63,3.63,0,0,1,.46-.34.9.9,0,0,1,.21-.08L46.73,6a20.75,20.75,0,0,1,2.49-1.59c.48-.26,1-.51,1.49-.74l.51-.22.54.1a11.74,11.74,0,0,1,2.58.83,10.61,10.61,0,0,1,1.59.91c.27.19.56.38.86.6l.45.34c.19.14.38.29.58.46l.25.23a2.52,2.52,0,0,1,.74.52c.1.16,0,0,0-.11a2.46,2.46,0,0,1,0-.26,1.11,1.11,0,0,1,0-.3c-.37-1.25-.69-2.31-.95-3.18-.13-.42-.25-.8-.37-1.13l1,0c.88,0,1.63.08,2.15.13l.9.08.57,0,.17.15a8.67,8.67,0,0,1,2.17,4.3c0,.19.07.36.08.43v0l.29,0v0A45.57,45.57,0,0,1,65,2.81l.58,0h.76l.45,0a2.92,2.92,0,0,0,.44-.06c.45-.07.88-.17,1.32-.25l.28.29a6.8,6.8,0,0,1,1,1.53c.08.17.17.36.24.55a5.8,5.8,0,0,1,.21.89c0,.3.08.62.13.94l.06.49,0,.25,0,.13s0,0,0,0l.15-.49a15.41,15.41,0,0,1,.75-2,8.45,8.45,0,0,1,.67-1.2,3.69,3.69,0,0,1,.72-.78,6.43,6.43,0,0,1,.73-.48A3.27,3.27,0,0,1,74,2.38a16.23,16.23,0,0,1,2.16.54c.85.29,1.62.62,2.26.86s.93.34,1.23.42c.36.4.64.68.84.87s.34.29.38.27,0-.18-.19-.43-.22-.38-.39-.65l.46,0h.48c.5,0,1-.09,1.58-.16a15.37,15.37,0,0,1,1.63-.14,2.89,2.89,0,0,1,1.36.23c.66.32.79,1.28.84,1.91A11.5,11.5,0,0,1,86.7,7.22ZM86,6.12a3.52,3.52,0,0,0-.09-.85c0-.06-.25,0-.5.07l-.28.12h0a5.33,5.33,0,0,0-1.27.38,11.1,11.1,0,0,1-1.32.49,2.49,2.49,0,0,1-.44.09l.5.72a1.39,1.39,0,0,1,.24-.35A2.85,2.85,0,0,1,84,6.05a1.71,1.71,0,0,1,1.14-.11l0,.22A4.49,4.49,0,0,1,85,7.58c-.17.71-.35,1.44-.41,1.87-.32-.59-.63-1-.7-1a11.42,11.42,0,0,0,.56,1.74c.15.43.27.86.35,1.19s.1.55.11.57a4.42,4.42,0,0,1,.1.54,7.64,7.64,0,0,1,0,1.22,9.48,9.48,0,0,0-.1,1.82,5.29,5.29,0,0,0,.56-1.76,6.33,6.33,0,0,0,.18-1.31,6.26,6.26,0,0,0,0-.64s-.06-.26-.18-.6A9.92,9.92,0,0,0,84.92,10c-.06-.1-.11-.21-.16-.31a13.38,13.38,0,0,0,.94-1.93A4.77,4.77,0,0,0,86,6.12ZM74.92,43.19a.77.77,0,0,0,0-.38.17.17,0,0,0,0-.12s-.08,0-.12,0-.22.12-.21.14-.12-.11-.14-.08a.37.37,0,0,0,0,.38.33.33,0,0,0,.23.23C74.77,43.41,74.86,43.33,74.92,43.19Zm-.76-1.43a.5.5,0,0,0,.21-.35.17.17,0,0,0,0-.12.13.13,0,0,0-.13,0c-.17,0-.25.09-.25.12s-.13-.11-.14-.1l-.06.08a.56.56,0,0,0-.13.24.19.19,0,0,0,.13.24A.48.48,0,0,0,74.16,41.76Zm-.2,2a.69.69,0,0,0,.22-.62,1.19,1.19,0,0,0-.24-.55,1.73,1.73,0,0,0-.41-.4A1.34,1.34,0,0,0,73,42a3.59,3.59,0,0,0-1,0l-.16,0-.11,0-.2.07-.17,0h-.11l-.13,0a.83.83,0,0,0-.29,0,3,3,0,0,0-.37,0,4.5,4.5,0,0,0-.69.2l-.36.18a2.37,2.37,0,0,0-.79.63,2,2,0,0,0-.49,1.33,2,2,0,0,0,.19.79,1,1,0,0,0,.72.56,1.8,1.8,0,0,0,.81-.09.68.68,0,0,0,.31.18,1.77,1.77,0,0,0,.91,0,3.42,3.42,0,0,0,.69-.28h0a.47.47,0,0,0,.24.08.76.76,0,0,0,.55-.18c.21-.21.36-.4.42-.45s0,0,0,0h0A0,0,0,0,0,73,45l-.06,0v0s.09,0,.12,0a.51.51,0,0,0,.16-.09.57.57,0,0,0,.23-.3C73.52,44.05,73.64,44,74,43.79Zm-7.28,1.85a.58.58,0,0,0-.25-.49C66.17,45,66,45,66,45s-.14-.09-.15-.06a1.86,1.86,0,0,0-.3.45.58.58,0,0,0,.07.61.73.73,0,0,0,1.11-.38ZM41.63,11c.57-.6,1.21-1.1,1.17-1.18s-.2,0-.45.15h0A2.51,2.51,0,0,0,41.19,9,4.34,4.34,0,0,0,38.59,9c-1.58.35-3.23.51-3.23.73a8.12,8.12,0,0,0,3.36.27,3.36,3.36,0,0,1,1.91.28,1.31,1.31,0,0,1,.4.32,1.43,1.43,0,0,1,.1.16s0,0,.13,0a9,9,0,0,0-.82.75c-.23.24-.37.42-.38.43l-.3.48a5.39,5.39,0,0,0-.5,1.1,3.59,3.59,0,0,0-.2,1.17c0,.33,0,.54.09.54s.16-.82.54-1.54a6.13,6.13,0,0,1,.58-.94l.32-.42s.12-.18.31-.42A9.63,9.63,0,0,1,41.63,11Z"/>
+                <path class="cls-6"
+                      d="M86.37,27l-.22.33c-.26.37-.62.88-1.06,1.46l-.69.91c-.11.16-.24.32-.36.48a1.94,1.94,0,0,0-.13.2l.15.08.47.27,1.65,1-2.52.84s-.26-.26-.51-.53l-.21.76.72-.23h0c0,.15-.06.26-.08.35v0c-.08.32-.09.37-.1.39l-.09.06s-.12.06-.26.16l-.24.19a4.89,4.89,0,0,0-.72.85c-.5.81-1.17,2-2,3.11a9.16,9.16,0,0,1-1.36,1.48,4.41,4.41,0,0,1-.78.52c-.25.14-.5.26-.72.37a4,4,0,0,1-1.58.54,12.63,12.63,0,0,1,1.39-.88,7.12,7.12,0,0,0,1.32-1,8.35,8.35,0,0,0,1.16-1.48c.71-1.09,1.26-2.25,1.78-3.18A5.54,5.54,0,0,1,82.22,33l.31-.27h0s0,0-.08-.11l-.38-.46s0-.11.07-.17l.51-.14,1.11-.31.28-.08h0l.15,0-.15-.13-1.2-.78.66-.76.4-.46c.27-.29.52-.58.76-.85s.71-.77,1-1.06l.37-.05-.13-.2-.24.25c-.76.07-2.18.14-2.28.11.13,0,2.18-.26,2.59-.4Z"/>
+                <path class="cls-8" d="M86,27.13l.13.2-.37.05Z"/>
+                <path class="cls-6"
+                      d="M85.93,5.27a3.52,3.52,0,0,1,.09.85,4.77,4.77,0,0,1-.32,1.66,13.38,13.38,0,0,1-.94,1.93l-.14-.26h0c.06-.43.24-1.16.41-1.87a4.49,4.49,0,0,0,.09-1.42l0-.22a.2.2,0,0,1,.08,0,.38.38,0,0,1,.09.08l-.07,0v0h0l.06,0a0,0,0,0,1,0,0,.57.57,0,0,1,.11-.1l-.12.07v0l.7-.38a.77.77,0,0,0-.67-.23h-.14l.28-.12C85.68,5.23,85.92,5.21,85.93,5.27Z"/>
+                <path class="cls-6"
+                      d="M86,5.68l-.7.38A.38.38,0,0,0,85.17,6a.2.2,0,0,0-.08,0,3.17,3.17,0,0,0-.1-.38s.06,0,.15-.1h.15A.77.77,0,0,1,86,5.68Z"/>
+                <path class="cls-6"
+                      d="M85.64,12.47a6.33,6.33,0,0,1-.18,1.31,5.29,5.29,0,0,1-.56,1.76,9.48,9.48,0,0,1,.1-1.82,7.64,7.64,0,0,0,0-1.22,4.42,4.42,0,0,0-.1-.54s0-.24-.11-.57-.2-.76-.35-1.19a11.42,11.42,0,0,1-.56-1.74c.07,0,.38.4.7,1h0c0,.22,0,.35,0,.37s.07,0,.13-.11c0,.1.1.21.16.31a9.92,9.92,0,0,1,.49,1.21c.12.34.17.59.18.6A6.26,6.26,0,0,1,85.64,12.47Z"/>
+                <path class="cls-6" d="M85.27,6.09,85.39,6a.57.57,0,0,0-.11.1A0,0,0,0,0,85.27,6.09Z"/>
+                <path class="cls-9" d="M85.26,6.06v0l-.06,0h0v0Z"/>
+                <path class="cls-6"
+                      d="M85.14,5.46c-.09,0-.15.08-.15.1a3.17,3.17,0,0,1,.1.38A1.71,1.71,0,0,0,84,6.05a2.85,2.85,0,0,0-1.1.74,1.39,1.39,0,0,0-.24.35l-.5-.72a2.49,2.49,0,0,0,.44-.09,11.1,11.1,0,0,0,1.32-.49A5.33,5.33,0,0,1,85.14,5.46Z"/>
+                <path class="cls-3"
+                      d="M85.71,27.38c-.28.29-.62.65-1,1.06s-.49.56-.76.85l-.4.46-.66.76-.28-.09c.29-1,.59-2.12.81-2.93C83.53,27.52,85,27.45,85.71,27.38Z"/>
+                <path class="cls-6"
+                      d="M84.93,20.44c0,.5,0,1,0,1.39s-.06.65-.06.67,0,.27-.1.65-.18.88-.31,1.36-.32,1-.46,1.31a3.35,3.35,0,0,1-.26.57,14.12,14.12,0,0,1,.43-1.68c0,.13,0,.19,0,.19s0-.22,0-.61.16-.85.2-1.19.07-.63.08-.64,0-.27.07-.65.08-.88.1-1.38c0-.76,0-1.53,0-1.84h0l.05,0A12.72,12.72,0,0,1,84.93,20.44Z"/>
+                <path class="cls-6"
+                      d="M84.23,42.73c.44.18.69.36.67.4a3.54,3.54,0,0,1-.75-.15,15.35,15.35,0,0,0-1.64-.3c-.6-.08-1.21-.15-1.67-.19l-.8-.06-.79-.1a5.52,5.52,0,0,0-1.61,0,13.16,13.16,0,0,0-1.43.34V42.4a8.88,8.88,0,0,1,1.33-.48,5.75,5.75,0,0,1,.92-.18,5.87,5.87,0,0,1,.83,0l.82,0s.34,0,.81.12,1.07.19,1.68.34A11,11,0,0,1,84.23,42.73Z"/>
+                <path class="cls-9" d="M84.79,18.53l-.05,0a.79.79,0,0,1,0-.14S84.78,18.47,84.79,18.53Z"/>
+                <path class="cls-6" d="M84.62,9.45l.14.26c-.06.08-.11.12-.13.11S84.59,9.67,84.62,9.45Z"/>
+                <path class="cls-3"
+                      d="M84.25,31.42l-.15,0h0l-.28.08-1.11.31-.51.14c.13-.37.29-.94.47-1.56l.28.09,1.2.78Z"/>
+                <path class="cls-6"
+                      d="M84.24,24c0,.11,0,.21,0,.3a.85.85,0,0,0,0,.17l-.06.25c0-.16-.07-.39-.11-.7s-.08-.63-.13-1a10.2,10.2,0,0,0-.47-1.21,4.69,4.69,0,0,0-1-1.17,6.62,6.62,0,0,0-1.33-1.08,6.21,6.21,0,0,0-3.58-.71,3.61,3.61,0,0,0-1.61.73,5.45,5.45,0,0,0-1.25,1.29A4.39,4.39,0,0,0,74,22.34l0,.09a3.44,3.44,0,0,0-.71.65s.21-.15.63-.36c0,0,0,0,0,.06-.86.76-1.1,1.77-1.2,4a11.17,11.17,0,0,0,.24,3.6h0a3.25,3.25,0,0,0,0,.33c0,.36,0,.74,0,1.13a.27.27,0,0,0-.15.18.32.32,0,0,0,.15.35A14.36,14.36,0,0,0,73,34.1a13.5,13.5,0,0,0,1,3.66l.1.22.08.16c0,.07.07.08.12.07l.15,0,.14-.07.41-.26c.53-.35,1.05-.73,1.55-1.09,1-.72,1.92-1.42,2.71-2s1.42-1.12,1.86-1.48c0,0,.21-.28.56-.71s.46-1.5,1-2.71c.06-.15.13-.32.19-.49.23-.59.44-1.28.6-1.85h0c-.22.81-.52,2-.81,2.93-.18.62-.34,1.19-.47,1.56L82,32l.09.12a1.54,1.54,0,0,1-.09.24A15.16,15.16,0,0,1,79.46,35c-.75.66-1.64,1.4-2.62,2.17-.49.39-1,.78-1.53,1.17l-.42.29a2.76,2.76,0,0,1-.3.15,1.42,1.42,0,0,1-.32.07.6.6,0,0,1-.68-.32l-.15-.28-.12-.23A15.86,15.86,0,0,1,72,30.71c.05-2,.2-3.43.21-3.51a32.86,32.86,0,0,1,.55-3.49c.11-.51.24-1.05.42-1.62A5.3,5.3,0,0,1,74,20.35a6.4,6.4,0,0,1,1.47-1.42,4.21,4.21,0,0,1,2-.82,6.82,6.82,0,0,1,3.92.93,7.31,7.31,0,0,1,1.39,1.22,5,5,0,0,1,1,1.34A7.16,7.16,0,0,1,84.2,23C84.22,23.36,84.23,23.7,84.24,24Z"/>
+                <path class="cls-8" d="M84.25,24.29c0,.39,0,.62,0,.61s0-.06,0-.19l.06-.25A.85.85,0,0,1,84.25,24.29Z"/>
+                <path class="cls-7"
+                      d="M84,24c0,.31.08.54.11.7a14.12,14.12,0,0,0-.43,1.68v0h0a.3.3,0,0,1,0,.11.39.39,0,0,1,0,.13s0,.06,0,.1,0,.18-.08.28a1.21,1.21,0,0,1,0,.18,1.8,1.8,0,0,1,0,.19s0,0,0,0a.42.42,0,0,0,0,.06,0,0,0,0,1,0,0c-.16.57-.37,1.26-.6,1.85l-1.35-.11a7.18,7.18,0,0,0,.15-2.11,4.53,4.53,0,0,0-.64-2,11.8,11.8,0,0,0-1.13-1.66,4.19,4.19,0,0,0-1.46-1.21,5,5,0,0,0-4.1,0l-.32.2,0-.09a4.39,4.39,0,0,1,.69-1.51,5.45,5.45,0,0,1,1.25-1.29,3.61,3.61,0,0,1,1.61-.73,6.21,6.21,0,0,1,3.58.71,6.62,6.62,0,0,1,1.33,1.08,4.69,4.69,0,0,1,1,1.17A10.2,10.2,0,0,1,83.91,23C84,23.38,84,23.72,84,24Z"/>
+                <path class="cls-8" d="M83.43,27.47v0h0A0,0,0,0,0,83.43,27.47Z"/>
+                <path class="cls-6" d="M83.66,32.5l-.72.23.21-.76C83.4,32.24,83.63,32.48,83.66,32.5Z"/>
+                <path class="cls-6"
+                      d="M83.34,41.11A14.82,14.82,0,0,1,81.12,41a10.13,10.13,0,0,0-1.52.06c-.41,0-.69.1-.7.1l-.72.09c-.42.06-1,.15-1.51.28l-.6.13c0-.13-.07-.26-.11-.38l.59-.2a14,14,0,0,1,1.52-.43l.73-.15s.32,0,.76,0a10.16,10.16,0,0,1,1.59.09A7.06,7.06,0,0,1,83.34,41.11Z"/>
+                <path class="cls-7"
+                      d="M81.47,29.23l1.35.11c-.06.17-.13.34-.19.49-.53,1.21-.65,2.28-1,2.71s-.56.71-.56.71c-.44.36-1.08.88-1.86,1.48s-1.71,1.31-2.71,2c-.5.36-1,.74-1.55,1.09l-.41.26-.14.07-.15,0c-.05,0-.11,0-.12-.07L74.06,38l-.1-.22a13.5,13.5,0,0,1-1-3.66,14.36,14.36,0,0,1-.13-1.69.54.54,0,0,0,.17.07,3.86,3.86,0,0,0,1.09,0,15.52,15.52,0,0,0,2.54-.42A14,14,0,0,0,80,30.75a6.71,6.71,0,0,0,.84-.59,4.54,4.54,0,0,0,.38-.38,1.25,1.25,0,0,0,.09-.12l.09-.16C81.42,29.41,81.45,29.31,81.47,29.23Z"/>
+                <path class="cls-8" d="M82,32l.16-.05c0,.06-.05.12-.07.17Z"/>
+                <path class="cls-6"
+                      d="M81.62,27.12a7.18,7.18,0,0,1-.15,2.11c0,.08,0,.18-.08.27l-.09.16a1.25,1.25,0,0,1-.09.12,4.54,4.54,0,0,1-.38.38,6.71,6.71,0,0,1-.84.59,14,14,0,0,1-3.33,1.35,15.52,15.52,0,0,1-2.54.42,3.86,3.86,0,0,1-1.09,0,.54.54,0,0,1-.17-.07,4.68,4.68,0,0,1,0-.53.4.4,0,0,1,.29-.05,3.21,3.21,0,0,0,.81.06h0a2.69,2.69,0,0,0,1.72.23,3.31,3.31,0,0,0,1.76-.88,11.78,11.78,0,0,0,2.26-1,5.84,5.84,0,0,0,.77-.53,2.46,2.46,0,0,0,.33-.31l.07-.08s0,0,0-.06a.65.65,0,0,0,.07-.21,7,7,0,0,0,.18-1.95,6.79,6.79,0,0,0-1.6-3.48,3.85,3.85,0,0,0-1.31-1.15,4.3,4.3,0,0,0-1.53-.45h-.51a1.81,1.81,0,0,0-1.52.15,4.26,4.26,0,0,0-.7.47h0l-.1,0c0-.09,0-.19.08-.29l.32-.2a5,5,0,0,1,4.1,0,4.19,4.19,0,0,1,1.46,1.21A11.8,11.8,0,0,1,81,25.1,4.53,4.53,0,0,1,81.62,27.12Z"/>
+                <path class="cls-10"
+                      d="M81.16,27.14A7,7,0,0,1,81,29.09a.65.65,0,0,1-.07.21s0,0,0,.06l-.07.08a2.46,2.46,0,0,1-.33.31,5.84,5.84,0,0,1-.77.53,11.78,11.78,0,0,1-2.26,1,5.92,5.92,0,0,0,1.7-4.14c.09-2.17-1.34-4.54-2.93-5h.5a4.3,4.3,0,0,1,1.53.45,3.85,3.85,0,0,1,1.31,1.15A6.79,6.79,0,0,1,81.16,27.14Z"/>
+                <path class="cls-8" d="M80.05,4c.16.17.21.27.18.32s-.15,0-.34,0l-.23-.06q-.14-.13-.27-.3l.47-.09Z"/>
+                <path class="cls-6"
+                      d="M79.86,3.81l-.47.09q.14.16.27.3c-.3-.08-.72-.23-1.23-.42S77,3.21,76.17,2.92A16.23,16.23,0,0,0,74,2.38a2.93,2.93,0,0,1,.9-.32L74.49,1l0-.06a14.46,14.46,0,0,1,2.14.87A24.26,24.26,0,0,1,78.8,3.07C79.25,3.36,79.6,3.61,79.86,3.81Z"/>
+                <path class="cls-6"
+                      d="M78.17,43.57c.6.25,1.15.62,1.1.7A5.18,5.18,0,0,1,78,44l-.84-.17-.38,0-.38,0H76a3.49,3.49,0,0,0,.18-.57,4.09,4.09,0,0,1,.7,0l.13,0,.33.07A9.1,9.1,0,0,1,78.17,43.57Z"/>
+                <path class="cls-11"
+                      d="M76.22,22.06c1.59.5,3,2.87,2.93,5a5.92,5.92,0,0,1-1.7,4.14c-.33.11-.64.2-.94.27a15.51,15.51,0,0,1-2.44.38H74a2.34,2.34,0,0,1-1-1.47h0c.1-1.82.25-3,.26-3.11s.1-1.45.46-3.41c.06-.36.15-.73.24-1.11a.36.36,0,0,1,.11-.1h0a5.88,5.88,0,0,1,2.18-.61Z"/>
+                <path class="cls-6"
+                      d="M76.51,31.51c.3-.07.61-.16.94-.27a3.31,3.31,0,0,1-1.76.88A2.69,2.69,0,0,1,74,31.89h.1A15.51,15.51,0,0,0,76.51,31.51Z"/>
+                <path class="cls-6" d="M76.21,42.4v.31l-.56.16a1.7,1.7,0,0,1,0-.22A4.25,4.25,0,0,1,76.21,42.4Z"/>
+                <path class="cls-6"
+                      d="M76.17,42.09a2.91,2.91,0,0,1,0,.31,4.25,4.25,0,0,0-.52.25,2.18,2.18,0,0,0,0-.51c0-.12,0-.25,0-.37l.41-.11C76.11,41.8,76.14,41.94,76.17,42.09Z"/>
+                <path class="cls-6" d="M76.21,42.71a3.7,3.7,0,0,1-.06.48,4,4,0,0,0-.65.14,3.1,3.1,0,0,0,.15-.46Z"/>
+                <path class="cls-6"
+                      d="M76.15,43.19a3.49,3.49,0,0,1-.18.57h0l-.41,0-.32,0a2.7,2.7,0,0,0,.17-.31l.09-.18A4,4,0,0,1,76.15,43.19Z"/>
+                <path class="cls-6" d="M76,41.28c0,.12.08.25.11.38l-.41.11c0-.12,0-.24,0-.35Z"/>
+                <path class="cls-6"
+                      d="M76,41.28l-.35.14c0-.29-.1-.55-.16-.77a1.23,1.23,0,0,0-.17-.42c-.07-.08-.14-.1-.14-.13s.08-.05.22,0a1.1,1.1,0,0,1,.33.45h0A5.14,5.14,0,0,1,76,41.28Z"/>
+                <path class="cls-6"
+                      d="M74.69,22.21a1.81,1.81,0,0,1,1.52-.15,5.88,5.88,0,0,0-2.18.61h0A4.26,4.26,0,0,1,74.69,22.21Z"/>
+                <path class="cls-6"
+                      d="M75.56,43.79l.41,0a4.13,4.13,0,0,1-.38.71,6.18,6.18,0,0,1-.52.59,7,7,0,0,1-1.28,1,2.41,2.41,0,0,1-.56.22,3,3,0,0,1-1,.07c-.43-.05-.7-.15-.7-.2s.3,0,.7,0a2.76,2.76,0,0,0,1.36-.44,7.27,7.27,0,0,0,1.09-1c.27-.31.41-.54.43-.55s.07-.1.18-.27Z"/>
+                <path class="cls-6"
+                      d="M75.69,42.65a1.7,1.7,0,0,0,0,.22c-.23.06-.36.09-.37.06S75.42,42.79,75.69,42.65Z"/>
+                <path class="cls-6" d="M75.61,41.42c0,.11,0,.23,0,.35-.65.16-1.15.31-1.17.23A4,4,0,0,1,75.61,41.42Z"/>
+                <path class="cls-6" d="M75.5,43.33l-.09.18a2.7,2.7,0,0,1-.17.31c-.5.07-.93.16-.95.09s.54-.4,1.18-.58Z"/>
+                <path class="cls-6"
+                      d="M75,42.81a.77.77,0,0,1,0,.38c-.06.14-.15.22-.27.2a.33.33,0,0,1-.23-.23.37.37,0,0,1,0-.38s.08,0,.14.08c-.12.11,0,.43.13.4s.22-.54.14-.51a2.65,2.65,0,0,0-.27.11s.06-.07.21-.14.09,0,.12,0A.17.17,0,0,1,75,42.81Z"/>
+                <path class="cls-6"
+                      d="M74.49,1l.42,1.09a2.93,2.93,0,0,0-.9.32l-.69-.13L73,2.19,73.22,2A9.11,9.11,0,0,1,74.49,1Z"/>
+                <path class="cls-6"
+                      d="M74.61,42.87a.55.55,0,0,0,.06.08h0v0s0,0,0,0,0,.07.06,0l0-.09s0,0,0-.06,0,0,0,0A.36.36,0,0,1,74.61,42.87Zm.25-.12c.08,0,0,.49-.14.51s-.25-.29-.13-.4A2.65,2.65,0,0,1,74.86,42.75Z"/>
+                <path class="cls-6"
+                      d="M74.79,42.87s0,.05,0,.06l0,.09s-.07,0-.06,0,0,0,0,0v0h0a.55.55,0,0,1-.06-.08.36.36,0,0,0,.14,0S74.79,42.85,74.79,42.87Z"/>
+                <path class="cls-6"
+                      d="M74.51.91l0,.06a9.11,9.11,0,0,0-1.27,1L73,2.19a3.64,3.64,0,0,1-.44-.07l-.41-.05a1.48,1.48,0,0,0-.31,0,8.43,8.43,0,0,0-1.47.11c-.31,0-.62.1-.92.15l0,0a4.35,4.35,0,0,0-.7-1,1.22,1.22,0,0,0-.45-.3L68.16.37c.63-.07,1.29-.15,2-.18A10.33,10.33,0,0,1,72,.24c.16,0,.34.07.51.1l.4.11.79.21Z"/>
+                <path class="cls-6"
+                      d="M74.37,41.41a.5.5,0,0,1-.21.35.48.48,0,0,1-.4.09.19.19,0,0,1-.13-.24.56.56,0,0,1,.13-.24l.06-.08s.08,0,.14.1c-.27.26-.24.39,0,.33s.46-.46.23-.39l-.23.06s.08-.07.25-.12a.13.13,0,0,1,.13,0A.17.17,0,0,1,74.37,41.41Z"/>
+                <path class="cls-6"
+                      d="M74.19,41.33c.23-.07,0,.35-.23.39s-.27-.07,0-.33a.46.46,0,0,1,.11.12s0,0,0,0,0,.05,0,0a.46.46,0,0,0,.07-.07s0-.11,0-.09-.16,0-.17,0Z"/>
+                <path class="cls-6"
+                      d="M74.18,43.17a.69.69,0,0,1-.22.62c-.32.22-.44.26-.54.74a.57.57,0,0,1-.23.3.51.51,0,0,1-.16.09s-.09,0-.12,0,0,0,0,0a.83.83,0,0,1,.06-.21.36.36,0,0,0,0-.11s0,0,0-.22c0,0,0,0,0,0h0l-.08,0-.14,0c-.08,0-.13,0-.13,0s0,0,.09-.1a.55.55,0,0,1,.38-.14c.1.09,0,.21,0,.31s.06,0,.09,0l.08-.08a.38.38,0,0,0,.07-.21v0a.19.19,0,0,1,0-.08.42.42,0,0,1,0-.1.34.34,0,0,1,.07-.11,1.62,1.62,0,0,1,.18-.19l.18-.15c.15-.13.07-.38-.11-.6a1.4,1.4,0,0,0-.32-.28,1.06,1.06,0,0,0-.38-.12,3.17,3.17,0,0,0-.87,0H72l-.11,0-.21.07-.23.08a1.53,1.53,0,0,1-.29,0l-.25-.05h-.06a1.17,1.17,0,0,0-.27.05,3.85,3.85,0,0,0-.58.19,2.5,2.5,0,0,0-.94.59,1.5,1.5,0,0,0-.4.95,1.46,1.46,0,0,0,.1.57.46.46,0,0,0,.35.31,1.69,1.69,0,0,0,1.19-.29,2.2,2.2,0,0,0,.25-.17l.11-.1.07-.06a.2.2,0,0,0,.06-.15c0-.06-.07-.08-.11-.1a1.29,1.29,0,0,0-.41,0,.4.4,0,0,0-.29.1.84.84,0,0,0-.12.19s-.07.07-.08.06,0,0,0-.08a.54.54,0,0,1,.08-.25.56.56,0,0,1,.38-.21,1.32,1.32,0,0,1,.57,0,.4.4,0,0,1,.29.21.42.42,0,0,1-.08.38,2,2,0,0,1-.13.18l-.12.12a2,2,0,0,1-.28.23l-.33.2a.28.28,0,0,1-.15-.15.21.21,0,0,0-.16.07c-.07.06-.12.12-.11.13l.08.1a1.8,1.8,0,0,1-.81.09,1,1,0,0,1-.72-.56,2,2,0,0,1-.19-.79,2,2,0,0,1,.49-1.33,2.37,2.37,0,0,1,.79-.63l.36-.18a4.5,4.5,0,0,1,.69-.2,3,3,0,0,1,.37,0,.83.83,0,0,1,.29,0l.13,0h.11l.17,0,.2-.07.11,0,.16,0a3.59,3.59,0,0,1,1,0,1.34,1.34,0,0,1,.56.22,1.73,1.73,0,0,1,.41.4A1.19,1.19,0,0,1,74.18,43.17Z"/>
+                <path class="cls-6"
+                      d="M74.13,41.41s.05.05,0,.09a.46.46,0,0,1-.07.07s-.07,0,0,0,0,0,0,0a.46.46,0,0,0-.11-.12S74.06,41.41,74.13,41.41Z"/>
+                <path class="cls-6"
+                      d="M73.32,2.25l.69.13a3.27,3.27,0,0,0-.42.21,6.43,6.43,0,0,0-.73.48,3.69,3.69,0,0,0-.72.78,8.45,8.45,0,0,0-.67,1.2,15.41,15.41,0,0,0-.75,2l-.15.49s0,0,0,0l0-.13,0-.25-.06-.49c-.05-.32-.09-.64-.13-.94a5.8,5.8,0,0,0-.21-.89c-.07-.19-.16-.38-.24-.55a6.8,6.8,0,0,0-1-1.53l-.28-.29.87-.18a12.39,12.39,0,0,1,.83,1.76,5.46,5.46,0,0,1,.21.61,3,3,0,0,1,.1.5q0,.27.06.57l0,.32,0,.16V6.3s0,0,0,0A2.55,2.55,0,0,1,70.77,6c.15-.43.3-.84.43-1.18a13.45,13.45,0,0,1,.62-1.26,4.62,4.62,0,0,1,.72-1l.42-.4Z"/>
+                <path class="cls-10" d="M73.89,22.72l.1,0a.36.36,0,0,0-.11.1S73.89,22.74,73.89,22.72Z"/>
+                <path class="cls-6" d="M74,22.43c0,.1,0,.2-.08.29-.42.21-.6.36-.63.36A3.44,3.44,0,0,1,74,22.43Z"/>
+                <path class="cls-10"
+                      d="M74,31.89a3.21,3.21,0,0,1-.81-.06.4.4,0,0,0-.29.05c0-.39,0-.77,0-1.13a3.25,3.25,0,0,1,0-.33A2.34,2.34,0,0,0,74,31.89Z"/>
+                <path class="cls-6"
+                      d="M74,60.42a.55.55,0,0,1-.14.35,1.17,1.17,0,0,1-.24.21,2.14,2.14,0,0,1-.48.27.83.83,0,0,1-.4,0,.13.13,0,0,0,0-.06.86.86,0,0,0,.34-.09,2.23,2.23,0,0,0,.42-.3c.14-.12.28-.25.26-.41a2,2,0,0,0-.47-.93.61.61,0,0,0-.36-.23.21.21,0,0,1,0-.13v0c0-.09,0-.16.1-.16s.07,0,.18.08a1.17,1.17,0,0,1,.34.28,2.35,2.35,0,0,1,.29.49A1.59,1.59,0,0,1,74,60.42Z"/>
+                <path class="cls-3"
+                      d="M73.8,60.42c0,.16-.12.29-.26.41a2.23,2.23,0,0,1-.42.3.86.86,0,0,1-.34.09,4.88,4.88,0,0,0,.08-.61,6.06,6.06,0,0,0,.06-1c0-.18,0-.34,0-.48h0a.21.21,0,0,0,0,.13.61.61,0,0,1,.36.23A2,2,0,0,1,73.8,60.42Z"/>
+                <path class="cls-6"
+                      d="M73.88,22.78c-.09.38-.18.75-.24,1.11-.36,2-.44,3.33-.46,3.41s-.16,1.29-.26,3.11a11.17,11.17,0,0,1-.24-3.6C72.78,24.55,73,23.54,73.88,22.78Z"/>
+                <path class="cls-12"
+                      d="M73.59,42.9c.18.22.26.47.11.6l-.18.15a1.62,1.62,0,0,0-.18.19.34.34,0,0,0-.07.11.42.42,0,0,0,0,.1.19.19,0,0,0,0,.08v0a.38.38,0,0,1-.07.21l-.08.08s-.09.06-.09,0,.12-.22,0-.31a.55.55,0,0,0-.38.14c-.07.06-.1.09-.09.1s0,0,.13,0l.14,0,.08,0h0s0,0,0,0c0,.2,0,.17,0,.22a.36.36,0,0,1,0,.11.83.83,0,0,0-.06.21s0,0,0,0v0c-.05,0-.09,0-.14,0s-.27.2-.39.27a.58.58,0,0,1-.44.13.16.16,0,0,0,0-.14c0-.09-.09-.09-.09-.08a.3.3,0,0,1,0,.09s-.08.09-.18.13a3.33,3.33,0,0,1-.78.22,1.59,1.59,0,0,1-.76,0l-.07,0,.33-.2a2,2,0,0,0,.28-.23l.12-.12a2,2,0,0,0,.13-.18.42.42,0,0,0,.08-.38.4.4,0,0,0-.29-.21,1.32,1.32,0,0,0-.57,0,.56.56,0,0,0-.38.21.54.54,0,0,0-.08.25s0,.07,0,.08,0,0,.08-.06a.84.84,0,0,1,.12-.19.4.4,0,0,1,.29-.1,1.29,1.29,0,0,1,.41,0s.1,0,.11.1a.2.2,0,0,1-.06.15l-.07.06-.11.1a2.2,2.2,0,0,1-.25.17,1.69,1.69,0,0,1-1.19.29.46.46,0,0,1-.35-.31,1.46,1.46,0,0,1-.1-.57,1.5,1.5,0,0,1,.4-.95,2.5,2.5,0,0,1,.94-.59,3.85,3.85,0,0,1,.58-.19,1.17,1.17,0,0,1,.27-.05h.06l.25.05a1.53,1.53,0,0,0,.29,0l.23-.08.21-.07.11,0H72a3.17,3.17,0,0,1,.87,0,1.06,1.06,0,0,1,.38.12A1.4,1.4,0,0,1,73.59,42.9Z"/>
+                <path class="cls-6"
+                      d="M73.66,53.78a3,3,0,0,1-.08.71c-.1.39-.26.81-.38,1.27s-.3,1.15-.38,1.5c0-.17,0-.36-.09-.56s0-.28-.07-.42,0-.41.08-.62c.06-.47.2-1,.25-1.28a2,2,0,0,0,0-.4.79.79,0,0,0,0-.14.91.91,0,0,0-.11-.44,1.84,1.84,0,0,0-.94-.61l-.11,0c0-.18-.09-.36-.15-.53l.4.13a2.22,2.22,0,0,1,1.29.7,1.42,1.42,0,0,1,.24.51C73.65,53.7,73.65,53.78,73.66,53.78Z"/>
+                <path class="cls-6"
+                      d="M73.25,46.34s-.07.28-.36.6a2.84,2.84,0,0,1-1.33.85,4.87,4.87,0,0,1-1,.18v0a.33.33,0,0,0-.32-.31l-.49.2v-.4l.12-.09.21,0a4.38,4.38,0,0,0,1.39,0,3.16,3.16,0,0,0,1.28-.58,4.89,4.89,0,0,1,.52-.42Z"/>
+                <path class="cls-3"
+                      d="M73,54a2,2,0,0,1,0,.4c0,.31-.19.81-.25,1.28,0,.21-.06.42-.08.62-.15-.86-.4-1.9-.66-2.93l-.16-.6.11,0a1.84,1.84,0,0,1,.94.61.91.91,0,0,1,.11.44A.79.79,0,0,1,73,54Z"/>
+                <path class="cls-6"
+                      d="M72.92,45c-.06,0-.21.24-.42.45a.76.76,0,0,1-.55.18.47.47,0,0,1-.24-.08.2.2,0,0,0,.09-.06.47.47,0,0,0,.13-.11h0a.58.58,0,0,0,.44-.13c.12-.07.27-.2.39-.27s.09-.06.14,0L73,45A0,0,0,0,1,73,45h0S73,45.06,72.92,45Z"/>
+                <path class="cls-6"
+                      d="M72.92,59.13c0,.14,0,.3,0,.48a6.06,6.06,0,0,1-.06,1,4.88,4.88,0,0,1-.08.61h-.14s0,0,.13.05a15.64,15.64,0,0,1-2,5.16c-.32.55-.68,1.11-1.07,1.68.08-.34.11-.56.06-.59a8.26,8.26,0,0,0-1.23,2l-.28.52v0a5.08,5.08,0,0,1-1.66,1.26,9.59,9.59,0,0,1-2.31.74l-.66.11v-.09c0-.08,0-.14,0-.17v0h-1s0,.18,0,.44h-.07c0-.27,0-.42-.08-.43s-.06.16-.11.45c-.19,0-.38,0-.57,0a14.62,14.62,0,0,1-2.55-.07,9.7,9.7,0,0,1-2.18-.62,4.84,4.84,0,0,0-.26-.43s0,0,0,0S57,71,57,71l-1.24-.44a3.26,3.26,0,0,1-.11.33c-.37-.22-.73-.46-1.08-.71a17.72,17.72,0,0,1-2-1.68l-.19-.21a.76.76,0,0,0,.12-.61A8.22,8.22,0,0,1,52,66.29l.13-.07a6.9,6.9,0,0,0,1.1,1.62l.14.13,0,0,.16.24.09-.06c.21.21.44.41.67.61a.23.23,0,0,1-.18,0l-.15.25a.57.57,0,0,0,.28.08.42.42,0,0,0,.28-.1l.61.47a10.2,10.2,0,0,0,4.36,2,15.88,15.88,0,0,0,2.4.12,16.42,16.42,0,0,0,2.35-.22A5.89,5.89,0,0,0,68,69.45a28.34,28.34,0,0,0,2.4-3.28,15.37,15.37,0,0,0,2.22-5.6c.23-1.45.13-2.3.2-2.3a2.49,2.49,0,0,1,.09.6C72.9,59,72.91,59,72.92,59.13Z"/>
+                <path class="cls-8"
+                      d="M72.86,31.88a4.68,4.68,0,0,0,0,.53.32.32,0,0,1-.15-.35A.27.27,0,0,1,72.86,31.88Z"/>
+                <path class="cls-6"
+                      d="M72.82,57.26c.07.61.05,1,0,1s-.26-.5-.55-1.28h0a.66.66,0,0,1,0-.15l-.73-2,.14-.14a3.1,3.1,0,0,0,.37-.46.27.27,0,0,0-.16-.38c-.17-.08-.34-.06-.4,0s-.07.11-.2.27c-.06-.17-.12-.34-.19-.52l-.31-.84.11,0,.33-.08L70.81,52a3.28,3.28,0,0,0,1,.73l.16.6c.26,1,.51,2.07.66,2.93a2.62,2.62,0,0,0,0,1.31S72.77,57.47,72.82,57.26Z"/>
+                <path class="cls-3"
+                      d="M72.25,57c.29.78.46,1.29.55,1.28-.07,0,0,.85-.2,2.3a15.37,15.37,0,0,1-2.22,5.6A28.34,28.34,0,0,1,68,69.45a5.89,5.89,0,0,1-3.79,1.9,16.42,16.42,0,0,1-2.35.22,15.88,15.88,0,0,1-2.4-.12,10.2,10.2,0,0,1-4.36-2L54.47,69h0a1.6,1.6,0,0,0,.26-1.3.18.18,0,0,0-.19-.11h-.83l-.21,0,.06.2s0,.12-.21.24l-.14-.13a6.9,6.9,0,0,1-1.1-1.62l-.18-.35q-.15-.32-.27-.63a.24.24,0,0,0,.14,0,.37.37,0,0,0,.27-.31.48.48,0,0,0-.17-.41.36.36,0,0,0-.18-.11,1.48,1.48,0,0,1-.42-.19s0,0-.05,0a23,23,0,0,1-.76-2.84c-.16-.74-.28-1.48-.38-2.2l.12,0c.26-.08.66-.2,1.22-.39a10.72,10.72,0,0,0,2.1-1c.41-.26.83-.56,1.28-.91l.74-.6c.31-.25.48-.46.79-.72a6.55,6.55,0,0,1,.56-.6l0,0A7.67,7.67,0,0,1,56,55c-.4,0-.82.08-1.16.09l-.82,0a9.68,9.68,0,0,1-1.4-.1,5.38,5.38,0,0,1-1.85-.65,3.29,3.29,0,0,1-.67-.53c0-.29.08-.58.13-.86a15.28,15.28,0,0,1,.42-1.65,4.78,4.78,0,0,0,.81.2,6.94,6.94,0,0,0,2-.08l.62-.09.81-.14.89-.16.48-.09c.12,0,0,0,0-.06s-.14,0-.15,0-.17-.1-.17-.11l-.17-.07,1.7-.25h0a15.19,15.19,0,0,0,1.8-1.48c.45-.37.91-.73,1.27-1l.45-.3a16.2,16.2,0,0,0,3.42,1,9.28,9.28,0,0,0,2,0v0a1,1,0,0,0,.19.14,3.7,3.7,0,0,0,.44.28,1.84,1.84,0,0,0,.47.15,2.79,2.79,0,0,0,1.18,0,6.28,6.28,0,0,0,.66-.23s.07.17.12.33a.27.27,0,0,1,.08.19h0v0a1.16,1.16,0,0,1-.18.51,1.92,1.92,0,0,1-.18.29,2.28,2.28,0,0,1-1.25.69l-.51.09-.61.1a4.7,4.7,0,0,0-.71.14l-.16,0-.09,0s0,.06,0,.08a1.84,1.84,0,0,0,.15.35,2.3,2.3,0,0,0,.52.6,3.18,3.18,0,0,0,.58.35,3.49,3.49,0,0,0,1.12.31A6.5,6.5,0,0,0,69.86,53c.37-.07.64-.13.85-.19h0l.31.84c.07.18.13.35.19.52l-.08.1a2.71,2.71,0,0,1-1,.68,3.82,3.82,0,0,1-1.73.24l-1-.09c-.26,0-.59-.08-1-.17s-.83-.23-1.29-.36l.11.14,0,0v0l0,0,.35.32a9.75,9.75,0,0,0,.74.64l.43.32.29.18a5.33,5.33,0,0,0,.56.32,5.15,5.15,0,0,0,2.26.61A5.47,5.47,0,0,0,72.25,57Zm-1.92,3.55a3.52,3.52,0,0,0,.29-.4,3.56,3.56,0,0,0-.45-.13l-.27,0c-.16,0-.32,0-.3.05a2.64,2.64,0,0,0,.26.11l.24.1c.06,0,0,0,.05,0s0,0-.06,0l-.11.12a.56.56,0,0,1-.24.17c-.09,0-.15,0-.16-.1s0-.16,0-.17-.07,0-.1.16a.27.27,0,0,0,0,.23.39.39,0,0,0,.26.11A1,1,0,0,0,70.33,60.54Zm-.14,3s.18-.11,0-.29a1.78,1.78,0,0,0-.74-.06l-.33,0a1.15,1.15,0,0,0-.31,0,3.87,3.87,0,0,0-1,.41,1.55,1.55,0,0,1-.32.14c-.07,0-.12,0-.12,0s-.09,0-.1.12a.63.63,0,0,0,.18.34.9.9,0,0,0,.45.32.84.84,0,0,0,.6-.22,4.68,4.68,0,0,1,.91-.55l.11,0,.18-.06.3-.09A.88.88,0,0,0,70.19,63.49Zm-1.1,3.9c0-.21-.16-.29-.3-.25a1,1,0,0,0-.2,0,3.56,3.56,0,0,0-.62.34c-.28.19-.53.42-.5.45s.31-.12.62-.25a4,4,0,0,1,.41-.17l.19-.06s.07,0,.07,0,0,0,0,0,0,.14,0,.22-.05.18-.07.25-.16.14-.18.17,0,0,.09,0,.16-.05.22-.12a1.74,1.74,0,0,0,.14-.27A2.09,2.09,0,0,0,69.09,67.39Zm-4.54-3.93a.18.18,0,0,0-.06-.23c-.14-.06-.13,0-.15,0H64a3.24,3.24,0,0,0-.67,0,.81.81,0,0,0-.52.46c-.07.17-.08.29-.06.3a2.44,2.44,0,0,0,.94-.07,1.63,1.63,0,0,0,.62-.28l.07,0a.11.11,0,0,0,.06,0S64.51,63.53,64.55,63.46Zm-.92,3.12c0-.13-.12-.24-.23-.28a2.15,2.15,0,0,0-.52-.13l-.36,0a1,1,0,0,0-.78.31,1.22,1.22,0,0,0-.36,1,2.13,2.13,0,0,1,.52-.88.73.73,0,0,1,.59-.17l.35,0a2.92,2.92,0,0,1,.45.08l0,0v0a.5.5,0,0,1-.07.08c-.1.11-.24.24-.33.32-.34.14-.68.19-.68.22a1.18,1.18,0,0,0,.77,0,3.25,3.25,0,0,0,.42-.31l.09-.1A.5.5,0,0,0,63.63,66.58ZM60.11,69.3a.26.26,0,0,0,.07-.24.4.4,0,0,0-.22-.2c-.31-.14-.6,0-.57,0s.07,0,.16,0a.86.86,0,0,1,.28.11s0,.06,0,.06,0,0,0,0a1.49,1.49,0,0,1-.46.07.49.49,0,0,1-.19,0c-.06,0,.05,0,.05.07a.23.23,0,0,1,0,.07s0,0,0,0,0,0,0,0,0,0,0,0l.1,0a1.16,1.16,0,0,0,.4,0l.19,0A.58.58,0,0,0,60.11,69.3ZM57.7,62.89a.24.24,0,0,0,0-.17.2.2,0,0,0-.07-.15.37.37,0,0,0-.16-.1.81.81,0,0,0-.31-.06,2.63,2.63,0,0,0-.77.06c-.26,0-.52.06-.73.08l-.15,0-.06,0s0,.07,0,.08.09.06.09.06,0,0,0-.07h.18a3.66,3.66,0,0,0,.75,0,3.23,3.23,0,0,1,.71,0l.19,0h0s0,0,0,0-.35.38-.54.42a.67.67,0,0,1-.33-.05l-.34-.1A1.21,1.21,0,0,0,55.8,63s.1.09.29.18l.31.15a.91.91,0,0,0,.43.11.83.83,0,0,0,.42-.2l.27-.21A.59.59,0,0,0,57.7,62.89Z"/>
+                <path class="cls-6"
+                      d="M72.73,56.7c0,.2.06.39.09.56s-.09.33-.11.33a2.62,2.62,0,0,1,0-1.31C72.69,56.42,72.71,56.56,72.73,56.7Z"/>
+                <path class="cls-6" d="M72.78,61.22a.13.13,0,0,1,0,.06c-.09,0-.13,0-.13-.05Z"/>
+                <path class="cls-7"
+                      d="M73,2.19l-.42.4a4.62,4.62,0,0,0-.72,1,13.45,13.45,0,0,0-.62,1.26c-.13.34-.28.75-.43,1.18a2.55,2.55,0,0,0-.08.26s0,.07,0,0V6.22l0-.16,0-.32q0-.3-.06-.57a3,3,0,0,0-.1-.5,5.46,5.46,0,0,0-.21-.61,12.39,12.39,0,0,0-.83-1.76c.3,0,.61-.11.92-.15A8.43,8.43,0,0,1,71.8,2a1.48,1.48,0,0,1,.31,0l.41.05A3.64,3.64,0,0,0,73,2.19Z"/>
+                <path class="cls-6"
+                      d="M72.25,57h0a5.47,5.47,0,0,1-2.27.2,5.15,5.15,0,0,1-2.26-.61,5.33,5.33,0,0,1-.56-.32l-.29-.18-.43-.32a9.75,9.75,0,0,1-.74-.64l-.35-.32,0,0v0l0,0-.11-.14c.46.13.94.28,1.29.36s.69.13,1,.17l1,.09a3.82,3.82,0,0,0,1.73-.24,2.71,2.71,0,0,0,1-.68l.08-.1c.09.23.17.45.25.68a3.23,3.23,0,0,1-1.07.67,4.36,4.36,0,0,1-2,.22,10.19,10.19,0,0,1-1.08-.12l-.19,0-.16,0-.08,0,0,.05a.77.77,0,0,0,.13.12l.08.07.24.17c.17.12.35.22.52.33a5.15,5.15,0,0,0,2.09.67,10.19,10.19,0,0,0,1.62.09A4.86,4.86,0,0,1,72.25,57Z"/>
+                <path class="cls-7"
+                      d="M72.2,56.83a.66.66,0,0,0,0,.15,4.86,4.86,0,0,0-.63,0A10.19,10.19,0,0,1,70,56.92a5.15,5.15,0,0,1-2.09-.67c-.17-.11-.35-.21-.52-.33l-.24-.17-.08-.07a.77.77,0,0,1-.13-.12l0-.05.08,0,.16,0,.19,0a10.19,10.19,0,0,0,1.08.12,4.36,4.36,0,0,0,2-.22,3.23,3.23,0,0,0,1.07-.67Z"/>
+                <path class="cls-6"
+                      d="M71.82,53.86a.27.27,0,0,1,.16.38,3.1,3.1,0,0,1-.37.46l-.14.14c-.08-.23-.16-.45-.25-.68.13-.16.19-.26.2-.27S71.65,53.78,71.82,53.86Z"/>
+                <path class="cls-6"
+                      d="M71.75,45.41s0,0,0,0a.05.05,0,0,1-.06.06s0,0,0,.05h0a3.42,3.42,0,0,1-.69.28,1.77,1.77,0,0,1-.91,0,.68.68,0,0,1-.31-.18,2.07,2.07,0,0,0,.34-.15l.07,0a1.59,1.59,0,0,0,.76,0,3.33,3.33,0,0,0,.78-.22c.1,0,.17-.09.18-.13a.3.3,0,0,0,0-.09s.06,0,.09.08a.16.16,0,0,1,0,.14h0s-.05,0-.05,0a.3.3,0,0,0-.1.07h0A.08.08,0,0,0,71.75,45.41Z"/>
+                <path class="cls-6"
+                      d="M71.88,45.38s0,0,.05,0a.47.47,0,0,1-.13.11.2.2,0,0,1-.09.06h0s0,0,0-.05a.05.05,0,0,0,.06-.06h0A.3.3,0,0,1,71.88,45.38Z"/>
+                <path class="cls-6"
+                      d="M71.69,52.22c.06.17.1.35.15.53a3.28,3.28,0,0,1-1-.73h0l-.19-.36-.06.07c-.08-.11-.11-.19-.09-.21S71,51.94,71.69,52.22Z"/>
+                <path class="cls-6"
+                      d="M65,82.21h0q.11.44.18.87l1.5.82,2.42,0a2.26,2.26,0,0,0,1.07-.11,1,1,0,0,0,.36-.3l.09-.11a0,0,0,0,0,0,0,.89.89,0,0,1,0,.11h0l.27.19c.08-.1,0-.36-.13-.59l0-.08c.11-.17.21-.33.3-.49l.08-.15a.28.28,0,0,1,0,.07l.3-.13a1.54,1.54,0,0,0-.17-.23.86.86,0,0,0-.14-.13,1.18,1.18,0,0,0-.32-.66.73.73,0,0,0-.73-.28,7.83,7.83,0,0,0-.86.38,9.05,9.05,0,0,1-1.64.62,5.61,5.61,0,0,1-1.34,0c-.36,0-.64,0-.84,0h-.1l.21,0,.16,0h.08V82h0c.14,0,.3,0,.48-.06a6.81,6.81,0,0,0,1.29-.11,9.28,9.28,0,0,0,1.53-.68,6.59,6.59,0,0,1,.92-.45,1.08,1.08,0,0,1,.64,0,1.56,1.56,0,0,1,.52.34,1.79,1.79,0,0,1,.53,1.14.69.69,0,0,1,0,.39,2.73,2.73,0,0,1-.13.29c-.09.18-.19.35-.29.52s-.21.35-.34.53a1.52,1.52,0,0,1-.55.48,3,3,0,0,1-1.34.21l-2.58,0c-.66-.35-1.33-.69-2-1-.35-1.54-.7-3-1-4.43-.08-.32-.15-.62-.23-.92,0,0,0-.15-.05-.21l0-.13,0-.24-.06-.48c-.06-.62-.12-1.2-.17-1.74-.1-1.07-.19-2-.24-2.56,0-.23,0-.42-.05-.57.32,0,.65-.07,1-.12,0,.15,0,.36,0,.61,0,.61.11,1.49.2,2.56,0,.53.09,1.11.14,1.73,0,.27,0,.55.08.84l.08.29,0,.25c0,.17.08.33.11.5L65,82.2Zm5.66,1.37h0S70.66,83.57,70.68,83.58Z"/>
+                <path class="cls-8" d="M71.77,45.45s0,0,0,0A.08.08,0,0,1,71.77,45.45Z"/>
+                <path class="cls-8"
+                      d="M71.58,82.36l-.3.13a.28.28,0,0,0,0-.07l0-.07c0-.06,0-.06,0-.17s0-.12,0-.18a.86.86,0,0,1,.14.13A1.54,1.54,0,0,1,71.58,82.36Z"/>
+                <path class="cls-8"
+                      d="M71.29,82.18c0,.11,0,.11,0,.17l0,.07a.69.69,0,0,0-.42-.35,1.72,1.72,0,0,0-.5,0,.38.38,0,0,0-.16,0s-.07,0-.08,0,0,0,0,0a.27.27,0,0,1,.17-.09,1.51,1.51,0,0,1,.56-.08.88.88,0,0,1,.41.16C71.28,82.06,71.28,82.12,71.29,82.18Z"/>
+                <path class="cls-3"
+                      d="M71.24,82.42l-.08.15c-.09.16-.19.32-.3.49l0,.08a1.05,1.05,0,0,0-.31-.28,1.38,1.38,0,0,0-.6-.08c-.16,0-.26,0-.26,0s.1.06.25.09a1.51,1.51,0,0,1,.48.16.84.84,0,0,1,.26.35l-.09.11a1,1,0,0,1-.36.3,2.26,2.26,0,0,1-1.07.11l-2.42,0-1.5-.82q-.08-.43-.18-.87h.08l.32-.06h.12c.2,0,.48,0,.84,0a5.61,5.61,0,0,0,1.34,0,9.05,9.05,0,0,0,1.64-.62,7.83,7.83,0,0,1,.86-.38.73.73,0,0,1,.73.28,1.18,1.18,0,0,1,.32.66.88.88,0,0,0-.41-.16,1.51,1.51,0,0,0-.56.08.27.27,0,0,0-.17.09s-.06,0,0,0,0,0,.08,0a.38.38,0,0,1,.16,0,1.72,1.72,0,0,1,.5,0A.69.69,0,0,1,71.24,82.42Z"/>
+                <path class="cls-6"
+                      d="M70.81,52l.35.67-.33.08-.11,0h0c-.12-.31-.23-.63-.35-.93l.06,0,.13-.1a2.64,2.64,0,0,0,.25.29Z"/>
+                <path class="cls-6"
+                      d="M71.07,50c.19.63.41,1.39.62,2.2-.68-.28-1.18-.74-1.23-.7s0,.1.09.21l-.13.1-.06,0-.47-1.26a2.71,2.71,0,0,0,.46-.57,1.65,1.65,0,0,0,.18-.37l-1.06-.17h0a.27.27,0,0,0-.08-.19c0-.16-.1-.28-.12-.33a6,6,0,0,0,1.06-.57.41.41,0,0,0,.19-.24C70.61,48.52,70.86,49.32,71.07,50Z"/>
+                <path class="cls-8"
+                      d="M70.82,83.14c.17.23.21.49.13.59l-.27-.19h0a.89.89,0,0,0,0-.11,0,0,0,0,1,0,0C70.69,83.32,70.76,83.23,70.82,83.14Z"/>
+                <path class="cls-6"
+                      d="M70.2,46.69c.42-.35.62-.71.68-.65a1.07,1.07,0,0,1-.1.24,2.11,2.11,0,0,1-.41.59,2.7,2.7,0,0,1-.53.46h0l-.08,0h0v-.12h-.15l-.09,0h0a.2.2,0,0,0-.09.06.28.28,0,0,0-.13.25v.05c-.3.06-.85.19-1.4.36a7.15,7.15,0,0,1-1.37.28h-.17a4,4,0,0,1-1.07-.17,3.65,3.65,0,0,1-1-.49,15.58,15.58,0,0,1-1.3-1.21l.17-.11.26-.17c.44.38.87.76,1.21,1a2.87,2.87,0,0,0,.58.27l.26.08a4.51,4.51,0,0,0,.92.2,7.36,7.36,0,0,0,2-.12A3.92,3.92,0,0,0,70.2,46.69Z"/>
+                <path class="cls-8" d="M70.61,51.66l.19.36a2.64,2.64,0,0,1-.25-.29Z"/>
+                <path class="cls-9" d="M70.72,83.58h0s0,0,0,0Z"/>
+                <path class="cls-6"
+                      d="M70.54,47.93v0h-.09s0,0-.11,0A1.36,1.36,0,0,1,70,48a1.48,1.48,0,0,1-.31,0l-.16,0h0s.12,0,.12,0l.07,0h.06v0l.49-.2A.33.33,0,0,1,70.54,47.93Z"/>
+                <path class="cls-8" d="M70.45,48h.09a.52.52,0,0,1,0,.18A1.08,1.08,0,0,1,70.45,48Z"/>
+                <path class="cls-6"
+                      d="M70.36,51.87c.12.3.23.62.35.93-.21.06-.48.12-.85.19a6.5,6.5,0,0,1-1.71.12A3.49,3.49,0,0,1,67,52.8a3.18,3.18,0,0,1-.58-.35,2.3,2.3,0,0,1-.52-.6,1.84,1.84,0,0,1-.15-.35s0-.07,0-.08l.09,0,.16,0a4.7,4.7,0,0,1,.71-.14l.61-.1.51-.09a2.28,2.28,0,0,0,1.25-.69,1.92,1.92,0,0,0,.18-.29,1.16,1.16,0,0,0,.18-.51v0h0l.42,1.11a2.94,2.94,0,0,1-1.93.82l-1.08.1-.48,0-.12,0s-.11,0-.07,0a.57.57,0,0,0,.12.23,1.41,1.41,0,0,0,.36.37,2.64,2.64,0,0,0,1.53.43,3.93,3.93,0,0,0,1.47-.4A4.92,4.92,0,0,0,70.36,51.87Z"/>
+                <path class="cls-6" d="M69.47,49.5l1.06.17a1.65,1.65,0,0,1-.18.37,2.71,2.71,0,0,1-.46.57Z"/>
+                <path class="cls-6"
+                      d="M70.45,48a1.08,1.08,0,0,0,.06.18.41.41,0,0,1-.19.24,6,6,0,0,1-1.06.57l0,0c0-.16.2-.4.57-.53a1.51,1.51,0,0,0,.53-.42Z"/>
+                <path class="cls-8" d="M70.45,48h-.11C70.4,47.93,70.43,47.92,70.45,48Z"/>
+                <path class="cls-6"
+                      d="M70,48a1.36,1.36,0,0,0,.35,0,1.51,1.51,0,0,1-.53.42c-.37.13-.62.37-.57.53l0,0a6.28,6.28,0,0,1-.66.23,2.79,2.79,0,0,1-1.18,0,1.84,1.84,0,0,1-.47-.15,3.7,3.7,0,0,1-.44-.28,1,1,0,0,1-.19-.14v0h.08a6.07,6.07,0,0,0,.83-.17h0a.34.34,0,0,0,0,.15.9.9,0,0,0,.27.2,1.32,1.32,0,0,0,1,.09,1.66,1.66,0,0,0,.79-.36l.26-.18s.13-.12.13-.22v-.08a.76.76,0,0,0-.2-.16l.16,0A1.48,1.48,0,0,0,70,48Z"/>
+                <path class="cls-6"
+                      d="M70.62,60.14a3.52,3.52,0,0,1-.29.4,1,1,0,0,1-.57.29.39.39,0,0,1-.26-.11.27.27,0,0,1,0-.23c0-.12.09-.17.1-.16s0,.08,0,.17.07.11.16.1a.56.56,0,0,0,.24-.17l.11-.12s0,0,.06,0,0,0-.05,0l-.24-.1A2.64,2.64,0,0,1,69.6,60s.14-.07.3-.05l.27,0A3.56,3.56,0,0,1,70.62,60.14Z"/>
+                <path class="cls-6"
+                      d="M70.21,63.2c.16.18,0,.28,0,.29a.88.88,0,0,1-.2.1l-.3.09-.18.06-.11,0a4.68,4.68,0,0,0-.91.55.84.84,0,0,1-.6.22.9.9,0,0,1-.45-.32.63.63,0,0,1-.18-.34c0-.12.1-.13.1-.12a.15.15,0,0,0,0,.11.78.78,0,0,0,.2.26.8.8,0,0,0,.38.23c.14,0,.29-.11.45-.23a4.78,4.78,0,0,1,.92-.64l.09,0h0l0,0h-.57a5.22,5.22,0,0,0-1,.31,1.25,1.25,0,0,1-.36.09c-.09,0-.14,0-.13,0s0,0,.12,0a1.55,1.55,0,0,0,.32-.14,3.87,3.87,0,0,1,1-.41,1.15,1.15,0,0,1,.31,0l.33,0A1.78,1.78,0,0,1,70.21,63.2Z"/>
+                <path class="cls-7"
+                      d="M69.89,50.61l.47,1.26a4.92,4.92,0,0,1-.67.41,3.93,3.93,0,0,1-1.47.4,2.64,2.64,0,0,1-1.53-.43,1.41,1.41,0,0,1-.36-.37.57.57,0,0,1-.12-.23s0,0,.07,0l.12,0,.48,0,1.08-.1a2.94,2.94,0,0,0,1.93-.82Z"/>
+                <path class="cls-6"
+                      d="M70,45.42a.28.28,0,0,0,.15.15,2.07,2.07,0,0,1-.34.15l-.08-.1s0-.07.11-.13A.21.21,0,0,1,70,45.42Z"/>
+                <path class="cls-6"
+                      d="M69.81,67.53s0,.25-.06.59c-.39.57-.83,1.14-1.29,1.72l-.16.21.28-.52A8.26,8.26,0,0,1,69.81,67.53Z"/>
+                <path class="cls-6" d="M69.81,47.32h0l-.12.09v-.09h0v0h0Z"/>
+                <path class="cls-6" d="M69.73,47.82v0h0Z"/>
+                <path class="cls-6"
+                      d="M69.72,47.42v.4l0,0h0a1.21,1.21,0,0,0,0-.14.21.21,0,0,1,0-.11s0,0,0,0,0,0,0,0l0,0Z"/>
+                <path class="cls-9" d="M69.72,47.3h0v0Z"/>
+                <path class="cls-6" d="M69.72,47.33v.09l-.09.06a.47.47,0,0,0,.07-.12Z"/>
+                <path class="cls-6"
+                      d="M69.72,47.32h0l0,0a.47.47,0,0,1-.07.12l-.17.09a.51.51,0,0,0-.23,0v-.05a.28.28,0,0,1,.13-.25.2.2,0,0,1,.09-.06h0l.09,0h.15v.14Z"/>
+                <path class="cls-3"
+                      d="M69.72,48.06v.08c0,.1-.13.22-.13.22l-.26.18a1.66,1.66,0,0,1-.79.36,1.32,1.32,0,0,1-1-.09.9.9,0,0,1-.27-.2.34.34,0,0,1,0-.15h0c.25-.08.49-.17.69-.25a8.55,8.55,0,0,0,1.35-.5c0,.06.07.12.1.13l.06,0,0,0h0A.76.76,0,0,1,69.72,48.06Z"/>
+                <path class="cls-6"
+                      d="M69.65,31.44a14.28,14.28,0,0,1-.16,3.36,12.55,12.55,0,0,1-2,4.7c-.7,1-1.25,1.52-1.3,1.47a3,3,0,0,1,.29-.42c.19-.28.46-.68.76-1.2a13.51,13.51,0,0,0,1.65-4.65,13.85,13.85,0,0,0,0-3.23,34.74,34.74,0,0,0-.39-3.57,11,11,0,0,0-1.17-3.44A7.92,7.92,0,0,0,65,21.83l0,0a8.32,8.32,0,0,0-4.87-1.68,29.13,29.13,0,0,0-4.62.59,16.12,16.12,0,0,0-3.07,1c-.7.31-1.08.56-1.14.58s-.57.33-1.36.94a24.3,24.3,0,0,0-3,2.81,25.21,25.21,0,0,0-1.74,2.1c-.14.2-.29.4-.43.61l-.11.14v0s0,0,0,.05l0,0,.23.27.52.6A48.11,48.11,0,0,0,50,34.5a24.1,24.1,0,0,0,2.66,2c.22.15.46.29.69.43l.7.38c.48.25,1,.48,1.45.7,1.92.92,3.72,1.74,5.29,2.33A15.08,15.08,0,0,0,63,41a6.93,6.93,0,0,0,1.74.15,5.22,5.22,0,0,0,1.12-.1c.25,0,.37-.11.38-.1s-.48.39-1.49.47a7.51,7.51,0,0,1-1.82,0,9.31,9.31,0,0,1-1.26-.28c-.33-.08-.66-.18-1-.29-1.63-.53-3.47-1.3-5.42-2.14-.49-.22-1-.43-1.49-.67L53,37.65l-.74-.43a25.94,25.94,0,0,1-2.8-2,47.56,47.56,0,0,1-4.91-4.66L44,30l-.28-.33-.47-.54c0-.05-.11-.09-.08-.14l.1-.15.2-.29.32-.47.42-.61A24.7,24.7,0,0,1,46,25.19a25.2,25.2,0,0,1,3.12-3,16.69,16.69,0,0,1,1.49-1.06c.07,0,.51-.31,1.3-.65a17.8,17.8,0,0,1,3.33-1A27.83,27.83,0,0,1,60.05,19a9.26,9.26,0,0,1,5.51,2l0,0h0a8.88,8.88,0,0,1,2.61,3,11.8,11.8,0,0,1,1.16,3.75A31.65,31.65,0,0,1,69.65,31.44Z"/>
+                <path class="cls-6"
+                      d="M69.67,47.84h0l-.07,0s-.12,0-.12,0l0,0-.06,0s-.07-.07-.1-.13c.12-.07.19-.11.19-.13l.17-.09,0,0s0,0,0,0,0,0,0,0a.21.21,0,0,0,0,.11A1.21,1.21,0,0,1,69.67,47.84Z"/>
+                <path class="cls-8" d="M69.26,47.67a1.24,1.24,0,0,0,.2-.1s-.07.06-.19.13v0Z"/>
+                <path class="cls-8" d="M69.46,47.57a1.24,1.24,0,0,1-.2.1.11.11,0,0,1,0-.08A.51.51,0,0,1,69.46,47.57Z"/>
+                <path class="cls-3"
+                      d="M69.39,63.42h0l0,0h0l-.09,0a4.78,4.78,0,0,0-.92.64c-.16.12-.31.24-.45.23a.8.8,0,0,1-.38-.23.78.78,0,0,1-.2-.26.15.15,0,0,1,0-.11s0,0,.13,0a1.25,1.25,0,0,0,.36-.09,5.22,5.22,0,0,1,1-.31h.53Z"/>
+                <path class="cls-6"
+                      d="M69.39,2.28l0,0-.87.18a1.85,1.85,0,0,0-.46-.33c-.06,0-.1,0-.11,0s0-.07,0-.09A.15.15,0,0,1,68,2l.24-1a1.22,1.22,0,0,1,.45.3A4.35,4.35,0,0,1,69.39,2.28Z"/>
+                <path class="cls-6"
+                      d="M69.75,68.12a14.79,14.79,0,0,1-.53,1.69c-.2.56-.42,1.11-.59,1.52s-.3.7-.32.72-.15.28-.4.66a11.06,11.06,0,0,1-1,1.36c-.27.32-.54.61-.79.86a1.41,1.41,0,0,1-.1-.18l-.63.62s0,0,.08,0,0,0,0,.05v.07c-.18.15-.31.23-.33.16a10.11,10.11,0,0,1,1.16-2c.29-.48.55-1,.74-1.38s.31-.67.32-.69.16-.27.37-.65.31-.55.48-.87v0l.16-.21C68.92,69.26,69.36,68.69,69.75,68.12Z"/>
+                <path class="cls-6"
+                      d="M67.46,48.33l-.29-.1s-.15.06-.49.23a2.48,2.48,0,0,0-.59,0s.19.14.23.2a9.28,9.28,0,0,1-2,0,16.2,16.2,0,0,1-3.42-1,1.4,1.4,0,0,0,.17-.1l.52-.35a15.12,15.12,0,0,0,2.81.9,9.52,9.52,0,0,0,1.93.13h.09a8,8,0,0,0,2-.27,4.8,4.8,0,0,0,.78-.28v0a8.55,8.55,0,0,1-1.35.5c-.2.08-.44.17-.69.25,0,0,0-.06.08-.08l.09,0Z"/>
+                <path class="cls-6"
+                      d="M69.26,47.67h0a4.8,4.8,0,0,1-.78.28,8,8,0,0,1-2,.27A7.15,7.15,0,0,0,67.83,48c.55-.17,1.1-.3,1.4-.36A.11.11,0,0,0,69.26,47.67Z"/>
+                <path class="cls-6"
+                      d="M68.79,67.14c.14,0,.35,0,.3.25a2.09,2.09,0,0,1-.13.37,1.74,1.74,0,0,1-.14.27c-.06.07-.15.14-.22.12s-.09,0-.09,0,.13,0,.18-.17,0-.15.07-.25,0-.24,0-.22,0,0,0,0-.07,0-.07,0l-.19.06a4,4,0,0,0-.41.17c-.31.13-.59.29-.62.25s.22-.26.5-.45a3.56,3.56,0,0,1,.62-.34A1,1,0,0,1,68.79,67.14Z"/>
+                <path class="cls-7"
+                      d="M69,31.47a13.85,13.85,0,0,1,0,3.23,13.51,13.51,0,0,1-1.65,4.65c-.3.52-.57.92-.76,1.2a3,3,0,0,0-.29.42s-.13.05-.38.1a5.22,5.22,0,0,1-1.12.1A6.93,6.93,0,0,1,63,41a15.08,15.08,0,0,1-2.18-.67c-1.57-.59-3.37-1.41-5.29-2.33-.48-.22-1-.45-1.45-.7l-.7-.38c-.23-.14-.47-.28-.69-.43a24.1,24.1,0,0,1-2.66-2,48.11,48.11,0,0,1-4.69-4.67l-.52-.6L44.58,29l0,0s0,0,0-.05v0l.11-.14c.14-.21.29-.41.43-.61A25.21,25.21,0,0,1,46.86,26a24.3,24.3,0,0,1,3-2.81c.79-.61,1.31-.89,1.36-.94s.44-.27,1.14-.58a16.12,16.12,0,0,1,3.07-1,29.13,29.13,0,0,1,4.62-.59,8.32,8.32,0,0,1,4.87,1.68l0,0a7.92,7.92,0,0,1,2.42,2.63,11,11,0,0,1,1.17,3.44A34.74,34.74,0,0,1,69,31.47Zm-1.4,1.13a3.9,3.9,0,0,0,.18-2,16.49,16.49,0,0,0-.59-2.52A10.8,10.8,0,0,0,66,25.61a5.56,5.56,0,0,0-1.16-1.29,11.65,11.65,0,0,0-1.62-.88,7.72,7.72,0,0,0-1.87-.59,4.76,4.76,0,0,0-2.12.1,6.51,6.51,0,0,0-1.94,1,12.46,12.46,0,0,0-4.25,4.91,10,10,0,0,0-.38,1c-.05.18-.09.36-.13.54s0,.18,0,.29,0,.29,0,.43l.33.27.21.16c.14.1.28.22.43.32l.86.58h0a9.39,9.39,0,0,0,2.61,1.13,23,23,0,0,0,2.54.58,12.77,12.77,0,0,0,4.43.18,7.53,7.53,0,0,0,2.83-1A2.43,2.43,0,0,0,67.56,32.6Z"/>
+                <path class="cls-6"
+                      d="M68.16.37l.08.64L68,2A.15.15,0,0,0,68,2s0,.06,0,.09,0,0,.11,0a1.85,1.85,0,0,1,.46.33c-.44.08-.87.18-1.32.25a2.92,2.92,0,0,1-.44.06l-.45,0h-.76l-.58,0c.09-.9.17-1.29.17-1.29l.1-1.1.42,0,.66.05a2.61,2.61,0,0,0,.28,0,1.72,1.72,0,0,0,.31,0C67.32.47,67.72.42,68.16.37Z"/>
+                <path class="cls-3"
+                      d="M68.29,70.07c-.17.32-.34.62-.48.87s-.36.64-.37.65-.14.29-.32.69-.45.9-.74,1.38a10.11,10.11,0,0,0-1.16,2c0,.07.15,0,.33-.16a1.48,1.48,0,0,1,0,.27,25.11,25.11,0,0,0-.33,2.81c-.06,1.31-.06,2.23-.08,2.83,0,.32,0,.54,0,.69a.13.13,0,0,1,0,.06v0H65L64.36,79c0-.17-.07-.33-.11-.5l0-.25-.08-.29c0-.29-.06-.57-.08-.84-.05-.62-.1-1.2-.14-1.73-.09-1.07-.15-1.95-.2-2.56,0-.25,0-.46,0-.61l.66-.11a9.59,9.59,0,0,0,2.31-.74A5.08,5.08,0,0,0,68.29,70.07Z"/>
+                <path class="cls-6"
+                      d="M67.74,30.65a3.9,3.9,0,0,1-.18,2s0-.75,0-.76a13.61,13.61,0,0,0-.48-1.77l0-.21s0-.1,0-.15c-.43-1.11-.53-1.34-.86-2.07l-.4-.8a5.25,5.25,0,0,0-1.66-2.12l-.29-.18h-.29l-.66-.32a4.94,4.94,0,0,0-3.44-.5,8.38,8.38,0,0,0-3.31,2.09,10.46,10.46,0,0,0-2.48,3.28,6.91,6.91,0,0,0-.37.95c-.05.16-.09.32-.13.48l0,.24v.09l.28.22.41.32.84.59,0,0a9.23,9.23,0,0,0,2.41,1.09,25,25,0,0,0,2.47.64,15.7,15.7,0,0,0,2.66.35l.3.16a.24.24,0,0,1,.17-.07c.35,0,.7-.06,1.05-.07l.06-.06h.16l.14,0A2.23,2.23,0,0,0,65,34a1.88,1.88,0,0,0,.24-.18,5.65,5.65,0,0,0,.65-.15l.17-.16c.23-.1.44-.2.62-.3a9.45,9.45,0,0,0,.92-.58,2.43,2.43,0,0,1-.85.72,7.53,7.53,0,0,1-2.83,1,12.77,12.77,0,0,1-4.43-.18,23,23,0,0,1-2.54-.58,9.39,9.39,0,0,1-2.61-1.13h0l-.86-.58c-.15-.1-.29-.22-.43-.32l-.21-.16-.33-.27c0-.14,0-.29,0-.43s0-.19,0-.29.08-.36.13-.54a10,10,0,0,1,.38-1,12.46,12.46,0,0,1,4.25-4.91,6.51,6.51,0,0,1,1.94-1,4.76,4.76,0,0,1,2.12-.1,7.72,7.72,0,0,1,1.87.59,11.65,11.65,0,0,1,1.62.88A5.56,5.56,0,0,1,66,25.61a10.8,10.8,0,0,1,1.14,2.52A16.49,16.49,0,0,1,67.74,30.65Z"/>
+                <path class="cls-10"
+                      d="M67.54,31.84s0,.75,0,.76a9.45,9.45,0,0,1-.92.58c-.18.1-.39.2-.62.3a5.74,5.74,0,0,0,1-3.41A13.61,13.61,0,0,1,67.54,31.84Z"/>
+                <path class="cls-6"
+                      d="M67.46,48.33H67.4l-.09,0s-.08.05-.08.08a6.07,6.07,0,0,1-.83.17h-.08c0-.06-.23-.15-.23-.2a2.48,2.48,0,0,1,.59,0c.34-.17.49-.23.49-.23Z"/>
+                <path class="cls-6"
+                      d="M67.08,29.86l0,.21a21.9,21.9,0,0,0-1.45-3.34l-.08-.15-.24-.45L65.17,26a4.12,4.12,0,0,0-.85-1,6.68,6.68,0,0,0-.78-.47h.29l.29.18a5.25,5.25,0,0,1,1.66,2.12l.4.8c.33.73.43,1,.86,2.07C67.06,29.76,67.06,29.82,67.08,29.86Z"/>
+                <path class="cls-11"
+                      d="M67.06,30.07a5.74,5.74,0,0,1-1,3.41c-.23.09-.48.18-.76.26l.14-.11a10.05,10.05,0,0,1-2.5.35H62a5.25,5.25,0,0,1-1.9-4.7c.14-2.6,1.6-4.63,3.4-4.74a6.68,6.68,0,0,1,.78.47,4.12,4.12,0,0,1,.85,1l.12.15.24.45.08.15A21.9,21.9,0,0,1,67.06,30.07Z"/>
+                <path class="cls-6"
+                      d="M66.85,42.55a.2.2,0,0,1-.08.24.37.37,0,0,1-.23.05l-.32,0-.29,0,0,0,.67,0c.3,0,.16-.28-.11-.48s-.38.34-.38.34-.15-.05-.15-.07a.83.83,0,0,1,.18-.34.3.3,0,0,1,.22-.11h0a.41.41,0,0,1,.24.1A.85.85,0,0,1,66.85,42.55Z"/>
+                <path class="cls-6"
+                      d="M66.47,42.26c.27.2.41.48.11.48l-.67,0s0,0,0,0l.27-.06.31,0a.16.16,0,0,0,.1,0s0,0,0-.06a.84.84,0,0,0-.19-.18c-.08,0,0,0-.07,0a.62.62,0,0,0-.09.23s-.08,0-.17,0S66.21,42.06,66.47,42.26Z"/>
+                <path class="cls-6"
+                      d="M66.43,45.15a.58.58,0,0,1,.25.49.73.73,0,0,1-1.11.38.58.58,0,0,1-.07-.61,1.86,1.86,0,0,1,.3-.45s.09,0,.15.06c-.22.26-.51.64-.27.91s1,0,.9-.45A.74.74,0,0,0,66,45S66.17,45,66.43,45.15Z"/>
+                <path class="cls-6"
+                      d="M66.61,42.57s0,0,0,.06a.16.16,0,0,1-.1,0l-.31,0-.27.06.16-.15c.09,0,.17,0,.17,0a.62.62,0,0,1,.09-.23s0,0,.07,0A.84.84,0,0,1,66.61,42.57Z"/>
+                <path class="cls-6"
+                      d="M66.58,45.48c.15.42-.66.72-.9.45s0-.65.27-.91A.74.74,0,0,1,66.58,45.48Zm-.08.13a.45.45,0,0,0-.16-.36A1,1,0,0,0,66,45c.07.06.1.11.09.14a1.3,1.3,0,0,0-.27.36.29.29,0,0,0,0,.32c0,.07.23.08.39,0A.44.44,0,0,0,66.5,45.61Z"/>
+                <path class="cls-6"
+                      d="M66.34,45.25a.34.34,0,0,1-.17.63c-.16,0-.35,0-.39,0a.29.29,0,0,1,0-.32,1.3,1.3,0,0,1,.27-.36s0-.08-.09-.14A1,1,0,0,1,66.34,45.25Z"/>
+                <path class="cls-3"
+                      d="M66.43,48.23h-.06a9.52,9.52,0,0,1-1.93-.13,15.12,15.12,0,0,1-2.81-.9l1.3-.85a15.58,15.58,0,0,0,1.3,1.21,3.65,3.65,0,0,0,1,.49,4,4,0,0,0,1.07.17Z"/>
+                <path class="cls-3"
+                      d="M64.74,41.44l1.6.64a.3.3,0,0,0-.22.11.83.83,0,0,0-.18.34s.07,0,.15.07l-.16.15s0,0,0,0l0,0-.46.79A15.13,15.13,0,0,0,63.2,44l-.09-.75s0,0,0,0a4.16,4.16,0,0,0-1.24-.48l-.62-.16.38-1.42a9.31,9.31,0,0,0,1.26.28A7.51,7.51,0,0,0,64.74,41.44Z"/>
+                <path class="cls-6"
+                      d="M66.2,75.05a.8.8,0,0,1,0,.44,2.38,2.38,0,0,1-.16.4,7,7,0,0,0-.65,2.7,9.46,9.46,0,0,0,.25,2.8,3.66,3.66,0,0,0,.19.57,4,4,0,0,1-.6.09s0,0,0,0l.14,0h0l-.32.06h0v0a.13.13,0,0,0,0-.06c0-.15,0-.37,0-.69,0-.6,0-1.52.08-2.83a25.11,25.11,0,0,1,.33-2.81,1.48,1.48,0,0,0,0-.27l.28-.25.32-.32Z"/>
+                <path class="cls-6"
+                      d="M66.05,74.75a1.41,1.41,0,0,0,.1.18l-.32.32-.28.25v-.07c0-.06,0,0,0-.05s-.08,0-.08,0Z"/>
+                <path class="cls-6"
+                      d="M66,33.48l-.17.16a5.65,5.65,0,0,1-.65.15l.06,0C65.54,33.66,65.79,33.57,66,33.48Z"/>
+                <path class="cls-6"
+                      d="M65.67,97.26a3.85,3.85,0,0,1,.25,2,5.19,5.19,0,0,1-.46,1.93c-.24.58-.51,1.1-.73,1.55s-.37.7-.5,1l-.77.09c0-.07.08-.17.14-.28s.35-.62.59-1,.52-.93.77-1.47a6.78,6.78,0,0,0,.33-.85,5,5,0,0,0,.17-.92,3.55,3.55,0,0,0-.13-1.79,4.16,4.16,0,0,0-.9-1.32,2.52,2.52,0,0,0-.75-.57c.09,0,.17,0,.27-.06a3,3,0,0,1,.66.44A4.18,4.18,0,0,1,65.67,97.26Z"/>
+                <path class="cls-8" d="M65.89,82h0v0l0,0h0V82Z"/>
+                <path class="cls-8" d="M65.88,82v0h-.08l-.16,0-.21,0h0l-.14,0s-.07-.06,0,0a4,4,0,0,0,.6-.09h0Z"/>
+                <path class="cls-6"
+                      d="M65.47,43.58c.07,0,.11,0,.11,0s-1.5.47-3,1l-.69.23-.48-.41,1-.27c.25-.06.49-.12.74-.16A15.13,15.13,0,0,1,65.47,43.58Z"/>
+                <path class="cls-3"
+                      d="M65.33,97.41a3.55,3.55,0,0,1,.13,1.79,5,5,0,0,1-.17.92A6.78,6.78,0,0,1,65,101c-.25.54-.53,1-.77,1.47s-.44.8-.59,1-.1.21-.14.28l-1.4.14c-.6,0-1.21.1-1.81.13l-.32,0h-.3l-.19,0-.9-.14c-1.61-.25-3.22-.45-4.78-.74,0,0,0,0,0,0,.14-.2.37-.47.64-.8a8.93,8.93,0,0,0,1.69-2.72,5.16,5.16,0,0,0,.08-3.17,1.82,1.82,0,0,0-.56-.8l1,.17a18.79,18.79,0,0,0,6.09-.11c.31,0,.63-.11,1-.19a2.52,2.52,0,0,1,.75.57A4.16,4.16,0,0,1,65.33,97.41Z"/>
+                <path class="cls-11"
+                      d="M65.4,33.63l-.14.11-.34.1h0a15.44,15.44,0,0,1-2,.14A10.05,10.05,0,0,0,65.4,33.63Z"/>
+                <path class="cls-6"
+                      d="M65.26.42l-.1,1.1H64a11.34,11.34,0,0,1,.22,1.25L63,2.73l-.24-.39A8,8,0,0,0,62,1.39l-.26-.28.16-1c.41,0,1.32.13,2.5.27Z"/>
+                <path class="cls-11" d="M65.26,33.74l-.06,0-.28.05Z"/>
+                <path class="cls-6"
+                      d="M64.92,33.84l.28-.05A1.88,1.88,0,0,1,65,34a2.23,2.23,0,0,1-.89,0,6.6,6.6,0,0,0,.84-.16Z"/>
+                <path class="cls-6" d="M64,1.53h1.17s-.08.39-.17,1.29l-.74,0h0A11.34,11.34,0,0,0,64,1.53Z"/>
+                <polygon class="cls-8" points="65.02 82.2 65.02 82.21 65.02 82.21 65.02 82.2"/>
+                <path class="cls-6"
+                      d="M64.35,45.15c.44-.12.74-.09.75,0s-.29.11-.66.29-.68.41-1.08.68L63,45.76A9.59,9.59,0,0,1,64.35,45.15Z"/>
+                <path class="cls-6"
+                      d="M65,2.81a45.57,45.57,0,0,0-.18,4.74s0-.24-.1-.46-.15-.68-.24-1c-.07-1.51-.17-2.59-.26-3.32h0Z"/>
+                <path class="cls-9" d="M64.81,7.55v0l-.29,0v0Z"/>
+                <path class="cls-8"
+                      d="M64.81,7.55l-.3,0c0-.53,0-1,0-1.48q.14.47.24,1C64.76,7.31,64.81,7.52,64.81,7.55Z"/>
+                <path class="cls-6"
+                      d="M62.78,64s0,0,0,0,.49-.14.84-.26a1,1,0,0,0,.36-.2,3.94,3.94,0,0,0-.6,0c-.35,0-.53.41-.6.5S62.78,63.94,62.78,64Zm1.71-.72a.18.18,0,0,1,.06.23c0,.07-.06.06-.09.08a.11.11,0,0,1-.06,0l-.07,0a1.63,1.63,0,0,1-.62.28,2.44,2.44,0,0,1-.94.07s0-.13.06-.3a.81.81,0,0,1,.52-.46,3.24,3.24,0,0,1,.67,0h.32S64.35,63.17,64.49,63.23Zm-.12.18s0,0,0,0a.21.21,0,0,1-.06-.1s0,0,0,0l-.13.07a.53.53,0,0,1-.14.12l.28,0h0A.49.49,0,0,1,64.37,63.41Z"/>
+                <path class="cls-6"
+                      d="M64.47,6.1c0,.46,0,1,0,1.48,0-.07,0-.24-.08-.43a8.67,8.67,0,0,0-2.17-4.3l-.17-.15.93,0A13.48,13.48,0,0,1,64.47,6.1Z"/>
+                <path class="cls-3"
+                      d="M64.39,63.38s0,0,0,0a.49.49,0,0,0,0,.11h0l-.28,0a.53.53,0,0,0,.14-.12l.13-.07s0,0,0,0A.21.21,0,0,0,64.39,63.38Z"/>
+                <path class="cls-11"
+                      d="M64.91,33.84a6.6,6.6,0,0,1-.84.16H64a.29.29,0,0,0-.24,0h-.05l-.5,0-.55,0a3.85,3.85,0,0,1-.48,0L62,34h.86A15.44,15.44,0,0,0,64.91,33.84Z"/>
+                <path class="cls-7" d="M64.21,2.78c.09.73.19,1.81.26,3.32A13.48,13.48,0,0,0,63,2.73Z"/>
+                <path class="cls-6"
+                      d="M64.23,103.68l-.06.12-.2.41c0,.09-.21.1-.38,0s-.27-.21-.22-.32a1.63,1.63,0,0,0,.09-.16Z"/>
+                <path class="cls-11" d="M64.07,34l-.14,0h-.16A.29.29,0,0,1,64,34Z"/>
+                <path class="cls-6"
+                      d="M64,95.46c-.1,0-.18.05-.27.06l-.17-.06a1.06,1.06,0,0,0-.42,0s.13-.15.44-.12A1.26,1.26,0,0,1,64,95.46Z"/>
+                <path class="cls-6"
+                      d="M63.72,34.05h.05l-.06.06c-.35,0-.7,0-1.05.07a.24.24,0,0,0-.17.07l-.3-.16a3.85,3.85,0,0,0,.48,0l.55,0Z"/>
+                <path class="cls-3"
+                      d="M64,63.47a1,1,0,0,1-.36.2c-.35.12-.73.21-.84.26.07-.09.25-.46.6-.5A3.94,3.94,0,0,1,64,63.47Z"/>
+                <path class="cls-6"
+                      d="M63.66,72.09v.09c-.32,0-.65.09-1,.12,0-.26,0-.4,0-.44h1v0S63.65,72,63.66,72.09Z"/>
+                <path class="cls-6"
+                      d="M63.4,66.3c.11,0,.24.15.23.28a.5.5,0,0,1-.1.19l-.09.1a3.25,3.25,0,0,1-.42.31,1.18,1.18,0,0,1-.77,0s.34-.08.68-.22c.09-.08.23-.21.33-.32a.5.5,0,0,0,.07-.08v0l0,0a2.92,2.92,0,0,0-.45-.08l-.35,0a.73.73,0,0,0-.59.17,2.13,2.13,0,0,0-.52.88,1.22,1.22,0,0,1,.36-1,1,1,0,0,1,.78-.31l.36,0A2.15,2.15,0,0,1,63.4,66.3Z"/>
+                <path class="cls-6" d="M63.36,46.07l-.26.17-.17.11-.29-.29a.46.46,0,0,0-.07-.07l.3-.16.14-.07Z"/>
+                <path class="cls-3"
+                      d="M63.11,43.2l.09.75c-.25,0-.49.1-.74.16l-1,.27c-.47-.39-.81-.64-.86-.58a6.65,6.65,0,0,0,.58.66l-.8.25c-.58.19-1,.36-1,.37a8.64,8.64,0,0,0-1,.5l-.41.28c-1.2-.39-2.46-.76-3.71-1.11-.23-.07-.49-.13-.67-.2L53,44.27l-1.32-.59-.15-.07c.7-.19,1.36-.35,1.9-.47.78-.17,1.32-.22,1.35-.23s.56-.1,1.36-.19A20.23,20.23,0,0,1,59,42.65a23,23,0,0,1,2.86.31C62.52,43.08,63,43.2,63.11,43.2Z"/>
+                <path class="cls-6"
+                      d="M63.14,43.19s0,0,0,0-.59-.12-1.27-.24A23,23,0,0,0,59,42.65a20.23,20.23,0,0,0-2.88.07c-.8.09-1.33.17-1.36.19s-.57.06-1.35.23c-.54.12-1.2.28-1.9.47l-.68-.31c.88-.31,1.74-.56,2.44-.75a13.73,13.73,0,0,1,1.39-.29,11.45,11.45,0,0,1,1.4-.14,18.9,18.9,0,0,1,3,.06,19.94,19.94,0,0,1,2.27.37l.62.16A4.16,4.16,0,0,1,63.14,43.19Z"/>
+                <path class="cls-10"
+                      d="M62.88,24.22l.66.32c-1.8.11-3.26,2.14-3.4,4.74A5.25,5.25,0,0,0,62,34l.15.1a15.7,15.7,0,0,1-2.66-.35,25,25,0,0,1-2.47-.64A9.23,9.23,0,0,1,54.65,32l0,0-.84-.59-.41-.32-.28-.22v-.09l0-.24c0-.16.08-.32.13-.48a6.91,6.91,0,0,1,.37-.95,10.46,10.46,0,0,1,2.48-3.28,8.38,8.38,0,0,1,3.31-2.09A4.94,4.94,0,0,1,62.88,24.22Z"/>
+                <path class="cls-6" d="M63,45.76l-.14.07-.3.16-1-1.08.35-.12,1.07.94Z"/>
+                <path class="cls-6" d="M62.64,46.06l.29.29-1.3.85-.73-.29.53-.3L62.57,46A.46.46,0,0,1,62.64,46.06Z"/>
+                <path class="cls-6"
+                      d="M62.78,2.34l.24.39-.93,0a3.36,3.36,0,0,0-.69-.49l-.29-.14.66-1,.26.28A8,8,0,0,1,62.78,2.34Z"/>
+                <path class="cls-9" d="M62.78,64s0,0,0,0S62.79,64,62.78,64Z"/>
+                <path class="cls-6"
+                      d="M61.64,77.81l0,0,0,0,0,.07h0v-.07l0-.26c.22-1.44.43-2.87.58-3.94l.21-1.34.19,0a52.52,52.52,0,0,1-.29,5.39l0,.28v.08a1.94,1.94,0,0,1-.06.22h0s0,0,0,0l0,0h0l0,0,0,0h0s0,0,0,0l-.1-.09h0v0l0,0,0,0,0,0h0A.8.8,0,0,0,61.64,77.81Z"/>
+                <path class="cls-6" d="M62.62,72.3l-.19,0c0-.29.08-.45.11-.45S62.61,72,62.62,72.3Z"/>
+                <path class="cls-3"
+                      d="M61.86,72.35c.19,0,.38,0,.57,0l-.21,1.34c-.15,1.07-.36,2.5-.58,3.94l0,.26v.07h0s0,0,0,0l0,.09-.21.5c-.14.34-.26.66-.39,1l-.69,1.76c-.2.52-.37,1-.48,1.27,0,.08-.06.15-.08.22v0l0,.07s0,0,0,0l0,0c0,.09,0,.13,0,.14l-.51,1.63c-.33.27-.71.6-1.12.93l-1.39,1.19-.18.16-.09.07,0,0h0a2.8,2.8,0,0,1-.14-.25A.6.6,0,0,1,56,86.6a.36.36,0,0,1,0-.12.61.61,0,0,1,.19-.38,3.53,3.53,0,0,1,.28-.37c-.09-.21-.89.56-.79.71a.82.82,0,0,0,.21.57l.11.12L55.13,87l-.45-.07-.19,0a.76.76,0,0,1,0-.15.77.77,0,0,1,.08-.29c0-.08.06-.12.06-.13a2,2,0,0,1,.23-.4c.14-.19.35-.32.33-.36s-.28,0-.49.19a1.33,1.33,0,0,0-.26.28.84.84,0,0,0-.1.15,1,1,0,0,0-.08.53L54,86.34v-.21a2.45,2.45,0,0,1,0-.27,3.12,3.12,0,0,1,.1-.48,1.14,1.14,0,0,1,.45-.64,1,1,0,0,1,.7-.18c.08.16,2-.6,2-.62A12.54,12.54,0,0,0,59,82.79h0a9.25,9.25,0,0,0,.26-3,24.51,24.51,0,0,0-.13-3.16s-.1-.45-.29-1-.47-1.27-.76-2-.66-1.46-.93-2a9.7,9.7,0,0,0,2.18.62A14.62,14.62,0,0,0,61.86,72.35Z"/>
+                <path class="cls-8" d="M62.23,78.28s0,0,0,0l0,0h0Z"/>
+                <path class="cls-6"
+                      d="M62.22,78.31l-.18.51c-.11.34-.23.68-.34,1l-.59,1.79c-.18.52-.32,1-.43,1.28l0,0c-.18,0-.51.09-.51.1h-.52s0-.06,0-.09,0,0,0,0l0-.07v0c0-.07.05-.14.08-.22.11-.32.28-.75.48-1.27l.69-1.76c.13-.33.25-.65.39-1l.21-.5,0-.09s0,0,0,0,0,.12.07.11,0-.12.07-.08h.12l0,0,0,0,0,0v0h0l.1.09s0,0,0,0h0l0,0,0,0h0Z"/>
+                <path class="cls-6"
+                      d="M61.93.07l-.16,1-.66,1,.29.14a3.36,3.36,0,0,1,.69.49l-.57,0-.9-.08c-.52,0-1.27-.11-2.15-.13l-1,0c-.1-.29-.19-.54-.29-.77s-.12-.25-.18-.36a1.51,1.51,0,0,0-.3-.36L56.41.66,56.16.43l0-.21C57,.12,57.75.06,58.46,0c.94,0,1.73,0,2.31,0l.93,0Z"/>
+                <path class="cls-6" d="M61.9,44.79l-.35.12c-.13-.14-.24-.27-.36-.39l0-.06.28-.08Z"/>
+                <path class="cls-8"
+                      d="M61.66,77.83l0,0a.8.8,0,0,1,.17.15h-.08c-.06,0-.07.07-.07.08s-.06-.07-.07-.11l0-.07Z"/>
+                <path class="cls-3"
+                      d="M61.55,44.91l1,1.08-1.14.62-.53.3-1.12-.44-1.06-.37c.5-.26.87-.41.9-.42s.38-.18.93-.4Z"/>
+                <path class="cls-6" d="M61.42,44.38l-.28.08a6.65,6.65,0,0,1-.58-.66C60.61,43.74,61,44,61.42,44.38Z"/>
+                <path class="cls-6"
+                      d="M61.19,44.52c.12.12.23.25.36.39l-1,.37c-.55.22-.92.39-.93.4s-.4.16-.9.42c-.24-.08-.48-.17-.73-.24l.41-.28a8.64,8.64,0,0,1,1-.5s.41-.18,1-.37l.8-.25Z"/>
+                <path class="cls-6" d="M60.9,46.91l.73.29-.52.35a1.4,1.4,0,0,1-.17.1l-.73-.26.36-.27.19-.12Z"/>
+                <path class="cls-6"
+                      d="M60.21,47.39l.73.26-.45.3c-.36.24-.82.6-1.27,1a15.19,15.19,0,0,1-1.8,1.48h0a8.94,8.94,0,0,1,1.49-1.81,13.14,13.14,0,0,1,1.21-1.12Z"/>
+                <path class="cls-6"
+                      d="M60.9,46.91l-.14.09-.19.12-.36.27-.67-.22c-.55-.18-1.11-.35-1.69-.52h0l.44-.3.39-.24h0l1.06.37Z"/>
+                <path class="cls-8" d="M60.68,82.89a.06.06,0,0,0,0,0h0Z"/>
+                <path class="cls-9" d="M60.66,82.93a.19.19,0,0,1,0,.08h0l0,0Z"/>
+                <path class="cls-8" d="M60.66,82.93l0,.11h-.47S60.48,83,60.66,82.93Z"/>
+                <polygon class="cls-8" points="60.64 83.01 60.62 83.08 60.62 83.06 60.62 83.04 60.64 83.01"/>
+                <path class="cls-6"
+                      d="M60.62,83.08h0v0h0v.13a1.47,1.47,0,0,0,0,.17l-.18.52c-.12.33-.3.8-.49,1.36L57,87.43l-.43.34a.2.2,0,0,1-.09,0h0l-.08,0h-.2l-.3,0L55,87.62l-.45-.1-.24-.06-.17,0s-.12,0-.14-.08c-.19-.3-.37-.59-.55-.86v-.23a.86.86,0,0,1,0-.16,2.14,2.14,0,0,1,.06-.31,2.37,2.37,0,0,1,.18-.55,1.34,1.34,0,0,1,.68-.72,1.43,1.43,0,0,1,.81,0h0a1,1,0,0,0-.7.18,1.14,1.14,0,0,0-.45.64,3.12,3.12,0,0,0-.1.48,2.45,2.45,0,0,0,0,.27v.21l.29.39a.06.06,0,0,0,0,0c0,.3.27.48.3.45s0-.15-.07-.31l.19,0,.45.07.91.12c.15.14.3.22.33.19a.65.65,0,0,0-.1-.19h0l0,0,.09-.07.18-.16L58,85.67c.41-.33.79-.66,1.12-.93l.51-1.63s0,0,0-.14l0,0s0,.06,0,.09h1v0Z"/>
+                <path class="cls-3"
+                      d="M60.21,47.39l-.09.07a13.14,13.14,0,0,0-1.21,1.12,8.94,8.94,0,0,0-1.49,1.81l-1.7.25a3.84,3.84,0,0,1-.8-.43,2.34,2.34,0,0,1-.38-.28c-.09-.07-.16-.16-.24-.23a3.46,3.46,0,0,1-.42-.57l.33-.19a20.84,20.84,0,0,0,2.69-1.65l1-.64c.58.17,1.14.34,1.69.52Z"/>
+                <path class="cls-6"
+                      d="M60.18,69.06a.26.26,0,0,1-.07.24.58.58,0,0,1-.25.12l-.19,0a1.16,1.16,0,0,1-.4,0l-.1,0s0,0,0,0,0,0,0,0,0,0,0,0a.23.23,0,0,0,0-.07s-.11-.06-.05-.07a.49.49,0,0,0,.19,0,1.49,1.49,0,0,0,.46-.07s0,0,0,0,0,0,0-.06a.86.86,0,0,0-.28-.11c-.09,0-.14,0-.16,0s.26-.19.57,0A.4.4,0,0,1,60.18,69.06Zm-.93.26c.06.09,0,0,0,0Z"/>
+                <path class="cls-9" d="M59.23,69.29s.08.12,0,0Z"/>
+                <path class="cls-6"
+                      d="M59.11,76.62a24.51,24.51,0,0,1,.13,3.16,9.25,9.25,0,0,1-.26,3,.08.08,0,0,0,0-.06s.11-.25-.11-.2c-.1-.49-.22-1.59-.34-2.71-.09-.75-.18-1.51-.26-2.07,0-.28-.07-.51-.1-.68s0-.25,0-.27-.06-.37-.2-.92-.33-1.28-.54-2c-.25-.88-.52-1.73-.67-2.29h0l0-.07.37.16c.27.51.62,1.24.93,2s.57,1.42.76,2S59.1,76.6,59.11,76.62Z"/>
+                <path class="cls-8" d="M58.89,82.52c.22,0,.08.15.11.2a.08.08,0,0,1,0,.06h0s-.06-.1-.09-.27Z"/>
+                <path class="cls-6"
+                      d="M58.89,82.52c0,.17.06.27.09.27a12.54,12.54,0,0,1-1.75,1.15s-1.93.78-2,.62h0a2.9,2.9,0,0,1,.78-.34c.77-.46,1.21-.77,2-1.3l.56-.29A1.41,1.41,0,0,1,58.89,82.52Z"/>
+                <path class="cls-6"
+                      d="M58.84,7.31c0,.08.07.27,0,.11a2.52,2.52,0,0,0-.74-.52l-.25-.23c-.2-.17-.39-.32-.58-.46l-.45-.34c-.3-.22-.59-.41-.86-.6a10.61,10.61,0,0,0-1.59-.91,11.74,11.74,0,0,0-2.58-.83l-.54-.1.28-.12.4-.16L52.27,3l.11,0a20.13,20.13,0,0,1,2.06.95,13.29,13.29,0,0,1,1.62,1l.88.65.45.34.36.28.15.13c.3.25.55.5.58.53s0,0,0-.12l-.09-.27c-.06-.16-.1-.27-.12-.31-.23-.64-.65-1.76-1-2.46-.22-.51-.42-.94-.61-1.28h.82c.12.33.24.71.37,1.13.26.87.58,1.93.95,3.18a1.11,1.11,0,0,0,0,.3A2.46,2.46,0,0,0,58.84,7.31Z"/>
+                <path class="cls-6"
+                      d="M58.72,46.1h0l-.39.24-.44.3h0l-.65-.18.35-.27.42-.33h0C58.24,45.93,58.48,46,58.72,46.1Z"/>
+                <path class="cls-7"
+                      d="M58.47,6.77c0,.08.11.28,0,.12s-.28-.28-.58-.53l-.15-.13L57.39,6l-.45-.34L56.06,5a13.29,13.29,0,0,0-1.62-1A20.13,20.13,0,0,0,52.38,3a14.93,14.93,0,0,1,3.11-.49c.41,0,.81,0,1.2,0,.19.34.39.77.61,1.28.31.7.73,1.82,1,2.46,0,0,.06.15.12.31Z"/>
+                <path class="cls-6"
+                      d="M58,45.86h0l-.42.33-.35.27c-1-.29-2.09-.55-3.16-.82-.25-.06-.47-.11-.74-.2h0l.07-.14-1.18-.58-.11.23-.84-.35L50,44.06l.61-.19.92-.26.15.07,1.32.59.65.28c.18.07.44.13.67.2C55.53,45.1,56.79,45.47,58,45.86Z"/>
+                <path class="cls-6" d="M57.2,46.47l.65.18-1,.64a20.84,20.84,0,0,1-2.69,1.65,17.91,17.91,0,0,1,2.42-2Z"/>
+                <path class="cls-6"
+                      d="M55.54,62.68s0,.07,0,.07,0,0-.09-.06,0-.07,0-.08l.06,0,.15,0c.21,0,.47,0,.73-.08a2.63,2.63,0,0,1,.77-.06.81.81,0,0,1,.31.06.37.37,0,0,1,.16.1.2.2,0,0,1,.07.15.24.24,0,0,1,0,.17.59.59,0,0,1-.18.14l-.27.21a.83.83,0,0,1-.42.2.91.91,0,0,1-.43-.11l-.31-.15c-.19-.09-.3-.15-.29-.18a1.21,1.21,0,0,1,.33.06l.34.1a.67.67,0,0,0,.33.05c.19,0,.37-.29.54-.42s0,0,0,0h0l-.19,0a3.23,3.23,0,0,0-.71,0,3.66,3.66,0,0,1-.75,0Z"/>
+                <path class="cls-6"
+                      d="M56.24,1.76s0,0,0,0l0-.05Zm1-.09c.1.23.19.48.29.77h-.82A3.89,3.89,0,0,0,56.44,2l-.17-.23,0,0s0,0,0,0h0l-.05,0-.38-.2-.29-.14.67-1,.25.23.33.29a1.51,1.51,0,0,1,.3.36C57.1,1.42,57.17,1.55,57.22,1.67Z"/>
+                <path class="cls-3"
+                      d="M57.2,46.47l-.57.44a17.91,17.91,0,0,0-2.42,2l-.33.19a3.84,3.84,0,0,1-.23-.45,11,11,0,0,1-.55-1.74c-.07-.3-.12-.54-.18-.75.18-.35.3-.6.37-.74h0c.27.09.49.14.74.2C55.11,45.92,56.17,46.18,57.2,46.47Z"/>
+                <path class="cls-6" d="M57.13,71.66l-.37-.16a2.2,2.2,0,0,0,.11-.27A4.84,4.84,0,0,1,57.13,71.66Z"/>
+                <path class="cls-6"
+                      d="M55.72,70.58,57,71s0,.07-.07.19,0,0,0,0c-.12-.2-.21-.31-.26-.29s0,.22.09.53a10.16,10.16,0,0,1-1.09-.56A3.26,3.26,0,0,0,55.72,70.58Z"/>
+                <path class="cls-6"
+                      d="M56.9,54.9l0,0a6.55,6.55,0,0,0-.56.6c-.31.26-.48.47-.79.72l-.74.6c-.45.35-.87.65-1.28.91a10.72,10.72,0,0,1-2.1,1c-.56.19-1,.31-1.22.39l-.12,0c0-.36-.1-.73-.13-1.08h.11a9.74,9.74,0,0,0,1.23-.12,7,7,0,0,0,2.05-.64,17.59,17.59,0,0,0,2.47-1.68l.55-.45,0,0-.34.08-.55.14-.63.07-.82.06a11.87,11.87,0,0,1-1.45,0,7.34,7.34,0,0,1-2.14-.42l-.51-.21a9.46,9.46,0,0,1,.12-1.07,3.29,3.29,0,0,0,.67.53,5.38,5.38,0,0,0,1.85.65,9.68,9.68,0,0,0,1.4.1l.82,0c.34,0,.76-.05,1.16-.09A7.67,7.67,0,0,0,56.9,54.9Z"/>
+                <path class="cls-6"
+                      d="M56.87,71.23a2.2,2.2,0,0,1-.11.27.09.09,0,0,1-.06,0c-.08-.31-.12-.51-.09-.53S56.75,71,56.87,71.23Z"/>
+                <path class="cls-8" d="M56.76,71.5l0,.07,0-.1A.09.09,0,0,0,56.76,71.5Z"/>
+                <path class="cls-6"
+                      d="M56.73,71.57h0a1,1,0,0,0-.07.15,13,13,0,0,1-1,1.73A26.07,26.07,0,0,1,54,75.63c-.64.75-1.36,1.56-2.12,2.29A29.25,29.25,0,0,0,48,82.07c-.87,1.27-1.11,2.3-1.22,2.28a3.61,3.61,0,0,1,.38-1.69,1,1,0,0,0,.31-.15s-.1,0-.26,0a7.28,7.28,0,0,1,.36-.76,9.44,9.44,0,0,1,1-1.5.89.89,0,0,0,.35-.16.82.82,0,0,0-.26,0c.75-1,1.67-1.94,2.56-2.9.71-.76,1.34-1.55,1.94-2.33a24.19,24.19,0,0,0,1.51-2.14,13.28,13.28,0,0,0,.83-1.59c.05-.12.09-.22.13-.3a10.16,10.16,0,0,0,1.09.56Z"/>
+                <path class="cls-6"
+                      d="M56.44,2a3.89,3.89,0,0,1,.25.42c-.39,0-.79,0-1.2,0A14.93,14.93,0,0,0,52.38,3l-.5-.19c-.68-.24-1.17-.39-1.49-.48l-.47-.14h0c.26-.16.53-.31.8-.46l.41-.21.46-.22A15.68,15.68,0,0,1,55.25.33l.88-.11,0,.21-.67,1,.29.14.38.2.05,0h0s0,0,0,0l0,0Z"/>
+                <path class="cls-6"
+                      d="M55.72,86.44c-.1-.15.7-.92.79-.71a3.53,3.53,0,0,0-.28.37.61.61,0,0,0-.19.38.36.36,0,0,0,0,.12.6.6,0,0,0,.09.28,2.8,2.8,0,0,0,.14.25s0,0-.23,0L55.93,87A.82.82,0,0,1,55.72,86.44Z"/>
+                <path class="cls-7"
+                      d="M56.37,55.13l0,0-.55.45a17.59,17.59,0,0,1-2.47,1.68,7,7,0,0,1-2.05.64,9.74,9.74,0,0,1-1.23.12H50q-.06-.6-.09-1.17a14.88,14.88,0,0,1,0-2l.51.21a7.34,7.34,0,0,0,2.14.42,11.87,11.87,0,0,0,1.45,0l.82-.06.63-.07.55-.14Z"/>
+                <path class="cls-8"
+                      d="M56.27,87.13a.65.65,0,0,1,.1.19s-.18,0-.33-.19C56.23,87.14,56.24,87.16,56.27,87.13Z"/>
+                <path class="cls-8" d="M56.29,1.68l0,.05s0,0,0,0Z"/>
+                <path class="cls-6"
+                      d="M56.19,96.45a5.16,5.16,0,0,1-.08,3.17,8.93,8.93,0,0,1-1.69,2.72c-.27.33-.5.6-.64.8,0,0,0,0,0,0l-.7-.13a12,12,0,0,1,.9-1.1,8.63,8.63,0,0,0,1.71-2.47A5.24,5.24,0,0,0,56,96.53a1.69,1.69,0,0,0-.6-.93l.11,0,.17,0A1.82,1.82,0,0,1,56.19,96.45Z"/>
+                <path class="cls-6"
+                      d="M56.21,50.87s.11,0,0,.06l-.48.09-.89.16-.81.14-.62.09a6.94,6.94,0,0,1-2,.08,4.78,4.78,0,0,1-.81-.2c.1-.31.2-.62.31-.9a3,3,0,0,0,.72.4,4.77,4.77,0,0,0,1.8.19l.6,0,.51,0,.55-.08.29,0c.1,0,0,0-.05,0l-.14,0-.09,0a3.66,3.66,0,0,1-.52-.28l-.21-.16a3.11,3.11,0,0,1-.28-.23,4.45,4.45,0,0,1-.81-1c-.39-.68-.63-1.25-.85-1.69,0,0,0,0,0,0l.51-1c.06.21.11.45.18.75a11,11,0,0,0,.55,1.74,3.84,3.84,0,0,0,.23.45,3.46,3.46,0,0,0,.42.57c.08.07.15.16.24.23a2.34,2.34,0,0,0,.38.28,3.84,3.84,0,0,0,.8.43l.17.07s.16.09.17.11S56.18,50.86,56.21,50.87Z"/>
+                <path class="cls-7"
+                      d="M56,96.53a5.24,5.24,0,0,1-.28,2.94A8.63,8.63,0,0,1,54,101.94a12,12,0,0,0-.9,1.1c-.53-.11-1.06-.23-1.57-.37a13.43,13.43,0,0,1-3.16-1.31c-.18-.09-.35-.19-.52-.29l.68-.25a10.08,10.08,0,0,0,2.88-1.66,3.85,3.85,0,0,0,1-1.49,4.18,4.18,0,0,0,.25-1.53,3.81,3.81,0,0,0-.22-1.39l.43.13,1.59.46.9.26A1.69,1.69,0,0,1,56,96.53Z"/>
+                <path class="cls-6" d="M55.63,95.65l-.17,0-.11,0c-.1-.09-.17-.13-.17-.15a.61.61,0,0,1,.37.15Z"/>
+                <path class="cls-3"
+                      d="M55.61,70.91c0,.08-.08.18-.13.3a13.28,13.28,0,0,1-.83,1.59,24.19,24.19,0,0,1-1.51,2.14c-.6.78-1.23,1.57-1.94,2.33-.89,1-1.81,2-2.56,2.9a5.43,5.43,0,0,1-.79.09A7.9,7.9,0,0,1,45.54,80a3.24,3.24,0,0,1-1.08-.5,2.52,2.52,0,0,1-.68-.76,2.58,2.58,0,0,1-.34-1c.59-.73,1.17-1.41,1.72-2a3,3,0,0,0,.88.8,2.43,2.43,0,0,0,1.19.35c.36,0,.59-.17.54-.26s-.2-.1-.43-.24a3.75,3.75,0,0,1-.74-.58,2.57,2.57,0,0,1-.44-.75l-.09-.31.23-.24c.29-.31.57-.6.85-.86a3.46,3.46,0,0,0,.85.86c.89.61,1.9.71,1.94.55s-.79-.61-1.33-1.25a2.72,2.72,0,0,1-.53-.93l0-.1.72-.68.42-.4a1.7,1.7,0,0,0,.62.75,1.87,1.87,0,0,0,.39.23l.38.17a4.64,4.64,0,0,0,.69.23c.42.1.73.06.74,0s-.22-.2-.54-.43c-.16-.11-.34-.25-.52-.4l-.3-.23a3,3,0,0,1-.25-.24.75.75,0,0,1-.13-.82,2,2,0,0,1,.16-.3l0-.07h0a.05.05,0,0,1,0,0l.65-.61,0,0v0l0,.12a1.73,1.73,0,0,0,.29.31,4.06,4.06,0,0,0,.57.35c.43.22,1,.29,1,.1s-.19-.47-.4-.81l-.28-.46a.48.48,0,0,1,0-.13.66.66,0,0,1-.24-.45s0-.08,0-.12a2.77,2.77,0,0,0,.31-.53l.19.21a17.72,17.72,0,0,0,2,1.68C54.88,70.45,55.24,70.69,55.61,70.91Z"/>
+                <path class="cls-7"
+                      d="M55.33,50.73s.15,0,.05,0l-.29,0-.55.08-.51,0-.6,0a4.77,4.77,0,0,1-1.8-.19,3,3,0,0,1-.72-.4c.08-.22.17-.42.25-.62.41-.88.85-1.72,1.17-2.38l.08-.18s0,0,0,0c.22.44.46,1,.85,1.69a4.45,4.45,0,0,0,.81,1,3.11,3.11,0,0,0,.28.23l.21.16a3.66,3.66,0,0,0,.52.28l.09,0Z"/>
+                <path class="cls-6"
+                      d="M55.18,85.58s-.19.17-.33.36a2,2,0,0,0-.23.4s0,0-.06.13a.77.77,0,0,0-.08.29.76.76,0,0,0,0,.15h0s-.07,0-.1,0l-.12-.15a1,1,0,0,1,.08-.53.84.84,0,0,1,.1-.15,1.33,1.33,0,0,1,.26-.28C54.9,85.6,55.17,85.53,55.18,85.58Z"/>
+                <path class="cls-6"
+                      d="M54.74,67.67a1.6,1.6,0,0,1-.26,1.3h0l-.23-.18,0,0a1.35,1.35,0,0,0,.2-.91c-.17,0-.46,0-.64,0a.71.71,0,0,1-.27.33L53.36,68c.18-.12.21-.21.21-.24l-.06-.2.21,0h.83A.18.18,0,0,1,54.74,67.67Z"/>
+                <path class="cls-8"
+                      d="M54.49,86.91c0,.16.09.28.07.31s-.26-.15-.3-.45a.06.06,0,0,1,0,0l.12.15s.07,0,.1,0Z"/>
+                <path class="cls-3"
+                      d="M54.48,67.85a1.35,1.35,0,0,1-.2.91l0,0c-.23-.2-.46-.4-.67-.61a.71.71,0,0,0,.27-.33C54,67.86,54.31,67.86,54.48,67.85Z"/>
+                <path class="cls-6" d="M54.47,69h0a.42.42,0,0,1-.28.1.57.57,0,0,1-.28-.08l.15-.25a.23.23,0,0,0,.18,0Z"/>
+                <path class="cls-6"
+                      d="M53.06,103l.7.13-.19.29c0,.07-.2.05-.36,0s-.25-.22-.2-.31A.28.28,0,0,1,53.06,103Z"/>
+                <path class="cls-6" d="M53.57,68.18l-.09.06L53.32,68l0,0Z"/>
+                <path class="cls-6" d="M52.18,44.73l1.18.58-.07.14-.71-.28L52.07,45Z"/>
+                <path class="cls-6"
+                      d="M53.29,45.45c-.07.14-.19.39-.37.74,0-.12-.06-.22-.09-.31a1.06,1.06,0,0,0-.16-.34.82.82,0,0,0-.21-.19l-.53,1a4.45,4.45,0,0,1,.48.83l-.08.18c-.32.66-.76,1.5-1.17,2.38-.08.2-.17.4-.25.62a.94.94,0,0,1-.24-.28l-.81.85a3,3,0,0,0,.74.33,15.28,15.28,0,0,0-.42,1.65c0,.28-.1.57-.13.86a1.11,1.11,0,0,1-.26-.32l-.89.75a4,4,0,0,0,1,.64,14.88,14.88,0,0,0,0,2q0,.57.09,1.17h-.31v0c0-.78-.1-1.54-.14-2.26l-.24-.29-.14-.19a3.52,3.52,0,0,0-.27-.37l-.14-.21c0-.4.06-.78.11-1.15l.88-.55-.56-.82a.34.34,0,0,1-.1.06,15.8,15.8,0,0,1,.54-1.93c.51-.4.85-.67.82-.73s-.27,0-.63.18c.07-.17.13-.33.2-.49.45-1,.84-1.76,1.16-2.44l.9-1.87.51.21Z"/>
+                <path class="cls-6"
+                      d="M52.6,70c.21.34.45.64.4.81s-.57.12-1-.1a4.06,4.06,0,0,1-.57-.35,1.73,1.73,0,0,1-.29-.31l0-.12v0A7.59,7.59,0,0,0,52,68.84s0,.09,0,.12a.66.66,0,0,0,.24.45.48.48,0,0,0,0,.13Z"/>
+                <path class="cls-6"
+                      d="M52.83,45.88c0,.09.06.19.09.31l-.51,1a4.45,4.45,0,0,0-.48-.83l.53-1a.82.82,0,0,1,.21.19A1.06,1.06,0,0,1,52.83,45.88Z"/>
+                <path class="cls-6"
+                      d="M52.65,96.14a4.18,4.18,0,0,1-.25,1.53,3.85,3.85,0,0,1-1,1.49,10.08,10.08,0,0,1-2.88,1.66l-.68.25c-.24-.14-.48-.28-.71-.44l.16,0c.25-.07.6-.18,1-.33a9.58,9.58,0,0,0,2.79-1.45,3.65,3.65,0,0,0,1.34-2.67,9.38,9.38,0,0,0,0-1.39h.06A3.81,3.81,0,0,1,52.65,96.14Z"/>
+                <path class="cls-6"
+                      d="M52.45,67.7a.76.76,0,0,1-.12.61,7,7,0,0,1-.84-1.15c.4-.68.44-1,.5-.87A8.22,8.22,0,0,0,52.45,67.7Z"/>
+                <path class="cls-8" d="M52.43,94.75h-.06s0-.06,0-.06S52.4,94.71,52.43,94.75Z"/>
+                <path class="cls-3"
+                      d="M52.37,94.74a9.38,9.38,0,0,1,0,1.39,3.65,3.65,0,0,1-1.34,2.67,9.58,9.58,0,0,1-2.79,1.45c-.41.15-.76.26-1,.33l-.16,0h0l-.22-.15-.35-.24c-.18-.13-.42-.3-.62-.47-.43-.33-.9-.78-1.34-1.17,0,.53,0,1,0,1.56l-.8-1.7-.4-.84-.56.74-.6.77-.08.1s0,.06,0,0v-.06l-.06-.3L41.62,97c-.06-.31-.13-.61-.2-.92l-.1-.47a3,3,0,0,0-.16-.56c-.08-.17-.27-.8-.48-1.5.22,0,.49.08.78.11a6.4,6.4,0,0,0,1.57,0,5.69,5.69,0,0,0,1.68-.54A3,3,0,0,0,46,92.25a3.87,3.87,0,0,0,.58-.93c.08-.24.16-.46.23-.66.14-.39.25-.72.32-1,.17.33.29.52.29.54s.22.33.53.77a18.44,18.44,0,0,0,1.22,1.54,7.72,7.72,0,0,0,1.46,1.31,2.27,2.27,0,0,0,.79.37l.19.23h0a1.22,1.22,0,0,0,.32.12Z"/>
+                <path class="cls-6"
+                      d="M52.38,3l-.11,0-.37.13-.4.16-.28.12a9.5,9.5,0,0,0-1-.09h-.46l.12-1.15h0l.47.14c.32.09.81.24,1.49.48Z"/>
+                <path class="cls-6"
+                      d="M49.82,59.63h0l0-.49c0-.38,0-.75-.08-1.11h0l.13,1.16.27-.07c.1.72.22,1.46.38,2.2a23,23,0,0,0,.76,2.84A1.05,1.05,0,0,0,51,64c-.11,0-.19,0-.18,0s.07,0,.13.08l.21.24a.67.67,0,0,0,.25.2,6.44,6.44,0,0,0,.24.61s0,0,0,0h0q.12.32.27.63l.18.35-.13.07c-.06-.11-.1.19-.5.87-.17-.28-.32-.56-.46-.85a21.2,21.2,0,0,1-1.6-4.74c-.06-.23-.1-.46-.15-.68a1,1,0,0,0,.47-.43.8.8,0,0,0,.1-.45.78.78,0,0,0,0-.22l0-.07,0,0h0l0,0v0Z"/>
+                <path class="cls-6"
+                      d="M52.33,68.31a2.77,2.77,0,0,1-.31.53c0-.3,0-.63-.14-.72s-.56.2-.75.71a1.49,1.49,0,0,0-.1.8,1,1,0,0,0,.06.28l0,0-.65.61a1.77,1.77,0,0,1-.36-.26L50,70.16l-.44-.49,0,0,.17-.19c.3-.28.48-.45.51-.49a12.34,12.34,0,0,0,1.33-1.81A7,7,0,0,0,52.33,68.31Z"/>
+                <path class="cls-6"
+                      d="M51.91,64.51a.48.48,0,0,1,.17.41.37.37,0,0,1-.27.31.24.24,0,0,1-.14,0,0,0,0,0,1,0,0c.06-.06.23-.16.2-.29a.23.23,0,0,0-.13-.16.26.26,0,0,0-.1,0,1,1,0,0,1-.21-.11c0-.14-.11-.28-.15-.42,0,0,0,0,.05,0a1.48,1.48,0,0,0,.42.19A.36.36,0,0,1,51.91,64.51Z"/>
+                <path class="cls-6"
+                      d="M51.47,72.61c.32.23.55.35.54.43s-.32.14-.74,0a4.64,4.64,0,0,1-.69-.23l-.38-.17a1.87,1.87,0,0,1-.39-.23,1.7,1.7,0,0,1-.62-.75l1.23-1.16a.05.05,0,0,0,0,0h0l0,.07a2,2,0,0,0-.16.3.75.75,0,0,0,.13.82,3,3,0,0,0,.25.24l.3.23C51.13,72.36,51.31,72.5,51.47,72.61Z"/>
+                <path class="cls-6"
+                      d="M51.88,68.12c.12.09.1.42.14.72a7.59,7.59,0,0,1-.93,1.07,1,1,0,0,1-.06-.28,1.49,1.49,0,0,1,.1-.8C51.32,68.32,51.74,68,51.88,68.12Z"/>
+                <path class="cls-9" d="M51.65,65.2a0,0,0,0,0,0,0h0S51.64,65.21,51.65,65.2Z"/>
+                <path class="cls-6" d="M51.49,43.61l-.92.26-.61.19-.54-.24c.32-.14.66-.27,1-.39l.38-.13h0Z"/>
+                <path class="cls-6"
+                      d="M51.26,64.17c0,.14.1.28.15.42a.67.67,0,0,1-.25-.2L51,64.15c-.06-.05-.12-.05-.13-.08s.07-.07.18,0A1.05,1.05,0,0,1,51.26,64.17Z"/>
+                <path class="cls-6"
+                      d="M47.19,89.26a2.24,2.24,0,0,0-.17.33l-.1-.19a6.53,6.53,0,0,1-.51-2,.28.28,0,0,1,0-.09c.13-.07.18-.12.17-.14l-.17.07a5.07,5.07,0,0,1,.37-2.64h0a14.28,14.28,0,0,0,.1,2.73,6.25,6.25,0,0,0,.6,1.76,7.06,7.06,0,0,0,.47.75l.46.78c.28.45.66,1,1.08,1.59a8.81,8.81,0,0,0,1.26,1.39c.38.34.68.52.66.57s0,0,0,0a2.27,2.27,0,0,1-.79-.37,7.72,7.72,0,0,1-1.46-1.31A18.44,18.44,0,0,1,47.9,91c-.31-.44-.51-.75-.53-.77s-.12-.21-.29-.54A1.34,1.34,0,0,0,47.19,89.26Z"/>
+                <path class="cls-6"
+                      d="M51.22,3.43l-.51.22c-.52.23-1,.48-1.49.74A20.75,20.75,0,0,0,46.73,6l-.24.18a.9.9,0,0,0-.21.08,3.63,3.63,0,0,0-.46.34,1.67,1.67,0,0,0-.06-1c.09-.1.18-.21.28-.31a15.45,15.45,0,0,1,2.4-2.07c.45-.34,1-.65,1.46-1l-.12,1.15h.46A9.5,9.5,0,0,1,51.22,3.43Z"/>
+                <path class="cls-6"
+                      d="M50.81,43.3l-.38.13c-.35.12-.69.25-1,.39l-.79-.35c-1.69-.76-3.27-1.5-4.61-2.18-.66-.35-1.28-.68-1.82-1s-1-.64-1.38-.88l-1.24-.82L37.19,37l-2.51-1.64c-.17-.13-.42-.28-.6-.44l-.22-.26a2.36,2.36,0,0,1-.15-.25c-.06-.09,0-.21,0-.28s0-.18.13-.28a1.12,1.12,0,0,1,.27-.26l.34-.24a3.36,3.36,0,0,1,.48-.28l.15-.07L35,33l-.05,0-.18,0-.59-.17-3.4-1,2.59-1.66.84-.54.21-.13.07,0,.16-.1.15-.09s-.08-.05-.13-.07L34.45,29l-.26-.12-.44-.18s-.22-.08-.31-.14a1,1,0,0,1-.28-.23.92.92,0,0,1,.12-1.26,8.12,8.12,0,0,0,1.86-3,16.17,16.17,0,0,0,.79-2.8,15.29,15.29,0,0,0,.25-2.24l.16.14h0a10,10,0,0,1,0,2.16,15.55,15.55,0,0,1-.63,2.93A11.13,11.13,0,0,1,35,26a5.62,5.62,0,0,1-.51.83c-.09.13-.19.27-.3.4l-.16.2-.15.16a.24.24,0,0,0,0,.36.15.15,0,0,0,.09.06L34,28l.45.17,1.38.52.38.15.19.07.09,0,0,0,0,0-.67.45-2,1.39-.42.28-.14.1-.2.15.32.07,1,.27,3.61,1-1.61.89-.76.44-.28.17-.08,0h0s-.06,0-.05.07l.12.07L37.87,36c1.45.9,2.36,1.5,2.44,1.54s.49.35,1.24.86c.39.28.77.55,1.29.87s1.1.64,1.75,1c1.3.7,2.84,1.47,4.49,2.27Z"/>
+                <path class="cls-6"
+                      d="M50.91,50.39c-.11.28-.21.59-.31.9a3,3,0,0,1-.74-.33l.81-.85A.94.94,0,0,0,50.91,50.39Z"/>
+                <path class="cls-6"
+                      d="M50.44,49.58c0,.06-.31.33-.82.73.06-.19.13-.37.19-.55C50.17,49.6,50.42,49.53,50.44,49.58Z"/>
+                <path class="cls-6"
+                      d="M50.06,70.28a1.77,1.77,0,0,0,.36.26L49.19,71.7s0-.07,0-.11a1.89,1.89,0,0,1,0-1,3,3,0,0,1,.19-.61l.08-.16s0,0,0,0,0,0,0-.06a.35.35,0,0,1,.08-.1l.44.49Z"/>
+                <path class="cls-6"
+                      d="M50.05,53.8a9.46,9.46,0,0,0-.12,1.07,4,4,0,0,1-1-.64l.89-.75A1.11,1.11,0,0,0,50.05,53.8Z"/>
+                <path class="cls-6" d="M50,58.05c0,.35.08.72.13,1.08l-.27.07L49.72,58H50Z"/>
+                <path class="cls-6"
+                      d="M49.42,43.82l.54.24a17.15,17.15,0,0,0-2.08.81,9.81,9.81,0,0,0-1.13.66s.31-.47,1-.88A13,13,0,0,1,49.42,43.82Z"/>
+                <path class="cls-6"
+                      d="M48.61,73.81c.54.64,1.4,1.07,1.33,1.25s-1,.06-1.94-.55a3.46,3.46,0,0,1-.85-.86c.31-.31.62-.6.9-.87l0,.1A2.72,2.72,0,0,0,48.61,73.81Z"/>
+                <path class="cls-9" d="M49.92,2.18h0Z"/>
+                <path class="cls-6"
+                      d="M49.85,60a.8.8,0,0,1-.1.45,1,1,0,0,1-.47.43l-.15-.78a.08.08,0,0,0,0-.07v0l.14-.08h0l.05,0h0l0,0,0,0a.06.06,0,0,0,0,0l.13-.07h0l.12,0h0l0,0,0,.07A.78.78,0,0,1,49.85,60Z"/>
+                <path class="cls-8" d="M49.82,59.63l0,0h0Z"/>
+                <path class="cls-6"
+                      d="M49.81,49.76c-.06.18-.13.36-.19.55-.27.2-.59.45-.91.72-.48.38-1,.79-1.42,1.18l-.6.56-.25.24-.11.11-.07.08s0,0,0,.06a1.23,1.23,0,0,0,.06.21,2.61,2.61,0,0,0,.27.52c.25.39.92.85,1.43,1.53a3.19,3.19,0,0,1,.53,1.12,4.3,4.3,0,0,1,.1,1c0,.15,0,.29,0,.41a1.13,1.13,0,0,1,0,.18.19.19,0,0,1,0,.09.09.09,0,0,1,0,.06h0l-.11-.09h0s0,0,0,0h0s0,0,0,0l-.05,0s0-.07,0-.12-.05-.23-.08-.37A3.2,3.2,0,0,0,47.51,56c-.46-.51-1.14-.87-1.6-1.4a4.26,4.26,0,0,1-.45-.71c-.08-.19-.12-.33-.13-.35a1.42,1.42,0,0,1,0-.25.83.83,0,0,1,.25-.67c.05,0,.09-.09.15-.13a1.36,1.36,0,0,0,.12-.12l.29-.23.68-.52c.5-.36,1.06-.72,1.58-1A14.45,14.45,0,0,1,49.81,49.76Z"/>
+                <path class="cls-8" d="M49.79,59.65v0l0,0h0Z"/>
+                <path class="cls-6"
+                      d="M49.79,59.64h0l-.12.06h0l-.13.07a.06.06,0,0,1,0,0l0,0,0,0h0l-.05,0h0l-.14,0h0a.45.45,0,0,1,0-.17s0,0,0,0L49,59.21l-.12-1.12c-.06-.64-.12-1.26-.17-1.84a11.37,11.37,0,0,1,0-1.55l.14.21a3.52,3.52,0,0,1,.27.37l.14.19.24.29c0,.72.09,1.48.14,2.26v0c0,.36.06.73.08,1.11Z"/>
+                <path class="cls-8" d="M49.78,59.66h0l-.12,0Z"/>
+                <path class="cls-6"
+                      d="M49.18,52.18l.56.82-.88.55c0-.28.08-.56.13-.83l.09-.47h0A.34.34,0,0,0,49.18,52.18Z"/>
+                <path class="cls-3"
+                      d="M49.62,50.31a15.8,15.8,0,0,0-.54,1.93h0l-1,.65-.27.18c-.18.13-.42.25-.48.45a1,1,0,0,0,.06.68c.06.14.08.17.12.25l.12.2a8.57,8.57,0,0,0,.52.76l.29.39.16.19.07.08h0a.88.88,0,0,0,0,.16c0,.22,0,.46,0,.7,0,.63.1,1.27.19,1.91h0a.47.47,0,0,0-.12-.23,1.81,1.81,0,0,0-.24-.24h0a.09.09,0,0,0,0-.06.19.19,0,0,0,0-.09,1.13,1.13,0,0,0,0-.18c0-.12,0-.26,0-.41a4.3,4.3,0,0,0-.1-1,3.19,3.19,0,0,0-.53-1.12c-.51-.68-1.18-1.14-1.43-1.53a2.61,2.61,0,0,1-.27-.52,1.23,1.23,0,0,1-.06-.21s0,0,0-.06l.07-.08.11-.11.25-.24.6-.56c.45-.39.94-.8,1.42-1.18C49,50.76,49.35,50.51,49.62,50.31Z"/>
+                <path class="cls-6"
+                      d="M49.48,69.65l0,0a.35.35,0,0,0-.08.1s0,.06,0,.06,0,0,0,0l-.08.16a3,3,0,0,0-.19.61,1.89,1.89,0,0,0,0,1s0,.07,0,.11l-.42.4-.72.68c0-.1,0-.18-.06-.25a.82.82,0,0,0-.09-.26l-.77.42-.13.07-.16.08-.1,0h0l-.07-.05C47.61,71.76,48.53,70.69,49.48,69.65Z"/>
+                <path class="cls-6"
+                      d="M49.13,60.11l.15.78-.19.07a2.46,2.46,0,0,1-.65.08A9.23,9.23,0,0,1,47.26,61a4.84,4.84,0,0,1-1.12-.28,1.5,1.5,0,0,1-.92-.83,1.07,1.07,0,0,1,0-.64,4.7,4.7,0,0,1,.18-.47,6.14,6.14,0,0,1,.4-.86,1.48,1.48,0,0,1,.29-.36l.33-.27a1.68,1.68,0,0,1,.36-.28c.11,0,.24-.11.35,0s.15.43.2.63,0,.17.05.25a.3.3,0,0,1,0,.21l-.23.07.1-.11c0-.07,0-.2-.07-.34s0-.27-.15-.39-.16,0-.22.08l-.18.19-.26.25a1.08,1.08,0,0,0-.21.29,8.29,8.29,0,0,0-.32.82,4.29,4.29,0,0,0-.13.44.59.59,0,0,0,0,.35,1.07,1.07,0,0,0,.64.48,4.52,4.52,0,0,0,1,.2,7.76,7.76,0,0,0,1.08,0c.33,0,.69-.12.71-.24Z"/>
+                <path class="cls-8" d="M49.14,60l.14,0-.14.08h0Z"/>
+                <path class="cls-8" d="M49.14,60v0a.08.08,0,0,1,0,.07c0-.11,0-.21,0-.31a.45.45,0,0,0,0,.17h0Z"/>
+                <path class="cls-3"
+                      d="M49.09,59.8c0,.1,0,.2,0,.31v0c0,.12-.38.24-.71.24a7.76,7.76,0,0,1-1.08,0,4.52,4.52,0,0,1-1-.2,1.07,1.07,0,0,1-.64-.48.59.59,0,0,1,0-.35,4.29,4.29,0,0,1,.13-.44,8.29,8.29,0,0,1,.32-.82,1.08,1.08,0,0,1,.21-.29l.26-.25.18-.19c.06-.05.15-.13.22-.08s.08.27.15.39.11.27.07.34l-.1.11,0,0a1.08,1.08,0,0,0-.54.38.41.41,0,0,0,0,.34.62.62,0,0,0,.12.2,1,1,0,0,0,.13.14s.11,0,.15-.09.08-.15.06-.17l-.1-.08c0-.07-.1-.14-.07-.21s.2-.17.38-.26a1.52,1.52,0,0,1,.57-.18.85.85,0,0,1,.54.19c.16.12.32.23.44.33s.08.47.12.47a.35.35,0,0,0,.07-.14.35.35,0,0,0,0-.18h0q.06.47.15.93S49.08,59.79,49.09,59.8Z"/>
+                <path class="cls-8"
+                      d="M49,59.21l.07.58q-.09-.47-.15-.93c-.09-.64-.15-1.28-.19-1.91,0-.24,0-.48,0-.7.05.58.11,1.2.17,1.84Z"/>
+                <path class="cls-6"
+                      d="M49.08,52.25l-.09.47c-.05.27-.1.55-.13.83l-.28.18-.27.17h0v0l.05.12.09.15c.09.17.2.33.31.51a11.37,11.37,0,0,0,0,1.55.88.88,0,0,1,0-.16h0L48.63,56l-.16-.19-.29-.39a8.57,8.57,0,0,1-.52-.76l-.12-.2c0-.08-.06-.11-.12-.25a1,1,0,0,1-.06-.68c.06-.2.3-.32.48-.45l.27-.18Z"/>
+                <path class="cls-6"
+                      d="M48.94,58.86a.35.35,0,0,1,0,.18.35.35,0,0,1-.07.14s.11-.25-.12-.47-.28-.21-.44-.33a.85.85,0,0,0-.54-.19,1.52,1.52,0,0,0-.57.18c-.18.09-.35.18-.38.26s0,.14.07.21l.1.08s0,.1-.06.17-.12.11-.15.09a1,1,0,0,1-.13-.14.62.62,0,0,1-.12-.2.41.41,0,0,1,0-.34,1.08,1.08,0,0,1,.54-.38l0,0c-.08.09-.15.13-.14.15s.14,0,.35-.19c0,0,0,0,0,0a1.29,1.29,0,0,1,.4-.07.94.94,0,0,1,.55.2v.07a.32.32,0,0,0,0,.09s0,.09.16.12a.2.2,0,0,0,.09,0,1.81,1.81,0,0,1,.24.24A.47.47,0,0,1,48.94,58.86Z"/>
+                <path class="cls-6" d="M48.64,80.17a.82.82,0,0,1,.26,0,.89.89,0,0,1-.35.16Z"/>
+                <path class="cls-6"
+                      d="M48.64,80.17l-.09.13a5.51,5.51,0,0,1-.69.14,7.09,7.09,0,0,1-2.39-.11,3.52,3.52,0,0,1-1.23-.51,2.69,2.69,0,0,1-.83-.86,3.21,3.21,0,0,1-.34-.72c.08-.11.17-.21.25-.31l.12-.15a2.58,2.58,0,0,0,.34,1,2.52,2.52,0,0,0,.68.76,3.24,3.24,0,0,0,1.08.5,7.9,7.9,0,0,0,2.31.26A5.43,5.43,0,0,0,48.64,80.17Z"/>
+                <path class="cls-6"
+                      d="M48.47,58.3l.11.09a.2.2,0,0,1-.09,0c-.17,0-.13-.09-.16-.12a.32.32,0,0,1,0-.09v-.07l.1.07h0v0l0,0s0,0,0,0Z"/>
+                <path class="cls-8" d="M48.49,58.26s0,0,0,0l-.07-.06h0v0l.05,0s0,0,0,0Z"/>
+                <path class="cls-8" d="M48.47,58.29h0v0s0,0,0,0l0,0v0h0Z"/>
+                <path class="cls-6" d="M48.4,58.22h0l-.1-.07h0s0,0,.07,0h0Z"/>
+                <path class="cls-7"
+                      d="M47.86,80.44a5.51,5.51,0,0,0,.69-.14,9.44,9.44,0,0,0-1,1.5,7.28,7.28,0,0,0-.36.76c-.2,0-.52.13-.91.2a6.19,6.19,0,0,1-2.55,0,3.4,3.4,0,0,1-2.05-1.35,2.85,2.85,0,0,1-.37-.66q.21-.39.45-.75c.41-.63.86-1.22,1.3-1.79a3.21,3.21,0,0,0,.34.72,2.69,2.69,0,0,0,.83.86,3.52,3.52,0,0,0,1.23.51A7.09,7.09,0,0,0,47.86,80.44Z"/>
+                <path class="cls-6"
+                      d="M48,72.53c0,.07,0,.15.06.25-.28.27-.59.56-.9.87a2,2,0,0,1-.17-.27c-.1-.19-.17-.35-.21-.44l0-.06h0l.1,0,.16-.08.13-.07.77-.42A.82.82,0,0,1,48,72.53Z"/>
+                <path class="cls-6"
+                      d="M47.77,76.63c0,.09-.18.27-.54.26A2.43,2.43,0,0,1,46,76.54a3,3,0,0,1-.88-.8l.91-1,.09.31a2.57,2.57,0,0,0,.44.75,3.75,3.75,0,0,0,.74.58C47.57,76.53,47.73,76.55,47.77,76.63Z"/>
+                <path class="cls-6"
+                      d="M47.81,101.07l-.37.13-.41.13a.13.13,0,0,1-.13-.06c0-.07-.06-.14-.13-.2a.17.17,0,0,1,0-.24.15.15,0,0,1,.09-.13l.25-.07h0C47.33,100.79,47.57,100.93,47.81,101.07Z"/>
+                <path class="cls-6" d="M47.2,82.56c.16,0,.25-.07.26,0a1,1,0,0,1-.31.15A.47.47,0,0,1,47.2,82.56Z"/>
+                <path class="cls-6" d="M47.35,58s0,0,0,0c-.21.19-.34.19-.35.19s.06-.06.14-.15Z"/>
+                <path class="cls-6"
+                      d="M47.2,82.56a.47.47,0,0,0-.05.1,6.1,6.1,0,0,1-.81.28,6.18,6.18,0,0,1-2.67.18,3.68,3.68,0,0,1-2.33-1.42,2.41,2.41,0,0,1-.28-.43c.08-.16.16-.33.26-.49a2.85,2.85,0,0,0,.37.66,3.4,3.4,0,0,0,2.05,1.35,6.19,6.19,0,0,0,2.55,0C46.68,82.69,47,82.61,47.2,82.56Z"/>
+                <path class="cls-6" d="M47.19,89.26a1.34,1.34,0,0,1-.11.44L47,89.59A2.24,2.24,0,0,1,47.19,89.26Z"/>
+                <path class="cls-6"
+                      d="M47,89.59l.06.11c-.07.24-.18.57-.32,1-.07.2-.15.42-.23.66a3.87,3.87,0,0,1-.58.93,3,3,0,0,1-1.24.86,5.69,5.69,0,0,1-1.68.54,6.4,6.4,0,0,1-1.57,0c-.29,0-.56-.07-.78-.11l-.15-.5a8.75,8.75,0,0,0,1,.17,5.82,5.82,0,0,0,1.46,0,5.93,5.93,0,0,0,1.6-.46,3.62,3.62,0,0,0,1.36-.93,2.74,2.74,0,0,0,.39-.64c.1-.23.18-.45.27-.65C46.77,90.16,46.91,89.83,47,89.59Z"/>
+                <path class="cls-6"
+                      d="M47,73.38a2,2,0,0,0,.17.27c-.28.26-.56.55-.85.86l-.23.24a.73.73,0,0,0,0-.08,1.87,1.87,0,0,0-.64.16,2,2,0,0,0-.6.27,3.81,3.81,0,0,0,.28.54l.07.1c-.55.63-1.13,1.31-1.72,2a.08.08,0,0,1,0,0,.24.24,0,0,0-.26-.18.22.22,0,0,0-.2.26,1.93,1.93,0,0,0,.1.41c-.44.57-.89,1.16-1.3,1.79q-.24.36-.45.75l0-.07a2.69,2.69,0,0,1-.11-.33.16.16,0,0,0-.09-.12h0c.15-.35.32-.69.48-1l.08-.11c.38-.54.7-1.11,1-1.68l.82-1.19c.43-.48.86-1,1.32-1.41.64-.65,1.26-1.34,1.87-2l.07.05h0l0,.06C46.81,73,46.88,73.19,47,73.38Z"/>
+                <path class="cls-7"
+                      d="M46.92,89.4l.1.19c-.11.24-.25.57-.43,1-.09.2-.17.42-.27.65a2.74,2.74,0,0,1-.39.64,3.62,3.62,0,0,1-1.36.93,5.93,5.93,0,0,1-1.6.46,5.82,5.82,0,0,1-1.46,0,8.75,8.75,0,0,1-1-.17c-.25-.82-.49-1.62-.57-1.81l-.13-.34h0a11.84,11.84,0,0,1-.41-2.9c0-.27,0-.55,0-.83a2.08,2.08,0,0,0,.41.35,4.1,4.1,0,0,0,2.8.74,14.86,14.86,0,0,0,2.79-.51,3.91,3.91,0,0,0,1-.4.28.28,0,0,0,0,.09A6.53,6.53,0,0,0,46.92,89.4Z"/>
+                <path class="cls-3"
+                      d="M46.77,84.35v.3a5.07,5.07,0,0,0-.37,2.64,1.56,1.56,0,0,0-.15.06c-.21.07-.51.15-.88.24a20.91,20.91,0,0,1-2.75.35,3.89,3.89,0,0,1-2.53-.76,3.19,3.19,0,0,1-.64-.65,5,5,0,0,1,.16-1,27.15,27.15,0,0,1,.87-3c.18-.43.37-.84.58-1.24a2.41,2.41,0,0,0,.28.43,3.68,3.68,0,0,0,2.33,1.42,6.18,6.18,0,0,0,2.67-.18,6.1,6.1,0,0,0,.81-.28A3.61,3.61,0,0,0,46.77,84.35Z"/>
+                <rect class="cls-9" x="46.74" y="72.88" width="0.01" height="0.01"/>
+                <path class="cls-6" d="M46.57,87.22s0,.07-.17.14,0,0,0-.07Z"/>
+                <path class="cls-6"
+                      d="M46.4,87.29s0,0,0,.07a3.91,3.91,0,0,1-1,.4,14.86,14.86,0,0,1-2.79.51,4.1,4.1,0,0,1-2.8-.74,2.08,2.08,0,0,1-.41-.35c0-.22,0-.44,0-.65a3.19,3.19,0,0,0,.64.65,3.89,3.89,0,0,0,2.53.76,20.91,20.91,0,0,0,2.75-.35c.37-.09.67-.17.88-.24A1.56,1.56,0,0,1,46.4,87.29Z"/>
+                <path class="cls-6"
+                      d="M46.05,74.67a.73.73,0,0,1,0,.08l-.91,1-.07-.1a3.81,3.81,0,0,1-.28-.54,2,2,0,0,1,.6-.27A1.87,1.87,0,0,1,46.05,74.67Z"/>
+                <path class="cls-6"
+                      d="M45.76,5.53a1.67,1.67,0,0,1,.06,1c-.2.17-.38.36-.56.54s-.11.12-.17.19a3.83,3.83,0,0,1-.28.29h-.05a.27.27,0,0,1-.12-.15.29.29,0,0,1,0-.11,1.24,1.24,0,0,1,.07-.27A6.56,6.56,0,0,1,45.76,5.53Z"/>
+                <path class="cls-9" d="M45.82,6.58h0c-.19.17-.37.36-.56.54C45.44,6.94,45.62,6.75,45.82,6.58Z"/>
+                <path class="cls-6"
+                      d="M45.56,5.37a.31.31,0,0,1,.2.16,6.56,6.56,0,0,0-1,1.53,1.24,1.24,0,0,0-.07.27.29.29,0,0,0,0,.11.27.27,0,0,0,.12.15h.05l-.22.23-1-.26c-.81-.2-2-.48-3.32-.72a13.41,13.41,0,0,0-2.07-.24c-.74,0-1.59.1-2.45.2s-1.75.24-2.64.4l-.66.13-.54.13c-.08,0-.14,0-.19.07a.49.49,0,0,0-.08.18v.07a.66.66,0,0,0,0,.14c0,.1,0,.2,0,.31s0,.42,0,.64a11.6,11.6,0,0,0,.18,1.3,12.83,12.83,0,0,0,.29,1.26c.07.21.13.41.2.6l.05.13v0l0,.07.15.29a32,32,0,0,0,2.47,4c1.76,2.14,3,3.61,2.85,3.75s-.64-.36-1.56-1.16h0a1.72,1.72,0,0,0-.11-.56s0,.15,0,.41c-.54-.48-1.19-1.08-1.92-1.79a27.93,27.93,0,0,1-3-4L31.12,13l0-.07a.75.75,0,0,1-.07-.12l-.08-.19c-.11-.22-.19-.44-.29-.67-.17-.46-.31-.92-.44-1.4s-.22-1-.3-1.47c0-.25-.06-.51-.08-.77s0-.27,0-.4V7.69c0-.07,0-.19,0-.29a2.26,2.26,0,0,1,.37-1.11,1.82,1.82,0,0,1,1-.62l.27-.1.18-.05.37-.1.71-.19c.93-.24,1.85-.42,2.75-.58s1.78-.28,2.67-.35a14.83,14.83,0,0,1,2.53.15c1.48.19,2.68.44,3.54.61Z"/>
+                <path class="cls-6"
+                      d="M43.43,77.75a.08.08,0,0,0,0,0l-.12.15c-.08.1-.17.2-.25.31a1.93,1.93,0,0,1-.1-.41.22.22,0,0,1,.2-.26A.24.24,0,0,1,43.43,77.75Z"/>
+                <path class="cls-6"
+                      d="M42.8,9.82c0,.08-.6.58-1.17,1.18a9.63,9.63,0,0,0-.73.85c-.19.24-.3.42-.31.42l-.32.42a6.13,6.13,0,0,0-.58.94c-.38.72-.45,1.54-.54,1.54s-.1-.21-.09-.54a3.59,3.59,0,0,1,.2-1.17,5.39,5.39,0,0,1,.5-1.1l.3-.48s.15-.19.38-.43a9,9,0,0,1,.82-.75h0l.56-.18c.37-.12.59-.39.52-.55C42.6,9.85,42.78,9.78,42.8,9.82Z"/>
+                <path class="cls-8"
+                      d="M42.35,10c.07.16-.15.43-.52.55l-.56.18a.12.12,0,0,1,0,0A7.84,7.84,0,0,1,42.35,10Z"/>
+                <path class="cls-6"
+                      d="M42.34,10h0a7.84,7.84,0,0,0-1,.68.12.12,0,0,0,0,0h0c-.08,0-.12,0-.13,0a1.43,1.43,0,0,0-.1-.16,1.31,1.31,0,0,0-.4-.32A3.36,3.36,0,0,0,38.72,10a8.12,8.12,0,0,1-3.36-.27c0-.22,1.65-.38,3.23-.73a4.34,4.34,0,0,1,2.6.08A2.51,2.51,0,0,1,42.34,10Z"/>
+                <path class="cls-6"
+                      d="M41.29,80.71l0,.07c-.1.16-.18.33-.26.49a2.75,2.75,0,0,1-.23-.45c0-.09.07-.17.1-.25a0,0,0,0,0,0,0l.13-.28h0a.16.16,0,0,1,.09.12A2.69,2.69,0,0,0,41.29,80.71Z"/>
+                <path class="cls-9" d="M41.07,80.26h0l-.13.28.13-.28Z"/>
+                <path class="cls-9" d="M40.93,80.57c0,.08-.06.16-.1.25h0Z"/>
+                <path class="cls-6"
+                      d="M40.83,80.82a2.75,2.75,0,0,0,.23.45c-.21.4-.4.81-.58,1.24a27.15,27.15,0,0,0-.87,3,5,5,0,0,0-.16,1,2.57,2.57,0,0,1-.19-.29l0,0c0-.29.1-.57.17-.89A24.6,24.6,0,0,1,40.83,80.82Z"/>
+                <path class="cls-6" d="M40.53,93.06l.15.5-.1,0-.12-.49Z"/>
+                <circle class="cls-3" cx="74.66" cy="26.13" r="0.81"/>
+                <circle class="cls-3" cx="62.2" cy="27.25" r="0.91"/>
+                <circle class="cls-3" cx="62.76" cy="28.68" r="0.18"/>
+                <circle class="cls-3" cx="73.86" cy="27.51" r="0.19"/>
+                <path class="cls-6"
+                      d="M64.13,43.12l.07,0a.29.29,0,0,0-.16-.56h0c-.1,0-.18.12-.21.2v0c-.09.37.47.53.56.16v0l-.21.2h0L64,42.54l-.06,0c-.35.14-.2.7.15.56Z"/>
+                <path class="cls-6" d="M63.92,46.39l0,0a.29.29,0,0,0,.41.41l0,0a.29.29,0,0,0-.41-.41Z"/>
+                <path class="cls-7"
+                      d="M90.14,88.49a1,1,0,0,1,0,.21l-.05.34a5.09,5.09,0,0,1-.12.68,10.14,10.14,0,0,1-.39,1.33,12,12,0,0,1-3.07,4.7,15.53,15.53,0,0,1-4.84,3.18l-.68.28-.7.23c-.46.17-1,.28-1.42.41-1,.21-1.92.36-3,.57l-3.17,1.25h0a18.09,18.09,0,0,1-3.4,1.13c-1.16.28-2.36.5-3.56.68l-1.45.19c.13-.25.3-.58.5-1s.49-1,.73-1.55a5.19,5.19,0,0,0,.46-1.93,3.85,3.85,0,0,0-.25-2,4.18,4.18,0,0,0-1.06-1.36,3,3,0,0,0-.66-.44,35.84,35.84,0,0,0,6.35-2.19c2.68-1.18,5.48-2.68,8.47-4.21.76-.37,1.51-.77,2.29-1.13s1.57-.78,2.37-1.09A8.86,8.86,0,0,1,86,86.22a4.17,4.17,0,0,1,2.46.48,4.33,4.33,0,0,1,1,.81,5.17,5.17,0,0,1,.42.51Z"/>
+                <path class="cls-3"
+                      d="M86.7,7.22s.06.78,0,1.87A25.11,25.11,0,0,1,86.24,13a29.25,29.25,0,0,1-1,3.84,7.62,7.62,0,0,0-.54,1.75s0,0,.09,0c0,.31,0,1.08,0,1.84,0,.5-.06,1-.1,1.38s-.07.63-.07.65,0,.27-.08.64-.11.76-.2,1.19c0-.09,0-.19,0-.3,0-.29,0-.63,0-1a7.16,7.16,0,0,0-.42-1.35,5,5,0,0,0-1-1.34A7.31,7.31,0,0,0,81.41,19a6.82,6.82,0,0,0-3.92-.93,4.21,4.21,0,0,0-2,.82A6.4,6.4,0,0,0,74,20.35a5.3,5.3,0,0,0-.85,1.74c-.18.57-.31,1.11-.42,1.62a32.86,32.86,0,0,0-.55,3.49c0,.08-.16,1.47-.21,3.51a15.86,15.86,0,0,0,1.33,7.34l.12.23.15.28a.6.6,0,0,0,.68.32,1.42,1.42,0,0,0,.32-.07,2.76,2.76,0,0,0,.3-.15l.42-.29c.54-.39,1-.78,1.53-1.17,1-.77,1.87-1.51,2.62-2.17A15.16,15.16,0,0,0,82,32.39a1.54,1.54,0,0,0,.09-.24l.38.46c.05.07.1.12.08.11h0l-.31.27a5.54,5.54,0,0,0-.83,1.07c-.52.93-1.07,2.09-1.78,3.18a8.35,8.35,0,0,1-1.16,1.48,7.12,7.12,0,0,1-1.32,1,12.63,12.63,0,0,0-1.39.88h0a1.1,1.1,0,0,0-.33-.45c-.14-.07-.22,0-.22,0s.07,0,.14.13a1.23,1.23,0,0,1,.17.42c.06.22.11.48.16.77a4,4,0,0,0-1.12.58c0,.08.52-.07,1.17-.23,0,.12,0,.25,0,.37a2.18,2.18,0,0,1,0,.51c-.27.14-.43.26-.41.28s.14,0,.37-.06a3.1,3.1,0,0,1-.15.46h0c-.64.18-1.22.49-1.18.58s.45,0,.95-.09c-.11.17-.18.26-.18.27s-.16.24-.43.55a7.27,7.27,0,0,1-1.09,1,2.76,2.76,0,0,1-1.36.44c-.4,0-.68,0-.7,0s.27.15.7.2a3,3,0,0,0,1-.07v.06a4.89,4.89,0,0,0-.52.42,3.16,3.16,0,0,1-1.28.58,4.38,4.38,0,0,1-1.39,0l-.21,0a2.7,2.7,0,0,0,.53-.46,2.11,2.11,0,0,0,.41-.59,1.07,1.07,0,0,0,.1-.24c-.06-.06-.26.3-.68.65a3.92,3.92,0,0,1-1.83.81,7.36,7.36,0,0,1-2,.12,4.51,4.51,0,0,1-.92-.2l-.26-.08a2.87,2.87,0,0,1-.58-.27c-.34-.24-.77-.62-1.21-1,.4-.27.78-.52,1.08-.68s.66-.24.66-.29-.31-.07-.75,0a9.59,9.59,0,0,0-1.34.61l0,0-1.07-.94.69-.23c1.49-.49,3-.87,3-1s0,0-.11,0l.46-.79.29,0,.32,0a.37.37,0,0,0,.23-.05.2.2,0,0,0,.08-.24.85.85,0,0,0-.25-.37.41.41,0,0,0-.24-.1h0l-1.6-.64c1-.08,1.55-.41,1.49-.47s.6-.44,1.3-1.47a12.55,12.55,0,0,0,2-4.7,14.28,14.28,0,0,0,.16-3.36,31.65,31.65,0,0,0-.28-3.67A11.8,11.8,0,0,0,68.21,24a8.88,8.88,0,0,0-2.61-3h0l0,0a9.26,9.26,0,0,0-5.51-2,27.83,27.83,0,0,0-4.85.52,17.8,17.8,0,0,0-3.33,1c-.79.34-1.23.63-1.3.65a16.69,16.69,0,0,0-1.49,1.06,25.2,25.2,0,0,0-3.12,3,24.7,24.7,0,0,0-1.78,2.24l-.42.61-.32.47-.2.29-.1.15c0,.05.06.09.08.14l.47.54L44,30l.55.6a47.56,47.56,0,0,0,4.91,4.66,25.94,25.94,0,0,0,2.8,2l.74.43.76.38c.51.24,1,.45,1.49.67,2,.84,3.79,1.61,5.42,2.14.36.11.69.21,1,.29l-.38,1.42A19.94,19.94,0,0,0,59,42.18a18.9,18.9,0,0,0-3-.06,11.45,11.45,0,0,0-1.4.14,13.73,13.73,0,0,0-1.39.29c-.7.19-1.56.44-2.44.75h0l-1.73-.82c-1.65-.8-3.19-1.57-4.49-2.27-.65-.35-1.24-.68-1.75-1s-.9-.59-1.29-.87c-.75-.51-1.19-.82-1.24-.86s-1-.64-2.44-1.54l-2.53-1.58-.12-.07s0,0,.05-.07h0l.08,0,.28-.17.76-.44L38,32.67l-3.61-1-1-.27-.32-.07.2-.15.14-.1.42-.28,2-1.39.67-.45,0,0,0,0-.09,0-.19-.07-.38-.15-1.38-.52L34,28l-.12,0a.15.15,0,0,1-.09-.06.24.24,0,0,1,0-.36l.15-.16.16-.2c.11-.13.21-.27.3-.4A5.62,5.62,0,0,0,35,26a11.13,11.13,0,0,0,.71-1.67,15.55,15.55,0,0,0,.63-2.93,10,10,0,0,0,0-2.16c.92.8,1.49,1.23,1.56,1.16s-1.09-1.61-2.85-3.75a32,32,0,0,1-2.47-4l-.15-.29,0-.07v0L32.33,12c-.07-.19-.13-.39-.2-.6a12.83,12.83,0,0,1-.29-1.26,11.6,11.6,0,0,1-.18-1.3c0-.22,0-.44,0-.64s0-.21,0-.31a.66.66,0,0,1,0-.14V7.72a.49.49,0,0,1,.08-.18c.05,0,.11,0,.19-.07l.54-.13.66-.13c.89-.16,1.78-.3,2.64-.4s1.71-.18,2.45-.2a13.41,13.41,0,0,1,2.07.24c1.36.24,2.51.52,3.32.72l1,.26.22-.23a3.83,3.83,0,0,0,.28-.29c.06-.07.12-.12.17-.19s.37-.37.56-.54h0a3.63,3.63,0,0,1,.46-.34.9.9,0,0,1,.21-.08L46.73,6a20.75,20.75,0,0,1,2.49-1.59c.48-.26,1-.51,1.49-.74l.51-.22.54.1a11.74,11.74,0,0,1,2.58.83,10.61,10.61,0,0,1,1.59.91c.27.19.56.38.86.6l.45.34c.19.14.38.29.58.46l.25.23a2.52,2.52,0,0,1,.74.52c.1.16,0,0,0-.11a2.46,2.46,0,0,1,0-.26,1.11,1.11,0,0,1,0-.3c-.37-1.25-.69-2.31-.95-3.18-.13-.42-.25-.8-.37-1.13l1,0c.88,0,1.63.08,2.15.13l.9.08.57,0,.17.15a8.67,8.67,0,0,1,2.17,4.3c0,.19.07.36.08.43v0l.29,0v0A45.57,45.57,0,0,1,65,2.81l.58,0h.76l.45,0a2.92,2.92,0,0,0,.44-.06c.45-.07.88-.17,1.32-.25l.28.29a6.8,6.8,0,0,1,1,1.53c.08.17.17.36.24.55a5.8,5.8,0,0,1,.21.89c0,.3.08.62.13.94l.06.49,0,.25,0,.13s0,0,0,0l.15-.49a15.41,15.41,0,0,1,.75-2,8.45,8.45,0,0,1,.67-1.2,3.69,3.69,0,0,1,.72-.78,6.43,6.43,0,0,1,.73-.48A3.27,3.27,0,0,1,74,2.38a16.23,16.23,0,0,1,2.16.54c.85.29,1.62.62,2.26.86s.93.34,1.23.42c.36.4.64.68.84.87s.34.29.38.27,0-.18-.19-.43-.22-.38-.39-.65l.46,0h.48c.5,0,1-.09,1.58-.16a15.37,15.37,0,0,1,1.63-.14,2.89,2.89,0,0,1,1.36.23c.66.32.79,1.28.84,1.91A11.5,11.5,0,0,1,86.7,7.22ZM86,6.12a3.52,3.52,0,0,0-.09-.85c0-.06-.25,0-.5.07l-.28.12h0a5.33,5.33,0,0,0-1.27.38,11.1,11.1,0,0,1-1.32.49,2.49,2.49,0,0,1-.44.09l.5.72a1.39,1.39,0,0,1,.24-.35A2.85,2.85,0,0,1,84,6.05a1.71,1.71,0,0,1,1.14-.11l0,.22A4.49,4.49,0,0,1,85,7.58c-.17.71-.35,1.44-.41,1.87-.32-.59-.63-1-.7-1a11.42,11.42,0,0,0,.56,1.74c.15.43.27.86.35,1.19s.1.55.11.57a4.42,4.42,0,0,1,.1.54,7.64,7.64,0,0,1,0,1.22,9.48,9.48,0,0,0-.1,1.82,5.29,5.29,0,0,0,.56-1.76,6.33,6.33,0,0,0,.18-1.31,6.26,6.26,0,0,0,0-.64s-.06-.26-.18-.6A9.92,9.92,0,0,0,84.92,10c-.06-.1-.11-.21-.16-.31a13.38,13.38,0,0,0,.94-1.93A4.77,4.77,0,0,0,86,6.12ZM74.92,43.19a.77.77,0,0,0,0-.38.17.17,0,0,0,0-.12s-.08,0-.12,0-.22.12-.21.14-.12-.11-.14-.08a.37.37,0,0,0,0,.38.33.33,0,0,0,.23.23C74.77,43.41,74.86,43.33,74.92,43.19Zm-.76-1.43a.5.5,0,0,0,.21-.35.17.17,0,0,0,0-.12.13.13,0,0,0-.13,0c-.17,0-.25.09-.25.12s-.13-.11-.14-.1l-.06.08a.56.56,0,0,0-.13.24.19.19,0,0,0,.13.24A.48.48,0,0,0,74.16,41.76Zm-.2,2a.69.69,0,0,0,.22-.62,1.19,1.19,0,0,0-.24-.55,1.73,1.73,0,0,0-.41-.4A1.34,1.34,0,0,0,73,42a3.59,3.59,0,0,0-1,0l-.16,0-.11,0-.2.07-.17,0h-.11l-.13,0a.83.83,0,0,0-.29,0,3,3,0,0,0-.37,0,4.5,4.5,0,0,0-.69.2l-.36.18a2.37,2.37,0,0,0-.79.63,2,2,0,0,0-.49,1.33,2,2,0,0,0,.19.79,1,1,0,0,0,.72.56,1.8,1.8,0,0,0,.81-.09.68.68,0,0,0,.31.18,1.77,1.77,0,0,0,.91,0,3.42,3.42,0,0,0,.69-.28h0a.47.47,0,0,0,.24.08.76.76,0,0,0,.55-.18c.21-.21.36-.4.42-.45s0,0,0,0h0A0,0,0,0,0,73,45l-.06,0v0s.09,0,.12,0a.51.51,0,0,0,.16-.09.57.57,0,0,0,.23-.3C73.52,44.05,73.64,44,74,43.79Zm-7.28,1.85a.58.58,0,0,0-.25-.49C66.17,45,66,45,66,45s-.14-.09-.15-.06a1.86,1.86,0,0,0-.3.45.58.58,0,0,0,.07.61.73.73,0,0,0,1.11-.38ZM41.63,11c.57-.6,1.21-1.1,1.17-1.18s-.2,0-.45.15h0A2.51,2.51,0,0,0,41.19,9,4.34,4.34,0,0,0,38.59,9c-1.58.35-3.23.51-3.23.73a8.12,8.12,0,0,0,3.36.27,3.36,3.36,0,0,1,1.91.28,1.31,1.31,0,0,1,.4.32,1.43,1.43,0,0,1,.1.16s0,0,.13,0a9,9,0,0,0-.82.75c-.23.24-.37.42-.38.43l-.3.48a5.39,5.39,0,0,0-.5,1.1,3.59,3.59,0,0,0-.2,1.17c0,.33,0,.54.09.54s.16-.82.54-1.54a6.13,6.13,0,0,1,.58-.94l.32-.42s.12-.18.31-.42A9.63,9.63,0,0,1,41.63,11Z"/>
+                <path class="cls-9" d="M85.26,6.06v0l-.06,0h0v0Z"/>
+                <path class="cls-3"
+                      d="M85.71,27.38c-.28.29-.62.65-1,1.06s-.49.56-.76.85l-.4.46-.66.76-.28-.09c.29-1,.59-2.12.81-2.93C83.53,27.52,85,27.45,85.71,27.38Z"/>
+                <path class="cls-9" d="M84.79,18.53l-.05,0a.79.79,0,0,1,0-.14S84.78,18.47,84.79,18.53Z"/>
+                <path class="cls-3"
+                      d="M84.25,31.42l-.15,0h0l-.28.08-1.11.31-.51.14c.13-.37.29-.94.47-1.56l.28.09,1.2.78Z"/>
+                <path class="cls-8" d="M84.25,24.29c0,.39,0,.62,0,.61s0-.06,0-.19l.06-.25A.85.85,0,0,1,84.25,24.29Z"/>
+                <path class="cls-7"
+                      d="M84,24c0,.31.08.54.11.7a14.12,14.12,0,0,0-.43,1.68v0h0a.3.3,0,0,1,0,.11.39.39,0,0,1,0,.13s0,.06,0,.1,0,.18-.08.28a1.21,1.21,0,0,1,0,.18,1.8,1.8,0,0,1,0,.19s0,0,0,0a.42.42,0,0,0,0,.06,0,0,0,0,1,0,0c-.16.57-.37,1.26-.6,1.85l-1.35-.11a7.18,7.18,0,0,0,.15-2.11,4.53,4.53,0,0,0-.64-2,11.8,11.8,0,0,0-1.13-1.66,4.19,4.19,0,0,0-1.46-1.21,5,5,0,0,0-4.1,0l-.32.2,0-.09a4.39,4.39,0,0,1,.69-1.51,5.45,5.45,0,0,1,1.25-1.29,3.61,3.61,0,0,1,1.61-.73,6.21,6.21,0,0,1,3.58.71,6.62,6.62,0,0,1,1.33,1.08,4.69,4.69,0,0,1,1,1.17A10.2,10.2,0,0,1,83.91,23C84,23.38,84,23.72,84,24Z"/>
+                <path class="cls-8" d="M83.43,27.47v0h0A0,0,0,0,0,83.43,27.47Z"/>
+                <path class="cls-7"
+                      d="M81.47,29.23l1.35.11c-.06.17-.13.34-.19.49-.53,1.21-.65,2.28-1,2.71s-.56.71-.56.71c-.44.36-1.08.88-1.86,1.48s-1.71,1.31-2.71,2c-.5.36-1,.74-1.55,1.09l-.41.26-.14.07-.15,0c-.05,0-.11,0-.12-.07L74.06,38l-.1-.22a13.5,13.5,0,0,1-1-3.66,14.36,14.36,0,0,1-.13-1.69.54.54,0,0,0,.17.07,3.86,3.86,0,0,0,1.09,0,15.52,15.52,0,0,0,2.54-.42A14,14,0,0,0,80,30.75a6.71,6.71,0,0,0,.84-.59,4.54,4.54,0,0,0,.38-.38,1.25,1.25,0,0,0,.09-.12l.09-.16C81.42,29.41,81.45,29.31,81.47,29.23Z"/>
+                <path class="cls-8" d="M82,32l.16-.05c0,.06-.05.12-.07.17Z"/>
+                <path class="cls-10"
+                      d="M81.16,27.14A7,7,0,0,1,81,29.09a.65.65,0,0,1-.07.21s0,0,0,.06l-.07.08a2.46,2.46,0,0,1-.33.31,5.84,5.84,0,0,1-.77.53,11.78,11.78,0,0,1-2.26,1,5.92,5.92,0,0,0,1.7-4.14c.09-2.17-1.34-4.54-2.93-5h.5a4.3,4.3,0,0,1,1.53.45,3.85,3.85,0,0,1,1.31,1.15A6.79,6.79,0,0,1,81.16,27.14Z"/>
+                <path class="cls-11"
+                      d="M76.22,22.06c1.59.5,3,2.87,2.93,5a5.92,5.92,0,0,1-1.7,4.14c-.33.11-.64.2-.94.27a15.51,15.51,0,0,1-2.44.38H74a2.34,2.34,0,0,1-1-1.47h0c.1-1.82.25-3,.26-3.11s.1-1.45.46-3.41c.06-.36.15-.73.24-1.11a.36.36,0,0,1,.11-.1h0a5.88,5.88,0,0,1,2.18-.61Z"/>
+                <path class="cls-10" d="M73.89,22.72l.1,0a.36.36,0,0,0-.11.1S73.89,22.74,73.89,22.72Z"/>
+                <path class="cls-10"
+                      d="M74,31.89a3.21,3.21,0,0,1-.81-.06.4.4,0,0,0-.29.05c0-.39,0-.77,0-1.13a3.25,3.25,0,0,1,0-.33A2.34,2.34,0,0,0,74,31.89Z"/>
+                <path class="cls-3"
+                      d="M73.8,60.42c0,.16-.12.29-.26.41a2.23,2.23,0,0,1-.42.3.86.86,0,0,1-.34.09,4.88,4.88,0,0,0,.08-.61,6.06,6.06,0,0,0,.06-1c0-.18,0-.34,0-.48h0a.21.21,0,0,0,0,.13.61.61,0,0,1,.36.23A2,2,0,0,1,73.8,60.42Z"/>
+                <path class="cls-12"
+                      d="M73.59,42.9c.18.22.26.47.11.6l-.18.15a1.62,1.62,0,0,0-.18.19.34.34,0,0,0-.07.11.42.42,0,0,0,0,.1.19.19,0,0,0,0,.08v0a.38.38,0,0,1-.07.21l-.08.08s-.09.06-.09,0,.12-.22,0-.31a.55.55,0,0,0-.38.14c-.07.06-.1.09-.09.1s0,0,.13,0l.14,0,.08,0h0s0,0,0,0c0,.2,0,.17,0,.22a.36.36,0,0,1,0,.11.83.83,0,0,0-.06.21s0,0,0,0v0c-.05,0-.09,0-.14,0s-.27.2-.39.27a.58.58,0,0,1-.44.13.16.16,0,0,0,0-.14c0-.09-.09-.09-.09-.08a.3.3,0,0,1,0,.09s-.08.09-.18.13a3.33,3.33,0,0,1-.78.22,1.59,1.59,0,0,1-.76,0l-.07,0,.33-.2a2,2,0,0,0,.28-.23l.12-.12a2,2,0,0,0,.13-.18.42.42,0,0,0,.08-.38.4.4,0,0,0-.29-.21,1.32,1.32,0,0,0-.57,0,.56.56,0,0,0-.38.21.54.54,0,0,0-.08.25s0,.07,0,.08,0,0,.08-.06a.84.84,0,0,1,.12-.19.4.4,0,0,1,.29-.1,1.29,1.29,0,0,1,.41,0s.1,0,.11.1a.2.2,0,0,1-.06.15l-.07.06-.11.1a2.2,2.2,0,0,1-.25.17,1.69,1.69,0,0,1-1.19.29.46.46,0,0,1-.35-.31,1.46,1.46,0,0,1-.1-.57,1.5,1.5,0,0,1,.4-.95,2.5,2.5,0,0,1,.94-.59,3.85,3.85,0,0,1,.58-.19,1.17,1.17,0,0,1,.27-.05h.06l.25.05a1.53,1.53,0,0,0,.29,0l.23-.08.21-.07.11,0H72a3.17,3.17,0,0,1,.87,0,1.06,1.06,0,0,1,.38.12A1.4,1.4,0,0,1,73.59,42.9Z"/>
+                <path class="cls-3"
+                      d="M73,54a2,2,0,0,1,0,.4c0,.31-.19.81-.25,1.28,0,.21-.06.42-.08.62-.15-.86-.4-1.9-.66-2.93l-.16-.6.11,0a1.84,1.84,0,0,1,.94.61.91.91,0,0,1,.11.44A.79.79,0,0,1,73,54Z"/>
+                <path class="cls-3"
+                      d="M72.25,57c.29.78.46,1.29.55,1.28-.07,0,0,.85-.2,2.3a15.37,15.37,0,0,1-2.22,5.6A28.34,28.34,0,0,1,68,69.45a5.89,5.89,0,0,1-3.79,1.9,16.42,16.42,0,0,1-2.35.22,15.88,15.88,0,0,1-2.4-.12,10.2,10.2,0,0,1-4.36-2L54.47,69h0a1.6,1.6,0,0,0,.26-1.3.18.18,0,0,0-.19-.11h-.83l-.21,0,.06.2s0,.12-.21.24l-.14-.13a6.9,6.9,0,0,1-1.1-1.62l-.18-.35q-.15-.32-.27-.63a.24.24,0,0,0,.14,0,.37.37,0,0,0,.27-.31.48.48,0,0,0-.17-.41.36.36,0,0,0-.18-.11,1.48,1.48,0,0,1-.42-.19s0,0-.05,0a23,23,0,0,1-.76-2.84c-.16-.74-.28-1.48-.38-2.2l.12,0c.26-.08.66-.2,1.22-.39a10.72,10.72,0,0,0,2.1-1c.41-.26.83-.56,1.28-.91l.74-.6c.31-.25.48-.46.79-.72a6.55,6.55,0,0,1,.56-.6l0,0A7.67,7.67,0,0,1,56,55c-.4,0-.82.08-1.16.09l-.82,0a9.68,9.68,0,0,1-1.4-.1,5.38,5.38,0,0,1-1.85-.65,3.29,3.29,0,0,1-.67-.53c0-.29.08-.58.13-.86a15.28,15.28,0,0,1,.42-1.65,4.78,4.78,0,0,0,.81.2,6.94,6.94,0,0,0,2-.08l.62-.09.81-.14.89-.16.48-.09c.12,0,0,0,0-.06s-.14,0-.15,0-.17-.1-.17-.11l-.17-.07,1.7-.25h0a15.19,15.19,0,0,0,1.8-1.48c.45-.37.91-.73,1.27-1l.45-.3a16.2,16.2,0,0,0,3.42,1,9.28,9.28,0,0,0,2,0v0a1,1,0,0,0,.19.14,3.7,3.7,0,0,0,.44.28,1.84,1.84,0,0,0,.47.15,2.79,2.79,0,0,0,1.18,0,6.28,6.28,0,0,0,.66-.23s.07.17.12.33a.27.27,0,0,1,.08.19h0v0a1.16,1.16,0,0,1-.18.51,1.92,1.92,0,0,1-.18.29,2.28,2.28,0,0,1-1.25.69l-.51.09-.61.1a4.7,4.7,0,0,0-.71.14l-.16,0-.09,0s0,.06,0,.08a1.84,1.84,0,0,0,.15.35,2.3,2.3,0,0,0,.52.6,3.18,3.18,0,0,0,.58.35,3.49,3.49,0,0,0,1.12.31A6.5,6.5,0,0,0,69.86,53c.37-.07.64-.13.85-.19h0l.31.84c.07.18.13.35.19.52l-.08.1a2.71,2.71,0,0,1-1,.68,3.82,3.82,0,0,1-1.73.24l-1-.09c-.26,0-.59-.08-1-.17s-.83-.23-1.29-.36l.11.14,0,0v0l0,0,.35.32a9.75,9.75,0,0,0,.74.64l.43.32.29.18a5.33,5.33,0,0,0,.56.32,5.15,5.15,0,0,0,2.26.61A5.47,5.47,0,0,0,72.25,57Zm-1.92,3.55a3.52,3.52,0,0,0,.29-.4,3.56,3.56,0,0,0-.45-.13l-.27,0c-.16,0-.32,0-.3.05a2.64,2.64,0,0,0,.26.11l.24.1c.06,0,0,0,.05,0s0,0-.06,0l-.11.12a.56.56,0,0,1-.24.17c-.09,0-.15,0-.16-.1s0-.16,0-.17-.07,0-.1.16a.27.27,0,0,0,0,.23.39.39,0,0,0,.26.11A1,1,0,0,0,70.33,60.54Zm-.14,3s.18-.11,0-.29a1.78,1.78,0,0,0-.74-.06l-.33,0a1.15,1.15,0,0,0-.31,0,3.87,3.87,0,0,0-1,.41,1.55,1.55,0,0,1-.32.14c-.07,0-.12,0-.12,0s-.09,0-.1.12a.63.63,0,0,0,.18.34.9.9,0,0,0,.45.32.84.84,0,0,0,.6-.22,4.68,4.68,0,0,1,.91-.55l.11,0,.18-.06.3-.09A.88.88,0,0,0,70.19,63.49Zm-1.1,3.9c0-.21-.16-.29-.3-.25a1,1,0,0,0-.2,0,3.56,3.56,0,0,0-.62.34c-.28.19-.53.42-.5.45s.31-.12.62-.25a4,4,0,0,1,.41-.17l.19-.06s.07,0,.07,0,0,0,0,0,0,.14,0,.22-.05.18-.07.25-.16.14-.18.17,0,0,.09,0,.16-.05.22-.12a1.74,1.74,0,0,0,.14-.27A2.09,2.09,0,0,0,69.09,67.39Zm-4.54-3.93a.18.18,0,0,0-.06-.23c-.14-.06-.13,0-.15,0H64a3.24,3.24,0,0,0-.67,0,.81.81,0,0,0-.52.46c-.07.17-.08.29-.06.3a2.44,2.44,0,0,0,.94-.07,1.63,1.63,0,0,0,.62-.28l.07,0a.11.11,0,0,0,.06,0S64.51,63.53,64.55,63.46Zm-.92,3.12c0-.13-.12-.24-.23-.28a2.15,2.15,0,0,0-.52-.13l-.36,0a1,1,0,0,0-.78.31,1.22,1.22,0,0,0-.36,1,2.13,2.13,0,0,1,.52-.88.73.73,0,0,1,.59-.17l.35,0a2.92,2.92,0,0,1,.45.08l0,0v0a.5.5,0,0,1-.07.08c-.1.11-.24.24-.33.32-.34.14-.68.19-.68.22a1.18,1.18,0,0,0,.77,0,3.25,3.25,0,0,0,.42-.31l.09-.1A.5.5,0,0,0,63.63,66.58ZM60.11,69.3a.26.26,0,0,0,.07-.24.4.4,0,0,0-.22-.2c-.31-.14-.6,0-.57,0s.07,0,.16,0a.86.86,0,0,1,.28.11s0,.06,0,.06,0,0,0,0a1.49,1.49,0,0,1-.46.07.49.49,0,0,1-.19,0c-.06,0,.05,0,.05.07a.23.23,0,0,1,0,.07s0,0,0,0,0,0,0,0,0,0,0,0l.1,0a1.16,1.16,0,0,0,.4,0l.19,0A.58.58,0,0,0,60.11,69.3ZM57.7,62.89a.24.24,0,0,0,0-.17.2.2,0,0,0-.07-.15.37.37,0,0,0-.16-.1.81.81,0,0,0-.31-.06,2.63,2.63,0,0,0-.77.06c-.26,0-.52.06-.73.08l-.15,0-.06,0s0,.07,0,.08.09.06.09.06,0,0,0-.07h.18a3.66,3.66,0,0,0,.75,0,3.23,3.23,0,0,1,.71,0l.19,0h0s0,0,0,0-.35.38-.54.42a.67.67,0,0,1-.33-.05l-.34-.1A1.21,1.21,0,0,0,55.8,63s.1.09.29.18l.31.15a.91.91,0,0,0,.43.11.83.83,0,0,0,.42-.2l.27-.21A.59.59,0,0,0,57.7,62.89Z"/>
+                <path class="cls-7"
+                      d="M73,2.19l-.42.4a4.62,4.62,0,0,0-.72,1,13.45,13.45,0,0,0-.62,1.26c-.13.34-.28.75-.43,1.18a2.55,2.55,0,0,0-.08.26s0,.07,0,0V6.22l0-.16,0-.32q0-.3-.06-.57a3,3,0,0,0-.1-.5,5.46,5.46,0,0,0-.21-.61,12.39,12.39,0,0,0-.83-1.76c.3,0,.61-.11.92-.15A8.43,8.43,0,0,1,71.8,2a1.48,1.48,0,0,1,.31,0l.41.05A3.64,3.64,0,0,0,73,2.19Z"/>
+                <path class="cls-7"
+                      d="M72.2,56.83a.66.66,0,0,0,0,.15,4.86,4.86,0,0,0-.63,0A10.19,10.19,0,0,1,70,56.92a5.15,5.15,0,0,1-2.09-.67c-.17-.11-.35-.21-.52-.33l-.24-.17-.08-.07a.77.77,0,0,1-.13-.12l0-.05.08,0,.16,0,.19,0a10.19,10.19,0,0,0,1.08.12,4.36,4.36,0,0,0,2-.22,3.23,3.23,0,0,0,1.07-.67Z"/>
+                <path class="cls-8" d="M71.77,45.45s0,0,0,0A.08.08,0,0,1,71.77,45.45Z"/>
+                <g id="_Group_" data-name="&lt;Group&gt;">
+                    <path class="cls-3"
+                          d="M70.82,83.14a1.05,1.05,0,0,0-.31-.28,1.38,1.38,0,0,0-.6-.08c-.16,0-.25,0-.25,0s.09.06.24.09a1.66,1.66,0,0,1,.49.16.82.82,0,0,1,.25.35l-.09.11a1,1,0,0,1-.36.3,2.26,2.26,0,0,1-1.07.11l-2.42,0-1.49-.82L65,82.21h.07l.32-.06h.12c.2,0,.48,0,.84,0a5.7,5.7,0,0,0,1.35,0,9.26,9.26,0,0,0,1.63-.62,7.83,7.83,0,0,1,.86-.38.72.72,0,0,1,.73.28,1.18,1.18,0,0,1,.32.66.89.89,0,0,0-.4-.16,1.53,1.53,0,0,0-.57.08.3.3,0,0,0-.17.09s0,0,0,0,0,0,.08,0a.38.38,0,0,1,.16,0,2.13,2.13,0,0,1,.5,0,.72.72,0,0,1,.43.35l-.09.15-.29.49A.35.35,0,0,0,70.82,83.14Z"/>
+                </g>
+                <path class="cls-7"
+                      d="M69.89,50.61l.47,1.26a4.92,4.92,0,0,1-.67.41,3.93,3.93,0,0,1-1.47.4,2.64,2.64,0,0,1-1.53-.43,1.41,1.41,0,0,1-.36-.37.57.57,0,0,1-.12-.23s0,0,.07,0l.12,0,.48,0,1.08-.1a2.94,2.94,0,0,0,1.93-.82Z"/>
+                <path class="cls-9" d="M69.72,47.3h0v0Z"/>
+                <path class="cls-3"
+                      d="M69.72,48.06v.08c0,.1-.13.22-.13.22l-.26.18a1.66,1.66,0,0,1-.79.36,1.32,1.32,0,0,1-1-.09.9.9,0,0,1-.27-.2.34.34,0,0,1,0-.15h0c.25-.08.49-.17.69-.25a8.55,8.55,0,0,0,1.35-.5c0,.06.07.12.1.13l.06,0,0,0h0A.76.76,0,0,1,69.72,48.06Z"/>
+                <path class="cls-8" d="M69.26,47.67a1.24,1.24,0,0,0,.2-.1s-.07.06-.19.13v0Z"/>
+                <path class="cls-3"
+                      d="M69.39,63.42h0l0,0h0l-.09,0a4.78,4.78,0,0,0-.92.64c-.16.12-.31.24-.45.23a.8.8,0,0,1-.38-.23.78.78,0,0,1-.2-.26.15.15,0,0,1,0-.11s0,0,.13,0a1.25,1.25,0,0,0,.36-.09,5.22,5.22,0,0,1,1-.31h.53Z"/>
+                <path class="cls-7"
+                      d="M69,31.47a13.85,13.85,0,0,1,0,3.23,13.51,13.51,0,0,1-1.65,4.65c-.3.52-.57.92-.76,1.2a3,3,0,0,0-.29.42s-.13.05-.38.1a5.22,5.22,0,0,1-1.12.1A6.93,6.93,0,0,1,63,41a15.08,15.08,0,0,1-2.18-.67c-1.57-.59-3.37-1.41-5.29-2.33-.48-.22-1-.45-1.45-.7l-.7-.38c-.23-.14-.47-.28-.69-.43a24.1,24.1,0,0,1-2.66-2,48.11,48.11,0,0,1-4.69-4.67l-.52-.6L44.58,29l0,0s0,0,0-.05v0l.11-.14c.14-.21.29-.41.43-.61A25.21,25.21,0,0,1,46.86,26a24.3,24.3,0,0,1,3-2.81c.79-.61,1.31-.89,1.36-.94s.44-.27,1.14-.58a16.12,16.12,0,0,1,3.07-1,29.13,29.13,0,0,1,4.62-.59,8.32,8.32,0,0,1,4.87,1.68l0,0a7.92,7.92,0,0,1,2.42,2.63,11,11,0,0,1,1.17,3.44A34.74,34.74,0,0,1,69,31.47Zm-1.4,1.13a3.9,3.9,0,0,0,.18-2,16.49,16.49,0,0,0-.59-2.52A10.8,10.8,0,0,0,66,25.61a5.56,5.56,0,0,0-1.16-1.29,11.65,11.65,0,0,0-1.62-.88,7.72,7.72,0,0,0-1.87-.59,4.76,4.76,0,0,0-2.12.1,6.51,6.51,0,0,0-1.94,1,12.46,12.46,0,0,0-4.25,4.91,10,10,0,0,0-.38,1c-.05.18-.09.36-.13.54s0,.18,0,.29,0,.29,0,.43l.33.27.21.16c.14.1.28.22.43.32l.86.58h0a9.39,9.39,0,0,0,2.61,1.13,23,23,0,0,0,2.54.58,12.77,12.77,0,0,0,4.43.18,7.53,7.53,0,0,0,2.83-1A2.43,2.43,0,0,0,67.56,32.6Z"/>
+                <path class="cls-3"
+                      d="M68.29,70.07c-.17.32-.34.62-.48.87s-.36.64-.37.65-.14.29-.32.69-.45.9-.74,1.38a10.11,10.11,0,0,0-1.16,2c0,.07.15,0,.33-.16a1.48,1.48,0,0,1,0,.27,25.11,25.11,0,0,0-.33,2.81c-.06,1.31-.06,2.23-.08,2.83,0,.32,0,.54,0,.69a.13.13,0,0,1,0,.06v0H65L64.36,79c0-.17-.07-.33-.11-.5l0-.25-.08-.29c0-.29-.06-.57-.08-.84-.05-.62-.1-1.2-.14-1.73-.09-1.07-.15-1.95-.2-2.56,0-.25,0-.46,0-.61l.66-.11a9.59,9.59,0,0,0,2.31-.74A5.08,5.08,0,0,0,68.29,70.07Z"/>
+                <path class="cls-10"
+                      d="M67.54,31.84s0,.75,0,.76a9.45,9.45,0,0,1-.92.58c-.18.1-.39.2-.62.3a5.74,5.74,0,0,0,1-3.41A13.61,13.61,0,0,1,67.54,31.84Z"/>
+                <path class="cls-11"
+                      d="M67.06,30.07a5.74,5.74,0,0,1-1,3.41c-.23.09-.48.18-.76.26l.14-.11a10.05,10.05,0,0,1-2.5.35H62a5.25,5.25,0,0,1-1.9-4.7c.14-2.6,1.6-4.63,3.4-4.74a6.68,6.68,0,0,1,.78.47,4.12,4.12,0,0,1,.85,1l.12.15.24.45.08.15A21.9,21.9,0,0,1,67.06,30.07Z"/>
+                <path class="cls-3"
+                      d="M66.43,48.23h-.06a9.52,9.52,0,0,1-1.93-.13,15.12,15.12,0,0,1-2.81-.9l1.3-.85a15.58,15.58,0,0,0,1.3,1.21,3.65,3.65,0,0,0,1,.49,4,4,0,0,0,1.07.17Z"/>
+                <path class="cls-3"
+                      d="M64.74,41.44l1.6.64a.3.3,0,0,0-.22.11.83.83,0,0,0-.18.34s.07,0,.15.07l-.16.15s0,0,0,0l0,0-.46.79A15.13,15.13,0,0,0,63.2,44l-.09-.75s0,0,0,0a4.16,4.16,0,0,0-1.24-.48l-.62-.16.38-1.42a9.31,9.31,0,0,0,1.26.28A7.51,7.51,0,0,0,64.74,41.44Z"/>
+                <path class="cls-3"
+                      d="M65.33,97.41a3.55,3.55,0,0,1,.13,1.79,5,5,0,0,1-.17.92A6.78,6.78,0,0,1,65,101c-.25.54-.53,1-.77,1.47s-.44.8-.59,1-.1.21-.14.28l-1.4.14c-.6,0-1.21.1-1.81.13l-.32,0h-.3l-.19,0-.9-.14c-1.61-.25-3.22-.45-4.78-.74,0,0,0,0,0,0,.14-.2.37-.47.64-.8a8.93,8.93,0,0,0,1.69-2.72,5.16,5.16,0,0,0,.08-3.17,1.82,1.82,0,0,0-.56-.8l1,.17a18.79,18.79,0,0,0,6.09-.11c.31,0,.63-.11,1-.19a2.52,2.52,0,0,1,.75.57A4.16,4.16,0,0,1,65.33,97.41Z"/>
+                <path class="cls-11"
+                      d="M65.4,33.63l-.14.11-.34.1h0a15.44,15.44,0,0,1-2,.14A10.05,10.05,0,0,0,65.4,33.63Z"/>
+                <path class="cls-11" d="M65.26,33.74l-.06,0-.28.05Z"/>
+                <path class="cls-9" d="M64.81,7.55v0l-.29,0v0Z"/>
+                <path class="cls-3"
+                      d="M64.39,63.38s0,0,0,0a.49.49,0,0,0,0,.11h0l-.28,0a.53.53,0,0,0,.14-.12l.13-.07s0,0,0,0A.21.21,0,0,0,64.39,63.38Z"/>
+                <path class="cls-11"
+                      d="M64.91,33.84a6.6,6.6,0,0,1-.84.16H64a.29.29,0,0,0-.24,0h-.05l-.5,0-.55,0a3.85,3.85,0,0,1-.48,0L62,34h.86A15.44,15.44,0,0,0,64.91,33.84Z"/>
+                <path class="cls-7" d="M64.21,2.78c.09.73.19,1.81.26,3.32A13.48,13.48,0,0,0,63,2.73Z"/>
+                <path class="cls-11" d="M64.07,34l-.14,0h-.16A.29.29,0,0,1,64,34Z"/>
+                <path class="cls-3"
+                      d="M64,63.47a1,1,0,0,1-.36.2c-.35.12-.73.21-.84.26.07-.09.25-.46.6-.5A3.94,3.94,0,0,1,64,63.47Z"/>
+                <path class="cls-3"
+                      d="M63.11,43.2l.09.75c-.25,0-.49.1-.74.16l-1,.27c-.47-.39-.81-.64-.86-.58a6.65,6.65,0,0,0,.58.66l-.8.25c-.58.19-1,.36-1,.37a8.64,8.64,0,0,0-1,.5l-.41.28c-1.2-.39-2.46-.76-3.71-1.11-.23-.07-.49-.13-.67-.2L53,44.27l-1.32-.59-.15-.07c.7-.19,1.36-.35,1.9-.47.78-.17,1.32-.22,1.35-.23s.56-.1,1.36-.19A20.23,20.23,0,0,1,59,42.65a23,23,0,0,1,2.86.31C62.52,43.08,63,43.2,63.11,43.2Z"/>
+                <path class="cls-10"
+                      d="M62.88,24.22l.66.32c-1.8.11-3.26,2.14-3.4,4.74A5.25,5.25,0,0,0,62,34l.15.1a15.7,15.7,0,0,1-2.66-.35,25,25,0,0,1-2.47-.64A9.23,9.23,0,0,1,54.65,32l0,0-.84-.59-.41-.32-.28-.22v-.09l0-.24c0-.16.08-.32.13-.48a6.91,6.91,0,0,1,.37-.95,10.46,10.46,0,0,1,2.48-3.28,8.38,8.38,0,0,1,3.31-2.09A4.94,4.94,0,0,1,62.88,24.22Z"/>
+                <path class="cls-9" d="M62.78,64s0,0,0,0S62.79,64,62.78,64Z"/>
+                <path class="cls-3"
+                      d="M61.86,72.35c.19,0,.38,0,.57,0l-.21,1.34c-.15,1.07-.36,2.5-.58,3.94l0,.26v.07h0s0,0,0,0l0,.09-.21.5c-.14.34-.26.66-.39,1l-.69,1.76c-.2.52-.37,1-.48,1.27,0,.08-.06.15-.08.22v0l0,.07s0,0,0,0l0,0c0,.09,0,.13,0,.14l-.51,1.63c-.33.27-.71.6-1.12.93l-1.39,1.19-.18.16-.09.07,0,0h0a2.8,2.8,0,0,1-.14-.25A.6.6,0,0,1,56,86.6a.36.36,0,0,1,0-.12.61.61,0,0,1,.19-.38,3.53,3.53,0,0,1,.28-.37c-.09-.21-.89.56-.79.71a.82.82,0,0,0,.21.57l.11.12L55.13,87l-.45-.07-.19,0a.76.76,0,0,1,0-.15.77.77,0,0,1,.08-.29c0-.08.06-.12.06-.13a2,2,0,0,1,.23-.4c.14-.19.35-.32.33-.36s-.28,0-.49.19a1.33,1.33,0,0,0-.26.28.84.84,0,0,0-.1.15,1,1,0,0,0-.08.53L54,86.34v-.21a2.45,2.45,0,0,1,0-.27,3.12,3.12,0,0,1,.1-.48,1.14,1.14,0,0,1,.45-.64,1,1,0,0,1,.7-.18c.08.16,2-.6,2-.62A12.54,12.54,0,0,0,59,82.79h0a9.25,9.25,0,0,0,.26-3,24.51,24.51,0,0,0-.13-3.16s-.1-.45-.29-1-.47-1.27-.76-2-.66-1.46-.93-2a9.7,9.7,0,0,0,2.18.62A14.62,14.62,0,0,0,61.86,72.35Z"/>
+                <path class="cls-3"
+                      d="M61.55,44.91l1,1.08-1.14.62-.53.3-1.12-.44-1.06-.37c.5-.26.87-.41.9-.42s.38-.18.93-.4Z"/>
+                <path class="cls-3"
+                      d="M60.21,47.39l-.09.07a13.14,13.14,0,0,0-1.21,1.12,8.94,8.94,0,0,0-1.49,1.81l-1.7.25a3.84,3.84,0,0,1-.8-.43,2.34,2.34,0,0,1-.38-.28c-.09-.07-.16-.16-.24-.23a3.46,3.46,0,0,1-.42-.57l.33-.19a20.84,20.84,0,0,0,2.69-1.65l1-.64c.58.17,1.14.34,1.69.52Z"/>
+                <path class="cls-9" d="M59.23,69.29s.08.12,0,0Z"/>
+                <path class="cls-7"
+                      d="M58.47,6.77c0,.08.11.28,0,.12s-.28-.28-.58-.53l-.15-.13L57.39,6l-.45-.34L56.06,5a13.29,13.29,0,0,0-1.62-1A20.13,20.13,0,0,0,52.38,3a14.93,14.93,0,0,1,3.11-.49c.41,0,.81,0,1.2,0,.19.34.39.77.61,1.28.31.7.73,1.82,1,2.46,0,0,.06.15.12.31Z"/>
+                <path class="cls-3"
+                      d="M57.2,46.47l-.57.44a17.91,17.91,0,0,0-2.42,2l-.33.19a3.84,3.84,0,0,1-.23-.45,11,11,0,0,1-.55-1.74c-.07-.3-.12-.54-.18-.75.18-.35.3-.6.37-.74h0c.27.09.49.14.74.2C55.11,45.92,56.17,46.18,57.2,46.47Z"/>
+                <path class="cls-8" d="M56.76,71.5l0,.07,0-.1A.09.09,0,0,0,56.76,71.5Z"/>
+                <path class="cls-7"
+                      d="M56.37,55.13l0,0-.55.45a17.59,17.59,0,0,1-2.47,1.68,7,7,0,0,1-2.05.64,9.74,9.74,0,0,1-1.23.12H50q-.06-.6-.09-1.17a14.88,14.88,0,0,1,0-2l.51.21a7.34,7.34,0,0,0,2.14.42,11.87,11.87,0,0,0,1.45,0l.82-.06.63-.07.55-.14Z"/>
+                <path class="cls-8" d="M56.29,1.68l0,.05s0,0,0,0Z"/>
+                <path class="cls-7"
+                      d="M56,96.53a5.24,5.24,0,0,1-.28,2.94A8.63,8.63,0,0,1,54,101.94a12,12,0,0,0-.9,1.1c-.53-.11-1.06-.23-1.57-.37a13.43,13.43,0,0,1-3.16-1.31c-.18-.09-.35-.19-.52-.29l.68-.25a10.08,10.08,0,0,0,2.88-1.66,3.85,3.85,0,0,0,1-1.49,4.18,4.18,0,0,0,.25-1.53,3.81,3.81,0,0,0-.22-1.39l.43.13,1.59.46.9.26A1.69,1.69,0,0,1,56,96.53Z"/>
+                <path class="cls-3"
+                      d="M55.61,70.91c0,.08-.08.18-.13.3a13.28,13.28,0,0,1-.83,1.59,24.19,24.19,0,0,1-1.51,2.14c-.6.78-1.23,1.57-1.94,2.33-.89,1-1.81,2-2.56,2.9a5.43,5.43,0,0,1-.79.09A7.9,7.9,0,0,1,45.54,80a3.24,3.24,0,0,1-1.08-.5,2.52,2.52,0,0,1-.68-.76,2.58,2.58,0,0,1-.34-1c.59-.73,1.17-1.41,1.72-2a3,3,0,0,0,.88.8,2.43,2.43,0,0,0,1.19.35c.36,0,.59-.17.54-.26s-.2-.1-.43-.24a3.75,3.75,0,0,1-.74-.58,2.57,2.57,0,0,1-.44-.75l-.09-.31.23-.24c.29-.31.57-.6.85-.86a3.46,3.46,0,0,0,.85.86c.89.61,1.9.71,1.94.55s-.79-.61-1.33-1.25a2.72,2.72,0,0,1-.53-.93l0-.1.72-.68.42-.4a1.7,1.7,0,0,0,.62.75,1.87,1.87,0,0,0,.39.23l.38.17a4.64,4.64,0,0,0,.69.23c.42.1.73.06.74,0s-.22-.2-.54-.43c-.16-.11-.34-.25-.52-.4l-.3-.23a3,3,0,0,1-.25-.24.75.75,0,0,1-.13-.82,2,2,0,0,1,.16-.3l0-.07h0a.05.05,0,0,1,0,0l.65-.61,0,0v0l0,.12a1.73,1.73,0,0,0,.29.31,4.06,4.06,0,0,0,.57.35c.43.22,1,.29,1,.1s-.19-.47-.4-.81l-.28-.46a.48.48,0,0,1,0-.13.66.66,0,0,1-.24-.45s0-.08,0-.12a2.77,2.77,0,0,0,.31-.53l.19.21a17.72,17.72,0,0,0,2,1.68C54.88,70.45,55.24,70.69,55.61,70.91Z"/>
+                <path class="cls-7"
+                      d="M55.33,50.73s.15,0,.05,0l-.29,0-.55.08-.51,0-.6,0a4.77,4.77,0,0,1-1.8-.19,3,3,0,0,1-.72-.4c.08-.22.17-.42.25-.62.41-.88.85-1.72,1.17-2.38l.08-.18s0,0,0,0c.22.44.46,1,.85,1.69a4.45,4.45,0,0,0,.81,1,3.11,3.11,0,0,0,.28.23l.21.16a3.66,3.66,0,0,0,.52.28l.09,0Z"/>
+                <path class="cls-3"
+                      d="M54.48,67.85a1.35,1.35,0,0,1-.2.91l0,0c-.23-.2-.46-.4-.67-.61a.71.71,0,0,0,.27-.33C54,67.86,54.31,67.86,54.48,67.85Z"/>
+                <path class="cls-8" d="M52.43,94.75h-.06s0-.06,0-.06S52.4,94.71,52.43,94.75Z"/>
+                <path class="cls-3"
+                      d="M52.37,94.74a9.38,9.38,0,0,1,0,1.39,3.65,3.65,0,0,1-1.34,2.67,9.58,9.58,0,0,1-2.79,1.45c-.41.15-.76.26-1,.33l-.16,0h0l-.22-.15-.35-.24c-.18-.13-.42-.3-.62-.47-.43-.33-.9-.78-1.34-1.17,0,.53,0,1,0,1.56l-.8-1.7-.4-.84-.56.74-.6.77-.08.1s0,.06,0,0v-.06l-.06-.3L41.62,97c-.06-.31-.13-.61-.2-.92l-.1-.47a3,3,0,0,0-.16-.56c-.08-.17-.27-.8-.48-1.5.22,0,.49.08.78.11a6.4,6.4,0,0,0,1.57,0,5.69,5.69,0,0,0,1.68-.54A3,3,0,0,0,46,92.25a3.87,3.87,0,0,0,.58-.93c.08-.24.16-.46.23-.66.14-.39.25-.72.32-1,.17.33.29.52.29.54s.22.33.53.77a18.44,18.44,0,0,0,1.22,1.54,7.72,7.72,0,0,0,1.46,1.31,2.27,2.27,0,0,0,.79.37l.19.23h0a1.22,1.22,0,0,0,.32.12Z"/>
+                <path class="cls-9" d="M51.65,65.2a0,0,0,0,0,0,0h0S51.64,65.21,51.65,65.2Z"/>
+                <path class="cls-9" d="M49.92,2.18h0Z"/>
+                <path class="cls-8" d="M49.82,59.63l0,0h0Z"/>
+                <path class="cls-8" d="M49.79,59.65v0l0,0h0Z"/>
+                <path class="cls-8" d="M49.78,59.66h0l-.12,0Z"/>
+                <path class="cls-3"
+                      d="M49.62,50.31a15.8,15.8,0,0,0-.54,1.93h0l-1,.65-.27.18c-.18.13-.42.25-.48.45a1,1,0,0,0,.06.68c.06.14.08.17.12.25l.12.2a8.57,8.57,0,0,0,.52.76l.29.39.16.19.07.08h0a.88.88,0,0,0,0,.16c0,.22,0,.46,0,.7,0,.63.1,1.27.19,1.91h0a.47.47,0,0,0-.12-.23,1.81,1.81,0,0,0-.24-.24h0a.09.09,0,0,0,0-.06.19.19,0,0,0,0-.09,1.13,1.13,0,0,0,0-.18c0-.12,0-.26,0-.41a4.3,4.3,0,0,0-.1-1,3.19,3.19,0,0,0-.53-1.12c-.51-.68-1.18-1.14-1.43-1.53a2.61,2.61,0,0,1-.27-.52,1.23,1.23,0,0,1-.06-.21s0,0,0-.06l.07-.08.11-.11.25-.24.6-.56c.45-.39.94-.8,1.42-1.18C49,50.76,49.35,50.51,49.62,50.31Z"/>
+                <path class="cls-8" d="M49.14,60l.14,0-.14.08h0Z"/>
+                <path class="cls-8" d="M49.14,60v0a.08.08,0,0,1,0,.07c0-.11,0-.21,0-.31a.45.45,0,0,0,0,.17h0Z"/>
+                <path class="cls-3"
+                      d="M49.09,59.8c0,.1,0,.2,0,.31v0c0,.12-.38.24-.71.24a7.76,7.76,0,0,1-1.08,0,4.52,4.52,0,0,1-1-.2,1.07,1.07,0,0,1-.64-.48.59.59,0,0,1,0-.35,4.29,4.29,0,0,1,.13-.44,8.29,8.29,0,0,1,.32-.82,1.08,1.08,0,0,1,.21-.29l.26-.25.18-.19c.06-.05.15-.13.22-.08s.08.27.15.39.11.27.07.34l-.1.11,0,0a1.08,1.08,0,0,0-.54.38.41.41,0,0,0,0,.34.62.62,0,0,0,.12.2,1,1,0,0,0,.13.14s.11,0,.15-.09.08-.15.06-.17l-.1-.08c0-.07-.1-.14-.07-.21s.2-.17.38-.26a1.52,1.52,0,0,1,.57-.18.85.85,0,0,1,.54.19c.16.12.32.23.44.33s.08.47.12.47a.35.35,0,0,0,.07-.14.35.35,0,0,0,0-.18h0q.06.47.15.93S49.08,59.79,49.09,59.8Z"/>
+                <path class="cls-8"
+                      d="M49,59.21l.07.58q-.09-.47-.15-.93c-.09-.64-.15-1.28-.19-1.91,0-.24,0-.48,0-.7.05.58.11,1.2.17,1.84Z"/>
+                <path class="cls-8" d="M48.49,58.26s0,0,0,0l-.07-.06h0v0l.05,0s0,0,0,0Z"/>
+                <path class="cls-8" d="M48.47,58.29h0v0s0,0,0,0l0,0v0h0Z"/>
+                <path class="cls-7"
+                      d="M47.86,80.44a5.51,5.51,0,0,0,.69-.14,9.44,9.44,0,0,0-1,1.5,7.28,7.28,0,0,0-.36.76c-.2,0-.52.13-.91.2a6.19,6.19,0,0,1-2.55,0,3.4,3.4,0,0,1-2.05-1.35,2.85,2.85,0,0,1-.37-.66q.21-.39.45-.75c.41-.63.86-1.22,1.3-1.79a3.21,3.21,0,0,0,.34.72,2.69,2.69,0,0,0,.83.86,3.52,3.52,0,0,0,1.23.51A7.09,7.09,0,0,0,47.86,80.44Z"/>
+                <path class="cls-7"
+                      d="M46.92,89.4l.1.19c-.11.24-.25.57-.43,1-.09.2-.17.42-.27.65a2.74,2.74,0,0,1-.39.64,3.62,3.62,0,0,1-1.36.93,5.93,5.93,0,0,1-1.6.46,5.82,5.82,0,0,1-1.46,0,8.75,8.75,0,0,1-1-.17c-.25-.82-.49-1.62-.57-1.81l-.13-.34h0a11.84,11.84,0,0,1-.41-2.9c0-.27,0-.55,0-.83a2.08,2.08,0,0,0,.41.35,4.1,4.1,0,0,0,2.8.74,14.86,14.86,0,0,0,2.79-.51,3.91,3.91,0,0,0,1-.4.28.28,0,0,0,0,.09A6.53,6.53,0,0,0,46.92,89.4Z"/>
+                <path class="cls-3"
+                      d="M46.77,84.35v.3a5.07,5.07,0,0,0-.37,2.64,1.56,1.56,0,0,0-.15.06c-.21.07-.51.15-.88.24a20.91,20.91,0,0,1-2.75.35,3.89,3.89,0,0,1-2.53-.76,3.19,3.19,0,0,1-.64-.65,5,5,0,0,1,.16-1,27.15,27.15,0,0,1,.87-3c.18-.43.37-.84.58-1.24a2.41,2.41,0,0,0,.28.43,3.68,3.68,0,0,0,2.33,1.42,6.18,6.18,0,0,0,2.67-.18,6.1,6.1,0,0,0,.81-.28A3.61,3.61,0,0,0,46.77,84.35Z"/>
+                <rect class="cls-9" x="46.74" y="72.88" width="0.01" height="0.01"/>
+                <path class="cls-9" d="M45.82,6.58h0c-.19.17-.37.36-.56.54C45.44,6.94,45.62,6.75,45.82,6.58Z"/>
+                <path class="cls-9" d="M41.07,80.26h0l-.13.28.13-.28Z"/>
+                <path class="cls-9" d="M40.93,80.57c0,.08-.06.16-.1.25h0Z"/>
+                <circle class="cls-3" cx="74.66" cy="26.13" r="0.81"/>
+                <circle class="cls-3" cx="62.2" cy="27.25" r="0.91"/>
+                <circle class="cls-3" cx="62.76" cy="28.68" r="0.18"/>
+                <circle class="cls-3" cx="73.86" cy="27.51" r="0.19"/>
+                <path class="cls-6"
+                      d="M70.82,83.14c-.06.09-.13.18-.18.27a.84.84,0,0,0-.26-.35,1.51,1.51,0,0,0-.48-.16c-.15,0-.25-.07-.25-.09s.1,0,.26,0a1.38,1.38,0,0,1,.6.08A1.05,1.05,0,0,1,70.82,83.14Z"/>
+                <g class="cls-13">
+                    <path class="cls-14"
+                          d="M62,78.53c-.61,0-1.23-.08-1.85-.1-.18,4.39-4.9,5.19-6,9C59.4,89.88,62.24,83.56,62,78.53Z"/>
+                </g>
+                <path class="cls-15" d="M64.57,78.76l-.2,0,.09.42C64.5,79,64.54,78.89,64.57,78.76Z"/>
+                <g class="cls-13">
+                    <path class="cls-14"
+                          d="M64.7,84.59c1.51.89,3.08.4,5.35-.19C67.22,83,65.16,82,64.46,79.16,63.88,81.24,63.73,83.12,64.7,84.59Z"/>
+                </g>
+                <path class="cls-16"
+                      d="M70.3,93.27A35.84,35.84,0,0,1,64,95.46a3,3,0,0,1,.66.44,5.22,5.22,0,0,1,.63.68A36.81,36.81,0,0,0,77.4,89.76C74.92,91,72.56,92.27,70.3,93.27Z"/>
+                <path class="cls-7"
+                      d="M81.74,95.5a17.57,17.57,0,0,1,5.85-2.33c-1.17,0-2.34-.59-1.76-1.76a17.83,17.83,0,0,1,4.27-3L89.83,88a5.17,5.17,0,0,0-.42-.51,4.33,4.33,0,0,0-1-.81A4.17,4.17,0,0,0,86,86.22a8.86,8.86,0,0,0-2.52.62c-.8.31-1.58.72-2.37,1.09s-1.53.76-2.29,1.13l-1.37.7a36.81,36.81,0,0,1-12.16,6.82,3.29,3.29,0,0,1,.43.68,3.85,3.85,0,0,1,.25,2,5.19,5.19,0,0,1-.46,1.93c-.24.58-.51,1.1-.73,1.55s-.37.7-.5,1l1.45-.19c.87-.13,1.73-.29,2.59-.47,4.9-2.2,9.71-4.79,14.64-6.35C81.74,96.67,81.15,96.09,81.74,95.5Z"/>
+                <path class="cls-17"
+                      d="M90.12,88.42a17.83,17.83,0,0,0-4.27,3c-.58,1.17.58,1.76,1.75,1.76a17.39,17.39,0,0,0-5.84,2.33c-.59.59,0,1.17,1.17,1.17C78,98.22,73.19,100.81,68.29,103l1-.21a18.09,18.09,0,0,0,3.4-1.13h0l3.17-1.25c1.09-.21,2-.36,3-.58a14.28,14.28,0,0,0,1.42-.4L81,99.2l.69-.28a15.82,15.82,0,0,0,4.84-3.18A12.22,12.22,0,0,0,89.58,91,10.61,10.61,0,0,0,90,89.71c.06-.22.08-.45.12-.68l0-.34a1,1,0,0,0,0-.21Z"/>
+                <path class="cls-17"
+                      d="M67.64,103.22l.62-.28c1.39-.63,2.81-1.3,4.17-1.94a88.63,88.63,0,0,1,10.1-4.29,1.23,1.23,0,0,1-1-.56.66.66,0,0,1,.22-.71,16.8,16.8,0,0,1,5.43-2.24,1.92,1.92,0,0,1-1.38-.72,1.13,1.13,0,0,1,0-1.11l0,0a18.14,18.14,0,0,1,4.29-3l.06,0,.09.15s0,.08,0,.11a1,1,0,0,0,0,.12l0,.34a2,2,0,0,0,0,.24,3.54,3.54,0,0,1-.08.45l-.1.37a6.74,6.74,0,0,1-.29,1,12.26,12.26,0,0,1-3.09,4.72A15.7,15.7,0,0,1,81.7,99l-.69.28-.7.24c-.33.12-.69.21-1,.3l-.39.1c-.69.16-1.36.28-2.07.4l-.95.18-.83.33-2.32.92h0a17.78,17.78,0,0,1-3.42,1.14l-.7.15ZM85.91,91.44a1,1,0,0,0,0,1,2,2,0,0,0,1.71.67h.6l-.58.15a17.44,17.44,0,0,0-5.82,2.32.52.52,0,0,0-.17.54c.13.3.63.5,1.3.5h.47l-.45.14a84.44,84.44,0,0,0-10.46,4.4c-1.17.55-2.37,1.12-3.57,1.67l.33-.07a17.86,17.86,0,0,0,3.38-1.13l0,0h0l2.31-.91.84-.33,1-.18c.7-.13,1.37-.25,2-.4l.39-.1c.34-.09.69-.18,1-.3l.7-.23.68-.28a15.79,15.79,0,0,0,4.82-3.16A12.17,12.17,0,0,0,89.51,91a6.89,6.89,0,0,0,.29-1c0-.13.06-.26.1-.38a3,3,0,0,0,.08-.43L90,89l.06-.34c0-.06,0-.09,0-.12a.08.08,0,0,0,0,0A18.18,18.18,0,0,0,85.91,91.44Z"/>
+                <path class="cls-18"
+                      d="M40.06,11.88s.15-.19.38-.43a9,9,0,0,1,.82-.75c-.08,0-.12,0-.13,0a1.43,1.43,0,0,0-.1-.16,1.31,1.31,0,0,0-.4-.32A3.36,3.36,0,0,0,38.72,10l-.47,0a7.66,7.66,0,0,1,1.18,3,6.75,6.75,0,0,1,.33-.66Z"/>
+                <path class="cls-3" d="M70.37,46.87a2.7,2.7,0,0,1-.53.46l.21,0,.14,0c.07-.19.14-.38.22-.57Z"/>
+                <path class="cls-3" d="M82.08,32.15a1.16,1.16,0,0,1-.06.15l.23.05Z"/>
+                <path class="cls-19"
+                      d="M71.44,47.34a3.37,3.37,0,0,0,1.28-.58,4.89,4.89,0,0,1,.52-.42v-.06a3,3,0,0,1-1,.07c-.43-.05-.7-.15-.7-.2s.3,0,.7,0a2.76,2.76,0,0,0,1.36-.44,7.27,7.27,0,0,0,1.09-1c.27-.31.41-.54.43-.55s.07-.1.18-.27c-.5.07-.93.16-.95.09s.54-.4,1.18-.58h0a3.1,3.1,0,0,0,.15-.46c-.23.06-.36.09-.37.06s.14-.14.41-.28a2.18,2.18,0,0,0,0-.51c0-.12,0-.25,0-.37-.65.16-1.15.31-1.17.23a4,4,0,0,1,1.12-.58c0-.29-.1-.55-.16-.77a1.23,1.23,0,0,0-.17-.42c-.07-.08-.14-.1-.14-.13s.08-.05.22,0a1.1,1.1,0,0,1,.33.45h0a12.63,12.63,0,0,1,1.39-.88,7.12,7.12,0,0,0,1.32-1,8.35,8.35,0,0,0,1.16-1.48c.71-1.09,1.26-2.25,1.78-3.18A5.54,5.54,0,0,1,82.22,33l.31-.27h0s0,0-.08-.11l-.21-.26L82,32.3l0,.09A15.16,15.16,0,0,1,79.46,35c-.75.66-1.64,1.4-2.62,2.17-.49.39-1,.78-1.53,1.17l-.42.29a2.76,2.76,0,0,1-.3.15,1.42,1.42,0,0,1-.32.07.6.6,0,0,1-.68-.32l-.15-.28-.12-.23A15.86,15.86,0,0,1,72,30.71c.05-2,.2-3.43.21-3.51a32.86,32.86,0,0,1,.55-3.49c.1-.49.23-1,.4-1.58C70.34,28.44,70.66,35.59,72.5,42A4,4,0,0,1,73,42a1.34,1.34,0,0,1,.56.22,1.73,1.73,0,0,1,.41.4,1.19,1.19,0,0,1,.24.55.69.69,0,0,1-.22.62c-.32.22-.44.26-.54.74a.57.57,0,0,1-.23.3.51.51,0,0,1-.16.09s-.09,0-.12,0v0L73,45A0,0,0,0,1,73,45h0s0,0,0,0-.21.24-.42.45a.76.76,0,0,1-.55.18.47.47,0,0,1-.24-.08h0a3.42,3.42,0,0,1-.69.28h0c0,.1-.18.13-.22.23.1-.12.06-.07.09,0a1.07,1.07,0,0,1-.1.24,2,2,0,0,1-.33.47c-.09.19-.46.4-.61.58A4.65,4.65,0,0,0,71.44,47.34Zm3-4.56s.08,0,.14.08.06-.07.21-.14.09,0,.12,0a.17.17,0,0,1,0,.12.77.77,0,0,1,0,.38c-.06.14-.15.22-.27.2a.33.33,0,0,1-.23-.23A.37.37,0,0,1,74.45,42.78Zm-.29-1a.48.48,0,0,1-.4.09.19.19,0,0,1-.13-.24.56.56,0,0,1,.13-.24l.06-.08s.08,0,.14.1.08-.07.25-.12a.13.13,0,0,1,.13,0,.17.17,0,0,1,0,.12A.5.5,0,0,1,74.16,41.76Z"/>
+                <path class="cls-3"
+                      d="M74,2.39l-.38.2a6.43,6.43,0,0,0-.73.48,3.69,3.69,0,0,0-.72.78,8.45,8.45,0,0,0-.67,1.2,15.41,15.41,0,0,0-.75,2l-.15.49s0,0,0,0l0-.13,0-.25-.06-.49c-.05-.32-.09-.64-.13-.94a5.8,5.8,0,0,0-.21-.89c-.07-.19-.16-.38-.24-.55a6.8,6.8,0,0,0-1-1.53l-.28-.29-.19,0c-1,1.2-2.84,1.58-3.51,2.75q0,1,0,2.28v0l-.29,0v0c0-.07,0-.24-.08-.43a8.67,8.67,0,0,0-2.17-4.3l-.17-.15-.57,0-.9-.08-.14,0a5.47,5.47,0,0,0-1.92,3.28q.13.44.27.9a1.11,1.11,0,0,0,0,.3,2.46,2.46,0,0,0,0,.26c0,.08.07.27,0,.11a2.52,2.52,0,0,0-.74-.52l-.25-.23c-.2-.17-.39-.32-.58-.46l-.45-.34c-.3-.22-.59-.41-.86-.6a10.61,10.61,0,0,0-1.59-.91,11.74,11.74,0,0,0-2.58-.83l-.54-.1-.51.22c-.52.23-1,.48-1.49.74A20.75,20.75,0,0,0,46.73,6l-.24.18a.9.9,0,0,0-.21.08,3.63,3.63,0,0,0-.46.34h0c-.19.17-.37.36-.56.54s-.11.12-.17.19a3.83,3.83,0,0,1-.28.29l-.22.23-1-.26c-.81-.2-2-.48-3.32-.72a13.41,13.41,0,0,0-2.07-.24c-.74,0-1.59.1-2.45.2s-1.75.24-2.64.4l-.66.13-.54.13h-.06c1.47,3.3,2.26,6.86,6,7.93a7.55,7.55,0,0,0-1.07,3.35c.74.92,1.17,1.5,1.08,1.59s-.47-.23-1.14-.8v.07a8.06,8.06,0,0,1,0,1.47v0c-.33,3-1.87,6.18,2.33,6.6-.58,1.17-2.33,1.76-2.33,2.92.58,1.17,2.33,1.17,4.09,1.17a15.68,15.68,0,0,1-3.51,2.93c2,.85,3.44,2.55,4.94,4.13l.59.38c.51.31,1.1.64,1.75,1,1.3.7,2.84,1.47,4.49,2.27l1.73.82h0c.88-.31,1.74-.56,2.44-.75a13.73,13.73,0,0,1,1.39-.29,11.45,11.45,0,0,1,1.4-.14,18.9,18.9,0,0,1,3,.06,19.94,19.94,0,0,1,2.27.37l.38-1.42c-.33-.08-.66-.18-1-.29-1.63-.53-3.47-1.3-5.42-2.14-.49-.22-1-.43-1.49-.67L53,37.65l-.74-.43a25.94,25.94,0,0,1-2.8-2,47.56,47.56,0,0,1-4.91-4.66L44,30l-.28-.33-.47-.54c0-.05-.11-.09-.08-.14l.1-.15.2-.29.32-.47.42-.61A24.7,24.7,0,0,1,46,25.19a25.2,25.2,0,0,1,3.12-3,16.69,16.69,0,0,1,1.49-1.06c.07,0,.51-.31,1.3-.65a17.8,17.8,0,0,1,3.33-1A27.83,27.83,0,0,1,60.05,19a9.26,9.26,0,0,1,5.51,2l0,0h0a8.88,8.88,0,0,1,2.61,3,11.8,11.8,0,0,1,1.16,3.75,31.65,31.65,0,0,1,.28,3.67,14.28,14.28,0,0,1-.16,3.36,12.55,12.55,0,0,1-2,4.7c-.7,1-1.25,1.52-1.3,1.47s-.48.39-1.49.47l1.6.64h0a.41.41,0,0,1,.24.1.85.85,0,0,1,.25.37.2.2,0,0,1-.08.24.37.37,0,0,1-.23.05l-.32,0-.29,0-.46.79c.07,0,.11,0,.11,0s-1.5.47-3,1l-.69.23,1.07.94,0,0a9.59,9.59,0,0,1,1.34-.61c.44-.12.74-.09.75,0s-.29.11-.66.29-.68.41-1.08.68c.44.38.87.76,1.21,1a2.87,2.87,0,0,0,.58.27l.26.08a4.51,4.51,0,0,0,.92.2,7.36,7.36,0,0,0,2-.12,3.92,3.92,0,0,0,1.83-.81,4.46,4.46,0,0,0,.49-.49l.12-.31a1.55,1.55,0,0,1-.71,0,.68.68,0,0,1-.31-.18,1.8,1.8,0,0,1-.81.09,1,1,0,0,1-.72-.56,2,2,0,0,1-.19-.79,2,2,0,0,1,.49-1.33,2.37,2.37,0,0,1,.79-.63l.36-.18a4.5,4.5,0,0,1,.69-.2,3,3,0,0,1,.37,0,.83.83,0,0,1,.29,0l.13,0h.11l.17,0,.2-.07.11,0,.16,0a5.15,5.15,0,0,1,.56,0c-1.84-6.36-2.16-13.51.65-19.82,0,0,0,0,0,0A5.41,5.41,0,0,1,73.61,21a7.63,7.63,0,0,0-1.81,4.35A7.63,7.63,0,0,1,73.61,21a5.47,5.47,0,0,1,.41-.65,6.4,6.4,0,0,1,1.47-1.42,5.29,5.29,0,0,1,1.25-.65,8.66,8.66,0,0,0,2.66-2.87C82.67,9.69,78.8,5.69,74,2.39ZM41.63,11a9.63,9.63,0,0,0-.73.85c-.19.24-.3.42-.31.42l-.32.42a6.13,6.13,0,0,0-.58.94,5,5,0,0,0-.23.55,4.8,4.8,0,0,1-2.15,3.57v0a4.8,4.8,0,0,0,2.15-3.57,8.84,8.84,0,0,1-.31,1s-.1-.21-.09-.54a3.59,3.59,0,0,1,.2-1.17c.05-.15.11-.3.17-.44a7.66,7.66,0,0,0-1.18-3,6.88,6.88,0,0,1-2.89-.29c0-.17,1-.32,2.28-.54a9.4,9.4,0,0,0-2.08-1.91,9.4,9.4,0,0,1,2.08,1.91l1-.19a4.34,4.34,0,0,1,2.6.08,2.51,2.51,0,0,1,1.15.93h0c.25-.12.43-.19.45-.15S42.2,10.4,41.63,11ZM66.25,46.1a.62.62,0,0,1-.68-.08.58.58,0,0,1-.07-.61,1.86,1.86,0,0,1,.3-.45s.09,0,.15.06.22-.05.48.13a.58.58,0,0,1,.25.49A.61.61,0,0,1,66.25,46.1Z"/>
+                <path class="cls-3"
+                      d="M68.35,2.52c-.37.07-.75.15-1.13.21a2.92,2.92,0,0,1-.44.06l-.45,0h-.76l-.58,0c-.06.59-.12,1.4-.15,2.46C65.51,4.1,67.39,3.72,68.35,2.52Z"/>
+                <path class="cls-3"
+                      d="M60.48,2.57c-.51,0-1.2-.09-2-.11l-1,0c.12.33.24.71.37,1.13.2.66.42,1.41.68,2.28A5.47,5.47,0,0,1,60.48,2.57Z"/>
+                <path class="cls-19"
+                      d="M37.31,34.71a15.68,15.68,0,0,0,3.51-2.93c-1.76,0-3.51,0-4.09-1.17,0-1.16,1.75-1.75,2.33-2.92-4.93-.49-2-4.73-2.31-8.14l-.41-.36a10,10,0,0,1,0,2.16,15.55,15.55,0,0,1-.63,2.93A11.13,11.13,0,0,1,35,26a5.62,5.62,0,0,1-.51.83c-.09.13-.19.27-.3.4l-.16.2-.15.16a.24.24,0,0,0,0,.36.15.15,0,0,0,.09.06L34,28l.45.17,1.38.52.38.15.19.07.09,0,0,0,0,0-.67.45-2,1.39-.42.28-.14.1-.2.15.32.07,1,.27,3.61,1-1.61.89-.76.44-.28.17-.08,0h0s-.06,0-.05.07l.12.07L37.87,36c1.45.9,2.36,1.5,2.44,1.54s.49.35,1.24.86l.7.49C40.75,37.26,39.31,35.56,37.31,34.71Z"/>
+                <path class="cls-19"
+                      d="M85.19,10.64a4.89,4.89,0,0,1,.22.59c.12.34.17.59.18.6a6.26,6.26,0,0,1,0,.64,6.33,6.33,0,0,1-.18,1.31,5.29,5.29,0,0,1-.56,1.76,9.48,9.48,0,0,1,.1-1.82,7.64,7.64,0,0,0,0-1.22,4.42,4.42,0,0,0-.1-.54s0-.24-.11-.57-.2-.76-.35-1.19c-.23-.71-.51-1.4-.56-1.64C83.55,8,83.09,7.51,82.68,7a.92.92,0,0,0-.07.13l-.5-.72h.11a4.11,4.11,0,0,1-.48-.93,4.11,4.11,0,0,0,.48.93l.33-.08a11.1,11.1,0,0,0,1.32-.49,5.33,5.33,0,0,1,1.27-.38h0l.28-.12c.25-.11.49-.13.5-.07a3.52,3.52,0,0,1,.09.85,4.77,4.77,0,0,1-.32,1.66,13.38,13.38,0,0,1-.94,1.93c0,.1.1.21.16.31s.19.42.27.62c1-.39.84-1.94,1.54-2.62,0-.48,0-.77,0-.8a11.5,11.5,0,0,0,0-1.16c-.05-.63-.18-1.59-.84-1.91a2.89,2.89,0,0,0-1.36-.23,15.37,15.37,0,0,0-1.63.14c-.54.07-1.08.11-1.58.16h-.48l-.46,0c.17.27.3.49.39.65s.22.4.19.43-.17-.08-.38-.27S80,4.6,79.66,4.2c-.3-.08-.72-.23-1.23-.42S77,3.21,76.17,2.92A16.23,16.23,0,0,0,74,2.38h0c4.83,3.3,8.7,7.3,5.43,13a8.66,8.66,0,0,1-2.66,2.87,3.43,3.43,0,0,1,.75-.17,6.82,6.82,0,0,1,3.92.93,7.31,7.31,0,0,1,1.39,1.22,5,5,0,0,1,1,1.34A7.16,7.16,0,0,1,84.2,23c0,.41,0,.75,0,1,0,.11,0,.21,0,.3.09-.43.16-.85.2-1.19s.07-.63.08-.64,0-.27.07-.65.08-.88.1-1.38c0-.76,0-1.53,0-1.84,0,0-.07.05-.09,0a7.62,7.62,0,0,1,.54-1.75,29.25,29.25,0,0,0,1-3.84,25.11,25.11,0,0,0,.48-3.95c0-.42,0-.78,0-1.07C86,8.7,86.19,10.25,85.19,10.64Z"/>
+                <path class="cls-18"
+                      d="M83.92,8.46c.07,0,.38.4.7,1,.06-.43.24-1.16.41-1.87a4.49,4.49,0,0,0,.09-1.42l0-.22A1.71,1.71,0,0,0,84,6.05a2.85,2.85,0,0,0-1.1.74,1.91,1.91,0,0,0-.17.22c.41.5.87,1,1.24,1.55A.16.16,0,0,1,83.92,8.46Z"/>
+                <path class="cls-9" d="M85.26,6.06v0l-.06,0h0v0Z"/>
+                <path class="cls-3"
+                      d="M85.71,27.38c-.28.29-.62.65-1,1.06s-.49.56-.76.85l-.4.46-.66.76-.28-.09c.29-1,.59-2.12.81-2.93C83.53,27.52,85,27.45,85.71,27.38Z"/>
+                <path class="cls-9" d="M84.79,18.53l-.05,0a.79.79,0,0,1,0-.14S84.78,18.47,84.79,18.53Z"/>
+                <path class="cls-3"
+                      d="M84.25,31.42l-.15,0h0l-.28.08-1.11.31-.51.14c.13-.37.29-.94.47-1.56l.28.09,1.2.78Z"/>
+                <path class="cls-8" d="M74,22.34l0,.09h0c.09-.3.19-.59.3-.88A4.89,4.89,0,0,0,74,22.34Z"/>
+                <path class="cls-20"
+                      d="M79.22,18.87a6.68,6.68,0,0,0-1.67-.06,3.61,3.61,0,0,0-1.61.73,5.45,5.45,0,0,0-1.25,1.29,4.81,4.81,0,0,0-.42.72c-.11.29-.21.58-.3.88l.32-.2A3.78,3.78,0,0,1,76,21.8,7.14,7.14,0,0,1,79.22,18.87Z"/>
+                <path class="cls-8"
+                      d="M84.15,24.71c0-.16-.07-.39-.11-.7s-.08-.63-.13-1a10.2,10.2,0,0,0-.47-1.21,4.69,4.69,0,0,0-1-1.17,6.62,6.62,0,0,0-1.33-1.08,5.54,5.54,0,0,0-1.91-.65A7.14,7.14,0,0,0,76,21.8a6.12,6.12,0,0,1,.74,0,4.52,4.52,0,0,1,1.65.42,4.19,4.19,0,0,1,1.46,1.21A11.8,11.8,0,0,1,81,25.1a4.53,4.53,0,0,1,.64,2,7.18,7.18,0,0,1-.15,2.11l1.35.11c.23-.59.44-1.28.6-1.85a0,0,0,0,0,0,0,.42.42,0,0,1,0-.06s0,0,0,0a1.8,1.8,0,0,0,0-.19,1.21,1.21,0,0,0,0-.18c0-.1,0-.2.08-.28s0-.07,0-.1a.39.39,0,0,0,0-.13.3.3,0,0,0,0-.11h0v0A14.12,14.12,0,0,1,84.15,24.71Z"/>
+                <path class="cls-20"
+                      d="M74.12,32.52a3.86,3.86,0,0,1-1.09,0,.54.54,0,0,1-.17-.07A14.36,14.36,0,0,0,73,34.1a13.5,13.5,0,0,0,1,3.66l.1.22.08.16c0,.07.07.08.12.07l.15,0,.14-.07.41-.26c.53-.35,1.05-.73,1.55-1.09l.52-.38a14.39,14.39,0,0,1-2.43-3.91Z"/>
+                <path class="cls-8"
+                      d="M81.47,29.23c0,.08,0,.18-.08.27l-.09.16a1.25,1.25,0,0,1-.09.12,4.54,4.54,0,0,1-.38.38,6.71,6.71,0,0,1-.84.59,14,14,0,0,1-3.33,1.35,13.35,13.35,0,0,1-2.06.37A14.39,14.39,0,0,0,77,36.38c.8-.59,1.54-1.15,2.19-1.65s1.42-1.12,1.86-1.48c0,0,.21-.28.56-.71s.46-1.5,1-2.71c.06-.15.13-.32.19-.49Z"/>
+                <path class="cls-10"
+                      d="M79.3,23.34a3.92,3.92,0,0,0-1-.83,4.3,4.3,0,0,0-1.53-.45h-.5c1.59.5,3,2.87,2.93,5a5.92,5.92,0,0,1-1.7,4.14,12.06,12.06,0,0,0,2.08-.86C80.62,28.42,80,25.69,79.3,23.34Z"/>
+                <path class="cls-3"
+                      d="M81.16,27.14a6.79,6.79,0,0,0-1.6-3.48,4,4,0,0,0-.26-.32c.73,2.35,1.32,5.08.23,7l.18-.1a5.84,5.84,0,0,0,.77-.53,2.46,2.46,0,0,0,.33-.31l.07-.08s0,0,0-.06a.65.65,0,0,0,.07-.21A7,7,0,0,0,81.16,27.14Z"/>
+                <path class="cls-10" d="M73.89,22.72l.1,0a.36.36,0,0,0-.11.1S73.89,22.74,73.89,22.72Z"/>
+                <path class="cls-3"
+                      d="M74,31.89a3.21,3.21,0,0,1-.81-.06.4.4,0,0,0-.29.05c0-.39,0-.77,0-1.13a3.25,3.25,0,0,1,0-.33A2.34,2.34,0,0,0,74,31.89Z"/>
+                <path class="cls-3"
+                      d="M73.71,60.12a2.19,2.19,0,0,0-.38-.63.61.61,0,0,0-.36-.23.21.21,0,0,1,0-.13h0c0,.14,0,.3,0,.48s0,.43,0,.67A1.75,1.75,0,0,0,73.71,60.12Z"/>
+                <path class="cls-19"
+                      d="M72.89,60.28c0,.11,0,.21,0,.33a4.88,4.88,0,0,1-.08.61.86.86,0,0,0,.34-.09,2.23,2.23,0,0,0,.42-.3c.14-.12.28-.25.26-.41a1.71,1.71,0,0,0-.09-.3A1.75,1.75,0,0,1,72.89,60.28Z"/>
+                <path class="cls-21"
+                      d="M70.08,44.3a.28.28,0,0,1,.13,0,1.32,1.32,0,0,1,.57,0,.4.4,0,0,1,.29.21.42.42,0,0,1-.08.38,2,2,0,0,1-.13.18l-.12.12a2,2,0,0,1-.28.23l-.33.2.07,0a1.59,1.59,0,0,0,.76,0,3.33,3.33,0,0,0,.78-.22c.1,0,.17-.09.18-.13a.3.3,0,0,0,0-.09s.06,0,.09.08a.16.16,0,0,1,0,.14.58.58,0,0,0,.44-.13c.12-.07.27-.2.39-.27s.09-.06.14,0v0s0,0,0,0a.83.83,0,0,1,.06-.21.36.36,0,0,0,0-.11s0,0,0-.22c0,0,0,0,0,0h0l-.08,0-.14,0c-.08,0-.13,0-.13,0s0,0,.09-.1a.55.55,0,0,1,.38-.14c.1.09,0,.21,0,.31s.06,0,.09,0l.08-.08c-.15-.25,0-1.07-.46-.91a1.35,1.35,0,0,1-.53,0C71.49,43.38,70.27,43.13,70.08,44.3Z"/>
+                <path class="cls-12"
+                      d="M73.59,42.9a1.4,1.4,0,0,0-.32-.28,1.06,1.06,0,0,0-.38-.12,3.17,3.17,0,0,0-.87,0H72l-.11,0-.21.07-.23.08a1.53,1.53,0,0,1-.29,0l-.25-.05h-.06a1.17,1.17,0,0,0-.27.05,3.85,3.85,0,0,0-.58.19,2.5,2.5,0,0,0-.94.59,1.5,1.5,0,0,0-.4.95,1.46,1.46,0,0,0,.1.57.46.46,0,0,0,.35.31,1.69,1.69,0,0,0,1.19-.29,2.2,2.2,0,0,0,.25-.17l.11-.1.07-.06a.2.2,0,0,0,.06-.15c0-.06-.07-.08-.11-.1a1.29,1.29,0,0,0-.41,0,.47.47,0,0,0-.17,0,.81.81,0,0,0,0,.16.81.81,0,0,1,0-.16.35.35,0,0,0-.12.07.84.84,0,0,0-.12.19s-.07.07-.08.06,0,0,0-.08a.54.54,0,0,1,.08-.25.51.51,0,0,1,.25-.17c.22-1.32,1.67-.38,2.45-.83.7-.11.41.56.61.9h0a.38.38,0,0,0,.07-.21v0a.19.19,0,0,1,0-.08.42.42,0,0,1,0-.1.34.34,0,0,1,.07-.11,1.62,1.62,0,0,1,.18-.19l.18-.15C73.85,43.37,73.78,43.12,73.59,42.9Z"/>
+                <path class="cls-19"
+                      d="M73,54a2,2,0,0,1,0,.4c0,.31-.19.81-.25,1.28,0,.21-.06.42-.08.62-.15-.86-.4-1.9-.66-2.93l-.16-.6.11,0a1.84,1.84,0,0,1,.94.61.91.91,0,0,1,.11.44A.79.79,0,0,1,73,54Z"/>
+                <path class="cls-19"
+                      d="M68.24,53.11h-.09A3.49,3.49,0,0,1,67,52.8a3.18,3.18,0,0,1-.58-.35,2.3,2.3,0,0,1-.52-.6,1.84,1.84,0,0,1-.15-.35s0-.07,0-.08l.09,0,.16,0a4.7,4.7,0,0,1,.71-.14l.61-.1.51-.09a2.28,2.28,0,0,0,1.25-.69,1.92,1.92,0,0,0,.18-.29,1.16,1.16,0,0,0,.18-.51v0h0a.27.27,0,0,0-.08-.19c0-.16-.1-.28-.12-.33a6.28,6.28,0,0,1-.66.23,2.79,2.79,0,0,1-1.18,0,1.84,1.84,0,0,1-.47-.15,3.7,3.7,0,0,1-.44-.28,1,1,0,0,1-.19-.14v0a9.28,9.28,0,0,1-2,0,16.2,16.2,0,0,1-3.42-1l-.45.3c-.23.15-.5.36-.78.58C62.11,51.1,65.12,53.17,68.24,53.11Z"/>
+                <path class="cls-3"
+                      d="M67.12,65.69c.22-.36.44-.76.65-1.19a1,1,0,0,1-.33-.27.63.63,0,0,1-.18-.34c0-.12.1-.13.1-.12s0,0,.12,0a1.55,1.55,0,0,0,.32-.14c.13-.07.28-.15.46-.23A9.51,9.51,0,0,0,68.8,57a5.17,5.17,0,0,1-1.08-.43,5.33,5.33,0,0,1-.56-.32l-.29-.18-.43-.32a9.75,9.75,0,0,1-.74-.64l-.35-.32,0,0v0l0,0-.11-.14c.46.13.94.28,1.29.36s.69.13,1,.17l.28,0a4.65,4.65,0,0,0-.55-.53,4.65,4.65,0,0,1,.55.53l.77.07a3.82,3.82,0,0,0,1.73-.24,2.71,2.71,0,0,0,1-.68l.08-.1c-.06-.17-.12-.34-.19-.52l-.31-.84h0c-.21.06-.48.12-.85.19a6.85,6.85,0,0,1-1.62.12c-3.12.06-6.13-2-8.53-4.58l-.49.39a15.19,15.19,0,0,1-1.8,1.48h0l-1.7.25.17.07s.16.09.17.11.12,0,.15,0,.11,0,0,.06l-.48.09-.89.16-.81.14-.62.09a6.94,6.94,0,0,1-2,.08,4.78,4.78,0,0,1-.81-.2,15.28,15.28,0,0,0-.42,1.65c0,.28-.1.57-.13.86a3.29,3.29,0,0,0,.67.53,5.38,5.38,0,0,0,1.85.65,9.68,9.68,0,0,0,1.4.1l.82,0c.34,0,.76-.05,1.16-.09a7.67,7.67,0,0,0,.95-.07l0,0a6.55,6.55,0,0,0-.56.6c-.31.26-.48.47-.79.72l-.74.6c-.45.35-.87.65-1.28.91a10.72,10.72,0,0,1-2.1,1c-.56.19-1,.31-1.22.39l-.12,0c.1.72.22,1.46.38,2.2a23,23,0,0,0,.76,2.84s0,0,.05,0a1.48,1.48,0,0,0,.42.19.36.36,0,0,1,.18.11.48.48,0,0,1,.17.41.37.37,0,0,1-.27.31.24.24,0,0,1-.14,0q.12.32.27.63l.18.35a6.9,6.9,0,0,0,1.1,1.62l.14.13c.18-.12.21-.21.21-.24l-.06-.2.21,0h.83a.18.18,0,0,1,.19.11,1.6,1.6,0,0,1-.26,1.3h0l.61.47a11.74,11.74,0,0,0,2.54,1.47l.15,0C61.86,71.54,64.79,68.61,67.12,65.69Zm-4.29-2a.81.81,0,0,1,.52-.46,3.24,3.24,0,0,1,.67,0h.32s0,0,.15,0a.18.18,0,0,1,.06.23c0,.07-.06.06-.09.08a.11.11,0,0,1-.06,0l-.07,0a1.63,1.63,0,0,1-.62.28,2.44,2.44,0,0,1-.94.07S62.76,63.83,62.83,63.66Zm-1.09,2.78a1,1,0,0,1,.78-.31l.36,0a2.15,2.15,0,0,1,.52.13c.11,0,.24.15.23.28a.5.5,0,0,1-.1.19l-.09.1a3.25,3.25,0,0,1-.42.31,1.18,1.18,0,0,1-.77,0s.34-.08.68-.22c.09-.08.23-.21.33-.32a.5.5,0,0,0,.07-.08v0l0,0a2.92,2.92,0,0,0-.45-.08l-.35,0a.73.73,0,0,0-.59.17,2.13,2.13,0,0,0-.52.88A1.22,1.22,0,0,1,61.74,66.44Zm-2.61,2.71a.42.42,0,0,0,.18,0,1.49,1.49,0,0,0,.46-.07s0,0,0,0,0,0,0-.06a.86.86,0,0,0-.28-.11c-.09,0-.14,0-.16,0s.26-.19.57,0a.4.4,0,0,1,.22.2.26.26,0,0,1-.07.24.58.58,0,0,1-.25.12l-.19,0a1.16,1.16,0,0,1-.4,0l-.1,0s0,0,0,0,0,0,0,0,0,0,0,0a.23.23,0,0,0,0-.07S59.06,69.16,59.13,69.15ZM57.7,62.89a.59.59,0,0,1-.18.14l-.27.21a.83.83,0,0,1-.42.2.91.91,0,0,1-.43-.11l-.31-.15c-.19-.09-.3-.15-.29-.18a1.21,1.21,0,0,1,.33.06l.34.1a.67.67,0,0,0,.33.05c.19,0,.37-.29.54-.42s0,0,0,0h0l-.19,0a3.23,3.23,0,0,0-.71,0,3.66,3.66,0,0,1-.75,0h-.18s0,.07,0,.07,0,0-.09-.06,0-.07,0-.08l.06,0,.15,0c.21,0,.47,0,.73-.08a2.63,2.63,0,0,1,.77-.06.81.81,0,0,1,.31.06.37.37,0,0,1,.16.1.2.2,0,0,1,.07.15A.24.24,0,0,1,57.7,62.89Z"/>
+                <path class="cls-19"
+                      d="M72.25,57a5.47,5.47,0,0,1-2.27.2A5.21,5.21,0,0,1,68.8,57a9.51,9.51,0,0,1-.54,6.37,2.93,2.93,0,0,1,.57-.18,1.15,1.15,0,0,1,.31,0l.33,0a1.78,1.78,0,0,1,.74.06c.16.18,0,.28,0,.29a.88.88,0,0,1-.2.1l-.3.09-.18.06-.11,0a4.68,4.68,0,0,0-.91.55.84.84,0,0,1-.6.22.33.33,0,0,1-.12,0c-.21.43-.43.83-.65,1.19-2.33,2.92-5.26,5.85-9.35,5.26l-.15,0a8.41,8.41,0,0,0,1.82.53,15.88,15.88,0,0,0,2.4.12,16.42,16.42,0,0,0,2.35-.22A5.89,5.89,0,0,0,68,69.45a28.34,28.34,0,0,0,2.4-3.28,15.37,15.37,0,0,0,2.22-5.6c.23-1.45.13-2.3.2-2.3C72.71,58.28,72.54,57.77,72.25,57ZM69,67.76a1.74,1.74,0,0,1-.14.27c0,.07-.15.14-.22.12s-.09,0-.09,0,.13,0,.18-.17,0-.15.07-.25,0-.24,0-.22,0,0,0,0-.08,0-.08,0l-.19.06a4,4,0,0,0-.41.17c-.31.13-.59.29-.62.25s.22-.26.5-.45a3.56,3.56,0,0,1,.62-.34,1,1,0,0,1,.2,0c.14,0,.35,0,.3.25A2.09,2.09,0,0,1,69,67.76Zm1.37-7.22a1,1,0,0,1-.57.29.39.39,0,0,1-.26-.11.27.27,0,0,1,0-.23c0-.12.09-.17.1-.16s0,.08,0,.17.07.11.16.1a.56.56,0,0,0,.24-.17l.11-.12s0,0,.06,0,0,0-.05,0l-.24-.1A2.64,2.64,0,0,1,69.6,60s.14-.07.3-.05l.27,0a3.56,3.56,0,0,1,.45.13A3.52,3.52,0,0,1,70.33,60.54Z"/>
+                <path class="cls-20"
+                      d="M73,2.19l-.42.4a4.62,4.62,0,0,0-.72,1,13.45,13.45,0,0,0-.62,1.26c-.13.34-.28.75-.43,1.18a2.55,2.55,0,0,0-.08.26s0,.07,0,0V6.22l0-.16,0-.32q0-.3-.06-.57a3,3,0,0,0-.1-.5,5.46,5.46,0,0,0-.21-.61,12.39,12.39,0,0,0-.83-1.76c.3,0,.61-.11.92-.15A8.43,8.43,0,0,1,71.8,2a1.48,1.48,0,0,1,.31,0l.41.05A3.64,3.64,0,0,0,73,2.19Z"/>
+                <path class="cls-7"
+                      d="M72.2,56.83a.66.66,0,0,0,0,.15,4.86,4.86,0,0,0-.63,0A10.19,10.19,0,0,1,70,56.92a5.15,5.15,0,0,1-2.09-.67c-.17-.11-.35-.21-.52-.33l-.24-.17-.08-.07a.77.77,0,0,1-.13-.12l0-.05.08,0,.16,0,.19,0a10.19,10.19,0,0,0,1.08.12,4.36,4.36,0,0,0,2-.22,3.23,3.23,0,0,0,1.07-.67Z"/>
+                <path class="cls-19"
+                      d="M70.86,81.84a.88.88,0,0,1,.41.16,1.21,1.21,0,0,0-.23-.53c-.18.11-.35.27-.52.39A1.22,1.22,0,0,1,70.86,81.84Z"/>
+                <path class="cls-3"
+                      d="M70.22,81.06a7.83,7.83,0,0,0-.86.38,9.05,9.05,0,0,1-1.64.62,5.61,5.61,0,0,1-1.34,0c-.36,0-.64,0-.84,0h-.12l-.32.06H65q.11.44.18.87l.09,0a16.47,16.47,0,0,0,5.1.56,1.33,1.33,0,0,0,.16-.17l.09-.11a.84.84,0,0,0-.26-.35,1.51,1.51,0,0,0-.48-.16c-.15,0-.25-.07-.25-.09s0,0,.06,0a.6.6,0,0,1-.25-.15.6.6,0,0,0,.25.15h.2a1.92,1.92,0,0,1,.33,0,3.09,3.09,0,0,1,.85-.1l.07-.12.08-.15a.69.69,0,0,0-.42-.35,1.72,1.72,0,0,0-.5,0,.38.38,0,0,0-.16,0s-.07,0-.08,0h0l0,0a.27.27,0,0,1,.17-.09l.22-.06c.17-.12.34-.28.52-.39a.81.81,0,0,0-.82-.41Z"/>
+                <path class="cls-19"
+                      d="M70.24,82.79a1.08,1.08,0,0,1,.27.07,1.05,1.05,0,0,1,.31.28l0-.08.23-.37A3.09,3.09,0,0,0,70.24,82.79Z"/>
+                <path class="cls-19"
+                      d="M65.29,83.13l1.41.77,2.42,0a2.26,2.26,0,0,0,1.07-.11,1,1,0,0,0,.2-.13A18.56,18.56,0,0,1,65.29,83.13Z"/>
+                <path class="cls-9" d="M70.72,83.58h0s0,0,0,0Z"/>
+                <path class="cls-7"
+                      d="M66.33,51.88a1.41,1.41,0,0,0,.36.37,2.64,2.64,0,0,0,1.53.43,3.93,3.93,0,0,0,1.47-.4,4.92,4.92,0,0,0,.67-.41l-.47-1.26a2.94,2.94,0,0,1-1.93.82l-1.08.1-.48,0-.12,0s-.11,0-.07,0A.57.57,0,0,0,66.33,51.88Z"/>
+                <path class="cls-9" d="M69.72,47.3h0v0Z"/>
+                <path class="cls-3"
+                      d="M69.72,48.06v.08c0,.1-.13.22-.13.22l-.26.18a1.66,1.66,0,0,1-.79.36,1.32,1.32,0,0,1-1-.09.9.9,0,0,1-.27-.2.34.34,0,0,1,0-.15h0c.25-.08.49-.17.69-.25a8.55,8.55,0,0,0,1.35-.5c0,.06.07.12.1.13l.06,0,0,0h0A.76.76,0,0,1,69.72,48.06Z"/>
+                <path class="cls-3"
+                      d="M69.39,63.42h0l0,0h0l-.09,0a4.78,4.78,0,0,0-.92.64c-.16.12-.31.24-.45.23a.8.8,0,0,1-.38-.23.78.78,0,0,1-.2-.26.15.15,0,0,1,0-.11s0,0,.13,0a1.25,1.25,0,0,0,.36-.09,5.22,5.22,0,0,1,1-.31h.53Z"/>
+                <path class="cls-20"
+                      d="M69,31.47a34.74,34.74,0,0,0-.39-3.57,11,11,0,0,0-1.17-3.44A7.92,7.92,0,0,0,65,21.83l0,0A9.1,9.1,0,0,0,63,20.71c.63.43,1,.95.63,1.72A2.58,2.58,0,0,1,62,23a11.14,11.14,0,0,1,1.27.46,11.65,11.65,0,0,1,1.62.88A5.56,5.56,0,0,1,66,25.61a10.8,10.8,0,0,1,1.14,2.52,16.49,16.49,0,0,1,.59,2.52,3.9,3.9,0,0,1-.18,2s-.16.24-.57.53c-.88,3.64-4.89,6-8.72,6.17.9.39,1.75.75,2.54,1.05A15.08,15.08,0,0,0,63,41a6.93,6.93,0,0,0,1.74.15,5.22,5.22,0,0,0,1.12-.1c.25,0,.37-.11.38-.1a3,3,0,0,1,.29-.42c.19-.28.46-.68.76-1.2a13.51,13.51,0,0,0,1.65-4.65A13.85,13.85,0,0,0,69,31.47Z"/>
+                <path class="cls-8"
+                      d="M67,33.13l-.28.19a7.53,7.53,0,0,1-2.83,1,12.77,12.77,0,0,1-4.43-.18,23,23,0,0,1-2.54-.58,9.39,9.39,0,0,1-2.61-1.13h0l-.86-.58c-.15-.1-.29-.22-.43-.32l-.21-.16-.33-.27c0-.14,0-.29,0-.43s0-.19,0-.29.08-.36.13-.54a10,10,0,0,1,.38-1,12.46,12.46,0,0,1,4.25-4.91,6.51,6.51,0,0,1,1.94-1,4.76,4.76,0,0,1,2.12-.1A5.29,5.29,0,0,1,62,23a2.58,2.58,0,0,0,1.66-.55c.38-.77,0-1.29-.63-1.72a7.77,7.77,0,0,0-2.92-.59,29,29,0,0,0-4.62.59,20,20,0,0,0-2,.55c-4.69,2.54-5.84,9.65-2.1,12.86a35.13,35.13,0,0,0,6.93,5.17h0C62.1,39.12,66.11,36.77,67,33.13Z"/>
+                <path class="cls-20"
+                      d="M53.44,21.26c-.4.14-.76.28-1.06.41-.7.31-1.08.56-1.14.58s-.57.33-1.36.94a24.3,24.3,0,0,0-3,2.81,25.21,25.21,0,0,0-1.74,2.1c-.14.2-.29.4-.43.61l-.11.14v0s0,0,0,.05l0,0,.23.27.52.6A48.11,48.11,0,0,0,50,34.5a24.1,24.1,0,0,0,2.66,2c.22.15.46.29.69.43l.7.38c.48.25,1,.48,1.45.7.95.45,1.87.88,2.75,1.27a35.13,35.13,0,0,1-6.93-5.17C47.6,30.91,48.75,23.8,53.44,21.26Z"/>
+                <path class="cls-19"
+                      d="M67.37,71.75l.07-.16s.16-.27.37-.65.31-.55.48-.87a5.08,5.08,0,0,1-1.66,1.26,9.59,9.59,0,0,1-2.31.74l-.66.11c0,.15,0,.36,0,.61,0,.61.11,1.49.2,2.56,0,.53.09,1.11.14,1.73,0,.27,0,.55.08.84l.08.29,0,.25c0,.17.08.33.11.5l0,.19C64.54,76.14,64.55,72.7,67.37,71.75Z"/>
+                <path class="cls-3"
+                      d="M64.4,79.15c.2,1,.41,2,.62,3h.07v0a.13.13,0,0,0,0-.06c0-.15,0-.37,0-.69,0-.6,0-1.52.08-2.83a25.11,25.11,0,0,1,.33-2.81,1.48,1.48,0,0,0,0-.27c-.18.15-.31.23-.33.16a10.11,10.11,0,0,1,1.16-2c.29-.48.55-1,.74-1.38.1-.23.19-.41.25-.53C64.55,72.7,64.54,76.14,64.4,79.15Z"/>
+                <path class="cls-10"
+                      d="M67.54,31.84s0,.75,0,.76a9.45,9.45,0,0,1-.92.58c-.18.1-.39.2-.62.3a5.74,5.74,0,0,0,1-3.41A13.61,13.61,0,0,1,67.54,31.84Z"/>
+                <path class="cls-11"
+                      d="M67.06,30.07a5.74,5.74,0,0,1-1,3.41c-.23.09-.48.18-.76.26l.14-.11a10.05,10.05,0,0,1-2.5.35H62a5.25,5.25,0,0,1-1.9-4.7c.14-2.6,1.6-4.63,3.4-4.74a6.68,6.68,0,0,1,.78.47,4.12,4.12,0,0,1,.85,1l.12.15.24.45.08.15A21.9,21.9,0,0,1,67.06,30.07Z"/>
+                <path class="cls-3"
+                      d="M66.43,48.23h-.06a9.52,9.52,0,0,1-1.93-.13,15.12,15.12,0,0,1-2.81-.9l1.3-.85a15.58,15.58,0,0,0,1.3,1.21,3.65,3.65,0,0,0,1,.49,4,4,0,0,0,1.07.17Z"/>
+                <path class="cls-3"
+                      d="M64.74,41.44l1.6.64a.3.3,0,0,0-.22.11.83.83,0,0,0-.18.34s.07,0,.15.07l-.16.15s0,0,0,0l0,0-.46.79A15.13,15.13,0,0,0,63.2,44l-.09-.75s0,0,0,0a4.16,4.16,0,0,0-1.24-.48l-.62-.16.38-1.42a9.31,9.31,0,0,0,1.26.28A7.51,7.51,0,0,0,64.74,41.44Z"/>
+                <path class="cls-3"
+                      d="M56.11,99.62a8.93,8.93,0,0,1-1.69,2.72c-.27.33-.5.6-.64.8,0,0,0,0,0,0,1.56.29,3.17.49,4.78.74l.9.14.19,0h.3l.32,0c.6,0,1.21-.08,1.81-.13l1.4-.14c0-.07.08-.17.14-.28s.35-.62.59-1,.52-.93.77-1.47a6.78,6.78,0,0,0,.33-.85,5,5,0,0,0,.17-.92,3.55,3.55,0,0,0-.13-1.79,3.19,3.19,0,0,0-.4-.73A29.32,29.32,0,0,1,56.4,98,7.53,7.53,0,0,1,56.11,99.62Z"/>
+                <path class="cls-19"
+                      d="M63.68,95.52c-.32.07-.64.14-1,.19a18.79,18.79,0,0,1-6.09.11l-1-.17a1.82,1.82,0,0,1,.56.8A3.81,3.81,0,0,1,56.4,98a29.32,29.32,0,0,0,8.53-1.29,5,5,0,0,0-.5-.59A2.52,2.52,0,0,0,63.68,95.52Z"/>
+                <path class="cls-11"
+                      d="M65.4,33.63l-.14.11-.34.1h0a15.44,15.44,0,0,1-2,.14A10.05,10.05,0,0,0,65.4,33.63Z"/>
+                <path class="cls-11" d="M65.26,33.74l-.06,0-.28.05Z"/>
+                <path class="cls-9" d="M64.81,7.55v0l-.29,0v0Z"/>
+                <path class="cls-3"
+                      d="M64.39,63.38s0,0,0,0a.49.49,0,0,0,0,.11h0l-.28,0a.53.53,0,0,0,.14-.12l.13-.07s0,0,0,0A.21.21,0,0,0,64.39,63.38Z"/>
+                <path class="cls-11"
+                      d="M64.91,33.84a6.6,6.6,0,0,1-.84.16H64a.29.29,0,0,0-.24,0h-.05l-.5,0-.55,0a3.85,3.85,0,0,1-.48,0L62,34h.86A15.44,15.44,0,0,0,64.91,33.84Z"/>
+                <path class="cls-20" d="M64.21,2.78c.09.73.19,1.81.26,3.32A13.48,13.48,0,0,0,63,2.73Z"/>
+                <path class="cls-11" d="M64.07,34l-.14,0h-.16A.29.29,0,0,1,64,34Z"/>
+                <path class="cls-3"
+                      d="M64,63.47a1,1,0,0,1-.36.2c-.35.12-.73.21-.84.26.07-.09.25-.46.6-.5A3.94,3.94,0,0,1,64,63.47Z"/>
+                <path class="cls-3"
+                      d="M63.11,43.2l.09.75c-.25,0-.49.1-.74.16l-1,.27c-.47-.39-.81-.64-.86-.58a6.65,6.65,0,0,0,.58.66l-.8.25c-.58.19-1,.36-1,.37a8.64,8.64,0,0,0-1,.5l-.41.28c-1.2-.39-2.46-.76-3.71-1.11-.23-.07-.49-.13-.67-.2L53,44.27l-1.32-.59-.15-.07c.7-.19,1.36-.35,1.9-.47.78-.17,1.32-.22,1.35-.23s.56-.1,1.36-.19A20.23,20.23,0,0,1,59,42.65a23,23,0,0,1,2.86.31C62.52,43.08,63,43.2,63.11,43.2Z"/>
+                <path class="cls-3"
+                      d="M58.34,24.17a10.38,10.38,0,0,0-2.21,1.64,10.46,10.46,0,0,0-2.48,3.28,6.91,6.91,0,0,0-.37.95c-.05.16-.09.32-.13.48l0,.24v.09l.28.22.41.32.84.59,0,0a7.78,7.78,0,0,0,2,.94C55.22,30.34,55.79,26.77,58.34,24.17Z"/>
+                <path class="cls-10"
+                      d="M60.14,29.28c.14-2.6,1.6-4.63,3.4-4.74l-.66-.32a4.94,4.94,0,0,0-3.44-.5,5.42,5.42,0,0,0-1.1.45c-2.55,2.6-3.12,6.17-1.72,8.77l.44.15a25,25,0,0,0,2.47.64,15.7,15.7,0,0,0,2.66.35L62,34A5.25,5.25,0,0,1,60.14,29.28Z"/>
+                <path class="cls-9" d="M62.78,64s0,0,0,0S62.79,64,62.78,64Z"/>
+                <path class="cls-19"
+                      d="M56.06,86.71a.77.77,0,0,0,.07.17,2.8,2.8,0,0,0,.14.25h0l0,0,.09-.07.18-.16L58,85.67l1.12-.93.39-1.26A10.16,10.16,0,0,1,56.06,86.71Z"/>
+                <path class="cls-19"
+                      d="M56.23,86.1a.61.61,0,0,0-.19.38.36.36,0,0,0,0,.12.52.52,0,0,0,0,.11A10,10,0,0,0,58.24,85a5.44,5.44,0,0,1-1.86.9A1.91,1.91,0,0,0,56.23,86.1Z"/>
+                <path class="cls-19"
+                      d="M54.78,86a1.85,1.85,0,0,0-.16.3s0,0-.06.13a.77.77,0,0,0-.08.29.76.76,0,0,0,0,.15l.19,0,.45.07.91.12L55.93,87a.82.82,0,0,1-.21-.57c0-.07.11-.28.3-.46A4.7,4.7,0,0,1,54.78,86Z"/>
+                <path class="cls-19"
+                      d="M54,86.13v.21l.29.39a1,1,0,0,1,.08-.53.84.84,0,0,1,.1-.15l0,0a4.05,4.05,0,0,1-.5-.12A2.11,2.11,0,0,0,54,86.13Z"/>
+                <path class="cls-3"
+                      d="M61.28,75c0-.91-1.08-1.83-1.83-2.75h-.14a9.7,9.7,0,0,1-2.18-.62c.27.51.62,1.24.93,2s.57,1.42.76,2,.28,1,.29,1a24.51,24.51,0,0,1,.13,3.16,9.25,9.25,0,0,1-.26,3h0a12.54,12.54,0,0,1-1.75,1.15s-1.93.78-2,.62a1,1,0,0,0-.7.18,1.14,1.14,0,0,0-.45.64,3.12,3.12,0,0,0-.1.48v0a4.05,4.05,0,0,0,.5.12,2.28,2.28,0,0,1,.22-.23c.21-.17.48-.24.49-.2s-.19.18-.33.37a.86.86,0,0,0-.07.1A4.7,4.7,0,0,0,56,86c.21-.2.45-.36.49-.25l-.13.16a5.44,5.44,0,0,0,1.86-.9,9.79,9.79,0,0,0,1.23-1.51c.07-.22.11-.35.12-.37s0,0,0-.14l0,0s0,0,0,0l0-.07v0c0-.07.05-.14.08-.22.11-.32.28-.75.48-1.27l.69-1.76c.09-.25.19-.5.29-.74A13.51,13.51,0,0,0,61.28,75Z"/>
+                <path class="cls-19"
+                      d="M61.86,72.35a15,15,0,0,1-2.41-.06c.75.92,1.83,1.84,1.83,2.75a13.51,13.51,0,0,1-.05,3.76c0-.09.07-.16.1-.25l.21-.5,0-.09s0,0,0,0h0v-.07l0-.26c.22-1.44.43-2.87.58-3.94l.21-1.34C62.24,72.33,62.05,72.35,61.86,72.35Z"/>
+                <path class="cls-3"
+                      d="M61.55,44.91l1,1.08-1.14.62-.53.3-1.12-.44-1.06-.37c.5-.26.87-.41.9-.42s.38-.18.93-.4Z"/>
+                <path class="cls-9" d="M60.66,82.93a.19.19,0,0,1,0,.08h0l0,0Z"/>
+                <path class="cls-22"
+                      d="M60.21,47.39l-.67-.22c-.44-.15-.89-.28-1.34-.41.36.47.75.93,1.15,1.39.27-.26.54-.5.77-.69Z"/>
+                <path class="cls-3"
+                      d="M57.85,46.65l-1,.64a20.84,20.84,0,0,1-2.69,1.65l-.33.19a3.46,3.46,0,0,0,.42.57c.08.07.15.16.24.23a2.34,2.34,0,0,0,.38.28,3.84,3.84,0,0,0,.8.43l1.7-.25a8.94,8.94,0,0,1,1.49-1.81c.14-.15.29-.29.44-.43-.4-.46-.79-.92-1.15-1.39Z"/>
+                <path class="cls-9" d="M59.23,69.29s.08.12,0,0Z"/>
+                <path class="cls-20"
+                      d="M58.47,6.77c0,.08.11.28,0,.12s-.28-.28-.58-.53l-.15-.13L57.39,6l-.45-.34L56.06,5a13.29,13.29,0,0,0-1.62-1A20.13,20.13,0,0,0,52.38,3a14.93,14.93,0,0,1,3.11-.49c.41,0,.81,0,1.2,0,.19.34.39.77.61,1.28.31.7.73,1.82,1,2.46,0,0,.06.15.12.31Z"/>
+                <path class="cls-3"
+                      d="M53.3,45.45h0c-.07.14-.19.39-.37.74.06.21.11.45.18.75a11,11,0,0,0,.55,1.74,3.84,3.84,0,0,0,.23.45l.33-.19a17.91,17.91,0,0,1,2.42-2l.57-.44c-1-.29-2.09-.55-3.16-.82C53.79,45.59,53.57,45.54,53.3,45.45Z"/>
+                <path class="cls-7"
+                      d="M56.37,55.13l0,0-.55.45a17.59,17.59,0,0,1-2.47,1.68,7,7,0,0,1-2.05.64,9.74,9.74,0,0,1-1.23.12H50q-.06-.6-.09-1.17a14.88,14.88,0,0,1,0-2l.51.21a7.34,7.34,0,0,0,2.14.42,11.87,11.87,0,0,0,1.45,0l.82-.06.63-.07.55-.14Z"/>
+                <path class="cls-7"
+                      d="M51.37,99.16a10.08,10.08,0,0,1-2.88,1.66l-.68.25c.17.1.34.2.52.29a13.43,13.43,0,0,0,3.16,1.31c.51.14,1,.26,1.57.37a12,12,0,0,1,.9-1.1,8.63,8.63,0,0,0,1.71-2.47A7.56,7.56,0,0,0,56,98a28,28,0,0,1-3.62-.3A3.85,3.85,0,0,1,51.37,99.16Z"/>
+                <path class="cls-16"
+                      d="M56,96.53a1.77,1.77,0,0,0-.6-.94c-.32-.08-.62-.16-.9-.25l-1.59-.46-.43-.13a3.81,3.81,0,0,1,.22,1.39,4.18,4.18,0,0,1-.25,1.53h0A28,28,0,0,0,56,98,3.55,3.55,0,0,0,56,96.53Z"/>
+                <path class="cls-3"
+                      d="M53.22,69.16c-.24-.21-.47-.41-.7-.64l-.19-.21a2.77,2.77,0,0,1-.31.53s0,.09,0,.12a.66.66,0,0,0,.24.45.48.48,0,0,0,0,.13l.28.46c.21.34.45.64.4.81s-.57.12-1-.1a4.06,4.06,0,0,1-.57-.35,1.73,1.73,0,0,1-.29-.31l0-.12v0l0,0-.65.61a.05.05,0,0,0,0,0h0l0,.07a2,2,0,0,0-.16.3.75.75,0,0,0,.13.82,3,3,0,0,0,.25.24l.3.23c.18.15.36.29.52.4.32.23.55.35.54.43s-.32.14-.74,0a4.64,4.64,0,0,1-.69-.23l-.38-.17a1.87,1.87,0,0,1-.39-.23,1.7,1.7,0,0,1-.62-.75l-.42.4-.72.68,0,.1a2.72,2.72,0,0,0,.53.93c.54.64,1.4,1.07,1.33,1.25s-1,.06-1.94-.55a3.46,3.46,0,0,1-.85-.86c-.28.26-.56.55-.85.86l-.23.24.09.31a2.57,2.57,0,0,0,.44.75,3.75,3.75,0,0,0,.74.58c.23.14.39.16.43.24s-.18.27-.54.26A2.43,2.43,0,0,1,46,76.54a3,3,0,0,1-.88-.8c-.55.63-1.13,1.31-1.72,2a2.58,2.58,0,0,0,.34,1,2.52,2.52,0,0,0,.68.76,3.24,3.24,0,0,0,1.08.5l.19,0C49.53,77,53.38,73.65,53.22,69.16Z"/>
+                <path class="cls-19"
+                      d="M54.53,70.2c-.46-.33-.89-.68-1.31-1C53.38,73.65,49.53,77,45.73,80a7.91,7.91,0,0,0,2.12.22,5.43,5.43,0,0,0,.79-.09c.75-1,1.67-1.94,2.56-2.9.71-.76,1.34-1.55,1.94-2.33a24.19,24.19,0,0,0,1.51-2.14,13.28,13.28,0,0,0,.83-1.59c.05-.12.09-.22.13-.3C55.24,70.69,54.88,70.45,54.53,70.2Z"/>
+                <path class="cls-7"
+                      d="M55.33,50.73s.15,0,.05,0l-.29,0-.55.08-.51,0-.6,0a4.77,4.77,0,0,1-1.8-.19,3,3,0,0,1-.72-.4c.08-.22.17-.42.25-.62.41-.88.85-1.72,1.17-2.38l.08-.18s0,0,0,0c.22.44.46,1,.85,1.69a4.45,4.45,0,0,0,.81,1,3.11,3.11,0,0,0,.28.23l.21.16a3.66,3.66,0,0,0,.52.28l.09,0Z"/>
+                <path class="cls-3"
+                      d="M54.48,67.85a1.35,1.35,0,0,1-.2.91l0,0c-.23-.2-.46-.4-.67-.61a.71.71,0,0,0,.27-.33C54,67.86,54.31,67.86,54.48,67.85Z"/>
+                <path class="cls-3"
+                      d="M44.76,93.09l0,0a5.69,5.69,0,0,1-1.68.54,6.4,6.4,0,0,1-1.57,0c-.29,0-.56-.07-.78-.11.21.7.4,1.33.48,1.5a3,3,0,0,1,.16.56l.1.47c.07.31.14.61.2.92L42,98.89l.06.3v.06s0,0,0,0l.08-.1.6-.77.56-.74.4.84.8,1.7c0-.52,0-1,0-1.56.44.39.91.84,1.34,1.17.2.17.44.34.62.47l.35.24.22.15h0l.16,0c.25-.07.6-.18,1-.33a9.58,9.58,0,0,0,2.79-1.45A3.1,3.1,0,0,0,52,97.61c-.61-.1-1.22-.21-1.84-.35A8.67,8.67,0,0,1,44.76,93.09Z"/>
+                <path class="cls-19"
+                      d="M52.37,94.74l-.48-.16a1.22,1.22,0,0,1-.32-.12h0l-.19-.23a2.27,2.27,0,0,1-.79-.37,7.72,7.72,0,0,1-1.46-1.31A18.44,18.44,0,0,1,47.9,91c-.31-.44-.51-.75-.53-.77s-.12-.21-.29-.54c-.07.24-.18.57-.32,1-.07.2-.15.42-.23.66a3.87,3.87,0,0,1-.58.93,3.1,3.1,0,0,1-1.19.84,8.67,8.67,0,0,0,5.41,4.17c.62.14,1.23.25,1.84.35a4.13,4.13,0,0,0,.39-1.48A9.38,9.38,0,0,0,52.37,94.74Z"/>
+                <path class="cls-9" d="M51.65,65.2a0,0,0,0,0,0,0h0S51.64,65.21,51.65,65.2Z"/>
+                <path class="cls-9" d="M49.92,2.18h0Z"/>
+                <path class="cls-19"
+                      d="M46.46,53l0,0-.11.11-.07.08s0,0,0,.06a1.23,1.23,0,0,0,.06.21,2.61,2.61,0,0,0,.27.52c.25.39.92.85,1.43,1.53a3.19,3.19,0,0,1,.53,1.12,4.3,4.3,0,0,1,.1,1c0,.15,0,.29,0,.41a1.13,1.13,0,0,1,0,.18.19.19,0,0,1,0,.09.09.09,0,0,1,0,.06h0a1.81,1.81,0,0,1,.24.24.47.47,0,0,1,.12.23h0c-.09-.64-.15-1.28-.19-1.91,0-.24,0-.48,0-.7,0-.06,0-.1,0-.16h0L48.63,56l-.16-.19-.29-.39a8.57,8.57,0,0,1-.52-.76l-.12-.2c0-.08-.06-.11-.12-.25a1,1,0,0,1-.06-.68c.06-.2.3-.32.48-.45l.27-.18,1-.65h0a16.36,16.36,0,0,1,.47-1.71C48.48,51.65,48.39,53.72,46.46,53Z"/>
+                <path class="cls-3"
+                      d="M48.71,51c-.48.38-1,.79-1.42,1.18l-.6.56-.23.22c1.93.73,2-1.34,3.09-2.46a1.87,1.87,0,0,1,.07-.22C49.35,50.51,49,50.76,48.71,51Z"/>
+                <path class="cls-3"
+                      d="M48.42,59.84a1.18,1.18,0,0,0,.09-1.3l-.22-.16a.85.85,0,0,0-.54-.19,1.52,1.52,0,0,0-.57.18c-.18.09-.35.18-.38.26s0,.14.07.21l.1.08s0,.1-.06.17-.12.11-.15.09a1,1,0,0,1-.13-.14.62.62,0,0,1-.12-.2.41.41,0,0,1,0-.34,1.08,1.08,0,0,1,.54-.38l0,0,.1-.11c0-.07,0-.2-.07-.34s0-.27-.15-.39-.16,0-.22.08l-.18.19-.26.25a1.08,1.08,0,0,0-.21.29c-.06.12-.11.26-.17.4C46.45,59.42,47.11,60.28,48.42,59.84Z"/>
+                <path class="cls-19"
+                      d="M49.09,59.8s0,0,0,0q-.09-.47-.15-.93h0a.35.35,0,0,1,0,.18.35.35,0,0,1-.07.14s.11-.25-.13-.47l-.21-.17a1.18,1.18,0,0,1-.09,1.3c-1.31.44-2-.42-2.46-1.37-.05.13-.1.28-.15.42a4.29,4.29,0,0,0-.13.44.59.59,0,0,0,0,.35,1.07,1.07,0,0,0,.64.48,4.52,4.52,0,0,0,1,.2,7.76,7.76,0,0,0,1.08,0c.33,0,.69-.12.71-.24v0C49.12,60,49.1,59.9,49.09,59.8Z"/>
+                <path class="cls-7"
+                      d="M45.47,80.33a3.52,3.52,0,0,1-1.23-.51,2.69,2.69,0,0,1-.83-.86,3.21,3.21,0,0,1-.34-.72c-.44.57-.89,1.16-1.3,1.79q-.24.36-.45.75a2.85,2.85,0,0,0,.37.66,3.4,3.4,0,0,0,2.05,1.35,4.13,4.13,0,0,0,.69.11A11.59,11.59,0,0,1,46,80.42C45.84,80.39,45.65,80.37,45.47,80.33Z"/>
+                <path class="cls-16"
+                      d="M46.29,82.76c.39-.07.71-.15.91-.2a7.28,7.28,0,0,1,.36-.76,9.44,9.44,0,0,1,1-1.5,5.51,5.51,0,0,1-.69.14,6.71,6.71,0,0,1-1.84,0,11.59,11.59,0,0,0-1.59,2.48A7.15,7.15,0,0,0,46.29,82.76Z"/>
+                <path class="cls-7"
+                      d="M42.63,88.27a4.1,4.1,0,0,1-2.8-.74,2.08,2.08,0,0,1-.41-.35c0,.28,0,.56,0,.83a11.84,11.84,0,0,0,.41,2.9h0l.13.34c.08.19.32,1,.57,1.81a8.75,8.75,0,0,0,1,.17,5.82,5.82,0,0,0,1.46,0,5.93,5.93,0,0,0,1.6-.46l0,0a10.9,10.9,0,0,1-1.24-4.6Z"/>
+                <path class="cls-16"
+                      d="M45.93,91.88a2.74,2.74,0,0,0,.39-.64c.1-.23.18-.45.27-.66.18-.42.32-.75.43-1l-.1-.19a6.53,6.53,0,0,1-.51-2,.28.28,0,0,1,0-.09,3.91,3.91,0,0,1-1,.4,14.78,14.78,0,0,1-2.06.43,10.9,10.9,0,0,0,1.24,4.6A3.46,3.46,0,0,0,45.93,91.88Z"/>
+                <path class="cls-3"
+                      d="M44.3,83.18a4.48,4.48,0,0,1-.63-.06,3.68,3.68,0,0,1-2.33-1.42,2.41,2.41,0,0,1-.28-.43c-.21.4-.4.81-.58,1.24a27.15,27.15,0,0,0-.87,3,5,5,0,0,0-.16,1,3.19,3.19,0,0,0,.64.65,3.89,3.89,0,0,0,2.53.76l.74-.06A11.13,11.13,0,0,1,44.3,83.18Z"/>
+                <path class="cls-19"
+                      d="M46.25,87.35a1.56,1.56,0,0,1,.15-.06,5.07,5.07,0,0,1,.37-2.64v-.3a3.61,3.61,0,0,1,.38-1.69,6.1,6.1,0,0,1-.81.28,6.61,6.61,0,0,1-2,.24,11.13,11.13,0,0,0-.94,4.7c.74-.07,1.45-.18,2-.29C45.74,87.5,46,87.42,46.25,87.35Z"/>
+                <rect class="cls-9" x="46.74" y="72.88" width="0.01" height="0.01"/>
+                <path class="cls-9" d="M45.82,6.58h0c-.19.17-.37.36-.56.54C45.44,6.94,45.62,6.75,45.82,6.58Z"/>
+                <path class="cls-9" d="M41.07,80.26h0l-.13.28.13-.28Z"/>
+                <path class="cls-9" d="M40.93,80.57c0,.08-.06.16-.1.25h0Z"/>
+                <circle class="cls-3" cx="62.2" cy="27.25" r="0.91"/>
+                <circle class="cls-3" cx="62.76" cy="28.68" r="0.18"/>
+                <path class="cls-11" d="M73.88,22.78h0Z"/>
+                <path class="cls-11"
+                      d="M77.45,31.24a5.92,5.92,0,0,0,1.7-4.14c.09-2.17-1.34-4.54-2.93-5h0a5.88,5.88,0,0,0-2.18.61h0a.36.36,0,0,0-.11.1h0c-.09.37-.18.75-.24,1.1s-.08.43-.11.64a15.3,15.3,0,0,0,.83,7.33,13.51,13.51,0,0,0,2.15-.35C76.81,31.44,77.12,31.35,77.45,31.24Z"/>
+                <path class="cls-11"
+                      d="M73.53,24.53c-.26,1.61-.34,2.7-.35,2.77s-.16,1.29-.26,3.11h0a2.34,2.34,0,0,0,1,1.47h.11l.29,0A15.3,15.3,0,0,1,73.53,24.53Z"/>
+                <path class="cls-3"
+                      d="M74.29,25.41a.81.81,0,0,0-.36,1.09.8.8,0,0,0,1.09.35.81.81,0,0,0,.36-1.09A.8.8,0,0,0,74.29,25.41Z"/>
+                <circle class="cls-3" cx="73.86" cy="27.51" r="0.19"/>
+                <g id="_Group_2" data-name="&lt;Group&gt;">
+                    <path class="cls-20" d="M85.28,6.09,85.39,6l-.11.1Z"/>
+                    <path class="cls-20"
+                          d="M86,5.69l-.7.38A.22.22,0,0,0,85.18,6l-.09,0a3.17,3.17,0,0,0-.1-.38s.06,0,.15-.1h.15A.73.73,0,0,1,86,5.69Z"/>
+                    <path class="cls-20"
+                          d="M84.76,9.71l-.14-.25h0c.06-.43.24-1.16.42-1.86a4.84,4.84,0,0,0,.08-1.43l0-.22.09,0a.22.22,0,0,1,.08.09l-.07,0h0l.07,0v0l.11-.1-.11.07,0,0,.7-.38a.73.73,0,0,0-.67-.24h-.13l.27-.12c.26-.11.49-.13.5-.07a2.64,2.64,0,0,1,.09.85,4.77,4.77,0,0,1-.32,1.66A11.52,11.52,0,0,1,84.76,9.71Z"/>
+                    <path class="cls-20" d="M84.62,9.46l.14.25c-.06.09-.1.12-.13.11S84.59,9.67,84.62,9.46Z"/>
+                    <path class="cls-20"
+                          d="M84.7,20.43c0-.76,0-1.53,0-1.84h0l.05,0a11.48,11.48,0,0,1,.14,1.91c0,.5,0,1,0,1.39s-.06.65-.06.67a5.15,5.15,0,0,1-.1.65c-.06.38-.18.88-.31,1.37s-.32.95-.46,1.3a3.35,3.35,0,0,1-.26.57,16.82,16.82,0,0,1,.43-1.68c0,.13,0,.19.06.19s0-.22,0-.61a11.2,11.2,0,0,0,.2-1.18c0-.38.07-.64.08-.65s0-.27.07-.65S84.68,20.93,84.7,20.43Z"/>
+                    <path class="cls-20"
+                          d="M84.49,10.2a10.26,10.26,0,0,1-.56-1.74,3,3,0,0,1,.69,1h0c0,.21,0,.34,0,.36s.07,0,.13-.11l.16.31a12.08,12.08,0,0,1,.5,1.21c.11.34.16.59.17.6a4,4,0,0,1,0,.64,6.24,6.24,0,0,1-.18,1.31,4.82,4.82,0,0,1-.56,1.76,10.51,10.51,0,0,1,.1-1.82,7.64,7.64,0,0,0,0-1.22,4.42,4.42,0,0,0-.1-.54,4.71,4.71,0,0,0-.11-.57C84.76,11.06,84.63,10.63,84.49,10.2Z"/>
+                    <path class="cls-20"
+                          d="M85.09,5.94A1.71,1.71,0,0,0,84,6.05a2.93,2.93,0,0,0-1.1.74,1.14,1.14,0,0,0-.23.35l-.51-.72a2.32,2.32,0,0,0,.44-.09,11.1,11.1,0,0,0,1.32-.49,5.33,5.33,0,0,1,1.27-.38c-.09,0-.15.08-.15.1A3.17,3.17,0,0,1,85.09,5.94Z"/>
+                    <path class="cls-20" d="M82.94,32.73l.21-.76c.26.27.48.51.51.53Z"/>
+                    <path class="cls-20"
+                          d="M84.39,3a3.84,3.84,0,0,1,1.9.21,2.52,2.52,0,0,1,1.27,1.4,5.66,5.66,0,0,1,.34,1.35c.1.76.12,1.22.12,1.26a18.41,18.41,0,0,1-.09,2,23,23,0,0,1-.78,4.08,21.5,21.5,0,0,1-1.48,3.82,8.88,8.88,0,0,1-.88,1.45q0-.09,0-.09s0,0,0,.14h0s-.07.05-.08,0a6.85,6.85,0,0,1,.53-1.75,30.59,30.59,0,0,0,1.06-3.83,26.5,26.5,0,0,0,.47-4c0-1.08,0-1.82,0-1.87s0-.49,0-1.15-.19-1.59-.85-1.92a2.89,2.89,0,0,0-1.36-.23c-.52,0-1.08.08-1.62.14s-1.09.11-1.59.16l-.18,0h-.3l-.45,0,.38.65c.15.25.22.4.19.43s-.16-.08-.37-.27S80,4.6,79.66,4.2l.23.06c.19.06.32.08.35,0s0-.15-.18-.32l-.2-.16,1.29-.24c.48-.1,1-.19,1.54-.32S83.8,3,84.39,3Z"/>
+                    <path class="cls-20"
+                          d="M84.9,43.13s-.31-.05-.75-.15-1-.21-1.63-.3-1.21-.15-1.68-.19l-.8-.06-.79-.1a5.52,5.52,0,0,0-1.61,0,13.75,13.75,0,0,0-1.43.34V42.4a9.31,9.31,0,0,1,1.33-.48,6.1,6.1,0,0,1,.93-.18,7.85,7.85,0,0,1,.83,0l.81,0s.34,0,.81.12,1.08.19,1.68.34a11.12,11.12,0,0,1,1.64.5C84.67,42.91,84.93,43.09,84.9,43.13Z"/>
+                    <path class="cls-20"
+                          d="M78.18,41.25c-.42.06-1,.15-1.51.28l-.6.13c0-.13-.07-.26-.11-.38l.59-.2a14.38,14.38,0,0,1,1.52-.42l.73-.16s.32,0,.76,0a10.16,10.16,0,0,1,1.59.09,7.39,7.39,0,0,1,2.19.57A14.82,14.82,0,0,1,81.12,41a9.93,9.93,0,0,0-1.51.06c-.42,0-.69.1-.71.1Z"/>
+                    <path class="cls-20"
+                          d="M76.85,43.15l.14,0,.32.08a6.78,6.78,0,0,1,.86.32c.61.25,1.15.62,1.1.7A4.81,4.81,0,0,1,78,44l-.85-.17-.38,0-.38,0a3.22,3.22,0,0,0-.44,0h0a3.49,3.49,0,0,0,.18-.57A2.84,2.84,0,0,1,76.85,43.15Z"/>
+                    <path class="cls-20"
+                          d="M85.09,28.75l-.69.91q-.16.24-.36.48a1.94,1.94,0,0,0-.13.2l.16.08.46.27,1.65,1-2.52.84s-.25-.26-.51-.53l-.21.76.72-.23h0c0,.15-.06.27-.08.35v0a2.72,2.72,0,0,0-.09.4l-.1.05s-.12.06-.26.16l-.24.2a4.43,4.43,0,0,0-.71.84c-.51.82-1.18,2-2,3.11a9.16,9.16,0,0,1-1.36,1.48,4.07,4.07,0,0,1-.78.52c-.25.14-.5.26-.72.37a4,4,0,0,1-1.58.54,12.63,12.63,0,0,1,1.39-.88,7.12,7.12,0,0,0,1.32-1,8.35,8.35,0,0,0,1.16-1.48c.71-1.09,1.26-2.25,1.78-3.18A5.54,5.54,0,0,1,82.22,33l.31-.27h0l-.09-.11-.38-.46a1.11,1.11,0,0,1,.07-.16l.51-.15,1.11-.31.28-.08h.06l.14,0-.14-.13-1.21-.78.66-.76.4-.46.77-.85c.36-.41.7-.77,1-1.06l.37-.05-.13-.2-.24.25a21.2,21.2,0,0,1-2.28.11l.4-.06c.65-.09,1.88-.23,2.19-.34l.35-.13-.22.33C85.9,27.66,85.53,28.17,85.09,28.75Z"/>
+                    <path class="cls-20"
+                          d="M75.67,41.77l.4-.11c0,.14.07.28.1.43a2.91,2.91,0,0,1,0,.31c-.2.09-.38.17-.52.25a2.83,2.83,0,0,0,0-.51C75.69,42,75.68,41.89,75.67,41.77Z"/>
+                    <path class="cls-20"
+                          d="M76.07,41.66l-.4.11c0-.12,0-.24-.06-.35l.35-.14C76,41.4,76,41.53,76.07,41.66Z"/>
+                    <path class="cls-20" d="M76.21,42.71l-.56.16a1.43,1.43,0,0,0,0-.22c.14-.08.32-.16.52-.25Z"/>
+                    <path class="cls-20"
+                          d="M76.15,43.19a4.23,4.23,0,0,0-.65.14,2.76,2.76,0,0,0,.15-.46l.56-.16A3.5,3.5,0,0,1,76.15,43.19Z"/>
+                    <path class="cls-20"
+                          d="M75.5,43.33a4.23,4.23,0,0,1,.65-.14,3.49,3.49,0,0,1-.18.57h0l-.41,0-.32,0a1.72,1.72,0,0,0,.17-.31S75.47,43.39,75.5,43.33Z"/>
+                    <path class="cls-20"
+                          d="M75.28,42.94s.14-.15.41-.29a1.43,1.43,0,0,1,0,.22C75.43,42.93,75.29,43,75.28,42.94Z"/>
+                    <path class="cls-20"
+                          d="M75.7,40.59a4.54,4.54,0,0,1,.26.69l-.35.14a5.9,5.9,0,0,0-.16-.76,1.3,1.3,0,0,0-.17-.43c-.07-.08-.14-.1-.14-.13s.09-.05.22,0a1.17,1.17,0,0,1,.33.45h0Z"/>
+                    <path class="cls-20"
+                          d="M74.49,42a3.61,3.61,0,0,1,1.12-.59c0,.11,0,.23.06.35A4.1,4.1,0,0,1,74.49,42Z"/>
+                    <path class="cls-20"
+                          d="M74.79,42.87s0,.05,0,.07a.19.19,0,0,1,0,.08c0,.06-.07,0-.06,0l0,0h0l0,0a.55.55,0,0,1-.06-.08.64.64,0,0,0,.14,0S74.79,42.85,74.79,42.87Z"/>
+                    <path class="cls-20"
+                          d="M74.79,42.94s0,0,0-.07,0,0,0,0a.64.64,0,0,1-.14,0,.55.55,0,0,0,.06.08l0,0h0l0,0s0,.08.06,0A.19.19,0,0,0,74.79,42.94Zm.07-.19c.09,0,0,.49-.14.51s-.25-.29-.12-.4A2.17,2.17,0,0,1,74.86,42.75Z"/>
+                    <path class="cls-20"
+                          d="M74.29,43.91c0-.09.54-.4,1.18-.58h0c0,.06-.06.13-.09.18a1.72,1.72,0,0,1-.17.31C74.74,43.89,74.31,44,74.29,43.91Z"/>
+                    <path class="cls-20"
+                          d="M78.44,3.79c-.65-.24-1.42-.58-2.27-.86A14.81,14.81,0,0,0,74,2.38a3,3,0,0,1,.91-.32L74.49,1l0-.06a13.47,13.47,0,0,1,2.14.88A22.21,22.21,0,0,1,78.8,3.07c.45.29.81.55,1.06.74l-.47.09.27.3C79.36,4.12,78.94,4,78.44,3.79Z"/>
+                    <path class="cls-20"
+                          d="M74.72,43.26c.12,0,.23-.53.14-.51a2.17,2.17,0,0,0-.26.11s.05-.07.21-.13.08-.06.11,0a.2.2,0,0,1,.06.11.79.79,0,0,1-.06.38c-.06.14-.14.22-.27.2a.32.32,0,0,1-.22-.23.37.37,0,0,1,0-.38s.09,0,.15.08C74.47,43,74.6,43.29,74.72,43.26Z"/>
+                    <path class="cls-20"
+                          d="M77.45,31.24a3.28,3.28,0,0,1-1.76.88A2.6,2.6,0,0,1,74,31.89h.09a15.51,15.51,0,0,0,2.44-.38A9.68,9.68,0,0,0,77.45,31.24Z"/>
+                    <path class="cls-20" d="M74.07,41.57s-.07,0,0,0l0,0s0-.07-.11-.13.1,0,.17,0,.06.05,0,.09Z"/>
+                    <path class="cls-20"
+                          d="M74.69,22.21a1.86,1.86,0,0,1,1.52-.15,6.14,6.14,0,0,0-2.18.61l0,0A4.29,4.29,0,0,1,74.69,22.21Z"/>
+                    <path class="cls-20"
+                          d="M74,41.73c-.24.05-.27-.07,0-.34.06.06.11.11.11.13l0,0s0,.05,0,0l.08-.07s0-.11,0-.09-.16,0-.17,0l.23-.06C74.42,41.26,74.2,41.68,74,41.73Z"/>
+                    <path class="cls-20"
+                          d="M73.26,23.08a3.33,3.33,0,0,1,.72-.65l-.09.3C73.47,22.93,73.29,23.08,73.26,23.08Z"/>
+                    <path class="cls-20"
+                          d="M73.77,41.85a.19.19,0,0,1-.14-.24.7.7,0,0,1,.13-.24l.06-.08s.08,0,.14.1c-.27.27-.24.39,0,.34s.46-.47.23-.4l-.23.06s.09-.07.26-.12a.11.11,0,0,1,.12,0,.18.18,0,0,1,0,.13.48.48,0,0,1-.21.34A.43.43,0,0,1,73.77,41.85Z"/>
+                    <path class="cls-20"
+                          d="M74.92,2.06a3,3,0,0,0-.91.32l-.69-.13L73,2.2,73.22,2a10.26,10.26,0,0,1,1.27-1Z"/>
+                    <path class="cls-20"
+                          d="M72.92,30.41a11.14,11.14,0,0,1-.24-3.6c.1-2.25.34-3.27,1.2-4q-.13.57-.24,1.11c-.35,2-.44,3.33-.46,3.41S73,28.59,72.92,30.41Z"/>
+                    <path class="cls-20"
+                          d="M75.69,32.12a3.28,3.28,0,0,0,1.76-.88,11.5,11.5,0,0,0,2.27-1,6.48,6.48,0,0,0,.76-.53,3.39,3.39,0,0,0,.34-.31l.07-.08a.2.2,0,0,0,0-.06.65.65,0,0,0,.07-.21,6.92,6.92,0,0,0,.18-1.94,6.71,6.71,0,0,0-1.6-3.49,3.85,3.85,0,0,0-1.31-1.15,4,4,0,0,0-1.53-.44,2.77,2.77,0,0,0-.5,0h0a1.86,1.86,0,0,0-1.52.15,4.29,4.29,0,0,0-.7.48h0l-.1,0,.09-.3a2,2,0,0,1,.31-.19,4.42,4.42,0,0,1,2.46-.43,4.52,4.52,0,0,1,1.64.42,4.31,4.31,0,0,1,1.47,1.21A12.67,12.67,0,0,1,81,25.1a4.57,4.57,0,0,1,.64,2,7.53,7.53,0,0,1-.14,2.11c0,.08-.06.18-.09.27a.89.89,0,0,1-.09.16,1.25,1.25,0,0,1-.09.12,4.54,4.54,0,0,1-.38.38,6.71,6.71,0,0,1-.84.59,13.24,13.24,0,0,1-3.33,1.35,14.5,14.5,0,0,1-2.54.42,3.91,3.91,0,0,1-1.09,0,.44.44,0,0,1-.17-.07,4.68,4.68,0,0,1,0-.53.41.41,0,0,1,.29-.05,3.21,3.21,0,0,0,.81.06h0A2.6,2.6,0,0,0,75.69,32.12Z"/>
+                    <path class="cls-20"
+                          d="M72.77,61.29a.2.2,0,0,0,0-.07.72.72,0,0,0,.34-.09,2,2,0,0,0,.42-.29c.14-.13.28-.26.26-.42a2,2,0,0,0-.47-.93.68.68,0,0,0-.35-.23s0-.06,0-.13v0c0-.09,0-.16.09-.15a.51.51,0,0,1,.18.07,1.05,1.05,0,0,1,.34.28,2.35,2.35,0,0,1,.29.49,1.59,1.59,0,0,1,.18.64.5.5,0,0,1-.14.35.93.93,0,0,1-.24.21,1.78,1.78,0,0,1-.48.27A1,1,0,0,1,72.77,61.29Z"/>
+                    <path class="cls-20"
+                          d="M76,43.77a4.27,4.27,0,0,1-.38.7,4.1,4.1,0,0,1-.52.59,7,7,0,0,1-1.28,1,2.41,2.41,0,0,1-.56.22h0a3,3,0,0,1-1,.06c-.43-.05-.69-.15-.69-.2s.29,0,.7,0a2.85,2.85,0,0,0,1.35-.43,7.85,7.85,0,0,0,1.09-1,5.12,5.12,0,0,0,.43-.55s.07-.1.18-.27l.32,0Z"/>
+                    <path class="cls-20" d="M72.77,61.29c-.09,0-.13,0-.13-.06h.14A.2.2,0,0,1,72.77,61.29Z"/>
+                    <path class="cls-20"
+                          d="M72.71,57.59c-.09,0-.11-.59,0-1.31,0,.14,0,.28.07.42s.05.39.08.56S72.74,57.59,72.71,57.59Z"/>
+                    <path class="cls-20"
+                          d="M84.24,24c0,.12,0,.22,0,.3s0,.11,0,.17l-.06.25c0-.15-.07-.39-.11-.7s-.08-.63-.13-1a10.2,10.2,0,0,0-.47-1.21,4.69,4.69,0,0,0-1-1.17,6.62,6.62,0,0,0-1.33-1.08,6.21,6.21,0,0,0-3.58-.71,3.57,3.57,0,0,0-1.61.74,5.42,5.42,0,0,0-1.25,1.28A4.48,4.48,0,0,0,74,22.34a.29.29,0,0,0,0,.09,3.33,3.33,0,0,0-.72.65s.21-.15.63-.35a.43.43,0,0,0,0,.05c-.86.76-1.1,1.78-1.2,4a11.14,11.14,0,0,0,.24,3.6h0c0,.1,0,.22,0,.33,0,.36,0,.74,0,1.13a.3.3,0,0,0-.15.18.31.31,0,0,0,.15.35A14.36,14.36,0,0,0,73,34.1a13.87,13.87,0,0,0,1,3.66l.1.22.08.16c0,.07.07.08.12.07l.15,0,.14-.07.41-.25c.53-.36,1.05-.74,1.55-1.1,1-.72,1.93-1.42,2.71-2s1.42-1.12,1.86-1.48c0,0,.21-.28.56-.71s.46-1.5,1-2.7l.2-.5c.22-.59.43-1.28.59-1.85h0c-.22.81-.52,2-.81,2.94-.17.62-.34,1.18-.47,1.56L82,32l.09.12a1.54,1.54,0,0,1-.09.24A15.16,15.16,0,0,1,79.46,35c-.74.66-1.64,1.4-2.61,2.17-.5.39-1,.78-1.54,1.17l-.42.29-.29.15a1.68,1.68,0,0,1-.33.07.6.6,0,0,1-.68-.32l-.15-.28-.11-.23A15.75,15.75,0,0,1,72,30.71c.05-2,.2-3.42.21-3.51s.13-1.47.55-3.49c.11-.5.24-1.05.42-1.62A5.3,5.3,0,0,1,74,20.35a6.45,6.45,0,0,1,1.48-1.42,4.18,4.18,0,0,1,2-.82,6.78,6.78,0,0,1,3.92.93,7,7,0,0,1,1.39,1.23,5,5,0,0,1,1,1.33A7.9,7.9,0,0,1,84.2,23C84.22,23.36,84.24,23.7,84.24,24Z"/>
+                    <path class="cls-20"
+                          d="M72.09,52.35a2.24,2.24,0,0,1,1.3.71,1.19,1.19,0,0,1,.23.5c0,.14,0,.22,0,.23a2.94,2.94,0,0,1-.08.7c-.1.39-.26.81-.38,1.27s-.29,1.15-.38,1.5c0-.17,0-.36-.08-.56s0-.28-.07-.42,0-.41.07-.62c.07-.47.2-1,.25-1.28a2,2,0,0,0,0-.4.79.79,0,0,0,0-.14.91.91,0,0,0-.11-.44,1.86,1.86,0,0,0-.94-.61l-.11,0c0-.18-.09-.36-.14-.53C71.82,52.27,72,52.31,72.09,52.35Z"/>
+                    <path class="cls-20"
+                          d="M72.5,45.47a.71.71,0,0,1-.55.18.47.47,0,0,1-.24-.08.33.33,0,0,0,.1-.06.63.63,0,0,0,.12-.11h0a.57.57,0,0,0,.43-.13c.13-.07.27-.2.39-.27s.09-.06.15,0h0A0,0,0,0,1,73,45h0s0,0,0,0S72.71,45.26,72.5,45.47Z"/>
+                    <path class="cls-20"
+                          d="M71.81,45.51a.33.33,0,0,1-.1.06h0s0,0,0-.05.06,0,.06,0h0a.2.2,0,0,1,.1-.07h.05A.63.63,0,0,1,71.81,45.51Z"/>
+                    <path class="cls-20"
+                          d="M71.82,53.86a.27.27,0,0,1,.16.38,3.1,3.1,0,0,1-.37.46l-.14.14c-.08-.22-.16-.45-.25-.68a3,3,0,0,0,.21-.27C71.49,53.8,71.65,53.79,71.82,53.86Z"/>
+                    <path class="cls-20"
+                          d="M72,53.35c.26,1,.51,2.07.67,2.93-.07.72,0,1.31,0,1.31s.06-.12.11-.33c.07.61.05,1,0,1s-.26-.5-.55-1.27h0s0-.1,0-.15l-.73-2,.14-.14a3.1,3.1,0,0,0,.37-.46.27.27,0,0,0-.16-.38c-.17-.07-.33-.06-.39,0a3,3,0,0,1-.21.27L71,53.65c-.11-.28-.22-.57-.32-.85l.12,0,.32-.08L70.81,52a3.57,3.57,0,0,0,1,.72Z"/>
+                    <path class="cls-20"
+                          d="M70.71,52.8c-.11-.31-.23-.63-.35-.93a.13.13,0,0,0,.06,0l.13-.1a2,2,0,0,0,.25.29h0l.35.66-.32.08-.12,0Z"/>
+                    <path class="cls-20"
+                          d="M71.7,52.22c0,.17.1.35.14.53a3.57,3.57,0,0,1-1-.72h0l-.19-.36-.06.07c-.08-.11-.11-.19-.09-.21S71,51.94,71.7,52.22Z"/>
+                    <path class="cls-20"
+                          d="M69.85,4.31a6.58,6.58,0,0,0-1-1.54,4,4,0,0,0-.28-.29l.87-.17a12.66,12.66,0,0,1,.84,1.75c.07.19.14.4.2.61a4.48,4.48,0,0,1,.11.5c0,.18,0,.38,0,.57l0,.32,0,.16V6.3s0,0,0,0,0-.14.08-.26c.15-.43.3-.83.43-1.17a12.54,12.54,0,0,1,.62-1.27,5,5,0,0,1,.72-1c.15-.14.29-.28.42-.39l.36,0,.69.13a4,4,0,0,0-.41.21,7,7,0,0,0-.74.48,3.42,3.42,0,0,0-.71.78,8,8,0,0,0-.68,1.2,16.59,16.59,0,0,0-.75,2l-.15.49s0,0,0,0V7.42l0-.25-.06-.49c-.05-.32-.09-.64-.13-.94a4.54,4.54,0,0,0-.21-.88A4,4,0,0,0,69.85,4.31Z"/>
+                    <path class="cls-20"
+                          d="M69.89,50.61l-.42-1.11,1.06.18a1.27,1.27,0,0,1-.18.36A2.48,2.48,0,0,1,69.89,50.61Z"/>
+                    <path class="cls-20"
+                          d="M72,45.26a.18.18,0,0,1,0,.14h-.06a.2.2,0,0,0-.1.07h0s0,0,0-.05,0,.05,0,.05,0,0-.06,0,0,0,0,.05h0a3.42,3.42,0,0,1-.69.28,1.86,1.86,0,0,1-.9.06.66.66,0,0,1-.31-.19,2.41,2.41,0,0,0,.33-.15s0,0,.07,0a1.59,1.59,0,0,0,.76,0,3.33,3.33,0,0,0,.78-.22c.1,0,.17-.09.18-.13a.3.3,0,0,0,0-.09S72,45.17,72,45.26Z"/>
+                    <path class="cls-20"
+                          d="M73.26,46.34s-.08.28-.37.61a2.91,2.91,0,0,1-1.33.84,4.65,4.65,0,0,1-1,.18v0a.33.33,0,0,0-.32-.31l-.49.2v-.4l.12-.09.21,0a4.11,4.11,0,0,0,1.39,0,3.16,3.16,0,0,0,1.28-.58c.26-.19.42-.37.5-.41h0Z"/>
+                    <path class="cls-20"
+                          d="M69.71,45.62s0-.07.11-.13.14-.08.16-.06a.32.32,0,0,0,.15.14,2.41,2.41,0,0,1-.33.15A.44.44,0,0,1,69.71,45.62Z"/>
+                    <path class="cls-20" d="M69.72,47.42v-.09h0s0,0,0,0h0l.08,0h0Z"/>
+                    <path class="cls-20" d="M69.68,47.85l0,0v0h0Z"/>
+                    <path class="cls-20"
+                          d="M69.64,47.71a.29.29,0,0,1,0-.11s0-.05,0-.05,0,0,0,0a0,0,0,0,0,0,0l.09-.06v.4l0,0h0A.35.35,0,0,0,69.64,47.71Z"/>
+                    <path class="cls-20" d="M69.72,47.42l-.09.06a.47.47,0,0,0,.07-.12s0,0,0,0Z"/>
+                    <path class="cls-20"
+                          d="M69.39,49.29,69.26,49a6.28,6.28,0,0,0,1.06-.56.45.45,0,0,0,.19-.24c.1.36.35,1.17.56,1.86s.41,1.39.63,2.2c-.69-.28-1.19-.74-1.24-.7s0,.1.09.21l-.13.1a.13.13,0,0,1-.06,0c-.17-.45-.32-.88-.47-1.26a2.48,2.48,0,0,0,.46-.57,1.27,1.27,0,0,0,.18-.36l-1.06-.18h0A.32.32,0,0,0,69.39,49.29Z"/>
+                    <path class="cls-20"
+                          d="M69.53,47.9h.07l.07,0h.06v0l.49-.2a.33.33,0,0,1,.32.31v0h-.09c0-.06,0,0-.1,0s-.25,0-.36,0l-.31,0Z"/>
+                    <path class="cls-20"
+                          d="M69.5,60.72a.27.27,0,0,1,0-.23c0-.12.09-.17.11-.16s0,.08,0,.17.08.11.16.1a.56.56,0,0,0,.24-.17l.11-.12s0,0,.06,0,0,0,0,0l-.25-.1A2.64,2.64,0,0,1,69.6,60s.14-.07.3-.05l.27,0,.45.13a2.71,2.71,0,0,1-.29.4,1,1,0,0,1-.57.29A.36.36,0,0,1,69.5,60.72Z"/>
+                    <path class="cls-20"
+                          d="M69.25,48.92c-.06-.16.19-.4.56-.53a1.8,1.8,0,0,0,.54-.41h.1s0,.07.06.18a.45.45,0,0,1-.19.24,6.28,6.28,0,0,1-1.06.56A.08.08,0,0,1,69.25,48.92Z"/>
+                    <path class="cls-20"
+                          d="M69.37,47.83a.38.38,0,0,1-.1-.13c.12-.07.19-.11.19-.13l.17-.09a0,0,0,0,1,0,0s0,0,0,0,0,0,0,.05a.29.29,0,0,0,0,.11.35.35,0,0,1,0,.13h0l-.07,0h-.12l0,0Z"/>
+                    <path class="cls-20"
+                          d="M69.23,47.6v-.06a.31.31,0,0,1,.13-.25l.09-.06h0l.09,0h.15v.14h0s0,0,0,0a.47.47,0,0,1-.07.12l-.17.09A.66.66,0,0,0,69.23,47.6Z"/>
+                    <path class="cls-20"
+                          d="M68.24,1a1.3,1.3,0,0,1,.46.3,4.37,4.37,0,0,1,.69,1l0,0-.87.17a1.94,1.94,0,0,0-.46-.33c-.06,0-.1,0-.11,0s0-.07,0-.09A.28.28,0,0,0,68,2Z"/>
+                    <path class="cls-20"
+                          d="M69.8,45.72a1.71,1.71,0,0,1-.82.09,1,1,0,0,1-.72-.56,2,2,0,0,1-.19-.79,2.09,2.09,0,0,1,.49-1.33,2.62,2.62,0,0,1,.79-.63l.36-.18a6.43,6.43,0,0,1,.69-.2l.37,0a.8.8,0,0,1,.29,0l.13,0h.11l.17,0,.2-.06.11,0a.53.53,0,0,1,.16,0,3.67,3.67,0,0,1,1,0,1.51,1.51,0,0,1,.55.22,2,2,0,0,1,.42.4,1.29,1.29,0,0,1,.24.56.71.71,0,0,1-.23.61c-.32.22-.44.26-.53.74a.66.66,0,0,1-.24.31l-.16.08-.08,0h0s0,0,0,0,0-.13.06-.2a.25.25,0,0,0,0-.12s0,0,0-.22c0,0,0,0,0,0h0l-.09,0-.14,0c-.08,0-.12,0-.13,0s0,0,.09-.09a.48.48,0,0,1,.38-.14c.1.08,0,.2,0,.3s0,0,.08,0a.34.34,0,0,0,.08-.09.3.3,0,0,0,.07-.21v0s0-.06,0-.08a.42.42,0,0,1,0-.1l.07-.11a1.7,1.7,0,0,1,.19-.19l.17-.15c.15-.13.08-.38-.11-.6a1.18,1.18,0,0,0-.32-.27,1.07,1.07,0,0,0-.38-.13,3.62,3.62,0,0,0-.87,0H72l-.11.05-.21.07-.23.07a1.51,1.51,0,0,1-.29,0l-.25-.05h-.06l-.27.05a3.85,3.85,0,0,0-.58.19,2.5,2.5,0,0,0-.94.59,1.5,1.5,0,0,0-.4.95,1.46,1.46,0,0,0,.1.57.49.49,0,0,0,.36.32,1.74,1.74,0,0,0,1.18-.3,2.2,2.2,0,0,0,.25-.17l.12-.1.06-.06a.15.15,0,0,0,.06-.15s-.07-.08-.11-.09a1,1,0,0,0-.41,0,.48.48,0,0,0-.29.1.84.84,0,0,0-.12.19s-.07.07-.08.06,0,0,0-.08a.85.85,0,0,1,.09-.25.57.57,0,0,1,.37-.21,1.32,1.32,0,0,1,.57,0,.42.42,0,0,1,.29.21.39.39,0,0,1-.08.38,1.13,1.13,0,0,1-.12.18l-.13.13a2.09,2.09,0,0,1-.28.22,2.63,2.63,0,0,1-.33.2.32.32,0,0,1-.15-.14s-.1,0-.16.06-.12.12-.11.13A.44.44,0,0,0,69.8,45.72Z"/>
+                    <path class="cls-20"
+                          d="M69.75,68.12c-.39.57-.83,1.15-1.29,1.72l-.16.22.29-.52c.55-1,1.09-2.06,1.22-2S69.84,67.78,69.75,68.12Z"/>
+                    <path class="cls-20"
+                          d="M69.39,2.28a4.37,4.37,0,0,0-.69-1,1.3,1.3,0,0,0-.46-.3L68.16.37c.63-.07,1.3-.14,2-.18A11.5,11.5,0,0,1,72,.24l.5.1.4.11.79.21.84.25,0,.06a10.26,10.26,0,0,0-1.27,1L73,2.2l-.44-.07-.4-.06a1.66,1.66,0,0,0-.32,0,9.62,9.62,0,0,0-1.47.11l-.92.16Z"/>
+                    <path class="cls-20"
+                          d="M68.82,68a.29.29,0,0,1-.22.13c-.06,0-.08,0-.08,0s.12,0,.17-.17,0-.15.07-.25a1.26,1.26,0,0,0,0-.22s0,0,0,0-.07,0-.07,0l-.2.06c-.11,0-.27.1-.41.17a3.36,3.36,0,0,1-.62.26s.22-.27.5-.46a3.56,3.56,0,0,1,.62-.34,1,1,0,0,1,.2,0c.15,0,.36,0,.3.26a2.46,2.46,0,0,1-.12.36C68.92,67.85,68.88,67.94,68.82,68Z"/>
+                    <path class="cls-20"
+                          d="M68.36,64.15a4.44,4.44,0,0,1,.92-.65l.09,0h0l0,0h-.28a1.32,1.32,0,0,0-.28,0,4.71,4.71,0,0,0-1,.3,1.18,1.18,0,0,1-.36.09c-.09,0-.14,0-.13,0s0,0,.13,0a1.25,1.25,0,0,0,.31-.14,4,4,0,0,1,1-.41,1.15,1.15,0,0,1,.31,0h.33a1.65,1.65,0,0,1,.74.05.19.19,0,0,1,0,.3l-.2.09-.3.09-.17.06-.12,0a5.36,5.36,0,0,0-.91.55.64.64,0,0,1-1-.1.63.63,0,0,1-.18-.34c0-.12.1-.13.1-.12a.15.15,0,0,0,0,.11.7.7,0,0,0,.2.26.8.8,0,0,0,.38.23A.82.82,0,0,0,68.36,64.15Z"/>
+                    <path class="cls-20"
+                          d="M69.26,47.68a4.48,4.48,0,0,1-.78.28,8,8,0,0,1-2,.27A6.46,6.46,0,0,0,67.83,48a12.74,12.74,0,0,1,1.4-.35.11.11,0,0,0,0,.07Z"/>
+                    <path class="cls-20"
+                          d="M66.51,48.79a1.56,1.56,0,0,1-.19-.14v0h.09a6.24,6.24,0,0,0,.82-.17h0a.26.26,0,0,0,0,.15.73.73,0,0,0,.26.2,1.32,1.32,0,0,0,1,.09,1.53,1.53,0,0,0,.79-.36,2.4,2.4,0,0,0,.26-.18s.13-.12.13-.22v-.08a1.59,1.59,0,0,0-.19-.16l.15,0L70,48c.11,0,.23,0,.36,0a1.8,1.8,0,0,1-.54.41c-.37.13-.62.37-.56.53a.08.08,0,0,0,0,0,6.28,6.28,0,0,1-.66.23,2.65,2.65,0,0,1-1.18,0,2.6,2.6,0,0,1-.47-.16A3.7,3.7,0,0,1,66.51,48.79Z"/>
+                    <path class="cls-20"
+                          d="M66.32,48.63c0-.06-.22-.15-.22-.2a2,2,0,0,1,.59,0,5.19,5.19,0,0,1,.48-.24l.29.1H67.4l-.09,0a.2.2,0,0,0-.08.08,6.24,6.24,0,0,1-.82.17Z"/>
+                    <path class="cls-20"
+                          d="M66.26,42.61s-.08,0-.16,0,.11-.54.38-.34.4.48.11.48l-.68,0s0,0,0,0a1.43,1.43,0,0,1,.28,0l.3,0a.23.23,0,0,0,.1,0s0,0,0-.06a2.23,2.23,0,0,0-.2-.18c-.08,0,0,0-.07,0A.61.61,0,0,0,66.26,42.61Z"/>
+                    <path class="cls-20"
+                          d="M66.1,42.6c.08,0,.16,0,.16,0a.61.61,0,0,1,.09-.22s0,0,.07,0a2.23,2.23,0,0,1,.2.18s0,0,0,.06a.23.23,0,0,1-.1,0l-.3,0a1.43,1.43,0,0,0-.28,0Z"/>
+                    <path class="cls-20"
+                          d="M65.93,51.85a2.07,2.07,0,0,1-.15-.34s0-.07,0-.09l.09,0,.16,0a4.87,4.87,0,0,1,.72-.13l.6-.11.51-.09a2.22,2.22,0,0,0,1.25-.69,2.55,2.55,0,0,0,.18-.28,1.42,1.42,0,0,0,.19-.52v0h0l.42,1.11a3.23,3.23,0,0,1-.27.23,3.36,3.36,0,0,1-1.66.6l-1.08.1-.47,0-.13,0s-.11,0-.07,0a1.34,1.34,0,0,0,.12.24,1.54,1.54,0,0,0,.36.36,2.64,2.64,0,0,0,1.53.43,3.75,3.75,0,0,0,1.47-.4,3.19,3.19,0,0,0,.67-.41c.12.3.24.62.35.93-.21.06-.48.12-.84.19a6.2,6.2,0,0,1-1.72.12A3.44,3.44,0,0,1,67,52.8a2.93,2.93,0,0,1-.59-.35A2.3,2.3,0,0,1,65.93,51.85Z"/>
+                    <path class="cls-20"
+                          d="M65.93,42.79l0,0,.68,0c.29,0,.15-.28-.11-.48s-.38.34-.38.34-.16-.05-.16-.07a.9.9,0,0,1,.18-.34.3.3,0,0,1,.23-.11h0a.41.41,0,0,1,.24.1,1,1,0,0,1,.26.37.22.22,0,0,1-.09.25.43.43,0,0,1-.23,0l-.32,0Z"/>
+                    <path class="cls-20"
+                          d="M65.79,45.53a1.65,1.65,0,0,1,.26-.36s0-.08-.08-.14a1.14,1.14,0,0,1,.38.22.47.47,0,0,1,.15.36.43.43,0,0,1-.33.27c-.16,0-.35,0-.39,0A.27.27,0,0,1,65.79,45.53Z"/>
+                    <path class="cls-20"
+                          d="M65.79,45.53a.27.27,0,0,0,0,.32c0,.07.23.08.39,0a.43.43,0,0,0,.33-.27.47.47,0,0,0-.15-.36A1.14,1.14,0,0,0,66,45c.06.06.1.12.08.14A1.65,1.65,0,0,0,65.79,45.53Zm-.11.4c-.24-.26,0-.64.27-.91a.74.74,0,0,1,.63.46C66.73,45.91,65.92,46.2,65.68,45.93Z"/>
+                    <path class="cls-20"
+                          d="M65.57,46a.58.58,0,0,1-.07-.61,1.86,1.86,0,0,1,.3-.45s.09,0,.15.06c-.22.27-.51.65-.27.91s1,0,.9-.45A.74.74,0,0,0,66,45a.6.6,0,0,1,.48.13.61.61,0,0,1,.26.49.64.64,0,0,1-.44.46A.62.62,0,0,1,65.57,46Z"/>
+                    <path class="cls-20"
+                          d="M65.42,75.37l.63-.61s0,0,.1.17l-.32.32-.28.25v-.07c0-.05,0,0,0-.05S65.42,75.36,65.42,75.37Z"/>
+                    <path class="cls-20" d="M65.85,33.64a3.88,3.88,0,0,1-.65.15l.06,0,.76-.27Z"/>
+                    <path class="cls-20"
+                          d="M65.22,75.66a10.11,10.11,0,0,1,1.16-2c.29-.48.55-1,.74-1.38l.32-.69s.16-.27.37-.65.31-.55.48-.87h0l.16-.22c.46-.57.9-1.15,1.29-1.72a15.52,15.52,0,0,1-.53,1.7c-.2.55-.42,1.1-.59,1.52l-.31.71s-.16.29-.41.67a11.85,11.85,0,0,1-1,1.35c-.27.32-.54.61-.79.86-.07-.13-.1-.16-.1-.17l-.63.61s.06,0,.08,0,0,0,0,.05v.07C65.37,75.65,65.24,75.73,65.22,75.66Z"/>
+                    <path class="cls-20"
+                          d="M65.15,54.56c.47.13.94.28,1.29.36s.7.13,1,.17l1,.09a3.82,3.82,0,0,0,1.73-.24,2.6,2.6,0,0,0,1-.68.58.58,0,0,0,.08-.1c.09.23.17.46.25.68a3.23,3.23,0,0,1-1.07.67,4.34,4.34,0,0,1-2,.22,10.49,10.49,0,0,1-1.08-.12l-.19,0-.16,0-.08,0,0,.05.13.13.08.06.24.17c.17.12.35.22.52.33a5.17,5.17,0,0,0,2.1.68,11.22,11.22,0,0,0,1.62.08,4.73,4.73,0,0,1,.62,0h0a5.76,5.76,0,0,1-2.27.19,5.19,5.19,0,0,1-2.25-.6,6.32,6.32,0,0,1-.56-.33l-.3-.18c-.14-.11-.29-.21-.42-.32a8.09,8.09,0,0,1-.75-.64l-.35-.32,0,0,0,0,0,0Z"/>
+                    <path class="cls-20"
+                          d="M65.1,82.1c0-.15,0-.37,0-.69,0-.6,0-1.52.08-2.83a25.11,25.11,0,0,1,.33-2.81,1.48,1.48,0,0,0,0-.27l.28-.25.32-.32a.73.73,0,0,1,0,.12.8.8,0,0,1,0,.44,2.9,2.9,0,0,1-.16.41,7,7,0,0,0-.65,2.7,9.38,9.38,0,0,0,.25,2.79,2.5,2.5,0,0,0,.2.57c-.39.06-.59.13-.61.09s0,0,.06,0a.25.25,0,0,0,.13,0h0l-.32.06h0V82.1Z"/>
+                    <path class="cls-20"
+                          d="M65,2.81c.09-.9.17-1.29.17-1.29l.1-1.1.43,0,.65.05a2.59,2.59,0,0,0,.28,0h.31L68.16.37l.08.64L68,2A.28.28,0,0,1,68,2s0,.07,0,.09,0,0,.11,0a1.94,1.94,0,0,1,.46.33c-.43.08-.87.18-1.32.25a3,3,0,0,1-.43.06l-.46,0h-.76Z"/>
+                    <path class="cls-20"
+                          d="M65,34a2.23,2.23,0,0,1-.89,0,6.6,6.6,0,0,0,.84-.16h0l.27-.05A1.88,1.88,0,0,1,65,34Z"/>
+                    <path class="cls-20" d="M64.36,42.92a.25.25,0,0,1,0,.09.08.08,0,0,1,0,0l-.08.05v0l.17-.18Z"/>
+                    <path class="cls-20"
+                          d="M64.47,6.11c-.07-1.52-.17-2.6-.26-3.32h0l.74,0c-.09,1-.19,2.51-.18,4.74,0,0,0-.24-.09-.46S64.56,6.42,64.47,6.11Z"/>
+                    <path class="cls-20"
+                          d="M64.19,43.08c0-.19-.09-.36-.15-.55a.29.29,0,0,1,.28.48.25.25,0,0,0,0-.09v0Z"/>
+                    <path class="cls-20" d="M64.28,43.05a.2.2,0,0,1-.15.07l.07,0Z"/>
+                    <path class="cls-20" d="M64.19,43.08v0h0Z"/>
+                    <path class="cls-20" d="M64.21,2.79A11.32,11.32,0,0,0,64,1.53h1.17s-.08.39-.17,1.29l-.74,0Z"/>
+                    <path class="cls-20"
+                          d="M63.8,42.74l0-.06a.31.31,0,0,1,.15-.12l.05,0h0c.06.19.1.36.15.55l0,0h0l-.07,0h0a.28.28,0,0,1-.33-.35Z"/>
+                    <path class="cls-20" d="M64,42.56a.31.31,0,0,0-.15.12.25.25,0,0,1,.18-.14h0Z"/>
+                    <path class="cls-20" d="M64.28,46.85a.3.3,0,0,1-.44-.37Z"/>
+                    <path class="cls-20" d="M63.92,46.38a.3.3,0,0,1,.42.42l0,0,0,0-.44-.37a.19.19,0,0,1,.06-.07Z"/>
+                    <path class="cls-20"
+                          d="M63.54,24.54h.29l.29.18a5.29,5.29,0,0,1,1.67,2.12l.39.8c.34.73.43,1,.86,2.07,0,.05,0,.11,0,.15v.21a22.94,22.94,0,0,0-1.45-3.34l-.09-.15-.24-.45L65.17,26a4.33,4.33,0,0,0-.85-1A6.68,6.68,0,0,0,63.54,24.54Z"/>
+                    <path class="cls-20" d="M64.13,43.12c-.26.1-.4-.17-.33-.38v0A.28.28,0,0,0,64.13,43.12Z"/>
+                    <path class="cls-20"
+                          d="M70.72,83.58h0Zm-8-10.71c0-.22,0-.42-.05-.57.32,0,.65-.06,1-.12,0,.16,0,.36,0,.61,0,.62.12,1.49.2,2.56,0,.53.09,1.11.14,1.73l.09.84c0,.14.05.21.07.3l0,.24c0,.17.08.34.11.5.22,1,.44,2.16.67,3.24h0l.18.87,1.49.82,2.42,0a2.26,2.26,0,0,0,1.07-.11,1,1,0,0,0,.36-.3l.09-.11a0,0,0,0,0,0,0,.28.28,0,0,1,0,.11h0l.27.19c.09-.1,0-.36-.13-.59a.35.35,0,0,1,.05-.08l.29-.49.09-.15,0,.08.3-.14a1.31,1.31,0,0,0-.17-.23L71.27,82a1.18,1.18,0,0,0-.32-.66.72.72,0,0,0-.73-.28,7.83,7.83,0,0,0-.86.38,9.26,9.26,0,0,1-1.63.62,5.7,5.7,0,0,1-1.35,0c-.36,0-.64,0-.84,0h-.09l.21,0,.15,0h.09V82h0l.48-.06a6,6,0,0,0,1.28-.11,9.28,9.28,0,0,0,1.53-.68,6.59,6.59,0,0,1,.92-.45,1.08,1.08,0,0,1,.64,0,1.4,1.4,0,0,1,.52.33,1.76,1.76,0,0,1,.53,1.14.67.67,0,0,1,0,.39c-.06.12-.09.2-.14.29s-.19.35-.29.52-.21.35-.34.53a1.52,1.52,0,0,1-.55.48,3,3,0,0,1-1.34.21l-2.58,0-2-1c-.35-1.53-.69-3-1-4.43-.08-.31-.15-.62-.23-.92a1.12,1.12,0,0,1,0-.21l0-.13,0-.24c0-.16,0-.32-.06-.48-.06-.62-.12-1.2-.17-1.74C62.88,74.36,62.79,73.48,62.74,72.87Z"/>
+                    <path class="cls-20"
+                          d="M63.36,46.07c-.12-.1-.23-.21-.35-.3a11.07,11.07,0,0,1,1.34-.62c.44-.12.75-.09.75,0s-.29.11-.66.29S63.76,45.81,63.36,46.07Z"/>
+                    <path class="cls-20"
+                          d="M63.6,103.49c.15-.25.35-.62.6-1s.51-.93.76-1.47a5.53,5.53,0,0,0,.33-.85,5,5,0,0,0,.17-.92,3.56,3.56,0,0,0-.12-1.79,4.35,4.35,0,0,0-.91-1.32,2.7,2.7,0,0,0-.75-.57,1.31,1.31,0,0,0,.27-.06,2.77,2.77,0,0,1,.66.45,4.13,4.13,0,0,1,1.06,1.35,4,4,0,0,1,.26,2,9.76,9.76,0,0,1-.14,1,6.81,6.81,0,0,1-.33.93c-.24.57-.5,1.09-.73,1.54s-.37.7-.5,1c-.26,0-.51.07-.77.09A2.4,2.4,0,0,0,63.6,103.49Z"/>
+                    <path class="cls-20"
+                          d="M63.59,104.25c-.17-.07-.27-.21-.22-.32a.65.65,0,0,0,.09-.16c.26,0,.51,0,.77-.09l-.06.12-.2.41C63.93,104.3,63.76,104.31,63.59,104.25Z"/>
+                    <path class="cls-20"
+                          d="M64.23,47.57a15.8,15.8,0,0,1-1.3-1.22l.17-.11.26-.17.48.41a.3.3,0,0,0,.44.37l.3.22a2.59,2.59,0,0,0,.57.27l.26.09a4.17,4.17,0,0,0,.92.19,7.45,7.45,0,0,0,2-.12,3.88,3.88,0,0,0,1.82-.81c.43-.35.62-.71.68-.65a.68.68,0,0,1-.1.25,2.24,2.24,0,0,1-.41.58,2.7,2.7,0,0,1-.53.46h0l-.08,0h0v-.11h-.15l-.09,0h0l-.09.06a.31.31,0,0,0-.13.25v.06a12.74,12.74,0,0,0-1.4.35,6.46,6.46,0,0,1-1.37.28h-.17a4,4,0,0,1-1.07-.17A3.79,3.79,0,0,1,64.23,47.57Z"/>
+                    <path class="cls-20"
+                          d="M62.69,72.3c0-.26,0-.4,0-.44h.57l.37,0h0v0a1.23,1.23,0,0,0,0,.17v.09C63.34,72.24,63,72.27,62.69,72.3Z"/>
+                    <path class="cls-20" d="M62.58,46l.29-.15.14-.07c.12.09.23.2.35.3l-.26.17-.17.11-.28-.29Z"/>
+                    <path class="cls-20"
+                          d="M63.09,95.46s.13-.16.44-.13a1.26,1.26,0,0,1,.42.13,1.31,1.31,0,0,1-.27.06l-.17-.06A.8.8,0,0,0,63.09,95.46Z"/>
+                    <path class="cls-20"
+                          d="M62.26,2.86l-.17-.16.94,0a13.83,13.83,0,0,1,1.44,3.38c0,.45,0,.94,0,1.47,0-.06,0-.24-.09-.43A8.5,8.5,0,0,0,62.26,2.86Z"/>
+                    <path class="cls-20" d="M62.58,46l-1-1.08.35-.12,1.07.94s0,0,0,0l-.14.07Z"/>
+                    <path class="cls-20"
+                          d="M64,63.47l.28,0h0a.3.3,0,0,1,0-.11s0,0,0,0a.45.45,0,0,1-.06-.09s0,0,0,0l-.13.08Zm-1.18.2a.82.82,0,0,1,.52-.47,3.31,3.31,0,0,1,.68,0,2.66,2.66,0,0,1,.31,0,.29.29,0,0,1,.15,0,.18.18,0,0,1,.06.23c0,.07-.06.06-.09.08l0,0a.1.1,0,0,0-.08,0,1.63,1.63,0,0,1-.62.28,2.44,2.44,0,0,1-.94.07S62.76,63.84,62.83,63.67Zm0,.28a0,0,0,0,0,0,0h0c.11,0,.49-.14.85-.26a1.07,1.07,0,0,0,.35-.2,3.94,3.94,0,0,0-.6,0c-.35,0-.53.41-.6.5h0S62.79,63.94,62.79,64Z"/>
+                    <path class="cls-20"
+                          d="M62.2,34.09h.47l.55,0,.5,0h.05l-.05.06c-.35,0-.71,0-1.06.07a.26.26,0,0,0-.17.07A2.64,2.64,0,0,1,62.2,34.09Z"/>
+                    <path class="cls-20" d="M61.63,47.2l-.73-.29.54-.3c.31-.18.72-.39,1.14-.62l.07.07.28.29Z"/>
+                    <path class="cls-20" d="M62.43,72.32c0-.29.08-.45.11-.45s.07.16.08.44Z"/>
+                    <path class="cls-20"
+                          d="M62.78,2.34A7.83,7.83,0,0,0,62,1.39l-.26-.28.16-1c.41,0,1.32.13,2.5.27l.83.08-.1,1.1H64a11.32,11.32,0,0,1,.22,1.26L63,2.73Z"/>
+                    <path class="cls-20"
+                          d="M61.6,77.87l0-.27c.21-1.44.42-2.87.58-3.94.08-.56.15-1,.2-1.34h.19c0,.91-.08,3.14-.28,5.39l0,.27v.08a.92.92,0,0,1-.06.22h0s0,0,0,0h0a0,0,0,0,0,0,0h0s0,0,0,0l0,0h0l0,0a.75.75,0,0,1-.09-.09h0l0,0,0,0,0,0H61.8a.66.66,0,0,0-.16-.15l0,0,0,0,0,.07h0Z"/>
+                    <path class="cls-20"
+                          d="M61.41,2.21l-.3-.14.66-1,.26.28a7.83,7.83,0,0,1,.75,1l.25.39-.94,0A3.67,3.67,0,0,0,61.41,2.21Z"/>
+                    <path class="cls-20"
+                          d="M61.9,44.79l-.48-.4,1-.28c.25-.06.5-.12.74-.16a15.2,15.2,0,0,1,2.28-.37c.07,0,.11,0,.11,0s-1.51.48-3,1Z"/>
+                    <path class="cls-20"
+                          d="M64.36,48.6a16.2,16.2,0,0,1-3.42-1,.67.67,0,0,0,.17-.1l.52-.35a14.41,14.41,0,0,0,2.81.9,9.52,9.52,0,0,0,1.93.13h.09a8,8,0,0,0,2-.27,4.48,4.48,0,0,0,.78-.28v0a8.75,8.75,0,0,1-1.34.5c-.21.08-.44.17-.7.25a.2.2,0,0,1,.08-.08l.09,0h.06l-.29-.1a5.19,5.19,0,0,0-.48.24,2,2,0,0,0-.59,0s.18.14.22.2A9.28,9.28,0,0,1,64.36,48.6Z"/>
+                    <path class="cls-20"
+                          d="M61.38,67.49a1.22,1.22,0,0,1,.36-1,1,1,0,0,1,.78-.31l.37,0a3.49,3.49,0,0,1,.52.13c.1,0,.23.15.22.28a.39.39,0,0,1-.1.19l-.09.1a2.68,2.68,0,0,1-.42.31,1.18,1.18,0,0,1-.77,0s.34-.07.68-.21c.1-.09.24-.22.34-.33l.06-.08v0l-.05,0a2.34,2.34,0,0,0-.45-.07l-.35-.06a.73.73,0,0,0-.59.17A2.13,2.13,0,0,0,61.38,67.49Z"/>
+                    <path class="cls-20" d="M61.55,44.91l-.35-.38-.06-.07.28-.07.48.4Z"/>
+                    <path class="cls-20" d="M61.14,44.46a6.65,6.65,0,0,1-.58-.66c0-.06.39.19.86.59Z"/>
+                    <path class="cls-20" d="M60.21,47.4l.37-.28.18-.12.14-.09.73.29-.52.35a.67.67,0,0,1-.17.1Z"/>
+                    <path class="cls-20"
+                          d="M59.77,82.57c.12-.31.29-.75.48-1.27l.69-1.76.39-1,.21-.51,0-.09s0,0,0,0,0,.12.07.11,0-.11.07-.08h.12l0,0,0,0,0,0h0a.75.75,0,0,0,.09.09l0,0h0l0,0s0,0,0,0h0a0,0,0,0,1,0,0h0l-.18.5c-.11.34-.22.68-.34,1l-.59,1.79c-.18.52-.32,1-.43,1.28l0,0c-.18,0-.51.09-.51.1h-.51a.19.19,0,0,1,0-.08s0,0,0-.06l0-.07v0C59.71,82.72,59.74,82.65,59.77,82.57Z"/>
+                    <path class="cls-20"
+                          d="M59.25,69.32c.06.09,0,0,0,0S59.24,69.31,59.25,69.32Zm0,.09-.1,0s0,0,0,0,0,0,0,0,0,0,0,0a.42.42,0,0,0-.06-.08s-.11-.06,0-.06a.62.62,0,0,0,.18,0,1.17,1.17,0,0,0,.46-.07s0,0,0,0,0,0,0,0a.88.88,0,0,0-.28-.12c-.08,0-.14,0-.15,0s.25-.19.56,0c.09,0,.2.11.22.2a.25.25,0,0,1-.07.24.58.58,0,0,1-.25.12l-.19,0A1.16,1.16,0,0,1,59.27,69.41Z"/>
+                    <path class="cls-20"
+                          d="M59.54,47.17c-.55-.18-1.11-.35-1.69-.52h0l.44-.3.4-.24h0l1.06.37,1.12.44-.14.09-.18.12-.37.28Z"/>
+                    <path class="cls-20"
+                          d="M59.23,48.92a17.23,17.23,0,0,1-1.8,1.48h0a8.94,8.94,0,0,1,1.49-1.81c.42-.42.85-.83,1.21-1.12a.47.47,0,0,1,.09-.06l.73.25-.45.3A15.49,15.49,0,0,0,59.23,48.92Z"/>
+                    <path class="cls-20"
+                          d="M58.4,45.58a9.83,9.83,0,0,1,1-.5s.41-.17,1-.37l.8-.25.06.07.35.38c-.37.13-.71.26-1,.38-.55.21-.91.38-.93.39s-.4.16-.9.42c-.24-.08-.48-.17-.73-.24C58.14,45.77,58.27,45.67,58.4,45.58Z"/>
+                    <path class="cls-20" d="M57.85,46.65l-.65-.18.35-.27.43-.33h0c.25.07.49.16.73.24h0l-.4.24-.44.3Z"/>
+                    <path class="cls-20" d="M56.76,71.51l.12-.28c.07.12.16.26.25.43C57,71.62,56.88,71.56,56.76,71.51Z"/>
+                    <path class="cls-20"
+                          d="M57.4,73.87c-.25-.87-.52-1.73-.67-2.29h0l0-.07c.12,0,.24.11.37.15.27.51.62,1.24.93,2s.58,1.42.76,2a9,9,0,0,1,.29,1,24.29,24.29,0,0,1,.13,3.15,9.73,9.73,0,0,1-.25,3,.13.13,0,0,0,0-.06s.11-.25-.11-.2c-.1-.49-.21-1.59-.34-2.71-.09-.75-.18-1.51-.25-2.07,0-.28-.08-.51-.11-.68s0-.25,0-.26,0-.38-.19-.93S57.61,74.59,57.4,73.87Z"/>
+                    <path class="cls-20" d="M56.7,71.48c-.08-.32-.12-.52-.09-.54s.14.09.27.29l-.12.28Z"/>
+                    <path class="cls-20"
+                          d="M56.13.22C57,.12,57.75.06,58.46,0c.94,0,1.74,0,2.31,0l.93,0,.23,0-.16,1-.66,1,.3.14a3.67,3.67,0,0,1,.68.49l-.57,0-.9-.08c-.52,0-1.27-.11-2.15-.13l-1,0c-.1-.29-.19-.54-.29-.77s-.12-.25-.18-.36a1.29,1.29,0,0,0-.3-.35l-.33-.3L56.16.44Z"/>
+                    <path class="cls-20"
+                          d="M56.26,1.74h0Zm-.48-.2L55.5,1.4l.66-1,.25.22.33.3a1.29,1.29,0,0,1,.3.35c.06.11.13.24.18.36s.19.48.29.77h-.82A3.89,3.89,0,0,0,56.44,2l-.17-.23h0s0,0,0,0h0l-.06,0Z"/>
+                    <path class="cls-20" d="M56.26,1.73h0Z"/>
+                    <path class="cls-20"
+                          d="M55.72,86.44c-.1-.15.71-.92.79-.71l-.28.37c-.19.22-.19.36-.18.38a.23.23,0,0,0,0,.12.85.85,0,0,0,.09.29c0,.08.1.17.14.24s0,0-.22,0a.68.68,0,0,1-.12-.12A.82.82,0,0,1,55.72,86.44Z"/>
+                    <path class="cls-20"
+                          d="M56.7,71.48a11.29,11.29,0,0,1-1.09-.57,3.26,3.26,0,0,0,.11-.33L57,71a1.52,1.52,0,0,0-.07.18s0,0,0,0c-.13-.2-.22-.31-.27-.29S56.62,71.16,56.7,71.48Z"/>
+                    <path class="cls-20"
+                          d="M55.54,62.68s0,.07,0,.07,0,0-.1,0,0-.08,0-.09l.07,0,.14,0c.21,0,.47,0,.73-.08a2.69,2.69,0,0,1,.78-.06,1.59,1.59,0,0,1,.3.06.37.37,0,0,1,.16.1.2.2,0,0,1,.07.15.23.23,0,0,1,0,.17.7.7,0,0,1-.17.14l-.27.21a.92.92,0,0,1-.42.2.82.82,0,0,1-.44-.11l-.31-.14c-.18-.1-.3-.16-.29-.18s.14,0,.33.05l.34.1a.72.72,0,0,0,.34.05c.18,0,.36-.29.53-.42s0,0,0,0h0l-.19,0a2.74,2.74,0,0,0-.71,0,4.44,4.44,0,0,1-.75,0Z"/>
+                    <path class="cls-20"
+                          d="M55.22,84.56a2.87,2.87,0,0,1,.79-.34c.77-.46,1.2-.77,2-1.3l.57-.29.28-.11c0,.17.06.27.09.27a12,12,0,0,1-1.75,1.15s-1.93.78-2,.62Z"/>
+                    <path class="cls-20"
+                          d="M55.18,95.46s.16,0,.37.14l.08.05-.17,0a.38.38,0,0,0-.1,0C55.26,95.51,55.18,95.47,55.18,95.46Z"/>
+                    <path class="cls-20"
+                          d="M54.85,85.94a1.91,1.91,0,0,0-.22.4l-.07.13a1.12,1.12,0,0,0-.07.29.45.45,0,0,0,0,.16h0s-.07,0-.1,0l-.12-.16a1,1,0,0,1,.08-.53,1.62,1.62,0,0,1,.1-.15,1.1,1.1,0,0,1,.26-.27c.21-.18.48-.25.49-.2S55,85.75,54.85,85.94Z"/>
+                    <path class="cls-20"
+                          d="M54.21,48.94a17.91,17.91,0,0,1,2.42-2l.57-.44.65.18-1,.64A20.84,20.84,0,0,1,54.21,48.94Z"/>
+                    <path class="cls-20"
+                          d="M53.91,69l.15-.25a.23.23,0,0,0,.18,0l.23.18h0a.42.42,0,0,1-.28.1A.57.57,0,0,1,53.91,69Z"/>
+                    <path class="cls-20"
+                          d="M54,87.35c-.18-.29-.37-.59-.55-.86v-.23s0-.12,0-.16l.06-.31a2.37,2.37,0,0,1,.18-.55,1.34,1.34,0,0,1,.68-.72,1.55,1.55,0,0,1,.81,0h0a.92.92,0,0,0-.69.19,1,1,0,0,0-.45.63,2.25,2.25,0,0,0-.11.48,2.45,2.45,0,0,0,0,.27v.21l.29.39a.06.06,0,0,0,0,0c0,.3.27.48.3.45s0-.15-.06-.3l.18,0,.45.07.92.12c.14.14.29.22.32.19s0-.09-.1-.19h0l0,0,.09-.08.18-.16L58,85.68l1.12-.94.51-1.63s0,0,0-.14v0a.19.19,0,0,0,0,.08h.86l.12,0h0v0h0v0h0l0,.08v0a1.43,1.43,0,0,1,0,.17l-.18.52-.49,1.36c-.79.59-1.79,1.36-2.82,2.15l-.43.33a.25.25,0,0,1-.08,0h0l-.09,0h-.07l-.13,0a1.43,1.43,0,0,1-.29,0c-.32,0-.63-.12-.93-.18l-.45-.1-.24-.06-.17,0S54.05,87.41,54,87.35Z"/>
+                    <path class="cls-20"
+                          d="M53.76,103.17l-.7-.13A11,11,0,0,1,54,102a8.63,8.63,0,0,0,1.71-2.48A5.15,5.15,0,0,0,56,96.53a1.75,1.75,0,0,0-.59-.93.38.38,0,0,1,.1,0l.17,0a1.8,1.8,0,0,1,.56.8,5.16,5.16,0,0,1-.08,3.17,9,9,0,0,1-1.68,2.72c-.28.34-.51.6-.65.8C53.78,103.16,53.77,103.17,53.76,103.17Z"/>
+                    <path class="cls-20"
+                          d="M50.81,43.3c.88-.31,1.75-.56,2.44-.74s1.36-.29,1.39-.3.59-.09,1.41-.14a18.94,18.94,0,0,1,3,.06,17.42,17.42,0,0,1,2.26.38l.62.15a4.16,4.16,0,0,1,1.24.48s0,0,0,0-.59-.12-1.26-.23A21.45,21.45,0,0,0,59,42.65a20.34,20.34,0,0,0-2.89.07c-.8.09-1.33.17-1.36.19s-.57.06-1.35.24c-.54.11-1.2.27-1.9.46Z"/>
+                    <path class="cls-20"
+                          d="M53.36,68c.18-.12.21-.21.21-.24l-.06-.19.21,0h.84a.17.17,0,0,1,.18.12A1.55,1.55,0,0,1,54.48,69h0l-.23-.18,0,0a1.4,1.4,0,0,0,.21-.91c-.17,0-.47,0-.65,0a.67.67,0,0,1-.27.33Z"/>
+                    <path class="cls-20" d="M53.57,68.18l-.08.06L53.32,68l0,0Z"/>
+                    <path class="cls-20"
+                          d="M53,103.12a.59.59,0,0,1,.05-.08l.7.13-.19.29c0,.07-.2.05-.36,0S53,103.21,53,103.12Z"/>
+                    <path class="cls-20"
+                          d="M52.49,30.69c0-.11,0-.19,0-.29s.09-.36.13-.54c.11-.35.24-.7.38-1a11.22,11.22,0,0,1,2.58-3.54,11,11,0,0,1,1.67-1.37,6.51,6.51,0,0,1,1.94-1,4.91,4.91,0,0,1,2.12-.1,7.73,7.73,0,0,1,1.87.6,10.16,10.16,0,0,1,1.62.87A5.34,5.34,0,0,1,66,25.61a10.8,10.8,0,0,1,1.14,2.52,16.49,16.49,0,0,1,.59,2.52,3.9,3.9,0,0,1-.18,2s0-.75,0-.76a17.77,17.77,0,0,0-.48-1.77v-.21s0-.1,0-.15c-.43-1.11-.52-1.34-.86-2.07l-.39-.8a5.29,5.29,0,0,0-1.67-2.12l-.29-.18h-.29l-.65-.32a5,5,0,0,0-3.45-.5,8.45,8.45,0,0,0-3.31,2.09,10.62,10.62,0,0,0-2.48,3.28,6.91,6.91,0,0,0-.37.95c-.05.16-.09.32-.13.48l0,.24,0,.09.28.22.41.32.85.6h0a9.23,9.23,0,0,0,2.41,1.09,22.51,22.51,0,0,0,2.47.64,15.88,15.88,0,0,0,2.67.36,2.64,2.64,0,0,0,.29.15.26.26,0,0,1,.17-.07c.35,0,.71-.06,1.06-.07l.05-.06h.16l.14,0A2.23,2.23,0,0,0,65,34a1.88,1.88,0,0,0,.24-.18,3.88,3.88,0,0,0,.65-.15l.17-.16c.23-.1.44-.2.62-.3a9.45,9.45,0,0,0,.92-.58s-.23.33-.85.72a7.36,7.36,0,0,1-2.83,1,12.77,12.77,0,0,1-4.43-.18,23.55,23.55,0,0,1-2.54-.58,9.39,9.39,0,0,1-2.61-1.13h0l-.86-.58L53,31.55l-.21-.16-.34-.27C52.46,31,52.48,30.83,52.49,30.69Z"/>
+                    <path class="cls-20"
+                          d="M52.42,47.22a6.31,6.31,0,0,0-.48-.84l.52-1a.82.82,0,0,1,.21.19,1.35,1.35,0,0,1,.17.34,2.81,2.81,0,0,1,.08.31C52.78,46.47,52.61,46.81,52.42,47.22Z"/>
+                    <path class="cls-20"
+                          d="M52.33,68.31a.74.74,0,0,0,.12-.6A9.85,9.85,0,0,1,52,66.3l.13-.07a7,7,0,0,0,1.1,1.61l.14.13,0,0,.17.24.08-.06c.21.21.44.41.67.61a.23.23,0,0,1-.18,0l-.15.25a.57.57,0,0,0,.28.08.42.42,0,0,0,.28-.1l.61.47a10.13,10.13,0,0,0,4.36,2,13.65,13.65,0,0,0,2.4.12,16.42,16.42,0,0,0,2.35-.22A5.89,5.89,0,0,0,68,69.45a27.21,27.21,0,0,0,2.4-3.28,15.19,15.19,0,0,0,2.22-5.6c.23-1.45.13-2.3.2-2.3a2.49,2.49,0,0,1,.09.6,2.06,2.06,0,0,1,0,.26c0,.15,0,.3,0,.48a6.06,6.06,0,0,1-.06,1,4.65,4.65,0,0,1-.08.61h-.14s0,0,.13.06a15.6,15.6,0,0,1-2,5.15c-.32.55-.67,1.11-1.07,1.68.09-.34.12-.56.06-.58s-.67,1-1.22,2l-.29.52h0a4.94,4.94,0,0,1-1.66,1.26,9.17,9.17,0,0,1-2.31.74l-.66.11v-.09a1.23,1.23,0,0,1,0-.17v0h0l-.37,0h-.57s0,.18,0,.44h-.07c0-.28,0-.43-.08-.44s-.06.16-.11.45a5.44,5.44,0,0,1-.57,0,14.65,14.65,0,0,1-2.55-.07,8.75,8.75,0,0,1-2.18-.62c-.09-.17-.18-.31-.25-.43s0,0,0,0A1.52,1.52,0,0,1,57,71l-1.24-.45a3.26,3.26,0,0,1-.11.33c-.37-.22-.73-.46-1.08-.71a16.79,16.79,0,0,1-2-1.68Z"/>
+                    <path class="cls-20" d="M52.07,45l.11-.23,1.18.58-.07.14c-.27-.09-.47-.18-.7-.28Z"/>
+                    <path class="cls-20"
+                          d="M51.43,70.37a2.09,2.09,0,0,1-.29-.32l0-.12v0A7,7,0,0,0,52,68.85l0,.11a.66.66,0,0,0,.24.45.48.48,0,0,0,0,.13l.28.46c.21.34.45.64.4.81s-.57.12-1-.1A4.77,4.77,0,0,1,51.43,70.37Z"/>
+                    <path class="cls-20"
+                          d="M51.49,67.16c.41-.68.45-1,.5-.86a9.85,9.85,0,0,0,.46,1.41.74.74,0,0,1-.12.6A7.68,7.68,0,0,1,51.49,67.16Z"/>
+                    <path class="cls-20"
+                          d="M54.34,4.36a11.85,11.85,0,0,0-2.57-.83l-.55-.1.28-.12.4-.16L52.27,3l.11,0a19.19,19.19,0,0,1,2.06.95,13.77,13.77,0,0,1,1.62,1l.88.65L57.4,6l.35.28.15.13c.3.25.55.51.58.54s0-.05,0-.13l-.09-.27a2.94,2.94,0,0,0-.12-.31c-.23-.64-.65-1.76-1-2.46a12.09,12.09,0,0,0-.61-1.28h.82c.12.33.24.71.37,1.13.26.88.58,1.93.95,3.18a1.15,1.15,0,0,0,0,.3,1.22,1.22,0,0,0,0,.26c0,.08.07.27,0,.11a2.37,2.37,0,0,0-.74-.52l-.25-.23c-.2-.17-.39-.32-.58-.46l-.45-.34-.86-.6A11.57,11.57,0,0,0,54.34,4.36Z"/>
+                    <path class="cls-20"
+                          d="M51.23,44.61,50,44.06l.61-.19.92-.26.15.07,1.33.59.64.28c.19.07.44.13.67.2,1.25.35,2.51.72,3.71,1.11h0l-.43.33-.35.27c-1-.28-2.09-.55-3.16-.82-.24-.06-.47-.11-.74-.2h0l.07-.14-1.18-.58-.11.23C51.79,44.84,51.52,44.72,51.23,44.61Z"/>
+                    <path class="cls-20"
+                          d="M51.62,64.7a.76.76,0,0,1-.21-.1c0-.15-.11-.29-.15-.43l.06,0a1.51,1.51,0,0,0,.41.18.48.48,0,0,1,.18.11.45.45,0,0,1,.17.41.37.37,0,0,1-.27.31.24.24,0,0,1-.14,0,.08.08,0,0,1,0,0c.06-.06.23-.15.2-.29a.23.23,0,0,0-.13-.16A.26.26,0,0,0,51.62,64.7Z"/>
+                    <path class="cls-20"
+                          d="M51,69.63a1.49,1.49,0,0,1,.1-.8c.19-.51.61-.83.75-.71s.1.42.14.73a7,7,0,0,1-.93,1.06A1.33,1.33,0,0,1,51,69.63Z"/>
+                    <path class="cls-20"
+                          d="M50.6,51.3c.1-.32.2-.62.31-.91a3.17,3.17,0,0,0,.72.4,4.79,4.79,0,0,0,1.8.19l.6,0,.51,0,.55-.08.3,0c.09,0,0,0-.06,0l-.14,0-.09,0a2.87,2.87,0,0,1-.52-.28l-.21-.16a3.11,3.11,0,0,1-.28-.23,4.39,4.39,0,0,1-.8-1c-.39-.68-.64-1.25-.86-1.69v0c.19-.41.36-.75.5-1,.06.21.11.45.18.75a11.83,11.83,0,0,0,.55,1.74,3.84,3.84,0,0,0,.23.45,3.46,3.46,0,0,0,.42.57l.24.23a2.34,2.34,0,0,0,.38.28,3.42,3.42,0,0,0,.8.43l.17.07s.16.09.17.11.12,0,.15,0,.12,0,0,.06l-.48.09-.88.16-.82.14-.62.09a6.94,6.94,0,0,1-2,.08A4.88,4.88,0,0,1,50.6,51.3Z"/>
+                    <path class="cls-20"
+                          d="M51.26,64.17c0,.14.1.28.15.43a.82.82,0,0,1-.25-.21,3,3,0,0,0-.21-.24c-.06-.05-.12-.05-.12-.08s.06-.07.17,0A.91.91,0,0,1,51.26,64.17Z"/>
+                    <path class="cls-20"
+                          d="M50.6,51.3a3.49,3.49,0,0,1-.74-.34l.81-.85a1.15,1.15,0,0,0,.24.28C50.8,50.68,50.7,51,50.6,51.3Z"/>
+                    <path class="cls-20" d="M49.42,43.82c.32-.14.66-.26,1-.39l.38-.13h0l.68.31-.92.26-.61.19Z"/>
+                    <path class="cls-20"
+                          d="M50,70.16l-.44-.48,0,0,.17-.19c.3-.28.48-.45.51-.49a11.63,11.63,0,0,0,1.33-1.81,7.68,7.68,0,0,0,.84,1.15,3.15,3.15,0,0,1-.31.54c0-.31,0-.64-.14-.73s-.56.2-.75.71a1.49,1.49,0,0,0-.1.8,1.33,1.33,0,0,0,.06.28l0,0-.65.61a1.43,1.43,0,0,1-.35-.26Z"/>
+                    <path class="cls-20"
+                          d="M50.39,2.32l-.47-.14h0c.26-.16.53-.31.8-.45l.41-.22.46-.22A15.63,15.63,0,0,1,55.26.33l.87-.11,0,.22-.66,1,.28.14.38.2.06,0h0s0,0,0,0h0l.17.23a3.89,3.89,0,0,1,.25.42l-1.19,0A15.6,15.6,0,0,0,52.38,3l-.5-.19C51.21,2.56,50.71,2.41,50.39,2.32Z"/>
+                    <path class="cls-20"
+                          d="M50,58.05h.1a9.74,9.74,0,0,0,1.23-.12,7.16,7.16,0,0,0,2.06-.64,17.43,17.43,0,0,0,2.46-1.67l.55-.45,0,0-.34.08-.55.14-.63.07-.82.06a11.87,11.87,0,0,1-1.45,0,7.41,7.41,0,0,1-2.14-.42l-.51-.21a9.46,9.46,0,0,1,.12-1.07,3.14,3.14,0,0,0,.68.53,5.23,5.23,0,0,0,1.84.65,9.72,9.72,0,0,0,1.41.1l.81,0c.34,0,.76-.05,1.16-.09a7.92,7.92,0,0,0,1-.07l0,0a7.13,7.13,0,0,0-.56.59c-.31.26-.48.48-.79.72l-.74.6c-.45.35-.87.65-1.28.91a10.47,10.47,0,0,1-2.1,1c-.56.2-1,.31-1.21.39l-.13,0C50.07,58.77,50,58.4,50,58.05Z"/>
+                    <path class="cls-20"
+                          d="M49.19,71.7l1.23-1.16,0,0h0a.22.22,0,0,0-.06.07,1.38,1.38,0,0,0-.15.3.73.73,0,0,0,.12.82,3.33,3.33,0,0,0,.26.24l.29.23.52.4c.33.23.55.35.54.43s-.32.14-.74,0a5.06,5.06,0,0,1-.69-.23l-.37-.17a2,2,0,0,1-1-1Z"/>
+                    <path class="cls-20"
+                          d="M49.78,3.34,49.9,2.2s0,0,0,0l.47.14c.32.09.82.24,1.49.48l.5.19-.11,0-.37.12-.4.16-.28.12a9.6,9.6,0,0,0-1-.09h-.47Z"/>
+                    <path class="cls-20"
+                          d="M49.62,50.31c.06-.19.13-.37.19-.55.37-.16.61-.23.64-.18S50.13,49.91,49.62,50.31Z"/>
+                    <path class="cls-20"
+                          d="M49.93,54.87a4.15,4.15,0,0,1-1-.63l.9-.76a.84.84,0,0,0,.25.32A9.46,9.46,0,0,0,49.93,54.87Z"/>
+                    <path class="cls-20" d="M50.12,59.13l-.26.08L49.73,58H50C50,58.4,50.07,58.77,50.12,59.13Z"/>
+                    <path class="cls-20"
+                          d="M49.28,60.89c0-.26-.1-.52-.14-.78a.15.15,0,0,0,0-.07v0l.14-.08h0l.05,0h0l0,0,0,0,0,0a.06.06,0,0,0,0,0l.14-.06h0l.12,0h0l0,0,0,.06a1.66,1.66,0,0,1,0,.22.9.9,0,0,1-.58.88Z"/>
+                    <path class="cls-20"
+                          d="M51,66.31a21.2,21.2,0,0,1-1.6-4.74l-.15-.68a.9.9,0,0,0,.58-.88,1.66,1.66,0,0,0,0-.22l0-.06,0,0h0s0,0,0,0v-.05h0l0-.49c0-.38,0-.75-.07-1.11h0l.13,1.17.26-.08c.1.72.23,1.46.38,2.2a24.87,24.87,0,0,0,.76,2.84A.91.91,0,0,0,51,64c-.11,0-.19,0-.17,0s.06,0,.12.08a3,3,0,0,1,.21.24.82.82,0,0,0,.25.21q.11.3.24.6s0,0,0,0h0q.12.32.27.63l.18.36L52,66.3c-.05-.11-.09.18-.5.86C51.32,66.88,51.17,66.6,51,66.31Z"/>
+                    <path class="cls-20"
+                          d="M49.15,71.59a2,2,0,0,1,0-1,3.18,3.18,0,0,1,.19-.61l.08-.16,0,0s0,0,0-.06a.38.38,0,0,1,.08-.09l.44.48.12.12a1.43,1.43,0,0,0,.35.26L49.19,71.7A.49.49,0,0,0,49.15,71.59Z"/>
+                    <path class="cls-20" d="M48.86,53.55c0-.28.08-.56.13-.83l.09-.47h0a.34.34,0,0,0,.1-.06l.56.82Z"/>
+                    <path class="cls-20"
+                          d="M48.76,54.7a10.92,10.92,0,0,1,.1-1.15l.88-.55-.56-.82a.34.34,0,0,1-.1.06,15.8,15.8,0,0,1,.54-1.93c.51-.4.85-.67.83-.73s-.27,0-.64.18c.07-.17.13-.33.2-.49.45-1,.84-1.76,1.16-2.44l.9-1.87.52.21c.23.1.43.19.7.28-.07.14-.19.39-.37.74a2.81,2.81,0,0,0-.08-.31,1.35,1.35,0,0,0-.17-.34.82.82,0,0,0-.21-.19l-.52,1a6.31,6.31,0,0,1,.48.84l-.09.18c-.32.65-.76,1.49-1.17,2.37-.08.2-.17.4-.25.62a1.15,1.15,0,0,1-.24-.28l-.81.85a3.49,3.49,0,0,0,.74.34,14.52,14.52,0,0,0-.42,1.64c0,.28-.1.57-.13.86a.84.84,0,0,1-.25-.32l-.9.76a4.15,4.15,0,0,0,1,.63,16.73,16.73,0,0,0,0,2c0,.38.05.78.1,1.17h-.31v0c-.06-.78-.1-1.54-.15-2.26l-.23-.29-.14-.19c-.09-.13-.19-.25-.27-.37S48.8,54.77,48.76,54.7Z"/>
+                    <path class="cls-20"
+                          d="M48.73,56.25a11.36,11.36,0,0,1,0-1.55c0,.07.09.14.14.21s.18.24.27.37l.14.19.23.29c.05.72.09,1.48.15,2.26v0c0,.36.05.73.07,1.11l0,.49h0l-.12.06h0l-.14.06a.06.06,0,0,1,0,0l0,0,0,0,0,0h0l-.05,0h0l-.14,0h0c0-.06,0-.14,0-.17s0,0,0,0L49,59.21l0-.29-.09-.83C48.84,57.45,48.78,56.83,48.73,56.25Z"/>
+                    <path class="cls-20" d="M48.64,80.17a1.56,1.56,0,0,1,.26,0,.89.89,0,0,1-.35.16Z"/>
+                    <path class="cls-20"
+                          d="M47.81,101.07c-.24-.14-.47-.28-.71-.44l.16,0c.25-.07.6-.18,1-.32a10,10,0,0,0,2.79-1.45,3.65,3.65,0,0,0,1.34-2.68,8.14,8.14,0,0,0,0-1.39h.06a4,4,0,0,1,.23,1.4,4.38,4.38,0,0,1-.26,1.52,3.68,3.68,0,0,1-1,1.49,10,10,0,0,1-2.88,1.66Z"/>
+                    <path class="cls-20" d="M48.4,58.23l-.09-.07h0s0,0,.07,0h0v0Z"/>
+                    <path class="cls-20"
+                          d="M48.4,58.23v0s0,0,0,0,0,0,0,0,0,0,0,0l.1.09a.13.13,0,0,1-.09.06c-.17,0-.13-.1-.16-.13a.29.29,0,0,1,0-.09.09.09,0,0,1,0-.07l.09.07Z"/>
+                    <path class="cls-20"
+                          d="M47.42,54.21a1,1,0,0,1-.06-.68c.06-.2.3-.32.48-.45l.27-.18,1-.65-.09.47c-.05.27-.09.55-.13.83l-.27.18-.28.17h0s0,0,0,0a.87.87,0,0,1,.05.12l.09.16c.09.16.2.32.32.5a11.36,11.36,0,0,0,0,1.55c0-.06,0-.1,0-.15v0L48.63,56l-.15-.19c-.1-.14-.2-.26-.3-.39a7.32,7.32,0,0,1-.52-.76l-.11-.2A2.59,2.59,0,0,1,47.42,54.21Z"/>
+                    <path class="cls-20"
+                          d="M48,74.51a3.3,3.3,0,0,1-.85-.86c.31-.31.62-.6.9-.87a.38.38,0,0,1,0,.1,2.77,2.77,0,0,0,.54.93c.53.64,1.39,1.07,1.32,1.25S48.9,75.12,48,74.51Z"/>
+                    <path class="cls-20"
+                          d="M50,44.06a19,19,0,0,0-2.08.81,8.24,8.24,0,0,0-1.12.66c-.06,0,.3-.47,1-.88a12.8,12.8,0,0,1,1.66-.83Z"/>
+                    <path class="cls-20"
+                          d="M48,82.07c-.87,1.27-1.11,2.3-1.23,2.28a3.73,3.73,0,0,1,.38-1.68,1.1,1.1,0,0,0,.31-.16.91.91,0,0,0-.26,0,6.33,6.33,0,0,1,.36-.75,9.07,9.07,0,0,1,1-1.51.89.89,0,0,0,.35-.16,1.56,1.56,0,0,0-.26,0c.75-1,1.67-1.94,2.56-2.89.71-.77,1.34-1.56,1.94-2.34a22.81,22.81,0,0,0,1.51-2.14,10.85,10.85,0,0,0,.83-1.59c.05-.11.09-.22.13-.3a11.29,11.29,0,0,0,1.09.57l0,.1h0l-.07.15a13.21,13.21,0,0,1-1,1.73A24.75,24.75,0,0,1,54,75.63c-.64.75-1.36,1.56-2.12,2.29A28.55,28.55,0,0,0,48,82.07Z"/>
+                    <path class="cls-20"
+                          d="M47.46,82.51a1.1,1.1,0,0,1-.31.16,1.17,1.17,0,0,1,.05-.11A.91.91,0,0,1,47.46,82.51Z"/>
+                    <path class="cls-20"
+                          d="M47,73.32a4.91,4.91,0,0,1-.21-.45l.07,0a1.19,1.19,0,0,0,.16-.08l.13-.07.77-.42a.82.82,0,0,1,.09.26c0,.07,0,.16.06.25-.28.27-.59.56-.9.87a.08.08,0,0,1,0,0l0,0A2.92,2.92,0,0,1,47,73.32Z"/>
+                    <path class="cls-20" d="M47,89.59c.1-.21.16-.33.18-.32a1.6,1.6,0,0,1-.12.43Z"/>
+                    <path class="cls-20" d="M47,58.25s.06-.06.14-.14l.23-.08,0,0C47.13,58.25,47,58.25,47,58.25Z"/>
+                    <path class="cls-20"
+                          d="M46.77,101.07a.17.17,0,0,1,0-.24.15.15,0,0,1,.09-.13l.26-.07h0c.24.16.47.3.71.44l-.36.13-.42.13a.13.13,0,0,1-.13-.06C46.91,101.2,46.84,101.13,46.77,101.07Z"/>
+                    <path class="cls-20"
+                          d="M46.71,72.79c.92-1.05,1.84-2.12,2.77-3.14l0,0a.38.38,0,0,0-.08.09s0,.06,0,.06l0,0-.08.16a3.18,3.18,0,0,0-.19.61,2,2,0,0,0,0,1,.49.49,0,0,1,0,.11l-.42.4c-.22.22-.46.45-.72.68,0-.09,0-.18-.06-.25a.82.82,0,0,0-.09-.26l-.77.42-.13.07a1.19,1.19,0,0,1-.16.08l-.07,0a.08.08,0,0,1,0-.05h0Z"/>
+                    <path class="cls-20"
+                          d="M46.51,58.84a.45.45,0,0,1,0-.34,1.08,1.08,0,0,1,.54-.38h0c-.08.08-.15.12-.14.14s.15,0,.35-.19l0,0a1.29,1.29,0,0,1,.4-.07,1.08,1.08,0,0,1,.56.2.09.09,0,0,0,0,.07.29.29,0,0,0,0,.09s0,.09.16.13a.13.13,0,0,0,.09-.06,1.9,1.9,0,0,1,.25.24.45.45,0,0,1,.11.23v.07a.37.37,0,0,1,0,.11c0,.1-.07.14-.08.14s.12-.25-.12-.47-.28-.21-.44-.33a.84.84,0,0,0-.53-.19,1.7,1.7,0,0,0-.58.18c-.18.09-.35.18-.38.26s0,.14.07.21a.44.44,0,0,0,.1.08s0,.1-.06.17-.12.12-.15.09a.57.57,0,0,1-.13-.14A.62.62,0,0,1,46.51,58.84Z"/>
+                    <path class="cls-20"
+                          d="M46.93,89.4a6.24,6.24,0,0,1-.52-2v-.08c.12-.08.17-.13.16-.15l-.17.07a5.1,5.1,0,0,1,.37-2.64h0a15.28,15.28,0,0,0,.1,2.73,6.13,6.13,0,0,0,.61,1.76c.24.43.45.73.46.75l.47.78c.28.45.65,1,1.07,1.59a9.39,9.39,0,0,0,1.26,1.4c.38.33.68.52.66.56s0,0,0,0a2.12,2.12,0,0,1-.79-.37,7.45,7.45,0,0,1-1.47-1.31A18.44,18.44,0,0,1,47.9,91c-.31-.44-.51-.75-.52-.77s-.13-.21-.3-.54a1.6,1.6,0,0,0,.12-.43s-.08.11-.18.32Z"/>
+                    <path class="cls-20"
+                          d="M46.77,72.87a4.91,4.91,0,0,0,.21.45,2.92,2.92,0,0,0,.17.27l0,0c-.06-.08-.1-.15-.15-.23s-.17-.35-.21-.44a.11.11,0,0,1,0-.06h0Z"/>
+                    <path class="cls-20" d="M46.74,72.87l-.07-.05,0,0h0l0,0h0a.08.08,0,0,0,0,.05h0Z"/>
+                    <path class="cls-20" d="M46.4,87.29l.17-.07s0,.07-.16.15A.12.12,0,0,1,46.4,87.29Z"/>
+                    <path class="cls-20"
+                          d="M45.91,54.56a3.89,3.89,0,0,1-.45-.71,2.33,2.33,0,0,1-.12-.34.63.63,0,0,1,0-.26.79.79,0,0,1,.24-.67c.05,0,.09-.09.15-.13l.13-.11.28-.24c.21-.17.44-.34.69-.52.49-.35,1.05-.72,1.57-1a12.93,12.93,0,0,1,1.45-.78c-.06.18-.13.36-.19.55-.27.2-.58.45-.91.72s-1,.79-1.42,1.18l-.6.56-.25.24-.11.12s-.08.08-.06.07a.32.32,0,0,1,0,.06,1,1,0,0,0,.06.21,3.27,3.27,0,0,0,.27.52c.25.39.93.85,1.43,1.53a3,3,0,0,1,.53,1.12,5,5,0,0,1,.11,1,2.75,2.75,0,0,1,0,.41.55.55,0,0,1,0,.17.29.29,0,0,1,0,.09l0,.06h0l-.1-.09h0v0h0s0,0,0,0l-.05,0s0-.07,0-.12,0-.23-.07-.37A3.36,3.36,0,0,0,47.52,56C47.05,55.45,46.37,55.1,45.91,54.56Z"/>
+                    <path class="cls-20"
+                          d="M46,76.54a2.82,2.82,0,0,1-.87-.8l.9-1c0,.07,0,.17.1.31a2.39,2.39,0,0,0,.43.74,3.75,3.75,0,0,0,.74.58c.23.14.39.17.43.24s-.18.27-.53.26A2.44,2.44,0,0,1,46,76.54Z"/>
+                    <path class="cls-20"
+                          d="M45.76,5.53c.09-.1.18-.21.28-.31a15.45,15.45,0,0,1,2.4-2.07A16.65,16.65,0,0,1,49.9,2.2l-.12,1.14h.47a9.6,9.6,0,0,1,1,.09l-.51.22c-.52.23-1,.49-1.49.74A20.75,20.75,0,0,0,46.73,6l-.24.18a.9.9,0,0,0-.21.08,3.63,3.63,0,0,0-.46.34A1.67,1.67,0,0,0,45.76,5.53Z"/>
+                    <path class="cls-20"
+                          d="M45.4,58.74a6.14,6.14,0,0,1,.4-.86,1.74,1.74,0,0,1,.3-.36l.32-.27a3.58,3.58,0,0,1,.36-.28c.11,0,.25-.11.35,0s.15.44.21.63,0,.17,0,.25a.3.3,0,0,1,0,.21l-.23.08.1-.12c.05-.07,0-.19-.07-.34s0-.27-.15-.39-.16,0-.21.08a1.7,1.7,0,0,0-.19.19c-.05.06-.18.17-.26.25a1.36,1.36,0,0,0-.21.29,6.41,6.41,0,0,0-.31.82,3.15,3.15,0,0,0-.14.44.59.59,0,0,0,0,.35,1.07,1.07,0,0,0,.65.48,4.32,4.32,0,0,0,1,.2,9.74,9.74,0,0,0,1.08,0c.33,0,.69-.13.71-.25a0,0,0,0,0,0,0c0,.26.1.52.14.78L49.1,61a2.59,2.59,0,0,1-.66.08A9,9,0,0,1,47.27,61a5,5,0,0,1-1.13-.28,1.53,1.53,0,0,1-.92-.83,1,1,0,0,1,0-.64A3.61,3.61,0,0,1,45.4,58.74Z"/>
+                    <path class="cls-20"
+                          d="M45.1,75.57a2.12,2.12,0,0,1-.27-.49,3.87,3.87,0,0,1,.58-.25,1.87,1.87,0,0,1,.64-.16.66.66,0,0,1,0,.09l-.9,1,0,0,0,0Z"/>
+                    <path class="cls-20"
+                          d="M44.65,7.44a.23.23,0,0,1,0-.11.88.88,0,0,1,.08-.27,6.19,6.19,0,0,1,1-1.53,1.67,1.67,0,0,1,.06,1,7,7,0,0,0-.55.54l-.18.19a3.83,3.83,0,0,1-.28.29h-.05A.22.22,0,0,1,44.65,7.44Z"/>
+                    <path class="cls-20"
+                          d="M44.83,75.08a2.12,2.12,0,0,0,.27.49l.07.11,0,0a.43.43,0,0,0,0-.07,3.39,3.39,0,0,1-.29-.54Z"/>
+                    <path class="cls-20"
+                          d="M44.18,27.43a27.31,27.31,0,0,1,4.9-5.25c.85-.68,1.44-1,1.49-1.06s.51-.31,1.3-.64a16.4,16.4,0,0,1,3.33-1A27.87,27.87,0,0,1,60.05,19a9.27,9.27,0,0,1,5.51,2h0s0,0,0,0a8.75,8.75,0,0,1,2.61,3,11.8,11.8,0,0,1,1.16,3.75,31.73,31.73,0,0,1,.29,3.67,14.82,14.82,0,0,1-.17,3.36,12.48,12.48,0,0,1-2,4.7c-.7,1-1.25,1.52-1.29,1.47s.09-.14.28-.42.46-.68.76-1.2a13.51,13.51,0,0,0,1.65-4.65,13.84,13.84,0,0,0,0-3.23,34.26,34.26,0,0,0-.39-3.56,11,11,0,0,0-1.17-3.45A7.82,7.82,0,0,0,65,21.83l0,0a8.39,8.39,0,0,0-4.87-1.68,27.82,27.82,0,0,0-4.61.6,15.09,15.09,0,0,0-3.07,1c-.71.31-1.09.57-1.14.58a15.64,15.64,0,0,0-1.37.94,23.75,23.75,0,0,0-3,2.82,23.49,23.49,0,0,0-1.74,2.09c-.14.2-.29.4-.43.61l-.11.14v0s0,0,0,.05l0,0,.23.27.52.6A49.34,49.34,0,0,0,50,34.51a26.4,26.4,0,0,0,2.66,2l.69.43.71.38c.47.25,1,.48,1.45.71,1.91.91,3.71,1.73,5.29,2.32A15,15,0,0,0,63,41a7.58,7.58,0,0,0,1.74.16,5.82,5.82,0,0,0,1.12-.11c.25,0,.37-.11.39-.1s-.49.39-1.5.47a7,7,0,0,1-1.82,0,11,11,0,0,1-1.26-.27l-1-.3c-1.63-.53-3.48-1.29-5.43-2.14-.49-.22-1-.43-1.49-.67L53,37.65l-.74-.43a25.94,25.94,0,0,1-2.8-2,47.56,47.56,0,0,1-4.91-4.66L44,30l-.28-.32-.46-.55s-.12-.09-.09-.14l.1-.14.2-.3.32-.46Z"/>
+                    <path class="cls-20"
+                          d="M43.41,79a3.21,3.21,0,0,1-.34-.72l.25-.31.12-.15a2.58,2.58,0,0,0,.34,1,2.44,2.44,0,0,0,.69.76,3.07,3.07,0,0,0,1.08.5,7.83,7.83,0,0,0,2.3.26,5.43,5.43,0,0,0,.79-.09l-.09.13a5.16,5.16,0,0,1-.69.14,7.09,7.09,0,0,1-2.39-.11,3.52,3.52,0,0,1-1.23-.51A2.69,2.69,0,0,1,43.41,79Z"/>
+                    <path class="cls-20"
+                          d="M43.32,77.93l-.25.31s0,0,0,0h0a2.09,2.09,0,0,1-.1-.41.22.22,0,0,1,.2-.2.26.26,0,0,1,.27.18v0Z"/>
+                    <path class="cls-20"
+                          d="M43,77.77a2.09,2.09,0,0,0,.1.41h0a1.76,1.76,0,0,1-.09-.36A.06.06,0,0,1,43,77.77Z"/>
+                    <path class="cls-20"
+                          d="M41.34,81.71a3.93,3.93,0,0,1-.28-.44l.26-.49a3.27,3.27,0,0,0,.37.66,3.35,3.35,0,0,0,2.05,1.35,6.19,6.19,0,0,0,2.55,0c.4-.07.71-.15.91-.2a1.17,1.17,0,0,0-.05.11,8,8,0,0,1-.81.28,6.31,6.31,0,0,1-2.66.17A3.74,3.74,0,0,1,41.34,81.71Z"/>
+                    <path class="cls-20"
+                          d="M40.83,80.82a2.6,2.6,0,0,0,.1-.25l0,0,.12-.28h0a.22.22,0,0,1,.1.13v0a2.52,2.52,0,0,0,.1.3l0,.07-.26.49A2.4,2.4,0,0,1,40.83,80.82Z"/>
+                    <path class="cls-20"
+                          d="M41.09,80.2s0,0,0,0h0l.48-1,.09-.12c.37-.54.69-1.1,1-1.67l.82-1.19c.43-.48.86-1,1.32-1.42.64-.65,1.26-1.33,1.87-2l0,0,0,0,.07.05h0a.11.11,0,0,0,0,.06c0,.09.11.25.21.44s.09.15.15.23c-.27.26-.54.53-.83.84l-.23.24a.73.73,0,0,0,0-.08,1.63,1.63,0,0,0-.64.16,2,2,0,0,0-.6.27.11.11,0,0,1,0,0l0,0a3.39,3.39,0,0,0,.29.54.43.43,0,0,1,0,.07c-.55.62-1.12,1.28-1.7,2v0a.26.26,0,0,0-.27-.17.22.22,0,0,0-.2.26.06.06,0,0,0,0,.06,1.76,1.76,0,0,0,.09.36c-.44.56-.88,1.15-1.29,1.78q-.24.36-.45.75l0-.08c0-.1-.06-.18-.08-.23s0-.08,0-.09A.2.2,0,0,0,41.09,80.2Z"/>
+                    <path class="cls-20"
+                          d="M43,93.66a6.89,6.89,0,0,1-1.57,0c-.29,0-.56-.07-.78-.11l-.15-.5a9.19,9.19,0,0,0,1,.17,5.82,5.82,0,0,0,1.46,0,6,6,0,0,0,1.61-.46,3.58,3.58,0,0,0,1.35-.93,2.74,2.74,0,0,0,.39-.64c.1-.23.19-.45.27-.65.18-.42.32-.76.43-1l.06.11c-.07.24-.18.57-.32,1-.07.2-.14.42-.23.66a4.16,4.16,0,0,1-.57.93,3.15,3.15,0,0,1-1.24.86A6.19,6.19,0,0,1,43,93.66Z"/>
+                    <path class="cls-20" d="M40.58,93.54c0-.16-.08-.33-.11-.49h.06l.15.5Z"/>
+                    <path class="cls-20"
+                          d="M40.47,93.05c0,.16.07.33.11.49l.1,0c.21.7.41,1.33.48,1.5a2.87,2.87,0,0,1,.16.57l.1.46c.07.31.14.61.2.92L42,98.89l.06.3,0,.07s0,0,0,0l.08-.1.6-.77.57-.74.39.84.8,1.7c0-.52,0-1,0-1.56.44.39.92.84,1.34,1.17.2.17.44.34.62.47l.35.24a1.82,1.82,0,0,0,.23.15l-.26.07a.15.15,0,0,0-.09.13.17.17,0,0,0,0,.24c.07.06.14.13.13.2a.13.13,0,0,0,.13.06l.42-.13.36-.13.52.3a13.84,13.84,0,0,0,3.16,1.3c.52.14,1,.26,1.57.37a.59.59,0,0,0-.05.08c0,.09,0,.23.2.31s.32.1.36,0l.19-.29c1.56.29,3.17.49,4.78.74l.9.14.2,0h.29l.32,0c.6,0,1.21-.08,1.81-.13l1.4-.14a.65.65,0,0,1-.09.16c0,.11.05.25.22.32s.34,0,.38,0l.2-.41.06-.12,1.45-.19c1.2-.18,2.4-.4,3.57-.68a18.23,18.23,0,0,0,3.39-1.13h0l3.17-1.25c1.09-.21,2-.36,3-.57.47-.13,1-.24,1.42-.41l.7-.23.68-.28a15.53,15.53,0,0,0,4.84-3.18,12,12,0,0,0,3.07-4.7A9.71,9.71,0,0,0,90,89.72a5.09,5.09,0,0,0,.12-.68l.05-.34c0-.12,0-.14,0-.21L89.84,88a5.27,5.27,0,0,0-.43-.51,4.5,4.5,0,0,0-1-.81A4.22,4.22,0,0,0,86,86.22a8.86,8.86,0,0,0-2.52.62c-.8.31-1.58.72-2.36,1.09s-1.54.76-2.29,1.13c-3,1.53-5.8,3-8.48,4.21A35,35,0,0,1,64,95.46a1.26,1.26,0,0,0-.42-.13c-.31,0-.46.11-.44.13a.8.8,0,0,1,.42,0l.17.06c-.32.08-.64.14-1,.19a18.51,18.51,0,0,1-6.09.11l-1-.17-.08-.05c-.21-.14-.36-.16-.37-.14s.08.05.18.14c-.33-.09-.63-.17-.91-.26l-1.59-.46-.43-.13s0-.07,0-.07,0,0,0,.06c-.19-.07-.36-.11-.48-.16a.93.93,0,0,1-.32-.12l.34.07,1,.23,1.6.4,1,.26,1.18.16a18.8,18.8,0,0,0,6-.23,32.75,32.75,0,0,0,7.45-2.52c2.64-1.2,5.41-2.73,8.4-4.3.74-.38,1.5-.78,2.29-1.15s1.55-.8,2.4-1.13a9.58,9.58,0,0,1,2.7-.7,4.68,4.68,0,0,1,4,1.48,6.57,6.57,0,0,1,.48.57l.47.71a2.27,2.27,0,0,1,0,.48l0,.36a6.17,6.17,0,0,1-.12.73,12.06,12.06,0,0,1-.41,1.42,12.74,12.74,0,0,1-3.22,5A16.24,16.24,0,0,1,82,99.69l-.71.31-.74.25c-.47.18-1,.29-1.48.43-1,.23-2.06.41-3,.59L73,102.49a18.53,18.53,0,0,1-3.56,1.23c-1.21.29-2.43.53-3.65.72s-2.45.33-3.67.45l-1.84.14-.31,0h-.53l-.17,0-.9-.13a65.24,65.24,0,0,1-7.18-1.22,15,15,0,0,1-3.4-1.37c-.53-.29-1-.6-1.55-.93l-.45-.31L45.7,101s0,.08,0,.11v.16c0,.5,0,1,0,1.48l.07,2.6L44.69,103c-.52-1.08-1-2.15-1.53-3.2l0,.07-.57.73c-.19.23-.4.49-.55.46a.47.47,0,0,1-.14-.08c-.1-.35-.21-.7-.34-1A25.2,25.2,0,0,0,41,95.33c-.11-.49-.92-3.6-1-4.08.08.2.33,1,.57,1.81Z"/>
+                    <path class="cls-20" d="M39.44,89.93l.39,1A5.41,5.41,0,0,1,39.44,89.93Z"/>
+                    <path class="cls-20"
+                          d="M39.41,85.33a25.39,25.39,0,0,1,1.42-4.51,2.4,2.4,0,0,0,.23.45c-.21.4-.39.81-.58,1.24a27.15,27.15,0,0,0-.87,3,4.39,4.39,0,0,0-.15,1,2.53,2.53,0,0,1-.2-.29h0C39.29,85.93,39.34,85.65,39.41,85.33Z"/>
+                    <path class="cls-20"
+                          d="M39.42,88a11.84,11.84,0,0,0,.41,2.9l-.39-1v0h0C39.47,89.6,39.43,88.85,39.42,88Z"/>
+                    <path class="cls-20"
+                          d="M39.42,87.18c0-.22,0-.44,0-.65a2.86,2.86,0,0,0,.63.65,3.84,3.84,0,0,0,2.53.76,19.34,19.34,0,0,0,2.75-.35,8.41,8.41,0,0,0,.88-.24l.15-.06a.12.12,0,0,0,0,.08,4.27,4.27,0,0,1-1,.39,14.74,14.74,0,0,1-2.78.51,4.12,4.12,0,0,1-2.81-.74A2.42,2.42,0,0,1,39.42,87.18Z"/>
+                    <path class="cls-20"
+                          d="M39.26,13.46a7.16,7.16,0,0,1,.5-1.1l.3-.48s.16-.19.38-.42a7.8,7.8,0,0,1,.82-.76h0l.55-.18c.37-.12.59-.39.52-.54.26-.13.43-.2.45-.16s-.6.58-1.16,1.18c-.28.3-.55.6-.74.85s-.3.42-.31.42l-.32.42a5.8,5.8,0,0,0-.58,1c-.38.71-.45,1.53-.54,1.53s-.1-.21-.09-.53A3.89,3.89,0,0,1,39.26,13.46Z"/>
+                    <path class="cls-20"
+                          d="M39.18,86.58l.06-.35h0a2.53,2.53,0,0,0,.2.29c0,.21,0,.43,0,.65a1.7,1.7,0,0,1-.19-.19c0-.12,0-.23,0-.35S39.18,86.6,39.18,86.58Z"/>
+                    <path class="cls-20"
+                          d="M39.42,88c0,.84,0,1.59,0,1.87a6.64,6.64,0,0,1-.24-3.24c0,.12,0,.23,0,.35a1.7,1.7,0,0,0,.19.19C39.41,87.46,39.41,87.74,39.42,88Z"/>
+                    <path class="cls-20"
+                          d="M38.59,9a4.26,4.26,0,0,1,2.6.09,2.39,2.39,0,0,1,1.15.92v0a6.79,6.79,0,0,0-1,.67l0,0h0c-.07,0-.12,0-.13,0a1,1,0,0,0-.1-.15,1.23,1.23,0,0,0-.39-.33A3.42,3.42,0,0,0,38.72,10a8.12,8.12,0,0,1-3.36-.27C35.36,9.46,37,9.3,38.59,9Z"/>
+                    <path class="cls-20"
+                          d="M35.87,29.44l-2,1.39-.42.28-.14.1-.2.15.32.07,1,.27,3.6,1c-.55.29-1.08.59-1.6.88l-.76.44-.29.17-.08.06h0s-.07,0-.06.07l.13.07c.94.6,1.8,1.13,2.52,1.58,1.45.9,2.36,1.5,2.44,1.54l1.24.86c.39.28.78.55,1.3.87s1.09.64,1.74,1c1.3.7,2.84,1.47,4.49,2.27l1.73.82-.38.13c-.35.13-.69.25-1,.39l-.79-.35c-1.69-.76-3.26-1.5-4.6-2.18-.67-.35-1.28-.68-1.83-1s-1-.64-1.38-.88l-1.24-.82L37.19,37c-.72-.46-1.56-1-2.51-1.64-.17-.13-.42-.28-.6-.44l-.22-.26a2.36,2.36,0,0,1-.15-.25c-.06-.09,0-.21,0-.28s0-.18.13-.28a1.33,1.33,0,0,1,.27-.25,2.16,2.16,0,0,1,.35-.24c.53-.34.4-.24.48-.28l.14-.07L35,33l-.05,0-.18,0-.58-.17-3.41-1,2.59-1.66.84-.53.21-.14.08,0,.15-.09.15-.1s-.08,0-.13-.07L34.46,29l-.27-.11-.44-.19a1.91,1.91,0,0,1-.31-.14,1,1,0,0,1-.28-.22.94.94,0,0,1,.12-1.27,8,8,0,0,0,1.86-3,15.93,15.93,0,0,0,.79-2.8,15.29,15.29,0,0,0,.25-2.24l.17.14h0a10.82,10.82,0,0,1-.05,2.15,15.55,15.55,0,0,1-.63,2.93A11.21,11.21,0,0,1,35,26a8.05,8.05,0,0,1-.51.83c-.1.13-.2.27-.31.4l-.16.2-.15.16a.25.25,0,0,0,0,.37.19.19,0,0,0,.09.05L34,28l.44.16,1.38.53.38.14.19.07.1,0,0,0s0,0,0,0Z"/>
+                    <path class="cls-20"
+                          d="M32.58,12.56a32,32,0,0,0,2.47,4c1.76,2.14,3,3.61,2.86,3.75s-.65-.35-1.56-1.15h0a1.86,1.86,0,0,0-.12-.56s0,.15,0,.41c-.54-.48-1.19-1.08-1.92-1.79a27.18,27.18,0,0,1-2.95-4L31.12,13l0-.07a.75.75,0,0,1-.07-.12l-.08-.19c-.1-.22-.19-.44-.28-.67a12.67,12.67,0,0,1-.44-1.4,14.19,14.19,0,0,1-.31-1.47c0-.25-.06-.51-.08-.77s0-.27,0-.4V7.7c0-.08,0-.2,0-.3a2.26,2.26,0,0,1,.37-1.11,1.92,1.92,0,0,1,1-.62l.27-.1.19-.05.36-.1.71-.19c.94-.23,1.85-.42,2.75-.58s1.78-.28,2.68-.34a13.89,13.89,0,0,1,2.52.14c1.49.19,2.69.44,3.54.62l1.38.3a.32.32,0,0,1,.2.16,6.19,6.19,0,0,0-1,1.53.88.88,0,0,0-.08.27.23.23,0,0,0,0,.11.22.22,0,0,0,.11.15h.05l-.22.23-1-.26c-.82-.2-2-.48-3.32-.72a13.68,13.68,0,0,0-2.08-.24c-.74,0-1.59.1-2.44.2s-1.76.24-2.65.4l-.66.14-.54.12a.4.4,0,0,0-.19.07.4.4,0,0,0-.07.19v.06a.66.66,0,0,0,0,.14c0,.11,0,.2,0,.31s0,.42,0,.64c0,.44.1.87.18,1.3a10.51,10.51,0,0,0,.3,1.26c.06.21.12.41.19.6l.05.13v0l0,.07Z"/>
+                </g>
+                <path class="cls-6"
+                      d="M71.58,82.36l-.3.13a.28.28,0,0,0,0-.07l0-.07c0-.06,0-.06,0-.17s0-.12,0-.18a.86.86,0,0,1,.14.13A1.54,1.54,0,0,1,71.58,82.36Z"/>
+                <path class="cls-6"
+                      d="M71.29,82.18c0,.11,0,.11,0,.17l0,.07a.69.69,0,0,0-.42-.35,1.72,1.72,0,0,0-.5,0,.38.38,0,0,0-.16,0s-.07,0-.08,0,0,0,0,0a.27.27,0,0,1,.17-.09,1.51,1.51,0,0,1,.56-.08.88.88,0,0,1,.41.16C71.28,82.06,71.28,82.12,71.29,82.18Z"/>
+                <path class="cls-6"
+                      d="M70.79,83.29c0,.1,0,.1-.05.15l0,.06a.76.76,0,0,0-.33-.45,2,2,0,0,0-.47-.15.46.46,0,0,0-.16,0,.1.1,0,0,1-.08,0s0,0,.07,0a.28.28,0,0,1,.18,0,1.56,1.56,0,0,1,.57.08.83.83,0,0,1,.35.26C70.81,83.17,70.8,83.22,70.79,83.29Z"/>
+                <path class="cls-6"
+                      d="M70.82,83.14c.17.23.21.49.13.59l-.27-.19h0a.89.89,0,0,0,0-.11,0,0,0,0,1,0,0C70.69,83.32,70.76,83.23,70.82,83.14Z"/>
+                <path class="cls-6" d="M70.72,83.58h0s0,0,0,0Z"/>
+                <path class="cls-8" d="M65.89,82h0v0l0,0h0V82Z"/>
+                <path class="cls-6" d="M65.88,82v0h-.08l-.16,0-.21,0h0l-.14,0s-.07-.06,0,0a4,4,0,0,0,.6-.09h0Z"/>
+                <polygon class="cls-8" points="65.02 82.2 65.02 82.21 65.02 82.21 65.02 82.2"/>
+                <path class="cls-8" d="M62.23,78.28s0,0,0,0l0,0h0Z"/>
+                <path class="cls-8"
+                      d="M61.66,77.83l0,0a.8.8,0,0,1,.17.15h-.08c-.06,0-.07.07-.07.08s-.06-.07-.07-.11l0-.07Z"/>
+                <path class="cls-8" d="M60.68,82.89a.06.06,0,0,0,0,0h0Z"/>
+                <path class="cls-9" d="M60.66,82.93a.19.19,0,0,1,0,.08h0l0,0Z"/>
+                <path class="cls-6" d="M60.66,82.93l0,.11h-.47S60.48,83,60.66,82.93Z"/>
+                <polygon class="cls-8" points="60.64 83.01 60.62 83.08 60.62 83.06 60.62 83.04 60.64 83.01"/>
+                <path class="cls-6" d="M58.89,82.52c.22,0,.08.15.11.2a.08.08,0,0,1,0,.06h0s-.06-.1-.09-.27Z"/>
+                <path class="cls-8"
+                      d="M56.27,87.13a.65.65,0,0,1,.1.19s-.18,0-.33-.19C56.23,87.14,56.24,87.16,56.27,87.13Z"/>
+                <path class="cls-8"
+                      d="M54.49,86.91c0,.16.09.28.07.31s-.26-.15-.3-.45a.06.06,0,0,1,0,0l.12.15s.07,0,.1,0Z"/>
+                <path class="cls-8" d="M86,27.13l.13.2-.37.05Z"/>
+                <path class="cls-8" d="M80.05,4c.16.17.21.27.18.32s-.15,0-.34,0l-.23-.06q-.14-.13-.27-.3l.47-.09Z"/>
+                <path class="cls-8"
+                      d="M72.86,31.88a4.68,4.68,0,0,0,0,.53.32.32,0,0,1-.15-.35A.27.27,0,0,1,72.86,31.88Z"/>
+                <path class="cls-8" d="M70.61,51.66l.19.36a2.64,2.64,0,0,1-.25-.29Z"/>
+                <path class="cls-8" d="M70.45,48h.09a.52.52,0,0,1,0,.18A1.08,1.08,0,0,1,70.45,48Z"/>
+                <path class="cls-8" d="M70.45,48h-.11C70.4,47.93,70.43,47.92,70.45,48Z"/>
+                <path class="cls-8" d="M69.46,47.57a1.24,1.24,0,0,1-.2.1.11.11,0,0,1,0-.08A.51.51,0,0,1,69.46,47.57Z"/>
+                <path class="cls-8"
+                      d="M64.81,7.55l-.3,0c0-.53,0-1,0-1.48q.14.47.24,1C64.76,7.31,64.81,7.52,64.81,7.55Z"/>
+                <path class="cls-8"
+                      d="M42.35,10c.07.16-.15.43-.52.55l-.56.18a.12.12,0,0,1,0,0A7.84,7.84,0,0,1,42.35,10Z"/>
+                <path class="cls-23" d="M26.81,34.72c0,.23,0,.47,0,.72h0c0-.13,0-.25,0-.37S26.8,34.84,26.81,34.72Z"/>
+                <g class="cls-24">
+                    <path class="cls-23"
+                          d="M26.81,34.72c0,.23,0,.47,0,.72h0c0-.13,0-.25,0-.37S26.8,34.84,26.81,34.72Z"/>
+                </g>
+                <g class="cls-25">
+                    <polygon class="cls-26" points="48.26 58.07 48.27 58.06 48.27 58.07 48.26 58.07"/>
+                    <polygon class="cls-27" points="47.97 58.07 48.27 57.69 48.27 58.06 48.26 58.07 47.97 58.07"/>
+                    <polygon class="cls-28" points="47.67 58.07 48.27 57.31 48.27 57.69 47.97 58.07 47.67 58.07"/>
+                    <polygon class="cls-29" points="47.38 58.07 48.27 56.93 48.27 57.31 47.67 58.07 47.38 58.07"/>
+                    <polygon class="cls-29" points="47.09 58.07 48.27 56.56 48.27 56.93 47.38 58.07 47.09 58.07"/>
+                    <polygon class="cls-30"
+                             points="46.79 58.07 48.22 56.24 48.27 56.24 48.27 56.56 47.09 58.07 46.79 58.07"/>
+                    <polygon class="cls-31" points="46.5 58.07 47.93 56.24 48.22 56.24 46.79 58.07 46.5 58.07"/>
+                    <polygon class="cls-32" points="46.2 58.07 47.63 56.24 47.93 56.24 46.5 58.07 46.2 58.07"/>
+                    <polygon class="cls-33" points="45.91 58.07 47.34 56.24 47.63 56.24 46.2 58.07 45.91 58.07"/>
+                    <polygon class="cls-34" points="45.62 58.07 47.04 56.24 47.34 56.24 45.91 58.07 45.62 58.07"/>
+                    <polygon class="cls-35"
+                             points="45.34 58.04 46.75 56.24 47.04 56.24 45.62 58.07 45.34 58.07 45.34 58.04"/>
+                    <polygon class="cls-36" points="45.34 57.67 46.45 56.24 46.75 56.24 45.34 58.04 45.34 57.67"/>
+                    <polygon class="cls-37" points="45.34 57.29 46.16 56.24 46.45 56.24 45.34 57.67 45.34 57.29"/>
+                    <polygon class="cls-38" points="45.34 56.91 45.87 56.24 46.16 56.24 45.34 57.29 45.34 56.91"/>
+                    <polygon class="cls-39" points="45.34 56.54 45.57 56.24 45.87 56.24 45.34 56.91 45.34 56.54"/>
+                    <polygon class="cls-40" points="45.57 56.24 45.34 56.54 45.34 56.24 45.57 56.24"/>
+                </g>
+                <path class="cls-23" d="M26.79,35.08c0,.12,0,.24,0,.37h0C26.78,35.32,26.79,35.2,26.79,35.08Z"/>
+                <g class="cls-24">
+                    <path class="cls-23" d="M26.79,35.08c0,.12,0,.24,0,.37h0C26.78,35.32,26.79,35.2,26.79,35.08Z"/>
+                </g>
+                <g class="cls-41">
+                    <polygon class="cls-42" points="26.77 35.37 26.79 35.34 26.79 35.45 26.77 35.45 26.77 35.37"/>
+                    <polygon class="cls-43"
+                             points="26.77 35.11 26.79 35.08 26.79 35.08 26.79 35.34 26.77 35.37 26.77 35.11"/>
+                    <polygon class="cls-44" points="26.79 35.08 26.77 35.11 26.77 35.08 26.79 35.08"/>
+                </g>
+                <path class="cls-45"
+                      d="M275.36,62.93v5.43c0,2.4-.85,3.26-3.22,3.26h-3.9V79.3c0,2.4-.84,3.25-3.21,3.25h-7.88c-2.45,0-3.22-.85-3.22-3.25V71.62H230.75c-2.37,0-3.21-.86-3.21-3.26V63.24c0-2.56.15-3.49,1.68-5.27l23.26-28.15c1.53-1.78,2.45-2.33,5-2.33H265c2.37,0,3.21.86,3.21,3.26V59.68h3.9C274.51,59.68,275.36,60.53,275.36,62.93ZM253.93,46.57,243.22,59.68h10.71Z"/>
+                <path class="cls-46"
+                      d="M323.25,82.55h-9.79c-4,0-4.9-.23-6.35-2.87L299.84,67l-7,12.72c-1.45,2.41-2.22,2.87-6.35,2.87H277c-2.3,0-2.83-1.39-1.61-3.25l15.76-24.82-15-23.89c-1.15-1.7-.62-3.1,1.53-3.1h9.18c3.9,0,4.82.31,6.27,2.72l6.89,11.94,6.81-11.94c1.45-2.56,2.44-2.72,5.89-2.72h9.79c2.22,0,2.6,1.4,1.53,3.1L308.94,54.48l16,24.82C326.08,81,325.62,82.55,323.25,82.55Z"/>
+                <path class="cls-47"
+                      d="M.11,22.35a23,23,0,0,0,3.52,5.58l3.76-1A45.48,45.48,0,0,1,3.51,22a2.07,2.07,0,0,1-.13-.19c0,.07.09.13.13.19a40,40,0,0,0,4,4.67,66.77,66.77,0,0,0,.74-7.1C4.6,18.05,2.55,19,2.55,19S-.62,20.07.11,22.35Z"/>
+                <path class="cls-1" d="M18.54,29.78v-.05l0,.27,0,.05C18.53,30,18.54,29.87,18.54,29.78Z"/>
+                <path class="cls-1" d="M24.13,33c0,.15,0,.3,0,.46C24.12,33.28,24.13,33.13,24.13,33Z"/>
+                <path class="cls-1"
+                      d="M34.76,48.41l-.13-.09c-1-.63-1.86-1.25-2.75-1.86s-2-1.35-2.89-2-1.94-1.37-2.85-2-1.88-1.37-2.76-2c-.72-.54-1.42-1.07-2.09-1.59l-.67-.51-1.27-1-1.13-.9-.36-.29-.06,0,0,.22-.39.1.09.07,1.66,1.36,1,.78,2.75,2.15c.94.71,1.88,1.42,2.83,2.12s1.86,1.37,2.8,2,1.86,1.33,2.79,2,1.92,1.34,2.88,2l.64.44,2.27,1.52.61-.15,0-.25-.07,0Z"/>
+                <polygon class="cls-1" points="24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55"/>
+                <path class="cls-48" d="M26.89,34.82c0,.24,0,.48,0,.73h0c0-.12,0-.24,0-.37S26.89,34.94,26.89,34.82Z"/>
+                <path class="cls-49" d="M26.89,34.82c0,.24,0,.48,0,.73h0c0-.12,0-.24,0-.37S26.89,34.94,26.89,34.82Z"/>
+                <path class="cls-48" d="M24.1,33.55h0s0-.08,0-.12,0-.31,0-.46q0,.27,0,.57Z"/>
+                <path class="cls-49" d="M24.1,33.55h0s0-.08,0-.12,0-.31,0-.46q0,.27,0,.57Z"/>
+                <path class="cls-50"
+                      d="M14.85,34.17c-.89-.77-1.75-1.55-2.58-2.32s-1.7-1.61-2.5-2.41a.93.93,0,0,0-.14-.14c-.78-.8-1.53-1.58-2.24-2.37l-3.76,1,.4.52c.52.66,1.09,1.35,1.69,2.07S7.13,32.16,7.9,33s1.47,1.6,2.25,2.41,1.35,1.4,2.06,2.1a.3.3,0,0,1,.08.08l5.1-1.26C16.53,35.62,15.68,34.89,14.85,34.17Z"/>
+                <path class="cls-51"
+                      d="M38.15,50.64l2.36,1.52,0,0,.34.22L43,53.74a4.77,4.77,0,0,1,2.46-1.27,3.82,3.82,0,0,0-2.84.61c.92-3.32.74-6.41-1.37-8.47a6.27,6.27,0,0,0-.61-.53,3.28,3.28,0,0,1,.42,3.37h0a9.2,9.2,0,0,0-2.66-5.4c-.34-.33-.71-.67-1.13-1a7.52,7.52,0,0,1,.64,7.42l-.22,1.92Z"/>
+                <path class="cls-52"
+                      d="M34.17,48.8q-1.44-1-2.88-2c-.93-.64-1.86-1.3-2.79-2s-1.87-1.34-2.8-2-1.89-1.41-2.83-2.12l-2.75-2.15-1-.78-1.66-1.36-.09-.07-5.1,1.26.16.15c.76.74,1.53,1.49,2.33,2.23s1.63,1.48,2.47,2.21,1.43,1.23,2.16,1.83l.44.36c.93.74,1.82,1.43,2.69,2.06s1.93,1.37,2.84,2c.59.39,1.17.75,1.73,1.08l1.44.82c1.13.62,2.27,1.2,3.41,1.72l5.12-1.26-2.27-1.52Z"/>
+                <path class="cls-53"
+                      d="M48.4,58.19a1,1,0,0,0,0-.28c-2.19-1.33-4.59-2.83-7.44-4.66l-.65-.41-.18-.12-2.42-1.58-.56-.37h0L32,52l.16.07a36.52,36.52,0,0,0,4.24,1.62l.15,0a9.33,9.33,0,0,0-2.9,2.13,13.29,13.29,0,0,1,6.58-1.22A6.11,6.11,0,0,1,39,57.5a6,6,0,0,0,2.1-2.16,7.42,7.42,0,0,0,.94,3.89,7.62,7.62,0,0,1,.19-4.31c1.7,1.08,3.26,2,5.11,3.11a1.08,1.08,0,0,1,.6,0,1.51,1.51,0,0,1,.35.17Z"/>
+                <path class="cls-54"
+                      d="M17.86,36.07l.36.29,1.13.9,1.27,1,.67.51c.67.52,1.37,1,2.09,1.59q1.32,1,2.76,2t2.85,2c.93.66,1.89,1.33,2.89,2s1.8,1.23,2.75,1.86l.13.09,2.89,1.91.07,0,.22-1.92a.49.49,0,0,1,0,.11,13.64,13.64,0,0,0-2.37-8,18,18,0,0,0-2.82-3.22A32.33,32.33,0,0,0,29.81,35c-.94-.67-2-1.35-3.12-2a6.73,6.73,0,0,1,.2,1.89c0,.12,0,.24,0,.36s0,.25,0,.37h0a8.36,8.36,0,0,0-3.24-5.34A7.62,7.62,0,0,1,24.13,33c0,.15,0,.3,0,.46s0,.08,0,.12h0a9,9,0,0,0-.61-2.11c-.06-.13-.12-.26-.19-.39a6.42,6.42,0,0,0-.34-.56,3.64,3.64,0,0,0-.24-.35,6.75,6.75,0,0,0-.67-.76l-.23-.23-.35-.29c-.52-.43-1-.78-1.4-1.07-.21-.15-.4-.28-.58-.39l-.21-.14L18.73,27a5.69,5.69,0,0,0-.58-.28h0a1.82,1.82,0,0,1,.11.28,9.11,9.11,0,0,1,.29,2.78l.2-1.76-.2,1.76v.05c0,.09,0,.18,0,.27l0-.05-.71,6Z"/>
+                <path class="cls-55"
+                      d="M7.51,26.71c.68.71,1.46,1.49,2.35,2.35l.14.13c.77.74,1.62,1.52,2.56,2.36s1.68,1.49,2.62,2.29,1.7,1.43,2.62,2.18l.71-6a7.26,7.26,0,0,0-1.78-3.8c-.24-.27-.49-.53-.75-.8-.81-.82-1.71-1.65-2.62-2.42a30.56,30.56,0,0,0-2.57-2,15.55,15.55,0,0,0-1.43-.88c-.38-.2-.75-.37-1.11-.52A66.77,66.77,0,0,1,7.51,26.71Z"/>
+                <path class="cls-48" d="M26.88,35.18c0,.13,0,.25,0,.37h0C26.87,35.43,26.88,35.31,26.88,35.18Z"/>
+                <path class="cls-49" d="M26.88,35.18c0,.13,0,.25,0,.37h0C26.87,35.43,26.88,35.31,26.88,35.18Z"/>
+                <path class="cls-56" d="M26.88,35.18c0,.13,0,.25,0,.37h0C26.87,35.43,26.88,35.31,26.88,35.18Z"/>
+                <path class="cls-48" d="M24.1,33.56s0-.08,0-.12,0,.08,0,.12Z"/>
+                <path class="cls-49" d="M24.1,33.56s0-.08,0-.12,0,.08,0,.12Z"/>
+                <path class="cls-57" d="M24.1,33.56s0-.08,0-.12,0,.08,0,.12Z"/>
+                <polygon class="cls-48" points="24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55"/>
+                <polygon class="cls-49" points="24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55"/>
+                <polygon class="cls-58" points="24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55 24.1 33.55"/>
+                <path class="cls-59"
+                      d="M6.93,17.42l.17,0,.09-.4,1.14.26.05-.19-1.14-.26.09-.4-.17,0Zm.54-2.33.81.66-1,.25,0,.22,1.31.3,0-.17-1-.24,1-.24,0-.12-.8-.65,1,.24,0-.17-1.31-.3Z"/>
+            </g>
+        </g>
+    </g>
 </svg>
\ No newline at end of file
diff --git a/media/logos/SVG/logo PLC4X white line.svg b/media/logos/SVG/logo PLC4X white line.svg
index 5263e6aaed5..d2fdb72a6c8 100644
--- a/media/logos/SVG/logo PLC4X white line.svg	
+++ b/media/logos/SVG/logo PLC4X white line.svg	
@@ -1,1598 +1,1598 @@
-<!--
-    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
-
-         http://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.
--->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 326.17 105.33">
-    <defs>
-        <style>
-            .cls-1{fill:#fff;}.cls-2{isolation:isolate;}.cls-3{clip-path:url(#clip-path);}.cls-4{clip-path:url(#clip-path-2);}.cls-5{clip-path:url(#clip-path-3);}.cls-6{clip-path:url(#clip-path-4);}.cls-7{opacity:0.35;mix-blend-mode:screen;}.cls-8{clip-path:url(#clip-path-5);}.cls-9{clip-path:url(#clip-path-6);}.cls-10{clip-path:url(#clip-path-7);}.cls-11{clip-path:url(#clip-path-8);}.cls-12{clip-path:url(#clip-path-9);}.cls-13{clip-path:url(#clip-path-10);}.cls-14{clip-path:url(#clip-path-11);}.cls-15{clip-path:url(#clip-path-12);}.cls-16{clip-path:url(#clip-path-13);}.cls-17{clip-path:url(#clip-path-14);}
-        </style>
-        <clipPath id="clip-path">
-            <path class="cls-1"
-                  d="M275.72,63.08v5.4c0,2.39-.83,3.23-3.19,3.23h-3.88v7.64c0,2.39-.84,3.24-3.2,3.24h-7.83c-2.44,0-3.2-.85-3.2-3.24V71.71H231.36c-2.35,0-3.19-.84-3.19-3.23v-5.1c0-2.54.15-3.47,1.67-5.24l23.13-28c1.53-1.77,2.44-2.31,5-2.31h7.53c2.36,0,3.2.85,3.2,3.24V59.84h3.88C274.89,59.84,275.72,60.69,275.72,63.08ZM254.42,46.8l-10.65,13h10.65Z"/>
-        </clipPath>
-        <clipPath id="clip-path-2">
-            <path class="cls-1"
-                  d="M323.36,82.59h-9.74c-4,0-4.87-.23-6.32-2.85l-7.23-12.65-7,12.65c-1.44,2.39-2.2,2.85-6.31,2.85H277.4c-2.28,0-2.82-1.39-1.6-3.24l15.68-24.68L276.56,30.92c-1.14-1.7-.61-3.09,1.52-3.09h9.13c3.88,0,4.8.31,6.24,2.7l6.85,11.88,6.77-11.88c1.45-2.55,2.44-2.7,5.86-2.7h9.74c2.21,0,2.59,1.39,1.52,3.09L309.13,54.67,325,79.35C326.17,81.05,325.72,82.59,323.36,82.59Z"/>
-        </clipPath>
-        <clipPath id="clip-path-3">
-            <path class="cls-1"
-                  d="M47.8,58a1.32,1.32,0,0,1,.83-.09h0s0,0,0-.08c-.81-.5-1.62-1-2.54-1.59a1.65,1.65,0,0,1-.28.6l2,1.21S47.78,58,47.8,58Z"/>
-        </clipPath>
-        <clipPath id="clip-path-4">
-            <path class="cls-1"
-                  d="M.71,22.52A23.24,23.24,0,0,0,4.2,28l3.72-1a44.55,44.55,0,0,1-3.84-4.84A2.07,2.07,0,0,1,4,22a2.14,2.14,0,0,1,.13.19,40.79,40.79,0,0,0,4,4.62,65.5,65.5,0,0,0,.73-7c-3.61-1.54-5.64-.6-5.64-.6S0,20.26.71,22.52Z"/>
-        </clipPath>
-        <clipPath id="clip-path-5">
-            <path class="cls-1"
-                  d="M15.3,34.21c-.88-.77-1.73-1.53-2.55-2.3s-1.68-1.59-2.47-2.38l-.14-.14Q9,28.21,7.92,27.05L4.2,28l.4.51c.51.65,1.07,1.34,1.67,2s1.39,1.63,2.15,2.47,1.45,1.58,2.23,2.38,1.34,1.38,2,2.08l.08.07,5-1.24C17,35.64,16.12,34.92,15.3,34.21Z"/>
-        </clipPath>
-        <clipPath id="clip-path-6">
-            <path class="cls-1"
-                  d="M38.35,50.5,40.68,52l0,0,.34.22,2.12,1.32A4.78,4.78,0,0,1,45.6,52.3a3.85,3.85,0,0,0-2.81.61c.92-3.28.74-6.34-1.35-8.38a5.09,5.09,0,0,0-.6-.52,3.27,3.27,0,0,1,.42,3.34h0A9.18,9.18,0,0,0,38.62,42c-.33-.33-.7-.66-1.12-1a7.42,7.42,0,0,1,.64,7.34l-.22,1.9Z"/>
-        </clipPath>
-        <clipPath id="clip-path-7">
-            <path class="cls-1"
-                  d="M34.4,48.68c-.94-.64-1.89-1.29-2.84-2L28.8,44.77c-.93-.66-1.85-1.33-2.77-2s-1.87-1.39-2.8-2.1l-2.72-2.12-1-.77L17.9,36.42l-.09-.07-5,1.24a1.21,1.21,0,0,0,.16.16c.74.73,1.51,1.47,2.3,2.2s1.61,1.47,2.44,2.19,1.42,1.22,2.14,1.81l.44.35c.91.74,1.79,1.42,2.65,2s1.91,1.36,2.81,1.94c.59.38,1.16.74,1.71,1.07l1.42.81c1.12.62,2.25,1.19,3.38,1.7l5.07-1.24L35,49.11Z"/>
-        </clipPath>
-        <clipPath id="clip-path-8">
-            <path class="cls-1"
-                  d="M32.38,51.94a35.59,35.59,0,0,0,4.19,1.59l.15,0a9.39,9.39,0,0,0-2.87,2.11,13.22,13.22,0,0,1,6.51-1.21,6,6,0,0,1-1.17,2.8,6.07,6.07,0,0,0,2.09-2.14A7.3,7.3,0,0,0,42.2,59a7.63,7.63,0,0,1,.19-4.26C46,57,45,56.36,48.1,58.16c.1.05.29,0,.4,0,.34.19,1,.77,1.4,1a1.14,1.14,0,0,0-.58-1c-.88-.5-.78-.29-8.25-5.09l-.64-.41-.18-.12c-.78-.5-1.58-1-2.39-1.56l-.56-.37h0l-5.07,1.24Z"/>
-        </clipPath>
-        <clipPath id="clip-path-9">
-            <path class="cls-1"
-                  d="M18.28,36.08a3.51,3.51,0,0,0,.36.29l1.11.9,1.26,1,.66.51,2.06,1.57c.88.66,1.79,1.33,2.74,2s1.84,1.33,2.81,2l2.86,2,2.72,1.83.13.09,2.86,1.89.07,0,.22-1.9s0,.07,0,.11a13.6,13.6,0,0,0-2.34-8A18,18,0,0,0,33,37.29,28.37,28.37,0,0,0,30.1,35c-.94-.66-2-1.33-3.09-2a7,7,0,0,1,.2,1.87c0,.12,0,.24,0,.36l0,.37h0A8.26,8.26,0,0,0,24,30.29,7.68,7.68,0,0,1,24.48,33c0,.15,0,.3,0,.45a.49.49,0,0,0,0,.12h0a8.75,8.75,0,0,0-.61-2.08c-.06-.13-.12-.26-.19-.39s-.21-.37-.33-.56-.15-.22-.24-.34a7.63,7.63,0,0,0-.66-.76l-.23-.22L21.85,29c-.52-.42-1-.77-1.39-1.06l-.58-.38-.2-.13c-.2-.13-.38-.23-.54-.32a3.88,3.88,0,0,0-.58-.27h0a1.49,1.49,0,0,1,.11.28A8.89,8.89,0,0,1,19,29.82l.21-1.74L19,29.82v0a2.45,2.45,0,0,1,0,.27v-.05l-.7,6Z"/>
-        </clipPath>
-        <clipPath id="clip-path-10">
-            <path class="cls-1"
-                  d="M8,26.83c.67.7,1.45,1.47,2.32,2.32l.14.13c.77.73,1.61,1.51,2.53,2.34s1.66,1.47,2.6,2.26S17.3,35.29,18.22,36l.7-6a7.26,7.26,0,0,0-1.76-3.76c-.24-.26-.49-.53-.75-.79-.79-.81-1.68-1.63-2.58-2.39a31.59,31.59,0,0,0-2.54-1.95c-.51-.35-1-.64-1.42-.87s-.75-.37-1.1-.52A65.5,65.5,0,0,1,8,26.83Z"/>
-        </clipPath>
-        <clipPath id="clip-path-11">
-            <path class="cls-1" d="M27.2,35.21l0,.37h0Z"/>
-        </clipPath>
-        <clipPath id="clip-path-12">
-            <path class="cls-1" d="M24.45,33.6a.49.49,0,0,1,0-.12.49.49,0,0,0,0,.12Z"/>
-        </clipPath>
-        <clipPath id="clip-path-13">
-            <polygon class="cls-1" points="24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59"/>
-        </clipPath>
-        <clipPath id="clip-path-14">
-            <path class="cls-1" d="M27.25,35.08c0,.12,0,.24,0,.36h0C27.24,35.32,27.24,35.2,27.25,35.08Z"/>
-        </clipPath>
-    </defs>
-    <title>logo PLC4X white line</title>
-    <g class="cls-2">
-        <g id="Layer_2" data-name="Layer 2">
-            <g id="Layer_1-2" data-name="Layer 1">
-                <path class="cls-1"
-                      d="M135.53,47.11c0,12.19-7.61,19-19.48,19h-9.29V79.35c0,2.39-.83,3.24-3.19,3.24H94.89c-2.36,0-3.19-.85-3.19-3.24V31.07c0-2.39.83-3.24,3.19-3.24H116C127.76,27.83,135.53,34.85,135.53,47.11ZM119.93,47c0-3.39-2.06-5.7-5.63-5.7h-7.54V52.66h7.54A5.25,5.25,0,0,0,119.93,47Z"/>
-                <path class="cls-1"
-                      d="M154.09,31.07v38h18.26c2.44,0,3.27.77,3.27,3.24v7c0,2.39-.83,3.24-3.27,3.24H142.22c-2.36,0-3.2-.85-3.2-3.24V31.07c0-2.39.84-3.24,3.2-3.24h8.67C153.25,27.83,154.09,28.68,154.09,31.07Z"/>
-                <path class="cls-1"
-                      d="M201.38,26.67c11.72,0,19.1,4.86,22.22,13.5.84,2.24.23,3.39-2,4.16l-8.15,2.94c-2.35.69-3.19.3-4.1-2.09-1.3-3.47-3.58-5-7.92-5-5.93,0-8.29,2.62-8.29,8v14c0,5.4,2.36,8,8.29,8,4.26,0,6.7-1.7,8-5,.84-2.4,1.83-2.94,4.11-2.09l8.07,2.93c2.28.78,2.89,1.93,2,4.17-3.12,8.64-10.5,13.5-22.22,13.5-14.91,0-23.36-8.26-23.36-21.6V48.27C178,34.93,186.47,26.67,201.38,26.67Z"/>
-                <path class="cls-1"
-                      d="M275.72,63.08v5.4c0,2.39-.83,3.23-3.19,3.23h-3.88v7.64c0,2.39-.84,3.24-3.2,3.24h-7.83c-2.44,0-3.2-.85-3.2-3.24V71.71H231.36c-2.35,0-3.19-.84-3.19-3.23v-5.1c0-2.54.15-3.47,1.67-5.24l23.13-28c1.53-1.77,2.44-2.31,5-2.31h7.53c2.36,0,3.2.85,3.2,3.24V59.84h3.88C274.89,59.84,275.72,60.69,275.72,63.08ZM254.42,46.8l-10.65,13h10.65Z"/>
-                <g class="cls-3">
-                    <polygon class="cls-1" points="243.77 58.95 254.42 58.99 254.42 59.84 243.77 59.84 243.77 58.95"/>
-                    <polygon class="cls-1" points="243.77 57.66 254.42 57.7 254.42 58.99 243.77 58.95 243.77 57.66"/>
-                    <polygon class="cls-1" points="243.77 56.37 254.42 56.41 254.42 57.7 243.77 57.66 243.77 56.37"/>
-                    <polygon class="cls-1" points="243.77 55.08 254.42 55.11 254.42 56.41 243.77 56.37 243.77 55.08"/>
-                    <polygon class="cls-1" points="243.77 53.78 254.42 53.82 254.42 55.11 243.77 55.08 243.77 53.78"/>
-                    <polygon class="cls-1" points="243.77 52.49 254.42 52.53 254.42 53.82 243.77 53.78 243.77 52.49"/>
-                    <polygon class="cls-1" points="243.77 51.2 254.42 51.24 254.42 52.53 243.77 52.49 243.77 51.2"/>
-                    <polygon class="cls-1" points="243.77 49.91 254.42 49.95 254.42 51.24 243.77 51.2 243.77 49.91"/>
-                    <polygon class="cls-1" points="243.77 49.68 254.42 49.71 254.42 49.95 243.77 49.91 243.77 49.68"/>
-                    <polygon class="cls-1" points="243.77 49.44 254.42 49.48 254.42 49.71 243.77 49.68 243.77 49.44"/>
-                    <polygon class="cls-1" points="243.77 49.21 254.42 49.25 254.42 49.48 243.77 49.44 243.77 49.21"/>
-                    <polygon class="cls-1" points="243.77 48.98 254.42 49.02 254.42 49.25 243.77 49.21 243.77 48.98"/>
-                    <polygon class="cls-1" points="243.77 48.74 254.42 48.78 254.42 49.02 243.77 48.98 243.77 48.74"/>
-                    <polygon class="cls-1" points="243.77 48.51 254.42 48.55 254.42 48.78 243.77 48.74 243.77 48.51"/>
-                    <polygon class="cls-1" points="243.77 48.28 254.42 48.32 254.42 48.55 243.77 48.51 243.77 48.28"/>
-                    <polygon class="cls-1" points="243.77 48.05 254.42 48.08 254.42 48.32 243.77 48.28 243.77 48.05"/>
-                    <polygon class="cls-1" points="243.77 47.81 254.42 47.85 254.42 48.08 243.77 48.05 243.77 47.81"/>
-                    <polygon class="cls-1" points="243.77 47.58 254.42 47.62 254.42 47.85 243.77 47.81 243.77 47.58"/>
-                    <polygon class="cls-1" points="243.77 47.35 254.42 47.38 254.42 47.62 243.77 47.58 243.77 47.35"/>
-                    <polygon class="cls-1" points="243.77 47.11 254.42 47.15 254.42 47.38 243.77 47.35 243.77 47.11"/>
-                    <polygon class="cls-1" points="243.77 46.88 254.42 46.92 254.42 47.15 243.77 47.11 243.77 46.88"/>
-                    <polygon class="cls-1" points="254.42 46.92 243.77 46.88 243.77 46.8 254.42 46.8 254.42 46.92"/>
-                    <polygon class="cls-1" points="228.17 82.47 261.4 82.59 228.17 82.59 228.17 82.47"/>
-                    <polygon class="cls-1"
-                             points="228.17 82.26 275.73 82.42 275.73 82.59 261.4 82.59 228.17 82.47 228.17 82.26"/>
-                    <polygon class="cls-1" points="228.17 82.04 275.73 82.21 275.73 82.42 228.17 82.26 228.17 82.04"/>
-                    <polygon class="cls-1" points="228.17 81.82 275.73 81.99 275.73 82.21 228.17 82.04 228.17 81.82"/>
-                    <polygon class="cls-1" points="228.17 81.61 275.73 81.77 275.73 81.99 228.17 81.82 228.17 81.61"/>
-                    <polygon class="cls-1" points="228.17 81.39 275.73 81.56 275.73 81.77 228.17 81.61 228.17 81.39"/>
-                    <polygon class="cls-1" points="228.17 81.17 275.73 81.34 275.73 81.56 228.17 81.39 228.17 81.17"/>
-                    <polygon class="cls-1" points="228.17 80.96 275.73 81.12 275.73 81.34 228.17 81.17 228.17 80.96"/>
-                    <polygon class="cls-1" points="228.17 80.74 275.73 80.91 275.73 81.12 228.17 80.96 228.17 80.74"/>
-                    <polygon class="cls-1" points="228.17 80.53 275.73 80.69 275.73 80.91 228.17 80.74 228.17 80.53"/>
-                    <polygon class="cls-1" points="228.17 80.31 275.73 80.48 275.73 80.69 228.17 80.53 228.17 80.31"/>
-                    <polygon class="cls-1" points="228.17 80.09 275.73 80.26 275.73 80.48 228.17 80.31 228.17 80.09"/>
-                    <polygon class="cls-1" points="228.17 79.88 275.73 80.04 275.73 80.26 228.17 80.09 228.17 79.88"/>
-                    <polygon class="cls-1" points="228.17 79.66 275.73 79.83 275.73 80.04 228.17 79.88 228.17 79.66"/>
-                    <polygon class="cls-1" points="228.17 79.44 275.73 79.61 275.73 79.83 228.17 79.66 228.17 79.44"/>
-                    <polygon class="cls-1" points="228.17 79.23 275.73 79.39 275.73 79.61 228.17 79.44 228.17 79.23"/>
-                    <polygon class="cls-1" points="228.17 79.01 275.73 79.18 275.73 79.39 228.17 79.23 228.17 79.01"/>
-                    <polygon class="cls-1" points="228.17 78.8 275.73 78.96 275.73 79.18 228.17 79.01 228.17 78.8"/>
-                    <polygon class="cls-1" points="228.17 78.58 275.73 78.75 275.73 78.96 228.17 78.8 228.17 78.58"/>
-                    <polygon class="cls-1" points="228.17 78.36 275.73 78.53 275.73 78.75 228.17 78.58 228.17 78.36"/>
-                    <polygon class="cls-1" points="228.17 78.15 275.73 78.31 275.73 78.53 228.17 78.36 228.17 78.15"/>
-                    <polygon class="cls-1" points="228.17 77.93 275.73 78.1 275.73 78.31 228.17 78.15 228.17 77.93"/>
-                    <polygon class="cls-1" points="228.17 77.71 275.73 77.88 275.73 78.1 228.17 77.93 228.17 77.71"/>
-                    <polygon class="cls-1" points="228.17 77.5 275.73 77.66 275.73 77.88 228.17 77.71 228.17 77.5"/>
-                    <polygon class="cls-1" points="228.17 77.28 275.73 77.45 275.73 77.66 228.17 77.5 228.17 77.28"/>
-                    <polygon class="cls-1" points="228.17 77.06 275.73 77.23 275.73 77.45 228.17 77.28 228.17 77.06"/>
-                    <polygon class="cls-1" points="228.17 76.85 275.73 77.01 275.73 77.23 228.17 77.06 228.17 76.85"/>
-                    <polygon class="cls-1" points="228.17 76.63 275.73 76.8 275.73 77.01 228.17 76.85 228.17 76.63"/>
-                    <polygon class="cls-1" points="228.17 76.42 275.73 76.58 275.73 76.8 228.17 76.63 228.17 76.42"/>
-                    <polygon class="cls-1" points="228.17 76.2 275.73 76.36 275.73 76.58 228.17 76.42 228.17 76.2"/>
-                    <polygon class="cls-1" points="228.17 75.98 275.73 76.15 275.73 76.36 228.17 76.2 228.17 75.98"/>
-                    <polygon class="cls-1" points="228.17 75.77 275.73 75.93 275.73 76.15 228.17 75.98 228.17 75.77"/>
-                    <polygon class="cls-1" points="228.17 75.55 275.73 75.72 275.73 75.93 228.17 75.77 228.17 75.55"/>
-                    <polygon class="cls-1" points="228.17 75.33 275.73 75.5 275.73 75.72 228.17 75.55 228.17 75.33"/>
-                    <polygon class="cls-1" points="228.17 75.12 275.73 75.28 275.73 75.5 228.17 75.33 228.17 75.12"/>
-                    <polygon class="cls-1" points="228.17 74.9 275.73 75.07 275.73 75.28 228.17 75.12 228.17 74.9"/>
-                    <polygon class="cls-1" points="228.17 74.69 275.73 74.85 275.73 75.07 228.17 74.9 228.17 74.69"/>
-                    <polygon class="cls-1" points="228.17 74.47 275.73 74.63 275.73 74.85 228.17 74.69 228.17 74.47"/>
-                    <polygon class="cls-1" points="228.17 74.25 275.73 74.42 275.73 74.63 228.17 74.47 228.17 74.25"/>
-                    <polygon class="cls-1" points="228.17 74.03 275.73 74.2 275.73 74.42 228.17 74.25 228.17 74.03"/>
-                    <polygon class="cls-1" points="228.17 73.82 275.73 73.98 275.73 74.2 228.17 74.03 228.17 73.82"/>
-                    <polygon class="cls-1" points="228.17 73.6 275.73 73.77 275.73 73.98 228.17 73.82 228.17 73.6"/>
-                    <polygon class="cls-1" points="228.17 73.39 275.73 73.55 275.73 73.77 228.17 73.6 228.17 73.39"/>
-                    <polygon class="cls-1" points="228.17 73.17 275.73 73.34 275.73 73.55 228.17 73.39 228.17 73.17"/>
-                    <polygon class="cls-1" points="228.17 72.95 275.73 73.12 275.73 73.34 228.17 73.17 228.17 72.95"/>
-                    <polygon class="cls-1" points="228.17 72.74 275.73 72.9 275.73 73.12 228.17 72.95 228.17 72.74"/>
-                    <polygon class="cls-1" points="228.17 72.52 275.73 72.69 275.73 72.9 228.17 72.74 228.17 72.52"/>
-                    <polygon class="cls-1" points="228.17 72.31 275.73 72.47 275.73 72.69 228.17 72.52 228.17 72.31"/>
-                    <polygon class="cls-1" points="228.17 72.09 275.73 72.25 275.73 72.47 228.17 72.31 228.17 72.09"/>
-                    <polygon class="cls-1" points="228.17 71.87 275.73 72.04 275.73 72.25 228.17 72.09 228.17 71.87"/>
-                    <polygon class="cls-1" points="228.17 71.66 275.73 71.82 275.73 72.04 228.17 71.87 228.17 71.66"/>
-                    <polygon class="cls-1" points="228.17 71.44 275.73 71.61 275.73 71.82 228.17 71.66 228.17 71.44"/>
-                    <polygon class="cls-1" points="228.17 71.22 275.73 71.39 275.73 71.61 228.17 71.44 228.17 71.22"/>
-                    <polygon class="cls-1" points="228.17 71.01 275.73 71.17 275.73 71.39 228.17 71.22 228.17 71.01"/>
-                    <polygon class="cls-1" points="228.17 70.79 275.73 70.96 275.73 71.17 228.17 71.01 228.17 70.79"/>
-                    <polygon class="cls-1" points="228.17 70.57 275.73 70.74 275.73 70.96 228.17 70.79 228.17 70.57"/>
-                    <polygon class="cls-1" points="228.17 70.36 275.73 70.52 275.73 70.74 228.17 70.57 228.17 70.36"/>
-                    <polygon class="cls-1" points="228.17 70.14 275.73 70.31 275.73 70.52 228.17 70.36 228.17 70.14"/>
-                    <polygon class="cls-1" points="228.17 69.92 275.73 70.09 275.73 70.31 228.17 70.14 228.17 69.92"/>
-                    <polygon class="cls-1" points="228.17 69.71 275.73 69.88 275.73 70.09 228.17 69.92 228.17 69.71"/>
-                    <polygon class="cls-1" points="228.17 69.49 275.73 69.66 275.73 69.88 228.17 69.71 228.17 69.49"/>
-                    <polygon class="cls-1" points="228.17 69.28 275.73 69.44 275.73 69.66 228.17 69.49 228.17 69.28"/>
-                    <polygon class="cls-1" points="228.17 69.06 275.73 69.23 275.73 69.44 228.17 69.28 228.17 69.06"/>
-                    <polygon class="cls-1" points="228.17 68.84 275.73 69.01 275.73 69.23 228.17 69.06 228.17 68.84"/>
-                    <polygon class="cls-1" points="228.17 68.63 275.73 68.79 275.73 69.01 228.17 68.84 228.17 68.63"/>
-                    <polygon class="cls-1" points="228.17 68.41 275.73 68.58 275.73 68.79 228.17 68.63 228.17 68.41"/>
-                    <polygon class="cls-1" points="228.17 68.19 275.73 68.36 275.73 68.58 228.17 68.41 228.17 68.19"/>
-                    <polygon class="cls-1" points="228.17 67.98 275.73 68.14 275.73 68.36 228.17 68.19 228.17 67.98"/>
-                    <polygon class="cls-1" points="228.17 67.76 275.73 67.93 275.73 68.14 228.17 67.98 228.17 67.76"/>
-                    <polygon class="cls-1" points="228.17 67.55 275.73 67.71 275.73 67.93 228.17 67.76 228.17 67.55"/>
-                    <polygon class="cls-1" points="228.17 67.33 275.73 67.5 275.73 67.71 228.17 67.55 228.17 67.33"/>
-                    <polygon class="cls-1" points="228.17 67.11 275.73 67.28 275.73 67.5 228.17 67.33 228.17 67.11"/>
-                    <polygon class="cls-1" points="228.17 66.9 275.73 67.06 275.73 67.28 228.17 67.11 228.17 66.9"/>
-                    <polygon class="cls-1" points="228.17 66.68 275.73 66.85 275.73 67.06 228.17 66.9 228.17 66.68"/>
-                    <polygon class="cls-1" points="228.17 66.46 275.73 66.63 275.73 66.85 228.17 66.68 228.17 66.46"/>
-                    <polygon class="cls-1" points="228.17 66.25 275.73 66.41 275.73 66.63 228.17 66.46 228.17 66.25"/>
-                    <polygon class="cls-1" points="228.17 66.03 275.73 66.2 275.73 66.41 228.17 66.25 228.17 66.03"/>
-                    <polygon class="cls-1" points="228.17 65.81 275.73 65.98 275.73 66.2 228.17 66.03 228.17 65.81"/>
-                    <polygon class="cls-1" points="228.17 65.6 275.73 65.77 275.73 65.98 228.17 65.81 228.17 65.6"/>
-                    <polygon class="cls-1" points="228.17 65.38 275.73 65.55 275.73 65.77 228.17 65.6 228.17 65.38"/>
-                    <polygon class="cls-1" points="228.17 65.17 275.73 65.33 275.73 65.55 228.17 65.38 228.17 65.17"/>
-                    <polygon class="cls-1" points="228.17 64.95 275.73 65.12 275.73 65.33 228.17 65.17 228.17 64.95"/>
-                    <polygon class="cls-1" points="228.17 64.73 275.73 64.9 275.73 65.12 228.17 64.95 228.17 64.73"/>
-                    <polygon class="cls-1" points="228.17 64.52 275.73 64.68 275.73 64.9 228.17 64.73 228.17 64.52"/>
-                    <polygon class="cls-1" points="228.17 64.3 275.73 64.47 275.73 64.68 228.17 64.52 228.17 64.3"/>
-                    <polygon class="cls-1" points="228.17 64.08 275.73 64.25 275.73 64.47 228.17 64.3 228.17 64.08"/>
-                    <polygon class="cls-1" points="228.17 63.87 275.73 64.03 275.73 64.25 228.17 64.08 228.17 63.87"/>
-                    <polygon class="cls-1" points="228.17 63.65 275.73 63.82 275.73 64.03 228.17 63.87 228.17 63.65"/>
-                    <polygon class="cls-1" points="228.17 63.44 275.73 63.6 275.73 63.82 228.17 63.65 228.17 63.44"/>
-                    <polygon class="cls-1" points="228.17 63.22 275.73 63.38 275.73 63.6 228.17 63.44 228.17 63.22"/>
-                    <polygon class="cls-1" points="228.17 63 275.73 63.17 275.73 63.38 228.17 63.22 228.17 63"/>
-                    <polygon class="cls-1" points="228.17 62.79 275.73 62.95 275.73 63.17 228.17 63 228.17 62.79"/>
-                    <polygon class="cls-1" points="228.17 62.57 275.73 62.74 275.73 62.95 228.17 62.79 228.17 62.57"/>
-                    <polygon class="cls-1" points="228.17 62.35 275.73 62.52 275.73 62.74 228.17 62.57 228.17 62.35"/>
-                    <polygon class="cls-1" points="228.17 62.14 275.73 62.3 275.73 62.52 228.17 62.35 228.17 62.14"/>
-                    <polygon class="cls-1" points="228.17 61.92 275.73 62.09 275.73 62.3 228.17 62.14 228.17 61.92"/>
-                    <polygon class="cls-1" points="228.17 61.7 275.73 61.87 275.73 62.09 228.17 61.92 228.17 61.7"/>
-                    <polygon class="cls-1" points="228.17 61.49 275.73 61.65 275.73 61.87 228.17 61.7 228.17 61.49"/>
-                    <polygon class="cls-1" points="228.17 61.27 275.73 61.44 275.73 61.65 228.17 61.49 228.17 61.27"/>
-                    <polygon class="cls-1" points="228.17 61.05 275.73 61.22 275.73 61.44 228.17 61.27 228.17 61.05"/>
-                    <polygon class="cls-1" points="228.17 60.84 275.73 61.01 275.73 61.22 228.17 61.05 228.17 60.84"/>
-                    <polygon class="cls-1" points="228.17 60.62 275.73 60.79 275.73 61.01 228.17 60.84 228.17 60.62"/>
-                    <polygon class="cls-1" points="228.17 60.41 275.73 60.57 275.73 60.79 228.17 60.62 228.17 60.41"/>
-                    <polygon class="cls-1" points="228.17 60.19 275.73 60.36 275.73 60.57 228.17 60.41 228.17 60.19"/>
-                    <polygon class="cls-1" points="228.17 58.9 275.73 59.06 275.73 60.36 228.17 60.19 228.17 58.9"/>
-                    <polygon class="cls-1" points="228.17 57.61 275.73 57.77 275.73 59.06 228.17 58.9 228.17 57.61"/>
-                    <polygon class="cls-1" points="228.17 56.31 275.73 56.48 275.73 57.77 228.17 57.61 228.17 56.31"/>
-                    <polygon class="cls-1" points="228.17 55.02 275.73 55.19 275.73 56.48 228.17 56.31 228.17 55.02"/>
-                    <polygon class="cls-1" points="228.17 53.73 275.73 53.9 275.73 55.19 228.17 55.02 228.17 53.73"/>
-                    <polygon class="cls-1" points="228.17 52.44 275.73 52.6 275.73 53.9 228.17 53.73 228.17 52.44"/>
-                    <polygon class="cls-1" points="228.17 51.15 275.73 51.31 275.73 52.6 228.17 52.44 228.17 51.15"/>
-                    <polygon class="cls-1" points="228.17 49.85 275.73 50.02 275.73 51.31 228.17 51.15 228.17 49.85"/>
-                    <polygon class="cls-1" points="228.17 49.62 275.73 49.79 275.73 50.02 228.17 49.85 228.17 49.62"/>
-                    <polygon class="cls-1" points="228.17 49.39 275.73 49.55 275.73 49.79 228.17 49.62 228.17 49.39"/>
-                    <polygon class="cls-1" points="228.17 49.16 275.73 49.32 275.73 49.55 228.17 49.39 228.17 49.16"/>
-                    <polygon class="cls-1" points="228.17 48.92 275.73 49.09 275.73 49.32 228.17 49.16 228.17 48.92"/>
-                    <polygon class="cls-1" points="228.17 48.69 275.73 48.86 275.73 49.09 228.17 48.92 228.17 48.69"/>
-                    <polygon class="cls-1" points="228.17 48.46 275.73 48.62 275.73 48.86 228.17 48.69 228.17 48.46"/>
-                    <polygon class="cls-1" points="228.17 48.22 275.73 48.39 275.73 48.62 228.17 48.46 228.17 48.22"/>
-                    <polygon class="cls-1" points="228.17 47.99 275.73 48.16 275.73 48.39 228.17 48.22 228.17 47.99"/>
-                    <polygon class="cls-1" points="228.17 47.76 275.73 47.92 275.73 48.16 228.17 47.99 228.17 47.76"/>
-                    <polygon class="cls-1" points="228.17 47.52 275.73 47.69 275.73 47.92 228.17 47.76 228.17 47.52"/>
-                    <polygon class="cls-1" points="228.17 47.29 275.73 47.46 275.73 47.69 228.17 47.52 228.17 47.29"/>
-                    <polygon class="cls-1" points="228.17 47.06 275.73 47.23 275.73 47.46 228.17 47.29 228.17 47.06"/>
-                    <polygon class="cls-1" points="228.17 46.83 275.73 46.99 275.73 47.23 228.17 47.06 228.17 46.83"/>
-                    <polygon class="cls-1" points="228.17 46.59 275.73 46.76 275.73 46.99 228.17 46.83 228.17 46.59"/>
-                    <polygon class="cls-1" points="228.17 46.36 275.73 46.53 275.73 46.76 228.17 46.59 228.17 46.36"/>
-                    <polygon class="cls-1" points="228.17 46.13 275.73 46.29 275.73 46.53 228.17 46.36 228.17 46.13"/>
-                    <polygon class="cls-1" points="228.17 45.89 275.73 46.06 275.73 46.29 228.17 46.13 228.17 45.89"/>
-                    <polygon class="cls-1" points="228.17 45.66 275.73 45.83 275.73 46.06 228.17 45.89 228.17 45.66"/>
-                    <polygon class="cls-1" points="228.17 45.43 275.73 45.59 275.73 45.83 228.17 45.66 228.17 45.43"/>
-                    <polygon class="cls-1" points="228.17 45.2 275.73 45.36 275.73 45.59 228.17 45.43 228.17 45.2"/>
-                    <polygon class="cls-1" points="228.17 44.96 275.73 45.13 275.73 45.36 228.17 45.2 228.17 44.96"/>
-                    <polygon class="cls-1" points="228.17 44.73 275.73 44.9 275.73 45.13 228.17 44.96 228.17 44.73"/>
-                    <polygon class="cls-1" points="228.17 44.5 275.73 44.66 275.73 44.9 228.17 44.73 228.17 44.5"/>
-                    <polygon class="cls-1" points="228.17 44.26 275.73 44.43 275.73 44.66 228.17 44.5 228.17 44.26"/>
-                    <polygon class="cls-1" points="228.17 44.03 275.73 44.2 275.73 44.43 228.17 44.26 228.17 44.03"/>
-                    <polygon class="cls-1" points="228.17 43.8 275.73 43.96 275.73 44.2 228.17 44.03 228.17 43.8"/>
-                    <polygon class="cls-1" points="228.17 43.56 275.73 43.73 275.73 43.96 228.17 43.8 228.17 43.56"/>
-                    <polygon class="cls-1" points="228.17 43.33 275.73 43.5 275.73 43.73 228.17 43.56 228.17 43.33"/>
-                    <polygon class="cls-1" points="228.17 43.1 275.73 43.27 275.73 43.5 228.17 43.33 228.17 43.1"/>
-                    <polygon class="cls-1" points="228.17 42.87 275.73 43.03 275.73 43.27 228.17 43.1 228.17 42.87"/>
-                    <polygon class="cls-1" points="228.17 42.63 275.73 42.8 275.73 43.03 228.17 42.87 228.17 42.63"/>
-                    <polygon class="cls-1" points="228.17 42.4 275.73 42.57 275.73 42.8 228.17 42.63 228.17 42.4"/>
-                    <polygon class="cls-1" points="228.17 42.17 275.73 42.33 275.73 42.57 228.17 42.4 228.17 42.17"/>
-                    <polygon class="cls-1" points="228.17 41.93 275.73 42.1 275.73 42.33 228.17 42.17 228.17 41.93"/>
-                    <polygon class="cls-1" points="228.17 41.7 275.73 41.87 275.73 42.1 228.17 41.93 228.17 41.7"/>
-                    <polygon class="cls-1" points="228.17 41.47 275.73 41.63 275.73 41.87 228.17 41.7 228.17 41.47"/>
-                    <polygon class="cls-1" points="228.17 41.23 275.73 41.4 275.73 41.63 228.17 41.47 228.17 41.23"/>
-                    <polygon class="cls-1" points="228.17 41 275.73 41.17 275.73 41.4 228.17 41.23 228.17 41"/>
-                    <polygon class="cls-1" points="228.17 40.77 275.73 40.94 275.73 41.17 228.17 41 228.17 40.77"/>
-                    <polygon class="cls-1" points="228.17 40.54 275.73 40.7 275.73 40.94 228.17 40.77 228.17 40.54"/>
-                    <polygon class="cls-1" points="228.17 40.3 275.73 40.47 275.73 40.7 228.17 40.54 228.17 40.3"/>
-                    <polygon class="cls-1" points="228.17 40.07 275.73 40.24 275.73 40.47 228.17 40.3 228.17 40.07"/>
-                    <polygon class="cls-1" points="228.17 39.84 275.73 40 275.73 40.24 228.17 40.07 228.17 39.84"/>
-                    <polygon class="cls-1" points="228.17 39.6 275.73 39.77 275.73 40 228.17 39.84 228.17 39.6"/>
-                    <polygon class="cls-1" points="228.17 39.37 275.73 39.54 275.73 39.77 228.17 39.6 228.17 39.37"/>
-                    <polygon class="cls-1" points="228.17 39.14 275.73 39.3 275.73 39.54 228.17 39.37 228.17 39.14"/>
-                    <polygon class="cls-1" points="228.17 38.91 275.73 39.07 275.73 39.3 228.17 39.14 228.17 38.91"/>
-                    <polygon class="cls-1" points="228.17 38.67 275.73 38.84 275.73 39.07 228.17 38.91 228.17 38.67"/>
-                    <polygon class="cls-1" points="228.17 38.44 275.73 38.61 275.73 38.84 228.17 38.67 228.17 38.44"/>
-                    <polygon class="cls-1" points="228.17 38.21 275.73 38.37 275.73 38.61 228.17 38.44 228.17 38.21"/>
-                    <polygon class="cls-1" points="228.17 37.97 275.73 38.14 275.73 38.37 228.17 38.21 228.17 37.97"/>
-                    <polygon class="cls-1" points="228.17 37.74 275.73 37.91 275.73 38.14 228.17 37.97 228.17 37.74"/>
-                    <polygon class="cls-1" points="228.17 37.51 275.73 37.67 275.73 37.91 228.17 37.74 228.17 37.51"/>
-                    <polygon class="cls-1" points="228.17 37.27 275.73 37.44 275.73 37.67 228.17 37.51 228.17 37.27"/>
-                    <polygon class="cls-1" points="228.17 37.04 275.73 37.21 275.73 37.44 228.17 37.27 228.17 37.04"/>
-                    <polygon class="cls-1" points="228.17 36.81 275.73 36.98 275.73 37.21 228.17 37.04 228.17 36.81"/>
-                    <polygon class="cls-1" points="228.17 36.58 275.73 36.74 275.73 36.98 228.17 36.81 228.17 36.58"/>
-                    <polygon class="cls-1" points="228.17 36.34 275.73 36.51 275.73 36.74 228.17 36.58 228.17 36.34"/>
-                    <polygon class="cls-1" points="228.17 36.11 275.73 36.28 275.73 36.51 228.17 36.34 228.17 36.11"/>
-                    <polygon class="cls-1" points="228.17 35.88 275.73 36.04 275.73 36.28 228.17 36.11 228.17 35.88"/>
-                    <polygon class="cls-1" points="228.17 35.65 275.73 35.81 275.73 36.04 228.17 35.88 228.17 35.65"/>
-                    <polygon class="cls-1" points="228.17 35.41 275.73 35.58 275.73 35.81 228.17 35.65 228.17 35.41"/>
-                    <polygon class="cls-1" points="228.17 35.18 275.73 35.34 275.73 35.58 228.17 35.41 228.17 35.18"/>
-                    <polygon class="cls-1" points="228.17 34.95 275.73 35.11 275.73 35.34 228.17 35.18 228.17 34.95"/>
-                    <polygon class="cls-1" points="228.17 34.71 275.73 34.88 275.73 35.11 228.17 34.95 228.17 34.71"/>
-                    <polygon class="cls-1" points="228.17 34.48 275.73 34.65 275.73 34.88 228.17 34.71 228.17 34.48"/>
-                    <polygon class="cls-1" points="228.17 34.25 275.73 34.41 275.73 34.65 228.17 34.48 228.17 34.25"/>
-                    <polygon class="cls-1" points="228.17 34.01 275.73 34.18 275.73 34.41 228.17 34.25 228.17 34.01"/>
-                    <polygon class="cls-1" points="228.17 33.78 275.73 33.95 275.73 34.18 228.17 34.01 228.17 33.78"/>
-                    <polygon class="cls-1" points="228.17 33.55 275.73 33.71 275.73 33.95 228.17 33.78 228.17 33.55"/>
-                    <polygon class="cls-1" points="228.17 33.31 275.73 33.48 275.73 33.71 228.17 33.55 228.17 33.31"/>
-                    <polygon class="cls-1" points="228.17 33.08 275.73 33.25 275.73 33.48 228.17 33.31 228.17 33.08"/>
-                    <polygon class="cls-1" points="228.17 32.85 275.73 33.02 275.73 33.25 228.17 33.08 228.17 32.85"/>
-                    <polygon class="cls-1" points="228.17 32.62 275.73 32.78 275.73 33.02 228.17 32.85 228.17 32.62"/>
-                    <polygon class="cls-1" points="228.17 32.38 275.73 32.55 275.73 32.78 228.17 32.62 228.17 32.38"/>
-                    <polygon class="cls-1" points="228.17 32.15 275.73 32.32 275.73 32.55 228.17 32.38 228.17 32.15"/>
-                    <polygon class="cls-1" points="228.17 31.92 275.73 32.08 275.73 32.32 228.17 32.15 228.17 31.92"/>
-                    <polygon class="cls-1" points="228.17 31.68 275.73 31.85 275.73 32.08 228.17 31.92 228.17 31.68"/>
-                    <polygon class="cls-1" points="228.17 31.45 275.73 31.62 275.73 31.85 228.17 31.68 228.17 31.45"/>
-                    <polygon class="cls-1" points="228.17 31.22 275.73 31.39 275.73 31.62 228.17 31.45 228.17 31.22"/>
-                    <polygon class="cls-1" points="228.17 30.99 275.73 31.15 275.73 31.39 228.17 31.22 228.17 30.99"/>
-                    <polygon class="cls-1" points="228.17 30.75 275.73 30.92 275.73 31.15 228.17 30.99 228.17 30.75"/>
-                    <polygon class="cls-1" points="228.17 30.52 275.73 30.69 275.73 30.92 228.17 30.75 228.17 30.52"/>
-                    <polygon class="cls-1" points="228.17 30.29 275.73 30.45 275.73 30.69 228.17 30.52 228.17 30.29"/>
-                    <polygon class="cls-1" points="228.17 30.05 275.73 30.22 275.73 30.45 228.17 30.29 228.17 30.05"/>
-                    <polygon class="cls-1" points="228.17 29.82 275.73 29.99 275.73 30.22 228.17 30.05 228.17 29.82"/>
-                    <polygon class="cls-1" points="228.17 29.59 275.73 29.75 275.73 29.99 228.17 29.82 228.17 29.59"/>
-                    <polygon class="cls-1" points="228.17 29.36 275.73 29.52 275.73 29.75 228.17 29.59 228.17 29.36"/>
-                    <polygon class="cls-1" points="228.17 29.12 275.73 29.29 275.73 29.52 228.17 29.36 228.17 29.12"/>
-                    <polygon class="cls-1" points="228.17 28.89 275.73 29.06 275.73 29.29 228.17 29.12 228.17 28.89"/>
-                    <polygon class="cls-1" points="228.17 28.66 275.73 28.82 275.73 29.06 228.17 28.89 228.17 28.66"/>
-                    <polygon class="cls-1" points="275.73 28.82 228.17 28.66 228.17 27.83 275.73 27.83 275.73 28.82"/>
-                </g>
-                <path class="cls-1"
-                      d="M323.36,82.59h-9.74c-4,0-4.87-.23-6.32-2.85l-7.23-12.65-7,12.65c-1.44,2.39-2.2,2.85-6.31,2.85H277.4c-2.28,0-2.82-1.39-1.6-3.24l15.68-24.68L276.56,30.92c-1.14-1.7-.61-3.09,1.52-3.09h9.13c3.88,0,4.8.31,6.24,2.7l6.85,11.88,6.77-11.88c1.45-2.55,2.44-2.7,5.86-2.7h9.74c2.21,0,2.59,1.39,1.52,3.09L309.13,54.67,325,79.35C326.17,81.05,325.72,82.59,323.36,82.59Z"/>
-                <g class="cls-4">
-                    <polygon class="cls-1" points="274.58 82.42 323.27 82.59 274.58 82.59 274.58 82.42"/>
-                    <polygon class="cls-1"
-                             points="274.58 82.2 326.17 82.38 326.17 82.59 323.27 82.59 274.58 82.42 274.58 82.2"/>
-                    <polygon class="cls-1" points="274.58 81.99 326.17 82.17 326.17 82.38 274.58 82.2 274.58 81.99"/>
-                    <polygon class="cls-1" points="274.58 81.77 326.17 81.95 326.17 82.17 274.58 81.99 274.58 81.77"/>
-                    <polygon class="cls-1" points="274.58 81.55 326.17 81.73 326.17 81.95 274.58 81.77 274.58 81.55"/>
-                    <polygon class="cls-1" points="274.58 81.34 326.17 81.52 326.17 81.73 274.58 81.55 274.58 81.34"/>
-                    <polygon class="cls-1" points="274.58 81.12 326.17 81.3 326.17 81.52 274.58 81.34 274.58 81.12"/>
-                    <polygon class="cls-1" points="274.58 80.9 326.17 81.08 326.17 81.3 274.58 81.12 274.58 80.9"/>
-                    <polygon class="cls-1" points="274.58 80.69 326.17 80.87 326.17 81.08 274.58 80.9 274.58 80.69"/>
-                    <polygon class="cls-1" points="274.58 80.47 326.17 80.65 326.17 80.87 274.58 80.69 274.58 80.47"/>
-                    <polygon class="cls-1" points="274.58 80.25 326.17 80.44 326.17 80.65 274.58 80.47 274.58 80.25"/>
-                    <polygon class="cls-1" points="274.58 80.04 326.17 80.22 326.17 80.44 274.58 80.25 274.58 80.04"/>
-                    <polygon class="cls-1" points="274.58 79.82 326.17 80 326.17 80.22 274.58 80.04 274.58 79.82"/>
-                    <polygon class="cls-1" points="274.58 79.61 326.17 79.79 326.17 80 274.58 79.82 274.58 79.61"/>
-                    <polygon class="cls-1" points="274.58 79.39 326.17 79.57 326.17 79.79 274.58 79.61 274.58 79.39"/>
-                    <polygon class="cls-1" points="274.58 79.17 326.17 79.35 326.17 79.57 274.58 79.39 274.58 79.17"/>
-                    <polygon class="cls-1" points="274.58 78.96 326.17 79.14 326.17 79.35 274.58 79.17 274.58 78.96"/>
-                    <polygon class="cls-1" points="274.58 78.74 326.17 78.92 326.17 79.14 274.58 78.96 274.58 78.74"/>
-                    <polygon class="cls-1" points="274.58 78.52 326.17 78.7 326.17 78.92 274.58 78.74 274.58 78.52"/>
-                    <polygon class="cls-1" points="274.58 78.31 326.17 78.49 326.17 78.7 274.58 78.52 274.58 78.31"/>
-                    <polygon class="cls-1" points="274.58 78.09 326.17 78.27 326.17 78.49 274.58 78.31 274.58 78.09"/>
-                    <polygon class="cls-1" points="274.58 77.88 326.17 78.06 326.17 78.27 274.58 78.09 274.58 77.88"/>
-                    <polygon class="cls-1" points="274.58 77.66 326.17 77.84 326.17 78.06 274.58 77.88 274.58 77.66"/>
-                    <polygon class="cls-1" points="274.58 77.44 326.17 77.62 326.17 77.84 274.58 77.66 274.58 77.44"/>
-                    <polygon class="cls-1" points="274.58 77.23 326.17 77.41 326.17 77.62 274.58 77.44 274.58 77.23"/>
-                    <polygon class="cls-1" points="274.58 77.01 326.17 77.19 326.17 77.41 274.58 77.23 274.58 77.01"/>
-                    <polygon class="cls-1" points="274.58 76.79 326.17 76.97 326.17 77.19 274.58 77.01 274.58 76.79"/>
-                    <polygon class="cls-1" points="274.58 76.58 326.17 76.76 326.17 76.97 274.58 76.79 274.58 76.58"/>
-                    <polygon class="cls-1" points="274.58 76.36 326.17 76.54 326.17 76.76 274.58 76.58 274.58 76.36"/>
-                    <polygon class="cls-1" points="274.58 76.14 326.17 76.33 326.17 76.54 274.58 76.36 274.58 76.14"/>
-                    <polygon class="cls-1" points="274.58 75.93 326.17 76.11 326.17 76.33 274.58 76.14 274.58 75.93"/>
-                    <polygon class="cls-1" points="274.58 75.71 326.17 75.89 326.17 76.11 274.58 75.93 274.58 75.71"/>
-                    <polygon class="cls-1" points="274.58 75.5 326.17 75.68 326.17 75.89 274.58 75.71 274.58 75.5"/>
-                    <polygon class="cls-1" points="274.58 75.28 326.17 75.46 326.17 75.68 274.58 75.5 274.58 75.28"/>
-                    <polygon class="cls-1" points="274.58 75.06 326.17 75.24 326.17 75.46 274.58 75.28 274.58 75.06"/>
-                    <polygon class="cls-1" points="274.58 74.85 326.17 75.03 326.17 75.24 274.58 75.06 274.58 74.85"/>
-                    <polygon class="cls-1" points="274.58 74.63 326.17 74.81 326.17 75.03 274.58 74.85 274.58 74.63"/>
-                    <polygon class="cls-1" points="274.58 74.41 326.17 74.59 326.17 74.81 274.58 74.63 274.58 74.41"/>
-                    <polygon class="cls-1" points="274.58 74.2 326.17 74.38 326.17 74.59 274.58 74.41 274.58 74.2"/>
-                    <polygon class="cls-1" points="274.58 73.98 326.17 74.16 326.17 74.38 274.58 74.2 274.58 73.98"/>
-                    <polygon class="cls-1" points="274.58 73.77 326.17 73.94 326.17 74.16 274.58 73.98 274.58 73.77"/>
-                    <polygon class="cls-1" points="274.58 73.55 326.17 73.73 326.17 73.94 274.58 73.77 274.58 73.55"/>
-                    <polygon class="cls-1" points="274.58 73.33 326.17 73.51 326.17 73.73 274.58 73.55 274.58 73.33"/>
-                    <polygon class="cls-1" points="274.58 73.12 326.17 73.3 326.17 73.51 274.58 73.33 274.58 73.12"/>
-                    <polygon class="cls-1" points="274.58 72.9 326.17 73.08 326.17 73.3 274.58 73.12 274.58 72.9"/>
-                    <polygon class="cls-1" points="274.58 72.68 326.17 72.86 326.17 73.08 274.58 72.9 274.58 72.68"/>
-                    <polygon class="cls-1" points="274.58 72.47 326.17 72.65 326.17 72.86 274.58 72.68 274.58 72.47"/>
-                    <polygon class="cls-1" points="274.58 72.25 326.17 72.43 326.17 72.65 274.58 72.47 274.58 72.25"/>
-                    <polygon class="cls-1" points="274.58 72.03 326.17 72.22 326.17 72.43 274.58 72.25 274.58 72.03"/>
-                    <polygon class="cls-1" points="274.58 71.82 326.17 72 326.17 72.22 274.58 72.03 274.58 71.82"/>
-                    <polygon class="cls-1" points="274.58 71.6 326.17 71.78 326.17 72 274.58 71.82 274.58 71.6"/>
-                    <polygon class="cls-1" points="274.58 71.39 326.17 71.57 326.17 71.78 274.58 71.6 274.58 71.39"/>
-                    <polygon class="cls-1" points="274.58 71.17 326.17 71.35 326.17 71.57 274.58 71.39 274.58 71.17"/>
-                    <polygon class="cls-1" points="274.58 70.95 326.17 71.13 326.17 71.35 274.58 71.17 274.58 70.95"/>
-                    <polygon class="cls-1" points="274.58 70.74 326.17 70.92 326.17 71.13 274.58 70.95 274.58 70.74"/>
-                    <polygon class="cls-1" points="274.58 70.52 326.17 70.7 326.17 70.92 274.58 70.74 274.58 70.52"/>
-                    <polygon class="cls-1" points="274.58 70.3 326.17 70.48 326.17 70.7 274.58 70.52 274.58 70.3"/>
-                    <polygon class="cls-1" points="274.58 70.09 326.17 70.27 326.17 70.48 274.58 70.3 274.58 70.09"/>
-                    <polygon class="cls-1" points="274.58 69.87 326.17 70.05 326.17 70.27 274.58 70.09 274.58 69.87"/>
-                    <polygon class="cls-1" points="274.58 69.66 326.17 69.83 326.17 70.05 274.58 69.87 274.58 69.66"/>
-                    <polygon class="cls-1" points="274.58 69.44 326.17 69.62 326.17 69.83 274.58 69.66 274.58 69.44"/>
-                    <polygon class="cls-1" points="274.58 69.22 326.17 69.4 326.17 69.62 274.58 69.44 274.58 69.22"/>
-                    <polygon class="cls-1" points="274.58 69.01 326.17 69.19 326.17 69.4 274.58 69.22 274.58 69.01"/>
-                    <polygon class="cls-1" points="274.58 68.79 326.17 68.97 326.17 69.19 274.58 69.01 274.58 68.79"/>
-                    <polygon class="cls-1" points="274.58 68.57 326.17 68.75 326.17 68.97 274.58 68.79 274.58 68.57"/>
-                    <polygon class="cls-1" points="274.58 68.36 326.17 68.54 326.17 68.75 274.58 68.57 274.58 68.36"/>
-                    <polygon class="cls-1" points="274.58 68.14 326.17 68.32 326.17 68.54 274.58 68.36 274.58 68.14"/>
-                    <polygon class="cls-1" points="274.58 67.92 326.17 68.1 326.17 68.32 274.58 68.14 274.58 67.92"/>
-                    <polygon class="cls-1" points="274.58 67.71 326.17 67.89 326.17 68.1 274.58 67.92 274.58 67.71"/>
-                    <polygon class="cls-1" points="274.58 67.49 326.17 67.67 326.17 67.89 274.58 67.71 274.58 67.49"/>
-                    <polygon class="cls-1" points="274.58 67.28 326.17 67.46 326.17 67.67 274.58 67.49 274.58 67.28"/>
-                    <polygon class="cls-1" points="274.58 67.06 326.17 67.24 326.17 67.46 274.58 67.28 274.58 67.06"/>
-                    <polygon class="cls-1" points="274.58 66.84 326.17 67.02 326.17 67.24 274.58 67.06 274.58 66.84"/>
-                    <polygon class="cls-1" points="274.58 66.63 326.17 66.81 326.17 67.02 274.58 66.84 274.58 66.63"/>
-                    <polygon class="cls-1" points="274.58 66.41 326.17 66.59 326.17 66.81 274.58 66.63 274.58 66.41"/>
-                    <polygon class="cls-1" points="274.58 66.19 326.17 66.37 326.17 66.59 274.58 66.41 274.58 66.19"/>
-                    <polygon class="cls-1" points="274.58 65.98 326.17 66.16 326.17 66.37 274.58 66.19 274.58 65.98"/>
-                    <polygon class="cls-1" points="274.58 65.76 326.17 65.94 326.17 66.16 274.58 65.98 274.58 65.76"/>
-                    <polygon class="cls-1" points="274.58 65.54 326.17 65.72 326.17 65.94 274.58 65.76 274.58 65.54"/>
-                    <polygon class="cls-1" points="274.58 65.33 326.17 65.51 326.17 65.72 274.58 65.54 274.58 65.33"/>
-                    <polygon class="cls-1" points="274.58 65.11 326.17 65.29 326.17 65.51 274.58 65.33 274.58 65.11"/>
-                    <polygon class="cls-1" points="274.58 64.9 326.17 65.08 326.17 65.29 274.58 65.11 274.58 64.9"/>
-                    <polygon class="cls-1" points="274.58 64.68 326.17 64.86 326.17 65.08 274.58 64.9 274.58 64.68"/>
-                    <polygon class="cls-1" points="274.58 64.46 326.17 64.64 326.17 64.86 274.58 64.68 274.58 64.46"/>
-                    <polygon class="cls-1" points="274.58 64.25 326.17 64.43 326.17 64.64 274.58 64.46 274.58 64.25"/>
-                    <polygon class="cls-1" points="274.58 64.03 326.17 64.21 326.17 64.43 274.58 64.25 274.58 64.03"/>
-                    <polygon class="cls-1" points="274.58 63.81 326.17 63.99 326.17 64.21 274.58 64.03 274.58 63.81"/>
-                    <polygon class="cls-1" points="274.58 63.6 326.17 63.78 326.17 63.99 274.58 63.81 274.58 63.6"/>
-                    <polygon class="cls-1" points="274.58 63.38 326.17 63.56 326.17 63.78 274.58 63.6 274.58 63.38"/>
-                    <polygon class="cls-1" points="274.58 63.16 326.17 63.34 326.17 63.56 274.58 63.38 274.58 63.16"/>
-                    <polygon class="cls-1" points="274.58 62.95 326.17 63.13 326.17 63.34 274.58 63.16 274.58 62.95"/>
-                    <polygon class="cls-1" points="274.58 62.73 326.17 62.91 326.17 63.13 274.58 62.95 274.58 62.73"/>
-                    <polygon class="cls-1" points="274.58 62.52 326.17 62.7 326.17 62.91 274.58 62.73 274.58 62.52"/>
-                    <polygon class="cls-1" points="274.58 62.3 326.17 62.48 326.17 62.7 274.58 62.52 274.58 62.3"/>
-                    <polygon class="cls-1" points="274.58 62.08 326.17 62.26 326.17 62.48 274.58 62.3 274.58 62.08"/>
-                    <polygon class="cls-1" points="274.58 61.87 326.17 62.05 326.17 62.26 274.58 62.08 274.58 61.87"/>
-                    <polygon class="cls-1" points="274.58 61.65 326.17 61.83 326.17 62.05 274.58 61.87 274.58 61.65"/>
-                    <polygon class="cls-1" points="274.58 61.43 326.17 61.61 326.17 61.83 274.58 61.65 274.58 61.43"/>
-                    <polygon class="cls-1" points="274.58 61.22 326.17 61.4 326.17 61.61 274.58 61.43 274.58 61.22"/>
-                    <polygon class="cls-1" points="274.58 61 326.17 61.18 326.17 61.4 274.58 61.22 274.58 61"/>
-                    <polygon class="cls-1" points="274.58 60.78 326.17 60.97 326.17 61.18 274.58 61 274.58 60.78"/>
-                    <polygon class="cls-1" points="274.58 60.57 326.17 60.75 326.17 60.97 274.58 60.78 274.58 60.57"/>
-                    <polygon class="cls-1" points="274.58 60.35 326.17 60.53 326.17 60.75 274.58 60.57 274.58 60.35"/>
-                    <polygon class="cls-1" points="274.58 59.06 326.17 59.24 326.17 60.53 274.58 60.35 274.58 59.06"/>
-                    <polygon class="cls-1" points="274.58 57.77 326.17 57.95 326.17 59.24 274.58 59.06 274.58 57.77"/>
-                    <polygon class="cls-1" points="274.58 56.48 326.17 56.66 326.17 57.95 274.58 57.77 274.58 56.48"/>
-                    <polygon class="cls-1" points="274.58 55.19 326.17 55.37 326.17 56.66 274.58 56.48 274.58 55.19"/>
-                    <polygon class="cls-1" points="274.58 53.89 326.17 54.07 326.17 55.37 274.58 55.19 274.58 53.89"/>
-                    <polygon class="cls-1" points="274.58 52.6 326.17 52.78 326.17 54.07 274.58 53.89 274.58 52.6"/>
-                    <polygon class="cls-1" points="274.58 51.31 326.17 51.49 326.17 52.78 274.58 52.6 274.58 51.31"/>
-                    <polygon class="cls-1" points="274.58 50.02 326.17 50.2 326.17 51.49 274.58 51.31 274.58 50.02"/>
-                    <polygon class="cls-1" points="274.58 49.78 326.17 49.96 326.17 50.2 274.58 50.02 274.58 49.78"/>
-                    <polygon class="cls-1" points="274.58 49.55 326.17 49.73 326.17 49.96 274.58 49.78 274.58 49.55"/>
-                    <polygon class="cls-1" points="274.58 49.32 326.17 49.5 326.17 49.73 274.58 49.55 274.58 49.32"/>
-                    <polygon class="cls-1" points="274.58 49.09 326.17 49.27 326.17 49.5 274.58 49.32 274.58 49.09"/>
-                    <polygon class="cls-1" points="274.58 48.85 326.17 49.03 326.17 49.27 274.58 49.09 274.58 48.85"/>
-                    <polygon class="cls-1" points="274.58 48.62 326.17 48.8 326.17 49.03 274.58 48.85 274.58 48.62"/>
-                    <polygon class="cls-1" points="274.58 48.39 326.17 48.57 326.17 48.8 274.58 48.62 274.58 48.39"/>
-                    <polygon class="cls-1" points="274.58 48.15 326.17 48.33 326.17 48.57 274.58 48.39 274.58 48.15"/>
-                    <polygon class="cls-1" points="274.58 47.92 326.17 48.1 326.17 48.33 274.58 48.15 274.58 47.92"/>
-                    <polygon class="cls-1" points="274.58 47.69 326.17 47.87 326.17 48.1 274.58 47.92 274.58 47.69"/>
-                    <polygon class="cls-1" points="274.58 47.45 326.17 47.63 326.17 47.87 274.58 47.69 274.58 47.45"/>
-                    <polygon class="cls-1" points="274.58 47.22 326.17 47.4 326.17 47.63 274.58 47.45 274.58 47.22"/>
-                    <polygon class="cls-1" points="274.58 46.99 326.17 47.17 326.17 47.4 274.58 47.22 274.58 46.99"/>
-                    <polygon class="cls-1" points="274.58 46.76 326.17 46.94 326.17 47.17 274.58 46.99 274.58 46.76"/>
-                    <polygon class="cls-1" points="274.58 46.52 326.17 46.7 326.17 46.94 274.58 46.76 274.58 46.52"/>
-                    <polygon class="cls-1" points="274.58 46.29 326.17 46.47 326.17 46.7 274.58 46.52 274.58 46.29"/>
-                    <polygon class="cls-1" points="274.58 46.06 326.17 46.24 326.17 46.47 274.58 46.29 274.58 46.06"/>
-                    <polygon class="cls-1" points="274.58 45.82 326.17 46 326.17 46.24 274.58 46.06 274.58 45.82"/>
-                    <polygon class="cls-1" points="274.58 45.59 326.17 45.77 326.17 46 274.58 45.82 274.58 45.59"/>
-                    <polygon class="cls-1" points="274.58 45.36 326.17 45.54 326.17 45.77 274.58 45.59 274.58 45.36"/>
-                    <polygon class="cls-1" points="274.58 45.13 326.17 45.3 326.17 45.54 274.58 45.36 274.58 45.13"/>
-                    <polygon class="cls-1" points="274.58 44.89 326.17 45.07 326.17 45.3 274.58 45.13 274.58 44.89"/>
-                    <polygon class="cls-1" points="274.58 44.66 326.17 44.84 326.17 45.07 274.58 44.89 274.58 44.66"/>
-                    <polygon class="cls-1" points="274.58 44.43 326.17 44.61 326.17 44.84 274.58 44.66 274.58 44.43"/>
-                    <polygon class="cls-1" points="274.58 44.19 326.17 44.37 326.17 44.61 274.58 44.43 274.58 44.19"/>
-                    <polygon class="cls-1" points="274.58 43.96 326.17 44.14 326.17 44.37 274.58 44.19 274.58 43.96"/>
-                    <polygon class="cls-1" points="274.58 43.73 326.17 43.91 326.17 44.14 274.58 43.96 274.58 43.73"/>
-                    <polygon class="cls-1" points="274.58 43.49 326.17 43.67 326.17 43.91 274.58 43.73 274.58 43.49"/>
-                    <polygon class="cls-1" points="274.58 43.26 326.17 43.44 326.17 43.67 274.58 43.49 274.58 43.26"/>
-                    <polygon class="cls-1" points="274.58 43.03 326.17 43.21 326.17 43.44 274.58 43.26 274.58 43.03"/>
-                    <polygon class="cls-1" points="274.58 42.8 326.17 42.98 326.17 43.21 274.58 43.03 274.58 42.8"/>
-                    <polygon class="cls-1" points="274.58 42.56 326.17 42.74 326.17 42.98 274.58 42.8 274.58 42.56"/>
-                    <polygon class="cls-1" points="274.58 42.33 326.17 42.51 326.17 42.74 274.58 42.56 274.58 42.33"/>
-                    <polygon class="cls-1" points="274.58 42.1 326.17 42.28 326.17 42.51 274.58 42.33 274.58 42.1"/>
-                    <polygon class="cls-1" points="274.58 41.86 326.17 42.04 326.17 42.28 274.58 42.1 274.58 41.86"/>
-                    <polygon class="cls-1" points="274.58 41.63 326.17 41.81 326.17 42.04 274.58 41.86 274.58 41.63"/>
-                    <polygon class="cls-1" points="274.58 41.4 326.17 41.58 326.17 41.81 274.58 41.63 274.58 41.4"/>
-                    <polygon class="cls-1" points="274.58 41.16 326.17 41.34 326.17 41.58 274.58 41.4 274.58 41.16"/>
-                    <polygon class="cls-1" points="274.58 40.93 326.17 41.11 326.17 41.34 274.58 41.16 274.58 40.93"/>
-                    <polygon class="cls-1" points="274.58 40.7 326.17 40.88 326.17 41.11 274.58 40.93 274.58 40.7"/>
-                    <polygon class="cls-1" points="274.58 40.47 326.17 40.65 326.17 40.88 274.58 40.7 274.58 40.47"/>
-                    <polygon class="cls-1" points="274.58 40.23 326.17 40.41 326.17 40.65 274.58 40.47 274.58 40.23"/>
-                    <polygon class="cls-1" points="274.58 40 326.17 40.18 326.17 40.41 274.58 40.23 274.58 40"/>
-                    <polygon class="cls-1" points="274.58 39.77 326.17 39.95 326.17 40.18 274.58 40 274.58 39.77"/>
-                    <polygon class="cls-1" points="274.58 39.53 326.17 39.71 326.17 39.95 274.58 39.77 274.58 39.53"/>
-                    <polygon class="cls-1" points="274.58 39.3 326.17 39.48 326.17 39.71 274.58 39.53 274.58 39.3"/>
-                    <polygon class="cls-1" points="274.58 39.07 326.17 39.25 326.17 39.48 274.58 39.3 274.58 39.07"/>
-                    <polygon class="cls-1" points="274.58 38.84 326.17 39.02 326.17 39.25 274.58 39.07 274.58 38.84"/>
-                    <polygon class="cls-1" points="274.58 38.6 326.17 38.78 326.17 39.02 274.58 38.84 274.58 38.6"/>
-                    <polygon class="cls-1" points="274.58 38.37 326.17 38.55 326.17 38.78 274.58 38.6 274.58 38.37"/>
-                    <polygon class="cls-1" points="274.58 38.14 326.17 38.32 326.17 38.55 274.58 38.37 274.58 38.14"/>
-                    <polygon class="cls-1" points="274.58 37.9 326.17 38.08 326.17 38.32 274.58 38.14 274.58 37.9"/>
-                    <polygon class="cls-1" points="274.58 37.67 326.17 37.85 326.17 38.08 274.58 37.9 274.58 37.67"/>
-                    <polygon class="cls-1" points="274.58 37.44 326.17 37.62 326.17 37.85 274.58 37.67 274.58 37.44"/>
-                    <polygon class="cls-1" points="274.58 37.2 326.17 37.38 326.17 37.62 274.58 37.44 274.58 37.2"/>
-                    <polygon class="cls-1" points="274.58 36.97 326.17 37.15 326.17 37.38 274.58 37.2 274.58 36.97"/>
-                    <polygon class="cls-1" points="274.58 36.74 326.17 36.92 326.17 37.15 274.58 36.97 274.58 36.74"/>
-                    <polygon class="cls-1" points="274.58 36.51 326.17 36.69 326.17 36.92 274.58 36.74 274.58 36.51"/>
-                    <polygon class="cls-1" points="274.58 36.27 326.17 36.45 326.17 36.69 274.58 36.51 274.58 36.27"/>
-                    <polygon class="cls-1" points="274.58 36.04 326.17 36.22 326.17 36.45 274.58 36.27 274.58 36.04"/>
-                    <polygon class="cls-1" points="274.58 35.81 326.17 35.99 326.17 36.22 274.58 36.04 274.58 35.81"/>
-                    <polygon class="cls-1" points="274.58 35.57 326.17 35.75 326.17 35.99 274.58 35.81 274.58 35.57"/>
-                    <polygon class="cls-1" points="274.58 35.34 326.17 35.52 326.17 35.75 274.58 35.57 274.58 35.34"/>
-                    <polygon class="cls-1" points="274.58 35.11 326.17 35.29 326.17 35.52 274.58 35.34 274.58 35.11"/>
-                    <polygon class="cls-1" points="274.58 34.88 326.17 35.05 326.17 35.29 274.58 35.11 274.58 34.88"/>
-                    <polygon class="cls-1" points="274.58 34.64 326.17 34.82 326.17 35.05 274.58 34.88 274.58 34.64"/>
-                    <polygon class="cls-1" points="274.58 34.41 326.17 34.59 326.17 34.82 274.58 34.64 274.58 34.41"/>
-                    <polygon class="cls-1" points="274.58 34.18 326.17 34.36 326.17 34.59 274.58 34.41 274.58 34.18"/>
-                    <polygon class="cls-1" points="274.58 33.94 326.17 34.12 326.17 34.36 274.58 34.18 274.58 33.94"/>
-                    <polygon class="cls-1" points="274.58 33.71 326.17 33.89 326.17 34.12 274.58 33.94 274.58 33.71"/>
-                    <polygon class="cls-1" points="274.58 33.48 326.17 33.66 326.17 33.89 274.58 33.71 274.58 33.48"/>
-                    <polygon class="cls-1" points="274.58 33.24 326.17 33.42 326.17 33.66 274.58 33.48 274.58 33.24"/>
-                    <polygon class="cls-1" points="274.58 33.01 326.17 33.19 326.17 33.42 274.58 33.24 274.58 33.01"/>
-                    <polygon class="cls-1" points="274.58 32.78 326.17 32.96 326.17 33.19 274.58 33.01 274.58 32.78"/>
-                    <polygon class="cls-1" points="274.58 32.55 326.17 32.73 326.17 32.96 274.58 32.78 274.58 32.55"/>
-                    <polygon class="cls-1" points="274.58 32.31 326.17 32.49 326.17 32.73 274.58 32.55 274.58 32.31"/>
-                    <polygon class="cls-1" points="274.58 32.08 326.17 32.26 326.17 32.49 274.58 32.31 274.58 32.08"/>
-                    <polygon class="cls-1" points="274.58 31.85 326.17 32.03 326.17 32.26 274.58 32.08 274.58 31.85"/>
-                    <polygon class="cls-1" points="274.58 31.61 326.17 31.79 326.17 32.03 274.58 31.85 274.58 31.61"/>
-                    <polygon class="cls-1" points="274.58 31.38 326.17 31.56 326.17 31.79 274.58 31.61 274.58 31.38"/>
-                    <polygon class="cls-1" points="274.58 31.15 326.17 31.33 326.17 31.56 274.58 31.38 274.58 31.15"/>
-                    <polygon class="cls-1" points="274.58 30.91 326.17 31.09 326.17 31.33 274.58 31.15 274.58 30.91"/>
-                    <polygon class="cls-1" points="274.58 30.68 326.17 30.86 326.17 31.09 274.58 30.91 274.58 30.68"/>
-                    <polygon class="cls-1" points="274.58 30.45 326.17 30.63 326.17 30.86 274.58 30.68 274.58 30.45"/>
-                    <polygon class="cls-1" points="274.58 30.22 326.17 30.4 326.17 30.63 274.58 30.45 274.58 30.22"/>
-                    <polygon class="cls-1" points="274.58 29.98 326.17 30.16 326.17 30.4 274.58 30.22 274.58 29.98"/>
-                    <polygon class="cls-1" points="274.58 29.75 326.17 29.93 326.17 30.16 274.58 29.98 274.58 29.75"/>
-                    <polygon class="cls-1" points="274.58 29.52 326.17 29.7 326.17 29.93 274.58 29.75 274.58 29.52"/>
-                    <polygon class="cls-1" points="274.58 29.28 326.17 29.46 326.17 29.7 274.58 29.52 274.58 29.28"/>
-                    <polygon class="cls-1" points="274.58 29.05 326.17 29.23 326.17 29.46 274.58 29.28 274.58 29.05"/>
-                    <polygon class="cls-1" points="274.58 28.82 326.17 29 326.17 29.23 274.58 29.05 274.58 28.82"/>
-                    <polygon class="cls-1" points="326.17 29 274.58 28.82 274.58 27.83 326.17 27.83 326.17 29"/>
-                </g>
-                <path class="cls-1"
-                      d="M281.78,21.08h-.29c-.23,0-.3,0-.35-.17L280.41,19h-3.08l-.74,1.87c0,.13-.12.17-.35.17H276c-.16,0-.19-.06-.14-.18l2.64-6.67c0-.13.11-.16.25-.16h.3c.14,0,.2,0,.25.15l2.64,6.68C282,21,281.93,21.08,281.78,21.08ZM279,15.42a2.46,2.46,0,0,1-.14-.67h-.05a3,3,0,0,1-.12.67l-1.18,3h2.67Z"/>
-                <path class="cls-1"
-                      d="M290.42,16.28a2,2,0,0,1-2.22,2.18h-2.12v2.43c0,.15-.05.19-.19.19h-.33c-.15,0-.2,0-.2-.19v-6.6c0-.14.05-.19.2-.19h2.64A2,2,0,0,1,290.42,16.28Zm-.76,0a1.4,1.4,0,0,0-1.54-1.51h-2.05v3h2.05A1.4,1.4,0,0,0,289.66,16.28Z"/>
-                <path class="cls-1"
-                      d="M298.82,21.08h-.28c-.24,0-.31,0-.36-.17L297.45,19h-3.08l-.74,1.87c-.05.13-.11.17-.35.17H293c-.15,0-.18-.06-.13-.18l2.63-6.67c.05-.13.11-.16.25-.16h.31a.21.21,0,0,1,.24.15L299,20.9C299,21,299,21.08,298.82,21.08Zm-2.75-5.66a2.46,2.46,0,0,1-.14-.67h-.05a2.7,2.7,0,0,1-.13.67l-1.18,3h2.68Z"/>
-                <path class="cls-1"
-                      d="M304.75,14a2.37,2.37,0,0,1,2.62,1.68c.05.15,0,.21-.13.26l-.31.11c-.13,0-.19,0-.24-.12a1.73,1.73,0,0,0-1.94-1.27c-1.31,0-2,.67-2,1.8v2.34c0,1.12.7,1.8,2,1.8a1.74,1.74,0,0,0,1.95-1.3c.06-.13.12-.16.25-.12l.31.11c.14.05.17.11.12.25a2.39,2.39,0,0,1-2.63,1.72c-1.74,0-2.71-.93-2.71-2.47V16.43C302,14.89,303,14,304.75,14Z"/>
-                <path class="cls-1"
-                      d="M316.25,14.29v6.6c0,.15-.05.19-.2.19h-.32c-.15,0-.2,0-.2-.19v-3h-3.74v3c0,.15-.05.19-.2.19h-.32c-.15,0-.2,0-.2-.19v-6.6c0-.14.05-.19.2-.19h.32c.15,0,.2.05.2.19v2.92h3.74V14.29c0-.14.05-.19.2-.19h.32C316.2,14.1,316.25,14.15,316.25,14.29Z"/>
-                <path class="cls-1"
-                      d="M324.72,14.29v.28c0,.15-.05.2-.2.2h-3.47v2.44h3c.14,0,.19.05.19.19v.28c0,.15,0,.2-.19.2h-3v2.53h3.6c.13,0,.18.05.18.2v.28c0,.15-.05.19-.18.19h-4.12c-.14,0-.19,0-.19-.19v-6.6c0-.14.05-.19.19-.19h4C324.67,14.1,324.72,14.15,324.72,14.29Z"/>
-                <path class="cls-1" d="M71.18,83.58h0Z"/>
-                <path class="cls-1" d="M63.24,64s0,0,0,0S63.25,64,63.24,64Z"/>
-                <path class="cls-1" d="M61.12,82.93s0,0,0,.08h0l0,0Z"/>
-                <path class="cls-1" d="M59.69,69.29s.08.12,0,0Z"/>
-                <path class="cls-1" d="M52.11,65.19a.09.09,0,0,0,0,0s0,0,0,0S52.09,65.21,52.11,65.19Z"/>
-                <path class="cls-1" d="M50.38,2.18h0Z"/>
-                <rect class="cls-1" x="47.2" y="72.88" width="0.01" height="0.01"/>
-                <path class="cls-1" d="M46.28,6.58h0a7.14,7.14,0,0,0-.56.54A7.14,7.14,0,0,1,46.28,6.58Z"/>
-                <path class="cls-1" d="M41.39,80.56a2.77,2.77,0,0,1-.1.26"/>
-                <path class="cls-1" d="M63.24,64s0,0,0,0S63.25,64,63.24,64Z"/>
-                <path class="cls-1" d="M59.69,69.29s.08.12,0,0Z"/>
-                <path class="cls-1" d="M52.11,65.19a.09.09,0,0,0,0,0s0,0,0,0S52.09,65.21,52.11,65.19Z"/>
-                <path class="cls-1" d="M50.38,2.18h0Z"/>
-                <rect class="cls-1" x="47.2" y="72.88" width="0.01" height="0.01"/>
-                <path class="cls-1" d="M46.28,6.58h0a7.14,7.14,0,0,0-.56.54A7.14,7.14,0,0,1,46.28,6.58Z"/>
-                <path class="cls-1" d="M65,78.76l-.2,0c0,.14.06.29.09.42C65,79,65,78.89,65,78.76Z"/>
-                <path class="cls-1" d="M71.18,83.58h0Z"/>
-                <path class="cls-1" d="M63.24,64s0,0,0,0S63.25,64,63.24,64Z"/>
-                <path class="cls-1" d="M61.12,82.93s0,0,0,.08h0l0,0Z"/>
-                <path class="cls-1" d="M59.69,69.29s.08.12,0,0Z"/>
-                <path class="cls-1" d="M52.11,65.19a.09.09,0,0,0,0,0s0,0,0,0S52.09,65.21,52.11,65.19Z"/>
-                <path class="cls-1" d="M50.38,2.18h0Z"/>
-                <rect class="cls-1" x="47.2" y="72.88" width="0.01" height="0.01"/>
-                <path class="cls-1" d="M46.28,6.58h0a7.14,7.14,0,0,0-.56.54A7.14,7.14,0,0,1,46.28,6.58Z"/>
-                <path class="cls-1" d="M61.12,82.93s0,0,0,.08h0l0,0Z"/>
-                <path class="cls-1"
-                      d="M47.8,58a1.32,1.32,0,0,1,.83-.09h0s0,0,0-.08c-.81-.5-1.62-1-2.54-1.59a1.65,1.65,0,0,1-.28.6l2,1.21S47.78,58,47.8,58Z"/>
-                <g class="cls-5">
-                    <polygon class="cls-1" points="48.62 58.08 48.63 58.07 48.63 58.08 48.62 58.08"/>
-                    <polygon class="cls-1" points="48.34 58.08 48.63 57.7 48.63 58.07 48.62 58.08 48.34 58.08"/>
-                    <polygon class="cls-1" points="48.05 58.08 48.63 57.32 48.63 57.7 48.34 58.08 48.05 58.08"/>
-                    <polygon class="cls-1" points="47.77 58.08 48.63 56.95 48.63 57.32 48.05 58.08 47.77 58.08"/>
-                    <polygon class="cls-1" points="47.49 58.08 48.63 56.58 48.63 56.95 47.77 58.08 47.49 58.08"/>
-                    <polygon class="cls-1"
-                             points="47.2 58.08 48.58 56.27 48.63 56.27 48.63 56.58 47.49 58.08 47.2 58.08"/>
-                    <polygon class="cls-1" points="46.92 58.08 48.3 56.27 48.58 56.27 47.2 58.08 46.92 58.08"/>
-                    <polygon class="cls-1" points="46.63 58.08 48.01 56.27 48.3 56.27 46.92 58.08 46.63 58.08"/>
-                    <polygon class="cls-1" points="46.35 58.08 47.73 56.27 48.01 56.27 46.63 58.08 46.35 58.08"/>
-                    <polygon class="cls-1" points="46.06 58.08 47.45 56.27 47.73 56.27 46.35 58.08 46.06 58.08"/>
-                    <polygon class="cls-1"
-                             points="45.8 58.05 47.16 56.27 47.45 56.27 46.06 58.08 45.8 58.08 45.8 58.05"/>
-                    <polygon class="cls-1" points="45.8 57.67 46.88 56.27 47.16 56.27 45.8 58.05 45.8 57.67"/>
-                    <polygon class="cls-1" points="45.8 57.3 46.59 56.27 46.88 56.27 45.8 57.67 45.8 57.3"/>
-                    <polygon class="cls-1" points="45.8 56.93 46.31 56.27 46.59 56.27 45.8 57.3 45.8 56.93"/>
-                    <polygon class="cls-1" points="45.8 56.56 46.02 56.27 46.31 56.27 45.8 56.93 45.8 56.56"/>
-                    <polygon class="cls-1" points="46.02 56.27 45.8 56.56 45.8 56.27 46.02 56.27"/>
-                </g>
-                <path class="cls-1"
-                      d="M.71,22.52A23.24,23.24,0,0,0,4.2,28l3.72-1a44.55,44.55,0,0,1-3.84-4.84A2.07,2.07,0,0,1,4,22a2.14,2.14,0,0,1,.13.19,40.79,40.79,0,0,0,4,4.62,65.5,65.5,0,0,0,.73-7c-3.61-1.54-5.64-.6-5.64-.6S0,20.26.71,22.52Z"/>
-                <g class="cls-6">
-                    <polygon class="cls-1" points="0 26.86 8.77 26.47 8.77 28.04 0 28.04 0 26.86"/>
-                    <polygon class="cls-1" points="0 24.72 8.77 24.33 8.77 26.47 0 26.86 0 24.72"/>
-                    <polygon class="cls-1" points="0 22.58 8.77 22.19 8.77 24.33 0 24.72 0 22.58"/>
-                    <polygon class="cls-1" points="0 22.41 8.77 22.02 8.77 22.19 0 22.58 0 22.41"/>
-                    <polygon class="cls-1" points="0 22.25 8.77 21.86 8.77 22.02 0 22.41 0 22.25"/>
-                    <polygon class="cls-1" points="0 22.08 8.77 21.69 8.77 21.86 0 22.25 0 22.08"/>
-                    <polygon class="cls-1" points="0 21.92 8.77 21.53 8.77 21.69 0 22.08 0 21.92"/>
-                    <polygon class="cls-1" points="0 21.75 8.77 21.37 8.77 21.53 0 21.92 0 21.75"/>
-                    <polygon class="cls-1" points="0 21.59 8.77 21.2 8.77 21.37 0 21.75 0 21.59"/>
-                    <polygon class="cls-1" points="0 21.43 8.77 21.04 8.77 21.2 0 21.59 0 21.43"/>
-                    <polygon class="cls-1" points="0 21.26 8.77 20.87 8.77 21.04 0 21.43 0 21.26"/>
-                    <polygon class="cls-1" points="0 21.1 8.77 20.71 8.77 20.87 0 21.26 0 21.1"/>
-                    <polygon class="cls-1" points="0 20.93 8.77 20.55 8.77 20.71 0 21.1 0 20.93"/>
-                    <polygon class="cls-1" points="0 20.77 8.77 20.38 8.77 20.55 0 20.93 0 20.77"/>
-                    <polygon class="cls-1" points="0 20.61 8.77 20.22 8.77 20.38 0 20.77 0 20.61"/>
-                    <polygon class="cls-1" points="0 20.44 8.77 20.05 8.77 20.22 0 20.61 0 20.44"/>
-                    <polygon class="cls-1" points="0 20.28 8.77 19.89 8.77 20.05 0 20.44 0 20.28"/>
-                    <polygon class="cls-1" points="0 20.11 8.77 19.73 8.77 19.89 0 20.28 0 20.11"/>
-                    <polygon class="cls-1" points="0 19.95 8.77 19.56 8.77 19.73 0 20.11 0 19.95"/>
-                    <polygon class="cls-1" points="0 19.79 8.77 19.4 8.77 19.56 0 19.95 0 19.79"/>
-                    <polygon class="cls-1" points="0 19.62 8.77 19.23 8.77 19.4 0 19.79 0 19.62"/>
-                    <polygon class="cls-1" points="0 19.46 8.77 19.07 8.77 19.23 0 19.62 0 19.46"/>
-                    <polygon class="cls-1" points="0 19.29 8.77 18.9 8.77 19.07 0 19.46 0 19.29"/>
-                    <polygon class="cls-1" points="0 19.13 8.77 18.74 8.77 18.9 0 19.29 0 19.13"/>
-                    <polygon class="cls-1" points="0 18.96 8.77 18.58 8.77 18.74 0 19.13 0 18.96"/>
-                    <polygon class="cls-1" points="0 18.8 8.77 18.41 8.77 18.58 0 18.96 0 18.8"/>
-                    <polygon class="cls-1" points="0 18.64 8.46 18.26 8.77 18.26 8.77 18.41 0 18.8 0 18.64"/>
-                    <polygon class="cls-1" points="0 18.47 4.75 18.26 8.46 18.26 0 18.64 0 18.47"/>
-                    <polygon class="cls-1" points="0 18.31 1.05 18.26 4.75 18.26 0 18.47 0 18.31"/>
-                    <polygon class="cls-1" points="1.05 18.26 0 18.31 0 18.26 1.05 18.26"/>
-                </g>
-                <path class="cls-1" d="M19,29.86v0l0,.26v.05A2.45,2.45,0,0,0,19,29.86Z"/>
-                <path class="cls-1" d="M24.48,33c0,.15,0,.3,0,.45C24.47,33.33,24.48,33.18,24.48,33Z"/>
-                <polygon class="cls-1" points="24.45 33.6 24.45 33.6 24.45 33.59 24.45 33.6"/>
-                <path class="cls-1" d="M27.21,34.85c0,.23,0,.47,0,.72h0l0-.37C27.21,35.09,27.21,35,27.21,34.85Z"/>
-                <g class="cls-7">
-                    <path class="cls-1" d="M27.21,34.85c0,.23,0,.47,0,.72h0l0-.37C27.21,35.09,27.21,35,27.21,34.85Z"/>
-                </g>
-                <path class="cls-1" d="M24.45,33.59h0a.49.49,0,0,1,0-.12c0-.15,0-.3,0-.45l0,.56Z"/>
-                <g class="cls-7">
-                    <path class="cls-1" d="M24.45,33.59h0a.49.49,0,0,1,0-.12c0-.15,0-.3,0-.45l0,.56Z"/>
-                </g>
-                <path class="cls-1"
-                      d="M15.3,34.21c-.88-.77-1.73-1.53-2.55-2.3s-1.68-1.59-2.47-2.38l-.14-.14Q9,28.21,7.92,27.05L4.2,28l.4.51c.51.65,1.07,1.34,1.67,2s1.39,1.63,2.15,2.47,1.45,1.58,2.23,2.38,1.34,1.38,2,2.08l.08.07,5-1.24C17,35.64,16.12,34.92,15.3,34.21Z"/>
-                <g class="cls-8">
-                    <polygon class="cls-1" points="17.7 37.59 17.81 37.45 17.81 37.59 17.7 37.59"/>
-                    <polygon class="cls-1" points="17.48 37.59 17.81 37.17 17.81 37.45 17.7 37.59 17.48 37.59"/>
-                    <polygon class="cls-1" points="17.26 37.59 17.81 36.89 17.81 37.17 17.48 37.59 17.26 37.59"/>
-                    <polygon class="cls-1" points="17.04 37.59 17.81 36.61 17.81 36.89 17.26 37.59 17.04 37.59"/>
-                    <polygon class="cls-1" points="16.82 37.59 17.81 36.33 17.81 36.61 17.04 37.59 16.82 37.59"/>
-                    <polygon class="cls-1" points="16.6 37.59 17.81 36.04 17.81 36.33 16.82 37.59 16.6 37.59"/>
-                    <polygon class="cls-1" points="16.38 37.59 17.81 35.76 17.81 36.04 16.6 37.59 16.38 37.59"/>
-                    <polygon class="cls-1" points="16.16 37.59 17.81 35.48 17.81 35.76 16.38 37.59 16.16 37.59"/>
-                    <polygon class="cls-1" points="15.94 37.59 17.81 35.2 17.81 35.48 16.16 37.59 15.94 37.59"/>
-                    <polygon class="cls-1" points="15.72 37.59 17.81 34.91 17.81 35.2 15.94 37.59 15.72 37.59"/>
-                    <polygon class="cls-1" points="15.5 37.59 17.81 34.63 17.81 34.91 15.72 37.59 15.5 37.59"/>
-                    <polygon class="cls-1" points="15.28 37.59 17.81 34.35 17.81 34.63 15.5 37.59 15.28 37.59"/>
-                    <polygon class="cls-1" points="15.06 37.59 17.81 34.07 17.81 34.35 15.28 37.59 15.06 37.59"/>
-                    <polygon class="cls-1" points="14.84 37.59 17.81 33.79 17.81 34.07 15.06 37.59 14.84 37.59"/>
-                    <polygon class="cls-1" points="14.62 37.59 17.81 33.5 17.81 33.79 14.84 37.59 14.62 37.59"/>
-                    <polygon class="cls-1" points="14.4 37.59 17.81 33.22 17.81 33.5 14.62 37.59 14.4 37.59"/>
-                    <polygon class="cls-1" points="14.18 37.59 17.81 32.94 17.81 33.22 14.4 37.59 14.18 37.59"/>
-                    <polygon class="cls-1" points="13.96 37.59 17.81 32.66 17.81 32.94 14.18 37.59 13.96 37.59"/>
-                    <polygon class="cls-1"
-                             points="13.74 37.59 17.75 32.45 17.81 32.5 17.81 32.66 13.96 37.59 13.74 37.59"/>
-                    <polygon class="cls-1" points="13.52 37.59 17.61 32.35 17.75 32.45 13.74 37.59 13.52 37.59"/>
-                    <polygon class="cls-1" points="13.3 37.59 17.48 32.24 17.61 32.35 13.52 37.59 13.3 37.59"/>
-                    <polygon class="cls-1" points="13.08 37.59 17.34 32.13 17.48 32.24 13.3 37.59 13.08 37.59"/>
-                    <polygon class="cls-1" points="12.86 37.59 17.2 32.03 17.34 32.13 13.08 37.59 12.86 37.59"/>
-                    <polygon class="cls-1" points="12.63 37.59 17.07 31.92 17.2 32.03 12.86 37.59 12.63 37.59"/>
-                    <polygon class="cls-1" points="12.41 37.59 16.93 31.81 17.07 31.92 12.63 37.59 12.41 37.59"/>
-                    <polygon class="cls-1" points="12.19 37.59 16.79 31.71 16.93 31.81 12.41 37.59 12.19 37.59"/>
-                    <polygon class="cls-1" points="11.97 37.59 16.66 31.6 16.79 31.71 12.19 37.59 11.97 37.59"/>
-                    <polygon class="cls-1" points="11.75 37.59 16.52 31.49 16.66 31.6 11.97 37.59 11.75 37.59"/>
-                    <polygon class="cls-1" points="11.53 37.59 16.38 31.39 16.52 31.49 11.75 37.59 11.53 37.59"/>
-                    <polygon class="cls-1" points="11.31 37.59 16.25 31.28 16.38 31.39 11.53 37.59 11.31 37.59"/>
-                    <polygon class="cls-1" points="11.09 37.59 16.11 31.17 16.25 31.28 11.31 37.59 11.09 37.59"/>
-                    <polygon class="cls-1" points="10.87 37.59 15.97 31.07 16.11 31.17 11.09 37.59 10.87 37.59"/>
-                    <polygon class="cls-1" points="10.65 37.59 15.84 30.96 15.97 31.07 10.87 37.59 10.65 37.59"/>
-                    <polygon class="cls-1" points="10.43 37.59 15.7 30.85 15.84 30.96 10.65 37.59 10.43 37.59"/>
-                    <polygon class="cls-1" points="10.21 37.59 15.56 30.74 15.7 30.85 10.43 37.59 10.21 37.59"/>
-                    <polygon class="cls-1" points="9.99 37.59 15.43 30.64 15.56 30.74 10.21 37.59 9.99 37.59"/>
-                    <polygon class="cls-1" points="9.86 37.59 9.8 37.55 15.29 30.53 15.43 30.64 9.99 37.59 9.86 37.59"/>
-                    <rect class="cls-1" x="8.02" y="33.9" width="8.91" height="0.17"
-                          transform="translate(-21.99 22.9) rotate(-52)"/>
-                    <rect class="cls-1" x="7.89" y="33.79" width="8.91" height="0.17"
-                          transform="translate(-21.95 22.75) rotate(-52)"/>
-                    <rect class="cls-1" x="7.75" y="33.69" width="8.91" height="0.17"
-                          transform="translate(-21.92 22.6) rotate(-52)"/>
-                    <rect class="cls-1" x="7.61" y="33.58" width="8.91" height="0.17"
-                          transform="translate(-21.89 22.45) rotate(-52)"/>
-                    <rect class="cls-1" x="7.48" y="33.47" width="8.91" height="0.17"
-                          transform="translate(-21.86 22.3) rotate(-52)"/>
-                    <rect class="cls-1" x="7.34" y="33.36" width="8.91" height="0.17"
-                          transform="translate(-21.83 22.15) rotate(-52)"/>
-                    <rect class="cls-1" x="7.2" y="33.26" width="8.91" height="0.17"
-                          transform="translate(-21.8 22) rotate(-52)"/>
-                    <rect class="cls-1" x="7.07" y="33.15" width="8.91" height="0.17"
-                          transform="translate(-21.76 21.85) rotate(-52)"/>
-                    <rect class="cls-1" x="6.93" y="33.04" width="8.91" height="0.17"
-                          transform="translate(-21.73 21.7) rotate(-52)"/>
-                    <rect class="cls-1" x="6.79" y="32.94" width="8.91" height="0.17"
-                          transform="translate(-21.7 21.55) rotate(-52)"/>
-                    <rect class="cls-1" x="6.66" y="32.83" width="8.91" height="0.17"
-                          transform="translate(-21.67 21.41) rotate(-52)"/>
-                    <rect class="cls-1" x="6.52" y="32.72" width="8.91" height="0.17"
-                          transform="translate(-21.64 21.26) rotate(-52)"/>
-                    <rect class="cls-1" x="6.38" y="32.62" width="8.91" height="0.17"
-                          transform="translate(-21.61 21.11) rotate(-52)"/>
-                    <rect class="cls-1" x="6.24" y="32.51" width="8.91" height="0.17"
-                          transform="translate(-21.57 20.96) rotate(-52)"/>
-                    <rect class="cls-1" x="6.11" y="32.4" width="8.91" height="0.17"
-                          transform="translate(-21.54 20.81) rotate(-52)"/>
-                    <rect class="cls-1" x="5.97" y="32.3" width="8.91" height="0.17"
-                          transform="translate(-21.51 20.66) rotate(-52)"/>
-                    <rect class="cls-1" x="5.83" y="32.19" width="8.91" height="0.17"
-                          transform="translate(-21.48 20.51) rotate(-52)"/>
-                    <rect class="cls-1" x="5.7" y="32.08" width="8.91" height="0.17"
-                          transform="translate(-21.45 20.36) rotate(-52)"/>
-                    <rect class="cls-1" x="5.56" y="31.97" width="8.91" height="0.17"
-                          transform="translate(-21.42 20.21) rotate(-52)"/>
-                    <rect class="cls-1" x="5.42" y="31.87" width="8.91" height="0.17"
-                          transform="translate(-21.38 20.06) rotate(-52)"/>
-                    <rect class="cls-1" x="5.29" y="31.76" width="8.91" height="0.17"
-                          transform="translate(-21.35 19.92) rotate(-52)"/>
-                    <rect class="cls-1" x="5.15" y="31.65" width="8.91" height="0.17"
-                          transform="translate(-21.32 19.77) rotate(-52)"/>
-                    <rect class="cls-1" x="5.01" y="31.55" width="8.91" height="0.17"
-                          transform="translate(-21.29 19.62) rotate(-52)"/>
-                    <rect class="cls-1" x="4.88" y="31.44" width="8.91" height="0.17"
-                          transform="translate(-21.26 19.47) rotate(-52)"/>
-                    <rect class="cls-1" x="4.74" y="31.33" width="8.91" height="0.17"
-                          transform="translate(-21.23 19.32) rotate(-52)"/>
-                    <rect class="cls-1" x="4.6" y="31.23" width="8.91" height="0.17"
-                          transform="translate(-21.19 19.17) rotate(-52)"/>
-                    <rect class="cls-1" x="4.46" y="31.12" width="8.91" height="0.17"
-                          transform="translate(-21.16 19.02) rotate(-52)"/>
-                    <rect class="cls-1" x="4.33" y="31.01" width="8.91" height="0.17"
-                          transform="translate(-21.13 18.87) rotate(-52)"/>
-                    <rect class="cls-1" x="4.19" y="30.9" width="8.91" height="0.17"
-                          transform="translate(-21.1 18.72) rotate(-52)"/>
-                    <rect class="cls-1" x="4.05" y="30.8" width="8.91" height="0.17"
-                          transform="translate(-21.07 18.58) rotate(-52)"/>
-                    <rect class="cls-1" x="3.92" y="30.69" width="8.91" height="0.17"
-                          transform="translate(-21.04 18.43) rotate(-52)"/>
-                    <rect class="cls-1" x="3.78" y="30.58" width="8.91" height="0.17"
-                          transform="translate(-21 18.28) rotate(-52)"/>
-                    <polygon class="cls-1"
-                             points="5.42 34.13 5.29 34.02 10.73 27.05 10.83 27.05 10.91 27.11 5.42 34.13"/>
-                    <polygon class="cls-1" points="5.29 34.02 5.15 33.91 10.52 27.05 10.73 27.05 5.29 34.02"/>
-                    <polygon class="cls-1" points="5.15 33.91 5.01 33.81 10.29 27.05 10.52 27.05 5.15 33.91"/>
-                    <polygon class="cls-1" points="5.01 33.81 4.88 33.7 10.07 27.05 10.29 27.05 5.01 33.81"/>
-                    <polygon class="cls-1" points="4.88 33.7 4.74 33.59 9.85 27.05 10.07 27.05 4.88 33.7"/>
-                    <polygon class="cls-1" points="4.74 33.59 4.6 33.48 9.63 27.05 9.85 27.05 4.74 33.59"/>
-                    <polygon class="cls-1" points="4.6 33.48 4.46 33.38 9.41 27.05 9.63 27.05 4.6 33.48"/>
-                    <polygon class="cls-1" points="4.46 33.38 4.33 33.27 9.19 27.05 9.41 27.05 4.46 33.38"/>
-                    <polygon class="cls-1" points="4.33 33.27 4.2 33.17 4.2 33.16 8.97 27.05 9.19 27.05 4.33 33.27"/>
-                    <polygon class="cls-1" points="4.2 32.87 8.75 27.05 8.97 27.05 4.2 33.16 4.2 32.87"/>
-                    <polygon class="cls-1" points="4.2 32.59 8.53 27.05 8.75 27.05 4.2 32.87 4.2 32.59"/>
-                    <polygon class="cls-1" points="4.2 32.31 8.31 27.05 8.53 27.05 4.2 32.59 4.2 32.31"/>
-                    <polygon class="cls-1" points="4.2 32.03 8.09 27.05 8.31 27.05 4.2 32.31 4.2 32.03"/>
-                    <polygon class="cls-1" points="4.2 31.75 7.87 27.05 8.09 27.05 4.2 32.03 4.2 31.75"/>
-                    <polygon class="cls-1" points="4.2 31.46 7.65 27.05 7.87 27.05 4.2 31.75 4.2 31.46"/>
-                    <polygon class="cls-1" points="7.65 27.05 4.2 31.46 4.2 27.05 7.65 27.05"/>
-                </g>
-                <path class="cls-1"
-                      d="M38.35,50.5,40.68,52l0,0,.34.22,2.12,1.32A4.78,4.78,0,0,1,45.6,52.3a3.85,3.85,0,0,0-2.81.61c.92-3.28.74-6.34-1.35-8.38a5.09,5.09,0,0,0-.6-.52,3.27,3.27,0,0,1,.42,3.34h0A9.18,9.18,0,0,0,38.62,42c-.33-.33-.7-.66-1.12-1a7.42,7.42,0,0,1,.64,7.34l-.22,1.9Z"/>
-                <g class="cls-9">
-                    <polygon class="cls-1" points="45.57 53.56 45.6 53.51 45.6 53.56 45.57 53.56"/>
-                    <polygon class="cls-1" points="45.23 53.56 45.6 53.08 45.6 53.51 45.57 53.56 45.23 53.56"/>
-                    <polygon class="cls-1" points="44.89 53.56 45.6 52.65 45.6 53.08 45.23 53.56 44.89 53.56"/>
-                    <polygon class="cls-1" points="44.56 53.56 45.6 52.22 45.6 52.65 44.89 53.56 44.56 53.56"/>
-                    <polygon class="cls-1" points="44.22 53.56 45.6 51.79 45.6 52.22 44.56 53.56 44.22 53.56"/>
-                    <polygon class="cls-1" points="43.88 53.56 45.6 51.36 45.6 51.79 44.22 53.56 43.88 53.56"/>
-                    <polygon class="cls-1" points="43.55 53.56 45.6 50.93 45.6 51.36 43.88 53.56 43.55 53.56"/>
-                    <polygon class="cls-1" points="43.21 53.56 45.6 50.5 45.6 50.93 43.55 53.56 43.21 53.56"/>
-                    <polygon class="cls-1" points="42.87 53.56 45.6 50.07 45.6 50.5 43.21 53.56 42.87 53.56"/>
-                    <polygon class="cls-1" points="42.54 53.56 45.6 49.63 45.6 50.07 42.87 53.56 42.54 53.56"/>
-                    <polygon class="cls-1" points="42.2 53.56 45.6 49.2 45.6 49.63 42.54 53.56 42.2 53.56"/>
-                    <polygon class="cls-1" points="41.86 53.56 45.6 48.77 45.6 49.2 42.2 53.56 41.86 53.56"/>
-                    <polygon class="cls-1" points="41.53 53.56 45.6 48.34 45.6 48.77 41.86 53.56 41.53 53.56"/>
-                    <polygon class="cls-1" points="41.19 53.56 45.6 47.91 45.6 48.34 41.53 53.56 41.19 53.56"/>
-                    <polygon class="cls-1" points="40.85 53.56 45.6 47.48 45.6 47.91 41.19 53.56 40.85 53.56"/>
-                    <polygon class="cls-1" points="40.52 53.56 45.6 47.05 45.6 47.48 40.85 53.56 40.52 53.56"/>
-                    <polygon class="cls-1" points="40.18 53.56 45.6 46.62 45.6 47.05 40.52 53.56 40.18 53.56"/>
-                    <polygon class="cls-1" points="39.84 53.56 45.6 46.19 45.6 46.62 40.18 53.56 39.84 53.56"/>
-                    <polygon class="cls-1" points="39.51 53.56 45.6 45.76 45.6 46.19 39.84 53.56 39.51 53.56"/>
-                    <polygon class="cls-1"
-                             points="39.29 53.56 39.22 53.51 45.6 45.33 45.6 45.76 39.51 53.56 39.29 53.56"/>
-                    <polygon class="cls-1"
-                             points="39.22 53.51 39.01 53.34 45.53 44.99 45.6 45.05 45.6 45.33 39.22 53.51"/>
-                    <rect class="cls-1" x="36.86" y="48.95" width="10.6" height="0.27"
-                          transform="translate(-22.47 52.09) rotate(-52)"/>
-                    <rect class="cls-1" x="36.66" y="48.79" width="10.6" height="0.27"
-                          transform="translate(-22.42 51.87) rotate(-52)"/>
-                    <rect class="cls-1" x="36.45" y="48.62" width="10.6" height="0.27"
-                          transform="translate(-22.38 51.64) rotate(-52)"/>
-                    <rect class="cls-1" x="36.24" y="48.46" width="10.6" height="0.27"
-                          transform="translate(-22.33 51.41) rotate(-52)"/>
-                    <rect class="cls-1" x="36.03" y="48.3" width="10.6" height="0.27"
-                          transform="translate(-22.28 51.18) rotate(-52)"/>
-                    <rect class="cls-1" x="35.82" y="48.14" width="10.6" height="0.27"
-                          transform="translate(-22.23 50.96) rotate(-52)"/>
-                    <rect class="cls-1" x="35.61" y="47.97" width="10.6" height="0.27"
-                          transform="translate(-22.18 50.73) rotate(-52)"/>
-                    <polygon class="cls-1"
-                             points="37.54 52.2 37.5 52.16 37.5 51.82 43.86 43.68 44.07 43.85 37.54 52.2"/>
-                    <polygon class="cls-1" points="37.5 51.39 43.65 43.52 43.86 43.68 37.5 51.82 37.5 51.39"/>
-                    <polygon class="cls-1" points="37.5 50.96 43.44 43.36 43.65 43.52 37.5 51.39 37.5 50.96"/>
-                    <polygon class="cls-1" points="37.5 50.53 43.23 43.19 43.44 43.36 37.5 50.96 37.5 50.53"/>
-                    <polygon class="cls-1" points="37.5 50.1 43.02 43.03 43.23 43.19 37.5 50.53 37.5 50.1"/>
-                    <polygon class="cls-1" points="37.5 49.67 42.81 42.87 43.02 43.03 37.5 50.1 37.5 49.67"/>
-                    <polygon class="cls-1" points="37.5 49.24 42.61 42.7 42.81 42.87 37.5 49.67 37.5 49.24"/>
-                    <polygon class="cls-1" points="37.5 48.81 42.4 42.54 42.61 42.7 37.5 49.24 37.5 48.81"/>
-                    <polygon class="cls-1" points="37.5 48.38 42.19 42.38 42.4 42.54 37.5 48.81 37.5 48.38"/>
-                    <polygon class="cls-1" points="37.5 47.95 41.98 42.21 42.19 42.38 37.5 48.38 37.5 47.95"/>
-                    <polygon class="cls-1" points="37.5 47.52 41.77 42.05 41.98 42.21 37.5 47.95 37.5 47.52"/>
-                    <polygon class="cls-1" points="37.5 47.09 41.56 41.89 41.77 42.05 37.5 47.52 37.5 47.09"/>
-                    <polygon class="cls-1" points="37.5 46.66 41.35 41.72 41.56 41.89 37.5 47.09 37.5 46.66"/>
-                    <polygon class="cls-1" points="37.5 46.22 41.14 41.56 41.35 41.72 37.5 46.66 37.5 46.22"/>
-                    <polygon class="cls-1" points="37.5 45.79 40.93 41.4 41.14 41.56 37.5 46.22 37.5 45.79"/>
-                    <polygon class="cls-1" points="37.5 45.36 40.73 41.23 40.93 41.4 37.5 45.79 37.5 45.36"/>
-                    <polygon class="cls-1" points="37.5 44.93 40.52 41.07 40.73 41.23 37.5 45.36 37.5 44.93"/>
-                    <polygon class="cls-1" points="37.5 44.5 40.25 40.98 40.41 40.98 40.52 41.07 37.5 44.93 37.5 44.5"/>
-                    <polygon class="cls-1" points="37.5 44.07 39.91 40.98 40.25 40.98 37.5 44.5 37.5 44.07"/>
-                    <polygon class="cls-1" points="37.5 43.64 39.57 40.98 39.91 40.98 37.5 44.07 37.5 43.64"/>
-                    <polygon class="cls-1" points="37.5 43.21 39.24 40.98 39.57 40.98 37.5 43.64 37.5 43.21"/>
-                    <polygon class="cls-1" points="37.5 42.78 38.9 40.98 39.24 40.98 37.5 43.21 37.5 42.78"/>
-                    <polygon class="cls-1" points="37.5 42.35 38.56 40.98 38.9 40.98 37.5 42.78 37.5 42.35"/>
-                    <polygon class="cls-1" points="37.5 41.92 38.23 40.98 38.56 40.98 37.5 42.35 37.5 41.92"/>
-                    <polygon class="cls-1" points="37.5 41.48 37.89 40.98 38.23 40.98 37.5 41.92 37.5 41.48"/>
-                    <polygon class="cls-1" points="37.5 41.05 37.55 40.98 37.89 40.98 37.5 41.48 37.5 41.05"/>
-                    <polygon class="cls-1" points="37.55 40.98 37.5 41.05 37.5 40.98 37.55 40.98"/>
-                </g>
-                <path class="cls-1"
-                      d="M34.4,48.68c-.94-.64-1.89-1.29-2.84-2L28.8,44.77c-.93-.66-1.85-1.33-2.77-2s-1.87-1.39-2.8-2.1l-2.72-2.12-1-.77L17.9,36.42l-.09-.07-5,1.24a1.21,1.21,0,0,0,.16.16c.74.73,1.51,1.47,2.3,2.2s1.61,1.47,2.44,2.19,1.42,1.22,2.14,1.81l.44.35c.91.74,1.79,1.42,2.65,2s1.91,1.36,2.81,1.94c.59.38,1.16.74,1.71,1.07l1.42.81c1.12.62,2.25,1.19,3.38,1.7l5.07-1.24L35,49.11Z"/>
-                <g class="cls-10">
-                    <polygon class="cls-1" points="37.11 51.87 37.29 51.64 37.29 51.87 37.11 51.87"/>
-                    <polygon class="cls-1" points="36.91 51.87 37.29 51.37 37.29 51.64 37.11 51.87 36.91 51.87"/>
-                    <polygon class="cls-1" points="36.7 51.87 37.29 51.11 37.29 51.37 36.91 51.87 36.7 51.87"/>
-                    <polygon class="cls-1" points="36.5 51.87 37.29 50.85 37.29 51.11 36.7 51.87 36.5 51.87"/>
-                    <polygon class="cls-1" points="36.29 51.87 37.29 50.59 37.29 50.85 36.5 51.87 36.29 51.87"/>
-                    <polygon class="cls-1" points="36.09 51.87 37.29 50.33 37.29 50.59 36.29 51.87 36.09 51.87"/>
-                    <polygon class="cls-1" points="35.88 51.87 37.29 50.06 37.29 50.33 36.09 51.87 35.88 51.87"/>
-                    <polygon class="cls-1" points="35.68 51.87 37.29 49.8 37.29 50.06 35.88 51.87 35.68 51.87"/>
-                    <polygon class="cls-1" points="35.47 51.87 37.29 49.54 37.29 49.8 35.68 51.87 35.47 51.87"/>
-                    <polygon class="cls-1" points="35.27 51.87 37.29 49.28 37.29 49.54 35.47 51.87 35.27 51.87"/>
-                    <polygon class="cls-1" points="35.06 51.87 37.29 49.02 37.29 49.28 35.27 51.87 35.06 51.87"/>
-                    <polygon class="cls-1" points="34.86 51.87 37.29 48.75 37.29 49.02 35.06 51.87 34.86 51.87"/>
-                    <polygon class="cls-1" points="34.66 51.87 37.29 48.49 37.29 48.75 34.86 51.87 34.66 51.87"/>
-                    <polygon class="cls-1"
-                             points="34.45 51.87 37.23 48.3 37.29 48.34 37.29 48.49 34.66 51.87 34.45 51.87"/>
-                    <polygon class="cls-1" points="34.24 51.87 37.11 48.2 37.23 48.3 34.45 51.87 34.24 51.87"/>
-                    <polygon class="cls-1" points="34.04 51.87 36.98 48.1 37.11 48.2 34.24 51.87 34.04 51.87"/>
-                    <polygon class="cls-1" points="33.84 51.87 36.85 48 36.98 48.1 34.04 51.87 33.84 51.87"/>
-                    <polygon class="cls-1" points="33.63 51.87 36.73 47.9 36.85 48 33.84 51.87 33.63 51.87"/>
-                    <polygon class="cls-1" points="33.43 51.87 36.6 47.8 36.73 47.9 33.63 51.87 33.43 51.87"/>
-                    <polygon class="cls-1" points="33.22 51.87 36.47 47.7 36.6 47.8 33.43 51.87 33.22 51.87"/>
-                    <polygon class="cls-1" points="33.02 51.87 36.34 47.61 36.47 47.7 33.22 51.87 33.02 51.87"/>
-                    <polygon class="cls-1" points="32.81 51.87 36.22 47.51 36.34 47.61 33.02 51.87 32.81 51.87"/>
-                    <polygon class="cls-1" points="32.61 51.87 36.09 47.41 36.22 47.51 32.81 51.87 32.61 51.87"/>
-                    <polygon class="cls-1" points="32.4 51.87 35.96 47.31 36.09 47.41 32.61 51.87 32.4 51.87"/>
-                    <polygon class="cls-1" points="32.2 51.87 35.84 47.21 35.96 47.31 32.4 51.87 32.2 51.87"/>
-                    <polygon class="cls-1" points="31.99 51.87 35.71 47.11 35.84 47.21 32.2 51.87 31.99 51.87"/>
-                    <polygon class="cls-1" points="31.79 51.87 35.58 47.01 35.71 47.11 31.99 51.87 31.79 51.87"/>
-                    <polygon class="cls-1" points="31.58 51.87 35.45 46.91 35.58 47.01 31.79 51.87 31.58 51.87"/>
-                    <polygon class="cls-1" points="31.38 51.87 35.33 46.81 35.45 46.91 31.58 51.87 31.38 51.87"/>
-                    <polygon class="cls-1" points="31.17 51.87 35.2 46.71 35.33 46.81 31.38 51.87 31.17 51.87"/>
-                    <polygon class="cls-1" points="30.97 51.87 35.07 46.61 35.2 46.71 31.17 51.87 30.97 51.87"/>
-                    <polygon class="cls-1" points="30.77 51.87 34.95 46.51 35.07 46.61 30.97 51.87 30.77 51.87"/>
-                    <polygon class="cls-1" points="30.56 51.87 34.82 46.41 34.95 46.51 30.77 51.87 30.56 51.87"/>
-                    <polygon class="cls-1" points="30.36 51.87 34.69 46.31 34.82 46.41 30.56 51.87 30.36 51.87"/>
-                    <polygon class="cls-1" points="30.15 51.87 34.56 46.22 34.69 46.31 30.36 51.87 30.15 51.87"/>
-                    <polygon class="cls-1" points="29.95 51.87 34.44 46.12 34.56 46.22 30.15 51.87 29.95 51.87"/>
-                    <polygon class="cls-1" points="29.74 51.87 34.31 46.02 34.44 46.12 29.95 51.87 29.74 51.87"/>
-                    <polygon class="cls-1" points="29.54 51.87 34.18 45.92 34.31 46.02 29.74 51.87 29.54 51.87"/>
-                    <polygon class="cls-1" points="29.33 51.87 34.06 45.82 34.18 45.92 29.54 51.87 29.33 51.87"/>
-                    <polygon class="cls-1" points="29.13 51.87 33.93 45.72 34.06 45.82 29.33 51.87 29.13 51.87"/>
-                    <polygon class="cls-1" points="28.92 51.87 33.8 45.62 33.93 45.72 29.13 51.87 28.92 51.87"/>
-                    <polygon class="cls-1" points="28.72 51.87 33.67 45.52 33.8 45.62 28.92 51.87 28.72 51.87"/>
-                    <polygon class="cls-1" points="28.51 51.87 33.55 45.42 33.67 45.52 28.72 51.87 28.51 51.87"/>
-                    <polygon class="cls-1" points="28.31 51.87 33.42 45.32 33.55 45.42 28.51 51.87 28.31 51.87"/>
-                    <polygon class="cls-1" points="28.1 51.87 33.29 45.22 33.42 45.32 28.31 51.87 28.1 51.87"/>
-                    <polygon class="cls-1" points="27.9 51.87 33.17 45.12 33.29 45.22 28.1 51.87 27.9 51.87"/>
-                    <polygon class="cls-1" points="27.69 51.87 33.04 45.02 33.17 45.12 27.9 51.87 27.69 51.87"/>
-                    <polygon class="cls-1" points="27.49 51.87 32.91 44.92 33.04 45.02 27.69 51.87 27.49 51.87"/>
-                    <polygon class="cls-1" points="27.29 51.87 32.78 44.83 32.91 44.92 27.49 51.87 27.29 51.87"/>
-                    <polygon class="cls-1" points="27.08 51.87 32.66 44.73 32.78 44.83 27.29 51.87 27.08 51.87"/>
-                    <polygon class="cls-1"
-                             points="26.99 51.87 26.92 51.81 32.53 44.63 32.66 44.73 27.08 51.87 26.99 51.87"/>
-                    <rect class="cls-1" x="25.1" y="48.09" width="9.12" height="0.16"
-                          transform="translate(-26.56 41.89) rotate(-52)"/>
-                    <rect class="cls-1" x="24.98" y="47.99" width="9.12" height="0.16"
-                          transform="translate(-26.53 41.75) rotate(-52)"/>
-                    <rect class="cls-1" x="24.85" y="47.89" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -26.5, 41.61)"/>
-                    <rect class="cls-1" x="24.72" y="47.79" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -26.47, 41.47)"/>
-                    <rect class="cls-1" x="24.59" y="47.69" width="9.12" height="0.16"
-                          transform="translate(-26.44 41.33) rotate(-52)"/>
-                    <rect class="cls-1" x="24.47" y="47.59" width="9.12" height="0.16"
-                          transform="translate(-26.41 41.2) rotate(-52)"/>
-                    <rect class="cls-1" x="24.34" y="47.49" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -26.38, 41.06)"/>
-                    <rect class="cls-1" x="24.21" y="47.39" width="9.12" height="0.16"
-                          transform="translate(-26.35 40.92) rotate(-52)"/>
-                    <rect class="cls-1" x="24.09" y="47.29" width="9.12" height="0.16"
-                          transform="translate(-26.32 40.78) rotate(-52)"/>
-                    <rect class="cls-1" x="23.96" y="47.19" width="9.12" height="0.16"
-                          transform="translate(-26.29 40.64) rotate(-52)"/>
-                    <rect class="cls-1" x="23.83" y="47.09" width="9.12" height="0.16"
-                          transform="translate(-26.26 40.5) rotate(-52)"/>
-                    <rect class="cls-1" x="23.7" y="47" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -26.23, 40.37)"/>
-                    <rect class="cls-1" x="23.58" y="46.9" width="9.12" height="0.16"
-                          transform="translate(-26.2 40.23) rotate(-52)"/>
-                    <rect class="cls-1" x="23.45" y="46.8" width="9.12" height="0.16"
-                          transform="translate(-26.18 40.09) rotate(-52)"/>
-                    <rect class="cls-1" x="23.32" y="46.7" width="9.12" height="0.16"
-                          transform="translate(-26.15 39.95) rotate(-52)"/>
-                    <rect class="cls-1" x="23.2" y="46.6" width="9.12" height="0.16"
-                          transform="translate(-26.12 39.81) rotate(-52)"/>
-                    <rect class="cls-1" x="23.07" y="46.5" width="9.12" height="0.16"
-                          transform="translate(-26.09 39.67) rotate(-52)"/>
-                    <rect class="cls-1" x="22.94" y="46.4" width="9.12" height="0.16"
-                          transform="translate(-26.06 39.54) rotate(-52)"/>
-                    <rect class="cls-1" x="22.81" y="46.3" width="9.12" height="0.16"
-                          transform="translate(-26.03 39.4) rotate(-52)"/>
-                    <rect class="cls-1" x="22.69" y="46.2" width="9.12" height="0.16"
-                          transform="translate(-26 39.26) rotate(-52)"/>
-                    <rect class="cls-1" x="22.56" y="46.1" width="9.12" height="0.16"
-                          transform="translate(-25.97 39.12) rotate(-52)"/>
-                    <rect class="cls-1" x="22.43" y="46" width="9.12" height="0.16"
-                          transform="translate(-25.94 38.98) rotate(-52)"/>
-                    <rect class="cls-1" x="22.31" y="45.9" width="9.12" height="0.16"
-                          transform="translate(-25.91 38.84) rotate(-52)"/>
-                    <rect class="cls-1" x="22.18" y="45.8" width="9.12" height="0.16"
-                          transform="translate(-25.88 38.71) rotate(-52)"/>
-                    <rect class="cls-1" x="22.05" y="45.7" width="9.12" height="0.16"
-                          transform="translate(-25.85 38.57) rotate(-52)"/>
-                    <rect class="cls-1" x="21.92" y="45.6" width="9.12" height="0.16"
-                          transform="translate(-25.82 38.43) rotate(-52)"/>
-                    <rect class="cls-1" x="21.8" y="45.51" width="9.12" height="0.16"
-                          transform="translate(-25.79 38.29) rotate(-52)"/>
-                    <rect class="cls-1" x="21.67" y="45.41" width="9.12" height="0.16"
-                          transform="translate(-25.76 38.15) rotate(-52)"/>
-                    <rect class="cls-1" x="21.54" y="45.31" width="9.12" height="0.16"
-                          transform="translate(-25.73 38.01) rotate(-52)"/>
-                    <rect class="cls-1" x="21.42" y="45.21" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.7, 37.88)"/>
-                    <rect class="cls-1" x="21.29" y="45.11" width="9.12" height="0.16"
-                          transform="translate(-25.68 37.74) rotate(-52)"/>
-                    <rect class="cls-1" x="21.16" y="45.01" width="9.12" height="0.16"
-                          transform="translate(-25.65 37.6) rotate(-52)"/>
-                    <rect class="cls-1" x="21.03" y="44.91" width="9.12" height="0.16"
-                          transform="translate(-25.62 37.46) rotate(-52)"/>
-                    <rect class="cls-1" x="20.91" y="44.81" width="9.12" height="0.16"
-                          transform="translate(-25.59 37.32) rotate(-52)"/>
-                    <rect class="cls-1" x="20.78" y="44.71" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.56, 37.18)"/>
-                    <rect class="cls-1" x="20.65" y="44.61" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.53, 37.05)"/>
-                    <rect class="cls-1" x="20.53" y="44.51" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.5, 36.91)"/>
-                    <rect class="cls-1" x="20.4" y="44.41" width="9.12" height="0.16"
-                          transform="translate(-25.47 36.77) rotate(-52)"/>
-                    <rect class="cls-1" x="20.27" y="44.31" width="9.12" height="0.16"
-                          transform="translate(-25.44 36.63) rotate(-52)"/>
-                    <rect class="cls-1" x="20.14" y="44.21" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.41, 36.49)"/>
-                    <rect class="cls-1" x="20.02" y="44.11" width="9.12" height="0.16"
-                          transform="translate(-25.38 36.35) rotate(-52)"/>
-                    <rect class="cls-1" x="19.89" y="44.02" width="9.12" height="0.16"
-                          transform="translate(-25.35 36.21) rotate(-52)"/>
-                    <rect class="cls-1" x="19.76" y="43.92" width="9.12" height="0.16"
-                          transform="translate(-25.32 36.08) rotate(-52)"/>
-                    <rect class="cls-1" x="19.64" y="43.82" width="9.12" height="0.16"
-                          transform="translate(-25.29 35.94) rotate(-52)"/>
-                    <rect class="cls-1" x="19.51" y="43.72" width="9.12" height="0.16"
-                          transform="translate(-25.26 35.8) rotate(-52)"/>
-                    <rect class="cls-1" x="19.38" y="43.62" width="9.12" height="0.16"
-                          transform="translate(-25.23 35.66) rotate(-52)"/>
-                    <rect class="cls-1" x="19.25" y="43.52" width="9.12" height="0.16"
-                          transform="translate(-25.21 35.52) rotate(-52)"/>
-                    <rect class="cls-1" x="19.13" y="43.42" width="9.12" height="0.16"
-                          transform="translate(-25.18 35.38) rotate(-52)"/>
-                    <rect class="cls-1" x="19" y="43.32" width="9.12" height="0.16"
-                          transform="translate(-25.15 35.25) rotate(-52)"/>
-                    <rect class="cls-1" x="18.87" y="43.22" width="9.12" height="0.16"
-                          transform="translate(-25.12 35.11) rotate(-52)"/>
-                    <rect class="cls-1" x="18.75" y="43.12" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.09, 34.97)"/>
-                    <rect class="cls-1" x="18.62" y="43.02" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.06, 34.83)"/>
-                    <rect class="cls-1" x="18.49" y="42.92" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.03, 34.69)"/>
-                    <rect class="cls-1" x="18.37" y="42.82" width="9.12" height="0.16"
-                          transform="translate(-25 34.55) rotate(-52)"/>
-                    <rect class="cls-1" x="18.24" y="42.72" width="9.12" height="0.16"
-                          transform="translate(-24.97 34.42) rotate(-52)"/>
-                    <rect class="cls-1" x="18.11" y="42.63" width="9.12" height="0.16"
-                          transform="translate(-24.94 34.28) rotate(-52)"/>
-                    <rect class="cls-1" x="17.98" y="42.53" width="9.12" height="0.16"
-                          transform="translate(-24.91 34.14) rotate(-52)"/>
-                    <rect class="cls-1" x="17.86" y="42.43" width="9.12" height="0.16"
-                          transform="translate(-24.88 34) rotate(-52)"/>
-                    <rect class="cls-1" x="17.73" y="42.33" width="9.12" height="0.16"
-                          transform="translate(-24.85 33.86) rotate(-52)"/>
-                    <rect class="cls-1" x="17.6" y="42.23" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -24.82, 33.72)"/>
-                    <rect class="cls-1" x="17.48" y="42.13" width="9.12" height="0.16"
-                          transform="translate(-24.79 33.59) rotate(-52)"/>
-                    <rect class="cls-1" x="17.35" y="42.03" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -24.76, 33.45)"/>
-                    <rect class="cls-1" x="17.22" y="41.93" width="9.12" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -24.73, 33.31)"/>
-                    <rect class="cls-1" x="17.09" y="41.83" width="9.12" height="0.16"
-                          transform="translate(-24.71 33.17) rotate(-52)"/>
-                    <rect class="cls-1" x="16.97" y="41.73" width="9.12" height="0.16"
-                          transform="translate(-24.68 33.03) rotate(-52)"/>
-                    <rect class="cls-1" x="16.52" y="40.98" width="9.12" height="0.96"
-                          transform="translate(-24.57 32.55) rotate(-52)"/>
-                    <rect class="cls-1" x="15.76" y="40.39" width="9.12" height="0.96"
-                          transform="translate(-24.4 31.72) rotate(-52)"/>
-                    <rect class="cls-1" x="15" y="39.8" width="9.12" height="0.96"
-                          transform="translate(-24.22 30.9) rotate(-52)"/>
-                    <polygon class="cls-1"
-                             points="16.38 43.57 15.62 42.98 20.8 36.35 21.94 36.35 21.99 36.39 16.38 43.57"/>
-                    <polygon class="cls-1" points="15.62 42.98 14.86 42.39 19.58 36.35 20.8 36.35 15.62 42.98"/>
-                    <polygon class="cls-1" points="14.86 42.39 14.1 41.8 18.35 36.35 19.58 36.35 14.86 42.39"/>
-                    <polygon class="cls-1" points="14.1 41.8 13.34 41.2 17.13 36.35 18.35 36.35 14.1 41.8"/>
-                    <polygon class="cls-1"
-                             points="13.34 41.2 12.77 40.76 12.77 40.37 15.91 36.35 17.13 36.35 13.34 41.2"/>
-                    <polygon class="cls-1" points="12.77 40.09 15.69 36.35 15.91 36.35 12.77 40.37 12.77 40.09"/>
-                    <polygon class="cls-1" points="12.77 39.8 15.47 36.35 15.69 36.35 12.77 40.09 12.77 39.8"/>
-                    <polygon class="cls-1" points="12.77 39.52 15.25 36.35 15.47 36.35 12.77 39.8 12.77 39.52"/>
-                    <polygon class="cls-1" points="12.77 39.24 15.03 36.35 15.25 36.35 12.77 39.52 12.77 39.24"/>
-                    <polygon class="cls-1" points="12.77 38.96 14.8 36.35 15.03 36.35 12.77 39.24 12.77 38.96"/>
-                    <polygon class="cls-1" points="12.77 38.68 14.59 36.35 14.8 36.35 12.77 38.96 12.77 38.68"/>
-                    <polygon class="cls-1" points="12.77 38.39 14.37 36.35 14.59 36.35 12.77 38.68 12.77 38.39"/>
-                    <polygon class="cls-1" points="12.77 38.11 14.14 36.35 14.37 36.35 12.77 38.39 12.77 38.11"/>
-                    <polygon class="cls-1" points="12.77 37.83 13.92 36.35 14.14 36.35 12.77 38.11 12.77 37.83"/>
-                    <polygon class="cls-1" points="12.77 37.55 13.7 36.35 13.92 36.35 12.77 37.83 12.77 37.55"/>
-                    <polygon class="cls-1" points="12.77 37.27 13.48 36.35 13.7 36.35 12.77 37.55 12.77 37.27"/>
-                    <polygon class="cls-1" points="12.77 36.98 13.26 36.35 13.48 36.35 12.77 37.27 12.77 36.98"/>
-                    <polygon class="cls-1" points="12.77 36.7 13.04 36.35 13.26 36.35 12.77 36.98 12.77 36.7"/>
-                    <polygon class="cls-1" points="12.77 36.42 12.82 36.35 13.04 36.35 12.77 36.7 12.77 36.42"/>
-                    <polygon class="cls-1" points="12.82 36.35 12.77 36.42 12.77 36.35 12.82 36.35"/>
-                </g>
-                <path class="cls-1"
-                      d="M32.38,51.94a35.59,35.59,0,0,0,4.19,1.59l.15,0a9.39,9.39,0,0,0-2.87,2.11,13.22,13.22,0,0,1,6.51-1.21,6,6,0,0,1-1.17,2.8,6.07,6.07,0,0,0,2.09-2.14A7.3,7.3,0,0,0,42.2,59a7.63,7.63,0,0,1,.19-4.26C46,57,45,56.36,48.1,58.16c.1.05.29,0,.4,0,.34.19,1,.77,1.4,1a1.14,1.14,0,0,0-.58-1c-.88-.5-.78-.29-8.25-5.09l-.64-.41-.18-.12c-.78-.5-1.58-1-2.39-1.56l-.56-.37h0l-5.07,1.24Z"/>
-                <g class="cls-11">
-                    <path class="cls-1"
-                          d="M53.16,59.69A10.3,10.3,0,0,1,55.88,61V59.89l-2.24-1.74-1,1.27A5.12,5.12,0,0,0,53.16,59.69Z"/>
-                    <path class="cls-1"
-                          d="M53.09,62.25a14.26,14.26,0,0,1-1.83-1L50,62.82h4.35C53.92,62.64,53.5,62.46,53.09,62.25Z"/>
-                    <path class="cls-1" d="M47.76,59.73l-2.41,3.09h.29l2.34-3A.73.73,0,0,1,47.76,59.73Z"/>
-                    <path class="cls-1" d="M47.6,59.55l-2.55,3.27h.3l2.41-3.09A.55.55,0,0,1,47.6,59.55Z"/>
-                    <path class="cls-1" d="M47.51,59.29l-2.76,3.53h.3l2.55-3.27A.62.62,0,0,1,47.51,59.29Z"/>
-                    <path class="cls-1" d="M47.59,58.81l-3.13,4h.29l2.76-3.53A.91.91,0,0,1,47.59,58.81Z"/>
-                    <path class="cls-1"
-                          d="M47.91,58.4l2.29-2.94L50,55.32l-5.86,7.5h.3l3.13-4A.92.92,0,0,1,47.91,58.4Z"/>
-                    <polygon class="cls-1" points="43.86 62.82 49.83 55.17 50.02 55.32 44.16 62.82 43.86 62.82"/>
-                    <polygon class="cls-1" points="43.57 62.82 49.65 55.03 49.83 55.17 43.86 62.82 43.57 62.82"/>
-                    <polygon class="cls-1" points="43.27 62.82 49.47 54.88 49.65 55.03 43.57 62.82 43.27 62.82"/>
-                    <polygon class="cls-1" points="42.97 62.82 49.28 54.74 49.47 54.88 43.27 62.82 42.97 62.82"/>
-                    <polygon class="cls-1" points="42.68 62.82 49.1 54.6 49.28 54.74 42.97 62.82 42.68 62.82"/>
-                    <polygon class="cls-1" points="42.38 62.82 48.91 54.45 49.1 54.6 42.68 62.82 42.38 62.82"/>
-                    <polygon class="cls-1" points="42.08 62.82 48.73 54.31 48.91 54.45 42.38 62.82 42.08 62.82"/>
-                    <polygon class="cls-1" points="41.78 62.82 48.54 54.16 48.73 54.31 42.08 62.82 41.78 62.82"/>
-                    <polygon class="cls-1" points="41.49 62.82 48.36 54.02 48.54 54.16 41.78 62.82 41.49 62.82"/>
-                    <polygon class="cls-1" points="41.19 62.82 48.18 53.88 48.36 54.02 41.49 62.82 41.19 62.82"/>
-                    <polygon class="cls-1" points="40.9 62.82 47.99 53.73 48.18 53.88 41.19 62.82 40.9 62.82"/>
-                    <polygon class="cls-1" points="40.6 62.82 47.81 53.59 47.99 53.73 40.9 62.82 40.6 62.82"/>
-                    <polygon class="cls-1" points="40.3 62.82 47.62 53.45 47.81 53.59 40.6 62.82 40.3 62.82"/>
-                    <polygon class="cls-1"
-                             points="40.05 62.82 40.02 62.79 47.44 53.3 47.62 53.45 40.3 62.82 40.05 62.82"/>
-                    <rect class="cls-1" x="37.62" y="57.86" width="12.04" height="0.23"
-                          transform="translate(-28.91 56.67) rotate(-52)"/>
-                    <rect class="cls-1" x="37.43" y="57.71" width="12.04" height="0.23"
-                          transform="translate(-28.87 56.47) rotate(-52)"/>
-                    <rect class="cls-1" x="37.25" y="57.57" width="12.04" height="0.23"
-                          transform="translate(-28.83 56.27) rotate(-52)"/>
-                    <rect class="cls-1" x="37.06" y="57.43" width="12.04" height="0.23"
-                          transform="translate(-28.79 56.07) rotate(-52)"/>
-                    <rect class="cls-1" x="36.88" y="57.28" width="12.04" height="0.23"
-                          transform="translate(-28.74 55.87) rotate(-52)"/>
-                    <rect class="cls-1" x="36.7" y="57.14" width="12.04" height="0.23"
-                          transform="translate(-28.7 55.67) rotate(-52)"/>
-                    <rect class="cls-1" x="36.51" y="56.99" width="12.04" height="0.23"
-                          transform="translate(-28.66 55.47) rotate(-52)"/>
-                    <rect class="cls-1" x="36.33" y="56.85" width="12.04" height="0.23"
-                          transform="translate(-28.61 55.27) rotate(-52)"/>
-                    <rect class="cls-1" x="36.14" y="56.71" width="12.04" height="0.23"
-                          transform="translate(-28.57 55.07) rotate(-52)"/>
-                    <rect class="cls-1" x="35.96" y="56.56" width="12.04" height="0.23"
-                          transform="translate(-28.53 54.87) rotate(-52)"/>
-                    <rect class="cls-1" x="35.77" y="56.42" width="12.04" height="0.23"
-                          transform="translate(-28.49 54.67) rotate(-52)"/>
-                    <rect class="cls-1" x="35.59" y="56.27" width="12.04" height="0.23"
-                          transform="translate(-28.44 54.47) rotate(-52)"/>
-                    <rect class="cls-1" x="35.41" y="56.13" width="12.04" height="0.23"
-                          transform="translate(-28.4 54.27) rotate(-52)"/>
-                    <rect class="cls-1" x="35.22" y="55.99" width="12.04" height="0.23"
-                          transform="translate(-28.36 54.06) rotate(-52)"/>
-                    <rect class="cls-1" x="35.04" y="55.84" width="12.04" height="0.23"
-                          transform="translate(-28.32 53.86) rotate(-52)"/>
-                    <rect class="cls-1" x="34.85" y="55.7" width="12.04" height="0.23"
-                          transform="translate(-28.27 53.66) rotate(-52)"/>
-                    <rect class="cls-1" x="34.67" y="55.55" width="12.04" height="0.23"
-                          transform="translate(-28.23 53.46) rotate(-52)"/>
-                    <rect class="cls-1" x="34.48" y="55.41" width="12.04" height="0.23"
-                          transform="translate(-28.19 53.26) rotate(-52)"/>
-                    <polygon class="cls-1" points="36.71 60.2 36.52 60.06 43.9 50.62 44 50.62 44.12 50.71 36.71 60.2"/>
-                    <polygon class="cls-1" points="36.52 60.06 36.34 59.91 43.6 50.62 43.9 50.62 36.52 60.06"/>
-                    <polygon class="cls-1" points="36.34 59.91 36.15 59.77 43.3 50.62 43.6 50.62 36.34 59.91"/>
-                    <polygon class="cls-1" points="36.15 59.77 35.97 59.63 43.01 50.62 43.3 50.62 36.15 59.77"/>
-                    <polygon class="cls-1" points="35.97 59.63 35.78 59.48 42.71 50.62 43.01 50.62 35.97 59.63"/>
-                    <polygon class="cls-1" points="35.78 59.48 35.6 59.34 42.41 50.62 42.71 50.62 35.78 59.48"/>
-                    <polygon class="cls-1" points="35.6 59.34 35.42 59.19 42.12 50.62 42.41 50.62 35.6 59.34"/>
-                    <polygon class="cls-1" points="35.42 59.19 35.23 59.05 41.82 50.62 42.12 50.62 35.42 59.19"/>
-                    <polygon class="cls-1" points="35.23 59.05 35.05 58.91 41.52 50.62 41.82 50.62 35.23 59.05"/>
-                    <polygon class="cls-1" points="35.05 58.91 34.86 58.76 41.23 50.62 41.52 50.62 35.05 58.91"/>
-                    <polygon class="cls-1" points="34.86 58.76 34.68 58.62 40.93 50.62 41.23 50.62 34.86 58.76"/>
-                    <polygon class="cls-1" points="34.68 58.62 34.49 58.47 40.63 50.62 40.93 50.62 34.68 58.62"/>
-                    <polygon class="cls-1" points="34.49 58.47 34.31 58.33 40.34 50.62 40.63 50.62 34.49 58.47"/>
-                    <polygon class="cls-1" points="34.31 58.33 34.13 58.19 40.04 50.62 40.34 50.62 34.31 58.33"/>
-                    <polygon class="cls-1" points="34.13 58.19 33.94 58.04 39.74 50.62 40.04 50.62 34.13 58.19"/>
-                    <polygon class="cls-1" points="33.94 58.04 33.76 57.9 39.45 50.62 39.74 50.62 33.94 58.04"/>
-                    <polygon class="cls-1" points="33.76 57.9 33.57 57.75 39.15 50.62 39.45 50.62 33.76 57.9"/>
-                    <polygon class="cls-1" points="33.57 57.75 33.39 57.61 38.85 50.62 39.15 50.62 33.57 57.75"/>
-                    <polygon class="cls-1" points="33.39 57.61 33.2 57.47 38.56 50.62 38.85 50.62 33.39 57.61"/>
-                    <polygon class="cls-1" points="33.2 57.47 33.02 57.32 38.26 50.62 38.56 50.62 33.2 57.47"/>
-                    <polygon class="cls-1" points="33.02 57.32 32.84 57.18 37.96 50.62 38.26 50.62 33.02 57.32"/>
-                    <polygon class="cls-1" points="32.84 57.18 32.65 57.03 37.66 50.62 37.96 50.62 32.84 57.18"/>
-                    <polygon class="cls-1" points="32.65 57.03 32.47 56.89 37.37 50.62 37.66 50.62 32.65 57.03"/>
-                    <polygon class="cls-1" points="32.47 56.89 32.28 56.75 37.07 50.62 37.37 50.62 32.47 56.89"/>
-                    <polygon class="cls-1"
-                             points="32.28 56.75 32.22 56.7 32.22 56.44 36.77 50.62 37.07 50.62 32.28 56.75"/>
-                    <polygon class="cls-1" points="32.22 56.06 36.48 50.62 36.77 50.62 32.22 56.44 32.22 56.06"/>
-                    <polygon class="cls-1" points="32.22 55.68 36.18 50.62 36.48 50.62 32.22 56.06 32.22 55.68"/>
-                    <polygon class="cls-1" points="32.22 55.3 35.88 50.62 36.18 50.62 32.22 55.68 32.22 55.3"/>
-                    <polygon class="cls-1" points="32.22 54.92 35.59 50.62 35.88 50.62 32.22 55.3 32.22 54.92"/>
-                    <polygon class="cls-1" points="32.22 54.54 35.29 50.62 35.59 50.62 32.22 54.92 32.22 54.54"/>
-                    <polygon class="cls-1" points="32.22 54.16 34.99 50.62 35.29 50.62 32.22 54.54 32.22 54.16"/>
-                    <polygon class="cls-1" points="32.22 53.78 34.7 50.62 34.99 50.62 32.22 54.16 32.22 53.78"/>
-                    <polygon class="cls-1" points="32.22 53.4 34.4 50.62 34.7 50.62 32.22 53.78 32.22 53.4"/>
-                    <polygon class="cls-1" points="32.22 53.02 34.1 50.62 34.4 50.62 32.22 53.4 32.22 53.02"/>
-                    <polygon class="cls-1" points="32.22 52.64 33.81 50.62 34.1 50.62 32.22 53.02 32.22 52.64"/>
-                    <polygon class="cls-1" points="32.22 52.26 33.51 50.62 33.81 50.62 32.22 52.64 32.22 52.26"/>
-                    <polygon class="cls-1" points="32.22 51.88 33.21 50.62 33.51 50.62 32.22 52.26 32.22 51.88"/>
-                    <polygon class="cls-1" points="32.22 51.5 32.92 50.62 33.21 50.62 32.22 51.88 32.22 51.5"/>
-                    <polygon class="cls-1" points="32.22 51.12 32.62 50.62 32.92 50.62 32.22 51.5 32.22 51.12"/>
-                    <polygon class="cls-1" points="32.22 50.74 32.32 50.62 32.62 50.62 32.22 51.12 32.22 50.74"/>
-                    <polygon class="cls-1" points="32.32 50.62 32.22 50.74 32.22 50.62 32.32 50.62"/>
-                </g>
-                <path class="cls-1"
-                      d="M18.28,36.08a3.51,3.51,0,0,0,.36.29l1.11.9,1.26,1,.66.51,2.06,1.57c.88.66,1.79,1.33,2.74,2s1.84,1.33,2.81,2l2.86,2,2.72,1.83.13.09,2.86,1.89.07,0,.22-1.9s0,.07,0,.11a13.6,13.6,0,0,0-2.34-8A18,18,0,0,0,33,37.29,28.37,28.37,0,0,0,30.1,35c-.94-.66-2-1.33-3.09-2a7,7,0,0,1,.2,1.87c0,.12,0,.24,0,.36l0,.37h0A8.26,8.26,0,0,0,24,30.29,7.68,7.68,0,0,1,24.48,33c0,.15,0,.3,0,.45a.49.49,0,0,0,0,.12h0a8.75,8.75,0,0,0-.61-2.08c-.06-.13-.12-.26-.19-.39s-.21-.37-.33-.56-.15-.22-.24-.34a7.63,7.63,0,0,0-.66-.76l-.23-.22L21.85,29c-.52-.42-1-.77-1.39-1.06l-.58-.38-.2-.13c-.2-.13-.38-.23-.54-.32a3.88,3.88,0,0,0-.58-.27h0a1.49,1.49,0,0,1,.11.28A8.89,8.89,0,0,1,19,29.82l.21-1.74L19,29.82v0a2.45,2.45,0,0,1,0,.27v-.05l-.7,6Z"/>
-                <g class="cls-12">
-                    <polygon class="cls-1" points="38.19 50.22 38.33 50.04 38.33 50.22 38.19 50.22"/>
-                    <polygon class="cls-1" points="37.99 50.22 38.33 49.78 38.33 50.04 38.19 50.22 37.99 50.22"/>
-                    <polygon class="cls-1" points="37.78 50.22 38.33 49.52 38.33 49.78 37.99 50.22 37.78 50.22"/>
-                    <polygon class="cls-1" points="37.58 50.22 38.33 49.26 38.33 49.52 37.78 50.22 37.58 50.22"/>
-                    <polygon class="cls-1" points="37.37 50.22 38.33 48.99 38.33 49.26 37.58 50.22 37.37 50.22"/>
-                    <polygon class="cls-1" points="37.17 50.22 38.33 48.73 38.33 48.99 37.37 50.22 37.17 50.22"/>
-                    <polygon class="cls-1" points="36.96 50.22 38.33 48.47 38.33 48.73 37.17 50.22 36.96 50.22"/>
-                    <polygon class="cls-1" points="36.76 50.22 38.33 48.21 38.33 48.47 36.96 50.22 36.76 50.22"/>
-                    <polygon class="cls-1" points="36.55 50.22 38.33 47.95 38.33 48.21 36.76 50.22 36.55 50.22"/>
-                    <polygon class="cls-1" points="36.35 50.22 38.33 47.68 38.33 47.95 36.55 50.22 36.35 50.22"/>
-                    <polygon class="cls-1" points="36.14 50.22 38.33 47.42 38.33 47.68 36.35 50.22 36.14 50.22"/>
-                    <polygon class="cls-1" points="35.94 50.22 38.33 47.16 38.33 47.42 36.14 50.22 35.94 50.22"/>
-                    <polygon class="cls-1" points="35.73 50.22 38.33 46.9 38.33 47.16 35.94 50.22 35.73 50.22"/>
-                    <polygon class="cls-1" points="35.53 50.22 38.33 46.63 38.33 46.9 35.73 50.22 35.53 50.22"/>
-                    <polygon class="cls-1" points="35.33 50.22 38.33 46.37 38.33 46.63 35.53 50.22 35.33 50.22"/>
-                    <polygon class="cls-1" points="35.12 50.22 38.33 46.11 38.33 46.37 35.33 50.22 35.12 50.22"/>
-                    <polygon class="cls-1" points="34.92 50.22 38.33 45.85 38.33 46.11 35.12 50.22 34.92 50.22"/>
-                    <polygon class="cls-1" points="34.71 50.22 38.33 45.59 38.33 45.85 34.92 50.22 34.71 50.22"/>
-                    <polygon class="cls-1" points="34.51 50.22 38.33 45.32 38.33 45.59 34.71 50.22 34.51 50.22"/>
-                    <polygon class="cls-1" points="34.3 50.22 38.33 45.06 38.33 45.32 34.51 50.22 34.3 50.22"/>
-                    <polygon class="cls-1" points="34.1 50.22 38.33 44.8 38.33 45.06 34.3 50.22 34.1 50.22"/>
-                    <polygon class="cls-1" points="33.89 50.22 38.33 44.54 38.33 44.8 34.1 50.22 33.89 50.22"/>
-                    <polygon class="cls-1" points="33.69 50.22 38.33 44.28 38.33 44.54 33.89 50.22 33.69 50.22"/>
-                    <polygon class="cls-1" points="33.48 50.22 38.33 44.01 38.33 44.28 33.69 50.22 33.48 50.22"/>
-                    <polygon class="cls-1"
-                             points="33.42 50.22 33.33 50.15 38.33 43.75 38.33 44.01 33.48 50.22 33.42 50.22"/>
-                    <polygon class="cls-1" points="33.33 50.15 33.2 50.05 38.33 43.49 38.33 43.75 33.33 50.15"/>
-                    <polygon class="cls-1" points="33.2 50.05 33.08 49.95 38.33 43.23 38.33 43.49 33.2 50.05"/>
-                    <polygon class="cls-1" points="33.08 49.95 32.95 49.86 38.33 42.97 38.33 43.23 33.08 49.95"/>
-                    <polygon class="cls-1" points="32.95 49.86 32.82 49.76 38.33 42.7 38.33 42.97 32.95 49.86"/>
-                    <polygon class="cls-1" points="32.82 49.76 32.7 49.66 38.33 42.44 38.33 42.7 32.82 49.76"/>
-                    <polygon class="cls-1" points="32.7 49.66 32.57 49.56 38.33 42.18 38.33 42.44 32.7 49.66"/>
-                    <polygon class="cls-1" points="32.57 49.56 32.44 49.46 38.33 41.92 38.33 42.18 32.57 49.56"/>
-                    <polygon class="cls-1" points="32.44 49.46 32.31 49.36 38.33 41.66 38.33 41.92 32.44 49.46"/>
-                    <polygon class="cls-1" points="32.31 49.36 32.19 49.26 38.33 41.39 38.33 41.66 32.31 49.36"/>
-                    <polygon class="cls-1" points="32.19 49.26 32.06 49.16 38.33 41.13 38.33 41.39 32.19 49.26"/>
-                    <polygon class="cls-1" points="32.06 49.16 31.93 49.06 38.33 40.87 38.33 41.13 32.06 49.16"/>
-                    <polygon class="cls-1" points="31.93 49.06 31.8 48.96 38.33 40.61 38.33 40.87 31.93 49.06"/>
-                    <polygon class="cls-1" points="31.8 48.96 31.68 48.86 38.33 40.34 38.33 40.61 31.8 48.96"/>
-                    <polygon class="cls-1" points="31.68 48.86 31.55 48.76 38.33 40.08 38.33 40.34 31.68 48.86"/>
-                    <polygon class="cls-1" points="31.55 48.76 31.42 48.66 38.33 39.82 38.33 40.08 31.55 48.76"/>
-                    <polygon class="cls-1" points="31.42 48.66 31.3 48.56 38.33 39.56 38.33 39.82 31.42 48.66"/>
-                    <polygon class="cls-1" points="31.3 48.56 31.17 48.47 38.33 39.3 38.33 39.56 31.3 48.56"/>
-                    <polygon class="cls-1"
-                             points="31.17 48.47 31.04 48.37 38.31 39.06 38.33 39.08 38.33 39.3 31.17 48.47"/>
-                    <rect class="cls-1" x="28.71" y="43.58" width="11.81" height="0.16"
-                          transform="translate(-21.1 44.06) rotate(-52)"/>
-                    <rect class="cls-1" x="28.58" y="43.48" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -21.08, 43.92)"/>
-                    <rect class="cls-1" x="28.46" y="43.38" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -21.05, 43.78)"/>
-                    <rect class="cls-1" x="28.33" y="43.29" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -21.02, 43.64)"/>
-                    <rect class="cls-1" x="28.2" y="43.19" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -20.99, 43.51)"/>
-                    <rect class="cls-1" x="28.07" y="43.09" width="11.81" height="0.16"
-                          transform="translate(-20.96 43.37) rotate(-52)"/>
-                    <rect class="cls-1" x="27.95" y="42.99" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -20.93, 43.23)"/>
-                    <rect class="cls-1" x="27.82" y="42.89" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -20.9, 43.09)"/>
-                    <rect class="cls-1" x="27.69" y="42.79" width="11.81" height="0.16"
-                          transform="translate(-20.87 42.95) rotate(-52)"/>
-                    <rect class="cls-1" x="27.57" y="42.69" width="11.81" height="0.16"
-                          transform="translate(-20.84 42.81) rotate(-52)"/>
-                    <rect class="cls-1" x="27.44" y="42.59" width="11.81" height="0.16"
-                          transform="translate(-20.81 42.68) rotate(-52)"/>
-                    <rect class="cls-1" x="27.31" y="42.49" width="11.81" height="0.16"
-                          transform="translate(-20.78 42.54) rotate(-52)"/>
-                    <rect class="cls-1" x="27.18" y="42.39" width="11.81" height="0.16"
-                          transform="translate(-20.75 42.4) rotate(-52)"/>
-                    <rect class="cls-1" x="27.06" y="42.29" width="11.81" height="0.16"
-                          transform="translate(-20.72 42.26) rotate(-52)"/>
-                    <rect class="cls-1" x="26.93" y="42.19" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -20.69, 42.12)"/>
-                    <rect class="cls-1" x="26.8" y="42.09" width="11.81" height="0.16"
-                          transform="translate(-20.66 41.98) rotate(-52)"/>
-                    <rect class="cls-1" x="26.68" y="41.99" width="11.81" height="0.16"
-                          transform="translate(-20.63 41.84) rotate(-52)"/>
-                    <rect class="cls-1" x="26.55" y="41.89" width="11.81" height="0.16"
-                          transform="translate(-20.6 41.71) rotate(-52)"/>
-                    <rect class="cls-1" x="26.42" y="41.8" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -20.58, 41.57)"/>
-                    <rect class="cls-1" x="26.29" y="41.7" width="11.81" height="0.16"
-                          transform="translate(-20.55 41.43) rotate(-52)"/>
-                    <rect class="cls-1" x="26.17" y="41.6" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -20.52, 41.29)"/>
-                    <rect class="cls-1" x="26.04" y="41.5" width="11.81" height="0.16"
-                          transform="translate(-20.49 41.15) rotate(-52)"/>
-                    <rect class="cls-1" x="25.91" y="41.4" width="11.81" height="0.16"
-                          transform="translate(-20.46 41.01) rotate(-52)"/>
-                    <rect class="cls-1" x="25.79" y="41.3" width="11.81" height="0.16"
-                          transform="translate(-20.43 40.88) rotate(-52)"/>
-                    <rect class="cls-1" x="25.66" y="41.2" width="11.81" height="0.16"
-                          transform="translate(-20.4 40.74) rotate(-52)"/>
-                    <rect class="cls-1" x="25.53" y="41.1" width="11.81" height="0.16"
-                          transform="translate(-20.37 40.6) rotate(-52)"/>
-                    <rect class="cls-1" x="25.4" y="41" width="11.81" height="0.16"
-                          transform="translate(-20.34 40.46) rotate(-52)"/>
-                    <rect class="cls-1" x="25.28" y="40.9" width="11.81" height="0.16"
-                          transform="translate(-20.31 40.32) rotate(-52)"/>
-                    <rect class="cls-1" x="25.15" y="40.8" width="11.81" height="0.16"
-                          transform="translate(-20.28 40.18) rotate(-52)"/>
-                    <rect class="cls-1" x="25.02" y="40.7" width="11.81" height="0.16"
-                          transform="translate(-20.25 40.05) rotate(-52)"/>
-                    <rect class="cls-1" x="24.9" y="40.6" width="11.81" height="0.16"
-                          transform="translate(-20.22 39.91) rotate(-52)"/>
-                    <rect class="cls-1" x="24.77" y="40.5" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -20.19, 39.77)"/>
-                    <rect class="cls-1" x="24.64" y="40.41" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -20.16, 39.63)"/>
-                    <rect class="cls-1" x="24.51" y="40.31" width="11.81" height="0.16"
-                          transform="translate(-20.13 39.49) rotate(-52)"/>
-                    <rect class="cls-1" x="24.39" y="40.21" width="11.81" height="0.16"
-                          transform="translate(-20.1 39.35) rotate(-52)"/>
-                    <rect class="cls-1" x="24.26" y="40.11" width="11.81" height="0.16"
-                          transform="translate(-20.08 39.22) rotate(-52)"/>
-                    <rect class="cls-1" x="24.13" y="40.01" width="11.81" height="0.16"
-                          transform="translate(-20.05 39.08) rotate(-52)"/>
-                    <rect class="cls-1" x="24.01" y="39.91" width="11.81" height="0.16"
-                          transform="translate(-20.02 38.94) rotate(-52)"/>
-                    <rect class="cls-1" x="23.88" y="39.81" width="11.81" height="0.16"
-                          transform="translate(-19.99 38.8) rotate(-52)"/>
-                    <rect class="cls-1" x="23.75" y="39.71" width="11.81" height="0.16"
-                          transform="translate(-19.96 38.66) rotate(-52)"/>
-                    <rect class="cls-1" x="23.62" y="39.61" width="11.81" height="0.16"
-                          transform="translate(-19.93 38.52) rotate(-52)"/>
-                    <rect class="cls-1" x="23.5" y="39.51" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.9, 38.39)"/>
-                    <rect class="cls-1" x="23.37" y="39.41" width="11.81" height="0.16"
-                          transform="translate(-19.87 38.25) rotate(-52)"/>
-                    <rect class="cls-1" x="23.24" y="39.31" width="11.81" height="0.16"
-                          transform="translate(-19.84 38.11) rotate(-52)"/>
-                    <rect class="cls-1" x="23.12" y="39.21" width="11.81" height="0.16"
-                          transform="translate(-19.81 37.97) rotate(-52)"/>
-                    <rect class="cls-1" x="22.99" y="39.11" width="11.81" height="0.16"
-                          transform="translate(-19.78 37.83) rotate(-52)"/>
-                    <rect class="cls-1" x="22.86" y="39.01" width="11.81" height="0.16"
-                          transform="translate(-19.75 37.69) rotate(-52)"/>
-                    <rect class="cls-1" x="22.73" y="38.92" width="11.81" height="0.16"
-                          transform="translate(-19.72 37.56) rotate(-52)"/>
-                    <rect class="cls-1" x="22.61" y="38.82" width="11.81" height="0.16"
-                          transform="translate(-19.69 37.42) rotate(-52)"/>
-                    <rect class="cls-1" x="22.48" y="38.72" width="11.81" height="0.16"
-                          transform="translate(-19.66 37.28) rotate(-52)"/>
-                    <rect class="cls-1" x="22.35" y="38.62" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.63, 37.14)"/>
-                    <rect class="cls-1" x="22.23" y="38.52" width="11.81" height="0.16"
-                          transform="translate(-19.61 37) rotate(-52)"/>
-                    <rect class="cls-1" x="22.1" y="38.42" width="11.81" height="0.16"
-                          transform="translate(-19.58 36.86) rotate(-52)"/>
-                    <rect class="cls-1" x="21.97" y="38.32" width="11.81" height="0.16"
-                          transform="translate(-19.55 36.73) rotate(-52)"/>
-                    <rect class="cls-1" x="21.84" y="38.22" width="11.81" height="0.16"
-                          transform="translate(-19.52 36.59) rotate(-52)"/>
-                    <rect class="cls-1" x="21.72" y="38.12" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.49, 36.45)"/>
-                    <rect class="cls-1" x="21.59" y="38.02" width="11.81" height="0.16"
-                          transform="translate(-19.46 36.31) rotate(-52)"/>
-                    <rect class="cls-1" x="21.46" y="37.92" width="11.81" height="0.16"
-                          transform="translate(-19.43 36.17) rotate(-52)"/>
-                    <rect class="cls-1" x="21.34" y="37.82" width="11.81" height="0.16"
-                          transform="translate(-19.4 36.03) rotate(-52)"/>
-                    <rect class="cls-1" x="21.21" y="37.72" width="11.81" height="0.16"
-                          transform="translate(-19.37 35.9) rotate(-52)"/>
-                    <rect class="cls-1" x="21.08" y="37.62" width="11.81" height="0.16"
-                          transform="translate(-19.34 35.76) rotate(-52)"/>
-                    <rect class="cls-1" x="20.95" y="37.52" width="11.81" height="0.16"
-                          transform="translate(-19.31 35.62) rotate(-52)"/>
-                    <rect class="cls-1" x="20.83" y="37.43" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.28, 35.48)"/>
-                    <rect class="cls-1" x="20.7" y="37.33" width="11.81" height="0.16"
-                          transform="translate(-19.25 35.34) rotate(-52)"/>
-                    <rect class="cls-1" x="20.57" y="37.23" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.22, 35.2)"/>
-                    <rect class="cls-1" x="20.45" y="37.13" width="11.81" height="0.16"
-                          transform="translate(-19.19 35.07) rotate(-52)"/>
-                    <rect class="cls-1" x="20.32" y="37.03" width="11.81" height="0.16"
-                          transform="translate(-19.16 34.93) rotate(-52)"/>
-                    <rect class="cls-1" x="20.19" y="36.93" width="11.81" height="0.16"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.13, 34.79)"/>
-                    <rect class="cls-1" x="20.06" y="36.83" width="11.81" height="0.16"
-                          transform="translate(-19.11 34.65) rotate(-52)"/>
-                    <rect class="cls-1" x="19.94" y="36.73" width="11.81" height="0.16"
-                          transform="translate(-19.08 34.51) rotate(-52)"/>
-                    <rect class="cls-1" x="19.81" y="36.63" width="11.81" height="0.16"
-                          transform="translate(-19.05 34.37) rotate(-52)"/>
-                    <rect class="cls-1" x="19.68" y="36.53" width="11.81" height="0.16"
-                          transform="translate(-19.02 34.24) rotate(-52)"/>
-                    <rect class="cls-1" x="19.24" y="35.78" width="11.81" height="0.96"
-                          transform="translate(-18.91 33.75) rotate(-52)"/>
-                    <rect class="cls-1" x="18.48" y="35.19" width="11.81" height="0.96"
-                          transform="translate(-18.74 32.93) rotate(-52)"/>
-                    <rect class="cls-1" x="17.72" y="34.6" width="11.81" height="0.96"
-                          transform="translate(-18.56 32.1) rotate(-52)"/>
-                    <rect class="cls-1" x="16.96" y="34" width="11.81" height="0.96"
-                          transform="translate(-18.39 31.27) rotate(-52)"/>
-                    <polygon class="cls-1"
-                             points="18.85 38.84 18.22 38.35 18.22 38.09 25.36 28.95 26.12 29.54 18.85 38.84"/>
-                    <polygon class="cls-1" points="18.22 36.52 24.6 28.35 25.36 28.95 18.22 38.09 18.22 36.52"/>
-                    <polygon class="cls-1" points="18.22 34.96 23.84 27.76 24.6 28.35 18.22 36.52 18.22 34.96"/>
-                    <polygon class="cls-1" points="18.22 33.39 23.08 27.16 23.84 27.76 18.22 34.96 18.22 33.39"/>
-                    <polygon class="cls-1" points="18.22 33.11 22.95 27.06 23.08 27.16 18.22 33.39 18.22 33.11"/>
-                    <polygon class="cls-1" points="18.22 32.83 22.81 26.95 22.95 27.06 18.22 33.11 18.22 32.83"/>
-                    <polygon class="cls-1" points="18.22 32.55 22.67 26.84 22.81 26.95 18.22 32.83 18.22 32.55"/>
-                    <polygon class="cls-1"
-                             points="18.22 32.26 22.5 26.79 22.6 26.79 22.67 26.84 18.22 32.55 18.22 32.26"/>
-                    <polygon class="cls-1" points="18.22 31.98 22.27 26.79 22.5 26.79 18.22 32.26 18.22 31.98"/>
-                    <polygon class="cls-1" points="18.22 31.7 22.05 26.79 22.27 26.79 18.22 31.98 18.22 31.7"/>
-                    <polygon class="cls-1" points="18.22 31.42 21.84 26.79 22.05 26.79 18.22 31.7 18.22 31.42"/>
-                    <polygon class="cls-1" points="18.22 31.14 21.61 26.79 21.84 26.79 18.22 31.42 18.22 31.14"/>
-                    <polygon class="cls-1" points="18.22 30.85 21.39 26.79 21.61 26.79 18.22 31.14 18.22 30.85"/>
-                    <polygon class="cls-1" points="18.22 30.57 21.17 26.79 21.39 26.79 18.22 30.85 18.22 30.57"/>
-                    <polygon class="cls-1" points="18.22 30.29 20.95 26.79 21.17 26.79 18.22 30.57 18.22 30.29"/>
-                    <polygon class="cls-1" points="18.22 30.01 20.73 26.79 20.95 26.79 18.22 30.29 18.22 30.01"/>
-                    <polygon class="cls-1" points="18.22 29.73 20.51 26.79 20.73 26.79 18.22 30.01 18.22 29.73"/>
-                    <polygon class="cls-1" points="18.22 29.44 20.29 26.79 20.51 26.79 18.22 29.73 18.22 29.44"/>
-                    <polygon class="cls-1" points="18.22 29.16 20.07 26.79 20.29 26.79 18.22 29.44 18.22 29.16"/>
-                    <polygon class="cls-1" points="18.22 28.88 19.85 26.79 20.07 26.79 18.22 29.16 18.22 28.88"/>
-                    <polygon class="cls-1" points="18.22 28.6 19.63 26.79 19.85 26.79 18.22 28.88 18.22 28.6"/>
-                    <polygon class="cls-1" points="18.22 28.31 19.41 26.79 19.63 26.79 18.22 28.6 18.22 28.31"/>
-                    <polygon class="cls-1" points="18.22 28.03 19.19 26.79 19.41 26.79 18.22 28.31 18.22 28.03"/>
-                    <polygon class="cls-1" points="18.22 27.75 18.97 26.79 19.19 26.79 18.22 28.03 18.22 27.75"/>
-                    <polygon class="cls-1" points="18.22 27.47 18.75 26.79 18.97 26.79 18.22 27.75 18.22 27.47"/>
-                    <polygon class="cls-1" points="18.22 27.18 18.53 26.79 18.75 26.79 18.22 27.47 18.22 27.18"/>
-                    <polygon class="cls-1" points="18.22 26.9 18.31 26.79 18.53 26.79 18.22 27.18 18.22 26.9"/>
-                    <polygon class="cls-1" points="18.31 26.79 18.22 26.9 18.22 26.79 18.31 26.79"/>
-                </g>
-                <path class="cls-1"
-                      d="M8,26.83c.67.7,1.45,1.47,2.32,2.32l.14.13c.77.73,1.61,1.51,2.53,2.34s1.66,1.47,2.6,2.26S17.3,35.29,18.22,36l.7-6a7.26,7.26,0,0,0-1.76-3.76c-.24-.26-.49-.53-.75-.79-.79-.81-1.68-1.63-2.58-2.39a31.59,31.59,0,0,0-2.54-1.95c-.51-.35-1-.64-1.42-.87s-.75-.37-1.1-.52A65.5,65.5,0,0,1,8,26.83Z"/>
-                <g class="cls-13">
-                    <polygon class="cls-1" points="18.73 36.04 18.92 35.8 18.92 36.04 18.73 36.04"/>
-                    <polygon class="cls-1" points="18.51 36.04 18.92 35.51 18.92 35.8 18.73 36.04 18.51 36.04"/>
-                    <polygon class="cls-1" points="18.29 36.04 18.92 35.23 18.92 35.51 18.51 36.04 18.29 36.04"/>
-                    <polygon class="cls-1" points="18.07 36.04 18.92 34.95 18.92 35.23 18.29 36.04 18.07 36.04"/>
-                    <polygon class="cls-1" points="17.85 36.04 18.92 34.67 18.92 34.95 18.07 36.04 17.85 36.04"/>
-                    <polygon class="cls-1" points="17.63 36.04 18.92 34.38 18.92 34.67 17.85 36.04 17.63 36.04"/>
-                    <polygon class="cls-1" points="17.41 36.04 18.92 34.1 18.92 34.38 17.63 36.04 17.41 36.04"/>
-                    <polygon class="cls-1" points="17.19 36.04 18.92 33.82 18.92 34.1 17.41 36.04 17.19 36.04"/>
-                    <polygon class="cls-1" points="16.97 36.04 18.92 33.54 18.92 33.82 17.19 36.04 16.97 36.04"/>
-                    <polygon class="cls-1" points="16.75 36.04 18.92 33.26 18.92 33.54 16.97 36.04 16.75 36.04"/>
-                    <polygon class="cls-1" points="16.53 36.04 18.92 32.97 18.92 33.26 16.75 36.04 16.53 36.04"/>
-                    <polygon class="cls-1" points="16.31 36.04 18.92 32.69 18.92 32.97 16.53 36.04 16.31 36.04"/>
-                    <polygon class="cls-1" points="16.09 36.04 18.92 32.41 18.92 32.69 16.31 36.04 16.09 36.04"/>
-                    <polygon class="cls-1" points="15.87 36.04 18.92 32.13 18.92 32.41 16.09 36.04 15.87 36.04"/>
-                    <polygon class="cls-1" points="15.65 36.04 18.92 31.85 18.92 32.13 15.87 36.04 15.65 36.04"/>
-                    <polygon class="cls-1" points="15.43 36.04 18.92 31.56 18.92 31.85 15.65 36.04 15.43 36.04"/>
-                    <polygon class="cls-1"
-                             points="15.31 36.04 15.25 35.98 18.92 31.28 18.92 31.56 15.43 36.04 15.31 36.04"/>
-                    <polygon class="cls-1" points="15.25 35.98 15.11 35.88 18.92 31 18.92 31.28 15.25 35.98"/>
-                    <polygon class="cls-1" points="15.11 35.88 14.97 35.77 18.92 30.72 18.92 31 15.11 35.88"/>
-                    <polygon class="cls-1" points="14.97 35.77 14.84 35.66 18.92 30.43 18.92 30.72 14.97 35.77"/>
-                    <polygon class="cls-1" points="14.84 35.66 14.7 35.56 18.92 30.15 18.92 30.43 14.84 35.66"/>
-                    <polygon class="cls-1" points="14.7 35.56 14.56 35.45 18.92 29.87 18.92 30.15 14.7 35.56"/>
-                    <polygon class="cls-1" points="14.56 35.45 14.43 35.34 18.92 29.59 18.92 29.87 14.56 35.45"/>
-                    <polygon class="cls-1" points="14.43 35.34 14.29 35.24 18.92 29.31 18.92 29.59 14.43 35.34"/>
-                    <polygon class="cls-1" points="14.29 35.24 14.15 35.13 18.92 29.02 18.92 29.31 14.29 35.24"/>
-                    <polygon class="cls-1" points="14.15 35.13 14.02 35.02 18.92 28.74 18.92 29.02 14.15 35.13"/>
-                    <polygon class="cls-1" points="14.02 35.02 13.88 34.92 18.92 28.46 18.92 28.74 14.02 35.02"/>
-                    <polygon class="cls-1" points="13.88 34.92 13.74 34.81 18.92 28.18 18.92 28.46 13.88 34.92"/>
-                    <polygon class="cls-1" points="13.74 34.81 13.6 34.7 18.92 27.89 18.92 28.18 13.74 34.81"/>
-                    <polygon class="cls-1" points="13.6 34.7 13.47 34.59 18.92 27.61 18.92 27.89 13.6 34.7"/>
-                    <polygon class="cls-1" points="13.47 34.59 13.33 34.49 18.92 27.33 18.92 27.61 13.47 34.59"/>
-                    <polygon class="cls-1" points="13.33 34.49 13.19 34.38 18.92 27.05 18.92 27.33 13.33 34.49"/>
-                    <polygon class="cls-1" points="13.19 34.38 13.06 34.27 18.92 26.77 18.92 27.05 13.19 34.38"/>
-                    <polygon class="cls-1" points="13.06 34.27 12.92 34.17 18.92 26.48 18.92 26.77 13.06 34.27"/>
-                    <polygon class="cls-1" points="12.92 34.17 12.78 34.06 18.92 26.2 18.92 26.48 12.92 34.17"/>
-                    <polygon class="cls-1" points="12.78 34.06 12.65 33.95 18.92 25.92 18.92 26.2 12.78 34.06"/>
-                    <polygon class="cls-1" points="12.65 33.95 12.51 33.85 18.92 25.64 18.92 25.92 12.65 33.95"/>
-                    <polygon class="cls-1" points="12.51 33.85 12.37 33.74 18.92 25.36 18.92 25.64 12.51 33.85"/>
-                    <polygon class="cls-1" points="12.37 33.74 12.23 33.63 18.92 25.07 18.92 25.36 12.37 33.74"/>
-                    <polygon class="cls-1"
-                             points="12.23 33.63 12.1 33.52 18.92 24.79 18.92 24.79 18.92 25.07 12.23 33.63"/>
-                    <rect class="cls-1" x="9.9" y="29.02" width="11.08" height="0.17"
-                          transform="translate(-17 23.36) rotate(-52)"/>
-                    <rect class="cls-1" x="9.76" y="28.91" width="11.08" height="0.17"
-                          transform="translate(-16.97 23.21) rotate(-52)"/>
-                    <rect class="cls-1" x="9.63" y="28.8" width="11.08" height="0.17"
-                          transform="translate(-16.94 23.06) rotate(-52)"/>
-                    <rect class="cls-1" x="9.49" y="28.7" width="11.08" height="0.17"
-                          transform="translate(-16.91 22.91) rotate(-52)"/>
-                    <rect class="cls-1" x="9.35" y="28.59" width="11.08" height="0.17"
-                          transform="translate(-16.87 22.76) rotate(-52)"/>
-                    <rect class="cls-1" x="9.22" y="28.48" width="11.08" height="0.17"
-                          transform="translate(-16.84 22.61) rotate(-52)"/>
-                    <rect class="cls-1" x="9.08" y="28.38" width="11.08" height="0.17"
-                          transform="translate(-16.81 22.46) rotate(-52)"/>
-                    <rect class="cls-1" x="8.94" y="28.27" width="11.08" height="0.17"
-                          transform="translate(-16.78 22.31) rotate(-52)"/>
-                    <rect class="cls-1" x="8.81" y="28.16" width="11.08" height="0.17"
-                          transform="translate(-16.75 22.16) rotate(-52)"/>
-                    <rect class="cls-1" x="8.67" y="28.06" width="11.08" height="0.17"
-                          transform="translate(-16.72 22.01) rotate(-52)"/>
-                    <rect class="cls-1" x="8.53" y="27.95" width="11.08" height="0.17"
-                          transform="translate(-16.68 21.87) rotate(-52)"/>
-                    <rect class="cls-1" x="8.39" y="27.84" width="11.08" height="0.17"
-                          transform="translate(-16.65 21.72) rotate(-52)"/>
-                    <rect class="cls-1" x="8.26" y="27.74" width="11.08" height="0.17"
-                          transform="translate(-16.62 21.57) rotate(-52)"/>
-                    <rect class="cls-1" x="8.12" y="27.63" width="11.08" height="0.17"
-                          transform="translate(-16.59 21.42) rotate(-52)"/>
-                    <rect class="cls-1" x="7.98" y="27.52" width="11.08" height="0.17"
-                          transform="translate(-16.56 21.27) rotate(-52)"/>
-                    <rect class="cls-1" x="7.85" y="27.41" width="11.08" height="0.17"
-                          transform="translate(-16.53 21.12) rotate(-52)"/>
-                    <rect class="cls-1" x="7.71" y="27.31" width="11.08" height="0.17"
-                          transform="translate(-16.49 20.97) rotate(-52)"/>
-                    <rect class="cls-1" x="7.57" y="27.2" width="11.08" height="0.17"
-                          transform="translate(-16.46 20.82) rotate(-52)"/>
-                    <rect class="cls-1" x="7.44" y="27.09" width="11.08" height="0.17"
-                          transform="translate(-16.43 20.67) rotate(-52)"/>
-                    <rect class="cls-1" x="7.3" y="26.99" width="11.08" height="0.17"
-                          transform="translate(-16.4 20.52) rotate(-52)"/>
-                    <rect class="cls-1" x="7.16" y="26.88" width="11.08" height="0.17"
-                          transform="translate(-16.37 20.38) rotate(-52)"/>
-                    <rect class="cls-1" x="7.03" y="26.77" width="11.08" height="0.17"
-                          transform="translate(-16.34 20.23) rotate(-52)"/>
-                    <rect class="cls-1" x="6.89" y="26.67" width="11.08" height="0.17"
-                          transform="translate(-16.3 20.08) rotate(-52)"/>
-                    <rect class="cls-1" x="6.75" y="26.56" width="11.08" height="0.17"
-                          transform="translate(-16.27 19.93) rotate(-52)"/>
-                    <rect class="cls-1" x="6.61" y="26.45" width="11.08" height="0.17"
-                          transform="translate(-16.24 19.78) rotate(-52)"/>
-                    <rect class="cls-1" x="6.48" y="26.34" width="11.08" height="0.17"
-                          transform="translate(-16.21 19.63) rotate(-52)"/>
-                    <rect class="cls-1" x="6.34" y="26.24" width="11.08" height="0.17"
-                          transform="translate(-16.18 19.48) rotate(-52)"/>
-                    <rect class="cls-1" x="6.2" y="26.13" width="11.08" height="0.17"
-                          transform="translate(-16.15 19.33) rotate(-52)"/>
-                    <rect class="cls-1" x="6.07" y="26.02" width="11.08" height="0.17"
-                          transform="translate(-16.11 19.18) rotate(-52)"/>
-                    <polygon class="cls-1"
-                             points="8.13 30.42 8.04 30.36 8.04 30.25 14.81 21.58 14.95 21.69 8.13 30.42"/>
-                    <polygon class="cls-1" points="8.04 29.97 14.68 21.48 14.81 21.58 8.04 30.25 8.04 29.97"/>
-                    <polygon class="cls-1" points="8.04 29.69 14.54 21.37 14.68 21.48 8.04 29.97 8.04 29.69"/>
-                    <polygon class="cls-1" points="8.04 29.41 14.4 21.26 14.54 21.37 8.04 29.69 8.04 29.41"/>
-                    <polygon class="cls-1" points="8.04 29.13 14.27 21.16 14.4 21.26 8.04 29.41 8.04 29.13"/>
-                    <polygon class="cls-1" points="8.04 28.84 14.13 21.05 14.27 21.16 8.04 29.13 8.04 28.84"/>
-                    <polygon class="cls-1" points="8.04 28.56 13.99 20.94 14.13 21.05 8.04 28.84 8.04 28.56"/>
-                    <polygon class="cls-1" points="8.04 28.28 13.86 20.84 13.99 20.94 8.04 28.56 8.04 28.28"/>
-                    <polygon class="cls-1" points="8.04 28 13.72 20.73 13.86 20.84 8.04 28.28 8.04 28"/>
-                    <polygon class="cls-1" points="8.04 27.71 13.58 20.62 13.72 20.73 8.04 28 8.04 27.71"/>
-                    <polygon class="cls-1" points="8.04 27.43 13.45 20.51 13.58 20.62 8.04 27.71 8.04 27.43"/>
-                    <polygon class="cls-1" points="8.04 27.15 13.31 20.41 13.45 20.51 8.04 27.43 8.04 27.15"/>
-                    <polygon class="cls-1" points="12.54 19.8 13.31 20.41 8.04 27.15 8.04 19.8 12.54 19.8"/>
-                </g>
-                <path class="cls-1" d="M27.2,35.21l0,.37h0Z"/>
-                <g class="cls-7">
-                    <path class="cls-1" d="M27.2,35.21l0,.37h0Z"/>
-                </g>
-                <path class="cls-1" d="M27.2,35.21l0,.37h0Z"/>
-                <g class="cls-14">
-                    <polygon class="cls-1" points="27.17 35.5 27.2 35.47 27.2 35.58 27.17 35.58 27.17 35.5"/>
-                    <polygon class="cls-1"
-                             points="27.17 35.24 27.2 35.21 27.2 35.21 27.2 35.47 27.17 35.5 27.17 35.24"/>
-                    <polygon class="cls-1" points="27.2 35.21 27.17 35.24 27.17 35.21 27.2 35.21"/>
-                </g>
-                <path class="cls-1" d="M24.45,33.6a.49.49,0,0,1,0-.12.49.49,0,0,0,0,.12Z"/>
-                <g class="cls-7">
-                    <path class="cls-1" d="M24.45,33.6a.49.49,0,0,1,0-.12.49.49,0,0,0,0,.12Z"/>
-                </g>
-                <path class="cls-1" d="M24.45,33.6a.49.49,0,0,1,0-.12.49.49,0,0,0,0,.12Z"/>
-                <g class="cls-15">
-                    <rect class="cls-1" x="24.45" y="33.48" width="0.01" height="0.11"/>
-                </g>
-                <polygon class="cls-1"
-                         points="24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59"/>
-                <g class="cls-7">
-                    <polygon class="cls-1"
-                             points="24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59"/>
-                </g>
-                <polygon class="cls-1"
-                         points="24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59"/>
-                <g class="cls-16">
-                    <rect class="cls-1" x="24.45" y="33.59"/>
-                </g>
-                <path class="cls-1"
-                      d="M7.46,17.64l.17,0,.09-.4,1.13.26,0-.18L7.77,17.1l.09-.41-.17,0ZM8,15.34,8.8,16l-1,.24,0,.22,1.29.3,0-.17-1-.24,1-.23,0-.12-.79-.65,1,.24,0-.17-1.29-.3Z"/>
-                <path class="cls-1" d="M27.26,34.72c0,.23,0,.47,0,.72h0c0-.12,0-.24,0-.36S27.26,34.84,27.26,34.72Z"/>
-                <g class="cls-7">
-                    <path class="cls-1"
-                          d="M27.26,34.72c0,.23,0,.47,0,.72h0c0-.12,0-.24,0-.36S27.26,34.84,27.26,34.72Z"/>
-                </g>
-                <path class="cls-1" d="M27.25,35.08c0,.12,0,.24,0,.36h0C27.24,35.32,27.24,35.2,27.25,35.08Z"/>
-                <g class="cls-7">
-                    <path class="cls-1" d="M27.25,35.08c0,.12,0,.24,0,.36h0C27.24,35.32,27.24,35.2,27.25,35.08Z"/>
-                </g>
-                <path class="cls-1" d="M27.25,35.08c0,.12,0,.24,0,.36h0C27.24,35.32,27.24,35.2,27.25,35.08Z"/>
-                <g class="cls-17">
-                    <polygon class="cls-1" points="27.22 35.37 27.25 35.34 27.25 35.45 27.22 35.45 27.22 35.37"/>
-                    <polygon class="cls-1"
-                             points="27.22 35.11 27.25 35.08 27.25 35.08 27.25 35.34 27.22 35.37 27.22 35.11"/>
-                    <polygon class="cls-1" points="27.25 35.08 27.22 35.11 27.22 35.08 27.25 35.08"/>
-                </g>
-                <path class="cls-1" d="M85.72,6.06a0,0,0,0,1,0,0l-.06,0h0v0Z"/>
-                <path class="cls-1" d="M85.25,18.53l-.06,0c0-.09,0-.14,0-.14S85.23,18.47,85.25,18.53Z"/>
-                <path class="cls-1" d="M74.35,22.72l.09,0-.1.1A.13.13,0,0,1,74.35,22.72Z"/>
-                <path class="cls-1" d="M70.18,47.29h0v0Z"/>
-                <path class="cls-1" d="M85.72,6.06a0,0,0,0,1,0,0l-.06,0h0v0Z"/>
-                <path class="cls-1" d="M85.25,18.53l-.06,0c0-.09,0-.14,0-.14S85.23,18.47,85.25,18.53Z"/>
-                <path class="cls-1" d="M74.35,22.72l.09,0-.1.1A.13.13,0,0,1,74.35,22.72Z"/>
-                <path class="cls-1" d="M70.18,47.29h0v0Z"/>
-                <path class="cls-1" d="M85.72,6.06a0,0,0,0,1,0,0l-.06,0h0v0Z"/>
-                <path class="cls-1" d="M85.25,18.53l-.06,0c0-.09,0-.14,0-.14S85.23,18.47,85.25,18.53Z"/>
-                <path class="cls-1" d="M74.35,22.72l.09,0-.1.1A.13.13,0,0,1,74.35,22.72Z"/>
-                <path class="cls-1" d="M70.18,47.29h0v0Z"/>
-                <path class="cls-1"
-                      d="M66.07,26.73a1.09,1.09,0,0,1-.08-.15l-.25-.45a.58.58,0,0,0-.11-.15,4.4,4.4,0,0,0-.86-1,5.4,5.4,0,0,0-.77-.47c-1.8.11-3.27,2.14-3.41,4.74a5.66,5.66,0,0,0,1.91,4.87h.86a9.55,9.55,0,0,0,2.5-.35s-.1-.08-.14,0a6.09,6.09,0,0,0,.76-.27,5.68,5.68,0,0,0,1-3.4A21.07,21.07,0,0,0,66.07,26.73Zm-2.73,2.08a.18.18,0,1,1,0-.26A.17.17,0,0,1,63.34,28.81Zm0-.91a.92.92,0,0,1-1.29,0,.91.91,0,0,1,1.29-1.29A.92.92,0,0,1,63.31,27.9Z"/>
-                <path class="cls-1"
-                      d="M74,24.53c-.27,1.61-.34,2.7-.35,2.77s-.17,1.29-.27,3.11h0a2.34,2.34,0,0,0,1,1.46h0a.33.33,0,0,0,.1,0l.29,0A15.3,15.3,0,0,1,74,24.53Z"/>
-                <path class="cls-1"
-                      d="M76.68,22.06h0a5.8,5.8,0,0,0-2.18.61h0l-.1.1h0c-.1.37-.18.74-.24,1.1s-.08.43-.11.64a15.3,15.3,0,0,0,.83,7.33A14.87,14.87,0,0,0,77,31.51c.31-.08.62-.16,1-.27a5.92,5.92,0,0,0,1.7-4.14C79.7,24.93,78.27,22.56,76.68,22.06Zm-2.37,5.65a.2.2,0,0,1-.19-.2.2.2,0,0,1,.19-.19.2.2,0,1,1,0,.39Zm1.17-.86a.8.8,0,0,1-1.09-.35.81.81,0,0,1,.36-1.09.8.8,0,0,1,1.09.35A.81.81,0,0,1,75.48,26.85Z"/>
-                <path class="cls-1"
-                      d="M86.48,6.12a3.52,3.52,0,0,0-.09-.85c0-.06-.25,0-.5.07l-.27.12h0a5.52,5.52,0,0,0-1.28.38A10.49,10.49,0,0,1,83,6.33a2.49,2.49,0,0,1-.44.09l.5.72a1.39,1.39,0,0,1,.24-.35,2.85,2.85,0,0,1,1.1-.74,1.71,1.71,0,0,1,1.14-.11l0,.22a4.81,4.81,0,0,1-.09,1.42c-.17.71-.35,1.44-.41,1.87-.32-.59-.63-1-.7-1a11.42,11.42,0,0,0,.56,1.74c.15.43.27.86.35,1.19s.1.55.11.57.06.24.1.54a9,9,0,0,1,0,1.22,9.48,9.48,0,0,0-.1,1.82,5.29,5.29,0,0,0,.56-1.76,6.33,6.33,0,0,0,.18-1.31,6.26,6.26,0,0,0,0-.64s-.06-.27-.18-.6A9.92,9.92,0,0,0,85.38,10c-.06-.1-.11-.21-.16-.31a13.38,13.38,0,0,0,.94-1.93A4.77,4.77,0,0,0,86.48,6.12Zm-.81,0h0v0l.07,0v0Z"/>
-                <path class="cls-1"
-                      d="M78.1,42.37a5.52,5.52,0,0,1,1.61,0l.79.1.8.06c.46,0,1.07.11,1.67.19a15.35,15.35,0,0,1,1.64.3,3.54,3.54,0,0,0,.75.15s-.23-.22-.67-.4a11,11,0,0,0-1.63-.5c-.61-.15-1.22-.27-1.68-.34s-.79-.11-.81-.12l-.82,0a5.87,5.87,0,0,0-.83,0,5.75,5.75,0,0,0-.92.18,8.88,8.88,0,0,0-1.33.48,2.91,2.91,0,0,0,0-.31c0-.15-.06-.29-.1-.43l.6-.13c.54-.13,1.09-.22,1.51-.28l.72-.09s.29-.06.7-.1A10.13,10.13,0,0,1,81.58,41a16.53,16.53,0,0,0,2.22.11,7.06,7.06,0,0,0-2.19-.57A10.16,10.16,0,0,0,80,40.45c-.44,0-.74,0-.76,0l-.73.15a14,14,0,0,0-1.52.43l-.59.2a6.93,6.93,0,0,0-.26-.7h0a1.1,1.1,0,0,0-.33-.45c-.14-.07-.22,0-.22,0s.07,0,.14.13a1.23,1.23,0,0,1,.17.42c0,.22.11.48.16.77A3.61,3.61,0,0,0,75,42a4,4,0,0,0,1.17-.24c0,.12,0,.25,0,.37a2.18,2.18,0,0,1,0,.51c-.27.14-.43.26-.41.28s.14,0,.37-.06a3.1,3.1,0,0,1-.15.46h0c-.64.18-1.22.49-1.18.58s.45,0,1-.09c-.11.17-.19.26-.19.27a5.31,5.31,0,0,1-.42.55,6.92,6.92,0,0,1-1.1,1,2.7,2.7,0,0,1-1.35.44c-.4,0-.69,0-.7,0s.27.15.7.2a2.83,2.83,0,0,0,1-.07h0a2.41,2.41,0,0,0,.56-.22,7,7,0,0,0,1.28-1,6.18,6.18,0,0,0,.52-.59,4.13,4.13,0,0,0,.38-.71h.44l.38,0,.38,0,.84.17a5.18,5.18,0,0,0,1.26.27c0-.08-.5-.45-1.11-.7a8.07,8.07,0,0,0-.85-.33l-.33-.07-.13,0a4.09,4.09,0,0,0-.7,0,3.7,3.7,0,0,0,.06-.48A13.16,13.16,0,0,1,78.1,42.37Z"/>
-                <path class="cls-1"
-                      d="M75.11,43.39c.12,0,.21-.06.27-.2a.77.77,0,0,0,.05-.38.17.17,0,0,0-.05-.12s-.08,0-.12,0-.22.12-.21.14-.12-.11-.14-.08a.37.37,0,0,0,0,.38A.33.33,0,0,0,75.11,43.39Z"/>
-                <path class="cls-1"
-                      d="M74.62,41.76a.53.53,0,0,0,.21-.35.17.17,0,0,0,0-.12.13.13,0,0,0-.13,0c-.17,0-.25.09-.25.12s-.13-.11-.14-.1l-.06.08a.56.56,0,0,0-.13.24.19.19,0,0,0,.13.24A.48.48,0,0,0,74.62,41.76Z"/>
-                <path class="cls-1"
-                      d="M70.36,60c-.17,0-.32,0-.31.05s.12,0,.27.11l.24.1c.06,0,0,0,0,0s0,0-.06,0l-.11.12a.56.56,0,0,1-.24.17c-.09,0-.15,0-.16-.1s0-.16,0-.17-.07,0-.1.16a.27.27,0,0,0,0,.23.39.39,0,0,0,.26.11,1,1,0,0,0,.57-.29,3.52,3.52,0,0,0,.29-.4,3.56,3.56,0,0,0-.45-.13Z"/>
-                <path class="cls-1"
-                      d="M69.44,45.81a1.8,1.8,0,0,0,.81-.09.68.68,0,0,0,.31.18,1.77,1.77,0,0,0,.91,0,3.42,3.42,0,0,0,.69-.28h0a.47.47,0,0,0,.24.08.76.76,0,0,0,.55-.18c.2-.21.36-.4.42-.45s0,0,0,0h0a0,0,0,0,0,0-.05h-.06s-.09,0-.14,0-.27.2-.39.27a.58.58,0,0,1-.44.13.16.16,0,0,0,0-.14c0-.09-.09-.09-.09-.08a.3.3,0,0,1,0,.09s-.08.09-.18.13a3.33,3.33,0,0,1-.78.22,1.59,1.59,0,0,1-.76,0l-.07,0,.33-.2a1.49,1.49,0,0,0,.27-.23l.13-.12a2,2,0,0,0,.13-.18.45.45,0,0,0,.08-.38.4.4,0,0,0-.29-.21,1.32,1.32,0,0,0-.57,0,.56.56,0,0,0-.38.21.54.54,0,0,0-.08.25s0,.07,0,.08,0,0,.08-.06a.84.84,0,0,1,.12-.19.4.4,0,0,1,.29-.1,1.29,1.29,0,0,1,.41,0s.1,0,.11.1a.2.2,0,0,1-.06.15l-.07.06-.11.1a2.2,2.2,0,0,1-.25.17,1.69,1.69,0,0,1-1.19.29.46.46,0,0,1-.35-.31,1.46,1.46,0,0,1-.1-.57,1.5,1.5,0,0,1,.4-.95,2.5,2.5,0,0,1,.94-.59,3.41,3.41,0,0,1,.58-.19,1.19,1.19,0,0,1,.26-.05h.07l.25.05a1.53,1.53,0,0,0,.29,0l.23-.08.21-.07.11,0h0a3.26,3.26,0,0,1,.88,0,1.13,1.13,0,0,1,.38.12,1.4,1.4,0,0,1,.32.28c.18.22.25.47.11.6l-.18.15a1.07,1.07,0,0,0-.18.19.34.34,0,0,0-.07.11.42.42,0,0,0,0,.1.19.19,0,0,0,0,.08v0a.38.38,0,0,1-.07.21l-.08.08s-.09.06-.09,0,.11-.22,0-.31a.55.55,0,0,0-.38.14c-.07.06-.1.09-.09.1s0,0,.13,0l.14,0,.08,0h0s0,0,0,0c0,.2,0,.17,0,.22a.36.36,0,0,1,0,.11.83.83,0,0,0-.06.21s0,0,0,0h.12a.65.65,0,0,0,.16-.09.57.57,0,0,0,.23-.3c.1-.48.22-.52.54-.74a.69.69,0,0,0,.22-.62,1.19,1.19,0,0,0-.24-.55,1.73,1.73,0,0,0-.41-.4,1.4,1.4,0,0,0-.56-.22,3.59,3.59,0,0,0-1,0,.47.47,0,0,0-.16,0l-.11,0-.2.07-.17,0h-.12l-.12,0a.83.83,0,0,0-.29,0,3,3,0,0,0-.37,0,4.1,4.1,0,0,0-.69.2l-.36.18a2.37,2.37,0,0,0-.79.63,2,2,0,0,0-.49,1.33,1.84,1.84,0,0,0,.19.79A1,1,0,0,0,69.44,45.81Z"/>
-                <path class="cls-1"
-                      d="M69.25,67.14a1,1,0,0,0-.2,0,3.56,3.56,0,0,0-.62.34c-.28.19-.53.42-.5.45s.31-.12.62-.25a3.27,3.27,0,0,1,.41-.17l.19-.06s.07,0,.07,0,0,0,0,0,0,.14,0,.22,0,.18-.07.25-.16.14-.18.17,0,0,.09,0,.16-.05.22-.12a1.74,1.74,0,0,0,.14-.27,2.09,2.09,0,0,0,.13-.37C69.6,67.18,69.39,67.1,69.25,67.14Z"/>
-                <path class="cls-1"
-                      d="M69.93,63.14l-.33,0a1.15,1.15,0,0,0-.31,0,3.87,3.87,0,0,0-1,.41,1.55,1.55,0,0,1-.32.14c-.07,0-.12,0-.12,0s0,0,.13,0a1.25,1.25,0,0,0,.36-.09,5.22,5.22,0,0,1,1-.31h.57l0,0h0l-.09,0a4.78,4.78,0,0,0-.92.64c-.16.12-.31.24-.45.23a.8.8,0,0,1-.38-.23.78.78,0,0,1-.2-.26.12.12,0,0,1,0-.11s-.09,0-.1.12a.63.63,0,0,0,.18.34.9.9,0,0,0,.45.32.84.84,0,0,0,.6-.22,4.68,4.68,0,0,1,.91-.55l.11,0,.18-.06.3-.09a.88.88,0,0,0,.2-.1s.18-.11,0-.29A1.78,1.78,0,0,0,69.93,63.14Z"/>
-                <path class="cls-1"
-                      d="M67.31,42.55a.85.85,0,0,0-.25-.37.41.41,0,0,0-.24-.1h0a.3.3,0,0,0-.22.11.9.9,0,0,0-.18.34s.07,0,.15.07l-.16.15s0,0,0,0l0,0,.29,0,.32,0a.37.37,0,0,0,.23-.05A.2.2,0,0,0,67.31,42.55Z"/>
-                <path class="cls-1"
-                      d="M66.41,45c-.06-.06-.14-.09-.16-.06a2.06,2.06,0,0,0-.29.45A.58.58,0,0,0,66,46a.73.73,0,0,0,1.11-.38.58.58,0,0,0-.25-.49C66.63,45,66.41,45,66.41,45Z"/>
-                <path class="cls-1"
-                      d="M64.58,43.12h0l.06,0a.19.19,0,0,0,.09-.05.08.08,0,0,0,0,0,.29.29,0,0,0-.28-.48h0a.25.25,0,0,0-.18.14.33.33,0,0,0,0,.06v0s0,0,0,0C64.22,43,64.35,43.21,64.58,43.12Z"/>
-                <path class="cls-1"
-                      d="M64.8,63.18h-.32a3.24,3.24,0,0,0-.67,0,.81.81,0,0,0-.52.46c-.07.17-.08.29-.06.3a2.44,2.44,0,0,0,.94-.07,1.7,1.7,0,0,0,.62-.28l.07,0a.11.11,0,0,0,.06,0s0,0,.09-.08a.18.18,0,0,0-.06-.23C64.81,63.17,64.82,63.2,64.8,63.18Zm-.7.49c-.35.12-.73.21-.84.26.07-.09.25-.46.6-.5a3.94,3.94,0,0,1,.6,0A1.13,1.13,0,0,1,64.1,63.67Z"/>
-                <path class="cls-1"
-                      d="M63.86,66.3a2.15,2.15,0,0,0-.52-.13l-.36,0a1,1,0,0,0-.78.31,1.22,1.22,0,0,0-.36,1,2.13,2.13,0,0,1,.52-.88.73.73,0,0,1,.59-.17l.35,0a2.92,2.92,0,0,1,.45.08l0,0v0a.5.5,0,0,1-.07.08c-.1.11-.24.24-.33.32-.34.14-.68.19-.68.22a1.18,1.18,0,0,0,.77,0,3.25,3.25,0,0,0,.42-.31l.09-.1a.5.5,0,0,0,.1-.19C64.1,66.45,64,66.34,63.86,66.3Z"/>
-                <path class="cls-1"
-                      d="M60.42,68.86c-.32-.14-.6,0-.57,0s.07,0,.16,0a.86.86,0,0,1,.28.11s0,.06,0,.06-.05,0-.05,0a1.49,1.49,0,0,1-.46.07.49.49,0,0,1-.19,0c-.06,0,.05,0,.05.07l0,.07s0,0,0,0,0,0,0,0,0,0,0,0l.09,0a1.23,1.23,0,0,0,.41,0l.19,0a.58.58,0,0,0,.25-.12.26.26,0,0,0,.07-.24A.4.4,0,0,0,60.42,68.86Zm-.71.46s0,0,0,0S59.77,69.41,59.71,69.32Z"/>
-                <path class="cls-1"
-                      d="M58,62.47a.81.81,0,0,0-.31-.06,2.63,2.63,0,0,0-.77.06c-.26,0-.52.06-.73.08l-.15,0-.06,0s-.05.07,0,.08.09.06.09.06,0,0,0-.07h.18a3.58,3.58,0,0,0,.74,0,3.3,3.3,0,0,1,.72,0l.18,0h0s0,0,0,0-.35.38-.54.42a.72.72,0,0,1-.34-.05l-.33-.1a1.21,1.21,0,0,0-.33-.06s.1.09.28.18l.32.15a.91.91,0,0,0,.43.11.83.83,0,0,0,.42-.2L58,63a.59.59,0,0,0,.18-.14.24.24,0,0,0,.05-.17.2.2,0,0,0-.07-.15A.37.37,0,0,0,58,62.47Z"/>
-                <path class="cls-1"
-                      d="M68,32.6a9.45,9.45,0,0,1-.92.58c-.18.1-.39.2-.62.3s-.48.18-.76.26l-.06,0-.28.05h0a6.6,6.6,0,0,1-.84.16l-.14,0h-.21l-.5,0-.55,0a3.85,3.85,0,0,1-.48,0A15.57,15.57,0,0,1,60,33.73a25,25,0,0,1-2.47-.64A9.23,9.23,0,0,1,55.11,32l0,0-.84-.59-.41-.32-.28-.22v-.09l0-.24c0-.16.08-.32.13-.48a6.91,6.91,0,0,1,.37-.95,10.46,10.46,0,0,1,2.48-3.28,8.38,8.38,0,0,1,3.31-2.09,4.94,4.94,0,0,1,3.44.5l.66.32a6.68,6.68,0,0,1,.78.47,4.36,4.36,0,0,1,.85,1,1,1,0,0,1,.12.15l.24.45.08.15a21.9,21.9,0,0,1,1.45,3.34A13.61,13.61,0,0,1,68,31.84s0,.75,0,.76a3.9,3.9,0,0,0,.18-2,16.49,16.49,0,0,0-.59-2.52,10.8,10.8,0,0,0-1.14-2.52,5.56,5.56,0,0,0-1.16-1.29,11.65,11.65,0,0,0-1.62-.88,7.72,7.72,0,0,0-1.87-.59,4.76,4.76,0,0,0-2.12.1,6.69,6.69,0,0,0-2,1,12.1,12.1,0,0,0-1.67,1.36,11.5,11.5,0,0,0-2.57,3.55,10,10,0,0,0-.38,1c-.05.18-.09.36-.13.54s0,.18,0,.29,0,.29,0,.43l.33.27.21.16c.14.1.28.22.43.32l.86.58h0a9.39,9.39,0,0,0,2.61,1.13,23,23,0,0,0,2.54.58,12.77,12.77,0,0,0,4.43.18,7.53,7.53,0,0,0,2.83-1A2.43,2.43,0,0,0,68,32.6Z"/>
-                <path class="cls-1"
-                      d="M70,34.8a14.28,14.28,0,0,0,.16-3.36,31.65,31.65,0,0,0-.28-3.67A11.8,11.8,0,0,0,68.67,24a8.88,8.88,0,0,0-2.61-3h0l0,0a9.26,9.26,0,0,0-5.51-2,27.83,27.83,0,0,0-4.85.52,17.35,17.35,0,0,0-3.33,1c-.8.34-1.23.63-1.3.65a16.69,16.69,0,0,0-1.49,1.06,25.2,25.2,0,0,0-3.12,3,24.7,24.7,0,0,0-1.78,2.24l-.42.61-.32.47-.2.29-.1.15c0,.05.06.09.08.14l.47.54.28.33.55.6a47.56,47.56,0,0,0,4.91,4.66,25,25,0,0,0,2.8,2l.74.43.76.38c.51.24,1,.45,1.49.67,2,.84,3.79,1.61,5.42,2.14.36.11.69.21,1,.29a9.31,9.31,0,0,0,1.26.28,7.51,7.51,0,0,0,1.82,0c1-.08,1.55-.41,1.49-.47s-.13.05-.38.1a5.26,5.26,0,0,1-1.13.1A6.89,6.89,0,0,1,63.45,41a15.08,15.08,0,0,1-2.18-.67C59.7,39.76,57.9,38.94,56,38c-.48-.22-1-.45-1.45-.7l-.7-.38c-.23-.14-.47-.28-.69-.43a24.1,24.1,0,0,1-2.66-2,48.11,48.11,0,0,1-4.69-4.67l-.52-.6L45,29l0,0s0,0,0-.05v0l.11-.14c.14-.21.29-.41.43-.61A25.21,25.21,0,0,1,47.32,26a24.3,24.3,0,0,1,3-2.81c.79-.61,1.31-.89,1.36-.94s.44-.27,1.14-.58a16.12,16.12,0,0,1,3.07-1,29,29,0,0,1,4.62-.59A8.32,8.32,0,0,1,65.4,21.8l0,0a7.92,7.92,0,0,1,2.42,2.63A11,11,0,0,1,69,27.9a34.74,34.74,0,0,1,.39,3.57,13.85,13.85,0,0,1,0,3.23,13.51,13.51,0,0,1-1.65,4.65c-.3.52-.57.92-.76,1.2a3,3,0,0,0-.29.42c0,.05.6-.44,1.3-1.47A12.55,12.55,0,0,0,70,34.8Z"/>
-                <path class="cls-1"
-                      d="M90.87,87.6c-.14-.21-.33-.38-.48-.58a5.28,5.28,0,0,0-1.18-.92,4.88,4.88,0,0,0-2.86-.55,9.6,9.6,0,0,0-2.69.7c-.85.33-1.63.75-2.4,1.13s-1.55.77-2.3,1.15c-3,1.57-5.75,3.1-8.4,4.3a32.68,32.68,0,0,1-7.44,2.52,18.8,18.8,0,0,1-6,.23L56,95.41l-1-.25-1.6-.4c-.43-.11-.76-.18-1-.23L52,94.46a1.07,1.07,0,0,0,.32.12l.48.16s0-.06,0-.06,0,0,0,.07l.43.13,1.59.46.9.26a1.69,1.69,0,0,1,.6.93,5.24,5.24,0,0,1-.28,2.94,8.63,8.63,0,0,1-1.71,2.47,12,12,0,0,0-.9,1.1c-.53-.11-1.06-.23-1.57-.37a13.43,13.43,0,0,1-3.16-1.31c-.18-.09-.35-.19-.52-.29l.67-.25a10,10,0,0,0,2.89-1.66,3.85,3.85,0,0,0,1-1.49,4.4,4.4,0,0,0,.25-1.53,3.81,3.81,0,0,0-.22-1.39h-.06a9.38,9.38,0,0,1,0,1.39,3.69,3.69,0,0,1-1.34,2.67,9.58,9.58,0,0,1-2.79,1.45c-.41.15-.76.26-1,.33l-.16,0h0l-.22-.15-.35-.24c-.18-.13-.42-.3-.62-.47-.43-.33-.9-.78-1.34-1.17,0,.53,0,1,0,1.56l-.81-1.7-.39-.84-.56.74-.6.77-.08.1s0,.06,0,0v-.06l-.06-.3L42.08,97c-.06-.31-.13-.61-.2-.92l-.1-.47a3,3,0,0,0-.16-.56c-.08-.17-.27-.8-.48-1.5.22,0,.49.08.78.11a6.32,6.32,0,0,0,1.56,0,5.66,5.66,0,0,0,1.69-.54,3,3,0,0,0,1.24-.86,3.87,3.87,0,0,0,.58-.93c.08-.24.16-.46.23-.66.13-.39.25-.72.32-1,.17.33.29.52.29.54s.21.33.53.77a18.44,18.44,0,0,0,1.22,1.54A7.72,7.72,0,0,0,51,93.86a2.27,2.27,0,0,0,.79.37s0,0,0,0-.28-.23-.66-.57a8.81,8.81,0,0,1-1.26-1.39c-.42-.55-.8-1.14-1.08-1.59l-.46-.78a7.06,7.06,0,0,1-.47-.75,6.25,6.25,0,0,1-.6-1.76,14.28,14.28,0,0,1-.1-2.73h0a5.07,5.07,0,0,0-.37,2.64,1.56,1.56,0,0,0-.15.06c-.21.07-.51.15-.88.24a20.91,20.91,0,0,1-2.75.35,3.89,3.89,0,0,1-2.53-.76,3.19,3.19,0,0,1-.64-.65,6,6,0,0,1,.15-1,29.43,29.43,0,0,1,.88-3c.18-.43.37-.84.57-1.24-.09-.16-.14-.31-.2-.41h0c0,.11.11.25.2.41a3,3,0,0,0,.29.44,3.72,3.72,0,0,0,2.33,1.41,6.18,6.18,0,0,0,2.67-.18,6.1,6.1,0,0,0,.81-.28,3.61,3.61,0,0,0-.38,1.69c.11,0,.35-1,1.22-2.28a29.25,29.25,0,0,1,3.88-4.15c.76-.73,1.48-1.54,2.12-2.29a26.07,26.07,0,0,0,1.67-2.17,13,13,0,0,0,1-1.73,1,1,0,0,1,.07-.15c.15.56.42,1.41.67,2.29.21.72.42,1.45.54,2s.19.91.2.92,0,.11,0,.27.06.4.1.68c.08.56.17,1.32.26,2.07.12,1.12.24,2.22.33,2.71h0l-.28.11s-.55.27-.56.29c-.83.53-1.27.84-2,1.3a2.9,2.9,0,0,0-.78.34,1.43,1.43,0,0,0-.81,0,1.34,1.34,0,0,0-.68.72,2.37,2.37,0,0,0-.18.55,2.14,2.14,0,0,0-.06.31.86.86,0,0,0,0,.16v.23c.18.27.36.56.55.86,0,.06.09.06.14.08l.17,0,.23.06.45.1.93.18c.09,0,.14,0,.3,0h.2l.08,0h0a.14.14,0,0,0,.08,0l.44-.34,2.82-2.14c.19-.56.37-1,.49-1.36l.18-.52a1.47,1.47,0,0,1,0-.17v-.13h0v0h0v0h0a.28.28,0,0,0,0-.11l0,0c.1-.32.25-.76.43-1.28s.38-1.14.59-1.79c.11-.32.23-.66.34-1l.18-.51h0l0,0h0a1.06,1.06,0,0,0,.07-.22V78l0-.28a52.52,52.52,0,0,0,.29-5.39h.06c0,.15,0,.34.06.57,0,.61.14,1.49.24,2.56.05.54.11,1.12.17,1.74l.06.48,0,.24,0,.13c0,.06,0,.17.05.21.08.3.15.6.23.92.31,1.39.66,2.89,1,4.43l2,1,2.58,0a3,3,0,0,0,1.34-.21,1.61,1.61,0,0,0,.55-.48c.13-.18.23-.35.34-.53s.2-.34.29-.52a2.73,2.73,0,0,0,.13-.29.69.69,0,0,0,0-.39A1.79,1.79,0,0,0,71.73,81a1.56,1.56,0,0,0-.52-.34,1.08,1.08,0,0,0-.64,0,6.59,6.59,0,0,0-.92.45,9.28,9.28,0,0,1-1.53.68,6.81,6.81,0,0,1-1.29.11,3.92,3.92,0,0,0-.51.07,3.63,3.63,0,0,1-.2-.57,9.13,9.13,0,0,1-.25-2.8,7,7,0,0,1,.65-2.7,3.7,3.7,0,0,0,.16-.4.8.8,0,0,0,0-.44l0-.12c.25-.25.52-.54.79-.86a11.06,11.06,0,0,0,1-1.36c.25-.38.39-.65.4-.66s.14-.3.32-.72.39-1,.59-1.52a14.79,14.79,0,0,0,.53-1.69c.39-.57.75-1.13,1.07-1.68a15.68,15.68,0,0,0,2-5.15,1,1,0,0,0,.4,0,2.14,2.14,0,0,0,.48-.27,1.17,1.17,0,0,0,.24-.21.55.55,0,0,0,.14-.35,1.59,1.59,0,0,0-.18-.64,2.35,2.35,0,0,0-.29-.49,1.17,1.17,0,0,0-.34-.28c-.11-.06-.18-.07-.18-.08s-.09.07-.1.16v0a.21.21,0,0,0,0,.13.61.61,0,0,1,.36.23,2,2,0,0,1,.47.93c0,.16-.12.29-.27.41a1.92,1.92,0,0,1-.41.3.86.86,0,0,1-.34.09,4.88,4.88,0,0,0,.08-.61,6.06,6.06,0,0,0,.06-1c0-.18,0-.34,0-.48s0-.18,0-.26a2.49,2.49,0,0,0-.09-.6c-.07,0,0,.85-.2,2.3a15.37,15.37,0,0,1-2.22,5.6,28.34,28.34,0,0,1-2.4,3.28,5.89,5.89,0,0,1-3.79,1.9,16.42,16.42,0,0,1-2.35.22,15.88,15.88,0,0,1-2.4-.12,10.2,10.2,0,0,1-4.36-2L54.93,69h0a1.6,1.6,0,0,0,.26-1.3.18.18,0,0,0-.19-.11h-.83l-.21,0,.06.2s0,.12-.22.24l-.13-.13a6.9,6.9,0,0,1-1.1-1.62l-.18-.35q-.15-.32-.27-.63h0s0,0,0,0a6.44,6.44,0,0,1-.24-.61,1,1,0,0,0,.21.11.26.26,0,0,1,.1,0,.23.23,0,0,1,.13.16c0,.13-.14.23-.2.29a0,0,0,0,0,0,0,.24.24,0,0,0,.14,0,.37.37,0,0,0,.27-.31.48.48,0,0,0-.17-.41.36.36,0,0,0-.18-.11,1.48,1.48,0,0,1-.42-.19s0,0-.05,0A21.33,21.33,0,0,1,51,61.33c-.16-.74-.28-1.48-.38-2.2l.12,0c.26-.08.66-.2,1.21-.39a10.51,10.51,0,0,0,2.11-1c.41-.26.83-.56,1.28-.91l.74-.6c.31-.25.48-.46.79-.72a6.55,6.55,0,0,1,.56-.6l0,0a7.67,7.67,0,0,1-1,.07c-.4,0-.82.08-1.16.09l-.82,0A9.68,9.68,0,0,1,53,55a5.38,5.38,0,0,1-1.85-.65,3.29,3.29,0,0,1-.67-.53c0-.29.08-.58.13-.86a15.28,15.28,0,0,1,.42-1.65,4.78,4.78,0,0,0,.81.2,6.94,6.94,0,0,0,2-.08l.62-.09.81-.14.89-.16.48-.09c.12,0,0,0,0-.06s-.14,0-.15,0-.17-.1-.17-.11l-.17-.07a3.84,3.84,0,0,1-.8-.43,2.34,2.34,0,0,1-.38-.28c-.09-.07-.16-.16-.24-.23a4.26,4.26,0,0,1-.43-.57c-.08-.16-.16-.3-.22-.45a10.08,10.08,0,0,1-.55-1.74l-.18-.75c.18-.35.3-.6.37-.74h0c.27.09.49.14.74.2,1.07.27,2.13.53,3.16.82l-.57.44a17.91,17.91,0,0,0-2.42,2,20.84,20.84,0,0,0,2.69-1.65l1-.64c.58.17,1.14.34,1.69.52l.67.22-.09.07a13.14,13.14,0,0,0-1.21,1.12,8.94,8.94,0,0,0-1.49,1.81h0a15.19,15.19,0,0,0,1.8-1.48c.45-.37.91-.73,1.27-1l.45-.3a16.2,16.2,0,0,0,3.42,1,9.28,9.28,0,0,0,2,0v0a1,1,0,0,0,.19.14,3.7,3.7,0,0,0,.44.28,1.73,1.73,0,0,0,.47.15,2.79,2.79,0,0,0,1.18,0,6.28,6.28,0,0,0,.66-.23s.07.17.12.33a.27.27,0,0,1,.08.19h0v0a1.16,1.16,0,0,1-.18.51,1.92,1.92,0,0,1-.18.29A2.32,2.32,0,0,1,68.3,51l-.51.09-.61.1a4.7,4.7,0,0,0-.71.14l-.16,0-.09,0s0,.06,0,.08a1.84,1.84,0,0,0,.15.35,2.13,2.13,0,0,0,.52.6,3.18,3.18,0,0,0,.58.35,3.49,3.49,0,0,0,1.12.31A6.5,6.5,0,0,0,70.32,53c.37-.07.64-.13.85-.19h0l.31.84c.07.18.13.35.19.52l-.08.1a2.71,2.71,0,0,1-1,.68,3.82,3.82,0,0,1-1.73.24l-1.06-.09c-.25,0-.58-.08-.94-.17s-.83-.23-1.29-.36l.11.14,0,0v0l0,0,.35.32a9.75,9.75,0,0,0,.74.64l.43.32.29.18a5.33,5.33,0,0,0,.56.32,5.15,5.15,0,0,0,2.26.61,5.47,5.47,0,0,0,2.27-.2c.29.78.45,1.29.55,1.28s.09-.4,0-1c.08-.35.21-.93.38-1.5s.28-.88.38-1.27a3,3,0,0,0,.08-.71s0-.08,0-.22a1.42,1.42,0,0,0-.24-.51,2.22,2.22,0,0,0-1.29-.7l-.4-.13c-.21-.81-.44-1.57-.62-2.2s-.46-1.5-.56-1.87a1.08,1.08,0,0,1-.06-.18H71a4.87,4.87,0,0,0,1-.18,2.84,2.84,0,0,0,1.33-.85c.29-.32.39-.57.36-.6h0c-.07,0-.24.22-.49.41a3.22,3.22,0,0,1-1.28.58,4.44,4.44,0,0,1-1.4,0l-.2,0a2.7,2.7,0,0,0,.53-.46,2.11,2.11,0,0,0,.41-.59,1.07,1.07,0,0,0,.1-.24c-.06-.06-.26.3-.68.65a3.92,3.92,0,0,1-1.83.81,7.36,7.36,0,0,1-2,.12,4.51,4.51,0,0,1-.92-.2l-.26-.08a2.87,2.87,0,0,1-.58-.27l-.29-.22,0,0s0,0,0,0a.29.29,0,0,0-.41-.42s0,0,0,0l0,.07-.48-.41a12,12,0,0,1,1.08-.68c.37-.18.66-.24.66-.29s-.31-.07-.75,0a9.59,9.59,0,0,0-1.34.61l0,0-1.07-.94.69-.23c1.49-.49,3-.87,3-1s0,0-.11,0a15.13,15.13,0,0,0-2.27.37c-.25,0-.49.1-.74.16l-1,.27c-.47-.39-.81-.64-.86-.58a5.35,5.35,0,0,0,.58.66l-.8.25c-.58.19-1,.36-1,.37a8.64,8.64,0,0,0-1,.5l-.41.28c-1.2-.39-2.46-.76-3.71-1.11-.23-.07-.49-.13-.67-.2s-.43-.18-.65-.28l-1.32-.59L52,43.61c.7-.19,1.36-.35,1.9-.47.78-.17,1.32-.22,1.35-.23s.56-.1,1.36-.19a20.23,20.23,0,0,1,2.88-.07A23,23,0,0,1,62.3,43c.68.12,1.15.24,1.27.24s0,0,0,0a4.16,4.16,0,0,0-1.24-.48l-.62-.16a19.94,19.94,0,0,0-2.27-.37,18.9,18.9,0,0,0-3-.06,12.09,12.09,0,0,0-1.41.14s-.59.08-1.38.29-1.56.44-2.44.75h0l-1.73-.82c-1.65-.8-3.19-1.57-4.49-2.27-.65-.35-1.24-.68-1.75-1s-.9-.59-1.29-.87c-.75-.51-1.19-.82-1.24-.86s-1-.64-2.44-1.54L35.8,34.37l-.12-.07s0,0,0-.07h0l.09,0,.28-.17.76-.44,1.6-.89-3.6-1-1-.27-.32-.07.2-.15.14-.1.42-.28,2-1.39L37,29l0,0L37,29l-.1,0-.18-.07-.38-.15-1.38-.52L34.49,28l-.12,0a.15.15,0,0,1-.09-.06.24.24,0,0,1,0-.36l.15-.16.16-.2c.11-.13.21-.27.3-.4a5.62,5.62,0,0,0,.51-.83,10.1,10.1,0,0,0,.7-1.67,14.9,14.9,0,0,0,.64-2.93,10,10,0,0,0,0-2.16c.91.8,1.49,1.23,1.56,1.16s-1.09-1.61-2.85-3.75a30.91,30.91,0,0,1-2.47-4l-.15-.29,0-.07v0L32.79,12c-.07-.19-.13-.39-.2-.6a12.83,12.83,0,0,1-.29-1.26,11.6,11.6,0,0,1-.18-1.3c0-.22,0-.44,0-.64s0-.21,0-.31a.66.66,0,0,1,0-.14V7.72a.49.49,0,0,1,.08-.18c.05,0,.11,0,.19-.07l.54-.13.66-.13c.89-.16,1.78-.3,2.64-.4s1.71-.18,2.45-.2a13.41,13.41,0,0,1,2.07.24c1.36.24,2.51.52,3.32.72l1,.26.22-.23c.1-.09.18-.19.28-.29s.12-.12.17-.19a7.14,7.14,0,0,1,.56-.54,3.63,3.63,0,0,1,.46-.34A.9.9,0,0,1,47,6.16L47.19,6a20.75,20.75,0,0,1,2.49-1.59c.48-.26,1-.51,1.49-.74l.5-.22.55.1a11.74,11.74,0,0,1,2.58.83,10.61,10.61,0,0,1,1.59.91c.27.19.56.38.86.6l.45.34c.19.14.38.29.58.46l.25.23a2.52,2.52,0,0,1,.74.52c.1.16,0,0,0-.11a2.6,2.6,0,0,1,0-.26,1,1,0,0,1,0-.3c-.37-1.25-.69-2.31-.95-3.18-.14-.42-.25-.8-.37-1.13l1,0c.88,0,1.62.08,2.15.13l.9.08.57,0,.17.15A8.16,8.16,0,0,1,65,7a4.46,4.46,0,0,0,.17.54,39.58,39.58,0,0,1,.28-4.77l.58,0h.76l.45,0a2.92,2.92,0,0,0,.44-.06c.45-.07.88-.17,1.32-.25l.28.29a6.8,6.8,0,0,1,1,1.53c.08.17.17.36.24.55a5.8,5.8,0,0,1,.21.89c0,.3.08.62.12.94,0,.16.05.33.07.49l0,.25,0,.13s0,0,0,0l.15-.49a15.41,15.41,0,0,1,.75-2,8.45,8.45,0,0,1,.67-1.2,3.69,3.69,0,0,1,.72-.78,6.43,6.43,0,0,1,.73-.48,3.27,3.27,0,0,1,.42-.21,16.23,16.23,0,0,1,2.16.54c.85.29,1.61.62,2.26.86s.93.34,1.23.42c.36.4.64.68.84.87s.34.29.38.27,0-.18-.19-.43l-.36-.61s0,0,0,0l.4,0h.49c.5,0,1-.09,1.58-.16a15.37,15.37,0,0,1,1.63-.14,2.89,2.89,0,0,1,1.36.23c.66.32.78,1.28.84,1.91a11.5,11.5,0,0,1,0,1.16s.06.78,0,1.87A25.11,25.11,0,0,1,86.7,13a29.25,29.25,0,0,1-1,3.84,7.62,7.62,0,0,0-.54,1.75s0,0,.09,0c0,.31,0,1.08,0,1.84,0,.5-.06,1-.1,1.38s-.07.63-.07.65,0,.27-.08.64a11.17,11.17,0,0,1-.21,1.19V24c0-.29,0-.63,0-1a7.16,7.16,0,0,0-.42-1.35,4.79,4.79,0,0,0-1-1.34A6.94,6.94,0,0,0,81.87,19,6.82,6.82,0,0,0,78,18.11a4.21,4.21,0,0,0-2,.82,6.4,6.4,0,0,0-1.47,1.42,5.3,5.3,0,0,0-.85,1.74c-.18.57-.31,1.11-.42,1.62a32.86,32.86,0,0,0-.55,3.49c0,.08-.16,1.47-.21,3.51a15.86,15.86,0,0,0,1.33,7.34l.12.23.15.28a.6.6,0,0,0,.68.32,1.42,1.42,0,0,0,.32-.07,2.76,2.76,0,0,0,.3-.15l.42-.29c.54-.39,1-.78,1.53-1.17,1-.77,1.87-1.51,2.62-2.17a15.16,15.16,0,0,0,2.53-2.64,1.54,1.54,0,0,0,.09-.24l.38.46c0,.07.1.12.08.11h0c-.07.06-.19.15-.31.27a5.54,5.54,0,0,0-.83,1.07c-.52.93-1.07,2.09-1.78,3.18a8.35,8.35,0,0,1-1.16,1.48,7.12,7.12,0,0,1-1.32,1,12.63,12.63,0,0,0-1.39.88A4,4,0,0,0,77.78,40l.72-.37a4.41,4.41,0,0,0,.78-.52,9.16,9.16,0,0,0,1.36-1.48c.81-1.09,1.47-2.3,2-3.11a4.89,4.89,0,0,1,.72-.85l.24-.19c.14-.1.25-.15.26-.16l.09-.06s0-.07.1-.39v0c0-.09,0-.2.08-.35h0l2.52-.84-1.65-1-.47-.27-.15-.08a1.94,1.94,0,0,1,.13-.2c.12-.16.25-.32.36-.48l.69-.91c.43-.58.8-1.09,1-1.46l.23-.33-.35.13c-.31.11-1.54.25-2.19.34a2.62,2.62,0,0,0-.4.06c.1,0,1.52,0,2.28-.11-.28.29-.62.65-1,1.06s-.49.56-.76.85l-.41.46-.65.76,1.2.78.15.13-.15,0h0l-.28.08-1.11.31-.51.14c.12-.37.29-.94.47-1.56.29-1,.59-2.12.81-2.93h0c-.16.57-.37,1.26-.6,1.85-.06.17-.13.34-.19.49-.53,1.21-.65,2.28-1,2.71s-.56.71-.56.71c-.44.36-1.09.88-1.86,1.48S78,36,77,36.76c-.5.36-1,.74-1.55,1.09l-.41.26-.14.07-.15,0s-.11,0-.12-.07L74.52,38l-.1-.22a13.5,13.5,0,0,1-1-3.66,14.36,14.36,0,0,1-.13-1.69.54.54,0,0,0,.17.07,3.86,3.86,0,0,0,1.09,0,15.52,15.52,0,0,0,2.54-.42,14,14,0,0,0,3.33-1.35,6,6,0,0,0,.83-.59,2.73,2.73,0,0,0,.38-.38.58.58,0,0,0,.1-.12l.09-.16c0-.09.06-.19.08-.27a7.18,7.18,0,0,0,.15-2.11,4.53,4.53,0,0,0-.64-2,11.8,11.8,0,0,0-1.13-1.66,4.19,4.19,0,0,0-1.46-1.21,4.57,4.57,0,0,0-1.65-.42,4.48,4.48,0,0,0-2.45.42l-.32.2,0-.09a4.39,4.39,0,0,1,.69-1.51,5.45,5.45,0,0,1,1.25-1.29A3.61,3.61,0,0,1,78,18.81a6.21,6.21,0,0,1,3.58.71,6.62,6.62,0,0,1,1.33,1.08,4.69,4.69,0,0,1,1,1.17A10.2,10.2,0,0,1,84.37,23c0,.4.09.74.13,1s.08.54.11.7v0a14.12,14.12,0,0,0-.43,1.68,3.35,3.35,0,0,0,.26-.57c.14-.35.31-.82.46-1.31s.25-1,.31-1.36.1-.64.1-.65,0-.28.06-.67,0-.89,0-1.39a12.72,12.72,0,0,0-.14-1.91l0,0a.79.79,0,0,1,0-.14s0,0,0,.09a8.88,8.88,0,0,0,.88-1.45,21.5,21.5,0,0,0,1.48-3.82,22.89,22.89,0,0,0,.78-4.09,18.2,18.2,0,0,0,.09-2s0-.5-.12-1.26A5.66,5.66,0,0,0,88,4.57a2.48,2.48,0,0,0-1.28-1.4A3.79,3.79,0,0,0,84.85,3a17.19,17.19,0,0,0-1.7.29l-1.54.32-1.29.24c-.26-.2-.61-.45-1.06-.74A23.2,23.2,0,0,0,77.1,1.78,13.9,13.9,0,0,0,75,.91L74.13.66,73.34.45l-.4-.11c-.17,0-.35-.08-.51-.1a10.33,10.33,0,0,0-1.83,0c-.69,0-1.35.11-2,.18-.44,0-.85.1-1.23.13a1.72,1.72,0,0,1-.31,0,2.61,2.61,0,0,1-.28,0L66.14.47l-.42,0L64.89.34C63.71.2,62.8.11,62.39.07l-.23,0-.93,0c-.58,0-1.37,0-2.31,0-.71,0-1.49.09-2.33.19l-.88.11a15.68,15.68,0,0,0-3.64,1l-.46.22-.41.21-.81.46a0,0,0,0,1,0,0h0c-.51.31-1,.62-1.46,1a15.45,15.45,0,0,0-2.4,2.07l-.29.31A.27.27,0,0,0,46,5.37l-1.38-.31c-.86-.17-2.06-.42-3.54-.61a14.83,14.83,0,0,0-2.53-.15c-.89.07-1.76.2-2.67.35s-1.82.34-2.75.58l-.71.19-.37.1-.18.05-.27.1a1.78,1.78,0,0,0-1,.62,2.26,2.26,0,0,0-.37,1.11c0,.1,0,.22,0,.3v.21c0,.13,0,.27,0,.4s0,.52.08.77q.12.75.3,1.47c.13.48.27.94.44,1.4.1.23.18.45.29.67l.08.19a.75.75,0,0,0,.07.12l0,.07.18.29a27.93,27.93,0,0,0,3,4c.73.71,1.38,1.31,1.92,1.79h0a16.86,16.86,0,0,1-.25,2.24,16.17,16.17,0,0,1-.79,2.8,8.25,8.25,0,0,1-1.86,3,.92.92,0,0,0-.12,1.26,1,1,0,0,0,.28.23,2.56,2.56,0,0,0,.31.14l.44.18.26.12.17.07c.05,0,.12,0,.13.07l-.16.09-.15.1-.07,0-.21.13-.85.54-2.59,1.66,3.41,1,.59.17.18,0,0,0,.16.06-.15.07a3.36,3.36,0,0,0-.48.28l-.34.24a1.12,1.12,0,0,0-.27.26c-.09.1-.08.18-.13.28s-.09.19,0,.28a2.36,2.36,0,0,0,.15.25l.22.26c.18.16.43.31.6.44L37.65,37,40,38.59l1.24.82c.35.24.85.58,1.38.88s1.16.65,1.82,1c1.34.68,2.92,1.42,4.61,2.18l.79.35a13,13,0,0,0-1.67.83c-.69.41-1.05.84-1,.88a9.81,9.81,0,0,1,1.13-.66,17.15,17.15,0,0,1,2.08-.81l1.27.55.84.35-.9,1.87c-.32.68-.71,1.44-1.16,2.44-.07.16-.13.32-.2.49a14.45,14.45,0,0,0-1.45.77c-.52.33-1.08.69-1.58,1l-.68.52-.29.23a.74.74,0,0,1-.13.12l-.14.13a.83.83,0,0,0-.25.67,1.42,1.42,0,0,0,0,.25,2.53,2.53,0,0,0,.13.35,4.26,4.26,0,0,0,.45.71c.46.53,1.14.89,1.6,1.4a3.2,3.2,0,0,1,.79,1.74c0,.14.06.26.08.37s0,.08,0,.12l0,0,0,0h0s0,0,0,0h0v0s0,0,0,0l0,0v0h0v0h0s-.06,0-.07,0h0a.94.94,0,0,0-.55-.2,1.41,1.41,0,0,0-.41.07.26.26,0,0,0,0-.21c0-.08,0-.15-.05-.25s0-.46-.2-.63-.24,0-.35,0a1.68,1.68,0,0,0-.36.28l-.33.27a1.48,1.48,0,0,0-.29.36,6.14,6.14,0,0,0-.4.86,4.7,4.7,0,0,0-.18.47,1.07,1.07,0,0,0,0,.64,1.51,1.51,0,0,0,.91.83,5,5,0,0,0,1.13.28A9.11,9.11,0,0,0,48.9,61a2.51,2.51,0,0,0,.65-.08l.19-.07c0,.22.09.45.15.68a21.2,21.2,0,0,0,1.6,4.74c.14.29.29.57.46.85A12.34,12.34,0,0,1,50.62,69s-.21.21-.51.49l-.17.19c-.93,1-1.84,2.08-2.76,3.12h0s0,0,0,0h0c-.6.66-1.27,1.33-1.88,2-.46.46-.89.94-1.33,1.42l-.81,1.19c-.33.57-.65,1.13-1,1.67a.83.83,0,0,0-.08.12c-.11.22-.34.76-.52,1.2l-.1.19a2.77,2.77,0,0,1-.1.26h0v0l0,.05h0a24.24,24.24,0,0,0-1.39,4.43c-.07.32-.12.6-.17.89l-.06.36v.06a6.75,6.75,0,0,0,.25,3.24h0v0a4.91,4.91,0,0,0,.39,1,11.84,11.84,0,0,1-.41-2.9c0-.27,0-.55,0-.83a2.08,2.08,0,0,0,.41.35,4.1,4.1,0,0,0,2.8.74,14.86,14.86,0,0,0,2.79-.51,3.91,3.91,0,0,0,1-.4.28.28,0,0,0,0,.09,6.53,6.53,0,0,0,.51,2l.1.19c-.11.24-.25.57-.43,1-.09.2-.17.42-.27.65a2.74,2.74,0,0,1-.39.64,3.62,3.62,0,0,1-1.36.93,5.12,5.12,0,0,1-3.07.42,8.94,8.94,0,0,1-1-.17c-.25-.82-.49-1.62-.57-1.81.12.47.93,3.59,1,4.08A25.2,25.2,0,0,1,42,99.92c.12.34.23.69.33,1l.15.08c.15,0,.36-.23.54-.46l.58-.73,0-.07c.51,1,1,2.12,1.53,3.2l1.12,2.35-.07-2.6c0-.49,0-1,0-1.48v-.16s0-.11,0-.11l.12.09.45.31c.5.33,1,.64,1.55.93a14.77,14.77,0,0,0,3.39,1.37,66.05,66.05,0,0,0,7.18,1.22l.9.13.18,0h.53l.31,0,1.84-.15c1.22-.11,2.45-.26,3.67-.45s2.44-.42,3.65-.71a18.53,18.53,0,0,0,3.56-1.23l3.05-1.22c.91-.18,2-.36,3-.59.49-.14,1-.25,1.48-.43l.74-.25.71-.31a16.1,16.1,0,0,0,5.06-3.38,12.81,12.81,0,0,0,3.22-5,12,12,0,0,0,.4-1.42,6.21,6.21,0,0,0,.13-.73l0-.36a1.76,1.76,0,0,0,0-.48Zm-19.73-4h0Zm-5.06-1.5h0Zm-1.3-10a9.59,9.59,0,0,0,2.31-.74,5.08,5.08,0,0,0,1.66-1.26c-.17.32-.34.62-.48.87s-.36.64-.37.65-.14.29-.32.69-.45.9-.74,1.38a10.11,10.11,0,0,0-1.16,2c0,.07.15,0,.33-.16a1.48,1.48,0,0,1,0,.27,25.11,25.11,0,0,0-.33,2.81c-.06,1.31-.06,2.23-.08,2.83,0,.32,0,.54,0,.69a.13.13,0,0,1,0,.06v0h0l.32-.06H66c.2,0,.48,0,.84,0a5.61,5.61,0,0,0,1.34,0,9.05,9.05,0,0,0,1.64-.62,7.83,7.83,0,0,1,.86-.38.73.73,0,0,1,.73.28,1.2,1.2,0,0,1,.31.65.85.85,0,0,0-.4-.16,1.51,1.51,0,0,0-.56.08.3.3,0,0,0-.17.09s0,0,0,0,0,0,.08,0a.38.38,0,0,1,.16,0,2.13,2.13,0,0,1,.5,0,.69.69,0,0,1,.42.35.46.46,0,0,1,0,.08l.29-.14h0l-.3.13a.28.28,0,0,0,0-.07l-.08.15c-.09.16-.19.32-.3.49l0,.07h0v0a1,1,0,0,0-.3-.23,0,0,0,0,0,0,0h-.06a1,1,0,0,0-.36-.06h-.19a.11.11,0,0,0-.08,0,.37.37,0,0,0-.17,0s0,0,0,0l0,0s0,0,.07,0a.39.39,0,0,1,.15,0h.1a1.64,1.64,0,0,1,.39.14.59.59,0,0,1,.18.17,1,1,0,0,1,.09.18,0,0,0,0,0,0,0,.28.28,0,0,1,0,.11h0l.27.19a.23.23,0,0,0,0-.1.28.28,0,0,1,0,.11l-.27-.19h0a.89.89,0,0,0,0-.11,0,0,0,0,1,0,0l-.09.11a1,1,0,0,1-.36.3,2.26,2.26,0,0,1-1.07.11l-2.42,0-1.5-.82q-.07-.43-.18-.87h0L64.82,79c0-.17-.07-.33-.11-.5l0-.25-.08-.29c0-.29-.06-.57-.08-.84,0-.62-.1-1.2-.15-1.73-.08-1.07-.14-1.95-.19-2.56,0-.25,0-.46,0-.61Zm5.4-24.77ZM69,48.9a1.31,1.31,0,0,1-1-.09.9.9,0,0,1-.27-.2.34.34,0,0,1,0-.15h0c.25-.08.49-.17.69-.25a8.55,8.55,0,0,0,1.35-.5h0c0,.06.07.12.1.13l.06,0,0,0h0a.76.76,0,0,1,.2.16v.08c0,.1-.13.22-.13.22l-.26.18A1.66,1.66,0,0,1,69,48.9Zm1.16,3.38a3.93,3.93,0,0,1-1.47.4,2.64,2.64,0,0,1-1.53-.43,1.27,1.27,0,0,1-.36-.37.57.57,0,0,1-.12-.23s0,0,.07,0l.12,0,.48,0,1.08-.1a2.94,2.94,0,0,0,1.93-.82l.47,1.26A4.92,4.92,0,0,1,70.15,52.28ZM72.08,57a10.19,10.19,0,0,1-1.62-.09,5.15,5.15,0,0,1-2.09-.67l-.53-.33-.23-.17-.08-.07-.14-.12,0-.05.08,0,.16,0,.18,0a10.67,10.67,0,0,0,1.09.12,4.36,4.36,0,0,0,2-.22,3.23,3.23,0,0,0,1.07-.67l.73,2a.66.66,0,0,0,0,.15A4.82,4.82,0,0,0,72.08,57Zm.32-4.22a1.84,1.84,0,0,1,.95.61,1.06,1.06,0,0,1,.11.44.79.79,0,0,1,0,.14,3.19,3.19,0,0,1,0,.4c0,.31-.19.81-.25,1.28,0,.21-.06.42-.08.62-.15-.86-.4-1.9-.66-2.93l-.16-.6Zm-5.09-4.62-.39.06Zm-2.62-.61a3.65,3.65,0,0,0,1,.49,4,4,0,0,0,1.07.17h.08a9.52,9.52,0,0,1-1.93-.13,15.12,15.12,0,0,1-2.81-.9l1.3-.85A14.16,14.16,0,0,0,64.69,47.56Zm-4.61-1.88s.38-.18.93-.4l1-.37c.3.33.66.7,1,1.08l-1.14.62-.53.3-1.12-.44-1.06-.37C59.68,45.84,60.05,45.69,60.08,45.68Zm14.37-23h0a5.88,5.88,0,0,1,2.18-.61h.51a4.3,4.3,0,0,1,1.53.45A3.85,3.85,0,0,1,80,23.66a6.79,6.79,0,0,1,1.6,3.48,7,7,0,0,1-.18,1.95.65.65,0,0,1-.07.21l0,.06-.07.08a2.46,2.46,0,0,1-.33.31,5.84,5.84,0,0,1-.77.53,11.78,11.78,0,0,1-2.26,1,9.85,9.85,0,0,1-1,.27,15.42,15.42,0,0,1-2.43.38h-.11a3.21,3.21,0,0,1-.81-.06.4.4,0,0,0-.29.05c0-.39,0-.77,0-1.13a3.25,3.25,0,0,1,0-.33h0c.09-1.82.25-3,.26-3.11s.1-1.45.46-3.41c.06-.36.15-.73.24-1.11,0,0,0,0,0-.06ZM70.79,2.15A8.43,8.43,0,0,1,72.26,2a1.48,1.48,0,0,1,.31,0l.41.05a3.64,3.64,0,0,0,.44.07l-.42.4a4.62,4.62,0,0,0-.72,1,13.45,13.45,0,0,0-.62,1.26c-.13.34-.28.75-.43,1.18a2.55,2.55,0,0,0-.08.26s0,.07,0,0V6.22l0-.16,0-.32q0-.3-.06-.57a3,3,0,0,0-.1-.5,5.46,5.46,0,0,0-.21-.61,12.39,12.39,0,0,0-.83-1.76C70.17,2.25,70.48,2.19,70.79,2.15Zm-6.13.63c.1.73.2,1.81.27,3.32a13.48,13.48,0,0,0-1.45-3.37ZM56,2.5c.41,0,.81,0,1.2,0,.19.34.39.77.61,1.28.31.7.73,1.82,1,2.46,0,0,.06.15.12.31s0,.17.09.27.11.28,0,.12-.28-.28-.58-.53l-.16-.13L57.85,6l-.45-.34L56.52,5a13.29,13.29,0,0,0-1.62-1A20.13,20.13,0,0,0,52.84,3,14.93,14.93,0,0,1,56,2.5ZM49.21,54.7c-.11-.18-.22-.34-.31-.51L48.81,54l-.05-.12v0h0l.27-.17.28-.18C49.27,53.92,49.23,54.3,49.21,54.7Zm1,5h0Zm.64-4.61A7.34,7.34,0,0,0,53,55.5a11.87,11.87,0,0,0,1.45,0l.82-.06.63-.07.55-.14.34-.08,0,0-.55.45a17.59,17.59,0,0,1-2.47,1.68,7.11,7.11,0,0,1-2.05.64,9.74,9.74,0,0,1-1.23.12h-.11q-.06-.6-.09-1.17a14.88,14.88,0,0,1,0-2Zm.72-5.31c.41-.88.85-1.72,1.17-2.38a1.42,1.42,0,0,1,.08-.18s0,0,0,0c.22.44.46,1,.85,1.69a4.45,4.45,0,0,0,.81,1,3.11,3.11,0,0,0,.28.23l.21.16a3.66,3.66,0,0,0,.52.28l.09,0,.14,0s.15,0,.05,0l-.29,0L55,50.9l-.51,0-.61,0a4.74,4.74,0,0,1-1.79-.19,3,3,0,0,1-.72-.4C51.45,50.17,51.53,50,51.62,49.77Zm-2,10.37c0,.12-.38.24-.71.24a7.76,7.76,0,0,1-1.08,0,4.52,4.52,0,0,1-1-.2,1.07,1.07,0,0,1-.64-.48.59.59,0,0,1,0-.35,4.29,4.29,0,0,1,.13-.44,8.29,8.29,0,0,1,.32-.82,1.08,1.08,0,0,1,.21-.29l.26-.25.18-.19c.06-.05.15-.13.22-.08s.08.27.15.39.11.27.07.34l-.1.11,0,0a1.08,1.08,0,0,0-.54.38.41.41,0,0,0,0,.34.48.48,0,0,0,.12.2,1,1,0,0,0,.13.14s.11,0,.15-.09.08-.15.05-.17l-.09-.08c0-.07-.1-.14-.07-.21s.2-.17.38-.26a1.52,1.52,0,0,1,.57-.18.85.85,0,0,1,.54.19c.16.12.32.23.43.33s.09.47.13.47a.35.35,0,0,0,.07-.14.2.2,0,0,0,0-.11v-.07a.47.47,0,0,0-.12-.23,1.81,1.81,0,0,0-.24-.24h0a.09.09,0,0,0,0-.06.19.19,0,0,0,0-.09,1.13,1.13,0,0,0,0-.18c0-.12,0-.26,0-.41a4.3,4.3,0,0,0-.1-1,3.19,3.19,0,0,0-.53-1.12c-.51-.68-1.18-1.14-1.43-1.53a2.61,2.61,0,0,1-.27-.52,1.23,1.23,0,0,1-.06-.21s0,0,0-.06l.07-.08L46.9,53l.25-.24.6-.56c.45-.39.94-.8,1.42-1.18.32-.27.64-.52.91-.72a15.8,15.8,0,0,0-.54,1.93h0l-1,.65-.26.18c-.19.13-.42.25-.48.45a.91.91,0,0,0,.06.68c.06.14.08.17.12.25l.11.2c.16.26.34.5.53.76l.29.39.16.19.07.08h0c0,.06,0,.1,0,.16.06.58.12,1.2.18,1.84l.09.83,0,.29.07.58s0,0,0,0,0,.1.05.17h0v0h0v0h0v0h0v0a.08.08,0,0,1,0,.07ZM59.77,72.28a14.62,14.62,0,0,0,2.55.07c.19,0,.38,0,.57,0-.06.31-.12.77-.21,1.34-.15,1.07-.37,2.5-.58,3.94l0,.21s0,.07,0,.1v0h0s0,0,0,0l0,.09-.21.5c-.14.34-.26.66-.39,1l-.69,1.76c-.2.52-.37,1-.48,1.27,0,.08-.06.15-.08.22v0l0,.07s0,0,0,0v0c0,.09,0,.13,0,.14s-.21.68-.51,1.63c-.34.27-.72.6-1.12.93L57,86.86l-.18.16-.09.07,0,0h0a1.48,1.48,0,0,1-.14-.25.6.6,0,0,1-.09-.28.36.36,0,0,1,0-.12.63.63,0,0,1,.18-.38c.13-.18.26-.34.29-.37-.09-.21-.89.56-.79.71a.82.82,0,0,0,.21.57l.11.12L55.59,87l-.45-.07-.19,0a.76.76,0,0,1,0-.15.77.77,0,0,1,.08-.29c0-.08.06-.12.06-.13a2,2,0,0,1,.23-.4c.14-.19.35-.32.33-.36s-.28,0-.49.19a1.33,1.33,0,0,0-.26.28.84.84,0,0,0-.1.15,1.12,1.12,0,0,0-.1.5c-.09-.12-.19-.24-.27-.36v-.21a2.45,2.45,0,0,1,0-.27,3.12,3.12,0,0,1,.1-.48,1.14,1.14,0,0,1,.45-.64,1,1,0,0,1,.7-.18c.08.16,2-.6,2-.62a12.54,12.54,0,0,0,1.75-1.15h0a9.25,9.25,0,0,0,.26-3,26.88,26.88,0,0,0-.13-3.16s-.1-.45-.29-1-.47-1.27-.77-2-.65-1.46-.92-2A9.7,9.7,0,0,0,59.77,72.28ZM54.3,67.85c.18,0,.47,0,.64,0a1.35,1.35,0,0,1-.2.91l0,0c-.23-.2-.46-.4-.67-.61A.79.79,0,0,0,54.3,67.85ZM43.9,77.71c.58-.72,1.15-1.38,1.7-2l0,0h0a3.12,3.12,0,0,0,.88.8,2.41,2.41,0,0,0,1.19.34c.35,0,.59-.17.54-.25s-.2-.11-.43-.24a3.82,3.82,0,0,1-.74-.59,2.66,2.66,0,0,1-.44-.74l-.09-.31a.73.73,0,0,0,0-.08,0,0,0,0,0,0,0h0a.73.73,0,0,1,0,.08l.23-.25c.28-.3.55-.57.82-.83,0,0,0,0,0,0a3.3,3.3,0,0,0,.85.86c.89.61,1.9.71,1.94.55s-.79-.61-1.33-1.25a2.72,2.72,0,0,1-.53-.93l0-.1.72-.68.42-.4a1.7,1.7,0,0,0,.62.75,1.87,1.87,0,0,0,.39.23l.38.17a4.64,4.64,0,0,0,.69.23c.42.1.73.06.74,0s-.22-.2-.54-.43c-.16-.11-.34-.25-.52-.4l-.3-.23a3,3,0,0,1-.25-.24.75.75,0,0,1-.13-.82,1.35,1.35,0,0,1,.16-.3l.07-.16.57-.53,0,0v0l.05.12a1.37,1.37,0,0,0,.29.31,4.06,4.06,0,0,0,.57.35c.43.22.95.29,1,.1s-.19-.47-.4-.81l-.28-.46c-.12-.16-.12-.15-.12-.16s-.08-.07-.15-.42c0,0,0-.08,0-.12a2.77,2.77,0,0,0,.31-.53l.19.21a17.72,17.72,0,0,0,2,1.68c.35.25.71.49,1.08.71,0,.08-.08.18-.13.3a13.28,13.28,0,0,1-.83,1.59c-.4.64-.92,1.38-1.51,2.14s-1.24,1.57-1.94,2.33c-.89,1-1.81,2-2.56,2.9a5.43,5.43,0,0,1-.79.09A7.9,7.9,0,0,1,46,80a3.24,3.24,0,0,1-1.08-.5,2.52,2.52,0,0,1-.68-.76,2.58,2.58,0,0,1-.34-1,.08.08,0,0,1,0,0,.16.16,0,0,0,0-.07h0ZM42.23,80c.41-.63.85-1.22,1.28-1.78,0,0,0,0,0,0a3.6,3.6,0,0,0,.33.72,2.93,2.93,0,0,0,.83.86,3.65,3.65,0,0,0,1.24.51,7.09,7.09,0,0,0,2.39.11A5.51,5.51,0,0,0,49,80.3a9.44,9.44,0,0,0-1,1.5,7.28,7.28,0,0,0-.36.76c-.2,0-.52.13-.91.2a6.19,6.19,0,0,1-2.55,0,3.4,3.4,0,0,1-2.05-1.35,3.09,3.09,0,0,1-.37-.72Q42,80.33,42.23,80Zm20.29,23.94c-.6,0-1.21.1-1.81.13l-.32,0h-.3l-.19,0-.9-.14c-1.61-.25-3.22-.45-4.78-.74,0,0,0,0,0,0,.14-.2.37-.47.64-.8a8.93,8.93,0,0,0,1.69-2.72,5.16,5.16,0,0,0,.08-3.17,1.82,1.82,0,0,0-.56-.8l1,.17a18.79,18.79,0,0,0,6.09-.11c.31,0,.63-.11,1-.19a2.52,2.52,0,0,1,.75.57,4.16,4.16,0,0,1,.9,1.32,3.55,3.55,0,0,1,.13,1.79,6,6,0,0,1-.17.92,6.78,6.78,0,0,1-.33.85c-.25.54-.53,1-.77,1.47s-.44.8-.59,1-.1.21-.14.28ZM90.58,88.7l0,.34c0,.23-.06.46-.12.68A10.14,10.14,0,0,1,90,91.05,12,12,0,0,1,87,95.75a15.53,15.53,0,0,1-4.84,3.18l-.68.28-.7.23c-.46.17-1,.28-1.42.41-1,.21-1.92.36-3,.57l-3.17,1.25h0a18.09,18.09,0,0,1-3.4,1.13c-1.17.28-2.36.5-3.56.68l-1.45.19.49-1c.23-.45.5-1,.74-1.55a5.19,5.19,0,0,0,.46-1.93,3.85,3.85,0,0,0-.25-2,4.18,4.18,0,0,0-1.06-1.36,3,3,0,0,0-.66-.44,35.84,35.84,0,0,0,6.35-2.19c2.68-1.18,5.48-2.68,8.47-4.21.76-.37,1.51-.77,2.29-1.13s1.57-.78,2.37-1.09a8.86,8.86,0,0,1,2.52-.62,4.17,4.17,0,0,1,2.46.48,4.33,4.33,0,0,1,1,.81,5.17,5.17,0,0,1,.42.51l.31.47A1,1,0,0,1,90.58,88.7Z"/>
-                <path class="cls-1"
-                      d="M40.9,11.45c-.23.24-.37.42-.38.43l-.3.48a5.39,5.39,0,0,0-.5,1.1,3.59,3.59,0,0,0-.2,1.17c0,.33,0,.54.09.54s.16-.82.54-1.54a6.13,6.13,0,0,1,.58-.94l.32-.42s.12-.18.31-.42a9.63,9.63,0,0,1,.73-.85c.56-.6,1.21-1.1,1.17-1.18s-.2,0-.45.15h0A2.51,2.51,0,0,0,41.65,9,4.34,4.34,0,0,0,39.05,9c-1.58.35-3.24.51-3.24.73a8.18,8.18,0,0,0,3.37.27,3.38,3.38,0,0,1,1.91.28,1.31,1.31,0,0,1,.4.32c.07.1.09.15.1.16h0v.09A6.38,6.38,0,0,0,40.9,11.45Z"/>
-            </g>
-        </g>
-    </g>
+<!--
+    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
+
+         http://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.
+-->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 326.17 105.33">
+    <defs>
+        <style>
+            .cls-1{fill:#fff;}.cls-2{isolation:isolate;}.cls-3{clip-path:url(#clip-path);}.cls-4{clip-path:url(#clip-path-2);}.cls-5{clip-path:url(#clip-path-3);}.cls-6{clip-path:url(#clip-path-4);}.cls-7{opacity:0.35;mix-blend-mode:screen;}.cls-8{clip-path:url(#clip-path-5);}.cls-9{clip-path:url(#clip-path-6);}.cls-10{clip-path:url(#clip-path-7);}.cls-11{clip-path:url(#clip-path-8);}.cls-12{clip-path:url(#clip-path-9);}.cls-13{clip-path:url(#clip-path-10);}.cls-14{clip-path:url(#clip-path-11);}.cls-15{clip-path:url(#clip-path-12);}.cls-16{clip-path:url(#clip-path-13);}.cls-17{clip-path:url(#clip-path-14);}
+        </style>
+        <clipPath id="clip-path">
+            <path class="cls-1"
+                  d="M275.72,63.08v5.4c0,2.39-.83,3.23-3.19,3.23h-3.88v7.64c0,2.39-.84,3.24-3.2,3.24h-7.83c-2.44,0-3.2-.85-3.2-3.24V71.71H231.36c-2.35,0-3.19-.84-3.19-3.23v-5.1c0-2.54.15-3.47,1.67-5.24l23.13-28c1.53-1.77,2.44-2.31,5-2.31h7.53c2.36,0,3.2.85,3.2,3.24V59.84h3.88C274.89,59.84,275.72,60.69,275.72,63.08ZM254.42,46.8l-10.65,13h10.65Z"/>
+        </clipPath>
+        <clipPath id="clip-path-2">
+            <path class="cls-1"
+                  d="M323.36,82.59h-9.74c-4,0-4.87-.23-6.32-2.85l-7.23-12.65-7,12.65c-1.44,2.39-2.2,2.85-6.31,2.85H277.4c-2.28,0-2.82-1.39-1.6-3.24l15.68-24.68L276.56,30.92c-1.14-1.7-.61-3.09,1.52-3.09h9.13c3.88,0,4.8.31,6.24,2.7l6.85,11.88,6.77-11.88c1.45-2.55,2.44-2.7,5.86-2.7h9.74c2.21,0,2.59,1.39,1.52,3.09L309.13,54.67,325,79.35C326.17,81.05,325.72,82.59,323.36,82.59Z"/>
+        </clipPath>
+        <clipPath id="clip-path-3">
+            <path class="cls-1"
+                  d="M47.8,58a1.32,1.32,0,0,1,.83-.09h0s0,0,0-.08c-.81-.5-1.62-1-2.54-1.59a1.65,1.65,0,0,1-.28.6l2,1.21S47.78,58,47.8,58Z"/>
+        </clipPath>
+        <clipPath id="clip-path-4">
+            <path class="cls-1"
+                  d="M.71,22.52A23.24,23.24,0,0,0,4.2,28l3.72-1a44.55,44.55,0,0,1-3.84-4.84A2.07,2.07,0,0,1,4,22a2.14,2.14,0,0,1,.13.19,40.79,40.79,0,0,0,4,4.62,65.5,65.5,0,0,0,.73-7c-3.61-1.54-5.64-.6-5.64-.6S0,20.26.71,22.52Z"/>
+        </clipPath>
+        <clipPath id="clip-path-5">
+            <path class="cls-1"
+                  d="M15.3,34.21c-.88-.77-1.73-1.53-2.55-2.3s-1.68-1.59-2.47-2.38l-.14-.14Q9,28.21,7.92,27.05L4.2,28l.4.51c.51.65,1.07,1.34,1.67,2s1.39,1.63,2.15,2.47,1.45,1.58,2.23,2.38,1.34,1.38,2,2.08l.08.07,5-1.24C17,35.64,16.12,34.92,15.3,34.21Z"/>
+        </clipPath>
+        <clipPath id="clip-path-6">
+            <path class="cls-1"
+                  d="M38.35,50.5,40.68,52l0,0,.34.22,2.12,1.32A4.78,4.78,0,0,1,45.6,52.3a3.85,3.85,0,0,0-2.81.61c.92-3.28.74-6.34-1.35-8.38a5.09,5.09,0,0,0-.6-.52,3.27,3.27,0,0,1,.42,3.34h0A9.18,9.18,0,0,0,38.62,42c-.33-.33-.7-.66-1.12-1a7.42,7.42,0,0,1,.64,7.34l-.22,1.9Z"/>
+        </clipPath>
+        <clipPath id="clip-path-7">
+            <path class="cls-1"
+                  d="M34.4,48.68c-.94-.64-1.89-1.29-2.84-2L28.8,44.77c-.93-.66-1.85-1.33-2.77-2s-1.87-1.39-2.8-2.1l-2.72-2.12-1-.77L17.9,36.42l-.09-.07-5,1.24a1.21,1.21,0,0,0,.16.16c.74.73,1.51,1.47,2.3,2.2s1.61,1.47,2.44,2.19,1.42,1.22,2.14,1.81l.44.35c.91.74,1.79,1.42,2.65,2s1.91,1.36,2.81,1.94c.59.38,1.16.74,1.71,1.07l1.42.81c1.12.62,2.25,1.19,3.38,1.7l5.07-1.24L35,49.11Z"/>
+        </clipPath>
+        <clipPath id="clip-path-8">
+            <path class="cls-1"
+                  d="M32.38,51.94a35.59,35.59,0,0,0,4.19,1.59l.15,0a9.39,9.39,0,0,0-2.87,2.11,13.22,13.22,0,0,1,6.51-1.21,6,6,0,0,1-1.17,2.8,6.07,6.07,0,0,0,2.09-2.14A7.3,7.3,0,0,0,42.2,59a7.63,7.63,0,0,1,.19-4.26C46,57,45,56.36,48.1,58.16c.1.05.29,0,.4,0,.34.19,1,.77,1.4,1a1.14,1.14,0,0,0-.58-1c-.88-.5-.78-.29-8.25-5.09l-.64-.41-.18-.12c-.78-.5-1.58-1-2.39-1.56l-.56-.37h0l-5.07,1.24Z"/>
+        </clipPath>
+        <clipPath id="clip-path-9">
+            <path class="cls-1"
+                  d="M18.28,36.08a3.51,3.51,0,0,0,.36.29l1.11.9,1.26,1,.66.51,2.06,1.57c.88.66,1.79,1.33,2.74,2s1.84,1.33,2.81,2l2.86,2,2.72,1.83.13.09,2.86,1.89.07,0,.22-1.9s0,.07,0,.11a13.6,13.6,0,0,0-2.34-8A18,18,0,0,0,33,37.29,28.37,28.37,0,0,0,30.1,35c-.94-.66-2-1.33-3.09-2a7,7,0,0,1,.2,1.87c0,.12,0,.24,0,.36l0,.37h0A8.26,8.26,0,0,0,24,30.29,7.68,7.68,0,0,1,24.48,33c0,.15,0,.3,0,.45a.49.49,0,0,0,0,.12h0a8.75,8.75,0,0,0-.61-2.08c-.06-.13-.12-.26-.19-.39s-.21-.37-.33-.56-.15-.22-.24-.34a7.63,7.63,0,0,0-.66-.76l-.23-.22L21.85,29c-.52-.42-1-.77-1.39-1.06l-.58-.38-.2-.13c-.2-.13-.38-.23-.54-.32a3.88,3.88,0,0,0-.58-.27h0a1.49,1.49,0,0,1,.11.28A8.89,8.89,0,0,1,19,29.82l.21-1.74L19,29.82v0a2.45,2.45,0,0,1,0,.27v-.05l-.7,6Z"/>
+        </clipPath>
+        <clipPath id="clip-path-10">
+            <path class="cls-1"
+                  d="M8,26.83c.67.7,1.45,1.47,2.32,2.32l.14.13c.77.73,1.61,1.51,2.53,2.34s1.66,1.47,2.6,2.26S17.3,35.29,18.22,36l.7-6a7.26,7.26,0,0,0-1.76-3.76c-.24-.26-.49-.53-.75-.79-.79-.81-1.68-1.63-2.58-2.39a31.59,31.59,0,0,0-2.54-1.95c-.51-.35-1-.64-1.42-.87s-.75-.37-1.1-.52A65.5,65.5,0,0,1,8,26.83Z"/>
+        </clipPath>
+        <clipPath id="clip-path-11">
+            <path class="cls-1" d="M27.2,35.21l0,.37h0Z"/>
+        </clipPath>
+        <clipPath id="clip-path-12">
+            <path class="cls-1" d="M24.45,33.6a.49.49,0,0,1,0-.12.49.49,0,0,0,0,.12Z"/>
+        </clipPath>
+        <clipPath id="clip-path-13">
+            <polygon class="cls-1" points="24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59"/>
+        </clipPath>
+        <clipPath id="clip-path-14">
+            <path class="cls-1" d="M27.25,35.08c0,.12,0,.24,0,.36h0C27.24,35.32,27.24,35.2,27.25,35.08Z"/>
+        </clipPath>
+    </defs>
+    <title>logo PLC4X white line</title>
+    <g class="cls-2">
+        <g id="Layer_2" data-name="Layer 2">
+            <g id="Layer_1-2" data-name="Layer 1">
+                <path class="cls-1"
+                      d="M135.53,47.11c0,12.19-7.61,19-19.48,19h-9.29V79.35c0,2.39-.83,3.24-3.19,3.24H94.89c-2.36,0-3.19-.85-3.19-3.24V31.07c0-2.39.83-3.24,3.19-3.24H116C127.76,27.83,135.53,34.85,135.53,47.11ZM119.93,47c0-3.39-2.06-5.7-5.63-5.7h-7.54V52.66h7.54A5.25,5.25,0,0,0,119.93,47Z"/>
+                <path class="cls-1"
+                      d="M154.09,31.07v38h18.26c2.44,0,3.27.77,3.27,3.24v7c0,2.39-.83,3.24-3.27,3.24H142.22c-2.36,0-3.2-.85-3.2-3.24V31.07c0-2.39.84-3.24,3.2-3.24h8.67C153.25,27.83,154.09,28.68,154.09,31.07Z"/>
+                <path class="cls-1"
+                      d="M201.38,26.67c11.72,0,19.1,4.86,22.22,13.5.84,2.24.23,3.39-2,4.16l-8.15,2.94c-2.35.69-3.19.3-4.1-2.09-1.3-3.47-3.58-5-7.92-5-5.93,0-8.29,2.62-8.29,8v14c0,5.4,2.36,8,8.29,8,4.26,0,6.7-1.7,8-5,.84-2.4,1.83-2.94,4.11-2.09l8.07,2.93c2.28.78,2.89,1.93,2,4.17-3.12,8.64-10.5,13.5-22.22,13.5-14.91,0-23.36-8.26-23.36-21.6V48.27C178,34.93,186.47,26.67,201.38,26.67Z"/>
+                <path class="cls-1"
+                      d="M275.72,63.08v5.4c0,2.39-.83,3.23-3.19,3.23h-3.88v7.64c0,2.39-.84,3.24-3.2,3.24h-7.83c-2.44,0-3.2-.85-3.2-3.24V71.71H231.36c-2.35,0-3.19-.84-3.19-3.23v-5.1c0-2.54.15-3.47,1.67-5.24l23.13-28c1.53-1.77,2.44-2.31,5-2.31h7.53c2.36,0,3.2.85,3.2,3.24V59.84h3.88C274.89,59.84,275.72,60.69,275.72,63.08ZM254.42,46.8l-10.65,13h10.65Z"/>
+                <g class="cls-3">
+                    <polygon class="cls-1" points="243.77 58.95 254.42 58.99 254.42 59.84 243.77 59.84 243.77 58.95"/>
+                    <polygon class="cls-1" points="243.77 57.66 254.42 57.7 254.42 58.99 243.77 58.95 243.77 57.66"/>
+                    <polygon class="cls-1" points="243.77 56.37 254.42 56.41 254.42 57.7 243.77 57.66 243.77 56.37"/>
+                    <polygon class="cls-1" points="243.77 55.08 254.42 55.11 254.42 56.41 243.77 56.37 243.77 55.08"/>
+                    <polygon class="cls-1" points="243.77 53.78 254.42 53.82 254.42 55.11 243.77 55.08 243.77 53.78"/>
+                    <polygon class="cls-1" points="243.77 52.49 254.42 52.53 254.42 53.82 243.77 53.78 243.77 52.49"/>
+                    <polygon class="cls-1" points="243.77 51.2 254.42 51.24 254.42 52.53 243.77 52.49 243.77 51.2"/>
+                    <polygon class="cls-1" points="243.77 49.91 254.42 49.95 254.42 51.24 243.77 51.2 243.77 49.91"/>
+                    <polygon class="cls-1" points="243.77 49.68 254.42 49.71 254.42 49.95 243.77 49.91 243.77 49.68"/>
+                    <polygon class="cls-1" points="243.77 49.44 254.42 49.48 254.42 49.71 243.77 49.68 243.77 49.44"/>
+                    <polygon class="cls-1" points="243.77 49.21 254.42 49.25 254.42 49.48 243.77 49.44 243.77 49.21"/>
+                    <polygon class="cls-1" points="243.77 48.98 254.42 49.02 254.42 49.25 243.77 49.21 243.77 48.98"/>
+                    <polygon class="cls-1" points="243.77 48.74 254.42 48.78 254.42 49.02 243.77 48.98 243.77 48.74"/>
+                    <polygon class="cls-1" points="243.77 48.51 254.42 48.55 254.42 48.78 243.77 48.74 243.77 48.51"/>
+                    <polygon class="cls-1" points="243.77 48.28 254.42 48.32 254.42 48.55 243.77 48.51 243.77 48.28"/>
+                    <polygon class="cls-1" points="243.77 48.05 254.42 48.08 254.42 48.32 243.77 48.28 243.77 48.05"/>
+                    <polygon class="cls-1" points="243.77 47.81 254.42 47.85 254.42 48.08 243.77 48.05 243.77 47.81"/>
+                    <polygon class="cls-1" points="243.77 47.58 254.42 47.62 254.42 47.85 243.77 47.81 243.77 47.58"/>
+                    <polygon class="cls-1" points="243.77 47.35 254.42 47.38 254.42 47.62 243.77 47.58 243.77 47.35"/>
+                    <polygon class="cls-1" points="243.77 47.11 254.42 47.15 254.42 47.38 243.77 47.35 243.77 47.11"/>
+                    <polygon class="cls-1" points="243.77 46.88 254.42 46.92 254.42 47.15 243.77 47.11 243.77 46.88"/>
+                    <polygon class="cls-1" points="254.42 46.92 243.77 46.88 243.77 46.8 254.42 46.8 254.42 46.92"/>
+                    <polygon class="cls-1" points="228.17 82.47 261.4 82.59 228.17 82.59 228.17 82.47"/>
+                    <polygon class="cls-1"
+                             points="228.17 82.26 275.73 82.42 275.73 82.59 261.4 82.59 228.17 82.47 228.17 82.26"/>
+                    <polygon class="cls-1" points="228.17 82.04 275.73 82.21 275.73 82.42 228.17 82.26 228.17 82.04"/>
+                    <polygon class="cls-1" points="228.17 81.82 275.73 81.99 275.73 82.21 228.17 82.04 228.17 81.82"/>
+                    <polygon class="cls-1" points="228.17 81.61 275.73 81.77 275.73 81.99 228.17 81.82 228.17 81.61"/>
+                    <polygon class="cls-1" points="228.17 81.39 275.73 81.56 275.73 81.77 228.17 81.61 228.17 81.39"/>
+                    <polygon class="cls-1" points="228.17 81.17 275.73 81.34 275.73 81.56 228.17 81.39 228.17 81.17"/>
+                    <polygon class="cls-1" points="228.17 80.96 275.73 81.12 275.73 81.34 228.17 81.17 228.17 80.96"/>
+                    <polygon class="cls-1" points="228.17 80.74 275.73 80.91 275.73 81.12 228.17 80.96 228.17 80.74"/>
+                    <polygon class="cls-1" points="228.17 80.53 275.73 80.69 275.73 80.91 228.17 80.74 228.17 80.53"/>
+                    <polygon class="cls-1" points="228.17 80.31 275.73 80.48 275.73 80.69 228.17 80.53 228.17 80.31"/>
+                    <polygon class="cls-1" points="228.17 80.09 275.73 80.26 275.73 80.48 228.17 80.31 228.17 80.09"/>
+                    <polygon class="cls-1" points="228.17 79.88 275.73 80.04 275.73 80.26 228.17 80.09 228.17 79.88"/>
+                    <polygon class="cls-1" points="228.17 79.66 275.73 79.83 275.73 80.04 228.17 79.88 228.17 79.66"/>
+                    <polygon class="cls-1" points="228.17 79.44 275.73 79.61 275.73 79.83 228.17 79.66 228.17 79.44"/>
+                    <polygon class="cls-1" points="228.17 79.23 275.73 79.39 275.73 79.61 228.17 79.44 228.17 79.23"/>
+                    <polygon class="cls-1" points="228.17 79.01 275.73 79.18 275.73 79.39 228.17 79.23 228.17 79.01"/>
+                    <polygon class="cls-1" points="228.17 78.8 275.73 78.96 275.73 79.18 228.17 79.01 228.17 78.8"/>
+                    <polygon class="cls-1" points="228.17 78.58 275.73 78.75 275.73 78.96 228.17 78.8 228.17 78.58"/>
+                    <polygon class="cls-1" points="228.17 78.36 275.73 78.53 275.73 78.75 228.17 78.58 228.17 78.36"/>
+                    <polygon class="cls-1" points="228.17 78.15 275.73 78.31 275.73 78.53 228.17 78.36 228.17 78.15"/>
+                    <polygon class="cls-1" points="228.17 77.93 275.73 78.1 275.73 78.31 228.17 78.15 228.17 77.93"/>
+                    <polygon class="cls-1" points="228.17 77.71 275.73 77.88 275.73 78.1 228.17 77.93 228.17 77.71"/>
+                    <polygon class="cls-1" points="228.17 77.5 275.73 77.66 275.73 77.88 228.17 77.71 228.17 77.5"/>
+                    <polygon class="cls-1" points="228.17 77.28 275.73 77.45 275.73 77.66 228.17 77.5 228.17 77.28"/>
+                    <polygon class="cls-1" points="228.17 77.06 275.73 77.23 275.73 77.45 228.17 77.28 228.17 77.06"/>
+                    <polygon class="cls-1" points="228.17 76.85 275.73 77.01 275.73 77.23 228.17 77.06 228.17 76.85"/>
+                    <polygon class="cls-1" points="228.17 76.63 275.73 76.8 275.73 77.01 228.17 76.85 228.17 76.63"/>
+                    <polygon class="cls-1" points="228.17 76.42 275.73 76.58 275.73 76.8 228.17 76.63 228.17 76.42"/>
+                    <polygon class="cls-1" points="228.17 76.2 275.73 76.36 275.73 76.58 228.17 76.42 228.17 76.2"/>
+                    <polygon class="cls-1" points="228.17 75.98 275.73 76.15 275.73 76.36 228.17 76.2 228.17 75.98"/>
+                    <polygon class="cls-1" points="228.17 75.77 275.73 75.93 275.73 76.15 228.17 75.98 228.17 75.77"/>
+                    <polygon class="cls-1" points="228.17 75.55 275.73 75.72 275.73 75.93 228.17 75.77 228.17 75.55"/>
+                    <polygon class="cls-1" points="228.17 75.33 275.73 75.5 275.73 75.72 228.17 75.55 228.17 75.33"/>
+                    <polygon class="cls-1" points="228.17 75.12 275.73 75.28 275.73 75.5 228.17 75.33 228.17 75.12"/>
+                    <polygon class="cls-1" points="228.17 74.9 275.73 75.07 275.73 75.28 228.17 75.12 228.17 74.9"/>
+                    <polygon class="cls-1" points="228.17 74.69 275.73 74.85 275.73 75.07 228.17 74.9 228.17 74.69"/>
+                    <polygon class="cls-1" points="228.17 74.47 275.73 74.63 275.73 74.85 228.17 74.69 228.17 74.47"/>
+                    <polygon class="cls-1" points="228.17 74.25 275.73 74.42 275.73 74.63 228.17 74.47 228.17 74.25"/>
+                    <polygon class="cls-1" points="228.17 74.03 275.73 74.2 275.73 74.42 228.17 74.25 228.17 74.03"/>
+                    <polygon class="cls-1" points="228.17 73.82 275.73 73.98 275.73 74.2 228.17 74.03 228.17 73.82"/>
+                    <polygon class="cls-1" points="228.17 73.6 275.73 73.77 275.73 73.98 228.17 73.82 228.17 73.6"/>
+                    <polygon class="cls-1" points="228.17 73.39 275.73 73.55 275.73 73.77 228.17 73.6 228.17 73.39"/>
+                    <polygon class="cls-1" points="228.17 73.17 275.73 73.34 275.73 73.55 228.17 73.39 228.17 73.17"/>
+                    <polygon class="cls-1" points="228.17 72.95 275.73 73.12 275.73 73.34 228.17 73.17 228.17 72.95"/>
+                    <polygon class="cls-1" points="228.17 72.74 275.73 72.9 275.73 73.12 228.17 72.95 228.17 72.74"/>
+                    <polygon class="cls-1" points="228.17 72.52 275.73 72.69 275.73 72.9 228.17 72.74 228.17 72.52"/>
+                    <polygon class="cls-1" points="228.17 72.31 275.73 72.47 275.73 72.69 228.17 72.52 228.17 72.31"/>
+                    <polygon class="cls-1" points="228.17 72.09 275.73 72.25 275.73 72.47 228.17 72.31 228.17 72.09"/>
+                    <polygon class="cls-1" points="228.17 71.87 275.73 72.04 275.73 72.25 228.17 72.09 228.17 71.87"/>
+                    <polygon class="cls-1" points="228.17 71.66 275.73 71.82 275.73 72.04 228.17 71.87 228.17 71.66"/>
+                    <polygon class="cls-1" points="228.17 71.44 275.73 71.61 275.73 71.82 228.17 71.66 228.17 71.44"/>
+                    <polygon class="cls-1" points="228.17 71.22 275.73 71.39 275.73 71.61 228.17 71.44 228.17 71.22"/>
+                    <polygon class="cls-1" points="228.17 71.01 275.73 71.17 275.73 71.39 228.17 71.22 228.17 71.01"/>
+                    <polygon class="cls-1" points="228.17 70.79 275.73 70.96 275.73 71.17 228.17 71.01 228.17 70.79"/>
+                    <polygon class="cls-1" points="228.17 70.57 275.73 70.74 275.73 70.96 228.17 70.79 228.17 70.57"/>
+                    <polygon class="cls-1" points="228.17 70.36 275.73 70.52 275.73 70.74 228.17 70.57 228.17 70.36"/>
+                    <polygon class="cls-1" points="228.17 70.14 275.73 70.31 275.73 70.52 228.17 70.36 228.17 70.14"/>
+                    <polygon class="cls-1" points="228.17 69.92 275.73 70.09 275.73 70.31 228.17 70.14 228.17 69.92"/>
+                    <polygon class="cls-1" points="228.17 69.71 275.73 69.88 275.73 70.09 228.17 69.92 228.17 69.71"/>
+                    <polygon class="cls-1" points="228.17 69.49 275.73 69.66 275.73 69.88 228.17 69.71 228.17 69.49"/>
+                    <polygon class="cls-1" points="228.17 69.28 275.73 69.44 275.73 69.66 228.17 69.49 228.17 69.28"/>
+                    <polygon class="cls-1" points="228.17 69.06 275.73 69.23 275.73 69.44 228.17 69.28 228.17 69.06"/>
+                    <polygon class="cls-1" points="228.17 68.84 275.73 69.01 275.73 69.23 228.17 69.06 228.17 68.84"/>
+                    <polygon class="cls-1" points="228.17 68.63 275.73 68.79 275.73 69.01 228.17 68.84 228.17 68.63"/>
+                    <polygon class="cls-1" points="228.17 68.41 275.73 68.58 275.73 68.79 228.17 68.63 228.17 68.41"/>
+                    <polygon class="cls-1" points="228.17 68.19 275.73 68.36 275.73 68.58 228.17 68.41 228.17 68.19"/>
+                    <polygon class="cls-1" points="228.17 67.98 275.73 68.14 275.73 68.36 228.17 68.19 228.17 67.98"/>
+                    <polygon class="cls-1" points="228.17 67.76 275.73 67.93 275.73 68.14 228.17 67.98 228.17 67.76"/>
+                    <polygon class="cls-1" points="228.17 67.55 275.73 67.71 275.73 67.93 228.17 67.76 228.17 67.55"/>
+                    <polygon class="cls-1" points="228.17 67.33 275.73 67.5 275.73 67.71 228.17 67.55 228.17 67.33"/>
+                    <polygon class="cls-1" points="228.17 67.11 275.73 67.28 275.73 67.5 228.17 67.33 228.17 67.11"/>
+                    <polygon class="cls-1" points="228.17 66.9 275.73 67.06 275.73 67.28 228.17 67.11 228.17 66.9"/>
+                    <polygon class="cls-1" points="228.17 66.68 275.73 66.85 275.73 67.06 228.17 66.9 228.17 66.68"/>
+                    <polygon class="cls-1" points="228.17 66.46 275.73 66.63 275.73 66.85 228.17 66.68 228.17 66.46"/>
+                    <polygon class="cls-1" points="228.17 66.25 275.73 66.41 275.73 66.63 228.17 66.46 228.17 66.25"/>
+                    <polygon class="cls-1" points="228.17 66.03 275.73 66.2 275.73 66.41 228.17 66.25 228.17 66.03"/>
+                    <polygon class="cls-1" points="228.17 65.81 275.73 65.98 275.73 66.2 228.17 66.03 228.17 65.81"/>
+                    <polygon class="cls-1" points="228.17 65.6 275.73 65.77 275.73 65.98 228.17 65.81 228.17 65.6"/>
+                    <polygon class="cls-1" points="228.17 65.38 275.73 65.55 275.73 65.77 228.17 65.6 228.17 65.38"/>
+                    <polygon class="cls-1" points="228.17 65.17 275.73 65.33 275.73 65.55 228.17 65.38 228.17 65.17"/>
+                    <polygon class="cls-1" points="228.17 64.95 275.73 65.12 275.73 65.33 228.17 65.17 228.17 64.95"/>
+                    <polygon class="cls-1" points="228.17 64.73 275.73 64.9 275.73 65.12 228.17 64.95 228.17 64.73"/>
+                    <polygon class="cls-1" points="228.17 64.52 275.73 64.68 275.73 64.9 228.17 64.73 228.17 64.52"/>
+                    <polygon class="cls-1" points="228.17 64.3 275.73 64.47 275.73 64.68 228.17 64.52 228.17 64.3"/>
+                    <polygon class="cls-1" points="228.17 64.08 275.73 64.25 275.73 64.47 228.17 64.3 228.17 64.08"/>
+                    <polygon class="cls-1" points="228.17 63.87 275.73 64.03 275.73 64.25 228.17 64.08 228.17 63.87"/>
+                    <polygon class="cls-1" points="228.17 63.65 275.73 63.82 275.73 64.03 228.17 63.87 228.17 63.65"/>
+                    <polygon class="cls-1" points="228.17 63.44 275.73 63.6 275.73 63.82 228.17 63.65 228.17 63.44"/>
+                    <polygon class="cls-1" points="228.17 63.22 275.73 63.38 275.73 63.6 228.17 63.44 228.17 63.22"/>
+                    <polygon class="cls-1" points="228.17 63 275.73 63.17 275.73 63.38 228.17 63.22 228.17 63"/>
+                    <polygon class="cls-1" points="228.17 62.79 275.73 62.95 275.73 63.17 228.17 63 228.17 62.79"/>
+                    <polygon class="cls-1" points="228.17 62.57 275.73 62.74 275.73 62.95 228.17 62.79 228.17 62.57"/>
+                    <polygon class="cls-1" points="228.17 62.35 275.73 62.52 275.73 62.74 228.17 62.57 228.17 62.35"/>
+                    <polygon class="cls-1" points="228.17 62.14 275.73 62.3 275.73 62.52 228.17 62.35 228.17 62.14"/>
+                    <polygon class="cls-1" points="228.17 61.92 275.73 62.09 275.73 62.3 228.17 62.14 228.17 61.92"/>
+                    <polygon class="cls-1" points="228.17 61.7 275.73 61.87 275.73 62.09 228.17 61.92 228.17 61.7"/>
+                    <polygon class="cls-1" points="228.17 61.49 275.73 61.65 275.73 61.87 228.17 61.7 228.17 61.49"/>
+                    <polygon class="cls-1" points="228.17 61.27 275.73 61.44 275.73 61.65 228.17 61.49 228.17 61.27"/>
+                    <polygon class="cls-1" points="228.17 61.05 275.73 61.22 275.73 61.44 228.17 61.27 228.17 61.05"/>
+                    <polygon class="cls-1" points="228.17 60.84 275.73 61.01 275.73 61.22 228.17 61.05 228.17 60.84"/>
+                    <polygon class="cls-1" points="228.17 60.62 275.73 60.79 275.73 61.01 228.17 60.84 228.17 60.62"/>
+                    <polygon class="cls-1" points="228.17 60.41 275.73 60.57 275.73 60.79 228.17 60.62 228.17 60.41"/>
+                    <polygon class="cls-1" points="228.17 60.19 275.73 60.36 275.73 60.57 228.17 60.41 228.17 60.19"/>
+                    <polygon class="cls-1" points="228.17 58.9 275.73 59.06 275.73 60.36 228.17 60.19 228.17 58.9"/>
+                    <polygon class="cls-1" points="228.17 57.61 275.73 57.77 275.73 59.06 228.17 58.9 228.17 57.61"/>
+                    <polygon class="cls-1" points="228.17 56.31 275.73 56.48 275.73 57.77 228.17 57.61 228.17 56.31"/>
+                    <polygon class="cls-1" points="228.17 55.02 275.73 55.19 275.73 56.48 228.17 56.31 228.17 55.02"/>
+                    <polygon class="cls-1" points="228.17 53.73 275.73 53.9 275.73 55.19 228.17 55.02 228.17 53.73"/>
+                    <polygon class="cls-1" points="228.17 52.44 275.73 52.6 275.73 53.9 228.17 53.73 228.17 52.44"/>
+                    <polygon class="cls-1" points="228.17 51.15 275.73 51.31 275.73 52.6 228.17 52.44 228.17 51.15"/>
+                    <polygon class="cls-1" points="228.17 49.85 275.73 50.02 275.73 51.31 228.17 51.15 228.17 49.85"/>
+                    <polygon class="cls-1" points="228.17 49.62 275.73 49.79 275.73 50.02 228.17 49.85 228.17 49.62"/>
+                    <polygon class="cls-1" points="228.17 49.39 275.73 49.55 275.73 49.79 228.17 49.62 228.17 49.39"/>
+                    <polygon class="cls-1" points="228.17 49.16 275.73 49.32 275.73 49.55 228.17 49.39 228.17 49.16"/>
+                    <polygon class="cls-1" points="228.17 48.92 275.73 49.09 275.73 49.32 228.17 49.16 228.17 48.92"/>
+                    <polygon class="cls-1" points="228.17 48.69 275.73 48.86 275.73 49.09 228.17 48.92 228.17 48.69"/>
+                    <polygon class="cls-1" points="228.17 48.46 275.73 48.62 275.73 48.86 228.17 48.69 228.17 48.46"/>
+                    <polygon class="cls-1" points="228.17 48.22 275.73 48.39 275.73 48.62 228.17 48.46 228.17 48.22"/>
+                    <polygon class="cls-1" points="228.17 47.99 275.73 48.16 275.73 48.39 228.17 48.22 228.17 47.99"/>
+                    <polygon class="cls-1" points="228.17 47.76 275.73 47.92 275.73 48.16 228.17 47.99 228.17 47.76"/>
+                    <polygon class="cls-1" points="228.17 47.52 275.73 47.69 275.73 47.92 228.17 47.76 228.17 47.52"/>
+                    <polygon class="cls-1" points="228.17 47.29 275.73 47.46 275.73 47.69 228.17 47.52 228.17 47.29"/>
+                    <polygon class="cls-1" points="228.17 47.06 275.73 47.23 275.73 47.46 228.17 47.29 228.17 47.06"/>
+                    <polygon class="cls-1" points="228.17 46.83 275.73 46.99 275.73 47.23 228.17 47.06 228.17 46.83"/>
+                    <polygon class="cls-1" points="228.17 46.59 275.73 46.76 275.73 46.99 228.17 46.83 228.17 46.59"/>
+                    <polygon class="cls-1" points="228.17 46.36 275.73 46.53 275.73 46.76 228.17 46.59 228.17 46.36"/>
+                    <polygon class="cls-1" points="228.17 46.13 275.73 46.29 275.73 46.53 228.17 46.36 228.17 46.13"/>
+                    <polygon class="cls-1" points="228.17 45.89 275.73 46.06 275.73 46.29 228.17 46.13 228.17 45.89"/>
+                    <polygon class="cls-1" points="228.17 45.66 275.73 45.83 275.73 46.06 228.17 45.89 228.17 45.66"/>
+                    <polygon class="cls-1" points="228.17 45.43 275.73 45.59 275.73 45.83 228.17 45.66 228.17 45.43"/>
+                    <polygon class="cls-1" points="228.17 45.2 275.73 45.36 275.73 45.59 228.17 45.43 228.17 45.2"/>
+                    <polygon class="cls-1" points="228.17 44.96 275.73 45.13 275.73 45.36 228.17 45.2 228.17 44.96"/>
+                    <polygon class="cls-1" points="228.17 44.73 275.73 44.9 275.73 45.13 228.17 44.96 228.17 44.73"/>
+                    <polygon class="cls-1" points="228.17 44.5 275.73 44.66 275.73 44.9 228.17 44.73 228.17 44.5"/>
+                    <polygon class="cls-1" points="228.17 44.26 275.73 44.43 275.73 44.66 228.17 44.5 228.17 44.26"/>
+                    <polygon class="cls-1" points="228.17 44.03 275.73 44.2 275.73 44.43 228.17 44.26 228.17 44.03"/>
+                    <polygon class="cls-1" points="228.17 43.8 275.73 43.96 275.73 44.2 228.17 44.03 228.17 43.8"/>
+                    <polygon class="cls-1" points="228.17 43.56 275.73 43.73 275.73 43.96 228.17 43.8 228.17 43.56"/>
+                    <polygon class="cls-1" points="228.17 43.33 275.73 43.5 275.73 43.73 228.17 43.56 228.17 43.33"/>
+                    <polygon class="cls-1" points="228.17 43.1 275.73 43.27 275.73 43.5 228.17 43.33 228.17 43.1"/>
+                    <polygon class="cls-1" points="228.17 42.87 275.73 43.03 275.73 43.27 228.17 43.1 228.17 42.87"/>
+                    <polygon class="cls-1" points="228.17 42.63 275.73 42.8 275.73 43.03 228.17 42.87 228.17 42.63"/>
+                    <polygon class="cls-1" points="228.17 42.4 275.73 42.57 275.73 42.8 228.17 42.63 228.17 42.4"/>
+                    <polygon class="cls-1" points="228.17 42.17 275.73 42.33 275.73 42.57 228.17 42.4 228.17 42.17"/>
+                    <polygon class="cls-1" points="228.17 41.93 275.73 42.1 275.73 42.33 228.17 42.17 228.17 41.93"/>
+                    <polygon class="cls-1" points="228.17 41.7 275.73 41.87 275.73 42.1 228.17 41.93 228.17 41.7"/>
+                    <polygon class="cls-1" points="228.17 41.47 275.73 41.63 275.73 41.87 228.17 41.7 228.17 41.47"/>
+                    <polygon class="cls-1" points="228.17 41.23 275.73 41.4 275.73 41.63 228.17 41.47 228.17 41.23"/>
+                    <polygon class="cls-1" points="228.17 41 275.73 41.17 275.73 41.4 228.17 41.23 228.17 41"/>
+                    <polygon class="cls-1" points="228.17 40.77 275.73 40.94 275.73 41.17 228.17 41 228.17 40.77"/>
+                    <polygon class="cls-1" points="228.17 40.54 275.73 40.7 275.73 40.94 228.17 40.77 228.17 40.54"/>
+                    <polygon class="cls-1" points="228.17 40.3 275.73 40.47 275.73 40.7 228.17 40.54 228.17 40.3"/>
+                    <polygon class="cls-1" points="228.17 40.07 275.73 40.24 275.73 40.47 228.17 40.3 228.17 40.07"/>
+                    <polygon class="cls-1" points="228.17 39.84 275.73 40 275.73 40.24 228.17 40.07 228.17 39.84"/>
+                    <polygon class="cls-1" points="228.17 39.6 275.73 39.77 275.73 40 228.17 39.84 228.17 39.6"/>
+                    <polygon class="cls-1" points="228.17 39.37 275.73 39.54 275.73 39.77 228.17 39.6 228.17 39.37"/>
+                    <polygon class="cls-1" points="228.17 39.14 275.73 39.3 275.73 39.54 228.17 39.37 228.17 39.14"/>
+                    <polygon class="cls-1" points="228.17 38.91 275.73 39.07 275.73 39.3 228.17 39.14 228.17 38.91"/>
+                    <polygon class="cls-1" points="228.17 38.67 275.73 38.84 275.73 39.07 228.17 38.91 228.17 38.67"/>
+                    <polygon class="cls-1" points="228.17 38.44 275.73 38.61 275.73 38.84 228.17 38.67 228.17 38.44"/>
+                    <polygon class="cls-1" points="228.17 38.21 275.73 38.37 275.73 38.61 228.17 38.44 228.17 38.21"/>
+                    <polygon class="cls-1" points="228.17 37.97 275.73 38.14 275.73 38.37 228.17 38.21 228.17 37.97"/>
+                    <polygon class="cls-1" points="228.17 37.74 275.73 37.91 275.73 38.14 228.17 37.97 228.17 37.74"/>
+                    <polygon class="cls-1" points="228.17 37.51 275.73 37.67 275.73 37.91 228.17 37.74 228.17 37.51"/>
+                    <polygon class="cls-1" points="228.17 37.27 275.73 37.44 275.73 37.67 228.17 37.51 228.17 37.27"/>
+                    <polygon class="cls-1" points="228.17 37.04 275.73 37.21 275.73 37.44 228.17 37.27 228.17 37.04"/>
+                    <polygon class="cls-1" points="228.17 36.81 275.73 36.98 275.73 37.21 228.17 37.04 228.17 36.81"/>
+                    <polygon class="cls-1" points="228.17 36.58 275.73 36.74 275.73 36.98 228.17 36.81 228.17 36.58"/>
+                    <polygon class="cls-1" points="228.17 36.34 275.73 36.51 275.73 36.74 228.17 36.58 228.17 36.34"/>
+                    <polygon class="cls-1" points="228.17 36.11 275.73 36.28 275.73 36.51 228.17 36.34 228.17 36.11"/>
+                    <polygon class="cls-1" points="228.17 35.88 275.73 36.04 275.73 36.28 228.17 36.11 228.17 35.88"/>
+                    <polygon class="cls-1" points="228.17 35.65 275.73 35.81 275.73 36.04 228.17 35.88 228.17 35.65"/>
+                    <polygon class="cls-1" points="228.17 35.41 275.73 35.58 275.73 35.81 228.17 35.65 228.17 35.41"/>
+                    <polygon class="cls-1" points="228.17 35.18 275.73 35.34 275.73 35.58 228.17 35.41 228.17 35.18"/>
+                    <polygon class="cls-1" points="228.17 34.95 275.73 35.11 275.73 35.34 228.17 35.18 228.17 34.95"/>
+                    <polygon class="cls-1" points="228.17 34.71 275.73 34.88 275.73 35.11 228.17 34.95 228.17 34.71"/>
+                    <polygon class="cls-1" points="228.17 34.48 275.73 34.65 275.73 34.88 228.17 34.71 228.17 34.48"/>
+                    <polygon class="cls-1" points="228.17 34.25 275.73 34.41 275.73 34.65 228.17 34.48 228.17 34.25"/>
+                    <polygon class="cls-1" points="228.17 34.01 275.73 34.18 275.73 34.41 228.17 34.25 228.17 34.01"/>
+                    <polygon class="cls-1" points="228.17 33.78 275.73 33.95 275.73 34.18 228.17 34.01 228.17 33.78"/>
+                    <polygon class="cls-1" points="228.17 33.55 275.73 33.71 275.73 33.95 228.17 33.78 228.17 33.55"/>
+                    <polygon class="cls-1" points="228.17 33.31 275.73 33.48 275.73 33.71 228.17 33.55 228.17 33.31"/>
+                    <polygon class="cls-1" points="228.17 33.08 275.73 33.25 275.73 33.48 228.17 33.31 228.17 33.08"/>
+                    <polygon class="cls-1" points="228.17 32.85 275.73 33.02 275.73 33.25 228.17 33.08 228.17 32.85"/>
+                    <polygon class="cls-1" points="228.17 32.62 275.73 32.78 275.73 33.02 228.17 32.85 228.17 32.62"/>
+                    <polygon class="cls-1" points="228.17 32.38 275.73 32.55 275.73 32.78 228.17 32.62 228.17 32.38"/>
+                    <polygon class="cls-1" points="228.17 32.15 275.73 32.32 275.73 32.55 228.17 32.38 228.17 32.15"/>
+                    <polygon class="cls-1" points="228.17 31.92 275.73 32.08 275.73 32.32 228.17 32.15 228.17 31.92"/>
+                    <polygon class="cls-1" points="228.17 31.68 275.73 31.85 275.73 32.08 228.17 31.92 228.17 31.68"/>
+                    <polygon class="cls-1" points="228.17 31.45 275.73 31.62 275.73 31.85 228.17 31.68 228.17 31.45"/>
+                    <polygon class="cls-1" points="228.17 31.22 275.73 31.39 275.73 31.62 228.17 31.45 228.17 31.22"/>
+                    <polygon class="cls-1" points="228.17 30.99 275.73 31.15 275.73 31.39 228.17 31.22 228.17 30.99"/>
+                    <polygon class="cls-1" points="228.17 30.75 275.73 30.92 275.73 31.15 228.17 30.99 228.17 30.75"/>
+                    <polygon class="cls-1" points="228.17 30.52 275.73 30.69 275.73 30.92 228.17 30.75 228.17 30.52"/>
+                    <polygon class="cls-1" points="228.17 30.29 275.73 30.45 275.73 30.69 228.17 30.52 228.17 30.29"/>
+                    <polygon class="cls-1" points="228.17 30.05 275.73 30.22 275.73 30.45 228.17 30.29 228.17 30.05"/>
+                    <polygon class="cls-1" points="228.17 29.82 275.73 29.99 275.73 30.22 228.17 30.05 228.17 29.82"/>
+                    <polygon class="cls-1" points="228.17 29.59 275.73 29.75 275.73 29.99 228.17 29.82 228.17 29.59"/>
+                    <polygon class="cls-1" points="228.17 29.36 275.73 29.52 275.73 29.75 228.17 29.59 228.17 29.36"/>
+                    <polygon class="cls-1" points="228.17 29.12 275.73 29.29 275.73 29.52 228.17 29.36 228.17 29.12"/>
+                    <polygon class="cls-1" points="228.17 28.89 275.73 29.06 275.73 29.29 228.17 29.12 228.17 28.89"/>
+                    <polygon class="cls-1" points="228.17 28.66 275.73 28.82 275.73 29.06 228.17 28.89 228.17 28.66"/>
+                    <polygon class="cls-1" points="275.73 28.82 228.17 28.66 228.17 27.83 275.73 27.83 275.73 28.82"/>
+                </g>
+                <path class="cls-1"
+                      d="M323.36,82.59h-9.74c-4,0-4.87-.23-6.32-2.85l-7.23-12.65-7,12.65c-1.44,2.39-2.2,2.85-6.31,2.85H277.4c-2.28,0-2.82-1.39-1.6-3.24l15.68-24.68L276.56,30.92c-1.14-1.7-.61-3.09,1.52-3.09h9.13c3.88,0,4.8.31,6.24,2.7l6.85,11.88,6.77-11.88c1.45-2.55,2.44-2.7,5.86-2.7h9.74c2.21,0,2.59,1.39,1.52,3.09L309.13,54.67,325,79.35C326.17,81.05,325.72,82.59,323.36,82.59Z"/>
+                <g class="cls-4">
+                    <polygon class="cls-1" points="274.58 82.42 323.27 82.59 274.58 82.59 274.58 82.42"/>
+                    <polygon class="cls-1"
+                             points="274.58 82.2 326.17 82.38 326.17 82.59 323.27 82.59 274.58 82.42 274.58 82.2"/>
+                    <polygon class="cls-1" points="274.58 81.99 326.17 82.17 326.17 82.38 274.58 82.2 274.58 81.99"/>
+                    <polygon class="cls-1" points="274.58 81.77 326.17 81.95 326.17 82.17 274.58 81.99 274.58 81.77"/>
+                    <polygon class="cls-1" points="274.58 81.55 326.17 81.73 326.17 81.95 274.58 81.77 274.58 81.55"/>
+                    <polygon class="cls-1" points="274.58 81.34 326.17 81.52 326.17 81.73 274.58 81.55 274.58 81.34"/>
+                    <polygon class="cls-1" points="274.58 81.12 326.17 81.3 326.17 81.52 274.58 81.34 274.58 81.12"/>
+                    <polygon class="cls-1" points="274.58 80.9 326.17 81.08 326.17 81.3 274.58 81.12 274.58 80.9"/>
+                    <polygon class="cls-1" points="274.58 80.69 326.17 80.87 326.17 81.08 274.58 80.9 274.58 80.69"/>
+                    <polygon class="cls-1" points="274.58 80.47 326.17 80.65 326.17 80.87 274.58 80.69 274.58 80.47"/>
+                    <polygon class="cls-1" points="274.58 80.25 326.17 80.44 326.17 80.65 274.58 80.47 274.58 80.25"/>
+                    <polygon class="cls-1" points="274.58 80.04 326.17 80.22 326.17 80.44 274.58 80.25 274.58 80.04"/>
+                    <polygon class="cls-1" points="274.58 79.82 326.17 80 326.17 80.22 274.58 80.04 274.58 79.82"/>
+                    <polygon class="cls-1" points="274.58 79.61 326.17 79.79 326.17 80 274.58 79.82 274.58 79.61"/>
+                    <polygon class="cls-1" points="274.58 79.39 326.17 79.57 326.17 79.79 274.58 79.61 274.58 79.39"/>
+                    <polygon class="cls-1" points="274.58 79.17 326.17 79.35 326.17 79.57 274.58 79.39 274.58 79.17"/>
+                    <polygon class="cls-1" points="274.58 78.96 326.17 79.14 326.17 79.35 274.58 79.17 274.58 78.96"/>
+                    <polygon class="cls-1" points="274.58 78.74 326.17 78.92 326.17 79.14 274.58 78.96 274.58 78.74"/>
+                    <polygon class="cls-1" points="274.58 78.52 326.17 78.7 326.17 78.92 274.58 78.74 274.58 78.52"/>
+                    <polygon class="cls-1" points="274.58 78.31 326.17 78.49 326.17 78.7 274.58 78.52 274.58 78.31"/>
+                    <polygon class="cls-1" points="274.58 78.09 326.17 78.27 326.17 78.49 274.58 78.31 274.58 78.09"/>
+                    <polygon class="cls-1" points="274.58 77.88 326.17 78.06 326.17 78.27 274.58 78.09 274.58 77.88"/>
+                    <polygon class="cls-1" points="274.58 77.66 326.17 77.84 326.17 78.06 274.58 77.88 274.58 77.66"/>
+                    <polygon class="cls-1" points="274.58 77.44 326.17 77.62 326.17 77.84 274.58 77.66 274.58 77.44"/>
+                    <polygon class="cls-1" points="274.58 77.23 326.17 77.41 326.17 77.62 274.58 77.44 274.58 77.23"/>
+                    <polygon class="cls-1" points="274.58 77.01 326.17 77.19 326.17 77.41 274.58 77.23 274.58 77.01"/>
+                    <polygon class="cls-1" points="274.58 76.79 326.17 76.97 326.17 77.19 274.58 77.01 274.58 76.79"/>
+                    <polygon class="cls-1" points="274.58 76.58 326.17 76.76 326.17 76.97 274.58 76.79 274.58 76.58"/>
+                    <polygon class="cls-1" points="274.58 76.36 326.17 76.54 326.17 76.76 274.58 76.58 274.58 76.36"/>
+                    <polygon class="cls-1" points="274.58 76.14 326.17 76.33 326.17 76.54 274.58 76.36 274.58 76.14"/>
+                    <polygon class="cls-1" points="274.58 75.93 326.17 76.11 326.17 76.33 274.58 76.14 274.58 75.93"/>
+                    <polygon class="cls-1" points="274.58 75.71 326.17 75.89 326.17 76.11 274.58 75.93 274.58 75.71"/>
+                    <polygon class="cls-1" points="274.58 75.5 326.17 75.68 326.17 75.89 274.58 75.71 274.58 75.5"/>
+                    <polygon class="cls-1" points="274.58 75.28 326.17 75.46 326.17 75.68 274.58 75.5 274.58 75.28"/>
+                    <polygon class="cls-1" points="274.58 75.06 326.17 75.24 326.17 75.46 274.58 75.28 274.58 75.06"/>
+                    <polygon class="cls-1" points="274.58 74.85 326.17 75.03 326.17 75.24 274.58 75.06 274.58 74.85"/>
+                    <polygon class="cls-1" points="274.58 74.63 326.17 74.81 326.17 75.03 274.58 74.85 274.58 74.63"/>
+                    <polygon class="cls-1" points="274.58 74.41 326.17 74.59 326.17 74.81 274.58 74.63 274.58 74.41"/>
+                    <polygon class="cls-1" points="274.58 74.2 326.17 74.38 326.17 74.59 274.58 74.41 274.58 74.2"/>
+                    <polygon class="cls-1" points="274.58 73.98 326.17 74.16 326.17 74.38 274.58 74.2 274.58 73.98"/>
+                    <polygon class="cls-1" points="274.58 73.77 326.17 73.94 326.17 74.16 274.58 73.98 274.58 73.77"/>
+                    <polygon class="cls-1" points="274.58 73.55 326.17 73.73 326.17 73.94 274.58 73.77 274.58 73.55"/>
+                    <polygon class="cls-1" points="274.58 73.33 326.17 73.51 326.17 73.73 274.58 73.55 274.58 73.33"/>
+                    <polygon class="cls-1" points="274.58 73.12 326.17 73.3 326.17 73.51 274.58 73.33 274.58 73.12"/>
+                    <polygon class="cls-1" points="274.58 72.9 326.17 73.08 326.17 73.3 274.58 73.12 274.58 72.9"/>
+                    <polygon class="cls-1" points="274.58 72.68 326.17 72.86 326.17 73.08 274.58 72.9 274.58 72.68"/>
+                    <polygon class="cls-1" points="274.58 72.47 326.17 72.65 326.17 72.86 274.58 72.68 274.58 72.47"/>
+                    <polygon class="cls-1" points="274.58 72.25 326.17 72.43 326.17 72.65 274.58 72.47 274.58 72.25"/>
+                    <polygon class="cls-1" points="274.58 72.03 326.17 72.22 326.17 72.43 274.58 72.25 274.58 72.03"/>
+                    <polygon class="cls-1" points="274.58 71.82 326.17 72 326.17 72.22 274.58 72.03 274.58 71.82"/>
+                    <polygon class="cls-1" points="274.58 71.6 326.17 71.78 326.17 72 274.58 71.82 274.58 71.6"/>
+                    <polygon class="cls-1" points="274.58 71.39 326.17 71.57 326.17 71.78 274.58 71.6 274.58 71.39"/>
+                    <polygon class="cls-1" points="274.58 71.17 326.17 71.35 326.17 71.57 274.58 71.39 274.58 71.17"/>
+                    <polygon class="cls-1" points="274.58 70.95 326.17 71.13 326.17 71.35 274.58 71.17 274.58 70.95"/>
+                    <polygon class="cls-1" points="274.58 70.74 326.17 70.92 326.17 71.13 274.58 70.95 274.58 70.74"/>
+                    <polygon class="cls-1" points="274.58 70.52 326.17 70.7 326.17 70.92 274.58 70.74 274.58 70.52"/>
+                    <polygon class="cls-1" points="274.58 70.3 326.17 70.48 326.17 70.7 274.58 70.52 274.58 70.3"/>
+                    <polygon class="cls-1" points="274.58 70.09 326.17 70.27 326.17 70.48 274.58 70.3 274.58 70.09"/>
+                    <polygon class="cls-1" points="274.58 69.87 326.17 70.05 326.17 70.27 274.58 70.09 274.58 69.87"/>
+                    <polygon class="cls-1" points="274.58 69.66 326.17 69.83 326.17 70.05 274.58 69.87 274.58 69.66"/>
+                    <polygon class="cls-1" points="274.58 69.44 326.17 69.62 326.17 69.83 274.58 69.66 274.58 69.44"/>
+                    <polygon class="cls-1" points="274.58 69.22 326.17 69.4 326.17 69.62 274.58 69.44 274.58 69.22"/>
+                    <polygon class="cls-1" points="274.58 69.01 326.17 69.19 326.17 69.4 274.58 69.22 274.58 69.01"/>
+                    <polygon class="cls-1" points="274.58 68.79 326.17 68.97 326.17 69.19 274.58 69.01 274.58 68.79"/>
+                    <polygon class="cls-1" points="274.58 68.57 326.17 68.75 326.17 68.97 274.58 68.79 274.58 68.57"/>
+                    <polygon class="cls-1" points="274.58 68.36 326.17 68.54 326.17 68.75 274.58 68.57 274.58 68.36"/>
+                    <polygon class="cls-1" points="274.58 68.14 326.17 68.32 326.17 68.54 274.58 68.36 274.58 68.14"/>
+                    <polygon class="cls-1" points="274.58 67.92 326.17 68.1 326.17 68.32 274.58 68.14 274.58 67.92"/>
+                    <polygon class="cls-1" points="274.58 67.71 326.17 67.89 326.17 68.1 274.58 67.92 274.58 67.71"/>
+                    <polygon class="cls-1" points="274.58 67.49 326.17 67.67 326.17 67.89 274.58 67.71 274.58 67.49"/>
+                    <polygon class="cls-1" points="274.58 67.28 326.17 67.46 326.17 67.67 274.58 67.49 274.58 67.28"/>
+                    <polygon class="cls-1" points="274.58 67.06 326.17 67.24 326.17 67.46 274.58 67.28 274.58 67.06"/>
+                    <polygon class="cls-1" points="274.58 66.84 326.17 67.02 326.17 67.24 274.58 67.06 274.58 66.84"/>
+                    <polygon class="cls-1" points="274.58 66.63 326.17 66.81 326.17 67.02 274.58 66.84 274.58 66.63"/>
+                    <polygon class="cls-1" points="274.58 66.41 326.17 66.59 326.17 66.81 274.58 66.63 274.58 66.41"/>
+                    <polygon class="cls-1" points="274.58 66.19 326.17 66.37 326.17 66.59 274.58 66.41 274.58 66.19"/>
+                    <polygon class="cls-1" points="274.58 65.98 326.17 66.16 326.17 66.37 274.58 66.19 274.58 65.98"/>
+                    <polygon class="cls-1" points="274.58 65.76 326.17 65.94 326.17 66.16 274.58 65.98 274.58 65.76"/>
+                    <polygon class="cls-1" points="274.58 65.54 326.17 65.72 326.17 65.94 274.58 65.76 274.58 65.54"/>
+                    <polygon class="cls-1" points="274.58 65.33 326.17 65.51 326.17 65.72 274.58 65.54 274.58 65.33"/>
+                    <polygon class="cls-1" points="274.58 65.11 326.17 65.29 326.17 65.51 274.58 65.33 274.58 65.11"/>
+                    <polygon class="cls-1" points="274.58 64.9 326.17 65.08 326.17 65.29 274.58 65.11 274.58 64.9"/>
+                    <polygon class="cls-1" points="274.58 64.68 326.17 64.86 326.17 65.08 274.58 64.9 274.58 64.68"/>
+                    <polygon class="cls-1" points="274.58 64.46 326.17 64.64 326.17 64.86 274.58 64.68 274.58 64.46"/>
+                    <polygon class="cls-1" points="274.58 64.25 326.17 64.43 326.17 64.64 274.58 64.46 274.58 64.25"/>
+                    <polygon class="cls-1" points="274.58 64.03 326.17 64.21 326.17 64.43 274.58 64.25 274.58 64.03"/>
+                    <polygon class="cls-1" points="274.58 63.81 326.17 63.99 326.17 64.21 274.58 64.03 274.58 63.81"/>
+                    <polygon class="cls-1" points="274.58 63.6 326.17 63.78 326.17 63.99 274.58 63.81 274.58 63.6"/>
+                    <polygon class="cls-1" points="274.58 63.38 326.17 63.56 326.17 63.78 274.58 63.6 274.58 63.38"/>
+                    <polygon class="cls-1" points="274.58 63.16 326.17 63.34 326.17 63.56 274.58 63.38 274.58 63.16"/>
+                    <polygon class="cls-1" points="274.58 62.95 326.17 63.13 326.17 63.34 274.58 63.16 274.58 62.95"/>
+                    <polygon class="cls-1" points="274.58 62.73 326.17 62.91 326.17 63.13 274.58 62.95 274.58 62.73"/>
+                    <polygon class="cls-1" points="274.58 62.52 326.17 62.7 326.17 62.91 274.58 62.73 274.58 62.52"/>
+                    <polygon class="cls-1" points="274.58 62.3 326.17 62.48 326.17 62.7 274.58 62.52 274.58 62.3"/>
+                    <polygon class="cls-1" points="274.58 62.08 326.17 62.26 326.17 62.48 274.58 62.3 274.58 62.08"/>
+                    <polygon class="cls-1" points="274.58 61.87 326.17 62.05 326.17 62.26 274.58 62.08 274.58 61.87"/>
+                    <polygon class="cls-1" points="274.58 61.65 326.17 61.83 326.17 62.05 274.58 61.87 274.58 61.65"/>
+                    <polygon class="cls-1" points="274.58 61.43 326.17 61.61 326.17 61.83 274.58 61.65 274.58 61.43"/>
+                    <polygon class="cls-1" points="274.58 61.22 326.17 61.4 326.17 61.61 274.58 61.43 274.58 61.22"/>
+                    <polygon class="cls-1" points="274.58 61 326.17 61.18 326.17 61.4 274.58 61.22 274.58 61"/>
+                    <polygon class="cls-1" points="274.58 60.78 326.17 60.97 326.17 61.18 274.58 61 274.58 60.78"/>
+                    <polygon class="cls-1" points="274.58 60.57 326.17 60.75 326.17 60.97 274.58 60.78 274.58 60.57"/>
+                    <polygon class="cls-1" points="274.58 60.35 326.17 60.53 326.17 60.75 274.58 60.57 274.58 60.35"/>
+                    <polygon class="cls-1" points="274.58 59.06 326.17 59.24 326.17 60.53 274.58 60.35 274.58 59.06"/>
+                    <polygon class="cls-1" points="274.58 57.77 326.17 57.95 326.17 59.24 274.58 59.06 274.58 57.77"/>
+                    <polygon class="cls-1" points="274.58 56.48 326.17 56.66 326.17 57.95 274.58 57.77 274.58 56.48"/>
+                    <polygon class="cls-1" points="274.58 55.19 326.17 55.37 326.17 56.66 274.58 56.48 274.58 55.19"/>
+                    <polygon class="cls-1" points="274.58 53.89 326.17 54.07 326.17 55.37 274.58 55.19 274.58 53.89"/>
+                    <polygon class="cls-1" points="274.58 52.6 326.17 52.78 326.17 54.07 274.58 53.89 274.58 52.6"/>
+                    <polygon class="cls-1" points="274.58 51.31 326.17 51.49 326.17 52.78 274.58 52.6 274.58 51.31"/>
+                    <polygon class="cls-1" points="274.58 50.02 326.17 50.2 326.17 51.49 274.58 51.31 274.58 50.02"/>
+                    <polygon class="cls-1" points="274.58 49.78 326.17 49.96 326.17 50.2 274.58 50.02 274.58 49.78"/>
+                    <polygon class="cls-1" points="274.58 49.55 326.17 49.73 326.17 49.96 274.58 49.78 274.58 49.55"/>
+                    <polygon class="cls-1" points="274.58 49.32 326.17 49.5 326.17 49.73 274.58 49.55 274.58 49.32"/>
+                    <polygon class="cls-1" points="274.58 49.09 326.17 49.27 326.17 49.5 274.58 49.32 274.58 49.09"/>
+                    <polygon class="cls-1" points="274.58 48.85 326.17 49.03 326.17 49.27 274.58 49.09 274.58 48.85"/>
+                    <polygon class="cls-1" points="274.58 48.62 326.17 48.8 326.17 49.03 274.58 48.85 274.58 48.62"/>
+                    <polygon class="cls-1" points="274.58 48.39 326.17 48.57 326.17 48.8 274.58 48.62 274.58 48.39"/>
+                    <polygon class="cls-1" points="274.58 48.15 326.17 48.33 326.17 48.57 274.58 48.39 274.58 48.15"/>
+                    <polygon class="cls-1" points="274.58 47.92 326.17 48.1 326.17 48.33 274.58 48.15 274.58 47.92"/>
+                    <polygon class="cls-1" points="274.58 47.69 326.17 47.87 326.17 48.1 274.58 47.92 274.58 47.69"/>
+                    <polygon class="cls-1" points="274.58 47.45 326.17 47.63 326.17 47.87 274.58 47.69 274.58 47.45"/>
+                    <polygon class="cls-1" points="274.58 47.22 326.17 47.4 326.17 47.63 274.58 47.45 274.58 47.22"/>
+                    <polygon class="cls-1" points="274.58 46.99 326.17 47.17 326.17 47.4 274.58 47.22 274.58 46.99"/>
+                    <polygon class="cls-1" points="274.58 46.76 326.17 46.94 326.17 47.17 274.58 46.99 274.58 46.76"/>
+                    <polygon class="cls-1" points="274.58 46.52 326.17 46.7 326.17 46.94 274.58 46.76 274.58 46.52"/>
+                    <polygon class="cls-1" points="274.58 46.29 326.17 46.47 326.17 46.7 274.58 46.52 274.58 46.29"/>
+                    <polygon class="cls-1" points="274.58 46.06 326.17 46.24 326.17 46.47 274.58 46.29 274.58 46.06"/>
+                    <polygon class="cls-1" points="274.58 45.82 326.17 46 326.17 46.24 274.58 46.06 274.58 45.82"/>
+                    <polygon class="cls-1" points="274.58 45.59 326.17 45.77 326.17 46 274.58 45.82 274.58 45.59"/>
+                    <polygon class="cls-1" points="274.58 45.36 326.17 45.54 326.17 45.77 274.58 45.59 274.58 45.36"/>
+                    <polygon class="cls-1" points="274.58 45.13 326.17 45.3 326.17 45.54 274.58 45.36 274.58 45.13"/>
+                    <polygon class="cls-1" points="274.58 44.89 326.17 45.07 326.17 45.3 274.58 45.13 274.58 44.89"/>
+                    <polygon class="cls-1" points="274.58 44.66 326.17 44.84 326.17 45.07 274.58 44.89 274.58 44.66"/>
+                    <polygon class="cls-1" points="274.58 44.43 326.17 44.61 326.17 44.84 274.58 44.66 274.58 44.43"/>
+                    <polygon class="cls-1" points="274.58 44.19 326.17 44.37 326.17 44.61 274.58 44.43 274.58 44.19"/>
+                    <polygon class="cls-1" points="274.58 43.96 326.17 44.14 326.17 44.37 274.58 44.19 274.58 43.96"/>
+                    <polygon class="cls-1" points="274.58 43.73 326.17 43.91 326.17 44.14 274.58 43.96 274.58 43.73"/>
+                    <polygon class="cls-1" points="274.58 43.49 326.17 43.67 326.17 43.91 274.58 43.73 274.58 43.49"/>
+                    <polygon class="cls-1" points="274.58 43.26 326.17 43.44 326.17 43.67 274.58 43.49 274.58 43.26"/>
+                    <polygon class="cls-1" points="274.58 43.03 326.17 43.21 326.17 43.44 274.58 43.26 274.58 43.03"/>
+                    <polygon class="cls-1" points="274.58 42.8 326.17 42.98 326.17 43.21 274.58 43.03 274.58 42.8"/>
+                    <polygon class="cls-1" points="274.58 42.56 326.17 42.74 326.17 42.98 274.58 42.8 274.58 42.56"/>
+                    <polygon class="cls-1" points="274.58 42.33 326.17 42.51 326.17 42.74 274.58 42.56 274.58 42.33"/>
+                    <polygon class="cls-1" points="274.58 42.1 326.17 42.28 326.17 42.51 274.58 42.33 274.58 42.1"/>
+                    <polygon class="cls-1" points="274.58 41.86 326.17 42.04 326.17 42.28 274.58 42.1 274.58 41.86"/>
+                    <polygon class="cls-1" points="274.58 41.63 326.17 41.81 326.17 42.04 274.58 41.86 274.58 41.63"/>
+                    <polygon class="cls-1" points="274.58 41.4 326.17 41.58 326.17 41.81 274.58 41.63 274.58 41.4"/>
+                    <polygon class="cls-1" points="274.58 41.16 326.17 41.34 326.17 41.58 274.58 41.4 274.58 41.16"/>
+                    <polygon class="cls-1" points="274.58 40.93 326.17 41.11 326.17 41.34 274.58 41.16 274.58 40.93"/>
+                    <polygon class="cls-1" points="274.58 40.7 326.17 40.88 326.17 41.11 274.58 40.93 274.58 40.7"/>
+                    <polygon class="cls-1" points="274.58 40.47 326.17 40.65 326.17 40.88 274.58 40.7 274.58 40.47"/>
+                    <polygon class="cls-1" points="274.58 40.23 326.17 40.41 326.17 40.65 274.58 40.47 274.58 40.23"/>
+                    <polygon class="cls-1" points="274.58 40 326.17 40.18 326.17 40.41 274.58 40.23 274.58 40"/>
+                    <polygon class="cls-1" points="274.58 39.77 326.17 39.95 326.17 40.18 274.58 40 274.58 39.77"/>
+                    <polygon class="cls-1" points="274.58 39.53 326.17 39.71 326.17 39.95 274.58 39.77 274.58 39.53"/>
+                    <polygon class="cls-1" points="274.58 39.3 326.17 39.48 326.17 39.71 274.58 39.53 274.58 39.3"/>
+                    <polygon class="cls-1" points="274.58 39.07 326.17 39.25 326.17 39.48 274.58 39.3 274.58 39.07"/>
+                    <polygon class="cls-1" points="274.58 38.84 326.17 39.02 326.17 39.25 274.58 39.07 274.58 38.84"/>
+                    <polygon class="cls-1" points="274.58 38.6 326.17 38.78 326.17 39.02 274.58 38.84 274.58 38.6"/>
+                    <polygon class="cls-1" points="274.58 38.37 326.17 38.55 326.17 38.78 274.58 38.6 274.58 38.37"/>
+                    <polygon class="cls-1" points="274.58 38.14 326.17 38.32 326.17 38.55 274.58 38.37 274.58 38.14"/>
+                    <polygon class="cls-1" points="274.58 37.9 326.17 38.08 326.17 38.32 274.58 38.14 274.58 37.9"/>
+                    <polygon class="cls-1" points="274.58 37.67 326.17 37.85 326.17 38.08 274.58 37.9 274.58 37.67"/>
+                    <polygon class="cls-1" points="274.58 37.44 326.17 37.62 326.17 37.85 274.58 37.67 274.58 37.44"/>
+                    <polygon class="cls-1" points="274.58 37.2 326.17 37.38 326.17 37.62 274.58 37.44 274.58 37.2"/>
+                    <polygon class="cls-1" points="274.58 36.97 326.17 37.15 326.17 37.38 274.58 37.2 274.58 36.97"/>
+                    <polygon class="cls-1" points="274.58 36.74 326.17 36.92 326.17 37.15 274.58 36.97 274.58 36.74"/>
+                    <polygon class="cls-1" points="274.58 36.51 326.17 36.69 326.17 36.92 274.58 36.74 274.58 36.51"/>
+                    <polygon class="cls-1" points="274.58 36.27 326.17 36.45 326.17 36.69 274.58 36.51 274.58 36.27"/>
+                    <polygon class="cls-1" points="274.58 36.04 326.17 36.22 326.17 36.45 274.58 36.27 274.58 36.04"/>
+                    <polygon class="cls-1" points="274.58 35.81 326.17 35.99 326.17 36.22 274.58 36.04 274.58 35.81"/>
+                    <polygon class="cls-1" points="274.58 35.57 326.17 35.75 326.17 35.99 274.58 35.81 274.58 35.57"/>
+                    <polygon class="cls-1" points="274.58 35.34 326.17 35.52 326.17 35.75 274.58 35.57 274.58 35.34"/>
+                    <polygon class="cls-1" points="274.58 35.11 326.17 35.29 326.17 35.52 274.58 35.34 274.58 35.11"/>
+                    <polygon class="cls-1" points="274.58 34.88 326.17 35.05 326.17 35.29 274.58 35.11 274.58 34.88"/>
+                    <polygon class="cls-1" points="274.58 34.64 326.17 34.82 326.17 35.05 274.58 34.88 274.58 34.64"/>
+                    <polygon class="cls-1" points="274.58 34.41 326.17 34.59 326.17 34.82 274.58 34.64 274.58 34.41"/>
+                    <polygon class="cls-1" points="274.58 34.18 326.17 34.36 326.17 34.59 274.58 34.41 274.58 34.18"/>
+                    <polygon class="cls-1" points="274.58 33.94 326.17 34.12 326.17 34.36 274.58 34.18 274.58 33.94"/>
+                    <polygon class="cls-1" points="274.58 33.71 326.17 33.89 326.17 34.12 274.58 33.94 274.58 33.71"/>
+                    <polygon class="cls-1" points="274.58 33.48 326.17 33.66 326.17 33.89 274.58 33.71 274.58 33.48"/>
+                    <polygon class="cls-1" points="274.58 33.24 326.17 33.42 326.17 33.66 274.58 33.48 274.58 33.24"/>
+                    <polygon class="cls-1" points="274.58 33.01 326.17 33.19 326.17 33.42 274.58 33.24 274.58 33.01"/>
+                    <polygon class="cls-1" points="274.58 32.78 326.17 32.96 326.17 33.19 274.58 33.01 274.58 32.78"/>
+                    <polygon class="cls-1" points="274.58 32.55 326.17 32.73 326.17 32.96 274.58 32.78 274.58 32.55"/>
+                    <polygon class="cls-1" points="274.58 32.31 326.17 32.49 326.17 32.73 274.58 32.55 274.58 32.31"/>
+                    <polygon class="cls-1" points="274.58 32.08 326.17 32.26 326.17 32.49 274.58 32.31 274.58 32.08"/>
+                    <polygon class="cls-1" points="274.58 31.85 326.17 32.03 326.17 32.26 274.58 32.08 274.58 31.85"/>
+                    <polygon class="cls-1" points="274.58 31.61 326.17 31.79 326.17 32.03 274.58 31.85 274.58 31.61"/>
+                    <polygon class="cls-1" points="274.58 31.38 326.17 31.56 326.17 31.79 274.58 31.61 274.58 31.38"/>
+                    <polygon class="cls-1" points="274.58 31.15 326.17 31.33 326.17 31.56 274.58 31.38 274.58 31.15"/>
+                    <polygon class="cls-1" points="274.58 30.91 326.17 31.09 326.17 31.33 274.58 31.15 274.58 30.91"/>
+                    <polygon class="cls-1" points="274.58 30.68 326.17 30.86 326.17 31.09 274.58 30.91 274.58 30.68"/>
+                    <polygon class="cls-1" points="274.58 30.45 326.17 30.63 326.17 30.86 274.58 30.68 274.58 30.45"/>
+                    <polygon class="cls-1" points="274.58 30.22 326.17 30.4 326.17 30.63 274.58 30.45 274.58 30.22"/>
+                    <polygon class="cls-1" points="274.58 29.98 326.17 30.16 326.17 30.4 274.58 30.22 274.58 29.98"/>
+                    <polygon class="cls-1" points="274.58 29.75 326.17 29.93 326.17 30.16 274.58 29.98 274.58 29.75"/>
+                    <polygon class="cls-1" points="274.58 29.52 326.17 29.7 326.17 29.93 274.58 29.75 274.58 29.52"/>
+                    <polygon class="cls-1" points="274.58 29.28 326.17 29.46 326.17 29.7 274.58 29.52 274.58 29.28"/>
+                    <polygon class="cls-1" points="274.58 29.05 326.17 29.23 326.17 29.46 274.58 29.28 274.58 29.05"/>
+                    <polygon class="cls-1" points="274.58 28.82 326.17 29 326.17 29.23 274.58 29.05 274.58 28.82"/>
+                    <polygon class="cls-1" points="326.17 29 274.58 28.82 274.58 27.83 326.17 27.83 326.17 29"/>
+                </g>
+                <path class="cls-1"
+                      d="M281.78,21.08h-.29c-.23,0-.3,0-.35-.17L280.41,19h-3.08l-.74,1.87c0,.13-.12.17-.35.17H276c-.16,0-.19-.06-.14-.18l2.64-6.67c0-.13.11-.16.25-.16h.3c.14,0,.2,0,.25.15l2.64,6.68C282,21,281.93,21.08,281.78,21.08ZM279,15.42a2.46,2.46,0,0,1-.14-.67h-.05a3,3,0,0,1-.12.67l-1.18,3h2.67Z"/>
+                <path class="cls-1"
+                      d="M290.42,16.28a2,2,0,0,1-2.22,2.18h-2.12v2.43c0,.15-.05.19-.19.19h-.33c-.15,0-.2,0-.2-.19v-6.6c0-.14.05-.19.2-.19h2.64A2,2,0,0,1,290.42,16.28Zm-.76,0a1.4,1.4,0,0,0-1.54-1.51h-2.05v3h2.05A1.4,1.4,0,0,0,289.66,16.28Z"/>
+                <path class="cls-1"
+                      d="M298.82,21.08h-.28c-.24,0-.31,0-.36-.17L297.45,19h-3.08l-.74,1.87c-.05.13-.11.17-.35.17H293c-.15,0-.18-.06-.13-.18l2.63-6.67c.05-.13.11-.16.25-.16h.31a.21.21,0,0,1,.24.15L299,20.9C299,21,299,21.08,298.82,21.08Zm-2.75-5.66a2.46,2.46,0,0,1-.14-.67h-.05a2.7,2.7,0,0,1-.13.67l-1.18,3h2.68Z"/>
+                <path class="cls-1"
+                      d="M304.75,14a2.37,2.37,0,0,1,2.62,1.68c.05.15,0,.21-.13.26l-.31.11c-.13,0-.19,0-.24-.12a1.73,1.73,0,0,0-1.94-1.27c-1.31,0-2,.67-2,1.8v2.34c0,1.12.7,1.8,2,1.8a1.74,1.74,0,0,0,1.95-1.3c.06-.13.12-.16.25-.12l.31.11c.14.05.17.11.12.25a2.39,2.39,0,0,1-2.63,1.72c-1.74,0-2.71-.93-2.71-2.47V16.43C302,14.89,303,14,304.75,14Z"/>
+                <path class="cls-1"
+                      d="M316.25,14.29v6.6c0,.15-.05.19-.2.19h-.32c-.15,0-.2,0-.2-.19v-3h-3.74v3c0,.15-.05.19-.2.19h-.32c-.15,0-.2,0-.2-.19v-6.6c0-.14.05-.19.2-.19h.32c.15,0,.2.05.2.19v2.92h3.74V14.29c0-.14.05-.19.2-.19h.32C316.2,14.1,316.25,14.15,316.25,14.29Z"/>
+                <path class="cls-1"
+                      d="M324.72,14.29v.28c0,.15-.05.2-.2.2h-3.47v2.44h3c.14,0,.19.05.19.19v.28c0,.15,0,.2-.19.2h-3v2.53h3.6c.13,0,.18.05.18.2v.28c0,.15-.05.19-.18.19h-4.12c-.14,0-.19,0-.19-.19v-6.6c0-.14.05-.19.19-.19h4C324.67,14.1,324.72,14.15,324.72,14.29Z"/>
+                <path class="cls-1" d="M71.18,83.58h0Z"/>
+                <path class="cls-1" d="M63.24,64s0,0,0,0S63.25,64,63.24,64Z"/>
+                <path class="cls-1" d="M61.12,82.93s0,0,0,.08h0l0,0Z"/>
+                <path class="cls-1" d="M59.69,69.29s.08.12,0,0Z"/>
+                <path class="cls-1" d="M52.11,65.19a.09.09,0,0,0,0,0s0,0,0,0S52.09,65.21,52.11,65.19Z"/>
+                <path class="cls-1" d="M50.38,2.18h0Z"/>
+                <rect class="cls-1" x="47.2" y="72.88" width="0.01" height="0.01"/>
+                <path class="cls-1" d="M46.28,6.58h0a7.14,7.14,0,0,0-.56.54A7.14,7.14,0,0,1,46.28,6.58Z"/>
+                <path class="cls-1" d="M41.39,80.56a2.77,2.77,0,0,1-.1.26"/>
+                <path class="cls-1" d="M63.24,64s0,0,0,0S63.25,64,63.24,64Z"/>
+                <path class="cls-1" d="M59.69,69.29s.08.12,0,0Z"/>
+                <path class="cls-1" d="M52.11,65.19a.09.09,0,0,0,0,0s0,0,0,0S52.09,65.21,52.11,65.19Z"/>
+                <path class="cls-1" d="M50.38,2.18h0Z"/>
+                <rect class="cls-1" x="47.2" y="72.88" width="0.01" height="0.01"/>
+                <path class="cls-1" d="M46.28,6.58h0a7.14,7.14,0,0,0-.56.54A7.14,7.14,0,0,1,46.28,6.58Z"/>
+                <path class="cls-1" d="M65,78.76l-.2,0c0,.14.06.29.09.42C65,79,65,78.89,65,78.76Z"/>
+                <path class="cls-1" d="M71.18,83.58h0Z"/>
+                <path class="cls-1" d="M63.24,64s0,0,0,0S63.25,64,63.24,64Z"/>
+                <path class="cls-1" d="M61.12,82.93s0,0,0,.08h0l0,0Z"/>
+                <path class="cls-1" d="M59.69,69.29s.08.12,0,0Z"/>
+                <path class="cls-1" d="M52.11,65.19a.09.09,0,0,0,0,0s0,0,0,0S52.09,65.21,52.11,65.19Z"/>
+                <path class="cls-1" d="M50.38,2.18h0Z"/>
+                <rect class="cls-1" x="47.2" y="72.88" width="0.01" height="0.01"/>
+                <path class="cls-1" d="M46.28,6.58h0a7.14,7.14,0,0,0-.56.54A7.14,7.14,0,0,1,46.28,6.58Z"/>
+                <path class="cls-1" d="M61.12,82.93s0,0,0,.08h0l0,0Z"/>
+                <path class="cls-1"
+                      d="M47.8,58a1.32,1.32,0,0,1,.83-.09h0s0,0,0-.08c-.81-.5-1.62-1-2.54-1.59a1.65,1.65,0,0,1-.28.6l2,1.21S47.78,58,47.8,58Z"/>
+                <g class="cls-5">
+                    <polygon class="cls-1" points="48.62 58.08 48.63 58.07 48.63 58.08 48.62 58.08"/>
+                    <polygon class="cls-1" points="48.34 58.08 48.63 57.7 48.63 58.07 48.62 58.08 48.34 58.08"/>
+                    <polygon class="cls-1" points="48.05 58.08 48.63 57.32 48.63 57.7 48.34 58.08 48.05 58.08"/>
+                    <polygon class="cls-1" points="47.77 58.08 48.63 56.95 48.63 57.32 48.05 58.08 47.77 58.08"/>
+                    <polygon class="cls-1" points="47.49 58.08 48.63 56.58 48.63 56.95 47.77 58.08 47.49 58.08"/>
+                    <polygon class="cls-1"
+                             points="47.2 58.08 48.58 56.27 48.63 56.27 48.63 56.58 47.49 58.08 47.2 58.08"/>
+                    <polygon class="cls-1" points="46.92 58.08 48.3 56.27 48.58 56.27 47.2 58.08 46.92 58.08"/>
+                    <polygon class="cls-1" points="46.63 58.08 48.01 56.27 48.3 56.27 46.92 58.08 46.63 58.08"/>
+                    <polygon class="cls-1" points="46.35 58.08 47.73 56.27 48.01 56.27 46.63 58.08 46.35 58.08"/>
+                    <polygon class="cls-1" points="46.06 58.08 47.45 56.27 47.73 56.27 46.35 58.08 46.06 58.08"/>
+                    <polygon class="cls-1"
+                             points="45.8 58.05 47.16 56.27 47.45 56.27 46.06 58.08 45.8 58.08 45.8 58.05"/>
+                    <polygon class="cls-1" points="45.8 57.67 46.88 56.27 47.16 56.27 45.8 58.05 45.8 57.67"/>
+                    <polygon class="cls-1" points="45.8 57.3 46.59 56.27 46.88 56.27 45.8 57.67 45.8 57.3"/>
+                    <polygon class="cls-1" points="45.8 56.93 46.31 56.27 46.59 56.27 45.8 57.3 45.8 56.93"/>
+                    <polygon class="cls-1" points="45.8 56.56 46.02 56.27 46.31 56.27 45.8 56.93 45.8 56.56"/>
+                    <polygon class="cls-1" points="46.02 56.27 45.8 56.56 45.8 56.27 46.02 56.27"/>
+                </g>
+                <path class="cls-1"
+                      d="M.71,22.52A23.24,23.24,0,0,0,4.2,28l3.72-1a44.55,44.55,0,0,1-3.84-4.84A2.07,2.07,0,0,1,4,22a2.14,2.14,0,0,1,.13.19,40.79,40.79,0,0,0,4,4.62,65.5,65.5,0,0,0,.73-7c-3.61-1.54-5.64-.6-5.64-.6S0,20.26.71,22.52Z"/>
+                <g class="cls-6">
+                    <polygon class="cls-1" points="0 26.86 8.77 26.47 8.77 28.04 0 28.04 0 26.86"/>
+                    <polygon class="cls-1" points="0 24.72 8.77 24.33 8.77 26.47 0 26.86 0 24.72"/>
+                    <polygon class="cls-1" points="0 22.58 8.77 22.19 8.77 24.33 0 24.72 0 22.58"/>
+                    <polygon class="cls-1" points="0 22.41 8.77 22.02 8.77 22.19 0 22.58 0 22.41"/>
+                    <polygon class="cls-1" points="0 22.25 8.77 21.86 8.77 22.02 0 22.41 0 22.25"/>
+                    <polygon class="cls-1" points="0 22.08 8.77 21.69 8.77 21.86 0 22.25 0 22.08"/>
+                    <polygon class="cls-1" points="0 21.92 8.77 21.53 8.77 21.69 0 22.08 0 21.92"/>
+                    <polygon class="cls-1" points="0 21.75 8.77 21.37 8.77 21.53 0 21.92 0 21.75"/>
+                    <polygon class="cls-1" points="0 21.59 8.77 21.2 8.77 21.37 0 21.75 0 21.59"/>
+                    <polygon class="cls-1" points="0 21.43 8.77 21.04 8.77 21.2 0 21.59 0 21.43"/>
+                    <polygon class="cls-1" points="0 21.26 8.77 20.87 8.77 21.04 0 21.43 0 21.26"/>
+                    <polygon class="cls-1" points="0 21.1 8.77 20.71 8.77 20.87 0 21.26 0 21.1"/>
+                    <polygon class="cls-1" points="0 20.93 8.77 20.55 8.77 20.71 0 21.1 0 20.93"/>
+                    <polygon class="cls-1" points="0 20.77 8.77 20.38 8.77 20.55 0 20.93 0 20.77"/>
+                    <polygon class="cls-1" points="0 20.61 8.77 20.22 8.77 20.38 0 20.77 0 20.61"/>
+                    <polygon class="cls-1" points="0 20.44 8.77 20.05 8.77 20.22 0 20.61 0 20.44"/>
+                    <polygon class="cls-1" points="0 20.28 8.77 19.89 8.77 20.05 0 20.44 0 20.28"/>
+                    <polygon class="cls-1" points="0 20.11 8.77 19.73 8.77 19.89 0 20.28 0 20.11"/>
+                    <polygon class="cls-1" points="0 19.95 8.77 19.56 8.77 19.73 0 20.11 0 19.95"/>
+                    <polygon class="cls-1" points="0 19.79 8.77 19.4 8.77 19.56 0 19.95 0 19.79"/>
+                    <polygon class="cls-1" points="0 19.62 8.77 19.23 8.77 19.4 0 19.79 0 19.62"/>
+                    <polygon class="cls-1" points="0 19.46 8.77 19.07 8.77 19.23 0 19.62 0 19.46"/>
+                    <polygon class="cls-1" points="0 19.29 8.77 18.9 8.77 19.07 0 19.46 0 19.29"/>
+                    <polygon class="cls-1" points="0 19.13 8.77 18.74 8.77 18.9 0 19.29 0 19.13"/>
+                    <polygon class="cls-1" points="0 18.96 8.77 18.58 8.77 18.74 0 19.13 0 18.96"/>
+                    <polygon class="cls-1" points="0 18.8 8.77 18.41 8.77 18.58 0 18.96 0 18.8"/>
+                    <polygon class="cls-1" points="0 18.64 8.46 18.26 8.77 18.26 8.77 18.41 0 18.8 0 18.64"/>
+                    <polygon class="cls-1" points="0 18.47 4.75 18.26 8.46 18.26 0 18.64 0 18.47"/>
+                    <polygon class="cls-1" points="0 18.31 1.05 18.26 4.75 18.26 0 18.47 0 18.31"/>
+                    <polygon class="cls-1" points="1.05 18.26 0 18.31 0 18.26 1.05 18.26"/>
+                </g>
+                <path class="cls-1" d="M19,29.86v0l0,.26v.05A2.45,2.45,0,0,0,19,29.86Z"/>
+                <path class="cls-1" d="M24.48,33c0,.15,0,.3,0,.45C24.47,33.33,24.48,33.18,24.48,33Z"/>
+                <polygon class="cls-1" points="24.45 33.6 24.45 33.6 24.45 33.59 24.45 33.6"/>
+                <path class="cls-1" d="M27.21,34.85c0,.23,0,.47,0,.72h0l0-.37C27.21,35.09,27.21,35,27.21,34.85Z"/>
+                <g class="cls-7">
+                    <path class="cls-1" d="M27.21,34.85c0,.23,0,.47,0,.72h0l0-.37C27.21,35.09,27.21,35,27.21,34.85Z"/>
+                </g>
+                <path class="cls-1" d="M24.45,33.59h0a.49.49,0,0,1,0-.12c0-.15,0-.3,0-.45l0,.56Z"/>
+                <g class="cls-7">
+                    <path class="cls-1" d="M24.45,33.59h0a.49.49,0,0,1,0-.12c0-.15,0-.3,0-.45l0,.56Z"/>
+                </g>
+                <path class="cls-1"
+                      d="M15.3,34.21c-.88-.77-1.73-1.53-2.55-2.3s-1.68-1.59-2.47-2.38l-.14-.14Q9,28.21,7.92,27.05L4.2,28l.4.51c.51.65,1.07,1.34,1.67,2s1.39,1.63,2.15,2.47,1.45,1.58,2.23,2.38,1.34,1.38,2,2.08l.08.07,5-1.24C17,35.64,16.12,34.92,15.3,34.21Z"/>
+                <g class="cls-8">
+                    <polygon class="cls-1" points="17.7 37.59 17.81 37.45 17.81 37.59 17.7 37.59"/>
+                    <polygon class="cls-1" points="17.48 37.59 17.81 37.17 17.81 37.45 17.7 37.59 17.48 37.59"/>
+                    <polygon class="cls-1" points="17.26 37.59 17.81 36.89 17.81 37.17 17.48 37.59 17.26 37.59"/>
+                    <polygon class="cls-1" points="17.04 37.59 17.81 36.61 17.81 36.89 17.26 37.59 17.04 37.59"/>
+                    <polygon class="cls-1" points="16.82 37.59 17.81 36.33 17.81 36.61 17.04 37.59 16.82 37.59"/>
+                    <polygon class="cls-1" points="16.6 37.59 17.81 36.04 17.81 36.33 16.82 37.59 16.6 37.59"/>
+                    <polygon class="cls-1" points="16.38 37.59 17.81 35.76 17.81 36.04 16.6 37.59 16.38 37.59"/>
+                    <polygon class="cls-1" points="16.16 37.59 17.81 35.48 17.81 35.76 16.38 37.59 16.16 37.59"/>
+                    <polygon class="cls-1" points="15.94 37.59 17.81 35.2 17.81 35.48 16.16 37.59 15.94 37.59"/>
+                    <polygon class="cls-1" points="15.72 37.59 17.81 34.91 17.81 35.2 15.94 37.59 15.72 37.59"/>
+                    <polygon class="cls-1" points="15.5 37.59 17.81 34.63 17.81 34.91 15.72 37.59 15.5 37.59"/>
+                    <polygon class="cls-1" points="15.28 37.59 17.81 34.35 17.81 34.63 15.5 37.59 15.28 37.59"/>
+                    <polygon class="cls-1" points="15.06 37.59 17.81 34.07 17.81 34.35 15.28 37.59 15.06 37.59"/>
+                    <polygon class="cls-1" points="14.84 37.59 17.81 33.79 17.81 34.07 15.06 37.59 14.84 37.59"/>
+                    <polygon class="cls-1" points="14.62 37.59 17.81 33.5 17.81 33.79 14.84 37.59 14.62 37.59"/>
+                    <polygon class="cls-1" points="14.4 37.59 17.81 33.22 17.81 33.5 14.62 37.59 14.4 37.59"/>
+                    <polygon class="cls-1" points="14.18 37.59 17.81 32.94 17.81 33.22 14.4 37.59 14.18 37.59"/>
+                    <polygon class="cls-1" points="13.96 37.59 17.81 32.66 17.81 32.94 14.18 37.59 13.96 37.59"/>
+                    <polygon class="cls-1"
+                             points="13.74 37.59 17.75 32.45 17.81 32.5 17.81 32.66 13.96 37.59 13.74 37.59"/>
+                    <polygon class="cls-1" points="13.52 37.59 17.61 32.35 17.75 32.45 13.74 37.59 13.52 37.59"/>
+                    <polygon class="cls-1" points="13.3 37.59 17.48 32.24 17.61 32.35 13.52 37.59 13.3 37.59"/>
+                    <polygon class="cls-1" points="13.08 37.59 17.34 32.13 17.48 32.24 13.3 37.59 13.08 37.59"/>
+                    <polygon class="cls-1" points="12.86 37.59 17.2 32.03 17.34 32.13 13.08 37.59 12.86 37.59"/>
+                    <polygon class="cls-1" points="12.63 37.59 17.07 31.92 17.2 32.03 12.86 37.59 12.63 37.59"/>
+                    <polygon class="cls-1" points="12.41 37.59 16.93 31.81 17.07 31.92 12.63 37.59 12.41 37.59"/>
+                    <polygon class="cls-1" points="12.19 37.59 16.79 31.71 16.93 31.81 12.41 37.59 12.19 37.59"/>
+                    <polygon class="cls-1" points="11.97 37.59 16.66 31.6 16.79 31.71 12.19 37.59 11.97 37.59"/>
+                    <polygon class="cls-1" points="11.75 37.59 16.52 31.49 16.66 31.6 11.97 37.59 11.75 37.59"/>
+                    <polygon class="cls-1" points="11.53 37.59 16.38 31.39 16.52 31.49 11.75 37.59 11.53 37.59"/>
+                    <polygon class="cls-1" points="11.31 37.59 16.25 31.28 16.38 31.39 11.53 37.59 11.31 37.59"/>
+                    <polygon class="cls-1" points="11.09 37.59 16.11 31.17 16.25 31.28 11.31 37.59 11.09 37.59"/>
+                    <polygon class="cls-1" points="10.87 37.59 15.97 31.07 16.11 31.17 11.09 37.59 10.87 37.59"/>
+                    <polygon class="cls-1" points="10.65 37.59 15.84 30.96 15.97 31.07 10.87 37.59 10.65 37.59"/>
+                    <polygon class="cls-1" points="10.43 37.59 15.7 30.85 15.84 30.96 10.65 37.59 10.43 37.59"/>
+                    <polygon class="cls-1" points="10.21 37.59 15.56 30.74 15.7 30.85 10.43 37.59 10.21 37.59"/>
+                    <polygon class="cls-1" points="9.99 37.59 15.43 30.64 15.56 30.74 10.21 37.59 9.99 37.59"/>
+                    <polygon class="cls-1" points="9.86 37.59 9.8 37.55 15.29 30.53 15.43 30.64 9.99 37.59 9.86 37.59"/>
+                    <rect class="cls-1" x="8.02" y="33.9" width="8.91" height="0.17"
+                          transform="translate(-21.99 22.9) rotate(-52)"/>
+                    <rect class="cls-1" x="7.89" y="33.79" width="8.91" height="0.17"
+                          transform="translate(-21.95 22.75) rotate(-52)"/>
+                    <rect class="cls-1" x="7.75" y="33.69" width="8.91" height="0.17"
+                          transform="translate(-21.92 22.6) rotate(-52)"/>
+                    <rect class="cls-1" x="7.61" y="33.58" width="8.91" height="0.17"
+                          transform="translate(-21.89 22.45) rotate(-52)"/>
+                    <rect class="cls-1" x="7.48" y="33.47" width="8.91" height="0.17"
+                          transform="translate(-21.86 22.3) rotate(-52)"/>
+                    <rect class="cls-1" x="7.34" y="33.36" width="8.91" height="0.17"
+                          transform="translate(-21.83 22.15) rotate(-52)"/>
+                    <rect class="cls-1" x="7.2" y="33.26" width="8.91" height="0.17"
+                          transform="translate(-21.8 22) rotate(-52)"/>
+                    <rect class="cls-1" x="7.07" y="33.15" width="8.91" height="0.17"
+                          transform="translate(-21.76 21.85) rotate(-52)"/>
+                    <rect class="cls-1" x="6.93" y="33.04" width="8.91" height="0.17"
+                          transform="translate(-21.73 21.7) rotate(-52)"/>
+                    <rect class="cls-1" x="6.79" y="32.94" width="8.91" height="0.17"
+                          transform="translate(-21.7 21.55) rotate(-52)"/>
+                    <rect class="cls-1" x="6.66" y="32.83" width="8.91" height="0.17"
+                          transform="translate(-21.67 21.41) rotate(-52)"/>
+                    <rect class="cls-1" x="6.52" y="32.72" width="8.91" height="0.17"
+                          transform="translate(-21.64 21.26) rotate(-52)"/>
+                    <rect class="cls-1" x="6.38" y="32.62" width="8.91" height="0.17"
+                          transform="translate(-21.61 21.11) rotate(-52)"/>
+                    <rect class="cls-1" x="6.24" y="32.51" width="8.91" height="0.17"
+                          transform="translate(-21.57 20.96) rotate(-52)"/>
+                    <rect class="cls-1" x="6.11" y="32.4" width="8.91" height="0.17"
+                          transform="translate(-21.54 20.81) rotate(-52)"/>
+                    <rect class="cls-1" x="5.97" y="32.3" width="8.91" height="0.17"
+                          transform="translate(-21.51 20.66) rotate(-52)"/>
+                    <rect class="cls-1" x="5.83" y="32.19" width="8.91" height="0.17"
+                          transform="translate(-21.48 20.51) rotate(-52)"/>
+                    <rect class="cls-1" x="5.7" y="32.08" width="8.91" height="0.17"
+                          transform="translate(-21.45 20.36) rotate(-52)"/>
+                    <rect class="cls-1" x="5.56" y="31.97" width="8.91" height="0.17"
+                          transform="translate(-21.42 20.21) rotate(-52)"/>
+                    <rect class="cls-1" x="5.42" y="31.87" width="8.91" height="0.17"
+                          transform="translate(-21.38 20.06) rotate(-52)"/>
+                    <rect class="cls-1" x="5.29" y="31.76" width="8.91" height="0.17"
+                          transform="translate(-21.35 19.92) rotate(-52)"/>
+                    <rect class="cls-1" x="5.15" y="31.65" width="8.91" height="0.17"
+                          transform="translate(-21.32 19.77) rotate(-52)"/>
+                    <rect class="cls-1" x="5.01" y="31.55" width="8.91" height="0.17"
+                          transform="translate(-21.29 19.62) rotate(-52)"/>
+                    <rect class="cls-1" x="4.88" y="31.44" width="8.91" height="0.17"
+                          transform="translate(-21.26 19.47) rotate(-52)"/>
+                    <rect class="cls-1" x="4.74" y="31.33" width="8.91" height="0.17"
+                          transform="translate(-21.23 19.32) rotate(-52)"/>
+                    <rect class="cls-1" x="4.6" y="31.23" width="8.91" height="0.17"
+                          transform="translate(-21.19 19.17) rotate(-52)"/>
+                    <rect class="cls-1" x="4.46" y="31.12" width="8.91" height="0.17"
+                          transform="translate(-21.16 19.02) rotate(-52)"/>
+                    <rect class="cls-1" x="4.33" y="31.01" width="8.91" height="0.17"
+                          transform="translate(-21.13 18.87) rotate(-52)"/>
+                    <rect class="cls-1" x="4.19" y="30.9" width="8.91" height="0.17"
+                          transform="translate(-21.1 18.72) rotate(-52)"/>
+                    <rect class="cls-1" x="4.05" y="30.8" width="8.91" height="0.17"
+                          transform="translate(-21.07 18.58) rotate(-52)"/>
+                    <rect class="cls-1" x="3.92" y="30.69" width="8.91" height="0.17"
+                          transform="translate(-21.04 18.43) rotate(-52)"/>
+                    <rect class="cls-1" x="3.78" y="30.58" width="8.91" height="0.17"
+                          transform="translate(-21 18.28) rotate(-52)"/>
+                    <polygon class="cls-1"
+                             points="5.42 34.13 5.29 34.02 10.73 27.05 10.83 27.05 10.91 27.11 5.42 34.13"/>
+                    <polygon class="cls-1" points="5.29 34.02 5.15 33.91 10.52 27.05 10.73 27.05 5.29 34.02"/>
+                    <polygon class="cls-1" points="5.15 33.91 5.01 33.81 10.29 27.05 10.52 27.05 5.15 33.91"/>
+                    <polygon class="cls-1" points="5.01 33.81 4.88 33.7 10.07 27.05 10.29 27.05 5.01 33.81"/>
+                    <polygon class="cls-1" points="4.88 33.7 4.74 33.59 9.85 27.05 10.07 27.05 4.88 33.7"/>
+                    <polygon class="cls-1" points="4.74 33.59 4.6 33.48 9.63 27.05 9.85 27.05 4.74 33.59"/>
+                    <polygon class="cls-1" points="4.6 33.48 4.46 33.38 9.41 27.05 9.63 27.05 4.6 33.48"/>
+                    <polygon class="cls-1" points="4.46 33.38 4.33 33.27 9.19 27.05 9.41 27.05 4.46 33.38"/>
+                    <polygon class="cls-1" points="4.33 33.27 4.2 33.17 4.2 33.16 8.97 27.05 9.19 27.05 4.33 33.27"/>
+                    <polygon class="cls-1" points="4.2 32.87 8.75 27.05 8.97 27.05 4.2 33.16 4.2 32.87"/>
+                    <polygon class="cls-1" points="4.2 32.59 8.53 27.05 8.75 27.05 4.2 32.87 4.2 32.59"/>
+                    <polygon class="cls-1" points="4.2 32.31 8.31 27.05 8.53 27.05 4.2 32.59 4.2 32.31"/>
+                    <polygon class="cls-1" points="4.2 32.03 8.09 27.05 8.31 27.05 4.2 32.31 4.2 32.03"/>
+                    <polygon class="cls-1" points="4.2 31.75 7.87 27.05 8.09 27.05 4.2 32.03 4.2 31.75"/>
+                    <polygon class="cls-1" points="4.2 31.46 7.65 27.05 7.87 27.05 4.2 31.75 4.2 31.46"/>
+                    <polygon class="cls-1" points="7.65 27.05 4.2 31.46 4.2 27.05 7.65 27.05"/>
+                </g>
+                <path class="cls-1"
+                      d="M38.35,50.5,40.68,52l0,0,.34.22,2.12,1.32A4.78,4.78,0,0,1,45.6,52.3a3.85,3.85,0,0,0-2.81.61c.92-3.28.74-6.34-1.35-8.38a5.09,5.09,0,0,0-.6-.52,3.27,3.27,0,0,1,.42,3.34h0A9.18,9.18,0,0,0,38.62,42c-.33-.33-.7-.66-1.12-1a7.42,7.42,0,0,1,.64,7.34l-.22,1.9Z"/>
+                <g class="cls-9">
+                    <polygon class="cls-1" points="45.57 53.56 45.6 53.51 45.6 53.56 45.57 53.56"/>
+                    <polygon class="cls-1" points="45.23 53.56 45.6 53.08 45.6 53.51 45.57 53.56 45.23 53.56"/>
+                    <polygon class="cls-1" points="44.89 53.56 45.6 52.65 45.6 53.08 45.23 53.56 44.89 53.56"/>
+                    <polygon class="cls-1" points="44.56 53.56 45.6 52.22 45.6 52.65 44.89 53.56 44.56 53.56"/>
+                    <polygon class="cls-1" points="44.22 53.56 45.6 51.79 45.6 52.22 44.56 53.56 44.22 53.56"/>
+                    <polygon class="cls-1" points="43.88 53.56 45.6 51.36 45.6 51.79 44.22 53.56 43.88 53.56"/>
+                    <polygon class="cls-1" points="43.55 53.56 45.6 50.93 45.6 51.36 43.88 53.56 43.55 53.56"/>
+                    <polygon class="cls-1" points="43.21 53.56 45.6 50.5 45.6 50.93 43.55 53.56 43.21 53.56"/>
+                    <polygon class="cls-1" points="42.87 53.56 45.6 50.07 45.6 50.5 43.21 53.56 42.87 53.56"/>
+                    <polygon class="cls-1" points="42.54 53.56 45.6 49.63 45.6 50.07 42.87 53.56 42.54 53.56"/>
+                    <polygon class="cls-1" points="42.2 53.56 45.6 49.2 45.6 49.63 42.54 53.56 42.2 53.56"/>
+                    <polygon class="cls-1" points="41.86 53.56 45.6 48.77 45.6 49.2 42.2 53.56 41.86 53.56"/>
+                    <polygon class="cls-1" points="41.53 53.56 45.6 48.34 45.6 48.77 41.86 53.56 41.53 53.56"/>
+                    <polygon class="cls-1" points="41.19 53.56 45.6 47.91 45.6 48.34 41.53 53.56 41.19 53.56"/>
+                    <polygon class="cls-1" points="40.85 53.56 45.6 47.48 45.6 47.91 41.19 53.56 40.85 53.56"/>
+                    <polygon class="cls-1" points="40.52 53.56 45.6 47.05 45.6 47.48 40.85 53.56 40.52 53.56"/>
+                    <polygon class="cls-1" points="40.18 53.56 45.6 46.62 45.6 47.05 40.52 53.56 40.18 53.56"/>
+                    <polygon class="cls-1" points="39.84 53.56 45.6 46.19 45.6 46.62 40.18 53.56 39.84 53.56"/>
+                    <polygon class="cls-1" points="39.51 53.56 45.6 45.76 45.6 46.19 39.84 53.56 39.51 53.56"/>
+                    <polygon class="cls-1"
+                             points="39.29 53.56 39.22 53.51 45.6 45.33 45.6 45.76 39.51 53.56 39.29 53.56"/>
+                    <polygon class="cls-1"
+                             points="39.22 53.51 39.01 53.34 45.53 44.99 45.6 45.05 45.6 45.33 39.22 53.51"/>
+                    <rect class="cls-1" x="36.86" y="48.95" width="10.6" height="0.27"
+                          transform="translate(-22.47 52.09) rotate(-52)"/>
+                    <rect class="cls-1" x="36.66" y="48.79" width="10.6" height="0.27"
+                          transform="translate(-22.42 51.87) rotate(-52)"/>
+                    <rect class="cls-1" x="36.45" y="48.62" width="10.6" height="0.27"
+                          transform="translate(-22.38 51.64) rotate(-52)"/>
+                    <rect class="cls-1" x="36.24" y="48.46" width="10.6" height="0.27"
+                          transform="translate(-22.33 51.41) rotate(-52)"/>
+                    <rect class="cls-1" x="36.03" y="48.3" width="10.6" height="0.27"
+                          transform="translate(-22.28 51.18) rotate(-52)"/>
+                    <rect class="cls-1" x="35.82" y="48.14" width="10.6" height="0.27"
+                          transform="translate(-22.23 50.96) rotate(-52)"/>
+                    <rect class="cls-1" x="35.61" y="47.97" width="10.6" height="0.27"
+                          transform="translate(-22.18 50.73) rotate(-52)"/>
+                    <polygon class="cls-1"
+                             points="37.54 52.2 37.5 52.16 37.5 51.82 43.86 43.68 44.07 43.85 37.54 52.2"/>
+                    <polygon class="cls-1" points="37.5 51.39 43.65 43.52 43.86 43.68 37.5 51.82 37.5 51.39"/>
+                    <polygon class="cls-1" points="37.5 50.96 43.44 43.36 43.65 43.52 37.5 51.39 37.5 50.96"/>
+                    <polygon class="cls-1" points="37.5 50.53 43.23 43.19 43.44 43.36 37.5 50.96 37.5 50.53"/>
+                    <polygon class="cls-1" points="37.5 50.1 43.02 43.03 43.23 43.19 37.5 50.53 37.5 50.1"/>
+                    <polygon class="cls-1" points="37.5 49.67 42.81 42.87 43.02 43.03 37.5 50.1 37.5 49.67"/>
+                    <polygon class="cls-1" points="37.5 49.24 42.61 42.7 42.81 42.87 37.5 49.67 37.5 49.24"/>
+                    <polygon class="cls-1" points="37.5 48.81 42.4 42.54 42.61 42.7 37.5 49.24 37.5 48.81"/>
+                    <polygon class="cls-1" points="37.5 48.38 42.19 42.38 42.4 42.54 37.5 48.81 37.5 48.38"/>
+                    <polygon class="cls-1" points="37.5 47.95 41.98 42.21 42.19 42.38 37.5 48.38 37.5 47.95"/>
+                    <polygon class="cls-1" points="37.5 47.52 41.77 42.05 41.98 42.21 37.5 47.95 37.5 47.52"/>
+                    <polygon class="cls-1" points="37.5 47.09 41.56 41.89 41.77 42.05 37.5 47.52 37.5 47.09"/>
+                    <polygon class="cls-1" points="37.5 46.66 41.35 41.72 41.56 41.89 37.5 47.09 37.5 46.66"/>
+                    <polygon class="cls-1" points="37.5 46.22 41.14 41.56 41.35 41.72 37.5 46.66 37.5 46.22"/>
+                    <polygon class="cls-1" points="37.5 45.79 40.93 41.4 41.14 41.56 37.5 46.22 37.5 45.79"/>
+                    <polygon class="cls-1" points="37.5 45.36 40.73 41.23 40.93 41.4 37.5 45.79 37.5 45.36"/>
+                    <polygon class="cls-1" points="37.5 44.93 40.52 41.07 40.73 41.23 37.5 45.36 37.5 44.93"/>
+                    <polygon class="cls-1" points="37.5 44.5 40.25 40.98 40.41 40.98 40.52 41.07 37.5 44.93 37.5 44.5"/>
+                    <polygon class="cls-1" points="37.5 44.07 39.91 40.98 40.25 40.98 37.5 44.5 37.5 44.07"/>
+                    <polygon class="cls-1" points="37.5 43.64 39.57 40.98 39.91 40.98 37.5 44.07 37.5 43.64"/>
+                    <polygon class="cls-1" points="37.5 43.21 39.24 40.98 39.57 40.98 37.5 43.64 37.5 43.21"/>
+                    <polygon class="cls-1" points="37.5 42.78 38.9 40.98 39.24 40.98 37.5 43.21 37.5 42.78"/>
+                    <polygon class="cls-1" points="37.5 42.35 38.56 40.98 38.9 40.98 37.5 42.78 37.5 42.35"/>
+                    <polygon class="cls-1" points="37.5 41.92 38.23 40.98 38.56 40.98 37.5 42.35 37.5 41.92"/>
+                    <polygon class="cls-1" points="37.5 41.48 37.89 40.98 38.23 40.98 37.5 41.92 37.5 41.48"/>
+                    <polygon class="cls-1" points="37.5 41.05 37.55 40.98 37.89 40.98 37.5 41.48 37.5 41.05"/>
+                    <polygon class="cls-1" points="37.55 40.98 37.5 41.05 37.5 40.98 37.55 40.98"/>
+                </g>
+                <path class="cls-1"
+                      d="M34.4,48.68c-.94-.64-1.89-1.29-2.84-2L28.8,44.77c-.93-.66-1.85-1.33-2.77-2s-1.87-1.39-2.8-2.1l-2.72-2.12-1-.77L17.9,36.42l-.09-.07-5,1.24a1.21,1.21,0,0,0,.16.16c.74.73,1.51,1.47,2.3,2.2s1.61,1.47,2.44,2.19,1.42,1.22,2.14,1.81l.44.35c.91.74,1.79,1.42,2.65,2s1.91,1.36,2.81,1.94c.59.38,1.16.74,1.71,1.07l1.42.81c1.12.62,2.25,1.19,3.38,1.7l5.07-1.24L35,49.11Z"/>
+                <g class="cls-10">
+                    <polygon class="cls-1" points="37.11 51.87 37.29 51.64 37.29 51.87 37.11 51.87"/>
+                    <polygon class="cls-1" points="36.91 51.87 37.29 51.37 37.29 51.64 37.11 51.87 36.91 51.87"/>
+                    <polygon class="cls-1" points="36.7 51.87 37.29 51.11 37.29 51.37 36.91 51.87 36.7 51.87"/>
+                    <polygon class="cls-1" points="36.5 51.87 37.29 50.85 37.29 51.11 36.7 51.87 36.5 51.87"/>
+                    <polygon class="cls-1" points="36.29 51.87 37.29 50.59 37.29 50.85 36.5 51.87 36.29 51.87"/>
+                    <polygon class="cls-1" points="36.09 51.87 37.29 50.33 37.29 50.59 36.29 51.87 36.09 51.87"/>
+                    <polygon class="cls-1" points="35.88 51.87 37.29 50.06 37.29 50.33 36.09 51.87 35.88 51.87"/>
+                    <polygon class="cls-1" points="35.68 51.87 37.29 49.8 37.29 50.06 35.88 51.87 35.68 51.87"/>
+                    <polygon class="cls-1" points="35.47 51.87 37.29 49.54 37.29 49.8 35.68 51.87 35.47 51.87"/>
+                    <polygon class="cls-1" points="35.27 51.87 37.29 49.28 37.29 49.54 35.47 51.87 35.27 51.87"/>
+                    <polygon class="cls-1" points="35.06 51.87 37.29 49.02 37.29 49.28 35.27 51.87 35.06 51.87"/>
+                    <polygon class="cls-1" points="34.86 51.87 37.29 48.75 37.29 49.02 35.06 51.87 34.86 51.87"/>
+                    <polygon class="cls-1" points="34.66 51.87 37.29 48.49 37.29 48.75 34.86 51.87 34.66 51.87"/>
+                    <polygon class="cls-1"
+                             points="34.45 51.87 37.23 48.3 37.29 48.34 37.29 48.49 34.66 51.87 34.45 51.87"/>
+                    <polygon class="cls-1" points="34.24 51.87 37.11 48.2 37.23 48.3 34.45 51.87 34.24 51.87"/>
+                    <polygon class="cls-1" points="34.04 51.87 36.98 48.1 37.11 48.2 34.24 51.87 34.04 51.87"/>
+                    <polygon class="cls-1" points="33.84 51.87 36.85 48 36.98 48.1 34.04 51.87 33.84 51.87"/>
+                    <polygon class="cls-1" points="33.63 51.87 36.73 47.9 36.85 48 33.84 51.87 33.63 51.87"/>
+                    <polygon class="cls-1" points="33.43 51.87 36.6 47.8 36.73 47.9 33.63 51.87 33.43 51.87"/>
+                    <polygon class="cls-1" points="33.22 51.87 36.47 47.7 36.6 47.8 33.43 51.87 33.22 51.87"/>
+                    <polygon class="cls-1" points="33.02 51.87 36.34 47.61 36.47 47.7 33.22 51.87 33.02 51.87"/>
+                    <polygon class="cls-1" points="32.81 51.87 36.22 47.51 36.34 47.61 33.02 51.87 32.81 51.87"/>
+                    <polygon class="cls-1" points="32.61 51.87 36.09 47.41 36.22 47.51 32.81 51.87 32.61 51.87"/>
+                    <polygon class="cls-1" points="32.4 51.87 35.96 47.31 36.09 47.41 32.61 51.87 32.4 51.87"/>
+                    <polygon class="cls-1" points="32.2 51.87 35.84 47.21 35.96 47.31 32.4 51.87 32.2 51.87"/>
+                    <polygon class="cls-1" points="31.99 51.87 35.71 47.11 35.84 47.21 32.2 51.87 31.99 51.87"/>
+                    <polygon class="cls-1" points="31.79 51.87 35.58 47.01 35.71 47.11 31.99 51.87 31.79 51.87"/>
+                    <polygon class="cls-1" points="31.58 51.87 35.45 46.91 35.58 47.01 31.79 51.87 31.58 51.87"/>
+                    <polygon class="cls-1" points="31.38 51.87 35.33 46.81 35.45 46.91 31.58 51.87 31.38 51.87"/>
+                    <polygon class="cls-1" points="31.17 51.87 35.2 46.71 35.33 46.81 31.38 51.87 31.17 51.87"/>
+                    <polygon class="cls-1" points="30.97 51.87 35.07 46.61 35.2 46.71 31.17 51.87 30.97 51.87"/>
+                    <polygon class="cls-1" points="30.77 51.87 34.95 46.51 35.07 46.61 30.97 51.87 30.77 51.87"/>
+                    <polygon class="cls-1" points="30.56 51.87 34.82 46.41 34.95 46.51 30.77 51.87 30.56 51.87"/>
+                    <polygon class="cls-1" points="30.36 51.87 34.69 46.31 34.82 46.41 30.56 51.87 30.36 51.87"/>
+                    <polygon class="cls-1" points="30.15 51.87 34.56 46.22 34.69 46.31 30.36 51.87 30.15 51.87"/>
+                    <polygon class="cls-1" points="29.95 51.87 34.44 46.12 34.56 46.22 30.15 51.87 29.95 51.87"/>
+                    <polygon class="cls-1" points="29.74 51.87 34.31 46.02 34.44 46.12 29.95 51.87 29.74 51.87"/>
+                    <polygon class="cls-1" points="29.54 51.87 34.18 45.92 34.31 46.02 29.74 51.87 29.54 51.87"/>
+                    <polygon class="cls-1" points="29.33 51.87 34.06 45.82 34.18 45.92 29.54 51.87 29.33 51.87"/>
+                    <polygon class="cls-1" points="29.13 51.87 33.93 45.72 34.06 45.82 29.33 51.87 29.13 51.87"/>
+                    <polygon class="cls-1" points="28.92 51.87 33.8 45.62 33.93 45.72 29.13 51.87 28.92 51.87"/>
+                    <polygon class="cls-1" points="28.72 51.87 33.67 45.52 33.8 45.62 28.92 51.87 28.72 51.87"/>
+                    <polygon class="cls-1" points="28.51 51.87 33.55 45.42 33.67 45.52 28.72 51.87 28.51 51.87"/>
+                    <polygon class="cls-1" points="28.31 51.87 33.42 45.32 33.55 45.42 28.51 51.87 28.31 51.87"/>
+                    <polygon class="cls-1" points="28.1 51.87 33.29 45.22 33.42 45.32 28.31 51.87 28.1 51.87"/>
+                    <polygon class="cls-1" points="27.9 51.87 33.17 45.12 33.29 45.22 28.1 51.87 27.9 51.87"/>
+                    <polygon class="cls-1" points="27.69 51.87 33.04 45.02 33.17 45.12 27.9 51.87 27.69 51.87"/>
+                    <polygon class="cls-1" points="27.49 51.87 32.91 44.92 33.04 45.02 27.69 51.87 27.49 51.87"/>
+                    <polygon class="cls-1" points="27.29 51.87 32.78 44.83 32.91 44.92 27.49 51.87 27.29 51.87"/>
+                    <polygon class="cls-1" points="27.08 51.87 32.66 44.73 32.78 44.83 27.29 51.87 27.08 51.87"/>
+                    <polygon class="cls-1"
+                             points="26.99 51.87 26.92 51.81 32.53 44.63 32.66 44.73 27.08 51.87 26.99 51.87"/>
+                    <rect class="cls-1" x="25.1" y="48.09" width="9.12" height="0.16"
+                          transform="translate(-26.56 41.89) rotate(-52)"/>
+                    <rect class="cls-1" x="24.98" y="47.99" width="9.12" height="0.16"
+                          transform="translate(-26.53 41.75) rotate(-52)"/>
+                    <rect class="cls-1" x="24.85" y="47.89" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -26.5, 41.61)"/>
+                    <rect class="cls-1" x="24.72" y="47.79" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -26.47, 41.47)"/>
+                    <rect class="cls-1" x="24.59" y="47.69" width="9.12" height="0.16"
+                          transform="translate(-26.44 41.33) rotate(-52)"/>
+                    <rect class="cls-1" x="24.47" y="47.59" width="9.12" height="0.16"
+                          transform="translate(-26.41 41.2) rotate(-52)"/>
+                    <rect class="cls-1" x="24.34" y="47.49" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -26.38, 41.06)"/>
+                    <rect class="cls-1" x="24.21" y="47.39" width="9.12" height="0.16"
+                          transform="translate(-26.35 40.92) rotate(-52)"/>
+                    <rect class="cls-1" x="24.09" y="47.29" width="9.12" height="0.16"
+                          transform="translate(-26.32 40.78) rotate(-52)"/>
+                    <rect class="cls-1" x="23.96" y="47.19" width="9.12" height="0.16"
+                          transform="translate(-26.29 40.64) rotate(-52)"/>
+                    <rect class="cls-1" x="23.83" y="47.09" width="9.12" height="0.16"
+                          transform="translate(-26.26 40.5) rotate(-52)"/>
+                    <rect class="cls-1" x="23.7" y="47" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -26.23, 40.37)"/>
+                    <rect class="cls-1" x="23.58" y="46.9" width="9.12" height="0.16"
+                          transform="translate(-26.2 40.23) rotate(-52)"/>
+                    <rect class="cls-1" x="23.45" y="46.8" width="9.12" height="0.16"
+                          transform="translate(-26.18 40.09) rotate(-52)"/>
+                    <rect class="cls-1" x="23.32" y="46.7" width="9.12" height="0.16"
+                          transform="translate(-26.15 39.95) rotate(-52)"/>
+                    <rect class="cls-1" x="23.2" y="46.6" width="9.12" height="0.16"
+                          transform="translate(-26.12 39.81) rotate(-52)"/>
+                    <rect class="cls-1" x="23.07" y="46.5" width="9.12" height="0.16"
+                          transform="translate(-26.09 39.67) rotate(-52)"/>
+                    <rect class="cls-1" x="22.94" y="46.4" width="9.12" height="0.16"
+                          transform="translate(-26.06 39.54) rotate(-52)"/>
+                    <rect class="cls-1" x="22.81" y="46.3" width="9.12" height="0.16"
+                          transform="translate(-26.03 39.4) rotate(-52)"/>
+                    <rect class="cls-1" x="22.69" y="46.2" width="9.12" height="0.16"
+                          transform="translate(-26 39.26) rotate(-52)"/>
+                    <rect class="cls-1" x="22.56" y="46.1" width="9.12" height="0.16"
+                          transform="translate(-25.97 39.12) rotate(-52)"/>
+                    <rect class="cls-1" x="22.43" y="46" width="9.12" height="0.16"
+                          transform="translate(-25.94 38.98) rotate(-52)"/>
+                    <rect class="cls-1" x="22.31" y="45.9" width="9.12" height="0.16"
+                          transform="translate(-25.91 38.84) rotate(-52)"/>
+                    <rect class="cls-1" x="22.18" y="45.8" width="9.12" height="0.16"
+                          transform="translate(-25.88 38.71) rotate(-52)"/>
+                    <rect class="cls-1" x="22.05" y="45.7" width="9.12" height="0.16"
+                          transform="translate(-25.85 38.57) rotate(-52)"/>
+                    <rect class="cls-1" x="21.92" y="45.6" width="9.12" height="0.16"
+                          transform="translate(-25.82 38.43) rotate(-52)"/>
+                    <rect class="cls-1" x="21.8" y="45.51" width="9.12" height="0.16"
+                          transform="translate(-25.79 38.29) rotate(-52)"/>
+                    <rect class="cls-1" x="21.67" y="45.41" width="9.12" height="0.16"
+                          transform="translate(-25.76 38.15) rotate(-52)"/>
+                    <rect class="cls-1" x="21.54" y="45.31" width="9.12" height="0.16"
+                          transform="translate(-25.73 38.01) rotate(-52)"/>
+                    <rect class="cls-1" x="21.42" y="45.21" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.7, 37.88)"/>
+                    <rect class="cls-1" x="21.29" y="45.11" width="9.12" height="0.16"
+                          transform="translate(-25.68 37.74) rotate(-52)"/>
+                    <rect class="cls-1" x="21.16" y="45.01" width="9.12" height="0.16"
+                          transform="translate(-25.65 37.6) rotate(-52)"/>
+                    <rect class="cls-1" x="21.03" y="44.91" width="9.12" height="0.16"
+                          transform="translate(-25.62 37.46) rotate(-52)"/>
+                    <rect class="cls-1" x="20.91" y="44.81" width="9.12" height="0.16"
+                          transform="translate(-25.59 37.32) rotate(-52)"/>
+                    <rect class="cls-1" x="20.78" y="44.71" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.56, 37.18)"/>
+                    <rect class="cls-1" x="20.65" y="44.61" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.53, 37.05)"/>
+                    <rect class="cls-1" x="20.53" y="44.51" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.5, 36.91)"/>
+                    <rect class="cls-1" x="20.4" y="44.41" width="9.12" height="0.16"
+                          transform="translate(-25.47 36.77) rotate(-52)"/>
+                    <rect class="cls-1" x="20.27" y="44.31" width="9.12" height="0.16"
+                          transform="translate(-25.44 36.63) rotate(-52)"/>
+                    <rect class="cls-1" x="20.14" y="44.21" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.41, 36.49)"/>
+                    <rect class="cls-1" x="20.02" y="44.11" width="9.12" height="0.16"
+                          transform="translate(-25.38 36.35) rotate(-52)"/>
+                    <rect class="cls-1" x="19.89" y="44.02" width="9.12" height="0.16"
+                          transform="translate(-25.35 36.21) rotate(-52)"/>
+                    <rect class="cls-1" x="19.76" y="43.92" width="9.12" height="0.16"
+                          transform="translate(-25.32 36.08) rotate(-52)"/>
+                    <rect class="cls-1" x="19.64" y="43.82" width="9.12" height="0.16"
+                          transform="translate(-25.29 35.94) rotate(-52)"/>
+                    <rect class="cls-1" x="19.51" y="43.72" width="9.12" height="0.16"
+                          transform="translate(-25.26 35.8) rotate(-52)"/>
+                    <rect class="cls-1" x="19.38" y="43.62" width="9.12" height="0.16"
+                          transform="translate(-25.23 35.66) rotate(-52)"/>
+                    <rect class="cls-1" x="19.25" y="43.52" width="9.12" height="0.16"
+                          transform="translate(-25.21 35.52) rotate(-52)"/>
+                    <rect class="cls-1" x="19.13" y="43.42" width="9.12" height="0.16"
+                          transform="translate(-25.18 35.38) rotate(-52)"/>
+                    <rect class="cls-1" x="19" y="43.32" width="9.12" height="0.16"
+                          transform="translate(-25.15 35.25) rotate(-52)"/>
+                    <rect class="cls-1" x="18.87" y="43.22" width="9.12" height="0.16"
+                          transform="translate(-25.12 35.11) rotate(-52)"/>
+                    <rect class="cls-1" x="18.75" y="43.12" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.09, 34.97)"/>
+                    <rect class="cls-1" x="18.62" y="43.02" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.06, 34.83)"/>
+                    <rect class="cls-1" x="18.49" y="42.92" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -25.03, 34.69)"/>
+                    <rect class="cls-1" x="18.37" y="42.82" width="9.12" height="0.16"
+                          transform="translate(-25 34.55) rotate(-52)"/>
+                    <rect class="cls-1" x="18.24" y="42.72" width="9.12" height="0.16"
+                          transform="translate(-24.97 34.42) rotate(-52)"/>
+                    <rect class="cls-1" x="18.11" y="42.63" width="9.12" height="0.16"
+                          transform="translate(-24.94 34.28) rotate(-52)"/>
+                    <rect class="cls-1" x="17.98" y="42.53" width="9.12" height="0.16"
+                          transform="translate(-24.91 34.14) rotate(-52)"/>
+                    <rect class="cls-1" x="17.86" y="42.43" width="9.12" height="0.16"
+                          transform="translate(-24.88 34) rotate(-52)"/>
+                    <rect class="cls-1" x="17.73" y="42.33" width="9.12" height="0.16"
+                          transform="translate(-24.85 33.86) rotate(-52)"/>
+                    <rect class="cls-1" x="17.6" y="42.23" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -24.82, 33.72)"/>
+                    <rect class="cls-1" x="17.48" y="42.13" width="9.12" height="0.16"
+                          transform="translate(-24.79 33.59) rotate(-52)"/>
+                    <rect class="cls-1" x="17.35" y="42.03" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -24.76, 33.45)"/>
+                    <rect class="cls-1" x="17.22" y="41.93" width="9.12" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -24.73, 33.31)"/>
+                    <rect class="cls-1" x="17.09" y="41.83" width="9.12" height="0.16"
+                          transform="translate(-24.71 33.17) rotate(-52)"/>
+                    <rect class="cls-1" x="16.97" y="41.73" width="9.12" height="0.16"
+                          transform="translate(-24.68 33.03) rotate(-52)"/>
+                    <rect class="cls-1" x="16.52" y="40.98" width="9.12" height="0.96"
+                          transform="translate(-24.57 32.55) rotate(-52)"/>
+                    <rect class="cls-1" x="15.76" y="40.39" width="9.12" height="0.96"
+                          transform="translate(-24.4 31.72) rotate(-52)"/>
+                    <rect class="cls-1" x="15" y="39.8" width="9.12" height="0.96"
+                          transform="translate(-24.22 30.9) rotate(-52)"/>
+                    <polygon class="cls-1"
+                             points="16.38 43.57 15.62 42.98 20.8 36.35 21.94 36.35 21.99 36.39 16.38 43.57"/>
+                    <polygon class="cls-1" points="15.62 42.98 14.86 42.39 19.58 36.35 20.8 36.35 15.62 42.98"/>
+                    <polygon class="cls-1" points="14.86 42.39 14.1 41.8 18.35 36.35 19.58 36.35 14.86 42.39"/>
+                    <polygon class="cls-1" points="14.1 41.8 13.34 41.2 17.13 36.35 18.35 36.35 14.1 41.8"/>
+                    <polygon class="cls-1"
+                             points="13.34 41.2 12.77 40.76 12.77 40.37 15.91 36.35 17.13 36.35 13.34 41.2"/>
+                    <polygon class="cls-1" points="12.77 40.09 15.69 36.35 15.91 36.35 12.77 40.37 12.77 40.09"/>
+                    <polygon class="cls-1" points="12.77 39.8 15.47 36.35 15.69 36.35 12.77 40.09 12.77 39.8"/>
+                    <polygon class="cls-1" points="12.77 39.52 15.25 36.35 15.47 36.35 12.77 39.8 12.77 39.52"/>
+                    <polygon class="cls-1" points="12.77 39.24 15.03 36.35 15.25 36.35 12.77 39.52 12.77 39.24"/>
+                    <polygon class="cls-1" points="12.77 38.96 14.8 36.35 15.03 36.35 12.77 39.24 12.77 38.96"/>
+                    <polygon class="cls-1" points="12.77 38.68 14.59 36.35 14.8 36.35 12.77 38.96 12.77 38.68"/>
+                    <polygon class="cls-1" points="12.77 38.39 14.37 36.35 14.59 36.35 12.77 38.68 12.77 38.39"/>
+                    <polygon class="cls-1" points="12.77 38.11 14.14 36.35 14.37 36.35 12.77 38.39 12.77 38.11"/>
+                    <polygon class="cls-1" points="12.77 37.83 13.92 36.35 14.14 36.35 12.77 38.11 12.77 37.83"/>
+                    <polygon class="cls-1" points="12.77 37.55 13.7 36.35 13.92 36.35 12.77 37.83 12.77 37.55"/>
+                    <polygon class="cls-1" points="12.77 37.27 13.48 36.35 13.7 36.35 12.77 37.55 12.77 37.27"/>
+                    <polygon class="cls-1" points="12.77 36.98 13.26 36.35 13.48 36.35 12.77 37.27 12.77 36.98"/>
+                    <polygon class="cls-1" points="12.77 36.7 13.04 36.35 13.26 36.35 12.77 36.98 12.77 36.7"/>
+                    <polygon class="cls-1" points="12.77 36.42 12.82 36.35 13.04 36.35 12.77 36.7 12.77 36.42"/>
+                    <polygon class="cls-1" points="12.82 36.35 12.77 36.42 12.77 36.35 12.82 36.35"/>
+                </g>
+                <path class="cls-1"
+                      d="M32.38,51.94a35.59,35.59,0,0,0,4.19,1.59l.15,0a9.39,9.39,0,0,0-2.87,2.11,13.22,13.22,0,0,1,6.51-1.21,6,6,0,0,1-1.17,2.8,6.07,6.07,0,0,0,2.09-2.14A7.3,7.3,0,0,0,42.2,59a7.63,7.63,0,0,1,.19-4.26C46,57,45,56.36,48.1,58.16c.1.05.29,0,.4,0,.34.19,1,.77,1.4,1a1.14,1.14,0,0,0-.58-1c-.88-.5-.78-.29-8.25-5.09l-.64-.41-.18-.12c-.78-.5-1.58-1-2.39-1.56l-.56-.37h0l-5.07,1.24Z"/>
+                <g class="cls-11">
+                    <path class="cls-1"
+                          d="M53.16,59.69A10.3,10.3,0,0,1,55.88,61V59.89l-2.24-1.74-1,1.27A5.12,5.12,0,0,0,53.16,59.69Z"/>
+                    <path class="cls-1"
+                          d="M53.09,62.25a14.26,14.26,0,0,1-1.83-1L50,62.82h4.35C53.92,62.64,53.5,62.46,53.09,62.25Z"/>
+                    <path class="cls-1" d="M47.76,59.73l-2.41,3.09h.29l2.34-3A.73.73,0,0,1,47.76,59.73Z"/>
+                    <path class="cls-1" d="M47.6,59.55l-2.55,3.27h.3l2.41-3.09A.55.55,0,0,1,47.6,59.55Z"/>
+                    <path class="cls-1" d="M47.51,59.29l-2.76,3.53h.3l2.55-3.27A.62.62,0,0,1,47.51,59.29Z"/>
+                    <path class="cls-1" d="M47.59,58.81l-3.13,4h.29l2.76-3.53A.91.91,0,0,1,47.59,58.81Z"/>
+                    <path class="cls-1"
+                          d="M47.91,58.4l2.29-2.94L50,55.32l-5.86,7.5h.3l3.13-4A.92.92,0,0,1,47.91,58.4Z"/>
+                    <polygon class="cls-1" points="43.86 62.82 49.83 55.17 50.02 55.32 44.16 62.82 43.86 62.82"/>
+                    <polygon class="cls-1" points="43.57 62.82 49.65 55.03 49.83 55.17 43.86 62.82 43.57 62.82"/>
+                    <polygon class="cls-1" points="43.27 62.82 49.47 54.88 49.65 55.03 43.57 62.82 43.27 62.82"/>
+                    <polygon class="cls-1" points="42.97 62.82 49.28 54.74 49.47 54.88 43.27 62.82 42.97 62.82"/>
+                    <polygon class="cls-1" points="42.68 62.82 49.1 54.6 49.28 54.74 42.97 62.82 42.68 62.82"/>
+                    <polygon class="cls-1" points="42.38 62.82 48.91 54.45 49.1 54.6 42.68 62.82 42.38 62.82"/>
+                    <polygon class="cls-1" points="42.08 62.82 48.73 54.31 48.91 54.45 42.38 62.82 42.08 62.82"/>
+                    <polygon class="cls-1" points="41.78 62.82 48.54 54.16 48.73 54.31 42.08 62.82 41.78 62.82"/>
+                    <polygon class="cls-1" points="41.49 62.82 48.36 54.02 48.54 54.16 41.78 62.82 41.49 62.82"/>
+                    <polygon class="cls-1" points="41.19 62.82 48.18 53.88 48.36 54.02 41.49 62.82 41.19 62.82"/>
+                    <polygon class="cls-1" points="40.9 62.82 47.99 53.73 48.18 53.88 41.19 62.82 40.9 62.82"/>
+                    <polygon class="cls-1" points="40.6 62.82 47.81 53.59 47.99 53.73 40.9 62.82 40.6 62.82"/>
+                    <polygon class="cls-1" points="40.3 62.82 47.62 53.45 47.81 53.59 40.6 62.82 40.3 62.82"/>
+                    <polygon class="cls-1"
+                             points="40.05 62.82 40.02 62.79 47.44 53.3 47.62 53.45 40.3 62.82 40.05 62.82"/>
+                    <rect class="cls-1" x="37.62" y="57.86" width="12.04" height="0.23"
+                          transform="translate(-28.91 56.67) rotate(-52)"/>
+                    <rect class="cls-1" x="37.43" y="57.71" width="12.04" height="0.23"
+                          transform="translate(-28.87 56.47) rotate(-52)"/>
+                    <rect class="cls-1" x="37.25" y="57.57" width="12.04" height="0.23"
+                          transform="translate(-28.83 56.27) rotate(-52)"/>
+                    <rect class="cls-1" x="37.06" y="57.43" width="12.04" height="0.23"
+                          transform="translate(-28.79 56.07) rotate(-52)"/>
+                    <rect class="cls-1" x="36.88" y="57.28" width="12.04" height="0.23"
+                          transform="translate(-28.74 55.87) rotate(-52)"/>
+                    <rect class="cls-1" x="36.7" y="57.14" width="12.04" height="0.23"
+                          transform="translate(-28.7 55.67) rotate(-52)"/>
+                    <rect class="cls-1" x="36.51" y="56.99" width="12.04" height="0.23"
+                          transform="translate(-28.66 55.47) rotate(-52)"/>
+                    <rect class="cls-1" x="36.33" y="56.85" width="12.04" height="0.23"
+                          transform="translate(-28.61 55.27) rotate(-52)"/>
+                    <rect class="cls-1" x="36.14" y="56.71" width="12.04" height="0.23"
+                          transform="translate(-28.57 55.07) rotate(-52)"/>
+                    <rect class="cls-1" x="35.96" y="56.56" width="12.04" height="0.23"
+                          transform="translate(-28.53 54.87) rotate(-52)"/>
+                    <rect class="cls-1" x="35.77" y="56.42" width="12.04" height="0.23"
+                          transform="translate(-28.49 54.67) rotate(-52)"/>
+                    <rect class="cls-1" x="35.59" y="56.27" width="12.04" height="0.23"
+                          transform="translate(-28.44 54.47) rotate(-52)"/>
+                    <rect class="cls-1" x="35.41" y="56.13" width="12.04" height="0.23"
+                          transform="translate(-28.4 54.27) rotate(-52)"/>
+                    <rect class="cls-1" x="35.22" y="55.99" width="12.04" height="0.23"
+                          transform="translate(-28.36 54.06) rotate(-52)"/>
+                    <rect class="cls-1" x="35.04" y="55.84" width="12.04" height="0.23"
+                          transform="translate(-28.32 53.86) rotate(-52)"/>
+                    <rect class="cls-1" x="34.85" y="55.7" width="12.04" height="0.23"
+                          transform="translate(-28.27 53.66) rotate(-52)"/>
+                    <rect class="cls-1" x="34.67" y="55.55" width="12.04" height="0.23"
+                          transform="translate(-28.23 53.46) rotate(-52)"/>
+                    <rect class="cls-1" x="34.48" y="55.41" width="12.04" height="0.23"
+                          transform="translate(-28.19 53.26) rotate(-52)"/>
+                    <polygon class="cls-1" points="36.71 60.2 36.52 60.06 43.9 50.62 44 50.62 44.12 50.71 36.71 60.2"/>
+                    <polygon class="cls-1" points="36.52 60.06 36.34 59.91 43.6 50.62 43.9 50.62 36.52 60.06"/>
+                    <polygon class="cls-1" points="36.34 59.91 36.15 59.77 43.3 50.62 43.6 50.62 36.34 59.91"/>
+                    <polygon class="cls-1" points="36.15 59.77 35.97 59.63 43.01 50.62 43.3 50.62 36.15 59.77"/>
+                    <polygon class="cls-1" points="35.97 59.63 35.78 59.48 42.71 50.62 43.01 50.62 35.97 59.63"/>
+                    <polygon class="cls-1" points="35.78 59.48 35.6 59.34 42.41 50.62 42.71 50.62 35.78 59.48"/>
+                    <polygon class="cls-1" points="35.6 59.34 35.42 59.19 42.12 50.62 42.41 50.62 35.6 59.34"/>
+                    <polygon class="cls-1" points="35.42 59.19 35.23 59.05 41.82 50.62 42.12 50.62 35.42 59.19"/>
+                    <polygon class="cls-1" points="35.23 59.05 35.05 58.91 41.52 50.62 41.82 50.62 35.23 59.05"/>
+                    <polygon class="cls-1" points="35.05 58.91 34.86 58.76 41.23 50.62 41.52 50.62 35.05 58.91"/>
+                    <polygon class="cls-1" points="34.86 58.76 34.68 58.62 40.93 50.62 41.23 50.62 34.86 58.76"/>
+                    <polygon class="cls-1" points="34.68 58.62 34.49 58.47 40.63 50.62 40.93 50.62 34.68 58.62"/>
+                    <polygon class="cls-1" points="34.49 58.47 34.31 58.33 40.34 50.62 40.63 50.62 34.49 58.47"/>
+                    <polygon class="cls-1" points="34.31 58.33 34.13 58.19 40.04 50.62 40.34 50.62 34.31 58.33"/>
+                    <polygon class="cls-1" points="34.13 58.19 33.94 58.04 39.74 50.62 40.04 50.62 34.13 58.19"/>
+                    <polygon class="cls-1" points="33.94 58.04 33.76 57.9 39.45 50.62 39.74 50.62 33.94 58.04"/>
+                    <polygon class="cls-1" points="33.76 57.9 33.57 57.75 39.15 50.62 39.45 50.62 33.76 57.9"/>
+                    <polygon class="cls-1" points="33.57 57.75 33.39 57.61 38.85 50.62 39.15 50.62 33.57 57.75"/>
+                    <polygon class="cls-1" points="33.39 57.61 33.2 57.47 38.56 50.62 38.85 50.62 33.39 57.61"/>
+                    <polygon class="cls-1" points="33.2 57.47 33.02 57.32 38.26 50.62 38.56 50.62 33.2 57.47"/>
+                    <polygon class="cls-1" points="33.02 57.32 32.84 57.18 37.96 50.62 38.26 50.62 33.02 57.32"/>
+                    <polygon class="cls-1" points="32.84 57.18 32.65 57.03 37.66 50.62 37.96 50.62 32.84 57.18"/>
+                    <polygon class="cls-1" points="32.65 57.03 32.47 56.89 37.37 50.62 37.66 50.62 32.65 57.03"/>
+                    <polygon class="cls-1" points="32.47 56.89 32.28 56.75 37.07 50.62 37.37 50.62 32.47 56.89"/>
+                    <polygon class="cls-1"
+                             points="32.28 56.75 32.22 56.7 32.22 56.44 36.77 50.62 37.07 50.62 32.28 56.75"/>
+                    <polygon class="cls-1" points="32.22 56.06 36.48 50.62 36.77 50.62 32.22 56.44 32.22 56.06"/>
+                    <polygon class="cls-1" points="32.22 55.68 36.18 50.62 36.48 50.62 32.22 56.06 32.22 55.68"/>
+                    <polygon class="cls-1" points="32.22 55.3 35.88 50.62 36.18 50.62 32.22 55.68 32.22 55.3"/>
+                    <polygon class="cls-1" points="32.22 54.92 35.59 50.62 35.88 50.62 32.22 55.3 32.22 54.92"/>
+                    <polygon class="cls-1" points="32.22 54.54 35.29 50.62 35.59 50.62 32.22 54.92 32.22 54.54"/>
+                    <polygon class="cls-1" points="32.22 54.16 34.99 50.62 35.29 50.62 32.22 54.54 32.22 54.16"/>
+                    <polygon class="cls-1" points="32.22 53.78 34.7 50.62 34.99 50.62 32.22 54.16 32.22 53.78"/>
+                    <polygon class="cls-1" points="32.22 53.4 34.4 50.62 34.7 50.62 32.22 53.78 32.22 53.4"/>
+                    <polygon class="cls-1" points="32.22 53.02 34.1 50.62 34.4 50.62 32.22 53.4 32.22 53.02"/>
+                    <polygon class="cls-1" points="32.22 52.64 33.81 50.62 34.1 50.62 32.22 53.02 32.22 52.64"/>
+                    <polygon class="cls-1" points="32.22 52.26 33.51 50.62 33.81 50.62 32.22 52.64 32.22 52.26"/>
+                    <polygon class="cls-1" points="32.22 51.88 33.21 50.62 33.51 50.62 32.22 52.26 32.22 51.88"/>
+                    <polygon class="cls-1" points="32.22 51.5 32.92 50.62 33.21 50.62 32.22 51.88 32.22 51.5"/>
+                    <polygon class="cls-1" points="32.22 51.12 32.62 50.62 32.92 50.62 32.22 51.5 32.22 51.12"/>
+                    <polygon class="cls-1" points="32.22 50.74 32.32 50.62 32.62 50.62 32.22 51.12 32.22 50.74"/>
+                    <polygon class="cls-1" points="32.32 50.62 32.22 50.74 32.22 50.62 32.32 50.62"/>
+                </g>
+                <path class="cls-1"
+                      d="M18.28,36.08a3.51,3.51,0,0,0,.36.29l1.11.9,1.26,1,.66.51,2.06,1.57c.88.66,1.79,1.33,2.74,2s1.84,1.33,2.81,2l2.86,2,2.72,1.83.13.09,2.86,1.89.07,0,.22-1.9s0,.07,0,.11a13.6,13.6,0,0,0-2.34-8A18,18,0,0,0,33,37.29,28.37,28.37,0,0,0,30.1,35c-.94-.66-2-1.33-3.09-2a7,7,0,0,1,.2,1.87c0,.12,0,.24,0,.36l0,.37h0A8.26,8.26,0,0,0,24,30.29,7.68,7.68,0,0,1,24.48,33c0,.15,0,.3,0,.45a.49.49,0,0,0,0,.12h0a8.75,8.75,0,0,0-.61-2.08c-.06-.13-.12-.26-.19-.39s-.21-.37-.33-.56-.15-.22-.24-.34a7.63,7.63,0,0,0-.66-.76l-.23-.22L21.85,29c-.52-.42-1-.77-1.39-1.06l-.58-.38-.2-.13c-.2-.13-.38-.23-.54-.32a3.88,3.88,0,0,0-.58-.27h0a1.49,1.49,0,0,1,.11.28A8.89,8.89,0,0,1,19,29.82l.21-1.74L19,29.82v0a2.45,2.45,0,0,1,0,.27v-.05l-.7,6Z"/>
+                <g class="cls-12">
+                    <polygon class="cls-1" points="38.19 50.22 38.33 50.04 38.33 50.22 38.19 50.22"/>
+                    <polygon class="cls-1" points="37.99 50.22 38.33 49.78 38.33 50.04 38.19 50.22 37.99 50.22"/>
+                    <polygon class="cls-1" points="37.78 50.22 38.33 49.52 38.33 49.78 37.99 50.22 37.78 50.22"/>
+                    <polygon class="cls-1" points="37.58 50.22 38.33 49.26 38.33 49.52 37.78 50.22 37.58 50.22"/>
+                    <polygon class="cls-1" points="37.37 50.22 38.33 48.99 38.33 49.26 37.58 50.22 37.37 50.22"/>
+                    <polygon class="cls-1" points="37.17 50.22 38.33 48.73 38.33 48.99 37.37 50.22 37.17 50.22"/>
+                    <polygon class="cls-1" points="36.96 50.22 38.33 48.47 38.33 48.73 37.17 50.22 36.96 50.22"/>
+                    <polygon class="cls-1" points="36.76 50.22 38.33 48.21 38.33 48.47 36.96 50.22 36.76 50.22"/>
+                    <polygon class="cls-1" points="36.55 50.22 38.33 47.95 38.33 48.21 36.76 50.22 36.55 50.22"/>
+                    <polygon class="cls-1" points="36.35 50.22 38.33 47.68 38.33 47.95 36.55 50.22 36.35 50.22"/>
+                    <polygon class="cls-1" points="36.14 50.22 38.33 47.42 38.33 47.68 36.35 50.22 36.14 50.22"/>
+                    <polygon class="cls-1" points="35.94 50.22 38.33 47.16 38.33 47.42 36.14 50.22 35.94 50.22"/>
+                    <polygon class="cls-1" points="35.73 50.22 38.33 46.9 38.33 47.16 35.94 50.22 35.73 50.22"/>
+                    <polygon class="cls-1" points="35.53 50.22 38.33 46.63 38.33 46.9 35.73 50.22 35.53 50.22"/>
+                    <polygon class="cls-1" points="35.33 50.22 38.33 46.37 38.33 46.63 35.53 50.22 35.33 50.22"/>
+                    <polygon class="cls-1" points="35.12 50.22 38.33 46.11 38.33 46.37 35.33 50.22 35.12 50.22"/>
+                    <polygon class="cls-1" points="34.92 50.22 38.33 45.85 38.33 46.11 35.12 50.22 34.92 50.22"/>
+                    <polygon class="cls-1" points="34.71 50.22 38.33 45.59 38.33 45.85 34.92 50.22 34.71 50.22"/>
+                    <polygon class="cls-1" points="34.51 50.22 38.33 45.32 38.33 45.59 34.71 50.22 34.51 50.22"/>
+                    <polygon class="cls-1" points="34.3 50.22 38.33 45.06 38.33 45.32 34.51 50.22 34.3 50.22"/>
+                    <polygon class="cls-1" points="34.1 50.22 38.33 44.8 38.33 45.06 34.3 50.22 34.1 50.22"/>
+                    <polygon class="cls-1" points="33.89 50.22 38.33 44.54 38.33 44.8 34.1 50.22 33.89 50.22"/>
+                    <polygon class="cls-1" points="33.69 50.22 38.33 44.28 38.33 44.54 33.89 50.22 33.69 50.22"/>
+                    <polygon class="cls-1" points="33.48 50.22 38.33 44.01 38.33 44.28 33.69 50.22 33.48 50.22"/>
+                    <polygon class="cls-1"
+                             points="33.42 50.22 33.33 50.15 38.33 43.75 38.33 44.01 33.48 50.22 33.42 50.22"/>
+                    <polygon class="cls-1" points="33.33 50.15 33.2 50.05 38.33 43.49 38.33 43.75 33.33 50.15"/>
+                    <polygon class="cls-1" points="33.2 50.05 33.08 49.95 38.33 43.23 38.33 43.49 33.2 50.05"/>
+                    <polygon class="cls-1" points="33.08 49.95 32.95 49.86 38.33 42.97 38.33 43.23 33.08 49.95"/>
+                    <polygon class="cls-1" points="32.95 49.86 32.82 49.76 38.33 42.7 38.33 42.97 32.95 49.86"/>
+                    <polygon class="cls-1" points="32.82 49.76 32.7 49.66 38.33 42.44 38.33 42.7 32.82 49.76"/>
+                    <polygon class="cls-1" points="32.7 49.66 32.57 49.56 38.33 42.18 38.33 42.44 32.7 49.66"/>
+                    <polygon class="cls-1" points="32.57 49.56 32.44 49.46 38.33 41.92 38.33 42.18 32.57 49.56"/>
+                    <polygon class="cls-1" points="32.44 49.46 32.31 49.36 38.33 41.66 38.33 41.92 32.44 49.46"/>
+                    <polygon class="cls-1" points="32.31 49.36 32.19 49.26 38.33 41.39 38.33 41.66 32.31 49.36"/>
+                    <polygon class="cls-1" points="32.19 49.26 32.06 49.16 38.33 41.13 38.33 41.39 32.19 49.26"/>
+                    <polygon class="cls-1" points="32.06 49.16 31.93 49.06 38.33 40.87 38.33 41.13 32.06 49.16"/>
+                    <polygon class="cls-1" points="31.93 49.06 31.8 48.96 38.33 40.61 38.33 40.87 31.93 49.06"/>
+                    <polygon class="cls-1" points="31.8 48.96 31.68 48.86 38.33 40.34 38.33 40.61 31.8 48.96"/>
+                    <polygon class="cls-1" points="31.68 48.86 31.55 48.76 38.33 40.08 38.33 40.34 31.68 48.86"/>
+                    <polygon class="cls-1" points="31.55 48.76 31.42 48.66 38.33 39.82 38.33 40.08 31.55 48.76"/>
+                    <polygon class="cls-1" points="31.42 48.66 31.3 48.56 38.33 39.56 38.33 39.82 31.42 48.66"/>
+                    <polygon class="cls-1" points="31.3 48.56 31.17 48.47 38.33 39.3 38.33 39.56 31.3 48.56"/>
+                    <polygon class="cls-1"
+                             points="31.17 48.47 31.04 48.37 38.31 39.06 38.33 39.08 38.33 39.3 31.17 48.47"/>
+                    <rect class="cls-1" x="28.71" y="43.58" width="11.81" height="0.16"
+                          transform="translate(-21.1 44.06) rotate(-52)"/>
+                    <rect class="cls-1" x="28.58" y="43.48" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -21.08, 43.92)"/>
+                    <rect class="cls-1" x="28.46" y="43.38" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -21.05, 43.78)"/>
+                    <rect class="cls-1" x="28.33" y="43.29" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -21.02, 43.64)"/>
+                    <rect class="cls-1" x="28.2" y="43.19" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -20.99, 43.51)"/>
+                    <rect class="cls-1" x="28.07" y="43.09" width="11.81" height="0.16"
+                          transform="translate(-20.96 43.37) rotate(-52)"/>
+                    <rect class="cls-1" x="27.95" y="42.99" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -20.93, 43.23)"/>
+                    <rect class="cls-1" x="27.82" y="42.89" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -20.9, 43.09)"/>
+                    <rect class="cls-1" x="27.69" y="42.79" width="11.81" height="0.16"
+                          transform="translate(-20.87 42.95) rotate(-52)"/>
+                    <rect class="cls-1" x="27.57" y="42.69" width="11.81" height="0.16"
+                          transform="translate(-20.84 42.81) rotate(-52)"/>
+                    <rect class="cls-1" x="27.44" y="42.59" width="11.81" height="0.16"
+                          transform="translate(-20.81 42.68) rotate(-52)"/>
+                    <rect class="cls-1" x="27.31" y="42.49" width="11.81" height="0.16"
+                          transform="translate(-20.78 42.54) rotate(-52)"/>
+                    <rect class="cls-1" x="27.18" y="42.39" width="11.81" height="0.16"
+                          transform="translate(-20.75 42.4) rotate(-52)"/>
+                    <rect class="cls-1" x="27.06" y="42.29" width="11.81" height="0.16"
+                          transform="translate(-20.72 42.26) rotate(-52)"/>
+                    <rect class="cls-1" x="26.93" y="42.19" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -20.69, 42.12)"/>
+                    <rect class="cls-1" x="26.8" y="42.09" width="11.81" height="0.16"
+                          transform="translate(-20.66 41.98) rotate(-52)"/>
+                    <rect class="cls-1" x="26.68" y="41.99" width="11.81" height="0.16"
+                          transform="translate(-20.63 41.84) rotate(-52)"/>
+                    <rect class="cls-1" x="26.55" y="41.89" width="11.81" height="0.16"
+                          transform="translate(-20.6 41.71) rotate(-52)"/>
+                    <rect class="cls-1" x="26.42" y="41.8" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -20.58, 41.57)"/>
+                    <rect class="cls-1" x="26.29" y="41.7" width="11.81" height="0.16"
+                          transform="translate(-20.55 41.43) rotate(-52)"/>
+                    <rect class="cls-1" x="26.17" y="41.6" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -20.52, 41.29)"/>
+                    <rect class="cls-1" x="26.04" y="41.5" width="11.81" height="0.16"
+                          transform="translate(-20.49 41.15) rotate(-52)"/>
+                    <rect class="cls-1" x="25.91" y="41.4" width="11.81" height="0.16"
+                          transform="translate(-20.46 41.01) rotate(-52)"/>
+                    <rect class="cls-1" x="25.79" y="41.3" width="11.81" height="0.16"
+                          transform="translate(-20.43 40.88) rotate(-52)"/>
+                    <rect class="cls-1" x="25.66" y="41.2" width="11.81" height="0.16"
+                          transform="translate(-20.4 40.74) rotate(-52)"/>
+                    <rect class="cls-1" x="25.53" y="41.1" width="11.81" height="0.16"
+                          transform="translate(-20.37 40.6) rotate(-52)"/>
+                    <rect class="cls-1" x="25.4" y="41" width="11.81" height="0.16"
+                          transform="translate(-20.34 40.46) rotate(-52)"/>
+                    <rect class="cls-1" x="25.28" y="40.9" width="11.81" height="0.16"
+                          transform="translate(-20.31 40.32) rotate(-52)"/>
+                    <rect class="cls-1" x="25.15" y="40.8" width="11.81" height="0.16"
+                          transform="translate(-20.28 40.18) rotate(-52)"/>
+                    <rect class="cls-1" x="25.02" y="40.7" width="11.81" height="0.16"
+                          transform="translate(-20.25 40.05) rotate(-52)"/>
+                    <rect class="cls-1" x="24.9" y="40.6" width="11.81" height="0.16"
+                          transform="translate(-20.22 39.91) rotate(-52)"/>
+                    <rect class="cls-1" x="24.77" y="40.5" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -20.19, 39.77)"/>
+                    <rect class="cls-1" x="24.64" y="40.41" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -20.16, 39.63)"/>
+                    <rect class="cls-1" x="24.51" y="40.31" width="11.81" height="0.16"
+                          transform="translate(-20.13 39.49) rotate(-52)"/>
+                    <rect class="cls-1" x="24.39" y="40.21" width="11.81" height="0.16"
+                          transform="translate(-20.1 39.35) rotate(-52)"/>
+                    <rect class="cls-1" x="24.26" y="40.11" width="11.81" height="0.16"
+                          transform="translate(-20.08 39.22) rotate(-52)"/>
+                    <rect class="cls-1" x="24.13" y="40.01" width="11.81" height="0.16"
+                          transform="translate(-20.05 39.08) rotate(-52)"/>
+                    <rect class="cls-1" x="24.01" y="39.91" width="11.81" height="0.16"
+                          transform="translate(-20.02 38.94) rotate(-52)"/>
+                    <rect class="cls-1" x="23.88" y="39.81" width="11.81" height="0.16"
+                          transform="translate(-19.99 38.8) rotate(-52)"/>
+                    <rect class="cls-1" x="23.75" y="39.71" width="11.81" height="0.16"
+                          transform="translate(-19.96 38.66) rotate(-52)"/>
+                    <rect class="cls-1" x="23.62" y="39.61" width="11.81" height="0.16"
+                          transform="translate(-19.93 38.52) rotate(-52)"/>
+                    <rect class="cls-1" x="23.5" y="39.51" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.9, 38.39)"/>
+                    <rect class="cls-1" x="23.37" y="39.41" width="11.81" height="0.16"
+                          transform="translate(-19.87 38.25) rotate(-52)"/>
+                    <rect class="cls-1" x="23.24" y="39.31" width="11.81" height="0.16"
+                          transform="translate(-19.84 38.11) rotate(-52)"/>
+                    <rect class="cls-1" x="23.12" y="39.21" width="11.81" height="0.16"
+                          transform="translate(-19.81 37.97) rotate(-52)"/>
+                    <rect class="cls-1" x="22.99" y="39.11" width="11.81" height="0.16"
+                          transform="translate(-19.78 37.83) rotate(-52)"/>
+                    <rect class="cls-1" x="22.86" y="39.01" width="11.81" height="0.16"
+                          transform="translate(-19.75 37.69) rotate(-52)"/>
+                    <rect class="cls-1" x="22.73" y="38.92" width="11.81" height="0.16"
+                          transform="translate(-19.72 37.56) rotate(-52)"/>
+                    <rect class="cls-1" x="22.61" y="38.82" width="11.81" height="0.16"
+                          transform="translate(-19.69 37.42) rotate(-52)"/>
+                    <rect class="cls-1" x="22.48" y="38.72" width="11.81" height="0.16"
+                          transform="translate(-19.66 37.28) rotate(-52)"/>
+                    <rect class="cls-1" x="22.35" y="38.62" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.63, 37.14)"/>
+                    <rect class="cls-1" x="22.23" y="38.52" width="11.81" height="0.16"
+                          transform="translate(-19.61 37) rotate(-52)"/>
+                    <rect class="cls-1" x="22.1" y="38.42" width="11.81" height="0.16"
+                          transform="translate(-19.58 36.86) rotate(-52)"/>
+                    <rect class="cls-1" x="21.97" y="38.32" width="11.81" height="0.16"
+                          transform="translate(-19.55 36.73) rotate(-52)"/>
+                    <rect class="cls-1" x="21.84" y="38.22" width="11.81" height="0.16"
+                          transform="translate(-19.52 36.59) rotate(-52)"/>
+                    <rect class="cls-1" x="21.72" y="38.12" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.49, 36.45)"/>
+                    <rect class="cls-1" x="21.59" y="38.02" width="11.81" height="0.16"
+                          transform="translate(-19.46 36.31) rotate(-52)"/>
+                    <rect class="cls-1" x="21.46" y="37.92" width="11.81" height="0.16"
+                          transform="translate(-19.43 36.17) rotate(-52)"/>
+                    <rect class="cls-1" x="21.34" y="37.82" width="11.81" height="0.16"
+                          transform="translate(-19.4 36.03) rotate(-52)"/>
+                    <rect class="cls-1" x="21.21" y="37.72" width="11.81" height="0.16"
+                          transform="translate(-19.37 35.9) rotate(-52)"/>
+                    <rect class="cls-1" x="21.08" y="37.62" width="11.81" height="0.16"
+                          transform="translate(-19.34 35.76) rotate(-52)"/>
+                    <rect class="cls-1" x="20.95" y="37.52" width="11.81" height="0.16"
+                          transform="translate(-19.31 35.62) rotate(-52)"/>
+                    <rect class="cls-1" x="20.83" y="37.43" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.28, 35.48)"/>
+                    <rect class="cls-1" x="20.7" y="37.33" width="11.81" height="0.16"
+                          transform="translate(-19.25 35.34) rotate(-52)"/>
+                    <rect class="cls-1" x="20.57" y="37.23" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.22, 35.2)"/>
+                    <rect class="cls-1" x="20.45" y="37.13" width="11.81" height="0.16"
+                          transform="translate(-19.19 35.07) rotate(-52)"/>
+                    <rect class="cls-1" x="20.32" y="37.03" width="11.81" height="0.16"
+                          transform="translate(-19.16 34.93) rotate(-52)"/>
+                    <rect class="cls-1" x="20.19" y="36.93" width="11.81" height="0.16"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -19.13, 34.79)"/>
+                    <rect class="cls-1" x="20.06" y="36.83" width="11.81" height="0.16"
+                          transform="translate(-19.11 34.65) rotate(-52)"/>
+                    <rect class="cls-1" x="19.94" y="36.73" width="11.81" height="0.16"
+                          transform="translate(-19.08 34.51) rotate(-52)"/>
+                    <rect class="cls-1" x="19.81" y="36.63" width="11.81" height="0.16"
+                          transform="translate(-19.05 34.37) rotate(-52)"/>
+                    <rect class="cls-1" x="19.68" y="36.53" width="11.81" height="0.16"
+                          transform="translate(-19.02 34.24) rotate(-52)"/>
+                    <rect class="cls-1" x="19.24" y="35.78" width="11.81" height="0.96"
+                          transform="translate(-18.91 33.75) rotate(-52)"/>
+                    <rect class="cls-1" x="18.48" y="35.19" width="11.81" height="0.96"
+                          transform="translate(-18.74 32.93) rotate(-52)"/>
+                    <rect class="cls-1" x="17.72" y="34.6" width="11.81" height="0.96"
+                          transform="translate(-18.56 32.1) rotate(-52)"/>
+                    <rect class="cls-1" x="16.96" y="34" width="11.81" height="0.96"
+                          transform="translate(-18.39 31.27) rotate(-52)"/>
+                    <polygon class="cls-1"
+                             points="18.85 38.84 18.22 38.35 18.22 38.09 25.36 28.95 26.12 29.54 18.85 38.84"/>
+                    <polygon class="cls-1" points="18.22 36.52 24.6 28.35 25.36 28.95 18.22 38.09 18.22 36.52"/>
+                    <polygon class="cls-1" points="18.22 34.96 23.84 27.76 24.6 28.35 18.22 36.52 18.22 34.96"/>
+                    <polygon class="cls-1" points="18.22 33.39 23.08 27.16 23.84 27.76 18.22 34.96 18.22 33.39"/>
+                    <polygon class="cls-1" points="18.22 33.11 22.95 27.06 23.08 27.16 18.22 33.39 18.22 33.11"/>
+                    <polygon class="cls-1" points="18.22 32.83 22.81 26.95 22.95 27.06 18.22 33.11 18.22 32.83"/>
+                    <polygon class="cls-1" points="18.22 32.55 22.67 26.84 22.81 26.95 18.22 32.83 18.22 32.55"/>
+                    <polygon class="cls-1"
+                             points="18.22 32.26 22.5 26.79 22.6 26.79 22.67 26.84 18.22 32.55 18.22 32.26"/>
+                    <polygon class="cls-1" points="18.22 31.98 22.27 26.79 22.5 26.79 18.22 32.26 18.22 31.98"/>
+                    <polygon class="cls-1" points="18.22 31.7 22.05 26.79 22.27 26.79 18.22 31.98 18.22 31.7"/>
+                    <polygon class="cls-1" points="18.22 31.42 21.84 26.79 22.05 26.79 18.22 31.7 18.22 31.42"/>
+                    <polygon class="cls-1" points="18.22 31.14 21.61 26.79 21.84 26.79 18.22 31.42 18.22 31.14"/>
+                    <polygon class="cls-1" points="18.22 30.85 21.39 26.79 21.61 26.79 18.22 31.14 18.22 30.85"/>
+                    <polygon class="cls-1" points="18.22 30.57 21.17 26.79 21.39 26.79 18.22 30.85 18.22 30.57"/>
+                    <polygon class="cls-1" points="18.22 30.29 20.95 26.79 21.17 26.79 18.22 30.57 18.22 30.29"/>
+                    <polygon class="cls-1" points="18.22 30.01 20.73 26.79 20.95 26.79 18.22 30.29 18.22 30.01"/>
+                    <polygon class="cls-1" points="18.22 29.73 20.51 26.79 20.73 26.79 18.22 30.01 18.22 29.73"/>
+                    <polygon class="cls-1" points="18.22 29.44 20.29 26.79 20.51 26.79 18.22 29.73 18.22 29.44"/>
+                    <polygon class="cls-1" points="18.22 29.16 20.07 26.79 20.29 26.79 18.22 29.44 18.22 29.16"/>
+                    <polygon class="cls-1" points="18.22 28.88 19.85 26.79 20.07 26.79 18.22 29.16 18.22 28.88"/>
+                    <polygon class="cls-1" points="18.22 28.6 19.63 26.79 19.85 26.79 18.22 28.88 18.22 28.6"/>
+                    <polygon class="cls-1" points="18.22 28.31 19.41 26.79 19.63 26.79 18.22 28.6 18.22 28.31"/>
+                    <polygon class="cls-1" points="18.22 28.03 19.19 26.79 19.41 26.79 18.22 28.31 18.22 28.03"/>
+                    <polygon class="cls-1" points="18.22 27.75 18.97 26.79 19.19 26.79 18.22 28.03 18.22 27.75"/>
+                    <polygon class="cls-1" points="18.22 27.47 18.75 26.79 18.97 26.79 18.22 27.75 18.22 27.47"/>
+                    <polygon class="cls-1" points="18.22 27.18 18.53 26.79 18.75 26.79 18.22 27.47 18.22 27.18"/>
+                    <polygon class="cls-1" points="18.22 26.9 18.31 26.79 18.53 26.79 18.22 27.18 18.22 26.9"/>
+                    <polygon class="cls-1" points="18.31 26.79 18.22 26.9 18.22 26.79 18.31 26.79"/>
+                </g>
+                <path class="cls-1"
+                      d="M8,26.83c.67.7,1.45,1.47,2.32,2.32l.14.13c.77.73,1.61,1.51,2.53,2.34s1.66,1.47,2.6,2.26S17.3,35.29,18.22,36l.7-6a7.26,7.26,0,0,0-1.76-3.76c-.24-.26-.49-.53-.75-.79-.79-.81-1.68-1.63-2.58-2.39a31.59,31.59,0,0,0-2.54-1.95c-.51-.35-1-.64-1.42-.87s-.75-.37-1.1-.52A65.5,65.5,0,0,1,8,26.83Z"/>
+                <g class="cls-13">
+                    <polygon class="cls-1" points="18.73 36.04 18.92 35.8 18.92 36.04 18.73 36.04"/>
+                    <polygon class="cls-1" points="18.51 36.04 18.92 35.51 18.92 35.8 18.73 36.04 18.51 36.04"/>
+                    <polygon class="cls-1" points="18.29 36.04 18.92 35.23 18.92 35.51 18.51 36.04 18.29 36.04"/>
+                    <polygon class="cls-1" points="18.07 36.04 18.92 34.95 18.92 35.23 18.29 36.04 18.07 36.04"/>
+                    <polygon class="cls-1" points="17.85 36.04 18.92 34.67 18.92 34.95 18.07 36.04 17.85 36.04"/>
+                    <polygon class="cls-1" points="17.63 36.04 18.92 34.38 18.92 34.67 17.85 36.04 17.63 36.04"/>
+                    <polygon class="cls-1" points="17.41 36.04 18.92 34.1 18.92 34.38 17.63 36.04 17.41 36.04"/>
+                    <polygon class="cls-1" points="17.19 36.04 18.92 33.82 18.92 34.1 17.41 36.04 17.19 36.04"/>
+                    <polygon class="cls-1" points="16.97 36.04 18.92 33.54 18.92 33.82 17.19 36.04 16.97 36.04"/>
+                    <polygon class="cls-1" points="16.75 36.04 18.92 33.26 18.92 33.54 16.97 36.04 16.75 36.04"/>
+                    <polygon class="cls-1" points="16.53 36.04 18.92 32.97 18.92 33.26 16.75 36.04 16.53 36.04"/>
+                    <polygon class="cls-1" points="16.31 36.04 18.92 32.69 18.92 32.97 16.53 36.04 16.31 36.04"/>
+                    <polygon class="cls-1" points="16.09 36.04 18.92 32.41 18.92 32.69 16.31 36.04 16.09 36.04"/>
+                    <polygon class="cls-1" points="15.87 36.04 18.92 32.13 18.92 32.41 16.09 36.04 15.87 36.04"/>
+                    <polygon class="cls-1" points="15.65 36.04 18.92 31.85 18.92 32.13 15.87 36.04 15.65 36.04"/>
+                    <polygon class="cls-1" points="15.43 36.04 18.92 31.56 18.92 31.85 15.65 36.04 15.43 36.04"/>
+                    <polygon class="cls-1"
+                             points="15.31 36.04 15.25 35.98 18.92 31.28 18.92 31.56 15.43 36.04 15.31 36.04"/>
+                    <polygon class="cls-1" points="15.25 35.98 15.11 35.88 18.92 31 18.92 31.28 15.25 35.98"/>
+                    <polygon class="cls-1" points="15.11 35.88 14.97 35.77 18.92 30.72 18.92 31 15.11 35.88"/>
+                    <polygon class="cls-1" points="14.97 35.77 14.84 35.66 18.92 30.43 18.92 30.72 14.97 35.77"/>
+                    <polygon class="cls-1" points="14.84 35.66 14.7 35.56 18.92 30.15 18.92 30.43 14.84 35.66"/>
+                    <polygon class="cls-1" points="14.7 35.56 14.56 35.45 18.92 29.87 18.92 30.15 14.7 35.56"/>
+                    <polygon class="cls-1" points="14.56 35.45 14.43 35.34 18.92 29.59 18.92 29.87 14.56 35.45"/>
+                    <polygon class="cls-1" points="14.43 35.34 14.29 35.24 18.92 29.31 18.92 29.59 14.43 35.34"/>
+                    <polygon class="cls-1" points="14.29 35.24 14.15 35.13 18.92 29.02 18.92 29.31 14.29 35.24"/>
+                    <polygon class="cls-1" points="14.15 35.13 14.02 35.02 18.92 28.74 18.92 29.02 14.15 35.13"/>
+                    <polygon class="cls-1" points="14.02 35.02 13.88 34.92 18.92 28.46 18.92 28.74 14.02 35.02"/>
+                    <polygon class="cls-1" points="13.88 34.92 13.74 34.81 18.92 28.18 18.92 28.46 13.88 34.92"/>
+                    <polygon class="cls-1" points="13.74 34.81 13.6 34.7 18.92 27.89 18.92 28.18 13.74 34.81"/>
+                    <polygon class="cls-1" points="13.6 34.7 13.47 34.59 18.92 27.61 18.92 27.89 13.6 34.7"/>
+                    <polygon class="cls-1" points="13.47 34.59 13.33 34.49 18.92 27.33 18.92 27.61 13.47 34.59"/>
+                    <polygon class="cls-1" points="13.33 34.49 13.19 34.38 18.92 27.05 18.92 27.33 13.33 34.49"/>
+                    <polygon class="cls-1" points="13.19 34.38 13.06 34.27 18.92 26.77 18.92 27.05 13.19 34.38"/>
+                    <polygon class="cls-1" points="13.06 34.27 12.92 34.17 18.92 26.48 18.92 26.77 13.06 34.27"/>
+                    <polygon class="cls-1" points="12.92 34.17 12.78 34.06 18.92 26.2 18.92 26.48 12.92 34.17"/>
+                    <polygon class="cls-1" points="12.78 34.06 12.65 33.95 18.92 25.92 18.92 26.2 12.78 34.06"/>
+                    <polygon class="cls-1" points="12.65 33.95 12.51 33.85 18.92 25.64 18.92 25.92 12.65 33.95"/>
+                    <polygon class="cls-1" points="12.51 33.85 12.37 33.74 18.92 25.36 18.92 25.64 12.51 33.85"/>
+                    <polygon class="cls-1" points="12.37 33.74 12.23 33.63 18.92 25.07 18.92 25.36 12.37 33.74"/>
+                    <polygon class="cls-1"
+                             points="12.23 33.63 12.1 33.52 18.92 24.79 18.92 24.79 18.92 25.07 12.23 33.63"/>
+                    <rect class="cls-1" x="9.9" y="29.02" width="11.08" height="0.17"
+                          transform="translate(-17 23.36) rotate(-52)"/>
+                    <rect class="cls-1" x="9.76" y="28.91" width="11.08" height="0.17"
+                          transform="translate(-16.97 23.21) rotate(-52)"/>
+                    <rect class="cls-1" x="9.63" y="28.8" width="11.08" height="0.17"
+                          transform="translate(-16.94 23.06) rotate(-52)"/>
+                    <rect class="cls-1" x="9.49" y="28.7" width="11.08" height="0.17"
+                          transform="translate(-16.91 22.91) rotate(-52)"/>
+                    <rect class="cls-1" x="9.35" y="28.59" width="11.08" height="0.17"
+                          transform="translate(-16.87 22.76) rotate(-52)"/>
+                    <rect class="cls-1" x="9.22" y="28.48" width="11.08" height="0.17"
+                          transform="translate(-16.84 22.61) rotate(-52)"/>
+                    <rect class="cls-1" x="9.08" y="28.38" width="11.08" height="0.17"
+                          transform="translate(-16.81 22.46) rotate(-52)"/>
+                    <rect class="cls-1" x="8.94" y="28.27" width="11.08" height="0.17"
+                          transform="translate(-16.78 22.31) rotate(-52)"/>
+                    <rect class="cls-1" x="8.81" y="28.16" width="11.08" height="0.17"
+                          transform="translate(-16.75 22.16) rotate(-52)"/>
+                    <rect class="cls-1" x="8.67" y="28.06" width="11.08" height="0.17"
+                          transform="translate(-16.72 22.01) rotate(-52)"/>
+                    <rect class="cls-1" x="8.53" y="27.95" width="11.08" height="0.17"
+                          transform="translate(-16.68 21.87) rotate(-52)"/>
+                    <rect class="cls-1" x="8.39" y="27.84" width="11.08" height="0.17"
+                          transform="translate(-16.65 21.72) rotate(-52)"/>
+                    <rect class="cls-1" x="8.26" y="27.74" width="11.08" height="0.17"
+                          transform="translate(-16.62 21.57) rotate(-52)"/>
+                    <rect class="cls-1" x="8.12" y="27.63" width="11.08" height="0.17"
+                          transform="translate(-16.59 21.42) rotate(-52)"/>
+                    <rect class="cls-1" x="7.98" y="27.52" width="11.08" height="0.17"
+                          transform="translate(-16.56 21.27) rotate(-52)"/>
+                    <rect class="cls-1" x="7.85" y="27.41" width="11.08" height="0.17"
+                          transform="translate(-16.53 21.12) rotate(-52)"/>
+                    <rect class="cls-1" x="7.71" y="27.31" width="11.08" height="0.17"
+                          transform="translate(-16.49 20.97) rotate(-52)"/>
+                    <rect class="cls-1" x="7.57" y="27.2" width="11.08" height="0.17"
+                          transform="translate(-16.46 20.82) rotate(-52)"/>
+                    <rect class="cls-1" x="7.44" y="27.09" width="11.08" height="0.17"
+                          transform="translate(-16.43 20.67) rotate(-52)"/>
+                    <rect class="cls-1" x="7.3" y="26.99" width="11.08" height="0.17"
+                          transform="translate(-16.4 20.52) rotate(-52)"/>
+                    <rect class="cls-1" x="7.16" y="26.88" width="11.08" height="0.17"
+                          transform="translate(-16.37 20.38) rotate(-52)"/>
+                    <rect class="cls-1" x="7.03" y="26.77" width="11.08" height="0.17"
+                          transform="translate(-16.34 20.23) rotate(-52)"/>
+                    <rect class="cls-1" x="6.89" y="26.67" width="11.08" height="0.17"
+                          transform="translate(-16.3 20.08) rotate(-52)"/>
+                    <rect class="cls-1" x="6.75" y="26.56" width="11.08" height="0.17"
+                          transform="translate(-16.27 19.93) rotate(-52)"/>
+                    <rect class="cls-1" x="6.61" y="26.45" width="11.08" height="0.17"
+                          transform="translate(-16.24 19.78) rotate(-52)"/>
+                    <rect class="cls-1" x="6.48" y="26.34" width="11.08" height="0.17"
+                          transform="translate(-16.21 19.63) rotate(-52)"/>
+                    <rect class="cls-1" x="6.34" y="26.24" width="11.08" height="0.17"
+                          transform="translate(-16.18 19.48) rotate(-52)"/>
+                    <rect class="cls-1" x="6.2" y="26.13" width="11.08" height="0.17"
+                          transform="translate(-16.15 19.33) rotate(-52)"/>
+                    <rect class="cls-1" x="6.07" y="26.02" width="11.08" height="0.17"
+                          transform="translate(-16.11 19.18) rotate(-52)"/>
+                    <polygon class="cls-1"
+                             points="8.13 30.42 8.04 30.36 8.04 30.25 14.81 21.58 14.95 21.69 8.13 30.42"/>
+                    <polygon class="cls-1" points="8.04 29.97 14.68 21.48 14.81 21.58 8.04 30.25 8.04 29.97"/>
+                    <polygon class="cls-1" points="8.04 29.69 14.54 21.37 14.68 21.48 8.04 29.97 8.04 29.69"/>
+                    <polygon class="cls-1" points="8.04 29.41 14.4 21.26 14.54 21.37 8.04 29.69 8.04 29.41"/>
+                    <polygon class="cls-1" points="8.04 29.13 14.27 21.16 14.4 21.26 8.04 29.41 8.04 29.13"/>
+                    <polygon class="cls-1" points="8.04 28.84 14.13 21.05 14.27 21.16 8.04 29.13 8.04 28.84"/>
+                    <polygon class="cls-1" points="8.04 28.56 13.99 20.94 14.13 21.05 8.04 28.84 8.04 28.56"/>
+                    <polygon class="cls-1" points="8.04 28.28 13.86 20.84 13.99 20.94 8.04 28.56 8.04 28.28"/>
+                    <polygon class="cls-1" points="8.04 28 13.72 20.73 13.86 20.84 8.04 28.28 8.04 28"/>
+                    <polygon class="cls-1" points="8.04 27.71 13.58 20.62 13.72 20.73 8.04 28 8.04 27.71"/>
+                    <polygon class="cls-1" points="8.04 27.43 13.45 20.51 13.58 20.62 8.04 27.71 8.04 27.43"/>
+                    <polygon class="cls-1" points="8.04 27.15 13.31 20.41 13.45 20.51 8.04 27.43 8.04 27.15"/>
+                    <polygon class="cls-1" points="12.54 19.8 13.31 20.41 8.04 27.15 8.04 19.8 12.54 19.8"/>
+                </g>
+                <path class="cls-1" d="M27.2,35.21l0,.37h0Z"/>
+                <g class="cls-7">
+                    <path class="cls-1" d="M27.2,35.21l0,.37h0Z"/>
+                </g>
+                <path class="cls-1" d="M27.2,35.21l0,.37h0Z"/>
+                <g class="cls-14">
+                    <polygon class="cls-1" points="27.17 35.5 27.2 35.47 27.2 35.58 27.17 35.58 27.17 35.5"/>
+                    <polygon class="cls-1"
+                             points="27.17 35.24 27.2 35.21 27.2 35.21 27.2 35.47 27.17 35.5 27.17 35.24"/>
+                    <polygon class="cls-1" points="27.2 35.21 27.17 35.24 27.17 35.21 27.2 35.21"/>
+                </g>
+                <path class="cls-1" d="M24.45,33.6a.49.49,0,0,1,0-.12.49.49,0,0,0,0,.12Z"/>
+                <g class="cls-7">
+                    <path class="cls-1" d="M24.45,33.6a.49.49,0,0,1,0-.12.49.49,0,0,0,0,.12Z"/>
+                </g>
+                <path class="cls-1" d="M24.45,33.6a.49.49,0,0,1,0-.12.49.49,0,0,0,0,.12Z"/>
+                <g class="cls-15">
+                    <rect class="cls-1" x="24.45" y="33.48" width="0.01" height="0.11"/>
+                </g>
+                <polygon class="cls-1"
+                         points="24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59"/>
+                <g class="cls-7">
+                    <polygon class="cls-1"
+                             points="24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59"/>
+                </g>
+                <polygon class="cls-1"
+                         points="24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59 24.45 33.59"/>
+                <g class="cls-16">
+                    <rect class="cls-1" x="24.45" y="33.59"/>
+                </g>
+                <path class="cls-1"
+                      d="M7.46,17.64l.17,0,.09-.4,1.13.26,0-.18L7.77,17.1l.09-.41-.17,0ZM8,15.34,8.8,16l-1,.24,0,.22,1.29.3,0-.17-1-.24,1-.23,0-.12-.79-.65,1,.24,0-.17-1.29-.3Z"/>
+                <path class="cls-1" d="M27.26,34.72c0,.23,0,.47,0,.72h0c0-.12,0-.24,0-.36S27.26,34.84,27.26,34.72Z"/>
+                <g class="cls-7">
+                    <path class="cls-1"
+                          d="M27.26,34.72c0,.23,0,.47,0,.72h0c0-.12,0-.24,0-.36S27.26,34.84,27.26,34.72Z"/>
+                </g>
+                <path class="cls-1" d="M27.25,35.08c0,.12,0,.24,0,.36h0C27.24,35.32,27.24,35.2,27.25,35.08Z"/>
+                <g class="cls-7">
+                    <path class="cls-1" d="M27.25,35.08c0,.12,0,.24,0,.36h0C27.24,35.32,27.24,35.2,27.25,35.08Z"/>
+                </g>
+                <path class="cls-1" d="M27.25,35.08c0,.12,0,.24,0,.36h0C27.24,35.32,27.24,35.2,27.25,35.08Z"/>
+                <g class="cls-17">
+                    <polygon class="cls-1" points="27.22 35.37 27.25 35.34 27.25 35.45 27.22 35.45 27.22 35.37"/>
+                    <polygon class="cls-1"
+                             points="27.22 35.11 27.25 35.08 27.25 35.08 27.25 35.34 27.22 35.37 27.22 35.11"/>
+                    <polygon class="cls-1" points="27.25 35.08 27.22 35.11 27.22 35.08 27.25 35.08"/>
+                </g>
+                <path class="cls-1" d="M85.72,6.06a0,0,0,0,1,0,0l-.06,0h0v0Z"/>
+                <path class="cls-1" d="M85.25,18.53l-.06,0c0-.09,0-.14,0-.14S85.23,18.47,85.25,18.53Z"/>
+                <path class="cls-1" d="M74.35,22.72l.09,0-.1.1A.13.13,0,0,1,74.35,22.72Z"/>
+                <path class="cls-1" d="M70.18,47.29h0v0Z"/>
+                <path class="cls-1" d="M85.72,6.06a0,0,0,0,1,0,0l-.06,0h0v0Z"/>
+                <path class="cls-1" d="M85.25,18.53l-.06,0c0-.09,0-.14,0-.14S85.23,18.47,85.25,18.53Z"/>
+                <path class="cls-1" d="M74.35,22.72l.09,0-.1.1A.13.13,0,0,1,74.35,22.72Z"/>
+                <path class="cls-1" d="M70.18,47.29h0v0Z"/>
+                <path class="cls-1" d="M85.72,6.06a0,0,0,0,1,0,0l-.06,0h0v0Z"/>
+                <path class="cls-1" d="M85.25,18.53l-.06,0c0-.09,0-.14,0-.14S85.23,18.47,85.25,18.53Z"/>
+                <path class="cls-1" d="M74.35,22.72l.09,0-.1.1A.13.13,0,0,1,74.35,22.72Z"/>
+                <path class="cls-1" d="M70.18,47.29h0v0Z"/>
+                <path class="cls-1"
+                      d="M66.07,26.73a1.09,1.09,0,0,1-.08-.15l-.25-.45a.58.58,0,0,0-.11-.15,4.4,4.4,0,0,0-.86-1,5.4,5.4,0,0,0-.77-.47c-1.8.11-3.27,2.14-3.41,4.74a5.66,5.66,0,0,0,1.91,4.87h.86a9.55,9.55,0,0,0,2.5-.35s-.1-.08-.14,0a6.09,6.09,0,0,0,.76-.27,5.68,5.68,0,0,0,1-3.4A21.07,21.07,0,0,0,66.07,26.73Zm-2.73,2.08a.18.18,0,1,1,0-.26A.17.17,0,0,1,63.34,28.81Zm0-.91a.92.92,0,0,1-1.29,0,.91.91,0,0,1,1.29-1.29A.92.92,0,0,1,63.31,27.9Z"/>
+                <path class="cls-1"
+                      d="M74,24.53c-.27,1.61-.34,2.7-.35,2.77s-.17,1.29-.27,3.11h0a2.34,2.34,0,0,0,1,1.46h0a.33.33,0,0,0,.1,0l.29,0A15.3,15.3,0,0,1,74,24.53Z"/>
+                <path class="cls-1"
+                      d="M76.68,22.06h0a5.8,5.8,0,0,0-2.18.61h0l-.1.1h0c-.1.37-.18.74-.24,1.1s-.08.43-.11.64a15.3,15.3,0,0,0,.83,7.33A14.87,14.87,0,0,0,77,31.51c.31-.08.62-.16,1-.27a5.92,5.92,0,0,0,1.7-4.14C79.7,24.93,78.27,22.56,76.68,22.06Zm-2.37,5.65a.2.2,0,0,1-.19-.2.2.2,0,0,1,.19-.19.2.2,0,1,1,0,.39Zm1.17-.86a.8.8,0,0,1-1.09-.35.81.81,0,0,1,.36-1.09.8.8,0,0,1,1.09.35A.81.81,0,0,1,75.48,26.85Z"/>
+                <path class="cls-1"
+                      d="M86.48,6.12a3.52,3.52,0,0,0-.09-.85c0-.06-.25,0-.5.07l-.27.12h0a5.52,5.52,0,0,0-1.28.38A10.49,10.49,0,0,1,83,6.33a2.49,2.49,0,0,1-.44.09l.5.72a1.39,1.39,0,0,1,.24-.35,2.85,2.85,0,0,1,1.1-.74,1.71,1.71,0,0,1,1.14-.11l0,.22a4.81,4.81,0,0,1-.09,1.42c-.17.71-.35,1.44-.41,1.87-.32-.59-.63-1-.7-1a11.42,11.42,0,0,0,.56,1.74c.15.43.27.86.35,1.19s.1.55.11.57.06.24.1.54a9,9,0,0,1,0,1.22,9.48,9.48,0,0,0-.1,1.82,5.29,5.29,0,0,0,.56-1.76,6.33,6.33,0,0,0,.18-1.31,6.26,6.26,0,0,0,0-.64s-.06-.27-.18-.6A9.92,9.92,0,0,0,85.38,10c-.06-.1-.11-.21-.16-.31a13.38,13.38,0,0,0,.94-1.93A4.77,4.77,0,0,0,86.48,6.12Zm-.81,0h0v0l.07,0v0Z"/>
+                <path class="cls-1"
+                      d="M78.1,42.37a5.52,5.52,0,0,1,1.61,0l.79.1.8.06c.46,0,1.07.11,1.67.19a15.35,15.35,0,0,1,1.64.3,3.54,3.54,0,0,0,.75.15s-.23-.22-.67-.4a11,11,0,0,0-1.63-.5c-.61-.15-1.22-.27-1.68-.34s-.79-.11-.81-.12l-.82,0a5.87,5.87,0,0,0-.83,0,5.75,5.75,0,0,0-.92.18,8.88,8.88,0,0,0-1.33.48,2.91,2.91,0,0,0,0-.31c0-.15-.06-.29-.1-.43l.6-.13c.54-.13,1.09-.22,1.51-.28l.72-.09s.29-.06.7-.1A10.13,10.13,0,0,1,81.58,41a16.53,16.53,0,0,0,2.22.11,7.06,7.06,0,0,0-2.19-.57A10.16,10.16,0,0,0,80,40.45c-.44,0-.74,0-.76,0l-.73.15a14,14,0,0,0-1.52.43l-.59.2a6.93,6.93,0,0,0-.26-.7h0a1.1,1.1,0,0,0-.33-.45c-.14-.07-.22,0-.22,0s.07,0,.14.13a1.23,1.23,0,0,1,.17.42c0,.22.11.48.16.77A3.61,3.61,0,0,0,75,42a4,4,0,0,0,1.17-.24c0,.12,0,.25,0,.37a2.18,2.18,0,0,1,0,.51c-.27.14-.43.26-.41.28s.14,0,.37-.06a3.1,3.1,0,0,1-.15.46h0c-.64.18-1.22.49-1.18.58s.45,0,1-.09c-.11.17-.19.26-.19.27a5.31,5.31,0,0,1-.42.55,6.92,6.92,0,0,1-1.1,1,2.7,2.7,0,0,1-1.35.44c-.4,0-.69,0-.7,0s.27.15.7.2a2.83,2.83,0,0,0,1-.07h0a2.41,2.41,0,0,0,.56-.22,7,7,0,0,0,1.28-1,6.18,6.18,0,0,0,.52-.59,4.13,4.13,0,0,0,.38-.71h.44l.38,0,.38,0,.84.17a5.18,5.18,0,0,0,1.26.27c0-.08-.5-.45-1.11-.7a8.07,8.07,0,0,0-.85-.33l-.33-.07-.13,0a4.09,4.09,0,0,0-.7,0,3.7,3.7,0,0,0,.06-.48A13.16,13.16,0,0,1,78.1,42.37Z"/>
+                <path class="cls-1"
+                      d="M75.11,43.39c.12,0,.21-.06.27-.2a.77.77,0,0,0,.05-.38.17.17,0,0,0-.05-.12s-.08,0-.12,0-.22.12-.21.14-.12-.11-.14-.08a.37.37,0,0,0,0,.38A.33.33,0,0,0,75.11,43.39Z"/>
+                <path class="cls-1"
+                      d="M74.62,41.76a.53.53,0,0,0,.21-.35.17.17,0,0,0,0-.12.13.13,0,0,0-.13,0c-.17,0-.25.09-.25.12s-.13-.11-.14-.1l-.06.08a.56.56,0,0,0-.13.24.19.19,0,0,0,.13.24A.48.48,0,0,0,74.62,41.76Z"/>
+                <path class="cls-1"
+                      d="M70.36,60c-.17,0-.32,0-.31.05s.12,0,.27.11l.24.1c.06,0,0,0,0,0s0,0-.06,0l-.11.12a.56.56,0,0,1-.24.17c-.09,0-.15,0-.16-.1s0-.16,0-.17-.07,0-.1.16a.27.27,0,0,0,0,.23.39.39,0,0,0,.26.11,1,1,0,0,0,.57-.29,3.52,3.52,0,0,0,.29-.4,3.56,3.56,0,0,0-.45-.13Z"/>
+                <path class="cls-1"
+                      d="M69.44,45.81a1.8,1.8,0,0,0,.81-.09.68.68,0,0,0,.31.18,1.77,1.77,0,0,0,.91,0,3.42,3.42,0,0,0,.69-.28h0a.47.47,0,0,0,.24.08.76.76,0,0,0,.55-.18c.2-.21.36-.4.42-.45s0,0,0,0h0a0,0,0,0,0,0-.05h-.06s-.09,0-.14,0-.27.2-.39.27a.58.58,0,0,1-.44.13.16.16,0,0,0,0-.14c0-.09-.09-.09-.09-.08a.3.3,0,0,1,0,.09s-.08.09-.18.13a3.33,3.33,0,0,1-.78.22,1.59,1.59,0,0,1-.76,0l-.07,0,.33-.2a1.49,1.49,0,0,0,.27-.23l.13-.12a2,2,0,0,0,.13-.18.45.45,0,0,0,.08-.38.4.4,0,0,0-.29-.21,1.32,1.32,0,0,0-.57,0,.56.56,0,0,0-.38.21.54.54,0,0,0-.08.25s0,.07,0,.08,0,0,.08-.06a.84.84,0,0,1,.12-.19.4.4,0,0,1,.29-.1,1.29,1.29,0,0,1,.41,0s.1,0,.11.1a.2.2,0,0,1-.06.15l-.07.06-.11.1a2.2,2.2,0,0,1-.25.17,1.69,1.69,0,0,1-1.19.29.46.46,0,0,1-.35-.31,1.46,1.46,0,0,1-.1-.57,1.5,1.5,0,0,1,.4-.95,2.5,2.5,0,0,1,.94-.59,3.41,3.41,0,0,1,.58-.19,1.19,1.19,0,0,1,.26-.05h.07l.25.05a1.53,1.53,0,0,0,.29,0l.23-.08.21-.07.11,0h0a3.26,3.26,0,0,1,.88,0,1.13,1.13,0,0,1,.38.12,1.4,1.4,0,0,1,.32.28c.18.22.25.47.11.6l-.18.15a1.07,1.07,0,0,0-.18.19.34.34,0,0,0-.07.11.42.42,0,0,0,0,.1.19.19,0,0,0,0,.08v0a.38.38,0,0,1-.07.21l-.08.08s-.09.06-.09,0,.11-.22,0-.31a.55.55,0,0,0-.38.14c-.07.06-.1.09-.09.1s0,0,.13,0l.14,0,.08,0h0s0,0,0,0c0,.2,0,.17,0,.22a.36.36,0,0,1,0,.11.83.83,0,0,0-.06.21s0,0,0,0h.12a.65.65,0,0,0,.16-.09.57.57,0,0,0,.23-.3c.1-.48.22-.52.54-.74a.69.69,0,0,0,.22-.62,1.19,1.19,0,0,0-.24-.55,1.73,1.73,0,0,0-.41-.4,1.4,1.4,0,0,0-.56-.22,3.59,3.59,0,0,0-1,0,.47.47,0,0,0-.16,0l-.11,0-.2.07-.17,0h-.12l-.12,0a.83.83,0,0,0-.29,0,3,3,0,0,0-.37,0,4.1,4.1,0,0,0-.69.2l-.36.18a2.37,2.37,0,0,0-.79.63,2,2,0,0,0-.49,1.33,1.84,1.84,0,0,0,.19.79A1,1,0,0,0,69.44,45.81Z"/>
+                <path class="cls-1"
+                      d="M69.25,67.14a1,1,0,0,0-.2,0,3.56,3.56,0,0,0-.62.34c-.28.19-.53.42-.5.45s.31-.12.62-.25a3.27,3.27,0,0,1,.41-.17l.19-.06s.07,0,.07,0,0,0,0,0,0,.14,0,.22,0,.18-.07.25-.16.14-.18.17,0,0,.09,0,.16-.05.22-.12a1.74,1.74,0,0,0,.14-.27,2.09,2.09,0,0,0,.13-.37C69.6,67.18,69.39,67.1,69.25,67.14Z"/>
+                <path class="cls-1"
+                      d="M69.93,63.14l-.33,0a1.15,1.15,0,0,0-.31,0,3.87,3.87,0,0,0-1,.41,1.55,1.55,0,0,1-.32.14c-.07,0-.12,0-.12,0s0,0,.13,0a1.25,1.25,0,0,0,.36-.09,5.22,5.22,0,0,1,1-.31h.57l0,0h0l-.09,0a4.78,4.78,0,0,0-.92.64c-.16.12-.31.24-.45.23a.8.8,0,0,1-.38-.23.78.78,0,0,1-.2-.26.12.12,0,0,1,0-.11s-.09,0-.1.12a.63.63,0,0,0,.18.34.9.9,0,0,0,.45.32.84.84,0,0,0,.6-.22,4.68,4.68,0,0,1,.91-.55l.11,0,.18-.06.3-.09a.88.88,0,0,0,.2-.1s.18-.11,0-.29A1.78,1.78,0,0,0,69.93,63.14Z"/>
+                <path class="cls-1"
+                      d="M67.31,42.55a.85.85,0,0,0-.25-.37.41.41,0,0,0-.24-.1h0a.3.3,0,0,0-.22.11.9.9,0,0,0-.18.34s.07,0,.15.07l-.16.15s0,0,0,0l0,0,.29,0,.32,0a.37.37,0,0,0,.23-.05A.2.2,0,0,0,67.31,42.55Z"/>
+                <path class="cls-1"
+                      d="M66.41,45c-.06-.06-.14-.09-.16-.06a2.06,2.06,0,0,0-.29.45A.58.58,0,0,0,66,46a.73.73,0,0,0,1.11-.38.58.58,0,0,0-.25-.49C66.63,45,66.41,45,66.41,45Z"/>
+                <path class="cls-1"
+                      d="M64.58,43.12h0l.06,0a.19.19,0,0,0,.09-.05.08.08,0,0,0,0,0,.29.29,0,0,0-.28-.48h0a.25.25,0,0,0-.18.14.33.33,0,0,0,0,.06v0s0,0,0,0C64.22,43,64.35,43.21,64.58,43.12Z"/>
+                <path class="cls-1"
+                      d="M64.8,63.18h-.32a3.24,3.24,0,0,0-.67,0,.81.81,0,0,0-.52.46c-.07.17-.08.29-.06.3a2.44,2.44,0,0,0,.94-.07,1.7,1.7,0,0,0,.62-.28l.07,0a.11.11,0,0,0,.06,0s0,0,.09-.08a.18.18,0,0,0-.06-.23C64.81,63.17,64.82,63.2,64.8,63.18Zm-.7.49c-.35.12-.73.21-.84.26.07-.09.25-.46.6-.5a3.94,3.94,0,0,1,.6,0A1.13,1.13,0,0,1,64.1,63.67Z"/>
+                <path class="cls-1"
+                      d="M63.86,66.3a2.15,2.15,0,0,0-.52-.13l-.36,0a1,1,0,0,0-.78.31,1.22,1.22,0,0,0-.36,1,2.13,2.13,0,0,1,.52-.88.73.73,0,0,1,.59-.17l.35,0a2.92,2.92,0,0,1,.45.08l0,0v0a.5.5,0,0,1-.07.08c-.1.11-.24.24-.33.32-.34.14-.68.19-.68.22a1.18,1.18,0,0,0,.77,0,3.25,3.25,0,0,0,.42-.31l.09-.1a.5.5,0,0,0,.1-.19C64.1,66.45,64,66.34,63.86,66.3Z"/>
+                <path class="cls-1"
+                      d="M60.42,68.86c-.32-.14-.6,0-.57,0s.07,0,.16,0a.86.86,0,0,1,.28.11s0,.06,0,.06-.05,0-.05,0a1.49,1.49,0,0,1-.46.07.49.49,0,0,1-.19,0c-.06,0,.05,0,.05.07l0,.07s0,0,0,0,0,0,0,0,0,0,0,0l.09,0a1.23,1.23,0,0,0,.41,0l.19,0a.58.58,0,0,0,.25-.12.26.26,0,0,0,.07-.24A.4.4,0,0,0,60.42,68.86Zm-.71.46s0,0,0,0S59.77,69.41,59.71,69.32Z"/>
+                <path class="cls-1"
+                      d="M58,62.47a.81.81,0,0,0-.31-.06,2.63,2.63,0,0,0-.77.06c-.26,0-.52.06-.73.08l-.15,0-.06,0s-.05.07,0,.08.09.06.09.06,0,0,0-.07h.18a3.58,3.58,0,0,0,.74,0,3.3,3.3,0,0,1,.72,0l.18,0h0s0,0,0,0-.35.38-.54.42a.72.72,0,0,1-.34-.05l-.33-.1a1.21,1.21,0,0,0-.33-.06s.1.09.28.18l.32.15a.91.91,0,0,0,.43.11.83.83,0,0,0,.42-.2L58,63a.59.59,0,0,0,.18-.14.24.24,0,0,0,.05-.17.2.2,0,0,0-.07-.15A.37.37,0,0,0,58,62.47Z"/>
+                <path class="cls-1"
+                      d="M68,32.6a9.45,9.45,0,0,1-.92.58c-.18.1-.39.2-.62.3s-.48.18-.76.26l-.06,0-.28.05h0a6.6,6.6,0,0,1-.84.16l-.14,0h-.21l-.5,0-.55,0a3.85,3.85,0,0,1-.48,0A15.57,15.57,0,0,1,60,33.73a25,25,0,0,1-2.47-.64A9.23,9.23,0,0,1,55.11,32l0,0-.84-.59-.41-.32-.28-.22v-.09l0-.24c0-.16.08-.32.13-.48a6.91,6.91,0,0,1,.37-.95,10.46,10.46,0,0,1,2.48-3.28,8.38,8.38,0,0,1,3.31-2.09,4.94,4.94,0,0,1,3.44.5l.66.32a6.68,6.68,0,0,1,.78.47,4.36,4.36,0,0,1,.85,1,1,1,0,0,1,.12.15l.24.45.08.15a21.9,21.9,0,0,1,1.45,3.34A13.61,13.61,0,0,1,68,31.84s0,.75,0,.76a3.9,3.9,0,0,0,.18-2,16.49,16.49,0,0,0-.59-2.52,10.8,10.8,0,0,0-1.14-2.52,5.56,5.56,0,0,0-1.16-1.29,11.65,11.65,0,0,0-1.62-.88,7.72,7.72,0,0,0-1.87-.59,4.76,4.76,0,0,0-2.12.1,6.69,6.69,0,0,0-2,1,12.1,12.1,0,0,0-1.67,1.36,11.5,11.5,0,0,0-2.57,3.55,10,10,0,0,0-.38,1c-.05.18-.09.36-.13.54s0,.18,0,.29,0,.29,0,.43l.33.27.21.16c.14.1.28.22.43.32l.86.58h0a9.39,9.39,0,0,0,2.61,1.13,23,23,0,0,0,2.54.58,12.77,12.77,0,0,0,4.43.18,7.53,7.53,0,0,0,2.83-1A2.43,2.43,0,0,0,68,32.6Z"/>
+                <path class="cls-1"
+                      d="M70,34.8a14.28,14.28,0,0,0,.16-3.36,31.65,31.65,0,0,0-.28-3.67A11.8,11.8,0,0,0,68.67,24a8.88,8.88,0,0,0-2.61-3h0l0,0a9.26,9.26,0,0,0-5.51-2,27.83,27.83,0,0,0-4.85.52,17.35,17.35,0,0,0-3.33,1c-.8.34-1.23.63-1.3.65a16.69,16.69,0,0,0-1.49,1.06,25.2,25.2,0,0,0-3.12,3,24.7,24.7,0,0,0-1.78,2.24l-.42.61-.32.47-.2.29-.1.15c0,.05.06.09.08.14l.47.54.28.33.55.6a47.56,47.56,0,0,0,4.91,4.66,25,25,0,0,0,2.8,2l.74.43.76.38c.51.24,1,.45,1.49.67,2,.84,3.79,1.61,5.42,2.14.36.11.69.21,1,.29a9.31,9.31,0,0,0,1.26.28,7.51,7.51,0,0,0,1.82,0c1-.08,1.55-.41,1.49-.47s-.13.05-.38.1a5.26,5.26,0,0,1-1.13.1A6.89,6.89,0,0,1,63.45,41a15.08,15.08,0,0,1-2.18-.67C59.7,39.76,57.9,38.94,56,38c-.48-.22-1-.45-1.45-.7l-.7-.38c-.23-.14-.47-.28-.69-.43a24.1,24.1,0,0,1-2.66-2,48.11,48.11,0,0,1-4.69-4.67l-.52-.6L45,29l0,0s0,0,0-.05v0l.11-.14c.14-.21.29-.41.43-.61A25.21,25.21,0,0,1,47.32,26a24.3,24.3,0,0,1,3-2.81c.79-.61,1.31-.89,1.36-.94s.44-.27,1.14-.58a16.12,16.12,0,0,1,3.07-1,29,29,0,0,1,4.62-.59A8.32,8.32,0,0,1,65.4,21.8l0,0a7.92,7.92,0,0,1,2.42,2.63A11,11,0,0,1,69,27.9a34.74,34.74,0,0,1,.39,3.57,13.85,13.85,0,0,1,0,3.23,13.51,13.51,0,0,1-1.65,4.65c-.3.52-.57.92-.76,1.2a3,3,0,0,0-.29.42c0,.05.6-.44,1.3-1.47A12.55,12.55,0,0,0,70,34.8Z"/>
+                <path class="cls-1"
+                      d="M90.87,87.6c-.14-.21-.33-.38-.48-.58a5.28,5.28,0,0,0-1.18-.92,4.88,4.88,0,0,0-2.86-.55,9.6,9.6,0,0,0-2.69.7c-.85.33-1.63.75-2.4,1.13s-1.55.77-2.3,1.15c-3,1.57-5.75,3.1-8.4,4.3a32.68,32.68,0,0,1-7.44,2.52,18.8,18.8,0,0,1-6,.23L56,95.41l-1-.25-1.6-.4c-.43-.11-.76-.18-1-.23L52,94.46a1.07,1.07,0,0,0,.32.12l.48.16s0-.06,0-.06,0,0,0,.07l.43.13,1.59.46.9.26a1.69,1.69,0,0,1,.6.93,5.24,5.24,0,0,1-.28,2.94,8.63,8.63,0,0,1-1.71,2.47,12,12,0,0,0-.9,1.1c-.53-.11-1.06-.23-1.57-.37a13.43,13.43,0,0,1-3.16-1.31c-.18-.09-.35-.19-.52-.29l.67-.25a10,10,0,0,0,2.89-1.66,3.85,3.85,0,0,0,1-1.49,4.4,4.4,0,0,0,.25-1.53,3.81,3.81,0,0,0-.22-1.39h-.06a9.38,9.38,0,0,1,0,1.39,3.69,3.69,0,0,1-1.34,2.67,9.58,9.58,0,0,1-2.79,1.45c-.41.15-.76.26-1,.33l-.16,0h0l-.22-.15-.35-.24c-.18-.13-.42-.3-.62-.47-.43-.33-.9-.78-1.34-1.17,0,.53,0,1,0,1.56l-.81-1.7-.39-.84-.56.74-.6.77-.08.1s0,.06,0,0v-.06l-.06-.3L42.08,97c-.06-.31-.13-.61-.2-.92l-.1-.47a3,3,0,0,0-.16-.56c-.08-.17-.27-.8-.48-1.5.22,0,.49.08.78.11a6.32,6.32,0,0,0,1.56,0,5.66,5.66,0,0,0,1.69-.54,3,3,0,0,0,1.24-.86,3.87,3.87,0,0,0,.58-.93c.08-.24.16-.46.23-.66.13-.39.25-.72.32-1,.17.33.29.52.29.54s.21.33.53.77a18.44,18.44,0,0,0,1.22,1.54A7.72,7.72,0,0,0,51,93.86a2.27,2.27,0,0,0,.79.37s0,0,0,0-.28-.23-.66-.57a8.81,8.81,0,0,1-1.26-1.39c-.42-.55-.8-1.14-1.08-1.59l-.46-.78a7.06,7.06,0,0,1-.47-.75,6.25,6.25,0,0,1-.6-1.76,14.28,14.28,0,0,1-.1-2.73h0a5.07,5.07,0,0,0-.37,2.64,1.56,1.56,0,0,0-.15.06c-.21.07-.51.15-.88.24a20.91,20.91,0,0,1-2.75.35,3.89,3.89,0,0,1-2.53-.76,3.19,3.19,0,0,1-.64-.65,6,6,0,0,1,.15-1,29.43,29.43,0,0,1,.88-3c.18-.43.37-.84.57-1.24-.09-.16-.14-.31-.2-.41h0c0,.11.11.25.2.41a3,3,0,0,0,.29.44,3.72,3.72,0,0,0,2.33,1.41,6.18,6.18,0,0,0,2.67-.18,6.1,6.1,0,0,0,.81-.28,3.61,3.61,0,0,0-.38,1.69c.11,0,.35-1,1.22-2.28a29.25,29.25,0,0,1,3.88-4.15c.76-.73,1.48-1.54,2.12-2.29a26.07,26.07,0,0,0,1.67-2.17,13,13,0,0,0,1-1.73,1,1,0,0,1,.07-.15c.15.56.42,1.41.67,2.29.21.72.42,1.45.54,2s.19.91.2.92,0,.11,0,.27.06.4.1.68c.08.56.17,1.32.26,2.07.12,1.12.24,2.22.33,2.71h0l-.28.11s-.55.27-.56.29c-.83.53-1.27.84-2,1.3a2.9,2.9,0,0,0-.78.34,1.43,1.43,0,0,0-.81,0,1.34,1.34,0,0,0-.68.72,2.37,2.37,0,0,0-.18.55,2.14,2.14,0,0,0-.06.31.86.86,0,0,0,0,.16v.23c.18.27.36.56.55.86,0,.06.09.06.14.08l.17,0,.23.06.45.1.93.18c.09,0,.14,0,.3,0h.2l.08,0h0a.14.14,0,0,0,.08,0l.44-.34,2.82-2.14c.19-.56.37-1,.49-1.36l.18-.52a1.47,1.47,0,0,1,0-.17v-.13h0v0h0v0h0a.28.28,0,0,0,0-.11l0,0c.1-.32.25-.76.43-1.28s.38-1.14.59-1.79c.11-.32.23-.66.34-1l.18-.51h0l0,0h0a1.06,1.06,0,0,0,.07-.22V78l0-.28a52.52,52.52,0,0,0,.29-5.39h.06c0,.15,0,.34.06.57,0,.61.14,1.49.24,2.56.05.54.11,1.12.17,1.74l.06.48,0,.24,0,.13c0,.06,0,.17.05.21.08.3.15.6.23.92.31,1.39.66,2.89,1,4.43l2,1,2.58,0a3,3,0,0,0,1.34-.21,1.61,1.61,0,0,0,.55-.48c.13-.18.23-.35.34-.53s.2-.34.29-.52a2.73,2.73,0,0,0,.13-.29.69.69,0,0,0,0-.39A1.79,1.79,0,0,0,71.73,81a1.56,1.56,0,0,0-.52-.34,1.08,1.08,0,0,0-.64,0,6.59,6.59,0,0,0-.92.45,9.28,9.28,0,0,1-1.53.68,6.81,6.81,0,0,1-1.29.11,3.92,3.92,0,0,0-.51.07,3.63,3.63,0,0,1-.2-.57,9.13,9.13,0,0,1-.25-2.8,7,7,0,0,1,.65-2.7,3.7,3.7,0,0,0,.16-.4.8.8,0,0,0,0-.44l0-.12c.25-.25.52-.54.79-.86a11.06,11.06,0,0,0,1-1.36c.25-.38.39-.65.4-.66s.14-.3.32-.72.39-1,.59-1.52a14.79,14.79,0,0,0,.53-1.69c.39-.57.75-1.13,1.07-1.68a15.68,15.68,0,0,0,2-5.15,1,1,0,0,0,.4,0,2.14,2.14,0,0,0,.48-.27,1.17,1.17,0,0,0,.24-.21.55.55,0,0,0,.14-.35,1.59,1.59,0,0,0-.18-.64,2.35,2.35,0,0,0-.29-.49,1.17,1.17,0,0,0-.34-.28c-.11-.06-.18-.07-.18-.08s-.09.07-.1.16v0a.21.21,0,0,0,0,.13.61.61,0,0,1,.36.23,2,2,0,0,1,.47.93c0,.16-.12.29-.27.41a1.92,1.92,0,0,1-.41.3.86.86,0,0,1-.34.09,4.88,4.88,0,0,0,.08-.61,6.06,6.06,0,0,0,.06-1c0-.18,0-.34,0-.48s0-.18,0-.26a2.49,2.49,0,0,0-.09-.6c-.07,0,0,.85-.2,2.3a15.37,15.37,0,0,1-2.22,5.6,28.34,28.34,0,0,1-2.4,3.28,5.89,5.89,0,0,1-3.79,1.9,16.42,16.42,0,0,1-2.35.22,15.88,15.88,0,0,1-2.4-.12,10.2,10.2,0,0,1-4.36-2L54.93,69h0a1.6,1.6,0,0,0,.26-1.3.18.18,0,0,0-.19-.11h-.83l-.21,0,.06.2s0,.12-.22.24l-.13-.13a6.9,6.9,0,0,1-1.1-1.62l-.18-.35q-.15-.32-.27-.63h0s0,0,0,0a6.44,6.44,0,0,1-.24-.61,1,1,0,0,0,.21.11.26.26,0,0,1,.1,0,.23.23,0,0,1,.13.16c0,.13-.14.23-.2.29a0,0,0,0,0,0,0,.24.24,0,0,0,.14,0,.37.37,0,0,0,.27-.31.48.48,0,0,0-.17-.41.36.36,0,0,0-.18-.11,1.48,1.48,0,0,1-.42-.19s0,0-.05,0A21.33,21.33,0,0,1,51,61.33c-.16-.74-.28-1.48-.38-2.2l.12,0c.26-.08.66-.2,1.21-.39a10.51,10.51,0,0,0,2.11-1c.41-.26.83-.56,1.28-.91l.74-.6c.31-.25.48-.46.79-.72a6.55,6.55,0,0,1,.56-.6l0,0a7.67,7.67,0,0,1-1,.07c-.4,0-.82.08-1.16.09l-.82,0A9.68,9.68,0,0,1,53,55a5.38,5.38,0,0,1-1.85-.65,3.29,3.29,0,0,1-.67-.53c0-.29.08-.58.13-.86a15.28,15.28,0,0,1,.42-1.65,4.78,4.78,0,0,0,.81.2,6.94,6.94,0,0,0,2-.08l.62-.09.81-.14.89-.16.48-.09c.12,0,0,0,0-.06s-.14,0-.15,0-.17-.1-.17-.11l-.17-.07a3.84,3.84,0,0,1-.8-.43,2.34,2.34,0,0,1-.38-.28c-.09-.07-.16-.16-.24-.23a4.26,4.26,0,0,1-.43-.57c-.08-.16-.16-.3-.22-.45a10.08,10.08,0,0,1-.55-1.74l-.18-.75c.18-.35.3-.6.37-.74h0c.27.09.49.14.74.2,1.07.27,2.13.53,3.16.82l-.57.44a17.91,17.91,0,0,0-2.42,2,20.84,20.84,0,0,0,2.69-1.65l1-.64c.58.17,1.14.34,1.69.52l.67.22-.09.07a13.14,13.14,0,0,0-1.21,1.12,8.94,8.94,0,0,0-1.49,1.81h0a15.19,15.19,0,0,0,1.8-1.48c.45-.37.91-.73,1.27-1l.45-.3a16.2,16.2,0,0,0,3.42,1,9.28,9.28,0,0,0,2,0v0a1,1,0,0,0,.19.14,3.7,3.7,0,0,0,.44.28,1.73,1.73,0,0,0,.47.15,2.79,2.79,0,0,0,1.18,0,6.28,6.28,0,0,0,.66-.23s.07.17.12.33a.27.27,0,0,1,.08.19h0v0a1.16,1.16,0,0,1-.18.51,1.92,1.92,0,0,1-.18.29A2.32,2.32,0,0,1,68.3,51l-.51.09-.61.1a4.7,4.7,0,0,0-.71.14l-.16,0-.09,0s0,.06,0,.08a1.84,1.84,0,0,0,.15.35,2.13,2.13,0,0,0,.52.6,3.18,3.18,0,0,0,.58.35,3.49,3.49,0,0,0,1.12.31A6.5,6.5,0,0,0,70.32,53c.37-.07.64-.13.85-.19h0l.31.84c.07.18.13.35.19.52l-.08.1a2.71,2.71,0,0,1-1,.68,3.82,3.82,0,0,1-1.73.24l-1.06-.09c-.25,0-.58-.08-.94-.17s-.83-.23-1.29-.36l.11.14,0,0v0l0,0,.35.32a9.75,9.75,0,0,0,.74.64l.43.32.29.18a5.33,5.33,0,0,0,.56.32,5.15,5.15,0,0,0,2.26.61,5.47,5.47,0,0,0,2.27-.2c.29.78.45,1.29.55,1.28s.09-.4,0-1c.08-.35.21-.93.38-1.5s.28-.88.38-1.27a3,3,0,0,0,.08-.71s0-.08,0-.22a1.42,1.42,0,0,0-.24-.51,2.22,2.22,0,0,0-1.29-.7l-.4-.13c-.21-.81-.44-1.57-.62-2.2s-.46-1.5-.56-1.87a1.08,1.08,0,0,1-.06-.18H71a4.87,4.87,0,0,0,1-.18,2.84,2.84,0,0,0,1.33-.85c.29-.32.39-.57.36-.6h0c-.07,0-.24.22-.49.41a3.22,3.22,0,0,1-1.28.58,4.44,4.44,0,0,1-1.4,0l-.2,0a2.7,2.7,0,0,0,.53-.46,2.11,2.11,0,0,0,.41-.59,1.07,1.07,0,0,0,.1-.24c-.06-.06-.26.3-.68.65a3.92,3.92,0,0,1-1.83.81,7.36,7.36,0,0,1-2,.12,4.51,4.51,0,0,1-.92-.2l-.26-.08a2.87,2.87,0,0,1-.58-.27l-.29-.22,0,0s0,0,0,0a.29.29,0,0,0-.41-.42s0,0,0,0l0,.07-.48-.41a12,12,0,0,1,1.08-.68c.37-.18.66-.24.66-.29s-.31-.07-.75,0a9.59,9.59,0,0,0-1.34.61l0,0-1.07-.94.69-.23c1.49-.49,3-.87,3-1s0,0-.11,0a15.13,15.13,0,0,0-2.27.37c-.25,0-.49.1-.74.16l-1,.27c-.47-.39-.81-.64-.86-.58a5.35,5.35,0,0,0,.58.66l-.8.25c-.58.19-1,.36-1,.37a8.64,8.64,0,0,0-1,.5l-.41.28c-1.2-.39-2.46-.76-3.71-1.11-.23-.07-.49-.13-.67-.2s-.43-.18-.65-.28l-1.32-.59L52,43.61c.7-.19,1.36-.35,1.9-.47.78-.17,1.32-.22,1.35-.23s.56-.1,1.36-.19a20.23,20.23,0,0,1,2.88-.07A23,23,0,0,1,62.3,43c.68.12,1.15.24,1.27.24s0,0,0,0a4.16,4.16,0,0,0-1.24-.48l-.62-.16a19.94,19.94,0,0,0-2.27-.37,18.9,18.9,0,0,0-3-.06,12.09,12.09,0,0,0-1.41.14s-.59.08-1.38.29-1.56.44-2.44.75h0l-1.73-.82c-1.65-.8-3.19-1.57-4.49-2.27-.65-.35-1.24-.68-1.75-1s-.9-.59-1.29-.87c-.75-.51-1.19-.82-1.24-.86s-1-.64-2.44-1.54L35.8,34.37l-.12-.07s0,0,0-.07h0l.09,0,.28-.17.76-.44,1.6-.89-3.6-1-1-.27-.32-.07.2-.15.14-.1.42-.28,2-1.39L37,29l0,0L37,29l-.1,0-.18-.07-.38-.15-1.38-.52L34.49,28l-.12,0a.15.15,0,0,1-.09-.06.24.24,0,0,1,0-.36l.15-.16.16-.2c.11-.13.21-.27.3-.4a5.62,5.62,0,0,0,.51-.83,10.1,10.1,0,0,0,.7-1.67,14.9,14.9,0,0,0,.64-2.93,10,10,0,0,0,0-2.16c.91.8,1.49,1.23,1.56,1.16s-1.09-1.61-2.85-3.75a30.91,30.91,0,0,1-2.47-4l-.15-.29,0-.07v0L32.79,12c-.07-.19-.13-.39-.2-.6a12.83,12.83,0,0,1-.29-1.26,11.6,11.6,0,0,1-.18-1.3c0-.22,0-.44,0-.64s0-.21,0-.31a.66.66,0,0,1,0-.14V7.72a.49.49,0,0,1,.08-.18c.05,0,.11,0,.19-.07l.54-.13.66-.13c.89-.16,1.78-.3,2.64-.4s1.71-.18,2.45-.2a13.41,13.41,0,0,1,2.07.24c1.36.24,2.51.52,3.32.72l1,.26.22-.23c.1-.09.18-.19.28-.29s.12-.12.17-.19a7.14,7.14,0,0,1,.56-.54,3.63,3.63,0,0,1,.46-.34A.9.9,0,0,1,47,6.16L47.19,6a20.75,20.75,0,0,1,2.49-1.59c.48-.26,1-.51,1.49-.74l.5-.22.55.1a11.74,11.74,0,0,1,2.58.83,10.61,10.61,0,0,1,1.59.91c.27.19.56.38.86.6l.45.34c.19.14.38.29.58.46l.25.23a2.52,2.52,0,0,1,.74.52c.1.16,0,0,0-.11a2.6,2.6,0,0,1,0-.26,1,1,0,0,1,0-.3c-.37-1.25-.69-2.31-.95-3.18-.14-.42-.25-.8-.37-1.13l1,0c.88,0,1.62.08,2.15.13l.9.08.57,0,.17.15A8.16,8.16,0,0,1,65,7a4.46,4.46,0,0,0,.17.54,39.58,39.58,0,0,1,.28-4.77l.58,0h.76l.45,0a2.92,2.92,0,0,0,.44-.06c.45-.07.88-.17,1.32-.25l.28.29a6.8,6.8,0,0,1,1,1.53c.08.17.17.36.24.55a5.8,5.8,0,0,1,.21.89c0,.3.08.62.12.94,0,.16.05.33.07.49l0,.25,0,.13s0,0,0,0l.15-.49a15.41,15.41,0,0,1,.75-2,8.45,8.45,0,0,1,.67-1.2,3.69,3.69,0,0,1,.72-.78,6.43,6.43,0,0,1,.73-.48,3.27,3.27,0,0,1,.42-.21,16.23,16.23,0,0,1,2.16.54c.85.29,1.61.62,2.26.86s.93.34,1.23.42c.36.4.64.68.84.87s.34.29.38.27,0-.18-.19-.43l-.36-.61s0,0,0,0l.4,0h.49c.5,0,1-.09,1.58-.16a15.37,15.37,0,0,1,1.63-.14,2.89,2.89,0,0,1,1.36.23c.66.32.78,1.28.84,1.91a11.5,11.5,0,0,1,0,1.16s.06.78,0,1.87A25.11,25.11,0,0,1,86.7,13a29.25,29.25,0,0,1-1,3.84,7.62,7.62,0,0,0-.54,1.75s0,0,.09,0c0,.31,0,1.08,0,1.84,0,.5-.06,1-.1,1.38s-.07.63-.07.65,0,.27-.08.64a11.17,11.17,0,0,1-.21,1.19V24c0-.29,0-.63,0-1a7.16,7.16,0,0,0-.42-1.35,4.79,4.79,0,0,0-1-1.34A6.94,6.94,0,0,0,81.87,19,6.82,6.82,0,0,0,78,18.11a4.21,4.21,0,0,0-2,.82,6.4,6.4,0,0,0-1.47,1.42,5.3,5.3,0,0,0-.85,1.74c-.18.57-.31,1.11-.42,1.62a32.86,32.86,0,0,0-.55,3.49c0,.08-.16,1.47-.21,3.51a15.86,15.86,0,0,0,1.33,7.34l.12.23.15.28a.6.6,0,0,0,.68.32,1.42,1.42,0,0,0,.32-.07,2.76,2.76,0,0,0,.3-.15l.42-.29c.54-.39,1-.78,1.53-1.17,1-.77,1.87-1.51,2.62-2.17a15.16,15.16,0,0,0,2.53-2.64,1.54,1.54,0,0,0,.09-.24l.38.46c0,.07.1.12.08.11h0c-.07.06-.19.15-.31.27a5.54,5.54,0,0,0-.83,1.07c-.52.93-1.07,2.09-1.78,3.18a8.35,8.35,0,0,1-1.16,1.48,7.12,7.12,0,0,1-1.32,1,12.63,12.63,0,0,0-1.39.88A4,4,0,0,0,77.78,40l.72-.37a4.41,4.41,0,0,0,.78-.52,9.16,9.16,0,0,0,1.36-1.48c.81-1.09,1.47-2.3,2-3.11a4.89,4.89,0,0,1,.72-.85l.24-.19c.14-.1.25-.15.26-.16l.09-.06s0-.07.1-.39v0c0-.09,0-.2.08-.35h0l2.52-.84-1.65-1-.47-.27-.15-.08a1.94,1.94,0,0,1,.13-.2c.12-.16.25-.32.36-.48l.69-.91c.43-.58.8-1.09,1-1.46l.23-.33-.35.13c-.31.11-1.54.25-2.19.34a2.62,2.62,0,0,0-.4.06c.1,0,1.52,0,2.28-.11-.28.29-.62.65-1,1.06s-.49.56-.76.85l-.41.46-.65.76,1.2.78.15.13-.15,0h0l-.28.08-1.11.31-.51.14c.12-.37.29-.94.47-1.56.29-1,.59-2.12.81-2.93h0c-.16.57-.37,1.26-.6,1.85-.06.17-.13.34-.19.49-.53,1.21-.65,2.28-1,2.71s-.56.71-.56.71c-.44.36-1.09.88-1.86,1.48S78,36,77,36.76c-.5.36-1,.74-1.55,1.09l-.41.26-.14.07-.15,0s-.11,0-.12-.07L74.52,38l-.1-.22a13.5,13.5,0,0,1-1-3.66,14.36,14.36,0,0,1-.13-1.69.54.54,0,0,0,.17.07,3.86,3.86,0,0,0,1.09,0,15.52,15.52,0,0,0,2.54-.42,14,14,0,0,0,3.33-1.35,6,6,0,0,0,.83-.59,2.73,2.73,0,0,0,.38-.38.58.58,0,0,0,.1-.12l.09-.16c0-.09.06-.19.08-.27a7.18,7.18,0,0,0,.15-2.11,4.53,4.53,0,0,0-.64-2,11.8,11.8,0,0,0-1.13-1.66,4.19,4.19,0,0,0-1.46-1.21,4.57,4.57,0,0,0-1.65-.42,4.48,4.48,0,0,0-2.45.42l-.32.2,0-.09a4.39,4.39,0,0,1,.69-1.51,5.45,5.45,0,0,1,1.25-1.29A3.61,3.61,0,0,1,78,18.81a6.21,6.21,0,0,1,3.58.71,6.62,6.62,0,0,1,1.33,1.08,4.69,4.69,0,0,1,1,1.17A10.2,10.2,0,0,1,84.37,23c0,.4.09.74.13,1s.08.54.11.7v0a14.12,14.12,0,0,0-.43,1.68,3.35,3.35,0,0,0,.26-.57c.14-.35.31-.82.46-1.31s.25-1,.31-1.36.1-.64.1-.65,0-.28.06-.67,0-.89,0-1.39a12.72,12.72,0,0,0-.14-1.91l0,0a.79.79,0,0,1,0-.14s0,0,0,.09a8.88,8.88,0,0,0,.88-1.45,21.5,21.5,0,0,0,1.48-3.82,22.89,22.89,0,0,0,.78-4.09,18.2,18.2,0,0,0,.09-2s0-.5-.12-1.26A5.66,5.66,0,0,0,88,4.57a2.48,2.48,0,0,0-1.28-1.4A3.79,3.79,0,0,0,84.85,3a17.19,17.19,0,0,0-1.7.29l-1.54.32-1.29.24c-.26-.2-.61-.45-1.06-.74A23.2,23.2,0,0,0,77.1,1.78,13.9,13.9,0,0,0,75,.91L74.13.66,73.34.45l-.4-.11c-.17,0-.35-.08-.51-.1a10.33,10.33,0,0,0-1.83,0c-.69,0-1.35.11-2,.18-.44,0-.85.1-1.23.13a1.72,1.72,0,0,1-.31,0,2.61,2.61,0,0,1-.28,0L66.14.47l-.42,0L64.89.34C63.71.2,62.8.11,62.39.07l-.23,0-.93,0c-.58,0-1.37,0-2.31,0-.71,0-1.49.09-2.33.19l-.88.11a15.68,15.68,0,0,0-3.64,1l-.46.22-.41.21-.81.46a0,0,0,0,1,0,0h0c-.51.31-1,.62-1.46,1a15.45,15.45,0,0,0-2.4,2.07l-.29.31A.27.27,0,0,0,46,5.37l-1.38-.31c-.86-.17-2.06-.42-3.54-.61a14.83,14.83,0,0,0-2.53-.15c-.89.07-1.76.2-2.67.35s-1.82.34-2.75.58l-.71.19-.37.1-.18.05-.27.1a1.78,1.78,0,0,0-1,.62,2.26,2.26,0,0,0-.37,1.11c0,.1,0,.22,0,.3v.21c0,.13,0,.27,0,.4s0,.52.08.77q.12.75.3,1.47c.13.48.27.94.44,1.4.1.23.18.45.29.67l.08.19a.75.75,0,0,0,.07.12l0,.07.18.29a27.93,27.93,0,0,0,3,4c.73.71,1.38,1.31,1.92,1.79h0a16.86,16.86,0,0,1-.25,2.24,16.17,16.17,0,0,1-.79,2.8,8.25,8.25,0,0,1-1.86,3,.92.92,0,0,0-.12,1.26,1,1,0,0,0,.28.23,2.56,2.56,0,0,0,.31.14l.44.18.26.12.17.07c.05,0,.12,0,.13.07l-.16.09-.15.1-.07,0-.21.13-.85.54-2.59,1.66,3.41,1,.59.17.18,0,0,0,.16.06-.15.07a3.36,3.36,0,0,0-.48.28l-.34.24a1.12,1.12,0,0,0-.27.26c-.09.1-.08.18-.13.28s-.09.19,0,.28a2.36,2.36,0,0,0,.15.25l.22.26c.18.16.43.31.6.44L37.65,37,40,38.59l1.24.82c.35.24.85.58,1.38.88s1.16.65,1.82,1c1.34.68,2.92,1.42,4.61,2.18l.79.35a13,13,0,0,0-1.67.83c-.69.41-1.05.84-1,.88a9.81,9.81,0,0,1,1.13-.66,17.15,17.15,0,0,1,2.08-.81l1.27.55.84.35-.9,1.87c-.32.68-.71,1.44-1.16,2.44-.07.16-.13.32-.2.49a14.45,14.45,0,0,0-1.45.77c-.52.33-1.08.69-1.58,1l-.68.52-.29.23a.74.74,0,0,1-.13.12l-.14.13a.83.83,0,0,0-.25.67,1.42,1.42,0,0,0,0,.25,2.53,2.53,0,0,0,.13.35,4.26,4.26,0,0,0,.45.71c.46.53,1.14.89,1.6,1.4a3.2,3.2,0,0,1,.79,1.74c0,.14.06.26.08.37s0,.08,0,.12l0,0,0,0h0s0,0,0,0h0v0s0,0,0,0l0,0v0h0v0h0s-.06,0-.07,0h0a.94.94,0,0,0-.55-.2,1.41,1.41,0,0,0-.41.07.26.26,0,0,0,0-.21c0-.08,0-.15-.05-.25s0-.46-.2-.63-.24,0-.35,0a1.68,1.68,0,0,0-.36.28l-.33.27a1.48,1.48,0,0,0-.29.36,6.14,6.14,0,0,0-.4.86,4.7,4.7,0,0,0-.18.47,1.07,1.07,0,0,0,0,.64,1.51,1.51,0,0,0,.91.83,5,5,0,0,0,1.13.28A9.11,9.11,0,0,0,48.9,61a2.51,2.51,0,0,0,.65-.08l.19-.07c0,.22.09.45.15.68a21.2,21.2,0,0,0,1.6,4.74c.14.29.29.57.46.85A12.34,12.34,0,0,1,50.62,69s-.21.21-.51.49l-.17.19c-.93,1-1.84,2.08-2.76,3.12h0s0,0,0,0h0c-.6.66-1.27,1.33-1.88,2-.46.46-.89.94-1.33,1.42l-.81,1.19c-.33.57-.65,1.13-1,1.67a.83.83,0,0,0-.08.12c-.11.22-.34.76-.52,1.2l-.1.19a2.77,2.77,0,0,1-.1.26h0v0l0,.05h0a24.24,24.24,0,0,0-1.39,4.43c-.07.32-.12.6-.17.89l-.06.36v.06a6.75,6.75,0,0,0,.25,3.24h0v0a4.91,4.91,0,0,0,.39,1,11.84,11.84,0,0,1-.41-2.9c0-.27,0-.55,0-.83a2.08,2.08,0,0,0,.41.35,4.1,4.1,0,0,0,2.8.74,14.86,14.86,0,0,0,2.79-.51,3.91,3.91,0,0,0,1-.4.28.28,0,0,0,0,.09,6.53,6.53,0,0,0,.51,2l.1.19c-.11.24-.25.57-.43,1-.09.2-.17.42-.27.65a2.74,2.74,0,0,1-.39.64,3.62,3.62,0,0,1-1.36.93,5.12,5.12,0,0,1-3.07.42,8.94,8.94,0,0,1-1-.17c-.25-.82-.49-1.62-.57-1.81.12.47.93,3.59,1,4.08A25.2,25.2,0,0,1,42,99.92c.12.34.23.69.33,1l.15.08c.15,0,.36-.23.54-.46l.58-.73,0-.07c.51,1,1,2.12,1.53,3.2l1.12,2.35-.07-2.6c0-.49,0-1,0-1.48v-.16s0-.11,0-.11l.12.09.45.31c.5.33,1,.64,1.55.93a14.77,14.77,0,0,0,3.39,1.37,66.05,66.05,0,0,0,7.18,1.22l.9.13.18,0h.53l.31,0,1.84-.15c1.22-.11,2.45-.26,3.67-.45s2.44-.42,3.65-.71a18.53,18.53,0,0,0,3.56-1.23l3.05-1.22c.91-.18,2-.36,3-.59.49-.14,1-.25,1.48-.43l.74-.25.71-.31a16.1,16.1,0,0,0,5.06-3.38,12.81,12.81,0,0,0,3.22-5,12,12,0,0,0,.4-1.42,6.21,6.21,0,0,0,.13-.73l0-.36a1.76,1.76,0,0,0,0-.48Zm-19.73-4h0Zm-5.06-1.5h0Zm-1.3-10a9.59,9.59,0,0,0,2.31-.74,5.08,5.08,0,0,0,1.66-1.26c-.17.32-.34.62-.48.87s-.36.64-.37.65-.14.29-.32.69-.45.9-.74,1.38a10.11,10.11,0,0,0-1.16,2c0,.07.15,0,.33-.16a1.48,1.48,0,0,1,0,.27,25.11,25.11,0,0,0-.33,2.81c-.06,1.31-.06,2.23-.08,2.83,0,.32,0,.54,0,.69a.13.13,0,0,1,0,.06v0h0l.32-.06H66c.2,0,.48,0,.84,0a5.61,5.61,0,0,0,1.34,0,9.05,9.05,0,0,0,1.64-.62,7.83,7.83,0,0,1,.86-.38.73.73,0,0,1,.73.28,1.2,1.2,0,0,1,.31.65.85.85,0,0,0-.4-.16,1.51,1.51,0,0,0-.56.08.3.3,0,0,0-.17.09s0,0,0,0,0,0,.08,0a.38.38,0,0,1,.16,0,2.13,2.13,0,0,1,.5,0,.69.69,0,0,1,.42.35.46.46,0,0,1,0,.08l.29-.14h0l-.3.13a.28.28,0,0,0,0-.07l-.08.15c-.09.16-.19.32-.3.49l0,.07h0v0a1,1,0,0,0-.3-.23,0,0,0,0,0,0,0h-.06a1,1,0,0,0-.36-.06h-.19a.11.11,0,0,0-.08,0,.37.37,0,0,0-.17,0s0,0,0,0l0,0s0,0,.07,0a.39.39,0,0,1,.15,0h.1a1.64,1.64,0,0,1,.39.14.59.59,0,0,1,.18.17,1,1,0,0,1,.09.18,0,0,0,0,0,0,0,.28.28,0,0,1,0,.11h0l.27.19a.23.23,0,0,0,0-.1.28.28,0,0,1,0,.11l-.27-.19h0a.89.89,0,0,0,0-.11,0,0,0,0,1,0,0l-.09.11a1,1,0,0,1-.36.3,2.26,2.26,0,0,1-1.07.11l-2.42,0-1.5-.82q-.07-.43-.18-.87h0L64.82,79c0-.17-.07-.33-.11-.5l0-.25-.08-.29c0-.29-.06-.57-.08-.84,0-.62-.1-1.2-.15-1.73-.08-1.07-.14-1.95-.19-2.56,0-.25,0-.46,0-.61Zm5.4-24.77ZM69,48.9a1.31,1.31,0,0,1-1-.09.9.9,0,0,1-.27-.2.34.34,0,0,1,0-.15h0c.25-.08.49-.17.69-.25a8.55,8.55,0,0,0,1.35-.5h0c0,.06.07.12.1.13l.06,0,0,0h0a.76.76,0,0,1,.2.16v.08c0,.1-.13.22-.13.22l-.26.18A1.66,1.66,0,0,1,69,48.9Zm1.16,3.38a3.93,3.93,0,0,1-1.47.4,2.64,2.64,0,0,1-1.53-.43,1.27,1.27,0,0,1-.36-.37.57.57,0,0,1-.12-.23s0,0,.07,0l.12,0,.48,0,1.08-.1a2.94,2.94,0,0,0,1.93-.82l.47,1.26A4.92,4.92,0,0,1,70.15,52.28ZM72.08,57a10.19,10.19,0,0,1-1.62-.09,5.15,5.15,0,0,1-2.09-.67l-.53-.33-.23-.17-.08-.07-.14-.12,0-.05.08,0,.16,0,.18,0a10.67,10.67,0,0,0,1.09.12,4.36,4.36,0,0,0,2-.22,3.23,3.23,0,0,0,1.07-.67l.73,2a.66.66,0,0,0,0,.15A4.82,4.82,0,0,0,72.08,57Zm.32-4.22a1.84,1.84,0,0,1,.95.61,1.06,1.06,0,0,1,.11.44.79.79,0,0,1,0,.14,3.19,3.19,0,0,1,0,.4c0,.31-.19.81-.25,1.28,0,.21-.06.42-.08.62-.15-.86-.4-1.9-.66-2.93l-.16-.6Zm-5.09-4.62-.39.06Zm-2.62-.61a3.65,3.65,0,0,0,1,.49,4,4,0,0,0,1.07.17h.08a9.52,9.52,0,0,1-1.93-.13,15.12,15.12,0,0,1-2.81-.9l1.3-.85A14.16,14.16,0,0,0,64.69,47.56Zm-4.61-1.88s.38-.18.93-.4l1-.37c.3.33.66.7,1,1.08l-1.14.62-.53.3-1.12-.44-1.06-.37C59.68,45.84,60.05,45.69,60.08,45.68Zm14.37-23h0a5.88,5.88,0,0,1,2.18-.61h.51a4.3,4.3,0,0,1,1.53.45A3.85,3.85,0,0,1,80,23.66a6.79,6.79,0,0,1,1.6,3.48,7,7,0,0,1-.18,1.95.65.65,0,0,1-.07.21l0,.06-.07.08a2.46,2.46,0,0,1-.33.31,5.84,5.84,0,0,1-.77.53,11.78,11.78,0,0,1-2.26,1,9.85,9.85,0,0,1-1,.27,15.42,15.42,0,0,1-2.43.38h-.11a3.21,3.21,0,0,1-.81-.06.4.4,0,0,0-.29.05c0-.39,0-.77,0-1.13a3.25,3.25,0,0,1,0-.33h0c.09-1.82.25-3,.26-3.11s.1-1.45.46-3.41c.06-.36.15-.73.24-1.11,0,0,0,0,0-.06ZM70.79,2.15A8.43,8.43,0,0,1,72.26,2a1.48,1.48,0,0,1,.31,0l.41.05a3.64,3.64,0,0,0,.44.07l-.42.4a4.62,4.62,0,0,0-.72,1,13.45,13.45,0,0,0-.62,1.26c-.13.34-.28.75-.43,1.18a2.55,2.55,0,0,0-.08.26s0,.07,0,0V6.22l0-.16,0-.32q0-.3-.06-.57a3,3,0,0,0-.1-.5,5.46,5.46,0,0,0-.21-.61,12.39,12.39,0,0,0-.83-1.76C70.17,2.25,70.48,2.19,70.79,2.15Zm-6.13.63c.1.73.2,1.81.27,3.32a13.48,13.48,0,0,0-1.45-3.37ZM56,2.5c.41,0,.81,0,1.2,0,.19.34.39.77.61,1.28.31.7.73,1.82,1,2.46,0,0,.06.15.12.31s0,.17.09.27.11.28,0,.12-.28-.28-.58-.53l-.16-.13L57.85,6l-.45-.34L56.52,5a13.29,13.29,0,0,0-1.62-1A20.13,20.13,0,0,0,52.84,3,14.93,14.93,0,0,1,56,2.5ZM49.21,54.7c-.11-.18-.22-.34-.31-.51L48.81,54l-.05-.12v0h0l.27-.17.28-.18C49.27,53.92,49.23,54.3,49.21,54.7Zm1,5h0Zm.64-4.61A7.34,7.34,0,0,0,53,55.5a11.87,11.87,0,0,0,1.45,0l.82-.06.63-.07.55-.14.34-.08,0,0-.55.45a17.59,17.59,0,0,1-2.47,1.68,7.11,7.11,0,0,1-2.05.64,9.74,9.74,0,0,1-1.23.12h-.11q-.06-.6-.09-1.17a14.88,14.88,0,0,1,0-2Zm.72-5.31c.41-.88.85-1.72,1.17-2.38a1.42,1.42,0,0,1,.08-.18s0,0,0,0c.22.44.46,1,.85,1.69a4.45,4.45,0,0,0,.81,1,3.11,3.11,0,0,0,.28.23l.21.16a3.66,3.66,0,0,0,.52.28l.09,0,.14,0s.15,0,.05,0l-.29,0L55,50.9l-.51,0-.61,0a4.74,4.74,0,0,1-1.79-.19,3,3,0,0,1-.72-.4C51.45,50.17,51.53,50,51.62,49.77Zm-2,10.37c0,.12-.38.24-.71.24a7.76,7.76,0,0,1-1.08,0,4.52,4.52,0,0,1-1-.2,1.07,1.07,0,0,1-.64-.48.59.59,0,0,1,0-.35,4.29,4.29,0,0,1,.13-.44,8.29,8.29,0,0,1,.32-.82,1.08,1.08,0,0,1,.21-.29l.26-.25.18-.19c.06-.05.15-.13.22-.08s.08.27.15.39.11.27.07.34l-.1.11,0,0a1.08,1.08,0,0,0-.54.38.41.41,0,0,0,0,.34.48.48,0,0,0,.12.2,1,1,0,0,0,.13.14s.11,0,.15-.09.08-.15.05-.17l-.09-.08c0-.07-.1-.14-.07-.21s.2-.17.38-.26a1.52,1.52,0,0,1,.57-.18.85.85,0,0,1,.54.19c.16.12.32.23.43.33s.09.47.13.47a.35.35,0,0,0,.07-.14.2.2,0,0,0,0-.11v-.07a.47.47,0,0,0-.12-.23,1.81,1.81,0,0,0-.24-.24h0a.09.09,0,0,0,0-.06.19.19,0,0,0,0-.09,1.13,1.13,0,0,0,0-.18c0-.12,0-.26,0-.41a4.3,4.3,0,0,0-.1-1,3.19,3.19,0,0,0-.53-1.12c-.51-.68-1.18-1.14-1.43-1.53a2.61,2.61,0,0,1-.27-.52,1.23,1.23,0,0,1-.06-.21s0,0,0-.06l.07-.08L46.9,53l.25-.24.6-.56c.45-.39.94-.8,1.42-1.18.32-.27.64-.52.91-.72a15.8,15.8,0,0,0-.54,1.93h0l-1,.65-.26.18c-.19.13-.42.25-.48.45a.91.91,0,0,0,.06.68c.06.14.08.17.12.25l.11.2c.16.26.34.5.53.76l.29.39.16.19.07.08h0c0,.06,0,.1,0,.16.06.58.12,1.2.18,1.84l.09.83,0,.29.07.58s0,0,0,0,0,.1.05.17h0v0h0v0h0v0h0v0a.08.08,0,0,1,0,.07ZM59.77,72.28a14.62,14.62,0,0,0,2.55.07c.19,0,.38,0,.57,0-.06.31-.12.77-.21,1.34-.15,1.07-.37,2.5-.58,3.94l0,.21s0,.07,0,.1v0h0s0,0,0,0l0,.09-.21.5c-.14.34-.26.66-.39,1l-.69,1.76c-.2.52-.37,1-.48,1.27,0,.08-.06.15-.08.22v0l0,.07s0,0,0,0v0c0,.09,0,.13,0,.14s-.21.68-.51,1.63c-.34.27-.72.6-1.12.93L57,86.86l-.18.16-.09.07,0,0h0a1.48,1.48,0,0,1-.14-.25.6.6,0,0,1-.09-.28.36.36,0,0,1,0-.12.63.63,0,0,1,.18-.38c.13-.18.26-.34.29-.37-.09-.21-.89.56-.79.71a.82.82,0,0,0,.21.57l.11.12L55.59,87l-.45-.07-.19,0a.76.76,0,0,1,0-.15.77.77,0,0,1,.08-.29c0-.08.06-.12.06-.13a2,2,0,0,1,.23-.4c.14-.19.35-.32.33-.36s-.28,0-.49.19a1.33,1.33,0,0,0-.26.28.84.84,0,0,0-.1.15,1.12,1.12,0,0,0-.1.5c-.09-.12-.19-.24-.27-.36v-.21a2.45,2.45,0,0,1,0-.27,3.12,3.12,0,0,1,.1-.48,1.14,1.14,0,0,1,.45-.64,1,1,0,0,1,.7-.18c.08.16,2-.6,2-.62a12.54,12.54,0,0,0,1.75-1.15h0a9.25,9.25,0,0,0,.26-3,26.88,26.88,0,0,0-.13-3.16s-.1-.45-.29-1-.47-1.27-.77-2-.65-1.46-.92-2A9.7,9.7,0,0,0,59.77,72.28ZM54.3,67.85c.18,0,.47,0,.64,0a1.35,1.35,0,0,1-.2.91l0,0c-.23-.2-.46-.4-.67-.61A.79.79,0,0,0,54.3,67.85ZM43.9,77.71c.58-.72,1.15-1.38,1.7-2l0,0h0a3.12,3.12,0,0,0,.88.8,2.41,2.41,0,0,0,1.19.34c.35,0,.59-.17.54-.25s-.2-.11-.43-.24a3.82,3.82,0,0,1-.74-.59,2.66,2.66,0,0,1-.44-.74l-.09-.31a.73.73,0,0,0,0-.08,0,0,0,0,0,0,0h0a.73.73,0,0,1,0,.08l.23-.25c.28-.3.55-.57.82-.83,0,0,0,0,0,0a3.3,3.3,0,0,0,.85.86c.89.61,1.9.71,1.94.55s-.79-.61-1.33-1.25a2.72,2.72,0,0,1-.53-.93l0-.1.72-.68.42-.4a1.7,1.7,0,0,0,.62.75,1.87,1.87,0,0,0,.39.23l.38.17a4.64,4.64,0,0,0,.69.23c.42.1.73.06.74,0s-.22-.2-.54-.43c-.16-.11-.34-.25-.52-.4l-.3-.23a3,3,0,0,1-.25-.24.75.75,0,0,1-.13-.82,1.35,1.35,0,0,1,.16-.3l.07-.16.57-.53,0,0v0l.05.12a1.37,1.37,0,0,0,.29.31,4.06,4.06,0,0,0,.57.35c.43.22.95.29,1,.1s-.19-.47-.4-.81l-.28-.46c-.12-.16-.12-.15-.12-.16s-.08-.07-.15-.42c0,0,0-.08,0-.12a2.77,2.77,0,0,0,.31-.53l.19.21a17.72,17.72,0,0,0,2,1.68c.35.25.71.49,1.08.71,0,.08-.08.18-.13.3a13.28,13.28,0,0,1-.83,1.59c-.4.64-.92,1.38-1.51,2.14s-1.24,1.57-1.94,2.33c-.89,1-1.81,2-2.56,2.9a5.43,5.43,0,0,1-.79.09A7.9,7.9,0,0,1,46,80a3.24,3.24,0,0,1-1.08-.5,2.52,2.52,0,0,1-.68-.76,2.58,2.58,0,0,1-.34-1,.08.08,0,0,1,0,0,.16.16,0,0,0,0-.07h0ZM42.23,80c.41-.63.85-1.22,1.28-1.78,0,0,0,0,0,0a3.6,3.6,0,0,0,.33.72,2.93,2.93,0,0,0,.83.86,3.65,3.65,0,0,0,1.24.51,7.09,7.09,0,0,0,2.39.11A5.51,5.51,0,0,0,49,80.3a9.44,9.44,0,0,0-1,1.5,7.28,7.28,0,0,0-.36.76c-.2,0-.52.13-.91.2a6.19,6.19,0,0,1-2.55,0,3.4,3.4,0,0,1-2.05-1.35,3.09,3.09,0,0,1-.37-.72Q42,80.33,42.23,80Zm20.29,23.94c-.6,0-1.21.1-1.81.13l-.32,0h-.3l-.19,0-.9-.14c-1.61-.25-3.22-.45-4.78-.74,0,0,0,0,0,0,.14-.2.37-.47.64-.8a8.93,8.93,0,0,0,1.69-2.72,5.16,5.16,0,0,0,.08-3.17,1.82,1.82,0,0,0-.56-.8l1,.17a18.79,18.79,0,0,0,6.09-.11c.31,0,.63-.11,1-.19a2.52,2.52,0,0,1,.75.57,4.16,4.16,0,0,1,.9,1.32,3.55,3.55,0,0,1,.13,1.79,6,6,0,0,1-.17.92,6.78,6.78,0,0,1-.33.85c-.25.54-.53,1-.77,1.47s-.44.8-.59,1-.1.21-.14.28ZM90.58,88.7l0,.34c0,.23-.06.46-.12.68A10.14,10.14,0,0,1,90,91.05,12,12,0,0,1,87,95.75a15.53,15.53,0,0,1-4.84,3.18l-.68.28-.7.23c-.46.17-1,.28-1.42.41-1,.21-1.92.36-3,.57l-3.17,1.25h0a18.09,18.09,0,0,1-3.4,1.13c-1.17.28-2.36.5-3.56.68l-1.45.19.49-1c.23-.45.5-1,.74-1.55a5.19,5.19,0,0,0,.46-1.93,3.85,3.85,0,0,0-.25-2,4.18,4.18,0,0,0-1.06-1.36,3,3,0,0,0-.66-.44,35.84,35.84,0,0,0,6.35-2.19c2.68-1.18,5.48-2.68,8.47-4.21.76-.37,1.51-.77,2.29-1.13s1.57-.78,2.37-1.09a8.86,8.86,0,0,1,2.52-.62,4.17,4.17,0,0,1,2.46.48,4.33,4.33,0,0,1,1,.81,5.17,5.17,0,0,1,.42.51l.31.47A1,1,0,0,1,90.58,88.7Z"/>
+                <path class="cls-1"
+                      d="M40.9,11.45c-.23.24-.37.42-.38.43l-.3.48a5.39,5.39,0,0,0-.5,1.1,3.59,3.59,0,0,0-.2,1.17c0,.33,0,.54.09.54s.16-.82.54-1.54a6.13,6.13,0,0,1,.58-.94l.32-.42s.12-.18.31-.42a9.63,9.63,0,0,1,.73-.85c.56-.6,1.21-1.1,1.17-1.18s-.2,0-.45.15h0A2.51,2.51,0,0,0,41.65,9,4.34,4.34,0,0,0,39.05,9c-1.58.35-3.24.51-3.24.73a8.18,8.18,0,0,0,3.37.27,3.38,3.38,0,0,1,1.91.28,1.31,1.31,0,0,1,.4.32c.07.1.09.15.1.16h0v.09A6.38,6.38,0,0,0,40.9,11.45Z"/>
+            </g>
+        </g>
+    </g>
 </svg>
\ No newline at end of file
diff --git a/media/logos/SVG/mascot color with apache feather.svg b/media/logos/SVG/mascot color with apache feather.svg
index 13c1d2d2ebd..b118295c1d8 100644
--- a/media/logos/SVG/mascot color with apache feather.svg	
+++ b/media/logos/SVG/mascot color with apache feather.svg	
@@ -1,2462 +1,2462 @@
-<!--
-    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
-
-         http://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.
--->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 162.45 188.38">
-    <defs>
-        <style>
-            .cls-1{fill:none;}.cls-2{isolation:isolate;}.cls-3{opacity:0.13;}.cls-3,.cls-335{mix-blend-mode:multiply;}.cls-4{fill:#3c2517;}.cls-5{clip-path:url(#clip-path);}.cls-6{fill:#f59723;}.cls-7{fill:#f79823;}.cls-8{fill:#f69823;}.cls-9{fill:#f69723;}.cls-10{fill:#f59623;}.cls-11{fill:#f59524;}.cls-12{fill:#f49424;}.cls-13{fill:#f49324;}.cls-14{fill:#f39224;}.cls-15{fill:#f39124;}.cls-16{fill:#f29124;}.cls-17{fill:#f29024;}.cls-18{fill:#f28f24;}.cls-19{fill:#f18e25;}.cls-20{fill:#f18d25;}.cls-21{fill:#f08c25;}.cls-22{fill:#f08b25;}.cls-23{fill:#ef8a25;}.cls-24{fill:#ef8925;}.cls-25{fill:#ef8825;}.cls-26{fill:#ee8825;}.cls-27{fill:#ee8725;}.cls-28{fill:#ee8625;}.cls-29{fill:#ed8626;}.cls-30{fill:#ed8526;}.cls-31{fill:#bd2330;}.cls-32{opacity:0.35;mix-blend-mode:screen;}.cls-33{clip-path:url(#clip-path-2);}.cls-34{fill:#cf2a35;}.cls-35{fill:#cf2b35;}.cls-36{fill:#cf2c35;}.cls-37{fill:#cf2e34;}.cls-38{fill:#d02f34;}.cls-39{fill:#d03034;}.cls-40{fill:#d03234;}.cls-41{fill:#d03334;}.cls-42{fill:#d13434;}.cls-43{fill:#d13534;}.cls-44{fill:#d13634;}.cls-45{fill:#d13734;}.cls-46{fill:#d23934;}.cls-47{fill:#d23a33;}.cls-48{fill:#d23b33;}.cls-49{fill:#d23c33;}.cls-50{fill:#d33d33;}.cls-51{fill:#d33e33;}.cls-52{fill:#d33f33;}.cls-53{fill:#d44033;}.cls-54{fill:#d44133;}.cls-55{fill:#d44233;}.cls-56{fill:#d44332;}.cls-57{fill:#d54432;}.cls-58{fill:#d54532;}.cls-59{fill:#d54632;}.cls-60{fill:#d54732;}.cls-61{fill:#d64832;}.cls-62{fill:#d64932;}.cls-63{fill:#d64a32;}.cls-64{fill:#d74b31;}.cls-65{fill:#d74c31;}.cls-66{fill:#d74d31;}.cls-67{fill:#d84e31;}.cls-68{fill:#d84f31;}.cls-69{fill:#d85031;}.cls-70{fill:#d95130;}.cls-71{fill:#d95230;}.cls-72{fill:#d95330;}.cls-73{fill:#da5430;}.cls-74{fill:#da5530;}.cls-75{fill:#da562f;}.cls-76{fill:#da572f;}.cls-77{fill:#db582f;}.cls-78{fill:#db592f;}.cls-79{fill:#dc5a2f;}.cls-80{fill:#dc5b2e;}.cls-81{fill:#dc5c2e;}.cls-82{fill:#dd5d2e;}.cls-83{fill:#dd5e2e;}.cls-84{fill:#dd5f2d;}.cls-85{fill:#de602d;}.cls-86{fill:#de612d;}.cls-87{fill:#de622d;}.cls-88{fill:#df632d;}.cls-89{fill:#df642c;}.cls-90{fill:#e0652c;}.cls-91{fill:#e0662c;}.cls-92{fill:#e0672c;}.cls-93{fill:#e1682b;}.cls-94{fill:#e1692b;}.cls-95{fill:#e16a2b;}.cls-96{fill:#e26a2b;}.cls-97{fill:#e26b2a;}.cls-98{fill:#e26c2a;}.cls-99{fill:#e36d2a;}.cls-100{fill:#e36e2a;}.cls-101{fill:#e46e29;}.cls-102{fill:#e46f29;}.cls-103{fill:#e47029;}.cls-104{fill:#e57129;}.cls-105{fill:#e57229;}.cls-106{fill:#e57328;}.cls-107{fill:#e67328;}.cls-108{fill:#e67428;}.cls-109{fill:#e67528;}.cls-110{fill:#e77627;}.cls-111{fill:#e77727;}.cls-112{fill:#e87827;}.cls-113{clip-path:url(#clip-path-3);}.cls-114{fill:#752c82;}.cls-115{fill:#762c81;}.cls-116{fill:#772c81;}.cls-117{fill:#772c80;}.cls-118{fill:#782c80;}.cls-119{fill:#792b7f;}.cls-120{fill:#7a2b7f;}.cls-121{fill:#7a2b7e;}.cls-122{fill:#7b2b7e;}.cls-123{fill:#7c2b7d;}.cls-124{fill:#7d2a7d;}.cls-125{fill:#7d2a7c;}.cls-126{fill:#7e2a7c;}.cls-127{fill:#7f2a7b;}.cls-128{fill:#802a7a;}.cls-129{fill:#81297a;}.cls-130{fill:#822979;}.cls-131{fill:#832979;}.cls-132{fill:#832978;}.cls-133{fill:#842878;}.cls-134{fill:#852877;}.cls-135{fill:#862877;}.cls-136{fill:#862876;}.cls-137{fill:#872876;}.cls-138{fill:#872875;}.cls-139{fill:#882775;}.cls-140{fill:#892774;}.cls-141{fill:#8a2774;}.cls-142{fill:#8a2773;}.cls-143{fill:#8b2773;}.cls-144{fill:#8c2672;}.cls-145{fill:#8d2672;}.cls-146{fill:#8d2671;}.cls-147{fill:#8e2671;}.cls-148{fill:#8e2670;}.cls-149{fill:#8f2570;}.cls-150{fill:#902570;}.cls-151{fill:#90256f;}.cls-152{fill:#91256f;}.cls-153{fill:#91256e;}.cls-154{fill:#92246e;}.cls-155{fill:#93246d;}.cls-156{clip-path:url(#clip-path-4);}.cls-157{fill:#9f2062;}.cls-158{fill:#a02061;}.cls-159{fill:#a12060;}.cls-160{fill:#a2205f;}.cls-161{fill:#a3205e;}.cls-162{fill:#a4205d;}.cls-163{fill:#a5205d;}.cls-164{fill:#a5205c;}.cls-165{fill:#a6205c;}.cls-166{fill:#a6205b;}.cls-167{fill:#a7205b;}.cls-168{fill:#a7205a;}.cls-169{fill:#a8205a;}.cls-170{fill:#a82059;}.cls-171{fill:#a92059;}.cls-172{fill:#a92058;}.cls-173{fill:#aa2058;}.cls-174{fill:#ab2157;}.cls-175{fill:#ac2156;}.cls-176{fill:#ad2155;}.cls-177{fill:#ae2154;}.cls-178{fill:#af2153;}.cls-179{fill:#b02153;}.cls-180{fill:#b02152;}.cls-181{fill:#b12152;}.cls-182{fill:#b12151;}.cls-183{fill:#b22151;}.cls-184{fill:#b22150;}.cls-185{fill:#b32150;}.cls-186{fill:#b3214f;}.cls-187{fill:#b4214f;}.cls-188{fill:#b4214e;}.cls-189{fill:#b5214e;}.cls-190{fill:#b5204d;}.cls-191{fill:#b6204d;}.cls-192{fill:#b7204c;}.cls-193{fill:#b8204b;}.cls-194{fill:#b9204a;}.cls-195{fill:#b92049;}.cls-196{fill:#ba2049;}.cls-197{fill:#bb2048;}.cls-198{fill:#bc2047;}.cls-199{fill:#bc2046;}.cls-200{fill:#bd2046;}.cls-201{fill:#be2045;}.cls-202{fill:#be2044;}.cls-203{fill:#bf2044;}.cls-204{fill:#bf2043;}.cls-205{fill:#c02043;}.cls-206{fill:#c02042;}.cls-207{fill:#c12042;}.cls-208{fill:#c12041;}.cls-209{fill:#c22041;}.cls-210{fill:#c22040;}.cls-211{fill:#c3203f;}.cls-212{fill:#c4203e;}.cls-213{fill:#c5203d;}.cls-214{fill:#c5203c;}.cls-215{fill:#c6203c;}.cls-216{fill:#c6203b;}.cls-217{fill:#c7203b;}.cls-218{fill:#c7203a;}.cls-219{fill:#c8203a;}.cls-220{fill:#c82039;}.cls-221{fill:#c92038;}.cls-222{fill:#ca2038;}.cls-223{fill:#ca2037;}.cls-224{fill:#cb2037;}.cls-225{fill:#cc2036;}.cls-226{fill:#cd2035;}.cls-227{fill:#cd2135;}.cls-228{fill:#cd2335;}.cls-229{fill:#cd2435;}.cls-230{fill:#ce2635;}.cls-231{fill:#ce2735;}.cls-232{fill:#ce2835;}.cls-233{clip-path:url(#clip-path-5);}.cls-234{fill:#272761;}.cls-235{fill:#282761;}.cls-236{fill:#292762;}.cls-237{fill:#2a2763;}.cls-238{fill:#2b2863;}.cls-239{fill:#2c2864;}.cls-240{fill:#2d2864;}.cls-241{fill:#2e2865;}.cls-242{fill:#2f2866;}.cls-243{fill:#302866;}.cls-244{fill:#312967;}.cls-245{fill:#322967;}.cls-246{fill:#332968;}.cls-247{fill:#342969;}.cls-248{fill:#352969;}.cls-249{fill:#36296a;}.cls-250{fill:#37296b;}.cls-251{fill:#382a6b;}.cls-252{fill:#392a6c;}.cls-253{fill:#3a2a6c;}.cls-254{fill:#3a2a6d;}.cls-255{fill:#3b2a6e;}.cls-256{fill:#3c2a6e;}.cls-257{fill:#3d2a6f;}.cls-258{fill:#3e2a6f;}.cls-259{fill:#3f2b70;}.cls-260{fill:#402b71;}.cls-261{fill:#412b71;}.cls-262{fill:#422b72;}.cls-263{fill:#432b72;}.cls-264{fill:#442b73;}.cls-265{fill:#452b74;}.cls-266{fill:#462b74;}.cls-267{fill:#472c75;}.cls-268{fill:#482c76;}.cls-269{fill:#492c77;}.cls-270{fill:#4a2c77;}.cls-271{fill:#4b2c78;}.cls-272{fill:#4c2c79;}.cls-273{fill:#4d2c79;}.cls-274{fill:#4e2c7a;}.cls-275{fill:#4f2d7b;}.cls-276{fill:#502d7b;}.cls-277{fill:#512d7c;}.cls-278{fill:#522d7c;}.cls-279{fill:#532d7d;}.cls-280{fill:#532d7e;}.cls-281{fill:#542d7e;}.cls-282{fill:#552d7f;}.cls-283{fill:#562d7f;}.cls-284{fill:#572e80;}.cls-285{fill:#582e81;}.cls-286{fill:#592e81;}.cls-287{fill:#5a2e82;}.cls-288{fill:#5b2e83;}.cls-289{fill:#5c2e83;}.cls-290{fill:#5d2e84;}.cls-291{fill:#5d2e85;}.cls-292{fill:#5e2f85;}.cls-293{fill:#5f2f86;}.cls-294{fill:#602f87;}.cls-295{fill:#612f88;}.cls-296{fill:#622f88;}.cls-297{fill:#632f89;}.cls-298{fill:#64308a;}.cls-299{fill:#65308b;}.cls-300{fill:#66308c;}.cls-301{fill:#67308b;}.cls-302{fill:#68308b;}.cls-303{fill:#682f8a;}.cls-304{fill:#692f8a;}.cls-305{fill:#6a2f89;}.cls-306{fill:#6b2f89;}.cls-307{fill:#6c2f88;}.cls-308{fill:#6c2e88;}.cls-309{fill:#6d2e87;}.cls-310{fill:#6e2e87;}.cls-311{fill:#6e2e86;}.cls-312{fill:#6f2e86;}.cls-313{fill:#702e85;}.cls-314{fill:#702d85;}.cls-315{fill:#712d85;}.cls-316{fill:#722d84;}.cls-317{fill:#732d83;}.cls-318{fill:#742d82;}.cls-319{fill:#94246d;}.cls-320{fill:#94246c;}.cls-321{clip-path:url(#clip-path-6);}.cls-322{clip-path:url(#clip-path-7);}.cls-323{clip-path:url(#clip-path-8);}.cls-324{clip-path:url(#clip-path-9);}.cls-325{clip-path:url(#clip-path-10);}.cls-326{fill:#6e6f71;}.cls-327{fill:#644c53;}.cls-328{fill:#a66870;}.cls-329{fill:#f2e8df;}.cls-330{fill:#744a54;}.cls-331{fill:#231f20;}.cls-332{fill:#fff;}.cls-333{fill:#473439;}.cls-334{fill:#f7b2c6;}.cls-335{opacity:0.15;}.cls-336{fill:#3e362f;}.cls-337{fill:#f4f0d2;}.cls-338{fill:#97646d;}.cls-339{fill:#96636a;}.cls-340{fill:#8f8280;}.cls-341{fill:#dbd3d1;}.cls-342{fill:#694650;}.cls-343{fill:#c4869a;}.cls-344{fill:#a6938f;}.cls-345{clip-path:url(#clip-path-11);}.cls-346{clip-path:url(#clip-path-12);}
-        </style>
-        <clipPath id="clip-path">
-            <path class="cls-1"
-                  d="M1.27,40.05c.62,1.94,2.83,5.46,6.2,9.82l6.62-1.77a79.61,79.61,0,0,1-6.83-8.6L7,39.17l.23.33a70.54,70.54,0,0,0,7,8.22,120.65,120.65,0,0,0,1.3-12.5c-6.42-2.74-10-1.08-10-1.08S0,36,1.27,40.05Z"/>
-        </clipPath>
-        <clipPath id="clip-path-2">
-            <path class="cls-1"
-                  d="M27.2,60.84c-1.55-1.36-3.07-2.73-4.53-4.09s-3-2.83-4.39-4.24a3,3,0,0,1-.25-.25c-1.38-1.39-2.7-2.78-3.94-4.16L7.47,49.87l.71.91c.91,1.16,1.91,2.38,3,3.63,1.19,1.42,2.47,2.89,3.83,4.39s2.58,2.8,4,4.24q1.75,1.83,3.63,3.68a.93.93,0,0,0,.14.14l9-2.21C30.16,63.38,28.66,62.11,27.2,60.84Z"/>
-        </clipPath>
-        <clipPath id="clip-path-3">
-            <path class="cls-1"
-                  d="M68.2,89.81q2,1.32,4.15,2.67l.06,0,.6.38c.95.61,1.81,1.14,3.77,2.36.82-1.08,2.48-1.7,4.32-2.24a6.7,6.7,0,0,0-5,1.09c1.63-5.85,1.31-11.29-2.41-14.91a9.64,9.64,0,0,0-1.07-.93c1.24,1.55,1.54,3.18.74,5.93v0c-.89-4.53-2.18-7-4.68-9.5-.6-.59-1.26-1.18-2-1.81a13.21,13.21,0,0,1,1.14,13l-.4,3.38Z"/>
-        </clipPath>
-        <clipPath id="clip-path-4">
-            <path class="cls-1"
-                  d="M61.18,86.58q-2.51-1.71-5.06-3.48c-1.63-1.14-3.27-2.29-4.91-3.47s-3.28-2.37-4.92-3.58-3.33-2.47-5-3.73-3.25-2.51-4.84-3.77l-1.72-1.38c-1-.79-2-1.59-2.92-2.39l-.16-.13-9,2.21.28.28c1.33,1.3,2.69,2.61,4.09,3.91S30,73.67,31.43,75q1.88,1.64,3.8,3.21.39.33.78.63c1.62,1.31,3.2,2.52,4.72,3.63,1.73,1.27,3.4,2.41,5,3.45,1.05.68,2.07,1.31,3.05,1.9s1.68,1,2.53,1.44q3,1.65,6,3l9-2.22q-2-1.3-4-2.68Z"/>
-        </clipPath>
-        <clipPath id="clip-path-5">
-            <path class="cls-1"
-                  d="M57.58,92.37A65.17,65.17,0,0,0,65,95.21l.27.08c-2.34.8-5.12,3.76-5.1,3.76,4.11-1.63,8.05-2.67,11.57-2.15a10.57,10.57,0,0,1-2.07,5,10.73,10.73,0,0,0,3.7-3.8c-.34,2,.55,4.4,1.64,6.84-.54-3.33-.46-5.9.34-7.57,7.27,4.62,15.36,9.44,24,14.38a2.48,2.48,0,0,0-1.23-2c-1.56-.89-11.81-6.75-25.1-15.28l-1.14-.74-.32-.2-4.25-2.78-1-.66h0l-9,2.22Z"/>
-        </clipPath>
-        <clipPath id="clip-path-6">
-            <path class="cls-1"
-                  d="M32.5,64.17l.64.52,2,1.59L37.36,68l1.17.91c1.19.91,2.41,1.84,3.68,2.79q2.32,1.76,4.86,3.6c1.61,1.17,3.27,2.36,5,3.58s3.34,2.34,5.1,3.54q2.34,1.62,4.83,3.27l.24.16c1.64,1.1,3.34,2.22,5.07,3.35l.12.08.4-3.38c0,.07,0,.13-.08.19.42-4-1.31-9.95-4.16-14.17a32.3,32.3,0,0,0-5-5.65,53.85,53.85,0,0,0-5.1-4.08C51.86,61.05,50,59.86,48,58.65A12.61,12.61,0,0,1,48.39,62c0,.21,0,.42,0,.64s0,.43,0,.65h0c-.56-4-2.75-6.93-5.7-9.38a13.22,13.22,0,0,1,.92,4.86c0,.26,0,.54,0,.81,0,.07,0,.14,0,.2h0A15.45,15.45,0,0,0,42.4,56q-.15-.34-.33-.69c-.18-.34-.38-.67-.59-1s-.28-.41-.43-.6a13.39,13.39,0,0,0-1.17-1.36l-.41-.4-.62-.51c-.91-.75-1.73-1.37-2.46-1.88-.37-.26-.71-.49-1-.69L35,48.69c-.36-.22-.68-.4-1-.56a9.64,9.64,0,0,0-1-.49h0a4.77,4.77,0,0,1,.19.5,15.83,15.83,0,0,1,.5,4.89l.36-3.09L33.71,53v.07l0,.48s0,0,0-.08L32.4,64.09Z"/>
-        </clipPath>
-        <clipPath id="clip-path-7">
-            <path class="cls-1"
-                  d="M14.3,47.72c1.2,1.25,2.57,2.62,4.13,4.12l.25.24c1.36,1.29,2.85,2.68,4.5,4.16,1.42,1.27,2.95,2.61,4.61,4,1.44,1.23,3,2.5,4.61,3.83L33.65,53.5a12.88,12.88,0,0,0-3.14-6.69c-.42-.46-.86-.93-1.32-1.4-1.41-1.45-3-2.91-4.6-4.26s-3.1-2.49-4.52-3.46a26.47,26.47,0,0,0-2.52-1.54c-.68-.36-1.32-.66-2-.93A120.65,120.65,0,0,1,14.3,47.72Z"/>
-        </clipPath>
-        <clipPath id="clip-path-8">
-            <path class="cls-1" d="M48.37,62.62c0,.21,0,.43,0,.65h0C48.34,63.05,48.36,62.83,48.37,62.62Z"/>
-        </clipPath>
-        <clipPath id="clip-path-9">
-            <path class="cls-1" d="M43.48,59.75c0-.06,0-.13,0-.2s0,.14,0,.2Z"/>
-        </clipPath>
-        <clipPath id="clip-path-10">
-            <polygon class="cls-1" points="43.48 59.75 43.48 59.74 43.48 59.74 43.48 59.74 43.48 59.74 43.48 59.75"/>
-        </clipPath>
-        <clipPath id="clip-path-11">
-            <path class="cls-1"
-                  d="M85.13,103.2a2.38,2.38,0,0,1,1.53-.16h0a.77.77,0,0,1,0-.15c-1.49-.9-3-1.8-4.68-2.86a3,3,0,0,1-.5,1.09L85,103.28S85.09,103.21,85.13,103.2Z"/>
-        </clipPath>
-        <clipPath id="clip-path-12">
-            <path class="cls-1" d="M48.46,62.39c0,.21,0,.43,0,.65h0C48.44,62.82,48.45,62.6,48.46,62.39Z"/>
-        </clipPath>
-    </defs>
-    <title>mascot color with apache feather</title>
-    <g class="cls-2">
-        <g id="Layer_2" data-name="Layer 2">
-            <g id="Layer_1-2" data-name="Layer 1">
-                <g class="cls-3">
-                    <path class="cls-4"
-                          d="M161.67,156.4s4.38,14.27-13.72,23.36c-26.57,13.33-44.52,9-60.48,1.75-2.07-.93-3.49.33-5.46-13.66s4.7,5.76,5.71,5.9S130,173,130,173Z"/>
-                </g>
-                <g class="cls-5">
-                    <polygon class="cls-6" points="0 47.78 15.6 47.09 15.6 49.87 0 49.87 0 47.78"/>
-                    <polygon class="cls-6" points="0 43.96 15.6 43.27 15.6 47.09 0 47.78 0 43.96"/>
-                    <polygon class="cls-7" points="0 40.15 15.6 39.46 15.6 43.27 0 43.96 0 40.15"/>
-                    <polygon class="cls-7" points="0 39.86 15.6 39.17 15.6 39.46 0 40.15 0 39.86"/>
-                    <polygon class="cls-8" points="0 39.57 15.6 38.88 15.6 39.17 0 39.86 0 39.57"/>
-                    <polygon class="cls-9" points="0 39.28 15.6 38.58 15.6 38.88 0 39.57 0 39.28"/>
-                    <polygon class="cls-10" points="0 38.98 15.6 38.29 15.6 38.58 0 39.28 0 38.98"/>
-                    <polygon class="cls-11" points="0 38.69 15.6 38 15.6 38.29 0 38.98 0 38.69"/>
-                    <polygon class="cls-12" points="0 38.4 15.6 37.71 15.6 38 0 38.69 0 38.4"/>
-                    <polygon class="cls-12" points="0 38.11 15.6 37.42 15.6 37.71 0 38.4 0 38.11"/>
-                    <polygon class="cls-13" points="0 37.82 15.6 37.13 15.6 37.42 0 38.11 0 37.82"/>
-                    <polygon class="cls-14" points="0 37.52 15.6 36.83 15.6 37.13 0 37.82 0 37.52"/>
-                    <polygon class="cls-15" points="0 37.23 15.6 36.54 15.6 36.83 0 37.52 0 37.23"/>
-                    <polygon class="cls-16" points="0 36.94 15.6 36.25 15.6 36.54 0 37.23 0 36.94"/>
-                    <polygon class="cls-17" points="0 36.65 15.6 35.96 15.6 36.25 0 36.94 0 36.65"/>
-                    <polygon class="cls-18" points="0 36.36 15.6 35.67 15.6 35.96 0 36.65 0 36.36"/>
-                    <polygon class="cls-19" points="0 36.07 15.6 35.37 15.6 35.67 0 36.36 0 36.07"/>
-                    <polygon class="cls-19" points="0 35.77 15.6 35.08 15.6 35.37 0 36.07 0 35.77"/>
-                    <polygon class="cls-20" points="0 35.48 15.6 34.79 15.6 35.08 0 35.77 0 35.48"/>
-                    <polygon class="cls-21" points="0 35.19 15.6 34.5 15.6 34.79 0 35.48 0 35.19"/>
-                    <polygon class="cls-22" points="0 34.9 15.6 34.21 15.6 34.5 0 35.19 0 34.9"/>
-                    <polygon class="cls-22" points="0 34.61 15.6 33.91 15.6 34.21 0 34.9 0 34.61"/>
-                    <polygon class="cls-23" points="0 34.31 15.6 33.62 15.6 33.91 0 34.61 0 34.31"/>
-                    <polygon class="cls-24" points="0 34.02 15.6 33.33 15.6 33.62 0 34.31 0 34.02"/>
-                    <polygon class="cls-25" points="0 33.73 15.6 33.04 15.6 33.33 0 34.02 0 33.73"/>
-                    <polygon class="cls-26" points="0 33.44 15.6 32.75 15.6 33.04 0 33.73 0 33.44"/>
-                    <polygon class="cls-27" points="0 33.15 15.04 32.48 15.6 32.48 15.6 32.75 0 33.44 0 33.15"/>
-                    <polygon class="cls-28" points="0 32.85 8.46 32.48 15.04 32.48 0 33.15 0 32.85"/>
-                    <polygon class="cls-29" points="0 32.56 1.87 32.48 8.46 32.48 0 32.85 0 32.56"/>
-                    <polygon class="cls-30" points="1.87 32.48 0 32.56 0 32.48 1.87 32.48"/>
-                </g>
-                <path class="cls-1" d="M33.7,53.1V53l-.06.47s0,0,0,.08Z"/>
-                <path class="cls-1" d="M43.54,58.74c0,.26,0,.54,0,.81C43.52,59.28,43.53,59,43.54,58.74Z"/>
-                <path class="cls-1"
-                      d="M62.24,85.89,62,85.73q-2.49-1.65-4.83-3.27-2.64-1.8-5.1-3.54c-1.73-1.22-3.39-2.41-5-3.58s-3.31-2.43-4.86-3.6c-1.27-.95-2.49-1.88-3.68-2.79L37.36,68l-2.24-1.76-2-1.59-.64-.52-.1-.08,0,.39-.67.17.16.13c1,.8,1.93,1.6,2.92,2.39l1.72,1.38c1.59,1.26,3.21,2.52,4.84,3.77s3.31,2.5,5,3.73,3.28,2.41,4.92,3.58S54.49,82,56.12,83.1s3.39,2.34,5.06,3.48l1.13.76q2,1.38,4,2.68l1.06-.26.05-.44-.12-.08C65.58,88.11,63.88,87,62.24,85.89Z"/>
-                <polygon class="cls-1" points="43.48 59.76 43.48 59.76 43.48 59.75 43.48 59.76"/>
-                <path class="cls-31" d="M48.39,62c0,.42,0,.84-.07,1.28h0c0-.22,0-.44,0-.65S48.39,62.19,48.39,62Z"/>
-                <g class="cls-32">
-                    <path class="cls-31" d="M48.39,62c0,.42,0,.84-.07,1.28h0c0-.22,0-.44,0-.65S48.39,62.19,48.39,62Z"/>
-                </g>
-                <path class="cls-31" d="M43.48,59.74h0c0-.06,0-.13,0-.2,0-.27,0-.55,0-.81l-.06,1Z"/>
-                <g class="cls-32">
-                    <path class="cls-31" d="M43.48,59.74h0c0-.06,0-.13,0-.2,0-.27,0-.55,0-.81l-.06,1Z"/>
-                </g>
-                <g class="cls-33">
-                    <polygon class="cls-34" points="31.49 66.86 31.68 66.61 31.68 66.86 31.49 66.86"/>
-                    <polygon class="cls-35" points="31.1 66.86 31.68 66.11 31.68 66.61 31.49 66.86 31.1 66.86"/>
-                    <polygon class="cls-36" points="30.7 66.86 31.68 65.61 31.68 66.11 31.1 66.86 30.7 66.86"/>
-                    <polygon class="cls-37" points="30.31 66.86 31.68 65.11 31.68 65.61 30.7 66.86 30.31 66.86"/>
-                    <polygon class="cls-38" points="29.92 66.86 31.68 64.61 31.68 65.11 30.31 66.86 29.92 66.86"/>
-                    <polygon class="cls-39" points="29.53 66.86 31.68 64.11 31.68 64.61 29.92 66.86 29.53 66.86"/>
-                    <polygon class="cls-40" points="29.14 66.86 31.68 63.6 31.68 64.11 29.53 66.86 29.14 66.86"/>
-                    <polygon class="cls-41" points="28.74 66.86 31.68 63.1 31.68 63.6 29.14 66.86 28.74 66.86"/>
-                    <polygon class="cls-42" points="28.35 66.86 31.68 62.6 31.68 63.1 28.74 66.86 28.35 66.86"/>
-                    <polygon class="cls-43" points="27.96 66.86 31.68 62.1 31.68 62.6 28.35 66.86 27.96 66.86"/>
-                    <polygon class="cls-44" points="27.57 66.86 31.68 61.59 31.68 62.1 27.96 66.86 27.57 66.86"/>
-                    <polygon class="cls-45" points="27.18 66.86 31.68 61.09 31.68 61.59 27.57 66.86 27.18 66.86"/>
-                    <polygon class="cls-46" points="26.78 66.86 31.68 60.59 31.68 61.09 27.18 66.86 26.78 66.86"/>
-                    <polygon class="cls-47" points="26.39 66.86 31.68 60.09 31.68 60.59 26.78 66.86 26.39 66.86"/>
-                    <polygon class="cls-48" points="26 66.86 31.68 59.59 31.68 60.09 26.39 66.86 26 66.86"/>
-                    <polygon class="cls-49" points="25.61 66.86 31.68 59.09 31.68 59.59 26 66.86 25.61 66.86"/>
-                    <polygon class="cls-50" points="25.21 66.86 31.68 58.58 31.68 59.09 25.61 66.86 25.21 66.86"/>
-                    <polygon class="cls-51" points="24.82 66.86 31.68 58.08 31.68 58.58 25.21 66.86 24.82 66.86"/>
-                    <polygon class="cls-52"
-                             points="24.43 66.86 31.57 57.72 31.68 57.81 31.68 58.08 24.82 66.86 24.43 66.86"/>
-                    <polygon class="cls-53" points="24.04 66.86 31.33 57.53 31.57 57.72 24.43 66.86 24.04 66.86"/>
-                    <polygon class="cls-54" points="23.65 66.86 31.08 57.34 31.33 57.53 24.04 66.86 23.65 66.86"/>
-                    <polygon class="cls-55" points="23.25 66.86 30.84 57.15 31.08 57.34 23.65 66.86 23.25 66.86"/>
-                    <polygon class="cls-56" points="22.86 66.86 30.6 56.96 30.84 57.15 23.25 66.86 22.86 66.86"/>
-                    <polygon class="cls-57" points="22.47 66.86 30.35 56.77 30.6 56.96 22.86 66.86 22.47 66.86"/>
-                    <polygon class="cls-58" points="22.08 66.86 30.11 56.58 30.35 56.77 22.47 66.86 22.08 66.86"/>
-                    <polygon class="cls-59" points="21.69 66.86 29.87 56.39 30.11 56.58 22.08 66.86 21.69 66.86"/>
-                    <polygon class="cls-60" points="21.29 66.86 29.62 56.2 29.87 56.39 21.69 66.86 21.29 66.86"/>
-                    <polygon class="cls-61" points="20.9 66.86 29.38 56.01 29.62 56.2 21.29 66.86 20.9 66.86"/>
-                    <polygon class="cls-62" points="20.51 66.86 29.14 55.82 29.38 56.01 20.9 66.86 20.51 66.86"/>
-                    <polygon class="cls-63" points="20.12 66.86 28.89 55.63 29.14 55.82 20.51 66.86 20.12 66.86"/>
-                    <polygon class="cls-64" points="19.73 66.86 28.65 55.44 28.89 55.63 20.12 66.86 19.73 66.86"/>
-                    <polygon class="cls-65" points="19.33 66.86 28.41 55.25 28.65 55.44 19.73 66.86 19.33 66.86"/>
-                    <polygon class="cls-66" points="18.94 66.86 28.16 55.06 28.41 55.25 19.33 66.86 18.94 66.86"/>
-                    <polygon class="cls-67" points="18.55 66.86 27.92 54.87 28.16 55.06 18.94 66.86 18.55 66.86"/>
-                    <polygon class="cls-67" points="18.16 66.86 27.68 54.68 27.92 54.87 18.55 66.86 18.16 66.86"/>
-                    <polygon class="cls-68" points="17.77 66.86 27.43 54.49 27.68 54.68 18.16 66.86 17.77 66.86"/>
-                    <polygon class="cls-69"
-                             points="17.54 66.86 17.44 66.78 27.19 54.3 27.43 54.49 17.77 66.86 17.54 66.86"/>
-                    <rect class="cls-70" x="14.27" y="60.29" width="15.84" height="0.31"
-                          transform="translate(-39.1 40.72) rotate(-52)"/>
-                    <rect class="cls-71" x="14.03" y="60.1" width="15.84" height="0.31"
-                          transform="translate(-39.05 40.45) rotate(-52)"/>
-                    <rect class="cls-72" x="13.78" y="59.91" width="15.84" height="0.31"
-                          transform="translate(-38.99 40.19) rotate(-52)"/>
-                    <rect class="cls-73" x="13.54" y="59.72" width="15.84" height="0.31"
-                          transform="translate(-38.93 39.92) rotate(-52)"/>
-                    <rect class="cls-74" x="13.3" y="59.53" width="15.84" height="0.31"
-                          transform="translate(-38.88 39.66) rotate(-52)"/>
-                    <rect class="cls-75" x="13.05" y="59.34" width="15.84" height="0.31"
-                          transform="translate(-38.82 39.39) rotate(-52)"/>
-                    <rect class="cls-76" x="12.81" y="59.15" width="15.84" height="0.31"
-                          transform="translate(-38.77 39.13) rotate(-52)"/>
-                    <rect class="cls-77" x="12.57" y="58.96" width="15.84" height="0.31"
-                          transform="translate(-38.71 38.87) rotate(-52)"/>
-                    <rect class="cls-77" x="12.32" y="58.77" width="15.84" height="0.31"
-                          transform="translate(-38.65 38.6) rotate(-52)"/>
-                    <rect class="cls-78" x="12.08" y="58.58" width="15.84" height="0.31"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -38.6, 38.34)"/>
-                    <rect class="cls-79" x="11.84" y="58.39" width="15.84" height="0.31"
-                          transform="translate(-38.54 38.07) rotate(-52)"/>
-                    <rect class="cls-80" x="11.59" y="58.2" width="15.84" height="0.31"
-                          transform="translate(-38.48 37.81) rotate(-52)"/>
-                    <rect class="cls-81" x="11.35" y="58.01" width="15.84" height="0.31"
-                          transform="translate(-38.43 37.54) rotate(-52)"/>
-                    <rect class="cls-82" x="11.11" y="57.82" width="15.84" height="0.31"
-                          transform="translate(-38.37 37.28) rotate(-52)"/>
-                    <rect class="cls-83" x="10.86" y="57.63" width="15.84" height="0.31"
-                          transform="translate(-38.32 37.01) rotate(-52)"/>
-                    <rect class="cls-83" x="10.62" y="57.44" width="15.84" height="0.31"
-                          transform="translate(-38.26 36.75) rotate(-52)"/>
-                    <rect class="cls-84" x="10.37" y="57.25" width="15.84" height="0.31"
-                          transform="translate(-38.2 36.48) rotate(-52)"/>
-                    <rect class="cls-85" x="10.13" y="57.06" width="15.84" height="0.31"
-                          transform="translate(-38.15 36.22) rotate(-52)"/>
-                    <rect class="cls-86" x="9.89" y="56.87" width="15.84" height="0.31"
-                          transform="translate(-38.09 35.95) rotate(-52)"/>
-                    <rect class="cls-87" x="9.64" y="56.68" width="15.84" height="0.31"
-                          transform="translate(-38.03 35.69) rotate(-52)"/>
-                    <rect class="cls-88" x="9.4" y="56.49" width="15.84" height="0.31"
-                          transform="translate(-37.98 35.42) rotate(-52)"/>
-                    <rect class="cls-89" x="9.16" y="56.3" width="15.84" height="0.31"
-                          transform="translate(-37.92 35.16) rotate(-52)"/>
-                    <rect class="cls-89" x="8.91" y="56.11" width="15.84" height="0.31"
-                          transform="translate(-37.86 34.89) rotate(-52)"/>
-                    <rect class="cls-90" x="8.67" y="55.92" width="15.84" height="0.31"
-                          transform="translate(-37.81 34.63) rotate(-52)"/>
-                    <rect class="cls-91" x="8.43" y="55.73" width="15.84" height="0.31"
-                          transform="translate(-37.75 34.36) rotate(-52)"/>
-                    <rect class="cls-92" x="8.18" y="55.54" width="15.84" height="0.31"
-                          transform="translate(-37.7 34.1) rotate(-52)"/>
-                    <rect class="cls-93" x="7.94" y="55.35" width="15.84" height="0.31"
-                          transform="translate(-37.64 33.83) rotate(-52)"/>
-                    <rect class="cls-94" x="7.7" y="55.16" width="15.84" height="0.31"
-                          transform="translate(-37.58 33.57) rotate(-52)"/>
-                    <rect class="cls-95" x="7.45" y="54.97" width="15.84" height="0.31"
-                          transform="translate(-37.53 33.3) rotate(-52)"/>
-                    <rect class="cls-96" x="7.21" y="54.77" width="15.84" height="0.31"
-                          transform="translate(-37.47 33.04) rotate(-52)"/>
-                    <rect class="cls-97" x="6.97" y="54.58" width="15.84" height="0.31"
-                          transform="translate(-37.41 32.77) rotate(-52)"/>
-                    <rect class="cls-98" x="6.72" y="54.39" width="15.84" height="0.31"
-                          transform="translate(-37.36 32.51) rotate(-52)"/>
-                    <polygon class="cls-99" points="9.65 60.7 9.4 60.51 19.09 48.1 19.26 48.1 19.4 48.21 9.65 60.7"/>
-                    <polygon class="cls-100" points="9.4 60.51 9.16 60.31 18.7 48.1 19.09 48.1 9.4 60.51"/>
-                    <polygon class="cls-101" points="9.16 60.31 8.91 60.13 18.31 48.1 18.7 48.1 9.16 60.31"/>
-                    <polygon class="cls-102" points="8.91 60.13 8.67 59.93 17.92 48.1 18.31 48.1 8.91 60.13"/>
-                    <polygon class="cls-103" points="8.67 59.93 8.43 59.74 17.52 48.1 17.92 48.1 8.67 59.93"/>
-                    <polygon class="cls-104" points="8.43 59.74 8.19 59.55 17.13 48.1 17.52 48.1 8.43 59.74"/>
-                    <polygon class="cls-105" points="8.19 59.55 7.94 59.36 16.74 48.1 17.13 48.1 8.19 59.55"/>
-                    <polygon class="cls-106" points="7.94 59.36 7.7 59.17 16.35 48.1 16.74 48.1 7.94 59.36"/>
-                    <polygon class="cls-107" points="7.7 59.17 7.47 58.99 7.47 58.97 15.96 48.1 16.35 48.1 7.7 59.17"/>
-                    <polygon class="cls-108" points="7.47 58.47 15.56 48.1 15.96 48.1 7.47 58.97 7.47 58.47"/>
-                    <polygon class="cls-109" points="7.47 57.97 15.17 48.1 15.56 48.1 7.47 58.47 7.47 57.97"/>
-                    <polygon class="cls-110" points="7.47 57.46 14.78 48.1 15.17 48.1 7.47 57.97 7.47 57.46"/>
-                    <polygon class="cls-110" points="7.47 56.96 14.39 48.1 14.78 48.1 7.47 57.46 7.47 56.96"/>
-                    <polygon class="cls-111" points="7.47 56.46 13.99 48.1 14.39 48.1 7.47 56.96 7.47 56.46"/>
-                    <polygon class="cls-112" points="7.47 55.96 13.6 48.1 13.99 48.1 7.47 56.46 7.47 55.96"/>
-                    <polygon class="cls-112" points="13.6 48.1 7.47 55.96 7.47 48.1 13.6 48.1"/>
-                </g>
-                <g class="cls-113">
-                    <polygon class="cls-114" points="81.04 95.26 81.1 95.17 81.1 95.26 81.04 95.26"/>
-                    <polygon class="cls-114" points="80.44 95.26 81.1 94.41 81.1 95.17 81.04 95.26 80.44 95.26"/>
-                    <polygon class="cls-115" points="79.84 95.26 81.1 93.64 81.1 94.41 80.44 95.26 79.84 95.26"/>
-                    <polygon class="cls-116" points="79.24 95.26 81.1 92.87 81.1 93.64 79.84 95.26 79.24 95.26"/>
-                    <polygon class="cls-117" points="78.64 95.26 81.1 92.11 81.1 92.87 79.24 95.26 78.64 95.26"/>
-                    <polygon class="cls-118" points="78.04 95.26 81.1 91.34 81.1 92.11 78.64 95.26 78.04 95.26"/>
-                    <polygon class="cls-118" points="77.45 95.26 81.1 90.58 81.1 91.34 78.04 95.26 77.45 95.26"/>
-                    <polygon class="cls-119" points="76.85 95.26 81.1 89.81 81.1 90.58 77.45 95.26 76.85 95.26"/>
-                    <polygon class="cls-120" points="76.25 95.26 81.1 89.04 81.1 89.81 76.85 95.26 76.25 95.26"/>
-                    <polygon class="cls-121" points="75.65 95.26 81.1 88.28 81.1 89.04 76.25 95.26 75.65 95.26"/>
-                    <polygon class="cls-122" points="75.05 95.26 81.1 87.51 81.1 88.28 75.65 95.26 75.05 95.26"/>
-                    <polygon class="cls-122" points="74.45 95.26 81.1 86.74 81.1 87.51 75.05 95.26 74.45 95.26"/>
-                    <polygon class="cls-123" points="73.86 95.26 81.1 85.98 81.1 86.74 74.45 95.26 73.86 95.26"/>
-                    <polygon class="cls-124" points="73.26 95.26 81.1 85.21 81.1 85.98 73.86 95.26 73.26 95.26"/>
-                    <polygon class="cls-125" points="72.66 95.26 81.1 84.45 81.1 85.21 73.26 95.26 72.66 95.26"/>
-                    <polygon class="cls-126" points="72.06 95.26 81.1 83.68 81.1 84.45 72.66 95.26 72.06 95.26"/>
-                    <polygon class="cls-126" points="71.46 95.26 81.1 82.91 81.1 83.68 72.06 95.26 71.46 95.26"/>
-                    <polygon class="cls-127" points="70.86 95.26 81.1 82.15 81.1 82.91 71.46 95.26 70.86 95.26"/>
-                    <polygon class="cls-127" points="70.26 95.26 81.1 81.38 81.1 82.15 70.86 95.26 70.26 95.26"/>
-                    <polygon class="cls-128"
-                             points="69.87 95.26 69.74 95.16 81.1 80.62 81.1 81.38 70.26 95.26 69.87 95.26"/>
-                    <polygon class="cls-129"
-                             points="69.74 95.16 69.37 94.87 80.98 80.01 81.1 80.11 81.1 80.62 69.74 95.16"/>
-                    <rect class="cls-129" x="65.56" y="87.06" width="18.85" height="0.47"
-                          transform="translate(-39.97 92.65) rotate(-52)"/>
-                    <rect class="cls-130" x="65.19" y="86.77" width="18.85" height="0.47"
-                          transform="translate(-39.88 92.24) rotate(-52)"/>
-                    <rect class="cls-130" x="64.82" y="86.48" width="18.85" height="0.47"
-                          transform="translate(-39.8 91.84) rotate(-52)"/>
-                    <rect class="cls-131" x="64.45" y="86.19" width="18.85" height="0.47"
-                          transform="translate(-39.71 91.43) rotate(-52)"/>
-                    <rect class="cls-132" x="64.08" y="85.9" width="18.85" height="0.47"
-                          transform="translate(-39.63 91.03) rotate(-52)"/>
-                    <rect class="cls-133" x="63.7" y="85.61" width="18.85" height="0.47"
-                          transform="translate(-39.54 90.62) rotate(-52)"/>
-                    <rect class="cls-134" x="63.33" y="85.32" width="18.85" height="0.47"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -39.45, 90.22)"/>
-                    <polygon class="cls-134"
-                             points="66.77 92.84 66.69 92.78 66.69 92.17 78 77.69 78.37 77.98 66.77 92.84"/>
-                    <polygon class="cls-135" points="66.69 91.4 77.63 77.4 78 77.69 66.69 92.17 66.69 91.4"/>
-                    <polygon class="cls-136" points="66.69 90.64 77.26 77.11 77.63 77.4 66.69 91.4 66.69 90.64"/>
-                    <polygon class="cls-137" points="66.69 89.87 76.89 76.82 77.26 77.11 66.69 90.64 66.69 89.87"/>
-                    <polygon class="cls-138" points="66.69 89.1 76.52 76.53 76.89 76.82 66.69 89.87 66.69 89.1"/>
-                    <polygon class="cls-139" points="66.69 88.34 76.14 76.24 76.52 76.53 66.69 89.1 66.69 88.34"/>
-                    <polygon class="cls-139" points="66.69 87.57 75.77 75.95 76.14 76.24 66.69 88.34 66.69 87.57"/>
-                    <polygon class="cls-140" points="66.69 86.81 75.4 75.66 75.77 75.95 66.69 87.57 66.69 86.81"/>
-                    <polygon class="cls-141" points="66.69 86.04 75.03 75.37 75.4 75.66 66.69 86.81 66.69 86.04"/>
-                    <polygon class="cls-142" points="66.69 85.27 74.66 75.08 75.03 75.37 66.69 86.04 66.69 85.27"/>
-                    <polygon class="cls-143" points="66.69 84.51 74.29 74.79 74.66 75.08 66.69 85.27 66.69 84.51"/>
-                    <polygon class="cls-143" points="66.69 83.74 73.92 74.5 74.29 74.79 66.69 84.51 66.69 83.74"/>
-                    <polygon class="cls-144" points="66.69 82.97 73.54 74.21 73.92 74.5 66.69 83.74 66.69 82.97"/>
-                    <polygon class="cls-144" points="66.69 82.21 73.17 73.92 73.54 74.21 66.69 82.97 66.69 82.21"/>
-                    <polygon class="cls-145" points="66.69 81.44 72.8 73.63 73.17 73.92 66.69 82.21 66.69 81.44"/>
-                    <polygon class="cls-146" points="66.69 80.68 72.43 73.33 72.8 73.63 66.69 81.44 66.69 80.68"/>
-                    <polygon class="cls-147" points="66.69 79.91 72.06 73.05 72.43 73.33 66.69 80.68 66.69 79.91"/>
-                    <polygon class="cls-148"
-                             points="66.69 79.14 71.58 72.89 71.86 72.89 72.06 73.05 66.69 79.91 66.69 79.14"/>
-                    <polygon class="cls-149" points="66.69 78.38 70.98 72.89 71.58 72.89 66.69 79.14 66.69 78.38"/>
-                    <polygon class="cls-150" points="66.69 77.61 70.38 72.89 70.98 72.89 66.69 78.38 66.69 77.61"/>
-                    <polygon class="cls-151" points="66.69 76.85 69.78 72.89 70.38 72.89 66.69 77.61 66.69 76.85"/>
-                    <polygon class="cls-152" points="66.69 76.08 69.18 72.89 69.78 72.89 66.69 76.85 66.69 76.08"/>
-                    <polygon class="cls-153" points="66.69 75.31 68.58 72.89 69.18 72.89 66.69 76.08 66.69 75.31"/>
-                    <polygon class="cls-154" points="66.69 74.55 67.99 72.89 68.58 72.89 66.69 75.31 66.69 74.55"/>
-                    <polygon class="cls-154" points="66.69 73.78 67.39 72.89 67.99 72.89 66.69 74.55 66.69 73.78"/>
-                    <polygon class="cls-155" points="66.69 73.02 66.79 72.89 67.39 72.89 66.69 73.78 66.69 73.02"/>
-                    <polygon class="cls-155" points="66.79 72.89 66.69 73.02 66.69 72.89 66.79 72.89"/>
-                </g>
-                <g class="cls-156">
-                    <polygon class="cls-157" points="66 92.24 66.32 91.83 66.32 92.24 66 92.24"/>
-                    <polygon class="cls-157" points="65.64 92.24 66.32 91.37 66.32 91.83 66 92.24 65.64 92.24"/>
-                    <polygon class="cls-158" points="65.27 92.24 66.32 90.9 66.32 91.37 65.64 92.24 65.27 92.24"/>
-                    <polygon class="cls-158" points="64.91 92.24 66.32 90.44 66.32 90.9 65.27 92.24 64.91 92.24"/>
-                    <polygon class="cls-158" points="64.55 92.24 66.32 89.97 66.32 90.44 64.91 92.24 64.55 92.24"/>
-                    <polygon class="cls-159" points="64.18 92.24 66.32 89.5 66.32 89.97 64.55 92.24 64.18 92.24"/>
-                    <polygon class="cls-159" points="63.82 92.24 66.32 89.04 66.32 89.5 64.18 92.24 63.82 92.24"/>
-                    <polygon class="cls-159" points="63.45 92.24 66.32 88.57 66.32 89.04 63.82 92.24 63.45 92.24"/>
-                    <polygon class="cls-160" points="63.09 92.24 66.32 88.11 66.32 88.57 63.45 92.24 63.09 92.24"/>
-                    <polygon class="cls-160" points="62.72 92.24 66.32 87.64 66.32 88.11 63.09 92.24 62.72 92.24"/>
-                    <polygon class="cls-160" points="62.36 92.24 66.32 87.17 66.32 87.64 62.72 92.24 62.36 92.24"/>
-                    <polygon class="cls-161" points="62 92.24 66.32 86.71 66.32 87.17 62.36 92.24 62 92.24"/>
-                    <polygon class="cls-161" points="61.63 92.24 66.32 86.24 66.32 86.71 62 92.24 61.63 92.24"/>
-                    <polygon class="cls-161"
-                             points="61.27 92.24 66.22 85.9 66.32 85.98 66.32 86.24 61.63 92.24 61.27 92.24"/>
-                    <polygon class="cls-162" points="60.9 92.24 65.99 85.73 66.22 85.9 61.27 92.24 60.9 92.24"/>
-                    <polygon class="cls-162" points="60.54 92.24 65.77 85.55 65.99 85.73 60.9 92.24 60.54 92.24"/>
-                    <polygon class="cls-163" points="60.18 92.24 65.54 85.37 65.77 85.55 60.54 92.24 60.18 92.24"/>
-                    <polygon class="cls-164" points="59.81 92.24 65.31 85.2 65.54 85.37 60.18 92.24 59.81 92.24"/>
-                    <polygon class="cls-164" points="59.45 92.24 65.09 85.02 65.31 85.2 59.81 92.24 59.45 92.24"/>
-                    <polygon class="cls-165" points="59.08 92.24 64.86 84.84 65.09 85.02 59.45 92.24 59.08 92.24"/>
-                    <polygon class="cls-166" points="58.72 92.24 64.64 84.67 64.86 84.84 59.08 92.24 58.72 92.24"/>
-                    <polygon class="cls-166" points="58.35 92.24 64.41 84.49 64.64 84.67 58.72 92.24 58.35 92.24"/>
-                    <polygon class="cls-167" points="57.99 92.24 64.18 84.31 64.41 84.49 58.35 92.24 57.99 92.24"/>
-                    <polygon class="cls-167" points="57.63 92.24 63.96 84.14 64.18 84.31 57.99 92.24 57.63 92.24"/>
-                    <polygon class="cls-168" points="57.26 92.24 63.73 83.96 63.96 84.14 57.63 92.24 57.26 92.24"/>
-                    <polygon class="cls-169" points="56.9 92.24 63.51 83.78 63.73 83.96 57.26 92.24 56.9 92.24"/>
-                    <polygon class="cls-169" points="56.53 92.24 63.28 83.61 63.51 83.78 56.9 92.24 56.53 92.24"/>
-                    <polygon class="cls-170" points="56.17 92.24 63.05 83.43 63.28 83.61 56.53 92.24 56.17 92.24"/>
-                    <polygon class="cls-171" points="55.81 92.24 62.83 83.25 63.05 83.43 56.17 92.24 55.81 92.24"/>
-                    <polygon class="cls-171" points="55.44 92.24 62.6 83.08 62.83 83.25 55.81 92.24 55.44 92.24"/>
-                    <polygon class="cls-172" points="55.08 92.24 62.38 82.9 62.6 83.08 55.44 92.24 55.08 92.24"/>
-                    <polygon class="cls-173" points="54.71 92.24 62.15 82.72 62.38 82.9 55.08 92.24 54.71 92.24"/>
-                    <polygon class="cls-173" points="54.35 92.24 61.92 82.55 62.15 82.72 54.71 92.24 54.35 92.24"/>
-                    <polygon class="cls-174" points="53.99 92.24 61.7 82.37 61.92 82.55 54.35 92.24 53.99 92.24"/>
-                    <polygon class="cls-174" points="53.62 92.24 61.47 82.19 61.7 82.37 53.99 92.24 53.62 92.24"/>
-                    <polygon class="cls-174" points="53.26 92.24 61.24 82.02 61.47 82.19 53.62 92.24 53.26 92.24"/>
-                    <polygon class="cls-175" points="52.89 92.24 61.02 81.84 61.24 82.02 53.26 92.24 52.89 92.24"/>
-                    <polygon class="cls-175" points="52.53 92.24 60.79 81.67 61.02 81.84 52.89 92.24 52.53 92.24"/>
-                    <polygon class="cls-175" points="52.16 92.24 60.57 81.49 60.79 81.67 52.53 92.24 52.16 92.24"/>
-                    <polygon class="cls-176" points="51.8 92.24 60.34 81.31 60.57 81.49 52.16 92.24 51.8 92.24"/>
-                    <polygon class="cls-176" points="51.44 92.24 60.11 81.14 60.34 81.31 51.8 92.24 51.44 92.24"/>
-                    <polygon class="cls-176" points="51.07 92.24 59.89 80.96 60.11 81.14 51.44 92.24 51.07 92.24"/>
-                    <polygon class="cls-177" points="50.71 92.24 59.66 80.78 59.89 80.96 51.07 92.24 50.71 92.24"/>
-                    <polygon class="cls-177" points="50.34 92.24 59.44 80.61 59.66 80.78 50.71 92.24 50.34 92.24"/>
-                    <polygon class="cls-177" points="49.98 92.24 59.21 80.43 59.44 80.61 50.34 92.24 49.98 92.24"/>
-                    <polygon class="cls-178" points="49.62 92.24 58.98 80.25 59.21 80.43 49.98 92.24 49.62 92.24"/>
-                    <polygon class="cls-178" points="49.25 92.24 58.76 80.08 58.98 80.25 49.62 92.24 49.25 92.24"/>
-                    <polygon class="cls-179" points="48.89 92.24 58.53 79.9 58.76 80.08 49.25 92.24 48.89 92.24"/>
-                    <polygon class="cls-180" points="48.52 92.24 58.3 79.72 58.53 79.9 48.89 92.24 48.52 92.24"/>
-                    <polygon class="cls-180" points="48.16 92.24 58.08 79.55 58.3 79.72 48.52 92.24 48.16 92.24"/>
-                    <polygon class="cls-181"
-                             points="48 92.24 47.87 92.14 57.85 79.37 58.08 79.55 48.16 92.24 48 92.24"/>
-                    <rect class="cls-182" x="44.64" y="85.52" width="16.21" height="0.29"
-                          transform="translate(-47.23 74.5) rotate(-52)"/>
-                    <rect class="cls-182" x="44.42" y="85.35" width="16.21" height="0.29"
-                          transform="translate(-47.18 74.25) rotate(-52)"/>
-                    <rect class="cls-183" x="44.19" y="85.17" width="16.21" height="0.29"
-                          transform="translate(-47.13 74) rotate(-52)"/>
-                    <rect class="cls-184" x="43.97" y="84.99" width="16.21" height="0.29"
-                          transform="translate(-47.08 73.76) rotate(-52)"/>
-                    <rect class="cls-184" x="43.74" y="84.82" width="16.21" height="0.29"
-                          transform="translate(-47.02 73.51) rotate(-52)"/>
-                    <rect class="cls-185" x="43.51" y="84.64" width="16.21" height="0.29"
-                          transform="translate(-46.97 73.27) rotate(-52)"/>
-                    <rect class="cls-186" x="43.29" y="84.46" width="16.21" height="0.29"
-                          transform="translate(-46.92 73.02) rotate(-52)"/>
-                    <rect class="cls-187" x="43.06" y="84.29" width="16.21" height="0.29"
-                          transform="translate(-46.87 72.77) rotate(-52)"/>
-                    <rect class="cls-187" x="42.84" y="84.11" width="16.21" height="0.29"
-                          transform="translate(-46.81 72.53) rotate(-52)"/>
-                    <rect class="cls-188" x="42.61" y="83.93" width="16.21" height="0.29"
-                          transform="translate(-46.76 72.28) rotate(-52)"/>
-                    <rect class="cls-189" x="42.38" y="83.76" width="16.21" height="0.29"
-                          transform="translate(-46.71 72.04) rotate(-52)"/>
-                    <rect class="cls-189" x="42.16" y="83.58" width="16.21" height="0.29"
-                          transform="translate(-46.66 71.79) rotate(-52)"/>
-                    <rect class="cls-190" x="41.93" y="83.4" width="16.21" height="0.29"
-                          transform="translate(-46.61 71.54) rotate(-52)"/>
-                    <rect class="cls-191" x="41.71" y="83.23" width="16.21" height="0.29"
-                          transform="translate(-46.55 71.3) rotate(-52)"/>
-                    <rect class="cls-191" x="41.48" y="83.05" width="16.21" height="0.29"
-                          transform="translate(-46.5 71.05) rotate(-52)"/>
-                    <rect class="cls-192" x="41.25" y="82.87" width="16.21" height="0.29"
-                          transform="translate(-46.45 70.81) rotate(-52)"/>
-                    <rect class="cls-192" x="41.03" y="82.7" width="16.21" height="0.29"
-                          transform="translate(-46.4 70.56) rotate(-52)"/>
-                    <rect class="cls-192" x="40.8" y="82.52" width="16.21" height="0.29"
-                          transform="translate(-46.34 70.31) rotate(-52)"/>
-                    <rect class="cls-193" x="40.57" y="82.34" width="16.21" height="0.29"
-                          transform="translate(-46.29 70.07) rotate(-52)"/>
-                    <rect class="cls-193" x="40.35" y="82.17" width="16.21" height="0.29"
-                          transform="translate(-46.24 69.82) rotate(-52)"/>
-                    <rect class="cls-193" x="40.12" y="81.99" width="16.21" height="0.29"
-                          transform="translate(-46.19 69.57) rotate(-52)"/>
-                    <rect class="cls-194" x="39.9" y="81.81" width="16.21" height="0.29"
-                          transform="translate(-46.14 69.33) rotate(-52)"/>
-                    <rect class="cls-194" x="39.67" y="81.64" width="16.21" height="0.29"
-                          transform="translate(-46.08 69.08) rotate(-52)"/>
-                    <rect class="cls-195" x="39.44" y="81.46" width="16.21" height="0.29"
-                          transform="translate(-46.03 68.84) rotate(-52)"/>
-                    <rect class="cls-196" x="39.22" y="81.28" width="16.21" height="0.29"
-                          transform="translate(-45.98 68.59) rotate(-52)"/>
-                    <rect class="cls-196" x="38.99" y="81.11" width="16.21" height="0.29"
-                          transform="translate(-45.93 68.34) rotate(-52)"/>
-                    <rect class="cls-197" x="38.77" y="80.93" width="16.21" height="0.29"
-                          transform="translate(-45.87 68.1) rotate(-52)"/>
-                    <rect class="cls-197" x="38.54" y="80.75" width="16.21" height="0.29"
-                          transform="translate(-45.82 67.85) rotate(-52)"/>
-                    <rect class="cls-197" x="38.31" y="80.58" width="16.21" height="0.29"
-                          transform="translate(-45.77 67.61) rotate(-52)"/>
-                    <rect class="cls-198" x="38.09" y="80.4" width="16.21" height="0.29"
-                          transform="translate(-45.72 67.36) rotate(-52)"/>
-                    <rect class="cls-198" x="37.86" y="80.22" width="16.21" height="0.29"
-                          transform="translate(-45.66 67.11) rotate(-52)"/>
-                    <rect class="cls-199" x="37.64" y="80.05" width="16.21" height="0.29"
-                          transform="translate(-45.61 66.87) rotate(-52)"/>
-                    <rect class="cls-200" x="37.41" y="79.87" width="16.21" height="0.29"
-                          transform="translate(-45.56 66.62) rotate(-52)"/>
-                    <rect class="cls-200" x="37.18" y="79.69" width="16.21" height="0.29"
-                          transform="translate(-45.51 66.38) rotate(-52)"/>
-                    <rect class="cls-201" x="36.96" y="79.52" width="16.21" height="0.29"
-                          transform="translate(-45.46 66.13) rotate(-52)"/>
-                    <rect class="cls-201" x="36.73" y="79.34" width="16.21" height="0.29"
-                          transform="translate(-45.4 65.88) rotate(-52)"/>
-                    <rect class="cls-202" x="36.51" y="79.17" width="16.21" height="0.29"
-                          transform="translate(-45.35 65.64) rotate(-52)"/>
-                    <rect class="cls-203" x="36.28" y="78.99" width="16.21" height="0.29"
-                          transform="translate(-45.3 65.39) rotate(-52)"/>
-                    <rect class="cls-203" x="36.05" y="78.81" width="16.21" height="0.29"
-                          transform="translate(-45.25 65.15) rotate(-52)"/>
-                    <rect class="cls-204" x="35.83" y="78.64" width="16.21" height="0.29"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -45.19, 64.9)"/>
-                    <rect class="cls-205" x="35.6" y="78.46" width="16.21" height="0.29"
-                          transform="translate(-45.14 64.65) rotate(-52)"/>
-                    <rect class="cls-206" x="35.37" y="78.28" width="16.21" height="0.29"
-                          transform="translate(-45.09 64.41) rotate(-52)"/>
-                    <rect class="cls-206" x="35.15" y="78.11" width="16.21" height="0.29"
-                          transform="translate(-45.04 64.16) rotate(-52)"/>
-                    <rect class="cls-207" x="34.92" y="77.93" width="16.21" height="0.29"
-                          transform="translate(-44.98 63.92) rotate(-52)"/>
-                    <rect class="cls-208" x="34.7" y="77.75" width="16.21" height="0.29"
-                          transform="translate(-44.93 63.67) rotate(-52)"/>
-                    <rect class="cls-209" x="34.47" y="77.58" width="16.21" height="0.29"
-                          transform="translate(-44.88 63.42) rotate(-52)"/>
-                    <rect class="cls-210" x="34.24" y="77.4" width="16.21" height="0.29"
-                          transform="translate(-44.83 63.18) rotate(-52)"/>
-                    <rect class="cls-210" x="34.02" y="77.22" width="16.21" height="0.29"
-                          transform="translate(-44.78 62.93) rotate(-52)"/>
-                    <rect class="cls-211" x="33.79" y="77.05" width="16.21" height="0.29"
-                          transform="translate(-44.72 62.69) rotate(-52)"/>
-                    <rect class="cls-211" x="33.57" y="76.87" width="16.21" height="0.29"
-                          transform="translate(-44.67 62.44) rotate(-52)"/>
-                    <rect class="cls-211" x="33.34" y="76.69" width="16.21" height="0.29"
-                          transform="translate(-44.62 62.19) rotate(-52)"/>
-                    <rect class="cls-212" x="33.11" y="76.52" width="16.21" height="0.29"
-                          transform="translate(-44.57 61.95) rotate(-52)"/>
-                    <rect class="cls-212" x="32.89" y="76.34" width="16.21" height="0.29"
-                          transform="translate(-44.51 61.7) rotate(-52)"/>
-                    <rect class="cls-213" x="32.66" y="76.16" width="16.21" height="0.29"
-                          transform="translate(-44.46 61.45) rotate(-52)"/>
-                    <rect class="cls-213" x="32.44" y="75.99" width="16.21" height="0.29"
-                          transform="translate(-44.41 61.21) rotate(-52)"/>
-                    <rect class="cls-214" x="32.21" y="75.81" width="16.21" height="0.29"
-                          transform="translate(-44.36 60.96) rotate(-52)"/>
-                    <rect class="cls-215" x="31.98" y="75.63" width="16.21" height="0.29"
-                          transform="translate(-44.31 60.72) rotate(-52)"/>
-                    <rect class="cls-216" x="31.76" y="75.46" width="16.21" height="0.29"
-                          transform="translate(-44.25 60.47) rotate(-52)"/>
-                    <rect class="cls-216" x="31.53" y="75.28" width="16.21" height="0.29"
-                          transform="translate(-44.2 60.22) rotate(-52)"/>
-                    <rect class="cls-217" x="31.3" y="75.1" width="16.21" height="0.29"
-                          transform="translate(-44.15 59.98) rotate(-52)"/>
-                    <rect class="cls-218" x="31.08" y="74.93" width="16.21" height="0.29"
-                          transform="translate(-44.1 59.73) rotate(-52)"/>
-                    <rect class="cls-219" x="30.85" y="74.75" width="16.21" height="0.29"
-                          transform="translate(-44.04 59.49) rotate(-52)"/>
-                    <rect class="cls-220" x="30.63" y="74.57" width="16.21" height="0.29"
-                          transform="translate(-43.99 59.24) rotate(-52)"/>
-                    <rect class="cls-220" x="30.4" y="74.4" width="16.21" height="0.29"
-                          transform="translate(-43.94 58.99) rotate(-52)"/>
-                    <rect class="cls-221" x="30.17" y="74.22" width="16.21" height="0.29"
-                          transform="translate(-43.89 58.75) rotate(-52)"/>
-                    <rect class="cls-221" x="29.39" y="72.89" width="16.21" height="1.71"
-                          transform="translate(-43.7 57.89) rotate(-52)"/>
-                    <rect class="cls-221" x="28.04" y="71.84" width="16.21" height="1.71"
-                          transform="translate(-43.39 56.42) rotate(-52)"/>
-                    <rect class="cls-222" x="26.69" y="70.78" width="16.21" height="1.71"
-                          transform="translate(-43.08 54.95) rotate(-52)"/>
-                    <polygon class="cls-223"
-                             points="29.13 77.5 27.78 76.44 36.99 64.65 39.01 64.65 39.11 64.72 29.13 77.5"/>
-                    <polygon class="cls-224" points="27.78 76.44 26.43 75.39 34.81 64.65 36.99 64.65 27.78 76.44"/>
-                    <polygon class="cls-225" points="26.43 75.39 25.07 74.33 32.64 64.65 34.81 64.65 26.43 75.39"/>
-                    <polygon class="cls-225" points="25.07 74.33 23.73 73.28 30.46 64.65 32.64 64.65 25.07 74.33"/>
-                    <polygon class="cls-226"
-                             points="23.73 73.28 22.71 72.48 22.71 71.8 28.29 64.65 30.46 64.65 23.73 73.28"/>
-                    <polygon class="cls-226" points="22.71 71.3 27.9 64.65 28.29 64.65 22.71 71.8 22.71 71.3"/>
-                    <polygon class="cls-227" points="22.71 70.79 27.51 64.65 27.9 64.65 22.71 71.3 22.71 70.79"/>
-                    <polygon class="cls-228" points="22.71 70.29 27.11 64.65 27.51 64.65 22.71 70.79 22.71 70.29"/>
-                    <polygon class="cls-229" points="22.71 69.79 26.72 64.65 27.11 64.65 22.71 70.29 22.71 69.79"/>
-                    <polygon class="cls-230" points="22.71 69.29 26.33 64.65 26.72 64.65 22.71 69.79 22.71 69.29"/>
-                    <polygon class="cls-231" points="22.71 68.79 25.94 64.65 26.33 64.65 22.71 69.29 22.71 68.79"/>
-                    <polygon class="cls-232" points="22.71 68.28 25.55 64.65 25.94 64.65 22.71 68.79 22.71 68.28"/>
-                    <polygon class="cls-34" points="22.71 67.78 25.16 64.65 25.55 64.65 22.71 68.28 22.71 67.78"/>
-                    <polygon class="cls-35" points="22.71 67.28 24.76 64.65 25.16 64.65 22.71 67.78 22.71 67.28"/>
-                    <polygon class="cls-36" points="22.71 66.78 24.37 64.65 24.76 64.65 22.71 67.28 22.71 66.78"/>
-                    <polygon class="cls-37" points="22.71 66.28 23.98 64.65 24.37 64.65 22.71 66.78 22.71 66.28"/>
-                    <polygon class="cls-38" points="22.71 65.77 23.59 64.65 23.98 64.65 22.71 66.28 22.71 65.77"/>
-                    <polygon class="cls-39" points="22.71 65.27 23.19 64.65 23.59 64.65 22.71 65.77 22.71 65.27"/>
-                    <polygon class="cls-40" points="22.71 64.77 22.8 64.65 23.19 64.65 22.71 65.27 22.71 64.77"/>
-                    <polygon class="cls-41" points="22.8 64.65 22.71 64.77 22.71 64.65 22.8 64.65"/>
-                </g>
-                <g class="cls-233">
-                    <polygon class="cls-234" points="88.91 111.72 95.39 103.41 99.37 106.52 99.37 111.72 88.91 111.72"/>
-                    <polygon class="cls-234" points="88.8 111.72 95.33 103.36 95.39 103.41 88.91 111.72 88.8 111.72"/>
-                    <polygon class="cls-235" points="88.69 111.72 95.26 103.31 95.33 103.36 88.8 111.72 88.69 111.72"/>
-                    <polygon class="cls-236" points="88.59 111.72 95.2 103.26 95.26 103.31 88.69 111.72 88.59 111.72"/>
-                    <polygon class="cls-237" points="88.48 111.72 95.13 103.21 95.2 103.26 88.59 111.72 88.48 111.72"/>
-                    <polygon class="cls-238" points="88.38 111.72 95.07 103.16 95.13 103.21 88.48 111.72 88.38 111.72"/>
-                    <polygon class="cls-239" points="88.27 111.72 95 103.1 95.07 103.16 88.38 111.72 88.27 111.72"/>
-                    <polygon class="cls-240" points="88.16 111.72 94.94 103.05 95 103.1 88.27 111.72 88.16 111.72"/>
-                    <polygon class="cls-241" points="88.06 111.72 94.87 103 94.94 103.05 88.16 111.72 88.06 111.72"/>
-                    <polygon class="cls-242" points="87.95 111.72 94.8 102.95 94.87 103 88.06 111.72 87.95 111.72"/>
-                    <polygon class="cls-243" points="87.85 111.72 94.74 102.9 94.8 102.95 87.95 111.72 87.85 111.72"/>
-                    <polygon class="cls-244" points="87.74 111.72 94.67 102.85 94.74 102.9 87.85 111.72 87.74 111.72"/>
-                    <polygon class="cls-245" points="87.63 111.72 94.61 102.8 94.67 102.85 87.74 111.72 87.63 111.72"/>
-                    <polygon class="cls-246" points="87.53 111.72 94.54 102.74 94.61 102.8 87.63 111.72 87.53 111.72"/>
-                    <polygon class="cls-247" points="87.42 111.72 94.47 102.69 94.54 102.74 87.53 111.72 87.42 111.72"/>
-                    <polygon class="cls-248" points="87.32 111.72 94.41 102.64 94.47 102.69 87.42 111.72 87.32 111.72"/>
-                    <polygon class="cls-249" points="87.21 111.72 94.34 102.59 94.41 102.64 87.32 111.72 87.21 111.72"/>
-                    <polygon class="cls-250" points="87.1 111.72 94.28 102.54 94.34 102.59 87.21 111.72 87.1 111.72"/>
-                    <polygon class="cls-251" points="87 111.72 94.21 102.49 94.28 102.54 87.1 111.72 87 111.72"/>
-                    <polygon class="cls-252" points="86.89 111.72 94.14 102.44 94.21 102.49 87 111.72 86.89 111.72"/>
-                    <polygon class="cls-253" points="86.79 111.72 94.08 102.38 94.14 102.44 86.89 111.72 86.79 111.72"/>
-                    <polygon class="cls-254" points="86.68 111.72 94.01 102.33 94.08 102.38 86.79 111.72 86.68 111.72"/>
-                    <polygon class="cls-255" points="86.58 111.72 93.95 102.28 94.01 102.33 86.68 111.72 86.58 111.72"/>
-                    <polygon class="cls-256" points="86.47 111.72 93.88 102.23 93.95 102.28 86.58 111.72 86.47 111.72"/>
-                    <polygon class="cls-257" points="86.36 111.72 93.82 102.18 93.88 102.23 86.47 111.72 86.36 111.72"/>
-                    <polygon class="cls-258" points="86.26 111.72 93.75 102.13 93.82 102.18 86.36 111.72 86.26 111.72"/>
-                    <polygon class="cls-259" points="86.15 111.72 93.69 102.08 93.75 102.13 86.26 111.72 86.15 111.72"/>
-                    <polygon class="cls-260" points="86.05 111.72 93.62 102.03 93.69 102.08 86.15 111.72 86.05 111.72"/>
-                    <polygon class="cls-261" points="85.94 111.72 93.55 101.97 93.62 102.03 86.05 111.72 85.94 111.72"/>
-                    <polygon class="cls-262" points="85.83 111.72 93.49 101.92 93.55 101.97 85.94 111.72 85.83 111.72"/>
-                    <polygon class="cls-263" points="85.73 111.72 93.42 101.87 93.49 101.92 85.83 111.72 85.73 111.72"/>
-                    <polygon class="cls-264" points="85.62 111.72 93.36 101.82 93.42 101.87 85.73 111.72 85.62 111.72"/>
-                    <polygon class="cls-265" points="85.52 111.72 93.29 101.77 93.36 101.82 85.62 111.72 85.52 111.72"/>
-                    <polygon class="cls-266" points="85.41 111.72 93.22 101.72 93.29 101.77 85.52 111.72 85.41 111.72"/>
-                    <polygon class="cls-267" points="85.3 111.72 93.16 101.67 93.22 101.72 85.41 111.72 85.3 111.72"/>
-                    <polygon class="cls-268" points="85.2 111.72 93.09 101.61 93.16 101.67 85.3 111.72 85.2 111.72"/>
-                    <polygon class="cls-268" points="85.09 111.72 93.03 101.56 93.09 101.61 85.2 111.72 85.09 111.72"/>
-                    <polygon class="cls-269" points="84.99 111.72 92.96 101.51 93.03 101.56 85.09 111.72 84.99 111.72"/>
-                    <polygon class="cls-270" points="84.88 111.72 92.9 101.46 92.96 101.51 84.99 111.72 84.88 111.72"/>
-                    <polygon class="cls-271" points="84.77 111.72 92.83 101.41 92.9 101.46 84.88 111.72 84.77 111.72"/>
-                    <polygon class="cls-272" points="84.67 111.72 92.76 101.36 92.83 101.41 84.77 111.72 84.67 111.72"/>
-                    <polygon class="cls-273" points="84.56 111.72 92.7 101.31 92.76 101.36 84.67 111.72 84.56 111.72"/>
-                    <polygon class="cls-274" points="84.46 111.72 92.63 101.25 92.7 101.31 84.56 111.72 84.46 111.72"/>
-                    <polygon class="cls-275" points="84.35 111.72 92.57 101.2 92.63 101.25 84.46 111.72 84.35 111.72"/>
-                    <polygon class="cls-276" points="84.25 111.72 92.5 101.15 92.57 101.2 84.35 111.72 84.25 111.72"/>
-                    <polygon class="cls-277" points="84.14 111.72 92.44 101.1 92.5 101.15 84.25 111.72 84.14 111.72"/>
-                    <polygon class="cls-278" points="84.03 111.72 92.37 101.05 92.44 101.1 84.14 111.72 84.03 111.72"/>
-                    <polygon class="cls-279" points="83.93 111.72 92.3 101 92.37 101.05 84.03 111.72 83.93 111.72"/>
-                    <polygon class="cls-280" points="83.82 111.72 92.24 100.94 92.3 101 83.93 111.72 83.82 111.72"/>
-                    <polygon class="cls-281" points="83.72 111.72 92.17 100.89 92.24 100.94 83.82 111.72 83.72 111.72"/>
-                    <polygon class="cls-282" points="83.61 111.72 92.11 100.84 92.17 100.89 83.72 111.72 83.61 111.72"/>
-                    <polygon class="cls-283" points="83.5 111.72 92.04 100.79 92.11 100.84 83.61 111.72 83.5 111.72"/>
-                    <polygon class="cls-284" points="83.4 111.72 91.97 100.74 92.04 100.79 83.5 111.72 83.4 111.72"/>
-                    <polygon class="cls-285" points="83.29 111.72 91.91 100.69 91.97 100.74 83.4 111.72 83.29 111.72"/>
-                    <polygon class="cls-286" points="83.19 111.72 91.84 100.64 91.91 100.69 83.29 111.72 83.19 111.72"/>
-                    <polygon class="cls-287" points="83.08 111.72 91.78 100.59 91.84 100.64 83.19 111.72 83.08 111.72"/>
-                    <polygon class="cls-288" points="82.97 111.72 91.71 100.53 91.78 100.59 83.08 111.72 82.97 111.72"/>
-                    <polygon class="cls-289" points="82.87 111.72 91.65 100.48 91.71 100.53 82.97 111.72 82.87 111.72"/>
-                    <polygon class="cls-290" points="82.76 111.72 91.58 100.43 91.65 100.48 82.87 111.72 82.76 111.72"/>
-                    <polygon class="cls-291" points="82.66 111.72 91.51 100.38 91.58 100.43 82.76 111.72 82.66 111.72"/>
-                    <polygon class="cls-292" points="82.55 111.72 91.45 100.33 91.51 100.38 82.66 111.72 82.55 111.72"/>
-                    <polygon class="cls-293" points="82.44 111.72 91.38 100.28 91.45 100.33 82.55 111.72 82.44 111.72"/>
-                    <polygon class="cls-294" points="82.34 111.72 91.32 100.23 91.38 100.28 82.44 111.72 82.34 111.72"/>
-                    <polygon class="cls-295" points="82.23 111.72 91.25 100.17 91.32 100.23 82.34 111.72 82.23 111.72"/>
-                    <polygon class="cls-296" points="82.13 111.72 91.19 100.12 91.25 100.17 82.23 111.72 82.13 111.72"/>
-                    <polygon class="cls-297" points="82.02 111.72 91.12 100.07 91.19 100.12 82.13 111.72 82.02 111.72"/>
-                    <polygon class="cls-298" points="81.91 111.72 91.05 100.02 91.12 100.07 82.02 111.72 81.91 111.72"/>
-                    <polygon class="cls-299" points="81.81 111.72 90.99 99.97 91.05 100.02 81.91 111.72 81.81 111.72"/>
-                    <polygon class="cls-300" points="81.7 111.72 90.92 99.92 90.99 99.97 81.81 111.72 81.7 111.72"/>
-                    <polygon class="cls-300" points="81.17 111.72 90.59 99.66 90.92 99.92 81.7 111.72 81.17 111.72"/>
-                    <polygon class="cls-301" points="80.65 111.72 90.27 99.41 90.59 99.66 81.17 111.72 80.65 111.72"/>
-                    <polygon class="cls-302" points="80.12 111.72 89.94 99.15 90.27 99.41 80.65 111.72 80.12 111.72"/>
-                    <polygon class="cls-303" points="79.59 111.72 89.61 98.89 89.94 99.15 80.12 111.72 79.59 111.72"/>
-                    <polygon class="cls-304" points="79.06 111.72 89.28 98.64 89.61 98.89 79.59 111.72 79.06 111.72"/>
-                    <polygon class="cls-305" points="78.54 111.72 88.96 98.38 89.28 98.64 79.06 111.72 78.54 111.72"/>
-                    <polygon class="cls-305" points="78.01 111.72 88.63 98.13 88.96 98.38 78.54 111.72 78.01 111.72"/>
-                    <polygon class="cls-306" points="77.48 111.72 88.3 97.87 88.63 98.13 78.01 111.72 77.48 111.72"/>
-                    <polygon class="cls-307" points="76.95 111.72 87.97 97.61 88.3 97.87 77.48 111.72 76.95 111.72"/>
-                    <polygon class="cls-308" points="76.42 111.72 87.64 97.36 87.97 97.61 76.95 111.72 76.42 111.72"/>
-                    <polygon class="cls-309" points="75.9 111.72 87.32 97.1 87.64 97.36 76.42 111.72 75.9 111.72"/>
-                    <polygon class="cls-310" points="75.37 111.72 86.99 96.84 87.32 97.1 75.9 111.72 75.37 111.72"/>
-                    <polygon class="cls-311" points="74.84 111.72 86.66 96.59 86.99 96.84 75.37 111.72 74.84 111.72"/>
-                    <polygon class="cls-312" points="74.31 111.72 86.33 96.33 86.66 96.59 74.84 111.72 74.31 111.72"/>
-                    <polygon class="cls-313" points="73.78 111.72 86.01 96.08 86.33 96.33 74.31 111.72 73.78 111.72"/>
-                    <polygon class="cls-314" points="73.26 111.72 85.68 95.82 86.01 96.08 73.78 111.72 73.26 111.72"/>
-                    <polygon class="cls-315" points="72.73 111.72 85.35 95.56 85.68 95.82 73.26 111.72 72.73 111.72"/>
-                    <polygon class="cls-316" points="72.2 111.72 85.02 95.31 85.35 95.56 72.73 111.72 72.2 111.72"/>
-                    <polygon class="cls-316" points="71.67 111.72 84.69 95.05 85.02 95.31 72.2 111.72 71.67 111.72"/>
-                    <polygon class="cls-317"
-                             points="71.23 111.72 71.18 111.68 84.37 94.8 84.69 95.05 71.67 111.72 71.23 111.72"/>
-                    <rect class="cls-317" x="66.9" y="102.9" width="21.42" height="0.42"
-                          transform="translate(-51.42 100.79) rotate(-52)"/>
-                    <rect class="cls-318" x="66.57" y="102.64" width="21.42" height="0.42"
-                          transform="translate(-51.35 100.43) rotate(-52)"/>
-                    <rect class="cls-114" x="66.24" y="102.39" width="21.42" height="0.42"
-                          transform="translate(-51.27 100.08) rotate(-52)"/>
-                    <rect class="cls-114" x="65.92" y="102.13" width="21.42" height="0.42"
-                          transform="translate(-51.19 99.72) rotate(-52)"/>
-                    <rect class="cls-115" x="65.59" y="101.88" width="21.42" height="0.42"
-                          transform="translate(-51.12 99.36) rotate(-52)"/>
-                    <rect class="cls-116" x="65.26" y="101.62" width="21.42" height="0.42"
-                          transform="translate(-51.04 99.01) rotate(-52)"/>
-                    <rect class="cls-117" x="64.93" y="101.36" width="21.42" height="0.42"
-                          transform="translate(-50.97 98.65) rotate(-52)"/>
-                    <rect class="cls-118" x="64.61" y="101.11" width="21.42" height="0.42"
-                          transform="translate(-50.89 98.29) rotate(-52)"/>
-                    <rect class="cls-118" x="64.28" y="100.85" width="21.42" height="0.42"
-                          transform="translate(-50.82 97.94) rotate(-52)"/>
-                    <rect class="cls-119" x="63.95" y="100.6" width="21.42" height="0.42"
-                          transform="translate(-50.74 97.58) rotate(-52)"/>
-                    <rect class="cls-120" x="63.62" y="100.34" width="21.42" height="0.42"
-                          transform="translate(-50.66 97.22) rotate(-52)"/>
-                    <rect class="cls-121" x="63.29" y="100.08" width="21.42" height="0.42"
-                          transform="translate(-50.59 96.87) rotate(-52)"/>
-                    <rect class="cls-122" x="62.97" y="99.83" width="21.42" height="0.42"
-                          transform="translate(-50.51 96.51) rotate(-52)"/>
-                    <rect class="cls-122" x="62.64" y="99.57" width="21.42" height="0.42"
-                          transform="translate(-50.44 96.15) rotate(-52)"/>
-                    <rect class="cls-123" x="62.31" y="99.32" width="21.42" height="0.42"
-                          transform="translate(-50.36 95.8) rotate(-52)"/>
-                    <rect class="cls-124" x="61.98" y="99.06" width="21.42" height="0.42"
-                          transform="translate(-50.29 95.44) rotate(-52)"/>
-                    <rect class="cls-125" x="61.66" y="98.8" width="21.42" height="0.42"
-                          transform="translate(-50.21 95.08) rotate(-52)"/>
-                    <rect class="cls-126" x="61.33" y="98.55" width="21.42" height="0.42"
-                          transform="translate(-50.13 94.73) rotate(-52)"/>
-                    <polygon class="cls-126"
-                             points="65.28 107.07 64.95 106.81 78.07 90.02 78.25 90.02 78.47 90.19 65.28 107.07"/>
-                    <polygon class="cls-127" points="64.95 106.81 64.63 106.56 77.54 90.02 78.07 90.02 64.95 106.81"/>
-                    <polygon class="cls-127" points="64.63 106.56 64.3 106.3 77.02 90.02 77.54 90.02 64.63 106.56"/>
-                    <polygon class="cls-128" points="64.3 106.3 63.97 106.04 76.49 90.02 77.02 90.02 64.3 106.3"/>
-                    <polygon class="cls-129" points="63.97 106.04 63.64 105.79 75.96 90.02 76.49 90.02 63.97 106.04"/>
-                    <polygon class="cls-129" points="63.64 105.79 63.31 105.53 75.43 90.02 75.96 90.02 63.64 105.79"/>
-                    <polygon class="cls-130" points="63.31 105.53 62.99 105.28 74.9 90.02 75.43 90.02 63.31 105.53"/>
-                    <polygon class="cls-130" points="62.99 105.28 62.66 105.02 74.38 90.02 74.9 90.02 62.99 105.28"/>
-                    <polygon class="cls-131" points="62.66 105.02 62.33 104.76 73.85 90.02 74.38 90.02 62.66 105.02"/>
-                    <polygon class="cls-132" points="62.33 104.76 62 104.51 73.32 90.02 73.85 90.02 62.33 104.76"/>
-                    <polygon class="cls-133" points="62 104.51 61.67 104.25 72.79 90.02 73.32 90.02 62 104.51"/>
-                    <polygon class="cls-134" points="61.67 104.25 61.35 103.99 72.26 90.02 72.79 90.02 61.67 104.25"/>
-                    <polygon class="cls-134" points="61.35 103.99 61.02 103.74 71.74 90.02 72.26 90.02 61.35 103.99"/>
-                    <polygon class="cls-135" points="61.02 103.74 60.69 103.48 71.21 90.02 71.74 90.02 61.02 103.74"/>
-                    <polygon class="cls-136" points="60.69 103.48 60.36 103.23 70.68 90.02 71.21 90.02 60.69 103.48"/>
-                    <polygon class="cls-137" points="60.36 103.23 60.04 102.97 70.15 90.02 70.68 90.02 60.36 103.23"/>
-                    <polygon class="cls-138" points="60.04 102.97 59.71 102.71 69.63 90.02 70.15 90.02 60.04 102.97"/>
-                    <polygon class="cls-139" points="59.71 102.71 59.38 102.46 69.1 90.02 69.63 90.02 59.71 102.71"/>
-                    <polygon class="cls-139" points="59.38 102.46 59.05 102.2 68.57 90.02 69.1 90.02 59.38 102.46"/>
-                    <polygon class="cls-140" points="59.05 102.2 58.73 101.95 68.04 90.02 68.57 90.02 59.05 102.2"/>
-                    <polygon class="cls-141" points="58.73 101.95 58.4 101.69 67.51 90.02 68.04 90.02 58.73 101.95"/>
-                    <polygon class="cls-142" points="58.4 101.69 58.07 101.43 66.99 90.02 67.51 90.02 58.4 101.69"/>
-                    <polygon class="cls-143" points="58.07 101.43 57.74 101.18 66.46 90.02 66.99 90.02 58.07 101.43"/>
-                    <polygon class="cls-143" points="57.74 101.18 57.41 100.92 65.93 90.02 66.46 90.02 57.74 101.18"/>
-                    <polygon class="cls-144"
-                             points="57.41 100.92 57.31 100.84 57.31 100.38 65.4 90.02 65.93 90.02 57.41 100.92"/>
-                    <polygon class="cls-144" points="57.31 99.7 64.88 90.02 65.4 90.02 57.31 100.38 57.31 99.7"/>
-                    <polygon class="cls-145" points="57.31 99.03 64.35 90.02 64.88 90.02 57.31 99.7 57.31 99.03"/>
-                    <polygon class="cls-146" points="57.31 98.35 63.82 90.02 64.35 90.02 57.31 99.03 57.31 98.35"/>
-                    <polygon class="cls-147" points="57.31 97.68 63.29 90.02 63.82 90.02 57.31 98.35 57.31 97.68"/>
-                    <polygon class="cls-148" points="57.31 97 62.76 90.02 63.29 90.02 57.31 97.68 57.31 97"/>
-                    <polygon class="cls-149" points="57.31 96.33 62.24 90.02 62.76 90.02 57.31 97 57.31 96.33"/>
-                    <polygon class="cls-150" points="57.31 95.65 61.71 90.02 62.24 90.02 57.31 96.33 57.31 95.65"/>
-                    <polygon class="cls-151" points="57.31 94.97 61.18 90.02 61.71 90.02 57.31 95.65 57.31 94.97"/>
-                    <polygon class="cls-152" points="57.31 94.3 60.65 90.02 61.18 90.02 57.31 94.97 57.31 94.3"/>
-                    <polygon class="cls-153" points="57.31 93.62 60.13 90.02 60.65 90.02 57.31 94.3 57.31 93.62"/>
-                    <polygon class="cls-154" points="57.31 92.95 59.6 90.02 60.13 90.02 57.31 93.62 57.31 92.95"/>
-                    <polygon class="cls-154" points="57.31 92.27 59.07 90.02 59.6 90.02 57.31 92.95 57.31 92.27"/>
-                    <polygon class="cls-155" points="57.31 91.6 58.54 90.02 59.07 90.02 57.31 92.27 57.31 91.6"/>
-                    <polygon class="cls-155" points="57.31 90.92 58.01 90.02 58.54 90.02 57.31 91.6 57.31 90.92"/>
-                    <polygon class="cls-319" points="57.31 90.25 57.48 90.02 58.01 90.02 57.31 90.92 57.31 90.25"/>
-                    <polygon class="cls-320" points="57.48 90.02 57.31 90.25 57.31 90.02 57.48 90.02"/>
-                </g>
-                <g class="cls-321">
-                    <polygon class="cls-157" points="67.92 89.32 68.17 89 68.17 89.32 67.92 89.32"/>
-                    <polygon class="cls-158" points="67.56 89.32 68.17 88.53 68.17 89 67.92 89.32 67.56 89.32"/>
-                    <polygon class="cls-158" points="67.19 89.32 68.17 88.07 68.17 88.53 67.56 89.32 67.19 89.32"/>
-                    <polygon class="cls-158" points="66.83 89.32 68.17 87.6 68.17 88.07 67.19 89.32 66.83 89.32"/>
-                    <polygon class="cls-159" points="66.47 89.32 68.17 87.13 68.17 87.6 66.83 89.32 66.47 89.32"/>
-                    <polygon class="cls-159" points="66.1 89.32 68.17 86.67 68.17 87.13 66.47 89.32 66.1 89.32"/>
-                    <polygon class="cls-159" points="65.74 89.32 68.17 86.2 68.17 86.67 66.1 89.32 65.74 89.32"/>
-                    <polygon class="cls-160" points="65.37 89.32 68.17 85.74 68.17 86.2 65.74 89.32 65.37 89.32"/>
-                    <polygon class="cls-160" points="65.01 89.32 68.17 85.27 68.17 85.74 65.37 89.32 65.01 89.32"/>
-                    <polygon class="cls-160" points="64.64 89.32 68.17 84.8 68.17 85.27 65.01 89.32 64.64 89.32"/>
-                    <polygon class="cls-161" points="64.28 89.32 68.17 84.34 68.17 84.8 64.64 89.32 64.28 89.32"/>
-                    <polygon class="cls-161" points="63.92 89.32 68.17 83.87 68.17 84.34 64.28 89.32 63.92 89.32"/>
-                    <polygon class="cls-161" points="63.55 89.32 68.17 83.41 68.17 83.87 63.92 89.32 63.55 89.32"/>
-                    <polygon class="cls-162" points="63.19 89.32 68.17 82.94 68.17 83.41 63.55 89.32 63.19 89.32"/>
-                    <polygon class="cls-162" points="62.82 89.32 68.17 82.47 68.17 82.94 63.19 89.32 62.82 89.32"/>
-                    <polygon class="cls-163" points="62.46 89.32 68.17 82.01 68.17 82.47 62.82 89.32 62.46 89.32"/>
-                    <polygon class="cls-164" points="62.1 89.32 68.17 81.54 68.17 82.01 62.46 89.32 62.1 89.32"/>
-                    <polygon class="cls-164" points="61.73 89.32 68.17 81.08 68.17 81.54 62.1 89.32 61.73 89.32"/>
-                    <polygon class="cls-165" points="61.37 89.32 68.17 80.61 68.17 81.08 61.73 89.32 61.37 89.32"/>
-                    <polygon class="cls-166" points="61 89.32 68.17 80.14 68.17 80.61 61.37 89.32 61 89.32"/>
-                    <polygon class="cls-166" points="60.64 89.32 68.17 79.68 68.17 80.14 61 89.32 60.64 89.32"/>
-                    <polygon class="cls-167" points="60.28 89.32 68.17 79.21 68.17 79.68 60.64 89.32 60.28 89.32"/>
-                    <polygon class="cls-167" points="59.91 89.32 68.17 78.75 68.17 79.21 60.28 89.32 59.91 89.32"/>
-                    <polygon class="cls-168" points="59.55 89.32 68.17 78.28 68.17 78.75 59.91 89.32 59.55 89.32"/>
-                    <polygon class="cls-169"
-                             points="59.43 89.32 59.28 89.2 68.17 77.81 68.17 78.28 59.55 89.32 59.43 89.32"/>
-                    <polygon class="cls-169" points="59.28 89.2 59.05 89.02 68.17 77.35 68.17 77.81 59.28 89.2"/>
-                    <polygon class="cls-170" points="59.05 89.02 58.82 88.84 68.17 76.88 68.17 77.35 59.05 89.02"/>
-                    <polygon class="cls-171" points="58.82 88.84 58.6 88.67 68.17 76.42 68.17 76.88 58.82 88.84"/>
-                    <polygon class="cls-171" points="58.6 88.67 58.37 88.49 68.17 75.95 68.17 76.42 58.6 88.67"/>
-                    <polygon class="cls-172" points="58.37 88.49 58.15 88.31 68.17 75.48 68.17 75.95 58.37 88.49"/>
-                    <polygon class="cls-173" points="58.15 88.31 57.92 88.14 68.17 75.02 68.17 75.48 58.15 88.31"/>
-                    <polygon class="cls-173" points="57.92 88.14 57.69 87.96 68.17 74.55 68.17 75.02 57.92 88.14"/>
-                    <polygon class="cls-174" points="57.69 87.96 57.47 87.78 68.17 74.08 68.17 74.55 57.69 87.96"/>
-                    <polygon class="cls-174" points="57.47 87.78 57.24 87.61 68.17 73.62 68.17 74.08 57.47 87.78"/>
-                    <polygon class="cls-174" points="57.24 87.61 57.02 87.43 68.17 73.15 68.17 73.62 57.24 87.61"/>
-                    <polygon class="cls-175" points="57.02 87.43 56.79 87.25 68.17 72.69 68.17 73.15 57.02 87.43"/>
-                    <polygon class="cls-175" points="56.79 87.25 56.56 87.08 68.17 72.22 68.17 72.69 56.79 87.25"/>
-                    <polygon class="cls-175" points="56.56 87.08 56.34 86.9 68.17 71.75 68.17 72.22 56.56 87.08"/>
-                    <polygon class="cls-176" points="56.34 86.9 56.11 86.72 68.17 71.29 68.17 71.75 56.34 86.9"/>
-                    <polygon class="cls-176" points="56.11 86.72 55.88 86.55 68.17 70.82 68.17 71.29 56.11 86.72"/>
-                    <polygon class="cls-176" points="55.88 86.55 55.66 86.37 68.17 70.36 68.17 70.82 55.88 86.55"/>
-                    <polygon class="cls-177" points="55.66 86.37 55.43 86.19 68.17 69.89 68.17 70.36 55.66 86.37"/>
-                    <polygon class="cls-177"
-                             points="55.43 86.19 55.21 86.02 68.13 69.47 68.17 69.5 68.17 69.89 55.43 86.19"/>
-                    <rect class="cls-177" x="51.06" y="77.51" width="21" height="0.29"
-                          transform="translate(-37.54 78.36) rotate(-52)"/>
-                    <rect class="cls-178" x="50.83" y="77.34" width="21" height="0.29"
-                          transform="translate(-37.48 78.11) rotate(-52)"/>
-                    <rect class="cls-178" x="50.61" y="77.16" width="21" height="0.29"
-                          transform="translate(-37.43 77.87) rotate(-52)"/>
-                    <rect class="cls-179" x="50.38" y="76.98" width="21" height="0.29"
-                          transform="translate(-37.38 77.62) rotate(-52)"/>
-                    <rect class="cls-180" x="50.15" y="76.81" width="21" height="0.29"
-                          transform="translate(-37.33 77.37) rotate(-52)"/>
-                    <rect class="cls-180" x="49.93" y="76.63" width="21" height="0.29"
-                          transform="translate(-37.27 77.13) rotate(-52)"/>
-                    <rect class="cls-181" x="49.7" y="76.45" width="21" height="0.29"
-                          transform="translate(-37.22 76.88) rotate(-52)"/>
-                    <rect class="cls-182" x="49.48" y="76.28" width="21" height="0.29"
-                          transform="translate(-37.17 76.63) rotate(-52)"/>
-                    <rect class="cls-182" x="49.25" y="76.1" width="21" height="0.29"
-                          transform="translate(-37.12 76.39) rotate(-52)"/>
-                    <rect class="cls-183" x="49.02" y="75.92" width="21" height="0.29"
-                          transform="translate(-37.06 76.14) rotate(-52)"/>
-                    <rect class="cls-184" x="48.8" y="75.75" width="21" height="0.29"
-                          transform="translate(-37.01 75.9) rotate(-52)"/>
-                    <rect class="cls-184" x="48.57" y="75.57" width="21" height="0.29"
-                          transform="translate(-36.96 75.65) rotate(-52)"/>
-                    <rect class="cls-185" x="48.34" y="75.39" width="21" height="0.29"
-                          transform="translate(-36.91 75.4) rotate(-52)"/>
-                    <rect class="cls-186" x="48.12" y="75.22" width="21" height="0.29"
-                          transform="translate(-36.86 75.16) rotate(-52)"/>
-                    <rect class="cls-187" x="47.89" y="75.04" width="21" height="0.29"
-                          transform="translate(-36.8 74.91) rotate(-52)"/>
-                    <rect class="cls-187" x="47.67" y="74.86" width="21" height="0.29"
-                          transform="translate(-36.75 74.67) rotate(-52)"/>
-                    <rect class="cls-188" x="47.44" y="74.69" width="21" height="0.29"
-                          transform="translate(-36.7 74.42) rotate(-52)"/>
-                    <rect class="cls-189" x="47.21" y="74.51" width="21" height="0.29"
-                          transform="translate(-36.65 74.17) rotate(-52)"/>
-                    <rect class="cls-189" x="46.99" y="74.33" width="21" height="0.29"
-                          transform="translate(-36.59 73.93) rotate(-52)"/>
-                    <rect class="cls-190" x="46.76" y="74.16" width="21" height="0.29"
-                          transform="translate(-36.54 73.68) rotate(-52)"/>
-                    <rect class="cls-191" x="46.54" y="73.98" width="21" height="0.29"
-                          transform="translate(-36.49 73.44) rotate(-52)"/>
-                    <rect class="cls-191" x="46.31" y="73.8" width="21" height="0.29"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -36.44, 73.19)"/>
-                    <rect class="cls-192" x="46.08" y="73.63" width="21" height="0.29"
-                          transform="translate(-36.39 72.94) rotate(-52)"/>
-                    <rect class="cls-192" x="45.86" y="73.45" width="21" height="0.29"
-                          transform="translate(-36.33 72.7) rotate(-52)"/>
-                    <rect class="cls-192" x="45.63" y="73.27" width="21" height="0.29"
-                          transform="translate(-36.28 72.45) rotate(-52)"/>
-                    <rect class="cls-193" x="45.41" y="73.1" width="21" height="0.29"
-                          transform="translate(-36.23 72.21) rotate(-52)"/>
-                    <rect class="cls-193" x="45.18" y="72.92" width="21" height="0.29"
-                          transform="translate(-36.18 71.96) rotate(-52)"/>
-                    <rect class="cls-193" x="44.95" y="72.74" width="21" height="0.29"
-                          transform="translate(-36.12 71.71) rotate(-52)"/>
-                    <rect class="cls-194" x="44.73" y="72.57" width="21" height="0.29"
-                          transform="translate(-36.07 71.47) rotate(-52)"/>
-                    <rect class="cls-194" x="44.5" y="72.39" width="21" height="0.29"
-                          transform="translate(-36.02 71.22) rotate(-52)"/>
-                    <rect class="cls-195" x="44.28" y="72.21" width="21" height="0.29"
-                          transform="translate(-35.97 70.98) rotate(-52)"/>
-                    <rect class="cls-196" x="44.05" y="72.04" width="21" height="0.29"
-                          transform="translate(-35.91 70.73) rotate(-52)"/>
-                    <rect class="cls-196" x="43.82" y="71.86" width="21" height="0.29"
-                          transform="translate(-35.86 70.48) rotate(-52)"/>
-                    <rect class="cls-197" x="43.6" y="71.68" width="21" height="0.29"
-                          transform="translate(-35.81 70.24) rotate(-52)"/>
-                    <rect class="cls-197" x="43.37" y="71.51" width="21" height="0.29"
-                          transform="translate(-35.76 69.99) rotate(-52)"/>
-                    <rect class="cls-197" x="43.14" y="71.33" width="21" height="0.29"
-                          transform="translate(-35.71 69.74) rotate(-52)"/>
-                    <rect class="cls-198" x="42.92" y="71.15" width="21" height="0.29"
-                          transform="translate(-35.65 69.5) rotate(-52)"/>
-                    <rect class="cls-198" x="42.69" y="70.98" width="21" height="0.29"
-                          transform="translate(-35.6 69.25) rotate(-52)"/>
-                    <rect class="cls-199" x="42.47" y="70.8" width="21" height="0.29"
-                          transform="translate(-35.55 69.01) rotate(-52)"/>
-                    <rect class="cls-200" x="42.24" y="70.62" width="21" height="0.29"
-                          transform="translate(-35.5 68.76) rotate(-52)"/>
-                    <rect class="cls-200" x="42.01" y="70.45" width="21" height="0.29"
-                          transform="translate(-35.44 68.51) rotate(-52)"/>
-                    <rect class="cls-201" x="41.79" y="70.27" width="21" height="0.29"
-                          transform="translate(-35.39 68.27) rotate(-52)"/>
-                    <rect class="cls-201" x="41.56" y="70.09" width="21" height="0.29"
-                          transform="translate(-35.34 68.02) rotate(-52)"/>
-                    <rect class="cls-202" x="41.34" y="69.92" width="21" height="0.29"
-                          transform="translate(-35.29 67.78) rotate(-52)"/>
-                    <rect class="cls-203" x="41.11" y="69.74" width="21" height="0.29"
-                          transform="translate(-35.23 67.53) rotate(-52)"/>
-                    <rect class="cls-203" x="40.88" y="69.56" width="21" height="0.29"
-                          transform="translate(-35.18 67.28) rotate(-52)"/>
-                    <rect class="cls-204" x="40.66" y="69.39" width="21" height="0.29"
-                          transform="translate(-35.13 67.04) rotate(-52)"/>
-                    <rect class="cls-205" x="40.43" y="69.21" width="21" height="0.29"
-                          transform="translate(-35.08 66.79) rotate(-52)"/>
-                    <rect class="cls-206" x="40.21" y="69.03" width="21" height="0.29"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -35.03, 66.55)"/>
-                    <rect class="cls-206" x="39.98" y="68.86" width="21" height="0.29"
-                          transform="translate(-34.97 66.3) rotate(-52)"/>
-                    <rect class="cls-207" x="39.75" y="68.68" width="21" height="0.29"
-                          transform="translate(-34.92 66.05) rotate(-52)"/>
-                    <rect class="cls-208" x="39.53" y="68.5" width="21" height="0.29"
-                          transform="translate(-34.87 65.81) rotate(-52)"/>
-                    <rect class="cls-209" x="39.3" y="68.33" width="21" height="0.29"
-                          transform="translate(-34.82 65.56) rotate(-52)"/>
-                    <rect class="cls-210" x="39.07" y="68.15" width="21" height="0.29"
-                          transform="translate(-34.76 65.32) rotate(-52)"/>
-                    <rect class="cls-210" x="38.85" y="67.97" width="21" height="0.29"
-                          transform="translate(-34.71 65.07) rotate(-52)"/>
-                    <rect class="cls-211" x="38.62" y="67.8" width="21" height="0.29"
-                          transform="translate(-34.66 64.82) rotate(-52)"/>
-                    <rect class="cls-211" x="38.4" y="67.62" width="21" height="0.29"
-                          transform="translate(-34.61 64.58) rotate(-52)"/>
-                    <rect class="cls-211" x="38.17" y="67.44" width="21" height="0.29"
-                          transform="translate(-34.55 64.33) rotate(-52)"/>
-                    <rect class="cls-212" x="37.94" y="67.27" width="21" height="0.29"
-                          transform="translate(-34.5 64.09) rotate(-52)"/>
-                    <rect class="cls-212" x="37.72" y="67.09" width="21" height="0.29"
-                          transform="translate(-34.45 63.84) rotate(-52)"/>
-                    <rect class="cls-213" x="37.49" y="66.92" width="21" height="0.29"
-                          transform="translate(-34.4 63.59) rotate(-52)"/>
-                    <rect class="cls-213" x="37.27" y="66.74" width="21" height="0.29"
-                          transform="translate(-34.35 63.35) rotate(-52)"/>
-                    <rect class="cls-214" x="37.04" y="66.56" width="21" height="0.29"
-                          transform="translate(-34.29 63.1) rotate(-52)"/>
-                    <rect class="cls-215" x="36.81" y="66.39" width="21" height="0.29"
-                          transform="translate(-34.24 62.85) rotate(-52)"/>
-                    <rect class="cls-216" x="36.59" y="66.21" width="21" height="0.29"
-                          transform="translate(-34.19 62.61) rotate(-52)"/>
-                    <rect class="cls-216" x="36.36" y="66.03" width="21" height="0.29"
-                          transform="translate(-34.14 62.36) rotate(-52)"/>
-                    <rect class="cls-217" x="36.14" y="65.86" width="21" height="0.29"
-                          transform="translate(-34.08 62.12) rotate(-52)"/>
-                    <rect class="cls-218" x="35.91" y="65.68" width="21" height="0.29"
-                          transform="translate(-34.03 61.87) rotate(-52)"/>
-                    <rect class="cls-219" x="35.68" y="65.5" width="21" height="0.29"
-                          transform="translate(-33.98 61.62) rotate(-52)"/>
-                    <rect class="cls-220" x="35.46" y="65.33" width="21" height="0.29"
-                          transform="translate(-33.93 61.38) rotate(-52)"/>
-                    <rect class="cls-220" x="35.23" y="65.15" width="21" height="0.29"
-                          transform="translate(-33.88 61.13) rotate(-52)"/>
-                    <rect class="cls-221" x="35.01" y="64.97" width="21" height="0.29"
-                          transform="translate(-33.82 60.89) rotate(-52)"/>
-                    <rect class="cls-221" x="34.22" y="63.64" width="21" height="1.71"
-                          transform="translate(-33.64 60.03) rotate(-52)"/>
-                    <rect class="cls-221" x="32.87" y="62.59" width="21" height="1.71"
-                          transform="translate(-33.33 58.56) rotate(-52)"/>
-                    <rect class="cls-222" x="31.52" y="61.53" width="21" height="1.71"
-                          transform="translate(-33.02 57.09) rotate(-52)"/>
-                    <rect class="cls-223" x="30.17" y="60.48" width="21" height="1.71"
-                          transform="translate(-32.7 55.62) rotate(-52)"/>
-                    <polygon class="cls-224"
-                             points="33.53 69.08 32.4 68.2 32.4 67.74 45.1 51.48 46.45 52.53 33.53 69.08"/>
-                    <polygon class="cls-225" points="32.4 64.96 43.75 50.42 45.1 51.48 32.4 67.74 32.4 64.96"/>
-                    <polygon class="cls-225" points="32.4 62.17 42.4 49.37 43.75 50.42 32.4 64.96 32.4 62.17"/>
-                    <polygon class="cls-226" points="32.4 59.39 41.05 48.31 42.4 49.37 32.4 62.17 32.4 59.39"/>
-                    <polygon class="cls-226" points="32.4 58.89 40.81 48.12 41.05 48.31 32.4 59.39 32.4 58.89"/>
-                    <polygon class="cls-227" points="32.4 58.39 40.56 47.93 40.81 48.12 32.4 58.89 32.4 58.39"/>
-                    <polygon class="cls-228" points="32.4 57.88 40.32 47.74 40.56 47.93 32.4 58.39 32.4 57.88"/>
-                    <polygon class="cls-229"
-                             points="32.4 57.38 40.01 47.64 40.19 47.64 40.32 47.74 32.4 57.88 32.4 57.38"/>
-                    <polygon class="cls-230" points="32.4 56.88 39.62 47.64 40.01 47.64 32.4 57.38 32.4 56.88"/>
-                    <polygon class="cls-231" points="32.4 56.38 39.22 47.64 39.62 47.64 32.4 56.88 32.4 56.38"/>
-                    <polygon class="cls-232" points="32.4 55.88 38.83 47.64 39.22 47.64 32.4 56.38 32.4 55.88"/>
-                    <polygon class="cls-34" points="32.4 55.38 38.44 47.64 38.83 47.64 32.4 55.88 32.4 55.38"/>
-                    <polygon class="cls-35" points="32.4 54.87 38.05 47.64 38.44 47.64 32.4 55.38 32.4 54.87"/>
-                    <polygon class="cls-36" points="32.4 54.37 37.66 47.64 38.05 47.64 32.4 54.87 32.4 54.37"/>
-                    <polygon class="cls-37" points="32.4 53.87 37.26 47.64 37.66 47.64 32.4 54.37 32.4 53.87"/>
-                    <polygon class="cls-38" points="32.4 53.37 36.87 47.64 37.26 47.64 32.4 53.87 32.4 53.37"/>
-                    <polygon class="cls-39" points="32.4 52.87 36.48 47.64 36.87 47.64 32.4 53.37 32.4 52.87"/>
-                    <polygon class="cls-40" points="32.4 52.37 36.09 47.64 36.48 47.64 32.4 52.87 32.4 52.37"/>
-                    <polygon class="cls-41" points="32.4 51.86 35.7 47.64 36.09 47.64 32.4 52.37 32.4 51.86"/>
-                    <polygon class="cls-42" points="32.4 51.36 35.3 47.64 35.7 47.64 32.4 51.86 32.4 51.36"/>
-                    <polygon class="cls-43" points="32.4 50.86 34.91 47.64 35.3 47.64 32.4 51.36 32.4 50.86"/>
-                    <polygon class="cls-44" points="32.4 50.36 34.52 47.64 34.91 47.64 32.4 50.86 32.4 50.36"/>
-                    <polygon class="cls-45" points="32.4 49.85 34.13 47.64 34.52 47.64 32.4 50.36 32.4 49.85"/>
-                    <polygon class="cls-46" points="32.4 49.35 33.73 47.64 34.13 47.64 32.4 49.85 32.4 49.35"/>
-                    <polygon class="cls-47" points="32.4 48.85 33.34 47.64 33.73 47.64 32.4 49.35 32.4 48.85"/>
-                    <polygon class="cls-48" points="32.4 48.35 32.95 47.64 33.34 47.64 32.4 48.85 32.4 48.35"/>
-                    <polygon class="cls-49" points="32.4 47.85 32.56 47.64 32.95 47.64 32.4 48.35 32.4 47.85"/>
-                    <polygon class="cls-50" points="32.56 47.64 32.4 47.85 32.4 47.64 32.56 47.64"/>
-                </g>
-                <g class="cls-322">
-                    <polygon class="cls-37" points="33.32 64.09 33.65 63.66 33.65 64.09 33.32 64.09"/>
-                    <polygon class="cls-38" points="32.93 64.09 33.65 63.16 33.65 63.66 33.32 64.09 32.93 64.09"/>
-                    <polygon class="cls-39" points="32.53 64.09 33.65 62.66 33.65 63.16 32.93 64.09 32.53 64.09"/>
-                    <polygon class="cls-40" points="32.14 64.09 33.65 62.16 33.65 62.66 32.53 64.09 32.14 64.09"/>
-                    <polygon class="cls-41" points="31.75 64.09 33.65 61.66 33.65 62.16 32.14 64.09 31.75 64.09"/>
-                    <polygon class="cls-42" points="31.36 64.09 33.65 61.16 33.65 61.66 31.75 64.09 31.36 64.09"/>
-                    <polygon class="cls-43" points="30.97 64.09 33.65 60.65 33.65 61.16 31.36 64.09 30.97 64.09"/>
-                    <polygon class="cls-44" points="30.57 64.09 33.65 60.15 33.65 60.65 30.97 64.09 30.57 64.09"/>
-                    <polygon class="cls-45" points="30.18 64.09 33.65 59.65 33.65 60.15 30.57 64.09 30.18 64.09"/>
-                    <polygon class="cls-46" points="29.79 64.09 33.65 59.15 33.65 59.65 30.18 64.09 29.79 64.09"/>
-                    <polygon class="cls-47" points="29.4 64.09 33.65 58.65 33.65 59.15 29.79 64.09 29.4 64.09"/>
-                    <polygon class="cls-48" points="29.01 64.09 33.65 58.14 33.65 58.65 29.4 64.09 29.01 64.09"/>
-                    <polygon class="cls-49" points="28.61 64.09 33.65 57.64 33.65 58.14 29.01 64.09 28.61 64.09"/>
-                    <polygon class="cls-50" points="28.22 64.09 33.65 57.14 33.65 57.64 28.61 64.09 28.22 64.09"/>
-                    <polygon class="cls-51" points="27.83 64.09 33.65 56.64 33.65 57.14 28.22 64.09 27.83 64.09"/>
-                    <polygon class="cls-52" points="27.44 64.09 33.65 56.14 33.65 56.64 27.83 64.09 27.44 64.09"/>
-                    <polygon class="cls-53"
-                             points="27.23 64.09 27.12 64 33.65 55.63 33.65 56.14 27.44 64.09 27.23 64.09"/>
-                    <polygon class="cls-54" points="27.12 64 26.87 63.81 33.65 55.13 33.65 55.63 27.12 64"/>
-                    <polygon class="cls-55" points="26.87 63.81 26.63 63.62 33.65 54.63 33.65 55.13 26.87 63.81"/>
-                    <polygon class="cls-56" points="26.63 63.62 26.39 63.43 33.65 54.13 33.65 54.63 26.63 63.62"/>
-                    <polygon class="cls-57" points="26.39 63.43 26.14 63.24 33.65 53.63 33.65 54.13 26.39 63.43"/>
-                    <polygon class="cls-58" points="26.14 63.24 25.9 63.05 33.65 53.13 33.65 53.63 26.14 63.24"/>
-                    <polygon class="cls-59" points="25.9 63.05 25.66 62.86 33.65 52.62 33.65 53.13 25.9 63.05"/>
-                    <polygon class="cls-60" points="25.66 62.86 25.41 62.67 33.65 52.12 33.65 52.62 25.66 62.86"/>
-                    <polygon class="cls-61" points="25.41 62.67 25.17 62.48 33.65 51.62 33.65 52.12 25.41 62.67"/>
-                    <polygon class="cls-62" points="25.17 62.48 24.93 62.29 33.65 51.12 33.65 51.62 25.17 62.48"/>
-                    <polygon class="cls-63" points="24.93 62.29 24.68 62.1 33.65 50.62 33.65 51.12 24.93 62.29"/>
-                    <polygon class="cls-64" points="24.68 62.1 24.44 61.91 33.65 50.11 33.65 50.62 24.68 62.1"/>
-                    <polygon class="cls-65" points="24.44 61.91 24.2 61.72 33.65 49.61 33.65 50.11 24.44 61.91"/>
-                    <polygon class="cls-66" points="24.2 61.72 23.95 61.53 33.65 49.11 33.65 49.61 24.2 61.72"/>
-                    <polygon class="cls-67" points="23.95 61.53 23.71 61.34 33.65 48.61 33.65 49.11 23.95 61.53"/>
-                    <polygon class="cls-67" points="23.71 61.34 23.46 61.15 33.65 48.11 33.65 48.61 23.71 61.34"/>
-                    <polygon class="cls-68" points="23.46 61.15 23.22 60.96 33.65 47.6 33.65 48.11 23.46 61.15"/>
-                    <polygon class="cls-69" points="23.22 60.96 22.98 60.77 33.65 47.1 33.65 47.6 23.22 60.96"/>
-                    <polygon class="cls-70" points="22.98 60.77 22.73 60.58 33.65 46.6 33.65 47.1 22.98 60.77"/>
-                    <polygon class="cls-71" points="22.73 60.58 22.49 60.39 33.65 46.1 33.65 46.6 22.73 60.58"/>
-                    <polygon class="cls-72" points="22.49 60.39 22.25 60.2 33.65 45.6 33.65 46.1 22.49 60.39"/>
-                    <polygon class="cls-73" points="22.25 60.2 22 60.01 33.65 45.1 33.65 45.6 22.25 60.2"/>
-                    <polygon class="cls-74" points="22 60.01 21.76 59.82 33.65 44.59 33.65 45.1 22 60.01"/>
-                    <polygon class="cls-75"
-                             points="21.76 59.82 21.52 59.63 33.65 44.09 33.65 44.09 33.65 44.59 21.76 59.82"/>
-                    <rect class="cls-76" x="17.61" y="51.61" width="19.71" height="0.31"
-                          transform="translate(-30.24 41.54) rotate(-52)"/>
-                    <rect class="cls-77" x="17.36" y="51.42" width="19.71" height="0.31"
-                          transform="translate(-30.18 41.27) rotate(-52)"/>
-                    <rect class="cls-77" x="17.12" y="51.23" width="19.71" height="0.31"
-                          transform="translate(-30.12 41.01) rotate(-52)"/>
-                    <rect class="cls-78" x="16.88" y="51.04" width="19.71" height="0.31"
-                          transform="translate(-30.07 40.74) rotate(-52)"/>
-                    <rect class="cls-79" x="16.63" y="50.85" width="19.71" height="0.31"
-                          transform="translate(-30.01 40.48) rotate(-52)"/>
-                    <rect class="cls-80" x="16.39" y="50.66" width="19.71" height="0.31"
-                          transform="translate(-29.96 40.21) rotate(-52)"/>
-                    <rect class="cls-81" x="16.15" y="50.47" width="19.71" height="0.31"
-                          transform="translate(-29.9 39.95) rotate(-52)"/>
-                    <rect class="cls-82" x="15.9" y="50.28" width="19.71" height="0.31"
-                          transform="translate(-29.84 39.68) rotate(-52)"/>
-                    <rect class="cls-83" x="15.66" y="50.09" width="19.71" height="0.31"
-                          transform="translate(-29.79 39.42) rotate(-52)"/>
-                    <rect class="cls-83" x="15.42" y="49.9" width="19.71" height="0.31"
-                          transform="translate(-29.73 39.15) rotate(-52)"/>
-                    <rect class="cls-84" x="15.17" y="49.71" width="19.71" height="0.31"
-                          transform="matrix(0.62, -0.79, 0.79, 0.62, -29.67, 38.89)"/>
-                    <rect class="cls-85" x="14.93" y="49.52" width="19.71" height="0.31"
-                          transform="translate(-29.62 38.62) rotate(-52)"/>
-                    <rect class="cls-86" x="14.69" y="49.33" width="19.71" height="0.31"
-                          transform="translate(-29.56 38.36) rotate(-52)"/>
-                    <rect class="cls-87" x="14.44" y="49.14" width="19.71" height="0.31"
-                          transform="translate(-29.5 38.09) rotate(-52)"/>
-                    <rect class="cls-88" x="14.2" y="48.95" width="19.71" height="0.31"
-                          transform="translate(-29.45 37.83) rotate(-52)"/>
-                    <rect class="cls-89" x="13.96" y="48.76" width="19.71" height="0.31"
-                          transform="translate(-29.39 37.56) rotate(-52)"/>
-                    <rect class="cls-89" x="13.71" y="48.57" width="19.71" height="0.31"
-                          transform="translate(-29.34 37.3) rotate(-52)"/>
-                    <rect class="cls-90" x="13.47" y="48.38" width="19.71" height="0.31"
-                          transform="translate(-29.28 37.03) rotate(-52)"/>
-                    <rect class="cls-91" x="13.22" y="48.19" width="19.71" height="0.31"
-                          transform="translate(-29.22 36.77) rotate(-52)"/>
-                    <rect class="cls-92" x="12.98" y="48" width="19.71" height="0.31"
-                          transform="translate(-29.17 36.5) rotate(-52)"/>
-                    <rect class="cls-93" x="12.74" y="47.81" width="19.71" height="0.31"
-                          transform="translate(-29.11 36.24) rotate(-52)"/>
-                    <rect class="cls-94" x="12.49" y="47.62" width="19.71" height="0.31"
-                          transform="translate(-29.05 35.97) rotate(-52)"/>
-                    <rect class="cls-95" x="12.25" y="47.43" width="19.71" height="0.31"
-                          transform="translate(-29 35.71) rotate(-52)"/>
-                    <rect class="cls-96" x="12.01" y="47.24" width="19.71" height="0.31"
-                          transform="translate(-28.94 35.44) rotate(-52)"/>
-                    <rect class="cls-97" x="11.76" y="47.05" width="19.71" height="0.31"
-                          transform="translate(-28.89 35.18) rotate(-52)"/>
-                    <rect class="cls-98" x="11.52" y="46.86" width="19.71" height="0.31"
-                          transform="translate(-28.83 34.91) rotate(-52)"/>
-                    <rect class="cls-99" x="11.28" y="46.67" width="19.71" height="0.31"
-                          transform="translate(-28.77 34.65) rotate(-52)"/>
-                    <rect class="cls-100" x="11.03" y="46.47" width="19.71" height="0.31"
-                          transform="translate(-28.72 34.38) rotate(-52)"/>
-                    <rect class="cls-101" x="10.79" y="46.28" width="19.71" height="0.31"
-                          transform="translate(-28.66 34.12) rotate(-52)"/>
-                    <polygon class="cls-102"
-                             points="14.46 54.11 14.3 53.99 14.3 53.81 26.35 38.39 26.59 38.58 14.46 54.11"/>
-                    <polygon class="cls-103" points="14.3 53.31 26.1 38.2 26.35 38.39 14.3 53.81 14.3 53.31"/>
-                    <polygon class="cls-104" points="14.3 52.8 25.86 38.01 26.1 38.2 14.3 53.31 14.3 52.8"/>
-                    <polygon class="cls-105" points="14.3 52.3 25.62 37.82 25.86 38.01 14.3 52.8 14.3 52.3"/>
-                    <polygon class="cls-106" points="14.3 51.8 25.37 37.63 25.62 37.82 14.3 52.3 14.3 51.8"/>
-                    <polygon class="cls-107" points="14.3 51.3 25.13 37.44 25.37 37.63 14.3 51.8 14.3 51.3"/>
-                    <polygon class="cls-108" points="14.3 50.8 24.89 37.25 25.13 37.44 14.3 51.3 14.3 50.8"/>
-                    <polygon class="cls-109" points="14.3 50.3 24.64 37.06 24.89 37.25 14.3 50.8 14.3 50.3"/>
-                    <polygon class="cls-110" points="14.3 49.79 24.4 36.87 24.64 37.06 14.3 50.3 14.3 49.79"/>
-                    <polygon class="cls-110" points="14.3 49.29 24.16 36.68 24.4 36.87 14.3 49.79 14.3 49.29"/>
-                    <polygon class="cls-111" points="14.3 48.79 23.91 36.49 24.16 36.68 14.3 49.29 14.3 48.79"/>
-                    <polygon class="cls-112" points="14.3 48.29 23.67 36.3 23.91 36.49 14.3 48.79 14.3 48.29"/>
-                    <polygon class="cls-112" points="22.3 35.22 23.67 36.3 14.3 48.29 14.3 35.22 22.3 35.22"/>
-                </g>
-                <path class="cls-31" d="M48.37,62.62c0,.21,0,.43,0,.65h0C48.34,63.05,48.36,62.83,48.37,62.62Z"/>
-                <g class="cls-32">
-                    <path class="cls-31" d="M48.37,62.62c0,.21,0,.43,0,.65h0C48.34,63.05,48.36,62.83,48.37,62.62Z"/>
-                </g>
-                <g class="cls-323">
-                    <polygon class="cls-218" points="48.33 63.13 48.37 63.08 48.37 63.27 48.33 63.27 48.33 63.13"/>
-                    <polygon class="cls-219"
-                             points="48.33 62.67 48.37 62.62 48.37 62.62 48.37 63.08 48.33 63.13 48.33 62.67"/>
-                    <polygon class="cls-220" points="48.37 62.62 48.33 62.67 48.33 62.62 48.37 62.62"/>
-                </g>
-                <path class="cls-31" d="M43.48,59.75c0-.06,0-.13,0-.2s0,.14,0,.2Z"/>
-                <g class="cls-32">
-                    <path class="cls-31" d="M43.48,59.75c0-.06,0-.13,0-.2s0,.14,0,.2Z"/>
-                </g>
-                <g class="cls-324">
-                    <rect class="cls-222" x="43.48" y="59.55" width="0.02" height="0.2"/>
-                </g>
-                <polygon class="cls-31"
-                         points="43.48 59.75 43.48 59.74 43.48 59.74 43.48 59.74 43.48 59.74 43.48 59.75"/>
-                <g class="cls-32">
-                    <polygon class="cls-31"
-                             points="43.48 59.75 43.48 59.74 43.48 59.74 43.48 59.74 43.48 59.74 43.48 59.75"/>
-                </g>
-                <g class="cls-325">
-                    <rect class="cls-191" x="43.48" y="59.74"/>
-                </g>
-                <path class="cls-326"
-                      d="M13.27,31.37l.3.07.17-.7,2,.46.08-.33-2-.46.17-.72-.3-.07Zm1-4.09,1.42,1.16-1.79.43-.09.39,2.31.53.07-.3-1.83-.42,1.77-.42,0-.21-1.4-1.15,1.83.42.07-.3-2.31-.53Z"/>
-                <path class="cls-327"
-                      d="M162.43,157.05a3.74,3.74,0,0,1-.07.86l-.09.64a11.18,11.18,0,0,1-.21,1.29,21.55,21.55,0,0,1-.72,2.53,22.88,22.88,0,0,1-5.73,8.92,29,29,0,0,1-9,6l-1.26.54-1.31.45c-.85.32-1.76.52-2.64.77-1.77.4-3.66.72-5.27,1.05l-5.43,2.17a33.59,33.59,0,0,1-6.33,2.17c-2.15.53-4.33,1-6.5,1.28s-4.36.59-6.53.8c-1.09.11-2.18.19-3.26.26l-.57,0h-.93l-.31-.05-1.6-.23a118.64,118.64,0,0,1-12.77-2.17,26.54,26.54,0,0,1-6-2.44c-1-.51-1.86-1.06-2.76-1.66l-.8-.55-.21-.15s0,.13,0,.19v.28c0,.89,0,1.76.07,2.65l.12,4.61-2-4.18c-.92-1.92-1.81-3.81-2.72-5.68l-.09.12-1,1.29c-.33.42-.71.87-1,.82-.1,0-.18-.09-.26-.13-.17-.63-.37-1.25-.59-1.87a44.06,44.06,0,0,0-.92-8.16c-.18-.86-1.63-6.4-1.84-7.24.14.34.58,1.75,1,3.21l-.11,0c.06.29.13.59.21.88l.17,0c.38,1.25.72,2.37.86,2.66a8.06,8.06,0,0,1,.28,1l.17.82c.13.56.25,1.1.37,1.65.25,1.11.49,2.22.74,3.35l.1.53,0,.11c0,.06,0,0,.06,0l.15-.18L77,174.93l1-1.31.69,1.49,1.43,3c0-.92,0-1.84,0-2.77.79.69,1.63,1.49,2.38,2.07.36.31.79.61,1.11.85l.61.42a4.65,4.65,0,0,0,.41.26l-.45.13c-.08,0-.14.1-.16.23a.28.28,0,0,0,0,.42c.12.11.24.24.22.36s.16.13.23.11l.74-.24.66-.22c.3.18.6.36.91.52a24.29,24.29,0,0,0,5.63,2.32c.91.25,1.85.46,2.79.66a.61.61,0,0,0-.09.14c-.09.16.06.41.35.55s.58.18.65.05a5.11,5.11,0,0,1,.33-.5c2.78.5,5.65.87,8.51,1.31l1.6.24.34.06h.52L108,185c1.07-.06,2.15-.14,3.22-.23l2.49-.25-.16.29c-.08.18.1.43.4.56s.59.09.66-.06l.37-.74.1-.21c.86-.1,1.73-.22,2.58-.34,2.13-.31,4.26-.71,6.34-1.21a31,31,0,0,0,6-2l0,0h0l5.64-2.22c1.94-.37,3.61-.64,5.35-1,.85-.23,1.71-.42,2.53-.72l1.24-.41,1.21-.5a27.55,27.55,0,0,0,8.61-5.65,21.56,21.56,0,0,0,5.46-8.36,19.52,19.52,0,0,0,.7-2.37c.11-.38.13-.8.21-1.2l.09-.61a2.56,2.56,0,0,0,0-.37l-.55-.84a9.55,9.55,0,0,0-.75-.91,7.11,7.11,0,0,0-6.16-2.3,15.93,15.93,0,0,0-4.48,1.12c-1.43.55-2.81,1.28-4.21,1.92s-2.73,1.35-4.07,2c-5.32,2.71-10.3,5.38-15.08,7.48a62.25,62.25,0,0,1-11.29,3.9,2.32,2.32,0,0,0-.74-.23c-.56-.06-.83.2-.79.22a1.78,1.78,0,0,1,.75,0,1.21,1.21,0,0,1,.3.11c-.57.13-1.13.25-1.69.34a33.41,33.41,0,0,1-10.82.2l-1.8-.3a1.21,1.21,0,0,0-.14-.1c-.38-.26-.65-.29-.66-.26s.13.11.31.25c-.58-.14-1.11-.3-1.61-.45l-2.83-.82-.77-.23c0-.08-.06-.12-.08-.12s0,0,0,.09c-.35-.11-.64-.19-.86-.27a2,2,0,0,1-.57-.22l.61.12,1.75.41,2.85.72c.55.14,1.15.3,1.79.45l2.09.29a33.35,33.35,0,0,0,10.65-.41,58.22,58.22,0,0,0,13.23-4.48c4.7-2.14,9.63-4.85,14.94-7.64,1.33-.68,2.68-1.39,4.08-2.06s2.76-1.41,4.27-2a17,17,0,0,1,4.79-1.24,8.35,8.35,0,0,1,7.18,2.62c.28.34.6.65.85,1Z"/>
-                <path class="cls-328"
-                      d="M161.13,157.38a2.56,2.56,0,0,1,0,.37l-.09.61c-.08.4-.1.82-.21,1.2a19.52,19.52,0,0,1-.7,2.37,21.56,21.56,0,0,1-5.46,8.36,27.55,27.55,0,0,1-8.61,5.65l-1.21.5-1.24.41c-.82.3-1.68.49-2.53.72-1.74.38-3.41.65-5.35,1l-5.64,2.22h0l0,0a31,31,0,0,1-6,2c-2.08.5-4.21.9-6.34,1.21-.85.12-1.72.24-2.58.34.23-.45.53-1,.89-1.69s.87-1.72,1.31-2.75a14.49,14.49,0,0,0,.57-1.65,15.06,15.06,0,0,0,.25-1.79,7,7,0,0,0-.45-3.54,7.56,7.56,0,0,0-1.89-2.41,5.52,5.52,0,0,0-1.18-.79,62.25,62.25,0,0,0,11.29-3.9c4.78-2.1,9.76-4.77,15.08-7.48,1.34-.67,2.68-1.36,4.07-2s2.78-1.37,4.21-1.92a15.93,15.93,0,0,1,4.48-1.12,7.11,7.11,0,0,1,6.16,2.3,9.55,9.55,0,0,1,.75.91Z"/>
-                <path class="cls-327"
-                      d="M157.35,12.77a31.32,31.32,0,0,1-.16,3.55,40.83,40.83,0,0,1-1.38,7.26,39.16,39.16,0,0,1-2.64,6.8A15.69,15.69,0,0,1,151.61,33c0-.1,0-.16-.07-.16a1,1,0,0,0,0,.25h0c-.07.08-.11.1-.14.09s.33-1.28.95-3.12a52.23,52.23,0,0,0,1.88-6.82,44.21,44.21,0,0,0,.84-7c.07-1.93,0-3.24,0-3.33s0-.87-.09-2.06S154.6,8,153.43,7.37A5.19,5.19,0,0,0,151,7c-.93,0-1.92.13-2.89.25s-1.93.2-2.81.28l-.33,0h-.54l-.8,0,.69,1.17c.27.43.39.7.33.76s-.29-.14-.66-.48-.86-.85-1.5-1.55l.4.1c.34.11.58.15.62,0s0-.26-.32-.56l-.35-.28,2.29-.43c.86-.18,1.8-.35,2.74-.57s2-.41,3-.52a6.77,6.77,0,0,1,3.37.38,4.49,4.49,0,0,1,2.27,2.48,10.47,10.47,0,0,1,.6,2.4C157.31,11.89,157.35,12.7,157.35,12.77Z"/>
-                <path class="cls-329"
-                      d="M155,12.84c0,.09.1,1.4,0,3.33a44.21,44.21,0,0,1-.84,7A52.23,52.23,0,0,1,152.32,30c-.62,1.84-1.11,3-.95,3.12s.07,0,.14-.09c0,.56,0,1.93-.06,3.29,0,.88-.1,1.78-.18,2.44s-.13,1.13-.13,1.16,0,.49-.14,1.15a19.46,19.46,0,0,1-.36,2.11c0-.15,0-.33,0-.53,0-.52,0-1.13-.07-1.86a14.08,14.08,0,0,0-.74-2.39A8.79,8.79,0,0,0,148.06,36a12,12,0,0,0-2.46-2.17,12.1,12.1,0,0,0-7-1.66,7.56,7.56,0,0,0-3.55,1.45,11.26,11.26,0,0,0-2.62,2.53,9.45,9.45,0,0,0-1.52,3.09c-.32,1-.55,2-.74,2.88-.75,3.59-1,6.06-1,6.21s-.28,2.62-.37,6.25a28.23,28.23,0,0,0,2.38,13.06l.21.4.26.5a1.05,1.05,0,0,0,1.2.56,2.87,2.87,0,0,0,.59-.12,3.3,3.3,0,0,0,.51-.27c.28-.17.51-.35.75-.51,1-.69,1.86-1.4,2.74-2.08,1.73-1.37,3.32-2.7,4.65-3.86,0,0,3.81-3.23,4.5-4.7a3.73,3.73,0,0,0,.16-.43l.68.83c.09.12.18.21.14.19a0,0,0,0,1,0,0h0c-.13.12-.33.27-.55.48a9.86,9.86,0,0,0-1.47,1.91c-.93,1.65-1.91,3.72-3.17,5.66a15.89,15.89,0,0,1-2.06,2.63A13.7,13.7,0,0,1,138,70.59a20,20,0,0,0-2.48,1.56l-.07,0s0,0,0,0a1.9,1.9,0,0,0-.59-.79c-.24-.14-.39-.07-.39,0s.13.09.24.23a2.34,2.34,0,0,1,.31.76c.1.38.2.85.28,1.36a7,7,0,0,0-2,1,6.65,6.65,0,0,0,2.09-.42c0,.22.05.44.07.66a3.93,3.93,0,0,1,0,.91c-.48.25-.76.46-.73.51s.26,0,.66-.12a5.92,5.92,0,0,1-.26.81H135c-1.14.33-2.16.88-2.1,1s.8,0,1.69-.15c-.19.29-.32.45-.32.48a11.77,11.77,0,0,1-.76,1,13.43,13.43,0,0,1-1.95,1.82,4.75,4.75,0,0,1-2.4.77c-.73,0-1.23,0-1.25.1s.48.27,1.24.35a5.16,5.16,0,0,0,1.87-.13l0,.11a9.5,9.5,0,0,0-.92.75,5.53,5.53,0,0,1-2.28,1,8.07,8.07,0,0,1-2.48.06l-.37-.07a4.32,4.32,0,0,0,1-.83,4.55,4.55,0,0,0,.73-1,1.76,1.76,0,0,0,.17-.43c-.11-.11-.45.53-1.21,1.15a6.93,6.93,0,0,1-3.25,1.45,12.54,12.54,0,0,1-3.63.2,7.52,7.52,0,0,1-1.64-.34l-.46-.14a5.79,5.79,0,0,1-1-.49c-.6-.43-1.37-1.09-2.16-1.78.71-.47,1.4-.93,1.93-1.21s1.17-.42,1.17-.51-.55-.13-1.34.09a18.57,18.57,0,0,0-2.38,1.09l-.07-.06-1.91-1.68,1.24-.4c2.65-.87,5.32-1.55,5.32-1.71s-.07,0-.19,0l.81-1.4a3.9,3.9,0,0,0,.51.06l.57,0a.7.7,0,0,0,.4-.07.37.37,0,0,0,.16-.44,1.51,1.51,0,0,0-.46-.65.64.64,0,0,0-.42-.19h0L116,73.7c1.78-.14,2.74-.72,2.65-.84.08.1,1.06-.78,2.31-2.61a22.5,22.5,0,0,0,3.48-8.37,26,26,0,0,0,.29-6,55.56,55.56,0,0,0-.51-6.52,21.08,21.08,0,0,0-2.06-6.68,15.57,15.57,0,0,0-4.65-5.32l0,0,0,0a16.47,16.47,0,0,0-9.8-3.59,49.93,49.93,0,0,0-8.62.94,29.69,29.69,0,0,0-5.93,1.72,23.7,23.7,0,0,0-2.31,1.16,28.42,28.42,0,0,0-2.65,1.87,46.2,46.2,0,0,0-5.55,5.36,48.35,48.35,0,0,0-3.17,4c-.25.37-.5.73-.75,1.11l-.56.82-.35.53-.18.26c-.06.08.1.16.15.25l.82,1,.51.59c.32.34.64.69,1,1.06a86.52,86.52,0,0,0,8.74,8.28,45.79,45.79,0,0,0,5,3.57L95,67c.45.23.9.46,1.35.67.9.43,1.78.8,2.65,1.19,3.47,1.51,6.75,2.87,9.65,3.8.62.2,1.23.39,1.81.53l-.69,2.53a31.53,31.53,0,0,0-4-.66,34.33,34.33,0,0,0-5.28-.12C99,75,98,75.13,98,75.15s-1,.16-2.46.53c-1.24.32-2.78.77-4.34,1.32h0L88.1,75.55c-2.94-1.42-5.67-2.79-8-4C79,70.89,77.91,70.3,77,69.74s-1.61-1-2.3-1.53L72.5,66.68c-.14-.09-1.76-1.15-4.34-2.75l-4.49-2.8L63.45,61s0-.08.1-.12h0l.15-.11.5-.3,1.35-.78,2.85-1.57L62,56.37l-1.84-.47-.57-.13.35-.26.26-.19.74-.49c1.22-.84,2.44-1.66,3.65-2.48l1.18-.79.06,0-.08,0-.18-.07-.33-.13L64.59,51l-2.46-.92-.79-.31-.23-.08a.38.38,0,0,1-.15-.09A.45.45,0,0,1,61,49l.26-.28.29-.35c.2-.23.37-.48.54-.72A12.81,12.81,0,0,0,63,46.14a17.61,17.61,0,0,0,1.24-3A27.19,27.19,0,0,0,65.38,38a19.5,19.5,0,0,0,.07-3.83c1.62,1.42,2.65,2.17,2.77,2s-1.94-2.86-5.07-6.66a58.16,58.16,0,0,1-4.4-7.18l-.27-.51-.06-.13,0-.06-.08-.23c-.13-.34-.24-.7-.36-1.06-.2-.73-.39-1.48-.53-2.25a22.48,22.48,0,0,1-.31-2.31c0-.39,0-.77,0-1.14,0-.19,0-.36,0-.55a2,2,0,0,1,0-.25v-.11a.79.79,0,0,1,.14-.34.76.76,0,0,1,.33-.12l1-.22,1.17-.24c1.58-.29,3.16-.53,4.7-.72s3-.31,4.35-.34a23.57,23.57,0,0,1,3.69.42c2.41.42,4.46.93,5.9,1.29l1.76.45.38-.4c.18-.17.34-.34.5-.52l.31-.33c.33-.34.65-.66,1-1h0a5.22,5.22,0,0,1,.82-.6A1.2,1.2,0,0,1,83.5,11l.41-.32a37.51,37.51,0,0,1,4.43-2.82c.86-.46,1.74-.9,2.66-1.32l.9-.38c.3,0,.62.09,1,.16a21.24,21.24,0,0,1,4.57,1.49,19.46,19.46,0,0,1,2.83,1.61c.49.33,1,.69,1.53,1.07l.81.6c.33.25.66.52,1,.83l.45.4a4,4,0,0,1,1.31.93c.19.28.07-.07.07-.2a4.32,4.32,0,0,1-.06-.47,1.33,1.33,0,0,1,0-.53c-.67-2.22-1.23-4.1-1.7-5.64-.24-.76-.45-1.43-.65-2,.59,0,1.16,0,1.7,0,1.57,0,2.89.15,3.82.23l1.6.14,1,.06.3.28a15.34,15.34,0,0,1,3.87,7.64c.06.33.11.64.14.76s0,0,0,0l.52,0v0c0-4,.15-6.72.31-8.44l1,0a12.42,12.42,0,0,0,1.36,0c.24,0,.5,0,.8,0s.52-.06.77-.1c.8-.14,1.58-.3,2.35-.45a6.1,6.1,0,0,1,.5.51A12,12,0,0,1,125,7.66a9.74,9.74,0,0,1,.43,1,9.15,9.15,0,0,1,.36,1.58c.08.53.15,1.09.23,1.67,0,.29.07.58.12.87l.06.45,0,.23c0,.07,0,0,0,0s.15-.46.27-.87A28.82,28.82,0,0,1,127.92,9a14.6,14.6,0,0,1,1.2-2.14,6.15,6.15,0,0,1,1.27-1.38,12.37,12.37,0,0,1,1.31-.85c.27-.16.51-.28.74-.39a27.09,27.09,0,0,1,3.83,1c1.52.5,2.88,1.1,4,1.53.89.33,1.64.59,2.18.74.64.7,1.14,1.21,1.5,1.55s.6.52.66.48-.06-.33-.33-.76l-.69-1.17.8,0H145l.33,0c.88-.08,1.84-.15,2.81-.28S150.07,7,151,7a5.19,5.19,0,0,1,2.43.4c1.17.59,1.39,2.28,1.49,3.41S155,12.79,155,12.84Zm-1.21-2a5.35,5.35,0,0,0-.17-1.51c0-.1-.43-.07-.88.13l-.5.21h0a10.4,10.4,0,0,0-2.27.68,20.47,20.47,0,0,1-2.33.87,4.6,4.6,0,0,1-.78.16l.89,1.28a2.15,2.15,0,0,1,.42-.63,5.32,5.32,0,0,1,2-1.32,3,3,0,0,1,2-.18,3.53,3.53,0,0,1,.05.38,8.5,8.5,0,0,1-.15,2.54c-.31,1.26-.63,2.56-.73,3.31a5.26,5.26,0,0,0-1.24-1.75,18.77,18.77,0,0,0,1,3.1c.26.75.47,1.52.61,2.11a9.74,9.74,0,0,1,.2,1c0,.06.11.44.17,1a14,14,0,0,1-.07,2.16,18.91,18.91,0,0,0-.18,3.25,9,9,0,0,0,1-3.13,11,11,0,0,0,.32-2.33A8.68,8.68,0,0,0,153,21s-.1-.47-.31-1.08a20.82,20.82,0,0,0-.88-2.14c-.1-.18-.19-.37-.28-.55a23.62,23.62,0,0,0,1.67-3.44A8.77,8.77,0,0,0,153.8,10.88ZM134.06,76.8a1.38,1.38,0,0,0,.09-.67.34.34,0,0,0-.09-.2c-.07-.05-.15,0-.21,0-.27.12-.4.21-.37.24-.11-.12-.22-.19-.26-.14a.68.68,0,0,0-.05.68.62.62,0,0,0,.41.41C133.8,77.2,134,77.05,134.06,76.8Zm-1.35-2.53a1,1,0,0,0,.37-.62.33.33,0,0,0-.06-.22.21.21,0,0,0-.22,0q-.45.15-.45.21c-.11-.11-.23-.19-.25-.16l-.11.14a.94.94,0,0,0-.23.43.34.34,0,0,0,.24.42A.82.82,0,0,0,132.71,74.27Zm-.37,3.6a1.23,1.23,0,0,0,.41-1.09,2.18,2.18,0,0,0-.43-1,3.33,3.33,0,0,0-.74-.71,2.58,2.58,0,0,0-1-.4,6.81,6.81,0,0,0-1.85,0l-.28.06-.19.06-.37.11-.3.08h-.2l-.21,0a1.55,1.55,0,0,0-.52-.07,5,5,0,0,0-.66.09,7.29,7.29,0,0,0-1.23.36,5.94,5.94,0,0,0-.64.31,4.36,4.36,0,0,0-1.4,1.12,3.63,3.63,0,0,0-.88,2.37,3.59,3.59,0,0,0,.33,1.4,1.74,1.74,0,0,0,1.28,1,3.33,3.33,0,0,0,1.46-.16,1.21,1.21,0,0,0,.55.33,3.19,3.19,0,0,0,1.61-.11,5.84,5.84,0,0,0,1.23-.48h0a1,1,0,0,0,.43.14,1.28,1.28,0,0,0,1-.33c.37-.37.64-.71.74-.79.09.07.06,0,.07,0v0a.06.06,0,0,0,0-.08.16.16,0,0,0-.1,0v0a.28.28,0,0,0,.22,0,1,1,0,0,0,.28-.14,1.23,1.23,0,0,0,.42-.54C131.56,78.34,131.78,78.27,132.34,77.87Zm-12.93,3.29a1,1,0,0,0-.45-.86,1.08,1.08,0,0,0-.85-.24c-.12-.11-.25-.16-.28-.11a4.07,4.07,0,0,0-.52.8,1,1,0,0,0,.12,1.1,1.31,1.31,0,0,0,2-.69ZM74.86,19.56c1-1.06,2.15-2,2.07-2.1s-.35.05-.79.28l0,0a4.55,4.55,0,0,0-2.05-1.64,7.6,7.6,0,0,0-4.63-.15c-2.81.61-5.75.9-5.75,1.3s2.94.66,6,.48a6,6,0,0,1,3.4.49,2.36,2.36,0,0,1,.71.58,2.62,2.62,0,0,1,.17.28s.1,0,.23,0a14,14,0,0,0-1.45,1.34c-.41.42-.66.74-.68.76s-.24.35-.54.85a11.32,11.32,0,0,0-.88,2A6.84,6.84,0,0,0,70.27,26c0,.58.1.95.17.94s.29-1.45,1-2.72a10.19,10.19,0,0,1,1-1.68l.57-.74s.22-.33.56-.76A17,17,0,0,1,74.86,19.56Z"/>
-                <path class="cls-327"
-                      d="M154.41,48l-.39.59c-.45.65-1.1,1.55-1.87,2.58l-1.23,1.63-.64.86A3.21,3.21,0,0,0,150,54l.28.14.83.48c1,.58,2,1.17,2.93,1.73L149.6,57.8s-.46-.47-.91-.95l-.37,1.36,1.28-.41h0c-.06.27-.11.48-.15.62s0,0,0,.08l-.17.7-.17.11a3.73,3.73,0,0,0-.46.28,3.67,3.67,0,0,0-.42.34,7.6,7.6,0,0,0-1.28,1.51c-.91,1.44-2.09,3.6-3.54,5.52A14.81,14.81,0,0,1,141,69.61a7.27,7.27,0,0,1-1.39.92l-1.28.66a7.32,7.32,0,0,1-2.81,1A20,20,0,0,1,138,70.59a13.7,13.7,0,0,0,2.35-1.71,15.89,15.89,0,0,0,2.06-2.63c1.26-1.94,2.24-4,3.17-5.66A9.86,9.86,0,0,1,147,58.68c.22-.21.42-.36.55-.48h0a0,0,0,0,0,0,0s-.05-.07-.14-.19l-.68-.83c0-.08.08-.18.12-.29l.91-.26,2-.55.51-.14h.09l.26,0-.26-.23c-.72-.46-1.43-.93-2.14-1.4l1.16-1.35.72-.81c.48-.52.94-1,1.36-1.51l1.75-1.89.66-.08-.22-.37c-.14.14-.28.3-.44.45a39.61,39.61,0,0,1-4.06.2c.23-.08,3.89-.46,4.61-.72Z"/>
-                <path class="cls-330" d="M153.68,48.24l.22.37-.66.08C153.4,48.54,153.54,48.38,153.68,48.24Z"/>
-                <path class="cls-327"
-                      d="M153.63,9.37a5.35,5.35,0,0,1,.17,1.51,8.77,8.77,0,0,1-.57,2.95,23.62,23.62,0,0,1-1.67,3.44c-.09-.15-.17-.31-.25-.46h0c.1-.75.42-2.05.73-3.31a8.5,8.5,0,0,0,.15-2.54,3.53,3.53,0,0,0-.05-.38.52.52,0,0,1,.15.07.46.46,0,0,1,.16.14l-.13.08v0h0l.11-.07a.13.13,0,0,1,0,.06,1.68,1.68,0,0,1,.19-.19l-.2.13,0-.05,1.24-.67a1.36,1.36,0,0,0-1.2-.42l-.24,0,.5-.21C153.2,9.3,153.61,9.27,153.63,9.37Z"/>
-                <path class="cls-327"
-                      d="M153.69,10.11l-1.24.67a.46.46,0,0,0-.16-.14.52.52,0,0,0-.15-.07,5,5,0,0,0-.18-.68s.1-.09.27-.18h0l.24,0A1.36,1.36,0,0,1,153.69,10.11Z"/>
-                <path class="cls-327"
-                      d="M153.12,22.18a11,11,0,0,1-.32,2.33,9,9,0,0,1-1,3.13,18.91,18.91,0,0,1,.18-3.25,14,14,0,0,0,.07-2.16c-.06-.53-.17-.91-.17-1a9.74,9.74,0,0,0-.2-1c-.14-.59-.35-1.36-.61-2.11a18.77,18.77,0,0,1-1-3.1,5.26,5.26,0,0,1,1.24,1.75h0c-.06.38-.06.62,0,.65s.12,0,.23-.19c.09.18.18.37.28.55a20.82,20.82,0,0,1,.88,2.14c.21.61.29,1.05.31,1.08A8.68,8.68,0,0,1,153.12,22.18Z"/>
-                <path class="cls-327" d="M152.47,10.83l.2-.13a1.68,1.68,0,0,0-.19.19A.13.13,0,0,0,152.47,10.83Z"/>
-                <path class="cls-331" d="M152.45,10.78l0,.05-.11.07h0v0Z"/>
-                <path class="cls-327"
-                      d="M152.23,9.71c-.17.09-.27.14-.27.18a5,5,0,0,1,.18.68,3,3,0,0,0-2,.18,5.32,5.32,0,0,0-2,1.32,2.15,2.15,0,0,0-.42.63l-.89-1.28a4.6,4.6,0,0,0,.78-.16,20.47,20.47,0,0,0,2.33-.87A10.4,10.4,0,0,1,152.23,9.71Z"/>
-                <path class="cls-329"
-                      d="M153.24,48.69l-1.75,1.89c-.42.48-.88,1-1.36,1.51l-.72.81-1.16,1.35-.5-.14c.51-1.75,1.05-3.78,1.43-5.22A39.61,39.61,0,0,0,153.24,48.69Z"/>
-                <path class="cls-327"
-                      d="M151.86,36.35c0,.89,0,1.8-.05,2.47s-.09,1.16-.09,1.19-.05.49-.19,1.16A21.8,21.8,0,0,1,151,43.6c-.26.87-.57,1.7-.82,2.32a4.22,4.22,0,0,1-.46,1c-.08,0,.37-1.44.76-3,0,.23.08.34.11.34a3.08,3.08,0,0,0,.07-1.08,19.46,19.46,0,0,0,.36-2.11c.1-.66.13-1.12.14-1.15s.06-.48.13-1.16.14-1.56.18-2.44c.06-1.36,0-2.73.06-3.29h0a.29.29,0,0,0,.1-.09A22.54,22.54,0,0,1,151.86,36.35Z"/>
-                <path class="cls-327"
-                      d="M150.62,76c.77.33,1.23.65,1.18.72a5.48,5.48,0,0,1-1.33-.28c-.78-.19-1.84-.37-2.91-.52s-2.15-.27-3-.34l-1.43-.12-1.4-.16a9.05,9.05,0,0,0-2.87.07,20.89,20.89,0,0,0-2.55.6,5.23,5.23,0,0,0,0-.56,16.42,16.42,0,0,1,2.38-.84,9.32,9.32,0,0,1,1.64-.32,9.2,9.2,0,0,1,1.47,0c.85,0,1.42.07,1.45.07s.61.07,1.44.21,1.92.34,3,.6A19.74,19.74,0,0,1,150.62,76Z"/>
-                <path class="cls-331" d="M151.61,33a.29.29,0,0,1-.1.09,1,1,0,0,1,0-.25S151.59,32.85,151.61,33Z"/>
-                <path class="cls-327"
-                      d="M151.31,16.81c.08.15.16.31.25.46-.11.15-.19.21-.23.19S151.25,17.19,151.31,16.81Z"/>
-                <path class="cls-329"
-                      d="M150.65,55.88l-.26,0h-.09l-.51.14-2,.55-.91.26c.23-.67.53-1.67.84-2.77l.5.14c.71.47,1.42.94,2.14,1.4Z"/>
-                <path class="cls-327"
-                      d="M150.63,42.67c0,.2,0,.38,0,.53l-.06.29-.12.45c-.05-.27-.11-.7-.18-1.25s-.15-1.11-.24-1.82a15.8,15.8,0,0,0-.83-2.15,8.4,8.4,0,0,0-1.74-2.09,12.16,12.16,0,0,0-2.37-1.92,11.18,11.18,0,0,0-6.37-1.26,6.3,6.3,0,0,0-2.86,1.31,9.49,9.49,0,0,0-2.23,2.29,7.85,7.85,0,0,0-1.23,2.68.85.85,0,0,0,0,.17,6,6,0,0,0-1.27,1.15c.06,0,.37-.27,1.13-.63a.29.29,0,0,0,0,.09c-1.53,1.35-2,3.16-2.15,7.17a20.43,20.43,0,0,0,.43,6.41h0c0,.18,0,.38,0,.58,0,.64-.07,1.32-.07,2a.48.48,0,0,0-.27.32.55.55,0,0,0,.27.61,26.75,26.75,0,0,0,.23,3,24.54,24.54,0,0,0,1.73,6.51l.18.39.13.28a.17.17,0,0,0,.22.13,1.35,1.35,0,0,0,.27-.06c.07,0,.12-.05.25-.13l.72-.45c.95-.63,1.87-1.3,2.77-1.94,1.77-1.29,3.42-2.53,4.81-3.61s2.53-2,3.31-2.64l1-1.26c.62-.77.82-2.67,1.76-4.81.11-.27.24-.57.35-.89.4-1,.77-2.27,1.06-3.28h0c-.38,1.44-.92,3.47-1.43,5.22-.31,1.1-.61,2.1-.84,2.77l-.28.09.16.2a3.73,3.73,0,0,1-.16.43c-.69,1.47-4.5,4.7-4.5,4.7-1.33,1.16-2.92,2.49-4.65,3.86-.88.68-1.77,1.39-2.74,2.08-.24.16-.47.34-.75.51a3.3,3.3,0,0,1-.51.27,2.87,2.87,0,0,1-.59.12,1.05,1.05,0,0,1-1.2-.56l-.26-.5-.21-.4a28.23,28.23,0,0,1-2.38-13.06c.09-3.63.36-6.1.37-6.25s.24-2.62,1-6.21c.19-.89.42-1.86.74-2.88a9.45,9.45,0,0,1,1.52-3.09,11.26,11.26,0,0,1,2.62-2.53,7.56,7.56,0,0,1,3.55-1.45,12.1,12.1,0,0,1,7,1.66A12,12,0,0,1,148.06,36a8.79,8.79,0,0,1,1.76,2.38,14.08,14.08,0,0,1,.74,2.39C150.6,41.54,150.62,42.15,150.63,42.67Z"/>
-                <path class="cls-330" d="M150.64,43.2a3.08,3.08,0,0,1-.07,1.08s-.07-.11-.11-.34l.12-.45Z"/>
-                <path class="cls-328"
-                      d="M150.28,42.69c.07.55.13,1,.18,1.25-.39,1.55-.84,3-.76,3v0h0l-.05.18c0,.07,0,.14,0,.23s0,.12-.05.18l-.14.51c0,.1-.05.21-.08.31s-.06.22-.09.34,0,0,0,0a.3.3,0,0,1,0,.11s0,0,0,0c-.29,1-.66,2.24-1.06,3.28l-2.4-.19a13.25,13.25,0,0,0,.26-3.76,8.19,8.19,0,0,0-1.13-3.58,22.59,22.59,0,0,0-2-3,7.62,7.62,0,0,0-2.61-2.15,8.87,8.87,0,0,0-7.29,0,5.86,5.86,0,0,0-.56.36.85.85,0,0,1,0-.17,7.85,7.85,0,0,1,1.23-2.68,9.49,9.49,0,0,1,2.23-2.29,6.3,6.3,0,0,1,2.86-1.31,11.18,11.18,0,0,1,6.37,1.26,12.16,12.16,0,0,1,2.37,1.92,8.4,8.4,0,0,1,1.74,2.09,15.8,15.8,0,0,1,.83,2.15C150.13,41.58,150.2,42.19,150.28,42.69Z"/>
-                <path class="cls-330" d="M149.19,48.85a.06.06,0,0,1,0,0h0S149.18,48.86,149.19,48.85Z"/>
-                <path class="cls-327" d="M149.6,57.8l-1.28.41.37-1.36C149.14,57.33,149.55,57.76,149.6,57.8Z"/>
-                <path class="cls-327"
-                      d="M149,73.11c0,.24-2-.17-3.95-.19a18.51,18.51,0,0,0-2.69.1c-.74.07-1.23.18-1.26.18s-.54,0-1.28.16-1.72.27-2.68.49c-.37.07-.72.16-1.06.24-.07-.23-.13-.46-.2-.68l1-.36a27.86,27.86,0,0,1,2.7-.75c.75-.17,1.27-.27,1.31-.27s.56-.07,1.35-.09a18.09,18.09,0,0,1,2.83.15A13.08,13.08,0,0,1,149,73.11Z"/>
-                <path class="cls-328"
-                      d="M145.71,52l2.4.19c-.11.32-.24.62-.35.89-.94,2.14-1.14,4-1.76,4.81l-1,1.26c-.78.64-1.93,1.57-3.31,2.64s-3,2.32-4.81,3.61c-.9.64-1.82,1.31-2.77,1.94l-.72.45c-.13.08-.18.09-.25.13a1.35,1.35,0,0,1-.27.06.17.17,0,0,1-.22-.13l-.13-.28-.18-.39a24.54,24.54,0,0,1-1.73-6.51,26.75,26.75,0,0,1-.23-3,.83.83,0,0,0,.3.13,7.51,7.51,0,0,0,1.94.08,26.18,26.18,0,0,0,4.52-.76,23.93,23.93,0,0,0,5.92-2.39,11.29,11.29,0,0,0,1.49-1.06,4.79,4.79,0,0,0,.67-.68.82.82,0,0,0,.17-.2c.06-.09.12-.21.16-.28S145.67,52.13,145.71,52Z"/>
-                <path class="cls-330" d="M146.63,57l.28-.09c0,.11-.09.21-.12.29Z"/>
-                <path class="cls-327"
-                      d="M146,48.22a13.25,13.25,0,0,1-.26,3.76c0,.15-.09.32-.15.49s-.1.19-.16.28a.82.82,0,0,1-.17.2,4.79,4.79,0,0,1-.67.68,11.29,11.29,0,0,1-1.49,1.06,23.93,23.93,0,0,1-5.92,2.39,26.18,26.18,0,0,1-4.52.76,7.51,7.51,0,0,1-1.94-.08.83.83,0,0,1-.3-.13q0-.48,0-.93a.71.71,0,0,1,.52-.1,5.4,5.4,0,0,0,1.44.11h0a4.71,4.71,0,0,0,3.06.41,5.78,5.78,0,0,0,3.14-1.56,20.54,20.54,0,0,0,4-1.71,9.69,9.69,0,0,0,1.36-.94,4,4,0,0,0,.6-.56l.12-.13.05-.12a1.28,1.28,0,0,0,.13-.36,12.37,12.37,0,0,0,.31-3.46c-.08-2.33-1.54-4.38-2.84-6.2A7,7,0,0,0,140,40a7.4,7.4,0,0,0-2.71-.79,5.28,5.28,0,0,0-.89,0h0a3.27,3.27,0,0,0-2.7.27,8.12,8.12,0,0,0-1.24.84h0l-.16.08c0-.18.09-.35.14-.52a5.86,5.86,0,0,1,.56-.36,8.87,8.87,0,0,1,7.29,0,7.62,7.62,0,0,1,2.61,2.15,22.59,22.59,0,0,1,2,3A8.19,8.19,0,0,1,146,48.22Z"/>
-                <path class="cls-332"
-                      d="M145.15,48.28a12.37,12.37,0,0,1-.31,3.46,1.28,1.28,0,0,1-.13.36l-.05.12-.12.13a4,4,0,0,1-.6.56,9.69,9.69,0,0,1-1.36.94,20.54,20.54,0,0,1-4,1.71,10.5,10.5,0,0,0,3-7.37c.17-3.84-2.37-8.07-5.2-9a5.28,5.28,0,0,1,.89,0A7.4,7.4,0,0,1,140,40a7,7,0,0,1,2.34,2C143.61,43.9,145.07,46,145.15,48.28Z"/>
-                <path class="cls-330" d="M143.19,7.06c.28.3.37.48.32.56s-.28.06-.62,0l-.4-.1L142,6.94l.84-.16Z"/>
-                <path class="cls-327"
-                      d="M142.84,6.78l-.84.16.49.53c-.54-.15-1.29-.41-2.18-.74-1.16-.43-2.52-1-4-1.53a27.09,27.09,0,0,0-3.83-1,5.3,5.3,0,0,1,1.61-.56l-.76-1.94,0-.1a24.48,24.48,0,0,1,3.8,1.55A38.61,38.61,0,0,1,141,5.46C141.75,6,142.39,6.43,142.84,6.78Z"/>
-                <path class="cls-327"
-                      d="M139.83,77.48c1.08.46,2,1.11,2,1.26a9.81,9.81,0,0,1-2.23-.48c-.54-.13-1.09-.23-1.51-.3s-.64-.06-.67-.06a6.77,6.77,0,0,0-.68-.07q-.34,0-.78,0h0a5.85,5.85,0,0,0,.32-1,7,7,0,0,1,1.25-.07l.24,0c.13,0,.35.08.57.14A13.69,13.69,0,0,1,139.83,77.48Z"/>
-                <path class="cls-333"
-                      d="M136.37,39.23c2.83.89,5.37,5.12,5.2,9a10.5,10.5,0,0,1-3,7.37c-.58.19-1.14.35-1.69.48a26.87,26.87,0,0,1-4.33.67h-.19a4.14,4.14,0,0,1-1.86-2.61h0c.18-3.25.46-5.4.47-5.53s.19-2.59.82-6.08c.11-.63.26-1.3.43-2a1,1,0,0,1,.18-.17h0l.07,0a10.76,10.76,0,0,1,3.87-1.08Z"/>
-                <path class="cls-327"
-                      d="M136.87,56c.55-.13,1.11-.29,1.69-.48a5.78,5.78,0,0,1-3.14,1.56,4.71,4.71,0,0,1-3.06-.41h.18A26.87,26.87,0,0,0,136.87,56Z"/>
-                <path class="cls-327"
-                      d="M136.34,75.4a5.23,5.23,0,0,1,0,.56l-1,.28c0-.12.05-.26.07-.39C135.68,75.7,136,75.56,136.34,75.4Z"/>
-                <path class="cls-327"
-                      d="M136.27,74.85a3.31,3.31,0,0,1,.07.55c-.35.16-.66.3-.92.45a3.93,3.93,0,0,0,0-.91c0-.22,0-.44-.07-.66l.73-.19C136.17,74.34,136.22,74.59,136.27,74.85Z"/>
-                <path class="cls-327"
-                      d="M136.34,76a5.67,5.67,0,0,1-.1.84,8.84,8.84,0,0,0-1.15.25,5.92,5.92,0,0,0,.26-.81Z"/>
-                <path class="cls-327"
-                      d="M136.24,76.8a5.85,5.85,0,0,1-.32,1h0l-.73,0-.57.07c.09-.15.21-.34.31-.55l.16-.34A8.84,8.84,0,0,1,136.24,76.8Z"/>
-                <path class="cls-327" d="M135.91,73.41c.07.22.13.45.2.68l-.73.19a4.22,4.22,0,0,0-.1-.62Z"/>
-                <path class="cls-327"
-                      d="M135.91,73.41l-.63.25c-.08-.51-.18-1-.28-1.36a2.34,2.34,0,0,0-.31-.76c-.11-.14-.25-.17-.24-.23s.15-.09.39,0a1.9,1.9,0,0,1,.59.79s0,0,0,0A9.6,9.6,0,0,1,135.91,73.41Z"/>
-                <path class="cls-327"
-                      d="M133.64,39.5a3.27,3.27,0,0,1,2.7-.27,10.76,10.76,0,0,0-3.87,1.08l-.07,0A8.12,8.12,0,0,1,133.64,39.5Z"/>
-                <path class="cls-327"
-                      d="M135.19,77.87l.73,0a7.75,7.75,0,0,1-.67,1.25,9.56,9.56,0,0,1-.92,1A12.48,12.48,0,0,1,132,81.91a3.46,3.46,0,0,1-1,.39,5.16,5.16,0,0,1-1.87.13c-.76-.08-1.24-.27-1.24-.35s.52,0,1.25-.1a4.75,4.75,0,0,0,2.4-.77,13.43,13.43,0,0,0,1.95-1.82,11.77,11.77,0,0,0,.76-1s.13-.19.32-.48Z"/>
-                <path class="cls-327"
-                      d="M135.42,75.85c0,.13,0,.27-.07.39-.4.11-.64.17-.66.12S134.94,76.1,135.42,75.85Z"/>
-                <path class="cls-327"
-                      d="M135.28,73.66a4.22,4.22,0,0,1,.1.62,6.65,6.65,0,0,1-2.09.42A7,7,0,0,1,135.28,73.66Z"/>
-                <path class="cls-327" d="M135.09,77.05l-.16.34c-.1.21-.22.4-.31.55-.89.12-1.64.28-1.69.15s1-.7,2.1-1Z"/>
-                <path class="cls-327"
-                      d="M134.15,76.13a1.38,1.38,0,0,1-.09.67c-.11.25-.26.4-.48.37a.62.62,0,0,1-.41-.41.68.68,0,0,1,.05-.68s.15,0,.26.14c-.22.2,0,.76.21.72s.41-1,.25-.91-.46.19-.46.19.1-.12.37-.24c.06,0,.14-.1.21,0A.34.34,0,0,1,134.15,76.13Z"/>
-                <path class="cls-327"
-                      d="M133.29,1.72l.76,1.94a5.3,5.3,0,0,0-1.61.56L131.21,4l-.64-.11.46-.41A18.56,18.56,0,0,1,133.29,1.72Z"/>
-                <path class="cls-327"
-                      d="M133.5,76.24a1,1,0,0,0,.11.14l0,0,0,0,0,0s0,.14.1,0a.53.53,0,0,0,.07-.15.24.24,0,0,0,0-.12s-.05,0-.07,0A.8.8,0,0,1,133.5,76.24Zm.44-.21c.16,0,0,.87-.25.91s-.43-.52-.21-.72C133.48,76.22,133.78,76.08,133.94,76Z"/>
-                <path class="cls-327"
-                      d="M133.83,76.24a.24.24,0,0,1,0,.12.53.53,0,0,1-.07.15c-.06.1-.12,0-.1,0l0,0,0,0,0,0a1,1,0,0,1-.11-.14.8.8,0,0,0,.26,0S133.82,76.21,133.83,76.24Z"/>
-                <path class="cls-327"
-                      d="M133.32,1.62l0,.1A18.56,18.56,0,0,0,131,3.49l-.46.41-.79-.12-.71-.11a5.07,5.07,0,0,0-.56,0,16.14,16.14,0,0,0-2.62.2c-.56.08-1.1.18-1.64.28l0,0A8.45,8.45,0,0,0,123,2.33a2.4,2.4,0,0,0-.81-.54L122,.66c1.11-.13,2.3-.26,3.51-.32a17.29,17.29,0,0,1,3.27.09,7.39,7.39,0,0,1,.89.18l.72.18,1.4.39C132.33,1.31,132.83,1.47,133.32,1.62Z"/>
-                <path class="cls-327"
-                      d="M133.08,73.65a1,1,0,0,1-.37.62.82.82,0,0,1-.71.16.34.34,0,0,1-.24-.42.94.94,0,0,1,.23-.43l.11-.14s.14,0,.25.16c-.48.48-.42.7,0,.6s.81-.82.41-.7l-.41.1s.15-.11.45-.21a.21.21,0,0,1,.22,0A.33.33,0,0,1,133.08,73.65Z"/>
-                <path class="cls-327"
-                      d="M132.76,73.5c.4-.12,0,.62-.41.7s-.48-.12,0-.6a1,1,0,0,1,.19.23l-.07,0c-.06,0,0,.1.07,0a.36.36,0,0,0,.13-.12c.08-.07.05-.19,0-.16s-.28,0-.29,0Z"/>
-                <path class="cls-327"
-                      d="M132.75,76.78a1.23,1.23,0,0,1-.41,1.09c-.56.4-.78.47-.94,1.33a1.23,1.23,0,0,1-.42.54,1,1,0,0,1-.28.14.28.28,0,0,1-.22,0,0,0,0,0,1,0-.05,1.61,1.61,0,0,1,.1-.36.36.36,0,0,0,0-.2c0-.09-.09,0-.06-.4,0-.09,0-.06,0-.07h-.08l-.15,0a1.18,1.18,0,0,0-.25.1c-.14,0-.23.06-.24,0s.05-.08.17-.18a1,1,0,0,1,.68-.25c.16.16,0,.37,0,.54s.1,0,.14,0a.71.71,0,0,0,.15-.15.59.59,0,0,0,.12-.37v-.06a.68.68,0,0,1,0-.15.7.7,0,0,1,.08-.16,1.74,1.74,0,0,1,.13-.2,2.13,2.13,0,0,1,.33-.34l.31-.26c.26-.23.14-.68-.19-1.08a2.22,2.22,0,0,0-.58-.48,1.52,1.52,0,0,0-.66-.22,5.82,5.82,0,0,0-1.56,0l-.1,0-.2.07-.37.13-.41.13a2.48,2.48,0,0,1-1-.07s0,0-.11,0a4.37,4.37,0,0,0-.48.08,8.48,8.48,0,0,0-1,.35,4.54,4.54,0,0,0-1.67,1.05,2.62,2.62,0,0,0-.71,1.68,2.45,2.45,0,0,0,.18,1,.84.84,0,0,0,.63.56,3.06,3.06,0,0,0,2.11-.52,4.5,4.5,0,0,0,.45-.31l.2-.17s.08-.07.11-.11.14-.17.11-.27-.12-.14-.2-.17a2.25,2.25,0,0,0-.72-.06.75.75,0,0,0-.52.18,1.22,1.22,0,0,0-.22.34c-.06.09-.12.11-.13.1s0-.06,0-.14a1.09,1.09,0,0,1,.14-.45,1,1,0,0,1,.67-.37,2.43,2.43,0,0,1,1,0,.72.72,0,0,1,.51.37.75.75,0,0,1-.14.68,3.09,3.09,0,0,1-.23.31l-.23.23a3.28,3.28,0,0,1-.49.4,4.87,4.87,0,0,1-.59.36.79.79,0,0,1-.27-.26s-.16,0-.28.11-.21.21-.19.24l.15.17a3.33,3.33,0,0,1-1.46.16,1.74,1.74,0,0,1-1.28-1,3.59,3.59,0,0,1-.33-1.4,3.63,3.63,0,0,1,.88-2.37,4.36,4.36,0,0,1,1.4-1.12,5.94,5.94,0,0,1,.64-.31,7.29,7.29,0,0,1,1.23-.36,5,5,0,0,1,.66-.09,1.55,1.55,0,0,1,.52.07l.21,0h.2l.3-.08.37-.11.19-.06.28-.06a6.81,6.81,0,0,1,1.85,0,2.58,2.58,0,0,1,1,.4,3.33,3.33,0,0,1,.74.71A2.18,2.18,0,0,1,132.75,76.78Z"/>
-                <path class="cls-327"
-                      d="M132.64,73.64c.08,0,.11.09,0,.16a.36.36,0,0,1-.13.12c-.08,0-.13,0-.07,0l.07,0a1,1,0,0,0-.19-.23S132.52,73.64,132.64,73.64Z"/>
-                <path class="cls-327"
-                      d="M131.21,4l1.23.21c-.23.11-.47.23-.74.39a12.37,12.37,0,0,0-1.31.85,6.15,6.15,0,0,0-1.27,1.38A14.6,14.6,0,0,0,127.92,9a28.82,28.82,0,0,0-1.34,3.58c-.12.41-.25.8-.27.87s0,.07,0,0l0-.23-.06-.45c-.05-.29-.08-.58-.12-.87-.08-.58-.15-1.14-.23-1.67a9.15,9.15,0,0,0-.36-1.58,9.74,9.74,0,0,0-.43-1,12,12,0,0,0-1.84-2.74,6.1,6.1,0,0,0-.5-.51c.52-.11,1-.22,1.55-.31a22.07,22.07,0,0,1,1.49,3.12,10.71,10.71,0,0,1,.36,1.09,4.62,4.62,0,0,1,.19.88l.09,1c0,.19.05.37.07.56l0,.28v.15c0,.06,0,0,0-.07s.07-.24.15-.46c.26-.76.53-1.49.76-2.09a22.47,22.47,0,0,1,1.1-2.25,8.4,8.4,0,0,1,1.29-1.72c.26-.26.51-.5.74-.71Z"/>
-                <path class="cls-332" d="M132.23,40.42l.16-.08a1,1,0,0,0-.18.17A.29.29,0,0,1,132.23,40.42Z"/>
-                <path class="cls-327"
-                      d="M132.37,39.9c-.05.17-.1.34-.14.52-.76.36-1.07.63-1.13.63A6,6,0,0,1,132.37,39.9Z"/>
-                <path class="cls-332"
-                      d="M132.35,56.71a5.4,5.4,0,0,1-1.44-.11.71.71,0,0,0-.52.1c0-.7,0-1.38.07-2,0-.2,0-.4,0-.58A4.14,4.14,0,0,0,132.35,56.71Z"/>
-                <path class="cls-327"
-                      d="M132.48,107.45a1,1,0,0,1-.25.63,2.11,2.11,0,0,1-.44.37,2.92,2.92,0,0,1-.85.48,1.55,1.55,0,0,1-.71.06.52.52,0,0,0,0-.11,1.53,1.53,0,0,0,.61-.16,3.67,3.67,0,0,0,.73-.53c.26-.22.5-.46.47-.74a3.73,3.73,0,0,0-.83-1.65,1.22,1.22,0,0,0-.63-.42s-.06-.1-.06-.22v-.07c0-.16.08-.29.17-.28a2.66,2.66,0,0,1,.32.13,1.81,1.81,0,0,1,.6.51,3.52,3.52,0,0,1,.52.87A2.82,2.82,0,0,1,132.48,107.45Z"/>
-                <path class="cls-329"
-                      d="M132.06,107.45c0,.28-.21.52-.47.74a3.67,3.67,0,0,1-.73.53,1.53,1.53,0,0,1-.61.16c.06-.39.12-.75.15-1.09a12.75,12.75,0,0,0,.09-1.78,8,8,0,0,0,0-.85h0c0,.12,0,.22.06.22a1.22,1.22,0,0,1,.63.42A3.73,3.73,0,0,1,132.06,107.45Z"/>
-                <path class="cls-327"
-                      d="M132.21,40.51c-.17.67-.32,1.34-.43,2-.63,3.49-.79,5.93-.82,6.08s-.29,2.28-.47,5.53a20.43,20.43,0,0,1-.43-6.41C130.24,43.67,130.68,41.86,132.21,40.51Z"/>
-                <path class="cls-334"
-                      d="M131.69,76.29c.33.4.45.85.19,1.08l-.31.26a2.13,2.13,0,0,0-.33.34,1.74,1.74,0,0,0-.13.2.7.7,0,0,0-.08.16.68.68,0,0,0,0,.15v.06a.59.59,0,0,1-.12.37.71.71,0,0,1-.15.15s-.14.1-.14,0,.19-.38,0-.54a1,1,0,0,0-.68.25c-.12.1-.18.16-.17.18s.1,0,.24,0a1.18,1.18,0,0,1,.25-.1l.15,0h.08s0,0,0,.07c0,.36.09.31.06.4a.36.36,0,0,1,0,.2,1.61,1.61,0,0,0-.1.36,0,0,0,0,0,0,.05v0c-.1,0-.17.06-.26.09s-.47.35-.7.49a1,1,0,0,1-.77.22.28.28,0,0,0,.09-.26c-.05-.15-.16-.14-.17-.13a.49.49,0,0,1,.05.16c0,.07-.13.16-.31.23a6,6,0,0,1-1.39.39,2.88,2.88,0,0,1-1.35,0,.27.27,0,0,1-.13-.07,4.87,4.87,0,0,0,.59-.36,3.28,3.28,0,0,0,.49-.4l.23-.23a3.09,3.09,0,0,0,.23-.31.75.75,0,0,0,.14-.68.72.72,0,0,0-.51-.37,2.43,2.43,0,0,0-1,0,1,1,0,0,0-.67.37,1.09,1.09,0,0,0-.14.45c0,.08-.05.13,0,.14s.07,0,.13-.1a1.22,1.22,0,0,1,.22-.34.75.75,0,0,1,.52-.18,2.25,2.25,0,0,1,.72.06c.08,0,.18.07.2.17s0,.2-.11.27-.08.07-.11.11l-.2.17a4.5,4.5,0,0,1-.45.31,3.06,3.06,0,0,1-2.11.52.84.84,0,0,1-.63-.56,2.45,2.45,0,0,1-.18-1,2.62,2.62,0,0,1,.71-1.68,4.54,4.54,0,0,1,1.67-1.05,8.48,8.48,0,0,1,1-.35,4.37,4.37,0,0,1,.48-.08c.09,0,.08,0,.11,0a2.48,2.48,0,0,0,1,.07l.41-.13.37-.13.2-.07.1,0a5.82,5.82,0,0,1,1.56,0,1.52,1.52,0,0,1,.66.22A2.22,2.22,0,0,1,131.69,76.29Z"/>
-                <path class="cls-327"
-                      d="M131.81,95.65a5.22,5.22,0,0,1-.14,1.26c-.18.7-.46,1.44-.68,2.26-.3,1-.52,2-.68,2.67,0-.3-.08-.65-.14-1s-.08-.49-.13-.75.08-.71.14-1.09c.11-.83.35-1.73.44-2.29a3.69,3.69,0,0,0,0-.69,1.46,1.46,0,0,0,0-.26,1.53,1.53,0,0,0-.2-.78,3.22,3.22,0,0,0-1.67-1.08l-.19-.08c-.09-.32-.17-.63-.26-.94.23.09.47.16.71.23a4,4,0,0,1,2.29,1.25,2.3,2.3,0,0,1,.42.91C131.8,95.5,131.8,95.64,131.81,95.65Z"/>
-                <path class="cls-327"
-                      d="M131.09,82.42c.06,0-.13.5-.64,1.07a5.24,5.24,0,0,1-2.37,1.5,8,8,0,0,1-1.81.32.2.2,0,0,1,0-.07.57.57,0,0,0-.56-.54l-.88.35,0-.72a1.7,1.7,0,0,0,.22-.15l.37.07a8.07,8.07,0,0,0,2.48-.06,5.53,5.53,0,0,0,2.28-1,9.5,9.5,0,0,1,.92-.75Z"/>
-                <path class="cls-329"
-                      d="M130.66,96a3.69,3.69,0,0,1,0,.69c-.09.56-.33,1.46-.44,2.29-.06.38-.1.74-.14,1.09-.28-1.53-.71-3.37-1.18-5.21l-.28-1.06.19.08A3.22,3.22,0,0,1,130.44,95a1.53,1.53,0,0,1,.2.78A1.46,1.46,0,0,1,130.66,96Z"/>
-                <path class="cls-327"
-                      d="M130.49,80.07c-.1.08-.37.42-.74.79a1.28,1.28,0,0,1-1,.33,1,1,0,0,1-.43-.14l.17-.11a.67.67,0,0,0,.21-.2h0a1,1,0,0,0,.77-.22c.23-.14.48-.37.7-.49s.16-.11.26-.09a.16.16,0,0,1,.1,0,.06.06,0,0,1,0,.08v0S130.58,80.14,130.49,80.07Z"/>
-                <path class="cls-327"
-                      d="M130.49,105.16a8,8,0,0,1,0,.85,12.75,12.75,0,0,1-.09,1.78c0,.34-.09.7-.15,1.09-.15,0-.26,0-.26,0s.09.07.24.09a27.79,27.79,0,0,1-3.47,9.16c-.56,1-1.2,2-1.89,3,.14-.61.19-1,.1-1s-1.2,1.73-2.18,3.55c-.18.31-.35.63-.51.93l0,0a8.89,8.89,0,0,1-3,2.24,16.11,16.11,0,0,1-4.1,1.32c-.39.08-.78.15-1.18.2,0-.06,0-.11,0-.16s0-.24,0-.31v-.05h-.07l-.67,0-1,0c0,.06,0,.32.06.78h-.12c0-.49-.07-.76-.14-.77s-.11.28-.2.8l-1,0a24.73,24.73,0,0,1-4.53-.13,16.43,16.43,0,0,1-3.89-1.09c-.16-.3-.31-.56-.45-.77l0,0c.09-.22.13-.34.13-.34l-2.2-.79s-.06.21-.2.59c-.66-.4-1.29-.82-1.92-1.26a30.63,30.63,0,0,1-3.56-3c-.13-.12-.24-.25-.35-.37a1.36,1.36,0,0,0,.21-1.08,15.89,15.89,0,0,1-.82-2.51l.24-.12a12.1,12.1,0,0,0,1.95,2.87c.09.08.16.16.24.24l-.06,0,.29.43.16-.11c.37.37.78.73,1.18,1.08a.36.36,0,0,1-.31-.06l-.27.45a1.06,1.06,0,0,0,.5.14.7.7,0,0,0,.5-.19c.35.29.72.57,1.08.84a18.06,18.06,0,0,0,7.76,3.56,26.1,26.1,0,0,0,4.26.21,30.06,30.06,0,0,0,4.18-.38c2.68-.48,5.25-1.42,6.74-3.39a48.38,48.38,0,0,0,4.27-5.83,27.07,27.07,0,0,0,4-10c.41-2.57.23-4.09.35-4.09a3.77,3.77,0,0,1,.17,1.07C130.47,104.84,130.48,105,130.49,105.16Z"/>
-                <path class="cls-330" d="M130.39,56.7q0,.45,0,.93a.55.55,0,0,1-.27-.61A.48.48,0,0,1,130.39,56.7Z"/>
-                <path class="cls-327"
-                      d="M130.31,101.84c.13,1.08.1,1.77,0,1.79s-.46-.9-1-2.28h0a2.15,2.15,0,0,1-.1-.27c-.36-1-.81-2.24-1.29-3.55a3,3,0,0,0,.25-.23,5.59,5.59,0,0,0,.66-.83.48.48,0,0,0-.29-.67c-.3-.14-.6-.12-.7,0,0,0-.12.19-.36.48l-.34-.92c-.18-.5-.38-1-.56-1.49a1.29,1.29,0,0,0,.21-.06l.58-.14-.63-1.19a5.9,5.9,0,0,0,1.84,1.29l.28,1.06c.47,1.84.9,3.68,1.18,5.21-.12,1.28-.08,2.34.09,2.34S130.23,102.2,130.31,101.84Z"/>
-                <path class="cls-329"
-                      d="M129.31,101.35c.51,1.38.81,2.3,1,2.28-.12,0,.06,1.52-.35,4.09a27.07,27.07,0,0,1-4,10,48.38,48.38,0,0,1-4.27,5.83c-1.49,2-4.06,2.91-6.74,3.39a30.06,30.06,0,0,1-4.18.38,26.1,26.1,0,0,1-4.26-.21,18.06,18.06,0,0,1-7.76-3.56c-.36-.27-.73-.55-1.08-.84h0a2.8,2.8,0,0,0,.47-2.3.32.32,0,0,0-.34-.21c-.17,0-1,0-1.48,0l-.37,0,.11.34s-.06.22-.39.44c-.08-.08-.15-.16-.24-.24a12.1,12.1,0,0,1-1.95-2.87l-.32-.64A11,11,0,0,1,92.7,116a.59.59,0,0,0,.25,0,.67.67,0,0,0,.49-.55.91.91,0,0,0-.3-.74,1.13,1.13,0,0,0-.33-.2,2.15,2.15,0,0,1-.73-.32.41.41,0,0,1-.11-.07,43.42,43.42,0,0,1-1.35-5c-.27-1.32-.5-2.63-.68-3.92l.23-.08c.46-.13,1.17-.34,2.15-.68a19,19,0,0,0,3.75-1.7c.73-.46,1.47-1,2.27-1.62L99.66,100c.56-.44.85-.82,1.4-1.29,0-.08.57-.61,1-1l0,0a12.07,12.07,0,0,1-1.69.11c-.71.08-1.46.15-2.06.17l-1.45,0a14.44,14.44,0,0,1-2.5-.18A9.34,9.34,0,0,1,91,96.62a6,6,0,0,1-1.2-.94c.06-.52.14-1,.24-1.52a28.67,28.67,0,0,1,.74-2.94,8.44,8.44,0,0,0,1.44.35,12.62,12.62,0,0,0,3.55-.14l1.1-.15c.46-.09.93-.17,1.44-.25l1.58-.29.85-.17c.23,0,.07,0,0-.09s-.25,0-.27-.1-.29-.18-.29-.2l-.32-.12,3-.45s0,0,0,0a28.84,28.84,0,0,0,3.2-2.63,26.74,26.74,0,0,1,2.25-1.72c.32-.23.6-.41.8-.53a28.94,28.94,0,0,0,6.09,1.68,15.65,15.65,0,0,0,3.47,0,0,0,0,0,1,0,0,1.6,1.6,0,0,0,.34.26,5,5,0,0,0,.79.49,2.9,2.9,0,0,0,.83.28,4.67,4.67,0,0,0,2.09-.06,9.92,9.92,0,0,0,1.17-.4c0,.09.13.29.23.58a.52.52,0,0,1,.14.34h0s0,0,0,0h0s0,0,0,.08A2.34,2.34,0,0,1,124,89a2.44,2.44,0,0,1-.32.5,3.86,3.86,0,0,1-2.22,1.23c-.27.06-.59.11-.91.16l-1.07.19a7.55,7.55,0,0,0-1.27.24l-.29.07-.15,0s0,.11,0,.15a2.77,2.77,0,0,0,.27.61,3.75,3.75,0,0,0,.92,1.06,6,6,0,0,0,1,.64,6.4,6.4,0,0,0,2,.55,12.08,12.08,0,0,0,3-.22c.65-.13,1.14-.24,1.51-.33h0c.18.5.38,1,.56,1.49l.34.92-.15.18a4.59,4.59,0,0,1-1.73,1.2,6.61,6.61,0,0,1-3.07.43c-.61,0-1.24-.09-1.87-.16a15.34,15.34,0,0,1-1.69-.3c-.62-.13-1.46-.41-2.3-.63l.21.24.05.07,0,0,.09.07.62.58A17.23,17.23,0,0,0,119,99.17c.24.2.51.37.76.56l.52.33a11.13,11.13,0,0,0,1,.57,9.32,9.32,0,0,0,4,1.08A9.65,9.65,0,0,0,129.31,101.35Zm-3.41,6.31a5.93,5.93,0,0,0,.51-.71,8.34,8.34,0,0,0-.81-.22,2.57,2.57,0,0,0-.47-.08c-.29,0-.57,0-.54.1s.19.07.46.19l.44.18c.1,0,.07.06.08.07s0,0-.1.07l-.2.21a1.24,1.24,0,0,1-.42.31c-.16,0-.27,0-.3-.19s0-.28,0-.3-.13.07-.18.29a.43.43,0,0,0,.09.4.6.6,0,0,0,.46.2A1.8,1.8,0,0,0,125.9,107.66Zm-.25,5.26a.32.32,0,0,0,0-.52,2.91,2.91,0,0,0-1.31-.1l-.6,0a2.72,2.72,0,0,0-.55.06,7,7,0,0,0-1.83.74,2.11,2.11,0,0,1-.56.25c-.13,0-.22,0-.23,0s-.15,0-.16.21a1,1,0,0,0,.31.6,1.45,1.45,0,0,0,.8.57,1.48,1.48,0,0,0,1.07-.38,8,8,0,0,1,1.62-1l.2-.07.31-.1.53-.17A3.09,3.09,0,0,0,125.65,112.92Zm-2,6.94c.1-.38-.28-.53-.54-.45a2,2,0,0,0-.35.08,5.63,5.63,0,0,0-1.1.61c-.5.33-.94.74-.89.81a5.65,5.65,0,0,0,1.09-.45,7.69,7.69,0,0,1,.74-.3c.2-.06.33-.12.34-.12a.69.69,0,0,0,.13-.05s0,0,0,0a2,2,0,0,1-.06.39,3.1,3.1,0,0,1-.13.45c-.08.29-.28.25-.31.3s0,.07.16.08a.46.46,0,0,0,.38-.23,2.23,2.23,0,0,0,.26-.48A3.36,3.36,0,0,0,123.69,119.86Zm-8.08-7a.3.3,0,0,0-.11-.41,1,1,0,0,0-.26-.08s-.25,0-.56,0a5.22,5.22,0,0,0-1.21.05,1.37,1.37,0,0,0-.91.82c-.13.31-.15.51-.11.52a4,4,0,0,0,1.67-.11,2.82,2.82,0,0,0,1.1-.51.33.33,0,0,1,.13-.07l.11,0C115.51,113,115.54,113,115.61,112.86ZM114,118.41c0-.23-.21-.42-.39-.5a6.29,6.29,0,0,0-.93-.24l-.64-.06a1.84,1.84,0,0,0-1.4.55A2.14,2.14,0,0,0,110,120a3.82,3.82,0,0,1,.91-1.57,1.38,1.38,0,0,1,1.06-.31l.62.11a5.46,5.46,0,0,1,.81.13c.05,0,.05,0,.07,0v0a.83.83,0,0,1-.11.15,6.23,6.23,0,0,1-.6.57c-.6.25-1.21.33-1.21.39a2.3,2.3,0,0,0,1.37-.09,4.72,4.72,0,0,0,.75-.56,1.54,1.54,0,0,0,.16-.18A.66.66,0,0,0,114,118.41Zm-6.26,4.84a.43.43,0,0,0,.13-.43.68.68,0,0,0-.39-.35c-.56-.25-1.07,0-1,.08s.13,0,.28,0a1.55,1.55,0,0,1,.49.21c.08,0,0,.09,0,.09s-.09,0-.09,0a2.34,2.34,0,0,1-.82.14A1,1,0,0,1,106,123c-.12,0,.07,0,.08.11a.8.8,0,0,1,.09.14s-.07,0-.08,0,0,0,0,.1,0,.09,0,.09l.17,0a1.87,1.87,0,0,0,.72.07,1.64,1.64,0,0,0,.33-.05A1.28,1.28,0,0,0,107.71,123.25Zm-4.28-11.41a.44.44,0,0,0,0-.57.81.81,0,0,0-.29-.17,2.08,2.08,0,0,0-.54-.11,5.26,5.26,0,0,0-1.39.1c-.45.09-.92.12-1.29.16l-.26,0a.27.27,0,0,0-.11,0s-.08.12,0,.15.15.1.16.1,0,0,0-.12a1.56,1.56,0,0,1,.31,0,8.19,8.19,0,0,0,1.33,0,5.8,5.8,0,0,1,1.27,0l.34.08h0s.06,0-.06.06c-.31.23-.62.67-1,.74a1.26,1.26,0,0,1-.61-.09l-.59-.17a1.55,1.55,0,0,0-.59-.1s.19.16.51.32.36.17.56.26a1.56,1.56,0,0,0,.77.19,1.63,1.63,0,0,0,.75-.34,5.59,5.59,0,0,1,.48-.38A1.19,1.19,0,0,0,103.43,111.84Z"/>
-                <path class="cls-327"
-                      d="M130.17,100.83c.06.36.1.71.14,1s-.14.58-.18.58-.21-1.06-.09-2.34C130.09,100.34,130.13,100.59,130.17,100.83Z"/>
-                <path class="cls-327"
-                      d="M130.25,108.88a.52.52,0,0,1,0,.11c-.15,0-.24-.07-.24-.09S130.1,108.89,130.25,108.88Z"/>
-                <path class="cls-328"
-                      d="M130.57,3.9c-.23.21-.48.45-.74.71a8.4,8.4,0,0,0-1.29,1.72,22.47,22.47,0,0,0-1.1,2.25c-.23.6-.5,1.33-.76,2.09-.08.22-.14.43-.15.46s0,.13,0,.07v-.15l0-.28c0-.19,0-.37-.07-.56l-.09-1a4.62,4.62,0,0,0-.19-.88,10.71,10.71,0,0,0-.36-1.09,22.07,22.07,0,0,0-1.49-3.12c.54-.1,1.08-.2,1.64-.28a16.14,16.14,0,0,1,2.62-.2,5.07,5.07,0,0,1,.56,0l.71.11Z"/>
-                <path class="cls-327"
-                      d="M129.31,101.34h0a9.65,9.65,0,0,1-4,.36,9.32,9.32,0,0,1-4-1.08,11.13,11.13,0,0,1-1-.57l-.52-.33c-.25-.19-.52-.36-.76-.56A17.23,17.23,0,0,1,117.66,98l-.62-.58-.09-.07,0,0-.05-.07-.21-.24c.84.22,1.68.5,2.3.63a15.34,15.34,0,0,0,1.69.3c.63.07,1.26.13,1.87.16a6.61,6.61,0,0,0,3.07-.43,4.59,4.59,0,0,0,1.73-1.2l.15-.18.44,1.2a5.61,5.61,0,0,1-1.91,1.2,7.75,7.75,0,0,1-3.55.4c-.62-.05-1.27-.12-1.93-.22a1.5,1.5,0,0,1-.33-.08l-.28-.07s-.16,0-.15,0l.09.09a2.49,2.49,0,0,0,.23.22l.15.12.42.3c.31.21.62.39.92.58a9.26,9.26,0,0,0,3.73,1.21,18.64,18.64,0,0,0,2.88.14A7.27,7.27,0,0,1,129.31,101.34Z"/>
-                <path class="cls-328"
-                      d="M129.21,101.07a2.15,2.15,0,0,0,.1.27,7.27,7.27,0,0,0-1.12,0,18.64,18.64,0,0,1-2.88-.14,9.26,9.26,0,0,1-3.73-1.21c-.3-.19-.61-.37-.92-.58l-.42-.3-.15-.12a2.49,2.49,0,0,1-.23-.22l-.09-.09s.11,0,.15,0l.28.07a1.5,1.5,0,0,0,.33.08c.66.1,1.31.17,1.93.22a7.75,7.75,0,0,0,3.55-.4,5.61,5.61,0,0,0,1.91-1.2C128.4,98.83,128.85,100.06,129.21,101.07Z"/>
-                <path class="cls-327"
-                      d="M128.54,95.79a.48.48,0,0,1,.29.67,5.59,5.59,0,0,1-.66.83,3,3,0,0,1-.25.23l-.44-1.2c.24-.29.34-.47.36-.48C127.94,95.67,128.24,95.65,128.54,95.79Z"/>
-                <path class="cls-327"
-                      d="M128.41,80.77c0,.07,0,.07,0,.07s0,.09-.11.1,0,.07,0,.09l0,0a5.84,5.84,0,0,1-1.23.48,3.19,3.19,0,0,1-1.61.11,1.21,1.21,0,0,1-.55-.33,3.91,3.91,0,0,0,.59-.26.27.27,0,0,0,.13.07,2.88,2.88,0,0,0,1.35,0,6,6,0,0,0,1.39-.39c.18-.07.3-.16.31-.23a.49.49,0,0,0-.05-.16s.12,0,.17.13a.28.28,0,0,1-.09.26h0l-.09,0s-.13.09-.18.13h0A.1.1,0,0,0,128.41,80.77Z"/>
-                <path class="cls-327"
-                      d="M128.64,80.71l.09,0a.67.67,0,0,1-.21.2l-.17.11h0l0,0s0,0,0-.09.11,0,.11-.1h0S128.61,80.71,128.64,80.71Z"/>
-                <path class="cls-327"
-                      d="M128.32,92.87c.09.31.17.62.26.94a5.9,5.9,0,0,1-1.84-1.29h0l-.35-.63-.1.11c-.15-.19-.2-.33-.16-.36S127.1,92.38,128.32,92.87Z"/>
-                <path class="cls-327"
-                      d="M116.45,146.2h0c.11.52.21,1,.32,1.55l2.65,1.47,4.31.05a4.23,4.23,0,0,0,1.91-.2,1.74,1.74,0,0,0,.63-.53l.16-.21s0,0,0,.07a.58.58,0,0,1,0,.19l0,0,.48.34c.14-.18.07-.64-.24-1a.71.71,0,0,1,.08-.15c.19-.29.37-.58.53-.86l.15-.27.06.13.53-.24a1.9,1.9,0,0,0-.3-.41,1.79,1.79,0,0,0-.25-.22,2.18,2.18,0,0,0-.57-1.19,1.32,1.32,0,0,0-1.29-.49,12.61,12.61,0,0,0-1.53.68,15.27,15.27,0,0,1-2.91,1.1,9.8,9.8,0,0,1-2.39.05c-.65,0-1.15,0-1.5,0h-.17l.38-.08.27-.06H118v-.11h0a6.26,6.26,0,0,1,.86-.11,11.23,11.23,0,0,0,2.28-.2,17,17,0,0,0,2.73-1.2,9.91,9.91,0,0,1,1.63-.8,1.75,1.75,0,0,1,1.13,0,2.61,2.61,0,0,1,.94.6,3.19,3.19,0,0,1,.94,2,1.15,1.15,0,0,1-.07.69,4.33,4.33,0,0,1-.24.52c-.16.32-.34.63-.52.93a10.41,10.41,0,0,1-.6.94,2.63,2.63,0,0,1-1,.85,5.26,5.26,0,0,1-2.38.37l-4.59.07-3.52-1.81c-.62-2.73-1.23-5.4-1.8-7.87-.13-.57-.27-1.11-.4-1.64a3,3,0,0,1-.08-.37l0-.23,0-.44c0-.29-.07-.57-.1-.85-.12-1.1-.22-2.13-.31-3.09-.18-1.9-.34-3.47-.43-4.55q-.06-.61-.09-1c.58-.05,1.16-.11,1.73-.21,0,.27,0,.64.08,1.08.08,1.1.19,2.65.34,4.56.07.94.17,2,.25,3.07q.08.72.15,1.5c.08.24.1.37.14.52l.09.44c.08.3.14.59.2.89.37,1.83.78,3.84,1.18,5.76Zm10.06,2.44h.07l-.08,0Z"/>
-                <path class="cls-330" d="M128.45,80.84s0,0,0-.07A.1.1,0,0,1,128.45,80.84Z"/>
-                <path class="cls-330"
-                      d="M128.11,146.47l-.53.24-.06-.13.06-.13c0-.1,0-.1,0-.29a3.11,3.11,0,0,0,0-.32,1.79,1.79,0,0,1,.25.22A1.9,1.9,0,0,1,128.11,146.47Z"/>
-                <path class="cls-330"
-                      d="M127.6,146.16c0,.19,0,.19,0,.29l-.06.13a1.34,1.34,0,0,0-.76-.63,3.86,3.86,0,0,0-.89,0,.88.88,0,0,0-.29,0c-.08,0-.12,0-.13,0s0-.05.09-.09a.5.5,0,0,1,.29-.17,3,3,0,0,1,1-.13,1.49,1.49,0,0,1,.72.29A3.11,3.11,0,0,1,127.6,146.16Z"/>
-                <path class="cls-329"
-                      d="M127.52,146.58l-.15.27c-.16.28-.34.57-.53.86a.71.71,0,0,0-.08.15,1.75,1.75,0,0,0-.55-.49,2.16,2.16,0,0,0-1.06-.15c-.28,0-.46,0-.46.05s.18.11.44.17a2.56,2.56,0,0,1,.86.28,1.4,1.4,0,0,1,.45.61l-.16.21a1.74,1.74,0,0,1-.63.53,4.23,4.23,0,0,1-1.91.2l-4.31-.05-2.65-1.47c-.11-.51-.21-1-.32-1.55h0l.12,0h0l.57-.11h.21c.35,0,.85-.07,1.5,0a9.8,9.8,0,0,0,2.39-.05,15.27,15.27,0,0,0,2.91-1.1,12.61,12.61,0,0,1,1.53-.68,1.32,1.32,0,0,1,1.29.49,2.18,2.18,0,0,1,.57,1.19,1.49,1.49,0,0,0-.72-.29,3,3,0,0,0-1,.13.5.5,0,0,0-.29.17c-.06,0-.1.07-.09.09s0,0,.13,0a.88.88,0,0,1,.29,0,3.86,3.86,0,0,1,.89,0A1.34,1.34,0,0,1,127.52,146.58Z"/>
-                <path class="cls-327"
-                      d="M126.74,92.52l.63,1.19-.58.14a1.29,1.29,0,0,1-.21.06h0c-.21-.56-.41-1.13-.62-1.66l.1-.07a1.92,1.92,0,0,0,.23-.19,2.8,2.8,0,0,0,.45.52Z"/>
-                <path class="cls-327"
-                      d="M127.21,89c.33,1.11.72,2.47,1.11,3.91-1.22-.49-2.11-1.32-2.2-1.24s0,.17.16.36a1.92,1.92,0,0,1-.23.19l-.1.07c-.3-.81-.58-1.57-.84-2.24a5.4,5.4,0,0,0,.82-1,2.64,2.64,0,0,0,.32-.65L124.36,88s0,0,0,0h0a.52.52,0,0,0-.14-.34c-.1-.29-.19-.49-.23-.58a12.59,12.59,0,0,0,1.89-1,.8.8,0,0,0,.34-.43C126.39,86.29,126.83,87.72,127.21,89Z"/>
-                <path class="cls-330"
-                      d="M126.76,147.86c.31.41.38.87.24,1l-.48-.34,0,0a.58.58,0,0,0,0-.19s0-.05,0-.07Z"/>
-                <path class="cls-327"
-                      d="M125.66,83c.76-.62,1.1-1.26,1.21-1.15a1.76,1.76,0,0,1-.17.43,4.55,4.55,0,0,1-.73,1,4.32,4.32,0,0,1-1,.83.07.07,0,0,1-.06,0l-.14,0h0v-.19h-.11l-.16,0-.15,0h0a.54.54,0,0,0-.17.1.56.56,0,0,0-.23.45.28.28,0,0,0,0,.09,25.69,25.69,0,0,0-2.49.64,12.74,12.74,0,0,1-2.45.49h-.3a8,8,0,0,1-1.9-.31,6.46,6.46,0,0,1-1.76-.86,25,25,0,0,1-2.31-2.16c.11-.06.2-.14.3-.2l.46-.3c.79.69,1.56,1.35,2.16,1.78a5.79,5.79,0,0,0,1,.49l.46.14a7.52,7.52,0,0,0,1.64.34,12.54,12.54,0,0,0,3.63-.2A6.93,6.93,0,0,0,125.66,83Z"/>
-                <path class="cls-330" d="M126.38,91.88l.35.63a2.8,2.8,0,0,1-.45-.52Z"/>
-                <path class="cls-331" d="M126.58,148.65h-.08Z"/>
-                <path class="cls-327"
-                      d="M126.26,85.24a.2.2,0,0,0,0,.07h-.17c0-.09-.09-.07-.18,0a4.55,4.55,0,0,1-.64,0,4.41,4.41,0,0,1-.55-.06,1.34,1.34,0,0,1-.27-.07l-.08,0s.21,0,.21,0l.12,0h.11v0l.88-.35A.57.57,0,0,1,126.26,85.24Z"/>
-                <path class="cls-330" d="M126.1,85.32h.17a.92.92,0,0,1-.06.33C126.15,85.45,126.1,85.33,126.1,85.32Z"/>
-                <path class="cls-327"
-                      d="M126,92.25c.21.53.41,1.1.62,1.66-.37.09-.86.2-1.51.33a12.08,12.08,0,0,1-3,.22,6.4,6.4,0,0,1-2-.55,6,6,0,0,1-1-.64,3.75,3.75,0,0,1-.92-1.06,2.77,2.77,0,0,1-.27-.61s-.07-.13,0-.15l.15,0,.29-.07a7.55,7.55,0,0,1,1.27-.24l1.07-.19c.32,0,.64-.1.91-.16a3.86,3.86,0,0,0,2.22-1.23A2.44,2.44,0,0,0,124,89a2.34,2.34,0,0,0,.34-.91s0-.06,0-.08h0c.19.51.44,1.19.75,2-.15.13-.31.27-.48.4a5.79,5.79,0,0,1-3,1.06c-.58.07-1.21.12-1.92.18l-.84.08-.22,0c-.07,0-.2,0-.12.09a1.42,1.42,0,0,0,.2.41,2.72,2.72,0,0,0,.65.66,4.47,4.47,0,0,0,.9.46,4.4,4.4,0,0,0,1.82.3,6.79,6.79,0,0,0,2.61-.72A7.17,7.17,0,0,0,126,92.25Z"/>
-                <path class="cls-327"
-                      d="M124.36,88l1.89.31a2.64,2.64,0,0,1-.32.65,5.4,5.4,0,0,1-.82,1C124.8,89.22,124.55,88.54,124.36,88Z"/>
-                <path class="cls-327"
-                      d="M126.1,85.32s.05.13.11.32a.8.8,0,0,1-.34.43,12.59,12.59,0,0,1-1.89,1s0-.07,0-.08c-.1-.29.36-.71,1-.94a3,3,0,0,0,1-.74A1.08,1.08,0,0,0,126.1,85.32Z"/>
-                <path class="cls-330" d="M126.1,85.32a1.08,1.08,0,0,1-.18,0C126,85.25,126.07,85.23,126.1,85.32Z"/>
-                <path class="cls-327"
-                      d="M125.28,85.32a4.55,4.55,0,0,0,.64,0,3,3,0,0,1-1,.74c-.65.23-1.11.65-1,.94,0,0,0,0,0,.08a9.92,9.92,0,0,1-1.17.4,4.67,4.67,0,0,1-2.09.06,2.9,2.9,0,0,1-.83-.28,5,5,0,0,1-.79-.49,1.6,1.6,0,0,1-.34-.26,0,0,0,0,0,0,0h.16a10,10,0,0,0,1.47-.31v0a.51.51,0,0,0,.08.26,1.37,1.37,0,0,0,.47.37,2.43,2.43,0,0,0,1.76.16,2.94,2.94,0,0,0,1.41-.64c.1-.09.36-.24.45-.32s.23-.22.24-.39v-.16a2.42,2.42,0,0,0-.34-.27,1.34,1.34,0,0,0,.27.07A4.41,4.41,0,0,0,125.28,85.32Z"/>
-                <path class="cls-327"
-                      d="M126.41,107a5.93,5.93,0,0,1-.51.71,1.8,1.8,0,0,1-1,.52.6.6,0,0,1-.46-.2.43.43,0,0,1-.09-.4c0-.22.15-.3.18-.29s0,.14,0,.3.14.21.3.19a1.24,1.24,0,0,0,.42-.31l.2-.21c0-.07,0,0,.1-.07s0,0-.08-.07l-.44-.18c-.27-.12-.43-.16-.46-.19s.25-.14.54-.1a2.57,2.57,0,0,1,.47.08A8.34,8.34,0,0,1,126.41,107Z"/>
-                <path class="cls-327"
-                      d="M125.68,112.4a.32.32,0,0,1,0,.52,3.09,3.09,0,0,1-.37.17l-.53.17-.31.1-.2.07a8,8,0,0,0-1.62,1,1.48,1.48,0,0,1-1.07.38,1.45,1.45,0,0,1-.8-.57,1,1,0,0,1-.31-.6c0-.21.17-.23.16-.21s-.07.07,0,.2a1.18,1.18,0,0,0,.36.46,1.26,1.26,0,0,0,.67.4c.24,0,.52-.19.79-.39a7.91,7.91,0,0,1,1.64-1.15l.17-.07h0a.07.07,0,0,0,.06,0l-.06,0h-.43a4.1,4.1,0,0,0-.5,0,8.31,8.31,0,0,0-1.8.54,2.12,2.12,0,0,1-.65.15c-.16,0-.25-.07-.24-.08s.1,0,.23,0a2.11,2.11,0,0,0,.56-.25,7,7,0,0,1,1.83-.74,2.72,2.72,0,0,1,.55-.06l.6,0A2.91,2.91,0,0,1,125.68,112.4Z"/>
-                <path class="cls-328"
-                      d="M125.11,90c.26.67.54,1.43.84,2.24a7.17,7.17,0,0,1-1.2.72,6.79,6.79,0,0,1-2.61.72,4.4,4.4,0,0,1-1.82-.3,4.47,4.47,0,0,1-.9-.46,2.72,2.72,0,0,1-.65-.66,1.42,1.42,0,0,1-.2-.41c-.08-.09.05-.08.12-.09l.22,0,.84-.08c.71-.06,1.34-.11,1.92-.18a5.79,5.79,0,0,0,3-1.06C124.8,90.28,125,90.14,125.11,90Z"/>
-                <path class="cls-327"
-                      d="M125.26,80.79a.79.79,0,0,0,.27.26,3.91,3.91,0,0,1-.59.26l-.15-.17s.07-.13.19-.24S125.23,80.75,125.26,80.79Z"/>
-                <path class="cls-327"
-                      d="M125,120.11c.09,0,0,.43-.1,1-.71,1-1.48,2-2.3,3.06-.09.13-.2.25-.29.38.16-.3.33-.62.51-.93C123.77,121.84,124.74,120,125,120.11Z"/>
-                <path class="cls-327" d="M125,84.16a.07.07,0,0,0,.06,0,1.7,1.7,0,0,1-.22.15v-.17a.08.08,0,0,0,0,0h0Z"/>
-                <path class="cls-327" d="M124.82,85.05v0h-.09Z"/>
-                <path class="cls-327"
-                      d="M124.8,84.33l0,.72-.09,0h0a1.67,1.67,0,0,0-.06-.24.45.45,0,0,1-.06-.2s-.06-.07-.07-.07.07,0,.09-.09l0,0A.72.72,0,0,1,124.8,84.33Z"/>
-                <path class="cls-331" d="M124.81,84.11h0a.08.08,0,0,1,0,0v0Z"/>
-                <path class="cls-327" d="M124.8,84.18v.15a.72.72,0,0,0-.15.11.88.88,0,0,0,.12-.21Z"/>
-                <path class="cls-327"
-                      d="M124.8,84.16v0l0,0a.88.88,0,0,1-.12.21l-.3.16a1,1,0,0,0-.41,0,.28.28,0,0,1,0-.09.56.56,0,0,1,.23-.45.54.54,0,0,1,.17-.1h0l.15,0,.16,0h.11v.24Z"/>
-                <path class="cls-329"
-                      d="M124.8,85.46v.16c0,.17-.24.39-.24.39s-.35.23-.45.32a2.94,2.94,0,0,1-1.41.64,2.43,2.43,0,0,1-1.76-.16,1.37,1.37,0,0,1-.47-.37.51.51,0,0,1-.08-.26v0a11.56,11.56,0,0,0,1.23-.44,15.09,15.09,0,0,0,2.39-.89.73.73,0,0,0,.19.24l.09.05.1,0,.08,0A2.42,2.42,0,0,1,124.8,85.46Z"/>
-                <path class="cls-327"
-                      d="M124.69,55.91a26,26,0,0,1-.29,6,22.5,22.5,0,0,1-3.48,8.37c-1.25,1.83-2.23,2.71-2.31,2.61a4.49,4.49,0,0,1,.51-.74c.33-.49.81-1.21,1.35-2.15a23.79,23.79,0,0,0,2.93-8.25,25,25,0,0,0,0-5.75,56.55,56.55,0,0,0-.69-6.34,20.06,20.06,0,0,0-2.07-6.14,14.11,14.11,0,0,0-4.32-4.67l-.06,0a14.78,14.78,0,0,0-8.67-3,48.69,48.69,0,0,0-8.2,1.05A28.24,28.24,0,0,0,94,38.53a21.68,21.68,0,0,0-2,1c-.09.09-1,.59-2.43,1.68a42.9,42.9,0,0,0-5.37,5A44.24,44.24,0,0,0,81.05,50l-.76,1.08-.19.26,0,0s-.08,0,0,.09l.06.08.4.48.93,1.06a85,85,0,0,0,8.34,8.31,45.45,45.45,0,0,0,4.73,3.57l1.22.77,1.26.68c.84.43,1.73.84,2.58,1.24,3.41,1.63,6.6,3.09,9.41,4.14a27,27,0,0,0,3.87,1.2,13.09,13.09,0,0,0,3.09.27,10.24,10.24,0,0,0,2-.19c.45-.08.67-.2.69-.18s-.87.7-2.65.84a12.85,12.85,0,0,1-3.25-.06,17.37,17.37,0,0,1-2.23-.49c-.58-.14-1.19-.33-1.81-.53-2.9-.93-6.18-2.29-9.65-3.8-.87-.39-1.75-.76-2.65-1.19-.45-.21-.9-.44-1.35-.67l-1.31-.76a45.79,45.79,0,0,1-5-3.57A86.52,86.52,0,0,1,80,54.35c-.32-.37-.64-.72-1-1.06l-.51-.59-.82-1c0-.09-.21-.17-.15-.25l.18-.26.35-.53.56-.82c.25-.38.5-.74.75-1.11a48.35,48.35,0,0,1,3.17-4,46.2,46.2,0,0,1,5.55-5.36,28.42,28.42,0,0,1,2.65-1.87,23.7,23.7,0,0,1,2.31-1.16A29.69,29.69,0,0,1,99,34.69a49.93,49.93,0,0,1,8.62-.94,16.47,16.47,0,0,1,9.8,3.59l0,0,0,0a15.57,15.57,0,0,1,4.65,5.32,21.08,21.08,0,0,1,2.06,6.68A55.56,55.56,0,0,1,124.69,55.91Z"/>
-                <path class="cls-327"
-                      d="M124.72,85.08h0l-.12,0s-.21,0-.21,0l-.1,0-.09-.05a.73.73,0,0,1-.19-.24c.22-.12.35-.2.35-.23l.3-.16,0,0s0,.09-.09.09.09,0,.07.07a.45.45,0,0,0,.06.2A1.67,1.67,0,0,1,124.72,85.08Z"/>
-                <path class="cls-330" d="M124,84.78c.13,0,.25-.12.37-.18s-.13.11-.35.23a.08.08,0,0,1,0,0Z"/>
-                <path class="cls-330" d="M124.35,84.6c-.12.06-.24.13-.37.18a.25.25,0,0,1,0-.14A1,1,0,0,1,124.35,84.6Z"/>
-                <path class="cls-329"
-                      d="M124.22,112.79l.06,0a.07.07,0,0,1-.06,0h0l-.17.07a7.91,7.91,0,0,0-1.64,1.15c-.27.2-.55.42-.79.39a1.26,1.26,0,0,1-.67-.4,1.18,1.18,0,0,1-.36-.46c0-.13,0-.18,0-.2s.08.09.24.08a2.12,2.12,0,0,0,.65-.15,8.31,8.31,0,0,1,1.8-.54,4.1,4.1,0,0,1,.5,0Z"/>
-                <path class="cls-327"
-                      d="M124.22,4.05l0,0c-.52.09-1,.2-1.55.31a3.24,3.24,0,0,0-.81-.59,1.83,1.83,0,0,0-.19,0s0-.12,0-.16a.65.65,0,0,1,0-.1l.42-1.72a2.4,2.4,0,0,1,.81.54A8.45,8.45,0,0,1,124.22,4.05Z"/>
-                <path class="cls-327"
-                      d="M124.87,121.15a29.83,29.83,0,0,1-1,3c-.35,1-.75,2-1,2.7s-.54,1.24-.56,1.27-.28.51-.72,1.19a20.68,20.68,0,0,1-1.72,2.41c-.48.56-1,1.08-1.42,1.53a2.06,2.06,0,0,0-.18-.31L117.16,134s.1,0,.14,0,.07,0,.09.09v.12c-.32.27-.55.41-.59.29s1-1.84,2.07-3.57a27.68,27.68,0,0,0,1.31-2.45l.57-1.22s.28-.49.66-1.16c.24-.45.55-1,.85-1.55l0,0c.09-.13.2-.25.29-.38C123.39,123.18,124.16,122.17,124.87,121.15Z"/>
-                <path class="cls-327"
-                      d="M120.78,86l-.51-.18s-.27.11-.86.42a4,4,0,0,0-1-.06c0,.08.33.25.39.35a15.65,15.65,0,0,1-3.47,0,28.94,28.94,0,0,1-6.09-1.68l.31-.18.93-.62a26.21,26.21,0,0,0,5,1.59,17.63,17.63,0,0,0,3.43.24H119a13.69,13.69,0,0,0,3.6-.48,7.27,7.27,0,0,0,1.38-.5.08.08,0,0,0,0,0,15.09,15.09,0,0,1-2.39.89,11.56,11.56,0,0,1-1.23.44s.08-.1.14-.13a.35.35,0,0,1,.16-.07Z"/>
-                <path class="cls-327"
-                      d="M124,84.78h0a7.27,7.27,0,0,1-1.38.5,13.69,13.69,0,0,1-3.6.48,12.74,12.74,0,0,0,2.45-.49,25.69,25.69,0,0,1,2.49-.64A.25.25,0,0,0,124,84.78Z"/>
-                <path class="cls-327"
-                      d="M123.15,119.41c.26-.08.64.07.54.45a3.36,3.36,0,0,1-.23.64,2.23,2.23,0,0,1-.26.48.46.46,0,0,1-.38.23c-.12,0-.16-.06-.16-.08s.23,0,.31-.3a3.1,3.1,0,0,0,.13-.45,2,2,0,0,0,.06-.39s0,0,0,0a.69.69,0,0,1-.13.05s-.14.06-.34.12a7.69,7.69,0,0,0-.74.3,5.65,5.65,0,0,1-1.09.45c0-.07.39-.48.89-.81a5.63,5.63,0,0,1,1.1-.61A2,2,0,0,1,123.15,119.41Z"/>
-                <path class="cls-328"
-                      d="M123.45,56a25,25,0,0,1,0,5.75A23.79,23.79,0,0,1,120.47,70c-.54.94-1,1.66-1.35,2.15a4.49,4.49,0,0,0-.51.74s-.24.1-.69.18a10.24,10.24,0,0,1-2,.19,13.09,13.09,0,0,1-3.09-.27,27,27,0,0,1-3.87-1.2c-2.81-1.05-6-2.51-9.41-4.14-.85-.4-1.74-.81-2.58-1.24l-1.26-.68-1.22-.77a45.45,45.45,0,0,1-4.73-3.57,85,85,0,0,1-8.34-8.31L80.5,52l-.4-.48L80,51.43s0-.07,0-.09l0,0,.19-.26L81.05,50a44.24,44.24,0,0,1,3.1-3.72,42.9,42.9,0,0,1,5.37-5c1.41-1.09,2.34-1.59,2.43-1.68a21.68,21.68,0,0,1,2-1,28.24,28.24,0,0,1,5.46-1.69,48.69,48.69,0,0,1,8.2-1.05,14.78,14.78,0,0,1,8.67,3l.06,0a14.11,14.11,0,0,1,4.32,4.67,20.06,20.06,0,0,1,2.07,6.14A56.55,56.55,0,0,1,123.45,56ZM121,58c.33-.29.49-2.46.32-3.47A30.6,30.6,0,0,0,120.23,50a18.42,18.42,0,0,0-2-4.48,9.35,9.35,0,0,0-2.06-2.3,18.31,18.31,0,0,0-2.88-1.56,14,14,0,0,0-3.32-1.06,8.81,8.81,0,0,0-3.78.19,11.69,11.69,0,0,0-3.45,1.7,22.75,22.75,0,0,0-7.55,8.73,15.75,15.75,0,0,0-.67,1.85c-.09.32-.17.64-.23,1,0,.17-.06.31-.1.52s0,.51,0,.76c.19.16.39.32.6.47l.37.28c.25.19.5.4.76.58l1.53,1h0a17.52,17.52,0,0,0,4.64,2,38.42,38.42,0,0,0,4.52,1,22.52,22.52,0,0,0,7.88.31,13.18,13.18,0,0,0,5-1.81A4.37,4.37,0,0,0,121,58Z"/>
-                <path class="cls-327"
-                      d="M122,.66l.13,1.13-.42,1.72a.65.65,0,0,0,0,.1s0,.12,0,.16a1.83,1.83,0,0,1,.19,0,3.24,3.24,0,0,1,.81.59c-.77.15-1.55.31-2.35.45-.25,0-.48.08-.77.1s-.56,0-.8,0a12.42,12.42,0,0,1-1.36,0l-1,0c.16-1.59.3-2.29.3-2.29l.18-1.95.76.08c.4.05.78.07,1.16.09a4.4,4.4,0,0,0,.5,0,5.36,5.36,0,0,0,.55,0Z"/>
-                <path class="cls-329"
-                      d="M122.26,124.61c-.3.57-.61,1.1-.85,1.55-.38.67-.64,1.14-.66,1.16l-.57,1.22a27.68,27.68,0,0,1-1.31,2.45c-1.1,1.73-2.25,3.51-2.07,3.57s.27,0,.59-.29a3.52,3.52,0,0,1,0,.49,43.28,43.28,0,0,0-.59,5c-.11,2.32-.1,4-.14,5,0,.56,0,1,0,1.23a.28.28,0,0,1,0,.09v0h0l-.12,0c-.4-1.92-.81-3.93-1.18-5.76-.06-.3-.12-.59-.2-.89l-.09-.44c0-.15-.06-.28-.14-.52q-.07-.78-.15-1.5c-.08-1.1-.18-2.13-.25-3.07-.15-1.91-.26-3.46-.34-4.56,0-.44-.06-.81-.08-1.08.4-.05.79-.12,1.18-.2a16.11,16.11,0,0,0,4.1-1.32A8.89,8.89,0,0,0,122.26,124.61Z"/>
-                <path class="cls-327"
-                      d="M121.29,54.51c.17,1,0,3.18-.32,3.47,0,0,0-1.34,0-1.36a26.17,26.17,0,0,0-.86-3.15l0-.37c-.05-.07,0-.17-.08-.26-.77-2-.93-2.38-1.53-3.69l-.7-1.42a9.43,9.43,0,0,0-3-3.77l-.52-.31h-.51l-1.16-.58a8.77,8.77,0,0,0-6.12-.89,15.12,15.12,0,0,0-5.9,3.71,18.93,18.93,0,0,0-4.41,5.84,13.37,13.37,0,0,0-.65,1.69c-.08.29-.17.57-.23.86l-.08.42,0,.17.48.39c.25.19.48.39.73.56L98,56.88l0,0a16.54,16.54,0,0,0,4.3,1.93A38.19,38.19,0,0,0,106.68,60a27.46,27.46,0,0,0,4.74.64c.17.1.35.19.53.28a.44.44,0,0,1,.29-.14c.64,0,1.26-.09,1.89-.11l.09-.11h.29l.25,0a4.2,4.2,0,0,0,1.58,0,3.19,3.19,0,0,0,.43-.32,10.28,10.28,0,0,0,1.15-.27c.11-.1.2-.19.3-.3a11.88,11.88,0,0,0,1.11-.51c1.07-.58,1.58-1,1.64-1a4.37,4.37,0,0,1-1.51,1.27,13.18,13.18,0,0,1-5,1.81,22.52,22.52,0,0,1-7.88-.31,38.42,38.42,0,0,1-4.52-1,17.52,17.52,0,0,1-4.64-2h0l-1.53-1c-.26-.18-.51-.39-.76-.58l-.37-.28c-.21-.15-.41-.31-.6-.47,0-.25,0-.51,0-.76s.06-.35.1-.52c.06-.33.14-.65.23-1a15.75,15.75,0,0,1,.67-1.85,22.75,22.75,0,0,1,7.55-8.73,11.69,11.69,0,0,1,3.45-1.7,8.81,8.81,0,0,1,3.78-.19,14,14,0,0,1,3.32,1.06,18.31,18.31,0,0,1,2.88,1.56,9.35,9.35,0,0,1,2.06,2.3,18.42,18.42,0,0,1,2,4.48A30.6,30.6,0,0,1,121.29,54.51Z"/>
-                <path class="cls-332"
-                      d="M120.94,56.62S121,58,121,58s-.57.46-1.64,1a11.88,11.88,0,0,1-1.11.51c1.29-1.4,1.65-3.56,1.86-6.06A26.17,26.17,0,0,1,120.94,56.62Z"/>
-                <path class="cls-327"
-                      d="M120.78,86h-.1a.35.35,0,0,0-.16.07c-.06,0-.13.08-.14.13a10,10,0,0,1-1.47.31h-.16c-.06-.1-.39-.27-.39-.35a4,4,0,0,1,1,.06c.59-.31.86-.42.86-.42Z"/>
-                <path class="cls-327"
-                      d="M120.12,53.1l0,.37a39.34,39.34,0,0,0-2.57-5.93,2.43,2.43,0,0,1-.15-.26l-.44-.81a1.11,1.11,0,0,0-.2-.26,7.81,7.81,0,0,0-1.52-1.73,10.86,10.86,0,0,0-1.39-.83h.51l.52.31a9.43,9.43,0,0,1,3,3.77l.7,1.42c.6,1.31.76,1.71,1.53,3.69C120.08,52.93,120.07,53,120.12,53.1Z"/>
-                <path class="cls-333"
-                      d="M120.08,53.47c-.21,2.5-.57,4.66-1.86,6.06a11.07,11.07,0,0,1-1.35.48l.25-.2a17.5,17.5,0,0,1-4.45.62h-1.53c-2.17-1.46-3.58-4.68-3.38-8.36.25-4.64,2.86-8.24,6-8.43a10.86,10.86,0,0,1,1.39.83,7.81,7.81,0,0,1,1.52,1.73,1.11,1.11,0,0,1,.2.26l.44.81a2.43,2.43,0,0,0,.15.26A39.34,39.34,0,0,1,120.08,53.47Z"/>
-                <path class="cls-327"
-                      d="M119.71,75.67a.37.37,0,0,1-.16.44.7.7,0,0,1-.4.07l-.57,0a3.9,3.9,0,0,1-.51-.06s0,0,0,0l1.2-.06c.53,0,.27-.51-.2-.86s-.67.61-.67.61c-.15,0-.27-.09-.27-.13a1.56,1.56,0,0,1,.32-.6.54.54,0,0,1,.4-.2h0a.64.64,0,0,1,.42.19A1.51,1.51,0,0,1,119.71,75.67Z"/>
-                <path class="cls-327"
-                      d="M119,75.15c.47.35.73.85.2.86l-1.2.06,0,0a2.31,2.31,0,0,1,.49-.1l.54-.07c.12,0,.14,0,.17,0s0-.08,0-.11a1.53,1.53,0,0,0-.34-.32c-.15-.09-.08,0-.12,0a1.13,1.13,0,0,0-.17.41s-.14,0-.29,0C118.36,75.76,118.57,74.81,119,75.15Z"/>
-                <path class="cls-327"
-                      d="M119,80.3a1,1,0,0,1,.45.86,1.31,1.31,0,0,1-2,.69,1,1,0,0,1-.12-1.1,4.07,4.07,0,0,1,.52-.8s.16,0,.28.11c-.41.48-.92,1.15-.49,1.63s1.87,0,1.6-.81a1.33,1.33,0,0,0-1.11-.82A1.08,1.08,0,0,1,119,80.3Z"/>
-                <path class="cls-327"
-                      d="M119.28,75.71s0,.09,0,.11,0,0-.17,0l-.54.07a2.31,2.31,0,0,0-.49.1l.29-.27c.15,0,.29.06.29,0a1.13,1.13,0,0,1,.17-.41s0-.08.12,0A1.53,1.53,0,0,1,119.28,75.71Z"/>
-                <path class="cls-327"
-                      d="M119.22,80.88c.27.76-1.17,1.29-1.6.81s.08-1.15.49-1.63A1.33,1.33,0,0,1,119.22,80.88Zm-.13.24a.88.88,0,0,0-.28-.65,2.21,2.21,0,0,0-.68-.39c.11.1.18.21.14.25a2.6,2.6,0,0,0-.46.64c-.1.2-.15.4,0,.56s.41.16.69.07A.86.86,0,0,0,119.09,81.12Z"/>
-                <path class="cls-327"
-                      d="M118.81,80.47a.88.88,0,0,1,.28.65.86.86,0,0,1-.6.48c-.28.09-.62.06-.69-.07s-.09-.36,0-.56a2.6,2.6,0,0,1,.46-.64s0-.15-.14-.25A2.21,2.21,0,0,1,118.81,80.47Z"/>
-                <path class="cls-329"
-                      d="M119,85.77h-.1a17.63,17.63,0,0,1-3.43-.24,26.21,26.21,0,0,1-5-1.59l2.3-1.52A25,25,0,0,0,115,84.59a6.46,6.46,0,0,0,1.76.86,8,8,0,0,0,1.9.31Z"/>
-                <path class="cls-329"
-                      d="M116,73.7l2.85,1.13a.54.54,0,0,0-.4.2,1.56,1.56,0,0,0-.32.6s.12.1.27.13l-.29.27,0,0s0,0,0,0l-.81,1.4a27,27,0,0,0-4.05.66l-.15-1.34h0A7.63,7.63,0,0,0,110.9,76c-.34-.09-.71-.19-1.11-.28l.69-2.53a17.37,17.37,0,0,0,2.23.49A12.85,12.85,0,0,0,116,73.7Z"/>
-                <path class="cls-327"
-                      d="M118.55,133.47a1.47,1.47,0,0,1,0,.79,6.56,6.56,0,0,1-.28.71,12.57,12.57,0,0,0-1.16,4.81,16.59,16.59,0,0,0,.45,5,5.68,5.68,0,0,0,.34,1,5,5,0,0,1-1.08.16s0,.07.1.1a.88.88,0,0,0,.24,0h0l-.57.11h0v0a.28.28,0,0,0,0-.09c0-.27,0-.67,0-1.23,0-1.07,0-2.71.14-5a43.28,43.28,0,0,1,.59-5,3.52,3.52,0,0,0,0-.49l.5-.45c.18-.17.36-.35.56-.56A2.17,2.17,0,0,1,118.55,133.47Z"/>
-                <path class="cls-327"
-                      d="M118.27,133a2.06,2.06,0,0,1,.18.31c-.2.21-.38.39-.56.56l-.5.45v-.12c0-.1-.06-.08-.09-.09s-.15,0-.14,0Z"/>
-                <path class="cls-327"
-                      d="M118.22,59.53c-.1.11-.19.2-.3.3a10.28,10.28,0,0,1-1.15.27.43.43,0,0,0,.1-.09A11.07,11.07,0,0,0,118.22,59.53Z"/>
-                <path class="cls-327"
-                      d="M117.61,173a7,7,0,0,1,.45,3.54,15.06,15.06,0,0,1-.25,1.79,14.49,14.49,0,0,1-.57,1.65c-.44,1-.91,2-1.31,2.75s-.66,1.24-.89,1.69l-1.37.16.26-.49c.26-.46.61-1.1,1-1.87s.91-1.66,1.36-2.62a10.73,10.73,0,0,0,.59-1.51,11.11,11.11,0,0,0,.31-1.64,6.51,6.51,0,0,0-.23-3.19,7.68,7.68,0,0,0-1.6-2.34,4.82,4.82,0,0,0-1.35-1,4.15,4.15,0,0,0,.48-.11,5.52,5.52,0,0,1,1.18.79A7.56,7.56,0,0,1,117.61,173Z"/>
-                <path class="cls-330" d="M118,145.88h0l0,0,0-.07H118v.11Z"/>
-                <path class="cls-330"
-                      d="M118,145.84l0,0h-.14l-.27.06-.38.08h0a.88.88,0,0,1-.24,0c-.1,0-.12-.11-.1-.1a5,5,0,0,0,1.08-.16h0Z"/>
-                <path class="cls-327"
-                      d="M117.26,77.5c.12,0,.19,0,.19,0s-2.67.84-5.32,1.71l-1.24.4-.84-.71c.59-.17,1.23-.34,1.85-.49.44-.11.88-.21,1.31-.29A27,27,0,0,1,117.26,77.5Z"/>
-                <path class="cls-329"
-                      d="M117,173.23a6.51,6.51,0,0,1,.23,3.19,11.11,11.11,0,0,1-.31,1.64,10.73,10.73,0,0,1-.59,1.51c-.45,1-.93,1.85-1.36,2.62s-.79,1.41-1,1.87l-.26.49-2.49.25c-1.07.09-2.15.17-3.22.23l-.57.08h-.52l-.34-.06-1.6-.24c-2.86-.44-5.73-.81-8.51-1.31l0-.06c.25-.35.66-.83,1.15-1.42a16.24,16.24,0,0,0,3-4.85,9.24,9.24,0,0,0,.15-5.63,3.12,3.12,0,0,0-1-1.41l1.8.3a33.41,33.41,0,0,0,10.82-.2c.56-.09,1.12-.21,1.69-.34a4.82,4.82,0,0,1,1.35,1A7.68,7.68,0,0,1,117,173.23Z"/>
-                <path class="cls-333"
-                      d="M117.12,59.81l-.25.2a5.08,5.08,0,0,1-.59.17h0a27.52,27.52,0,0,1-3.58.25A17.5,17.5,0,0,0,117.12,59.81Z"/>
-                <path class="cls-327"
-                      d="M116.87.75l-.18,2-2.07,0A21.11,21.11,0,0,1,115,5l-2.1-.09c-.15-.25-.29-.49-.44-.7a14.42,14.42,0,0,0-1.33-1.69l-.47-.5L111,.12c.72.07,2.33.24,4.45.49Z"/>
-                <path class="cls-333" d="M116.87,60a.43.43,0,0,1-.1.09l-.49.08A5.08,5.08,0,0,0,116.87,60Z"/>
-                <path class="cls-327"
-                      d="M116.28,60.18l.49-.08a3.19,3.19,0,0,1-.43.32,4.2,4.2,0,0,1-1.58,0,12.3,12.3,0,0,0,1.49-.29Z"/>
-                <path class="cls-327"
-                      d="M114.62,2.73l2.07,0s-.14.7-.3,2.29l-1.32,0H115A21.11,21.11,0,0,0,114.62,2.73Z"/>
-                <polygon class="cls-330" points="116.45 146.19 116.45 146.2 116.44 146.2 116.45 146.19"/>
-                <path class="cls-327"
-                      d="M115.25,80.3c.79-.22,1.33-.17,1.34-.09s-.52.19-1.17.51-1.22.74-1.93,1.21l-.62-.54A18.57,18.57,0,0,1,115.25,80.3Z"/>
-                <path class="cls-327"
-                      d="M116.39,5c-.16,1.72-.33,4.46-.31,8.44,0-.06-.09-.43-.18-.83-.13-.61-.28-1.19-.43-1.74-.13-2.7-.3-4.62-.47-5.91h.07Z"/>
-                <path class="cls-331" d="M116.08,13.43v0l-.52,0s0,0,0,0Z"/>
-                <path class="cls-330"
-                      d="M116.08,13.43l-.53.05c0-1,0-1.82-.08-2.62.15.55.3,1.13.43,1.74C116,13,116.07,13.37,116.08,13.43Z"/>
-                <path class="cls-327"
-                      d="M112.47,113.73s0,0,0,0c.19-.09.88-.25,1.5-.47a2,2,0,0,0,.64-.35,6.34,6.34,0,0,0-1.07-.07c-.63.06-.94.73-1.07.89C112.48,113.71,112.47,113.71,112.47,113.73Zm3-1.28a.3.3,0,0,1,.11.41c-.07.12-.1.1-.15.15l-.11,0a.33.33,0,0,0-.13.07,2.82,2.82,0,0,1-1.1.51,4,4,0,0,1-1.67.11s0-.21.11-.52a1.37,1.37,0,0,1,.91-.82,5.22,5.22,0,0,1,1.21-.05c.31,0,.54,0,.56,0A1,1,0,0,1,115.5,112.45Zm-.2.33c0-.06.06-.06,0-.07a.36.36,0,0,1-.11-.16c0-.08,0,0-.08,0a1,1,0,0,0-.23.13l-.25.21c.3,0,.5.07.5.07h.07A.51.51,0,0,1,115.3,112.78Z"/>
-                <path class="cls-327"
-                      d="M115.47,10.86c0,.8.06,1.67.08,2.62,0-.12-.08-.43-.14-.76a15.34,15.34,0,0,0-3.87-7.64l-.3-.28,1.66.06A23.88,23.88,0,0,1,115.47,10.86Z"/>
-                <path class="cls-329"
-                      d="M115.33,112.71s0,0,0,.07a.51.51,0,0,0-.07.18h-.07s-.2,0-.5-.07l.25-.21a1,1,0,0,1,.23-.13c.06,0,0-.07.08,0A.36.36,0,0,0,115.33,112.71Z"/>
-                <path class="cls-333"
-                      d="M116.25,60.18a12.3,12.3,0,0,1-1.49.29h-.1a.52.52,0,0,0-.43.08h-.09l-.9.06c-.32,0-.64,0-1,0s-.57,0-.85,0l-.28-.18h1.53A27.52,27.52,0,0,0,116.25,60.18Z"/>
-                <path class="cls-328" d="M115,5c.17,1.29.34,3.21.47,5.91a23.88,23.88,0,0,0-2.57-6Z"/>
-                <path class="cls-327" d="M115,184.39l-.1.21-.37.74c-.07.15-.36.17-.66.06s-.48-.38-.4-.56l.16-.29Z"/>
-                <path class="cls-333" d="M114.76,60.47l-.25,0h-.28a.52.52,0,0,1,.43-.08Z"/>
-                <path class="cls-327"
-                      d="M114.54,169.77a4.15,4.15,0,0,1-.48.11,1.21,1.21,0,0,0-.3-.11,1.78,1.78,0,0,0-.75,0s.23-.28.79-.22A2.32,2.32,0,0,1,114.54,169.77Z"/>
-                <path class="cls-327"
-                      d="M114.14,60.55h.08l-.09.11c-.63,0-1.25.06-1.89.11a.44.44,0,0,0-.29.14c-.18-.09-.36-.18-.53-.28.28,0,.56,0,.85,0s.65,0,1,0Z"/>
-                <path class="cls-329"
-                      d="M114.64,112.88a2,2,0,0,1-.64.35c-.62.22-1.31.38-1.5.47.13-.16.44-.83,1.07-.89A6.34,6.34,0,0,1,114.64,112.88Z"/>
-                <path class="cls-327"
-                      d="M114,128.21s0,.1,0,.16c-.57.1-1.15.16-1.73.21,0-.46-.06-.72-.06-.78l1,0,.67,0H114v.05C114,128,114,128.07,114,128.21Z"/>
-                <path class="cls-327"
-                      d="M113.58,117.91c.18.08.41.27.39.5a.66.66,0,0,1-.17.33,1.54,1.54,0,0,1-.16.18,4.72,4.72,0,0,1-.75.56,2.3,2.3,0,0,1-1.37.09c0-.06.61-.14,1.21-.39a6.23,6.23,0,0,0,.6-.57.83.83,0,0,0,.11-.15v0s0,0-.07,0a5.46,5.46,0,0,0-.81-.13l-.62-.11a1.38,1.38,0,0,0-1.06.31A3.82,3.82,0,0,0,110,120a2.14,2.14,0,0,1,.63-1.87,1.84,1.84,0,0,1,1.4-.55l.64.06A6.29,6.29,0,0,1,113.58,117.91Z"/>
-                <path class="cls-327" d="M113.49,81.93l-.46.3c-.1.06-.19.14-.3.2l-.51-.51-.12-.14.52-.27.25-.12Z"/>
-                <path class="cls-329"
-                      d="M113.06,76.82l.15,1.34c-.43.08-.87.18-1.31.29-.62.15-1.26.32-1.85.49-.84-.71-1.44-1.15-1.53-1a12.33,12.33,0,0,0,1,1.17l-1.41.45c-1,.34-1.73.63-1.77.65a15.63,15.63,0,0,0-1.68.9c-.23.14-.47.32-.73.49-2.14-.7-4.38-1.35-6.6-2-.41-.12-.87-.24-1.2-.36L95,78.74l-2.35-1.06-.27-.13c1.23-.33,2.42-.62,3.38-.82,1.38-.31,2.34-.4,2.4-.42s1-.18,2.41-.34a36.41,36.41,0,0,1,5.14-.12,39,39,0,0,1,5.08.56C112,76.62,112.85,76.82,113.06,76.82Z"/>
-                <path class="cls-327"
-                      d="M113.11,76.81h0c-.21,0-1-.2-2.26-.41a39,39,0,0,0-5.08-.56,36.41,36.41,0,0,0-5.14.12c-1.41.16-2.36.31-2.41.34s-1,.11-2.4.42c-1,.2-2.15.49-3.38.82L91.18,77c1.56-.55,3.1-1,4.34-1.32,1.41-.37,2.41-.51,2.46-.53s1-.15,2.51-.25a34.33,34.33,0,0,1,5.28.12,31.53,31.53,0,0,1,4,.66c.4.09.77.19,1.11.28A7.63,7.63,0,0,1,113.11,76.81Z"/>
-                <path class="cls-332"
-                      d="M112.65,43.07l1.16.58c-3.19.19-5.8,3.79-6,8.43-.2,3.68,1.21,6.9,3.38,8.36l.28.18a27.46,27.46,0,0,1-4.74-.64,38.19,38.19,0,0,1-4.38-1.13A16.54,16.54,0,0,1,98,56.92l0,0-1.51-1.06c-.25-.17-.48-.37-.73-.56l-.48-.39,0-.17.08-.42c.06-.29.15-.57.23-.86a13.37,13.37,0,0,1,.65-1.69,18.93,18.93,0,0,1,4.41-5.84,15.12,15.12,0,0,1,5.9-3.71A8.77,8.77,0,0,1,112.65,43.07Z"/>
-                <path class="cls-327" d="M112.87,81.39l-.25.12-.52.27c-.65-.66-1.28-1.33-1.82-1.91l.61-.22,1.91,1.68Z"/>
-                <path class="cls-327" d="M112.22,81.92l.51.51L110.43,84l-1.3-.52.94-.53c.56-.33,1.28-.71,2-1.12Z"/>
-                <path class="cls-327"
-                      d="M112.46,4.16c.15.21.29.45.44.7l-1.66-.06A6.89,6.89,0,0,0,110,3.92l-.53-.24L110.66,2l.47.5A14.42,14.42,0,0,1,112.46,4.16Z"/>
-                <path class="cls-331" d="M112.47,113.73s0,0,0,0S112.48,113.73,112.47,113.73Z"/>
-                <path class="cls-327"
-                      d="M110.44,138.38l0,0-.06.07a.67.67,0,0,0-.06.12v0l0-.11.09-.47c.37-2.56.74-5.1,1-7,.15-1,.27-1.83.36-2.38l.34,0c.06,1.62-.14,5.59-.51,9.59l0,.48v.14a2.13,2.13,0,0,1-.11.41h0l0,0h0a0,0,0,0,0,0,0h0s0,0,0,0l-.06-.07h0l0,0-.18-.15s0,0,0,0l0,0-.06-.07-.08-.06s0-.05-.06-.06l0,0v0h0A2,2,0,0,0,110.44,138.38Z"/>
-                <path class="cls-327" d="M112.18,128.59l-.34,0c.09-.52.14-.8.2-.8S112.16,128.1,112.18,128.59Z"/>
-                <path class="cls-329"
-                      d="M110.83,128.67l1,0c-.09.55-.21,1.37-.36,2.38-.29,1.91-.66,4.45-1,7l-.09.47,0,.11v0l0,0-.07.16-.38.9c-.23.6-.46,1.18-.69,1.75-.45,1.14-.86,2.21-1.23,3.13s-.64,1.71-.85,2.27c0,.14-.11.27-.15.38v.05l0,.13s0,.07,0,.1l0,.05a1.11,1.11,0,0,1-.08.24c0,.08-.38,1.22-.91,2.9-.59.49-1.27,1.06-2,1.67l-2.48,2.11-.32.28-.16.13,0,.06h0a3.65,3.65,0,0,1-.26-.44,1.35,1.35,0,0,1-.15-.51.82.82,0,0,1,0-.22s0-.27.32-.66a4.94,4.94,0,0,1,.51-.66c-.16-.37-1.59,1-1.42,1.26a1.48,1.48,0,0,0,.38,1,2.13,2.13,0,0,0,.21.22l-1.64-.22-.8-.13-.32,0a.88.88,0,0,1,0-.28,1.46,1.46,0,0,1,.14-.51l.11-.23a3.2,3.2,0,0,1,.41-.71c.24-.34.61-.58.58-.65s-.5,0-.88.35a2.82,2.82,0,0,0-.45.49,1.3,1.3,0,0,0-.18.27,1.81,1.81,0,0,0-.15.94c-.17-.24-.35-.47-.52-.69v-.14a2,2,0,0,1,0-.23,3.91,3.91,0,0,1,0-.48,5.21,5.21,0,0,1,.18-.86,2,2,0,0,1,.8-1.13,1.71,1.71,0,0,1,1.24-.32c.15.28,3.52-1.08,3.58-1.11a21.48,21.48,0,0,0,3.11-2.05h0c.28-.05.44-2.67.45-5.34a42,42,0,0,0-.24-5.61,14,14,0,0,0-.51-1.79c-.33-1-.83-2.27-1.36-3.53s-1.16-2.6-1.65-3.5a16.43,16.43,0,0,0,3.89,1.09A24.73,24.73,0,0,0,110.83,128.67Z"/>
-                <path class="cls-330" d="M111.49,139.22h0a.33.33,0,0,1,0,.06h0Z"/>
-                <path class="cls-327"
-                      d="M111.47,139.28c-.11.3-.21.6-.32.89-.19.61-.4,1.21-.6,1.78l-1.06,3.18-.76,2.28,0,.08c-.32.06-.92.16-.92.18h-.91s0-.1,0-.15,0-.07,0-.1l0-.13v-.05c0-.11.1-.24.15-.38.21-.56.51-1.34.85-2.27s.78-2,1.23-3.13c.23-.57.46-1.15.69-1.75l.38-.9.07-.16,0,0c0,.07.09.22.13.19s0-.2.11-.14h.18v0l0,0s0,0,.06.06l.08.06.06.07,0,0s0,0,0,0l.18.15,0,0h0l.06.07s0,0,0,0h0a0,0,0,0,1,0,0h0Z"/>
-                <path class="cls-327"
-                      d="M111,.12,110.66,2l-1.17,1.71.53.24a6.89,6.89,0,0,1,1.22.88l-1-.06-1.6-.14c-.93-.08-2.25-.19-3.82-.23-.54,0-1.11,0-1.7,0-.18-.51-.35-1-.52-1.36a6.59,6.59,0,0,0-.33-.65,2.19,2.19,0,0,0-.53-.63c-.24-.21-.43-.39-.59-.52l-.45-.41,0-.38c1.49-.18,2.88-.28,4.14-.34,1.67-.07,3.09-.06,4.11,0l1.65.06Z"/>
-                <path class="cls-327" d="M110.89,79.65l-.61.22-.63-.69a1.14,1.14,0,0,1-.11-.11l.51-.13Z"/>
-                <path class="cls-330"
-                      d="M110.47,138.42l0,0a2,2,0,0,1,.3.27h-.15c-.09-.06-.12.13-.11.14s-.11-.12-.13-.19a.67.67,0,0,1,.06-.12Z"/>
-                <path class="cls-329"
-                      d="M110.28,79.87c.54.58,1.17,1.25,1.82,1.91-.75.41-1.47.79-2,1.12l-.94.53-2-.78c-.62-.23-1.25-.45-1.89-.67.89-.46,1.56-.72,1.6-.74s.67-.32,1.66-.7C109,80.33,109.62,80.1,110.28,79.87Z"/>
-                <path class="cls-327"
-                      d="M110.05,78.94l-.51.13a12.33,12.33,0,0,1-1-1.17C108.61,77.79,109.21,78.23,110.05,78.94Z"/>
-                <path class="cls-327"
-                      d="M109.65,79.18l.63.69c-.66.23-1.27.46-1.78.67-1,.38-1.63.68-1.66.7s-.71.28-1.6.74c-.43-.14-.86-.29-1.29-.42.26-.17.5-.35.73-.49a15.63,15.63,0,0,1,1.68-.9s.74-.31,1.77-.65l1.41-.45A1.14,1.14,0,0,0,109.65,79.18Z"/>
-                <path class="cls-327" d="M109.13,83.43l1.3.52-.93.62-.31.18-1.3-.46.65-.49.34-.22Z"/>
-                <path class="cls-327"
-                      d="M107.89,84.29l1.3.46c-.2.12-.48.3-.8.53A26.74,26.74,0,0,0,106.14,87a28.84,28.84,0,0,1-3.2,2.63s0,0,0,0a16.41,16.41,0,0,1,2.65-3.21,28.42,28.42,0,0,1,2.15-2Z"/>
-                <path class="cls-327"
-                      d="M109.13,83.43l-.25.15-.34.22-.65.49-1.19-.41c-1-.32-2-.62-3-.91l0,0,.79-.53.7-.43h0c.64.22,1.27.44,1.89.67Z"/>
-                <path class="cls-330" d="M108.73,147.41a.24.24,0,0,0,0,.08h0Z"/>
-                <path class="cls-331" d="M108.7,147.49l0,.14h0l0,.05Z"/>
-                <path class="cls-330" d="M108.7,147.49l-.08.2-.21,0h-.63S108.38,147.55,108.7,147.49Z"/>
-                <polygon class="cls-330"
-                         points="108.66 147.64 108.62 147.76 108.62 147.71 108.62 147.69 108.66 147.64"/>
-                <path class="cls-327"
-                      d="M108.62,147.76h0v0h0l0,.15,0,.07-.09.31s-.12.37-.32.92-.52,1.42-.88,2.42l-5,3.82-.77.6a.39.39,0,0,1-.14.08h0l-.15.06h-.13l-.23,0c-.27,0-.38-.06-.52-.08-.57-.1-1.11-.22-1.65-.33-.27-.06-.53-.13-.8-.18l-.42-.09-.3-.06c-.1,0-.21,0-.25-.15l-1-1.53v-.4a2.83,2.83,0,0,1,0-.29c0-.2.07-.38.11-.55a4.17,4.17,0,0,1,.32-1,2.43,2.43,0,0,1,1.22-1.28,2.6,2.6,0,0,1,1.43.07h0a1.71,1.71,0,0,0-1.24.32,2,2,0,0,0-.8,1.13,5.21,5.21,0,0,0-.18.86,3.91,3.91,0,0,0,0,.48,2,2,0,0,0,0,.23v.14c.17.22.35.45.52.69a.25.25,0,0,0,0,.08c.09.53.49.86.55.79s-.08-.27-.12-.54l.32,0,.8.13,1.64.22c.26.25.53.39.57.34s-.06-.17-.17-.34h0l0-.06.16-.13.32-.28,2.48-2.11c.71-.61,1.39-1.18,2-1.67.53-1.68.89-2.82.91-2.9a1.11,1.11,0,0,0,.08-.24l0-.05c0,.05,0,.1,0,.15h1.54l.21,0v.07Z"/>
-                <path class="cls-329"
-                      d="M107.89,84.29l-.16.11a28.42,28.42,0,0,0-2.15,2,16.41,16.41,0,0,0-2.65,3.21l-3,.45a7.27,7.27,0,0,1-1.42-.76,5.31,5.31,0,0,1-.67-.5c-.15-.12-.29-.28-.43-.41a6.64,6.64,0,0,1-.75-1l.59-.34A34.53,34.53,0,0,0,102,84.1L103.7,83c1,.29,2,.59,3,.91Z"/>
-                <path class="cls-327"
-                      d="M107.84,122.82a.43.43,0,0,1-.13.43,1.28,1.28,0,0,1-.45.21,1.64,1.64,0,0,1-.33.05,1.87,1.87,0,0,1-.72-.07l-.17,0s0,0,0-.09,0-.08,0-.1,0,0,.08,0a.8.8,0,0,0-.09-.14c0-.08-.2-.1-.08-.11a1,1,0,0,0,.32.05,2.34,2.34,0,0,0,.82-.14s.08,0,.09,0,.09,0,0-.09a1.55,1.55,0,0,0-.49-.21c-.15,0-.26,0-.28,0s.45-.33,1-.08A.68.68,0,0,1,107.84,122.82Zm-1.66.46c.12.16,0,0,0,0Z"/>
-                <path class="cls-331" d="M106.15,123.24s.15.2,0,0Z"/>
-                <path class="cls-327"
-                      d="M105.93,136.27a42,42,0,0,1,.24,5.61c0,2.67-.17,5.29-.45,5.34a.14.14,0,0,0,0-.1c-.06-.1.19-.45-.2-.37-.17-.87-.38-2.82-.6-4.81-.16-1.34-.32-2.68-.45-3.68-.07-.5-.14-.92-.19-1.21s-.09-.45-.09-.47-.1-.67-.35-1.65-.59-2.27-1-3.56c-.45-1.55-.93-3.07-1.2-4.07h0a.61.61,0,0,0,0-.12l.66.28c.49.9,1.1,2.19,1.65,3.5s1,2.53,1.36,3.53A14,14,0,0,1,105.93,136.27Z"/>
-                <path class="cls-330"
-                      d="M105.54,146.75c.39-.08.14.27.2.37a.14.14,0,0,1,0,.1h0c-.06,0-.11-.16-.17-.47Z"/>
-                <path class="cls-327"
-                      d="M105.54,146.76c.06.31.11.47.17.47a21.48,21.48,0,0,1-3.11,2.05c-.06,0-3.43,1.39-3.58,1.11h0a5.71,5.71,0,0,1,1.39-.6c1.38-.81,2.14-1.37,3.62-2.32l1-.51A2.21,2.21,0,0,1,105.54,146.76Z"/>
-                <path class="cls-327"
-                      d="M105.47,13c0,.13.12.48-.07.2a4,4,0,0,0-1.31-.93l-.45-.4c-.36-.31-.69-.58-1-.83l-.81-.6c-.52-.38-1-.74-1.53-1.07a19.46,19.46,0,0,0-2.83-1.61,21.24,21.24,0,0,0-4.57-1.49c-.36-.07-.68-.12-1-.16l.5-.22.71-.28.66-.23.2-.06A32.83,32.83,0,0,1,97.64,7a25.86,25.86,0,0,1,2.88,1.82L102.08,10l.81.62.62.5.27.21a12.11,12.11,0,0,1,1,1c.19.28,0-.08,0-.23s-.11-.33-.17-.47-.17-.48-.2-.55c-.41-1.14-1.16-3.13-1.71-4.38a22.39,22.39,0,0,0-1.09-2.27c.51,0,1,0,1.47,0,.2.59.41,1.26.65,2,.47,1.54,1,3.42,1.7,5.64a1.33,1.33,0,0,0,0,.53A4.32,4.32,0,0,0,105.47,13Z"/>
-                <path class="cls-327"
-                      d="M105.24,82h0l-.7.43-.79.53,0,0c-.39-.12-.77-.22-1.17-.33l.63-.48.76-.58,0,0C104.38,81.69,104.81,81.84,105.24,82Z"/>
-                <path class="cls-328"
-                      d="M104.8,12c0,.15.2.51,0,.23a12.11,12.11,0,0,0-1-1l-.27-.21-.62-.5-.81-.62-1.56-1.15A25.86,25.86,0,0,0,97.64,7,32.83,32.83,0,0,0,94,5.32a27.82,27.82,0,0,1,5.54-.88c.73,0,1.43-.07,2.12-.08a22.39,22.39,0,0,1,1.09,2.27c.55,1.25,1.3,3.24,1.71,4.38,0,.07.11.27.2.55S104.74,11.87,104.8,12Z"/>
-                <path class="cls-327"
-                      d="M104,81.56l0,0-.76.58-.63.48c-1.83-.5-3.71-1-5.61-1.46-.44-.1-.83-.2-1.32-.35h0l.12-.25-2.1-1-.19.4-1.49-.62-2.27-1c.36-.12.73-.24,1.09-.34.55-.17,1.1-.32,1.64-.47l.27.13L95,78.74l1.14.49c.33.12.79.24,1.2.36C99.57,80.21,101.81,80.86,104,81.56Z"/>
-                <path class="cls-327"
-                      d="M102.53,82.64c.4.11.78.21,1.17.33L102,84.1A34.53,34.53,0,0,1,97.22,87a33.12,33.12,0,0,1,4.31-3.6Z"/>
-                <path class="cls-327"
-                      d="M99.59,111.48c0,.07.06.11,0,.12s-.07,0-.16-.1,0-.14,0-.15a.27.27,0,0,1,.11,0l.26,0c.37,0,.84-.07,1.29-.16a5.26,5.26,0,0,1,1.39-.1,2.08,2.08,0,0,1,.54.11.81.81,0,0,1,.29.17.44.44,0,0,1,0,.57,1.19,1.19,0,0,1-.31.26,5.59,5.59,0,0,0-.48.38,1.63,1.63,0,0,1-.75.34,1.56,1.56,0,0,1-.77-.19c-.2-.09-.38-.19-.56-.26s-.53-.28-.51-.32a1.55,1.55,0,0,1,.59.1l.59.17a1.26,1.26,0,0,0,.61.09c.33-.07.64-.51,1-.74.12-.08,0,0,.06-.06h0l-.34-.08a5.8,5.8,0,0,0-1.27,0,8.19,8.19,0,0,1-1.33,0A1.56,1.56,0,0,0,99.59,111.48Z"/>
-                <path class="cls-327"
-                      d="M100.84,3.12s0,0,0,0l0-.09ZM102.58,3c.17.4.34.85.52,1.36-.47,0-1,0-1.47,0-.15-.28-.3-.54-.44-.75s-.22-.28-.31-.4,0,0-.06,0,0,0,0,0h0l-.11-.05L100,2.74l-.51-.25L100.68.77l.45.41c.16.13.35.31.59.52a2.19,2.19,0,0,1,.53.63A6.59,6.59,0,0,1,102.58,3Z"/>
-                <path class="cls-329"
-                      d="M102.53,82.64l-1,.79A33.12,33.12,0,0,0,97.22,87l-.59.34a7.57,7.57,0,0,1-.41-.8,19.25,19.25,0,0,1-1-3.09c-.13-.53-.22-1-.32-1.33.32-.63.53-1.07.66-1.32h0c.49.15.88.25,1.32.35C98.82,81.66,100.7,82.14,102.53,82.64Z"/>
-                <path class="cls-327"
-                      d="M102.41,127.45l-.66-.28c.1-.2.16-.37.21-.49C102.1,126.89,102.25,127.15,102.41,127.45Z"/>
-                <path class="cls-327"
-                      d="M99.91,125.52l2.2.79s0,.12-.13.34l0,0c-.22-.36-.38-.55-.47-.51s0,.38.16.94a20.92,20.92,0,0,1-1.94-1C99.85,125.73,99.91,125.52,99.91,125.52Z"/>
-                <path class="cls-327"
-                      d="M102,97.64l0,0c-.43.44-1,1-1,1-.55.47-.84.85-1.4,1.29l-1.32,1.06c-.8.62-1.54,1.16-2.27,1.62a19,19,0,0,1-3.75,1.7c-1,.34-1.69.55-2.15.68l-.23.08c-.08-.65-.16-1.29-.21-1.93h.18A15.67,15.67,0,0,0,92.1,103a12.34,12.34,0,0,0,3.66-1.14,31.49,31.49,0,0,0,4.38-3l1-.8-.05-.07c-.21.06-.59.13-.62.14l-1,.25c-.41,0-.75.09-1.14.12l-1.44.12a22.81,22.81,0,0,1-2.59,0,12.91,12.91,0,0,1-3.8-.75c-.34-.12-.64-.25-.91-.37a16.9,16.9,0,0,1,.21-1.91,6,6,0,0,0,1.2.94,9.34,9.34,0,0,0,3.29,1.15,14.44,14.44,0,0,0,2.5.18l1.45,0c.6,0,1.35-.09,2.06-.17A12.07,12.07,0,0,0,102,97.64Z"/>
-                <path class="cls-327"
-                      d="M102,126.68c0,.12-.11.29-.21.49l-.1-.06c-.15-.56-.22-.91-.16-.94S101.74,126.32,102,126.68Z"/>
-                <path class="cls-330" d="M101.75,127.17a.61.61,0,0,1,0,.12c0-.06,0-.12,0-.18Z"/>
-                <path class="cls-327"
-                      d="M101.7,127.29h0c0,.08-.08.18-.12.27a24.62,24.62,0,0,1-1.77,3.07,46.21,46.21,0,0,1-3,3.87c-1.14,1.33-2.42,2.76-3.77,4.06-2.7,2.6-5.38,5.11-6.89,7.39s-2,4.09-2.17,4a6.35,6.35,0,0,1,.67-3,1.4,1.4,0,0,0,.54-.28,1.49,1.49,0,0,0-.45.1,10.64,10.64,0,0,1,.63-1.34,18.5,18.5,0,0,1,1.77-2.69,1.46,1.46,0,0,0,.62-.28,1.67,1.67,0,0,0-.46.06c1.32-1.69,3-3.45,4.55-5.15,1.26-1.36,2.39-2.77,3.45-4.15A43.59,43.59,0,0,0,98,129.47a21.87,21.87,0,0,0,1.49-2.83c.08-.2.15-.39.22-.53a20.92,20.92,0,0,0,1.94,1C101.67,127.17,101.68,127.23,101.7,127.29Z"/>
-                <path class="cls-327"
-                      d="M101.19,3.61c.14.21.29.47.44.75-.69,0-1.39,0-2.12.08A27.82,27.82,0,0,0,94,5.32c-.31-.13-.61-.23-.89-.34-1.2-.42-2.08-.69-2.66-.86s-.74-.22-.83-.24l0,0c.47-.28.95-.55,1.43-.81l.73-.39.81-.38A27.32,27.32,0,0,1,99.08.59c.53-.08,1-.15,1.56-.2l0,.38L99.51,2.49l.51.25.66.35.11.05h0s0,0,0,0,0,0,.06,0S101.08,3.44,101.19,3.61Z"/>
-                <path class="cls-327"
-                      d="M99.9,153.73c-.17-.27,1.26-1.63,1.42-1.26a4.94,4.94,0,0,0-.51.66c-.33.39-.33.64-.32.66a.82.82,0,0,0,0,.22,1.35,1.35,0,0,0,.15.51,3.65,3.65,0,0,0,.26.44c-.06,0-.08,0-.4,0a2.13,2.13,0,0,1-.21-.22A1.48,1.48,0,0,1,99.9,153.73Z"/>
-                <path class="cls-328"
-                      d="M101.07,98l.05.07-1,.8a31.49,31.49,0,0,1-4.38,3A12.34,12.34,0,0,1,92.1,103a15.67,15.67,0,0,1-2.19.21h-.18c-.08-.69-.13-1.39-.17-2.07a28.17,28.17,0,0,1,0-3.57c.27.12.57.25.91.37a12.91,12.91,0,0,0,3.8.75,22.81,22.81,0,0,0,2.59,0l1.44-.12c.39,0,.73-.07,1.14-.12l1-.25S100.86,98.1,101.07,98Z"/>
-                <path class="cls-330"
-                      d="M100.89,155c.11.17.2.31.17.34s-.31-.09-.57-.34C100.81,155,100.83,155,100.89,155Z"/>
-                <path class="cls-330" d="M100.92,3l0,.09s0,0,0,0Z"/>
-                <path class="cls-327"
-                      d="M100.75,171.53a9.24,9.24,0,0,1-.15,5.63,16.24,16.24,0,0,1-3,4.85c-.49.59-.9,1.07-1.15,1.42l0,.06-1.24-.24a19.52,19.52,0,0,1,1.6-1.95,15.32,15.32,0,0,0,3-4.41,9.27,9.27,0,0,0,.5-5.22A3.14,3.14,0,0,0,99.26,170l.19.05.3.06A3.12,3.12,0,0,1,100.75,171.53Z"/>
-                <path class="cls-327"
-                      d="M100.78,90.48s.21.06,0,.09l-.85.17L98.33,91c-.51.08-1,.16-1.44.25l-1.1.15a12.62,12.62,0,0,1-3.55.14,8.44,8.44,0,0,1-1.44-.35c.17-.56.36-1.1.56-1.61a4.75,4.75,0,0,0,1.28.71,8,8,0,0,0,3.19.34l1.08-.06.9-.08,1-.14.52-.09c.17,0,0,0-.09-.06l-.25-.1-.17-.07a6.09,6.09,0,0,1-.91-.5c-.14-.09-.26-.18-.39-.28a6.4,6.4,0,0,1-.49-.42A7.64,7.64,0,0,1,95.58,87c-.7-1.21-1.13-2.23-1.53-3,0,0,0,0,0,0,.35-.72.65-1.32.9-1.82.1.36.19.8.32,1.33a19.25,19.25,0,0,0,1,3.09,7.57,7.57,0,0,0,.41.8,6.64,6.64,0,0,0,.75,1c.14.13.28.29.43.41a5.31,5.31,0,0,0,.67.5,7.27,7.27,0,0,0,1.42.76l.32.12s.28.16.29.2S100.73,90.44,100.78,90.48Z"/>
-                <path class="cls-328"
-                      d="M100.32,171.67a9.27,9.27,0,0,1-.5,5.22,15.32,15.32,0,0,1-3,4.41,19.52,19.52,0,0,0-1.6,1.95c-.94-.2-1.88-.41-2.79-.66a24.29,24.29,0,0,1-5.63-2.32c-.31-.16-.61-.34-.91-.52l1.19-.44a17.54,17.54,0,0,0,5.13-3A6.44,6.44,0,0,0,94,173.7a7.71,7.71,0,0,0,.46-2.71,6.72,6.72,0,0,0-.41-2.48l.77.23,2.83.82c.5.15,1,.31,1.61.45A3.14,3.14,0,0,1,100.32,171.67Z"/>
-                <path class="cls-327"
-                      d="M99.75,170.12l-.3-.06-.19-.05c-.18-.14-.31-.22-.31-.25s.28,0,.66.26A1.21,1.21,0,0,1,99.75,170.12Z"/>
-                <path class="cls-329"
-                      d="M99.71,126.11c-.07.14-.14.33-.22.53A21.87,21.87,0,0,1,98,129.47a43.59,43.59,0,0,1-2.68,3.81c-1.06,1.38-2.19,2.79-3.45,4.15-1.58,1.7-3.23,3.46-4.55,5.15a9.23,9.23,0,0,1-1.41.16,13.88,13.88,0,0,1-4.1-.47,5.54,5.54,0,0,1-1.92-.88A4.65,4.65,0,0,1,78.67,140a4.69,4.69,0,0,1-.6-1.71c1.05-1.3,2.08-2.5,3.07-3.62a5.25,5.25,0,0,0,1.55,1.43,4.43,4.43,0,0,0,2.13.61c.62,0,1.05-.3.94-.46s-.35-.18-.75-.42a6.1,6.1,0,0,1-1.31-1,4.22,4.22,0,0,1-.78-1.32,4.9,4.9,0,0,1-.17-.55l.4-.44c.52-.55,1-1.06,1.51-1.53a6.13,6.13,0,0,0,1.52,1.53c1.59,1.09,3.38,1.26,3.45,1s-1.41-1.08-2.36-2.23a4.52,4.52,0,0,1-.94-1.64,1.39,1.39,0,0,1-.06-.19c.45-.41.88-.82,1.28-1.2l.75-.71a3.12,3.12,0,0,0,1.09,1.33,4.22,4.22,0,0,0,.71.41l.67.3A8.21,8.21,0,0,0,92,130c.75.18,1.31.12,1.32-.06s-.38-.36-1-.77c-.28-.2-.61-.44-.94-.71-.17-.13-.34-.28-.52-.41s-.34-.3-.45-.42a1.34,1.34,0,0,1-.23-1.46,2.38,2.38,0,0,1,.29-.54.56.56,0,0,1,.09-.13l0,0-.07,0,1.16-1.09,0,0s0,0,0,0,.08.2.08.21a3.21,3.21,0,0,0,.52.56,7.08,7.08,0,0,0,1,.61c.76.4,1.69.51,1.78.18s-.34-.83-.71-1.45l-.5-.81a.79.79,0,0,1,0-.24,1.14,1.14,0,0,1-.44-.79c0-.06,0-.13,0-.2a5.81,5.81,0,0,0,.55-1c.11.12.22.25.35.37a30.63,30.63,0,0,0,3.56,3C98.42,125.29,99.05,125.71,99.71,126.11Z"/>
-                <path class="cls-328"
-                      d="M99.22,90.23s.26,0,.09.06l-.52.09-1,.14-.9.08-1.08.06a8,8,0,0,1-3.19-.34,4.75,4.75,0,0,1-1.28-.71c.13-.38.29-.75.44-1.1.73-1.57,1.51-3.06,2.07-4.22.06-.11.11-.22.16-.32s0,0,0,0c.4.77.83,1.79,1.53,3A7.64,7.64,0,0,0,97,88.86a6.4,6.4,0,0,0,.49.42c.13.1.25.19.39.28a6.09,6.09,0,0,0,.91.5l.17.07Z"/>
-                <path class="cls-327"
-                      d="M99,152.19c0,.07-.34.31-.58.65a3.2,3.2,0,0,0-.41.71l-.11.23a1.46,1.46,0,0,0-.14.51.88.88,0,0,0,0,.28h0c-.05,0-.13,0-.17,0l-.22-.28a1.81,1.81,0,0,1,.15-.94,1.3,1.3,0,0,1,.18-.27,2.82,2.82,0,0,1,.45-.49C98.45,152.23,98.93,152.11,99,152.19Z"/>
-                <path class="cls-327"
-                      d="M98.17,120.36a2.8,2.8,0,0,1-.47,2.3h0l-.42-.33a.21.21,0,0,0,.08,0,2.37,2.37,0,0,0,.36-1.61c-.3,0-.83,0-1.14,0a1.4,1.4,0,0,1-.48.58c-.14-.11-.26-.24-.39-.36.33-.22.39-.39.39-.44l-.11-.34.37,0c.5,0,1.31,0,1.48,0A.32.32,0,0,1,98.17,120.36Z"/>
-                <path class="cls-330"
-                      d="M97.73,154.57c0,.27.16.5.12.54s-.46-.26-.55-.79a.25.25,0,0,1,0-.08l.22.28s.12,0,.17,0Z"/>
-                <path class="cls-329"
-                      d="M97.71,120.67a2.37,2.37,0,0,1-.36,1.61.21.21,0,0,1-.08,0c-.4-.35-.81-.71-1.18-1.08a1.4,1.4,0,0,0,.48-.58C96.88,120.68,97.41,120.68,97.71,120.67Z"/>
-                <path class="cls-327"
-                      d="M97.69,122.66h0a.7.7,0,0,1-.5.19,1.06,1.06,0,0,1-.5-.14l.27-.45a.36.36,0,0,0,.31.06Z"/>
-                <path class="cls-327"
-                      d="M95.18,183.25l1.24.24a5.11,5.11,0,0,0-.33.5c-.07.13-.37.1-.65-.05s-.44-.39-.35-.55A.61.61,0,0,1,95.18,183.25Z"/>
-                <path class="cls-327" d="M96.09,121.25l-.16.11-.29-.43.06,0C95.83,121,96,121.14,96.09,121.25Z"/>
-                <path class="cls-327" d="M93.61,79.55l2.1,1-.12.25c-.49-.17-.83-.32-1.26-.49s-.61-.26-.91-.39Z"/>
-                <path class="cls-327"
-                      d="M95.59,80.83c-.13.25-.34.69-.66,1.32-.05-.21-.1-.39-.15-.55a2.2,2.2,0,0,0-.29-.62,1.38,1.38,0,0,0-.38-.33l-.93,1.83A10.37,10.37,0,0,1,94,84c0,.1-.1.21-.16.32-.56,1.16-1.34,2.65-2.07,4.22-.15.35-.31.72-.44,1.1a1.48,1.48,0,0,1-.43-.49l-1.44,1.5a5.12,5.12,0,0,0,1.31.6,28.67,28.67,0,0,0-.74,2.94c-.1.5-.18,1-.24,1.52a2,2,0,0,1-.45-.57l-1.59,1.34a6.81,6.81,0,0,0,1.83,1.14,28.17,28.17,0,0,0,0,3.57c0,.68.09,1.38.17,2.07h-.56v0c-.09-1.39-.17-2.74-.26-4l-.41-.52-.25-.35-.48-.65c-.08-.13-.18-.25-.25-.37,0-.7.11-1.38.19-2l1.56-1-1-1.45a.7.7,0,0,1-.17.11,28,28,0,0,1,1-3.44c.9-.71,1.52-1.19,1.47-1.29s-.48,0-1.13.32c.12-.3.23-.59.36-.87.79-1.78,1.48-3.13,2.06-4.35.77-1.61,1.33-2.75,1.6-3.33.3.13.61.25.91.39S95.1,80.66,95.59,80.83Z"/>
-                <path class="cls-327"
-                      d="M94.36,124.48c.37.62.8,1.15.71,1.45s-1,.22-1.78-.18a7.08,7.08,0,0,1-1-.61,3.21,3.21,0,0,1-.52-.56s0-.09-.08-.21,0,0,0,0a12.66,12.66,0,0,0,1.66-1.89c0,.07,0,.14,0,.2a1.14,1.14,0,0,0,.44.79.79.79,0,0,0,0,.24Z"/>
-                <path class="cls-327"
-                      d="M94.78,81.6c0,.16.1.34.15.55-.25.5-.55,1.1-.9,1.82a10.37,10.37,0,0,0-.85-1.49l.93-1.83a1.38,1.38,0,0,1,.38.33A2.2,2.2,0,0,1,94.78,81.6Z"/>
-                <path class="cls-327"
-                      d="M94.46,171A7.71,7.71,0,0,1,94,173.7a6.44,6.44,0,0,1-1.83,2.64,17.54,17.54,0,0,1-5.13,3l-1.19.44c-.44-.25-.86-.51-1.27-.79l.28-.08c.45-.14,1.07-.32,1.8-.58a17.38,17.38,0,0,0,5-2.58A6.57,6.57,0,0,0,94,171a15.13,15.13,0,0,0-.06-2.49l.1,0A6.72,6.72,0,0,1,94.46,171Z"/>
-                <path class="cls-327"
-                      d="M94.09,120.41a1.36,1.36,0,0,1-.21,1.08,12.58,12.58,0,0,1-1.49-2c.71-1.2.79-1.73.88-1.54A15.89,15.89,0,0,0,94.09,120.41Z"/>
-                <path class="cls-330" d="M94.05,168.51l-.1,0c0-.06,0-.09,0-.09S94,168.43,94.05,168.51Z"/>
-                <path class="cls-329"
-                      d="M94,168.48A15.13,15.13,0,0,1,94,171a6.57,6.57,0,0,1-2.39,4.75,17.38,17.38,0,0,1-5,2.58c-.73.26-1.35.44-1.8.58l-.28.08h0a4.65,4.65,0,0,1-.41-.26l-.61-.42c-.32-.24-.75-.54-1.11-.85-.75-.58-1.59-1.38-2.38-2.07,0,.93,0,1.85,0,2.77l-1.43-3L78,173.62l-1,1.31-1.06,1.37-.15.18s-.06.1-.06,0l0-.11-.1-.53c-.25-1.13-.49-2.24-.74-3.35-.12-.55-.24-1.09-.37-1.65l-.17-.82a8.06,8.06,0,0,0-.28-1c-.14-.29-.48-1.41-.86-2.66.4.08.87.14,1.39.19a11.28,11.28,0,0,0,2.78,0,10.69,10.69,0,0,0,3-1,5.54,5.54,0,0,0,2.2-1.54,7,7,0,0,0,1-1.64c.15-.43.28-.82.41-1.18.24-.69.43-1.27.56-1.7.3.58.52.93.53,1s.37.58.93,1.36a27.38,27.38,0,0,0,2.17,2.74,13.23,13.23,0,0,0,2.61,2.33,3.94,3.94,0,0,0,1.4.66l.33.41h0a2,2,0,0,0,.57.22C93.31,168.29,93.6,168.37,94,168.48Z"/>
-                <path class="cls-327"
-                      d="M94,5.32l-.2.06-.66.23-.71.28-.5.22a12.64,12.64,0,0,0-1.73-.17,4.65,4.65,0,0,0-.63,0h-.19l.21-2,0,0c.09,0,.35.09.83.24s1.46.44,2.66.86C93.36,5.09,93.66,5.19,94,5.32Z"/>
-                <path class="cls-327"
-                      d="M89.42,106.05l0,0-.06-.88c0-.67-.09-1.32-.14-2h.08l.23,2.07.46-.13c.18,1.29.41,2.6.68,3.92a43.42,43.42,0,0,0,1.35,5,1.45,1.45,0,0,0-.46-.24c-.19-.06-.33,0-.31.06s.12,0,.22.14.23.26.38.42a1.52,1.52,0,0,0,.44.37c.13.36.27.71.43,1.07,0,0,0,0,0,0a.09.09,0,0,0,.06,0,11,11,0,0,0,.49,1.11l.32.64-.24.12c-.09-.19-.17.34-.88,1.54-.3-.5-.57-1-.82-1.51a37.18,37.18,0,0,1-2.85-8.44c-.1-.4-.18-.81-.26-1.2a1.89,1.89,0,0,0,.84-.76,1.64,1.64,0,0,0,.18-.8,1.34,1.34,0,0,0-.06-.4l0-.11,0-.09v0h0a.09.09,0,0,1,0,0v-.08Z"/>
-                <path class="cls-327"
-                      d="M93.88,121.49a5.81,5.81,0,0,1-.55,1c-.08-.55,0-1.14-.25-1.29s-1,.35-1.34,1.25a2.77,2.77,0,0,0-.17,1.44,2.46,2.46,0,0,0,.1.49l0,0-1.16,1.09a3.18,3.18,0,0,1-.63-.47,1.17,1.17,0,0,1-.2-.21l-.79-.86,0,0c.09-.11.2-.22.3-.33.53-.51.85-.8.92-.88a22.52,22.52,0,0,0,2.36-3.22A12.58,12.58,0,0,0,93.88,121.49Z"/>
-                <path class="cls-327"
-                      d="M93.14,114.72a.91.91,0,0,1,.3.74A.67.67,0,0,1,93,116a.59.59,0,0,1-.25,0,.13.13,0,0,1,0-.08c.1-.1.41-.27.35-.51a.38.38,0,0,0-.23-.29.93.93,0,0,0-.17-.09,1.84,1.84,0,0,1-.38-.18c-.09-.25-.19-.5-.27-.75a.41.41,0,0,0,.11.07,2.15,2.15,0,0,0,.73.32A1.13,1.13,0,0,1,93.14,114.72Z"/>
-                <path class="cls-327"
-                      d="M92.36,129.13c.57.41,1,.62,1,.77s-.57.24-1.32.06a8.21,8.21,0,0,1-1.22-.4l-.67-.3a4.22,4.22,0,0,1-.71-.41,3.12,3.12,0,0,1-1.09-1.33l2.18-2.07.07,0,0,0a.56.56,0,0,0-.09.13,2.38,2.38,0,0,0-.29.54,1.34,1.34,0,0,0,.23,1.46c.11.12.27.26.45.42s.35.28.52.41C91.75,128.69,92.08,128.93,92.36,129.13Z"/>
-                <path class="cls-327"
-                      d="M93.08,121.15c.21.15.17.74.25,1.29a12.66,12.66,0,0,1-1.66,1.89,2.46,2.46,0,0,1-.1-.49,2.77,2.77,0,0,1,.17-1.44C92.09,121.5,92.82,120.93,93.08,121.15Z"/>
-                <path class="cls-331" d="M92.67,116a.13.13,0,0,0,0,.08.09.09,0,0,1-.06,0S92.65,116,92.67,116Z"/>
-                <path class="cls-327"
-                      d="M92.39,77.55c-.54.15-1.09.3-1.64.47-.36.1-.73.22-1.09.34l-1-.42c.57-.25,1.17-.48,1.78-.7.22-.08.45-.17.68-.24h0Z"/>
-                <path class="cls-327"
-                      d="M92,114.13c.08.25.18.5.27.75a1.52,1.52,0,0,1-.44-.37c-.15-.16-.28-.33-.38-.42s-.21-.1-.22-.14.12-.12.31-.06A1.45,1.45,0,0,1,92,114.13Z"/>
-                <path class="cls-327"
-                      d="M84.75,158.75s-.14.21-.32.58l-.16-.34a11.33,11.33,0,0,1-.92-3.46.86.86,0,0,1,0-.16c.22-.13.31-.23.29-.26a1.74,1.74,0,0,0-.3.13,9.06,9.06,0,0,1,.66-4.7h0a24.7,24.7,0,0,0,.17,4.86,11,11,0,0,0,1.07,3.12,14,14,0,0,0,.83,1.34l.83,1.4c.5.8,1.16,1.84,1.91,2.81a16.63,16.63,0,0,0,2.24,2.49c.67.6,1.21.92,1.17,1s0,0,0,0a3.94,3.94,0,0,1-1.4-.66,13.23,13.23,0,0,1-2.61-2.33A27.38,27.38,0,0,1,86,161.85c-.56-.78-.91-1.33-.93-1.36s-.23-.38-.53-1A3.16,3.16,0,0,0,84.75,158.75Z"/>
-                <path class="cls-327"
-                      d="M91.9,6.11l-.9.38c-.92.42-1.8.86-2.66,1.32a37.51,37.51,0,0,0-4.43,2.82L83.5,11a1.2,1.2,0,0,0-.38.15,5.22,5.22,0,0,0-.82.6,2.88,2.88,0,0,0-.11-1.86c.16-.19.33-.38.51-.56A27.7,27.7,0,0,1,87,5.6a29.15,29.15,0,0,1,2.6-1.7l-.21,2h.19a4.65,4.65,0,0,1,.63,0A12.64,12.64,0,0,1,91.9,6.11Z"/>
-                <path class="cls-327"
-                      d="M91.17,77c-.23.07-.46.16-.68.24-.61.22-1.21.45-1.78.7l-1.42-.64c-3-1.34-5.8-2.66-8.18-3.87-1.18-.63-2.28-1.2-3.24-1.77S74,70.51,73.4,70.09l-2.2-1.46L67,65.83C65.68,65,64.17,64,62.5,62.9a12.63,12.63,0,0,1-1.07-.78l-.4-.46c-.12-.16-.18-.31-.27-.45s0-.37.06-.5.06-.32.23-.49a2.13,2.13,0,0,1,.48-.46,7.24,7.24,0,0,1,.61-.42c1-.61.72-.43.86-.5l.26-.13L63,58.6l-.09,0-.32-.1-1-.3-6.06-1.75c1.53-1,3.06-2,4.6-3l1.5-1,.37-.24.14-.08.27-.16.28-.17s-.16-.08-.24-.12l-.29-.14-.47-.2-.79-.33a5.15,5.15,0,0,1-.55-.24,1.91,1.91,0,0,1-.49-.4A1.65,1.65,0,0,1,60,48.18a14.53,14.53,0,0,0,3.31-5.33,29.76,29.76,0,0,0,1.4-5,28,28,0,0,0,.45-4l.29.25h0A19.5,19.5,0,0,1,65.38,38a27.19,27.19,0,0,1-1.14,5.21,17.61,17.61,0,0,1-1.24,3,12.81,12.81,0,0,1-.91,1.48c-.17.24-.34.49-.54.72l-.29.35L61,49a.45.45,0,0,0,0,.66.38.38,0,0,0,.15.09l.23.08.79.31,2.46.92.67.26.33.13.18.07.08,0-.06,0-1.18.79C63.4,53.17,62.18,54,61,54.83l-.74.49-.26.19-.35.26.57.13,1.84.47,6.4,1.74-2.85,1.57-1.35.78-.5.3-.15.11h0s-.12.07-.1.12l.22.13,4.49,2.8c2.58,1.6,4.2,2.66,4.34,2.75l2.21,1.53c.69.48,1.37,1,2.3,1.53s1.95,1.15,3.11,1.77c2.31,1.25,5,2.62,8,4Z"/>
-                <path class="cls-327"
-                      d="M91.36,89.61c-.2.51-.39,1-.56,1.61a5.12,5.12,0,0,1-1.31-.6l1.44-1.5A1.48,1.48,0,0,0,91.36,89.61Z"/>
-                <path class="cls-327"
-                      d="M90.53,88.18c0,.1-.57.58-1.47,1.29.1-.34.23-.66.34-1C90.05,88.21,90.48,88.08,90.53,88.18Z"/>
-                <path class="cls-327"
-                      d="M89.85,125a3.18,3.18,0,0,0,.63.47l-2.18,2.07a1.72,1.72,0,0,1-.07-.21,3.48,3.48,0,0,1-.1-1.7,5.13,5.13,0,0,1,.34-1.08c.06-.13.11-.22.14-.3l0,0,.08-.1a.79.79,0,0,1,.14-.18l.79.86A1.17,1.17,0,0,0,89.85,125Z"/>
-                <path class="cls-327"
-                      d="M89.82,95.68a16.9,16.9,0,0,0-.21,1.91,6.81,6.81,0,0,1-1.83-1.14l1.59-1.34A2,2,0,0,0,89.82,95.68Z"/>
-                <path class="cls-327" d="M89.73,103.23c0,.64.13,1.28.21,1.93l-.46.13-.23-2.07h.48Z"/>
-                <path class="cls-327"
-                      d="M88.71,77.94l1,.42A31.27,31.27,0,0,0,86,79.8,14.08,14.08,0,0,0,84,81c-.1-.07.54-.84,1.77-1.57A22.26,22.26,0,0,1,88.71,77.94Z"/>
-                <path class="cls-327"
-                      d="M87.27,131.26c1,1.15,2.49,1.91,2.36,2.23s-1.86.11-3.45-1A6.13,6.13,0,0,1,84.66,131c.56-.55,1.1-1.06,1.61-1.55a1.39,1.39,0,0,0,.06.19A4.52,4.52,0,0,0,87.27,131.26Z"/>
-                <path class="cls-331" d="M89.59,3.88l0,0v0Z"/>
-                <path class="cls-327"
-                      d="M89.48,106.73a1.64,1.64,0,0,1-.18.8,1.89,1.89,0,0,1-.84.76c-.09-.47-.18-.93-.26-1.39a.22.22,0,0,0,0-.12s0,0,0-.07l.25-.14.06,0h0l.09,0h0l0,0,.06,0,0,0,.07,0,.24-.11a0,0,0,0,1,0,0l.21-.1v0l0,.09,0,.11A1.34,1.34,0,0,1,89.48,106.73Z"/>
-                <path class="cls-330" d="M89.42,106.05l0,0h0Z"/>
-                <path class="cls-327"
-                      d="M89.4,88.5c-.11.31-.24.63-.34,1-.48.36-1,.8-1.62,1.28-.84.67-1.73,1.41-2.52,2.11l-1.07,1-.45.44-.19.2c-.06.06-.15.14-.12.13s0,0,0,.11a3.3,3.3,0,0,0,.12.37,4.36,4.36,0,0,0,.48.93c.44.69,1.64,1.5,2.54,2.72a5.5,5.5,0,0,1,.94,2,7.79,7.79,0,0,1,.19,1.81c0,.26,0,.5,0,.72s0,.21-.06.32a.58.58,0,0,1,0,.16.93.93,0,0,1,0,.1h0l-.19-.17h0s0,0,0-.06h0l-.06,0-.09-.08c0-.07,0-.13,0-.22s-.09-.41-.14-.66a5.93,5.93,0,0,0-1.4-3.09c-.83-.9-2-1.54-2.86-2.49a5.89,5.89,0,0,1-.79-1.26,3.18,3.18,0,0,1-.23-.62,1.71,1.71,0,0,1-.07-.45,1.45,1.45,0,0,1,.43-1.19,2.84,2.84,0,0,0,.26-.24l.23-.19.51-.42c.38-.3.78-.61,1.22-.93.88-.63,1.87-1.29,2.8-1.86A23.46,23.46,0,0,1,89.4,88.5Z"/>
-                <path class="cls-330" d="M89.37,106.08v.08a.09.09,0,0,0,0,0h0Z"/>
-                <path class="cls-327"
-                      d="M89.37,106.07h0l0,0-.21.11a0,0,0,0,0,0,0l-.24.11-.07,0,0,0-.06,0,0,0h0l-.09,0h0l-.06,0-.25.08h0a2.32,2.32,0,0,1-.08-.3,0,0,0,0,1,0,0l-.12-1c-.06-.67-.14-1.34-.21-2-.1-1.14-.22-2.24-.31-3.28a22.72,22.72,0,0,1,0-2.75c.07.12.17.24.25.37l.48.65.25.35.41.52c.09,1.28.17,2.63.26,4v0c0,.65.1,1.3.14,2Z"/>
-                <path class="cls-330" d="M89.34,106.1h0l-.21.1Z"/>
-                <path class="cls-327"
-                      d="M88.27,92.8l1,1.45-1.56,1c.06-.5.14-1,.23-1.48,0-.28.1-.56.16-.84h0A.7.7,0,0,0,88.27,92.8Z"/>
-                <path class="cls-329"
-                      d="M89.06,89.47a28,28,0,0,0-1,3.44h0l-1.73,1.16-.47.32c-.33.23-.75.44-.86.8a1.62,1.62,0,0,0,.11,1.21c.1.24.15.3.22.45l.2.34a14.89,14.89,0,0,0,.93,1.36c.17.22.35.45.52.69l.27.34.13.15,0,0,0,.27c0,.41,0,.83,0,1.25.07,1.12.19,2.25.34,3.4h0a.81.81,0,0,0-.19-.41,2.94,2.94,0,0,0-.44-.42h0a.93.93,0,0,0,0-.1.58.58,0,0,0,0-.16c0-.11.05-.21.06-.32s0-.46,0-.72a7.79,7.79,0,0,0-.19-1.81,5.5,5.5,0,0,0-.94-2c-.9-1.22-2.1-2-2.54-2.72a4.36,4.36,0,0,1-.48-.93,3.3,3.3,0,0,1-.12-.37c0-.1,0-.09,0-.11s.06-.07.12-.13l.19-.2.45-.44,1.07-1c.79-.7,1.68-1.44,2.52-2.11C88,90.27,88.58,89.83,89.06,89.47Z"/>
-                <path class="cls-327"
-                      d="M88.81,123.87l0,0a.79.79,0,0,0-.14.18l-.08.1,0,0c0,.08-.08.17-.14.3a5.13,5.13,0,0,0-.34,1.08,3.48,3.48,0,0,0,.1,1.7,1.72,1.72,0,0,0,.07.21l-.75.71c-.4.38-.83.79-1.28,1.2,0-.16-.07-.31-.11-.44a1.74,1.74,0,0,0-.16-.46l-1.37.75-.23.12-.29.15-.17.06h0l-.11-.09C85.48,127.62,87.13,125.71,88.81,123.87Z"/>
-                <path class="cls-327"
-                      d="M88.2,106.9c.08.46.17.92.26,1.39l-.34.12a4.8,4.8,0,0,1-1.16.15,15.94,15.94,0,0,1-2.09-.15,8.45,8.45,0,0,1-2-.5,2.68,2.68,0,0,1-1.63-1.48,2,2,0,0,1,0-1.13c.1-.35.21-.56.31-.84a12.44,12.44,0,0,1,.71-1.52,2.59,2.59,0,0,1,.53-.64c.22-.2.35-.28.58-.49a3.65,3.65,0,0,1,.64-.49c.19-.09.43-.2.62,0,.29.3.26.77.36,1.12,0,.18.07.29.09.44a.53.53,0,0,1-.06.37,1.65,1.65,0,0,0-.41.14c0-.07.11-.13.18-.21s0-.34-.13-.6-.08-.48-.26-.69-.28,0-.38.13a3.4,3.4,0,0,0-.32.34c-.1.1-.34.3-.47.44a2.58,2.58,0,0,0-.38.52c-.2.42-.37.94-.56,1.46-.07.25-.2.56-.24.79a1,1,0,0,0,0,.62,1.9,1.9,0,0,0,1.15.85,7.58,7.58,0,0,0,1.79.35,13.6,13.6,0,0,0,1.92,0c.58,0,1.23-.22,1.26-.44A.07.07,0,0,0,88.2,106.9Z"/>
-                <path class="cls-330" d="M88.21,106.65l.25-.08-.25.14v0h0Z"/>
-                <path class="cls-330"
-                      d="M88.21,106.71s0,.05,0,.07a.22.22,0,0,1,0,.12c0-.18-.07-.37-.09-.55a2.32,2.32,0,0,0,.08.3h0Z"/>
-                <path class="cls-329"
-                      d="M88.11,106.35c0,.18.06.37.09.55a.07.07,0,0,1,0,0c0,.22-.68.43-1.26.44a13.6,13.6,0,0,1-1.92,0,7.58,7.58,0,0,1-1.79-.35,1.9,1.9,0,0,1-1.15-.85,1,1,0,0,1,0-.62c0-.23.17-.54.24-.79.19-.52.36-1,.56-1.46a2.58,2.58,0,0,1,.38-.52c.13-.14.37-.34.47-.44A3.4,3.4,0,0,1,84,102c.1-.09.26-.22.38-.13s.15.48.26.69.21.48.13.6-.13.14-.18.21l-.08,0a1.81,1.81,0,0,0-1,.66.77.77,0,0,0,0,.61.88.88,0,0,0,.21.36,1.35,1.35,0,0,0,.24.25s.18,0,.27-.16.13-.27.09-.3a1.52,1.52,0,0,1-.17-.15c-.09-.12-.18-.25-.12-.37s.35-.31.67-.47a3,3,0,0,1,1-.31,1.48,1.48,0,0,1,1,.34,8.29,8.29,0,0,1,.78.59c.43.38.14.83.22.83s.08-.07.13-.25a.66.66,0,0,0,0-.32h0c.08.55.16,1.1.26,1.65A0,0,0,0,0,88.11,106.35Z"/>
-                <path class="cls-330"
-                      d="M88,105.3l.12,1c-.1-.55-.18-1.1-.26-1.65-.15-1.15-.27-2.28-.34-3.4,0-.42,0-.84,0-1.25.09,1,.21,2.14.31,3.28C87.85,104,87.93,104.63,88,105.3Z"/>
-                <path class="cls-327"
-                      d="M88.1,92.92c-.06.28-.11.56-.16.84-.09.48-.17,1-.23,1.48l-.49.31c-.16.09-.31.2-.49.3h0s0,0,0,0l.09.21.16.28c.17.29.35.58.56.9a22.72,22.72,0,0,0,0,2.75l0-.27,0,0-.13-.15L87,99.25c-.17-.24-.35-.47-.52-.69a14.89,14.89,0,0,1-.93-1.36l-.2-.34c-.07-.15-.12-.21-.22-.45A1.62,1.62,0,0,1,85,95.2c.11-.36.53-.57.86-.8l.47-.32Z"/>
-                <path class="cls-327"
-                      d="M87.84,104.68a.66.66,0,0,1,0,.32c0,.18-.12.25-.13.25s.21-.45-.22-.83a8.29,8.29,0,0,0-.78-.59,1.48,1.48,0,0,0-1-.34,3,3,0,0,0-1,.31c-.32.16-.62.33-.67.47s0,.25.12.37a1.52,1.52,0,0,0,.17.15s0,.17-.09.3-.22.2-.27.16a1.35,1.35,0,0,1-.24-.25.88.88,0,0,1-.21-.36.77.77,0,0,1,0-.61,1.81,1.81,0,0,1,1-.66l.08,0c-.15.14-.27.21-.24.25s.25,0,.61-.34l0,0a2.3,2.3,0,0,1,.71-.12,1.75,1.75,0,0,1,1,.36.28.28,0,0,0,0,.13.56.56,0,0,0,0,.15s0,.16.28.22a.28.28,0,0,0,.17-.09,2.94,2.94,0,0,1,.44.42A.81.81,0,0,1,87.84,104.68Z"/>
-                <path class="cls-327" d="M87.32,142.58a1.67,1.67,0,0,1,.46-.06,1.46,1.46,0,0,1-.62.28Z"/>
-                <path class="cls-327"
-                      d="M87.32,142.58l-.16.22a7.6,7.6,0,0,1-1.23.26,12.34,12.34,0,0,1-4.25-.21,6.15,6.15,0,0,1-2.2-.89A5.29,5.29,0,0,1,78,140.43a5.38,5.38,0,0,1-.59-1.29l.43-.55a2.88,2.88,0,0,0,.22-.27,4.69,4.69,0,0,0,.6,1.71,4.65,4.65,0,0,0,1.22,1.36,5.54,5.54,0,0,0,1.92.88,13.88,13.88,0,0,0,4.1.47A9.23,9.23,0,0,0,87.32,142.58Z"/>
-                <path class="cls-327"
-                      d="M87,103.68l.19.17a.28.28,0,0,1-.17.09c-.29-.06-.23-.17-.28-.22a.56.56,0,0,1,0-.15.28.28,0,0,1,0-.13l.17.11v.07s0,0,0,0,.06,0,.06,0A0,0,0,0,1,87,103.68Z"/>
-                <path class="cls-330" d="M87.05,103.61s0,0,0,.06l-.12-.1h0v-.08l.09.08.06,0Z"/>
-                <path class="cls-330" d="M87,103.67h0a0,0,0,0,0,0,0s0,0-.06,0,0,0,0,0v-.05h0Z"/>
-                <path class="cls-327" d="M86.89,103.53v0l-.17-.11s0,0,0,0,.07,0,.14.07h0Z"/>
-                <path class="cls-328"
-                      d="M85.93,143.06a7.6,7.6,0,0,0,1.23-.26,18.5,18.5,0,0,0-1.77,2.69,10.64,10.64,0,0,0-.63,1.34c-.36.08-.92.23-1.62.36a11.08,11.08,0,0,1-4.54.05,6.1,6.1,0,0,1-3.65-2.4,6,6,0,0,1-.65-1.17c.25-.46.52-.91.8-1.34.74-1.12,1.53-2.18,2.32-3.19a5.38,5.38,0,0,0,.59,1.29A5.29,5.29,0,0,0,79.48,142a6.15,6.15,0,0,0,2.2.89A12.34,12.34,0,0,0,85.93,143.06Z"/>
-                <path class="cls-327"
-                      d="M86.16,129c0,.13.07.28.11.44-.51.49-1,1-1.61,1.55a4.09,4.09,0,0,1-.29-.48,6.43,6.43,0,0,1-.38-.79l0-.09h0l.17-.06.29-.15.23-.12,1.37-.75A1.74,1.74,0,0,1,86.16,129Z"/>
-                <path class="cls-327"
-                      d="M85.76,136.28c.11.16-.32.48-.94.46a4.43,4.43,0,0,1-2.13-.61,5.25,5.25,0,0,1-1.55-1.43c.55-.61,1.09-1.2,1.61-1.75a4.9,4.9,0,0,0,.17.55,4.22,4.22,0,0,0,.78,1.32,6.1,6.1,0,0,0,1.31,1C85.41,136.1,85.69,136.15,85.76,136.28Z"/>
-                <path class="cls-327"
-                      d="M85.85,179.75l-.66.22-.74.24c-.07,0-.15,0-.23-.11s-.1-.25-.22-.36a.28.28,0,0,1,0-.42c0-.13.08-.21.16-.23l.45-.13h0C85,179.24,85.41,179.5,85.85,179.75Z"/>
-                <path class="cls-327"
-                      d="M84.76,146.83a1.49,1.49,0,0,1,.45-.1,1.4,1.4,0,0,1-.54.28A.76.76,0,0,1,84.76,146.83Z"/>
-                <path class="cls-327" d="M85,103.2l0,0c-.36.35-.59.35-.61.34s.09-.11.24-.25A1.65,1.65,0,0,1,85,103.2Z"/>
-                <path class="cls-327"
-                      d="M84.76,146.83a.76.76,0,0,0-.09.18,11.5,11.5,0,0,1-1.44.5,10.79,10.79,0,0,1-4.74.31,6.63,6.63,0,0,1-4.16-2.51,5.53,5.53,0,0,1-.5-.77c.14-.29.3-.59.47-.87a6,6,0,0,0,.65,1.17,6.1,6.1,0,0,0,3.65,2.4,11.08,11.08,0,0,0,4.54-.05C83.84,147.06,84.4,146.91,84.76,146.83Z"/>
-                <path class="cls-327"
-                      d="M84.75,158.75a3.16,3.16,0,0,1-.21.78l-.11-.2C84.61,159,84.71,158.74,84.75,158.75Z"/>
-                <path class="cls-327"
-                      d="M84.43,159.33l.11.2c-.13.43-.32,1-.56,1.7-.13.36-.26.75-.41,1.18a7,7,0,0,1-1,1.64,5.54,5.54,0,0,1-2.2,1.54,10.69,10.69,0,0,1-3,1,11.28,11.28,0,0,1-2.78,0c-.52-.05-1-.11-1.39-.19l-.27-.89c.44.1,1,.22,1.74.31a11.17,11.17,0,0,0,2.61.06,10.22,10.22,0,0,0,2.85-.82,6.13,6.13,0,0,0,2.41-1.65,4.89,4.89,0,0,0,.69-1.13l.48-1.17Z"/>
-                <path class="cls-327"
-                      d="M84.37,130.5a4.09,4.09,0,0,0,.29.48c-.49.47-1,1-1.51,1.53l-.4.44a1,1,0,0,0,0-.15,3.23,3.23,0,0,0-1.14.28,3.76,3.76,0,0,0-1.07.48,5.7,5.7,0,0,0,.51,1l.13.18c-1,1.12-2,2.32-3.07,3.62a.18.18,0,0,1,0,0,.44.44,0,0,0-.47-.31.39.39,0,0,0-.36.46,4.27,4.27,0,0,0,.19.72c-.79,1-1.58,2.07-2.32,3.19-.28.43-.55.88-.8,1.34a.45.45,0,0,0-.06-.14,4.14,4.14,0,0,1-.18-.57.34.34,0,0,0-.17-.22s0,0,0,0h0c.27-.61.56-1.23.85-1.82,0-.07.1-.13.15-.21.66-.95,1.24-2,1.82-3l1.45-2.12c.77-.85,1.54-1.7,2.35-2.52,1.15-1.15,2.25-2.37,3.34-3.58l.11.09h0l0,.09A6.43,6.43,0,0,0,84.37,130.5Z"/>
-                <path class="cls-328"
-                      d="M84.27,159l.16.34-.76,1.77-.48,1.17a4.89,4.89,0,0,1-.69,1.13,6.13,6.13,0,0,1-2.41,1.65,10.22,10.22,0,0,1-2.85.82,11.17,11.17,0,0,1-2.61-.06c-.71-.09-1.3-.21-1.74-.31-.43-1.46-.87-2.87-1-3.21l-.23-.61h0a21.58,21.58,0,0,1-.73-5.15c0-.48,0-1,0-1.47a4.23,4.23,0,0,0,.73.62,7.38,7.38,0,0,0,5,1.31,27.07,27.07,0,0,0,4.94-.9,7.08,7.08,0,0,0,1.76-.71.86.86,0,0,0,0,.16A11.33,11.33,0,0,0,84.27,159Z"/>
-                <path class="cls-329"
-                      d="M84,150v.53a9.06,9.06,0,0,0-.66,4.7l-.27.1a12.24,12.24,0,0,1-1.56.43,34.12,34.12,0,0,1-4.9.62,6.85,6.85,0,0,1-4.49-1.34A5.67,5.67,0,0,1,71,153.89a9.56,9.56,0,0,1,.27-1.72,48,48,0,0,1,1.56-5.44c.32-.76.65-1.48,1-2.19a5.53,5.53,0,0,0,.5.77,6.63,6.63,0,0,0,4.16,2.51,10.79,10.79,0,0,0,4.74-.31,11.5,11.5,0,0,0,1.44-.5A6.35,6.35,0,0,0,84,150Z"/>
-                <rect class="cls-331" x="83.93" y="129.61" width="0.01" height="0.01"/>
-                <path class="cls-327" d="M83.63,155.11s-.07.13-.29.26a.3.3,0,0,1,0-.13A1.74,1.74,0,0,1,83.63,155.11Z"/>
-                <path class="cls-327"
-                      d="M83.33,155.24a.3.3,0,0,0,0,.13,7.08,7.08,0,0,1-1.76.71,27.07,27.07,0,0,1-4.94.9,7.38,7.38,0,0,1-5-1.31,4.23,4.23,0,0,1-.73-.62c0-.39,0-.79.06-1.16a5.67,5.67,0,0,0,1.13,1.16,6.85,6.85,0,0,0,4.49,1.34,34.12,34.12,0,0,0,4.9-.62,12.24,12.24,0,0,0,1.56-.43Z"/>
-                <path class="cls-327"
-                      d="M82.71,132.8a1,1,0,0,1,0,.15c-.52.55-1.06,1.14-1.61,1.75l-.13-.18a5.7,5.7,0,0,1-.51-1,3.76,3.76,0,0,1,1.07-.48A3.23,3.23,0,0,1,82.71,132.8Z"/>
-                <path class="cls-327"
-                      d="M82.19,9.84a2.88,2.88,0,0,1,.11,1.86,12.93,12.93,0,0,0-1,1L81,13c-.16.18-.32.35-.5.52l-.08,0a.45.45,0,0,1-.21-.27.43.43,0,0,1,0-.2,1.88,1.88,0,0,1,.14-.48A11.17,11.17,0,0,1,82.19,9.84Z"/>
-                <path class="cls-331" d="M82.3,11.7h0c-.34.3-.66.62-1,1A12.93,12.93,0,0,1,82.3,11.7Z"/>
-                <path class="cls-327"
-                      d="M81.84,9.55a.52.52,0,0,1,.35.29,11.17,11.17,0,0,0-1.85,2.71,1.88,1.88,0,0,0-.14.48.43.43,0,0,0,0,.2.45.45,0,0,0,.21.27l.08,0-.38.4-1.76-.45c-1.44-.36-3.49-.87-5.9-1.29a23.57,23.57,0,0,0-3.69-.42c-1.32,0-2.83.17-4.35.34s-3.12.43-4.7.72l-1.17.24-1,.22a.76.76,0,0,0-.33.12.79.79,0,0,0-.14.34v.11a2,2,0,0,0,0,.25c0,.19,0,.36,0,.55,0,.37,0,.75,0,1.14a22.48,22.48,0,0,0,.31,2.31c.14.77.33,1.52.53,2.25.12.36.23.72.36,1.06l.08.23,0,.06.06.13.27.51a58.16,58.16,0,0,0,4.4,7.18c3.13,3.8,5.32,6.42,5.07,6.66s-1.15-.62-2.77-2h0a2.61,2.61,0,0,0-.21-1s-.06.26-.08.73c-1-.86-2.12-1.93-3.41-3.19a47.34,47.34,0,0,1-5.26-7l-.33-.5L56.08,23a1.39,1.39,0,0,1-.11-.21l-.15-.33c-.19-.4-.34-.79-.51-1.2a25.72,25.72,0,0,1-.78-2.49q-.33-1.28-.54-2.61c-.06-.45-.11-.91-.14-1.37,0-.23,0-.48,0-.72s0-.25,0-.37,0-.36,0-.52a3.89,3.89,0,0,1,.65-2,3.3,3.3,0,0,1,1.73-1.1l.49-.18L57,9.82l.64-.19L59,9.3c1.66-.42,3.3-.75,4.9-1s3.16-.5,4.75-.61a26.51,26.51,0,0,1,4.49.25c2.64.35,4.77.78,6.29,1.1S81.78,9.53,81.84,9.55Z"/>
-                <path class="cls-327"
-                      d="M78.06,138.27a.18.18,0,0,0,0,0,2.88,2.88,0,0,1-.22.27l-.43.55a4.27,4.27,0,0,1-.19-.72.39.39,0,0,1,.36-.46A.44.44,0,0,1,78.06,138.27Z"/>
-                <path class="cls-327"
-                      d="M76.93,17.46c.08.14-1.07,1-2.07,2.1a17,17,0,0,0-1.3,1.51c-.34.43-.54.75-.56.76l-.57.74a10.19,10.19,0,0,0-1,1.68c-.68,1.27-.81,2.72-1,2.72s-.18-.36-.17-.94a6.84,6.84,0,0,1,.37-2.09,11.32,11.32,0,0,1,.88-2c.3-.5.53-.84.54-.85s.27-.34.68-.76A14,14,0,0,1,74.19,19h0l1-.32c.65-.22,1-.7.93-1C76.58,17.51,76.9,17.4,76.93,17.46Z"/>
-                <path class="cls-330" d="M76.14,17.74c.11.27-.28.75-.93,1l-1,.32.1-.08A11.7,11.7,0,0,1,76.14,17.74Z"/>
-                <path class="cls-327"
-                      d="M76.12,17.71l0,0A11.7,11.7,0,0,0,74.3,19l-.1.08h0c-.13,0-.21,0-.23,0a2.62,2.62,0,0,0-.17-.28,2.36,2.36,0,0,0-.71-.58,6,6,0,0,0-3.4-.49c-3.05.18-6-.18-6-.48s2.94-.69,5.75-1.3a7.6,7.6,0,0,1,4.63.15A4.55,4.55,0,0,1,76.12,17.71Z"/>
-                <path class="cls-327"
-                      d="M74.24,143.53a.45.45,0,0,1,.06.14c-.17.28-.33.58-.47.87a5.37,5.37,0,0,1-.4-.8c.07-.16.12-.3.18-.46a.08.08,0,0,0,0,0c.07-.17.16-.33.23-.5,0,0,0,0,0,0a.34.34,0,0,1,.17.22A4.14,4.14,0,0,0,74.24,143.53Z"/>
-                <path class="cls-331" d="M73.86,142.73h0c-.07.17-.16.33-.23.5.07-.17.15-.33.22-.51Z"/>
-                <path class="cls-331" d="M73.61,143.28c-.06.16-.11.3-.18.46v0Z"/>
-                <path class="cls-327"
-                      d="M73.43,143.74a5.37,5.37,0,0,0,.4.8c-.37.71-.7,1.43-1,2.19a48,48,0,0,0-1.56,5.44,9.56,9.56,0,0,0-.27,1.72,4.53,4.53,0,0,1-.34-.51l0,0c.08-.54.16-1,.29-1.6A43.86,43.86,0,0,1,73.43,143.74Z"/>
-                <path class="cls-327" d="M72.89,165.5l.27.89-.17,0c-.08-.29-.15-.59-.21-.88Z"/>
-                <circle class="cls-329" cx="133.59" cy="46.47" r="1.44"/>
-                <circle class="cls-329" cx="111.44" cy="48.47" r="1.62"/>
-                <circle class="cls-329" cx="112.42" cy="51.01" r="0.33"/>
-                <circle class="cls-329" cx="132.16" cy="48.93" r="0.34"/>
-                <path class="cls-327"
-                      d="M114.87,76.69l.12,0a.52.52,0,0,0-.28-1h-.06a.5.5,0,0,0-.37.36v0a.52.52,0,0,0,1,.28v0l-.37.36H115l-.28-1-.12,0c-.61.24-.34,1.25.28,1Z"/>
-                <path class="cls-327" d="M114.5,82.5l0,0a.52.52,0,0,0,.74.74l0,0c.47-.47-.26-1.21-.73-.73Z"/>
-                <path class="cls-328"
-                      d="M161.13,157.38a2.56,2.56,0,0,1,0,.37l-.09.61c-.08.4-.1.82-.21,1.2a19.52,19.52,0,0,1-.7,2.37,21.56,21.56,0,0,1-5.46,8.36,27.55,27.55,0,0,1-8.61,5.65l-1.21.5-1.24.41c-.82.3-1.68.49-2.53.72-1.74.38-3.41.65-5.35,1l-5.64,2.22h0l0,0a31,31,0,0,1-6,2c-2.08.5-4.21.9-6.34,1.21-.85.12-1.72.24-2.58.34.23-.45.53-1,.89-1.69s.87-1.72,1.31-2.75a14.49,14.49,0,0,0,.57-1.65,15.06,15.06,0,0,0,.25-1.79,7,7,0,0,0-.45-3.54,7.56,7.56,0,0,0-1.89-2.41,5.52,5.52,0,0,0-1.18-.79,62.25,62.25,0,0,0,11.29-3.9c4.78-2.1,9.76-4.77,15.08-7.48,1.34-.67,2.68-1.36,4.07-2s2.78-1.37,4.21-1.92a15.93,15.93,0,0,1,4.48-1.12,7.11,7.11,0,0,1,6.16,2.3,9.55,9.55,0,0,1,.75.91Z"/>
-                <path class="cls-329"
-                      d="M155,12.84c0,.09.1,1.4,0,3.33a44.21,44.21,0,0,1-.84,7A52.23,52.23,0,0,1,152.32,30c-.62,1.84-1.11,3-.95,3.12s.07,0,.14-.09c0,.56,0,1.93-.06,3.29,0,.88-.1,1.78-.18,2.44s-.13,1.13-.13,1.16,0,.49-.14,1.15a19.46,19.46,0,0,1-.36,2.11c0-.15,0-.33,0-.53,0-.52,0-1.13-.07-1.86a14.08,14.08,0,0,0-.74-2.39A8.79,8.79,0,0,0,148.06,36a12,12,0,0,0-2.46-2.17,12.1,12.1,0,0,0-7-1.66,7.56,7.56,0,0,0-3.55,1.45,11.26,11.26,0,0,0-2.62,2.53,9.45,9.45,0,0,0-1.52,3.09c-.32,1-.55,2-.74,2.88-.75,3.59-1,6.06-1,6.21s-.28,2.62-.37,6.25a28.23,28.23,0,0,0,2.38,13.06l.21.4.26.5a1.05,1.05,0,0,0,1.2.56,2.87,2.87,0,0,0,.59-.12,3.3,3.3,0,0,0,.51-.27c.28-.17.51-.35.75-.51,1-.69,1.86-1.4,2.74-2.08,1.73-1.37,3.32-2.7,4.65-3.86,0,0,3.81-3.23,4.5-4.7a3.73,3.73,0,0,0,.16-.43l.68.83c.09.12.18.21.14.19a0,0,0,0,1,0,0h0c-.13.12-.33.27-.55.48a9.86,9.86,0,0,0-1.47,1.91c-.93,1.65-1.91,3.72-3.17,5.66a15.89,15.89,0,0,1-2.06,2.63A13.7,13.7,0,0,1,138,70.59a20,20,0,0,0-2.48,1.56l-.07,0s0,0,0,0a1.9,1.9,0,0,0-.59-.79c-.24-.14-.39-.07-.39,0s.13.09.24.23a2.34,2.34,0,0,1,.31.76c.1.38.2.85.28,1.36a7,7,0,0,0-2,1,6.65,6.65,0,0,0,2.09-.42c0,.22.05.44.07.66a3.93,3.93,0,0,1,0,.91c-.48.25-.76.46-.73.51s.26,0,.66-.12a5.92,5.92,0,0,1-.26.81H135c-1.14.33-2.16.88-2.1,1s.8,0,1.69-.15c-.19.29-.32.45-.32.48a11.77,11.77,0,0,1-.76,1,13.43,13.43,0,0,1-1.95,1.82,4.75,4.75,0,0,1-2.4.77c-.73,0-1.23,0-1.25.1s.48.27,1.24.35a5.16,5.16,0,0,0,1.87-.13l0,.11a9.5,9.5,0,0,0-.92.75,5.53,5.53,0,0,1-2.28,1,8.07,8.07,0,0,1-2.48.06l-.37-.07a4.32,4.32,0,0,0,1-.83,4.55,4.55,0,0,0,.73-1,1.76,1.76,0,0,0,.17-.43c-.11-.11-.45.53-1.21,1.15a6.93,6.93,0,0,1-3.25,1.45,12.54,12.54,0,0,1-3.63.2,7.52,7.52,0,0,1-1.64-.34l-.46-.14a5.79,5.79,0,0,1-1-.49c-.6-.43-1.37-1.09-2.16-1.78.71-.47,1.4-.93,1.93-1.21s1.17-.42,1.17-.51-.55-.13-1.34.09a18.57,18.57,0,0,0-2.38,1.09l-.07-.06-1.91-1.68,1.24-.4c2.65-.87,5.32-1.55,5.32-1.71s-.07,0-.19,0l.81-1.4a3.9,3.9,0,0,0,.51.06l.57,0a.7.7,0,0,0,.4-.07.37.37,0,0,0,.16-.44,1.51,1.51,0,0,0-.46-.65.64.64,0,0,0-.42-.19h0L116,73.7c1.78-.14,2.74-.72,2.65-.84.08.1,1.06-.78,2.31-2.61a22.5,22.5,0,0,0,3.48-8.37,26,26,0,0,0,.29-6,55.56,55.56,0,0,0-.51-6.52,21.08,21.08,0,0,0-2.06-6.68,15.57,15.57,0,0,0-4.65-5.32l0,0,0,0a16.47,16.47,0,0,0-9.8-3.59,49.93,49.93,0,0,0-8.62.94,29.69,29.69,0,0,0-5.93,1.72,23.7,23.7,0,0,0-2.31,1.16,28.42,28.42,0,0,0-2.65,1.87,46.2,46.2,0,0,0-5.55,5.36,48.35,48.35,0,0,0-3.17,4c-.25.37-.5.73-.75,1.11l-.56.82-.35.53-.18.26c-.06.08.1.16.15.25l.82,1,.51.59c.32.34.64.69,1,1.06a86.52,86.52,0,0,0,8.74,8.28,45.79,45.79,0,0,0,5,3.57L95,67c.45.23.9.46,1.35.67.9.43,1.78.8,2.65,1.19,3.47,1.51,6.75,2.87,9.65,3.8.62.2,1.23.39,1.81.53l-.69,2.53a31.53,31.53,0,0,0-4-.66,34.33,34.33,0,0,0-5.28-.12C99,75,98,75.13,98,75.15s-1,.16-2.46.53c-1.24.32-2.78.77-4.34,1.32h0L88.1,75.55c-2.94-1.42-5.67-2.79-8-4C79,70.89,77.91,70.3,77,69.74s-1.61-1-2.3-1.53L72.5,66.68c-.14-.09-1.76-1.15-4.34-2.75l-4.49-2.8L63.45,61s0-.08.1-.12h0l.15-.11.5-.3,1.35-.78,2.85-1.57L62,56.37l-1.84-.47-.57-.13.35-.26.26-.19.74-.49c1.22-.84,2.44-1.66,3.65-2.48l1.18-.79.06,0-.08,0-.18-.07-.33-.13L64.59,51l-2.46-.92-.79-.31-.23-.08a.38.38,0,0,1-.15-.09A.45.45,0,0,1,61,49l.26-.28.29-.35c.2-.23.37-.48.54-.72A12.81,12.81,0,0,0,63,46.14a17.61,17.61,0,0,0,1.24-3A27.19,27.19,0,0,0,65.38,38a19.5,19.5,0,0,0,.07-3.83c1.62,1.42,2.65,2.17,2.77,2s-1.94-2.86-5.07-6.66a58.16,58.16,0,0,1-4.4-7.18l-.27-.51-.06-.13,0-.06-.08-.23c-.13-.34-.24-.7-.36-1.06-.2-.73-.39-1.48-.53-2.25a22.48,22.48,0,0,1-.31-2.31c0-.39,0-.77,0-1.14,0-.19,0-.36,0-.55a2,2,0,0,1,0-.25v-.11a.79.79,0,0,1,.14-.34.76.76,0,0,1,.33-.12l1-.22,1.17-.24c1.58-.29,3.16-.53,4.7-.72s3-.31,4.35-.34a23.57,23.57,0,0,1,3.69.42c2.41.42,4.46.93,5.9,1.29l1.76.45.38-.4c.18-.17.34-.34.5-.52l.31-.33c.33-.34.65-.66,1-1h0a5.22,5.22,0,0,1,.82-.6A1.2,1.2,0,0,1,83.5,11l.41-.32a37.51,37.51,0,0,1,4.43-2.82c.86-.46,1.74-.9,2.66-1.32l.9-.38c.3,0,.62.09,1,.16a21.24,21.24,0,0,1,4.57,1.49,19.46,19.46,0,0,1,2.83,1.61c.49.33,1,.69,1.53,1.07l.81.6c.33.25.66.52,1,.83l.45.4a4,4,0,0,1,1.31.93c.19.28.07-.07.07-.2a4.32,4.32,0,0,1-.06-.47,1.33,1.33,0,0,1,0-.53c-.67-2.22-1.23-4.1-1.7-5.64-.24-.76-.45-1.43-.65-2,.59,0,1.16,0,1.7,0,1.57,0,2.89.15,3.82.23l1.6.14,1,.06.3.28a15.34,15.34,0,0,1,3.87,7.64c.06.33.11.64.14.76s0,0,0,0l.52,0v0c0-4,.15-6.72.31-8.44l1,0a12.42,12.42,0,0,0,1.36,0c.24,0,.5,0,.8,0s.52-.06.77-.1c.8-.14,1.58-.3,2.35-.45a6.1,6.1,0,0,1,.5.51A12,12,0,0,1,125,7.66a9.74,9.74,0,0,1,.43,1,9.15,9.15,0,0,1,.36,1.58c.08.53.15,1.09.23,1.67,0,.29.07.58.12.87l.06.45,0,.23c0,.07,0,0,0,0s.15-.46.27-.87A28.82,28.82,0,0,1,127.92,9a14.6,14.6,0,0,1,1.2-2.14,6.15,6.15,0,0,1,1.27-1.38,12.37,12.37,0,0,1,1.31-.85c.27-.16.51-.28.74-.39a27.09,27.09,0,0,1,3.83,1c1.52.5,2.88,1.1,4,1.53.89.33,1.64.59,2.18.74.64.7,1.14,1.21,1.5,1.55s.6.52.66.48-.06-.33-.33-.76l-.69-1.17.8,0H145l.33,0c.88-.08,1.84-.15,2.81-.28S150.07,7,151,7a5.19,5.19,0,0,1,2.43.4c1.17.59,1.39,2.28,1.49,3.41S155,12.79,155,12.84Zm-1.21-2a5.35,5.35,0,0,0-.17-1.51c0-.1-.43-.07-.88.13l-.5.21h0a10.4,10.4,0,0,0-2.27.68,20.47,20.47,0,0,1-2.33.87,4.6,4.6,0,0,1-.78.16l.89,1.28a2.15,2.15,0,0,1,.42-.63,5.32,5.32,0,0,1,2-1.32,3,3,0,0,1,2-.18,3.53,3.53,0,0,1,.05.38,8.5,8.5,0,0,1-.15,2.54c-.31,1.26-.63,2.56-.73,3.31a5.26,5.26,0,0,0-1.24-1.75,18.77,18.77,0,0,0,1,3.1c.26.75.47,1.52.61,2.11a9.74,9.74,0,0,1,.2,1c0,.06.11.44.17,1a14,14,0,0,1-.07,2.16,18.91,18.91,0,0,0-.18,3.25,9,9,0,0,0,1-3.13,11,11,0,0,0,.32-2.33A8.68,8.68,0,0,0,153,21s-.1-.47-.31-1.08a20.82,20.82,0,0,0-.88-2.14c-.1-.18-.19-.37-.28-.55a23.62,23.62,0,0,0,1.67-3.44A8.77,8.77,0,0,0,153.8,10.88ZM134.06,76.8a1.38,1.38,0,0,0,.09-.67.34.34,0,0,0-.09-.2c-.07-.05-.15,0-.21,0-.27.12-.4.21-.37.24-.11-.12-.22-.19-.26-.14a.68.68,0,0,0-.05.68.62.62,0,0,0,.41.41C133.8,77.2,134,77.05,134.06,76.8Zm-1.35-2.53a1,1,0,0,0,.37-.62.33.33,0,0,0-.06-.22.21.21,0,0,0-.22,0q-.45.15-.45.21c-.11-.11-.23-.19-.25-.16l-.11.14a.94.94,0,0,0-.23.43.34.34,0,0,0,.24.42A.82.82,0,0,0,132.71,74.27Zm-.37,3.6a1.23,1.23,0,0,0,.41-1.09,2.18,2.18,0,0,0-.43-1,3.33,3.33,0,0,0-.74-.71,2.58,2.58,0,0,0-1-.4,6.81,6.81,0,0,0-1.85,0l-.28.06-.19.06-.37.11-.3.08h-.2l-.21,0a1.55,1.55,0,0,0-.52-.07,5,5,0,0,0-.66.09,7.29,7.29,0,0,0-1.23.36,5.94,5.94,0,0,0-.64.31,4.36,4.36,0,0,0-1.4,1.12,3.63,3.63,0,0,0-.88,2.37,3.59,3.59,0,0,0,.33,1.4,1.74,1.74,0,0,0,1.28,1,3.33,3.33,0,0,0,1.46-.16,1.21,1.21,0,0,0,.55.33,3.19,3.19,0,0,0,1.61-.11,5.84,5.84,0,0,0,1.23-.48h0a1,1,0,0,0,.43.14,1.28,1.28,0,0,0,1-.33c.37-.37.64-.71.74-.79.09.07.06,0,.07,0v0a.06.06,0,0,0,0-.08.16.16,0,0,0-.1,0v0a.28.28,0,0,0,.22,0,1,1,0,0,0,.28-.14,1.23,1.23,0,0,0,.42-.54C131.56,78.34,131.78,78.27,132.34,77.87Zm-12.93,3.29a1,1,0,0,0-.45-.86,1.08,1.08,0,0,0-.85-.24c-.12-.11-.25-.16-.28-.11a4.07,4.07,0,0,0-.52.8,1,1,0,0,0,.12,1.1,1.31,1.31,0,0,0,2-.69ZM74.86,19.56c1-1.06,2.15-2,2.07-2.1s-.35.05-.79.28l0,0a4.55,4.55,0,0,0-2.05-1.64,7.6,7.6,0,0,0-4.63-.15c-2.81.61-5.75.9-5.75,1.3s2.94.66,6,.48a6,6,0,0,1,3.4.49,2.36,2.36,0,0,1,.71.58,2.62,2.62,0,0,1,.17.28s.1,0,.23,0a14,14,0,0,0-1.45,1.34c-.41.42-.66.74-.68.76s-.24.35-.54.85a11.32,11.32,0,0,0-.88,2A6.84,6.84,0,0,0,70.27,26c0,.58.1.95.17.94s.29-1.45,1-2.72a10.19,10.19,0,0,1,1-1.68l.57-.74s.22-.33.56-.76A17,17,0,0,1,74.86,19.56Z"/>
-                <path class="cls-331" d="M152.45,10.78l0,.05-.11.07h0v0Z"/>
-                <path class="cls-329"
-                      d="M153.24,48.69l-1.75,1.89c-.42.48-.88,1-1.36,1.51l-.72.81-1.16,1.35-.5-.14c.51-1.75,1.05-3.78,1.43-5.22A39.61,39.61,0,0,0,153.24,48.69Z"/>
-                <path class="cls-331" d="M151.61,33a.29.29,0,0,1-.1.09,1,1,0,0,1,0-.25S151.59,32.85,151.61,33Z"/>
-                <path class="cls-329"
-                      d="M150.65,55.88l-.26,0h-.09l-.51.14-2,.55-.91.26c.23-.67.53-1.67.84-2.77l.5.14c.71.47,1.42.94,2.14,1.4Z"/>
-                <path class="cls-330" d="M150.64,43.2a3.08,3.08,0,0,1-.07,1.08s-.07-.11-.11-.34l.12-.45Z"/>
-                <path class="cls-328"
-                      d="M150.28,42.69c.07.55.13,1,.18,1.25-.39,1.55-.84,3-.76,3v0h0l-.05.18c0,.07,0,.14,0,.23s0,.12-.05.18l-.14.51c0,.1-.05.21-.08.31s-.06.22-.09.34,0,0,0,0a.3.3,0,0,1,0,.11s0,0,0,0c-.29,1-.66,2.24-1.06,3.28l-2.4-.19a13.25,13.25,0,0,0,.26-3.76,8.19,8.19,0,0,0-1.13-3.58,22.59,22.59,0,0,0-2-3,7.62,7.62,0,0,0-2.61-2.15,8.87,8.87,0,0,0-7.29,0,5.86,5.86,0,0,0-.56.36.85.85,0,0,1,0-.17,7.85,7.85,0,0,1,1.23-2.68,9.49,9.49,0,0,1,2.23-2.29,6.3,6.3,0,0,1,2.86-1.31,11.18,11.18,0,0,1,6.37,1.26,12.16,12.16,0,0,1,2.37,1.92,8.4,8.4,0,0,1,1.74,2.09,15.8,15.8,0,0,1,.83,2.15C150.13,41.58,150.2,42.19,150.28,42.69Z"/>
-                <path class="cls-330" d="M149.19,48.85a.06.06,0,0,1,0,0h0S149.18,48.86,149.19,48.85Z"/>
-                <path class="cls-328"
-                      d="M145.71,52l2.4.19c-.11.32-.24.62-.35.89-.94,2.14-1.14,4-1.76,4.81l-1,1.26c-.78.64-1.93,1.57-3.31,2.64s-3,2.32-4.81,3.61c-.9.64-1.82,1.31-2.77,1.94l-.72.45c-.13.08-.18.09-.25.13a1.35,1.35,0,0,1-.27.06.17.17,0,0,1-.22-.13l-.13-.28-.18-.39a24.54,24.54,0,0,1-1.73-6.51,26.75,26.75,0,0,1-.23-3,.83.83,0,0,0,.3.13,7.51,7.51,0,0,0,1.94.08,26.18,26.18,0,0,0,4.52-.76,23.93,23.93,0,0,0,5.92-2.39,11.29,11.29,0,0,0,1.49-1.06,4.79,4.79,0,0,0,.67-.68.82.82,0,0,0,.17-.2c.06-.09.12-.21.16-.28S145.67,52.13,145.71,52Z"/>
-                <path class="cls-330" d="M146.63,57l.28-.09c0,.11-.09.21-.12.29Z"/>
-                <path class="cls-332"
-                      d="M145.15,48.28a12.37,12.37,0,0,1-.31,3.46,1.28,1.28,0,0,1-.13.36l-.05.12-.12.13a4,4,0,0,1-.6.56,9.69,9.69,0,0,1-1.36.94,20.54,20.54,0,0,1-4,1.71,10.5,10.5,0,0,0,3-7.37c.17-3.84-2.37-8.07-5.2-9a5.28,5.28,0,0,1,.89,0A7.4,7.4,0,0,1,140,40a7,7,0,0,1,2.34,2C143.61,43.9,145.07,46,145.15,48.28Z"/>
-                <path class="cls-333"
-                      d="M136.37,39.23c2.83.89,5.37,5.12,5.2,9a10.5,10.5,0,0,1-3,7.37c-.58.19-1.14.35-1.69.48a26.87,26.87,0,0,1-4.33.67h-.19a4.14,4.14,0,0,1-1.86-2.61h0c.18-3.25.46-5.4.47-5.53s.19-2.59.82-6.08c.11-.63.26-1.3.43-2a1,1,0,0,1,.18-.17h0l.07,0a10.76,10.76,0,0,1,3.87-1.08Z"/>
-                <path class="cls-332" d="M132.23,40.42l.16-.08a1,1,0,0,0-.18.17A.29.29,0,0,1,132.23,40.42Z"/>
-                <path class="cls-332"
-                      d="M132.35,56.71a5.4,5.4,0,0,1-1.44-.11.71.71,0,0,0-.52.1c0-.7,0-1.38.07-2,0-.2,0-.4,0-.58A4.14,4.14,0,0,0,132.35,56.71Z"/>
-                <path class="cls-329"
-                      d="M132.06,107.45c0,.28-.21.52-.47.74a3.67,3.67,0,0,1-.73.53,1.53,1.53,0,0,1-.61.16c.06-.39.12-.75.15-1.09a12.75,12.75,0,0,0,.09-1.78,8,8,0,0,0,0-.85h0c0,.12,0,.22.06.22a1.22,1.22,0,0,1,.63.42A3.73,3.73,0,0,1,132.06,107.45Z"/>
-                <path class="cls-334"
-                      d="M131.69,76.29c.33.4.45.85.19,1.08l-.31.26a2.13,2.13,0,0,0-.33.34,1.74,1.74,0,0,0-.13.2.7.7,0,0,0-.08.16.68.68,0,0,0,0,.15v.06a.59.59,0,0,1-.12.37.71.71,0,0,1-.15.15s-.14.1-.14,0,.19-.38,0-.54a1,1,0,0,0-.68.25c-.12.1-.18.16-.17.18s.1,0,.24,0a1.18,1.18,0,0,1,.25-.1l.15,0h.08s0,0,0,.07c0,.36.09.31.06.4a.36.36,0,0,1,0,.2,1.61,1.61,0,0,0-.1.36,0,0,0,0,0,0,.05v0c-.1,0-.17.06-.26.09s-.47.35-.7.49a1,1,0,0,1-.77.22.28.28,0,0,0,.09-.26c-.05-.15-.16-.14-.17-.13a.49.49,0,0,1,.05.16c0,.07-.13.16-.31.23a6,6,0,0,1-1.39.39,2.88,2.88,0,0,1-1.35,0,.27.27,0,0,1-.13-.07,4.87,4.87,0,0,0,.59-.36,3.28,3.28,0,0,0,.49-.4l.23-.23a3.09,3.09,0,0,0,.23-.31.75.75,0,0,0,.14-.68.72.72,0,0,0-.51-.37,2.43,2.43,0,0,0-1,0,1,1,0,0,0-.67.37,1.09,1.09,0,0,0-.14.45c0,.08-.05.13,0,.14s.07,0,.13-.1a1.22,1.22,0,0,1,.22-.34.75.75,0,0,1,.52-.18,2.25,2.25,0,0,1,.72.06c.08,0,.18.07.2.17s0,.2-.11.27-.08.07-.11.11l-.2.17a4.5,4.5,0,0,1-.45.31,3.06,3.06,0,0,1-2.11.52.84.84,0,0,1-.63-.56,2.45,2.45,0,0,1-.18-1,2.62,2.62,0,0,1,.71-1.68,4.54,4.54,0,0,1,1.67-1.05,8.48,8.48,0,0,1,1-.35,4.37,4.37,0,0,1,.48-.08c.09,0,.08,0,.11,0a2.48,2.48,0,0,0,1,.07l.41-.13.37-.13.2-.07.1,0a5.82,5.82,0,0,1,1.56,0,1.52,1.52,0,0,1,.66.22A2.22,2.22,0,0,1,131.69,76.29Z"/>
-                <path class="cls-329"
-                      d="M130.66,96a3.69,3.69,0,0,1,0,.69c-.09.56-.33,1.46-.44,2.29-.06.38-.1.74-.14,1.09-.28-1.53-.71-3.37-1.18-5.21l-.28-1.06.19.08A3.22,3.22,0,0,1,130.44,95a1.53,1.53,0,0,1,.2.78A1.46,1.46,0,0,1,130.66,96Z"/>
-                <path class="cls-329"
-                      d="M129.31,101.35c.51,1.38.81,2.3,1,2.28-.12,0,.06,1.52-.35,4.09a27.07,27.07,0,0,1-4,10,48.38,48.38,0,0,1-4.27,5.83c-1.49,2-4.06,2.91-6.74,3.39a30.06,30.06,0,0,1-4.18.38,26.1,26.1,0,0,1-4.26-.21,18.06,18.06,0,0,1-7.76-3.56c-.36-.27-.73-.55-1.08-.84h0a2.8,2.8,0,0,0,.47-2.3.32.32,0,0,0-.34-.21c-.17,0-1,0-1.48,0l-.37,0,.11.34s-.06.22-.39.44c-.08-.08-.15-.16-.24-.24a12.1,12.1,0,0,1-1.95-2.87l-.32-.64A11,11,0,0,1,92.7,116a.59.59,0,0,0,.25,0,.67.67,0,0,0,.49-.55.91.91,0,0,0-.3-.74,1.13,1.13,0,0,0-.33-.2,2.15,2.15,0,0,1-.73-.32.41.41,0,0,1-.11-.07,43.42,43.42,0,0,1-1.35-5c-.27-1.32-.5-2.63-.68-3.92l.23-.08c.46-.13,1.17-.34,2.15-.68a19,19,0,0,0,3.75-1.7c.73-.46,1.47-1,2.27-1.62L99.66,100c.56-.44.85-.82,1.4-1.29,0-.08.57-.61,1-1l0,0a12.07,12.07,0,0,1-1.69.11c-.71.08-1.46.15-2.06.17l-1.45,0a14.44,14.44,0,0,1-2.5-.18A9.34,9.34,0,0,1,91,96.62a6,6,0,0,1-1.2-.94c.06-.52.14-1,.24-1.52a28.67,28.67,0,0,1,.74-2.94,8.44,8.44,0,0,0,1.44.35,12.62,12.62,0,0,0,3.55-.14l1.1-.15c.46-.09.93-.17,1.44-.25l1.58-.29.85-.17c.23,0,.07,0,0-.09s-.25,0-.27-.1-.29-.18-.29-.2l-.32-.12,3-.45s0,0,0,0a28.84,28.84,0,0,0,3.2-2.63,26.74,26.74,0,0,1,2.25-1.72c.32-.23.6-.41.8-.53a28.94,28.94,0,0,0,6.09,1.68,15.65,15.65,0,0,0,3.47,0,0,0,0,0,1,0,0,1.6,1.6,0,0,0,.34.26,5,5,0,0,0,.79.49,2.9,2.9,0,0,0,.83.28,4.67,4.67,0,0,0,2.09-.06,9.92,9.92,0,0,0,1.17-.4c0,.09.13.29.23.58a.52.52,0,0,1,.14.34h0s0,0,0,0h0s0,0,0,.08A2.34,2.34,0,0,1,124,89a2.44,2.44,0,0,1-.32.5,3.86,3.86,0,0,1-2.22,1.23c-.27.06-.59.11-.91.16l-1.07.19a7.55,7.55,0,0,0-1.27.24l-.29.07-.15,0s0,.11,0,.15a2.77,2.77,0,0,0,.27.61,3.75,3.75,0,0,0,.92,1.06,6,6,0,0,0,1,.64,6.4,6.4,0,0,0,2,.55,12.08,12.08,0,0,0,3-.22c.65-.13,1.14-.24,1.51-.33h0c.18.5.38,1,.56,1.49l.34.92-.15.18a4.59,4.59,0,0,1-1.73,1.2,6.61,6.61,0,0,1-3.07.43c-.61,0-1.24-.09-1.87-.16a15.34,15.34,0,0,1-1.69-.3c-.62-.13-1.46-.41-2.3-.63l.21.24.05.07,0,0,.09.07.62.58A17.23,17.23,0,0,0,119,99.17c.24.2.51.37.76.56l.52.33a11.13,11.13,0,0,0,1,.57,9.32,9.32,0,0,0,4,1.08A9.65,9.65,0,0,0,129.31,101.35Zm-3.41,6.31a5.93,5.93,0,0,0,.51-.71,8.34,8.34,0,0,0-.81-.22,2.57,2.57,0,0,0-.47-.08c-.29,0-.57,0-.54.1s.19.07.46.19l.44.18c.1,0,.07.06.08.07s0,0-.1.07l-.2.21a1.24,1.24,0,0,1-.42.31c-.16,0-.27,0-.3-.19s0-.28,0-.3-.13.07-.18.29a.43.43,0,0,0,.09.4.6.6,0,0,0,.46.2A1.8,1.8,0,0,0,125.9,107.66Zm-.25,5.26a.32.32,0,0,0,0-.52,2.91,2.91,0,0,0-1.31-.1l-.6,0a2.72,2.72,0,0,0-.55.06,7,7,0,0,0-1.83.74,2.11,2.11,0,0,1-.56.25c-.13,0-.22,0-.23,0s-.15,0-.16.21a1,1,0,0,0,.31.6,1.45,1.45,0,0,0,.8.57,1.48,1.48,0,0,0,1.07-.38,8,8,0,0,1,1.62-1l.2-.07.31-.1.53-.17A3.09,3.09,0,0,0,125.65,112.92Zm-2,6.94c.1-.38-.28-.53-.54-.45a2,2,0,0,0-.35.08,5.63,5.63,0,0,0-1.1.61c-.5.33-.94.74-.89.81a5.65,5.65,0,0,0,1.09-.45,7.69,7.69,0,0,1,.74-.3c.2-.06.33-.12.34-.12a.69.69,0,0,0,.13-.05s0,0,0,0a2,2,0,0,1-.06.39,3.1,3.1,0,0,1-.13.45c-.08.29-.28.25-.31.3s0,.07.16.08a.46.46,0,0,0,.38-.23,2.23,2.23,0,0,0,.26-.48A3.36,3.36,0,0,0,123.69,119.86Zm-8.08-7a.3.3,0,0,0-.11-.41,1,1,0,0,0-.26-.08s-.25,0-.56,0a5.22,5.22,0,0,0-1.21.05,1.37,1.37,0,0,0-.91.82c-.13.31-.15.51-.11.52a4,4,0,0,0,1.67-.11,2.82,2.82,0,0,0,1.1-.51.33.33,0,0,1,.13-.07l.11,0C115.51,113,115.54,113,115.61,112.86ZM114,118.41c0-.23-.21-.42-.39-.5a6.29,6.29,0,0,0-.93-.24l-.64-.06a1.84,1.84,0,0,0-1.4.55A2.14,2.14,0,0,0,110,120a3.82,3.82,0,0,1,.91-1.57,1.38,1.38,0,0,1,1.06-.31l.62.11a5.46,5.46,0,0,1,.81.13c.05,0,.05,0,.07,0v0a.83.83,0,0,1-.11.15,6.23,6.23,0,0,1-.6.57c-.6.25-1.21.33-1.21.39a2.3,2.3,0,0,0,1.37-.09,4.72,4.72,0,0,0,.75-.56,1.54,1.54,0,0,0,.16-.18A.66.66,0,0,0,114,118.41Zm-6.26,4.84a.43.43,0,0,0,.13-.43.68.68,0,0,0-.39-.35c-.56-.25-1.07,0-1,.08s.13,0,.28,0a1.55,1.55,0,0,1,.49.21c.08,0,0,.09,0,.09s-.09,0-.09,0a2.34,2.34,0,0,1-.82.14A1,1,0,0,1,106,123c-.12,0,.07,0,.08.11a.8.8,0,0,1,.09.14s-.07,0-.08,0,0,0,0,.1,0,.09,0,.09l.17,0a1.87,1.87,0,0,0,.72.07,1.64,1.64,0,0,0,.33-.05A1.28,1.28,0,0,0,107.71,123.25Zm-4.28-11.41a.44.44,0,0,0,0-.57.81.81,0,0,0-.29-.17,2.08,2.08,0,0,0-.54-.11,5.26,5.26,0,0,0-1.39.1c-.45.09-.92.12-1.29.16l-.26,0a.27.27,0,0,0-.11,0s-.08.12,0,.15.15.1.16.1,0,0,0-.12a1.56,1.56,0,0,1,.31,0,8.19,8.19,0,0,0,1.33,0,5.8,5.8,0,0,1,1.27,0l.34.08h0s.06,0-.06.06c-.31.23-.62.67-1,.74a1.26,1.26,0,0,1-.61-.09l-.59-.17a1.55,1.55,0,0,0-.59-.1s.19.16.51.32.36.17.56.26a1.56,1.56,0,0,0,.77.19,1.63,1.63,0,0,0,.75-.34,5.59,5.59,0,0,1,.48-.38A1.19,1.19,0,0,0,103.43,111.84Z"/>
-                <path class="cls-328"
-                      d="M130.57,3.9c-.23.21-.48.45-.74.71a8.4,8.4,0,0,0-1.29,1.72,22.47,22.47,0,0,0-1.1,2.25c-.23.6-.5,1.33-.76,2.09-.08.22-.14.43-.15.46s0,.13,0,.07v-.15l0-.28c0-.19,0-.37-.07-.56l-.09-1a4.62,4.62,0,0,0-.19-.88,10.71,10.71,0,0,0-.36-1.09,22.07,22.07,0,0,0-1.49-3.12c.54-.1,1.08-.2,1.64-.28a16.14,16.14,0,0,1,2.62-.2,5.07,5.07,0,0,1,.56,0l.71.11Z"/>
-                <path class="cls-328"
-                      d="M129.21,101.07a2.15,2.15,0,0,0,.1.27,7.27,7.27,0,0,0-1.12,0,18.64,18.64,0,0,1-2.88-.14,9.26,9.26,0,0,1-3.73-1.21c-.3-.19-.61-.37-.92-.58l-.42-.3-.15-.12a2.49,2.49,0,0,1-.23-.22l-.09-.09s.11,0,.15,0l.28.07a1.5,1.5,0,0,0,.33.08c.66.1,1.31.17,1.93.22a7.75,7.75,0,0,0,3.55-.4,5.61,5.61,0,0,0,1.91-1.2C128.4,98.83,128.85,100.06,129.21,101.07Z"/>
-                <path class="cls-330" d="M128.45,80.84s0,0,0-.07A.1.1,0,0,1,128.45,80.84Z"/>
-                <g id="_Group_" data-name="&lt;Group&gt;">
-                    <path class="cls-329"
-                          d="M126.76,147.86a1.64,1.64,0,0,0-.55-.49,2.15,2.15,0,0,0-1.06-.15c-.28,0-.46,0-.46.06s.18.1.44.16a3.1,3.1,0,0,1,.86.28,1.3,1.3,0,0,1,.45.62,1.56,1.56,0,0,1-.16.2,1.66,1.66,0,0,1-.63.53,4.19,4.19,0,0,1-1.9.2l-4.32-.05-2.65-1.47c-.1-.51-.21-1-.32-1.55h0l.12,0h0l.58-.11h.2c.36,0,.86-.06,1.5,0a10.32,10.32,0,0,0,2.39-.05,16.06,16.06,0,0,0,2.91-1.11,11.13,11.13,0,0,1,1.53-.67,1.27,1.27,0,0,1,1.29.49,2.12,2.12,0,0,1,.57,1.18,1.55,1.55,0,0,0-.71-.29,2.67,2.67,0,0,0-1,.14.46.46,0,0,0-.29.16c-.07,0-.11.07-.1.1s0,0,.14,0a.62.62,0,0,1,.29-.06,3.32,3.32,0,0,1,.88.06,1.23,1.23,0,0,1,.76.62l-.14.27-.53.86A.6.6,0,0,0,126.76,147.86Z"/>
-                </g>
-                <path class="cls-328"
-                      d="M125.11,90c.26.67.54,1.43.84,2.24a7.17,7.17,0,0,1-1.2.72,6.79,6.79,0,0,1-2.61.72,4.4,4.4,0,0,1-1.82-.3,4.47,4.47,0,0,1-.9-.46,2.72,2.72,0,0,1-.65-.66,1.42,1.42,0,0,1-.2-.41c-.08-.09.05-.08.12-.09l.22,0,.84-.08c.71-.06,1.34-.11,1.92-.18a5.79,5.79,0,0,0,3-1.06C124.8,90.28,125,90.14,125.11,90Z"/>
-                <path class="cls-331" d="M124.81,84.11h0a.08.08,0,0,1,0,0v0Z"/>
-                <path class="cls-329"
-                      d="M124.8,85.46v.16c0,.17-.24.39-.24.39s-.35.23-.45.32a2.94,2.94,0,0,1-1.41.64,2.43,2.43,0,0,1-1.76-.16,1.37,1.37,0,0,1-.47-.37.51.51,0,0,1-.08-.26v0a11.56,11.56,0,0,0,1.23-.44,15.09,15.09,0,0,0,2.39-.89.73.73,0,0,0,.19.24l.09.05.1,0,.08,0A2.42,2.42,0,0,1,124.8,85.46Z"/>
-                <path class="cls-330" d="M124,84.78c.13,0,.25-.12.37-.18s-.13.11-.35.23a.08.08,0,0,1,0,0Z"/>
-                <path class="cls-329"
-                      d="M124.22,112.79l.06,0a.07.07,0,0,1-.06,0h0l-.17.07a7.91,7.91,0,0,0-1.64,1.15c-.27.2-.55.42-.79.39a1.26,1.26,0,0,1-.67-.4,1.18,1.18,0,0,1-.36-.46c0-.13,0-.18,0-.2s.08.09.24.08a2.12,2.12,0,0,0,.65-.15,8.31,8.31,0,0,1,1.8-.54,4.1,4.1,0,0,1,.5,0Z"/>
-                <path class="cls-328"
-                      d="M123.45,56a25,25,0,0,1,0,5.75A23.79,23.79,0,0,1,120.47,70c-.54.94-1,1.66-1.35,2.15a4.49,4.49,0,0,0-.51.74s-.24.1-.69.18a10.24,10.24,0,0,1-2,.19,13.09,13.09,0,0,1-3.09-.27,27,27,0,0,1-3.87-1.2c-2.81-1.05-6-2.51-9.41-4.14-.85-.4-1.74-.81-2.58-1.24l-1.26-.68-1.22-.77a45.45,45.45,0,0,1-4.73-3.57,85,85,0,0,1-8.34-8.31L80.5,52l-.4-.48L80,51.43s0-.07,0-.09l0,0,.19-.26L81.05,50a44.24,44.24,0,0,1,3.1-3.72,42.9,42.9,0,0,1,5.37-5c1.41-1.09,2.34-1.59,2.43-1.68a21.68,21.68,0,0,1,2-1,28.24,28.24,0,0,1,5.46-1.69,48.69,48.69,0,0,1,8.2-1.05,14.78,14.78,0,0,1,8.67,3l.06,0a14.11,14.11,0,0,1,4.32,4.67,20.06,20.06,0,0,1,2.07,6.14A56.55,56.55,0,0,1,123.45,56ZM121,58c.33-.29.49-2.46.32-3.47A30.6,30.6,0,0,0,120.23,50a18.42,18.42,0,0,0-2-4.48,9.35,9.35,0,0,0-2.06-2.3,18.31,18.31,0,0,0-2.88-1.56,14,14,0,0,0-3.32-1.06,8.81,8.81,0,0,0-3.78.19,11.69,11.69,0,0,0-3.45,1.7,22.75,22.75,0,0,0-7.55,8.73,15.75,15.75,0,0,0-.67,1.85c-.09.32-.17.64-.23,1,0,.17-.06.31-.1.52s0,.51,0,.76c.19.16.39.32.6.47l.37.28c.25.19.5.4.76.58l1.53,1h0a17.52,17.52,0,0,0,4.64,2,38.42,38.42,0,0,0,4.52,1,22.52,22.52,0,0,0,7.88.31,13.18,13.18,0,0,0,5-1.81A4.37,4.37,0,0,0,121,58Z"/>
-                <path class="cls-329"
-                      d="M122.26,124.61c-.3.57-.61,1.1-.85,1.55-.38.67-.64,1.14-.66,1.16l-.57,1.22a27.68,27.68,0,0,1-1.31,2.45c-1.1,1.73-2.25,3.51-2.07,3.57s.27,0,.59-.29a3.52,3.52,0,0,1,0,.49,43.28,43.28,0,0,0-.59,5c-.11,2.32-.1,4-.14,5,0,.56,0,1,0,1.23a.28.28,0,0,1,0,.09v0h0l-.12,0c-.4-1.92-.81-3.93-1.18-5.76-.06-.3-.12-.59-.2-.89l-.09-.44c0-.15-.06-.28-.14-.52q-.07-.78-.15-1.5c-.08-1.1-.18-2.13-.25-3.07-.15-1.91-.26-3.46-.34-4.56,0-.44-.06-.81-.08-1.08.4-.05.79-.12,1.18-.2a16.11,16.11,0,0,0,4.1-1.32A8.89,8.89,0,0,0,122.26,124.61Z"/>
-                <path class="cls-332"
-                      d="M120.94,56.62S121,58,121,58s-.57.46-1.64,1a11.88,11.88,0,0,1-1.11.51c1.29-1.4,1.65-3.56,1.86-6.06A26.17,26.17,0,0,1,120.94,56.62Z"/>
-                <path class="cls-333"
-                      d="M120.08,53.47c-.21,2.5-.57,4.66-1.86,6.06a11.07,11.07,0,0,1-1.35.48l.25-.2a17.5,17.5,0,0,1-4.45.62h-1.53c-2.17-1.46-3.58-4.68-3.38-8.36.25-4.64,2.86-8.24,6-8.43a10.86,10.86,0,0,1,1.39.83,7.81,7.81,0,0,1,1.52,1.73,1.11,1.11,0,0,1,.2.26l.44.81a2.43,2.43,0,0,0,.15.26A39.34,39.34,0,0,1,120.08,53.47Z"/>
-                <path class="cls-329"
-                      d="M119,85.77h-.1a17.63,17.63,0,0,1-3.43-.24,26.21,26.21,0,0,1-5-1.59l2.3-1.52A25,25,0,0,0,115,84.59a6.46,6.46,0,0,0,1.76.86,8,8,0,0,0,1.9.31Z"/>
-                <path class="cls-329"
-                      d="M116,73.7l2.85,1.13a.54.54,0,0,0-.4.2,1.56,1.56,0,0,0-.32.6s.12.1.27.13l-.29.27,0,0s0,0,0,0l-.81,1.4a27,27,0,0,0-4.05.66l-.15-1.34h0A7.63,7.63,0,0,0,110.9,76c-.34-.09-.71-.19-1.11-.28l.69-2.53a17.37,17.37,0,0,0,2.23.49A12.85,12.85,0,0,0,116,73.7Z"/>
-                <path class="cls-329"
-                      d="M117,173.23a6.51,6.51,0,0,1,.23,3.19,11.11,11.11,0,0,1-.31,1.64,10.73,10.73,0,0,1-.59,1.51c-.45,1-.93,1.85-1.36,2.62s-.79,1.41-1,1.87l-.26.49-2.49.25c-1.07.09-2.15.17-3.22.23l-.57.08h-.52l-.34-.06-1.6-.24c-2.86-.44-5.73-.81-8.51-1.31l0-.06c.25-.35.66-.83,1.15-1.42a16.24,16.24,0,0,0,3-4.85,9.24,9.24,0,0,0,.15-5.63,3.12,3.12,0,0,0-1-1.41l1.8.3a33.41,33.41,0,0,0,10.82-.2c.56-.09,1.12-.21,1.69-.34a4.82,4.82,0,0,1,1.35,1A7.68,7.68,0,0,1,117,173.23Z"/>
-                <path class="cls-333"
-                      d="M117.12,59.81l-.25.2a5.08,5.08,0,0,1-.59.17h0a27.52,27.52,0,0,1-3.58.25A17.5,17.5,0,0,0,117.12,59.81Z"/>
-                <path class="cls-333" d="M116.87,60a.43.43,0,0,1-.1.09l-.49.08A5.08,5.08,0,0,0,116.87,60Z"/>
-                <path class="cls-331" d="M116.08,13.43v0l-.52,0s0,0,0,0Z"/>
-                <path class="cls-329"
-                      d="M115.33,112.71s0,0,0,.07a.51.51,0,0,0-.07.18h-.07s-.2,0-.5-.07l.25-.21a1,1,0,0,1,.23-.13c.06,0,0-.07.08,0A.36.36,0,0,0,115.33,112.71Z"/>
-                <path class="cls-333"
-                      d="M116.25,60.18a12.3,12.3,0,0,1-1.49.29h-.1a.52.52,0,0,0-.43.08h-.09l-.9.06c-.32,0-.64,0-1,0s-.57,0-.85,0l-.28-.18h1.53A27.52,27.52,0,0,0,116.25,60.18Z"/>
-                <path class="cls-328" d="M115,5c.17,1.29.34,3.21.47,5.91a23.88,23.88,0,0,0-2.57-6Z"/>
-                <path class="cls-333" d="M114.76,60.47l-.25,0h-.28a.52.52,0,0,1,.43-.08Z"/>
-                <path class="cls-329"
-                      d="M114.64,112.88a2,2,0,0,1-.64.35c-.62.22-1.31.38-1.5.47.13-.16.44-.83,1.07-.89A6.34,6.34,0,0,1,114.64,112.88Z"/>
-                <path class="cls-329"
-                      d="M113.06,76.82l.15,1.34c-.43.08-.87.18-1.31.29-.62.15-1.26.32-1.85.49-.84-.71-1.44-1.15-1.53-1a12.33,12.33,0,0,0,1,1.17l-1.41.45c-1,.34-1.73.63-1.77.65a15.63,15.63,0,0,0-1.68.9c-.23.14-.47.32-.73.49-2.14-.7-4.38-1.35-6.6-2-.41-.12-.87-.24-1.2-.36L95,78.74l-2.35-1.06-.27-.13c1.23-.33,2.42-.62,3.38-.82,1.38-.31,2.34-.4,2.4-.42s1-.18,2.41-.34a36.41,36.41,0,0,1,5.14-.12,39,39,0,0,1,5.08.56C112,76.62,112.85,76.82,113.06,76.82Z"/>
-                <path class="cls-332"
-                      d="M112.65,43.07l1.16.58c-3.19.19-5.8,3.79-6,8.43-.2,3.68,1.21,6.9,3.38,8.36l.28.18a27.46,27.46,0,0,1-4.74-.64,38.19,38.19,0,0,1-4.38-1.13A16.54,16.54,0,0,1,98,56.92l0,0-1.51-1.06c-.25-.17-.48-.37-.73-.56l-.48-.39,0-.17.08-.42c.06-.29.15-.57.23-.86a13.37,13.37,0,0,1,.65-1.69,18.93,18.93,0,0,1,4.41-5.84,15.12,15.12,0,0,1,5.9-3.71A8.77,8.77,0,0,1,112.65,43.07Z"/>
-                <path class="cls-331" d="M112.47,113.73s0,0,0,0S112.48,113.73,112.47,113.73Z"/>
-                <path class="cls-329"
-                      d="M110.83,128.67l1,0c-.09.55-.21,1.37-.36,2.38-.29,1.91-.66,4.45-1,7l-.09.47,0,.11v0l0,0-.07.16-.38.9c-.23.6-.46,1.18-.69,1.75-.45,1.14-.86,2.21-1.23,3.13s-.64,1.71-.85,2.27c0,.14-.11.27-.15.38v.05l0,.13s0,.07,0,.1l0,.05a1.11,1.11,0,0,1-.08.24c0,.08-.38,1.22-.91,2.9-.59.49-1.27,1.06-2,1.67l-2.48,2.11-.32.28-.16.13,0,.06h0a3.65,3.65,0,0,1-.26-.44,1.35,1.35,0,0,1-.15-.51.82.82,0,0,1,0-.22s0-.27.32-.66a4.94,4.94,0,0,1,.51-.66c-.16-.37-1.59,1-1.42,1.26a1.48,1.48,0,0,0,.38,1,2.13,2.13,0,0,0,.21.22l-1.64-.22-.8-.13-.32,0a.88.88,0,0,1,0-.28,1.46,1.46,0,0,1,.14-.51l.11-.23a3.2,3.2,0,0,1,.41-.71c.24-.34.61-.58.58-.65s-.5,0-.88.35a2.82,2.82,0,0,0-.45.49,1.3,1.3,0,0,0-.18.27,1.81,1.81,0,0,0-.15.94c-.17-.24-.35-.47-.52-.69v-.14a2,2,0,0,1,0-.23,3.91,3.91,0,0,1,0-.48,5.21,5.21,0,0,1,.18-.86,2,2,0,0,1,.8-1.13,1.71,1.71,0,0,1,1.24-.32c.15.28,3.52-1.08,3.58-1.11a21.48,21.48,0,0,0,3.11-2.05h0c.28-.05.44-2.67.45-5.34a42,42,0,0,0-.24-5.61,14,14,0,0,0-.51-1.79c-.33-1-.83-2.27-1.36-3.53s-1.16-2.6-1.65-3.5a16.43,16.43,0,0,0,3.89,1.09A24.73,24.73,0,0,0,110.83,128.67Z"/>
-                <path class="cls-329"
-                      d="M110.28,79.87c.54.58,1.17,1.25,1.82,1.91-.75.41-1.47.79-2,1.12l-.94.53-2-.78c-.62-.23-1.25-.45-1.89-.67.89-.46,1.56-.72,1.6-.74s.67-.32,1.66-.7C109,80.33,109.62,80.1,110.28,79.87Z"/>
-                <path class="cls-329"
-                      d="M107.89,84.29l-.16.11a28.42,28.42,0,0,0-2.15,2,16.41,16.41,0,0,0-2.65,3.21l-3,.45a7.27,7.27,0,0,1-1.42-.76,5.31,5.31,0,0,1-.67-.5c-.15-.12-.29-.28-.43-.41a6.64,6.64,0,0,1-.75-1l.59-.34A34.53,34.53,0,0,0,102,84.1L103.7,83c1,.29,2,.59,3,.91Z"/>
-                <path class="cls-331" d="M106.15,123.24s.15.2,0,0Z"/>
-                <path class="cls-328"
-                      d="M104.8,12c0,.15.2.51,0,.23a12.11,12.11,0,0,0-1-1l-.27-.21-.62-.5-.81-.62-1.56-1.15A25.86,25.86,0,0,0,97.64,7,32.83,32.83,0,0,0,94,5.32a27.82,27.82,0,0,1,5.54-.88c.73,0,1.43-.07,2.12-.08a22.39,22.39,0,0,1,1.09,2.27c.55,1.25,1.3,3.24,1.71,4.38,0,.07.11.27.2.55S104.74,11.87,104.8,12Z"/>
-                <path class="cls-329"
-                      d="M102.53,82.64l-1,.79A33.12,33.12,0,0,0,97.22,87l-.59.34a7.57,7.57,0,0,1-.41-.8,19.25,19.25,0,0,1-1-3.09c-.13-.53-.22-1-.32-1.33.32-.63.53-1.07.66-1.32h0c.49.15.88.25,1.32.35C98.82,81.66,100.7,82.14,102.53,82.64Z"/>
-                <path class="cls-330" d="M101.75,127.17a.61.61,0,0,1,0,.12c0-.06,0-.12,0-.18Z"/>
-                <path class="cls-328"
-                      d="M101.07,98l.05.07-1,.8a31.49,31.49,0,0,1-4.38,3A12.34,12.34,0,0,1,92.1,103a15.67,15.67,0,0,1-2.19.21h-.18c-.08-.69-.13-1.39-.17-2.07a28.17,28.17,0,0,1,0-3.57c.27.12.57.25.91.37a12.91,12.91,0,0,0,3.8.75,22.81,22.81,0,0,0,2.59,0l1.44-.12c.39,0,.73-.07,1.14-.12l1-.25S100.86,98.1,101.07,98Z"/>
-                <path class="cls-330" d="M100.92,3l0,.09s0,0,0,0Z"/>
-                <path class="cls-328"
-                      d="M100.32,171.67a9.27,9.27,0,0,1-.5,5.22,15.32,15.32,0,0,1-3,4.41,19.52,19.52,0,0,0-1.6,1.95c-.94-.2-1.88-.41-2.79-.66a24.29,24.29,0,0,1-5.63-2.32c-.31-.16-.61-.34-.91-.52l1.19-.44a17.54,17.54,0,0,0,5.13-3A6.44,6.44,0,0,0,94,173.7a7.71,7.71,0,0,0,.46-2.71,6.72,6.72,0,0,0-.41-2.48l.77.23,2.83.82c.5.15,1,.31,1.61.45A3.14,3.14,0,0,1,100.32,171.67Z"/>
-                <path class="cls-329"
-                      d="M99.71,126.11c-.07.14-.14.33-.22.53A21.87,21.87,0,0,1,98,129.47a43.59,43.59,0,0,1-2.68,3.81c-1.06,1.38-2.19,2.79-3.45,4.15-1.58,1.7-3.23,3.46-4.55,5.15a9.23,9.23,0,0,1-1.41.16,13.88,13.88,0,0,1-4.1-.47,5.54,5.54,0,0,1-1.92-.88A4.65,4.65,0,0,1,78.67,140a4.69,4.69,0,0,1-.6-1.71c1.05-1.3,2.08-2.5,3.07-3.62a5.25,5.25,0,0,0,1.55,1.43,4.43,4.43,0,0,0,2.13.61c.62,0,1.05-.3.94-.46s-.35-.18-.75-.42a6.1,6.1,0,0,1-1.31-1,4.22,4.22,0,0,1-.78-1.32,4.9,4.9,0,0,1-.17-.55l.4-.44c.52-.55,1-1.06,1.51-1.53a6.13,6.13,0,0,0,1.52,1.53c1.59,1.09,3.38,1.26,3.45,1s-1.41-1.08-2.36-2.23a4.52,4.52,0,0,1-.94-1.64,1.39,1.39,0,0,1-.06-.19c.45-.41.88-.82,1.28-1.2l.75-.71a3.12,3.12,0,0,0,1.09,1.33,4.22,4.22,0,0,0,.71.41l.67.3A8.21,8.21,0,0,0,92,130c.75.18,1.31.12,1.32-.06s-.38-.36-1-.77c-.28-.2-.61-.44-.94-.71-.17-.13-.34-.28-.52-.41s-.34-.3-.45-.42a1.34,1.34,0,0,1-.23-1.46,2.38,2.38,0,0,1,.29-.54.56.56,0,0,1,.09-.13l0,0-.07,0,1.16-1.09,0,0s0,0,0,0,.08.2.08.21a3.21,3.21,0,0,0,.52.56,7.08,7.08,0,0,0,1,.61c.76.4,1.69.51,1.78.18s-.34-.83-.71-1.45l-.5-.81a.79.79,0,0,1,0-.24,1.14,1.14,0,0,1-.44-.79c0-.06,0-.13,0-.2a5.81,5.81,0,0,0,.55-1c.11.12.22.25.35.37a30.63,30.63,0,0,0,3.56,3C98.42,125.29,99.05,125.71,99.71,126.11Z"/>
-                <path class="cls-328"
-                      d="M99.22,90.23s.26,0,.09.06l-.52.09-1,.14-.9.08-1.08.06a8,8,0,0,1-3.19-.34,4.75,4.75,0,0,1-1.28-.71c.13-.38.29-.75.44-1.1.73-1.57,1.51-3.06,2.07-4.22.06-.11.11-.22.16-.32s0,0,0,0c.4.77.83,1.79,1.53,3A7.64,7.64,0,0,0,97,88.86a6.4,6.4,0,0,0,.49.42c.13.1.25.19.39.28a6.09,6.09,0,0,0,.91.5l.17.07Z"/>
-                <path class="cls-329"
-                      d="M97.71,120.67a2.37,2.37,0,0,1-.36,1.61.21.21,0,0,1-.08,0c-.4-.35-.81-.71-1.18-1.08a1.4,1.4,0,0,0,.48-.58C96.88,120.68,97.41,120.68,97.71,120.67Z"/>
-                <path class="cls-330" d="M94.05,168.51l-.1,0c0-.06,0-.09,0-.09S94,168.43,94.05,168.51Z"/>
-                <path class="cls-329"
-                      d="M94,168.48A15.13,15.13,0,0,1,94,171a6.57,6.57,0,0,1-2.39,4.75,17.38,17.38,0,0,1-5,2.58c-.73.26-1.35.44-1.8.58l-.28.08h0a4.65,4.65,0,0,1-.41-.26l-.61-.42c-.32-.24-.75-.54-1.11-.85-.75-.58-1.59-1.38-2.38-2.07,0,.93,0,1.85,0,2.77l-1.43-3L78,173.62l-1,1.31-1.06,1.37-.15.18s-.06.1-.06,0l0-.11-.1-.53c-.25-1.13-.49-2.24-.74-3.35-.12-.55-.24-1.09-.37-1.65l-.17-.82a8.06,8.06,0,0,0-.28-1c-.14-.29-.48-1.41-.86-2.66.4.08.87.14,1.39.19a11.28,11.28,0,0,0,2.78,0,10.69,10.69,0,0,0,3-1,5.54,5.54,0,0,0,2.2-1.54,7,7,0,0,0,1-1.64c.15-.43.28-.82.41-1.18.24-.69.43-1.27.56-1.7.3.58.52.93.53,1s.37.58.93,1.36a27.38,27.38,0,0,0,2.17,2.74,13.23,13.23,0,0,0,2.61,2.33,3.94,3.94,0,0,0,1.4.66l.33.41h0a2,2,0,0,0,.57.22C93.31,168.29,93.6,168.37,94,168.48Z"/>
-                <path class="cls-331" d="M92.67,116a.13.13,0,0,0,0,.08.09.09,0,0,1-.06,0S92.65,116,92.67,116Z"/>
-                <path class="cls-331" d="M89.59,3.88l0,0v0Z"/>
-                <path class="cls-330" d="M89.42,106.05l0,0h0Z"/>
-                <path class="cls-330" d="M89.37,106.08v.08a.09.09,0,0,0,0,0h0Z"/>
-                <path class="cls-330" d="M89.34,106.1h0l-.21.1Z"/>
-                <path class="cls-329"
-                      d="M89.06,89.47a28,28,0,0,0-1,3.44h0l-1.73,1.16-.47.32c-.33.23-.75.44-.86.8a1.62,1.62,0,0,0,.11,1.21c.1.24.15.3.22.45l.2.34a14.89,14.89,0,0,0,.93,1.36c.17.22.35.45.52.69l.27.34.13.15,0,0,0,.27c0,.41,0,.83,0,1.25.07,1.12.19,2.25.34,3.4h0a.81.81,0,0,0-.19-.41,2.94,2.94,0,0,0-.44-.42h0a.93.93,0,0,0,0-.1.58.58,0,0,0,0-.16c0-.11.05-.21.06-.32s0-.46,0-.72a7.79,7.79,0,0,0-.19-1.81,5.5,5.5,0,0,0-.94-2c-.9-1.22-2.1-2-2.54-2.72a4.36,4.36,0,0,1-.48-.93,3.3,3.3,0,0,1-.12-.37c0-.1,0-.09,0-.11s.06-.07.12-.13l.19-.2.45-.44,1.07-1c.79-.7,1.68-1.44,2.52-2.11C88,90.27,88.58,89.83,89.06,89.47Z"/>
-                <path class="cls-330" d="M88.21,106.65l.25-.08-.25.14v0h0Z"/>
-                <path class="cls-330"
-                      d="M88.21,106.71s0,.05,0,.07a.22.22,0,0,1,0,.12c0-.18-.07-.37-.09-.55a2.32,2.32,0,0,0,.08.3h0Z"/>
-                <path class="cls-329"
-                      d="M88.11,106.35c0,.18.06.37.09.55a.07.07,0,0,1,0,0c0,.22-.68.43-1.26.44a13.6,13.6,0,0,1-1.92,0,7.58,7.58,0,0,1-1.79-.35,1.9,1.9,0,0,1-1.15-.85,1,1,0,0,1,0-.62c0-.23.17-.54.24-.79.19-.52.36-1,.56-1.46a2.58,2.58,0,0,1,.38-.52c.13-.14.37-.34.47-.44A3.4,3.4,0,0,1,84,102c.1-.09.26-.22.38-.13s.15.48.26.69.21.48.13.6-.13.14-.18.21l-.08,0a1.81,1.81,0,0,0-1,.66.77.77,0,0,0,0,.61.88.88,0,0,0,.21.36,1.35,1.35,0,0,0,.24.25s.18,0,.27-.16.13-.27.09-.3a1.52,1.52,0,0,1-.17-.15c-.09-.12-.18-.25-.12-.37s.35-.31.67-.47a3,3,0,0,1,1-.31,1.48,1.48,0,0,1,1,.34,8.29,8.29,0,0,1,.78.59c.43.38.14.83.22.83s.08-.07.13-.25a.66.66,0,0,0,0-.32h0c.08.55.16,1.1.26,1.65A0,0,0,0,0,88.11,106.35Z"/>
-                <path class="cls-330"
-                      d="M88,105.3l.12,1c-.1-.55-.18-1.1-.26-1.65-.15-1.15-.27-2.28-.34-3.4,0-.42,0-.84,0-1.25.09,1,.21,2.14.31,3.28C87.85,104,87.93,104.63,88,105.3Z"/>
-                <path class="cls-330" d="M87.05,103.61s0,0,0,.06l-.12-.1h0v-.08l.09.08.06,0Z"/>
-                <path class="cls-330" d="M87,103.67h0a0,0,0,0,0,0,0s0,0-.06,0,0,0,0,0v-.05h0Z"/>
-                <path class="cls-328"
-                      d="M85.93,143.06a7.6,7.6,0,0,0,1.23-.26,18.5,18.5,0,0,0-1.77,2.69,10.64,10.64,0,0,0-.63,1.34c-.36.08-.92.23-1.62.36a11.08,11.08,0,0,1-4.54.05,6.1,6.1,0,0,1-3.65-2.4,6,6,0,0,1-.65-1.17c.25-.46.52-.91.8-1.34.74-1.12,1.53-2.18,2.32-3.19a5.38,5.38,0,0,0,.59,1.29A5.29,5.29,0,0,0,79.48,142a6.15,6.15,0,0,0,2.2.89A12.34,12.34,0,0,0,85.93,143.06Z"/>
-                <path class="cls-328"
-                      d="M84.27,159l.16.34-.76,1.77-.48,1.17a4.89,4.89,0,0,1-.69,1.13,6.13,6.13,0,0,1-2.41,1.65,10.22,10.22,0,0,1-2.85.82,11.17,11.17,0,0,1-2.61-.06c-.71-.09-1.3-.21-1.74-.31-.43-1.46-.87-2.87-1-3.21l-.23-.61h0a21.58,21.58,0,0,1-.73-5.15c0-.48,0-1,0-1.47a4.23,4.23,0,0,0,.73.62,7.38,7.38,0,0,0,5,1.31,27.07,27.07,0,0,0,4.94-.9,7.08,7.08,0,0,0,1.76-.71.86.86,0,0,0,0,.16A11.33,11.33,0,0,0,84.27,159Z"/>
-                <path class="cls-329"
-                      d="M84,150v.53a9.06,9.06,0,0,0-.66,4.7l-.27.1a12.24,12.24,0,0,1-1.56.43,34.12,34.12,0,0,1-4.9.62,6.85,6.85,0,0,1-4.49-1.34A5.67,5.67,0,0,1,71,153.89a9.56,9.56,0,0,1,.27-1.72,48,48,0,0,1,1.56-5.44c.32-.76.65-1.48,1-2.19a5.53,5.53,0,0,0,.5.77,6.63,6.63,0,0,0,4.16,2.51,10.79,10.79,0,0,0,4.74-.31,11.5,11.5,0,0,0,1.44-.5A6.35,6.35,0,0,0,84,150Z"/>
-                <rect class="cls-331" x="83.93" y="129.61" width="0.01" height="0.01"/>
-                <path class="cls-331" d="M82.3,11.7h0c-.34.3-.66.62-1,1A12.93,12.93,0,0,1,82.3,11.7Z"/>
-                <path class="cls-331" d="M73.86,142.73h0c-.07.17-.16.33-.23.5.07-.17.15-.33.22-.51Z"/>
-                <path class="cls-331" d="M73.61,143.28c-.06.16-.11.3-.18.46v0Z"/>
-                <circle class="cls-329" cx="133.59" cy="46.47" r="1.44"/>
-                <circle class="cls-329" cx="111.44" cy="48.47" r="1.62"/>
-                <circle class="cls-329" cx="112.42" cy="51.01" r="0.33"/>
-                <circle class="cls-329" cx="132.16" cy="48.93" r="0.34"/>
-                <path class="cls-327"
-                      d="M126.76,147.86l-.32.47a1.4,1.4,0,0,0-.45-.61,2.56,2.56,0,0,0-.86-.28c-.26-.06-.44-.12-.44-.17s.18-.05.46-.05a2.16,2.16,0,0,1,1.06.15A1.75,1.75,0,0,1,126.76,147.86Z"/>
-                <g class="cls-335">
-                    <path class="cls-336"
-                          d="M111.08,139.66q-1.62-.1-3.3-.18c-.3,7.81-8.71,9.24-10.64,16C106.45,159.85,111.51,148.61,111.08,139.66Z"/>
-                </g>
-                <path class="cls-337"
-                      d="M115.66,140.07l-.36,0c0,.26.1.51.16.76C115.52,140.55,115.59,140.31,115.66,140.07Z"/>
-                <g class="cls-335">
-                    <path class="cls-336"
-                          d="M115.89,150.43c2.67,1.6,5.47.72,9.5-.33-5-2.51-8.69-4.36-9.93-9.31C114.42,144.48,114.15,147.82,115.89,150.43Z"/>
-                </g>
-                <path class="cls-338"
-                      d="M125.83,165.87a62.25,62.25,0,0,1-11.29,3.9,5.52,5.52,0,0,1,1.18.79,10.16,10.16,0,0,1,1.13,1.2,65.59,65.59,0,0,0,21.62-12.12C134.06,161.91,129.86,164.1,125.83,165.87Z"/>
-                <path class="cls-328"
-                      d="M146.18,169.85c3.12-2.08,6.24-3.12,10.4-4.16-2.08,0-4.16-1-3.12-3.12a31.79,31.79,0,0,1,7.6-5.3l-.48-.73a9.55,9.55,0,0,0-.75-.91,7.11,7.11,0,0,0-6.16-2.3,15.93,15.93,0,0,0-4.48,1.12c-1.43.55-2.81,1.28-4.21,1.92s-2.73,1.35-4.07,2l-2.44,1.25a65.59,65.59,0,0,1-21.62,12.12,6.07,6.07,0,0,1,.76,1.21,7,7,0,0,1,.45,3.54,15.06,15.06,0,0,1-.25,1.79,14.49,14.49,0,0,1-.57,1.65c-.44,1-.91,2-1.31,2.75s-.66,1.24-.89,1.69c.86-.1,1.73-.22,2.58-.34,1.54-.23,3.08-.52,4.61-.84,8.71-3.91,17.27-8.51,26-11.28C146.18,171.93,145.14,170.89,146.18,169.85Z"/>
-                <path class="cls-339"
-                      d="M161.09,157.25a31.79,31.79,0,0,0-7.6,5.3c-1,2.08,1,3.12,3.12,3.12-4.16,1-7.27,2.08-10.39,4.16-1,1,0,2.08,2.08,2.08-8.77,2.77-17.32,7.37-26,11.28.58-.12,1.16-.23,1.74-.37a31.26,31.26,0,0,0,6-2l0,0h0l5.63-2.22c1.95-.37,3.61-.64,5.36-1,.84-.23,1.7-.42,2.52-.72l1.24-.41,1.22-.5a27.78,27.78,0,0,0,8.61-5.65,21.65,21.65,0,0,0,5.45-8.36,17.88,17.88,0,0,0,.7-2.37,11.55,11.55,0,0,0,.21-1.2l.09-.61a2.56,2.56,0,0,0,0-.37Z"/>
-                <path class="cls-339"
-                      d="M121.1,183.57l1.11-.5c2.48-1.11,5-2.3,7.42-3.45a156,156,0,0,1,18-7.62,2.17,2.17,0,0,1-1.85-1,1.14,1.14,0,0,1,.37-1.25,30,30,0,0,1,9.67-4,3.34,3.34,0,0,1-2.45-1.27,2,2,0,0,1,0-2l0,0a32.83,32.83,0,0,1,7.63-5.33l.1,0,.16.27a.57.57,0,0,1,0,.19,2.06,2.06,0,0,0,0,.21l-.09.61c0,.14,0,.28-.07.42a5.35,5.35,0,0,1-.14.8l-.18.66a10.36,10.36,0,0,1-.53,1.72,21.74,21.74,0,0,1-5.48,8.41,28.14,28.14,0,0,1-8.65,5.67l-1.22.5-1.24.42a17.46,17.46,0,0,1-1.84.53l-.7.19c-1.23.27-2.41.48-3.67.71l-1.69.31-1.48.58-4.13,1.63h0a32.31,32.31,0,0,1-6.08,2c-.41.1-.83.18-1.24.27Zm32.5-20.94a1.69,1.69,0,0,0,0,1.71,3.62,3.62,0,0,0,3.05,1.2h1.06l-1,.26a31.06,31.06,0,0,0-10.35,4.14.9.9,0,0,0-.3.95c.22.54,1.13.89,2.31.89h.84l-.8.25a151.94,151.94,0,0,0-18.6,7.82c-2.08,1-4.22,2-6.35,3l.57-.13a32,32,0,0,0,6-2l.05,0h0l4.11-1.62,1.5-.59,1.72-.32c1.25-.23,2.43-.44,3.65-.71l.69-.18a16.47,16.47,0,0,0,1.82-.53l1.24-.42,1.21-.49a27.93,27.93,0,0,0,8.57-5.62,21.58,21.58,0,0,0,5.42-8.31,11.73,11.73,0,0,0,.52-1.69c.06-.23.11-.45.18-.67a5.7,5.7,0,0,0,.14-.76,3.32,3.32,0,0,1,.06-.44l.09-.6a2.06,2.06,0,0,1,0-.21.2.2,0,0,0,0-.07A31.76,31.76,0,0,0,153.6,162.63Z"/>
-                <path class="cls-340"
-                      d="M72.06,21.13s.27-.34.68-.76A14,14,0,0,1,74.19,19c-.13,0-.21,0-.23,0a2.62,2.62,0,0,0-.17-.28,2.36,2.36,0,0,0-.71-.58,6,6,0,0,0-3.4-.49l-.85,0a13.46,13.46,0,0,1,2.11,5.43c.19-.44.4-.85.58-1.18C71.82,21.48,72.05,21.14,72.06,21.13Z"/>
-                <path class="cls-329" d="M126,83.35a4.32,4.32,0,0,1-1,.83l.37.07.26,0c.11-.32.24-.66.39-1Z"/>
-                <path class="cls-329" d="M146.79,57.17a2.91,2.91,0,0,1-.1.28l.4.09Z"/>
-                <path class="cls-341"
-                      d="M127.87,84.19a6,6,0,0,0,2.28-1,9.5,9.5,0,0,1,.92-.75l0-.11a5.16,5.16,0,0,1-1.87.13c-.76-.08-1.24-.27-1.24-.35s.52,0,1.25-.1a4.75,4.75,0,0,0,2.4-.77,13.43,13.43,0,0,0,1.95-1.82,11.77,11.77,0,0,0,.76-1s.13-.19.32-.48c-.89.12-1.64.28-1.69.15s1-.7,2.1-1h.06a5.92,5.92,0,0,0,.26-.81c-.4.11-.64.17-.66.12s.25-.26.73-.51a3.93,3.93,0,0,0,0-.91c0-.22,0-.44-.07-.66a6.65,6.65,0,0,1-2.09.42,7,7,0,0,1,2-1c-.08-.51-.18-1-.28-1.36a2.34,2.34,0,0,0-.31-.76c-.11-.14-.25-.17-.24-.23s.15-.09.39,0a1.9,1.9,0,0,1,.59.79s0,0,0,0l.07,0A20,20,0,0,1,138,70.59a13.7,13.7,0,0,0,2.35-1.71,15.89,15.89,0,0,0,2.06-2.63c1.26-1.94,2.24-4,3.17-5.66A9.86,9.86,0,0,1,147,58.68c.22-.21.42-.36.55-.48h0a0,0,0,0,0,0,0s-.05-.07-.14-.19l-.38-.46-.4-.09a1.16,1.16,0,0,1-.06.15c-.69,1.47-4.5,4.7-4.5,4.7-1.33,1.16-2.92,2.49-4.65,3.86-.88.68-1.77,1.39-2.74,2.08-.24.16-.47.34-.75.51a3.3,3.3,0,0,1-.51.27,2.87,2.87,0,0,1-.59.12,1.05,1.05,0,0,1-1.2-.56l-.26-.5-.21-.4a28.23,28.23,0,0,1-2.38-13.06c.09-3.63.36-6.1.37-6.25s.24-2.62,1-6.21c.18-.87.41-1.81.72-2.8-5,11.22-4.45,23.93-1.17,35.25a6.25,6.25,0,0,1,.85.08,2.58,2.58,0,0,1,1,.4,3.33,3.33,0,0,1,.74.71,2.18,2.18,0,0,1,.43,1,1.23,1.23,0,0,1-.41,1.09c-.56.4-.78.47-.94,1.33a1.23,1.23,0,0,1-.42.54,1,1,0,0,1-.28.14.28.28,0,0,1-.22,0v0a.16.16,0,0,1,.1,0,.06.06,0,0,1,0,.08v0s0,.06-.07,0c-.1.08-.37.42-.74.79a1.28,1.28,0,0,1-1,.33,1,1,0,0,1-.43-.14h0a5.84,5.84,0,0,1-1.23.48c-.11,0,.12,0,0,0-.07.19-.31.24-.39.42.18-.21.11-.12.16-.07a1.76,1.76,0,0,1-.17.43,3.84,3.84,0,0,1-.6.83c-.15.34-.81.72-1.08,1A8.6,8.6,0,0,0,127.87,84.19Zm5.35-8.11s.15,0,.26.14c0,0,.1-.12.37-.24.06,0,.14-.1.21,0a.34.34,0,0,1,.09.2,1.4,1.4,0,0,1-.09.67c-.11.25-.26.4-.48.37a.62.62,0,0,1-.41-.41A.68.68,0,0,1,133.22,76.08Zm-.51-1.81a.82.82,0,0,1-.71.16.34.34,0,0,1-.24-.42.9.9,0,0,1,.23-.43l.11-.14s.14,0,.25.16.15-.11.45-.21a.21.21,0,0,1,.22,0,.33.33,0,0,1,.06.22A1,1,0,0,1,132.71,74.27Z"/>
-                <path class="cls-329"
-                      d="M132.37,4.26c-.21.1-.43.21-.67.35a12.37,12.37,0,0,0-1.31.85,6.15,6.15,0,0,0-1.27,1.38A14.6,14.6,0,0,0,127.92,9a28.82,28.82,0,0,0-1.34,3.58c-.12.41-.25.8-.27.87s0,.07,0,0l0-.23-.06-.45c-.05-.29-.08-.58-.12-.87-.08-.58-.15-1.14-.23-1.67a9.15,9.15,0,0,0-.36-1.58,9.74,9.74,0,0,0-.43-1,12,12,0,0,0-1.84-2.74,6.1,6.1,0,0,0-.5-.51l-.33.06c-1.71,2.15-5.05,2.82-6.24,4.89,0,1.18-.06,2.53,0,4.07v0l-.52,0s0,0,0,0-.08-.43-.14-.76a15.34,15.34,0,0,0-3.87-7.64l-.3-.28-1-.06-1.6-.14-.25,0c-1.85,1.27-2.7,3.3-3.4,5.82.15.51.31,1,.48,1.6a1.33,1.33,0,0,0,0,.53,4.32,4.32,0,0,0,.06.47c0,.13.12.48-.07.2a4,4,0,0,0-1.31-.93l-.45-.4c-.36-.31-.69-.58-1-.83l-.81-.6c-.52-.38-1-.74-1.53-1.07a19.46,19.46,0,0,0-2.83-1.61,21.24,21.24,0,0,0-4.57-1.49c-.36-.07-.68-.12-1-.16l-.9.38c-.92.42-1.8.86-2.66,1.32a37.51,37.51,0,0,0-4.43,2.82L83.5,11a1.2,1.2,0,0,0-.38.15,5.22,5.22,0,0,0-.82.6h0c-.34.3-.66.62-1,1L81,13c-.16.18-.32.35-.5.52l-.38.4-1.76-.45c-1.44-.36-3.49-.87-5.9-1.29a23.57,23.57,0,0,0-3.69-.42c-1.32,0-2.83.17-4.35.34s-3.12.43-4.7.72l-1.17.24-1,.22-.11,0c2.62,5.86,4,12.19,10.74,14.1a13.09,13.09,0,0,0-1.91,6C67.61,35,68.38,36,68.22,36.18s-.84-.41-2-1.41a.49.49,0,0,1,0,.12,13.54,13.54,0,0,1-.05,2.62v0c-.58,5.4-3.32,11,4.16,11.74-1,2.08-4.16,3.12-4.16,5.2,1,2.08,4.16,2.08,7.28,2.08-2.08,2.08-4.16,4.15-6.24,5.19,3.55,1.53,6.12,4.54,8.78,7.35.32.21.67.44,1.06.67.9.56,1.95,1.15,3.11,1.77,2.31,1.25,5,2.62,8,4L91.17,77h0c1.56-.55,3.1-1,4.34-1.32,1.41-.37,2.41-.51,2.46-.53s1-.16,2.51-.25a34.33,34.33,0,0,1,5.28.12,31.53,31.53,0,0,1,4,.66l.69-2.53c-.58-.14-1.19-.33-1.81-.53-2.9-.93-6.18-2.29-9.65-3.8-.87-.39-1.75-.76-2.65-1.19-.45-.21-.9-.44-1.35-.67l-1.31-.76a45.79,45.79,0,0,1-5-3.57A86.52,86.52,0,0,1,80,54.35c-.32-.37-.64-.72-1-1.06l-.51-.59-.82-1c0-.09-.21-.17-.15-.25l.18-.26.35-.53.56-.82c.25-.38.5-.74.75-1.11a48.35,48.35,0,0,1,3.17-4,46.2,46.2,0,0,1,5.55-5.36,28.42,28.42,0,0,1,2.65-1.87,23.7,23.7,0,0,1,2.31-1.16A29.69,29.69,0,0,1,99,34.69a49.93,49.93,0,0,1,8.62-.94,16.47,16.47,0,0,1,9.8,3.59l0,0,0,0a15.57,15.57,0,0,1,4.65,5.32,21.08,21.08,0,0,1,2.06,6.68,55.56,55.56,0,0,1,.51,6.52,26,26,0,0,1-.29,6,22.5,22.5,0,0,1-3.48,8.37c-1.25,1.83-2.23,2.71-2.31,2.61.09.12-.87.7-2.65.84l2.85,1.13h0a.64.64,0,0,1,.42.19,1.51,1.51,0,0,1,.46.65.37.37,0,0,1-.16.44.7.7,0,0,1-.4.07l-.57,0a3.9,3.9,0,0,1-.51-.06l-.81,1.4c.12,0,.19,0,.19,0s-2.67.84-5.32,1.71l-1.24.4,1.91,1.68.07.06a18.57,18.57,0,0,1,2.38-1.09c.79-.22,1.33-.17,1.34-.09s-.52.19-1.17.51-1.22.74-1.93,1.21c.79.69,1.56,1.35,2.16,1.78a5.79,5.79,0,0,0,1,.49l.46.14a7.52,7.52,0,0,0,1.64.34,12.54,12.54,0,0,0,3.63-.2A6.93,6.93,0,0,0,125.66,83a7,7,0,0,0,.87-.87l.22-.54a2.83,2.83,0,0,1-1.26,0,1.21,1.21,0,0,1-.55-.33,3.33,3.33,0,0,1-1.46.16,1.74,1.74,0,0,1-1.28-1,3.59,3.59,0,0,1-.33-1.4,3.63,3.63,0,0,1,.88-2.37,4.36,4.36,0,0,1,1.4-1.12,5.94,5.94,0,0,1,.64-.31,7.29,7.29,0,0,1,1.23-.36,5,5,0,0,1,.66-.09,1.55,1.55,0,0,1,.52.07l.21,0h.2l.3-.08.37-.11.19-.06.28-.06a8.29,8.29,0,0,1,1,0c-3.28-11.32-3.85-24,1.17-35.25a.24.24,0,0,1,0-.08,9,9,0,0,1,.79-1.93,13.51,13.51,0,0,0-3.22,7.74,13.51,13.51,0,0,1,3.22-7.74,8.7,8.7,0,0,1,.73-1.16,11.26,11.26,0,0,1,2.62-2.53,9.36,9.36,0,0,1,2.2-1.14A15.38,15.38,0,0,0,142,27.41C147.84,17.24,141,10.11,132.37,4.26ZM74.86,19.56a17,17,0,0,0-1.3,1.51c-.34.43-.54.75-.56.76l-.57.74a10.19,10.19,0,0,0-1,1.68,5.9,5.9,0,0,0-.42,1,8.57,8.57,0,0,1-3.82,6.34v0A8.57,8.57,0,0,0,71,25.23,11.77,11.77,0,0,1,70.44,27c-.07,0-.18-.36-.17-.94a6.84,6.84,0,0,1,.37-2.09,6.62,6.62,0,0,1,.3-.78,13.46,13.46,0,0,0-2.11-5.43c-2.72.08-5.14-.24-5.14-.51s1.88-.57,4.07-1a17,17,0,0,0-3.71-3.39,17,17,0,0,1,3.71,3.39l1.68-.33a7.6,7.6,0,0,1,4.63.15,4.55,4.55,0,0,1,2.05,1.64l0,0c.44-.23.76-.34.79-.28S75.86,18.5,74.86,19.56ZM118.63,82a1.11,1.11,0,0,1-1.2-.14,1,1,0,0,1-.12-1.1,4.07,4.07,0,0,1,.52-.8s.16,0,.28.11a1.08,1.08,0,0,1,.85.24,1,1,0,0,1,.45.86A1.12,1.12,0,0,1,118.63,82Z"/>
-                <path class="cls-329"
-                      d="M122.37,4.47c-.66.13-1.33.27-2,.39-.25,0-.48.08-.77.1s-.56,0-.8,0a12.42,12.42,0,0,1-1.36,0l-1,0c-.1,1.06-.2,2.5-.26,4.37C117.32,7.29,120.66,6.62,122.37,4.47Z"/>
-                <path class="cls-329"
-                      d="M108.37,4.58c-.91-.08-2.12-.17-3.57-.21-.54,0-1.11,0-1.7,0,.2.59.41,1.26.65,2,.35,1.16.76,2.5,1.22,4C105.67,7.88,106.52,5.85,108.37,4.58Z"/>
-                <path class="cls-341"
-                      d="M67.17,61.72c2.08-1,4.16-3.11,6.24-5.19-3.12,0-6.24,0-7.28-2.08,0-2.08,3.12-3.12,4.16-5.2-8.77-.88-3.49-8.41-4.11-14.49l-.73-.62A19.5,19.5,0,0,1,65.38,38a27.19,27.19,0,0,1-1.14,5.21,17.61,17.61,0,0,1-1.24,3,12.81,12.81,0,0,1-.91,1.48c-.17.24-.34.49-.54.72l-.29.35L61,49a.45.45,0,0,0,0,.66.38.38,0,0,0,.15.09l.23.08.79.31,2.46.92.67.26.33.13.18.07.08,0-.06,0-1.18.79C63.4,53.17,62.18,54,61,54.83l-.74.49-.26.19-.35.26.57.13,1.84.47,6.4,1.74-2.85,1.57-1.35.78-.5.3-.15.11h0s-.12.07-.1.12l.22.13,4.49,2.8c2.58,1.6,4.2,2.66,4.34,2.75l2.21,1.53,1.24.86C73.29,66.26,70.72,63.25,67.17,61.72Z"/>
-                <path class="cls-341"
-                      d="M152.33,18.93c.15.37.28.72.39,1,.21.61.29,1.05.31,1.08a8.68,8.68,0,0,1,.09,1.14,11,11,0,0,1-.32,2.33,9,9,0,0,1-1,3.13,18.91,18.91,0,0,1,.18-3.25,14,14,0,0,0,.07-2.16c-.06-.53-.17-.91-.17-1a9.74,9.74,0,0,0-.2-1c-.14-.59-.35-1.36-.61-2.11-.42-1.27-.91-2.49-1-2.93-.66-1-1.48-1.86-2.21-2.75a1.15,1.15,0,0,0-.12.23l-.89-1.28.19,0a7,7,0,0,1-.86-1.65,7,7,0,0,0,.86,1.65,5.67,5.67,0,0,0,.59-.13,20.47,20.47,0,0,0,2.33-.87,10.4,10.4,0,0,1,2.27-.68h0l.5-.21c.45-.2.86-.23.88-.13a5.35,5.35,0,0,1,.17,1.51,8.77,8.77,0,0,1-.57,2.95,23.62,23.62,0,0,1-1.67,3.44c.09.18.18.37.28.55.18.37.34.75.49,1.11,1.76-.7,1.48-3.46,2.73-4.68,0-.84-.05-1.36-.05-1.41s0-.87-.09-2.06S154.6,8,153.43,7.37A5.19,5.19,0,0,0,151,7c-.93,0-1.92.13-2.89.25s-1.93.2-2.81.28l-.33,0h-.54l-.8,0,.69,1.17c.27.43.39.7.33.76s-.29-.14-.66-.48-.86-.85-1.5-1.55c-.54-.15-1.29-.41-2.18-.74-1.16-.43-2.52-1-4-1.53a27.09,27.09,0,0,0-3.83-1l-.07,0c8.58,5.85,15.47,13,9.65,23.15a15.38,15.38,0,0,1-4.74,5.11,5.91,5.91,0,0,1,1.35-.31,12.1,12.1,0,0,1,7,1.66A12,12,0,0,1,148.06,36a8.79,8.79,0,0,1,1.76,2.38,14.08,14.08,0,0,1,.74,2.39c0,.73.06,1.34.07,1.86,0,.2,0,.38,0,.53a19.46,19.46,0,0,0,.36-2.11c.1-.66.13-1.12.14-1.15s.06-.48.13-1.16.14-1.56.18-2.44c.06-1.36,0-2.73.06-3.29-.07.08-.11.1-.14.09s.33-1.28.95-3.12a52.23,52.23,0,0,0,1.88-6.82,44.21,44.21,0,0,0,.84-7c0-.74,0-1.39,0-1.92C153.81,15.47,154.09,18.23,152.33,18.93Z"/>
-                <path class="cls-340"
-                      d="M150.07,15.05a5.26,5.26,0,0,1,1.24,1.75c.1-.75.42-2.05.73-3.31a8.5,8.5,0,0,0,.15-2.54,3.53,3.53,0,0,0-.05-.38,3,3,0,0,0-2,.18,5.32,5.32,0,0,0-2,1.32,3.7,3.7,0,0,0-.3.4c.73.89,1.55,1.77,2.21,2.75C150.05,15.13,150,15.06,150.07,15.05Z"/>
-                <path class="cls-331" d="M152.45,10.78l0,.05-.11.07h0v0Z"/>
-                <path class="cls-329"
-                      d="M153.24,48.69l-1.75,1.89c-.42.48-.88,1-1.36,1.51l-.72.81-1.16,1.35-.5-.14c.51-1.75,1.05-3.78,1.43-5.22A39.61,39.61,0,0,0,153.24,48.69Z"/>
-                <path class="cls-331" d="M151.61,33a.29.29,0,0,1-.1.09,1,1,0,0,1,0-.25S151.59,32.85,151.61,33Z"/>
-                <path class="cls-329"
-                      d="M150.65,55.88l-.26,0h-.09l-.51.14-2,.55-.91.26c.23-.67.53-1.67.84-2.77l.5.14c.71.47,1.42.94,2.14,1.4Z"/>
-                <path class="cls-330"
-                      d="M132.41,39.73a.85.85,0,0,0,0,.17h0c.16-.53.34-1,.54-1.57A7.83,7.83,0,0,0,132.41,39.73Z"/>
-                <path class="cls-342"
-                      d="M141.71,33.56a12.92,12.92,0,0,0-3-.11,6.3,6.3,0,0,0-2.86,1.31,9.49,9.49,0,0,0-2.23,2.29,8.63,8.63,0,0,0-.73,1.27c-.2.52-.38,1-.54,1.57.18-.13.38-.24.56-.35a6.64,6.64,0,0,1,3-.76C137.42,36.54,139.37,34.41,141.71,33.56Z"/>
-                <path class="cls-330"
-                      d="M150.46,43.94c-.05-.27-.11-.7-.18-1.25s-.15-1.11-.24-1.82a15.8,15.8,0,0,0-.83-2.15,8.4,8.4,0,0,0-1.74-2.09,12.16,12.16,0,0,0-2.37-1.92,10.15,10.15,0,0,0-3.39-1.15c-2.34.85-4.29,3-5.73,5.22q.63,0,1.32,0a8,8,0,0,1,2.92.75,7.62,7.62,0,0,1,2.61,2.15,22.59,22.59,0,0,1,2,3A8.19,8.19,0,0,1,146,48.22a13.25,13.25,0,0,1-.26,3.76l2.4.19c.4-1,.77-2.27,1.06-3.28,0,0,0,0,0,0a.3.3,0,0,0,0-.11s0,0,0,0,.06-.24.09-.34.06-.21.08-.31l.14-.51c0-.06,0-.13.05-.18s0-.16,0-.23l.05-.18h0v0C149.62,46.9,150.07,45.49,150.46,43.94Z"/>
-                <path class="cls-342"
-                      d="M132.63,57.84a7.51,7.51,0,0,1-1.94-.08.83.83,0,0,1-.3-.13,26.75,26.75,0,0,0,.23,3,24.54,24.54,0,0,0,1.73,6.51l.18.39.13.28a.17.17,0,0,0,.22.13,1.35,1.35,0,0,0,.27-.06c.07,0,.12-.05.25-.13l.72-.45c.95-.63,1.87-1.3,2.77-1.94l.92-.68a25.69,25.69,0,0,1-4.32-7Z"/>
-                <path class="cls-330"
-                      d="M145.71,52c0,.15-.09.32-.15.49s-.1.19-.16.28a.82.82,0,0,1-.17.2,4.79,4.79,0,0,1-.67.68,11.29,11.29,0,0,1-1.49,1.06,23.93,23.93,0,0,1-5.92,2.39,23.48,23.48,0,0,1-3.66.67,25.69,25.69,0,0,0,4.32,7c1.42-1,2.74-2,3.89-2.93,1.38-1.07,2.53-2,3.31-2.64l1-1.26c.62-.77.82-2.67,1.76-4.81.11-.27.24-.57.35-.89Z"/>
-                <path class="cls-332"
-                      d="M141.85,41.51A7.1,7.1,0,0,0,140,40a7.4,7.4,0,0,0-2.71-.79,5.28,5.28,0,0,0-.89,0c2.83.89,5.37,5.12,5.2,9a10.5,10.5,0,0,1-3,7.37A20.85,20.85,0,0,0,142.25,54C144.19,50.55,143.14,45.69,141.85,41.51Z"/>
-                <path class="cls-329"
-                      d="M145.15,48.28c-.08-2.33-1.54-4.38-2.84-6.2a6.36,6.36,0,0,0-.46-.57c1.29,4.18,2.34,9,.4,12.51l.33-.17a9.69,9.69,0,0,0,1.36-.94,4,4,0,0,0,.6-.56l.12-.13.05-.12a1.28,1.28,0,0,0,.13-.36A12.37,12.37,0,0,0,145.15,48.28Z"/>
-                <path class="cls-332" d="M132.23,40.42l.16-.08a1,1,0,0,0-.18.17A.29.29,0,0,1,132.23,40.42Z"/>
-                <path class="cls-329"
-                      d="M132.35,56.71a5.4,5.4,0,0,1-1.44-.11.71.71,0,0,0-.52.1c0-.7,0-1.38.07-2,0-.2,0-.4,0-.58A4.14,4.14,0,0,0,132.35,56.71Z"/>
-                <path class="cls-329"
-                      d="M131.91,106.93a4.21,4.21,0,0,0-.68-1.13,1.22,1.22,0,0,0-.63-.42s-.06-.1-.06-.22h0a8,8,0,0,1,0,.85c0,.36,0,.76,0,1.19A3.3,3.3,0,0,0,131.91,106.93Z"/>
-                <path class="cls-341"
-                      d="M130.45,107.2c0,.19,0,.38,0,.59s-.09.7-.15,1.09a1.53,1.53,0,0,0,.61-.16,3.67,3.67,0,0,0,.73-.53c.26-.22.5-.46.47-.74a2.55,2.55,0,0,0-.15-.52A3.3,3.3,0,0,1,130.45,107.2Z"/>
-                <path class="cls-343"
-                      d="M125.44,78.79a1.13,1.13,0,0,1,.24-.08,2.43,2.43,0,0,1,1,0,.72.72,0,0,1,.51.37.75.75,0,0,1-.14.68,3.09,3.09,0,0,1-.23.31l-.23.23a3.28,3.28,0,0,1-.49.4,4.87,4.87,0,0,1-.59.36.27.27,0,0,0,.13.07,2.88,2.88,0,0,0,1.35,0,6,6,0,0,0,1.39-.39c.18-.07.3-.16.31-.23a.49.49,0,0,0-.05-.16s.12,0,.17.13a.28.28,0,0,1-.09.26,1,1,0,0,0,.77-.22c.23-.14.48-.37.7-.49s.16-.11.26-.09v0a0,0,0,0,1,0-.05,1.61,1.61,0,0,1,.1-.36.36.36,0,0,0,0-.2c0-.09-.09,0-.06-.4,0-.09,0-.06,0-.07h-.08l-.15,0a1.18,1.18,0,0,0-.25.1c-.14,0-.23.06-.24,0s.05-.08.17-.18a1,1,0,0,1,.68-.25c.16.16,0,.36,0,.54s.1,0,.14,0a.62.62,0,0,0,.14-.14c-.26-.46,0-1.92-.81-1.64a2.24,2.24,0,0,1-.93,0C128,77.15,125.79,76.71,125.44,78.79Z"/>
-                <path class="cls-334"
-                      d="M131.69,76.29a2.22,2.22,0,0,0-.58-.48,1.52,1.52,0,0,0-.66-.22,5.82,5.82,0,0,0-1.56,0l-.1,0-.2.07-.37.13-.41.13a2.48,2.48,0,0,1-1-.07s0,0-.11,0a4.37,4.37,0,0,0-.48.08,8.48,8.48,0,0,0-1,.35,4.54,4.54,0,0,0-1.67,1.05,2.62,2.62,0,0,0-.71,1.68,2.45,2.45,0,0,0,.18,1,.84.84,0,0,0,.63.56,3.06,3.06,0,0,0,2.11-.52,4.5,4.5,0,0,0,.45-.31l.2-.17s.08-.07.11-.11.14-.17.11-.27-.12-.14-.2-.17a2.25,2.25,0,0,0-.72-.06,1,1,0,0,0-.31.06,2.48,2.48,0,0,0,0,.29,2.48,2.48,0,0,1,0-.29.43.43,0,0,0-.21.12,1.22,1.22,0,0,0-.22.34c-.06.09-.12.11-.13.1s0-.06,0-.14a1.09,1.09,0,0,1,.14-.45.79.79,0,0,1,.43-.29c.4-2.36,3-.68,4.37-1.49,1.23-.19.72,1,1.07,1.62h0a.59.59,0,0,0,.12-.37v-.06a.68.68,0,0,1,0-.15.7.7,0,0,1,.08-.16,1.74,1.74,0,0,1,.13-.2,2.13,2.13,0,0,1,.33-.34l.31-.26C132.14,77.14,132,76.69,131.69,76.29Z"/>
-                <path class="cls-341"
-                      d="M130.66,96a3.69,3.69,0,0,1,0,.69c-.09.56-.33,1.46-.44,2.29-.06.38-.1.74-.14,1.09-.28-1.53-.71-3.37-1.18-5.21l-.28-1.06.19.08A3.22,3.22,0,0,1,130.44,95a1.53,1.53,0,0,1,.2.78A1.46,1.46,0,0,1,130.66,96Z"/>
-                <path class="cls-341"
-                      d="M122.18,94.46H122a6.4,6.4,0,0,1-2-.55,6,6,0,0,1-1-.64,3.75,3.75,0,0,1-.92-1.06,2.77,2.77,0,0,1-.27-.61s-.07-.13,0-.15l.15,0,.29-.07a7.55,7.55,0,0,1,1.27-.24l1.07-.19c.32,0,.64-.1.91-.16a3.86,3.86,0,0,0,2.22-1.23A2.44,2.44,0,0,0,124,89a2.34,2.34,0,0,0,.34-.91s0-.06,0-.08h0s0,0,0,0h0a.52.52,0,0,0-.14-.34c-.1-.29-.19-.49-.23-.58a9.33,9.33,0,0,1-1.17.4,4.67,4.67,0,0,1-2.09.06,2.9,2.9,0,0,1-.83-.28,5,5,0,0,1-.79-.49,1.6,1.6,0,0,1-.34-.26,0,0,0,0,0,0,0,15.65,15.65,0,0,1-3.47,0,28.94,28.94,0,0,1-6.09-1.68c-.2.12-.48.3-.8.53s-.89.63-1.39,1C111.27,90.87,116.64,94.55,122.18,94.46Z"/>
-                <path class="cls-329"
-                      d="M120.19,116.83c.39-.65.78-1.36,1.14-2.12a1.71,1.71,0,0,1-.58-.49,1,1,0,0,1-.31-.6c0-.21.17-.23.16-.21s.1,0,.23,0a2.11,2.11,0,0,0,.56-.25c.23-.12.51-.27.81-.4,1.41-3.56,2.21-7.76,1-11.35a8.51,8.51,0,0,1-1.91-.75,11.13,11.13,0,0,1-1-.57l-.52-.33c-.25-.19-.52-.36-.76-.56A17.23,17.23,0,0,1,117.66,98l-.62-.58-.09-.07,0,0-.05-.07-.21-.24c.84.22,1.68.5,2.3.63a15.34,15.34,0,0,0,1.69.3l.51,0a11,11,0,0,0-1-.94,11,11,0,0,1,1,.94c.46,0,.92.1,1.36.12a6.61,6.61,0,0,0,3.07-.43,4.59,4.59,0,0,0,1.73-1.2l.15-.18-.34-.92c-.18-.5-.38-1-.56-1.49h0c-.37.09-.86.2-1.51.33a11.84,11.84,0,0,1-2.88.22c-5.54.09-10.91-3.59-15.18-8.15-.29.22-.57.45-.86.69a28.84,28.84,0,0,1-3.2,2.63s0,0,0,0l-3,.45.32.12s.28.16.29.2.22.06.27.1.21.06,0,.09l-.85.17L98.33,91c-.51.08-1,.16-1.44.25l-1.1.15a12.62,12.62,0,0,1-3.55.14,8.44,8.44,0,0,1-1.44-.35,28.67,28.67,0,0,0-.74,2.94c-.1.5-.18,1-.24,1.52a6,6,0,0,0,1.2.94,9.34,9.34,0,0,0,3.29,1.15,14.44,14.44,0,0,0,2.5.18l1.45,0c.6,0,1.35-.09,2.06-.17a12.07,12.07,0,0,0,1.69-.11l0,0c-.43.44-1,1-1,1-.55.47-.84.85-1.4,1.29l-1.32,1.06c-.8.62-1.54,1.16-2.27,1.62a19,19,0,0,1-3.75,1.7c-1,.34-1.69.55-2.15.68l-.23.08c.18,1.29.41,2.6.68,3.92a43.42,43.42,0,0,0,1.35,5,.41.41,0,0,0,.11.07,2.15,2.15,0,0,0,.73.32,1.13,1.13,0,0,1,.33.2.91.91,0,0,1,.3.74A.67.67,0,0,1,93,116a.59.59,0,0,1-.25,0,11,11,0,0,0,.49,1.11l.32.64a12.1,12.1,0,0,0,1.95,2.87c.09.08.16.16.24.24.33-.22.39-.39.39-.44l-.11-.34.37,0c.5,0,1.31,0,1.48,0a.32.32,0,0,1,.34.21,2.8,2.8,0,0,1-.47,2.3h0c.35.29.72.57,1.08.84a20.59,20.59,0,0,0,4.51,2.61,2.8,2.8,0,0,0,.28.06C110.83,127.22,116,122,120.19,116.83Zm-7.63-3.61a1.37,1.37,0,0,1,.91-.82,5.22,5.22,0,0,1,1.21-.05c.31,0,.54,0,.56,0a1,1,0,0,1,.26.08.3.3,0,0,1,.11.41c-.07.12-.1.1-.15.15l-.11,0a.33.33,0,0,0-.13.07,2.82,2.82,0,0,1-1.1.51,4,4,0,0,1-1.67.11S112.43,113.53,112.56,113.22Zm-2,4.94a1.84,1.84,0,0,1,1.4-.55l.64.06a5,5,0,0,1,.93.24c.18.08.41.27.39.5a.66.66,0,0,1-.17.33,1.54,1.54,0,0,1-.16.18,4.72,4.72,0,0,1-.75.56,2.3,2.3,0,0,1-1.37.09c0-.06.61-.14,1.21-.39a6.23,6.23,0,0,0,.6-.57.83.83,0,0,0,.11-.15v0s0,0-.07,0a5.46,5.46,0,0,0-.81-.13l-.62-.11a1.38,1.38,0,0,0-1.06.31A3.82,3.82,0,0,0,110,120,2.14,2.14,0,0,1,110.61,118.16ZM106,123a1,1,0,0,0,.32.05,2.34,2.34,0,0,0,.82-.14s.08,0,.09,0,.09,0,0-.09a1.55,1.55,0,0,0-.49-.21c-.15,0-.26,0-.28,0s.45-.33,1-.08c.16.07.35.19.39.35a.43.43,0,0,1-.13.43,1.28,1.28,0,0,1-.45.21,1.64,1.64,0,0,1-.33.05,1.87,1.87,0,0,1-.72-.07l-.17,0s0,0,0-.09,0-.08,0-.1,0,0,.08,0a.8.8,0,0,0-.09-.14C106,123,105.85,123,106,123Zm-2.54-11.15a1.19,1.19,0,0,1-.31.26,5.59,5.59,0,0,0-.48.38,1.63,1.63,0,0,1-.75.34,1.56,1.56,0,0,1-.77-.19c-.2-.09-.38-.19-.56-.26s-.53-.28-.51-.32a1.55,1.55,0,0,1,.59.1l.59.17a1.26,1.26,0,0,0,.61.09c.33-.07.64-.51,1-.74.12-.08,0,0,.06-.06h0l-.34-.08a5.8,5.8,0,0,0-1.27,0,8.19,8.19,0,0,1-1.33,0,1.56,1.56,0,0,0-.31,0c0,.07.06.11,0,.12s-.07,0-.16-.1,0-.14,0-.15a.27.27,0,0,1,.11,0l.26,0c.37,0,.84-.07,1.29-.16a5.26,5.26,0,0,1,1.39-.1,2.08,2.08,0,0,1,.54.11.81.81,0,0,1,.29.17.44.44,0,0,1,0,.57Z"/>
-                <path class="cls-341"
-                      d="M129.31,101.35a9.65,9.65,0,0,1-4,.36,9.21,9.21,0,0,1-2.1-.33c1.24,3.59.44,7.79-1,11.35a5.09,5.09,0,0,1,1-.34,2.72,2.72,0,0,1,.55-.06l.6,0a2.91,2.91,0,0,1,1.31.1.32.32,0,0,1,0,.52,3.09,3.09,0,0,1-.37.17l-.53.17-.31.1-.2.07a8,8,0,0,0-1.62,1,1.48,1.48,0,0,1-1.07.38.58.58,0,0,1-.22-.08c-.36.76-.75,1.47-1.14,2.12-4.16,5.2-9.36,10.39-16.63,9.35a2.8,2.8,0,0,1-.28-.06,14.4,14.4,0,0,0,3.25.95,26.1,26.1,0,0,0,4.26.21,30.06,30.06,0,0,0,4.18-.38c2.68-.48,5.25-1.42,6.74-3.39a48.38,48.38,0,0,0,4.27-5.83,27.07,27.07,0,0,0,4-10c.41-2.57.23-4.09.35-4.09C130.12,103.65,129.82,102.73,129.31,101.35Zm-5.85,19.15a2.23,2.23,0,0,1-.26.48.46.46,0,0,1-.38.23c-.12,0-.16-.06-.16-.08s.23,0,.31-.3a3.1,3.1,0,0,0,.13-.45,2,2,0,0,0,.06-.39s0,0,0,0a.69.69,0,0,1-.13.05s-.14.06-.34.12a7.69,7.69,0,0,0-.74.3,5.65,5.65,0,0,1-1.09.45c0-.07.39-.48.89-.81a5.63,5.63,0,0,1,1.1-.61,2,2,0,0,1,.35-.08c.26-.08.64.07.54.45A3.36,3.36,0,0,1,123.46,120.5Zm2.44-12.84a1.8,1.8,0,0,1-1,.52.6.6,0,0,1-.46-.2.43.43,0,0,1-.09-.4c0-.22.15-.3.18-.29s0,.14,0,.3.14.21.3.19a1.24,1.24,0,0,0,.42-.31l.2-.21c0-.07,0,0,.1-.07s0,0-.08-.07l-.44-.18c-.27-.12-.43-.16-.46-.19s.25-.14.54-.1a2.57,2.57,0,0,1,.47.08,8.34,8.34,0,0,1,.81.22A5.93,5.93,0,0,1,125.9,107.66Z"/>
-                <path class="cls-342"
-                      d="M130.57,3.9c-.23.21-.48.45-.74.71a8.4,8.4,0,0,0-1.29,1.72,22.47,22.47,0,0,0-1.1,2.25c-.23.6-.5,1.33-.76,2.09-.08.22-.14.43-.15.46s0,.13,0,.07v-.15l0-.28c0-.19,0-.37-.07-.56l-.09-1a4.62,4.62,0,0,0-.19-.88,10.71,10.71,0,0,0-.36-1.09,22.07,22.07,0,0,0-1.49-3.12c.54-.1,1.08-.2,1.64-.28a16.14,16.14,0,0,1,2.62-.2,5.07,5.07,0,0,1,.56,0l.71.11Z"/>
-                <path class="cls-328"
-                      d="M129.21,101.07a2.15,2.15,0,0,0,.1.27,7.27,7.27,0,0,0-1.12,0,18.64,18.64,0,0,1-2.88-.14,9.26,9.26,0,0,1-3.73-1.21c-.3-.19-.61-.37-.92-.58l-.42-.3-.15-.12a2.49,2.49,0,0,1-.23-.22l-.09-.09s.11,0,.15,0l.28.07a1.5,1.5,0,0,0,.33.08c.66.1,1.31.17,1.93.22a7.75,7.75,0,0,0,3.55-.4,5.61,5.61,0,0,0,1.91-1.2C128.4,98.83,128.85,100.06,129.21,101.07Z"/>
-                <path class="cls-341"
-                      d="M126.84,145.55a1.49,1.49,0,0,1,.72.29,2.15,2.15,0,0,0-.41-1c-.31.2-.62.48-.93.7A1.79,1.79,0,0,1,126.84,145.55Z"/>
-                <path class="cls-329"
-                      d="M125.7,144.16a12.61,12.61,0,0,0-1.53.68,15.27,15.27,0,0,1-2.91,1.1,9.8,9.8,0,0,1-2.39.05c-.65,0-1.15,0-1.5,0h-.21l-.57.11h0l-.12,0h0c.11.52.21,1,.32,1.55l.15.09a29,29,0,0,0,9.07,1,2,2,0,0,0,.28-.3l.16-.21a1.4,1.4,0,0,0-.45-.61,2.56,2.56,0,0,0-.86-.28c-.26-.06-.44-.12-.44-.17s0,0,.11,0a1.08,1.08,0,0,1-.45-.26,1.08,1.08,0,0,0,.45.26l.35,0c.15,0,.36,0,.58,0a6,6,0,0,1,1.51-.17l.13-.21.15-.27a1.34,1.34,0,0,0-.76-.63,3.86,3.86,0,0,0-.89,0,.88.88,0,0,0-.29,0c-.08,0-.12,0-.13,0h0a.24.24,0,0,1,.09-.08.5.5,0,0,1,.29-.17l.39-.09c.31-.22.62-.5.93-.7-.06-.08-.1-.17-.16-.24A1.32,1.32,0,0,0,125.7,144.16Z"/>
-                <path class="cls-341"
-                      d="M125.73,147.23a1.36,1.36,0,0,1,.48.14,1.75,1.75,0,0,1,.55.49.71.71,0,0,1,.08-.15l.4-.65A6,6,0,0,0,125.73,147.23Z"/>
-                <path class="cls-341"
-                      d="M116.93,147.84l2.5,1.38,4.31.05a4.23,4.23,0,0,0,1.91-.2,1.63,1.63,0,0,0,.35-.23A32.79,32.79,0,0,1,116.93,147.84Z"/>
-                <path class="cls-331" d="M126.58,148.65h-.08Z"/>
-                <path class="cls-328"
-                      d="M118.77,92.27a2.72,2.72,0,0,0,.65.66,4.47,4.47,0,0,0,.9.46,4.4,4.4,0,0,0,1.82.3,6.74,6.74,0,0,0,2.61-.72,7.17,7.17,0,0,0,1.2-.72c-.3-.81-.58-1.57-.84-2.24-.15.13-.31.27-.48.4a5.79,5.79,0,0,1-3,1.06c-.58.07-1.21.12-1.92.18l-.84.08-.22,0c-.07,0-.2,0-.12.09A1.42,1.42,0,0,0,118.77,92.27Z"/>
-                <path class="cls-331" d="M124.81,84.11h0a.08.08,0,0,1,0,0v0Z"/>
-                <path class="cls-329"
-                      d="M124.8,85.46v.16c0,.17-.24.39-.24.39s-.35.23-.45.32a2.94,2.94,0,0,1-1.41.64,2.43,2.43,0,0,1-1.76-.16,1.37,1.37,0,0,1-.47-.37.51.51,0,0,1-.08-.26v0a11.56,11.56,0,0,0,1.23-.44,15.09,15.09,0,0,0,2.39-.89.73.73,0,0,0,.19.24l.09.05.1,0,.08,0A2.42,2.42,0,0,1,124.8,85.46Z"/>
-                <path class="cls-329"
-                      d="M124.22,112.79l.06,0a.07.07,0,0,1-.06,0h0l-.17.07a7.91,7.91,0,0,0-1.64,1.15c-.27.2-.55.42-.79.39a1.26,1.26,0,0,1-.67-.4,1.18,1.18,0,0,1-.36-.46c0-.13,0-.18,0-.2s.08.09.24.08a2.12,2.12,0,0,0,.65-.15,8.31,8.31,0,0,1,1.8-.54,4.1,4.1,0,0,1,.5,0Z"/>
-                <path class="cls-342"
-                      d="M123.45,56a56.55,56.55,0,0,0-.69-6.34,20.06,20.06,0,0,0-2.07-6.14,14.11,14.11,0,0,0-4.32-4.67l-.06,0a15.59,15.59,0,0,0-3.48-1.93c1.14.76,1.81,1.68,1.12,3a4.55,4.55,0,0,1-2.94,1,14.92,14.92,0,0,1,2.25.81,18.31,18.31,0,0,1,2.88,1.56,9.35,9.35,0,0,1,2.06,2.3,18.42,18.42,0,0,1,2,4.48,30.6,30.6,0,0,1,1.06,4.48c.17,1,0,3.18-.32,3.47a3.46,3.46,0,0,1-1,1c-1.55,6.47-8.69,10.65-15.5,11,1.59.7,3.1,1.34,4.52,1.87a27,27,0,0,0,3.87,1.2,13.09,13.09,0,0,0,3.09.27,10.24,10.24,0,0,0,2-.19c.45-.08.67-.2.69-.18a4.49,4.49,0,0,1,.51-.74c.33-.49.81-1.21,1.35-2.15a23.79,23.79,0,0,0,2.93-8.25A25,25,0,0,0,123.45,56Z"/>
-                <path class="cls-330"
-                      d="M120,58.93l-.49.32a13.18,13.18,0,0,1-5,1.81,22.52,22.52,0,0,1-7.88-.31,38.42,38.42,0,0,1-4.52-1,17.52,17.52,0,0,1-4.64-2h0l-1.53-1c-.26-.18-.51-.39-.76-.58l-.37-.28c-.21-.15-.41-.31-.6-.47,0-.25,0-.51,0-.76s.06-.35.1-.52c.06-.33.14-.65.23-1a15.75,15.75,0,0,1,.67-1.85,22.75,22.75,0,0,1,7.55-8.73,11.69,11.69,0,0,1,3.45-1.7,8.81,8.81,0,0,1,3.78-.19c.36.07.72.15,1.07.25a4.55,4.55,0,0,0,2.94-1c.69-1.37,0-2.29-1.12-3a13.4,13.4,0,0,0-5.19-1.05,48.69,48.69,0,0,0-8.2,1.05,30.13,30.13,0,0,0-3.59,1C87.51,42.33,85.47,55,92.12,60.68a62.77,62.77,0,0,0,12.32,9.2h0C111.26,69.58,118.4,65.4,120,58.93Z"/>
-                <path class="cls-342"
-                      d="M95.85,37.82c-.71.24-1.35.49-1.87.71a21.68,21.68,0,0,0-2,1c-.09.09-1,.59-2.43,1.68a42.9,42.9,0,0,0-5.37,5A44.24,44.24,0,0,0,81.05,50l-.76,1.08-.19.26,0,0s-.08,0,0,.09l.06.08.4.48.93,1.06a85,85,0,0,0,8.34,8.31,45.45,45.45,0,0,0,4.73,3.57l1.22.77,1.26.68c.84.43,1.73.84,2.58,1.24,1.69.81,3.32,1.57,4.88,2.26a62.77,62.77,0,0,1-12.32-9.2C85.47,55,87.51,42.33,95.85,37.82Z"/>
-                <path class="cls-341"
-                      d="M120.62,127.6l.13-.28s.28-.49.66-1.16c.24-.45.55-1,.85-1.55a8.89,8.89,0,0,1-3,2.24,16.11,16.11,0,0,1-4.1,1.32c-.39.08-.78.15-1.18.2,0,.27,0,.64.08,1.08.08,1.1.19,2.65.34,4.56.07.94.17,2,.25,3.07q.08.72.15,1.5c.08.24.1.37.14.52l.09.44c.08.3.14.59.2.89,0,.11,0,.23.07.34C115.59,135.42,115.62,129.3,120.62,127.6Z"/>
-                <path class="cls-329"
-                      d="M115.35,140.77c.35,1.74.73,3.62,1.11,5.42l.12,0h0v0a.28.28,0,0,0,0-.09c0-.27,0-.67,0-1.23,0-1.07,0-2.71.14-5a43.28,43.28,0,0,1,.59-5,3.52,3.52,0,0,0,0-.49c-.32.27-.55.41-.59.29s1-1.84,2.07-3.57a27.68,27.68,0,0,0,1.31-2.45l.44-.94C115.62,129.3,115.59,135.42,115.35,140.77Z"/>
-                <path class="cls-332"
-                      d="M120.94,56.62S121,58,121,58s-.57.46-1.64,1a11.88,11.88,0,0,1-1.11.51c1.29-1.4,1.65-3.56,1.86-6.06A26.17,26.17,0,0,1,120.94,56.62Z"/>
-                <path class="cls-333"
-                      d="M120.08,53.47c-.21,2.5-.57,4.66-1.86,6.06a11.07,11.07,0,0,1-1.35.48l.25-.2a17.5,17.5,0,0,1-4.45.62h-1.53c-2.17-1.46-3.58-4.68-3.38-8.36.25-4.64,2.86-8.24,6-8.43a10.86,10.86,0,0,1,1.39.83,7.81,7.81,0,0,1,1.52,1.73,1.11,1.11,0,0,1,.2.26l.44.81a2.43,2.43,0,0,0,.15.26A39.34,39.34,0,0,1,120.08,53.47Z"/>
-                <path class="cls-329"
-                      d="M119,85.77h-.1a17.63,17.63,0,0,1-3.43-.24,26.21,26.21,0,0,1-5-1.59l2.3-1.52A25,25,0,0,0,115,84.59a6.46,6.46,0,0,0,1.76.86,8,8,0,0,0,1.9.31Z"/>
-                <path class="cls-329"
-                      d="M116,73.7l2.85,1.13a.54.54,0,0,0-.4.2,1.56,1.56,0,0,0-.32.6s.12.1.27.13l-.29.27,0,0s0,0,0,0l-.81,1.4a27,27,0,0,0-4.05.66l-.15-1.34h0A7.63,7.63,0,0,0,110.9,76c-.34-.09-.71-.19-1.11-.28l.69-2.53a17.37,17.37,0,0,0,2.23.49A12.85,12.85,0,0,0,116,73.7Z"/>
-                <path class="cls-329"
-                      d="M100.6,177.16a16.24,16.24,0,0,1-3,4.85c-.49.59-.9,1.07-1.15,1.42l0,.06c2.78.5,5.65.87,8.51,1.31l1.6.25.34,0h.52L108,185c1.07-.06,2.15-.14,3.22-.23l2.49-.25.26-.49c.26-.46.61-1.1,1-1.87s.91-1.66,1.36-2.62a10.73,10.73,0,0,0,.59-1.51,11.11,11.11,0,0,0,.31-1.64,6.51,6.51,0,0,0-.23-3.19,6.07,6.07,0,0,0-.73-1.3,51.29,51.29,0,0,1-15.17,2.3A12.69,12.69,0,0,1,100.6,177.16Z"/>
-                <path class="cls-341"
-                      d="M114.06,169.88c-.57.13-1.13.25-1.69.34a33.41,33.41,0,0,1-10.82.2l-1.8-.3a3.12,3.12,0,0,1,1,1.41,6.58,6.58,0,0,1,.36,2.7,51.29,51.29,0,0,0,15.17-2.3,11.66,11.66,0,0,0-.87-1A4.82,4.82,0,0,0,114.06,169.88Z"/>
-                <path class="cls-333"
-                      d="M117.12,59.81l-.25.2a5.08,5.08,0,0,1-.59.17h0a27.52,27.52,0,0,1-3.58.25A17.5,17.5,0,0,0,117.12,59.81Z"/>
-                <path class="cls-333" d="M116.87,60a.43.43,0,0,1-.1.09l-.49.08A5.08,5.08,0,0,0,116.87,60Z"/>
-                <path class="cls-331" d="M116.08,13.43v0l-.52,0s0,0,0,0Z"/>
-                <path class="cls-329"
-                      d="M115.33,112.71s0,0,0,.07a.51.51,0,0,0-.07.18h-.07s-.2,0-.5-.07l.25-.21a1,1,0,0,1,.23-.13c.06,0,0-.07.08,0A.36.36,0,0,0,115.33,112.71Z"/>
-                <path class="cls-333"
-                      d="M116.25,60.18a12.3,12.3,0,0,1-1.49.29h-.1a.52.52,0,0,0-.43.08h-.09l-.9.06c-.32,0-.64,0-1,0s-.57,0-.85,0l-.28-.18h1.53A27.52,27.52,0,0,0,116.25,60.18Z"/>
-                <path class="cls-342" d="M115,5c.17,1.29.34,3.21.47,5.91a23.88,23.88,0,0,0-2.57-6Z"/>
-                <path class="cls-333" d="M114.76,60.47l-.25,0h-.28a.52.52,0,0,1,.43-.08Z"/>
-                <path class="cls-329"
-                      d="M114.64,112.88a2,2,0,0,1-.64.35c-.62.22-1.31.38-1.5.47.13-.16.44-.83,1.07-.89A6.34,6.34,0,0,1,114.64,112.88Z"/>
-                <path class="cls-329"
-                      d="M113.06,76.82l.15,1.34c-.43.08-.87.18-1.31.29-.62.15-1.26.32-1.85.49-.84-.71-1.44-1.15-1.53-1a12.33,12.33,0,0,0,1,1.17l-1.41.45c-1,.34-1.73.63-1.77.65a15.63,15.63,0,0,0-1.68.9c-.23.14-.47.32-.73.49-2.14-.7-4.38-1.35-6.6-2-.41-.12-.87-.24-1.2-.36L95,78.74l-2.35-1.06-.27-.13c1.23-.33,2.42-.62,3.38-.82,1.38-.31,2.34-.4,2.4-.42s1-.18,2.41-.34a36.41,36.41,0,0,1,5.14-.12,39,39,0,0,1,5.08.56C112,76.62,112.85,76.82,113.06,76.82Z"/>
-                <path class="cls-329"
-                      d="M104.57,43a19.26,19.26,0,0,0-3.94,2.91,18.93,18.93,0,0,0-4.41,5.84,13.37,13.37,0,0,0-.65,1.69c-.08.29-.17.57-.23.86l-.08.42,0,.17.48.39c.25.19.48.39.73.56L98,56.88l0,0a14.24,14.24,0,0,0,3.52,1.66C99,54,100,47.6,104.57,43Z"/>
-                <path class="cls-332"
-                      d="M107.76,52.08c.25-4.64,2.86-8.24,6-8.43l-1.16-.58a8.77,8.77,0,0,0-6.12-.89,10.62,10.62,0,0,0-2,.8c-4.53,4.62-5.56,11-3,15.6l.78.27A38.19,38.19,0,0,0,106.68,60a27.46,27.46,0,0,0,4.74.64l-.28-.18C109,59,107.56,55.76,107.76,52.08Z"/>
-                <path class="cls-331" d="M112.47,113.73s0,0,0,0S112.48,113.73,112.47,113.73Z"/>
-                <path class="cls-341"
-                      d="M100.51,154.21a2.45,2.45,0,0,0,.12.31,3.65,3.65,0,0,0,.26.44h0l0-.06.16-.13.32-.28,2.48-2.11c.71-.61,1.39-1.18,2-1.67l.7-2.23A18.08,18.08,0,0,1,100.51,154.21Z"/>
-                <path class="cls-341"
-                      d="M100.81,153.13c-.33.39-.33.64-.32.66a.82.82,0,0,0,0,.22.88.88,0,0,0,0,.2,17.54,17.54,0,0,0,3.88-3.06,10.17,10.17,0,0,1-3.31,1.61C101,152.87,100.9,153,100.81,153.13Z"/>
-                <path class="cls-341"
-                      d="M98.24,153a3.33,3.33,0,0,0-.28.54l-.11.23a1.46,1.46,0,0,0-.14.51.88.88,0,0,0,0,.28l.32,0,.8.13,1.64.22a2.13,2.13,0,0,1-.21-.22,1.48,1.48,0,0,1-.38-1c-.08-.13.21-.51.54-.83A7.75,7.75,0,0,1,98.24,153Z"/>
-                <path class="cls-341"
-                      d="M96.75,153.18a2,2,0,0,0,0,.23v.14c.17.22.35.45.52.69a1.81,1.81,0,0,1,.15-.94,1.3,1.3,0,0,1,.18-.27l.06-.08a5.51,5.51,0,0,1-.89-.22C96.77,152.88,96.76,153,96.75,153.18Z"/>
-                <path class="cls-329"
-                      d="M109.79,133.46c0-1.63-1.92-3.26-3.25-4.9l-.24,0a16.43,16.43,0,0,1-3.89-1.09c.49.9,1.1,2.19,1.65,3.5s1,2.53,1.36,3.53a14,14,0,0,1,.51,1.79,42,42,0,0,1,.24,5.61c0,2.67-.17,5.29-.45,5.34h0a21.48,21.48,0,0,1-3.11,2.05c-.06,0-3.43,1.39-3.58,1.11a1.71,1.71,0,0,0-1.24.32,2,2,0,0,0-.8,1.13,5.21,5.21,0,0,0-.18.86v0a5.51,5.51,0,0,0,.89.22,3.68,3.68,0,0,1,.39-.41c.38-.31.86-.43.88-.35s-.34.31-.58.65a1.92,1.92,0,0,0-.13.17,7.75,7.75,0,0,0,2.2-.11c.37-.34.8-.62.88-.43a1.94,1.94,0,0,0-.24.29,10.17,10.17,0,0,0,3.31-1.61,18.06,18.06,0,0,0,2.19-2.68l.21-.67a1.11,1.11,0,0,0,.08-.24l0-.05s0-.07,0-.1l0-.13v-.05c0-.11.1-.24.15-.38.21-.56.51-1.34.85-2.27s.78-2,1.23-3.13c.17-.43.35-.87.52-1.32A24,24,0,0,0,109.79,133.46Z"/>
-                <path class="cls-341"
-                      d="M110.83,128.67a25.85,25.85,0,0,1-4.29-.11c1.33,1.64,3.25,3.27,3.25,4.9a24,24,0,0,1-.08,6.67c.06-.14.12-.28.17-.43l.38-.9.07-.16,0,0v0l0-.11.09-.47c.37-2.56.74-5.1,1-7,.15-1,.27-1.83.36-2.38Z"/>
-                <path class="cls-329"
-                      d="M110.28,79.87c.54.58,1.17,1.25,1.82,1.91-.75.41-1.47.79-2,1.12l-.94.53-2-.78c-.62-.23-1.25-.45-1.89-.67.89-.46,1.56-.72,1.6-.74s.67-.32,1.66-.7C109,80.33,109.62,80.1,110.28,79.87Z"/>
-                <path class="cls-331" d="M108.7,147.49l0,.14h0l0,.05Z"/>
-                <path class="cls-344"
-                      d="M107.89,84.29l-1.19-.41c-.77-.25-1.58-.49-2.39-.72.65.83,1.34,1.66,2.06,2.46.48-.46.95-.88,1.36-1.22Z"/>
-                <path class="cls-329"
-                      d="M103.7,83,102,84.1A34.53,34.53,0,0,1,97.22,87l-.59.34a6.64,6.64,0,0,0,.75,1c.14.13.28.29.43.41a5.31,5.31,0,0,0,.67.5,7.27,7.27,0,0,0,1.42.76l3-.45a16.41,16.41,0,0,1,2.65-3.21c.26-.27.52-.53.79-.78-.72-.8-1.41-1.63-2.06-2.46Z"/>
-                <path class="cls-331" d="M106.15,123.24s.15.2,0,0Z"/>
-                <path class="cls-342"
-                      d="M104.8,12c0,.15.2.51,0,.23a12.11,12.11,0,0,0-1-1l-.27-.21-.62-.5-.81-.62-1.56-1.15A25.86,25.86,0,0,0,97.64,7,32.83,32.83,0,0,0,94,5.32a27.82,27.82,0,0,1,5.54-.88c.73,0,1.43-.07,2.12-.08a22.39,22.39,0,0,1,1.09,2.27c.55,1.25,1.3,3.24,1.71,4.38,0,.07.11.27.2.55S104.74,11.87,104.8,12Z"/>
-                <path class="cls-329"
-                      d="M95.6,80.83h0c-.13.25-.34.69-.66,1.32.1.36.19.8.32,1.33a19.25,19.25,0,0,0,1,3.09,7.57,7.57,0,0,0,.41.8l.59-.34a33.12,33.12,0,0,1,4.31-3.6l1-.79c-1.83-.5-3.71-1-5.61-1.46C96.48,81.08,96.09,81,95.6,80.83Z"/>
-                <path class="cls-328"
-                      d="M101.07,98l.05.07-1,.8a31.49,31.49,0,0,1-4.38,3A12.34,12.34,0,0,1,92.1,103a15.67,15.67,0,0,1-2.19.21h-.18c-.08-.69-.13-1.39-.17-2.07a28.17,28.17,0,0,1,0-3.57c.27.12.57.25.91.37a12.91,12.91,0,0,0,3.8.75,22.81,22.81,0,0,0,2.59,0l1.44-.12c.39,0,.73-.07,1.14-.12l1-.25S100.86,98.1,101.07,98Z"/>
-                <path class="cls-328"
-                      d="M92.17,176.34a17.54,17.54,0,0,1-5.13,3l-1.19.44c.3.18.6.36.91.52a24.29,24.29,0,0,0,5.63,2.32c.91.25,1.85.46,2.79.66a19.52,19.52,0,0,1,1.6-1.95,15.32,15.32,0,0,0,3-4.41,12.83,12.83,0,0,0,.63-2.66A50.67,50.67,0,0,1,94,173.7,6.54,6.54,0,0,1,92.17,176.34Z"/>
-                <path class="cls-338"
-                      d="M100.32,171.67A3.14,3.14,0,0,0,99.26,170c-.58-.14-1.11-.3-1.61-.45l-2.83-.82-.77-.23a6.72,6.72,0,0,1,.41,2.48A7.71,7.71,0,0,1,94,173.7h0a50.67,50.67,0,0,0,6.45.53A6.46,6.46,0,0,0,100.32,171.67Z"/>
-                <path class="cls-329"
-                      d="M95.46,123c-.42-.36-.83-.73-1.23-1.13-.13-.12-.24-.25-.35-.37a5.81,5.81,0,0,1-.55,1c0,.07,0,.14,0,.2a1.14,1.14,0,0,0,.44.79.79.79,0,0,0,0,.24l.5.81c.37.62.8,1.15.71,1.45s-1,.22-1.78-.18a7.08,7.08,0,0,1-1-.61,3.21,3.21,0,0,1-.52-.56s0-.09-.08-.21,0,0,0,0l0,0-1.16,1.09.07,0,0,0a.56.56,0,0,0-.09.13,2.38,2.38,0,0,0-.29.54,1.34,1.34,0,0,0,.23,1.46c.11.12.27.26.45.42s.35.28.52.41c.33.27.66.51.94.71.57.41,1,.62,1,.77s-.57.24-1.32.06a8.21,8.21,0,0,1-1.22-.4l-.67-.3a4.22,4.22,0,0,1-.71-.41,3.12,3.12,0,0,1-1.09-1.33l-.75.71c-.4.38-.83.79-1.28,1.2a1.39,1.39,0,0,0,.06.19,4.52,4.52,0,0,0,.94,1.64c1,1.15,2.49,1.91,2.36,2.23s-1.86.11-3.45-1A6.13,6.13,0,0,1,84.66,131c-.49.47-1,1-1.51,1.53l-.4.44a4.9,4.9,0,0,0,.17.55,4.22,4.22,0,0,0,.78,1.32,6.1,6.1,0,0,0,1.31,1c.4.24.68.29.75.42s-.32.48-.94.46a4.43,4.43,0,0,1-2.13-.61,5.25,5.25,0,0,1-1.55-1.43c-1,1.12-2,2.32-3.07,3.62a4.69,4.69,0,0,0,.6,1.71,4.65,4.65,0,0,0,1.22,1.36,5.54,5.54,0,0,0,1.92.88l.34.08C88.89,136.9,95.75,131,95.46,123Z"/>
-                <path class="cls-341"
-                      d="M97.79,124.85c-.81-.6-1.58-1.21-2.33-1.86.29,8-6.57,13.91-13.31,19.36a13.73,13.73,0,0,0,3.76.39,9.23,9.23,0,0,0,1.41-.16c1.32-1.69,3-3.45,4.55-5.15,1.26-1.36,2.39-2.77,3.45-4.15A43.59,43.59,0,0,0,98,129.47a21.87,21.87,0,0,0,1.49-2.83c.08-.2.15-.39.22-.53C99.05,125.71,98.42,125.29,97.79,124.85Z"/>
-                <path class="cls-328"
-                      d="M99.22,90.23s.26,0,.09.06l-.52.09-1,.14-.9.08-1.08.06a8,8,0,0,1-3.19-.34,4.75,4.75,0,0,1-1.28-.71c.13-.38.29-.75.44-1.1.73-1.57,1.51-3.06,2.07-4.22.06-.11.11-.22.16-.32s0,0,0,0c.4.77.83,1.79,1.53,3A7.64,7.64,0,0,0,97,88.86a6.4,6.4,0,0,0,.49.42c.13.1.25.19.39.28a6.09,6.09,0,0,0,.91.5l.17.07Z"/>
-                <path class="cls-329"
-                      d="M97.71,120.67a2.37,2.37,0,0,1-.36,1.61.21.21,0,0,1-.08,0c-.4-.35-.81-.71-1.18-1.08a1.4,1.4,0,0,0,.48-.58C96.88,120.68,97.41,120.68,97.71,120.67Z"/>
-                <path class="cls-329"
-                      d="M80.42,165.55l-.08,0a10.69,10.69,0,0,1-3,1,11.28,11.28,0,0,1-2.78,0c-.52-.05-1-.11-1.39-.19.38,1.25.72,2.37.86,2.66a8.06,8.06,0,0,1,.28,1l.17.82c.13.56.25,1.1.37,1.65.25,1.11.49,2.22.74,3.35l.1.53,0,.11c0,.06,0,0,.06,0l.15-.18L77,174.93l1-1.31.69,1.49,1.43,3c0-.92,0-1.84,0-2.77.79.69,1.63,1.49,2.38,2.07.36.31.79.61,1.11.85l.61.42a4.65,4.65,0,0,0,.41.26h0l.28-.08c.45-.14,1.07-.32,1.8-.58a17.38,17.38,0,0,0,5-2.58,5.6,5.6,0,0,0,1.7-2.13c-1.09-.17-2.18-.37-3.28-.62A15.38,15.38,0,0,1,80.42,165.55Z"/>
-                <path class="cls-341"
-                      d="M94,168.48c-.35-.11-.64-.19-.86-.27a2,2,0,0,1-.57-.22h0l-.33-.41a3.94,3.94,0,0,1-1.4-.66,13.23,13.23,0,0,1-2.61-2.33A27.38,27.38,0,0,1,86,161.85c-.56-.78-.91-1.33-.93-1.36s-.23-.38-.53-1c-.13.43-.32,1-.56,1.7-.13.36-.26.75-.41,1.18a7,7,0,0,1-1,1.64,5.29,5.29,0,0,1-2.12,1.5A15.38,15.38,0,0,0,90,173c1.1.25,2.19.45,3.28.62A7.62,7.62,0,0,0,94,171,15.13,15.13,0,0,0,94,168.48Z"/>
-                <path class="cls-331" d="M92.67,116a.13.13,0,0,0,0,.08.09.09,0,0,1-.06,0S92.65,116,92.67,116Z"/>
-                <path class="cls-331" d="M89.59,3.88l0,0v0Z"/>
-                <path class="cls-341"
-                      d="M83.44,94.25l0,0-.19.2c-.06.06-.15.14-.12.13s0,0,0,.11a3.3,3.3,0,0,0,.12.37,4.36,4.36,0,0,0,.48.93c.44.69,1.64,1.5,2.54,2.72a5.5,5.5,0,0,1,.94,2,7.79,7.79,0,0,1,.19,1.81c0,.26,0,.5,0,.72s0,.21-.06.32a.58.58,0,0,1,0,.16.93.93,0,0,1,0,.1h0a2.94,2.94,0,0,1,.44.42.81.81,0,0,1,.19.41h0c-.15-1.15-.27-2.28-.34-3.4,0-.42,0-.84,0-1.25l0-.27,0,0-.13-.15L87,99.25c-.17-.24-.35-.47-.52-.69a14.89,14.89,0,0,1-.93-1.36l-.2-.34c-.07-.15-.12-.21-.22-.45A1.62,1.62,0,0,1,85,95.2c.11-.36.53-.57.86-.8l.47-.32,1.73-1.16h0a29.71,29.71,0,0,1,.83-3C87,91.85,86.88,95.54,83.44,94.25Z"/>
-                <path class="cls-329"
-                      d="M87.44,90.75c-.84.67-1.73,1.41-2.52,2.11l-1.07,1-.41.41c3.44,1.29,3.6-2.4,5.49-4.38,0-.13.08-.27.13-.4C88.58,89.83,88,90.27,87.44,90.75Z"/>
-                <path class="cls-329"
-                      d="M86.92,106.43a2.07,2.07,0,0,0,.16-2.32l-.39-.28a1.48,1.48,0,0,0-1-.34,3,3,0,0,0-1,.31c-.32.16-.62.33-.67.47s0,.25.12.37a1.52,1.52,0,0,0,.17.15s0,.17-.09.3-.22.2-.27.16a1.35,1.35,0,0,1-.24-.25.88.88,0,0,1-.21-.36.77.77,0,0,1,0-.61,1.81,1.81,0,0,1,1-.66l.08,0c0-.07.11-.13.18-.21s0-.34-.13-.6-.08-.48-.26-.69-.28,0-.38.13a3.4,3.4,0,0,0-.32.34c-.1.1-.34.3-.47.44a2.58,2.58,0,0,0-.38.52c-.1.22-.2.46-.29.71C83.43,105.67,84.6,107.2,86.92,106.43Z"/>
-                <path class="cls-341"
-                      d="M88.11,106.35a0,0,0,0,1,0,0c-.1-.55-.18-1.1-.26-1.65h0a.66.66,0,0,1,0,.32c0,.18-.12.25-.13.25s.21-.45-.22-.83a4.84,4.84,0,0,0-.39-.31,2.07,2.07,0,0,1-.16,2.32c-2.32.77-3.49-.76-4.36-2.45l-.27.75c-.07.25-.2.56-.24.79a1,1,0,0,0,0,.62,1.9,1.9,0,0,0,1.15.85,7.58,7.58,0,0,0,1.79.35,13.6,13.6,0,0,0,1.92,0c.58,0,1.23-.22,1.26-.44a.07.07,0,0,0,0,0C88.17,106.72,88.13,106.53,88.11,106.35Z"/>
-                <path class="cls-328"
-                      d="M81.68,142.85a6.15,6.15,0,0,1-2.2-.89A5.29,5.29,0,0,1,78,140.43a5.38,5.38,0,0,1-.59-1.29c-.79,1-1.58,2.07-2.32,3.19-.28.43-.55.88-.8,1.34a6,6,0,0,0,.65,1.17,6.1,6.1,0,0,0,3.65,2.4,8.81,8.81,0,0,0,1.22.19A19.63,19.63,0,0,1,82.67,143,8.54,8.54,0,0,1,81.68,142.85Z"/>
-                <path class="cls-338"
-                      d="M83.14,147.19c.7-.13,1.26-.28,1.62-.36a10.64,10.64,0,0,1,.63-1.34,18.5,18.5,0,0,1,1.77-2.69,7.6,7.6,0,0,1-1.23.26,12,12,0,0,1-3.26,0,19.63,19.63,0,0,0-2.85,4.41A12.66,12.66,0,0,0,83.14,147.19Z"/>
-                <path class="cls-328"
-                      d="M76.64,157a7.38,7.38,0,0,1-5-1.31,4.23,4.23,0,0,1-.73-.62c0,.49,0,1,0,1.47a21.58,21.58,0,0,0,.73,5.15h0l.23.61c.14.34.58,1.75,1,3.21.44.1,1,.22,1.74.31a11.17,11.17,0,0,0,2.61.06,10.22,10.22,0,0,0,2.85-.82l0,0a19.22,19.22,0,0,1-2.21-8.2Q77.3,156.92,76.64,157Z"/>
-                <path class="cls-338"
-                      d="M82.5,163.4a4.89,4.89,0,0,0,.69-1.13l.48-1.17.76-1.77-.16-.34a11.33,11.33,0,0,1-.92-3.46.86.86,0,0,1,0-.16,7.08,7.08,0,0,1-1.76.71,25.6,25.6,0,0,1-3.65.75,19.22,19.22,0,0,0,2.21,8.2A6.12,6.12,0,0,0,82.5,163.4Z"/>
-                <path class="cls-329"
-                      d="M79.59,147.94a8.4,8.4,0,0,1-1.1-.12,6.63,6.63,0,0,1-4.16-2.51,5.53,5.53,0,0,1-.5-.77c-.37.71-.7,1.43-1,2.19a48,48,0,0,0-1.56,5.44,9.56,9.56,0,0,0-.27,1.72,5.67,5.67,0,0,0,1.13,1.16,6.91,6.91,0,0,0,4.49,1.34c.44,0,.88-.06,1.32-.1A20,20,0,0,1,79.59,147.94Z"/>
-                <path class="cls-341"
-                      d="M83.06,155.34l.27-.1a9.06,9.06,0,0,1,.66-4.7V150a6.35,6.35,0,0,1,.67-3,11.5,11.5,0,0,1-1.44.5,11.69,11.69,0,0,1-3.64.43,20,20,0,0,0-1.67,8.35,33.94,33.94,0,0,0,3.58-.52A12.24,12.24,0,0,0,83.06,155.34Z"/>
-                <rect class="cls-331" x="83.93" y="129.61" width="0.01" height="0.01"/>
-                <path class="cls-331" d="M82.3,11.7h0c-.34.3-.66.62-1,1A12.93,12.93,0,0,1,82.3,11.7Z"/>
-                <path class="cls-331" d="M73.86,142.73h0c-.07.17-.16.33-.23.5.07-.17.15-.33.22-.51Z"/>
-                <path class="cls-331" d="M73.61,143.28c-.06.16-.11.3-.18.46v0Z"/>
-                <circle class="cls-329" cx="111.44" cy="48.47" r="1.62"/>
-                <circle class="cls-329" cx="112.42" cy="51.01" r="0.33"/>
-                <path class="cls-333" d="M132.21,40.51v0Z"/>
-                <path class="cls-333"
-                      d="M138.56,55.56a10.5,10.5,0,0,0,3-7.37c.17-3.84-2.37-8.07-5.2-9h0a10.76,10.76,0,0,0-3.87,1.08l-.07,0h0a1,1,0,0,0-.18.17v0c-.16.67-.31,1.33-.42,1.95-.07.4-.14.78-.2,1.15a27.38,27.38,0,0,0,1.48,13,25.58,25.58,0,0,0,3.81-.62C137.42,55.91,138,55.75,138.56,55.56Z"/>
-                <path class="cls-333"
-                      d="M131.58,43.63c-.47,2.86-.59,4.8-.62,4.93s-.29,2.28-.47,5.53h0a4.14,4.14,0,0,0,1.86,2.61h.19l.52-.05A27.38,27.38,0,0,1,131.58,43.63Z"/>
-                <path class="cls-329" d="M132.93,45.18a1.45,1.45,0,1,0,1.94.64A1.46,1.46,0,0,0,132.93,45.18Z"/>
-                <circle class="cls-329" cx="132.16" cy="48.93" r="0.34"/>
-                <g id="_Group_2" data-name="&lt;Group&gt;">
-                    <path class="cls-342" d="M152.47,10.83l.2-.13c-.07.07-.14.15-.19.19A.13.13,0,0,0,152.47,10.83Z"/>
-                    <path class="cls-342"
-                          d="M153.69,10.11l-1.24.68a.52.52,0,0,0-.15-.15l-.16-.07a3.63,3.63,0,0,0-.18-.68s.11-.09.27-.17h0l.22,0A1.35,1.35,0,0,1,153.69,10.11Z"/>
-                    <path class="cls-342"
-                          d="M151.56,17.27l-.25-.45h0c.1-.76.43-2.06.74-3.32a8.46,8.46,0,0,0,.14-2.54,3.53,3.53,0,0,0-.05-.38l.16.07a.52.52,0,0,1,.15.15l-.12.07v0h0l.11-.07a.13.13,0,0,1,0,.06c.05,0,.12-.12.19-.19l-.2.13,0,0,1.24-.68a1.35,1.35,0,0,0-1.2-.41l-.22,0c.13-.07.29-.14.48-.22.45-.2.87-.23.89-.13a5.58,5.58,0,0,1,.16,1.51,8.49,8.49,0,0,1-.57,2.95A22.13,22.13,0,0,1,151.56,17.27Z"/>
-                    <path class="cls-342" d="M151.31,16.82l.25.45c-.11.15-.19.21-.23.19S151.26,17.19,151.31,16.82Z"/>
-                    <path class="cls-342"
-                          d="M151.45,36.34c.07-1.36.05-2.73.07-3.28h0a.43.43,0,0,0,.09-.1,22.66,22.66,0,0,1,.25,3.4c0,.9,0,1.8,0,2.48s-.1,1.15-.1,1.18-.05.49-.18,1.17A24.16,24.16,0,0,1,151,43.6c-.26.87-.58,1.7-.82,2.32a5,5,0,0,1-.46,1,26.73,26.73,0,0,1,.76-3c0,.23.07.35.1.35a3.17,3.17,0,0,0,.07-1.09c.17-.77.3-1.51.37-2.11s.12-1.12.13-1.15.06-.48.14-1.15S151.41,37.23,151.45,36.34Z"/>
-                    <path class="cls-342"
-                          d="M151.07,18.15a19.93,19.93,0,0,1-1-3.1c.12-.05.67.72,1.24,1.76h0c-.05.37-.05.61,0,.64s.12,0,.23-.19l.28.56a19.13,19.13,0,0,1,.88,2.14c.21.6.29,1.05.31,1.07a7.85,7.85,0,0,1,.1,1.14,12.5,12.5,0,0,1-.32,2.33,9.46,9.46,0,0,1-1,3.13A17.2,17.2,0,0,1,152,24.4a14.26,14.26,0,0,0,.08-2.17c-.07-.53-.18-.91-.18-1a9.62,9.62,0,0,0-.2-1A21.38,21.38,0,0,0,151.07,18.15Z"/>
-                    <path class="cls-342"
-                          d="M152.14,10.57a3,3,0,0,0-2,.19,5.08,5.08,0,0,0-2,1.32,2.35,2.35,0,0,0-.42.62l-.89-1.28a5.07,5.07,0,0,0,.78-.15,22.43,22.43,0,0,0,2.34-.88,9.57,9.57,0,0,1,2.26-.67c-.16.08-.27.13-.27.17A3.63,3.63,0,0,1,152.14,10.57Z"/>
-                    <path class="cls-342" d="M148.32,58.22l.37-1.36c.46.47.86.9.91.94Z"/>
-                    <path class="cls-342"
-                          d="M150.9,5.27a6.63,6.63,0,0,1,3.37.37,4.44,4.44,0,0,1,2.27,2.49,9.75,9.75,0,0,1,.6,2.4c.18,1.36.21,2.17.21,2.24a31.26,31.26,0,0,1-.16,3.55,40,40,0,0,1-1.38,7.27,39,39,0,0,1-2.64,6.79A15.69,15.69,0,0,1,151.61,33q0-.15-.06-.15a.87.87,0,0,0,0,.25h0c-.08.07-.12.09-.15.08s.33-1.28,1-3.12a53.5,53.5,0,0,0,1.87-6.82,44.08,44.08,0,0,0,.84-7c.07-1.93,0-3.24,0-3.32s0-.88-.08-2.06-.33-2.83-1.5-3.41A5,5,0,0,0,151,7c-.94,0-1.93.14-2.89.25s-1.94.2-2.82.28l-.32,0h-.54l-.8,0,.68,1.17c.27.44.4.71.33.76s-.29-.14-.66-.48-.85-.84-1.5-1.55l.41.1c.33.11.57.15.61.06s0-.26-.32-.57a3.84,3.84,0,0,1-.34-.28l2.28-.43c.87-.18,1.8-.35,2.75-.56A25.33,25.33,0,0,1,150.9,5.27Z"/>
-                    <path class="cls-342"
-                          d="M151.81,76.71c0,.08-.55-.1-1.33-.28s-1.84-.37-2.91-.52-2.16-.27-3-.34-1.38-.1-1.42-.12l-1.41-.16a9,9,0,0,0-2.86.07,24.77,24.77,0,0,0-2.55.6,5.23,5.23,0,0,0,0-.56,16.27,16.27,0,0,1,2.37-.84,10.33,10.33,0,0,1,1.64-.32,12.52,12.52,0,0,1,1.48,0c.84,0,1.41.07,1.44.07s.62.07,1.45.21,1.91.34,3,.6a18.54,18.54,0,0,1,2.9.9C151.39,76.32,151.85,76.64,151.81,76.71Z"/>
-                    <path class="cls-342"
-                          d="M139.85,73.37c-.74.1-1.71.27-2.68.48l-1.06.24c-.06-.23-.13-.45-.2-.67.33-.13.69-.25,1-.37,1-.32,2-.58,2.7-.75S140.92,72,141,72s.57-.07,1.36-.09a16.93,16.93,0,0,1,2.82.16,12.74,12.74,0,0,1,3.89,1c0,.23-2-.18-3.95-.2a20.12,20.12,0,0,0-2.69.1c-.74.07-1.23.18-1.26.18S140.59,73.25,139.85,73.37Z"/>
-                    <path class="cls-342"
-                          d="M137.49,76.73l.24,0a5.31,5.31,0,0,1,.57.13,16,16,0,0,1,1.53.57c1.08.46,2,1.11,2,1.26a9.17,9.17,0,0,1-2.24-.48c-.54-.12-1.09-.23-1.51-.3s-.64-.06-.66-.06-.28,0-.69-.06q-.34,0-.78,0h0a5.55,5.55,0,0,0,.32-1A6.52,6.52,0,0,1,137.49,76.73Z"/>
-                    <path class="cls-342"
-                          d="M152.15,51.13l-1.23,1.62c-.2.28-.42.57-.64.86A3.21,3.21,0,0,0,150,54l.28.14.83.48c1,.58,2,1.17,2.93,1.73-1.64.56-3.18,1-4.48,1.49,0,0-.45-.47-.91-.94l-.37,1.36,1.28-.42h0c-.06.27-.11.48-.14.63s0,.05,0,.07c-.15.57-.17.66-.18.71l-.17.1a4.07,4.07,0,0,0-.45.28,5.08,5.08,0,0,0-.43.34,8,8,0,0,0-1.28,1.51c-.9,1.45-2.09,3.6-3.53,5.52A15.6,15.6,0,0,1,141,69.61a7.72,7.72,0,0,1-1.4.93c-.45.24-.88.45-1.28.65a7.31,7.31,0,0,1-2.8,1A18.49,18.49,0,0,1,138,70.59a13.7,13.7,0,0,0,2.35-1.71,15.48,15.48,0,0,0,2.06-2.63c1.27-1.94,2.24-4,3.17-5.66a9.77,9.77,0,0,1,1.48-1.91c.21-.2.41-.36.55-.47h0s-.05-.08-.15-.2l-.67-.82c0-.09.07-.19.11-.29l.92-.26,2-.55.51-.15h.09l.26,0-.26-.23-2.14-1.39,1.17-1.36.71-.81,1.37-1.5c.65-.73,1.25-1.38,1.74-1.9l.67-.08-.23-.36c-.14.13-.28.29-.44.44a39.56,39.56,0,0,1-4.05.2,7.15,7.15,0,0,1,.72-.11,35.24,35.24,0,0,0,3.88-.61l.63-.21-.4.58C153.58,49.19,152.92,50.1,152.15,51.13Z"/>
-                    <path class="cls-342"
-                          d="M135.38,74.28l.73-.19c.06.25.11.5.17.76a3.45,3.45,0,0,1,.07.55,10.25,10.25,0,0,0-.93.45,3.84,3.84,0,0,0,0-.9C135.43,74.73,135.41,74.5,135.38,74.28Z"/>
-                    <path class="cls-342"
-                          d="M136.11,74.09l-.73.19a5.58,5.58,0,0,0-.09-.61c.19-.09.4-.17.62-.25C136,73.64,136.05,73.86,136.11,74.09Z"/>
-                    <path class="cls-342"
-                          d="M136.35,76l-1,.29c0-.13.05-.26.07-.4a10.25,10.25,0,0,1,.93-.45A5.23,5.23,0,0,1,136.35,76Z"/>
-                    <path class="cls-342"
-                          d="M136.24,76.81a6.44,6.44,0,0,0-1.15.25,4.8,4.8,0,0,0,.26-.81l1-.29A4.59,4.59,0,0,1,136.24,76.81Z"/>
-                    <path class="cls-342"
-                          d="M135.09,77.06a6.44,6.44,0,0,1,1.15-.25,5.55,5.55,0,0,1-.32,1h0l-.73,0-.57.06a3.85,3.85,0,0,0,.31-.55C135,77.28,135,77.17,135.09,77.06Z"/>
-                    <path class="cls-342"
-                          d="M134.69,76.36s.25-.26.73-.51c0,.14,0,.27-.07.4C135,76.35,134.72,76.41,134.69,76.36Z"/>
-                    <path class="cls-342"
-                          d="M135.44,72.18a8,8,0,0,1,.47,1.24c-.22.08-.43.16-.62.25-.09-.51-.19-1-.28-1.37a2.36,2.36,0,0,0-.32-.75c-.11-.15-.24-.18-.23-.23s.14-.1.38,0a1.88,1.88,0,0,1,.59.79v0Z"/>
-                    <path class="cls-342"
-                          d="M133.29,74.71a6.41,6.41,0,0,1,2-1,5.58,5.58,0,0,1,.09.61A7.19,7.19,0,0,1,133.29,74.71Z"/>
-                    <path class="cls-342"
-                          d="M133.83,76.25a.2.2,0,0,1,0,.11.84.84,0,0,1-.07.16c-.05.09-.12,0-.09,0l0,0,0,0,0,0s-.07-.07-.11-.13a.62.62,0,0,0,.26,0S133.82,76.21,133.83,76.25Z"/>
-                    <path class="cls-342"
-                          d="M133.82,76.36a.2.2,0,0,0,0-.11s-.05,0-.07,0a.62.62,0,0,1-.26,0c0,.06.08.09.11.13l0,0,0,0,0,0s0,.14.09,0A.84.84,0,0,0,133.82,76.36ZM134,76c.15-.05,0,.86-.25.9s-.44-.52-.22-.72A3.37,3.37,0,0,1,134,76Z"/>
-                    <path class="cls-342"
-                          d="M132.94,78.1c-.06-.16.95-.71,2.1-1h.05c-.05.11-.1.22-.16.33a3.85,3.85,0,0,1-.31.55C133.74,78.06,133,78.22,132.94,78.1Z"/>
-                    <path class="cls-342"
-                          d="M140.31,6.73c-1.16-.42-2.52-1-4-1.53a27.61,27.61,0,0,0-3.84-1,5.14,5.14,0,0,1,1.61-.56l-.76-1.95,0-.09a23.13,23.13,0,0,1,3.81,1.55A37.33,37.33,0,0,1,141,5.46c.8.52,1.44,1,1.9,1.32l-.85.16.49.53C142,7.32,141.2,7.06,140.31,6.73Z"/>
-                    <path class="cls-342"
-                          d="M133.7,76.94c.21,0,.4-1,.25-.9a3.37,3.37,0,0,0-.47.18s.1-.12.37-.23c.06,0,.15-.11.21-.06a.37.37,0,0,1,.09.2,1.31,1.31,0,0,1-.09.68c-.1.25-.26.39-.48.36a.59.59,0,0,1-.4-.41.69.69,0,0,1,0-.68s.15,0,.26.14C133.26,76.42,133.48,77,133.7,76.94Z"/>
-                    <path class="cls-342"
-                          d="M138.56,55.57a5.86,5.86,0,0,1-3.14,1.56,4.65,4.65,0,0,1-3-.42h.16a26,26,0,0,0,4.34-.67C137.42,55.91,138,55.75,138.56,55.57Z"/>
-                    <path class="cls-342"
-                          d="M132.54,73.93c-.08,0-.12,0-.07-.06l.07,0a1.09,1.09,0,0,0-.18-.23c0,.05.16.05.29.05s.1.08,0,.15A.42.42,0,0,1,132.54,73.93Z"/>
-                    <path class="cls-342"
-                          d="M133.64,39.5a3.29,3.29,0,0,1,2.71-.27,11,11,0,0,0-3.88,1.08l-.06,0A8,8,0,0,1,133.64,39.5Z"/>
-                    <path class="cls-342"
-                          d="M132.36,74.21c-.43.09-.48-.13,0-.61a1.09,1.09,0,0,1,.18.23l-.07,0c-.05,0,0,.1.07.06a.42.42,0,0,0,.14-.13c.07-.07,0-.19,0-.15s-.28,0-.29-.05l.4-.1C133.17,73.39,132.78,74.12,132.36,74.21Z"/>
-                    <path class="cls-342"
-                          d="M131.11,41.05a6,6,0,0,1,1.27-1.15,4.44,4.44,0,0,0-.15.52A12.59,12.59,0,0,0,131.11,41.05Z"/>
-                    <path class="cls-342"
-                          d="M132,74.44a.35.35,0,0,1-.24-.43,1.05,1.05,0,0,1,.23-.43,1.64,1.64,0,0,1,.12-.14s.13,0,.25.16c-.48.48-.43.7,0,.61s.81-.82.4-.71l-.4.1s.14-.11.44-.2a.22.22,0,0,1,.22,0,.35.35,0,0,1,.06.23,1,1,0,0,1-.37.61A.83.83,0,0,1,132,74.44Z"/>
-                    <path class="cls-342"
-                          d="M134.05,3.67a5.14,5.14,0,0,0-1.61.56c-.41-.09-.81-.16-1.23-.22-.21,0-.41-.06-.63-.11a5.65,5.65,0,0,1,.46-.41,18.13,18.13,0,0,1,2.25-1.77Z"/>
-                    <path class="cls-342"
-                          d="M130.49,54.09a20.11,20.11,0,0,1-.42-6.4c.17-4,.61-5.83,2.14-7.18-.17.68-.31,1.34-.43,2-.63,3.48-.79,5.92-.82,6.07S130.67,50.85,130.49,54.09Z"/>
-                    <path class="cls-342"
-                          d="M135.42,57.13a5.86,5.86,0,0,0,3.14-1.56,21.58,21.58,0,0,0,4-1.72,11,11,0,0,0,1.36-.94,3.94,3.94,0,0,0,.59-.56l.13-.13a.52.52,0,0,0,.05-.12,1.69,1.69,0,0,0,.12-.36,12,12,0,0,0,.31-3.46c-.08-2.33-1.53-4.38-2.83-6.2A7.2,7.2,0,0,0,140,40a7.86,7.86,0,0,0-2.72-.79,5.28,5.28,0,0,0-.89,0h0a3.29,3.29,0,0,0-2.71.27,8,8,0,0,0-1.23.84h0l-.17.08a4.44,4.44,0,0,1,.15-.52,4.1,4.1,0,0,1,.56-.36,7.92,7.92,0,0,1,4.36-.75,8.22,8.22,0,0,1,2.93.74,7.63,7.63,0,0,1,2.61,2.16,22.74,22.74,0,0,1,2,3A8.24,8.24,0,0,1,146,48.23a13.21,13.21,0,0,1-.26,3.75c-.05.15-.1.32-.16.49a1.17,1.17,0,0,1-.16.28,1.66,1.66,0,0,1-.16.21,5.37,5.37,0,0,1-.68.67,11.29,11.29,0,0,1-1.49,1.06,23.25,23.25,0,0,1-5.92,2.39,26.1,26.1,0,0,1-4.51.76,7.05,7.05,0,0,1-1.95-.08.74.74,0,0,1-.3-.13q0-.48,0-.93a.71.71,0,0,1,.52-.09,5.75,5.75,0,0,0,1.45.1h0A4.65,4.65,0,0,0,135.42,57.13Z"/>
-                    <path class="cls-342"
-                          d="M130.23,109a.61.61,0,0,0,0-.11,1.53,1.53,0,0,0,.6-.16,3.44,3.44,0,0,0,.74-.53c.26-.21.5-.45.46-.73a3.77,3.77,0,0,0-.83-1.66,1.15,1.15,0,0,0-.63-.41s0-.11,0-.23v-.06c0-.17.07-.3.16-.28a3.24,3.24,0,0,1,.33.12,2,2,0,0,1,.6.51,3.85,3.85,0,0,1,.52.87,3,3,0,0,1,.32,1.14,1,1,0,0,1-.25.62,1.67,1.67,0,0,1-.44.37,2.92,2.92,0,0,1-.85.48A1.32,1.32,0,0,1,130.23,109Z"/>
-                    <path class="cls-342"
-                          d="M135.92,77.84a8.42,8.42,0,0,1-.66,1.24A11.64,11.64,0,0,1,132,81.91a3.89,3.89,0,0,1-1,.4H131a5.29,5.29,0,0,1-1.82.11c-.75-.08-1.23-.27-1.23-.35s.52,0,1.24-.1a4.81,4.81,0,0,0,2.41-.77,13.29,13.29,0,0,0,1.94-1.81c.48-.56.74-1,.76-1s.13-.19.32-.48l.57-.06Z"/>
-                    <path class="cls-342" d="M130.23,109c-.15,0-.23-.07-.23-.09s.1,0,.26,0A.61.61,0,0,1,130.23,109Z"/>
-                    <path class="cls-342"
-                          d="M130.13,102.42c-.17,0-.21-1.06-.08-2.34q.06.39.12.75c.06.37.11.71.15,1S130.17,102.42,130.13,102.42Z"/>
-                    <path class="cls-342"
-                          d="M150.63,42.67c0,.2,0,.38,0,.53l-.06.3c0,.14-.07.3-.11.44-.06-.27-.12-.69-.19-1.25s-.15-1.11-.24-1.81a15.41,15.41,0,0,0-.83-2.16,8.4,8.4,0,0,0-1.74-2.09,12.23,12.23,0,0,0-2.37-1.92,11.18,11.18,0,0,0-6.37-1.26,6.4,6.4,0,0,0-2.86,1.31,10.28,10.28,0,0,0-2.23,2.29,7.83,7.83,0,0,0-1.22,2.68,1,1,0,0,0,0,.17,6,6,0,0,0-1.27,1.15,12.59,12.59,0,0,1,1.12-.63.29.29,0,0,0,0,.09c-1.53,1.35-2,3.16-2.14,7.18a20.11,20.11,0,0,0,.42,6.4h0l0,.58c0,.65-.07,1.32-.07,2a.54.54,0,0,0-.27.32.56.56,0,0,0,.27.61,26.75,26.75,0,0,0,.23,3,24.19,24.19,0,0,0,1.74,6.51l.17.39.14.28a.17.17,0,0,0,.22.13l.27,0,.25-.14c.23-.13.47-.3.71-.45.95-.63,1.87-1.3,2.77-1.94,1.78-1.29,3.42-2.53,4.81-3.61s2.53-2,3.31-2.64c0,0,.38-.49,1-1.26s.82-2.67,1.75-4.81c.12-.27.24-.57.36-.88.39-1,.77-2.28,1.06-3.29h0c-.39,1.45-.93,3.47-1.44,5.22-.31,1.1-.61,2.1-.84,2.78l-.28.08.17.21c-.07.17-.12.32-.17.42-.69,1.47-4.5,4.7-4.5,4.7-1.32,1.17-2.91,2.49-4.65,3.86-.87.69-1.77,1.39-2.73,2.08-.24.17-.48.34-.75.51a2.15,2.15,0,0,1-1.1.39,1.06,1.06,0,0,1-1.21-.56l-.26-.5-.21-.4a28.23,28.23,0,0,1-2.38-13.06c.09-3.63.37-6.09.38-6.25a62.62,62.62,0,0,1,1-6.21c.19-.89.42-1.86.74-2.88a9.41,9.41,0,0,1,1.52-3.08,11.5,11.5,0,0,1,2.62-2.54,7.56,7.56,0,0,1,3.56-1.45A10.83,10.83,0,0,1,148.06,36a8.58,8.58,0,0,1,1.76,2.38,13.23,13.23,0,0,1,.74,2.39C150.6,41.54,150.62,42.15,150.63,42.67Z"/>
-                    <path class="cls-342"
-                          d="M129,93.1a4,4,0,0,1,2.3,1.26,2.17,2.17,0,0,1,.41.9c.06.24.06.39.07.4a4.63,4.63,0,0,1-.14,1.25c-.18.7-.46,1.44-.68,2.26-.3,1-.52,2-.67,2.67,0-.3-.09-.64-.15-1s-.08-.49-.12-.75.07-.71.13-1.09c.12-.83.36-1.72.44-2.28a3.79,3.79,0,0,0,0-.7,1.46,1.46,0,0,0,0-.26,1.53,1.53,0,0,0-.2-.78,3.22,3.22,0,0,0-1.67-1.08l-.19-.07c-.08-.33-.16-.64-.26-.95A5.88,5.88,0,0,0,129,93.1Z"/>
-                    <path class="cls-342"
-                          d="M129.76,80.86a1.27,1.27,0,0,1-1,.33,1,1,0,0,1-.43-.14.5.5,0,0,0,.17-.11.82.82,0,0,0,.22-.19h0a1.09,1.09,0,0,0,.77-.23c.23-.14.48-.37.69-.49s.16-.1.26-.08a.13.13,0,0,1,.08,0h0a.07.07,0,0,1,0,.08v0s0,.06-.08,0C130.39,80.15,130.12,80.5,129.76,80.86Z"/>
-                    <path class="cls-342"
-                          d="M128.52,80.94a.5.5,0,0,1-.17.11h0l0,0a.41.41,0,0,0,0-.09c.1,0,.12,0,.12-.1h0a.53.53,0,0,1,.17-.12l.1,0A.82.82,0,0,1,128.52,80.94Z"/>
-                    <path class="cls-342"
-                          d="M128.54,95.79a.49.49,0,0,1,.29.68,7.09,7.09,0,0,1-.65.82l-.25.24c-.15-.4-.29-.8-.45-1.21.24-.29.34-.47.36-.48C128,95.68,128.24,95.66,128.54,95.79Z"/>
-                    <path class="cls-342"
-                          d="M128.86,94.88c.47,1.84.91,3.68,1.19,5.2-.13,1.28-.09,2.34.08,2.34s.1-.21.19-.58c.12,1.08.09,1.77,0,1.79s-.47-.89-1-2.27h0q0-.12-.09-.27c-.37-1-.82-2.23-1.29-3.54l.25-.24a7.09,7.09,0,0,0,.65-.82.49.49,0,0,0-.29-.68c-.3-.13-.59-.11-.7,0,0,0-.12.19-.36.48-.1-.3-.22-.6-.33-.91-.19-.5-.39-1-.56-1.5l.2,0,.59-.15-.64-1.18a6.38,6.38,0,0,0,1.84,1.29Z"/>
-                    <path class="cls-342"
-                          d="M126.57,93.91c-.2-.56-.41-1.12-.62-1.65a.87.87,0,0,0,.1-.08l.23-.18a4.42,4.42,0,0,0,.45.52s0,0,0,0l.64,1.18-.59.15-.2,0Z"/>
-                    <path class="cls-342"
-                          d="M128.32,92.87c.1.31.18.62.26.95a6.38,6.38,0,0,1-1.84-1.29s0,0,0,0l-.34-.64-.11.12c-.14-.2-.19-.34-.15-.37S127.11,92.38,128.32,92.87Z"/>
-                    <path class="cls-342"
-                          d="M125.05,7.66a12.62,12.62,0,0,0-1.84-2.74l-.5-.51,1.55-.31a23.37,23.37,0,0,1,1.48,3.12,10.71,10.71,0,0,1,.37,1.09,5.62,5.62,0,0,1,.18.89c0,.32.07.66.1,1,0,.18,0,.36.06.56l0,.28v.14c0,.07,0,0,0-.07l.15-.46c.26-.76.53-1.48.77-2.09a21.27,21.27,0,0,1,1.09-2.24,8.21,8.21,0,0,1,1.29-1.73c.26-.26.51-.5.75-.71.22.05.42.08.63.11.42.06.82.13,1.23.22-.23.1-.47.23-.74.38a13.48,13.48,0,0,0-1.31.85,6.47,6.47,0,0,0-1.27,1.39A14,14,0,0,0,127.93,9a27.86,27.86,0,0,0-1.34,3.58c-.13.41-.25.81-.28.87s0,.07,0,0l0-.23-.06-.45c0-.29-.07-.58-.11-.87-.09-.57-.16-1.13-.23-1.66a10,10,0,0,0-.37-1.59A9.74,9.74,0,0,0,125.05,7.66Z"/>
-                    <path class="cls-342"
-                          d="M125.11,90c-.3-.79-.55-1.47-.75-2l1.89.32a2.68,2.68,0,0,1-.32.64A5.11,5.11,0,0,1,125.11,90Z"/>
-                    <path class="cls-342"
-                          d="M128.83,80.49a.33.33,0,0,1-.08.26h0l-.1,0a.53.53,0,0,0-.17.12h0a.1.1,0,0,0,0-.07c0,.07,0,.07,0,.07s0,.09-.12.1a.41.41,0,0,1,0,.09l0,0a6,6,0,0,1-1.22.49,3.23,3.23,0,0,1-1.62.1,1.26,1.26,0,0,1-.55-.33,3.2,3.2,0,0,0,.6-.26.29.29,0,0,0,.12.07,2.64,2.64,0,0,0,1.35,0,6.55,6.55,0,0,0,1.39-.38c.18-.08.31-.17.32-.24s-.06-.14-.06-.16S128.78,80.33,128.83,80.49Z"/>
-                    <path class="cls-342"
-                          d="M131.1,82.42c.05,0-.14.5-.65,1.07a5.16,5.16,0,0,1-2.37,1.5,7.42,7.42,0,0,1-1.81.32.2.2,0,0,1,0-.07.57.57,0,0,0-.56-.54l-.87.35,0-.72.22-.15a2.88,2.88,0,0,0,.36.07,8.07,8.07,0,0,0,2.48-.06,5.4,5.4,0,0,0,2.28-1c.45-.33.74-.66.87-.73l.06,0Z"/>
-                    <path class="cls-342"
-                          d="M124.8,81.14s.06-.12.18-.24.25-.14.28-.11.09.16.28.26a3.2,3.2,0,0,1-.6.26Z"/>
-                    <path class="cls-342" d="M124.81,84.33v-.15h0a.08.08,0,0,0,0,0h0l.13,0H125Z"/>
-                    <path class="cls-342" d="M124.73,85.09l.1,0v0h-.1Z"/>
-                    <path class="cls-342"
-                          d="M124.66,84.84a.42.42,0,0,1-.06-.19c0-.05,0-.08-.06-.08s.06,0,.08-.09l0,0,.16-.11,0,.72-.1,0h0A2.07,2.07,0,0,0,124.66,84.84Z"/>
-                    <path class="cls-342" d="M124.81,84.33l-.16.11a1.07,1.07,0,0,0,.13-.21l0,0Z"/>
-                    <path class="cls-342"
-                          d="M124.21,87.66c-.1-.29-.18-.49-.22-.58a11.8,11.8,0,0,0,1.89-1,.79.79,0,0,0,.33-.43c.19.65.62,2.08,1,3.32s.73,2.47,1.11,3.91c-1.21-.49-2.11-1.32-2.19-1.24s0,.17.15.37l-.23.18a.87.87,0,0,1-.1.08c-.3-.81-.58-1.57-.84-2.25a5.11,5.11,0,0,0,.82-1,2.68,2.68,0,0,0,.32-.64L124.36,88s0,0,0,0h0A.48.48,0,0,0,124.21,87.66Z"/>
-                    <path class="cls-342"
-                          d="M124.46,85.2l-.08,0s.21,0,.21,0l.12,0h.12v0l.87-.35a.57.57,0,0,1,.56.54.2.2,0,0,0,0,.07h-.16c0-.09-.1-.07-.19,0a4.41,4.41,0,0,1-.63,0,4.58,4.58,0,0,1-.56-.06Z"/>
-                    <path class="cls-342"
-                          d="M124.42,108a.49.49,0,0,1-.09-.41c0-.22.16-.3.19-.29s0,.15,0,.3.13.21.29.19a1.34,1.34,0,0,0,.43-.3l.19-.22c0-.06,0,0,.11-.06s0,0-.09-.08l-.43-.17c-.27-.13-.44-.17-.47-.2s.25-.14.54-.09a4,4,0,0,1,.48.07,6.24,6.24,0,0,1,.8.23,6.35,6.35,0,0,1-.51.7,1.71,1.71,0,0,1-1,.52A.64.64,0,0,1,124.42,108Z"/>
-                    <path class="cls-342"
-                          d="M124,87c-.11-.3.35-.72,1-1a3,3,0,0,0,1-.74,1.2,1.2,0,0,0,.19,0s0,.14.1.32a.79.79,0,0,1-.33.43,11.8,11.8,0,0,1-1.89,1Z"/>
-                    <path class="cls-342"
-                          d="M124.19,85.07a.55.55,0,0,1-.18-.24c.22-.12.34-.19.34-.23l.3-.16,0,0s0,.09-.08.09.08,0,.06.08a.42.42,0,0,0,.06.19,2.07,2.07,0,0,1,.06.24h0l-.12,0s-.21,0-.21,0l-.09,0Z"/>
-                    <path class="cls-342"
-                          d="M123.94,84.65a.38.38,0,0,1,0-.1.6.6,0,0,1,.23-.45.54.54,0,0,1,.17-.1h0l.16,0,.15,0h.12v.25h0l0,0a1.07,1.07,0,0,1-.13.21l-.3.16A.91.91,0,0,0,123.94,84.65Z"/>
-                    <path class="cls-342"
-                          d="M122.18,1.79a2.51,2.51,0,0,1,.81.54,8.85,8.85,0,0,1,1.24,1.72l0,0-1.55.31a3.65,3.65,0,0,0-.81-.59c-.11,0-.19-.06-.2,0s0-.12,0-.16a.65.65,0,0,1,0-.1Z"/>
-                    <path class="cls-342"
-                          d="M124.94,81.31a3.13,3.13,0,0,1-1.45.16,1.73,1.73,0,0,1-1.28-1,3.51,3.51,0,0,1-.33-1.41,3.64,3.64,0,0,1,.87-2.37,4.62,4.62,0,0,1,1.4-1.12,6.59,6.59,0,0,1,.65-.31,8.2,8.2,0,0,1,1.22-.36,5,5,0,0,1,.66-.09,1.55,1.55,0,0,1,.52.07,1,1,0,0,0,.22.06h.19l.31-.09.36-.11.2-.05.28-.07a6.39,6.39,0,0,1,1.84.06,2.5,2.5,0,0,1,1,.39,3.08,3.08,0,0,1,.73.71,2.17,2.17,0,0,1,.43,1,1.25,1.25,0,0,1-.4,1.09c-.57.39-.78.47-.95,1.32a1.11,1.11,0,0,1-.42.54.92.92,0,0,1-.28.14.29.29,0,0,1-.14,0,.11.11,0,0,1-.08,0,0,0,0,0,1,0-.05,1.65,1.65,0,0,1,.11-.36.46.46,0,0,0,0-.2c0-.09-.1,0-.06-.39,0-.1,0-.07,0-.08h-.08l-.14,0L130,79c-.15,0-.23.06-.24,0s0-.07.16-.18a1,1,0,0,1,.68-.25c.17.16,0,.37,0,.54s.1,0,.14,0a.5.5,0,0,0,.15-.14.64.64,0,0,0,.12-.38v-.06a.4.4,0,0,1,0-.15.7.7,0,0,1,.08-.16,1.32,1.32,0,0,1,.12-.2,2.73,2.73,0,0,1,.34-.34c.11-.11.26-.21.31-.26.26-.23.13-.68-.2-1.07a2,2,0,0,0-.57-.49,1.61,1.61,0,0,0-.67-.22,5.82,5.82,0,0,0-1.56,0l-.1,0-.2.08-.36.12-.42.14a2.24,2.24,0,0,1-.51,0,2.15,2.15,0,0,1-.44-.09s0,0-.12,0a3.08,3.08,0,0,0-.48.09,7.61,7.61,0,0,0-1,.34,4.54,4.54,0,0,0-1.67,1.05,2.67,2.67,0,0,0-.71,1.68,2.42,2.42,0,0,0,.18,1,.84.84,0,0,0,.63.56,3.06,3.06,0,0,0,2.11-.52,2.77,2.77,0,0,0,.45-.31l.2-.16a1.31,1.31,0,0,1,.11-.12.33.33,0,0,0,.12-.27c0-.09-.13-.13-.21-.17a2.25,2.25,0,0,0-.72-.06.77.77,0,0,0-.52.18,1.94,1.94,0,0,0-.22.34c-.06.1-.12.12-.13.11s0-.07,0-.15a1,1,0,0,1,.15-.45,1,1,0,0,1,.66-.37,2.61,2.61,0,0,1,1,0,.68.68,0,0,1,.51.37.75.75,0,0,1-.14.68,2.18,2.18,0,0,1-.22.31l-.23.23a4.74,4.74,0,0,1-.49.4c-.19.13-.39.25-.59.36-.19-.1-.24-.24-.28-.26s-.16,0-.28.11-.2.21-.18.24Z"/>
-                    <path class="cls-342"
-                          d="M124.87,121.15c-.71,1-1.48,2-2.3,3.07l-.29.37c.17-.3.33-.61.51-.93,1-1.81,1.95-3.64,2.18-3.55S125,120.55,124.87,121.15Z"/>
-                    <path class="cls-342"
-                          d="M124.23,4.05A8.85,8.85,0,0,0,123,2.33a2.51,2.51,0,0,0-.81-.54L122,.66c1.11-.12,2.3-.26,3.52-.32a19,19,0,0,1,3.26.09c.28,0,.6.12.89.18l.72.19,1.41.38c.49.14,1,.29,1.48.45l0,.09A18.13,18.13,0,0,0,131,3.49a5.65,5.65,0,0,0-.46.41l-.79-.12-.72-.1a3.31,3.31,0,0,0-.56-.06,17.45,17.45,0,0,0-2.62.2c-.55.08-1.09.18-1.63.28Z"/>
-                    <path class="cls-342"
-                          d="M123.21,121a.47.47,0,0,1-.39.23c-.11,0-.15-.06-.15-.08s.22,0,.31-.29.08-.28.12-.46.09-.42.06-.39,0,0,0,0-.12.06-.12.06l-.35.11c-.2.07-.47.18-.73.3a5.37,5.37,0,0,1-1.1.45c0-.06.39-.48.89-.81a6.3,6.3,0,0,1,1.1-.6,1.34,1.34,0,0,1,.35-.09c.26-.08.64.08.54.45a4.06,4.06,0,0,1-.22.64A3.12,3.12,0,0,1,123.21,121Z"/>
-                    <path class="cls-342"
-                          d="M122.38,114.08a7.53,7.53,0,0,1,1.65-1.14l.16-.08h0a.07.07,0,0,0,.06,0l-.06,0h-.44a4.18,4.18,0,0,0-.5,0,8.31,8.31,0,0,0-1.8.54,2.19,2.19,0,0,1-.64.16c-.17,0-.25-.08-.24-.09s.09,0,.23,0a2.43,2.43,0,0,0,.56-.25,6.74,6.74,0,0,1,1.83-.74,2.57,2.57,0,0,1,.55-.06l.59,0c.61,0,1.25,0,1.31.11a.3.3,0,0,1,0,.51,1.51,1.51,0,0,1-.36.17c-.16,0-.33.11-.53.17l-.32.1a1,1,0,0,0-.19.07,8.87,8.87,0,0,0-1.63,1,1.13,1.13,0,0,1-1.87-.19,1.06,1.06,0,0,1-.31-.6c0-.21.18-.23.17-.21s-.08.08,0,.2a1.07,1.07,0,0,0,.35.46,1.34,1.34,0,0,0,.67.4C121.83,114.51,122.11,114.29,122.38,114.08Z"/>
-                    <path class="cls-342"
-                          d="M124,84.79a7,7,0,0,1-1.39.5,13.57,13.57,0,0,1-3.59.48,11.41,11.41,0,0,0,2.44-.49,23.13,23.13,0,0,1,2.49-.63.18.18,0,0,0,0,.13Z"/>
-                    <path class="cls-342"
-                          d="M119.1,86.78c-.11-.1-.27-.17-.33-.26a0,0,0,0,0,0,0h.15a11.45,11.45,0,0,0,1.47-.32v0a.48.48,0,0,0,.08.26,1.37,1.37,0,0,0,.47.37,2.4,2.4,0,0,0,1.77.16,2.94,2.94,0,0,0,1.4-.64c.1-.08.36-.24.46-.32s.23-.22.24-.39v-.15a1.49,1.49,0,0,0-.35-.27l.27.06a4.58,4.58,0,0,0,.56.06,4.41,4.41,0,0,0,.63,0,3,3,0,0,1-1,.74c-.65.23-1.11.65-1,1l0,.07a10.12,10.12,0,0,1-1.18.4,4.83,4.83,0,0,1-2.09.07,3.68,3.68,0,0,1-.83-.28A7.18,7.18,0,0,1,119.1,86.78Z"/>
-                    <path class="cls-342"
-                          d="M118.76,86.49c-.07-.11-.4-.27-.4-.36a4,4,0,0,1,1,.06c.59-.31.86-.42.86-.42l.51.19h-.1a.54.54,0,0,0-.16.06c-.06,0-.13.08-.14.13a11.45,11.45,0,0,1-1.47.32Z"/>
-                    <path class="cls-342"
-                          d="M118.65,75.79s-.13,0-.29,0c0,0,.21-1,.68-.62s.72.86.19.87l-1.2,0s0,0,0,0a2.13,2.13,0,0,1,.49-.11l.54-.07c.12,0,.15,0,.18,0s0-.07,0-.11a2,2,0,0,0-.35-.32c-.14-.09-.08,0-.12,0A1.13,1.13,0,0,0,118.65,75.79Z"/>
-                    <path class="cls-342"
-                          d="M118.36,75.77c.16,0,.29,0,.29,0a1.13,1.13,0,0,1,.17-.41s0-.08.12,0a2,2,0,0,1,.35.32s0,.09,0,.11-.06,0-.18,0l-.54.07a2.13,2.13,0,0,0-.49.11Z"/>
-                    <path class="cls-342"
-                          d="M118.07,92.21a3.05,3.05,0,0,1-.27-.61s-.06-.12,0-.14l.15,0,.3-.07a8.56,8.56,0,0,1,1.26-.24l1.08-.19c.32,0,.63-.1.9-.16a3.86,3.86,0,0,0,2.22-1.23A3.06,3.06,0,0,0,124,89a2.32,2.32,0,0,0,.33-.91s0,0,0-.08h0c.2.51.45,1.19.75,2-.15.14-.3.27-.48.41a5.85,5.85,0,0,1-2.95,1.06l-1.93.17c-.27,0-.54.07-.84.09l-.22,0c-.07,0-.19,0-.12.09a1.27,1.27,0,0,0,.21.42,2.33,2.33,0,0,0,.64.65,3.88,3.88,0,0,0,.91.46,4.35,4.35,0,0,0,1.82.3,6.85,6.85,0,0,0,2.61-.72,7.83,7.83,0,0,0,1.19-.71c.21.53.42,1.09.62,1.65-.37.09-.86.21-1.5.33a11.71,11.71,0,0,1-3,.22,6.34,6.34,0,0,1-2-.55,4.89,4.89,0,0,1-1-.64A3.63,3.63,0,0,1,118.07,92.21Z"/>
-                    <path class="cls-342"
-                          d="M118.07,76.1s0,0,0,0l1.2,0c.53,0,.28-.51-.19-.87s-.68.62-.68.62-.27-.1-.27-.14a1.56,1.56,0,0,1,.32-.6.59.59,0,0,1,.4-.2h0a.72.72,0,0,1,.43.19,1.5,1.5,0,0,1,.45.65.37.37,0,0,1-.15.44.75.75,0,0,1-.41.07l-.57,0A3.9,3.9,0,0,1,118.07,76.1Z"/>
-                    <path class="cls-342"
-                          d="M117.81,81a2.72,2.72,0,0,1,.47-.65s0-.14-.15-.25a2.11,2.11,0,0,1,.68.4.84.84,0,0,1,.28.64.8.8,0,0,1-.59.48c-.28.09-.63.06-.7-.06A.5.5,0,0,1,117.81,81Z"/>
-                    <path class="cls-342"
-                          d="M117.81,81a.5.5,0,0,0,0,.56c.07.12.42.15.7.06a.8.8,0,0,0,.59-.48.84.84,0,0,0-.28-.64,2.11,2.11,0,0,0-.68-.4c.12.11.18.21.15.25A2.72,2.72,0,0,0,117.81,81Zm-.19.71c-.42-.48.09-1.15.49-1.63a1.33,1.33,0,0,1,1.11.82C119.49,81.64,118.05,82.17,117.62,81.69Z"/>
-                    <path class="cls-342"
-                          d="M117.44,81.85a1,1,0,0,1-.13-1.09,3.7,3.7,0,0,1,.52-.8c0-.06.17,0,.28.1-.4.48-.91,1.15-.49,1.63s1.87,0,1.6-.81a1.33,1.33,0,0,0-1.11-.82,1.08,1.08,0,0,1,.85.24,1.06,1.06,0,0,1,.45.86,1.12,1.12,0,0,1-.78.83A1.1,1.1,0,0,1,117.44,81.85Z"/>
-                    <path class="cls-342"
-                          d="M117.17,134l1.11-1.09a3.25,3.25,0,0,1,.17.31,7.39,7.39,0,0,1-.56.56c-.17.17-.35.32-.5.45v-.11c0-.11-.06-.09-.09-.1S117.16,134,117.17,134Z"/>
-                    <path class="cls-342"
-                          d="M117.92,59.83a8.12,8.12,0,0,1-1.15.27.39.39,0,0,0,.1-.08c.5-.15.95-.32,1.36-.48Z"/>
-                    <path class="cls-342"
-                          d="M116.8,134.56c-.17-.06,1-1.84,2.07-3.57a25.27,25.27,0,0,0,1.31-2.45c.33-.71.56-1.18.57-1.22s.28-.48.67-1.16c.24-.45.54-1,.84-1.55l0,0,.29-.37c.82-1,1.59-2,2.3-3.07a29.83,29.83,0,0,1-1,3c-.35,1-.74,2-1,2.71s-.54,1.23-.56,1.27-.28.5-.72,1.18a18.82,18.82,0,0,1-1.72,2.41c-.48.56-1,1.08-1.42,1.53a3.25,3.25,0,0,0-.17-.31L117.17,134s.09,0,.13,0,.07,0,.09.1v.11C117.07,134.54,116.84,134.69,116.8,134.56Z"/>
-                    <path class="cls-342"
-                          d="M116.68,97c.83.23,1.67.5,2.29.63a15.34,15.34,0,0,0,1.69.3c.63.08,1.27.13,1.87.16a6.64,6.64,0,0,0,3.08-.43,4.63,4.63,0,0,0,1.72-1.2,1.09,1.09,0,0,0,.15-.18c.16.41.3.81.45,1.21A5.81,5.81,0,0,1,126,98.72a7.69,7.69,0,0,1-3.54.4c-.63,0-1.28-.12-1.94-.22l-.33-.07-.28-.08s-.16,0-.14,0l.08.1.24.21.14.12.42.3c.31.21.62.4.92.58a9.25,9.25,0,0,0,3.74,1.21,17.37,17.37,0,0,0,2.88.14,7.14,7.14,0,0,1,1.11,0h0a9.74,9.74,0,0,1-4,.36,9.47,9.47,0,0,1-4-1.08c-.33-.18-.67-.37-1-.58l-.52-.33c-.25-.19-.52-.36-.75-.56A17.42,17.42,0,0,1,117.66,98l-.62-.59-.08-.07,0,0,0-.07Z"/>
-                    <path class="cls-342"
-                          d="M116.59,146c0-.27,0-.67,0-1.23,0-1.07,0-2.71.14-5a45.68,45.68,0,0,1,.59-5,3.52,3.52,0,0,0,0-.49c.15-.13.33-.28.5-.45a7.39,7.39,0,0,0,.56-.56.82.82,0,0,1,.1.21,1.48,1.48,0,0,1,0,.79,5.13,5.13,0,0,1-.28.72,12.45,12.45,0,0,0-1.16,4.8,16.59,16.59,0,0,0,.45,5,5.5,5.5,0,0,0,.35,1c-.69.1-1,.23-1.09.16s0,.08.11.1a.78.78,0,0,0,.24,0h0l-.58.11h0v0A.28.28,0,0,0,116.59,146Z"/>
-                    <path class="cls-342"
-                          d="M116.4,5a23.14,23.14,0,0,1,.3-2.3l.17-1.95c.25,0,.5.06.76.09s.78.06,1.17.08a4.37,4.37,0,0,0,.5,0l.55,0c.68-.06,1.41-.15,2.19-.24l.14,1.13-.43,1.72a.65.65,0,0,0,0,.1s0,.12,0,.16.09,0,.2,0a3.65,3.65,0,0,1,.81.59c-.77.15-1.55.32-2.35.45-.25,0-.49.08-.77.1s-.56,0-.8.06c-.49,0-.94,0-1.36,0Z"/>
-                    <path class="cls-342"
-                          d="M116.34,60.42a3.83,3.83,0,0,1-1.58,0,10.63,10.63,0,0,0,1.49-.29h0l.49-.08A2.67,2.67,0,0,1,116.34,60.42Z"/>
-                    <path class="cls-342"
-                          d="M115.27,76.33a.39.39,0,0,1-.07.16.12.12,0,0,1-.06.08l-.16.08s0,0,0,0l.31-.31A0,0,0,0,1,115.27,76.33Z"/>
-                    <path class="cls-342"
-                          d="M115.47,10.86c-.12-2.69-.3-4.62-.47-5.91h.08l1.32,0a82.69,82.69,0,0,0-.32,8.43l-.17-.82C115.77,12,115.63,11.41,115.47,10.86Z"/>
-                    <path class="cls-342"
-                          d="M115,76.61c-.08-.32-.16-.64-.26-1a.51.51,0,0,1,.49.85.39.39,0,0,0,.07-.16,0,0,0,0,0,0,0Z"/>
-                    <path class="cls-342" d="M115.14,76.57a.42.42,0,0,1-.27.12l.11,0Z"/>
-                    <path class="cls-342" d="M115,76.61s0,0,0,0h-.06Z"/>
-                    <path class="cls-342"
-                          d="M115,5a18.06,18.06,0,0,0-.38-2.22l2.08,0a23.14,23.14,0,0,0-.3,2.3l-1.32,0Z"/>
-                    <path class="cls-342"
-                          d="M114.29,76a.33.33,0,0,1,0-.12.51.51,0,0,1,.26-.21l.08,0h0c.1.33.18.65.26,1l0,0H115l-.11,0h0a.51.51,0,0,1-.58-.63S114.29,76,114.29,76Z"/>
-                    <path class="cls-342" d="M114.6,75.69a.51.51,0,0,0-.26.21.44.44,0,0,1,.31-.25h0Z"/>
-                    <path class="cls-342" d="M115.14,83.31a.52.52,0,0,1-.78-.64A10.06,10.06,0,0,0,115.14,83.31Z"/>
-                    <path class="cls-342"
-                          d="M114.49,82.49a.52.52,0,0,1,.74.74s0,0,0,0l0,0a10.06,10.06,0,0,1-.78-.64.34.34,0,0,1,.09-.13Z"/>
-                    <path class="cls-342"
-                          d="M113.82,43.65h.51l.52.31a9.34,9.34,0,0,1,3,3.78c.14.26.61,1.22.71,1.41.59,1.31.76,1.72,1.53,3.69,0,.1,0,.19.07.26l0,.38a39.07,39.07,0,0,0-2.58-5.94c-.05-.08-.11-.18-.15-.26l-.43-.81a1.48,1.48,0,0,0-.21-.26,7.81,7.81,0,0,0-1.52-1.73A10,10,0,0,0,113.82,43.65Z"/>
-                    <path class="cls-342"
-                          d="M114.86,76.69c-.45.18-.71-.31-.57-.67,0,0,0,0,0,0A.51.51,0,0,0,114.86,76.69Z"/>
-                    <path class="cls-342"
-                          d="M126.59,148.65l-.09,0h.09Zm-14.2-19.05c0-.4-.07-.75-.09-1,.58-.05,1.16-.11,1.74-.21,0,.27,0,.64.07,1.09.08,1.09.2,2.65.34,4.55.07,1,.17,2,.25,3.08,0,.48.11,1,.16,1.49.07.24.09.37.13.52l.1.44c.07.3.13.59.19.89.38,1.83.78,3.84,1.18,5.76h0c.11.52.22,1,.32,1.55l2.65,1.47,4.32.05a4.19,4.19,0,0,0,1.9-.2,1.66,1.66,0,0,0,.63-.53,1.56,1.56,0,0,0,.16-.2s0,0,0,.06a.58.58,0,0,1,0,.2l0,0,.48.33c.15-.18.07-.64-.24-1a.6.6,0,0,1,.09-.15l.53-.86.14-.27.06.13.53-.23a1.61,1.61,0,0,0-.3-.42,1.86,1.86,0,0,0-.25-.22,2.12,2.12,0,0,0-.57-1.18,1.27,1.27,0,0,0-1.29-.49,11.13,11.13,0,0,0-1.53.67,16.06,16.06,0,0,1-2.91,1.11,10.32,10.32,0,0,1-2.39.05c-.64,0-1.14,0-1.5,0h-.16l.37-.07a2,2,0,0,0,.27-.07H118v-.11h0a8.47,8.47,0,0,1,.85-.11,12,12,0,0,0,2.29-.19,18.49,18.49,0,0,0,2.72-1.21,10.33,10.33,0,0,1,1.63-.8,1.93,1.93,0,0,1,1.14,0,2.81,2.81,0,0,1,.93.6,3.14,3.14,0,0,1,.94,2,1.25,1.25,0,0,1-.06.7l-.24.52-.52.92c-.19.31-.37.62-.61.94a2.6,2.6,0,0,1-1,.85,5.15,5.15,0,0,1-2.38.37l-4.6.08c-1.17-.62-2.35-1.22-3.51-1.82-.63-2.73-1.24-5.4-1.8-7.87-.14-.56-.27-1.1-.41-1.63a3.61,3.61,0,0,1-.08-.38l0-.23-.05-.43c0-.3-.08-.58-.11-.86-.11-1.1-.22-2.13-.31-3.08C112.64,132.25,112.49,130.68,112.39,129.6Z"/>
-                    <path class="cls-342"
-                          d="M113.5,81.93l-.63-.54a20.81,20.81,0,0,1,2.38-1.09c.79-.22,1.33-.17,1.34-.08s-.52.18-1.17.51S114.2,81.46,113.5,81.93Z"/>
-                    <path class="cls-342"
-                          d="M113.93,184.06l1-1.87c.43-.77.92-1.65,1.36-2.62a12.16,12.16,0,0,0,.6-1.51,11.13,11.13,0,0,0,.3-1.64,6.47,6.47,0,0,0-.23-3.18,7.28,7.28,0,0,0-1.6-2.34,5,5,0,0,0-1.34-1,3.26,3.26,0,0,0,.48-.11,5.48,5.48,0,0,1,1.17.79,7.58,7.58,0,0,1,1.89,2.42,7,7,0,0,1,.45,3.53,11.66,11.66,0,0,1-.25,1.79,12.78,12.78,0,0,1-.57,1.65c-.44,1-.91,2-1.31,2.75l-.89,1.69c-.45.06-.91.12-1.37.16C113.75,184.42,113.83,184.26,113.93,184.06Z"/>
-                    <path class="cls-342"
-                          d="M113.91,185.4c-.3-.12-.48-.37-.39-.56l.15-.29c.46,0,.92-.1,1.37-.16a2.09,2.09,0,0,1-.1.21l-.36.74C114.5,185.49,114.21,185.52,113.91,185.4Z"/>
-                    <path class="cls-342"
-                          d="M115,84.59a26.28,26.28,0,0,1-2.3-2.16l.3-.2.46-.3c.29.25.58.51.86.74a.52.52,0,0,0,.78.64c.19.15.35.29.52.4a5.48,5.48,0,0,0,1,.49l.45.14a8.07,8.07,0,0,0,1.65.35,13,13,0,0,0,3.63-.21A6.89,6.89,0,0,0,125.66,83c.76-.62,1.1-1.25,1.22-1.15a1.59,1.59,0,0,1-.18.44,4.45,4.45,0,0,1-.73,1,4.77,4.77,0,0,1-.94.82H125l-.13,0h0v-.2h-.12l-.15,0-.16,0h0a.54.54,0,0,0-.17.1.6.6,0,0,0-.23.45.38.38,0,0,0,0,.1,23.13,23.13,0,0,0-2.49.63,11.41,11.41,0,0,1-2.44.49h-.31a7.71,7.71,0,0,1-1.9-.3A6.7,6.7,0,0,1,115,84.59Z"/>
-                    <path class="cls-342"
-                          d="M112.3,128.58c0-.46,0-.71,0-.78l1,0,.66,0H114v.06c0,.06,0,.16,0,.3s0,.1,0,.16C113.46,128.47,112.88,128.53,112.3,128.58Z"/>
-                    <path class="cls-342" d="M112.1,81.79l.52-.27.25-.13.63.54-.46.3-.3.2-.51-.51Z"/>
-                    <path class="cls-342"
-                          d="M113,169.76s.23-.28.79-.21a2.28,2.28,0,0,1,.74.22,3.26,3.26,0,0,1-.48.11l-.3-.11A2,2,0,0,0,113,169.76Z"/>
-                    <path class="cls-342"
-                          d="M111.54,5.08l-.3-.28,1.66.06a24.05,24.05,0,0,1,2.57,6c0,.8.06,1.67.08,2.62,0-.11-.08-.43-.14-.76A15.39,15.39,0,0,0,111.54,5.08Z"/>
-                    <path class="cls-342" d="M112.1,81.79c-.64-.67-1.28-1.33-1.82-1.92l.62-.21,1.9,1.67.07.06-.25.13Z"/>
-                    <path class="cls-342"
-                          d="M114.66,112.88a3.86,3.86,0,0,1,.5.08h.07a.49.49,0,0,1,.07-.19s.07,0,0-.06a.34.34,0,0,1-.12-.17c0-.08,0,0-.08,0a1,1,0,0,0-.23.14Zm-2.1.35a1.35,1.35,0,0,1,.91-.82,4.79,4.79,0,0,1,1.21-.06c.31,0,.54,0,.56,0a1,1,0,0,1,.26.09c.08.06.21.13.12.4s-.11.11-.16.15l-.1,0a.37.37,0,0,0-.14.07,2.75,2.75,0,0,1-1.1.51,4.21,4.21,0,0,1-1.66.12S112.44,113.53,112.56,113.23Zm-.07.5a0,0,0,0,0,0,0v0c.19-.09.87-.24,1.5-.46a2.12,2.12,0,0,0,.63-.36,6.28,6.28,0,0,0-1.07-.07c-.63.06-.94.73-1.06.89,0,0,0,0,0,0S112.48,113.72,112.49,113.73Z"/>
-                    <path class="cls-342"
-                          d="M111.43,60.62q.42,0,.84,0c.33,0,.65,0,1,0l.89,0h.08l-.09.1c-.62,0-1.25.06-1.88.11a.44.44,0,0,0-.29.14A3.78,3.78,0,0,1,111.43,60.62Z"/>
-                    <path class="cls-342"
-                          d="M110.43,84l-1.3-.52c.21-.1.54-.3,1-.53.56-.32,1.27-.71,2-1.11l.13.13.51.51Z"/>
-                    <path class="cls-342" d="M111.84,128.62c.1-.52.15-.8.2-.8s.12.28.15.77Z"/>
-                    <path class="cls-342"
-                          d="M112.47,4.16a14.42,14.42,0,0,0-1.33-1.69c-.33-.34-.47-.5-.47-.5L111,.12c.73.07,2.34.24,4.45.49l1.46.14-.17,2-2.08,0A18.06,18.06,0,0,1,115,5l-2.1-.09C112.76,4.61,112.61,4.37,112.47,4.16Z"/>
-                    <path class="cls-342"
-                          d="M110.37,138.48l.08-.47c.37-2.56.75-5.1,1-7,.15-1,.27-1.82.36-2.38l.35,0c.06,1.62-.15,5.6-.51,9.59l-.06.49v.13a2.13,2.13,0,0,1-.11.41h0l0,0h0a0,0,0,0,0,0,0h0s0,0-.05,0l-.06-.06h0s0-.05,0-.06l-.18-.15h0l0,0-.06-.08-.07-.06-.07-.06,0,0h0c-.19-.2-.27-.27-.29-.27l0,0,0,.07a.52.52,0,0,0-.06.13v0Z"/>
-                    <path class="cls-342"
-                          d="M110,3.92l-.53-.23L110.67,2s.14.16.47.5a14.42,14.42,0,0,1,1.33,1.69c.14.21.29.45.43.7l-1.66-.06A6.89,6.89,0,0,0,110,3.92Z"/>
-                    <path class="cls-342"
-                          d="M110.9,79.66l-.85-.72c.6-.17,1.23-.33,1.85-.49.44-.1.88-.21,1.31-.29a27.19,27.19,0,0,1,4.05-.66c.12,0,.2,0,.2,0s-2.68.85-5.33,1.71Z"/>
-                    <path class="cls-342"
-                          d="M115.28,86.43a28.35,28.35,0,0,1-6.09-1.68,2.81,2.81,0,0,0,.31-.18l.93-.62a25.73,25.73,0,0,0,5,1.59,16.93,16.93,0,0,0,3.43.24H119a13.57,13.57,0,0,0,3.59-.48,7,7,0,0,0,1.39-.5l0,0a16.38,16.38,0,0,1-2.39.9c-.37.14-.78.3-1.24.43,0,0,.08-.1.14-.13a.54.54,0,0,1,.16-.06h.1l-.51-.19s-.27.11-.86.42a4,4,0,0,0-1-.06c0,.09.33.25.4.36A16.42,16.42,0,0,1,115.28,86.43Z"/>
-                    <path class="cls-342"
-                          d="M110,120a2.19,2.19,0,0,1,.64-1.88,1.8,1.8,0,0,1,1.39-.55l.64.07a4.84,4.84,0,0,1,.93.24c.19.07.41.27.39.49a.81.81,0,0,1-.16.34l-.17.17a5.47,5.47,0,0,1-.75.57,2.34,2.34,0,0,1-1.37.08s.61-.14,1.22-.39a7.65,7.65,0,0,0,.59-.57,1.34,1.34,0,0,0,.11-.14s0,0,0,0,0,0-.07,0a5.27,5.27,0,0,0-.81-.13l-.61-.11a1.38,1.38,0,0,0-1.06.32A3.71,3.71,0,0,0,110,120Z"/>
-                    <path class="cls-342" d="M110.28,79.87l-.63-.68-.11-.12.51-.13.85.72Z"/>
-                    <path class="cls-342" d="M109.54,79.07a10.19,10.19,0,0,1-1-1.17c.08-.11.68.33,1.52,1Z"/>
-                    <path class="cls-342"
-                          d="M107.89,84.29l.66-.49.33-.21a1.51,1.51,0,0,1,.25-.16l1.3.52-.93.62a2.81,2.81,0,0,1-.31.18Z"/>
-                    <path class="cls-342"
-                          d="M107.11,146.85c.21-.56.51-1.34.85-2.27s.78-2,1.23-3.13l.7-1.74.37-.91.08-.15s0,0,0,0,.08.21.12.18,0-.2.11-.13h.18l0,0,.07.06.07.06.06.08,0,0h0l.18.15s0,0,0,.06h0l.06.06s0,0,.05,0h0a0,0,0,0,1,0,0h0c-.11.3-.21.6-.31.89-.2.61-.41,1.21-.61,1.78l-1.06,3.18-.76,2.28,0,.08c-.32.07-.91.16-.91.18h-.92s0-.09,0-.15,0-.07,0-.1l0-.12v-.06C107,147.12,107.06,147,107.11,146.85Z"/>
-                    <path class="cls-342"
-                          d="M106.19,123.28c.1.16,0,0,0,0Zm0,.17a.76.76,0,0,1-.18-.06s0,0,0-.09,0-.08,0-.09,0,0,.09,0a1,1,0,0,1-.1-.14c0-.08-.2-.1-.08-.11a1.09,1.09,0,0,0,.32.05,2.4,2.4,0,0,0,.82-.13s.09,0,.1,0,.08,0,0-.1a2.13,2.13,0,0,0-.49-.21c-.16,0-.26,0-.28,0s.44-.33,1-.08a.69.69,0,0,1,.38.35.44.44,0,0,1-.12.43,1.29,1.29,0,0,1-.45.22,2.63,2.63,0,0,1-.33,0A2.06,2.06,0,0,1,106.22,123.45Z"/>
-                    <path class="cls-342"
-                          d="M106.71,83.89c-1-.33-2-.63-3-.92l0,0,.79-.53.7-.43h0c.65.22,1.27.44,1.89.67l2,.78a1.51,1.51,0,0,0-.25.16l-.33.21-.66.49Z"/>
-                    <path class="cls-342"
-                          d="M106.15,87a29.79,29.79,0,0,1-3.21,2.63s0,0,0,0a16.34,16.34,0,0,1,2.65-3.22,26.36,26.36,0,0,1,2.16-2,.79.79,0,0,1,.15-.12l1.3.46c-.2.12-.48.3-.8.53C107.76,85.71,106.94,86.34,106.15,87Z"/>
-                    <path class="cls-342"
-                          d="M104.68,81.07c1-.57,1.64-.87,1.68-.9s.74-.31,1.77-.65l1.41-.45.11.12.63.68c-.65.23-1.27.46-1.77.67-1,.38-1.64.69-1.67.71s-.71.28-1.6.73c-.43-.14-.85-.29-1.29-.42C104.21,81.39,104.45,81.21,104.68,81.07Z"/>
-                    <path class="cls-342"
-                          d="M103.7,83l-1.16-.33.62-.48.76-.58,0,0c.44.13.86.28,1.29.42h0l-.7.43-.79.53Z"/>
-                    <path class="cls-342"
-                          d="M101.76,127.17c.09-.2.15-.37.21-.49.13.21.29.47.44.77C102.19,127.37,102,127.27,101.76,127.17Z"/>
-                    <path class="cls-342"
-                          d="M102.9,131.37c-.45-1.55-.92-3.07-1.19-4.07h0a.61.61,0,0,0,.05-.12c.22.1.43.2.65.28.49.9,1.1,2.19,1.66,3.5s1,2.53,1.36,3.53a16,16,0,0,1,.51,1.8,43.79,43.79,0,0,1,.24,5.6c0,2.67-.18,5.29-.46,5.34a.14.14,0,0,0,0-.1c0-.09.2-.45-.2-.36-.16-.88-.37-2.83-.6-4.82-.16-1.34-.31-2.68-.45-3.68-.07-.5-.13-.91-.19-1.2s-.09-.46-.09-.48-.09-.67-.34-1.65S103.28,132.66,102.9,131.37Z"/>
-                    <path class="cls-342"
-                          d="M101.65,127.12c-.14-.56-.21-.92-.15-1s.25.16.47.51c-.06.12-.12.29-.21.49Z"/>
-                    <path class="cls-342"
-                          d="M100.65.39c1.48-.18,2.88-.28,4.13-.33,1.68-.08,3.09-.07,4.11,0l1.65.05.42,0L110.67,2l-1.18,1.72.53.23a6.89,6.89,0,0,1,1.22.88l-1,0-1.6-.15c-.93-.08-2.25-.19-3.82-.23-.54,0-1.11,0-1.7,0-.18-.51-.34-1-.52-1.36a6.54,6.54,0,0,0-.32-.65,2.76,2.76,0,0,0-.53-.63l-.6-.52-.44-.41Z"/>
-                    <path class="cls-342"
-                          d="M100.86,3.09h0ZM100,2.74l-.51-.25L100.69.77l.44.41.6.52a2.76,2.76,0,0,1,.53.63,6.54,6.54,0,0,1,.32.65c.18.4.34.85.52,1.36-.47,0-1,0-1.47,0-.14-.28-.3-.54-.43-.75l-.32-.4s0,0-.06,0,0,0,0,0h0l-.1-.06Z"/>
-                    <path class="cls-342" d="M100.87,3.08h0Z"/>
-                    <path class="cls-342"
-                          d="M99.91,153.73c-.18-.27,1.26-1.63,1.41-1.26a7,7,0,0,0-.51.66c-.33.39-.33.64-.32.66a.82.82,0,0,0,0,.22,1.3,1.3,0,0,0,.15.51c.08.16.18.31.26.44s-.08,0-.4,0a2.18,2.18,0,0,1-.21-.22A1.49,1.49,0,0,1,99.91,153.73Z"/>
-                    <path class="cls-342"
-                          d="M101.65,127.12c-.66-.31-1.31-.64-1.94-1,.15-.38.21-.58.21-.58l2.19.79-.12.33,0,0c-.22-.35-.39-.55-.47-.51S101.51,126.56,101.65,127.12Z"/>
-                    <path class="cls-342"
-                          d="M99.6,111.48c0,.07.06.11,0,.12s-.08,0-.17-.1,0-.13,0-.15a.31.31,0,0,1,.12,0l.26,0c.36,0,.83-.07,1.29-.15a4.81,4.81,0,0,1,1.38-.11,1.69,1.69,0,0,1,.54.12.63.63,0,0,1,.29.16.49.49,0,0,1,.13.27.44.44,0,0,1-.1.3,1,1,0,0,1-.31.26c-.15.1-.29.23-.48.38a1.63,1.63,0,0,1-.75.34,1.46,1.46,0,0,1-.77-.19l-.56-.26c-.32-.16-.53-.28-.51-.32a1.52,1.52,0,0,1,.6.11l.59.16a1.24,1.24,0,0,0,.6.1c.33-.08.65-.51,1-.74.11-.09,0,0,0-.07h0l-.33-.08a5.81,5.81,0,0,0-1.27,0,8.14,8.14,0,0,1-1.33,0A1.55,1.55,0,0,0,99.6,111.48Z"/>
-                    <path class="cls-342"
-                          d="M99,150.38a5.66,5.66,0,0,1,1.4-.6c1.37-.81,2.14-1.37,3.61-2.32l1-.51a2.22,2.22,0,0,1,.5-.18c.06.3.12.46.17.46a21.48,21.48,0,0,1-3.11,2.05s-3.43,1.4-3.58,1.11Z"/>
-                    <path class="cls-342"
-                          d="M99,169.76s.28,0,.67.26l.13.1-.3-.05a1.39,1.39,0,0,0-.19-.06C99.09,169.87,99,169.8,99,169.76Z"/>
-                    <path class="cls-342"
-                          d="M98.37,152.84a3.15,3.15,0,0,0-.41.72l-.11.22a1.8,1.8,0,0,0-.14.51.86.86,0,0,0,0,.28h0c-.05,0-.12,0-.16,0l-.22-.28a1.7,1.7,0,0,1,.14-.93,1.54,1.54,0,0,1,.18-.27,2.08,2.08,0,0,1,.46-.49c.37-.31.85-.44.87-.36S98.62,152.51,98.37,152.84Z"/>
-                    <path class="cls-342"
-                          d="M97.22,87a32.75,32.75,0,0,1,4.31-3.61l1-.79,1.16.33L102,84.1A36.15,36.15,0,0,1,97.22,87Z"/>
-                    <path class="cls-342"
-                          d="M96.69,122.72l.27-.45a.35.35,0,0,0,.32.06c.13.11.28.22.41.34h0a.74.74,0,0,1-.5.18A1.09,1.09,0,0,1,96.69,122.72Z"/>
-                    <path class="cls-342"
-                          d="M96.89,155.34c-.33-.52-.66-1-1-1.52l0-.41c0-.07,0-.21,0-.29s.06-.38.1-.55a4.69,4.69,0,0,1,.32-1,2.43,2.43,0,0,1,1.22-1.28,2.72,2.72,0,0,1,1.43.07h0a1.66,1.66,0,0,0-1.23.33,1.85,1.85,0,0,0-.8,1.12,4.34,4.34,0,0,0-.19.86c0,.16,0,.33,0,.48a1.93,1.93,0,0,0,0,.23v.15l.52.68a.25.25,0,0,0,0,.08c.08.54.49.86.54.8s-.07-.28-.12-.55l.33.05.8.12,1.63.22c.26.25.53.39.57.34s-.06-.16-.17-.34h0l0,0,.15-.14.32-.28,2.48-2.11c.72-.6,1.39-1.17,2-1.66.53-1.69.88-2.83.9-2.9a1.43,1.43,0,0,0,.08-.24l0-.06c0,.06,0,.1,0,.15h1.54l.21,0v.07h0v0h0l0,.14,0,.07c0,.18-.09.29-.1.32s-.12.36-.32.91-.52,1.43-.87,2.42c-1.4,1-3.17,2.42-5,3.82l-.77.6a.46.46,0,0,1-.15.09h0l-.14.05h-.14l-.23,0a3.19,3.19,0,0,1-.52-.08c-.57-.1-1.11-.21-1.65-.33l-.8-.17-.42-.1-.3-.06C97.05,155.46,96.93,155.46,96.89,155.34Z"/>
-                    <path class="cls-342"
-                          d="M96.42,183.49l-1.23-.24a19.22,19.22,0,0,1,1.6-1.95,15.19,15.19,0,0,0,3-4.4,9.19,9.19,0,0,0,.5-5.22A3.07,3.07,0,0,0,99.26,170a1.39,1.39,0,0,1,.19.06l.3.05a3.18,3.18,0,0,1,1,1.41,9.2,9.2,0,0,1-.15,5.64,15.79,15.79,0,0,1-3,4.84c-.49.59-.89,1.07-1.14,1.43Z"/>
-                    <path class="cls-342"
-                          d="M91.18,77c1.56-.55,3.1-1,4.34-1.32,1.41-.37,2.41-.51,2.46-.53s1-.15,2.51-.25a34.31,34.31,0,0,1,5.28.12,31.23,31.23,0,0,1,4,.66l1.12.28a7,7,0,0,1,2.2.86s0,0,0,0c-.21,0-1-.21-2.26-.42a39,39,0,0,0-5.08-.56,38.07,38.07,0,0,0-5.14.12c-1.41.16-2.36.32-2.41.34s-1,.11-2.4.42c-1,.2-2.14.49-3.38.83Z"/>
-                    <path class="cls-342"
-                          d="M95.71,120.89c.32-.22.38-.39.38-.44l-.1-.34.36,0c.5,0,1.31,0,1.49,0a.31.31,0,0,1,.33.21,2.79,2.79,0,0,1-.47,2.31h0c-.13-.12-.28-.23-.41-.34l.07,0a2.31,2.31,0,0,0,.36-1.61c-.3,0-.83,0-1.14,0a1.27,1.27,0,0,1-.48.58C96,121.14,95.83,121,95.71,120.89Z"/>
-                    <path class="cls-342" d="M96.09,121.25l-.15.12-.3-.44.07,0C95.83,121,96,121.14,96.09,121.25Z"/>
-                    <path class="cls-342"
-                          d="M95.09,183.39a.5.5,0,0,1,.1-.14l1.23.24c-.21.31-.33.5-.33.51s-.36.09-.64-.05S95,183.55,95.09,183.39Z"/>
-                    <path class="cls-342"
-                          d="M94.17,54.59c0-.21,0-.34.09-.52s.15-.65.23-1a17.85,17.85,0,0,1,.68-1.85A20.47,20.47,0,0,1,99.74,45a22.33,22.33,0,0,1,3-2.43,12,12,0,0,1,3.46-1.7,8.6,8.6,0,0,1,3.77-.18,13.25,13.25,0,0,1,3.33,1.06,17.94,17.94,0,0,1,2.88,1.56,9.34,9.34,0,0,1,2.06,2.29,18.3,18.3,0,0,1,2,4.48,30.55,30.55,0,0,1,1.06,4.49c.17,1,0,3.18-.32,3.46,0,0,0-1.33,0-1.35a28.12,28.12,0,0,0-.85-3.15l0-.38c0-.07,0-.16-.07-.26-.77-2-.94-2.38-1.53-3.69-.1-.19-.57-1.15-.71-1.41a9.34,9.34,0,0,0-3-3.78l-.52-.31h-.51l-1.17-.58a8.77,8.77,0,0,0-6.12-.88,15,15,0,0,0-5.9,3.71,18.9,18.9,0,0,0-4.4,5.83,13.43,13.43,0,0,0-.66,1.69c-.08.3-.16.58-.23.87l-.08.41,0,.17.49.39c.25.19.48.39.73.57L98,56.89l0,0a16.54,16.54,0,0,0,4.3,1.93A38.35,38.35,0,0,0,106.69,60a26.28,26.28,0,0,0,4.74.64,3.78,3.78,0,0,0,.53.28.44.44,0,0,1,.29-.14c.63,0,1.26-.09,1.88-.11l.09-.1h.23a.07.07,0,0,0,.06,0l.25,0a3.83,3.83,0,0,0,1.58,0,2.67,2.67,0,0,0,.43-.32,8.12,8.12,0,0,0,1.15-.27l.31-.29c.41-.17.79-.36,1.1-.52A16.91,16.91,0,0,0,121,58a4.31,4.31,0,0,1-1.51,1.28,13.45,13.45,0,0,1-5,1.81,22.79,22.79,0,0,1-7.88-.32,38.27,38.27,0,0,1-4.51-1,16.81,16.81,0,0,1-4.65-2h0l-1.53-1c-.26-.18-.51-.39-.76-.57l-.37-.28c-.21-.16-.41-.32-.59-.48C94.12,55.1,94.15,54.84,94.17,54.59Z"/>
-                    <path class="cls-342"
-                          d="M94,84a9.47,9.47,0,0,0-.85-1.49l.94-1.83a1.74,1.74,0,0,1,.37.34,1.81,1.81,0,0,1,.29.61c0,.17.11.34.16.55Z"/>
-                    <path class="cls-342"
-                          d="M93.89,121.49a1.41,1.41,0,0,0,.21-1.08,16.63,16.63,0,0,1-.83-2.51l.24-.12a12.13,12.13,0,0,0,2,2.87,2.72,2.72,0,0,0,.24.24l-.07,0,.3.44.15-.12c.38.38.78.73,1.19,1.08a.35.35,0,0,1-.32-.06l-.27.45a1.09,1.09,0,0,0,.5.14.74.74,0,0,0,.5-.18l1.08.83a18,18,0,0,0,7.76,3.56,26.16,26.16,0,0,0,4.26.21,28.48,28.48,0,0,0,4.18-.38c2.68-.48,5.25-1.42,6.74-3.39a48,48,0,0,0,4.27-5.82,27.2,27.2,0,0,0,4-10c.41-2.58.23-4.1.36-4.1a4.07,4.07,0,0,1,.16,1.07c0,.15,0,.29,0,.46a6,6,0,0,1,0,.85,12.75,12.75,0,0,1-.09,1.78c0,.34-.08.71-.14,1.09-.16,0-.26,0-.26,0s.08.07.23.09a27.57,27.57,0,0,1-3.47,9.16q-.84,1.48-1.89,3c.15-.6.2-1,.1-1s-1.19,1.74-2.18,3.55c-.18.32-.34.63-.51.93l0,0a8.84,8.84,0,0,1-2.94,2.25,16.59,16.59,0,0,1-4.11,1.32c-.38.07-.78.14-1.17.19,0-.06,0-.11,0-.16s0-.24,0-.3v-.06h-.08l-.66,0-1,0c0,.07,0,.32,0,.78h-.11c0-.49-.08-.76-.15-.77s-.1.28-.2.8c-.33,0-.67,0-1,.06a25.71,25.71,0,0,1-4.53-.14,16.43,16.43,0,0,1-3.89-1.09c-.15-.3-.31-.56-.44-.77l0,0,.12-.33-2.19-.79s-.06.2-.21.58c-.66-.4-1.29-.81-1.91-1.26a31.67,31.67,0,0,1-3.57-3C94.11,121.74,94,121.62,93.89,121.49Z"/>
-                    <path class="cls-342" d="M93.42,80c.12-.26.2-.41.2-.41l2.1,1-.13.25c-.49-.17-.83-.32-1.26-.49Z"/>
-                    <path class="cls-342"
-                          d="M92.29,125.14a2.79,2.79,0,0,1-.52-.56,1.38,1.38,0,0,1-.09-.21s0,0,0,0a13.39,13.39,0,0,0,1.67-1.89c0,.07,0,.14,0,.21a1.15,1.15,0,0,0,.43.79.72.72,0,0,0,.06.24c.12.21.31.51.5.81.36.61.8,1.14.7,1.44s-1,.22-1.78-.18A6.15,6.15,0,0,1,92.29,125.14Z"/>
-                    <path class="cls-342"
-                          d="M92.39,119.44c.72-1.2.79-1.73.88-1.54a16.63,16.63,0,0,0,.83,2.51,1.41,1.41,0,0,1-.21,1.08A12.81,12.81,0,0,1,92.39,119.44Z"/>
-                    <path class="cls-342"
-                          d="M97.45,7.76a21.06,21.06,0,0,0-4.57-1.49c-.35-.07-.68-.12-1-.16l.5-.22.72-.28.65-.23.2-.06A32,32,0,0,1,97.64,7a25,25,0,0,1,2.88,1.82L102.08,10l.81.61.62.5c.13.1.25.21.28.22a10.36,10.36,0,0,1,1,.95c.19.28,0-.08,0-.23s-.11-.33-.16-.46c-.1-.28-.18-.49-.21-.55-.41-1.15-1.15-3.13-1.71-4.39a20.43,20.43,0,0,0-1.09-2.27c.51,0,1,0,1.47,0,.21.59.41,1.26.65,2l1.7,5.64a1.7,1.7,0,0,0,0,.53,4,4,0,0,0,0,.47c0,.14.12.48-.06.2a4.34,4.34,0,0,0-1.31-.93l-.46-.4c-.35-.3-.69-.57-1-.82l-.81-.61c-.52-.38-1-.73-1.53-1.07A19.88,19.88,0,0,0,97.45,7.76Z"/>
-                    <path class="cls-342"
-                          d="M91.93,79.33l-2.26-1c.35-.13.72-.24,1.09-.35.54-.16,1.09-.32,1.63-.46l.27.12L95,78.74l1.14.49c.34.12.79.24,1.2.36,2.22.63,4.46,1.27,6.6,2l0,0-.76.58-.62.48c-1.83-.5-3.71-1-5.62-1.46-.43-.1-.83-.19-1.32-.35h0l.13-.25-2.1-1s-.08.15-.2.41Z"/>
-                    <path class="cls-342"
-                          d="M92.62,115.07a2.28,2.28,0,0,1-.38-.19l-.27-.75.11.07a2.44,2.44,0,0,0,.74.33,1,1,0,0,1,.32.19.91.91,0,0,1,.3.74A.66.66,0,0,1,93,116a.58.58,0,0,1-.25,0,.13.13,0,0,1,0-.08c.1-.09.42-.27.35-.51a.41.41,0,0,0-.22-.29A.74.74,0,0,0,92.62,115.07Z"/>
-                    <path class="cls-342"
-                          d="M91.57,123.84a2.73,2.73,0,0,1,.18-1.43c.34-.91,1.08-1.48,1.34-1.26s.16.75.25,1.29a13.39,13.39,0,0,1-1.67,1.89A2.32,2.32,0,0,1,91.57,123.84Z"/>
-                    <path class="cls-342"
-                          d="M90.8,91.23c.18-.56.36-1.11.56-1.61a5.27,5.27,0,0,0,1.28.7,8.19,8.19,0,0,0,3.19.35l1.08-.07.91-.08c.31,0,.63-.08,1-.14l.52-.09c.17,0,0,0-.09-.06L99,90.14l-.16-.08a5,5,0,0,1-.92-.5,2.66,2.66,0,0,1-.38-.28,5.06,5.06,0,0,1-.49-.41A8.11,8.11,0,0,1,95.58,87c-.69-1.22-1.13-2.24-1.53-3,0,0,0,0,0,0l.91-1.82c.09.36.18.8.31,1.33a20.55,20.55,0,0,0,1,3.09,7.46,7.46,0,0,0,.4.8,6.19,6.19,0,0,0,.75,1c.15.13.28.29.44.41a4.55,4.55,0,0,0,.66.5,7.11,7.11,0,0,0,1.43.76,3.24,3.24,0,0,0,.31.13s.28.15.29.19.22.07.27.1.21.06,0,.09l-.84.17L98.34,91l-1.45.25-1.1.15a12.24,12.24,0,0,1-3.55.14A8.54,8.54,0,0,1,90.8,91.23Z"/>
-                    <path class="cls-342"
-                          d="M92,114.13l.27.75a1.34,1.34,0,0,1-.43-.36c-.16-.17-.28-.34-.39-.43s-.2-.09-.22-.14.12-.12.32-.06A1.78,1.78,0,0,1,92,114.13Z"/>
-                    <path class="cls-342"
-                          d="M90.8,91.23a5.13,5.13,0,0,1-1.31-.61l1.44-1.49a1.77,1.77,0,0,0,.43.49C91.16,90.12,91,90.67,90.8,91.23Z"/>
-                    <path class="cls-342"
-                          d="M88.71,77.94c.57-.25,1.17-.48,1.79-.7l.67-.24h0l1.21.56c-.54.14-1.09.3-1.63.46-.37.11-.74.22-1.09.35Z"/>
-                    <path class="cls-342"
-                          d="M89.66,124.78l-.79-.87-.06,0,.31-.33c.53-.51.85-.8.91-.87a23.06,23.06,0,0,0,2.36-3.23,12.81,12.81,0,0,0,1.5,2,6.65,6.65,0,0,1-.55,1c-.09-.54,0-1.14-.25-1.29s-1,.35-1.34,1.26a2.73,2.73,0,0,0-.18,1.43,2.32,2.32,0,0,0,.1.49l0,0-1.15,1.09a3.34,3.34,0,0,1-.64-.46A2.23,2.23,0,0,1,89.66,124.78Z"/>
-                    <path class="cls-342"
-                          d="M90.43,4.12l-.84-.24,0,0c.47-.28.95-.55,1.43-.81l.74-.38.81-.39A27.68,27.68,0,0,1,99.09.59c.53-.08,1-.15,1.56-.2l0,.38L99.51,2.49l.51.25.67.35.1.06h0s0,0,0,0,0,0,.06,0l.32.4c.13.21.29.47.43.75-.68,0-1.39,0-2.12.08A27.94,27.94,0,0,0,94,5.32c-.31-.13-.6-.23-.88-.33C91.88,4.56,91,4.29,90.43,4.12Z"/>
-                    <path class="cls-342"
-                          d="M89.73,103.24h.19A19.67,19.67,0,0,0,92.1,103a12.53,12.53,0,0,0,3.66-1.15,30.47,30.47,0,0,0,4.39-3l1-.8-.05-.06-.61.13-1,.25c-.4,0-.75.1-1.13.13l-1.45.11a22.78,22.78,0,0,1-2.59,0,13,13,0,0,1-3.8-.75c-.33-.12-.64-.25-.91-.37,0-.64.11-1.29.21-1.9a6.16,6.16,0,0,0,1.21.93,9.33,9.33,0,0,0,3.28,1.16,15.59,15.59,0,0,0,2.5.17l1.45,0c.61,0,1.36-.09,2.06-.16a12.83,12.83,0,0,0,1.7-.12l0,0c-.43.44-1,1-1,1-.55.47-.84.86-1.39,1.29s-.91.73-1.32,1.06a24.53,24.53,0,0,1-2.28,1.62,18.34,18.34,0,0,1-3.74,1.7c-1,.34-1.7.55-2.15.69l-.23.07C89.86,104.51,89.78,103.87,89.73,103.24Z"/>
-                    <path class="cls-342"
-                          d="M88.3,127.52l2.19-2.07.06,0,0,0-.09.13a2.41,2.41,0,0,0-.28.54,1.3,1.3,0,0,0,.23,1.46c.1.12.27.26.44.42s.36.28.52.42c.34.27.66.51.94.7.57.41,1,.63,1,.77s-.58.24-1.32.07a8.05,8.05,0,0,1-1.23-.41l-.67-.3a4.17,4.17,0,0,1-.7-.41A3.07,3.07,0,0,1,88.3,127.52Z"/>
-                    <path class="cls-342"
-                          d="M89.35,5.94l.21-2,0,0,.84.24c.58.17,1.45.44,2.66.87.28.1.57.2.88.33l-.2.06-.65.23-.72.28-.5.22a12.67,12.67,0,0,0-1.72-.17,4.8,4.8,0,0,0-.64,0Z"/>
-                    <path class="cls-342"
-                          d="M89.06,89.47c.11-.33.23-.66.35-1,.64-.29,1.08-.41,1.12-.32S90,88.76,89.06,89.47Z"/>
-                    <path class="cls-342"
-                          d="M89.61,97.59a7.45,7.45,0,0,1-1.83-1.13l1.6-1.34a1.86,1.86,0,0,0,.44.57C89.72,96.3,89.66,97,89.61,97.59Z"/>
-                    <path class="cls-342"
-                          d="M90,105.16l-.47.13-.23-2.07.16,0h.32C89.78,103.87,89.86,104.51,90,105.16Z"/>
-                    <path class="cls-342"
-                          d="M88.46,108.29c-.08-.47-.18-.93-.26-1.38a.27.27,0,0,0,0-.13s0,0,0-.07a2.11,2.11,0,0,0,.25-.14l.06,0h0l.1,0h0l0,0,.06,0,0,0,.08,0,.24-.11a0,0,0,0,1,0,0l.2-.1v0l0,.08,0,.11a1.75,1.75,0,0,1,0,.4,1.54,1.54,0,0,1-.18.8A1.89,1.89,0,0,1,88.46,108.29Z"/>
-                    <path class="cls-342"
-                          d="M91.57,117.94a37.92,37.92,0,0,1-2.85-8.45c-.09-.4-.18-.81-.26-1.2a1.89,1.89,0,0,0,.84-.76,1.54,1.54,0,0,0,.18-.8,1.75,1.75,0,0,0,0-.4l0-.11,0-.08v0h0s0,0,0,.06v-.09s0,0,0,0h0l-.07-.88c0-.67-.09-1.32-.13-2h.07l.23,2.07.47-.13c.17,1.29.4,2.6.67,3.92a44.93,44.93,0,0,0,1.35,5,1.78,1.78,0,0,0-.45-.24c-.2-.06-.34,0-.32.06s.12,0,.22.14.23.26.39.43a1.34,1.34,0,0,0,.43.36c.13.36.27.72.43,1.07,0,0,0,0,0,0a.09.09,0,0,0,.06,0c.15.38.31.75.49,1.12l.32.63-.24.12c-.09-.19-.16.34-.88,1.54C92.09,118.94,91.82,118.45,91.57,117.94Z"/>
-                    <path class="cls-342"
-                          d="M88.23,127.31a3.35,3.35,0,0,1-.09-1.7,5.21,5.21,0,0,1,.33-1.08c.06-.13.11-.22.15-.29l0,0,.07-.1a.94.94,0,0,1,.15-.18l.79.87a2.23,2.23,0,0,0,.19.21,3.34,3.34,0,0,0,.64.46l-2.19,2.07A1.29,1.29,0,0,1,88.23,127.31Z"/>
-                    <path class="cls-342" d="M87.71,95.24c.06-.5.15-1,.23-1.48,0-.28.1-.56.17-.84h0l.16-.1,1,1.44Z"/>
-                    <path class="cls-342"
-                          d="M87.52,97.28c0-.7.11-1.37.19-2l1.56-1-1-1.44-.16.1a28.07,28.07,0,0,1,1-3.44c.91-.71,1.52-1.19,1.47-1.29s-.48,0-1.12.32c.11-.3.23-.59.35-.87.79-1.78,1.49-3.13,2.06-4.35L93.42,80l.91.38c.43.17.77.32,1.26.49l-.65,1.32c0-.21-.11-.38-.16-.55a1.81,1.81,0,0,0-.29-.61,1.74,1.74,0,0,0-.37-.34l-.94,1.83A9.47,9.47,0,0,1,94,84l-.15.32c-.56,1.17-1.34,2.65-2.07,4.22-.16.36-.31.72-.45,1.11a1.77,1.77,0,0,1-.43-.49l-1.44,1.49a5.13,5.13,0,0,0,1.31.61,27.83,27.83,0,0,0-.74,2.93c-.09.5-.18,1-.24,1.53a1.86,1.86,0,0,1-.44-.57l-1.6,1.34a7.45,7.45,0,0,0,1.83,1.13,28.3,28.3,0,0,0,0,3.58c0,.67.1,1.37.17,2.07h-.32l-.16,0h-.07v0c-.1-1.39-.18-2.74-.26-4l-.42-.52-.25-.34c-.15-.22-.32-.45-.48-.66Z"/>
-                    <path class="cls-342"
-                          d="M87.47,100a22.76,22.76,0,0,1,0-2.75l.25.37c.16.21.33.44.48.66l.25.34.42.52c.08,1.28.16,2.63.26,4v0c0,.65.09,1.3.13,2l.07.88h0l0,0-.2.11a0,0,0,0,0,0,0l-.24.11-.08,0,0,0-.06,0,0,0h0l-.1,0h0l-.06,0-.25.09h0a2.05,2.05,0,0,1-.07-.31,0,0,0,0,1,0,0l-.13-1c0-.16,0-.34,0-.51,0-.49-.1-1-.16-1.48C87.68,102.17,87.57,101.07,87.47,100Z"/>
-                    <path class="cls-342"
-                          d="M87.33,142.59a1.46,1.46,0,0,1,.45-.07s-.22.16-.62.29A1.18,1.18,0,0,1,87.33,142.59Z"/>
-                    <path class="cls-342"
-                          d="M85.85,179.76c-.44-.25-.85-.51-1.27-.79a2.29,2.29,0,0,1,.28-.09c.45-.13,1.07-.32,1.8-.58a17.25,17.25,0,0,0,5-2.58A6.52,6.52,0,0,0,94,171a13.88,13.88,0,0,0-.06-2.48l.1,0a6.6,6.6,0,0,1,.41,2.47A7.49,7.49,0,0,1,94,173.7a6.54,6.54,0,0,1-1.83,2.65,17.58,17.58,0,0,1-5.12,3Z"/>
-                    <path class="cls-342" d="M86.89,103.56a.74.74,0,0,0-.17-.12s0,0,0,0,.08,0,.14.07h0v.07Z"/>
-                    <path class="cls-342"
-                          d="M86.89,103.57v.05s0,0,0,0l.07,0a0,0,0,0,1,0,0l.18.17a.26.26,0,0,1-.16.09c-.29-.06-.23-.16-.28-.22a.37.37,0,0,1,0-.15.28.28,0,0,1,0-.13.74.74,0,0,1,.17.12Z"/>
-                    <path class="cls-342"
-                          d="M85.15,96.41A1.67,1.67,0,0,1,85,95.2c.11-.36.53-.56.86-.8l.47-.31,1.74-1.17c-.07.28-.12.56-.17.84-.08.48-.17,1-.23,1.48l-.49.31c-.15.1-.31.2-.49.3h0s0,0,0,0l.1.21.15.28c.17.29.36.59.56.9a22.76,22.76,0,0,0,0,2.75l0-.27,0,0-.12-.14L87,99.25c-.18-.24-.36-.46-.52-.68a14.53,14.53,0,0,1-.94-1.37l-.2-.34C85.3,96.72,85.26,96.65,85.15,96.41Z"/>
-                    <path class="cls-342"
-                          d="M86.18,132.51A5.63,5.63,0,0,1,84.67,131c.56-.55,1.1-1.06,1.61-1.55,0,.07,0,.13,0,.19a4.67,4.67,0,0,0,.94,1.64c1,1.15,2.49,1.91,2.37,2.23S87.77,133.6,86.18,132.51Z"/>
-                    <path class="cls-342"
-                          d="M89.67,78.37A29.31,29.31,0,0,0,86,79.8,14.23,14.23,0,0,0,84,81c-.09-.08.54-.85,1.78-1.57a22.66,22.66,0,0,1,3-1.47Z"/>
-                    <path class="cls-342"
-                          d="M86.17,146c-1.55,2.25-2,4.08-2.17,4a6.41,6.41,0,0,1,.68-3,1.72,1.72,0,0,0,.54-.28s-.17,0-.46.09a13.19,13.19,0,0,1,.63-1.34,17.91,17.91,0,0,1,1.77-2.68c.4-.13.62-.24.62-.29a1.46,1.46,0,0,0-.45.07c1.32-1.7,3-3.45,4.54-5.16,1.26-1.36,2.39-2.77,3.45-4.15a42.92,42.92,0,0,0,2.68-3.8,22.54,22.54,0,0,0,1.49-2.84l.22-.53c.63.37,1.28.7,1.94,1a1.77,1.77,0,0,0,.06.17h0c0,.09-.09.18-.13.27a22.78,22.78,0,0,1-1.77,3.07,43.16,43.16,0,0,1-3,3.87c-1.13,1.33-2.41,2.76-3.76,4.06C90.36,141.17,87.68,143.68,86.17,146Z"/>
-                    <path class="cls-342"
-                          d="M85.22,146.74a1.72,1.72,0,0,1-.54.28,1.08,1.08,0,0,1,.08-.19C85.05,146.76,85.21,146.71,85.22,146.74Z"/>
-                    <path class="cls-342"
-                          d="M84.37,130.39a8.38,8.38,0,0,1-.38-.79l.12,0,.3-.15.22-.12,1.38-.75a1.84,1.84,0,0,1,.15.46c0,.13.08.28.12.44-.51.49-1,1-1.61,1.55a.15.15,0,0,1,0-.07l0,0A5.3,5.3,0,0,1,84.37,130.39Z"/>
-                    <path class="cls-342" d="M84.44,159.34a2,2,0,0,1,.31-.59,2.56,2.56,0,0,1-.21.78Z"/>
-                    <path class="cls-342"
-                          d="M84.37,103.59s.1-.11.24-.25a3.93,3.93,0,0,1,.41-.14.33.33,0,0,1,0,.06C84.62,103.6,84.4,103.6,84.37,103.59Z"/>
-                    <path class="cls-342"
-                          d="M84,179.75a.3.3,0,0,1,0-.43c0-.13.08-.21.16-.23l.45-.12h0c.42.28.83.54,1.27.79l-.65.21-.74.24a.25.25,0,0,1-.24-.11C84.24,180,84.12,179.85,84,179.75Z"/>
-                    <path class="cls-342"
-                          d="M83.89,129.45c1.63-1.87,3.26-3.76,4.92-5.58l.06,0a.94.94,0,0,0-.15.18l-.07.1,0,0c0,.07-.09.16-.15.29a5.21,5.21,0,0,0-.33,1.08,3.35,3.35,0,0,0,.09,1.7,1.29,1.29,0,0,0,.07.21l-.74.71-1.28,1.2c0-.16-.08-.31-.12-.44a1.84,1.84,0,0,0-.15-.46l-1.38.75-.22.12-.3.15-.12,0,0-.09h0Z"/>
-                    <path class="cls-342"
-                          d="M83.53,104.64a.75.75,0,0,1,0-.6,1.86,1.86,0,0,1,1-.67l.08,0c-.14.14-.27.22-.24.25s.25,0,.62-.33a.33.33,0,0,0,0-.06,2.41,2.41,0,0,1,.72-.12,1.82,1.82,0,0,1,1,.36.28.28,0,0,0,0,.13.37.37,0,0,0,0,.15c0,.06,0,.16.28.22a.26.26,0,0,0,.16-.09,2.94,2.94,0,0,1,.44.42.87.87,0,0,1,.2.41.49.49,0,0,1,0,.12.56.56,0,0,1,0,.2c-.06.18-.13.25-.14.25s.21-.45-.22-.83c-.2-.19-.49-.37-.78-.59a1.47,1.47,0,0,0-.94-.34,2.89,2.89,0,0,0-1,.32c-.32.15-.63.32-.68.46s0,.25.13.37a1.11,1.11,0,0,0,.16.15s0,.17-.09.31-.22.19-.27.15a1.89,1.89,0,0,1-.24-.25A1,1,0,0,1,83.53,104.64Z"/>
-                    <path class="cls-342"
-                          d="M84.27,159a11.06,11.06,0,0,1-.91-3.46.41.41,0,0,1,0-.16c.22-.13.32-.22.3-.25a1.79,1.79,0,0,0-.31.12,9.21,9.21,0,0,1,.66-4.7h0a26.19,26.19,0,0,0,.18,4.87,11,11,0,0,0,1.07,3.12c.42.76.8,1.31.82,1.34l.83,1.39c.5.8,1.17,1.84,1.91,2.82a17,17,0,0,0,2.24,2.48c.67.6,1.22.93,1.17,1s0,0,0,0a4.21,4.21,0,0,1-1.4-.65,13.86,13.86,0,0,1-2.61-2.33A30,30,0,0,1,86,161.85c-.56-.78-.92-1.33-.94-1.36s-.23-.37-.53-1a2.56,2.56,0,0,0,.21-.78,2,2,0,0,0-.31.59C84.38,159.23,84.33,159.12,84.27,159Z"/>
-                    <path class="cls-342"
-                          d="M84,129.6a8.38,8.38,0,0,0,.38.79,5.3,5.3,0,0,0,.3.48l0,0c-.1-.14-.17-.27-.25-.4-.18-.34-.31-.63-.38-.79l0-.1h0Z"/>
-                    <path class="cls-342" d="M83.94,129.6l-.12-.09.06-.06h0l0,0h0l0,.09h0Z"/>
-                    <path class="cls-342"
-                          d="M83.33,155.24a1.79,1.79,0,0,1,.31-.12s-.08.12-.3.25A.3.3,0,0,1,83.33,155.24Z"/>
-                    <path class="cls-342"
-                          d="M82.46,97a6.33,6.33,0,0,1-.79-1.26,4.83,4.83,0,0,1-.23-.61,1.88,1.88,0,0,1-.07-.46,1.43,1.43,0,0,1,.44-1.19l.26-.24.22-.19c.16-.13.34-.27.51-.42.38-.3.78-.61,1.22-.92.88-.64,1.87-1.29,2.81-1.86a20.63,20.63,0,0,1,2.58-1.38c-.12.31-.24.64-.35,1-.48.36-1,.8-1.62,1.28-.84.67-1.72,1.41-2.51,2.11l-1.08,1-.44.43-.2.2c0,.06-.15.15-.11.14s0,0,0,.1,0,.12.11.37a4.36,4.36,0,0,0,.48.93c.45.7,1.64,1.51,2.55,2.72a5.55,5.55,0,0,1,.93,2,7.84,7.84,0,0,1,.19,1.81c0,.26,0,.5,0,.73s0,.2,0,.31a.4.4,0,0,1-.06.16.31.31,0,0,1,0,.1h0l-.18-.17h0s0,0,0-.06h0l-.07,0-.09-.08a1.77,1.77,0,0,0,0-.21c0-.2-.08-.42-.14-.67a5.85,5.85,0,0,0-1.4-3.09C84.49,98.62,83.28,98,82.46,97Z"/>
-                    <path class="cls-342"
-                          d="M82.69,136.13a5.23,5.23,0,0,1-1.55-1.42c.55-.62,1.09-1.21,1.61-1.76,0,.12.09.31.17.55a4.11,4.11,0,0,0,.78,1.32,5.8,5.8,0,0,0,1.31,1c.4.24.68.29.76.43s-.32.47-1,.45A4.35,4.35,0,0,1,82.69,136.13Z"/>
-                    <path class="cls-342"
-                          d="M82.19,9.84l.51-.56A27.7,27.7,0,0,1,87,5.6c.81-.59,1.69-1.16,2.6-1.7l-.21,2h.19a4.8,4.8,0,0,1,.64,0,12.67,12.67,0,0,1,1.72.17L91,6.49c-.93.42-1.81.87-2.66,1.32a37.15,37.15,0,0,0-4.43,2.82L83.5,11a1.44,1.44,0,0,0-.37.15,5.94,5.94,0,0,0-.82.6A3,3,0,0,0,82.19,9.84Z"/>
-                    <path class="cls-342"
-                          d="M81.56,104.46a12.39,12.39,0,0,1,.7-1.52,3.06,3.06,0,0,1,.53-.64c.22-.2.36-.28.59-.49a3.72,3.72,0,0,1,.63-.49c.2-.09.44-.2.62,0,.3.3.26.77.37,1.12,0,.18.06.29.08.44a.53.53,0,0,1-.06.37,3.93,3.93,0,0,0-.41.14,2,2,0,0,0,.18-.21c.08-.11,0-.34-.12-.6s-.09-.48-.26-.69-.29,0-.39.14-.22.22-.32.33-.33.3-.47.45a2.1,2.1,0,0,0-.37.52,13.73,13.73,0,0,0-.57,1.45c-.07.25-.19.56-.23.79a.9.9,0,0,0,0,.63,1.87,1.87,0,0,0,1.14.84,7.1,7.1,0,0,0,1.79.35,13.64,13.64,0,0,0,1.92,0c.58,0,1.23-.21,1.26-.43a.07.07,0,0,0,0,0c.08.45.18.91.26,1.38a2.67,2.67,0,0,1-.33.12,4.42,4.42,0,0,1-1.17.15,14.48,14.48,0,0,1-2.09-.15,8.38,8.38,0,0,1-2-.5,2.71,2.71,0,0,1-1.64-1.47,2,2,0,0,1,0-1.14A7.85,7.85,0,0,1,81.56,104.46Z"/>
-                    <path class="cls-342"
-                          d="M81,134.4a4.9,4.9,0,0,1-.48-.88,7.22,7.22,0,0,1,1-.44,3.43,3.43,0,0,1,1.13-.28s0,.06,0,.15c-.52.55-1.06,1.14-1.61,1.76l0-.07,0,0Z"/>
-                    <path class="cls-342"
-                          d="M80.22,13.23c0-.16,0-.18,0-.2a2,2,0,0,1,.13-.48,11.47,11.47,0,0,1,1.85-2.71,3,3,0,0,1,.12,1.86,11.36,11.36,0,0,0-1,1L81,13l-.5.52-.09,0A.44.44,0,0,1,80.22,13.23Z"/>
-                    <path class="cls-342"
-                          d="M80.54,133.52a4.9,4.9,0,0,0,.48.88l.12.19,0,0-.08-.12a4.91,4.91,0,0,1-.51-1Z"/>
-                    <path class="cls-342"
-                          d="M79.38,48.78a47.11,47.11,0,0,1,3.17-4,46.42,46.42,0,0,1,5.56-5.37,25.64,25.64,0,0,1,2.65-1.87,23.53,23.53,0,0,1,2.31-1.16A30.25,30.25,0,0,1,99,34.69a51.17,51.17,0,0,1,8.62-.94,16.58,16.58,0,0,1,9.81,3.59l0,0,0,0a15.59,15.59,0,0,1,4.64,5.33,20.78,20.78,0,0,1,2.06,6.67,53.64,53.64,0,0,1,.51,6.52,25,25,0,0,1-.29,6,22.41,22.41,0,0,1-3.48,8.37c-1.25,1.83-2.23,2.7-2.31,2.61s.18-.26.51-.75.81-1.21,1.35-2.14a23.86,23.86,0,0,0,2.93-8.26,25.49,25.49,0,0,0,.06-5.75,59.06,59.06,0,0,0-.7-6.34,20,20,0,0,0-2.07-6.13,14,14,0,0,0-4.31-4.67l-.07-.06a14.76,14.76,0,0,0-8.67-3,50,50,0,0,0-8.2,1.05A27.46,27.46,0,0,0,94,38.54a20.43,20.43,0,0,0-2,1,28.12,28.12,0,0,0-2.43,1.67,43.71,43.71,0,0,0-5.36,5A42.4,42.4,0,0,0,81.06,50l-.77,1.08-.19.26,0,0s-.07.06,0,.09l.06.08.41.48.92,1.06a87.35,87.35,0,0,0,8.34,8.32,46.42,46.42,0,0,0,4.73,3.56l1.23.77,1.26.68c.84.44,1.72.84,2.57,1.25,3.41,1.62,6.61,3.08,9.41,4.13a27.81,27.81,0,0,0,3.87,1.2,13.17,13.17,0,0,0,3.09.27,9.43,9.43,0,0,0,2-.19c.45-.08.67-.19.69-.17s-.86.69-2.65.83a13.19,13.19,0,0,1-3.24,0,19,19,0,0,1-2.24-.49c-.58-.15-1.18-.34-1.81-.53-2.9-.94-6.17-2.3-9.65-3.81-.87-.38-1.74-.76-2.65-1.18L95,67l-1.31-.76a45.7,45.7,0,0,1-5-3.56A85.36,85.36,0,0,1,80,54.35l-1-1.06-.51-.58-.82-1c0-.08-.21-.17-.15-.25l.18-.26.35-.53.57-.82C78.88,49.5,79.13,49.14,79.38,48.78Z"/>
-                    <path class="cls-342"
-                          d="M78,140.43a5.34,5.34,0,0,1-.59-1.28c.14-.19.29-.38.44-.56l.21-.27a4.59,4.59,0,0,0,.61,1.71,4.37,4.37,0,0,0,1.21,1.36,5.52,5.52,0,0,0,1.93.89,14.08,14.08,0,0,0,4.09.46,11.24,11.24,0,0,0,1.42-.15,1.18,1.18,0,0,0-.17.22,10.61,10.61,0,0,1-1.23.26,12.86,12.86,0,0,1-4.25-.21,6.22,6.22,0,0,1-2.19-.9A5,5,0,0,1,78,140.43Z"/>
-                    <path class="cls-342"
-                          d="M77.86,138.59c-.15.18-.3.37-.44.56l0-.09,0,0a4.51,4.51,0,0,1-.19-.73.4.4,0,0,1,.37-.34.45.45,0,0,1,.46.31.18.18,0,0,0,0,0Z"/>
-                    <path class="cls-342"
-                          d="M77.23,138.3a4.51,4.51,0,0,0,.19.73l0,0a5,5,0,0,1-.16-.64A.24.24,0,0,1,77.23,138.3Z"/>
-                    <path class="cls-342"
-                          d="M74.33,145.31a6.62,6.62,0,0,1-.5-.77c.15-.29.3-.59.47-.87a5.7,5.7,0,0,0,.65,1.17,6.1,6.1,0,0,0,3.65,2.4,11.13,11.13,0,0,0,4.55-.05c.69-.13,1.26-.28,1.61-.36a1.08,1.08,0,0,0-.08.19,14.92,14.92,0,0,1-1.45.49,10.92,10.92,0,0,1-4.74.32A6.64,6.64,0,0,1,74.33,145.31Z"/>
-                    <path class="cls-342"
-                          d="M73.44,143.74l.17-.46a.08.08,0,0,0,0,0c.08-.16.16-.33.23-.5,0,0,0,0,0,0a.32.32,0,0,1,.17.22.43.43,0,0,1,0,0,3.61,3.61,0,0,0,.18.52s0,.09,0,.14c-.17.28-.32.58-.47.87A4.4,4.4,0,0,1,73.44,143.74Z"/>
-                    <path class="cls-342"
-                          d="M73.89,142.63h0c.27-.62.56-1.23.86-1.82,0-.07.09-.14.14-.21.67-1,1.24-2,1.82-3,.48-.71,1-1.42,1.46-2.12.77-.86,1.53-1.7,2.35-2.52,1.14-1.15,2.24-2.37,3.33-3.59l.06.06-.06.06.12.09h0l0,.1c.07.16.2.45.38.79.08.13.15.26.25.4-.47.46-1,1-1.46,1.49l-.41.43a1,1,0,0,0,0-.14,3.16,3.16,0,0,0-1.13.28,3.6,3.6,0,0,0-1.07.48l0,.07,0,0a4.91,4.91,0,0,0,.51,1l.08.12c-1,1.11-2,2.29-3,3.57a.18.18,0,0,1,0-.05.44.44,0,0,0-.46-.31.38.38,0,0,0-.37.45.24.24,0,0,0,0,.12,5,5,0,0,0,.16.64c-.78,1-1.56,2.05-2.29,3.16-.28.43-.55.88-.8,1.33,0-.05,0-.09,0-.13s-.12-.32-.15-.42,0-.14,0-.15A.3.3,0,0,0,73.89,142.63Z"/>
-                    <path class="cls-342"
-                          d="M77.34,166.56a10.89,10.89,0,0,1-2.79,0c-.52-.05-1-.11-1.38-.18q-.15-.45-.27-.9a15.12,15.12,0,0,0,1.73.31,11.16,11.16,0,0,0,2.61.07,10.39,10.39,0,0,0,2.85-.83,6.06,6.06,0,0,0,2.41-1.65,4.57,4.57,0,0,0,.69-1.13c.18-.41.33-.8.49-1.17.31-.74.57-1.35.76-1.76l.1.19c-.12.43-.32,1-.56,1.7-.13.36-.26.76-.41,1.18a6.64,6.64,0,0,1-1,1.65,5.36,5.36,0,0,1-2.2,1.53A10.42,10.42,0,0,1,77.34,166.56Z"/>
-                    <path class="cls-342" d="M73,166.36c-.07-.29-.15-.59-.21-.88l.12,0q.12.45.27.9Z"/>
-                    <path class="cls-342"
-                          d="M72.78,165.48c.06.29.14.59.21.88l.18,0c.37,1.24.71,2.37.85,2.66a5.18,5.18,0,0,1,.28,1l.18.82c.12.55.25,1.09.36,1.64.25,1.11.49,2.22.74,3.35l.1.53,0,.11c0,.06.05,0,.07,0l.14-.18L77,174.93l1-1.31.7,1.49c.47,1,.94,2,1.42,3,0-.92,0-1.84,0-2.77.79.69,1.63,1.49,2.38,2.08.36.3.79.6,1.11.84l.62.43.4.26-.45.12c-.08,0-.14.1-.16.23a.3.3,0,0,0,0,.43c.12.1.24.23.22.35a.25.25,0,0,0,.24.11l.74-.24.65-.21c.3.17.6.35.92.52a24.45,24.45,0,0,0,5.62,2.31c.92.25,1.85.46,2.8.66a.5.5,0,0,0-.1.14c-.09.16.07.41.36.56s.57.17.64.05.12-.2.33-.51c2.78.51,5.65.87,8.51,1.31l1.6.25.34,0h.52L108,185c1.08-.07,2.16-.15,3.23-.24.83-.07,1.65-.16,2.48-.25l-.15.29c-.09.19.09.44.39.56s.59.09.67-.06l.36-.74a2.09,2.09,0,0,0,.1-.21c.87-.1,1.73-.22,2.58-.34,2.13-.31,4.27-.71,6.35-1.21a32.17,32.17,0,0,0,6-2l0,0h0l5.63-2.23c1.95-.36,3.61-.63,5.36-1,.84-.23,1.7-.41,2.52-.72l1.24-.41,1.22-.5a27.78,27.78,0,0,0,8.61-5.65,21.69,21.69,0,0,0,5.45-8.35,17.58,17.58,0,0,0,.7-2.38,9.4,9.4,0,0,0,.21-1.2l.09-.6a2.53,2.53,0,0,0,0-.38l-.55-.84c-.22-.33-.5-.6-.75-.91a7.56,7.56,0,0,0-1.77-1.43,7.4,7.4,0,0,0-4.39-.86,15.43,15.43,0,0,0-4.47,1.11c-1.44.55-2.82,1.28-4.21,1.92s-2.74,1.35-4.08,2c-5.32,2.71-10.3,5.39-15.07,7.49a63.22,63.22,0,0,1-11.29,3.89,2.28,2.28,0,0,0-.74-.22c-.56-.07-.83.19-.79.21a2,2,0,0,1,.75,0l.3.11c-.57.13-1.14.25-1.7.34a33.13,33.13,0,0,1-10.82.2l-1.8-.3-.13-.1c-.39-.26-.66-.29-.67-.26s.14.11.31.25c-.58-.14-1.11-.3-1.61-.44-1.11-.33-2.06-.61-2.83-.82l-.77-.23c0-.09-.06-.13-.08-.13s0,0,0,.1l-.85-.28a2.44,2.44,0,0,1-.57-.21,5,5,0,0,1,.6.11l1.76.42,2.84.71c.56.14,1.16.31,1.79.45l2.09.29a33.32,33.32,0,0,0,10.65-.4,58.71,58.71,0,0,0,13.23-4.48c4.7-2.15,9.63-4.86,14.94-7.65,1.33-.68,2.69-1.39,4.08-2s2.76-1.42,4.27-2a17.3,17.3,0,0,1,4.8-1.24,8.68,8.68,0,0,1,5.08,1,9,9,0,0,1,2.09,1.64c.28.35.6.66.85,1l.83,1.26a3.26,3.26,0,0,1-.07.86l-.08.65c-.08.42-.1.86-.22,1.29a22,22,0,0,1-.72,2.52,22.69,22.69,0,0,1-5.73,8.92,28.58,28.58,0,0,1-9,6l-1.26.54-1.31.45c-.85.32-1.76.52-2.64.77-1.77.4-3.66.73-5.27,1.05l-5.43,2.17a33.59,33.59,0,0,1-6.33,2.17c-2.15.53-4.32,1-6.5,1.28s-4.35.6-6.53.8c-1.09.11-2.18.19-3.26.26l-.56.05h-.94l-.31-.06-1.6-.22a121.65,121.65,0,0,1-12.77-2.18,26.54,26.54,0,0,1-6-2.44c-1-.51-1.86-1.06-2.75-1.65l-.8-.55-.21-.16s0,.13,0,.2v.28c0,.88,0,1.75.06,2.64l.12,4.61-2-4.18c-.92-1.92-1.81-3.81-2.72-5.68l-.09.12-1,1.29c-.33.42-.7.88-1,.82a1.56,1.56,0,0,1-.26-.13q-.27-.94-.6-1.86a44.72,44.72,0,0,0-.91-8.16c-.19-.87-1.63-6.41-1.84-7.25.13.34.57,1.76,1,3.21Z"/>
-                    <path class="cls-342" d="M71,159.93l.69,1.75A9.5,9.5,0,0,1,71,159.93Z"/>
-                    <path class="cls-342"
-                          d="M70.9,151.76a43.74,43.74,0,0,1,2.54-8,4.4,4.4,0,0,0,.39.8c-.36.71-.69,1.44-1,2.2a50,50,0,0,0-1.56,5.43,10.55,10.55,0,0,0-.27,1.72,3.67,3.67,0,0,1-.34-.51l0,0C70.69,152.82,70.78,152.33,70.9,151.76Z"/>
-                    <path class="cls-342"
-                          d="M70.92,156.52a21.66,21.66,0,0,0,.73,5.16L71,159.93l0-.06v0C71,159.36,70.93,158,70.92,156.52Z"/>
-                    <path class="cls-342"
-                          d="M70.92,155.05c0-.39,0-.79.06-1.16a5.52,5.52,0,0,0,1.14,1.16,6.81,6.81,0,0,0,4.49,1.34,34,34,0,0,0,4.89-.62,12.24,12.24,0,0,0,1.56-.43l.27-.1a.3.3,0,0,0,0,.13,7.14,7.14,0,0,1-1.75.71,27.13,27.13,0,0,1-5,.91,7.5,7.5,0,0,1-5-1.31A5.27,5.27,0,0,1,70.92,155.05Z"/>
-                    <path class="cls-342"
-                          d="M70.64,23.94a11.32,11.32,0,0,1,.88-2l.54-.85s.27-.34.68-.76A14.24,14.24,0,0,1,74.2,19h0l1-.31c.65-.22,1-.7.93-1,.45-.23.76-.34.79-.28s-1.07,1-2.07,2.1a17,17,0,0,0-1.3,1.51c-.34.44-.54.75-.56.76l-.57.75a10.79,10.79,0,0,0-1,1.67c-.68,1.27-.81,2.72-1,2.72s-.17-.36-.16-.94A6.9,6.9,0,0,1,70.64,23.94Z"/>
-                    <path class="cls-342"
-                          d="M70.49,154c.05-.21.08-.41.12-.63l0,0a3.67,3.67,0,0,0,.34.51c0,.37,0,.77-.06,1.16a3.48,3.48,0,0,1-.33-.34c0-.21,0-.42-.09-.62C70.5,154.05,70.49,154,70.49,154Z"/>
-                    <path class="cls-342"
-                          d="M70.92,156.52c0,1.5.08,2.84,0,3.33a11.84,11.84,0,0,1-.44-5.76c0,.2.06.41.09.62a3.48,3.48,0,0,0,.33.34C70.91,155.54,70.91,156,70.92,156.52Z"/>
-                    <path class="cls-342"
-                          d="M69.44,15.92a7.68,7.68,0,0,1,4.63.15,4.48,4.48,0,0,1,2.05,1.64l0,0A11.7,11.7,0,0,0,74.3,19a.46.46,0,0,0-.07.07h0c-.14,0-.21,0-.23,0a2,2,0,0,0-.18-.28,2.4,2.4,0,0,0-.71-.58,6,6,0,0,0-3.4-.49c-3,.18-6-.18-6-.48S66.64,16.54,69.44,15.92Z"/>
-                    <path class="cls-342"
-                          d="M64.61,52.35,61,54.83l-.74.5-.26.18-.35.26.57.13,1.84.48,6.41,1.73-2.85,1.57-1.35.78-.5.3-.16.11h0s-.11.07-.09.12l.21.13,4.5,2.81c2.57,1.6,4.2,2.66,4.33,2.74l2.22,1.53c.68.49,1.37,1,2.29,1.54s2,1.14,3.11,1.76c2.31,1.25,5,2.62,8,4,1,.48,2,1,3.06,1.45l-.67.24c-.62.22-1.22.45-1.79.7l-1.41-.63c-3-1.35-5.81-2.67-8.19-3.88-1.18-.63-2.27-1.2-3.24-1.77S74,70.52,73.41,70.09L71.2,68.63c-.12-.09-1.72-1.14-4.24-2.8L62.5,62.91c-.31-.23-.76-.5-1.07-.78l-.4-.47c-.12-.16-.17-.3-.27-.45s0-.36.07-.5.06-.32.22-.49a1.91,1.91,0,0,1,.48-.45,5.66,5.66,0,0,1,.62-.43c1-.6.71-.43.85-.5l.26-.12A1.55,1.55,0,0,0,63,58.6l-.1,0-.32-.09-1-.3c-2-.59-4-1.17-6.06-1.76,1.53-1,3.07-2,4.61-3l1.49-1,.38-.24.13-.07.27-.17.28-.17s-.15-.08-.23-.12l-.3-.14-.46-.19-.79-.34c-.1,0-.39-.14-.56-.23a1.9,1.9,0,0,1-.48-.41,1.65,1.65,0,0,1,.2-2.25,14.4,14.4,0,0,0,3.31-5.33,28.59,28.59,0,0,0,1.4-5,26.58,26.58,0,0,0,.45-4l.29.25h0A18,18,0,0,1,65.38,38a27.88,27.88,0,0,1-1.13,5.21,19,19,0,0,1-1.25,3,11.46,11.46,0,0,1-.91,1.47,7.11,7.11,0,0,1-.54.72l-.29.35L61,49a.45.45,0,0,0,0,.66.35.35,0,0,0,.16.09l.23.09.79.3,2.45.92.67.26.34.13.17.07.09,0-.06,0Z"/>
-                    <path class="cls-342"
-                          d="M58.76,22.34a56.27,56.27,0,0,0,4.39,7.18c3.13,3.81,5.33,6.43,5.08,6.67s-1.16-.63-2.78-2h0a2.39,2.39,0,0,0-.21-1s-.06.26-.08.73c-1-.85-2.12-1.93-3.41-3.18a49.14,49.14,0,0,1-5.26-7l-.32-.51L56.08,23a1.39,1.39,0,0,1-.11-.21l-.15-.33c-.18-.39-.34-.79-.5-1.19a21.31,21.31,0,0,1-.78-2.5c-.22-.85-.41-1.71-.55-2.61-.06-.45-.11-.9-.14-1.37,0-.23,0-.48,0-.72s0-.25,0-.37,0-.36,0-.52a4,4,0,0,1,.65-2,3.34,3.34,0,0,1,1.73-1.1l.49-.18L57,9.82l.65-.19L59,9.3c1.67-.42,3.3-.75,4.9-1s3.16-.5,4.75-.61a25.42,25.42,0,0,1,4.49.26c2.64.34,4.78.78,6.29,1.09s2.41.52,2.47.54a.51.51,0,0,1,.34.29,11.47,11.47,0,0,0-1.85,2.71,2,2,0,0,0-.13.48s0,0,0,.2a.44.44,0,0,0,.2.27l.09,0-.39.41-1.76-.46c-1.44-.35-3.49-.86-5.9-1.29a23.57,23.57,0,0,0-3.69-.42c-1.32,0-2.83.17-4.35.35s-3.12.42-4.7.71l-1.17.24-1,.22c-.13,0-.24,0-.33.13a1,1,0,0,0-.14.33v.11a2.11,2.11,0,0,0,0,.25c0,.19,0,.37,0,.55,0,.37,0,.75,0,1.14a22.69,22.69,0,0,0,.32,2.32A20.3,20.3,0,0,0,58,20.35c.11.37.23.72.35,1.06l.08.23,0,.06.07.13Z"/>
-                </g>
-                <path class="cls-327"
-                      d="M128.11,146.47l-.53.24-.06-.13.06-.13c0-.1,0-.1,0-.29a3.11,3.11,0,0,0,0-.32,1.79,1.79,0,0,1,.25.22A1.9,1.9,0,0,1,128.11,146.47Z"/>
-                <path class="cls-327"
-                      d="M127.6,146.16c0,.19,0,.19,0,.29l-.06.13a1.34,1.34,0,0,0-.76-.63,3.86,3.86,0,0,0-.89,0,.88.88,0,0,0-.29,0c-.08,0-.12,0-.13,0s0-.05.09-.09a.5.5,0,0,1,.29-.17,3,3,0,0,1,1-.13,1.49,1.49,0,0,1,.72.29A3.11,3.11,0,0,1,127.6,146.16Z"/>
-                <path class="cls-327"
-                      d="M126.72,148.12c0,.19,0,.19-.1.28l-.09.1a1.27,1.27,0,0,0-.58-.79,3.46,3.46,0,0,0-.84-.28,1,1,0,0,0-.29,0,.16.16,0,0,1-.13,0s0-.05.11-.07a.5.5,0,0,1,.33-.09,2.77,2.77,0,0,1,1,.13,1.6,1.6,0,0,1,.62.46C126.75,147.91,126.74,148,126.72,148.12Z"/>
-                <path class="cls-327"
-                      d="M126.76,147.86c.31.41.38.87.24,1l-.48-.34,0,0a.58.58,0,0,0,0-.19s0-.05,0-.07Z"/>
-                <path class="cls-327" d="M126.58,148.65h-.08Z"/>
-                <path class="cls-330" d="M118,145.88h0l0,0,0-.07H118v.11Z"/>
-                <path class="cls-327"
-                      d="M118,145.84l0,0h-.14l-.27.06-.38.08h0a.88.88,0,0,1-.24,0c-.1,0-.12-.11-.1-.1a5,5,0,0,0,1.08-.16h0Z"/>
-                <polygon class="cls-330" points="116.45 146.19 116.45 146.2 116.44 146.2 116.45 146.19"/>
-                <path class="cls-330" d="M111.49,139.22h0a.33.33,0,0,1,0,.06h0Z"/>
-                <path class="cls-330"
-                      d="M110.47,138.42l0,0a2,2,0,0,1,.3.27h-.15c-.09-.06-.12.13-.11.14s-.11-.12-.13-.19a.67.67,0,0,1,.06-.12Z"/>
-                <path class="cls-330" d="M108.73,147.41a.24.24,0,0,0,0,.08h0Z"/>
-                <path class="cls-331" d="M108.7,147.49l0,.14h0l0,.05Z"/>
-                <path class="cls-327" d="M108.7,147.49l-.08.2-.21,0h-.63S108.38,147.55,108.7,147.49Z"/>
-                <polygon class="cls-330"
-                         points="108.66 147.64 108.62 147.76 108.62 147.71 108.62 147.69 108.66 147.64"/>
-                <path class="cls-327"
-                      d="M105.54,146.75c.39-.08.14.27.2.37a.14.14,0,0,1,0,.1h0c-.06,0-.11-.16-.17-.47Z"/>
-                <path class="cls-330"
-                      d="M100.89,155c.11.17.2.31.17.34s-.31-.09-.57-.34C100.81,155,100.83,155,100.89,155Z"/>
-                <path class="cls-330"
-                      d="M97.73,154.57c0,.27.16.5.12.54s-.46-.26-.55-.79a.25.25,0,0,1,0-.08l.22.28s.12,0,.17,0Z"/>
-                <path class="cls-330" d="M153.68,48.24l.22.37-.66.08C153.4,48.54,153.54,48.38,153.68,48.24Z"/>
-                <path class="cls-330" d="M143.19,7.06c.28.3.37.48.32.56s-.28.06-.62,0l-.4-.1L142,6.94l.84-.16Z"/>
-                <path class="cls-330" d="M130.39,56.7q0,.45,0,.93a.55.55,0,0,1-.27-.61A.48.48,0,0,1,130.39,56.7Z"/>
-                <path class="cls-330" d="M126.38,91.88l.35.63a2.8,2.8,0,0,1-.45-.52Z"/>
-                <path class="cls-330" d="M126.1,85.32h.17a.92.92,0,0,1-.06.33C126.15,85.45,126.1,85.33,126.1,85.32Z"/>
-                <path class="cls-330" d="M126.1,85.32a1.08,1.08,0,0,1-.18,0C126,85.25,126.07,85.23,126.1,85.32Z"/>
-                <path class="cls-330" d="M124.35,84.6c-.12.06-.24.13-.37.18a.25.25,0,0,1,0-.14A1,1,0,0,1,124.35,84.6Z"/>
-                <path class="cls-330"
-                      d="M116.08,13.43l-.53.05c0-1,0-1.82-.08-2.62.15.55.3,1.13.43,1.74C116,13,116.07,13.37,116.08,13.43Z"/>
-                <path class="cls-330" d="M76.14,17.74c.11.27-.28.75-.93,1l-1,.32.1-.08A11.7,11.7,0,0,1,76.14,17.74Z"/>
-                <path class="cls-31" d="M48.49,61.75c0,.42-.05.84-.07,1.28h0c0-.22,0-.44,0-.65Z"/>
-                <g class="cls-32">
-                    <path class="cls-31" d="M48.49,61.75c0,.42-.05.84-.07,1.28h0c0-.22,0-.44,0-.65Z"/>
-                </g>
-                <g class="cls-345">
-                    <polygon class="cls-302" points="86.65 103.28 86.66 103.26 86.66 103.28 86.65 103.28"/>
-                    <polygon class="cls-303" points="86.12 103.28 86.66 102.59 86.66 103.26 86.65 103.28 86.12 103.28"/>
-                    <polygon class="cls-304" points="85.6 103.28 86.66 101.92 86.66 102.59 86.12 103.28 85.6 103.28"/>
-                    <polygon class="cls-305" points="85.08 103.28 86.66 101.25 86.66 101.92 85.6 103.28 85.08 103.28"/>
-                    <polygon class="cls-305" points="84.55 103.28 86.66 100.59 86.66 101.25 85.08 103.28 84.55 103.28"/>
-                    <polygon class="cls-306"
-                             points="84.03 103.28 86.57 100.03 86.66 100.03 86.66 100.59 84.55 103.28 84.03 103.28"/>
-                    <polygon class="cls-307" points="83.51 103.28 86.05 100.03 86.57 100.03 84.03 103.28 83.51 103.28"/>
-                    <polygon class="cls-308" points="82.98 103.28 85.52 100.03 86.05 100.03 83.51 103.28 82.98 103.28"/>
-                    <polygon class="cls-309" points="82.46 103.28 85 100.03 85.52 100.03 82.98 103.28 82.46 103.28"/>
-                    <polygon class="cls-310" points="81.94 103.28 84.48 100.03 85 100.03 82.46 103.28 81.94 103.28"/>
-                    <polygon class="cls-311"
-                             points="81.46 103.22 83.95 100.03 84.48 100.03 81.94 103.28 81.46 103.28 81.46 103.22"/>
-                    <polygon class="cls-312" points="81.46 102.56 83.43 100.03 83.95 100.03 81.46 103.22 81.46 102.56"/>
-                    <polygon class="cls-313" points="81.46 101.89 82.91 100.03 83.43 100.03 81.46 102.56 81.46 101.89"/>
-                    <polygon class="cls-314" points="81.46 101.22 82.39 100.03 82.91 100.03 81.46 101.89 81.46 101.22"/>
-                    <polygon class="cls-315" points="81.46 100.55 81.86 100.03 82.39 100.03 81.46 101.22 81.46 100.55"/>
-                    <polygon class="cls-316" points="81.86 100.03 81.46 100.55 81.46 100.03 81.86 100.03"/>
-                </g>
-                <path class="cls-31" d="M48.46,62.39c0,.21,0,.43,0,.65h0C48.44,62.82,48.45,62.6,48.46,62.39Z"/>
-                <g class="cls-32">
-                    <path class="cls-31" d="M48.46,62.39c0,.21,0,.43,0,.65h0C48.44,62.82,48.45,62.6,48.46,62.39Z"/>
-                </g>
-                <g class="cls-346">
-                    <polygon class="cls-218" points="48.42 62.9 48.46 62.84 48.46 63.04 48.42 63.04 48.42 62.9"/>
-                    <polygon class="cls-219"
-                             points="48.42 62.44 48.46 62.39 48.46 62.39 48.46 62.84 48.42 62.9 48.42 62.44"/>
-                    <polygon class="cls-220" points="48.46 62.39 48.42 62.44 48.42 62.39 48.46 62.39"/>
-                </g>
-            </g>
-        </g>
-    </g>
+<!--
+    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
+
+         http://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.
+-->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 162.45 188.38">
+    <defs>
+        <style>
+            .cls-1{fill:none;}.cls-2{isolation:isolate;}.cls-3{opacity:0.13;}.cls-3,.cls-335{mix-blend-mode:multiply;}.cls-4{fill:#3c2517;}.cls-5{clip-path:url(#clip-path);}.cls-6{fill:#f59723;}.cls-7{fill:#f79823;}.cls-8{fill:#f69823;}.cls-9{fill:#f69723;}.cls-10{fill:#f59623;}.cls-11{fill:#f59524;}.cls-12{fill:#f49424;}.cls-13{fill:#f49324;}.cls-14{fill:#f39224;}.cls-15{fill:#f39124;}.cls-16{fill:#f29124;}.cls-17{fill:#f29024;}.cls-18{fill:#f28f24;}.cls-19{fill:#f18e25;}.cls-20{fill:#f18d25;}.cls-21{fill:#f08c25;}.cls-22{fill:#f08b25;}.cls-23{fill:#ef8a25;}.cls-24{fill:#ef8925;}.cls-25{fill:#ef8825;}.cls-26{fill:#ee8825;}.cls-27{fill:#ee8725;}.cls-28{fill:#ee8625;}.cls-29{fill:#ed8626;}.cls-30{fill:#ed8526;}.cls-31{fill:#bd2330;}.cls-32{opacity:0.35;mix-blend-mode:screen;}.cls-33{clip-path:url(#clip-path-2);}.cls-34{fill:#cf2a35;}.cls-35{fill:#cf2b35;}.cls-36{fill:#cf2c35;}.cls-37{fill:#cf2e34;}.cls-38{fill:#d02f34;}.cls-39{fill:#d03034;}.cls-40{fill:#d03234;}.cls-41{fill:#d03334;}.cls-42{fill:#d13434;}.cls-43{fill:#d13534;}.cls-44{fill:#d13634;}.cls-45{fill:#d13734;}.cls-46{fill:#d23934;}.cls-47{fill:#d23a33;}.cls-48{fill:#d23b33;}.cls-49{fill:#d23c33;}.cls-50{fill:#d33d33;}.cls-51{fill:#d33e33;}.cls-52{fill:#d33f33;}.cls-53{fill:#d44033;}.cls-54{fill:#d44133;}.cls-55{fill:#d44233;}.cls-56{fill:#d44332;}.cls-57{fill:#d54432;}.cls-58{fill:#d54532;}.cls-59{fill:#d54632;}.cls-60{fill:#d54732;}.cls-61{fill:#d64832;}.cls-62{fill:#d64932;}.cls-63{fill:#d64a32;}.cls-64{fill:#d74b31;}.cls-65{fill:#d74c31;}.cls-66{fill:#d74d31;}.cls-67{fill:#d84e31;}.cls-68{fill:#d84f31;}.cls-69{fill:#d85031;}.cls-70{fill:#d95130;}.cls-71{fill:#d95230;}.cls-72{fill:#d95330;}.cls-73{fill:#da5430;}.cls-74{fill:#da5530;}.cls-75{fill:#da562f;}.cls-76{fill:#da572f;}.cls-77{fill:#db582f;}.cls-78{fill:#db592f;}.cls-79{fill:#dc5a2f;}.cls-80{fill:#dc5b2e;}.cls-81{fill:#dc5c2e;}.cls-82{fill:#dd5d2e;}.cls-83{fill:#dd5e2e;}.cls-84{fill:#dd5f2d;}.cls-85{fill:#de602d;}.cls-86{fill:#de612d;}.cls-87{fill:#de622d;}.cls-88{fill:#df632d;}.cls-89{fill:#df642c;}.cls-90{fill:#e0652c;}.cls-91{fill:#e0662c;}.cls-92{fill:#e0672c;}.cls-93{fill:#e1682b;}.cls-94{fill:#e1692b;}.cls-95{fill:#e16a2b;}.cls-96{fill:#e26a2b;}.cls-97{fill:#e26b2a;}.cls-98{fill:#e26c2a;}.cls-99{fill:#e36d2a;}.cls-100{fill:#e36e2a;}.cls-101{fill:#e46e29;}.cls-102{fill:#e46f29;}.cls-103{fill:#e47029;}.cls-104{fill:#e57129;}.cls-105{fill:#e57229;}.cls-106{fill:#e57328;}.cls-107{fill:#e67328;}.cls-108{fill:#e67428;}.cls-109{fill:#e67528;}.cls-110{fill:#e77627;}.cls-111{fill:#e77727;}.cls-112{fill:#e87827;}.cls-113{clip-path:url(#clip-path-3);}.cls-114{fill:#752c82;}.cls-115{fill:#762c81;}.cls-116{fill:#772c81;}.cls-117{fill:#772c80;}.cls-118{fill:#782c80;}.cls-119{fill:#792b7f;}.cls-120{fill:#7a2b7f;}.cls-121{fill:#7a2b7e;}.cls-122{fill:#7b2b7e;}.cls-123{fill:#7c2b7d;}.cls-124{fill:#7d2a7d;}.cls-125{fill:#7d2a7c;}.cls-126{fill:#7e2a7c;}.cls-127{fill:#7f2a7b;}.cls-128{fill:#802a7a;}.cls-129{fill:#81297a;}.cls-130{fill:#822979;}.cls-131{fill:#832979;}.cls-132{fill:#832978;}.cls-133{fill:#842878;}.cls-134{fill:#852877;}.cls-135{fill:#862877;}.cls-136{fill:#862876;}.cls-137{fill:#872876;}.cls-138{fill:#872875;}.cls-139{fill:#882775;}.cls-140{fill:#892774;}.cls-141{fill:#8a2774;}.cls-142{fill:#8a2773;}.cls-143{fill:#8b2773;}.cls-144{fill:#8c2672;}.cls-145{fill:#8d2672;}.cls-146{fill:#8d2671;}.cls-147{fill:#8e2671;}.cls-148{fill:#8e2670;}.cls-149{fill:#8f2570;}.cls-150{fill:#902570;}.cls-151{fill:#90256f;}.cls-152{fill:#91256f;}.cls-153{fill:#91256e;}.cls-154{fill:#92246e;}.cls-155{fill:#93246d;}.cls-156{clip-path:url(#clip-path-4);}.cls-157{fill:#9f2062;}.cls-158{fill:#a02061;}.cls-159{fill:#a12060;}.cls-160{fill:#a2205f;}.cls-161{fill:#a3205e;}.cls-162{fill:#a4205d;}.cls-163{fill:#a5205d;}.cls-164{fill:#a5205c;}.cls-165{fill:#a6205c;}.cls-166{fill:#a6205b;}.cls-167{fill:#a7205b;}.cls-168{fill:#a7205a;}.cls-169{fill:#a8205a;}.cls-170{fill:#a82059;}.cls-171{fill:#a92059;}.cls-172{fill:#a92058;}.cls-173{fill:#aa2058;}.cls-174{fill:#ab2157;}.cls-175{fill:#ac2156;}.cls-176{fill:#ad2155;}.cls-177{fill:#ae2154;}.cls-178{fill:#af2153;}.cls-179{fill:#b02153;}.cls-180{fill:#b02152;}.cls-181{fill:#b12152;}.cls-182{fill:#b12151;}.cls-183{fill:#b22151;}.cls-184{fill:#b22150;}.cls-185{fill:#b32150;}.cls-186{fill:#b3214f;}.cls-187{fill:#b4214f;}.cls-188{fill:#b4214e;}.cls-189{fill:#b5214e;}.cls-190{fill:#b5204d;}.cls-191{fill:#b6204d;}.cls-192{fill:#b7204c;}.cls-193{fill:#b8204b;}.cls-194{fill:#b9204a;}.cls-195{fill:#b92049;}.cls-196{fill:#ba2049;}.cls-197{fill:#bb2048;}.cls-198{fill:#bc2047;}.cls-199{fill:#bc2046;}.cls-200{fill:#bd2046;}.cls-201{fill:#be2045;}.cls-202{fill:#be2044;}.cls-203{fill:#bf2044;}.cls-204{fill:#bf2043;}.cls-205{fill:#c02043;}.cls-206{fill:#c02042;}.cls-207{fill:#c12042;}.cls-208{fill:#c12041;}.cls-209{fill:#c22041;}.cls-210{fill:#c22040;}.cls-211{fill:#c3203f;}.cls-212{fill:#c4203e;}.cls-213{fill:#c5203d;}.cls-214{fill:#c5203c;}.cls-215{fill:#c6203c;}.cls-216{fill:#c6203b;}.cls-217{fill:#c7203b;}.cls-218{fill:#c7203a;}.cls-219{fill:#c8203a;}.cls-220{fill:#c82039;}.cls-221{fill:#c92038;}.cls-222{fill:#ca2038;}.cls-223{fill:#ca2037;}.cls-224{fill:#cb2037;}.cls-225{fill:#cc2036;}.cls-226{fill:#cd2035;}.cls-227{fill:#cd2135;}.cls-228{fill:#cd2335;}.cls-229{fill:#cd2435;}.cls-230{fill:#ce2635;}.cls-231{fill:#ce2735;}.cls-232{fill:#ce2835;}.cls-233{clip-path:url(#clip-path-5);}.cls-234{fill:#272761;}.cls-235{fill:#282761;}.cls-236{fill:#292762;}.cls-237{fill:#2a2763;}.cls-238{fill:#2b2863;}.cls-239{fill:#2c2864;}.cls-240{fill:#2d2864;}.cls-241{fill:#2e2865;}.cls-242{fill:#2f2866;}.cls-243{fill:#302866;}.cls-244{fill:#312967;}.cls-245{fill:#322967;}.cls-246{fill:#332968;}.cls-247{fill:#342969;}.cls-248{fill:#352969;}.cls-249{fill:#36296a;}.cls-250{fill:#37296b;}.cls-251{fill:#382a6b;}.cls-252{fill:#392a6c;}.cls-253{fill:#3a2a6c;}.cls-254{fill:#3a2a6d;}.cls-255{fill:#3b2a6e;}.cls-256{fill:#3c2a6e;}.cls-257{fill:#3d2a6f;}.cls-258{fill:#3e2a6f;}.cls-259{fill:#3f2b70;}.cls-260{fill:#402b71;}.cls-261{fill:#412b71;}.cls-262{fill:#422b72;}.cls-263{fill:#432b72;}.cls-264{fill:#442b73;}.cls-265{fill:#452b74;}.cls-266{fill:#462b74;}.cls-267{fill:#472c75;}.cls-268{fill:#482c76;}.cls-269{fill:#492c77;}.cls-270{fill:#4a2c77;}.cls-271{fill:#4b2c78;}.cls-272{fill:#4c2c79;}.cls-273{fill:#4d2c79;}.cls-274{fill:#4e2c7a;}.cls-275{fill:#4f2d7b;}.cls-276{fill:#502d7b;}.cls-277{fill:#512d7c;}.cls-278{fill:#522d7c;}.cls-279{fill:#532d7d;}.cls-280{fill:#532d7e;}.cls-281{fill:#542d7e;}.cls-282{fill:#552d7f;}.cls-283{fill:#562d7f;}.cls-284{fill:#572e80;}.cls-285{fill:#582e81;}.cls-286{fill:#592e81;}.cls-287{fill:#5a2e82;}.cls-288{fill:#5b2e83;}.cls-289{fill:#5c2e83;}.cls-290{fill:#5d2e84;}.cls-291{fill:#5d2e85;}.cls-292{fill:#5e2f85;}.cls-293{fill:#5f2f86;}.cls-294{fill:#602f87;}.cls-295{fill:#612f88;}.cls-296{fill:#622f88;}.cls-297{fill:#632f89;}.cls-298{fill:#64308a;}.cls-299{fill:#65308b;}.cls-300{fill:#66308c;}.cls-301{fill:#67308b;}.cls-302{fill:#68308b;}.cls-303{fill:#682f8a;}.cls-304{fill:#692f8a;}.cls-305{fill:#6a2f89;}.cls-306{fill:#6b2f89;}.cls-307{fill:#6c2f88;}.cls-308{fill:#6c2e88;}.cls-309{fill:#6d2e87;}.cls-310{fill:#6e2e87;}.cls-311{fill:#6e2e86;}.cls-312{fill:#6f2e86;}.cls-313{fill:#702e85;}.cls-314{fill:#702d85;}.cls-315{fill:#712d85;}.cls-316{fill:#722d84;}.cls-317{fill:#732d83;}.cls-318{fill:#742d82;}.cls-319{fill:#94246d;}.cls-320{fill:#94246c;}.cls-321{clip-path:url(#clip-path-6);}.cls-322{clip-path:url(#clip-path-7);}.cls-323{clip-path:url(#clip-path-8);}.cls-324{clip-path:url(#clip-path-9);}.cls-325{clip-path:url(#clip-path-10);}.cls-326{fill:#6e6f71;}.cls-327{fill:#644c53;}.cls-328{fill:#a66870;}.cls-329{fill:#f2e8df;}.cls-330{fill:#744a54;}.cls-331{fill:#231f20;}.cls-332{fill:#fff;}.cls-333{fill:#473439;}.cls-334{fill:#f7b2c6;}.cls-335{opacity:0.15;}.cls-336{fill:#3e362f;}.cls-337{fill:#f4f0d2;}.cls-338{fill:#97646d;}.cls-339{fill:#96636a;}.cls-340{fill:#8f8280;}.cls-341{fill:#dbd3d1;}.cls-342{fill:#694650;}.cls-343{fill:#c4869a;}.cls-344{fill:#a6938f;}.cls-345{clip-path:url(#clip-path-11);}.cls-346{clip-path:url(#clip-path-12);}
+        </style>
+        <clipPath id="clip-path">
+            <path class="cls-1"
+                  d="M1.27,40.05c.62,1.94,2.83,5.46,6.2,9.82l6.62-1.77a79.61,79.61,0,0,1-6.83-8.6L7,39.17l.23.33a70.54,70.54,0,0,0,7,8.22,120.65,120.65,0,0,0,1.3-12.5c-6.42-2.74-10-1.08-10-1.08S0,36,1.27,40.05Z"/>
+        </clipPath>
+        <clipPath id="clip-path-2">
+            <path class="cls-1"
+                  d="M27.2,60.84c-1.55-1.36-3.07-2.73-4.53-4.09s-3-2.83-4.39-4.24a3,3,0,0,1-.25-.25c-1.38-1.39-2.7-2.78-3.94-4.16L7.47,49.87l.71.91c.91,1.16,1.91,2.38,3,3.63,1.19,1.42,2.47,2.89,3.83,4.39s2.58,2.8,4,4.24q1.75,1.83,3.63,3.68a.93.93,0,0,0,.14.14l9-2.21C30.16,63.38,28.66,62.11,27.2,60.84Z"/>
+        </clipPath>
+        <clipPath id="clip-path-3">
+            <path class="cls-1"
+                  d="M68.2,89.81q2,1.32,4.15,2.67l.06,0,.6.38c.95.61,1.81,1.14,3.77,2.36.82-1.08,2.48-1.7,4.32-2.24a6.7,6.7,0,0,0-5,1.09c1.63-5.85,1.31-11.29-2.41-14.91a9.64,9.64,0,0,0-1.07-.93c1.24,1.55,1.54,3.18.74,5.93v0c-.89-4.53-2.18-7-4.68-9.5-.6-.59-1.26-1.18-2-1.81a13.21,13.21,0,0,1,1.14,13l-.4,3.38Z"/>
+        </clipPath>
+        <clipPath id="clip-path-4">
+            <path class="cls-1"
+                  d="M61.18,86.58q-2.51-1.71-5.06-3.48c-1.63-1.14-3.27-2.29-4.91-3.47s-3.28-2.37-4.92-3.58-3.33-2.47-5-3.73-3.25-2.51-4.84-3.77l-1.72-1.38c-1-.79-2-1.59-2.92-2.39l-.16-.13-9,2.21.28.28c1.33,1.3,2.69,2.61,4.09,3.91S30,73.67,31.43,75q1.88,1.64,3.8,3.21.39.33.78.63c1.62,1.31,3.2,2.52,4.72,3.63,1.73,1.27,3.4,2.41,5,3.45,1.05.68,2.07,1.31,3.05,1.9s1.68,1,2.53,1.44q3,1.65,6,3l9-2.22q-2-1.3-4-2.68Z"/>
+        </clipPath>
+        <clipPath id="clip-path-5">
+            <path class="cls-1"
+                  d="M57.58,92.37A65.17,65.17,0,0,0,65,95.21l.27.08c-2.34.8-5.12,3.76-5.1,3.76,4.11-1.63,8.05-2.67,11.57-2.15a10.57,10.57,0,0,1-2.07,5,10.73,10.73,0,0,0,3.7-3.8c-.34,2,.55,4.4,1.64,6.84-.54-3.33-.46-5.9.34-7.57,7.27,4.62,15.36,9.44,24,14.38a2.48,2.48,0,0,0-1.23-2c-1.56-.89-11.81-6.75-25.1-15.28l-1.14-.74-.32-.2-4.25-2.78-1-.66h0l-9,2.22Z"/>
+        </clipPath>
+        <clipPath id="clip-path-6">
+            <path class="cls-1"
+                  d="M32.5,64.17l.64.52,2,1.59L37.36,68l1.17.91c1.19.91,2.41,1.84,3.68,2.79q2.32,1.76,4.86,3.6c1.61,1.17,3.27,2.36,5,3.58s3.34,2.34,5.1,3.54q2.34,1.62,4.83,3.27l.24.16c1.64,1.1,3.34,2.22,5.07,3.35l.12.08.4-3.38c0,.07,0,.13-.08.19.42-4-1.31-9.95-4.16-14.17a32.3,32.3,0,0,0-5-5.65,53.85,53.85,0,0,0-5.1-4.08C51.86,61.05,50,59.86,48,58.65A12.61,12.61,0,0,1,48.39,62c0,.21,0,.42,0,.64s0,.43,0,.65h0c-.56-4-2.75-6.93-5.7-9.38a13.22,13.22,0,0,1,.92,4.86c0,.26,0,.54,0,.81,0,.07,0,.14,0,.2h0A15.45,15.45,0,0,0,42.4,56q-.15-.34-.33-.69c-.18-.34-.38-.67-.59-1s-.28-.41-.43-.6a13.39,13.39,0,0,0-1.17-1.36l-.41-.4-.62-.51c-.91-.75-1.73-1.37-2.46-1.88-.37-.26-.71-.49-1-.69L35,48.69c-.36-.22-.68-.4-1-.56a9.64,9.64,0,0,0-1-.49h0a4.77,4.77,0,0,1,.19.5,15.83,15.83,0,0,1,.5,4.89l.36-3.09L33.71,53v.07l0,.48s0,0,0-.08L32.4,64.09Z"/>
+        </clipPath>
+        <clipPath id="clip-path-7">
+            <path class="cls-1"
+                  d="M14.3,47.72c1.2,1.25,2.57,2.62,4.13,4.12l.25.24c1.36,1.29,2.85,2.68,4.5,4.16,1.42,1.27,2.95,2.61,4.61,4,1.44,1.23,3,2.5,4.61,3.83L33.65,53.5a12.88,12.88,0,0,0-3.14-6.69c-.42-.46-.86-.93-1.32-1.4-1.41-1.45-3-2.91-4.6-4.26s-3.1-2.49-4.52-3.46a26.47,26.47,0,0,0-2.52-1.54c-.68-.36-1.32-.66-2-.93A120.65,120.65,0,0,1,14.3,47.72Z"/>
+        </clipPath>
+        <clipPath id="clip-path-8">
+            <path class="cls-1" d="M48.37,62.62c0,.21,0,.43,0,.65h0C48.34,63.05,48.36,62.83,48.37,62.62Z"/>
+        </clipPath>
+        <clipPath id="clip-path-9">
+            <path class="cls-1" d="M43.48,59.75c0-.06,0-.13,0-.2s0,.14,0,.2Z"/>
+        </clipPath>
+        <clipPath id="clip-path-10">
+            <polygon class="cls-1" points="43.48 59.75 43.48 59.74 43.48 59.74 43.48 59.74 43.48 59.74 43.48 59.75"/>
+        </clipPath>
+        <clipPath id="clip-path-11">
+            <path class="cls-1"
+                  d="M85.13,103.2a2.38,2.38,0,0,1,1.53-.16h0a.77.77,0,0,1,0-.15c-1.49-.9-3-1.8-4.68-2.86a3,3,0,0,1-.5,1.09L85,103.28S85.09,103.21,85.13,103.2Z"/>
+        </clipPath>
+        <clipPath id="clip-path-12">
+            <path class="cls-1" d="M48.46,62.39c0,.21,0,.43,0,.65h0C48.44,62.82,48.45,62.6,48.46,62.39Z"/>
+        </clipPath>
+    </defs>
+    <title>mascot color with apache feather</title>
+    <g class="cls-2">
+        <g id="Layer_2" data-name="Layer 2">
+            <g id="Layer_1-2" data-name="Layer 1">
+                <g class="cls-3">
+                    <path class="cls-4"
+                          d="M161.67,156.4s4.38,14.27-13.72,23.36c-26.57,13.33-44.52,9-60.48,1.75-2.07-.93-3.49.33-5.46-13.66s4.7,5.76,5.71,5.9S130,173,130,173Z"/>
+                </g>
+                <g class="cls-5">
+                    <polygon class="cls-6" points="0 47.78 15.6 47.09 15.6 49.87 0 49.87 0 47.78"/>
+                    <polygon class="cls-6" points="0 43.96 15.6 43.27 15.6 47.09 0 47.78 0 43.96"/>
+                    <polygon class="cls-7" points="0 40.15 15.6 39.46 15.6 43.27 0 43.96 0 40.15"/>
+                    <polygon class="cls-7" points="0 39.86 15.6 39.17 15.6 39.46 0 40.15 0 39.86"/>
+                    <polygon class="cls-8" points="0 39.57 15.6 38.88 15.6 39.17 0 39.86 0 39.57"/>
+                    <polygon class="cls-9" points="0 39.28 15.6 38.58 15.6 38.88 0 39.57 0 39.28"/>
+                    <polygon class="cls-10" points="0 38.98 15.6 38.29 15.6 38.58 0 39.28 0 38.98"/>
+                    <polygon class="cls-11" points="0 38.69 15.6 38 15.6 38.29 0 38.98 0 38.69"/>
+                    <polygon class="cls-12" points="0 38.4 15.6 37.71 15.6 38 0 38.69 0 38.4"/>
+                    <polygon class="cls-12" points="0 38.11 15.6 37.42 15.6 37.71 0 38.4 0 38.11"/>
+                    <polygon class="cls-13" points="0 37.82 15.6 37.13 15.6 37.42 0 38.11 0 37.82"/>
+                    <polygon class="cls-14" points="0 37.52 15.6 36.83 15.6 37.13 0 37.82 0 37.52"/>
+                    <polygon class="cls-15" points="0 37.23 15.6 36.54 15.6 36.83 0 37.52 0 37.23"/>
+                    <polygon class="cls-16" points="0 36.94 15.6 36.25 15.6 36.54 0 37.23 0 36.94"/>
+                    <polygon class="cls-17" points="0 36.65 15.6 35.96 15.6 36.25 0 36.94 0 36.65"/>
+                    <polygon class="cls-18" points="0 36.36 15.6 35.67 15.6 35.96 0 36.65 0 36.36"/>
+                    <polygon class="cls-19" points="0 36.07 15.6 35.37 15.6 35.67 0 36.36 0 36.07"/>
+                    <polygon class="cls-19" points="0 35.77 15.6 35.08 15.6 35.37 0 36.07 0 35.77"/>
+                    <polygon class="cls-20" points="0 35.48 15.6 34.79 15.6 35.08 0 35.77 0 35.48"/>
+                    <polygon class="cls-21" points="0 35.19 15.6 34.5 15.6 34.79 0 35.48 0 35.19"/>
+                    <polygon class="cls-22" points="0 34.9 15.6 34.21 15.6 34.5 0 35.19 0 34.9"/>
+                    <polygon class="cls-22" points="0 34.61 15.6 33.91 15.6 34.21 0 34.9 0 34.61"/>
+                    <polygon class="cls-23" points="0 34.31 15.6 33.62 15.6 33.91 0 34.61 0 34.31"/>
+                    <polygon class="cls-24" points="0 34.02 15.6 33.33 15.6 33.62 0 34.31 0 34.02"/>
+                    <polygon class="cls-25" points="0 33.73 15.6 33.04 15.6 33.33 0 34.02 0 33.73"/>
+                    <polygon class="cls-26" points="0 33.44 15.6 32.75 15.6 33.04 0 33.73 0 33.44"/>
+                    <polygon class="cls-27" points="0 33.15 15.04 32.48 15.6 32.48 15.6 32.75 0 33.44 0 33.15"/>
+                    <polygon class="cls-28" points="0 32.85 8.46 32.48 15.04 32.48 0 33.15 0 32.85"/>
+                    <polygon class="cls-29" points="0 32.56 1.87 32.48 8.46 32.48 0 32.85 0 32.56"/>
+                    <polygon class="cls-30" points="1.87 32.48 0 32.56 0 32.48 1.87 32.48"/>
+                </g>
+                <path class="cls-1" d="M33.7,53.1V53l-.06.47s0,0,0,.08Z"/>
+                <path class="cls-1" d="M43.54,58.74c0,.26,0,.54,0,.81C43.52,59.28,43.53,59,43.54,58.74Z"/>
+                <path class="cls-1"
+                      d="M62.24,85.89,62,85.73q-2.49-1.65-4.83-3.27-2.64-1.8-5.1-3.54c-1.73-1.22-3.39-2.41-5-3.58s-3.31-2.43-4.86-3.6c-1.27-.95-2.49-1.88-3.68-2.79L37.36,68l-2.24-1.76-2-1.59-.64-.52-.1-.08,0,.39-.67.17.16.13c1,.8,1.93,1.6,2.92,2.39l1.72,1.38c1.59,1.26,3.21,2.52,4.84,3.77s3.31,2.5,5,3.73,3.28,2.41,4.92,3.58S54.49,82,56.12,83.1s3.39,2.34,5.06,3.48l1.13.76q2,1.38,4,2.68l1.06-.26.05-.44-.12-.08C65.58,88.11,63.88,87,62.24,85.89Z"/>
+                <polygon class="cls-1" points="43.48 59.76 43.48 59.76 43.48 59.75 43.48 59.76"/>
+                <path class="cls-31" d="M48.39,62c0,.42,0,.84-.07,1.28h0c0-.22,0-.44,0-.65S48.39,62.19,48.39,62Z"/>
+                <g class="cls-32">
+                    <path class="cls-31" d="M48.39,62c0,.42,0,.84-.07,1.28h0c0-.22,0-.44,0-.65S48.39,62.19,48.39,62Z"/>
+                </g>
+                <path class="cls-31" d="M43.48,59.74h0c0-.06,0-.13,0-.2,0-.27,0-.55,0-.81l-.06,1Z"/>
+                <g class="cls-32">
+                    <path class="cls-31" d="M43.48,59.74h0c0-.06,0-.13,0-.2,0-.27,0-.55,0-.81l-.06,1Z"/>
+                </g>
+                <g class="cls-33">
+                    <polygon class="cls-34" points="31.49 66.86 31.68 66.61 31.68 66.86 31.49 66.86"/>
+                    <polygon class="cls-35" points="31.1 66.86 31.68 66.11 31.68 66.61 31.49 66.86 31.1 66.86"/>
+                    <polygon class="cls-36" points="30.7 66.86 31.68 65.61 31.68 66.11 31.1 66.86 30.7 66.86"/>
+                    <polygon class="cls-37" points="30.31 66.86 31.68 65.11 31.68 65.61 30.7 66.86 30.31 66.86"/>
+                    <polygon class="cls-38" points="29.92 66.86 31.68 64.61 31.68 65.11 30.31 66.86 29.92 66.86"/>
+                    <polygon class="cls-39" points="29.53 66.86 31.68 64.11 31.68 64.61 29.92 66.86 29.53 66.86"/>
+                    <polygon class="cls-40" points="29.14 66.86 31.68 63.6 31.68 64.11 29.53 66.86 29.14 66.86"/>
+                    <polygon class="cls-41" points="28.74 66.86 31.68 63.1 31.68 63.6 29.14 66.86 28.74 66.86"/>
+                    <polygon class="cls-42" points="28.35 66.86 31.68 62.6 31.68 63.1 28.74 66.86 28.35 66.86"/>
+                    <polygon class="cls-43" points="27.96 66.86 31.68 62.1 31.68 62.6 28.35 66.86 27.96 66.86"/>
+                    <polygon class="cls-44" points="27.57 66.86 31.68 61.59 31.68 62.1 27.96 66.86 27.57 66.86"/>
+                    <polygon class="cls-45" points="27.18 66.86 31.68 61.09 31.68 61.59 27.57 66.86 27.18 66.86"/>
+                    <polygon class="cls-46" points="26.78 66.86 31.68 60.59 31.68 61.09 27.18 66.86 26.78 66.86"/>
+                    <polygon class="cls-47" points="26.39 66.86 31.68 60.09 31.68 60.59 26.78 66.86 26.39 66.86"/>
+                    <polygon class="cls-48" points="26 66.86 31.68 59.59 31.68 60.09 26.39 66.86 26 66.86"/>
+                    <polygon class="cls-49" points="25.61 66.86 31.68 59.09 31.68 59.59 26 66.86 25.61 66.86"/>
+                    <polygon class="cls-50" points="25.21 66.86 31.68 58.58 31.68 59.09 25.61 66.86 25.21 66.86"/>
+                    <polygon class="cls-51" points="24.82 66.86 31.68 58.08 31.68 58.58 25.21 66.86 24.82 66.86"/>
+                    <polygon class="cls-52"
+                             points="24.43 66.86 31.57 57.72 31.68 57.81 31.68 58.08 24.82 66.86 24.43 66.86"/>
+                    <polygon class="cls-53" points="24.04 66.86 31.33 57.53 31.57 57.72 24.43 66.86 24.04 66.86"/>
+                    <polygon class="cls-54" points="23.65 66.86 31.08 57.34 31.33 57.53 24.04 66.86 23.65 66.86"/>
+                    <polygon class="cls-55" points="23.25 66.86 30.84 57.15 31.08 57.34 23.65 66.86 23.25 66.86"/>
+                    <polygon class="cls-56" points="22.86 66.86 30.6 56.96 30.84 57.15 23.25 66.86 22.86 66.86"/>
+                    <polygon class="cls-57" points="22.47 66.86 30.35 56.77 30.6 56.96 22.86 66.86 22.47 66.86"/>
+                    <polygon class="cls-58" points="22.08 66.86 30.11 56.58 30.35 56.77 22.47 66.86 22.08 66.86"/>
+                    <polygon class="cls-59" points="21.69 66.86 29.87 56.39 30.11 56.58 22.08 66.86 21.69 66.86"/>
+                    <polygon class="cls-60" points="21.29 66.86 29.62 56.2 29.87 56.39 21.69 66.86 21.29 66.86"/>
+                    <polygon class="cls-61" points="20.9 66.86 29.38 56.01 29.62 56.2 21.29 66.86 20.9 66.86"/>
+                    <polygon class="cls-62" points="20.51 66.86 29.14 55.82 29.38 56.01 20.9 66.86 20.51 66.86"/>
+                    <polygon class="cls-63" points="20.12 66.86 28.89 55.63 29.14 55.82 20.51 66.86 20.12 66.86"/>
+                    <polygon class="cls-64" points="19.73 66.86 28.65 55.44 28.89 55.63 20.12 66.86 19.73 66.86"/>
+                    <polygon class="cls-65" points="19.33 66.86 28.41 55.25 28.65 55.44 19.73 66.86 19.33 66.86"/>
+                    <polygon class="cls-66" points="18.94 66.86 28.16 55.06 28.41 55.25 19.33 66.86 18.94 66.86"/>
+                    <polygon class="cls-67" points="18.55 66.86 27.92 54.87 28.16 55.06 18.94 66.86 18.55 66.86"/>
+                    <polygon class="cls-67" points="18.16 66.86 27.68 54.68 27.92 54.87 18.55 66.86 18.16 66.86"/>
+                    <polygon class="cls-68" points="17.77 66.86 27.43 54.49 27.68 54.68 18.16 66.86 17.77 66.86"/>
+                    <polygon class="cls-69"
+                             points="17.54 66.86 17.44 66.78 27.19 54.3 27.43 54.49 17.77 66.86 17.54 66.86"/>
+                    <rect class="cls-70" x="14.27" y="60.29" width="15.84" height="0.31"
+                          transform="translate(-39.1 40.72) rotate(-52)"/>
+                    <rect class="cls-71" x="14.03" y="60.1" width="15.84" height="0.31"
+                          transform="translate(-39.05 40.45) rotate(-52)"/>
+                    <rect class="cls-72" x="13.78" y="59.91" width="15.84" height="0.31"
+                          transform="translate(-38.99 40.19) rotate(-52)"/>
+                    <rect class="cls-73" x="13.54" y="59.72" width="15.84" height="0.31"
+                          transform="translate(-38.93 39.92) rotate(-52)"/>
+                    <rect class="cls-74" x="13.3" y="59.53" width="15.84" height="0.31"
+                          transform="translate(-38.88 39.66) rotate(-52)"/>
+                    <rect class="cls-75" x="13.05" y="59.34" width="15.84" height="0.31"
+                          transform="translate(-38.82 39.39) rotate(-52)"/>
+                    <rect class="cls-76" x="12.81" y="59.15" width="15.84" height="0.31"
+                          transform="translate(-38.77 39.13) rotate(-52)"/>
+                    <rect class="cls-77" x="12.57" y="58.96" width="15.84" height="0.31"
+                          transform="translate(-38.71 38.87) rotate(-52)"/>
+                    <rect class="cls-77" x="12.32" y="58.77" width="15.84" height="0.31"
+                          transform="translate(-38.65 38.6) rotate(-52)"/>
+                    <rect class="cls-78" x="12.08" y="58.58" width="15.84" height="0.31"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -38.6, 38.34)"/>
+                    <rect class="cls-79" x="11.84" y="58.39" width="15.84" height="0.31"
+                          transform="translate(-38.54 38.07) rotate(-52)"/>
+                    <rect class="cls-80" x="11.59" y="58.2" width="15.84" height="0.31"
+                          transform="translate(-38.48 37.81) rotate(-52)"/>
+                    <rect class="cls-81" x="11.35" y="58.01" width="15.84" height="0.31"
+                          transform="translate(-38.43 37.54) rotate(-52)"/>
+                    <rect class="cls-82" x="11.11" y="57.82" width="15.84" height="0.31"
+                          transform="translate(-38.37 37.28) rotate(-52)"/>
+                    <rect class="cls-83" x="10.86" y="57.63" width="15.84" height="0.31"
+                          transform="translate(-38.32 37.01) rotate(-52)"/>
+                    <rect class="cls-83" x="10.62" y="57.44" width="15.84" height="0.31"
+                          transform="translate(-38.26 36.75) rotate(-52)"/>
+                    <rect class="cls-84" x="10.37" y="57.25" width="15.84" height="0.31"
+                          transform="translate(-38.2 36.48) rotate(-52)"/>
+                    <rect class="cls-85" x="10.13" y="57.06" width="15.84" height="0.31"
+                          transform="translate(-38.15 36.22) rotate(-52)"/>
+                    <rect class="cls-86" x="9.89" y="56.87" width="15.84" height="0.31"
+                          transform="translate(-38.09 35.95) rotate(-52)"/>
+                    <rect class="cls-87" x="9.64" y="56.68" width="15.84" height="0.31"
+                          transform="translate(-38.03 35.69) rotate(-52)"/>
+                    <rect class="cls-88" x="9.4" y="56.49" width="15.84" height="0.31"
+                          transform="translate(-37.98 35.42) rotate(-52)"/>
+                    <rect class="cls-89" x="9.16" y="56.3" width="15.84" height="0.31"
+                          transform="translate(-37.92 35.16) rotate(-52)"/>
+                    <rect class="cls-89" x="8.91" y="56.11" width="15.84" height="0.31"
+                          transform="translate(-37.86 34.89) rotate(-52)"/>
+                    <rect class="cls-90" x="8.67" y="55.92" width="15.84" height="0.31"
+                          transform="translate(-37.81 34.63) rotate(-52)"/>
+                    <rect class="cls-91" x="8.43" y="55.73" width="15.84" height="0.31"
+                          transform="translate(-37.75 34.36) rotate(-52)"/>
+                    <rect class="cls-92" x="8.18" y="55.54" width="15.84" height="0.31"
+                          transform="translate(-37.7 34.1) rotate(-52)"/>
+                    <rect class="cls-93" x="7.94" y="55.35" width="15.84" height="0.31"
+                          transform="translate(-37.64 33.83) rotate(-52)"/>
+                    <rect class="cls-94" x="7.7" y="55.16" width="15.84" height="0.31"
+                          transform="translate(-37.58 33.57) rotate(-52)"/>
+                    <rect class="cls-95" x="7.45" y="54.97" width="15.84" height="0.31"
+                          transform="translate(-37.53 33.3) rotate(-52)"/>
+                    <rect class="cls-96" x="7.21" y="54.77" width="15.84" height="0.31"
+                          transform="translate(-37.47 33.04) rotate(-52)"/>
+                    <rect class="cls-97" x="6.97" y="54.58" width="15.84" height="0.31"
+                          transform="translate(-37.41 32.77) rotate(-52)"/>
+                    <rect class="cls-98" x="6.72" y="54.39" width="15.84" height="0.31"
+                          transform="translate(-37.36 32.51) rotate(-52)"/>
+                    <polygon class="cls-99" points="9.65 60.7 9.4 60.51 19.09 48.1 19.26 48.1 19.4 48.21 9.65 60.7"/>
+                    <polygon class="cls-100" points="9.4 60.51 9.16 60.31 18.7 48.1 19.09 48.1 9.4 60.51"/>
+                    <polygon class="cls-101" points="9.16 60.31 8.91 60.13 18.31 48.1 18.7 48.1 9.16 60.31"/>
+                    <polygon class="cls-102" points="8.91 60.13 8.67 59.93 17.92 48.1 18.31 48.1 8.91 60.13"/>
+                    <polygon class="cls-103" points="8.67 59.93 8.43 59.74 17.52 48.1 17.92 48.1 8.67 59.93"/>
+                    <polygon class="cls-104" points="8.43 59.74 8.19 59.55 17.13 48.1 17.52 48.1 8.43 59.74"/>
+                    <polygon class="cls-105" points="8.19 59.55 7.94 59.36 16.74 48.1 17.13 48.1 8.19 59.55"/>
+                    <polygon class="cls-106" points="7.94 59.36 7.7 59.17 16.35 48.1 16.74 48.1 7.94 59.36"/>
+                    <polygon class="cls-107" points="7.7 59.17 7.47 58.99 7.47 58.97 15.96 48.1 16.35 48.1 7.7 59.17"/>
+                    <polygon class="cls-108" points="7.47 58.47 15.56 48.1 15.96 48.1 7.47 58.97 7.47 58.47"/>
+                    <polygon class="cls-109" points="7.47 57.97 15.17 48.1 15.56 48.1 7.47 58.47 7.47 57.97"/>
+                    <polygon class="cls-110" points="7.47 57.46 14.78 48.1 15.17 48.1 7.47 57.97 7.47 57.46"/>
+                    <polygon class="cls-110" points="7.47 56.96 14.39 48.1 14.78 48.1 7.47 57.46 7.47 56.96"/>
+                    <polygon class="cls-111" points="7.47 56.46 13.99 48.1 14.39 48.1 7.47 56.96 7.47 56.46"/>
+                    <polygon class="cls-112" points="7.47 55.96 13.6 48.1 13.99 48.1 7.47 56.46 7.47 55.96"/>
+                    <polygon class="cls-112" points="13.6 48.1 7.47 55.96 7.47 48.1 13.6 48.1"/>
+                </g>
+                <g class="cls-113">
+                    <polygon class="cls-114" points="81.04 95.26 81.1 95.17 81.1 95.26 81.04 95.26"/>
+                    <polygon class="cls-114" points="80.44 95.26 81.1 94.41 81.1 95.17 81.04 95.26 80.44 95.26"/>
+                    <polygon class="cls-115" points="79.84 95.26 81.1 93.64 81.1 94.41 80.44 95.26 79.84 95.26"/>
+                    <polygon class="cls-116" points="79.24 95.26 81.1 92.87 81.1 93.64 79.84 95.26 79.24 95.26"/>
+                    <polygon class="cls-117" points="78.64 95.26 81.1 92.11 81.1 92.87 79.24 95.26 78.64 95.26"/>
+                    <polygon class="cls-118" points="78.04 95.26 81.1 91.34 81.1 92.11 78.64 95.26 78.04 95.26"/>
+                    <polygon class="cls-118" points="77.45 95.26 81.1 90.58 81.1 91.34 78.04 95.26 77.45 95.26"/>
+                    <polygon class="cls-119" points="76.85 95.26 81.1 89.81 81.1 90.58 77.45 95.26 76.85 95.26"/>
+                    <polygon class="cls-120" points="76.25 95.26 81.1 89.04 81.1 89.81 76.85 95.26 76.25 95.26"/>
+                    <polygon class="cls-121" points="75.65 95.26 81.1 88.28 81.1 89.04 76.25 95.26 75.65 95.26"/>
+                    <polygon class="cls-122" points="75.05 95.26 81.1 87.51 81.1 88.28 75.65 95.26 75.05 95.26"/>
+                    <polygon class="cls-122" points="74.45 95.26 81.1 86.74 81.1 87.51 75.05 95.26 74.45 95.26"/>
+                    <polygon class="cls-123" points="73.86 95.26 81.1 85.98 81.1 86.74 74.45 95.26 73.86 95.26"/>
+                    <polygon class="cls-124" points="73.26 95.26 81.1 85.21 81.1 85.98 73.86 95.26 73.26 95.26"/>
+                    <polygon class="cls-125" points="72.66 95.26 81.1 84.45 81.1 85.21 73.26 95.26 72.66 95.26"/>
+                    <polygon class="cls-126" points="72.06 95.26 81.1 83.68 81.1 84.45 72.66 95.26 72.06 95.26"/>
+                    <polygon class="cls-126" points="71.46 95.26 81.1 82.91 81.1 83.68 72.06 95.26 71.46 95.26"/>
+                    <polygon class="cls-127" points="70.86 95.26 81.1 82.15 81.1 82.91 71.46 95.26 70.86 95.26"/>
+                    <polygon class="cls-127" points="70.26 95.26 81.1 81.38 81.1 82.15 70.86 95.26 70.26 95.26"/>
+                    <polygon class="cls-128"
+                             points="69.87 95.26 69.74 95.16 81.1 80.62 81.1 81.38 70.26 95.26 69.87 95.26"/>
+                    <polygon class="cls-129"
+                             points="69.74 95.16 69.37 94.87 80.98 80.01 81.1 80.11 81.1 80.62 69.74 95.16"/>
+                    <rect class="cls-129" x="65.56" y="87.06" width="18.85" height="0.47"
+                          transform="translate(-39.97 92.65) rotate(-52)"/>
+                    <rect class="cls-130" x="65.19" y="86.77" width="18.85" height="0.47"
+                          transform="translate(-39.88 92.24) rotate(-52)"/>
+                    <rect class="cls-130" x="64.82" y="86.48" width="18.85" height="0.47"
+                          transform="translate(-39.8 91.84) rotate(-52)"/>
+                    <rect class="cls-131" x="64.45" y="86.19" width="18.85" height="0.47"
+                          transform="translate(-39.71 91.43) rotate(-52)"/>
+                    <rect class="cls-132" x="64.08" y="85.9" width="18.85" height="0.47"
+                          transform="translate(-39.63 91.03) rotate(-52)"/>
+                    <rect class="cls-133" x="63.7" y="85.61" width="18.85" height="0.47"
+                          transform="translate(-39.54 90.62) rotate(-52)"/>
+                    <rect class="cls-134" x="63.33" y="85.32" width="18.85" height="0.47"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -39.45, 90.22)"/>
+                    <polygon class="cls-134"
+                             points="66.77 92.84 66.69 92.78 66.69 92.17 78 77.69 78.37 77.98 66.77 92.84"/>
+                    <polygon class="cls-135" points="66.69 91.4 77.63 77.4 78 77.69 66.69 92.17 66.69 91.4"/>
+                    <polygon class="cls-136" points="66.69 90.64 77.26 77.11 77.63 77.4 66.69 91.4 66.69 90.64"/>
+                    <polygon class="cls-137" points="66.69 89.87 76.89 76.82 77.26 77.11 66.69 90.64 66.69 89.87"/>
+                    <polygon class="cls-138" points="66.69 89.1 76.52 76.53 76.89 76.82 66.69 89.87 66.69 89.1"/>
+                    <polygon class="cls-139" points="66.69 88.34 76.14 76.24 76.52 76.53 66.69 89.1 66.69 88.34"/>
+                    <polygon class="cls-139" points="66.69 87.57 75.77 75.95 76.14 76.24 66.69 88.34 66.69 87.57"/>
+                    <polygon class="cls-140" points="66.69 86.81 75.4 75.66 75.77 75.95 66.69 87.57 66.69 86.81"/>
+                    <polygon class="cls-141" points="66.69 86.04 75.03 75.37 75.4 75.66 66.69 86.81 66.69 86.04"/>
+                    <polygon class="cls-142" points="66.69 85.27 74.66 75.08 75.03 75.37 66.69 86.04 66.69 85.27"/>
+                    <polygon class="cls-143" points="66.69 84.51 74.29 74.79 74.66 75.08 66.69 85.27 66.69 84.51"/>
+                    <polygon class="cls-143" points="66.69 83.74 73.92 74.5 74.29 74.79 66.69 84.51 66.69 83.74"/>
+                    <polygon class="cls-144" points="66.69 82.97 73.54 74.21 73.92 74.5 66.69 83.74 66.69 82.97"/>
+                    <polygon class="cls-144" points="66.69 82.21 73.17 73.92 73.54 74.21 66.69 82.97 66.69 82.21"/>
+                    <polygon class="cls-145" points="66.69 81.44 72.8 73.63 73.17 73.92 66.69 82.21 66.69 81.44"/>
+                    <polygon class="cls-146" points="66.69 80.68 72.43 73.33 72.8 73.63 66.69 81.44 66.69 80.68"/>
+                    <polygon class="cls-147" points="66.69 79.91 72.06 73.05 72.43 73.33 66.69 80.68 66.69 79.91"/>
+                    <polygon class="cls-148"
+                             points="66.69 79.14 71.58 72.89 71.86 72.89 72.06 73.05 66.69 79.91 66.69 79.14"/>
+                    <polygon class="cls-149" points="66.69 78.38 70.98 72.89 71.58 72.89 66.69 79.14 66.69 78.38"/>
+                    <polygon class="cls-150" points="66.69 77.61 70.38 72.89 70.98 72.89 66.69 78.38 66.69 77.61"/>
+                    <polygon class="cls-151" points="66.69 76.85 69.78 72.89 70.38 72.89 66.69 77.61 66.69 76.85"/>
+                    <polygon class="cls-152" points="66.69 76.08 69.18 72.89 69.78 72.89 66.69 76.85 66.69 76.08"/>
+                    <polygon class="cls-153" points="66.69 75.31 68.58 72.89 69.18 72.89 66.69 76.08 66.69 75.31"/>
+                    <polygon class="cls-154" points="66.69 74.55 67.99 72.89 68.58 72.89 66.69 75.31 66.69 74.55"/>
+                    <polygon class="cls-154" points="66.69 73.78 67.39 72.89 67.99 72.89 66.69 74.55 66.69 73.78"/>
+                    <polygon class="cls-155" points="66.69 73.02 66.79 72.89 67.39 72.89 66.69 73.78 66.69 73.02"/>
+                    <polygon class="cls-155" points="66.79 72.89 66.69 73.02 66.69 72.89 66.79 72.89"/>
+                </g>
+                <g class="cls-156">
+                    <polygon class="cls-157" points="66 92.24 66.32 91.83 66.32 92.24 66 92.24"/>
+                    <polygon class="cls-157" points="65.64 92.24 66.32 91.37 66.32 91.83 66 92.24 65.64 92.24"/>
+                    <polygon class="cls-158" points="65.27 92.24 66.32 90.9 66.32 91.37 65.64 92.24 65.27 92.24"/>
+                    <polygon class="cls-158" points="64.91 92.24 66.32 90.44 66.32 90.9 65.27 92.24 64.91 92.24"/>
+                    <polygon class="cls-158" points="64.55 92.24 66.32 89.97 66.32 90.44 64.91 92.24 64.55 92.24"/>
+                    <polygon class="cls-159" points="64.18 92.24 66.32 89.5 66.32 89.97 64.55 92.24 64.18 92.24"/>
+                    <polygon class="cls-159" points="63.82 92.24 66.32 89.04 66.32 89.5 64.18 92.24 63.82 92.24"/>
+                    <polygon class="cls-159" points="63.45 92.24 66.32 88.57 66.32 89.04 63.82 92.24 63.45 92.24"/>
+                    <polygon class="cls-160" points="63.09 92.24 66.32 88.11 66.32 88.57 63.45 92.24 63.09 92.24"/>
+                    <polygon class="cls-160" points="62.72 92.24 66.32 87.64 66.32 88.11 63.09 92.24 62.72 92.24"/>
+                    <polygon class="cls-160" points="62.36 92.24 66.32 87.17 66.32 87.64 62.72 92.24 62.36 92.24"/>
+                    <polygon class="cls-161" points="62 92.24 66.32 86.71 66.32 87.17 62.36 92.24 62 92.24"/>
+                    <polygon class="cls-161" points="61.63 92.24 66.32 86.24 66.32 86.71 62 92.24 61.63 92.24"/>
+                    <polygon class="cls-161"
+                             points="61.27 92.24 66.22 85.9 66.32 85.98 66.32 86.24 61.63 92.24 61.27 92.24"/>
+                    <polygon class="cls-162" points="60.9 92.24 65.99 85.73 66.22 85.9 61.27 92.24 60.9 92.24"/>
+                    <polygon class="cls-162" points="60.54 92.24 65.77 85.55 65.99 85.73 60.9 92.24 60.54 92.24"/>
+                    <polygon class="cls-163" points="60.18 92.24 65.54 85.37 65.77 85.55 60.54 92.24 60.18 92.24"/>
+                    <polygon class="cls-164" points="59.81 92.24 65.31 85.2 65.54 85.37 60.18 92.24 59.81 92.24"/>
+                    <polygon class="cls-164" points="59.45 92.24 65.09 85.02 65.31 85.2 59.81 92.24 59.45 92.24"/>
+                    <polygon class="cls-165" points="59.08 92.24 64.86 84.84 65.09 85.02 59.45 92.24 59.08 92.24"/>
+                    <polygon class="cls-166" points="58.72 92.24 64.64 84.67 64.86 84.84 59.08 92.24 58.72 92.24"/>
+                    <polygon class="cls-166" points="58.35 92.24 64.41 84.49 64.64 84.67 58.72 92.24 58.35 92.24"/>
+                    <polygon class="cls-167" points="57.99 92.24 64.18 84.31 64.41 84.49 58.35 92.24 57.99 92.24"/>
+                    <polygon class="cls-167" points="57.63 92.24 63.96 84.14 64.18 84.31 57.99 92.24 57.63 92.24"/>
+                    <polygon class="cls-168" points="57.26 92.24 63.73 83.96 63.96 84.14 57.63 92.24 57.26 92.24"/>
+                    <polygon class="cls-169" points="56.9 92.24 63.51 83.78 63.73 83.96 57.26 92.24 56.9 92.24"/>
+                    <polygon class="cls-169" points="56.53 92.24 63.28 83.61 63.51 83.78 56.9 92.24 56.53 92.24"/>
+                    <polygon class="cls-170" points="56.17 92.24 63.05 83.43 63.28 83.61 56.53 92.24 56.17 92.24"/>
+                    <polygon class="cls-171" points="55.81 92.24 62.83 83.25 63.05 83.43 56.17 92.24 55.81 92.24"/>
+                    <polygon class="cls-171" points="55.44 92.24 62.6 83.08 62.83 83.25 55.81 92.24 55.44 92.24"/>
+                    <polygon class="cls-172" points="55.08 92.24 62.38 82.9 62.6 83.08 55.44 92.24 55.08 92.24"/>
+                    <polygon class="cls-173" points="54.71 92.24 62.15 82.72 62.38 82.9 55.08 92.24 54.71 92.24"/>
+                    <polygon class="cls-173" points="54.35 92.24 61.92 82.55 62.15 82.72 54.71 92.24 54.35 92.24"/>
+                    <polygon class="cls-174" points="53.99 92.24 61.7 82.37 61.92 82.55 54.35 92.24 53.99 92.24"/>
+                    <polygon class="cls-174" points="53.62 92.24 61.47 82.19 61.7 82.37 53.99 92.24 53.62 92.24"/>
+                    <polygon class="cls-174" points="53.26 92.24 61.24 82.02 61.47 82.19 53.62 92.24 53.26 92.24"/>
+                    <polygon class="cls-175" points="52.89 92.24 61.02 81.84 61.24 82.02 53.26 92.24 52.89 92.24"/>
+                    <polygon class="cls-175" points="52.53 92.24 60.79 81.67 61.02 81.84 52.89 92.24 52.53 92.24"/>
+                    <polygon class="cls-175" points="52.16 92.24 60.57 81.49 60.79 81.67 52.53 92.24 52.16 92.24"/>
+                    <polygon class="cls-176" points="51.8 92.24 60.34 81.31 60.57 81.49 52.16 92.24 51.8 92.24"/>
+                    <polygon class="cls-176" points="51.44 92.24 60.11 81.14 60.34 81.31 51.8 92.24 51.44 92.24"/>
+                    <polygon class="cls-176" points="51.07 92.24 59.89 80.96 60.11 81.14 51.44 92.24 51.07 92.24"/>
+                    <polygon class="cls-177" points="50.71 92.24 59.66 80.78 59.89 80.96 51.07 92.24 50.71 92.24"/>
+                    <polygon class="cls-177" points="50.34 92.24 59.44 80.61 59.66 80.78 50.71 92.24 50.34 92.24"/>
+                    <polygon class="cls-177" points="49.98 92.24 59.21 80.43 59.44 80.61 50.34 92.24 49.98 92.24"/>
+                    <polygon class="cls-178" points="49.62 92.24 58.98 80.25 59.21 80.43 49.98 92.24 49.62 92.24"/>
+                    <polygon class="cls-178" points="49.25 92.24 58.76 80.08 58.98 80.25 49.62 92.24 49.25 92.24"/>
+                    <polygon class="cls-179" points="48.89 92.24 58.53 79.9 58.76 80.08 49.25 92.24 48.89 92.24"/>
+                    <polygon class="cls-180" points="48.52 92.24 58.3 79.72 58.53 79.9 48.89 92.24 48.52 92.24"/>
+                    <polygon class="cls-180" points="48.16 92.24 58.08 79.55 58.3 79.72 48.52 92.24 48.16 92.24"/>
+                    <polygon class="cls-181"
+                             points="48 92.24 47.87 92.14 57.85 79.37 58.08 79.55 48.16 92.24 48 92.24"/>
+                    <rect class="cls-182" x="44.64" y="85.52" width="16.21" height="0.29"
+                          transform="translate(-47.23 74.5) rotate(-52)"/>
+                    <rect class="cls-182" x="44.42" y="85.35" width="16.21" height="0.29"
+                          transform="translate(-47.18 74.25) rotate(-52)"/>
+                    <rect class="cls-183" x="44.19" y="85.17" width="16.21" height="0.29"
+                          transform="translate(-47.13 74) rotate(-52)"/>
+                    <rect class="cls-184" x="43.97" y="84.99" width="16.21" height="0.29"
+                          transform="translate(-47.08 73.76) rotate(-52)"/>
+                    <rect class="cls-184" x="43.74" y="84.82" width="16.21" height="0.29"
+                          transform="translate(-47.02 73.51) rotate(-52)"/>
+                    <rect class="cls-185" x="43.51" y="84.64" width="16.21" height="0.29"
+                          transform="translate(-46.97 73.27) rotate(-52)"/>
+                    <rect class="cls-186" x="43.29" y="84.46" width="16.21" height="0.29"
+                          transform="translate(-46.92 73.02) rotate(-52)"/>
+                    <rect class="cls-187" x="43.06" y="84.29" width="16.21" height="0.29"
+                          transform="translate(-46.87 72.77) rotate(-52)"/>
+                    <rect class="cls-187" x="42.84" y="84.11" width="16.21" height="0.29"
+                          transform="translate(-46.81 72.53) rotate(-52)"/>
+                    <rect class="cls-188" x="42.61" y="83.93" width="16.21" height="0.29"
+                          transform="translate(-46.76 72.28) rotate(-52)"/>
+                    <rect class="cls-189" x="42.38" y="83.76" width="16.21" height="0.29"
+                          transform="translate(-46.71 72.04) rotate(-52)"/>
+                    <rect class="cls-189" x="42.16" y="83.58" width="16.21" height="0.29"
+                          transform="translate(-46.66 71.79) rotate(-52)"/>
+                    <rect class="cls-190" x="41.93" y="83.4" width="16.21" height="0.29"
+                          transform="translate(-46.61 71.54) rotate(-52)"/>
+                    <rect class="cls-191" x="41.71" y="83.23" width="16.21" height="0.29"
+                          transform="translate(-46.55 71.3) rotate(-52)"/>
+                    <rect class="cls-191" x="41.48" y="83.05" width="16.21" height="0.29"
+                          transform="translate(-46.5 71.05) rotate(-52)"/>
+                    <rect class="cls-192" x="41.25" y="82.87" width="16.21" height="0.29"
+                          transform="translate(-46.45 70.81) rotate(-52)"/>
+                    <rect class="cls-192" x="41.03" y="82.7" width="16.21" height="0.29"
+                          transform="translate(-46.4 70.56) rotate(-52)"/>
+                    <rect class="cls-192" x="40.8" y="82.52" width="16.21" height="0.29"
+                          transform="translate(-46.34 70.31) rotate(-52)"/>
+                    <rect class="cls-193" x="40.57" y="82.34" width="16.21" height="0.29"
+                          transform="translate(-46.29 70.07) rotate(-52)"/>
+                    <rect class="cls-193" x="40.35" y="82.17" width="16.21" height="0.29"
+                          transform="translate(-46.24 69.82) rotate(-52)"/>
+                    <rect class="cls-193" x="40.12" y="81.99" width="16.21" height="0.29"
+                          transform="translate(-46.19 69.57) rotate(-52)"/>
+                    <rect class="cls-194" x="39.9" y="81.81" width="16.21" height="0.29"
+                          transform="translate(-46.14 69.33) rotate(-52)"/>
+                    <rect class="cls-194" x="39.67" y="81.64" width="16.21" height="0.29"
+                          transform="translate(-46.08 69.08) rotate(-52)"/>
+                    <rect class="cls-195" x="39.44" y="81.46" width="16.21" height="0.29"
+                          transform="translate(-46.03 68.84) rotate(-52)"/>
+                    <rect class="cls-196" x="39.22" y="81.28" width="16.21" height="0.29"
+                          transform="translate(-45.98 68.59) rotate(-52)"/>
+                    <rect class="cls-196" x="38.99" y="81.11" width="16.21" height="0.29"
+                          transform="translate(-45.93 68.34) rotate(-52)"/>
+                    <rect class="cls-197" x="38.77" y="80.93" width="16.21" height="0.29"
+                          transform="translate(-45.87 68.1) rotate(-52)"/>
+                    <rect class="cls-197" x="38.54" y="80.75" width="16.21" height="0.29"
+                          transform="translate(-45.82 67.85) rotate(-52)"/>
+                    <rect class="cls-197" x="38.31" y="80.58" width="16.21" height="0.29"
+                          transform="translate(-45.77 67.61) rotate(-52)"/>
+                    <rect class="cls-198" x="38.09" y="80.4" width="16.21" height="0.29"
+                          transform="translate(-45.72 67.36) rotate(-52)"/>
+                    <rect class="cls-198" x="37.86" y="80.22" width="16.21" height="0.29"
+                          transform="translate(-45.66 67.11) rotate(-52)"/>
+                    <rect class="cls-199" x="37.64" y="80.05" width="16.21" height="0.29"
+                          transform="translate(-45.61 66.87) rotate(-52)"/>
+                    <rect class="cls-200" x="37.41" y="79.87" width="16.21" height="0.29"
+                          transform="translate(-45.56 66.62) rotate(-52)"/>
+                    <rect class="cls-200" x="37.18" y="79.69" width="16.21" height="0.29"
+                          transform="translate(-45.51 66.38) rotate(-52)"/>
+                    <rect class="cls-201" x="36.96" y="79.52" width="16.21" height="0.29"
+                          transform="translate(-45.46 66.13) rotate(-52)"/>
+                    <rect class="cls-201" x="36.73" y="79.34" width="16.21" height="0.29"
+                          transform="translate(-45.4 65.88) rotate(-52)"/>
+                    <rect class="cls-202" x="36.51" y="79.17" width="16.21" height="0.29"
+                          transform="translate(-45.35 65.64) rotate(-52)"/>
+                    <rect class="cls-203" x="36.28" y="78.99" width="16.21" height="0.29"
+                          transform="translate(-45.3 65.39) rotate(-52)"/>
+                    <rect class="cls-203" x="36.05" y="78.81" width="16.21" height="0.29"
+                          transform="translate(-45.25 65.15) rotate(-52)"/>
+                    <rect class="cls-204" x="35.83" y="78.64" width="16.21" height="0.29"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -45.19, 64.9)"/>
+                    <rect class="cls-205" x="35.6" y="78.46" width="16.21" height="0.29"
+                          transform="translate(-45.14 64.65) rotate(-52)"/>
+                    <rect class="cls-206" x="35.37" y="78.28" width="16.21" height="0.29"
+                          transform="translate(-45.09 64.41) rotate(-52)"/>
+                    <rect class="cls-206" x="35.15" y="78.11" width="16.21" height="0.29"
+                          transform="translate(-45.04 64.16) rotate(-52)"/>
+                    <rect class="cls-207" x="34.92" y="77.93" width="16.21" height="0.29"
+                          transform="translate(-44.98 63.92) rotate(-52)"/>
+                    <rect class="cls-208" x="34.7" y="77.75" width="16.21" height="0.29"
+                          transform="translate(-44.93 63.67) rotate(-52)"/>
+                    <rect class="cls-209" x="34.47" y="77.58" width="16.21" height="0.29"
+                          transform="translate(-44.88 63.42) rotate(-52)"/>
+                    <rect class="cls-210" x="34.24" y="77.4" width="16.21" height="0.29"
+                          transform="translate(-44.83 63.18) rotate(-52)"/>
+                    <rect class="cls-210" x="34.02" y="77.22" width="16.21" height="0.29"
+                          transform="translate(-44.78 62.93) rotate(-52)"/>
+                    <rect class="cls-211" x="33.79" y="77.05" width="16.21" height="0.29"
+                          transform="translate(-44.72 62.69) rotate(-52)"/>
+                    <rect class="cls-211" x="33.57" y="76.87" width="16.21" height="0.29"
+                          transform="translate(-44.67 62.44) rotate(-52)"/>
+                    <rect class="cls-211" x="33.34" y="76.69" width="16.21" height="0.29"
+                          transform="translate(-44.62 62.19) rotate(-52)"/>
+                    <rect class="cls-212" x="33.11" y="76.52" width="16.21" height="0.29"
+                          transform="translate(-44.57 61.95) rotate(-52)"/>
+                    <rect class="cls-212" x="32.89" y="76.34" width="16.21" height="0.29"
+                          transform="translate(-44.51 61.7) rotate(-52)"/>
+                    <rect class="cls-213" x="32.66" y="76.16" width="16.21" height="0.29"
+                          transform="translate(-44.46 61.45) rotate(-52)"/>
+                    <rect class="cls-213" x="32.44" y="75.99" width="16.21" height="0.29"
+                          transform="translate(-44.41 61.21) rotate(-52)"/>
+                    <rect class="cls-214" x="32.21" y="75.81" width="16.21" height="0.29"
+                          transform="translate(-44.36 60.96) rotate(-52)"/>
+                    <rect class="cls-215" x="31.98" y="75.63" width="16.21" height="0.29"
+                          transform="translate(-44.31 60.72) rotate(-52)"/>
+                    <rect class="cls-216" x="31.76" y="75.46" width="16.21" height="0.29"
+                          transform="translate(-44.25 60.47) rotate(-52)"/>
+                    <rect class="cls-216" x="31.53" y="75.28" width="16.21" height="0.29"
+                          transform="translate(-44.2 60.22) rotate(-52)"/>
+                    <rect class="cls-217" x="31.3" y="75.1" width="16.21" height="0.29"
+                          transform="translate(-44.15 59.98) rotate(-52)"/>
+                    <rect class="cls-218" x="31.08" y="74.93" width="16.21" height="0.29"
+                          transform="translate(-44.1 59.73) rotate(-52)"/>
+                    <rect class="cls-219" x="30.85" y="74.75" width="16.21" height="0.29"
+                          transform="translate(-44.04 59.49) rotate(-52)"/>
+                    <rect class="cls-220" x="30.63" y="74.57" width="16.21" height="0.29"
+                          transform="translate(-43.99 59.24) rotate(-52)"/>
+                    <rect class="cls-220" x="30.4" y="74.4" width="16.21" height="0.29"
+                          transform="translate(-43.94 58.99) rotate(-52)"/>
+                    <rect class="cls-221" x="30.17" y="74.22" width="16.21" height="0.29"
+                          transform="translate(-43.89 58.75) rotate(-52)"/>
+                    <rect class="cls-221" x="29.39" y="72.89" width="16.21" height="1.71"
+                          transform="translate(-43.7 57.89) rotate(-52)"/>
+                    <rect class="cls-221" x="28.04" y="71.84" width="16.21" height="1.71"
+                          transform="translate(-43.39 56.42) rotate(-52)"/>
+                    <rect class="cls-222" x="26.69" y="70.78" width="16.21" height="1.71"
+                          transform="translate(-43.08 54.95) rotate(-52)"/>
+                    <polygon class="cls-223"
+                             points="29.13 77.5 27.78 76.44 36.99 64.65 39.01 64.65 39.11 64.72 29.13 77.5"/>
+                    <polygon class="cls-224" points="27.78 76.44 26.43 75.39 34.81 64.65 36.99 64.65 27.78 76.44"/>
+                    <polygon class="cls-225" points="26.43 75.39 25.07 74.33 32.64 64.65 34.81 64.65 26.43 75.39"/>
+                    <polygon class="cls-225" points="25.07 74.33 23.73 73.28 30.46 64.65 32.64 64.65 25.07 74.33"/>
+                    <polygon class="cls-226"
+                             points="23.73 73.28 22.71 72.48 22.71 71.8 28.29 64.65 30.46 64.65 23.73 73.28"/>
+                    <polygon class="cls-226" points="22.71 71.3 27.9 64.65 28.29 64.65 22.71 71.8 22.71 71.3"/>
+                    <polygon class="cls-227" points="22.71 70.79 27.51 64.65 27.9 64.65 22.71 71.3 22.71 70.79"/>
+                    <polygon class="cls-228" points="22.71 70.29 27.11 64.65 27.51 64.65 22.71 70.79 22.71 70.29"/>
+                    <polygon class="cls-229" points="22.71 69.79 26.72 64.65 27.11 64.65 22.71 70.29 22.71 69.79"/>
+                    <polygon class="cls-230" points="22.71 69.29 26.33 64.65 26.72 64.65 22.71 69.79 22.71 69.29"/>
+                    <polygon class="cls-231" points="22.71 68.79 25.94 64.65 26.33 64.65 22.71 69.29 22.71 68.79"/>
+                    <polygon class="cls-232" points="22.71 68.28 25.55 64.65 25.94 64.65 22.71 68.79 22.71 68.28"/>
+                    <polygon class="cls-34" points="22.71 67.78 25.16 64.65 25.55 64.65 22.71 68.28 22.71 67.78"/>
+                    <polygon class="cls-35" points="22.71 67.28 24.76 64.65 25.16 64.65 22.71 67.78 22.71 67.28"/>
+                    <polygon class="cls-36" points="22.71 66.78 24.37 64.65 24.76 64.65 22.71 67.28 22.71 66.78"/>
+                    <polygon class="cls-37" points="22.71 66.28 23.98 64.65 24.37 64.65 22.71 66.78 22.71 66.28"/>
+                    <polygon class="cls-38" points="22.71 65.77 23.59 64.65 23.98 64.65 22.71 66.28 22.71 65.77"/>
+                    <polygon class="cls-39" points="22.71 65.27 23.19 64.65 23.59 64.65 22.71 65.77 22.71 65.27"/>
+                    <polygon class="cls-40" points="22.71 64.77 22.8 64.65 23.19 64.65 22.71 65.27 22.71 64.77"/>
+                    <polygon class="cls-41" points="22.8 64.65 22.71 64.77 22.71 64.65 22.8 64.65"/>
+                </g>
+                <g class="cls-233">
+                    <polygon class="cls-234" points="88.91 111.72 95.39 103.41 99.37 106.52 99.37 111.72 88.91 111.72"/>
+                    <polygon class="cls-234" points="88.8 111.72 95.33 103.36 95.39 103.41 88.91 111.72 88.8 111.72"/>
+                    <polygon class="cls-235" points="88.69 111.72 95.26 103.31 95.33 103.36 88.8 111.72 88.69 111.72"/>
+                    <polygon class="cls-236" points="88.59 111.72 95.2 103.26 95.26 103.31 88.69 111.72 88.59 111.72"/>
+                    <polygon class="cls-237" points="88.48 111.72 95.13 103.21 95.2 103.26 88.59 111.72 88.48 111.72"/>
+                    <polygon class="cls-238" points="88.38 111.72 95.07 103.16 95.13 103.21 88.48 111.72 88.38 111.72"/>
+                    <polygon class="cls-239" points="88.27 111.72 95 103.1 95.07 103.16 88.38 111.72 88.27 111.72"/>
+                    <polygon class="cls-240" points="88.16 111.72 94.94 103.05 95 103.1 88.27 111.72 88.16 111.72"/>
+                    <polygon class="cls-241" points="88.06 111.72 94.87 103 94.94 103.05 88.16 111.72 88.06 111.72"/>
+                    <polygon class="cls-242" points="87.95 111.72 94.8 102.95 94.87 103 88.06 111.72 87.95 111.72"/>
+                    <polygon class="cls-243" points="87.85 111.72 94.74 102.9 94.8 102.95 87.95 111.72 87.85 111.72"/>
+                    <polygon class="cls-244" points="87.74 111.72 94.67 102.85 94.74 102.9 87.85 111.72 87.74 111.72"/>
+                    <polygon class="cls-245" points="87.63 111.72 94.61 102.8 94.67 102.85 87.74 111.72 87.63 111.72"/>
+                    <polygon class="cls-246" points="87.53 111.72 94.54 102.74 94.61 102.8 87.63 111.72 87.53 111.72"/>
+                    <polygon class="cls-247" points="87.42 111.72 94.47 102.69 94.54 102.74 87.53 111.72 87.42 111.72"/>
+                    <polygon class="cls-248" points="87.32 111.72 94.41 102.64 94.47 102.69 87.42 111.72 87.32 111.72"/>
+                    <polygon class="cls-249" points="87.21 111.72 94.34 102.59 94.41 102.64 87.32 111.72 87.21 111.72"/>
+                    <polygon class="cls-250" points="87.1 111.72 94.28 102.54 94.34 102.59 87.21 111.72 87.1 111.72"/>
+                    <polygon class="cls-251" points="87 111.72 94.21 102.49 94.28 102.54 87.1 111.72 87 111.72"/>
+                    <polygon class="cls-252" points="86.89 111.72 94.14 102.44 94.21 102.49 87 111.72 86.89 111.72"/>
+                    <polygon class="cls-253" points="86.79 111.72 94.08 102.38 94.14 102.44 86.89 111.72 86.79 111.72"/>
+                    <polygon class="cls-254" points="86.68 111.72 94.01 102.33 94.08 102.38 86.79 111.72 86.68 111.72"/>
+                    <polygon class="cls-255" points="86.58 111.72 93.95 102.28 94.01 102.33 86.68 111.72 86.58 111.72"/>
+                    <polygon class="cls-256" points="86.47 111.72 93.88 102.23 93.95 102.28 86.58 111.72 86.47 111.72"/>
+                    <polygon class="cls-257" points="86.36 111.72 93.82 102.18 93.88 102.23 86.47 111.72 86.36 111.72"/>
+                    <polygon class="cls-258" points="86.26 111.72 93.75 102.13 93.82 102.18 86.36 111.72 86.26 111.72"/>
+                    <polygon class="cls-259" points="86.15 111.72 93.69 102.08 93.75 102.13 86.26 111.72 86.15 111.72"/>
+                    <polygon class="cls-260" points="86.05 111.72 93.62 102.03 93.69 102.08 86.15 111.72 86.05 111.72"/>
+                    <polygon class="cls-261" points="85.94 111.72 93.55 101.97 93.62 102.03 86.05 111.72 85.94 111.72"/>
+                    <polygon class="cls-262" points="85.83 111.72 93.49 101.92 93.55 101.97 85.94 111.72 85.83 111.72"/>
+                    <polygon class="cls-263" points="85.73 111.72 93.42 101.87 93.49 101.92 85.83 111.72 85.73 111.72"/>
+                    <polygon class="cls-264" points="85.62 111.72 93.36 101.82 93.42 101.87 85.73 111.72 85.62 111.72"/>
+                    <polygon class="cls-265" points="85.52 111.72 93.29 101.77 93.36 101.82 85.62 111.72 85.52 111.72"/>
+                    <polygon class="cls-266" points="85.41 111.72 93.22 101.72 93.29 101.77 85.52 111.72 85.41 111.72"/>
+                    <polygon class="cls-267" points="85.3 111.72 93.16 101.67 93.22 101.72 85.41 111.72 85.3 111.72"/>
+                    <polygon class="cls-268" points="85.2 111.72 93.09 101.61 93.16 101.67 85.3 111.72 85.2 111.72"/>
+                    <polygon class="cls-268" points="85.09 111.72 93.03 101.56 93.09 101.61 85.2 111.72 85.09 111.72"/>
+                    <polygon class="cls-269" points="84.99 111.72 92.96 101.51 93.03 101.56 85.09 111.72 84.99 111.72"/>
+                    <polygon class="cls-270" points="84.88 111.72 92.9 101.46 92.96 101.51 84.99 111.72 84.88 111.72"/>
+                    <polygon class="cls-271" points="84.77 111.72 92.83 101.41 92.9 101.46 84.88 111.72 84.77 111.72"/>
+                    <polygon class="cls-272" points="84.67 111.72 92.76 101.36 92.83 101.41 84.77 111.72 84.67 111.72"/>
+                    <polygon class="cls-273" points="84.56 111.72 92.7 101.31 92.76 101.36 84.67 111.72 84.56 111.72"/>
+                    <polygon class="cls-274" points="84.46 111.72 92.63 101.25 92.7 101.31 84.56 111.72 84.46 111.72"/>
+                    <polygon class="cls-275" points="84.35 111.72 92.57 101.2 92.63 101.25 84.46 111.72 84.35 111.72"/>
+                    <polygon class="cls-276" points="84.25 111.72 92.5 101.15 92.57 101.2 84.35 111.72 84.25 111.72"/>
+                    <polygon class="cls-277" points="84.14 111.72 92.44 101.1 92.5 101.15 84.25 111.72 84.14 111.72"/>
+                    <polygon class="cls-278" points="84.03 111.72 92.37 101.05 92.44 101.1 84.14 111.72 84.03 111.72"/>
+                    <polygon class="cls-279" points="83.93 111.72 92.3 101 92.37 101.05 84.03 111.72 83.93 111.72"/>
+                    <polygon class="cls-280" points="83.82 111.72 92.24 100.94 92.3 101 83.93 111.72 83.82 111.72"/>
+                    <polygon class="cls-281" points="83.72 111.72 92.17 100.89 92.24 100.94 83.82 111.72 83.72 111.72"/>
+                    <polygon class="cls-282" points="83.61 111.72 92.11 100.84 92.17 100.89 83.72 111.72 83.61 111.72"/>
+                    <polygon class="cls-283" points="83.5 111.72 92.04 100.79 92.11 100.84 83.61 111.72 83.5 111.72"/>
+                    <polygon class="cls-284" points="83.4 111.72 91.97 100.74 92.04 100.79 83.5 111.72 83.4 111.72"/>
+                    <polygon class="cls-285" points="83.29 111.72 91.91 100.69 91.97 100.74 83.4 111.72 83.29 111.72"/>
+                    <polygon class="cls-286" points="83.19 111.72 91.84 100.64 91.91 100.69 83.29 111.72 83.19 111.72"/>
+                    <polygon class="cls-287" points="83.08 111.72 91.78 100.59 91.84 100.64 83.19 111.72 83.08 111.72"/>
+                    <polygon class="cls-288" points="82.97 111.72 91.71 100.53 91.78 100.59 83.08 111.72 82.97 111.72"/>
+                    <polygon class="cls-289" points="82.87 111.72 91.65 100.48 91.71 100.53 82.97 111.72 82.87 111.72"/>
+                    <polygon class="cls-290" points="82.76 111.72 91.58 100.43 91.65 100.48 82.87 111.72 82.76 111.72"/>
+                    <polygon class="cls-291" points="82.66 111.72 91.51 100.38 91.58 100.43 82.76 111.72 82.66 111.72"/>
+                    <polygon class="cls-292" points="82.55 111.72 91.45 100.33 91.51 100.38 82.66 111.72 82.55 111.72"/>
+                    <polygon class="cls-293" points="82.44 111.72 91.38 100.28 91.45 100.33 82.55 111.72 82.44 111.72"/>
+                    <polygon class="cls-294" points="82.34 111.72 91.32 100.23 91.38 100.28 82.44 111.72 82.34 111.72"/>
+                    <polygon class="cls-295" points="82.23 111.72 91.25 100.17 91.32 100.23 82.34 111.72 82.23 111.72"/>
+                    <polygon class="cls-296" points="82.13 111.72 91.19 100.12 91.25 100.17 82.23 111.72 82.13 111.72"/>
+                    <polygon class="cls-297" points="82.02 111.72 91.12 100.07 91.19 100.12 82.13 111.72 82.02 111.72"/>
+                    <polygon class="cls-298" points="81.91 111.72 91.05 100.02 91.12 100.07 82.02 111.72 81.91 111.72"/>
+                    <polygon class="cls-299" points="81.81 111.72 90.99 99.97 91.05 100.02 81.91 111.72 81.81 111.72"/>
+                    <polygon class="cls-300" points="81.7 111.72 90.92 99.92 90.99 99.97 81.81 111.72 81.7 111.72"/>
+                    <polygon class="cls-300" points="81.17 111.72 90.59 99.66 90.92 99.92 81.7 111.72 81.17 111.72"/>
+                    <polygon class="cls-301" points="80.65 111.72 90.27 99.41 90.59 99.66 81.17 111.72 80.65 111.72"/>
+                    <polygon class="cls-302" points="80.12 111.72 89.94 99.15 90.27 99.41 80.65 111.72 80.12 111.72"/>
+                    <polygon class="cls-303" points="79.59 111.72 89.61 98.89 89.94 99.15 80.12 111.72 79.59 111.72"/>
+                    <polygon class="cls-304" points="79.06 111.72 89.28 98.64 89.61 98.89 79.59 111.72 79.06 111.72"/>
+                    <polygon class="cls-305" points="78.54 111.72 88.96 98.38 89.28 98.64 79.06 111.72 78.54 111.72"/>
+                    <polygon class="cls-305" points="78.01 111.72 88.63 98.13 88.96 98.38 78.54 111.72 78.01 111.72"/>
+                    <polygon class="cls-306" points="77.48 111.72 88.3 97.87 88.63 98.13 78.01 111.72 77.48 111.72"/>
+                    <polygon class="cls-307" points="76.95 111.72 87.97 97.61 88.3 97.87 77.48 111.72 76.95 111.72"/>
+                    <polygon class="cls-308" points="76.42 111.72 87.64 97.36 87.97 97.61 76.95 111.72 76.42 111.72"/>
+                    <polygon class="cls-309" points="75.9 111.72 87.32 97.1 87.64 97.36 76.42 111.72 75.9 111.72"/>
+                    <polygon class="cls-310" points="75.37 111.72 86.99 96.84 87.32 97.1 75.9 111.72 75.37 111.72"/>
+                    <polygon class="cls-311" points="74.84 111.72 86.66 96.59 86.99 96.84 75.37 111.72 74.84 111.72"/>
+                    <polygon class="cls-312" points="74.31 111.72 86.33 96.33 86.66 96.59 74.84 111.72 74.31 111.72"/>
+                    <polygon class="cls-313" points="73.78 111.72 86.01 96.08 86.33 96.33 74.31 111.72 73.78 111.72"/>
+                    <polygon class="cls-314" points="73.26 111.72 85.68 95.82 86.01 96.08 73.78 111.72 73.26 111.72"/>
+                    <polygon class="cls-315" points="72.73 111.72 85.35 95.56 85.68 95.82 73.26 111.72 72.73 111.72"/>
+                    <polygon class="cls-316" points="72.2 111.72 85.02 95.31 85.35 95.56 72.73 111.72 72.2 111.72"/>
+                    <polygon class="cls-316" points="71.67 111.72 84.69 95.05 85.02 95.31 72.2 111.72 71.67 111.72"/>
+                    <polygon class="cls-317"
+                             points="71.23 111.72 71.18 111.68 84.37 94.8 84.69 95.05 71.67 111.72 71.23 111.72"/>
+                    <rect class="cls-317" x="66.9" y="102.9" width="21.42" height="0.42"
+                          transform="translate(-51.42 100.79) rotate(-52)"/>
+                    <rect class="cls-318" x="66.57" y="102.64" width="21.42" height="0.42"
+                          transform="translate(-51.35 100.43) rotate(-52)"/>
+                    <rect class="cls-114" x="66.24" y="102.39" width="21.42" height="0.42"
+                          transform="translate(-51.27 100.08) rotate(-52)"/>
+                    <rect class="cls-114" x="65.92" y="102.13" width="21.42" height="0.42"
+                          transform="translate(-51.19 99.72) rotate(-52)"/>
+                    <rect class="cls-115" x="65.59" y="101.88" width="21.42" height="0.42"
+                          transform="translate(-51.12 99.36) rotate(-52)"/>
+                    <rect class="cls-116" x="65.26" y="101.62" width="21.42" height="0.42"
+                          transform="translate(-51.04 99.01) rotate(-52)"/>
+                    <rect class="cls-117" x="64.93" y="101.36" width="21.42" height="0.42"
+                          transform="translate(-50.97 98.65) rotate(-52)"/>
+                    <rect class="cls-118" x="64.61" y="101.11" width="21.42" height="0.42"
+                          transform="translate(-50.89 98.29) rotate(-52)"/>
+                    <rect class="cls-118" x="64.28" y="100.85" width="21.42" height="0.42"
+                          transform="translate(-50.82 97.94) rotate(-52)"/>
+                    <rect class="cls-119" x="63.95" y="100.6" width="21.42" height="0.42"
+                          transform="translate(-50.74 97.58) rotate(-52)"/>
+                    <rect class="cls-120" x="63.62" y="100.34" width="21.42" height="0.42"
+                          transform="translate(-50.66 97.22) rotate(-52)"/>
+                    <rect class="cls-121" x="63.29" y="100.08" width="21.42" height="0.42"
+                          transform="translate(-50.59 96.87) rotate(-52)"/>
+                    <rect class="cls-122" x="62.97" y="99.83" width="21.42" height="0.42"
+                          transform="translate(-50.51 96.51) rotate(-52)"/>
+                    <rect class="cls-122" x="62.64" y="99.57" width="21.42" height="0.42"
+                          transform="translate(-50.44 96.15) rotate(-52)"/>
+                    <rect class="cls-123" x="62.31" y="99.32" width="21.42" height="0.42"
+                          transform="translate(-50.36 95.8) rotate(-52)"/>
+                    <rect class="cls-124" x="61.98" y="99.06" width="21.42" height="0.42"
+                          transform="translate(-50.29 95.44) rotate(-52)"/>
+                    <rect class="cls-125" x="61.66" y="98.8" width="21.42" height="0.42"
+                          transform="translate(-50.21 95.08) rotate(-52)"/>
+                    <rect class="cls-126" x="61.33" y="98.55" width="21.42" height="0.42"
+                          transform="translate(-50.13 94.73) rotate(-52)"/>
+                    <polygon class="cls-126"
+                             points="65.28 107.07 64.95 106.81 78.07 90.02 78.25 90.02 78.47 90.19 65.28 107.07"/>
+                    <polygon class="cls-127" points="64.95 106.81 64.63 106.56 77.54 90.02 78.07 90.02 64.95 106.81"/>
+                    <polygon class="cls-127" points="64.63 106.56 64.3 106.3 77.02 90.02 77.54 90.02 64.63 106.56"/>
+                    <polygon class="cls-128" points="64.3 106.3 63.97 106.04 76.49 90.02 77.02 90.02 64.3 106.3"/>
+                    <polygon class="cls-129" points="63.97 106.04 63.64 105.79 75.96 90.02 76.49 90.02 63.97 106.04"/>
+                    <polygon class="cls-129" points="63.64 105.79 63.31 105.53 75.43 90.02 75.96 90.02 63.64 105.79"/>
+                    <polygon class="cls-130" points="63.31 105.53 62.99 105.28 74.9 90.02 75.43 90.02 63.31 105.53"/>
+                    <polygon class="cls-130" points="62.99 105.28 62.66 105.02 74.38 90.02 74.9 90.02 62.99 105.28"/>
+                    <polygon class="cls-131" points="62.66 105.02 62.33 104.76 73.85 90.02 74.38 90.02 62.66 105.02"/>
+                    <polygon class="cls-132" points="62.33 104.76 62 104.51 73.32 90.02 73.85 90.02 62.33 104.76"/>
+                    <polygon class="cls-133" points="62 104.51 61.67 104.25 72.79 90.02 73.32 90.02 62 104.51"/>
+                    <polygon class="cls-134" points="61.67 104.25 61.35 103.99 72.26 90.02 72.79 90.02 61.67 104.25"/>
+                    <polygon class="cls-134" points="61.35 103.99 61.02 103.74 71.74 90.02 72.26 90.02 61.35 103.99"/>
+                    <polygon class="cls-135" points="61.02 103.74 60.69 103.48 71.21 90.02 71.74 90.02 61.02 103.74"/>
+                    <polygon class="cls-136" points="60.69 103.48 60.36 103.23 70.68 90.02 71.21 90.02 60.69 103.48"/>
+                    <polygon class="cls-137" points="60.36 103.23 60.04 102.97 70.15 90.02 70.68 90.02 60.36 103.23"/>
+                    <polygon class="cls-138" points="60.04 102.97 59.71 102.71 69.63 90.02 70.15 90.02 60.04 102.97"/>
+                    <polygon class="cls-139" points="59.71 102.71 59.38 102.46 69.1 90.02 69.63 90.02 59.71 102.71"/>
+                    <polygon class="cls-139" points="59.38 102.46 59.05 102.2 68.57 90.02 69.1 90.02 59.38 102.46"/>
+                    <polygon class="cls-140" points="59.05 102.2 58.73 101.95 68.04 90.02 68.57 90.02 59.05 102.2"/>
+                    <polygon class="cls-141" points="58.73 101.95 58.4 101.69 67.51 90.02 68.04 90.02 58.73 101.95"/>
+                    <polygon class="cls-142" points="58.4 101.69 58.07 101.43 66.99 90.02 67.51 90.02 58.4 101.69"/>
+                    <polygon class="cls-143" points="58.07 101.43 57.74 101.18 66.46 90.02 66.99 90.02 58.07 101.43"/>
+                    <polygon class="cls-143" points="57.74 101.18 57.41 100.92 65.93 90.02 66.46 90.02 57.74 101.18"/>
+                    <polygon class="cls-144"
+                             points="57.41 100.92 57.31 100.84 57.31 100.38 65.4 90.02 65.93 90.02 57.41 100.92"/>
+                    <polygon class="cls-144" points="57.31 99.7 64.88 90.02 65.4 90.02 57.31 100.38 57.31 99.7"/>
+                    <polygon class="cls-145" points="57.31 99.03 64.35 90.02 64.88 90.02 57.31 99.7 57.31 99.03"/>
+                    <polygon class="cls-146" points="57.31 98.35 63.82 90.02 64.35 90.02 57.31 99.03 57.31 98.35"/>
+                    <polygon class="cls-147" points="57.31 97.68 63.29 90.02 63.82 90.02 57.31 98.35 57.31 97.68"/>
+                    <polygon class="cls-148" points="57.31 97 62.76 90.02 63.29 90.02 57.31 97.68 57.31 97"/>
+                    <polygon class="cls-149" points="57.31 96.33 62.24 90.02 62.76 90.02 57.31 97 57.31 96.33"/>
+                    <polygon class="cls-150" points="57.31 95.65 61.71 90.02 62.24 90.02 57.31 96.33 57.31 95.65"/>
+                    <polygon class="cls-151" points="57.31 94.97 61.18 90.02 61.71 90.02 57.31 95.65 57.31 94.97"/>
+                    <polygon class="cls-152" points="57.31 94.3 60.65 90.02 61.18 90.02 57.31 94.97 57.31 94.3"/>
+                    <polygon class="cls-153" points="57.31 93.62 60.13 90.02 60.65 90.02 57.31 94.3 57.31 93.62"/>
+                    <polygon class="cls-154" points="57.31 92.95 59.6 90.02 60.13 90.02 57.31 93.62 57.31 92.95"/>
+                    <polygon class="cls-154" points="57.31 92.27 59.07 90.02 59.6 90.02 57.31 92.95 57.31 92.27"/>
+                    <polygon class="cls-155" points="57.31 91.6 58.54 90.02 59.07 90.02 57.31 92.27 57.31 91.6"/>
+                    <polygon class="cls-155" points="57.31 90.92 58.01 90.02 58.54 90.02 57.31 91.6 57.31 90.92"/>
+                    <polygon class="cls-319" points="57.31 90.25 57.48 90.02 58.01 90.02 57.31 90.92 57.31 90.25"/>
+                    <polygon class="cls-320" points="57.48 90.02 57.31 90.25 57.31 90.02 57.48 90.02"/>
+                </g>
+                <g class="cls-321">
+                    <polygon class="cls-157" points="67.92 89.32 68.17 89 68.17 89.32 67.92 89.32"/>
+                    <polygon class="cls-158" points="67.56 89.32 68.17 88.53 68.17 89 67.92 89.32 67.56 89.32"/>
+                    <polygon class="cls-158" points="67.19 89.32 68.17 88.07 68.17 88.53 67.56 89.32 67.19 89.32"/>
+                    <polygon class="cls-158" points="66.83 89.32 68.17 87.6 68.17 88.07 67.19 89.32 66.83 89.32"/>
+                    <polygon class="cls-159" points="66.47 89.32 68.17 87.13 68.17 87.6 66.83 89.32 66.47 89.32"/>
+                    <polygon class="cls-159" points="66.1 89.32 68.17 86.67 68.17 87.13 66.47 89.32 66.1 89.32"/>
+                    <polygon class="cls-159" points="65.74 89.32 68.17 86.2 68.17 86.67 66.1 89.32 65.74 89.32"/>
+                    <polygon class="cls-160" points="65.37 89.32 68.17 85.74 68.17 86.2 65.74 89.32 65.37 89.32"/>
+                    <polygon class="cls-160" points="65.01 89.32 68.17 85.27 68.17 85.74 65.37 89.32 65.01 89.32"/>
+                    <polygon class="cls-160" points="64.64 89.32 68.17 84.8 68.17 85.27 65.01 89.32 64.64 89.32"/>
+                    <polygon class="cls-161" points="64.28 89.32 68.17 84.34 68.17 84.8 64.64 89.32 64.28 89.32"/>
+                    <polygon class="cls-161" points="63.92 89.32 68.17 83.87 68.17 84.34 64.28 89.32 63.92 89.32"/>
+                    <polygon class="cls-161" points="63.55 89.32 68.17 83.41 68.17 83.87 63.92 89.32 63.55 89.32"/>
+                    <polygon class="cls-162" points="63.19 89.32 68.17 82.94 68.17 83.41 63.55 89.32 63.19 89.32"/>
+                    <polygon class="cls-162" points="62.82 89.32 68.17 82.47 68.17 82.94 63.19 89.32 62.82 89.32"/>
+                    <polygon class="cls-163" points="62.46 89.32 68.17 82.01 68.17 82.47 62.82 89.32 62.46 89.32"/>
+                    <polygon class="cls-164" points="62.1 89.32 68.17 81.54 68.17 82.01 62.46 89.32 62.1 89.32"/>
+                    <polygon class="cls-164" points="61.73 89.32 68.17 81.08 68.17 81.54 62.1 89.32 61.73 89.32"/>
+                    <polygon class="cls-165" points="61.37 89.32 68.17 80.61 68.17 81.08 61.73 89.32 61.37 89.32"/>
+                    <polygon class="cls-166" points="61 89.32 68.17 80.14 68.17 80.61 61.37 89.32 61 89.32"/>
+                    <polygon class="cls-166" points="60.64 89.32 68.17 79.68 68.17 80.14 61 89.32 60.64 89.32"/>
+                    <polygon class="cls-167" points="60.28 89.32 68.17 79.21 68.17 79.68 60.64 89.32 60.28 89.32"/>
+                    <polygon class="cls-167" points="59.91 89.32 68.17 78.75 68.17 79.21 60.28 89.32 59.91 89.32"/>
+                    <polygon class="cls-168" points="59.55 89.32 68.17 78.28 68.17 78.75 59.91 89.32 59.55 89.32"/>
+                    <polygon class="cls-169"
+                             points="59.43 89.32 59.28 89.2 68.17 77.81 68.17 78.28 59.55 89.32 59.43 89.32"/>
+                    <polygon class="cls-169" points="59.28 89.2 59.05 89.02 68.17 77.35 68.17 77.81 59.28 89.2"/>
+                    <polygon class="cls-170" points="59.05 89.02 58.82 88.84 68.17 76.88 68.17 77.35 59.05 89.02"/>
+                    <polygon class="cls-171" points="58.82 88.84 58.6 88.67 68.17 76.42 68.17 76.88 58.82 88.84"/>
+                    <polygon class="cls-171" points="58.6 88.67 58.37 88.49 68.17 75.95 68.17 76.42 58.6 88.67"/>
+                    <polygon class="cls-172" points="58.37 88.49 58.15 88.31 68.17 75.48 68.17 75.95 58.37 88.49"/>
+                    <polygon class="cls-173" points="58.15 88.31 57.92 88.14 68.17 75.02 68.17 75.48 58.15 88.31"/>
+                    <polygon class="cls-173" points="57.92 88.14 57.69 87.96 68.17 74.55 68.17 75.02 57.92 88.14"/>
+                    <polygon class="cls-174" points="57.69 87.96 57.47 87.78 68.17 74.08 68.17 74.55 57.69 87.96"/>
+                    <polygon class="cls-174" points="57.47 87.78 57.24 87.61 68.17 73.62 68.17 74.08 57.47 87.78"/>
+                    <polygon class="cls-174" points="57.24 87.61 57.02 87.43 68.17 73.15 68.17 73.62 57.24 87.61"/>
+                    <polygon class="cls-175" points="57.02 87.43 56.79 87.25 68.17 72.69 68.17 73.15 57.02 87.43"/>
+                    <polygon class="cls-175" points="56.79 87.25 56.56 87.08 68.17 72.22 68.17 72.69 56.79 87.25"/>
+                    <polygon class="cls-175" points="56.56 87.08 56.34 86.9 68.17 71.75 68.17 72.22 56.56 87.08"/>
+                    <polygon class="cls-176" points="56.34 86.9 56.11 86.72 68.17 71.29 68.17 71.75 56.34 86.9"/>
+                    <polygon class="cls-176" points="56.11 86.72 55.88 86.55 68.17 70.82 68.17 71.29 56.11 86.72"/>
+                    <polygon class="cls-176" points="55.88 86.55 55.66 86.37 68.17 70.36 68.17 70.82 55.88 86.55"/>
+                    <polygon class="cls-177" points="55.66 86.37 55.43 86.19 68.17 69.89 68.17 70.36 55.66 86.37"/>
+                    <polygon class="cls-177"
+                             points="55.43 86.19 55.21 86.02 68.13 69.47 68.17 69.5 68.17 69.89 55.43 86.19"/>
+                    <rect class="cls-177" x="51.06" y="77.51" width="21" height="0.29"
+                          transform="translate(-37.54 78.36) rotate(-52)"/>
+                    <rect class="cls-178" x="50.83" y="77.34" width="21" height="0.29"
+                          transform="translate(-37.48 78.11) rotate(-52)"/>
+                    <rect class="cls-178" x="50.61" y="77.16" width="21" height="0.29"
+                          transform="translate(-37.43 77.87) rotate(-52)"/>
+                    <rect class="cls-179" x="50.38" y="76.98" width="21" height="0.29"
+                          transform="translate(-37.38 77.62) rotate(-52)"/>
+                    <rect class="cls-180" x="50.15" y="76.81" width="21" height="0.29"
+                          transform="translate(-37.33 77.37) rotate(-52)"/>
+                    <rect class="cls-180" x="49.93" y="76.63" width="21" height="0.29"
+                          transform="translate(-37.27 77.13) rotate(-52)"/>
+                    <rect class="cls-181" x="49.7" y="76.45" width="21" height="0.29"
+                          transform="translate(-37.22 76.88) rotate(-52)"/>
+                    <rect class="cls-182" x="49.48" y="76.28" width="21" height="0.29"
+                          transform="translate(-37.17 76.63) rotate(-52)"/>
+                    <rect class="cls-182" x="49.25" y="76.1" width="21" height="0.29"
+                          transform="translate(-37.12 76.39) rotate(-52)"/>
+                    <rect class="cls-183" x="49.02" y="75.92" width="21" height="0.29"
+                          transform="translate(-37.06 76.14) rotate(-52)"/>
+                    <rect class="cls-184" x="48.8" y="75.75" width="21" height="0.29"
+                          transform="translate(-37.01 75.9) rotate(-52)"/>
+                    <rect class="cls-184" x="48.57" y="75.57" width="21" height="0.29"
+                          transform="translate(-36.96 75.65) rotate(-52)"/>
+                    <rect class="cls-185" x="48.34" y="75.39" width="21" height="0.29"
+                          transform="translate(-36.91 75.4) rotate(-52)"/>
+                    <rect class="cls-186" x="48.12" y="75.22" width="21" height="0.29"
+                          transform="translate(-36.86 75.16) rotate(-52)"/>
+                    <rect class="cls-187" x="47.89" y="75.04" width="21" height="0.29"
+                          transform="translate(-36.8 74.91) rotate(-52)"/>
+                    <rect class="cls-187" x="47.67" y="74.86" width="21" height="0.29"
+                          transform="translate(-36.75 74.67) rotate(-52)"/>
+                    <rect class="cls-188" x="47.44" y="74.69" width="21" height="0.29"
+                          transform="translate(-36.7 74.42) rotate(-52)"/>
+                    <rect class="cls-189" x="47.21" y="74.51" width="21" height="0.29"
+                          transform="translate(-36.65 74.17) rotate(-52)"/>
+                    <rect class="cls-189" x="46.99" y="74.33" width="21" height="0.29"
+                          transform="translate(-36.59 73.93) rotate(-52)"/>
+                    <rect class="cls-190" x="46.76" y="74.16" width="21" height="0.29"
+                          transform="translate(-36.54 73.68) rotate(-52)"/>
+                    <rect class="cls-191" x="46.54" y="73.98" width="21" height="0.29"
+                          transform="translate(-36.49 73.44) rotate(-52)"/>
+                    <rect class="cls-191" x="46.31" y="73.8" width="21" height="0.29"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -36.44, 73.19)"/>
+                    <rect class="cls-192" x="46.08" y="73.63" width="21" height="0.29"
+                          transform="translate(-36.39 72.94) rotate(-52)"/>
+                    <rect class="cls-192" x="45.86" y="73.45" width="21" height="0.29"
+                          transform="translate(-36.33 72.7) rotate(-52)"/>
+                    <rect class="cls-192" x="45.63" y="73.27" width="21" height="0.29"
+                          transform="translate(-36.28 72.45) rotate(-52)"/>
+                    <rect class="cls-193" x="45.41" y="73.1" width="21" height="0.29"
+                          transform="translate(-36.23 72.21) rotate(-52)"/>
+                    <rect class="cls-193" x="45.18" y="72.92" width="21" height="0.29"
+                          transform="translate(-36.18 71.96) rotate(-52)"/>
+                    <rect class="cls-193" x="44.95" y="72.74" width="21" height="0.29"
+                          transform="translate(-36.12 71.71) rotate(-52)"/>
+                    <rect class="cls-194" x="44.73" y="72.57" width="21" height="0.29"
+                          transform="translate(-36.07 71.47) rotate(-52)"/>
+                    <rect class="cls-194" x="44.5" y="72.39" width="21" height="0.29"
+                          transform="translate(-36.02 71.22) rotate(-52)"/>
+                    <rect class="cls-195" x="44.28" y="72.21" width="21" height="0.29"
+                          transform="translate(-35.97 70.98) rotate(-52)"/>
+                    <rect class="cls-196" x="44.05" y="72.04" width="21" height="0.29"
+                          transform="translate(-35.91 70.73) rotate(-52)"/>
+                    <rect class="cls-196" x="43.82" y="71.86" width="21" height="0.29"
+                          transform="translate(-35.86 70.48) rotate(-52)"/>
+                    <rect class="cls-197" x="43.6" y="71.68" width="21" height="0.29"
+                          transform="translate(-35.81 70.24) rotate(-52)"/>
+                    <rect class="cls-197" x="43.37" y="71.51" width="21" height="0.29"
+                          transform="translate(-35.76 69.99) rotate(-52)"/>
+                    <rect class="cls-197" x="43.14" y="71.33" width="21" height="0.29"
+                          transform="translate(-35.71 69.74) rotate(-52)"/>
+                    <rect class="cls-198" x="42.92" y="71.15" width="21" height="0.29"
+                          transform="translate(-35.65 69.5) rotate(-52)"/>
+                    <rect class="cls-198" x="42.69" y="70.98" width="21" height="0.29"
+                          transform="translate(-35.6 69.25) rotate(-52)"/>
+                    <rect class="cls-199" x="42.47" y="70.8" width="21" height="0.29"
+                          transform="translate(-35.55 69.01) rotate(-52)"/>
+                    <rect class="cls-200" x="42.24" y="70.62" width="21" height="0.29"
+                          transform="translate(-35.5 68.76) rotate(-52)"/>
+                    <rect class="cls-200" x="42.01" y="70.45" width="21" height="0.29"
+                          transform="translate(-35.44 68.51) rotate(-52)"/>
+                    <rect class="cls-201" x="41.79" y="70.27" width="21" height="0.29"
+                          transform="translate(-35.39 68.27) rotate(-52)"/>
+                    <rect class="cls-201" x="41.56" y="70.09" width="21" height="0.29"
+                          transform="translate(-35.34 68.02) rotate(-52)"/>
+                    <rect class="cls-202" x="41.34" y="69.92" width="21" height="0.29"
+                          transform="translate(-35.29 67.78) rotate(-52)"/>
+                    <rect class="cls-203" x="41.11" y="69.74" width="21" height="0.29"
+                          transform="translate(-35.23 67.53) rotate(-52)"/>
+                    <rect class="cls-203" x="40.88" y="69.56" width="21" height="0.29"
+                          transform="translate(-35.18 67.28) rotate(-52)"/>
+                    <rect class="cls-204" x="40.66" y="69.39" width="21" height="0.29"
+                          transform="translate(-35.13 67.04) rotate(-52)"/>
+                    <rect class="cls-205" x="40.43" y="69.21" width="21" height="0.29"
+                          transform="translate(-35.08 66.79) rotate(-52)"/>
+                    <rect class="cls-206" x="40.21" y="69.03" width="21" height="0.29"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -35.03, 66.55)"/>
+                    <rect class="cls-206" x="39.98" y="68.86" width="21" height="0.29"
+                          transform="translate(-34.97 66.3) rotate(-52)"/>
+                    <rect class="cls-207" x="39.75" y="68.68" width="21" height="0.29"
+                          transform="translate(-34.92 66.05) rotate(-52)"/>
+                    <rect class="cls-208" x="39.53" y="68.5" width="21" height="0.29"
+                          transform="translate(-34.87 65.81) rotate(-52)"/>
+                    <rect class="cls-209" x="39.3" y="68.33" width="21" height="0.29"
+                          transform="translate(-34.82 65.56) rotate(-52)"/>
+                    <rect class="cls-210" x="39.07" y="68.15" width="21" height="0.29"
+                          transform="translate(-34.76 65.32) rotate(-52)"/>
+                    <rect class="cls-210" x="38.85" y="67.97" width="21" height="0.29"
+                          transform="translate(-34.71 65.07) rotate(-52)"/>
+                    <rect class="cls-211" x="38.62" y="67.8" width="21" height="0.29"
+                          transform="translate(-34.66 64.82) rotate(-52)"/>
+                    <rect class="cls-211" x="38.4" y="67.62" width="21" height="0.29"
+                          transform="translate(-34.61 64.58) rotate(-52)"/>
+                    <rect class="cls-211" x="38.17" y="67.44" width="21" height="0.29"
+                          transform="translate(-34.55 64.33) rotate(-52)"/>
+                    <rect class="cls-212" x="37.94" y="67.27" width="21" height="0.29"
+                          transform="translate(-34.5 64.09) rotate(-52)"/>
+                    <rect class="cls-212" x="37.72" y="67.09" width="21" height="0.29"
+                          transform="translate(-34.45 63.84) rotate(-52)"/>
+                    <rect class="cls-213" x="37.49" y="66.92" width="21" height="0.29"
+                          transform="translate(-34.4 63.59) rotate(-52)"/>
+                    <rect class="cls-213" x="37.27" y="66.74" width="21" height="0.29"
+                          transform="translate(-34.35 63.35) rotate(-52)"/>
+                    <rect class="cls-214" x="37.04" y="66.56" width="21" height="0.29"
+                          transform="translate(-34.29 63.1) rotate(-52)"/>
+                    <rect class="cls-215" x="36.81" y="66.39" width="21" height="0.29"
+                          transform="translate(-34.24 62.85) rotate(-52)"/>
+                    <rect class="cls-216" x="36.59" y="66.21" width="21" height="0.29"
+                          transform="translate(-34.19 62.61) rotate(-52)"/>
+                    <rect class="cls-216" x="36.36" y="66.03" width="21" height="0.29"
+                          transform="translate(-34.14 62.36) rotate(-52)"/>
+                    <rect class="cls-217" x="36.14" y="65.86" width="21" height="0.29"
+                          transform="translate(-34.08 62.12) rotate(-52)"/>
+                    <rect class="cls-218" x="35.91" y="65.68" width="21" height="0.29"
+                          transform="translate(-34.03 61.87) rotate(-52)"/>
+                    <rect class="cls-219" x="35.68" y="65.5" width="21" height="0.29"
+                          transform="translate(-33.98 61.62) rotate(-52)"/>
+                    <rect class="cls-220" x="35.46" y="65.33" width="21" height="0.29"
+                          transform="translate(-33.93 61.38) rotate(-52)"/>
+                    <rect class="cls-220" x="35.23" y="65.15" width="21" height="0.29"
+                          transform="translate(-33.88 61.13) rotate(-52)"/>
+                    <rect class="cls-221" x="35.01" y="64.97" width="21" height="0.29"
+                          transform="translate(-33.82 60.89) rotate(-52)"/>
+                    <rect class="cls-221" x="34.22" y="63.64" width="21" height="1.71"
+                          transform="translate(-33.64 60.03) rotate(-52)"/>
+                    <rect class="cls-221" x="32.87" y="62.59" width="21" height="1.71"
+                          transform="translate(-33.33 58.56) rotate(-52)"/>
+                    <rect class="cls-222" x="31.52" y="61.53" width="21" height="1.71"
+                          transform="translate(-33.02 57.09) rotate(-52)"/>
+                    <rect class="cls-223" x="30.17" y="60.48" width="21" height="1.71"
+                          transform="translate(-32.7 55.62) rotate(-52)"/>
+                    <polygon class="cls-224"
+                             points="33.53 69.08 32.4 68.2 32.4 67.74 45.1 51.48 46.45 52.53 33.53 69.08"/>
+                    <polygon class="cls-225" points="32.4 64.96 43.75 50.42 45.1 51.48 32.4 67.74 32.4 64.96"/>
+                    <polygon class="cls-225" points="32.4 62.17 42.4 49.37 43.75 50.42 32.4 64.96 32.4 62.17"/>
+                    <polygon class="cls-226" points="32.4 59.39 41.05 48.31 42.4 49.37 32.4 62.17 32.4 59.39"/>
+                    <polygon class="cls-226" points="32.4 58.89 40.81 48.12 41.05 48.31 32.4 59.39 32.4 58.89"/>
+                    <polygon class="cls-227" points="32.4 58.39 40.56 47.93 40.81 48.12 32.4 58.89 32.4 58.39"/>
+                    <polygon class="cls-228" points="32.4 57.88 40.32 47.74 40.56 47.93 32.4 58.39 32.4 57.88"/>
+                    <polygon class="cls-229"
+                             points="32.4 57.38 40.01 47.64 40.19 47.64 40.32 47.74 32.4 57.88 32.4 57.38"/>
+                    <polygon class="cls-230" points="32.4 56.88 39.62 47.64 40.01 47.64 32.4 57.38 32.4 56.88"/>
+                    <polygon class="cls-231" points="32.4 56.38 39.22 47.64 39.62 47.64 32.4 56.88 32.4 56.38"/>
+                    <polygon class="cls-232" points="32.4 55.88 38.83 47.64 39.22 47.64 32.4 56.38 32.4 55.88"/>
+                    <polygon class="cls-34" points="32.4 55.38 38.44 47.64 38.83 47.64 32.4 55.88 32.4 55.38"/>
+                    <polygon class="cls-35" points="32.4 54.87 38.05 47.64 38.44 47.64 32.4 55.38 32.4 54.87"/>
+                    <polygon class="cls-36" points="32.4 54.37 37.66 47.64 38.05 47.64 32.4 54.87 32.4 54.37"/>
+                    <polygon class="cls-37" points="32.4 53.87 37.26 47.64 37.66 47.64 32.4 54.37 32.4 53.87"/>
+                    <polygon class="cls-38" points="32.4 53.37 36.87 47.64 37.26 47.64 32.4 53.87 32.4 53.37"/>
+                    <polygon class="cls-39" points="32.4 52.87 36.48 47.64 36.87 47.64 32.4 53.37 32.4 52.87"/>
+                    <polygon class="cls-40" points="32.4 52.37 36.09 47.64 36.48 47.64 32.4 52.87 32.4 52.37"/>
+                    <polygon class="cls-41" points="32.4 51.86 35.7 47.64 36.09 47.64 32.4 52.37 32.4 51.86"/>
+                    <polygon class="cls-42" points="32.4 51.36 35.3 47.64 35.7 47.64 32.4 51.86 32.4 51.36"/>
+                    <polygon class="cls-43" points="32.4 50.86 34.91 47.64 35.3 47.64 32.4 51.36 32.4 50.86"/>
+                    <polygon class="cls-44" points="32.4 50.36 34.52 47.64 34.91 47.64 32.4 50.86 32.4 50.36"/>
+                    <polygon class="cls-45" points="32.4 49.85 34.13 47.64 34.52 47.64 32.4 50.36 32.4 49.85"/>
+                    <polygon class="cls-46" points="32.4 49.35 33.73 47.64 34.13 47.64 32.4 49.85 32.4 49.35"/>
+                    <polygon class="cls-47" points="32.4 48.85 33.34 47.64 33.73 47.64 32.4 49.35 32.4 48.85"/>
+                    <polygon class="cls-48" points="32.4 48.35 32.95 47.64 33.34 47.64 32.4 48.85 32.4 48.35"/>
+                    <polygon class="cls-49" points="32.4 47.85 32.56 47.64 32.95 47.64 32.4 48.35 32.4 47.85"/>
+                    <polygon class="cls-50" points="32.56 47.64 32.4 47.85 32.4 47.64 32.56 47.64"/>
+                </g>
+                <g class="cls-322">
+                    <polygon class="cls-37" points="33.32 64.09 33.65 63.66 33.65 64.09 33.32 64.09"/>
+                    <polygon class="cls-38" points="32.93 64.09 33.65 63.16 33.65 63.66 33.32 64.09 32.93 64.09"/>
+                    <polygon class="cls-39" points="32.53 64.09 33.65 62.66 33.65 63.16 32.93 64.09 32.53 64.09"/>
+                    <polygon class="cls-40" points="32.14 64.09 33.65 62.16 33.65 62.66 32.53 64.09 32.14 64.09"/>
+                    <polygon class="cls-41" points="31.75 64.09 33.65 61.66 33.65 62.16 32.14 64.09 31.75 64.09"/>
+                    <polygon class="cls-42" points="31.36 64.09 33.65 61.16 33.65 61.66 31.75 64.09 31.36 64.09"/>
+                    <polygon class="cls-43" points="30.97 64.09 33.65 60.65 33.65 61.16 31.36 64.09 30.97 64.09"/>
+                    <polygon class="cls-44" points="30.57 64.09 33.65 60.15 33.65 60.65 30.97 64.09 30.57 64.09"/>
+                    <polygon class="cls-45" points="30.18 64.09 33.65 59.65 33.65 60.15 30.57 64.09 30.18 64.09"/>
+                    <polygon class="cls-46" points="29.79 64.09 33.65 59.15 33.65 59.65 30.18 64.09 29.79 64.09"/>
+                    <polygon class="cls-47" points="29.4 64.09 33.65 58.65 33.65 59.15 29.79 64.09 29.4 64.09"/>
+                    <polygon class="cls-48" points="29.01 64.09 33.65 58.14 33.65 58.65 29.4 64.09 29.01 64.09"/>
+                    <polygon class="cls-49" points="28.61 64.09 33.65 57.64 33.65 58.14 29.01 64.09 28.61 64.09"/>
+                    <polygon class="cls-50" points="28.22 64.09 33.65 57.14 33.65 57.64 28.61 64.09 28.22 64.09"/>
+                    <polygon class="cls-51" points="27.83 64.09 33.65 56.64 33.65 57.14 28.22 64.09 27.83 64.09"/>
+                    <polygon class="cls-52" points="27.44 64.09 33.65 56.14 33.65 56.64 27.83 64.09 27.44 64.09"/>
+                    <polygon class="cls-53"
+                             points="27.23 64.09 27.12 64 33.65 55.63 33.65 56.14 27.44 64.09 27.23 64.09"/>
+                    <polygon class="cls-54" points="27.12 64 26.87 63.81 33.65 55.13 33.65 55.63 27.12 64"/>
+                    <polygon class="cls-55" points="26.87 63.81 26.63 63.62 33.65 54.63 33.65 55.13 26.87 63.81"/>
+                    <polygon class="cls-56" points="26.63 63.62 26.39 63.43 33.65 54.13 33.65 54.63 26.63 63.62"/>
+                    <polygon class="cls-57" points="26.39 63.43 26.14 63.24 33.65 53.63 33.65 54.13 26.39 63.43"/>
+                    <polygon class="cls-58" points="26.14 63.24 25.9 63.05 33.65 53.13 33.65 53.63 26.14 63.24"/>
+                    <polygon class="cls-59" points="25.9 63.05 25.66 62.86 33.65 52.62 33.65 53.13 25.9 63.05"/>
+                    <polygon class="cls-60" points="25.66 62.86 25.41 62.67 33.65 52.12 33.65 52.62 25.66 62.86"/>
+                    <polygon class="cls-61" points="25.41 62.67 25.17 62.48 33.65 51.62 33.65 52.12 25.41 62.67"/>
+                    <polygon class="cls-62" points="25.17 62.48 24.93 62.29 33.65 51.12 33.65 51.62 25.17 62.48"/>
+                    <polygon class="cls-63" points="24.93 62.29 24.68 62.1 33.65 50.62 33.65 51.12 24.93 62.29"/>
+                    <polygon class="cls-64" points="24.68 62.1 24.44 61.91 33.65 50.11 33.65 50.62 24.68 62.1"/>
+                    <polygon class="cls-65" points="24.44 61.91 24.2 61.72 33.65 49.61 33.65 50.11 24.44 61.91"/>
+                    <polygon class="cls-66" points="24.2 61.72 23.95 61.53 33.65 49.11 33.65 49.61 24.2 61.72"/>
+                    <polygon class="cls-67" points="23.95 61.53 23.71 61.34 33.65 48.61 33.65 49.11 23.95 61.53"/>
+                    <polygon class="cls-67" points="23.71 61.34 23.46 61.15 33.65 48.11 33.65 48.61 23.71 61.34"/>
+                    <polygon class="cls-68" points="23.46 61.15 23.22 60.96 33.65 47.6 33.65 48.11 23.46 61.15"/>
+                    <polygon class="cls-69" points="23.22 60.96 22.98 60.77 33.65 47.1 33.65 47.6 23.22 60.96"/>
+                    <polygon class="cls-70" points="22.98 60.77 22.73 60.58 33.65 46.6 33.65 47.1 22.98 60.77"/>
+                    <polygon class="cls-71" points="22.73 60.58 22.49 60.39 33.65 46.1 33.65 46.6 22.73 60.58"/>
+                    <polygon class="cls-72" points="22.49 60.39 22.25 60.2 33.65 45.6 33.65 46.1 22.49 60.39"/>
+                    <polygon class="cls-73" points="22.25 60.2 22 60.01 33.65 45.1 33.65 45.6 22.25 60.2"/>
+                    <polygon class="cls-74" points="22 60.01 21.76 59.82 33.65 44.59 33.65 45.1 22 60.01"/>
+                    <polygon class="cls-75"
+                             points="21.76 59.82 21.52 59.63 33.65 44.09 33.65 44.09 33.65 44.59 21.76 59.82"/>
+                    <rect class="cls-76" x="17.61" y="51.61" width="19.71" height="0.31"
+                          transform="translate(-30.24 41.54) rotate(-52)"/>
+                    <rect class="cls-77" x="17.36" y="51.42" width="19.71" height="0.31"
+                          transform="translate(-30.18 41.27) rotate(-52)"/>
+                    <rect class="cls-77" x="17.12" y="51.23" width="19.71" height="0.31"
+                          transform="translate(-30.12 41.01) rotate(-52)"/>
+                    <rect class="cls-78" x="16.88" y="51.04" width="19.71" height="0.31"
+                          transform="translate(-30.07 40.74) rotate(-52)"/>
+                    <rect class="cls-79" x="16.63" y="50.85" width="19.71" height="0.31"
+                          transform="translate(-30.01 40.48) rotate(-52)"/>
+                    <rect class="cls-80" x="16.39" y="50.66" width="19.71" height="0.31"
+                          transform="translate(-29.96 40.21) rotate(-52)"/>
+                    <rect class="cls-81" x="16.15" y="50.47" width="19.71" height="0.31"
+                          transform="translate(-29.9 39.95) rotate(-52)"/>
+                    <rect class="cls-82" x="15.9" y="50.28" width="19.71" height="0.31"
+                          transform="translate(-29.84 39.68) rotate(-52)"/>
+                    <rect class="cls-83" x="15.66" y="50.09" width="19.71" height="0.31"
+                          transform="translate(-29.79 39.42) rotate(-52)"/>
+                    <rect class="cls-83" x="15.42" y="49.9" width="19.71" height="0.31"
+                          transform="translate(-29.73 39.15) rotate(-52)"/>
+                    <rect class="cls-84" x="15.17" y="49.71" width="19.71" height="0.31"
+                          transform="matrix(0.62, -0.79, 0.79, 0.62, -29.67, 38.89)"/>
+                    <rect class="cls-85" x="14.93" y="49.52" width="19.71" height="0.31"
+                          transform="translate(-29.62 38.62) rotate(-52)"/>
+                    <rect class="cls-86" x="14.69" y="49.33" width="19.71" height="0.31"
+                          transform="translate(-29.56 38.36) rotate(-52)"/>
+                    <rect class="cls-87" x="14.44" y="49.14" width="19.71" height="0.31"
+                          transform="translate(-29.5 38.09) rotate(-52)"/>
+                    <rect class="cls-88" x="14.2" y="48.95" width="19.71" height="0.31"
+                          transform="translate(-29.45 37.83) rotate(-52)"/>
+                    <rect class="cls-89" x="13.96" y="48.76" width="19.71" height="0.31"
+                          transform="translate(-29.39 37.56) rotate(-52)"/>
+                    <rect class="cls-89" x="13.71" y="48.57" width="19.71" height="0.31"
+                          transform="translate(-29.34 37.3) rotate(-52)"/>
+                    <rect class="cls-90" x="13.47" y="48.38" width="19.71" height="0.31"
+                          transform="translate(-29.28 37.03) rotate(-52)"/>
+                    <rect class="cls-91" x="13.22" y="48.19" width="19.71" height="0.31"
+                          transform="translate(-29.22 36.77) rotate(-52)"/>
+                    <rect class="cls-92" x="12.98" y="48" width="19.71" height="0.31"
+                          transform="translate(-29.17 36.5) rotate(-52)"/>
+                    <rect class="cls-93" x="12.74" y="47.81" width="19.71" height="0.31"
+                          transform="translate(-29.11 36.24) rotate(-52)"/>
+                    <rect class="cls-94" x="12.49" y="47.62" width="19.71" height="0.31"
+                          transform="translate(-29.05 35.97) rotate(-52)"/>
+                    <rect class="cls-95" x="12.25" y="47.43" width="19.71" height="0.31"
+                          transform="translate(-29 35.71) rotate(-52)"/>
+                    <rect class="cls-96" x="12.01" y="47.24" width="19.71" height="0.31"
+                          transform="translate(-28.94 35.44) rotate(-52)"/>
+                    <rect class="cls-97" x="11.76" y="47.05" width="19.71" height="0.31"
+                          transform="translate(-28.89 35.18) rotate(-52)"/>
+                    <rect class="cls-98" x="11.52" y="46.86" width="19.71" height="0.31"
+                          transform="translate(-28.83 34.91) rotate(-52)"/>
+                    <rect class="cls-99" x="11.28" y="46.67" width="19.71" height="0.31"
+                          transform="translate(-28.77 34.65) rotate(-52)"/>
+                    <rect class="cls-100" x="11.03" y="46.47" width="19.71" height="0.31"
+                          transform="translate(-28.72 34.38) rotate(-52)"/>
+                    <rect class="cls-101" x="10.79" y="46.28" width="19.71" height="0.31"
+                          transform="translate(-28.66 34.12) rotate(-52)"/>
+                    <polygon class="cls-102"
+                             points="14.46 54.11 14.3 53.99 14.3 53.81 26.35 38.39 26.59 38.58 14.46 54.11"/>
+                    <polygon class="cls-103" points="14.3 53.31 26.1 38.2 26.35 38.39 14.3 53.81 14.3 53.31"/>
+                    <polygon class="cls-104" points="14.3 52.8 25.86 38.01 26.1 38.2 14.3 53.31 14.3 52.8"/>
+                    <polygon class="cls-105" points="14.3 52.3 25.62 37.82 25.86 38.01 14.3 52.8 14.3 52.3"/>
+                    <polygon class="cls-106" points="14.3 51.8 25.37 37.63 25.62 37.82 14.3 52.3 14.3 51.8"/>
+                    <polygon class="cls-107" points="14.3 51.3 25.13 37.44 25.37 37.63 14.3 51.8 14.3 51.3"/>
+                    <polygon class="cls-108" points="14.3 50.8 24.89 37.25 25.13 37.44 14.3 51.3 14.3 50.8"/>
+                    <polygon class="cls-109" points="14.3 50.3 24.64 37.06 24.89 37.25 14.3 50.8 14.3 50.3"/>
+                    <polygon class="cls-110" points="14.3 49.79 24.4 36.87 24.64 37.06 14.3 50.3 14.3 49.79"/>
+                    <polygon class="cls-110" points="14.3 49.29 24.16 36.68 24.4 36.87 14.3 49.79 14.3 49.29"/>
+                    <polygon class="cls-111" points="14.3 48.79 23.91 36.49 24.16 36.68 14.3 49.29 14.3 48.79"/>
+                    <polygon class="cls-112" points="14.3 48.29 23.67 36.3 23.91 36.49 14.3 48.79 14.3 48.29"/>
+                    <polygon class="cls-112" points="22.3 35.22 23.67 36.3 14.3 48.29 14.3 35.22 22.3 35.22"/>
+                </g>
+                <path class="cls-31" d="M48.37,62.62c0,.21,0,.43,0,.65h0C48.34,63.05,48.36,62.83,48.37,62.62Z"/>
+                <g class="cls-32">
+                    <path class="cls-31" d="M48.37,62.62c0,.21,0,.43,0,.65h0C48.34,63.05,48.36,62.83,48.37,62.62Z"/>
+                </g>
+                <g class="cls-323">
+                    <polygon class="cls-218" points="48.33 63.13 48.37 63.08 48.37 63.27 48.33 63.27 48.33 63.13"/>
+                    <polygon class="cls-219"
+                             points="48.33 62.67 48.37 62.62 48.37 62.62 48.37 63.08 48.33 63.13 48.33 62.67"/>
+                    <polygon class="cls-220" points="48.37 62.62 48.33 62.67 48.33 62.62 48.37 62.62"/>
+                </g>
+                <path class="cls-31" d="M43.48,59.75c0-.06,0-.13,0-.2s0,.14,0,.2Z"/>
+                <g class="cls-32">
+                    <path class="cls-31" d="M43.48,59.75c0-.06,0-.13,0-.2s0,.14,0,.2Z"/>
+                </g>
+                <g class="cls-324">
+                    <rect class="cls-222" x="43.48" y="59.55" width="0.02" height="0.2"/>
+                </g>
+                <polygon class="cls-31"
+                         points="43.48 59.75 43.48 59.74 43.48 59.74 43.48 59.74 43.48 59.74 43.48 59.75"/>
+                <g class="cls-32">
+                    <polygon class="cls-31"
+                             points="43.48 59.75 43.48 59.74 43.48 59.74 43.48 59.74 43.48 59.74 43.48 59.75"/>
+                </g>
+                <g class="cls-325">
+                    <rect class="cls-191" x="43.48" y="59.74"/>
+                </g>
+                <path class="cls-326"
+                      d="M13.27,31.37l.3.07.17-.7,2,.46.08-.33-2-.46.17-.72-.3-.07Zm1-4.09,1.42,1.16-1.79.43-.09.39,2.31.53.07-.3-1.83-.42,1.77-.42,0-.21-1.4-1.15,1.83.42.07-.3-2.31-.53Z"/>
+                <path class="cls-327"
+                      d="M162.43,157.05a3.74,3.74,0,0,1-.07.86l-.09.64a11.18,11.18,0,0,1-.21,1.29,21.55,21.55,0,0,1-.72,2.53,22.88,22.88,0,0,1-5.73,8.92,29,29,0,0,1-9,6l-1.26.54-1.31.45c-.85.32-1.76.52-2.64.77-1.77.4-3.66.72-5.27,1.05l-5.43,2.17a33.59,33.59,0,0,1-6.33,2.17c-2.15.53-4.33,1-6.5,1.28s-4.36.59-6.53.8c-1.09.11-2.18.19-3.26.26l-.57,0h-.93l-.31-.05-1.6-.23a118.64,118.64,0,0,1-12.77-2.17,26.54,26.54,0,0,1-6-2.44c-1-.51-1.86-1.06-2.76-1.66l-.8-.55-.21-.15s0,.13,0,.19v.28c0,.89,0,1.76.07,2.65l.12,4.61-2-4.18c-.92-1.92-1.81-3.81-2.72-5.68l-.09.12-1,1.29c-.33.42-.71.87-1,.82-.1,0-.18-.09-.26-.13-.17-.63-.37-1.25-.59-1.87a44.06,44.06,0,0,0-.92-8.16c-.18-.86-1.63-6.4-1.84-7.24.14.34.58,1.75,1,3.21l-.11,0c.06.29.13.59.21.88l.17,0c.38,1.25.72,2.37.86,2.66a8.06,8.06,0,0,1,.28,1l.17.82c.13.56.25,1.1.37,1.65.25,1.11.49,2.22.74,3.35l.1.53,0,.11c0,.06,0,0,.06,0l.15-.18L77,174.93l1-1.31.69,1.49,1.43,3c0-.92,0-1.84,0-2.77.79.69,1.63,1.49,2.38,2.07.36.31.79.61,1.11.85l.61.42a4.65,4.65,0,0,0,.41.26l-.45.13c-.08,0-.14.1-.16.23a.28.28,0,0,0,0,.42c.12.11.24.24.22.36s.16.13.23.11l.74-.24.66-.22c.3.18.6.36.91.52a24.29,24.29,0,0,0,5.63,2.32c.91.25,1.85.46,2.79.66a.61.61,0,0,0-.09.14c-.09.16.06.41.35.55s.58.18.65.05a5.11,5.11,0,0,1,.33-.5c2.78.5,5.65.87,8.51,1.31l1.6.24.34.06h.52L108,185c1.07-.06,2.15-.14,3.22-.23l2.49-.25-.16.29c-.08.18.1.43.4.56s.59.09.66-.06l.37-.74.1-.21c.86-.1,1.73-.22,2.58-.34,2.13-.31,4.26-.71,6.34-1.21a31,31,0,0,0,6-2l0,0h0l5.64-2.22c1.94-.37,3.61-.64,5.35-1,.85-.23,1.71-.42,2.53-.72l1.24-.41,1.21-.5a27.55,27.55,0,0,0,8.61-5.65,21.56,21.56,0,0,0,5.46-8.36,19.52,19.52,0,0,0,.7-2.37c.11-.38.13-.8.21-1.2l.09-.61a2.56,2.56,0,0,0,0-.37l-.55-.84a9.55,9.55,0,0,0-.75-.91,7.11,7.11,0,0,0-6.16-2.3,15.93,15.93,0,0,0-4.48,1.12c-1.43.55-2.81,1.28-4.21,1.92s-2.73,1.35-4.07,2c-5.32,2.71-10.3,5.38-15.08,7.48a62.25,62.25,0,0,1-11.29,3.9,2.32,2.32,0,0,0-.74-.23c-.56-.06-.83.2-.79.22a1.78,1.78,0,0,1,.75,0,1.21,1.21,0,0,1,.3.11c-.57.13-1.13.25-1.69.34a33.41,33.41,0,0,1-10.82.2l-1.8-.3a1.21,1.21,0,0,0-.14-.1c-.38-.26-.65-.29-.66-.26s.13.11.31.25c-.58-.14-1.11-.3-1.61-.45l-2.83-.82-.77-.23c0-.08-.06-.12-.08-.12s0,0,0,.09c-.35-.11-.64-.19-.86-.27a2,2,0,0,1-.57-.22l.61.12,1.75.41,2.85.72c.55.14,1.15.3,1.79.45l2.09.29a33.35,33.35,0,0,0,10.65-.41,58.22,58.22,0,0,0,13.23-4.48c4.7-2.14,9.63-4.85,14.94-7.64,1.33-.68,2.68-1.39,4.08-2.06s2.76-1.41,4.27-2a17,17,0,0,1,4.79-1.24,8.35,8.35,0,0,1,7.18,2.62c.28.34.6.65.85,1Z"/>
+                <path class="cls-328"
+                      d="M161.13,157.38a2.56,2.56,0,0,1,0,.37l-.09.61c-.08.4-.1.82-.21,1.2a19.52,19.52,0,0,1-.7,2.37,21.56,21.56,0,0,1-5.46,8.36,27.55,27.55,0,0,1-8.61,5.65l-1.21.5-1.24.41c-.82.3-1.68.49-2.53.72-1.74.38-3.41.65-5.35,1l-5.64,2.22h0l0,0a31,31,0,0,1-6,2c-2.08.5-4.21.9-6.34,1.21-.85.12-1.72.24-2.58.34.23-.45.53-1,.89-1.69s.87-1.72,1.31-2.75a14.49,14.49,0,0,0,.57-1.65,15.06,15.06,0,0,0,.25-1.79,7,7,0,0,0-.45-3.54,7.56,7.56,0,0,0-1.89-2.41,5.52,5.52,0,0,0-1.18-.79,62.25,62.25,0,0,0,11.29-3.9c4.78-2.1,9.76-4.77,15.08-7.48,1.34-.67,2.68-1.36,4.07-2s2.78-1.37,4.21-1.92a15.93,15.93,0,0,1,4.48-1.12,7.11,7.11,0,0,1,6.16,2.3,9.55,9.55,0,0,1,.75.91Z"/>
+                <path class="cls-327"
+                      d="M157.35,12.77a31.32,31.32,0,0,1-.16,3.55,40.83,40.83,0,0,1-1.38,7.26,39.16,39.16,0,0,1-2.64,6.8A15.69,15.69,0,0,1,151.61,33c0-.1,0-.16-.07-.16a1,1,0,0,0,0,.25h0c-.07.08-.11.1-.14.09s.33-1.28.95-3.12a52.23,52.23,0,0,0,1.88-6.82,44.21,44.21,0,0,0,.84-7c.07-1.93,0-3.24,0-3.33s0-.87-.09-2.06S154.6,8,153.43,7.37A5.19,5.19,0,0,0,151,7c-.93,0-1.92.13-2.89.25s-1.93.2-2.81.28l-.33,0h-.54l-.8,0,.69,1.17c.27.43.39.7.33.76s-.29-.14-.66-.48-.86-.85-1.5-1.55l.4.1c.34.11.58.15.62,0s0-.26-.32-.56l-.35-.28,2.29-.43c.86-.18,1.8-.35,2.74-.57s2-.41,3-.52a6.77,6.77,0,0,1,3.37.38,4.49,4.49,0,0,1,2.27,2.48,10.47,10.47,0,0,1,.6,2.4C157.31,11.89,157.35,12.7,157.35,12.77Z"/>
+                <path class="cls-329"
+                      d="M155,12.84c0,.09.1,1.4,0,3.33a44.21,44.21,0,0,1-.84,7A52.23,52.23,0,0,1,152.32,30c-.62,1.84-1.11,3-.95,3.12s.07,0,.14-.09c0,.56,0,1.93-.06,3.29,0,.88-.1,1.78-.18,2.44s-.13,1.13-.13,1.16,0,.49-.14,1.15a19.46,19.46,0,0,1-.36,2.11c0-.15,0-.33,0-.53,0-.52,0-1.13-.07-1.86a14.08,14.08,0,0,0-.74-2.39A8.79,8.79,0,0,0,148.06,36a12,12,0,0,0-2.46-2.17,12.1,12.1,0,0,0-7-1.66,7.56,7.56,0,0,0-3.55,1.45,11.26,11.26,0,0,0-2.62,2.53,9.45,9.45,0,0,0-1.52,3.09c-.32,1-.55,2-.74,2.88-.75,3.59-1,6.06-1,6.21s-.28,2.62-.37,6.25a28.23,28.23,0,0,0,2.38,13.06l.21.4.26.5a1.05,1.05,0,0,0,1.2.56,2.87,2.87,0,0,0,.59-.12,3.3,3.3,0,0,0,.51-.27c.28-.17.51-.35.75-.51,1-.69,1.86-1.4,2.74-2.08,1.73-1.37,3.32-2.7,4.65-3.86,0,0,3.81-3.23,4.5-4.7a3.73,3.73,0,0,0,.16-.43l.68.83c.09.12.18.21.14.19a0,0,0,0,1,0,0h0c-.13.12-.33.27-.55.48a9.86,9.86,0,0,0-1.47,1.91c-.93,1.65-1.91,3.72-3.17,5.66a15.89,15.89,0,0,1-2.06,2.63A13.7,13.7,0,0,1,138,70.59a20,20,0,0,0-2.48,1.56l-.07,0s0,0,0,0a1.9,1.9,0,0,0-.59-.79c-.24-.14-.39-.07-.39,0s.13.09.24.23a2.34,2.34,0,0,1,.31.76c.1.38.2.85.28,1.36a7,7,0,0,0-2,1,6.65,6.65,0,0,0,2.09-.42c0,.22.05.44.07.66a3.93,3.93,0,0,1,0,.91c-.48.25-.76.46-.73.51s.26,0,.66-.12a5.92,5.92,0,0,1-.26.81H135c-1.14.33-2.16.88-2.1,1s.8,0,1.69-.15c-.19.29-.32.45-.32.48a11.77,11.77,0,0,1-.76,1,13.43,13.43,0,0,1-1.95,1.82,4.75,4.75,0,0,1-2.4.77c-.73,0-1.23,0-1.25.1s.48.27,1.24.35a5.16,5.16,0,0,0,1.87-.13l0,.11a9.5,9.5,0,0,0-.92.75,5.53,5.53,0,0,1-2.28,1,8.07,8.07,0,0,1-2.48.06l-.37-.07a4.32,4.32,0,0,0,1-.83,4.55,4.55,0,0,0,.73-1,1.76,1.76,0,0,0,.17-.43c-.11-.11-.45.53-1.21,1.15a6.93,6.93,0,0,1-3.25,1.45,12.54,12.54,0,0,1-3.63.2,7.52,7.52,0,0,1-1.64-.34l-.46-.14a5.79,5.79,0,0,1-1-.49c-.6-.43-1.37-1.09-2.16-1.78.71-.47,1.4-.93,1.93-1.21s1.17-.42,1.17-.51-.55-.13-1.34.09a18.57,18.57,0,0,0-2.38,1.09l-.07-.06-1.91-1.68,1.24-.4c2.65-.87,5.32-1.55,5.32-1.71s-.07,0-.19,0l.81-1.4a3.9,3.9,0,0,0,.51.06l.57,0a.7.7,0,0,0,.4-.07.37.37,0,0,0,.16-.44,1.51,1.51,0,0,0-.46-.65.64.64,0,0,0-.42-.19h0L116,73.7c1.78-.14,2.74-.72,2.65-.84.08.1,1.06-.78,2.31-2.61a22.5,22.5,0,0,0,3.48-8.37,26,26,0,0,0,.29-6,55.56,55.56,0,0,0-.51-6.52,21.08,21.08,0,0,0-2.06-6.68,15.57,15.57,0,0,0-4.65-5.32l0,0,0,0a16.47,16.47,0,0,0-9.8-3.59,49.93,49.93,0,0,0-8.62.94,29.69,29.69,0,0,0-5.93,1.72,23.7,23.7,0,0,0-2.31,1.16,28.42,28.42,0,0,0-2.65,1.87,46.2,46.2,0,0,0-5.55,5.36,48.35,48.35,0,0,0-3.17,4c-.25.37-.5.73-.75,1.11l-.56.82-.35.53-.18.26c-.06.08.1.16.15.25l.82,1,.51.59c.32.34.64.69,1,1.06a86.52,86.52,0,0,0,8.74,8.28,45.79,45.79,0,0,0,5,3.57L95,67c.45.23.9.46,1.35.67.9.43,1.78.8,2.65,1.19,3.47,1.51,6.75,2.87,9.65,3.8.62.2,1.23.39,1.81.53l-.69,2.53a31.53,31.53,0,0,0-4-.66,34.33,34.33,0,0,0-5.28-.12C99,75,98,75.13,98,75.15s-1,.16-2.46.53c-1.24.32-2.78.77-4.34,1.32h0L88.1,75.55c-2.94-1.42-5.67-2.79-8-4C79,70.89,77.91,70.3,77,69.74s-1.61-1-2.3-1.53L72.5,66.68c-.14-.09-1.76-1.15-4.34-2.75l-4.49-2.8L63.45,61s0-.08.1-.12h0l.15-.11.5-.3,1.35-.78,2.85-1.57L62,56.37l-1.84-.47-.57-.13.35-.26.26-.19.74-.49c1.22-.84,2.44-1.66,3.65-2.48l1.18-.79.06,0-.08,0-.18-.07-.33-.13L64.59,51l-2.46-.92-.79-.31-.23-.08a.38.38,0,0,1-.15-.09A.45.45,0,0,1,61,49l.26-.28.29-.35c.2-.23.37-.48.54-.72A12.81,12.81,0,0,0,63,46.14a17.61,17.61,0,0,0,1.24-3A27.19,27.19,0,0,0,65.38,38a19.5,19.5,0,0,0,.07-3.83c1.62,1.42,2.65,2.17,2.77,2s-1.94-2.86-5.07-6.66a58.16,58.16,0,0,1-4.4-7.18l-.27-.51-.06-.13,0-.06-.08-.23c-.13-.34-.24-.7-.36-1.06-.2-.73-.39-1.48-.53-2.25a22.48,22.48,0,0,1-.31-2.31c0-.39,0-.77,0-1.14,0-.19,0-.36,0-.55a2,2,0,0,1,0-.25v-.11a.79.79,0,0,1,.14-.34.76.76,0,0,1,.33-.12l1-.22,1.17-.24c1.58-.29,3.16-.53,4.7-.72s3-.31,4.35-.34a23.57,23.57,0,0,1,3.69.42c2.41.42,4.46.93,5.9,1.29l1.76.45.38-.4c.18-.17.34-.34.5-.52l.31-.33c.33-.34.65-.66,1-1h0a5.22,5.22,0,0,1,.82-.6A1.2,1.2,0,0,1,83.5,11l.41-.32a37.51,37.51,0,0,1,4.43-2.82c.86-.46,1.74-.9,2.66-1.32l.9-.38c.3,0,.62.09,1,.16a21.24,21.24,0,0,1,4.57,1.49,19.46,19.46,0,0,1,2.83,1.61c.49.33,1,.69,1.53,1.07l.81.6c.33.25.66.52,1,.83l.45.4a4,4,0,0,1,1.31.93c.19.28.07-.07.07-.2a4.32,4.32,0,0,1-.06-.47,1.33,1.33,0,0,1,0-.53c-.67-2.22-1.23-4.1-1.7-5.64-.24-.76-.45-1.43-.65-2,.59,0,1.16,0,1.7,0,1.57,0,2.89.15,3.82.23l1.6.14,1,.06.3.28a15.34,15.34,0,0,1,3.87,7.64c.06.33.11.64.14.76s0,0,0,0l.52,0v0c0-4,.15-6.72.31-8.44l1,0a12.42,12.42,0,0,0,1.36,0c.24,0,.5,0,.8,0s.52-.06.77-.1c.8-.14,1.58-.3,2.35-.45a6.1,6.1,0,0,1,.5.51A12,12,0,0,1,125,7.66a9.74,9.74,0,0,1,.43,1,9.15,9.15,0,0,1,.36,1.58c.08.53.15,1.09.23,1.67,0,.29.07.58.12.87l.06.45,0,.23c0,.07,0,0,0,0s.15-.46.27-.87A28.82,28.82,0,0,1,127.92,9a14.6,14.6,0,0,1,1.2-2.14,6.15,6.15,0,0,1,1.27-1.38,12.37,12.37,0,0,1,1.31-.85c.27-.16.51-.28.74-.39a27.09,27.09,0,0,1,3.83,1c1.52.5,2.88,1.1,4,1.53.89.33,1.64.59,2.18.74.64.7,1.14,1.21,1.5,1.55s.6.52.66.48-.06-.33-.33-.76l-.69-1.17.8,0H145l.33,0c.88-.08,1.84-.15,2.81-.28S150.07,7,151,7a5.19,5.19,0,0,1,2.43.4c1.17.59,1.39,2.28,1.49,3.41S155,12.79,155,12.84Zm-1.21-2a5.35,5.35,0,0,0-.17-1.51c0-.1-.43-.07-.88.13l-.5.21h0a10.4,10.4,0,0,0-2.27.68,20.47,20.47,0,0,1-2.33.87,4.6,4.6,0,0,1-.78.16l.89,1.28a2.15,2.15,0,0,1,.42-.63,5.32,5.32,0,0,1,2-1.32,3,3,0,0,1,2-.18,3.53,3.53,0,0,1,.05.38,8.5,8.5,0,0,1-.15,2.54c-.31,1.26-.63,2.56-.73,3.31a5.26,5.26,0,0,0-1.24-1.75,18.77,18.77,0,0,0,1,3.1c.26.75.47,1.52.61,2.11a9.74,9.74,0,0,1,.2,1c0,.06.11.44.17,1a14,14,0,0,1-.07,2.16,18.91,18.91,0,0,0-.18,3.25,9,9,0,0,0,1-3.13,11,11,0,0,0,.32-2.33A8.68,8.68,0,0,0,153,21s-.1-.47-.31-1.08a20.82,20.82,0,0,0-.88-2.14c-.1-.18-.19-.37-.28-.55a23.62,23.62,0,0,0,1.67-3.44A8.77,8.77,0,0,0,153.8,10.88ZM134.06,76.8a1.38,1.38,0,0,0,.09-.67.34.34,0,0,0-.09-.2c-.07-.05-.15,0-.21,0-.27.12-.4.21-.37.24-.11-.12-.22-.19-.26-.14a.68.68,0,0,0-.05.68.62.62,0,0,0,.41.41C133.8,77.2,134,77.05,134.06,76.8Zm-1.35-2.53a1,1,0,0,0,.37-.62.33.33,0,0,0-.06-.22.21.21,0,0,0-.22,0q-.45.15-.45.21c-.11-.11-.23-.19-.25-.16l-.11.14a.94.94,0,0,0-.23.43.34.34,0,0,0,.24.42A.82.82,0,0,0,132.71,74.27Zm-.37,3.6a1.23,1.23,0,0,0,.41-1.09,2.18,2.18,0,0,0-.43-1,3.33,3.33,0,0,0-.74-.71,2.58,2.58,0,0,0-1-.4,6.81,6.81,0,0,0-1.85,0l-.28.06-.19.06-.37.11-.3.08h-.2l-.21,0a1.55,1.55,0,0,0-.52-.07,5,5,0,0,0-.66.09,7.29,7.29,0,0,0-1.23.36,5.94,5.94,0,0,0-.64.31,4.36,4.36,0,0,0-1.4,1.12,3.63,3.63,0,0,0-.88,2.37,3.59,3.59,0,0,0,.33,1.4,1.74,1.74,0,0,0,1.28,1,3.33,3.33,0,0,0,1.46-.16,1.21,1.21,0,0,0,.55.33,3.19,3.19,0,0,0,1.61-.11,5.84,5.84,0,0,0,1.23-.48h0a1,1,0,0,0,.43.14,1.28,1.28,0,0,0,1-.33c.37-.37.64-.71.74-.79.09.07.06,0,.07,0v0a.06.06,0,0,0,0-.08.16.16,0,0,0-.1,0v0a.28.28,0,0,0,.22,0,1,1,0,0,0,.28-.14,1.23,1.23,0,0,0,.42-.54C131.56,78.34,131.78,78.27,132.34,77.87Zm-12.93,3.29a1,1,0,0,0-.45-.86,1.08,1.08,0,0,0-.85-.24c-.12-.11-.25-.16-.28-.11a4.07,4.07,0,0,0-.52.8,1,1,0,0,0,.12,1.1,1.31,1.31,0,0,0,2-.69ZM74.86,19.56c1-1.06,2.15-2,2.07-2.1s-.35.05-.79.28l0,0a4.55,4.55,0,0,0-2.05-1.64,7.6,7.6,0,0,0-4.63-.15c-2.81.61-5.75.9-5.75,1.3s2.94.66,6,.48a6,6,0,0,1,3.4.49,2.36,2.36,0,0,1,.71.58,2.62,2.62,0,0,1,.17.28s.1,0,.23,0a14,14,0,0,0-1.45,1.34c-.41.42-.66.74-.68.76s-.24.35-.54.85a11.32,11.32,0,0,0-.88,2A6.84,6.84,0,0,0,70.27,26c0,.58.1.95.17.94s.29-1.45,1-2.72a10.19,10.19,0,0,1,1-1.68l.57-.74s.22-.33.56-.76A17,17,0,0,1,74.86,19.56Z"/>
+                <path class="cls-327"
+                      d="M154.41,48l-.39.59c-.45.65-1.1,1.55-1.87,2.58l-1.23,1.63-.64.86A3.21,3.21,0,0,0,150,54l.28.14.83.48c1,.58,2,1.17,2.93,1.73L149.6,57.8s-.46-.47-.91-.95l-.37,1.36,1.28-.41h0c-.06.27-.11.48-.15.62s0,0,0,.08l-.17.7-.17.11a3.73,3.73,0,0,0-.46.28,3.67,3.67,0,0,0-.42.34,7.6,7.6,0,0,0-1.28,1.51c-.91,1.44-2.09,3.6-3.54,5.52A14.81,14.81,0,0,1,141,69.61a7.27,7.27,0,0,1-1.39.92l-1.28.66a7.32,7.32,0,0,1-2.81,1A20,20,0,0,1,138,70.59a13.7,13.7,0,0,0,2.35-1.71,15.89,15.89,0,0,0,2.06-2.63c1.26-1.94,2.24-4,3.17-5.66A9.86,9.86,0,0,1,147,58.68c.22-.21.42-.36.55-.48h0a0,0,0,0,0,0,0s-.05-.07-.14-.19l-.68-.83c0-.08.08-.18.12-.29l.91-.26,2-.55.51-.14h.09l.26,0-.26-.23c-.72-.46-1.43-.93-2.14-1.4l1.16-1.35.72-.81c.48-.52.94-1,1.36-1.51l1.75-1.89.66-.08-.22-.37c-.14.14-.28.3-.44.45a39.61,39.61,0,0,1-4.06.2c.23-.08,3.89-.46,4.61-.72Z"/>
+                <path class="cls-330" d="M153.68,48.24l.22.37-.66.08C153.4,48.54,153.54,48.38,153.68,48.24Z"/>
+                <path class="cls-327"
+                      d="M153.63,9.37a5.35,5.35,0,0,1,.17,1.51,8.77,8.77,0,0,1-.57,2.95,23.62,23.62,0,0,1-1.67,3.44c-.09-.15-.17-.31-.25-.46h0c.1-.75.42-2.05.73-3.31a8.5,8.5,0,0,0,.15-2.54,3.53,3.53,0,0,0-.05-.38.52.52,0,0,1,.15.07.46.46,0,0,1,.16.14l-.13.08v0h0l.11-.07a.13.13,0,0,1,0,.06,1.68,1.68,0,0,1,.19-.19l-.2.13,0-.05,1.24-.67a1.36,1.36,0,0,0-1.2-.42l-.24,0,.5-.21C153.2,9.3,153.61,9.27,153.63,9.37Z"/>
+                <path class="cls-327"
+                      d="M153.69,10.11l-1.24.67a.46.46,0,0,0-.16-.14.52.52,0,0,0-.15-.07,5,5,0,0,0-.18-.68s.1-.09.27-.18h0l.24,0A1.36,1.36,0,0,1,153.69,10.11Z"/>
+                <path class="cls-327"
+                      d="M153.12,22.18a11,11,0,0,1-.32,2.33,9,9,0,0,1-1,3.13,18.91,18.91,0,0,1,.18-3.25,14,14,0,0,0,.07-2.16c-.06-.53-.17-.91-.17-1a9.74,9.74,0,0,0-.2-1c-.14-.59-.35-1.36-.61-2.11a18.77,18.77,0,0,1-1-3.1,5.26,5.26,0,0,1,1.24,1.75h0c-.06.38-.06.62,0,.65s.12,0,.23-.19c.09.18.18.37.28.55a20.82,20.82,0,0,1,.88,2.14c.21.61.29,1.05.31,1.08A8.68,8.68,0,0,1,153.12,22.18Z"/>
+                <path class="cls-327" d="M152.47,10.83l.2-.13a1.68,1.68,0,0,0-.19.19A.13.13,0,0,0,152.47,10.83Z"/>
+                <path class="cls-331" d="M152.45,10.78l0,.05-.11.07h0v0Z"/>
+                <path class="cls-327"
+                      d="M152.23,9.71c-.17.09-.27.14-.27.18a5,5,0,0,1,.18.68,3,3,0,0,0-2,.18,5.32,5.32,0,0,0-2,1.32,2.15,2.15,0,0,0-.42.63l-.89-1.28a4.6,4.6,0,0,0,.78-.16,20.47,20.47,0,0,0,2.33-.87A10.4,10.4,0,0,1,152.23,9.71Z"/>
+                <path class="cls-329"
+                      d="M153.24,48.69l-1.75,1.89c-.42.48-.88,1-1.36,1.51l-.72.81-1.16,1.35-.5-.14c.51-1.75,1.05-3.78,1.43-5.22A39.61,39.61,0,0,0,153.24,48.69Z"/>
+                <path class="cls-327"
+                      d="M151.86,36.35c0,.89,0,1.8-.05,2.47s-.09,1.16-.09,1.19-.05.49-.19,1.16A21.8,21.8,0,0,1,151,43.6c-.26.87-.57,1.7-.82,2.32a4.22,4.22,0,0,1-.46,1c-.08,0,.37-1.44.76-3,0,.23.08.34.11.34a3.08,3.08,0,0,0,.07-1.08,19.46,19.46,0,0,0,.36-2.11c.1-.66.13-1.12.14-1.15s.06-.48.13-1.16.14-1.56.18-2.44c.06-1.36,0-2.73.06-3.29h0a.29.29,0,0,0,.1-.09A22.54,22.54,0,0,1,151.86,36.35Z"/>
+                <path class="cls-327"
+                      d="M150.62,76c.77.33,1.23.65,1.18.72a5.48,5.48,0,0,1-1.33-.28c-.78-.19-1.84-.37-2.91-.52s-2.15-.27-3-.34l-1.43-.12-1.4-.16a9.05,9.05,0,0,0-2.87.07,20.89,20.89,0,0,0-2.55.6,5.23,5.23,0,0,0,0-.56,16.42,16.42,0,0,1,2.38-.84,9.32,9.32,0,0,1,1.64-.32,9.2,9.2,0,0,1,1.47,0c.85,0,1.42.07,1.45.07s.61.07,1.44.21,1.92.34,3,.6A19.74,19.74,0,0,1,150.62,76Z"/>
+                <path class="cls-331" d="M151.61,33a.29.29,0,0,1-.1.09,1,1,0,0,1,0-.25S151.59,32.85,151.61,33Z"/>
+                <path class="cls-327"
+                      d="M151.31,16.81c.08.15.16.31.25.46-.11.15-.19.21-.23.19S151.25,17.19,151.31,16.81Z"/>
+                <path class="cls-329"
+                      d="M150.65,55.88l-.26,0h-.09l-.51.14-2,.55-.91.26c.23-.67.53-1.67.84-2.77l.5.14c.71.47,1.42.94,2.14,1.4Z"/>
+                <path class="cls-327"
+                      d="M150.63,42.67c0,.2,0,.38,0,.53l-.06.29-.12.45c-.05-.27-.11-.7-.18-1.25s-.15-1.11-.24-1.82a15.8,15.8,0,0,0-.83-2.15,8.4,8.4,0,0,0-1.74-2.09,12.16,12.16,0,0,0-2.37-1.92,11.18,11.18,0,0,0-6.37-1.26,6.3,6.3,0,0,0-2.86,1.31,9.49,9.49,0,0,0-2.23,2.29,7.85,7.85,0,0,0-1.23,2.68.85.85,0,0,0,0,.17,6,6,0,0,0-1.27,1.15c.06,0,.37-.27,1.13-.63a.29.29,0,0,0,0,.09c-1.53,1.35-2,3.16-2.15,7.17a20.43,20.43,0,0,0,.43,6.41h0c0,.18,0,.38,0,.58,0,.64-.07,1.32-.07,2a.48.48,0,0,0-.27.32.55.55,0,0,0,.27.61,26.75,26.75,0,0,0,.23,3,24.54,24.54,0,0,0,1.73,6.51l.18.39.13.28a.17.17,0,0,0,.22.13,1.35,1.35,0,0,0,.27-.06c.07,0,.12-.05.25-.13l.72-.45c.95-.63,1.87-1.3,2.77-1.94,1.77-1.29,3.42-2.53,4.81-3.61s2.53-2,3.31-2.64l1-1.26c.62-.77.82-2.67,1.76-4.81.11-.27.24-.57.35-.89.4-1,.77-2.27,1.06-3.28h0c-.38,1.44-.92,3.47-1.43,5.22-.31,1.1-.61,2.1-.84,2.77l-.28.09.16.2a3.73,3.73,0,0,1-.16.43c-.69,1.47-4.5,4.7-4.5,4.7-1.33,1.16-2.92,2.49-4.65,3.86-.88.68-1.77,1.39-2.74,2.08-.24.16-.47.34-.75.51a3.3,3.3,0,0,1-.51.27,2.87,2.87,0,0,1-.59.12,1.05,1.05,0,0,1-1.2-.56l-.26-.5-.21-.4a28.23,28.23,0,0,1-2.38-13.06c.09-3.63.36-6.1.37-6.25s.24-2.62,1-6.21c.19-.89.42-1.86.74-2.88a9.45,9.45,0,0,1,1.52-3.09,11.26,11.26,0,0,1,2.62-2.53,7.56,7.56,0,0,1,3.55-1.45,12.1,12.1,0,0,1,7,1.66A12,12,0,0,1,148.06,36a8.79,8.79,0,0,1,1.76,2.38,14.08,14.08,0,0,1,.74,2.39C150.6,41.54,150.62,42.15,150.63,42.67Z"/>
+                <path class="cls-330" d="M150.64,43.2a3.08,3.08,0,0,1-.07,1.08s-.07-.11-.11-.34l.12-.45Z"/>
+                <path class="cls-328"
+                      d="M150.28,42.69c.07.55.13,1,.18,1.25-.39,1.55-.84,3-.76,3v0h0l-.05.18c0,.07,0,.14,0,.23s0,.12-.05.18l-.14.51c0,.1-.05.21-.08.31s-.06.22-.09.34,0,0,0,0a.3.3,0,0,1,0,.11s0,0,0,0c-.29,1-.66,2.24-1.06,3.28l-2.4-.19a13.25,13.25,0,0,0,.26-3.76,8.19,8.19,0,0,0-1.13-3.58,22.59,22.59,0,0,0-2-3,7.62,7.62,0,0,0-2.61-2.15,8.87,8.87,0,0,0-7.29,0,5.86,5.86,0,0,0-.56.36.85.85,0,0,1,0-.17,7.85,7.85,0,0,1,1.23-2.68,9.49,9.49,0,0,1,2.23-2.29,6.3,6.3,0,0,1,2.86-1.31,11.18,11.18,0,0,1,6.37,1.26,12.16,12.16,0,0,1,2.37,1.92,8.4,8.4,0,0,1,1.74,2.09,15.8,15.8,0,0,1,.83,2.15C150.13,41.58,150.2,42.19,150.28,42.69Z"/>
+                <path class="cls-330" d="M149.19,48.85a.06.06,0,0,1,0,0h0S149.18,48.86,149.19,48.85Z"/>
+                <path class="cls-327" d="M149.6,57.8l-1.28.41.37-1.36C149.14,57.33,149.55,57.76,149.6,57.8Z"/>
+                <path class="cls-327"
+                      d="M149,73.11c0,.24-2-.17-3.95-.19a18.51,18.51,0,0,0-2.69.1c-.74.07-1.23.18-1.26.18s-.54,0-1.28.16-1.72.27-2.68.49c-.37.07-.72.16-1.06.24-.07-.23-.13-.46-.2-.68l1-.36a27.86,27.86,0,0,1,2.7-.75c.75-.17,1.27-.27,1.31-.27s.56-.07,1.35-.09a18.09,18.09,0,0,1,2.83.15A13.08,13.08,0,0,1,149,73.11Z"/>
+                <path class="cls-328"
+                      d="M145.71,52l2.4.19c-.11.32-.24.62-.35.89-.94,2.14-1.14,4-1.76,4.81l-1,1.26c-.78.64-1.93,1.57-3.31,2.64s-3,2.32-4.81,3.61c-.9.64-1.82,1.31-2.77,1.94l-.72.45c-.13.08-.18.09-.25.13a1.35,1.35,0,0,1-.27.06.17.17,0,0,1-.22-.13l-.13-.28-.18-.39a24.54,24.54,0,0,1-1.73-6.51,26.75,26.75,0,0,1-.23-3,.83.83,0,0,0,.3.13,7.51,7.51,0,0,0,1.94.08,26.18,26.18,0,0,0,4.52-.76,23.93,23.93,0,0,0,5.92-2.39,11.29,11.29,0,0,0,1.49-1.06,4.79,4.79,0,0,0,.67-.68.82.82,0,0,0,.17-.2c.06-.09.12-.21.16-.28S145.67,52.13,145.71,52Z"/>
+                <path class="cls-330" d="M146.63,57l.28-.09c0,.11-.09.21-.12.29Z"/>
+                <path class="cls-327"
+                      d="M146,48.22a13.25,13.25,0,0,1-.26,3.76c0,.15-.09.32-.15.49s-.1.19-.16.28a.82.82,0,0,1-.17.2,4.79,4.79,0,0,1-.67.68,11.29,11.29,0,0,1-1.49,1.06,23.93,23.93,0,0,1-5.92,2.39,26.18,26.18,0,0,1-4.52.76,7.51,7.51,0,0,1-1.94-.08.83.83,0,0,1-.3-.13q0-.48,0-.93a.71.71,0,0,1,.52-.1,5.4,5.4,0,0,0,1.44.11h0a4.71,4.71,0,0,0,3.06.41,5.78,5.78,0,0,0,3.14-1.56,20.54,20.54,0,0,0,4-1.71,9.69,9.69,0,0,0,1.36-.94,4,4,0,0,0,.6-.56l.12-.13.05-.12a1.28,1.28,0,0,0,.13-.36,12.37,12.37,0,0,0,.31-3.46c-.08-2.33-1.54-4.38-2.84-6.2A7,7,0,0,0,140,40a7.4,7.4,0,0,0-2.71-.79,5.28,5.28,0,0,0-.89,0h0a3.27,3.27,0,0,0-2.7.27,8.12,8.12,0,0,0-1.24.84h0l-.16.08c0-.18.09-.35.14-.52a5.86,5.86,0,0,1,.56-.36,8.87,8.87,0,0,1,7.29,0,7.62,7.62,0,0,1,2.61,2.15,22.59,22.59,0,0,1,2,3A8.19,8.19,0,0,1,146,48.22Z"/>
+                <path class="cls-332"
+                      d="M145.15,48.28a12.37,12.37,0,0,1-.31,3.46,1.28,1.28,0,0,1-.13.36l-.05.12-.12.13a4,4,0,0,1-.6.56,9.69,9.69,0,0,1-1.36.94,20.54,20.54,0,0,1-4,1.71,10.5,10.5,0,0,0,3-7.37c.17-3.84-2.37-8.07-5.2-9a5.28,5.28,0,0,1,.89,0A7.4,7.4,0,0,1,140,40a7,7,0,0,1,2.34,2C143.61,43.9,145.07,46,145.15,48.28Z"/>
+                <path class="cls-330" d="M143.19,7.06c.28.3.37.48.32.56s-.28.06-.62,0l-.4-.1L142,6.94l.84-.16Z"/>
+                <path class="cls-327"
+                      d="M142.84,6.78l-.84.16.49.53c-.54-.15-1.29-.41-2.18-.74-1.16-.43-2.52-1-4-1.53a27.09,27.09,0,0,0-3.83-1,5.3,5.3,0,0,1,1.61-.56l-.76-1.94,0-.1a24.48,24.48,0,0,1,3.8,1.55A38.61,38.61,0,0,1,141,5.46C141.75,6,142.39,6.43,142.84,6.78Z"/>
+                <path class="cls-327"
+                      d="M139.83,77.48c1.08.46,2,1.11,2,1.26a9.81,9.81,0,0,1-2.23-.48c-.54-.13-1.09-.23-1.51-.3s-.64-.06-.67-.06a6.77,6.77,0,0,0-.68-.07q-.34,0-.78,0h0a5.85,5.85,0,0,0,.32-1,7,7,0,0,1,1.25-.07l.24,0c.13,0,.35.08.57.14A13.69,13.69,0,0,1,139.83,77.48Z"/>
+                <path class="cls-333"
+                      d="M136.37,39.23c2.83.89,5.37,5.12,5.2,9a10.5,10.5,0,0,1-3,7.37c-.58.19-1.14.35-1.69.48a26.87,26.87,0,0,1-4.33.67h-.19a4.14,4.14,0,0,1-1.86-2.61h0c.18-3.25.46-5.4.47-5.53s.19-2.59.82-6.08c.11-.63.26-1.3.43-2a1,1,0,0,1,.18-.17h0l.07,0a10.76,10.76,0,0,1,3.87-1.08Z"/>
+                <path class="cls-327"
+                      d="M136.87,56c.55-.13,1.11-.29,1.69-.48a5.78,5.78,0,0,1-3.14,1.56,4.71,4.71,0,0,1-3.06-.41h.18A26.87,26.87,0,0,0,136.87,56Z"/>
+                <path class="cls-327"
+                      d="M136.34,75.4a5.23,5.23,0,0,1,0,.56l-1,.28c0-.12.05-.26.07-.39C135.68,75.7,136,75.56,136.34,75.4Z"/>
+                <path class="cls-327"
+                      d="M136.27,74.85a3.31,3.31,0,0,1,.07.55c-.35.16-.66.3-.92.45a3.93,3.93,0,0,0,0-.91c0-.22,0-.44-.07-.66l.73-.19C136.17,74.34,136.22,74.59,136.27,74.85Z"/>
+                <path class="cls-327"
+                      d="M136.34,76a5.67,5.67,0,0,1-.1.84,8.84,8.84,0,0,0-1.15.25,5.92,5.92,0,0,0,.26-.81Z"/>
+                <path class="cls-327"
+                      d="M136.24,76.8a5.85,5.85,0,0,1-.32,1h0l-.73,0-.57.07c.09-.15.21-.34.31-.55l.16-.34A8.84,8.84,0,0,1,136.24,76.8Z"/>
+                <path class="cls-327" d="M135.91,73.41c.07.22.13.45.2.68l-.73.19a4.22,4.22,0,0,0-.1-.62Z"/>
+                <path class="cls-327"
+                      d="M135.91,73.41l-.63.25c-.08-.51-.18-1-.28-1.36a2.34,2.34,0,0,0-.31-.76c-.11-.14-.25-.17-.24-.23s.15-.09.39,0a1.9,1.9,0,0,1,.59.79s0,0,0,0A9.6,9.6,0,0,1,135.91,73.41Z"/>
+                <path class="cls-327"
+                      d="M133.64,39.5a3.27,3.27,0,0,1,2.7-.27,10.76,10.76,0,0,0-3.87,1.08l-.07,0A8.12,8.12,0,0,1,133.64,39.5Z"/>
+                <path class="cls-327"
+                      d="M135.19,77.87l.73,0a7.75,7.75,0,0,1-.67,1.25,9.56,9.56,0,0,1-.92,1A12.48,12.48,0,0,1,132,81.91a3.46,3.46,0,0,1-1,.39,5.16,5.16,0,0,1-1.87.13c-.76-.08-1.24-.27-1.24-.35s.52,0,1.25-.1a4.75,4.75,0,0,0,2.4-.77,13.43,13.43,0,0,0,1.95-1.82,11.77,11.77,0,0,0,.76-1s.13-.19.32-.48Z"/>
+                <path class="cls-327"
+                      d="M135.42,75.85c0,.13,0,.27-.07.39-.4.11-.64.17-.66.12S134.94,76.1,135.42,75.85Z"/>
+                <path class="cls-327"
+                      d="M135.28,73.66a4.22,4.22,0,0,1,.1.62,6.65,6.65,0,0,1-2.09.42A7,7,0,0,1,135.28,73.66Z"/>
+                <path class="cls-327" d="M135.09,77.05l-.16.34c-.1.21-.22.4-.31.55-.89.12-1.64.28-1.69.15s1-.7,2.1-1Z"/>
+                <path class="cls-327"
+                      d="M134.15,76.13a1.38,1.38,0,0,1-.09.67c-.11.25-.26.4-.48.37a.62.62,0,0,1-.41-.41.68.68,0,0,1,.05-.68s.15,0,.26.14c-.22.2,0,.76.21.72s.41-1,.25-.91-.46.19-.46.19.1-.12.37-.24c.06,0,.14-.1.21,0A.34.34,0,0,1,134.15,76.13Z"/>
+                <path class="cls-327"
+                      d="M133.29,1.72l.76,1.94a5.3,5.3,0,0,0-1.61.56L131.21,4l-.64-.11.46-.41A18.56,18.56,0,0,1,133.29,1.72Z"/>
+                <path class="cls-327"
+                      d="M133.5,76.24a1,1,0,0,0,.11.14l0,0,0,0,0,0s0,.14.1,0a.53.53,0,0,0,.07-.15.24.24,0,0,0,0-.12s-.05,0-.07,0A.8.8,0,0,1,133.5,76.24Zm.44-.21c.16,0,0,.87-.25.91s-.43-.52-.21-.72C133.48,76.22,133.78,76.08,133.94,76Z"/>
+                <path class="cls-327"
+                      d="M133.83,76.24a.24.24,0,0,1,0,.12.53.53,0,0,1-.07.15c-.06.1-.12,0-.1,0l0,0,0,0,0,0a1,1,0,0,1-.11-.14.8.8,0,0,0,.26,0S133.82,76.21,133.83,76.24Z"/>
+                <path class="cls-327"
+                      d="M133.32,1.62l0,.1A18.56,18.56,0,0,0,131,3.49l-.46.41-.79-.12-.71-.11a5.07,5.07,0,0,0-.56,0,16.14,16.14,0,0,0-2.62.2c-.56.08-1.1.18-1.64.28l0,0A8.45,8.45,0,0,0,123,2.33a2.4,2.4,0,0,0-.81-.54L122,.66c1.11-.13,2.3-.26,3.51-.32a17.29,17.29,0,0,1,3.27.09,7.39,7.39,0,0,1,.89.18l.72.18,1.4.39C132.33,1.31,132.83,1.47,133.32,1.62Z"/>
+                <path class="cls-327"
+                      d="M133.08,73.65a1,1,0,0,1-.37.62.82.82,0,0,1-.71.16.34.34,0,0,1-.24-.42.94.94,0,0,1,.23-.43l.11-.14s.14,0,.25.16c-.48.48-.42.7,0,.6s.81-.82.41-.7l-.41.1s.15-.11.45-.21a.21.21,0,0,1,.22,0A.33.33,0,0,1,133.08,73.65Z"/>
+                <path class="cls-327"
+                      d="M132.76,73.5c.4-.12,0,.62-.41.7s-.48-.12,0-.6a1,1,0,0,1,.19.23l-.07,0c-.06,0,0,.1.07,0a.36.36,0,0,0,.13-.12c.08-.07.05-.19,0-.16s-.28,0-.29,0Z"/>
+                <path class="cls-327"
+                      d="M132.75,76.78a1.23,1.23,0,0,1-.41,1.09c-.56.4-.78.47-.94,1.33a1.23,1.23,0,0,1-.42.54,1,1,0,0,1-.28.14.28.28,0,0,1-.22,0,0,0,0,0,1,0-.05,1.61,1.61,0,0,1,.1-.36.36.36,0,0,0,0-.2c0-.09-.09,0-.06-.4,0-.09,0-.06,0-.07h-.08l-.15,0a1.18,1.18,0,0,0-.25.1c-.14,0-.23.06-.24,0s.05-.08.17-.18a1,1,0,0,1,.68-.25c.16.16,0,.37,0,.54s.1,0,.14,0a.71.71,0,0,0,.15-.15.59.59,0,0,0,.12-.37v-.06a.68.68,0,0,1,0-.15.7.7,0,0,1,.08-.16,1.74,1.74,0,0,1,.13-.2,2.13,2.13,0,0,1,.33-.34l.31-.26c.26-.23.14-.68-.19-1.08a2.22,2.22,0,0,0-.58-.48,1.52,1.52,0,0,0-.66-.22,5.82,5.82,0,0,0-1.56,0l-.1,0-.2.07-.37.13-.41.13a2.48,2.48,0,0,1-1-.07s0,0-.11,0a4.37,4.37,0,0,0-.48.08,8.48,8.48,0,0,0-1,.35,4.54,4.54,0,0,0-1.67,1.05,2.62,2.62,0,0,0-.71,1.68,2.45,2.45,0,0,0,.18,1,.84.84,0,0,0,.63.56,3.06,3.06,0,0,0,2.11-.52,4.5,4.5,0,0,0,.45-.31l.2-.17s.08-.07.11-.11.14-.17.11-.27-.12-.14-.2-.17a2.25,2.25,0,0,0-.72-.06.75.75,0,0,0-.52.18,1.22,1.22,0,0,0-.22.34c-.06.09-.12.11-.13.1s0-.06,0-.14a1.09,1.09,0,0,1,.14-.45,1,1,0,0,1,.67-.37,2.43,2.43,0,0,1,1,0,.72.72,0,0,1,.51.37.75.75,0,0,1-.14.68,3.09,3.09,0,0,1-.23.31l-.23.23a3.28,3.28,0,0,1-.49.4,4.87,4.87,0,0,1-.59.36.79.79,0,0,1-.27-.26s-.16,0-.28.11-.21.21-.19.24l.15.17a3.33,3.33,0,0,1-1.46.16,1.74,1.74,0,0,1-1.28-1,3.59,3.59,0,0,1-.33-1.4,3.63,3.63,0,0,1,.88-2.37,4.36,4.36,0,0,1,1.4-1.12,5.94,5.94,0,0,1,.64-.31,7.29,7.29,0,0,1,1.23-.36,5,5,0,0,1,.66-.09,1.55,1.55,0,0,1,.52.07l.21,0h.2l.3-.08.37-.11.19-.06.28-.06a6.81,6.81,0,0,1,1.85,0,2.58,2.58,0,0,1,1,.4,3.33,3.33,0,0,1,.74.71A2.18,2.18,0,0,1,132.75,76.78Z"/>
+                <path class="cls-327"
+                      d="M132.64,73.64c.08,0,.11.09,0,.16a.36.36,0,0,1-.13.12c-.08,0-.13,0-.07,0l.07,0a1,1,0,0,0-.19-.23S132.52,73.64,132.64,73.64Z"/>
+                <path class="cls-327"
+                      d="M131.21,4l1.23.21c-.23.11-.47.23-.74.39a12.37,12.37,0,0,0-1.31.85,6.15,6.15,0,0,0-1.27,1.38A14.6,14.6,0,0,0,127.92,9a28.82,28.82,0,0,0-1.34,3.58c-.12.41-.25.8-.27.87s0,.07,0,0l0-.23-.06-.45c-.05-.29-.08-.58-.12-.87-.08-.58-.15-1.14-.23-1.67a9.15,9.15,0,0,0-.36-1.58,9.74,9.74,0,0,0-.43-1,12,12,0,0,0-1.84-2.74,6.1,6.1,0,0,0-.5-.51c.52-.11,1-.22,1.55-.31a22.07,22.07,0,0,1,1.49,3.12,10.71,10.71,0,0,1,.36,1.09,4.62,4.62,0,0,1,.19.88l.09,1c0,.19.05.37.07.56l0,.28v.15c0,.06,0,0,0-.07s.07-.24.15-.46c.26-.76.53-1.49.76-2.09a22.47,22.47,0,0,1,1.1-2.25,8.4,8.4,0,0,1,1.29-1.72c.26-.26.51-.5.74-.71Z"/>
+                <path class="cls-332" d="M132.23,40.42l.16-.08a1,1,0,0,0-.18.17A.29.29,0,0,1,132.23,40.42Z"/>
+                <path class="cls-327"
+                      d="M132.37,39.9c-.05.17-.1.34-.14.52-.76.36-1.07.63-1.13.63A6,6,0,0,1,132.37,39.9Z"/>
+                <path class="cls-332"
+                      d="M132.35,56.71a5.4,5.4,0,0,1-1.44-.11.71.71,0,0,0-.52.1c0-.7,0-1.38.07-2,0-.2,0-.4,0-.58A4.14,4.14,0,0,0,132.35,56.71Z"/>
+                <path class="cls-327"
+                      d="M132.48,107.45a1,1,0,0,1-.25.63,2.11,2.11,0,0,1-.44.37,2.92,2.92,0,0,1-.85.48,1.55,1.55,0,0,1-.71.06.52.52,0,0,0,0-.11,1.53,1.53,0,0,0,.61-.16,3.67,3.67,0,0,0,.73-.53c.26-.22.5-.46.47-.74a3.73,3.73,0,0,0-.83-1.65,1.22,1.22,0,0,0-.63-.42s-.06-.1-.06-.22v-.07c0-.16.08-.29.17-.28a2.66,2.66,0,0,1,.32.13,1.81,1.81,0,0,1,.6.51,3.52,3.52,0,0,1,.52.87A2.82,2.82,0,0,1,132.48,107.45Z"/>
+                <path class="cls-329"
+                      d="M132.06,107.45c0,.28-.21.52-.47.74a3.67,3.67,0,0,1-.73.53,1.53,1.53,0,0,1-.61.16c.06-.39.12-.75.15-1.09a12.75,12.75,0,0,0,.09-1.78,8,8,0,0,0,0-.85h0c0,.12,0,.22.06.22a1.22,1.22,0,0,1,.63.42A3.73,3.73,0,0,1,132.06,107.45Z"/>
+                <path class="cls-327"
+                      d="M132.21,40.51c-.17.67-.32,1.34-.43,2-.63,3.49-.79,5.93-.82,6.08s-.29,2.28-.47,5.53a20.43,20.43,0,0,1-.43-6.41C130.24,43.67,130.68,41.86,132.21,40.51Z"/>
+                <path class="cls-334"
+                      d="M131.69,76.29c.33.4.45.85.19,1.08l-.31.26a2.13,2.13,0,0,0-.33.34,1.74,1.74,0,0,0-.13.2.7.7,0,0,0-.08.16.68.68,0,0,0,0,.15v.06a.59.59,0,0,1-.12.37.71.71,0,0,1-.15.15s-.14.1-.14,0,.19-.38,0-.54a1,1,0,0,0-.68.25c-.12.1-.18.16-.17.18s.1,0,.24,0a1.18,1.18,0,0,1,.25-.1l.15,0h.08s0,0,0,.07c0,.36.09.31.06.4a.36.36,0,0,1,0,.2,1.61,1.61,0,0,0-.1.36,0,0,0,0,0,0,.05v0c-.1,0-.17.06-.26.09s-.47.35-.7.49a1,1,0,0,1-.77.22.28.28,0,0,0,.09-.26c-.05-.15-.16-.14-.17-.13a.49.49,0,0,1,.05.16c0,.07-.13.16-.31.23a6,6,0,0,1-1.39.39,2.88,2.88,0,0,1-1.35,0,.27.27,0,0,1-.13-.07,4.87,4.87,0,0,0,.59-.36,3.28,3.28,0,0,0,.49-.4l.23-.23a3.09,3.09,0,0,0,.23-.31.75.75,0,0,0,.14-.68.72.72,0,0,0-.51-.37,2.43,2.43,0,0,0-1,0,1,1,0,0,0-.67.37,1.09,1.09,0,0,0-.14.45c0,.08-.05.13,0,.14s.07,0,.13-.1a1.22,1.22,0,0,1,.22-.34.75.75,0,0,1,.52-.18,2.25,2.25,0,0,1,.72.06c.08,0,.18.07.2.17s0,.2-.11.27-.08.07-.11.11l-.2.17a4.5,4.5,0,0,1-.45.31,3.06,3.06,0,0,1-2.11.52.84.84,0,0,1-.63-.56,2.45,2.45,0,0,1-.18-1,2.62,2.62,0,0,1,.71-1.68,4.54,4.54,0,0,1,1.67-1.05,8.48,8.48,0,0,1,1-.35,4.37,4.37,0,0,1,.48-.08c.09,0,.08,0,.11,0a2.48,2.48,0,0,0,1,.07l.41-.13.37-.13.2-.07.1,0a5.82,5.82,0,0,1,1.56,0,1.52,1.52,0,0,1,.66.22A2.22,2.22,0,0,1,131.69,76.29Z"/>
+                <path class="cls-327"
+                      d="M131.81,95.65a5.22,5.22,0,0,1-.14,1.26c-.18.7-.46,1.44-.68,2.26-.3,1-.52,2-.68,2.67,0-.3-.08-.65-.14-1s-.08-.49-.13-.75.08-.71.14-1.09c.11-.83.35-1.73.44-2.29a3.69,3.69,0,0,0,0-.69,1.46,1.46,0,0,0,0-.26,1.53,1.53,0,0,0-.2-.78,3.22,3.22,0,0,0-1.67-1.08l-.19-.08c-.09-.32-.17-.63-.26-.94.23.09.47.16.71.23a4,4,0,0,1,2.29,1.25,2.3,2.3,0,0,1,.42.91C131.8,95.5,131.8,95.64,131.81,95.65Z"/>
+                <path class="cls-327"
+                      d="M131.09,82.42c.06,0-.13.5-.64,1.07a5.24,5.24,0,0,1-2.37,1.5,8,8,0,0,1-1.81.32.2.2,0,0,1,0-.07.57.57,0,0,0-.56-.54l-.88.35,0-.72a1.7,1.7,0,0,0,.22-.15l.37.07a8.07,8.07,0,0,0,2.48-.06,5.53,5.53,0,0,0,2.28-1,9.5,9.5,0,0,1,.92-.75Z"/>
+                <path class="cls-329"
+                      d="M130.66,96a3.69,3.69,0,0,1,0,.69c-.09.56-.33,1.46-.44,2.29-.06.38-.1.74-.14,1.09-.28-1.53-.71-3.37-1.18-5.21l-.28-1.06.19.08A3.22,3.22,0,0,1,130.44,95a1.53,1.53,0,0,1,.2.78A1.46,1.46,0,0,1,130.66,96Z"/>
+                <path class="cls-327"
+                      d="M130.49,80.07c-.1.08-.37.42-.74.79a1.28,1.28,0,0,1-1,.33,1,1,0,0,1-.43-.14l.17-.11a.67.67,0,0,0,.21-.2h0a1,1,0,0,0,.77-.22c.23-.14.48-.37.7-.49s.16-.11.26-.09a.16.16,0,0,1,.1,0,.06.06,0,0,1,0,.08v0S130.58,80.14,130.49,80.07Z"/>
+                <path class="cls-327"
+                      d="M130.49,105.16a8,8,0,0,1,0,.85,12.75,12.75,0,0,1-.09,1.78c0,.34-.09.7-.15,1.09-.15,0-.26,0-.26,0s.09.07.24.09a27.79,27.79,0,0,1-3.47,9.16c-.56,1-1.2,2-1.89,3,.14-.61.19-1,.1-1s-1.2,1.73-2.18,3.55c-.18.31-.35.63-.51.93l0,0a8.89,8.89,0,0,1-3,2.24,16.11,16.11,0,0,1-4.1,1.32c-.39.08-.78.15-1.18.2,0-.06,0-.11,0-.16s0-.24,0-.31v-.05h-.07l-.67,0-1,0c0,.06,0,.32.06.78h-.12c0-.49-.07-.76-.14-.77s-.11.28-.2.8l-1,0a24.73,24.73,0,0,1-4.53-.13,16.43,16.43,0,0,1-3.89-1.09c-.16-.3-.31-.56-.45-.77l0,0c.09-.22.13-.34.13-.34l-2.2-.79s-.06.21-.2.59c-.66-.4-1.29-.82-1.92-1.26a30.63,30.63,0,0,1-3.56-3c-.13-.12-.24-.25-.35-.37a1.36,1.36,0,0,0,.21-1.08,15.89,15.89,0,0,1-.82-2.51l.24-.12a12.1,12.1,0,0,0,1.95,2.87c.09.08.16.16.24.24l-.06,0,.29.43.16-.11c.37.37.78.73,1.18,1.08a.36.36,0,0,1-.31-.06l-.27.45a1.06,1.06,0,0,0,.5.14.7.7,0,0,0,.5-.19c.35.29.72.57,1.08.84a18.06,18.06,0,0,0,7.76,3.56,26.1,26.1,0,0,0,4.26.21,30.06,30.06,0,0,0,4.18-.38c2.68-.48,5.25-1.42,6.74-3.39a48.38,48.38,0,0,0,4.27-5.83,27.07,27.07,0,0,0,4-10c.41-2.57.23-4.09.35-4.09a3.77,3.77,0,0,1,.17,1.07C130.47,104.84,130.48,105,130.49,105.16Z"/>
+                <path class="cls-330" d="M130.39,56.7q0,.45,0,.93a.55.55,0,0,1-.27-.61A.48.48,0,0,1,130.39,56.7Z"/>
+                <path class="cls-327"
+                      d="M130.31,101.84c.13,1.08.1,1.77,0,1.79s-.46-.9-1-2.28h0a2.15,2.15,0,0,1-.1-.27c-.36-1-.81-2.24-1.29-3.55a3,3,0,0,0,.25-.23,5.59,5.59,0,0,0,.66-.83.48.48,0,0,0-.29-.67c-.3-.14-.6-.12-.7,0,0,0-.12.19-.36.48l-.34-.92c-.18-.5-.38-1-.56-1.49a1.29,1.29,0,0,0,.21-.06l.58-.14-.63-1.19a5.9,5.9,0,0,0,1.84,1.29l.28,1.06c.47,1.84.9,3.68,1.18,5.21-.12,1.28-.08,2.34.09,2.34S130.23,102.2,130.31,101.84Z"/>
+                <path class="cls-329"
+                      d="M129.31,101.35c.51,1.38.81,2.3,1,2.28-.12,0,.06,1.52-.35,4.09a27.07,27.07,0,0,1-4,10,48.38,48.38,0,0,1-4.27,5.83c-1.49,2-4.06,2.91-6.74,3.39a30.06,30.06,0,0,1-4.18.38,26.1,26.1,0,0,1-4.26-.21,18.06,18.06,0,0,1-7.76-3.56c-.36-.27-.73-.55-1.08-.84h0a2.8,2.8,0,0,0,.47-2.3.32.32,0,0,0-.34-.21c-.17,0-1,0-1.48,0l-.37,0,.11.34s-.06.22-.39.44c-.08-.08-.15-.16-.24-.24a12.1,12.1,0,0,1-1.95-2.87l-.32-.64A11,11,0,0,1,92.7,116a.59.59,0,0,0,.25,0,.67.67,0,0,0,.49-.55.91.91,0,0,0-.3-.74,1.13,1.13,0,0,0-.33-.2,2.15,2.15,0,0,1-.73-.32.41.41,0,0,1-.11-.07,43.42,43.42,0,0,1-1.35-5c-.27-1.32-.5-2.63-.68-3.92l.23-.08c.46-.13,1.17-.34,2.15-.68a19,19,0,0,0,3.75-1.7c.73-.46,1.47-1,2.27-1.62L99.66,100c.56-.44.85-.82,1.4-1.29,0-.08.57-.61,1-1l0,0a12.07,12.07,0,0,1-1.69.11c-.71.08-1.46.15-2.06.17l-1.45,0a14.44,14.44,0,0,1-2.5-.18A9.34,9.34,0,0,1,91,96.62a6,6,0,0,1-1.2-.94c.06-.52.14-1,.24-1.52a28.67,28.67,0,0,1,.74-2.94,8.44,8.44,0,0,0,1.44.35,12.62,12.62,0,0,0,3.55-.14l1.1-.15c.46-.09.93-.17,1.44-.25l1.58-.29.85-.17c.23,0,.07,0,0-.09s-.25,0-.27-.1-.29-.18-.29-.2l-.32-.12,3-.45s0,0,0,0a28.84,28.84,0,0,0,3.2-2.63,26.74,26.74,0,0,1,2.25-1.72c.32-.23.6-.41.8-.53a28.94,28.94,0,0,0,6.09,1.68,15.65,15.65,0,0,0,3.47,0,0,0,0,0,1,0,0,1.6,1.6,0,0,0,.34.26,5,5,0,0,0,.79.49,2.9,2.9,0,0,0,.83.28,4.67,4.67,0,0,0,2.09-.06,9.92,9.92,0,0,0,1.17-.4c0,.09.13.29.23.58a.52.52,0,0,1,.14.34h0s0,0,0,0h0s0,0,0,.08A2.34,2.34,0,0,1,124,89a2.44,2.44,0,0,1-.32.5,3.86,3.86,0,0,1-2.22,1.23c-.27.06-.59.11-.91.16l-1.07.19a7.55,7.55,0,0,0-1.27.24l-.29.07-.15,0s0,.11,0,.15a2.77,2.77,0,0,0,.27.61,3.75,3.75,0,0,0,.92,1.06,6,6,0,0,0,1,.64,6.4,6.4,0,0,0,2,.55,12.08,12.08,0,0,0,3-.22c.65-.13,1.14-.24,1.51-.33h0c.18.5.38,1,.56,1.49l.34.92-.15.18a4.59,4.59,0,0,1-1.73,1.2,6.61,6.61,0,0,1-3.07.43c-.61,0-1.24-.09-1.87-.16a15.34,15.34,0,0,1-1.69-.3c-.62-.13-1.46-.41-2.3-.63l.21.24.05.07,0,0,.09.07.62.58A17.23,17.23,0,0,0,119,99.17c.24.2.51.37.76.56l.52.33a11.13,11.13,0,0,0,1,.57,9.32,9.32,0,0,0,4,1.08A9.65,9.65,0,0,0,129.31,101.35Zm-3.41,6.31a5.93,5.93,0,0,0,.51-.71,8.34,8.34,0,0,0-.81-.22,2.57,2.57,0,0,0-.47-.08c-.29,0-.57,0-.54.1s.19.07.46.19l.44.18c.1,0,.07.06.08.07s0,0-.1.07l-.2.21a1.24,1.24,0,0,1-.42.31c-.16,0-.27,0-.3-.19s0-.28,0-.3-.13.07-.18.29a.43.43,0,0,0,.09.4.6.6,0,0,0,.46.2A1.8,1.8,0,0,0,125.9,107.66Zm-.25,5.26a.32.32,0,0,0,0-.52,2.91,2.91,0,0,0-1.31-.1l-.6,0a2.72,2.72,0,0,0-.55.06,7,7,0,0,0-1.83.74,2.11,2.11,0,0,1-.56.25c-.13,0-.22,0-.23,0s-.15,0-.16.21a1,1,0,0,0,.31.6,1.45,1.45,0,0,0,.8.57,1.48,1.48,0,0,0,1.07-.38,8,8,0,0,1,1.62-1l.2-.07.31-.1.53-.17A3.09,3.09,0,0,0,125.65,112.92Zm-2,6.94c.1-.38-.28-.53-.54-.45a2,2,0,0,0-.35.08,5.63,5.63,0,0,0-1.1.61c-.5.33-.94.74-.89.81a5.65,5.65,0,0,0,1.09-.45,7.69,7.69,0,0,1,.74-.3c.2-.06.33-.12.34-.12a.69.69,0,0,0,.13-.05s0,0,0,0a2,2,0,0,1-.06.39,3.1,3.1,0,0,1-.13.45c-.08.29-.28.25-.31.3s0,.07.16.08a.46.46,0,0,0,.38-.23,2.23,2.23,0,0,0,.26-.48A3.36,3.36,0,0,0,123.69,119.86Zm-8.08-7a.3.3,0,0,0-.11-.41,1,1,0,0,0-.26-.08s-.25,0-.56,0a5.22,5.22,0,0,0-1.21.05,1.37,1.37,0,0,0-.91.82c-.13.31-.15.51-.11.52a4,4,0,0,0,1.67-.11,2.82,2.82,0,0,0,1.1-.51.33.33,0,0,1,.13-.07l.11,0C115.51,113,115.54,113,115.61,112.86ZM114,118.41c0-.23-.21-.42-.39-.5a6.29,6.29,0,0,0-.93-.24l-.64-.06a1.84,1.84,0,0,0-1.4.55A2.14,2.14,0,0,0,110,120a3.82,3.82,0,0,1,.91-1.57,1.38,1.38,0,0,1,1.06-.31l.62.11a5.46,5.46,0,0,1,.81.13c.05,0,.05,0,.07,0v0a.83.83,0,0,1-.11.15,6.23,6.23,0,0,1-.6.57c-.6.25-1.21.33-1.21.39a2.3,2.3,0,0,0,1.37-.09,4.72,4.72,0,0,0,.75-.56,1.54,1.54,0,0,0,.16-.18A.66.66,0,0,0,114,118.41Zm-6.26,4.84a.43.43,0,0,0,.13-.43.68.68,0,0,0-.39-.35c-.56-.25-1.07,0-1,.08s.13,0,.28,0a1.55,1.55,0,0,1,.49.21c.08,0,0,.09,0,.09s-.09,0-.09,0a2.34,2.34,0,0,1-.82.14A1,1,0,0,1,106,123c-.12,0,.07,0,.08.11a.8.8,0,0,1,.09.14s-.07,0-.08,0,0,0,0,.1,0,.09,0,.09l.17,0a1.87,1.87,0,0,0,.72.07,1.64,1.64,0,0,0,.33-.05A1.28,1.28,0,0,0,107.71,123.25Zm-4.28-11.41a.44.44,0,0,0,0-.57.81.81,0,0,0-.29-.17,2.08,2.08,0,0,0-.54-.11,5.26,5.26,0,0,0-1.39.1c-.45.09-.92.12-1.29.16l-.26,0a.27.27,0,0,0-.11,0s-.08.12,0,.15.15.1.16.1,0,0,0-.12a1.56,1.56,0,0,1,.31,0,8.19,8.19,0,0,0,1.33,0,5.8,5.8,0,0,1,1.27,0l.34.08h0s.06,0-.06.06c-.31.23-.62.67-1,.74a1.26,1.26,0,0,1-.61-.09l-.59-.17a1.55,1.55,0,0,0-.59-.1s.19.16.51.32.36.17.56.26a1.56,1.56,0,0,0,.77.19,1.63,1.63,0,0,0,.75-.34,5.59,5.59,0,0,1,.48-.38A1.19,1.19,0,0,0,103.43,111.84Z"/>
+                <path class="cls-327"
+                      d="M130.17,100.83c.06.36.1.71.14,1s-.14.58-.18.58-.21-1.06-.09-2.34C130.09,100.34,130.13,100.59,130.17,100.83Z"/>
+                <path class="cls-327"
+                      d="M130.25,108.88a.52.52,0,0,1,0,.11c-.15,0-.24-.07-.24-.09S130.1,108.89,130.25,108.88Z"/>
+                <path class="cls-328"
+                      d="M130.57,3.9c-.23.21-.48.45-.74.71a8.4,8.4,0,0,0-1.29,1.72,22.47,22.47,0,0,0-1.1,2.25c-.23.6-.5,1.33-.76,2.09-.08.22-.14.43-.15.46s0,.13,0,.07v-.15l0-.28c0-.19,0-.37-.07-.56l-.09-1a4.62,4.62,0,0,0-.19-.88,10.71,10.71,0,0,0-.36-1.09,22.07,22.07,0,0,0-1.49-3.12c.54-.1,1.08-.2,1.64-.28a16.14,16.14,0,0,1,2.62-.2,5.07,5.07,0,0,1,.56,0l.71.11Z"/>
+                <path class="cls-327"
+                      d="M129.31,101.34h0a9.65,9.65,0,0,1-4,.36,9.32,9.32,0,0,1-4-1.08,11.13,11.13,0,0,1-1-.57l-.52-.33c-.25-.19-.52-.36-.76-.56A17.23,17.23,0,0,1,117.66,98l-.62-.58-.09-.07,0,0-.05-.07-.21-.24c.84.22,1.68.5,2.3.63a15.34,15.34,0,0,0,1.69.3c.63.07,1.26.13,1.87.16a6.61,6.61,0,0,0,3.07-.43,4.59,4.59,0,0,0,1.73-1.2l.15-.18.44,1.2a5.61,5.61,0,0,1-1.91,1.2,7.75,7.75,0,0,1-3.55.4c-.62-.05-1.27-.12-1.93-.22a1.5,1.5,0,0,1-.33-.08l-.28-.07s-.16,0-.15,0l.09.09a2.49,2.49,0,0,0,.23.22l.15.12.42.3c.31.21.62.39.92.58a9.26,9.26,0,0,0,3.73,1.21,18.64,18.64,0,0,0,2.88.14A7.27,7.27,0,0,1,129.31,101.34Z"/>
+                <path class="cls-328"
+                      d="M129.21,101.07a2.15,2.15,0,0,0,.1.27,7.27,7.27,0,0,0-1.12,0,18.64,18.64,0,0,1-2.88-.14,9.26,9.26,0,0,1-3.73-1.21c-.3-.19-.61-.37-.92-.58l-.42-.3-.15-.12a2.49,2.49,0,0,1-.23-.22l-.09-.09s.11,0,.15,0l.28.07a1.5,1.5,0,0,0,.33.08c.66.1,1.31.17,1.93.22a7.75,7.75,0,0,0,3.55-.4,5.61,5.61,0,0,0,1.91-1.2C128.4,98.83,128.85,100.06,129.21,101.07Z"/>
+                <path class="cls-327"
+                      d="M128.54,95.79a.48.48,0,0,1,.29.67,5.59,5.59,0,0,1-.66.83,3,3,0,0,1-.25.23l-.44-1.2c.24-.29.34-.47.36-.48C127.94,95.67,128.24,95.65,128.54,95.79Z"/>
+                <path class="cls-327"
+                      d="M128.41,80.77c0,.07,0,.07,0,.07s0,.09-.11.1,0,.07,0,.09l0,0a5.84,5.84,0,0,1-1.23.48,3.19,3.19,0,0,1-1.61.11,1.21,1.21,0,0,1-.55-.33,3.91,3.91,0,0,0,.59-.26.27.27,0,0,0,.13.07,2.88,2.88,0,0,0,1.35,0,6,6,0,0,0,1.39-.39c.18-.07.3-.16.31-.23a.49.49,0,0,0-.05-.16s.12,0,.17.13a.28.28,0,0,1-.09.26h0l-.09,0s-.13.09-.18.13h0A.1.1,0,0,0,128.41,80.77Z"/>
+                <path class="cls-327"
+                      d="M128.64,80.71l.09,0a.67.67,0,0,1-.21.2l-.17.11h0l0,0s0,0,0-.09.11,0,.11-.1h0S128.61,80.71,128.64,80.71Z"/>
+                <path class="cls-327"
+                      d="M128.32,92.87c.09.31.17.62.26.94a5.9,5.9,0,0,1-1.84-1.29h0l-.35-.63-.1.11c-.15-.19-.2-.33-.16-.36S127.1,92.38,128.32,92.87Z"/>
+                <path class="cls-327"
+                      d="M116.45,146.2h0c.11.52.21,1,.32,1.55l2.65,1.47,4.31.05a4.23,4.23,0,0,0,1.91-.2,1.74,1.74,0,0,0,.63-.53l.16-.21s0,0,0,.07a.58.58,0,0,1,0,.19l0,0,.48.34c.14-.18.07-.64-.24-1a.71.71,0,0,1,.08-.15c.19-.29.37-.58.53-.86l.15-.27.06.13.53-.24a1.9,1.9,0,0,0-.3-.41,1.79,1.79,0,0,0-.25-.22,2.18,2.18,0,0,0-.57-1.19,1.32,1.32,0,0,0-1.29-.49,12.61,12.61,0,0,0-1.53.68,15.27,15.27,0,0,1-2.91,1.1,9.8,9.8,0,0,1-2.39.05c-.65,0-1.15,0-1.5,0h-.17l.38-.08.27-.06H118v-.11h0a6.26,6.26,0,0,1,.86-.11,11.23,11.23,0,0,0,2.28-.2,17,17,0,0,0,2.73-1.2,9.91,9.91,0,0,1,1.63-.8,1.75,1.75,0,0,1,1.13,0,2.61,2.61,0,0,1,.94.6,3.19,3.19,0,0,1,.94,2,1.15,1.15,0,0,1-.07.69,4.33,4.33,0,0,1-.24.52c-.16.32-.34.63-.52.93a10.41,10.41,0,0,1-.6.94,2.63,2.63,0,0,1-1,.85,5.26,5.26,0,0,1-2.38.37l-4.59.07-3.52-1.81c-.62-2.73-1.23-5.4-1.8-7.87-.13-.57-.27-1.11-.4-1.64a3,3,0,0,1-.08-.37l0-.23,0-.44c0-.29-.07-.57-.1-.85-.12-1.1-.22-2.13-.31-3.09-.18-1.9-.34-3.47-.43-4.55q-.06-.61-.09-1c.58-.05,1.16-.11,1.73-.21,0,.27,0,.64.08,1.08.08,1.1.19,2.65.34,4.56.07.94.17,2,.25,3.07q.08.72.15,1.5c.08.24.1.37.14.52l.09.44c.08.3.14.59.2.89.37,1.83.78,3.84,1.18,5.76Zm10.06,2.44h.07l-.08,0Z"/>
+                <path class="cls-330" d="M128.45,80.84s0,0,0-.07A.1.1,0,0,1,128.45,80.84Z"/>
+                <path class="cls-330"
+                      d="M128.11,146.47l-.53.24-.06-.13.06-.13c0-.1,0-.1,0-.29a3.11,3.11,0,0,0,0-.32,1.79,1.79,0,0,1,.25.22A1.9,1.9,0,0,1,128.11,146.47Z"/>
+                <path class="cls-330"
+                      d="M127.6,146.16c0,.19,0,.19,0,.29l-.06.13a1.34,1.34,0,0,0-.76-.63,3.86,3.86,0,0,0-.89,0,.88.88,0,0,0-.29,0c-.08,0-.12,0-.13,0s0-.05.09-.09a.5.5,0,0,1,.29-.17,3,3,0,0,1,1-.13,1.49,1.49,0,0,1,.72.29A3.11,3.11,0,0,1,127.6,146.16Z"/>
+                <path class="cls-329"
+                      d="M127.52,146.58l-.15.27c-.16.28-.34.57-.53.86a.71.71,0,0,0-.08.15,1.75,1.75,0,0,0-.55-.49,2.16,2.16,0,0,0-1.06-.15c-.28,0-.46,0-.46.05s.18.11.44.17a2.56,2.56,0,0,1,.86.28,1.4,1.4,0,0,1,.45.61l-.16.21a1.74,1.74,0,0,1-.63.53,4.23,4.23,0,0,1-1.91.2l-4.31-.05-2.65-1.47c-.11-.51-.21-1-.32-1.55h0l.12,0h0l.57-.11h.21c.35,0,.85-.07,1.5,0a9.8,9.8,0,0,0,2.39-.05,15.27,15.27,0,0,0,2.91-1.1,12.61,12.61,0,0,1,1.53-.68,1.32,1.32,0,0,1,1.29.49,2.18,2.18,0,0,1,.57,1.19,1.49,1.49,0,0,0-.72-.29,3,3,0,0,0-1,.13.5.5,0,0,0-.29.17c-.06,0-.1.07-.09.09s0,0,.13,0a.88.88,0,0,1,.29,0,3.86,3.86,0,0,1,.89,0A1.34,1.34,0,0,1,127.52,146.58Z"/>
+                <path class="cls-327"
+                      d="M126.74,92.52l.63,1.19-.58.14a1.29,1.29,0,0,1-.21.06h0c-.21-.56-.41-1.13-.62-1.66l.1-.07a1.92,1.92,0,0,0,.23-.19,2.8,2.8,0,0,0,.45.52Z"/>
+                <path class="cls-327"
+                      d="M127.21,89c.33,1.11.72,2.47,1.11,3.91-1.22-.49-2.11-1.32-2.2-1.24s0,.17.16.36a1.92,1.92,0,0,1-.23.19l-.1.07c-.3-.81-.58-1.57-.84-2.24a5.4,5.4,0,0,0,.82-1,2.64,2.64,0,0,0,.32-.65L124.36,88s0,0,0,0h0a.52.52,0,0,0-.14-.34c-.1-.29-.19-.49-.23-.58a12.59,12.59,0,0,0,1.89-1,.8.8,0,0,0,.34-.43C126.39,86.29,126.83,87.72,127.21,89Z"/>
+                <path class="cls-330"
+                      d="M126.76,147.86c.31.41.38.87.24,1l-.48-.34,0,0a.58.58,0,0,0,0-.19s0-.05,0-.07Z"/>
+                <path class="cls-327"
+                      d="M125.66,83c.76-.62,1.1-1.26,1.21-1.15a1.76,1.76,0,0,1-.17.43,4.55,4.55,0,0,1-.73,1,4.32,4.32,0,0,1-1,.83.07.07,0,0,1-.06,0l-.14,0h0v-.19h-.11l-.16,0-.15,0h0a.54.54,0,0,0-.17.1.56.56,0,0,0-.23.45.28.28,0,0,0,0,.09,25.69,25.69,0,0,0-2.49.64,12.74,12.74,0,0,1-2.45.49h-.3a8,8,0,0,1-1.9-.31,6.46,6.46,0,0,1-1.76-.86,25,25,0,0,1-2.31-2.16c.11-.06.2-.14.3-.2l.46-.3c.79.69,1.56,1.35,2.16,1.78a5.79,5.79,0,0,0,1,.49l.46.14a7.52,7.52,0,0,0,1.64.34,12.54,12.54,0,0,0,3.63-.2A6.93,6.93,0,0,0,125.66,83Z"/>
+                <path class="cls-330" d="M126.38,91.88l.35.63a2.8,2.8,0,0,1-.45-.52Z"/>
+                <path class="cls-331" d="M126.58,148.65h-.08Z"/>
+                <path class="cls-327"
+                      d="M126.26,85.24a.2.2,0,0,0,0,.07h-.17c0-.09-.09-.07-.18,0a4.55,4.55,0,0,1-.64,0,4.41,4.41,0,0,1-.55-.06,1.34,1.34,0,0,1-.27-.07l-.08,0s.21,0,.21,0l.12,0h.11v0l.88-.35A.57.57,0,0,1,126.26,85.24Z"/>
+                <path class="cls-330" d="M126.1,85.32h.17a.92.92,0,0,1-.06.33C126.15,85.45,126.1,85.33,126.1,85.32Z"/>
+                <path class="cls-327"
+                      d="M126,92.25c.21.53.41,1.1.62,1.66-.37.09-.86.2-1.51.33a12.08,12.08,0,0,1-3,.22,6.4,6.4,0,0,1-2-.55,6,6,0,0,1-1-.64,3.75,3.75,0,0,1-.92-1.06,2.77,2.77,0,0,1-.27-.61s-.07-.13,0-.15l.15,0,.29-.07a7.55,7.55,0,0,1,1.27-.24l1.07-.19c.32,0,.64-.1.91-.16a3.86,3.86,0,0,0,2.22-1.23A2.44,2.44,0,0,0,124,89a2.34,2.34,0,0,0,.34-.91s0-.06,0-.08h0c.19.51.44,1.19.75,2-.15.13-.31.27-.48.4a5.79,5.79,0,0,1-3,1.06c-.58.07-1.21.12-1.92.18l-.84.08-.22,0c-.07,0-.2,0-.12.09a1.42,1.42,0,0,0,.2.41,2.72,2.72,0,0,0,.65.66,4.47,4.47,0,0,0,.9.46,4.4,4.4,0,0,0,1.82.3,6.79,6.79,0,0,0,2.61-.72A7.17,7.17,0,0,0,126,92.25Z"/>
+                <path class="cls-327"
+                      d="M124.36,88l1.89.31a2.64,2.64,0,0,1-.32.65,5.4,5.4,0,0,1-.82,1C124.8,89.22,124.55,88.54,124.36,88Z"/>
+                <path class="cls-327"
+                      d="M126.1,85.32s.05.13.11.32a.8.8,0,0,1-.34.43,12.59,12.59,0,0,1-1.89,1s0-.07,0-.08c-.1-.29.36-.71,1-.94a3,3,0,0,0,1-.74A1.08,1.08,0,0,0,126.1,85.32Z"/>
+                <path class="cls-330" d="M126.1,85.32a1.08,1.08,0,0,1-.18,0C126,85.25,126.07,85.23,126.1,85.32Z"/>
+                <path class="cls-327"
+                      d="M125.28,85.32a4.55,4.55,0,0,0,.64,0,3,3,0,0,1-1,.74c-.65.23-1.11.65-1,.94,0,0,0,0,0,.08a9.92,9.92,0,0,1-1.17.4,4.67,4.67,0,0,1-2.09.06,2.9,2.9,0,0,1-.83-.28,5,5,0,0,1-.79-.49,1.6,1.6,0,0,1-.34-.26,0,0,0,0,0,0,0h.16a10,10,0,0,0,1.47-.31v0a.51.51,0,0,0,.08.26,1.37,1.37,0,0,0,.47.37,2.43,2.43,0,0,0,1.76.16,2.94,2.94,0,0,0,1.41-.64c.1-.09.36-.24.45-.32s.23-.22.24-.39v-.16a2.42,2.42,0,0,0-.34-.27,1.34,1.34,0,0,0,.27.07A4.41,4.41,0,0,0,125.28,85.32Z"/>
+                <path class="cls-327"
+                      d="M126.41,107a5.93,5.93,0,0,1-.51.71,1.8,1.8,0,0,1-1,.52.6.6,0,0,1-.46-.2.43.43,0,0,1-.09-.4c0-.22.15-.3.18-.29s0,.14,0,.3.14.21.3.19a1.24,1.24,0,0,0,.42-.31l.2-.21c0-.07,0,0,.1-.07s0,0-.08-.07l-.44-.18c-.27-.12-.43-.16-.46-.19s.25-.14.54-.1a2.57,2.57,0,0,1,.47.08A8.34,8.34,0,0,1,126.41,107Z"/>
+                <path class="cls-327"
+                      d="M125.68,112.4a.32.32,0,0,1,0,.52,3.09,3.09,0,0,1-.37.17l-.53.17-.31.1-.2.07a8,8,0,0,0-1.62,1,1.48,1.48,0,0,1-1.07.38,1.45,1.45,0,0,1-.8-.57,1,1,0,0,1-.31-.6c0-.21.17-.23.16-.21s-.07.07,0,.2a1.18,1.18,0,0,0,.36.46,1.26,1.26,0,0,0,.67.4c.24,0,.52-.19.79-.39a7.91,7.91,0,0,1,1.64-1.15l.17-.07h0a.07.07,0,0,0,.06,0l-.06,0h-.43a4.1,4.1,0,0,0-.5,0,8.31,8.31,0,0,0-1.8.54,2.12,2.12,0,0,1-.65.15c-.16,0-.25-.07-.24-.08s.1,0,.23,0a2.11,2.11,0,0,0,.56-.25,7,7,0,0,1,1.83-.74,2.72,2.72,0,0,1,.55-.06l.6,0A2.91,2.91,0,0,1,125.68,112.4Z"/>
+                <path class="cls-328"
+                      d="M125.11,90c.26.67.54,1.43.84,2.24a7.17,7.17,0,0,1-1.2.72,6.79,6.79,0,0,1-2.61.72,4.4,4.4,0,0,1-1.82-.3,4.47,4.47,0,0,1-.9-.46,2.72,2.72,0,0,1-.65-.66,1.42,1.42,0,0,1-.2-.41c-.08-.09.05-.08.12-.09l.22,0,.84-.08c.71-.06,1.34-.11,1.92-.18a5.79,5.79,0,0,0,3-1.06C124.8,90.28,125,90.14,125.11,90Z"/>
+                <path class="cls-327"
+                      d="M125.26,80.79a.79.79,0,0,0,.27.26,3.91,3.91,0,0,1-.59.26l-.15-.17s.07-.13.19-.24S125.23,80.75,125.26,80.79Z"/>
+                <path class="cls-327"
+                      d="M125,120.11c.09,0,0,.43-.1,1-.71,1-1.48,2-2.3,3.06-.09.13-.2.25-.29.38.16-.3.33-.62.51-.93C123.77,121.84,124.74,120,125,120.11Z"/>
+                <path class="cls-327" d="M125,84.16a.07.07,0,0,0,.06,0,1.7,1.7,0,0,1-.22.15v-.17a.08.08,0,0,0,0,0h0Z"/>
+                <path class="cls-327" d="M124.82,85.05v0h-.09Z"/>
+                <path class="cls-327"
+                      d="M124.8,84.33l0,.72-.09,0h0a1.67,1.67,0,0,0-.06-.24.45.45,0,0,1-.06-.2s-.06-.07-.07-.07.07,0,.09-.09l0,0A.72.72,0,0,1,124.8,84.33Z"/>
+                <path class="cls-331" d="M124.81,84.11h0a.08.08,0,0,1,0,0v0Z"/>
+                <path class="cls-327" d="M124.8,84.18v.15a.72.72,0,0,0-.15.11.88.88,0,0,0,.12-.21Z"/>
+                <path class="cls-327"
+                      d="M124.8,84.16v0l0,0a.88.88,0,0,1-.12.21l-.3.16a1,1,0,0,0-.41,0,.28.28,0,0,1,0-.09.56.56,0,0,1,.23-.45.54.54,0,0,1,.17-.1h0l.15,0,.16,0h.11v.24Z"/>
+                <path class="cls-329"
+                      d="M124.8,85.46v.16c0,.17-.24.39-.24.39s-.35.23-.45.32a2.94,2.94,0,0,1-1.41.64,2.43,2.43,0,0,1-1.76-.16,1.37,1.37,0,0,1-.47-.37.51.51,0,0,1-.08-.26v0a11.56,11.56,0,0,0,1.23-.44,15.09,15.09,0,0,0,2.39-.89.73.73,0,0,0,.19.24l.09.05.1,0,.08,0A2.42,2.42,0,0,1,124.8,85.46Z"/>
+                <path class="cls-327"
+                      d="M124.69,55.91a26,26,0,0,1-.29,6,22.5,22.5,0,0,1-3.48,8.37c-1.25,1.83-2.23,2.71-2.31,2.61a4.49,4.49,0,0,1,.51-.74c.33-.49.81-1.21,1.35-2.15a23.79,23.79,0,0,0,2.93-8.25,25,25,0,0,0,0-5.75,56.55,56.55,0,0,0-.69-6.34,20.06,20.06,0,0,0-2.07-6.14,14.11,14.11,0,0,0-4.32-4.67l-.06,0a14.78,14.78,0,0,0-8.67-3,48.69,48.69,0,0,0-8.2,1.05A28.24,28.24,0,0,0,94,38.53a21.68,21.68,0,0,0-2,1c-.09.09-1,.59-2.43,1.68a42.9,42.9,0,0,0-5.37,5A44.24,44.24,0,0,0,81.05,50l-.76,1.08-.19.26,0,0s-.08,0,0,.09l.06.08.4.48.93,1.06a85,85,0,0,0,8.34,8.31,45.45,45.45,0,0,0,4.73,3.57l1.22.77,1.26.68c.84.43,1.73.84,2.58,1.24,3.41,1.63,6.6,3.09,9.41,4.14a27,27,0,0,0,3.87,1.2,13.09,13.09,0,0,0,3.09.27,10.24,10.24,0,0,0,2-.19c.45-.08.67-.2.69-.18s-.87.7-2.65.84a12.85,12.85,0,0,1-3.25-.06,17.37,17.37,0,0,1-2.23-.49c-.58-.14-1.19-.33-1.81-.53-2.9-.93-6.18-2.29-9.65-3.8-.87-.39-1.75-.76-2.65-1.19-.45-.21-.9-.44-1.35-.67l-1.31-.76a45.79,45.79,0,0,1-5-3.57A86.52,86.52,0,0,1,80,54.35c-.32-.37-.64-.72-1-1.06l-.51-.59-.82-1c0-.09-.21-.17-.15-.25l.18-.26.35-.53.56-.82c.25-.38.5-.74.75-1.11a48.35,48.35,0,0,1,3.17-4,46.2,46.2,0,0,1,5.55-5.36,28.42,28.42,0,0,1,2.65-1.87,23.7,23.7,0,0,1,2.31-1.16A29.69,29.69,0,0,1,99,34.69a49.93,49.93,0,0,1,8.62-.94,16.47,16.47,0,0,1,9.8,3.59l0,0,0,0a15.57,15.57,0,0,1,4.65,5.32,21.08,21.08,0,0,1,2.06,6.68A55.56,55.56,0,0,1,124.69,55.91Z"/>
+                <path class="cls-327"
+                      d="M124.72,85.08h0l-.12,0s-.21,0-.21,0l-.1,0-.09-.05a.73.73,0,0,1-.19-.24c.22-.12.35-.2.35-.23l.3-.16,0,0s0,.09-.09.09.09,0,.07.07a.45.45,0,0,0,.06.2A1.67,1.67,0,0,1,124.72,85.08Z"/>
+                <path class="cls-330" d="M124,84.78c.13,0,.25-.12.37-.18s-.13.11-.35.23a.08.08,0,0,1,0,0Z"/>
+                <path class="cls-330" d="M124.35,84.6c-.12.06-.24.13-.37.18a.25.25,0,0,1,0-.14A1,1,0,0,1,124.35,84.6Z"/>
+                <path class="cls-329"
+                      d="M124.22,112.79l.06,0a.07.07,0,0,1-.06,0h0l-.17.07a7.91,7.91,0,0,0-1.64,1.15c-.27.2-.55.42-.79.39a1.26,1.26,0,0,1-.67-.4,1.18,1.18,0,0,1-.36-.46c0-.13,0-.18,0-.2s.08.09.24.08a2.12,2.12,0,0,0,.65-.15,8.31,8.31,0,0,1,1.8-.54,4.1,4.1,0,0,1,.5,0Z"/>
+                <path class="cls-327"
+                      d="M124.22,4.05l0,0c-.52.09-1,.2-1.55.31a3.24,3.24,0,0,0-.81-.59,1.83,1.83,0,0,0-.19,0s0-.12,0-.16a.65.65,0,0,1,0-.1l.42-1.72a2.4,2.4,0,0,1,.81.54A8.45,8.45,0,0,1,124.22,4.05Z"/>
+                <path class="cls-327"
+                      d="M124.87,121.15a29.83,29.83,0,0,1-1,3c-.35,1-.75,2-1,2.7s-.54,1.24-.56,1.27-.28.51-.72,1.19a20.68,20.68,0,0,1-1.72,2.41c-.48.56-1,1.08-1.42,1.53a2.06,2.06,0,0,0-.18-.31L117.16,134s.1,0,.14,0,.07,0,.09.09v.12c-.32.27-.55.41-.59.29s1-1.84,2.07-3.57a27.68,27.68,0,0,0,1.31-2.45l.57-1.22s.28-.49.66-1.16c.24-.45.55-1,.85-1.55l0,0c.09-.13.2-.25.29-.38C123.39,123.18,124.16,122.17,124.87,121.15Z"/>
+                <path class="cls-327"
+                      d="M120.78,86l-.51-.18s-.27.11-.86.42a4,4,0,0,0-1-.06c0,.08.33.25.39.35a15.65,15.65,0,0,1-3.47,0,28.94,28.94,0,0,1-6.09-1.68l.31-.18.93-.62a26.21,26.21,0,0,0,5,1.59,17.63,17.63,0,0,0,3.43.24H119a13.69,13.69,0,0,0,3.6-.48,7.27,7.27,0,0,0,1.38-.5.08.08,0,0,0,0,0,15.09,15.09,0,0,1-2.39.89,11.56,11.56,0,0,1-1.23.44s.08-.1.14-.13a.35.35,0,0,1,.16-.07Z"/>
+                <path class="cls-327"
+                      d="M124,84.78h0a7.27,7.27,0,0,1-1.38.5,13.69,13.69,0,0,1-3.6.48,12.74,12.74,0,0,0,2.45-.49,25.69,25.69,0,0,1,2.49-.64A.25.25,0,0,0,124,84.78Z"/>
+                <path class="cls-327"
+                      d="M123.15,119.41c.26-.08.64.07.54.45a3.36,3.36,0,0,1-.23.64,2.23,2.23,0,0,1-.26.48.46.46,0,0,1-.38.23c-.12,0-.16-.06-.16-.08s.23,0,.31-.3a3.1,3.1,0,0,0,.13-.45,2,2,0,0,0,.06-.39s0,0,0,0a.69.69,0,0,1-.13.05s-.14.06-.34.12a7.69,7.69,0,0,0-.74.3,5.65,5.65,0,0,1-1.09.45c0-.07.39-.48.89-.81a5.63,5.63,0,0,1,1.1-.61A2,2,0,0,1,123.15,119.41Z"/>
+                <path class="cls-328"
+                      d="M123.45,56a25,25,0,0,1,0,5.75A23.79,23.79,0,0,1,120.47,70c-.54.94-1,1.66-1.35,2.15a4.49,4.49,0,0,0-.51.74s-.24.1-.69.18a10.24,10.24,0,0,1-2,.19,13.09,13.09,0,0,1-3.09-.27,27,27,0,0,1-3.87-1.2c-2.81-1.05-6-2.51-9.41-4.14-.85-.4-1.74-.81-2.58-1.24l-1.26-.68-1.22-.77a45.45,45.45,0,0,1-4.73-3.57,85,85,0,0,1-8.34-8.31L80.5,52l-.4-.48L80,51.43s0-.07,0-.09l0,0,.19-.26L81.05,50a44.24,44.24,0,0,1,3.1-3.72,42.9,42.9,0,0,1,5.37-5c1.41-1.09,2.34-1.59,2.43-1.68a21.68,21.68,0,0,1,2-1,28.24,28.24,0,0,1,5.46-1.69,48.69,48.69,0,0,1,8.2-1.05,14.78,14.78,0,0,1,8.67,3l.06,0a14.11,14.11,0,0,1,4.32,4.67,20.06,20.06,0,0,1,2.07,6.14A56.55,56.55,0,0,1,123.45,56ZM121,58c.33-.29.49-2.46.32-3.47A30.6,30.6,0,0,0,120.23,50a18.42,18.42,0,0,0-2-4.48,9.35,9.35,0,0,0-2.06-2.3,18.31,18.31,0,0,0-2.88-1.56,14,14,0,0,0-3.32-1.06,8.81,8.81,0,0,0-3.78.19,11.69,11.69,0,0,0-3.45,1.7,22.75,22.75,0,0,0-7.55,8.73,15.75,15.75,0,0,0-.67,1.85c-.09.32-.17.64-.23,1,0,.17-.06.31-.1.52s0,.51,0,.76c.19.16.39.32.6.47l.37.28c.25.19.5.4.76.58l1.53,1h0a17.52,17.52,0,0,0,4.64,2,38.42,38.42,0,0,0,4.52,1,22.52,22.52,0,0,0,7.88.31,13.18,13.18,0,0,0,5-1.81A4.37,4.37,0,0,0,121,58Z"/>
+                <path class="cls-327"
+                      d="M122,.66l.13,1.13-.42,1.72a.65.65,0,0,0,0,.1s0,.12,0,.16a1.83,1.83,0,0,1,.19,0,3.24,3.24,0,0,1,.81.59c-.77.15-1.55.31-2.35.45-.25,0-.48.08-.77.1s-.56,0-.8,0a12.42,12.42,0,0,1-1.36,0l-1,0c.16-1.59.3-2.29.3-2.29l.18-1.95.76.08c.4.05.78.07,1.16.09a4.4,4.4,0,0,0,.5,0,5.36,5.36,0,0,0,.55,0Z"/>
+                <path class="cls-329"
+                      d="M122.26,124.61c-.3.57-.61,1.1-.85,1.55-.38.67-.64,1.14-.66,1.16l-.57,1.22a27.68,27.68,0,0,1-1.31,2.45c-1.1,1.73-2.25,3.51-2.07,3.57s.27,0,.59-.29a3.52,3.52,0,0,1,0,.49,43.28,43.28,0,0,0-.59,5c-.11,2.32-.1,4-.14,5,0,.56,0,1,0,1.23a.28.28,0,0,1,0,.09v0h0l-.12,0c-.4-1.92-.81-3.93-1.18-5.76-.06-.3-.12-.59-.2-.89l-.09-.44c0-.15-.06-.28-.14-.52q-.07-.78-.15-1.5c-.08-1.1-.18-2.13-.25-3.07-.15-1.91-.26-3.46-.34-4.56,0-.44-.06-.81-.08-1.08.4-.05.79-.12,1.18-.2a16.11,16.11,0,0,0,4.1-1.32A8.89,8.89,0,0,0,122.26,124.61Z"/>
+                <path class="cls-327"
+                      d="M121.29,54.51c.17,1,0,3.18-.32,3.47,0,0,0-1.34,0-1.36a26.17,26.17,0,0,0-.86-3.15l0-.37c-.05-.07,0-.17-.08-.26-.77-2-.93-2.38-1.53-3.69l-.7-1.42a9.43,9.43,0,0,0-3-3.77l-.52-.31h-.51l-1.16-.58a8.77,8.77,0,0,0-6.12-.89,15.12,15.12,0,0,0-5.9,3.71,18.93,18.93,0,0,0-4.41,5.84,13.37,13.37,0,0,0-.65,1.69c-.08.29-.17.57-.23.86l-.08.42,0,.17.48.39c.25.19.48.39.73.56L98,56.88l0,0a16.54,16.54,0,0,0,4.3,1.93A38.19,38.19,0,0,0,106.68,60a27.46,27.46,0,0,0,4.74.64c.17.1.35.19.53.28a.44.44,0,0,1,.29-.14c.64,0,1.26-.09,1.89-.11l.09-.11h.29l.25,0a4.2,4.2,0,0,0,1.58,0,3.19,3.19,0,0,0,.43-.32,10.28,10.28,0,0,0,1.15-.27c.11-.1.2-.19.3-.3a11.88,11.88,0,0,0,1.11-.51c1.07-.58,1.58-1,1.64-1a4.37,4.37,0,0,1-1.51,1.27,13.18,13.18,0,0,1-5,1.81,22.52,22.52,0,0,1-7.88-.31,38.42,38.42,0,0,1-4.52-1,17.52,17.52,0,0,1-4.64-2h0l-1.53-1c-.26-.18-.51-.39-.76-.58l-.37-.28c-.21-.15-.41-.31-.6-.47,0-.25,0-.51,0-.76s.06-.35.1-.52c.06-.33.14-.65.23-1a15.75,15.75,0,0,1,.67-1.85,22.75,22.75,0,0,1,7.55-8.73,11.69,11.69,0,0,1,3.45-1.7,8.81,8.81,0,0,1,3.78-.19,14,14,0,0,1,3.32,1.06,18.31,18.31,0,0,1,2.88,1.56,9.35,9.35,0,0,1,2.06,2.3,18.42,18.42,0,0,1,2,4.48A30.6,30.6,0,0,1,121.29,54.51Z"/>
+                <path class="cls-332"
+                      d="M120.94,56.62S121,58,121,58s-.57.46-1.64,1a11.88,11.88,0,0,1-1.11.51c1.29-1.4,1.65-3.56,1.86-6.06A26.17,26.17,0,0,1,120.94,56.62Z"/>
+                <path class="cls-327"
+                      d="M120.78,86h-.1a.35.35,0,0,0-.16.07c-.06,0-.13.08-.14.13a10,10,0,0,1-1.47.31h-.16c-.06-.1-.39-.27-.39-.35a4,4,0,0,1,1,.06c.59-.31.86-.42.86-.42Z"/>
+                <path class="cls-327"
+                      d="M120.12,53.1l0,.37a39.34,39.34,0,0,0-2.57-5.93,2.43,2.43,0,0,1-.15-.26l-.44-.81a1.11,1.11,0,0,0-.2-.26,7.81,7.81,0,0,0-1.52-1.73,10.86,10.86,0,0,0-1.39-.83h.51l.52.31a9.43,9.43,0,0,1,3,3.77l.7,1.42c.6,1.31.76,1.71,1.53,3.69C120.08,52.93,120.07,53,120.12,53.1Z"/>
+                <path class="cls-333"
+                      d="M120.08,53.47c-.21,2.5-.57,4.66-1.86,6.06a11.07,11.07,0,0,1-1.35.48l.25-.2a17.5,17.5,0,0,1-4.45.62h-1.53c-2.17-1.46-3.58-4.68-3.38-8.36.25-4.64,2.86-8.24,6-8.43a10.86,10.86,0,0,1,1.39.83,7.81,7.81,0,0,1,1.52,1.73,1.11,1.11,0,0,1,.2.26l.44.81a2.43,2.43,0,0,0,.15.26A39.34,39.34,0,0,1,120.08,53.47Z"/>
+                <path class="cls-327"
+                      d="M119.71,75.67a.37.37,0,0,1-.16.44.7.7,0,0,1-.4.07l-.57,0a3.9,3.9,0,0,1-.51-.06s0,0,0,0l1.2-.06c.53,0,.27-.51-.2-.86s-.67.61-.67.61c-.15,0-.27-.09-.27-.13a1.56,1.56,0,0,1,.32-.6.54.54,0,0,1,.4-.2h0a.64.64,0,0,1,.42.19A1.51,1.51,0,0,1,119.71,75.67Z"/>
+                <path class="cls-327"
+                      d="M119,75.15c.47.35.73.85.2.86l-1.2.06,0,0a2.31,2.31,0,0,1,.49-.1l.54-.07c.12,0,.14,0,.17,0s0-.08,0-.11a1.53,1.53,0,0,0-.34-.32c-.15-.09-.08,0-.12,0a1.13,1.13,0,0,0-.17.41s-.14,0-.29,0C118.36,75.76,118.57,74.81,119,75.15Z"/>
+                <path class="cls-327"
+                      d="M119,80.3a1,1,0,0,1,.45.86,1.31,1.31,0,0,1-2,.69,1,1,0,0,1-.12-1.1,4.07,4.07,0,0,1,.52-.8s.16,0,.28.11c-.41.48-.92,1.15-.49,1.63s1.87,0,1.6-.81a1.33,1.33,0,0,0-1.11-.82A1.08,1.08,0,0,1,119,80.3Z"/>
+                <path class="cls-327"
+                      d="M119.28,75.71s0,.09,0,.11,0,0-.17,0l-.54.07a2.31,2.31,0,0,0-.49.1l.29-.27c.15,0,.29.06.29,0a1.13,1.13,0,0,1,.17-.41s0-.08.12,0A1.53,1.53,0,0,1,119.28,75.71Z"/>
+                <path class="cls-327"
+                      d="M119.22,80.88c.27.76-1.17,1.29-1.6.81s.08-1.15.49-1.63A1.33,1.33,0,0,1,119.22,80.88Zm-.13.24a.88.88,0,0,0-.28-.65,2.21,2.21,0,0,0-.68-.39c.11.1.18.21.14.25a2.6,2.6,0,0,0-.46.64c-.1.2-.15.4,0,.56s.41.16.69.07A.86.86,0,0,0,119.09,81.12Z"/>
+                <path class="cls-327"
+                      d="M118.81,80.47a.88.88,0,0,1,.28.65.86.86,0,0,1-.6.48c-.28.09-.62.06-.69-.07s-.09-.36,0-.56a2.6,2.6,0,0,1,.46-.64s0-.15-.14-.25A2.21,2.21,0,0,1,118.81,80.47Z"/>
+                <path class="cls-329"
+                      d="M119,85.77h-.1a17.63,17.63,0,0,1-3.43-.24,26.21,26.21,0,0,1-5-1.59l2.3-1.52A25,25,0,0,0,115,84.59a6.46,6.46,0,0,0,1.76.86,8,8,0,0,0,1.9.31Z"/>
+                <path class="cls-329"
+                      d="M116,73.7l2.85,1.13a.54.54,0,0,0-.4.2,1.56,1.56,0,0,0-.32.6s.12.1.27.13l-.29.27,0,0s0,0,0,0l-.81,1.4a27,27,0,0,0-4.05.66l-.15-1.34h0A7.63,7.63,0,0,0,110.9,76c-.34-.09-.71-.19-1.11-.28l.69-2.53a17.37,17.37,0,0,0,2.23.49A12.85,12.85,0,0,0,116,73.7Z"/>
+                <path class="cls-327"
+                      d="M118.55,133.47a1.47,1.47,0,0,1,0,.79,6.56,6.56,0,0,1-.28.71,12.57,12.57,0,0,0-1.16,4.81,16.59,16.59,0,0,0,.45,5,5.68,5.68,0,0,0,.34,1,5,5,0,0,1-1.08.16s0,.07.1.1a.88.88,0,0,0,.24,0h0l-.57.11h0v0a.28.28,0,0,0,0-.09c0-.27,0-.67,0-1.23,0-1.07,0-2.71.14-5a43.28,43.28,0,0,1,.59-5,3.52,3.52,0,0,0,0-.49l.5-.45c.18-.17.36-.35.56-.56A2.17,2.17,0,0,1,118.55,133.47Z"/>
+                <path class="cls-327"
+                      d="M118.27,133a2.06,2.06,0,0,1,.18.31c-.2.21-.38.39-.56.56l-.5.45v-.12c0-.1-.06-.08-.09-.09s-.15,0-.14,0Z"/>
+                <path class="cls-327"
+                      d="M118.22,59.53c-.1.11-.19.2-.3.3a10.28,10.28,0,0,1-1.15.27.43.43,0,0,0,.1-.09A11.07,11.07,0,0,0,118.22,59.53Z"/>
+                <path class="cls-327"
+                      d="M117.61,173a7,7,0,0,1,.45,3.54,15.06,15.06,0,0,1-.25,1.79,14.49,14.49,0,0,1-.57,1.65c-.44,1-.91,2-1.31,2.75s-.66,1.24-.89,1.69l-1.37.16.26-.49c.26-.46.61-1.1,1-1.87s.91-1.66,1.36-2.62a10.73,10.73,0,0,0,.59-1.51,11.11,11.11,0,0,0,.31-1.64,6.51,6.51,0,0,0-.23-3.19,7.68,7.68,0,0,0-1.6-2.34,4.82,4.82,0,0,0-1.35-1,4.15,4.15,0,0,0,.48-.11,5.52,5.52,0,0,1,1.18.79A7.56,7.56,0,0,1,117.61,173Z"/>
+                <path class="cls-330" d="M118,145.88h0l0,0,0-.07H118v.11Z"/>
+                <path class="cls-330"
+                      d="M118,145.84l0,0h-.14l-.27.06-.38.08h0a.88.88,0,0,1-.24,0c-.1,0-.12-.11-.1-.1a5,5,0,0,0,1.08-.16h0Z"/>
+                <path class="cls-327"
+                      d="M117.26,77.5c.12,0,.19,0,.19,0s-2.67.84-5.32,1.71l-1.24.4-.84-.71c.59-.17,1.23-.34,1.85-.49.44-.11.88-.21,1.31-.29A27,27,0,0,1,117.26,77.5Z"/>
+                <path class="cls-329"
+                      d="M117,173.23a6.51,6.51,0,0,1,.23,3.19,11.11,11.11,0,0,1-.31,1.64,10.73,10.73,0,0,1-.59,1.51c-.45,1-.93,1.85-1.36,2.62s-.79,1.41-1,1.87l-.26.49-2.49.25c-1.07.09-2.15.17-3.22.23l-.57.08h-.52l-.34-.06-1.6-.24c-2.86-.44-5.73-.81-8.51-1.31l0-.06c.25-.35.66-.83,1.15-1.42a16.24,16.24,0,0,0,3-4.85,9.24,9.24,0,0,0,.15-5.63,3.12,3.12,0,0,0-1-1.41l1.8.3a33.41,33.41,0,0,0,10.82-.2c.56-.09,1.12-.21,1.69-.34a4.82,4.82,0,0,1,1.35,1A7.68,7.68,0,0,1,117,173.23Z"/>
+                <path class="cls-333"
+                      d="M117.12,59.81l-.25.2a5.08,5.08,0,0,1-.59.17h0a27.52,27.52,0,0,1-3.58.25A17.5,17.5,0,0,0,117.12,59.81Z"/>
+                <path class="cls-327"
+                      d="M116.87.75l-.18,2-2.07,0A21.11,21.11,0,0,1,115,5l-2.1-.09c-.15-.25-.29-.49-.44-.7a14.42,14.42,0,0,0-1.33-1.69l-.47-.5L111,.12c.72.07,2.33.24,4.45.49Z"/>
+                <path class="cls-333" d="M116.87,60a.43.43,0,0,1-.1.09l-.49.08A5.08,5.08,0,0,0,116.87,60Z"/>
+                <path class="cls-327"
+                      d="M116.28,60.18l.49-.08a3.19,3.19,0,0,1-.43.32,4.2,4.2,0,0,1-1.58,0,12.3,12.3,0,0,0,1.49-.29Z"/>
+                <path class="cls-327"
+                      d="M114.62,2.73l2.07,0s-.14.7-.3,2.29l-1.32,0H115A21.11,21.11,0,0,0,114.62,2.73Z"/>
+                <polygon class="cls-330" points="116.45 146.19 116.45 146.2 116.44 146.2 116.45 146.19"/>
+                <path class="cls-327"
+                      d="M115.25,80.3c.79-.22,1.33-.17,1.34-.09s-.52.19-1.17.51-1.22.74-1.93,1.21l-.62-.54A18.57,18.57,0,0,1,115.25,80.3Z"/>
+                <path class="cls-327"
+                      d="M116.39,5c-.16,1.72-.33,4.46-.31,8.44,0-.06-.09-.43-.18-.83-.13-.61-.28-1.19-.43-1.74-.13-2.7-.3-4.62-.47-5.91h.07Z"/>
+                <path class="cls-331" d="M116.08,13.43v0l-.52,0s0,0,0,0Z"/>
+                <path class="cls-330"
+                      d="M116.08,13.43l-.53.05c0-1,0-1.82-.08-2.62.15.55.3,1.13.43,1.74C116,13,116.07,13.37,116.08,13.43Z"/>
+                <path class="cls-327"
+                      d="M112.47,113.73s0,0,0,0c.19-.09.88-.25,1.5-.47a2,2,0,0,0,.64-.35,6.34,6.34,0,0,0-1.07-.07c-.63.06-.94.73-1.07.89C112.48,113.71,112.47,113.71,112.47,113.73Zm3-1.28a.3.3,0,0,1,.11.41c-.07.12-.1.1-.15.15l-.11,0a.33.33,0,0,0-.13.07,2.82,2.82,0,0,1-1.1.51,4,4,0,0,1-1.67.11s0-.21.11-.52a1.37,1.37,0,0,1,.91-.82,5.22,5.22,0,0,1,1.21-.05c.31,0,.54,0,.56,0A1,1,0,0,1,115.5,112.45Zm-.2.33c0-.06.06-.06,0-.07a.36.36,0,0,1-.11-.16c0-.08,0,0-.08,0a1,1,0,0,0-.23.13l-.25.21c.3,0,.5.07.5.07h.07A.51.51,0,0,1,115.3,112.78Z"/>
+                <path class="cls-327"
+                      d="M115.47,10.86c0,.8.06,1.67.08,2.62,0-.12-.08-.43-.14-.76a15.34,15.34,0,0,0-3.87-7.64l-.3-.28,1.66.06A23.88,23.88,0,0,1,115.47,10.86Z"/>
+                <path class="cls-329"
+                      d="M115.33,112.71s0,0,0,.07a.51.51,0,0,0-.07.18h-.07s-.2,0-.5-.07l.25-.21a1,1,0,0,1,.23-.13c.06,0,0-.07.08,0A.36.36,0,0,0,115.33,112.71Z"/>
+                <path class="cls-333"
+                      d="M116.25,60.18a12.3,12.3,0,0,1-1.49.29h-.1a.52.52,0,0,0-.43.08h-.09l-.9.06c-.32,0-.64,0-1,0s-.57,0-.85,0l-.28-.18h1.53A27.52,27.52,0,0,0,116.25,60.18Z"/>
+                <path class="cls-328" d="M115,5c.17,1.29.34,3.21.47,5.91a23.88,23.88,0,0,0-2.57-6Z"/>
+                <path class="cls-327" d="M115,184.39l-.1.21-.37.74c-.07.15-.36.17-.66.06s-.48-.38-.4-.56l.16-.29Z"/>
+                <path class="cls-333" d="M114.76,60.47l-.25,0h-.28a.52.52,0,0,1,.43-.08Z"/>
+                <path class="cls-327"
+                      d="M114.54,169.77a4.15,4.15,0,0,1-.48.11,1.21,1.21,0,0,0-.3-.11,1.78,1.78,0,0,0-.75,0s.23-.28.79-.22A2.32,2.32,0,0,1,114.54,169.77Z"/>
+                <path class="cls-327"
+                      d="M114.14,60.55h.08l-.09.11c-.63,0-1.25.06-1.89.11a.44.44,0,0,0-.29.14c-.18-.09-.36-.18-.53-.28.28,0,.56,0,.85,0s.65,0,1,0Z"/>
+                <path class="cls-329"
+                      d="M114.64,112.88a2,2,0,0,1-.64.35c-.62.22-1.31.38-1.5.47.13-.16.44-.83,1.07-.89A6.34,6.34,0,0,1,114.64,112.88Z"/>
+                <path class="cls-327"
+                      d="M114,128.21s0,.1,0,.16c-.57.1-1.15.16-1.73.21,0-.46-.06-.72-.06-.78l1,0,.67,0H114v.05C114,128,114,128.07,114,128.21Z"/>
+                <path class="cls-327"
+                      d="M113.58,117.91c.18.08.41.27.39.5a.66.66,0,0,1-.17.33,1.54,1.54,0,0,1-.16.18,4.72,4.72,0,0,1-.75.56,2.3,2.3,0,0,1-1.37.09c0-.06.61-.14,1.21-.39a6.23,6.23,0,0,0,.6-.57.83.83,0,0,0,.11-.15v0s0,0-.07,0a5.46,5.46,0,0,0-.81-.13l-.62-.11a1.38,1.38,0,0,0-1.06.31A3.82,3.82,0,0,0,110,120a2.14,2.14,0,0,1,.63-1.87,1.84,1.84,0,0,1,1.4-.55l.64.06A6.29,6.29,0,0,1,113.58,117.91Z"/>
+                <path class="cls-327" d="M113.49,81.93l-.46.3c-.1.06-.19.14-.3.2l-.51-.51-.12-.14.52-.27.25-.12Z"/>
+                <path class="cls-329"
+                      d="M113.06,76.82l.15,1.34c-.43.08-.87.18-1.31.29-.62.15-1.26.32-1.85.49-.84-.71-1.44-1.15-1.53-1a12.33,12.33,0,0,0,1,1.17l-1.41.45c-1,.34-1.73.63-1.77.65a15.63,15.63,0,0,0-1.68.9c-.23.14-.47.32-.73.49-2.14-.7-4.38-1.35-6.6-2-.41-.12-.87-.24-1.2-.36L95,78.74l-2.35-1.06-.27-.13c1.23-.33,2.42-.62,3.38-.82,1.38-.31,2.34-.4,2.4-.42s1-.18,2.41-.34a36.41,36.41,0,0,1,5.14-.12,39,39,0,0,1,5.08.56C112,76.62,112.85,76.82,113.06,76.82Z"/>
+                <path class="cls-327"
+                      d="M113.11,76.81h0c-.21,0-1-.2-2.26-.41a39,39,0,0,0-5.08-.56,36.41,36.41,0,0,0-5.14.12c-1.41.16-2.36.31-2.41.34s-1,.11-2.4.42c-1,.2-2.15.49-3.38.82L91.18,77c1.56-.55,3.1-1,4.34-1.32,1.41-.37,2.41-.51,2.46-.53s1-.15,2.51-.25a34.33,34.33,0,0,1,5.28.12,31.53,31.53,0,0,1,4,.66c.4.09.77.19,1.11.28A7.63,7.63,0,0,1,113.11,76.81Z"/>
+                <path class="cls-332"
+                      d="M112.65,43.07l1.16.58c-3.19.19-5.8,3.79-6,8.43-.2,3.68,1.21,6.9,3.38,8.36l.28.18a27.46,27.46,0,0,1-4.74-.64,38.19,38.19,0,0,1-4.38-1.13A16.54,16.54,0,0,1,98,56.92l0,0-1.51-1.06c-.25-.17-.48-.37-.73-.56l-.48-.39,0-.17.08-.42c.06-.29.15-.57.23-.86a13.37,13.37,0,0,1,.65-1.69,18.93,18.93,0,0,1,4.41-5.84,15.12,15.12,0,0,1,5.9-3.71A8.77,8.77,0,0,1,112.65,43.07Z"/>
+                <path class="cls-327" d="M112.87,81.39l-.25.12-.52.27c-.65-.66-1.28-1.33-1.82-1.91l.61-.22,1.91,1.68Z"/>
+                <path class="cls-327" d="M112.22,81.92l.51.51L110.43,84l-1.3-.52.94-.53c.56-.33,1.28-.71,2-1.12Z"/>
+                <path class="cls-327"
+                      d="M112.46,4.16c.15.21.29.45.44.7l-1.66-.06A6.89,6.89,0,0,0,110,3.92l-.53-.24L110.66,2l.47.5A14.42,14.42,0,0,1,112.46,4.16Z"/>
+                <path class="cls-331" d="M112.47,113.73s0,0,0,0S112.48,113.73,112.47,113.73Z"/>
+                <path class="cls-327"
+                      d="M110.44,138.38l0,0-.06.07a.67.67,0,0,0-.06.12v0l0-.11.09-.47c.37-2.56.74-5.1,1-7,.15-1,.27-1.83.36-2.38l.34,0c.06,1.62-.14,5.59-.51,9.59l0,.48v.14a2.13,2.13,0,0,1-.11.41h0l0,0h0a0,0,0,0,0,0,0h0s0,0,0,0l-.06-.07h0l0,0-.18-.15s0,0,0,0l0,0-.06-.07-.08-.06s0-.05-.06-.06l0,0v0h0A2,2,0,0,0,110.44,138.38Z"/>
+                <path class="cls-327" d="M112.18,128.59l-.34,0c.09-.52.14-.8.2-.8S112.16,128.1,112.18,128.59Z"/>
+                <path class="cls-329"
+                      d="M110.83,128.67l1,0c-.09.55-.21,1.37-.36,2.38-.29,1.91-.66,4.45-1,7l-.09.47,0,.11v0l0,0-.07.16-.38.9c-.23.6-.46,1.18-.69,1.75-.45,1.14-.86,2.21-1.23,3.13s-.64,1.71-.85,2.27c0,.14-.11.27-.15.38v.05l0,.13s0,.07,0,.1l0,.05a1.11,1.11,0,0,1-.08.24c0,.08-.38,1.22-.91,2.9-.59.49-1.27,1.06-2,1.67l-2.48,2.11-.32.28-.16.13,0,.06h0a3.65,3.65,0,0,1-.26-.44,1.35,1.35,0,0,1-.15-.51.82.82,0,0,1,0-.22s0-.27.32-.66a4.94,4.94,0,0,1,.51-.66c-.16-.37-1.59,1-1.42,1.26a1.48,1.48,0,0,0,.38,1,2.13,2.13,0,0,0,.21.22l-1.64-.22-.8-.13-.32,0a.88.88,0,0,1,0-.28,1.46,1.46,0,0,1,.14-.51l.11-.23a3.2,3.2,0,0,1,.41-.71c.24-.34.61-.58.58-.65s-.5,0-.88.35a2.82,2.82,0,0,0-.45.49,1.3,1.3,0,0,0-.18.27,1.81,1.81,0,0,0-.15.94c-.17-.24-.35-.47-.52-.69v-.14a2,2,0,0,1,0-.23,3.91,3.91,0,0,1,0-.48,5.21,5.21,0,0,1,.18-.86,2,2,0,0,1,.8-1.13,1.71,1.71,0,0,1,1.24-.32c.15.28,3.52-1.08,3.58-1.11a21.48,21.48,0,0,0,3.11-2.05h0c.28-.05.44-2.67.45-5.34a42,42,0,0,0-.24-5.61,14,14,0,0,0-.51-1.79c-.33-1-.83-2.27-1.36-3.53s-1.16-2.6-1.65-3.5a16.43,16.43,0,0,0,3.89,1.09A24.73,24.73,0,0,0,110.83,128.67Z"/>
+                <path class="cls-330" d="M111.49,139.22h0a.33.33,0,0,1,0,.06h0Z"/>
+                <path class="cls-327"
+                      d="M111.47,139.28c-.11.3-.21.6-.32.89-.19.61-.4,1.21-.6,1.78l-1.06,3.18-.76,2.28,0,.08c-.32.06-.92.16-.92.18h-.91s0-.1,0-.15,0-.07,0-.1l0-.13v-.05c0-.11.1-.24.15-.38.21-.56.51-1.34.85-2.27s.78-2,1.23-3.13c.23-.57.46-1.15.69-1.75l.38-.9.07-.16,0,0c0,.07.09.22.13.19s0-.2.11-.14h.18v0l0,0s0,0,.06.06l.08.06.06.07,0,0s0,0,0,0l.18.15,0,0h0l.06.07s0,0,0,0h0a0,0,0,0,1,0,0h0Z"/>
+                <path class="cls-327"
+                      d="M111,.12,110.66,2l-1.17,1.71.53.24a6.89,6.89,0,0,1,1.22.88l-1-.06-1.6-.14c-.93-.08-2.25-.19-3.82-.23-.54,0-1.11,0-1.7,0-.18-.51-.35-1-.52-1.36a6.59,6.59,0,0,0-.33-.65,2.19,2.19,0,0,0-.53-.63c-.24-.21-.43-.39-.59-.52l-.45-.41,0-.38c1.49-.18,2.88-.28,4.14-.34,1.67-.07,3.09-.06,4.11,0l1.65.06Z"/>
+                <path class="cls-327" d="M110.89,79.65l-.61.22-.63-.69a1.14,1.14,0,0,1-.11-.11l.51-.13Z"/>
+                <path class="cls-330"
+                      d="M110.47,138.42l0,0a2,2,0,0,1,.3.27h-.15c-.09-.06-.12.13-.11.14s-.11-.12-.13-.19a.67.67,0,0,1,.06-.12Z"/>
+                <path class="cls-329"
+                      d="M110.28,79.87c.54.58,1.17,1.25,1.82,1.91-.75.41-1.47.79-2,1.12l-.94.53-2-.78c-.62-.23-1.25-.45-1.89-.67.89-.46,1.56-.72,1.6-.74s.67-.32,1.66-.7C109,80.33,109.62,80.1,110.28,79.87Z"/>
+                <path class="cls-327"
+                      d="M110.05,78.94l-.51.13a12.33,12.33,0,0,1-1-1.17C108.61,77.79,109.21,78.23,110.05,78.94Z"/>
+                <path class="cls-327"
+                      d="M109.65,79.18l.63.69c-.66.23-1.27.46-1.78.67-1,.38-1.63.68-1.66.7s-.71.28-1.6.74c-.43-.14-.86-.29-1.29-.42.26-.17.5-.35.73-.49a15.63,15.63,0,0,1,1.68-.9s.74-.31,1.77-.65l1.41-.45A1.14,1.14,0,0,0,109.65,79.18Z"/>
+                <path class="cls-327" d="M109.13,83.43l1.3.52-.93.62-.31.18-1.3-.46.65-.49.34-.22Z"/>
+                <path class="cls-327"
+                      d="M107.89,84.29l1.3.46c-.2.12-.48.3-.8.53A26.74,26.74,0,0,0,106.14,87a28.84,28.84,0,0,1-3.2,2.63s0,0,0,0a16.41,16.41,0,0,1,2.65-3.21,28.42,28.42,0,0,1,2.15-2Z"/>
+                <path class="cls-327"
+                      d="M109.13,83.43l-.25.15-.34.22-.65.49-1.19-.41c-1-.32-2-.62-3-.91l0,0,.79-.53.7-.43h0c.64.22,1.27.44,1.89.67Z"/>
+                <path class="cls-330" d="M108.73,147.41a.24.24,0,0,0,0,.08h0Z"/>
+                <path class="cls-331" d="M108.7,147.49l0,.14h0l0,.05Z"/>
+                <path class="cls-330" d="M108.7,147.49l-.08.2-.21,0h-.63S108.38,147.55,108.7,147.49Z"/>
+                <polygon class="cls-330"
+                         points="108.66 147.64 108.62 147.76 108.62 147.71 108.62 147.69 108.66 147.64"/>
+                <path class="cls-327"
+                      d="M108.62,147.76h0v0h0l0,.15,0,.07-.09.31s-.12.37-.32.92-.52,1.42-.88,2.42l-5,3.82-.77.6a.39.39,0,0,1-.14.08h0l-.15.06h-.13l-.23,0c-.27,0-.38-.06-.52-.08-.57-.1-1.11-.22-1.65-.33-.27-.06-.53-.13-.8-.18l-.42-.09-.3-.06c-.1,0-.21,0-.25-.15l-1-1.53v-.4a2.83,2.83,0,0,1,0-.29c0-.2.07-.38.11-.55a4.17,4.17,0,0,1,.32-1,2.43,2.43,0,0,1,1.22-1.28,2.6,2.6,0,0,1,1.43.07h0a1.71,1.71,0,0,0-1.24.32,2,2,0,0,0-.8,1.13,5.21,5.21,0,0,0-.18.86,3.91,3.91,0,0,0,0,.48,2,2,0,0,0,0,.23v.14c.17.22.35.45.52.69a.25.25,0,0,0,0,.08c.09.53.49.86.55.79s-.08-.27-.12-.54l.32,0,.8.13,1.64.22c.26.25.53.39.57.34s-.06-.17-.17-.34h0l0-.06.16-.13.32-.28,2.48-2.11c.71-.61,1.39-1.18,2-1.67.53-1.68.89-2.82.91-2.9a1.11,1.11,0,0,0,.08-.24l0-.05c0,.05,0,.1,0,.15h1.54l.21,0v.07Z"/>
+                <path class="cls-329"
+                      d="M107.89,84.29l-.16.11a28.42,28.42,0,0,0-2.15,2,16.41,16.41,0,0,0-2.65,3.21l-3,.45a7.27,7.27,0,0,1-1.42-.76,5.31,5.31,0,0,1-.67-.5c-.15-.12-.29-.28-.43-.41a6.64,6.64,0,0,1-.75-1l.59-.34A34.53,34.53,0,0,0,102,84.1L103.7,83c1,.29,2,.59,3,.91Z"/>
+                <path class="cls-327"
+                      d="M107.84,122.82a.43.43,0,0,1-.13.43,1.28,1.28,0,0,1-.45.21,1.64,1.64,0,0,1-.33.05,1.87,1.87,0,0,1-.72-.07l-.17,0s0,0,0-.09,0-.08,0-.1,0,0,.08,0a.8.8,0,0,0-.09-.14c0-.08-.2-.1-.08-.11a1,1,0,0,0,.32.05,2.34,2.34,0,0,0,.82-.14s.08,0,.09,0,.09,0,0-.09a1.55,1.55,0,0,0-.49-.21c-.15,0-.26,0-.28,0s.45-.33,1-.08A.68.68,0,0,1,107.84,122.82Zm-1.66.46c.12.16,0,0,0,0Z"/>
+                <path class="cls-331" d="M106.15,123.24s.15.2,0,0Z"/>
+                <path class="cls-327"
+                      d="M105.93,136.27a42,42,0,0,1,.24,5.61c0,2.67-.17,5.29-.45,5.34a.14.14,0,0,0,0-.1c-.06-.1.19-.45-.2-.37-.17-.87-.38-2.82-.6-4.81-.16-1.34-.32-2.68-.45-3.68-.07-.5-.14-.92-.19-1.21s-.09-.45-.09-.47-.1-.67-.35-1.65-.59-2.27-1-3.56c-.45-1.55-.93-3.07-1.2-4.07h0a.61.61,0,0,0,0-.12l.66.28c.49.9,1.1,2.19,1.65,3.5s1,2.53,1.36,3.53A14,14,0,0,1,105.93,136.27Z"/>
+                <path class="cls-330"
+                      d="M105.54,146.75c.39-.08.14.27.2.37a.14.14,0,0,1,0,.1h0c-.06,0-.11-.16-.17-.47Z"/>
+                <path class="cls-327"
+                      d="M105.54,146.76c.06.31.11.47.17.47a21.48,21.48,0,0,1-3.11,2.05c-.06,0-3.43,1.39-3.58,1.11h0a5.71,5.71,0,0,1,1.39-.6c1.38-.81,2.14-1.37,3.62-2.32l1-.51A2.21,2.21,0,0,1,105.54,146.76Z"/>
+                <path class="cls-327"
+                      d="M105.47,13c0,.13.12.48-.07.2a4,4,0,0,0-1.31-.93l-.45-.4c-.36-.31-.69-.58-1-.83l-.81-.6c-.52-.38-1-.74-1.53-1.07a19.46,19.46,0,0,0-2.83-1.61,21.24,21.24,0,0,0-4.57-1.49c-.36-.07-.68-.12-1-.16l.5-.22.71-.28.66-.23.2-.06A32.83,32.83,0,0,1,97.64,7a25.86,25.86,0,0,1,2.88,1.82L102.08,10l.81.62.62.5.27.21a12.11,12.11,0,0,1,1,1c.19.28,0-.08,0-.23s-.11-.33-.17-.47-.17-.48-.2-.55c-.41-1.14-1.16-3.13-1.71-4.38a22.39,22.39,0,0,0-1.09-2.27c.51,0,1,0,1.47,0,.2.59.41,1.26.65,2,.47,1.54,1,3.42,1.7,5.64a1.33,1.33,0,0,0,0,.53A4.32,4.32,0,0,0,105.47,13Z"/>
+                <path class="cls-327"
+                      d="M105.24,82h0l-.7.43-.79.53,0,0c-.39-.12-.77-.22-1.17-.33l.63-.48.76-.58,0,0C104.38,81.69,104.81,81.84,105.24,82Z"/>
+                <path class="cls-328"
+                      d="M104.8,12c0,.15.2.51,0,.23a12.11,12.11,0,0,0-1-1l-.27-.21-.62-.5-.81-.62-1.56-1.15A25.86,25.86,0,0,0,97.64,7,32.83,32.83,0,0,0,94,5.32a27.82,27.82,0,0,1,5.54-.88c.73,0,1.43-.07,2.12-.08a22.39,22.39,0,0,1,1.09,2.27c.55,1.25,1.3,3.24,1.71,4.38,0,.07.11.27.2.55S104.74,11.87,104.8,12Z"/>
+                <path class="cls-327"
+                      d="M104,81.56l0,0-.76.58-.63.48c-1.83-.5-3.71-1-5.61-1.46-.44-.1-.83-.2-1.32-.35h0l.12-.25-2.1-1-.19.4-1.49-.62-2.27-1c.36-.12.73-.24,1.09-.34.55-.17,1.1-.32,1.64-.47l.27.13L95,78.74l1.14.49c.33.12.79.24,1.2.36C99.57,80.21,101.81,80.86,104,81.56Z"/>
+                <path class="cls-327"
+                      d="M102.53,82.64c.4.11.78.21,1.17.33L102,84.1A34.53,34.53,0,0,1,97.22,87a33.12,33.12,0,0,1,4.31-3.6Z"/>
+                <path class="cls-327"
+                      d="M99.59,111.48c0,.07.06.11,0,.12s-.07,0-.16-.1,0-.14,0-.15a.27.27,0,0,1,.11,0l.26,0c.37,0,.84-.07,1.29-.16a5.26,5.26,0,0,1,1.39-.1,2.08,2.08,0,0,1,.54.11.81.81,0,0,1,.29.17.44.44,0,0,1,0,.57,1.19,1.19,0,0,1-.31.26,5.59,5.59,0,0,0-.48.38,1.63,1.63,0,0,1-.75.34,1.56,1.56,0,0,1-.77-.19c-.2-.09-.38-.19-.56-.26s-.53-.28-.51-.32a1.55,1.55,0,0,1,.59.1l.59.17a1.26,1.26,0,0,0,.61.09c.33-.07.64-.51,1-.74.12-.08,0,0,.06-.06h0l-.34-.08a5.8,5.8,0,0,0-1.27,0,8.19,8.19,0,0,1-1.33,0A1.56,1.56,0,0,0,99.59,111.48Z"/>
+                <path class="cls-327"
+                      d="M100.84,3.12s0,0,0,0l0-.09ZM102.58,3c.17.4.34.85.52,1.36-.47,0-1,0-1.47,0-.15-.28-.3-.54-.44-.75s-.22-.28-.31-.4,0,0-.06,0,0,0,0,0h0l-.11-.05L100,2.74l-.51-.25L100.68.77l.45.41c.16.13.35.31.59.52a2.19,2.19,0,0,1,.53.63A6.59,6.59,0,0,1,102.58,3Z"/>
+                <path class="cls-329"
+                      d="M102.53,82.64l-1,.79A33.12,33.12,0,0,0,97.22,87l-.59.34a7.57,7.57,0,0,1-.41-.8,19.25,19.25,0,0,1-1-3.09c-.13-.53-.22-1-.32-1.33.32-.63.53-1.07.66-1.32h0c.49.15.88.25,1.32.35C98.82,81.66,100.7,82.14,102.53,82.64Z"/>
+                <path class="cls-327"
+                      d="M102.41,127.45l-.66-.28c.1-.2.16-.37.21-.49C102.1,126.89,102.25,127.15,102.41,127.45Z"/>
+                <path class="cls-327"
+                      d="M99.91,125.52l2.2.79s0,.12-.13.34l0,0c-.22-.36-.38-.55-.47-.51s0,.38.16.94a20.92,20.92,0,0,1-1.94-1C99.85,125.73,99.91,125.52,99.91,125.52Z"/>
+                <path class="cls-327"
+                      d="M102,97.64l0,0c-.43.44-1,1-1,1-.55.47-.84.85-1.4,1.29l-1.32,1.06c-.8.62-1.54,1.16-2.27,1.62a19,19,0,0,1-3.75,1.7c-1,.34-1.69.55-2.15.68l-.23.08c-.08-.65-.16-1.29-.21-1.93h.18A15.67,15.67,0,0,0,92.1,103a12.34,12.34,0,0,0,3.66-1.14,31.49,31.49,0,0,0,4.38-3l1-.8-.05-.07c-.21.06-.59.13-.62.14l-1,.25c-.41,0-.75.09-1.14.12l-1.44.12a22.81,22.81,0,0,1-2.59,0,12.91,12.91,0,0,1-3.8-.75c-.34-.12-.64-.25-.91-.37a16.9,16.9,0,0,1,.21-1.91,6,6,0,0,0,1.2.94,9.34,9.34,0,0,0,3.29,1.15,14.44,14.44,0,0,0,2.5.18l1.45,0c.6,0,1.35-.09,2.06-.17A12.07,12.07,0,0,0,102,97.64Z"/>
+                <path class="cls-327"
+                      d="M102,126.68c0,.12-.11.29-.21.49l-.1-.06c-.15-.56-.22-.91-.16-.94S101.74,126.32,102,126.68Z"/>
+                <path class="cls-330" d="M101.75,127.17a.61.61,0,0,1,0,.12c0-.06,0-.12,0-.18Z"/>
+                <path class="cls-327"
+                      d="M101.7,127.29h0c0,.08-.08.18-.12.27a24.62,24.62,0,0,1-1.77,3.07,46.21,46.21,0,0,1-3,3.87c-1.14,1.33-2.42,2.76-3.77,4.06-2.7,2.6-5.38,5.11-6.89,7.39s-2,4.09-2.17,4a6.35,6.35,0,0,1,.67-3,1.4,1.4,0,0,0,.54-.28,1.49,1.49,0,0,0-.45.1,10.64,10.64,0,0,1,.63-1.34,18.5,18.5,0,0,1,1.77-2.69,1.46,1.46,0,0,0,.62-.28,1.67,1.67,0,0,0-.46.06c1.32-1.69,3-3.45,4.55-5.15,1.26-1.36,2.39-2.77,3.45-4.15A43.59,43.59,0,0,0,98,129.47a21.87,21.87,0,0,0,1.49-2.83c.08-.2.15-.39.22-.53a20.92,20.92,0,0,0,1.94,1C101.67,127.17,101.68,127.23,101.7,127.29Z"/>
+                <path class="cls-327"
+                      d="M101.19,3.61c.14.21.29.47.44.75-.69,0-1.39,0-2.12.08A27.82,27.82,0,0,0,94,5.32c-.31-.13-.61-.23-.89-.34-1.2-.42-2.08-.69-2.66-.86s-.74-.22-.83-.24l0,0c.47-.28.95-.55,1.43-.81l.73-.39.81-.38A27.32,27.32,0,0,1,99.08.59c.53-.08,1-.15,1.56-.2l0,.38L99.51,2.49l.51.25.66.35.11.05h0s0,0,0,0,0,0,.06,0S101.08,3.44,101.19,3.61Z"/>
+                <path class="cls-327"
+                      d="M99.9,153.73c-.17-.27,1.26-1.63,1.42-1.26a4.94,4.94,0,0,0-.51.66c-.33.39-.33.64-.32.66a.82.82,0,0,0,0,.22,1.35,1.35,0,0,0,.15.51,3.65,3.65,0,0,0,.26.44c-.06,0-.08,0-.4,0a2.13,2.13,0,0,1-.21-.22A1.48,1.48,0,0,1,99.9,153.73Z"/>
+                <path class="cls-328"
+                      d="M101.07,98l.05.07-1,.8a31.49,31.49,0,0,1-4.38,3A12.34,12.34,0,0,1,92.1,103a15.67,15.67,0,0,1-2.19.21h-.18c-.08-.69-.13-1.39-.17-2.07a28.17,28.17,0,0,1,0-3.57c.27.12.57.25.91.37a12.91,12.91,0,0,0,3.8.75,22.81,22.81,0,0,0,2.59,0l1.44-.12c.39,0,.73-.07,1.14-.12l1-.25S100.86,98.1,101.07,98Z"/>
+                <path class="cls-330"
+                      d="M100.89,155c.11.17.2.31.17.34s-.31-.09-.57-.34C100.81,155,100.83,155,100.89,155Z"/>
+                <path class="cls-330" d="M100.92,3l0,.09s0,0,0,0Z"/>
+                <path class="cls-327"
+                      d="M100.75,171.53a9.24,9.24,0,0,1-.15,5.63,16.24,16.24,0,0,1-3,4.85c-.49.59-.9,1.07-1.15,1.42l0,.06-1.24-.24a19.52,19.52,0,0,1,1.6-1.95,15.32,15.32,0,0,0,3-4.41,9.27,9.27,0,0,0,.5-5.22A3.14,3.14,0,0,0,99.26,170l.19.05.3.06A3.12,3.12,0,0,1,100.75,171.53Z"/>
+                <path class="cls-327"
+                      d="M100.78,90.48s.21.06,0,.09l-.85.17L98.33,91c-.51.08-1,.16-1.44.25l-1.1.15a12.62,12.62,0,0,1-3.55.14,8.44,8.44,0,0,1-1.44-.35c.17-.56.36-1.1.56-1.61a4.75,4.75,0,0,0,1.28.71,8,8,0,0,0,3.19.34l1.08-.06.9-.08,1-.14.52-.09c.17,0,0,0-.09-.06l-.25-.1-.17-.07a6.09,6.09,0,0,1-.91-.5c-.14-.09-.26-.18-.39-.28a6.4,6.4,0,0,1-.49-.42A7.64,7.64,0,0,1,95.58,87c-.7-1.21-1.13-2.23-1.53-3,0,0,0,0,0,0,.35-.72.65-1.32.9-1.82.1.36.19.8.32,1.33a19.25,19.25,0,0,0,1,3.09,7.57,7.57,0,0,0,.41.8,6.64,6.64,0,0,0,.75,1c.14.13.28.29.43.41a5.31,5.31,0,0,0,.67.5,7.27,7.27,0,0,0,1.42.76l.32.12s.28.16.29.2S100.73,90.44,100.78,90.48Z"/>
+                <path class="cls-328"
+                      d="M100.32,171.67a9.27,9.27,0,0,1-.5,5.22,15.32,15.32,0,0,1-3,4.41,19.52,19.52,0,0,0-1.6,1.95c-.94-.2-1.88-.41-2.79-.66a24.29,24.29,0,0,1-5.63-2.32c-.31-.16-.61-.34-.91-.52l1.19-.44a17.54,17.54,0,0,0,5.13-3A6.44,6.44,0,0,0,94,173.7a7.71,7.71,0,0,0,.46-2.71,6.72,6.72,0,0,0-.41-2.48l.77.23,2.83.82c.5.15,1,.31,1.61.45A3.14,3.14,0,0,1,100.32,171.67Z"/>
+                <path class="cls-327"
+                      d="M99.75,170.12l-.3-.06-.19-.05c-.18-.14-.31-.22-.31-.25s.28,0,.66.26A1.21,1.21,0,0,1,99.75,170.12Z"/>
+                <path class="cls-329"
+                      d="M99.71,126.11c-.07.14-.14.33-.22.53A21.87,21.87,0,0,1,98,129.47a43.59,43.59,0,0,1-2.68,3.81c-1.06,1.38-2.19,2.79-3.45,4.15-1.58,1.7-3.23,3.46-4.55,5.15a9.23,9.23,0,0,1-1.41.16,13.88,13.88,0,0,1-4.1-.47,5.54,5.54,0,0,1-1.92-.88A4.65,4.65,0,0,1,78.67,140a4.69,4.69,0,0,1-.6-1.71c1.05-1.3,2.08-2.5,3.07-3.62a5.25,5.25,0,0,0,1.55,1.43,4.43,4.43,0,0,0,2.13.61c.62,0,1.05-.3.94-.46s-.35-.18-.75-.42a6.1,6.1,0,0,1-1.31-1,4.22,4.22,0,0,1-.78-1.32,4.9,4.9,0,0,1-.17-.55l.4-.44c.52-.55,1-1.06,1.51-1.53a6.13,6.13,0,0,0,1.52,1.53c1.59,1.09,3.38,1.26,3.45,1s-1.41-1.08-2.36-2.23a4.52,4.52,0,0,1-.94-1.64,1.39,1.39,0,0,1-.06-.19c.45-.41.88-.82,1.28-1.2l.75-.71a3.12,3.12,0,0,0,1.09,1.33,4.22,4.22,0,0,0,.71.41l.67.3A8.21,8.21,0,0,0,92,130c.75.18,1.31.12,1.32-.06s-.38-.36-1-.77c-.28-.2-.61-.44-.94-.71-.17-.13-.34-.28-.52-.41s-.34-.3-.45-.42a1.34,1.34,0,0,1-.23-1.46,2.38,2.38,0,0,1,.29-.54.56.56,0,0,1,.09-.13l0,0-.07,0,1.16-1.09,0,0s0,0,0,0,.08.2.08.21a3.21,3.21,0,0,0,.52.56,7.08,7.08,0,0,0,1,.61c.76.4,1.69.51,1.78.18s-.34-.83-.71-1.45l-.5-.81a.79.79,0,0,1,0-.24,1.14,1.14,0,0,1-.44-.79c0-.06,0-.13,0-.2a5.81,5.81,0,0,0,.55-1c.11.12.22.25.35.37a30.63,30.63,0,0,0,3.56,3C98.42,125.29,99.05,125.71,99.71,126.11Z"/>
+                <path class="cls-328"
+                      d="M99.22,90.23s.26,0,.09.06l-.52.09-1,.14-.9.08-1.08.06a8,8,0,0,1-3.19-.34,4.75,4.75,0,0,1-1.28-.71c.13-.38.29-.75.44-1.1.73-1.57,1.51-3.06,2.07-4.22.06-.11.11-.22.16-.32s0,0,0,0c.4.77.83,1.79,1.53,3A7.64,7.64,0,0,0,97,88.86a6.4,6.4,0,0,0,.49.42c.13.1.25.19.39.28a6.09,6.09,0,0,0,.91.5l.17.07Z"/>
+                <path class="cls-327"
+                      d="M99,152.19c0,.07-.34.31-.58.65a3.2,3.2,0,0,0-.41.71l-.11.23a1.46,1.46,0,0,0-.14.51.88.88,0,0,0,0,.28h0c-.05,0-.13,0-.17,0l-.22-.28a1.81,1.81,0,0,1,.15-.94,1.3,1.3,0,0,1,.18-.27,2.82,2.82,0,0,1,.45-.49C98.45,152.23,98.93,152.11,99,152.19Z"/>
+                <path class="cls-327"
+                      d="M98.17,120.36a2.8,2.8,0,0,1-.47,2.3h0l-.42-.33a.21.21,0,0,0,.08,0,2.37,2.37,0,0,0,.36-1.61c-.3,0-.83,0-1.14,0a1.4,1.4,0,0,1-.48.58c-.14-.11-.26-.24-.39-.36.33-.22.39-.39.39-.44l-.11-.34.37,0c.5,0,1.31,0,1.48,0A.32.32,0,0,1,98.17,120.36Z"/>
+                <path class="cls-330"
+                      d="M97.73,154.57c0,.27.16.5.12.54s-.46-.26-.55-.79a.25.25,0,0,1,0-.08l.22.28s.12,0,.17,0Z"/>
+                <path class="cls-329"
+                      d="M97.71,120.67a2.37,2.37,0,0,1-.36,1.61.21.21,0,0,1-.08,0c-.4-.35-.81-.71-1.18-1.08a1.4,1.4,0,0,0,.48-.58C96.88,120.68,97.41,120.68,97.71,120.67Z"/>
+                <path class="cls-327"
+                      d="M97.69,122.66h0a.7.7,0,0,1-.5.19,1.06,1.06,0,0,1-.5-.14l.27-.45a.36.36,0,0,0,.31.06Z"/>
+                <path class="cls-327"
+                      d="M95.18,183.25l1.24.24a5.11,5.11,0,0,0-.33.5c-.07.13-.37.1-.65-.05s-.44-.39-.35-.55A.61.61,0,0,1,95.18,183.25Z"/>
+                <path class="cls-327" d="M96.09,121.25l-.16.11-.29-.43.06,0C95.83,121,96,121.14,96.09,121.25Z"/>
+                <path class="cls-327" d="M93.61,79.55l2.1,1-.12.25c-.49-.17-.83-.32-1.26-.49s-.61-.26-.91-.39Z"/>
+                <path class="cls-327"
+                      d="M95.59,80.83c-.13.25-.34.69-.66,1.32-.05-.21-.1-.39-.15-.55a2.2,2.2,0,0,0-.29-.62,1.38,1.38,0,0,0-.38-.33l-.93,1.83A10.37,10.37,0,0,1,94,84c0,.1-.1.21-.16.32-.56,1.16-1.34,2.65-2.07,4.22-.15.35-.31.72-.44,1.1a1.48,1.48,0,0,1-.43-.49l-1.44,1.5a5.12,5.12,0,0,0,1.31.6,28.67,28.67,0,0,0-.74,2.94c-.1.5-.18,1-.24,1.52a2,2,0,0,1-.45-.57l-1.59,1.34a6.81,6.81,0,0,0,1.83,1.14,28.17,28.17,0,0,0,0,3.57c0,.68.09,1.38.17,2.07h-.56v0c-.09-1.39-.17-2.74-.26-4l-.41-.52-.25-.35-.48-.65c-.08-.13-.18-.25-.25-.37,0-.7.11-1.38.19-2l1.56-1-1-1.45a.7.7,0,0,1-.17.11,28,28,0,0,1,1-3.44c.9-.71,1.52-1.19,1.47-1.29s-.48,0-1.13.32c.12-.3.23-.59.36-.87.79-1.78,1.48-3.13,2.06-4.35.77-1.61,1.33-2.75,1.6-3.33.3.13.61.25.91.39S95.1,80.66,95.59,80.83Z"/>
+                <path class="cls-327"
+                      d="M94.36,124.48c.37.62.8,1.15.71,1.45s-1,.22-1.78-.18a7.08,7.08,0,0,1-1-.61,3.21,3.21,0,0,1-.52-.56s0-.09-.08-.21,0,0,0,0a12.66,12.66,0,0,0,1.66-1.89c0,.07,0,.14,0,.2a1.14,1.14,0,0,0,.44.79.79.79,0,0,0,0,.24Z"/>
+                <path class="cls-327"
+                      d="M94.78,81.6c0,.16.1.34.15.55-.25.5-.55,1.1-.9,1.82a10.37,10.37,0,0,0-.85-1.49l.93-1.83a1.38,1.38,0,0,1,.38.33A2.2,2.2,0,0,1,94.78,81.6Z"/>
+                <path class="cls-327"
+                      d="M94.46,171A7.71,7.71,0,0,1,94,173.7a6.44,6.44,0,0,1-1.83,2.64,17.54,17.54,0,0,1-5.13,3l-1.19.44c-.44-.25-.86-.51-1.27-.79l.28-.08c.45-.14,1.07-.32,1.8-.58a17.38,17.38,0,0,0,5-2.58A6.57,6.57,0,0,0,94,171a15.13,15.13,0,0,0-.06-2.49l.1,0A6.72,6.72,0,0,1,94.46,171Z"/>
+                <path class="cls-327"
+                      d="M94.09,120.41a1.36,1.36,0,0,1-.21,1.08,12.58,12.58,0,0,1-1.49-2c.71-1.2.79-1.73.88-1.54A15.89,15.89,0,0,0,94.09,120.41Z"/>
+                <path class="cls-330" d="M94.05,168.51l-.1,0c0-.06,0-.09,0-.09S94,168.43,94.05,168.51Z"/>
+                <path class="cls-329"
+                      d="M94,168.48A15.13,15.13,0,0,1,94,171a6.57,6.57,0,0,1-2.39,4.75,17.38,17.38,0,0,1-5,2.58c-.73.26-1.35.44-1.8.58l-.28.08h0a4.65,4.65,0,0,1-.41-.26l-.61-.42c-.32-.24-.75-.54-1.11-.85-.75-.58-1.59-1.38-2.38-2.07,0,.93,0,1.85,0,2.77l-1.43-3L78,173.62l-1,1.31-1.06,1.37-.15.18s-.06.1-.06,0l0-.11-.1-.53c-.25-1.13-.49-2.24-.74-3.35-.12-.55-.24-1.09-.37-1.65l-.17-.82a8.06,8.06,0,0,0-.28-1c-.14-.29-.48-1.41-.86-2.66.4.08.87.14,1.39.19a11.28,11.28,0,0,0,2.78,0,10.69,10.69,0,0,0,3-1,5.54,5.54,0,0,0,2.2-1.54,7,7,0,0,0,1-1.64c.15-.43.28-.82.41-1.18.24-.69.43-1.27.56-1.7.3.58.52.93.53,1s.37.58.93,1.36a27.38,27.38,0,0,0,2.17,2.74,13.23,13.23,0,0,0,2.61,2.33,3.94,3.94,0,0,0,1.4.66l.33.41h0a2,2,0,0,0,.57.22C93.31,168.29,93.6,168.37,94,168.48Z"/>
+                <path class="cls-327"
+                      d="M94,5.32l-.2.06-.66.23-.71.28-.5.22a12.64,12.64,0,0,0-1.73-.17,4.65,4.65,0,0,0-.63,0h-.19l.21-2,0,0c.09,0,.35.09.83.24s1.46.44,2.66.86C93.36,5.09,93.66,5.19,94,5.32Z"/>
+                <path class="cls-327"
+                      d="M89.42,106.05l0,0-.06-.88c0-.67-.09-1.32-.14-2h.08l.23,2.07.46-.13c.18,1.29.41,2.6.68,3.92a43.42,43.42,0,0,0,1.35,5,1.45,1.45,0,0,0-.46-.24c-.19-.06-.33,0-.31.06s.12,0,.22.14.23.26.38.42a1.52,1.52,0,0,0,.44.37c.13.36.27.71.43,1.07,0,0,0,0,0,0a.09.09,0,0,0,.06,0,11,11,0,0,0,.49,1.11l.32.64-.24.12c-.09-.19-.17.34-.88,1.54-.3-.5-.57-1-.82-1.51a37.18,37.18,0,0,1-2.85-8.44c-.1-.4-.18-.81-.26-1.2a1.89,1.89,0,0,0,.84-.76,1.64,1.64,0,0,0,.18-.8,1.34,1.34,0,0,0-.06-.4l0-.11,0-.09v0h0a.09.09,0,0,1,0,0v-.08Z"/>
+                <path class="cls-327"
+                      d="M93.88,121.49a5.81,5.81,0,0,1-.55,1c-.08-.55,0-1.14-.25-1.29s-1,.35-1.34,1.25a2.77,2.77,0,0,0-.17,1.44,2.46,2.46,0,0,0,.1.49l0,0-1.16,1.09a3.18,3.18,0,0,1-.63-.47,1.17,1.17,0,0,1-.2-.21l-.79-.86,0,0c.09-.11.2-.22.3-.33.53-.51.85-.8.92-.88a22.52,22.52,0,0,0,2.36-3.22A12.58,12.58,0,0,0,93.88,121.49Z"/>
+                <path class="cls-327"
+                      d="M93.14,114.72a.91.91,0,0,1,.3.74A.67.67,0,0,1,93,116a.59.59,0,0,1-.25,0,.13.13,0,0,1,0-.08c.1-.1.41-.27.35-.51a.38.38,0,0,0-.23-.29.93.93,0,0,0-.17-.09,1.84,1.84,0,0,1-.38-.18c-.09-.25-.19-.5-.27-.75a.41.41,0,0,0,.11.07,2.15,2.15,0,0,0,.73.32A1.13,1.13,0,0,1,93.14,114.72Z"/>
+                <path class="cls-327"
+                      d="M92.36,129.13c.57.41,1,.62,1,.77s-.57.24-1.32.06a8.21,8.21,0,0,1-1.22-.4l-.67-.3a4.22,4.22,0,0,1-.71-.41,3.12,3.12,0,0,1-1.09-1.33l2.18-2.07.07,0,0,0a.56.56,0,0,0-.09.13,2.38,2.38,0,0,0-.29.54,1.34,1.34,0,0,0,.23,1.46c.11.12.27.26.45.42s.35.28.52.41C91.75,128.69,92.08,128.93,92.36,129.13Z"/>
+                <path class="cls-327"
+                      d="M93.08,121.15c.21.15.17.74.25,1.29a12.66,12.66,0,0,1-1.66,1.89,2.46,2.46,0,0,1-.1-.49,2.77,2.77,0,0,1,.17-1.44C92.09,121.5,92.82,120.93,93.08,121.15Z"/>
+                <path class="cls-331" d="M92.67,116a.13.13,0,0,0,0,.08.09.09,0,0,1-.06,0S92.65,116,92.67,116Z"/>
+                <path class="cls-327"
+                      d="M92.39,77.55c-.54.15-1.09.3-1.64.47-.36.1-.73.22-1.09.34l-1-.42c.57-.25,1.17-.48,1.78-.7.22-.08.45-.17.68-.24h0Z"/>
+                <path class="cls-327"
+                      d="M92,114.13c.08.25.18.5.27.75a1.52,1.52,0,0,1-.44-.37c-.15-.16-.28-.33-.38-.42s-.21-.1-.22-.14.12-.12.31-.06A1.45,1.45,0,0,1,92,114.13Z"/>
+                <path class="cls-327"
+                      d="M84.75,158.75s-.14.21-.32.58l-.16-.34a11.33,11.33,0,0,1-.92-3.46.86.86,0,0,1,0-.16c.22-.13.31-.23.29-.26a1.74,1.74,0,0,0-.3.13,9.06,9.06,0,0,1,.66-4.7h0a24.7,24.7,0,0,0,.17,4.86,11,11,0,0,0,1.07,3.12,14,14,0,0,0,.83,1.34l.83,1.4c.5.8,1.16,1.84,1.91,2.81a16.63,16.63,0,0,0,2.24,2.49c.67.6,1.21.92,1.17,1s0,0,0,0a3.94,3.94,0,0,1-1.4-.66,13.23,13.23,0,0,1-2.61-2.33A27.38,27.38,0,0,1,86,161.85c-.56-.78-.91-1.33-.93-1.36s-.23-.38-.53-1A3.16,3.16,0,0,0,84.75,158.75Z"/>
+                <path class="cls-327"
+                      d="M91.9,6.11l-.9.38c-.92.42-1.8.86-2.66,1.32a37.51,37.51,0,0,0-4.43,2.82L83.5,11a1.2,1.2,0,0,0-.38.15,5.22,5.22,0,0,0-.82.6,2.88,2.88,0,0,0-.11-1.86c.16-.19.33-.38.51-.56A27.7,27.7,0,0,1,87,5.6a29.15,29.15,0,0,1,2.6-1.7l-.21,2h.19a4.65,4.65,0,0,1,.63,0A12.64,12.64,0,0,1,91.9,6.11Z"/>
+                <path class="cls-327"
+                      d="M91.17,77c-.23.07-.46.16-.68.24-.61.22-1.21.45-1.78.7l-1.42-.64c-3-1.34-5.8-2.66-8.18-3.87-1.18-.63-2.28-1.2-3.24-1.77S74,70.51,73.4,70.09l-2.2-1.46L67,65.83C65.68,65,64.17,64,62.5,62.9a12.63,12.63,0,0,1-1.07-.78l-.4-.46c-.12-.16-.18-.31-.27-.45s0-.37.06-.5.06-.32.23-.49a2.13,2.13,0,0,1,.48-.46,7.24,7.24,0,0,1,.61-.42c1-.61.72-.43.86-.5l.26-.13L63,58.6l-.09,0-.32-.1-1-.3-6.06-1.75c1.53-1,3.06-2,4.6-3l1.5-1,.37-.24.14-.08.27-.16.28-.17s-.16-.08-.24-.12l-.29-.14-.47-.2-.79-.33a5.15,5.15,0,0,1-.55-.24,1.91,1.91,0,0,1-.49-.4A1.65,1.65,0,0,1,60,48.18a14.53,14.53,0,0,0,3.31-5.33,29.76,29.76,0,0,0,1.4-5,28,28,0,0,0,.45-4l.29.25h0A19.5,19.5,0,0,1,65.38,38a27.19,27.19,0,0,1-1.14,5.21,17.61,17.61,0,0,1-1.24,3,12.81,12.81,0,0,1-.91,1.48c-.17.24-.34.49-.54.72l-.29.35L61,49a.45.45,0,0,0,0,.66.38.38,0,0,0,.15.09l.23.08.79.31,2.46.92.67.26.33.13.18.07.08,0-.06,0-1.18.79C63.4,53.17,62.18,54,61,54.83l-.74.49-.26.19-.35.26.57.13,1.84.47,6.4,1.74-2.85,1.57-1.35.78-.5.3-.15.11h0s-.12.07-.1.12l.22.13,4.49,2.8c2.58,1.6,4.2,2.66,4.34,2.75l2.21,1.53c.69.48,1.37,1,2.3,1.53s1.95,1.15,3.11,1.77c2.31,1.25,5,2.62,8,4Z"/>
+                <path class="cls-327"
+                      d="M91.36,89.61c-.2.51-.39,1-.56,1.61a5.12,5.12,0,0,1-1.31-.6l1.44-1.5A1.48,1.48,0,0,0,91.36,89.61Z"/>
+                <path class="cls-327"
+                      d="M90.53,88.18c0,.1-.57.58-1.47,1.29.1-.34.23-.66.34-1C90.05,88.21,90.48,88.08,90.53,88.18Z"/>
+                <path class="cls-327"
+                      d="M89.85,125a3.18,3.18,0,0,0,.63.47l-2.18,2.07a1.72,1.72,0,0,1-.07-.21,3.48,3.48,0,0,1-.1-1.7,5.13,5.13,0,0,1,.34-1.08c.06-.13.11-.22.14-.3l0,0,.08-.1a.79.79,0,0,1,.14-.18l.79.86A1.17,1.17,0,0,0,89.85,125Z"/>
+                <path class="cls-327"
+                      d="M89.82,95.68a16.9,16.9,0,0,0-.21,1.91,6.81,6.81,0,0,1-1.83-1.14l1.59-1.34A2,2,0,0,0,89.82,95.68Z"/>
+                <path class="cls-327" d="M89.73,103.23c0,.64.13,1.28.21,1.93l-.46.13-.23-2.07h.48Z"/>
+                <path class="cls-327"
+                      d="M88.71,77.94l1,.42A31.27,31.27,0,0,0,86,79.8,14.08,14.08,0,0,0,84,81c-.1-.07.54-.84,1.77-1.57A22.26,22.26,0,0,1,88.71,77.94Z"/>
+                <path class="cls-327"
+                      d="M87.27,131.26c1,1.15,2.49,1.91,2.36,2.23s-1.86.11-3.45-1A6.13,6.13,0,0,1,84.66,131c.56-.55,1.1-1.06,1.61-1.55a1.39,1.39,0,0,0,.06.19A4.52,4.52,0,0,0,87.27,131.26Z"/>
+                <path class="cls-331" d="M89.59,3.88l0,0v0Z"/>
+                <path class="cls-327"
+                      d="M89.48,106.73a1.64,1.64,0,0,1-.18.8,1.89,1.89,0,0,1-.84.76c-.09-.47-.18-.93-.26-1.39a.22.22,0,0,0,0-.12s0,0,0-.07l.25-.14.06,0h0l.09,0h0l0,0,.06,0,0,0,.07,0,.24-.11a0,0,0,0,1,0,0l.21-.1v0l0,.09,0,.11A1.34,1.34,0,0,1,89.48,106.73Z"/>
+                <path class="cls-330" d="M89.42,106.05l0,0h0Z"/>
+                <path class="cls-327"
+                      d="M89.4,88.5c-.11.31-.24.63-.34,1-.48.36-1,.8-1.62,1.28-.84.67-1.73,1.41-2.52,2.11l-1.07,1-.45.44-.19.2c-.06.06-.15.14-.12.13s0,0,0,.11a3.3,3.3,0,0,0,.12.37,4.36,4.36,0,0,0,.48.93c.44.69,1.64,1.5,2.54,2.72a5.5,5.5,0,0,1,.94,2,7.79,7.79,0,0,1,.19,1.81c0,.26,0,.5,0,.72s0,.21-.06.32a.58.58,0,0,1,0,.16.93.93,0,0,1,0,.1h0l-.19-.17h0s0,0,0-.06h0l-.06,0-.09-.08c0-.07,0-.13,0-.22s-.09-.41-.14-.66a5.93,5.93,0,0,0-1.4-3.09c-.83-.9-2-1.54-2.86-2.49a5.89,5.89,0,0,1-.79-1.26,3.18,3.18,0,0,1-.23-.62,1.71,1.71,0,0,1-.07-.45,1.45,1.45,0,0,1,.43-1.19,2.84,2.84,0,0,0,.26-.24l.23-.19.51-.42c.38-.3.78-.61,1.22-.93.88-.63,1.87-1.29,2.8-1.86A23.46,23.46,0,0,1,89.4,88.5Z"/>
+                <path class="cls-330" d="M89.37,106.08v.08a.09.09,0,0,0,0,0h0Z"/>
+                <path class="cls-327"
+                      d="M89.37,106.07h0l0,0-.21.11a0,0,0,0,0,0,0l-.24.11-.07,0,0,0-.06,0,0,0h0l-.09,0h0l-.06,0-.25.08h0a2.32,2.32,0,0,1-.08-.3,0,0,0,0,1,0,0l-.12-1c-.06-.67-.14-1.34-.21-2-.1-1.14-.22-2.24-.31-3.28a22.72,22.72,0,0,1,0-2.75c.07.12.17.24.25.37l.48.65.25.35.41.52c.09,1.28.17,2.63.26,4v0c0,.65.1,1.3.14,2Z"/>
+                <path class="cls-330" d="M89.34,106.1h0l-.21.1Z"/>
+                <path class="cls-327"
+                      d="M88.27,92.8l1,1.45-1.56,1c.06-.5.14-1,.23-1.48,0-.28.1-.56.16-.84h0A.7.7,0,0,0,88.27,92.8Z"/>
+                <path class="cls-329"
+                      d="M89.06,89.47a28,28,0,0,0-1,3.44h0l-1.73,1.16-.47.32c-.33.23-.75.44-.86.8a1.62,1.62,0,0,0,.11,1.21c.1.24.15.3.22.45l.2.34a14.89,14.89,0,0,0,.93,1.36c.17.22.35.45.52.69l.27.34.13.15,0,0,0,.27c0,.41,0,.83,0,1.25.07,1.12.19,2.25.34,3.4h0a.81.81,0,0,0-.19-.41,2.94,2.94,0,0,0-.44-.42h0a.93.93,0,0,0,0-.1.58.58,0,0,0,0-.16c0-.11.05-.21.06-.32s0-.46,0-.72a7.79,7.79,0,0,0-.19-1.81,5.5,5.5,0,0,0-.94-2c-.9-1.22-2.1-2-2.54-2.72a4.36,4.36,0,0,1-.48-.93,3.3,3.3,0,0,1-.12-.37c0-.1,0-.09,0-.11s.06-.07.12-.13l.19-.2.45-.44,1.07-1c.79-.7,1.68-1.44,2.52-2.11C88,90.27,88.58,89.83,89.06,89.47Z"/>
+                <path class="cls-327"
+                      d="M88.81,123.87l0,0a.79.79,0,0,0-.14.18l-.08.1,0,0c0,.08-.08.17-.14.3a5.13,5.13,0,0,0-.34,1.08,3.48,3.48,0,0,0,.1,1.7,1.72,1.72,0,0,0,.07.21l-.75.71c-.4.38-.83.79-1.28,1.2,0-.16-.07-.31-.11-.44a1.74,1.74,0,0,0-.16-.46l-1.37.75-.23.12-.29.15-.17.06h0l-.11-.09C85.48,127.62,87.13,125.71,88.81,123.87Z"/>
+                <path class="cls-327"
+                      d="M88.2,106.9c.08.46.17.92.26,1.39l-.34.12a4.8,4.8,0,0,1-1.16.15,15.94,15.94,0,0,1-2.09-.15,8.45,8.45,0,0,1-2-.5,2.68,2.68,0,0,1-1.63-1.48,2,2,0,0,1,0-1.13c.1-.35.21-.56.31-.84a12.44,12.44,0,0,1,.71-1.52,2.59,2.59,0,0,1,.53-.64c.22-.2.35-.28.58-.49a3.65,3.65,0,0,1,.64-.49c.19-.09.43-.2.62,0,.29.3.26.77.36,1.12,0,.18.07.29.09.44a.53.53,0,0,1-.06.37,1.65,1.65,0,0,0-.41.14c0-.07.11-.13.18-.21s0-.34-.13-.6-.08-.48-.26-.69-.28,0-.38.13a3.4,3.4,0,0,0-.32.34c-.1.1-.34.3-.47.44a2.58,2.58,0,0,0-.38.52c-.2.42-.37.94-.56,1.46-.07.25-.2.56-.24.79a1,1,0,0,0,0,.62,1.9,1.9,0,0,0,1.15.85,7.58,7.58,0,0,0,1.79.35,13.6,13.6,0,0,0,1.92,0c.58,0,1.23-.22,1.26-.44A.07.07,0,0,0,88.2,106.9Z"/>
+                <path class="cls-330" d="M88.21,106.65l.25-.08-.25.14v0h0Z"/>
+                <path class="cls-330"
+                      d="M88.21,106.71s0,.05,0,.07a.22.22,0,0,1,0,.12c0-.18-.07-.37-.09-.55a2.32,2.32,0,0,0,.08.3h0Z"/>
+                <path class="cls-329"
+                      d="M88.11,106.35c0,.18.06.37.09.55a.07.07,0,0,1,0,0c0,.22-.68.43-1.26.44a13.6,13.6,0,0,1-1.92,0,7.58,7.58,0,0,1-1.79-.35,1.9,1.9,0,0,1-1.15-.85,1,1,0,0,1,0-.62c0-.23.17-.54.24-.79.19-.52.36-1,.56-1.46a2.58,2.58,0,0,1,.38-.52c.13-.14.37-.34.47-.44A3.4,3.4,0,0,1,84,102c.1-.09.26-.22.38-.13s.15.48.26.69.21.48.13.6-.13.14-.18.21l-.08,0a1.81,1.81,0,0,0-1,.66.77.77,0,0,0,0,.61.88.88,0,0,0,.21.36,1.35,1.35,0,0,0,.24.25s.18,0,.27-.16.13-.27.09-.3a1.52,1.52,0,0,1-.17-.15c-.09-.12-.18-.25-.12-.37s.35-.31.67-.47a3,3,0,0,1,1-.31,1.48,1.48,0,0,1,1,.34,8.29,8.29,0,0,1,.78.59c.43.38.14.83.22.83s.08-.07.13-.25a.66.66,0,0,0,0-.32h0c.08.55.16,1.1.26,1.65A0,0,0,0,0,88.11,106.35Z"/>
+                <path class="cls-330"
+                      d="M88,105.3l.12,1c-.1-.55-.18-1.1-.26-1.65-.15-1.15-.27-2.28-.34-3.4,0-.42,0-.84,0-1.25.09,1,.21,2.14.31,3.28C87.85,104,87.93,104.63,88,105.3Z"/>
+                <path class="cls-327"
+                      d="M88.1,92.92c-.06.28-.11.56-.16.84-.09.48-.17,1-.23,1.48l-.49.31c-.16.09-.31.2-.49.3h0s0,0,0,0l.09.21.16.28c.17.29.35.58.56.9a22.72,22.72,0,0,0,0,2.75l0-.27,0,0-.13-.15L87,99.25c-.17-.24-.35-.47-.52-.69a14.89,14.89,0,0,1-.93-1.36l-.2-.34c-.07-.15-.12-.21-.22-.45A1.62,1.62,0,0,1,85,95.2c.11-.36.53-.57.86-.8l.47-.32Z"/>
+                <path class="cls-327"
+                      d="M87.84,104.68a.66.66,0,0,1,0,.32c0,.18-.12.25-.13.25s.21-.45-.22-.83a8.29,8.29,0,0,0-.78-.59,1.48,1.48,0,0,0-1-.34,3,3,0,0,0-1,.31c-.32.16-.62.33-.67.47s0,.25.12.37a1.52,1.52,0,0,0,.17.15s0,.17-.09.3-.22.2-.27.16a1.35,1.35,0,0,1-.24-.25.88.88,0,0,1-.21-.36.77.77,0,0,1,0-.61,1.81,1.81,0,0,1,1-.66l.08,0c-.15.14-.27.21-.24.25s.25,0,.61-.34l0,0a2.3,2.3,0,0,1,.71-.12,1.75,1.75,0,0,1,1,.36.28.28,0,0,0,0,.13.56.56,0,0,0,0,.15s0,.16.28.22a.28.28,0,0,0,.17-.09,2.94,2.94,0,0,1,.44.42A.81.81,0,0,1,87.84,104.68Z"/>
+                <path class="cls-327" d="M87.32,142.58a1.67,1.67,0,0,1,.46-.06,1.46,1.46,0,0,1-.62.28Z"/>
+                <path class="cls-327"
+                      d="M87.32,142.58l-.16.22a7.6,7.6,0,0,1-1.23.26,12.34,12.34,0,0,1-4.25-.21,6.15,6.15,0,0,1-2.2-.89A5.29,5.29,0,0,1,78,140.43a5.38,5.38,0,0,1-.59-1.29l.43-.55a2.88,2.88,0,0,0,.22-.27,4.69,4.69,0,0,0,.6,1.71,4.65,4.65,0,0,0,1.22,1.36,5.54,5.54,0,0,0,1.92.88,13.88,13.88,0,0,0,4.1.47A9.23,9.23,0,0,0,87.32,142.58Z"/>
+                <path class="cls-327"
+                      d="M87,103.68l.19.17a.28.28,0,0,1-.17.09c-.29-.06-.23-.17-.28-.22a.56.56,0,0,1,0-.15.28.28,0,0,1,0-.13l.17.11v.07s0,0,0,0,.06,0,.06,0A0,0,0,0,1,87,103.68Z"/>
+                <path class="cls-330" d="M87.05,103.61s0,0,0,.06l-.12-.1h0v-.08l.09.08.06,0Z"/>
+                <path class="cls-330" d="M87,103.67h0a0,0,0,0,0,0,0s0,0-.06,0,0,0,0,0v-.05h0Z"/>
+                <path class="cls-327" d="M86.89,103.53v0l-.17-.11s0,0,0,0,.07,0,.14.07h0Z"/>
+                <path class="cls-328"
+                      d="M85.93,143.06a7.6,7.6,0,0,0,1.23-.26,18.5,18.5,0,0,0-1.77,2.69,10.64,10.64,0,0,0-.63,1.34c-.36.08-.92.23-1.62.36a11.08,11.08,0,0,1-4.54.05,6.1,6.1,0,0,1-3.65-2.4,6,6,0,0,1-.65-1.17c.25-.46.52-.91.8-1.34.74-1.12,1.53-2.18,2.32-3.19a5.38,5.38,0,0,0,.59,1.29A5.29,5.29,0,0,0,79.48,142a6.15,6.15,0,0,0,2.2.89A12.34,12.34,0,0,0,85.93,143.06Z"/>
+                <path class="cls-327"
+                      d="M86.16,129c0,.13.07.28.11.44-.51.49-1,1-1.61,1.55a4.09,4.09,0,0,1-.29-.48,6.43,6.43,0,0,1-.38-.79l0-.09h0l.17-.06.29-.15.23-.12,1.37-.75A1.74,1.74,0,0,1,86.16,129Z"/>
+                <path class="cls-327"
+                      d="M85.76,136.28c.11.16-.32.48-.94.46a4.43,4.43,0,0,1-2.13-.61,5.25,5.25,0,0,1-1.55-1.43c.55-.61,1.09-1.2,1.61-1.75a4.9,4.9,0,0,0,.17.55,4.22,4.22,0,0,0,.78,1.32,6.1,6.1,0,0,0,1.31,1C85.41,136.1,85.69,136.15,85.76,136.28Z"/>
+                <path class="cls-327"
+                      d="M85.85,179.75l-.66.22-.74.24c-.07,0-.15,0-.23-.11s-.1-.25-.22-.36a.28.28,0,0,1,0-.42c0-.13.08-.21.16-.23l.45-.13h0C85,179.24,85.41,179.5,85.85,179.75Z"/>
+                <path class="cls-327"
+                      d="M84.76,146.83a1.49,1.49,0,0,1,.45-.1,1.4,1.4,0,0,1-.54.28A.76.76,0,0,1,84.76,146.83Z"/>
+                <path class="cls-327" d="M85,103.2l0,0c-.36.35-.59.35-.61.34s.09-.11.24-.25A1.65,1.65,0,0,1,85,103.2Z"/>
+                <path class="cls-327"
+                      d="M84.76,146.83a.76.76,0,0,0-.09.18,11.5,11.5,0,0,1-1.44.5,10.79,10.79,0,0,1-4.74.31,6.63,6.63,0,0,1-4.16-2.51,5.53,5.53,0,0,1-.5-.77c.14-.29.3-.59.47-.87a6,6,0,0,0,.65,1.17,6.1,6.1,0,0,0,3.65,2.4,11.08,11.08,0,0,0,4.54-.05C83.84,147.06,84.4,146.91,84.76,146.83Z"/>
+                <path class="cls-327"
+                      d="M84.75,158.75a3.16,3.16,0,0,1-.21.78l-.11-.2C84.61,159,84.71,158.74,84.75,158.75Z"/>
+                <path class="cls-327"
+                      d="M84.43,159.33l.11.2c-.13.43-.32,1-.56,1.7-.13.36-.26.75-.41,1.18a7,7,0,0,1-1,1.64,5.54,5.54,0,0,1-2.2,1.54,10.69,10.69,0,0,1-3,1,11.28,11.28,0,0,1-2.78,0c-.52-.05-1-.11-1.39-.19l-.27-.89c.44.1,1,.22,1.74.31a11.17,11.17,0,0,0,2.61.06,10.22,10.22,0,0,0,2.85-.82,6.13,6.13,0,0,0,2.41-1.65,4.89,4.89,0,0,0,.69-1.13l.48-1.17Z"/>
+                <path class="cls-327"
+                      d="M84.37,130.5a4.09,4.09,0,0,0,.29.48c-.49.47-1,1-1.51,1.53l-.4.44a1,1,0,0,0,0-.15,3.23,3.23,0,0,0-1.14.28,3.76,3.76,0,0,0-1.07.48,5.7,5.7,0,0,0,.51,1l.13.18c-1,1.12-2,2.32-3.07,3.62a.18.18,0,0,1,0,0,.44.44,0,0,0-.47-.31.39.39,0,0,0-.36.46,4.27,4.27,0,0,0,.19.72c-.79,1-1.58,2.07-2.32,3.19-.28.43-.55.88-.8,1.34a.45.45,0,0,0-.06-.14,4.14,4.14,0,0,1-.18-.57.34.34,0,0,0-.17-.22s0,0,0,0h0c.27-.61.56-1.23.85-1.82,0-.07.1-.13.15-.21.66-.95,1.24-2,1.82-3l1.45-2.12c.77-.85,1.54-1.7,2.35-2.52,1.15-1.15,2.25-2.37,3.34-3.58l.11.09h0l0,.09A6.43,6.43,0,0,0,84.37,130.5Z"/>
+                <path class="cls-328"
+                      d="M84.27,159l.16.34-.76,1.77-.48,1.17a4.89,4.89,0,0,1-.69,1.13,6.13,6.13,0,0,1-2.41,1.65,10.22,10.22,0,0,1-2.85.82,11.17,11.17,0,0,1-2.61-.06c-.71-.09-1.3-.21-1.74-.31-.43-1.46-.87-2.87-1-3.21l-.23-.61h0a21.58,21.58,0,0,1-.73-5.15c0-.48,0-1,0-1.47a4.23,4.23,0,0,0,.73.62,7.38,7.38,0,0,0,5,1.31,27.07,27.07,0,0,0,4.94-.9,7.08,7.08,0,0,0,1.76-.71.86.86,0,0,0,0,.16A11.33,11.33,0,0,0,84.27,159Z"/>
+                <path class="cls-329"
+                      d="M84,150v.53a9.06,9.06,0,0,0-.66,4.7l-.27.1a12.24,12.24,0,0,1-1.56.43,34.12,34.12,0,0,1-4.9.62,6.85,6.85,0,0,1-4.49-1.34A5.67,5.67,0,0,1,71,153.89a9.56,9.56,0,0,1,.27-1.72,48,48,0,0,1,1.56-5.44c.32-.76.65-1.48,1-2.19a5.53,5.53,0,0,0,.5.77,6.63,6.63,0,0,0,4.16,2.51,10.79,10.79,0,0,0,4.74-.31,11.5,11.5,0,0,0,1.44-.5A6.35,6.35,0,0,0,84,150Z"/>
+                <rect class="cls-331" x="83.93" y="129.61" width="0.01" height="0.01"/>
+                <path class="cls-327" d="M83.63,155.11s-.07.13-.29.26a.3.3,0,0,1,0-.13A1.74,1.74,0,0,1,83.63,155.11Z"/>
+                <path class="cls-327"
+                      d="M83.33,155.24a.3.3,0,0,0,0,.13,7.08,7.08,0,0,1-1.76.71,27.07,27.07,0,0,1-4.94.9,7.38,7.38,0,0,1-5-1.31,4.23,4.23,0,0,1-.73-.62c0-.39,0-.79.06-1.16a5.67,5.67,0,0,0,1.13,1.16,6.85,6.85,0,0,0,4.49,1.34,34.12,34.12,0,0,0,4.9-.62,12.24,12.24,0,0,0,1.56-.43Z"/>
+                <path class="cls-327"
+                      d="M82.71,132.8a1,1,0,0,1,0,.15c-.52.55-1.06,1.14-1.61,1.75l-.13-.18a5.7,5.7,0,0,1-.51-1,3.76,3.76,0,0,1,1.07-.48A3.23,3.23,0,0,1,82.71,132.8Z"/>
+                <path class="cls-327"
+                      d="M82.19,9.84a2.88,2.88,0,0,1,.11,1.86,12.93,12.93,0,0,0-1,1L81,13c-.16.18-.32.35-.5.52l-.08,0a.45.45,0,0,1-.21-.27.43.43,0,0,1,0-.2,1.88,1.88,0,0,1,.14-.48A11.17,11.17,0,0,1,82.19,9.84Z"/>
+                <path class="cls-331" d="M82.3,11.7h0c-.34.3-.66.62-1,1A12.93,12.93,0,0,1,82.3,11.7Z"/>
+                <path class="cls-327"
+                      d="M81.84,9.55a.52.52,0,0,1,.35.29,11.17,11.17,0,0,0-1.85,2.71,1.88,1.88,0,0,0-.14.48.43.43,0,0,0,0,.2.45.45,0,0,0,.21.27l.08,0-.38.4-1.76-.45c-1.44-.36-3.49-.87-5.9-1.29a23.57,23.57,0,0,0-3.69-.42c-1.32,0-2.83.17-4.35.34s-3.12.43-4.7.72l-1.17.24-1,.22a.76.76,0,0,0-.33.12.79.79,0,0,0-.14.34v.11a2,2,0,0,0,0,.25c0,.19,0,.36,0,.55,0,.37,0,.75,0,1.14a22.48,22.48,0,0,0,.31,2.31c.14.77.33,1.52.53,2.25.12.36.23.72.36,1.06l.08.23,0,.06.06.13.27.51a58.16,58.16,0,0,0,4.4,7.18c3.13,3.8,5.32,6.42,5.07,6.66s-1.15-.62-2.77-2h0a2.61,2.61,0,0,0-.21-1s-.06.26-.08.73c-1-.86-2.12-1.93-3.41-3.19a47.34,47.34,0,0,1-5.26-7l-.33-.5L56.08,23a1.39,1.39,0,0,1-.11-.21l-.15-.33c-.19-.4-.34-.79-.51-1.2a25.72,25.72,0,0,1-.78-2.49q-.33-1.28-.54-2.61c-.06-.45-.11-.91-.14-1.37,0-.23,0-.48,0-.72s0-.25,0-.37,0-.36,0-.52a3.89,3.89,0,0,1,.65-2,3.3,3.3,0,0,1,1.73-1.1l.49-.18L57,9.82l.64-.19L59,9.3c1.66-.42,3.3-.75,4.9-1s3.16-.5,4.75-.61a26.51,26.51,0,0,1,4.49.25c2.64.35,4.77.78,6.29,1.1S81.78,9.53,81.84,9.55Z"/>
+                <path class="cls-327"
+                      d="M78.06,138.27a.18.18,0,0,0,0,0,2.88,2.88,0,0,1-.22.27l-.43.55a4.27,4.27,0,0,1-.19-.72.39.39,0,0,1,.36-.46A.44.44,0,0,1,78.06,138.27Z"/>
+                <path class="cls-327"
+                      d="M76.93,17.46c.08.14-1.07,1-2.07,2.1a17,17,0,0,0-1.3,1.51c-.34.43-.54.75-.56.76l-.57.74a10.19,10.19,0,0,0-1,1.68c-.68,1.27-.81,2.72-1,2.72s-.18-.36-.17-.94a6.84,6.84,0,0,1,.37-2.09,11.32,11.32,0,0,1,.88-2c.3-.5.53-.84.54-.85s.27-.34.68-.76A14,14,0,0,1,74.19,19h0l1-.32c.65-.22,1-.7.93-1C76.58,17.51,76.9,17.4,76.93,17.46Z"/>
+                <path class="cls-330" d="M76.14,17.74c.11.27-.28.75-.93,1l-1,.32.1-.08A11.7,11.7,0,0,1,76.14,17.74Z"/>
+                <path class="cls-327"
+                      d="M76.12,17.71l0,0A11.7,11.7,0,0,0,74.3,19l-.1.08h0c-.13,0-.21,0-.23,0a2.62,2.62,0,0,0-.17-.28,2.36,2.36,0,0,0-.71-.58,6,6,0,0,0-3.4-.49c-3.05.18-6-.18-6-.48s2.94-.69,5.75-1.3a7.6,7.6,0,0,1,4.63.15A4.55,4.55,0,0,1,76.12,17.71Z"/>
+                <path class="cls-327"
+                      d="M74.24,143.53a.45.45,0,0,1,.06.14c-.17.28-.33.58-.47.87a5.37,5.37,0,0,1-.4-.8c.07-.16.12-.3.18-.46a.08.08,0,0,0,0,0c.07-.17.16-.33.23-.5,0,0,0,0,0,0a.34.34,0,0,1,.17.22A4.14,4.14,0,0,0,74.24,143.53Z"/>
+                <path class="cls-331" d="M73.86,142.73h0c-.07.17-.16.33-.23.5.07-.17.15-.33.22-.51Z"/>
+                <path class="cls-331" d="M73.61,143.28c-.06.16-.11.3-.18.46v0Z"/>
+                <path class="cls-327"
+                      d="M73.43,143.74a5.37,5.37,0,0,0,.4.8c-.37.71-.7,1.43-1,2.19a48,48,0,0,0-1.56,5.44,9.56,9.56,0,0,0-.27,1.72,4.53,4.53,0,0,1-.34-.51l0,0c.08-.54.16-1,.29-1.6A43.86,43.86,0,0,1,73.43,143.74Z"/>
+                <path class="cls-327" d="M72.89,165.5l.27.89-.17,0c-.08-.29-.15-.59-.21-.88Z"/>
+                <circle class="cls-329" cx="133.59" cy="46.47" r="1.44"/>
+                <circle class="cls-329" cx="111.44" cy="48.47" r="1.62"/>
+                <circle class="cls-329" cx="112.42" cy="51.01" r="0.33"/>
+                <circle class="cls-329" cx="132.16" cy="48.93" r="0.34"/>
+                <path class="cls-327"
+                      d="M114.87,76.69l.12,0a.52.52,0,0,0-.28-1h-.06a.5.5,0,0,0-.37.36v0a.52.52,0,0,0,1,.28v0l-.37.36H115l-.28-1-.12,0c-.61.24-.34,1.25.28,1Z"/>
+                <path class="cls-327" d="M114.5,82.5l0,0a.52.52,0,0,0,.74.74l0,0c.47-.47-.26-1.21-.73-.73Z"/>
+                <path class="cls-328"
+                      d="M161.13,157.38a2.56,2.56,0,0,1,0,.37l-.09.61c-.08.4-.1.82-.21,1.2a19.52,19.52,0,0,1-.7,2.37,21.56,21.56,0,0,1-5.46,8.36,27.55,27.55,0,0,1-8.61,5.65l-1.21.5-1.24.41c-.82.3-1.68.49-2.53.72-1.74.38-3.41.65-5.35,1l-5.64,2.22h0l0,0a31,31,0,0,1-6,2c-2.08.5-4.21.9-6.34,1.21-.85.12-1.72.24-2.58.34.23-.45.53-1,.89-1.69s.87-1.72,1.31-2.75a14.49,14.49,0,0,0,.57-1.65,15.06,15.06,0,0,0,.25-1.79,7,7,0,0,0-.45-3.54,7.56,7.56,0,0,0-1.89-2.41,5.52,5.52,0,0,0-1.18-.79,62.25,62.25,0,0,0,11.29-3.9c4.78-2.1,9.76-4.77,15.08-7.48,1.34-.67,2.68-1.36,4.07-2s2.78-1.37,4.21-1.92a15.93,15.93,0,0,1,4.48-1.12,7.11,7.11,0,0,1,6.16,2.3,9.55,9.55,0,0,1,.75.91Z"/>
+                <path class="cls-329"
+                      d="M155,12.84c0,.09.1,1.4,0,3.33a44.21,44.21,0,0,1-.84,7A52.23,52.23,0,0,1,152.32,30c-.62,1.84-1.11,3-.95,3.12s.07,0,.14-.09c0,.56,0,1.93-.06,3.29,0,.88-.1,1.78-.18,2.44s-.13,1.13-.13,1.16,0,.49-.14,1.15a19.46,19.46,0,0,1-.36,2.11c0-.15,0-.33,0-.53,0-.52,0-1.13-.07-1.86a14.08,14.08,0,0,0-.74-2.39A8.79,8.79,0,0,0,148.06,36a12,12,0,0,0-2.46-2.17,12.1,12.1,0,0,0-7-1.66,7.56,7.56,0,0,0-3.55,1.45,11.26,11.26,0,0,0-2.62,2.53,9.45,9.45,0,0,0-1.52,3.09c-.32,1-.55,2-.74,2.88-.75,3.59-1,6.06-1,6.21s-.28,2.62-.37,6.25a28.23,28.23,0,0,0,2.38,13.06l.21.4.26.5a1.05,1.05,0,0,0,1.2.56,2.87,2.87,0,0,0,.59-.12,3.3,3.3,0,0,0,.51-.27c.28-.17.51-.35.75-.51,1-.69,1.86-1.4,2.74-2.08,1.73-1.37,3.32-2.7,4.65-3.86,0,0,3.81-3.23,4.5-4.7a3.73,3.73,0,0,0,.16-.43l.68.83c.09.12.18.21.14.19a0,0,0,0,1,0,0h0c-.13.12-.33.27-.55.48a9.86,9.86,0,0,0-1.47,1.91c-.93,1.65-1.91,3.72-3.17,5.66a15.89,15.89,0,0,1-2.06,2.63A13.7,13.7,0,0,1,138,70.59a20,20,0,0,0-2.48,1.56l-.07,0s0,0,0,0a1.9,1.9,0,0,0-.59-.79c-.24-.14-.39-.07-.39,0s.13.09.24.23a2.34,2.34,0,0,1,.31.76c.1.38.2.85.28,1.36a7,7,0,0,0-2,1,6.65,6.65,0,0,0,2.09-.42c0,.22.05.44.07.66a3.93,3.93,0,0,1,0,.91c-.48.25-.76.46-.73.51s.26,0,.66-.12a5.92,5.92,0,0,1-.26.81H135c-1.14.33-2.16.88-2.1,1s.8,0,1.69-.15c-.19.29-.32.45-.32.48a11.77,11.77,0,0,1-.76,1,13.43,13.43,0,0,1-1.95,1.82,4.75,4.75,0,0,1-2.4.77c-.73,0-1.23,0-1.25.1s.48.27,1.24.35a5.16,5.16,0,0,0,1.87-.13l0,.11a9.5,9.5,0,0,0-.92.75,5.53,5.53,0,0,1-2.28,1,8.07,8.07,0,0,1-2.48.06l-.37-.07a4.32,4.32,0,0,0,1-.83,4.55,4.55,0,0,0,.73-1,1.76,1.76,0,0,0,.17-.43c-.11-.11-.45.53-1.21,1.15a6.93,6.93,0,0,1-3.25,1.45,12.54,12.54,0,0,1-3.63.2,7.52,7.52,0,0,1-1.64-.34l-.46-.14a5.79,5.79,0,0,1-1-.49c-.6-.43-1.37-1.09-2.16-1.78.71-.47,1.4-.93,1.93-1.21s1.17-.42,1.17-.51-.55-.13-1.34.09a18.57,18.57,0,0,0-2.38,1.09l-.07-.06-1.91-1.68,1.24-.4c2.65-.87,5.32-1.55,5.32-1.71s-.07,0-.19,0l.81-1.4a3.9,3.9,0,0,0,.51.06l.57,0a.7.7,0,0,0,.4-.07.37.37,0,0,0,.16-.44,1.51,1.51,0,0,0-.46-.65.64.64,0,0,0-.42-.19h0L116,73.7c1.78-.14,2.74-.72,2.65-.84.08.1,1.06-.78,2.31-2.61a22.5,22.5,0,0,0,3.48-8.37,26,26,0,0,0,.29-6,55.56,55.56,0,0,0-.51-6.52,21.08,21.08,0,0,0-2.06-6.68,15.57,15.57,0,0,0-4.65-5.32l0,0,0,0a16.47,16.47,0,0,0-9.8-3.59,49.93,49.93,0,0,0-8.62.94,29.69,29.69,0,0,0-5.93,1.72,23.7,23.7,0,0,0-2.31,1.16,28.42,28.42,0,0,0-2.65,1.87,46.2,46.2,0,0,0-5.55,5.36,48.35,48.35,0,0,0-3.17,4c-.25.37-.5.73-.75,1.11l-.56.82-.35.53-.18.26c-.06.08.1.16.15.25l.82,1,.51.59c.32.34.64.69,1,1.06a86.52,86.52,0,0,0,8.74,8.28,45.79,45.79,0,0,0,5,3.57L95,67c.45.23.9.46,1.35.67.9.43,1.78.8,2.65,1.19,3.47,1.51,6.75,2.87,9.65,3.8.62.2,1.23.39,1.81.53l-.69,2.53a31.53,31.53,0,0,0-4-.66,34.33,34.33,0,0,0-5.28-.12C99,75,98,75.13,98,75.15s-1,.16-2.46.53c-1.24.32-2.78.77-4.34,1.32h0L88.1,75.55c-2.94-1.42-5.67-2.79-8-4C79,70.89,77.91,70.3,77,69.74s-1.61-1-2.3-1.53L72.5,66.68c-.14-.09-1.76-1.15-4.34-2.75l-4.49-2.8L63.45,61s0-.08.1-.12h0l.15-.11.5-.3,1.35-.78,2.85-1.57L62,56.37l-1.84-.47-.57-.13.35-.26.26-.19.74-.49c1.22-.84,2.44-1.66,3.65-2.48l1.18-.79.06,0-.08,0-.18-.07-.33-.13L64.59,51l-2.46-.92-.79-.31-.23-.08a.38.38,0,0,1-.15-.09A.45.45,0,0,1,61,49l.26-.28.29-.35c.2-.23.37-.48.54-.72A12.81,12.81,0,0,0,63,46.14a17.61,17.61,0,0,0,1.24-3A27.19,27.19,0,0,0,65.38,38a19.5,19.5,0,0,0,.07-3.83c1.62,1.42,2.65,2.17,2.77,2s-1.94-2.86-5.07-6.66a58.16,58.16,0,0,1-4.4-7.18l-.27-.51-.06-.13,0-.06-.08-.23c-.13-.34-.24-.7-.36-1.06-.2-.73-.39-1.48-.53-2.25a22.48,22.48,0,0,1-.31-2.31c0-.39,0-.77,0-1.14,0-.19,0-.36,0-.55a2,2,0,0,1,0-.25v-.11a.79.79,0,0,1,.14-.34.76.76,0,0,1,.33-.12l1-.22,1.17-.24c1.58-.29,3.16-.53,4.7-.72s3-.31,4.35-.34a23.57,23.57,0,0,1,3.69.42c2.41.42,4.46.93,5.9,1.29l1.76.45.38-.4c.18-.17.34-.34.5-.52l.31-.33c.33-.34.65-.66,1-1h0a5.22,5.22,0,0,1,.82-.6A1.2,1.2,0,0,1,83.5,11l.41-.32a37.51,37.51,0,0,1,4.43-2.82c.86-.46,1.74-.9,2.66-1.32l.9-.38c.3,0,.62.09,1,.16a21.24,21.24,0,0,1,4.57,1.49,19.46,19.46,0,0,1,2.83,1.61c.49.33,1,.69,1.53,1.07l.81.6c.33.25.66.52,1,.83l.45.4a4,4,0,0,1,1.31.93c.19.28.07-.07.07-.2a4.32,4.32,0,0,1-.06-.47,1.33,1.33,0,0,1,0-.53c-.67-2.22-1.23-4.1-1.7-5.64-.24-.76-.45-1.43-.65-2,.59,0,1.16,0,1.7,0,1.57,0,2.89.15,3.82.23l1.6.14,1,.06.3.28a15.34,15.34,0,0,1,3.87,7.64c.06.33.11.64.14.76s0,0,0,0l.52,0v0c0-4,.15-6.72.31-8.44l1,0a12.42,12.42,0,0,0,1.36,0c.24,0,.5,0,.8,0s.52-.06.77-.1c.8-.14,1.58-.3,2.35-.45a6.1,6.1,0,0,1,.5.51A12,12,0,0,1,125,7.66a9.74,9.74,0,0,1,.43,1,9.15,9.15,0,0,1,.36,1.58c.08.53.15,1.09.23,1.67,0,.29.07.58.12.87l.06.45,0,.23c0,.07,0,0,0,0s.15-.46.27-.87A28.82,28.82,0,0,1,127.92,9a14.6,14.6,0,0,1,1.2-2.14,6.15,6.15,0,0,1,1.27-1.38,12.37,12.37,0,0,1,1.31-.85c.27-.16.51-.28.74-.39a27.09,27.09,0,0,1,3.83,1c1.52.5,2.88,1.1,4,1.53.89.33,1.64.59,2.18.74.64.7,1.14,1.21,1.5,1.55s.6.52.66.48-.06-.33-.33-.76l-.69-1.17.8,0H145l.33,0c.88-.08,1.84-.15,2.81-.28S150.07,7,151,7a5.19,5.19,0,0,1,2.43.4c1.17.59,1.39,2.28,1.49,3.41S155,12.79,155,12.84Zm-1.21-2a5.35,5.35,0,0,0-.17-1.51c0-.1-.43-.07-.88.13l-.5.21h0a10.4,10.4,0,0,0-2.27.68,20.47,20.47,0,0,1-2.33.87,4.6,4.6,0,0,1-.78.16l.89,1.28a2.15,2.15,0,0,1,.42-.63,5.32,5.32,0,0,1,2-1.32,3,3,0,0,1,2-.18,3.53,3.53,0,0,1,.05.38,8.5,8.5,0,0,1-.15,2.54c-.31,1.26-.63,2.56-.73,3.31a5.26,5.26,0,0,0-1.24-1.75,18.77,18.77,0,0,0,1,3.1c.26.75.47,1.52.61,2.11a9.74,9.74,0,0,1,.2,1c0,.06.11.44.17,1a14,14,0,0,1-.07,2.16,18.91,18.91,0,0,0-.18,3.25,9,9,0,0,0,1-3.13,11,11,0,0,0,.32-2.33A8.68,8.68,0,0,0,153,21s-.1-.47-.31-1.08a20.82,20.82,0,0,0-.88-2.14c-.1-.18-.19-.37-.28-.55a23.62,23.62,0,0,0,1.67-3.44A8.77,8.77,0,0,0,153.8,10.88ZM134.06,76.8a1.38,1.38,0,0,0,.09-.67.34.34,0,0,0-.09-.2c-.07-.05-.15,0-.21,0-.27.12-.4.21-.37.24-.11-.12-.22-.19-.26-.14a.68.68,0,0,0-.05.68.62.62,0,0,0,.41.41C133.8,77.2,134,77.05,134.06,76.8Zm-1.35-2.53a1,1,0,0,0,.37-.62.33.33,0,0,0-.06-.22.21.21,0,0,0-.22,0q-.45.15-.45.21c-.11-.11-.23-.19-.25-.16l-.11.14a.94.94,0,0,0-.23.43.34.34,0,0,0,.24.42A.82.82,0,0,0,132.71,74.27Zm-.37,3.6a1.23,1.23,0,0,0,.41-1.09,2.18,2.18,0,0,0-.43-1,3.33,3.33,0,0,0-.74-.71,2.58,2.58,0,0,0-1-.4,6.81,6.81,0,0,0-1.85,0l-.28.06-.19.06-.37.11-.3.08h-.2l-.21,0a1.55,1.55,0,0,0-.52-.07,5,5,0,0,0-.66.09,7.29,7.29,0,0,0-1.23.36,5.94,5.94,0,0,0-.64.31,4.36,4.36,0,0,0-1.4,1.12,3.63,3.63,0,0,0-.88,2.37,3.59,3.59,0,0,0,.33,1.4,1.74,1.74,0,0,0,1.28,1,3.33,3.33,0,0,0,1.46-.16,1.21,1.21,0,0,0,.55.33,3.19,3.19,0,0,0,1.61-.11,5.84,5.84,0,0,0,1.23-.48h0a1,1,0,0,0,.43.14,1.28,1.28,0,0,0,1-.33c.37-.37.64-.71.74-.79.09.07.06,0,.07,0v0a.06.06,0,0,0,0-.08.16.16,0,0,0-.1,0v0a.28.28,0,0,0,.22,0,1,1,0,0,0,.28-.14,1.23,1.23,0,0,0,.42-.54C131.56,78.34,131.78,78.27,132.34,77.87Zm-12.93,3.29a1,1,0,0,0-.45-.86,1.08,1.08,0,0,0-.85-.24c-.12-.11-.25-.16-.28-.11a4.07,4.07,0,0,0-.52.8,1,1,0,0,0,.12,1.1,1.31,1.31,0,0,0,2-.69ZM74.86,19.56c1-1.06,2.15-2,2.07-2.1s-.35.05-.79.28l0,0a4.55,4.55,0,0,0-2.05-1.64,7.6,7.6,0,0,0-4.63-.15c-2.81.61-5.75.9-5.75,1.3s2.94.66,6,.48a6,6,0,0,1,3.4.49,2.36,2.36,0,0,1,.71.58,2.62,2.62,0,0,1,.17.28s.1,0,.23,0a14,14,0,0,0-1.45,1.34c-.41.42-.66.74-.68.76s-.24.35-.54.85a11.32,11.32,0,0,0-.88,2A6.84,6.84,0,0,0,70.27,26c0,.58.1.95.17.94s.29-1.45,1-2.72a10.19,10.19,0,0,1,1-1.68l.57-.74s.22-.33.56-.76A17,17,0,0,1,74.86,19.56Z"/>
+                <path class="cls-331" d="M152.45,10.78l0,.05-.11.07h0v0Z"/>
+                <path class="cls-329"
+                      d="M153.24,48.69l-1.75,1.89c-.42.48-.88,1-1.36,1.51l-.72.81-1.16,1.35-.5-.14c.51-1.75,1.05-3.78,1.43-5.22A39.61,39.61,0,0,0,153.24,48.69Z"/>
+                <path class="cls-331" d="M151.61,33a.29.29,0,0,1-.1.09,1,1,0,0,1,0-.25S151.59,32.85,151.61,33Z"/>
+                <path class="cls-329"
+                      d="M150.65,55.88l-.26,0h-.09l-.51.14-2,.55-.91.26c.23-.67.53-1.67.84-2.77l.5.14c.71.47,1.42.94,2.14,1.4Z"/>
+                <path class="cls-330" d="M150.64,43.2a3.08,3.08,0,0,1-.07,1.08s-.07-.11-.11-.34l.12-.45Z"/>
+                <path class="cls-328"
+                      d="M150.28,42.69c.07.55.13,1,.18,1.25-.39,1.55-.84,3-.76,3v0h0l-.05.18c0,.07,0,.14,0,.23s0,.12-.05.18l-.14.51c0,.1-.05.21-.08.31s-.06.22-.09.34,0,0,0,0a.3.3,0,0,1,0,.11s0,0,0,0c-.29,1-.66,2.24-1.06,3.28l-2.4-.19a13.25,13.25,0,0,0,.26-3.76,8.19,8.19,0,0,0-1.13-3.58,22.59,22.59,0,0,0-2-3,7.62,7.62,0,0,0-2.61-2.15,8.87,8.87,0,0,0-7.29,0,5.86,5.86,0,0,0-.56.36.85.85,0,0,1,0-.17,7.85,7.85,0,0,1,1.23-2.68,9.49,9.49,0,0,1,2.23-2.29,6.3,6.3,0,0,1,2.86-1.31,11.18,11.18,0,0,1,6.37,1.26,12.16,12.16,0,0,1,2.37,1.92,8.4,8.4,0,0,1,1.74,2.09,15.8,15.8,0,0,1,.83,2.15C150.13,41.58,150.2,42.19,150.28,42.69Z"/>
+                <path class="cls-330" d="M149.19,48.85a.06.06,0,0,1,0,0h0S149.18,48.86,149.19,48.85Z"/>
+                <path class="cls-328"
+                      d="M145.71,52l2.4.19c-.11.32-.24.62-.35.89-.94,2.14-1.14,4-1.76,4.81l-1,1.26c-.78.64-1.93,1.57-3.31,2.64s-3,2.32-4.81,3.61c-.9.64-1.82,1.31-2.77,1.94l-.72.45c-.13.08-.18.09-.25.13a1.35,1.35,0,0,1-.27.06.17.17,0,0,1-.22-.13l-.13-.28-.18-.39a24.54,24.54,0,0,1-1.73-6.51,26.75,26.75,0,0,1-.23-3,.83.83,0,0,0,.3.13,7.51,7.51,0,0,0,1.94.08,26.18,26.18,0,0,0,4.52-.76,23.93,23.93,0,0,0,5.92-2.39,11.29,11.29,0,0,0,1.49-1.06,4.79,4.79,0,0,0,.67-.68.82.82,0,0,0,.17-.2c.06-.09.12-.21.16-.28S145.67,52.13,145.71,52Z"/>
+                <path class="cls-330" d="M146.63,57l.28-.09c0,.11-.09.21-.12.29Z"/>
+                <path class="cls-332"
+                      d="M145.15,48.28a12.37,12.37,0,0,1-.31,3.46,1.28,1.28,0,0,1-.13.36l-.05.12-.12.13a4,4,0,0,1-.6.56,9.69,9.69,0,0,1-1.36.94,20.54,20.54,0,0,1-4,1.71,10.5,10.5,0,0,0,3-7.37c.17-3.84-2.37-8.07-5.2-9a5.28,5.28,0,0,1,.89,0A7.4,7.4,0,0,1,140,40a7,7,0,0,1,2.34,2C143.61,43.9,145.07,46,145.15,48.28Z"/>
+                <path class="cls-333"
+                      d="M136.37,39.23c2.83.89,5.37,5.12,5.2,9a10.5,10.5,0,0,1-3,7.37c-.58.19-1.14.35-1.69.48a26.87,26.87,0,0,1-4.33.67h-.19a4.14,4.14,0,0,1-1.86-2.61h0c.18-3.25.46-5.4.47-5.53s.19-2.59.82-6.08c.11-.63.26-1.3.43-2a1,1,0,0,1,.18-.17h0l.07,0a10.76,10.76,0,0,1,3.87-1.08Z"/>
+                <path class="cls-332" d="M132.23,40.42l.16-.08a1,1,0,0,0-.18.17A.29.29,0,0,1,132.23,40.42Z"/>
+                <path class="cls-332"
+                      d="M132.35,56.71a5.4,5.4,0,0,1-1.44-.11.71.71,0,0,0-.52.1c0-.7,0-1.38.07-2,0-.2,0-.4,0-.58A4.14,4.14,0,0,0,132.35,56.71Z"/>
+                <path class="cls-329"
+                      d="M132.06,107.45c0,.28-.21.52-.47.74a3.67,3.67,0,0,1-.73.53,1.53,1.53,0,0,1-.61.16c.06-.39.12-.75.15-1.09a12.75,12.75,0,0,0,.09-1.78,8,8,0,0,0,0-.85h0c0,.12,0,.22.06.22a1.22,1.22,0,0,1,.63.42A3.73,3.73,0,0,1,132.06,107.45Z"/>
+                <path class="cls-334"
+                      d="M131.69,76.29c.33.4.45.85.19,1.08l-.31.26a2.13,2.13,0,0,0-.33.34,1.74,1.74,0,0,0-.13.2.7.7,0,0,0-.08.16.68.68,0,0,0,0,.15v.06a.59.59,0,0,1-.12.37.71.71,0,0,1-.15.15s-.14.1-.14,0,.19-.38,0-.54a1,1,0,0,0-.68.25c-.12.1-.18.16-.17.18s.1,0,.24,0a1.18,1.18,0,0,1,.25-.1l.15,0h.08s0,0,0,.07c0,.36.09.31.06.4a.36.36,0,0,1,0,.2,1.61,1.61,0,0,0-.1.36,0,0,0,0,0,0,.05v0c-.1,0-.17.06-.26.09s-.47.35-.7.49a1,1,0,0,1-.77.22.28.28,0,0,0,.09-.26c-.05-.15-.16-.14-.17-.13a.49.49,0,0,1,.05.16c0,.07-.13.16-.31.23a6,6,0,0,1-1.39.39,2.88,2.88,0,0,1-1.35,0,.27.27,0,0,1-.13-.07,4.87,4.87,0,0,0,.59-.36,3.28,3.28,0,0,0,.49-.4l.23-.23a3.09,3.09,0,0,0,.23-.31.75.75,0,0,0,.14-.68.72.72,0,0,0-.51-.37,2.43,2.43,0,0,0-1,0,1,1,0,0,0-.67.37,1.09,1.09,0,0,0-.14.45c0,.08-.05.13,0,.14s.07,0,.13-.1a1.22,1.22,0,0,1,.22-.34.75.75,0,0,1,.52-.18,2.25,2.25,0,0,1,.72.06c.08,0,.18.07.2.17s0,.2-.11.27-.08.07-.11.11l-.2.17a4.5,4.5,0,0,1-.45.31,3.06,3.06,0,0,1-2.11.52.84.84,0,0,1-.63-.56,2.45,2.45,0,0,1-.18-1,2.62,2.62,0,0,1,.71-1.68,4.54,4.54,0,0,1,1.67-1.05,8.48,8.48,0,0,1,1-.35,4.37,4.37,0,0,1,.48-.08c.09,0,.08,0,.11,0a2.48,2.48,0,0,0,1,.07l.41-.13.37-.13.2-.07.1,0a5.82,5.82,0,0,1,1.56,0,1.52,1.52,0,0,1,.66.22A2.22,2.22,0,0,1,131.69,76.29Z"/>
+                <path class="cls-329"
+                      d="M130.66,96a3.69,3.69,0,0,1,0,.69c-.09.56-.33,1.46-.44,2.29-.06.38-.1.74-.14,1.09-.28-1.53-.71-3.37-1.18-5.21l-.28-1.06.19.08A3.22,3.22,0,0,1,130.44,95a1.53,1.53,0,0,1,.2.78A1.46,1.46,0,0,1,130.66,96Z"/>
+                <path class="cls-329"
+                      d="M129.31,101.35c.51,1.38.81,2.3,1,2.28-.12,0,.06,1.52-.35,4.09a27.07,27.07,0,0,1-4,10,48.38,48.38,0,0,1-4.27,5.83c-1.49,2-4.06,2.91-6.74,3.39a30.06,30.06,0,0,1-4.18.38,26.1,26.1,0,0,1-4.26-.21,18.06,18.06,0,0,1-7.76-3.56c-.36-.27-.73-.55-1.08-.84h0a2.8,2.8,0,0,0,.47-2.3.32.32,0,0,0-.34-.21c-.17,0-1,0-1.48,0l-.37,0,.11.34s-.06.22-.39.44c-.08-.08-.15-.16-.24-.24a12.1,12.1,0,0,1-1.95-2.87l-.32-.64A11,11,0,0,1,92.7,116a.59.59,0,0,0,.25,0,.67.67,0,0,0,.49-.55.91.91,0,0,0-.3-.74,1.13,1.13,0,0,0-.33-.2,2.15,2.15,0,0,1-.73-.32.41.41,0,0,1-.11-.07,43.42,43.42,0,0,1-1.35-5c-.27-1.32-.5-2.63-.68-3.92l.23-.08c.46-.13,1.17-.34,2.15-.68a19,19,0,0,0,3.75-1.7c.73-.46,1.47-1,2.27-1.62L99.66,100c.56-.44.85-.82,1.4-1.29,0-.08.57-.61,1-1l0,0a12.07,12.07,0,0,1-1.69.11c-.71.08-1.46.15-2.06.17l-1.45,0a14.44,14.44,0,0,1-2.5-.18A9.34,9.34,0,0,1,91,96.62a6,6,0,0,1-1.2-.94c.06-.52.14-1,.24-1.52a28.67,28.67,0,0,1,.74-2.94,8.44,8.44,0,0,0,1.44.35,12.62,12.62,0,0,0,3.55-.14l1.1-.15c.46-.09.93-.17,1.44-.25l1.58-.29.85-.17c.23,0,.07,0,0-.09s-.25,0-.27-.1-.29-.18-.29-.2l-.32-.12,3-.45s0,0,0,0a28.84,28.84,0,0,0,3.2-2.63,26.74,26.74,0,0,1,2.25-1.72c.32-.23.6-.41.8-.53a28.94,28.94,0,0,0,6.09,1.68,15.65,15.65,0,0,0,3.47,0,0,0,0,0,1,0,0,1.6,1.6,0,0,0,.34.26,5,5,0,0,0,.79.49,2.9,2.9,0,0,0,.83.28,4.67,4.67,0,0,0,2.09-.06,9.92,9.92,0,0,0,1.17-.4c0,.09.13.29.23.58a.52.52,0,0,1,.14.34h0s0,0,0,0h0s0,0,0,.08A2.34,2.34,0,0,1,124,89a2.44,2.44,0,0,1-.32.5,3.86,3.86,0,0,1-2.22,1.23c-.27.06-.59.11-.91.16l-1.07.19a7.55,7.55,0,0,0-1.27.24l-.29.07-.15,0s0,.11,0,.15a2.77,2.77,0,0,0,.27.61,3.75,3.75,0,0,0,.92,1.06,6,6,0,0,0,1,.64,6.4,6.4,0,0,0,2,.55,12.08,12.08,0,0,0,3-.22c.65-.13,1.14-.24,1.51-.33h0c.18.5.38,1,.56,1.49l.34.92-.15.18a4.59,4.59,0,0,1-1.73,1.2,6.61,6.61,0,0,1-3.07.43c-.61,0-1.24-.09-1.87-.16a15.34,15.34,0,0,1-1.69-.3c-.62-.13-1.46-.41-2.3-.63l.21.24.05.07,0,0,.09.07.62.58A17.23,17.23,0,0,0,119,99.17c.24.2.51.37.76.56l.52.33a11.13,11.13,0,0,0,1,.57,9.32,9.32,0,0,0,4,1.08A9.65,9.65,0,0,0,129.31,101.35Zm-3.41,6.31a5.93,5.93,0,0,0,.51-.71,8.34,8.34,0,0,0-.81-.22,2.57,2.57,0,0,0-.47-.08c-.29,0-.57,0-.54.1s.19.07.46.19l.44.18c.1,0,.07.06.08.07s0,0-.1.07l-.2.21a1.24,1.24,0,0,1-.42.31c-.16,0-.27,0-.3-.19s0-.28,0-.3-.13.07-.18.29a.43.43,0,0,0,.09.4.6.6,0,0,0,.46.2A1.8,1.8,0,0,0,125.9,107.66Zm-.25,5.26a.32.32,0,0,0,0-.52,2.91,2.91,0,0,0-1.31-.1l-.6,0a2.72,2.72,0,0,0-.55.06,7,7,0,0,0-1.83.74,2.11,2.11,0,0,1-.56.25c-.13,0-.22,0-.23,0s-.15,0-.16.21a1,1,0,0,0,.31.6,1.45,1.45,0,0,0,.8.57,1.48,1.48,0,0,0,1.07-.38,8,8,0,0,1,1.62-1l.2-.07.31-.1.53-.17A3.09,3.09,0,0,0,125.65,112.92Zm-2,6.94c.1-.38-.28-.53-.54-.45a2,2,0,0,0-.35.08,5.63,5.63,0,0,0-1.1.61c-.5.33-.94.74-.89.81a5.65,5.65,0,0,0,1.09-.45,7.69,7.69,0,0,1,.74-.3c.2-.06.33-.12.34-.12a.69.69,0,0,0,.13-.05s0,0,0,0a2,2,0,0,1-.06.39,3.1,3.1,0,0,1-.13.45c-.08.29-.28.25-.31.3s0,.07.16.08a.46.46,0,0,0,.38-.23,2.23,2.23,0,0,0,.26-.48A3.36,3.36,0,0,0,123.69,119.86Zm-8.08-7a.3.3,0,0,0-.11-.41,1,1,0,0,0-.26-.08s-.25,0-.56,0a5.22,5.22,0,0,0-1.21.05,1.37,1.37,0,0,0-.91.82c-.13.31-.15.51-.11.52a4,4,0,0,0,1.67-.11,2.82,2.82,0,0,0,1.1-.51.33.33,0,0,1,.13-.07l.11,0C115.51,113,115.54,113,115.61,112.86ZM114,118.41c0-.23-.21-.42-.39-.5a6.29,6.29,0,0,0-.93-.24l-.64-.06a1.84,1.84,0,0,0-1.4.55A2.14,2.14,0,0,0,110,120a3.82,3.82,0,0,1,.91-1.57,1.38,1.38,0,0,1,1.06-.31l.62.11a5.46,5.46,0,0,1,.81.13c.05,0,.05,0,.07,0v0a.83.83,0,0,1-.11.15,6.23,6.23,0,0,1-.6.57c-.6.25-1.21.33-1.21.39a2.3,2.3,0,0,0,1.37-.09,4.72,4.72,0,0,0,.75-.56,1.54,1.54,0,0,0,.16-.18A.66.66,0,0,0,114,118.41Zm-6.26,4.84a.43.43,0,0,0,.13-.43.68.68,0,0,0-.39-.35c-.56-.25-1.07,0-1,.08s.13,0,.28,0a1.55,1.55,0,0,1,.49.21c.08,0,0,.09,0,.09s-.09,0-.09,0a2.34,2.34,0,0,1-.82.14A1,1,0,0,1,106,123c-.12,0,.07,0,.08.11a.8.8,0,0,1,.09.14s-.07,0-.08,0,0,0,0,.1,0,.09,0,.09l.17,0a1.87,1.87,0,0,0,.72.07,1.64,1.64,0,0,0,.33-.05A1.28,1.28,0,0,0,107.71,123.25Zm-4.28-11.41a.44.44,0,0,0,0-.57.81.81,0,0,0-.29-.17,2.08,2.08,0,0,0-.54-.11,5.26,5.26,0,0,0-1.39.1c-.45.09-.92.12-1.29.16l-.26,0a.27.27,0,0,0-.11,0s-.08.12,0,.15.15.1.16.1,0,0,0-.12a1.56,1.56,0,0,1,.31,0,8.19,8.19,0,0,0,1.33,0,5.8,5.8,0,0,1,1.27,0l.34.08h0s.06,0-.06.06c-.31.23-.62.67-1,.74a1.26,1.26,0,0,1-.61-.09l-.59-.17a1.55,1.55,0,0,0-.59-.1s.19.16.51.32.36.17.56.26a1.56,1.56,0,0,0,.77.19,1.63,1.63,0,0,0,.75-.34,5.59,5.59,0,0,1,.48-.38A1.19,1.19,0,0,0,103.43,111.84Z"/>
+                <path class="cls-328"
+                      d="M130.57,3.9c-.23.21-.48.45-.74.71a8.4,8.4,0,0,0-1.29,1.72,22.47,22.47,0,0,0-1.1,2.25c-.23.6-.5,1.33-.76,2.09-.08.22-.14.43-.15.46s0,.13,0,.07v-.15l0-.28c0-.19,0-.37-.07-.56l-.09-1a4.62,4.62,0,0,0-.19-.88,10.71,10.71,0,0,0-.36-1.09,22.07,22.07,0,0,0-1.49-3.12c.54-.1,1.08-.2,1.64-.28a16.14,16.14,0,0,1,2.62-.2,5.07,5.07,0,0,1,.56,0l.71.11Z"/>
+                <path class="cls-328"
+                      d="M129.21,101.07a2.15,2.15,0,0,0,.1.27,7.27,7.27,0,0,0-1.12,0,18.64,18.64,0,0,1-2.88-.14,9.26,9.26,0,0,1-3.73-1.21c-.3-.19-.61-.37-.92-.58l-.42-.3-.15-.12a2.49,2.49,0,0,1-.23-.22l-.09-.09s.11,0,.15,0l.28.07a1.5,1.5,0,0,0,.33.08c.66.1,1.31.17,1.93.22a7.75,7.75,0,0,0,3.55-.4,5.61,5.61,0,0,0,1.91-1.2C128.4,98.83,128.85,100.06,129.21,101.07Z"/>
+                <path class="cls-330" d="M128.45,80.84s0,0,0-.07A.1.1,0,0,1,128.45,80.84Z"/>
+                <g id="_Group_" data-name="&lt;Group&gt;">
+                    <path class="cls-329"
+                          d="M126.76,147.86a1.64,1.64,0,0,0-.55-.49,2.15,2.15,0,0,0-1.06-.15c-.28,0-.46,0-.46.06s.18.1.44.16a3.1,3.1,0,0,1,.86.28,1.3,1.3,0,0,1,.45.62,1.56,1.56,0,0,1-.16.2,1.66,1.66,0,0,1-.63.53,4.19,4.19,0,0,1-1.9.2l-4.32-.05-2.65-1.47c-.1-.51-.21-1-.32-1.55h0l.12,0h0l.58-.11h.2c.36,0,.86-.06,1.5,0a10.32,10.32,0,0,0,2.39-.05,16.06,16.06,0,0,0,2.91-1.11,11.13,11.13,0,0,1,1.53-.67,1.27,1.27,0,0,1,1.29.49,2.12,2.12,0,0,1,.57,1.18,1.55,1.55,0,0,0-.71-.29,2.67,2.67,0,0,0-1,.14.46.46,0,0,0-.29.16c-.07,0-.11.07-.1.1s0,0,.14,0a.62.62,0,0,1,.29-.06,3.32,3.32,0,0,1,.88.06,1.23,1.23,0,0,1,.76.62l-.14.27-.53.86A.6.6,0,0,0,126.76,147.86Z"/>
+                </g>
+                <path class="cls-328"
+                      d="M125.11,90c.26.67.54,1.43.84,2.24a7.17,7.17,0,0,1-1.2.72,6.79,6.79,0,0,1-2.61.72,4.4,4.4,0,0,1-1.82-.3,4.47,4.47,0,0,1-.9-.46,2.72,2.72,0,0,1-.65-.66,1.42,1.42,0,0,1-.2-.41c-.08-.09.05-.08.12-.09l.22,0,.84-.08c.71-.06,1.34-.11,1.92-.18a5.79,5.79,0,0,0,3-1.06C124.8,90.28,125,90.14,125.11,90Z"/>
+                <path class="cls-331" d="M124.81,84.11h0a.08.08,0,0,1,0,0v0Z"/>
+                <path class="cls-329"
+                      d="M124.8,85.46v.16c0,.17-.24.39-.24.39s-.35.23-.45.32a2.94,2.94,0,0,1-1.41.64,2.43,2.43,0,0,1-1.76-.16,1.37,1.37,0,0,1-.47-.37.51.51,0,0,1-.08-.26v0a11.56,11.56,0,0,0,1.23-.44,15.09,15.09,0,0,0,2.39-.89.73.73,0,0,0,.19.24l.09.05.1,0,.08,0A2.42,2.42,0,0,1,124.8,85.46Z"/>
+                <path class="cls-330" d="M124,84.78c.13,0,.25-.12.37-.18s-.13.11-.35.23a.08.08,0,0,1,0,0Z"/>
+                <path class="cls-329"
+                      d="M124.22,112.79l.06,0a.07.07,0,0,1-.06,0h0l-.17.07a7.91,7.91,0,0,0-1.64,1.15c-.27.2-.55.42-.79.39a1.26,1.26,0,0,1-.67-.4,1.18,1.18,0,0,1-.36-.46c0-.13,0-.18,0-.2s.08.09.24.08a2.12,2.12,0,0,0,.65-.15,8.31,8.31,0,0,1,1.8-.54,4.1,4.1,0,0,1,.5,0Z"/>
+                <path class="cls-328"
+                      d="M123.45,56a25,25,0,0,1,0,5.75A23.79,23.79,0,0,1,120.47,70c-.54.94-1,1.66-1.35,2.15a4.49,4.49,0,0,0-.51.74s-.24.1-.69.18a10.24,10.24,0,0,1-2,.19,13.09,13.09,0,0,1-3.09-.27,27,27,0,0,1-3.87-1.2c-2.81-1.05-6-2.51-9.41-4.14-.85-.4-1.74-.81-2.58-1.24l-1.26-.68-1.22-.77a45.45,45.45,0,0,1-4.73-3.57,85,85,0,0,1-8.34-8.31L80.5,52l-.4-.48L80,51.43s0-.07,0-.09l0,0,.19-.26L81.05,50a44.24,44.24,0,0,1,3.1-3.72,42.9,42.9,0,0,1,5.37-5c1.41-1.09,2.34-1.59,2.43-1.68a21.68,21.68,0,0,1,2-1,28.24,28.24,0,0,1,5.46-1.69,48.69,48.69,0,0,1,8.2-1.05,14.78,14.78,0,0,1,8.67,3l.06,0a14.11,14.11,0,0,1,4.32,4.67,20.06,20.06,0,0,1,2.07,6.14A56.55,56.55,0,0,1,123.45,56ZM121,58c.33-.29.49-2.46.32-3.47A30.6,30.6,0,0,0,120.23,50a18.42,18.42,0,0,0-2-4.48,9.35,9.35,0,0,0-2.06-2.3,18.31,18.31,0,0,0-2.88-1.56,14,14,0,0,0-3.32-1.06,8.81,8.81,0,0,0-3.78.19,11.69,11.69,0,0,0-3.45,1.7,22.75,22.75,0,0,0-7.55,8.73,15.75,15.75,0,0,0-.67,1.85c-.09.32-.17.64-.23,1,0,.17-.06.31-.1.52s0,.51,0,.76c.19.16.39.32.6.47l.37.28c.25.19.5.4.76.58l1.53,1h0a17.52,17.52,0,0,0,4.64,2,38.42,38.42,0,0,0,4.52,1,22.52,22.52,0,0,0,7.88.31,13.18,13.18,0,0,0,5-1.81A4.37,4.37,0,0,0,121,58Z"/>
+                <path class="cls-329"
+                      d="M122.26,124.61c-.3.57-.61,1.1-.85,1.55-.38.67-.64,1.14-.66,1.16l-.57,1.22a27.68,27.68,0,0,1-1.31,2.45c-1.1,1.73-2.25,3.51-2.07,3.57s.27,0,.59-.29a3.52,3.52,0,0,1,0,.49,43.28,43.28,0,0,0-.59,5c-.11,2.32-.1,4-.14,5,0,.56,0,1,0,1.23a.28.28,0,0,1,0,.09v0h0l-.12,0c-.4-1.92-.81-3.93-1.18-5.76-.06-.3-.12-.59-.2-.89l-.09-.44c0-.15-.06-.28-.14-.52q-.07-.78-.15-1.5c-.08-1.1-.18-2.13-.25-3.07-.15-1.91-.26-3.46-.34-4.56,0-.44-.06-.81-.08-1.08.4-.05.79-.12,1.18-.2a16.11,16.11,0,0,0,4.1-1.32A8.89,8.89,0,0,0,122.26,124.61Z"/>
+                <path class="cls-332"
+                      d="M120.94,56.62S121,58,121,58s-.57.46-1.64,1a11.88,11.88,0,0,1-1.11.51c1.29-1.4,1.65-3.56,1.86-6.06A26.17,26.17,0,0,1,120.94,56.62Z"/>
+                <path class="cls-333"
+                      d="M120.08,53.47c-.21,2.5-.57,4.66-1.86,6.06a11.07,11.07,0,0,1-1.35.48l.25-.2a17.5,17.5,0,0,1-4.45.62h-1.53c-2.17-1.46-3.58-4.68-3.38-8.36.25-4.64,2.86-8.24,6-8.43a10.86,10.86,0,0,1,1.39.83,7.81,7.81,0,0,1,1.52,1.73,1.11,1.11,0,0,1,.2.26l.44.81a2.43,2.43,0,0,0,.15.26A39.34,39.34,0,0,1,120.08,53.47Z"/>
+                <path class="cls-329"
+                      d="M119,85.77h-.1a17.63,17.63,0,0,1-3.43-.24,26.21,26.21,0,0,1-5-1.59l2.3-1.52A25,25,0,0,0,115,84.59a6.46,6.46,0,0,0,1.76.86,8,8,0,0,0,1.9.31Z"/>
+                <path class="cls-329"
+                      d="M116,73.7l2.85,1.13a.54.54,0,0,0-.4.2,1.56,1.56,0,0,0-.32.6s.12.1.27.13l-.29.27,0,0s0,0,0,0l-.81,1.4a27,27,0,0,0-4.05.66l-.15-1.34h0A7.63,7.63,0,0,0,110.9,76c-.34-.09-.71-.19-1.11-.28l.69-2.53a17.37,17.37,0,0,0,2.23.49A12.85,12.85,0,0,0,116,73.7Z"/>
+                <path class="cls-329"
+                      d="M117,173.23a6.51,6.51,0,0,1,.23,3.19,11.11,11.11,0,0,1-.31,1.64,10.73,10.73,0,0,1-.59,1.51c-.45,1-.93,1.85-1.36,2.62s-.79,1.41-1,1.87l-.26.49-2.49.25c-1.07.09-2.15.17-3.22.23l-.57.08h-.52l-.34-.06-1.6-.24c-2.86-.44-5.73-.81-8.51-1.31l0-.06c.25-.35.66-.83,1.15-1.42a16.24,16.24,0,0,0,3-4.85,9.24,9.24,0,0,0,.15-5.63,3.12,3.12,0,0,0-1-1.41l1.8.3a33.41,33.41,0,0,0,10.82-.2c.56-.09,1.12-.21,1.69-.34a4.82,4.82,0,0,1,1.35,1A7.68,7.68,0,0,1,117,173.23Z"/>
+                <path class="cls-333"
+                      d="M117.12,59.81l-.25.2a5.08,5.08,0,0,1-.59.17h0a27.52,27.52,0,0,1-3.58.25A17.5,17.5,0,0,0,117.12,59.81Z"/>
+                <path class="cls-333" d="M116.87,60a.43.43,0,0,1-.1.09l-.49.08A5.08,5.08,0,0,0,116.87,60Z"/>
+                <path class="cls-331" d="M116.08,13.43v0l-.52,0s0,0,0,0Z"/>
+                <path class="cls-329"
+                      d="M115.33,112.71s0,0,0,.07a.51.51,0,0,0-.07.18h-.07s-.2,0-.5-.07l.25-.21a1,1,0,0,1,.23-.13c.06,0,0-.07.08,0A.36.36,0,0,0,115.33,112.71Z"/>
+                <path class="cls-333"
+                      d="M116.25,60.18a12.3,12.3,0,0,1-1.49.29h-.1a.52.52,0,0,0-.43.08h-.09l-.9.06c-.32,0-.64,0-1,0s-.57,0-.85,0l-.28-.18h1.53A27.52,27.52,0,0,0,116.25,60.18Z"/>
+                <path class="cls-328" d="M115,5c.17,1.29.34,3.21.47,5.91a23.88,23.88,0,0,0-2.57-6Z"/>
+                <path class="cls-333" d="M114.76,60.47l-.25,0h-.28a.52.52,0,0,1,.43-.08Z"/>
+                <path class="cls-329"
+                      d="M114.64,112.88a2,2,0,0,1-.64.35c-.62.22-1.31.38-1.5.47.13-.16.44-.83,1.07-.89A6.34,6.34,0,0,1,114.64,112.88Z"/>
+                <path class="cls-329"
+                      d="M113.06,76.82l.15,1.34c-.43.08-.87.18-1.31.29-.62.15-1.26.32-1.85.49-.84-.71-1.44-1.15-1.53-1a12.33,12.33,0,0,0,1,1.17l-1.41.45c-1,.34-1.73.63-1.77.65a15.63,15.63,0,0,0-1.68.9c-.23.14-.47.32-.73.49-2.14-.7-4.38-1.35-6.6-2-.41-.12-.87-.24-1.2-.36L95,78.74l-2.35-1.06-.27-.13c1.23-.33,2.42-.62,3.38-.82,1.38-.31,2.34-.4,2.4-.42s1-.18,2.41-.34a36.41,36.41,0,0,1,5.14-.12,39,39,0,0,1,5.08.56C112,76.62,112.85,76.82,113.06,76.82Z"/>
+                <path class="cls-332"
+                      d="M112.65,43.07l1.16.58c-3.19.19-5.8,3.79-6,8.43-.2,3.68,1.21,6.9,3.38,8.36l.28.18a27.46,27.46,0,0,1-4.74-.64,38.19,38.19,0,0,1-4.38-1.13A16.54,16.54,0,0,1,98,56.92l0,0-1.51-1.06c-.25-.17-.48-.37-.73-.56l-.48-.39,0-.17.08-.42c.06-.29.15-.57.23-.86a13.37,13.37,0,0,1,.65-1.69,18.93,18.93,0,0,1,4.41-5.84,15.12,15.12,0,0,1,5.9-3.71A8.77,8.77,0,0,1,112.65,43.07Z"/>
+                <path class="cls-331" d="M112.47,113.73s0,0,0,0S112.48,113.73,112.47,113.73Z"/>
+                <path class="cls-329"
+                      d="M110.83,128.67l1,0c-.09.55-.21,1.37-.36,2.38-.29,1.91-.66,4.45-1,7l-.09.47,0,.11v0l0,0-.07.16-.38.9c-.23.6-.46,1.18-.69,1.75-.45,1.14-.86,2.21-1.23,3.13s-.64,1.71-.85,2.27c0,.14-.11.27-.15.38v.05l0,.13s0,.07,0,.1l0,.05a1.11,1.11,0,0,1-.08.24c0,.08-.38,1.22-.91,2.9-.59.49-1.27,1.06-2,1.67l-2.48,2.11-.32.28-.16.13,0,.06h0a3.65,3.65,0,0,1-.26-.44,1.35,1.35,0,0,1-.15-.51.82.82,0,0,1,0-.22s0-.27.32-.66a4.94,4.94,0,0,1,.51-.66c-.16-.37-1.59,1-1.42,1.26a1.48,1.48,0,0,0,.38,1,2.13,2.13,0,0,0,.21.22l-1.64-.22-.8-.13-.32,0a.88.88,0,0,1,0-.28,1.46,1.46,0,0,1,.14-.51l.11-.23a3.2,3.2,0,0,1,.41-.71c.24-.34.61-.58.58-.65s-.5,0-.88.35a2.82,2.82,0,0,0-.45.49,1.3,1.3,0,0,0-.18.27,1.81,1.81,0,0,0-.15.94c-.17-.24-.35-.47-.52-.69v-.14a2,2,0,0,1,0-.23,3.91,3.91,0,0,1,0-.48,5.21,5.21,0,0,1,.18-.86,2,2,0,0,1,.8-1.13,1.71,1.71,0,0,1,1.24-.32c.15.28,3.52-1.08,3.58-1.11a21.48,21.48,0,0,0,3.11-2.05h0c.28-.05.44-2.67.45-5.34a42,42,0,0,0-.24-5.61,14,14,0,0,0-.51-1.79c-.33-1-.83-2.27-1.36-3.53s-1.16-2.6-1.65-3.5a16.43,16.43,0,0,0,3.89,1.09A24.73,24.73,0,0,0,110.83,128.67Z"/>
+                <path class="cls-329"
+                      d="M110.28,79.87c.54.58,1.17,1.25,1.82,1.91-.75.41-1.47.79-2,1.12l-.94.53-2-.78c-.62-.23-1.25-.45-1.89-.67.89-.46,1.56-.72,1.6-.74s.67-.32,1.66-.7C109,80.33,109.62,80.1,110.28,79.87Z"/>
+                <path class="cls-329"
+                      d="M107.89,84.29l-.16.11a28.42,28.42,0,0,0-2.15,2,16.41,16.41,0,0,0-2.65,3.21l-3,.45a7.27,7.27,0,0,1-1.42-.76,5.31,5.31,0,0,1-.67-.5c-.15-.12-.29-.28-.43-.41a6.64,6.64,0,0,1-.75-1l.59-.34A34.53,34.53,0,0,0,102,84.1L103.7,83c1,.29,2,.59,3,.91Z"/>
+                <path class="cls-331" d="M106.15,123.24s.15.2,0,0Z"/>
+                <path class="cls-328"
+                      d="M104.8,12c0,.15.2.51,0,.23a12.11,12.11,0,0,0-1-1l-.27-.21-.62-.5-.81-.62-1.56-1.15A25.86,25.86,0,0,0,97.64,7,32.83,32.83,0,0,0,94,5.32a27.82,27.82,0,0,1,5.54-.88c.73,0,1.43-.07,2.12-.08a22.39,22.39,0,0,1,1.09,2.27c.55,1.25,1.3,3.24,1.71,4.38,0,.07.11.27.2.55S104.74,11.87,104.8,12Z"/>
+                <path class="cls-329"
+                      d="M102.53,82.64l-1,.79A33.12,33.12,0,0,0,97.22,87l-.59.34a7.57,7.57,0,0,1-.41-.8,19.25,19.25,0,0,1-1-3.09c-.13-.53-.22-1-.32-1.33.32-.63.53-1.07.66-1.32h0c.49.15.88.25,1.32.35C98.82,81.66,100.7,82.14,102.53,82.64Z"/>
+                <path class="cls-330" d="M101.75,127.17a.61.61,0,0,1,0,.12c0-.06,0-.12,0-.18Z"/>
+                <path class="cls-328"
+                      d="M101.07,98l.05.07-1,.8a31.49,31.49,0,0,1-4.38,3A12.34,12.34,0,0,1,92.1,103a15.67,15.67,0,0,1-2.19.21h-.18c-.08-.69-.13-1.39-.17-2.07a28.17,28.17,0,0,1,0-3.57c.27.12.57.25.91.37a12.91,12.91,0,0,0,3.8.75,22.81,22.81,0,0,0,2.59,0l1.44-.12c.39,0,.73-.07,1.14-.12l1-.25S100.86,98.1,101.07,98Z"/>
+                <path class="cls-330" d="M100.92,3l0,.09s0,0,0,0Z"/>
+                <path class="cls-328"
+                      d="M100.32,171.67a9.27,9.27,0,0,1-.5,5.22,15.32,15.32,0,0,1-3,4.41,19.52,19.52,0,0,0-1.6,1.95c-.94-.2-1.88-.41-2.79-.66a24.29,24.29,0,0,1-5.63-2.32c-.31-.16-.61-.34-.91-.52l1.19-.44a17.54,17.54,0,0,0,5.13-3A6.44,6.44,0,0,0,94,173.7a7.71,7.71,0,0,0,.46-2.71,6.72,6.72,0,0,0-.41-2.48l.77.23,2.83.82c.5.15,1,.31,1.61.45A3.14,3.14,0,0,1,100.32,171.67Z"/>
+                <path class="cls-329"
+                      d="M99.71,126.11c-.07.14-.14.33-.22.53A21.87,21.87,0,0,1,98,129.47a43.59,43.59,0,0,1-2.68,3.81c-1.06,1.38-2.19,2.79-3.45,4.15-1.58,1.7-3.23,3.46-4.55,5.15a9.23,9.23,0,0,1-1.41.16,13.88,13.88,0,0,1-4.1-.47,5.54,5.54,0,0,1-1.92-.88A4.65,4.65,0,0,1,78.67,140a4.69,4.69,0,0,1-.6-1.71c1.05-1.3,2.08-2.5,3.07-3.62a5.25,5.25,0,0,0,1.55,1.43,4.43,4.43,0,0,0,2.13.61c.62,0,1.05-.3.94-.46s-.35-.18-.75-.42a6.1,6.1,0,0,1-1.31-1,4.22,4.22,0,0,1-.78-1.32,4.9,4.9,0,0,1-.17-.55l.4-.44c.52-.55,1-1.06,1.51-1.53a6.13,6.13,0,0,0,1.52,1.53c1.59,1.09,3.38,1.26,3.45,1s-1.41-1.08-2.36-2.23a4.52,4.52,0,0,1-.94-1.64,1.39,1.39,0,0,1-.06-.19c.45-.41.88-.82,1.28-1.2l.75-.71a3.12,3.12,0,0,0,1.09,1.33,4.22,4.22,0,0,0,.71.41l.67.3A8.21,8.21,0,0,0,92,130c.75.18,1.31.12,1.32-.06s-.38-.36-1-.77c-.28-.2-.61-.44-.94-.71-.17-.13-.34-.28-.52-.41s-.34-.3-.45-.42a1.34,1.34,0,0,1-.23-1.46,2.38,2.38,0,0,1,.29-.54.56.56,0,0,1,.09-.13l0,0-.07,0,1.16-1.09,0,0s0,0,0,0,.08.2.08.21a3.21,3.21,0,0,0,.52.56,7.08,7.08,0,0,0,1,.61c.76.4,1.69.51,1.78.18s-.34-.83-.71-1.45l-.5-.81a.79.79,0,0,1,0-.24,1.14,1.14,0,0,1-.44-.79c0-.06,0-.13,0-.2a5.81,5.81,0,0,0,.55-1c.11.12.22.25.35.37a30.63,30.63,0,0,0,3.56,3C98.42,125.29,99.05,125.71,99.71,126.11Z"/>
+                <path class="cls-328"
+                      d="M99.22,90.23s.26,0,.09.06l-.52.09-1,.14-.9.08-1.08.06a8,8,0,0,1-3.19-.34,4.75,4.75,0,0,1-1.28-.71c.13-.38.29-.75.44-1.1.73-1.57,1.51-3.06,2.07-4.22.06-.11.11-.22.16-.32s0,0,0,0c.4.77.83,1.79,1.53,3A7.64,7.64,0,0,0,97,88.86a6.4,6.4,0,0,0,.49.42c.13.1.25.19.39.28a6.09,6.09,0,0,0,.91.5l.17.07Z"/>
+                <path class="cls-329"
+                      d="M97.71,120.67a2.37,2.37,0,0,1-.36,1.61.21.21,0,0,1-.08,0c-.4-.35-.81-.71-1.18-1.08a1.4,1.4,0,0,0,.48-.58C96.88,120.68,97.41,120.68,97.71,120.67Z"/>
+                <path class="cls-330" d="M94.05,168.51l-.1,0c0-.06,0-.09,0-.09S94,168.43,94.05,168.51Z"/>
+                <path class="cls-329"
+                      d="M94,168.48A15.13,15.13,0,0,1,94,171a6.57,6.57,0,0,1-2.39,4.75,17.38,17.38,0,0,1-5,2.58c-.73.26-1.35.44-1.8.58l-.28.08h0a4.65,4.65,0,0,1-.41-.26l-.61-.42c-.32-.24-.75-.54-1.11-.85-.75-.58-1.59-1.38-2.38-2.07,0,.93,0,1.85,0,2.77l-1.43-3L78,173.62l-1,1.31-1.06,1.37-.15.18s-.06.1-.06,0l0-.11-.1-.53c-.25-1.13-.49-2.24-.74-3.35-.12-.55-.24-1.09-.37-1.65l-.17-.82a8.06,8.06,0,0,0-.28-1c-.14-.29-.48-1.41-.86-2.66.4.08.87.14,1.39.19a11.28,11.28,0,0,0,2.78,0,10.69,10.69,0,0,0,3-1,5.54,5.54,0,0,0,2.2-1.54,7,7,0,0,0,1-1.64c.15-.43.28-.82.41-1.18.24-.69.43-1.27.56-1.7.3.58.52.93.53,1s.37.58.93,1.36a27.38,27.38,0,0,0,2.17,2.74,13.23,13.23,0,0,0,2.61,2.33,3.94,3.94,0,0,0,1.4.66l.33.41h0a2,2,0,0,0,.57.22C93.31,168.29,93.6,168.37,94,168.48Z"/>
+                <path class="cls-331" d="M92.67,116a.13.13,0,0,0,0,.08.09.09,0,0,1-.06,0S92.65,116,92.67,116Z"/>
+                <path class="cls-331" d="M89.59,3.88l0,0v0Z"/>
+                <path class="cls-330" d="M89.42,106.05l0,0h0Z"/>
+                <path class="cls-330" d="M89.37,106.08v.08a.09.09,0,0,0,0,0h0Z"/>
+                <path class="cls-330" d="M89.34,106.1h0l-.21.1Z"/>
+                <path class="cls-329"
+                      d="M89.06,89.47a28,28,0,0,0-1,3.44h0l-1.73,1.16-.47.32c-.33.23-.75.44-.86.8a1.62,1.62,0,0,0,.11,1.21c.1.24.15.3.22.45l.2.34a14.89,14.89,0,0,0,.93,1.36c.17.22.35.45.52.69l.27.34.13.15,0,0,0,.27c0,.41,0,.83,0,1.25.07,1.12.19,2.25.34,3.4h0a.81.81,0,0,0-.19-.41,2.94,2.94,0,0,0-.44-.42h0a.93.93,0,0,0,0-.1.58.58,0,0,0,0-.16c0-.11.05-.21.06-.32s0-.46,0-.72a7.79,7.79,0,0,0-.19-1.81,5.5,5.5,0,0,0-.94-2c-.9-1.22-2.1-2-2.54-2.72a4.36,4.36,0,0,1-.48-.93,3.3,3.3,0,0,1-.12-.37c0-.1,0-.09,0-.11s.06-.07.12-.13l.19-.2.45-.44,1.07-1c.79-.7,1.68-1.44,2.52-2.11C88,90.27,88.58,89.83,89.06,89.47Z"/>
+                <path class="cls-330" d="M88.21,106.65l.25-.08-.25.14v0h0Z"/>
+                <path class="cls-330"
+                      d="M88.21,106.71s0,.05,0,.07a.22.22,0,0,1,0,.12c0-.18-.07-.37-.09-.55a2.32,2.32,0,0,0,.08.3h0Z"/>
+                <path class="cls-329"
+                      d="M88.11,106.35c0,.18.06.37.09.55a.07.07,0,0,1,0,0c0,.22-.68.43-1.26.44a13.6,13.6,0,0,1-1.92,0,7.58,7.58,0,0,1-1.79-.35,1.9,1.9,0,0,1-1.15-.85,1,1,0,0,1,0-.62c0-.23.17-.54.24-.79.19-.52.36-1,.56-1.46a2.58,2.58,0,0,1,.38-.52c.13-.14.37-.34.47-.44A3.4,3.4,0,0,1,84,102c.1-.09.26-.22.38-.13s.15.48.26.69.21.48.13.6-.13.14-.18.21l-.08,0a1.81,1.81,0,0,0-1,.66.77.77,0,0,0,0,.61.88.88,0,0,0,.21.36,1.35,1.35,0,0,0,.24.25s.18,0,.27-.16.13-.27.09-.3a1.52,1.52,0,0,1-.17-.15c-.09-.12-.18-.25-.12-.37s.35-.31.67-.47a3,3,0,0,1,1-.31,1.48,1.48,0,0,1,1,.34,8.29,8.29,0,0,1,.78.59c.43.38.14.83.22.83s.08-.07.13-.25a.66.66,0,0,0,0-.32h0c.08.55.16,1.1.26,1.65A0,0,0,0,0,88.11,106.35Z"/>
+                <path class="cls-330"
+                      d="M88,105.3l.12,1c-.1-.55-.18-1.1-.26-1.65-.15-1.15-.27-2.28-.34-3.4,0-.42,0-.84,0-1.25.09,1,.21,2.14.31,3.28C87.85,104,87.93,104.63,88,105.3Z"/>
+                <path class="cls-330" d="M87.05,103.61s0,0,0,.06l-.12-.1h0v-.08l.09.08.06,0Z"/>
+                <path class="cls-330" d="M87,103.67h0a0,0,0,0,0,0,0s0,0-.06,0,0,0,0,0v-.05h0Z"/>
+                <path class="cls-328"
+                      d="M85.93,143.06a7.6,7.6,0,0,0,1.23-.26,18.5,18.5,0,0,0-1.77,2.69,10.64,10.64,0,0,0-.63,1.34c-.36.08-.92.23-1.62.36a11.08,11.08,0,0,1-4.54.05,6.1,6.1,0,0,1-3.65-2.4,6,6,0,0,1-.65-1.17c.25-.46.52-.91.8-1.34.74-1.12,1.53-2.18,2.32-3.19a5.38,5.38,0,0,0,.59,1.29A5.29,5.29,0,0,0,79.48,142a6.15,6.15,0,0,0,2.2.89A12.34,12.34,0,0,0,85.93,143.06Z"/>
+                <path class="cls-328"
+                      d="M84.27,159l.16.34-.76,1.77-.48,1.17a4.89,4.89,0,0,1-.69,1.13,6.13,6.13,0,0,1-2.41,1.65,10.22,10.22,0,0,1-2.85.82,11.17,11.17,0,0,1-2.61-.06c-.71-.09-1.3-.21-1.74-.31-.43-1.46-.87-2.87-1-3.21l-.23-.61h0a21.58,21.58,0,0,1-.73-5.15c0-.48,0-1,0-1.47a4.23,4.23,0,0,0,.73.62,7.38,7.38,0,0,0,5,1.31,27.07,27.07,0,0,0,4.94-.9,7.08,7.08,0,0,0,1.76-.71.86.86,0,0,0,0,.16A11.33,11.33,0,0,0,84.27,159Z"/>
+                <path class="cls-329"
+                      d="M84,150v.53a9.06,9.06,0,0,0-.66,4.7l-.27.1a12.24,12.24,0,0,1-1.56.43,34.12,34.12,0,0,1-4.9.62,6.85,6.85,0,0,1-4.49-1.34A5.67,5.67,0,0,1,71,153.89a9.56,9.56,0,0,1,.27-1.72,48,48,0,0,1,1.56-5.44c.32-.76.65-1.48,1-2.19a5.53,5.53,0,0,0,.5.77,6.63,6.63,0,0,0,4.16,2.51,10.79,10.79,0,0,0,4.74-.31,11.5,11.5,0,0,0,1.44-.5A6.35,6.35,0,0,0,84,150Z"/>
+                <rect class="cls-331" x="83.93" y="129.61" width="0.01" height="0.01"/>
+                <path class="cls-331" d="M82.3,11.7h0c-.34.3-.66.62-1,1A12.93,12.93,0,0,1,82.3,11.7Z"/>
+                <path class="cls-331" d="M73.86,142.73h0c-.07.17-.16.33-.23.5.07-.17.15-.33.22-.51Z"/>
+                <path class="cls-331" d="M73.61,143.28c-.06.16-.11.3-.18.46v0Z"/>
+                <circle class="cls-329" cx="133.59" cy="46.47" r="1.44"/>
+                <circle class="cls-329" cx="111.44" cy="48.47" r="1.62"/>
+                <circle class="cls-329" cx="112.42" cy="51.01" r="0.33"/>
+                <circle class="cls-329" cx="132.16" cy="48.93" r="0.34"/>
+                <path class="cls-327"
+                      d="M126.76,147.86l-.32.47a1.4,1.4,0,0,0-.45-.61,2.56,2.56,0,0,0-.86-.28c-.26-.06-.44-.12-.44-.17s.18-.05.46-.05a2.16,2.16,0,0,1,1.06.15A1.75,1.75,0,0,1,126.76,147.86Z"/>
+                <g class="cls-335">
+                    <path class="cls-336"
+                          d="M111.08,139.66q-1.62-.1-3.3-.18c-.3,7.81-8.71,9.24-10.64,16C106.45,159.85,111.51,148.61,111.08,139.66Z"/>
+                </g>
+                <path class="cls-337"
+                      d="M115.66,140.07l-.36,0c0,.26.1.51.16.76C115.52,140.55,115.59,140.31,115.66,140.07Z"/>
+                <g class="cls-335">
+                    <path class="cls-336"
+                          d="M115.89,150.43c2.67,1.6,5.47.72,9.5-.33-5-2.51-8.69-4.36-9.93-9.31C114.42,144.48,114.15,147.82,115.89,150.43Z"/>
+                </g>
+                <path class="cls-338"
+                      d="M125.83,165.87a62.25,62.25,0,0,1-11.29,3.9,5.52,5.52,0,0,1,1.18.79,10.16,10.16,0,0,1,1.13,1.2,65.59,65.59,0,0,0,21.62-12.12C134.06,161.91,129.86,164.1,125.83,165.87Z"/>
+                <path class="cls-328"
+                      d="M146.18,169.85c3.12-2.08,6.24-3.12,10.4-4.16-2.08,0-4.16-1-3.12-3.12a31.79,31.79,0,0,1,7.6-5.3l-.48-.73a9.55,9.55,0,0,0-.75-.91,7.11,7.11,0,0,0-6.16-2.3,15.93,15.93,0,0,0-4.48,1.12c-1.43.55-2.81,1.28-4.21,1.92s-2.73,1.35-4.07,2l-2.44,1.25a65.59,65.59,0,0,1-21.62,12.12,6.07,6.07,0,0,1,.76,1.21,7,7,0,0,1,.45,3.54,15.06,15.06,0,0,1-.25,1.79,14.49,14.49,0,0,1-.57,1.65c-.44,1-.91,2-1.31,2.75s-.66,1.24-.89,1.69c.86-.1,1.73-.22,2.58-.34,1.54-.23,3.08-.52,4.61-.84,8.71-3.91,17.27-8.51,26-11.28C146.18,171.93,145.14,170.89,146.18,169.85Z"/>
+                <path class="cls-339"
+                      d="M161.09,157.25a31.79,31.79,0,0,0-7.6,5.3c-1,2.08,1,3.12,3.12,3.12-4.16,1-7.27,2.08-10.39,4.16-1,1,0,2.08,2.08,2.08-8.77,2.77-17.32,7.37-26,11.28.58-.12,1.16-.23,1.74-.37a31.26,31.26,0,0,0,6-2l0,0h0l5.63-2.22c1.95-.37,3.61-.64,5.36-1,.84-.23,1.7-.42,2.52-.72l1.24-.41,1.22-.5a27.78,27.78,0,0,0,8.61-5.65,21.65,21.65,0,0,0,5.45-8.36,17.88,17.88,0,0,0,.7-2.37,11.55,11.55,0,0,0,.21-1.2l.09-.61a2.56,2.56,0,0,0,0-.37Z"/>
+                <path class="cls-339"
+                      d="M121.1,183.57l1.11-.5c2.48-1.11,5-2.3,7.42-3.45a156,156,0,0,1,18-7.62,2.17,2.17,0,0,1-1.85-1,1.14,1.14,0,0,1,.37-1.25,30,30,0,0,1,9.67-4,3.34,3.34,0,0,1-2.45-1.27,2,2,0,0,1,0-2l0,0a32.83,32.83,0,0,1,7.63-5.33l.1,0,.16.27a.57.57,0,0,1,0,.19,2.06,2.06,0,0,0,0,.21l-.09.61c0,.14,0,.28-.07.42a5.35,5.35,0,0,1-.14.8l-.18.66a10.36,10.36,0,0,1-.53,1.72,21.74,21.74,0,0,1-5.48,8.41,28.14,28.14,0,0,1-8.65,5.67l-1.22.5-1.24.42a17.46,17.46,0,0,1-1.84.53l-.7.19c-1.23.27-2.41.48-3.67.71l-1.69.31-1.48.58-4.13,1.63h0a32.31,32.31,0,0,1-6.08,2c-.41.1-.83.18-1.24.27Zm32.5-20.94a1.69,1.69,0,0,0,0,1.71,3.62,3.62,0,0,0,3.05,1.2h1.06l-1,.26a31.06,31.06,0,0,0-10.35,4.14.9.9,0,0,0-.3.95c.22.54,1.13.89,2.31.89h.84l-.8.25a151.94,151.94,0,0,0-18.6,7.82c-2.08,1-4.22,2-6.35,3l.57-.13a32,32,0,0,0,6-2l.05,0h0l4.11-1.62,1.5-.59,1.72-.32c1.25-.23,2.43-.44,3.65-.71l.69-.18a16.47,16.47,0,0,0,1.82-.53l1.24-.42,1.21-.49a27.93,27.93,0,0,0,8.57-5.62,21.58,21.58,0,0,0,5.42-8.31,11.73,11.73,0,0,0,.52-1.69c.06-.23.11-.45.18-.67a5.7,5.7,0,0,0,.14-.76,3.32,3.32,0,0,1,.06-.44l.09-.6a2.06,2.06,0,0,1,0-.21.2.2,0,0,0,0-.07A31.76,31.76,0,0,0,153.6,162.63Z"/>
+                <path class="cls-340"
+                      d="M72.06,21.13s.27-.34.68-.76A14,14,0,0,1,74.19,19c-.13,0-.21,0-.23,0a2.62,2.62,0,0,0-.17-.28,2.36,2.36,0,0,0-.71-.58,6,6,0,0,0-3.4-.49l-.85,0a13.46,13.46,0,0,1,2.11,5.43c.19-.44.4-.85.58-1.18C71.82,21.48,72.05,21.14,72.06,21.13Z"/>
+                <path class="cls-329" d="M126,83.35a4.32,4.32,0,0,1-1,.83l.37.07.26,0c.11-.32.24-.66.39-1Z"/>
+                <path class="cls-329" d="M146.79,57.17a2.91,2.91,0,0,1-.1.28l.4.09Z"/>
+                <path class="cls-341"
+                      d="M127.87,84.19a6,6,0,0,0,2.28-1,9.5,9.5,0,0,1,.92-.75l0-.11a5.16,5.16,0,0,1-1.87.13c-.76-.08-1.24-.27-1.24-.35s.52,0,1.25-.1a4.75,4.75,0,0,0,2.4-.77,13.43,13.43,0,0,0,1.95-1.82,11.77,11.77,0,0,0,.76-1s.13-.19.32-.48c-.89.12-1.64.28-1.69.15s1-.7,2.1-1h.06a5.92,5.92,0,0,0,.26-.81c-.4.11-.64.17-.66.12s.25-.26.73-.51a3.93,3.93,0,0,0,0-.91c0-.22,0-.44-.07-.66a6.65,6.65,0,0,1-2.09.42,7,7,0,0,1,2-1c-.08-.51-.18-1-.28-1.36a2.34,2.34,0,0,0-.31-.76c-.11-.14-.25-.17-.24-.23s.15-.09.39,0a1.9,1.9,0,0,1,.59.79s0,0,0,0l.07,0A20,20,0,0,1,138,70.59a13.7,13.7,0,0,0,2.35-1.71,15.89,15.89,0,0,0,2.06-2.63c1.26-1.94,2.24-4,3.17-5.66A9.86,9.86,0,0,1,147,58.68c.22-.21.42-.36.55-.48h0a0,0,0,0,0,0,0s-.05-.07-.14-.19l-.38-.46-.4-.09a1.16,1.16,0,0,1-.06.15c-.69,1.47-4.5,4.7-4.5,4.7-1.33,1.16-2.92,2.49-4.65,3.86-.88.68-1.77,1.39-2.74,2.08-.24.16-.47.34-.75.51a3.3,3.3,0,0,1-.51.27,2.87,2.87,0,0,1-.59.12,1.05,1.05,0,0,1-1.2-.56l-.26-.5-.21-.4a28.23,28.23,0,0,1-2.38-13.06c.09-3.63.36-6.1.37-6.25s.24-2.62,1-6.21c.18-.87.41-1.81.72-2.8-5,11.22-4.45,23.93-1.17,35.25a6.25,6.25,0,0,1,.85.08,2.58,2.58,0,0,1,1,.4,3.33,3.33,0,0,1,.74.71,2.18,2.18,0,0,1,.43,1,1.23,1.23,0,0,1-.41,1.09c-.56.4-.78.47-.94,1.33a1.23,1.23,0,0,1-.42.54,1,1,0,0,1-.28.14.28.28,0,0,1-.22,0v0a.16.16,0,0,1,.1,0,.06.06,0,0,1,0,.08v0s0,.06-.07,0c-.1.08-.37.42-.74.79a1.28,1.28,0,0,1-1,.33,1,1,0,0,1-.43-.14h0a5.84,5.84,0,0,1-1.23.48c-.11,0,.12,0,0,0-.07.19-.31.24-.39.42.18-.21.11-.12.16-.07a1.76,1.76,0,0,1-.17.43,3.84,3.84,0,0,1-.6.83c-.15.34-.81.72-1.08,1A8.6,8.6,0,0,0,127.87,84.19Zm5.35-8.11s.15,0,.26.14c0,0,.1-.12.37-.24.06,0,.14-.1.21,0a.34.34,0,0,1,.09.2,1.4,1.4,0,0,1-.09.67c-.11.25-.26.4-.48.37a.62.62,0,0,1-.41-.41A.68.68,0,0,1,133.22,76.08Zm-.51-1.81a.82.82,0,0,1-.71.16.34.34,0,0,1-.24-.42.9.9,0,0,1,.23-.43l.11-.14s.14,0,.25.16.15-.11.45-.21a.21.21,0,0,1,.22,0,.33.33,0,0,1,.06.22A1,1,0,0,1,132.71,74.27Z"/>
+                <path class="cls-329"
+                      d="M132.37,4.26c-.21.1-.43.21-.67.35a12.37,12.37,0,0,0-1.31.85,6.15,6.15,0,0,0-1.27,1.38A14.6,14.6,0,0,0,127.92,9a28.82,28.82,0,0,0-1.34,3.58c-.12.41-.25.8-.27.87s0,.07,0,0l0-.23-.06-.45c-.05-.29-.08-.58-.12-.87-.08-.58-.15-1.14-.23-1.67a9.15,9.15,0,0,0-.36-1.58,9.74,9.74,0,0,0-.43-1,12,12,0,0,0-1.84-2.74,6.1,6.1,0,0,0-.5-.51l-.33.06c-1.71,2.15-5.05,2.82-6.24,4.89,0,1.18-.06,2.53,0,4.07v0l-.52,0s0,0,0,0-.08-.43-.14-.76a15.34,15.34,0,0,0-3.87-7.64l-.3-.28-1-.06-1.6-.14-.25,0c-1.85,1.27-2.7,3.3-3.4,5.82.15.51.31,1,.48,1.6a1.33,1.33,0,0,0,0,.53,4.32,4.32,0,0,0,.06.47c0,.13.12.48-.07.2a4,4,0,0,0-1.31-.93l-.45-.4c-.36-.31-.69-.58-1-.83l-.81-.6c-.52-.38-1-.74-1.53-1.07a19.46,19.46,0,0,0-2.83-1.61,21.24,21.24,0,0,0-4.57-1.49c-.36-.07-.68-.12-1-.16l-.9.38c-.92.42-1.8.86-2.66,1.32a37.51,37.51,0,0,0-4.43,2.82L83.5,11a1.2,1.2,0,0,0-.38.15,5.22,5.22,0,0,0-.82.6h0c-.34.3-.66.62-1,1L81,13c-.16.18-.32.35-.5.52l-.38.4-1.76-.45c-1.44-.36-3.49-.87-5.9-1.29a23.57,23.57,0,0,0-3.69-.42c-1.32,0-2.83.17-4.35.34s-3.12.43-4.7.72l-1.17.24-1,.22-.11,0c2.62,5.86,4,12.19,10.74,14.1a13.09,13.09,0,0,0-1.91,6C67.61,35,68.38,36,68.22,36.18s-.84-.41-2-1.41a.49.49,0,0,1,0,.12,13.54,13.54,0,0,1-.05,2.62v0c-.58,5.4-3.32,11,4.16,11.74-1,2.08-4.16,3.12-4.16,5.2,1,2.08,4.16,2.08,7.28,2.08-2.08,2.08-4.16,4.15-6.24,5.19,3.55,1.53,6.12,4.54,8.78,7.35.32.21.67.44,1.06.67.9.56,1.95,1.15,3.11,1.77,2.31,1.25,5,2.62,8,4L91.17,77h0c1.56-.55,3.1-1,4.34-1.32,1.41-.37,2.41-.51,2.46-.53s1-.16,2.51-.25a34.33,34.33,0,0,1,5.28.12,31.53,31.53,0,0,1,4,.66l.69-2.53c-.58-.14-1.19-.33-1.81-.53-2.9-.93-6.18-2.29-9.65-3.8-.87-.39-1.75-.76-2.65-1.19-.45-.21-.9-.44-1.35-.67l-1.31-.76a45.79,45.79,0,0,1-5-3.57A86.52,86.52,0,0,1,80,54.35c-.32-.37-.64-.72-1-1.06l-.51-.59-.82-1c0-.09-.21-.17-.15-.25l.18-.26.35-.53.56-.82c.25-.38.5-.74.75-1.11a48.35,48.35,0,0,1,3.17-4,46.2,46.2,0,0,1,5.55-5.36,28.42,28.42,0,0,1,2.65-1.87,23.7,23.7,0,0,1,2.31-1.16A29.69,29.69,0,0,1,99,34.69a49.93,49.93,0,0,1,8.62-.94,16.47,16.47,0,0,1,9.8,3.59l0,0,0,0a15.57,15.57,0,0,1,4.65,5.32,21.08,21.08,0,0,1,2.06,6.68,55.56,55.56,0,0,1,.51,6.52,26,26,0,0,1-.29,6,22.5,22.5,0,0,1-3.48,8.37c-1.25,1.83-2.23,2.71-2.31,2.61.09.12-.87.7-2.65.84l2.85,1.13h0a.64.64,0,0,1,.42.19,1.51,1.51,0,0,1,.46.65.37.37,0,0,1-.16.44.7.7,0,0,1-.4.07l-.57,0a3.9,3.9,0,0,1-.51-.06l-.81,1.4c.12,0,.19,0,.19,0s-2.67.84-5.32,1.71l-1.24.4,1.91,1.68.07.06a18.57,18.57,0,0,1,2.38-1.09c.79-.22,1.33-.17,1.34-.09s-.52.19-1.17.51-1.22.74-1.93,1.21c.79.69,1.56,1.35,2.16,1.78a5.79,5.79,0,0,0,1,.49l.46.14a7.52,7.52,0,0,0,1.64.34,12.54,12.54,0,0,0,3.63-.2A6.93,6.93,0,0,0,125.66,83a7,7,0,0,0,.87-.87l.22-.54a2.83,2.83,0,0,1-1.26,0,1.21,1.21,0,0,1-.55-.33,3.33,3.33,0,0,1-1.46.16,1.74,1.74,0,0,1-1.28-1,3.59,3.59,0,0,1-.33-1.4,3.63,3.63,0,0,1,.88-2.37,4.36,4.36,0,0,1,1.4-1.12,5.94,5.94,0,0,1,.64-.31,7.29,7.29,0,0,1,1.23-.36,5,5,0,0,1,.66-.09,1.55,1.55,0,0,1,.52.07l.21,0h.2l.3-.08.37-.11.19-.06.28-.06a8.29,8.29,0,0,1,1,0c-3.28-11.32-3.85-24,1.17-35.25a.24.24,0,0,1,0-.08,9,9,0,0,1,.79-1.93,13.51,13.51,0,0,0-3.22,7.74,13.51,13.51,0,0,1,3.22-7.74,8.7,8.7,0,0,1,.73-1.16,11.26,11.26,0,0,1,2.62-2.53,9.36,9.36,0,0,1,2.2-1.14A15.38,15.38,0,0,0,142,27.41C147.84,17.24,141,10.11,132.37,4.26ZM74.86,19.56a17,17,0,0,0-1.3,1.51c-.34.43-.54.75-.56.76l-.57.74a10.19,10.19,0,0,0-1,1.68,5.9,5.9,0,0,0-.42,1,8.57,8.57,0,0,1-3.82,6.34v0A8.57,8.57,0,0,0,71,25.23,11.77,11.77,0,0,1,70.44,27c-.07,0-.18-.36-.17-.94a6.84,6.84,0,0,1,.37-2.09,6.62,6.62,0,0,1,.3-.78,13.46,13.46,0,0,0-2.11-5.43c-2.72.08-5.14-.24-5.14-.51s1.88-.57,4.07-1a17,17,0,0,0-3.71-3.39,17,17,0,0,1,3.71,3.39l1.68-.33a7.6,7.6,0,0,1,4.63.15,4.55,4.55,0,0,1,2.05,1.64l0,0c.44-.23.76-.34.79-.28S75.86,18.5,74.86,19.56ZM118.63,82a1.11,1.11,0,0,1-1.2-.14,1,1,0,0,1-.12-1.1,4.07,4.07,0,0,1,.52-.8s.16,0,.28.11a1.08,1.08,0,0,1,.85.24,1,1,0,0,1,.45.86A1.12,1.12,0,0,1,118.63,82Z"/>
+                <path class="cls-329"
+                      d="M122.37,4.47c-.66.13-1.33.27-2,.39-.25,0-.48.08-.77.1s-.56,0-.8,0a12.42,12.42,0,0,1-1.36,0l-1,0c-.1,1.06-.2,2.5-.26,4.37C117.32,7.29,120.66,6.62,122.37,4.47Z"/>
+                <path class="cls-329"
+                      d="M108.37,4.58c-.91-.08-2.12-.17-3.57-.21-.54,0-1.11,0-1.7,0,.2.59.41,1.26.65,2,.35,1.16.76,2.5,1.22,4C105.67,7.88,106.52,5.85,108.37,4.58Z"/>
+                <path class="cls-341"
+                      d="M67.17,61.72c2.08-1,4.16-3.11,6.24-5.19-3.12,0-6.24,0-7.28-2.08,0-2.08,3.12-3.12,4.16-5.2-8.77-.88-3.49-8.41-4.11-14.49l-.73-.62A19.5,19.5,0,0,1,65.38,38a27.19,27.19,0,0,1-1.14,5.21,17.61,17.61,0,0,1-1.24,3,12.81,12.81,0,0,1-.91,1.48c-.17.24-.34.49-.54.72l-.29.35L61,49a.45.45,0,0,0,0,.66.38.38,0,0,0,.15.09l.23.08.79.31,2.46.92.67.26.33.13.18.07.08,0-.06,0-1.18.79C63.4,53.17,62.18,54,61,54.83l-.74.49-.26.19-.35.26.57.13,1.84.47,6.4,1.74-2.85,1.57-1.35.78-.5.3-.15.11h0s-.12.07-.1.12l.22.13,4.49,2.8c2.58,1.6,4.2,2.66,4.34,2.75l2.21,1.53,1.24.86C73.29,66.26,70.72,63.25,67.17,61.72Z"/>
+                <path class="cls-341"
+                      d="M152.33,18.93c.15.37.28.72.39,1,.21.61.29,1.05.31,1.08a8.68,8.68,0,0,1,.09,1.14,11,11,0,0,1-.32,2.33,9,9,0,0,1-1,3.13,18.91,18.91,0,0,1,.18-3.25,14,14,0,0,0,.07-2.16c-.06-.53-.17-.91-.17-1a9.74,9.74,0,0,0-.2-1c-.14-.59-.35-1.36-.61-2.11-.42-1.27-.91-2.49-1-2.93-.66-1-1.48-1.86-2.21-2.75a1.15,1.15,0,0,0-.12.23l-.89-1.28.19,0a7,7,0,0,1-.86-1.65,7,7,0,0,0,.86,1.65,5.67,5.67,0,0,0,.59-.13,20.47,20.47,0,0,0,2.33-.87,10.4,10.4,0,0,1,2.27-.68h0l.5-.21c.45-.2.86-.23.88-.13a5.35,5.35,0,0,1,.17,1.51,8.77,8.77,0,0,1-.57,2.95,23.62,23.62,0,0,1-1.67,3.44c.09.18.18.37.28.55.18.37.34.75.49,1.11,1.76-.7,1.48-3.46,2.73-4.68,0-.84-.05-1.36-.05-1.41s0-.87-.09-2.06S154.6,8,153.43,7.37A5.19,5.19,0,0,0,151,7c-.93,0-1.92.13-2.89.25s-1.93.2-2.81.28l-.33,0h-.54l-.8,0,.69,1.17c.27.43.39.7.33.76s-.29-.14-.66-.48-.86-.85-1.5-1.55c-.54-.15-1.29-.41-2.18-.74-1.16-.43-2.52-1-4-1.53a27.09,27.09,0,0,0-3.83-1l-.07,0c8.58,5.85,15.47,13,9.65,23.15a15.38,15.38,0,0,1-4.74,5.11,5.91,5.91,0,0,1,1.35-.31,12.1,12.1,0,0,1,7,1.66A12,12,0,0,1,148.06,36a8.79,8.79,0,0,1,1.76,2.38,14.08,14.08,0,0,1,.74,2.39c0,.73.06,1.34.07,1.86,0,.2,0,.38,0,.53a19.46,19.46,0,0,0,.36-2.11c.1-.66.13-1.12.14-1.15s.06-.48.13-1.16.14-1.56.18-2.44c.06-1.36,0-2.73.06-3.29-.07.08-.11.1-.14.09s.33-1.28.95-3.12a52.23,52.23,0,0,0,1.88-6.82,44.21,44.21,0,0,0,.84-7c0-.74,0-1.39,0-1.92C153.81,15.47,154.09,18.23,152.33,18.93Z"/>
+                <path class="cls-340"
+                      d="M150.07,15.05a5.26,5.26,0,0,1,1.24,1.75c.1-.75.42-2.05.73-3.31a8.5,8.5,0,0,0,.15-2.54,3.53,3.53,0,0,0-.05-.38,3,3,0,0,0-2,.18,5.32,5.32,0,0,0-2,1.32,3.7,3.7,0,0,0-.3.4c.73.89,1.55,1.77,2.21,2.75C150.05,15.13,150,15.06,150.07,15.05Z"/>
+                <path class="cls-331" d="M152.45,10.78l0,.05-.11.07h0v0Z"/>
+                <path class="cls-329"
+                      d="M153.24,48.69l-1.75,1.89c-.42.48-.88,1-1.36,1.51l-.72.81-1.16,1.35-.5-.14c.51-1.75,1.05-3.78,1.43-5.22A39.61,39.61,0,0,0,153.24,48.69Z"/>
+                <path class="cls-331" d="M151.61,33a.29.29,0,0,1-.1.09,1,1,0,0,1,0-.25S151.59,32.85,151.61,33Z"/>
+                <path class="cls-329"
+                      d="M150.65,55.88l-.26,0h-.09l-.51.14-2,.55-.91.26c.23-.67.53-1.67.84-2.77l.5.14c.71.47,1.42.94,2.14,1.4Z"/>
+                <path class="cls-330"
+                      d="M132.41,39.73a.85.85,0,0,0,0,.17h0c.16-.53.34-1,.54-1.57A7.83,7.83,0,0,0,132.41,39.73Z"/>
+                <path class="cls-342"
+                      d="M141.71,33.56a12.92,12.92,0,0,0-3-.11,6.3,6.3,0,0,0-2.86,1.31,9.49,9.49,0,0,0-2.23,2.29,8.63,8.63,0,0,0-.73,1.27c-.2.52-.38,1-.54,1.57.18-.13.38-.24.56-.35a6.64,6.64,0,0,1,3-.76C137.42,36.54,139.37,34.41,141.71,33.56Z"/>
+                <path class="cls-330"
+                      d="M150.46,43.94c-.05-.27-.11-.7-.18-1.25s-.15-1.11-.24-1.82a15.8,15.8,0,0,0-.83-2.15,8.4,8.4,0,0,0-1.74-2.09,12.16,12.16,0,0,0-2.37-1.92,10.15,10.15,0,0,0-3.39-1.15c-2.34.85-4.29,3-5.73,5.22q.63,0,1.32,0a8,8,0,0,1,2.92.75,7.62,7.62,0,0,1,2.61,2.15,22.59,22.59,0,0,1,2,3A8.19,8.19,0,0,1,146,48.22a13.25,13.25,0,0,1-.26,3.76l2.4.19c.4-1,.77-2.27,1.06-3.28,0,0,0,0,0,0a.3.3,0,0,0,0-.11s0,0,0,0,.06-.24.09-.34.06-.21.08-.31l.14-.51c0-.06,0-.13.05-.18s0-.16,0-.23l.05-.18h0v0C149.62,46.9,150.07,45.49,150.46,43.94Z"/>
+                <path class="cls-342"
+                      d="M132.63,57.84a7.51,7.51,0,0,1-1.94-.08.83.83,0,0,1-.3-.13,26.75,26.75,0,0,0,.23,3,24.54,24.54,0,0,0,1.73,6.51l.18.39.13.28a.17.17,0,0,0,.22.13,1.35,1.35,0,0,0,.27-.06c.07,0,.12-.05.25-.13l.72-.45c.95-.63,1.87-1.3,2.77-1.94l.92-.68a25.69,25.69,0,0,1-4.32-7Z"/>
+                <path class="cls-330"
+                      d="M145.71,52c0,.15-.09.32-.15.49s-.1.19-.16.28a.82.82,0,0,1-.17.2,4.79,4.79,0,0,1-.67.68,11.29,11.29,0,0,1-1.49,1.06,23.93,23.93,0,0,1-5.92,2.39,23.48,23.48,0,0,1-3.66.67,25.69,25.69,0,0,0,4.32,7c1.42-1,2.74-2,3.89-2.93,1.38-1.07,2.53-2,3.31-2.64l1-1.26c.62-.77.82-2.67,1.76-4.81.11-.27.24-.57.35-.89Z"/>
+                <path class="cls-332"
+                      d="M141.85,41.51A7.1,7.1,0,0,0,140,40a7.4,7.4,0,0,0-2.71-.79,5.28,5.28,0,0,0-.89,0c2.83.89,5.37,5.12,5.2,9a10.5,10.5,0,0,1-3,7.37A20.85,20.85,0,0,0,142.25,54C144.19,50.55,143.14,45.69,141.85,41.51Z"/>
+                <path class="cls-329"
+                      d="M145.15,48.28c-.08-2.33-1.54-4.38-2.84-6.2a6.36,6.36,0,0,0-.46-.57c1.29,4.18,2.34,9,.4,12.51l.33-.17a9.69,9.69,0,0,0,1.36-.94,4,4,0,0,0,.6-.56l.12-.13.05-.12a1.28,1.28,0,0,0,.13-.36A12.37,12.37,0,0,0,145.15,48.28Z"/>
+                <path class="cls-332" d="M132.23,40.42l.16-.08a1,1,0,0,0-.18.17A.29.29,0,0,1,132.23,40.42Z"/>
+                <path class="cls-329"
+                      d="M132.35,56.71a5.4,5.4,0,0,1-1.44-.11.71.71,0,0,0-.52.1c0-.7,0-1.38.07-2,0-.2,0-.4,0-.58A4.14,4.14,0,0,0,132.35,56.71Z"/>
+                <path class="cls-329"
+                      d="M131.91,106.93a4.21,4.21,0,0,0-.68-1.13,1.22,1.22,0,0,0-.63-.42s-.06-.1-.06-.22h0a8,8,0,0,1,0,.85c0,.36,0,.76,0,1.19A3.3,3.3,0,0,0,131.91,106.93Z"/>
+                <path class="cls-341"
+                      d="M130.45,107.2c0,.19,0,.38,0,.59s-.09.7-.15,1.09a1.53,1.53,0,0,0,.61-.16,3.67,3.67,0,0,0,.73-.53c.26-.22.5-.46.47-.74a2.55,2.55,0,0,0-.15-.52A3.3,3.3,0,0,1,130.45,107.2Z"/>
+                <path class="cls-343"
+                      d="M125.44,78.79a1.13,1.13,0,0,1,.24-.08,2.43,2.43,0,0,1,1,0,.72.72,0,0,1,.51.37.75.75,0,0,1-.14.68,3.09,3.09,0,0,1-.23.31l-.23.23a3.28,3.28,0,0,1-.49.4,4.87,4.87,0,0,1-.59.36.27.27,0,0,0,.13.07,2.88,2.88,0,0,0,1.35,0,6,6,0,0,0,1.39-.39c.18-.07.3-.16.31-.23a.49.49,0,0,0-.05-.16s.12,0,.17.13a.28.28,0,0,1-.09.26,1,1,0,0,0,.77-.22c.23-.14.48-.37.7-.49s.16-.11.26-.09v0a0,0,0,0,1,0-.05,1.61,1.61,0,0,1,.1-.36.36.36,0,0,0,0-.2c0-.09-.09,0-.06-.4,0-.09,0-.06,0-.07h-.08l-.15,0a1.18,1.18,0,0,0-.25.1c-.14,0-.23.06-.24,0s.05-.08.17-.18a1,1,0,0,1,.68-.25c.16.16,0,.36,0,.54s.1,0,.14,0a.62.62,0,0,0,.14-.14c-.26-.46,0-1.92-.81-1.64a2.24,2.24,0,0,1-.93,0C128,77.15,125.79,76.71,125.44,78.79Z"/>
+                <path class="cls-334"
+                      d="M131.69,76.29a2.22,2.22,0,0,0-.58-.48,1.52,1.52,0,0,0-.66-.22,5.82,5.82,0,0,0-1.56,0l-.1,0-.2.07-.37.13-.41.13a2.48,2.48,0,0,1-1-.07s0,0-.11,0a4.37,4.37,0,0,0-.48.08,8.48,8.48,0,0,0-1,.35,4.54,4.54,0,0,0-1.67,1.05,2.62,2.62,0,0,0-.71,1.68,2.45,2.45,0,0,0,.18,1,.84.84,0,0,0,.63.56,3.06,3.06,0,0,0,2.11-.52,4.5,4.5,0,0,0,.45-.31l.2-.17s.08-.07.11-.11.14-.17.11-.27-.12-.14-.2-.17a2.25,2.25,0,0,0-.72-.06,1,1,0,0,0-.31.06,2.48,2.48,0,0,0,0,.29,2.48,2.48,0,0,1,0-.29.43.43,0,0,0-.21.12,1.22,1.22,0,0,0-.22.34c-.06.09-.12.11-.13.1s0-.06,0-.14a1.09,1.09,0,0,1,.14-.45.79.79,0,0,1,.43-.29c.4-2.36,3-.68,4.37-1.49,1.23-.19.72,1,1.07,1.62h0a.59.59,0,0,0,.12-.37v-.06a.68.68,0,0,1,0-.15.7.7,0,0,1,.08-.16,1.74,1.74,0,0,1,.13-.2,2.13,2.13,0,0,1,.33-.34l.31-.26C132.14,77.14,132,76.69,131.69,76.29Z"/>
+                <path class="cls-341"
+                      d="M130.66,96a3.69,3.69,0,0,1,0,.69c-.09.56-.33,1.46-.44,2.29-.06.38-.1.74-.14,1.09-.28-1.53-.71-3.37-1.18-5.21l-.28-1.06.19.08A3.22,3.22,0,0,1,130.44,95a1.53,1.53,0,0,1,.2.78A1.46,1.46,0,0,1,130.66,96Z"/>
+                <path class="cls-341"
+                      d="M122.18,94.46H122a6.4,6.4,0,0,1-2-.55,6,6,0,0,1-1-.64,3.75,3.75,0,0,1-.92-1.06,2.77,2.77,0,0,1-.27-.61s-.07-.13,0-.15l.15,0,.29-.07a7.55,7.55,0,0,1,1.27-.24l1.07-.19c.32,0,.64-.1.91-.16a3.86,3.86,0,0,0,2.22-1.23A2.44,2.44,0,0,0,124,89a2.34,2.34,0,0,0,.34-.91s0-.06,0-.08h0s0,0,0,0h0a.52.52,0,0,0-.14-.34c-.1-.29-.19-.49-.23-.58a9.33,9.33,0,0,1-1.17.4,4.67,4.67,0,0,1-2.09.06,2.9,2.9,0,0,1-.83-.28,5,5,0,0,1-.79-.49,1.6,1.6,0,0,1-.34-.26,0,0,0,0,0,0,0,15.65,15.65,0,0,1-3.47,0,28.94,28.94,0,0,1-6.09-1.68c-.2.12-.48.3-.8.53s-.89.63-1.39,1C111.27,90.87,116.64,94.55,122.18,94.46Z"/>
+                <path class="cls-329"
+                      d="M120.19,116.83c.39-.65.78-1.36,1.14-2.12a1.71,1.71,0,0,1-.58-.49,1,1,0,0,1-.31-.6c0-.21.17-.23.16-.21s.1,0,.23,0a2.11,2.11,0,0,0,.56-.25c.23-.12.51-.27.81-.4,1.41-3.56,2.21-7.76,1-11.35a8.51,8.51,0,0,1-1.91-.75,11.13,11.13,0,0,1-1-.57l-.52-.33c-.25-.19-.52-.36-.76-.56A17.23,17.23,0,0,1,117.66,98l-.62-.58-.09-.07,0,0-.05-.07-.21-.24c.84.22,1.68.5,2.3.63a15.34,15.34,0,0,0,1.69.3l.51,0a11,11,0,0,0-1-.94,11,11,0,0,1,1,.94c.46,0,.92.1,1.36.12a6.61,6.61,0,0,0,3.07-.43,4.59,4.59,0,0,0,1.73-1.2l.15-.18-.34-.92c-.18-.5-.38-1-.56-1.49h0c-.37.09-.86.2-1.51.33a11.84,11.84,0,0,1-2.88.22c-5.54.09-10.91-3.59-15.18-8.15-.29.22-.57.45-.86.69a28.84,28.84,0,0,1-3.2,2.63s0,0,0,0l-3,.45.32.12s.28.16.29.2.22.06.27.1.21.06,0,.09l-.85.17L98.33,91c-.51.08-1,.16-1.44.25l-1.1.15a12.62,12.62,0,0,1-3.55.14,8.44,8.44,0,0,1-1.44-.35,28.67,28.67,0,0,0-.74,2.94c-.1.5-.18,1-.24,1.52a6,6,0,0,0,1.2.94,9.34,9.34,0,0,0,3.29,1.15,14.44,14.44,0,0,0,2.5.18l1.45,0c.6,0,1.35-.09,2.06-.17a12.07,12.07,0,0,0,1.69-.11l0,0c-.43.44-1,1-1,1-.55.47-.84.85-1.4,1.29l-1.32,1.06c-.8.62-1.54,1.16-2.27,1.62a19,19,0,0,1-3.75,1.7c-1,.34-1.69.55-2.15.68l-.23.08c.18,1.29.41,2.6.68,3.92a43.42,43.42,0,0,0,1.35,5,.41.41,0,0,0,.11.07,2.15,2.15,0,0,0,.73.32,1.13,1.13,0,0,1,.33.2.91.91,0,0,1,.3.74A.67.67,0,0,1,93,116a.59.59,0,0,1-.25,0,11,11,0,0,0,.49,1.11l.32.64a12.1,12.1,0,0,0,1.95,2.87c.09.08.16.16.24.24.33-.22.39-.39.39-.44l-.11-.34.37,0c.5,0,1.31,0,1.48,0a.32.32,0,0,1,.34.21,2.8,2.8,0,0,1-.47,2.3h0c.35.29.72.57,1.08.84a20.59,20.59,0,0,0,4.51,2.61,2.8,2.8,0,0,0,.28.06C110.83,127.22,116,122,120.19,116.83Zm-7.63-3.61a1.37,1.37,0,0,1,.91-.82,5.22,5.22,0,0,1,1.21-.05c.31,0,.54,0,.56,0a1,1,0,0,1,.26.08.3.3,0,0,1,.11.41c-.07.12-.1.1-.15.15l-.11,0a.33.33,0,0,0-.13.07,2.82,2.82,0,0,1-1.1.51,4,4,0,0,1-1.67.11S112.43,113.53,112.56,113.22Zm-2,4.94a1.84,1.84,0,0,1,1.4-.55l.64.06a5,5,0,0,1,.93.24c.18.08.41.27.39.5a.66.66,0,0,1-.17.33,1.54,1.54,0,0,1-.16.18,4.72,4.72,0,0,1-.75.56,2.3,2.3,0,0,1-1.37.09c0-.06.61-.14,1.21-.39a6.23,6.23,0,0,0,.6-.57.83.83,0,0,0,.11-.15v0s0,0-.07,0a5.46,5.46,0,0,0-.81-.13l-.62-.11a1.38,1.38,0,0,0-1.06.31A3.82,3.82,0,0,0,110,120,2.14,2.14,0,0,1,110.61,118.16ZM106,123a1,1,0,0,0,.32.05,2.34,2.34,0,0,0,.82-.14s.08,0,.09,0,.09,0,0-.09a1.55,1.55,0,0,0-.49-.21c-.15,0-.26,0-.28,0s.45-.33,1-.08c.16.07.35.19.39.35a.43.43,0,0,1-.13.43,1.28,1.28,0,0,1-.45.21,1.64,1.64,0,0,1-.33.05,1.87,1.87,0,0,1-.72-.07l-.17,0s0,0,0-.09,0-.08,0-.1,0,0,.08,0a.8.8,0,0,0-.09-.14C106,123,105.85,123,106,123Zm-2.54-11.15a1.19,1.19,0,0,1-.31.26,5.59,5.59,0,0,0-.48.38,1.63,1.63,0,0,1-.75.34,1.56,1.56,0,0,1-.77-.19c-.2-.09-.38-.19-.56-.26s-.53-.28-.51-.32a1.55,1.55,0,0,1,.59.1l.59.17a1.26,1.26,0,0,0,.61.09c.33-.07.64-.51,1-.74.12-.08,0,0,.06-.06h0l-.34-.08a5.8,5.8,0,0,0-1.27,0,8.19,8.19,0,0,1-1.33,0,1.56,1.56,0,0,0-.31,0c0,.07.06.11,0,.12s-.07,0-.16-.1,0-.14,0-.15a.27.27,0,0,1,.11,0l.26,0c.37,0,.84-.07,1.29-.16a5.26,5.26,0,0,1,1.39-.1,2.08,2.08,0,0,1,.54.11.81.81,0,0,1,.29.17.44.44,0,0,1,0,.57Z"/>
+                <path class="cls-341"
+                      d="M129.31,101.35a9.65,9.65,0,0,1-4,.36,9.21,9.21,0,0,1-2.1-.33c1.24,3.59.44,7.79-1,11.35a5.09,5.09,0,0,1,1-.34,2.72,2.72,0,0,1,.55-.06l.6,0a2.91,2.91,0,0,1,1.31.1.32.32,0,0,1,0,.52,3.09,3.09,0,0,1-.37.17l-.53.17-.31.1-.2.07a8,8,0,0,0-1.62,1,1.48,1.48,0,0,1-1.07.38.58.58,0,0,1-.22-.08c-.36.76-.75,1.47-1.14,2.12-4.16,5.2-9.36,10.39-16.63,9.35a2.8,2.8,0,0,1-.28-.06,14.4,14.4,0,0,0,3.25.95,26.1,26.1,0,0,0,4.26.21,30.06,30.06,0,0,0,4.18-.38c2.68-.48,5.25-1.42,6.74-3.39a48.38,48.38,0,0,0,4.27-5.83,27.07,27.07,0,0,0,4-10c.41-2.57.23-4.09.35-4.09C130.12,103.65,129.82,102.73,129.31,101.35Zm-5.85,19.15a2.23,2.23,0,0,1-.26.48.46.46,0,0,1-.38.23c-.12,0-.16-.06-.16-.08s.23,0,.31-.3a3.1,3.1,0,0,0,.13-.45,2,2,0,0,0,.06-.39s0,0,0,0a.69.69,0,0,1-.13.05s-.14.06-.34.12a7.69,7.69,0,0,0-.74.3,5.65,5.65,0,0,1-1.09.45c0-.07.39-.48.89-.81a5.63,5.63,0,0,1,1.1-.61,2,2,0,0,1,.35-.08c.26-.08.64.07.54.45A3.36,3.36,0,0,1,123.46,120.5Zm2.44-12.84a1.8,1.8,0,0,1-1,.52.6.6,0,0,1-.46-.2.43.43,0,0,1-.09-.4c0-.22.15-.3.18-.29s0,.14,0,.3.14.21.3.19a1.24,1.24,0,0,0,.42-.31l.2-.21c0-.07,0,0,.1-.07s0,0-.08-.07l-.44-.18c-.27-.12-.43-.16-.46-.19s.25-.14.54-.1a2.57,2.57,0,0,1,.47.08,8.34,8.34,0,0,1,.81.22A5.93,5.93,0,0,1,125.9,107.66Z"/>
+                <path class="cls-342"
+                      d="M130.57,3.9c-.23.21-.48.45-.74.71a8.4,8.4,0,0,0-1.29,1.72,22.47,22.47,0,0,0-1.1,2.25c-.23.6-.5,1.33-.76,2.09-.08.22-.14.43-.15.46s0,.13,0,.07v-.15l0-.28c0-.19,0-.37-.07-.56l-.09-1a4.62,4.62,0,0,0-.19-.88,10.71,10.71,0,0,0-.36-1.09,22.07,22.07,0,0,0-1.49-3.12c.54-.1,1.08-.2,1.64-.28a16.14,16.14,0,0,1,2.62-.2,5.07,5.07,0,0,1,.56,0l.71.11Z"/>
+                <path class="cls-328"
+                      d="M129.21,101.07a2.15,2.15,0,0,0,.1.27,7.27,7.27,0,0,0-1.12,0,18.64,18.64,0,0,1-2.88-.14,9.26,9.26,0,0,1-3.73-1.21c-.3-.19-.61-.37-.92-.58l-.42-.3-.15-.12a2.49,2.49,0,0,1-.23-.22l-.09-.09s.11,0,.15,0l.28.07a1.5,1.5,0,0,0,.33.08c.66.1,1.31.17,1.93.22a7.75,7.75,0,0,0,3.55-.4,5.61,5.61,0,0,0,1.91-1.2C128.4,98.83,128.85,100.06,129.21,101.07Z"/>
+                <path class="cls-341"
+                      d="M126.84,145.55a1.49,1.49,0,0,1,.72.29,2.15,2.15,0,0,0-.41-1c-.31.2-.62.48-.93.7A1.79,1.79,0,0,1,126.84,145.55Z"/>
+                <path class="cls-329"
+                      d="M125.7,144.16a12.61,12.61,0,0,0-1.53.68,15.27,15.27,0,0,1-2.91,1.1,9.8,9.8,0,0,1-2.39.05c-.65,0-1.15,0-1.5,0h-.21l-.57.11h0l-.12,0h0c.11.52.21,1,.32,1.55l.15.09a29,29,0,0,0,9.07,1,2,2,0,0,0,.28-.3l.16-.21a1.4,1.4,0,0,0-.45-.61,2.56,2.56,0,0,0-.86-.28c-.26-.06-.44-.12-.44-.17s0,0,.11,0a1.08,1.08,0,0,1-.45-.26,1.08,1.08,0,0,0,.45.26l.35,0c.15,0,.36,0,.58,0a6,6,0,0,1,1.51-.17l.13-.21.15-.27a1.34,1.34,0,0,0-.76-.63,3.86,3.86,0,0,0-.89,0,.88.88,0,0,0-.29,0c-.08,0-.12,0-.13,0h0a.24.24,0,0,1,.09-.08.5.5,0,0,1,.29-.17l.39-.09c.31-.22.62-.5.93-.7-.06-.08-.1-.17-.16-.24A1.32,1.32,0,0,0,125.7,144.16Z"/>
+                <path class="cls-341"
+                      d="M125.73,147.23a1.36,1.36,0,0,1,.48.14,1.75,1.75,0,0,1,.55.49.71.71,0,0,1,.08-.15l.4-.65A6,6,0,0,0,125.73,147.23Z"/>
+                <path class="cls-341"
+                      d="M116.93,147.84l2.5,1.38,4.31.05a4.23,4.23,0,0,0,1.91-.2,1.63,1.63,0,0,0,.35-.23A32.79,32.79,0,0,1,116.93,147.84Z"/>
+                <path class="cls-331" d="M126.58,148.65h-.08Z"/>
+                <path class="cls-328"
+                      d="M118.77,92.27a2.72,2.72,0,0,0,.65.66,4.47,4.47,0,0,0,.9.46,4.4,4.4,0,0,0,1.82.3,6.74,6.74,0,0,0,2.61-.72,7.17,7.17,0,0,0,1.2-.72c-.3-.81-.58-1.57-.84-2.24-.15.13-.31.27-.48.4a5.79,5.79,0,0,1-3,1.06c-.58.07-1.21.12-1.92.18l-.84.08-.22,0c-.07,0-.2,0-.12.09A1.42,1.42,0,0,0,118.77,92.27Z"/>
+                <path class="cls-331" d="M124.81,84.11h0a.08.08,0,0,1,0,0v0Z"/>
+                <path class="cls-329"
+                      d="M124.8,85.46v.16c0,.17-.24.39-.24.39s-.35.23-.45.32a2.94,2.94,0,0,1-1.41.64,2.43,2.43,0,0,1-1.76-.16,1.37,1.37,0,0,1-.47-.37.51.51,0,0,1-.08-.26v0a11.56,11.56,0,0,0,1.23-.44,15.09,15.09,0,0,0,2.39-.89.73.73,0,0,0,.19.24l.09.05.1,0,.08,0A2.42,2.42,0,0,1,124.8,85.46Z"/>
+                <path class="cls-329"
+                      d="M124.22,112.79l.06,0a.07.07,0,0,1-.06,0h0l-.17.07a7.91,7.91,0,0,0-1.64,1.15c-.27.2-.55.42-.79.39a1.26,1.26,0,0,1-.67-.4,1.18,1.18,0,0,1-.36-.46c0-.13,0-.18,0-.2s.08.09.24.08a2.12,2.12,0,0,0,.65-.15,8.31,8.31,0,0,1,1.8-.54,4.1,4.1,0,0,1,.5,0Z"/>
+                <path class="cls-342"
+                      d="M123.45,56a56.55,56.55,0,0,0-.69-6.34,20.06,20.06,0,0,0-2.07-6.14,14.11,14.11,0,0,0-4.32-4.67l-.06,0a15.59,15.59,0,0,0-3.48-1.93c1.14.76,1.81,1.68,1.12,3a4.55,4.55,0,0,1-2.94,1,14.92,14.92,0,0,1,2.25.81,18.31,18.31,0,0,1,2.88,1.56,9.35,9.35,0,0,1,2.06,2.3,18.42,18.42,0,0,1,2,4.48,30.6,30.6,0,0,1,1.06,4.48c.17,1,0,3.18-.32,3.47a3.46,3.46,0,0,1-1,1c-1.55,6.47-8.69,10.65-15.5,11,1.59.7,3.1,1.34,4.52,1.87a27,27,0,0,0,3.87,1.2,13.09,13.09,0,0,0,3.09.27,10.24,10.24,0,0,0,2-.19c.45-.08.67-.2.69-.18a4.49,4.49,0,0,1,.51-.74c.33-.49.81-1.21,1.35-2.15a23.79,23.79,0,0,0,2.93-8.25A25,25,0,0,0,123.45,56Z"/>
+                <path class="cls-330"
+                      d="M120,58.93l-.49.32a13.18,13.18,0,0,1-5,1.81,22.52,22.52,0,0,1-7.88-.31,38.42,38.42,0,0,1-4.52-1,17.52,17.52,0,0,1-4.64-2h0l-1.53-1c-.26-.18-.51-.39-.76-.58l-.37-.28c-.21-.15-.41-.31-.6-.47,0-.25,0-.51,0-.76s.06-.35.1-.52c.06-.33.14-.65.23-1a15.75,15.75,0,0,1,.67-1.85,22.75,22.75,0,0,1,7.55-8.73,11.69,11.69,0,0,1,3.45-1.7,8.81,8.81,0,0,1,3.78-.19c.36.07.72.15,1.07.25a4.55,4.55,0,0,0,2.94-1c.69-1.37,0-2.29-1.12-3a13.4,13.4,0,0,0-5.19-1.05,48.69,48.69,0,0,0-8.2,1.05,30.13,30.13,0,0,0-3.59,1C87.51,42.33,85.47,55,92.12,60.68a62.77,62.77,0,0,0,12.32,9.2h0C111.26,69.58,118.4,65.4,120,58.93Z"/>
+                <path class="cls-342"
+                      d="M95.85,37.82c-.71.24-1.35.49-1.87.71a21.68,21.68,0,0,0-2,1c-.09.09-1,.59-2.43,1.68a42.9,42.9,0,0,0-5.37,5A44.24,44.24,0,0,0,81.05,50l-.76,1.08-.19.26,0,0s-.08,0,0,.09l.06.08.4.48.93,1.06a85,85,0,0,0,8.34,8.31,45.45,45.45,0,0,0,4.73,3.57l1.22.77,1.26.68c.84.43,1.73.84,2.58,1.24,1.69.81,3.32,1.57,4.88,2.26a62.77,62.77,0,0,1-12.32-9.2C85.47,55,87.51,42.33,95.85,37.82Z"/>
+                <path class="cls-341"
+                      d="M120.62,127.6l.13-.28s.28-.49.66-1.16c.24-.45.55-1,.85-1.55a8.89,8.89,0,0,1-3,2.24,16.11,16.11,0,0,1-4.1,1.32c-.39.08-.78.15-1.18.2,0,.27,0,.64.08,1.08.08,1.1.19,2.65.34,4.56.07.94.17,2,.25,3.07q.08.72.15,1.5c.08.24.1.37.14.52l.09.44c.08.3.14.59.2.89,0,.11,0,.23.07.34C115.59,135.42,115.62,129.3,120.62,127.6Z"/>
+                <path class="cls-329"
+                      d="M115.35,140.77c.35,1.74.73,3.62,1.11,5.42l.12,0h0v0a.28.28,0,0,0,0-.09c0-.27,0-.67,0-1.23,0-1.07,0-2.71.14-5a43.28,43.28,0,0,1,.59-5,3.52,3.52,0,0,0,0-.49c-.32.27-.55.41-.59.29s1-1.84,2.07-3.57a27.68,27.68,0,0,0,1.31-2.45l.44-.94C115.62,129.3,115.59,135.42,115.35,140.77Z"/>
+                <path class="cls-332"
+                      d="M120.94,56.62S121,58,121,58s-.57.46-1.64,1a11.88,11.88,0,0,1-1.11.51c1.29-1.4,1.65-3.56,1.86-6.06A26.17,26.17,0,0,1,120.94,56.62Z"/>
+                <path class="cls-333"
+                      d="M120.08,53.47c-.21,2.5-.57,4.66-1.86,6.06a11.07,11.07,0,0,1-1.35.48l.25-.2a17.5,17.5,0,0,1-4.45.62h-1.53c-2.17-1.46-3.58-4.68-3.38-8.36.25-4.64,2.86-8.24,6-8.43a10.86,10.86,0,0,1,1.39.83,7.81,7.81,0,0,1,1.52,1.73,1.11,1.11,0,0,1,.2.26l.44.81a2.43,2.43,0,0,0,.15.26A39.34,39.34,0,0,1,120.08,53.47Z"/>
+                <path class="cls-329"
+                      d="M119,85.77h-.1a17.63,17.63,0,0,1-3.43-.24,26.21,26.21,0,0,1-5-1.59l2.3-1.52A25,25,0,0,0,115,84.59a6.46,6.46,0,0,0,1.76.86,8,8,0,0,0,1.9.31Z"/>
+                <path class="cls-329"
+                      d="M116,73.7l2.85,1.13a.54.54,0,0,0-.4.2,1.56,1.56,0,0,0-.32.6s.12.1.27.13l-.29.27,0,0s0,0,0,0l-.81,1.4a27,27,0,0,0-4.05.66l-.15-1.34h0A7.63,7.63,0,0,0,110.9,76c-.34-.09-.71-.19-1.11-.28l.69-2.53a17.37,17.37,0,0,0,2.23.49A12.85,12.85,0,0,0,116,73.7Z"/>
+                <path class="cls-329"
+                      d="M100.6,177.16a16.24,16.24,0,0,1-3,4.85c-.49.59-.9,1.07-1.15,1.42l0,.06c2.78.5,5.65.87,8.51,1.31l1.6.25.34,0h.52L108,185c1.07-.06,2.15-.14,3.22-.23l2.49-.25.26-.49c.26-.46.61-1.1,1-1.87s.91-1.66,1.36-2.62a10.73,10.73,0,0,0,.59-1.51,11.11,11.11,0,0,0,.31-1.64,6.51,6.51,0,0,0-.23-3.19,6.07,6.07,0,0,0-.73-1.3,51.29,51.29,0,0,1-15.17,2.3A12.69,12.69,0,0,1,100.6,177.16Z"/>
+                <path class="cls-341"
+                      d="M114.06,169.88c-.57.13-1.13.25-1.69.34a33.41,33.41,0,0,1-10.82.2l-1.8-.3a3.12,3.12,0,0,1,1,1.41,6.58,6.58,0,0,1,.36,2.7,51.29,51.29,0,0,0,15.17-2.3,11.66,11.66,0,0,0-.87-1A4.82,4.82,0,0,0,114.06,169.88Z"/>
+                <path class="cls-333"
+                      d="M117.12,59.81l-.25.2a5.08,5.08,0,0,1-.59.17h0a27.52,27.52,0,0,1-3.58.25A17.5,17.5,0,0,0,117.12,59.81Z"/>
+                <path class="cls-333" d="M116.87,60a.43.43,0,0,1-.1.09l-.49.08A5.08,5.08,0,0,0,116.87,60Z"/>
+                <path class="cls-331" d="M116.08,13.43v0l-.52,0s0,0,0,0Z"/>
+                <path class="cls-329"
+                      d="M115.33,112.71s0,0,0,.07a.51.51,0,0,0-.07.18h-.07s-.2,0-.5-.07l.25-.21a1,1,0,0,1,.23-.13c.06,0,0-.07.08,0A.36.36,0,0,0,115.33,112.71Z"/>
+                <path class="cls-333"
+                      d="M116.25,60.18a12.3,12.3,0,0,1-1.49.29h-.1a.52.52,0,0,0-.43.08h-.09l-.9.06c-.32,0-.64,0-1,0s-.57,0-.85,0l-.28-.18h1.53A27.52,27.52,0,0,0,116.25,60.18Z"/>
+                <path class="cls-342" d="M115,5c.17,1.29.34,3.21.47,5.91a23.88,23.88,0,0,0-2.57-6Z"/>
+                <path class="cls-333" d="M114.76,60.47l-.25,0h-.28a.52.52,0,0,1,.43-.08Z"/>
+                <path class="cls-329"
+                      d="M114.64,112.88a2,2,0,0,1-.64.35c-.62.22-1.31.38-1.5.47.13-.16.44-.83,1.07-.89A6.34,6.34,0,0,1,114.64,112.88Z"/>
+                <path class="cls-329"
+                      d="M113.06,76.82l.15,1.34c-.43.08-.87.18-1.31.29-.62.15-1.26.32-1.85.49-.84-.71-1.44-1.15-1.53-1a12.33,12.33,0,0,0,1,1.17l-1.41.45c-1,.34-1.73.63-1.77.65a15.63,15.63,0,0,0-1.68.9c-.23.14-.47.32-.73.49-2.14-.7-4.38-1.35-6.6-2-.41-.12-.87-.24-1.2-.36L95,78.74l-2.35-1.06-.27-.13c1.23-.33,2.42-.62,3.38-.82,1.38-.31,2.34-.4,2.4-.42s1-.18,2.41-.34a36.41,36.41,0,0,1,5.14-.12,39,39,0,0,1,5.08.56C112,76.62,112.85,76.82,113.06,76.82Z"/>
+                <path class="cls-329"
+                      d="M104.57,43a19.26,19.26,0,0,0-3.94,2.91,18.93,18.93,0,0,0-4.41,5.84,13.37,13.37,0,0,0-.65,1.69c-.08.29-.17.57-.23.86l-.08.42,0,.17.48.39c.25.19.48.39.73.56L98,56.88l0,0a14.24,14.24,0,0,0,3.52,1.66C99,54,100,47.6,104.57,43Z"/>
+                <path class="cls-332"
+                      d="M107.76,52.08c.25-4.64,2.86-8.24,6-8.43l-1.16-.58a8.77,8.77,0,0,0-6.12-.89,10.62,10.62,0,0,0-2,.8c-4.53,4.62-5.56,11-3,15.6l.78.27A38.19,38.19,0,0,0,106.68,60a27.46,27.46,0,0,0,4.74.64l-.28-.18C109,59,107.56,55.76,107.76,52.08Z"/>
+                <path class="cls-331" d="M112.47,113.73s0,0,0,0S112.48,113.73,112.47,113.73Z"/>
+                <path class="cls-341"
+                      d="M100.51,154.21a2.45,2.45,0,0,0,.12.31,3.65,3.65,0,0,0,.26.44h0l0-.06.16-.13.32-.28,2.48-2.11c.71-.61,1.39-1.18,2-1.67l.7-2.23A18.08,18.08,0,0,1,100.51,154.21Z"/>
+                <path class="cls-341"
+                      d="M100.81,153.13c-.33.39-.33.64-.32.66a.82.82,0,0,0,0,.22.88.88,0,0,0,0,.2,17.54,17.54,0,0,0,3.88-3.06,10.17,10.17,0,0,1-3.31,1.61C101,152.87,100.9,153,100.81,153.13Z"/>
+                <path class="cls-341"
+                      d="M98.24,153a3.33,3.33,0,0,0-.28.54l-.11.23a1.46,1.46,0,0,0-.14.51.88.88,0,0,0,0,.28l.32,0,.8.13,1.64.22a2.13,2.13,0,0,1-.21-.22,1.48,1.48,0,0,1-.38-1c-.08-.13.21-.51.54-.83A7.75,7.75,0,0,1,98.24,153Z"/>
+                <path class="cls-341"
+                      d="M96.75,153.18a2,2,0,0,0,0,.23v.14c.17.22.35.45.52.69a1.81,1.81,0,0,1,.15-.94,1.3,1.3,0,0,1,.18-.27l.06-.08a5.51,5.51,0,0,1-.89-.22C96.77,152.88,96.76,153,96.75,153.18Z"/>
+                <path class="cls-329"
+                      d="M109.79,133.46c0-1.63-1.92-3.26-3.25-4.9l-.24,0a16.43,16.43,0,0,1-3.89-1.09c.49.9,1.1,2.19,1.65,3.5s1,2.53,1.36,3.53a14,14,0,0,1,.51,1.79,42,42,0,0,1,.24,5.61c0,2.67-.17,5.29-.45,5.34h0a21.48,21.48,0,0,1-3.11,2.05c-.06,0-3.43,1.39-3.58,1.11a1.71,1.71,0,0,0-1.24.32,2,2,0,0,0-.8,1.13,5.21,5.21,0,0,0-.18.86v0a5.51,5.51,0,0,0,.89.22,3.68,3.68,0,0,1,.39-.41c.38-.31.86-.43.88-.35s-.34.31-.58.65a1.92,1.92,0,0,0-.13.17,7.75,7.75,0,0,0,2.2-.11c.37-.34.8-.62.88-.43a1.94,1.94,0,0,0-.24.29,10.17,10.17,0,0,0,3.31-1.61,18.06,18.06,0,0,0,2.19-2.68l.21-.67a1.11,1.11,0,0,0,.08-.24l0-.05s0-.07,0-.1l0-.13v-.05c0-.11.1-.24.15-.38.21-.56.51-1.34.85-2.27s.78-2,1.23-3.13c.17-.43.35-.87.52-1.32A24,24,0,0,0,109.79,133.46Z"/>
+                <path class="cls-341"
+                      d="M110.83,128.67a25.85,25.85,0,0,1-4.29-.11c1.33,1.64,3.25,3.27,3.25,4.9a24,24,0,0,1-.08,6.67c.06-.14.12-.28.17-.43l.38-.9.07-.16,0,0v0l0-.11.09-.47c.37-2.56.74-5.1,1-7,.15-1,.27-1.83.36-2.38Z"/>
+                <path class="cls-329"
+                      d="M110.28,79.87c.54.58,1.17,1.25,1.82,1.91-.75.41-1.47.79-2,1.12l-.94.53-2-.78c-.62-.23-1.25-.45-1.89-.67.89-.46,1.56-.72,1.6-.74s.67-.32,1.66-.7C109,80.33,109.62,80.1,110.28,79.87Z"/>
+                <path class="cls-331" d="M108.7,147.49l0,.14h0l0,.05Z"/>
+                <path class="cls-344"
+                      d="M107.89,84.29l-1.19-.41c-.77-.25-1.58-.49-2.39-.72.65.83,1.34,1.66,2.06,2.46.48-.46.95-.88,1.36-1.22Z"/>
+                <path class="cls-329"
+                      d="M103.7,83,102,84.1A34.53,34.53,0,0,1,97.22,87l-.59.34a6.64,6.64,0,0,0,.75,1c.14.13.28.29.43.41a5.31,5.31,0,0,0,.67.5,7.27,7.27,0,0,0,1.42.76l3-.45a16.41,16.41,0,0,1,2.65-3.21c.26-.27.52-.53.79-.78-.72-.8-1.41-1.63-2.06-2.46Z"/>
+                <path class="cls-331" d="M106.15,123.24s.15.2,0,0Z"/>
+                <path class="cls-342"
+                      d="M104.8,12c0,.15.2.51,0,.23a12.11,12.11,0,0,0-1-1l-.27-.21-.62-.5-.81-.62-1.56-1.15A25.86,25.86,0,0,0,97.64,7,32.83,32.83,0,0,0,94,5.32a27.82,27.82,0,0,1,5.54-.88c.73,0,1.43-.07,2.12-.08a22.39,22.39,0,0,1,1.09,2.27c.55,1.25,1.3,3.24,1.71,4.38,0,.07.11.27.2.55S104.74,11.87,104.8,12Z"/>
+                <path class="cls-329"
+                      d="M95.6,80.83h0c-.13.25-.34.69-.66,1.32.1.36.19.8.32,1.33a19.25,19.25,0,0,0,1,3.09,7.57,7.57,0,0,0,.41.8l.59-.34a33.12,33.12,0,0,1,4.31-3.6l1-.79c-1.83-.5-3.71-1-5.61-1.46C96.48,81.08,96.09,81,95.6,80.83Z"/>
+                <path class="cls-328"
+                      d="M101.07,98l.05.07-1,.8a31.49,31.49,0,0,1-4.38,3A12.34,12.34,0,0,1,92.1,103a15.67,15.67,0,0,1-2.19.21h-.18c-.08-.69-.13-1.39-.17-2.07a28.17,28.17,0,0,1,0-3.57c.27.12.57.25.91.37a12.91,12.91,0,0,0,3.8.75,22.81,22.81,0,0,0,2.59,0l1.44-.12c.39,0,.73-.07,1.14-.12l1-.25S100.86,98.1,101.07,98Z"/>
+                <path class="cls-328"
+                      d="M92.17,176.34a17.54,17.54,0,0,1-5.13,3l-1.19.44c.3.18.6.36.91.52a24.29,24.29,0,0,0,5.63,2.32c.91.25,1.85.46,2.79.66a19.52,19.52,0,0,1,1.6-1.95,15.32,15.32,0,0,0,3-4.41,12.83,12.83,0,0,0,.63-2.66A50.67,50.67,0,0,1,94,173.7,6.54,6.54,0,0,1,92.17,176.34Z"/>
+                <path class="cls-338"
+                      d="M100.32,171.67A3.14,3.14,0,0,0,99.26,170c-.58-.14-1.11-.3-1.61-.45l-2.83-.82-.77-.23a6.72,6.72,0,0,1,.41,2.48A7.71,7.71,0,0,1,94,173.7h0a50.67,50.67,0,0,0,6.45.53A6.46,6.46,0,0,0,100.32,171.67Z"/>
+                <path class="cls-329"
+                      d="M95.46,123c-.42-.36-.83-.73-1.23-1.13-.13-.12-.24-.25-.35-.37a5.81,5.81,0,0,1-.55,1c0,.07,0,.14,0,.2a1.14,1.14,0,0,0,.44.79.79.79,0,0,0,0,.24l.5.81c.37.62.8,1.15.71,1.45s-1,.22-1.78-.18a7.08,7.08,0,0,1-1-.61,3.21,3.21,0,0,1-.52-.56s0-.09-.08-.21,0,0,0,0l0,0-1.16,1.09.07,0,0,0a.56.56,0,0,0-.09.13,2.38,2.38,0,0,0-.29.54,1.34,1.34,0,0,0,.23,1.46c.11.12.27.26.45.42s.35.28.52.41c.33.27.66.51.94.71.57.41,1,.62,1,.77s-.57.24-1.32.06a8.21,8.21,0,0,1-1.22-.4l-.67-.3a4.22,4.22,0,0,1-.71-.41,3.12,3.12,0,0,1-1.09-1.33l-.75.71c-.4.38-.83.79-1.28,1.2a1.39,1.39,0,0,0,.06.19,4.52,4.52,0,0,0,.94,1.64c1,1.15,2.49,1.91,2.36,2.23s-1.86.11-3.45-1A6.13,6.13,0,0,1,84.66,131c-.49.47-1,1-1.51,1.53l-.4.44a4.9,4.9,0,0,0,.17.55,4.22,4.22,0,0,0,.78,1.32,6.1,6.1,0,0,0,1.31,1c.4.24.68.29.75.42s-.32.48-.94.46a4.43,4.43,0,0,1-2.13-.61,5.25,5.25,0,0,1-1.55-1.43c-1,1.12-2,2.32-3.07,3.62a4.69,4.69,0,0,0,.6,1.71,4.65,4.65,0,0,0,1.22,1.36,5.54,5.54,0,0,0,1.92.88l.34.08C88.89,136.9,95.75,131,95.46,123Z"/>
+                <path class="cls-341"
+                      d="M97.79,124.85c-.81-.6-1.58-1.21-2.33-1.86.29,8-6.57,13.91-13.31,19.36a13.73,13.73,0,0,0,3.76.39,9.23,9.23,0,0,0,1.41-.16c1.32-1.69,3-3.45,4.55-5.15,1.26-1.36,2.39-2.77,3.45-4.15A43.59,43.59,0,0,0,98,129.47a21.87,21.87,0,0,0,1.49-2.83c.08-.2.15-.39.22-.53C99.05,125.71,98.42,125.29,97.79,124.85Z"/>
+                <path class="cls-328"
+                      d="M99.22,90.23s.26,0,.09.06l-.52.09-1,.14-.9.08-1.08.06a8,8,0,0,1-3.19-.34,4.75,4.75,0,0,1-1.28-.71c.13-.38.29-.75.44-1.1.73-1.57,1.51-3.06,2.07-4.22.06-.11.11-.22.16-.32s0,0,0,0c.4.77.83,1.79,1.53,3A7.64,7.64,0,0,0,97,88.86a6.4,6.4,0,0,0,.49.42c.13.1.25.19.39.28a6.09,6.09,0,0,0,.91.5l.17.07Z"/>
+                <path class="cls-329"
+                      d="M97.71,120.67a2.37,2.37,0,0,1-.36,1.61.21.21,0,0,1-.08,0c-.4-.35-.81-.71-1.18-1.08a1.4,1.4,0,0,0,.48-.58C96.88,120.68,97.41,120.68,97.71,120.67Z"/>
+                <path class="cls-329"
+                      d="M80.42,165.55l-.08,0a10.69,10.69,0,0,1-3,1,11.28,11.28,0,0,1-2.78,0c-.52-.05-1-.11-1.39-.19.38,1.25.72,2.37.86,2.66a8.06,8.06,0,0,1,.28,1l.17.82c.13.56.25,1.1.37,1.65.25,1.11.49,2.22.74,3.35l.1.53,0,.11c0,.06,0,0,.06,0l.15-.18L77,174.93l1-1.31.69,1.49,1.43,3c0-.92,0-1.84,0-2.77.79.69,1.63,1.49,2.38,2.07.36.31.79.61,1.11.85l.61.42a4.65,4.65,0,0,0,.41.26h0l.28-.08c.45-.14,1.07-.32,1.8-.58a17.38,17.38,0,0,0,5-2.58,5.6,5.6,0,0,0,1.7-2.13c-1.09-.17-2.18-.37-3.28-.62A15.38,15.38,0,0,1,80.42,165.55Z"/>
+                <path class="cls-341"
+                      d="M94,168.48c-.35-.11-.64-.19-.86-.27a2,2,0,0,1-.57-.22h0l-.33-.41a3.94,3.94,0,0,1-1.4-.66,13.23,13.23,0,0,1-2.61-2.33A27.38,27.38,0,0,1,86,161.85c-.56-.78-.91-1.33-.93-1.36s-.23-.38-.53-1c-.13.43-.32,1-.56,1.7-.13.36-.26.75-.41,1.18a7,7,0,0,1-1,1.64,5.29,5.29,0,0,1-2.12,1.5A15.38,15.38,0,0,0,90,173c1.1.25,2.19.45,3.28.62A7.62,7.62,0,0,0,94,171,15.13,15.13,0,0,0,94,168.48Z"/>
+                <path class="cls-331" d="M92.67,116a.13.13,0,0,0,0,.08.09.09,0,0,1-.06,0S92.65,116,92.67,116Z"/>
+                <path class="cls-331" d="M89.59,3.88l0,0v0Z"/>
+                <path class="cls-341"
+                      d="M83.44,94.25l0,0-.19.2c-.06.06-.15.14-.12.13s0,0,0,.11a3.3,3.3,0,0,0,.12.37,4.36,4.36,0,0,0,.48.93c.44.69,1.64,1.5,2.54,2.72a5.5,5.5,0,0,1,.94,2,7.79,7.79,0,0,1,.19,1.81c0,.26,0,.5,0,.72s0,.21-.06.32a.58.58,0,0,1,0,.16.93.93,0,0,1,0,.1h0a2.94,2.94,0,0,1,.44.42.81.81,0,0,1,.19.41h0c-.15-1.15-.27-2.28-.34-3.4,0-.42,0-.84,0-1.25l0-.27,0,0-.13-.15L87,99.25c-.17-.24-.35-.47-.52-.69a14.89,14.89,0,0,1-.93-1.36l-.2-.34c-.07-.15-.12-.21-.22-.45A1.62,1.62,0,0,1,85,95.2c.11-.36.53-.57.86-.8l.47-.32,1.73-1.16h0a29.71,29.71,0,0,1,.83-3C87,91.85,86.88,95.54,83.44,94.25Z"/>
+                <path class="cls-329"
+                      d="M87.44,90.75c-.84.67-1.73,1.41-2.52,2.11l-1.07,1-.41.41c3.44,1.29,3.6-2.4,5.49-4.38,0-.13.08-.27.13-.4C88.58,89.83,88,90.27,87.44,90.75Z"/>
+                <path class="cls-329"
+                      d="M86.92,106.43a2.07,2.07,0,0,0,.16-2.32l-.39-.28a1.48,1.48,0,0,0-1-.34,3,3,0,0,0-1,.31c-.32.16-.62.33-.67.47s0,.25.12.37a1.52,1.52,0,0,0,.17.15s0,.17-.09.3-.22.2-.27.16a1.35,1.35,0,0,1-.24-.25.88.88,0,0,1-.21-.36.77.77,0,0,1,0-.61,1.81,1.81,0,0,1,1-.66l.08,0c0-.07.11-.13.18-.21s0-.34-.13-.6-.08-.48-.26-.69-.28,0-.38.13a3.4,3.4,0,0,0-.32.34c-.1.1-.34.3-.47.44a2.58,2.58,0,0,0-.38.52c-.1.22-.2.46-.29.71C83.43,105.67,84.6,107.2,86.92,106.43Z"/>
+                <path class="cls-341"
+                      d="M88.11,106.35a0,0,0,0,1,0,0c-.1-.55-.18-1.1-.26-1.65h0a.66.66,0,0,1,0,.32c0,.18-.12.25-.13.25s.21-.45-.22-.83a4.84,4.84,0,0,0-.39-.31,2.07,2.07,0,0,1-.16,2.32c-2.32.77-3.49-.76-4.36-2.45l-.27.75c-.07.25-.2.56-.24.79a1,1,0,0,0,0,.62,1.9,1.9,0,0,0,1.15.85,7.58,7.58,0,0,0,1.79.35,13.6,13.6,0,0,0,1.92,0c.58,0,1.23-.22,1.26-.44a.07.07,0,0,0,0,0C88.17,106.72,88.13,106.53,88.11,106.35Z"/>
+                <path class="cls-328"
+                      d="M81.68,142.85a6.15,6.15,0,0,1-2.2-.89A5.29,5.29,0,0,1,78,140.43a5.38,5.38,0,0,1-.59-1.29c-.79,1-1.58,2.07-2.32,3.19-.28.43-.55.88-.8,1.34a6,6,0,0,0,.65,1.17,6.1,6.1,0,0,0,3.65,2.4,8.81,8.81,0,0,0,1.22.19A19.63,19.63,0,0,1,82.67,143,8.54,8.54,0,0,1,81.68,142.85Z"/>
+                <path class="cls-338"
+                      d="M83.14,147.19c.7-.13,1.26-.28,1.62-.36a10.64,10.64,0,0,1,.63-1.34,18.5,18.5,0,0,1,1.77-2.69,7.6,7.6,0,0,1-1.23.26,12,12,0,0,1-3.26,0,19.63,19.63,0,0,0-2.85,4.41A12.66,12.66,0,0,0,83.14,147.19Z"/>
+                <path class="cls-328"
+                      d="M76.64,157a7.38,7.38,0,0,1-5-1.31,4.23,4.23,0,0,1-.73-.62c0,.49,0,1,0,1.47a21.58,21.58,0,0,0,.73,5.15h0l.23.61c.14.34.58,1.75,1,3.21.44.1,1,.22,1.74.31a11.17,11.17,0,0,0,2.61.06,10.22,10.22,0,0,0,2.85-.82l0,0a19.22,19.22,0,0,1-2.21-8.2Q77.3,156.92,76.64,157Z"/>
+                <path class="cls-338"
+                      d="M82.5,163.4a4.89,4.89,0,0,0,.69-1.13l.48-1.17.76-1.77-.16-.34a11.33,11.33,0,0,1-.92-3.46.86.86,0,0,1,0-.16,7.08,7.08,0,0,1-1.76.71,25.6,25.6,0,0,1-3.65.75,19.22,19.22,0,0,0,2.21,8.2A6.12,6.12,0,0,0,82.5,163.4Z"/>
+                <path class="cls-329"
+                      d="M79.59,147.94a8.4,8.4,0,0,1-1.1-.12,6.63,6.63,0,0,1-4.16-2.51,5.53,5.53,0,0,1-.5-.77c-.37.71-.7,1.43-1,2.19a48,48,0,0,0-1.56,5.44,9.56,9.56,0,0,0-.27,1.72,5.67,5.67,0,0,0,1.13,1.16,6.91,6.91,0,0,0,4.49,1.34c.44,0,.88-.06,1.32-.1A20,20,0,0,1,79.59,147.94Z"/>
+                <path class="cls-341"
+                      d="M83.06,155.34l.27-.1a9.06,9.06,0,0,1,.66-4.7V150a6.35,6.35,0,0,1,.67-3,11.5,11.5,0,0,1-1.44.5,11.69,11.69,0,0,1-3.64.43,20,20,0,0,0-1.67,8.35,33.94,33.94,0,0,0,3.58-.52A12.24,12.24,0,0,0,83.06,155.34Z"/>
+                <rect class="cls-331" x="83.93" y="129.61" width="0.01" height="0.01"/>
+                <path class="cls-331" d="M82.3,11.7h0c-.34.3-.66.62-1,1A12.93,12.93,0,0,1,82.3,11.7Z"/>
+                <path class="cls-331" d="M73.86,142.73h0c-.07.17-.16.33-.23.5.07-.17.15-.33.22-.51Z"/>
+                <path class="cls-331" d="M73.61,143.28c-.06.16-.11.3-.18.46v0Z"/>
+                <circle class="cls-329" cx="111.44" cy="48.47" r="1.62"/>
+                <circle class="cls-329" cx="112.42" cy="51.01" r="0.33"/>
+                <path class="cls-333" d="M132.21,40.51v0Z"/>
+                <path class="cls-333"
+                      d="M138.56,55.56a10.5,10.5,0,0,0,3-7.37c.17-3.84-2.37-8.07-5.2-9h0a10.76,10.76,0,0,0-3.87,1.08l-.07,0h0a1,1,0,0,0-.18.17v0c-.16.67-.31,1.33-.42,1.95-.07.4-.14.78-.2,1.15a27.38,27.38,0,0,0,1.48,13,25.58,25.58,0,0,0,3.81-.62C137.42,55.91,138,55.75,138.56,55.56Z"/>
+                <path class="cls-333"
+                      d="M131.58,43.63c-.47,2.86-.59,4.8-.62,4.93s-.29,2.28-.47,5.53h0a4.14,4.14,0,0,0,1.86,2.61h.19l.52-.05A27.38,27.38,0,0,1,131.58,43.63Z"/>
+                <path class="cls-329" d="M132.93,45.18a1.45,1.45,0,1,0,1.94.64A1.46,1.46,0,0,0,132.93,45.18Z"/>
+                <circle class="cls-329" cx="132.16" cy="48.93" r="0.34"/>
+                <g id="_Group_2" data-name="&lt;Group&gt;">
+                    <path class="cls-342" d="M152.47,10.83l.2-.13c-.07.07-.14.15-.19.19A.13.13,0,0,0,152.47,10.83Z"/>
+                    <path class="cls-342"
+                          d="M153.69,10.11l-1.24.68a.52.52,0,0,0-.15-.15l-.16-.07a3.63,3.63,0,0,0-.18-.68s.11-.09.27-.17h0l.22,0A1.35,1.35,0,0,1,153.69,10.11Z"/>
+                    <path class="cls-342"
+                          d="M151.56,17.27l-.25-.45h0c.1-.76.43-2.06.74-3.32a8.46,8.46,0,0,0,.14-2.54,3.53,3.53,0,0,0-.05-.38l.16.07a.52.52,0,0,1,.15.15l-.12.07v0h0l.11-.07a.13.13,0,0,1,0,.06c.05,0,.12-.12.19-.19l-.2.13,0,0,1.24-.68a1.35,1.35,0,0,0-1.2-.41l-.22,0c.13-.07.29-.14.48-.22.45-.2.87-.23.89-.13a5.58,5.58,0,0,1,.16,1.51,8.49,8.49,0,0,1-.57,2.95A22.13,22.13,0,0,1,151.56,17.27Z"/>
+                    <path class="cls-342" d="M151.31,16.82l.25.45c-.11.15-.19.21-.23.19S151.26,17.19,151.31,16.82Z"/>
+                    <path class="cls-342"
+                          d="M151.45,36.34c.07-1.36.05-2.73.07-3.28h0a.43.43,0,0,0,.09-.1,22.66,22.66,0,0,1,.25,3.4c0,.9,0,1.8,0,2.48s-.1,1.15-.1,1.18-.05.49-.18,1.17A24.16,24.16,0,0,1,151,43.6c-.26.87-.58,1.7-.82,2.32a5,5,0,0,1-.46,1,26.73,26.73,0,0,1,.76-3c0,.23.07.35.1.35a3.17,3.17,0,0,0,.07-1.09c.17-.77.3-1.51.37-2.11s.12-1.12.13-1.15.06-.48.14-1.15S151.41,37.23,151.45,36.34Z"/>
+                    <path class="cls-342"
+                          d="M151.07,18.15a19.93,19.93,0,0,1-1-3.1c.12-.05.67.72,1.24,1.76h0c-.05.37-.05.61,0,.64s.12,0,.23-.19l.28.56a19.13,19.13,0,0,1,.88,2.14c.21.6.29,1.05.31,1.07a7.85,7.85,0,0,1,.1,1.14,12.5,12.5,0,0,1-.32,2.33,9.46,9.46,0,0,1-1,3.13A17.2,17.2,0,0,1,152,24.4a14.26,14.26,0,0,0,.08-2.17c-.07-.53-.18-.91-.18-1a9.62,9.62,0,0,0-.2-1A21.38,21.38,0,0,0,151.07,18.15Z"/>
+                    <path class="cls-342"
+                          d="M152.14,10.57a3,3,0,0,0-2,.19,5.08,5.08,0,0,0-2,1.32,2.35,2.35,0,0,0-.42.62l-.89-1.28a5.07,5.07,0,0,0,.78-.15,22.43,22.43,0,0,0,2.34-.88,9.57,9.57,0,0,1,2.26-.67c-.16.08-.27.13-.27.17A3.63,3.63,0,0,1,152.14,10.57Z"/>
+                    <path class="cls-342" d="M148.32,58.22l.37-1.36c.46.47.86.9.91.94Z"/>
+                    <path class="cls-342"
+                          d="M150.9,5.27a6.63,6.63,0,0,1,3.37.37,4.44,4.44,0,0,1,2.27,2.49,9.75,9.75,0,0,1,.6,2.4c.18,1.36.21,2.17.21,2.24a31.26,31.26,0,0,1-.16,3.55,40,40,0,0,1-1.38,7.27,39,39,0,0,1-2.64,6.79A15.69,15.69,0,0,1,151.61,33q0-.15-.06-.15a.87.87,0,0,0,0,.25h0c-.08.07-.12.09-.15.08s.33-1.28,1-3.12a53.5,53.5,0,0,0,1.87-6.82,44.08,44.08,0,0,0,.84-7c.07-1.93,0-3.24,0-3.32s0-.88-.08-2.06-.33-2.83-1.5-3.41A5,5,0,0,0,151,7c-.94,0-1.93.14-2.89.25s-1.94.2-2.82.28l-.32,0h-.54l-.8,0,.68,1.17c.27.44.4.71.33.76s-.29-.14-.66-.48-.85-.84-1.5-1.55l.41.1c.33.11.57.15.61.06s0-.26-.32-.57a3.84,3.84,0,0,1-.34-.28l2.28-.43c.87-.18,1.8-.35,2.75-.56A25.33,25.33,0,0,1,150.9,5.27Z"/>
+                    <path class="cls-342"
+                          d="M151.81,76.71c0,.08-.55-.1-1.33-.28s-1.84-.37-2.91-.52-2.16-.27-3-.34-1.38-.1-1.42-.12l-1.41-.16a9,9,0,0,0-2.86.07,24.77,24.77,0,0,0-2.55.6,5.23,5.23,0,0,0,0-.56,16.27,16.27,0,0,1,2.37-.84,10.33,10.33,0,0,1,1.64-.32,12.52,12.52,0,0,1,1.48,0c.84,0,1.41.07,1.44.07s.62.07,1.45.21,1.91.34,3,.6a18.54,18.54,0,0,1,2.9.9C151.39,76.32,151.85,76.64,151.81,76.71Z"/>
+                    <path class="cls-342"
+                          d="M139.85,73.37c-.74.1-1.71.27-2.68.48l-1.06.24c-.06-.23-.13-.45-.2-.67.33-.13.69-.25,1-.37,1-.32,2-.58,2.7-.75S140.92,72,141,72s.57-.07,1.36-.09a16.93,16.93,0,0,1,2.82.16,12.74,12.74,0,0,1,3.89,1c0,.23-2-.18-3.95-.2a20.12,20.12,0,0,0-2.69.1c-.74.07-1.23.18-1.26.18S140.59,73.25,139.85,73.37Z"/>
+                    <path class="cls-342"
+                          d="M137.49,76.73l.24,0a5.31,5.31,0,0,1,.57.13,16,16,0,0,1,1.53.57c1.08.46,2,1.11,2,1.26a9.17,9.17,0,0,1-2.24-.48c-.54-.12-1.09-.23-1.51-.3s-.64-.06-.66-.06-.28,0-.69-.06q-.34,0-.78,0h0a5.55,5.55,0,0,0,.32-1A6.52,6.52,0,0,1,137.49,76.73Z"/>
+                    <path class="cls-342"
+                          d="M152.15,51.13l-1.23,1.62c-.2.28-.42.57-.64.86A3.21,3.21,0,0,0,150,54l.28.14.83.48c1,.58,2,1.17,2.93,1.73-1.64.56-3.18,1-4.48,1.49,0,0-.45-.47-.91-.94l-.37,1.36,1.28-.42h0c-.06.27-.11.48-.14.63s0,.05,0,.07c-.15.57-.17.66-.18.71l-.17.1a4.07,4.07,0,0,0-.45.28,5.08,5.08,0,0,0-.43.34,8,8,0,0,0-1.28,1.51c-.9,1.45-2.09,3.6-3.53,5.52A15.6,15.6,0,0,1,141,69.61a7.72,7.72,0,0,1-1.4.93c-.45.24-.88.45-1.28.65a7.31,7.31,0,0,1-2.8,1A18.49,18.49,0,0,1,138,70.59a13.7,13.7,0,0,0,2.35-1.71,15.48,15.48,0,0,0,2.06-2.63c1.27-1.94,2.24-4,3.17-5.66a9.77,9.77,0,0,1,1.48-1.91c.21-.2.41-.36.55-.47h0s-.05-.08-.15-.2l-.67-.82c0-.09.07-.19.11-.29l.92-.26,2-.55.51-.15h.09l.26,0-.26-.23-2.14-1.39,1.17-1.36.71-.81,1.37-1.5c.65-.73,1.25-1.38,1.74-1.9l.67-.08-.23-.36c-.14.13-.28.29-.44.44a39.56,39.56,0,0,1-4.05.2,7.15,7.15,0,0,1,.72-.11,35.24,35.24,0,0,0,3.88-.61l.63-.21-.4.58C153.58,49.19,152.92,50.1,152.15,51.13Z"/>
+                    <path class="cls-342"
+                          d="M135.38,74.28l.73-.19c.06.25.11.5.17.76a3.45,3.45,0,0,1,.07.55,10.25,10.25,0,0,0-.93.45,3.84,3.84,0,0,0,0-.9C135.43,74.73,135.41,74.5,135.38,74.28Z"/>
+                    <path class="cls-342"
+                          d="M136.11,74.09l-.73.19a5.58,5.58,0,0,0-.09-.61c.19-.09.4-.17.62-.25C136,73.64,136.05,73.86,136.11,74.09Z"/>
+                    <path class="cls-342"
+                          d="M136.35,76l-1,.29c0-.13.05-.26.07-.4a10.25,10.25,0,0,1,.93-.45A5.23,5.23,0,0,1,136.35,76Z"/>
+                    <path class="cls-342"
+                          d="M136.24,76.81a6.44,6.44,0,0,0-1.15.25,4.8,4.8,0,0,0,.26-.81l1-.29A4.59,4.59,0,0,1,136.24,76.81Z"/>
+                    <path class="cls-342"
+                          d="M135.09,77.06a6.44,6.44,0,0,1,1.15-.25,5.55,5.55,0,0,1-.32,1h0l-.73,0-.57.06a3.85,3.85,0,0,0,.31-.55C135,77.28,135,77.17,135.09,77.06Z"/>
+                    <path class="cls-342"
+                          d="M134.69,76.36s.25-.26.73-.51c0,.14,0,.27-.07.4C135,76.35,134.72,76.41,134.69,76.36Z"/>
+                    <path class="cls-342"
+                          d="M135.44,72.18a8,8,0,0,1,.47,1.24c-.22.08-.43.16-.62.25-.09-.51-.19-1-.28-1.37a2.36,2.36,0,0,0-.32-.75c-.11-.15-.24-.18-.23-.23s.14-.1.38,0a1.88,1.88,0,0,1,.59.79v0Z"/>
+                    <path class="cls-342"
+                          d="M133.29,74.71a6.41,6.41,0,0,1,2-1,5.58,5.58,0,0,1,.09.61A7.19,7.19,0,0,1,133.29,74.71Z"/>
+                    <path class="cls-342"
+                          d="M133.83,76.25a.2.2,0,0,1,0,.11.84.84,0,0,1-.07.16c-.05.09-.12,0-.09,0l0,0,0,0,0,0s-.07-.07-.11-.13a.62.62,0,0,0,.26,0S133.82,76.21,133.83,76.25Z"/>
+                    <path class="cls-342"
+                          d="M133.82,76.36a.2.2,0,0,0,0-.11s-.05,0-.07,0a.62.62,0,0,1-.26,0c0,.06.08.09.11.13l0,0,0,0,0,0s0,.14.09,0A.84.84,0,0,0,133.82,76.36ZM134,76c.15-.05,0,.86-.25.9s-.44-.52-.22-.72A3.37,3.37,0,0,1,134,76Z"/>
+                    <path class="cls-342"
+                          d="M132.94,78.1c-.06-.16.95-.71,2.1-1h.05c-.05.11-.1.22-.16.33a3.85,3.85,0,0,1-.31.55C133.74,78.06,133,78.22,132.94,78.1Z"/>
+                    <path class="cls-342"
+                          d="M140.31,6.73c-1.16-.42-2.52-1-4-1.53a27.61,27.61,0,0,0-3.84-1,5.14,5.14,0,0,1,1.61-.56l-.76-1.95,0-.09a23.13,23.13,0,0,1,3.81,1.55A37.33,37.33,0,0,1,141,5.46c.8.52,1.44,1,1.9,1.32l-.85.16.49.53C142,7.32,141.2,7.06,140.31,6.73Z"/>
+                    <path class="cls-342"
+                          d="M133.7,76.94c.21,0,.4-1,.25-.9a3.37,3.37,0,0,0-.47.18s.1-.12.37-.23c.06,0,.15-.11.21-.06a.37.37,0,0,1,.09.2,1.31,1.31,0,0,1-.09.68c-.1.25-.26.39-.48.36a.59.59,0,0,1-.4-.41.69.69,0,0,1,0-.68s.15,0,.26.14C133.26,76.42,133.48,77,133.7,76.94Z"/>
+                    <path class="cls-342"
+                          d="M138.56,55.57a5.86,5.86,0,0,1-3.14,1.56,4.65,4.65,0,0,1-3-.42h.16a26,26,0,0,0,4.34-.67C137.42,55.91,138,55.75,138.56,55.57Z"/>
+                    <path class="cls-342"
+                          d="M132.54,73.93c-.08,0-.12,0-.07-.06l.07,0a1.09,1.09,0,0,0-.18-.23c0,.05.16.05.29.05s.1.08,0,.15A.42.42,0,0,1,132.54,73.93Z"/>
+                    <path class="cls-342"
+                          d="M133.64,39.5a3.29,3.29,0,0,1,2.71-.27,11,11,0,0,0-3.88,1.08l-.06,0A8,8,0,0,1,133.64,39.5Z"/>
+                    <path class="cls-342"
+                          d="M132.36,74.21c-.43.09-.48-.13,0-.61a1.09,1.09,0,0,1,.18.23l-.07,0c-.05,0,0,.1.07.06a.42.42,0,0,0,.14-.13c.07-.07,0-.19,0-.15s-.28,0-.29-.05l.4-.1C133.17,73.39,132.78,74.12,132.36,74.21Z"/>
+                    <path class="cls-342"
+                          d="M131.11,41.05a6,6,0,0,1,1.27-1.15,4.44,4.44,0,0,0-.15.52A12.59,12.59,0,0,0,131.11,41.05Z"/>
+                    <path class="cls-342"
+                          d="M132,74.44a.35.35,0,0,1-.24-.43,1.05,1.05,0,0,1,.23-.43,1.64,1.64,0,0,1,.12-.14s.13,0,.25.16c-.48.48-.43.7,0,.61s.81-.82.4-.71l-.4.1s.14-.11.44-.2a.22.22,0,0,1,.22,0,.35.35,0,0,1,.06.23,1,1,0,0,1-.37.61A.83.83,0,0,1,132,74.44Z"/>
+                    <path class="cls-342"
+                          d="M134.05,3.67a5.14,5.14,0,0,0-1.61.56c-.41-.09-.81-.16-1.23-.22-.21,0-.41-.06-.63-.11a5.65,5.65,0,0,1,.46-.41,18.13,18.13,0,0,1,2.25-1.77Z"/>
+                    <path class="cls-342"
+                          d="M130.49,54.09a20.11,20.11,0,0,1-.42-6.4c.17-4,.61-5.83,2.14-7.18-.17.68-.31,1.34-.43,2-.63,3.48-.79,5.92-.82,6.07S130.67,50.85,130.49,54.09Z"/>
+                    <path class="cls-342"
+                          d="M135.42,57.13a5.86,5.86,0,0,0,3.14-1.56,21.58,21.58,0,0,0,4-1.72,11,11,0,0,0,1.36-.94,3.94,3.94,0,0,0,.59-.56l.13-.13a.52.52,0,0,0,.05-.12,1.69,1.69,0,0,0,.12-.36,12,12,0,0,0,.31-3.46c-.08-2.33-1.53-4.38-2.83-6.2A7.2,7.2,0,0,0,140,40a7.86,7.86,0,0,0-2.72-.79,5.28,5.28,0,0,0-.89,0h0a3.29,3.29,0,0,0-2.71.27,8,8,0,0,0-1.23.84h0l-.17.08a4.44,4.44,0,0,1,.15-.52,4.1,4.1,0,0,1,.56-.36,7.92,7.92,0,0,1,4.36-.75,8.22,8.22,0,0,1,2.93.74,7.63,7.63,0,0,1,2.61,2.16,22.74,22.74,0,0,1,2,3A8.24,8.24,0,0,1,146,48.23a13.21,13.21,0,0,1-.26,3.75c-.05.15-.1.32-.16.49a1.17,1.17,0,0,1-.16.28,1.66,1.66,0,0,1-.16.21,5.37,5.37,0,0,1-.68.67,11.29,11.29,0,0,1-1.49,1.06,23.25,23.25,0,0,1-5.92,2.39,26.1,26.1,0,0,1-4.51.76,7.05,7.05,0,0,1-1.95-.08.74.74,0,0,1-.3-.13q0-.48,0-.93a.71.71,0,0,1,.52-.09,5.75,5.75,0,0,0,1.45.1h0A4.65,4.65,0,0,0,135.42,57.13Z"/>
+                    <path class="cls-342"
+                          d="M130.23,109a.61.61,0,0,0,0-.11,1.53,1.53,0,0,0,.6-.16,3.44,3.44,0,0,0,.74-.53c.26-.21.5-.45.46-.73a3.77,3.77,0,0,0-.83-1.66,1.15,1.15,0,0,0-.63-.41s0-.11,0-.23v-.06c0-.17.07-.3.16-.28a3.24,3.24,0,0,1,.33.12,2,2,0,0,1,.6.51,3.85,3.85,0,0,1,.52.87,3,3,0,0,1,.32,1.14,1,1,0,0,1-.25.62,1.67,1.67,0,0,1-.44.37,2.92,2.92,0,0,1-.85.48A1.32,1.32,0,0,1,130.23,109Z"/>
+                    <path class="cls-342"
+                          d="M135.92,77.84a8.42,8.42,0,0,1-.66,1.24A11.64,11.64,0,0,1,132,81.91a3.89,3.89,0,0,1-1,.4H131a5.29,5.29,0,0,1-1.82.11c-.75-.08-1.23-.27-1.23-.35s.52,0,1.24-.1a4.81,4.81,0,0,0,2.41-.77,13.29,13.29,0,0,0,1.94-1.81c.48-.56.74-1,.76-1s.13-.19.32-.48l.57-.06Z"/>
+                    <path class="cls-342" d="M130.23,109c-.15,0-.23-.07-.23-.09s.1,0,.26,0A.61.61,0,0,1,130.23,109Z"/>
+                    <path class="cls-342"
+                          d="M130.13,102.42c-.17,0-.21-1.06-.08-2.34q.06.39.12.75c.06.37.11.71.15,1S130.17,102.42,130.13,102.42Z"/>
+                    <path class="cls-342"
+                          d="M150.63,42.67c0,.2,0,.38,0,.53l-.06.3c0,.14-.07.3-.11.44-.06-.27-.12-.69-.19-1.25s-.15-1.11-.24-1.81a15.41,15.41,0,0,0-.83-2.16,8.4,8.4,0,0,0-1.74-2.09,12.23,12.23,0,0,0-2.37-1.92,11.18,11.18,0,0,0-6.37-1.26,6.4,6.4,0,0,0-2.86,1.31,10.28,10.28,0,0,0-2.23,2.29,7.83,7.83,0,0,0-1.22,2.68,1,1,0,0,0,0,.17,6,6,0,0,0-1.27,1.15,12.59,12.59,0,0,1,1.12-.63.29.29,0,0,0,0,.09c-1.53,1.35-2,3.16-2.14,7.18a20.11,20.11,0,0,0,.42,6.4h0l0,.58c0,.65-.07,1.32-.07,2a.54.54,0,0,0-.27.32.56.56,0,0,0,.27.61,26.75,26.75,0,0,0,.23,3,24.19,24.19,0,0,0,1.74,6.51l.17.39.14.28a.17.17,0,0,0,.22.13l.27,0,.25-.14c.23-.13.47-.3.71-.45.95-.63,1.87-1.3,2.77-1.94,1.78-1.29,3.42-2.53,4.81-3.61s2.53-2,3.31-2.64c0,0,.38-.49,1-1.26s.82-2.67,1.75-4.81c.12-.27.24-.57.36-.88.39-1,.77-2.28,1.06-3.29h0c-.39,1.45-.93,3.47-1.44,5.22-.31,1.1-.61,2.1-.84,2.78l-.28.08.17.21c-.07.17-.12.32-.17.42-.69,1.47-4.5,4.7-4.5,4.7-1.32,1.17-2.91,2.49-4.65,3.86-.87.69-1.77,1.39-2.73,2.08-.24.17-.48.34-.75.51a2.15,2.15,0,0,1-1.1.39,1.06,1.06,0,0,1-1.21-.56l-.26-.5-.21-.4a28.23,28.23,0,0,1-2.38-13.06c.09-3.63.37-6.09.38-6.25a62.62,62.62,0,0,1,1-6.21c.19-.89.42-1.86.74-2.88a9.41,9.41,0,0,1,1.52-3.08,11.5,11.5,0,0,1,2.62-2.54,7.56,7.56,0,0,1,3.56-1.45A10.83,10.83,0,0,1,148.06,36a8.58,8.58,0,0,1,1.76,2.38,13.23,13.23,0,0,1,.74,2.39C150.6,41.54,150.62,42.15,150.63,42.67Z"/>
+                    <path class="cls-342"
+                          d="M129,93.1a4,4,0,0,1,2.3,1.26,2.17,2.17,0,0,1,.41.9c.06.24.06.39.07.4a4.63,4.63,0,0,1-.14,1.25c-.18.7-.46,1.44-.68,2.26-.3,1-.52,2-.67,2.67,0-.3-.09-.64-.15-1s-.08-.49-.12-.75.07-.71.13-1.09c.12-.83.36-1.72.44-2.28a3.79,3.79,0,0,0,0-.7,1.46,1.46,0,0,0,0-.26,1.53,1.53,0,0,0-.2-.78,3.22,3.22,0,0,0-1.67-1.08l-.19-.07c-.08-.33-.16-.64-.26-.95A5.88,5.88,0,0,0,129,93.1Z"/>
+                    <path class="cls-342"
+                          d="M129.76,80.86a1.27,1.27,0,0,1-1,.33,1,1,0,0,1-.43-.14.5.5,0,0,0,.17-.11.82.82,0,0,0,.22-.19h0a1.09,1.09,0,0,0,.77-.23c.23-.14.48-.37.69-.49s.16-.1.26-.08a.13.13,0,0,1,.08,0h0a.07.07,0,0,1,0,.08v0s0,.06-.08,0C130.39,80.15,130.12,80.5,129.76,80.86Z"/>
+                    <path class="cls-342"
+                          d="M128.52,80.94a.5.5,0,0,1-.17.11h0l0,0a.41.41,0,0,0,0-.09c.1,0,.12,0,.12-.1h0a.53.53,0,0,1,.17-.12l.1,0A.82.82,0,0,1,128.52,80.94Z"/>
+                    <path class="cls-342"
+                          d="M128.54,95.79a.49.49,0,0,1,.29.68,7.09,7.09,0,0,1-.65.82l-.25.24c-.15-.4-.29-.8-.45-1.21.24-.29.34-.47.36-.48C128,95.68,128.24,95.66,128.54,95.79Z"/>
+                    <path class="cls-342"
+                          d="M128.86,94.88c.47,1.84.91,3.68,1.19,5.2-.13,1.28-.09,2.34.08,2.34s.1-.21.19-.58c.12,1.08.09,1.77,0,1.79s-.47-.89-1-2.27h0q0-.12-.09-.27c-.37-1-.82-2.23-1.29-3.54l.25-.24a7.09,7.09,0,0,0,.65-.82.49.49,0,0,0-.29-.68c-.3-.13-.59-.11-.7,0,0,0-.12.19-.36.48-.1-.3-.22-.6-.33-.91-.19-.5-.39-1-.56-1.5l.2,0,.59-.15-.64-1.18a6.38,6.38,0,0,0,1.84,1.29Z"/>
+                    <path class="cls-342"
+                          d="M126.57,93.91c-.2-.56-.41-1.12-.62-1.65a.87.87,0,0,0,.1-.08l.23-.18a4.42,4.42,0,0,0,.45.52s0,0,0,0l.64,1.18-.59.15-.2,0Z"/>
+                    <path class="cls-342"
+                          d="M128.32,92.87c.1.31.18.62.26.95a6.38,6.38,0,0,1-1.84-1.29s0,0,0,0l-.34-.64-.11.12c-.14-.2-.19-.34-.15-.37S127.11,92.38,128.32,92.87Z"/>
+                    <path class="cls-342"
+                          d="M125.05,7.66a12.62,12.62,0,0,0-1.84-2.74l-.5-.51,1.55-.31a23.37,23.37,0,0,1,1.48,3.12,10.71,10.71,0,0,1,.37,1.09,5.62,5.62,0,0,1,.18.89c0,.32.07.66.1,1,0,.18,0,.36.06.56l0,.28v.14c0,.07,0,0,0-.07l.15-.46c.26-.76.53-1.48.77-2.09a21.27,21.27,0,0,1,1.09-2.24,8.21,8.21,0,0,1,1.29-1.73c.26-.26.51-.5.75-.71.22.05.42.08.63.11.42.06.82.13,1.23.22-.23.1-.47.23-.74.38a13.48,13.48,0,0,0-1.31.85,6.47,6.47,0,0,0-1.27,1.39A14,14,0,0,0,127.93,9a27.86,27.86,0,0,0-1.34,3.58c-.13.41-.25.81-.28.87s0,.07,0,0l0-.23-.06-.45c0-.29-.07-.58-.11-.87-.09-.57-.16-1.13-.23-1.66a10,10,0,0,0-.37-1.59A9.74,9.74,0,0,0,125.05,7.66Z"/>
+                    <path class="cls-342"
+                          d="M125.11,90c-.3-.79-.55-1.47-.75-2l1.89.32a2.68,2.68,0,0,1-.32.64A5.11,5.11,0,0,1,125.11,90Z"/>
+                    <path class="cls-342"
+                          d="M128.83,80.49a.33.33,0,0,1-.08.26h0l-.1,0a.53.53,0,0,0-.17.12h0a.1.1,0,0,0,0-.07c0,.07,0,.07,0,.07s0,.09-.12.1a.41.41,0,0,1,0,.09l0,0a6,6,0,0,1-1.22.49,3.23,3.23,0,0,1-1.62.1,1.26,1.26,0,0,1-.55-.33,3.2,3.2,0,0,0,.6-.26.29.29,0,0,0,.12.07,2.64,2.64,0,0,0,1.35,0,6.55,6.55,0,0,0,1.39-.38c.18-.08.31-.17.32-.24s-.06-.14-.06-.16S128.78,80.33,128.83,80.49Z"/>
+                    <path class="cls-342"
+                          d="M131.1,82.42c.05,0-.14.5-.65,1.07a5.16,5.16,0,0,1-2.37,1.5,7.42,7.42,0,0,1-1.81.32.2.2,0,0,1,0-.07.57.57,0,0,0-.56-.54l-.87.35,0-.72.22-.15a2.88,2.88,0,0,0,.36.07,8.07,8.07,0,0,0,2.48-.06,5.4,5.4,0,0,0,2.28-1c.45-.33.74-.66.87-.73l.06,0Z"/>
+                    <path class="cls-342"
+                          d="M124.8,81.14s.06-.12.18-.24.25-.14.28-.11.09.16.28.26a3.2,3.2,0,0,1-.6.26Z"/>
+                    <path class="cls-342" d="M124.81,84.33v-.15h0a.08.08,0,0,0,0,0h0l.13,0H125Z"/>
+                    <path class="cls-342" d="M124.73,85.09l.1,0v0h-.1Z"/>
+                    <path class="cls-342"
+                          d="M124.66,84.84a.42.42,0,0,1-.06-.19c0-.05,0-.08-.06-.08s.06,0,.08-.09l0,0,.16-.11,0,.72-.1,0h0A2.07,2.07,0,0,0,124.66,84.84Z"/>
+                    <path class="cls-342" d="M124.81,84.33l-.16.11a1.07,1.07,0,0,0,.13-.21l0,0Z"/>
+                    <path class="cls-342"
+                          d="M124.21,87.66c-.1-.29-.18-.49-.22-.58a11.8,11.8,0,0,0,1.89-1,.79.79,0,0,0,.33-.43c.19.65.62,2.08,1,3.32s.73,2.47,1.11,3.91c-1.21-.49-2.11-1.32-2.19-1.24s0,.17.15.37l-.23.18a.87.87,0,0,1-.1.08c-.3-.81-.58-1.57-.84-2.25a5.11,5.11,0,0,0,.82-1,2.68,2.68,0,0,0,.32-.64L124.36,88s0,0,0,0h0A.48.48,0,0,0,124.21,87.66Z"/>
+                    <path class="cls-342"
+                          d="M124.46,85.2l-.08,0s.21,0,.21,0l.12,0h.12v0l.87-.35a.57.57,0,0,1,.56.54.2.2,0,0,0,0,.07h-.16c0-.09-.1-.07-.19,0a4.41,4.41,0,0,1-.63,0,4.58,4.58,0,0,1-.56-.06Z"/>
+                    <path class="cls-342"
+                          d="M124.42,108a.49.49,0,0,1-.09-.41c0-.22.16-.3.19-.29s0,.15,0,.3.13.21.29.19a1.34,1.34,0,0,0,.43-.3l.19-.22c0-.06,0,0,.11-.06s0,0-.09-.08l-.43-.17c-.27-.13-.44-.17-.47-.2s.25-.14.54-.09a4,4,0,0,1,.48.07,6.24,6.24,0,0,1,.8.23,6.35,6.35,0,0,1-.51.7,1.71,1.71,0,0,1-1,.52A.64.64,0,0,1,124.42,108Z"/>
+                    <path class="cls-342"
+                          d="M124,87c-.11-.3.35-.72,1-1a3,3,0,0,0,1-.74,1.2,1.2,0,0,0,.19,0s0,.14.1.32a.79.79,0,0,1-.33.43,11.8,11.8,0,0,1-1.89,1Z"/>
+                    <path class="cls-342"
+                          d="M124.19,85.07a.55.55,0,0,1-.18-.24c.22-.12.34-.19.34-.23l.3-.16,0,0s0,.09-.08.09.08,0,.06.08a.42.42,0,0,0,.06.19,2.07,2.07,0,0,1,.06.24h0l-.12,0s-.21,0-.21,0l-.09,0Z"/>
+                    <path class="cls-342"
+                          d="M123.94,84.65a.38.38,0,0,1,0-.1.6.6,0,0,1,.23-.45.54.54,0,0,1,.17-.1h0l.16,0,.15,0h.12v.25h0l0,0a1.07,1.07,0,0,1-.13.21l-.3.16A.91.91,0,0,0,123.94,84.65Z"/>
+                    <path class="cls-342"
+                          d="M122.18,1.79a2.51,2.51,0,0,1,.81.54,8.85,8.85,0,0,1,1.24,1.72l0,0-1.55.31a3.65,3.65,0,0,0-.81-.59c-.11,0-.19-.06-.2,0s0-.12,0-.16a.65.65,0,0,1,0-.1Z"/>
+                    <path class="cls-342"
+                          d="M124.94,81.31a3.13,3.13,0,0,1-1.45.16,1.73,1.73,0,0,1-1.28-1,3.51,3.51,0,0,1-.33-1.41,3.64,3.64,0,0,1,.87-2.37,4.62,4.62,0,0,1,1.4-1.12,6.59,6.59,0,0,1,.65-.31,8.2,8.2,0,0,1,1.22-.36,5,5,0,0,1,.66-.09,1.55,1.55,0,0,1,.52.07,1,1,0,0,0,.22.06h.19l.31-.09.36-.11.2-.05.28-.07a6.39,6.39,0,0,1,1.84.06,2.5,2.5,0,0,1,1,.39,3.08,3.08,0,0,1,.73.71,2.17,2.17,0,0,1,.43,1,1.25,1.25,0,0,1-.4,1.09c-.57.39-.78.47-.95,1.32a1.11,1.11,0,0,1-.42.54.92.92,0,0,1-.28.14.29.29,0,0,1-.14,0,.11.11,0,0,1-.08,0,0,0,0,0,1,0-.05,1.65,1.65,0,0,1,.11-.36.46.46,0,0,0,0-.2c0-.09-.1,0-.06-.39,0-.1,0-.07,0-.08h-.08l-.14,0L130,79c-.15,0-.23.06-.24,0s0-.07.16-.18a1,1,0,0,1,.68-.25c.17.16,0,.37,0,.54s.1,0,.14,0a.5.5,0,0,0,.15-.14.64.64,0,0,0,.12-.38v-.06a.4.4,0,0,1,0-.15.7.7,0,0,1,.08-.16,1.32,1.32,0,0,1,.12-.2,2.73,2.73,0,0,1,.34-.34c.11-.11.26-.21.31-.26.26-.23.13-.68-.2-1.07a2,2,0,0,0-.57-.49,1.61,1.61,0,0,0-.67-.22,5.82,5.82,0,0,0-1.56,0l-.1,0-.2.08-.36.12-.42.14a2.24,2.24,0,0,1-.51,0,2.15,2.15,0,0,1-.44-.09s0,0-.12,0a3.08,3.08,0,0,0-.48.09,7.61,7.61,0,0,0-1,.34,4.54,4.54,0,0,0-1.67,1.05,2.67,2.67,0,0,0-.71,1.68,2.42,2.42,0,0,0,.18,1,.84.84,0,0,0,.63.56,3.06,3.06,0,0,0,2.11-.52,2.77,2.77,0,0,0,.45-.31l.2-.16a1.31,1.31,0,0,1,.11-.12.33.33,0,0,0,.12-.27c0-.09-.13-.13-.21-.17a2.25,2.25,0,0,0-.72-.06.77.77,0,0,0-.52.18,1.94,1.94,0,0,0-.22.34c-.06.1-.12.12-.13.11s0-.07,0-.15a1,1,0,0,1,.15-.45,1,1,0,0,1,.66-.37,2.61,2.61,0,0,1,1,0,.68.68,0,0,1,.51.37.75.75,0,0,1-.14.68,2.18,2.18,0,0,1-.22.31l-.23.23a4.74,4.74,0,0,1-.49.4c-.19.13-.39.25-.59.36-.19-.1-.24-.24-.28-.26s-.16,0-.28.11-.2.21-.18.24Z"/>
+                    <path class="cls-342"
+                          d="M124.87,121.15c-.71,1-1.48,2-2.3,3.07l-.29.37c.17-.3.33-.61.51-.93,1-1.81,1.95-3.64,2.18-3.55S125,120.55,124.87,121.15Z"/>
+                    <path class="cls-342"
+                          d="M124.23,4.05A8.85,8.85,0,0,0,123,2.33a2.51,2.51,0,0,0-.81-.54L122,.66c1.11-.12,2.3-.26,3.52-.32a19,19,0,0,1,3.26.09c.28,0,.6.12.89.18l.72.19,1.41.38c.49.14,1,.29,1.48.45l0,.09A18.13,18.13,0,0,0,131,3.49a5.65,5.65,0,0,0-.46.41l-.79-.12-.72-.1a3.31,3.31,0,0,0-.56-.06,17.45,17.45,0,0,0-2.62.2c-.55.08-1.09.18-1.63.28Z"/>
+                    <path class="cls-342"
+                          d="M123.21,121a.47.47,0,0,1-.39.23c-.11,0-.15-.06-.15-.08s.22,0,.31-.29.08-.28.12-.46.09-.42.06-.39,0,0,0,0-.12.06-.12.06l-.35.11c-.2.07-.47.18-.73.3a5.37,5.37,0,0,1-1.1.45c0-.06.39-.48.89-.81a6.3,6.3,0,0,1,1.1-.6,1.34,1.34,0,0,1,.35-.09c.26-.08.64.08.54.45a4.06,4.06,0,0,1-.22.64A3.12,3.12,0,0,1,123.21,121Z"/>
+                    <path class="cls-342"
+                          d="M122.38,114.08a7.53,7.53,0,0,1,1.65-1.14l.16-.08h0a.07.07,0,0,0,.06,0l-.06,0h-.44a4.18,4.18,0,0,0-.5,0,8.31,8.31,0,0,0-1.8.54,2.19,2.19,0,0,1-.64.16c-.17,0-.25-.08-.24-.09s.09,0,.23,0a2.43,2.43,0,0,0,.56-.25,6.74,6.74,0,0,1,1.83-.74,2.57,2.57,0,0,1,.55-.06l.59,0c.61,0,1.25,0,1.31.11a.3.3,0,0,1,0,.51,1.51,1.51,0,0,1-.36.17c-.16,0-.33.11-.53.17l-.32.1a1,1,0,0,0-.19.07,8.87,8.87,0,0,0-1.63,1,1.13,1.13,0,0,1-1.87-.19,1.06,1.06,0,0,1-.31-.6c0-.21.18-.23.17-.21s-.08.08,0,.2a1.07,1.07,0,0,0,.35.46,1.34,1.34,0,0,0,.67.4C121.83,114.51,122.11,114.29,122.38,114.08Z"/>
+                    <path class="cls-342"
+                          d="M124,84.79a7,7,0,0,1-1.39.5,13.57,13.57,0,0,1-3.59.48,11.41,11.41,0,0,0,2.44-.49,23.13,23.13,0,0,1,2.49-.63.18.18,0,0,0,0,.13Z"/>
+                    <path class="cls-342"
+                          d="M119.1,86.78c-.11-.1-.27-.17-.33-.26a0,0,0,0,0,0,0h.15a11.45,11.45,0,0,0,1.47-.32v0a.48.48,0,0,0,.08.26,1.37,1.37,0,0,0,.47.37,2.4,2.4,0,0,0,1.77.16,2.94,2.94,0,0,0,1.4-.64c.1-.08.36-.24.46-.32s.23-.22.24-.39v-.15a1.49,1.49,0,0,0-.35-.27l.27.06a4.58,4.58,0,0,0,.56.06,4.41,4.41,0,0,0,.63,0,3,3,0,0,1-1,.74c-.65.23-1.11.65-1,1l0,.07a10.12,10.12,0,0,1-1.18.4,4.83,4.83,0,0,1-2.09.07,3.68,3.68,0,0,1-.83-.28A7.18,7.18,0,0,1,119.1,86.78Z"/>
+                    <path class="cls-342"
+                          d="M118.76,86.49c-.07-.11-.4-.27-.4-.36a4,4,0,0,1,1,.06c.59-.31.86-.42.86-.42l.51.19h-.1a.54.54,0,0,0-.16.06c-.06,0-.13.08-.14.13a11.45,11.45,0,0,1-1.47.32Z"/>
+                    <path class="cls-342"
+                          d="M118.65,75.79s-.13,0-.29,0c0,0,.21-1,.68-.62s.72.86.19.87l-1.2,0s0,0,0,0a2.13,2.13,0,0,1,.49-.11l.54-.07c.12,0,.15,0,.18,0s0-.07,0-.11a2,2,0,0,0-.35-.32c-.14-.09-.08,0-.12,0A1.13,1.13,0,0,0,118.65,75.79Z"/>
+                    <path class="cls-342"
+                          d="M118.36,75.77c.16,0,.29,0,.29,0a1.13,1.13,0,0,1,.17-.41s0-.08.12,0a2,2,0,0,1,.35.32s0,.09,0,.11-.06,0-.18,0l-.54.07a2.13,2.13,0,0,0-.49.11Z"/>
+                    <path class="cls-342"
+                          d="M118.07,92.21a3.05,3.05,0,0,1-.27-.61s-.06-.12,0-.14l.15,0,.3-.07a8.56,8.56,0,0,1,1.26-.24l1.08-.19c.32,0,.63-.1.9-.16a3.86,3.86,0,0,0,2.22-1.23A3.06,3.06,0,0,0,124,89a2.32,2.32,0,0,0,.33-.91s0,0,0-.08h0c.2.51.45,1.19.75,2-.15.14-.3.27-.48.41a5.85,5.85,0,0,1-2.95,1.06l-1.93.17c-.27,0-.54.07-.84.09l-.22,0c-.07,0-.19,0-.12.09a1.27,1.27,0,0,0,.21.42,2.33,2.33,0,0,0,.64.65,3.88,3.88,0,0,0,.91.46,4.35,4.35,0,0,0,1.82.3,6.85,6.85,0,0,0,2.61-.72,7.83,7.83,0,0,0,1.19-.71c.21.53.42,1.09.62,1.65-.37.09-.86.21-1.5.33a11.71,11.71,0,0,1-3,.22,6.34,6.34,0,0,1-2-.55,4.89,4.89,0,0,1-1-.64A3.63,3.63,0,0,1,118.07,92.21Z"/>
+                    <path class="cls-342"
+                          d="M118.07,76.1s0,0,0,0l1.2,0c.53,0,.28-.51-.19-.87s-.68.62-.68.62-.27-.1-.27-.14a1.56,1.56,0,0,1,.32-.6.59.59,0,0,1,.4-.2h0a.72.72,0,0,1,.43.19,1.5,1.5,0,0,1,.45.65.37.37,0,0,1-.15.44.75.75,0,0,1-.41.07l-.57,0A3.9,3.9,0,0,1,118.07,76.1Z"/>
+                    <path class="cls-342"
+                          d="M117.81,81a2.72,2.72,0,0,1,.47-.65s0-.14-.15-.25a2.11,2.11,0,0,1,.68.4.84.84,0,0,1,.28.64.8.8,0,0,1-.59.48c-.28.09-.63.06-.7-.06A.5.5,0,0,1,117.81,81Z"/>
+                    <path class="cls-342"
+                          d="M117.81,81a.5.5,0,0,0,0,.56c.07.12.42.15.7.06a.8.8,0,0,0,.59-.48.84.84,0,0,0-.28-.64,2.11,2.11,0,0,0-.68-.4c.12.11.18.21.15.25A2.72,2.72,0,0,0,117.81,81Zm-.19.71c-.42-.48.09-1.15.49-1.63a1.33,1.33,0,0,1,1.11.82C119.49,81.64,118.05,82.17,117.62,81.69Z"/>
+                    <path class="cls-342"
+                          d="M117.44,81.85a1,1,0,0,1-.13-1.09,3.7,3.7,0,0,1,.52-.8c0-.06.17,0,.28.1-.4.48-.91,1.15-.49,1.63s1.87,0,1.6-.81a1.33,1.33,0,0,0-1.11-.82,1.08,1.08,0,0,1,.85.24,1.06,1.06,0,0,1,.45.86,1.12,1.12,0,0,1-.78.83A1.1,1.1,0,0,1,117.44,81.85Z"/>
+                    <path class="cls-342"
+                          d="M117.17,134l1.11-1.09a3.25,3.25,0,0,1,.17.31,7.39,7.39,0,0,1-.56.56c-.17.17-.35.32-.5.45v-.11c0-.11-.06-.09-.09-.1S117.16,134,117.17,134Z"/>
+                    <path class="cls-342"
+                          d="M117.92,59.83a8.12,8.12,0,0,1-1.15.27.39.39,0,0,0,.1-.08c.5-.15.95-.32,1.36-.48Z"/>
+                    <path class="cls-342"
+                          d="M116.8,134.56c-.17-.06,1-1.84,2.07-3.57a25.27,25.27,0,0,0,1.31-2.45c.33-.71.56-1.18.57-1.22s.28-.48.67-1.16c.24-.45.54-1,.84-1.55l0,0,.29-.37c.82-1,1.59-2,2.3-3.07a29.83,29.83,0,0,1-1,3c-.35,1-.74,2-1,2.71s-.54,1.23-.56,1.27-.28.5-.72,1.18a18.82,18.82,0,0,1-1.72,2.41c-.48.56-1,1.08-1.42,1.53a3.25,3.25,0,0,0-.17-.31L117.17,134s.09,0,.13,0,.07,0,.09.1v.11C117.07,134.54,116.84,134.69,116.8,134.56Z"/>
+                    <path class="cls-342"
+                          d="M116.68,97c.83.23,1.67.5,2.29.63a15.34,15.34,0,0,0,1.69.3c.63.08,1.27.13,1.87.16a6.64,6.64,0,0,0,3.08-.43,4.63,4.63,0,0,0,1.72-1.2,1.09,1.09,0,0,0,.15-.18c.16.41.3.81.45,1.21A5.81,5.81,0,0,1,126,98.72a7.69,7.69,0,0,1-3.54.4c-.63,0-1.28-.12-1.94-.22l-.33-.07-.28-.08s-.16,0-.14,0l.08.1.24.21.14.12.42.3c.31.21.62.4.92.58a9.25,9.25,0,0,0,3.74,1.21,17.37,17.37,0,0,0,2.88.14,7.14,7.14,0,0,1,1.11,0h0a9.74,9.74,0,0,1-4,.36,9.47,9.47,0,0,1-4-1.08c-.33-.18-.67-.37-1-.58l-.52-.33c-.25-.19-.52-.36-.75-.56A17.42,17.42,0,0,1,117.66,98l-.62-.59-.08-.07,0,0,0-.07Z"/>
+                    <path class="cls-342"
+                          d="M116.59,146c0-.27,0-.67,0-1.23,0-1.07,0-2.71.14-5a45.68,45.68,0,0,1,.59-5,3.52,3.52,0,0,0,0-.49c.15-.13.33-.28.5-.45a7.39,7.39,0,0,0,.56-.56.82.82,0,0,1,.1.21,1.48,1.48,0,0,1,0,.79,5.13,5.13,0,0,1-.28.72,12.45,12.45,0,0,0-1.16,4.8,16.59,16.59,0,0,0,.45,5,5.5,5.5,0,0,0,.35,1c-.69.1-1,.23-1.09.16s0,.08.11.1a.78.78,0,0,0,.24,0h0l-.58.11h0v0A.28.28,0,0,0,116.59,146Z"/>
+                    <path class="cls-342"
+                          d="M116.4,5a23.14,23.14,0,0,1,.3-2.3l.17-1.95c.25,0,.5.06.76.09s.78.06,1.17.08a4.37,4.37,0,0,0,.5,0l.55,0c.68-.06,1.41-.15,2.19-.24l.14,1.13-.43,1.72a.65.65,0,0,0,0,.1s0,.12,0,.16.09,0,.2,0a3.65,3.65,0,0,1,.81.59c-.77.15-1.55.32-2.35.45-.25,0-.49.08-.77.1s-.56,0-.8.06c-.49,0-.94,0-1.36,0Z"/>
+                    <path class="cls-342"
+                          d="M116.34,60.42a3.83,3.83,0,0,1-1.58,0,10.63,10.63,0,0,0,1.49-.29h0l.49-.08A2.67,2.67,0,0,1,116.34,60.42Z"/>
+                    <path class="cls-342"
+                          d="M115.27,76.33a.39.39,0,0,1-.07.16.12.12,0,0,1-.06.08l-.16.08s0,0,0,0l.31-.31A0,0,0,0,1,115.27,76.33Z"/>
+                    <path class="cls-342"
+                          d="M115.47,10.86c-.12-2.69-.3-4.62-.47-5.91h.08l1.32,0a82.69,82.69,0,0,0-.32,8.43l-.17-.82C115.77,12,115.63,11.41,115.47,10.86Z"/>
+                    <path class="cls-342"
+                          d="M115,76.61c-.08-.32-.16-.64-.26-1a.51.51,0,0,1,.49.85.39.39,0,0,0,.07-.16,0,0,0,0,0,0,0Z"/>
+                    <path class="cls-342" d="M115.14,76.57a.42.42,0,0,1-.27.12l.11,0Z"/>
+                    <path class="cls-342" d="M115,76.61s0,0,0,0h-.06Z"/>
+                    <path class="cls-342"
+                          d="M115,5a18.06,18.06,0,0,0-.38-2.22l2.08,0a23.14,23.14,0,0,0-.3,2.3l-1.32,0Z"/>
+                    <path class="cls-342"
+                          d="M114.29,76a.33.33,0,0,1,0-.12.51.51,0,0,1,.26-.21l.08,0h0c.1.33.18.65.26,1l0,0H115l-.11,0h0a.51.51,0,0,1-.58-.63S114.29,76,114.29,76Z"/>
+                    <path class="cls-342" d="M114.6,75.69a.51.51,0,0,0-.26.21.44.44,0,0,1,.31-.25h0Z"/>
+                    <path class="cls-342" d="M115.14,83.31a.52.52,0,0,1-.78-.64A10.06,10.06,0,0,0,115.14,83.31Z"/>
+                    <path class="cls-342"
+                          d="M114.49,82.49a.52.52,0,0,1,.74.74s0,0,0,0l0,0a10.06,10.06,0,0,1-.78-.64.34.34,0,0,1,.09-.13Z"/>
+                    <path class="cls-342"
+                          d="M113.82,43.65h.51l.52.31a9.34,9.34,0,0,1,3,3.78c.14.26.61,1.22.71,1.41.59,1.31.76,1.72,1.53,3.69,0,.1,0,.19.07.26l0,.38a39.07,39.07,0,0,0-2.58-5.94c-.05-.08-.11-.18-.15-.26l-.43-.81a1.48,1.48,0,0,0-.21-.26,7.81,7.81,0,0,0-1.52-1.73A10,10,0,0,0,113.82,43.65Z"/>
+                    <path class="cls-342"
+                          d="M114.86,76.69c-.45.18-.71-.31-.57-.67,0,0,0,0,0,0A.51.51,0,0,0,114.86,76.69Z"/>
+                    <path class="cls-342"
+                          d="M126.59,148.65l-.09,0h.09Zm-14.2-19.05c0-.4-.07-.75-.09-1,.58-.05,1.16-.11,1.74-.21,0,.27,0,.64.07,1.09.08,1.09.2,2.65.34,4.55.07,1,.17,2,.25,3.08,0,.48.11,1,.16,1.49.07.24.09.37.13.52l.1.44c.07.3.13.59.19.89.38,1.83.78,3.84,1.18,5.76h0c.11.52.22,1,.32,1.55l2.65,1.47,4.32.05a4.19,4.19,0,0,0,1.9-.2,1.66,1.66,0,0,0,.63-.53,1.56,1.56,0,0,0,.16-.2s0,0,0,.06a.58.58,0,0,1,0,.2l0,0,.48.33c.15-.18.07-.64-.24-1a.6.6,0,0,1,.09-.15l.53-.86.14-.27.06.13.53-.23a1.61,1.61,0,0,0-.3-.42,1.86,1.86,0,0,0-.25-.22,2.12,2.12,0,0,0-.57-1.18,1.27,1.27,0,0,0-1.29-.49,11.13,11.13,0,0,0-1.53.67,16.06,16.06,0,0,1-2.91,1.11,10.32,10.32,0,0,1-2.39.05c-.64,0-1.14,0-1.5,0h-.16l.37-.07a2,2,0,0,0,.27-.07H118v-.11h0a8.47,8.47,0,0,1,.85-.11,12,12,0,0,0,2.29-.19,18.49,18.49,0,0,0,2.72-1.21,10.33,10.33,0,0,1,1.63-.8,1.93,1.93,0,0,1,1.14,0,2.81,2.81,0,0,1,.93.6,3.14,3.14,0,0,1,.94,2,1.25,1.25,0,0,1-.06.7l-.24.52-.52.92c-.19.31-.37.62-.61.94a2.6,2.6,0,0,1-1,.85,5.15,5.15,0,0,1-2.38.37l-4.6.08c-1.17-.62-2.35-1.22-3.51-1.82-.63-2.73-1.24-5.4-1.8-7.87-.14-.56-.27-1.1-.41-1.63a3.61,3.61,0,0,1-.08-.38l0-.23-.05-.43c0-.3-.08-.58-.11-.86-.11-1.1-.22-2.13-.31-3.08C112.64,132.25,112.49,130.68,112.39,129.6Z"/>
+                    <path class="cls-342"
+                          d="M113.5,81.93l-.63-.54a20.81,20.81,0,0,1,2.38-1.09c.79-.22,1.33-.17,1.34-.08s-.52.18-1.17.51S114.2,81.46,113.5,81.93Z"/>
+                    <path class="cls-342"
+                          d="M113.93,184.06l1-1.87c.43-.77.92-1.65,1.36-2.62a12.16,12.16,0,0,0,.6-1.51,11.13,11.13,0,0,0,.3-1.64,6.47,6.47,0,0,0-.23-3.18,7.28,7.28,0,0,0-1.6-2.34,5,5,0,0,0-1.34-1,3.26,3.26,0,0,0,.48-.11,5.48,5.48,0,0,1,1.17.79,7.58,7.58,0,0,1,1.89,2.42,7,7,0,0,1,.45,3.53,11.66,11.66,0,0,1-.25,1.79,12.78,12.78,0,0,1-.57,1.65c-.44,1-.91,2-1.31,2.75l-.89,1.69c-.45.06-.91.12-1.37.16C113.75,184.42,113.83,184.26,113.93,184.06Z"/>
+                    <path class="cls-342"
+                          d="M113.91,185.4c-.3-.12-.48-.37-.39-.56l.15-.29c.46,0,.92-.1,1.37-.16a2.09,2.09,0,0,1-.1.21l-.36.74C114.5,185.49,114.21,185.52,113.91,185.4Z"/>
+                    <path class="cls-342"
+                          d="M115,84.59a26.28,26.28,0,0,1-2.3-2.16l.3-.2.46-.3c.29.25.58.51.86.74a.52.52,0,0,0,.78.64c.19.15.35.29.52.4a5.48,5.48,0,0,0,1,.49l.45.14a8.07,8.07,0,0,0,1.65.35,13,13,0,0,0,3.63-.21A6.89,6.89,0,0,0,125.66,83c.76-.62,1.1-1.25,1.22-1.15a1.59,1.59,0,0,1-.18.44,4.45,4.45,0,0,1-.73,1,4.77,4.77,0,0,1-.94.82H125l-.13,0h0v-.2h-.12l-.15,0-.16,0h0a.54.54,0,0,0-.17.1.6.6,0,0,0-.23.45.38.38,0,0,0,0,.1,23.13,23.13,0,0,0-2.49.63,11.41,11.41,0,0,1-2.44.49h-.31a7.71,7.71,0,0,1-1.9-.3A6.7,6.7,0,0,1,115,84.59Z"/>
+                    <path class="cls-342"
+                          d="M112.3,128.58c0-.46,0-.71,0-.78l1,0,.66,0H114v.06c0,.06,0,.16,0,.3s0,.1,0,.16C113.46,128.47,112.88,128.53,112.3,128.58Z"/>
+                    <path class="cls-342" d="M112.1,81.79l.52-.27.25-.13.63.54-.46.3-.3.2-.51-.51Z"/>
+                    <path class="cls-342"
+                          d="M113,169.76s.23-.28.79-.21a2.28,2.28,0,0,1,.74.22,3.26,3.26,0,0,1-.48.11l-.3-.11A2,2,0,0,0,113,169.76Z"/>
+                    <path class="cls-342"
+                          d="M111.54,5.08l-.3-.28,1.66.06a24.05,24.05,0,0,1,2.57,6c0,.8.06,1.67.08,2.62,0-.11-.08-.43-.14-.76A15.39,15.39,0,0,0,111.54,5.08Z"/>
+                    <path class="cls-342" d="M112.1,81.79c-.64-.67-1.28-1.33-1.82-1.92l.62-.21,1.9,1.67.07.06-.25.13Z"/>
+                    <path class="cls-342"
+                          d="M114.66,112.88a3.86,3.86,0,0,1,.5.08h.07a.49.49,0,0,1,.07-.19s.07,0,0-.06a.34.34,0,0,1-.12-.17c0-.08,0,0-.08,0a1,1,0,0,0-.23.14Zm-2.1.35a1.35,1.35,0,0,1,.91-.82,4.79,4.79,0,0,1,1.21-.06c.31,0,.54,0,.56,0a1,1,0,0,1,.26.09c.08.06.21.13.12.4s-.11.11-.16.15l-.1,0a.37.37,0,0,0-.14.07,2.75,2.75,0,0,1-1.1.51,4.21,4.21,0,0,1-1.66.12S112.44,113.53,112.56,113.23Zm-.07.5a0,0,0,0,0,0,0v0c.19-.09.87-.24,1.5-.46a2.12,2.12,0,0,0,.63-.36,6.28,6.28,0,0,0-1.07-.07c-.63.06-.94.73-1.06.89,0,0,0,0,0,0S112.48,113.72,112.49,113.73Z"/>
+                    <path class="cls-342"
+                          d="M111.43,60.62q.42,0,.84,0c.33,0,.65,0,1,0l.89,0h.08l-.09.1c-.62,0-1.25.06-1.88.11a.44.44,0,0,0-.29.14A3.78,3.78,0,0,1,111.43,60.62Z"/>
+                    <path class="cls-342"
+                          d="M110.43,84l-1.3-.52c.21-.1.54-.3,1-.53.56-.32,1.27-.71,2-1.11l.13.13.51.51Z"/>
+                    <path class="cls-342" d="M111.84,128.62c.1-.52.15-.8.2-.8s.12.28.15.77Z"/>
+                    <path class="cls-342"
+                          d="M112.47,4.16a14.42,14.42,0,0,0-1.33-1.69c-.33-.34-.47-.5-.47-.5L111,.12c.73.07,2.34.24,4.45.49l1.46.14-.17,2-2.08,0A18.06,18.06,0,0,1,115,5l-2.1-.09C112.76,4.61,112.61,4.37,112.47,4.16Z"/>
+                    <path class="cls-342"
+                          d="M110.37,138.48l.08-.47c.37-2.56.75-5.1,1-7,.15-1,.27-1.82.36-2.38l.35,0c.06,1.62-.15,5.6-.51,9.59l-.06.49v.13a2.13,2.13,0,0,1-.11.41h0l0,0h0a0,0,0,0,0,0,0h0s0,0-.05,0l-.06-.06h0s0-.05,0-.06l-.18-.15h0l0,0-.06-.08-.07-.06-.07-.06,0,0h0c-.19-.2-.27-.27-.29-.27l0,0,0,.07a.52.52,0,0,0-.06.13v0Z"/>
+                    <path class="cls-342"
+                          d="M110,3.92l-.53-.23L110.67,2s.14.16.47.5a14.42,14.42,0,0,1,1.33,1.69c.14.21.29.45.43.7l-1.66-.06A6.89,6.89,0,0,0,110,3.92Z"/>
+                    <path class="cls-342"
+                          d="M110.9,79.66l-.85-.72c.6-.17,1.23-.33,1.85-.49.44-.1.88-.21,1.31-.29a27.19,27.19,0,0,1,4.05-.66c.12,0,.2,0,.2,0s-2.68.85-5.33,1.71Z"/>
+                    <path class="cls-342"
+                          d="M115.28,86.43a28.35,28.35,0,0,1-6.09-1.68,2.81,2.81,0,0,0,.31-.18l.93-.62a25.73,25.73,0,0,0,5,1.59,16.93,16.93,0,0,0,3.43.24H119a13.57,13.57,0,0,0,3.59-.48,7,7,0,0,0,1.39-.5l0,0a16.38,16.38,0,0,1-2.39.9c-.37.14-.78.3-1.24.43,0,0,.08-.1.14-.13a.54.54,0,0,1,.16-.06h.1l-.51-.19s-.27.11-.86.42a4,4,0,0,0-1-.06c0,.09.33.25.4.36A16.42,16.42,0,0,1,115.28,86.43Z"/>
+                    <path class="cls-342"
+                          d="M110,120a2.19,2.19,0,0,1,.64-1.88,1.8,1.8,0,0,1,1.39-.55l.64.07a4.84,4.84,0,0,1,.93.24c.19.07.41.27.39.49a.81.81,0,0,1-.16.34l-.17.17a5.47,5.47,0,0,1-.75.57,2.34,2.34,0,0,1-1.37.08s.61-.14,1.22-.39a7.65,7.65,0,0,0,.59-.57,1.34,1.34,0,0,0,.11-.14s0,0,0,0,0,0-.07,0a5.27,5.27,0,0,0-.81-.13l-.61-.11a1.38,1.38,0,0,0-1.06.32A3.71,3.71,0,0,0,110,120Z"/>
+                    <path class="cls-342" d="M110.28,79.87l-.63-.68-.11-.12.51-.13.85.72Z"/>
+                    <path class="cls-342" d="M109.54,79.07a10.19,10.19,0,0,1-1-1.17c.08-.11.68.33,1.52,1Z"/>
+                    <path class="cls-342"
+                          d="M107.89,84.29l.66-.49.33-.21a1.51,1.51,0,0,1,.25-.16l1.3.52-.93.62a2.81,2.81,0,0,1-.31.18Z"/>
+                    <path class="cls-342"
+                          d="M107.11,146.85c.21-.56.51-1.34.85-2.27s.78-2,1.23-3.13l.7-1.74.37-.91.08-.15s0,0,0,0,.08.21.12.18,0-.2.11-.13h.18l0,0,.07.06.07.06.06.08,0,0h0l.18.15s0,0,0,.06h0l.06.06s0,0,.05,0h0a0,0,0,0,1,0,0h0c-.11.3-.21.6-.31.89-.2.61-.41,1.21-.61,1.78l-1.06,3.18-.76,2.28,0,.08c-.32.07-.91.16-.91.18h-.92s0-.09,0-.15,0-.07,0-.1l0-.12v-.06C107,147.12,107.06,147,107.11,146.85Z"/>
+                    <path class="cls-342"
+                          d="M106.19,123.28c.1.16,0,0,0,0Zm0,.17a.76.76,0,0,1-.18-.06s0,0,0-.09,0-.08,0-.09,0,0,.09,0a1,1,0,0,1-.1-.14c0-.08-.2-.1-.08-.11a1.09,1.09,0,0,0,.32.05,2.4,2.4,0,0,0,.82-.13s.09,0,.1,0,.08,0,0-.1a2.13,2.13,0,0,0-.49-.21c-.16,0-.26,0-.28,0s.44-.33,1-.08a.69.69,0,0,1,.38.35.44.44,0,0,1-.12.43,1.29,1.29,0,0,1-.45.22,2.63,2.63,0,0,1-.33,0A2.06,2.06,0,0,1,106.22,123.45Z"/>
+                    <path class="cls-342"
+                          d="M106.71,83.89c-1-.33-2-.63-3-.92l0,0,.79-.53.7-.43h0c.65.22,1.27.44,1.89.67l2,.78a1.51,1.51,0,0,0-.25.16l-.33.21-.66.49Z"/>
+                    <path class="cls-342"
+                          d="M106.15,87a29.79,29.79,0,0,1-3.21,2.63s0,0,0,0a16.34,16.34,0,0,1,2.65-3.22,26.36,26.36,0,0,1,2.16-2,.79.79,0,0,1,.15-.12l1.3.46c-.2.12-.48.3-.8.53C107.76,85.71,106.94,86.34,106.15,87Z"/>
+                    <path class="cls-342"
+                          d="M104.68,81.07c1-.57,1.64-.87,1.68-.9s.74-.31,1.77-.65l1.41-.45.11.12.63.68c-.65.23-1.27.46-1.77.67-1,.38-1.64.69-1.67.71s-.71.28-1.6.73c-.43-.14-.85-.29-1.29-.42C104.21,81.39,104.45,81.21,104.68,81.07Z"/>
+                    <path class="cls-342"
+                          d="M103.7,83l-1.16-.33.62-.48.76-.58,0,0c.44.13.86.28,1.29.42h0l-.7.43-.79.53Z"/>
+                    <path class="cls-342"
+                          d="M101.76,127.17c.09-.2.15-.37.21-.49.13.21.29.47.44.77C102.19,127.37,102,127.27,101.76,127.17Z"/>
+                    <path class="cls-342"
+                          d="M102.9,131.37c-.45-1.55-.92-3.07-1.19-4.07h0a.61.61,0,0,0,.05-.12c.22.1.43.2.65.28.49.9,1.1,2.19,1.66,3.5s1,2.53,1.36,3.53a16,16,0,0,1,.51,1.8,43.79,43.79,0,0,1,.24,5.6c0,2.67-.18,5.29-.46,5.34a.14.14,0,0,0,0-.1c0-.09.2-.45-.2-.36-.16-.88-.37-2.83-.6-4.82-.16-1.34-.31-2.68-.45-3.68-.07-.5-.13-.91-.19-1.2s-.09-.46-.09-.48-.09-.67-.34-1.65S103.28,132.66,102.9,131.37Z"/>
+                    <path class="cls-342"
+                          d="M101.65,127.12c-.14-.56-.21-.92-.15-1s.25.16.47.51c-.06.12-.12.29-.21.49Z"/>
+                    <path class="cls-342"
+                          d="M100.65.39c1.48-.18,2.88-.28,4.13-.33,1.68-.08,3.09-.07,4.11,0l1.65.05.42,0L110.67,2l-1.18,1.72.53.23a6.89,6.89,0,0,1,1.22.88l-1,0-1.6-.15c-.93-.08-2.25-.19-3.82-.23-.54,0-1.11,0-1.7,0-.18-.51-.34-1-.52-1.36a6.54,6.54,0,0,0-.32-.65,2.76,2.76,0,0,0-.53-.63l-.6-.52-.44-.41Z"/>
+                    <path class="cls-342"
+                          d="M100.86,3.09h0ZM100,2.74l-.51-.25L100.69.77l.44.41.6.52a2.76,2.76,0,0,1,.53.63,6.54,6.54,0,0,1,.32.65c.18.4.34.85.52,1.36-.47,0-1,0-1.47,0-.14-.28-.3-.54-.43-.75l-.32-.4s0,0-.06,0,0,0,0,0h0l-.1-.06Z"/>
+                    <path class="cls-342" d="M100.87,3.08h0Z"/>
+                    <path class="cls-342"
+                          d="M99.91,153.73c-.18-.27,1.26-1.63,1.41-1.26a7,7,0,0,0-.51.66c-.33.39-.33.64-.32.66a.82.82,0,0,0,0,.22,1.3,1.3,0,0,0,.15.51c.08.16.18.31.26.44s-.08,0-.4,0a2.18,2.18,0,0,1-.21-.22A1.49,1.49,0,0,1,99.91,153.73Z"/>
+                    <path class="cls-342"
+                          d="M101.65,127.12c-.66-.31-1.31-.64-1.94-1,.15-.38.21-.58.21-.58l2.19.79-.12.33,0,0c-.22-.35-.39-.55-.47-.51S101.51,126.56,101.65,127.12Z"/>
+                    <path class="cls-342"
+                          d="M99.6,111.48c0,.07.06.11,0,.12s-.08,0-.17-.1,0-.13,0-.15a.31.31,0,0,1,.12,0l.26,0c.36,0,.83-.07,1.29-.15a4.81,4.81,0,0,1,1.38-.11,1.69,1.69,0,0,1,.54.12.63.63,0,0,1,.29.16.49.49,0,0,1,.13.27.44.44,0,0,1-.1.3,1,1,0,0,1-.31.26c-.15.1-.29.23-.48.38a1.63,1.63,0,0,1-.75.34,1.46,1.46,0,0,1-.77-.19l-.56-.26c-.32-.16-.53-.28-.51-.32a1.52,1.52,0,0,1,.6.11l.59.16a1.24,1.24,0,0,0,.6.1c.33-.08.65-.51,1-.74.11-.09,0,0,0-.07h0l-.33-.08a5.81,5.81,0,0,0-1.27,0,8.14,8.14,0,0,1-1.33,0A1.55,1.55,0,0,0,99.6,111.48Z"/>
+                    <path class="cls-342"
+                          d="M99,150.38a5.66,5.66,0,0,1,1.4-.6c1.37-.81,2.14-1.37,3.61-2.32l1-.51a2.22,2.22,0,0,1,.5-.18c.06.3.12.46.17.46a21.48,21.48,0,0,1-3.11,2.05s-3.43,1.4-3.58,1.11Z"/>
+                    <path class="cls-342"
+                          d="M99,169.76s.28,0,.67.26l.13.1-.3-.05a1.39,1.39,0,0,0-.19-.06C99.09,169.87,99,169.8,99,169.76Z"/>
+                    <path class="cls-342"
+                          d="M98.37,152.84a3.15,3.15,0,0,0-.41.72l-.11.22a1.8,1.8,0,0,0-.14.51.86.86,0,0,0,0,.28h0c-.05,0-.12,0-.16,0l-.22-.28a1.7,1.7,0,0,1,.14-.93,1.54,1.54,0,0,1,.18-.27,2.08,2.08,0,0,1,.46-.49c.37-.31.85-.44.87-.36S98.62,152.51,98.37,152.84Z"/>
+                    <path class="cls-342"
+                          d="M97.22,87a32.75,32.75,0,0,1,4.31-3.61l1-.79,1.16.33L102,84.1A36.15,36.15,0,0,1,97.22,87Z"/>
+                    <path class="cls-342"
+                          d="M96.69,122.72l.27-.45a.35.35,0,0,0,.32.06c.13.11.28.22.41.34h0a.74.74,0,0,1-.5.18A1.09,1.09,0,0,1,96.69,122.72Z"/>
+                    <path class="cls-342"
+                          d="M96.89,155.34c-.33-.52-.66-1-1-1.52l0-.41c0-.07,0-.21,0-.29s.06-.38.1-.55a4.69,4.69,0,0,1,.32-1,2.43,2.43,0,0,1,1.22-1.28,2.72,2.72,0,0,1,1.43.07h0a1.66,1.66,0,0,0-1.23.33,1.85,1.85,0,0,0-.8,1.12,4.34,4.34,0,0,0-.19.86c0,.16,0,.33,0,.48a1.93,1.93,0,0,0,0,.23v.15l.52.68a.25.25,0,0,0,0,.08c.08.54.49.86.54.8s-.07-.28-.12-.55l.33.05.8.12,1.63.22c.26.25.53.39.57.34s-.06-.16-.17-.34h0l0,0,.15-.14.32-.28,2.48-2.11c.72-.6,1.39-1.17,2-1.66.53-1.69.88-2.83.9-2.9a1.43,1.43,0,0,0,.08-.24l0-.06c0,.06,0,.1,0,.15h1.54l.21,0v.07h0v0h0l0,.14,0,.07c0,.18-.09.29-.1.32s-.12.36-.32.91-.52,1.43-.87,2.42c-1.4,1-3.17,2.42-5,3.82l-.77.6a.46.46,0,0,1-.15.09h0l-.14.05h-.14l-.23,0a3.19,3.19,0,0,1-.52-.08c-.57-.1-1.11-.21-1.65-.33l-.8-.17-.42-.1-.3-.06C97.05,155.46,96.93,155.46,96.89,155.34Z"/>
+                    <path class="cls-342"
+                          d="M96.42,183.49l-1.23-.24a19.22,19.22,0,0,1,1.6-1.95,15.19,15.19,0,0,0,3-4.4,9.19,9.19,0,0,0,.5-5.22A3.07,3.07,0,0,0,99.26,170a1.39,1.39,0,0,1,.19.06l.3.05a3.18,3.18,0,0,1,1,1.41,9.2,9.2,0,0,1-.15,5.64,15.79,15.79,0,0,1-3,4.84c-.49.59-.89,1.07-1.14,1.43Z"/>
+                    <path class="cls-342"
+                          d="M91.18,77c1.56-.55,3.1-1,4.34-1.32,1.41-.37,2.41-.51,2.46-.53s1-.15,2.51-.25a34.31,34.31,0,0,1,5.28.12,31.23,31.23,0,0,1,4,.66l1.12.28a7,7,0,0,1,2.2.86s0,0,0,0c-.21,0-1-.21-2.26-.42a39,39,0,0,0-5.08-.56,38.07,38.07,0,0,0-5.14.12c-1.41.16-2.36.32-2.41.34s-1,.11-2.4.42c-1,.2-2.14.49-3.38.83Z"/>
+                    <path class="cls-342"
+                          d="M95.71,120.89c.32-.22.38-.39.38-.44l-.1-.34.36,0c.5,0,1.31,0,1.49,0a.31.31,0,0,1,.33.21,2.79,2.79,0,0,1-.47,2.31h0c-.13-.12-.28-.23-.41-.34l.07,0a2.31,2.31,0,0,0,.36-1.61c-.3,0-.83,0-1.14,0a1.27,1.27,0,0,1-.48.58C96,121.14,95.83,121,95.71,120.89Z"/>
+                    <path class="cls-342" d="M96.09,121.25l-.15.12-.3-.44.07,0C95.83,121,96,121.14,96.09,121.25Z"/>
+                    <path class="cls-342"
+                          d="M95.09,183.39a.5.5,0,0,1,.1-.14l1.23.24c-.21.31-.33.5-.33.51s-.36.09-.64-.05S95,183.55,95.09,183.39Z"/>
+                    <path class="cls-342"
+                          d="M94.17,54.59c0-.21,0-.34.09-.52s.15-.65.23-1a17.85,17.85,0,0,1,.68-1.85A20.47,20.47,0,0,1,99.74,45a22.33,22.33,0,0,1,3-2.43,12,12,0,0,1,3.46-1.7,8.6,8.6,0,0,1,3.77-.18,13.25,13.25,0,0,1,3.33,1.06,17.94,17.94,0,0,1,2.88,1.56,9.34,9.34,0,0,1,2.06,2.29,18.3,18.3,0,0,1,2,4.48,30.55,30.55,0,0,1,1.06,4.49c.17,1,0,3.18-.32,3.46,0,0,0-1.33,0-1.35a28.12,28.12,0,0,0-.85-3.15l0-.38c0-.07,0-.16-.07-.26-.77-2-.94-2.38-1.53-3.69-.1-.19-.57-1.15-.71-1.41a9.34,9.34,0,0,0-3-3.78l-.52-.31h-.51l-1.17-.58a8.77,8.77,0,0,0-6.12-.88,15,15,0,0,0-5.9,3.71,18.9,18.9,0,0,0-4.4,5.83,13.43,13.43,0,0,0-.66,1.69c-.08.3-.16.58-.23.87l-.08.41,0,.17.49.39c.25.19.48.39.73.57L98,56.89l0,0a16.54,16.54,0,0,0,4.3,1.93A38.35,38.35,0,0,0,106.69,60a26.28,26.28,0,0,0,4.74.64,3.78,3.78,0,0,0,.53.28.44.44,0,0,1,.29-.14c.63,0,1.26-.09,1.88-.11l.09-.1h.23a.07.07,0,0,0,.06,0l.25,0a3.83,3.83,0,0,0,1.58,0,2.67,2.67,0,0,0,.43-.32,8.12,8.12,0,0,0,1.15-.27l.31-.29c.41-.17.79-.36,1.1-.52A16.91,16.91,0,0,0,121,58a4.31,4.31,0,0,1-1.51,1.28,13.45,13.45,0,0,1-5,1.81,22.79,22.79,0,0,1-7.88-.32,38.27,38.27,0,0,1-4.51-1,16.81,16.81,0,0,1-4.65-2h0l-1.53-1c-.26-.18-.51-.39-.76-.57l-.37-.28c-.21-.16-.41-.32-.59-.48C94.12,55.1,94.15,54.84,94.17,54.59Z"/>
+                    <path class="cls-342"
+                          d="M94,84a9.47,9.47,0,0,0-.85-1.49l.94-1.83a1.74,1.74,0,0,1,.37.34,1.81,1.81,0,0,1,.29.61c0,.17.11.34.16.55Z"/>
+                    <path class="cls-342"
+                          d="M93.89,121.49a1.41,1.41,0,0,0,.21-1.08,16.63,16.63,0,0,1-.83-2.51l.24-.12a12.13,12.13,0,0,0,2,2.87,2.72,2.72,0,0,0,.24.24l-.07,0,.3.44.15-.12c.38.38.78.73,1.19,1.08a.35.35,0,0,1-.32-.06l-.27.45a1.09,1.09,0,0,0,.5.14.74.74,0,0,0,.5-.18l1.08.83a18,18,0,0,0,7.76,3.56,26.16,26.16,0,0,0,4.26.21,28.48,28.48,0,0,0,4.18-.38c2.68-.48,5.25-1.42,6.74-3.39a48,48,0,0,0,4.27-5.82,27.2,27.2,0,0,0,4-10c.41-2.58.23-4.1.36-4.1a4.07,4.07,0,0,1,.16,1.07c0,.15,0,.29,0,.46a6,6,0,0,1,0,.85,12.75,12.75,0,0,1-.09,1.78c0,.34-.08.71-.14,1.09-.16,0-.26,0-.26,0s.08.07.23.09a27.57,27.57,0,0,1-3.47,9.16q-.84,1.48-1.89,3c.15-.6.2-1,.1-1s-1.19,1.74-2.18,3.55c-.18.32-.34.63-.51.93l0,0a8.84,8.84,0,0,1-2.94,2.25,16.59,16.59,0,0,1-4.11,1.32c-.38.07-.78.14-1.17.19,0-.06,0-.11,0-.16s0-.24,0-.3v-.06h-.08l-.66,0-1,0c0,.07,0,.32,0,.78h-.11c0-.49-.08-.76-.15-.77s-.1.28-.2.8c-.33,0-.67,0-1,.06a25.71,25.71,0,0,1-4.53-.14,16.43,16.43,0,0,1-3.89-1.09c-.15-.3-.31-.56-.44-.77l0,0,.12-.33-2.19-.79s-.06.2-.21.58c-.66-.4-1.29-.81-1.91-1.26a31.67,31.67,0,0,1-3.57-3C94.11,121.74,94,121.62,93.89,121.49Z"/>
+                    <path class="cls-342" d="M93.42,80c.12-.26.2-.41.2-.41l2.1,1-.13.25c-.49-.17-.83-.32-1.26-.49Z"/>
+                    <path class="cls-342"
+                          d="M92.29,125.14a2.79,2.79,0,0,1-.52-.56,1.38,1.38,0,0,1-.09-.21s0,0,0,0a13.39,13.39,0,0,0,1.67-1.89c0,.07,0,.14,0,.21a1.15,1.15,0,0,0,.43.79.72.72,0,0,0,.06.24c.12.21.31.51.5.81.36.61.8,1.14.7,1.44s-1,.22-1.78-.18A6.15,6.15,0,0,1,92.29,125.14Z"/>
+                    <path class="cls-342"
+                          d="M92.39,119.44c.72-1.2.79-1.73.88-1.54a16.63,16.63,0,0,0,.83,2.51,1.41,1.41,0,0,1-.21,1.08A12.81,12.81,0,0,1,92.39,119.44Z"/>
+                    <path class="cls-342"
+                          d="M97.45,7.76a21.06,21.06,0,0,0-4.57-1.49c-.35-.07-.68-.12-1-.16l.5-.22.72-.28.65-.23.2-.06A32,32,0,0,1,97.64,7a25,25,0,0,1,2.88,1.82L102.08,10l.81.61.62.5c.13.1.25.21.28.22a10.36,10.36,0,0,1,1,.95c.19.28,0-.08,0-.23s-.11-.33-.16-.46c-.1-.28-.18-.49-.21-.55-.41-1.15-1.15-3.13-1.71-4.39a20.43,20.43,0,0,0-1.09-2.27c.51,0,1,0,1.47,0,.21.59.41,1.26.65,2l1.7,5.64a1.7,1.7,0,0,0,0,.53,4,4,0,0,0,0,.47c0,.14.12.48-.06.2a4.34,4.34,0,0,0-1.31-.93l-.46-.4c-.35-.3-.69-.57-1-.82l-.81-.61c-.52-.38-1-.73-1.53-1.07A19.88,19.88,0,0,0,97.45,7.76Z"/>
+                    <path class="cls-342"
+                          d="M91.93,79.33l-2.26-1c.35-.13.72-.24,1.09-.35.54-.16,1.09-.32,1.63-.46l.27.12L95,78.74l1.14.49c.34.12.79.24,1.2.36,2.22.63,4.46,1.27,6.6,2l0,0-.76.58-.62.48c-1.83-.5-3.71-1-5.62-1.46-.43-.1-.83-.19-1.32-.35h0l.13-.25-2.1-1s-.08.15-.2.41Z"/>
+                    <path class="cls-342"
+                          d="M92.62,115.07a2.28,2.28,0,0,1-.38-.19l-.27-.75.11.07a2.44,2.44,0,0,0,.74.33,1,1,0,0,1,.32.19.91.91,0,0,1,.3.74A.66.66,0,0,1,93,116a.58.58,0,0,1-.25,0,.13.13,0,0,1,0-.08c.1-.09.42-.27.35-.51a.41.41,0,0,0-.22-.29A.74.74,0,0,0,92.62,115.07Z"/>
+                    <path class="cls-342"
+                          d="M91.57,123.84a2.73,2.73,0,0,1,.18-1.43c.34-.91,1.08-1.48,1.34-1.26s.16.75.25,1.29a13.39,13.39,0,0,1-1.67,1.89A2.32,2.32,0,0,1,91.57,123.84Z"/>
+                    <path class="cls-342"
+                          d="M90.8,91.23c.18-.56.36-1.11.56-1.61a5.27,5.27,0,0,0,1.28.7,8.19,8.19,0,0,0,3.19.35l1.08-.07.91-.08c.31,0,.63-.08,1-.14l.52-.09c.17,0,0,0-.09-.06L99,90.14l-.16-.08a5,5,0,0,1-.92-.5,2.66,2.66,0,0,1-.38-.28,5.06,5.06,0,0,1-.49-.41A8.11,8.11,0,0,1,95.58,87c-.69-1.22-1.13-2.24-1.53-3,0,0,0,0,0,0l.91-1.82c.09.36.18.8.31,1.33a20.55,20.55,0,0,0,1,3.09,7.46,7.46,0,0,0,.4.8,6.19,6.19,0,0,0,.75,1c.15.13.28.29.44.41a4.55,4.55,0,0,0,.66.5,7.11,7.11,0,0,0,1.43.76,3.24,3.24,0,0,0,.31.13s.28.15.29.19.22.07.27.1.21.06,0,.09l-.84.17L98.34,91l-1.45.25-1.1.15a12.24,12.24,0,0,1-3.55.14A8.54,8.54,0,0,1,90.8,91.23Z"/>
+                    <path class="cls-342"
+                          d="M92,114.13l.27.75a1.34,1.34,0,0,1-.43-.36c-.16-.17-.28-.34-.39-.43s-.2-.09-.22-.14.12-.12.32-.06A1.78,1.78,0,0,1,92,114.13Z"/>
+                    <path class="cls-342"
+                          d="M90.8,91.23a5.13,5.13,0,0,1-1.31-.61l1.44-1.49a1.77,1.77,0,0,0,.43.49C91.16,90.12,91,90.67,90.8,91.23Z"/>
+                    <path class="cls-342"
+                          d="M88.71,77.94c.57-.25,1.17-.48,1.79-.7l.67-.24h0l1.21.56c-.54.14-1.09.3-1.63.46-.37.11-.74.22-1.09.35Z"/>
+                    <path class="cls-342"
+                          d="M89.66,124.78l-.79-.87-.06,0,.31-.33c.53-.51.85-.8.91-.87a23.06,23.06,0,0,0,2.36-3.23,12.81,12.81,0,0,0,1.5,2,6.65,6.65,0,0,1-.55,1c-.09-.54,0-1.14-.25-1.29s-1,.35-1.34,1.26a2.73,2.73,0,0,0-.18,1.43,2.32,2.32,0,0,0,.1.49l0,0-1.15,1.09a3.34,3.34,0,0,1-.64-.46A2.23,2.23,0,0,1,89.66,124.78Z"/>
+                    <path class="cls-342"
+                          d="M90.43,4.12l-.84-.24,0,0c.47-.28.95-.55,1.43-.81l.74-.38.81-.39A27.68,27.68,0,0,1,99.09.59c.53-.08,1-.15,1.56-.2l0,.38L99.51,2.49l.51.25.67.35.1.06h0s0,0,0,0,0,0,.06,0l.32.4c.13.21.29.47.43.75-.68,0-1.39,0-2.12.08A27.94,27.94,0,0,0,94,5.32c-.31-.13-.6-.23-.88-.33C91.88,4.56,91,4.29,90.43,4.12Z"/>
+                    <path class="cls-342"
+                          d="M89.73,103.24h.19A19.67,19.67,0,0,0,92.1,103a12.53,12.53,0,0,0,3.66-1.15,30.47,30.47,0,0,0,4.39-3l1-.8-.05-.06-.61.13-1,.25c-.4,0-.75.1-1.13.13l-1.45.11a22.78,22.78,0,0,1-2.59,0,13,13,0,0,1-3.8-.75c-.33-.12-.64-.25-.91-.37,0-.64.11-1.29.21-1.9a6.16,6.16,0,0,0,1.21.93,9.33,9.33,0,0,0,3.28,1.16,15.59,15.59,0,0,0,2.5.17l1.45,0c.61,0,1.36-.09,2.06-.16a12.83,12.83,0,0,0,1.7-.12l0,0c-.43.44-1,1-1,1-.55.47-.84.86-1.39,1.29s-.91.73-1.32,1.06a24.53,24.53,0,0,1-2.28,1.62,18.34,18.34,0,0,1-3.74,1.7c-1,.34-1.7.55-2.15.69l-.23.07C89.86,104.51,89.78,103.87,89.73,103.24Z"/>
+                    <path class="cls-342"
+                          d="M88.3,127.52l2.19-2.07.06,0,0,0-.09.13a2.41,2.41,0,0,0-.28.54,1.3,1.3,0,0,0,.23,1.46c.1.12.27.26.44.42s.36.28.52.42c.34.27.66.51.94.7.57.41,1,.63,1,.77s-.58.24-1.32.07a8.05,8.05,0,0,1-1.23-.41l-.67-.3a4.17,4.17,0,0,1-.7-.41A3.07,3.07,0,0,1,88.3,127.52Z"/>
+                    <path class="cls-342"
+                          d="M89.35,5.94l.21-2,0,0,.84.24c.58.17,1.45.44,2.66.87.28.1.57.2.88.33l-.2.06-.65.23-.72.28-.5.22a12.67,12.67,0,0,0-1.72-.17,4.8,4.8,0,0,0-.64,0Z"/>
+                    <path class="cls-342"
+                          d="M89.06,89.47c.11-.33.23-.66.35-1,.64-.29,1.08-.41,1.12-.32S90,88.76,89.06,89.47Z"/>
+                    <path class="cls-342"
+                          d="M89.61,97.59a7.45,7.45,0,0,1-1.83-1.13l1.6-1.34a1.86,1.86,0,0,0,.44.57C89.72,96.3,89.66,97,89.61,97.59Z"/>
+                    <path class="cls-342"
+                          d="M90,105.16l-.47.13-.23-2.07.16,0h.32C89.78,103.87,89.86,104.51,90,105.16Z"/>
+                    <path class="cls-342"
+                          d="M88.46,108.29c-.08-.47-.18-.93-.26-1.38a.27.27,0,0,0,0-.13s0,0,0-.07a2.11,2.11,0,0,0,.25-.14l.06,0h0l.1,0h0l0,0,.06,0,0,0,.08,0,.24-.11a0,0,0,0,1,0,0l.2-.1v0l0,.08,0,.11a1.75,1.75,0,0,1,0,.4,1.54,1.54,0,0,1-.18.8A1.89,1.89,0,0,1,88.46,108.29Z"/>
+                    <path class="cls-342"
+                          d="M91.57,117.94a37.92,37.92,0,0,1-2.85-8.45c-.09-.4-.18-.81-.26-1.2a1.89,1.89,0,0,0,.84-.76,1.54,1.54,0,0,0,.18-.8,1.75,1.75,0,0,0,0-.4l0-.11,0-.08v0h0s0,0,0,.06v-.09s0,0,0,0h0l-.07-.88c0-.67-.09-1.32-.13-2h.07l.23,2.07.47-.13c.17,1.29.4,2.6.67,3.92a44.93,44.93,0,0,0,1.35,5,1.78,1.78,0,0,0-.45-.24c-.2-.06-.34,0-.32.06s.12,0,.22.14.23.26.39.43a1.34,1.34,0,0,0,.43.36c.13.36.27.72.43,1.07,0,0,0,0,0,0a.09.09,0,0,0,.06,0c.15.38.31.75.49,1.12l.32.63-.24.12c-.09-.19-.16.34-.88,1.54C92.09,118.94,91.82,118.45,91.57,117.94Z"/>
+                    <path class="cls-342"
+                          d="M88.23,127.31a3.35,3.35,0,0,1-.09-1.7,5.21,5.21,0,0,1,.33-1.08c.06-.13.11-.22.15-.29l0,0,.07-.1a.94.94,0,0,1,.15-.18l.79.87a2.23,2.23,0,0,0,.19.21,3.34,3.34,0,0,0,.64.46l-2.19,2.07A1.29,1.29,0,0,1,88.23,127.31Z"/>
+                    <path class="cls-342" d="M87.71,95.24c.06-.5.15-1,.23-1.48,0-.28.1-.56.17-.84h0l.16-.1,1,1.44Z"/>
+                    <path class="cls-342"
+                          d="M87.52,97.28c0-.7.11-1.37.19-2l1.56-1-1-1.44-.16.1a28.07,28.07,0,0,1,1-3.44c.91-.71,1.52-1.19,1.47-1.29s-.48,0-1.12.32c.11-.3.23-.59.35-.87.79-1.78,1.49-3.13,2.06-4.35L93.42,80l.91.38c.43.17.77.32,1.26.49l-.65,1.32c0-.21-.11-.38-.16-.55a1.81,1.81,0,0,0-.29-.61,1.74,1.74,0,0,0-.37-.34l-.94,1.83A9.47,9.47,0,0,1,94,84l-.15.32c-.56,1.17-1.34,2.65-2.07,4.22-.16.36-.31.72-.45,1.11a1.77,1.77,0,0,1-.43-.49l-1.44,1.49a5.13,5.13,0,0,0,1.31.61,27.83,27.83,0,0,0-.74,2.93c-.09.5-.18,1-.24,1.53a1.86,1.86,0,0,1-.44-.57l-1.6,1.34a7.45,7.45,0,0,0,1.83,1.13,28.3,28.3,0,0,0,0,3.58c0,.67.1,1.37.17,2.07h-.32l-.16,0h-.07v0c-.1-1.39-.18-2.74-.26-4l-.42-.52-.25-.34c-.15-.22-.32-.45-.48-.66Z"/>
+                    <path class="cls-342"
+                          d="M87.47,100a22.76,22.76,0,0,1,0-2.75l.25.37c.16.21.33.44.48.66l.25.34.42.52c.08,1.28.16,2.63.26,4v0c0,.65.09,1.3.13,2l.07.88h0l0,0-.2.11a0,0,0,0,0,0,0l-.24.11-.08,0,0,0-.06,0,0,0h0l-.1,0h0l-.06,0-.25.09h0a2.05,2.05,0,0,1-.07-.31,0,0,0,0,1,0,0l-.13-1c0-.16,0-.34,0-.51,0-.49-.1-1-.16-1.48C87.68,102.17,87.57,101.07,87.47,100Z"/>
+                    <path class="cls-342"
+                          d="M87.33,142.59a1.46,1.46,0,0,1,.45-.07s-.22.16-.62.29A1.18,1.18,0,0,1,87.33,142.59Z"/>
+                    <path class="cls-342"
+                          d="M85.85,179.76c-.44-.25-.85-.51-1.27-.79a2.29,2.29,0,0,1,.28-.09c.45-.13,1.07-.32,1.8-.58a17.25,17.25,0,0,0,5-2.58A6.52,6.52,0,0,0,94,171a13.88,13.88,0,0,0-.06-2.48l.1,0a6.6,6.6,0,0,1,.41,2.47A7.49,7.49,0,0,1,94,173.7a6.54,6.54,0,0,1-1.83,2.65,17.58,17.58,0,0,1-5.12,3Z"/>
+                    <path class="cls-342" d="M86.89,103.56a.74.74,0,0,0-.17-.12s0,0,0,0,.08,0,.14.07h0v.07Z"/>
+                    <path class="cls-342"
+                          d="M86.89,103.57v.05s0,0,0,0l.07,0a0,0,0,0,1,0,0l.18.17a.26.26,0,0,1-.16.09c-.29-.06-.23-.16-.28-.22a.37.37,0,0,1,0-.15.28.28,0,0,1,0-.13.74.74,0,0,1,.17.12Z"/>
+                    <path class="cls-342"
+                          d="M85.15,96.41A1.67,1.67,0,0,1,85,95.2c.11-.36.53-.56.86-.8l.47-.31,1.74-1.17c-.07.28-.12.56-.17.84-.08.48-.17,1-.23,1.48l-.49.31c-.15.1-.31.2-.49.3h0s0,0,0,0l.1.21.15.28c.17.29.36.59.56.9a22.76,22.76,0,0,0,0,2.75l0-.27,0,0-.12-.14L87,99.25c-.18-.24-.36-.46-.52-.68a14.53,14.53,0,0,1-.94-1.37l-.2-.34C85.3,96.72,85.26,96.65,85.15,96.41Z"/>
+                    <path class="cls-342"
+                          d="M86.18,132.51A5.63,5.63,0,0,1,84.67,131c.56-.55,1.1-1.06,1.61-1.55,0,.07,0,.13,0,.19a4.67,4.67,0,0,0,.94,1.64c1,1.15,2.49,1.91,2.37,2.23S87.77,133.6,86.18,132.51Z"/>
+                    <path class="cls-342"
+                          d="M89.67,78.37A29.31,29.31,0,0,0,86,79.8,14.23,14.23,0,0,0,84,81c-.09-.08.54-.85,1.78-1.57a22.66,22.66,0,0,1,3-1.47Z"/>
+                    <path class="cls-342"
+                          d="M86.17,146c-1.55,2.25-2,4.08-2.17,4a6.41,6.41,0,0,1,.68-3,1.72,1.72,0,0,0,.54-.28s-.17,0-.46.09a13.19,13.19,0,0,1,.63-1.34,17.91,17.91,0,0,1,1.77-2.68c.4-.13.62-.24.62-.29a1.46,1.46,0,0,0-.45.07c1.32-1.7,3-3.45,4.54-5.16,1.26-1.36,2.39-2.77,3.45-4.15a42.92,42.92,0,0,0,2.68-3.8,22.54,22.54,0,0,0,1.49-2.84l.22-.53c.63.37,1.28.7,1.94,1a1.77,1.77,0,0,0,.06.17h0c0,.09-.09.18-.13.27a22.78,22.78,0,0,1-1.77,3.07,43.16,43.16,0,0,1-3,3.87c-1.13,1.33-2.41,2.76-3.76,4.06C90.36,141.17,87.68,143.68,86.17,146Z"/>
+                    <path class="cls-342"
+                          d="M85.22,146.74a1.72,1.72,0,0,1-.54.28,1.08,1.08,0,0,1,.08-.19C85.05,146.76,85.21,146.71,85.22,146.74Z"/>
+                    <path class="cls-342"
+                          d="M84.37,130.39a8.38,8.38,0,0,1-.38-.79l.12,0,.3-.15.22-.12,1.38-.75a1.84,1.84,0,0,1,.15.46c0,.13.08.28.12.44-.51.49-1,1-1.61,1.55a.15.15,0,0,1,0-.07l0,0A5.3,5.3,0,0,1,84.37,130.39Z"/>
+                    <path class="cls-342" d="M84.44,159.34a2,2,0,0,1,.31-.59,2.56,2.56,0,0,1-.21.78Z"/>
+                    <path class="cls-342"
+                          d="M84.37,103.59s.1-.11.24-.25a3.93,3.93,0,0,1,.41-.14.33.33,0,0,1,0,.06C84.62,103.6,84.4,103.6,84.37,103.59Z"/>
+                    <path class="cls-342"
+                          d="M84,179.75a.3.3,0,0,1,0-.43c0-.13.08-.21.16-.23l.45-.12h0c.42.28.83.54,1.27.79l-.65.21-.74.24a.25.25,0,0,1-.24-.11C84.24,180,84.12,179.85,84,179.75Z"/>
+                    <path class="cls-342"
+                          d="M83.89,129.45c1.63-1.87,3.26-3.76,4.92-5.58l.06,0a.94.94,0,0,0-.15.18l-.07.1,0,0c0,.07-.09.16-.15.29a5.21,5.21,0,0,0-.33,1.08,3.35,3.35,0,0,0,.09,1.7,1.29,1.29,0,0,0,.07.21l-.74.71-1.28,1.2c0-.16-.08-.31-.12-.44a1.84,1.84,0,0,0-.15-.46l-1.38.75-.22.12-.3.15-.12,0,0-.09h0Z"/>
+                    <path class="cls-342"
+                          d="M83.53,104.64a.75.75,0,0,1,0-.6,1.86,1.86,0,0,1,1-.67l.08,0c-.14.14-.27.22-.24.25s.25,0,.62-.33a.33.33,0,0,0,0-.06,2.41,2.41,0,0,1,.72-.12,1.82,1.82,0,0,1,1,.36.28.28,0,0,0,0,.13.37.37,0,0,0,0,.15c0,.06,0,.16.28.22a.26.26,0,0,0,.16-.09,2.94,2.94,0,0,1,.44.42.87.87,0,0,1,.2.41.49.49,0,0,1,0,.12.56.56,0,0,1,0,.2c-.06.18-.13.25-.14.25s.21-.45-.22-.83c-.2-.19-.49-.37-.78-.59a1.47,1.47,0,0,0-.94-.34,2.89,2.89,0,0,0-1,.32c-.32.15-.63.32-.68.46s0,.25.13.37a1.11,1.11,0,0,0,.16.15s0,.17-.09.31-.22.19-.27.15a1.89,1.89,0,0,1-.24-.25A1,1,0,0,1,83.53,104.64Z"/>
+                    <path class="cls-342"
+                          d="M84.27,159a11.06,11.06,0,0,1-.91-3.46.41.41,0,0,1,0-.16c.22-.13.32-.22.3-.25a1.79,1.79,0,0,0-.31.12,9.21,9.21,0,0,1,.66-4.7h0a26.19,26.19,0,0,0,.18,4.87,11,11,0,0,0,1.07,3.12c.42.76.8,1.31.82,1.34l.83,1.39c.5.8,1.17,1.84,1.91,2.82a17,17,0,0,0,2.24,2.48c.67.6,1.22.93,1.17,1s0,0,0,0a4.21,4.21,0,0,1-1.4-.65,13.86,13.86,0,0,1-2.61-2.33A30,30,0,0,1,86,161.85c-.56-.78-.92-1.33-.94-1.36s-.23-.37-.53-1a2.56,2.56,0,0,0,.21-.78,2,2,0,0,0-.31.59C84.38,159.23,84.33,159.12,84.27,159Z"/>
+                    <path class="cls-342"
+                          d="M84,129.6a8.38,8.38,0,0,0,.38.79,5.3,5.3,0,0,0,.3.48l0,0c-.1-.14-.17-.27-.25-.4-.18-.34-.31-.63-.38-.79l0-.1h0Z"/>
+                    <path class="cls-342" d="M83.94,129.6l-.12-.09.06-.06h0l0,0h0l0,.09h0Z"/>
+                    <path class="cls-342"
+                          d="M83.33,155.24a1.79,1.79,0,0,1,.31-.12s-.08.12-.3.25A.3.3,0,0,1,83.33,155.24Z"/>
+                    <path class="cls-342"
+                          d="M82.46,97a6.33,6.33,0,0,1-.79-1.26,4.83,4.83,0,0,1-.23-.61,1.88,1.88,0,0,1-.07-.46,1.43,1.43,0,0,1,.44-1.19l.26-.24.22-.19c.16-.13.34-.27.51-.42.38-.3.78-.61,1.22-.92.88-.64,1.87-1.29,2.81-1.86a20.63,20.63,0,0,1,2.58-1.38c-.12.31-.24.64-.35,1-.48.36-1,.8-1.62,1.28-.84.67-1.72,1.41-2.51,2.11l-1.08,1-.44.43-.2.2c0,.06-.15.15-.11.14s0,0,0,.1,0,.12.11.37a4.36,4.36,0,0,0,.48.93c.45.7,1.64,1.51,2.55,2.72a5.55,5.55,0,0,1,.93,2,7.84,7.84,0,0,1,.19,1.81c0,.26,0,.5,0,.73s0,.2,0,.31a.4.4,0,0,1-.06.16.31.31,0,0,1,0,.1h0l-.18-.17h0s0,0,0-.06h0l-.07,0-.09-.08a1.77,1.77,0,0,0,0-.21c0-.2-.08-.42-.14-.67a5.85,5.85,0,0,0-1.4-3.09C84.49,98.62,83.28,98,82.46,97Z"/>
+                    <path class="cls-342"
+                          d="M82.69,136.13a5.23,5.23,0,0,1-1.55-1.42c.55-.62,1.09-1.21,1.61-1.76,0,.12.09.31.17.55a4.11,4.11,0,0,0,.78,1.32,5.8,5.8,0,0,0,1.31,1c.4.24.68.29.76.43s-.32.47-1,.45A4.35,4.35,0,0,1,82.69,136.13Z"/>
+                    <path class="cls-342"
+                          d="M82.19,9.84l.51-.56A27.7,27.7,0,0,1,87,5.6c.81-.59,1.69-1.16,2.6-1.7l-.21,2h.19a4.8,4.8,0,0,1,.64,0,12.67,12.67,0,0,1,1.72.17L91,6.49c-.93.42-1.81.87-2.66,1.32a37.15,37.15,0,0,0-4.43,2.82L83.5,11a1.44,1.44,0,0,0-.37.15,5.94,5.94,0,0,0-.82.6A3,3,0,0,0,82.19,9.84Z"/>
+                    <path class="cls-342"
+                          d="M81.56,104.46a12.39,12.39,0,0,1,.7-1.52,3.06,3.06,0,0,1,.53-.64c.22-.2.36-.28.59-.49a3.72,3.72,0,0,1,.63-.49c.2-.09.44-.2.62,0,.3.3.26.77.37,1.12,0,.18.06.29.08.44a.53.53,0,0,1-.06.37,3.93,3.93,0,0,0-.41.14,2,2,0,0,0,.18-.21c.08-.11,0-.34-.12-.6s-.09-.48-.26-.69-.29,0-.39.14-.22.22-.32.33-.33.3-.47.45a2.1,2.1,0,0,0-.37.52,13.73,13.73,0,0,0-.57,1.45c-.07.25-.19.56-.23.79a.9.9,0,0,0,0,.63,1.87,1.87,0,0,0,1.14.84,7.1,7.1,0,0,0,1.79.35,13.64,13.64,0,0,0,1.92,0c.58,0,1.23-.21,1.26-.43a.07.07,0,0,0,0,0c.08.45.18.91.26,1.38a2.67,2.67,0,0,1-.33.12,4.42,4.42,0,0,1-1.17.15,14.48,14.48,0,0,1-2.09-.15,8.38,8.38,0,0,1-2-.5,2.71,2.71,0,0,1-1.64-1.47,2,2,0,0,1,0-1.14A7.85,7.85,0,0,1,81.56,104.46Z"/>
+                    <path class="cls-342"
+                          d="M81,134.4a4.9,4.9,0,0,1-.48-.88,7.22,7.22,0,0,1,1-.44,3.43,3.43,0,0,1,1.13-.28s0,.06,0,.15c-.52.55-1.06,1.14-1.61,1.76l0-.07,0,0Z"/>
+                    <path class="cls-342"
+                          d="M80.22,13.23c0-.16,0-.18,0-.2a2,2,0,0,1,.13-.48,11.47,11.47,0,0,1,1.85-2.71,3,3,0,0,1,.12,1.86,11.36,11.36,0,0,0-1,1L81,13l-.5.52-.09,0A.44.44,0,0,1,80.22,13.23Z"/>
+                    <path class="cls-342"
+                          d="M80.54,133.52a4.9,4.9,0,0,0,.48.88l.12.19,0,0-.08-.12a4.91,4.91,0,0,1-.51-1Z"/>
+                    <path class="cls-342"
+                          d="M79.38,48.78a47.11,47.11,0,0,1,3.17-4,46.42,46.42,0,0,1,5.56-5.37,25.64,25.64,0,0,1,2.65-1.87,23.53,23.53,0,0,1,2.31-1.16A30.25,30.25,0,0,1,99,34.69a51.17,51.17,0,0,1,8.62-.94,16.58,16.58,0,0,1,9.81,3.59l0,0,0,0a15.59,15.59,0,0,1,4.64,5.33,20.78,20.78,0,0,1,2.06,6.67,53.64,53.64,0,0,1,.51,6.52,25,25,0,0,1-.29,6,22.41,22.41,0,0,1-3.48,8.37c-1.25,1.83-2.23,2.7-2.31,2.61s.18-.26.51-.75.81-1.21,1.35-2.14a23.86,23.86,0,0,0,2.93-8.26,25.49,25.49,0,0,0,.06-5.75,59.06,59.06,0,0,0-.7-6.34,20,20,0,0,0-2.07-6.13,14,14,0,0,0-4.31-4.67l-.07-.06a14.76,14.76,0,0,0-8.67-3,50,50,0,0,0-8.2,1.05A27.46,27.46,0,0,0,94,38.54a20.43,20.43,0,0,0-2,1,28.12,28.12,0,0,0-2.43,1.67,43.71,43.71,0,0,0-5.36,5A42.4,42.4,0,0,0,81.06,50l-.77,1.08-.19.26,0,0s-.07.06,0,.09l.06.08.41.48.92,1.06a87.35,87.35,0,0,0,8.34,8.32,46.42,46.42,0,0,0,4.73,3.56l1.23.77,1.26.68c.84.44,1.72.84,2.57,1.25,3.41,1.62,6.61,3.08,9.41,4.13a27.81,27.81,0,0,0,3.87,1.2,13.17,13.17,0,0,0,3.09.27,9.43,9.43,0,0,0,2-.19c.45-.08.67-.19.69-.17s-.86.69-2.65.83a13.19,13.19,0,0,1-3.24,0,19,19,0,0,1-2.24-.49c-.58-.15-1.18-.34-1.81-.53-2.9-.94-6.17-2.3-9.65-3.81-.87-.38-1.74-.76-2.65-1.18L95,67l-1.31-.76a45.7,45.7,0,0,1-5-3.56A85.36,85.36,0,0,1,80,54.35l-1-1.06-.51-.58-.82-1c0-.08-.21-.17-.15-.25l.18-.26.35-.53.57-.82C78.88,49.5,79.13,49.14,79.38,48.78Z"/>
+                    <path class="cls-342"
+                          d="M78,140.43a5.34,5.34,0,0,1-.59-1.28c.14-.19.29-.38.44-.56l.21-.27a4.59,4.59,0,0,0,.61,1.71,4.37,4.37,0,0,0,1.21,1.36,5.52,5.52,0,0,0,1.93.89,14.08,14.08,0,0,0,4.09.46,11.24,11.24,0,0,0,1.42-.15,1.18,1.18,0,0,0-.17.22,10.61,10.61,0,0,1-1.23.26,12.86,12.86,0,0,1-4.25-.21,6.22,6.22,0,0,1-2.19-.9A5,5,0,0,1,78,140.43Z"/>
+                    <path class="cls-342"
+                          d="M77.86,138.59c-.15.18-.3.37-.44.56l0-.09,0,0a4.51,4.51,0,0,1-.19-.73.4.4,0,0,1,.37-.34.45.45,0,0,1,.46.31.18.18,0,0,0,0,0Z"/>
+                    <path class="cls-342"
+                          d="M77.23,138.3a4.51,4.51,0,0,0,.19.73l0,0a5,5,0,0,1-.16-.64A.24.24,0,0,1,77.23,138.3Z"/>
+                    <path class="cls-342"
+                          d="M74.33,145.31a6.62,6.62,0,0,1-.5-.77c.15-.29.3-.59.47-.87a5.7,5.7,0,0,0,.65,1.17,6.1,6.1,0,0,0,3.65,2.4,11.13,11.13,0,0,0,4.55-.05c.69-.13,1.26-.28,1.61-.36a1.08,1.08,0,0,0-.08.19,14.92,14.92,0,0,1-1.45.49,10.92,10.92,0,0,1-4.74.32A6.64,6.64,0,0,1,74.33,145.31Z"/>
+                    <path class="cls-342"
+                          d="M73.44,143.74l.17-.46a.08.08,0,0,0,0,0c.08-.16.16-.33.23-.5,0,0,0,0,0,0a.32.32,0,0,1,.17.22.43.43,0,0,1,0,0,3.61,3.61,0,0,0,.18.52s0,.09,0,.14c-.17.28-.32.58-.47.87A4.4,4.4,0,0,1,73.44,143.74Z"/>
+                    <path class="cls-342"
+                          d="M73.89,142.63h0c.27-.62.56-1.23.86-1.82,0-.07.09-.14.14-.21.67-1,1.24-2,1.82-3,.48-.71,1-1.42,1.46-2.12.77-.86,1.53-1.7,2.35-2.52,1.14-1.15,2.24-2.37,3.33-3.59l.06.06-.06.06.12.09h0l0,.1c.07.16.2.45.38.79.08.13.15.26.25.4-.47.46-1,1-1.46,1.49l-.41.43a1,1,0,0,0,0-.14,3.16,3.16,0,0,0-1.13.28,3.6,3.6,0,0,0-1.07.48l0,.07,0,0a4.91,4.91,0,0,0,.51,1l.08.12c-1,1.11-2,2.29-3,3.57a.18.18,0,0,1,0-.05.44.44,0,0,0-.46-.31.38.38,0,0,0-.37.45.24.24,0,0,0,0,.12,5,5,0,0,0,.16.64c-.78,1-1.56,2.05-2.29,3.16-.28.43-.55.88-.8,1.33,0-.05,0-.09,0-.13s-.12-.32-.15-.42,0-.14,0-.15A.3.3,0,0,0,73.89,142.63Z"/>
+                    <path class="cls-342"
+                          d="M77.34,166.56a10.89,10.89,0,0,1-2.79,0c-.52-.05-1-.11-1.38-.18q-.15-.45-.27-.9a15.12,15.12,0,0,0,1.73.31,11.16,11.16,0,0,0,2.61.07,10.39,10.39,0,0,0,2.85-.83,6.06,6.06,0,0,0,2.41-1.65,4.57,4.57,0,0,0,.69-1.13c.18-.41.33-.8.49-1.17.31-.74.57-1.35.76-1.76l.1.19c-.12.43-.32,1-.56,1.7-.13.36-.26.76-.41,1.18a6.64,6.64,0,0,1-1,1.65,5.36,5.36,0,0,1-2.2,1.53A10.42,10.42,0,0,1,77.34,166.56Z"/>
+                    <path class="cls-342" d="M73,166.36c-.07-.29-.15-.59-.21-.88l.12,0q.12.45.27.9Z"/>
+                    <path class="cls-342"
+                          d="M72.78,165.48c.06.29.14.59.21.88l.18,0c.37,1.24.71,2.37.85,2.66a5.18,5.18,0,0,1,.28,1l.18.82c.12.55.25,1.09.36,1.64.25,1.11.49,2.22.74,3.35l.1.53,0,.11c0,.06.05,0,.07,0l.14-.18L77,174.93l1-1.31.7,1.49c.47,1,.94,2,1.42,3,0-.92,0-1.84,0-2.77.79.69,1.63,1.49,2.38,2.08.36.3.79.6,1.11.84l.62.43.4.26-.45.12c-.08,0-.14.1-.16.23a.3.3,0,0,0,0,.43c.12.1.24.23.22.35a.25.25,0,0,0,.24.11l.74-.24.65-.21c.3.17.6.35.92.52a24.45,24.45,0,0,0,5.62,2.31c.92.25,1.85.46,2.8.66a.5.5,0,0,0-.1.14c-.09.16.07.41.36.56s.57.17.64.05.12-.2.33-.51c2.78.51,5.65.87,8.51,1.31l1.6.25.34,0h.52L108,185c1.08-.07,2.16-.15,3.23-.24.83-.07,1.65-.16,2.48-.25l-.15.29c-.09.19.09.44.39.56s.59.09.67-.06l.36-.74a2.09,2.09,0,0,0,.1-.21c.87-.1,1.73-.22,2.58-.34,2.13-.31,4.27-.71,6.35-1.21a32.17,32.17,0,0,0,6-2l0,0h0l5.63-2.23c1.95-.36,3.61-.63,5.36-1,.84-.23,1.7-.41,2.52-.72l1.24-.41,1.22-.5a27.78,27.78,0,0,0,8.61-5.65,21.69,21.69,0,0,0,5.45-8.35,17.58,17.58,0,0,0,.7-2.38,9.4,9.4,0,0,0,.21-1.2l.09-.6a2.53,2.53,0,0,0,0-.38l-.55-.84c-.22-.33-.5-.6-.75-.91a7.56,7.56,0,0,0-1.77-1.43,7.4,7.4,0,0,0-4.39-.86,15.43,15.43,0,0,0-4.47,1.11c-1.44.55-2.82,1.28-4.21,1.92s-2.74,1.35-4.08,2c-5.32,2.71-10.3,5.39-15.07,7.49a63.22,63.22,0,0,1-11.29,3.89,2.28,2.28,0,0,0-.74-.22c-.56-.07-.83.19-.79.21a2,2,0,0,1,.75,0l.3.11c-.57.13-1.14.25-1.7.34a33.13,33.13,0,0,1-10.82.2l-1.8-.3-.13-.1c-.39-.26-.66-.29-.67-.26s.14.11.31.25c-.58-.14-1.11-.3-1.61-.44-1.11-.33-2.06-.61-2.83-.82l-.77-.23c0-.09-.06-.13-.08-.13s0,0,0,.1l-.85-.28a2.44,2.44,0,0,1-.57-.21,5,5,0,0,1,.6.11l1.76.42,2.84.71c.56.14,1.16.31,1.79.45l2.09.29a33.32,33.32,0,0,0,10.65-.4,58.71,58.71,0,0,0,13.23-4.48c4.7-2.15,9.63-4.86,14.94-7.65,1.33-.68,2.69-1.39,4.08-2s2.76-1.42,4.27-2a17.3,17.3,0,0,1,4.8-1.24,8.68,8.68,0,0,1,5.08,1,9,9,0,0,1,2.09,1.64c.28.35.6.66.85,1l.83,1.26a3.26,3.26,0,0,1-.07.86l-.08.65c-.08.42-.1.86-.22,1.29a22,22,0,0,1-.72,2.52,22.69,22.69,0,0,1-5.73,8.92,28.58,28.58,0,0,1-9,6l-1.26.54-1.31.45c-.85.32-1.76.52-2.64.77-1.77.4-3.66.73-5.27,1.05l-5.43,2.17a33.59,33.59,0,0,1-6.33,2.17c-2.15.53-4.32,1-6.5,1.28s-4.35.6-6.53.8c-1.09.11-2.18.19-3.26.26l-.56.05h-.94l-.31-.06-1.6-.22a121.65,121.65,0,0,1-12.77-2.18,26.54,26.54,0,0,1-6-2.44c-1-.51-1.86-1.06-2.75-1.65l-.8-.55-.21-.16s0,.13,0,.2v.28c0,.88,0,1.75.06,2.64l.12,4.61-2-4.18c-.92-1.92-1.81-3.81-2.72-5.68l-.09.12-1,1.29c-.33.42-.7.88-1,.82a1.56,1.56,0,0,1-.26-.13q-.27-.94-.6-1.86a44.72,44.72,0,0,0-.91-8.16c-.19-.87-1.63-6.41-1.84-7.25.13.34.57,1.76,1,3.21Z"/>
+                    <path class="cls-342" d="M71,159.93l.69,1.75A9.5,9.5,0,0,1,71,159.93Z"/>
+                    <path class="cls-342"
+                          d="M70.9,151.76a43.74,43.74,0,0,1,2.54-8,4.4,4.4,0,0,0,.39.8c-.36.71-.69,1.44-1,2.2a50,50,0,0,0-1.56,5.43,10.55,10.55,0,0,0-.27,1.72,3.67,3.67,0,0,1-.34-.51l0,0C70.69,152.82,70.78,152.33,70.9,151.76Z"/>
+                    <path class="cls-342"
+                          d="M70.92,156.52a21.66,21.66,0,0,0,.73,5.16L71,159.93l0-.06v0C71,159.36,70.93,158,70.92,156.52Z"/>
+                    <path class="cls-342"
+                          d="M70.92,155.05c0-.39,0-.79.06-1.16a5.52,5.52,0,0,0,1.14,1.16,6.81,6.81,0,0,0,4.49,1.34,34,34,0,0,0,4.89-.62,12.24,12.24,0,0,0,1.56-.43l.27-.1a.3.3,0,0,0,0,.13,7.14,7.14,0,0,1-1.75.71,27.13,27.13,0,0,1-5,.91,7.5,7.5,0,0,1-5-1.31A5.27,5.27,0,0,1,70.92,155.05Z"/>
+                    <path class="cls-342"
+                          d="M70.64,23.94a11.32,11.32,0,0,1,.88-2l.54-.85s.27-.34.68-.76A14.24,14.24,0,0,1,74.2,19h0l1-.31c.65-.22,1-.7.93-1,.45-.23.76-.34.79-.28s-1.07,1-2.07,2.1a17,17,0,0,0-1.3,1.51c-.34.44-.54.75-.56.76l-.57.75a10.79,10.79,0,0,0-1,1.67c-.68,1.27-.81,2.72-1,2.72s-.17-.36-.16-.94A6.9,6.9,0,0,1,70.64,23.94Z"/>
+                    <path class="cls-342"
+                          d="M70.49,154c.05-.21.08-.41.12-.63l0,0a3.67,3.67,0,0,0,.34.51c0,.37,0,.77-.06,1.16a3.48,3.48,0,0,1-.33-.34c0-.21,0-.42-.09-.62C70.5,154.05,70.49,154,70.49,154Z"/>
+                    <path class="cls-342"
+                          d="M70.92,156.52c0,1.5.08,2.84,0,3.33a11.84,11.84,0,0,1-.44-5.76c0,.2.06.41.09.62a3.48,3.48,0,0,0,.33.34C70.91,155.54,70.91,156,70.92,156.52Z"/>
+                    <path class="cls-342"
+                          d="M69.44,15.92a7.68,7.68,0,0,1,4.63.15,4.48,4.48,0,0,1,2.05,1.64l0,0A11.7,11.7,0,0,0,74.3,19a.46.46,0,0,0-.07.07h0c-.14,0-.21,0-.23,0a2,2,0,0,0-.18-.28,2.4,2.4,0,0,0-.71-.58,6,6,0,0,0-3.4-.49c-3,.18-6-.18-6-.48S66.64,16.54,69.44,15.92Z"/>
+                    <path class="cls-342"
+                          d="M64.61,52.35,61,54.83l-.74.5-.26.18-.35.26.57.13,1.84.48,6.41,1.73-2.85,1.57-1.35.78-.5.3-.16.11h0s-.11.07-.09.12l.21.13,4.5,2.81c2.57,1.6,4.2,2.66,4.33,2.74l2.22,1.53c.68.49,1.37,1,2.29,1.54s2,1.14,3.11,1.76c2.31,1.25,5,2.62,8,4,1,.48,2,1,3.06,1.45l-.67.24c-.62.22-1.22.45-1.79.7l-1.41-.63c-3-1.35-5.81-2.67-8.19-3.88-1.18-.63-2.27-1.2-3.24-1.77S74,70.52,73.41,70.09L71.2,68.63c-.12-.09-1.72-1.14-4.24-2.8L62.5,62.91c-.31-.23-.76-.5-1.07-.78l-.4-.47c-.12-.16-.17-.3-.27-.45s0-.36.07-.5.06-.32.22-.49a1.91,1.91,0,0,1,.48-.45,5.66,5.66,0,0,1,.62-.43c1-.6.71-.43.85-.5l.26-.12A1.55,1.55,0,0,0,63,58.6l-.1,0-.32-.09-1-.3c-2-.59-4-1.17-6.06-1.76,1.53-1,3.07-2,4.61-3l1.49-1,.38-.24.13-.07.27-.17.28-.17s-.15-.08-.23-.12l-.3-.14-.46-.19-.79-.34c-.1,0-.39-.14-.56-.23a1.9,1.9,0,0,1-.48-.41,1.65,1.65,0,0,1,.2-2.25,14.4,14.4,0,0,0,3.31-5.33,28.59,28.59,0,0,0,1.4-5,26.58,26.58,0,0,0,.45-4l.29.25h0A18,18,0,0,1,65.38,38a27.88,27.88,0,0,1-1.13,5.21,19,19,0,0,1-1.25,3,11.46,11.46,0,0,1-.91,1.47,7.11,7.11,0,0,1-.54.72l-.29.35L61,49a.45.45,0,0,0,0,.66.35.35,0,0,0,.16.09l.23.09.79.3,2.45.92.67.26.34.13.17.07.09,0-.06,0Z"/>
+                    <path class="cls-342"
+                          d="M58.76,22.34a56.27,56.27,0,0,0,4.39,7.18c3.13,3.81,5.33,6.43,5.08,6.67s-1.16-.63-2.78-2h0a2.39,2.39,0,0,0-.21-1s-.06.26-.08.73c-1-.85-2.12-1.93-3.41-3.18a49.14,49.14,0,0,1-5.26-7l-.32-.51L56.08,23a1.39,1.39,0,0,1-.11-.21l-.15-.33c-.18-.39-.34-.79-.5-1.19a21.31,21.31,0,0,1-.78-2.5c-.22-.85-.41-1.71-.55-2.61-.06-.45-.11-.9-.14-1.37,0-.23,0-.48,0-.72s0-.25,0-.37,0-.36,0-.52a4,4,0,0,1,.65-2,3.34,3.34,0,0,1,1.73-1.1l.49-.18L57,9.82l.65-.19L59,9.3c1.67-.42,3.3-.75,4.9-1s3.16-.5,4.75-.61a25.42,25.42,0,0,1,4.49.26c2.64.34,4.78.78,6.29,1.09s2.41.52,2.47.54a.51.51,0,0,1,.34.29,11.47,11.47,0,0,0-1.85,2.71,2,2,0,0,0-.13.48s0,0,0,.2a.44.44,0,0,0,.2.27l.09,0-.39.41-1.76-.46c-1.44-.35-3.49-.86-5.9-1.29a23.57,23.57,0,0,0-3.69-.42c-1.32,0-2.83.17-4.35.35s-3.12.42-4.7.71l-1.17.24-1,.22c-.13,0-.24,0-.33.13a1,1,0,0,0-.14.33v.11a2.11,2.11,0,0,0,0,.25c0,.19,0,.37,0,.55,0,.37,0,.75,0,1.14a22.69,22.69,0,0,0,.32,2.32A20.3,20.3,0,0,0,58,20.35c.11.37.23.72.35,1.06l.08.23,0,.06.07.13Z"/>
+                </g>
+                <path class="cls-327"
+                      d="M128.11,146.47l-.53.24-.06-.13.06-.13c0-.1,0-.1,0-.29a3.11,3.11,0,0,0,0-.32,1.79,1.79,0,0,1,.25.22A1.9,1.9,0,0,1,128.11,146.47Z"/>
+                <path class="cls-327"
+                      d="M127.6,146.16c0,.19,0,.19,0,.29l-.06.13a1.34,1.34,0,0,0-.76-.63,3.86,3.86,0,0,0-.89,0,.88.88,0,0,0-.29,0c-.08,0-.12,0-.13,0s0-.05.09-.09a.5.5,0,0,1,.29-.17,3,3,0,0,1,1-.13,1.49,1.49,0,0,1,.72.29A3.11,3.11,0,0,1,127.6,146.16Z"/>
+                <path class="cls-327"
+                      d="M126.72,148.12c0,.19,0,.19-.1.28l-.09.1a1.27,1.27,0,0,0-.58-.79,3.46,3.46,0,0,0-.84-.28,1,1,0,0,0-.29,0,.16.16,0,0,1-.13,0s0-.05.11-.07a.5.5,0,0,1,.33-.09,2.77,2.77,0,0,1,1,.13,1.6,1.6,0,0,1,.62.46C126.75,147.91,126.74,148,126.72,148.12Z"/>
+                <path class="cls-327"
+                      d="M126.76,147.86c.31.41.38.87.24,1l-.48-.34,0,0a.58.58,0,0,0,0-.19s0-.05,0-.07Z"/>
+                <path class="cls-327" d="M126.58,148.65h-.08Z"/>
+                <path class="cls-330" d="M118,145.88h0l0,0,0-.07H118v.11Z"/>
+                <path class="cls-327"
+                      d="M118,145.84l0,0h-.14l-.27.06-.38.08h0a.88.88,0,0,1-.24,0c-.1,0-.12-.11-.1-.1a5,5,0,0,0,1.08-.16h0Z"/>
+                <polygon class="cls-330" points="116.45 146.19 116.45 146.2 116.44 146.2 116.45 146.19"/>
+                <path class="cls-330" d="M111.49,139.22h0a.33.33,0,0,1,0,.06h0Z"/>
+                <path class="cls-330"
+                      d="M110.47,138.42l0,0a2,2,0,0,1,.3.27h-.15c-.09-.06-.12.13-.11.14s-.11-.12-.13-.19a.67.67,0,0,1,.06-.12Z"/>
+                <path class="cls-330" d="M108.73,147.41a.24.24,0,0,0,0,.08h0Z"/>
+                <path class="cls-331" d="M108.7,147.49l0,.14h0l0,.05Z"/>
+                <path class="cls-327" d="M108.7,147.49l-.08.2-.21,0h-.63S108.38,147.55,108.7,147.49Z"/>
+                <polygon class="cls-330"
+                         points="108.66 147.64 108.62 147.76 108.62 147.71 108.62 147.69 108.66 147.64"/>
+                <path class="cls-327"
+                      d="M105.54,146.75c.39-.08.14.27.2.37a.14.14,0,0,1,0,.1h0c-.06,0-.11-.16-.17-.47Z"/>
+                <path class="cls-330"
+                      d="M100.89,155c.11.17.2.31.17.34s-.31-.09-.57-.34C100.81,155,100.83,155,100.89,155Z"/>
+                <path class="cls-330"
+                      d="M97.73,154.57c0,.27.16.5.12.54s-.46-.26-.55-.79a.25.25,0,0,1,0-.08l.22.28s.12,0,.17,0Z"/>
+                <path class="cls-330" d="M153.68,48.24l.22.37-.66.08C153.4,48.54,153.54,48.38,153.68,48.24Z"/>
+                <path class="cls-330" d="M143.19,7.06c.28.3.37.48.32.56s-.28.06-.62,0l-.4-.1L142,6.94l.84-.16Z"/>
+                <path class="cls-330" d="M130.39,56.7q0,.45,0,.93a.55.55,0,0,1-.27-.61A.48.48,0,0,1,130.39,56.7Z"/>
+                <path class="cls-330" d="M126.38,91.88l.35.63a2.8,2.8,0,0,1-.45-.52Z"/>
+                <path class="cls-330" d="M126.1,85.32h.17a.92.92,0,0,1-.06.33C126.15,85.45,126.1,85.33,126.1,85.32Z"/>
+                <path class="cls-330" d="M126.1,85.32a1.08,1.08,0,0,1-.18,0C126,85.25,126.07,85.23,126.1,85.32Z"/>
+                <path class="cls-330" d="M124.35,84.6c-.12.06-.24.13-.37.18a.25.25,0,0,1,0-.14A1,1,0,0,1,124.35,84.6Z"/>
+                <path class="cls-330"
+                      d="M116.08,13.43l-.53.05c0-1,0-1.82-.08-2.62.15.55.3,1.13.43,1.74C116,13,116.07,13.37,116.08,13.43Z"/>
+                <path class="cls-330" d="M76.14,17.74c.11.27-.28.75-.93,1l-1,.32.1-.08A11.7,11.7,0,0,1,76.14,17.74Z"/>
+                <path class="cls-31" d="M48.49,61.75c0,.42-.05.84-.07,1.28h0c0-.22,0-.44,0-.65Z"/>
+                <g class="cls-32">
+                    <path class="cls-31" d="M48.49,61.75c0,.42-.05.84-.07,1.28h0c0-.22,0-.44,0-.65Z"/>
+                </g>
+                <g class="cls-345">
+                    <polygon class="cls-302" points="86.65 103.28 86.66 103.26 86.66 103.28 86.65 103.28"/>
+                    <polygon class="cls-303" points="86.12 103.28 86.66 102.59 86.66 103.26 86.65 103.28 86.12 103.28"/>
+                    <polygon class="cls-304" points="85.6 103.28 86.66 101.92 86.66 102.59 86.12 103.28 85.6 103.28"/>
+                    <polygon class="cls-305" points="85.08 103.28 86.66 101.25 86.66 101.92 85.6 103.28 85.08 103.28"/>
+                    <polygon class="cls-305" points="84.55 103.28 86.66 100.59 86.66 101.25 85.08 103.28 84.55 103.28"/>
+                    <polygon class="cls-306"
+                             points="84.03 103.28 86.57 100.03 86.66 100.03 86.66 100.59 84.55 103.28 84.03 103.28"/>
+                    <polygon class="cls-307" points="83.51 103.28 86.05 100.03 86.57 100.03 84.03 103.28 83.51 103.28"/>
+                    <polygon class="cls-308" points="82.98 103.28 85.52 100.03 86.05 100.03 83.51 103.28 82.98 103.28"/>
+                    <polygon class="cls-309" points="82.46 103.28 85 100.03 85.52 100.03 82.98 103.28 82.46 103.28"/>
+                    <polygon class="cls-310" points="81.94 103.28 84.48 100.03 85 100.03 82.46 103.28 81.94 103.28"/>
+                    <polygon class="cls-311"
+                             points="81.46 103.22 83.95 100.03 84.48 100.03 81.94 103.28 81.46 103.28 81.46 103.22"/>
+                    <polygon class="cls-312" points="81.46 102.56 83.43 100.03 83.95 100.03 81.46 103.22 81.46 102.56"/>
+                    <polygon class="cls-313" points="81.46 101.89 82.91 100.03 83.43 100.03 81.46 102.56 81.46 101.89"/>
+                    <polygon class="cls-314" points="81.46 101.22 82.39 100.03 82.91 100.03 81.46 101.89 81.46 101.22"/>
+                    <polygon class="cls-315" points="81.46 100.55 81.86 100.03 82.39 100.03 81.46 101.22 81.46 100.55"/>
+                    <polygon class="cls-316" points="81.86 100.03 81.46 100.55 81.46 100.03 81.86 100.03"/>
+                </g>
+                <path class="cls-31" d="M48.46,62.39c0,.21,0,.43,0,.65h0C48.44,62.82,48.45,62.6,48.46,62.39Z"/>
+                <g class="cls-32">
+                    <path class="cls-31" d="M48.46,62.39c0,.21,0,.43,0,.65h0C48.44,62.82,48.45,62.6,48.46,62.39Z"/>
+                </g>
+                <g class="cls-346">
+                    <polygon class="cls-218" points="48.42 62.9 48.46 62.84 48.46 63.04 48.42 63.04 48.42 62.9"/>
+                    <polygon class="cls-219"
+                             points="48.42 62.44 48.46 62.39 48.46 62.39 48.46 62.84 48.42 62.9 48.42 62.44"/>
+                    <polygon class="cls-220" points="48.46 62.39 48.42 62.44 48.42 62.39 48.46 62.39"/>
+                </g>
+            </g>
+        </g>
+    </g>
 </svg>
\ No newline at end of file
diff --git a/media/logos/SVG/mascot color without feather.svg b/media/logos/SVG/mascot color without feather.svg
index 0cbc26d9d5d..a219df68629 100644
--- a/media/logos/SVG/mascot color without feather.svg	
+++ b/media/logos/SVG/mascot color without feather.svg	
@@ -1,1403 +1,1403 @@
-<!--
-    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
-
-         http://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.
--->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 114.03 188.38">
-    <defs>
-        <style>
-            .cls-1{fill:none;}.cls-2{isolation:isolate;}.cls-3{opacity:0.13;}.cls-13,.cls-3{mix-blend-mode:multiply;}.cls-4{fill:#3c2517;}.cls-5{fill:#644c53;}.cls-6{fill:#a66870;}.cls-7{fill:#f2e8df;}.cls-8{fill:#744a54;}.cls-9{fill:#231f20;}.cls-10{fill:#fff;}.cls-11{fill:#473439;}.cls-12{fill:#f7b2c6;}.cls-13{opacity:0.15;}.cls-14{fill:#3e362f;}.cls-15{fill:#f4f0d2;}.cls-16{fill:#97646d;}.cls-17{fill:#96636a;}.cls-18{fill:#8f8280;}.cls-19{fill:#dbd3d1;}.cls-20{fill:#694650;}.cls-21{fill:#c4869a;}.cls-22{fill:#a6938f;}.cls-23{fill:#bd2330;}.cls-24{opacity:0.35;mix-blend-mode:screen;}.cls-25{clip-path:url(#clip-path);}.cls-26{fill:#c7203a;}.cls-27{fill:#c8203a;}.cls-28{fill:#c82039;}
-        </style>
-        <clipPath id="clip-path">
-            <path class="cls-1" d="M.05,62.39c0,.21,0,.43,0,.65H0C0,62.82,0,62.6.05,62.39Z"/>
-        </clipPath>
-    </defs>
-    <title>mascot color without feather</title>
-    <g class="cls-2">
-        <g id="Layer_2" data-name="Layer 2">
-            <g id="Layer_1-2" data-name="Layer 1">
-                <g class="cls-3">
-                    <path class="cls-4"
-                          d="M113.25,156.4s4.39,14.27-13.72,23.36c-26.56,13.33-44.52,9-60.47,1.75-2.07-.93-3.49.33-5.47-13.66s4.7,5.76,5.71,5.9S81.55,173,81.55,173Z"/>
-                </g>
-                <path class="cls-5"
-                      d="M114,157.05a3.26,3.26,0,0,1-.07.86l-.08.64a11.21,11.21,0,0,1-.22,1.29,19.78,19.78,0,0,1-.72,2.53,22.77,22.77,0,0,1-5.73,8.92,28.75,28.75,0,0,1-9,6l-1.26.54-1.31.45c-.85.32-1.75.52-2.64.77-1.77.4-3.66.72-5.27,1.05l-5.43,2.17A33.59,33.59,0,0,1,76,184.45c-2.15.53-4.32,1-6.5,1.28s-4.35.59-6.53.8c-1.09.11-2.18.19-3.26.26l-.56,0h-.94l-.31-.05-1.6-.23a119.07,119.07,0,0,1-12.77-2.17,26.54,26.54,0,0,1-6-2.44c-.94-.51-1.86-1.06-2.75-1.66l-.8-.55-.21-.15s0,.13,0,.19v.28l.06,2.65.13,4.61-2-4.18c-.92-1.92-1.81-3.81-2.71-5.68l-.1.12-1,1.29c-.33.42-.7.87-1,.82a1.56,1.56,0,0,1-.26-.13c-.18-.63-.38-1.25-.6-1.87a44.92,44.92,0,0,0-.91-8.16c-.19-.86-1.63-6.4-1.84-7.24.13.34.57,1.75,1,3.21l-.12,0c.06.29.14.59.21.88l.18,0c.37,1.25.71,2.37.85,2.66a5.58,5.58,0,0,1,.28,1l.18.82c.12.56.25,1.1.36,1.65.25,1.11.49,2.22.74,3.35l.1.53,0,.11c0,.06.05,0,.07,0l.14-.18,1.06-1.37,1-1.31.7,1.49c.47,1,.94,2,1.42,3,0-.92,0-1.84-.05-2.77.79.69,1.63,1.49,2.38,2.07.37.31.79.61,1.11.85l.62.42a4.53,4.53,0,0,0,.4.26l-.44.13c-.09,0-.15.1-.17.23a.29.29,0,0,0,0,.42c.13.11.24.24.22.36a.26.26,0,0,0,.24.11l.74-.24.65-.22c.3.18.6.36.92.52A24,24,0,0,0,44,182.59c.92.25,1.85.46,2.8.66l-.1.14c-.09.16.07.41.36.55s.57.18.64.05.12-.19.33-.5c2.78.5,5.65.87,8.51,1.31l1.6.24.34.06H59l.58-.08c1.07-.06,2.15-.14,3.22-.23l2.48-.25-.15.29c-.09.18.09.43.39.56s.59.09.67-.06.14-.3.36-.74l.11-.21c.86-.1,1.72-.22,2.57-.34,2.14-.31,4.27-.71,6.35-1.21a31.26,31.26,0,0,0,6-2l0,0h0l5.63-2.22c2-.37,3.61-.64,5.36-1,.84-.23,1.7-.42,2.52-.72l1.24-.41,1.22-.5a27.78,27.78,0,0,0,8.61-5.65,21.65,21.65,0,0,0,5.45-8.36,17.88,17.88,0,0,0,.7-2.37,9.4,9.4,0,0,0,.21-1.2l.09-.61a2.56,2.56,0,0,0,0-.37l-.55-.84a8.24,8.24,0,0,0-.75-.91,7.36,7.36,0,0,0-1.77-1.43,7.48,7.48,0,0,0-4.39-.87,15.78,15.78,0,0,0-4.47,1.12c-1.44.55-2.82,1.28-4.21,1.92s-2.74,1.35-4.08,2c-5.32,2.71-10.3,5.38-15.07,7.48a62.51,62.51,0,0,1-11.29,3.9,2.32,2.32,0,0,0-.74-.23c-.56-.06-.83.2-.79.22a1.78,1.78,0,0,1,.75,0,1.6,1.6,0,0,1,.3.11c-.57.13-1.14.25-1.7.34a33.41,33.41,0,0,1-10.82.2l-1.8-.3-.13-.1c-.39-.26-.66-.29-.67-.26s.14.11.31.25c-.58-.14-1.11-.3-1.61-.45l-2.83-.82-.77-.23c0-.08-.06-.12-.08-.12s0,0,0,.09c-.34-.11-.63-.19-.85-.27a2,2,0,0,1-.57-.22,6,6,0,0,1,.6.12l1.76.41,2.84.72,1.79.45,2.09.29a33.35,33.35,0,0,0,10.65-.41,58.06,58.06,0,0,0,13.23-4.48c4.7-2.14,9.63-4.85,14.94-7.64,1.34-.68,2.69-1.39,4.08-2.06s2.77-1.41,4.27-2a17,17,0,0,1,4.8-1.24,8.6,8.6,0,0,1,5.08,1,8.51,8.51,0,0,1,2.09,1.64c.28.34.6.65.85,1Z"/>
-                <path class="cls-6"
-                      d="M112.71,157.38a2.56,2.56,0,0,1,0,.37l-.09.61a9.4,9.4,0,0,1-.21,1.2,17.88,17.88,0,0,1-.7,2.37,21.65,21.65,0,0,1-5.45,8.36,27.78,27.78,0,0,1-8.61,5.65l-1.22.5-1.24.41c-.82.3-1.68.49-2.52.72-1.75.38-3.41.65-5.36,1l-5.63,2.22h0l0,0a31.26,31.26,0,0,1-6,2c-2.08.5-4.21.9-6.35,1.21-.85.12-1.71.24-2.57.34.22-.45.53-1,.88-1.69s.87-1.72,1.31-2.75a11.42,11.42,0,0,0,.57-1.65,11.83,11.83,0,0,0,.25-1.79,7,7,0,0,0-.45-3.54,7.43,7.43,0,0,0-1.89-2.41,5.48,5.48,0,0,0-1.17-.79,62.51,62.51,0,0,0,11.29-3.9c4.77-2.1,9.75-4.77,15.07-7.48,1.34-.67,2.69-1.36,4.08-2s2.77-1.37,4.21-1.92a15.78,15.78,0,0,1,4.47-1.12,7.48,7.48,0,0,1,4.39.87,7.36,7.36,0,0,1,1.77,1.43,8.24,8.24,0,0,1,.75.91Z"/>
-                <path class="cls-5"
-                      d="M108.93,12.77a31.32,31.32,0,0,1-.16,3.55,40,40,0,0,1-1.38,7.26,39.16,39.16,0,0,1-2.64,6.8A15,15,0,0,1,103.19,33c0-.1,0-.16-.06-.16a1,1,0,0,0,0,.25h0c-.08.08-.12.1-.15.09s.33-1.28,1-3.12a54,54,0,0,0,1.87-6.82,44.21,44.21,0,0,0,.84-7c.07-1.93,0-3.24,0-3.33s0-.87-.08-2.06S106.19,8,105,7.37a5.14,5.14,0,0,0-2.42-.4,28.67,28.67,0,0,0-2.89.25c-1,.13-1.94.2-2.82.28l-.32,0H96l-.8,0,.68,1.17c.27.43.4.7.34.76s-.3-.14-.67-.48-.85-.85-1.5-1.55l.41.1c.33.11.57.15.61,0s0-.26-.32-.56c-.1-.08-.22-.17-.34-.28l2.28-.43c.87-.18,1.8-.35,2.75-.57a30.62,30.62,0,0,1,3-.52,6.75,6.75,0,0,1,3.37.38,4.42,4.42,0,0,1,2.27,2.48,10,10,0,0,1,.6,2.4C108.9,11.89,108.93,12.7,108.93,12.77Z"/>
-                <path class="cls-7"
-                      d="M106.59,12.84c0,.09.1,1.4,0,3.33a44.21,44.21,0,0,1-.84,7A54,54,0,0,1,103.91,30c-.63,1.84-1.11,3-1,3.12s.07,0,.15-.09c0,.56,0,1.93-.06,3.29-.05.88-.11,1.78-.18,2.44s-.14,1.13-.14,1.16,0,.49-.13,1.15a19.72,19.72,0,0,1-.37,2.11c0-.15,0-.33,0-.53,0-.52,0-1.13-.07-1.86a13.23,13.23,0,0,0-.74-2.39A8.75,8.75,0,0,0,99.65,36a12.3,12.3,0,0,0-2.47-2.17,12.07,12.07,0,0,0-7-1.66,7.56,7.56,0,0,0-3.56,1.45A11.46,11.46,0,0,0,84,36.19a9.45,9.45,0,0,0-1.52,3.09c-.32,1-.55,2-.74,2.88-.74,3.59-1,6.06-1,6.21s-.28,2.62-.38,6.25A28.23,28.23,0,0,0,82.8,67.68l.21.4.26.5a1.07,1.07,0,0,0,1.21.56,2.75,2.75,0,0,0,.58-.12,3.48,3.48,0,0,0,.52-.27c.27-.17.51-.35.75-.51,1-.69,1.86-1.4,2.73-2.08,1.74-1.37,3.33-2.7,4.65-3.86,0,0,3.81-3.23,4.5-4.7.05-.1.1-.25.17-.43l.67.83c.1.12.18.21.15.19a0,0,0,0,1,0,0h0c-.14.12-.33.27-.55.48a9.47,9.47,0,0,0-1.48,1.91c-.92,1.65-1.9,3.72-3.17,5.66a15.38,15.38,0,0,1-2.06,2.63,13.7,13.7,0,0,1-2.35,1.71,19.36,19.36,0,0,0-2.47,1.56l-.08,0s0,0,0,0a1.82,1.82,0,0,0-.59-.79c-.24-.14-.38-.07-.38,0s.12.09.24.23a2.9,2.9,0,0,1,.31.76c.09.38.19.85.28,1.36a6.94,6.94,0,0,0-2,1A6.61,6.61,0,0,0,87,74.28c0,.22.05.44.07.66a3.44,3.44,0,0,1,0,.91c-.48.25-.76.46-.72.51s.26,0,.65-.12a4.8,4.8,0,0,1-.26.81h0c-1.15.33-2.16.88-2.1,1s.8,0,1.68-.15c-.18.29-.32.45-.32.48a11.77,11.77,0,0,1-.76,1,13.31,13.31,0,0,1-1.94,1.82,4.81,4.81,0,0,1-2.4.77c-.73,0-1.23,0-1.25.1s.48.27,1.24.35a5.18,5.18,0,0,0,1.87-.13l0,.11c-.11,0-.42.36-.93.75a5.54,5.54,0,0,1-2.27,1,8.13,8.13,0,0,1-2.49.06,3.29,3.29,0,0,1-.36-.07,4.5,4.5,0,0,0,.94-.83,4,4,0,0,0,.73-1,1.62,1.62,0,0,0,.18-.43c-.12-.11-.46.53-1.22,1.15A6.89,6.89,0,0,1,74,84.48a12.54,12.54,0,0,1-3.63.2,7.35,7.35,0,0,1-1.64-.34l-.46-.14a5.48,5.48,0,0,1-1-.49c-.6-.43-1.37-1.09-2.16-1.78.7-.47,1.39-.93,1.92-1.21s1.17-.42,1.17-.51-.55-.13-1.34.09a19.22,19.22,0,0,0-2.38,1.09l-.07-.06-1.9-1.68,1.23-.4C66.37,78.38,69,77.7,69,77.54s-.08,0-.2,0l.81-1.4a3.9,3.9,0,0,0,.51.06l.57,0a.74.74,0,0,0,.41-.07.36.36,0,0,0,.15-.44,1.5,1.5,0,0,0-.45-.65.66.66,0,0,0-.43-.19h0L67.54,73.7c1.79-.14,2.75-.72,2.65-.84.08.1,1.06-.78,2.31-2.61A22.18,22.18,0,0,0,76,61.88a25,25,0,0,0,.29-6,53.49,53.49,0,0,0-.51-6.52,21.06,21.06,0,0,0-2.05-6.68,15.79,15.79,0,0,0-4.65-5.32l0,0,0,0a16.52,16.52,0,0,0-9.81-3.59,50.15,50.15,0,0,0-8.62.94,29.57,29.57,0,0,0-5.92,1.72,21.16,21.16,0,0,0-2.31,1.16,25.64,25.64,0,0,0-2.65,1.87,44.75,44.75,0,0,0-5.55,5.36,48.36,48.36,0,0,0-3.18,4l-.74,1.11-.57.82-.35.53-.18.26c-.06.08.11.16.15.25l.82,1,.51.59c.32.34.65.69,1,1.06a86.39,86.39,0,0,0,8.73,8.28,46.78,46.78,0,0,0,5,3.57L46.6,67l1.35.67c.91.43,1.78.8,2.65,1.19,3.48,1.51,6.75,2.87,9.65,3.8.63.2,1.23.39,1.81.53l-.68,2.53a31.69,31.69,0,0,0-4-.66,34.31,34.31,0,0,0-5.28-.12c-1.46.1-2.44.23-2.51.25s-1.05.16-2.46.53c-1.24.32-2.78.77-4.34,1.32h0l-3.06-1.45c-2.94-1.42-5.68-2.79-8-4-1.15-.62-2.2-1.21-3.11-1.77s-1.61-1-2.29-1.53l-2.22-1.53c-.13-.09-1.76-1.15-4.33-2.75l-4.5-2.8L15,61s.05-.08.09-.12h0l.16-.11.5-.3,1.35-.78L20,58.11,13.6,56.37l-1.84-.47-.57-.13.35-.26.26-.19.74-.49,3.65-2.48,1.19-.79.06,0-.08,0-.18-.07-.33-.13L16.17,51l-2.45-.92-.79-.31-.23-.08a.42.42,0,0,1-.16-.09.46.46,0,0,1,0-.66l.26-.28.29-.35a7.11,7.11,0,0,0,.54-.72,11.56,11.56,0,0,0,.91-1.48,18.56,18.56,0,0,0,1.25-3A27.88,27.88,0,0,0,17,38,18,18,0,0,0,17,34.14c1.62,1.42,2.65,2.17,2.78,2s-1.95-2.86-5.07-6.66a55.82,55.82,0,0,1-4.4-7.18l-.27-.51L10,21.7l0-.06-.08-.23c-.12-.34-.24-.7-.35-1.06A20.48,20.48,0,0,1,9,18.1a20,20,0,0,1-.31-2.31,11.17,11.17,0,0,1-.06-1.14c0-.19,0-.36,0-.55a2,2,0,0,1,0-.25v-.11a1.16,1.16,0,0,1,.14-.34.81.81,0,0,1,.33-.12l1-.22,1.17-.24c1.58-.29,3.16-.53,4.7-.72s3-.31,4.35-.34a23.44,23.44,0,0,1,3.69.42c2.41.42,4.46.93,5.91,1.29l1.75.45c.14-.13.26-.27.39-.4l.5-.52c.1-.12.2-.22.31-.33a12.79,12.79,0,0,1,1-1h0a5.22,5.22,0,0,1,.82-.6,1.15,1.15,0,0,1,.37-.15l.42-.32a35.93,35.93,0,0,1,4.43-2.82c.85-.46,1.73-.9,2.66-1.32l.89-.38c.3,0,.63.09,1,.16A20.89,20.89,0,0,1,49,7.76a19,19,0,0,1,2.83,1.61c.49.33,1,.69,1.53,1.07l.81.6c.33.25.67.52,1,.83l.46.4A4.16,4.16,0,0,1,57,13.2c.18.28.06-.07.06-.2a4.19,4.19,0,0,1,0-.47A1.67,1.67,0,0,1,57,12c-.67-2.22-1.23-4.1-1.7-5.64-.23-.76-.44-1.43-.65-2,.59,0,1.16,0,1.7,0,1.57,0,2.89.15,3.82.23l1.6.14,1,.06a3.71,3.71,0,0,1,.3.28A15.34,15.34,0,0,1,67,12.72c.06.33.11.64.14.76s0,0,0,0l.52,0v0A80.77,80.77,0,0,1,68,5l1,0a12.45,12.45,0,0,0,1.36,0c.24,0,.5,0,.8,0s.52-.06.77-.1c.8-.14,1.58-.3,2.35-.45.15.15.32.31.5.51a12.38,12.38,0,0,1,1.84,2.74,9.74,9.74,0,0,1,.42,1,10.17,10.17,0,0,1,.37,1.58c.07.53.14,1.09.23,1.67,0,.29.07.58.11.87l.06.45,0,.23c0,.07,0,0,.06,0l.27-.87A27.31,27.31,0,0,1,79.51,9,14.63,14.63,0,0,1,80.7,6.84,6.39,6.39,0,0,1,82,5.46a13.48,13.48,0,0,1,1.31-.85c.27-.16.51-.28.74-.39a27.59,27.59,0,0,1,3.84,1c1.51.5,2.88,1.1,4,1.53.89.33,1.64.59,2.18.74.65.7,1.15,1.21,1.5,1.55s.6.52.67.48-.07-.33-.34-.76l-.68-1.17.8,0h.54l.32,0c.88-.08,1.84-.15,2.82-.28A28.67,28.67,0,0,1,102.59,7a5.14,5.14,0,0,1,2.42.4c1.18.59,1.39,2.28,1.5,3.41S106.59,12.79,106.59,12.84Zm-1.21-2a5.15,5.15,0,0,0-.16-1.51c0-.1-.44-.07-.89.13l-.49.21h0a10.19,10.19,0,0,0-2.26.68,19.76,19.76,0,0,1-2.34.87,4.6,4.6,0,0,1-.78.16l.89,1.28a2.47,2.47,0,0,1,.42-.63,5.32,5.32,0,0,1,2-1.32,3,3,0,0,1,2-.18,3.53,3.53,0,0,1,0,.38,8.14,8.14,0,0,1-.14,2.54c-.31,1.26-.64,2.56-.74,3.31-.57-1-1.12-1.8-1.24-1.75a19.93,19.93,0,0,0,1,3.1,19.92,19.92,0,0,1,.61,2.11,9.74,9.74,0,0,1,.2,1c0,.06.12.44.18,1a15.34,15.34,0,0,1-.07,2.16,16.84,16.84,0,0,0-.18,3.25,9.46,9.46,0,0,0,1-3.13,12.5,12.5,0,0,0,.32-2.33c0-.68-.11-1.11-.09-1.14s-.11-.47-.32-1.08a18.79,18.79,0,0,0-.88-2.14l-.28-.55a22.61,22.61,0,0,0,1.67-3.44A8.53,8.53,0,0,0,105.38,10.88ZM85.64,76.8a1.27,1.27,0,0,0,.09-.67.34.34,0,0,0-.09-.2c-.06-.05-.14,0-.21,0-.27.12-.39.21-.37.24-.1-.12-.22-.19-.26-.14a.69.69,0,0,0,0,.68.61.61,0,0,0,.4.41C85.38,77.2,85.54,77.05,85.64,76.8Zm-1.35-2.53a1,1,0,0,0,.37-.62.33.33,0,0,0-.06-.22.2.2,0,0,0-.22,0c-.3.1-.44.17-.44.21s-.23-.19-.25-.16l-.12.14a1.05,1.05,0,0,0-.23.43.35.35,0,0,0,.24.42A.82.82,0,0,0,84.29,74.27Zm-.36,3.6a1.23,1.23,0,0,0,.4-1.09,2.18,2.18,0,0,0-.43-1,3.08,3.08,0,0,0-.73-.71,2.62,2.62,0,0,0-1-.4,6.75,6.75,0,0,0-1.84,0,1.57,1.57,0,0,0-.28.06l-.2.06-.36.11-.3.08H79a1,1,0,0,1-.22,0,1.55,1.55,0,0,0-.52-.07,5,5,0,0,0-.66.09,7,7,0,0,0-1.22.36,6.59,6.59,0,0,0-.65.31,4.47,4.47,0,0,0-1.4,1.12,3.62,3.62,0,0,0-.87,2.37,3.42,3.42,0,0,0,.33,1.4,1.74,1.74,0,0,0,1.28,1,3.27,3.27,0,0,0,1.45-.16,1.26,1.26,0,0,0,.55.33,3.23,3.23,0,0,0,1.62-.11,6,6,0,0,0,1.22-.48h0a1,1,0,0,0,.43.14,1.31,1.31,0,0,0,1-.33c.36-.37.63-.71.74-.79.09.07.06,0,.07,0v0a.07.07,0,0,0,0-.08.17.17,0,0,0-.11,0v0a.28.28,0,0,0,.22,0,.92.92,0,0,0,.28-.14A1.16,1.16,0,0,0,83,79.2C83.15,78.34,83.36,78.27,83.93,77.87ZM71,81.16a1.05,1.05,0,0,0-.44-.86,1.1,1.1,0,0,0-.86-.24c-.11-.11-.25-.16-.28-.11a4.07,4.07,0,0,0-.52.8,1,1,0,0,0,.13,1.1,1.3,1.3,0,0,0,2-.69ZM26.44,19.56c1-1.06,2.15-2,2.07-2.1s-.34.05-.79.28l0,0a4.48,4.48,0,0,0-2.05-1.64A7.57,7.57,0,0,0,21,15.92c-2.81.61-5.75.9-5.75,1.3s2.94.66,6,.48a6,6,0,0,1,3.4.49,2.13,2.13,0,0,1,.71.58,2,2,0,0,1,.18.28s.09,0,.23,0a15.28,15.28,0,0,0-1.46,1.34c-.4.42-.65.74-.67.76s-.24.35-.55.85a11.32,11.32,0,0,0-.88,2A6.8,6.8,0,0,0,21.86,26c0,.58.09.95.16.94s.29-1.45,1-2.72a10.93,10.93,0,0,1,1-1.68l.57-.74s.22-.33.56-.76A17,17,0,0,1,26.44,19.56Z"/>
-                <path class="cls-5"
-                      d="M106,48l-.4.59c-.44.65-1.1,1.55-1.87,2.58l-1.23,1.63c-.2.28-.42.57-.64.86a3.21,3.21,0,0,0-.24.35l.28.14.83.48,2.94,1.73-4.49,1.49c-.05,0-.45-.47-.91-.95l-.36,1.36,1.27-.41h0l-.14.62s0,0,0,.08c-.15.57-.17.66-.18.7l-.16.11a3.05,3.05,0,0,0-.46.28,3.61,3.61,0,0,0-.43.34,8,8,0,0,0-1.28,1.51c-.9,1.44-2.09,3.6-3.53,5.52a15.6,15.6,0,0,1-2.41,2.64,7.65,7.65,0,0,1-1.4.92c-.44.24-.88.46-1.28.66a7.31,7.31,0,0,1-2.8,1,19.36,19.36,0,0,1,2.47-1.56,13.7,13.7,0,0,0,2.35-1.71A15.38,15.38,0,0,0,94,66.25c1.27-1.94,2.25-4,3.17-5.66a9.47,9.47,0,0,1,1.48-1.91c.22-.21.41-.36.55-.48h0a0,0,0,0,0,0,0s0-.07-.15-.19l-.67-.83.11-.29.92-.26,2-.55.51-.14H102l.26,0-.26-.23-2.14-1.4c.39-.44.78-.9,1.17-1.35l.71-.81,1.37-1.51c.65-.72,1.25-1.37,1.74-1.89l.67-.08-.23-.37c-.14.14-.28.3-.44.45a39.45,39.45,0,0,1-4,.2c.23-.08,3.89-.46,4.6-.72Z"/>
-                <path class="cls-8" d="M105.26,48.24l.23.37-.67.08C105,48.54,105.12,48.38,105.26,48.24Z"/>
-                <path class="cls-5"
-                      d="M105.22,9.37a5.15,5.15,0,0,1,.16,1.51,8.53,8.53,0,0,1-.57,2.95,22.61,22.61,0,0,1-1.67,3.44l-.25-.46h0c.1-.75.43-2.05.74-3.31a8.14,8.14,0,0,0,.14-2.54,3.53,3.53,0,0,0,0-.38.59.59,0,0,1,.16.07.52.52,0,0,1,.15.14l-.12.08v0h0l.11-.07a.13.13,0,0,1,0,.06l.19-.19-.2.13,0-.05,1.24-.67a1.34,1.34,0,0,0-1.2-.42l-.23,0,.49-.21C104.78,9.3,105.2,9.27,105.22,9.37Z"/>
-                <path class="cls-5"
-                      d="M105.27,10.11l-1.24.67a.52.52,0,0,0-.15-.14.59.59,0,0,0-.16-.07,3.63,3.63,0,0,0-.18-.68s.11-.09.27-.18h0l.23,0A1.34,1.34,0,0,1,105.27,10.11Z"/>
-                <path class="cls-5"
-                      d="M104.71,22.18a12.5,12.5,0,0,1-.32,2.33,9.46,9.46,0,0,1-1,3.13,16.84,16.84,0,0,1,.18-3.25,15.34,15.34,0,0,0,.07-2.16c-.06-.53-.18-.91-.18-1a9.74,9.74,0,0,0-.2-1,19.92,19.92,0,0,0-.61-2.11,19.93,19.93,0,0,1-1-3.1c.12-.05.67.71,1.24,1.75h0c0,.38,0,.62,0,.65s.13,0,.23-.19l.28.55A18.79,18.79,0,0,1,104.3,20c.21.61.29,1.05.32,1.08S104.71,21.5,104.71,22.18Z"/>
-                <path class="cls-5" d="M104.05,10.83l.2-.13-.19.19A.13.13,0,0,0,104.05,10.83Z"/>
-                <path class="cls-9" d="M104,10.78l0,.05-.11.07h0v0Z"/>
-                <path class="cls-5"
-                      d="M103.81,9.71c-.16.09-.27.14-.27.18a3.63,3.63,0,0,1,.18.68,3,3,0,0,0-2,.18,5.32,5.32,0,0,0-2,1.32,2.47,2.47,0,0,0-.42.63l-.89-1.28a4.6,4.6,0,0,0,.78-.16,19.76,19.76,0,0,0,2.34-.87A10.19,10.19,0,0,1,103.81,9.71Z"/>
-                <path class="cls-7"
-                      d="M104.82,48.69c-.49.52-1.09,1.17-1.74,1.89l-1.37,1.51-.71.81c-.39.45-.78.91-1.17,1.35l-.5-.14c.51-1.75,1-3.78,1.44-5.22A39.45,39.45,0,0,0,104.82,48.69Z"/>
-                <path class="cls-5"
-                      d="M103.44,36.35c0,.89,0,1.8,0,2.47s-.09,1.16-.09,1.19-.06.49-.19,1.16a24.3,24.3,0,0,1-.55,2.43c-.26.87-.57,1.7-.82,2.32a4.74,4.74,0,0,1-.46,1,29.75,29.75,0,0,1,.76-3c0,.23.07.34.1.34a3.08,3.08,0,0,0,.07-1.08,19.72,19.72,0,0,0,.37-2.11c.09-.66.12-1.12.13-1.15s.07-.48.14-1.16.13-1.56.18-2.44c.06-1.36,0-2.73.06-3.29h0a.38.38,0,0,0,.09-.09A22.54,22.54,0,0,1,103.44,36.35Z"/>
-                <path class="cls-5"
-                      d="M102.2,76c.77.33,1.23.65,1.19.72a5.48,5.48,0,0,1-1.33-.28c-.78-.19-1.84-.37-2.91-.52s-2.16-.27-3-.34l-1.42-.12-1.4-.16a9,9,0,0,0-2.87.07,20.46,20.46,0,0,0-2.55.6,5.23,5.23,0,0,0,0-.56,16.27,16.27,0,0,1,2.37-.84,8.8,8.8,0,0,1,3.12-.34c.84,0,1.41.07,1.44.07s.62.07,1.45.21,1.91.34,3,.6A19.74,19.74,0,0,1,102.2,76Z"/>
-                <path class="cls-9" d="M103.19,33a.38.38,0,0,1-.09.09,1,1,0,0,1,0-.25S103.17,32.85,103.19,33Z"/>
-                <path class="cls-5" d="M102.89,16.81l.25.46c-.1.15-.19.21-.23.19S102.84,17.19,102.89,16.81Z"/>
-                <path class="cls-7"
-                      d="M102.23,55.88l-.26,0h-.09l-.51.14-2,.55-.92.26c.23-.67.53-1.67.84-2.77l.5.14,2.14,1.4Z"/>
-                <path class="cls-5"
-                      d="M102.21,42.67c0,.2,0,.38,0,.53l-.06.29c0,.15-.07.3-.11.45,0-.27-.12-.7-.19-1.25s-.15-1.11-.24-1.82a15.8,15.8,0,0,0-.83-2.15,8.19,8.19,0,0,0-1.74-2.09,11.87,11.87,0,0,0-2.37-1.92,11.18,11.18,0,0,0-6.37-1.26,6.3,6.3,0,0,0-2.86,1.31,9.63,9.63,0,0,0-2.22,2.29A7.67,7.67,0,0,0,84,39.73a.85.85,0,0,0,0,.17,5.7,5.7,0,0,0-1.27,1.15,12.59,12.59,0,0,1,1.12-.63.29.29,0,0,0,0,.09c-1.53,1.35-2,3.16-2.14,7.17a19.85,19.85,0,0,0,.43,6.41h0c0,.18,0,.38,0,.58,0,.64-.07,1.32-.07,2a.51.51,0,0,0-.27.32.56.56,0,0,0,.27.61,26.75,26.75,0,0,0,.23,3,24.19,24.19,0,0,0,1.74,6.51l.17.39.14.28a.17.17,0,0,0,.22.13,1.52,1.52,0,0,0,.27-.06l.25-.13c.24-.14.47-.3.71-.45,1-.63,1.88-1.3,2.77-1.94,1.78-1.29,3.42-2.53,4.81-3.61s2.53-2,3.31-2.64c0,0,.38-.49,1-1.26s.82-2.67,1.75-4.81c.12-.27.24-.57.36-.89.39-1,.77-2.27,1.06-3.28h0c-.39,1.44-.93,3.47-1.44,5.22-.31,1.1-.61,2.1-.84,2.77l-.28.09.17.2c-.07.18-.12.33-.17.43-.69,1.47-4.5,4.7-4.5,4.7-1.32,1.16-2.91,2.49-4.65,3.86-.87.68-1.77,1.39-2.73,2.08-.24.16-.48.34-.75.51a3.48,3.48,0,0,1-.52.27,2.75,2.75,0,0,1-.58.12,1.07,1.07,0,0,1-1.21-.56l-.26-.5-.21-.4a28.23,28.23,0,0,1-2.38-13.06c.1-3.63.37-6.1.38-6.25s.24-2.62,1-6.21c.19-.89.42-1.86.74-2.88A9.45,9.45,0,0,1,84,36.19a11.46,11.46,0,0,1,2.62-2.53,7.56,7.56,0,0,1,3.56-1.45,12.07,12.07,0,0,1,7,1.66A12.3,12.3,0,0,1,99.65,36a8.75,8.75,0,0,1,1.75,2.38,13.23,13.23,0,0,1,.74,2.39C102.18,41.54,102.2,42.15,102.21,42.67Z"/>
-                <path class="cls-8" d="M102.22,43.2a3.08,3.08,0,0,1-.07,1.08s-.06-.11-.1-.34.07-.3.11-.45Z"/>
-                <path class="cls-6"
-                      d="M101.86,42.69c.07.55.14,1,.19,1.25a29.75,29.75,0,0,0-.76,3v0h0l0,.18c0,.07,0,.14-.06.23s0,.12,0,.18-.08.32-.13.51-.06.21-.09.31-.06.22-.09.34,0,0,0,0a.61.61,0,0,1,0,.11s0,0,0,0c-.29,1-.67,2.24-1.06,3.28L97.3,52a13.25,13.25,0,0,0,.26-3.76,8.2,8.2,0,0,0-1.14-3.58,23.57,23.57,0,0,0-2-3,7.71,7.71,0,0,0-2.61-2.15,8.87,8.87,0,0,0-7.29,0,4.1,4.1,0,0,0-.56.36.85.85,0,0,1,0-.17,7.67,7.67,0,0,1,1.23-2.68,9.63,9.63,0,0,1,2.22-2.29,6.3,6.3,0,0,1,2.86-1.31,11.18,11.18,0,0,1,6.37,1.26,11.87,11.87,0,0,1,2.37,1.92,8.19,8.19,0,0,1,1.74,2.09,15.8,15.8,0,0,1,.83,2.15C101.71,41.58,101.79,42.19,101.86,42.69Z"/>
-                <path class="cls-8" d="M100.78,48.85a.06.06,0,0,1,0,0h0S100.77,48.86,100.78,48.85Z"/>
-                <path class="cls-5" d="M101.18,57.8l-1.27.41.36-1.36C100.73,57.33,101.13,57.76,101.18,57.8Z"/>
-                <path class="cls-5"
-                      d="M100.61,73.11c0,.24-2-.17-4-.19A18.57,18.57,0,0,0,94,73c-.74.07-1.23.18-1.26.18s-.54,0-1.28.16-1.71.27-2.68.49c-.36.07-.72.16-1.06.24-.06-.23-.13-.46-.2-.68l1-.36c1-.32,2-.58,2.7-.75S92.5,72,92.54,72s.57-.07,1.36-.09a17.91,17.91,0,0,1,2.82.15A13.08,13.08,0,0,1,100.61,73.11Z"/>
-                <path class="cls-6"
-                      d="M97.3,52l2.4.19c-.12.32-.24.62-.36.89-.93,2.14-1.14,4-1.75,4.81s-1,1.26-1,1.26c-.78.64-1.92,1.57-3.31,2.64s-3,2.32-4.81,3.61c-.89.64-1.82,1.31-2.77,1.94-.24.15-.47.31-.71.45l-.25.13a1.52,1.52,0,0,1-.27.06.17.17,0,0,1-.22-.13l-.14-.28-.17-.39a24.19,24.19,0,0,1-1.74-6.51,26.75,26.75,0,0,1-.23-3,.91.91,0,0,0,.3.13,7.56,7.56,0,0,0,2,.08,26.1,26.1,0,0,0,4.51-.76,23.83,23.83,0,0,0,5.93-2.39,11.9,11.9,0,0,0,1.48-1.06,5.46,5.46,0,0,0,.68-.68,1.08,1.08,0,0,0,.16-.2,1.39,1.39,0,0,0,.16-.28C97.2,52.3,97.25,52.13,97.3,52Z"/>
-                <path class="cls-8" d="M98.21,57l.28-.09-.11.29Z"/>
-                <path class="cls-5"
-                      d="M97.56,48.22A13.25,13.25,0,0,1,97.3,52c0,.15-.1.32-.16.49a1.39,1.39,0,0,1-.16.28,1.08,1.08,0,0,1-.16.2,5.46,5.46,0,0,1-.68.68,11.9,11.9,0,0,1-1.48,1.06,23.83,23.83,0,0,1-5.93,2.39,26.1,26.1,0,0,1-4.51.76,7.56,7.56,0,0,1-2-.08.91.91,0,0,1-.3-.13q0-.48,0-.93a.72.72,0,0,1,.52-.1,5.44,5.44,0,0,0,1.45.11h0a4.67,4.67,0,0,0,3,.41,5.72,5.72,0,0,0,3.14-1.56,20.62,20.62,0,0,0,4-1.71,11,11,0,0,0,1.36-.94,3.94,3.94,0,0,0,.59-.56l.13-.13,0-.12a1.69,1.69,0,0,0,.12-.36,12,12,0,0,0,.31-3.46c-.08-2.33-1.53-4.38-2.83-6.2a7.2,7.2,0,0,0-2.34-2,7.45,7.45,0,0,0-2.72-.79,5.28,5.28,0,0,0-.89,0h0a3.26,3.26,0,0,0-2.7.27,7.65,7.65,0,0,0-1.24.84h0l-.17.08A4.44,4.44,0,0,1,84,39.9a4.1,4.1,0,0,1,.56-.36,8.87,8.87,0,0,1,7.29,0,7.71,7.71,0,0,1,2.61,2.15,23.57,23.57,0,0,1,2,3A8.2,8.2,0,0,1,97.56,48.22Z"/>
-                <path class="cls-10"
-                      d="M96.73,48.28a12,12,0,0,1-.31,3.46,1.69,1.69,0,0,1-.12.36l0,.12-.13.13a3.94,3.94,0,0,1-.59.56,11,11,0,0,1-1.36.94,20.62,20.62,0,0,1-4,1.71,10.5,10.5,0,0,0,3-7.37c.16-3.84-2.37-8.07-5.21-9a5.28,5.28,0,0,1,.89,0,7.45,7.45,0,0,1,2.72.79,7.2,7.2,0,0,1,2.34,2C95.2,43.9,96.65,46,96.73,48.28Z"/>
-                <path class="cls-8"
-                      d="M94.77,7.06c.28.3.37.48.32.56s-.28.06-.61,0l-.41-.1-.49-.53.85-.16C94.55,6.89,94.67,7,94.77,7.06Z"/>
-                <path class="cls-5"
-                      d="M94.43,6.78l-.85.16.49.53c-.54-.15-1.29-.41-2.18-.74-1.15-.43-2.52-1-4-1.53a27.59,27.59,0,0,0-3.84-1,5.49,5.49,0,0,1,1.61-.56l-.76-1.94,0-.1a24.21,24.21,0,0,1,3.81,1.55,37.19,37.19,0,0,1,3.82,2.29C93.33,6,94,6.43,94.43,6.78Z"/>
-                <path class="cls-5"
-                      d="M91.41,77.48c1.08.46,2,1.11,2,1.26a9.74,9.74,0,0,1-2.24-.48c-.54-.13-1.09-.23-1.51-.3S89,77.9,89,77.9a6.78,6.78,0,0,0-.69-.07q-.34,0-.78,0h0a5.1,5.1,0,0,0,.32-1,7,7,0,0,1,1.25-.07l.24,0a5.74,5.74,0,0,1,.57.14A13.69,13.69,0,0,1,91.41,77.48Z"/>
-                <path class="cls-11"
-                      d="M88,39.23c2.84.89,5.37,5.12,5.21,9a10.5,10.5,0,0,1-3,7.37q-.87.28-1.68.48a27.13,27.13,0,0,1-4.34.67h-.18a4.1,4.1,0,0,1-1.86-2.61h0c.17-3.25.45-5.4.46-5.53s.19-2.59.82-6.08c.12-.63.26-1.3.43-2a.79.79,0,0,1,.19-.17h0l.06,0a10.76,10.76,0,0,1,3.88-1.08Z"/>
-                <path class="cls-5"
-                      d="M88.46,56q.81-.2,1.68-.48A5.72,5.72,0,0,1,87,57.12a4.67,4.67,0,0,1-3-.41h.17A27.13,27.13,0,0,0,88.46,56Z"/>
-                <path class="cls-5"
-                      d="M87.93,75.4a5.23,5.23,0,0,1,0,.56l-1,.28c0-.12,0-.26.07-.39C87.26,75.7,87.58,75.56,87.93,75.4Z"/>
-                <path class="cls-5"
-                      d="M87.86,74.85a3.31,3.31,0,0,1,.07.55c-.35.16-.67.3-.93.45a3.44,3.44,0,0,0,0-.91c0-.22,0-.44-.07-.66l.73-.19C87.75,74.34,87.8,74.59,87.86,74.85Z"/>
-                <path class="cls-5"
-                      d="M87.93,76a4.59,4.59,0,0,1-.11.84,9.21,9.21,0,0,0-1.15.25,4.8,4.8,0,0,0,.26-.81Z"/>
-                <path class="cls-5"
-                      d="M87.82,76.8a5.1,5.1,0,0,1-.32,1h0l-.73,0-.57.07a4.5,4.5,0,0,0,.31-.55,3.54,3.54,0,0,0,.16-.34A9.21,9.21,0,0,1,87.82,76.8Z"/>
-                <path class="cls-5" d="M87.49,73.41c.07.22.14.45.2.68l-.73.19a6.17,6.17,0,0,0-.09-.62Z"/>
-                <path class="cls-5"
-                      d="M87.49,73.41l-.62.25c-.09-.51-.19-1-.28-1.36a2.9,2.9,0,0,0-.31-.76c-.12-.14-.25-.17-.24-.23s.14-.09.38,0a1.82,1.82,0,0,1,.59.79s0,0,0,0A8.32,8.32,0,0,1,87.49,73.41Z"/>
-                <path class="cls-5"
-                      d="M85.23,39.5a3.26,3.26,0,0,1,2.7-.27,10.76,10.76,0,0,0-3.88,1.08l-.06,0A7.65,7.65,0,0,1,85.23,39.5Z"/>
-                <path class="cls-5"
-                      d="M86.77,77.87l.73,0a8.25,8.25,0,0,1-.66,1.25,10.41,10.41,0,0,1-.93,1,12.48,12.48,0,0,1-2.29,1.78,3.52,3.52,0,0,1-1,.39,5.18,5.18,0,0,1-1.87.13c-.76-.08-1.24-.27-1.24-.35s.52,0,1.25-.1a4.81,4.81,0,0,0,2.4-.77,13.31,13.31,0,0,0,1.94-1.82,11.77,11.77,0,0,0,.76-1s.14-.19.32-.48Z"/>
-                <path class="cls-5" d="M87,75.85c0,.13,0,.27-.07.39-.39.11-.63.17-.65.12S86.52,76.1,87,75.85Z"/>
-                <path class="cls-5"
-                      d="M86.87,73.66a6.17,6.17,0,0,1,.09.62,6.61,6.61,0,0,1-2.09.42A6.94,6.94,0,0,1,86.87,73.66Z"/>
-                <path class="cls-5"
-                      d="M86.67,77.05a3.54,3.54,0,0,1-.16.34,4.5,4.5,0,0,1-.31.55c-.88.12-1.64.28-1.68.15s1-.7,2.1-1Z"/>
-                <path class="cls-5"
-                      d="M85.73,76.13a1.27,1.27,0,0,1-.09.67c-.1.25-.26.4-.48.37a.61.61,0,0,1-.4-.41.69.69,0,0,1,0-.68s.16,0,.26.14c-.22.2,0,.76.22.72s.4-1,.25-.91a4.6,4.6,0,0,0-.47.19s.1-.12.37-.24c.07,0,.15-.1.21,0A.34.34,0,0,1,85.73,76.13Z"/>
-                <path class="cls-5"
-                      d="M84.87,1.72l.76,1.94A5.49,5.49,0,0,0,84,4.22c-.41-.08-.81-.15-1.23-.21l-.63-.11a5.65,5.65,0,0,1,.46-.41A18.13,18.13,0,0,1,84.87,1.72Z"/>
-                <path class="cls-5"
-                      d="M85.08,76.24a1,1,0,0,0,.11.14l0,0,0,0,0,0s0,.14.09,0a.53.53,0,0,0,.07-.15.24.24,0,0,0,0-.12s0,0-.07,0A.79.79,0,0,1,85.08,76.24Zm.45-.21c.15,0,0,.87-.25.91s-.44-.52-.22-.72A4.6,4.6,0,0,1,85.53,76Z"/>
-                <path class="cls-5"
-                      d="M85.41,76.24a.24.24,0,0,1,0,.12.53.53,0,0,1-.07.15c0,.1-.12,0-.09,0l0,0,0,0,0,0a1,1,0,0,1-.11-.14.79.79,0,0,0,.26,0S85.4,76.21,85.41,76.24Z"/>
-                <path class="cls-5"
-                      d="M84.9,1.62l0,.1a18.13,18.13,0,0,0-2.25,1.77,5.65,5.65,0,0,0-.46.41l-.79-.12-.72-.11a4.86,4.86,0,0,0-.56,0,16.22,16.22,0,0,0-2.62.2c-.55.08-1.09.18-1.63.28l0,0a8.85,8.85,0,0,0-1.24-1.72,2.4,2.4,0,0,0-.81-.54L73.62.66C74.74.53,75.92.4,77.14.34A17.16,17.16,0,0,1,80.4.43a8,8,0,0,1,.9.18L82,.79c.47.14.94.26,1.41.39S84.41,1.47,84.9,1.62Z"/>
-                <path class="cls-5"
-                      d="M84.66,73.65a1,1,0,0,1-.37.62.82.82,0,0,1-.71.16.35.35,0,0,1-.24-.42,1.05,1.05,0,0,1,.23-.43l.12-.14s.13,0,.25.16c-.48.48-.43.7,0,.6s.81-.82.4-.7l-.4.1s.14-.11.44-.21a.2.2,0,0,1,.22,0A.33.33,0,0,1,84.66,73.65Z"/>
-                <path class="cls-5"
-                      d="M84.34,73.5c.41-.12,0,.62-.4.7s-.48-.12,0-.6a1.09,1.09,0,0,1,.18.23l-.07,0s0,.1.07,0a.37.37,0,0,0,.14-.12c.07-.07,0-.19,0-.16s-.28,0-.29,0Z"/>
-                <path class="cls-5"
-                      d="M84.33,76.78a1.23,1.23,0,0,1-.4,1.09c-.57.4-.78.47-1,1.33a1.16,1.16,0,0,1-.42.54.92.92,0,0,1-.28.14.28.28,0,0,1-.22,0,0,0,0,0,1,0-.05,1.65,1.65,0,0,1,.11-.36.49.49,0,0,0,0-.2c0-.09-.09,0-.06-.4,0-.09,0-.06,0-.07H82l-.14,0a.86.86,0,0,0-.25.1c-.15,0-.23.06-.24,0s0-.08.16-.18a1,1,0,0,1,.68-.25c.17.16,0,.37,0,.54s.1,0,.14,0a.43.43,0,0,0,.15-.15.53.53,0,0,0,.12-.37v-.06a.66.66,0,0,1,0-.15.7.7,0,0,1,.08-.16,1,1,0,0,1,.12-.2,2.19,2.19,0,0,1,.34-.34c.11-.11.26-.21.31-.26.26-.23.13-.68-.2-1.08a2.17,2.17,0,0,0-.57-.48,1.61,1.61,0,0,0-.67-.22,5.82,5.82,0,0,0-1.56,0l-.1,0-.2.07-.36.13-.42.13a2.24,2.24,0,0,1-.51,0,2.14,2.14,0,0,1-.44-.08s0,0-.12,0a4.8,4.8,0,0,0-.48.08,9.32,9.32,0,0,0-1,.35,4.54,4.54,0,0,0-1.67,1.05,2.67,2.67,0,0,0-.71,1.68,2.62,2.62,0,0,0,.18,1,.84.84,0,0,0,.63.56,3.06,3.06,0,0,0,2.11-.52,3.58,3.58,0,0,0,.45-.31l.2-.17s.08-.07.11-.11a.33.33,0,0,0,.12-.27c0-.1-.13-.14-.21-.17a2.25,2.25,0,0,0-.72-.06.77.77,0,0,0-.52.18,1.94,1.94,0,0,0-.22.34c-.06.09-.12.11-.13.1s0-.06,0-.14a1,1,0,0,1,.15-.45,1,1,0,0,1,.66-.37,2.43,2.43,0,0,1,1,0,.68.68,0,0,1,.51.37.75.75,0,0,1-.14.68,3,3,0,0,1-.22.31l-.23.23a3.88,3.88,0,0,1-.49.4c-.19.13-.39.25-.59.36a.79.79,0,0,1-.27-.26s-.17,0-.29.11-.2.21-.18.24l.14.17a3.27,3.27,0,0,1-1.45.16,1.74,1.74,0,0,1-1.28-1,3.42,3.42,0,0,1-.33-1.4,3.62,3.62,0,0,1,.87-2.37,4.47,4.47,0,0,1,1.4-1.12,6.59,6.59,0,0,1,.65-.31,7,7,0,0,1,1.22-.36,5,5,0,0,1,.66-.09,1.55,1.55,0,0,1,.52.07,1,1,0,0,0,.22,0h.2l.3-.08.36-.11.2-.06a1.57,1.57,0,0,1,.28-.06,6.75,6.75,0,0,1,1.84,0,2.62,2.62,0,0,1,1,.4,3.08,3.08,0,0,1,.73.71A2.18,2.18,0,0,1,84.33,76.78Z"/>
-                <path class="cls-5"
-                      d="M84.23,73.64c.07,0,.1.09,0,.16a.37.37,0,0,1-.14.12c-.08,0-.12,0-.07,0l.07,0a1.09,1.09,0,0,0-.18-.23S84.1,73.64,84.23,73.64Z"/>
-                <path class="cls-5"
-                      d="M82.79,4c.42.06.82.13,1.23.21-.23.11-.47.23-.74.39A13.48,13.48,0,0,0,82,5.46,6.39,6.39,0,0,0,80.7,6.84,14.63,14.63,0,0,0,79.51,9a27.31,27.31,0,0,0-1.34,3.58l-.27.87s-.05.07-.06,0l0-.23-.06-.45c0-.29-.07-.58-.11-.87-.09-.58-.16-1.14-.23-1.67a10.17,10.17,0,0,0-.37-1.58,9.74,9.74,0,0,0-.42-1,12.38,12.38,0,0,0-1.84-2.74c-.18-.2-.35-.36-.5-.51.52-.11,1-.22,1.55-.31a23.37,23.37,0,0,1,1.48,3.12,10.71,10.71,0,0,1,.37,1.09,5.5,5.5,0,0,1,.18.88c0,.33.07.67.1,1l.06.56,0,.28v.15c0,.06,0,0,0-.07l.15-.46c.26-.76.53-1.49.77-2.09a22.48,22.48,0,0,1,1.09-2.25,8.77,8.77,0,0,1,1.29-1.72c.26-.26.51-.5.75-.71Z"/>
-                <path class="cls-10" d="M83.81,40.42l.17-.08a.79.79,0,0,0-.19.17A.29.29,0,0,1,83.81,40.42Z"/>
-                <path class="cls-5"
-                      d="M84,39.9a4.44,4.44,0,0,0-.15.52,12.59,12.59,0,0,0-1.12.63A5.7,5.7,0,0,1,84,39.9Z"/>
-                <path class="cls-10"
-                      d="M83.94,56.71a5.44,5.44,0,0,1-1.45-.11.72.72,0,0,0-.52.1c0-.7,0-1.38.07-2,0-.2,0-.4,0-.58A4.1,4.1,0,0,0,83.94,56.71Z"/>
-                <path class="cls-5"
-                      d="M84.06,107.45a1,1,0,0,1-.25.63,1.88,1.88,0,0,1-.44.37,2.92,2.92,0,0,1-.85.48,1.52,1.52,0,0,1-.7.06.52.52,0,0,0,0-.11,1.53,1.53,0,0,0,.6-.16,3.44,3.44,0,0,0,.74-.53c.26-.22.5-.46.47-.74a3.74,3.74,0,0,0-.84-1.65,1.22,1.22,0,0,0-.63-.42s-.05-.1-.05-.22v-.07c0-.16.07-.29.16-.28a2.39,2.39,0,0,1,.33.13,2,2,0,0,1,.6.51,3.85,3.85,0,0,1,.52.87A3,3,0,0,1,84.06,107.45Z"/>
-                <path class="cls-7"
-                      d="M83.65,107.45c0,.28-.21.52-.47.74a3.44,3.44,0,0,1-.74.53,1.53,1.53,0,0,1-.6.16c.06-.39.11-.75.14-1.09a11.49,11.49,0,0,0,.1-1.78,8,8,0,0,0,0-.85h0c0,.12,0,.22.05.22a1.22,1.22,0,0,1,.63.42A3.74,3.74,0,0,1,83.65,107.45Z"/>
-                <path class="cls-5"
-                      d="M83.79,40.51c-.17.67-.31,1.34-.43,2-.63,3.49-.79,5.93-.82,6.08s-.29,2.28-.46,5.53a19.85,19.85,0,0,1-.43-6.41C81.83,43.67,82.26,41.86,83.79,40.51Z"/>
-                <path class="cls-12"
-                      d="M83.27,76.29c.33.4.46.85.2,1.08,0,0-.2.15-.31.26a2.19,2.19,0,0,0-.34.34,1,1,0,0,0-.12.2.7.7,0,0,0-.08.16.66.66,0,0,0,0,.15v.06a.53.53,0,0,1-.12.37.43.43,0,0,1-.15.15s-.14.1-.14,0,.2-.38,0-.54a1,1,0,0,0-.68.25c-.12.1-.17.16-.16.18s.09,0,.24,0a.86.86,0,0,1,.25-.1l.14,0h.09s0,0,0,.07c0,.36.08.31.06.4a.49.49,0,0,1,0,.2,1.65,1.65,0,0,0-.11.36,0,0,0,0,0,0,.05v0c-.1,0-.16.06-.26.09s-.46.35-.69.49a1.06,1.06,0,0,1-.77.22.31.31,0,0,0,.08-.26c0-.15-.15-.14-.16-.13a.49.49,0,0,1,0,.16c0,.07-.14.16-.31.23a6.21,6.21,0,0,1-1.4.39,2.88,2.88,0,0,1-1.35,0,.29.29,0,0,1-.12-.07c.2-.11.4-.23.59-.36a3.88,3.88,0,0,0,.49-.4l.23-.23a3,3,0,0,0,.22-.31.75.75,0,0,0,.14-.68.68.68,0,0,0-.51-.37,2.43,2.43,0,0,0-1,0,1,1,0,0,0-.66.37,1,1,0,0,0-.15.45c0,.08,0,.13,0,.14s.07,0,.13-.1a1.94,1.94,0,0,1,.22-.34.77.77,0,0,1,.52-.18,2.25,2.25,0,0,1,.72.06c.08,0,.19.07.21.17a.33.33,0,0,1-.12.27s-.08.07-.11.11l-.2.17a3.58,3.58,0,0,1-.45.31,3.06,3.06,0,0,1-2.11.52.84.84,0,0,1-.63-.56,2.62,2.62,0,0,1-.18-1,2.67,2.67,0,0,1,.71-1.68,4.54,4.54,0,0,1,1.67-1.05,9.32,9.32,0,0,1,1-.35,4.8,4.8,0,0,1,.48-.08c.1,0,.09,0,.12,0a2.14,2.14,0,0,0,.44.08,2.24,2.24,0,0,0,.51,0l.42-.13.36-.13.2-.07.1,0a5.82,5.82,0,0,1,1.56,0,1.61,1.61,0,0,1,.67.22A2.17,2.17,0,0,1,83.27,76.29Z"/>
-                <path class="cls-5"
-                      d="M83.4,95.65a5,5,0,0,1-.15,1.26c-.18.7-.46,1.44-.68,2.26-.3,1-.52,2-.67,2.67,0-.3-.08-.65-.15-1s-.08-.49-.12-.75.07-.71.13-1.09c.12-.83.36-1.73.44-2.29a3.69,3.69,0,0,0,0-.69,1.46,1.46,0,0,0,0-.26A1.53,1.53,0,0,0,82,95a3.22,3.22,0,0,0-1.67-1.08l-.19-.08c-.08-.32-.16-.63-.26-.94.23.09.47.16.71.23a4,4,0,0,1,2.3,1.25,2.25,2.25,0,0,1,.41.91A3.37,3.37,0,0,1,83.4,95.65Z"/>
-                <path class="cls-5"
-                      d="M82.68,82.42s-.14.5-.65,1.07A5.24,5.24,0,0,1,79.66,85a7.93,7.93,0,0,1-1.81.32.2.2,0,0,1,0-.07.57.57,0,0,0-.56-.54l-.87.35,0-.72.22-.15a3.29,3.29,0,0,0,.36.07,8.13,8.13,0,0,0,2.49-.06,5.54,5.54,0,0,0,2.27-1c.51-.39.82-.75.93-.75Z"/>
-                <path class="cls-7"
-                      d="M82.24,96a3.69,3.69,0,0,1,0,.69c-.08.56-.32,1.46-.44,2.29-.06.38-.1.74-.13,1.09-.28-1.53-.72-3.37-1.19-5.21l-.28-1.06.19.08A3.22,3.22,0,0,1,82,95a1.53,1.53,0,0,1,.2.78A1.46,1.46,0,0,1,82.24,96Z"/>
-                <path class="cls-5"
-                      d="M82.08,80.07c-.11.08-.38.42-.74.79a1.31,1.31,0,0,1-1,.33,1,1,0,0,1-.43-.14l.17-.11a.7.7,0,0,0,.22-.2h0a1.06,1.06,0,0,0,.77-.22c.23-.14.48-.37.69-.49s.16-.11.26-.09a.17.17,0,0,1,.11,0,.07.07,0,0,1,0,.08v0S82.17,80.14,82.08,80.07Z"/>
-                <path class="cls-5"
-                      d="M82.08,105.16a8,8,0,0,1,0,.85,11.49,11.49,0,0,1-.1,1.78c0,.34-.08.7-.14,1.09-.16,0-.26,0-.26,0s.08.07.24.09a27.84,27.84,0,0,1-3.48,9.16q-.84,1.48-1.89,3c.15-.61.2-1,.1-1s-1.19,1.73-2.18,3.55c-.18.31-.34.63-.51.93l0,0a9,9,0,0,1-2.94,2.24,16.18,16.18,0,0,1-4.11,1.32c-.38.08-.78.15-1.17.2,0-.06,0-.11,0-.16s0-.24,0-.31v-.05h-.08l-.66,0-1,0c0,.06,0,.32.05.78h-.11c0-.49-.08-.76-.15-.77s-.1.28-.2.8l-1,0a24.76,24.76,0,0,1-4.53-.13A16.43,16.43,0,0,1,54,127.45c-.15-.3-.31-.56-.44-.77l0,0,.12-.34-2.19-.79s-.06.21-.21.59c-.65-.4-1.29-.82-1.91-1.26a30.73,30.73,0,0,1-3.57-3c-.12-.12-.24-.25-.34-.37a1.41,1.41,0,0,0,.21-1.08,16.63,16.63,0,0,1-.83-2.51l.24-.12a12.13,12.13,0,0,0,2,2.87l.24.24-.06,0,.29.43.15-.11c.38.37.78.73,1.19,1.08a.36.36,0,0,1-.31-.06l-.27.45a1,1,0,0,0,.49.14.7.7,0,0,0,.5-.19l1.08.84a18.06,18.06,0,0,0,7.76,3.56,26.16,26.16,0,0,0,4.26.21,29.92,29.92,0,0,0,4.18-.38c2.69-.48,5.25-1.42,6.74-3.39a47.32,47.32,0,0,0,4.27-5.83,27.07,27.07,0,0,0,4-10c.41-2.57.23-4.09.36-4.09A4.07,4.07,0,0,1,82,104.7C82.05,104.84,82.06,105,82.08,105.16Z"/>
-                <path class="cls-8" d="M82,56.7q0,.45,0,.93A.56.56,0,0,1,81.7,57,.51.51,0,0,1,82,56.7Z"/>
-                <path class="cls-5"
-                      d="M81.9,101.84c.12,1.08.09,1.77,0,1.79s-.47-.9-1-2.28h0c0-.08-.06-.18-.09-.27-.37-1-.81-2.24-1.29-3.55l.25-.23a5.9,5.9,0,0,0,.65-.83.48.48,0,0,0-.29-.67c-.3-.14-.59-.12-.7,0,0,0-.12.19-.36.48-.1-.3-.22-.6-.33-.92-.19-.5-.39-1-.56-1.49a1.17,1.17,0,0,0,.2-.06l.59-.14-.64-1.19a6,6,0,0,0,1.84,1.29l.28,1.06c.47,1.84.91,3.68,1.19,5.21-.13,1.28-.09,2.34.08,2.34S81.82,102.2,81.9,101.84Z"/>
-                <path class="cls-7"
-                      d="M80.89,101.35c.51,1.38.81,2.3,1,2.28-.13,0,0,1.52-.36,4.09a27.07,27.07,0,0,1-4,10,47.32,47.32,0,0,1-4.27,5.83c-1.49,2-4.05,2.91-6.74,3.39a29.92,29.92,0,0,1-4.18.38,26.16,26.16,0,0,1-4.26-.21,18.06,18.06,0,0,1-7.76-3.56l-1.08-.84h0a2.73,2.73,0,0,0,.47-2.3.31.31,0,0,0-.33-.21c-.18,0-1,0-1.49,0l-.36,0,.1.34s-.06.22-.38.44l-.24-.24a12.13,12.13,0,0,1-2-2.87c-.11-.21-.21-.43-.32-.64-.18-.36-.34-.73-.49-1.11a.58.58,0,0,0,.25,0,.66.66,0,0,0,.49-.55.88.88,0,0,0-.3-.74,1.16,1.16,0,0,0-.32-.2,2.09,2.09,0,0,1-.74-.32l-.1-.07a43.49,43.49,0,0,1-1.36-5c-.27-1.32-.5-2.63-.67-3.92a2,2,0,0,1,.23-.08c.45-.13,1.16-.34,2.15-.68a18.65,18.65,0,0,0,3.74-1.7c.73-.46,1.48-1,2.28-1.62L51.25,100c.55-.44.84-.82,1.39-1.29,0-.08.57-.61,1-1l0,0a12.26,12.26,0,0,1-1.7.11c-.7.08-1.45.15-2,.17l-1.46,0a14.44,14.44,0,0,1-2.5-.18,9.35,9.35,0,0,1-3.28-1.15,6.13,6.13,0,0,1-1.21-.94c.07-.52.15-1,.24-1.52a28.67,28.67,0,0,1,.74-2.94,8.35,8.35,0,0,0,1.45.35,12.55,12.55,0,0,0,3.54-.14l1.1-.15c.46-.09.94-.17,1.45-.25l1.58-.29.84-.17c.23,0,.07,0,0-.09s-.25,0-.27-.1-.29-.18-.29-.2l-.31-.12,3-.45s0,0,0,0A27.49,27.49,0,0,0,57.73,87c.79-.66,1.61-1.3,2.24-1.72.32-.23.6-.41.8-.53a28.94,28.94,0,0,0,6.09,1.68,15.74,15.74,0,0,0,3.48,0,0,0,0,0,1,0,0c.06.1.22.17.33.26a5,5,0,0,0,.79.49,2.9,2.9,0,0,0,.83.28,4.66,4.66,0,0,0,2.09-.06,10.12,10.12,0,0,0,1.18-.4c0,.09.12.29.23.58a.51.51,0,0,1,.13.34h0s0,0,0,0h0s0,0,0,.08a2.32,2.32,0,0,1-.33.91,3.74,3.74,0,0,1-.32.5A3.93,3.93,0,0,1,73,90.75c-.27.06-.58.11-.9.16l-1.08.19a7.42,7.42,0,0,0-1.26.24l-.29.07-.16,0s0,.11,0,.15a3.33,3.33,0,0,0,.27.61,3.63,3.63,0,0,0,.93,1.06,5.33,5.33,0,0,0,1,.64,6.34,6.34,0,0,0,2,.55,12.16,12.16,0,0,0,3.05-.22l1.51-.33h0c.17.5.37,1,.56,1.49.11.32.23.62.33.92a1.77,1.77,0,0,1-.15.18,4.63,4.63,0,0,1-1.72,1.2,6.64,6.64,0,0,1-3.08.43c-.6,0-1.24-.09-1.87-.16a14.82,14.82,0,0,1-1.68-.3c-.63-.13-1.47-.41-2.3-.63l.21.24,0,.07,0,0,.08.07.63.58a15.51,15.51,0,0,0,1.32,1.14c.24.2.51.37.75.56l.52.33c.33.21.67.4,1,.57a9.32,9.32,0,0,0,4,1.08A9.54,9.54,0,0,0,80.89,101.35Zm-3.41,6.31A5.93,5.93,0,0,0,78,107a8.2,8.2,0,0,0-.8-.22,2.67,2.67,0,0,0-.48-.08c-.29,0-.56,0-.54.1s.2.07.47.19l.43.18c.11,0,.08.06.09.07s0,0-.11.07l-.19.21a1.27,1.27,0,0,1-.43.31c-.16,0-.27,0-.29-.19s0-.28,0-.3-.14.07-.19.29a.46.46,0,0,0,.09.4.61.61,0,0,0,.46.2A1.71,1.71,0,0,0,77.48,107.66Zm-.25,5.26a.32.32,0,0,0,0-.52,2.91,2.91,0,0,0-1.31-.1l-.59,0a2.57,2.57,0,0,0-.55.06,6.88,6.88,0,0,0-1.83.74,2.43,2.43,0,0,1-.56.25c-.14,0-.22,0-.23,0s-.16,0-.17.21a1.09,1.09,0,0,0,.31.6,1.15,1.15,0,0,0,1.87.19,8.34,8.34,0,0,1,1.63-1,1,1,0,0,1,.19-.07l.32-.1c.2-.07.37-.13.53-.17A2.34,2.34,0,0,0,77.23,112.92Zm-2,6.94c.09-.38-.29-.53-.54-.45a2.07,2.07,0,0,0-.36.08,6,6,0,0,0-1.1.61c-.5.33-.94.74-.88.81a5.65,5.65,0,0,0,1.09-.45,7.69,7.69,0,0,1,.74-.3l.34-.12a.61.61,0,0,0,.12-.05s.06,0,.06,0a2.43,2.43,0,0,1-.07.39c0,.17-.08.33-.12.45-.08.29-.28.25-.31.3s0,.07.15.08a.47.47,0,0,0,.39-.23,3.67,3.67,0,0,0,.26-.48A5.78,5.78,0,0,0,75.28,119.86Zm-8.08-7a.31.31,0,0,0-.12-.41,1,1,0,0,0-.26-.08s-.25,0-.56,0a5.12,5.12,0,0,0-1.2.05,1.41,1.41,0,0,0-.92.82c-.12.31-.14.51-.1.52a3.91,3.91,0,0,0,1.66-.11,2.75,2.75,0,0,0,1.1-.51.37.37,0,0,1,.14-.07l.1,0C67.09,113,67.12,113,67.2,112.86Zm-1.65,5.55c0-.23-.2-.42-.39-.5a5.67,5.67,0,0,0-.93-.24l-.64-.06a1.8,1.8,0,0,0-1.39.55,2.16,2.16,0,0,0-.64,1.87,3.9,3.9,0,0,1,.92-1.57,1.37,1.37,0,0,1,1.06-.31l.61.11a5.27,5.27,0,0,1,.81.13c.05,0,.05,0,.07,0v0a.83.83,0,0,1-.11.15,7.65,7.65,0,0,1-.59.57c-.61.25-1.22.33-1.22.39a2.3,2.3,0,0,0,1.37-.09,4.72,4.72,0,0,0,.75-.56,1.52,1.52,0,0,0,.17-.18A.73.73,0,0,0,65.55,118.41Zm-6.25,4.84a.44.44,0,0,0,.12-.43c0-.16-.23-.28-.38-.35-.57-.25-1.08,0-1,.08s.12,0,.28,0a1.77,1.77,0,0,1,.49.21c.07,0,0,.09,0,.09s-.1,0-.1,0a2.28,2.28,0,0,1-.82.14,1.14,1.14,0,0,1-.32-.05c-.12,0,.07,0,.08.11a.94.94,0,0,1,.1.14s-.08,0-.09,0,0,0,0,.1,0,.09,0,.09l.18,0a1.87,1.87,0,0,0,.72.07,1.83,1.83,0,0,0,.33-.05A1.37,1.37,0,0,0,59.3,123.25ZM55,111.84a.4.4,0,0,0,.1-.3.42.42,0,0,0-.13-.27.7.7,0,0,0-.29-.17,2,2,0,0,0-.54-.11,5.16,5.16,0,0,0-1.38.1c-.46.09-.93.12-1.29.16l-.26,0a.31.31,0,0,0-.12,0c-.05,0-.08.12-.05.15s.16.1.17.1,0,0,0-.12a1.55,1.55,0,0,1,.31,0,8.14,8.14,0,0,0,1.33,0,5.81,5.81,0,0,1,1.27,0l.33.08h0s.06,0,0,.06c-.31.23-.63.67-1,.74a1.22,1.22,0,0,1-.6-.09c-.21-.06-.42-.11-.59-.17a1.61,1.61,0,0,0-.6-.1s.19.16.51.32.37.17.56.26a1.56,1.56,0,0,0,.77.19,1.54,1.54,0,0,0,.75-.34,5.59,5.59,0,0,1,.48-.38A1,1,0,0,0,55,111.84Z"/>
-                <path class="cls-5"
-                      d="M81.75,100.83c.07.36.11.71.15,1s-.15.58-.19.58-.21-1.06-.08-2.34Q81.69,100.47,81.75,100.83Z"/>
-                <path class="cls-5"
-                      d="M81.84,108.88a.52.52,0,0,1,0,.11c-.16,0-.24-.07-.24-.09S81.68,108.89,81.84,108.88Z"/>
-                <path class="cls-6"
-                      d="M82.16,3.9c-.24.21-.49.45-.75.71a8.77,8.77,0,0,0-1.29,1.72A22.48,22.48,0,0,0,79,8.58c-.24.6-.51,1.33-.77,2.09l-.15.46s0,.13,0,.07v-.15l0-.28L78,10.21c0-.35-.06-.69-.1-1a5.5,5.5,0,0,0-.18-.88,10.71,10.71,0,0,0-.37-1.09A23.37,23.37,0,0,0,75.84,4.1c.54-.1,1.08-.2,1.63-.28a16.22,16.22,0,0,1,2.62-.2,4.86,4.86,0,0,1,.56,0l.72.11Z"/>
-                <path class="cls-5"
-                      d="M80.89,101.34h0a9.54,9.54,0,0,1-4,.36,9.32,9.32,0,0,1-4-1.08c-.33-.17-.67-.36-1-.57l-.52-.33c-.24-.19-.51-.36-.75-.56A15.51,15.51,0,0,1,69.25,98l-.63-.58-.08-.07,0,0,0-.07L68.26,97c.83.22,1.67.5,2.3.63a14.82,14.82,0,0,0,1.68.3c.63.07,1.27.13,1.87.16a6.64,6.64,0,0,0,3.08-.43,4.63,4.63,0,0,0,1.72-1.2,1.77,1.77,0,0,0,.15-.18c.16.4.3.81.45,1.2a5.66,5.66,0,0,1-1.92,1.2,7.69,7.69,0,0,1-3.54.4c-.62-.05-1.28-.12-1.93-.22a1.88,1.88,0,0,1-.34-.08l-.28-.07s-.15,0-.14,0l.08.09a1.79,1.79,0,0,0,.24.22l.14.12.42.3c.31.21.62.39.93.58a9.16,9.16,0,0,0,3.73,1.21,18.54,18.54,0,0,0,2.88.14A7.14,7.14,0,0,1,80.89,101.34Z"/>
-                <path class="cls-6"
-                      d="M80.8,101.07c0,.09.06.19.09.27a7.14,7.14,0,0,0-1.11,0,18.54,18.54,0,0,1-2.88-.14A9.16,9.16,0,0,1,73.17,100c-.31-.19-.62-.37-.93-.58l-.42-.3L71.68,99a1.79,1.79,0,0,1-.24-.22l-.08-.09s.1,0,.14,0l.28.07a1.88,1.88,0,0,0,.34.08c.65.1,1.31.17,1.93.22a7.69,7.69,0,0,0,3.54-.4,5.66,5.66,0,0,0,1.92-1.2C80,98.83,80.43,100.06,80.8,101.07Z"/>
-                <path class="cls-5"
-                      d="M80.12,95.79a.48.48,0,0,1,.29.67,5.9,5.9,0,0,1-.65.83l-.25.23c-.15-.39-.29-.8-.45-1.2.24-.29.34-.47.36-.48C79.53,95.67,79.82,95.65,80.12,95.79Z"/>
-                <path class="cls-5"
-                      d="M80,80.77c0,.07,0,.07,0,.07s0,.09-.12.1,0,.07,0,.09l0,0a6,6,0,0,1-1.22.48,3.23,3.23,0,0,1-1.62.11,1.26,1.26,0,0,1-.55-.33,4,4,0,0,0,.6-.26.29.29,0,0,0,.12.07,2.88,2.88,0,0,0,1.35,0,6.21,6.21,0,0,0,1.4-.39c.17-.07.3-.16.31-.23a.49.49,0,0,0,0-.16s.11,0,.16.13a.31.31,0,0,1-.08.26h0l-.1,0s-.13.09-.17.13h0A.1.1,0,0,0,80,80.77Z"/>
-                <path class="cls-5"
-                      d="M80.22,80.71l.1,0a.7.7,0,0,1-.22.2l-.17.11h0l0,0s0,0,0-.09.12,0,.12-.1h0S80.19,80.71,80.22,80.71Z"/>
-                <path class="cls-5"
-                      d="M79.9,92.87c.1.31.18.62.26.94a6,6,0,0,1-1.84-1.29h0L78,91.88a.84.84,0,0,1-.11.11c-.14-.19-.19-.33-.15-.36S78.69,92.38,79.9,92.87Z"/>
-                <path class="cls-5"
-                      d="M68,146.2h0c.11.52.22,1,.32,1.55L71,149.22l4.32.05a4.19,4.19,0,0,0,1.9-.2,1.66,1.66,0,0,0,.63-.53,1.16,1.16,0,0,0,.16-.21s0,0,0,.07a.58.58,0,0,1,0,.19l0,0,.48.34c.15-.18.07-.64-.24-1a.46.46,0,0,1,.09-.15l.53-.86.14-.27.06.13.53-.24a1.9,1.9,0,0,0-.3-.41,1.36,1.36,0,0,0-.25-.22,2.18,2.18,0,0,0-.57-1.19,1.31,1.31,0,0,0-1.29-.49,12.61,12.61,0,0,0-1.53.68,15.27,15.27,0,0,1-2.91,1.1,9.79,9.79,0,0,1-2.39.05c-.64,0-1.14,0-1.5,0h-.16l.37-.08.27-.06h.16v-.11h0a6.31,6.31,0,0,1,.85-.11,11.27,11.27,0,0,0,2.29-.2,17,17,0,0,0,2.72-1.2,10.33,10.33,0,0,1,1.63-.8,1.78,1.78,0,0,1,1.14,0,2.66,2.66,0,0,1,.93.6,3.14,3.14,0,0,1,.94,2,1.21,1.21,0,0,1-.06.69c-.1.22-.16.36-.24.52-.17.32-.35.63-.52.93s-.37.61-.61.94a2.6,2.6,0,0,1-1,.85,5.28,5.28,0,0,1-2.38.37l-4.6.07-3.51-1.81c-.63-2.73-1.24-5.4-1.8-7.87-.14-.57-.27-1.11-.41-1.64a3,3,0,0,1-.08-.37l0-.23-.05-.44c0-.29-.08-.57-.11-.85-.11-1.1-.22-2.13-.31-3.09-.18-1.9-.33-3.47-.43-4.55q-.06-.61-.09-1c.58-.05,1.17-.11,1.74-.21,0,.27,0,.64.07,1.08.08,1.1.2,2.65.34,4.56.08.94.17,2,.25,3.07,0,.48.11,1,.16,1.5.07.24.09.37.13.52l.1.44c.07.3.13.59.19.89.38,1.83.78,3.84,1.18,5.76Zm10.06,2.44h.08l-.09,0Z"/>
-                <path class="cls-8" d="M80,80.84c-.05,0,0,0,0-.07A.1.1,0,0,1,80,80.84Z"/>
-                <path class="cls-8"
-                      d="M79.69,146.47l-.53.24-.06-.13.06-.13c.06-.1,0-.1,0-.29a3.11,3.11,0,0,0,0-.32,1.36,1.36,0,0,1,.25.22A1.9,1.9,0,0,1,79.69,146.47Z"/>
-                <path class="cls-8"
-                      d="M79.18,146.16c0,.19,0,.19,0,.29l-.06.13a1.28,1.28,0,0,0-.76-.63,3.78,3.78,0,0,0-.88,0,.79.79,0,0,0-.29,0c-.09,0-.13,0-.14,0s0-.05.1-.09a.46.46,0,0,1,.29-.17,2.91,2.91,0,0,1,1-.13,1.41,1.41,0,0,1,.71.29A3.11,3.11,0,0,1,79.18,146.16Z"/>
-                <path class="cls-7"
-                      d="M79.1,146.58l-.14.27-.53.86a.46.46,0,0,0-.09.15,1.64,1.64,0,0,0-.55-.49,2.15,2.15,0,0,0-1.06-.15c-.28,0-.46,0-.46.05s.18.11.44.17a2.56,2.56,0,0,1,.86.28,1.33,1.33,0,0,1,.45.61,1.16,1.16,0,0,1-.16.21,1.66,1.66,0,0,1-.63.53,4.19,4.19,0,0,1-1.9.2L71,149.22l-2.65-1.47c-.1-.51-.21-1-.32-1.55h0l.12,0h0l.58-.11H69c.36,0,.86-.07,1.5,0a9.79,9.79,0,0,0,2.39-.05,15.27,15.27,0,0,0,2.91-1.1,12.61,12.61,0,0,1,1.53-.68,1.31,1.31,0,0,1,1.29.49,2.18,2.18,0,0,1,.57,1.19,1.41,1.41,0,0,0-.71-.29,2.91,2.91,0,0,0-1,.13.46.46,0,0,0-.29.17c-.07,0-.11.07-.1.09s0,0,.14,0a.79.79,0,0,1,.29,0,3.78,3.78,0,0,1,.88,0A1.28,1.28,0,0,1,79.1,146.58Z"/>
-                <path class="cls-5"
-                      d="M78.32,92.52,79,93.71l-.59.14a1.17,1.17,0,0,1-.2.06h0c-.21-.56-.42-1.13-.63-1.66l.11-.07.22-.19a3.24,3.24,0,0,0,.45.52Z"/>
-                <path class="cls-5"
-                      d="M78.79,89c.33,1.11.73,2.47,1.11,3.91-1.21-.49-2.11-1.32-2.19-1.24s0,.17.15.36l-.22.19-.11.07c-.3-.81-.58-1.57-.84-2.24a5,5,0,0,0,.82-1,2.64,2.64,0,0,0,.32-.65L75.94,88s0,0,0,0h0a.51.51,0,0,0-.13-.34c-.11-.29-.19-.49-.23-.58a13.09,13.09,0,0,0,1.89-1,.83.83,0,0,0,.33-.43C78,86.29,78.42,87.72,78.79,89Z"/>
-                <path class="cls-8"
-                      d="M78.34,147.86c.31.41.39.87.24,1l-.48-.34,0,0a.58.58,0,0,0,0-.19s0-.05,0-.07S78.24,148,78.34,147.86Z"/>
-                <path class="cls-5"
-                      d="M77.24,83c.76-.62,1.1-1.26,1.22-1.15a1.62,1.62,0,0,1-.18.43,4,4,0,0,1-.73,1,4.5,4.5,0,0,1-.94.83.1.1,0,0,1-.07,0l-.13,0h0v-.19h-.12l-.15,0L76,84h0a.68.68,0,0,0-.17.1.59.59,0,0,0-.23.45.15.15,0,0,0,0,.09,25.74,25.74,0,0,0-2.5.64,12.78,12.78,0,0,1-2.44.49h-.3a8,8,0,0,1-1.91-.31,6.34,6.34,0,0,1-1.75-.86,25,25,0,0,1-2.31-2.16c.1-.06.19-.14.3-.2l.46-.3c.79.69,1.56,1.35,2.16,1.78a5.48,5.48,0,0,0,1,.49l.46.14a7.35,7.35,0,0,0,1.64.34,12.54,12.54,0,0,0,3.63-.2A6.89,6.89,0,0,0,77.24,83Z"/>
-                <path class="cls-8" d="M78,91.88l.34.63a3.24,3.24,0,0,1-.45-.52A.84.84,0,0,0,78,91.88Z"/>
-                <path class="cls-9" d="M78.17,148.65h-.09Z"/>
-                <path class="cls-5"
-                      d="M77.84,85.24a.2.2,0,0,0,0,.07h-.16c0-.09-.1-.07-.19,0a4.41,4.41,0,0,1-.63,0,4.21,4.21,0,0,1-.55-.06,1.19,1.19,0,0,1-.27-.07l-.09,0s.21,0,.21,0l.12,0h.12v0l.87-.35A.57.57,0,0,1,77.84,85.24Z"/>
-                <path class="cls-8" d="M77.69,85.32h.16a.92.92,0,0,1-.06.33C77.73,85.45,77.69,85.33,77.69,85.32Z"/>
-                <path class="cls-5"
-                      d="M77.53,92.25c.21.53.42,1.1.63,1.66l-1.51.33a12.16,12.16,0,0,1-3.05.22,6.34,6.34,0,0,1-2-.55,5.33,5.33,0,0,1-1-.64,3.63,3.63,0,0,1-.93-1.06,3.33,3.33,0,0,1-.27-.61s-.06-.13,0-.15l.16,0,.29-.07a7.42,7.42,0,0,1,1.26-.24l1.08-.19c.32,0,.63-.1.9-.16a3.93,3.93,0,0,0,2.23-1.23,3.74,3.74,0,0,0,.32-.5,2.32,2.32,0,0,0,.33-.91s0-.06,0-.08h0c.2.51.45,1.19.75,2-.15.13-.3.27-.48.4a5.72,5.72,0,0,1-2.95,1.06c-.58.07-1.22.12-1.92.18l-.85.08-.22,0c-.07,0-.19,0-.12.09a1.23,1.23,0,0,0,.21.41,2.52,2.52,0,0,0,.64.66,4.56,4.56,0,0,0,.91.46,4.37,4.37,0,0,0,1.82.3A6.85,6.85,0,0,0,76.34,93,7,7,0,0,0,77.53,92.25Z"/>
-                <path class="cls-5"
-                      d="M75.94,88l1.89.31a2.64,2.64,0,0,1-.32.65,5,5,0,0,1-.82,1C76.39,89.22,76.14,88.54,75.94,88Z"/>
-                <path class="cls-5"
-                      d="M77.69,85.32s0,.13.1.32a.83.83,0,0,1-.33.43,13.09,13.09,0,0,1-1.89,1s0-.07,0-.08c-.11-.29.35-.71,1-.94a3,3,0,0,0,1-.74A1.21,1.21,0,0,0,77.69,85.32Z"/>
-                <path class="cls-8" d="M77.69,85.32a1.21,1.21,0,0,1-.19,0C77.59,85.25,77.66,85.23,77.69,85.32Z"/>
-                <path class="cls-5"
-                      d="M76.87,85.32a4.41,4.41,0,0,0,.63,0,3,3,0,0,1-1,.74c-.65.23-1.11.65-1,.94,0,0,0,0,0,.08a10.12,10.12,0,0,1-1.18.4,4.66,4.66,0,0,1-2.09.06,2.9,2.9,0,0,1-.83-.28,5,5,0,0,1-.79-.49c-.11-.09-.27-.16-.33-.26a0,0,0,0,0,0,0h.15A10,10,0,0,0,72,86.16v0a.51.51,0,0,0,.08.26,1.37,1.37,0,0,0,.47.37,2.46,2.46,0,0,0,1.77.16,2.9,2.9,0,0,0,1.4-.64c.11-.09.37-.24.46-.32s.23-.22.24-.39v-.16a3.18,3.18,0,0,0-.34-.27,1.19,1.19,0,0,0,.27.07A4.21,4.21,0,0,0,76.87,85.32Z"/>
-                <path class="cls-5"
-                      d="M78,107a5.93,5.93,0,0,1-.51.71,1.71,1.71,0,0,1-1,.52A.61.61,0,0,1,76,108a.46.46,0,0,1-.09-.4c0-.22.16-.3.19-.29s0,.14,0,.3.13.21.29.19a1.27,1.27,0,0,0,.43-.31l.19-.21c.06-.07,0,0,.11-.07s0,0-.09-.07l-.43-.18c-.27-.12-.44-.16-.47-.19s.25-.14.54-.1a2.67,2.67,0,0,1,.48.08A8.2,8.2,0,0,1,78,107Z"/>
-                <path class="cls-5"
-                      d="M77.26,112.4a.32.32,0,0,1,0,.52,2.34,2.34,0,0,1-.36.17c-.16,0-.33.1-.53.17l-.32.1a1,1,0,0,0-.19.07,8.34,8.34,0,0,0-1.63,1,1.15,1.15,0,0,1-1.87-.19,1.09,1.09,0,0,1-.31-.6c0-.21.18-.23.17-.21s-.07.07,0,.2a1.13,1.13,0,0,0,.35.46,1.33,1.33,0,0,0,.68.4c.23,0,.52-.19.79-.39a7.91,7.91,0,0,1,1.64-1.15l.16-.07h0a.07.07,0,0,0,.06,0l-.06,0h-.44a4.18,4.18,0,0,0-.5,0,8.48,8.48,0,0,0-1.8.54,2.13,2.13,0,0,1-.64.15c-.17,0-.25-.07-.24-.08s.09,0,.23,0a2.43,2.43,0,0,0,.56-.25,6.88,6.88,0,0,1,1.83-.74,2.57,2.57,0,0,1,.55-.06l.59,0A2.91,2.91,0,0,1,77.26,112.4Z"/>
-                <path class="cls-6"
-                      d="M76.69,90c.26.67.54,1.43.84,2.24a7,7,0,0,1-1.19.72,6.85,6.85,0,0,1-2.61.72,4.37,4.37,0,0,1-1.82-.3,4.56,4.56,0,0,1-.91-.46,2.52,2.52,0,0,1-.64-.66,1.23,1.23,0,0,1-.21-.41c-.07-.09,0-.08.12-.09l.22,0,.85-.08c.7-.06,1.34-.11,1.92-.18a5.72,5.72,0,0,0,2.95-1.06C76.39,90.28,76.54,90.14,76.69,90Z"/>
-                <path class="cls-5"
-                      d="M76.85,80.79a.79.79,0,0,0,.27.26,4,4,0,0,1-.6.26l-.14-.17s.06-.13.18-.24S76.81,80.75,76.85,80.79Z"/>
-                <path class="cls-5"
-                      d="M76.55,120.11c.1,0,0,.43-.1,1-.71,1-1.48,2-2.3,3.06-.09.13-.19.25-.29.38.17-.3.33-.62.51-.93C75.36,121.84,76.33,120,76.55,120.11Z"/>
-                <path class="cls-5" d="M76.54,84.16a.1.1,0,0,0,.07,0l-.22.15v-.17a.08.08,0,0,0,0,0h0Z"/>
-                <path class="cls-5" d="M76.41,85.05v0h-.09Z"/>
-                <path class="cls-5"
-                      d="M76.39,84.33l0,.72-.09,0h0a1.67,1.67,0,0,0-.06-.24.45.45,0,0,1-.06-.2s-.05-.07-.06-.07.06,0,.08-.09l0,0A.76.76,0,0,1,76.39,84.33Z"/>
-                <path class="cls-9" d="M76.4,84.11h0a.08.08,0,0,1,0,0v0Z"/>
-                <path class="cls-5" d="M76.39,84.18v.15a.76.76,0,0,0-.16.11.92.92,0,0,0,.13-.21Z"/>
-                <path class="cls-5"
-                      d="M76.39,84.16v0l0,0a.92.92,0,0,1-.13.21l-.3.16a.94.94,0,0,0-.4,0,.15.15,0,0,1,0-.09.59.59,0,0,1,.23-.45.68.68,0,0,1,.17-.1h0l.16,0,.15,0h.12v.24Z"/>
-                <path class="cls-7"
-                      d="M76.39,85.46v.16c0,.17-.24.39-.24.39s-.35.23-.46.32a2.9,2.9,0,0,1-1.4.64,2.46,2.46,0,0,1-1.77-.16,1.37,1.37,0,0,1-.47-.37.51.51,0,0,1-.08-.26v0a11.78,11.78,0,0,0,1.24-.44,15.49,15.49,0,0,0,2.39-.89.62.62,0,0,0,.18.24l.1.05.09,0,.09,0A3.18,3.18,0,0,1,76.39,85.46Z"/>
-                <path class="cls-5"
-                      d="M76.27,55.91a25,25,0,0,1-.29,6,22.18,22.18,0,0,1-3.48,8.37c-1.25,1.83-2.23,2.71-2.31,2.61a5.47,5.47,0,0,1,.51-.74c.33-.49.81-1.21,1.35-2.15A23.79,23.79,0,0,0,75,61.72,24.92,24.92,0,0,0,75,56a59.06,59.06,0,0,0-.7-6.34,19.8,19.8,0,0,0-2.07-6.14A14.18,14.18,0,0,0,68,38.82l-.07,0a14.76,14.76,0,0,0-8.67-3A49,49,0,0,0,51,36.84a28.24,28.24,0,0,0-5.46,1.69c-1.26.55-1.92,1-2,1s-1,.59-2.43,1.68a42.93,42.93,0,0,0-5.36,5A44.24,44.24,0,0,0,32.64,50l-.77,1.08-.19.26,0,0s-.07,0,0,.09l.06.08.41.48L33,53.05a87.27,87.27,0,0,0,8.34,8.31,46.53,46.53,0,0,0,4.73,3.57l1.23.77,1.26.68c.84.43,1.72.84,2.57,1.24,3.41,1.63,6.61,3.09,9.41,4.14A27.81,27.81,0,0,0,64.42,73a13.17,13.17,0,0,0,3.09.27,10.36,10.36,0,0,0,2-.19c.44-.08.66-.2.68-.18s-.86.7-2.65.84a12.77,12.77,0,0,1-3.24-.06,17.14,17.14,0,0,1-2.24-.49c-.58-.14-1.18-.33-1.81-.53-2.9-.93-6.17-2.29-9.65-3.8-.87-.39-1.74-.76-2.65-1.19L46.6,67l-1.31-.76a46.78,46.78,0,0,1-5-3.57,86.39,86.39,0,0,1-8.73-8.28c-.32-.37-.65-.72-1-1.06l-.51-.59-.82-1c0-.09-.21-.17-.15-.25l.18-.26.35-.53.57-.82L31,48.77a48.36,48.36,0,0,1,3.18-4,44.75,44.75,0,0,1,5.55-5.36,25.64,25.64,0,0,1,2.65-1.87,21.16,21.16,0,0,1,2.31-1.16,29.57,29.57,0,0,1,5.92-1.72,50.15,50.15,0,0,1,8.62-.94A16.52,16.52,0,0,1,69,37.34l0,0,0,0a15.79,15.79,0,0,1,4.65,5.32,21.06,21.06,0,0,1,2.05,6.68A53.49,53.49,0,0,1,76.27,55.91Z"/>
-                <path class="cls-5"
-                      d="M76.3,85.08h0l-.12,0s-.21,0-.21,0l-.09,0-.1-.05a.62.62,0,0,1-.18-.24c.22-.12.34-.2.34-.23l.3-.16,0,0s0,.09-.08.09.08,0,.06.07a.45.45,0,0,0,.06.2A1.67,1.67,0,0,1,76.3,85.08Z"/>
-                <path class="cls-8" d="M75.57,84.78c.12,0,.25-.12.36-.18s-.12.11-.34.23l0,0Z"/>
-                <path class="cls-8" d="M75.93,84.6c-.11.06-.24.13-.36.18a.25.25,0,0,1,0-.14A.94.94,0,0,1,75.93,84.6Z"/>
-                <path class="cls-7"
-                      d="M75.81,112.79l.06,0a.07.07,0,0,1-.06,0h0l-.16.07A7.91,7.91,0,0,0,74,114.08c-.27.2-.56.42-.79.39a1.33,1.33,0,0,1-.68-.4,1.13,1.13,0,0,1-.35-.46c0-.13,0-.18,0-.2s.07.09.24.08a2.13,2.13,0,0,0,.64-.15,8.48,8.48,0,0,1,1.8-.54,4.18,4.18,0,0,1,.5,0Z"/>
-                <path class="cls-5"
-                      d="M75.81,4.05l0,0c-.52.09-1,.2-1.55.31a3.65,3.65,0,0,0-.81-.59c-.11,0-.19-.06-.2,0s0-.12,0-.16a.65.65,0,0,1,0-.1l.43-1.72a2.4,2.4,0,0,1,.81.54A8.85,8.85,0,0,1,75.81,4.05Z"/>
-                <path class="cls-5"
-                      d="M76.45,121.15a29.83,29.83,0,0,1-1,3c-.35,1-.74,2-1,2.7s-.54,1.24-.56,1.27-.28.51-.71,1.19a20.87,20.87,0,0,1-1.73,2.41c-.48.56-1,1.08-1.41,1.53-.12-.24-.18-.29-.18-.31L68.75,134s.09,0,.13,0,.07,0,.1.09v.12c-.33.27-.56.41-.6.29s1-1.84,2.07-3.57a25.27,25.27,0,0,0,1.31-2.45l.57-1.22s.28-.49.67-1.16c.24-.45.54-1,.84-1.55l0,0c.1-.13.2-.25.29-.38C75,123.18,75.74,122.17,76.45,121.15Z"/>
-                <path class="cls-5"
-                      d="M72.36,86l-.5-.18s-.28.11-.87.42a4,4,0,0,0-1-.06c0,.08.33.25.4.35a15.74,15.74,0,0,1-3.48,0,28.94,28.94,0,0,1-6.09-1.68l.31-.18L62,84a26.43,26.43,0,0,0,5,1.59,17.69,17.69,0,0,0,3.43.24h.16a13.57,13.57,0,0,0,3.59-.48,7.63,7.63,0,0,0,1.39-.5l0,0a15.49,15.49,0,0,1-2.39.89,11.78,11.78,0,0,1-1.24.44s.08-.1.14-.13a.4.4,0,0,1,.16-.07Z"/>
-                <path class="cls-5"
-                      d="M75.57,84.78h0a7.63,7.63,0,0,1-1.39.5,13.57,13.57,0,0,1-3.59.48A12.78,12.78,0,0,0,73,85.28a25.74,25.74,0,0,1,2.5-.64A.25.25,0,0,0,75.57,84.78Z"/>
-                <path class="cls-5"
-                      d="M74.74,119.41c.25-.08.63.07.54.45a5.78,5.78,0,0,1-.23.64,3.67,3.67,0,0,1-.26.48.47.47,0,0,1-.39.23c-.11,0-.15-.06-.15-.08s.23,0,.31-.3c0-.12.08-.28.12-.45a2.43,2.43,0,0,0,.07-.39s-.06,0-.06,0a.61.61,0,0,1-.12.05l-.34.12a7.69,7.69,0,0,0-.74.3,5.65,5.65,0,0,1-1.09.45c-.06-.07.38-.48.88-.81a6,6,0,0,1,1.1-.61A2.07,2.07,0,0,1,74.74,119.41Z"/>
-                <path class="cls-6"
-                      d="M75,56A24.92,24.92,0,0,1,75,61.72,23.79,23.79,0,0,1,72.05,70c-.54.94-1,1.66-1.35,2.15a5.47,5.47,0,0,0-.51.74s-.24.1-.68.18a10.36,10.36,0,0,1-2,.19A13.17,13.17,0,0,1,64.42,73a27.81,27.81,0,0,1-3.87-1.2c-2.8-1.05-6-2.51-9.41-4.14-.85-.4-1.73-.81-2.57-1.24l-1.26-.68-1.23-.77a46.53,46.53,0,0,1-4.73-3.57A87.27,87.27,0,0,1,33,53.05L32.09,52l-.41-.48-.06-.08s0-.07,0-.09l0,0,.19-.26L32.64,50a44.24,44.24,0,0,1,3.1-3.72,42.93,42.93,0,0,1,5.36-5c1.42-1.09,2.34-1.59,2.43-1.68s.77-.49,2-1A28.24,28.24,0,0,1,51,36.84a49,49,0,0,1,8.2-1.05,14.76,14.76,0,0,1,8.67,3l.07,0a14.18,14.18,0,0,1,4.31,4.67,19.8,19.8,0,0,1,2.07,6.14A59.06,59.06,0,0,1,75,56Zm-2.49,2c.33-.29.49-2.46.32-3.47A30.6,30.6,0,0,0,71.81,50a18,18,0,0,0-2-4.48,9.56,9.56,0,0,0-2.06-2.3,18.77,18.77,0,0,0-2.88-1.56,14.11,14.11,0,0,0-3.33-1.06,8.76,8.76,0,0,0-3.77.19,11.87,11.87,0,0,0-3.46,1.7,20.87,20.87,0,0,0-3,2.43,20.47,20.47,0,0,0-4.57,6.3,17.85,17.85,0,0,0-.68,1.85c-.08.32-.17.64-.23,1,0,.17-.06.31-.09.52s0,.51,0,.76a7.16,7.16,0,0,0,.59.47l.37.28c.25.19.5.4.76.58l1.53,1h0a17.44,17.44,0,0,0,4.65,2,38.74,38.74,0,0,0,4.51,1,22.53,22.53,0,0,0,7.88.31,13.11,13.11,0,0,0,5-1.81A4.24,4.24,0,0,0,72.55,58Z"/>
-                <path class="cls-5"
-                      d="M73.62.66l.14,1.13-.43,1.72a.65.65,0,0,0,0,.1s0,.12,0,.16.09,0,.2,0a3.65,3.65,0,0,1,.81.59c-.77.15-1.55.31-2.35.45-.25,0-.49.08-.77.1s-.56,0-.8,0A12.45,12.45,0,0,1,69,5L68,5a22.52,22.52,0,0,1,.3-2.29L68.46.75l.75.08c.4.05.78.07,1.17.09a4.37,4.37,0,0,0,.5,0l.55,0Z"/>
-                <path class="cls-7"
-                      d="M73.84,124.61c-.3.57-.6,1.1-.84,1.55-.39.67-.65,1.14-.67,1.16l-.57,1.22A25.27,25.27,0,0,1,70.45,131c-1.1,1.73-2.24,3.51-2.07,3.57s.27,0,.6-.29a3.78,3.78,0,0,1-.06.49,48.36,48.36,0,0,0-.59,5c-.1,2.32-.09,4-.13,5,0,.56,0,1,0,1.23a.28.28,0,0,1,0,.09v0h0l-.12,0c-.4-1.92-.8-3.93-1.18-5.76-.06-.3-.12-.59-.19-.89l-.1-.44c0-.15-.06-.28-.13-.52,0-.52-.11-1-.16-1.5C66.2,136,66.11,135,66,134c-.14-1.91-.26-3.46-.34-4.56,0-.44,0-.81-.07-1.08.39-.05.79-.12,1.17-.2a16.18,16.18,0,0,0,4.11-1.32A9,9,0,0,0,73.84,124.61Z"/>
-                <path class="cls-5"
-                      d="M72.87,54.51c.17,1,0,3.18-.32,3.47,0,0,0-1.34,0-1.36a28.12,28.12,0,0,0-.85-3.15l0-.37c0-.07,0-.17-.07-.26-.77-2-.94-2.38-1.53-3.69-.1-.19-.57-1.16-.71-1.42a9.39,9.39,0,0,0-3-3.77l-.52-.31H65.4c-.39-.2-.78-.4-1.17-.58a8.77,8.77,0,0,0-6.12-.89,15,15,0,0,0-5.89,3.71,18.93,18.93,0,0,0-4.41,5.84,13.43,13.43,0,0,0-.66,1.69c-.08.29-.16.57-.23.86l-.08.42,0,.17.49.39c.25.19.48.39.73.56l1.5,1.06.05,0a16.33,16.33,0,0,0,4.29,1.93A38.35,38.35,0,0,0,58.27,60a27.21,27.21,0,0,0,4.74.64,5.24,5.24,0,0,0,.53.28.4.4,0,0,1,.29-.14c.63,0,1.26-.09,1.88-.11l.09-.11h.3l.24,0a4.26,4.26,0,0,0,1.59,0,3.11,3.11,0,0,0,.42-.32,10.48,10.48,0,0,0,1.16-.27l.3-.3a11.62,11.62,0,0,0,1.1-.51c1.07-.58,1.58-1,1.64-1A4.24,4.24,0,0,1,71,59.25a13.11,13.11,0,0,1-5,1.81,22.53,22.53,0,0,1-7.88-.31,38.74,38.74,0,0,1-4.51-1,17.44,17.44,0,0,1-4.65-2h0l-1.53-1c-.26-.18-.51-.39-.76-.58l-.37-.28a7.16,7.16,0,0,1-.59-.47c0-.25,0-.51,0-.76s0-.35.09-.52c.06-.33.15-.65.23-1a17.85,17.85,0,0,1,.68-1.85A20.47,20.47,0,0,1,51.32,45a20.87,20.87,0,0,1,3-2.43,11.87,11.87,0,0,1,3.46-1.7,8.76,8.76,0,0,1,3.77-.19,14.11,14.11,0,0,1,3.33,1.06,18.77,18.77,0,0,1,2.88,1.56,9.56,9.56,0,0,1,2.06,2.3,18,18,0,0,1,2,4.48A30.6,30.6,0,0,1,72.87,54.51Z"/>
-                <path class="cls-10"
-                      d="M72.52,56.62s0,1.33,0,1.36-.57.46-1.64,1a11.62,11.62,0,0,1-1.1.51c1.29-1.4,1.64-3.56,1.86-6.06A28.12,28.12,0,0,1,72.52,56.62Z"/>
-                <path class="cls-5"
-                      d="M72.36,86h-.1a.4.4,0,0,0-.16.07c-.06,0-.13.08-.14.13a10,10,0,0,1-1.47.31h-.15c-.07-.1-.4-.27-.4-.35a4,4,0,0,1,1,.06c.59-.31.87-.42.87-.42Z"/>
-                <path class="cls-5"
-                      d="M71.7,53.1l0,.37a39.39,39.39,0,0,0-2.58-5.93l-.15-.26-.43-.81a1.48,1.48,0,0,0-.21-.26,7.81,7.81,0,0,0-1.52-1.73,10,10,0,0,0-1.38-.83h.51l.52.31a9.39,9.39,0,0,1,3,3.77c.14.26.61,1.23.71,1.42.59,1.31.76,1.71,1.53,3.69C71.67,52.93,71.66,53,71.7,53.1Z"/>
-                <path class="cls-11"
-                      d="M71.67,53.47c-.22,2.5-.57,4.66-1.86,6.06a12.42,12.42,0,0,1-1.35.48l.24-.2a17.49,17.49,0,0,1-4.44.62H62.73c-2.18-1.46-3.59-4.68-3.38-8.36.25-4.64,2.86-8.24,6.05-8.43a10,10,0,0,1,1.38.83,7.81,7.81,0,0,1,1.52,1.73,1.48,1.48,0,0,1,.21.26l.43.81.15.26A39.39,39.39,0,0,1,71.67,53.47Z"/>
-                <path class="cls-5"
-                      d="M71.29,75.67a.36.36,0,0,1-.15.44.74.74,0,0,1-.41.07l-.57,0a3.9,3.9,0,0,1-.51-.06s0,0,0,0L70.82,76c.53,0,.27-.51-.2-.86s-.68.61-.68.61-.27-.09-.27-.13A1.56,1.56,0,0,1,70,75a.55.55,0,0,1,.4-.2h0a.66.66,0,0,1,.43.19A1.5,1.5,0,0,1,71.29,75.67Z"/>
-                <path class="cls-5"
-                      d="M70.62,75.15c.47.35.73.85.2.86l-1.21.06,0,0a2.31,2.31,0,0,1,.49-.1l.54-.07c.13,0,.15,0,.18,0s0-.08,0-.11a1.65,1.65,0,0,0-.35-.32c-.14-.09-.08,0-.12,0a1.13,1.13,0,0,0-.17.41s-.13,0-.29,0C69.94,75.76,70.15,74.81,70.62,75.15Z"/>
-                <path class="cls-5"
-                      d="M70.55,80.3a1.05,1.05,0,0,1,.44.86,1.3,1.3,0,0,1-2,.69,1,1,0,0,1-.13-1.1,4.07,4.07,0,0,1,.52-.8s.17,0,.28.11c-.4.48-.91,1.15-.49,1.63s1.88,0,1.61-.81a1.35,1.35,0,0,0-1.12-.82A1.1,1.1,0,0,1,70.55,80.3Z"/>
-                <path class="cls-5"
-                      d="M70.87,75.71s0,.09,0,.11,0,0-.18,0l-.54.07a2.31,2.31,0,0,0-.49.1l.29-.27c.16,0,.29.06.29,0a1.13,1.13,0,0,1,.17-.41s0-.08.12,0A1.65,1.65,0,0,1,70.87,75.71Z"/>
-                <path class="cls-5"
-                      d="M70.81,80.88c.27.76-1.18,1.29-1.61.81s.09-1.15.49-1.63A1.35,1.35,0,0,1,70.81,80.88Zm-.14.24a.84.84,0,0,0-.28-.65,2,2,0,0,0-.68-.39c.12.1.18.21.15.25a2.78,2.78,0,0,0-.47.64.52.52,0,0,0,0,.56c.07.13.42.16.7.07A.82.82,0,0,0,70.67,81.12Z"/>
-                <path class="cls-5"
-                      d="M70.39,80.47a.84.84,0,0,1,.28.65.82.82,0,0,1-.59.48c-.28.09-.63.06-.7-.07a.52.52,0,0,1,0-.56,2.78,2.78,0,0,1,.47-.64s0-.15-.15-.25A2,2,0,0,1,70.39,80.47Z"/>
-                <path class="cls-7"
-                      d="M70.53,85.77h-.1A17.69,17.69,0,0,1,67,85.54,26.43,26.43,0,0,1,62,84l2.31-1.52a25,25,0,0,0,2.31,2.16,6.34,6.34,0,0,0,1.75.86,8,8,0,0,0,1.91.31Z"/>
-                <path class="cls-7"
-                      d="M67.54,73.7l2.85,1.13a.55.55,0,0,0-.4.2,1.56,1.56,0,0,0-.32.6s.13.1.27.13l-.29.27,0,0s0,0,0,0l-.81,1.4a26.93,26.93,0,0,0-4,.66l-.16-1.34h0a7.48,7.48,0,0,0-2.2-.85l-1.11-.28.68-2.53a17.14,17.14,0,0,0,2.24.49A12.77,12.77,0,0,0,67.54,73.7Z"/>
-                <path class="cls-5"
-                      d="M70.13,133.47a1.47,1.47,0,0,1,0,.79,5,5,0,0,1-.28.71,12.42,12.42,0,0,0-1.15,4.81,16.34,16.34,0,0,0,.44,5,5.5,5.5,0,0,0,.35,1,5,5,0,0,1-1.09.16s0,.07.11.1a.78.78,0,0,0,.24,0h0l-.58.11h0v0a.28.28,0,0,0,0-.09c0-.27,0-.67,0-1.23,0-1.07,0-2.71.13-5a48.36,48.36,0,0,1,.59-5,3.78,3.78,0,0,0,.06-.49c.14-.13.32-.28.49-.45s.37-.35.57-.56A1.09,1.09,0,0,1,70.13,133.47Z"/>
-                <path class="cls-5"
-                      d="M69.86,133s.06.07.18.31c-.2.21-.39.39-.57.56s-.35.32-.49.45v-.12c0-.1-.07-.08-.1-.09s-.14,0-.13,0Z"/>
-                <path class="cls-5"
-                      d="M69.81,59.53l-.3.3a10.48,10.48,0,0,1-1.16.27.87.87,0,0,0,.11-.09A12.42,12.42,0,0,0,69.81,59.53Z"/>
-                <path class="cls-5"
-                      d="M69.19,173a7,7,0,0,1,.45,3.54,11.83,11.83,0,0,1-.25,1.79,11.42,11.42,0,0,1-.57,1.65c-.44,1-.91,2-1.31,2.75s-.66,1.24-.88,1.69l-1.38.16c.08-.13.16-.3.26-.49l1-1.87c.43-.77.92-1.66,1.37-2.62a13.88,13.88,0,0,0,.59-1.51,11.13,11.13,0,0,0,.3-1.64,6.39,6.39,0,0,0-.23-3.19,7.5,7.5,0,0,0-1.6-2.34,4.94,4.94,0,0,0-1.34-1c.15,0,.31-.07.48-.11a5.48,5.48,0,0,1,1.17.79A7.43,7.43,0,0,1,69.19,173Z"/>
-                <path class="cls-8" d="M69.59,145.88h0l0,0,0-.07h.06v.11Z"/>
-                <path class="cls-8"
-                      d="M69.56,145.84l0,0h-.15l-.27.06-.37.08h0a.78.78,0,0,1-.24,0c-.11,0-.13-.11-.11-.1a5,5,0,0,0,1.09-.16h0Z"/>
-                <path class="cls-5"
-                      d="M68.84,77.5c.12,0,.2,0,.2,0s-2.67.84-5.33,1.71l-1.23.4-.84-.71c.59-.17,1.22-.34,1.85-.49.43-.11.87-.21,1.31-.29A26.93,26.93,0,0,1,68.84,77.5Z"/>
-                <path class="cls-7"
-                      d="M68.59,173.23a6.39,6.39,0,0,1,.23,3.19,11.13,11.13,0,0,1-.3,1.64,13.88,13.88,0,0,1-.59,1.51c-.45,1-.94,1.85-1.37,2.62l-1,1.87c-.1.19-.18.36-.26.49l-2.48.25c-1.07.09-2.15.17-3.22.23l-.58.08h-.52l-.34-.06-1.6-.24c-2.86-.44-5.73-.81-8.51-1.31a.15.15,0,0,0,0-.06c.25-.35.65-.83,1.14-1.42a15.85,15.85,0,0,0,3-4.85,9.17,9.17,0,0,0,.15-5.63,3.05,3.05,0,0,0-1-1.41l1.8.3a33.41,33.41,0,0,0,10.82-.2c.56-.09,1.13-.21,1.7-.34a4.94,4.94,0,0,1,1.34,1A7.5,7.5,0,0,1,68.59,173.23Z"/>
-                <path class="cls-11"
-                      d="M68.7,59.81l-.24.2a5.25,5.25,0,0,1-.6.17h0a27.25,27.25,0,0,1-3.57.25A17.49,17.49,0,0,0,68.7,59.81Z"/>
-                <path class="cls-5"
-                      d="M68.46.75l-.18,2-2.08,0A18.06,18.06,0,0,1,66.58,5l-2.1-.09c-.14-.25-.29-.49-.43-.7a14.42,14.42,0,0,0-1.33-1.69L62.25,2,62.54.12c.73.07,2.34.24,4.45.49Z"/>
-                <path class="cls-11" d="M68.46,60a.87.87,0,0,1-.11.09l-.49.08A5.25,5.25,0,0,0,68.46,60Z"/>
-                <path class="cls-5"
-                      d="M67.86,60.18l.49-.08a3.11,3.11,0,0,1-.42.32,4.26,4.26,0,0,1-1.59,0,11.93,11.93,0,0,0,1.49-.29Z"/>
-                <path class="cls-5"
-                      d="M66.2,2.73l2.08,0A22.52,22.52,0,0,0,68,5L66.66,5h-.08A18.06,18.06,0,0,0,66.2,2.73Z"/>
-                <polygon class="cls-8" points="68.04 146.19 68.04 146.2 68.03 146.2 68.04 146.19"/>
-                <path class="cls-5"
-                      d="M66.83,80.3c.79-.22,1.33-.17,1.34-.09s-.52.19-1.17.51-1.22.74-1.92,1.21l-.63-.54A19.22,19.22,0,0,1,66.83,80.3Z"/>
-                <path class="cls-5"
-                      d="M68,5a80.77,80.77,0,0,0-.31,8.44c0-.06-.1-.43-.18-.83-.14-.61-.28-1.19-.44-1.74-.12-2.7-.3-4.62-.47-5.91h.08Z"/>
-                <path class="cls-9" d="M67.67,13.43v0l-.52,0s0,0,0,0Z"/>
-                <path class="cls-8"
-                      d="M67.67,13.43l-.54.05c0-1,0-1.82-.08-2.62.16.55.3,1.13.44,1.74C67.57,13,67.65,13.37,67.67,13.43Z"/>
-                <path class="cls-5"
-                      d="M64.06,113.73l0,0c.19-.09.87-.25,1.5-.47a1.91,1.91,0,0,0,.63-.35,6.28,6.28,0,0,0-1.07-.07c-.62.06-.94.73-1.06.89C64.07,113.71,64.06,113.71,64.06,113.73Zm3-1.28a.31.31,0,0,1,.12.41c-.08.12-.11.1-.16.15l-.1,0a.37.37,0,0,0-.14.07,2.75,2.75,0,0,1-1.1.51,3.91,3.91,0,0,1-1.66.11s0-.21.1-.52a1.41,1.41,0,0,1,.92-.82,5.12,5.12,0,0,1,1.2-.05c.31,0,.54,0,.56,0A1,1,0,0,1,67.08,112.45Zm-.19.33c0-.06.06-.06,0-.07a.37.37,0,0,1-.12-.16c0-.08,0,0-.08,0a1.34,1.34,0,0,0-.23.13,2.32,2.32,0,0,1-.25.21c.3,0,.5.07.5.07h.07A.4.4,0,0,1,66.89,112.78Z"/>
-                <path class="cls-5"
-                      d="M67.05,10.86c0,.8.06,1.67.08,2.62,0-.12-.08-.43-.14-.76a15.34,15.34,0,0,0-3.87-7.64,3.71,3.71,0,0,0-.3-.28l1.66.06A23.52,23.52,0,0,1,67.05,10.86Z"/>
-                <path class="cls-7"
-                      d="M66.92,112.71s0,0,0,.07a.4.4,0,0,0-.08.18h-.07s-.2,0-.5-.07a2.32,2.32,0,0,0,.25-.21,1.34,1.34,0,0,1,.23-.13c.06,0,0-.07.08,0A.37.37,0,0,0,66.92,112.71Z"/>
-                <path class="cls-11"
-                      d="M67.83,60.18a11.93,11.93,0,0,1-1.49.29h-.1a.52.52,0,0,0-.43.08h-.09l-.89.06c-.33,0-.65,0-1,0s-.56,0-.84,0l-.28-.18h1.53A27.25,27.25,0,0,0,67.83,60.18Z"/>
-                <path class="cls-6" d="M66.58,5c.17,1.29.35,3.21.47,5.91a23.52,23.52,0,0,0-2.57-6Z"/>
-                <path class="cls-5"
-                      d="M66.63,184.39l-.11.21c-.22.44-.35.72-.36.74s-.37.17-.67.06-.48-.38-.39-.56l.15-.29Z"/>
-                <path class="cls-11" d="M66.34,60.47l-.24,0h-.29a.52.52,0,0,1,.43-.08Z"/>
-                <path class="cls-5"
-                      d="M66.13,169.77c-.17,0-.33.09-.48.11a1.6,1.6,0,0,0-.3-.11,1.78,1.78,0,0,0-.75,0s.23-.28.79-.22A2.32,2.32,0,0,1,66.13,169.77Z"/>
-                <path class="cls-5"
-                      d="M65.72,60.55h.08l-.09.11c-.62,0-1.25.06-1.88.11a.4.4,0,0,0-.29.14,5.24,5.24,0,0,1-.53-.28q.42,0,.84,0c.33,0,.65,0,1,0Z"/>
-                <path class="cls-7"
-                      d="M66.22,112.88a1.91,1.91,0,0,1-.63.35c-.63.22-1.31.38-1.5.47.12-.16.44-.83,1.06-.89A6.28,6.28,0,0,1,66.22,112.88Z"/>
-                <path class="cls-5"
-                      d="M65.61,128.21s0,.1,0,.16c-.57.1-1.16.16-1.74.21,0-.46-.05-.72-.05-.78l1,0,.66,0h.08v.05C65.59,128,65.6,128.07,65.61,128.21Z"/>
-                <path class="cls-5"
-                      d="M65.16,117.91c.19.08.42.27.39.5a.73.73,0,0,1-.16.33,1.52,1.52,0,0,1-.17.18,4.72,4.72,0,0,1-.75.56,2.3,2.3,0,0,1-1.37.09c0-.06.61-.14,1.22-.39a7.65,7.65,0,0,0,.59-.57.83.83,0,0,0,.11-.15v0s0,0-.07,0a5.27,5.27,0,0,0-.81-.13l-.61-.11a1.37,1.37,0,0,0-1.06.31,3.9,3.9,0,0,0-.92,1.57,2.16,2.16,0,0,1,.64-1.87,1.8,1.8,0,0,1,1.39-.55l.64.06A5.67,5.67,0,0,1,65.16,117.91Z"/>
-                <path class="cls-5"
-                      d="M65.08,81.93l-.46.3c-.11.06-.2.14-.3.2l-.51-.51-.13-.14c.17-.08.35-.17.52-.27l.25-.12Z"/>
-                <path class="cls-7"
-                      d="M64.64,76.82l.16,1.34c-.44.08-.88.18-1.31.29-.63.15-1.26.32-1.85.49-.85-.71-1.45-1.15-1.53-1a10.77,10.77,0,0,0,1,1.17l-1.42.45c-1,.34-1.72.63-1.77.65a16.81,16.81,0,0,0-1.68.9c-.23.14-.47.32-.73.49-2.14-.7-4.37-1.35-6.6-2-.41-.12-.86-.24-1.2-.36l-1.14-.49-2.35-1.06L44,77.55c1.24-.33,2.42-.62,3.38-.82,1.38-.31,2.34-.4,2.4-.42s1-.18,2.41-.34a36.5,36.5,0,0,1,5.14-.12,39,39,0,0,1,5.08.56C63.59,76.62,64.43,76.82,64.64,76.82Z"/>
-                <path class="cls-5"
-                      d="M64.69,76.81h0c-.21,0-1-.2-2.26-.41a39,39,0,0,0-5.08-.56,36.5,36.5,0,0,0-5.14.12c-1.41.16-2.36.31-2.41.34s-1,.11-2.4.42c-1,.2-2.14.49-3.38.82L42.76,77c1.56-.55,3.1-1,4.34-1.32,1.41-.37,2.41-.51,2.46-.53s1-.15,2.51-.25a34.31,34.31,0,0,1,5.28.12,31.69,31.69,0,0,1,4,.66l1.11.28A7.48,7.48,0,0,1,64.69,76.81Z"/>
-                <path class="cls-10"
-                      d="M64.23,43.07c.39.18.78.38,1.17.58-3.19.19-5.8,3.79-6.05,8.43-.21,3.68,1.2,6.9,3.38,8.36l.28.18A27.21,27.21,0,0,1,58.27,60a38.35,38.35,0,0,1-4.39-1.13,16.33,16.33,0,0,1-4.29-1.93l-.05,0L48,55.82c-.25-.17-.48-.37-.73-.56l-.49-.39,0-.17.08-.42c.07-.29.15-.57.23-.86a13.43,13.43,0,0,1,.66-1.69,18.93,18.93,0,0,1,4.41-5.84,15,15,0,0,1,5.89-3.71A8.77,8.77,0,0,1,64.23,43.07Z"/>
-                <path class="cls-5"
-                      d="M64.45,81.39l-.25.12c-.17.1-.35.19-.52.27-.64-.66-1.28-1.33-1.82-1.91l.62-.22,1.9,1.68Z"/>
-                <path class="cls-5"
-                      d="M63.81,81.92l.51.51L62,84c-.43-.17-.85-.35-1.3-.52l.95-.53c.56-.33,1.27-.71,2-1.12Z"/>
-                <path class="cls-5"
-                      d="M64.05,4.16c.14.21.29.45.43.7L62.82,4.8a6.89,6.89,0,0,0-1.22-.88l-.53-.24L62.25,2l.47.5A14.42,14.42,0,0,1,64.05,4.16Z"/>
-                <path class="cls-9" d="M64.06,113.73s0,0,0,0Z"/>
-                <path class="cls-5"
-                      d="M62,138.38l0,0,0,.07a.67.67,0,0,0-.06.12v0l0-.11L62,138c.37-2.56.75-5.1,1-7,.16-1,.27-1.83.36-2.38l.35,0c.06,1.62-.15,5.59-.51,9.59l-.06.48v.14a2.13,2.13,0,0,1-.11.41h0l0,0h0a0,0,0,0,0,0,0h0a.1.1,0,0,0,0,0l-.06-.07h0l0,0-.18-.15,0,0,0,0-.06-.07-.07-.06-.07-.06,0,0v0h0A2,2,0,0,0,62,138.38Z"/>
-                <path class="cls-5" d="M63.77,128.59l-.35,0c.1-.52.15-.8.2-.8S63.75,128.1,63.77,128.59Z"/>
-                <path class="cls-7"
-                      d="M62.41,128.67l1,0c-.09.55-.2,1.37-.36,2.38-.28,1.91-.66,4.45-1,7l-.08.47,0,.11v0l0,0-.08.16-.37.9-.7,1.75c-.44,1.14-.86,2.21-1.22,3.13l-.86,2.27-.14.38v.05l0,.13a.38.38,0,0,0,0,.1l0,.05a1.11,1.11,0,0,1-.08.24c0,.08-.37,1.22-.9,2.9-.6.49-1.27,1.06-2,1.67L53,154.48l-.33.28-.15.13,0,.06h0a2.69,2.69,0,0,1-.26-.44,1.23,1.23,0,0,1-.16-.51.82.82,0,0,1,0-.22s0-.27.32-.66a4.94,4.94,0,0,1,.51-.66c-.15-.37-1.59,1-1.41,1.26a1.5,1.5,0,0,0,.37,1c.06.08.14.14.21.22l-1.63-.22-.8-.13-.33,0a.88.88,0,0,1,0-.28,1.71,1.71,0,0,1,.14-.51l.11-.23a3.2,3.2,0,0,1,.41-.71c.25-.34.61-.58.58-.65s-.5,0-.87.35a2.56,2.56,0,0,0-.46.49,2.11,2.11,0,0,0-.18.27,1.87,1.87,0,0,0-.14.94l-.52-.69v-.14a2,2,0,0,1,0-.23c0-.16,0-.32,0-.48a4.34,4.34,0,0,1,.19-.86,1.91,1.91,0,0,1,.8-1.13,1.68,1.68,0,0,1,1.23-.32c.15.28,3.53-1.08,3.58-1.11a21,21,0,0,0,3.11-2.05h0c.28-.05.45-2.67.46-5.34a44,44,0,0,0-.24-5.61,16.22,16.22,0,0,0-.51-1.79c-.33-1-.83-2.27-1.36-3.53s-1.17-2.6-1.66-3.5a16.43,16.43,0,0,0,3.89,1.09A24.76,24.76,0,0,0,62.41,128.67Z"/>
-                <path class="cls-8" d="M63.07,139.22h0a.33.33,0,0,1,0,.06h0Z"/>
-                <path class="cls-5"
-                      d="M63.05,139.28c-.1.3-.21.6-.31.89-.2.61-.41,1.21-.61,1.78l-1.06,3.18-.76,2.28,0,.08c-.32.06-.91.16-.91.18h-.92s0-.1,0-.15a.38.38,0,0,1,0-.1l0-.13v-.05l.14-.38.86-2.27c.36-.92.78-2,1.22-3.13l.7-1.75.37-.9.08-.16,0,0c0,.07.08.22.12.19s0-.2.12-.14h.17v0l0,0,.07.06.07.06.06.07,0,0,0,0,.18.15,0,0h0l.06.07a.1.1,0,0,1,0,0h0a0,0,0,0,1,0,0h0Z"/>
-                <path class="cls-5"
-                      d="M62.54.12,62.25,2,61.07,3.68l.53.24a6.89,6.89,0,0,1,1.22.88l-1-.06L60.2,4.6c-.93-.08-2.25-.19-3.82-.23-.54,0-1.11,0-1.7,0-.18-.51-.34-1-.52-1.36a6.54,6.54,0,0,0-.32-.65,2.56,2.56,0,0,0-.53-.63l-.6-.52L52.27.77l0-.38C53.71.21,55.11.11,56.36.05,58,0,59.45,0,60.47,0l1.65.06Z"/>
-                <path class="cls-5" d="M62.48,79.65l-.62.22-.63-.69-.1-.11.51-.13Z"/>
-                <path class="cls-8"
-                      d="M62.05,138.42l0,0a2,2,0,0,1,.3.27h-.14c-.1-.06-.13.13-.12.14s-.1-.12-.12-.19a.67.67,0,0,1,.06-.12Z"/>
-                <path class="cls-7"
-                      d="M61.86,79.87c.54.58,1.18,1.25,1.82,1.91-.75.41-1.46.79-2,1.12l-.95.53c-.64-.26-1.31-.52-2-.78s-1.24-.45-1.89-.67c.9-.46,1.56-.72,1.6-.74s.68-.32,1.67-.7C60.6,80.33,61.21,80.1,61.86,79.87Z"/>
-                <path class="cls-5"
-                      d="M61.64,78.94l-.51.13a10.77,10.77,0,0,1-1-1.17C60.19,77.79,60.79,78.23,61.64,78.94Z"/>
-                <path class="cls-5"
-                      d="M61.23,79.18l.63.69c-.65.23-1.26.46-1.77.67-1,.38-1.64.68-1.67.7s-.7.28-1.6.74c-.42-.14-.85-.29-1.29-.42.26-.17.5-.35.73-.49a16.81,16.81,0,0,1,1.68-.9c.05,0,.74-.31,1.77-.65l1.42-.45Z"/>
-                <path class="cls-5"
-                      d="M60.71,83.43c.45.17.87.35,1.3.52l-.93.62-.31.18-1.3-.46.66-.49c.21-.13.32-.22.33-.22Z"/>
-                <path class="cls-5"
-                      d="M59.47,84.29l1.3.46c-.2.12-.48.3-.8.53-.63.42-1.45,1.06-2.24,1.72a27.49,27.49,0,0,1-3.21,2.63s0,0,0,0a16.41,16.41,0,0,1,2.65-3.21,26.63,26.63,0,0,1,2.16-2Z"/>
-                <path class="cls-5"
-                      d="M60.71,83.43l-.25.15s-.12.09-.33.22l-.66.49-1.18-.41c-1-.32-2-.62-3-.91l0,0,.79-.53.7-.43h0c.65.22,1.27.44,1.89.67S60.07,83.17,60.71,83.43Z"/>
-                <path class="cls-8" d="M60.31,147.41a.24.24,0,0,0,0,.08h0Z"/>
-                <path class="cls-9" d="M60.28,147.49l0,.14h0l0,.05Z"/>
-                <path class="cls-8" d="M60.28,147.49l-.08.2-.21,0h-.62S60,147.55,60.28,147.49Z"/>
-                <polygon class="cls-8" points="60.24 147.64 60.2 147.76 60.2 147.71 60.2 147.69 60.24 147.64"/>
-                <path class="cls-5"
-                      d="M60.2,147.76h0v0h0l0,.15,0,.07c0,.18-.09.28-.1.31s-.12.37-.32.92-.52,1.42-.87,2.42l-5,3.82-.77.6a.44.44,0,0,1-.15.08h0l-.14.06h-.14l-.23,0c-.27,0-.37-.06-.52-.08-.57-.1-1.11-.22-1.65-.33-.27-.06-.53-.13-.8-.18l-.42-.09-.3-.06c-.09,0-.21,0-.25-.15l-1-1.53v-.4a2.83,2.83,0,0,1,0-.29c0-.2.06-.38.1-.55a4.69,4.69,0,0,1,.32-1,2.43,2.43,0,0,1,1.22-1.28,2.6,2.6,0,0,1,1.43.07h0a1.68,1.68,0,0,0-1.23.32,1.91,1.91,0,0,0-.8,1.13,4.34,4.34,0,0,0-.19.86c0,.16,0,.32,0,.48a2,2,0,0,0,0,.23v.14l.52.69a.25.25,0,0,0,0,.08c.08.53.49.86.54.79s-.07-.27-.12-.54l.33,0,.8.13,1.63.22c.26.25.53.39.57.34s-.06-.17-.16-.34h0l0-.06.15-.13.33-.28,2.47-2.11c.72-.61,1.39-1.18,2-1.67.53-1.68.88-2.82.9-2.9a1.11,1.11,0,0,0,.08-.24l0-.05c0,.05,0,.1,0,.15H60l.21,0v.07Z"/>
-                <path class="cls-7"
-                      d="M59.47,84.29l-.15.11a26.63,26.63,0,0,0-2.16,2,16.41,16.41,0,0,0-2.65,3.21l-3,.45a7.11,7.11,0,0,1-1.43-.76,4.55,4.55,0,0,1-.66-.5c-.16-.12-.29-.28-.44-.41a6.64,6.64,0,0,1-.75-1l.6-.34a35.2,35.2,0,0,0,4.78-2.93c.57-.38,1.15-.78,1.69-1.13,1,.29,2,.59,3,.91Z"/>
-                <path class="cls-5"
-                      d="M59.42,122.82a.44.44,0,0,1-.12.43,1.37,1.37,0,0,1-.45.21,1.83,1.83,0,0,1-.33.05,1.87,1.87,0,0,1-.72-.07l-.18,0s0,0,0-.09,0-.08,0-.1,0,0,.09,0a.94.94,0,0,0-.1-.14c0-.08-.2-.1-.08-.11a1.14,1.14,0,0,0,.32.05,2.28,2.28,0,0,0,.82-.14s.09,0,.1,0,.08,0,0-.09a1.77,1.77,0,0,0-.49-.21c-.16,0-.26,0-.28,0s.44-.33,1-.08C59.19,122.54,59.38,122.66,59.42,122.82Zm-1.65.46c.11.16,0,0,0,0Z"/>
-                <path class="cls-9" d="M57.74,123.24s.14.2,0,0Z"/>
-                <path class="cls-5"
-                      d="M57.52,136.27a44,44,0,0,1,.24,5.61c0,2.67-.18,5.29-.46,5.34a.14.14,0,0,0,0-.1c0-.1.2-.45-.2-.37-.16-.87-.37-2.82-.6-4.81-.16-1.34-.31-2.68-.45-3.68-.07-.5-.13-.92-.18-1.21s-.1-.45-.1-.47-.09-.67-.34-1.65-.59-2.27-1-3.56c-.44-1.55-.92-3.07-1.19-4.07h0a.61.61,0,0,0,.05-.12l.65.28c.49.9,1.11,2.19,1.66,3.5s1,2.53,1.36,3.53A16.22,16.22,0,0,1,57.52,136.27Z"/>
-                <path class="cls-8" d="M57.12,146.75c.4-.08.15.27.2.37a.14.14,0,0,1,0,.1h0s-.1-.16-.17-.47Z"/>
-                <path class="cls-5"
-                      d="M57.12,146.76c.07.31.12.47.17.47a21,21,0,0,1-3.11,2.05s-3.43,1.39-3.58,1.11h0a5.66,5.66,0,0,1,1.4-.6c1.37-.81,2.14-1.37,3.62-2.32l1-.51A2.4,2.4,0,0,1,57.12,146.76Z"/>
-                <path class="cls-5"
-                      d="M57.05,13c0,.13.12.48-.06.2a4.16,4.16,0,0,0-1.31-.93l-.46-.4c-.35-.31-.69-.58-1-.83l-.81-.6c-.52-.38-1-.74-1.53-1.07A19,19,0,0,0,49,7.76a20.89,20.89,0,0,0-4.57-1.49c-.35-.07-.68-.12-1-.16l.5-.22.72-.28.65-.23.2-.06A32,32,0,0,1,49.22,7,25,25,0,0,1,52.1,8.82L53.66,10l.81.62.63.5.27.21c.54.45,1,.91,1,1,.18.28,0-.08,0-.23s-.11-.33-.16-.47S56,11.08,56,11c-.41-1.14-1.15-3.13-1.7-4.38a22.22,22.22,0,0,0-1.1-2.27c.51,0,1,0,1.47,0,.21.59.42,1.26.65,2,.47,1.54,1,3.42,1.7,5.64a1.67,1.67,0,0,0,0,.53A4.19,4.19,0,0,0,57.05,13Z"/>
-                <path class="cls-5"
-                      d="M56.82,82h0l-.7.43-.79.53,0,0c-.38-.12-.77-.22-1.16-.33l.62-.48.76-.58,0,0C56,81.69,56.4,81.84,56.82,82Z"/>
-                <path class="cls-6"
-                      d="M56.38,12c0,.15.2.51,0,.23,0,0-.49-.51-1-1l-.27-.21-.63-.5L53.66,10,52.1,8.82A25,25,0,0,0,49.22,7a32,32,0,0,0-3.67-1.68,27.94,27.94,0,0,1,5.54-.88c.73,0,1.44-.07,2.12-.08a22.22,22.22,0,0,1,1.1,2.27C54.86,7.88,55.6,9.87,56,11c0,.07.11.27.21.55S56.32,11.87,56.38,12Z"/>
-                <path class="cls-5"
-                      d="M55.53,81.56l0,0-.76.58-.62.48c-1.83-.5-3.71-1-5.62-1.46-.43-.1-.83-.2-1.32-.35h0l.13-.25-2.1-1s-.08.14-.2.4l-1.49-.62-2.26-1c.35-.12.72-.24,1.09-.34.54-.17,1.09-.32,1.63-.47l.27.13,2.35,1.06,1.14.49c.34.12.79.24,1.2.36C51.16,80.21,53.39,80.86,55.53,81.56Z"/>
-                <path class="cls-5"
-                      d="M54.12,82.64c.39.11.78.21,1.16.33-.54.35-1.12.75-1.69,1.13A35.2,35.2,0,0,1,48.81,87a31.87,31.87,0,0,1,4.3-3.6C53.44,83.17,53.79,82.91,54.12,82.64Z"/>
-                <path class="cls-5"
-                      d="M51.18,111.48c0,.07.06.11,0,.12s-.08,0-.17-.1,0-.14.05-.15a.31.31,0,0,1,.12,0l.26,0c.36,0,.83-.07,1.29-.16a5.16,5.16,0,0,1,1.38-.1,2,2,0,0,1,.54.11.7.7,0,0,1,.29.17.42.42,0,0,1,.13.27.4.4,0,0,1-.1.3,1,1,0,0,1-.31.26,5.59,5.59,0,0,0-.48.38,1.54,1.54,0,0,1-.75.34,1.56,1.56,0,0,1-.77-.19c-.19-.09-.38-.19-.56-.26s-.53-.28-.51-.32a1.61,1.61,0,0,1,.6.1c.17.06.38.11.59.17a1.22,1.22,0,0,0,.6.09c.33-.07.65-.51,1-.74.11-.08,0,0,0-.06h0l-.33-.08a5.81,5.81,0,0,0-1.27,0,8.14,8.14,0,0,1-1.33,0A1.55,1.55,0,0,0,51.18,111.48Z"/>
-                <path class="cls-5"
-                      d="M52.42,3.12s0,0,0,0L52.51,3ZM54.16,3c.18.4.34.85.52,1.36-.47,0-1,0-1.47,0-.14-.28-.3-.54-.43-.75s-.22-.28-.31-.4-.06,0-.07,0,0,0,0,0h0l-.1-.05-.67-.35-.51-.25L52.27.77l.44.41.6.52a2.56,2.56,0,0,1,.53.63A6.54,6.54,0,0,1,54.16,3Z"/>
-                <path class="cls-7"
-                      d="M54.12,82.64c-.33.27-.68.53-1,.79a31.87,31.87,0,0,0-4.3,3.6l-.6.34a7.46,7.46,0,0,1-.4-.8,20.55,20.55,0,0,1-1-3.09c-.12-.53-.22-1-.31-1.33l.65-1.32h0c.49.15.89.25,1.32.35C50.41,81.66,52.29,82.14,54.12,82.64Z"/>
-                <path class="cls-5" d="M54,127.45l-.65-.28c.09-.2.15-.37.21-.49C53.68,126.89,53.84,127.15,54,127.45Z"/>
-                <path class="cls-5"
-                      d="M51.5,125.52l2.19.79-.12.34,0,0c-.22-.36-.39-.55-.47-.51s0,.38.15.94a20.92,20.92,0,0,1-1.94-1C51.44,125.73,51.5,125.52,51.5,125.52Z"/>
-                <path class="cls-5"
-                      d="M53.6,97.64l0,0c-.43.44-1,1-1,1-.55.47-.84.85-1.39,1.29l-1.32,1.06c-.8.62-1.55,1.16-2.28,1.62a18.65,18.65,0,0,1-3.74,1.7c-1,.34-1.7.55-2.15.68a2,2,0,0,0-.23.08c-.09-.65-.17-1.29-.22-1.93h.19a15.69,15.69,0,0,0,2.18-.21,12.17,12.17,0,0,0,3.66-1.14,32.19,32.19,0,0,0,4.39-3l1-.8L52.65,98c-.21.06-.59.13-.61.14l-1,.25c-.4,0-.75.09-1.13.12l-1.45.12a22.78,22.78,0,0,1-2.59,0A13,13,0,0,1,42.1,98c-.33-.12-.63-.25-.91-.37.05-.65.11-1.29.21-1.91a6.13,6.13,0,0,0,1.21.94,9.35,9.35,0,0,0,3.28,1.15,14.44,14.44,0,0,0,2.5.18l1.46,0c.6,0,1.35-.09,2-.17A12.26,12.26,0,0,0,53.6,97.64Z"/>
-                <path class="cls-5"
-                      d="M53.55,126.68c-.06.12-.12.29-.21.49l-.11-.06c-.14-.56-.21-.91-.15-.94S53.33,126.32,53.55,126.68Z"/>
-                <path class="cls-8" d="M53.34,127.17a.61.61,0,0,1-.05.12,1.27,1.27,0,0,0-.06-.18Z"/>
-                <path class="cls-5"
-                      d="M53.29,127.29h0a2.24,2.24,0,0,0-.13.27,22.31,22.31,0,0,1-1.77,3.07,46.21,46.21,0,0,1-3,3.87c-1.13,1.33-2.41,2.76-3.76,4.06-2.71,2.6-5.39,5.11-6.9,7.39s-2,4.09-2.17,4a6.46,6.46,0,0,1,.68-3,1.5,1.5,0,0,0,.54-.28,1.52,1.52,0,0,0-.46.1,12.25,12.25,0,0,1,.63-1.34,18.5,18.5,0,0,1,1.77-2.69c.4-.12.63-.24.63-.28a1.64,1.64,0,0,0-.46.06c1.32-1.69,3-3.45,4.54-5.15,1.26-1.36,2.39-2.77,3.45-4.15a43.87,43.87,0,0,0,2.69-3.81,22.89,22.89,0,0,0,1.48-2.83c.09-.2.16-.39.22-.53a20.92,20.92,0,0,0,1.94,1A1.27,1.27,0,0,1,53.29,127.29Z"/>
-                <path class="cls-5"
-                      d="M52.78,3.61c.13.21.29.47.43.75-.68,0-1.39,0-2.12.08a27.94,27.94,0,0,0-5.54.88c-.31-.13-.6-.23-.88-.34-1.21-.42-2.08-.69-2.66-.86s-.74-.22-.84-.24l0,0c.46-.28.94-.55,1.42-.81l.74-.39.81-.38A27.2,27.2,0,0,1,50.67.59c.53-.08,1-.15,1.56-.2l0,.38L51.09,2.49l.51.25.67.35.1.05h0s0,0,0,0,0,0,.07,0S52.66,3.44,52.78,3.61Z"/>
-                <path class="cls-5"
-                      d="M51.49,153.73c-.18-.27,1.26-1.63,1.41-1.26a4.94,4.94,0,0,0-.51.66c-.33.39-.33.64-.32.66a.82.82,0,0,0,0,.22,1.23,1.23,0,0,0,.16.51,2.69,2.69,0,0,0,.26.44c-.07,0-.09,0-.41,0-.07-.08-.15-.14-.21-.22A1.5,1.5,0,0,1,51.49,153.73Z"/>
-                <path class="cls-6"
-                      d="M52.65,98l.05.07-1,.8a32.19,32.19,0,0,1-4.39,3A12.17,12.17,0,0,1,43.68,103a15.69,15.69,0,0,1-2.18.21h-.19c-.07-.69-.13-1.39-.17-2.07a28.17,28.17,0,0,1,0-3.57c.28.12.58.25.91.37a13,13,0,0,0,3.8.75,22.78,22.78,0,0,0,2.59,0l1.45-.12c.38,0,.73-.07,1.13-.12l1-.25S52.44,98.1,52.65,98Z"/>
-                <path class="cls-8" d="M52.48,155c.1.17.19.31.16.34s-.31-.09-.57-.34C52.39,155,52.41,155,52.48,155Z"/>
-                <path class="cls-8" d="M52.51,3l-.06.09s0,0,0,0Z"/>
-                <path class="cls-5"
-                      d="M52.33,171.53a9.17,9.17,0,0,1-.15,5.63,15.85,15.85,0,0,1-3,4.85c-.49.59-.89,1.07-1.14,1.42a.15.15,0,0,1,0,.06l-1.23-.24a19.52,19.52,0,0,1,1.6-1.95,15.11,15.11,0,0,0,3-4.41,9.18,9.18,0,0,0,.5-5.22A3.08,3.08,0,0,0,50.84,170l.19.05.3.06A3.05,3.05,0,0,1,52.33,171.53Z"/>
-                <path class="cls-5"
-                      d="M52.36,90.48s.21.06,0,.09l-.84.17L49.92,91c-.51.08-1,.16-1.45.25l-1.1.15a12.55,12.55,0,0,1-3.54.14,8.35,8.35,0,0,1-1.45-.35c.18-.56.36-1.1.56-1.61a4.92,4.92,0,0,0,1.28.71,8,8,0,0,0,3.19.34l1.08-.06.91-.08,1-.14.52-.09c.16,0-.06,0-.1-.06l-.25-.1-.16-.07a5.74,5.74,0,0,1-.92-.5c-.13-.09-.26-.18-.38-.28a4,4,0,0,1-.49-.42A7.7,7.7,0,0,1,47.16,87c-.69-1.21-1.13-2.23-1.53-3,0,0,0,0,0,0l.91-1.82c.09.36.19.8.31,1.33a20.55,20.55,0,0,0,1,3.09,7.46,7.46,0,0,0,.4.8,6.64,6.64,0,0,0,.75,1c.15.13.28.29.44.41a4.55,4.55,0,0,0,.66.5,7.11,7.11,0,0,0,1.43.76l.31.12s.28.16.29.2S52.31,90.44,52.36,90.48Z"/>
-                <path class="cls-6"
-                      d="M51.9,171.67a9.18,9.18,0,0,1-.5,5.22,15.11,15.11,0,0,1-3,4.41,19.52,19.52,0,0,0-1.6,1.95c-1-.2-1.88-.41-2.8-.66a24,24,0,0,1-5.62-2.32c-.32-.16-.62-.34-.92-.52l1.2-.44a17.63,17.63,0,0,0,5.12-3,6.44,6.44,0,0,0,1.83-2.64A7.49,7.49,0,0,0,46,171a6.72,6.72,0,0,0-.41-2.48l.77.23,2.83.82c.5.15,1,.31,1.61.45A3.08,3.08,0,0,1,51.9,171.67Z"/>
-                <path class="cls-5" d="M51.33,170.12l-.3-.06-.19-.05c-.17-.14-.31-.22-.31-.25s.28,0,.67.26Z"/>
-                <path class="cls-7"
-                      d="M51.29,126.11c-.06.14-.13.33-.22.53a22.89,22.89,0,0,1-1.48,2.83,43.87,43.87,0,0,1-2.69,3.81c-1.06,1.38-2.19,2.79-3.45,4.15-1.58,1.7-3.22,3.46-4.54,5.15a9.23,9.23,0,0,1-1.42.16,13.78,13.78,0,0,1-4.09-.47,5.5,5.5,0,0,1-1.93-.88A4.6,4.6,0,0,1,30.26,140a4.8,4.8,0,0,1-.61-1.71c1.05-1.3,2.08-2.5,3.07-3.62a5.52,5.52,0,0,0,1.55,1.43,4.46,4.46,0,0,0,2.13.61c.63,0,1.05-.3,1-.46s-.36-.18-.76-.42a6.1,6.1,0,0,1-1.31-1,4.42,4.42,0,0,1-.78-1.32c-.08-.24-.14-.43-.17-.55l.41-.44c.52-.55,1-1.06,1.51-1.53a5.92,5.92,0,0,0,1.51,1.53c1.59,1.09,3.38,1.26,3.46,1s-1.42-1.08-2.36-2.23a4.72,4.72,0,0,1-1-1.64c0-.06,0-.13,0-.19l1.28-1.2.74-.71a3.07,3.07,0,0,0,1.1,1.33,4.61,4.61,0,0,0,.7.41l.67.3a8.31,8.31,0,0,0,1.23.4c.74.18,1.31.12,1.32-.06s-.39-.36-1-.77c-.28-.2-.6-.44-.94-.71-.16-.13-.34-.28-.52-.41s-.34-.3-.44-.42a1.3,1.3,0,0,1-.23-1.46,2.41,2.41,0,0,1,.28-.54.56.56,0,0,1,.09-.13l0,0-.06,0,1.15-1.09,0,0s0,0,0,0,.09.2.09.21a2.79,2.79,0,0,0,.52.56,6.56,6.56,0,0,0,1,.61c.75.4,1.68.51,1.77.18s-.34-.83-.7-1.45c-.19-.29-.38-.59-.5-.81a.79.79,0,0,1-.05-.24,1.1,1.1,0,0,1-.44-.79c0-.06,0-.13,0-.2a6.65,6.65,0,0,0,.55-1c.1.12.22.25.34.37a30.73,30.73,0,0,0,3.57,3C50,125.29,50.64,125.71,51.29,126.11Z"/>
-                <path class="cls-6"
-                      d="M50.8,90.23s.26,0,.1.06l-.52.09-1,.14-.91.08-1.08.06a8,8,0,0,1-3.19-.34,4.92,4.92,0,0,1-1.28-.71c.14-.38.29-.75.45-1.1.73-1.57,1.51-3.06,2.07-4.22l.15-.32s0,0,0,0c.4.77.84,1.79,1.53,3a7.7,7.7,0,0,0,1.44,1.84,4,4,0,0,0,.49.42c.12.1.25.19.38.28a5.74,5.74,0,0,0,.92.5l.16.07Z"/>
-                <path class="cls-5"
-                      d="M50.53,152.19c0,.07-.33.31-.58.65a3.2,3.2,0,0,0-.41.71l-.11.23a1.71,1.71,0,0,0-.14.51.88.88,0,0,0,0,.28h-.05s-.12,0-.16,0l-.22-.28a1.87,1.87,0,0,1,.14-.94,2.11,2.11,0,0,1,.18-.27,2.56,2.56,0,0,1,.46-.49C50,152.23,50.51,152.11,50.53,152.19Z"/>
-                <path class="cls-5"
-                      d="M49.75,120.36a2.73,2.73,0,0,1-.47,2.3h0l-.41-.33.07,0a2.31,2.31,0,0,0,.36-1.61c-.3,0-.83,0-1.14,0a1.32,1.32,0,0,1-.48.58c-.13-.11-.26-.24-.38-.36.32-.22.38-.39.38-.44l-.1-.34.36,0c.5,0,1.31,0,1.49,0A.31.31,0,0,1,49.75,120.36Z"/>
-                <path class="cls-8"
-                      d="M49.31,154.57c0,.27.16.5.12.54s-.46-.26-.54-.79a.25.25,0,0,1,0-.08l.22.28s.11,0,.16,0Z"/>
-                <path class="cls-7"
-                      d="M49.29,120.67a2.31,2.31,0,0,1-.36,1.61l-.07,0c-.41-.35-.81-.71-1.19-1.08a1.32,1.32,0,0,0,.48-.58C48.46,120.68,49,120.68,49.29,120.67Z"/>
-                <path class="cls-5"
-                      d="M49.27,122.66h0a.7.7,0,0,1-.5.19,1,1,0,0,1-.49-.14l.27-.45a.36.36,0,0,0,.31.06Z"/>
-                <path class="cls-5" d="M46.77,183.25l1.23.24c-.21.31-.33.49-.33.5s-.36.1-.64-.05-.45-.39-.36-.55Z"/>
-                <path class="cls-5" d="M47.67,121.25l-.15.11-.29-.43.06,0C47.41,121,47.54,121.14,47.67,121.25Z"/>
-                <path class="cls-5"
-                      d="M45.2,79.55l2.1,1-.13.25c-.49-.17-.83-.32-1.25-.49L45,80C45.12,79.69,45.2,79.55,45.2,79.55Z"/>
-                <path class="cls-5"
-                      d="M47.17,80.83l-.65,1.32c-.05-.21-.11-.39-.16-.55a2,2,0,0,0-.29-.62,1.47,1.47,0,0,0-.37-.33l-.94,1.83A9.47,9.47,0,0,1,45.61,84l-.15.32c-.56,1.16-1.34,2.65-2.07,4.22-.16.35-.31.72-.45,1.1a1.39,1.39,0,0,1-.42-.49l-1.45,1.5a5.34,5.34,0,0,0,1.31.6,28.67,28.67,0,0,0-.74,2.94c-.09.5-.17,1-.24,1.52a1.86,1.86,0,0,1-.44-.57l-1.59,1.34a6.85,6.85,0,0,0,1.82,1.14,28.17,28.17,0,0,0,0,3.57c0,.68.1,1.38.17,2.07h-.55v0c-.1-1.39-.18-2.74-.26-4l-.42-.52-.25-.35-.48-.65c-.08-.13-.17-.25-.24-.37,0-.7.1-1.38.18-2l1.56-1-1-1.45a.75.75,0,0,1-.16.11,28.07,28.07,0,0,1,1-3.44c.91-.71,1.52-1.19,1.47-1.29s-.48,0-1.12.32c.11-.3.23-.59.35-.87.79-1.78,1.49-3.13,2.06-4.35.78-1.61,1.33-2.75,1.6-3.33l.92.39C46.34,80.51,46.68,80.66,47.17,80.83Z"/>
-                <path class="cls-5"
-                      d="M46,124.48c.36.62.8,1.15.7,1.45s-1,.22-1.77-.18a6.56,6.56,0,0,1-1-.61,2.79,2.79,0,0,1-.52-.56s0-.09-.09-.21,0,0,0,0a13.39,13.39,0,0,0,1.67-1.89c0,.07,0,.14,0,.2a1.1,1.1,0,0,0,.44.79.79.79,0,0,0,.05.24C45.57,123.89,45.76,124.19,46,124.48Z"/>
-                <path class="cls-5"
-                      d="M46.36,81.6c0,.16.11.34.16.55L45.61,84a9.47,9.47,0,0,0-.85-1.49l.94-1.83a1.47,1.47,0,0,1,.37.33A2,2,0,0,1,46.36,81.6Z"/>
-                <path class="cls-5"
-                      d="M46,171a7.49,7.49,0,0,1-.46,2.71,6.44,6.44,0,0,1-1.83,2.64,17.63,17.63,0,0,1-5.12,3l-1.2.44c-.44-.25-.85-.51-1.27-.79l.28-.08c.45-.14,1.07-.32,1.8-.58a17.25,17.25,0,0,0,5-2.58A6.54,6.54,0,0,0,45.59,171a14,14,0,0,0-.06-2.49l.1,0A6.72,6.72,0,0,1,46,171Z"/>
-                <path class="cls-5"
-                      d="M45.68,120.41a1.41,1.41,0,0,1-.21,1.08,13.27,13.27,0,0,1-1.5-2c.72-1.2.79-1.73.88-1.54A16.63,16.63,0,0,0,45.68,120.41Z"/>
-                <path class="cls-8" d="M45.63,168.51l-.1,0c0-.06,0-.09,0-.09S45.59,168.43,45.63,168.51Z"/>
-                <path class="cls-7"
-                      d="M45.53,168.48a14,14,0,0,1,.06,2.49,6.54,6.54,0,0,1-2.39,4.75,17.25,17.25,0,0,1-5,2.58c-.73.26-1.35.44-1.8.58l-.28.08h0a4.53,4.53,0,0,1-.4-.26l-.62-.42c-.32-.24-.74-.54-1.11-.85-.75-.58-1.59-1.38-2.38-2.07,0,.93,0,1.85.05,2.77-.48-1-1-2-1.42-3l-.7-1.49-1,1.31L27.5,176.3l-.14.18s-.07.1-.07,0l0-.11-.1-.53c-.25-1.13-.49-2.24-.74-3.35-.11-.55-.24-1.09-.36-1.65l-.18-.82a5.58,5.58,0,0,0-.28-1c-.14-.29-.48-1.41-.85-2.66a13.58,13.58,0,0,0,1.38.19,11.36,11.36,0,0,0,2.79,0,10.63,10.63,0,0,0,3-1,5.58,5.58,0,0,0,2.21-1.54,6.65,6.65,0,0,0,1-1.64c.15-.43.29-.82.41-1.18.24-.69.44-1.27.56-1.7.3.58.52.93.53,1s.38.58.94,1.36a28.68,28.68,0,0,0,2.16,2.74,13.52,13.52,0,0,0,2.61,2.33,4.11,4.11,0,0,0,1.4.66l.34.41h0a2,2,0,0,0,.57.22C44.9,168.29,45.19,168.37,45.53,168.48Z"/>
-                <path class="cls-5"
-                      d="M45.55,5.32l-.2.06-.65.23L44,5.89l-.5.22a12.67,12.67,0,0,0-1.72-.17,4.79,4.79,0,0,0-.64,0h-.18l.2-2,0,0c.1,0,.36.09.84.24s1.45.44,2.66.86C45,5.09,45.24,5.19,45.55,5.32Z"/>
-                <path class="cls-5"
-                      d="M41,106.05l0,0-.07-.88c0-.67-.09-1.32-.13-2h.07l.23,2.07.47-.13c.17,1.29.4,2.6.67,3.92a43.49,43.49,0,0,0,1.36,5,1.69,1.69,0,0,0-.46-.24c-.2-.06-.34,0-.31.06s.11,0,.21.14.23.26.39.42a1.3,1.3,0,0,0,.44.37c.12.36.27.71.42,1.07,0,0,0,0,0,0a.09.09,0,0,0,.06,0c.15.38.31.75.49,1.11.11.21.21.43.32.64l-.24.12c-.09-.19-.16.34-.88,1.54-.3-.5-.57-1-.82-1.51a38.18,38.18,0,0,1-2.85-8.44c-.09-.4-.18-.81-.26-1.2a1.89,1.89,0,0,0,.84-.76,1.54,1.54,0,0,0,.18-.8,1.75,1.75,0,0,0-.05-.4l0-.11,0-.09,0,0h0a.09.09,0,0,1,0,0v-.08Z"/>
-                <path class="cls-5"
-                      d="M45.47,121.49a6.65,6.65,0,0,1-.55,1c-.09-.55,0-1.14-.25-1.29s-1,.35-1.34,1.25a2.78,2.78,0,0,0-.18,1.44,2.46,2.46,0,0,0,.1.49l0,0-1.15,1.09a3.31,3.31,0,0,1-.64-.47,1.32,1.32,0,0,1-.19-.21l-.79-.86-.06,0,.31-.33c.53-.51.85-.8.91-.88A21.75,21.75,0,0,0,44,119.44,13.27,13.27,0,0,0,45.47,121.49Z"/>
-                <path class="cls-5"
-                      d="M44.72,114.72a.88.88,0,0,1,.3.74.66.66,0,0,1-.49.55.58.58,0,0,1-.25,0,.13.13,0,0,1,0-.08c.11-.1.42-.27.36-.51a.43.43,0,0,0-.23-.29,1.23,1.23,0,0,0-.18-.09,1.65,1.65,0,0,1-.37-.18q-.15-.37-.27-.75l.1.07a2.09,2.09,0,0,0,.74.32A1.16,1.16,0,0,1,44.72,114.72Z"/>
-                <path class="cls-5"
-                      d="M43.94,129.13c.57.41,1,.62,1,.77s-.58.24-1.32.06a8.31,8.31,0,0,1-1.23-.4l-.67-.3a4.61,4.61,0,0,1-.7-.41,3.07,3.07,0,0,1-1.1-1.33l2.19-2.07.06,0,0,0a.56.56,0,0,0-.09.13,2.41,2.41,0,0,0-.28.54,1.3,1.3,0,0,0,.23,1.46c.1.12.27.26.44.42s.36.28.52.41C43.34,128.69,43.66,128.93,43.94,129.13Z"/>
-                <path class="cls-5"
-                      d="M44.67,121.15c.21.15.16.74.25,1.29a13.39,13.39,0,0,1-1.67,1.89,2.46,2.46,0,0,1-.1-.49,2.78,2.78,0,0,1,.18-1.44C43.67,121.5,44.41,120.93,44.67,121.15Z"/>
-                <path class="cls-9" d="M44.25,116a.13.13,0,0,0,0,.08.09.09,0,0,1-.06,0S44.23,116,44.25,116Z"/>
-                <path class="cls-5"
-                      d="M44,77.55c-.54.15-1.09.3-1.63.47-.37.1-.74.22-1.09.34l-1-.42c.57-.25,1.18-.48,1.79-.7l.67-.24h0Z"/>
-                <path class="cls-5"
-                      d="M43.56,114.13q.12.38.27.75a1.3,1.3,0,0,1-.44-.37c-.16-.16-.28-.33-.39-.42s-.2-.1-.21-.14.11-.12.31-.06A1.69,1.69,0,0,1,43.56,114.13Z"/>
-                <path class="cls-5"
-                      d="M36.33,158.75a2.06,2.06,0,0,0-.31.58l-.17-.34a11.34,11.34,0,0,1-.91-3.46.86.86,0,0,1,0-.16c.21-.13.31-.23.29-.26a1.45,1.45,0,0,0-.3.13,9.11,9.11,0,0,1,.65-4.7h0a26.09,26.09,0,0,0,.18,4.86,10.75,10.75,0,0,0,1.07,3.12,15.33,15.33,0,0,0,.82,1.34l.83,1.4c.5.8,1.17,1.84,1.91,2.81a16.63,16.63,0,0,0,2.24,2.49c.68.6,1.22.92,1.17,1s0,0,0,0a4.11,4.11,0,0,1-1.4-.66,13.52,13.52,0,0,1-2.61-2.33,28.68,28.68,0,0,1-2.16-2.74c-.56-.78-.92-1.33-.94-1.36s-.23-.38-.53-1A2.71,2.71,0,0,0,36.33,158.75Z"/>
-                <path class="cls-5"
-                      d="M43.48,6.11l-.89.38c-.93.42-1.81.86-2.66,1.32a35.93,35.93,0,0,0-4.43,2.82l-.42.32a1.15,1.15,0,0,0-.37.15,5.22,5.22,0,0,0-.82.6,2.94,2.94,0,0,0-.12-1.86c.17-.19.33-.38.51-.56A27.7,27.7,0,0,1,38.54,5.6a30.67,30.67,0,0,1,2.6-1.7l-.2,2h.18a4.79,4.79,0,0,1,.64,0A12.67,12.67,0,0,1,43.48,6.11Z"/>
-                <path class="cls-5"
-                      d="M42.75,77l-.67.24c-.61.22-1.22.45-1.79.7l-1.41-.64c-3-1.34-5.8-2.66-8.19-3.87-1.18-.63-2.27-1.2-3.24-1.77S25.61,70.51,25,70.09l-2.21-1.46c-.12-.09-1.72-1.14-4.24-2.8C17.26,65,15.75,64,14.08,62.9c-.31-.23-.76-.5-1.07-.78l-.4-.46c-.12-.16-.17-.31-.27-.45s0-.37.07-.5.06-.32.23-.49a1.87,1.87,0,0,1,.47-.46,7.45,7.45,0,0,1,.62-.42c.95-.61.71-.43.85-.5l.26-.13c-.05,0-.18-.07-.28-.11l-.1,0-.32-.1-1-.3L7,56.42l4.61-3,1.49-1,.38-.24.13-.08.27-.16.28-.17s-.15-.08-.23-.12l-.3-.14-.46-.2-.79-.33a3.84,3.84,0,0,1-.55-.24,1.75,1.75,0,0,1-.49-.4,1.65,1.65,0,0,1,.2-2.25,14.4,14.4,0,0,0,3.31-5.33,28.83,28.83,0,0,0,1.4-5,26.58,26.58,0,0,0,.45-4l.29.25h0A18,18,0,0,1,17,38a27.88,27.88,0,0,1-1.13,5.21,18.56,18.56,0,0,1-1.25,3,11.56,11.56,0,0,1-.91,1.48,7.11,7.11,0,0,1-.54.72l-.29.35-.26.28a.46.46,0,0,0,0,.66.42.42,0,0,0,.16.09l.23.08.79.31,2.45.92.68.26.33.13.18.07.08,0-.06,0-1.19.79-3.65,2.48-.74.49-.26.19-.35.26.57.13,1.84.47L20,58.11l-2.85,1.57-1.35.78-.5.3-.16.11h0S15,61,15,61l.21.13,4.5,2.8c2.57,1.6,4.2,2.66,4.33,2.75l2.22,1.53c.68.48,1.37,1,2.29,1.53s2,1.15,3.11,1.77c2.31,1.25,5.05,2.62,8,4Z"/>
-                <path class="cls-5"
-                      d="M42.94,89.61c-.2.51-.38,1-.56,1.61a5.34,5.34,0,0,1-1.31-.6l1.45-1.5A1.39,1.39,0,0,0,42.94,89.61Z"/>
-                <path class="cls-5"
-                      d="M42.11,88.18c0,.1-.56.58-1.47,1.29.11-.34.23-.66.35-1C41.63,88.21,42.07,88.08,42.11,88.18Z"/>
-                <path class="cls-5"
-                      d="M41.43,125a3.31,3.31,0,0,0,.64.47l-2.19,2.07a1.72,1.72,0,0,1-.07-.21,3.47,3.47,0,0,1-.09-1.7,5.21,5.21,0,0,1,.33-1.08c.06-.13.12-.22.15-.3l0,0,.07-.1a.65.65,0,0,1,.15-.18l.79.86A1.32,1.32,0,0,0,41.43,125Z"/>
-                <path class="cls-5"
-                      d="M41.4,95.68c-.1.62-.16,1.26-.21,1.91a6.85,6.85,0,0,1-1.82-1.14L41,95.11A1.86,1.86,0,0,0,41.4,95.68Z"/>
-                <path class="cls-5" d="M41.31,103.23c0,.64.13,1.28.22,1.93l-.47.13-.23-2.07h.48Z"/>
-                <path class="cls-5"
-                      d="M40.29,77.94l1,.42a30,30,0,0,0-3.7,1.44,14.62,14.62,0,0,0-2,1.17c-.09-.07.54-.84,1.78-1.57A22.71,22.71,0,0,1,40.29,77.94Z"/>
-                <path class="cls-5"
-                      d="M38.86,131.26c.94,1.15,2.48,1.91,2.36,2.23s-1.87.11-3.46-1A5.92,5.92,0,0,1,36.25,131c.56-.55,1.1-1.06,1.61-1.55,0,.06,0,.13,0,.19A4.72,4.72,0,0,0,38.86,131.26Z"/>
-                <path class="cls-9" d="M41.17,3.88l0,0v0Z"/>
-                <path class="cls-5"
-                      d="M41.06,106.73a1.54,1.54,0,0,1-.18.8,1.89,1.89,0,0,1-.84.76c-.08-.47-.18-.93-.26-1.39a.22.22,0,0,0,0-.12s0,0,0-.07l.25-.14.06,0h0l.1,0h0l0,0,.06,0,0,0a.25.25,0,0,0,.08,0l.24-.11a0,0,0,0,1,0,0,1.22,1.22,0,0,1,.2-.1l0,0,0,.09,0,.11A1.75,1.75,0,0,1,41.06,106.73Z"/>
-                <path class="cls-8" d="M41,106.05l0,0h0Z"/>
-                <path class="cls-5"
-                      d="M41,88.5c-.12.31-.24.63-.35,1-.47.36-1,.8-1.62,1.28-.84.67-1.72,1.41-2.51,2.11l-1.07,1-.45.44-.2.2c0,.06-.14.14-.11.13s0,0,0,.11,0,.12.11.37a4.88,4.88,0,0,0,.48.93c.45.69,1.64,1.5,2.55,2.72a5.48,5.48,0,0,1,.93,2,7.79,7.79,0,0,1,.19,1.81c0,.26,0,.5,0,.72s0,.21-.05.32a.58.58,0,0,1,0,.16s0,.06-.06.1h0l-.18-.17h0l0-.06h0l-.07,0-.09-.08c0-.07,0-.13,0-.22s-.08-.41-.14-.66a5.85,5.85,0,0,0-1.4-3.09c-.83-.9-2-1.54-2.86-2.49a6.84,6.84,0,0,1-.79-1.26,4.17,4.17,0,0,1-.23-.62A1.71,1.71,0,0,1,33,94.7a1.43,1.43,0,0,1,.44-1.19l.26-.24.23-.19.51-.42c.37-.3.77-.61,1.21-.93.89-.63,1.87-1.29,2.81-1.86A22.59,22.59,0,0,1,41,88.5Z"/>
-                <path class="cls-8" d="M41,106.08v.08a.09.09,0,0,0,0,0h0Z"/>
-                <path class="cls-5"
-                      d="M41,106.07h0l0,0-.2.11a0,0,0,0,0,0,0l-.24.11a.25.25,0,0,1-.08,0l0,0-.06,0,0,0h0l-.1,0h0l-.06,0-.25.08h0a2,2,0,0,1-.07-.3,0,0,0,0,1,0,0l-.13-1c-.06-.67-.13-1.34-.2-2-.11-1.14-.22-2.24-.32-3.28a20.81,20.81,0,0,1,.06-2.75c.07.12.16.24.24.37l.48.65.25.35.42.52c.08,1.28.16,2.63.26,4v0c0,.65.09,1.3.13,2Z"/>
-                <path class="cls-8" d="M40.92,106.1h0a1.22,1.22,0,0,0-.2.1Z"/>
-                <path class="cls-5"
-                      d="M39.85,92.8l1,1.45-1.56,1c.06-.5.15-1,.23-1.48,0-.28.11-.56.17-.84h0A.75.75,0,0,0,39.85,92.8Z"/>
-                <path class="cls-7"
-                      d="M40.64,89.47a28.07,28.07,0,0,0-1,3.44h0L38,94.08l-.47.32c-.33.23-.75.44-.86.8a1.67,1.67,0,0,0,.11,1.21c.11.24.15.3.22.45l.2.34a13.22,13.22,0,0,0,.94,1.36l.52.69.27.34.12.15,0,0,0,.27c0,.41,0,.83,0,1.25.08,1.12.19,2.25.35,3.4h0a.83.83,0,0,0-.2-.41,2.52,2.52,0,0,0-.44-.42h0s.05-.07.06-.1a.58.58,0,0,0,0-.16c0-.11,0-.21.05-.32s0-.46,0-.72a7.79,7.79,0,0,0-.19-1.81,5.48,5.48,0,0,0-.93-2c-.91-1.22-2.1-2-2.55-2.72a4.88,4.88,0,0,1-.48-.93c-.09-.25-.1-.36-.11-.37s0-.09,0-.11.06-.07.11-.13l.2-.2.45-.44,1.07-1c.79-.7,1.67-1.44,2.51-2.11C39.6,90.27,40.17,89.83,40.64,89.47Z"/>
-                <path class="cls-5"
-                      d="M40.39,123.87l.06,0a.65.65,0,0,0-.15.18l-.07.1,0,0c0,.08-.09.17-.15.3a5.21,5.21,0,0,0-.33,1.08,3.47,3.47,0,0,0,.09,1.7,1.72,1.72,0,0,0,.07.21l-.74.71-1.28,1.2c0-.16-.08-.31-.12-.44a1.84,1.84,0,0,0-.15-.46l-1.38.75-.22.12a2,2,0,0,0-.29.15l-.17.06h0l-.12-.09C37.07,127.62,38.71,125.71,40.39,123.87Z"/>
-                <path class="cls-5"
-                      d="M39.78,106.9c.08.46.18.92.26,1.39a2.67,2.67,0,0,1-.33.12,4.88,4.88,0,0,1-1.17.15,16.06,16.06,0,0,1-2.09-.15,8.38,8.38,0,0,1-2-.5,2.66,2.66,0,0,1-1.63-1.48,1.81,1.81,0,0,1,0-1.13,6.21,6.21,0,0,1,.31-.84,12.39,12.39,0,0,1,.7-1.52,2.83,2.83,0,0,1,.53-.64c.22-.2.36-.28.59-.49a3.61,3.61,0,0,1,.63-.49c.2-.09.44-.2.62,0,.3.3.26.77.37,1.12,0,.18.06.29.08.44a.53.53,0,0,1-.06.37,1.8,1.8,0,0,0-.41.14c.06-.07.12-.13.18-.21s0-.34-.12-.6-.09-.48-.26-.69-.28,0-.39.13-.22.22-.32.34-.33.3-.47.44a2.55,2.55,0,0,0-.37.52,12.76,12.76,0,0,0-.56,1.46,7,7,0,0,0-.24.79.87.87,0,0,0,0,.62,1.84,1.84,0,0,0,1.14.85,7.58,7.58,0,0,0,1.79.35,13.64,13.64,0,0,0,1.92,0c.58,0,1.23-.22,1.26-.44A.07.07,0,0,0,39.78,106.9Z"/>
-                <path class="cls-8" d="M39.79,106.65l.25-.08-.25.14v0h0Z"/>
-                <path class="cls-8"
-                      d="M39.79,106.71s0,.05,0,.07a.22.22,0,0,1,0,.12c0-.18-.06-.37-.08-.55a2,2,0,0,0,.07.3h0Z"/>
-                <path class="cls-7"
-                      d="M39.7,106.35c0,.18,0,.37.08.55a.07.07,0,0,1,0,0c0,.22-.68.43-1.26.44a13.64,13.64,0,0,1-1.92,0A7.58,7.58,0,0,1,34.8,107a1.84,1.84,0,0,1-1.14-.85.87.87,0,0,1,0-.62,7,7,0,0,1,.24-.79,12.76,12.76,0,0,1,.56-1.46,2.55,2.55,0,0,1,.37-.52c.14-.14.38-.34.47-.44s.21-.23.32-.34.26-.22.39-.13.14.48.26.69.2.48.12.6-.12.14-.18.21l-.08,0a1.84,1.84,0,0,0-1,.66.77.77,0,0,0,0,.61,1,1,0,0,0,.21.36,1.89,1.89,0,0,0,.24.25s.19,0,.27-.16.14-.27.09-.3a1.11,1.11,0,0,1-.16-.15c-.1-.12-.19-.25-.13-.37s.36-.31.68-.47a2.87,2.87,0,0,1,1-.31,1.47,1.47,0,0,1,.94.34,7.16,7.16,0,0,1,.78.59c.43.38.15.83.22.83s.08-.07.14-.25a.66.66,0,0,0,0-.32h0c.07.55.15,1.1.26,1.65A0,0,0,0,0,39.7,106.35Z"/>
-                <path class="cls-8"
-                      d="M39.57,105.3l.13,1c-.11-.55-.19-1.1-.26-1.65-.16-1.15-.27-2.28-.35-3.4,0-.42,0-.84,0-1.25.1,1,.21,2.14.32,3.28C39.44,104,39.51,104.63,39.57,105.3Z"/>
-                <path class="cls-5"
-                      d="M39.69,92.92c-.06.28-.12.56-.17.84-.08.48-.17,1-.23,1.48l-.49.31-.48.3h0s0,0,0,0l.1.21.15.28c.17.29.36.58.57.9a20.81,20.81,0,0,0-.06,2.75l0-.27,0,0-.12-.15-.27-.34-.52-.69a13.22,13.22,0,0,1-.94-1.36l-.2-.34c-.07-.15-.11-.21-.22-.45a1.67,1.67,0,0,1-.11-1.21c.11-.36.53-.57.86-.8l.47-.32Z"/>
-                <path class="cls-5"
-                      d="M39.43,104.68a.66.66,0,0,1,0,.32c-.06.18-.13.25-.14.25s.21-.45-.22-.83a7.16,7.16,0,0,0-.78-.59,1.47,1.47,0,0,0-.94-.34,2.87,2.87,0,0,0-1,.31c-.32.16-.63.33-.68.47s0,.25.13.37a1.11,1.11,0,0,0,.16.15s0,.17-.09.3-.22.2-.27.16a1.89,1.89,0,0,1-.24-.25,1,1,0,0,1-.21-.36.77.77,0,0,1,0-.61,1.84,1.84,0,0,1,1-.66l.08,0c-.14.14-.27.21-.24.25s.25,0,.62-.34l0,0a2.41,2.41,0,0,1,.72-.12,1.75,1.75,0,0,1,1,.36.28.28,0,0,0,0,.13.65.65,0,0,0,.05.15s0,.16.28.22a.26.26,0,0,0,.16-.09,2.52,2.52,0,0,1,.44.42A.83.83,0,0,1,39.43,104.68Z"/>
-                <path class="cls-5" d="M38.91,142.58a1.64,1.64,0,0,1,.46-.06s-.23.16-.63.28Z"/>
-                <path class="cls-5"
-                      d="M38.91,142.58l-.17.22a7.6,7.6,0,0,1-1.23.26,12.34,12.34,0,0,1-4.25-.21,6,6,0,0,1-2.19-.89,5.2,5.2,0,0,1-1.48-1.53,5.38,5.38,0,0,1-.59-1.29l.44-.55.21-.27a4.8,4.8,0,0,0,.61,1.71,4.6,4.6,0,0,0,1.21,1.36,5.5,5.5,0,0,0,1.93.88,13.78,13.78,0,0,0,4.09.47A9.23,9.23,0,0,0,38.91,142.58Z"/>
-                <path class="cls-5"
-                      d="M38.61,103.68l.18.17a.26.26,0,0,1-.16.09c-.29-.06-.23-.17-.28-.22a.65.65,0,0,1-.05-.15.28.28,0,0,1,0-.13.71.71,0,0,1,.17.11v.07s0,0,.05,0l.07,0A0,0,0,0,1,38.61,103.68Z"/>
-                <path class="cls-8" d="M38.64,103.61l0,.06-.13-.1h0v-.08l.09.08.07,0Z"/>
-                <path class="cls-8" d="M38.61,103.67h0a0,0,0,0,0,0,0l-.07,0c-.09-.06,0,0-.05,0v-.05h0Z"/>
-                <path class="cls-5" d="M38.47,103.53v0a.71.71,0,0,0-.17-.11s0,0,0,0,.07,0,.13.07h0Z"/>
-                <path class="cls-6"
-                      d="M37.51,143.06a7.6,7.6,0,0,0,1.23-.26A18.5,18.5,0,0,0,37,145.49a12.25,12.25,0,0,0-.63,1.34c-.35.08-.92.23-1.61.36a11.13,11.13,0,0,1-4.55.05,6.12,6.12,0,0,1-4.3-3.57c.25-.46.52-.91.8-1.34.74-1.12,1.53-2.18,2.32-3.19a5.38,5.38,0,0,0,.59,1.29A5.2,5.2,0,0,0,31.07,142a6,6,0,0,0,2.19.89A12.34,12.34,0,0,0,37.51,143.06Z"/>
-                <path class="cls-5"
-                      d="M37.74,129c0,.13.08.28.12.44-.51.49-1,1-1.61,1.55a4.2,4.2,0,0,1-.3-.48,8.38,8.38,0,0,1-.38-.79l0-.09h0l.17-.06a2,2,0,0,1,.29-.15l.22-.12,1.38-.75A1.84,1.84,0,0,1,37.74,129Z"/>
-                <path class="cls-5"
-                      d="M37.35,136.28c.1.16-.32.48-1,.46a4.46,4.46,0,0,1-2.13-.61,5.52,5.52,0,0,1-1.55-1.43c.55-.61,1.09-1.2,1.61-1.75,0,.12.09.31.17.55a4.42,4.42,0,0,0,.78,1.32,6.1,6.1,0,0,0,1.31,1C37,136.1,37.28,136.15,37.35,136.28Z"/>
-                <path class="cls-5"
-                      d="M37.43,179.75l-.65.22-.74.24a.26.26,0,0,1-.24-.11c0-.12-.09-.25-.22-.36a.29.29,0,0,1,0-.42c0-.13.08-.21.17-.23l.44-.13h0C36.58,179.24,37,179.5,37.43,179.75Z"/>
-                <path class="cls-5"
-                      d="M36.34,146.83a1.52,1.52,0,0,1,.46-.1,1.5,1.5,0,0,1-.54.28A1.42,1.42,0,0,1,36.34,146.83Z"/>
-                <path class="cls-5" d="M36.6,103.2l0,0c-.37.35-.59.35-.62.34s.1-.11.24-.25A1.8,1.8,0,0,1,36.6,103.2Z"/>
-                <path class="cls-5"
-                      d="M36.34,146.83a1.42,1.42,0,0,0-.08.18,12.36,12.36,0,0,1-1.45.5,10.78,10.78,0,0,1-4.74.31,6.52,6.52,0,0,1-4.66-3.28c.15-.29.3-.59.47-.87a6.12,6.12,0,0,0,4.3,3.57,11.13,11.13,0,0,0,4.55-.05C35.42,147.06,36,146.91,36.34,146.83Z"/>
-                <path class="cls-5" d="M36.33,158.75a2.71,2.71,0,0,1-.21.78l-.1-.2A2.06,2.06,0,0,1,36.33,158.75Z"/>
-                <path class="cls-5"
-                      d="M36,159.33l.1.2c-.12.43-.32,1-.56,1.7-.12.36-.26.75-.41,1.18a6.65,6.65,0,0,1-1,1.64,5.58,5.58,0,0,1-2.21,1.54,10.63,10.63,0,0,1-3,1,11.36,11.36,0,0,1-2.79,0,13.58,13.58,0,0,1-1.38-.19c-.1-.29-.19-.59-.27-.89.43.1,1,.22,1.73.31a11.19,11.19,0,0,0,2.61.06,10,10,0,0,0,2.85-.82,6.06,6.06,0,0,0,2.41-1.65,4.57,4.57,0,0,0,.69-1.13c.18-.41.33-.8.49-1.17C35.57,160.35,35.83,159.75,36,159.33Z"/>
-                <path class="cls-5"
-                      d="M36,130.5a4.2,4.2,0,0,0,.3.48c-.49.47-1,1-1.51,1.53l-.41.44a1,1,0,0,0,0-.15,3.16,3.16,0,0,0-1.13.28,3.76,3.76,0,0,0-1.07.48,4.91,4.91,0,0,0,.51,1l.12.18c-1,1.12-2,2.32-3.07,3.62a.18.18,0,0,1,0,0,.43.43,0,0,0-.46-.31.39.39,0,0,0-.37.46,4.27,4.27,0,0,0,.19.72c-.79,1-1.58,2.07-2.32,3.19-.28.43-.55.88-.8,1.34a1.09,1.09,0,0,0-.05-.14,3.54,3.54,0,0,1-.19-.57.33.33,0,0,0-.16-.22s0,0,0,0h0c.27-.61.57-1.23.86-1.82l.14-.21c.67-.95,1.24-2,1.82-3,.48-.71,1-1.41,1.46-2.12.77-.85,1.54-1.7,2.35-2.52,1.14-1.15,2.24-2.37,3.33-3.58l.12.09h0l0,.09A8.38,8.38,0,0,0,36,130.5Z"/>
-                <path class="cls-6"
-                      d="M35.85,159l.17.34c-.19.42-.45,1-.76,1.77-.16.37-.31.76-.49,1.17a4.57,4.57,0,0,1-.69,1.13,6.06,6.06,0,0,1-2.41,1.65,10,10,0,0,1-2.85.82,11.19,11.19,0,0,1-2.61-.06c-.7-.09-1.3-.21-1.73-.31-.44-1.46-.88-2.87-1-3.21l-.24-.61h0a21.58,21.58,0,0,1-.73-5.15c0-.48,0-1,0-1.47a4.64,4.64,0,0,0,.73.62,7.39,7.39,0,0,0,5,1.31,27.19,27.19,0,0,0,5-.9,7.43,7.43,0,0,0,1.76-.71.86.86,0,0,0,0,.16A11.34,11.34,0,0,0,35.85,159Z"/>
-                <path class="cls-7"
-                      d="M35.58,150v.53a9.11,9.11,0,0,0-.65,4.7l-.27.1a13.27,13.27,0,0,1-1.56.43,34.12,34.12,0,0,1-4.9.62,6.83,6.83,0,0,1-4.49-1.34,5.76,5.76,0,0,1-1.14-1.16,10.55,10.55,0,0,1,.27-1.72,50.14,50.14,0,0,1,1.56-5.44c.33-.76.66-1.48,1-2.19a6.52,6.52,0,0,0,4.66,3.28,10.78,10.78,0,0,0,4.74-.31,12.36,12.36,0,0,0,1.45-.5A6.46,6.46,0,0,0,35.58,150Z"/>
-                <rect class="cls-9" x="35.52" y="129.61" width="0.01" height="0.01"/>
-                <path class="cls-5" d="M35.22,155.11s-.08.13-.29.26c0-.05,0-.09,0-.13A1.45,1.45,0,0,1,35.22,155.11Z"/>
-                <path class="cls-5"
-                      d="M34.92,155.24s0,.08,0,.13a7.43,7.43,0,0,1-1.76.71,27.19,27.19,0,0,1-5,.9,7.39,7.39,0,0,1-5-1.31,4.64,4.64,0,0,1-.73-.62c0-.39,0-.79.06-1.16a5.76,5.76,0,0,0,1.14,1.16,6.83,6.83,0,0,0,4.49,1.34,34.12,34.12,0,0,0,4.9-.62,13.27,13.27,0,0,0,1.56-.43Z"/>
-                <path class="cls-5"
-                      d="M34.29,132.8a1,1,0,0,1,0,.15c-.52.55-1.06,1.14-1.61,1.75l-.12-.18a4.91,4.91,0,0,1-.51-1,3.76,3.76,0,0,1,1.07-.48A3.16,3.16,0,0,1,34.29,132.8Z"/>
-                <path class="cls-5"
-                      d="M33.77,9.84a2.94,2.94,0,0,1,.12,1.86,10.09,10.09,0,0,0-1,1c-.11.11-.21.21-.31.33l-.5.52-.09,0a.44.44,0,0,1-.2-.27.43.43,0,0,1,0-.2,2,2,0,0,1,.13-.48A11.47,11.47,0,0,1,33.77,9.84Z"/>
-                <path class="cls-9" d="M33.89,11.7h0a12.79,12.79,0,0,0-1,1A10.09,10.09,0,0,1,33.89,11.7Z"/>
-                <path class="cls-5"
-                      d="M33.43,9.55a.51.51,0,0,1,.34.29,11.47,11.47,0,0,0-1.85,2.71,2,2,0,0,0-.13.48.43.43,0,0,0,0,.2.44.44,0,0,0,.2.27l.09,0c-.13.13-.25.27-.39.4L30,13.47c-1.45-.36-3.5-.87-5.91-1.29a23.44,23.44,0,0,0-3.69-.42c-1.32,0-2.83.17-4.35.34s-3.12.43-4.7.72l-1.17.24-1,.22a.81.81,0,0,0-.33.12,1.16,1.16,0,0,0-.14.34v.11a2,2,0,0,0,0,.25c0,.19,0,.36,0,.55a11.17,11.17,0,0,0,.06,1.14A20,20,0,0,0,9,18.1a20.48,20.48,0,0,0,.53,2.25c.11.36.23.72.35,1.06l.08.23,0,.06.07.13.27.51a55.82,55.82,0,0,0,4.4,7.18c3.12,3.8,5.32,6.42,5.07,6.66s-1.16-.62-2.78-2h0a2.39,2.39,0,0,0-.21-1s-.06.26-.08.73c-1-.86-2.12-1.93-3.41-3.19a48,48,0,0,1-5.26-7l-.32-.5L7.67,23a.88.88,0,0,1-.12-.21l-.14-.33c-.19-.4-.35-.79-.51-1.2a21.15,21.15,0,0,1-.78-2.49,24.62,24.62,0,0,1-.54-2.61c-.07-.45-.12-.91-.15-1.37,0-.23,0-.48,0-.72s0-.25,0-.37,0-.36,0-.52a3.9,3.9,0,0,1,.66-2,3.28,3.28,0,0,1,1.72-1.1l.49-.18.32-.09.65-.19,1.26-.33c1.67-.42,3.3-.75,4.9-1s3.16-.5,4.75-.61a26.51,26.51,0,0,1,4.49.25c2.65.35,4.78.78,6.29,1.1S33.37,9.53,33.43,9.55Z"/>
-                <path class="cls-5"
-                      d="M29.64,138.27a.18.18,0,0,0,0,0l-.21.27-.44.55a4.27,4.27,0,0,1-.19-.72.39.39,0,0,1,.37-.46A.43.43,0,0,1,29.64,138.27Z"/>
-                <path class="cls-5"
-                      d="M28.51,17.46c.08.14-1.07,1-2.07,2.1a17,17,0,0,0-1.3,1.51c-.34.43-.54.75-.56.76l-.57.74a10.93,10.93,0,0,0-1,1.68c-.68,1.27-.81,2.72-1,2.72s-.17-.36-.16-.94a6.8,6.8,0,0,1,.36-2.09,11.32,11.32,0,0,1,.88-2c.31-.5.53-.84.55-.85s.27-.34.67-.76A15.28,15.28,0,0,1,25.78,19h0l1-.32c.64-.22,1-.7.92-1C28.17,17.51,28.48,17.4,28.51,17.46Z"/>
-                <path class="cls-8" d="M27.72,17.74c.12.27-.28.75-.92,1l-1,.32.09-.08A12.18,12.18,0,0,1,27.72,17.74Z"/>
-                <path class="cls-5"
-                      d="M27.7,17.71l0,0A12.18,12.18,0,0,0,25.88,19l-.09.08h0c-.14,0-.21,0-.23,0a2,2,0,0,0-.18-.28,2.13,2.13,0,0,0-.71-.58,6,6,0,0,0-3.4-.49c-3,.18-6-.18-6-.48s2.94-.69,5.75-1.3a7.57,7.57,0,0,1,4.62.15A4.48,4.48,0,0,1,27.7,17.71Z"/>
-                <path class="cls-5"
-                      d="M25.83,143.53a1.09,1.09,0,0,1,.05.14c-.17.28-.32.58-.47.87a5.19,5.19,0,0,1-.39-.8l.17-.46,0,0c.07-.17.15-.33.22-.5,0,0,0,0,0,0a.33.33,0,0,1,.16.22A3.54,3.54,0,0,0,25.83,143.53Z"/>
-                <path class="cls-9" d="M25.44,142.73h0c-.07.17-.15.33-.22.5l.21-.51Z"/>
-                <path class="cls-9" d="M25.19,143.28l-.17.46v0Z"/>
-                <path class="cls-5"
-                      d="M25,143.74a5.19,5.19,0,0,0,.39.8c-.36.71-.69,1.43-1,2.19a50.14,50.14,0,0,0-1.56,5.44,10.55,10.55,0,0,0-.27,1.72c-.22-.3-.33-.5-.34-.51l0,0c.08-.54.17-1,.29-1.6A43.89,43.89,0,0,1,25,143.74Z"/>
-                <path class="cls-5" d="M24.48,165.5c.08.3.17.6.27.89l-.18,0c-.07-.29-.15-.59-.21-.88Z"/>
-                <circle class="cls-7" cx="85.17" cy="46.47" r="1.44"/>
-                <circle class="cls-7" cx="63.02" cy="48.47" r="1.62"/>
-                <circle class="cls-7" cx="64.01" cy="51.01" r="0.33"/>
-                <circle class="cls-7" cx="83.75" cy="48.93" r="0.34"/>
-                <path class="cls-5"
-                      d="M66.46,76.69l.11,0a.52.52,0,0,0-.28-1h-.06a.49.49,0,0,0-.36.36v0a.52.52,0,0,0,1,.28v0l-.36.36h.06l-.28-1-.11,0c-.62.24-.35,1.25.28,1Z"/>
-                <path class="cls-5" d="M66.08,82.5l0,0a.52.52,0,0,0,.73.74l0,0a.52.52,0,0,0-.73-.73Z"/>
-                <path class="cls-6"
-                      d="M112.71,157.38a2.56,2.56,0,0,1,0,.37l-.09.61a9.4,9.4,0,0,1-.21,1.2,17.88,17.88,0,0,1-.7,2.37,21.65,21.65,0,0,1-5.45,8.36,27.78,27.78,0,0,1-8.61,5.65l-1.22.5-1.24.41c-.82.3-1.68.49-2.52.72-1.75.38-3.41.65-5.36,1l-5.63,2.22h0l0,0a31.26,31.26,0,0,1-6,2c-2.08.5-4.21.9-6.35,1.21-.85.12-1.71.24-2.57.34.22-.45.53-1,.88-1.69s.87-1.72,1.31-2.75a11.42,11.42,0,0,0,.57-1.65,11.83,11.83,0,0,0,.25-1.79,7,7,0,0,0-.45-3.54,7.43,7.43,0,0,0-1.89-2.41,5.48,5.48,0,0,0-1.17-.79,62.51,62.51,0,0,0,11.29-3.9c4.77-2.1,9.75-4.77,15.07-7.48,1.34-.67,2.69-1.36,4.08-2s2.77-1.37,4.21-1.92a15.78,15.78,0,0,1,4.47-1.12,7.48,7.48,0,0,1,4.39.87,7.36,7.36,0,0,1,1.77,1.43,8.24,8.24,0,0,1,.75.91Z"/>
-                <path class="cls-7"
-                      d="M106.59,12.84c0,.09.1,1.4,0,3.33a44.21,44.21,0,0,1-.84,7A54,54,0,0,1,103.91,30c-.63,1.84-1.11,3-1,3.12s.07,0,.15-.09c0,.56,0,1.93-.06,3.29-.05.88-.11,1.78-.18,2.44s-.14,1.13-.14,1.16,0,.49-.13,1.15a19.72,19.72,0,0,1-.37,2.11c0-.15,0-.33,0-.53,0-.52,0-1.13-.07-1.86a13.23,13.23,0,0,0-.74-2.39A8.75,8.75,0,0,0,99.65,36a12.3,12.3,0,0,0-2.47-2.17,12.07,12.07,0,0,0-7-1.66,7.56,7.56,0,0,0-3.56,1.45A11.46,11.46,0,0,0,84,36.19a9.45,9.45,0,0,0-1.52,3.09c-.32,1-.55,2-.74,2.88-.74,3.59-1,6.06-1,6.21s-.28,2.62-.38,6.25A28.23,28.23,0,0,0,82.8,67.68l.21.4.26.5a1.07,1.07,0,0,0,1.21.56,2.75,2.75,0,0,0,.58-.12,3.48,3.48,0,0,0,.52-.27c.27-.17.51-.35.75-.51,1-.69,1.86-1.4,2.73-2.08,1.74-1.37,3.33-2.7,4.65-3.86,0,0,3.81-3.23,4.5-4.7.05-.1.1-.25.17-.43l.67.83c.1.12.18.21.15.19a0,0,0,0,1,0,0h0c-.14.12-.33.27-.55.48a9.47,9.47,0,0,0-1.48,1.91c-.92,1.65-1.9,3.72-3.17,5.66a15.38,15.38,0,0,1-2.06,2.63,13.7,13.7,0,0,1-2.35,1.71,19.36,19.36,0,0,0-2.47,1.56l-.08,0s0,0,0,0a1.82,1.82,0,0,0-.59-.79c-.24-.14-.38-.07-.38,0s.12.09.24.23a2.9,2.9,0,0,1,.31.76c.09.38.19.85.28,1.36a6.94,6.94,0,0,0-2,1A6.61,6.61,0,0,0,87,74.28c0,.22.05.44.07.66a3.44,3.44,0,0,1,0,.91c-.48.25-.76.46-.72.51s.26,0,.65-.12a4.8,4.8,0,0,1-.26.81h0c-1.15.33-2.16.88-2.1,1s.8,0,1.68-.15c-.18.29-.32.45-.32.48a11.77,11.77,0,0,1-.76,1,13.31,13.31,0,0,1-1.94,1.82,4.81,4.81,0,0,1-2.4.77c-.73,0-1.23,0-1.25.1s.48.27,1.24.35a5.18,5.18,0,0,0,1.87-.13l0,.11c-.11,0-.42.36-.93.75a5.54,5.54,0,0,1-2.27,1,8.13,8.13,0,0,1-2.49.06,3.29,3.29,0,0,1-.36-.07,4.5,4.5,0,0,0,.94-.83,4,4,0,0,0,.73-1,1.62,1.62,0,0,0,.18-.43c-.12-.11-.46.53-1.22,1.15A6.89,6.89,0,0,1,74,84.48a12.54,12.54,0,0,1-3.63.2,7.35,7.35,0,0,1-1.64-.34l-.46-.14a5.48,5.48,0,0,1-1-.49c-.6-.43-1.37-1.09-2.16-1.78.7-.47,1.39-.93,1.92-1.21s1.17-.42,1.17-.51-.55-.13-1.34.09a19.22,19.22,0,0,0-2.38,1.09l-.07-.06-1.9-1.68,1.23-.4C66.37,78.38,69,77.7,69,77.54s-.08,0-.2,0l.81-1.4a3.9,3.9,0,0,0,.51.06l.57,0a.74.74,0,0,0,.41-.07.36.36,0,0,0,.15-.44,1.5,1.5,0,0,0-.45-.65.66.66,0,0,0-.43-.19h0L67.54,73.7c1.79-.14,2.75-.72,2.65-.84.08.1,1.06-.78,2.31-2.61A22.18,22.18,0,0,0,76,61.88a25,25,0,0,0,.29-6,53.49,53.49,0,0,0-.51-6.52,21.06,21.06,0,0,0-2.05-6.68,15.79,15.79,0,0,0-4.65-5.32l0,0,0,0a16.52,16.52,0,0,0-9.81-3.59,50.15,50.15,0,0,0-8.62.94,29.57,29.57,0,0,0-5.92,1.72,21.16,21.16,0,0,0-2.31,1.16,25.64,25.64,0,0,0-2.65,1.87,44.75,44.75,0,0,0-5.55,5.36,48.36,48.36,0,0,0-3.18,4l-.74,1.11-.57.82-.35.53-.18.26c-.06.08.11.16.15.25l.82,1,.51.59c.32.34.65.69,1,1.06a86.39,86.39,0,0,0,8.73,8.28,46.78,46.78,0,0,0,5,3.57L46.6,67l1.35.67c.91.43,1.78.8,2.65,1.19,3.48,1.51,6.75,2.87,9.65,3.8.63.2,1.23.39,1.81.53l-.68,2.53a31.69,31.69,0,0,0-4-.66,34.31,34.31,0,0,0-5.28-.12c-1.46.1-2.44.23-2.51.25s-1.05.16-2.46.53c-1.24.32-2.78.77-4.34,1.32h0l-3.06-1.45c-2.94-1.42-5.68-2.79-8-4-1.15-.62-2.2-1.21-3.11-1.77s-1.61-1-2.29-1.53l-2.22-1.53c-.13-.09-1.76-1.15-4.33-2.75l-4.5-2.8L15,61s.05-.08.09-.12h0l.16-.11.5-.3,1.35-.78L20,58.11,13.6,56.37l-1.84-.47-.57-.13.35-.26.26-.19.74-.49,3.65-2.48,1.19-.79.06,0-.08,0-.18-.07-.33-.13L16.17,51l-2.45-.92-.79-.31-.23-.08a.42.42,0,0,1-.16-.09.46.46,0,0,1,0-.66l.26-.28.29-.35a7.11,7.11,0,0,0,.54-.72,11.56,11.56,0,0,0,.91-1.48,18.56,18.56,0,0,0,1.25-3A27.88,27.88,0,0,0,17,38,18,18,0,0,0,17,34.14c1.62,1.42,2.65,2.17,2.78,2s-1.95-2.86-5.07-6.66a55.82,55.82,0,0,1-4.4-7.18l-.27-.51L10,21.7l0-.06-.08-.23c-.12-.34-.24-.7-.35-1.06A20.48,20.48,0,0,1,9,18.1a20,20,0,0,1-.31-2.31,11.17,11.17,0,0,1-.06-1.14c0-.19,0-.36,0-.55a2,2,0,0,1,0-.25v-.11a1.16,1.16,0,0,1,.14-.34.81.81,0,0,1,.33-.12l1-.22,1.17-.24c1.58-.29,3.16-.53,4.7-.72s3-.31,4.35-.34a23.44,23.44,0,0,1,3.69.42c2.41.42,4.46.93,5.91,1.29l1.75.45c.14-.13.26-.27.39-.4l.5-.52c.1-.12.2-.22.31-.33a12.79,12.79,0,0,1,1-1h0a5.22,5.22,0,0,1,.82-.6,1.15,1.15,0,0,1,.37-.15l.42-.32a35.93,35.93,0,0,1,4.43-2.82c.85-.46,1.73-.9,2.66-1.32l.89-.38c.3,0,.63.09,1,.16A20.89,20.89,0,0,1,49,7.76a19,19,0,0,1,2.83,1.61c.49.33,1,.69,1.53,1.07l.81.6c.33.25.67.52,1,.83l.46.4A4.16,4.16,0,0,1,57,13.2c.18.28.06-.07.06-.2a4.19,4.19,0,0,1,0-.47A1.67,1.67,0,0,1,57,12c-.67-2.22-1.23-4.1-1.7-5.64-.23-.76-.44-1.43-.65-2,.59,0,1.16,0,1.7,0,1.57,0,2.89.15,3.82.23l1.6.14,1,.06a3.71,3.71,0,0,1,.3.28A15.34,15.34,0,0,1,67,12.72c.06.33.11.64.14.76s0,0,0,0l.52,0v0A80.77,80.77,0,0,1,68,5l1,0a12.45,12.45,0,0,0,1.36,0c.24,0,.5,0,.8,0s.52-.06.77-.1c.8-.14,1.58-.3,2.35-.45.15.15.32.31.5.51a12.38,12.38,0,0,1,1.84,2.74,9.74,9.74,0,0,1,.42,1,10.17,10.17,0,0,1,.37,1.58c.07.53.14,1.09.23,1.67,0,.29.07.58.11.87l.06.45,0,.23c0,.07,0,0,.06,0l.27-.87A27.31,27.31,0,0,1,79.51,9,14.63,14.63,0,0,1,80.7,6.84,6.39,6.39,0,0,1,82,5.46a13.48,13.48,0,0,1,1.31-.85c.27-.16.51-.28.74-.39a27.59,27.59,0,0,1,3.84,1c1.51.5,2.88,1.1,4,1.53.89.33,1.64.59,2.18.74.65.7,1.15,1.21,1.5,1.55s.6.52.67.48-.07-.33-.34-.76l-.68-1.17.8,0h.54l.32,0c.88-.08,1.84-.15,2.82-.28A28.67,28.67,0,0,1,102.59,7a5.14,5.14,0,0,1,2.42.4c1.18.59,1.39,2.28,1.5,3.41S106.59,12.79,106.59,12.84Zm-1.21-2a5.15,5.15,0,0,0-.16-1.51c0-.1-.44-.07-.89.13l-.49.21h0a10.19,10.19,0,0,0-2.26.68,19.76,19.76,0,0,1-2.34.87,4.6,4.6,0,0,1-.78.16l.89,1.28a2.47,2.47,0,0,1,.42-.63,5.32,5.32,0,0,1,2-1.32,3,3,0,0,1,2-.18,3.53,3.53,0,0,1,0,.38,8.14,8.14,0,0,1-.14,2.54c-.31,1.26-.64,2.56-.74,3.31-.57-1-1.12-1.8-1.24-1.75a19.93,19.93,0,0,0,1,3.1,19.92,19.92,0,0,1,.61,2.11,9.74,9.74,0,0,1,.2,1c0,.06.12.44.18,1a15.34,15.34,0,0,1-.07,2.16,16.84,16.84,0,0,0-.18,3.25,9.46,9.46,0,0,0,1-3.13,12.5,12.5,0,0,0,.32-2.33c0-.68-.11-1.11-.09-1.14s-.11-.47-.32-1.08a18.79,18.79,0,0,0-.88-2.14l-.28-.55a22.61,22.61,0,0,0,1.67-3.44A8.53,8.53,0,0,0,105.38,10.88ZM85.64,76.8a1.27,1.27,0,0,0,.09-.67.34.34,0,0,0-.09-.2c-.06-.05-.14,0-.21,0-.27.12-.39.21-.37.24-.1-.12-.22-.19-.26-.14a.69.69,0,0,0,0,.68.61.61,0,0,0,.4.41C85.38,77.2,85.54,77.05,85.64,76.8Zm-1.35-2.53a1,1,0,0,0,.37-.62.33.33,0,0,0-.06-.22.2.2,0,0,0-.22,0c-.3.1-.44.17-.44.21s-.23-.19-.25-.16l-.12.14a1.05,1.05,0,0,0-.23.43.35.35,0,0,0,.24.42A.82.82,0,0,0,84.29,74.27Zm-.36,3.6a1.23,1.23,0,0,0,.4-1.09,2.18,2.18,0,0,0-.43-1,3.08,3.08,0,0,0-.73-.71,2.62,2.62,0,0,0-1-.4,6.75,6.75,0,0,0-1.84,0,1.57,1.57,0,0,0-.28.06l-.2.06-.36.11-.3.08H79a1,1,0,0,1-.22,0,1.55,1.55,0,0,0-.52-.07,5,5,0,0,0-.66.09,7,7,0,0,0-1.22.36,6.59,6.59,0,0,0-.65.31,4.47,4.47,0,0,0-1.4,1.12,3.62,3.62,0,0,0-.87,2.37,3.42,3.42,0,0,0,.33,1.4,1.74,1.74,0,0,0,1.28,1,3.27,3.27,0,0,0,1.45-.16,1.26,1.26,0,0,0,.55.33,3.23,3.23,0,0,0,1.62-.11,6,6,0,0,0,1.22-.48h0a1,1,0,0,0,.43.14,1.31,1.31,0,0,0,1-.33c.36-.37.63-.71.74-.79.09.07.06,0,.07,0v0a.07.07,0,0,0,0-.08.17.17,0,0,0-.11,0v0a.28.28,0,0,0,.22,0,.92.92,0,0,0,.28-.14A1.16,1.16,0,0,0,83,79.2C83.15,78.34,83.36,78.27,83.93,77.87ZM71,81.16a1.05,1.05,0,0,0-.44-.86,1.1,1.1,0,0,0-.86-.24c-.11-.11-.25-.16-.28-.11a4.07,4.07,0,0,0-.52.8,1,1,0,0,0,.13,1.1,1.3,1.3,0,0,0,2-.69ZM26.44,19.56c1-1.06,2.15-2,2.07-2.1s-.34.05-.79.28l0,0a4.48,4.48,0,0,0-2.05-1.64A7.57,7.57,0,0,0,21,15.92c-2.81.61-5.75.9-5.75,1.3s2.94.66,6,.48a6,6,0,0,1,3.4.49,2.13,2.13,0,0,1,.71.58,2,2,0,0,1,.18.28s.09,0,.23,0a15.28,15.28,0,0,0-1.46,1.34c-.4.42-.65.74-.67.76s-.24.35-.55.85a11.32,11.32,0,0,0-.88,2A6.8,6.8,0,0,0,21.86,26c0,.58.09.95.16.94s.29-1.45,1-2.72a10.93,10.93,0,0,1,1-1.68l.57-.74s.22-.33.56-.76A17,17,0,0,1,26.44,19.56Z"/>
-                <path class="cls-9" d="M104,10.78l0,.05-.11.07h0v0Z"/>
-                <path class="cls-7"
-                      d="M104.82,48.69c-.49.52-1.09,1.17-1.74,1.89l-1.37,1.51-.71.81c-.39.45-.78.91-1.17,1.35l-.5-.14c.51-1.75,1-3.78,1.44-5.22A39.45,39.45,0,0,0,104.82,48.69Z"/>
-                <path class="cls-9" d="M103.19,33a.38.38,0,0,1-.09.09,1,1,0,0,1,0-.25S103.17,32.85,103.19,33Z"/>
-                <path class="cls-7"
-                      d="M102.23,55.88l-.26,0h-.09l-.51.14-2,.55-.92.26c.23-.67.53-1.67.84-2.77l.5.14,2.14,1.4Z"/>
-                <path class="cls-8" d="M102.22,43.2a3.08,3.08,0,0,1-.07,1.08s-.06-.11-.1-.34.07-.3.11-.45Z"/>
-                <path class="cls-6"
-                      d="M101.86,42.69c.07.55.14,1,.19,1.25a29.75,29.75,0,0,0-.76,3v0h0l0,.18c0,.07,0,.14-.06.23s0,.12,0,.18-.08.32-.13.51-.06.21-.09.31-.06.22-.09.34,0,0,0,0a.61.61,0,0,1,0,.11s0,0,0,0c-.29,1-.67,2.24-1.06,3.28L97.3,52a13.25,13.25,0,0,0,.26-3.76,8.2,8.2,0,0,0-1.14-3.58,23.57,23.57,0,0,0-2-3,7.71,7.71,0,0,0-2.61-2.15,8.87,8.87,0,0,0-7.29,0,4.1,4.1,0,0,0-.56.36.85.85,0,0,1,0-.17,7.67,7.67,0,0,1,1.23-2.68,9.63,9.63,0,0,1,2.22-2.29,6.3,6.3,0,0,1,2.86-1.31,11.18,11.18,0,0,1,6.37,1.26,11.87,11.87,0,0,1,2.37,1.92,8.19,8.19,0,0,1,1.74,2.09,15.8,15.8,0,0,1,.83,2.15C101.71,41.58,101.79,42.19,101.86,42.69Z"/>
-                <path class="cls-8" d="M100.78,48.85a.06.06,0,0,1,0,0h0S100.77,48.86,100.78,48.85Z"/>
-                <path class="cls-6"
-                      d="M97.3,52l2.4.19c-.12.32-.24.62-.36.89-.93,2.14-1.14,4-1.75,4.81s-1,1.26-1,1.26c-.78.64-1.92,1.57-3.31,2.64s-3,2.32-4.81,3.61c-.89.64-1.82,1.31-2.77,1.94-.24.15-.47.31-.71.45l-.25.13a1.52,1.52,0,0,1-.27.06.17.17,0,0,1-.22-.13l-.14-.28-.17-.39a24.19,24.19,0,0,1-1.74-6.51,26.75,26.75,0,0,1-.23-3,.91.91,0,0,0,.3.13,7.56,7.56,0,0,0,2,.08,26.1,26.1,0,0,0,4.51-.76,23.83,23.83,0,0,0,5.93-2.39,11.9,11.9,0,0,0,1.48-1.06,5.46,5.46,0,0,0,.68-.68,1.08,1.08,0,0,0,.16-.2,1.39,1.39,0,0,0,.16-.28C97.2,52.3,97.25,52.13,97.3,52Z"/>
-                <path class="cls-8" d="M98.21,57l.28-.09-.11.29Z"/>
-                <path class="cls-10"
-                      d="M96.73,48.28a12,12,0,0,1-.31,3.46,1.69,1.69,0,0,1-.12.36l0,.12-.13.13a3.94,3.94,0,0,1-.59.56,11,11,0,0,1-1.36.94,20.62,20.62,0,0,1-4,1.71,10.5,10.5,0,0,0,3-7.37c.16-3.84-2.37-8.07-5.21-9a5.28,5.28,0,0,1,.89,0,7.45,7.45,0,0,1,2.72.79,7.2,7.2,0,0,1,2.34,2C95.2,43.9,96.65,46,96.73,48.28Z"/>
-                <path class="cls-11"
-                      d="M88,39.23c2.84.89,5.37,5.12,5.21,9a10.5,10.5,0,0,1-3,7.37q-.87.28-1.68.48a27.13,27.13,0,0,1-4.34.67h-.18a4.1,4.1,0,0,1-1.86-2.61h0c.17-3.25.45-5.4.46-5.53s.19-2.59.82-6.08c.12-.63.26-1.3.43-2a.79.79,0,0,1,.19-.17h0l.06,0a10.76,10.76,0,0,1,3.88-1.08Z"/>
-                <path class="cls-10" d="M83.81,40.42l.17-.08a.79.79,0,0,0-.19.17A.29.29,0,0,1,83.81,40.42Z"/>
-                <path class="cls-10"
-                      d="M83.94,56.71a5.44,5.44,0,0,1-1.45-.11.72.72,0,0,0-.52.1c0-.7,0-1.38.07-2,0-.2,0-.4,0-.58A4.1,4.1,0,0,0,83.94,56.71Z"/>
-                <path class="cls-7"
-                      d="M83.65,107.45c0,.28-.21.52-.47.74a3.44,3.44,0,0,1-.74.53,1.53,1.53,0,0,1-.6.16c.06-.39.11-.75.14-1.09a11.49,11.49,0,0,0,.1-1.78,8,8,0,0,0,0-.85h0c0,.12,0,.22.05.22a1.22,1.22,0,0,1,.63.42A3.74,3.74,0,0,1,83.65,107.45Z"/>
-                <path class="cls-12"
-                      d="M83.27,76.29c.33.4.46.85.2,1.08,0,0-.2.15-.31.26a2.19,2.19,0,0,0-.34.34,1,1,0,0,0-.12.2.7.7,0,0,0-.08.16.66.66,0,0,0,0,.15v.06a.53.53,0,0,1-.12.37.43.43,0,0,1-.15.15s-.14.1-.14,0,.2-.38,0-.54a1,1,0,0,0-.68.25c-.12.1-.17.16-.16.18s.09,0,.24,0a.86.86,0,0,1,.25-.1l.14,0h.09s0,0,0,.07c0,.36.08.31.06.4a.49.49,0,0,1,0,.2,1.65,1.65,0,0,0-.11.36,0,0,0,0,0,0,.05v0c-.1,0-.16.06-.26.09s-.46.35-.69.49a1.06,1.06,0,0,1-.77.22.31.31,0,0,0,.08-.26c0-.15-.15-.14-.16-.13a.49.49,0,0,1,0,.16c0,.07-.14.16-.31.23a6.21,6.21,0,0,1-1.4.39,2.88,2.88,0,0,1-1.35,0,.29.29,0,0,1-.12-.07c.2-.11.4-.23.59-.36a3.88,3.88,0,0,0,.49-.4l.23-.23a3,3,0,0,0,.22-.31.75.75,0,0,0,.14-.68.68.68,0,0,0-.51-.37,2.43,2.43,0,0,0-1,0,1,1,0,0,0-.66.37,1,1,0,0,0-.15.45c0,.08,0,.13,0,.14s.07,0,.13-.1a1.94,1.94,0,0,1,.22-.34.77.77,0,0,1,.52-.18,2.25,2.25,0,0,1,.72.06c.08,0,.19.07.21.17a.33.33,0,0,1-.12.27s-.08.07-.11.11l-.2.17a3.58,3.58,0,0,1-.45.31,3.06,3.06,0,0,1-2.11.52.84.84,0,0,1-.63-.56,2.62,2.62,0,0,1-.18-1,2.67,2.67,0,0,1,.71-1.68,4.54,4.54,0,0,1,1.67-1.05,9.32,9.32,0,0,1,1-.35,4.8,4.8,0,0,1,.48-.08c.1,0,.09,0,.12,0a2.14,2.14,0,0,0,.44.08,2.24,2.24,0,0,0,.51,0l.42-.13.36-.13.2-.07.1,0a5.82,5.82,0,0,1,1.56,0,1.61,1.61,0,0,1,.67.22A2.17,2.17,0,0,1,83.27,76.29Z"/>
-                <path class="cls-7"
-                      d="M82.24,96a3.69,3.69,0,0,1,0,.69c-.08.56-.32,1.46-.44,2.29-.06.38-.1.74-.13,1.09-.28-1.53-.72-3.37-1.19-5.21l-.28-1.06.19.08A3.22,3.22,0,0,1,82,95a1.53,1.53,0,0,1,.2.78A1.46,1.46,0,0,1,82.24,96Z"/>
-                <path class="cls-7"
-                      d="M80.89,101.35c.51,1.38.81,2.3,1,2.28-.13,0,0,1.52-.36,4.09a27.07,27.07,0,0,1-4,10,47.32,47.32,0,0,1-4.27,5.83c-1.49,2-4.05,2.91-6.74,3.39a29.92,29.92,0,0,1-4.18.38,26.16,26.16,0,0,1-4.26-.21,18.06,18.06,0,0,1-7.76-3.56l-1.08-.84h0a2.73,2.73,0,0,0,.47-2.3.31.31,0,0,0-.33-.21c-.18,0-1,0-1.49,0l-.36,0,.1.34s-.06.22-.38.44l-.24-.24a12.13,12.13,0,0,1-2-2.87c-.11-.21-.21-.43-.32-.64-.18-.36-.34-.73-.49-1.11a.58.58,0,0,0,.25,0,.66.66,0,0,0,.49-.55.88.88,0,0,0-.3-.74,1.16,1.16,0,0,0-.32-.2,2.09,2.09,0,0,1-.74-.32l-.1-.07a43.49,43.49,0,0,1-1.36-5c-.27-1.32-.5-2.63-.67-3.92a2,2,0,0,1,.23-.08c.45-.13,1.16-.34,2.15-.68a18.65,18.65,0,0,0,3.74-1.7c.73-.46,1.48-1,2.28-1.62L51.25,100c.55-.44.84-.82,1.39-1.29,0-.08.57-.61,1-1l0,0a12.26,12.26,0,0,1-1.7.11c-.7.08-1.45.15-2,.17l-1.46,0a14.44,14.44,0,0,1-2.5-.18,9.35,9.35,0,0,1-3.28-1.15,6.13,6.13,0,0,1-1.21-.94c.07-.52.15-1,.24-1.52a28.67,28.67,0,0,1,.74-2.94,8.35,8.35,0,0,0,1.45.35,12.55,12.55,0,0,0,3.54-.14l1.1-.15c.46-.09.94-.17,1.45-.25l1.58-.29.84-.17c.23,0,.07,0,0-.09s-.25,0-.27-.1-.29-.18-.29-.2l-.31-.12,3-.45s0,0,0,0A27.49,27.49,0,0,0,57.73,87c.79-.66,1.61-1.3,2.24-1.72.32-.23.6-.41.8-.53a28.94,28.94,0,0,0,6.09,1.68,15.74,15.74,0,0,0,3.48,0,0,0,0,0,1,0,0c.06.1.22.17.33.26a5,5,0,0,0,.79.49,2.9,2.9,0,0,0,.83.28,4.66,4.66,0,0,0,2.09-.06,10.12,10.12,0,0,0,1.18-.4c0,.09.12.29.23.58a.51.51,0,0,1,.13.34h0s0,0,0,0h0s0,0,0,.08a2.32,2.32,0,0,1-.33.91,3.74,3.74,0,0,1-.32.5A3.93,3.93,0,0,1,73,90.75c-.27.06-.58.11-.9.16l-1.08.19a7.42,7.42,0,0,0-1.26.24l-.29.07-.16,0s0,.11,0,.15a3.33,3.33,0,0,0,.27.61,3.63,3.63,0,0,0,.93,1.06,5.33,5.33,0,0,0,1,.64,6.34,6.34,0,0,0,2,.55,12.16,12.16,0,0,0,3.05-.22l1.51-.33h0c.17.5.37,1,.56,1.49.11.32.23.62.33.92a1.77,1.77,0,0,1-.15.18,4.63,4.63,0,0,1-1.72,1.2,6.64,6.64,0,0,1-3.08.43c-.6,0-1.24-.09-1.87-.16a14.82,14.82,0,0,1-1.68-.3c-.63-.13-1.47-.41-2.3-.63l.21.24,0,.07,0,0,.08.07.63.58a15.51,15.51,0,0,0,1.32,1.14c.24.2.51.37.75.56l.52.33c.33.21.67.4,1,.57a9.32,9.32,0,0,0,4,1.08A9.54,9.54,0,0,0,80.89,101.35Zm-3.41,6.31A5.93,5.93,0,0,0,78,107a8.2,8.2,0,0,0-.8-.22,2.67,2.67,0,0,0-.48-.08c-.29,0-.56,0-.54.1s.2.07.47.19l.43.18c.11,0,.08.06.09.07s0,0-.11.07l-.19.21a1.27,1.27,0,0,1-.43.31c-.16,0-.27,0-.29-.19s0-.28,0-.3-.14.07-.19.29a.46.46,0,0,0,.09.4.61.61,0,0,0,.46.2A1.71,1.71,0,0,0,77.48,107.66Zm-.25,5.26a.32.32,0,0,0,0-.52,2.91,2.91,0,0,0-1.31-.1l-.59,0a2.57,2.57,0,0,0-.55.06,6.88,6.88,0,0,0-1.83.74,2.43,2.43,0,0,1-.56.25c-.14,0-.22,0-.23,0s-.16,0-.17.21a1.09,1.09,0,0,0,.31.6,1.15,1.15,0,0,0,1.87.19,8.34,8.34,0,0,1,1.63-1,1,1,0,0,1,.19-.07l.32-.1c.2-.07.37-.13.53-.17A2.34,2.34,0,0,0,77.23,112.92Zm-2,6.94c.09-.38-.29-.53-.54-.45a2.07,2.07,0,0,0-.36.08,6,6,0,0,0-1.1.61c-.5.33-.94.74-.88.81a5.65,5.65,0,0,0,1.09-.45,7.69,7.69,0,0,1,.74-.3l.34-.12a.61.61,0,0,0,.12-.05s.06,0,.06,0a2.43,2.43,0,0,1-.07.39c0,.17-.08.33-.12.45-.08.29-.28.25-.31.3s0,.07.15.08a.47.47,0,0,0,.39-.23,3.67,3.67,0,0,0,.26-.48A5.78,5.78,0,0,0,75.28,119.86Zm-8.08-7a.31.31,0,0,0-.12-.41,1,1,0,0,0-.26-.08s-.25,0-.56,0a5.12,5.12,0,0,0-1.2.05,1.41,1.41,0,0,0-.92.82c-.12.31-.14.51-.1.52a3.91,3.91,0,0,0,1.66-.11,2.75,2.75,0,0,0,1.1-.51.37.37,0,0,1,.14-.07l.1,0C67.09,113,67.12,113,67.2,112.86Zm-1.65,5.55c0-.23-.2-.42-.39-.5a5.67,5.67,0,0,0-.93-.24l-.64-.06a1.8,1.8,0,0,0-1.39.55,2.16,2.16,0,0,0-.64,1.87,3.9,3.9,0,0,1,.92-1.57,1.37,1.37,0,0,1,1.06-.31l.61.11a5.27,5.27,0,0,1,.81.13c.05,0,.05,0,.07,0v0a.83.83,0,0,1-.11.15,7.65,7.65,0,0,1-.59.57c-.61.25-1.22.33-1.22.39a2.3,2.3,0,0,0,1.37-.09,4.72,4.72,0,0,0,.75-.56,1.52,1.52,0,0,0,.17-.18A.73.73,0,0,0,65.55,118.41Zm-6.25,4.84a.44.44,0,0,0,.12-.43c0-.16-.23-.28-.38-.35-.57-.25-1.08,0-1,.08s.12,0,.28,0a1.77,1.77,0,0,1,.49.21c.07,0,0,.09,0,.09s-.1,0-.1,0a2.28,2.28,0,0,1-.82.14,1.14,1.14,0,0,1-.32-.05c-.12,0,.07,0,.08.11a.94.94,0,0,1,.1.14s-.08,0-.09,0,0,0,0,.1,0,.09,0,.09l.18,0a1.87,1.87,0,0,0,.72.07,1.83,1.83,0,0,0,.33-.05A1.37,1.37,0,0,0,59.3,123.25ZM55,111.84a.4.4,0,0,0,.1-.3.42.42,0,0,0-.13-.27.7.7,0,0,0-.29-.17,2,2,0,0,0-.54-.11,5.16,5.16,0,0,0-1.38.1c-.46.09-.93.12-1.29.16l-.26,0a.31.31,0,0,0-.12,0c-.05,0-.08.12-.05.15s.16.1.17.1,0,0,0-.12a1.55,1.55,0,0,1,.31,0,8.14,8.14,0,0,0,1.33,0,5.81,5.81,0,0,1,1.27,0l.33.08h0s.06,0,0,.06c-.31.23-.63.67-1,.74a1.22,1.22,0,0,1-.6-.09c-.21-.06-.42-.11-.59-.17a1.61,1.61,0,0,0-.6-.1s.19.16.51.32.37.17.56.26a1.56,1.56,0,0,0,.77.19,1.54,1.54,0,0,0,.75-.34,5.59,5.59,0,0,1,.48-.38A1,1,0,0,0,55,111.84Z"/>
-                <path class="cls-6"
-                      d="M82.16,3.9c-.24.21-.49.45-.75.71a8.77,8.77,0,0,0-1.29,1.72A22.48,22.48,0,0,0,79,8.58c-.24.6-.51,1.33-.77,2.09l-.15.46s0,.13,0,.07v-.15l0-.28L78,10.21c0-.35-.06-.69-.1-1a5.5,5.5,0,0,0-.18-.88,10.71,10.71,0,0,0-.37-1.09A23.37,23.37,0,0,0,75.84,4.1c.54-.1,1.08-.2,1.63-.28a16.22,16.22,0,0,1,2.62-.2,4.86,4.86,0,0,1,.56,0l.72.11Z"/>
-                <path class="cls-6"
-                      d="M80.8,101.07c0,.09.06.19.09.27a7.14,7.14,0,0,0-1.11,0,18.54,18.54,0,0,1-2.88-.14A9.16,9.16,0,0,1,73.17,100c-.31-.19-.62-.37-.93-.58l-.42-.3L71.68,99a1.79,1.79,0,0,1-.24-.22l-.08-.09s.1,0,.14,0l.28.07a1.88,1.88,0,0,0,.34.08c.65.1,1.31.17,1.93.22a7.69,7.69,0,0,0,3.54-.4,5.66,5.66,0,0,0,1.92-1.2C80,98.83,80.43,100.06,80.8,101.07Z"/>
-                <path class="cls-8" d="M80,80.84c-.05,0,0,0,0-.07A.1.1,0,0,1,80,80.84Z"/>
-                <g id="_Group_" data-name="&lt;Group&gt;">
-                    <path class="cls-7"
-                          d="M78.35,147.86a1.79,1.79,0,0,0-.56-.49,2.15,2.15,0,0,0-1.06-.15c-.28,0-.45,0-.45.06s.17.1.43.16a3.17,3.17,0,0,1,.87.28,1.28,1.28,0,0,1,.44.62l-.15.2a1.77,1.77,0,0,1-.64.53,4.19,4.19,0,0,1-1.9.2L71,149.22l-2.65-1.47c-.11-.51-.21-1-.33-1.55h0l.13,0h0l.57-.11H69c.35,0,.85-.06,1.49,0a10.41,10.41,0,0,0,2.4-.05,16.34,16.34,0,0,0,2.91-1.11,11.13,11.13,0,0,1,1.53-.67,1.26,1.26,0,0,1,1.28.49,2.13,2.13,0,0,1,.58,1.18,1.59,1.59,0,0,0-.72-.29,2.67,2.67,0,0,0-1,.14.49.49,0,0,0-.29.16c-.06,0-.1.07-.09.1s0,0,.13,0a.68.68,0,0,1,.29-.06,3.39,3.39,0,0,1,.89.06,1.24,1.24,0,0,1,.75.62l-.14.27c-.17.28-.34.57-.53.86A1.09,1.09,0,0,0,78.35,147.86Z"/>
-                </g>
-                <path class="cls-6"
-                      d="M76.69,90c.26.67.54,1.43.84,2.24a7,7,0,0,1-1.19.72,6.85,6.85,0,0,1-2.61.72,4.37,4.37,0,0,1-1.82-.3,4.56,4.56,0,0,1-.91-.46,2.52,2.52,0,0,1-.64-.66,1.23,1.23,0,0,1-.21-.41c-.07-.09,0-.08.12-.09l.22,0,.85-.08c.7-.06,1.34-.11,1.92-.18a5.72,5.72,0,0,0,2.95-1.06C76.39,90.28,76.54,90.14,76.69,90Z"/>
-                <path class="cls-9" d="M76.4,84.11h0a.08.08,0,0,1,0,0v0Z"/>
-                <path class="cls-7"
-                      d="M76.39,85.46v.16c0,.17-.24.39-.24.39s-.35.23-.46.32a2.9,2.9,0,0,1-1.4.64,2.46,2.46,0,0,1-1.77-.16,1.37,1.37,0,0,1-.47-.37.51.51,0,0,1-.08-.26v0a11.78,11.78,0,0,0,1.24-.44,15.49,15.49,0,0,0,2.39-.89.62.62,0,0,0,.18.24l.1.05.09,0,.09,0A3.18,3.18,0,0,1,76.39,85.46Z"/>
-                <path class="cls-8" d="M75.57,84.78c.12,0,.25-.12.36-.18s-.12.11-.34.23l0,0Z"/>
-                <path class="cls-7"
-                      d="M75.81,112.79l.06,0a.07.07,0,0,1-.06,0h0l-.16.07A7.91,7.91,0,0,0,74,114.08c-.27.2-.56.42-.79.39a1.33,1.33,0,0,1-.68-.4,1.13,1.13,0,0,1-.35-.46c0-.13,0-.18,0-.2s.07.09.24.08a2.13,2.13,0,0,0,.64-.15,8.48,8.48,0,0,1,1.8-.54,4.18,4.18,0,0,1,.5,0Z"/>
-                <path class="cls-6"
-                      d="M75,56A24.92,24.92,0,0,1,75,61.72,23.79,23.79,0,0,1,72.05,70c-.54.94-1,1.66-1.35,2.15a5.47,5.47,0,0,0-.51.74s-.24.1-.68.18a10.36,10.36,0,0,1-2,.19A13.17,13.17,0,0,1,64.42,73a27.81,27.81,0,0,1-3.87-1.2c-2.8-1.05-6-2.51-9.41-4.14-.85-.4-1.73-.81-2.57-1.24l-1.26-.68-1.23-.77a46.53,46.53,0,0,1-4.73-3.57A87.27,87.27,0,0,1,33,53.05L32.09,52l-.41-.48-.06-.08s0-.07,0-.09l0,0,.19-.26L32.64,50a44.24,44.24,0,0,1,3.1-3.72,42.93,42.93,0,0,1,5.36-5c1.42-1.09,2.34-1.59,2.43-1.68s.77-.49,2-1A28.24,28.24,0,0,1,51,36.84a49,49,0,0,1,8.2-1.05,14.76,14.76,0,0,1,8.67,3l.07,0a14.18,14.18,0,0,1,4.31,4.67,19.8,19.8,0,0,1,2.07,6.14A59.06,59.06,0,0,1,75,56Zm-2.49,2c.33-.29.49-2.46.32-3.47A30.6,30.6,0,0,0,71.81,50a18,18,0,0,0-2-4.48,9.56,9.56,0,0,0-2.06-2.3,18.77,18.77,0,0,0-2.88-1.56,14.11,14.11,0,0,0-3.33-1.06,8.76,8.76,0,0,0-3.77.19,11.87,11.87,0,0,0-3.46,1.7,20.87,20.87,0,0,0-3,2.43,20.47,20.47,0,0,0-4.57,6.3,17.85,17.85,0,0,0-.68,1.85c-.08.32-.17.64-.23,1,0,.17-.06.31-.09.52s0,.51,0,.76a7.16,7.16,0,0,0,.59.47l.37.28c.25.19.5.4.76.58l1.53,1h0a17.44,17.44,0,0,0,4.65,2,38.74,38.74,0,0,0,4.51,1,22.53,22.53,0,0,0,7.88.31,13.11,13.11,0,0,0,5-1.81A4.24,4.24,0,0,0,72.55,58Z"/>
-                <path class="cls-7"
-                      d="M73.84,124.61c-.3.57-.6,1.1-.84,1.55-.39.67-.65,1.14-.67,1.16l-.57,1.22A25.27,25.27,0,0,1,70.45,131c-1.1,1.73-2.24,3.51-2.07,3.57s.27,0,.6-.29a3.78,3.78,0,0,1-.06.49,48.36,48.36,0,0,0-.59,5c-.1,2.32-.09,4-.13,5,0,.56,0,1,0,1.23a.28.28,0,0,1,0,.09v0h0l-.12,0c-.4-1.92-.8-3.93-1.18-5.76-.06-.3-.12-.59-.19-.89l-.1-.44c0-.15-.06-.28-.13-.52,0-.52-.11-1-.16-1.5C66.2,136,66.11,135,66,134c-.14-1.91-.26-3.46-.34-4.56,0-.44,0-.81-.07-1.08.39-.05.79-.12,1.17-.2a16.18,16.18,0,0,0,4.11-1.32A9,9,0,0,0,73.84,124.61Z"/>
-                <path class="cls-10"
-                      d="M72.52,56.62s0,1.33,0,1.36-.57.46-1.64,1a11.62,11.62,0,0,1-1.1.51c1.29-1.4,1.64-3.56,1.86-6.06A28.12,28.12,0,0,1,72.52,56.62Z"/>
-                <path class="cls-11"
-                      d="M71.67,53.47c-.22,2.5-.57,4.66-1.86,6.06a12.42,12.42,0,0,1-1.35.48l.24-.2a17.49,17.49,0,0,1-4.44.62H62.73c-2.18-1.46-3.59-4.68-3.38-8.36.25-4.64,2.86-8.24,6.05-8.43a10,10,0,0,1,1.38.83,7.81,7.81,0,0,1,1.52,1.73,1.48,1.48,0,0,1,.21.26l.43.81.15.26A39.39,39.39,0,0,1,71.67,53.47Z"/>
-                <path class="cls-7"
-                      d="M70.53,85.77h-.1A17.69,17.69,0,0,1,67,85.54,26.43,26.43,0,0,1,62,84l2.31-1.52a25,25,0,0,0,2.31,2.16,6.34,6.34,0,0,0,1.75.86,8,8,0,0,0,1.91.31Z"/>
-                <path class="cls-7"
-                      d="M67.54,73.7l2.85,1.13a.55.55,0,0,0-.4.2,1.56,1.56,0,0,0-.32.6s.13.1.27.13l-.29.27,0,0s0,0,0,0l-.81,1.4a26.93,26.93,0,0,0-4,.66l-.16-1.34h0a7.48,7.48,0,0,0-2.2-.85l-1.11-.28.68-2.53a17.14,17.14,0,0,0,2.24.49A12.77,12.77,0,0,0,67.54,73.7Z"/>
-                <path class="cls-7"
-                      d="M68.59,173.23a6.39,6.39,0,0,1,.23,3.19,11.13,11.13,0,0,1-.3,1.64,13.88,13.88,0,0,1-.59,1.51c-.45,1-.94,1.85-1.37,2.62l-1,1.87c-.1.19-.18.36-.26.49l-2.48.25c-1.07.09-2.15.17-3.22.23l-.58.08h-.52l-.34-.06-1.6-.24c-2.86-.44-5.73-.81-8.51-1.31a.15.15,0,0,0,0-.06c.25-.35.65-.83,1.14-1.42a15.85,15.85,0,0,0,3-4.85,9.17,9.17,0,0,0,.15-5.63,3.05,3.05,0,0,0-1-1.41l1.8.3a33.41,33.41,0,0,0,10.82-.2c.56-.09,1.13-.21,1.7-.34a4.94,4.94,0,0,1,1.34,1A7.5,7.5,0,0,1,68.59,173.23Z"/>
-                <path class="cls-11"
-                      d="M68.7,59.81l-.24.2a5.25,5.25,0,0,1-.6.17h0a27.25,27.25,0,0,1-3.57.25A17.49,17.49,0,0,0,68.7,59.81Z"/>
-                <path class="cls-11" d="M68.46,60a.87.87,0,0,1-.11.09l-.49.08A5.25,5.25,0,0,0,68.46,60Z"/>
-                <path class="cls-9" d="M67.67,13.43v0l-.52,0s0,0,0,0Z"/>
-                <path class="cls-7"
-                      d="M66.92,112.71s0,0,0,.07a.4.4,0,0,0-.08.18h-.07s-.2,0-.5-.07a2.32,2.32,0,0,0,.25-.21,1.34,1.34,0,0,1,.23-.13c.06,0,0-.07.08,0A.37.37,0,0,0,66.92,112.71Z"/>
-                <path class="cls-11"
-                      d="M67.83,60.18a11.93,11.93,0,0,1-1.49.29h-.1a.52.52,0,0,0-.43.08h-.09l-.89.06c-.33,0-.65,0-1,0s-.56,0-.84,0l-.28-.18h1.53A27.25,27.25,0,0,0,67.83,60.18Z"/>
-                <path class="cls-6" d="M66.58,5c.17,1.29.35,3.21.47,5.91a23.52,23.52,0,0,0-2.57-6Z"/>
-                <path class="cls-11" d="M66.34,60.47l-.24,0h-.29a.52.52,0,0,1,.43-.08Z"/>
-                <path class="cls-7"
-                      d="M66.22,112.88a1.91,1.91,0,0,1-.63.35c-.63.22-1.31.38-1.5.47.12-.16.44-.83,1.06-.89A6.28,6.28,0,0,1,66.22,112.88Z"/>
-                <path class="cls-7"
-                      d="M64.64,76.82l.16,1.34c-.44.08-.88.18-1.31.29-.63.15-1.26.32-1.85.49-.85-.71-1.45-1.15-1.53-1a10.77,10.77,0,0,0,1,1.17l-1.42.45c-1,.34-1.72.63-1.77.65a16.81,16.81,0,0,0-1.68.9c-.23.14-.47.32-.73.49-2.14-.7-4.37-1.35-6.6-2-.41-.12-.86-.24-1.2-.36l-1.14-.49-2.35-1.06L44,77.55c1.24-.33,2.42-.62,3.38-.82,1.38-.31,2.34-.4,2.4-.42s1-.18,2.41-.34a36.5,36.5,0,0,1,5.14-.12,39,39,0,0,1,5.08.56C63.59,76.62,64.43,76.82,64.64,76.82Z"/>
-                <path class="cls-10"
-                      d="M64.23,43.07c.39.18.78.38,1.17.58-3.19.19-5.8,3.79-6.05,8.43-.21,3.68,1.2,6.9,3.38,8.36l.28.18A27.21,27.21,0,0,1,58.27,60a38.35,38.35,0,0,1-4.39-1.13,16.33,16.33,0,0,1-4.29-1.93l-.05,0L48,55.82c-.25-.17-.48-.37-.73-.56l-.49-.39,0-.17.08-.42c.07-.29.15-.57.23-.86a13.43,13.43,0,0,1,.66-1.69,18.93,18.93,0,0,1,4.41-5.84,15,15,0,0,1,5.89-3.71A8.77,8.77,0,0,1,64.23,43.07Z"/>
-                <path class="cls-9" d="M64.06,113.73s0,0,0,0Z"/>
-                <path class="cls-7"
-                      d="M62.41,128.67l1,0c-.09.55-.2,1.37-.36,2.38-.28,1.91-.66,4.45-1,7l-.08.47,0,.11v0l0,0-.08.16-.37.9-.7,1.75c-.44,1.14-.86,2.21-1.22,3.13l-.86,2.27-.14.38v.05l0,.13a.38.38,0,0,0,0,.1l0,.05a1.11,1.11,0,0,1-.08.24c0,.08-.37,1.22-.9,2.9-.6.49-1.27,1.06-2,1.67L53,154.48l-.33.28-.15.13,0,.06h0a2.69,2.69,0,0,1-.26-.44,1.23,1.23,0,0,1-.16-.51.82.82,0,0,1,0-.22s0-.27.32-.66a4.94,4.94,0,0,1,.51-.66c-.15-.37-1.59,1-1.41,1.26a1.5,1.5,0,0,0,.37,1c.06.08.14.14.21.22l-1.63-.22-.8-.13-.33,0a.88.88,0,0,1,0-.28,1.71,1.71,0,0,1,.14-.51l.11-.23a3.2,3.2,0,0,1,.41-.71c.25-.34.61-.58.58-.65s-.5,0-.87.35a2.56,2.56,0,0,0-.46.49,2.11,2.11,0,0,0-.18.27,1.87,1.87,0,0,0-.14.94l-.52-.69v-.14a2,2,0,0,1,0-.23c0-.16,0-.32,0-.48a4.34,4.34,0,0,1,.19-.86,1.91,1.91,0,0,1,.8-1.13,1.68,1.68,0,0,1,1.23-.32c.15.28,3.53-1.08,3.58-1.11a21,21,0,0,0,3.11-2.05h0c.28-.05.45-2.67.46-5.34a44,44,0,0,0-.24-5.61,16.22,16.22,0,0,0-.51-1.79c-.33-1-.83-2.27-1.36-3.53s-1.17-2.6-1.66-3.5a16.43,16.43,0,0,0,3.89,1.09A24.76,24.76,0,0,0,62.41,128.67Z"/>
-                <path class="cls-7"
-                      d="M61.86,79.87c.54.58,1.18,1.25,1.82,1.91-.75.41-1.46.79-2,1.12l-.95.53c-.64-.26-1.31-.52-2-.78s-1.24-.45-1.89-.67c.9-.46,1.56-.72,1.6-.74s.68-.32,1.67-.7C60.6,80.33,61.21,80.1,61.86,79.87Z"/>
-                <path class="cls-7"
-                      d="M59.47,84.29l-.15.11a26.63,26.63,0,0,0-2.16,2,16.41,16.41,0,0,0-2.65,3.21l-3,.45a7.11,7.11,0,0,1-1.43-.76,4.55,4.55,0,0,1-.66-.5c-.16-.12-.29-.28-.44-.41a6.64,6.64,0,0,1-.75-1l.6-.34a35.2,35.2,0,0,0,4.78-2.93c.57-.38,1.15-.78,1.69-1.13,1,.29,2,.59,3,.91Z"/>
-                <path class="cls-9" d="M57.74,123.24s.14.2,0,0Z"/>
-                <path class="cls-6"
-                      d="M56.38,12c0,.15.2.51,0,.23,0,0-.49-.51-1-1l-.27-.21-.63-.5L53.66,10,52.1,8.82A25,25,0,0,0,49.22,7a32,32,0,0,0-3.67-1.68,27.94,27.94,0,0,1,5.54-.88c.73,0,1.44-.07,2.12-.08a22.22,22.22,0,0,1,1.1,2.27C54.86,7.88,55.6,9.87,56,11c0,.07.11.27.21.55S56.32,11.87,56.38,12Z"/>
-                <path class="cls-7"
-                      d="M54.12,82.64c-.33.27-.68.53-1,.79a31.87,31.87,0,0,0-4.3,3.6l-.6.34a7.46,7.46,0,0,1-.4-.8,20.55,20.55,0,0,1-1-3.09c-.12-.53-.22-1-.31-1.33l.65-1.32h0c.49.15.89.25,1.32.35C50.41,81.66,52.29,82.14,54.12,82.64Z"/>
-                <path class="cls-8" d="M53.34,127.17a.61.61,0,0,1-.05.12,1.27,1.27,0,0,0-.06-.18Z"/>
-                <path class="cls-6"
-                      d="M52.65,98l.05.07-1,.8a32.19,32.19,0,0,1-4.39,3A12.17,12.17,0,0,1,43.68,103a15.69,15.69,0,0,1-2.18.21h-.19c-.07-.69-.13-1.39-.17-2.07a28.17,28.17,0,0,1,0-3.57c.28.12.58.25.91.37a13,13,0,0,0,3.8.75,22.78,22.78,0,0,0,2.59,0l1.45-.12c.38,0,.73-.07,1.13-.12l1-.25S52.44,98.1,52.65,98Z"/>
-                <path class="cls-8" d="M52.51,3l-.06.09s0,0,0,0Z"/>
-                <path class="cls-6"
-                      d="M51.9,171.67a9.18,9.18,0,0,1-.5,5.22,15.11,15.11,0,0,1-3,4.41,19.52,19.52,0,0,0-1.6,1.95c-1-.2-1.88-.41-2.8-.66a24,24,0,0,1-5.62-2.32c-.32-.16-.62-.34-.92-.52l1.2-.44a17.63,17.63,0,0,0,5.12-3,6.44,6.44,0,0,0,1.83-2.64A7.49,7.49,0,0,0,46,171a6.72,6.72,0,0,0-.41-2.48l.77.23,2.83.82c.5.15,1,.31,1.61.45A3.08,3.08,0,0,1,51.9,171.67Z"/>
-                <path class="cls-7"
-                      d="M51.29,126.11c-.06.14-.13.33-.22.53a22.89,22.89,0,0,1-1.48,2.83,43.87,43.87,0,0,1-2.69,3.81c-1.06,1.38-2.19,2.79-3.45,4.15-1.58,1.7-3.22,3.46-4.54,5.15a9.23,9.23,0,0,1-1.42.16,13.78,13.78,0,0,1-4.09-.47,5.5,5.5,0,0,1-1.93-.88A4.6,4.6,0,0,1,30.26,140a4.8,4.8,0,0,1-.61-1.71c1.05-1.3,2.08-2.5,3.07-3.62a5.52,5.52,0,0,0,1.55,1.43,4.46,4.46,0,0,0,2.13.61c.63,0,1.05-.3,1-.46s-.36-.18-.76-.42a6.1,6.1,0,0,1-1.31-1,4.42,4.42,0,0,1-.78-1.32c-.08-.24-.14-.43-.17-.55l.41-.44c.52-.55,1-1.06,1.51-1.53a5.92,5.92,0,0,0,1.51,1.53c1.59,1.09,3.38,1.26,3.46,1s-1.42-1.08-2.36-2.23a4.72,4.72,0,0,1-1-1.64c0-.06,0-.13,0-.19l1.28-1.2.74-.71a3.07,3.07,0,0,0,1.1,1.33,4.61,4.61,0,0,0,.7.41l.67.3a8.31,8.31,0,0,0,1.23.4c.74.18,1.31.12,1.32-.06s-.39-.36-1-.77c-.28-.2-.6-.44-.94-.71-.16-.13-.34-.28-.52-.41s-.34-.3-.44-.42a1.3,1.3,0,0,1-.23-1.46,2.41,2.41,0,0,1,.28-.54.56.56,0,0,1,.09-.13l0,0-.06,0,1.15-1.09,0,0s0,0,0,0,.09.2.09.21a2.79,2.79,0,0,0,.52.56,6.56,6.56,0,0,0,1,.61c.75.4,1.68.51,1.77.18s-.34-.83-.7-1.45c-.19-.29-.38-.59-.5-.81a.79.79,0,0,1-.05-.24,1.1,1.1,0,0,1-.44-.79c0-.06,0-.13,0-.2a6.65,6.65,0,0,0,.55-1c.1.12.22.25.34.37a30.73,30.73,0,0,0,3.57,3C50,125.29,50.64,125.71,51.29,126.11Z"/>
-                <path class="cls-6"
-                      d="M50.8,90.23s.26,0,.1.06l-.52.09-1,.14-.91.08-1.08.06a8,8,0,0,1-3.19-.34,4.92,4.92,0,0,1-1.28-.71c.14-.38.29-.75.45-1.1.73-1.57,1.51-3.06,2.07-4.22l.15-.32s0,0,0,0c.4.77.84,1.79,1.53,3a7.7,7.7,0,0,0,1.44,1.84,4,4,0,0,0,.49.42c.12.1.25.19.38.28a5.74,5.74,0,0,0,.92.5l.16.07Z"/>
-                <path class="cls-7"
-                      d="M49.29,120.67a2.31,2.31,0,0,1-.36,1.61l-.07,0c-.41-.35-.81-.71-1.19-1.08a1.32,1.32,0,0,0,.48-.58C48.46,120.68,49,120.68,49.29,120.67Z"/>
-                <path class="cls-8" d="M45.63,168.51l-.1,0c0-.06,0-.09,0-.09S45.59,168.43,45.63,168.51Z"/>
-                <path class="cls-7"
-                      d="M45.53,168.48a14,14,0,0,1,.06,2.49,6.54,6.54,0,0,1-2.39,4.75,17.25,17.25,0,0,1-5,2.58c-.73.26-1.35.44-1.8.58l-.28.08h0a4.53,4.53,0,0,1-.4-.26l-.62-.42c-.32-.24-.74-.54-1.11-.85-.75-.58-1.59-1.38-2.38-2.07,0,.93,0,1.85.05,2.77-.48-1-1-2-1.42-3l-.7-1.49-1,1.31L27.5,176.3l-.14.18s-.07.1-.07,0l0-.11-.1-.53c-.25-1.13-.49-2.24-.74-3.35-.11-.55-.24-1.09-.36-1.65l-.18-.82a5.58,5.58,0,0,0-.28-1c-.14-.29-.48-1.41-.85-2.66a13.58,13.58,0,0,0,1.38.19,11.36,11.36,0,0,0,2.79,0,10.63,10.63,0,0,0,3-1,5.58,5.58,0,0,0,2.21-1.54,6.65,6.65,0,0,0,1-1.64c.15-.43.29-.82.41-1.18.24-.69.44-1.27.56-1.7.3.58.52.93.53,1s.38.58.94,1.36a28.68,28.68,0,0,0,2.16,2.74,13.52,13.52,0,0,0,2.61,2.33,4.11,4.11,0,0,0,1.4.66l.34.41h0a2,2,0,0,0,.57.22C44.9,168.29,45.19,168.37,45.53,168.48Z"/>
-                <path class="cls-9" d="M44.25,116a.13.13,0,0,0,0,.08.09.09,0,0,1-.06,0S44.23,116,44.25,116Z"/>
-                <path class="cls-9" d="M41.17,3.88l0,0v0Z"/>
-                <path class="cls-8" d="M41,106.05l0,0h0Z"/>
-                <path class="cls-8" d="M41,106.08v.08a.09.09,0,0,0,0,0h0Z"/>
-                <path class="cls-8" d="M40.92,106.1h0a1.22,1.22,0,0,0-.2.1Z"/>
-                <path class="cls-7"
-                      d="M40.64,89.47a28.07,28.07,0,0,0-1,3.44h0L38,94.08l-.47.32c-.33.23-.75.44-.86.8a1.67,1.67,0,0,0,.11,1.21c.11.24.15.3.22.45l.2.34a13.22,13.22,0,0,0,.94,1.36l.52.69.27.34.12.15,0,0,0,.27c0,.41,0,.83,0,1.25.08,1.12.19,2.25.35,3.4h0a.83.83,0,0,0-.2-.41,2.52,2.52,0,0,0-.44-.42h0s.05-.07.06-.1a.58.58,0,0,0,0-.16c0-.11,0-.21.05-.32s0-.46,0-.72a7.79,7.79,0,0,0-.19-1.81,5.48,5.48,0,0,0-.93-2c-.91-1.22-2.1-2-2.55-2.72a4.88,4.88,0,0,1-.48-.93c-.09-.25-.1-.36-.11-.37s0-.09,0-.11.06-.07.11-.13l.2-.2.45-.44,1.07-1c.79-.7,1.67-1.44,2.51-2.11C39.6,90.27,40.17,89.83,40.64,89.47Z"/>
-                <path class="cls-8" d="M39.79,106.65l.25-.08-.25.14v0h0Z"/>
-                <path class="cls-8"
-                      d="M39.79,106.71s0,.05,0,.07a.22.22,0,0,1,0,.12c0-.18-.06-.37-.08-.55a2,2,0,0,0,.07.3h0Z"/>
-                <path class="cls-7"
-                      d="M39.7,106.35c0,.18,0,.37.08.55a.07.07,0,0,1,0,0c0,.22-.68.43-1.26.44a13.64,13.64,0,0,1-1.92,0A7.58,7.58,0,0,1,34.8,107a1.84,1.84,0,0,1-1.14-.85.87.87,0,0,1,0-.62,7,7,0,0,1,.24-.79,12.76,12.76,0,0,1,.56-1.46,2.55,2.55,0,0,1,.37-.52c.14-.14.38-.34.47-.44s.21-.23.32-.34.26-.22.39-.13.14.48.26.69.2.48.12.6-.12.14-.18.21l-.08,0a1.84,1.84,0,0,0-1,.66.77.77,0,0,0,0,.61,1,1,0,0,0,.21.36,1.89,1.89,0,0,0,.24.25s.19,0,.27-.16.14-.27.09-.3a1.11,1.11,0,0,1-.16-.15c-.1-.12-.19-.25-.13-.37s.36-.31.68-.47a2.87,2.87,0,0,1,1-.31,1.47,1.47,0,0,1,.94.34,7.16,7.16,0,0,1,.78.59c.43.38.15.83.22.83s.08-.07.14-.25a.66.66,0,0,0,0-.32h0c.07.55.15,1.1.26,1.65A0,0,0,0,0,39.7,106.35Z"/>
-                <path class="cls-8"
-                      d="M39.57,105.3l.13,1c-.11-.55-.19-1.1-.26-1.65-.16-1.15-.27-2.28-.35-3.4,0-.42,0-.84,0-1.25.1,1,.21,2.14.32,3.28C39.44,104,39.51,104.63,39.57,105.3Z"/>
-                <path class="cls-8" d="M38.64,103.61l0,.06-.13-.1h0v-.08l.09.08.07,0Z"/>
-                <path class="cls-8" d="M38.61,103.67h0a0,0,0,0,0,0,0l-.07,0c-.09-.06,0,0-.05,0v-.05h0Z"/>
-                <path class="cls-6"
-                      d="M37.51,143.06a7.6,7.6,0,0,0,1.23-.26A18.5,18.5,0,0,0,37,145.49a12.25,12.25,0,0,0-.63,1.34c-.35.08-.92.23-1.61.36a11.13,11.13,0,0,1-4.55.05,6.12,6.12,0,0,1-4.3-3.57c.25-.46.52-.91.8-1.34.74-1.12,1.53-2.18,2.32-3.19a5.38,5.38,0,0,0,.59,1.29A5.2,5.2,0,0,0,31.07,142a6,6,0,0,0,2.19.89A12.34,12.34,0,0,0,37.51,143.06Z"/>
-                <path class="cls-6"
-                      d="M35.85,159l.17.34c-.19.42-.45,1-.76,1.77-.16.37-.31.76-.49,1.17a4.57,4.57,0,0,1-.69,1.13,6.06,6.06,0,0,1-2.41,1.65,10,10,0,0,1-2.85.82,11.19,11.19,0,0,1-2.61-.06c-.7-.09-1.3-.21-1.73-.31-.44-1.46-.88-2.87-1-3.21l-.24-.61h0a21.58,21.58,0,0,1-.73-5.15c0-.48,0-1,0-1.47a4.64,4.64,0,0,0,.73.62,7.39,7.39,0,0,0,5,1.31,27.19,27.19,0,0,0,5-.9,7.43,7.43,0,0,0,1.76-.71.86.86,0,0,0,0,.16A11.34,11.34,0,0,0,35.85,159Z"/>
-                <path class="cls-7"
-                      d="M35.58,150v.53a9.11,9.11,0,0,0-.65,4.7l-.27.1a13.27,13.27,0,0,1-1.56.43,34.12,34.12,0,0,1-4.9.62,6.83,6.83,0,0,1-4.49-1.34,5.76,5.76,0,0,1-1.14-1.16,10.55,10.55,0,0,1,.27-1.72,50.14,50.14,0,0,1,1.56-5.44c.33-.76.66-1.48,1-2.19a6.52,6.52,0,0,0,4.66,3.28,10.78,10.78,0,0,0,4.74-.31,12.36,12.36,0,0,0,1.45-.5A6.46,6.46,0,0,0,35.58,150Z"/>
-                <rect class="cls-9" x="35.52" y="129.61" width="0.01" height="0.01"/>
-                <path class="cls-9" d="M33.89,11.7h0a12.79,12.79,0,0,0-1,1A10.09,10.09,0,0,1,33.89,11.7Z"/>
-                <path class="cls-9" d="M25.44,142.73h0c-.07.17-.15.33-.22.5l.21-.51Z"/>
-                <path class="cls-9" d="M25.19,143.28l-.17.46v0Z"/>
-                <circle class="cls-7" cx="85.17" cy="46.47" r="1.44"/>
-                <circle class="cls-7" cx="63.02" cy="48.47" r="1.62"/>
-                <circle class="cls-7" cx="64.01" cy="51.01" r="0.33"/>
-                <circle class="cls-7" cx="83.75" cy="48.93" r="0.34"/>
-                <path class="cls-5"
-                      d="M78.34,147.86c-.1.16-.22.33-.32.47a1.33,1.33,0,0,0-.45-.61,2.56,2.56,0,0,0-.86-.28c-.26-.06-.44-.12-.44-.17s.18-.05.46-.05a2.15,2.15,0,0,1,1.06.15A1.64,1.64,0,0,1,78.34,147.86Z"/>
-                <g class="cls-13">
-                    <path class="cls-14"
-                          d="M62.66,139.66c-1.08-.07-2.18-.13-3.29-.18-.31,7.81-8.71,9.24-10.65,16C58,159.85,63.1,148.61,62.66,139.66Z"/>
-                </g>
-                <path class="cls-15"
-                      d="M67.24,140.07l-.36,0c.05.26.1.51.16.76C67.11,140.55,67.17,140.31,67.24,140.07Z"/>
-                <g class="cls-13">
-                    <path class="cls-14"
-                          d="M67.47,150.43c2.67,1.6,5.47.72,9.5-.33-5-2.51-8.69-4.36-9.93-9.31C66,144.48,65.73,147.82,67.47,150.43Z"/>
-                </g>
-                <path class="cls-16"
-                      d="M77.42,165.87a62.51,62.51,0,0,1-11.29,3.9,5.48,5.48,0,0,1,1.17.79,9.4,9.4,0,0,1,1.13,1.2,65.59,65.59,0,0,0,21.62-12.12C85.64,161.91,81.45,164.1,77.42,165.87Z"/>
-                <path class="cls-6"
-                      d="M97.77,169.85c3.12-2.08,6.24-3.12,10.39-4.16-2.08,0-4.15-1-3.12-3.12a32,32,0,0,1,7.6-5.3l-.48-.73a8.24,8.24,0,0,0-.75-.91,7.36,7.36,0,0,0-1.77-1.43,7.48,7.48,0,0,0-4.39-.87,15.78,15.78,0,0,0-4.47,1.12c-1.44.55-2.82,1.28-4.21,1.92s-2.74,1.35-4.08,2l-2.44,1.25a65.59,65.59,0,0,1-21.62,12.12,6.07,6.07,0,0,1,.76,1.21,7,7,0,0,1,.45,3.54,11.83,11.83,0,0,1-.25,1.79,11.42,11.42,0,0,1-.57,1.65c-.44,1-.91,2-1.31,2.75s-.66,1.24-.88,1.69c.86-.1,1.72-.22,2.57-.34,1.55-.23,3.09-.52,4.61-.84,8.72-3.91,17.27-8.51,26-11.28C97.77,171.93,96.73,170.89,97.77,169.85Z"/>
-                <path class="cls-17"
-                      d="M112.67,157.25a31.93,31.93,0,0,0-7.59,5.3c-1,2.08,1,3.12,3.12,3.12-4.16,1-7.28,2.08-10.4,4.16-1,1,0,2.08,2.08,2.08-8.76,2.77-17.32,7.37-26,11.28.58-.12,1.17-.23,1.74-.37a31,31,0,0,0,6-2l0,0h0l5.64-2.22c1.94-.37,3.6-.64,5.35-1,.84-.23,1.71-.42,2.53-.72l1.23-.41,1.22-.5a27.66,27.66,0,0,0,8.61-5.65,21.67,21.67,0,0,0,5.46-8.36,17.84,17.84,0,0,0,.69-2.37,9.4,9.4,0,0,0,.21-1.2l.1-.61a2.56,2.56,0,0,0,0-.37Z"/>
-                <path class="cls-17"
-                      d="M72.69,183.57l1.1-.5c2.49-1.11,5-2.3,7.42-3.45a157.55,157.55,0,0,1,18-7.62,2.17,2.17,0,0,1-1.85-1,1.14,1.14,0,0,1,.38-1.25,29.91,29.91,0,0,1,9.66-4,3.34,3.34,0,0,1-2.45-1.27,2,2,0,0,1,0-2l0,0a32.58,32.58,0,0,1,7.62-5.33l.11,0,.16.27a.55.55,0,0,1,0,.19c0,.05,0,.11,0,.21l-.1.61-.06.42a5.37,5.37,0,0,1-.15.8c-.06.22-.12.44-.17.66a12.68,12.68,0,0,1-.53,1.72,21.88,21.88,0,0,1-5.49,8.41A28.14,28.14,0,0,1,97.69,176l-1.22.5-1.24.42a17.46,17.46,0,0,1-1.84.53l-.69.19c-1.23.27-2.42.48-3.67.71-.55.09-1.11.2-1.7.31l-1.47.58-4.14,1.63h0a32.07,32.07,0,0,1-6.08,2c-.41.1-.82.18-1.24.27Zm32.5-20.94a1.69,1.69,0,0,0,0,1.71,3.63,3.63,0,0,0,3.06,1.2h1l-1,.26a31,31,0,0,0-10.36,4.14.9.9,0,0,0-.3.95c.23.54,1.13.89,2.31.89h.84l-.8.25a151.16,151.16,0,0,0-18.59,7.82c-2.08,1-4.23,2-6.36,3l.58-.13a31.92,31.92,0,0,0,6-2l0,0h0L85.76,179l1.5-.59,1.72-.32c1.25-.23,2.44-.44,3.65-.71l.7-.18a17,17,0,0,0,1.81-.53l1.24-.42,1.21-.49a27.81,27.81,0,0,0,8.57-5.62,21.61,21.61,0,0,0,5.43-8.31,11.68,11.68,0,0,0,.51-1.69l.18-.67a5.7,5.7,0,0,0,.14-.76l.06-.44.1-.6a2.06,2.06,0,0,1,0-.21s0-.05,0-.07A31.76,31.76,0,0,0,105.19,162.63Z"/>
-                <path class="cls-18"
-                      d="M23.65,21.13s.27-.34.67-.76A15.28,15.28,0,0,1,25.78,19c-.14,0-.21,0-.23,0a2,2,0,0,0-.18-.28,2.13,2.13,0,0,0-.71-.58,6,6,0,0,0-3.4-.49c-.28,0-.56,0-.84,0a13.44,13.44,0,0,1,2.1,5.43c.19-.44.4-.85.58-1.18C23.41,21.48,23.63,21.14,23.65,21.13Z"/>
-                <path class="cls-7"
-                      d="M77.55,83.35a4.5,4.5,0,0,1-.94.83,3.29,3.29,0,0,0,.36.07l.27,0a9.63,9.63,0,0,1,.38-1Z"/>
-                <path class="cls-7" d="M98.38,57.17l-.1.28.39.09Z"/>
-                <path class="cls-19"
-                      d="M79.46,84.19a6,6,0,0,0,2.27-1c.51-.39.82-.75.93-.75l0-.11a5.18,5.18,0,0,1-1.87.13c-.76-.08-1.24-.27-1.24-.35s.52,0,1.25-.1a4.81,4.81,0,0,0,2.4-.77,13.31,13.31,0,0,0,1.94-1.82,11.77,11.77,0,0,0,.76-1s.14-.19.32-.48c-.88.12-1.64.28-1.68.15s1-.7,2.1-1h0a4.8,4.8,0,0,0,.26-.81c-.39.11-.63.17-.65.12s.24-.26.72-.51a3.44,3.44,0,0,0,0-.91c0-.22,0-.44-.07-.66a6.61,6.61,0,0,1-2.09.42,6.94,6.94,0,0,1,2-1c-.09-.51-.19-1-.28-1.36a2.9,2.9,0,0,0-.31-.76c-.12-.14-.25-.17-.24-.23s.14-.09.38,0a1.82,1.82,0,0,1,.59.79s0,0,0,0l.08,0a19.36,19.36,0,0,1,2.47-1.56,13.7,13.7,0,0,0,2.35-1.71A15.38,15.38,0,0,0,94,66.25c1.27-1.94,2.25-4,3.17-5.66a9.47,9.47,0,0,1,1.48-1.91c.22-.21.41-.36.55-.48h0a0,0,0,0,0,0,0s0-.07-.15-.19l-.38-.46-.39-.09-.07.15c-.69,1.47-4.5,4.7-4.5,4.7-1.32,1.16-2.91,2.49-4.65,3.86-.87.68-1.77,1.39-2.73,2.08-.24.16-.48.34-.75.51a3.48,3.48,0,0,1-.52.27,2.75,2.75,0,0,1-.58.12,1.07,1.07,0,0,1-1.21-.56l-.26-.5-.21-.4a28.23,28.23,0,0,1-2.38-13.06c.1-3.63.37-6.1.38-6.25s.24-2.62,1-6.21c.19-.87.41-1.81.72-2.8-5,11.22-4.44,23.93-1.17,35.25a6.25,6.25,0,0,1,.85.08,2.62,2.62,0,0,1,1,.4,3.08,3.08,0,0,1,.73.71,2.18,2.18,0,0,1,.43,1,1.23,1.23,0,0,1-.4,1.09c-.57.4-.78.47-1,1.33a1.16,1.16,0,0,1-.42.54.92.92,0,0,1-.28.14.28.28,0,0,1-.22,0v0a.17.17,0,0,1,.11,0,.07.07,0,0,1,0,.08v0s0,.06-.07,0c-.11.08-.38.42-.74.79a1.31,1.31,0,0,1-1,.33,1,1,0,0,1-.43-.14h0a6,6,0,0,1-1.22.48c-.12,0,.11,0,0,0-.08.19-.32.24-.4.42.18-.21.11-.12.17-.07a1.62,1.62,0,0,1-.18.43,3.42,3.42,0,0,1-.59.83c-.15.34-.81.72-1.08,1A8.58,8.58,0,0,0,79.46,84.19Zm5.34-8.11s.16,0,.26.14c0,0,.1-.12.37-.24.07,0,.15-.1.21,0a.34.34,0,0,1,.09.2,1.29,1.29,0,0,1-.09.67c-.1.25-.26.4-.48.37a.61.61,0,0,1-.4-.41A.69.69,0,0,1,84.8,76.08Zm-.51-1.81a.82.82,0,0,1-.71.16.35.35,0,0,1-.24-.42,1,1,0,0,1,.23-.43l.12-.14s.13,0,.25.16.14-.11.44-.21a.2.2,0,0,1,.22,0,.33.33,0,0,1,.06.22A1,1,0,0,1,84.29,74.27Z"/>
-                <path class="cls-7"
-                      d="M84,4.26l-.67.35A13.48,13.48,0,0,0,82,5.46,6.39,6.39,0,0,0,80.7,6.84,14.63,14.63,0,0,0,79.51,9a27.31,27.31,0,0,0-1.34,3.58l-.27.87s-.05.07-.06,0l0-.23-.06-.45c0-.29-.07-.58-.11-.87-.09-.58-.16-1.14-.23-1.67a10.17,10.17,0,0,0-.37-1.58,9.74,9.74,0,0,0-.42-1,12.38,12.38,0,0,0-1.84-2.74c-.18-.2-.35-.36-.5-.51L74,4.47c-1.72,2.15-5.06,2.82-6.25,4.89,0,1.18,0,2.53,0,4.07v0l-.52,0s0,0,0,0-.08-.43-.14-.76a15.34,15.34,0,0,0-3.87-7.64,3.71,3.71,0,0,0-.3-.28l-1-.06L60.2,4.6l-.24,0c-1.85,1.27-2.71,3.3-3.41,5.82.15.51.31,1,.48,1.6a1.67,1.67,0,0,0,0,.53,4.19,4.19,0,0,0,0,.47c0,.13.12.48-.06.2a4.16,4.16,0,0,0-1.31-.93l-.46-.4c-.35-.31-.69-.58-1-.83l-.81-.6c-.52-.38-1-.74-1.53-1.07A19,19,0,0,0,49,7.76a20.89,20.89,0,0,0-4.57-1.49c-.35-.07-.68-.12-1-.16l-.89.38c-.93.42-1.81.86-2.66,1.32a35.93,35.93,0,0,0-4.43,2.82l-.42.32a1.15,1.15,0,0,0-.37.15,5.22,5.22,0,0,0-.82.6h0a12.79,12.79,0,0,0-1,1c-.11.11-.21.21-.31.33l-.5.52c-.13.13-.25.27-.39.4L30,13.47c-1.45-.36-3.5-.87-5.91-1.29a23.44,23.44,0,0,0-3.69-.42c-1.32,0-2.83.17-4.35.34s-3.12.43-4.7.72l-1.17.24-1,.22-.11,0c2.62,5.86,4,12.19,10.74,14.1a13.2,13.2,0,0,0-1.9,6C19.2,35,20,36,19.81,36.18s-.85-.41-2-1.41a.49.49,0,0,0,0,.12,13.56,13.56,0,0,1-.06,2.62v0c-.58,5.4-3.32,11,4.16,11.74-1,2.08-4.16,3.12-4.16,5.2,1,2.08,4.16,2.08,7.28,2.08-2.08,2.08-4.16,4.15-6.24,5.19,3.56,1.53,6.12,4.54,8.78,7.35.33.21.67.44,1.06.67.91.56,2,1.15,3.11,1.77,2.31,1.25,5.05,2.62,8,4L42.75,77h0c1.56-.55,3.1-1,4.34-1.32,1.41-.37,2.41-.51,2.46-.53s1-.16,2.51-.25a34.31,34.31,0,0,1,5.28.12,31.69,31.69,0,0,1,4,.66l.68-2.53c-.58-.14-1.18-.33-1.81-.53-2.9-.93-6.17-2.29-9.65-3.8-.87-.39-1.74-.76-2.65-1.19L46.6,67l-1.31-.76a46.78,46.78,0,0,1-5-3.57,86.39,86.39,0,0,1-8.73-8.28c-.32-.37-.65-.72-1-1.06l-.51-.59-.82-1c0-.09-.21-.17-.15-.25l.18-.26.35-.53.57-.82L31,48.77a48.36,48.36,0,0,1,3.18-4,44.75,44.75,0,0,1,5.55-5.36,25.64,25.64,0,0,1,2.65-1.87,21.16,21.16,0,0,1,2.31-1.16,29.57,29.57,0,0,1,5.92-1.72,50.15,50.15,0,0,1,8.62-.94A16.52,16.52,0,0,1,69,37.34l0,0,0,0a15.79,15.79,0,0,1,4.65,5.32,21.06,21.06,0,0,1,2.05,6.68,53.49,53.49,0,0,1,.51,6.52,25,25,0,0,1-.29,6,22.18,22.18,0,0,1-3.48,8.37c-1.25,1.83-2.23,2.71-2.31,2.61.1.12-.86.7-2.65.84l2.85,1.13h0a.66.66,0,0,1,.43.19,1.5,1.5,0,0,1,.45.65.36.36,0,0,1-.15.44.74.74,0,0,1-.41.07l-.57,0a3.9,3.9,0,0,1-.51-.06l-.81,1.4c.12,0,.2,0,.2,0s-2.67.84-5.33,1.71l-1.23.4,1.9,1.68.07.06a19.22,19.22,0,0,1,2.38-1.09c.79-.22,1.33-.17,1.34-.09s-.52.19-1.17.51-1.22.74-1.92,1.21c.79.69,1.56,1.35,2.16,1.78a5.48,5.48,0,0,0,1,.49l.46.14a7.35,7.35,0,0,0,1.64.34,12.54,12.54,0,0,0,3.63-.2A6.89,6.89,0,0,0,77.24,83a7,7,0,0,0,.87-.87l.23-.54a2.87,2.87,0,0,1-1.27,0,1.26,1.26,0,0,1-.55-.33,3.27,3.27,0,0,1-1.45.16,1.74,1.74,0,0,1-1.28-1,3.42,3.42,0,0,1-.33-1.4,3.62,3.62,0,0,1,.87-2.37,4.47,4.47,0,0,1,1.4-1.12,6.59,6.59,0,0,1,.65-.31,7,7,0,0,1,1.22-.36,5,5,0,0,1,.66-.09,1.55,1.55,0,0,1,.52.07,1,1,0,0,0,.22,0h.2l.3-.08.36-.11.2-.06a1.57,1.57,0,0,1,.28-.06,8.06,8.06,0,0,1,1,0c-3.27-11.32-3.84-24,1.17-35.25,0,0,0,0,0-.08a10.21,10.21,0,0,1,.79-1.93,13.64,13.64,0,0,0-3.22,7.74,13.64,13.64,0,0,1,3.22-7.74A9.85,9.85,0,0,1,84,36.19a11.46,11.46,0,0,1,2.62-2.53,9.43,9.43,0,0,1,2.21-1.14,15.59,15.59,0,0,0,4.74-5.11C99.42,17.24,92.53,10.11,84,4.26ZM26.44,19.56a17,17,0,0,0-1.3,1.51c-.34.43-.54.75-.56.76l-.57.74a10.93,10.93,0,0,0-1,1.68,6.88,6.88,0,0,0-.42,1,8.51,8.51,0,0,1-3.82,6.34v0a8.51,8.51,0,0,0,3.82-6.34A11.77,11.77,0,0,1,22,27c-.07,0-.17-.36-.16-.94a6.8,6.8,0,0,1,.36-2.09q.13-.4.3-.78a13.44,13.44,0,0,0-2.1-5.43c-2.73.08-5.14-.24-5.14-.51s1.88-.57,4.06-1a17,17,0,0,0-3.71-3.39,17,17,0,0,1,3.71,3.39L21,15.92a7.57,7.57,0,0,1,4.62.15,4.48,4.48,0,0,1,2.05,1.64l0,0c.45-.23.76-.34.79-.28S27.44,18.5,26.44,19.56ZM70.21,82A1.1,1.1,0,0,1,69,81.85a1,1,0,0,1-.13-1.1,4.07,4.07,0,0,1,.52-.8s.17,0,.28.11a1.1,1.1,0,0,1,.86.24,1.05,1.05,0,0,1,.44.86A1.1,1.1,0,0,1,70.21,82Z"/>
-                <path class="cls-7"
-                      d="M74,4.47c-.67.13-1.33.27-2,.39-.25,0-.49.08-.77.1s-.56,0-.8,0A12.45,12.45,0,0,1,69,5L68,5c-.1,1.06-.21,2.5-.27,4.37C68.9,7.29,72.24,6.62,74,4.47Z"/>
-                <path class="cls-7"
-                      d="M60,4.58c-.91-.08-2.13-.17-3.58-.21-.54,0-1.11,0-1.7,0,.21.59.42,1.26.65,2,.36,1.16.76,2.5,1.22,4C57.25,7.88,58.11,5.85,60,4.58Z"/>
-                <path class="cls-19"
-                      d="M18.75,61.72c2.08-1,4.16-3.11,6.24-5.19-3.12,0-6.24,0-7.28-2.08,0-2.08,3.12-3.12,4.16-5.2-8.77-.88-3.49-8.41-4.11-14.49L17,34.14A18,18,0,0,1,17,38a27.88,27.88,0,0,1-1.13,5.21,18.56,18.56,0,0,1-1.25,3,11.56,11.56,0,0,1-.91,1.48,7.11,7.11,0,0,1-.54.72l-.29.35-.26.28a.46.46,0,0,0,0,.66.42.42,0,0,0,.16.09l.23.08.79.31,2.45.92.68.26.33.13.18.07.08,0-.06,0-1.19.79-3.65,2.48-.74.49-.26.19-.35.26.57.13,1.84.47L20,58.11l-2.85,1.57-1.35.78-.5.3-.16.11h0S15,61,15,61l.22.13c1.68,1.06,3.2,2,4.49,2.8,2.57,1.6,4.2,2.66,4.33,2.75l2.22,1.53,1.23.86C24.87,66.26,22.31,63.25,18.75,61.72Z"/>
-                <path class="cls-19"
-                      d="M103.91,18.93c.16.37.29.72.39,1,.21.61.29,1.05.32,1.08a8.68,8.68,0,0,1,.09,1.14,12.5,12.5,0,0,1-.32,2.33,9.46,9.46,0,0,1-1,3.13,16.84,16.84,0,0,1,.18-3.25,15.34,15.34,0,0,0,.07-2.16c-.06-.53-.18-.91-.18-1a9.74,9.74,0,0,0-.2-1,19.92,19.92,0,0,0-.61-2.11c-.41-1.27-.91-2.49-1-2.93-.66-1-1.47-1.86-2.2-2.75a1.91,1.91,0,0,0-.13.23l-.89-1.28.19,0a6.63,6.63,0,0,1-.85-1.65,6.63,6.63,0,0,0,.85,1.65,5.16,5.16,0,0,0,.59-.13,19.76,19.76,0,0,0,2.34-.87,10.19,10.19,0,0,1,2.26-.68h0l.49-.21c.45-.2.87-.23.89-.13a5.15,5.15,0,0,1,.16,1.51,8.53,8.53,0,0,1-.57,2.95,22.61,22.61,0,0,1-1.67,3.44l.28.55c.18.37.35.75.49,1.11,1.77-.7,1.48-3.46,2.73-4.68,0-.84,0-1.36,0-1.41s0-.87-.08-2.06S106.19,8,105,7.37a5.14,5.14,0,0,0-2.42-.4,28.67,28.67,0,0,0-2.89.25c-1,.13-1.94.2-2.82.28l-.32,0H96l-.8,0,.68,1.17c.27.43.4.7.34.76s-.3-.14-.67-.48-.85-.85-1.5-1.55c-.54-.15-1.29-.41-2.18-.74-1.15-.43-2.52-1-4-1.53a27.59,27.59,0,0,0-3.84-1l-.07,0c8.58,5.85,15.47,13,9.66,23.15a15.59,15.59,0,0,1-4.74,5.11,5.67,5.67,0,0,1,1.35-.31,12.07,12.07,0,0,1,7,1.66A12.3,12.3,0,0,1,99.65,36a8.75,8.75,0,0,1,1.75,2.38,13.23,13.23,0,0,1,.74,2.39c0,.73.06,1.34.07,1.86,0,.2,0,.38,0,.53a19.72,19.72,0,0,0,.37-2.11c.09-.66.12-1.12.13-1.15s.07-.48.14-1.16.13-1.56.18-2.44c.06-1.36,0-2.73.06-3.29-.08.08-.12.1-.15.09s.33-1.28,1-3.12a54,54,0,0,0,1.87-6.82,44.21,44.21,0,0,0,.84-7c0-.74,0-1.39,0-1.92C105.39,15.47,105.68,18.23,103.91,18.93Z"/>
-                <path class="cls-18"
-                      d="M101.65,15.05c.12-.05.67.71,1.24,1.75.1-.75.43-2.05.74-3.31a8.14,8.14,0,0,0,.14-2.54,3.53,3.53,0,0,0,0-.38,3,3,0,0,0-2,.18,5.32,5.32,0,0,0-2,1.32,3.36,3.36,0,0,0-.29.4c.73.89,1.54,1.77,2.2,2.75C101.64,15.13,101.63,15.06,101.65,15.05Z"/>
-                <path class="cls-9" d="M104,10.78l0,.05-.11.07h0v0Z"/>
-                <path class="cls-7"
-                      d="M104.82,48.69c-.49.52-1.09,1.17-1.74,1.89l-1.37,1.51-.71.81c-.39.45-.78.91-1.17,1.35l-.5-.14c.51-1.75,1-3.78,1.44-5.22A39.45,39.45,0,0,0,104.82,48.69Z"/>
-                <path class="cls-9" d="M103.19,33a.38.38,0,0,1-.09.09,1,1,0,0,1,0-.25S103.17,32.85,103.19,33Z"/>
-                <path class="cls-7"
-                      d="M102.23,55.88l-.26,0h-.09l-.51.14-2,.55-.92.26c.23-.67.53-1.67.84-2.77l.5.14,2.14,1.4Z"/>
-                <path class="cls-8" d="M84,39.73a.85.85,0,0,0,0,.17h0c.16-.53.34-1,.53-1.57A8.67,8.67,0,0,0,84,39.73Z"/>
-                <path class="cls-20"
-                      d="M93.29,33.56a12.92,12.92,0,0,0-3-.11,6.3,6.3,0,0,0-2.86,1.31,9.63,9.63,0,0,0-2.22,2.29,7.89,7.89,0,0,0-.74,1.27c-.19.52-.37,1-.53,1.57a6.11,6.11,0,0,1,3.6-1.11C89,36.54,91,34.41,93.29,33.56Z"/>
-                <path class="cls-8"
-                      d="M102.05,43.94c0-.27-.12-.7-.19-1.25s-.15-1.11-.24-1.82a15.8,15.8,0,0,0-.83-2.15,8.19,8.19,0,0,0-1.74-2.09,11.87,11.87,0,0,0-2.37-1.92,10.07,10.07,0,0,0-3.39-1.15c-2.33.85-4.29,3-5.73,5.22.42,0,.86,0,1.33,0a8,8,0,0,1,2.92.75,7.71,7.71,0,0,1,2.61,2.15,23.57,23.57,0,0,1,2,3,8.2,8.2,0,0,1,1.14,3.58A13.25,13.25,0,0,1,97.3,52l2.4.19c.39-1,.77-2.27,1.06-3.28,0,0,0,0,0,0a.61.61,0,0,0,0-.11s0,0,0,0,.06-.24.09-.34.07-.21.09-.31.09-.37.13-.51,0-.13,0-.18,0-.16.06-.23l0-.18h0v0A29.75,29.75,0,0,1,102.05,43.94Z"/>
-                <path class="cls-20"
-                      d="M84.22,57.84a7.56,7.56,0,0,1-2-.08.91.91,0,0,1-.3-.13,26.75,26.75,0,0,0,.23,3,24.19,24.19,0,0,0,1.74,6.51l.17.39.14.28a.17.17,0,0,0,.22.13,1.52,1.52,0,0,0,.27-.06l.25-.13c.24-.14.47-.3.71-.45,1-.63,1.88-1.3,2.77-1.94l.92-.68a25.69,25.69,0,0,1-4.32-7Z"/>
-                <path class="cls-8"
-                      d="M97.3,52c0,.15-.1.32-.16.49a1.39,1.39,0,0,1-.16.28,1.08,1.08,0,0,1-.16.2,5.46,5.46,0,0,1-.68.68,11.9,11.9,0,0,1-1.48,1.06,23.83,23.83,0,0,1-5.93,2.39,23.48,23.48,0,0,1-3.66.67,25.69,25.69,0,0,0,4.32,7c1.42-1,2.75-2,3.89-2.93,1.39-1.07,2.53-2,3.31-2.64,0,0,.38-.49,1-1.26s.82-2.67,1.75-4.81c.12-.27.24-.57.36-.89Z"/>
-                <path class="cls-10"
-                      d="M93.43,41.51A7.06,7.06,0,0,0,91.56,40a7.45,7.45,0,0,0-2.72-.79,5.28,5.28,0,0,0-.89,0c2.84.89,5.37,5.12,5.21,9a10.5,10.5,0,0,1-3,7.37A20.93,20.93,0,0,0,93.84,54C95.78,50.55,94.72,45.69,93.43,41.51Z"/>
-                <path class="cls-7"
-                      d="M96.73,48.28c-.08-2.33-1.53-4.38-2.83-6.2-.15-.2-.31-.39-.47-.57,1.29,4.18,2.35,9,.41,12.51l.33-.17a11,11,0,0,0,1.36-.94,3.94,3.94,0,0,0,.59-.56l.13-.13,0-.12a1.69,1.69,0,0,0,.12-.36A12,12,0,0,0,96.73,48.28Z"/>
-                <path class="cls-10" d="M83.81,40.42l.17-.08a.79.79,0,0,0-.19.17A.29.29,0,0,1,83.81,40.42Z"/>
-                <path class="cls-7"
-                      d="M83.94,56.71a5.44,5.44,0,0,1-1.45-.11.72.72,0,0,0-.52.1c0-.7,0-1.38.07-2,0-.2,0-.4,0-.58A4.1,4.1,0,0,0,83.94,56.71Z"/>
-                <path class="cls-7"
-                      d="M83.49,106.93a4,4,0,0,0-.68-1.13,1.22,1.22,0,0,0-.63-.42s-.05-.1-.05-.22h0a8,8,0,0,1,0,.85c0,.36,0,.76,0,1.19A3.28,3.28,0,0,0,83.49,106.93Z"/>
-                <path class="cls-19"
-                      d="M82,107.2c0,.19,0,.38,0,.59s-.08.7-.14,1.09a1.53,1.53,0,0,0,.6-.16,3.44,3.44,0,0,0,.74-.53c.26-.22.5-.46.47-.74a2.59,2.59,0,0,0-.16-.52A3.28,3.28,0,0,1,82,107.2Z"/>
-                <path class="cls-21"
-                      d="M77,78.79a.9.9,0,0,1,.23-.08,2.43,2.43,0,0,1,1,0,.68.68,0,0,1,.51.37.75.75,0,0,1-.14.68,3,3,0,0,1-.22.31l-.23.23a3.88,3.88,0,0,1-.49.4c-.19.13-.39.25-.59.36a.29.29,0,0,0,.12.07,2.88,2.88,0,0,0,1.35,0,6.21,6.21,0,0,0,1.4-.39c.17-.07.3-.16.31-.23a.49.49,0,0,0,0-.16s.11,0,.16.13a.31.31,0,0,1-.08.26,1.06,1.06,0,0,0,.77-.22c.23-.14.48-.37.69-.49s.16-.11.26-.09v0a0,0,0,0,1,0-.05,1.65,1.65,0,0,1,.11-.36.49.49,0,0,0,0-.2c0-.09-.09,0-.06-.4,0-.09,0-.06,0-.07H82l-.14,0a.86.86,0,0,0-.25.1c-.15,0-.23.06-.24,0s0-.08.16-.18a1,1,0,0,1,.68-.25c.17.16,0,.36,0,.54s.1,0,.14,0a.5.5,0,0,0,.15-.14c-.27-.46,0-1.92-.82-1.64a2.24,2.24,0,0,1-.93,0C79.55,77.15,77.37,76.71,77,78.79Z"/>
-                <path class="cls-12"
-                      d="M83.27,76.29a2.17,2.17,0,0,0-.57-.48,1.61,1.61,0,0,0-.67-.22,5.82,5.82,0,0,0-1.56,0l-.1,0-.2.07-.36.13-.42.13a2.24,2.24,0,0,1-.51,0,2.14,2.14,0,0,1-.44-.08s0,0-.12,0a4.8,4.8,0,0,0-.48.08,9.32,9.32,0,0,0-1,.35,4.54,4.54,0,0,0-1.67,1.05,2.67,2.67,0,0,0-.71,1.68,2.62,2.62,0,0,0,.18,1,.84.84,0,0,0,.63.56,3.1,3.1,0,0,0,2.12-.52,4.37,4.37,0,0,0,.44-.31l.2-.17s.08-.07.11-.11a.33.33,0,0,0,.12-.27c0-.1-.13-.14-.21-.17a2.25,2.25,0,0,0-.72-.06,1,1,0,0,0-.31.06c0,.09,0,.18,0,.29,0-.11,0-.2,0-.29a.48.48,0,0,0-.21.12,1.94,1.94,0,0,0-.22.34c-.06.09-.12.11-.13.1s0-.06,0-.14a1,1,0,0,1,.15-.45.75.75,0,0,1,.43-.29c.39-2.36,3-.68,4.36-1.49,1.24-.19.73,1,1.08,1.62h0a.53.53,0,0,0,.12-.37v-.06a.66.66,0,0,1,0-.15.7.7,0,0,1,.08-.16,1,1,0,0,1,.12-.2,2.19,2.19,0,0,1,.34-.34c.11-.11.26-.21.31-.26C83.73,77.14,83.6,76.69,83.27,76.29Z"/>
-                <path class="cls-19"
-                      d="M82.24,96a3.69,3.69,0,0,1,0,.69c-.08.56-.32,1.46-.44,2.29-.06.38-.1.74-.13,1.09-.28-1.53-.72-3.37-1.19-5.21l-.28-1.06.19.08A3.22,3.22,0,0,1,82,95a1.53,1.53,0,0,1,.2.78A1.46,1.46,0,0,1,82.24,96Z"/>
-                <path class="cls-19"
-                      d="M73.76,94.46H73.6a6.34,6.34,0,0,1-2-.55,5.33,5.33,0,0,1-1-.64,3.63,3.63,0,0,1-.93-1.06,3.33,3.33,0,0,1-.27-.61s-.06-.13,0-.15l.16,0,.29-.07a7.42,7.42,0,0,1,1.26-.24l1.08-.19c.32,0,.63-.1.9-.16a3.93,3.93,0,0,0,2.23-1.23,3.74,3.74,0,0,0,.32-.5,2.32,2.32,0,0,0,.33-.91s0-.06,0-.08h0s0,0,0,0h0a.51.51,0,0,0-.13-.34c-.11-.29-.19-.49-.23-.58a10.12,10.12,0,0,1-1.18.4,4.66,4.66,0,0,1-2.09.06,2.9,2.9,0,0,1-.83-.28,5,5,0,0,1-.79-.49c-.11-.09-.27-.16-.33-.26a0,0,0,0,0,0,0,15.74,15.74,0,0,1-3.48,0,28.94,28.94,0,0,1-6.09-1.68c-.2.12-.48.3-.8.53s-.89.63-1.39,1C62.85,90.87,68.22,94.55,73.76,94.46Z"/>
-                <path class="cls-7"
-                      d="M71.78,116.83c.38-.65.77-1.36,1.14-2.12a1.86,1.86,0,0,1-.59-.49,1.09,1.09,0,0,1-.31-.6c0-.21.18-.23.17-.21s.09,0,.23,0a2.43,2.43,0,0,0,.56-.25c.23-.12.5-.27.81-.4,1.41-3.56,2.2-7.76,1-11.35a8.51,8.51,0,0,1-1.91-.75c-.33-.17-.67-.36-1-.57l-.52-.33c-.24-.19-.51-.36-.75-.56A15.51,15.51,0,0,1,69.25,98l-.63-.58-.08-.07,0,0,0-.07L68.26,97c.83.22,1.67.5,2.3.63a14.82,14.82,0,0,0,1.68.3l.51,0a10.85,10.85,0,0,0-1-.94,10.85,10.85,0,0,1,1,.94c.46,0,.92.1,1.36.12a6.64,6.64,0,0,0,3.08-.43,4.63,4.63,0,0,0,1.72-1.2,1.77,1.77,0,0,0,.15-.18c-.1-.3-.22-.6-.33-.92-.19-.5-.39-1-.56-1.49h0l-1.51.33a12,12,0,0,1-2.89.22c-5.54.09-10.91-3.59-15.18-8.15-.28.22-.57.45-.85.69a27.49,27.49,0,0,1-3.21,2.63s0,0,0,0l-3,.45.31.12s.28.16.29.2.22.06.27.1.21.06,0,.09l-.84.17L49.92,91c-.51.08-1,.16-1.45.25l-1.1.15a12.55,12.55,0,0,1-3.54.14,8.35,8.35,0,0,1-1.45-.35,28.67,28.67,0,0,0-.74,2.94c-.09.5-.17,1-.24,1.52a6.13,6.13,0,0,0,1.21.94,9.35,9.35,0,0,0,3.28,1.15,14.44,14.44,0,0,0,2.5.18l1.46,0c.6,0,1.35-.09,2-.17a12.26,12.26,0,0,0,1.7-.11l0,0c-.43.44-1,1-1,1-.55.47-.84.85-1.39,1.29l-1.32,1.06c-.8.62-1.55,1.16-2.28,1.62a18.65,18.65,0,0,1-3.74,1.7c-1,.34-1.7.55-2.15.68a2,2,0,0,0-.23.08c.17,1.29.4,2.6.67,3.92a43.49,43.49,0,0,0,1.36,5l.1.07a2.09,2.09,0,0,0,.74.32,1.16,1.16,0,0,1,.32.2.88.88,0,0,1,.3.74.66.66,0,0,1-.49.55.58.58,0,0,1-.25,0c.15.38.31.75.49,1.11.11.21.21.43.32.64a12.13,12.13,0,0,0,2,2.87l.24.24c.32-.22.38-.39.38-.44l-.1-.34.36,0c.5,0,1.31,0,1.49,0a.31.31,0,0,1,.33.21,2.73,2.73,0,0,1-.47,2.3h0l1.08.84a20.65,20.65,0,0,0,4.52,2.61,2.14,2.14,0,0,0,.27.06C62.42,127.22,67.62,122,71.78,116.83Zm-7.64-3.61a1.41,1.41,0,0,1,.92-.82,5.12,5.12,0,0,1,1.2-.05c.31,0,.54,0,.56,0a1,1,0,0,1,.26.08.31.31,0,0,1,.12.41c-.08.12-.11.1-.16.15l-.1,0a.37.37,0,0,0-.14.07,2.75,2.75,0,0,1-1.1.51,3.91,3.91,0,0,1-1.66.11S64,113.53,64.14,113.22Zm-1.94,4.94a1.8,1.8,0,0,1,1.39-.55l.64.06a4.65,4.65,0,0,1,.93.24c.19.08.42.27.39.5a.73.73,0,0,1-.16.33,1.52,1.52,0,0,1-.17.18,4.72,4.72,0,0,1-.75.56,2.3,2.3,0,0,1-1.37.09c0-.06.61-.14,1.22-.39a7.65,7.65,0,0,0,.59-.57.83.83,0,0,0,.11-.15v0s0,0-.07,0a5.27,5.27,0,0,0-.81-.13l-.61-.11a1.37,1.37,0,0,0-1.06.31,3.9,3.9,0,0,0-.92,1.57A2.16,2.16,0,0,1,62.2,118.16ZM57.55,123a1.14,1.14,0,0,0,.32.05,2.28,2.28,0,0,0,.82-.14s.09,0,.1,0,.08,0,0-.09a1.77,1.77,0,0,0-.49-.21c-.16,0-.26,0-.28,0s.44-.33,1-.08c.15.07.34.19.38.35a.44.44,0,0,1-.12.43,1.37,1.37,0,0,1-.45.21,1.83,1.83,0,0,1-.33.05,1.87,1.87,0,0,1-.72-.07l-.18,0s0,0,0-.09,0-.08,0-.1,0,0,.09,0a.94.94,0,0,0-.1-.14C57.62,123,57.43,123,57.55,123ZM55,111.84a1,1,0,0,1-.31.26,5.59,5.59,0,0,0-.48.38,1.54,1.54,0,0,1-.75.34,1.56,1.56,0,0,1-.77-.19c-.19-.09-.38-.19-.56-.26s-.53-.28-.51-.32a1.61,1.61,0,0,1,.6.1c.17.06.38.11.59.17a1.22,1.22,0,0,0,.6.09c.33-.07.65-.51,1-.74.11-.08,0,0,0-.06h0l-.33-.08a5.81,5.81,0,0,0-1.27,0,8.14,8.14,0,0,1-1.33,0,1.55,1.55,0,0,0-.31,0c0,.07.06.11,0,.12s-.08,0-.17-.1,0-.14.05-.15a.31.31,0,0,1,.12,0l.26,0c.36,0,.83-.07,1.29-.16a5.16,5.16,0,0,1,1.38-.1,2,2,0,0,1,.54.11.7.7,0,0,1,.29.17.42.42,0,0,1,.13.27A.4.4,0,0,1,55,111.84Z"/>
-                <path class="cls-19"
-                      d="M80.89,101.35a9.54,9.54,0,0,1-4,.36,9.29,9.29,0,0,1-2.11-.33c1.24,3.59.45,7.79-1,11.35a5.09,5.09,0,0,1,1-.34,2.57,2.57,0,0,1,.55-.06l.59,0a2.91,2.91,0,0,1,1.31.1.32.32,0,0,1,0,.52,2.34,2.34,0,0,1-.36.17c-.16,0-.33.1-.53.17l-.32.1a1,1,0,0,0-.19.07,8.34,8.34,0,0,0-1.63,1,1.48,1.48,0,0,1-1.07.38.49.49,0,0,1-.21-.08c-.37.76-.76,1.47-1.14,2.12-4.16,5.2-9.36,10.39-16.64,9.35a2.14,2.14,0,0,1-.27-.06,14.32,14.32,0,0,0,3.24.95,26.16,26.16,0,0,0,4.26.21,29.92,29.92,0,0,0,4.18-.38c2.69-.48,5.25-1.42,6.74-3.39a47.32,47.32,0,0,0,4.27-5.83,27.07,27.07,0,0,0,4-10c.41-2.57.23-4.09.36-4.09C81.7,103.65,81.4,102.73,80.89,101.35ZM75.05,120.5a3.67,3.67,0,0,1-.26.48.47.47,0,0,1-.39.23c-.11,0-.15-.06-.15-.08s.23,0,.31-.3c0-.12.08-.28.12-.45a2.43,2.43,0,0,0,.07-.39s-.06,0-.06,0a.61.61,0,0,1-.12.05l-.34.12a7.69,7.69,0,0,0-.74.3,5.65,5.65,0,0,1-1.09.45c-.06-.07.38-.48.88-.81a6,6,0,0,1,1.1-.61,2,2,0,0,1,.35-.08c.26-.08.64.07.55.45A5.78,5.78,0,0,1,75.05,120.5Zm2.43-12.84a1.71,1.71,0,0,1-1,.52A.61.61,0,0,1,76,108a.46.46,0,0,1-.09-.4c0-.22.16-.3.19-.29s0,.14,0,.3.13.21.29.19a1.27,1.27,0,0,0,.43-.31l.19-.21c.06-.07,0,0,.11-.07s0,0-.09-.07l-.43-.18c-.27-.12-.44-.16-.47-.19s.25-.14.54-.1a2.67,2.67,0,0,1,.48.08,8.2,8.2,0,0,1,.8.22A5.93,5.93,0,0,1,77.48,107.66Z"/>
-                <path class="cls-20"
-                      d="M82.16,3.9c-.24.21-.49.45-.75.71a8.77,8.77,0,0,0-1.29,1.72A22.48,22.48,0,0,0,79,8.58c-.24.6-.51,1.33-.77,2.09l-.15.46s0,.13,0,.07v-.15l0-.28L78,10.21c0-.35-.06-.69-.1-1a5.5,5.5,0,0,0-.18-.88,10.71,10.71,0,0,0-.37-1.09A23.37,23.37,0,0,0,75.84,4.1c.54-.1,1.08-.2,1.63-.28a16.22,16.22,0,0,1,2.62-.2,4.86,4.86,0,0,1,.56,0l.72.11Z"/>
-                <path class="cls-6"
-                      d="M80.8,101.07c0,.09.06.19.09.27a7.14,7.14,0,0,0-1.11,0,18.54,18.54,0,0,1-2.88-.14A9.16,9.16,0,0,1,73.17,100c-.31-.19-.62-.37-.93-.58l-.42-.3L71.68,99a1.79,1.79,0,0,1-.24-.22l-.08-.09s.1,0,.14,0l.28.07a1.88,1.88,0,0,0,.34.08c.65.1,1.31.17,1.93.22a7.69,7.69,0,0,0,3.54-.4,5.66,5.66,0,0,0,1.92-1.2C80,98.83,80.43,100.06,80.8,101.07Z"/>
-                <path class="cls-19"
-                      d="M78.43,145.55a1.41,1.41,0,0,1,.71.29,2,2,0,0,0-.41-1c-.31.2-.61.48-.92.7A1.75,1.75,0,0,1,78.43,145.55Z"/>
-                <path class="cls-7"
-                      d="M77.28,144.16a12.61,12.61,0,0,0-1.53.68,15.27,15.27,0,0,1-2.91,1.1,9.79,9.79,0,0,1-2.39.05c-.64,0-1.14,0-1.5,0h-.2l-.58.11h0l-.12,0h0c.11.52.22,1,.32,1.55l.15.09a29.07,29.07,0,0,0,9.07,1,2,2,0,0,0,.28-.3,1.16,1.16,0,0,0,.16-.21,1.33,1.33,0,0,0-.45-.61,2.49,2.49,0,0,0-.86-.28c-.26-.06-.44-.12-.44-.17s0,0,.11,0a1.15,1.15,0,0,1-.45-.26,1.15,1.15,0,0,0,.45.26l.35,0c.16,0,.36,0,.58,0a6.08,6.08,0,0,1,1.51-.17l.14-.21.14-.27a1.28,1.28,0,0,0-.76-.63,3.78,3.78,0,0,0-.88,0,.79.79,0,0,0-.29,0c-.09,0-.13,0-.14,0h0s0-.05.09-.08a.46.46,0,0,1,.29-.17l.39-.09c.31-.22.61-.5.92-.7a1.25,1.25,0,0,0-.16-.24A1.31,1.31,0,0,0,77.28,144.16Z"/>
-                <path class="cls-19"
-                      d="M77.31,147.23a1.25,1.25,0,0,1,.48.14,1.64,1.64,0,0,1,.55.49.46.46,0,0,1,.09-.15c.14-.22.27-.43.39-.65A6.08,6.08,0,0,0,77.31,147.23Z"/>
-                <path class="cls-19"
-                      d="M68.51,147.84l2.5,1.38,4.32.05a4.19,4.19,0,0,0,1.9-.2,1.41,1.41,0,0,0,.35-.23A32.79,32.79,0,0,1,68.51,147.84Z"/>
-                <path class="cls-9" d="M78.17,148.65h-.09Z"/>
-                <path class="cls-6"
-                      d="M70.36,92.27a2.52,2.52,0,0,0,.64.66,4.56,4.56,0,0,0,.91.46,4.37,4.37,0,0,0,1.82.3A6.85,6.85,0,0,0,76.34,93a7,7,0,0,0,1.19-.72c-.3-.81-.58-1.57-.84-2.24-.15.13-.3.27-.48.4a5.72,5.72,0,0,1-2.95,1.06c-.58.07-1.22.12-1.92.18l-.85.08-.22,0c-.07,0-.19,0-.12.09A1.23,1.23,0,0,0,70.36,92.27Z"/>
-                <path class="cls-9" d="M76.4,84.11h0a.08.08,0,0,1,0,0v0Z"/>
-                <path class="cls-7"
-                      d="M76.39,85.46v.16c0,.17-.24.39-.24.39s-.35.23-.46.32a2.9,2.9,0,0,1-1.4.64,2.46,2.46,0,0,1-1.77-.16,1.37,1.37,0,0,1-.47-.37.51.51,0,0,1-.08-.26v0a11.78,11.78,0,0,0,1.24-.44,15.49,15.49,0,0,0,2.39-.89.62.62,0,0,0,.18.24l.1.05.09,0,.09,0A3.18,3.18,0,0,1,76.39,85.46Z"/>
-                <path class="cls-7"
-                      d="M75.81,112.79l.06,0a.07.07,0,0,1-.06,0h0l-.16.07A7.91,7.91,0,0,0,74,114.08c-.27.2-.56.42-.79.39a1.33,1.33,0,0,1-.68-.4,1.13,1.13,0,0,1-.35-.46c0-.13,0-.18,0-.2s.07.09.24.08a2.13,2.13,0,0,0,.64-.15,8.48,8.48,0,0,1,1.8-.54,4.18,4.18,0,0,1,.5,0Z"/>
-                <path class="cls-20"
-                      d="M75,56a59.06,59.06,0,0,0-.7-6.34,19.8,19.8,0,0,0-2.07-6.14A14.18,14.18,0,0,0,68,38.82l-.07,0a15.52,15.52,0,0,0-3.47-1.93c1.13.76,1.8,1.68,1.12,3a4.6,4.6,0,0,1-3,1,15,15,0,0,1,2.26.81,18.77,18.77,0,0,1,2.88,1.56,9.56,9.56,0,0,1,2.06,2.3,18,18,0,0,1,2,4.48,30.6,30.6,0,0,1,1.06,4.48c.17,1,0,3.18-.32,3.47,0,0-.28.42-1,1C70,65.4,62.84,69.58,56,69.89c1.59.7,3.11,1.34,4.52,1.87A27.81,27.81,0,0,0,64.42,73a13.17,13.17,0,0,0,3.09.27,10.36,10.36,0,0,0,2-.19c.44-.08.66-.2.68-.18a5.47,5.47,0,0,1,.51-.74c.33-.49.81-1.21,1.35-2.15A23.79,23.79,0,0,0,75,61.72,24.92,24.92,0,0,0,75,56Z"/>
-                <path class="cls-8"
-                      d="M71.53,58.93c-.15.1-.3.21-.49.32a13.11,13.11,0,0,1-5,1.81,22.53,22.53,0,0,1-7.88-.31,38.74,38.74,0,0,1-4.51-1,17.44,17.44,0,0,1-4.65-2h0l-1.53-1c-.26-.18-.51-.39-.76-.58l-.37-.28a7.16,7.16,0,0,1-.59-.47c0-.25,0-.51,0-.76s0-.35.09-.52c.06-.33.15-.65.23-1a17.85,17.85,0,0,1,.68-1.85A20.47,20.47,0,0,1,51.32,45a20.87,20.87,0,0,1,3-2.43,11.87,11.87,0,0,1,3.46-1.7,8.76,8.76,0,0,1,3.77-.19c.37.07.72.15,1.07.25a4.6,4.6,0,0,0,3-1c.68-1.37,0-2.29-1.12-3a13.49,13.49,0,0,0-5.2-1.05A49,49,0,0,0,51,36.84a29.41,29.41,0,0,0-3.58,1C39.09,42.33,37.05,55,43.7,60.68A63.37,63.37,0,0,0,56,69.88h0C62.84,69.58,70,65.4,71.53,58.93Z"/>
-                <path class="cls-20"
-                      d="M47.44,37.82c-.72.24-1.36.49-1.88.71-1.26.55-1.92,1-2,1s-1,.59-2.43,1.68a42.93,42.93,0,0,0-5.36,5A44.24,44.24,0,0,0,32.64,50l-.77,1.08-.19.26,0,0s-.07,0,0,.09l.06.08.41.48L33,53.05a87.27,87.27,0,0,0,8.34,8.31,46.53,46.53,0,0,0,4.73,3.57l1.23.77,1.26.68c.84.43,1.72.84,2.57,1.24,1.69.81,3.32,1.57,4.88,2.26a63.37,63.37,0,0,1-12.32-9.2C37.05,55,39.09,42.33,47.44,37.82Z"/>
-                <path class="cls-19"
-                      d="M72.2,127.6a2,2,0,0,0,.13-.28s.28-.49.67-1.16c.24-.45.54-1,.84-1.55a9,9,0,0,1-2.94,2.24,16.18,16.18,0,0,1-4.11,1.32c-.38.08-.78.15-1.17.2,0,.27,0,.64.07,1.08.08,1.1.2,2.65.34,4.56.08.94.17,2,.25,3.07,0,.48.11,1,.16,1.5.07.24.09.37.13.52l.1.44c.07.3.13.59.19.89,0,.11,0,.23.07.34C67.18,135.42,67.2,129.3,72.2,127.6Z"/>
-                <path class="cls-7"
-                      d="M66.93,140.77c.36,1.74.74,3.62,1.11,5.42l.12,0h0v0a.28.28,0,0,0,0-.09c0-.27,0-.67,0-1.23,0-1.07,0-2.71.13-5a48.36,48.36,0,0,1,.59-5,3.78,3.78,0,0,0,.06-.49c-.33.27-.56.41-.6.29s1-1.84,2.07-3.57a25.27,25.27,0,0,0,1.31-2.45l.44-.94C67.2,129.3,67.18,135.42,66.93,140.77Z"/>
-                <path class="cls-10"
-                      d="M72.52,56.62s0,1.33,0,1.36-.57.46-1.64,1a11.62,11.62,0,0,1-1.1.51c1.29-1.4,1.64-3.56,1.86-6.06A28.12,28.12,0,0,1,72.52,56.62Z"/>
-                <path class="cls-11"
-                      d="M71.67,53.47c-.22,2.5-.57,4.66-1.86,6.06a12.42,12.42,0,0,1-1.35.48l.24-.2a17.49,17.49,0,0,1-4.44.62H62.73c-2.18-1.46-3.59-4.68-3.38-8.36.25-4.64,2.86-8.24,6.05-8.43a10,10,0,0,1,1.38.83,7.81,7.81,0,0,1,1.52,1.73,1.48,1.48,0,0,1,.21.26l.43.81.15.26A39.39,39.39,0,0,1,71.67,53.47Z"/>
-                <path class="cls-7"
-                      d="M70.53,85.77h-.1A17.69,17.69,0,0,1,67,85.54,26.43,26.43,0,0,1,62,84l2.31-1.52a25,25,0,0,0,2.31,2.16,6.34,6.34,0,0,0,1.75.86,8,8,0,0,0,1.91.31Z"/>
-                <path class="cls-7"
-                      d="M67.54,73.7l2.85,1.13a.55.55,0,0,0-.4.2,1.56,1.56,0,0,0-.32.6s.13.1.27.13l-.29.27,0,0s0,0,0,0l-.81,1.4a26.93,26.93,0,0,0-4,.66l-.16-1.34h0a7.48,7.48,0,0,0-2.2-.85l-1.11-.28.68-2.53a17.14,17.14,0,0,0,2.24.49A12.77,12.77,0,0,0,67.54,73.7Z"/>
-                <path class="cls-7"
-                      d="M52.18,177.16a15.85,15.85,0,0,1-3,4.85c-.49.59-.89,1.07-1.14,1.42a.15.15,0,0,1,0,.06c2.78.5,5.65.87,8.51,1.31l1.6.25.34,0H59l.58-.08c1.07-.06,2.15-.14,3.22-.23l2.48-.25c.08-.13.16-.3.26-.49l1-1.87c.43-.77.92-1.66,1.37-2.62a13.88,13.88,0,0,0,.59-1.51,11.13,11.13,0,0,0,.3-1.64,6.39,6.39,0,0,0-.23-3.19,5.67,5.67,0,0,0-.73-1.3,51.23,51.23,0,0,1-15.16,2.3A12.72,12.72,0,0,1,52.18,177.16Z"/>
-                <path class="cls-19"
-                      d="M65.65,169.88c-.57.13-1.14.25-1.7.34a33.41,33.41,0,0,1-10.82.2l-1.8-.3a3.05,3.05,0,0,1,1,1.41,6.58,6.58,0,0,1,.37,2.7,51.23,51.23,0,0,0,15.16-2.3,11.66,11.66,0,0,0-.87-1A4.94,4.94,0,0,0,65.65,169.88Z"/>
-                <path class="cls-11"
-                      d="M68.7,59.81l-.24.2a5.25,5.25,0,0,1-.6.17h0a27.25,27.25,0,0,1-3.57.25A17.49,17.49,0,0,0,68.7,59.81Z"/>
-                <path class="cls-11" d="M68.46,60a.87.87,0,0,1-.11.09l-.49.08A5.25,5.25,0,0,0,68.46,60Z"/>
-                <path class="cls-9" d="M67.67,13.43v0l-.52,0s0,0,0,0Z"/>
-                <path class="cls-7"
-                      d="M66.92,112.71s0,0,0,.07a.4.4,0,0,0-.08.18h-.07s-.2,0-.5-.07a2.32,2.32,0,0,0,.25-.21,1.34,1.34,0,0,1,.23-.13c.06,0,0-.07.08,0A.37.37,0,0,0,66.92,112.71Z"/>
-                <path class="cls-11"
-                      d="M67.83,60.18a11.93,11.93,0,0,1-1.49.29h-.1a.52.52,0,0,0-.43.08h-.09l-.89.06c-.33,0-.65,0-1,0s-.56,0-.84,0l-.28-.18h1.53A27.25,27.25,0,0,0,67.83,60.18Z"/>
-                <path class="cls-20" d="M66.58,5c.17,1.29.35,3.21.47,5.91a23.52,23.52,0,0,0-2.57-6Z"/>
-                <path class="cls-11" d="M66.34,60.47l-.24,0h-.29a.52.52,0,0,1,.43-.08Z"/>
-                <path class="cls-7"
-                      d="M66.22,112.88a1.91,1.91,0,0,1-.63.35c-.63.22-1.31.38-1.5.47.12-.16.44-.83,1.06-.89A6.28,6.28,0,0,1,66.22,112.88Z"/>
-                <path class="cls-7"
-                      d="M64.64,76.82l.16,1.34c-.44.08-.88.18-1.31.29-.63.15-1.26.32-1.85.49-.85-.71-1.45-1.15-1.53-1a10.77,10.77,0,0,0,1,1.17l-1.42.45c-1,.34-1.72.63-1.77.65a16.81,16.81,0,0,0-1.68.9c-.23.14-.47.32-.73.49-2.14-.7-4.37-1.35-6.6-2-.41-.12-.86-.24-1.2-.36l-1.14-.49-2.35-1.06L44,77.55c1.24-.33,2.42-.62,3.38-.82,1.38-.31,2.34-.4,2.4-.42s1-.18,2.41-.34a36.5,36.5,0,0,1,5.14-.12,39,39,0,0,1,5.08.56C63.59,76.62,64.43,76.82,64.64,76.82Z"/>
-                <path class="cls-7"
-                      d="M56.15,43a21.38,21.38,0,0,0-8.34,8.75,13.43,13.43,0,0,0-.66,1.69c-.08.29-.16.57-.23.86l-.08.42,0,.17.49.39c.25.19.48.39.73.56l1.5,1.06.05,0a14.34,14.34,0,0,0,3.51,1.66C50.6,54,51.62,47.6,56.15,43Z"/>
-                <path class="cls-10"
-                      d="M59.35,52.08c.25-4.64,2.86-8.24,6.05-8.43-.39-.2-.78-.4-1.17-.58a8.77,8.77,0,0,0-6.12-.89,10.91,10.91,0,0,0-2,.8c-4.53,4.62-5.55,11-3,15.6.26.09.52.19.78.27A38.35,38.35,0,0,0,58.27,60a27.21,27.21,0,0,0,4.74.64l-.28-.18C60.55,59,59.14,55.76,59.35,52.08Z"/>
-                <path class="cls-9" d="M64.06,113.73s0,0,0,0Z"/>
-                <path class="cls-19"
-                      d="M52.1,154.21a1.1,1.1,0,0,0,.12.31,2.69,2.69,0,0,0,.26.44h0l0-.06.15-.13.33-.28,2.47-2.11c.72-.61,1.39-1.18,2-1.67l.7-2.23A18.18,18.18,0,0,1,52.1,154.21Z"/>
-                <path class="cls-19"
-                      d="M52.39,153.13c-.33.39-.33.64-.32.66a.82.82,0,0,0,0,.22,1,1,0,0,0,0,.2A18,18,0,0,0,56,151.15a10.22,10.22,0,0,1-3.32,1.61Z"/>
-                <path class="cls-19"
-                      d="M49.83,153a4,4,0,0,0-.29.54l-.11.23a1.71,1.71,0,0,0-.14.51.88.88,0,0,0,0,.28l.33,0,.8.13,1.63.22c-.07-.08-.15-.14-.21-.22a1.5,1.5,0,0,1-.37-1c-.09-.13.2-.51.54-.83A7.79,7.79,0,0,1,49.83,153Z"/>
-                <path class="cls-19"
-                      d="M48.34,153.18a2,2,0,0,0,0,.23v.14l.52.69a1.87,1.87,0,0,1,.14-.94,2.11,2.11,0,0,1,.18-.27l.07-.08a5.51,5.51,0,0,1-.89-.22C48.36,152.88,48.35,153,48.34,153.18Z"/>
-                <path class="cls-7"
-                      d="M61.38,133.46c0-1.63-1.92-3.26-3.25-4.9l-.25,0A16.43,16.43,0,0,1,54,127.45c.49.9,1.11,2.19,1.66,3.5s1,2.53,1.36,3.53a16.22,16.22,0,0,1,.51,1.79,44,44,0,0,1,.24,5.61c0,2.67-.18,5.29-.46,5.34h0a21,21,0,0,1-3.11,2.05s-3.43,1.39-3.58,1.11a1.68,1.68,0,0,0-1.23.32,1.91,1.91,0,0,0-.8,1.13,4.34,4.34,0,0,0-.19.86v0a5.51,5.51,0,0,0,.89.22,2.46,2.46,0,0,1,.39-.41c.37-.31.85-.43.87-.35s-.33.31-.58.65a1.77,1.77,0,0,0-.12.17,7.79,7.79,0,0,0,2.2-.11c.36-.34.79-.62.87-.43a2.92,2.92,0,0,0-.24.29A10.22,10.22,0,0,0,56,151.15a18.71,18.71,0,0,0,2.19-2.68c.12-.39.19-.63.2-.67a1.11,1.11,0,0,0,.08-.24l0-.05a.38.38,0,0,1,0-.1l0-.13v-.05l.14-.38.86-2.27c.36-.92.78-2,1.22-3.13l.53-1.32A24.39,24.39,0,0,0,61.38,133.46Z"/>
-                <path class="cls-19"
-                      d="M62.41,128.67a25.75,25.75,0,0,1-4.28-.11c1.33,1.64,3.25,3.27,3.25,4.9a24.39,24.39,0,0,1-.08,6.67c.05-.14.11-.28.17-.43l.37-.9.08-.16,0,0v0l0-.11L62,138c.37-2.56.75-5.1,1-7,.16-1,.27-1.83.36-2.38Z"/>
-                <path class="cls-7"
-                      d="M61.86,79.87c.54.58,1.18,1.25,1.82,1.91-.75.41-1.46.79-2,1.12l-.95.53c-.64-.26-1.31-.52-2-.78s-1.24-.45-1.89-.67c.9-.46,1.56-.72,1.6-.74s.68-.32,1.67-.7C60.6,80.33,61.21,80.1,61.86,79.87Z"/>
-                <path class="cls-9" d="M60.28,147.49l0,.14h0l0,.05Z"/>
-                <path class="cls-22"
-                      d="M59.47,84.29l-1.18-.41c-.78-.25-1.58-.49-2.39-.72.65.83,1.33,1.66,2.05,2.46.48-.46,1-.88,1.37-1.22Z"/>
-                <path class="cls-7"
-                      d="M55.28,83c-.54.35-1.12.75-1.69,1.13A35.2,35.2,0,0,1,48.81,87l-.6.34a6.64,6.64,0,0,0,.75,1c.15.13.28.29.44.41a4.55,4.55,0,0,0,.66.5,7.11,7.11,0,0,0,1.43.76l3-.45a16.41,16.41,0,0,1,2.65-3.21c.26-.27.53-.53.79-.78-.72-.8-1.4-1.63-2.05-2.46Z"/>
-                <path class="cls-9" d="M57.74,123.24s.14.2,0,0Z"/>
-                <path class="cls-20"
-                      d="M56.38,12c0,.15.2.51,0,.23,0,0-.49-.51-1-1l-.27-.21-.63-.5L53.66,10,52.1,8.82A25,25,0,0,0,49.22,7a32,32,0,0,0-3.67-1.68,27.94,27.94,0,0,1,5.54-.88c.73,0,1.44-.07,2.12-.08a22.22,22.22,0,0,1,1.1,2.27C54.86,7.88,55.6,9.87,56,11c0,.07.11.27.21.55S56.32,11.87,56.38,12Z"/>
-                <path class="cls-7"
-                      d="M47.18,80.83h0l-.65,1.32c.09.36.19.8.31,1.33a20.55,20.55,0,0,0,1,3.09,7.46,7.46,0,0,0,.4.8l.6-.34a31.87,31.87,0,0,1,4.3-3.6c.33-.26.68-.52,1-.79-1.83-.5-3.71-1-5.62-1.46C48.07,81.08,47.67,81,47.18,80.83Z"/>
-                <path class="cls-6"
-                      d="M52.65,98l.05.07-1,.8a32.19,32.19,0,0,1-4.39,3A12.17,12.17,0,0,1,43.68,103a15.69,15.69,0,0,1-2.18.21h-.19c-.07-.69-.13-1.39-.17-2.07a28.17,28.17,0,0,1,0-3.57c.28.12.58.25.91.37a13,13,0,0,0,3.8.75,22.78,22.78,0,0,0,2.59,0l1.45-.12c.38,0,.73-.07,1.13-.12l1-.25S52.44,98.1,52.65,98Z"/>
-                <path class="cls-6"
-                      d="M43.75,176.34a17.63,17.63,0,0,1-5.12,3l-1.2.44c.3.18.6.36.92.52A24,24,0,0,0,44,182.59c.92.25,1.85.46,2.8.66a19.52,19.52,0,0,1,1.6-1.95,15.11,15.11,0,0,0,3-4.41,12.23,12.23,0,0,0,.63-2.66,50.82,50.82,0,0,1-6.45-.53A6.44,6.44,0,0,1,43.75,176.34Z"/>
-                <path class="cls-16"
-                      d="M51.9,171.67A3.08,3.08,0,0,0,50.84,170c-.58-.14-1.11-.3-1.61-.45l-2.83-.82-.77-.23A6.72,6.72,0,0,1,46,171a7.49,7.49,0,0,1-.46,2.71h0a50.82,50.82,0,0,0,6.45.53A6.46,6.46,0,0,0,51.9,171.67Z"/>
-                <path class="cls-7"
-                      d="M47,123c-.41-.36-.83-.73-1.23-1.13-.12-.12-.24-.25-.34-.37a6.65,6.65,0,0,1-.55,1c0,.07,0,.14,0,.2a1.1,1.1,0,0,0,.44.79.79.79,0,0,0,.05.24c.12.22.31.52.5.81.36.62.8,1.15.7,1.45s-1,.22-1.77-.18a6.56,6.56,0,0,1-1-.61,2.79,2.79,0,0,1-.52-.56s0-.09-.09-.21,0,0,0,0l0,0-1.15,1.09.06,0,0,0a.56.56,0,0,0-.09.13,2.41,2.41,0,0,0-.28.54,1.3,1.3,0,0,0,.23,1.46c.1.12.27.26.44.42s.36.28.52.41c.34.27.66.51.94.71.57.41,1,.62,1,.77s-.58.24-1.32.06a8.31,8.31,0,0,1-1.23-.4l-.67-.3a4.61,4.61,0,0,1-.7-.41,3,3,0,0,1-1.09-1.33l-.75.71-1.28,1.2c0,.06,0,.13,0,.19a4.72,4.72,0,0,0,1,1.64c.94,1.15,2.48,1.91,2.36,2.23s-1.87.11-3.46-1A5.92,5.92,0,0,1,36.25,131c-.49.47-1,1-1.51,1.53l-.41.44c0,.12.09.31.17.55a4.22,4.22,0,0,0,.78,1.32,6.1,6.1,0,0,0,1.31,1c.4.24.69.29.76.42s-.32.48-1,.46a4.46,4.46,0,0,1-2.13-.61,5.52,5.52,0,0,1-1.55-1.43c-1,1.12-2,2.32-3.07,3.62a4.8,4.8,0,0,0,.61,1.71,4.6,4.6,0,0,0,1.21,1.36,5.5,5.5,0,0,0,1.93.88l.33.08C40.48,136.9,47.34,131,47,123Z"/>
-                <path class="cls-19"
-                      d="M49.38,124.85c-.82-.6-1.59-1.21-2.34-1.86.3,8-6.56,13.91-13.31,19.36a13.77,13.77,0,0,0,3.76.39,9.23,9.23,0,0,0,1.42-.16c1.32-1.69,3-3.45,4.54-5.15,1.26-1.36,2.39-2.77,3.45-4.15a43.87,43.87,0,0,0,2.69-3.81,22.89,22.89,0,0,0,1.48-2.83c.09-.2.16-.39.22-.53C50.64,125.71,50,125.29,49.38,124.85Z"/>
-                <path class="cls-6"
-                      d="M50.8,90.23s.26,0,.1.06l-.52.09-1,.14-.91.08-1.08.06a8,8,0,0,1-3.19-.34,4.92,4.92,0,0,1-1.28-.71c.14-.38.29-.75.45-1.1.73-1.57,1.51-3.06,2.07-4.22l.15-.32s0,0,0,0c.4.77.84,1.79,1.53,3a7.7,7.7,0,0,0,1.44,1.84,4,4,0,0,0,.49.42c.12.1.25.19.38.28a5.74,5.74,0,0,0,.92.5l.16.07Z"/>
-                <path class="cls-7"
-                      d="M49.29,120.67a2.31,2.31,0,0,1-.36,1.61l-.07,0c-.41-.35-.81-.71-1.19-1.08a1.32,1.32,0,0,0,.48-.58C48.46,120.68,49,120.68,49.29,120.67Z"/>
-                <path class="cls-7"
-                      d="M32,165.55l-.08,0a10.63,10.63,0,0,1-3,1,11.36,11.36,0,0,1-2.79,0,13.58,13.58,0,0,1-1.38-.19c.37,1.25.71,2.37.85,2.66a5.58,5.58,0,0,1,.28,1l.18.82c.12.56.25,1.1.36,1.65.25,1.11.49,2.22.74,3.35l.1.53,0,.11c0,.06.05,0,.07,0l.14-.18,1.06-1.37,1-1.31.7,1.49c.47,1,.94,2,1.42,3,0-.92,0-1.84-.05-2.77.79.69,1.63,1.49,2.38,2.07.37.31.79.61,1.11.85l.62.42a4.53,4.53,0,0,0,.4.26h0l.28-.08c.45-.14,1.07-.32,1.8-.58a17.25,17.25,0,0,0,5-2.58,5.6,5.6,0,0,0,1.7-2.13c-1.09-.17-2.18-.37-3.28-.62A15.41,15.41,0,0,1,32,165.55Z"/>
-                <path class="cls-19"
-                      d="M45.53,168.48c-.34-.11-.63-.19-.85-.27a2,2,0,0,1-.57-.22h0l-.34-.41a4.11,4.11,0,0,1-1.4-.66,13.52,13.52,0,0,1-2.61-2.33,28.68,28.68,0,0,1-2.16-2.74c-.56-.78-.92-1.33-.94-1.36s-.23-.38-.53-1c-.12.43-.32,1-.56,1.7-.12.36-.26.75-.41,1.18a6.65,6.65,0,0,1-1,1.64,5.33,5.33,0,0,1-2.13,1.5A15.41,15.41,0,0,0,41.62,173c1.1.25,2.19.45,3.28.62a7.4,7.4,0,0,0,.69-2.62A14,14,0,0,0,45.53,168.48Z"/>
-                <path class="cls-9" d="M44.25,116a.13.13,0,0,0,0,.08.09.09,0,0,1-.06,0S44.23,116,44.25,116Z"/>
-                <path class="cls-9" d="M41.17,3.88l0,0v0Z"/>
-                <path class="cls-19"
-                      d="M35,94.25l0,0-.2.2c0,.06-.15.14-.11.13s0,0,0,.11,0,.12.11.37a4.88,4.88,0,0,0,.48.93c.45.69,1.64,1.5,2.55,2.72a5.48,5.48,0,0,1,.93,2,7.79,7.79,0,0,1,.19,1.81c0,.26,0,.5,0,.72s0,.21-.05.32a.58.58,0,0,1,0,.16s0,.06-.06.1h0a2.52,2.52,0,0,1,.44.42.83.83,0,0,1,.2.41h0c-.16-1.15-.27-2.28-.35-3.4,0-.42,0-.84,0-1.25l0-.27,0,0-.12-.15-.27-.34-.52-.69a13.22,13.22,0,0,1-.94-1.36l-.2-.34c-.07-.15-.11-.21-.22-.45a1.67,1.67,0,0,1-.11-1.21c.11-.36.53-.57.86-.8l.47-.32,1.74-1.16h0a27.35,27.35,0,0,1,.83-3C38.63,91.85,38.47,95.54,35,94.25Z"/>
-                <path class="cls-7"
-                      d="M39,90.75c-.84.67-1.72,1.41-2.51,2.11l-1.07,1-.42.41c3.45,1.29,3.61-2.4,5.5-4.38l.12-.4C40.17,89.83,39.6,90.27,39,90.75Z"/>
-                <path class="cls-7"
-                      d="M38.51,106.43a2.11,2.11,0,0,0,.16-2.32l-.4-.28a1.47,1.47,0,0,0-.94-.34,2.87,2.87,0,0,0-1,.31c-.32.16-.63.33-.68.47s0,.25.13.37a1.11,1.11,0,0,0,.16.15s0,.17-.09.3-.22.2-.27.16a1.89,1.89,0,0,1-.24-.25,1,1,0,0,1-.21-.36.77.77,0,0,1,0-.61,1.84,1.84,0,0,1,1-.66l.08,0c.06-.07.12-.13.18-.21s0-.34-.12-.6-.09-.48-.26-.69-.28,0-.39.13-.22.22-.32.34-.33.3-.47.44a2.55,2.55,0,0,0-.37.52,6.58,6.58,0,0,0-.3.71C35,105.67,36.18,107.2,38.51,106.43Z"/>
-                <path class="cls-19"
-                      d="M39.7,106.35a0,0,0,0,1,0,0c-.11-.55-.19-1.1-.26-1.65h0a.66.66,0,0,1,0,.32c-.06.18-.13.25-.14.25s.21-.45-.22-.83a4.56,4.56,0,0,0-.38-.31,2.11,2.11,0,0,1-.16,2.32c-2.33.77-3.49-.76-4.37-2.45l-.26.75a7,7,0,0,0-.24.79.87.87,0,0,0,0,.62,1.84,1.84,0,0,0,1.14.85,7.58,7.58,0,0,0,1.79.35,13.64,13.64,0,0,0,1.92,0c.58,0,1.23-.22,1.26-.44a.07.07,0,0,0,0,0C39.75,106.72,39.72,106.53,39.7,106.35Z"/>
-                <path class="cls-6"
-                      d="M33.26,142.85a6,6,0,0,1-2.19-.89,5.2,5.2,0,0,1-1.48-1.53,5.38,5.38,0,0,1-.59-1.29c-.79,1-1.58,2.07-2.32,3.19-.28.43-.55.88-.8,1.34a6.12,6.12,0,0,0,4.3,3.57,8.72,8.72,0,0,0,1.23.19A19.94,19.94,0,0,1,34.25,143,8.54,8.54,0,0,1,33.26,142.85Z"/>
-                <path class="cls-16"
-                      d="M34.73,147.19c.69-.13,1.26-.28,1.61-.36a12.25,12.25,0,0,1,.63-1.34,18.5,18.5,0,0,1,1.77-2.69,7.6,7.6,0,0,1-1.23.26,12,12,0,0,1-3.26,0,19.94,19.94,0,0,0-2.84,4.41A12.73,12.73,0,0,0,34.73,147.19Z"/>
-                <path class="cls-6"
-                      d="M28.22,157a7.39,7.39,0,0,1-5-1.31,4.64,4.64,0,0,1-.73-.62c0,.49,0,1,0,1.47a21.58,21.58,0,0,0,.73,5.15h0l.24.61c.13.34.57,1.75,1,3.21.43.1,1,.22,1.73.31a11.19,11.19,0,0,0,2.61.06,10,10,0,0,0,2.85-.82l0,0a19.36,19.36,0,0,1-2.2-8.2C29.09,156.89,28.66,156.94,28.22,157Z"/>
-                <path class="cls-16"
-                      d="M34.08,163.4a4.57,4.57,0,0,0,.69-1.13c.18-.41.33-.8.49-1.17.31-.75.57-1.35.76-1.77l-.17-.34a11.34,11.34,0,0,1-.91-3.46.86.86,0,0,1,0-.16,7.43,7.43,0,0,1-1.76.71,26.2,26.2,0,0,1-3.65.75,19.36,19.36,0,0,0,2.2,8.2A6.12,6.12,0,0,0,34.08,163.4Z"/>
-                <path class="cls-7"
-                      d="M31.18,147.94a8.37,8.37,0,0,1-1.11-.12,6.52,6.52,0,0,1-4.66-3.28c-.36.71-.69,1.43-1,2.19a50.14,50.14,0,0,0-1.56,5.44,10.55,10.55,0,0,0-.27,1.72,5.76,5.76,0,0,0,1.14,1.16,6.89,6.89,0,0,0,4.49,1.34c.44,0,.88-.06,1.31-.1A20,20,0,0,1,31.18,147.94Z"/>
-                <path class="cls-19"
-                      d="M34.64,155.34l.28-.1a9.11,9.11,0,0,1,.65-4.7V150a6.46,6.46,0,0,1,.68-3,12.36,12.36,0,0,1-1.45.5,11.63,11.63,0,0,1-3.63.43,20,20,0,0,0-1.68,8.35,34.16,34.16,0,0,0,3.59-.52A12.5,12.5,0,0,0,34.64,155.34Z"/>
-                <rect class="cls-9" x="35.52" y="129.61" width="0.01" height="0.01"/>
-                <path class="cls-9" d="M33.89,11.7h0a12.79,12.79,0,0,0-1,1A10.09,10.09,0,0,1,33.89,11.7Z"/>
-                <path class="cls-9" d="M25.44,142.73h0c-.07.17-.15.33-.22.5l.21-.51Z"/>
-                <path class="cls-9" d="M25.19,143.28l-.17.46v0Z"/>
-                <circle class="cls-7" cx="63.02" cy="48.47" r="1.62"/>
-                <circle class="cls-7" cx="64.01" cy="51.01" r="0.33"/>
-                <path class="cls-11" d="M83.79,40.51v0Z"/>
-                <path class="cls-11"
-                      d="M90.14,55.56a10.5,10.5,0,0,0,3-7.37c.16-3.84-2.37-8.07-5.21-9h0a10.76,10.76,0,0,0-3.88,1.08l-.06,0h0a1,1,0,0,0-.19.17v0c-.17.67-.31,1.33-.43,1.95-.07.4-.13.78-.19,1.15a27.25,27.25,0,0,0,1.47,13A25.69,25.69,0,0,0,88.46,56Q89.27,55.85,90.14,55.56Z"/>
-                <path class="cls-11"
-                      d="M83.17,43.63c-.47,2.86-.6,4.8-.63,4.93s-.29,2.28-.46,5.53h0a4.1,4.1,0,0,0,1.86,2.61h.18l.52-.05A27.25,27.25,0,0,1,83.17,43.63Z"/>
-                <path class="cls-7" d="M84.52,45.18a1.46,1.46,0,0,0-.64,2,1.45,1.45,0,1,0,.64-2Z"/>
-                <circle class="cls-7" cx="83.75" cy="48.93" r="0.34"/>
-                <g id="_Group_2" data-name="&lt;Group&gt;">
-                    <path class="cls-20" d="M104.06,10.83l.19-.13-.18.19A.13.13,0,0,0,104.06,10.83Z"/>
-                    <path class="cls-20"
-                          d="M105.27,10.11l-1.23.68a.59.59,0,0,0-.16-.15.48.48,0,0,0-.16-.07,4.35,4.35,0,0,0-.17-.68s.1-.09.27-.17h0l.23,0A1.34,1.34,0,0,1,105.27,10.11Z"/>
-                    <path class="cls-20"
-                          d="M103.14,17.27c-.08-.15-.16-.31-.25-.45h0c.11-.76.43-2.06.74-3.32a8.5,8.5,0,0,0,.15-2.54,2,2,0,0,0-.06-.38.48.48,0,0,1,.16.07.59.59,0,0,1,.16.15l-.13.07v0h0l.12-.07a.13.13,0,0,1,0,.06l.18-.19-.19.13,0,0,1.23-.68a1.34,1.34,0,0,0-1.19-.41l-.23,0a4.88,4.88,0,0,1,.49-.22c.44-.2.86-.23.88-.13a5.35,5.35,0,0,1,.17,1.51,8.72,8.72,0,0,1-.57,2.95A21.92,21.92,0,0,1,103.14,17.27Z"/>
-                    <path class="cls-20"
-                          d="M102.89,16.82c.09.14.17.3.25.45-.1.15-.18.21-.23.19S102.84,17.19,102.89,16.82Z"/>
-                    <path class="cls-20"
-                          d="M103,36.34c.06-1.36,0-2.73.06-3.28h0a.43.43,0,0,0,.09-.1,21.36,21.36,0,0,1,.25,3.4c0,.9,0,1.8,0,2.48s-.09,1.15-.09,1.18,0,.49-.19,1.17a21.67,21.67,0,0,1-.55,2.42c-.26.87-.57,1.7-.82,2.32a5,5,0,0,1-.46,1c-.08,0,.37-1.45.76-3,0,.23.07.35.1.35s.08-.39.08-1.09c.16-.77.3-1.51.36-2.11s.13-1.12.14-1.15.06-.48.13-1.15S103,37.23,103,36.34Z"/>
-                    <path class="cls-20"
-                          d="M102.65,18.15a18.22,18.22,0,0,1-1-3.1,5.26,5.26,0,0,1,1.23,1.76h0c0,.37,0,.61,0,.64s.13,0,.23-.19c.1.18.19.37.28.56a17.58,17.58,0,0,1,.89,2.14c.2.6.29,1.05.31,1.07a8.91,8.91,0,0,1,.09,1.14,11.72,11.72,0,0,1-.32,2.33,9,9,0,0,1-1,3.13,17.69,17.69,0,0,1,.18-3.24,15.48,15.48,0,0,0,.07-2.17,9.31,9.31,0,0,0-.18-1s0-.43-.19-1S102.91,18.91,102.65,18.15Z"/>
-                    <path class="cls-20"
-                          d="M103.72,10.57a2.94,2.94,0,0,0-2,.19,5.22,5.22,0,0,0-2,1.32,2.11,2.11,0,0,0-.41.62l-.9-1.28a5.07,5.07,0,0,0,.78-.15,22.43,22.43,0,0,0,2.34-.88,9.76,9.76,0,0,1,2.27-.67c-.17.08-.27.13-.27.17A4.35,4.35,0,0,1,103.72,10.57Z"/>
-                    <path class="cls-20" d="M99.91,58.22l.36-1.36c.46.47.87.9.92.94Z"/>
-                    <path class="cls-20"
-                          d="M102.49,5.27a6.64,6.64,0,0,1,3.37.37,4.42,4.42,0,0,1,2.26,2.49,9.82,9.82,0,0,1,.61,2.4c.17,1.36.2,2.17.2,2.24a32.56,32.56,0,0,1-.15,3.55,41,41,0,0,1-1.39,7.27,37.49,37.49,0,0,1-2.64,6.79A14.37,14.37,0,0,1,103.19,33q0-.15-.06-.15a.87.87,0,0,0,0,.25h0c-.07.07-.11.09-.14.08s.33-1.28,1-3.12a51.9,51.9,0,0,0,1.87-6.82,45.39,45.39,0,0,0,.85-7,32.9,32.9,0,0,0,0-3.32c0-.06,0-.88-.08-2.06S106.19,8,105,7.38A5,5,0,0,0,102.59,7c-.93,0-1.92.14-2.89.25s-1.93.2-2.82.28l-.32,0H96l-.8,0,.69,1.17c.27.44.39.71.33.76S96,9.36,95.57,9s-.85-.84-1.49-1.55l.4.1c.33.11.57.15.62.06s0-.26-.33-.57c-.1-.08-.22-.17-.34-.28l2.29-.43c.86-.18,1.8-.35,2.74-.56A25.85,25.85,0,0,1,102.49,5.27Z"/>
-                    <path class="cls-20"
-                          d="M103.39,76.71c0,.08-.55-.1-1.33-.28s-1.84-.37-2.91-.52-2.15-.27-3-.34-1.39-.1-1.43-.12l-1.4-.16a9.05,9.05,0,0,0-2.87.07,24.77,24.77,0,0,0-2.55.6,5.23,5.23,0,0,0,0-.56,16.7,16.7,0,0,1,2.37-.84,10.33,10.33,0,0,1,1.64-.32,12.55,12.55,0,0,1,1.48,0c.84,0,1.42.07,1.45.07s.61.07,1.44.21,1.91.34,3,.6a18.54,18.54,0,0,1,2.9.9C103,76.32,103.43,76.64,103.39,76.71Z"/>
-                    <path class="cls-20"
-                          d="M91.44,73.37c-.74.1-1.72.27-2.69.48l-1.06.24c-.06-.23-.12-.45-.19-.67.33-.13.68-.25,1-.37,1-.32,2-.58,2.71-.75S92.51,72,92.55,72s.56-.07,1.35-.09a17,17,0,0,1,2.83.16,12.85,12.85,0,0,1,3.89,1c-.05.23-2-.18-4-.2A20.27,20.27,0,0,0,94,73c-.74.07-1.22.18-1.26.18S92.17,73.25,91.44,73.37Z"/>
-                    <path class="cls-20"
-                          d="M89.08,76.73l.23,0a5.41,5.41,0,0,1,.58.13c.42.14,1,.33,1.52.57,1.09.46,2,1.11,2,1.26a9.36,9.36,0,0,1-2.24-.48c-.54-.12-1.09-.23-1.5-.3S89,77.9,89,77.9s-.28,0-.68-.06q-.35,0-.78,0h0a7.68,7.68,0,0,0,.32-1A6.47,6.47,0,0,1,89.08,76.73Z"/>
-                    <path class="cls-20"
-                          d="M103.73,51.13l-1.22,1.62-.65.86-.24.35.29.14.83.48,2.93,1.73c-1.64.56-3.18,1-4.48,1.49,0,0-.46-.47-.92-.94l-.36,1.36,1.28-.42h0c-.06.27-.12.48-.15.63s0,.05,0,.07c-.14.57-.16.66-.18.71l-.16.1a3.73,3.73,0,0,0-.46.28l-.43.34a7.61,7.61,0,0,0-1.27,1.51C97.62,62.9,96.44,65.05,95,67a15.6,15.6,0,0,1-2.41,2.64,8,8,0,0,1-1.39.93c-.45.24-.89.45-1.28.65a7.32,7.32,0,0,1-2.81,1,20.32,20.32,0,0,1,2.47-1.56,13.33,13.33,0,0,0,2.35-1.71A15,15,0,0,0,94,66.25c1.27-1.94,2.25-4,3.17-5.66a9.77,9.77,0,0,1,1.48-1.91c.22-.2.42-.36.55-.47h0s0-.08-.14-.2l-.68-.82c0-.09.07-.19.11-.29l.92-.26,2-.55.51-.15h.1l.26,0-.26-.23-2.14-1.39L101,52.9l.72-.81,1.36-1.5c.65-.73,1.26-1.38,1.75-1.9l.66-.08-.23-.36-.43.44a39.61,39.61,0,0,1-4.06.2,7.15,7.15,0,0,1,.72-.11,35.48,35.48,0,0,0,3.89-.61L106,48l-.39.58C105.16,49.19,104.5,50.1,103.73,51.13Z"/>
-                    <path class="cls-20"
-                          d="M87,74.28l.73-.19c.07.25.12.5.17.76a3.45,3.45,0,0,1,.07.55c-.35.16-.66.3-.92.45a3.84,3.84,0,0,0,0-.9C87,74.73,87,74.5,87,74.28Z"/>
-                    <path class="cls-20"
-                          d="M87.69,74.09l-.73.19a5.58,5.58,0,0,0-.09-.61c.2-.09.41-.17.63-.25C87.57,73.64,87.63,73.86,87.69,74.09Z"/>
-                    <path class="cls-20"
-                          d="M87.93,76l-1,.29c0-.13.06-.26.08-.4.26-.15.57-.29.92-.45A5.23,5.23,0,0,1,87.93,76Z"/>
-                    <path class="cls-20"
-                          d="M87.83,76.81a6.54,6.54,0,0,0-1.16.25,4,4,0,0,0,.26-.81l1-.29A5.65,5.65,0,0,1,87.83,76.81Z"/>
-                    <path class="cls-20"
-                          d="M86.67,77.06a6.54,6.54,0,0,1,1.16-.25,7.68,7.68,0,0,1-.32,1h0l-.73,0-.57.06c.09-.15.2-.33.31-.55Z"/>
-                    <path class="cls-20"
-                          d="M86.28,76.36s.25-.26.73-.51c0,.14-.05.27-.08.4C86.54,76.35,86.3,76.41,86.28,76.36Z"/>
-                    <path class="cls-20"
-                          d="M87,72.18a10.81,10.81,0,0,1,.47,1.24c-.22.08-.43.16-.63.25-.08-.51-.19-1-.28-1.37a2.4,2.4,0,0,0-.31-.75c-.12-.15-.25-.18-.24-.23s.15-.1.38,0a2,2,0,0,1,.6.79v0Z"/>
-                    <path class="cls-20"
-                          d="M84.88,74.71a6.44,6.44,0,0,1,2-1,5.58,5.58,0,0,1,.09.61A7.16,7.16,0,0,1,84.88,74.71Z"/>
-                    <path class="cls-20"
-                          d="M85.42,76.25a.2.2,0,0,1,0,.11c0,.07-.06.12-.08.16s-.11,0-.09,0l0,0,0,0,0,0a1.67,1.67,0,0,1-.12-.13.62.62,0,0,0,.26,0S85.41,76.21,85.42,76.25Z"/>
-                    <path class="cls-20"
-                          d="M85.41,76.36a.2.2,0,0,0,0-.11s-.06,0-.08,0a.62.62,0,0,1-.26,0,1.67,1.67,0,0,0,.12.13l0,0,0,0,0,0s0,.14.09,0S85.38,76.43,85.41,76.36Zm.12-.32c.16-.05,0,.86-.25.9s-.44-.52-.22-.72A3.37,3.37,0,0,1,85.53,76Z"/>
-                    <path class="cls-20"
-                          d="M84.52,78.1c-.06-.16,1-.71,2.1-1h0l-.15.33c-.11.22-.22.4-.31.55C85.32,78.06,84.56,78.22,84.52,78.1Z"/>
-                    <path class="cls-20"
-                          d="M91.89,6.73c-1.15-.42-2.51-1-4-1.53a27.61,27.61,0,0,0-3.84-1,5.14,5.14,0,0,1,1.61-.56l-.75-1.95,0-.09a22.66,22.66,0,0,1,3.8,1.55,38.75,38.75,0,0,1,3.83,2.28c.8.52,1.43,1,1.89,1.32l-.84.16c.16.19.33.36.49.53C93.54,7.32,92.79,7.06,91.89,6.73Z"/>
-                    <path class="cls-20"
-                          d="M85.28,76.94c.22,0,.41-1,.25-.9a3.37,3.37,0,0,0-.47.18s.11-.12.38-.23c.06,0,.14-.11.2-.06a.32.32,0,0,1,.1.2,1.33,1.33,0,0,1-.1.68c-.1.25-.26.39-.47.36a.6.6,0,0,1-.41-.41.69.69,0,0,1,0-.68s.16,0,.26.14C84.84,76.42,85.06,77,85.28,76.94Z"/>
-                    <path class="cls-20"
-                          d="M90.15,55.57A5.92,5.92,0,0,1,87,57.13,4.68,4.68,0,0,1,84,56.71h.17A25.79,25.79,0,0,0,88.46,56C89,55.91,89.56,55.75,90.15,55.57Z"/>
-                    <path class="cls-20"
-                          d="M84.13,73.93c-.09,0-.13,0-.08-.06l.08,0a1.34,1.34,0,0,0-.19-.23c0,.05.17.05.29.05s.1.08,0,.15A.4.4,0,0,1,84.13,73.93Z"/>
-                    <path class="cls-20"
-                          d="M85.23,39.5a3.26,3.26,0,0,1,2.7-.27,11,11,0,0,0-3.88,1.08l-.06,0A7.65,7.65,0,0,1,85.23,39.5Z"/>
-                    <path class="cls-20"
-                          d="M83.94,74.21c-.43.09-.48-.13,0-.61a1.34,1.34,0,0,1,.19.23l-.08,0s0,.1.08.06a.4.4,0,0,0,.13-.13c.07-.07,0-.19,0-.15s-.28,0-.29-.05l.4-.1C84.75,73.39,84.37,74.12,83.94,74.21Z"/>
-                    <path class="cls-20"
-                          d="M82.69,41.05A6,6,0,0,1,84,39.9l-.15.52C83.06,40.78,82.74,41.05,82.69,41.05Z"/>
-                    <path class="cls-20"
-                          d="M83.59,74.44a.34.34,0,0,1-.24-.43.94.94,0,0,1,.23-.43l.11-.14s.14,0,.25.16c-.48.48-.43.7,0,.61s.81-.82.4-.71l-.4.1s.14-.11.45-.2a.2.2,0,0,1,.21,0,.3.3,0,0,1,.07.23,1,1,0,0,1-.38.61A.81.81,0,0,1,83.59,74.44Z"/>
-                    <path class="cls-20"
-                          d="M85.63,3.67A5.14,5.14,0,0,0,84,4.23c-.4-.09-.81-.16-1.22-.22-.21,0-.42-.06-.64-.11.16-.15.31-.29.46-.41a16.83,16.83,0,0,1,2.26-1.77Z"/>
-                    <path class="cls-20"
-                          d="M82.08,54.09a20.38,20.38,0,0,1-.43-6.4c.18-4,.62-5.83,2.14-7.18-.16.68-.31,1.34-.42,2-.64,3.48-.79,5.92-.82,6.07S82.26,50.85,82.08,54.09Z"/>
-                    <path class="cls-20"
-                          d="M87,57.13a5.92,5.92,0,0,0,3.14-1.56,21.23,21.23,0,0,0,4-1.72,9.69,9.69,0,0,0,1.36-.94,3.51,3.51,0,0,0,.59-.56l.13-.13a.52.52,0,0,0,0-.12,2.49,2.49,0,0,0,.13-.36,12.37,12.37,0,0,0,.31-3.46c-.09-2.33-1.54-4.38-2.84-6.2a7.2,7.2,0,0,0-2.34-2,7.81,7.81,0,0,0-2.71-.79,5.4,5.4,0,0,0-.9,0h0a3.26,3.26,0,0,0-2.7.27,7.65,7.65,0,0,0-1.24.84h0a.65.65,0,0,1-.17.08L84,39.9a4.83,4.83,0,0,1,.56-.36,8,8,0,0,1,4.37-.75,8.22,8.22,0,0,1,2.92.74,7.54,7.54,0,0,1,2.61,2.16,22.79,22.79,0,0,1,2,3,8.23,8.23,0,0,1,1.13,3.59A13.21,13.21,0,0,1,97.3,52a4,4,0,0,1-.16.49,1.55,1.55,0,0,1-.15.28,1.73,1.73,0,0,1-.17.21,6.05,6.05,0,0,1-.67.67,11.29,11.29,0,0,1-1.49,1.06,23.45,23.45,0,0,1-5.93,2.39,26.1,26.1,0,0,1-4.51.76,7,7,0,0,1-1.94-.08.79.79,0,0,1-.31-.13q0-.48,0-.93a.72.72,0,0,1,.52-.09,5.9,5.9,0,0,0,1.45.1h0A4.68,4.68,0,0,0,87,57.13Z"/>
-                    <path class="cls-20"
-                          d="M81.82,109a.52.52,0,0,0,0-.11,1.49,1.49,0,0,0,.6-.16,3.44,3.44,0,0,0,.74-.53c.26-.21.5-.45.47-.73a3.88,3.88,0,0,0-.83-1.66,1.19,1.19,0,0,0-.64-.41s-.05-.11-.05-.23v-.06c0-.17.07-.3.17-.28s.13,0,.32.12a1.92,1.92,0,0,1,.6.51,3.52,3.52,0,0,1,.52.87,2.87,2.87,0,0,1,.32,1.14,1,1,0,0,1-.25.62,1.81,1.81,0,0,1-.43.37,2.92,2.92,0,0,1-.85.48A1.32,1.32,0,0,1,81.82,109Z"/>
-                    <path class="cls-20"
-                          d="M87.51,77.84a6.14,6.14,0,0,1-1.6,2.29,12.3,12.3,0,0,1-2.28,1.78,4,4,0,0,1-1,.4h0a5.3,5.3,0,0,1-1.82.11c-.76-.08-1.24-.27-1.24-.35s.52,0,1.25-.1a4.78,4.78,0,0,0,2.4-.77,12.79,12.79,0,0,0,1.94-1.81c.48-.56.74-1,.76-1s.14-.19.33-.48l.57-.06Z"/>
-                    <path class="cls-20" d="M81.82,109c-.16,0-.24-.07-.24-.09s.1,0,.26,0A.52.52,0,0,1,81.82,109Z"/>
-                    <path class="cls-20"
-                          d="M81.71,102.42a4.8,4.8,0,0,1-.08-2.34c0,.26.08.51.13.75s.1.71.14,1S81.76,102.42,81.71,102.42Z"/>
-                    <path class="cls-20"
-                          d="M102.22,42.67c0,.2,0,.38,0,.53s0,.2-.07.3-.07.3-.11.44c0-.27-.11-.69-.19-1.25s-.14-1.11-.24-1.81a13.27,13.27,0,0,0-.83-2.16,8.35,8.35,0,0,0-1.73-2.09,12.53,12.53,0,0,0-2.37-1.92,11.2,11.2,0,0,0-6.38-1.26,6.5,6.5,0,0,0-2.86,1.31,10,10,0,0,0-2.22,2.29A7.85,7.85,0,0,0,84,39.73a1,1,0,0,0,0,.17,6,6,0,0,0-1.27,1.15s.37-.27,1.12-.63a.29.29,0,0,0,0,.09c-1.52,1.35-2,3.16-2.14,7.18a20.38,20.38,0,0,0,.43,6.4h0l0,.58c0,.65-.08,1.32-.08,2a.52.52,0,0,0,0,.93c0,1,.1,2,.23,3a24.19,24.19,0,0,0,1.74,6.51l.18.39.13.28a.17.17,0,0,0,.22.13l.27,0,.25-.14c.24-.13.48-.3.72-.45.94-.63,1.87-1.3,2.76-1.94,1.78-1.29,3.42-2.53,4.82-3.61s2.52-2,3.3-2.64l1-1.26c.61-.77.82-2.67,1.76-4.81.11-.27.24-.57.35-.88.4-1,.77-2.28,1.06-3.29h0c-.38,1.45-.92,3.47-1.43,5.22-.31,1.1-.62,2.1-.85,2.78l-.28.08.17.21a2.58,2.58,0,0,1-.17.42c-.68,1.47-4.5,4.7-4.5,4.7-1.32,1.17-2.91,2.49-4.64,3.86-.88.69-1.77,1.39-2.74,2.08-.24.17-.48.34-.75.51a2.46,2.46,0,0,1-.52.27,2.62,2.62,0,0,1-.58.12,1.06,1.06,0,0,1-1.21-.56l-.26-.5-.2-.4a28.23,28.23,0,0,1-2.38-13.06c.09-3.63.36-6.09.37-6.25s.24-2.62,1-6.21a26.08,26.08,0,0,1,.74-2.88A9.58,9.58,0,0,1,84,36.2a11.5,11.5,0,0,1,2.62-2.54,7.6,7.6,0,0,1,3.56-1.45,12.07,12.07,0,0,1,7,1.66A12.3,12.3,0,0,1,99.65,36a8.79,8.79,0,0,1,1.76,2.38,13.16,13.16,0,0,1,.73,2.39C102.19,41.54,102.21,42.15,102.22,42.67Z"/>
-                    <path class="cls-20"
-                          d="M80.61,93.1a4,4,0,0,1,2.3,1.26,2.35,2.35,0,0,1,.42.9c.06.24.06.39.07.4a4.9,4.9,0,0,1-.15,1.25c-.17.7-.45,1.44-.67,2.26-.3,1-.52,2-.68,2.67,0-.3-.08-.64-.14-1s-.09-.49-.13-.75.07-.71.14-1.09c.11-.83.35-1.72.43-2.28a3.07,3.07,0,0,0,0-.7A3.29,3.29,0,0,0,82,95a3.25,3.25,0,0,0-1.68-1.08l-.18-.07c-.09-.33-.17-.64-.26-.95A5.21,5.21,0,0,0,80.61,93.1Z"/>
-                    <path class="cls-20"
-                          d="M81.34,80.86a1.25,1.25,0,0,1-1,.33.9.9,0,0,1-.42-.14.57.57,0,0,0,.16-.11.69.69,0,0,0,.22-.19h0a1.07,1.07,0,0,0,.77-.23c.23-.14.48-.37.7-.49s.15-.1.26-.08a.11.11,0,0,1,.07,0h0a.07.07,0,0,1,0,.08v0s0,.06-.07,0C82,80.15,81.7,80.5,81.34,80.86Z"/>
-                    <path class="cls-20"
-                          d="M80.1,80.94a.57.57,0,0,1-.16.11h0l0,0s0,0,.05-.09.11,0,.11-.1h0a.56.56,0,0,1,.18-.12l.09,0A.69.69,0,0,1,80.1,80.94Z"/>
-                    <path class="cls-20"
-                          d="M80.12,95.79a.48.48,0,0,1,.29.68,6,6,0,0,1-.65.82l-.25.24c-.15-.4-.29-.8-.45-1.21.24-.29.35-.47.37-.48C79.53,95.68,79.82,95.66,80.12,95.79Z"/>
-                    <path class="cls-20"
-                          d="M80.45,94.88c.46,1.84.9,3.68,1.18,5.2a4.8,4.8,0,0,0,.08,2.34c.05,0,.11-.21.19-.58.13,1.08.1,1.77,0,1.79s-.47-.89-1-2.27h0q0-.12-.09-.27c-.36-1-.81-2.23-1.29-3.54l.25-.24a6,6,0,0,0,.65-.82.48.48,0,0,0-.29-.68c-.3-.13-.59-.11-.69,0,0,0-.13.19-.37.48-.1-.3-.22-.6-.33-.91-.19-.5-.38-1-.56-1.5l.21,0,.58-.15-.63-1.18a6.24,6.24,0,0,0,1.84,1.29Z"/>
-                    <path class="cls-20"
-                          d="M78.16,93.91c-.21-.56-.42-1.12-.63-1.65a.52.52,0,0,0,.11-.08l.23-.18a4.21,4.21,0,0,0,.44.52s0,0,0,0L79,93.71l-.58.15-.21,0Z"/>
-                    <path class="cls-20"
-                          d="M79.91,92.87c.09.31.17.62.26.95a6.24,6.24,0,0,1-1.84-1.29s0,0,0,0L78,91.88l-.1.12c-.15-.2-.2-.34-.16-.37S78.69,92.38,79.91,92.87Z"/>
-                    <path class="cls-20"
-                          d="M76.63,7.66a12.27,12.27,0,0,0-1.84-2.74c-.18-.19-.34-.36-.5-.51l1.55-.31a22.07,22.07,0,0,1,1.49,3.12,10.71,10.71,0,0,1,.36,1.09,5.65,5.65,0,0,1,.19.89q0,.48.09,1c0,.18,0,.36.06.56l0,.28v.14c0,.07,0,0,0-.07s.07-.24.14-.46c.26-.76.53-1.48.77-2.09a21.27,21.27,0,0,1,1.09-2.24,9,9,0,0,1,1.29-1.73c.26-.26.51-.5.75-.71.22.05.43.08.64.11.41.06.82.13,1.22.22-.23.1-.47.23-.74.38A13.48,13.48,0,0,0,82,5.46a6.44,6.44,0,0,0-1.26,1.39A13.94,13.94,0,0,0,79.51,9a29.44,29.44,0,0,0-1.34,3.58l-.27.87s0,.07-.05,0l0-.23-.07-.45c0-.29-.07-.58-.11-.87-.08-.57-.16-1.13-.23-1.66a10.06,10.06,0,0,0-.36-1.59A9.74,9.74,0,0,0,76.63,7.66Z"/>
-                    <path class="cls-20"
-                          d="M76.69,90c-.3-.79-.55-1.47-.75-2l1.9.32a3,3,0,0,1-.33.64A4.47,4.47,0,0,1,76.69,90Z"/>
-                    <path class="cls-20"
-                          d="M80.41,80.49a.29.29,0,0,1-.08.26h0l-.09,0a.56.56,0,0,0-.18.12h0a.1.1,0,0,0,0-.07c0,.07,0,.07,0,.07s0,.09-.11.1-.05.08-.05.09l0,0a6.06,6.06,0,0,1-1.23.49,3.18,3.18,0,0,1-1.61.1,1.21,1.21,0,0,1-.55-.33,3.42,3.42,0,0,0,.59-.26.29.29,0,0,0,.12.07,2.68,2.68,0,0,0,1.36,0A6.55,6.55,0,0,0,80,80.75c.18-.08.3-.17.31-.24a.49.49,0,0,0,0-.16S80.36,80.33,80.41,80.49Z"/>
-                    <path class="cls-20"
-                          d="M82.68,82.42s-.13.5-.64,1.07A5.22,5.22,0,0,1,79.67,85a7.59,7.59,0,0,1-1.81.32.2.2,0,0,1,0-.07.57.57,0,0,0-.56-.54l-.88.35,0-.72c.07,0,.15-.09.22-.15a3.29,3.29,0,0,0,.36.07,8.13,8.13,0,0,0,2.49-.06,5.52,5.52,0,0,0,2.28-1c.44-.33.73-.66.87-.73l0,0Z"/>
-                    <path class="cls-20"
-                          d="M76.38,81.14s.06-.12.19-.24.25-.14.28-.11a.79.79,0,0,0,.27.26,3.42,3.42,0,0,1-.59.26A1.52,1.52,0,0,1,76.38,81.14Z"/>
-                    <path class="cls-20"
-                          d="M76.39,84.33v-.15h0a.08.08,0,0,0,0,0h0l.14,0h.06C76.54,84.24,76.46,84.28,76.39,84.33Z"/>
-                    <path class="cls-20" d="M76.32,85.09l.09,0v0h-.09Z"/>
-                    <path class="cls-20"
-                          d="M76.25,84.84a.36.36,0,0,1-.07-.19c0-.05-.05-.08-.06-.08s.06,0,.08-.09l0,0,.15-.11,0,.72-.09,0h0A2.07,2.07,0,0,0,76.25,84.84Z"/>
-                    <path class="cls-20" d="M76.39,84.33l-.15.11a.72.72,0,0,0,.12-.21l0,0Z"/>
-                    <path class="cls-20"
-                          d="M75.8,87.66c-.11-.29-.19-.49-.23-.58a11,11,0,0,0,1.89-1,.75.75,0,0,0,.33-.43c.19.65.63,2.08,1,3.32s.73,2.47,1.12,3.91c-1.22-.49-2.12-1.32-2.2-1.24s0,.17.16.37l-.23.18a.52.52,0,0,1-.11.08c-.3-.81-.58-1.57-.84-2.25a4.47,4.47,0,0,0,.82-1,3,3,0,0,0,.33-.64L75.94,88s0,0,0,0h0A.51.51,0,0,0,75.8,87.66Z"/>
-                    <path class="cls-20"
-                          d="M76.05,85.2l-.08,0s.2,0,.2,0l.13,0h.11v0l.88-.35a.57.57,0,0,1,.56.54.2.2,0,0,0,0,.07h-.17c0-.09-.09-.07-.19,0a4.41,4.41,0,0,1-.63,0,4.21,4.21,0,0,1-.55-.06A2.14,2.14,0,0,1,76.05,85.2Z"/>
-                    <path class="cls-20"
-                          d="M76,108a.46.46,0,0,1-.1-.41c.06-.22.16-.3.19-.29s0,.15,0,.3.14.21.29.19a1.24,1.24,0,0,0,.43-.3l.2-.22c0-.06,0,0,.1-.06s0,0-.08-.08l-.44-.17c-.27-.13-.44-.17-.47-.2s.25-.14.54-.09a3.7,3.7,0,0,1,.48.07,6.24,6.24,0,0,1,.8.23,6.35,6.35,0,0,1-.51.7,1.71,1.71,0,0,1-1,.52A.62.62,0,0,1,76,108Z"/>
-                    <path class="cls-20"
-                          d="M75.55,87c-.1-.3.35-.72,1-1a3,3,0,0,0,.94-.74,1.2,1.2,0,0,0,.19,0s0,.14.1.32a.75.75,0,0,1-.33.43,11,11,0,0,1-1.89,1Z"/>
-                    <path class="cls-20"
-                          d="M75.78,85.07a.55.55,0,0,1-.19-.24c.22-.12.34-.19.34-.23l.31-.16,0,0s0,.09-.08.09.08,0,.06.08a.36.36,0,0,0,.07.19,2.07,2.07,0,0,1,.06.24h0l-.13,0s-.2,0-.2,0l-.1,0Z"/>
-                    <path class="cls-20"
-                          d="M75.53,84.65a.38.38,0,0,1,0-.1.57.57,0,0,1,.23-.45.53.53,0,0,1,.16-.1h0l.16,0,.16,0h.11v.25h0l0,0a.72.72,0,0,1-.12.21l-.31.16A.87.87,0,0,0,75.53,84.65Z"/>
-                    <path class="cls-20"
-                          d="M73.76,1.79a2.4,2.4,0,0,1,.81.54,8.45,8.45,0,0,1,1.24,1.72l0,0-1.55.31a3.24,3.24,0,0,0-.81-.59,1.72,1.72,0,0,0-.2,0s0-.12,0-.16a.65.65,0,0,1,0-.1Z"/>
-                    <path class="cls-20"
-                          d="M76.53,81.31a3.19,3.19,0,0,1-1.46.16,1.73,1.73,0,0,1-1.28-1,3.51,3.51,0,0,1-.33-1.41,3.64,3.64,0,0,1,.87-2.37,4.52,4.52,0,0,1,1.41-1.12,5.94,5.94,0,0,1,.64-.31,8.11,8.11,0,0,1,1.23-.36,4.63,4.63,0,0,1,.65-.09,1.49,1.49,0,0,1,.52.07A1.16,1.16,0,0,0,79,75h.2l.3-.09.36-.11.2-.05a1.64,1.64,0,0,1,.28-.07,6.38,6.38,0,0,1,1.84.06,2.44,2.44,0,0,1,1,.39,3.33,3.33,0,0,1,.74.71,2.16,2.16,0,0,1,.42,1,1.22,1.22,0,0,1-.4,1.09c-.56.39-.78.47-1,1.32a1.15,1.15,0,0,1-.41.54,1.22,1.22,0,0,1-.28.14.33.33,0,0,1-.15,0,.08.08,0,0,1-.07,0,0,0,0,0,1,0-.05,1.61,1.61,0,0,1,.1-.36.46.46,0,0,0,0-.2c0-.09-.09,0-.06-.39,0-.1,0-.07,0-.08H82l-.15,0-.25.1c-.15,0-.23.06-.24,0s0-.07.17-.18a.94.94,0,0,1,.67-.25c.17.16,0,.37,0,.54s.11,0,.15,0a.62.62,0,0,0,.14-.14.58.58,0,0,0,.13-.38v-.06a.77.77,0,0,1,0-.15.7.7,0,0,1,.08-.16,1.37,1.37,0,0,1,.13-.2,2.12,2.12,0,0,1,.33-.34c.11-.11.26-.21.31-.26.26-.23.14-.68-.2-1.07a1.91,1.91,0,0,0-.57-.49,1.56,1.56,0,0,0-.66-.22,5.82,5.82,0,0,0-1.56,0l-.11,0-.19.08-.37.12L79.4,76a2.24,2.24,0,0,1-1-.08s0,0-.11,0a2.7,2.7,0,0,0-.48.09,7,7,0,0,0-1,.34,4.54,4.54,0,0,0-1.68,1.05,2.66,2.66,0,0,0-.7,1.68,2.58,2.58,0,0,0,.17,1,.87.87,0,0,0,.64.56,3.08,3.08,0,0,0,2.11-.52,4,4,0,0,0,.45-.31l.19-.16s.09-.08.12-.12a.35.35,0,0,0,.11-.27c0-.09-.12-.13-.21-.17a2.16,2.16,0,0,0-.71-.06.75.75,0,0,0-.52.18,1.22,1.22,0,0,0-.22.34c-.06.1-.13.12-.14.11s0-.07,0-.15a1,1,0,0,1,.15-.45,1,1,0,0,1,.66-.37,2.62,2.62,0,0,1,1,0,.68.68,0,0,1,.51.37.75.75,0,0,1-.13.68,2.26,2.26,0,0,1-.23.31l-.23.23a3.88,3.88,0,0,1-.49.4,5.8,5.8,0,0,1-.59.36.79.79,0,0,1-.27-.26s-.17,0-.28.11-.21.21-.19.24A1.52,1.52,0,0,0,76.53,81.31Z"/>
-                    <path class="cls-20"
-                          d="M76.45,121.15c-.7,1-1.47,2-2.29,3.07l-.3.37q.26-.45.51-.93c1-1.81,2-3.64,2.19-3.55S76.6,120.55,76.45,121.15Z"/>
-                    <path class="cls-20"
-                          d="M75.81,4.05a8.45,8.45,0,0,0-1.24-1.72,2.4,2.4,0,0,0-.81-.54L73.63.66C74.74.54,75.92.4,77.14.34A19,19,0,0,1,80.4.43c.29,0,.61.12.9.18L82,.8l1.4.38c.5.14,1,.29,1.49.45l0,.09a16.83,16.83,0,0,0-2.26,1.77c-.15.12-.3.26-.46.41l-.79-.12-.72-.1a3.2,3.2,0,0,0-.56-.06,17.54,17.54,0,0,0-2.62.2c-.55.08-1.09.18-1.63.28Z"/>
-                    <path class="cls-20"
-                          d="M74.79,121a.46.46,0,0,1-.38.23c-.12,0-.16-.06-.16-.08s.23,0,.31-.29.08-.28.13-.46a2,2,0,0,0,.06-.39s0,0,0,0-.13.06-.13.06l-.34.11a7.69,7.69,0,0,0-.74.3,5.65,5.65,0,0,1-1.09.45c-.05-.06.38-.48.88-.81a6.3,6.3,0,0,1,1.1-.6,1.88,1.88,0,0,1,.36-.09c.26-.08.63.08.54.45a5.09,5.09,0,0,1-.23.64A2.45,2.45,0,0,1,74.79,121Z"/>
-                    <path class="cls-20"
-                          d="M74,114.08a7.48,7.48,0,0,1,1.64-1.14l.17-.08h0a.07.07,0,0,0,.06,0l-.06,0h-.44a4.26,4.26,0,0,0-.5,0,8.48,8.48,0,0,0-1.8.54,2.05,2.05,0,0,1-.64.16c-.17,0-.25-.08-.24-.09s.09,0,.23,0a2.43,2.43,0,0,0,.56-.25,6.88,6.88,0,0,1,1.83-.74,2.72,2.72,0,0,1,.55-.06l.59,0c.62,0,1.25,0,1.31.11a.3.3,0,0,1,0,.51,1.51,1.51,0,0,1-.36.17c-.16,0-.32.11-.53.17l-.31.1a.88.88,0,0,0-.2.07,8.51,8.51,0,0,0-1.62,1,1.55,1.55,0,0,1-1.07.39,1.47,1.47,0,0,1-.8-.58,1,1,0,0,1-.32-.6c0-.21.18-.23.17-.21s-.07.08,0,.2a1.16,1.16,0,0,0,.35.46,1.33,1.33,0,0,0,.68.4C73.42,114.51,73.7,114.29,74,114.08Z"/>
-                    <path class="cls-20"
-                          d="M75.57,84.79a6.85,6.85,0,0,1-1.38.5,13.69,13.69,0,0,1-3.6.48A11.15,11.15,0,0,0,73,85.28a23.2,23.2,0,0,1,2.5-.63.22.22,0,0,0,0,.13Z"/>
-                    <path class="cls-20"
-                          d="M70.68,86.78c-.11-.1-.27-.17-.33-.26a0,0,0,0,0,0,0h.16A10.93,10.93,0,0,0,72,86.16v0a.43.43,0,0,0,.09.26,1.42,1.42,0,0,0,.46.37,2.41,2.41,0,0,0,1.77.16,2.86,2.86,0,0,0,1.4-.64c.11-.08.37-.24.46-.32s.23-.22.24-.39v-.15a1.49,1.49,0,0,0-.34-.27,2.14,2.14,0,0,0,.27.06,4.21,4.21,0,0,0,.55.06,4.41,4.41,0,0,0,.63,0,3,3,0,0,1-.94.74c-.66.23-1.11.65-1,1l0,.07a9.92,9.92,0,0,1-1.17.4,4.83,4.83,0,0,1-2.09.07,3.6,3.6,0,0,1-.84-.28A7.18,7.18,0,0,1,70.68,86.78Z"/>
-                    <path class="cls-20"
-                          d="M70.34,86.49c-.06-.11-.39-.27-.39-.36a4,4,0,0,1,1,.06c.59-.31.86-.42.86-.42l.51.19h-.11a.42.42,0,0,0-.15.06c-.06,0-.14.08-.15.13a10.93,10.93,0,0,1-1.46.32Z"/>
-                    <path class="cls-20"
-                          d="M70.24,75.79s-.14,0-.29,0,.2-1,.67-.62.73.86.2.87l-1.21,0s0,0,0,0a2.28,2.28,0,0,1,.49-.11l.54-.07c.13,0,.15,0,.18,0s0-.07,0-.11a2.21,2.21,0,0,0-.34-.32c-.15-.09-.09,0-.13,0A1.22,1.22,0,0,0,70.24,75.79Z"/>
-                    <path class="cls-20"
-                          d="M70,75.77c.15,0,.29,0,.29,0a1.22,1.22,0,0,1,.16-.41s0-.08.13,0a2.21,2.21,0,0,1,.34.32s0,.09,0,.11,0,0-.18,0l-.54.07a2.28,2.28,0,0,0-.49.11Z"/>
-                    <path class="cls-20"
-                          d="M69.65,92.21a3.75,3.75,0,0,1-.27-.61s-.06-.12,0-.14l.16,0,.29-.07a8.45,8.45,0,0,1,1.27-.24l1.07-.19c.32,0,.63-.1.9-.16a3.9,3.9,0,0,0,2.23-1.23,3,3,0,0,0,.32-.5,2.18,2.18,0,0,0,.33-.91s0,0,0-.08h0c.2.51.45,1.19.75,2a5.11,5.11,0,0,1-.48.41,5.81,5.81,0,0,1-2.95,1.06l-1.92.17c-.27,0-.54.07-.84.09l-.22,0c-.07,0-.2,0-.13.09a1.5,1.5,0,0,0,.21.42,2.51,2.51,0,0,0,.65.65,3.8,3.8,0,0,0,.9.46,4.4,4.4,0,0,0,1.82.3A6.79,6.79,0,0,0,76.34,93a7.35,7.35,0,0,0,1.19-.71c.21.53.42,1.09.63,1.65-.38.09-.86.21-1.51.33a11.66,11.66,0,0,1-3,.22,6.32,6.32,0,0,1-2-.55,5.44,5.44,0,0,1-1-.64A3.78,3.78,0,0,1,69.65,92.21Z"/>
-                    <path class="cls-20"
-                          d="M69.65,76.1s0,0,0,0l1.21,0c.53,0,.27-.51-.2-.87s-.67.62-.67.62c-.15,0-.27-.1-.27-.14A1.56,1.56,0,0,1,70,75a.57.57,0,0,1,.39-.2h0a.69.69,0,0,1,.43.19,1.51,1.51,0,0,1,.46.65.36.36,0,0,1-.16.44.7.7,0,0,1-.4.07l-.58,0A4.16,4.16,0,0,1,69.65,76.1Z"/>
-                    <path class="cls-20"
-                          d="M69.39,81a2.72,2.72,0,0,1,.47-.65s0-.14-.14-.25a2.22,2.22,0,0,1,.67.4.6.6,0,0,1-.31,1.12c-.28.09-.62.06-.7-.06A.52.52,0,0,1,69.39,81Z"/>
-                    <path class="cls-20"
-                          d="M69.39,81a.52.52,0,0,0,0,.56c.08.12.42.15.7.06a.6.6,0,0,0,.31-1.12,2.22,2.22,0,0,0-.67-.4c.11.11.17.21.14.25A2.72,2.72,0,0,0,69.39,81Zm-.18.71c-.43-.48.08-1.15.49-1.63a1.33,1.33,0,0,1,1.11.82C71.08,81.64,69.63,82.17,69.21,81.69Z"/>
-                    <path class="cls-20"
-                          d="M69,81.85a1,1,0,0,1-.12-1.09,3.7,3.7,0,0,1,.52-.8c0-.06.16,0,.28.1-.41.48-.92,1.15-.49,1.63s1.87,0,1.6-.81a1.33,1.33,0,0,0-1.11-.82,1.08,1.08,0,0,1,.85.24,1.06,1.06,0,0,1,.45.86,1.13,1.13,0,0,1-.78.83A1.11,1.11,0,0,1,69,81.85Z"/>
-                    <path class="cls-20"
-                          d="M68.75,134,69.86,133s.06.07.18.31c-.2.21-.39.4-.56.56l-.5.45v-.11c0-.11-.06-.09-.1-.1S68.74,134,68.75,134Z"/>
-                    <path class="cls-20"
-                          d="M69.51,59.83a8.28,8.28,0,0,1-1.16.27.31.31,0,0,0,.11-.08c.5-.15.94-.32,1.35-.48Z"/>
-                    <path class="cls-20"
-                          d="M68.39,134.56c-.18-.06,1-1.84,2.06-3.57a25.27,25.27,0,0,0,1.31-2.45c.34-.71.57-1.18.58-1.22s.28-.48.66-1.16c.24-.45.54-1,.84-1.55l0,0,.3-.37c.82-1,1.59-2,2.29-3.07a29.47,29.47,0,0,1-.94,3c-.36,1-.75,2-1.05,2.71s-.54,1.23-.56,1.27-.28.5-.72,1.18a20,20,0,0,1-1.73,2.41c-.48.56-1,1.08-1.41,1.53-.12-.24-.18-.29-.18-.31L68.75,134s.09,0,.13,0,.08,0,.1.1v.11C68.66,134.54,68.43,134.69,68.39,134.56Z"/>
-                    <path class="cls-20"
-                          d="M68.26,97c.83.23,1.67.5,2.3.63a15.22,15.22,0,0,0,1.68.3c.64.08,1.27.13,1.87.16a6.64,6.64,0,0,0,3.08-.43,4.76,4.76,0,0,0,1.73-1.2,1.79,1.79,0,0,0,.14-.18c.16.41.3.81.45,1.21a5.86,5.86,0,0,1-1.91,1.19,7.75,7.75,0,0,1-3.55.4c-.62,0-1.28-.12-1.93-.22l-.33-.07-.29-.08s-.15,0-.14,0l.08.1.24.21.15.12.41.3c.31.21.63.4.93.58a9.26,9.26,0,0,0,3.73,1.21,17.41,17.41,0,0,0,2.88.14,7.14,7.14,0,0,1,1.11,0h0a9.74,9.74,0,0,1-4,.36,9.43,9.43,0,0,1-4-1.08c-.34-.18-.68-.37-1-.58l-.52-.33c-.25-.19-.52-.36-.76-.56A15.47,15.47,0,0,1,69.25,98l-.63-.59-.08-.07,0,0,0-.07Z"/>
-                    <path class="cls-20"
-                          d="M68.18,146c0-.27,0-.67,0-1.23,0-1.07,0-2.71.13-5a45.08,45.08,0,0,1,.6-5,3.52,3.52,0,0,0,0-.49l.5-.45c.17-.16.36-.35.56-.56a1.46,1.46,0,0,1,.09.21,1.3,1.3,0,0,1,0,.79,4.14,4.14,0,0,1-.28.72,12.49,12.49,0,0,0-1.15,4.8,16.26,16.26,0,0,0,.45,5,5.68,5.68,0,0,0,.34,1c-.69.1-1,.23-1.08.16s0,.08.1.1a.83.83,0,0,0,.24,0h0l-.57.11h0v0A.28.28,0,0,0,68.18,146Z"/>
-                    <path class="cls-20"
-                          d="M68,5c.16-1.59.3-2.3.3-2.3L68.46.75c.25,0,.5.06.76.09S70,.9,70.38.92a4.4,4.4,0,0,0,.5,0l.55,0c.69-.06,1.42-.15,2.2-.24l.13,1.13-.43,1.72a.65.65,0,0,0,0,.1s0,.12,0,.16a1.72,1.72,0,0,1,.2,0,3.24,3.24,0,0,1,.81.59c-.77.15-1.55.32-2.35.45-.25,0-.49.08-.77.1s-.56,0-.8.06c-.49,0-.93,0-1.36,0Z"/>
-                    <path class="cls-20"
-                          d="M67.93,60.42a3.83,3.83,0,0,1-1.58,0,10.21,10.21,0,0,0,1.48-.29h0l.48-.08A3.11,3.11,0,0,1,67.93,60.42Z"/>
-                    <path class="cls-20"
-                          d="M66.86,76.33a.3.3,0,0,1-.08.16.12.12,0,0,1-.06.08.53.53,0,0,1-.15.08s0,0,0,0l.31-.31A0,0,0,0,1,66.86,76.33Z"/>
-                    <path class="cls-20"
-                          d="M67.06,10.86c-.13-2.69-.31-4.62-.47-5.91h.07L68,5a83.48,83.48,0,0,0-.31,8.43s-.1-.43-.18-.82C67.36,12,67.21,11.41,67.06,10.86Z"/>
-                    <path class="cls-20"
-                          d="M66.56,76.61c-.09-.32-.17-.64-.26-1a.51.51,0,0,1,.48.85.3.3,0,0,0,.08-.16,0,0,0,0,0,0,0Z"/>
-                    <path class="cls-20" d="M66.72,76.57a.4.4,0,0,1-.27.12l.12,0A.53.53,0,0,0,66.72,76.57Z"/>
-                    <path class="cls-20" d="M66.56,76.61s0,0,0,0H66.5Z"/>
-                    <path class="cls-20" d="M66.59,5a18.9,18.9,0,0,0-.39-2.22l2.08,0s-.14.71-.3,2.3L66.66,5Z"/>
-                    <path class="cls-20"
-                          d="M65.87,76a.33.33,0,0,1,0-.12.55.55,0,0,1,.26-.21l.08,0h0c.09.33.17.65.26,1l-.06,0h.07l-.12,0h0a.52.52,0,0,1-.58-.63S65.87,76,65.87,76Z"/>
-                    <path class="cls-20" d="M66.18,75.69a.55.55,0,0,0-.26.21.46.46,0,0,1,.31-.25h0Z"/>
-                    <path class="cls-20" d="M66.72,83.31a.52.52,0,0,1-.78-.64A10.06,10.06,0,0,0,66.72,83.31Z"/>
-                    <path class="cls-20"
-                          d="M66.08,82.49a.52.52,0,0,1,.74.74l0,0,0,0a10.06,10.06,0,0,1-.78-.64.29.29,0,0,1,.1-.13Z"/>
-                    <path class="cls-20"
-                          d="M65.4,43.65h.51l.52.31a9.26,9.26,0,0,1,3,3.78c.14.26.62,1.22.71,1.41.59,1.31.76,1.72,1.53,3.69,0,.1,0,.19.07.26l0,.38a38.1,38.1,0,0,0-2.58-5.94c0-.08-.1-.18-.14-.26l-.44-.81a.92.92,0,0,0-.21-.26,7.33,7.33,0,0,0-1.52-1.73A10,10,0,0,0,65.4,43.65Z"/>
-                    <path class="cls-20"
-                          d="M66.44,76.69c-.45.18-.71-.31-.57-.67,0,0,0,0,0,0A.52.52,0,0,0,66.44,76.69Z"/>
-                    <path class="cls-20"
-                          d="M78.17,148.65l-.08,0h.08ZM64,129.6c0-.4-.08-.75-.1-1,.59-.05,1.17-.11,1.74-.21,0,.27,0,.64.07,1.09.09,1.09.2,2.65.35,4.55.07,1,.16,2,.25,3.08,0,.48.1,1,.15,1.49.07.24.1.37.14.52l.09.44c.07.3.14.59.2.89L68,146.19h0c.12.52.22,1,.33,1.55L71,149.22l4.31.05a4.19,4.19,0,0,0,1.9-.2,1.77,1.77,0,0,0,.64-.53l.15-.2,0,.06a.45.45,0,0,1,0,.2l0,0,.48.33c.14-.18.07-.64-.24-1a1.09,1.09,0,0,1,.08-.15c.19-.29.36-.58.53-.86l.14-.27a.92.92,0,0,1,.07.13l.53-.23a2,2,0,0,0-.3-.42l-.25-.22a2.13,2.13,0,0,0-.58-1.18,1.26,1.26,0,0,0-1.28-.49,11.13,11.13,0,0,0-1.53.67A16.34,16.34,0,0,1,72.85,146a10.41,10.41,0,0,1-2.4.05c-.64,0-1.14,0-1.49,0h-.17l.38-.07.27-.07h.15v-.11h0a8.47,8.47,0,0,1,.85-.11,12,12,0,0,0,2.29-.19,18.57,18.57,0,0,0,2.73-1.21,9.53,9.53,0,0,1,1.63-.8,1.9,1.9,0,0,1,1.13,0,2.76,2.76,0,0,1,.94.6,3.12,3.12,0,0,1,.93,2,1.25,1.25,0,0,1-.06.7c-.09.22-.16.35-.24.52s-.34.62-.52.92-.36.62-.6.94a2.63,2.63,0,0,1-1,.85,5.13,5.13,0,0,1-2.38.37l-4.6.08c-1.17-.62-2.34-1.22-3.51-1.82-.62-2.73-1.24-5.4-1.8-7.87-.13-.56-.27-1.1-.4-1.63a3.54,3.54,0,0,1-.09-.38l0-.23-.05-.43c0-.3-.07-.58-.1-.86-.12-1.1-.22-2.13-.32-3.08C64.23,132.25,64.07,130.68,64,129.6Z"/>
-                    <path class="cls-20"
-                          d="M65.08,81.93c-.21-.17-.42-.36-.62-.54a20.06,20.06,0,0,1,2.38-1.09c.79-.22,1.33-.17,1.34-.08s-.52.18-1.18.51S65.79,81.46,65.08,81.93Z"/>
-                    <path class="cls-20"
-                          d="M65.52,184.06c.26-.46.61-1.1,1-1.87s.91-1.65,1.36-2.62a10.73,10.73,0,0,0,.59-1.51,10,10,0,0,0,.3-1.64,6.24,6.24,0,0,0-.23-3.18A7.28,7.28,0,0,0,67,170.9a4.85,4.85,0,0,0-1.34-1,3,3,0,0,0,.48-.11,5.48,5.48,0,0,1,1.17.79A7.6,7.6,0,0,1,69.2,173a6.84,6.84,0,0,1,.44,3.53,11.66,11.66,0,0,1-.25,1.79,11.42,11.42,0,0,1-.57,1.65c-.43,1-.9,2-1.31,2.75s-.65,1.25-.88,1.69c-.46.06-.92.12-1.37.16Z"/>
-                    <path class="cls-20"
-                          d="M65.5,185.4c-.31-.12-.48-.37-.4-.56l.16-.29c.45,0,.91-.1,1.37-.16a1,1,0,0,1-.11.21c-.21.45-.35.72-.36.74S65.8,185.52,65.5,185.4Z"/>
-                    <path class="cls-20"
-                          d="M66.63,84.59a25,25,0,0,1-2.31-2.16l.3-.2.46-.3c.29.25.58.51.86.74a.52.52,0,0,0,.78.64c.19.15.36.29.52.4a5.79,5.79,0,0,0,1,.49l.46.14a7.67,7.67,0,0,0,1.64.35A13,13,0,0,0,74,84.48,6.84,6.84,0,0,0,77.24,83c.76-.62,1.11-1.25,1.22-1.15a1.59,1.59,0,0,1-.18.44,4.36,4.36,0,0,1-.72,1,4.84,4.84,0,0,1-1,.82h-.06l-.14,0h0v-.2h-.11l-.16,0L76,84h0a.53.53,0,0,0-.16.1.57.57,0,0,0-.23.45.38.38,0,0,0,0,.1,23.2,23.2,0,0,0-2.5.63,11.15,11.15,0,0,1-2.44.49h-.3a7.71,7.71,0,0,1-1.9-.3A6.55,6.55,0,0,1,66.63,84.59Z"/>
-                    <path class="cls-20"
-                          d="M63.88,128.58c0-.46-.05-.71-.05-.78l1,0,.67,0h.07v.06c0,.06,0,.16,0,.3s0,.1,0,.16C65.05,128.47,64.47,128.53,63.88,128.58Z"/>
-                    <path class="cls-20" d="M63.69,81.79l.52-.27.25-.13c.2.18.41.37.62.54l-.46.3-.3.2-.51-.51Z"/>
-                    <path class="cls-20"
-                          d="M64.6,169.76s.23-.28.79-.21a2.28,2.28,0,0,1,.74.22,3,3,0,0,1-.48.11l-.3-.11A2,2,0,0,0,64.6,169.76Z"/>
-                    <path class="cls-20"
-                          d="M63.13,5.08c-.11-.1-.21-.2-.31-.28l1.67.06a24.05,24.05,0,0,1,2.57,6c0,.8.06,1.67.08,2.62,0-.11-.08-.43-.15-.76A15.4,15.4,0,0,0,63.13,5.08Z"/>
-                    <path class="cls-20" d="M63.69,81.79c-.65-.67-1.28-1.33-1.82-1.92l.61-.21,1.9,1.67.08.06-.25.13Z"/>
-                    <path class="cls-20"
-                          d="M66.24,112.88a3.49,3.49,0,0,1,.5.08h.08a.49.49,0,0,1,.07-.19s.06,0,0-.06a.41.41,0,0,1-.11-.17c-.06-.08,0,0-.09,0a1.18,1.18,0,0,0-.23.14A2.43,2.43,0,0,1,66.24,112.88Zm-2.1.35a1.37,1.37,0,0,1,.92-.82,4.71,4.71,0,0,1,1.2-.06c.32,0,.55,0,.57,0a1,1,0,0,1,.26.09c.07.06.2.13.11.4s-.1.11-.16.15l-.1,0a.33.33,0,0,0-.13.07,2.8,2.8,0,0,1-1.11.51,4.21,4.21,0,0,1-1.66.12S64,113.53,64.14,113.23Zm-.07.5a0,0,0,0,0,0,0v0c.19-.09.88-.24,1.5-.46a2,2,0,0,0,.63-.36,6.28,6.28,0,0,0-1.07-.07c-.62.06-.93.73-1.06.89,0,0,0,0,0,0S64.06,113.72,64.07,113.73Z"/>
-                    <path class="cls-20"
-                          d="M63,60.62q.42,0,.84,0c.34,0,.66,0,1,0l.89,0h.09a.94.94,0,0,1-.1.1c-.62,0-1.24.06-1.88.11a.47.47,0,0,0-.29.14A4.44,4.44,0,0,1,63,60.62Z"/>
-                    <path class="cls-20" d="M62,84l-1.3-.52c.21-.1.54-.3.95-.53.56-.32,1.28-.71,2-1.11l.12.13.51.51Z"/>
-                    <path class="cls-20" d="M63.43,128.62c.09-.52.14-.8.19-.8s.13.28.15.77Z"/>
-                    <path class="cls-20"
-                          d="M64.05,4.16a14.42,14.42,0,0,0-1.33-1.69L62.25,2,62.54.12c.73.07,2.34.24,4.45.49l1.47.14-.18,2-2.08,0A18.9,18.9,0,0,1,66.59,5l-2.1-.09C64.34,4.61,64.2,4.37,64.05,4.16Z"/>
-                    <path class="cls-20"
-                          d="M62,138.48,62,138c.38-2.56.75-5.1,1-7,.16-1,.27-1.82.37-2.38l.34,0c.06,1.62-.15,5.6-.51,9.59l0,.49v.13a1.69,1.69,0,0,1-.12.41h0l0,0h0a0,0,0,0,0,0,0h0s0,0,0,0l-.06-.06h0s0-.05-.06-.06l-.17-.15h0l0,0-.06-.08-.07-.06s0-.05-.06-.06l0,0h0c-.18-.2-.27-.27-.29-.27l0,0,0,.07a.52.52,0,0,0-.06.13v0Z"/>
-                    <path class="cls-20"
-                          d="M61.61,3.92l-.53-.23L62.25,2l.47.5a14.42,14.42,0,0,1,1.33,1.69c.15.21.29.45.44.7L62.82,4.8A6.9,6.9,0,0,0,61.61,3.92Z"/>
-                    <path class="cls-20"
-                          d="M62.48,79.66l-.84-.72c.59-.17,1.23-.33,1.85-.49.44-.1.87-.21,1.31-.29a26.93,26.93,0,0,1,4-.66c.13,0,.2,0,.2,0s-2.67.85-5.32,1.71Z"/>
-                    <path class="cls-20"
-                          d="M66.87,86.43a28.19,28.19,0,0,1-6.09-1.68l.31-.18L62,84a25.73,25.73,0,0,0,5,1.59,17,17,0,0,0,3.43.24h.16a13.69,13.69,0,0,0,3.6-.48,6.85,6.85,0,0,0,1.38-.5l0,0a16.38,16.38,0,0,1-2.39.9c-.36.14-.78.3-1.24.43,0,0,.09-.1.15-.13a.42.42,0,0,1,.15-.06h.11l-.51-.19s-.27.11-.86.42a4,4,0,0,0-1-.06c0,.09.33.25.39.36A16.33,16.33,0,0,1,66.87,86.43Z"/>
-                    <path class="cls-20"
-                          d="M61.57,120a2.13,2.13,0,0,1,.63-1.88,1.82,1.82,0,0,1,1.39-.55l.65.07a4.86,4.86,0,0,1,.92.24c.19.07.42.27.4.49a.84.84,0,0,1-.17.34l-.16.17a5.47,5.47,0,0,1-.75.57,2.38,2.38,0,0,1-1.38.08s.62-.14,1.22-.39a5.2,5.2,0,0,0,.59-.57l.12-.14s0,0,0,0,0,0-.07,0a5.49,5.49,0,0,0-.82-.13l-.61-.11a1.38,1.38,0,0,0-1.06.32A3.64,3.64,0,0,0,61.57,120Z"/>
-                    <path class="cls-20" d="M61.87,79.87l-.64-.68-.1-.12.51-.13.84.72Z"/>
-                    <path class="cls-20" d="M61.13,79.07a11,11,0,0,1-1-1.17c.08-.11.69.33,1.53,1Z"/>
-                    <path class="cls-20" d="M59.48,84.29l.65-.49.33-.21a2.28,2.28,0,0,1,.25-.16L62,84l-.92.62-.31.18Z"/>
-                    <path class="cls-20"
-                          d="M58.7,146.85c.2-.56.51-1.34.85-2.27l1.23-3.13q.33-.85.69-1.74l.38-.91.07-.15s0,0,0,0,.08.21.12.18,0-.2.12-.13h.18l0,0s0,0,.06.06l.07.06.06.08,0,0h0l.17.15s0,0,.06.06h0l.06.06s0,0,0,0h0a0,0,0,0,1,0,0h0c-.1.3-.21.6-.31.89-.2.61-.41,1.21-.6,1.78l-1.06,3.18c-.32.93-.57,1.72-.76,2.28l0,.08c-.33.07-.92.16-.92.18h-.91s0-.09,0-.15,0-.07,0-.1l0-.12v-.06Z"/>
-                    <path class="cls-20"
-                          d="M57.77,123.28c.1.16,0,0,0,0Zm0,.17-.17-.06s0,0,0-.09,0-.08,0-.09,0,0,.08,0l-.09-.14c0-.08-.2-.1-.09-.11a1.14,1.14,0,0,0,.32.05,2.48,2.48,0,0,0,.83-.13s.08,0,.09,0,.08,0,0-.1a1.81,1.81,0,0,0-.49-.21c-.15,0-.26,0-.28,0s.45-.33,1-.08a.66.66,0,0,1,.38.35.42.42,0,0,1-.12.43,1.29,1.29,0,0,1-.45.22,2.33,2.33,0,0,1-.33,0A2.06,2.06,0,0,1,57.8,123.45Z"/>
-                    <path class="cls-20"
-                          d="M58.29,83.89c-1-.33-2-.63-3-.92l0,0,.79-.53L56.8,82h0l1.9.67,2,.78a2.28,2.28,0,0,0-.25.16l-.33.21-.65.49Z"/>
-                    <path class="cls-20"
-                          d="M57.73,87a30.23,30.23,0,0,1-3.2,2.63s0,0,0,0a15.94,15.94,0,0,1,2.65-3.22,28.12,28.12,0,0,1,2.15-2,.61.61,0,0,1,.16-.12l1.3.46c-.2.12-.48.3-.81.53C59.34,85.71,58.52,86.34,57.73,87Z"/>
-                    <path class="cls-20"
-                          d="M56.26,81.07c1-.57,1.65-.87,1.69-.9s.74-.31,1.76-.65l1.42-.45.1.12.64.68c-.66.23-1.27.46-1.78.67-1,.38-1.63.69-1.66.71s-.71.28-1.61.73c-.42-.14-.85-.29-1.28-.42C55.8,81.39,56,81.21,56.26,81.07Z"/>
-                    <path class="cls-20"
-                          d="M55.29,83l-1.17-.33.63-.48c.27-.2.52-.39.75-.58l0,0c.43.13.86.28,1.28.42h0l-.69.43-.79.53Z"/>
-                    <path class="cls-20"
-                          d="M53.34,127.17c.1-.2.16-.37.21-.49.13.21.29.47.45.77C53.78,127.37,53.56,127.27,53.34,127.17Z"/>
-                    <path class="cls-20"
-                          d="M54.49,131.37c-.45-1.55-.93-3.07-1.2-4.07h0a.61.61,0,0,0,.05-.12c.22.1.44.2.66.28.49.9,1.1,2.19,1.65,3.5s1,2.53,1.36,3.53a16,16,0,0,1,.51,1.8,43.79,43.79,0,0,1,.24,5.6c0,2.67-.18,5.29-.46,5.34a.14.14,0,0,0,0-.1c0-.09.2-.45-.19-.36-.17-.88-.38-2.83-.61-4.82-.15-1.34-.31-2.68-.44-3.68-.08-.5-.14-.91-.19-1.2s-.09-.46-.09-.48-.1-.67-.35-1.65S54.86,132.66,54.49,131.37Z"/>
-                    <path class="cls-20" d="M53.24,127.12c-.15-.56-.22-.92-.16-1s.25.16.47.51c0,.12-.11.29-.21.49Z"/>
-                    <path class="cls-20"
-                          d="M52.23.39C53.72.21,55.11.11,56.37.06,58,0,59.45,0,60.47,0l1.66.05.41,0L62.25,2,61.08,3.69l.53.23a6.9,6.9,0,0,1,1.21.88l-1,0L60.2,4.6c-.92-.08-2.24-.19-3.81-.23q-.81,0-1.71,0A14.5,14.5,0,0,0,54.16,3a6.54,6.54,0,0,0-.32-.65,2.34,2.34,0,0,0-.53-.63l-.59-.52L52.27.77Z"/>
-                    <path class="cls-20"
-                          d="M52.45,3.09h0Zm-.84-.35-.51-.25L52.27.77l.45.41.59.52a2.34,2.34,0,0,1,.53.63,6.54,6.54,0,0,1,.32.65,14.5,14.5,0,0,1,.52,1.36c-.46,0-1,0-1.46,0-.15-.28-.3-.54-.44-.75s-.22-.28-.31-.4,0,0-.06,0,0,0,0,0h0l-.1-.06Z"/>
-                    <path class="cls-20" d="M52.46,3.08h0Z"/>
-                    <path class="cls-20"
-                          d="M51.49,153.73c-.18-.27,1.26-1.63,1.42-1.26a4.63,4.63,0,0,0-.51.66c-.34.39-.34.64-.33.66a.82.82,0,0,0,0,.22,1.34,1.34,0,0,0,.16.51,3.65,3.65,0,0,0,.26.44c-.06,0-.08,0-.41,0a2.09,2.09,0,0,1-.2-.22A1.47,1.47,0,0,1,51.49,153.73Z"/>
-                    <path class="cls-20"
-                          d="M53.24,127.12c-.67-.31-1.31-.64-2-1,.15-.38.21-.58.21-.58l2.2.79s-.05.11-.13.33l0,0c-.22-.35-.39-.55-.47-.51S53.09,126.56,53.24,127.12Z"/>
-                    <path class="cls-20"
-                          d="M51.18,111.48c0,.07.06.11,0,.12s-.07,0-.17-.1,0-.13.06-.15a.27.27,0,0,1,.11,0l.26,0c.36,0,.83-.07,1.29-.15a4.86,4.86,0,0,1,1.38-.11,1.63,1.63,0,0,1,.54.12.63.63,0,0,1,.29.16.42.42,0,0,1,0,.57,1.08,1.08,0,0,1-.32.26c-.14.1-.29.23-.47.38a1.63,1.63,0,0,1-.75.34,1.41,1.41,0,0,1-.77-.19l-.56-.26c-.33-.16-.53-.28-.51-.32a1.46,1.46,0,0,1,.59.11l.59.16a1.26,1.26,0,0,0,.6.1c.34-.08.65-.51,1-.74.12-.09,0,0,0-.07h0l-.33-.08a5.8,5.8,0,0,0-1.27,0,8.14,8.14,0,0,1-1.33,0A1.56,1.56,0,0,0,51.18,111.48Z"/>
-                    <path class="cls-20"
-                          d="M50.61,150.38a5.71,5.71,0,0,1,1.39-.6c1.37-.81,2.14-1.37,3.62-2.32l1-.51a2.06,2.06,0,0,1,.5-.18c.06.3.11.46.16.46a20.44,20.44,0,0,1-3.11,2.05s-3.43,1.4-3.57,1.11Z"/>
-                    <path class="cls-20"
-                          d="M50.53,169.76s.29,0,.67.26a.71.71,0,0,0,.14.1l-.31-.05-.18-.06C50.67,169.87,50.53,169.8,50.53,169.76Z"/>
-                    <path class="cls-20"
-                          d="M50,152.84a2.91,2.91,0,0,0-.4.72s-.06.09-.12.22a1.81,1.81,0,0,0-.13.51.86.86,0,0,0,0,.28h0c-.06,0-.13,0-.17,0l-.22-.28a1.76,1.76,0,0,1,.15-.93,1.21,1.21,0,0,1,.17-.27,2.32,2.32,0,0,1,.46-.49c.38-.31.85-.44.87-.36S50.2,152.51,50,152.84Z"/>
-                    <path class="cls-20"
-                          d="M48.81,87c-.11-.14,2.08-1.88,4.3-3.61.34-.26.68-.52,1-.79l1.17.33-1.7,1.13A37.14,37.14,0,0,1,48.81,87Z"/>
-                    <path class="cls-20"
-                          d="M48.28,122.72l.27-.45a.33.33,0,0,0,.31.06l.42.34h0a.77.77,0,0,1-.5.18A1.06,1.06,0,0,1,48.28,122.72Z"/>
-                    <path class="cls-20"
-                          d="M48.48,155.34l-1-1.52v-.41c0-.07,0-.21,0-.29s.06-.38.1-.55a4.7,4.7,0,0,1,.33-1,2.42,2.42,0,0,1,1.21-1.28,2.75,2.75,0,0,1,1.44.07h0a1.69,1.69,0,0,0-1.24.33,1.94,1.94,0,0,0-.8,1.12,5.19,5.19,0,0,0-.19.86c0,.16,0,.33,0,.48a1.93,1.93,0,0,0,0,.23v.15c.17.21.34.44.52.68a.25.25,0,0,0,0,.08c.09.54.49.86.54.8s-.07-.28-.11-.55l.32.05.8.12,1.63.22c.26.25.53.39.58.34s-.07-.16-.17-.34h0l0,0,.16-.14.32-.28,2.47-2.11,2-1.66c.53-1.69.88-2.83.9-2.9a1.07,1.07,0,0,0,.09-.24l0-.06c0,.06,0,.1,0,.15H60l.2,0v.07h0v0h0l0,.14,0,.07-.09.32-.32.91c-.21.59-.52,1.43-.88,2.42l-5,3.82-.77.6a.42.42,0,0,1-.14.09h0l-.15.05h-.13l-.23,0a3,3,0,0,1-.52-.08c-.58-.1-1.12-.21-1.66-.33l-.8-.17-.41-.1-.3-.06C48.63,155.46,48.52,155.46,48.48,155.34Z"/>
-                    <path class="cls-20"
-                          d="M48,183.49c-.42-.07-.83-.16-1.24-.24a20.78,20.78,0,0,1,1.6-1.95,15.4,15.4,0,0,0,3-4.4,9.37,9.37,0,0,0,.5-5.22A3.13,3.13,0,0,0,50.85,170l.18.06.31.05a3.17,3.17,0,0,1,1,1.41,9.19,9.19,0,0,1-.14,5.64,16,16,0,0,1-3,4.84c-.49.59-.89,1.07-1.14,1.43Z"/>
-                    <path class="cls-20"
-                          d="M42.77,77c1.56-.55,3.1-1,4.33-1.32,1.42-.37,2.42-.51,2.47-.53s1-.15,2.5-.25a34.31,34.31,0,0,1,5.28.12,31.69,31.69,0,0,1,4,.66l1.11.28a7,7,0,0,1,2.2.86s0,0,0,0c-.2,0-1-.21-2.25-.42a39.33,39.33,0,0,0-5.09-.56,37.88,37.88,0,0,0-5.13.12c-1.42.16-2.36.32-2.42.34s-1,.11-2.4.42c-1,.2-2.14.49-3.38.83Z"/>
-                    <path class="cls-20"
-                          d="M47.29,120.89c.32-.22.39-.39.39-.44l-.11-.34.37,0c.49,0,1.31,0,1.48,0a.3.3,0,0,1,.33.21,2.78,2.78,0,0,1-.46,2.31h0l-.42-.34.07,0a2.32,2.32,0,0,0,.37-1.61c-.3,0-.83,0-1.15,0a1.23,1.23,0,0,1-.47.58C47.54,121.14,47.42,121,47.29,120.89Z"/>
-                    <path class="cls-20" d="M47.68,121.25l-.16.12-.29-.44.06,0C47.42,121,47.54,121.14,47.68,121.25Z"/>
-                    <path class="cls-20"
-                          d="M46.68,183.39a.61.61,0,0,1,.09-.14c.41.08.82.17,1.24.24a4.48,4.48,0,0,0-.33.51c-.08.12-.37.09-.65-.05S46.58,183.55,46.68,183.39Z"/>
-                    <path class="cls-20"
-                          d="M45.75,54.59a3.69,3.69,0,0,1,.1-.52c.06-.32.14-.65.22-1a17.85,17.85,0,0,1,.68-1.85A20.47,20.47,0,0,1,51.32,45a22.42,22.42,0,0,1,3-2.43,11.94,11.94,0,0,1,3.45-1.7,8.61,8.61,0,0,1,3.77-.18,13.25,13.25,0,0,1,3.33,1.06,17.94,17.94,0,0,1,2.88,1.56,9.34,9.34,0,0,1,2.06,2.29,18.76,18.76,0,0,1,2,4.48,30.55,30.55,0,0,1,1.06,4.49c.16,1,0,3.18-.33,3.46,0,0,0-1.33,0-1.35a26.13,26.13,0,0,0-.85-3.15l0-.38c0-.07,0-.16-.07-.26-.77-2-.94-2.38-1.53-3.69C70,49,69.53,48,69.39,47.74a9.26,9.26,0,0,0-3-3.78l-.52-.31H65.4l-1.16-.58a8.79,8.79,0,0,0-6.13-.88,15,15,0,0,0-5.89,3.71,18.77,18.77,0,0,0-4.41,5.83,12,12,0,0,0-.65,1.69c-.09.3-.17.58-.23.87l-.09.41,0,.17.49.39c.25.19.48.39.73.57l1.51,1.06,0,0a16.62,16.62,0,0,0,4.29,1.93A38.88,38.88,0,0,0,58.27,60a26.28,26.28,0,0,0,4.74.64,4.44,4.44,0,0,0,.53.28.47.47,0,0,1,.29-.14c.64,0,1.26-.09,1.88-.11a.94.94,0,0,0,.1-.1H66a.07.07,0,0,0,.06,0l.25,0a3.83,3.83,0,0,0,1.58,0,3.11,3.11,0,0,0,.42-.32,8.28,8.28,0,0,0,1.16-.27l.3-.29c.42-.17.79-.36,1.1-.52a16.91,16.91,0,0,0,1.64-1s-.41.59-1.5,1.28a13.51,13.51,0,0,1-5,1.81,22.79,22.79,0,0,1-7.88-.32,38.74,38.74,0,0,1-4.51-1,16.81,16.81,0,0,1-4.65-2h0l-1.52-1c-.26-.18-.51-.39-.76-.57l-.38-.28c-.21-.16-.4-.32-.59-.48C45.7,55.1,45.73,54.84,45.75,54.59Z"/>
-                    <path class="cls-20"
-                          d="M45.62,84a10.15,10.15,0,0,0-.86-1.49l.94-1.83a1.49,1.49,0,0,1,.37.34,2,2,0,0,1,.3.61c.05.17.1.34.15.55C46.27,82.65,46,83.25,45.62,84Z"/>
-                    <path class="cls-20"
-                          d="M45.47,121.49a1.41,1.41,0,0,0,.21-1.08,14.74,14.74,0,0,1-.82-2.51l.24-.12a12.1,12.1,0,0,0,1.95,2.87l.24.24-.06,0,.29.44.16-.12c.37.38.78.73,1.18,1.08a.33.33,0,0,1-.31-.06l-.27.45a1.06,1.06,0,0,0,.5.14.77.77,0,0,0,.5-.18c.35.28.71.56,1.08.83a18,18,0,0,0,7.75,3.56,26.28,26.28,0,0,0,4.27.21,28.74,28.74,0,0,0,4.18-.38c2.68-.48,5.25-1.42,6.73-3.39a48.15,48.15,0,0,0,4.28-5.82,27.38,27.38,0,0,0,4-10c.4-2.58.23-4.1.35-4.1A4.29,4.29,0,0,1,82,104.7c0,.15,0,.29,0,.46a8,8,0,0,1,0,.85,11.49,11.49,0,0,1-.1,1.78c0,.34-.08.71-.14,1.09-.16,0-.26,0-.26,0s.08.07.24.09a28,28,0,0,1-3.47,9.16c-.57,1-1.2,2-1.9,3,.15-.6.2-1,.11-1s-1.2,1.74-2.19,3.55q-.25.48-.51.93l0,0a8.74,8.74,0,0,1-2.94,2.25,16.65,16.65,0,0,1-4.1,1.32c-.39.07-.78.14-1.18.19,0-.06,0-.11,0-.16s0-.24,0-.3v-.06h-.07l-.67,0-1,0c0,.07,0,.32.05.78h-.11c0-.49-.07-.76-.15-.77s-.1.28-.19.8l-1,.06a25.65,25.65,0,0,1-4.53-.14A16.17,16.17,0,0,1,54,127.45c-.16-.3-.32-.56-.45-.77l0,0c.08-.22.13-.33.13-.33l-2.2-.79s-.06.2-.21.58c-.65-.4-1.29-.81-1.91-1.26a32.59,32.59,0,0,1-3.57-3Z"/>
-                    <path class="cls-20" d="M45,80l.2-.41,2.1,1-.12.25c-.49-.17-.84-.32-1.26-.49Z"/>
-                    <path class="cls-20"
-                          d="M43.87,125.14a3.21,3.21,0,0,1-.52-.56s0-.08-.08-.21,0,0,0,0a13.92,13.92,0,0,0,1.66-1.89c0,.07,0,.14,0,.21a1.18,1.18,0,0,0,.44.79.84.84,0,0,0,.05.24l.5.81c.36.61.8,1.14.71,1.44s-1,.22-1.78-.18A5.86,5.86,0,0,1,43.87,125.14Z"/>
-                    <path class="cls-20"
-                          d="M44,119.44c.72-1.2.79-1.73.89-1.54a14.74,14.74,0,0,0,.82,2.51,1.41,1.41,0,0,1-.21,1.08A12.81,12.81,0,0,1,44,119.44Z"/>
-                    <path class="cls-20"
-                          d="M49,7.76a21.12,21.12,0,0,0-4.58-1.49c-.35-.07-.67-.12-1-.16L44,5.89l.72-.28.66-.23.19-.06A32,32,0,0,1,49.22,7,24.14,24.14,0,0,1,52.1,8.82L53.66,10l.81.61.63.5.27.22a11.09,11.09,0,0,1,1,.95c.19.28,0-.08,0-.23l-.17-.46A4.73,4.73,0,0,0,56,11c-.4-1.15-1.15-3.13-1.7-4.39a24.76,24.76,0,0,0-1.09-2.27c.51,0,1,0,1.46,0,.21.59.42,1.26.66,2,.47,1.55,1,3.42,1.69,5.64a1.7,1.7,0,0,0,0,.53,4,4,0,0,0,0,.47c0,.14.13.48-.06.2a4.2,4.2,0,0,0-1.31-.93l-.46-.4c-.35-.3-.68-.57-1-.82l-.81-.61c-.52-.38-1-.73-1.52-1.07A20.44,20.44,0,0,0,49,7.76Z"/>
-                    <path class="cls-20"
-                          d="M43.52,79.33l-2.27-1c.35-.13.73-.24,1.09-.35.54-.16,1.09-.32,1.63-.46l.27.12,2.35,1.06,1.15.49c.33.12.79.24,1.19.36,2.23.63,4.46,1.27,6.61,2l0,0c-.23.19-.48.38-.75.58l-.63.48c-1.83-.5-3.71-1-5.61-1.46-.44-.1-.83-.19-1.32-.35h0l.12-.25-2.1-1L45,80Z"/>
-                    <path class="cls-20"
-                          d="M44.2,115.07a2.42,2.42,0,0,1-.37-.19c-.09-.25-.19-.5-.27-.75l.1.07a2.67,2.67,0,0,0,.74.33.89.89,0,0,1,.32.19.85.85,0,0,1,.3.74.66.66,0,0,1-.48.55.59.59,0,0,1-.25,0s0,0,0-.08.42-.27.36-.51a.42.42,0,0,0-.23-.29A.6.6,0,0,0,44.2,115.07Z"/>
-                    <path class="cls-20"
-                          d="M43.15,123.84a2.73,2.73,0,0,1,.18-1.43c.34-.91,1.08-1.48,1.34-1.26s.17.75.25,1.29a13.92,13.92,0,0,1-1.66,1.89A2.25,2.25,0,0,1,43.15,123.84Z"/>
-                    <path class="cls-20"
-                          d="M42.38,91.23c.18-.56.37-1.11.56-1.61a5.47,5.47,0,0,0,1.28.7,8.22,8.22,0,0,0,3.2.35l1.08-.07.9-.08c.31,0,.64-.08,1-.14l.52-.09c.16,0,0,0-.1-.06l-.24-.09-.17-.08a5.4,5.4,0,0,1-.92-.5,3.37,3.37,0,0,1-.38-.28c-.18-.13-.33-.27-.49-.41A8.05,8.05,0,0,1,47.17,87c-.7-1.22-1.14-2.24-1.53-3,0,0,0,0,0,0,.35-.72.65-1.32.9-1.82.09.36.19.8.31,1.33a20.55,20.55,0,0,0,1,3.09,6.06,6.06,0,0,0,.41.8,5.59,5.59,0,0,0,.74,1c.15.13.29.29.44.41a5.31,5.31,0,0,0,.67.5,7,7,0,0,0,1.42.76l.31.13s.28.15.29.19.22.07.27.1.21.06,0,.09l-.84.17L49.92,91l-1.44.25-1.11.15a12.18,12.18,0,0,1-3.54.14A8.93,8.93,0,0,1,42.38,91.23Z"/>
-                    <path class="cls-20"
-                          d="M43.56,114.13c.08.25.18.5.27.75a1.37,1.37,0,0,1-.44-.36c-.15-.17-.28-.34-.38-.43s-.21-.09-.22-.14.11-.12.31-.06A1.84,1.84,0,0,1,43.56,114.13Z"/>
-                    <path class="cls-20"
-                          d="M42.38,91.23a5.36,5.36,0,0,1-1.31-.61l1.45-1.49a1.49,1.49,0,0,0,.42.49C42.75,90.12,42.56,90.67,42.38,91.23Z"/>
-                    <path class="cls-20"
-                          d="M40.29,77.94c.58-.25,1.18-.48,1.79-.7l.68-.24h0l1.2.56c-.54.14-1.09.3-1.63.46-.36.11-.74.22-1.09.35C40.93,78.22,40.61,78.07,40.29,77.94Z"/>
-                    <path class="cls-20"
-                          d="M41.24,124.78l-.79-.87-.05,0c.09-.11.2-.22.3-.33.53-.51.85-.8.91-.87A21.51,21.51,0,0,0,44,119.44a12.81,12.81,0,0,0,1.5,2,5.81,5.81,0,0,1-.55,1c-.08-.54,0-1.14-.25-1.29s-1,.35-1.34,1.26a2.73,2.73,0,0,0-.18,1.43,2.25,2.25,0,0,0,.11.49l0,0-1.16,1.09a2.93,2.93,0,0,1-.63-.46A1.81,1.81,0,0,1,41.24,124.78Z"/>
-                    <path class="cls-20"
-                          d="M42,4.12l-.83-.24,0,0c.47-.28.94-.55,1.42-.81l.74-.38.81-.39A27.8,27.8,0,0,1,50.67.59c.53-.08,1-.15,1.56-.2l0,.38L51.1,2.49l.51.25.66.35.1.06h0s0,0,0,0,0,0,.06,0,.2.24.31.4.29.47.44.75c-.69,0-1.4,0-2.12.08a28,28,0,0,0-5.55.88c-.31-.13-.6-.23-.88-.33C43.46,4.56,42.59,4.29,42,4.12Z"/>
-                    <path class="cls-20"
-                          d="M41.31,103.24h.19a19.25,19.25,0,0,0,2.18-.21,12.53,12.53,0,0,0,3.66-1.15,29.93,29.93,0,0,0,4.39-3l1-.8-.05-.06-.62.13-1,.25c-.41,0-.75.1-1.14.13l-1.44.11a22.81,22.81,0,0,1-2.59,0A13.06,13.06,0,0,1,42.1,98c-.33-.12-.63-.25-.9-.37a16.73,16.73,0,0,1,.21-1.9,6,6,0,0,0,1.2.93,9.32,9.32,0,0,0,3.29,1.16,15.54,15.54,0,0,0,2.49.17l1.46,0c.6,0,1.35-.09,2.06-.16a12.72,12.72,0,0,0,1.69-.12l0,0c-.42.44-1,1-1,1-.56.47-.85.86-1.4,1.29s-.9.73-1.32,1.06a24.53,24.53,0,0,1-2.28,1.62,18.1,18.1,0,0,1-3.74,1.7c-1,.34-1.69.55-2.15.69l-.23.07C41.45,104.51,41.36,103.87,41.31,103.24Z"/>
-                    <path class="cls-20"
-                          d="M39.89,127.52l2.18-2.07.06,0,.06,0a.85.85,0,0,0-.1.13,2.41,2.41,0,0,0-.28.54,1.32,1.32,0,0,0,.23,1.46,4.93,4.93,0,0,0,.45.42l.52.42c.33.27.65.51.93.7.57.41,1,.63,1,.77s-.57.24-1.32.07a8.43,8.43,0,0,1-1.23-.41l-.66-.3a4.22,4.22,0,0,1-.71-.41A3,3,0,0,1,39.89,127.52Z"/>
-                    <path class="cls-20"
-                          d="M40.94,5.94l.21-2,0,0,.83.24c.58.17,1.45.44,2.66.87.28.1.57.2.88.33l-.19.06-.66.23L44,5.89l-.49.22a12.64,12.64,0,0,0-1.73-.17,4.65,4.65,0,0,0-.63,0Z"/>
-                    <path class="cls-20"
-                          d="M40.65,89.47c.1-.33.23-.66.34-1,.64-.29,1.08-.41,1.12-.32S41.55,88.76,40.65,89.47Z"/>
-                    <path class="cls-20"
-                          d="M41.2,97.59a7,7,0,0,1-1.83-1.13L41,95.12a1.8,1.8,0,0,0,.45.57A16.73,16.73,0,0,0,41.2,97.59Z"/>
-                    <path class="cls-20"
-                          d="M41.53,105.16l-.47.13-.23-2.07.16,0h.32C41.36,103.87,41.45,104.51,41.53,105.16Z"/>
-                    <path class="cls-20"
-                          d="M40,108.29c-.08-.47-.17-.93-.26-1.38a.19.19,0,0,0,0-.13s0,0,0-.07a2.11,2.11,0,0,0,.25-.14l.07,0h0l.09,0h0l0,0,.07,0,0,0,.07,0,.24-.11a0,0,0,0,1,0,0l.21-.1v0l0,.08,0,.11a1.75,1.75,0,0,1,.05.4,1.63,1.63,0,0,1-.17.8A1.86,1.86,0,0,1,40,108.29Z"/>
-                    <path class="cls-20"
-                          d="M43.15,117.94a38.44,38.44,0,0,1-2.85-8.45c-.09-.4-.17-.81-.26-1.2a1.86,1.86,0,0,0,.85-.76,1.63,1.63,0,0,0,.17-.8,1.75,1.75,0,0,0-.05-.4l0-.11,0-.08v0h0s0,0,0,.06v-.09s0,0,0,0h0l-.06-.88c0-.67-.1-1.32-.14-2h.07l.23,2.07.47-.13c.18,1.29.41,2.6.68,3.92a42.89,42.89,0,0,0,1.35,5,1.84,1.84,0,0,0-.46-.24c-.2-.06-.33,0-.31.06s.11,0,.22.14.23.26.38.43a1.37,1.37,0,0,0,.44.36c.12.36.27.72.42,1.07,0,0,0,0,0,0a.09.09,0,0,0,.07,0c.14.38.31.75.48,1.12.11.2.21.42.33.63l-.24.12c-.1-.19-.17.34-.89,1.54C43.67,118.94,43.4,118.45,43.15,117.94Z"/>
-                    <path class="cls-20"
-                          d="M39.82,127.31a3.48,3.48,0,0,1-.1-1.7,5.9,5.9,0,0,1,.33-1.08c.07-.13.12-.22.15-.29l0,0,.07-.1a1.84,1.84,0,0,1,.15-.18l.79.87a1.81,1.81,0,0,0,.2.21,2.93,2.93,0,0,0,.63.46l-2.18,2.07A1.29,1.29,0,0,1,39.82,127.31Z"/>
-                    <path class="cls-20"
-                          d="M39.3,95.24c.06-.5.14-1,.22-1.48.06-.28.11-.56.17-.84h0a1.06,1.06,0,0,0,.17-.1l1,1.44Z"/>
-                    <path class="cls-20"
-                          d="M39.11,97.28c0-.7.1-1.37.19-2l1.56-1-1-1.44a1.06,1.06,0,0,1-.17.1,26.37,26.37,0,0,1,1-3.44c.9-.71,1.52-1.19,1.46-1.29s-.48,0-1.12.32c.11-.3.23-.59.35-.87.79-1.78,1.49-3.13,2.06-4.35L45,80l.92.38c.42.17.77.32,1.26.49-.13.25-.35.7-.66,1.32-.05-.21-.1-.38-.15-.55a2,2,0,0,0-.3-.61,1.49,1.49,0,0,0-.37-.34l-.94,1.83A10.15,10.15,0,0,1,45.62,84a3.18,3.18,0,0,0-.16.32c-.56,1.17-1.34,2.65-2.07,4.22-.15.36-.31.72-.45,1.11a1.49,1.49,0,0,1-.42-.49l-1.45,1.49a5.36,5.36,0,0,0,1.31.61,25.6,25.6,0,0,0-.73,2.93q-.15.75-.24,1.53a1.8,1.8,0,0,1-.45-.57l-1.59,1.34a7,7,0,0,0,1.83,1.13,25,25,0,0,0-.05,3.58c0,.67.09,1.37.16,2.07H41l-.16,0h-.07v0c-.09-1.39-.18-2.74-.26-4l-.41-.52-.25-.34-.48-.66A4,4,0,0,1,39.11,97.28Z"/>
-                    <path class="cls-20"
-                          d="M39.06,100a20.88,20.88,0,0,1,0-2.75,4,4,0,0,0,.25.37l.48.66.25.34.41.52c.08,1.28.17,2.63.26,4v0c0,.65.1,1.3.14,2l.06.88h0l0,0-.21.11a0,0,0,0,0,0,0l-.24.11-.07,0,0,0-.07,0,0,0h0l-.09,0h0l-.07,0-.25.09h0a2.05,2.05,0,0,1-.07-.31,0,0,0,0,1,0,0l-.12-1c0-.16,0-.34-.06-.51l-.15-1.48C39.26,102.17,39.15,101.07,39.06,100Z"/>
-                    <path class="cls-20" d="M38.91,142.59a1.51,1.51,0,0,1,.46-.07s-.23.16-.63.29Z"/>
-                    <path class="cls-20"
-                          d="M37.43,179.76c-.43-.25-.85-.51-1.26-.79a1.54,1.54,0,0,1,.28-.09c.44-.13,1.07-.32,1.8-.58a17.21,17.21,0,0,0,5-2.58A6.53,6.53,0,0,0,45.6,171a14.52,14.52,0,0,0-.07-2.48l.11,0A6.9,6.9,0,0,1,46,171a7.68,7.68,0,0,1-.45,2.71,6.64,6.64,0,0,1-1.83,2.65,17.62,17.62,0,0,1-5.13,3Z"/>
-                    <path class="cls-20" d="M38.47,103.56a1,1,0,0,0-.16-.12s0,0,0,0,.07,0,.13.07h0v.07Z"/>
-                    <path class="cls-20"
-                          d="M38.47,103.57v.05l.06,0s.06,0,.06,0a0,0,0,0,1,0,0,1.54,1.54,0,0,0,.19.17.28.28,0,0,1-.17.09c-.29-.06-.23-.16-.28-.22a.56.56,0,0,1,0-.15.28.28,0,0,1,0-.13,1,1,0,0,1,.16.12Z"/>
-                    <path class="cls-20"
-                          d="M36.74,96.41a1.67,1.67,0,0,1-.12-1.21c.12-.36.53-.56.87-.8.16-.12.32-.22.46-.31l1.74-1.17c-.06.28-.11.56-.17.84-.08.48-.16,1-.22,1.48l-.49.31c-.16.1-.31.2-.49.3h0s0,0,0,0l.09.21.16.28c.16.29.35.59.56.9a20.88,20.88,0,0,0,0,2.75c0-.09,0-.17,0-.27l0,0-.12-.14-.27-.35-.52-.68c-.34-.46-.66-.9-.94-1.37L37,96.86A3.16,3.16,0,0,1,36.74,96.41Z"/>
-                    <path class="cls-20"
-                          d="M37.77,132.51A5.53,5.53,0,0,1,36.25,131c.56-.55,1.1-1.06,1.61-1.55,0,.07,0,.13,0,.19a4.72,4.72,0,0,0,1,1.64c1,1.15,2.48,1.91,2.36,2.23S39.36,133.6,37.77,132.51Z"/>
-                    <path class="cls-20"
-                          d="M41.25,78.37a29.72,29.72,0,0,0-3.7,1.43,14.77,14.77,0,0,0-2,1.18c-.09-.08.54-.85,1.78-1.57a22.66,22.66,0,0,1,3-1.47C40.61,78.07,40.93,78.22,41.25,78.37Z"/>
-                    <path class="cls-20"
-                          d="M37.76,146c-1.55,2.25-2,4.08-2.18,4a6.41,6.41,0,0,1,.68-3,1.72,1.72,0,0,0,.54-.28s-.17,0-.46.09a13.37,13.37,0,0,1,.64-1.34,17.81,17.81,0,0,1,1.76-2.68c.4-.13.63-.24.63-.29a1.51,1.51,0,0,0-.46.07c1.32-1.7,3-3.45,4.54-5.16,1.26-1.36,2.4-2.77,3.46-4.15a45.12,45.12,0,0,0,2.68-3.8,24,24,0,0,0,1.49-2.84c.08-.2.15-.39.21-.53.64.37,1.28.7,2,1,0,0,0,.11,0,.17h0c0,.09-.08.18-.13.27a22.54,22.54,0,0,1-1.76,3.07,41.59,41.59,0,0,1-3,3.87c-1.13,1.33-2.41,2.76-3.76,4.06C42,141.17,39.26,143.68,37.76,146Z"/>
-                    <path class="cls-20"
-                          d="M36.8,146.74a1.72,1.72,0,0,1-.54.28,1.08,1.08,0,0,1,.08-.19C36.63,146.76,36.79,146.71,36.8,146.74Z"/>
-                    <path class="cls-20"
-                          d="M36,130.39c-.19-.33-.31-.62-.39-.79l.13,0,.29-.15.23-.12,1.37-.75a1.74,1.74,0,0,1,.16.46c0,.13.07.28.11.44-.51.49-1,1-1.61,1.55a.25.25,0,0,1,0-.07l0,0A3.61,3.61,0,0,1,36,130.39Z"/>
-                    <path class="cls-20" d="M36,159.34a2.4,2.4,0,0,1,.31-.59,2.56,2.56,0,0,1-.21.78Z"/>
-                    <path class="cls-20" d="M36,103.59s.09-.11.24-.25l.4-.14,0,.06C36.21,103.6,36,103.6,36,103.59Z"/>
-                    <path class="cls-20"
-                          d="M35.58,179.75a.31.31,0,0,1,0-.43.26.26,0,0,1,.17-.23l.45-.12h0c.41.28.83.54,1.26.79l-.65.21-.74.24c-.07,0-.15,0-.24-.11S35.71,179.85,35.58,179.75Z"/>
-                    <path class="cls-20"
-                          d="M35.47,129.45c1.63-1.87,3.26-3.76,4.93-5.58l.05,0a1.84,1.84,0,0,0-.15.18l-.07.1,0,0c0,.07-.08.16-.15.29a5.9,5.9,0,0,0-.33,1.08,3.48,3.48,0,0,0,.1,1.7,1.29,1.29,0,0,0,.07.21l-.75.71c-.41.38-.83.79-1.28,1.2,0-.16-.07-.31-.11-.44a1.74,1.74,0,0,0-.16-.46l-1.37.75-.23.12-.29.15-.13,0,0-.09h0Z"/>
-                    <path class="cls-20"
-                          d="M35.12,104.64a.68.68,0,0,1,0-.6,1.84,1.84,0,0,1,1-.67l.09,0c-.15.14-.27.22-.24.25s.25,0,.61-.33l0-.06a2.41,2.41,0,0,1,.72-.12,1.86,1.86,0,0,1,1,.36.28.28,0,0,0,0,.13.56.56,0,0,0,0,.15c0,.06,0,.16.28.22a.28.28,0,0,0,.17-.09,2.86,2.86,0,0,1,.43.42.78.78,0,0,1,.2.41.49.49,0,0,1,0,.12.56.56,0,0,1,0,.2c0,.18-.12.25-.14.25s.21-.45-.21-.83c-.2-.19-.49-.37-.78-.59a1.5,1.5,0,0,0-1-.34,3,3,0,0,0-1,.32c-.32.15-.62.32-.67.46s0,.25.12.37a.9.9,0,0,0,.17.15s0,.17-.1.31-.21.19-.27.15a1.89,1.89,0,0,1-.24-.25A1,1,0,0,1,35.12,104.64Z"/>
-                    <path class="cls-20"
-                          d="M35.85,159a11.34,11.34,0,0,1-.91-3.46.81.81,0,0,1,0-.16c.22-.13.31-.22.29-.25a1.84,1.84,0,0,0-.3.12,9.26,9.26,0,0,1,.65-4.7h0a26.19,26.19,0,0,0,.18,4.87,11,11,0,0,0,1.07,3.12c.43.76.8,1.31.82,1.34s.36.58.83,1.39,1.17,1.84,1.92,2.82a17.59,17.59,0,0,0,2.23,2.48c.68.6,1.22.93,1.18,1s0,0,0,0a4.13,4.13,0,0,1-1.41-.65,14.18,14.18,0,0,1-2.61-2.33,30,30,0,0,1-2.16-2.75c-.56-.78-.91-1.33-.94-1.36s-.22-.37-.53-1a2.56,2.56,0,0,0,.21-.78,2.4,2.4,0,0,0-.31.59C36,159.23,35.92,159.12,35.85,159Z"/>
-                    <path class="cls-20"
-                          d="M35.57,129.6c.08.17.2.46.39.79a3.61,3.61,0,0,0,.29.48l0,0a2.59,2.59,0,0,1-.25-.4c-.19-.34-.31-.63-.39-.79l0-.1h0Z"/>
-                    <path class="cls-20" d="M35.52,129.6l-.11-.09.05-.06h0l.05,0h0l0,.09h0Z"/>
-                    <path class="cls-20"
-                          d="M34.92,155.24a1.84,1.84,0,0,1,.3-.12s-.07.12-.29.25A.3.3,0,0,1,34.92,155.24Z"/>
-                    <path class="cls-20"
-                          d="M34.05,97a5.89,5.89,0,0,1-.79-1.26,3.51,3.51,0,0,1-.23-.61A1.54,1.54,0,0,1,33,94.7a1.43,1.43,0,0,1,.44-1.19l.26-.24.23-.19.51-.42c.37-.3.78-.61,1.21-.92.89-.64,1.88-1.29,2.81-1.86A21.35,21.35,0,0,1,41,88.5c-.11.31-.24.64-.34,1-.48.36-1,.8-1.62,1.28-.85.67-1.73,1.41-2.52,2.11-.39.35-.75.69-1.07,1-.17.15-.31.3-.45.43l-.2.2c0,.06-.14.15-.11.14s0,0,0,.1a3.3,3.3,0,0,0,.12.37,4.77,4.77,0,0,0,.47.93c.45.7,1.65,1.51,2.55,2.72a5.58,5.58,0,0,1,.94,2,8.36,8.36,0,0,1,.18,1.81c0,.26,0,.5,0,.73s0,.2-.05.31a.58.58,0,0,1,0,.16.31.31,0,0,1,0,.1h0a1.54,1.54,0,0,1-.19-.17h0l0-.06h0l-.06,0-.1-.08a1.77,1.77,0,0,0,0-.21l-.13-.67a5.87,5.87,0,0,0-1.41-3.09C36.07,98.62,34.87,98,34.05,97Z"/>
-                    <path class="cls-20"
-                          d="M34.27,136.13a5.49,5.49,0,0,1-1.55-1.42c.56-.62,1.1-1.21,1.62-1.76,0,.12.08.31.16.55a4.51,4.51,0,0,0,.78,1.32,6.28,6.28,0,0,0,1.31,1c.41.24.69.29.76.43s-.32.47-.94.45A4.35,4.35,0,0,1,34.27,136.13Z"/>
-                    <path class="cls-20"
-                          d="M33.77,9.84l.51-.56A27.81,27.81,0,0,1,38.55,5.6c.81-.59,1.68-1.16,2.6-1.7l-.21,2h.19a4.65,4.65,0,0,1,.63,0,12.64,12.64,0,0,1,1.73.17c-.31.12-.61.25-.9.38-.92.42-1.81.87-2.66,1.32a38.84,38.84,0,0,0-4.43,2.82c-.14.12-.28.22-.42.32a1.6,1.6,0,0,0-.37.15,5.94,5.94,0,0,0-.82.6A2.88,2.88,0,0,0,33.77,9.84Z"/>
-                    <path class="cls-20"
-                          d="M33.14,104.46a12.44,12.44,0,0,1,.71-1.52,2.55,2.55,0,0,1,.53-.64c.22-.2.35-.28.58-.49a4.73,4.73,0,0,1,.63-.49c.2-.09.44-.2.63,0,.29.3.26.77.36,1.12,0,.18.06.29.09.44a.48.48,0,0,1-.07.37l-.4.14.17-.21c.09-.11,0-.34-.12-.6s-.08-.48-.26-.69-.28,0-.39.14-.21.22-.32.33-.33.3-.47.45a2.1,2.1,0,0,0-.37.52,13.8,13.8,0,0,0-.56,1.45c-.07.25-.2.56-.24.79a1,1,0,0,0,0,.63,1.9,1.9,0,0,0,1.14.84,7.19,7.19,0,0,0,1.79.35,13.79,13.79,0,0,0,1.93,0c.58,0,1.22-.21,1.25-.43a.07.07,0,0,0,0,0c.09.45.18.91.26,1.38a2.19,2.19,0,0,1-.33.12,4.35,4.35,0,0,1-1.16.15,14.28,14.28,0,0,1-2.09-.15,8.45,8.45,0,0,1-2-.5,2.69,2.69,0,0,1-1.63-1.47,1.84,1.84,0,0,1,0-1.14A7.93,7.93,0,0,1,33.14,104.46Z"/>
-                    <path class="cls-20"
-                          d="M32.6,134.4a4.9,4.9,0,0,1-.48-.88,7.8,7.8,0,0,1,1-.44,3.43,3.43,0,0,1,1.13-.28.71.71,0,0,1,.05.15c-.52.55-1.06,1.14-1.62,1.76l0-.07,0,0Z"/>
-                    <path class="cls-20"
-                          d="M31.8,13.23a.43.43,0,0,1,0-.2,2,2,0,0,1,.13-.48,11.78,11.78,0,0,1,1.85-2.71,2.88,2.88,0,0,1,.12,1.86,13,13,0,0,0-1,1l-.31.33c-.17.18-.32.35-.5.52l-.08,0A.42.42,0,0,1,31.8,13.23Z"/>
-                    <path class="cls-20"
-                          d="M32.12,133.52a4.9,4.9,0,0,0,.48.88l.12.19,0,0-.08-.12a5.7,5.7,0,0,1-.51-1Z"/>
-                    <path class="cls-20"
-                          d="M31,48.78a45.18,45.18,0,0,1,3.17-4,46.45,46.45,0,0,1,5.55-5.37,28.42,28.42,0,0,1,2.65-1.87c.12,0,.9-.55,2.31-1.16a30.17,30.17,0,0,1,5.93-1.72,50.93,50.93,0,0,1,8.62-.94A16.53,16.53,0,0,1,69,37.34l0,0,0,0a15.62,15.62,0,0,1,4.65,5.33,21,21,0,0,1,2.06,6.67,58,58,0,0,1,.51,6.52,26.1,26.1,0,0,1-.29,6,22.4,22.4,0,0,1-3.49,8.37c-1.24,1.83-2.22,2.7-2.31,2.61s.18-.26.51-.75.82-1.21,1.36-2.14A23.86,23.86,0,0,0,75,61.72,25,25,0,0,0,75,56a56.61,56.61,0,0,0-.7-6.34,19.74,19.74,0,0,0-2.07-6.13A13.89,13.89,0,0,0,68,38.83l-.06-.06a14.81,14.81,0,0,0-8.67-3A50,50,0,0,0,51,36.84a27.46,27.46,0,0,0-5.46,1.7,19.55,19.55,0,0,0-2,1,27.29,27.29,0,0,0-2.44,1.67A48.57,48.57,0,0,0,32.64,50l-.77,1.08-.18.26,0,0s-.07.06,0,.09l.07.08.4.48c.3.35.61.71.93,1.06a87.23,87.23,0,0,0,8.33,8.32,46.42,46.42,0,0,0,4.73,3.56l1.23.77,1.26.68c.84.44,1.73.84,2.58,1.25,3.41,1.62,6.6,3.08,9.41,4.13A27.31,27.31,0,0,0,64.42,73a13.17,13.17,0,0,0,3.09.27,9.54,9.54,0,0,0,2-.19c.45-.08.66-.19.68-.17s-.86.69-2.65.83a13.2,13.2,0,0,1-3.24,0,19,19,0,0,1-2.24-.49c-.58-.15-1.18-.34-1.8-.53-2.91-.94-6.18-2.3-9.65-3.81-.88-.38-1.75-.76-2.65-1.18L46.6,67l-1.31-.76a46.69,46.69,0,0,1-5-3.56,85.36,85.36,0,0,1-8.73-8.29c-.32-.36-.64-.72-1-1.06l-.51-.58-.82-1c0-.08-.2-.17-.14-.25l.17-.26.36-.53.56-.82C30.47,49.5,30.72,49.14,31,48.78Z"/>
-                    <path class="cls-20"
-                          d="M29.6,140.43a5.43,5.43,0,0,1-.6-1.28c.15-.19.29-.38.44-.56s.15-.17.22-.27a4.5,4.5,0,0,0,.6,1.71,4.41,4.41,0,0,0,1.22,1.36,5.47,5.47,0,0,0,1.92.89,14.14,14.14,0,0,0,4.1.46,11,11,0,0,0,1.41-.15l-.17.22a10.38,10.38,0,0,1-1.22.26,12.84,12.84,0,0,1-4.25-.21,6.35,6.35,0,0,1-2.2-.9A5.05,5.05,0,0,1,29.6,140.43Z"/>
-                    <path class="cls-20"
-                          d="M29.44,138.59c-.15.18-.29.37-.44.56l0-.09,0,0a5.11,5.11,0,0,1-.18-.73.39.39,0,0,1,.36-.34.45.45,0,0,1,.47.31.18.18,0,0,0,0,0C29.59,138.42,29.51,138.5,29.44,138.59Z"/>
-                    <path class="cls-20"
-                          d="M28.82,138.3A5.11,5.11,0,0,0,29,139l0,0a6.1,6.1,0,0,1-.15-.64A.24.24,0,0,1,28.82,138.3Z"/>
-                    <path class="cls-20"
-                          d="M25.91,145.31a6.46,6.46,0,0,1-.49-.77c.14-.29.3-.59.46-.87a6.35,6.35,0,0,0,.66,1.17,6.07,6.07,0,0,0,3.65,2.4,11.09,11.09,0,0,0,4.54-.05c.7-.13,1.26-.28,1.61-.36a1.08,1.08,0,0,0-.08.19,13.24,13.24,0,0,1-1.45.49,10.91,10.91,0,0,1-4.74.32A6.69,6.69,0,0,1,25.91,145.31Z"/>
-                    <path class="cls-20"
-                          d="M25,143.74l.18-.46a.08.08,0,0,0,0,0l.23-.5s0,0,0,0a.33.33,0,0,1,.16.22s0,0,0,0a4.76,4.76,0,0,0,.17.52s0,.09.05.14c-.16.28-.32.58-.46.87A4.54,4.54,0,0,1,25,143.74Z"/>
-                    <path class="cls-20"
-                          d="M25.48,142.63h0c.27-.62.56-1.23.85-1.82a1.37,1.37,0,0,1,.15-.21c.66-1,1.23-2,1.81-3,.48-.71,1-1.42,1.46-2.12.77-.86,1.54-1.7,2.35-2.52,1.14-1.15,2.25-2.37,3.34-3.59l.05.06-.05.06.11.09h0l0,.1c.08.16.2.45.39.79a2.59,2.59,0,0,0,.25.4c-.48.46-1,1-1.47,1.49l-.4.43a.51.51,0,0,0-.05-.14,3.16,3.16,0,0,0-1.13.28,3.76,3.76,0,0,0-1.07.48l0,.07,0,0a5.7,5.7,0,0,0,.51,1l.08.12c-1,1.11-2,2.29-3,3.57a.18.18,0,0,1,0-.05.44.44,0,0,0-.47-.31.37.37,0,0,0-.36.45.24.24,0,0,0,0,.12,6.1,6.1,0,0,0,.15.64c-.78,1-1.56,2.05-2.29,3.16-.28.43-.55.88-.8,1.33,0-.05,0-.09-.05-.13s-.11-.32-.14-.42-.05-.14-.05-.15A.31.31,0,0,0,25.48,142.63Z"/>
-                    <path class="cls-20"
-                          d="M28.92,166.56a10.89,10.89,0,0,1-2.79,0q-.78-.08-1.38-.18c-.09-.3-.19-.6-.27-.9a15.35,15.35,0,0,0,1.74.31,11.14,11.14,0,0,0,2.61.07,10.43,10.43,0,0,0,2.84-.83,6.1,6.1,0,0,0,2.42-1.65,4.49,4.49,0,0,0,.68-1.13c.18-.41.34-.8.49-1.17.31-.74.57-1.35.76-1.76l.1.19c-.12.43-.32,1-.56,1.7l-.4,1.18a7.28,7.28,0,0,1-1,1.65,5.46,5.46,0,0,1-2.21,1.53A10.22,10.22,0,0,1,28.92,166.56Z"/>
-                    <path class="cls-20" d="M24.57,166.36c-.07-.29-.14-.59-.2-.88l.11,0c.08.3.18.6.27.9Z"/>
-                    <path class="cls-20"
-                          d="M24.37,165.48c.06.29.13.59.2.88l.18,0c.37,1.24.72,2.37.85,2.66a5.18,5.18,0,0,1,.28,1l.18.82c.13.55.25,1.09.36,1.64.25,1.11.49,2.22.74,3.35l.11.53,0,.11c0,.06,0,0,.06,0l.15-.18,1.06-1.37,1-1.31.7,1.49c.47,1,.95,2,1.43,3,0-.92,0-1.84-.06-2.77.79.69,1.64,1.49,2.38,2.08.37.3.79.6,1.12.84l.61.43.41.26-.45.12a.26.26,0,0,0-.17.23.31.31,0,0,0,0,.43c.13.1.24.23.22.35s.17.13.24.11l.74-.24.65-.21.92.52A24.82,24.82,0,0,0,44,182.59c.92.25,1.85.46,2.8.66a.61.61,0,0,0-.09.14c-.1.16.06.41.35.56s.57.17.65.05a4.48,4.48,0,0,1,.33-.51c2.77.51,5.64.87,8.5,1.31l1.6.25.35,0H59l.57-.07c1.07-.07,2.15-.15,3.22-.24.83-.07,1.65-.16,2.49-.25l-.16.29c-.08.19.09.44.4.56s.59.09.66-.06.15-.29.36-.74a1,1,0,0,0,.11-.21c.86-.1,1.72-.22,2.58-.34,2.13-.31,4.26-.71,6.34-1.21a31.7,31.7,0,0,0,6-2l0,0h0l5.64-2.23c1.94-.36,3.6-.63,5.35-1,.84-.23,1.71-.41,2.53-.72l1.23-.41,1.22-.5a27.66,27.66,0,0,0,8.61-5.65,21.71,21.71,0,0,0,5.46-8.35,17.55,17.55,0,0,0,.69-2.38,9.4,9.4,0,0,0,.21-1.2l.1-.6a2.53,2.53,0,0,0,0-.38l-.55-.84c-.22-.33-.5-.6-.75-.91a7.08,7.08,0,0,0-6.17-2.29,15.51,15.51,0,0,0-4.47,1.11c-1.43.55-2.82,1.28-4.21,1.92s-2.73,1.35-4.07,2c-5.33,2.71-10.31,5.39-15.08,7.49a63,63,0,0,1-11.29,3.89,2.28,2.28,0,0,0-.74-.22c-.56-.07-.83.19-.79.21a2,2,0,0,1,.75,0l.3.11c-.57.13-1.13.25-1.69.34a33.19,33.19,0,0,1-10.83.2l-1.79-.3a.71.71,0,0,1-.14-.1c-.38-.26-.66-.29-.67-.26s.14.11.32.25c-.59-.14-1.12-.3-1.62-.44-1.11-.33-2-.61-2.82-.82l-.77-.23c0-.09-.06-.13-.09-.13s0,0,0,.1l-.85-.28a2.67,2.67,0,0,1-.57-.21,4.61,4.61,0,0,1,.6.11l1.76.42,2.85.71c.55.14,1.15.31,1.79.45l2.09.29a33.25,33.25,0,0,0,10.64-.4,58.61,58.61,0,0,0,13.24-4.48c4.7-2.15,9.62-4.86,14.94-7.65,1.33-.68,2.68-1.39,4.07-2s2.77-1.42,4.28-2a17.14,17.14,0,0,1,4.79-1.24,8.68,8.68,0,0,1,5.08,1,9,9,0,0,1,2.09,1.64c.28.35.61.66.86,1l.83,1.26a3.7,3.7,0,0,1-.08.86l-.08.65a9.94,9.94,0,0,1-.22,1.29,21.91,21.91,0,0,1-.71,2.52,22.81,22.81,0,0,1-5.73,8.92,28.74,28.74,0,0,1-9,6l-1.25.54-1.31.45c-.86.32-1.76.52-2.65.77-1.76.4-3.66.73-5.27,1.05l-5.42,2.17A33.44,33.44,0,0,1,76,184.45c-2.15.53-4.32,1-6.49,1.28s-4.36.6-6.53.8c-1.09.11-2.19.19-3.27.26l-.56.05h-.93l-.32-.06-1.6-.22a121.47,121.47,0,0,1-12.76-2.18A26.8,26.8,0,0,1,37.44,182c-.94-.51-1.86-1.06-2.75-1.65l-.8-.55-.21-.16s0,.13,0,.2v.28l.06,2.64.13,4.61-2-4.18q-1.36-2.88-2.71-5.68l-.09.12-1,1.29c-.34.42-.71.88-1,.82a2.09,2.09,0,0,1-.26-.13c-.18-.63-.37-1.25-.59-1.86a45.63,45.63,0,0,0-.92-8.16c-.19-.87-1.63-6.41-1.84-7.25.14.34.57,1.76,1,3.21Z"/>
-                    <path class="cls-20" d="M22.55,159.93l.68,1.75A10.68,10.68,0,0,1,22.55,159.93Z"/>
-                    <path class="cls-20"
-                          d="M22.48,151.76a44.53,44.53,0,0,1,2.54-8,4.54,4.54,0,0,0,.4.8c-.37.71-.7,1.44-1,2.2a47.8,47.8,0,0,0-1.56,5.43,8.75,8.75,0,0,0-.27,1.72,4.53,4.53,0,0,1-.35-.51l0,0C22.28,152.82,22.36,152.33,22.48,151.76Z"/>
-                    <path class="cls-20"
-                          d="M22.5,156.52a22.18,22.18,0,0,0,.73,5.16l-.68-1.75,0-.06v0C22.59,159.36,22.52,158,22.5,156.52Z"/>
-                    <path class="cls-20"
-                          d="M22.5,155.05c0-.39,0-.79.07-1.16a5.43,5.43,0,0,0,1.13,1.16,6.83,6.83,0,0,0,4.49,1.34,34.12,34.12,0,0,0,4.9-.62,13.27,13.27,0,0,0,1.56-.43l.27-.1a.3.3,0,0,0,0,.13,7.25,7.25,0,0,1-1.76.71,27.13,27.13,0,0,1-5,.91,7.52,7.52,0,0,1-5-1.31A5.27,5.27,0,0,1,22.5,155.05Z"/>
-                    <path class="cls-20"
-                          d="M22.22,23.94a11.3,11.3,0,0,1,.89-2c.3-.49.53-.84.54-.85s.27-.34.67-.76A16.71,16.71,0,0,1,25.78,19h0l1-.31c.64-.22,1-.7.92-1,.45-.23.76-.34.79-.28s-1.07,1-2.06,2.1a17,17,0,0,0-1.3,1.51c-.35.44-.55.75-.57.76l-.57.75a10.79,10.79,0,0,0-1,1.67c-.67,1.27-.81,2.72-1,2.72s-.18-.36-.17-.94A7.22,7.22,0,0,1,22.22,23.94Z"/>
-                    <path class="cls-20"
-                          d="M22.08,154c0-.21.07-.41.11-.63l0,0a4.53,4.53,0,0,0,.35.51c0,.37-.05.77-.07,1.16-.12-.11-.23-.23-.33-.34s-.05-.42-.08-.62C22.09,154.05,22.08,154,22.08,154Z"/>
-                    <path class="cls-20"
-                          d="M22.5,156.52c0,1.5.09,2.84,0,3.33a11.72,11.72,0,0,1-.44-5.76c0,.2.05.41.08.62s.21.23.33.34C22.49,155.54,22.49,156,22.5,156.52Z"/>
-                    <path class="cls-20"
-                          d="M21,15.92a7.69,7.69,0,0,1,4.63.15,4.42,4.42,0,0,1,2,1.64l0,0A12.18,12.18,0,0,0,25.88,19a.46.46,0,0,0-.07.07h0c-.14,0-.21,0-.23,0a2,2,0,0,0-.18-.28,2.47,2.47,0,0,0-.7-.58,6.07,6.07,0,0,0-3.4-.49c-3.05.18-6-.18-6-.48S18.22,16.54,21,15.92Z"/>
-                    <path class="cls-20"
-                          d="M16.19,52.35l-3.65,2.48-.73.5-.26.18-.36.26.57.13,1.85.48L20,58.11l-2.85,1.57-1.35.78-.5.3-.16.11h0S15,61,15,61l.22.13,4.49,2.81c2.58,1.6,4.2,2.66,4.34,2.74l2.21,1.53c.69.49,1.37,1,2.3,1.54s1.95,1.14,3.11,1.76c2.3,1.25,5,2.62,8,4,1,.48,2,1,3.07,1.45l-.68.24c-.61.22-1.21.45-1.79.7q-.7-.33-1.41-.63c-3-1.35-5.8-2.67-8.18-3.88-1.19-.63-2.28-1.2-3.25-1.77S25.61,70.52,25,70.09c-1.32-.87-2.11-1.39-2.2-1.46l-4.25-2.8-4.46-2.92c-.31-.23-.76-.5-1.07-.78l-.39-.47a3.15,3.15,0,0,1-.27-.45c-.11-.15,0-.36.06-.5s.06-.32.23-.49a1.75,1.75,0,0,1,.48-.45,4.72,4.72,0,0,1,.61-.43c1-.6.72-.43.85-.5l.26-.12a1.29,1.29,0,0,0-.28-.12l-.09,0-.32-.09-1-.3c-2-.59-4-1.17-6.07-1.76,1.53-1,3.07-2,4.61-3l1.5-1,.37-.24.14-.07.27-.17.28-.17s-.16-.08-.24-.12l-.29-.14-.47-.19-.79-.34c-.09,0-.38-.14-.55-.23a1.94,1.94,0,0,1-.49-.41,1.64,1.64,0,0,1,.21-2.25,14.37,14.37,0,0,0,3.3-5.33,28.7,28.7,0,0,0,1.41-5,27.61,27.61,0,0,0,.44-4l.3.25h0A18.91,18.91,0,0,1,17,38a27.1,27.1,0,0,1-1.13,5.21,18.13,18.13,0,0,1-1.25,3,12.6,12.6,0,0,1-.9,1.47c-.17.24-.35.49-.54.72l-.29.35-.26.28a.46.46,0,0,0-.05.66.51.51,0,0,0,.16.09l.23.09.79.3,2.45.92.68.26.33.13.18.07.08,0-.06,0Z"/>
-                    <path class="cls-20"
-                          d="M10.34,22.34a56.26,56.26,0,0,0,4.4,7.18c3.13,3.81,5.32,6.43,5.07,6.67s-1.15-.63-2.77-2h0a2.87,2.87,0,0,0-.21-1s-.06.26-.09.73c-1-.85-2.12-1.93-3.41-3.18a49.89,49.89,0,0,1-5.26-7l-.32-.51L7.67,23l-.12-.21-.14-.33c-.19-.39-.34-.79-.51-1.19a25.91,25.91,0,0,1-.78-2.5,24.11,24.11,0,0,1-.54-2.61c-.06-.45-.12-.9-.15-1.37,0-.23,0-.48,0-.72s0-.25,0-.37,0-.36,0-.52a4,4,0,0,1,.66-2,3.28,3.28,0,0,1,1.72-1.1l.49-.18.33-.09.64-.19,1.27-.33c1.66-.42,3.29-.75,4.89-1s3.17-.5,4.76-.61a25.48,25.48,0,0,1,4.49.26C27.32,8.26,29.45,8.7,31,9s2.4.52,2.46.54a.49.49,0,0,1,.34.29,11.78,11.78,0,0,0-1.85,2.71,2,2,0,0,0-.13.48.43.43,0,0,0,0,.2.42.42,0,0,0,.21.27l.08,0c-.12.14-.25.27-.38.41L30,13.47c-1.45-.35-3.49-.86-5.91-1.29a23.3,23.3,0,0,0-3.69-.42c-1.32,0-2.83.17-4.34.35s-3.12.42-4.7.71l-1.18.24-1,.22a.73.73,0,0,0-.34.13.82.82,0,0,0-.13.33v.11a2.11,2.11,0,0,0,0,.25c0,.19,0,.37,0,.55,0,.37,0,.75.05,1.14A20.19,20.19,0,0,0,9,18.11a22.85,22.85,0,0,0,.53,2.24c.11.37.23.72.35,1.06l.09.23,0,.06.06.13Z"/>
-                </g>
-                <path class="cls-5"
-                      d="M79.69,146.47l-.53.24-.06-.13.06-.13c.06-.1,0-.1,0-.29a3.11,3.11,0,0,0,0-.32,1.36,1.36,0,0,1,.25.22A1.9,1.9,0,0,1,79.69,146.47Z"/>
-                <path class="cls-5"
-                      d="M79.18,146.16c0,.19,0,.19,0,.29l-.06.13a1.28,1.28,0,0,0-.76-.63,3.78,3.78,0,0,0-.88,0,.79.79,0,0,0-.29,0c-.09,0-.13,0-.14,0s0-.05.1-.09a.46.46,0,0,1,.29-.17,2.91,2.91,0,0,1,1-.13,1.41,1.41,0,0,1,.71.29A3.11,3.11,0,0,1,79.18,146.16Z"/>
-                <path class="cls-5"
-                      d="M78.3,148.12c0,.19,0,.19-.09.28l-.1.1a1.28,1.28,0,0,0-.57-.79,3.46,3.46,0,0,0-.84-.28,1.06,1.06,0,0,0-.3,0,.19.19,0,0,1-.13,0s0-.05.12-.07a.45.45,0,0,1,.32-.09,2.77,2.77,0,0,1,1,.13,1.47,1.47,0,0,1,.62.46A1.75,1.75,0,0,1,78.3,148.12Z"/>
-                <path class="cls-5"
-                      d="M78.34,147.86c.31.41.39.87.24,1l-.48-.34,0,0a.58.58,0,0,0,0-.19s0-.05,0-.07S78.24,148,78.34,147.86Z"/>
-                <path class="cls-5" d="M78.17,148.65h-.09Z"/>
-                <path class="cls-8" d="M69.59,145.88h0l0,0,0-.07h.06v.11Z"/>
-                <path class="cls-5"
-                      d="M69.56,145.84l0,0h-.15l-.27.06-.37.08h0a.78.78,0,0,1-.24,0c-.11,0-.13-.11-.11-.1a5,5,0,0,0,1.09-.16h0Z"/>
-                <polygon class="cls-8" points="68.04 146.19 68.04 146.2 68.03 146.2 68.04 146.19"/>
-                <path class="cls-8" d="M63.07,139.22h0a.33.33,0,0,1,0,.06h0Z"/>
-                <path class="cls-8"
-                      d="M62.05,138.42l0,0a2,2,0,0,1,.3.27h-.14c-.1-.06-.13.13-.12.14s-.1-.12-.12-.19a.67.67,0,0,1,.06-.12Z"/>
-                <path class="cls-8" d="M60.31,147.41a.24.24,0,0,0,0,.08h0Z"/>
-                <path class="cls-9" d="M60.28,147.49l0,.14h0l0,.05Z"/>
-                <path class="cls-5" d="M60.28,147.49l-.08.2-.21,0h-.62S60,147.55,60.28,147.49Z"/>
-                <polygon class="cls-8" points="60.24 147.64 60.2 147.76 60.2 147.71 60.2 147.69 60.24 147.64"/>
-                <path class="cls-5" d="M57.12,146.75c.4-.08.15.27.2.37a.14.14,0,0,1,0,.1h0s-.1-.16-.17-.47Z"/>
-                <path class="cls-8" d="M52.48,155c.1.17.19.31.16.34s-.31-.09-.57-.34C52.39,155,52.41,155,52.48,155Z"/>
-                <path class="cls-8"
-                      d="M49.31,154.57c0,.27.16.5.12.54s-.46-.26-.54-.79a.25.25,0,0,1,0-.08l.22.28s.11,0,.16,0Z"/>
-                <path class="cls-8" d="M105.26,48.24l.23.37-.67.08C105,48.54,105.12,48.38,105.26,48.24Z"/>
-                <path class="cls-8"
-                      d="M94.77,7.06c.28.3.37.48.32.56s-.28.06-.61,0l-.41-.1-.49-.53.85-.16C94.55,6.89,94.67,7,94.77,7.06Z"/>
-                <path class="cls-8" d="M82,56.7q0,.45,0,.93A.56.56,0,0,1,81.7,57,.51.51,0,0,1,82,56.7Z"/>
-                <path class="cls-8" d="M78,91.88l.34.63a3.24,3.24,0,0,1-.45-.52A.84.84,0,0,0,78,91.88Z"/>
-                <path class="cls-8" d="M77.69,85.32h.16a.92.92,0,0,1-.06.33C77.73,85.45,77.69,85.33,77.69,85.32Z"/>
-                <path class="cls-8" d="M77.69,85.32a1.21,1.21,0,0,1-.19,0C77.59,85.25,77.66,85.23,77.69,85.32Z"/>
-                <path class="cls-8" d="M75.93,84.6c-.11.06-.24.13-.36.18a.25.25,0,0,1,0-.14A.94.94,0,0,1,75.93,84.6Z"/>
-                <path class="cls-8"
-                      d="M67.67,13.43l-.54.05c0-1,0-1.82-.08-2.62.16.55.3,1.13.44,1.74C67.57,13,67.65,13.37,67.67,13.43Z"/>
-                <path class="cls-8" d="M27.72,17.74c.12.27-.28.75-.92,1l-1,.32.09-.08A12.18,12.18,0,0,1,27.72,17.74Z"/>
-                <path class="cls-23" d="M.07,61.75c0,.42,0,.84-.07,1.28H0c0-.22,0-.44.05-.65S.07,62,.07,61.75Z"/>
-                <g class="cls-24">
-                    <path class="cls-23" d="M.07,61.75c0,.42,0,.84-.07,1.28H0c0-.22,0-.44.05-.65S.07,62,.07,61.75Z"/>
-                </g>
-                <path class="cls-23" d="M.05,62.39c0,.21,0,.43,0,.65H0C0,62.82,0,62.6.05,62.39Z"/>
-                <g class="cls-24">
-                    <path class="cls-23" d="M.05,62.39c0,.21,0,.43,0,.65H0C0,62.82,0,62.6.05,62.39Z"/>
-                </g>
-                <g class="cls-25">
-                    <polygon class="cls-26" points="0 62.9 0.05 62.84 0.05 63.04 0 63.04 0 62.9"/>
-                    <polygon class="cls-27" points="0 62.44 0.04 62.39 0.05 62.39 0.05 62.84 0 62.9 0 62.44"/>
-                    <polygon class="cls-28" points="0.04 62.39 0 62.44 0 62.39 0.04 62.39"/>
-                </g>
-            </g>
-        </g>
-    </g>
+<!--
+    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
+
+         http://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.
+-->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 114.03 188.38">
+    <defs>
+        <style>
+            .cls-1{fill:none;}.cls-2{isolation:isolate;}.cls-3{opacity:0.13;}.cls-13,.cls-3{mix-blend-mode:multiply;}.cls-4{fill:#3c2517;}.cls-5{fill:#644c53;}.cls-6{fill:#a66870;}.cls-7{fill:#f2e8df;}.cls-8{fill:#744a54;}.cls-9{fill:#231f20;}.cls-10{fill:#fff;}.cls-11{fill:#473439;}.cls-12{fill:#f7b2c6;}.cls-13{opacity:0.15;}.cls-14{fill:#3e362f;}.cls-15{fill:#f4f0d2;}.cls-16{fill:#97646d;}.cls-17{fill:#96636a;}.cls-18{fill:#8f8280;}.cls-19{fill:#dbd3d1;}.cls-20{fill:#694650;}.cls-21{fill:#c4869a;}.cls-22{fill:#a6938f;}.cls-23{fill:#bd2330;}.cls-24{opacity:0.35;mix-blend-mode:screen;}.cls-25{clip-path:url(#clip-path);}.cls-26{fill:#c7203a;}.cls-27{fill:#c8203a;}.cls-28{fill:#c82039;}
+        </style>
+        <clipPath id="clip-path">
+            <path class="cls-1" d="M.05,62.39c0,.21,0,.43,0,.65H0C0,62.82,0,62.6.05,62.39Z"/>
+        </clipPath>
+    </defs>
+    <title>mascot color without feather</title>
+    <g class="cls-2">
+        <g id="Layer_2" data-name="Layer 2">
+            <g id="Layer_1-2" data-name="Layer 1">
+                <g class="cls-3">
+                    <path class="cls-4"
+                          d="M113.25,156.4s4.39,14.27-13.72,23.36c-26.56,13.33-44.52,9-60.47,1.75-2.07-.93-3.49.33-5.47-13.66s4.7,5.76,5.71,5.9S81.55,173,81.55,173Z"/>
+                </g>
+                <path class="cls-5"
+                      d="M114,157.05a3.26,3.26,0,0,1-.07.86l-.08.64a11.21,11.21,0,0,1-.22,1.29,19.78,19.78,0,0,1-.72,2.53,22.77,22.77,0,0,1-5.73,8.92,28.75,28.75,0,0,1-9,6l-1.26.54-1.31.45c-.85.32-1.75.52-2.64.77-1.77.4-3.66.72-5.27,1.05l-5.43,2.17A33.59,33.59,0,0,1,76,184.45c-2.15.53-4.32,1-6.5,1.28s-4.35.59-6.53.8c-1.09.11-2.18.19-3.26.26l-.56,0h-.94l-.31-.05-1.6-.23a119.07,119.07,0,0,1-12.77-2.17,26.54,26.54,0,0,1-6-2.44c-.94-.51-1.86-1.06-2.75-1.66l-.8-.55-.21-.15s0,.13,0,.19v.28l.06,2.65.13,4.61-2-4.18c-.92-1.92-1.81-3.81-2.71-5.68l-.1.12-1,1.29c-.33.42-.7.87-1,.82a1.56,1.56,0,0,1-.26-.13c-.18-.63-.38-1.25-.6-1.87a44.92,44.92,0,0,0-.91-8.16c-.19-.86-1.63-6.4-1.84-7.24.13.34.57,1.75,1,3.21l-.12,0c.06.29.14.59.21.88l.18,0c.37,1.25.71,2.37.85,2.66a5.58,5.58,0,0,1,.28,1l.18.82c.12.56.25,1.1.36,1.65.25,1.11.49,2.22.74,3.35l.1.53,0,.11c0,.06.05,0,.07,0l.14-.18,1.06-1.37,1-1.31.7,1.49c.47,1,.94,2,1.42,3,0-.92,0-1.84-.05-2.77.79.69,1.63,1.49,2.38,2.07.37.31.79.61,1.11.85l.62.42a4.53,4.53,0,0,0,.4.26l-.44.13c-.09,0-.15.1-.17.23a.29.29,0,0,0,0,.42c.13.11.24.24.22.36a.26.26,0,0,0,.24.11l.74-.24.65-.22c.3.18.6.36.92.52A24,24,0,0,0,44,182.59c.92.25,1.85.46,2.8.66l-.1.14c-.09.16.07.41.36.55s.57.18.64.05.12-.19.33-.5c2.78.5,5.65.87,8.51,1.31l1.6.24.34.06H59l.58-.08c1.07-.06,2.15-.14,3.22-.23l2.48-.25-.15.29c-.09.18.09.43.39.56s.59.09.67-.06.14-.3.36-.74l.11-.21c.86-.1,1.72-.22,2.57-.34,2.14-.31,4.27-.71,6.35-1.21a31.26,31.26,0,0,0,6-2l0,0h0l5.63-2.22c2-.37,3.61-.64,5.36-1,.84-.23,1.7-.42,2.52-.72l1.24-.41,1.22-.5a27.78,27.78,0,0,0,8.61-5.65,21.65,21.65,0,0,0,5.45-8.36,17.88,17.88,0,0,0,.7-2.37,9.4,9.4,0,0,0,.21-1.2l.09-.61a2.56,2.56,0,0,0,0-.37l-.55-.84a8.24,8.24,0,0,0-.75-.91,7.36,7.36,0,0,0-1.77-1.43,7.48,7.48,0,0,0-4.39-.87,15.78,15.78,0,0,0-4.47,1.12c-1.44.55-2.82,1.28-4.21,1.92s-2.74,1.35-4.08,2c-5.32,2.71-10.3,5.38-15.07,7.48a62.51,62.51,0,0,1-11.29,3.9,2.32,2.32,0,0,0-.74-.23c-.56-.06-.83.2-.79.22a1.78,1.78,0,0,1,.75,0,1.6,1.6,0,0,1,.3.11c-.57.13-1.14.25-1.7.34a33.41,33.41,0,0,1-10.82.2l-1.8-.3-.13-.1c-.39-.26-.66-.29-.67-.26s.14.11.31.25c-.58-.14-1.11-.3-1.61-.45l-2.83-.82-.77-.23c0-.08-.06-.12-.08-.12s0,0,0,.09c-.34-.11-.63-.19-.85-.27a2,2,0,0,1-.57-.22,6,6,0,0,1,.6.12l1.76.41,2.84.72,1.79.45,2.09.29a33.35,33.35,0,0,0,10.65-.41,58.06,58.06,0,0,0,13.23-4.48c4.7-2.14,9.63-4.85,14.94-7.64,1.34-.68,2.69-1.39,4.08-2.06s2.77-1.41,4.27-2a17,17,0,0,1,4.8-1.24,8.6,8.6,0,0,1,5.08,1,8.51,8.51,0,0,1,2.09,1.64c.28.34.6.65.85,1Z"/>
+                <path class="cls-6"
+                      d="M112.71,157.38a2.56,2.56,0,0,1,0,.37l-.09.61a9.4,9.4,0,0,1-.21,1.2,17.88,17.88,0,0,1-.7,2.37,21.65,21.65,0,0,1-5.45,8.36,27.78,27.78,0,0,1-8.61,5.65l-1.22.5-1.24.41c-.82.3-1.68.49-2.52.72-1.75.38-3.41.65-5.36,1l-5.63,2.22h0l0,0a31.26,31.26,0,0,1-6,2c-2.08.5-4.21.9-6.35,1.21-.85.12-1.71.24-2.57.34.22-.45.53-1,.88-1.69s.87-1.72,1.31-2.75a11.42,11.42,0,0,0,.57-1.65,11.83,11.83,0,0,0,.25-1.79,7,7,0,0,0-.45-3.54,7.43,7.43,0,0,0-1.89-2.41,5.48,5.48,0,0,0-1.17-.79,62.51,62.51,0,0,0,11.29-3.9c4.77-2.1,9.75-4.77,15.07-7.48,1.34-.67,2.69-1.36,4.08-2s2.77-1.37,4.21-1.92a15.78,15.78,0,0,1,4.47-1.12,7.48,7.48,0,0,1,4.39.87,7.36,7.36,0,0,1,1.77,1.43,8.24,8.24,0,0,1,.75.91Z"/>
+                <path class="cls-5"
+                      d="M108.93,12.77a31.32,31.32,0,0,1-.16,3.55,40,40,0,0,1-1.38,7.26,39.16,39.16,0,0,1-2.64,6.8A15,15,0,0,1,103.19,33c0-.1,0-.16-.06-.16a1,1,0,0,0,0,.25h0c-.08.08-.12.1-.15.09s.33-1.28,1-3.12a54,54,0,0,0,1.87-6.82,44.21,44.21,0,0,0,.84-7c.07-1.93,0-3.24,0-3.33s0-.87-.08-2.06S106.19,8,105,7.37a5.14,5.14,0,0,0-2.42-.4,28.67,28.67,0,0,0-2.89.25c-1,.13-1.94.2-2.82.28l-.32,0H96l-.8,0,.68,1.17c.27.43.4.7.34.76s-.3-.14-.67-.48-.85-.85-1.5-1.55l.41.1c.33.11.57.15.61,0s0-.26-.32-.56c-.1-.08-.22-.17-.34-.28l2.28-.43c.87-.18,1.8-.35,2.75-.57a30.62,30.62,0,0,1,3-.52,6.75,6.75,0,0,1,3.37.38,4.42,4.42,0,0,1,2.27,2.48,10,10,0,0,1,.6,2.4C108.9,11.89,108.93,12.7,108.93,12.77Z"/>
+                <path class="cls-7"
+                      d="M106.59,12.84c0,.09.1,1.4,0,3.33a44.21,44.21,0,0,1-.84,7A54,54,0,0,1,103.91,30c-.63,1.84-1.11,3-1,3.12s.07,0,.15-.09c0,.56,0,1.93-.06,3.29-.05.88-.11,1.78-.18,2.44s-.14,1.13-.14,1.16,0,.49-.13,1.15a19.72,19.72,0,0,1-.37,2.11c0-.15,0-.33,0-.53,0-.52,0-1.13-.07-1.86a13.23,13.23,0,0,0-.74-2.39A8.75,8.75,0,0,0,99.65,36a12.3,12.3,0,0,0-2.47-2.17,12.07,12.07,0,0,0-7-1.66,7.56,7.56,0,0,0-3.56,1.45A11.46,11.46,0,0,0,84,36.19a9.45,9.45,0,0,0-1.52,3.09c-.32,1-.55,2-.74,2.88-.74,3.59-1,6.06-1,6.21s-.28,2.62-.38,6.25A28.23,28.23,0,0,0,82.8,67.68l.21.4.26.5a1.07,1.07,0,0,0,1.21.56,2.75,2.75,0,0,0,.58-.12,3.48,3.48,0,0,0,.52-.27c.27-.17.51-.35.75-.51,1-.69,1.86-1.4,2.73-2.08,1.74-1.37,3.33-2.7,4.65-3.86,0,0,3.81-3.23,4.5-4.7.05-.1.1-.25.17-.43l.67.83c.1.12.18.21.15.19a0,0,0,0,1,0,0h0c-.14.12-.33.27-.55.48a9.47,9.47,0,0,0-1.48,1.91c-.92,1.65-1.9,3.72-3.17,5.66a15.38,15.38,0,0,1-2.06,2.63,13.7,13.7,0,0,1-2.35,1.71,19.36,19.36,0,0,0-2.47,1.56l-.08,0s0,0,0,0a1.82,1.82,0,0,0-.59-.79c-.24-.14-.38-.07-.38,0s.12.09.24.23a2.9,2.9,0,0,1,.31.76c.09.38.19.85.28,1.36a6.94,6.94,0,0,0-2,1A6.61,6.61,0,0,0,87,74.28c0,.22.05.44.07.66a3.44,3.44,0,0,1,0,.91c-.48.25-.76.46-.72.51s.26,0,.65-.12a4.8,4.8,0,0,1-.26.81h0c-1.15.33-2.16.88-2.1,1s.8,0,1.68-.15c-.18.29-.32.45-.32.48a11.77,11.77,0,0,1-.76,1,13.31,13.31,0,0,1-1.94,1.82,4.81,4.81,0,0,1-2.4.77c-.73,0-1.23,0-1.25.1s.48.27,1.24.35a5.18,5.18,0,0,0,1.87-.13l0,.11c-.11,0-.42.36-.93.75a5.54,5.54,0,0,1-2.27,1,8.13,8.13,0,0,1-2.49.06,3.29,3.29,0,0,1-.36-.07,4.5,4.5,0,0,0,.94-.83,4,4,0,0,0,.73-1,1.62,1.62,0,0,0,.18-.43c-.12-.11-.46.53-1.22,1.15A6.89,6.89,0,0,1,74,84.48a12.54,12.54,0,0,1-3.63.2,7.35,7.35,0,0,1-1.64-.34l-.46-.14a5.48,5.48,0,0,1-1-.49c-.6-.43-1.37-1.09-2.16-1.78.7-.47,1.39-.93,1.92-1.21s1.17-.42,1.17-.51-.55-.13-1.34.09a19.22,19.22,0,0,0-2.38,1.09l-.07-.06-1.9-1.68,1.23-.4C66.37,78.38,69,77.7,69,77.54s-.08,0-.2,0l.81-1.4a3.9,3.9,0,0,0,.51.06l.57,0a.74.74,0,0,0,.41-.07.36.36,0,0,0,.15-.44,1.5,1.5,0,0,0-.45-.65.66.66,0,0,0-.43-.19h0L67.54,73.7c1.79-.14,2.75-.72,2.65-.84.08.1,1.06-.78,2.31-2.61A22.18,22.18,0,0,0,76,61.88a25,25,0,0,0,.29-6,53.49,53.49,0,0,0-.51-6.52,21.06,21.06,0,0,0-2.05-6.68,15.79,15.79,0,0,0-4.65-5.32l0,0,0,0a16.52,16.52,0,0,0-9.81-3.59,50.15,50.15,0,0,0-8.62.94,29.57,29.57,0,0,0-5.92,1.72,21.16,21.16,0,0,0-2.31,1.16,25.64,25.64,0,0,0-2.65,1.87,44.75,44.75,0,0,0-5.55,5.36,48.36,48.36,0,0,0-3.18,4l-.74,1.11-.57.82-.35.53-.18.26c-.06.08.11.16.15.25l.82,1,.51.59c.32.34.65.69,1,1.06a86.39,86.39,0,0,0,8.73,8.28,46.78,46.78,0,0,0,5,3.57L46.6,67l1.35.67c.91.43,1.78.8,2.65,1.19,3.48,1.51,6.75,2.87,9.65,3.8.63.2,1.23.39,1.81.53l-.68,2.53a31.69,31.69,0,0,0-4-.66,34.31,34.31,0,0,0-5.28-.12c-1.46.1-2.44.23-2.51.25s-1.05.16-2.46.53c-1.24.32-2.78.77-4.34,1.32h0l-3.06-1.45c-2.94-1.42-5.68-2.79-8-4-1.15-.62-2.2-1.21-3.11-1.77s-1.61-1-2.29-1.53l-2.22-1.53c-.13-.09-1.76-1.15-4.33-2.75l-4.5-2.8L15,61s.05-.08.09-.12h0l.16-.11.5-.3,1.35-.78L20,58.11,13.6,56.37l-1.84-.47-.57-.13.35-.26.26-.19.74-.49,3.65-2.48,1.19-.79.06,0-.08,0-.18-.07-.33-.13L16.17,51l-2.45-.92-.79-.31-.23-.08a.42.42,0,0,1-.16-.09.46.46,0,0,1,0-.66l.26-.28.29-.35a7.11,7.11,0,0,0,.54-.72,11.56,11.56,0,0,0,.91-1.48,18.56,18.56,0,0,0,1.25-3A27.88,27.88,0,0,0,17,38,18,18,0,0,0,17,34.14c1.62,1.42,2.65,2.17,2.78,2s-1.95-2.86-5.07-6.66a55.82,55.82,0,0,1-4.4-7.18l-.27-.51L10,21.7l0-.06-.08-.23c-.12-.34-.24-.7-.35-1.06A20.48,20.48,0,0,1,9,18.1a20,20,0,0,1-.31-2.31,11.17,11.17,0,0,1-.06-1.14c0-.19,0-.36,0-.55a2,2,0,0,1,0-.25v-.11a1.16,1.16,0,0,1,.14-.34.81.81,0,0,1,.33-.12l1-.22,1.17-.24c1.58-.29,3.16-.53,4.7-.72s3-.31,4.35-.34a23.44,23.44,0,0,1,3.69.42c2.41.42,4.46.93,5.91,1.29l1.75.45c.14-.13.26-.27.39-.4l.5-.52c.1-.12.2-.22.31-.33a12.79,12.79,0,0,1,1-1h0a5.22,5.22,0,0,1,.82-.6,1.15,1.15,0,0,1,.37-.15l.42-.32a35.93,35.93,0,0,1,4.43-2.82c.85-.46,1.73-.9,2.66-1.32l.89-.38c.3,0,.63.09,1,.16A20.89,20.89,0,0,1,49,7.76a19,19,0,0,1,2.83,1.61c.49.33,1,.69,1.53,1.07l.81.6c.33.25.67.52,1,.83l.46.4A4.16,4.16,0,0,1,57,13.2c.18.28.06-.07.06-.2a4.19,4.19,0,0,1,0-.47A1.67,1.67,0,0,1,57,12c-.67-2.22-1.23-4.1-1.7-5.64-.23-.76-.44-1.43-.65-2,.59,0,1.16,0,1.7,0,1.57,0,2.89.15,3.82.23l1.6.14,1,.06a3.71,3.71,0,0,1,.3.28A15.34,15.34,0,0,1,67,12.72c.06.33.11.64.14.76s0,0,0,0l.52,0v0A80.77,80.77,0,0,1,68,5l1,0a12.45,12.45,0,0,0,1.36,0c.24,0,.5,0,.8,0s.52-.06.77-.1c.8-.14,1.58-.3,2.35-.45.15.15.32.31.5.51a12.38,12.38,0,0,1,1.84,2.74,9.74,9.74,0,0,1,.42,1,10.17,10.17,0,0,1,.37,1.58c.07.53.14,1.09.23,1.67,0,.29.07.58.11.87l.06.45,0,.23c0,.07,0,0,.06,0l.27-.87A27.31,27.31,0,0,1,79.51,9,14.63,14.63,0,0,1,80.7,6.84,6.39,6.39,0,0,1,82,5.46a13.48,13.48,0,0,1,1.31-.85c.27-.16.51-.28.74-.39a27.59,27.59,0,0,1,3.84,1c1.51.5,2.88,1.1,4,1.53.89.33,1.64.59,2.18.74.65.7,1.15,1.21,1.5,1.55s.6.52.67.48-.07-.33-.34-.76l-.68-1.17.8,0h.54l.32,0c.88-.08,1.84-.15,2.82-.28A28.67,28.67,0,0,1,102.59,7a5.14,5.14,0,0,1,2.42.4c1.18.59,1.39,2.28,1.5,3.41S106.59,12.79,106.59,12.84Zm-1.21-2a5.15,5.15,0,0,0-.16-1.51c0-.1-.44-.07-.89.13l-.49.21h0a10.19,10.19,0,0,0-2.26.68,19.76,19.76,0,0,1-2.34.87,4.6,4.6,0,0,1-.78.16l.89,1.28a2.47,2.47,0,0,1,.42-.63,5.32,5.32,0,0,1,2-1.32,3,3,0,0,1,2-.18,3.53,3.53,0,0,1,0,.38,8.14,8.14,0,0,1-.14,2.54c-.31,1.26-.64,2.56-.74,3.31-.57-1-1.12-1.8-1.24-1.75a19.93,19.93,0,0,0,1,3.1,19.92,19.92,0,0,1,.61,2.11,9.74,9.74,0,0,1,.2,1c0,.06.12.44.18,1a15.34,15.34,0,0,1-.07,2.16,16.84,16.84,0,0,0-.18,3.25,9.46,9.46,0,0,0,1-3.13,12.5,12.5,0,0,0,.32-2.33c0-.68-.11-1.11-.09-1.14s-.11-.47-.32-1.08a18.79,18.79,0,0,0-.88-2.14l-.28-.55a22.61,22.61,0,0,0,1.67-3.44A8.53,8.53,0,0,0,105.38,10.88ZM85.64,76.8a1.27,1.27,0,0,0,.09-.67.34.34,0,0,0-.09-.2c-.06-.05-.14,0-.21,0-.27.12-.39.21-.37.24-.1-.12-.22-.19-.26-.14a.69.69,0,0,0,0,.68.61.61,0,0,0,.4.41C85.38,77.2,85.54,77.05,85.64,76.8Zm-1.35-2.53a1,1,0,0,0,.37-.62.33.33,0,0,0-.06-.22.2.2,0,0,0-.22,0c-.3.1-.44.17-.44.21s-.23-.19-.25-.16l-.12.14a1.05,1.05,0,0,0-.23.43.35.35,0,0,0,.24.42A.82.82,0,0,0,84.29,74.27Zm-.36,3.6a1.23,1.23,0,0,0,.4-1.09,2.18,2.18,0,0,0-.43-1,3.08,3.08,0,0,0-.73-.71,2.62,2.62,0,0,0-1-.4,6.75,6.75,0,0,0-1.84,0,1.57,1.57,0,0,0-.28.06l-.2.06-.36.11-.3.08H79a1,1,0,0,1-.22,0,1.55,1.55,0,0,0-.52-.07,5,5,0,0,0-.66.09,7,7,0,0,0-1.22.36,6.59,6.59,0,0,0-.65.31,4.47,4.47,0,0,0-1.4,1.12,3.62,3.62,0,0,0-.87,2.37,3.42,3.42,0,0,0,.33,1.4,1.74,1.74,0,0,0,1.28,1,3.27,3.27,0,0,0,1.45-.16,1.26,1.26,0,0,0,.55.33,3.23,3.23,0,0,0,1.62-.11,6,6,0,0,0,1.22-.48h0a1,1,0,0,0,.43.14,1.31,1.31,0,0,0,1-.33c.36-.37.63-.71.74-.79.09.07.06,0,.07,0v0a.07.07,0,0,0,0-.08.17.17,0,0,0-.11,0v0a.28.28,0,0,0,.22,0,.92.92,0,0,0,.28-.14A1.16,1.16,0,0,0,83,79.2C83.15,78.34,83.36,78.27,83.93,77.87ZM71,81.16a1.05,1.05,0,0,0-.44-.86,1.1,1.1,0,0,0-.86-.24c-.11-.11-.25-.16-.28-.11a4.07,4.07,0,0,0-.52.8,1,1,0,0,0,.13,1.1,1.3,1.3,0,0,0,2-.69ZM26.44,19.56c1-1.06,2.15-2,2.07-2.1s-.34.05-.79.28l0,0a4.48,4.48,0,0,0-2.05-1.64A7.57,7.57,0,0,0,21,15.92c-2.81.61-5.75.9-5.75,1.3s2.94.66,6,.48a6,6,0,0,1,3.4.49,2.13,2.13,0,0,1,.71.58,2,2,0,0,1,.18.28s.09,0,.23,0a15.28,15.28,0,0,0-1.46,1.34c-.4.42-.65.74-.67.76s-.24.35-.55.85a11.32,11.32,0,0,0-.88,2A6.8,6.8,0,0,0,21.86,26c0,.58.09.95.16.94s.29-1.45,1-2.72a10.93,10.93,0,0,1,1-1.68l.57-.74s.22-.33.56-.76A17,17,0,0,1,26.44,19.56Z"/>
+                <path class="cls-5"
+                      d="M106,48l-.4.59c-.44.65-1.1,1.55-1.87,2.58l-1.23,1.63c-.2.28-.42.57-.64.86a3.21,3.21,0,0,0-.24.35l.28.14.83.48,2.94,1.73-4.49,1.49c-.05,0-.45-.47-.91-.95l-.36,1.36,1.27-.41h0l-.14.62s0,0,0,.08c-.15.57-.17.66-.18.7l-.16.11a3.05,3.05,0,0,0-.46.28,3.61,3.61,0,0,0-.43.34,8,8,0,0,0-1.28,1.51c-.9,1.44-2.09,3.6-3.53,5.52a15.6,15.6,0,0,1-2.41,2.64,7.65,7.65,0,0,1-1.4.92c-.44.24-.88.46-1.28.66a7.31,7.31,0,0,1-2.8,1,19.36,19.36,0,0,1,2.47-1.56,13.7,13.7,0,0,0,2.35-1.71A15.38,15.38,0,0,0,94,66.25c1.27-1.94,2.25-4,3.17-5.66a9.47,9.47,0,0,1,1.48-1.91c.22-.21.41-.36.55-.48h0a0,0,0,0,0,0,0s0-.07-.15-.19l-.67-.83.11-.29.92-.26,2-.55.51-.14H102l.26,0-.26-.23-2.14-1.4c.39-.44.78-.9,1.17-1.35l.71-.81,1.37-1.51c.65-.72,1.25-1.37,1.74-1.89l.67-.08-.23-.37c-.14.14-.28.3-.44.45a39.45,39.45,0,0,1-4,.2c.23-.08,3.89-.46,4.6-.72Z"/>
+                <path class="cls-8" d="M105.26,48.24l.23.37-.67.08C105,48.54,105.12,48.38,105.26,48.24Z"/>
+                <path class="cls-5"
+                      d="M105.22,9.37a5.15,5.15,0,0,1,.16,1.51,8.53,8.53,0,0,1-.57,2.95,22.61,22.61,0,0,1-1.67,3.44l-.25-.46h0c.1-.75.43-2.05.74-3.31a8.14,8.14,0,0,0,.14-2.54,3.53,3.53,0,0,0,0-.38.59.59,0,0,1,.16.07.52.52,0,0,1,.15.14l-.12.08v0h0l.11-.07a.13.13,0,0,1,0,.06l.19-.19-.2.13,0-.05,1.24-.67a1.34,1.34,0,0,0-1.2-.42l-.23,0,.49-.21C104.78,9.3,105.2,9.27,105.22,9.37Z"/>
+                <path class="cls-5"
+                      d="M105.27,10.11l-1.24.67a.52.52,0,0,0-.15-.14.59.59,0,0,0-.16-.07,3.63,3.63,0,0,0-.18-.68s.11-.09.27-.18h0l.23,0A1.34,1.34,0,0,1,105.27,10.11Z"/>
+                <path class="cls-5"
+                      d="M104.71,22.18a12.5,12.5,0,0,1-.32,2.33,9.46,9.46,0,0,1-1,3.13,16.84,16.84,0,0,1,.18-3.25,15.34,15.34,0,0,0,.07-2.16c-.06-.53-.18-.91-.18-1a9.74,9.74,0,0,0-.2-1,19.92,19.92,0,0,0-.61-2.11,19.93,19.93,0,0,1-1-3.1c.12-.05.67.71,1.24,1.75h0c0,.38,0,.62,0,.65s.13,0,.23-.19l.28.55A18.79,18.79,0,0,1,104.3,20c.21.61.29,1.05.32,1.08S104.71,21.5,104.71,22.18Z"/>
+                <path class="cls-5" d="M104.05,10.83l.2-.13-.19.19A.13.13,0,0,0,104.05,10.83Z"/>
+                <path class="cls-9" d="M104,10.78l0,.05-.11.07h0v0Z"/>
+                <path class="cls-5"
+                      d="M103.81,9.71c-.16.09-.27.14-.27.18a3.63,3.63,0,0,1,.18.68,3,3,0,0,0-2,.18,5.32,5.32,0,0,0-2,1.32,2.47,2.47,0,0,0-.42.63l-.89-1.28a4.6,4.6,0,0,0,.78-.16,19.76,19.76,0,0,0,2.34-.87A10.19,10.19,0,0,1,103.81,9.71Z"/>
+                <path class="cls-7"
+                      d="M104.82,48.69c-.49.52-1.09,1.17-1.74,1.89l-1.37,1.51-.71.81c-.39.45-.78.91-1.17,1.35l-.5-.14c.51-1.75,1-3.78,1.44-5.22A39.45,39.45,0,0,0,104.82,48.69Z"/>
+                <path class="cls-5"
+                      d="M103.44,36.35c0,.89,0,1.8,0,2.47s-.09,1.16-.09,1.19-.06.49-.19,1.16a24.3,24.3,0,0,1-.55,2.43c-.26.87-.57,1.7-.82,2.32a4.74,4.74,0,0,1-.46,1,29.75,29.75,0,0,1,.76-3c0,.23.07.34.1.34a3.08,3.08,0,0,0,.07-1.08,19.72,19.72,0,0,0,.37-2.11c.09-.66.12-1.12.13-1.15s.07-.48.14-1.16.13-1.56.18-2.44c.06-1.36,0-2.73.06-3.29h0a.38.38,0,0,0,.09-.09A22.54,22.54,0,0,1,103.44,36.35Z"/>
+                <path class="cls-5"
+                      d="M102.2,76c.77.33,1.23.65,1.19.72a5.48,5.48,0,0,1-1.33-.28c-.78-.19-1.84-.37-2.91-.52s-2.16-.27-3-.34l-1.42-.12-1.4-.16a9,9,0,0,0-2.87.07,20.46,20.46,0,0,0-2.55.6,5.23,5.23,0,0,0,0-.56,16.27,16.27,0,0,1,2.37-.84,8.8,8.8,0,0,1,3.12-.34c.84,0,1.41.07,1.44.07s.62.07,1.45.21,1.91.34,3,.6A19.74,19.74,0,0,1,102.2,76Z"/>
+                <path class="cls-9" d="M103.19,33a.38.38,0,0,1-.09.09,1,1,0,0,1,0-.25S103.17,32.85,103.19,33Z"/>
+                <path class="cls-5" d="M102.89,16.81l.25.46c-.1.15-.19.21-.23.19S102.84,17.19,102.89,16.81Z"/>
+                <path class="cls-7"
+                      d="M102.23,55.88l-.26,0h-.09l-.51.14-2,.55-.92.26c.23-.67.53-1.67.84-2.77l.5.14,2.14,1.4Z"/>
+                <path class="cls-5"
+                      d="M102.21,42.67c0,.2,0,.38,0,.53l-.06.29c0,.15-.07.3-.11.45,0-.27-.12-.7-.19-1.25s-.15-1.11-.24-1.82a15.8,15.8,0,0,0-.83-2.15,8.19,8.19,0,0,0-1.74-2.09,11.87,11.87,0,0,0-2.37-1.92,11.18,11.18,0,0,0-6.37-1.26,6.3,6.3,0,0,0-2.86,1.31,9.63,9.63,0,0,0-2.22,2.29A7.67,7.67,0,0,0,84,39.73a.85.85,0,0,0,0,.17,5.7,5.7,0,0,0-1.27,1.15,12.59,12.59,0,0,1,1.12-.63.29.29,0,0,0,0,.09c-1.53,1.35-2,3.16-2.14,7.17a19.85,19.85,0,0,0,.43,6.41h0c0,.18,0,.38,0,.58,0,.64-.07,1.32-.07,2a.51.51,0,0,0-.27.32.56.56,0,0,0,.27.61,26.75,26.75,0,0,0,.23,3,24.19,24.19,0,0,0,1.74,6.51l.17.39.14.28a.17.17,0,0,0,.22.13,1.52,1.52,0,0,0,.27-.06l.25-.13c.24-.14.47-.3.71-.45,1-.63,1.88-1.3,2.77-1.94,1.78-1.29,3.42-2.53,4.81-3.61s2.53-2,3.31-2.64c0,0,.38-.49,1-1.26s.82-2.67,1.75-4.81c.12-.27.24-.57.36-.89.39-1,.77-2.27,1.06-3.28h0c-.39,1.44-.93,3.47-1.44,5.22-.31,1.1-.61,2.1-.84,2.77l-.28.09.17.2c-.07.18-.12.33-.17.43-.69,1.47-4.5,4.7-4.5,4.7-1.32,1.16-2.91,2.49-4.65,3.86-.87.68-1.77,1.39-2.73,2.08-.24.16-.48.34-.75.51a3.48,3.48,0,0,1-.52.27,2.75,2.75,0,0,1-.58.12,1.07,1.07,0,0,1-1.21-.56l-.26-.5-.21-.4a28.23,28.23,0,0,1-2.38-13.06c.1-3.63.37-6.1.38-6.25s.24-2.62,1-6.21c.19-.89.42-1.86.74-2.88A9.45,9.45,0,0,1,84,36.19a11.46,11.46,0,0,1,2.62-2.53,7.56,7.56,0,0,1,3.56-1.45,12.07,12.07,0,0,1,7,1.66A12.3,12.3,0,0,1,99.65,36a8.75,8.75,0,0,1,1.75,2.38,13.23,13.23,0,0,1,.74,2.39C102.18,41.54,102.2,42.15,102.21,42.67Z"/>
+                <path class="cls-8" d="M102.22,43.2a3.08,3.08,0,0,1-.07,1.08s-.06-.11-.1-.34.07-.3.11-.45Z"/>
+                <path class="cls-6"
+                      d="M101.86,42.69c.07.55.14,1,.19,1.25a29.75,29.75,0,0,0-.76,3v0h0l0,.18c0,.07,0,.14-.06.23s0,.12,0,.18-.08.32-.13.51-.06.21-.09.31-.06.22-.09.34,0,0,0,0a.61.61,0,0,1,0,.11s0,0,0,0c-.29,1-.67,2.24-1.06,3.28L97.3,52a13.25,13.25,0,0,0,.26-3.76,8.2,8.2,0,0,0-1.14-3.58,23.57,23.57,0,0,0-2-3,7.71,7.71,0,0,0-2.61-2.15,8.87,8.87,0,0,0-7.29,0,4.1,4.1,0,0,0-.56.36.85.85,0,0,1,0-.17,7.67,7.67,0,0,1,1.23-2.68,9.63,9.63,0,0,1,2.22-2.29,6.3,6.3,0,0,1,2.86-1.31,11.18,11.18,0,0,1,6.37,1.26,11.87,11.87,0,0,1,2.37,1.92,8.19,8.19,0,0,1,1.74,2.09,15.8,15.8,0,0,1,.83,2.15C101.71,41.58,101.79,42.19,101.86,42.69Z"/>
+                <path class="cls-8" d="M100.78,48.85a.06.06,0,0,1,0,0h0S100.77,48.86,100.78,48.85Z"/>
+                <path class="cls-5" d="M101.18,57.8l-1.27.41.36-1.36C100.73,57.33,101.13,57.76,101.18,57.8Z"/>
+                <path class="cls-5"
+                      d="M100.61,73.11c0,.24-2-.17-4-.19A18.57,18.57,0,0,0,94,73c-.74.07-1.23.18-1.26.18s-.54,0-1.28.16-1.71.27-2.68.49c-.36.07-.72.16-1.06.24-.06-.23-.13-.46-.2-.68l1-.36c1-.32,2-.58,2.7-.75S92.5,72,92.54,72s.57-.07,1.36-.09a17.91,17.91,0,0,1,2.82.15A13.08,13.08,0,0,1,100.61,73.11Z"/>
+                <path class="cls-6"
+                      d="M97.3,52l2.4.19c-.12.32-.24.62-.36.89-.93,2.14-1.14,4-1.75,4.81s-1,1.26-1,1.26c-.78.64-1.92,1.57-3.31,2.64s-3,2.32-4.81,3.61c-.89.64-1.82,1.31-2.77,1.94-.24.15-.47.31-.71.45l-.25.13a1.52,1.52,0,0,1-.27.06.17.17,0,0,1-.22-.13l-.14-.28-.17-.39a24.19,24.19,0,0,1-1.74-6.51,26.75,26.75,0,0,1-.23-3,.91.91,0,0,0,.3.13,7.56,7.56,0,0,0,2,.08,26.1,26.1,0,0,0,4.51-.76,23.83,23.83,0,0,0,5.93-2.39,11.9,11.9,0,0,0,1.48-1.06,5.46,5.46,0,0,0,.68-.68,1.08,1.08,0,0,0,.16-.2,1.39,1.39,0,0,0,.16-.28C97.2,52.3,97.25,52.13,97.3,52Z"/>
+                <path class="cls-8" d="M98.21,57l.28-.09-.11.29Z"/>
+                <path class="cls-5"
+                      d="M97.56,48.22A13.25,13.25,0,0,1,97.3,52c0,.15-.1.32-.16.49a1.39,1.39,0,0,1-.16.28,1.08,1.08,0,0,1-.16.2,5.46,5.46,0,0,1-.68.68,11.9,11.9,0,0,1-1.48,1.06,23.83,23.83,0,0,1-5.93,2.39,26.1,26.1,0,0,1-4.51.76,7.56,7.56,0,0,1-2-.08.91.91,0,0,1-.3-.13q0-.48,0-.93a.72.72,0,0,1,.52-.1,5.44,5.44,0,0,0,1.45.11h0a4.67,4.67,0,0,0,3,.41,5.72,5.72,0,0,0,3.14-1.56,20.62,20.62,0,0,0,4-1.71,11,11,0,0,0,1.36-.94,3.94,3.94,0,0,0,.59-.56l.13-.13,0-.12a1.69,1.69,0,0,0,.12-.36,12,12,0,0,0,.31-3.46c-.08-2.33-1.53-4.38-2.83-6.2a7.2,7.2,0,0,0-2.34-2,7.45,7.45,0,0,0-2.72-.79,5.28,5.28,0,0,0-.89,0h0a3.26,3.26,0,0,0-2.7.27,7.65,7.65,0,0,0-1.24.84h0l-.17.08A4.44,4.44,0,0,1,84,39.9a4.1,4.1,0,0,1,.56-.36,8.87,8.87,0,0,1,7.29,0,7.71,7.71,0,0,1,2.61,2.15,23.57,23.57,0,0,1,2,3A8.2,8.2,0,0,1,97.56,48.22Z"/>
+                <path class="cls-10"
+                      d="M96.73,48.28a12,12,0,0,1-.31,3.46,1.69,1.69,0,0,1-.12.36l0,.12-.13.13a3.94,3.94,0,0,1-.59.56,11,11,0,0,1-1.36.94,20.62,20.62,0,0,1-4,1.71,10.5,10.5,0,0,0,3-7.37c.16-3.84-2.37-8.07-5.21-9a5.28,5.28,0,0,1,.89,0,7.45,7.45,0,0,1,2.72.79,7.2,7.2,0,0,1,2.34,2C95.2,43.9,96.65,46,96.73,48.28Z"/>
+                <path class="cls-8"
+                      d="M94.77,7.06c.28.3.37.48.32.56s-.28.06-.61,0l-.41-.1-.49-.53.85-.16C94.55,6.89,94.67,7,94.77,7.06Z"/>
+                <path class="cls-5"
+                      d="M94.43,6.78l-.85.16.49.53c-.54-.15-1.29-.41-2.18-.74-1.15-.43-2.52-1-4-1.53a27.59,27.59,0,0,0-3.84-1,5.49,5.49,0,0,1,1.61-.56l-.76-1.94,0-.1a24.21,24.21,0,0,1,3.81,1.55,37.19,37.19,0,0,1,3.82,2.29C93.33,6,94,6.43,94.43,6.78Z"/>
+                <path class="cls-5"
+                      d="M91.41,77.48c1.08.46,2,1.11,2,1.26a9.74,9.74,0,0,1-2.24-.48c-.54-.13-1.09-.23-1.51-.3S89,77.9,89,77.9a6.78,6.78,0,0,0-.69-.07q-.34,0-.78,0h0a5.1,5.1,0,0,0,.32-1,7,7,0,0,1,1.25-.07l.24,0a5.74,5.74,0,0,1,.57.14A13.69,13.69,0,0,1,91.41,77.48Z"/>
+                <path class="cls-11"
+                      d="M88,39.23c2.84.89,5.37,5.12,5.21,9a10.5,10.5,0,0,1-3,7.37q-.87.28-1.68.48a27.13,27.13,0,0,1-4.34.67h-.18a4.1,4.1,0,0,1-1.86-2.61h0c.17-3.25.45-5.4.46-5.53s.19-2.59.82-6.08c.12-.63.26-1.3.43-2a.79.79,0,0,1,.19-.17h0l.06,0a10.76,10.76,0,0,1,3.88-1.08Z"/>
+                <path class="cls-5"
+                      d="M88.46,56q.81-.2,1.68-.48A5.72,5.72,0,0,1,87,57.12a4.67,4.67,0,0,1-3-.41h.17A27.13,27.13,0,0,0,88.46,56Z"/>
+                <path class="cls-5"
+                      d="M87.93,75.4a5.23,5.23,0,0,1,0,.56l-1,.28c0-.12,0-.26.07-.39C87.26,75.7,87.58,75.56,87.93,75.4Z"/>
+                <path class="cls-5"
+                      d="M87.86,74.85a3.31,3.31,0,0,1,.07.55c-.35.16-.67.3-.93.45a3.44,3.44,0,0,0,0-.91c0-.22,0-.44-.07-.66l.73-.19C87.75,74.34,87.8,74.59,87.86,74.85Z"/>
+                <path class="cls-5"
+                      d="M87.93,76a4.59,4.59,0,0,1-.11.84,9.21,9.21,0,0,0-1.15.25,4.8,4.8,0,0,0,.26-.81Z"/>
+                <path class="cls-5"
+                      d="M87.82,76.8a5.1,5.1,0,0,1-.32,1h0l-.73,0-.57.07a4.5,4.5,0,0,0,.31-.55,3.54,3.54,0,0,0,.16-.34A9.21,9.21,0,0,1,87.82,76.8Z"/>
+                <path class="cls-5" d="M87.49,73.41c.07.22.14.45.2.68l-.73.19a6.17,6.17,0,0,0-.09-.62Z"/>
+                <path class="cls-5"
+                      d="M87.49,73.41l-.62.25c-.09-.51-.19-1-.28-1.36a2.9,2.9,0,0,0-.31-.76c-.12-.14-.25-.17-.24-.23s.14-.09.38,0a1.82,1.82,0,0,1,.59.79s0,0,0,0A8.32,8.32,0,0,1,87.49,73.41Z"/>
+                <path class="cls-5"
+                      d="M85.23,39.5a3.26,3.26,0,0,1,2.7-.27,10.76,10.76,0,0,0-3.88,1.08l-.06,0A7.65,7.65,0,0,1,85.23,39.5Z"/>
+                <path class="cls-5"
+                      d="M86.77,77.87l.73,0a8.25,8.25,0,0,1-.66,1.25,10.41,10.41,0,0,1-.93,1,12.48,12.48,0,0,1-2.29,1.78,3.52,3.52,0,0,1-1,.39,5.18,5.18,0,0,1-1.87.13c-.76-.08-1.24-.27-1.24-.35s.52,0,1.25-.1a4.81,4.81,0,0,0,2.4-.77,13.31,13.31,0,0,0,1.94-1.82,11.77,11.77,0,0,0,.76-1s.14-.19.32-.48Z"/>
+                <path class="cls-5" d="M87,75.85c0,.13,0,.27-.07.39-.39.11-.63.17-.65.12S86.52,76.1,87,75.85Z"/>
+                <path class="cls-5"
+                      d="M86.87,73.66a6.17,6.17,0,0,1,.09.62,6.61,6.61,0,0,1-2.09.42A6.94,6.94,0,0,1,86.87,73.66Z"/>
+                <path class="cls-5"
+                      d="M86.67,77.05a3.54,3.54,0,0,1-.16.34,4.5,4.5,0,0,1-.31.55c-.88.12-1.64.28-1.68.15s1-.7,2.1-1Z"/>
+                <path class="cls-5"
+                      d="M85.73,76.13a1.27,1.27,0,0,1-.09.67c-.1.25-.26.4-.48.37a.61.61,0,0,1-.4-.41.69.69,0,0,1,0-.68s.16,0,.26.14c-.22.2,0,.76.22.72s.4-1,.25-.91a4.6,4.6,0,0,0-.47.19s.1-.12.37-.24c.07,0,.15-.1.21,0A.34.34,0,0,1,85.73,76.13Z"/>
+                <path class="cls-5"
+                      d="M84.87,1.72l.76,1.94A5.49,5.49,0,0,0,84,4.22c-.41-.08-.81-.15-1.23-.21l-.63-.11a5.65,5.65,0,0,1,.46-.41A18.13,18.13,0,0,1,84.87,1.72Z"/>
+                <path class="cls-5"
+                      d="M85.08,76.24a1,1,0,0,0,.11.14l0,0,0,0,0,0s0,.14.09,0a.53.53,0,0,0,.07-.15.24.24,0,0,0,0-.12s0,0-.07,0A.79.79,0,0,1,85.08,76.24Zm.45-.21c.15,0,0,.87-.25.91s-.44-.52-.22-.72A4.6,4.6,0,0,1,85.53,76Z"/>
+                <path class="cls-5"
+                      d="M85.41,76.24a.24.24,0,0,1,0,.12.53.53,0,0,1-.07.15c0,.1-.12,0-.09,0l0,0,0,0,0,0a1,1,0,0,1-.11-.14.79.79,0,0,0,.26,0S85.4,76.21,85.41,76.24Z"/>
+                <path class="cls-5"
+                      d="M84.9,1.62l0,.1a18.13,18.13,0,0,0-2.25,1.77,5.65,5.65,0,0,0-.46.41l-.79-.12-.72-.11a4.86,4.86,0,0,0-.56,0,16.22,16.22,0,0,0-2.62.2c-.55.08-1.09.18-1.63.28l0,0a8.85,8.85,0,0,0-1.24-1.72,2.4,2.4,0,0,0-.81-.54L73.62.66C74.74.53,75.92.4,77.14.34A17.16,17.16,0,0,1,80.4.43a8,8,0,0,1,.9.18L82,.79c.47.14.94.26,1.41.39S84.41,1.47,84.9,1.62Z"/>
+                <path class="cls-5"
+                      d="M84.66,73.65a1,1,0,0,1-.37.62.82.82,0,0,1-.71.16.35.35,0,0,1-.24-.42,1.05,1.05,0,0,1,.23-.43l.12-.14s.13,0,.25.16c-.48.48-.43.7,0,.6s.81-.82.4-.7l-.4.1s.14-.11.44-.21a.2.2,0,0,1,.22,0A.33.33,0,0,1,84.66,73.65Z"/>
+                <path class="cls-5"
+                      d="M84.34,73.5c.41-.12,0,.62-.4.7s-.48-.12,0-.6a1.09,1.09,0,0,1,.18.23l-.07,0s0,.1.07,0a.37.37,0,0,0,.14-.12c.07-.07,0-.19,0-.16s-.28,0-.29,0Z"/>
+                <path class="cls-5"
+                      d="M84.33,76.78a1.23,1.23,0,0,1-.4,1.09c-.57.4-.78.47-1,1.33a1.16,1.16,0,0,1-.42.54.92.92,0,0,1-.28.14.28.28,0,0,1-.22,0,0,0,0,0,1,0-.05,1.65,1.65,0,0,1,.11-.36.49.49,0,0,0,0-.2c0-.09-.09,0-.06-.4,0-.09,0-.06,0-.07H82l-.14,0a.86.86,0,0,0-.25.1c-.15,0-.23.06-.24,0s0-.08.16-.18a1,1,0,0,1,.68-.25c.17.16,0,.37,0,.54s.1,0,.14,0a.43.43,0,0,0,.15-.15.53.53,0,0,0,.12-.37v-.06a.66.66,0,0,1,0-.15.7.7,0,0,1,.08-.16,1,1,0,0,1,.12-.2,2.19,2.19,0,0,1,.34-.34c.11-.11.26-.21.31-.26.26-.23.13-.68-.2-1.08a2.17,2.17,0,0,0-.57-.48,1.61,1.61,0,0,0-.67-.22,5.82,5.82,0,0,0-1.56,0l-.1,0-.2.07-.36.13-.42.13a2.24,2.24,0,0,1-.51,0,2.14,2.14,0,0,1-.44-.08s0,0-.12,0a4.8,4.8,0,0,0-.48.08,9.32,9.32,0,0,0-1,.35,4.54,4.54,0,0,0-1.67,1.05,2.67,2.67,0,0,0-.71,1.68,2.62,2.62,0,0,0,.18,1,.84.84,0,0,0,.63.56,3.06,3.06,0,0,0,2.11-.52,3.58,3.58,0,0,0,.45-.31l.2-.17s.08-.07.11-.11a.33.33,0,0,0,.12-.27c0-.1-.13-.14-.21-.17a2.25,2.25,0,0,0-.72-.06.77.77,0,0,0-.52.18,1.94,1.94,0,0,0-.22.34c-.06.09-.12.11-.13.1s0-.06,0-.14a1,1,0,0,1,.15-.45,1,1,0,0,1,.66-.37,2.43,2.43,0,0,1,1,0,.68.68,0,0,1,.51.37.75.75,0,0,1-.14.68,3,3,0,0,1-.22.31l-.23.23a3.88,3.88,0,0,1-.49.4c-.19.13-.39.25-.59.36a.79.79,0,0,1-.27-.26s-.17,0-.29.11-.2.21-.18.24l.14.17a3.27,3.27,0,0,1-1.45.16,1.74,1.74,0,0,1-1.28-1,3.42,3.42,0,0,1-.33-1.4,3.62,3.62,0,0,1,.87-2.37,4.47,4.47,0,0,1,1.4-1.12,6.59,6.59,0,0,1,.65-.31,7,7,0,0,1,1.22-.36,5,5,0,0,1,.66-.09,1.55,1.55,0,0,1,.52.07,1,1,0,0,0,.22,0h.2l.3-.08.36-.11.2-.06a1.57,1.57,0,0,1,.28-.06,6.75,6.75,0,0,1,1.84,0,2.62,2.62,0,0,1,1,.4,3.08,3.08,0,0,1,.73.71A2.18,2.18,0,0,1,84.33,76.78Z"/>
+                <path class="cls-5"
+                      d="M84.23,73.64c.07,0,.1.09,0,.16a.37.37,0,0,1-.14.12c-.08,0-.12,0-.07,0l.07,0a1.09,1.09,0,0,0-.18-.23S84.1,73.64,84.23,73.64Z"/>
+                <path class="cls-5"
+                      d="M82.79,4c.42.06.82.13,1.23.21-.23.11-.47.23-.74.39A13.48,13.48,0,0,0,82,5.46,6.39,6.39,0,0,0,80.7,6.84,14.63,14.63,0,0,0,79.51,9a27.31,27.31,0,0,0-1.34,3.58l-.27.87s-.05.07-.06,0l0-.23-.06-.45c0-.29-.07-.58-.11-.87-.09-.58-.16-1.14-.23-1.67a10.17,10.17,0,0,0-.37-1.58,9.74,9.74,0,0,0-.42-1,12.38,12.38,0,0,0-1.84-2.74c-.18-.2-.35-.36-.5-.51.52-.11,1-.22,1.55-.31a23.37,23.37,0,0,1,1.48,3.12,10.71,10.71,0,0,1,.37,1.09,5.5,5.5,0,0,1,.18.88c0,.33.07.67.1,1l.06.56,0,.28v.15c0,.06,0,0,0-.07l.15-.46c.26-.76.53-1.49.77-2.09a22.48,22.48,0,0,1,1.09-2.25,8.77,8.77,0,0,1,1.29-1.72c.26-.26.51-.5.75-.71Z"/>
+                <path class="cls-10" d="M83.81,40.42l.17-.08a.79.79,0,0,0-.19.17A.29.29,0,0,1,83.81,40.42Z"/>
+                <path class="cls-5"
+                      d="M84,39.9a4.44,4.44,0,0,0-.15.52,12.59,12.59,0,0,0-1.12.63A5.7,5.7,0,0,1,84,39.9Z"/>
+                <path class="cls-10"
+                      d="M83.94,56.71a5.44,5.44,0,0,1-1.45-.11.72.72,0,0,0-.52.1c0-.7,0-1.38.07-2,0-.2,0-.4,0-.58A4.1,4.1,0,0,0,83.94,56.71Z"/>
+                <path class="cls-5"
+                      d="M84.06,107.45a1,1,0,0,1-.25.63,1.88,1.88,0,0,1-.44.37,2.92,2.92,0,0,1-.85.48,1.52,1.52,0,0,1-.7.06.52.52,0,0,0,0-.11,1.53,1.53,0,0,0,.6-.16,3.44,3.44,0,0,0,.74-.53c.26-.22.5-.46.47-.74a3.74,3.74,0,0,0-.84-1.65,1.22,1.22,0,0,0-.63-.42s-.05-.1-.05-.22v-.07c0-.16.07-.29.16-.28a2.39,2.39,0,0,1,.33.13,2,2,0,0,1,.6.51,3.85,3.85,0,0,1,.52.87A3,3,0,0,1,84.06,107.45Z"/>
+                <path class="cls-7"
+                      d="M83.65,107.45c0,.28-.21.52-.47.74a3.44,3.44,0,0,1-.74.53,1.53,1.53,0,0,1-.6.16c.06-.39.11-.75.14-1.09a11.49,11.49,0,0,0,.1-1.78,8,8,0,0,0,0-.85h0c0,.12,0,.22.05.22a1.22,1.22,0,0,1,.63.42A3.74,3.74,0,0,1,83.65,107.45Z"/>
+                <path class="cls-5"
+                      d="M83.79,40.51c-.17.67-.31,1.34-.43,2-.63,3.49-.79,5.93-.82,6.08s-.29,2.28-.46,5.53a19.85,19.85,0,0,1-.43-6.41C81.83,43.67,82.26,41.86,83.79,40.51Z"/>
+                <path class="cls-12"
+                      d="M83.27,76.29c.33.4.46.85.2,1.08,0,0-.2.15-.31.26a2.19,2.19,0,0,0-.34.34,1,1,0,0,0-.12.2.7.7,0,0,0-.08.16.66.66,0,0,0,0,.15v.06a.53.53,0,0,1-.12.37.43.43,0,0,1-.15.15s-.14.1-.14,0,.2-.38,0-.54a1,1,0,0,0-.68.25c-.12.1-.17.16-.16.18s.09,0,.24,0a.86.86,0,0,1,.25-.1l.14,0h.09s0,0,0,.07c0,.36.08.31.06.4a.49.49,0,0,1,0,.2,1.65,1.65,0,0,0-.11.36,0,0,0,0,0,0,.05v0c-.1,0-.16.06-.26.09s-.46.35-.69.49a1.06,1.06,0,0,1-.77.22.31.31,0,0,0,.08-.26c0-.15-.15-.14-.16-.13a.49.49,0,0,1,0,.16c0,.07-.14.16-.31.23a6.21,6.21,0,0,1-1.4.39,2.88,2.88,0,0,1-1.35,0,.29.29,0,0,1-.12-.07c.2-.11.4-.23.59-.36a3.88,3.88,0,0,0,.49-.4l.23-.23a3,3,0,0,0,.22-.31.75.75,0,0,0,.14-.68.68.68,0,0,0-.51-.37,2.43,2.43,0,0,0-1,0,1,1,0,0,0-.66.37,1,1,0,0,0-.15.45c0,.08,0,.13,0,.14s.07,0,.13-.1a1.94,1.94,0,0,1,.22-.34.77.77,0,0,1,.52-.18,2.25,2.25,0,0,1,.72.06c.08,0,.19.07.21.17a.33.33,0,0,1-.12.27s-.08.07-.11.11l-.2.17a3.58,3.58,0,0,1-.45.31,3.06,3.06,0,0,1-2.11.52.84.84,0,0,1-.63-.56,2.62,2.62,0,0,1-.18-1,2.67,2.67,0,0,1,.71-1.68,4.54,4.54,0,0,1,1.67-1.05,9.32,9.32,0,0,1,1-.35,4.8,4.8,0,0,1,.48-.08c.1,0,.09,0,.12,0a2.14,2.14,0,0,0,.44.08,2.24,2.24,0,0,0,.51,0l.42-.13.36-.13.2-.07.1,0a5.82,5.82,0,0,1,1.56,0,1.61,1.61,0,0,1,.67.22A2.17,2.17,0,0,1,83.27,76.29Z"/>
+                <path class="cls-5"
+                      d="M83.4,95.65a5,5,0,0,1-.15,1.26c-.18.7-.46,1.44-.68,2.26-.3,1-.52,2-.67,2.67,0-.3-.08-.65-.15-1s-.08-.49-.12-.75.07-.71.13-1.09c.12-.83.36-1.73.44-2.29a3.69,3.69,0,0,0,0-.69,1.46,1.46,0,0,0,0-.26A1.53,1.53,0,0,0,82,95a3.22,3.22,0,0,0-1.67-1.08l-.19-.08c-.08-.32-.16-.63-.26-.94.23.09.47.16.71.23a4,4,0,0,1,2.3,1.25,2.25,2.25,0,0,1,.41.91A3.37,3.37,0,0,1,83.4,95.65Z"/>
+                <path class="cls-5"
+                      d="M82.68,82.42s-.14.5-.65,1.07A5.24,5.24,0,0,1,79.66,85a7.93,7.93,0,0,1-1.81.32.2.2,0,0,1,0-.07.57.57,0,0,0-.56-.54l-.87.35,0-.72.22-.15a3.29,3.29,0,0,0,.36.07,8.13,8.13,0,0,0,2.49-.06,5.54,5.54,0,0,0,2.27-1c.51-.39.82-.75.93-.75Z"/>
+                <path class="cls-7"
+                      d="M82.24,96a3.69,3.69,0,0,1,0,.69c-.08.56-.32,1.46-.44,2.29-.06.38-.1.74-.13,1.09-.28-1.53-.72-3.37-1.19-5.21l-.28-1.06.19.08A3.22,3.22,0,0,1,82,95a1.53,1.53,0,0,1,.2.78A1.46,1.46,0,0,1,82.24,96Z"/>
+                <path class="cls-5"
+                      d="M82.08,80.07c-.11.08-.38.42-.74.79a1.31,1.31,0,0,1-1,.33,1,1,0,0,1-.43-.14l.17-.11a.7.7,0,0,0,.22-.2h0a1.06,1.06,0,0,0,.77-.22c.23-.14.48-.37.69-.49s.16-.11.26-.09a.17.17,0,0,1,.11,0,.07.07,0,0,1,0,.08v0S82.17,80.14,82.08,80.07Z"/>
+                <path class="cls-5"
+                      d="M82.08,105.16a8,8,0,0,1,0,.85,11.49,11.49,0,0,1-.1,1.78c0,.34-.08.7-.14,1.09-.16,0-.26,0-.26,0s.08.07.24.09a27.84,27.84,0,0,1-3.48,9.16q-.84,1.48-1.89,3c.15-.61.2-1,.1-1s-1.19,1.73-2.18,3.55c-.18.31-.34.63-.51.93l0,0a9,9,0,0,1-2.94,2.24,16.18,16.18,0,0,1-4.11,1.32c-.38.08-.78.15-1.17.2,0-.06,0-.11,0-.16s0-.24,0-.31v-.05h-.08l-.66,0-1,0c0,.06,0,.32.05.78h-.11c0-.49-.08-.76-.15-.77s-.1.28-.2.8l-1,0a24.76,24.76,0,0,1-4.53-.13A16.43,16.43,0,0,1,54,127.45c-.15-.3-.31-.56-.44-.77l0,0,.12-.34-2.19-.79s-.06.21-.21.59c-.65-.4-1.29-.82-1.91-1.26a30.73,30.73,0,0,1-3.57-3c-.12-.12-.24-.25-.34-.37a1.41,1.41,0,0,0,.21-1.08,16.63,16.63,0,0,1-.83-2.51l.24-.12a12.13,12.13,0,0,0,2,2.87l.24.24-.06,0,.29.43.15-.11c.38.37.78.73,1.19,1.08a.36.36,0,0,1-.31-.06l-.27.45a1,1,0,0,0,.49.14.7.7,0,0,0,.5-.19l1.08.84a18.06,18.06,0,0,0,7.76,3.56,26.16,26.16,0,0,0,4.26.21,29.92,29.92,0,0,0,4.18-.38c2.69-.48,5.25-1.42,6.74-3.39a47.32,47.32,0,0,0,4.27-5.83,27.07,27.07,0,0,0,4-10c.41-2.57.23-4.09.36-4.09A4.07,4.07,0,0,1,82,104.7C82.05,104.84,82.06,105,82.08,105.16Z"/>
+                <path class="cls-8" d="M82,56.7q0,.45,0,.93A.56.56,0,0,1,81.7,57,.51.51,0,0,1,82,56.7Z"/>
+                <path class="cls-5"
+                      d="M81.9,101.84c.12,1.08.09,1.77,0,1.79s-.47-.9-1-2.28h0c0-.08-.06-.18-.09-.27-.37-1-.81-2.24-1.29-3.55l.25-.23a5.9,5.9,0,0,0,.65-.83.48.48,0,0,0-.29-.67c-.3-.14-.59-.12-.7,0,0,0-.12.19-.36.48-.1-.3-.22-.6-.33-.92-.19-.5-.39-1-.56-1.49a1.17,1.17,0,0,0,.2-.06l.59-.14-.64-1.19a6,6,0,0,0,1.84,1.29l.28,1.06c.47,1.84.91,3.68,1.19,5.21-.13,1.28-.09,2.34.08,2.34S81.82,102.2,81.9,101.84Z"/>
+                <path class="cls-7"
+                      d="M80.89,101.35c.51,1.38.81,2.3,1,2.28-.13,0,0,1.52-.36,4.09a27.07,27.07,0,0,1-4,10,47.32,47.32,0,0,1-4.27,5.83c-1.49,2-4.05,2.91-6.74,3.39a29.92,29.92,0,0,1-4.18.38,26.16,26.16,0,0,1-4.26-.21,18.06,18.06,0,0,1-7.76-3.56l-1.08-.84h0a2.73,2.73,0,0,0,.47-2.3.31.31,0,0,0-.33-.21c-.18,0-1,0-1.49,0l-.36,0,.1.34s-.06.22-.38.44l-.24-.24a12.13,12.13,0,0,1-2-2.87c-.11-.21-.21-.43-.32-.64-.18-.36-.34-.73-.49-1.11a.58.58,0,0,0,.25,0,.66.66,0,0,0,.49-.55.88.88,0,0,0-.3-.74,1.16,1.16,0,0,0-.32-.2,2.09,2.09,0,0,1-.74-.32l-.1-.07a43.49,43.49,0,0,1-1.36-5c-.27-1.32-.5-2.63-.67-3.92a2,2,0,0,1,.23-.08c.45-.13,1.16-.34,2.15-.68a18.65,18.65,0,0,0,3.74-1.7c.73-.46,1.48-1,2.28-1.62L51.25,100c.55-.44.84-.82,1.39-1.29,0-.08.57-.61,1-1l0,0a12.26,12.26,0,0,1-1.7.11c-.7.08-1.45.15-2,.17l-1.46,0a14.44,14.44,0,0,1-2.5-.18,9.35,9.35,0,0,1-3.28-1.15,6.13,6.13,0,0,1-1.21-.94c.07-.52.15-1,.24-1.52a28.67,28.67,0,0,1,.74-2.94,8.35,8.35,0,0,0,1.45.35,12.55,12.55,0,0,0,3.54-.14l1.1-.15c.46-.09.94-.17,1.45-.25l1.58-.29.84-.17c.23,0,.07,0,0-.09s-.25,0-.27-.1-.29-.18-.29-.2l-.31-.12,3-.45s0,0,0,0A27.49,27.49,0,0,0,57.73,87c.79-.66,1.61-1.3,2.24-1.72.32-.23.6-.41.8-.53a28.94,28.94,0,0,0,6.09,1.68,15.74,15.74,0,0,0,3.48,0,0,0,0,0,1,0,0c.06.1.22.17.33.26a5,5,0,0,0,.79.49,2.9,2.9,0,0,0,.83.28,4.66,4.66,0,0,0,2.09-.06,10.12,10.12,0,0,0,1.18-.4c0,.09.12.29.23.58a.51.51,0,0,1,.13.34h0s0,0,0,0h0s0,0,0,.08a2.32,2.32,0,0,1-.33.91,3.74,3.74,0,0,1-.32.5A3.93,3.93,0,0,1,73,90.75c-.27.06-.58.11-.9.16l-1.08.19a7.42,7.42,0,0,0-1.26.24l-.29.07-.16,0s0,.11,0,.15a3.33,3.33,0,0,0,.27.61,3.63,3.63,0,0,0,.93,1.06,5.33,5.33,0,0,0,1,.64,6.34,6.34,0,0,0,2,.55,12.16,12.16,0,0,0,3.05-.22l1.51-.33h0c.17.5.37,1,.56,1.49.11.32.23.62.33.92a1.77,1.77,0,0,1-.15.18,4.63,4.63,0,0,1-1.72,1.2,6.64,6.64,0,0,1-3.08.43c-.6,0-1.24-.09-1.87-.16a14.82,14.82,0,0,1-1.68-.3c-.63-.13-1.47-.41-2.3-.63l.21.24,0,.07,0,0,.08.07.63.58a15.51,15.51,0,0,0,1.32,1.14c.24.2.51.37.75.56l.52.33c.33.21.67.4,1,.57a9.32,9.32,0,0,0,4,1.08A9.54,9.54,0,0,0,80.89,101.35Zm-3.41,6.31A5.93,5.93,0,0,0,78,107a8.2,8.2,0,0,0-.8-.22,2.67,2.67,0,0,0-.48-.08c-.29,0-.56,0-.54.1s.2.07.47.19l.43.18c.11,0,.08.06.09.07s0,0-.11.07l-.19.21a1.27,1.27,0,0,1-.43.31c-.16,0-.27,0-.29-.19s0-.28,0-.3-.14.07-.19.29a.46.46,0,0,0,.09.4.61.61,0,0,0,.46.2A1.71,1.71,0,0,0,77.48,107.66Zm-.25,5.26a.32.32,0,0,0,0-.52,2.91,2.91,0,0,0-1.31-.1l-.59,0a2.57,2.57,0,0,0-.55.06,6.88,6.88,0,0,0-1.83.74,2.43,2.43,0,0,1-.56.25c-.14,0-.22,0-.23,0s-.16,0-.17.21a1.09,1.09,0,0,0,.31.6,1.15,1.15,0,0,0,1.87.19,8.34,8.34,0,0,1,1.63-1,1,1,0,0,1,.19-.07l.32-.1c.2-.07.37-.13.53-.17A2.34,2.34,0,0,0,77.23,112.92Zm-2,6.94c.09-.38-.29-.53-.54-.45a2.07,2.07,0,0,0-.36.08,6,6,0,0,0-1.1.61c-.5.33-.94.74-.88.81a5.65,5.65,0,0,0,1.09-.45,7.69,7.69,0,0,1,.74-.3l.34-.12a.61.61,0,0,0,.12-.05s.06,0,.06,0a2.43,2.43,0,0,1-.07.39c0,.17-.08.33-.12.45-.08.29-.28.25-.31.3s0,.07.15.08a.47.47,0,0,0,.39-.23,3.67,3.67,0,0,0,.26-.48A5.78,5.78,0,0,0,75.28,119.86Zm-8.08-7a.31.31,0,0,0-.12-.41,1,1,0,0,0-.26-.08s-.25,0-.56,0a5.12,5.12,0,0,0-1.2.05,1.41,1.41,0,0,0-.92.82c-.12.31-.14.51-.1.52a3.91,3.91,0,0,0,1.66-.11,2.75,2.75,0,0,0,1.1-.51.37.37,0,0,1,.14-.07l.1,0C67.09,113,67.12,113,67.2,112.86Zm-1.65,5.55c0-.23-.2-.42-.39-.5a5.67,5.67,0,0,0-.93-.24l-.64-.06a1.8,1.8,0,0,0-1.39.55,2.16,2.16,0,0,0-.64,1.87,3.9,3.9,0,0,1,.92-1.57,1.37,1.37,0,0,1,1.06-.31l.61.11a5.27,5.27,0,0,1,.81.13c.05,0,.05,0,.07,0v0a.83.83,0,0,1-.11.15,7.65,7.65,0,0,1-.59.57c-.61.25-1.22.33-1.22.39a2.3,2.3,0,0,0,1.37-.09,4.72,4.72,0,0,0,.75-.56,1.52,1.52,0,0,0,.17-.18A.73.73,0,0,0,65.55,118.41Zm-6.25,4.84a.44.44,0,0,0,.12-.43c0-.16-.23-.28-.38-.35-.57-.25-1.08,0-1,.08s.12,0,.28,0a1.77,1.77,0,0,1,.49.21c.07,0,0,.09,0,.09s-.1,0-.1,0a2.28,2.28,0,0,1-.82.14,1.14,1.14,0,0,1-.32-.05c-.12,0,.07,0,.08.11a.94.94,0,0,1,.1.14s-.08,0-.09,0,0,0,0,.1,0,.09,0,.09l.18,0a1.87,1.87,0,0,0,.72.07,1.83,1.83,0,0,0,.33-.05A1.37,1.37,0,0,0,59.3,123.25ZM55,111.84a.4.4,0,0,0,.1-.3.42.42,0,0,0-.13-.27.7.7,0,0,0-.29-.17,2,2,0,0,0-.54-.11,5.16,5.16,0,0,0-1.38.1c-.46.09-.93.12-1.29.16l-.26,0a.31.31,0,0,0-.12,0c-.05,0-.08.12-.05.15s.16.1.17.1,0,0,0-.12a1.55,1.55,0,0,1,.31,0,8.14,8.14,0,0,0,1.33,0,5.81,5.81,0,0,1,1.27,0l.33.08h0s.06,0,0,.06c-.31.23-.63.67-1,.74a1.22,1.22,0,0,1-.6-.09c-.21-.06-.42-.11-.59-.17a1.61,1.61,0,0,0-.6-.1s.19.16.51.32.37.17.56.26a1.56,1.56,0,0,0,.77.19,1.54,1.54,0,0,0,.75-.34,5.59,5.59,0,0,1,.48-.38A1,1,0,0,0,55,111.84Z"/>
+                <path class="cls-5"
+                      d="M81.75,100.83c.07.36.11.71.15,1s-.15.58-.19.58-.21-1.06-.08-2.34Q81.69,100.47,81.75,100.83Z"/>
+                <path class="cls-5"
+                      d="M81.84,108.88a.52.52,0,0,1,0,.11c-.16,0-.24-.07-.24-.09S81.68,108.89,81.84,108.88Z"/>
+                <path class="cls-6"
+                      d="M82.16,3.9c-.24.21-.49.45-.75.71a8.77,8.77,0,0,0-1.29,1.72A22.48,22.48,0,0,0,79,8.58c-.24.6-.51,1.33-.77,2.09l-.15.46s0,.13,0,.07v-.15l0-.28L78,10.21c0-.35-.06-.69-.1-1a5.5,5.5,0,0,0-.18-.88,10.71,10.71,0,0,0-.37-1.09A23.37,23.37,0,0,0,75.84,4.1c.54-.1,1.08-.2,1.63-.28a16.22,16.22,0,0,1,2.62-.2,4.86,4.86,0,0,1,.56,0l.72.11Z"/>
+                <path class="cls-5"
+                      d="M80.89,101.34h0a9.54,9.54,0,0,1-4,.36,9.32,9.32,0,0,1-4-1.08c-.33-.17-.67-.36-1-.57l-.52-.33c-.24-.19-.51-.36-.75-.56A15.51,15.51,0,0,1,69.25,98l-.63-.58-.08-.07,0,0,0-.07L68.26,97c.83.22,1.67.5,2.3.63a14.82,14.82,0,0,0,1.68.3c.63.07,1.27.13,1.87.16a6.64,6.64,0,0,0,3.08-.43,4.63,4.63,0,0,0,1.72-1.2,1.77,1.77,0,0,0,.15-.18c.16.4.3.81.45,1.2a5.66,5.66,0,0,1-1.92,1.2,7.69,7.69,0,0,1-3.54.4c-.62-.05-1.28-.12-1.93-.22a1.88,1.88,0,0,1-.34-.08l-.28-.07s-.15,0-.14,0l.08.09a1.79,1.79,0,0,0,.24.22l.14.12.42.3c.31.21.62.39.93.58a9.16,9.16,0,0,0,3.73,1.21,18.54,18.54,0,0,0,2.88.14A7.14,7.14,0,0,1,80.89,101.34Z"/>
+                <path class="cls-6"
+                      d="M80.8,101.07c0,.09.06.19.09.27a7.14,7.14,0,0,0-1.11,0,18.54,18.54,0,0,1-2.88-.14A9.16,9.16,0,0,1,73.17,100c-.31-.19-.62-.37-.93-.58l-.42-.3L71.68,99a1.79,1.79,0,0,1-.24-.22l-.08-.09s.1,0,.14,0l.28.07a1.88,1.88,0,0,0,.34.08c.65.1,1.31.17,1.93.22a7.69,7.69,0,0,0,3.54-.4,5.66,5.66,0,0,0,1.92-1.2C80,98.83,80.43,100.06,80.8,101.07Z"/>
+                <path class="cls-5"
+                      d="M80.12,95.79a.48.48,0,0,1,.29.67,5.9,5.9,0,0,1-.65.83l-.25.23c-.15-.39-.29-.8-.45-1.2.24-.29.34-.47.36-.48C79.53,95.67,79.82,95.65,80.12,95.79Z"/>
+                <path class="cls-5"
+                      d="M80,80.77c0,.07,0,.07,0,.07s0,.09-.12.1,0,.07,0,.09l0,0a6,6,0,0,1-1.22.48,3.23,3.23,0,0,1-1.62.11,1.26,1.26,0,0,1-.55-.33,4,4,0,0,0,.6-.26.29.29,0,0,0,.12.07,2.88,2.88,0,0,0,1.35,0,6.21,6.21,0,0,0,1.4-.39c.17-.07.3-.16.31-.23a.49.49,0,0,0,0-.16s.11,0,.16.13a.31.31,0,0,1-.08.26h0l-.1,0s-.13.09-.17.13h0A.1.1,0,0,0,80,80.77Z"/>
+                <path class="cls-5"
+                      d="M80.22,80.71l.1,0a.7.7,0,0,1-.22.2l-.17.11h0l0,0s0,0,0-.09.12,0,.12-.1h0S80.19,80.71,80.22,80.71Z"/>
+                <path class="cls-5"
+                      d="M79.9,92.87c.1.31.18.62.26.94a6,6,0,0,1-1.84-1.29h0L78,91.88a.84.84,0,0,1-.11.11c-.14-.19-.19-.33-.15-.36S78.69,92.38,79.9,92.87Z"/>
+                <path class="cls-5"
+                      d="M68,146.2h0c.11.52.22,1,.32,1.55L71,149.22l4.32.05a4.19,4.19,0,0,0,1.9-.2,1.66,1.66,0,0,0,.63-.53,1.16,1.16,0,0,0,.16-.21s0,0,0,.07a.58.58,0,0,1,0,.19l0,0,.48.34c.15-.18.07-.64-.24-1a.46.46,0,0,1,.09-.15l.53-.86.14-.27.06.13.53-.24a1.9,1.9,0,0,0-.3-.41,1.36,1.36,0,0,0-.25-.22,2.18,2.18,0,0,0-.57-1.19,1.31,1.31,0,0,0-1.29-.49,12.61,12.61,0,0,0-1.53.68,15.27,15.27,0,0,1-2.91,1.1,9.79,9.79,0,0,1-2.39.05c-.64,0-1.14,0-1.5,0h-.16l.37-.08.27-.06h.16v-.11h0a6.31,6.31,0,0,1,.85-.11,11.27,11.27,0,0,0,2.29-.2,17,17,0,0,0,2.72-1.2,10.33,10.33,0,0,1,1.63-.8,1.78,1.78,0,0,1,1.14,0,2.66,2.66,0,0,1,.93.6,3.14,3.14,0,0,1,.94,2,1.21,1.21,0,0,1-.06.69c-.1.22-.16.36-.24.52-.17.32-.35.63-.52.93s-.37.61-.61.94a2.6,2.6,0,0,1-1,.85,5.28,5.28,0,0,1-2.38.37l-4.6.07-3.51-1.81c-.63-2.73-1.24-5.4-1.8-7.87-.14-.57-.27-1.11-.41-1.64a3,3,0,0,1-.08-.37l0-.23-.05-.44c0-.29-.08-.57-.11-.85-.11-1.1-.22-2.13-.31-3.09-.18-1.9-.33-3.47-.43-4.55q-.06-.61-.09-1c.58-.05,1.17-.11,1.74-.21,0,.27,0,.64.07,1.08.08,1.1.2,2.65.34,4.56.08.94.17,2,.25,3.07,0,.48.11,1,.16,1.5.07.24.09.37.13.52l.1.44c.07.3.13.59.19.89.38,1.83.78,3.84,1.18,5.76Zm10.06,2.44h.08l-.09,0Z"/>
+                <path class="cls-8" d="M80,80.84c-.05,0,0,0,0-.07A.1.1,0,0,1,80,80.84Z"/>
+                <path class="cls-8"
+                      d="M79.69,146.47l-.53.24-.06-.13.06-.13c.06-.1,0-.1,0-.29a3.11,3.11,0,0,0,0-.32,1.36,1.36,0,0,1,.25.22A1.9,1.9,0,0,1,79.69,146.47Z"/>
+                <path class="cls-8"
+                      d="M79.18,146.16c0,.19,0,.19,0,.29l-.06.13a1.28,1.28,0,0,0-.76-.63,3.78,3.78,0,0,0-.88,0,.79.79,0,0,0-.29,0c-.09,0-.13,0-.14,0s0-.05.1-.09a.46.46,0,0,1,.29-.17,2.91,2.91,0,0,1,1-.13,1.41,1.41,0,0,1,.71.29A3.11,3.11,0,0,1,79.18,146.16Z"/>
+                <path class="cls-7"
+                      d="M79.1,146.58l-.14.27-.53.86a.46.46,0,0,0-.09.15,1.64,1.64,0,0,0-.55-.49,2.15,2.15,0,0,0-1.06-.15c-.28,0-.46,0-.46.05s.18.11.44.17a2.56,2.56,0,0,1,.86.28,1.33,1.33,0,0,1,.45.61,1.16,1.16,0,0,1-.16.21,1.66,1.66,0,0,1-.63.53,4.19,4.19,0,0,1-1.9.2L71,149.22l-2.65-1.47c-.1-.51-.21-1-.32-1.55h0l.12,0h0l.58-.11H69c.36,0,.86-.07,1.5,0a9.79,9.79,0,0,0,2.39-.05,15.27,15.27,0,0,0,2.91-1.1,12.61,12.61,0,0,1,1.53-.68,1.31,1.31,0,0,1,1.29.49,2.18,2.18,0,0,1,.57,1.19,1.41,1.41,0,0,0-.71-.29,2.91,2.91,0,0,0-1,.13.46.46,0,0,0-.29.17c-.07,0-.11.07-.1.09s0,0,.14,0a.79.79,0,0,1,.29,0,3.78,3.78,0,0,1,.88,0A1.28,1.28,0,0,1,79.1,146.58Z"/>
+                <path class="cls-5"
+                      d="M78.32,92.52,79,93.71l-.59.14a1.17,1.17,0,0,1-.2.06h0c-.21-.56-.42-1.13-.63-1.66l.11-.07.22-.19a3.24,3.24,0,0,0,.45.52Z"/>
+                <path class="cls-5"
+                      d="M78.79,89c.33,1.11.73,2.47,1.11,3.91-1.21-.49-2.11-1.32-2.19-1.24s0,.17.15.36l-.22.19-.11.07c-.3-.81-.58-1.57-.84-2.24a5,5,0,0,0,.82-1,2.64,2.64,0,0,0,.32-.65L75.94,88s0,0,0,0h0a.51.51,0,0,0-.13-.34c-.11-.29-.19-.49-.23-.58a13.09,13.09,0,0,0,1.89-1,.83.83,0,0,0,.33-.43C78,86.29,78.42,87.72,78.79,89Z"/>
+                <path class="cls-8"
+                      d="M78.34,147.86c.31.41.39.87.24,1l-.48-.34,0,0a.58.58,0,0,0,0-.19s0-.05,0-.07S78.24,148,78.34,147.86Z"/>
+                <path class="cls-5"
+                      d="M77.24,83c.76-.62,1.1-1.26,1.22-1.15a1.62,1.62,0,0,1-.18.43,4,4,0,0,1-.73,1,4.5,4.5,0,0,1-.94.83.1.1,0,0,1-.07,0l-.13,0h0v-.19h-.12l-.15,0L76,84h0a.68.68,0,0,0-.17.1.59.59,0,0,0-.23.45.15.15,0,0,0,0,.09,25.74,25.74,0,0,0-2.5.64,12.78,12.78,0,0,1-2.44.49h-.3a8,8,0,0,1-1.91-.31,6.34,6.34,0,0,1-1.75-.86,25,25,0,0,1-2.31-2.16c.1-.06.19-.14.3-.2l.46-.3c.79.69,1.56,1.35,2.16,1.78a5.48,5.48,0,0,0,1,.49l.46.14a7.35,7.35,0,0,0,1.64.34,12.54,12.54,0,0,0,3.63-.2A6.89,6.89,0,0,0,77.24,83Z"/>
+                <path class="cls-8" d="M78,91.88l.34.63a3.24,3.24,0,0,1-.45-.52A.84.84,0,0,0,78,91.88Z"/>
+                <path class="cls-9" d="M78.17,148.65h-.09Z"/>
+                <path class="cls-5"
+                      d="M77.84,85.24a.2.2,0,0,0,0,.07h-.16c0-.09-.1-.07-.19,0a4.41,4.41,0,0,1-.63,0,4.21,4.21,0,0,1-.55-.06,1.19,1.19,0,0,1-.27-.07l-.09,0s.21,0,.21,0l.12,0h.12v0l.87-.35A.57.57,0,0,1,77.84,85.24Z"/>
+                <path class="cls-8" d="M77.69,85.32h.16a.92.92,0,0,1-.06.33C77.73,85.45,77.69,85.33,77.69,85.32Z"/>
+                <path class="cls-5"
+                      d="M77.53,92.25c.21.53.42,1.1.63,1.66l-1.51.33a12.16,12.16,0,0,1-3.05.22,6.34,6.34,0,0,1-2-.55,5.33,5.33,0,0,1-1-.64,3.63,3.63,0,0,1-.93-1.06,3.33,3.33,0,0,1-.27-.61s-.06-.13,0-.15l.16,0,.29-.07a7.42,7.42,0,0,1,1.26-.24l1.08-.19c.32,0,.63-.1.9-.16a3.93,3.93,0,0,0,2.23-1.23,3.74,3.74,0,0,0,.32-.5,2.32,2.32,0,0,0,.33-.91s0-.06,0-.08h0c.2.51.45,1.19.75,2-.15.13-.3.27-.48.4a5.72,5.72,0,0,1-2.95,1.06c-.58.07-1.22.12-1.92.18l-.85.08-.22,0c-.07,0-.19,0-.12.09a1.23,1.23,0,0,0,.21.41,2.52,2.52,0,0,0,.64.66,4.56,4.56,0,0,0,.91.46,4.37,4.37,0,0,0,1.82.3A6.85,6.85,0,0,0,76.34,93,7,7,0,0,0,77.53,92.25Z"/>
+                <path class="cls-5"
+                      d="M75.94,88l1.89.31a2.64,2.64,0,0,1-.32.65,5,5,0,0,1-.82,1C76.39,89.22,76.14,88.54,75.94,88Z"/>
+                <path class="cls-5"
+                      d="M77.69,85.32s0,.13.1.32a.83.83,0,0,1-.33.43,13.09,13.09,0,0,1-1.89,1s0-.07,0-.08c-.11-.29.35-.71,1-.94a3,3,0,0,0,1-.74A1.21,1.21,0,0,0,77.69,85.32Z"/>
+                <path class="cls-8" d="M77.69,85.32a1.21,1.21,0,0,1-.19,0C77.59,85.25,77.66,85.23,77.69,85.32Z"/>
+                <path class="cls-5"
+                      d="M76.87,85.32a4.41,4.41,0,0,0,.63,0,3,3,0,0,1-1,.74c-.65.23-1.11.65-1,.94,0,0,0,0,0,.08a10.12,10.12,0,0,1-1.18.4,4.66,4.66,0,0,1-2.09.06,2.9,2.9,0,0,1-.83-.28,5,5,0,0,1-.79-.49c-.11-.09-.27-.16-.33-.26a0,0,0,0,0,0,0h.15A10,10,0,0,0,72,86.16v0a.51.51,0,0,0,.08.26,1.37,1.37,0,0,0,.47.37,2.46,2.46,0,0,0,1.77.16,2.9,2.9,0,0,0,1.4-.64c.11-.09.37-.24.46-.32s.23-.22.24-.39v-.16a3.18,3.18,0,0,0-.34-.27,1.19,1.19,0,0,0,.27.07A4.21,4.21,0,0,0,76.87,85.32Z"/>
+                <path class="cls-5"
+                      d="M78,107a5.93,5.93,0,0,1-.51.71,1.71,1.71,0,0,1-1,.52A.61.61,0,0,1,76,108a.46.46,0,0,1-.09-.4c0-.22.16-.3.19-.29s0,.14,0,.3.13.21.29.19a1.27,1.27,0,0,0,.43-.31l.19-.21c.06-.07,0,0,.11-.07s0,0-.09-.07l-.43-.18c-.27-.12-.44-.16-.47-.19s.25-.14.54-.1a2.67,2.67,0,0,1,.48.08A8.2,8.2,0,0,1,78,107Z"/>
+                <path class="cls-5"
+                      d="M77.26,112.4a.32.32,0,0,1,0,.52,2.34,2.34,0,0,1-.36.17c-.16,0-.33.1-.53.17l-.32.1a1,1,0,0,0-.19.07,8.34,8.34,0,0,0-1.63,1,1.15,1.15,0,0,1-1.87-.19,1.09,1.09,0,0,1-.31-.6c0-.21.18-.23.17-.21s-.07.07,0,.2a1.13,1.13,0,0,0,.35.46,1.33,1.33,0,0,0,.68.4c.23,0,.52-.19.79-.39a7.91,7.91,0,0,1,1.64-1.15l.16-.07h0a.07.07,0,0,0,.06,0l-.06,0h-.44a4.18,4.18,0,0,0-.5,0,8.48,8.48,0,0,0-1.8.54,2.13,2.13,0,0,1-.64.15c-.17,0-.25-.07-.24-.08s.09,0,.23,0a2.43,2.43,0,0,0,.56-.25,6.88,6.88,0,0,1,1.83-.74,2.57,2.57,0,0,1,.55-.06l.59,0A2.91,2.91,0,0,1,77.26,112.4Z"/>
+                <path class="cls-6"
+                      d="M76.69,90c.26.67.54,1.43.84,2.24a7,7,0,0,1-1.19.72,6.85,6.85,0,0,1-2.61.72,4.37,4.37,0,0,1-1.82-.3,4.56,4.56,0,0,1-.91-.46,2.52,2.52,0,0,1-.64-.66,1.23,1.23,0,0,1-.21-.41c-.07-.09,0-.08.12-.09l.22,0,.85-.08c.7-.06,1.34-.11,1.92-.18a5.72,5.72,0,0,0,2.95-1.06C76.39,90.28,76.54,90.14,76.69,90Z"/>
+                <path class="cls-5"
+                      d="M76.85,80.79a.79.79,0,0,0,.27.26,4,4,0,0,1-.6.26l-.14-.17s.06-.13.18-.24S76.81,80.75,76.85,80.79Z"/>
+                <path class="cls-5"
+                      d="M76.55,120.11c.1,0,0,.43-.1,1-.71,1-1.48,2-2.3,3.06-.09.13-.19.25-.29.38.17-.3.33-.62.51-.93C75.36,121.84,76.33,120,76.55,120.11Z"/>
+                <path class="cls-5" d="M76.54,84.16a.1.1,0,0,0,.07,0l-.22.15v-.17a.08.08,0,0,0,0,0h0Z"/>
+                <path class="cls-5" d="M76.41,85.05v0h-.09Z"/>
+                <path class="cls-5"
+                      d="M76.39,84.33l0,.72-.09,0h0a1.67,1.67,0,0,0-.06-.24.45.45,0,0,1-.06-.2s-.05-.07-.06-.07.06,0,.08-.09l0,0A.76.76,0,0,1,76.39,84.33Z"/>
+                <path class="cls-9" d="M76.4,84.11h0a.08.08,0,0,1,0,0v0Z"/>
+                <path class="cls-5" d="M76.39,84.18v.15a.76.76,0,0,0-.16.11.92.92,0,0,0,.13-.21Z"/>
+                <path class="cls-5"
+                      d="M76.39,84.16v0l0,0a.92.92,0,0,1-.13.21l-.3.16a.94.94,0,0,0-.4,0,.15.15,0,0,1,0-.09.59.59,0,0,1,.23-.45.68.68,0,0,1,.17-.1h0l.16,0,.15,0h.12v.24Z"/>
+                <path class="cls-7"
+                      d="M76.39,85.46v.16c0,.17-.24.39-.24.39s-.35.23-.46.32a2.9,2.9,0,0,1-1.4.64,2.46,2.46,0,0,1-1.77-.16,1.37,1.37,0,0,1-.47-.37.51.51,0,0,1-.08-.26v0a11.78,11.78,0,0,0,1.24-.44,15.49,15.49,0,0,0,2.39-.89.62.62,0,0,0,.18.24l.1.05.09,0,.09,0A3.18,3.18,0,0,1,76.39,85.46Z"/>
+                <path class="cls-5"
+                      d="M76.27,55.91a25,25,0,0,1-.29,6,22.18,22.18,0,0,1-3.48,8.37c-1.25,1.83-2.23,2.71-2.31,2.61a5.47,5.47,0,0,1,.51-.74c.33-.49.81-1.21,1.35-2.15A23.79,23.79,0,0,0,75,61.72,24.92,24.92,0,0,0,75,56a59.06,59.06,0,0,0-.7-6.34,19.8,19.8,0,0,0-2.07-6.14A14.18,14.18,0,0,0,68,38.82l-.07,0a14.76,14.76,0,0,0-8.67-3A49,49,0,0,0,51,36.84a28.24,28.24,0,0,0-5.46,1.69c-1.26.55-1.92,1-2,1s-1,.59-2.43,1.68a42.93,42.93,0,0,0-5.36,5A44.24,44.24,0,0,0,32.64,50l-.77,1.08-.19.26,0,0s-.07,0,0,.09l.06.08.41.48L33,53.05a87.27,87.27,0,0,0,8.34,8.31,46.53,46.53,0,0,0,4.73,3.57l1.23.77,1.26.68c.84.43,1.72.84,2.57,1.24,3.41,1.63,6.61,3.09,9.41,4.14A27.81,27.81,0,0,0,64.42,73a13.17,13.17,0,0,0,3.09.27,10.36,10.36,0,0,0,2-.19c.44-.08.66-.2.68-.18s-.86.7-2.65.84a12.77,12.77,0,0,1-3.24-.06,17.14,17.14,0,0,1-2.24-.49c-.58-.14-1.18-.33-1.81-.53-2.9-.93-6.17-2.29-9.65-3.8-.87-.39-1.74-.76-2.65-1.19L46.6,67l-1.31-.76a46.78,46.78,0,0,1-5-3.57,86.39,86.39,0,0,1-8.73-8.28c-.32-.37-.65-.72-1-1.06l-.51-.59-.82-1c0-.09-.21-.17-.15-.25l.18-.26.35-.53.57-.82L31,48.77a48.36,48.36,0,0,1,3.18-4,44.75,44.75,0,0,1,5.55-5.36,25.64,25.64,0,0,1,2.65-1.87,21.16,21.16,0,0,1,2.31-1.16,29.57,29.57,0,0,1,5.92-1.72,50.15,50.15,0,0,1,8.62-.94A16.52,16.52,0,0,1,69,37.34l0,0,0,0a15.79,15.79,0,0,1,4.65,5.32,21.06,21.06,0,0,1,2.05,6.68A53.49,53.49,0,0,1,76.27,55.91Z"/>
+                <path class="cls-5"
+                      d="M76.3,85.08h0l-.12,0s-.21,0-.21,0l-.09,0-.1-.05a.62.62,0,0,1-.18-.24c.22-.12.34-.2.34-.23l.3-.16,0,0s0,.09-.08.09.08,0,.06.07a.45.45,0,0,0,.06.2A1.67,1.67,0,0,1,76.3,85.08Z"/>
+                <path class="cls-8" d="M75.57,84.78c.12,0,.25-.12.36-.18s-.12.11-.34.23l0,0Z"/>
+                <path class="cls-8" d="M75.93,84.6c-.11.06-.24.13-.36.18a.25.25,0,0,1,0-.14A.94.94,0,0,1,75.93,84.6Z"/>
+                <path class="cls-7"
+                      d="M75.81,112.79l.06,0a.07.07,0,0,1-.06,0h0l-.16.07A7.91,7.91,0,0,0,74,114.08c-.27.2-.56.42-.79.39a1.33,1.33,0,0,1-.68-.4,1.13,1.13,0,0,1-.35-.46c0-.13,0-.18,0-.2s.07.09.24.08a2.13,2.13,0,0,0,.64-.15,8.48,8.48,0,0,1,1.8-.54,4.18,4.18,0,0,1,.5,0Z"/>
+                <path class="cls-5"
+                      d="M75.81,4.05l0,0c-.52.09-1,.2-1.55.31a3.65,3.65,0,0,0-.81-.59c-.11,0-.19-.06-.2,0s0-.12,0-.16a.65.65,0,0,1,0-.1l.43-1.72a2.4,2.4,0,0,1,.81.54A8.85,8.85,0,0,1,75.81,4.05Z"/>
+                <path class="cls-5"
+                      d="M76.45,121.15a29.83,29.83,0,0,1-1,3c-.35,1-.74,2-1,2.7s-.54,1.24-.56,1.27-.28.51-.71,1.19a20.87,20.87,0,0,1-1.73,2.41c-.48.56-1,1.08-1.41,1.53-.12-.24-.18-.29-.18-.31L68.75,134s.09,0,.13,0,.07,0,.1.09v.12c-.33.27-.56.41-.6.29s1-1.84,2.07-3.57a25.27,25.27,0,0,0,1.31-2.45l.57-1.22s.28-.49.67-1.16c.24-.45.54-1,.84-1.55l0,0c.1-.13.2-.25.29-.38C75,123.18,75.74,122.17,76.45,121.15Z"/>
+                <path class="cls-5"
+                      d="M72.36,86l-.5-.18s-.28.11-.87.42a4,4,0,0,0-1-.06c0,.08.33.25.4.35a15.74,15.74,0,0,1-3.48,0,28.94,28.94,0,0,1-6.09-1.68l.31-.18L62,84a26.43,26.43,0,0,0,5,1.59,17.69,17.69,0,0,0,3.43.24h.16a13.57,13.57,0,0,0,3.59-.48,7.63,7.63,0,0,0,1.39-.5l0,0a15.49,15.49,0,0,1-2.39.89,11.78,11.78,0,0,1-1.24.44s.08-.1.14-.13a.4.4,0,0,1,.16-.07Z"/>
+                <path class="cls-5"
+                      d="M75.57,84.78h0a7.63,7.63,0,0,1-1.39.5,13.57,13.57,0,0,1-3.59.48A12.78,12.78,0,0,0,73,85.28a25.74,25.74,0,0,1,2.5-.64A.25.25,0,0,0,75.57,84.78Z"/>
+                <path class="cls-5"
+                      d="M74.74,119.41c.25-.08.63.07.54.45a5.78,5.78,0,0,1-.23.64,3.67,3.67,0,0,1-.26.48.47.47,0,0,1-.39.23c-.11,0-.15-.06-.15-.08s.23,0,.31-.3c0-.12.08-.28.12-.45a2.43,2.43,0,0,0,.07-.39s-.06,0-.06,0a.61.61,0,0,1-.12.05l-.34.12a7.69,7.69,0,0,0-.74.3,5.65,5.65,0,0,1-1.09.45c-.06-.07.38-.48.88-.81a6,6,0,0,1,1.1-.61A2.07,2.07,0,0,1,74.74,119.41Z"/>
+                <path class="cls-6"
+                      d="M75,56A24.92,24.92,0,0,1,75,61.72,23.79,23.79,0,0,1,72.05,70c-.54.94-1,1.66-1.35,2.15a5.47,5.47,0,0,0-.51.74s-.24.1-.68.18a10.36,10.36,0,0,1-2,.19A13.17,13.17,0,0,1,64.42,73a27.81,27.81,0,0,1-3.87-1.2c-2.8-1.05-6-2.51-9.41-4.14-.85-.4-1.73-.81-2.57-1.24l-1.26-.68-1.23-.77a46.53,46.53,0,0,1-4.73-3.57A87.27,87.27,0,0,1,33,53.05L32.09,52l-.41-.48-.06-.08s0-.07,0-.09l0,0,.19-.26L32.64,50a44.24,44.24,0,0,1,3.1-3.72,42.93,42.93,0,0,1,5.36-5c1.42-1.09,2.34-1.59,2.43-1.68s.77-.49,2-1A28.24,28.24,0,0,1,51,36.84a49,49,0,0,1,8.2-1.05,14.76,14.76,0,0,1,8.67,3l.07,0a14.18,14.18,0,0,1,4.31,4.67,19.8,19.8,0,0,1,2.07,6.14A59.06,59.06,0,0,1,75,56Zm-2.49,2c.33-.29.49-2.46.32-3.47A30.6,30.6,0,0,0,71.81,50a18,18,0,0,0-2-4.48,9.56,9.56,0,0,0-2.06-2.3,18.77,18.77,0,0,0-2.88-1.56,14.11,14.11,0,0,0-3.33-1.06,8.76,8.76,0,0,0-3.77.19,11.87,11.87,0,0,0-3.46,1.7,20.87,20.87,0,0,0-3,2.43,20.47,20.47,0,0,0-4.57,6.3,17.85,17.85,0,0,0-.68,1.85c-.08.32-.17.64-.23,1,0,.17-.06.31-.09.52s0,.51,0,.76a7.16,7.16,0,0,0,.59.47l.37.28c.25.19.5.4.76.58l1.53,1h0a17.44,17.44,0,0,0,4.65,2,38.74,38.74,0,0,0,4.51,1,22.53,22.53,0,0,0,7.88.31,13.11,13.11,0,0,0,5-1.81A4.24,4.24,0,0,0,72.55,58Z"/>
+                <path class="cls-5"
+                      d="M73.62.66l.14,1.13-.43,1.72a.65.65,0,0,0,0,.1s0,.12,0,.16.09,0,.2,0a3.65,3.65,0,0,1,.81.59c-.77.15-1.55.31-2.35.45-.25,0-.49.08-.77.1s-.56,0-.8,0A12.45,12.45,0,0,1,69,5L68,5a22.52,22.52,0,0,1,.3-2.29L68.46.75l.75.08c.4.05.78.07,1.17.09a4.37,4.37,0,0,0,.5,0l.55,0Z"/>
+                <path class="cls-7"
+                      d="M73.84,124.61c-.3.57-.6,1.1-.84,1.55-.39.67-.65,1.14-.67,1.16l-.57,1.22A25.27,25.27,0,0,1,70.45,131c-1.1,1.73-2.24,3.51-2.07,3.57s.27,0,.6-.29a3.78,3.78,0,0,1-.06.49,48.36,48.36,0,0,0-.59,5c-.1,2.32-.09,4-.13,5,0,.56,0,1,0,1.23a.28.28,0,0,1,0,.09v0h0l-.12,0c-.4-1.92-.8-3.93-1.18-5.76-.06-.3-.12-.59-.19-.89l-.1-.44c0-.15-.06-.28-.13-.52,0-.52-.11-1-.16-1.5C66.2,136,66.11,135,66,134c-.14-1.91-.26-3.46-.34-4.56,0-.44,0-.81-.07-1.08.39-.05.79-.12,1.17-.2a16.18,16.18,0,0,0,4.11-1.32A9,9,0,0,0,73.84,124.61Z"/>
+                <path class="cls-5"
+                      d="M72.87,54.51c.17,1,0,3.18-.32,3.47,0,0,0-1.34,0-1.36a28.12,28.12,0,0,0-.85-3.15l0-.37c0-.07,0-.17-.07-.26-.77-2-.94-2.38-1.53-3.69-.1-.19-.57-1.16-.71-1.42a9.39,9.39,0,0,0-3-3.77l-.52-.31H65.4c-.39-.2-.78-.4-1.17-.58a8.77,8.77,0,0,0-6.12-.89,15,15,0,0,0-5.89,3.71,18.93,18.93,0,0,0-4.41,5.84,13.43,13.43,0,0,0-.66,1.69c-.08.29-.16.57-.23.86l-.08.42,0,.17.49.39c.25.19.48.39.73.56l1.5,1.06.05,0a16.33,16.33,0,0,0,4.29,1.93A38.35,38.35,0,0,0,58.27,60a27.21,27.21,0,0,0,4.74.64,5.24,5.24,0,0,0,.53.28.4.4,0,0,1,.29-.14c.63,0,1.26-.09,1.88-.11l.09-.11h.3l.24,0a4.26,4.26,0,0,0,1.59,0,3.11,3.11,0,0,0,.42-.32,10.48,10.48,0,0,0,1.16-.27l.3-.3a11.62,11.62,0,0,0,1.1-.51c1.07-.58,1.58-1,1.64-1A4.24,4.24,0,0,1,71,59.25a13.11,13.11,0,0,1-5,1.81,22.53,22.53,0,0,1-7.88-.31,38.74,38.74,0,0,1-4.51-1,17.44,17.44,0,0,1-4.65-2h0l-1.53-1c-.26-.18-.51-.39-.76-.58l-.37-.28a7.16,7.16,0,0,1-.59-.47c0-.25,0-.51,0-.76s0-.35.09-.52c.06-.33.15-.65.23-1a17.85,17.85,0,0,1,.68-1.85A20.47,20.47,0,0,1,51.32,45a20.87,20.87,0,0,1,3-2.43,11.87,11.87,0,0,1,3.46-1.7,8.76,8.76,0,0,1,3.77-.19,14.11,14.11,0,0,1,3.33,1.06,18.77,18.77,0,0,1,2.88,1.56,9.56,9.56,0,0,1,2.06,2.3,18,18,0,0,1,2,4.48A30.6,30.6,0,0,1,72.87,54.51Z"/>
+                <path class="cls-10"
+                      d="M72.52,56.62s0,1.33,0,1.36-.57.46-1.64,1a11.62,11.62,0,0,1-1.1.51c1.29-1.4,1.64-3.56,1.86-6.06A28.12,28.12,0,0,1,72.52,56.62Z"/>
+                <path class="cls-5"
+                      d="M72.36,86h-.1a.4.4,0,0,0-.16.07c-.06,0-.13.08-.14.13a10,10,0,0,1-1.47.31h-.15c-.07-.1-.4-.27-.4-.35a4,4,0,0,1,1,.06c.59-.31.87-.42.87-.42Z"/>
+                <path class="cls-5"
+                      d="M71.7,53.1l0,.37a39.39,39.39,0,0,0-2.58-5.93l-.15-.26-.43-.81a1.48,1.48,0,0,0-.21-.26,7.81,7.81,0,0,0-1.52-1.73,10,10,0,0,0-1.38-.83h.51l.52.31a9.39,9.39,0,0,1,3,3.77c.14.26.61,1.23.71,1.42.59,1.31.76,1.71,1.53,3.69C71.67,52.93,71.66,53,71.7,53.1Z"/>
+                <path class="cls-11"
+                      d="M71.67,53.47c-.22,2.5-.57,4.66-1.86,6.06a12.42,12.42,0,0,1-1.35.48l.24-.2a17.49,17.49,0,0,1-4.44.62H62.73c-2.18-1.46-3.59-4.68-3.38-8.36.25-4.64,2.86-8.24,6.05-8.43a10,10,0,0,1,1.38.83,7.81,7.81,0,0,1,1.52,1.73,1.48,1.48,0,0,1,.21.26l.43.81.15.26A39.39,39.39,0,0,1,71.67,53.47Z"/>
+                <path class="cls-5"
+                      d="M71.29,75.67a.36.36,0,0,1-.15.44.74.74,0,0,1-.41.07l-.57,0a3.9,3.9,0,0,1-.51-.06s0,0,0,0L70.82,76c.53,0,.27-.51-.2-.86s-.68.61-.68.61-.27-.09-.27-.13A1.56,1.56,0,0,1,70,75a.55.55,0,0,1,.4-.2h0a.66.66,0,0,1,.43.19A1.5,1.5,0,0,1,71.29,75.67Z"/>
+                <path class="cls-5"
+                      d="M70.62,75.15c.47.35.73.85.2.86l-1.21.06,0,0a2.31,2.31,0,0,1,.49-.1l.54-.07c.13,0,.15,0,.18,0s0-.08,0-.11a1.65,1.65,0,0,0-.35-.32c-.14-.09-.08,0-.12,0a1.13,1.13,0,0,0-.17.41s-.13,0-.29,0C69.94,75.76,70.15,74.81,70.62,75.15Z"/>
+                <path class="cls-5"
+                      d="M70.55,80.3a1.05,1.05,0,0,1,.44.86,1.3,1.3,0,0,1-2,.69,1,1,0,0,1-.13-1.1,4.07,4.07,0,0,1,.52-.8s.17,0,.28.11c-.4.48-.91,1.15-.49,1.63s1.88,0,1.61-.81a1.35,1.35,0,0,0-1.12-.82A1.1,1.1,0,0,1,70.55,80.3Z"/>
+                <path class="cls-5"
+                      d="M70.87,75.71s0,.09,0,.11,0,0-.18,0l-.54.07a2.31,2.31,0,0,0-.49.1l.29-.27c.16,0,.29.06.29,0a1.13,1.13,0,0,1,.17-.41s0-.08.12,0A1.65,1.65,0,0,1,70.87,75.71Z"/>
+                <path class="cls-5"
+                      d="M70.81,80.88c.27.76-1.18,1.29-1.61.81s.09-1.15.49-1.63A1.35,1.35,0,0,1,70.81,80.88Zm-.14.24a.84.84,0,0,0-.28-.65,2,2,0,0,0-.68-.39c.12.1.18.21.15.25a2.78,2.78,0,0,0-.47.64.52.52,0,0,0,0,.56c.07.13.42.16.7.07A.82.82,0,0,0,70.67,81.12Z"/>
+                <path class="cls-5"
+                      d="M70.39,80.47a.84.84,0,0,1,.28.65.82.82,0,0,1-.59.48c-.28.09-.63.06-.7-.07a.52.52,0,0,1,0-.56,2.78,2.78,0,0,1,.47-.64s0-.15-.15-.25A2,2,0,0,1,70.39,80.47Z"/>
+                <path class="cls-7"
+                      d="M70.53,85.77h-.1A17.69,17.69,0,0,1,67,85.54,26.43,26.43,0,0,1,62,84l2.31-1.52a25,25,0,0,0,2.31,2.16,6.34,6.34,0,0,0,1.75.86,8,8,0,0,0,1.91.31Z"/>
+                <path class="cls-7"
+                      d="M67.54,73.7l2.85,1.13a.55.55,0,0,0-.4.2,1.56,1.56,0,0,0-.32.6s.13.1.27.13l-.29.27,0,0s0,0,0,0l-.81,1.4a26.93,26.93,0,0,0-4,.66l-.16-1.34h0a7.48,7.48,0,0,0-2.2-.85l-1.11-.28.68-2.53a17.14,17.14,0,0,0,2.24.49A12.77,12.77,0,0,0,67.54,73.7Z"/>
+                <path class="cls-5"
+                      d="M70.13,133.47a1.47,1.47,0,0,1,0,.79,5,5,0,0,1-.28.71,12.42,12.42,0,0,0-1.15,4.81,16.34,16.34,0,0,0,.44,5,5.5,5.5,0,0,0,.35,1,5,5,0,0,1-1.09.16s0,.07.11.1a.78.78,0,0,0,.24,0h0l-.58.11h0v0a.28.28,0,0,0,0-.09c0-.27,0-.67,0-1.23,0-1.07,0-2.71.13-5a48.36,48.36,0,0,1,.59-5,3.78,3.78,0,0,0,.06-.49c.14-.13.32-.28.49-.45s.37-.35.57-.56A1.09,1.09,0,0,1,70.13,133.47Z"/>
+                <path class="cls-5"
+                      d="M69.86,133s.06.07.18.31c-.2.21-.39.39-.57.56s-.35.32-.49.45v-.12c0-.1-.07-.08-.1-.09s-.14,0-.13,0Z"/>
+                <path class="cls-5"
+                      d="M69.81,59.53l-.3.3a10.48,10.48,0,0,1-1.16.27.87.87,0,0,0,.11-.09A12.42,12.42,0,0,0,69.81,59.53Z"/>
+                <path class="cls-5"
+                      d="M69.19,173a7,7,0,0,1,.45,3.54,11.83,11.83,0,0,1-.25,1.79,11.42,11.42,0,0,1-.57,1.65c-.44,1-.91,2-1.31,2.75s-.66,1.24-.88,1.69l-1.38.16c.08-.13.16-.3.26-.49l1-1.87c.43-.77.92-1.66,1.37-2.62a13.88,13.88,0,0,0,.59-1.51,11.13,11.13,0,0,0,.3-1.64,6.39,6.39,0,0,0-.23-3.19,7.5,7.5,0,0,0-1.6-2.34,4.94,4.94,0,0,0-1.34-1c.15,0,.31-.07.48-.11a5.48,5.48,0,0,1,1.17.79A7.43,7.43,0,0,1,69.19,173Z"/>
+                <path class="cls-8" d="M69.59,145.88h0l0,0,0-.07h.06v.11Z"/>
+                <path class="cls-8"
+                      d="M69.56,145.84l0,0h-.15l-.27.06-.37.08h0a.78.78,0,0,1-.24,0c-.11,0-.13-.11-.11-.1a5,5,0,0,0,1.09-.16h0Z"/>
+                <path class="cls-5"
+                      d="M68.84,77.5c.12,0,.2,0,.2,0s-2.67.84-5.33,1.71l-1.23.4-.84-.71c.59-.17,1.22-.34,1.85-.49.43-.11.87-.21,1.31-.29A26.93,26.93,0,0,1,68.84,77.5Z"/>
+                <path class="cls-7"
+                      d="M68.59,173.23a6.39,6.39,0,0,1,.23,3.19,11.13,11.13,0,0,1-.3,1.64,13.88,13.88,0,0,1-.59,1.51c-.45,1-.94,1.85-1.37,2.62l-1,1.87c-.1.19-.18.36-.26.49l-2.48.25c-1.07.09-2.15.17-3.22.23l-.58.08h-.52l-.34-.06-1.6-.24c-2.86-.44-5.73-.81-8.51-1.31a.15.15,0,0,0,0-.06c.25-.35.65-.83,1.14-1.42a15.85,15.85,0,0,0,3-4.85,9.17,9.17,0,0,0,.15-5.63,3.05,3.05,0,0,0-1-1.41l1.8.3a33.41,33.41,0,0,0,10.82-.2c.56-.09,1.13-.21,1.7-.34a4.94,4.94,0,0,1,1.34,1A7.5,7.5,0,0,1,68.59,173.23Z"/>
+                <path class="cls-11"
+                      d="M68.7,59.81l-.24.2a5.25,5.25,0,0,1-.6.17h0a27.25,27.25,0,0,1-3.57.25A17.49,17.49,0,0,0,68.7,59.81Z"/>
+                <path class="cls-5"
+                      d="M68.46.75l-.18,2-2.08,0A18.06,18.06,0,0,1,66.58,5l-2.1-.09c-.14-.25-.29-.49-.43-.7a14.42,14.42,0,0,0-1.33-1.69L62.25,2,62.54.12c.73.07,2.34.24,4.45.49Z"/>
+                <path class="cls-11" d="M68.46,60a.87.87,0,0,1-.11.09l-.49.08A5.25,5.25,0,0,0,68.46,60Z"/>
+                <path class="cls-5"
+                      d="M67.86,60.18l.49-.08a3.11,3.11,0,0,1-.42.32,4.26,4.26,0,0,1-1.59,0,11.93,11.93,0,0,0,1.49-.29Z"/>
+                <path class="cls-5"
+                      d="M66.2,2.73l2.08,0A22.52,22.52,0,0,0,68,5L66.66,5h-.08A18.06,18.06,0,0,0,66.2,2.73Z"/>
+                <polygon class="cls-8" points="68.04 146.19 68.04 146.2 68.03 146.2 68.04 146.19"/>
+                <path class="cls-5"
+                      d="M66.83,80.3c.79-.22,1.33-.17,1.34-.09s-.52.19-1.17.51-1.22.74-1.92,1.21l-.63-.54A19.22,19.22,0,0,1,66.83,80.3Z"/>
+                <path class="cls-5"
+                      d="M68,5a80.77,80.77,0,0,0-.31,8.44c0-.06-.1-.43-.18-.83-.14-.61-.28-1.19-.44-1.74-.12-2.7-.3-4.62-.47-5.91h.08Z"/>
+                <path class="cls-9" d="M67.67,13.43v0l-.52,0s0,0,0,0Z"/>
+                <path class="cls-8"
+                      d="M67.67,13.43l-.54.05c0-1,0-1.82-.08-2.62.16.55.3,1.13.44,1.74C67.57,13,67.65,13.37,67.67,13.43Z"/>
+                <path class="cls-5"
+                      d="M64.06,113.73l0,0c.19-.09.87-.25,1.5-.47a1.91,1.91,0,0,0,.63-.35,6.28,6.28,0,0,0-1.07-.07c-.62.06-.94.73-1.06.89C64.07,113.71,64.06,113.71,64.06,113.73Zm3-1.28a.31.31,0,0,1,.12.41c-.08.12-.11.1-.16.15l-.1,0a.37.37,0,0,0-.14.07,2.75,2.75,0,0,1-1.1.51,3.91,3.91,0,0,1-1.66.11s0-.21.1-.52a1.41,1.41,0,0,1,.92-.82,5.12,5.12,0,0,1,1.2-.05c.31,0,.54,0,.56,0A1,1,0,0,1,67.08,112.45Zm-.19.33c0-.06.06-.06,0-.07a.37.37,0,0,1-.12-.16c0-.08,0,0-.08,0a1.34,1.34,0,0,0-.23.13,2.32,2.32,0,0,1-.25.21c.3,0,.5.07.5.07h.07A.4.4,0,0,1,66.89,112.78Z"/>
+                <path class="cls-5"
+                      d="M67.05,10.86c0,.8.06,1.67.08,2.62,0-.12-.08-.43-.14-.76a15.34,15.34,0,0,0-3.87-7.64,3.71,3.71,0,0,0-.3-.28l1.66.06A23.52,23.52,0,0,1,67.05,10.86Z"/>
+                <path class="cls-7"
+                      d="M66.92,112.71s0,0,0,.07a.4.4,0,0,0-.08.18h-.07s-.2,0-.5-.07a2.32,2.32,0,0,0,.25-.21,1.34,1.34,0,0,1,.23-.13c.06,0,0-.07.08,0A.37.37,0,0,0,66.92,112.71Z"/>
+                <path class="cls-11"
+                      d="M67.83,60.18a11.93,11.93,0,0,1-1.49.29h-.1a.52.52,0,0,0-.43.08h-.09l-.89.06c-.33,0-.65,0-1,0s-.56,0-.84,0l-.28-.18h1.53A27.25,27.25,0,0,0,67.83,60.18Z"/>
+                <path class="cls-6" d="M66.58,5c.17,1.29.35,3.21.47,5.91a23.52,23.52,0,0,0-2.57-6Z"/>
+                <path class="cls-5"
+                      d="M66.63,184.39l-.11.21c-.22.44-.35.72-.36.74s-.37.17-.67.06-.48-.38-.39-.56l.15-.29Z"/>
+                <path class="cls-11" d="M66.34,60.47l-.24,0h-.29a.52.52,0,0,1,.43-.08Z"/>
+                <path class="cls-5"
+                      d="M66.13,169.77c-.17,0-.33.09-.48.11a1.6,1.6,0,0,0-.3-.11,1.78,1.78,0,0,0-.75,0s.23-.28.79-.22A2.32,2.32,0,0,1,66.13,169.77Z"/>
+                <path class="cls-5"
+                      d="M65.72,60.55h.08l-.09.11c-.62,0-1.25.06-1.88.11a.4.4,0,0,0-.29.14,5.24,5.24,0,0,1-.53-.28q.42,0,.84,0c.33,0,.65,0,1,0Z"/>
+                <path class="cls-7"
+                      d="M66.22,112.88a1.91,1.91,0,0,1-.63.35c-.63.22-1.31.38-1.5.47.12-.16.44-.83,1.06-.89A6.28,6.28,0,0,1,66.22,112.88Z"/>
+                <path class="cls-5"
+                      d="M65.61,128.21s0,.1,0,.16c-.57.1-1.16.16-1.74.21,0-.46-.05-.72-.05-.78l1,0,.66,0h.08v.05C65.59,128,65.6,128.07,65.61,128.21Z"/>
+                <path class="cls-5"
+                      d="M65.16,117.91c.19.08.42.27.39.5a.73.73,0,0,1-.16.33,1.52,1.52,0,0,1-.17.18,4.72,4.72,0,0,1-.75.56,2.3,2.3,0,0,1-1.37.09c0-.06.61-.14,1.22-.39a7.65,7.65,0,0,0,.59-.57.83.83,0,0,0,.11-.15v0s0,0-.07,0a5.27,5.27,0,0,0-.81-.13l-.61-.11a1.37,1.37,0,0,0-1.06.31,3.9,3.9,0,0,0-.92,1.57,2.16,2.16,0,0,1,.64-1.87,1.8,1.8,0,0,1,1.39-.55l.64.06A5.67,5.67,0,0,1,65.16,117.91Z"/>
+                <path class="cls-5"
+                      d="M65.08,81.93l-.46.3c-.11.06-.2.14-.3.2l-.51-.51-.13-.14c.17-.08.35-.17.52-.27l.25-.12Z"/>
+                <path class="cls-7"
+                      d="M64.64,76.82l.16,1.34c-.44.08-.88.18-1.31.29-.63.15-1.26.32-1.85.49-.85-.71-1.45-1.15-1.53-1a10.77,10.77,0,0,0,1,1.17l-1.42.45c-1,.34-1.72.63-1.77.65a16.81,16.81,0,0,0-1.68.9c-.23.14-.47.32-.73.49-2.14-.7-4.37-1.35-6.6-2-.41-.12-.86-.24-1.2-.36l-1.14-.49-2.35-1.06L44,77.55c1.24-.33,2.42-.62,3.38-.82,1.38-.31,2.34-.4,2.4-.42s1-.18,2.41-.34a36.5,36.5,0,0,1,5.14-.12,39,39,0,0,1,5.08.56C63.59,76.62,64.43,76.82,64.64,76.82Z"/>
+                <path class="cls-5"
+                      d="M64.69,76.81h0c-.21,0-1-.2-2.26-.41a39,39,0,0,0-5.08-.56,36.5,36.5,0,0,0-5.14.12c-1.41.16-2.36.31-2.41.34s-1,.11-2.4.42c-1,.2-2.14.49-3.38.82L42.76,77c1.56-.55,3.1-1,4.34-1.32,1.41-.37,2.41-.51,2.46-.53s1-.15,2.51-.25a34.31,34.31,0,0,1,5.28.12,31.69,31.69,0,0,1,4,.66l1.11.28A7.48,7.48,0,0,1,64.69,76.81Z"/>
+                <path class="cls-10"
+                      d="M64.23,43.07c.39.18.78.38,1.17.58-3.19.19-5.8,3.79-6.05,8.43-.21,3.68,1.2,6.9,3.38,8.36l.28.18A27.21,27.21,0,0,1,58.27,60a38.35,38.35,0,0,1-4.39-1.13,16.33,16.33,0,0,1-4.29-1.93l-.05,0L48,55.82c-.25-.17-.48-.37-.73-.56l-.49-.39,0-.17.08-.42c.07-.29.15-.57.23-.86a13.43,13.43,0,0,1,.66-1.69,18.93,18.93,0,0,1,4.41-5.84,15,15,0,0,1,5.89-3.71A8.77,8.77,0,0,1,64.23,43.07Z"/>
+                <path class="cls-5"
+                      d="M64.45,81.39l-.25.12c-.17.1-.35.19-.52.27-.64-.66-1.28-1.33-1.82-1.91l.62-.22,1.9,1.68Z"/>
+                <path class="cls-5"
+                      d="M63.81,81.92l.51.51L62,84c-.43-.17-.85-.35-1.3-.52l.95-.53c.56-.33,1.27-.71,2-1.12Z"/>
+                <path class="cls-5"
+                      d="M64.05,4.16c.14.21.29.45.43.7L62.82,4.8a6.89,6.89,0,0,0-1.22-.88l-.53-.24L62.25,2l.47.5A14.42,14.42,0,0,1,64.05,4.16Z"/>
+                <path class="cls-9" d="M64.06,113.73s0,0,0,0Z"/>
+                <path class="cls-5"
+                      d="M62,138.38l0,0,0,.07a.67.67,0,0,0-.06.12v0l0-.11L62,138c.37-2.56.75-5.1,1-7,.16-1,.27-1.83.36-2.38l.35,0c.06,1.62-.15,5.59-.51,9.59l-.06.48v.14a2.13,2.13,0,0,1-.11.41h0l0,0h0a0,0,0,0,0,0,0h0a.1.1,0,0,0,0,0l-.06-.07h0l0,0-.18-.15,0,0,0,0-.06-.07-.07-.06-.07-.06,0,0v0h0A2,2,0,0,0,62,138.38Z"/>
+                <path class="cls-5" d="M63.77,128.59l-.35,0c.1-.52.15-.8.2-.8S63.75,128.1,63.77,128.59Z"/>
+                <path class="cls-7"
+                      d="M62.41,128.67l1,0c-.09.55-.2,1.37-.36,2.38-.28,1.91-.66,4.45-1,7l-.08.47,0,.11v0l0,0-.08.16-.37.9-.7,1.75c-.44,1.14-.86,2.21-1.22,3.13l-.86,2.27-.14.38v.05l0,.13a.38.38,0,0,0,0,.1l0,.05a1.11,1.11,0,0,1-.08.24c0,.08-.37,1.22-.9,2.9-.6.49-1.27,1.06-2,1.67L53,154.48l-.33.28-.15.13,0,.06h0a2.69,2.69,0,0,1-.26-.44,1.23,1.23,0,0,1-.16-.51.82.82,0,0,1,0-.22s0-.27.32-.66a4.94,4.94,0,0,1,.51-.66c-.15-.37-1.59,1-1.41,1.26a1.5,1.5,0,0,0,.37,1c.06.08.14.14.21.22l-1.63-.22-.8-.13-.33,0a.88.88,0,0,1,0-.28,1.71,1.71,0,0,1,.14-.51l.11-.23a3.2,3.2,0,0,1,.41-.71c.25-.34.61-.58.58-.65s-.5,0-.87.35a2.56,2.56,0,0,0-.46.49,2.11,2.11,0,0,0-.18.27,1.87,1.87,0,0,0-.14.94l-.52-.69v-.14a2,2,0,0,1,0-.23c0-.16,0-.32,0-.48a4.34,4.34,0,0,1,.19-.86,1.91,1.91,0,0,1,.8-1.13,1.68,1.68,0,0,1,1.23-.32c.15.28,3.53-1.08,3.58-1.11a21,21,0,0,0,3.11-2.05h0c.28-.05.45-2.67.46-5.34a44,44,0,0,0-.24-5.61,16.22,16.22,0,0,0-.51-1.79c-.33-1-.83-2.27-1.36-3.53s-1.17-2.6-1.66-3.5a16.43,16.43,0,0,0,3.89,1.09A24.76,24.76,0,0,0,62.41,128.67Z"/>
+                <path class="cls-8" d="M63.07,139.22h0a.33.33,0,0,1,0,.06h0Z"/>
+                <path class="cls-5"
+                      d="M63.05,139.28c-.1.3-.21.6-.31.89-.2.61-.41,1.21-.61,1.78l-1.06,3.18-.76,2.28,0,.08c-.32.06-.91.16-.91.18h-.92s0-.1,0-.15a.38.38,0,0,1,0-.1l0-.13v-.05l.14-.38.86-2.27c.36-.92.78-2,1.22-3.13l.7-1.75.37-.9.08-.16,0,0c0,.07.08.22.12.19s0-.2.12-.14h.17v0l0,0,.07.06.07.06.06.07,0,0,0,0,.18.15,0,0h0l.06.07a.1.1,0,0,1,0,0h0a0,0,0,0,1,0,0h0Z"/>
+                <path class="cls-5"
+                      d="M62.54.12,62.25,2,61.07,3.68l.53.24a6.89,6.89,0,0,1,1.22.88l-1-.06L60.2,4.6c-.93-.08-2.25-.19-3.82-.23-.54,0-1.11,0-1.7,0-.18-.51-.34-1-.52-1.36a6.54,6.54,0,0,0-.32-.65,2.56,2.56,0,0,0-.53-.63l-.6-.52L52.27.77l0-.38C53.71.21,55.11.11,56.36.05,58,0,59.45,0,60.47,0l1.65.06Z"/>
+                <path class="cls-5" d="M62.48,79.65l-.62.22-.63-.69-.1-.11.51-.13Z"/>
+                <path class="cls-8"
+                      d="M62.05,138.42l0,0a2,2,0,0,1,.3.27h-.14c-.1-.06-.13.13-.12.14s-.1-.12-.12-.19a.67.67,0,0,1,.06-.12Z"/>
+                <path class="cls-7"
+                      d="M61.86,79.87c.54.58,1.18,1.25,1.82,1.91-.75.41-1.46.79-2,1.12l-.95.53c-.64-.26-1.31-.52-2-.78s-1.24-.45-1.89-.67c.9-.46,1.56-.72,1.6-.74s.68-.32,1.67-.7C60.6,80.33,61.21,80.1,61.86,79.87Z"/>
+                <path class="cls-5"
+                      d="M61.64,78.94l-.51.13a10.77,10.77,0,0,1-1-1.17C60.19,77.79,60.79,78.23,61.64,78.94Z"/>
+                <path class="cls-5"
+                      d="M61.23,79.18l.63.69c-.65.23-1.26.46-1.77.67-1,.38-1.64.68-1.67.7s-.7.28-1.6.74c-.42-.14-.85-.29-1.29-.42.26-.17.5-.35.73-.49a16.81,16.81,0,0,1,1.68-.9c.05,0,.74-.31,1.77-.65l1.42-.45Z"/>
+                <path class="cls-5"
+                      d="M60.71,83.43c.45.17.87.35,1.3.52l-.93.62-.31.18-1.3-.46.66-.49c.21-.13.32-.22.33-.22Z"/>
+                <path class="cls-5"
+                      d="M59.47,84.29l1.3.46c-.2.12-.48.3-.8.53-.63.42-1.45,1.06-2.24,1.72a27.49,27.49,0,0,1-3.21,2.63s0,0,0,0a16.41,16.41,0,0,1,2.65-3.21,26.63,26.63,0,0,1,2.16-2Z"/>
+                <path class="cls-5"
+                      d="M60.71,83.43l-.25.15s-.12.09-.33.22l-.66.49-1.18-.41c-1-.32-2-.62-3-.91l0,0,.79-.53.7-.43h0c.65.22,1.27.44,1.89.67S60.07,83.17,60.71,83.43Z"/>
+                <path class="cls-8" d="M60.31,147.41a.24.24,0,0,0,0,.08h0Z"/>
+                <path class="cls-9" d="M60.28,147.49l0,.14h0l0,.05Z"/>
+                <path class="cls-8" d="M60.28,147.49l-.08.2-.21,0h-.62S60,147.55,60.28,147.49Z"/>
+                <polygon class="cls-8" points="60.24 147.64 60.2 147.76 60.2 147.71 60.2 147.69 60.24 147.64"/>
+                <path class="cls-5"
+                      d="M60.2,147.76h0v0h0l0,.15,0,.07c0,.18-.09.28-.1.31s-.12.37-.32.92-.52,1.42-.87,2.42l-5,3.82-.77.6a.44.44,0,0,1-.15.08h0l-.14.06h-.14l-.23,0c-.27,0-.37-.06-.52-.08-.57-.1-1.11-.22-1.65-.33-.27-.06-.53-.13-.8-.18l-.42-.09-.3-.06c-.09,0-.21,0-.25-.15l-1-1.53v-.4a2.83,2.83,0,0,1,0-.29c0-.2.06-.38.1-.55a4.69,4.69,0,0,1,.32-1,2.43,2.43,0,0,1,1.22-1.28,2.6,2.6,0,0,1,1.43.07h0a1.68,1.68,0,0,0-1.23.32,1.91,1.91,0,0,0-.8,1.13,4.34,4.34,0,0,0-.19.86c0,.16,0,.32,0,.48a2,2,0,0,0,0,.23v.14l.52.69a.25.25,0,0,0,0,.08c.08.53.49.86.54.79s-.07-.27-.12-.54l.33,0,.8.13,1.63.22c.26.25.53.39.57.34s-.06-.17-.16-.34h0l0-.06.15-.13.33-.28,2.47-2.11c.72-.61,1.39-1.18,2-1.67.53-1.68.88-2.82.9-2.9a1.11,1.11,0,0,0,.08-.24l0-.05c0,.05,0,.1,0,.15H60l.21,0v.07Z"/>
+                <path class="cls-7"
+                      d="M59.47,84.29l-.15.11a26.63,26.63,0,0,0-2.16,2,16.41,16.41,0,0,0-2.65,3.21l-3,.45a7.11,7.11,0,0,1-1.43-.76,4.55,4.55,0,0,1-.66-.5c-.16-.12-.29-.28-.44-.41a6.64,6.64,0,0,1-.75-1l.6-.34a35.2,35.2,0,0,0,4.78-2.93c.57-.38,1.15-.78,1.69-1.13,1,.29,2,.59,3,.91Z"/>
+                <path class="cls-5"
+                      d="M59.42,122.82a.44.44,0,0,1-.12.43,1.37,1.37,0,0,1-.45.21,1.83,1.83,0,0,1-.33.05,1.87,1.87,0,0,1-.72-.07l-.18,0s0,0,0-.09,0-.08,0-.1,0,0,.09,0a.94.94,0,0,0-.1-.14c0-.08-.2-.1-.08-.11a1.14,1.14,0,0,0,.32.05,2.28,2.28,0,0,0,.82-.14s.09,0,.1,0,.08,0,0-.09a1.77,1.77,0,0,0-.49-.21c-.16,0-.26,0-.28,0s.44-.33,1-.08C59.19,122.54,59.38,122.66,59.42,122.82Zm-1.65.46c.11.16,0,0,0,0Z"/>
+                <path class="cls-9" d="M57.74,123.24s.14.2,0,0Z"/>
+                <path class="cls-5"
+                      d="M57.52,136.27a44,44,0,0,1,.24,5.61c0,2.67-.18,5.29-.46,5.34a.14.14,0,0,0,0-.1c0-.1.2-.45-.2-.37-.16-.87-.37-2.82-.6-4.81-.16-1.34-.31-2.68-.45-3.68-.07-.5-.13-.92-.18-1.21s-.1-.45-.1-.47-.09-.67-.34-1.65-.59-2.27-1-3.56c-.44-1.55-.92-3.07-1.19-4.07h0a.61.61,0,0,0,.05-.12l.65.28c.49.9,1.11,2.19,1.66,3.5s1,2.53,1.36,3.53A16.22,16.22,0,0,1,57.52,136.27Z"/>
+                <path class="cls-8" d="M57.12,146.75c.4-.08.15.27.2.37a.14.14,0,0,1,0,.1h0s-.1-.16-.17-.47Z"/>
+                <path class="cls-5"
+                      d="M57.12,146.76c.07.31.12.47.17.47a21,21,0,0,1-3.11,2.05s-3.43,1.39-3.58,1.11h0a5.66,5.66,0,0,1,1.4-.6c1.37-.81,2.14-1.37,3.62-2.32l1-.51A2.4,2.4,0,0,1,57.12,146.76Z"/>
+                <path class="cls-5"
+                      d="M57.05,13c0,.13.12.48-.06.2a4.16,4.16,0,0,0-1.31-.93l-.46-.4c-.35-.31-.69-.58-1-.83l-.81-.6c-.52-.38-1-.74-1.53-1.07A19,19,0,0,0,49,7.76a20.89,20.89,0,0,0-4.57-1.49c-.35-.07-.68-.12-1-.16l.5-.22.72-.28.65-.23.2-.06A32,32,0,0,1,49.22,7,25,25,0,0,1,52.1,8.82L53.66,10l.81.62.63.5.27.21c.54.45,1,.91,1,1,.18.28,0-.08,0-.23s-.11-.33-.16-.47S56,11.08,56,11c-.41-1.14-1.15-3.13-1.7-4.38a22.22,22.22,0,0,0-1.1-2.27c.51,0,1,0,1.47,0,.21.59.42,1.26.65,2,.47,1.54,1,3.42,1.7,5.64a1.67,1.67,0,0,0,0,.53A4.19,4.19,0,0,0,57.05,13Z"/>
+                <path class="cls-5"
+                      d="M56.82,82h0l-.7.43-.79.53,0,0c-.38-.12-.77-.22-1.16-.33l.62-.48.76-.58,0,0C56,81.69,56.4,81.84,56.82,82Z"/>
+                <path class="cls-6"
+                      d="M56.38,12c0,.15.2.51,0,.23,0,0-.49-.51-1-1l-.27-.21-.63-.5L53.66,10,52.1,8.82A25,25,0,0,0,49.22,7a32,32,0,0,0-3.67-1.68,27.94,27.94,0,0,1,5.54-.88c.73,0,1.44-.07,2.12-.08a22.22,22.22,0,0,1,1.1,2.27C54.86,7.88,55.6,9.87,56,11c0,.07.11.27.21.55S56.32,11.87,56.38,12Z"/>
+                <path class="cls-5"
+                      d="M55.53,81.56l0,0-.76.58-.62.48c-1.83-.5-3.71-1-5.62-1.46-.43-.1-.83-.2-1.32-.35h0l.13-.25-2.1-1s-.08.14-.2.4l-1.49-.62-2.26-1c.35-.12.72-.24,1.09-.34.54-.17,1.09-.32,1.63-.47l.27.13,2.35,1.06,1.14.49c.34.12.79.24,1.2.36C51.16,80.21,53.39,80.86,55.53,81.56Z"/>
+                <path class="cls-5"
+                      d="M54.12,82.64c.39.11.78.21,1.16.33-.54.35-1.12.75-1.69,1.13A35.2,35.2,0,0,1,48.81,87a31.87,31.87,0,0,1,4.3-3.6C53.44,83.17,53.79,82.91,54.12,82.64Z"/>
+                <path class="cls-5"
+                      d="M51.18,111.48c0,.07.06.11,0,.12s-.08,0-.17-.1,0-.14.05-.15a.31.31,0,0,1,.12,0l.26,0c.36,0,.83-.07,1.29-.16a5.16,5.16,0,0,1,1.38-.1,2,2,0,0,1,.54.11.7.7,0,0,1,.29.17.42.42,0,0,1,.13.27.4.4,0,0,1-.1.3,1,1,0,0,1-.31.26,5.59,5.59,0,0,0-.48.38,1.54,1.54,0,0,1-.75.34,1.56,1.56,0,0,1-.77-.19c-.19-.09-.38-.19-.56-.26s-.53-.28-.51-.32a1.61,1.61,0,0,1,.6.1c.17.06.38.11.59.17a1.22,1.22,0,0,0,.6.09c.33-.07.65-.51,1-.74.11-.08,0,0,0-.06h0l-.33-.08a5.81,5.81,0,0,0-1.27,0,8.14,8.14,0,0,1-1.33,0A1.55,1.55,0,0,0,51.18,111.48Z"/>
+                <path class="cls-5"
+                      d="M52.42,3.12s0,0,0,0L52.51,3ZM54.16,3c.18.4.34.85.52,1.36-.47,0-1,0-1.47,0-.14-.28-.3-.54-.43-.75s-.22-.28-.31-.4-.06,0-.07,0,0,0,0,0h0l-.1-.05-.67-.35-.51-.25L52.27.77l.44.41.6.52a2.56,2.56,0,0,1,.53.63A6.54,6.54,0,0,1,54.16,3Z"/>
+                <path class="cls-7"
+                      d="M54.12,82.64c-.33.27-.68.53-1,.79a31.87,31.87,0,0,0-4.3,3.6l-.6.34a7.46,7.46,0,0,1-.4-.8,20.55,20.55,0,0,1-1-3.09c-.12-.53-.22-1-.31-1.33l.65-1.32h0c.49.15.89.25,1.32.35C50.41,81.66,52.29,82.14,54.12,82.64Z"/>
+                <path class="cls-5" d="M54,127.45l-.65-.28c.09-.2.15-.37.21-.49C53.68,126.89,53.84,127.15,54,127.45Z"/>
+                <path class="cls-5"
+                      d="M51.5,125.52l2.19.79-.12.34,0,0c-.22-.36-.39-.55-.47-.51s0,.38.15.94a20.92,20.92,0,0,1-1.94-1C51.44,125.73,51.5,125.52,51.5,125.52Z"/>
+                <path class="cls-5"
+                      d="M53.6,97.64l0,0c-.43.44-1,1-1,1-.55.47-.84.85-1.39,1.29l-1.32,1.06c-.8.62-1.55,1.16-2.28,1.62a18.65,18.65,0,0,1-3.74,1.7c-1,.34-1.7.55-2.15.68a2,2,0,0,0-.23.08c-.09-.65-.17-1.29-.22-1.93h.19a15.69,15.69,0,0,0,2.18-.21,12.17,12.17,0,0,0,3.66-1.14,32.19,32.19,0,0,0,4.39-3l1-.8L52.65,98c-.21.06-.59.13-.61.14l-1,.25c-.4,0-.75.09-1.13.12l-1.45.12a22.78,22.78,0,0,1-2.59,0A13,13,0,0,1,42.1,98c-.33-.12-.63-.25-.91-.37.05-.65.11-1.29.21-1.91a6.13,6.13,0,0,0,1.21.94,9.35,9.35,0,0,0,3.28,1.15,14.44,14.44,0,0,0,2.5.18l1.46,0c.6,0,1.35-.09,2-.17A12.26,12.26,0,0,0,53.6,97.64Z"/>
+                <path class="cls-5"
+                      d="M53.55,126.68c-.06.12-.12.29-.21.49l-.11-.06c-.14-.56-.21-.91-.15-.94S53.33,126.32,53.55,126.68Z"/>
+                <path class="cls-8" d="M53.34,127.17a.61.61,0,0,1-.05.12,1.27,1.27,0,0,0-.06-.18Z"/>
+                <path class="cls-5"
+                      d="M53.29,127.29h0a2.24,2.24,0,0,0-.13.27,22.31,22.31,0,0,1-1.77,3.07,46.21,46.21,0,0,1-3,3.87c-1.13,1.33-2.41,2.76-3.76,4.06-2.71,2.6-5.39,5.11-6.9,7.39s-2,4.09-2.17,4a6.46,6.46,0,0,1,.68-3,1.5,1.5,0,0,0,.54-.28,1.52,1.52,0,0,0-.46.1,12.25,12.25,0,0,1,.63-1.34,18.5,18.5,0,0,1,1.77-2.69c.4-.12.63-.24.63-.28a1.64,1.64,0,0,0-.46.06c1.32-1.69,3-3.45,4.54-5.15,1.26-1.36,2.39-2.77,3.45-4.15a43.87,43.87,0,0,0,2.69-3.81,22.89,22.89,0,0,0,1.48-2.83c.09-.2.16-.39.22-.53a20.92,20.92,0,0,0,1.94,1A1.27,1.27,0,0,1,53.29,127.29Z"/>
+                <path class="cls-5"
+                      d="M52.78,3.61c.13.21.29.47.43.75-.68,0-1.39,0-2.12.08a27.94,27.94,0,0,0-5.54.88c-.31-.13-.6-.23-.88-.34-1.21-.42-2.08-.69-2.66-.86s-.74-.22-.84-.24l0,0c.46-.28.94-.55,1.42-.81l.74-.39.81-.38A27.2,27.2,0,0,1,50.67.59c.53-.08,1-.15,1.56-.2l0,.38L51.09,2.49l.51.25.67.35.1.05h0s0,0,0,0,0,0,.07,0S52.66,3.44,52.78,3.61Z"/>
+                <path class="cls-5"
+                      d="M51.49,153.73c-.18-.27,1.26-1.63,1.41-1.26a4.94,4.94,0,0,0-.51.66c-.33.39-.33.64-.32.66a.82.82,0,0,0,0,.22,1.23,1.23,0,0,0,.16.51,2.69,2.69,0,0,0,.26.44c-.07,0-.09,0-.41,0-.07-.08-.15-.14-.21-.22A1.5,1.5,0,0,1,51.49,153.73Z"/>
+                <path class="cls-6"
+                      d="M52.65,98l.05.07-1,.8a32.19,32.19,0,0,1-4.39,3A12.17,12.17,0,0,1,43.68,103a15.69,15.69,0,0,1-2.18.21h-.19c-.07-.69-.13-1.39-.17-2.07a28.17,28.17,0,0,1,0-3.57c.28.12.58.25.91.37a13,13,0,0,0,3.8.75,22.78,22.78,0,0,0,2.59,0l1.45-.12c.38,0,.73-.07,1.13-.12l1-.25S52.44,98.1,52.65,98Z"/>
+                <path class="cls-8" d="M52.48,155c.1.17.19.31.16.34s-.31-.09-.57-.34C52.39,155,52.41,155,52.48,155Z"/>
+                <path class="cls-8" d="M52.51,3l-.06.09s0,0,0,0Z"/>
+                <path class="cls-5"
+                      d="M52.33,171.53a9.17,9.17,0,0,1-.15,5.63,15.85,15.85,0,0,1-3,4.85c-.49.59-.89,1.07-1.14,1.42a.15.15,0,0,1,0,.06l-1.23-.24a19.52,19.52,0,0,1,1.6-1.95,15.11,15.11,0,0,0,3-4.41,9.18,9.18,0,0,0,.5-5.22A3.08,3.08,0,0,0,50.84,170l.19.05.3.06A3.05,3.05,0,0,1,52.33,171.53Z"/>
+                <path class="cls-5"
+                      d="M52.36,90.48s.21.06,0,.09l-.84.17L49.92,91c-.51.08-1,.16-1.45.25l-1.1.15a12.55,12.55,0,0,1-3.54.14,8.35,8.35,0,0,1-1.45-.35c.18-.56.36-1.1.56-1.61a4.92,4.92,0,0,0,1.28.71,8,8,0,0,0,3.19.34l1.08-.06.91-.08,1-.14.52-.09c.16,0-.06,0-.1-.06l-.25-.1-.16-.07a5.74,5.74,0,0,1-.92-.5c-.13-.09-.26-.18-.38-.28a4,4,0,0,1-.49-.42A7.7,7.7,0,0,1,47.16,87c-.69-1.21-1.13-2.23-1.53-3,0,0,0,0,0,0l.91-1.82c.09.36.19.8.31,1.33a20.55,20.55,0,0,0,1,3.09,7.46,7.46,0,0,0,.4.8,6.64,6.64,0,0,0,.75,1c.15.13.28.29.44.41a4.55,4.55,0,0,0,.66.5,7.11,7.11,0,0,0,1.43.76l.31.12s.28.16.29.2S52.31,90.44,52.36,90.48Z"/>
+                <path class="cls-6"
+                      d="M51.9,171.67a9.18,9.18,0,0,1-.5,5.22,15.11,15.11,0,0,1-3,4.41,19.52,19.52,0,0,0-1.6,1.95c-1-.2-1.88-.41-2.8-.66a24,24,0,0,1-5.62-2.32c-.32-.16-.62-.34-.92-.52l1.2-.44a17.63,17.63,0,0,0,5.12-3,6.44,6.44,0,0,0,1.83-2.64A7.49,7.49,0,0,0,46,171a6.72,6.72,0,0,0-.41-2.48l.77.23,2.83.82c.5.15,1,.31,1.61.45A3.08,3.08,0,0,1,51.9,171.67Z"/>
+                <path class="cls-5" d="M51.33,170.12l-.3-.06-.19-.05c-.17-.14-.31-.22-.31-.25s.28,0,.67.26Z"/>
+                <path class="cls-7"
+                      d="M51.29,126.11c-.06.14-.13.33-.22.53a22.89,22.89,0,0,1-1.48,2.83,43.87,43.87,0,0,1-2.69,3.81c-1.06,1.38-2.19,2.79-3.45,4.15-1.58,1.7-3.22,3.46-4.54,5.15a9.23,9.23,0,0,1-1.42.16,13.78,13.78,0,0,1-4.09-.47,5.5,5.5,0,0,1-1.93-.88A4.6,4.6,0,0,1,30.26,140a4.8,4.8,0,0,1-.61-1.71c1.05-1.3,2.08-2.5,3.07-3.62a5.52,5.52,0,0,0,1.55,1.43,4.46,4.46,0,0,0,2.13.61c.63,0,1.05-.3,1-.46s-.36-.18-.76-.42a6.1,6.1,0,0,1-1.31-1,4.42,4.42,0,0,1-.78-1.32c-.08-.24-.14-.43-.17-.55l.41-.44c.52-.55,1-1.06,1.51-1.53a5.92,5.92,0,0,0,1.51,1.53c1.59,1.09,3.38,1.26,3.46,1s-1.42-1.08-2.36-2.23a4.72,4.72,0,0,1-1-1.64c0-.06,0-.13,0-.19l1.28-1.2.74-.71a3.07,3.07,0,0,0,1.1,1.33,4.61,4.61,0,0,0,.7.41l.67.3a8.31,8.31,0,0,0,1.23.4c.74.18,1.31.12,1.32-.06s-.39-.36-1-.77c-.28-.2-.6-.44-.94-.71-.16-.13-.34-.28-.52-.41s-.34-.3-.44-.42a1.3,1.3,0,0,1-.23-1.46,2.41,2.41,0,0,1,.28-.54.56.56,0,0,1,.09-.13l0,0-.06,0,1.15-1.09,0,0s0,0,0,0,.09.2.09.21a2.79,2.79,0,0,0,.52.56,6.56,6.56,0,0,0,1,.61c.75.4,1.68.51,1.77.18s-.34-.83-.7-1.45c-.19-.29-.38-.59-.5-.81a.79.79,0,0,1-.05-.24,1.1,1.1,0,0,1-.44-.79c0-.06,0-.13,0-.2a6.65,6.65,0,0,0,.55-1c.1.12.22.25.34.37a30.73,30.73,0,0,0,3.57,3C50,125.29,50.64,125.71,51.29,126.11Z"/>
+                <path class="cls-6"
+                      d="M50.8,90.23s.26,0,.1.06l-.52.09-1,.14-.91.08-1.08.06a8,8,0,0,1-3.19-.34,4.92,4.92,0,0,1-1.28-.71c.14-.38.29-.75.45-1.1.73-1.57,1.51-3.06,2.07-4.22l.15-.32s0,0,0,0c.4.77.84,1.79,1.53,3a7.7,7.7,0,0,0,1.44,1.84,4,4,0,0,0,.49.42c.12.1.25.19.38.28a5.74,5.74,0,0,0,.92.5l.16.07Z"/>
+                <path class="cls-5"
+                      d="M50.53,152.19c0,.07-.33.31-.58.65a3.2,3.2,0,0,0-.41.71l-.11.23a1.71,1.71,0,0,0-.14.51.88.88,0,0,0,0,.28h-.05s-.12,0-.16,0l-.22-.28a1.87,1.87,0,0,1,.14-.94,2.11,2.11,0,0,1,.18-.27,2.56,2.56,0,0,1,.46-.49C50,152.23,50.51,152.11,50.53,152.19Z"/>
+                <path class="cls-5"
+                      d="M49.75,120.36a2.73,2.73,0,0,1-.47,2.3h0l-.41-.33.07,0a2.31,2.31,0,0,0,.36-1.61c-.3,0-.83,0-1.14,0a1.32,1.32,0,0,1-.48.58c-.13-.11-.26-.24-.38-.36.32-.22.38-.39.38-.44l-.1-.34.36,0c.5,0,1.31,0,1.49,0A.31.31,0,0,1,49.75,120.36Z"/>
+                <path class="cls-8"
+                      d="M49.31,154.57c0,.27.16.5.12.54s-.46-.26-.54-.79a.25.25,0,0,1,0-.08l.22.28s.11,0,.16,0Z"/>
+                <path class="cls-7"
+                      d="M49.29,120.67a2.31,2.31,0,0,1-.36,1.61l-.07,0c-.41-.35-.81-.71-1.19-1.08a1.32,1.32,0,0,0,.48-.58C48.46,120.68,49,120.68,49.29,120.67Z"/>
+                <path class="cls-5"
+                      d="M49.27,122.66h0a.7.7,0,0,1-.5.19,1,1,0,0,1-.49-.14l.27-.45a.36.36,0,0,0,.31.06Z"/>
+                <path class="cls-5" d="M46.77,183.25l1.23.24c-.21.31-.33.49-.33.5s-.36.1-.64-.05-.45-.39-.36-.55Z"/>
+                <path class="cls-5" d="M47.67,121.25l-.15.11-.29-.43.06,0C47.41,121,47.54,121.14,47.67,121.25Z"/>
+                <path class="cls-5"
+                      d="M45.2,79.55l2.1,1-.13.25c-.49-.17-.83-.32-1.25-.49L45,80C45.12,79.69,45.2,79.55,45.2,79.55Z"/>
+                <path class="cls-5"
+                      d="M47.17,80.83l-.65,1.32c-.05-.21-.11-.39-.16-.55a2,2,0,0,0-.29-.62,1.47,1.47,0,0,0-.37-.33l-.94,1.83A9.47,9.47,0,0,1,45.61,84l-.15.32c-.56,1.16-1.34,2.65-2.07,4.22-.16.35-.31.72-.45,1.1a1.39,1.39,0,0,1-.42-.49l-1.45,1.5a5.34,5.34,0,0,0,1.31.6,28.67,28.67,0,0,0-.74,2.94c-.09.5-.17,1-.24,1.52a1.86,1.86,0,0,1-.44-.57l-1.59,1.34a6.85,6.85,0,0,0,1.82,1.14,28.17,28.17,0,0,0,0,3.57c0,.68.1,1.38.17,2.07h-.55v0c-.1-1.39-.18-2.74-.26-4l-.42-.52-.25-.35-.48-.65c-.08-.13-.17-.25-.24-.37,0-.7.1-1.38.18-2l1.56-1-1-1.45a.75.75,0,0,1-.16.11,28.07,28.07,0,0,1,1-3.44c.91-.71,1.52-1.19,1.47-1.29s-.48,0-1.12.32c.11-.3.23-.59.35-.87.79-1.78,1.49-3.13,2.06-4.35.78-1.61,1.33-2.75,1.6-3.33l.92.39C46.34,80.51,46.68,80.66,47.17,80.83Z"/>
+                <path class="cls-5"
+                      d="M46,124.48c.36.62.8,1.15.7,1.45s-1,.22-1.77-.18a6.56,6.56,0,0,1-1-.61,2.79,2.79,0,0,1-.52-.56s0-.09-.09-.21,0,0,0,0a13.39,13.39,0,0,0,1.67-1.89c0,.07,0,.14,0,.2a1.1,1.1,0,0,0,.44.79.79.79,0,0,0,.05.24C45.57,123.89,45.76,124.19,46,124.48Z"/>
+                <path class="cls-5"
+                      d="M46.36,81.6c0,.16.11.34.16.55L45.61,84a9.47,9.47,0,0,0-.85-1.49l.94-1.83a1.47,1.47,0,0,1,.37.33A2,2,0,0,1,46.36,81.6Z"/>
+                <path class="cls-5"
+                      d="M46,171a7.49,7.49,0,0,1-.46,2.71,6.44,6.44,0,0,1-1.83,2.64,17.63,17.63,0,0,1-5.12,3l-1.2.44c-.44-.25-.85-.51-1.27-.79l.28-.08c.45-.14,1.07-.32,1.8-.58a17.25,17.25,0,0,0,5-2.58A6.54,6.54,0,0,0,45.59,171a14,14,0,0,0-.06-2.49l.1,0A6.72,6.72,0,0,1,46,171Z"/>
+                <path class="cls-5"
+                      d="M45.68,120.41a1.41,1.41,0,0,1-.21,1.08,13.27,13.27,0,0,1-1.5-2c.72-1.2.79-1.73.88-1.54A16.63,16.63,0,0,0,45.68,120.41Z"/>
+                <path class="cls-8" d="M45.63,168.51l-.1,0c0-.06,0-.09,0-.09S45.59,168.43,45.63,168.51Z"/>
+                <path class="cls-7"
+                      d="M45.53,168.48a14,14,0,0,1,.06,2.49,6.54,6.54,0,0,1-2.39,4.75,17.25,17.25,0,0,1-5,2.58c-.73.26-1.35.44-1.8.58l-.28.08h0a4.53,4.53,0,0,1-.4-.26l-.62-.42c-.32-.24-.74-.54-1.11-.85-.75-.58-1.59-1.38-2.38-2.07,0,.93,0,1.85.05,2.77-.48-1-1-2-1.42-3l-.7-1.49-1,1.31L27.5,176.3l-.14.18s-.07.1-.07,0l0-.11-.1-.53c-.25-1.13-.49-2.24-.74-3.35-.11-.55-.24-1.09-.36-1.65l-.18-.82a5.58,5.58,0,0,0-.28-1c-.14-.29-.48-1.41-.85-2.66a13.58,13.58,0,0,0,1.38.19,11.36,11.36,0,0,0,2.79,0,10.63,10.63,0,0,0,3-1,5.58,5.58,0,0,0,2.21-1.54,6.65,6.65,0,0,0,1-1.64c.15-.43.29-.82.41-1.18.24-.69.44-1.27.56-1.7.3.58.52.93.53,1s.38.58.94,1.36a28.68,28.68,0,0,0,2.16,2.74,13.52,13.52,0,0,0,2.61,2.33,4.11,4.11,0,0,0,1.4.66l.34.41h0a2,2,0,0,0,.57.22C44.9,168.29,45.19,168.37,45.53,168.48Z"/>
+                <path class="cls-5"
+                      d="M45.55,5.32l-.2.06-.65.23L44,5.89l-.5.22a12.67,12.67,0,0,0-1.72-.17,4.79,4.79,0,0,0-.64,0h-.18l.2-2,0,0c.1,0,.36.09.84.24s1.45.44,2.66.86C45,5.09,45.24,5.19,45.55,5.32Z"/>
+                <path class="cls-5"
+                      d="M41,106.05l0,0-.07-.88c0-.67-.09-1.32-.13-2h.07l.23,2.07.47-.13c.17,1.29.4,2.6.67,3.92a43.49,43.49,0,0,0,1.36,5,1.69,1.69,0,0,0-.46-.24c-.2-.06-.34,0-.31.06s.11,0,.21.14.23.26.39.42a1.3,1.3,0,0,0,.44.37c.12.36.27.71.42,1.07,0,0,0,0,0,0a.09.09,0,0,0,.06,0c.15.38.31.75.49,1.11.11.21.21.43.32.64l-.24.12c-.09-.19-.16.34-.88,1.54-.3-.5-.57-1-.82-1.51a38.18,38.18,0,0,1-2.85-8.44c-.09-.4-.18-.81-.26-1.2a1.89,1.89,0,0,0,.84-.76,1.54,1.54,0,0,0,.18-.8,1.75,1.75,0,0,0-.05-.4l0-.11,0-.09,0,0h0a.09.09,0,0,1,0,0v-.08Z"/>
+                <path class="cls-5"
+                      d="M45.47,121.49a6.65,6.65,0,0,1-.55,1c-.09-.55,0-1.14-.25-1.29s-1,.35-1.34,1.25a2.78,2.78,0,0,0-.18,1.44,2.46,2.46,0,0,0,.1.49l0,0-1.15,1.09a3.31,3.31,0,0,1-.64-.47,1.32,1.32,0,0,1-.19-.21l-.79-.86-.06,0,.31-.33c.53-.51.85-.8.91-.88A21.75,21.75,0,0,0,44,119.44,13.27,13.27,0,0,0,45.47,121.49Z"/>
+                <path class="cls-5"
+                      d="M44.72,114.72a.88.88,0,0,1,.3.74.66.66,0,0,1-.49.55.58.58,0,0,1-.25,0,.13.13,0,0,1,0-.08c.11-.1.42-.27.36-.51a.43.43,0,0,0-.23-.29,1.23,1.23,0,0,0-.18-.09,1.65,1.65,0,0,1-.37-.18q-.15-.37-.27-.75l.1.07a2.09,2.09,0,0,0,.74.32A1.16,1.16,0,0,1,44.72,114.72Z"/>
+                <path class="cls-5"
+                      d="M43.94,129.13c.57.41,1,.62,1,.77s-.58.24-1.32.06a8.31,8.31,0,0,1-1.23-.4l-.67-.3a4.61,4.61,0,0,1-.7-.41,3.07,3.07,0,0,1-1.1-1.33l2.19-2.07.06,0,0,0a.56.56,0,0,0-.09.13,2.41,2.41,0,0,0-.28.54,1.3,1.3,0,0,0,.23,1.46c.1.12.27.26.44.42s.36.28.52.41C43.34,128.69,43.66,128.93,43.94,129.13Z"/>
+                <path class="cls-5"
+                      d="M44.67,121.15c.21.15.16.74.25,1.29a13.39,13.39,0,0,1-1.67,1.89,2.46,2.46,0,0,1-.1-.49,2.78,2.78,0,0,1,.18-1.44C43.67,121.5,44.41,120.93,44.67,121.15Z"/>
+                <path class="cls-9" d="M44.25,116a.13.13,0,0,0,0,.08.09.09,0,0,1-.06,0S44.23,116,44.25,116Z"/>
+                <path class="cls-5"
+                      d="M44,77.55c-.54.15-1.09.3-1.63.47-.37.1-.74.22-1.09.34l-1-.42c.57-.25,1.18-.48,1.79-.7l.67-.24h0Z"/>
+                <path class="cls-5"
+                      d="M43.56,114.13q.12.38.27.75a1.3,1.3,0,0,1-.44-.37c-.16-.16-.28-.33-.39-.42s-.2-.1-.21-.14.11-.12.31-.06A1.69,1.69,0,0,1,43.56,114.13Z"/>
+                <path class="cls-5"
+                      d="M36.33,158.75a2.06,2.06,0,0,0-.31.58l-.17-.34a11.34,11.34,0,0,1-.91-3.46.86.86,0,0,1,0-.16c.21-.13.31-.23.29-.26a1.45,1.45,0,0,0-.3.13,9.11,9.11,0,0,1,.65-4.7h0a26.09,26.09,0,0,0,.18,4.86,10.75,10.75,0,0,0,1.07,3.12,15.33,15.33,0,0,0,.82,1.34l.83,1.4c.5.8,1.17,1.84,1.91,2.81a16.63,16.63,0,0,0,2.24,2.49c.68.6,1.22.92,1.17,1s0,0,0,0a4.11,4.11,0,0,1-1.4-.66,13.52,13.52,0,0,1-2.61-2.33,28.68,28.68,0,0,1-2.16-2.74c-.56-.78-.92-1.33-.94-1.36s-.23-.38-.53-1A2.71,2.71,0,0,0,36.33,158.75Z"/>
+                <path class="cls-5"
+                      d="M43.48,6.11l-.89.38c-.93.42-1.81.86-2.66,1.32a35.93,35.93,0,0,0-4.43,2.82l-.42.32a1.15,1.15,0,0,0-.37.15,5.22,5.22,0,0,0-.82.6,2.94,2.94,0,0,0-.12-1.86c.17-.19.33-.38.51-.56A27.7,27.7,0,0,1,38.54,5.6a30.67,30.67,0,0,1,2.6-1.7l-.2,2h.18a4.79,4.79,0,0,1,.64,0A12.67,12.67,0,0,1,43.48,6.11Z"/>
+                <path class="cls-5"
+                      d="M42.75,77l-.67.24c-.61.22-1.22.45-1.79.7l-1.41-.64c-3-1.34-5.8-2.66-8.19-3.87-1.18-.63-2.27-1.2-3.24-1.77S25.61,70.51,25,70.09l-2.21-1.46c-.12-.09-1.72-1.14-4.24-2.8C17.26,65,15.75,64,14.08,62.9c-.31-.23-.76-.5-1.07-.78l-.4-.46c-.12-.16-.17-.31-.27-.45s0-.37.07-.5.06-.32.23-.49a1.87,1.87,0,0,1,.47-.46,7.45,7.45,0,0,1,.62-.42c.95-.61.71-.43.85-.5l.26-.13c-.05,0-.18-.07-.28-.11l-.1,0-.32-.1-1-.3L7,56.42l4.61-3,1.49-1,.38-.24.13-.08.27-.16.28-.17s-.15-.08-.23-.12l-.3-.14-.46-.2-.79-.33a3.84,3.84,0,0,1-.55-.24,1.75,1.75,0,0,1-.49-.4,1.65,1.65,0,0,1,.2-2.25,14.4,14.4,0,0,0,3.31-5.33,28.83,28.83,0,0,0,1.4-5,26.58,26.58,0,0,0,.45-4l.29.25h0A18,18,0,0,1,17,38a27.88,27.88,0,0,1-1.13,5.21,18.56,18.56,0,0,1-1.25,3,11.56,11.56,0,0,1-.91,1.48,7.11,7.11,0,0,1-.54.72l-.29.35-.26.28a.46.46,0,0,0,0,.66.42.42,0,0,0,.16.09l.23.08.79.31,2.45.92.68.26.33.13.18.07.08,0-.06,0-1.19.79-3.65,2.48-.74.49-.26.19-.35.26.57.13,1.84.47L20,58.11l-2.85,1.57-1.35.78-.5.3-.16.11h0S15,61,15,61l.21.13,4.5,2.8c2.57,1.6,4.2,2.66,4.33,2.75l2.22,1.53c.68.48,1.37,1,2.29,1.53s2,1.15,3.11,1.77c2.31,1.25,5.05,2.62,8,4Z"/>
+                <path class="cls-5"
+                      d="M42.94,89.61c-.2.51-.38,1-.56,1.61a5.34,5.34,0,0,1-1.31-.6l1.45-1.5A1.39,1.39,0,0,0,42.94,89.61Z"/>
+                <path class="cls-5"
+                      d="M42.11,88.18c0,.1-.56.58-1.47,1.29.11-.34.23-.66.35-1C41.63,88.21,42.07,88.08,42.11,88.18Z"/>
+                <path class="cls-5"
+                      d="M41.43,125a3.31,3.31,0,0,0,.64.47l-2.19,2.07a1.72,1.72,0,0,1-.07-.21,3.47,3.47,0,0,1-.09-1.7,5.21,5.21,0,0,1,.33-1.08c.06-.13.12-.22.15-.3l0,0,.07-.1a.65.65,0,0,1,.15-.18l.79.86A1.32,1.32,0,0,0,41.43,125Z"/>
+                <path class="cls-5"
+                      d="M41.4,95.68c-.1.62-.16,1.26-.21,1.91a6.85,6.85,0,0,1-1.82-1.14L41,95.11A1.86,1.86,0,0,0,41.4,95.68Z"/>
+                <path class="cls-5" d="M41.31,103.23c0,.64.13,1.28.22,1.93l-.47.13-.23-2.07h.48Z"/>
+                <path class="cls-5"
+                      d="M40.29,77.94l1,.42a30,30,0,0,0-3.7,1.44,14.62,14.62,0,0,0-2,1.17c-.09-.07.54-.84,1.78-1.57A22.71,22.71,0,0,1,40.29,77.94Z"/>
+                <path class="cls-5"
+                      d="M38.86,131.26c.94,1.15,2.48,1.91,2.36,2.23s-1.87.11-3.46-1A5.92,5.92,0,0,1,36.25,131c.56-.55,1.1-1.06,1.61-1.55,0,.06,0,.13,0,.19A4.72,4.72,0,0,0,38.86,131.26Z"/>
+                <path class="cls-9" d="M41.17,3.88l0,0v0Z"/>
+                <path class="cls-5"
+                      d="M41.06,106.73a1.54,1.54,0,0,1-.18.8,1.89,1.89,0,0,1-.84.76c-.08-.47-.18-.93-.26-1.39a.22.22,0,0,0,0-.12s0,0,0-.07l.25-.14.06,0h0l.1,0h0l0,0,.06,0,0,0a.25.25,0,0,0,.08,0l.24-.11a0,0,0,0,1,0,0,1.22,1.22,0,0,1,.2-.1l0,0,0,.09,0,.11A1.75,1.75,0,0,1,41.06,106.73Z"/>
+                <path class="cls-8" d="M41,106.05l0,0h0Z"/>
+                <path class="cls-5"
+                      d="M41,88.5c-.12.31-.24.63-.35,1-.47.36-1,.8-1.62,1.28-.84.67-1.72,1.41-2.51,2.11l-1.07,1-.45.44-.2.2c0,.06-.14.14-.11.13s0,0,0,.11,0,.12.11.37a4.88,4.88,0,0,0,.48.93c.45.69,1.64,1.5,2.55,2.72a5.48,5.48,0,0,1,.93,2,7.79,7.79,0,0,1,.19,1.81c0,.26,0,.5,0,.72s0,.21-.05.32a.58.58,0,0,1,0,.16s0,.06-.06.1h0l-.18-.17h0l0-.06h0l-.07,0-.09-.08c0-.07,0-.13,0-.22s-.08-.41-.14-.66a5.85,5.85,0,0,0-1.4-3.09c-.83-.9-2-1.54-2.86-2.49a6.84,6.84,0,0,1-.79-1.26,4.17,4.17,0,0,1-.23-.62A1.71,1.71,0,0,1,33,94.7a1.43,1.43,0,0,1,.44-1.19l.26-.24.23-.19.51-.42c.37-.3.77-.61,1.21-.93.89-.63,1.87-1.29,2.81-1.86A22.59,22.59,0,0,1,41,88.5Z"/>
+                <path class="cls-8" d="M41,106.08v.08a.09.09,0,0,0,0,0h0Z"/>
+                <path class="cls-5"
+                      d="M41,106.07h0l0,0-.2.11a0,0,0,0,0,0,0l-.24.11a.25.25,0,0,1-.08,0l0,0-.06,0,0,0h0l-.1,0h0l-.06,0-.25.08h0a2,2,0,0,1-.07-.3,0,0,0,0,1,0,0l-.13-1c-.06-.67-.13-1.34-.2-2-.11-1.14-.22-2.24-.32-3.28a20.81,20.81,0,0,1,.06-2.75c.07.12.16.24.24.37l.48.65.25.35.42.52c.08,1.28.16,2.63.26,4v0c0,.65.09,1.3.13,2Z"/>
+                <path class="cls-8" d="M40.92,106.1h0a1.22,1.22,0,0,0-.2.1Z"/>
+                <path class="cls-5"
+                      d="M39.85,92.8l1,1.45-1.56,1c.06-.5.15-1,.23-1.48,0-.28.11-.56.17-.84h0A.75.75,0,0,0,39.85,92.8Z"/>
+                <path class="cls-7"
+                      d="M40.64,89.47a28.07,28.07,0,0,0-1,3.44h0L38,94.08l-.47.32c-.33.23-.75.44-.86.8a1.67,1.67,0,0,0,.11,1.21c.11.24.15.3.22.45l.2.34a13.22,13.22,0,0,0,.94,1.36l.52.69.27.34.12.15,0,0,0,.27c0,.41,0,.83,0,1.25.08,1.12.19,2.25.35,3.4h0a.83.83,0,0,0-.2-.41,2.52,2.52,0,0,0-.44-.42h0s.05-.07.06-.1a.58.58,0,0,0,0-.16c0-.11,0-.21.05-.32s0-.46,0-.72a7.79,7.79,0,0,0-.19-1.81,5.48,5.48,0,0,0-.93-2c-.91-1.22-2.1-2-2.55-2.72a4.88,4.88,0,0,1-.48-.93c-.09-.25-.1-.36-.11-.37s0-.09,0-.11.06-.07.11-.13l.2-.2.45-.44,1.07-1c.79-.7,1.67-1.44,2.51-2.11C39.6,90.27,40.17,89.83,40.64,89.47Z"/>
+                <path class="cls-5"
+                      d="M40.39,123.87l.06,0a.65.65,0,0,0-.15.18l-.07.1,0,0c0,.08-.09.17-.15.3a5.21,5.21,0,0,0-.33,1.08,3.47,3.47,0,0,0,.09,1.7,1.72,1.72,0,0,0,.07.21l-.74.71-1.28,1.2c0-.16-.08-.31-.12-.44a1.84,1.84,0,0,0-.15-.46l-1.38.75-.22.12a2,2,0,0,0-.29.15l-.17.06h0l-.12-.09C37.07,127.62,38.71,125.71,40.39,123.87Z"/>
+                <path class="cls-5"
+                      d="M39.78,106.9c.08.46.18.92.26,1.39a2.67,2.67,0,0,1-.33.12,4.88,4.88,0,0,1-1.17.15,16.06,16.06,0,0,1-2.09-.15,8.38,8.38,0,0,1-2-.5,2.66,2.66,0,0,1-1.63-1.48,1.81,1.81,0,0,1,0-1.13,6.21,6.21,0,0,1,.31-.84,12.39,12.39,0,0,1,.7-1.52,2.83,2.83,0,0,1,.53-.64c.22-.2.36-.28.59-.49a3.61,3.61,0,0,1,.63-.49c.2-.09.44-.2.62,0,.3.3.26.77.37,1.12,0,.18.06.29.08.44a.53.53,0,0,1-.06.37,1.8,1.8,0,0,0-.41.14c.06-.07.12-.13.18-.21s0-.34-.12-.6-.09-.48-.26-.69-.28,0-.39.13-.22.22-.32.34-.33.3-.47.44a2.55,2.55,0,0,0-.37.52,12.76,12.76,0,0,0-.56,1.46,7,7,0,0,0-.24.79.87.87,0,0,0,0,.62,1.84,1.84,0,0,0,1.14.85,7.58,7.58,0,0,0,1.79.35,13.64,13.64,0,0,0,1.92,0c.58,0,1.23-.22,1.26-.44A.07.07,0,0,0,39.78,106.9Z"/>
+                <path class="cls-8" d="M39.79,106.65l.25-.08-.25.14v0h0Z"/>
+                <path class="cls-8"
+                      d="M39.79,106.71s0,.05,0,.07a.22.22,0,0,1,0,.12c0-.18-.06-.37-.08-.55a2,2,0,0,0,.07.3h0Z"/>
+                <path class="cls-7"
+                      d="M39.7,106.35c0,.18,0,.37.08.55a.07.07,0,0,1,0,0c0,.22-.68.43-1.26.44a13.64,13.64,0,0,1-1.92,0A7.58,7.58,0,0,1,34.8,107a1.84,1.84,0,0,1-1.14-.85.87.87,0,0,1,0-.62,7,7,0,0,1,.24-.79,12.76,12.76,0,0,1,.56-1.46,2.55,2.55,0,0,1,.37-.52c.14-.14.38-.34.47-.44s.21-.23.32-.34.26-.22.39-.13.14.48.26.69.2.48.12.6-.12.14-.18.21l-.08,0a1.84,1.84,0,0,0-1,.66.77.77,0,0,0,0,.61,1,1,0,0,0,.21.36,1.89,1.89,0,0,0,.24.25s.19,0,.27-.16.14-.27.09-.3a1.11,1.11,0,0,1-.16-.15c-.1-.12-.19-.25-.13-.37s.36-.31.68-.47a2.87,2.87,0,0,1,1-.31,1.47,1.47,0,0,1,.94.34,7.16,7.16,0,0,1,.78.59c.43.38.15.83.22.83s.08-.07.14-.25a.66.66,0,0,0,0-.32h0c.07.55.15,1.1.26,1.65A0,0,0,0,0,39.7,106.35Z"/>
+                <path class="cls-8"
+                      d="M39.57,105.3l.13,1c-.11-.55-.19-1.1-.26-1.65-.16-1.15-.27-2.28-.35-3.4,0-.42,0-.84,0-1.25.1,1,.21,2.14.32,3.28C39.44,104,39.51,104.63,39.57,105.3Z"/>
+                <path class="cls-5"
+                      d="M39.69,92.92c-.06.28-.12.56-.17.84-.08.48-.17,1-.23,1.48l-.49.31-.48.3h0s0,0,0,0l.1.21.15.28c.17.29.36.58.57.9a20.81,20.81,0,0,0-.06,2.75l0-.27,0,0-.12-.15-.27-.34-.52-.69a13.22,13.22,0,0,1-.94-1.36l-.2-.34c-.07-.15-.11-.21-.22-.45a1.67,1.67,0,0,1-.11-1.21c.11-.36.53-.57.86-.8l.47-.32Z"/>
+                <path class="cls-5"
+                      d="M39.43,104.68a.66.66,0,0,1,0,.32c-.06.18-.13.25-.14.25s.21-.45-.22-.83a7.16,7.16,0,0,0-.78-.59,1.47,1.47,0,0,0-.94-.34,2.87,2.87,0,0,0-1,.31c-.32.16-.63.33-.68.47s0,.25.13.37a1.11,1.11,0,0,0,.16.15s0,.17-.09.3-.22.2-.27.16a1.89,1.89,0,0,1-.24-.25,1,1,0,0,1-.21-.36.77.77,0,0,1,0-.61,1.84,1.84,0,0,1,1-.66l.08,0c-.14.14-.27.21-.24.25s.25,0,.62-.34l0,0a2.41,2.41,0,0,1,.72-.12,1.75,1.75,0,0,1,1,.36.28.28,0,0,0,0,.13.65.65,0,0,0,.05.15s0,.16.28.22a.26.26,0,0,0,.16-.09,2.52,2.52,0,0,1,.44.42A.83.83,0,0,1,39.43,104.68Z"/>
+                <path class="cls-5" d="M38.91,142.58a1.64,1.64,0,0,1,.46-.06s-.23.16-.63.28Z"/>
+                <path class="cls-5"
+                      d="M38.91,142.58l-.17.22a7.6,7.6,0,0,1-1.23.26,12.34,12.34,0,0,1-4.25-.21,6,6,0,0,1-2.19-.89,5.2,5.2,0,0,1-1.48-1.53,5.38,5.38,0,0,1-.59-1.29l.44-.55.21-.27a4.8,4.8,0,0,0,.61,1.71,4.6,4.6,0,0,0,1.21,1.36,5.5,5.5,0,0,0,1.93.88,13.78,13.78,0,0,0,4.09.47A9.23,9.23,0,0,0,38.91,142.58Z"/>
+                <path class="cls-5"
+                      d="M38.61,103.68l.18.17a.26.26,0,0,1-.16.09c-.29-.06-.23-.17-.28-.22a.65.65,0,0,1-.05-.15.28.28,0,0,1,0-.13.71.71,0,0,1,.17.11v.07s0,0,.05,0l.07,0A0,0,0,0,1,38.61,103.68Z"/>
+                <path class="cls-8" d="M38.64,103.61l0,.06-.13-.1h0v-.08l.09.08.07,0Z"/>
+                <path class="cls-8" d="M38.61,103.67h0a0,0,0,0,0,0,0l-.07,0c-.09-.06,0,0-.05,0v-.05h0Z"/>
+                <path class="cls-5" d="M38.47,103.53v0a.71.71,0,0,0-.17-.11s0,0,0,0,.07,0,.13.07h0Z"/>
+                <path class="cls-6"
+                      d="M37.51,143.06a7.6,7.6,0,0,0,1.23-.26A18.5,18.5,0,0,0,37,145.49a12.25,12.25,0,0,0-.63,1.34c-.35.08-.92.23-1.61.36a11.13,11.13,0,0,1-4.55.05,6.12,6.12,0,0,1-4.3-3.57c.25-.46.52-.91.8-1.34.74-1.12,1.53-2.18,2.32-3.19a5.38,5.38,0,0,0,.59,1.29A5.2,5.2,0,0,0,31.07,142a6,6,0,0,0,2.19.89A12.34,12.34,0,0,0,37.51,143.06Z"/>
+                <path class="cls-5"
+                      d="M37.74,129c0,.13.08.28.12.44-.51.49-1,1-1.61,1.55a4.2,4.2,0,0,1-.3-.48,8.38,8.38,0,0,1-.38-.79l0-.09h0l.17-.06a2,2,0,0,1,.29-.15l.22-.12,1.38-.75A1.84,1.84,0,0,1,37.74,129Z"/>
+                <path class="cls-5"
+                      d="M37.35,136.28c.1.16-.32.48-1,.46a4.46,4.46,0,0,1-2.13-.61,5.52,5.52,0,0,1-1.55-1.43c.55-.61,1.09-1.2,1.61-1.75,0,.12.09.31.17.55a4.42,4.42,0,0,0,.78,1.32,6.1,6.1,0,0,0,1.31,1C37,136.1,37.28,136.15,37.35,136.28Z"/>
+                <path class="cls-5"
+                      d="M37.43,179.75l-.65.22-.74.24a.26.26,0,0,1-.24-.11c0-.12-.09-.25-.22-.36a.29.29,0,0,1,0-.42c0-.13.08-.21.17-.23l.44-.13h0C36.58,179.24,37,179.5,37.43,179.75Z"/>
+                <path class="cls-5"
+                      d="M36.34,146.83a1.52,1.52,0,0,1,.46-.1,1.5,1.5,0,0,1-.54.28A1.42,1.42,0,0,1,36.34,146.83Z"/>
+                <path class="cls-5" d="M36.6,103.2l0,0c-.37.35-.59.35-.62.34s.1-.11.24-.25A1.8,1.8,0,0,1,36.6,103.2Z"/>
+                <path class="cls-5"
+                      d="M36.34,146.83a1.42,1.42,0,0,0-.08.18,12.36,12.36,0,0,1-1.45.5,10.78,10.78,0,0,1-4.74.31,6.52,6.52,0,0,1-4.66-3.28c.15-.29.3-.59.47-.87a6.12,6.12,0,0,0,4.3,3.57,11.13,11.13,0,0,0,4.55-.05C35.42,147.06,36,146.91,36.34,146.83Z"/>
+                <path class="cls-5" d="M36.33,158.75a2.71,2.71,0,0,1-.21.78l-.1-.2A2.06,2.06,0,0,1,36.33,158.75Z"/>
+                <path class="cls-5"
+                      d="M36,159.33l.1.2c-.12.43-.32,1-.56,1.7-.12.36-.26.75-.41,1.18a6.65,6.65,0,0,1-1,1.64,5.58,5.58,0,0,1-2.21,1.54,10.63,10.63,0,0,1-3,1,11.36,11.36,0,0,1-2.79,0,13.58,13.58,0,0,1-1.38-.19c-.1-.29-.19-.59-.27-.89.43.1,1,.22,1.73.31a11.19,11.19,0,0,0,2.61.06,10,10,0,0,0,2.85-.82,6.06,6.06,0,0,0,2.41-1.65,4.57,4.57,0,0,0,.69-1.13c.18-.41.33-.8.49-1.17C35.57,160.35,35.83,159.75,36,159.33Z"/>
+                <path class="cls-5"
+                      d="M36,130.5a4.2,4.2,0,0,0,.3.48c-.49.47-1,1-1.51,1.53l-.41.44a1,1,0,0,0,0-.15,3.16,3.16,0,0,0-1.13.28,3.76,3.76,0,0,0-1.07.48,4.91,4.91,0,0,0,.51,1l.12.18c-1,1.12-2,2.32-3.07,3.62a.18.18,0,0,1,0,0,.43.43,0,0,0-.46-.31.39.39,0,0,0-.37.46,4.27,4.27,0,0,0,.19.72c-.79,1-1.58,2.07-2.32,3.19-.28.43-.55.88-.8,1.34a1.09,1.09,0,0,0-.05-.14,3.54,3.54,0,0,1-.19-.57.33.33,0,0,0-.16-.22s0,0,0,0h0c.27-.61.57-1.23.86-1.82l.14-.21c.67-.95,1.24-2,1.82-3,.48-.71,1-1.41,1.46-2.12.77-.85,1.54-1.7,2.35-2.52,1.14-1.15,2.24-2.37,3.33-3.58l.12.09h0l0,.09A8.38,8.38,0,0,0,36,130.5Z"/>
+                <path class="cls-6"
+                      d="M35.85,159l.17.34c-.19.42-.45,1-.76,1.77-.16.37-.31.76-.49,1.17a4.57,4.57,0,0,1-.69,1.13,6.06,6.06,0,0,1-2.41,1.65,10,10,0,0,1-2.85.82,11.19,11.19,0,0,1-2.61-.06c-.7-.09-1.3-.21-1.73-.31-.44-1.46-.88-2.87-1-3.21l-.24-.61h0a21.58,21.58,0,0,1-.73-5.15c0-.48,0-1,0-1.47a4.64,4.64,0,0,0,.73.62,7.39,7.39,0,0,0,5,1.31,27.19,27.19,0,0,0,5-.9,7.43,7.43,0,0,0,1.76-.71.86.86,0,0,0,0,.16A11.34,11.34,0,0,0,35.85,159Z"/>
+                <path class="cls-7"
+                      d="M35.58,150v.53a9.11,9.11,0,0,0-.65,4.7l-.27.1a13.27,13.27,0,0,1-1.56.43,34.12,34.12,0,0,1-4.9.62,6.83,6.83,0,0,1-4.49-1.34,5.76,5.76,0,0,1-1.14-1.16,10.55,10.55,0,0,1,.27-1.72,50.14,50.14,0,0,1,1.56-5.44c.33-.76.66-1.48,1-2.19a6.52,6.52,0,0,0,4.66,3.28,10.78,10.78,0,0,0,4.74-.31,12.36,12.36,0,0,0,1.45-.5A6.46,6.46,0,0,0,35.58,150Z"/>
+                <rect class="cls-9" x="35.52" y="129.61" width="0.01" height="0.01"/>
+                <path class="cls-5" d="M35.22,155.11s-.08.13-.29.26c0-.05,0-.09,0-.13A1.45,1.45,0,0,1,35.22,155.11Z"/>
+                <path class="cls-5"
+                      d="M34.92,155.24s0,.08,0,.13a7.43,7.43,0,0,1-1.76.71,27.19,27.19,0,0,1-5,.9,7.39,7.39,0,0,1-5-1.31,4.64,4.64,0,0,1-.73-.62c0-.39,0-.79.06-1.16a5.76,5.76,0,0,0,1.14,1.16,6.83,6.83,0,0,0,4.49,1.34,34.12,34.12,0,0,0,4.9-.62,13.27,13.27,0,0,0,1.56-.43Z"/>
+                <path class="cls-5"
+                      d="M34.29,132.8a1,1,0,0,1,0,.15c-.52.55-1.06,1.14-1.61,1.75l-.12-.18a4.91,4.91,0,0,1-.51-1,3.76,3.76,0,0,1,1.07-.48A3.16,3.16,0,0,1,34.29,132.8Z"/>
+                <path class="cls-5"
+                      d="M33.77,9.84a2.94,2.94,0,0,1,.12,1.86,10.09,10.09,0,0,0-1,1c-.11.11-.21.21-.31.33l-.5.52-.09,0a.44.44,0,0,1-.2-.27.43.43,0,0,1,0-.2,2,2,0,0,1,.13-.48A11.47,11.47,0,0,1,33.77,9.84Z"/>
+                <path class="cls-9" d="M33.89,11.7h0a12.79,12.79,0,0,0-1,1A10.09,10.09,0,0,1,33.89,11.7Z"/>
+                <path class="cls-5"
+                      d="M33.43,9.55a.51.51,0,0,1,.34.29,11.47,11.47,0,0,0-1.85,2.71,2,2,0,0,0-.13.48.43.43,0,0,0,0,.2.44.44,0,0,0,.2.27l.09,0c-.13.13-.25.27-.39.4L30,13.47c-1.45-.36-3.5-.87-5.91-1.29a23.44,23.44,0,0,0-3.69-.42c-1.32,0-2.83.17-4.35.34s-3.12.43-4.7.72l-1.17.24-1,.22a.81.81,0,0,0-.33.12,1.16,1.16,0,0,0-.14.34v.11a2,2,0,0,0,0,.25c0,.19,0,.36,0,.55a11.17,11.17,0,0,0,.06,1.14A20,20,0,0,0,9,18.1a20.48,20.48,0,0,0,.53,2.25c.11.36.23.72.35,1.06l.08.23,0,.06.07.13.27.51a55.82,55.82,0,0,0,4.4,7.18c3.12,3.8,5.32,6.42,5.07,6.66s-1.16-.62-2.78-2h0a2.39,2.39,0,0,0-.21-1s-.06.26-.08.73c-1-.86-2.12-1.93-3.41-3.19a48,48,0,0,1-5.26-7l-.32-.5L7.67,23a.88.88,0,0,1-.12-.21l-.14-.33c-.19-.4-.35-.79-.51-1.2a21.15,21.15,0,0,1-.78-2.49,24.62,24.62,0,0,1-.54-2.61c-.07-.45-.12-.91-.15-1.37,0-.23,0-.48,0-.72s0-.25,0-.37,0-.36,0-.52a3.9,3.9,0,0,1,.66-2,3.28,3.28,0,0,1,1.72-1.1l.49-.18.32-.09.65-.19,1.26-.33c1.67-.42,3.3-.75,4.9-1s3.16-.5,4.75-.61a26.51,26.51,0,0,1,4.49.25c2.65.35,4.78.78,6.29,1.1S33.37,9.53,33.43,9.55Z"/>
+                <path class="cls-5"
+                      d="M29.64,138.27a.18.18,0,0,0,0,0l-.21.27-.44.55a4.27,4.27,0,0,1-.19-.72.39.39,0,0,1,.37-.46A.43.43,0,0,1,29.64,138.27Z"/>
+                <path class="cls-5"
+                      d="M28.51,17.46c.08.14-1.07,1-2.07,2.1a17,17,0,0,0-1.3,1.51c-.34.43-.54.75-.56.76l-.57.74a10.93,10.93,0,0,0-1,1.68c-.68,1.27-.81,2.72-1,2.72s-.17-.36-.16-.94a6.8,6.8,0,0,1,.36-2.09,11.32,11.32,0,0,1,.88-2c.31-.5.53-.84.55-.85s.27-.34.67-.76A15.28,15.28,0,0,1,25.78,19h0l1-.32c.64-.22,1-.7.92-1C28.17,17.51,28.48,17.4,28.51,17.46Z"/>
+                <path class="cls-8" d="M27.72,17.74c.12.27-.28.75-.92,1l-1,.32.09-.08A12.18,12.18,0,0,1,27.72,17.74Z"/>
+                <path class="cls-5"
+                      d="M27.7,17.71l0,0A12.18,12.18,0,0,0,25.88,19l-.09.08h0c-.14,0-.21,0-.23,0a2,2,0,0,0-.18-.28,2.13,2.13,0,0,0-.71-.58,6,6,0,0,0-3.4-.49c-3,.18-6-.18-6-.48s2.94-.69,5.75-1.3a7.57,7.57,0,0,1,4.62.15A4.48,4.48,0,0,1,27.7,17.71Z"/>
+                <path class="cls-5"
+                      d="M25.83,143.53a1.09,1.09,0,0,1,.05.14c-.17.28-.32.58-.47.87a5.19,5.19,0,0,1-.39-.8l.17-.46,0,0c.07-.17.15-.33.22-.5,0,0,0,0,0,0a.33.33,0,0,1,.16.22A3.54,3.54,0,0,0,25.83,143.53Z"/>
+                <path class="cls-9" d="M25.44,142.73h0c-.07.17-.15.33-.22.5l.21-.51Z"/>
+                <path class="cls-9" d="M25.19,143.28l-.17.46v0Z"/>
+                <path class="cls-5"
+                      d="M25,143.74a5.19,5.19,0,0,0,.39.8c-.36.71-.69,1.43-1,2.19a50.14,50.14,0,0,0-1.56,5.44,10.55,10.55,0,0,0-.27,1.72c-.22-.3-.33-.5-.34-.51l0,0c.08-.54.17-1,.29-1.6A43.89,43.89,0,0,1,25,143.74Z"/>
+                <path class="cls-5" d="M24.48,165.5c.08.3.17.6.27.89l-.18,0c-.07-.29-.15-.59-.21-.88Z"/>
+                <circle class="cls-7" cx="85.17" cy="46.47" r="1.44"/>
+                <circle class="cls-7" cx="63.02" cy="48.47" r="1.62"/>
+                <circle class="cls-7" cx="64.01" cy="51.01" r="0.33"/>
+                <circle class="cls-7" cx="83.75" cy="48.93" r="0.34"/>
+                <path class="cls-5"
+                      d="M66.46,76.69l.11,0a.52.52,0,0,0-.28-1h-.06a.49.49,0,0,0-.36.36v0a.52.52,0,0,0,1,.28v0l-.36.36h.06l-.28-1-.11,0c-.62.24-.35,1.25.28,1Z"/>
+                <path class="cls-5" d="M66.08,82.5l0,0a.52.52,0,0,0,.73.74l0,0a.52.52,0,0,0-.73-.73Z"/>
+                <path class="cls-6"
+                      d="M112.71,157.38a2.56,2.56,0,0,1,0,.37l-.09.61a9.4,9.4,0,0,1-.21,1.2,17.88,17.88,0,0,1-.7,2.37,21.65,21.65,0,0,1-5.45,8.36,27.78,27.78,0,0,1-8.61,5.65l-1.22.5-1.24.41c-.82.3-1.68.49-2.52.72-1.75.38-3.41.65-5.36,1l-5.63,2.22h0l0,0a31.26,31.26,0,0,1-6,2c-2.08.5-4.21.9-6.35,1.21-.85.12-1.71.24-2.57.34.22-.45.53-1,.88-1.69s.87-1.72,1.31-2.75a11.42,11.42,0,0,0,.57-1.65,11.83,11.83,0,0,0,.25-1.79,7,7,0,0,0-.45-3.54,7.43,7.43,0,0,0-1.89-2.41,5.48,5.48,0,0,0-1.17-.79,62.51,62.51,0,0,0,11.29-3.9c4.77-2.1,9.75-4.77,15.07-7.48,1.34-.67,2.69-1.36,4.08-2s2.77-1.37,4.21-1.92a15.78,15.78,0,0,1,4.47-1.12,7.48,7.48,0,0,1,4.39.87,7.36,7.36,0,0,1,1.77,1.43,8.24,8.24,0,0,1,.75.91Z"/>
+                <path class="cls-7"
+                      d="M106.59,12.84c0,.09.1,1.4,0,3.33a44.21,44.21,0,0,1-.84,7A54,54,0,0,1,103.91,30c-.63,1.84-1.11,3-1,3.12s.07,0,.15-.09c0,.56,0,1.93-.06,3.29-.05.88-.11,1.78-.18,2.44s-.14,1.13-.14,1.16,0,.49-.13,1.15a19.72,19.72,0,0,1-.37,2.11c0-.15,0-.33,0-.53,0-.52,0-1.13-.07-1.86a13.23,13.23,0,0,0-.74-2.39A8.75,8.75,0,0,0,99.65,36a12.3,12.3,0,0,0-2.47-2.17,12.07,12.07,0,0,0-7-1.66,7.56,7.56,0,0,0-3.56,1.45A11.46,11.46,0,0,0,84,36.19a9.45,9.45,0,0,0-1.52,3.09c-.32,1-.55,2-.74,2.88-.74,3.59-1,6.06-1,6.21s-.28,2.62-.38,6.25A28.23,28.23,0,0,0,82.8,67.68l.21.4.26.5a1.07,1.07,0,0,0,1.21.56,2.75,2.75,0,0,0,.58-.12,3.48,3.48,0,0,0,.52-.27c.27-.17.51-.35.75-.51,1-.69,1.86-1.4,2.73-2.08,1.74-1.37,3.33-2.7,4.65-3.86,0,0,3.81-3.23,4.5-4.7.05-.1.1-.25.17-.43l.67.83c.1.12.18.21.15.19a0,0,0,0,1,0,0h0c-.14.12-.33.27-.55.48a9.47,9.47,0,0,0-1.48,1.91c-.92,1.65-1.9,3.72-3.17,5.66a15.38,15.38,0,0,1-2.06,2.63,13.7,13.7,0,0,1-2.35,1.71,19.36,19.36,0,0,0-2.47,1.56l-.08,0s0,0,0,0a1.82,1.82,0,0,0-.59-.79c-.24-.14-.38-.07-.38,0s.12.09.24.23a2.9,2.9,0,0,1,.31.76c.09.38.19.85.28,1.36a6.94,6.94,0,0,0-2,1A6.61,6.61,0,0,0,87,74.28c0,.22.05.44.07.66a3.44,3.44,0,0,1,0,.91c-.48.25-.76.46-.72.51s.26,0,.65-.12a4.8,4.8,0,0,1-.26.81h0c-1.15.33-2.16.88-2.1,1s.8,0,1.68-.15c-.18.29-.32.45-.32.48a11.77,11.77,0,0,1-.76,1,13.31,13.31,0,0,1-1.94,1.82,4.81,4.81,0,0,1-2.4.77c-.73,0-1.23,0-1.25.1s.48.27,1.24.35a5.18,5.18,0,0,0,1.87-.13l0,.11c-.11,0-.42.36-.93.75a5.54,5.54,0,0,1-2.27,1,8.13,8.13,0,0,1-2.49.06,3.29,3.29,0,0,1-.36-.07,4.5,4.5,0,0,0,.94-.83,4,4,0,0,0,.73-1,1.62,1.62,0,0,0,.18-.43c-.12-.11-.46.53-1.22,1.15A6.89,6.89,0,0,1,74,84.48a12.54,12.54,0,0,1-3.63.2,7.35,7.35,0,0,1-1.64-.34l-.46-.14a5.48,5.48,0,0,1-1-.49c-.6-.43-1.37-1.09-2.16-1.78.7-.47,1.39-.93,1.92-1.21s1.17-.42,1.17-.51-.55-.13-1.34.09a19.22,19.22,0,0,0-2.38,1.09l-.07-.06-1.9-1.68,1.23-.4C66.37,78.38,69,77.7,69,77.54s-.08,0-.2,0l.81-1.4a3.9,3.9,0,0,0,.51.06l.57,0a.74.74,0,0,0,.41-.07.36.36,0,0,0,.15-.44,1.5,1.5,0,0,0-.45-.65.66.66,0,0,0-.43-.19h0L67.54,73.7c1.79-.14,2.75-.72,2.65-.84.08.1,1.06-.78,2.31-2.61A22.18,22.18,0,0,0,76,61.88a25,25,0,0,0,.29-6,53.49,53.49,0,0,0-.51-6.52,21.06,21.06,0,0,0-2.05-6.68,15.79,15.79,0,0,0-4.65-5.32l0,0,0,0a16.52,16.52,0,0,0-9.81-3.59,50.15,50.15,0,0,0-8.62.94,29.57,29.57,0,0,0-5.92,1.72,21.16,21.16,0,0,0-2.31,1.16,25.64,25.64,0,0,0-2.65,1.87,44.75,44.75,0,0,0-5.55,5.36,48.36,48.36,0,0,0-3.18,4l-.74,1.11-.57.82-.35.53-.18.26c-.06.08.11.16.15.25l.82,1,.51.59c.32.34.65.69,1,1.06a86.39,86.39,0,0,0,8.73,8.28,46.78,46.78,0,0,0,5,3.57L46.6,67l1.35.67c.91.43,1.78.8,2.65,1.19,3.48,1.51,6.75,2.87,9.65,3.8.63.2,1.23.39,1.81.53l-.68,2.53a31.69,31.69,0,0,0-4-.66,34.31,34.31,0,0,0-5.28-.12c-1.46.1-2.44.23-2.51.25s-1.05.16-2.46.53c-1.24.32-2.78.77-4.34,1.32h0l-3.06-1.45c-2.94-1.42-5.68-2.79-8-4-1.15-.62-2.2-1.21-3.11-1.77s-1.61-1-2.29-1.53l-2.22-1.53c-.13-.09-1.76-1.15-4.33-2.75l-4.5-2.8L15,61s.05-.08.09-.12h0l.16-.11.5-.3,1.35-.78L20,58.11,13.6,56.37l-1.84-.47-.57-.13.35-.26.26-.19.74-.49,3.65-2.48,1.19-.79.06,0-.08,0-.18-.07-.33-.13L16.17,51l-2.45-.92-.79-.31-.23-.08a.42.42,0,0,1-.16-.09.46.46,0,0,1,0-.66l.26-.28.29-.35a7.11,7.11,0,0,0,.54-.72,11.56,11.56,0,0,0,.91-1.48,18.56,18.56,0,0,0,1.25-3A27.88,27.88,0,0,0,17,38,18,18,0,0,0,17,34.14c1.62,1.42,2.65,2.17,2.78,2s-1.95-2.86-5.07-6.66a55.82,55.82,0,0,1-4.4-7.18l-.27-.51L10,21.7l0-.06-.08-.23c-.12-.34-.24-.7-.35-1.06A20.48,20.48,0,0,1,9,18.1a20,20,0,0,1-.31-2.31,11.17,11.17,0,0,1-.06-1.14c0-.19,0-.36,0-.55a2,2,0,0,1,0-.25v-.11a1.16,1.16,0,0,1,.14-.34.81.81,0,0,1,.33-.12l1-.22,1.17-.24c1.58-.29,3.16-.53,4.7-.72s3-.31,4.35-.34a23.44,23.44,0,0,1,3.69.42c2.41.42,4.46.93,5.91,1.29l1.75.45c.14-.13.26-.27.39-.4l.5-.52c.1-.12.2-.22.31-.33a12.79,12.79,0,0,1,1-1h0a5.22,5.22,0,0,1,.82-.6,1.15,1.15,0,0,1,.37-.15l.42-.32a35.93,35.93,0,0,1,4.43-2.82c.85-.46,1.73-.9,2.66-1.32l.89-.38c.3,0,.63.09,1,.16A20.89,20.89,0,0,1,49,7.76a19,19,0,0,1,2.83,1.61c.49.33,1,.69,1.53,1.07l.81.6c.33.25.67.52,1,.83l.46.4A4.16,4.16,0,0,1,57,13.2c.18.28.06-.07.06-.2a4.19,4.19,0,0,1,0-.47A1.67,1.67,0,0,1,57,12c-.67-2.22-1.23-4.1-1.7-5.64-.23-.76-.44-1.43-.65-2,.59,0,1.16,0,1.7,0,1.57,0,2.89.15,3.82.23l1.6.14,1,.06a3.71,3.71,0,0,1,.3.28A15.34,15.34,0,0,1,67,12.72c.06.33.11.64.14.76s0,0,0,0l.52,0v0A80.77,80.77,0,0,1,68,5l1,0a12.45,12.45,0,0,0,1.36,0c.24,0,.5,0,.8,0s.52-.06.77-.1c.8-.14,1.58-.3,2.35-.45.15.15.32.31.5.51a12.38,12.38,0,0,1,1.84,2.74,9.74,9.74,0,0,1,.42,1,10.17,10.17,0,0,1,.37,1.58c.07.53.14,1.09.23,1.67,0,.29.07.58.11.87l.06.45,0,.23c0,.07,0,0,.06,0l.27-.87A27.31,27.31,0,0,1,79.51,9,14.63,14.63,0,0,1,80.7,6.84,6.39,6.39,0,0,1,82,5.46a13.48,13.48,0,0,1,1.31-.85c.27-.16.51-.28.74-.39a27.59,27.59,0,0,1,3.84,1c1.51.5,2.88,1.1,4,1.53.89.33,1.64.59,2.18.74.65.7,1.15,1.21,1.5,1.55s.6.52.67.48-.07-.33-.34-.76l-.68-1.17.8,0h.54l.32,0c.88-.08,1.84-.15,2.82-.28A28.67,28.67,0,0,1,102.59,7a5.14,5.14,0,0,1,2.42.4c1.18.59,1.39,2.28,1.5,3.41S106.59,12.79,106.59,12.84Zm-1.21-2a5.15,5.15,0,0,0-.16-1.51c0-.1-.44-.07-.89.13l-.49.21h0a10.19,10.19,0,0,0-2.26.68,19.76,19.76,0,0,1-2.34.87,4.6,4.6,0,0,1-.78.16l.89,1.28a2.47,2.47,0,0,1,.42-.63,5.32,5.32,0,0,1,2-1.32,3,3,0,0,1,2-.18,3.53,3.53,0,0,1,0,.38,8.14,8.14,0,0,1-.14,2.54c-.31,1.26-.64,2.56-.74,3.31-.57-1-1.12-1.8-1.24-1.75a19.93,19.93,0,0,0,1,3.1,19.92,19.92,0,0,1,.61,2.11,9.74,9.74,0,0,1,.2,1c0,.06.12.44.18,1a15.34,15.34,0,0,1-.07,2.16,16.84,16.84,0,0,0-.18,3.25,9.46,9.46,0,0,0,1-3.13,12.5,12.5,0,0,0,.32-2.33c0-.68-.11-1.11-.09-1.14s-.11-.47-.32-1.08a18.79,18.79,0,0,0-.88-2.14l-.28-.55a22.61,22.61,0,0,0,1.67-3.44A8.53,8.53,0,0,0,105.38,10.88ZM85.64,76.8a1.27,1.27,0,0,0,.09-.67.34.34,0,0,0-.09-.2c-.06-.05-.14,0-.21,0-.27.12-.39.21-.37.24-.1-.12-.22-.19-.26-.14a.69.69,0,0,0,0,.68.61.61,0,0,0,.4.41C85.38,77.2,85.54,77.05,85.64,76.8Zm-1.35-2.53a1,1,0,0,0,.37-.62.33.33,0,0,0-.06-.22.2.2,0,0,0-.22,0c-.3.1-.44.17-.44.21s-.23-.19-.25-.16l-.12.14a1.05,1.05,0,0,0-.23.43.35.35,0,0,0,.24.42A.82.82,0,0,0,84.29,74.27Zm-.36,3.6a1.23,1.23,0,0,0,.4-1.09,2.18,2.18,0,0,0-.43-1,3.08,3.08,0,0,0-.73-.71,2.62,2.62,0,0,0-1-.4,6.75,6.75,0,0,0-1.84,0,1.57,1.57,0,0,0-.28.06l-.2.06-.36.11-.3.08H79a1,1,0,0,1-.22,0,1.55,1.55,0,0,0-.52-.07,5,5,0,0,0-.66.09,7,7,0,0,0-1.22.36,6.59,6.59,0,0,0-.65.31,4.47,4.47,0,0,0-1.4,1.12,3.62,3.62,0,0,0-.87,2.37,3.42,3.42,0,0,0,.33,1.4,1.74,1.74,0,0,0,1.28,1,3.27,3.27,0,0,0,1.45-.16,1.26,1.26,0,0,0,.55.33,3.23,3.23,0,0,0,1.62-.11,6,6,0,0,0,1.22-.48h0a1,1,0,0,0,.43.14,1.31,1.31,0,0,0,1-.33c.36-.37.63-.71.74-.79.09.07.06,0,.07,0v0a.07.07,0,0,0,0-.08.17.17,0,0,0-.11,0v0a.28.28,0,0,0,.22,0,.92.92,0,0,0,.28-.14A1.16,1.16,0,0,0,83,79.2C83.15,78.34,83.36,78.27,83.93,77.87ZM71,81.16a1.05,1.05,0,0,0-.44-.86,1.1,1.1,0,0,0-.86-.24c-.11-.11-.25-.16-.28-.11a4.07,4.07,0,0,0-.52.8,1,1,0,0,0,.13,1.1,1.3,1.3,0,0,0,2-.69ZM26.44,19.56c1-1.06,2.15-2,2.07-2.1s-.34.05-.79.28l0,0a4.48,4.48,0,0,0-2.05-1.64A7.57,7.57,0,0,0,21,15.92c-2.81.61-5.75.9-5.75,1.3s2.94.66,6,.48a6,6,0,0,1,3.4.49,2.13,2.13,0,0,1,.71.58,2,2,0,0,1,.18.28s.09,0,.23,0a15.28,15.28,0,0,0-1.46,1.34c-.4.42-.65.74-.67.76s-.24.35-.55.85a11.32,11.32,0,0,0-.88,2A6.8,6.8,0,0,0,21.86,26c0,.58.09.95.16.94s.29-1.45,1-2.72a10.93,10.93,0,0,1,1-1.68l.57-.74s.22-.33.56-.76A17,17,0,0,1,26.44,19.56Z"/>
+                <path class="cls-9" d="M104,10.78l0,.05-.11.07h0v0Z"/>
+                <path class="cls-7"
+                      d="M104.82,48.69c-.49.52-1.09,1.17-1.74,1.89l-1.37,1.51-.71.81c-.39.45-.78.91-1.17,1.35l-.5-.14c.51-1.75,1-3.78,1.44-5.22A39.45,39.45,0,0,0,104.82,48.69Z"/>
+                <path class="cls-9" d="M103.19,33a.38.38,0,0,1-.09.09,1,1,0,0,1,0-.25S103.17,32.85,103.19,33Z"/>
+                <path class="cls-7"
+                      d="M102.23,55.88l-.26,0h-.09l-.51.14-2,.55-.92.26c.23-.67.53-1.67.84-2.77l.5.14,2.14,1.4Z"/>
+                <path class="cls-8" d="M102.22,43.2a3.08,3.08,0,0,1-.07,1.08s-.06-.11-.1-.34.07-.3.11-.45Z"/>
+                <path class="cls-6"
+                      d="M101.86,42.69c.07.55.14,1,.19,1.25a29.75,29.75,0,0,0-.76,3v0h0l0,.18c0,.07,0,.14-.06.23s0,.12,0,.18-.08.32-.13.51-.06.21-.09.31-.06.22-.09.34,0,0,0,0a.61.61,0,0,1,0,.11s0,0,0,0c-.29,1-.67,2.24-1.06,3.28L97.3,52a13.25,13.25,0,0,0,.26-3.76,8.2,8.2,0,0,0-1.14-3.58,23.57,23.57,0,0,0-2-3,7.71,7.71,0,0,0-2.61-2.15,8.87,8.87,0,0,0-7.29,0,4.1,4.1,0,0,0-.56.36.85.85,0,0,1,0-.17,7.67,7.67,0,0,1,1.23-2.68,9.63,9.63,0,0,1,2.22-2.29,6.3,6.3,0,0,1,2.86-1.31,11.18,11.18,0,0,1,6.37,1.26,11.87,11.87,0,0,1,2.37,1.92,8.19,8.19,0,0,1,1.74,2.09,15.8,15.8,0,0,1,.83,2.15C101.71,41.58,101.79,42.19,101.86,42.69Z"/>
+                <path class="cls-8" d="M100.78,48.85a.06.06,0,0,1,0,0h0S100.77,48.86,100.78,48.85Z"/>
+                <path class="cls-6"
+                      d="M97.3,52l2.4.19c-.12.32-.24.62-.36.89-.93,2.14-1.14,4-1.75,4.81s-1,1.26-1,1.26c-.78.64-1.92,1.57-3.31,2.64s-3,2.32-4.81,3.61c-.89.64-1.82,1.31-2.77,1.94-.24.15-.47.31-.71.45l-.25.13a1.52,1.52,0,0,1-.27.06.17.17,0,0,1-.22-.13l-.14-.28-.17-.39a24.19,24.19,0,0,1-1.74-6.51,26.75,26.75,0,0,1-.23-3,.91.91,0,0,0,.3.13,7.56,7.56,0,0,0,2,.08,26.1,26.1,0,0,0,4.51-.76,23.83,23.83,0,0,0,5.93-2.39,11.9,11.9,0,0,0,1.48-1.06,5.46,5.46,0,0,0,.68-.68,1.08,1.08,0,0,0,.16-.2,1.39,1.39,0,0,0,.16-.28C97.2,52.3,97.25,52.13,97.3,52Z"/>
+                <path class="cls-8" d="M98.21,57l.28-.09-.11.29Z"/>
+                <path class="cls-10"
+                      d="M96.73,48.28a12,12,0,0,1-.31,3.46,1.69,1.69,0,0,1-.12.36l0,.12-.13.13a3.94,3.94,0,0,1-.59.56,11,11,0,0,1-1.36.94,20.62,20.62,0,0,1-4,1.71,10.5,10.5,0,0,0,3-7.37c.16-3.84-2.37-8.07-5.21-9a5.28,5.28,0,0,1,.89,0,7.45,7.45,0,0,1,2.72.79,7.2,7.2,0,0,1,2.34,2C95.2,43.9,96.65,46,96.73,48.28Z"/>
+                <path class="cls-11"
+                      d="M88,39.23c2.84.89,5.37,5.12,5.21,9a10.5,10.5,0,0,1-3,7.37q-.87.28-1.68.48a27.13,27.13,0,0,1-4.34.67h-.18a4.1,4.1,0,0,1-1.86-2.61h0c.17-3.25.45-5.4.46-5.53s.19-2.59.82-6.08c.12-.63.26-1.3.43-2a.79.79,0,0,1,.19-.17h0l.06,0a10.76,10.76,0,0,1,3.88-1.08Z"/>
+                <path class="cls-10" d="M83.81,40.42l.17-.08a.79.79,0,0,0-.19.17A.29.29,0,0,1,83.81,40.42Z"/>
+                <path class="cls-10"
+                      d="M83.94,56.71a5.44,5.44,0,0,1-1.45-.11.72.72,0,0,0-.52.1c0-.7,0-1.38.07-2,0-.2,0-.4,0-.58A4.1,4.1,0,0,0,83.94,56.71Z"/>
+                <path class="cls-7"
+                      d="M83.65,107.45c0,.28-.21.52-.47.74a3.44,3.44,0,0,1-.74.53,1.53,1.53,0,0,1-.6.16c.06-.39.11-.75.14-1.09a11.49,11.49,0,0,0,.1-1.78,8,8,0,0,0,0-.85h0c0,.12,0,.22.05.22a1.22,1.22,0,0,1,.63.42A3.74,3.74,0,0,1,83.65,107.45Z"/>
+                <path class="cls-12"
+                      d="M83.27,76.29c.33.4.46.85.2,1.08,0,0-.2.15-.31.26a2.19,2.19,0,0,0-.34.34,1,1,0,0,0-.12.2.7.7,0,0,0-.08.16.66.66,0,0,0,0,.15v.06a.53.53,0,0,1-.12.37.43.43,0,0,1-.15.15s-.14.1-.14,0,.2-.38,0-.54a1,1,0,0,0-.68.25c-.12.1-.17.16-.16.18s.09,0,.24,0a.86.86,0,0,1,.25-.1l.14,0h.09s0,0,0,.07c0,.36.08.31.06.4a.49.49,0,0,1,0,.2,1.65,1.65,0,0,0-.11.36,0,0,0,0,0,0,.05v0c-.1,0-.16.06-.26.09s-.46.35-.69.49a1.06,1.06,0,0,1-.77.22.31.31,0,0,0,.08-.26c0-.15-.15-.14-.16-.13a.49.49,0,0,1,0,.16c0,.07-.14.16-.31.23a6.21,6.21,0,0,1-1.4.39,2.88,2.88,0,0,1-1.35,0,.29.29,0,0,1-.12-.07c.2-.11.4-.23.59-.36a3.88,3.88,0,0,0,.49-.4l.23-.23a3,3,0,0,0,.22-.31.75.75,0,0,0,.14-.68.68.68,0,0,0-.51-.37,2.43,2.43,0,0,0-1,0,1,1,0,0,0-.66.37,1,1,0,0,0-.15.45c0,.08,0,.13,0,.14s.07,0,.13-.1a1.94,1.94,0,0,1,.22-.34.77.77,0,0,1,.52-.18,2.25,2.25,0,0,1,.72.06c.08,0,.19.07.21.17a.33.33,0,0,1-.12.27s-.08.07-.11.11l-.2.17a3.58,3.58,0,0,1-.45.31,3.06,3.06,0,0,1-2.11.52.84.84,0,0,1-.63-.56,2.62,2.62,0,0,1-.18-1,2.67,2.67,0,0,1,.71-1.68,4.54,4.54,0,0,1,1.67-1.05,9.32,9.32,0,0,1,1-.35,4.8,4.8,0,0,1,.48-.08c.1,0,.09,0,.12,0a2.14,2.14,0,0,0,.44.08,2.24,2.24,0,0,0,.51,0l.42-.13.36-.13.2-.07.1,0a5.82,5.82,0,0,1,1.56,0,1.61,1.61,0,0,1,.67.22A2.17,2.17,0,0,1,83.27,76.29Z"/>
+                <path class="cls-7"
+                      d="M82.24,96a3.69,3.69,0,0,1,0,.69c-.08.56-.32,1.46-.44,2.29-.06.38-.1.74-.13,1.09-.28-1.53-.72-3.37-1.19-5.21l-.28-1.06.19.08A3.22,3.22,0,0,1,82,95a1.53,1.53,0,0,1,.2.78A1.46,1.46,0,0,1,82.24,96Z"/>
+                <path class="cls-7"
+                      d="M80.89,101.35c.51,1.38.81,2.3,1,2.28-.13,0,0,1.52-.36,4.09a27.07,27.07,0,0,1-4,10,47.32,47.32,0,0,1-4.27,5.83c-1.49,2-4.05,2.91-6.74,3.39a29.92,29.92,0,0,1-4.18.38,26.16,26.16,0,0,1-4.26-.21,18.06,18.06,0,0,1-7.76-3.56l-1.08-.84h0a2.73,2.73,0,0,0,.47-2.3.31.31,0,0,0-.33-.21c-.18,0-1,0-1.49,0l-.36,0,.1.34s-.06.22-.38.44l-.24-.24a12.13,12.13,0,0,1-2-2.87c-.11-.21-.21-.43-.32-.64-.18-.36-.34-.73-.49-1.11a.58.58,0,0,0,.25,0,.66.66,0,0,0,.49-.55.88.88,0,0,0-.3-.74,1.16,1.16,0,0,0-.32-.2,2.09,2.09,0,0,1-.74-.32l-.1-.07a43.49,43.49,0,0,1-1.36-5c-.27-1.32-.5-2.63-.67-3.92a2,2,0,0,1,.23-.08c.45-.13,1.16-.34,2.15-.68a18.65,18.65,0,0,0,3.74-1.7c.73-.46,1.48-1,2.28-1.62L51.25,100c.55-.44.84-.82,1.39-1.29,0-.08.57-.61,1-1l0,0a12.26,12.26,0,0,1-1.7.11c-.7.08-1.45.15-2,.17l-1.46,0a14.44,14.44,0,0,1-2.5-.18,9.35,9.35,0,0,1-3.28-1.15,6.13,6.13,0,0,1-1.21-.94c.07-.52.15-1,.24-1.52a28.67,28.67,0,0,1,.74-2.94,8.35,8.35,0,0,0,1.45.35,12.55,12.55,0,0,0,3.54-.14l1.1-.15c.46-.09.94-.17,1.45-.25l1.58-.29.84-.17c.23,0,.07,0,0-.09s-.25,0-.27-.1-.29-.18-.29-.2l-.31-.12,3-.45s0,0,0,0A27.49,27.49,0,0,0,57.73,87c.79-.66,1.61-1.3,2.24-1.72.32-.23.6-.41.8-.53a28.94,28.94,0,0,0,6.09,1.68,15.74,15.74,0,0,0,3.48,0,0,0,0,0,1,0,0c.06.1.22.17.33.26a5,5,0,0,0,.79.49,2.9,2.9,0,0,0,.83.28,4.66,4.66,0,0,0,2.09-.06,10.12,10.12,0,0,0,1.18-.4c0,.09.12.29.23.58a.51.51,0,0,1,.13.34h0s0,0,0,0h0s0,0,0,.08a2.32,2.32,0,0,1-.33.91,3.74,3.74,0,0,1-.32.5A3.93,3.93,0,0,1,73,90.75c-.27.06-.58.11-.9.16l-1.08.19a7.42,7.42,0,0,0-1.26.24l-.29.07-.16,0s0,.11,0,.15a3.33,3.33,0,0,0,.27.61,3.63,3.63,0,0,0,.93,1.06,5.33,5.33,0,0,0,1,.64,6.34,6.34,0,0,0,2,.55,12.16,12.16,0,0,0,3.05-.22l1.51-.33h0c.17.5.37,1,.56,1.49.11.32.23.62.33.92a1.77,1.77,0,0,1-.15.18,4.63,4.63,0,0,1-1.72,1.2,6.64,6.64,0,0,1-3.08.43c-.6,0-1.24-.09-1.87-.16a14.82,14.82,0,0,1-1.68-.3c-.63-.13-1.47-.41-2.3-.63l.21.24,0,.07,0,0,.08.07.63.58a15.51,15.51,0,0,0,1.32,1.14c.24.2.51.37.75.56l.52.33c.33.21.67.4,1,.57a9.32,9.32,0,0,0,4,1.08A9.54,9.54,0,0,0,80.89,101.35Zm-3.41,6.31A5.93,5.93,0,0,0,78,107a8.2,8.2,0,0,0-.8-.22,2.67,2.67,0,0,0-.48-.08c-.29,0-.56,0-.54.1s.2.07.47.19l.43.18c.11,0,.08.06.09.07s0,0-.11.07l-.19.21a1.27,1.27,0,0,1-.43.31c-.16,0-.27,0-.29-.19s0-.28,0-.3-.14.07-.19.29a.46.46,0,0,0,.09.4.61.61,0,0,0,.46.2A1.71,1.71,0,0,0,77.48,107.66Zm-.25,5.26a.32.32,0,0,0,0-.52,2.91,2.91,0,0,0-1.31-.1l-.59,0a2.57,2.57,0,0,0-.55.06,6.88,6.88,0,0,0-1.83.74,2.43,2.43,0,0,1-.56.25c-.14,0-.22,0-.23,0s-.16,0-.17.21a1.09,1.09,0,0,0,.31.6,1.15,1.15,0,0,0,1.87.19,8.34,8.34,0,0,1,1.63-1,1,1,0,0,1,.19-.07l.32-.1c.2-.07.37-.13.53-.17A2.34,2.34,0,0,0,77.23,112.92Zm-2,6.94c.09-.38-.29-.53-.54-.45a2.07,2.07,0,0,0-.36.08,6,6,0,0,0-1.1.61c-.5.33-.94.74-.88.81a5.65,5.65,0,0,0,1.09-.45,7.69,7.69,0,0,1,.74-.3l.34-.12a.61.61,0,0,0,.12-.05s.06,0,.06,0a2.43,2.43,0,0,1-.07.39c0,.17-.08.33-.12.45-.08.29-.28.25-.31.3s0,.07.15.08a.47.47,0,0,0,.39-.23,3.67,3.67,0,0,0,.26-.48A5.78,5.78,0,0,0,75.28,119.86Zm-8.08-7a.31.31,0,0,0-.12-.41,1,1,0,0,0-.26-.08s-.25,0-.56,0a5.12,5.12,0,0,0-1.2.05,1.41,1.41,0,0,0-.92.82c-.12.31-.14.51-.1.52a3.91,3.91,0,0,0,1.66-.11,2.75,2.75,0,0,0,1.1-.51.37.37,0,0,1,.14-.07l.1,0C67.09,113,67.12,113,67.2,112.86Zm-1.65,5.55c0-.23-.2-.42-.39-.5a5.67,5.67,0,0,0-.93-.24l-.64-.06a1.8,1.8,0,0,0-1.39.55,2.16,2.16,0,0,0-.64,1.87,3.9,3.9,0,0,1,.92-1.57,1.37,1.37,0,0,1,1.06-.31l.61.11a5.27,5.27,0,0,1,.81.13c.05,0,.05,0,.07,0v0a.83.83,0,0,1-.11.15,7.65,7.65,0,0,1-.59.57c-.61.25-1.22.33-1.22.39a2.3,2.3,0,0,0,1.37-.09,4.72,4.72,0,0,0,.75-.56,1.52,1.52,0,0,0,.17-.18A.73.73,0,0,0,65.55,118.41Zm-6.25,4.84a.44.44,0,0,0,.12-.43c0-.16-.23-.28-.38-.35-.57-.25-1.08,0-1,.08s.12,0,.28,0a1.77,1.77,0,0,1,.49.21c.07,0,0,.09,0,.09s-.1,0-.1,0a2.28,2.28,0,0,1-.82.14,1.14,1.14,0,0,1-.32-.05c-.12,0,.07,0,.08.11a.94.94,0,0,1,.1.14s-.08,0-.09,0,0,0,0,.1,0,.09,0,.09l.18,0a1.87,1.87,0,0,0,.72.07,1.83,1.83,0,0,0,.33-.05A1.37,1.37,0,0,0,59.3,123.25ZM55,111.84a.4.4,0,0,0,.1-.3.42.42,0,0,0-.13-.27.7.7,0,0,0-.29-.17,2,2,0,0,0-.54-.11,5.16,5.16,0,0,0-1.38.1c-.46.09-.93.12-1.29.16l-.26,0a.31.31,0,0,0-.12,0c-.05,0-.08.12-.05.15s.16.1.17.1,0,0,0-.12a1.55,1.55,0,0,1,.31,0,8.14,8.14,0,0,0,1.33,0,5.81,5.81,0,0,1,1.27,0l.33.08h0s.06,0,0,.06c-.31.23-.63.67-1,.74a1.22,1.22,0,0,1-.6-.09c-.21-.06-.42-.11-.59-.17a1.61,1.61,0,0,0-.6-.1s.19.16.51.32.37.17.56.26a1.56,1.56,0,0,0,.77.19,1.54,1.54,0,0,0,.75-.34,5.59,5.59,0,0,1,.48-.38A1,1,0,0,0,55,111.84Z"/>
+                <path class="cls-6"
+                      d="M82.16,3.9c-.24.21-.49.45-.75.71a8.77,8.77,0,0,0-1.29,1.72A22.48,22.48,0,0,0,79,8.58c-.24.6-.51,1.33-.77,2.09l-.15.46s0,.13,0,.07v-.15l0-.28L78,10.21c0-.35-.06-.69-.1-1a5.5,5.5,0,0,0-.18-.88,10.71,10.71,0,0,0-.37-1.09A23.37,23.37,0,0,0,75.84,4.1c.54-.1,1.08-.2,1.63-.28a16.22,16.22,0,0,1,2.62-.2,4.86,4.86,0,0,1,.56,0l.72.11Z"/>
+                <path class="cls-6"
+                      d="M80.8,101.07c0,.09.06.19.09.27a7.14,7.14,0,0,0-1.11,0,18.54,18.54,0,0,1-2.88-.14A9.16,9.16,0,0,1,73.17,100c-.31-.19-.62-.37-.93-.58l-.42-.3L71.68,99a1.79,1.79,0,0,1-.24-.22l-.08-.09s.1,0,.14,0l.28.07a1.88,1.88,0,0,0,.34.08c.65.1,1.31.17,1.93.22a7.69,7.69,0,0,0,3.54-.4,5.66,5.66,0,0,0,1.92-1.2C80,98.83,80.43,100.06,80.8,101.07Z"/>
+                <path class="cls-8" d="M80,80.84c-.05,0,0,0,0-.07A.1.1,0,0,1,80,80.84Z"/>
+                <g id="_Group_" data-name="&lt;Group&gt;">
+                    <path class="cls-7"
+                          d="M78.35,147.86a1.79,1.79,0,0,0-.56-.49,2.15,2.15,0,0,0-1.06-.15c-.28,0-.45,0-.45.06s.17.1.43.16a3.17,3.17,0,0,1,.87.28,1.28,1.28,0,0,1,.44.62l-.15.2a1.77,1.77,0,0,1-.64.53,4.19,4.19,0,0,1-1.9.2L71,149.22l-2.65-1.47c-.11-.51-.21-1-.33-1.55h0l.13,0h0l.57-.11H69c.35,0,.85-.06,1.49,0a10.41,10.41,0,0,0,2.4-.05,16.34,16.34,0,0,0,2.91-1.11,11.13,11.13,0,0,1,1.53-.67,1.26,1.26,0,0,1,1.28.49,2.13,2.13,0,0,1,.58,1.18,1.59,1.59,0,0,0-.72-.29,2.67,2.67,0,0,0-1,.14.49.49,0,0,0-.29.16c-.06,0-.1.07-.09.1s0,0,.13,0a.68.68,0,0,1,.29-.06,3.39,3.39,0,0,1,.89.06,1.24,1.24,0,0,1,.75.62l-.14.27c-.17.28-.34.57-.53.86A1.09,1.09,0,0,0,78.35,147.86Z"/>
+                </g>
+                <path class="cls-6"
+                      d="M76.69,90c.26.67.54,1.43.84,2.24a7,7,0,0,1-1.19.72,6.85,6.85,0,0,1-2.61.72,4.37,4.37,0,0,1-1.82-.3,4.56,4.56,0,0,1-.91-.46,2.52,2.52,0,0,1-.64-.66,1.23,1.23,0,0,1-.21-.41c-.07-.09,0-.08.12-.09l.22,0,.85-.08c.7-.06,1.34-.11,1.92-.18a5.72,5.72,0,0,0,2.95-1.06C76.39,90.28,76.54,90.14,76.69,90Z"/>
+                <path class="cls-9" d="M76.4,84.11h0a.08.08,0,0,1,0,0v0Z"/>
+                <path class="cls-7"
+                      d="M76.39,85.46v.16c0,.17-.24.39-.24.39s-.35.23-.46.32a2.9,2.9,0,0,1-1.4.64,2.46,2.46,0,0,1-1.77-.16,1.37,1.37,0,0,1-.47-.37.51.51,0,0,1-.08-.26v0a11.78,11.78,0,0,0,1.24-.44,15.49,15.49,0,0,0,2.39-.89.62.62,0,0,0,.18.24l.1.05.09,0,.09,0A3.18,3.18,0,0,1,76.39,85.46Z"/>
+                <path class="cls-8" d="M75.57,84.78c.12,0,.25-.12.36-.18s-.12.11-.34.23l0,0Z"/>
+                <path class="cls-7"
+                      d="M75.81,112.79l.06,0a.07.07,0,0,1-.06,0h0l-.16.07A7.91,7.91,0,0,0,74,114.08c-.27.2-.56.42-.79.39a1.33,1.33,0,0,1-.68-.4,1.13,1.13,0,0,1-.35-.46c0-.13,0-.18,0-.2s.07.09.24.08a2.13,2.13,0,0,0,.64-.15,8.48,8.48,0,0,1,1.8-.54,4.18,4.18,0,0,1,.5,0Z"/>
+                <path class="cls-6"
+                      d="M75,56A24.92,24.92,0,0,1,75,61.72,23.79,23.79,0,0,1,72.05,70c-.54.94-1,1.66-1.35,2.15a5.47,5.47,0,0,0-.51.74s-.24.1-.68.18a10.36,10.36,0,0,1-2,.19A13.17,13.17,0,0,1,64.42,73a27.81,27.81,0,0,1-3.87-1.2c-2.8-1.05-6-2.51-9.41-4.14-.85-.4-1.73-.81-2.57-1.24l-1.26-.68-1.23-.77a46.53,46.53,0,0,1-4.73-3.57A87.27,87.27,0,0,1,33,53.05L32.09,52l-.41-.48-.06-.08s0-.07,0-.09l0,0,.19-.26L32.64,50a44.24,44.24,0,0,1,3.1-3.72,42.93,42.93,0,0,1,5.36-5c1.42-1.09,2.34-1.59,2.43-1.68s.77-.49,2-1A28.24,28.24,0,0,1,51,36.84a49,49,0,0,1,8.2-1.05,14.76,14.76,0,0,1,8.67,3l.07,0a14.18,14.18,0,0,1,4.31,4.67,19.8,19.8,0,0,1,2.07,6.14A59.06,59.06,0,0,1,75,56Zm-2.49,2c.33-.29.49-2.46.32-3.47A30.6,30.6,0,0,0,71.81,50a18,18,0,0,0-2-4.48,9.56,9.56,0,0,0-2.06-2.3,18.77,18.77,0,0,0-2.88-1.56,14.11,14.11,0,0,0-3.33-1.06,8.76,8.76,0,0,0-3.77.19,11.87,11.87,0,0,0-3.46,1.7,20.87,20.87,0,0,0-3,2.43,20.47,20.47,0,0,0-4.57,6.3,17.85,17.85,0,0,0-.68,1.85c-.08.32-.17.64-.23,1,0,.17-.06.31-.09.52s0,.51,0,.76a7.16,7.16,0,0,0,.59.47l.37.28c.25.19.5.4.76.58l1.53,1h0a17.44,17.44,0,0,0,4.65,2,38.74,38.74,0,0,0,4.51,1,22.53,22.53,0,0,0,7.88.31,13.11,13.11,0,0,0,5-1.81A4.24,4.24,0,0,0,72.55,58Z"/>
+                <path class="cls-7"
+                      d="M73.84,124.61c-.3.57-.6,1.1-.84,1.55-.39.67-.65,1.14-.67,1.16l-.57,1.22A25.27,25.27,0,0,1,70.45,131c-1.1,1.73-2.24,3.51-2.07,3.57s.27,0,.6-.29a3.78,3.78,0,0,1-.06.49,48.36,48.36,0,0,0-.59,5c-.1,2.32-.09,4-.13,5,0,.56,0,1,0,1.23a.28.28,0,0,1,0,.09v0h0l-.12,0c-.4-1.92-.8-3.93-1.18-5.76-.06-.3-.12-.59-.19-.89l-.1-.44c0-.15-.06-.28-.13-.52,0-.52-.11-1-.16-1.5C66.2,136,66.11,135,66,134c-.14-1.91-.26-3.46-.34-4.56,0-.44,0-.81-.07-1.08.39-.05.79-.12,1.17-.2a16.18,16.18,0,0,0,4.11-1.32A9,9,0,0,0,73.84,124.61Z"/>
+                <path class="cls-10"
+                      d="M72.52,56.62s0,1.33,0,1.36-.57.46-1.64,1a11.62,11.62,0,0,1-1.1.51c1.29-1.4,1.64-3.56,1.86-6.06A28.12,28.12,0,0,1,72.52,56.62Z"/>
+                <path class="cls-11"
+                      d="M71.67,53.47c-.22,2.5-.57,4.66-1.86,6.06a12.42,12.42,0,0,1-1.35.48l.24-.2a17.49,17.49,0,0,1-4.44.62H62.73c-2.18-1.46-3.59-4.68-3.38-8.36.25-4.64,2.86-8.24,6.05-8.43a10,10,0,0,1,1.38.83,7.81,7.81,0,0,1,1.52,1.73,1.48,1.48,0,0,1,.21.26l.43.81.15.26A39.39,39.39,0,0,1,71.67,53.47Z"/>
+                <path class="cls-7"
+                      d="M70.53,85.77h-.1A17.69,17.69,0,0,1,67,85.54,26.43,26.43,0,0,1,62,84l2.31-1.52a25,25,0,0,0,2.31,2.16,6.34,6.34,0,0,0,1.75.86,8,8,0,0,0,1.91.31Z"/>
+                <path class="cls-7"
+                      d="M67.54,73.7l2.85,1.13a.55.55,0,0,0-.4.2,1.56,1.56,0,0,0-.32.6s.13.1.27.13l-.29.27,0,0s0,0,0,0l-.81,1.4a26.93,26.93,0,0,0-4,.66l-.16-1.34h0a7.48,7.48,0,0,0-2.2-.85l-1.11-.28.68-2.53a17.14,17.14,0,0,0,2.24.49A12.77,12.77,0,0,0,67.54,73.7Z"/>
+                <path class="cls-7"
+                      d="M68.59,173.23a6.39,6.39,0,0,1,.23,3.19,11.13,11.13,0,0,1-.3,1.64,13.88,13.88,0,0,1-.59,1.51c-.45,1-.94,1.85-1.37,2.62l-1,1.87c-.1.19-.18.36-.26.49l-2.48.25c-1.07.09-2.15.17-3.22.23l-.58.08h-.52l-.34-.06-1.6-.24c-2.86-.44-5.73-.81-8.51-1.31a.15.15,0,0,0,0-.06c.25-.35.65-.83,1.14-1.42a15.85,15.85,0,0,0,3-4.85,9.17,9.17,0,0,0,.15-5.63,3.05,3.05,0,0,0-1-1.41l1.8.3a33.41,33.41,0,0,0,10.82-.2c.56-.09,1.13-.21,1.7-.34a4.94,4.94,0,0,1,1.34,1A7.5,7.5,0,0,1,68.59,173.23Z"/>
+                <path class="cls-11"
+                      d="M68.7,59.81l-.24.2a5.25,5.25,0,0,1-.6.17h0a27.25,27.25,0,0,1-3.57.25A17.49,17.49,0,0,0,68.7,59.81Z"/>
+                <path class="cls-11" d="M68.46,60a.87.87,0,0,1-.11.09l-.49.08A5.25,5.25,0,0,0,68.46,60Z"/>
+                <path class="cls-9" d="M67.67,13.43v0l-.52,0s0,0,0,0Z"/>
+                <path class="cls-7"
+                      d="M66.92,112.71s0,0,0,.07a.4.4,0,0,0-.08.18h-.07s-.2,0-.5-.07a2.32,2.32,0,0,0,.25-.21,1.34,1.34,0,0,1,.23-.13c.06,0,0-.07.08,0A.37.37,0,0,0,66.92,112.71Z"/>
+                <path class="cls-11"
+                      d="M67.83,60.18a11.93,11.93,0,0,1-1.49.29h-.1a.52.52,0,0,0-.43.08h-.09l-.89.06c-.33,0-.65,0-1,0s-.56,0-.84,0l-.28-.18h1.53A27.25,27.25,0,0,0,67.83,60.18Z"/>
+                <path class="cls-6" d="M66.58,5c.17,1.29.35,3.21.47,5.91a23.52,23.52,0,0,0-2.57-6Z"/>
+                <path class="cls-11" d="M66.34,60.47l-.24,0h-.29a.52.52,0,0,1,.43-.08Z"/>
+                <path class="cls-7"
+                      d="M66.22,112.88a1.91,1.91,0,0,1-.63.35c-.63.22-1.31.38-1.5.47.12-.16.44-.83,1.06-.89A6.28,6.28,0,0,1,66.22,112.88Z"/>
+                <path class="cls-7"
+                      d="M64.64,76.82l.16,1.34c-.44.08-.88.18-1.31.29-.63.15-1.26.32-1.85.49-.85-.71-1.45-1.15-1.53-1a10.77,10.77,0,0,0,1,1.17l-1.42.45c-1,.34-1.72.63-1.77.65a16.81,16.81,0,0,0-1.68.9c-.23.14-.47.32-.73.49-2.14-.7-4.37-1.35-6.6-2-.41-.12-.86-.24-1.2-.36l-1.14-.49-2.35-1.06L44,77.55c1.24-.33,2.42-.62,3.38-.82,1.38-.31,2.34-.4,2.4-.42s1-.18,2.41-.34a36.5,36.5,0,0,1,5.14-.12,39,39,0,0,1,5.08.56C63.59,76.62,64.43,76.82,64.64,76.82Z"/>
+                <path class="cls-10"
+                      d="M64.23,43.07c.39.18.78.38,1.17.58-3.19.19-5.8,3.79-6.05,8.43-.21,3.68,1.2,6.9,3.38,8.36l.28.18A27.21,27.21,0,0,1,58.27,60a38.35,38.35,0,0,1-4.39-1.13,16.33,16.33,0,0,1-4.29-1.93l-.05,0L48,55.82c-.25-.17-.48-.37-.73-.56l-.49-.39,0-.17.08-.42c.07-.29.15-.57.23-.86a13.43,13.43,0,0,1,.66-1.69,18.93,18.93,0,0,1,4.41-5.84,15,15,0,0,1,5.89-3.71A8.77,8.77,0,0,1,64.23,43.07Z"/>
+                <path class="cls-9" d="M64.06,113.73s0,0,0,0Z"/>
+                <path class="cls-7"
+                      d="M62.41,128.67l1,0c-.09.55-.2,1.37-.36,2.38-.28,1.91-.66,4.45-1,7l-.08.47,0,.11v0l0,0-.08.16-.37.9-.7,1.75c-.44,1.14-.86,2.21-1.22,3.13l-.86,2.27-.14.38v.05l0,.13a.38.38,0,0,0,0,.1l0,.05a1.11,1.11,0,0,1-.08.24c0,.08-.37,1.22-.9,2.9-.6.49-1.27,1.06-2,1.67L53,154.48l-.33.28-.15.13,0,.06h0a2.69,2.69,0,0,1-.26-.44,1.23,1.23,0,0,1-.16-.51.82.82,0,0,1,0-.22s0-.27.32-.66a4.94,4.94,0,0,1,.51-.66c-.15-.37-1.59,1-1.41,1.26a1.5,1.5,0,0,0,.37,1c.06.08.14.14.21.22l-1.63-.22-.8-.13-.33,0a.88.88,0,0,1,0-.28,1.71,1.71,0,0,1,.14-.51l.11-.23a3.2,3.2,0,0,1,.41-.71c.25-.34.61-.58.58-.65s-.5,0-.87.35a2.56,2.56,0,0,0-.46.49,2.11,2.11,0,0,0-.18.27,1.87,1.87,0,0,0-.14.94l-.52-.69v-.14a2,2,0,0,1,0-.23c0-.16,0-.32,0-.48a4.34,4.34,0,0,1,.19-.86,1.91,1.91,0,0,1,.8-1.13,1.68,1.68,0,0,1,1.23-.32c.15.28,3.53-1.08,3.58-1.11a21,21,0,0,0,3.11-2.05h0c.28-.05.45-2.67.46-5.34a44,44,0,0,0-.24-5.61,16.22,16.22,0,0,0-.51-1.79c-.33-1-.83-2.27-1.36-3.53s-1.17-2.6-1.66-3.5a16.43,16.43,0,0,0,3.89,1.09A24.76,24.76,0,0,0,62.41,128.67Z"/>
+                <path class="cls-7"
+                      d="M61.86,79.87c.54.58,1.18,1.25,1.82,1.91-.75.41-1.46.79-2,1.12l-.95.53c-.64-.26-1.31-.52-2-.78s-1.24-.45-1.89-.67c.9-.46,1.56-.72,1.6-.74s.68-.32,1.67-.7C60.6,80.33,61.21,80.1,61.86,79.87Z"/>
+                <path class="cls-7"
+                      d="M59.47,84.29l-.15.11a26.63,26.63,0,0,0-2.16,2,16.41,16.41,0,0,0-2.65,3.21l-3,.45a7.11,7.11,0,0,1-1.43-.76,4.55,4.55,0,0,1-.66-.5c-.16-.12-.29-.28-.44-.41a6.64,6.64,0,0,1-.75-1l.6-.34a35.2,35.2,0,0,0,4.78-2.93c.57-.38,1.15-.78,1.69-1.13,1,.29,2,.59,3,.91Z"/>
+                <path class="cls-9" d="M57.74,123.24s.14.2,0,0Z"/>
+                <path class="cls-6"
+                      d="M56.38,12c0,.15.2.51,0,.23,0,0-.49-.51-1-1l-.27-.21-.63-.5L53.66,10,52.1,8.82A25,25,0,0,0,49.22,7a32,32,0,0,0-3.67-1.68,27.94,27.94,0,0,1,5.54-.88c.73,0,1.44-.07,2.12-.08a22.22,22.22,0,0,1,1.1,2.27C54.86,7.88,55.6,9.87,56,11c0,.07.11.27.21.55S56.32,11.87,56.38,12Z"/>
+                <path class="cls-7"
+                      d="M54.12,82.64c-.33.27-.68.53-1,.79a31.87,31.87,0,0,0-4.3,3.6l-.6.34a7.46,7.46,0,0,1-.4-.8,20.55,20.55,0,0,1-1-3.09c-.12-.53-.22-1-.31-1.33l.65-1.32h0c.49.15.89.25,1.32.35C50.41,81.66,52.29,82.14,54.12,82.64Z"/>
+                <path class="cls-8" d="M53.34,127.17a.61.61,0,0,1-.05.12,1.27,1.27,0,0,0-.06-.18Z"/>
+                <path class="cls-6"
+                      d="M52.65,98l.05.07-1,.8a32.19,32.19,0,0,1-4.39,3A12.17,12.17,0,0,1,43.68,103a15.69,15.69,0,0,1-2.18.21h-.19c-.07-.69-.13-1.39-.17-2.07a28.17,28.17,0,0,1,0-3.57c.28.12.58.25.91.37a13,13,0,0,0,3.8.75,22.78,22.78,0,0,0,2.59,0l1.45-.12c.38,0,.73-.07,1.13-.12l1-.25S52.44,98.1,52.65,98Z"/>
+                <path class="cls-8" d="M52.51,3l-.06.09s0,0,0,0Z"/>
+                <path class="cls-6"
+                      d="M51.9,171.67a9.18,9.18,0,0,1-.5,5.22,15.11,15.11,0,0,1-3,4.41,19.52,19.52,0,0,0-1.6,1.95c-1-.2-1.88-.41-2.8-.66a24,24,0,0,1-5.62-2.32c-.32-.16-.62-.34-.92-.52l1.2-.44a17.63,17.63,0,0,0,5.12-3,6.44,6.44,0,0,0,1.83-2.64A7.49,7.49,0,0,0,46,171a6.72,6.72,0,0,0-.41-2.48l.77.23,2.83.82c.5.15,1,.31,1.61.45A3.08,3.08,0,0,1,51.9,171.67Z"/>
+                <path class="cls-7"
+                      d="M51.29,126.11c-.06.14-.13.33-.22.53a22.89,22.89,0,0,1-1.48,2.83,43.87,43.87,0,0,1-2.69,3.81c-1.06,1.38-2.19,2.79-3.45,4.15-1.58,1.7-3.22,3.46-4.54,5.15a9.23,9.23,0,0,1-1.42.16,13.78,13.78,0,0,1-4.09-.47,5.5,5.5,0,0,1-1.93-.88A4.6,4.6,0,0,1,30.26,140a4.8,4.8,0,0,1-.61-1.71c1.05-1.3,2.08-2.5,3.07-3.62a5.52,5.52,0,0,0,1.55,1.43,4.46,4.46,0,0,0,2.13.61c.63,0,1.05-.3,1-.46s-.36-.18-.76-.42a6.1,6.1,0,0,1-1.31-1,4.42,4.42,0,0,1-.78-1.32c-.08-.24-.14-.43-.17-.55l.41-.44c.52-.55,1-1.06,1.51-1.53a5.92,5.92,0,0,0,1.51,1.53c1.59,1.09,3.38,1.26,3.46,1s-1.42-1.08-2.36-2.23a4.72,4.72,0,0,1-1-1.64c0-.06,0-.13,0-.19l1.28-1.2.74-.71a3.07,3.07,0,0,0,1.1,1.33,4.61,4.61,0,0,0,.7.41l.67.3a8.31,8.31,0,0,0,1.23.4c.74.18,1.31.12,1.32-.06s-.39-.36-1-.77c-.28-.2-.6-.44-.94-.71-.16-.13-.34-.28-.52-.41s-.34-.3-.44-.42a1.3,1.3,0,0,1-.23-1.46,2.41,2.41,0,0,1,.28-.54.56.56,0,0,1,.09-.13l0,0-.06,0,1.15-1.09,0,0s0,0,0,0,.09.2.09.21a2.79,2.79,0,0,0,.52.56,6.56,6.56,0,0,0,1,.61c.75.4,1.68.51,1.77.18s-.34-.83-.7-1.45c-.19-.29-.38-.59-.5-.81a.79.79,0,0,1-.05-.24,1.1,1.1,0,0,1-.44-.79c0-.06,0-.13,0-.2a6.65,6.65,0,0,0,.55-1c.1.12.22.25.34.37a30.73,30.73,0,0,0,3.57,3C50,125.29,50.64,125.71,51.29,126.11Z"/>
+                <path class="cls-6"
+                      d="M50.8,90.23s.26,0,.1.06l-.52.09-1,.14-.91.08-1.08.06a8,8,0,0,1-3.19-.34,4.92,4.92,0,0,1-1.28-.71c.14-.38.29-.75.45-1.1.73-1.57,1.51-3.06,2.07-4.22l.15-.32s0,0,0,0c.4.77.84,1.79,1.53,3a7.7,7.7,0,0,0,1.44,1.84,4,4,0,0,0,.49.42c.12.1.25.19.38.28a5.74,5.74,0,0,0,.92.5l.16.07Z"/>
+                <path class="cls-7"
+                      d="M49.29,120.67a2.31,2.31,0,0,1-.36,1.61l-.07,0c-.41-.35-.81-.71-1.19-1.08a1.32,1.32,0,0,0,.48-.58C48.46,120.68,49,120.68,49.29,120.67Z"/>
+                <path class="cls-8" d="M45.63,168.51l-.1,0c0-.06,0-.09,0-.09S45.59,168.43,45.63,168.51Z"/>
+                <path class="cls-7"
+                      d="M45.53,168.48a14,14,0,0,1,.06,2.49,6.54,6.54,0,0,1-2.39,4.75,17.25,17.25,0,0,1-5,2.58c-.73.26-1.35.44-1.8.58l-.28.08h0a4.53,4.53,0,0,1-.4-.26l-.62-.42c-.32-.24-.74-.54-1.11-.85-.75-.58-1.59-1.38-2.38-2.07,0,.93,0,1.85.05,2.77-.48-1-1-2-1.42-3l-.7-1.49-1,1.31L27.5,176.3l-.14.18s-.07.1-.07,0l0-.11-.1-.53c-.25-1.13-.49-2.24-.74-3.35-.11-.55-.24-1.09-.36-1.65l-.18-.82a5.58,5.58,0,0,0-.28-1c-.14-.29-.48-1.41-.85-2.66a13.58,13.58,0,0,0,1.38.19,11.36,11.36,0,0,0,2.79,0,10.63,10.63,0,0,0,3-1,5.58,5.58,0,0,0,2.21-1.54,6.65,6.65,0,0,0,1-1.64c.15-.43.29-.82.41-1.18.24-.69.44-1.27.56-1.7.3.58.52.93.53,1s.38.58.94,1.36a28.68,28.68,0,0,0,2.16,2.74,13.52,13.52,0,0,0,2.61,2.33,4.11,4.11,0,0,0,1.4.66l.34.41h0a2,2,0,0,0,.57.22C44.9,168.29,45.19,168.37,45.53,168.48Z"/>
+                <path class="cls-9" d="M44.25,116a.13.13,0,0,0,0,.08.09.09,0,0,1-.06,0S44.23,116,44.25,116Z"/>
+                <path class="cls-9" d="M41.17,3.88l0,0v0Z"/>
+                <path class="cls-8" d="M41,106.05l0,0h0Z"/>
+                <path class="cls-8" d="M41,106.08v.08a.09.09,0,0,0,0,0h0Z"/>
+                <path class="cls-8" d="M40.92,106.1h0a1.22,1.22,0,0,0-.2.1Z"/>
+                <path class="cls-7"
+                      d="M40.64,89.47a28.07,28.07,0,0,0-1,3.44h0L38,94.08l-.47.32c-.33.23-.75.44-.86.8a1.67,1.67,0,0,0,.11,1.21c.11.24.15.3.22.45l.2.34a13.22,13.22,0,0,0,.94,1.36l.52.69.27.34.12.15,0,0,0,.27c0,.41,0,.83,0,1.25.08,1.12.19,2.25.35,3.4h0a.83.83,0,0,0-.2-.41,2.52,2.52,0,0,0-.44-.42h0s.05-.07.06-.1a.58.58,0,0,0,0-.16c0-.11,0-.21.05-.32s0-.46,0-.72a7.79,7.79,0,0,0-.19-1.81,5.48,5.48,0,0,0-.93-2c-.91-1.22-2.1-2-2.55-2.72a4.88,4.88,0,0,1-.48-.93c-.09-.25-.1-.36-.11-.37s0-.09,0-.11.06-.07.11-.13l.2-.2.45-.44,1.07-1c.79-.7,1.67-1.44,2.51-2.11C39.6,90.27,40.17,89.83,40.64,89.47Z"/>
+                <path class="cls-8" d="M39.79,106.65l.25-.08-.25.14v0h0Z"/>
+                <path class="cls-8"
+                      d="M39.79,106.71s0,.05,0,.07a.22.22,0,0,1,0,.12c0-.18-.06-.37-.08-.55a2,2,0,0,0,.07.3h0Z"/>
+                <path class="cls-7"
+                      d="M39.7,106.35c0,.18,0,.37.08.55a.07.07,0,0,1,0,0c0,.22-.68.43-1.26.44a13.64,13.64,0,0,1-1.92,0A7.58,7.58,0,0,1,34.8,107a1.84,1.84,0,0,1-1.14-.85.87.87,0,0,1,0-.62,7,7,0,0,1,.24-.79,12.76,12.76,0,0,1,.56-1.46,2.55,2.55,0,0,1,.37-.52c.14-.14.38-.34.47-.44s.21-.23.32-.34.26-.22.39-.13.14.48.26.69.2.48.12.6-.12.14-.18.21l-.08,0a1.84,1.84,0,0,0-1,.66.77.77,0,0,0,0,.61,1,1,0,0,0,.21.36,1.89,1.89,0,0,0,.24.25s.19,0,.27-.16.14-.27.09-.3a1.11,1.11,0,0,1-.16-.15c-.1-.12-.19-.25-.13-.37s.36-.31.68-.47a2.87,2.87,0,0,1,1-.31,1.47,1.47,0,0,1,.94.34,7.16,7.16,0,0,1,.78.59c.43.38.15.83.22.83s.08-.07.14-.25a.66.66,0,0,0,0-.32h0c.07.55.15,1.1.26,1.65A0,0,0,0,0,39.7,106.35Z"/>
+                <path class="cls-8"
+                      d="M39.57,105.3l.13,1c-.11-.55-.19-1.1-.26-1.65-.16-1.15-.27-2.28-.35-3.4,0-.42,0-.84,0-1.25.1,1,.21,2.14.32,3.28C39.44,104,39.51,104.63,39.57,105.3Z"/>
+                <path class="cls-8" d="M38.64,103.61l0,.06-.13-.1h0v-.08l.09.08.07,0Z"/>
+                <path class="cls-8" d="M38.61,103.67h0a0,0,0,0,0,0,0l-.07,0c-.09-.06,0,0-.05,0v-.05h0Z"/>
+                <path class="cls-6"
+                      d="M37.51,143.06a7.6,7.6,0,0,0,1.23-.26A18.5,18.5,0,0,0,37,145.49a12.25,12.25,0,0,0-.63,1.34c-.35.08-.92.23-1.61.36a11.13,11.13,0,0,1-4.55.05,6.12,6.12,0,0,1-4.3-3.57c.25-.46.52-.91.8-1.34.74-1.12,1.53-2.18,2.32-3.19a5.38,5.38,0,0,0,.59,1.29A5.2,5.2,0,0,0,31.07,142a6,6,0,0,0,2.19.89A12.34,12.34,0,0,0,37.51,143.06Z"/>
+                <path class="cls-6"
+                      d="M35.85,159l.17.34c-.19.42-.45,1-.76,1.77-.16.37-.31.76-.49,1.17a4.57,4.57,0,0,1-.69,1.13,6.06,6.06,0,0,1-2.41,1.65,10,10,0,0,1-2.85.82,11.19,11.19,0,0,1-2.61-.06c-.7-.09-1.3-.21-1.73-.31-.44-1.46-.88-2.87-1-3.21l-.24-.61h0a21.58,21.58,0,0,1-.73-5.15c0-.48,0-1,0-1.47a4.64,4.64,0,0,0,.73.62,7.39,7.39,0,0,0,5,1.31,27.19,27.19,0,0,0,5-.9,7.43,7.43,0,0,0,1.76-.71.86.86,0,0,0,0,.16A11.34,11.34,0,0,0,35.85,159Z"/>
+                <path class="cls-7"
+                      d="M35.58,150v.53a9.11,9.11,0,0,0-.65,4.7l-.27.1a13.27,13.27,0,0,1-1.56.43,34.12,34.12,0,0,1-4.9.62,6.83,6.83,0,0,1-4.49-1.34,5.76,5.76,0,0,1-1.14-1.16,10.55,10.55,0,0,1,.27-1.72,50.14,50.14,0,0,1,1.56-5.44c.33-.76.66-1.48,1-2.19a6.52,6.52,0,0,0,4.66,3.28,10.78,10.78,0,0,0,4.74-.31,12.36,12.36,0,0,0,1.45-.5A6.46,6.46,0,0,0,35.58,150Z"/>
+                <rect class="cls-9" x="35.52" y="129.61" width="0.01" height="0.01"/>
+                <path class="cls-9" d="M33.89,11.7h0a12.79,12.79,0,0,0-1,1A10.09,10.09,0,0,1,33.89,11.7Z"/>
+                <path class="cls-9" d="M25.44,142.73h0c-.07.17-.15.33-.22.5l.21-.51Z"/>
+                <path class="cls-9" d="M25.19,143.28l-.17.46v0Z"/>
+                <circle class="cls-7" cx="85.17" cy="46.47" r="1.44"/>
+                <circle class="cls-7" cx="63.02" cy="48.47" r="1.62"/>
+                <circle class="cls-7" cx="64.01" cy="51.01" r="0.33"/>
+                <circle class="cls-7" cx="83.75" cy="48.93" r="0.34"/>
+                <path class="cls-5"
+                      d="M78.34,147.86c-.1.16-.22.33-.32.47a1.33,1.33,0,0,0-.45-.61,2.56,2.56,0,0,0-.86-.28c-.26-.06-.44-.12-.44-.17s.18-.05.46-.05a2.15,2.15,0,0,1,1.06.15A1.64,1.64,0,0,1,78.34,147.86Z"/>
+                <g class="cls-13">
+                    <path class="cls-14"
+                          d="M62.66,139.66c-1.08-.07-2.18-.13-3.29-.18-.31,7.81-8.71,9.24-10.65,16C58,159.85,63.1,148.61,62.66,139.66Z"/>
+                </g>
+                <path class="cls-15"
+                      d="M67.24,140.07l-.36,0c.05.26.1.51.16.76C67.11,140.55,67.17,140.31,67.24,140.07Z"/>
+                <g class="cls-13">
+                    <path class="cls-14"
+                          d="M67.47,150.43c2.67,1.6,5.47.72,9.5-.33-5-2.51-8.69-4.36-9.93-9.31C66,144.48,65.73,147.82,67.47,150.43Z"/>
+                </g>
+                <path class="cls-16"
+                      d="M77.42,165.87a62.51,62.51,0,0,1-11.29,3.9,5.48,5.48,0,0,1,1.17.79,9.4,9.4,0,0,1,1.13,1.2,65.59,65.59,0,0,0,21.62-12.12C85.64,161.91,81.45,164.1,77.42,165.87Z"/>
+                <path class="cls-6"
+                      d="M97.77,169.85c3.12-2.08,6.24-3.12,10.39-4.16-2.08,0-4.15-1-3.12-3.12a32,32,0,0,1,7.6-5.3l-.48-.73a8.24,8.24,0,0,0-.75-.91,7.36,7.36,0,0,0-1.77-1.43,7.48,7.48,0,0,0-4.39-.87,15.78,15.78,0,0,0-4.47,1.12c-1.44.55-2.82,1.28-4.21,1.92s-2.74,1.35-4.08,2l-2.44,1.25a65.59,65.59,0,0,1-21.62,12.12,6.07,6.07,0,0,1,.76,1.21,7,7,0,0,1,.45,3.54,11.83,11.83,0,0,1-.25,1.79,11.42,11.42,0,0,1-.57,1.65c-.44,1-.91,2-1.31,2.75s-.66,1.24-.88,1.69c.86-.1,1.72-.22,2.57-.34,1.55-.23,3.09-.52,4.61-.84,8.72-3.91,17.27-8.51,26-11.28C97.77,171.93,96.73,170.89,97.77,169.85Z"/>
+                <path class="cls-17"
+                      d="M112.67,157.25a31.93,31.93,0,0,0-7.59,5.3c-1,2.08,1,3.12,3.12,3.12-4.16,1-7.28,2.08-10.4,4.16-1,1,0,2.08,2.08,2.08-8.76,2.77-17.32,7.37-26,11.28.58-.12,1.17-.23,1.74-.37a31,31,0,0,0,6-2l0,0h0l5.64-2.22c1.94-.37,3.6-.64,5.35-1,.84-.23,1.71-.42,2.53-.72l1.23-.41,1.22-.5a27.66,27.66,0,0,0,8.61-5.65,21.67,21.67,0,0,0,5.46-8.36,17.84,17.84,0,0,0,.69-2.37,9.4,9.4,0,0,0,.21-1.2l.1-.61a2.56,2.56,0,0,0,0-.37Z"/>
+                <path class="cls-17"
+                      d="M72.69,183.57l1.1-.5c2.49-1.11,5-2.3,7.42-3.45a157.55,157.55,0,0,1,18-7.62,2.17,2.17,0,0,1-1.85-1,1.14,1.14,0,0,1,.38-1.25,29.91,29.91,0,0,1,9.66-4,3.34,3.34,0,0,1-2.45-1.27,2,2,0,0,1,0-2l0,0a32.58,32.58,0,0,1,7.62-5.33l.11,0,.16.27a.55.55,0,0,1,0,.19c0,.05,0,.11,0,.21l-.1.61-.06.42a5.37,5.37,0,0,1-.15.8c-.06.22-.12.44-.17.66a12.68,12.68,0,0,1-.53,1.72,21.88,21.88,0,0,1-5.49,8.41A28.14,28.14,0,0,1,97.69,176l-1.22.5-1.24.42a17.46,17.46,0,0,1-1.84.53l-.69.19c-1.23.27-2.42.48-3.67.71-.55.09-1.11.2-1.7.31l-1.47.58-4.14,1.63h0a32.07,32.07,0,0,1-6.08,2c-.41.1-.82.18-1.24.27Zm32.5-20.94a1.69,1.69,0,0,0,0,1.71,3.63,3.63,0,0,0,3.06,1.2h1l-1,.26a31,31,0,0,0-10.36,4.14.9.9,0,0,0-.3.95c.23.54,1.13.89,2.31.89h.84l-.8.25a151.16,151.16,0,0,0-18.59,7.82c-2.08,1-4.23,2-6.36,3l.58-.13a31.92,31.92,0,0,0,6-2l0,0h0L85.76,179l1.5-.59,1.72-.32c1.25-.23,2.44-.44,3.65-.71l.7-.18a17,17,0,0,0,1.81-.53l1.24-.42,1.21-.49a27.81,27.81,0,0,0,8.57-5.62,21.61,21.61,0,0,0,5.43-8.31,11.68,11.68,0,0,0,.51-1.69l.18-.67a5.7,5.7,0,0,0,.14-.76l.06-.44.1-.6a2.06,2.06,0,0,1,0-.21s0-.05,0-.07A31.76,31.76,0,0,0,105.19,162.63Z"/>
+                <path class="cls-18"
+                      d="M23.65,21.13s.27-.34.67-.76A15.28,15.28,0,0,1,25.78,19c-.14,0-.21,0-.23,0a2,2,0,0,0-.18-.28,2.13,2.13,0,0,0-.71-.58,6,6,0,0,0-3.4-.49c-.28,0-.56,0-.84,0a13.44,13.44,0,0,1,2.1,5.43c.19-.44.4-.85.58-1.18C23.41,21.48,23.63,21.14,23.65,21.13Z"/>
+                <path class="cls-7"
+                      d="M77.55,83.35a4.5,4.5,0,0,1-.94.83,3.29,3.29,0,0,0,.36.07l.27,0a9.63,9.63,0,0,1,.38-1Z"/>
+                <path class="cls-7" d="M98.38,57.17l-.1.28.39.09Z"/>
+                <path class="cls-19"
+                      d="M79.46,84.19a6,6,0,0,0,2.27-1c.51-.39.82-.75.93-.75l0-.11a5.18,5.18,0,0,1-1.87.13c-.76-.08-1.24-.27-1.24-.35s.52,0,1.25-.1a4.81,4.81,0,0,0,2.4-.77,13.31,13.31,0,0,0,1.94-1.82,11.77,11.77,0,0,0,.76-1s.14-.19.32-.48c-.88.12-1.64.28-1.68.15s1-.7,2.1-1h0a4.8,4.8,0,0,0,.26-.81c-.39.11-.63.17-.65.12s.24-.26.72-.51a3.44,3.44,0,0,0,0-.91c0-.22,0-.44-.07-.66a6.61,6.61,0,0,1-2.09.42,6.94,6.94,0,0,1,2-1c-.09-.51-.19-1-.28-1.36a2.9,2.9,0,0,0-.31-.76c-.12-.14-.25-.17-.24-.23s.14-.09.38,0a1.82,1.82,0,0,1,.59.79s0,0,0,0l.08,0a19.36,19.36,0,0,1,2.47-1.56,13.7,13.7,0,0,0,2.35-1.71A15.38,15.38,0,0,0,94,66.25c1.27-1.94,2.25-4,3.17-5.66a9.47,9.47,0,0,1,1.48-1.91c.22-.21.41-.36.55-.48h0a0,0,0,0,0,0,0s0-.07-.15-.19l-.38-.46-.39-.09-.07.15c-.69,1.47-4.5,4.7-4.5,4.7-1.32,1.16-2.91,2.49-4.65,3.86-.87.68-1.77,1.39-2.73,2.08-.24.16-.48.34-.75.51a3.48,3.48,0,0,1-.52.27,2.75,2.75,0,0,1-.58.12,1.07,1.07,0,0,1-1.21-.56l-.26-.5-.21-.4a28.23,28.23,0,0,1-2.38-13.06c.1-3.63.37-6.1.38-6.25s.24-2.62,1-6.21c.19-.87.41-1.81.72-2.8-5,11.22-4.44,23.93-1.17,35.25a6.25,6.25,0,0,1,.85.08,2.62,2.62,0,0,1,1,.4,3.08,3.08,0,0,1,.73.71,2.18,2.18,0,0,1,.43,1,1.23,1.23,0,0,1-.4,1.09c-.57.4-.78.47-1,1.33a1.16,1.16,0,0,1-.42.54.92.92,0,0,1-.28.14.28.28,0,0,1-.22,0v0a.17.17,0,0,1,.11,0,.07.07,0,0,1,0,.08v0s0,.06-.07,0c-.11.08-.38.42-.74.79a1.31,1.31,0,0,1-1,.33,1,1,0,0,1-.43-.14h0a6,6,0,0,1-1.22.48c-.12,0,.11,0,0,0-.08.19-.32.24-.4.42.18-.21.11-.12.17-.07a1.62,1.62,0,0,1-.18.43,3.42,3.42,0,0,1-.59.83c-.15.34-.81.72-1.08,1A8.58,8.58,0,0,0,79.46,84.19Zm5.34-8.11s.16,0,.26.14c0,0,.1-.12.37-.24.07,0,.15-.1.21,0a.34.34,0,0,1,.09.2,1.29,1.29,0,0,1-.09.67c-.1.25-.26.4-.48.37a.61.61,0,0,1-.4-.41A.69.69,0,0,1,84.8,76.08Zm-.51-1.81a.82.82,0,0,1-.71.16.35.35,0,0,1-.24-.42,1,1,0,0,1,.23-.43l.12-.14s.13,0,.25.16.14-.11.44-.21a.2.2,0,0,1,.22,0,.33.33,0,0,1,.06.22A1,1,0,0,1,84.29,74.27Z"/>
+                <path class="cls-7"
+                      d="M84,4.26l-.67.35A13.48,13.48,0,0,0,82,5.46,6.39,6.39,0,0,0,80.7,6.84,14.63,14.63,0,0,0,79.51,9a27.31,27.31,0,0,0-1.34,3.58l-.27.87s-.05.07-.06,0l0-.23-.06-.45c0-.29-.07-.58-.11-.87-.09-.58-.16-1.14-.23-1.67a10.17,10.17,0,0,0-.37-1.58,9.74,9.74,0,0,0-.42-1,12.38,12.38,0,0,0-1.84-2.74c-.18-.2-.35-.36-.5-.51L74,4.47c-1.72,2.15-5.06,2.82-6.25,4.89,0,1.18,0,2.53,0,4.07v0l-.52,0s0,0,0,0-.08-.43-.14-.76a15.34,15.34,0,0,0-3.87-7.64,3.71,3.71,0,0,0-.3-.28l-1-.06L60.2,4.6l-.24,0c-1.85,1.27-2.71,3.3-3.41,5.82.15.51.31,1,.48,1.6a1.67,1.67,0,0,0,0,.53,4.19,4.19,0,0,0,0,.47c0,.13.12.48-.06.2a4.16,4.16,0,0,0-1.31-.93l-.46-.4c-.35-.31-.69-.58-1-.83l-.81-.6c-.52-.38-1-.74-1.53-1.07A19,19,0,0,0,49,7.76a20.89,20.89,0,0,0-4.57-1.49c-.35-.07-.68-.12-1-.16l-.89.38c-.93.42-1.81.86-2.66,1.32a35.93,35.93,0,0,0-4.43,2.82l-.42.32a1.15,1.15,0,0,0-.37.15,5.22,5.22,0,0,0-.82.6h0a12.79,12.79,0,0,0-1,1c-.11.11-.21.21-.31.33l-.5.52c-.13.13-.25.27-.39.4L30,13.47c-1.45-.36-3.5-.87-5.91-1.29a23.44,23.44,0,0,0-3.69-.42c-1.32,0-2.83.17-4.35.34s-3.12.43-4.7.72l-1.17.24-1,.22-.11,0c2.62,5.86,4,12.19,10.74,14.1a13.2,13.2,0,0,0-1.9,6C19.2,35,20,36,19.81,36.18s-.85-.41-2-1.41a.49.49,0,0,0,0,.12,13.56,13.56,0,0,1-.06,2.62v0c-.58,5.4-3.32,11,4.16,11.74-1,2.08-4.16,3.12-4.16,5.2,1,2.08,4.16,2.08,7.28,2.08-2.08,2.08-4.16,4.15-6.24,5.19,3.56,1.53,6.12,4.54,8.78,7.35.33.21.67.44,1.06.67.91.56,2,1.15,3.11,1.77,2.31,1.25,5.05,2.62,8,4L42.75,77h0c1.56-.55,3.1-1,4.34-1.32,1.41-.37,2.41-.51,2.46-.53s1-.16,2.51-.25a34.31,34.31,0,0,1,5.28.12,31.69,31.69,0,0,1,4,.66l.68-2.53c-.58-.14-1.18-.33-1.81-.53-2.9-.93-6.17-2.29-9.65-3.8-.87-.39-1.74-.76-2.65-1.19L46.6,67l-1.31-.76a46.78,46.78,0,0,1-5-3.57,86.39,86.39,0,0,1-8.73-8.28c-.32-.37-.65-.72-1-1.06l-.51-.59-.82-1c0-.09-.21-.17-.15-.25l.18-.26.35-.53.57-.82L31,48.77a48.36,48.36,0,0,1,3.18-4,44.75,44.75,0,0,1,5.55-5.36,25.64,25.64,0,0,1,2.65-1.87,21.16,21.16,0,0,1,2.31-1.16,29.57,29.57,0,0,1,5.92-1.72,50.15,50.15,0,0,1,8.62-.94A16.52,16.52,0,0,1,69,37.34l0,0,0,0a15.79,15.79,0,0,1,4.65,5.32,21.06,21.06,0,0,1,2.05,6.68,53.49,53.49,0,0,1,.51,6.52,25,25,0,0,1-.29,6,22.18,22.18,0,0,1-3.48,8.37c-1.25,1.83-2.23,2.71-2.31,2.61.1.12-.86.7-2.65.84l2.85,1.13h0a.66.66,0,0,1,.43.19,1.5,1.5,0,0,1,.45.65.36.36,0,0,1-.15.44.74.74,0,0,1-.41.07l-.57,0a3.9,3.9,0,0,1-.51-.06l-.81,1.4c.12,0,.2,0,.2,0s-2.67.84-5.33,1.71l-1.23.4,1.9,1.68.07.06a19.22,19.22,0,0,1,2.38-1.09c.79-.22,1.33-.17,1.34-.09s-.52.19-1.17.51-1.22.74-1.92,1.21c.79.69,1.56,1.35,2.16,1.78a5.48,5.48,0,0,0,1,.49l.46.14a7.35,7.35,0,0,0,1.64.34,12.54,12.54,0,0,0,3.63-.2A6.89,6.89,0,0,0,77.24,83a7,7,0,0,0,.87-.87l.23-.54a2.87,2.87,0,0,1-1.27,0,1.26,1.26,0,0,1-.55-.33,3.27,3.27,0,0,1-1.45.16,1.74,1.74,0,0,1-1.28-1,3.42,3.42,0,0,1-.33-1.4,3.62,3.62,0,0,1,.87-2.37,4.47,4.47,0,0,1,1.4-1.12,6.59,6.59,0,0,1,.65-.31,7,7,0,0,1,1.22-.36,5,5,0,0,1,.66-.09,1.55,1.55,0,0,1,.52.07,1,1,0,0,0,.22,0h.2l.3-.08.36-.11.2-.06a1.57,1.57,0,0,1,.28-.06,8.06,8.06,0,0,1,1,0c-3.27-11.32-3.84-24,1.17-35.25,0,0,0,0,0-.08a10.21,10.21,0,0,1,.79-1.93,13.64,13.64,0,0,0-3.22,7.74,13.64,13.64,0,0,1,3.22-7.74A9.85,9.85,0,0,1,84,36.19a11.46,11.46,0,0,1,2.62-2.53,9.43,9.43,0,0,1,2.21-1.14,15.59,15.59,0,0,0,4.74-5.11C99.42,17.24,92.53,10.11,84,4.26ZM26.44,19.56a17,17,0,0,0-1.3,1.51c-.34.43-.54.75-.56.76l-.57.74a10.93,10.93,0,0,0-1,1.68,6.88,6.88,0,0,0-.42,1,8.51,8.51,0,0,1-3.82,6.34v0a8.51,8.51,0,0,0,3.82-6.34A11.77,11.77,0,0,1,22,27c-.07,0-.17-.36-.16-.94a6.8,6.8,0,0,1,.36-2.09q.13-.4.3-.78a13.44,13.44,0,0,0-2.1-5.43c-2.73.08-5.14-.24-5.14-.51s1.88-.57,4.06-1a17,17,0,0,0-3.71-3.39,17,17,0,0,1,3.71,3.39L21,15.92a7.57,7.57,0,0,1,4.62.15,4.48,4.48,0,0,1,2.05,1.64l0,0c.45-.23.76-.34.79-.28S27.44,18.5,26.44,19.56ZM70.21,82A1.1,1.1,0,0,1,69,81.85a1,1,0,0,1-.13-1.1,4.07,4.07,0,0,1,.52-.8s.17,0,.28.11a1.1,1.1,0,0,1,.86.24,1.05,1.05,0,0,1,.44.86A1.1,1.1,0,0,1,70.21,82Z"/>
+                <path class="cls-7"
+                      d="M74,4.47c-.67.13-1.33.27-2,.39-.25,0-.49.08-.77.1s-.56,0-.8,0A12.45,12.45,0,0,1,69,5L68,5c-.1,1.06-.21,2.5-.27,4.37C68.9,7.29,72.24,6.62,74,4.47Z"/>
+                <path class="cls-7"
+                      d="M60,4.58c-.91-.08-2.13-.17-3.58-.21-.54,0-1.11,0-1.7,0,.21.59.42,1.26.65,2,.36,1.16.76,2.5,1.22,4C57.25,7.88,58.11,5.85,60,4.58Z"/>
+                <path class="cls-19"
+                      d="M18.75,61.72c2.08-1,4.16-3.11,6.24-5.19-3.12,0-6.24,0-7.28-2.08,0-2.08,3.12-3.12,4.16-5.2-8.77-.88-3.49-8.41-4.11-14.49L17,34.14A18,18,0,0,1,17,38a27.88,27.88,0,0,1-1.13,5.21,18.56,18.56,0,0,1-1.25,3,11.56,11.56,0,0,1-.91,1.48,7.11,7.11,0,0,1-.54.72l-.29.35-.26.28a.46.46,0,0,0,0,.66.42.42,0,0,0,.16.09l.23.08.79.31,2.45.92.68.26.33.13.18.07.08,0-.06,0-1.19.79-3.65,2.48-.74.49-.26.19-.35.26.57.13,1.84.47L20,58.11l-2.85,1.57-1.35.78-.5.3-.16.11h0S15,61,15,61l.22.13c1.68,1.06,3.2,2,4.49,2.8,2.57,1.6,4.2,2.66,4.33,2.75l2.22,1.53,1.23.86C24.87,66.26,22.31,63.25,18.75,61.72Z"/>
+                <path class="cls-19"
+                      d="M103.91,18.93c.16.37.29.72.39,1,.21.61.29,1.05.32,1.08a8.68,8.68,0,0,1,.09,1.14,12.5,12.5,0,0,1-.32,2.33,9.46,9.46,0,0,1-1,3.13,16.84,16.84,0,0,1,.18-3.25,15.34,15.34,0,0,0,.07-2.16c-.06-.53-.18-.91-.18-1a9.74,9.74,0,0,0-.2-1,19.92,19.92,0,0,0-.61-2.11c-.41-1.27-.91-2.49-1-2.93-.66-1-1.47-1.86-2.2-2.75a1.91,1.91,0,0,0-.13.23l-.89-1.28.19,0a6.63,6.63,0,0,1-.85-1.65,6.63,6.63,0,0,0,.85,1.65,5.16,5.16,0,0,0,.59-.13,19.76,19.76,0,0,0,2.34-.87,10.19,10.19,0,0,1,2.26-.68h0l.49-.21c.45-.2.87-.23.89-.13a5.15,5.15,0,0,1,.16,1.51,8.53,8.53,0,0,1-.57,2.95,22.61,22.61,0,0,1-1.67,3.44l.28.55c.18.37.35.75.49,1.11,1.77-.7,1.48-3.46,2.73-4.68,0-.84,0-1.36,0-1.41s0-.87-.08-2.06S106.19,8,105,7.37a5.14,5.14,0,0,0-2.42-.4,28.67,28.67,0,0,0-2.89.25c-1,.13-1.94.2-2.82.28l-.32,0H96l-.8,0,.68,1.17c.27.43.4.7.34.76s-.3-.14-.67-.48-.85-.85-1.5-1.55c-.54-.15-1.29-.41-2.18-.74-1.15-.43-2.52-1-4-1.53a27.59,27.59,0,0,0-3.84-1l-.07,0c8.58,5.85,15.47,13,9.66,23.15a15.59,15.59,0,0,1-4.74,5.11,5.67,5.67,0,0,1,1.35-.31,12.07,12.07,0,0,1,7,1.66A12.3,12.3,0,0,1,99.65,36a8.75,8.75,0,0,1,1.75,2.38,13.23,13.23,0,0,1,.74,2.39c0,.73.06,1.34.07,1.86,0,.2,0,.38,0,.53a19.72,19.72,0,0,0,.37-2.11c.09-.66.12-1.12.13-1.15s.07-.48.14-1.16.13-1.56.18-2.44c.06-1.36,0-2.73.06-3.29-.08.08-.12.1-.15.09s.33-1.28,1-3.12a54,54,0,0,0,1.87-6.82,44.21,44.21,0,0,0,.84-7c0-.74,0-1.39,0-1.92C105.39,15.47,105.68,18.23,103.91,18.93Z"/>
+                <path class="cls-18"
+                      d="M101.65,15.05c.12-.05.67.71,1.24,1.75.1-.75.43-2.05.74-3.31a8.14,8.14,0,0,0,.14-2.54,3.53,3.53,0,0,0,0-.38,3,3,0,0,0-2,.18,5.32,5.32,0,0,0-2,1.32,3.36,3.36,0,0,0-.29.4c.73.89,1.54,1.77,2.2,2.75C101.64,15.13,101.63,15.06,101.65,15.05Z"/>
+                <path class="cls-9" d="M104,10.78l0,.05-.11.07h0v0Z"/>
+                <path class="cls-7"
+                      d="M104.82,48.69c-.49.52-1.09,1.17-1.74,1.89l-1.37,1.51-.71.81c-.39.45-.78.91-1.17,1.35l-.5-.14c.51-1.75,1-3.78,1.44-5.22A39.45,39.45,0,0,0,104.82,48.69Z"/>
+                <path class="cls-9" d="M103.19,33a.38.38,0,0,1-.09.09,1,1,0,0,1,0-.25S103.17,32.85,103.19,33Z"/>
+                <path class="cls-7"
+                      d="M102.23,55.88l-.26,0h-.09l-.51.14-2,.55-.92.26c.23-.67.53-1.67.84-2.77l.5.14,2.14,1.4Z"/>
+                <path class="cls-8" d="M84,39.73a.85.85,0,0,0,0,.17h0c.16-.53.34-1,.53-1.57A8.67,8.67,0,0,0,84,39.73Z"/>
+                <path class="cls-20"
+                      d="M93.29,33.56a12.92,12.92,0,0,0-3-.11,6.3,6.3,0,0,0-2.86,1.31,9.63,9.63,0,0,0-2.22,2.29,7.89,7.89,0,0,0-.74,1.27c-.19.52-.37,1-.53,1.57a6.11,6.11,0,0,1,3.6-1.11C89,36.54,91,34.41,93.29,33.56Z"/>
+                <path class="cls-8"
+                      d="M102.05,43.94c0-.27-.12-.7-.19-1.25s-.15-1.11-.24-1.82a15.8,15.8,0,0,0-.83-2.15,8.19,8.19,0,0,0-1.74-2.09,11.87,11.87,0,0,0-2.37-1.92,10.07,10.07,0,0,0-3.39-1.15c-2.33.85-4.29,3-5.73,5.22.42,0,.86,0,1.33,0a8,8,0,0,1,2.92.75,7.71,7.71,0,0,1,2.61,2.15,23.57,23.57,0,0,1,2,3,8.2,8.2,0,0,1,1.14,3.58A13.25,13.25,0,0,1,97.3,52l2.4.19c.39-1,.77-2.27,1.06-3.28,0,0,0,0,0,0a.61.61,0,0,0,0-.11s0,0,0,0,.06-.24.09-.34.07-.21.09-.31.09-.37.13-.51,0-.13,0-.18,0-.16.06-.23l0-.18h0v0A29.75,29.75,0,0,1,102.05,43.94Z"/>
+                <path class="cls-20"
+                      d="M84.22,57.84a7.56,7.56,0,0,1-2-.08.91.91,0,0,1-.3-.13,26.75,26.75,0,0,0,.23,3,24.19,24.19,0,0,0,1.74,6.51l.17.39.14.28a.17.17,0,0,0,.22.13,1.52,1.52,0,0,0,.27-.06l.25-.13c.24-.14.47-.3.71-.45,1-.63,1.88-1.3,2.77-1.94l.92-.68a25.69,25.69,0,0,1-4.32-7Z"/>
+                <path class="cls-8"
+                      d="M97.3,52c0,.15-.1.32-.16.49a1.39,1.39,0,0,1-.16.28,1.08,1.08,0,0,1-.16.2,5.46,5.46,0,0,1-.68.68,11.9,11.9,0,0,1-1.48,1.06,23.83,23.83,0,0,1-5.93,2.39,23.48,23.48,0,0,1-3.66.67,25.69,25.69,0,0,0,4.32,7c1.42-1,2.75-2,3.89-2.93,1.39-1.07,2.53-2,3.31-2.64,0,0,.38-.49,1-1.26s.82-2.67,1.75-4.81c.12-.27.24-.57.36-.89Z"/>
+                <path class="cls-10"
+                      d="M93.43,41.51A7.06,7.06,0,0,0,91.56,40a7.45,7.45,0,0,0-2.72-.79,5.28,5.28,0,0,0-.89,0c2.84.89,5.37,5.12,5.21,9a10.5,10.5,0,0,1-3,7.37A20.93,20.93,0,0,0,93.84,54C95.78,50.55,94.72,45.69,93.43,41.51Z"/>
+                <path class="cls-7"
+                      d="M96.73,48.28c-.08-2.33-1.53-4.38-2.83-6.2-.15-.2-.31-.39-.47-.57,1.29,4.18,2.35,9,.41,12.51l.33-.17a11,11,0,0,0,1.36-.94,3.94,3.94,0,0,0,.59-.56l.13-.13,0-.12a1.69,1.69,0,0,0,.12-.36A12,12,0,0,0,96.73,48.28Z"/>
+                <path class="cls-10" d="M83.81,40.42l.17-.08a.79.79,0,0,0-.19.17A.29.29,0,0,1,83.81,40.42Z"/>
+                <path class="cls-7"
+                      d="M83.94,56.71a5.44,5.44,0,0,1-1.45-.11.72.72,0,0,0-.52.1c0-.7,0-1.38.07-2,0-.2,0-.4,0-.58A4.1,4.1,0,0,0,83.94,56.71Z"/>
+                <path class="cls-7"
+                      d="M83.49,106.93a4,4,0,0,0-.68-1.13,1.22,1.22,0,0,0-.63-.42s-.05-.1-.05-.22h0a8,8,0,0,1,0,.85c0,.36,0,.76,0,1.19A3.28,3.28,0,0,0,83.49,106.93Z"/>
+                <path class="cls-19"
+                      d="M82,107.2c0,.19,0,.38,0,.59s-.08.7-.14,1.09a1.53,1.53,0,0,0,.6-.16,3.44,3.44,0,0,0,.74-.53c.26-.22.5-.46.47-.74a2.59,2.59,0,0,0-.16-.52A3.28,3.28,0,0,1,82,107.2Z"/>
+                <path class="cls-21"
+                      d="M77,78.79a.9.9,0,0,1,.23-.08,2.43,2.43,0,0,1,1,0,.68.68,0,0,1,.51.37.75.75,0,0,1-.14.68,3,3,0,0,1-.22.31l-.23.23a3.88,3.88,0,0,1-.49.4c-.19.13-.39.25-.59.36a.29.29,0,0,0,.12.07,2.88,2.88,0,0,0,1.35,0,6.21,6.21,0,0,0,1.4-.39c.17-.07.3-.16.31-.23a.49.49,0,0,0,0-.16s.11,0,.16.13a.31.31,0,0,1-.08.26,1.06,1.06,0,0,0,.77-.22c.23-.14.48-.37.69-.49s.16-.11.26-.09v0a0,0,0,0,1,0-.05,1.65,1.65,0,0,1,.11-.36.49.49,0,0,0,0-.2c0-.09-.09,0-.06-.4,0-.09,0-.06,0-.07H82l-.14,0a.86.86,0,0,0-.25.1c-.15,0-.23.06-.24,0s0-.08.16-.18a1,1,0,0,1,.68-.25c.17.16,0,.36,0,.54s.1,0,.14,0a.5.5,0,0,0,.15-.14c-.27-.46,0-1.92-.82-1.64a2.24,2.24,0,0,1-.93,0C79.55,77.15,77.37,76.71,77,78.79Z"/>
+                <path class="cls-12"
+                      d="M83.27,76.29a2.17,2.17,0,0,0-.57-.48,1.61,1.61,0,0,0-.67-.22,5.82,5.82,0,0,0-1.56,0l-.1,0-.2.07-.36.13-.42.13a2.24,2.24,0,0,1-.51,0,2.14,2.14,0,0,1-.44-.08s0,0-.12,0a4.8,4.8,0,0,0-.48.08,9.32,9.32,0,0,0-1,.35,4.54,4.54,0,0,0-1.67,1.05,2.67,2.67,0,0,0-.71,1.68,2.62,2.62,0,0,0,.18,1,.84.84,0,0,0,.63.56,3.1,3.1,0,0,0,2.12-.52,4.37,4.37,0,0,0,.44-.31l.2-.17s.08-.07.11-.11a.33.33,0,0,0,.12-.27c0-.1-.13-.14-.21-.17a2.25,2.25,0,0,0-.72-.06,1,1,0,0,0-.31.06c0,.09,0,.18,0,.29,0-.11,0-.2,0-.29a.48.48,0,0,0-.21.12,1.94,1.94,0,0,0-.22.34c-.06.09-.12.11-.13.1s0-.06,0-.14a1,1,0,0,1,.15-.45.75.75,0,0,1,.43-.29c.39-2.36,3-.68,4.36-1.49,1.24-.19.73,1,1.08,1.62h0a.53.53,0,0,0,.12-.37v-.06a.66.66,0,0,1,0-.15.7.7,0,0,1,.08-.16,1,1,0,0,1,.12-.2,2.19,2.19,0,0,1,.34-.34c.11-.11.26-.21.31-.26C83.73,77.14,83.6,76.69,83.27,76.29Z"/>
+                <path class="cls-19"
+                      d="M82.24,96a3.69,3.69,0,0,1,0,.69c-.08.56-.32,1.46-.44,2.29-.06.38-.1.74-.13,1.09-.28-1.53-.72-3.37-1.19-5.21l-.28-1.06.19.08A3.22,3.22,0,0,1,82,95a1.53,1.53,0,0,1,.2.78A1.46,1.46,0,0,1,82.24,96Z"/>
+                <path class="cls-19"
+                      d="M73.76,94.46H73.6a6.34,6.34,0,0,1-2-.55,5.33,5.33,0,0,1-1-.64,3.63,3.63,0,0,1-.93-1.06,3.33,3.33,0,0,1-.27-.61s-.06-.13,0-.15l.16,0,.29-.07a7.42,7.42,0,0,1,1.26-.24l1.08-.19c.32,0,.63-.1.9-.16a3.93,3.93,0,0,0,2.23-1.23,3.74,3.74,0,0,0,.32-.5,2.32,2.32,0,0,0,.33-.91s0-.06,0-.08h0s0,0,0,0h0a.51.51,0,0,0-.13-.34c-.11-.29-.19-.49-.23-.58a10.12,10.12,0,0,1-1.18.4,4.66,4.66,0,0,1-2.09.06,2.9,2.9,0,0,1-.83-.28,5,5,0,0,1-.79-.49c-.11-.09-.27-.16-.33-.26a0,0,0,0,0,0,0,15.74,15.74,0,0,1-3.48,0,28.94,28.94,0,0,1-6.09-1.68c-.2.12-.48.3-.8.53s-.89.63-1.39,1C62.85,90.87,68.22,94.55,73.76,94.46Z"/>
+                <path class="cls-7"
+                      d="M71.78,116.83c.38-.65.77-1.36,1.14-2.12a1.86,1.86,0,0,1-.59-.49,1.09,1.09,0,0,1-.31-.6c0-.21.18-.23.17-.21s.09,0,.23,0a2.43,2.43,0,0,0,.56-.25c.23-.12.5-.27.81-.4,1.41-3.56,2.2-7.76,1-11.35a8.51,8.51,0,0,1-1.91-.75c-.33-.17-.67-.36-1-.57l-.52-.33c-.24-.19-.51-.36-.75-.56A15.51,15.51,0,0,1,69.25,98l-.63-.58-.08-.07,0,0,0-.07L68.26,97c.83.22,1.67.5,2.3.63a14.82,14.82,0,0,0,1.68.3l.51,0a10.85,10.85,0,0,0-1-.94,10.85,10.85,0,0,1,1,.94c.46,0,.92.1,1.36.12a6.64,6.64,0,0,0,3.08-.43,4.63,4.63,0,0,0,1.72-1.2,1.77,1.77,0,0,0,.15-.18c-.1-.3-.22-.6-.33-.92-.19-.5-.39-1-.56-1.49h0l-1.51.33a12,12,0,0,1-2.89.22c-5.54.09-10.91-3.59-15.18-8.15-.28.22-.57.45-.85.69a27.49,27.49,0,0,1-3.21,2.63s0,0,0,0l-3,.45.31.12s.28.16.29.2.22.06.27.1.21.06,0,.09l-.84.17L49.92,91c-.51.08-1,.16-1.45.25l-1.1.15a12.55,12.55,0,0,1-3.54.14,8.35,8.35,0,0,1-1.45-.35,28.67,28.67,0,0,0-.74,2.94c-.09.5-.17,1-.24,1.52a6.13,6.13,0,0,0,1.21.94,9.35,9.35,0,0,0,3.28,1.15,14.44,14.44,0,0,0,2.5.18l1.46,0c.6,0,1.35-.09,2-.17a12.26,12.26,0,0,0,1.7-.11l0,0c-.43.44-1,1-1,1-.55.47-.84.85-1.39,1.29l-1.32,1.06c-.8.62-1.55,1.16-2.28,1.62a18.65,18.65,0,0,1-3.74,1.7c-1,.34-1.7.55-2.15.68a2,2,0,0,0-.23.08c.17,1.29.4,2.6.67,3.92a43.49,43.49,0,0,0,1.36,5l.1.07a2.09,2.09,0,0,0,.74.32,1.16,1.16,0,0,1,.32.2.88.88,0,0,1,.3.74.66.66,0,0,1-.49.55.58.58,0,0,1-.25,0c.15.38.31.75.49,1.11.11.21.21.43.32.64a12.13,12.13,0,0,0,2,2.87l.24.24c.32-.22.38-.39.38-.44l-.1-.34.36,0c.5,0,1.31,0,1.49,0a.31.31,0,0,1,.33.21,2.73,2.73,0,0,1-.47,2.3h0l1.08.84a20.65,20.65,0,0,0,4.52,2.61,2.14,2.14,0,0,0,.27.06C62.42,127.22,67.62,122,71.78,116.83Zm-7.64-3.61a1.41,1.41,0,0,1,.92-.82,5.12,5.12,0,0,1,1.2-.05c.31,0,.54,0,.56,0a1,1,0,0,1,.26.08.31.31,0,0,1,.12.41c-.08.12-.11.1-.16.15l-.1,0a.37.37,0,0,0-.14.07,2.75,2.75,0,0,1-1.1.51,3.91,3.91,0,0,1-1.66.11S64,113.53,64.14,113.22Zm-1.94,4.94a1.8,1.8,0,0,1,1.39-.55l.64.06a4.65,4.65,0,0,1,.93.24c.19.08.42.27.39.5a.73.73,0,0,1-.16.33,1.52,1.52,0,0,1-.17.18,4.72,4.72,0,0,1-.75.56,2.3,2.3,0,0,1-1.37.09c0-.06.61-.14,1.22-.39a7.65,7.65,0,0,0,.59-.57.83.83,0,0,0,.11-.15v0s0,0-.07,0a5.27,5.27,0,0,0-.81-.13l-.61-.11a1.37,1.37,0,0,0-1.06.31,3.9,3.9,0,0,0-.92,1.57A2.16,2.16,0,0,1,62.2,118.16ZM57.55,123a1.14,1.14,0,0,0,.32.05,2.28,2.28,0,0,0,.82-.14s.09,0,.1,0,.08,0,0-.09a1.77,1.77,0,0,0-.49-.21c-.16,0-.26,0-.28,0s.44-.33,1-.08c.15.07.34.19.38.35a.44.44,0,0,1-.12.43,1.37,1.37,0,0,1-.45.21,1.83,1.83,0,0,1-.33.05,1.87,1.87,0,0,1-.72-.07l-.18,0s0,0,0-.09,0-.08,0-.1,0,0,.09,0a.94.94,0,0,0-.1-.14C57.62,123,57.43,123,57.55,123ZM55,111.84a1,1,0,0,1-.31.26,5.59,5.59,0,0,0-.48.38,1.54,1.54,0,0,1-.75.34,1.56,1.56,0,0,1-.77-.19c-.19-.09-.38-.19-.56-.26s-.53-.28-.51-.32a1.61,1.61,0,0,1,.6.1c.17.06.38.11.59.17a1.22,1.22,0,0,0,.6.09c.33-.07.65-.51,1-.74.11-.08,0,0,0-.06h0l-.33-.08a5.81,5.81,0,0,0-1.27,0,8.14,8.14,0,0,1-1.33,0,1.55,1.55,0,0,0-.31,0c0,.07.06.11,0,.12s-.08,0-.17-.1,0-.14.05-.15a.31.31,0,0,1,.12,0l.26,0c.36,0,.83-.07,1.29-.16a5.16,5.16,0,0,1,1.38-.1,2,2,0,0,1,.54.11.7.7,0,0,1,.29.17.42.42,0,0,1,.13.27A.4.4,0,0,1,55,111.84Z"/>
+                <path class="cls-19"
+                      d="M80.89,101.35a9.54,9.54,0,0,1-4,.36,9.29,9.29,0,0,1-2.11-.33c1.24,3.59.45,7.79-1,11.35a5.09,5.09,0,0,1,1-.34,2.57,2.57,0,0,1,.55-.06l.59,0a2.91,2.91,0,0,1,1.31.1.32.32,0,0,1,0,.52,2.34,2.34,0,0,1-.36.17c-.16,0-.33.1-.53.17l-.32.1a1,1,0,0,0-.19.07,8.34,8.34,0,0,0-1.63,1,1.48,1.48,0,0,1-1.07.38.49.49,0,0,1-.21-.08c-.37.76-.76,1.47-1.14,2.12-4.16,5.2-9.36,10.39-16.64,9.35a2.14,2.14,0,0,1-.27-.06,14.32,14.32,0,0,0,3.24.95,26.16,26.16,0,0,0,4.26.21,29.92,29.92,0,0,0,4.18-.38c2.69-.48,5.25-1.42,6.74-3.39a47.32,47.32,0,0,0,4.27-5.83,27.07,27.07,0,0,0,4-10c.41-2.57.23-4.09.36-4.09C81.7,103.65,81.4,102.73,80.89,101.35ZM75.05,120.5a3.67,3.67,0,0,1-.26.48.47.47,0,0,1-.39.23c-.11,0-.15-.06-.15-.08s.23,0,.31-.3c0-.12.08-.28.12-.45a2.43,2.43,0,0,0,.07-.39s-.06,0-.06,0a.61.61,0,0,1-.12.05l-.34.12a7.69,7.69,0,0,0-.74.3,5.65,5.65,0,0,1-1.09.45c-.06-.07.38-.48.88-.81a6,6,0,0,1,1.1-.61,2,2,0,0,1,.35-.08c.26-.08.64.07.55.45A5.78,5.78,0,0,1,75.05,120.5Zm2.43-12.84a1.71,1.71,0,0,1-1,.52A.61.61,0,0,1,76,108a.46.46,0,0,1-.09-.4c0-.22.16-.3.19-.29s0,.14,0,.3.13.21.29.19a1.27,1.27,0,0,0,.43-.31l.19-.21c.06-.07,0,0,.11-.07s0,0-.09-.07l-.43-.18c-.27-.12-.44-.16-.47-.19s.25-.14.54-.1a2.67,2.67,0,0,1,.48.08,8.2,8.2,0,0,1,.8.22A5.93,5.93,0,0,1,77.48,107.66Z"/>
+                <path class="cls-20"
+                      d="M82.16,3.9c-.24.21-.49.45-.75.71a8.77,8.77,0,0,0-1.29,1.72A22.48,22.48,0,0,0,79,8.58c-.24.6-.51,1.33-.77,2.09l-.15.46s0,.13,0,.07v-.15l0-.28L78,10.21c0-.35-.06-.69-.1-1a5.5,5.5,0,0,0-.18-.88,10.71,10.71,0,0,0-.37-1.09A23.37,23.37,0,0,0,75.84,4.1c.54-.1,1.08-.2,1.63-.28a16.22,16.22,0,0,1,2.62-.2,4.86,4.86,0,0,1,.56,0l.72.11Z"/>
+                <path class="cls-6"
+                      d="M80.8,101.07c0,.09.06.19.09.27a7.14,7.14,0,0,0-1.11,0,18.54,18.54,0,0,1-2.88-.14A9.16,9.16,0,0,1,73.17,100c-.31-.19-.62-.37-.93-.58l-.42-.3L71.68,99a1.79,1.79,0,0,1-.24-.22l-.08-.09s.1,0,.14,0l.28.07a1.88,1.88,0,0,0,.34.08c.65.1,1.31.17,1.93.22a7.69,7.69,0,0,0,3.54-.4,5.66,5.66,0,0,0,1.92-1.2C80,98.83,80.43,100.06,80.8,101.07Z"/>
+                <path class="cls-19"
+                      d="M78.43,145.55a1.41,1.41,0,0,1,.71.29,2,2,0,0,0-.41-1c-.31.2-.61.48-.92.7A1.75,1.75,0,0,1,78.43,145.55Z"/>
+                <path class="cls-7"
+                      d="M77.28,144.16a12.61,12.61,0,0,0-1.53.68,15.27,15.27,0,0,1-2.91,1.1,9.79,9.79,0,0,1-2.39.05c-.64,0-1.14,0-1.5,0h-.2l-.58.11h0l-.12,0h0c.11.52.22,1,.32,1.55l.15.09a29.07,29.07,0,0,0,9.07,1,2,2,0,0,0,.28-.3,1.16,1.16,0,0,0,.16-.21,1.33,1.33,0,0,0-.45-.61,2.49,2.49,0,0,0-.86-.28c-.26-.06-.44-.12-.44-.17s0,0,.11,0a1.15,1.15,0,0,1-.45-.26,1.15,1.15,0,0,0,.45.26l.35,0c.16,0,.36,0,.58,0a6.08,6.08,0,0,1,1.51-.17l.14-.21.14-.27a1.28,1.28,0,0,0-.76-.63,3.78,3.78,0,0,0-.88,0,.79.79,0,0,0-.29,0c-.09,0-.13,0-.14,0h0s0-.05.09-.08a.46.46,0,0,1,.29-.17l.39-.09c.31-.22.61-.5.92-.7a1.25,1.25,0,0,0-.16-.24A1.31,1.31,0,0,0,77.28,144.16Z"/>
+                <path class="cls-19"
+                      d="M77.31,147.23a1.25,1.25,0,0,1,.48.14,1.64,1.64,0,0,1,.55.49.46.46,0,0,1,.09-.15c.14-.22.27-.43.39-.65A6.08,6.08,0,0,0,77.31,147.23Z"/>
+                <path class="cls-19"
+                      d="M68.51,147.84l2.5,1.38,4.32.05a4.19,4.19,0,0,0,1.9-.2,1.41,1.41,0,0,0,.35-.23A32.79,32.79,0,0,1,68.51,147.84Z"/>
+                <path class="cls-9" d="M78.17,148.65h-.09Z"/>
+                <path class="cls-6"
+                      d="M70.36,92.27a2.52,2.52,0,0,0,.64.66,4.56,4.56,0,0,0,.91.46,4.37,4.37,0,0,0,1.82.3A6.85,6.85,0,0,0,76.34,93a7,7,0,0,0,1.19-.72c-.3-.81-.58-1.57-.84-2.24-.15.13-.3.27-.48.4a5.72,5.72,0,0,1-2.95,1.06c-.58.07-1.22.12-1.92.18l-.85.08-.22,0c-.07,0-.19,0-.12.09A1.23,1.23,0,0,0,70.36,92.27Z"/>
+                <path class="cls-9" d="M76.4,84.11h0a.08.08,0,0,1,0,0v0Z"/>
+                <path class="cls-7"
+                      d="M76.39,85.46v.16c0,.17-.24.39-.24.39s-.35.23-.46.32a2.9,2.9,0,0,1-1.4.64,2.46,2.46,0,0,1-1.77-.16,1.37,1.37,0,0,1-.47-.37.51.51,0,0,1-.08-.26v0a11.78,11.78,0,0,0,1.24-.44,15.49,15.49,0,0,0,2.39-.89.62.62,0,0,0,.18.24l.1.05.09,0,.09,0A3.18,3.18,0,0,1,76.39,85.46Z"/>
+                <path class="cls-7"
+                      d="M75.81,112.79l.06,0a.07.07,0,0,1-.06,0h0l-.16.07A7.91,7.91,0,0,0,74,114.08c-.27.2-.56.42-.79.39a1.33,1.33,0,0,1-.68-.4,1.13,1.13,0,0,1-.35-.46c0-.13,0-.18,0-.2s.07.09.24.08a2.13,2.13,0,0,0,.64-.15,8.48,8.48,0,0,1,1.8-.54,4.18,4.18,0,0,1,.5,0Z"/>
+                <path class="cls-20"
+                      d="M75,56a59.06,59.06,0,0,0-.7-6.34,19.8,19.8,0,0,0-2.07-6.14A14.18,14.18,0,0,0,68,38.82l-.07,0a15.52,15.52,0,0,0-3.47-1.93c1.13.76,1.8,1.68,1.12,3a4.6,4.6,0,0,1-3,1,15,15,0,0,1,2.26.81,18.77,18.77,0,0,1,2.88,1.56,9.56,9.56,0,0,1,2.06,2.3,18,18,0,0,1,2,4.48,30.6,30.6,0,0,1,1.06,4.48c.17,1,0,3.18-.32,3.47,0,0-.28.42-1,1C70,65.4,62.84,69.58,56,69.89c1.59.7,3.11,1.34,4.52,1.87A27.81,27.81,0,0,0,64.42,73a13.17,13.17,0,0,0,3.09.27,10.36,10.36,0,0,0,2-.19c.44-.08.66-.2.68-.18a5.47,5.47,0,0,1,.51-.74c.33-.49.81-1.21,1.35-2.15A23.79,23.79,0,0,0,75,61.72,24.92,24.92,0,0,0,75,56Z"/>
+                <path class="cls-8"
+                      d="M71.53,58.93c-.15.1-.3.21-.49.32a13.11,13.11,0,0,1-5,1.81,22.53,22.53,0,0,1-7.88-.31,38.74,38.74,0,0,1-4.51-1,17.44,17.44,0,0,1-4.65-2h0l-1.53-1c-.26-.18-.51-.39-.76-.58l-.37-.28a7.16,7.16,0,0,1-.59-.47c0-.25,0-.51,0-.76s0-.35.09-.52c.06-.33.15-.65.23-1a17.85,17.85,0,0,1,.68-1.85A20.47,20.47,0,0,1,51.32,45a20.87,20.87,0,0,1,3-2.43,11.87,11.87,0,0,1,3.46-1.7,8.76,8.76,0,0,1,3.77-.19c.37.07.72.15,1.07.25a4.6,4.6,0,0,0,3-1c.68-1.37,0-2.29-1.12-3a13.49,13.49,0,0,0-5.2-1.05A49,49,0,0,0,51,36.84a29.41,29.41,0,0,0-3.58,1C39.09,42.33,37.05,55,43.7,60.68A63.37,63.37,0,0,0,56,69.88h0C62.84,69.58,70,65.4,71.53,58.93Z"/>
+                <path class="cls-20"
+                      d="M47.44,37.82c-.72.24-1.36.49-1.88.71-1.26.55-1.92,1-2,1s-1,.59-2.43,1.68a42.93,42.93,0,0,0-5.36,5A44.24,44.24,0,0,0,32.64,50l-.77,1.08-.19.26,0,0s-.07,0,0,.09l.06.08.41.48L33,53.05a87.27,87.27,0,0,0,8.34,8.31,46.53,46.53,0,0,0,4.73,3.57l1.23.77,1.26.68c.84.43,1.72.84,2.57,1.24,1.69.81,3.32,1.57,4.88,2.26a63.37,63.37,0,0,1-12.32-9.2C37.05,55,39.09,42.33,47.44,37.82Z"/>
+                <path class="cls-19"
+                      d="M72.2,127.6a2,2,0,0,0,.13-.28s.28-.49.67-1.16c.24-.45.54-1,.84-1.55a9,9,0,0,1-2.94,2.24,16.18,16.18,0,0,1-4.11,1.32c-.38.08-.78.15-1.17.2,0,.27,0,.64.07,1.08.08,1.1.2,2.65.34,4.56.08.94.17,2,.25,3.07,0,.48.11,1,.16,1.5.07.24.09.37.13.52l.1.44c.07.3.13.59.19.89,0,.11,0,.23.07.34C67.18,135.42,67.2,129.3,72.2,127.6Z"/>
+                <path class="cls-7"
+                      d="M66.93,140.77c.36,1.74.74,3.62,1.11,5.42l.12,0h0v0a.28.28,0,0,0,0-.09c0-.27,0-.67,0-1.23,0-1.07,0-2.71.13-5a48.36,48.36,0,0,1,.59-5,3.78,3.78,0,0,0,.06-.49c-.33.27-.56.41-.6.29s1-1.84,2.07-3.57a25.27,25.27,0,0,0,1.31-2.45l.44-.94C67.2,129.3,67.18,135.42,66.93,140.77Z"/>
+                <path class="cls-10"
+                      d="M72.52,56.62s0,1.33,0,1.36-.57.46-1.64,1a11.62,11.62,0,0,1-1.1.51c1.29-1.4,1.64-3.56,1.86-6.06A28.12,28.12,0,0,1,72.52,56.62Z"/>
+                <path class="cls-11"
+                      d="M71.67,53.47c-.22,2.5-.57,4.66-1.86,6.06a12.42,12.42,0,0,1-1.35.48l.24-.2a17.49,17.49,0,0,1-4.44.62H62.73c-2.18-1.46-3.59-4.68-3.38-8.36.25-4.64,2.86-8.24,6.05-8.43a10,10,0,0,1,1.38.83,7.81,7.81,0,0,1,1.52,1.73,1.48,1.48,0,0,1,.21.26l.43.81.15.26A39.39,39.39,0,0,1,71.67,53.47Z"/>
+                <path class="cls-7"
+                      d="M70.53,85.77h-.1A17.69,17.69,0,0,1,67,85.54,26.43,26.43,0,0,1,62,84l2.31-1.52a25,25,0,0,0,2.31,2.16,6.34,6.34,0,0,0,1.75.86,8,8,0,0,0,1.91.31Z"/>
+                <path class="cls-7"
+                      d="M67.54,73.7l2.85,1.13a.55.55,0,0,0-.4.2,1.56,1.56,0,0,0-.32.6s.13.1.27.13l-.29.27,0,0s0,0,0,0l-.81,1.4a26.93,26.93,0,0,0-4,.66l-.16-1.34h0a7.48,7.48,0,0,0-2.2-.85l-1.11-.28.68-2.53a17.14,17.14,0,0,0,2.24.49A12.77,12.77,0,0,0,67.54,73.7Z"/>
+                <path class="cls-7"
+                      d="M52.18,177.16a15.85,15.85,0,0,1-3,4.85c-.49.59-.89,1.07-1.14,1.42a.15.15,0,0,1,0,.06c2.78.5,5.65.87,8.51,1.31l1.6.25.34,0H59l.58-.08c1.07-.06,2.15-.14,3.22-.23l2.48-.25c.08-.13.16-.3.26-.49l1-1.87c.43-.77.92-1.66,1.37-2.62a13.88,13.88,0,0,0,.59-1.51,11.13,11.13,0,0,0,.3-1.64,6.39,6.39,0,0,0-.23-3.19,5.67,5.67,0,0,0-.73-1.3,51.23,51.23,0,0,1-15.16,2.3A12.72,12.72,0,0,1,52.18,177.16Z"/>
+                <path class="cls-19"
+                      d="M65.65,169.88c-.57.13-1.14.25-1.7.34a33.41,33.41,0,0,1-10.82.2l-1.8-.3a3.05,3.05,0,0,1,1,1.41,6.58,6.58,0,0,1,.37,2.7,51.23,51.23,0,0,0,15.16-2.3,11.66,11.66,0,0,0-.87-1A4.94,4.94,0,0,0,65.65,169.88Z"/>
+                <path class="cls-11"
+                      d="M68.7,59.81l-.24.2a5.25,5.25,0,0,1-.6.17h0a27.25,27.25,0,0,1-3.57.25A17.49,17.49,0,0,0,68.7,59.81Z"/>
+                <path class="cls-11" d="M68.46,60a.87.87,0,0,1-.11.09l-.49.08A5.25,5.25,0,0,0,68.46,60Z"/>
+                <path class="cls-9" d="M67.67,13.43v0l-.52,0s0,0,0,0Z"/>
+                <path class="cls-7"
+                      d="M66.92,112.71s0,0,0,.07a.4.4,0,0,0-.08.18h-.07s-.2,0-.5-.07a2.32,2.32,0,0,0,.25-.21,1.34,1.34,0,0,1,.23-.13c.06,0,0-.07.08,0A.37.37,0,0,0,66.92,112.71Z"/>
+                <path class="cls-11"
+                      d="M67.83,60.18a11.93,11.93,0,0,1-1.49.29h-.1a.52.52,0,0,0-.43.08h-.09l-.89.06c-.33,0-.65,0-1,0s-.56,0-.84,0l-.28-.18h1.53A27.25,27.25,0,0,0,67.83,60.18Z"/>
+                <path class="cls-20" d="M66.58,5c.17,1.29.35,3.21.47,5.91a23.52,23.52,0,0,0-2.57-6Z"/>
+                <path class="cls-11" d="M66.34,60.47l-.24,0h-.29a.52.52,0,0,1,.43-.08Z"/>
+                <path class="cls-7"
+                      d="M66.22,112.88a1.91,1.91,0,0,1-.63.35c-.63.22-1.31.38-1.5.47.12-.16.44-.83,1.06-.89A6.28,6.28,0,0,1,66.22,112.88Z"/>
+                <path class="cls-7"
+                      d="M64.64,76.82l.16,1.34c-.44.08-.88.18-1.31.29-.63.15-1.26.32-1.85.49-.85-.71-1.45-1.15-1.53-1a10.77,10.77,0,0,0,1,1.17l-1.42.45c-1,.34-1.72.63-1.77.65a16.81,16.81,0,0,0-1.68.9c-.23.14-.47.32-.73.49-2.14-.7-4.37-1.35-6.6-2-.41-.12-.86-.24-1.2-.36l-1.14-.49-2.35-1.06L44,77.55c1.24-.33,2.42-.62,3.38-.82,1.38-.31,2.34-.4,2.4-.42s1-.18,2.41-.34a36.5,36.5,0,0,1,5.14-.12,39,39,0,0,1,5.08.56C63.59,76.62,64.43,76.82,64.64,76.82Z"/>
+                <path class="cls-7"
+                      d="M56.15,43a21.38,21.38,0,0,0-8.34,8.75,13.43,13.43,0,0,0-.66,1.69c-.08.29-.16.57-.23.86l-.08.42,0,.17.49.39c.25.19.48.39.73.56l1.5,1.06.05,0a14.34,14.34,0,0,0,3.51,1.66C50.6,54,51.62,47.6,56.15,43Z"/>
+                <path class="cls-10"
+                      d="M59.35,52.08c.25-4.64,2.86-8.24,6.05-8.43-.39-.2-.78-.4-1.17-.58a8.77,8.77,0,0,0-6.12-.89,10.91,10.91,0,0,0-2,.8c-4.53,4.62-5.55,11-3,15.6.26.09.52.19.78.27A38.35,38.35,0,0,0,58.27,60a27.21,27.21,0,0,0,4.74.64l-.28-.18C60.55,59,59.14,55.76,59.35,52.08Z"/>
+                <path class="cls-9" d="M64.06,113.73s0,0,0,0Z"/>
+                <path class="cls-19"
+                      d="M52.1,154.21a1.1,1.1,0,0,0,.12.31,2.69,2.69,0,0,0,.26.44h0l0-.06.15-.13.33-.28,2.47-2.11c.72-.61,1.39-1.18,2-1.67l.7-2.23A18.18,18.18,0,0,1,52.1,154.21Z"/>
+                <path class="cls-19"
+                      d="M52.39,153.13c-.33.39-.33.64-.32.66a.82.82,0,0,0,0,.22,1,1,0,0,0,0,.2A18,18,0,0,0,56,151.15a10.22,10.22,0,0,1-3.32,1.61Z"/>
+                <path class="cls-19"
+                      d="M49.83,153a4,4,0,0,0-.29.54l-.11.23a1.71,1.71,0,0,0-.14.51.88.88,0,0,0,0,.28l.33,0,.8.13,1.63.22c-.07-.08-.15-.14-.21-.22a1.5,1.5,0,0,1-.37-1c-.09-.13.2-.51.54-.83A7.79,7.79,0,0,1,49.83,153Z"/>
+                <path class="cls-19"
+                      d="M48.34,153.18a2,2,0,0,0,0,.23v.14l.52.69a1.87,1.87,0,0,1,.14-.94,2.11,2.11,0,0,1,.18-.27l.07-.08a5.51,5.51,0,0,1-.89-.22C48.36,152.88,48.35,153,48.34,153.18Z"/>
+                <path class="cls-7"
+                      d="M61.38,133.46c0-1.63-1.92-3.26-3.25-4.9l-.25,0A16.43,16.43,0,0,1,54,127.45c.49.9,1.11,2.19,1.66,3.5s1,2.53,1.36,3.53a16.22,16.22,0,0,1,.51,1.79,44,44,0,0,1,.24,5.61c0,2.67-.18,5.29-.46,5.34h0a21,21,0,0,1-3.11,2.05s-3.43,1.39-3.58,1.11a1.68,1.68,0,0,0-1.23.32,1.91,1.91,0,0,0-.8,1.13,4.34,4.34,0,0,0-.19.86v0a5.51,5.51,0,0,0,.89.22,2.46,2.46,0,0,1,.39-.41c.37-.31.85-.43.87-.35s-.33.31-.58.65a1.77,1.77,0,0,0-.12.17,7.79,7.79,0,0,0,2.2-.11c.36-.34.79-.62.87-.43a2.92,2.92,0,0,0-.24.29A10.22,10.22,0,0,0,56,151.15a18.71,18.71,0,0,0,2.19-2.68c.12-.39.19-.63.2-.67a1.11,1.11,0,0,0,.08-.24l0-.05a.38.38,0,0,1,0-.1l0-.13v-.05l.14-.38.86-2.27c.36-.92.78-2,1.22-3.13l.53-1.32A24.39,24.39,0,0,0,61.38,133.46Z"/>
+                <path class="cls-19"
+                      d="M62.41,128.67a25.75,25.75,0,0,1-4.28-.11c1.33,1.64,3.25,3.27,3.25,4.9a24.39,24.39,0,0,1-.08,6.67c.05-.14.11-.28.17-.43l.37-.9.08-.16,0,0v0l0-.11L62,138c.37-2.56.75-5.1,1-7,.16-1,.27-1.83.36-2.38Z"/>
+                <path class="cls-7"
+                      d="M61.86,79.87c.54.58,1.18,1.25,1.82,1.91-.75.41-1.46.79-2,1.12l-.95.53c-.64-.26-1.31-.52-2-.78s-1.24-.45-1.89-.67c.9-.46,1.56-.72,1.6-.74s.68-.32,1.67-.7C60.6,80.33,61.21,80.1,61.86,79.87Z"/>
+                <path class="cls-9" d="M60.28,147.49l0,.14h0l0,.05Z"/>
+                <path class="cls-22"
+                      d="M59.47,84.29l-1.18-.41c-.78-.25-1.58-.49-2.39-.72.65.83,1.33,1.66,2.05,2.46.48-.46,1-.88,1.37-1.22Z"/>
+                <path class="cls-7"
+                      d="M55.28,83c-.54.35-1.12.75-1.69,1.13A35.2,35.2,0,0,1,48.81,87l-.6.34a6.64,6.64,0,0,0,.75,1c.15.13.28.29.44.41a4.55,4.55,0,0,0,.66.5,7.11,7.11,0,0,0,1.43.76l3-.45a16.41,16.41,0,0,1,2.65-3.21c.26-.27.53-.53.79-.78-.72-.8-1.4-1.63-2.05-2.46Z"/>
+                <path class="cls-9" d="M57.74,123.24s.14.2,0,0Z"/>
+                <path class="cls-20"
+                      d="M56.38,12c0,.15.2.51,0,.23,0,0-.49-.51-1-1l-.27-.21-.63-.5L53.66,10,52.1,8.82A25,25,0,0,0,49.22,7a32,32,0,0,0-3.67-1.68,27.94,27.94,0,0,1,5.54-.88c.73,0,1.44-.07,2.12-.08a22.22,22.22,0,0,1,1.1,2.27C54.86,7.88,55.6,9.87,56,11c0,.07.11.27.21.55S56.32,11.87,56.38,12Z"/>
+                <path class="cls-7"
+                      d="M47.18,80.83h0l-.65,1.32c.09.36.19.8.31,1.33a20.55,20.55,0,0,0,1,3.09,7.46,7.46,0,0,0,.4.8l.6-.34a31.87,31.87,0,0,1,4.3-3.6c.33-.26.68-.52,1-.79-1.83-.5-3.71-1-5.62-1.46C48.07,81.08,47.67,81,47.18,80.83Z"/>
+                <path class="cls-6"
+                      d="M52.65,98l.05.07-1,.8a32.19,32.19,0,0,1-4.39,3A12.17,12.17,0,0,1,43.68,103a15.69,15.69,0,0,1-2.18.21h-.19c-.07-.69-.13-1.39-.17-2.07a28.17,28.17,0,0,1,0-3.57c.28.12.58.25.91.37a13,13,0,0,0,3.8.75,22.78,22.78,0,0,0,2.59,0l1.45-.12c.38,0,.73-.07,1.13-.12l1-.25S52.44,98.1,52.65,98Z"/>
+                <path class="cls-6"
+                      d="M43.75,176.34a17.63,17.63,0,0,1-5.12,3l-1.2.44c.3.18.6.36.92.52A24,24,0,0,0,44,182.59c.92.25,1.85.46,2.8.66a19.52,19.52,0,0,1,1.6-1.95,15.11,15.11,0,0,0,3-4.41,12.23,12.23,0,0,0,.63-2.66,50.82,50.82,0,0,1-6.45-.53A6.44,6.44,0,0,1,43.75,176.34Z"/>
+                <path class="cls-16"
+                      d="M51.9,171.67A3.08,3.08,0,0,0,50.84,170c-.58-.14-1.11-.3-1.61-.45l-2.83-.82-.77-.23A6.72,6.72,0,0,1,46,171a7.49,7.49,0,0,1-.46,2.71h0a50.82,50.82,0,0,0,6.45.53A6.46,6.46,0,0,0,51.9,171.67Z"/>
+                <path class="cls-7"
+                      d="M47,123c-.41-.36-.83-.73-1.23-1.13-.12-.12-.24-.25-.34-.37a6.65,6.65,0,0,1-.55,1c0,.07,0,.14,0,.2a1.1,1.1,0,0,0,.44.79.79.79,0,0,0,.05.24c.12.22.31.52.5.81.36.62.8,1.15.7,1.45s-1,.22-1.77-.18a6.56,6.56,0,0,1-1-.61,2.79,2.79,0,0,1-.52-.56s0-.09-.09-.21,0,0,0,0l0,0-1.15,1.09.06,0,0,0a.56.56,0,0,0-.09.13,2.41,2.41,0,0,0-.28.54,1.3,1.3,0,0,0,.23,1.46c.1.12.27.26.44.42s.36.28.52.41c.34.27.66.51.94.71.57.41,1,.62,1,.77s-.58.24-1.32.06a8.31,8.31,0,0,1-1.23-.4l-.67-.3a4.61,4.61,0,0,1-.7-.41,3,3,0,0,1-1.09-1.33l-.75.71-1.28,1.2c0,.06,0,.13,0,.19a4.72,4.72,0,0,0,1,1.64c.94,1.15,2.48,1.91,2.36,2.23s-1.87.11-3.46-1A5.92,5.92,0,0,1,36.25,131c-.49.47-1,1-1.51,1.53l-.41.44c0,.12.09.31.17.55a4.22,4.22,0,0,0,.78,1.32,6.1,6.1,0,0,0,1.31,1c.4.24.69.29.76.42s-.32.48-1,.46a4.46,4.46,0,0,1-2.13-.61,5.52,5.52,0,0,1-1.55-1.43c-1,1.12-2,2.32-3.07,3.62a4.8,4.8,0,0,0,.61,1.71,4.6,4.6,0,0,0,1.21,1.36,5.5,5.5,0,0,0,1.93.88l.33.08C40.48,136.9,47.34,131,47,123Z"/>
+                <path class="cls-19"
+                      d="M49.38,124.85c-.82-.6-1.59-1.21-2.34-1.86.3,8-6.56,13.91-13.31,19.36a13.77,13.77,0,0,0,3.76.39,9.23,9.23,0,0,0,1.42-.16c1.32-1.69,3-3.45,4.54-5.15,1.26-1.36,2.39-2.77,3.45-4.15a43.87,43.87,0,0,0,2.69-3.81,22.89,22.89,0,0,0,1.48-2.83c.09-.2.16-.39.22-.53C50.64,125.71,50,125.29,49.38,124.85Z"/>
+                <path class="cls-6"
+                      d="M50.8,90.23s.26,0,.1.06l-.52.09-1,.14-.91.08-1.08.06a8,8,0,0,1-3.19-.34,4.92,4.92,0,0,1-1.28-.71c.14-.38.29-.75.45-1.1.73-1.57,1.51-3.06,2.07-4.22l.15-.32s0,0,0,0c.4.77.84,1.79,1.53,3a7.7,7.7,0,0,0,1.44,1.84,4,4,0,0,0,.49.42c.12.1.25.19.38.28a5.74,5.74,0,0,0,.92.5l.16.07Z"/>
+                <path class="cls-7"
+                      d="M49.29,120.67a2.31,2.31,0,0,1-.36,1.61l-.07,0c-.41-.35-.81-.71-1.19-1.08a1.32,1.32,0,0,0,.48-.58C48.46,120.68,49,120.68,49.29,120.67Z"/>
+                <path class="cls-7"
+                      d="M32,165.55l-.08,0a10.63,10.63,0,0,1-3,1,11.36,11.36,0,0,1-2.79,0,13.58,13.58,0,0,1-1.38-.19c.37,1.25.71,2.37.85,2.66a5.58,5.58,0,0,1,.28,1l.18.82c.12.56.25,1.1.36,1.65.25,1.11.49,2.22.74,3.35l.1.53,0,.11c0,.06.05,0,.07,0l.14-.18,1.06-1.37,1-1.31.7,1.49c.47,1,.94,2,1.42,3,0-.92,0-1.84-.05-2.77.79.69,1.63,1.49,2.38,2.07.37.31.79.61,1.11.85l.62.42a4.53,4.53,0,0,0,.4.26h0l.28-.08c.45-.14,1.07-.32,1.8-.58a17.25,17.25,0,0,0,5-2.58,5.6,5.6,0,0,0,1.7-2.13c-1.09-.17-2.18-.37-3.28-.62A15.41,15.41,0,0,1,32,165.55Z"/>
+                <path class="cls-19"
+                      d="M45.53,168.48c-.34-.11-.63-.19-.85-.27a2,2,0,0,1-.57-.22h0l-.34-.41a4.11,4.11,0,0,1-1.4-.66,13.52,13.52,0,0,1-2.61-2.33,28.68,28.68,0,0,1-2.16-2.74c-.56-.78-.92-1.33-.94-1.36s-.23-.38-.53-1c-.12.43-.32,1-.56,1.7-.12.36-.26.75-.41,1.18a6.65,6.65,0,0,1-1,1.64,5.33,5.33,0,0,1-2.13,1.5A15.41,15.41,0,0,0,41.62,173c1.1.25,2.19.45,3.28.62a7.4,7.4,0,0,0,.69-2.62A14,14,0,0,0,45.53,168.48Z"/>
+                <path class="cls-9" d="M44.25,116a.13.13,0,0,0,0,.08.09.09,0,0,1-.06,0S44.23,116,44.25,116Z"/>
+                <path class="cls-9" d="M41.17,3.88l0,0v0Z"/>
+                <path class="cls-19"
+                      d="M35,94.25l0,0-.2.2c0,.06-.15.14-.11.13s0,0,0,.11,0,.12.11.37a4.88,4.88,0,0,0,.48.93c.45.69,1.64,1.5,2.55,2.72a5.48,5.48,0,0,1,.93,2,7.79,7.79,0,0,1,.19,1.81c0,.26,0,.5,0,.72s0,.21-.05.32a.58.58,0,0,1,0,.16s0,.06-.06.1h0a2.52,2.52,0,0,1,.44.42.83.83,0,0,1,.2.41h0c-.16-1.15-.27-2.28-.35-3.4,0-.42,0-.84,0-1.25l0-.27,0,0-.12-.15-.27-.34-.52-.69a13.22,13.22,0,0,1-.94-1.36l-.2-.34c-.07-.15-.11-.21-.22-.45a1.67,1.67,0,0,1-.11-1.21c.11-.36.53-.57.86-.8l.47-.32,1.74-1.16h0a27.35,27.35,0,0,1,.83-3C38.63,91.85,38.47,95.54,35,94.25Z"/>
+                <path class="cls-7"
+                      d="M39,90.75c-.84.67-1.72,1.41-2.51,2.11l-1.07,1-.42.41c3.45,1.29,3.61-2.4,5.5-4.38l.12-.4C40.17,89.83,39.6,90.27,39,90.75Z"/>
+                <path class="cls-7"
+                      d="M38.51,106.43a2.11,2.11,0,0,0,.16-2.32l-.4-.28a1.47,1.47,0,0,0-.94-.34,2.87,2.87,0,0,0-1,.31c-.32.16-.63.33-.68.47s0,.25.13.37a1.11,1.11,0,0,0,.16.15s0,.17-.09.3-.22.2-.27.16a1.89,1.89,0,0,1-.24-.25,1,1,0,0,1-.21-.36.77.77,0,0,1,0-.61,1.84,1.84,0,0,1,1-.66l.08,0c.06-.07.12-.13.18-.21s0-.34-.12-.6-.09-.48-.26-.69-.28,0-.39.13-.22.22-.32.34-.33.3-.47.44a2.55,2.55,0,0,0-.37.52,6.58,6.58,0,0,0-.3.71C35,105.67,36.18,107.2,38.51,106.43Z"/>
+                <path class="cls-19"
+                      d="M39.7,106.35a0,0,0,0,1,0,0c-.11-.55-.19-1.1-.26-1.65h0a.66.66,0,0,1,0,.32c-.06.18-.13.25-.14.25s.21-.45-.22-.83a4.56,4.56,0,0,0-.38-.31,2.11,2.11,0,0,1-.16,2.32c-2.33.77-3.49-.76-4.37-2.45l-.26.75a7,7,0,0,0-.24.79.87.87,0,0,0,0,.62,1.84,1.84,0,0,0,1.14.85,7.58,7.58,0,0,0,1.79.35,13.64,13.64,0,0,0,1.92,0c.58,0,1.23-.22,1.26-.44a.07.07,0,0,0,0,0C39.75,106.72,39.72,106.53,39.7,106.35Z"/>
+                <path class="cls-6"
+                      d="M33.26,142.85a6,6,0,0,1-2.19-.89,5.2,5.2,0,0,1-1.48-1.53,5.38,5.38,0,0,1-.59-1.29c-.79,1-1.58,2.07-2.32,3.19-.28.43-.55.88-.8,1.34a6.12,6.12,0,0,0,4.3,3.57,8.72,8.72,0,0,0,1.23.19A19.94,19.94,0,0,1,34.25,143,8.54,8.54,0,0,1,33.26,142.85Z"/>
+                <path class="cls-16"
+                      d="M34.73,147.19c.69-.13,1.26-.28,1.61-.36a12.25,12.25,0,0,1,.63-1.34,18.5,18.5,0,0,1,1.77-2.69,7.6,7.6,0,0,1-1.23.26,12,12,0,0,1-3.26,0,19.94,19.94,0,0,0-2.84,4.41A12.73,12.73,0,0,0,34.73,147.19Z"/>
+                <path class="cls-6"
+                      d="M28.22,157a7.39,7.39,0,0,1-5-1.31,4.64,4.64,0,0,1-.73-.62c0,.49,0,1,0,1.47a21.58,21.58,0,0,0,.73,5.15h0l.24.61c.13.34.57,1.75,1,3.21.43.1,1,.22,1.73.31a11.19,11.19,0,0,0,2.61.06,10,10,0,0,0,2.85-.82l0,0a19.36,19.36,0,0,1-2.2-8.2C29.09,156.89,28.66,156.94,28.22,157Z"/>
+                <path class="cls-16"
+                      d="M34.08,163.4a4.57,4.57,0,0,0,.69-1.13c.18-.41.33-.8.49-1.17.31-.75.57-1.35.76-1.77l-.17-.34a11.34,11.34,0,0,1-.91-3.46.86.86,0,0,1,0-.16,7.43,7.43,0,0,1-1.76.71,26.2,26.2,0,0,1-3.65.75,19.36,19.36,0,0,0,2.2,8.2A6.12,6.12,0,0,0,34.08,163.4Z"/>
+                <path class="cls-7"
+                      d="M31.18,147.94a8.37,8.37,0,0,1-1.11-.12,6.52,6.52,0,0,1-4.66-3.28c-.36.71-.69,1.43-1,2.19a50.14,50.14,0,0,0-1.56,5.44,10.55,10.55,0,0,0-.27,1.72,5.76,5.76,0,0,0,1.14,1.16,6.89,6.89,0,0,0,4.49,1.34c.44,0,.88-.06,1.31-.1A20,20,0,0,1,31.18,147.94Z"/>
+                <path class="cls-19"
+                      d="M34.64,155.34l.28-.1a9.11,9.11,0,0,1,.65-4.7V150a6.46,6.46,0,0,1,.68-3,12.36,12.36,0,0,1-1.45.5,11.63,11.63,0,0,1-3.63.43,20,20,0,0,0-1.68,8.35,34.16,34.16,0,0,0,3.59-.52A12.5,12.5,0,0,0,34.64,155.34Z"/>
+                <rect class="cls-9" x="35.52" y="129.61" width="0.01" height="0.01"/>
+                <path class="cls-9" d="M33.89,11.7h0a12.79,12.79,0,0,0-1,1A10.09,10.09,0,0,1,33.89,11.7Z"/>
+                <path class="cls-9" d="M25.44,142.73h0c-.07.17-.15.33-.22.5l.21-.51Z"/>
+                <path class="cls-9" d="M25.19,143.28l-.17.46v0Z"/>
+                <circle class="cls-7" cx="63.02" cy="48.47" r="1.62"/>
+                <circle class="cls-7" cx="64.01" cy="51.01" r="0.33"/>
+                <path class="cls-11" d="M83.79,40.51v0Z"/>
+                <path class="cls-11"
+                      d="M90.14,55.56a10.5,10.5,0,0,0,3-7.37c.16-3.84-2.37-8.07-5.21-9h0a10.76,10.76,0,0,0-3.88,1.08l-.06,0h0a1,1,0,0,0-.19.17v0c-.17.67-.31,1.33-.43,1.95-.07.4-.13.78-.19,1.15a27.25,27.25,0,0,0,1.47,13A25.69,25.69,0,0,0,88.46,56Q89.27,55.85,90.14,55.56Z"/>
+                <path class="cls-11"
+                      d="M83.17,43.63c-.47,2.86-.6,4.8-.63,4.93s-.29,2.28-.46,5.53h0a4.1,4.1,0,0,0,1.86,2.61h.18l.52-.05A27.25,27.25,0,0,1,83.17,43.63Z"/>
+                <path class="cls-7" d="M84.52,45.18a1.46,1.46,0,0,0-.64,2,1.45,1.45,0,1,0,.64-2Z"/>
+                <circle class="cls-7" cx="83.75" cy="48.93" r="0.34"/>
+                <g id="_Group_2" data-name="&lt;Group&gt;">
+                    <path class="cls-20" d="M104.06,10.83l.19-.13-.18.19A.13.13,0,0,0,104.06,10.83Z"/>
+                    <path class="cls-20"
+                          d="M105.27,10.11l-1.23.68a.59.59,0,0,0-.16-.15.48.48,0,0,0-.16-.07,4.35,4.35,0,0,0-.17-.68s.1-.09.27-.17h0l.23,0A1.34,1.34,0,0,1,105.27,10.11Z"/>
+                    <path class="cls-20"
+                          d="M103.14,17.27c-.08-.15-.16-.31-.25-.45h0c.11-.76.43-2.06.74-3.32a8.5,8.5,0,0,0,.15-2.54,2,2,0,0,0-.06-.38.48.48,0,0,1,.16.07.59.59,0,0,1,.16.15l-.13.07v0h0l.12-.07a.13.13,0,0,1,0,.06l.18-.19-.19.13,0,0,1.23-.68a1.34,1.34,0,0,0-1.19-.41l-.23,0a4.88,4.88,0,0,1,.49-.22c.44-.2.86-.23.88-.13a5.35,5.35,0,0,1,.17,1.51,8.72,8.72,0,0,1-.57,2.95A21.92,21.92,0,0,1,103.14,17.27Z"/>
+                    <path class="cls-20"
+                          d="M102.89,16.82c.09.14.17.3.25.45-.1.15-.18.21-.23.19S102.84,17.19,102.89,16.82Z"/>
+                    <path class="cls-20"
+                          d="M103,36.34c.06-1.36,0-2.73.06-3.28h0a.43.43,0,0,0,.09-.1,21.36,21.36,0,0,1,.25,3.4c0,.9,0,1.8,0,2.48s-.09,1.15-.09,1.18,0,.49-.19,1.17a21.67,21.67,0,0,1-.55,2.42c-.26.87-.57,1.7-.82,2.32a5,5,0,0,1-.46,1c-.08,0,.37-1.45.76-3,0,.23.07.35.1.35s.08-.39.08-1.09c.16-.77.3-1.51.36-2.11s.13-1.12.14-1.15.06-.48.13-1.15S103,37.23,103,36.34Z"/>
+                    <path class="cls-20"
+                          d="M102.65,18.15a18.22,18.22,0,0,1-1-3.1,5.26,5.26,0,0,1,1.23,1.76h0c0,.37,0,.61,0,.64s.13,0,.23-.19c.1.18.19.37.28.56a17.58,17.58,0,0,1,.89,2.14c.2.6.29,1.05.31,1.07a8.91,8.91,0,0,1,.09,1.14,11.72,11.72,0,0,1-.32,2.33,9,9,0,0,1-1,3.13,17.69,17.69,0,0,1,.18-3.24,15.48,15.48,0,0,0,.07-2.17,9.31,9.31,0,0,0-.18-1s0-.43-.19-1S102.91,18.91,102.65,18.15Z"/>
+                    <path class="cls-20"
+                          d="M103.72,10.57a2.94,2.94,0,0,0-2,.19,5.22,5.22,0,0,0-2,1.32,2.11,2.11,0,0,0-.41.62l-.9-1.28a5.07,5.07,0,0,0,.78-.15,22.43,22.43,0,0,0,2.34-.88,9.76,9.76,0,0,1,2.27-.67c-.17.08-.27.13-.27.17A4.35,4.35,0,0,1,103.72,10.57Z"/>
+                    <path class="cls-20" d="M99.91,58.22l.36-1.36c.46.47.87.9.92.94Z"/>
+                    <path class="cls-20"
+                          d="M102.49,5.27a6.64,6.64,0,0,1,3.37.37,4.42,4.42,0,0,1,2.26,2.49,9.82,9.82,0,0,1,.61,2.4c.17,1.36.2,2.17.2,2.24a32.56,32.56,0,0,1-.15,3.55,41,41,0,0,1-1.39,7.27,37.49,37.49,0,0,1-2.64,6.79A14.37,14.37,0,0,1,103.19,33q0-.15-.06-.15a.87.87,0,0,0,0,.25h0c-.07.07-.11.09-.14.08s.33-1.28,1-3.12a51.9,51.9,0,0,0,1.87-6.82,45.39,45.39,0,0,0,.85-7,32.9,32.9,0,0,0,0-3.32c0-.06,0-.88-.08-2.06S106.19,8,105,7.38A5,5,0,0,0,102.59,7c-.93,0-1.92.14-2.89.25s-1.93.2-2.82.28l-.32,0H96l-.8,0,.69,1.17c.27.44.39.71.33.76S96,9.36,95.57,9s-.85-.84-1.49-1.55l.4.1c.33.11.57.15.62.06s0-.26-.33-.57c-.1-.08-.22-.17-.34-.28l2.29-.43c.86-.18,1.8-.35,2.74-.56A25.85,25.85,0,0,1,102.49,5.27Z"/>
+                    <path class="cls-20"
+                          d="M103.39,76.71c0,.08-.55-.1-1.33-.28s-1.84-.37-2.91-.52-2.15-.27-3-.34-1.39-.1-1.43-.12l-1.4-.16a9.05,9.05,0,0,0-2.87.07,24.77,24.77,0,0,0-2.55.6,5.23,5.23,0,0,0,0-.56,16.7,16.7,0,0,1,2.37-.84,10.33,10.33,0,0,1,1.64-.32,12.55,12.55,0,0,1,1.48,0c.84,0,1.42.07,1.45.07s.61.07,1.44.21,1.91.34,3,.6a18.54,18.54,0,0,1,2.9.9C103,76.32,103.43,76.64,103.39,76.71Z"/>
+                    <path class="cls-20"
+                          d="M91.44,73.37c-.74.1-1.72.27-2.69.48l-1.06.24c-.06-.23-.12-.45-.19-.67.33-.13.68-.25,1-.37,1-.32,2-.58,2.71-.75S92.51,72,92.55,72s.56-.07,1.35-.09a17,17,0,0,1,2.83.16,12.85,12.85,0,0,1,3.89,1c-.05.23-2-.18-4-.2A20.27,20.27,0,0,0,94,73c-.74.07-1.22.18-1.26.18S92.17,73.25,91.44,73.37Z"/>
+                    <path class="cls-20"
+                          d="M89.08,76.73l.23,0a5.41,5.41,0,0,1,.58.13c.42.14,1,.33,1.52.57,1.09.46,2,1.11,2,1.26a9.36,9.36,0,0,1-2.24-.48c-.54-.12-1.09-.23-1.5-.3S89,77.9,89,77.9s-.28,0-.68-.06q-.35,0-.78,0h0a7.68,7.68,0,0,0,.32-1A6.47,6.47,0,0,1,89.08,76.73Z"/>
+                    <path class="cls-20"
+                          d="M103.73,51.13l-1.22,1.62-.65.86-.24.35.29.14.83.48,2.93,1.73c-1.64.56-3.18,1-4.48,1.49,0,0-.46-.47-.92-.94l-.36,1.36,1.28-.42h0c-.06.27-.12.48-.15.63s0,.05,0,.07c-.14.57-.16.66-.18.71l-.16.1a3.73,3.73,0,0,0-.46.28l-.43.34a7.61,7.61,0,0,0-1.27,1.51C97.62,62.9,96.44,65.05,95,67a15.6,15.6,0,0,1-2.41,2.64,8,8,0,0,1-1.39.93c-.45.24-.89.45-1.28.65a7.32,7.32,0,0,1-2.81,1,20.32,20.32,0,0,1,2.47-1.56,13.33,13.33,0,0,0,2.35-1.71A15,15,0,0,0,94,66.25c1.27-1.94,2.25-4,3.17-5.66a9.77,9.77,0,0,1,1.48-1.91c.22-.2.42-.36.55-.47h0s0-.08-.14-.2l-.68-.82c0-.09.07-.19.11-.29l.92-.26,2-.55.51-.15h.1l.26,0-.26-.23-2.14-1.39L101,52.9l.72-.81,1.36-1.5c.65-.73,1.26-1.38,1.75-1.9l.66-.08-.23-.36-.43.44a39.61,39.61,0,0,1-4.06.2,7.15,7.15,0,0,1,.72-.11,35.48,35.48,0,0,0,3.89-.61L106,48l-.39.58C105.16,49.19,104.5,50.1,103.73,51.13Z"/>
+                    <path class="cls-20"
+                          d="M87,74.28l.73-.19c.07.25.12.5.17.76a3.45,3.45,0,0,1,.07.55c-.35.16-.66.3-.92.45a3.84,3.84,0,0,0,0-.9C87,74.73,87,74.5,87,74.28Z"/>
+                    <path class="cls-20"
+                          d="M87.69,74.09l-.73.19a5.58,5.58,0,0,0-.09-.61c.2-.09.41-.17.63-.25C87.57,73.64,87.63,73.86,87.69,74.09Z"/>
+                    <path class="cls-20"
+                          d="M87.93,76l-1,.29c0-.13.06-.26.08-.4.26-.15.57-.29.92-.45A5.23,5.23,0,0,1,87.93,76Z"/>
+                    <path class="cls-20"
+                          d="M87.83,76.81a6.54,6.54,0,0,0-1.16.25,4,4,0,0,0,.26-.81l1-.29A5.65,5.65,0,0,1,87.83,76.81Z"/>
+                    <path class="cls-20"
+                          d="M86.67,77.06a6.54,6.54,0,0,1,1.16-.25,7.68,7.68,0,0,1-.32,1h0l-.73,0-.57.06c.09-.15.2-.33.31-.55Z"/>
+                    <path class="cls-20"
+                          d="M86.28,76.36s.25-.26.73-.51c0,.14-.05.27-.08.4C86.54,76.35,86.3,76.41,86.28,76.36Z"/>
+                    <path class="cls-20"
+                          d="M87,72.18a10.81,10.81,0,0,1,.47,1.24c-.22.08-.43.16-.63.25-.08-.51-.19-1-.28-1.37a2.4,2.4,0,0,0-.31-.75c-.12-.15-.25-.18-.24-.23s.15-.1.38,0a2,2,0,0,1,.6.79v0Z"/>
+                    <path class="cls-20"
+                          d="M84.88,74.71a6.44,6.44,0,0,1,2-1,5.58,5.58,0,0,1,.09.61A7.16,7.16,0,0,1,84.88,74.71Z"/>
+                    <path class="cls-20"
+                          d="M85.42,76.25a.2.2,0,0,1,0,.11c0,.07-.06.12-.08.16s-.11,0-.09,0l0,0,0,0,0,0a1.67,1.67,0,0,1-.12-.13.62.62,0,0,0,.26,0S85.41,76.21,85.42,76.25Z"/>
+                    <path class="cls-20"
+                          d="M85.41,76.36a.2.2,0,0,0,0-.11s-.06,0-.08,0a.62.62,0,0,1-.26,0,1.67,1.67,0,0,0,.12.13l0,0,0,0,0,0s0,.14.09,0S85.38,76.43,85.41,76.36Zm.12-.32c.16-.05,0,.86-.25.9s-.44-.52-.22-.72A3.37,3.37,0,0,1,85.53,76Z"/>
+                    <path class="cls-20"
+                          d="M84.52,78.1c-.06-.16,1-.71,2.1-1h0l-.15.33c-.11.22-.22.4-.31.55C85.32,78.06,84.56,78.22,84.52,78.1Z"/>
+                    <path class="cls-20"
+                          d="M91.89,6.73c-1.15-.42-2.51-1-4-1.53a27.61,27.61,0,0,0-3.84-1,5.14,5.14,0,0,1,1.61-.56l-.75-1.95,0-.09a22.66,22.66,0,0,1,3.8,1.55,38.75,38.75,0,0,1,3.83,2.28c.8.52,1.43,1,1.89,1.32l-.84.16c.16.19.33.36.49.53C93.54,7.32,92.79,7.06,91.89,6.73Z"/>
+                    <path class="cls-20"
+                          d="M85.28,76.94c.22,0,.41-1,.25-.9a3.37,3.37,0,0,0-.47.18s.11-.12.38-.23c.06,0,.14-.11.2-.06a.32.32,0,0,1,.1.2,1.33,1.33,0,0,1-.1.68c-.1.25-.26.39-.47.36a.6.6,0,0,1-.41-.41.69.69,0,0,1,0-.68s.16,0,.26.14C84.84,76.42,85.06,77,85.28,76.94Z"/>
+                    <path class="cls-20"
+                          d="M90.15,55.57A5.92,5.92,0,0,1,87,57.13,4.68,4.68,0,0,1,84,56.71h.17A25.79,25.79,0,0,0,88.46,56C89,55.91,89.56,55.75,90.15,55.57Z"/>
+                    <path class="cls-20"
+                          d="M84.13,73.93c-.09,0-.13,0-.08-.06l.08,0a1.34,1.34,0,0,0-.19-.23c0,.05.17.05.29.05s.1.08,0,.15A.4.4,0,0,1,84.13,73.93Z"/>
+                    <path class="cls-20"
+                          d="M85.23,39.5a3.26,3.26,0,0,1,2.7-.27,11,11,0,0,0-3.88,1.08l-.06,0A7.65,7.65,0,0,1,85.23,39.5Z"/>
+                    <path class="cls-20"
+                          d="M83.94,74.21c-.43.09-.48-.13,0-.61a1.34,1.34,0,0,1,.19.23l-.08,0s0,.1.08.06a.4.4,0,0,0,.13-.13c.07-.07,0-.19,0-.15s-.28,0-.29-.05l.4-.1C84.75,73.39,84.37,74.12,83.94,74.21Z"/>
+                    <path class="cls-20"
+                          d="M82.69,41.05A6,6,0,0,1,84,39.9l-.15.52C83.06,40.78,82.74,41.05,82.69,41.05Z"/>
+                    <path class="cls-20"
+                          d="M83.59,74.44a.34.34,0,0,1-.24-.43.94.94,0,0,1,.23-.43l.11-.14s.14,0,.25.16c-.48.48-.43.7,0,.61s.81-.82.4-.71l-.4.1s.14-.11.45-.2a.2.2,0,0,1,.21,0,.3.3,0,0,1,.07.23,1,1,0,0,1-.38.61A.81.81,0,0,1,83.59,74.44Z"/>
+                    <path class="cls-20"
+                          d="M85.63,3.67A5.14,5.14,0,0,0,84,4.23c-.4-.09-.81-.16-1.22-.22-.21,0-.42-.06-.64-.11.16-.15.31-.29.46-.41a16.83,16.83,0,0,1,2.26-1.77Z"/>
+                    <path class="cls-20"
+                          d="M82.08,54.09a20.38,20.38,0,0,1-.43-6.4c.18-4,.62-5.83,2.14-7.18-.16.68-.31,1.34-.42,2-.64,3.48-.79,5.92-.82,6.07S82.26,50.85,82.08,54.09Z"/>
+                    <path class="cls-20"
+                          d="M87,57.13a5.92,5.92,0,0,0,3.14-1.56,21.23,21.23,0,0,0,4-1.72,9.69,9.69,0,0,0,1.36-.94,3.51,3.51,0,0,0,.59-.56l.13-.13a.52.52,0,0,0,0-.12,2.49,2.49,0,0,0,.13-.36,12.37,12.37,0,0,0,.31-3.46c-.09-2.33-1.54-4.38-2.84-6.2a7.2,7.2,0,0,0-2.34-2,7.81,7.81,0,0,0-2.71-.79,5.4,5.4,0,0,0-.9,0h0a3.26,3.26,0,0,0-2.7.27,7.65,7.65,0,0,0-1.24.84h0a.65.65,0,0,1-.17.08L84,39.9a4.83,4.83,0,0,1,.56-.36,8,8,0,0,1,4.37-.75,8.22,8.22,0,0,1,2.92.74,7.54,7.54,0,0,1,2.61,2.16,22.79,22.79,0,0,1,2,3,8.23,8.23,0,0,1,1.13,3.59A13.21,13.21,0,0,1,97.3,52a4,4,0,0,1-.16.49,1.55,1.55,0,0,1-.15.28,1.73,1.73,0,0,1-.17.21,6.05,6.05,0,0,1-.67.67,11.29,11.29,0,0,1-1.49,1.06,23.45,23.45,0,0,1-5.93,2.39,26.1,26.1,0,0,1-4.51.76,7,7,0,0,1-1.94-.08.79.79,0,0,1-.31-.13q0-.48,0-.93a.72.72,0,0,1,.52-.09,5.9,5.9,0,0,0,1.45.1h0A4.68,4.68,0,0,0,87,57.13Z"/>
+                    <path class="cls-20"
+                          d="M81.82,109a.52.52,0,0,0,0-.11,1.49,1.49,0,0,0,.6-.16,3.44,3.44,0,0,0,.74-.53c.26-.21.5-.45.47-.73a3.88,3.88,0,0,0-.83-1.66,1.19,1.19,0,0,0-.64-.41s-.05-.11-.05-.23v-.06c0-.17.07-.3.17-.28s.13,0,.32.12a1.92,1.92,0,0,1,.6.51,3.52,3.52,0,0,1,.52.87,2.87,2.87,0,0,1,.32,1.14,1,1,0,0,1-.25.62,1.81,1.81,0,0,1-.43.37,2.92,2.92,0,0,1-.85.48A1.32,1.32,0,0,1,81.82,109Z"/>
+                    <path class="cls-20"
+                          d="M87.51,77.84a6.14,6.14,0,0,1-1.6,2.29,12.3,12.3,0,0,1-2.28,1.78,4,4,0,0,1-1,.4h0a5.3,5.3,0,0,1-1.82.11c-.76-.08-1.24-.27-1.24-.35s.52,0,1.25-.1a4.78,4.78,0,0,0,2.4-.77,12.79,12.79,0,0,0,1.94-1.81c.48-.56.74-1,.76-1s.14-.19.33-.48l.57-.06Z"/>
+                    <path class="cls-20" d="M81.82,109c-.16,0-.24-.07-.24-.09s.1,0,.26,0A.52.52,0,0,1,81.82,109Z"/>
+                    <path class="cls-20"
+                          d="M81.71,102.42a4.8,4.8,0,0,1-.08-2.34c0,.26.08.51.13.75s.1.71.14,1S81.76,102.42,81.71,102.42Z"/>
+                    <path class="cls-20"
+                          d="M102.22,42.67c0,.2,0,.38,0,.53s0,.2-.07.3-.07.3-.11.44c0-.27-.11-.69-.19-1.25s-.14-1.11-.24-1.81a13.27,13.27,0,0,0-.83-2.16,8.35,8.35,0,0,0-1.73-2.09,12.53,12.53,0,0,0-2.37-1.92,11.2,11.2,0,0,0-6.38-1.26,6.5,6.5,0,0,0-2.86,1.31,10,10,0,0,0-2.22,2.29A7.85,7.85,0,0,0,84,39.73a1,1,0,0,0,0,.17,6,6,0,0,0-1.27,1.15s.37-.27,1.12-.63a.29.29,0,0,0,0,.09c-1.52,1.35-2,3.16-2.14,7.18a20.38,20.38,0,0,0,.43,6.4h0l0,.58c0,.65-.08,1.32-.08,2a.52.52,0,0,0,0,.93c0,1,.1,2,.23,3a24.19,24.19,0,0,0,1.74,6.51l.18.39.13.28a.17.17,0,0,0,.22.13l.27,0,.25-.14c.24-.13.48-.3.72-.45.94-.63,1.87-1.3,2.76-1.94,1.78-1.29,3.42-2.53,4.82-3.61s2.52-2,3.3-2.64l1-1.26c.61-.77.82-2.67,1.76-4.81.11-.27.24-.57.35-.88.4-1,.77-2.28,1.06-3.29h0c-.38,1.45-.92,3.47-1.43,5.22-.31,1.1-.62,2.1-.85,2.78l-.28.08.17.21a2.58,2.58,0,0,1-.17.42c-.68,1.47-4.5,4.7-4.5,4.7-1.32,1.17-2.91,2.49-4.64,3.86-.88.69-1.77,1.39-2.74,2.08-.24.17-.48.34-.75.51a2.46,2.46,0,0,1-.52.27,2.62,2.62,0,0,1-.58.12,1.06,1.06,0,0,1-1.21-.56l-.26-.5-.2-.4a28.23,28.23,0,0,1-2.38-13.06c.09-3.63.36-6.09.37-6.25s.24-2.62,1-6.21a26.08,26.08,0,0,1,.74-2.88A9.58,9.58,0,0,1,84,36.2a11.5,11.5,0,0,1,2.62-2.54,7.6,7.6,0,0,1,3.56-1.45,12.07,12.07,0,0,1,7,1.66A12.3,12.3,0,0,1,99.65,36a8.79,8.79,0,0,1,1.76,2.38,13.16,13.16,0,0,1,.73,2.39C102.19,41.54,102.21,42.15,102.22,42.67Z"/>
+                    <path class="cls-20"
+                          d="M80.61,93.1a4,4,0,0,1,2.3,1.26,2.35,2.35,0,0,1,.42.9c.06.24.06.39.07.4a4.9,4.9,0,0,1-.15,1.25c-.17.7-.45,1.44-.67,2.26-.3,1-.52,2-.68,2.67,0-.3-.08-.64-.14-1s-.09-.49-.13-.75.07-.71.14-1.09c.11-.83.35-1.72.43-2.28a3.07,3.07,0,0,0,0-.7A3.29,3.29,0,0,0,82,95a3.25,3.25,0,0,0-1.68-1.08l-.18-.07c-.09-.33-.17-.64-.26-.95A5.21,5.21,0,0,0,80.61,93.1Z"/>
+                    <path class="cls-20"
+                          d="M81.34,80.86a1.25,1.25,0,0,1-1,.33.9.9,0,0,1-.42-.14.57.57,0,0,0,.16-.11.69.69,0,0,0,.22-.19h0a1.07,1.07,0,0,0,.77-.23c.23-.14.48-.37.7-.49s.15-.1.26-.08a.11.11,0,0,1,.07,0h0a.07.07,0,0,1,0,.08v0s0,.06-.07,0C82,80.15,81.7,80.5,81.34,80.86Z"/>
+                    <path class="cls-20"
+                          d="M80.1,80.94a.57.57,0,0,1-.16.11h0l0,0s0,0,.05-.09.11,0,.11-.1h0a.56.56,0,0,1,.18-.12l.09,0A.69.69,0,0,1,80.1,80.94Z"/>
+                    <path class="cls-20"
+                          d="M80.12,95.79a.48.48,0,0,1,.29.68,6,6,0,0,1-.65.82l-.25.24c-.15-.4-.29-.8-.45-1.21.24-.29.35-.47.37-.48C79.53,95.68,79.82,95.66,80.12,95.79Z"/>
+                    <path class="cls-20"
+                          d="M80.45,94.88c.46,1.84.9,3.68,1.18,5.2a4.8,4.8,0,0,0,.08,2.34c.05,0,.11-.21.19-.58.13,1.08.1,1.77,0,1.79s-.47-.89-1-2.27h0q0-.12-.09-.27c-.36-1-.81-2.23-1.29-3.54l.25-.24a6,6,0,0,0,.65-.82.48.48,0,0,0-.29-.68c-.3-.13-.59-.11-.69,0,0,0-.13.19-.37.48-.1-.3-.22-.6-.33-.91-.19-.5-.38-1-.56-1.5l.21,0,.58-.15-.63-1.18a6.24,6.24,0,0,0,1.84,1.29Z"/>
+                    <path class="cls-20"
+                          d="M78.16,93.91c-.21-.56-.42-1.12-.63-1.65a.52.52,0,0,0,.11-.08l.23-.18a4.21,4.21,0,0,0,.44.52s0,0,0,0L79,93.71l-.58.15-.21,0Z"/>
+                    <path class="cls-20"
+                          d="M79.91,92.87c.09.31.17.62.26.95a6.24,6.24,0,0,1-1.84-1.29s0,0,0,0L78,91.88l-.1.12c-.15-.2-.2-.34-.16-.37S78.69,92.38,79.91,92.87Z"/>
+                    <path class="cls-20"
+                          d="M76.63,7.66a12.27,12.27,0,0,0-1.84-2.74c-.18-.19-.34-.36-.5-.51l1.55-.31a22.07,22.07,0,0,1,1.49,3.12,10.71,10.71,0,0,1,.36,1.09,5.65,5.65,0,0,1,.19.89q0,.48.09,1c0,.18,0,.36.06.56l0,.28v.14c0,.07,0,0,0-.07s.07-.24.14-.46c.26-.76.53-1.48.77-2.09a21.27,21.27,0,0,1,1.09-2.24,9,9,0,0,1,1.29-1.73c.26-.26.51-.5.75-.71.22.05.43.08.64.11.41.06.82.13,1.22.22-.23.1-.47.23-.74.38A13.48,13.48,0,0,0,82,5.46a6.44,6.44,0,0,0-1.26,1.39A13.94,13.94,0,0,0,79.51,9a29.44,29.44,0,0,0-1.34,3.58l-.27.87s0,.07-.05,0l0-.23-.07-.45c0-.29-.07-.58-.11-.87-.08-.57-.16-1.13-.23-1.66a10.06,10.06,0,0,0-.36-1.59A9.74,9.74,0,0,0,76.63,7.66Z"/>
+                    <path class="cls-20"
+                          d="M76.69,90c-.3-.79-.55-1.47-.75-2l1.9.32a3,3,0,0,1-.33.64A4.47,4.47,0,0,1,76.69,90Z"/>
+                    <path class="cls-20"
+                          d="M80.41,80.49a.29.29,0,0,1-.08.26h0l-.09,0a.56.56,0,0,0-.18.12h0a.1.1,0,0,0,0-.07c0,.07,0,.07,0,.07s0,.09-.11.1-.05.08-.05.09l0,0a6.06,6.06,0,0,1-1.23.49,3.18,3.18,0,0,1-1.61.1,1.21,1.21,0,0,1-.55-.33,3.42,3.42,0,0,0,.59-.26.29.29,0,0,0,.12.07,2.68,2.68,0,0,0,1.36,0A6.55,6.55,0,0,0,80,80.75c.18-.08.3-.17.31-.24a.49.49,0,0,0,0-.16S80.36,80.33,80.41,80.49Z"/>
+                    <path class="cls-20"
+                          d="M82.68,82.42s-.13.5-.64,1.07A5.22,5.22,0,0,1,79.67,85a7.59,7.59,0,0,1-1.81.32.2.2,0,0,1,0-.07.57.57,0,0,0-.56-.54l-.88.35,0-.72c.07,0,.15-.09.22-.15a3.29,3.29,0,0,0,.36.07,8.13,8.13,0,0,0,2.49-.06,5.52,5.52,0,0,0,2.28-1c.44-.33.73-.66.87-.73l0,0Z"/>
+                    <path class="cls-20"
+                          d="M76.38,81.14s.06-.12.19-.24.25-.14.28-.11a.79.79,0,0,0,.27.26,3.42,3.42,0,0,1-.59.26A1.52,1.52,0,0,1,76.38,81.14Z"/>
+                    <path class="cls-20"
+                          d="M76.39,84.33v-.15h0a.08.08,0,0,0,0,0h0l.14,0h.06C76.54,84.24,76.46,84.28,76.39,84.33Z"/>
+                    <path class="cls-20" d="M76.32,85.09l.09,0v0h-.09Z"/>
+                    <path class="cls-20"
+                          d="M76.25,84.84a.36.36,0,0,1-.07-.19c0-.05-.05-.08-.06-.08s.06,0,.08-.09l0,0,.15-.11,0,.72-.09,0h0A2.07,2.07,0,0,0,76.25,84.84Z"/>
+                    <path class="cls-20" d="M76.39,84.33l-.15.11a.72.72,0,0,0,.12-.21l0,0Z"/>
+                    <path class="cls-20"
+                          d="M75.8,87.66c-.11-.29-.19-.49-.23-.58a11,11,0,0,0,1.89-1,.75.75,0,0,0,.33-.43c.19.65.63,2.08,1,3.32s.73,2.47,1.12,3.91c-1.22-.49-2.12-1.32-2.2-1.24s0,.17.16.37l-.23.18a.52.52,0,0,1-.11.08c-.3-.81-.58-1.57-.84-2.25a4.47,4.47,0,0,0,.82-1,3,3,0,0,0,.33-.64L75.94,88s0,0,0,0h0A.51.51,0,0,0,75.8,87.66Z"/>
+                    <path class="cls-20"
+                          d="M76.05,85.2l-.08,0s.2,0,.2,0l.13,0h.11v0l.88-.35a.57.57,0,0,1,.56.54.2.2,0,0,0,0,.07h-.17c0-.09-.09-.07-.19,0a4.41,4.41,0,0,1-.63,0,4.21,4.21,0,0,1-.55-.06A2.14,2.14,0,0,1,76.05,85.2Z"/>
+                    <path class="cls-20"
+                          d="M76,108a.46.46,0,0,1-.1-.41c.06-.22.16-.3.19-.29s0,.15,0,.3.14.21.29.19a1.24,1.24,0,0,0,.43-.3l.2-.22c0-.06,0,0,.1-.06s0,0-.08-.08l-.44-.17c-.27-.13-.44-.17-.47-.2s.25-.14.54-.09a3.7,3.7,0,0,1,.48.07,6.24,6.24,0,0,1,.8.23,6.35,6.35,0,0,1-.51.7,1.71,1.71,0,0,1-1,.52A.62.62,0,0,1,76,108Z"/>
+                    <path class="cls-20"
+                          d="M75.55,87c-.1-.3.35-.72,1-1a3,3,0,0,0,.94-.74,1.2,1.2,0,0,0,.19,0s0,.14.1.32a.75.75,0,0,1-.33.43,11,11,0,0,1-1.89,1Z"/>
+                    <path class="cls-20"
+                          d="M75.78,85.07a.55.55,0,0,1-.19-.24c.22-.12.34-.19.34-.23l.31-.16,0,0s0,.09-.08.09.08,0,.06.08a.36.36,0,0,0,.07.19,2.07,2.07,0,0,1,.06.24h0l-.13,0s-.2,0-.2,0l-.1,0Z"/>
+                    <path class="cls-20"
+                          d="M75.53,84.65a.38.38,0,0,1,0-.1.57.57,0,0,1,.23-.45.53.53,0,0,1,.16-.1h0l.16,0,.16,0h.11v.25h0l0,0a.72.72,0,0,1-.12.21l-.31.16A.87.87,0,0,0,75.53,84.65Z"/>
+                    <path class="cls-20"
+                          d="M73.76,1.79a2.4,2.4,0,0,1,.81.54,8.45,8.45,0,0,1,1.24,1.72l0,0-1.55.31a3.24,3.24,0,0,0-.81-.59,1.72,1.72,0,0,0-.2,0s0-.12,0-.16a.65.65,0,0,1,0-.1Z"/>
+                    <path class="cls-20"
+                          d="M76.53,81.31a3.19,3.19,0,0,1-1.46.16,1.73,1.73,0,0,1-1.28-1,3.51,3.51,0,0,1-.33-1.41,3.64,3.64,0,0,1,.87-2.37,4.52,4.52,0,0,1,1.41-1.12,5.94,5.94,0,0,1,.64-.31,8.11,8.11,0,0,1,1.23-.36,4.63,4.63,0,0,1,.65-.09,1.49,1.49,0,0,1,.52.07A1.16,1.16,0,0,0,79,75h.2l.3-.09.36-.11.2-.05a1.64,1.64,0,0,1,.28-.07,6.38,6.38,0,0,1,1.84.06,2.44,2.44,0,0,1,1,.39,3.33,3.33,0,0,1,.74.71,2.16,2.16,0,0,1,.42,1,1.22,1.22,0,0,1-.4,1.09c-.56.39-.78.47-1,1.32a1.15,1.15,0,0,1-.41.54,1.22,1.22,0,0,1-.28.14.33.33,0,0,1-.15,0,.08.08,0,0,1-.07,0,0,0,0,0,1,0-.05,1.61,1.61,0,0,1,.1-.36.46.46,0,0,0,0-.2c0-.09-.09,0-.06-.39,0-.1,0-.07,0-.08H82l-.15,0-.25.1c-.15,0-.23.06-.24,0s0-.07.17-.18a.94.94,0,0,1,.67-.25c.17.16,0,.37,0,.54s.11,0,.15,0a.62.62,0,0,0,.14-.14.58.58,0,0,0,.13-.38v-.06a.77.77,0,0,1,0-.15.7.7,0,0,1,.08-.16,1.37,1.37,0,0,1,.13-.2,2.12,2.12,0,0,1,.33-.34c.11-.11.26-.21.31-.26.26-.23.14-.68-.2-1.07a1.91,1.91,0,0,0-.57-.49,1.56,1.56,0,0,0-.66-.22,5.82,5.82,0,0,0-1.56,0l-.11,0-.19.08-.37.12L79.4,76a2.24,2.24,0,0,1-1-.08s0,0-.11,0a2.7,2.7,0,0,0-.48.09,7,7,0,0,0-1,.34,4.54,4.54,0,0,0-1.68,1.05,2.66,2.66,0,0,0-.7,1.68,2.58,2.58,0,0,0,.17,1,.87.87,0,0,0,.64.56,3.08,3.08,0,0,0,2.11-.52,4,4,0,0,0,.45-.31l.19-.16s.09-.08.12-.12a.35.35,0,0,0,.11-.27c0-.09-.12-.13-.21-.17a2.16,2.16,0,0,0-.71-.06.75.75,0,0,0-.52.18,1.22,1.22,0,0,0-.22.34c-.06.1-.13.12-.14.11s0-.07,0-.15a1,1,0,0,1,.15-.45,1,1,0,0,1,.66-.37,2.62,2.62,0,0,1,1,0,.68.68,0,0,1,.51.37.75.75,0,0,1-.13.68,2.26,2.26,0,0,1-.23.31l-.23.23a3.88,3.88,0,0,1-.49.4,5.8,5.8,0,0,1-.59.36.79.79,0,0,1-.27-.26s-.17,0-.28.11-.21.21-.19.24A1.52,1.52,0,0,0,76.53,81.31Z"/>
+                    <path class="cls-20"
+                          d="M76.45,121.15c-.7,1-1.47,2-2.29,3.07l-.3.37q.26-.45.51-.93c1-1.81,2-3.64,2.19-3.55S76.6,120.55,76.45,121.15Z"/>
+                    <path class="cls-20"
+                          d="M75.81,4.05a8.45,8.45,0,0,0-1.24-1.72,2.4,2.4,0,0,0-.81-.54L73.63.66C74.74.54,75.92.4,77.14.34A19,19,0,0,1,80.4.43c.29,0,.61.12.9.18L82,.8l1.4.38c.5.14,1,.29,1.49.45l0,.09a16.83,16.83,0,0,0-2.26,1.77c-.15.12-.3.26-.46.41l-.79-.12-.72-.1a3.2,3.2,0,0,0-.56-.06,17.54,17.54,0,0,0-2.62.2c-.55.08-1.09.18-1.63.28Z"/>
+                    <path class="cls-20"
+                          d="M74.79,121a.46.46,0,0,1-.38.23c-.12,0-.16-.06-.16-.08s.23,0,.31-.29.08-.28.13-.46a2,2,0,0,0,.06-.39s0,0,0,0-.13.06-.13.06l-.34.11a7.69,7.69,0,0,0-.74.3,5.65,5.65,0,0,1-1.09.45c-.05-.06.38-.48.88-.81a6.3,6.3,0,0,1,1.1-.6,1.88,1.88,0,0,1,.36-.09c.26-.08.63.08.54.45a5.09,5.09,0,0,1-.23.64A2.45,2.45,0,0,1,74.79,121Z"/>
+                    <path class="cls-20"
+                          d="M74,114.08a7.48,7.48,0,0,1,1.64-1.14l.17-.08h0a.07.07,0,0,0,.06,0l-.06,0h-.44a4.26,4.26,0,0,0-.5,0,8.48,8.48,0,0,0-1.8.54,2.05,2.05,0,0,1-.64.16c-.17,0-.25-.08-.24-.09s.09,0,.23,0a2.43,2.43,0,0,0,.56-.25,6.88,6.88,0,0,1,1.83-.74,2.72,2.72,0,0,1,.55-.06l.59,0c.62,0,1.25,0,1.31.11a.3.3,0,0,1,0,.51,1.51,1.51,0,0,1-.36.17c-.16,0-.32.11-.53.17l-.31.1a.88.88,0,0,0-.2.07,8.51,8.51,0,0,0-1.62,1,1.55,1.55,0,0,1-1.07.39,1.47,1.47,0,0,1-.8-.58,1,1,0,0,1-.32-.6c0-.21.18-.23.17-.21s-.07.08,0,.2a1.16,1.16,0,0,0,.35.46,1.33,1.33,0,0,0,.68.4C73.42,114.51,73.7,114.29,74,114.08Z"/>
+                    <path class="cls-20"
+                          d="M75.57,84.79a6.85,6.85,0,0,1-1.38.5,13.69,13.69,0,0,1-3.6.48A11.15,11.15,0,0,0,73,85.28a23.2,23.2,0,0,1,2.5-.63.22.22,0,0,0,0,.13Z"/>
+                    <path class="cls-20"
+                          d="M70.68,86.78c-.11-.1-.27-.17-.33-.26a0,0,0,0,0,0,0h.16A10.93,10.93,0,0,0,72,86.16v0a.43.43,0,0,0,.09.26,1.42,1.42,0,0,0,.46.37,2.41,2.41,0,0,0,1.77.16,2.86,2.86,0,0,0,1.4-.64c.11-.08.37-.24.46-.32s.23-.22.24-.39v-.15a1.49,1.49,0,0,0-.34-.27,2.14,2.14,0,0,0,.27.06,4.21,4.21,0,0,0,.55.06,4.41,4.41,0,0,0,.63,0,3,3,0,0,1-.94.74c-.66.23-1.11.65-1,1l0,.07a9.92,9.92,0,0,1-1.17.4,4.83,4.83,0,0,1-2.09.07,3.6,3.6,0,0,1-.84-.28A7.18,7.18,0,0,1,70.68,86.78Z"/>
+                    <path class="cls-20"
+                          d="M70.34,86.49c-.06-.11-.39-.27-.39-.36a4,4,0,0,1,1,.06c.59-.31.86-.42.86-.42l.51.19h-.11a.42.42,0,0,0-.15.06c-.06,0-.14.08-.15.13a10.93,10.93,0,0,1-1.46.32Z"/>
+                    <path class="cls-20"
+                          d="M70.24,75.79s-.14,0-.29,0,.2-1,.67-.62.73.86.2.87l-1.21,0s0,0,0,0a2.28,2.28,0,0,1,.49-.11l.54-.07c.13,0,.15,0,.18,0s0-.07,0-.11a2.21,2.21,0,0,0-.34-.32c-.15-.09-.09,0-.13,0A1.22,1.22,0,0,0,70.24,75.79Z"/>
+                    <path class="cls-20"
+                          d="M70,75.77c.15,0,.29,0,.29,0a1.22,1.22,0,0,1,.16-.41s0-.08.13,0a2.21,2.21,0,0,1,.34.32s0,.09,0,.11,0,0-.18,0l-.54.07a2.28,2.28,0,0,0-.49.11Z"/>
+                    <path class="cls-20"
+                          d="M69.65,92.21a3.75,3.75,0,0,1-.27-.61s-.06-.12,0-.14l.16,0,.29-.07a8.45,8.45,0,0,1,1.27-.24l1.07-.19c.32,0,.63-.1.9-.16a3.9,3.9,0,0,0,2.23-1.23,3,3,0,0,0,.32-.5,2.18,2.18,0,0,0,.33-.91s0,0,0-.08h0c.2.51.45,1.19.75,2a5.11,5.11,0,0,1-.48.41,5.81,5.81,0,0,1-2.95,1.06l-1.92.17c-.27,0-.54.07-.84.09l-.22,0c-.07,0-.2,0-.13.09a1.5,1.5,0,0,0,.21.42,2.51,2.51,0,0,0,.65.65,3.8,3.8,0,0,0,.9.46,4.4,4.4,0,0,0,1.82.3A6.79,6.79,0,0,0,76.34,93a7.35,7.35,0,0,0,1.19-.71c.21.53.42,1.09.63,1.65-.38.09-.86.21-1.51.33a11.66,11.66,0,0,1-3,.22,6.32,6.32,0,0,1-2-.55,5.44,5.44,0,0,1-1-.64A3.78,3.78,0,0,1,69.65,92.21Z"/>
+                    <path class="cls-20"
+                          d="M69.65,76.1s0,0,0,0l1.21,0c.53,0,.27-.51-.2-.87s-.67.62-.67.62c-.15,0-.27-.1-.27-.14A1.56,1.56,0,0,1,70,75a.57.57,0,0,1,.39-.2h0a.69.69,0,0,1,.43.19,1.51,1.51,0,0,1,.46.65.36.36,0,0,1-.16.44.7.7,0,0,1-.4.07l-.58,0A4.16,4.16,0,0,1,69.65,76.1Z"/>
+                    <path class="cls-20"
+                          d="M69.39,81a2.72,2.72,0,0,1,.47-.65s0-.14-.14-.25a2.22,2.22,0,0,1,.67.4.6.6,0,0,1-.31,1.12c-.28.09-.62.06-.7-.06A.52.52,0,0,1,69.39,81Z"/>
+                    <path class="cls-20"
+                          d="M69.39,81a.52.52,0,0,0,0,.56c.08.12.42.15.7.06a.6.6,0,0,0,.31-1.12,2.22,2.22,0,0,0-.67-.4c.11.11.17.21.14.25A2.72,2.72,0,0,0,69.39,81Zm-.18.71c-.43-.48.08-1.15.49-1.63a1.33,1.33,0,0,1,1.11.82C71.08,81.64,69.63,82.17,69.21,81.69Z"/>
+                    <path class="cls-20"
+                          d="M69,81.85a1,1,0,0,1-.12-1.09,3.7,3.7,0,0,1,.52-.8c0-.06.16,0,.28.1-.41.48-.92,1.15-.49,1.63s1.87,0,1.6-.81a1.33,1.33,0,0,0-1.11-.82,1.08,1.08,0,0,1,.85.24,1.06,1.06,0,0,1,.45.86,1.13,1.13,0,0,1-.78.83A1.11,1.11,0,0,1,69,81.85Z"/>
+                    <path class="cls-20"
+                          d="M68.75,134,69.86,133s.06.07.18.31c-.2.21-.39.4-.56.56l-.5.45v-.11c0-.11-.06-.09-.1-.1S68.74,134,68.75,134Z"/>
+                    <path class="cls-20"
+                          d="M69.51,59.83a8.28,8.28,0,0,1-1.16.27.31.31,0,0,0,.11-.08c.5-.15.94-.32,1.35-.48Z"/>
+                    <path class="cls-20"
+                          d="M68.39,134.56c-.18-.06,1-1.84,2.06-3.57a25.27,25.27,0,0,0,1.31-2.45c.34-.71.57-1.18.58-1.22s.28-.48.66-1.16c.24-.45.54-1,.84-1.55l0,0,.3-.37c.82-1,1.59-2,2.29-3.07a29.47,29.47,0,0,1-.94,3c-.36,1-.75,2-1.05,2.71s-.54,1.23-.56,1.27-.28.5-.72,1.18a20,20,0,0,1-1.73,2.41c-.48.56-1,1.08-1.41,1.53-.12-.24-.18-.29-.18-.31L68.75,134s.09,0,.13,0,.08,0,.1.1v.11C68.66,134.54,68.43,134.69,68.39,134.56Z"/>
+                    <path class="cls-20"
+                          d="M68.26,97c.83.23,1.67.5,2.3.63a15.22,15.22,0,0,0,1.68.3c.64.08,1.27.13,1.87.16a6.64,6.64,0,0,0,3.08-.43,4.76,4.76,0,0,0,1.73-1.2,1.79,1.79,0,0,0,.14-.18c.16.41.3.81.45,1.21a5.86,5.86,0,0,1-1.91,1.19,7.75,7.75,0,0,1-3.55.4c-.62,0-1.28-.12-1.93-.22l-.33-.07-.29-.08s-.15,0-.14,0l.08.1.24.21.15.12.41.3c.31.21.63.4.93.58a9.26,9.26,0,0,0,3.73,1.21,17.41,17.41,0,0,0,2.88.14,7.14,7.14,0,0,1,1.11,0h0a9.74,9.74,0,0,1-4,.36,9.43,9.43,0,0,1-4-1.08c-.34-.18-.68-.37-1-.58l-.52-.33c-.25-.19-.52-.36-.76-.56A15.47,15.47,0,0,1,69.25,98l-.63-.59-.08-.07,0,0,0-.07Z"/>
+                    <path class="cls-20"
+                          d="M68.18,146c0-.27,0-.67,0-1.23,0-1.07,0-2.71.13-5a45.08,45.08,0,0,1,.6-5,3.52,3.52,0,0,0,0-.49l.5-.45c.17-.16.36-.35.56-.56a1.46,1.46,0,0,1,.09.21,1.3,1.3,0,0,1,0,.79,4.14,4.14,0,0,1-.28.72,12.49,12.49,0,0,0-1.15,4.8,16.26,16.26,0,0,0,.45,5,5.68,5.68,0,0,0,.34,1c-.69.1-1,.23-1.08.16s0,.08.1.1a.83.83,0,0,0,.24,0h0l-.57.11h0v0A.28.28,0,0,0,68.18,146Z"/>
+                    <path class="cls-20"
+                          d="M68,5c.16-1.59.3-2.3.3-2.3L68.46.75c.25,0,.5.06.76.09S70,.9,70.38.92a4.4,4.4,0,0,0,.5,0l.55,0c.69-.06,1.42-.15,2.2-.24l.13,1.13-.43,1.72a.65.65,0,0,0,0,.1s0,.12,0,.16a1.72,1.72,0,0,1,.2,0,3.24,3.24,0,0,1,.81.59c-.77.15-1.55.32-2.35.45-.25,0-.49.08-.77.1s-.56,0-.8.06c-.49,0-.93,0-1.36,0Z"/>
+                    <path class="cls-20"
+                          d="M67.93,60.42a3.83,3.83,0,0,1-1.58,0,10.21,10.21,0,0,0,1.48-.29h0l.48-.08A3.11,3.11,0,0,1,67.93,60.42Z"/>
+                    <path class="cls-20"
+                          d="M66.86,76.33a.3.3,0,0,1-.08.16.12.12,0,0,1-.06.08.53.53,0,0,1-.15.08s0,0,0,0l.31-.31A0,0,0,0,1,66.86,76.33Z"/>
+                    <path class="cls-20"
+                          d="M67.06,10.86c-.13-2.69-.31-4.62-.47-5.91h.07L68,5a83.48,83.48,0,0,0-.31,8.43s-.1-.43-.18-.82C67.36,12,67.21,11.41,67.06,10.86Z"/>
+                    <path class="cls-20"
+                          d="M66.56,76.61c-.09-.32-.17-.64-.26-1a.51.51,0,0,1,.48.85.3.3,0,0,0,.08-.16,0,0,0,0,0,0,0Z"/>
+                    <path class="cls-20" d="M66.72,76.57a.4.4,0,0,1-.27.12l.12,0A.53.53,0,0,0,66.72,76.57Z"/>
+                    <path class="cls-20" d="M66.56,76.61s0,0,0,0H66.5Z"/>
+                    <path class="cls-20" d="M66.59,5a18.9,18.9,0,0,0-.39-2.22l2.08,0s-.14.71-.3,2.3L66.66,5Z"/>
+                    <path class="cls-20"
+                          d="M65.87,76a.33.33,0,0,1,0-.12.55.55,0,0,1,.26-.21l.08,0h0c.09.33.17.65.26,1l-.06,0h.07l-.12,0h0a.52.52,0,0,1-.58-.63S65.87,76,65.87,76Z"/>
+                    <path class="cls-20" d="M66.18,75.69a.55.55,0,0,0-.26.21.46.46,0,0,1,.31-.25h0Z"/>
+                    <path class="cls-20" d="M66.72,83.31a.52.52,0,0,1-.78-.64A10.06,10.06,0,0,0,66.72,83.31Z"/>
+                    <path class="cls-20"
+                          d="M66.08,82.49a.52.52,0,0,1,.74.74l0,0,0,0a10.06,10.06,0,0,1-.78-.64.29.29,0,0,1,.1-.13Z"/>
+                    <path class="cls-20"
+                          d="M65.4,43.65h.51l.52.31a9.26,9.26,0,0,1,3,3.78c.14.26.62,1.22.71,1.41.59,1.31.76,1.72,1.53,3.69,0,.1,0,.19.07.26l0,.38a38.1,38.1,0,0,0-2.58-5.94c0-.08-.1-.18-.14-.26l-.44-.81a.92.92,0,0,0-.21-.26,7.33,7.33,0,0,0-1.52-1.73A10,10,0,0,0,65.4,43.65Z"/>
+                    <path class="cls-20"
+                          d="M66.44,76.69c-.45.18-.71-.31-.57-.67,0,0,0,0,0,0A.52.52,0,0,0,66.44,76.69Z"/>
+                    <path class="cls-20"
+                          d="M78.17,148.65l-.08,0h.08ZM64,129.6c0-.4-.08-.75-.1-1,.59-.05,1.17-.11,1.74-.21,0,.27,0,.64.07,1.09.09,1.09.2,2.65.35,4.55.07,1,.16,2,.25,3.08,0,.48.1,1,.15,1.49.07.24.1.37.14.52l.09.44c.07.3.14.59.2.89L68,146.19h0c.12.52.22,1,.33,1.55L71,149.22l4.31.05a4.19,4.19,0,0,0,1.9-.2,1.77,1.77,0,0,0,.64-.53l.15-.2,0,.06a.45.45,0,0,1,0,.2l0,0,.48.33c.14-.18.07-.64-.24-1a1.09,1.09,0,0,1,.08-.15c.19-.29.36-.58.53-.86l.14-.27a.92.92,0,0,1,.07.13l.53-.23a2,2,0,0,0-.3-.42l-.25-.22a2.13,2.13,0,0,0-.58-1.18,1.26,1.26,0,0,0-1.28-.49,11.13,11.13,0,0,0-1.53.67A16.34,16.34,0,0,1,72.85,146a10.41,10.41,0,0,1-2.4.05c-.64,0-1.14,0-1.49,0h-.17l.38-.07.27-.07h.15v-.11h0a8.47,8.47,0,0,1,.85-.11,12,12,0,0,0,2.29-.19,18.57,18.57,0,0,0,2.73-1.21,9.53,9.53,0,0,1,1.63-.8,1.9,1.9,0,0,1,1.13,0,2.76,2.76,0,0,1,.94.6,3.12,3.12,0,0,1,.93,2,1.25,1.25,0,0,1-.06.7c-.09.22-.16.35-.24.52s-.34.62-.52.92-.36.62-.6.94a2.63,2.63,0,0,1-1,.85,5.13,5.13,0,0,1-2.38.37l-4.6.08c-1.17-.62-2.34-1.22-3.51-1.82-.62-2.73-1.24-5.4-1.8-7.87-.13-.56-.27-1.1-.4-1.63a3.54,3.54,0,0,1-.09-.38l0-.23-.05-.43c0-.3-.07-.58-.1-.86-.12-1.1-.22-2.13-.32-3.08C64.23,132.25,64.07,130.68,64,129.6Z"/>
+                    <path class="cls-20"
+                          d="M65.08,81.93c-.21-.17-.42-.36-.62-.54a20.06,20.06,0,0,1,2.38-1.09c.79-.22,1.33-.17,1.34-.08s-.52.18-1.18.51S65.79,81.46,65.08,81.93Z"/>
+                    <path class="cls-20"
+                          d="M65.52,184.06c.26-.46.61-1.1,1-1.87s.91-1.65,1.36-2.62a10.73,10.73,0,0,0,.59-1.51,10,10,0,0,0,.3-1.64,6.24,6.24,0,0,0-.23-3.18A7.28,7.28,0,0,0,67,170.9a4.85,4.85,0,0,0-1.34-1,3,3,0,0,0,.48-.11,5.48,5.48,0,0,1,1.17.79A7.6,7.6,0,0,1,69.2,173a6.84,6.84,0,0,1,.44,3.53,11.66,11.66,0,0,1-.25,1.79,11.42,11.42,0,0,1-.57,1.65c-.43,1-.9,2-1.31,2.75s-.65,1.25-.88,1.69c-.46.06-.92.12-1.37.16Z"/>
+                    <path class="cls-20"
+                          d="M65.5,185.4c-.31-.12-.48-.37-.4-.56l.16-.29c.45,0,.91-.1,1.37-.16a1,1,0,0,1-.11.21c-.21.45-.35.72-.36.74S65.8,185.52,65.5,185.4Z"/>
+                    <path class="cls-20"
+                          d="M66.63,84.59a25,25,0,0,1-2.31-2.16l.3-.2.46-.3c.29.25.58.51.86.74a.52.52,0,0,0,.78.64c.19.15.36.29.52.4a5.79,5.79,0,0,0,1,.49l.46.14a7.67,7.67,0,0,0,1.64.35A13,13,0,0,0,74,84.48,6.84,6.84,0,0,0,77.24,83c.76-.62,1.11-1.25,1.22-1.15a1.59,1.59,0,0,1-.18.44,4.36,4.36,0,0,1-.72,1,4.84,4.84,0,0,1-1,.82h-.06l-.14,0h0v-.2h-.11l-.16,0L76,84h0a.53.53,0,0,0-.16.1.57.57,0,0,0-.23.45.38.38,0,0,0,0,.1,23.2,23.2,0,0,0-2.5.63,11.15,11.15,0,0,1-2.44.49h-.3a7.71,7.71,0,0,1-1.9-.3A6.55,6.55,0,0,1,66.63,84.59Z"/>
+                    <path class="cls-20"
+                          d="M63.88,128.58c0-.46-.05-.71-.05-.78l1,0,.67,0h.07v.06c0,.06,0,.16,0,.3s0,.1,0,.16C65.05,128.47,64.47,128.53,63.88,128.58Z"/>
+                    <path class="cls-20" d="M63.69,81.79l.52-.27.25-.13c.2.18.41.37.62.54l-.46.3-.3.2-.51-.51Z"/>
+                    <path class="cls-20"
+                          d="M64.6,169.76s.23-.28.79-.21a2.28,2.28,0,0,1,.74.22,3,3,0,0,1-.48.11l-.3-.11A2,2,0,0,0,64.6,169.76Z"/>
+                    <path class="cls-20"
+                          d="M63.13,5.08c-.11-.1-.21-.2-.31-.28l1.67.06a24.05,24.05,0,0,1,2.57,6c0,.8.06,1.67.08,2.62,0-.11-.08-.43-.15-.76A15.4,15.4,0,0,0,63.13,5.08Z"/>
+                    <path class="cls-20" d="M63.69,81.79c-.65-.67-1.28-1.33-1.82-1.92l.61-.21,1.9,1.67.08.06-.25.13Z"/>
+                    <path class="cls-20"
+                          d="M66.24,112.88a3.49,3.49,0,0,1,.5.08h.08a.49.49,0,0,1,.07-.19s.06,0,0-.06a.41.41,0,0,1-.11-.17c-.06-.08,0,0-.09,0a1.18,1.18,0,0,0-.23.14A2.43,2.43,0,0,1,66.24,112.88Zm-2.1.35a1.37,1.37,0,0,1,.92-.82,4.71,4.71,0,0,1,1.2-.06c.32,0,.55,0,.57,0a1,1,0,0,1,.26.09c.07.06.2.13.11.4s-.1.11-.16.15l-.1,0a.33.33,0,0,0-.13.07,2.8,2.8,0,0,1-1.11.51,4.21,4.21,0,0,1-1.66.12S64,113.53,64.14,113.23Zm-.07.5a0,0,0,0,0,0,0v0c.19-.09.88-.24,1.5-.46a2,2,0,0,0,.63-.36,6.28,6.28,0,0,0-1.07-.07c-.62.06-.93.73-1.06.89,0,0,0,0,0,0S64.06,113.72,64.07,113.73Z"/>
+                    <path class="cls-20"
+                          d="M63,60.62q.42,0,.84,0c.34,0,.66,0,1,0l.89,0h.09a.94.94,0,0,1-.1.1c-.62,0-1.24.06-1.88.11a.47.47,0,0,0-.29.14A4.44,4.44,0,0,1,63,60.62Z"/>
+                    <path class="cls-20" d="M62,84l-1.3-.52c.21-.1.54-.3.95-.53.56-.32,1.28-.71,2-1.11l.12.13.51.51Z"/>
+                    <path class="cls-20" d="M63.43,128.62c.09-.52.14-.8.19-.8s.13.28.15.77Z"/>
+                    <path class="cls-20"
+                          d="M64.05,4.16a14.42,14.42,0,0,0-1.33-1.69L62.25,2,62.54.12c.73.07,2.34.24,4.45.49l1.47.14-.18,2-2.08,0A18.9,18.9,0,0,1,66.59,5l-2.1-.09C64.34,4.61,64.2,4.37,64.05,4.16Z"/>
+                    <path class="cls-20"
+                          d="M62,138.48,62,138c.38-2.56.75-5.1,1-7,.16-1,.27-1.82.37-2.38l.34,0c.06,1.62-.15,5.6-.51,9.59l0,.49v.13a1.69,1.69,0,0,1-.12.41h0l0,0h0a0,0,0,0,0,0,0h0s0,0,0,0l-.06-.06h0s0-.05-.06-.06l-.17-.15h0l0,0-.06-.08-.07-.06s0-.05-.06-.06l0,0h0c-.18-.2-.27-.27-.29-.27l0,0,0,.07a.52.52,0,0,0-.06.13v0Z"/>
+                    <path class="cls-20"
+                          d="M61.61,3.92l-.53-.23L62.25,2l.47.5a14.42,14.42,0,0,1,1.33,1.69c.15.21.29.45.44.7L62.82,4.8A6.9,6.9,0,0,0,61.61,3.92Z"/>
+                    <path class="cls-20"
+                          d="M62.48,79.66l-.84-.72c.59-.17,1.23-.33,1.85-.49.44-.1.87-.21,1.31-.29a26.93,26.93,0,0,1,4-.66c.13,0,.2,0,.2,0s-2.67.85-5.32,1.71Z"/>
+                    <path class="cls-20"
+                          d="M66.87,86.43a28.19,28.19,0,0,1-6.09-1.68l.31-.18L62,84a25.73,25.73,0,0,0,5,1.59,17,17,0,0,0,3.43.24h.16a13.69,13.69,0,0,0,3.6-.48,6.85,6.85,0,0,0,1.38-.5l0,0a16.38,16.38,0,0,1-2.39.9c-.36.14-.78.3-1.24.43,0,0,.09-.1.15-.13a.42.42,0,0,1,.15-.06h.11l-.51-.19s-.27.11-.86.42a4,4,0,0,0-1-.06c0,.09.33.25.39.36A16.33,16.33,0,0,1,66.87,86.43Z"/>
+                    <path class="cls-20"
+                          d="M61.57,120a2.13,2.13,0,0,1,.63-1.88,1.82,1.82,0,0,1,1.39-.55l.65.07a4.86,4.86,0,0,1,.92.24c.19.07.42.27.4.49a.84.84,0,0,1-.17.34l-.16.17a5.47,5.47,0,0,1-.75.57,2.38,2.38,0,0,1-1.38.08s.62-.14,1.22-.39a5.2,5.2,0,0,0,.59-.57l.12-.14s0,0,0,0,0,0-.07,0a5.49,5.49,0,0,0-.82-.13l-.61-.11a1.38,1.38,0,0,0-1.06.32A3.64,3.64,0,0,0,61.57,120Z"/>
+                    <path class="cls-20" d="M61.87,79.87l-.64-.68-.1-.12.51-.13.84.72Z"/>
+                    <path class="cls-20" d="M61.13,79.07a11,11,0,0,1-1-1.17c.08-.11.69.33,1.53,1Z"/>
+                    <path class="cls-20" d="M59.48,84.29l.65-.49.33-.21a2.28,2.28,0,0,1,.25-.16L62,84l-.92.62-.31.18Z"/>
+                    <path class="cls-20"
+                          d="M58.7,146.85c.2-.56.51-1.34.85-2.27l1.23-3.13q.33-.85.69-1.74l.38-.91.07-.15s0,0,0,0,.08.21.12.18,0-.2.12-.13h.18l0,0s0,0,.06.06l.07.06.06.08,0,0h0l.17.15s0,0,.06.06h0l.06.06s0,0,0,0h0a0,0,0,0,1,0,0h0c-.1.3-.21.6-.31.89-.2.61-.41,1.21-.6,1.78l-1.06,3.18c-.32.93-.57,1.72-.76,2.28l0,.08c-.33.07-.92.16-.92.18h-.91s0-.09,0-.15,0-.07,0-.1l0-.12v-.06Z"/>
+                    <path class="cls-20"
+                          d="M57.77,123.28c.1.16,0,0,0,0Zm0,.17-.17-.06s0,0,0-.09,0-.08,0-.09,0,0,.08,0l-.09-.14c0-.08-.2-.1-.09-.11a1.14,1.14,0,0,0,.32.05,2.48,2.48,0,0,0,.83-.13s.08,0,.09,0,.08,0,0-.1a1.81,1.81,0,0,0-.49-.21c-.15,0-.26,0-.28,0s.45-.33,1-.08a.66.66,0,0,1,.38.35.42.42,0,0,1-.12.43,1.29,1.29,0,0,1-.45.22,2.33,2.33,0,0,1-.33,0A2.06,2.06,0,0,1,57.8,123.45Z"/>
+                    <path class="cls-20"
+                          d="M58.29,83.89c-1-.33-2-.63-3-.92l0,0,.79-.53L56.8,82h0l1.9.67,2,.78a2.28,2.28,0,0,0-.25.16l-.33.21-.65.49Z"/>
+                    <path class="cls-20"
+                          d="M57.73,87a30.23,30.23,0,0,1-3.2,2.63s0,0,0,0a15.94,15.94,0,0,1,2.65-3.22,28.12,28.12,0,0,1,2.15-2,.61.61,0,0,1,.16-.12l1.3.46c-.2.12-.48.3-.81.53C59.34,85.71,58.52,86.34,57.73,87Z"/>
+                    <path class="cls-20"
+                          d="M56.26,81.07c1-.57,1.65-.87,1.69-.9s.74-.31,1.76-.65l1.42-.45.1.12.64.68c-.66.23-1.27.46-1.78.67-1,.38-1.63.69-1.66.71s-.71.28-1.61.73c-.42-.14-.85-.29-1.28-.42C55.8,81.39,56,81.21,56.26,81.07Z"/>
+                    <path class="cls-20"
+                          d="M55.29,83l-1.17-.33.63-.48c.27-.2.52-.39.75-.58l0,0c.43.13.86.28,1.28.42h0l-.69.43-.79.53Z"/>
+                    <path class="cls-20"
+                          d="M53.34,127.17c.1-.2.16-.37.21-.49.13.21.29.47.45.77C53.78,127.37,53.56,127.27,53.34,127.17Z"/>
+                    <path class="cls-20"
+                          d="M54.49,131.37c-.45-1.55-.93-3.07-1.2-4.07h0a.61.61,0,0,0,.05-.12c.22.1.44.2.66.28.49.9,1.1,2.19,1.65,3.5s1,2.53,1.36,3.53a16,16,0,0,1,.51,1.8,43.79,43.79,0,0,1,.24,5.6c0,2.67-.18,5.29-.46,5.34a.14.14,0,0,0,0-.1c0-.09.2-.45-.19-.36-.17-.88-.38-2.83-.61-4.82-.15-1.34-.31-2.68-.44-3.68-.08-.5-.14-.91-.19-1.2s-.09-.46-.09-.48-.1-.67-.35-1.65S54.86,132.66,54.49,131.37Z"/>
+                    <path class="cls-20" d="M53.24,127.12c-.15-.56-.22-.92-.16-1s.25.16.47.51c0,.12-.11.29-.21.49Z"/>
+                    <path class="cls-20"
+                          d="M52.23.39C53.72.21,55.11.11,56.37.06,58,0,59.45,0,60.47,0l1.66.05.41,0L62.25,2,61.08,3.69l.53.23a6.9,6.9,0,0,1,1.21.88l-1,0L60.2,4.6c-.92-.08-2.24-.19-3.81-.23q-.81,0-1.71,0A14.5,14.5,0,0,0,54.16,3a6.54,6.54,0,0,0-.32-.65,2.34,2.34,0,0,0-.53-.63l-.59-.52L52.27.77Z"/>
+                    <path class="cls-20"
+                          d="M52.45,3.09h0Zm-.84-.35-.51-.25L52.27.77l.45.41.59.52a2.34,2.34,0,0,1,.53.63,6.54,6.54,0,0,1,.32.65,14.5,14.5,0,0,1,.52,1.36c-.46,0-1,0-1.46,0-.15-.28-.3-.54-.44-.75s-.22-.28-.31-.4,0,0-.06,0,0,0,0,0h0l-.1-.06Z"/>
+                    <path class="cls-20" d="M52.46,3.08h0Z"/>
+                    <path class="cls-20"
+                          d="M51.49,153.73c-.18-.27,1.26-1.63,1.42-1.26a4.63,4.63,0,0,0-.51.66c-.34.39-.34.64-.33.66a.82.82,0,0,0,0,.22,1.34,1.34,0,0,0,.16.51,3.65,3.65,0,0,0,.26.44c-.06,0-.08,0-.41,0a2.09,2.09,0,0,1-.2-.22A1.47,1.47,0,0,1,51.49,153.73Z"/>
+                    <path class="cls-20"
+                          d="M53.24,127.12c-.67-.31-1.31-.64-2-1,.15-.38.21-.58.21-.58l2.2.79s-.05.11-.13.33l0,0c-.22-.35-.39-.55-.47-.51S53.09,126.56,53.24,127.12Z"/>
+                    <path class="cls-20"
+                          d="M51.18,111.48c0,.07.06.11,0,.12s-.07,0-.17-.1,0-.13.06-.15a.27.27,0,0,1,.11,0l.26,0c.36,0,.83-.07,1.29-.15a4.86,4.86,0,0,1,1.38-.11,1.63,1.63,0,0,1,.54.12.63.63,0,0,1,.29.16.42.42,0,0,1,0,.57,1.08,1.08,0,0,1-.32.26c-.14.1-.29.23-.47.38a1.63,1.63,0,0,1-.75.34,1.41,1.41,0,0,1-.77-.19l-.56-.26c-.33-.16-.53-.28-.51-.32a1.46,1.46,0,0,1,.59.11l.59.16a1.26,1.26,0,0,0,.6.1c.34-.08.65-.51,1-.74.12-.09,0,0,0-.07h0l-.33-.08a5.8,5.8,0,0,0-1.27,0,8.14,8.14,0,0,1-1.33,0A1.56,1.56,0,0,0,51.18,111.48Z"/>
+                    <path class="cls-20"
+                          d="M50.61,150.38a5.71,5.71,0,0,1,1.39-.6c1.37-.81,2.14-1.37,3.62-2.32l1-.51a2.06,2.06,0,0,1,.5-.18c.06.3.11.46.16.46a20.44,20.44,0,0,1-3.11,2.05s-3.43,1.4-3.57,1.11Z"/>
+                    <path class="cls-20"
+                          d="M50.53,169.76s.29,0,.67.26a.71.71,0,0,0,.14.1l-.31-.05-.18-.06C50.67,169.87,50.53,169.8,50.53,169.76Z"/>
+                    <path class="cls-20"
+                          d="M50,152.84a2.91,2.91,0,0,0-.4.72s-.06.09-.12.22a1.81,1.81,0,0,0-.13.51.86.86,0,0,0,0,.28h0c-.06,0-.13,0-.17,0l-.22-.28a1.76,1.76,0,0,1,.15-.93,1.21,1.21,0,0,1,.17-.27,2.32,2.32,0,0,1,.46-.49c.38-.31.85-.44.87-.36S50.2,152.51,50,152.84Z"/>
+                    <path class="cls-20"
+                          d="M48.81,87c-.11-.14,2.08-1.88,4.3-3.61.34-.26.68-.52,1-.79l1.17.33-1.7,1.13A37.14,37.14,0,0,1,48.81,87Z"/>
+                    <path class="cls-20"
+                          d="M48.28,122.72l.27-.45a.33.33,0,0,0,.31.06l.42.34h0a.77.77,0,0,1-.5.18A1.06,1.06,0,0,1,48.28,122.72Z"/>
+                    <path class="cls-20"
+                          d="M48.48,155.34l-1-1.52v-.41c0-.07,0-.21,0-.29s.06-.38.1-.55a4.7,4.7,0,0,1,.33-1,2.42,2.42,0,0,1,1.21-1.28,2.75,2.75,0,0,1,1.44.07h0a1.69,1.69,0,0,0-1.24.33,1.94,1.94,0,0,0-.8,1.12,5.19,5.19,0,0,0-.19.86c0,.16,0,.33,0,.48a1.93,1.93,0,0,0,0,.23v.15c.17.21.34.44.52.68a.25.25,0,0,0,0,.08c.09.54.49.86.54.8s-.07-.28-.11-.55l.32.05.8.12,1.63.22c.26.25.53.39.58.34s-.07-.16-.17-.34h0l0,0,.16-.14.32-.28,2.47-2.11,2-1.66c.53-1.69.88-2.83.9-2.9a1.07,1.07,0,0,0,.09-.24l0-.06c0,.06,0,.1,0,.15H60l.2,0v.07h0v0h0l0,.14,0,.07-.09.32-.32.91c-.21.59-.52,1.43-.88,2.42l-5,3.82-.77.6a.42.42,0,0,1-.14.09h0l-.15.05h-.13l-.23,0a3,3,0,0,1-.52-.08c-.58-.1-1.12-.21-1.66-.33l-.8-.17-.41-.1-.3-.06C48.63,155.46,48.52,155.46,48.48,155.34Z"/>
+                    <path class="cls-20"
+                          d="M48,183.49c-.42-.07-.83-.16-1.24-.24a20.78,20.78,0,0,1,1.6-1.95,15.4,15.4,0,0,0,3-4.4,9.37,9.37,0,0,0,.5-5.22A3.13,3.13,0,0,0,50.85,170l.18.06.31.05a3.17,3.17,0,0,1,1,1.41,9.19,9.19,0,0,1-.14,5.64,16,16,0,0,1-3,4.84c-.49.59-.89,1.07-1.14,1.43Z"/>
+                    <path class="cls-20"
+                          d="M42.77,77c1.56-.55,3.1-1,4.33-1.32,1.42-.37,2.42-.51,2.47-.53s1-.15,2.5-.25a34.31,34.31,0,0,1,5.28.12,31.69,31.69,0,0,1,4,.66l1.11.28a7,7,0,0,1,2.2.86s0,0,0,0c-.2,0-1-.21-2.25-.42a39.33,39.33,0,0,0-5.09-.56,37.88,37.88,0,0,0-5.13.12c-1.42.16-2.36.32-2.42.34s-1,.11-2.4.42c-1,.2-2.14.49-3.38.83Z"/>
+                    <path class="cls-20"
+                          d="M47.29,120.89c.32-.22.39-.39.39-.44l-.11-.34.37,0c.49,0,1.31,0,1.48,0a.3.3,0,0,1,.33.21,2.78,2.78,0,0,1-.46,2.31h0l-.42-.34.07,0a2.32,2.32,0,0,0,.37-1.61c-.3,0-.83,0-1.15,0a1.23,1.23,0,0,1-.47.58C47.54,121.14,47.42,121,47.29,120.89Z"/>
+                    <path class="cls-20" d="M47.68,121.25l-.16.12-.29-.44.06,0C47.42,121,47.54,121.14,47.68,121.25Z"/>
+                    <path class="cls-20"
+                          d="M46.68,183.39a.61.61,0,0,1,.09-.14c.41.08.82.17,1.24.24a4.48,4.48,0,0,0-.33.51c-.08.12-.37.09-.65-.05S46.58,183.55,46.68,183.39Z"/>
+                    <path class="cls-20"
+                          d="M45.75,54.59a3.69,3.69,0,0,1,.1-.52c.06-.32.14-.65.22-1a17.85,17.85,0,0,1,.68-1.85A20.47,20.47,0,0,1,51.32,45a22.42,22.42,0,0,1,3-2.43,11.94,11.94,0,0,1,3.45-1.7,8.61,8.61,0,0,1,3.77-.18,13.25,13.25,0,0,1,3.33,1.06,17.94,17.94,0,0,1,2.88,1.56,9.34,9.34,0,0,1,2.06,2.29,18.76,18.76,0,0,1,2,4.48,30.55,30.55,0,0,1,1.06,4.49c.16,1,0,3.18-.33,3.46,0,0,0-1.33,0-1.35a26.13,26.13,0,0,0-.85-3.15l0-.38c0-.07,0-.16-.07-.26-.77-2-.94-2.38-1.53-3.69C70,49,69.53,48,69.39,47.74a9.26,9.26,0,0,0-3-3.78l-.52-.31H65.4l-1.16-.58a8.79,8.79,0,0,0-6.13-.88,15,15,0,0,0-5.89,3.71,18.77,18.77,0,0,0-4.41,5.83,12,12,0,0,0-.65,1.69c-.09.3-.17.58-.23.87l-.09.41,0,.17.49.39c.25.19.48.39.73.57l1.51,1.06,0,0a16.62,16.62,0,0,0,4.29,1.93A38.88,38.88,0,0,0,58.27,60a26.28,26.28,0,0,0,4.74.64,4.44,4.44,0,0,0,.53.28.47.47,0,0,1,.29-.14c.64,0,1.26-.09,1.88-.11a.94.94,0,0,0,.1-.1H66a.07.07,0,0,0,.06,0l.25,0a3.83,3.83,0,0,0,1.58,0,3.11,3.11,0,0,0,.42-.32,8.28,8.28,0,0,0,1.16-.27l.3-.29c.42-.17.79-.36,1.1-.52a16.91,16.91,0,0,0,1.64-1s-.41.59-1.5,1.28a13.51,13.51,0,0,1-5,1.81,22.79,22.79,0,0,1-7.88-.32,38.74,38.74,0,0,1-4.51-1,16.81,16.81,0,0,1-4.65-2h0l-1.52-1c-.26-.18-.51-.39-.76-.57l-.38-.28c-.21-.16-.4-.32-.59-.48C45.7,55.1,45.73,54.84,45.75,54.59Z"/>
+                    <path class="cls-20"
+                          d="M45.62,84a10.15,10.15,0,0,0-.86-1.49l.94-1.83a1.49,1.49,0,0,1,.37.34,2,2,0,0,1,.3.61c.05.17.1.34.15.55C46.27,82.65,46,83.25,45.62,84Z"/>
+                    <path class="cls-20"
+                          d="M45.47,121.49a1.41,1.41,0,0,0,.21-1.08,14.74,14.74,0,0,1-.82-2.51l.24-.12a12.1,12.1,0,0,0,1.95,2.87l.24.24-.06,0,.29.44.16-.12c.37.38.78.73,1.18,1.08a.33.33,0,0,1-.31-.06l-.27.45a1.06,1.06,0,0,0,.5.14.77.77,0,0,0,.5-.18c.35.28.71.56,1.08.83a18,18,0,0,0,7.75,3.56,26.28,26.28,0,0,0,4.27.21,28.74,28.74,0,0,0,4.18-.38c2.68-.48,5.25-1.42,6.73-3.39a48.15,48.15,0,0,0,4.28-5.82,27.38,27.38,0,0,0,4-10c.4-2.58.23-4.1.35-4.1A4.29,4.29,0,0,1,82,104.7c0,.15,0,.29,0,.46a8,8,0,0,1,0,.85,11.49,11.49,0,0,1-.1,1.78c0,.34-.08.71-.14,1.09-.16,0-.26,0-.26,0s.08.07.24.09a28,28,0,0,1-3.47,9.16c-.57,1-1.2,2-1.9,3,.15-.6.2-1,.11-1s-1.2,1.74-2.19,3.55q-.25.48-.51.93l0,0a8.74,8.74,0,0,1-2.94,2.25,16.65,16.65,0,0,1-4.1,1.32c-.39.07-.78.14-1.18.19,0-.06,0-.11,0-.16s0-.24,0-.3v-.06h-.07l-.67,0-1,0c0,.07,0,.32.05.78h-.11c0-.49-.07-.76-.15-.77s-.1.28-.19.8l-1,.06a25.65,25.65,0,0,1-4.53-.14A16.17,16.17,0,0,1,54,127.45c-.16-.3-.32-.56-.45-.77l0,0c.08-.22.13-.33.13-.33l-2.2-.79s-.06.2-.21.58c-.65-.4-1.29-.81-1.91-1.26a32.59,32.59,0,0,1-3.57-3Z"/>
+                    <path class="cls-20" d="M45,80l.2-.41,2.1,1-.12.25c-.49-.17-.84-.32-1.26-.49Z"/>
+                    <path class="cls-20"
+                          d="M43.87,125.14a3.21,3.21,0,0,1-.52-.56s0-.08-.08-.21,0,0,0,0a13.92,13.92,0,0,0,1.66-1.89c0,.07,0,.14,0,.21a1.18,1.18,0,0,0,.44.79.84.84,0,0,0,.05.24l.5.81c.36.61.8,1.14.71,1.44s-1,.22-1.78-.18A5.86,5.86,0,0,1,43.87,125.14Z"/>
+                    <path class="cls-20"
+                          d="M44,119.44c.72-1.2.79-1.73.89-1.54a14.74,14.74,0,0,0,.82,2.51,1.41,1.41,0,0,1-.21,1.08A12.81,12.81,0,0,1,44,119.44Z"/>
+                    <path class="cls-20"
+                          d="M49,7.76a21.12,21.12,0,0,0-4.58-1.49c-.35-.07-.67-.12-1-.16L44,5.89l.72-.28.66-.23.19-.06A32,32,0,0,1,49.22,7,24.14,24.14,0,0,1,52.1,8.82L53.66,10l.81.61.63.5.27.22a11.09,11.09,0,0,1,1,.95c.19.28,0-.08,0-.23l-.17-.46A4.73,4.73,0,0,0,56,11c-.4-1.15-1.15-3.13-1.7-4.39a24.76,24.76,0,0,0-1.09-2.27c.51,0,1,0,1.46,0,.21.59.42,1.26.66,2,.47,1.55,1,3.42,1.69,5.64a1.7,1.7,0,0,0,0,.53,4,4,0,0,0,0,.47c0,.14.13.48-.06.2a4.2,4.2,0,0,0-1.31-.93l-.46-.4c-.35-.3-.68-.57-1-.82l-.81-.61c-.52-.38-1-.73-1.52-1.07A20.44,20.44,0,0,0,49,7.76Z"/>
+                    <path class="cls-20"
+                          d="M43.52,79.33l-2.27-1c.35-.13.73-.24,1.09-.35.54-.16,1.09-.32,1.63-.46l.27.12,2.35,1.06,1.15.49c.33.12.79.24,1.19.36,2.23.63,4.46,1.27,6.61,2l0,0c-.23.19-.48.38-.75.58l-.63.48c-1.83-.5-3.71-1-5.61-1.46-.44-.1-.83-.19-1.32-.35h0l.12-.25-2.1-1L45,80Z"/>
+                    <path class="cls-20"
+                          d="M44.2,115.07a2.42,2.42,0,0,1-.37-.19c-.09-.25-.19-.5-.27-.75l.1.07a2.67,2.67,0,0,0,.74.33.89.89,0,0,1,.32.19.85.85,0,0,1,.3.74.66.66,0,0,1-.48.55.59.59,0,0,1-.25,0s0,0,0-.08.42-.27.36-.51a.42.42,0,0,0-.23-.29A.6.6,0,0,0,44.2,115.07Z"/>
+                    <path class="cls-20"
+                          d="M43.15,123.84a2.73,2.73,0,0,1,.18-1.43c.34-.91,1.08-1.48,1.34-1.26s.17.75.25,1.29a13.92,13.92,0,0,1-1.66,1.89A2.25,2.25,0,0,1,43.15,123.84Z"/>
+                    <path class="cls-20"
+                          d="M42.38,91.23c.18-.56.37-1.11.56-1.61a5.47,5.47,0,0,0,1.28.7,8.22,8.22,0,0,0,3.2.35l1.08-.07.9-.08c.31,0,.64-.08,1-.14l.52-.09c.16,0,0,0-.1-.06l-.24-.09-.17-.08a5.4,5.4,0,0,1-.92-.5,3.37,3.37,0,0,1-.38-.28c-.18-.13-.33-.27-.49-.41A8.05,8.05,0,0,1,47.17,87c-.7-1.22-1.14-2.24-1.53-3,0,0,0,0,0,0,.35-.72.65-1.32.9-1.82.09.36.19.8.31,1.33a20.55,20.55,0,0,0,1,3.09,6.06,6.06,0,0,0,.41.8,5.59,5.59,0,0,0,.74,1c.15.13.29.29.44.41a5.31,5.31,0,0,0,.67.5,7,7,0,0,0,1.42.76l.31.13s.28.15.29.19.22.07.27.1.21.06,0,.09l-.84.17L49.92,91l-1.44.25-1.11.15a12.18,12.18,0,0,1-3.54.14A8.93,8.93,0,0,1,42.38,91.23Z"/>
+                    <path class="cls-20"
+                          d="M43.56,114.13c.08.25.18.5.27.75a1.37,1.37,0,0,1-.44-.36c-.15-.17-.28-.34-.38-.43s-.21-.09-.22-.14.11-.12.31-.06A1.84,1.84,0,0,1,43.56,114.13Z"/>
+                    <path class="cls-20"
+                          d="M42.38,91.23a5.36,5.36,0,0,1-1.31-.61l1.45-1.49a1.49,1.49,0,0,0,.42.49C42.75,90.12,42.56,90.67,42.38,91.23Z"/>
+                    <path class="cls-20"
+                          d="M40.29,77.94c.58-.25,1.18-.48,1.79-.7l.68-.24h0l1.2.56c-.54.14-1.09.3-1.63.46-.36.11-.74.22-1.09.35C40.93,78.22,40.61,78.07,40.29,77.94Z"/>
+                    <path class="cls-20"
+                          d="M41.24,124.78l-.79-.87-.05,0c.09-.11.2-.22.3-.33.53-.51.85-.8.91-.87A21.51,21.51,0,0,0,44,119.44a12.81,12.81,0,0,0,1.5,2,5.81,5.81,0,0,1-.55,1c-.08-.54,0-1.14-.25-1.29s-1,.35-1.34,1.26a2.73,2.73,0,0,0-.18,1.43,2.25,2.25,0,0,0,.11.49l0,0-1.16,1.09a2.93,2.93,0,0,1-.63-.46A1.81,1.81,0,0,1,41.24,124.78Z"/>
+                    <path class="cls-20"
+                          d="M42,4.12l-.83-.24,0,0c.47-.28.94-.55,1.42-.81l.74-.38.81-.39A27.8,27.8,0,0,1,50.67.59c.53-.08,1-.15,1.56-.2l0,.38L51.1,2.49l.51.25.66.35.1.06h0s0,0,0,0,0,0,.06,0,.2.24.31.4.29.47.44.75c-.69,0-1.4,0-2.12.08a28,28,0,0,0-5.55.88c-.31-.13-.6-.23-.88-.33C43.46,4.56,42.59,4.29,42,4.12Z"/>
+                    <path class="cls-20"
+                          d="M41.31,103.24h.19a19.25,19.25,0,0,0,2.18-.21,12.53,12.53,0,0,0,3.66-1.15,29.93,29.93,0,0,0,4.39-3l1-.8-.05-.06-.62.13-1,.25c-.41,0-.75.1-1.14.13l-1.44.11a22.81,22.81,0,0,1-2.59,0A13.06,13.06,0,0,1,42.1,98c-.33-.12-.63-.25-.9-.37a16.73,16.73,0,0,1,.21-1.9,6,6,0,0,0,1.2.93,9.32,9.32,0,0,0,3.29,1.16,15.54,15.54,0,0,0,2.49.17l1.46,0c.6,0,1.35-.09,2.06-.16a12.72,12.72,0,0,0,1.69-.12l0,0c-.42.44-1,1-1,1-.56.47-.85.86-1.4,1.29s-.9.73-1.32,1.06a24.53,24.53,0,0,1-2.28,1.62,18.1,18.1,0,0,1-3.74,1.7c-1,.34-1.69.55-2.15.69l-.23.07C41.45,104.51,41.36,103.87,41.31,103.24Z"/>
+                    <path class="cls-20"
+                          d="M39.89,127.52l2.18-2.07.06,0,.06,0a.85.85,0,0,0-.1.13,2.41,2.41,0,0,0-.28.54,1.32,1.32,0,0,0,.23,1.46,4.93,4.93,0,0,0,.45.42l.52.42c.33.27.65.51.93.7.57.41,1,.63,1,.77s-.57.24-1.32.07a8.43,8.43,0,0,1-1.23-.41l-.66-.3a4.22,4.22,0,0,1-.71-.41A3,3,0,0,1,39.89,127.52Z"/>
+                    <path class="cls-20"
+                          d="M40.94,5.94l.21-2,0,0,.83.24c.58.17,1.45.44,2.66.87.28.1.57.2.88.33l-.19.06-.66.23L44,5.89l-.49.22a12.64,12.64,0,0,0-1.73-.17,4.65,4.65,0,0,0-.63,0Z"/>
+                    <path class="cls-20"
+                          d="M40.65,89.47c.1-.33.23-.66.34-1,.64-.29,1.08-.41,1.12-.32S41.55,88.76,40.65,89.47Z"/>
+                    <path class="cls-20"
+                          d="M41.2,97.59a7,7,0,0,1-1.83-1.13L41,95.12a1.8,1.8,0,0,0,.45.57A16.73,16.73,0,0,0,41.2,97.59Z"/>
+                    <path class="cls-20"
+                          d="M41.53,105.16l-.47.13-.23-2.07.16,0h.32C41.36,103.87,41.45,104.51,41.53,105.16Z"/>
+                    <path class="cls-20"
+                          d="M40,108.29c-.08-.47-.17-.93-.26-1.38a.19.19,0,0,0,0-.13s0,0,0-.07a2.11,2.11,0,0,0,.25-.14l.07,0h0l.09,0h0l0,0,.07,0,0,0,.07,0,.24-.11a0,0,0,0,1,0,0l.21-.1v0l0,.08,0,.11a1.75,1.75,0,0,1,.05.4,1.63,1.63,0,0,1-.17.8A1.86,1.86,0,0,1,40,108.29Z"/>
+                    <path class="cls-20"
+                          d="M43.15,117.94a38.44,38.44,0,0,1-2.85-8.45c-.09-.4-.17-.81-.26-1.2a1.86,1.86,0,0,0,.85-.76,1.63,1.63,0,0,0,.17-.8,1.75,1.75,0,0,0-.05-.4l0-.11,0-.08v0h0s0,0,0,.06v-.09s0,0,0,0h0l-.06-.88c0-.67-.1-1.32-.14-2h.07l.23,2.07.47-.13c.18,1.29.41,2.6.68,3.92a42.89,42.89,0,0,0,1.35,5,1.84,1.84,0,0,0-.46-.24c-.2-.06-.33,0-.31.06s.11,0,.22.14.23.26.38.43a1.37,1.37,0,0,0,.44.36c.12.36.27.72.42,1.07,0,0,0,0,0,0a.09.09,0,0,0,.07,0c.14.38.31.75.48,1.12.11.2.21.42.33.63l-.24.12c-.1-.19-.17.34-.89,1.54C43.67,118.94,43.4,118.45,43.15,117.94Z"/>
+                    <path class="cls-20"
+                          d="M39.82,127.31a3.48,3.48,0,0,1-.1-1.7,5.9,5.9,0,0,1,.33-1.08c.07-.13.12-.22.15-.29l0,0,.07-.1a1.84,1.84,0,0,1,.15-.18l.79.87a1.81,1.81,0,0,0,.2.21,2.93,2.93,0,0,0,.63.46l-2.18,2.07A1.29,1.29,0,0,1,39.82,127.31Z"/>
+                    <path class="cls-20"
+                          d="M39.3,95.24c.06-.5.14-1,.22-1.48.06-.28.11-.56.17-.84h0a1.06,1.06,0,0,0,.17-.1l1,1.44Z"/>
+                    <path class="cls-20"
+                          d="M39.11,97.28c0-.7.1-1.37.19-2l1.56-1-1-1.44a1.06,1.06,0,0,1-.17.1,26.37,26.37,0,0,1,1-3.44c.9-.71,1.52-1.19,1.46-1.29s-.48,0-1.12.32c.11-.3.23-.59.35-.87.79-1.78,1.49-3.13,2.06-4.35L45,80l.92.38c.42.17.77.32,1.26.49-.13.25-.35.7-.66,1.32-.05-.21-.1-.38-.15-.55a2,2,0,0,0-.3-.61,1.49,1.49,0,0,0-.37-.34l-.94,1.83A10.15,10.15,0,0,1,45.62,84a3.18,3.18,0,0,0-.16.32c-.56,1.17-1.34,2.65-2.07,4.22-.15.36-.31.72-.45,1.11a1.49,1.49,0,0,1-.42-.49l-1.45,1.49a5.36,5.36,0,0,0,1.31.61,25.6,25.6,0,0,0-.73,2.93q-.15.75-.24,1.53a1.8,1.8,0,0,1-.45-.57l-1.59,1.34a7,7,0,0,0,1.83,1.13,25,25,0,0,0-.05,3.58c0,.67.09,1.37.16,2.07H41l-.16,0h-.07v0c-.09-1.39-.18-2.74-.26-4l-.41-.52-.25-.34-.48-.66A4,4,0,0,1,39.11,97.28Z"/>
+                    <path class="cls-20"
+                          d="M39.06,100a20.88,20.88,0,0,1,0-2.75,4,4,0,0,0,.25.37l.48.66.25.34.41.52c.08,1.28.17,2.63.26,4v0c0,.65.1,1.3.14,2l.06.88h0l0,0-.21.11a0,0,0,0,0,0,0l-.24.11-.07,0,0,0-.07,0,0,0h0l-.09,0h0l-.07,0-.25.09h0a2.05,2.05,0,0,1-.07-.31,0,0,0,0,1,0,0l-.12-1c0-.16,0-.34-.06-.51l-.15-1.48C39.26,102.17,39.15,101.07,39.06,100Z"/>
+                    <path class="cls-20" d="M38.91,142.59a1.51,1.51,0,0,1,.46-.07s-.23.16-.63.29Z"/>
+                    <path class="cls-20"
+                          d="M37.43,179.76c-.43-.25-.85-.51-1.26-.79a1.54,1.54,0,0,1,.28-.09c.44-.13,1.07-.32,1.8-.58a17.21,17.21,0,0,0,5-2.58A6.53,6.53,0,0,0,45.6,171a14.52,14.52,0,0,0-.07-2.48l.11,0A6.9,6.9,0,0,1,46,171a7.68,7.68,0,0,1-.45,2.71,6.64,6.64,0,0,1-1.83,2.65,17.62,17.62,0,0,1-5.13,3Z"/>
+                    <path class="cls-20" d="M38.47,103.56a1,1,0,0,0-.16-.12s0,0,0,0,.07,0,.13.07h0v.07Z"/>
+                    <path class="cls-20"
+                          d="M38.47,103.57v.05l.06,0s.06,0,.06,0a0,0,0,0,1,0,0,1.54,1.54,0,0,0,.19.17.28.28,0,0,1-.17.09c-.29-.06-.23-.16-.28-.22a.56.56,0,0,1,0-.15.28.28,0,0,1,0-.13,1,1,0,0,1,.16.12Z"/>
+                    <path class="cls-20"
+                          d="M36.74,96.41a1.67,1.67,0,0,1-.12-1.21c.12-.36.53-.56.87-.8.16-.12.32-.22.46-.31l1.74-1.17c-.06.28-.11.56-.17.84-.08.48-.16,1-.22,1.48l-.49.31c-.16.1-.31.2-.49.3h0s0,0,0,0l.09.21.16.28c.16.29.35.59.56.9a20.88,20.88,0,0,0,0,2.75c0-.09,0-.17,0-.27l0,0-.12-.14-.27-.35-.52-.68c-.34-.46-.66-.9-.94-1.37L37,96.86A3.16,3.16,0,0,1,36.74,96.41Z"/>
+                    <path class="cls-20"
+                          d="M37.77,132.51A5.53,5.53,0,0,1,36.25,131c.56-.55,1.1-1.06,1.61-1.55,0,.07,0,.13,0,.19a4.72,4.72,0,0,0,1,1.64c1,1.15,2.48,1.91,2.36,2.23S39.36,133.6,37.77,132.51Z"/>
+                    <path class="cls-20"
+                          d="M41.25,78.37a29.72,29.72,0,0,0-3.7,1.43,14.77,14.77,0,0,0-2,1.18c-.09-.08.54-.85,1.78-1.57a22.66,22.66,0,0,1,3-1.47C40.61,78.07,40.93,78.22,41.25,78.37Z"/>
+                    <path class="cls-20"
+                          d="M37.76,146c-1.55,2.25-2,4.08-2.18,4a6.41,6.41,0,0,1,.68-3,1.72,1.72,0,0,0,.54-.28s-.17,0-.46.09a13.37,13.37,0,0,1,.64-1.34,17.81,17.81,0,0,1,1.76-2.68c.4-.13.63-.24.63-.29a1.51,1.51,0,0,0-.46.07c1.32-1.7,3-3.45,4.54-5.16,1.26-1.36,2.4-2.77,3.46-4.15a45.12,45.12,0,0,0,2.68-3.8,24,24,0,0,0,1.49-2.84c.08-.2.15-.39.21-.53.64.37,1.28.7,2,1,0,0,0,.11,0,.17h0c0,.09-.08.18-.13.27a22.54,22.54,0,0,1-1.76,3.07,41.59,41.59,0,0,1-3,3.87c-1.13,1.33-2.41,2.76-3.76,4.06C42,141.17,39.26,143.68,37.76,146Z"/>
+                    <path class="cls-20"
+                          d="M36.8,146.74a1.72,1.72,0,0,1-.54.28,1.08,1.08,0,0,1,.08-.19C36.63,146.76,36.79,146.71,36.8,146.74Z"/>
+                    <path class="cls-20"
+                          d="M36,130.39c-.19-.33-.31-.62-.39-.79l.13,0,.29-.15.23-.12,1.37-.75a1.74,1.74,0,0,1,.16.46c0,.13.07.28.11.44-.51.49-1,1-1.61,1.55a.25.25,0,0,1,0-.07l0,0A3.61,3.61,0,0,1,36,130.39Z"/>
+                    <path class="cls-20" d="M36,159.34a2.4,2.4,0,0,1,.31-.59,2.56,2.56,0,0,1-.21.78Z"/>
+                    <path class="cls-20" d="M36,103.59s.09-.11.24-.25l.4-.14,0,.06C36.21,103.6,36,103.6,36,103.59Z"/>
+                    <path class="cls-20"
+                          d="M35.58,179.75a.31.31,0,0,1,0-.43.26.26,0,0,1,.17-.23l.45-.12h0c.41.28.83.54,1.26.79l-.65.21-.74.24c-.07,0-.15,0-.24-.11S35.71,179.85,35.58,179.75Z"/>
+                    <path class="cls-20"
+                          d="M35.47,129.45c1.63-1.87,3.26-3.76,4.93-5.58l.05,0a1.84,1.84,0,0,0-.15.18l-.07.1,0,0c0,.07-.08.16-.15.29a5.9,5.9,0,0,0-.33,1.08,3.48,3.48,0,0,0,.1,1.7,1.29,1.29,0,0,0,.07.21l-.75.71c-.41.38-.83.79-1.28,1.2,0-.16-.07-.31-.11-.44a1.74,1.74,0,0,0-.16-.46l-1.37.75-.23.12-.29.15-.13,0,0-.09h0Z"/>
+                    <path class="cls-20"
+                          d="M35.12,104.64a.68.68,0,0,1,0-.6,1.84,1.84,0,0,1,1-.67l.09,0c-.15.14-.27.22-.24.25s.25,0,.61-.33l0-.06a2.41,2.41,0,0,1,.72-.12,1.86,1.86,0,0,1,1,.36.28.28,0,0,0,0,.13.56.56,0,0,0,0,.15c0,.06,0,.16.28.22a.28.28,0,0,0,.17-.09,2.86,2.86,0,0,1,.43.42.78.78,0,0,1,.2.41.49.49,0,0,1,0,.12.56.56,0,0,1,0,.2c0,.18-.12.25-.14.25s.21-.45-.21-.83c-.2-.19-.49-.37-.78-.59a1.5,1.5,0,0,0-1-.34,3,3,0,0,0-1,.32c-.32.15-.62.32-.67.46s0,.25.12.37a.9.9,0,0,0,.17.15s0,.17-.1.31-.21.19-.27.15a1.89,1.89,0,0,1-.24-.25A1,1,0,0,1,35.12,104.64Z"/>
+                    <path class="cls-20"
+                          d="M35.85,159a11.34,11.34,0,0,1-.91-3.46.81.81,0,0,1,0-.16c.22-.13.31-.22.29-.25a1.84,1.84,0,0,0-.3.12,9.26,9.26,0,0,1,.65-4.7h0a26.19,26.19,0,0,0,.18,4.87,11,11,0,0,0,1.07,3.12c.43.76.8,1.31.82,1.34s.36.58.83,1.39,1.17,1.84,1.92,2.82a17.59,17.59,0,0,0,2.23,2.48c.68.6,1.22.93,1.18,1s0,0,0,0a4.13,4.13,0,0,1-1.41-.65,14.18,14.18,0,0,1-2.61-2.33,30,30,0,0,1-2.16-2.75c-.56-.78-.91-1.33-.94-1.36s-.22-.37-.53-1a2.56,2.56,0,0,0,.21-.78,2.4,2.4,0,0,0-.31.59C36,159.23,35.92,159.12,35.85,159Z"/>
+                    <path class="cls-20"
+                          d="M35.57,129.6c.08.17.2.46.39.79a3.61,3.61,0,0,0,.29.48l0,0a2.59,2.59,0,0,1-.25-.4c-.19-.34-.31-.63-.39-.79l0-.1h0Z"/>
+                    <path class="cls-20" d="M35.52,129.6l-.11-.09.05-.06h0l.05,0h0l0,.09h0Z"/>
+                    <path class="cls-20"
+                          d="M34.92,155.24a1.84,1.84,0,0,1,.3-.12s-.07.12-.29.25A.3.3,0,0,1,34.92,155.24Z"/>
+                    <path class="cls-20"
+                          d="M34.05,97a5.89,5.89,0,0,1-.79-1.26,3.51,3.51,0,0,1-.23-.61A1.54,1.54,0,0,1,33,94.7a1.43,1.43,0,0,1,.44-1.19l.26-.24.23-.19.51-.42c.37-.3.78-.61,1.21-.92.89-.64,1.88-1.29,2.81-1.86A21.35,21.35,0,0,1,41,88.5c-.11.31-.24.64-.34,1-.48.36-1,.8-1.62,1.28-.85.67-1.73,1.41-2.52,2.11-.39.35-.75.69-1.07,1-.17.15-.31.3-.45.43l-.2.2c0,.06-.14.15-.11.14s0,0,0,.1a3.3,3.3,0,0,0,.12.37,4.77,4.77,0,0,0,.47.93c.45.7,1.65,1.51,2.55,2.72a5.58,5.58,0,0,1,.94,2,8.36,8.36,0,0,1,.18,1.81c0,.26,0,.5,0,.73s0,.2-.05.31a.58.58,0,0,1,0,.16.31.31,0,0,1,0,.1h0a1.54,1.54,0,0,1-.19-.17h0l0-.06h0l-.06,0-.1-.08a1.77,1.77,0,0,0,0-.21l-.13-.67a5.87,5.87,0,0,0-1.41-3.09C36.07,98.62,34.87,98,34.05,97Z"/>
+                    <path class="cls-20"
+                          d="M34.27,136.13a5.49,5.49,0,0,1-1.55-1.42c.56-.62,1.1-1.21,1.62-1.76,0,.12.08.31.16.55a4.51,4.51,0,0,0,.78,1.32,6.28,6.28,0,0,0,1.31,1c.41.24.69.29.76.43s-.32.47-.94.45A4.35,4.35,0,0,1,34.27,136.13Z"/>
+                    <path class="cls-20"
+                          d="M33.77,9.84l.51-.56A27.81,27.81,0,0,1,38.55,5.6c.81-.59,1.68-1.16,2.6-1.7l-.21,2h.19a4.65,4.65,0,0,1,.63,0,12.64,12.64,0,0,1,1.73.17c-.31.12-.61.25-.9.38-.92.42-1.81.87-2.66,1.32a38.84,38.84,0,0,0-4.43,2.82c-.14.12-.28.22-.42.32a1.6,1.6,0,0,0-.37.15,5.94,5.94,0,0,0-.82.6A2.88,2.88,0,0,0,33.77,9.84Z"/>
+                    <path class="cls-20"
+                          d="M33.14,104.46a12.44,12.44,0,0,1,.71-1.52,2.55,2.55,0,0,1,.53-.64c.22-.2.35-.28.58-.49a4.73,4.73,0,0,1,.63-.49c.2-.09.44-.2.63,0,.29.3.26.77.36,1.12,0,.18.06.29.09.44a.48.48,0,0,1-.07.37l-.4.14.17-.21c.09-.11,0-.34-.12-.6s-.08-.48-.26-.69-.28,0-.39.14-.21.22-.32.33-.33.3-.47.45a2.1,2.1,0,0,0-.37.52,13.8,13.8,0,0,0-.56,1.45c-.07.25-.2.56-.24.79a1,1,0,0,0,0,.63,1.9,1.9,0,0,0,1.14.84,7.19,7.19,0,0,0,1.79.35,13.79,13.79,0,0,0,1.93,0c.58,0,1.22-.21,1.25-.43a.07.07,0,0,0,0,0c.09.45.18.91.26,1.38a2.19,2.19,0,0,1-.33.12,4.35,4.35,0,0,1-1.16.15,14.28,14.28,0,0,1-2.09-.15,8.45,8.45,0,0,1-2-.5,2.69,2.69,0,0,1-1.63-1.47,1.84,1.84,0,0,1,0-1.14A7.93,7.93,0,0,1,33.14,104.46Z"/>
+                    <path class="cls-20"
+                          d="M32.6,134.4a4.9,4.9,0,0,1-.48-.88,7.8,7.8,0,0,1,1-.44,3.43,3.43,0,0,1,1.13-.28.71.71,0,0,1,.05.15c-.52.55-1.06,1.14-1.62,1.76l0-.07,0,0Z"/>
+                    <path class="cls-20"
+                          d="M31.8,13.23a.43.43,0,0,1,0-.2,2,2,0,0,1,.13-.48,11.78,11.78,0,0,1,1.85-2.71,2.88,2.88,0,0,1,.12,1.86,13,13,0,0,0-1,1l-.31.33c-.17.18-.32.35-.5.52l-.08,0A.42.42,0,0,1,31.8,13.23Z"/>
+                    <path class="cls-20"
+                          d="M32.12,133.52a4.9,4.9,0,0,0,.48.88l.12.19,0,0-.08-.12a5.7,5.7,0,0,1-.51-1Z"/>
+                    <path class="cls-20"
+                          d="M31,48.78a45.18,45.18,0,0,1,3.17-4,46.45,46.45,0,0,1,5.55-5.37,28.42,28.42,0,0,1,2.65-1.87c.12,0,.9-.55,2.31-1.16a30.17,30.17,0,0,1,5.93-1.72,50.93,50.93,0,0,1,8.62-.94A16.53,16.53,0,0,1,69,37.34l0,0,0,0a15.62,15.62,0,0,1,4.65,5.33,21,21,0,0,1,2.06,6.67,58,58,0,0,1,.51,6.52,26.1,26.1,0,0,1-.29,6,22.4,22.4,0,0,1-3.49,8.37c-1.24,1.83-2.22,2.7-2.31,2.61s.18-.26.51-.75.82-1.21,1.36-2.14A23.86,23.86,0,0,0,75,61.72,25,25,0,0,0,75,56a56.61,56.61,0,0,0-.7-6.34,19.74,19.74,0,0,0-2.07-6.13A13.89,13.89,0,0,0,68,38.83l-.06-.06a14.81,14.81,0,0,0-8.67-3A50,50,0,0,0,51,36.84a27.46,27.46,0,0,0-5.46,1.7,19.55,19.55,0,0,0-2,1,27.29,27.29,0,0,0-2.44,1.67A48.57,48.57,0,0,0,32.64,50l-.77,1.08-.18.26,0,0s-.07.06,0,.09l.07.08.4.48c.3.35.61.71.93,1.06a87.23,87.23,0,0,0,8.33,8.32,46.42,46.42,0,0,0,4.73,3.56l1.23.77,1.26.68c.84.44,1.73.84,2.58,1.25,3.41,1.62,6.6,3.08,9.41,4.13A27.31,27.31,0,0,0,64.42,73a13.17,13.17,0,0,0,3.09.27,9.54,9.54,0,0,0,2-.19c.45-.08.66-.19.68-.17s-.86.69-2.65.83a13.2,13.2,0,0,1-3.24,0,19,19,0,0,1-2.24-.49c-.58-.15-1.18-.34-1.8-.53-2.91-.94-6.18-2.3-9.65-3.81-.88-.38-1.75-.76-2.65-1.18L46.6,67l-1.31-.76a46.69,46.69,0,0,1-5-3.56,85.36,85.36,0,0,1-8.73-8.29c-.32-.36-.64-.72-1-1.06l-.51-.58-.82-1c0-.08-.2-.17-.14-.25l.17-.26.36-.53.56-.82C30.47,49.5,30.72,49.14,31,48.78Z"/>
+                    <path class="cls-20"
+                          d="M29.6,140.43a5.43,5.43,0,0,1-.6-1.28c.15-.19.29-.38.44-.56s.15-.17.22-.27a4.5,4.5,0,0,0,.6,1.71,4.41,4.41,0,0,0,1.22,1.36,5.47,5.47,0,0,0,1.92.89,14.14,14.14,0,0,0,4.1.46,11,11,0,0,0,1.41-.15l-.17.22a10.38,10.38,0,0,1-1.22.26,12.84,12.84,0,0,1-4.25-.21,6.35,6.35,0,0,1-2.2-.9A5.05,5.05,0,0,1,29.6,140.43Z"/>
+                    <path class="cls-20"
+                          d="M29.44,138.59c-.15.18-.29.37-.44.56l0-.09,0,0a5.11,5.11,0,0,1-.18-.73.39.39,0,0,1,.36-.34.45.45,0,0,1,.47.31.18.18,0,0,0,0,0C29.59,138.42,29.51,138.5,29.44,138.59Z"/>
+                    <path class="cls-20"
+                          d="M28.82,138.3A5.11,5.11,0,0,0,29,139l0,0a6.1,6.1,0,0,1-.15-.64A.24.24,0,0,1,28.82,138.3Z"/>
+                    <path class="cls-20"
+                          d="M25.91,145.31a6.46,6.46,0,0,1-.49-.77c.14-.29.3-.59.46-.87a6.35,6.35,0,0,0,.66,1.17,6.07,6.07,0,0,0,3.65,2.4,11.09,11.09,0,0,0,4.54-.05c.7-.13,1.26-.28,1.61-.36a1.08,1.08,0,0,0-.08.19,13.24,13.24,0,0,1-1.45.49,10.91,10.91,0,0,1-4.74.32A6.69,6.69,0,0,1,25.91,145.31Z"/>
+                    <path class="cls-20"
+                          d="M25,143.74l.18-.46a.08.08,0,0,0,0,0l.23-.5s0,0,0,0a.33.33,0,0,1,.16.22s0,0,0,0a4.76,4.76,0,0,0,.17.52s0,.09.05.14c-.16.28-.32.58-.46.87A4.54,4.54,0,0,1,25,143.74Z"/>
+                    <path class="cls-20"
+                          d="M25.48,142.63h0c.27-.62.56-1.23.85-1.82a1.37,1.37,0,0,1,.15-.21c.66-1,1.23-2,1.81-3,.48-.71,1-1.42,1.46-2.12.77-.86,1.54-1.7,2.35-2.52,1.14-1.15,2.25-2.37,3.34-3.59l.05.06-.05.06.11.09h0l0,.1c.08.16.2.45.39.79a2.59,2.59,0,0,0,.25.4c-.48.46-1,1-1.47,1.49l-.4.43a.51.51,0,0,0-.05-.14,3.16,3.16,0,0,0-1.13.28,3.76,3.76,0,0,0-1.07.48l0,.07,0,0a5.7,5.7,0,0,0,.51,1l.08.12c-1,1.11-2,2.29-3,3.57a.18.18,0,0,1,0-.05.44.44,0,0,0-.47-.31.37.37,0,0,0-.36.45.24.24,0,0,0,0,.12,6.1,6.1,0,0,0,.15.64c-.78,1-1.56,2.05-2.29,3.16-.28.43-.55.88-.8,1.33,0-.05,0-.09-.05-.13s-.11-.32-.14-.42-.05-.14-.05-.15A.31.31,0,0,0,25.48,142.63Z"/>
+                    <path class="cls-20"
+                          d="M28.92,166.56a10.89,10.89,0,0,1-2.79,0q-.78-.08-1.38-.18c-.09-.3-.19-.6-.27-.9a15.35,15.35,0,0,0,1.74.31,11.14,11.14,0,0,0,2.61.07,10.43,10.43,0,0,0,2.84-.83,6.1,6.1,0,0,0,2.42-1.65,4.49,4.49,0,0,0,.68-1.13c.18-.41.34-.8.49-1.17.31-.74.57-1.35.76-1.76l.1.19c-.12.43-.32,1-.56,1.7l-.4,1.18a7.28,7.28,0,0,1-1,1.65,5.46,5.46,0,0,1-2.21,1.53A10.22,10.22,0,0,1,28.92,166.56Z"/>
+                    <path class="cls-20" d="M24.57,166.36c-.07-.29-.14-.59-.2-.88l.11,0c.08.3.18.6.27.9Z"/>
+                    <path class="cls-20"
+                          d="M24.37,165.48c.06.29.13.59.2.88l.18,0c.37,1.24.72,2.37.85,2.66a5.18,5.18,0,0,1,.28,1l.18.82c.13.55.25,1.09.36,1.64.25,1.11.49,2.22.74,3.35l.11.53,0,.11c0,.06,0,0,.06,0l.15-.18,1.06-1.37,1-1.31.7,1.49c.47,1,.95,2,1.43,3,0-.92,0-1.84-.06-2.77.79.69,1.64,1.49,2.38,2.08.37.3.79.6,1.12.84l.61.43.41.26-.45.12a.26.26,0,0,0-.17.23.31.31,0,0,0,0,.43c.13.1.24.23.22.35s.17.13.24.11l.74-.24.65-.21.92.52A24.82,24.82,0,0,0,44,182.59c.92.25,1.85.46,2.8.66a.61.61,0,0,0-.09.14c-.1.16.06.41.35.56s.57.17.65.05a4.48,4.48,0,0,1,.33-.51c2.77.51,5.64.87,8.5,1.31l1.6.25.35,0H59l.57-.07c1.07-.07,2.15-.15,3.22-.24.83-.07,1.65-.16,2.49-.25l-.16.29c-.08.19.09.44.4.56s.59.09.66-.06.15-.29.36-.74a1,1,0,0,0,.11-.21c.86-.1,1.72-.22,2.58-.34,2.13-.31,4.26-.71,6.34-1.21a31.7,31.7,0,0,0,6-2l0,0h0l5.64-2.23c1.94-.36,3.6-.63,5.35-1,.84-.23,1.71-.41,2.53-.72l1.23-.41,1.22-.5a27.66,27.66,0,0,0,8.61-5.65,21.71,21.71,0,0,0,5.46-8.35,17.55,17.55,0,0,0,.69-2.38,9.4,9.4,0,0,0,.21-1.2l.1-.6a2.53,2.53,0,0,0,0-.38l-.55-.84c-.22-.33-.5-.6-.75-.91a7.08,7.08,0,0,0-6.17-2.29,15.51,15.51,0,0,0-4.47,1.11c-1.43.55-2.82,1.28-4.21,1.92s-2.73,1.35-4.07,2c-5.33,2.71-10.31,5.39-15.08,7.49a63,63,0,0,1-11.29,3.89,2.28,2.28,0,0,0-.74-.22c-.56-.07-.83.19-.79.21a2,2,0,0,1,.75,0l.3.11c-.57.13-1.13.25-1.69.34a33.19,33.19,0,0,1-10.83.2l-1.79-.3a.71.71,0,0,1-.14-.1c-.38-.26-.66-.29-.67-.26s.14.11.32.25c-.59-.14-1.12-.3-1.62-.44-1.11-.33-2-.61-2.82-.82l-.77-.23c0-.09-.06-.13-.09-.13s0,0,0,.1l-.85-.28a2.67,2.67,0,0,1-.57-.21,4.61,4.61,0,0,1,.6.11l1.76.42,2.85.71c.55.14,1.15.31,1.79.45l2.09.29a33.25,33.25,0,0,0,10.64-.4,58.61,58.61,0,0,0,13.24-4.48c4.7-2.15,9.62-4.86,14.94-7.65,1.33-.68,2.68-1.39,4.07-2s2.77-1.42,4.28-2a17.14,17.14,0,0,1,4.79-1.24,8.68,8.68,0,0,1,5.08,1,9,9,0,0,1,2.09,1.64c.28.35.61.66.86,1l.83,1.26a3.7,3.7,0,0,1-.08.86l-.08.65a9.94,9.94,0,0,1-.22,1.29,21.91,21.91,0,0,1-.71,2.52,22.81,22.81,0,0,1-5.73,8.92,28.74,28.74,0,0,1-9,6l-1.25.54-1.31.45c-.86.32-1.76.52-2.65.77-1.76.4-3.66.73-5.27,1.05l-5.42,2.17A33.44,33.44,0,0,1,76,184.45c-2.15.53-4.32,1-6.49,1.28s-4.36.6-6.53.8c-1.09.11-2.19.19-3.27.26l-.56.05h-.93l-.32-.06-1.6-.22a121.47,121.47,0,0,1-12.76-2.18A26.8,26.8,0,0,1,37.44,182c-.94-.51-1.86-1.06-2.75-1.65l-.8-.55-.21-.16s0,.13,0,.2v.28l.06,2.64.13,4.61-2-4.18q-1.36-2.88-2.71-5.68l-.09.12-1,1.29c-.34.42-.71.88-1,.82a2.09,2.09,0,0,1-.26-.13c-.18-.63-.37-1.25-.59-1.86a45.63,45.63,0,0,0-.92-8.16c-.19-.87-1.63-6.41-1.84-7.25.14.34.57,1.76,1,3.21Z"/>
+                    <path class="cls-20" d="M22.55,159.93l.68,1.75A10.68,10.68,0,0,1,22.55,159.93Z"/>
+                    <path class="cls-20"
+                          d="M22.48,151.76a44.53,44.53,0,0,1,2.54-8,4.54,4.54,0,0,0,.4.8c-.37.71-.7,1.44-1,2.2a47.8,47.8,0,0,0-1.56,5.43,8.75,8.75,0,0,0-.27,1.72,4.53,4.53,0,0,1-.35-.51l0,0C22.28,152.82,22.36,152.33,22.48,151.76Z"/>
+                    <path class="cls-20"
+                          d="M22.5,156.52a22.18,22.18,0,0,0,.73,5.16l-.68-1.75,0-.06v0C22.59,159.36,22.52,158,22.5,156.52Z"/>
+                    <path class="cls-20"
+                          d="M22.5,155.05c0-.39,0-.79.07-1.16a5.43,5.43,0,0,0,1.13,1.16,6.83,6.83,0,0,0,4.49,1.34,34.12,34.12,0,0,0,4.9-.62,13.27,13.27,0,0,0,1.56-.43l.27-.1a.3.3,0,0,0,0,.13,7.25,7.25,0,0,1-1.76.71,27.13,27.13,0,0,1-5,.91,7.52,7.52,0,0,1-5-1.31A5.27,5.27,0,0,1,22.5,155.05Z"/>
+                    <path class="cls-20"
+                          d="M22.22,23.94a11.3,11.3,0,0,1,.89-2c.3-.49.53-.84.54-.85s.27-.34.67-.76A16.71,16.71,0,0,1,25.78,19h0l1-.31c.64-.22,1-.7.92-1,.45-.23.76-.34.79-.28s-1.07,1-2.06,2.1a17,17,0,0,0-1.3,1.51c-.35.44-.55.75-.57.76l-.57.75a10.79,10.79,0,0,0-1,1.67c-.67,1.27-.81,2.72-1,2.72s-.18-.36-.17-.94A7.22,7.22,0,0,1,22.22,23.94Z"/>
+                    <path class="cls-20"
+                          d="M22.08,154c0-.21.07-.41.11-.63l0,0a4.53,4.53,0,0,0,.35.51c0,.37-.05.77-.07,1.16-.12-.11-.23-.23-.33-.34s-.05-.42-.08-.62C22.09,154.05,22.08,154,22.08,154Z"/>
+                    <path class="cls-20"
+                          d="M22.5,156.52c0,1.5.09,2.84,0,3.33a11.72,11.72,0,0,1-.44-5.76c0,.2.05.41.08.62s.21.23.33.34C22.49,155.54,22.49,156,22.5,156.52Z"/>
+                    <path class="cls-20"
+                          d="M21,15.92a7.69,7.69,0,0,1,4.63.15,4.42,4.42,0,0,1,2,1.64l0,0A12.18,12.18,0,0,0,25.88,19a.46.46,0,0,0-.07.07h0c-.14,0-.21,0-.23,0a2,2,0,0,0-.18-.28,2.47,2.47,0,0,0-.7-.58,6.07,6.07,0,0,0-3.4-.49c-3.05.18-6-.18-6-.48S18.22,16.54,21,15.92Z"/>
+                    <path class="cls-20"
+                          d="M16.19,52.35l-3.65,2.48-.73.5-.26.18-.36.26.57.13,1.85.48L20,58.11l-2.85,1.57-1.35.78-.5.3-.16.11h0S15,61,15,61l.22.13,4.49,2.81c2.58,1.6,4.2,2.66,4.34,2.74l2.21,1.53c.69.49,1.37,1,2.3,1.54s1.95,1.14,3.11,1.76c2.3,1.25,5,2.62,8,4,1,.48,2,1,3.07,1.45l-.68.24c-.61.22-1.21.45-1.79.7q-.7-.33-1.41-.63c-3-1.35-5.8-2.67-8.18-3.88-1.19-.63-2.28-1.2-3.25-1.77S25.61,70.52,25,70.09c-1.32-.87-2.11-1.39-2.2-1.46l-4.25-2.8-4.46-2.92c-.31-.23-.76-.5-1.07-.78l-.39-.47a3.15,3.15,0,0,1-.27-.45c-.11-.15,0-.36.06-.5s.06-.32.23-.49a1.75,1.75,0,0,1,.48-.45,4.72,4.72,0,0,1,.61-.43c1-.6.72-.43.85-.5l.26-.12a1.29,1.29,0,0,0-.28-.12l-.09,0-.32-.09-1-.3c-2-.59-4-1.17-6.07-1.76,1.53-1,3.07-2,4.61-3l1.5-1,.37-.24.14-.07.27-.17.28-.17s-.16-.08-.24-.12l-.29-.14-.47-.19-.79-.34c-.09,0-.38-.14-.55-.23a1.94,1.94,0,0,1-.49-.41,1.64,1.64,0,0,1,.21-2.25,14.37,14.37,0,0,0,3.3-5.33,28.7,28.7,0,0,0,1.41-5,27.61,27.61,0,0,0,.44-4l.3.25h0A18.91,18.91,0,0,1,17,38a27.1,27.1,0,0,1-1.13,5.21,18.13,18.13,0,0,1-1.25,3,12.6,12.6,0,0,1-.9,1.47c-.17.24-.35.49-.54.72l-.29.35-.26.28a.46.46,0,0,0-.05.66.51.51,0,0,0,.16.09l.23.09.79.3,2.45.92.68.26.33.13.18.07.08,0-.06,0Z"/>
+                    <path class="cls-20"
+                          d="M10.34,22.34a56.26,56.26,0,0,0,4.4,7.18c3.13,3.81,5.32,6.43,5.07,6.67s-1.15-.63-2.77-2h0a2.87,2.87,0,0,0-.21-1s-.06.26-.09.73c-1-.85-2.12-1.93-3.41-3.18a49.89,49.89,0,0,1-5.26-7l-.32-.51L7.67,23l-.12-.21-.14-.33c-.19-.39-.34-.79-.51-1.19a25.91,25.91,0,0,1-.78-2.5,24.11,24.11,0,0,1-.54-2.61c-.06-.45-.12-.9-.15-1.37,0-.23,0-.48,0-.72s0-.25,0-.37,0-.36,0-.52a4,4,0,0,1,.66-2,3.28,3.28,0,0,1,1.72-1.1l.49-.18.33-.09.64-.19,1.27-.33c1.66-.42,3.29-.75,4.89-1s3.17-.5,4.76-.61a25.48,25.48,0,0,1,4.49.26C27.32,8.26,29.45,8.7,31,9s2.4.52,2.46.54a.49.49,0,0,1,.34.29,11.78,11.78,0,0,0-1.85,2.71,2,2,0,0,0-.13.48.43.43,0,0,0,0,.2.42.42,0,0,0,.21.27l.08,0c-.12.14-.25.27-.38.41L30,13.47c-1.45-.35-3.49-.86-5.91-1.29a23.3,23.3,0,0,0-3.69-.42c-1.32,0-2.83.17-4.34.35s-3.12.42-4.7.71l-1.18.24-1,.22a.73.73,0,0,0-.34.13.82.82,0,0,0-.13.33v.11a2.11,2.11,0,0,0,0,.25c0,.19,0,.37,0,.55,0,.37,0,.75.05,1.14A20.19,20.19,0,0,0,9,18.11a22.85,22.85,0,0,0,.53,2.24c.11.37.23.72.35,1.06l.09.23,0,.06.06.13Z"/>
+                </g>
+                <path class="cls-5"
+                      d="M79.69,146.47l-.53.24-.06-.13.06-.13c.06-.1,0-.1,0-.29a3.11,3.11,0,0,0,0-.32,1.36,1.36,0,0,1,.25.22A1.9,1.9,0,0,1,79.69,146.47Z"/>
+                <path class="cls-5"
+                      d="M79.18,146.16c0,.19,0,.19,0,.29l-.06.13a1.28,1.28,0,0,0-.76-.63,3.78,3.78,0,0,0-.88,0,.79.79,0,0,0-.29,0c-.09,0-.13,0-.14,0s0-.05.1-.09a.46.46,0,0,1,.29-.17,2.91,2.91,0,0,1,1-.13,1.41,1.41,0,0,1,.71.29A3.11,3.11,0,0,1,79.18,146.16Z"/>
+                <path class="cls-5"
+                      d="M78.3,148.12c0,.19,0,.19-.09.28l-.1.1a1.28,1.28,0,0,0-.57-.79,3.46,3.46,0,0,0-.84-.28,1.06,1.06,0,0,0-.3,0,.19.19,0,0,1-.13,0s0-.05.12-.07a.45.45,0,0,1,.32-.09,2.77,2.77,0,0,1,1,.13,1.47,1.47,0,0,1,.62.46A1.75,1.75,0,0,1,78.3,148.12Z"/>
+                <path class="cls-5"
+                      d="M78.34,147.86c.31.41.39.87.24,1l-.48-.34,0,0a.58.58,0,0,0,0-.19s0-.05,0-.07S78.24,148,78.34,147.86Z"/>
+                <path class="cls-5" d="M78.17,148.65h-.09Z"/>
+                <path class="cls-8" d="M69.59,145.88h0l0,0,0-.07h.06v.11Z"/>
+                <path class="cls-5"
+                      d="M69.56,145.84l0,0h-.15l-.27.06-.37.08h0a.78.78,0,0,1-.24,0c-.11,0-.13-.11-.11-.1a5,5,0,0,0,1.09-.16h0Z"/>
+                <polygon class="cls-8" points="68.04 146.19 68.04 146.2 68.03 146.2 68.04 146.19"/>
+                <path class="cls-8" d="M63.07,139.22h0a.33.33,0,0,1,0,.06h0Z"/>
+                <path class="cls-8"
+                      d="M62.05,138.42l0,0a2,2,0,0,1,.3.27h-.14c-.1-.06-.13.13-.12.14s-.1-.12-.12-.19a.67.67,0,0,1,.06-.12Z"/>
+                <path class="cls-8" d="M60.31,147.41a.24.24,0,0,0,0,.08h0Z"/>
+                <path class="cls-9" d="M60.28,147.49l0,.14h0l0,.05Z"/>
+                <path class="cls-5" d="M60.28,147.49l-.08.2-.21,0h-.62S60,147.55,60.28,147.49Z"/>
+                <polygon class="cls-8" points="60.24 147.64 60.2 147.76 60.2 147.71 60.2 147.69 60.24 147.64"/>
+                <path class="cls-5" d="M57.12,146.75c.4-.08.15.27.2.37a.14.14,0,0,1,0,.1h0s-.1-.16-.17-.47Z"/>
+                <path class="cls-8" d="M52.48,155c.1.17.19.31.16.34s-.31-.09-.57-.34C52.39,155,52.41,155,52.48,155Z"/>
+                <path class="cls-8"
+                      d="M49.31,154.57c0,.27.16.5.12.54s-.46-.26-.54-.79a.25.25,0,0,1,0-.08l.22.28s.11,0,.16,0Z"/>
+                <path class="cls-8" d="M105.26,48.24l.23.37-.67.08C105,48.54,105.12,48.38,105.26,48.24Z"/>
+                <path class="cls-8"
+                      d="M94.77,7.06c.28.3.37.48.32.56s-.28.06-.61,0l-.41-.1-.49-.53.85-.16C94.55,6.89,94.67,7,94.77,7.06Z"/>
+                <path class="cls-8" d="M82,56.7q0,.45,0,.93A.56.56,0,0,1,81.7,57,.51.51,0,0,1,82,56.7Z"/>
+                <path class="cls-8" d="M78,91.88l.34.63a3.24,3.24,0,0,1-.45-.52A.84.84,0,0,0,78,91.88Z"/>
+                <path class="cls-8" d="M77.69,85.32h.16a.92.92,0,0,1-.06.33C77.73,85.45,77.69,85.33,77.69,85.32Z"/>
+                <path class="cls-8" d="M77.69,85.32a1.21,1.21,0,0,1-.19,0C77.59,85.25,77.66,85.23,77.69,85.32Z"/>
+                <path class="cls-8" d="M75.93,84.6c-.11.06-.24.13-.36.18a.25.25,0,0,1,0-.14A.94.94,0,0,1,75.93,84.6Z"/>
+                <path class="cls-8"
+                      d="M67.67,13.43l-.54.05c0-1,0-1.82-.08-2.62.16.55.3,1.13.44,1.74C67.57,13,67.65,13.37,67.67,13.43Z"/>
+                <path class="cls-8" d="M27.72,17.74c.12.27-.28.75-.92,1l-1,.32.09-.08A12.18,12.18,0,0,1,27.72,17.74Z"/>
+                <path class="cls-23" d="M.07,61.75c0,.42,0,.84-.07,1.28H0c0-.22,0-.44.05-.65S.07,62,.07,61.75Z"/>
+                <g class="cls-24">
+                    <path class="cls-23" d="M.07,61.75c0,.42,0,.84-.07,1.28H0c0-.22,0-.44.05-.65S.07,62,.07,61.75Z"/>
+                </g>
+                <path class="cls-23" d="M.05,62.39c0,.21,0,.43,0,.65H0C0,62.82,0,62.6.05,62.39Z"/>
+                <g class="cls-24">
+                    <path class="cls-23" d="M.05,62.39c0,.21,0,.43,0,.65H0C0,62.82,0,62.6.05,62.39Z"/>
+                </g>
+                <g class="cls-25">
+                    <polygon class="cls-26" points="0 62.9 0.05 62.84 0.05 63.04 0 63.04 0 62.9"/>
+                    <polygon class="cls-27" points="0 62.44 0.04 62.39 0.05 62.39 0.05 62.84 0 62.9 0 62.44"/>
+                    <polygon class="cls-28" points="0.04 62.39 0 62.44 0 62.39 0.04 62.39"/>
+                </g>
+            </g>
+        </g>
+    </g>
 </svg>
\ No newline at end of file
diff --git a/mvnw b/mvnw
index afe2c11c0be..a264fb557d9 100755
--- a/mvnw
+++ b/mvnw
@@ -1,305 +1,305 @@
-#!/bin/bash
-# ----------------------------------------------------------------------------
-# 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
-#
-#    http://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.
-# ----------------------------------------------------------------------------
-
-# ----------------------------------------------------------------------------
-# Maven2 Start Up Batch script
-#
-# Required ENV vars:
-# ------------------
-#   JAVA_HOME - location of a JDK home dir
-#
-# Optional ENV vars
-# -----------------
-#   M2_HOME - location of maven2's installed home dir
-#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
-#     e.g. to debug Maven itself, use
-#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-# ----------------------------------------------------------------------------
-
-if [ -z "$MAVEN_SKIP_RC" ] ; then
-
-  if [ -f /etc/mavenrc ] ; then
-    . /etc/mavenrc
-  fi
-
-  if [ -f "$HOME/.mavenrc" ] ; then
-    . "$HOME/.mavenrc"
-  fi
-
-fi
-
-# OS specific support.  $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
-mingw=false
-case "`uname`" in
-  CYGWIN*) cygwin=true ;;
-  MINGW*) mingw=true;;
-  Darwin*) darwin=true
-    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
-    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
-    if [ -z "$JAVA_HOME" ]; then
-      if [ -x "/usr/libexec/java_home" ]; then
-        export JAVA_HOME="`/usr/libexec/java_home`"
-      else
-        export JAVA_HOME="/Library/Java/Home"
-      fi
-    fi
-    ;;
-esac
-
-if [ -z "$JAVA_HOME" ] ; then
-  if [ -r /etc/gentoo-release ] ; then
-    JAVA_HOME=`java-config --jre-home`
-  fi
-fi
-
-if [ -z "$M2_HOME" ] ; then
-  ## resolve links - $0 may be a link to maven's home
-  PRG="$0"
-
-  # need this for relative symlinks
-  while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-      PRG="$link"
-    else
-      PRG="`dirname "$PRG"`/$link"
-    fi
-  done
-
-  saveddir=`pwd`
-
-  M2_HOME=`dirname "$PRG"`/..
-
-  # make it fully qualified
-  M2_HOME=`cd "$M2_HOME" && pwd`
-
-  cd "$saveddir"
-  # echo Using m2 at $M2_HOME
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --unix "$M2_HOME"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
-fi
-
-# For Mingw, ensure paths are in UNIX format before anything is touched
-if $mingw ; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME="`(cd "$M2_HOME"; pwd)`"
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
-fi
-
-if [ -z "$JAVA_HOME" ]; then
-  javaExecutable="`which javac`"
-  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
-    # readlink(1) is not available as standard on Solaris 10.
-    readLink=`which readlink`
-    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
-      if $darwin ; then
-        javaHome="`dirname \"$javaExecutable\"`"
-        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
-      else
-        javaExecutable="`readlink -f \"$javaExecutable\"`"
-      fi
-      javaHome="`dirname \"$javaExecutable\"`"
-      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
-      JAVA_HOME="$javaHome"
-      export JAVA_HOME
-    fi
-  fi
-fi
-
-if [ -z "$JAVACMD" ] ; then
-  if [ -n "$JAVA_HOME"  ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-      # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-      JAVACMD="$JAVA_HOME/bin/java"
-    fi
-  else
-    JAVACMD="`which java`"
-  fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly." >&2
-  echo "  We cannot execute $JAVACMD" >&2
-  exit 1
-fi
-
-if [ -z "$JAVA_HOME" ] ; then
-  echo "Warning: JAVA_HOME environment variable is not set."
-fi
-
-CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-
-# traverses directory structure from process work directory to filesystem root
-# first directory with .mvn subdirectory is considered project base directory
-find_maven_basedir() {
-
-  if [ -z "$1" ]
-  then
-    echo "Path not specified to find_maven_basedir"
-    return 1
-  fi
-
-  basedir="$1"
-  wdir="$1"
-  while [ "$wdir" != '/' ] ; do
-    if [ -d "$wdir"/.mvn ] ; then
-      basedir=$wdir
-      break
-    fi
-    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
-    if [ -d "${wdir}" ]; then
-      wdir=`cd "$wdir/.."; pwd`
-    fi
-    # end of workaround
-  done
-  echo "${basedir}"
-}
-
-# concatenates all lines of a file
-concat_lines() {
-  if [ -f "$1" ]; then
-    echo "$(tr -s '\n' ' ' < "$1")"
-  fi
-}
-
-BASE_DIR=`find_maven_basedir "$(pwd)"`
-if [ -z "$BASE_DIR" ]; then
-  exit 1;
-fi
-
-##########################################################################################
-# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-# This allows using the maven wrapper in projects that prohibit checking in binary data.
-##########################################################################################
-if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Found .mvn/wrapper/maven-wrapper.jar"
-    fi
-else
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
-    fi
-    if [ "$MVNW_REPOURL" = true ]; then
-      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.2/maven-wrapper-0.5.2.jar"
-    else
-      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.2/maven-wrapper-0.5.2.jar"
-    fi
-    while IFS="=" read key value; do
-      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
-      esac
-    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Downloading from: $jarUrl"
-    fi
-    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
-    if $cygwin; then
-      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
-    fi
-
-    if command -v wget > /dev/null; then
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Found wget ... using wget"
-        fi
-        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            wget "$jarUrl" -O "$wrapperJarPath"
-        else
-            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
-        fi
-    elif command -v curl > /dev/null; then
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Found curl ... using curl"
-        fi
-        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            curl -o "$wrapperJarPath" "$jarUrl" -f
-        else
-            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
-        fi
-
-    else
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Falling back to using Java to download"
-        fi
-        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
-        # For Cygwin, switch paths to Windows format before running javac
-        if $cygwin; then
-          javaClass=`cygpath --path --windows "$javaClass"`
-        fi
-        if [ -e "$javaClass" ]; then
-            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
-                if [ "$MVNW_VERBOSE" = true ]; then
-                  echo " - Compiling MavenWrapperDownloader.java ..."
-                fi
-                # Compiling the Java class
-                ("$JAVA_HOME/bin/javac" "$javaClass")
-            fi
-            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
-                # Running the downloader
-                if [ "$MVNW_VERBOSE" = true ]; then
-                  echo " - Running MavenWrapperDownloader.java ..."
-                fi
-                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
-            fi
-        fi
-    fi
-fi
-##########################################################################################
-# End of extension
-##########################################################################################
-
-export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
-if [ "$MVNW_VERBOSE" = true ]; then
-  echo $MAVEN_PROJECTBASEDIR
-fi
-MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --path --windows "$M2_HOME"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
-  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
-    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
-fi
-
-WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-exec "$JAVACMD" \
-  $MAVEN_OPTS \
-  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
-  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
-  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
+#!/bin/bash
+# ----------------------------------------------------------------------------
+# 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
+#
+#    http://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.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`which java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    if [ "$MVNW_REPOURL" = true ]; then
+      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.2/maven-wrapper-0.5.2.jar"
+    else
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.2/maven-wrapper-0.5.2.jar"
+    fi
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $jarUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
+
+    if command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget "$jarUrl" -O "$wrapperJarPath"
+        else
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+        fi
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl -o "$wrapperJarPath" "$jarUrl" -f
+        else
+            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+        fi
+
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
+        if [ -e "$javaClass" ]; then
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaClass")
+            fi
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/mvnw.cmd b/mvnw.cmd
index 025217a4006..36665e820aa 100644
--- a/mvnw.cmd
+++ b/mvnw.cmd
@@ -1,172 +1,172 @@
-@REM ----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements.  See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership.  The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License.  You may obtain a copy of the License at
-@REM
-@REM    http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied.  See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM ----------------------------------------------------------------------------
-
-@REM ----------------------------------------------------------------------------
-@REM Maven2 Start Up Batch script
-@REM
-@REM Required ENV vars:
-@REM JAVA_HOME - location of a JDK home dir
-@REM
-@REM Optional ENV vars
-@REM M2_HOME - location of maven2's installed home dir
-@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
-@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
-@REM     e.g. to debug Maven itself, use
-@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-@REM ----------------------------------------------------------------------------
-
-@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
-@echo off
-@REM set title of command window
-title %0
-@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
-@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
-
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-
-@REM Execute a user defined script before this one
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
-@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
-:skipRcPre
-
-@setlocal
-
-set ERROR_CODE=0
-
-@REM To isolate internal variables from possible post scripts, we use another setlocal
-@setlocal
-
-@REM ==== START VALIDATION ====
-if not "%JAVA_HOME%" == "" goto OkJHome
-
-echo.
-echo Error: JAVA_HOME not found in your environment. >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-:OkJHome
-if exist "%JAVA_HOME%\bin\java.exe" goto init
-
-echo.
-echo Error: JAVA_HOME is set to an invalid directory. >&2
-echo JAVA_HOME = "%JAVA_HOME%" >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-@REM ==== END VALIDATION ====
-
-:init
-
-@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
-@REM Fallback to current working directory if not found.
-
-set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
-IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
-
-set EXEC_DIR=%CD%
-set WDIR=%EXEC_DIR%
-:findBaseDir
-IF EXIST "%WDIR%"\.mvn goto baseDirFound
-cd ..
-IF "%WDIR%"=="%CD%" goto baseDirNotFound
-set WDIR=%CD%
-goto findBaseDir
-
-:baseDirFound
-set MAVEN_PROJECTBASEDIR=%WDIR%
-cd "%EXEC_DIR%"
-goto endDetectBaseDir
-
-:baseDirNotFound
-set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
-cd "%EXEC_DIR%"
-
-:endDetectBaseDir
-
-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
-
-@setlocal EnableExtensions EnableDelayedExpansion
-for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
-@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
-
-:endReadAdditionalConfig
-
-SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
-set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.2/maven-wrapper-0.5.2.jar"
-
-FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
-    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
-)
-
-@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
-if exist %WRAPPER_JAR% (
-    echo Found %WRAPPER_JAR%
-) else (
-	if not "%MVNW_REPOURL%" == "" (
-	  SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.2/maven-wrapper-0.5.2.jar"
-	)
-    echo Couldn't find %WRAPPER_JAR%, downloading it ...
-	echo Downloading from: %DOWNLOAD_URL%
-
-    powershell -Command "&{"^
-		"$webclient = new-object System.Net.WebClient;"^
-		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
-		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
-		"}"^
-		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
-		"}"
-    echo Finished downloading %WRAPPER_JAR%
-)
-@REM End of extension
-
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
-if ERRORLEVEL 1 goto error
-goto end
-
-:error
-set ERROR_CODE=1
-
-:end
-@endlocal & set ERROR_CODE=%ERROR_CODE%
-
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
-@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
-:skipRcPost
-
-@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%" == "on" pause
-
-if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
-
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.2/maven-wrapper-0.5.2.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    echo Found %WRAPPER_JAR%
+) else (
+	if not "%MVNW_REPOURL%" == "" (
+	  SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.2/maven-wrapper-0.5.2.jar"
+	)
+    echo Couldn't find %WRAPPER_JAR%, downloading it ...
+	echo Downloading from: %DOWNLOAD_URL%
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    echo Finished downloading %WRAPPER_JAR%
+)
+@REM End of extension
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
 exit /B %ERROR_CODE%
\ No newline at end of file
diff --git a/plc4j/api/pom.xml b/plc4j/api/pom.xml
index 83195fdb508..1b367e49c5d 100644
--- a/plc4j/api/pom.xml
+++ b/plc4j/api/pom.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-api</artifactId>
-  <name>PLC4J: API</name>
-  <description>Central API Module.</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-utils-test-utils</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>nl.jqno.equalsverifier</groupId>
-      <artifactId>equalsverifier</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-api</artifactId>
+  <name>PLC4J: API</name>
+  <description>Central API Module.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-utils-test-utils</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>nl.jqno.equalsverifier</groupId>
+      <artifactId>equalsverifier</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/PlcDriverManager.java b/plc4j/api/src/main/java/org/apache/plc4x/java/PlcDriverManager.java
index fb6b09a9eb4..f0345d24664 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/PlcDriverManager.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/PlcDriverManager.java
@@ -1,106 +1,106 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java;
-
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.spi.PlcDriver;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.ServiceLoader;
-
-public class PlcDriverManager {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(PlcDriverManager.class);
-
-    protected ClassLoader classLoader;
-
-    private Map<String, PlcDriver> driverMap;
-
-    public PlcDriverManager() {
-        this(Thread.currentThread().getContextClassLoader());
-    }
-
-    public PlcDriverManager(ClassLoader classLoader) {
-        LOGGER.info("Instantiating new PLC Driver Manager with class loader {}", classLoader);
-        this.classLoader = classLoader;
-        driverMap = new HashMap<>();
-        ServiceLoader<PlcDriver> plcDriverLoader = ServiceLoader.load(PlcDriver.class, classLoader);
-        LOGGER.info("Registering available drivers...");
-        for (PlcDriver driver : plcDriverLoader) {
-            if (driverMap.containsKey(driver.getProtocolCode())) {
-                throw new IllegalStateException(
-                    "Multiple driver implementations available for protocol code '" +
-                        driver.getProtocolCode() + "'");
-            }
-            LOGGER.info("Registering driver for Protocol {} ({})", driver.getProtocolCode(), driver.getProtocolName());
-            driverMap.put(driver.getProtocolCode(), driver);
-        }
-    }
-
-    /**
-     * Connects to a PLC using the given plc connection string.
-     *
-     * @param url plc connection string.
-     * @return PlcConnection object.
-     * @throws PlcConnectionException an exception if the connection attempt failed.
-     */
-    public PlcConnection getConnection(String url) throws PlcConnectionException {
-        PlcDriver driver = getDriver(url);
-        PlcConnection connection = driver.connect(url);
-        connection.connect();
-        return connection;
-    }
-
-    /**
-     * Connects to a PLC using the given plc connection string using given authentication credentials.
-     *
-     * @param url            plc connection string.
-     * @param authentication authentication credentials.
-     * @return PlcConnection object.
-     * @throws PlcConnectionException an exception if the connection attempt failed.
-     */
-    public PlcConnection getConnection(String url, PlcAuthentication authentication) throws PlcConnectionException {
-        PlcDriver driver = getDriver(url);
-        PlcConnection connection = driver.connect(url, authentication);
-        connection.connect();
-        return connection;
-    }
-
-    private PlcDriver getDriver(String url) throws PlcConnectionException {
-        try {
-            URI connectionUri = new URI(url);
-            String protocol = connectionUri.getScheme();
-            PlcDriver driver = driverMap.get(protocol);
-            if (driver == null) {
-                throw new PlcConnectionException("Unable to find driver for protocol '" + protocol + "'");
-            }
-            return driver;
-        } catch (URISyntaxException e) {
-            throw new PlcConnectionException("Invalid plc4j connection string '" + url + "'", e);
-        }
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java;
+
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.authentication.PlcAuthentication;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.spi.PlcDriver;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.ServiceLoader;
+
+public class PlcDriverManager {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PlcDriverManager.class);
+
+    protected ClassLoader classLoader;
+
+    private Map<String, PlcDriver> driverMap;
+
+    public PlcDriverManager() {
+        this(Thread.currentThread().getContextClassLoader());
+    }
+
+    public PlcDriverManager(ClassLoader classLoader) {
+        LOGGER.info("Instantiating new PLC Driver Manager with class loader {}", classLoader);
+        this.classLoader = classLoader;
+        driverMap = new HashMap<>();
+        ServiceLoader<PlcDriver> plcDriverLoader = ServiceLoader.load(PlcDriver.class, classLoader);
+        LOGGER.info("Registering available drivers...");
+        for (PlcDriver driver : plcDriverLoader) {
+            if (driverMap.containsKey(driver.getProtocolCode())) {
+                throw new IllegalStateException(
+                    "Multiple driver implementations available for protocol code '" +
+                        driver.getProtocolCode() + "'");
+            }
+            LOGGER.info("Registering driver for Protocol {} ({})", driver.getProtocolCode(), driver.getProtocolName());
+            driverMap.put(driver.getProtocolCode(), driver);
+        }
+    }
+
+    /**
+     * Connects to a PLC using the given plc connection string.
+     *
+     * @param url plc connection string.
+     * @return PlcConnection object.
+     * @throws PlcConnectionException an exception if the connection attempt failed.
+     */
+    public PlcConnection getConnection(String url) throws PlcConnectionException {
+        PlcDriver driver = getDriver(url);
+        PlcConnection connection = driver.connect(url);
+        connection.connect();
+        return connection;
+    }
+
+    /**
+     * Connects to a PLC using the given plc connection string using given authentication credentials.
+     *
+     * @param url            plc connection string.
+     * @param authentication authentication credentials.
+     * @return PlcConnection object.
+     * @throws PlcConnectionException an exception if the connection attempt failed.
+     */
+    public PlcConnection getConnection(String url, PlcAuthentication authentication) throws PlcConnectionException {
+        PlcDriver driver = getDriver(url);
+        PlcConnection connection = driver.connect(url, authentication);
+        connection.connect();
+        return connection;
+    }
+
+    private PlcDriver getDriver(String url) throws PlcConnectionException {
+        try {
+            URI connectionUri = new URI(url);
+            String protocol = connectionUri.getScheme();
+            PlcDriver driver = driverMap.get(protocol);
+            if (driver == null) {
+                throw new PlcConnectionException("Unable to find driver for protocol '" + protocol + "'");
+            }
+            return driver;
+        } catch (URISyntaxException e) {
+            throw new PlcConnectionException("Invalid plc4j connection string '" + url + "'", e);
+        }
+    }
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/PlcConnection.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/PlcConnection.java
index 3838594cda7..709990715e0 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/PlcConnection.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/PlcConnection.java
@@ -1,105 +1,105 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api;
-
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.exceptions.PlcUnsupportedOperationException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
-import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.metadata.PlcConnectionMetadata;
-import org.apache.plc4x.java.api.model.PlcField;
-
-import java.util.concurrent.CompletableFuture;
-
-/**
- * Interface defining the most basic methods a PLC4X connection should support.
- * This generally handles the connection establishment itself and the parsing of
- * field address strings to the platform dependent PlcField instances.
- */
-public interface PlcConnection extends AutoCloseable {
-
-    /**
-     * Establishes the connection to the remote PLC.
-     * @throws PlcConnectionException if the connection attempt failed
-     */
-    void connect() throws PlcConnectionException;
-
-    /**
-     * Indicates if the connection is established to a remote PLC.
-     * @return {@code true} if connected, {@code false} otherwise
-     */
-    boolean isConnected();
-
-    /**
-     * Closes the connection to the remote PLC.
-     * @throws Exception if shutting down the connection failed
-     */
-    @Override
-    void close() throws Exception;
-
-    /**
-     * Parse a fieldQuery for the given connection type.
-     *
-     * @throws PlcRuntimeException If the string cannot be parsed
-     */
-    default PlcField prepareField(String fieldQuery) throws PlcInvalidFieldException {
-        throw new PlcRuntimeException("Parse method is not implemented for this connection / driver");
-    }
-
-    /**
-     * Provides connection metadata.
-     */
-    PlcConnectionMetadata getMetadata();
-
-    /**
-     * Execute a ping query against a remote device to check the availability of the connection.
-     *
-     * @return CompletableFuture that is completed successfully (Void) or unsuccessfully with an PlcException.
-     */
-    CompletableFuture<Void> ping();
-
-    /**
-     * Obtain read request builder.
-     * @throws PlcUnsupportedOperationException if the connection does not support reading
-     */
-    PlcReadRequest.Builder readRequestBuilder();
-
-    /**
-     * Obtain write request builder.
-     * @throws PlcUnsupportedOperationException if the connection does not support writing
-     */
-    PlcWriteRequest.Builder writeRequestBuilder();
-
-    /**
-     * Obtain subscription request builder.
-     * @throws PlcUnsupportedOperationException if the connection does not support subscription
-     */
-    PlcSubscriptionRequest.Builder subscriptionRequestBuilder();
-
-    /**
-     * Obtain unsubscription request builder.
-     * @throws PlcUnsupportedOperationException if the connection does not support subscription
-     */
-    PlcUnsubscriptionRequest.Builder unsubscriptionRequestBuilder();
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api;
+
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.exceptions.PlcUnsupportedOperationException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.metadata.PlcConnectionMetadata;
+import org.apache.plc4x.java.api.model.PlcField;
+
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * Interface defining the most basic methods a PLC4X connection should support.
+ * This generally handles the connection establishment itself and the parsing of
+ * field address strings to the platform dependent PlcField instances.
+ */
+public interface PlcConnection extends AutoCloseable {
+
+    /**
+     * Establishes the connection to the remote PLC.
+     * @throws PlcConnectionException if the connection attempt failed
+     */
+    void connect() throws PlcConnectionException;
+
+    /**
+     * Indicates if the connection is established to a remote PLC.
+     * @return {@code true} if connected, {@code false} otherwise
+     */
+    boolean isConnected();
+
+    /**
+     * Closes the connection to the remote PLC.
+     * @throws Exception if shutting down the connection failed
+     */
+    @Override
+    void close() throws Exception;
+
+    /**
+     * Parse a fieldQuery for the given connection type.
+     *
+     * @throws PlcRuntimeException If the string cannot be parsed
+     */
+    default PlcField prepareField(String fieldQuery) throws PlcInvalidFieldException {
+        throw new PlcRuntimeException("Parse method is not implemented for this connection / driver");
+    }
+
+    /**
+     * Provides connection metadata.
+     */
+    PlcConnectionMetadata getMetadata();
+
+    /**
+     * Execute a ping query against a remote device to check the availability of the connection.
+     *
+     * @return CompletableFuture that is completed successfully (Void) or unsuccessfully with an PlcException.
+     */
+    CompletableFuture<Void> ping();
+
+    /**
+     * Obtain read request builder.
+     * @throws PlcUnsupportedOperationException if the connection does not support reading
+     */
+    PlcReadRequest.Builder readRequestBuilder();
+
+    /**
+     * Obtain write request builder.
+     * @throws PlcUnsupportedOperationException if the connection does not support writing
+     */
+    PlcWriteRequest.Builder writeRequestBuilder();
+
+    /**
+     * Obtain subscription request builder.
+     * @throws PlcUnsupportedOperationException if the connection does not support subscription
+     */
+    PlcSubscriptionRequest.Builder subscriptionRequestBuilder();
+
+    /**
+     * Obtain unsubscription request builder.
+     * @throws PlcUnsupportedOperationException if the connection does not support subscription
+     */
+    PlcUnsubscriptionRequest.Builder unsubscriptionRequestBuilder();
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/authentication/PlcAuthentication.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/authentication/PlcAuthentication.java
index 10089544b05..bf3c94fe383 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/authentication/PlcAuthentication.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/authentication/PlcAuthentication.java
@@ -1,22 +1,22 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.authentication;
-
-public interface PlcAuthentication {
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.authentication;
+
+public interface PlcAuthentication {
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/authentication/PlcUsernamePasswordAuthentication.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/authentication/PlcUsernamePasswordAuthentication.java
index a02b24e2520..dc46073dc48 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/authentication/PlcUsernamePasswordAuthentication.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/authentication/PlcUsernamePasswordAuthentication.java
@@ -1,69 +1,69 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.authentication;
-
-import java.util.Objects;
-
-public class PlcUsernamePasswordAuthentication implements PlcAuthentication {
-
-    private final String username;
-    private final String password;
-
-    public PlcUsernamePasswordAuthentication(String username, String password) {
-        Objects.requireNonNull(username, "User name must not be null");
-        Objects.requireNonNull(password, "Password must not be null");
-        this.username = username;
-        this.password = password;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    @Override
-    public final boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof PlcUsernamePasswordAuthentication)) {
-            return false;
-        }
-        PlcUsernamePasswordAuthentication that = (PlcUsernamePasswordAuthentication) o;
-        return Objects.equals(username, that.username) &&
-            Objects.equals(password, that.password);
-    }
-
-    @Override
-    public final int hashCode() {
-        return Objects.hash(username, password);
-    }
-
-    @Override
-    public String toString() {
-        return "PlcUsernamePasswordAuthentication{" +
-            "username='" + username + '\'' +
-            ", password='" + "*****************" + '\'' +
-            '}';
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.authentication;
+
+import java.util.Objects;
+
+public class PlcUsernamePasswordAuthentication implements PlcAuthentication {
+
+    private final String username;
+    private final String password;
+
+    public PlcUsernamePasswordAuthentication(String username, String password) {
+        Objects.requireNonNull(username, "User name must not be null");
+        Objects.requireNonNull(password, "Password must not be null");
+        this.username = username;
+        this.password = password;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    @Override
+    public final boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof PlcUsernamePasswordAuthentication)) {
+            return false;
+        }
+        PlcUsernamePasswordAuthentication that = (PlcUsernamePasswordAuthentication) o;
+        return Objects.equals(username, that.username) &&
+            Objects.equals(password, that.password);
+    }
+
+    @Override
+    public final int hashCode() {
+        return Objects.hash(username, password);
+    }
+
+    @Override
+    public String toString() {
+        return "PlcUsernamePasswordAuthentication{" +
+            "username='" + username + '\'' +
+            ", password='" + "*****************" + '\'' +
+            '}';
+    }
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcConnectionException.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcConnectionException.java
index db627b2a6f2..3ab94368d33 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcConnectionException.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcConnectionException.java
@@ -1,40 +1,40 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.exceptions;
-
-public class PlcConnectionException extends PlcException {
-    private static final long serialVersionUID = 1L;
-
-    public PlcConnectionException(String message) {
-        super(message);
-    }
-
-    public PlcConnectionException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public PlcConnectionException(Throwable cause) {
-        super(cause);
-    }
-
-    public PlcConnectionException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.exceptions;
+
+public class PlcConnectionException extends PlcException {
+    private static final long serialVersionUID = 1L;
+
+    public PlcConnectionException(String message) {
+        super(message);
+    }
+
+    public PlcConnectionException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public PlcConnectionException(Throwable cause) {
+        super(cause);
+    }
+
+    public PlcConnectionException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcException.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcException.java
index 6f4bd4c406f..8133cd6cc64 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcException.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcException.java
@@ -1,44 +1,44 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.exceptions;
-
-/**
- * Most generic type of plc4x exception. All plc4x exceptions are derived from
- * PlcException.
- */
-public class PlcException extends Exception {
-    private static final long serialVersionUID = 1L;
-
-    public PlcException(String message) {
-        super(message);
-    }
-
-    public PlcException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public PlcException(Throwable cause) {
-        super(cause);
-    }
-
-    public PlcException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.exceptions;
+
+/**
+ * Most generic type of plc4x exception. All plc4x exceptions are derived from
+ * PlcException.
+ */
+public class PlcException extends Exception {
+    private static final long serialVersionUID = 1L;
+
+    public PlcException(String message) {
+        super(message);
+    }
+
+    public PlcException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public PlcException(Throwable cause) {
+        super(cause);
+    }
+
+    public PlcException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcFieldRangeException.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcFieldRangeException.java
index 1d7fc8de5a4..6d857737226 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcFieldRangeException.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcFieldRangeException.java
@@ -1,28 +1,28 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.api.exceptions;
-
-public class PlcFieldRangeException extends PlcRuntimeException {
-
-    public PlcFieldRangeException(int maxIndex, int requestedIndex) {
-        super(String.format("requested index of %d is outside the valid range of 0 - %d", requestedIndex, maxIndex));
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.api.exceptions;
+
+public class PlcFieldRangeException extends PlcRuntimeException {
+
+    public PlcFieldRangeException(int maxIndex, int requestedIndex) {
+        super(String.format("requested index of %d is outside the valid range of 0 - %d", requestedIndex, maxIndex));
+    }
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcIncompatibleDatatypeException.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcIncompatibleDatatypeException.java
index cb779dfa233..b1e471995a5 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcIncompatibleDatatypeException.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcIncompatibleDatatypeException.java
@@ -1,28 +1,28 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.api.exceptions;
-
-public class PlcIncompatibleDatatypeException extends PlcRuntimeException {
-
-    public PlcIncompatibleDatatypeException(Class<?> datatype, int index) {
-        super("Incompatible Datatype " + datatype.getName() + " at index " + index);
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.api.exceptions;
+
+public class PlcIncompatibleDatatypeException extends PlcRuntimeException {
+
+    public PlcIncompatibleDatatypeException(Class<?> datatype, int index) {
+        super("Incompatible Datatype " + datatype.getName() + " at index " + index);
+    }
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcInvalidFieldException.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcInvalidFieldException.java
index 5eba89aec01..224d2a1b0a9 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcInvalidFieldException.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcInvalidFieldException.java
@@ -1,50 +1,50 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.api.exceptions;
-
-import java.util.regex.Pattern;
-
-/**
- * Indicates an invalid field address.
- */
-public class PlcInvalidFieldException extends PlcRuntimeException {
-
-    private static final long serialVersionUID = 1L;
-    private final String fieldToBeParsed;
-
-    public PlcInvalidFieldException(String fieldToBeParsed) {
-        super(fieldToBeParsed + " invalid");
-        this.fieldToBeParsed = fieldToBeParsed;
-    }
-
-    public PlcInvalidFieldException(String fieldToBeParsed, Pattern pattern) {
-        super(fieldToBeParsed + " doesn't match " + pattern);
-        this.fieldToBeParsed = fieldToBeParsed;
-    }
-
-    public PlcInvalidFieldException(String fieldToBeParsed, Pattern pattern, String readablePattern) {
-        super(fieldToBeParsed + " doesn't match " + readablePattern + '(' + pattern + ')');
-        this.fieldToBeParsed = fieldToBeParsed;
-    }
-
-    public String getFieldToBeParsed() {
-        return fieldToBeParsed;
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.api.exceptions;
+
+import java.util.regex.Pattern;
+
+/**
+ * Indicates an invalid field address.
+ */
+public class PlcInvalidFieldException extends PlcRuntimeException {
+
+    private static final long serialVersionUID = 1L;
+    private final String fieldToBeParsed;
+
+    public PlcInvalidFieldException(String fieldToBeParsed) {
+        super(fieldToBeParsed + " invalid");
+        this.fieldToBeParsed = fieldToBeParsed;
+    }
+
+    public PlcInvalidFieldException(String fieldToBeParsed, Pattern pattern) {
+        super(fieldToBeParsed + " doesn't match " + pattern);
+        this.fieldToBeParsed = fieldToBeParsed;
+    }
+
+    public PlcInvalidFieldException(String fieldToBeParsed, Pattern pattern, String readablePattern) {
+        super(fieldToBeParsed + " doesn't match " + readablePattern + '(' + pattern + ')');
+        this.fieldToBeParsed = fieldToBeParsed;
+    }
+
+    public String getFieldToBeParsed() {
+        return fieldToBeParsed;
+    }
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcIoException.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcIoException.java
index 1c3b17ba548..e862079d0d7 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcIoException.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcIoException.java
@@ -1,43 +1,43 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.exceptions;
-
-/**
- * Base exception for all IO related exceptions.
- */
-public class PlcIoException extends PlcException {
-    private static final long serialVersionUID = 1L;
-
-    public PlcIoException(String message) {
-        super(message);
-    }
-
-    public PlcIoException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public PlcIoException(Throwable cause) {
-        super(cause);
-    }
-
-    public PlcIoException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.exceptions;
+
+/**
+ * Base exception for all IO related exceptions.
+ */
+public class PlcIoException extends PlcException {
+    private static final long serialVersionUID = 1L;
+
+    public PlcIoException(String message) {
+        super(message);
+    }
+
+    public PlcIoException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public PlcIoException(Throwable cause) {
+        super(cause);
+    }
+
+    public PlcIoException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcNotImplementedException.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcNotImplementedException.java
index 1eea2b0bb2c..3aaae506263 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcNotImplementedException.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcNotImplementedException.java
@@ -1,30 +1,30 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.api.exceptions;
-
-/**
- * indicates that a functionality is not implemented yet.
- */
-public class PlcNotImplementedException extends PlcRuntimeException {
-
-    public PlcNotImplementedException(String message) {
-        super(message);
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.api.exceptions;
+
+/**
+ * indicates that a functionality is not implemented yet.
+ */
+public class PlcNotImplementedException extends PlcRuntimeException {
+
+    public PlcNotImplementedException(String message) {
+        super(message);
+    }
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcProtocolException.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcProtocolException.java
index 9dee077bd4a..a524d9daa6f 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcProtocolException.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcProtocolException.java
@@ -1,45 +1,45 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.exceptions;
-
-/**
- * Base exception for all protocol related exceptions.
- * This is usually if the messages themselves are malformed, contain incorrect information or
- * any other problems occur which are related to the protocol being implemented.
- */
-public class PlcProtocolException extends PlcException {
-    private static final long serialVersionUID = 1L;
-
-    public PlcProtocolException(String message) {
-        super(message);
-    }
-
-    public PlcProtocolException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public PlcProtocolException(Throwable cause) {
-        super(cause);
-    }
-
-    public PlcProtocolException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.exceptions;
+
+/**
+ * Base exception for all protocol related exceptions.
+ * This is usually if the messages themselves are malformed, contain incorrect information or
+ * any other problems occur which are related to the protocol being implemented.
+ */
+public class PlcProtocolException extends PlcException {
+    private static final long serialVersionUID = 1L;
+
+    public PlcProtocolException(String message) {
+        super(message);
+    }
+
+    public PlcProtocolException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public PlcProtocolException(Throwable cause) {
+        super(cause);
+    }
+
+    public PlcProtocolException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcProtocolPayloadTooBigException.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcProtocolPayloadTooBigException.java
index a8878dbbd05..2303f266395 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcProtocolPayloadTooBigException.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcProtocolPayloadTooBigException.java
@@ -1,53 +1,53 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.exceptions;
-
-public class PlcProtocolPayloadTooBigException extends PlcProtocolException {
-
-    private String protocolName;
-    private int maxSize;
-    private int actualSize;
-    private transient Object payload;
-
-    public PlcProtocolPayloadTooBigException(String protocolName, int maxSize, int actualSize, Object payload) {
-        super("Payload for protocol '" + protocolName + "' with size " + actualSize +
-            " exceeded allowed maximum of " + maxSize);
-        this.protocolName = protocolName;
-        this.maxSize = maxSize;
-        this.actualSize = actualSize;
-        this.payload = payload;
-    }
-
-    public String getProtocolName() {
-        return protocolName;
-    }
-
-    public int getMaxSize() {
-        return maxSize;
-    }
-
-    public int getActualSize() {
-        return actualSize;
-    }
-
-    public Object getPayload() {
-        return payload;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.exceptions;
+
+public class PlcProtocolPayloadTooBigException extends PlcProtocolException {
+
+    private String protocolName;
+    private int maxSize;
+    private int actualSize;
+    private transient Object payload;
+
+    public PlcProtocolPayloadTooBigException(String protocolName, int maxSize, int actualSize, Object payload) {
+        super("Payload for protocol '" + protocolName + "' with size " + actualSize +
+            " exceeded allowed maximum of " + maxSize);
+        this.protocolName = protocolName;
+        this.maxSize = maxSize;
+        this.actualSize = actualSize;
+        this.payload = payload;
+    }
+
+    public String getProtocolName() {
+        return protocolName;
+    }
+
+    public int getMaxSize() {
+        return maxSize;
+    }
+
+    public int getActualSize() {
+        return actualSize;
+    }
+
+    public Object getPayload() {
+        return payload;
+    }
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcRuntimeException.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcRuntimeException.java
index 372d70f51cc..e56dce26ef6 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcRuntimeException.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcRuntimeException.java
@@ -1,44 +1,44 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.exceptions;
-
-/**
- * Most generic type of plc4x runtime exception. All plc4x exceptions are derived from
- * PlcException.
- */
-public class PlcRuntimeException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
-
-    public PlcRuntimeException(String message) {
-        super(message);
-    }
-
-    public PlcRuntimeException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public PlcRuntimeException(Throwable cause) {
-        super(cause);
-    }
-
-    public PlcRuntimeException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.exceptions;
+
+/**
+ * Most generic type of plc4x runtime exception. All plc4x exceptions are derived from
+ * PlcException.
+ */
+public class PlcRuntimeException extends RuntimeException {
+    private static final long serialVersionUID = 1L;
+
+    public PlcRuntimeException(String message) {
+        super(message);
+    }
+
+    public PlcRuntimeException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public PlcRuntimeException(Throwable cause) {
+        super(cause);
+    }
+
+    public PlcRuntimeException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcTimeoutException.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcTimeoutException.java
index ddba534e240..c0874ff1633 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcTimeoutException.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcTimeoutException.java
@@ -1,46 +1,46 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.api.exceptions;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * Can be thrown when something times out.
- */
-public class PlcTimeoutException extends PlcRuntimeException {
-    private final long timeout;
-
-    /**
-     * Indicates something timed out.
-     *
-     * @param timeout in nanoseconds.
-     */
-    public PlcTimeoutException(long timeout) {
-        super("Timeout reached after " + TimeUnit.NANOSECONDS.toMillis(timeout) + "ms");
-        this.timeout = timeout;
-    }
-
-    /**
-     * @return the timeout in nanoseconds.
-     */
-    public long getTimeout() {
-        return timeout;
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.api.exceptions;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Can be thrown when something times out.
+ */
+public class PlcTimeoutException extends PlcRuntimeException {
+    private final long timeout;
+
+    /**
+     * Indicates something timed out.
+     *
+     * @param timeout in nanoseconds.
+     */
+    public PlcTimeoutException(long timeout) {
+        super("Timeout reached after " + TimeUnit.NANOSECONDS.toMillis(timeout) + "ms");
+        this.timeout = timeout;
+    }
+
+    /**
+     * @return the timeout in nanoseconds.
+     */
+    public long getTimeout() {
+        return timeout;
+    }
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedDataTypeException.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedDataTypeException.java
index 54ca86b6f9e..d44b44b22ff 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedDataTypeException.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedDataTypeException.java
@@ -1,46 +1,46 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.api.exceptions;
-
-/**
- * Indicate that a data type ({@link Class}) is not supported by Plc4x.
- */
-public class PlcUnsupportedDataTypeException extends PlcRuntimeException {
-    private static final long serialVersionUID = 1L;
-
-    public PlcUnsupportedDataTypeException(Class<?> dataType) {
-        super(dataType + " not supported by plc4x");
-    }
-
-    public PlcUnsupportedDataTypeException(String message) {
-        super(message);
-    }
-
-    public PlcUnsupportedDataTypeException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public PlcUnsupportedDataTypeException(Throwable cause) {
-        super(cause);
-    }
-
-    public PlcUnsupportedDataTypeException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.api.exceptions;
+
+/**
+ * Indicate that a data type ({@link Class}) is not supported by Plc4x.
+ */
+public class PlcUnsupportedDataTypeException extends PlcRuntimeException {
+    private static final long serialVersionUID = 1L;
+
+    public PlcUnsupportedDataTypeException(Class<?> dataType) {
+        super(dataType + " not supported by plc4x");
+    }
+
+    public PlcUnsupportedDataTypeException(String message) {
+        super(message);
+    }
+
+    public PlcUnsupportedDataTypeException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public PlcUnsupportedDataTypeException(Throwable cause) {
+        super(cause);
+    }
+
+    public PlcUnsupportedDataTypeException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedOperationException.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedOperationException.java
index 3efa8383795..279faff0991 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedOperationException.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedOperationException.java
@@ -1,27 +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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.exceptions;
-
-public class PlcUnsupportedOperationException extends PlcRuntimeException {
-
-    public PlcUnsupportedOperationException(String message) {
-        super(message);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.exceptions;
+
+public class PlcUnsupportedOperationException extends PlcRuntimeException {
+
+    public PlcUnsupportedOperationException(String message) {
+        super(message);
+    }
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedProtocolException.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedProtocolException.java
index f897d755e9f..d97f2f1de56 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedProtocolException.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedProtocolException.java
@@ -1,36 +1,36 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.api.exceptions;
-
-public class PlcUnsupportedProtocolException extends PlcConnectionException {
-
-    public PlcUnsupportedProtocolException(String message) {
-        super(message);
-    }
-
-    public PlcUnsupportedProtocolException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public PlcUnsupportedProtocolException(Throwable cause) {
-        super(cause);
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.api.exceptions;
+
+public class PlcUnsupportedProtocolException extends PlcConnectionException {
+
+    public PlcUnsupportedProtocolException(String message) {
+        super(message);
+    }
+
+    public PlcUnsupportedProtocolException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public PlcUnsupportedProtocolException(Throwable cause) {
+        super(cause);
+    }
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcFieldRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcFieldRequest.java
index 2ef86ccd1cf..39a455df91b 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcFieldRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcFieldRequest.java
@@ -1,40 +1,40 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.messages;
-
-import org.apache.plc4x.java.api.model.PlcField;
-
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-
-public interface PlcFieldRequest extends PlcRequest {
-
-    @Override
-    CompletableFuture<? extends PlcFieldResponse> execute();
-
-    int getNumberOfFields();
-
-    LinkedHashSet<String> getFieldNames();
-
-    PlcField getField(String name);
-
-    List<PlcField> getFields();
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.messages;
+
+import org.apache.plc4x.java.api.model.PlcField;
+
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+public interface PlcFieldRequest extends PlcRequest {
+
+    @Override
+    CompletableFuture<? extends PlcFieldResponse> execute();
+
+    int getNumberOfFields();
+
+    LinkedHashSet<String> getFieldNames();
+
+    PlcField getField(String name);
+
+    List<PlcField> getFields();
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcFieldResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcFieldResponse.java
index cf2be496fdb..6b6143bf1ed 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcFieldResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcFieldResponse.java
@@ -1,41 +1,41 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.messages;
-
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-
-import java.util.Collection;
-
-/**
- * Base type for all response messages sent as response for a prior request
- * from a plc to the plc4x system.
- */
-public interface PlcFieldResponse extends PlcResponse {
-
-    @Override
-    PlcFieldRequest getRequest();
-
-    Collection<String> getFieldNames();
-
-    PlcField getField(String name);
-
-    PlcResponseCode getResponseCode(String name);
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.messages;
+
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+
+import java.util.Collection;
+
+/**
+ * Base type for all response messages sent as response for a prior request
+ * from a plc to the plc4x system.
+ */
+public interface PlcFieldResponse extends PlcResponse {
+
+    @Override
+    PlcFieldRequest getRequest();
+
+    Collection<String> getFieldNames();
+
+    PlcField getField(String name);
+
+    PlcResponseCode getResponseCode(String name);
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcMessage.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcMessage.java
index aed337da013..a49e29af96b 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcMessage.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcMessage.java
@@ -1,26 +1,26 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.messages;
-
-/**
- * Base type for all forms of messages passed between plc and plc4x system.
- */
-public interface PlcMessage {
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.messages;
+
+/**
+ * Base type for all forms of messages passed between plc and plc4x system.
+ */
+public interface PlcMessage {
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadRequest.java
index e60afc341a1..7a7a5c96471 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadRequest.java
@@ -1,41 +1,41 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.messages;
-
-import java.util.concurrent.CompletableFuture;
-
-/**
- * Request to read one or more values from a plc.
- */
-public interface PlcReadRequest extends PlcFieldRequest {
-
-    @Override
-    CompletableFuture<? extends PlcReadResponse> execute();
-
-    interface Builder extends PlcRequestBuilder {
-
-        @Override
-        PlcReadRequest build();
-
-        Builder addItem(String name, String fieldQuery);
-
-    }
-
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.messages;
+
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * Request to read one or more values from a plc.
+ */
+public interface PlcReadRequest extends PlcFieldRequest {
+
+    @Override
+    CompletableFuture<? extends PlcReadResponse> execute();
+
+    interface Builder extends PlcRequestBuilder {
+
+        @Override
+        PlcReadRequest build();
+
+        Builder addItem(String name, String fieldQuery);
+
+    }
+
+}
+
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadResponse.java
index 82d6e655335..ee238b667da 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadResponse.java
@@ -1,195 +1,195 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.messages;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.Duration;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.Collection;
-
-/**
- * Response to a {@link PlcReadRequest}.
- */
-public interface PlcReadResponse extends PlcFieldResponse {
-
-    @Override
-    PlcReadRequest getRequest();
-
-    int getNumberOfValues(String name);
-
-    Object getObject(String name);
-
-    Object getObject(String name, int index);
-
-    Collection<Object> getAllObjects(String name);
-
-    boolean isValidBoolean(String name);
-
-    boolean isValidBoolean(String name, int index);
-
-    Boolean getBoolean(String name);
-
-    Boolean getBoolean(String name, int index);
-
-    Collection<Boolean> getAllBooleans(String name);
-
-    boolean isValidByte(String name);
-
-    boolean isValidByte(String name, int index);
-
-    Byte getByte(String name);
-
-    Byte getByte(String name, int index);
-
-    Collection<Byte> getAllBytes(String name);
-
-    boolean isValidShort(String name);
-
-    boolean isValidShort(String name, int index);
-
-    Short getShort(String name);
-
-    Short getShort(String name, int index);
-
-    Collection<Short> getAllShorts(String name);
-
-    boolean isValidInteger(String name);
-
-    boolean isValidInteger(String name, int index);
-
-    Integer getInteger(String name);
-
-    Integer getInteger(String name, int index);
-
-    Collection<Integer> getAllIntegers(String name);
-
-    boolean isValidBigInteger(String name);
-
-    boolean isValidBigInteger(String name, int index);
-
-    BigInteger getBigInteger(String name);
-
-    BigInteger getBigInteger(String name, int index);
-
-    Collection<BigInteger> getAllBigIntegers(String name);
-
-    boolean isValidLong(String name);
-
-    boolean isValidLong(String name, int index);
-
-    Long getLong(String name);
-
-    Long getLong(String name, int index);
-
-    Collection<Long> getAllLongs(String name);
-
-    boolean isValidFloat(String name);
-
-    boolean isValidFloat(String name, int index);
-
-    Float getFloat(String name);
-
-    Float getFloat(String name, int index);
-
-    Collection<Float> getAllFloats(String name);
-
-    boolean isValidDouble(String name);
-
-    boolean isValidDouble(String name, int index);
-
-    Double getDouble(String name);
-
-    Double getDouble(String name, int index);
-
-    Collection<Double> getAllDoubles(String name);
-
-    boolean isValidBigDecimal(String name);
-
-    boolean isValidBigDecimal(String name, int index);
-
-    BigDecimal getBigDecimal(String name);
-
-    BigDecimal getBigDecimal(String name, int index);
-
-    Collection<BigDecimal> getAllBigDecimals(String name);
-
-    boolean isValidString(String name);
-
-    boolean isValidString(String name, int index);
-
-    String getString(String name);
-
-    String getString(String name, int index);
-
-    Collection<String> getAllStrings(String name);
-
-    boolean isValidTime(String name);
-
-    boolean isValidTime(String name, int index);
-
-    LocalTime getTime(String name);
-
-    LocalTime getTime(String name, int index);
-
-    Collection<LocalTime> getAllTimes(String name);
-
-    boolean isValidDate(String name);
-
-    boolean isValidDate(String name, int index);
-
-    LocalDate getDate(String name);
-
-    LocalDate getDate(String name, int index);
-
-    Collection<LocalDate> getAllDates(String name);
-
-    boolean isValidDateTime(String name);
-
-    boolean isValidDateTime(String name, int index);
-
-    LocalDateTime getDateTime(String name);
-
-    LocalDateTime getDateTime(String name, int index);
-
-    Collection<LocalDateTime> getAllDateTimes(String name);
-    
-    boolean isValidDuration(String name);
-
-    boolean isValidDuration(String name, int index);    
-    
-    Duration getDuration(String name);
-
-    Duration getDuration(String name, int index);
-
-    Collection<Duration> getAllDuration(String name);    
-
-    boolean isValidByteArray(String name);
-
-    boolean isValidByteArray(String name, int index);
-
-    Byte[] getByteArray(String name);
-
-    Byte[] getByteArray(String name, int index);
-
-    Collection<Byte[]> getAllByteArrays(String name);
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.messages;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.Collection;
+
+/**
+ * Response to a {@link PlcReadRequest}.
+ */
+public interface PlcReadResponse extends PlcFieldResponse {
+
+    @Override
+    PlcReadRequest getRequest();
+
+    int getNumberOfValues(String name);
+
+    Object getObject(String name);
+
+    Object getObject(String name, int index);
+
+    Collection<Object> getAllObjects(String name);
+
+    boolean isValidBoolean(String name);
+
+    boolean isValidBoolean(String name, int index);
+
+    Boolean getBoolean(String name);
+
+    Boolean getBoolean(String name, int index);
+
+    Collection<Boolean> getAllBooleans(String name);
+
+    boolean isValidByte(String name);
+
+    boolean isValidByte(String name, int index);
+
+    Byte getByte(String name);
+
+    Byte getByte(String name, int index);
+
+    Collection<Byte> getAllBytes(String name);
+
+    boolean isValidShort(String name);
+
+    boolean isValidShort(String name, int index);
+
+    Short getShort(String name);
+
+    Short getShort(String name, int index);
+
+    Collection<Short> getAllShorts(String name);
+
+    boolean isValidInteger(String name);
+
+    boolean isValidInteger(String name, int index);
+
+    Integer getInteger(String name);
+
+    Integer getInteger(String name, int index);
+
+    Collection<Integer> getAllIntegers(String name);
+
+    boolean isValidBigInteger(String name);
+
+    boolean isValidBigInteger(String name, int index);
+
+    BigInteger getBigInteger(String name);
+
+    BigInteger getBigInteger(String name, int index);
+
+    Collection<BigInteger> getAllBigIntegers(String name);
+
+    boolean isValidLong(String name);
+
+    boolean isValidLong(String name, int index);
+
+    Long getLong(String name);
+
+    Long getLong(String name, int index);
+
+    Collection<Long> getAllLongs(String name);
+
+    boolean isValidFloat(String name);
+
+    boolean isValidFloat(String name, int index);
+
+    Float getFloat(String name);
+
+    Float getFloat(String name, int index);
+
+    Collection<Float> getAllFloats(String name);
+
+    boolean isValidDouble(String name);
+
+    boolean isValidDouble(String name, int index);
+
+    Double getDouble(String name);
+
+    Double getDouble(String name, int index);
+
+    Collection<Double> getAllDoubles(String name);
+
+    boolean isValidBigDecimal(String name);
+
+    boolean isValidBigDecimal(String name, int index);
+
+    BigDecimal getBigDecimal(String name);
+
+    BigDecimal getBigDecimal(String name, int index);
+
+    Collection<BigDecimal> getAllBigDecimals(String name);
+
+    boolean isValidString(String name);
+
+    boolean isValidString(String name, int index);
+
+    String getString(String name);
+
+    String getString(String name, int index);
+
+    Collection<String> getAllStrings(String name);
+
+    boolean isValidTime(String name);
+
+    boolean isValidTime(String name, int index);
+
+    LocalTime getTime(String name);
+
+    LocalTime getTime(String name, int index);
+
+    Collection<LocalTime> getAllTimes(String name);
+
+    boolean isValidDate(String name);
+
+    boolean isValidDate(String name, int index);
+
+    LocalDate getDate(String name);
+
+    LocalDate getDate(String name, int index);
+
+    Collection<LocalDate> getAllDates(String name);
+
+    boolean isValidDateTime(String name);
+
+    boolean isValidDateTime(String name, int index);
+
+    LocalDateTime getDateTime(String name);
+
+    LocalDateTime getDateTime(String name, int index);
+
+    Collection<LocalDateTime> getAllDateTimes(String name);
+    
+    boolean isValidDuration(String name);
+
+    boolean isValidDuration(String name, int index);    
+    
+    Duration getDuration(String name);
+
+    Duration getDuration(String name, int index);
+
+    Collection<Duration> getAllDuration(String name);    
+
+    boolean isValidByteArray(String name);
+
+    boolean isValidByteArray(String name, int index);
+
+    Byte[] getByteArray(String name);
+
+    Byte[] getByteArray(String name, int index);
+
+    Collection<Byte[]> getAllByteArrays(String name);
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequest.java
index 4b40bf119a4..55574f178a5 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequest.java
@@ -1,28 +1,28 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.messages;
-
-import java.util.concurrent.CompletableFuture;
-
-/**
- * Base type for all messages sent from the plc4x system to a connected plc.
- */
-public interface PlcRequest extends PlcMessage {
-    CompletableFuture<? extends PlcResponse> execute();
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.messages;
+
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * Base type for all messages sent from the plc4x system to a connected plc.
+ */
+public interface PlcRequest extends PlcMessage {
+    CompletableFuture<? extends PlcResponse> execute();
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequestBuilder.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequestBuilder.java
index b5f9b80c8d5..b2efdd95f2e 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequestBuilder.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequestBuilder.java
@@ -1,23 +1,23 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.messages;
-
-public interface PlcRequestBuilder {
-    PlcRequest build();
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.messages;
+
+public interface PlcRequestBuilder {
+    PlcRequest build();
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcResponse.java
index 7fdcffc1401..91d241dcfbc 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcResponse.java
@@ -1,27 +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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.messages;
-
-/**
- * Base type for all response messages sent as response for a prior request
- * from a plc to the plc4x system.
- */
-public interface PlcResponse extends PlcMessage {
-    PlcRequest getRequest();
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.messages;
+
+/**
+ * Base type for all response messages sent as response for a prior request
+ * from a plc to the plc4x system.
+ */
+public interface PlcResponse extends PlcMessage {
+    PlcRequest getRequest();
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionEvent.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionEvent.java
index 71923900422..b613d648c81 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionEvent.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionEvent.java
@@ -1,28 +1,28 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.messages;
-
-import java.time.Instant;
-
-public interface PlcSubscriptionEvent extends PlcReadResponse {
-    /**
-     * @return the timestamp at which this event occurred.
-     */
-    Instant getTimestamp();
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.messages;
+
+import java.time.Instant;
+
+public interface PlcSubscriptionEvent extends PlcReadResponse {
+    /**
+     * @return the timestamp at which this event occurred.
+     */
+    Instant getTimestamp();
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionRequest.java
index 3e51d6f82e4..ad1cf5b8e11 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionRequest.java
@@ -1,67 +1,67 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.messages;
-
-import java.time.Duration;
-import java.util.concurrent.CompletableFuture;
-
-public interface PlcSubscriptionRequest extends PlcFieldRequest {
-
-    @Override
-    CompletableFuture<? extends PlcSubscriptionResponse> execute();
-
-    interface Builder extends PlcRequestBuilder {
-
-        @Override
-        PlcSubscriptionRequest build();
-
-        /**
-         * Adds a new field to the to be constructed request which should be polled cyclically.
-         *
-         * @param name            alias of the field.
-         * @param fieldQuery      field query string for accessing the field.
-         * @param pollingInterval interval, in which the field should be polled.
-         * @return builder.
-         */
-        PlcSubscriptionRequest.Builder addCyclicField(String name, String fieldQuery, Duration pollingInterval);
-
-        /**
-         * Adds a new field to the to be constructed request which should be updated as soon as
-         * a value changes in the PLC.
-         *
-         * @param name       alias of the field.
-         * @param fieldQuery field query string for accessing the field.
-         * @return builder.
-         */
-        PlcSubscriptionRequest.Builder addChangeOfStateField(String name, String fieldQuery);
-
-        /**
-         * Adds a new subscription to the to be constructed request which should be updated
-         * as soon as an event occurs.
-         * <p>
-         * REMARK: We will have to see if this signature is correct as soon as we start using this type of subscription.
-         *
-         * @param name       alias of the field.
-         * @param fieldQuery field query string for accessing the field.
-         * @return builder.
-         */
-        PlcSubscriptionRequest.Builder addEventField(String name, String fieldQuery);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.messages;
+
+import java.time.Duration;
+import java.util.concurrent.CompletableFuture;
+
+public interface PlcSubscriptionRequest extends PlcFieldRequest {
+
+    @Override
+    CompletableFuture<? extends PlcSubscriptionResponse> execute();
+
+    interface Builder extends PlcRequestBuilder {
+
+        @Override
+        PlcSubscriptionRequest build();
+
+        /**
+         * Adds a new field to the to be constructed request which should be polled cyclically.
+         *
+         * @param name            alias of the field.
+         * @param fieldQuery      field query string for accessing the field.
+         * @param pollingInterval interval, in which the field should be polled.
+         * @return builder.
+         */
+        PlcSubscriptionRequest.Builder addCyclicField(String name, String fieldQuery, Duration pollingInterval);
+
+        /**
+         * Adds a new field to the to be constructed request which should be updated as soon as
+         * a value changes in the PLC.
+         *
+         * @param name       alias of the field.
+         * @param fieldQuery field query string for accessing the field.
+         * @return builder.
+         */
+        PlcSubscriptionRequest.Builder addChangeOfStateField(String name, String fieldQuery);
+
+        /**
+         * Adds a new subscription to the to be constructed request which should be updated
+         * as soon as an event occurs.
+         * <p>
+         * REMARK: We will have to see if this signature is correct as soon as we start using this type of subscription.
+         *
+         * @param name       alias of the field.
+         * @param fieldQuery field query string for accessing the field.
+         * @return builder.
+         */
+        PlcSubscriptionRequest.Builder addEventField(String name, String fieldQuery);
+    }
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionResponse.java
index 30b802a2fa9..b2c7ad186e9 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionResponse.java
@@ -1,34 +1,34 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.messages;
-
-import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
-
-import java.util.Collection;
-
-public interface PlcSubscriptionResponse extends PlcFieldResponse {
-
-    @Override
-    PlcSubscriptionRequest getRequest();
-
-    PlcSubscriptionHandle getSubscriptionHandle(String name);
-
-    Collection<PlcSubscriptionHandle> getSubscriptionHandles();
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.messages;
+
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+
+import java.util.Collection;
+
+public interface PlcSubscriptionResponse extends PlcFieldResponse {
+
+    @Override
+    PlcSubscriptionRequest getRequest();
+
+    PlcSubscriptionHandle getSubscriptionHandle(String name);
+
+    Collection<PlcSubscriptionHandle> getSubscriptionHandles();
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionRequest.java
index 8fb2979b618..02503694038 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionRequest.java
@@ -1,49 +1,49 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.messages;
-
-import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
-
-import java.util.Collection;
-import java.util.concurrent.CompletableFuture;
-
-public interface PlcUnsubscriptionRequest extends PlcRequest {
-
-    @Override
-    CompletableFuture<PlcUnsubscriptionResponse> execute();
-
-    interface Builder extends PlcRequestBuilder {
-
-        @Override
-        PlcUnsubscriptionRequest build();
-
-        /**
-         * TODO document me:
-         *
-         * @param plcSubscriptionHandle
-         * @return
-         */
-        PlcUnsubscriptionRequest.Builder addHandles(PlcSubscriptionHandle plcSubscriptionHandle);
-
-        PlcUnsubscriptionRequest.Builder addHandles(PlcSubscriptionHandle plcSubscriptionHandle1, PlcSubscriptionHandle... plcSubscriptionHandles);
-
-        PlcUnsubscriptionRequest.Builder addHandles(Collection<PlcSubscriptionHandle> plcSubscriptionHandle);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.messages;
+
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+
+import java.util.Collection;
+import java.util.concurrent.CompletableFuture;
+
+public interface PlcUnsubscriptionRequest extends PlcRequest {
+
+    @Override
+    CompletableFuture<PlcUnsubscriptionResponse> execute();
+
+    interface Builder extends PlcRequestBuilder {
+
+        @Override
+        PlcUnsubscriptionRequest build();
+
+        /**
+         * TODO document me:
+         *
+         * @param plcSubscriptionHandle
+         * @return
+         */
+        PlcUnsubscriptionRequest.Builder addHandles(PlcSubscriptionHandle plcSubscriptionHandle);
+
+        PlcUnsubscriptionRequest.Builder addHandles(PlcSubscriptionHandle plcSubscriptionHandle1, PlcSubscriptionHandle... plcSubscriptionHandles);
+
+        PlcUnsubscriptionRequest.Builder addHandles(Collection<PlcSubscriptionHandle> plcSubscriptionHandle);
+    }
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionResponse.java
index 705ee8d34bc..b0098129283 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionResponse.java
@@ -1,26 +1,26 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.messages;
-
-public interface PlcUnsubscriptionResponse extends PlcResponse {
-
-    @Override
-    PlcUnsubscriptionRequest getRequest();
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.messages;
+
+public interface PlcUnsubscriptionResponse extends PlcResponse {
+
+    @Override
+    PlcUnsubscriptionRequest getRequest();
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java
index 5d5a494299f..411e7104117 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java
@@ -1,76 +1,76 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.messages;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.Duration;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.concurrent.CompletableFuture;
-
-public interface PlcWriteRequest extends PlcFieldRequest {
-
-    @Override
-    CompletableFuture<? extends PlcWriteResponse> execute();
-
-    int getNumberOfValues(String name);
-
-    interface Builder extends PlcRequestBuilder {
-
-        @Override
-        PlcWriteRequest build();
-
-        PlcWriteRequest.Builder addItem(String name, String fieldQuery, Boolean... values);
-
-        PlcWriteRequest.Builder addItem(String name, String fieldQuery, Byte... values);
-
-        PlcWriteRequest.Builder addItem(String name, String fieldQuery, Short... values);
-
-        PlcWriteRequest.Builder addItem(String name, String fieldQuery, Integer... values);
-
-        PlcWriteRequest.Builder addItem(String name, String fieldQuery, BigInteger... values);
-
-        PlcWriteRequest.Builder addItem(String name, String fieldQuery, Long... values);
-
-        PlcWriteRequest.Builder addItem(String name, String fieldQuery, Float... values);
-
-        PlcWriteRequest.Builder addItem(String name, String fieldQuery, Double... values);
-
-        PlcWriteRequest.Builder addItem(String name, String fieldQuery, BigDecimal... values);
-
-        PlcWriteRequest.Builder addItem(String name, String fieldQuery, String... values);
-
-        PlcWriteRequest.Builder addItem(String name, String fieldQuery, LocalTime... values);
-
-        PlcWriteRequest.Builder addItem(String name, String fieldQuery, LocalDate... values);
-
-        PlcWriteRequest.Builder addItem(String name, String fieldQuery, LocalDateTime... values);
-        
-        PlcWriteRequest.Builder addItem(String name, String fieldQuery, Duration... values);        
-
-        PlcWriteRequest.Builder addItem(String name, String fieldQuery, byte[]... values);
-
-        PlcWriteRequest.Builder addItem(String name, String fieldQuery, Byte[]... values);
-
-        <T> PlcWriteRequest.Builder addItem(String name, String fieldQuery, T... values);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.messages;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.concurrent.CompletableFuture;
+
+public interface PlcWriteRequest extends PlcFieldRequest {
+
+    @Override
+    CompletableFuture<? extends PlcWriteResponse> execute();
+
+    int getNumberOfValues(String name);
+
+    interface Builder extends PlcRequestBuilder {
+
+        @Override
+        PlcWriteRequest build();
+
+        PlcWriteRequest.Builder addItem(String name, String fieldQuery, Boolean... values);
+
+        PlcWriteRequest.Builder addItem(String name, String fieldQuery, Byte... values);
+
+        PlcWriteRequest.Builder addItem(String name, String fieldQuery, Short... values);
+
+        PlcWriteRequest.Builder addItem(String name, String fieldQuery, Integer... values);
+
+        PlcWriteRequest.Builder addItem(String name, String fieldQuery, BigInteger... values);
+
+        PlcWriteRequest.Builder addItem(String name, String fieldQuery, Long... values);
+
+        PlcWriteRequest.Builder addItem(String name, String fieldQuery, Float... values);
+
+        PlcWriteRequest.Builder addItem(String name, String fieldQuery, Double... values);
+
+        PlcWriteRequest.Builder addItem(String name, String fieldQuery, BigDecimal... values);
+
+        PlcWriteRequest.Builder addItem(String name, String fieldQuery, String... values);
+
+        PlcWriteRequest.Builder addItem(String name, String fieldQuery, LocalTime... values);
+
+        PlcWriteRequest.Builder addItem(String name, String fieldQuery, LocalDate... values);
+
+        PlcWriteRequest.Builder addItem(String name, String fieldQuery, LocalDateTime... values);
+        
+        PlcWriteRequest.Builder addItem(String name, String fieldQuery, Duration... values);        
+
+        PlcWriteRequest.Builder addItem(String name, String fieldQuery, byte[]... values);
+
+        PlcWriteRequest.Builder addItem(String name, String fieldQuery, Byte[]... values);
+
+        <T> PlcWriteRequest.Builder addItem(String name, String fieldQuery, T... values);
+    }
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteResponse.java
index 035a3d73ec3..daba64d0795 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteResponse.java
@@ -1,26 +1,26 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.messages;
-
-public interface PlcWriteResponse extends PlcFieldResponse {
-
-    @Override
-    PlcWriteRequest getRequest();
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.messages;
+
+public interface PlcWriteResponse extends PlcFieldResponse {
+
+    @Override
+    PlcWriteRequest getRequest();
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/metadata/PlcConnectionMetadata.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/metadata/PlcConnectionMetadata.java
index 263aec9ee97..02f0d2e6797 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/metadata/PlcConnectionMetadata.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/metadata/PlcConnectionMetadata.java
@@ -1,42 +1,42 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.metadata;
-
-/**
- * Information about connection capabilities.
- * This includes connection and driver specific metadata.
- */
-public interface PlcConnectionMetadata {
-
-    /**
-     * Indicates that the connection supports reading.
-     */
-    boolean canRead();
-
-    /**
-     * Indicates that the connection supports writing.
-     */
-    boolean canWrite();
-
-    /**
-     * Indicates that the connection supports subscription.
-     */
-    boolean canSubscribe();
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.metadata;
+
+/**
+ * Information about connection capabilities.
+ * This includes connection and driver specific metadata.
+ */
+public interface PlcConnectionMetadata {
+
+    /**
+     * Indicates that the connection supports reading.
+     */
+    boolean canRead();
+
+    /**
+     * Indicates that the connection supports writing.
+     */
+    boolean canWrite();
+
+    /**
+     * Indicates that the connection supports subscription.
+     */
+    boolean canSubscribe();
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/model/PlcConsumerRegistration.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/model/PlcConsumerRegistration.java
index a0a8c528b93..fde29f3ebd6 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/model/PlcConsumerRegistration.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/model/PlcConsumerRegistration.java
@@ -1,24 +1,24 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.api.model;
-
-public interface PlcConsumerRegistration {
-    void unregister();
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.api.model;
+
+public interface PlcConsumerRegistration {
+    void unregister();
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/model/PlcField.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/model/PlcField.java
index 6851667015e..ca249c094a1 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/model/PlcField.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/model/PlcField.java
@@ -1,51 +1,51 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.model;
-
-/**
- * Base type for all field types.
- * Typically every driver provides an implementation of this interface in order
- * to be able to describe the fields of a resource. As this is completely tied to
- * the implemented protocol, this base interface makes absolutely no assumption to
- * any information it should provide.
- *
- * In order to stay platform and protocol independent every driver connection implementation
- * provides a prepareField(String) method that is able to parse a string representation of
- * a resource into it's individual field type. Manually constructing PlcField objects
- * manually makes the solution less independent from the protocol, but might be faster.
- */
-public interface PlcField {
-
-    /**
-     * Returns the "default" type of the response one can expect from this field as java type.
-     * I.e., a call to getXXX for the ResponseItem should succeed.
-     *
-     * The contract is not to return the exact type which is internally hold by PLC4X but to
-     * return a "casteable" type, i.e., a type whiches getXXX method succeeds.
-     * So for example if a type is internally a short, but the getInt() method is implemented, it
-     * is allowed to return Integer.class by this method.
-     *
-     * <b>This method should always return the BOXED type for primitives. E.g. not bool.class but Boolean.class</b>
-     * @return Either specific type or Object.class if no specific type is known.
-     */
-    default Class<?> getDefaultJavaType() {
-        return Object.class;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.model;
+
+/**
+ * Base type for all field types.
+ * Typically every driver provides an implementation of this interface in order
+ * to be able to describe the fields of a resource. As this is completely tied to
+ * the implemented protocol, this base interface makes absolutely no assumption to
+ * any information it should provide.
+ *
+ * In order to stay platform and protocol independent every driver connection implementation
+ * provides a prepareField(String) method that is able to parse a string representation of
+ * a resource into it's individual field type. Manually constructing PlcField objects
+ * manually makes the solution less independent from the protocol, but might be faster.
+ */
+public interface PlcField {
+
+    /**
+     * Returns the "default" type of the response one can expect from this field as java type.
+     * I.e., a call to getXXX for the ResponseItem should succeed.
+     *
+     * The contract is not to return the exact type which is internally hold by PLC4X but to
+     * return a "casteable" type, i.e., a type whiches getXXX method succeeds.
+     * So for example if a type is internally a short, but the getInt() method is implemented, it
+     * is allowed to return Integer.class by this method.
+     *
+     * <b>This method should always return the BOXED type for primitives. E.g. not bool.class but Boolean.class</b>
+     * @return Either specific type or Object.class if no specific type is known.
+     */
+    default Class<?> getDefaultJavaType() {
+        return Object.class;
+    }
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/model/PlcSubscriptionHandle.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/model/PlcSubscriptionHandle.java
index a9338ed6062..d9e24fa4b2b 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/model/PlcSubscriptionHandle.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/model/PlcSubscriptionHandle.java
@@ -1,37 +1,37 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.model;
-
-import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
-
-import java.util.function.Consumer;
-
-/**
- * When subscribing to remote resources, depending on the used protocol
- * different data is used to identify a subscription. This interface is
- * to be implemented in the individual Driver implementations to contain
- * all information needed to pull or unsubscribe any form of subscription.
- * <p>
- * For every subscribed item, a separate {@link PlcSubscriptionHandle} object is
- * returned in order to allow fine granular unsubscriptions.
- */
-public interface PlcSubscriptionHandle {
-
-    PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer);
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.model;
+
+import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
+
+import java.util.function.Consumer;
+
+/**
+ * When subscribing to remote resources, depending on the used protocol
+ * different data is used to identify a subscription. This interface is
+ * to be implemented in the individual Driver implementations to contain
+ * all information needed to pull or unsubscribe any form of subscription.
+ * <p>
+ * For every subscribed item, a separate {@link PlcSubscriptionHandle} object is
+ * returned in order to allow fine granular unsubscriptions.
+ */
+public interface PlcSubscriptionHandle {
+
+    PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer);
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/types/PlcClientDatatype.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/types/PlcClientDatatype.java
index ed36ad54950..dfbf16cd7c1 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/types/PlcClientDatatype.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/types/PlcClientDatatype.java
@@ -1,35 +1,35 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.types;
-
-public enum PlcClientDatatype {
-
-    BOOLEAN,
-    BYTE,
-    SHORT,
-    INTEGER,
-    LONG,
-    FLOAT,
-    DOUBLE,
-    STRING,
-    TIME,
-    DATE,
-    DATE_TIME
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.types;
+
+public enum PlcClientDatatype {
+
+    BOOLEAN,
+    BYTE,
+    SHORT,
+    INTEGER,
+    LONG,
+    FLOAT,
+    DOUBLE,
+    STRING,
+    TIME,
+    DATE,
+    DATE_TIME
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/types/PlcResponseCode.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/types/PlcResponseCode.java
index dbd4be5054a..205dd68101d 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/types/PlcResponseCode.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/types/PlcResponseCode.java
@@ -1,31 +1,31 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.types;
-
-public enum PlcResponseCode {
-
-    OK,
-    NOT_FOUND,
-    ACCESS_DENIED,
-    INVALID_ADDRESS,
-    INVALID_DATATYPE,
-    INTERNAL_ERROR,
-    RESPONSE_PENDING
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.types;
+
+public enum PlcResponseCode {
+
+    OK,
+    NOT_FOUND,
+    ACCESS_DENIED,
+    INVALID_ADDRESS,
+    INVALID_DATATYPE,
+    INTERNAL_ERROR,
+    RESPONSE_PENDING
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/types/PlcSubscriptionType.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/types/PlcSubscriptionType.java
index 4b0d972b4f0..6d2fa1ecc50 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/types/PlcSubscriptionType.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/types/PlcSubscriptionType.java
@@ -1,42 +1,42 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.types;
-
-/**
- * {@link PlcSubscriptionType} specifies the nature of the subscription.
- * In general PLC4X supports exactly 3 types of subscriptions.
- */
-public enum PlcSubscriptionType {
-
-    /**
-     * A cyclic subscription where a value is sent no matter if it's value changed in a given interval.
-     */
-    CYCLIC,
-
-    /**
-     * Only send data, if a value in the PLC changed.
-     */
-    CHANGE_OF_STATE,
-
-    /**
-     * Subscribe to events created by the PLC which usually are defined in the PLCs application (Alarms).
-     */
-    EVENT
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.types;
+
+/**
+ * {@link PlcSubscriptionType} specifies the nature of the subscription.
+ * In general PLC4X supports exactly 3 types of subscriptions.
+ */
+public enum PlcSubscriptionType {
+
+    /**
+     * A cyclic subscription where a value is sent no matter if it's value changed in a given interval.
+     */
+    CYCLIC,
+
+    /**
+     * Only send data, if a value in the PLC changed.
+     */
+    CHANGE_OF_STATE,
+
+    /**
+     * Subscribe to events created by the PLC which usually are defined in the PLCs application (Alarms).
+     */
+    EVENT
+
+}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcDriver.java b/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcDriver.java
index 6247f17a8df..7fbc8475e31 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcDriver.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcDriver.java
@@ -1,61 +1,61 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.spi;
-
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-
-/**
- * General interface defining the minimal methods required for adding a new type of driver to the PLC4J system.
- *
- * <b>Note that each driver has to add a service file called org.apache.plc4x.java.spi.PlcDriver to
- * src/main/resources/META-INF which contains the fully qualified classname in order to get loaded
- * by the PlcDriverManager instances.</b>
- */
-public interface PlcDriver {
-
-    /**
-     * @return code of the implemented protocol. This is usually a lot shorter than the String returned by @seeĀ #getProtocolName().
-     */
-    String getProtocolCode();
-
-    /**
-     * @return name of the implemented protocol.
-     */
-    String getProtocolName();
-
-    /**
-     * Connects to a PLC using the given plc connection string.
-     * @param url plc connection string.
-     * @return PlcConnection object.
-     * @throws PlcConnectionException an exception if the connection attempt failed.
-     */
-    PlcConnection connect(String url) throws PlcConnectionException;
-
-    /**
-     * Connects to a PLC using the given plc connection string using given authentication credentials.
-     * @param url plc connection string.
-     * @param authentication authentication credentials.
-     * @return PlcConnection object.
-     * @throws PlcConnectionException an exception if the connection attempt failed.
-     */
-    PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException;
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.spi;
+
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.authentication.PlcAuthentication;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+
+/**
+ * General interface defining the minimal methods required for adding a new type of driver to the PLC4J system.
+ *
+ * <b>Note that each driver has to add a service file called org.apache.plc4x.java.spi.PlcDriver to
+ * src/main/resources/META-INF which contains the fully qualified classname in order to get loaded
+ * by the PlcDriverManager instances.</b>
+ */
+public interface PlcDriver {
+
+    /**
+     * @return code of the implemented protocol. This is usually a lot shorter than the String returned by @seeĀ #getProtocolName().
+     */
+    String getProtocolCode();
+
+    /**
+     * @return name of the implemented protocol.
+     */
+    String getProtocolName();
+
+    /**
+     * Connects to a PLC using the given plc connection string.
+     * @param url plc connection string.
+     * @return PlcConnection object.
+     * @throws PlcConnectionException an exception if the connection attempt failed.
+     */
+    PlcConnection connect(String url) throws PlcConnectionException;
+
+    /**
+     * Connects to a PLC using the given plc connection string using given authentication credentials.
+     * @param url plc connection string.
+     * @param authentication authentication credentials.
+     * @return PlcConnection object.
+     * @throws PlcConnectionException an exception if the connection attempt failed.
+     */
+    PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException;
+
+}
diff --git a/plc4j/api/src/site/asciidoc/design.adoc b/plc4j/api/src/site/asciidoc/design.adoc
index 95d3a4ee618..e6f226a15df 100644
--- a/plc4j/api/src/site/asciidoc/design.adoc
+++ b/plc4j/api/src/site/asciidoc/design.adoc
@@ -1,51 +1,51 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== Design principals
-
-While designing the API for PLC4X the following ideas were important to us:
-
-- It should be possible to write a piece of software to interact with a PLC regardless of it's type or protocol.
-- Communication should utilize non-blocking principles where possible.
-
-=== Protocol and PLC independence
-
-In order to address a resource on a PLC the following information is required:
-
-- Addressing the PLC itself
-- Addressing resources on the PLC
-- The type of the resource
-
-Hereby the following parts are PLC and protocol dependent:
-
-- Addressing the PLC itself
-- Addressing resources on the PLC
-
-A driver implementation for a given protocol should therefore be able to parse a connection string and establish a connection to the corresponding PLC.
-
-The required information for addressing a resource is highly dependent on the used protocol and PLC type, therefore the connection - which should know what type of plc it's connected to - then should be able to parse an address string.
-
-As parsing a string can be expensive, the connection should provide a method for parsing a resource address string into an Address instance that can then be re-used by subsequent requests.
-
-Last, not least, the driver should be able to translate the data types defined in PLC4X into ones the protocol and PLC can understand.
-
-=== Non blocking communication
-
-As the protocols involved may include some consisting of multiple layers of protocols, designing a framework for supporting clean protocol layering and async communication, we decided to use an existing io framework instead.
-
-Currently PLC4X uses Apache Mina, but we are currently experimenting with Netty as this has been reported to have a simple architecture and provide better performance.
-
+//
+//  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
+//
+//      http://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.
+//
+
+== Design principals
+
+While designing the API for PLC4X the following ideas were important to us:
+
+- It should be possible to write a piece of software to interact with a PLC regardless of it's type or protocol.
+- Communication should utilize non-blocking principles where possible.
+
+=== Protocol and PLC independence
+
+In order to address a resource on a PLC the following information is required:
+
+- Addressing the PLC itself
+- Addressing resources on the PLC
+- The type of the resource
+
+Hereby the following parts are PLC and protocol dependent:
+
+- Addressing the PLC itself
+- Addressing resources on the PLC
+
+A driver implementation for a given protocol should therefore be able to parse a connection string and establish a connection to the corresponding PLC.
+
+The required information for addressing a resource is highly dependent on the used protocol and PLC type, therefore the connection - which should know what type of plc it's connected to - then should be able to parse an address string.
+
+As parsing a string can be expensive, the connection should provide a method for parsing a resource address string into an Address instance that can then be re-used by subsequent requests.
+
+Last, not least, the driver should be able to translate the data types defined in PLC4X into ones the protocol and PLC can understand.
+
+=== Non blocking communication
+
+As the protocols involved may include some consisting of multiple layers of protocols, designing a framework for supporting clean protocol layering and async communication, we decided to use an existing io framework instead.
+
+Currently PLC4X uses Apache Mina, but we are currently experimenting with Netty as this has been reported to have a simple architecture and provide better performance.
+
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/PlcDriverManagerTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/PlcDriverManagerTest.java
index 38cb8cf599e..36b53327c8f 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/PlcDriverManagerTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/PlcDriverManagerTest.java
@@ -1,117 +1,117 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java;
-
-import org.apache.plc4x.java.api.authentication.PlcUsernamePasswordAuthentication;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.exceptions.PlcException;
-import org.apache.plc4x.java.mock.MockPlcConnection;
-import org.apache.plc4x.test.FastTests;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.hamcrest.core.IsNull.nullValue;
-import static org.junit.Assert.assertThat;
-
-public class PlcDriverManagerTest {
-
-    /**
-     * Tries to get the mock plc driver which is part of this testsuite.
-     *
-     * @throws PlcException something went wrong
-     */
-    @Test
-    @Category(FastTests.class)
-    public void getExistingDriverTest() throws PlcException {
-        MockPlcConnection mockConnection = (MockPlcConnection) new PlcDriverManager().getConnection("spi-mock://some-cool-url");
-
-        assertThat(mockConnection.getAuthentication(), nullValue());
-        assertThat(mockConnection.isConnected(), is(true));
-    }
-
-    /**
-     * Tries to get the mock plc driver with authentication which is part of this testsuite.
-     *
-     * @throws PlcException something went wrong
-     */
-    @Test
-    @Category(FastTests.class)
-    public void getExistingDriverWithAuthenticationTest() throws PlcException {
-        PlcUsernamePasswordAuthentication authentication =
-            new PlcUsernamePasswordAuthentication("user", "pass");
-        MockPlcConnection mockConnection = (MockPlcConnection) new PlcDriverManager().getConnection("spi-mock://some-cool-url", authentication);
-
-        assertThat(mockConnection.getAuthentication(), notNullValue());
-        assertThat(mockConnection.getAuthentication(), instanceOf(PlcUsernamePasswordAuthentication.class));
-        assertThat(mockConnection.isConnected(), is(true));
-    }
-
-    /**
-     * In this test case a driver is requested which is not registered with the PlcDriverManager.
-     *
-     * @throws PlcConnectionException something went wrong
-     */
-    @Test(expected = PlcConnectionException.class)
-    @Category(FastTests.class)
-    public void getNotExistingDriverTest() throws PlcConnectionException {
-        new PlcDriverManager().getConnection("non-existing-protocol://some-cool-url");
-    }
-
-    /**
-     * In this test case a driver is requested which is not registered with the PlcDriverManager.
-     *
-     * @throws PlcConnectionException something went wrong
-     */
-    @Test(expected = PlcConnectionException.class)
-    @Category(FastTests.class)
-    public void getInvalidUriTest() throws PlcConnectionException {
-        new PlcDriverManager().getConnection("The quick brown fox jumps over the lazy dog");
-    }
-
-    /**
-     * In this test the PlcDriverManager will be configured with a service list that
-     * contains multiple implementation instances of the same protocol. This should result in
-     * an error.
-     *
-     * @throws MalformedURLException something went wrong
-     * @throws PlcConnectionException something went wrong
-     */
-    @Test(expected = IllegalStateException.class)
-    @Category(FastTests.class)
-    public void getDuplicateDriver() throws MalformedURLException, PlcConnectionException {
-        // Save and replace the context classloader as we need to force the ServiceLoader to
-        // use a different service file.
-        ClassLoader originalClassloader = Thread.currentThread().getContextClassLoader();
-        URL[] urls = new URL[1];
-        urls[0] = new File("src/test/resources/test").toURI().toURL();
-        ClassLoader fakeClassLoader = new URLClassLoader(urls, originalClassloader);
-
-        // expect exception
-        new PlcDriverManager(fakeClassLoader).getConnection("spi-mock://some-cool-url");
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java;
+
+import org.apache.plc4x.java.api.authentication.PlcUsernamePasswordAuthentication;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.exceptions.PlcException;
+import org.apache.plc4x.java.mock.MockPlcConnection;
+import org.apache.plc4x.test.FastTests;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsInstanceOf.instanceOf;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.hamcrest.core.IsNull.nullValue;
+import static org.junit.Assert.assertThat;
+
+public class PlcDriverManagerTest {
+
+    /**
+     * Tries to get the mock plc driver which is part of this testsuite.
+     *
+     * @throws PlcException something went wrong
+     */
+    @Test
+    @Category(FastTests.class)
+    public void getExistingDriverTest() throws PlcException {
+        MockPlcConnection mockConnection = (MockPlcConnection) new PlcDriverManager().getConnection("spi-mock://some-cool-url");
+
+        assertThat(mockConnection.getAuthentication(), nullValue());
+        assertThat(mockConnection.isConnected(), is(true));
+    }
+
+    /**
+     * Tries to get the mock plc driver with authentication which is part of this testsuite.
+     *
+     * @throws PlcException something went wrong
+     */
+    @Test
+    @Category(FastTests.class)
+    public void getExistingDriverWithAuthenticationTest() throws PlcException {
+        PlcUsernamePasswordAuthentication authentication =
+            new PlcUsernamePasswordAuthentication("user", "pass");
+        MockPlcConnection mockConnection = (MockPlcConnection) new PlcDriverManager().getConnection("spi-mock://some-cool-url", authentication);
+
+        assertThat(mockConnection.getAuthentication(), notNullValue());
+        assertThat(mockConnection.getAuthentication(), instanceOf(PlcUsernamePasswordAuthentication.class));
+        assertThat(mockConnection.isConnected(), is(true));
+    }
+
+    /**
+     * In this test case a driver is requested which is not registered with the PlcDriverManager.
+     *
+     * @throws PlcConnectionException something went wrong
+     */
+    @Test(expected = PlcConnectionException.class)
+    @Category(FastTests.class)
+    public void getNotExistingDriverTest() throws PlcConnectionException {
+        new PlcDriverManager().getConnection("non-existing-protocol://some-cool-url");
+    }
+
+    /**
+     * In this test case a driver is requested which is not registered with the PlcDriverManager.
+     *
+     * @throws PlcConnectionException something went wrong
+     */
+    @Test(expected = PlcConnectionException.class)
+    @Category(FastTests.class)
+    public void getInvalidUriTest() throws PlcConnectionException {
+        new PlcDriverManager().getConnection("The quick brown fox jumps over the lazy dog");
+    }
+
+    /**
+     * In this test the PlcDriverManager will be configured with a service list that
+     * contains multiple implementation instances of the same protocol. This should result in
+     * an error.
+     *
+     * @throws MalformedURLException something went wrong
+     * @throws PlcConnectionException something went wrong
+     */
+    @Test(expected = IllegalStateException.class)
+    @Category(FastTests.class)
+    public void getDuplicateDriver() throws MalformedURLException, PlcConnectionException {
+        // Save and replace the context classloader as we need to force the ServiceLoader to
+        // use a different service file.
+        ClassLoader originalClassloader = Thread.currentThread().getContextClassLoader();
+        URL[] urls = new URL[1];
+        urls[0] = new File("src/test/resources/test").toURI().toURL();
+        ClassLoader fakeClassLoader = new URLClassLoader(urls, originalClassloader);
+
+        // expect exception
+        new PlcDriverManager(fakeClassLoader).getConnection("spi-mock://some-cool-url");
+    }
+
+}
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/authentication/PlcUsernamePasswordAuthenticationTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/authentication/PlcUsernamePasswordAuthenticationTest.java
index 0b2c62d11b1..e5ae8ce8ae4 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/authentication/PlcUsernamePasswordAuthenticationTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/authentication/PlcUsernamePasswordAuthenticationTest.java
@@ -1,59 +1,59 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.authentication;
-
-
-import nl.jqno.equalsverifier.EqualsVerifier;
-import org.apache.plc4x.test.FastTests;
-import org.hamcrest.Matchers;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-
-public class PlcUsernamePasswordAuthenticationTest {
-
-    @Test
-    @Category(FastTests.class)
-    public void authentication() {
-        PlcUsernamePasswordAuthentication authenication = new PlcUsernamePasswordAuthentication("user", "password");
-
-        assertThat("Unexpected user name", authenication.getUsername(), equalTo("user"));
-        assertThat("Unexpected password", authenication.getPassword(), equalTo("password"));
-    }
-
-    /**
-     * Usually in a toString method most properties are output.
-     * However the password field should never be output this way or the password could be leaked to a log-file
-     * unintentionally.
-     */
-    @Test
-   public void toStringDoesntLeakPassword() {
-        PlcUsernamePasswordAuthentication authenication = new PlcUsernamePasswordAuthentication("user", "top-secret");
-
-        assertThat(authenication.toString(), Matchers.not(Matchers.containsString("top-secret")));
-    }
-
-    @Test
-    public void equalsContract() {
-        EqualsVerifier.forClass(PlcUsernamePasswordAuthentication.class).verify();
-    }
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.authentication;
+
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+import org.apache.plc4x.test.FastTests;
+import org.hamcrest.Matchers;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+
+public class PlcUsernamePasswordAuthenticationTest {
+
+    @Test
+    @Category(FastTests.class)
+    public void authentication() {
+        PlcUsernamePasswordAuthentication authenication = new PlcUsernamePasswordAuthentication("user", "password");
+
+        assertThat("Unexpected user name", authenication.getUsername(), equalTo("user"));
+        assertThat("Unexpected password", authenication.getPassword(), equalTo("password"));
+    }
+
+    /**
+     * Usually in a toString method most properties are output.
+     * However the password field should never be output this way or the password could be leaked to a log-file
+     * unintentionally.
+     */
+    @Test
+   public void toStringDoesntLeakPassword() {
+        PlcUsernamePasswordAuthentication authenication = new PlcUsernamePasswordAuthentication("user", "top-secret");
+
+        assertThat(authenication.toString(), Matchers.not(Matchers.containsString("top-secret")));
+    }
+
+    @Test
+    public void equalsContract() {
+        EqualsVerifier.forClass(PlcUsernamePasswordAuthentication.class).verify();
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/connection/PlcReaderTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/connection/PlcReaderTest.java
index f7b56995b06..72874410592 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/connection/PlcReaderTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/connection/PlcReaderTest.java
@@ -1,59 +1,59 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.api.connection;
-
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.junit.Test;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
-
-public class PlcReaderTest {
-
-/*    @Test
-    public void read() throws Exception {
-        ((PlcReader) readRequest -> CompletableFuture.completedFuture(new PlcReadResponse(readRequest, Collections.emptyList())))
-            .read(new TypeSafePlcReadRequest<>(String.class, mock(PlcField.class))).get();
-    }
-
-    @Test
-    public void readWrongType() throws Exception {
-        try {
-            ((PlcReader) readRequest -> CompletableFuture.completedFuture(new PlcReadResponse(readRequest, (List) Collections.singletonList(new PlcReadResponseItem(readRequest.getRequestItem().get(), PlcResponseCode.OK, 1)))))
-                .read(new TypeSafePlcReadRequest<>(String.class, mock(PlcField.class))).get();
-            fail("Should throw an exception");
-        } catch (IllegalArgumentException e) {
-            assertThat(e.getMessage(), equalTo("Datatype of 1 doesn't match required datatype of class java.lang.String"));
-        } catch (ExecutionException e) {
-            assertThat(e.getCause(), instanceOf(IllegalArgumentException.class));
-            assertThat(e.getCause().getMessage(), equalTo("Unexpected data type class java.lang.Integer on readRequestItem. Expected class java.lang.String"));
-        }
-    }*/
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.api.connection;
+
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+
+public class PlcReaderTest {
+
+/*    @Test
+    public void read() throws Exception {
+        ((PlcReader) readRequest -> CompletableFuture.completedFuture(new PlcReadResponse(readRequest, Collections.emptyList())))
+            .read(new TypeSafePlcReadRequest<>(String.class, mock(PlcField.class))).get();
+    }
+
+    @Test
+    public void readWrongType() throws Exception {
+        try {
+            ((PlcReader) readRequest -> CompletableFuture.completedFuture(new PlcReadResponse(readRequest, (List) Collections.singletonList(new PlcReadResponseItem(readRequest.getRequestItem().get(), PlcResponseCode.OK, 1)))))
+                .read(new TypeSafePlcReadRequest<>(String.class, mock(PlcField.class))).get();
+            fail("Should throw an exception");
+        } catch (IllegalArgumentException e) {
+            assertThat(e.getMessage(), equalTo("Datatype of 1 doesn't match required datatype of class java.lang.String"));
+        } catch (ExecutionException e) {
+            assertThat(e.getCause(), instanceOf(IllegalArgumentException.class));
+            assertThat(e.getCause().getMessage(), equalTo("Unexpected data type class java.lang.Integer on readRequestItem. Expected class java.lang.String"));
+        }
+    }*/
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/connection/PlcWriterTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/connection/PlcWriterTest.java
index 1b0ecb48218..610b36ff8c2 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/connection/PlcWriterTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/connection/PlcWriterTest.java
@@ -1,37 +1,37 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.api.connection;
-
-import org.apache.plc4x.java.api.model.PlcField;
-import org.junit.Test;
-
-import java.util.Collections;
-import java.util.concurrent.CompletableFuture;
-
-import static org.mockito.Mockito.mock;
-
-public class PlcWriterTest {
-
-/*    @Test
-    public void write() throws Exception {
-        PlcWriter dummyImplementation = writeRequest -> CompletableFuture.completedFuture(new TypeSafePlcWriteResponse((TypeSafePlcWriteRequest) writeRequest, Collections.emptyList()));
-        dummyImplementation.write(new TypeSafePlcWriteRequest<>(String.class, mock(PlcField.class))).get();
-    }*/
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.api.connection;
+
+import org.apache.plc4x.java.api.model.PlcField;
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.concurrent.CompletableFuture;
+
+import static org.mockito.Mockito.mock;
+
+public class PlcWriterTest {
+
+/*    @Test
+    public void write() throws Exception {
+        PlcWriter dummyImplementation = writeRequest -> CompletableFuture.completedFuture(new TypeSafePlcWriteResponse((TypeSafePlcWriteRequest) writeRequest, Collections.emptyList()));
+        dummyImplementation.write(new TypeSafePlcWriteRequest<>(String.class, mock(PlcField.class))).get();
+    }*/
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcConnectionExceptionTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcConnectionExceptionTest.java
index 61340ee0a6a..7fe87640dd5 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcConnectionExceptionTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcConnectionExceptionTest.java
@@ -1,56 +1,56 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.api.exceptions;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-class PlcConnectionExceptionTest {
-
-    @Test
-    public void simpleStringConstructor() {
-        assertThrows(PlcConnectionException.class, () -> {
-            throw new PlcConnectionException("Foo");
-        });
-    }
-
-    @Test
-    public void simpleThrowableConstructor() {
-        assertThrows(PlcConnectionException.class, () -> {
-            throw new PlcConnectionException(new IllegalArgumentException("bar"));
-        });
-    }
-
-    @Test
-    public void simpleStringAndThrowableConstructor() {
-        assertThrows(PlcConnectionException.class, () -> {
-            throw new PlcConnectionException("foo", new IllegalArgumentException("bar"));
-        });
-    }
-
-    @Test
-    public void complexStringAndThrowableConstructor() {
-        assertThrows(PlcConnectionException.class, () -> {
-            throw new PlcConnectionException("foo", new IllegalArgumentException("bar"), false, false);
-        });
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.api.exceptions;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class PlcConnectionExceptionTest {
+
+    @Test
+    public void simpleStringConstructor() {
+        assertThrows(PlcConnectionException.class, () -> {
+            throw new PlcConnectionException("Foo");
+        });
+    }
+
+    @Test
+    public void simpleThrowableConstructor() {
+        assertThrows(PlcConnectionException.class, () -> {
+            throw new PlcConnectionException(new IllegalArgumentException("bar"));
+        });
+    }
+
+    @Test
+    public void simpleStringAndThrowableConstructor() {
+        assertThrows(PlcConnectionException.class, () -> {
+            throw new PlcConnectionException("foo", new IllegalArgumentException("bar"));
+        });
+    }
+
+    @Test
+    public void complexStringAndThrowableConstructor() {
+        assertThrows(PlcConnectionException.class, () -> {
+            throw new PlcConnectionException("foo", new IllegalArgumentException("bar"), false, false);
+        });
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcExceptionTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcExceptionTest.java
index 1acf90a0607..ef8bc9e4752 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcExceptionTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcExceptionTest.java
@@ -1,56 +1,56 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.api.exceptions;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-class PlcExceptionTest {
-
-    @Test
-    public void simpleStringConstructor() {
-        assertThrows(PlcException.class, () -> {
-            throw new PlcException("Foo");
-        });
-    }
-
-    @Test
-    public void simpleThrowableConstructor() {
-        assertThrows(PlcException.class, () -> {
-            throw new PlcException(new IllegalArgumentException("bar"));
-        });
-    }
-
-    @Test
-    public void simpleStringAndThrowableConstructor() {
-        assertThrows(PlcException.class, () -> {
-            throw new PlcException("foo", new IllegalArgumentException("bar"));
-        });
-    }
-
-    @Test
-    public void complexStringAndThrowableConstructor() {
-        assertThrows(PlcException.class, () -> {
-            throw new PlcException("foo", new IllegalArgumentException("bar"), false, false);
-        });
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.api.exceptions;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class PlcExceptionTest {
+
+    @Test
+    public void simpleStringConstructor() {
+        assertThrows(PlcException.class, () -> {
+            throw new PlcException("Foo");
+        });
+    }
+
+    @Test
+    public void simpleThrowableConstructor() {
+        assertThrows(PlcException.class, () -> {
+            throw new PlcException(new IllegalArgumentException("bar"));
+        });
+    }
+
+    @Test
+    public void simpleStringAndThrowableConstructor() {
+        assertThrows(PlcException.class, () -> {
+            throw new PlcException("foo", new IllegalArgumentException("bar"));
+        });
+    }
+
+    @Test
+    public void complexStringAndThrowableConstructor() {
+        assertThrows(PlcException.class, () -> {
+            throw new PlcException("foo", new IllegalArgumentException("bar"), false, false);
+        });
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcFieldRangeExceptionTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcFieldRangeExceptionTest.java
index afffb5b6f81..d5f1d778f72 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcFieldRangeExceptionTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcFieldRangeExceptionTest.java
@@ -1,35 +1,35 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.api.exceptions;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-public class PlcFieldRangeExceptionTest {
-
-    @Test
-    public void simpleStringConstructor() {
-        assertThrows(PlcFieldRangeException.class,() -> {
-            throw new PlcFieldRangeException(1, 2);
-        });
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.api.exceptions;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class PlcFieldRangeExceptionTest {
+
+    @Test
+    public void simpleStringConstructor() {
+        assertThrows(PlcFieldRangeException.class,() -> {
+            throw new PlcFieldRangeException(1, 2);
+        });
+    }
+
+}
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcIncompatibleDatatypeExceptionTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcIncompatibleDatatypeExceptionTest.java
index 07fefdb08ed..e5a47e5837c 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcIncompatibleDatatypeExceptionTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcIncompatibleDatatypeExceptionTest.java
@@ -1,35 +1,35 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.api.exceptions;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-class PlcIncompatibleDatatypeExceptionTest {
-
-    @Test
-    public void constructor() {
-        assertThrows(PlcIncompatibleDatatypeException.class, () -> {
-            throw new PlcIncompatibleDatatypeException("Foo".getClass(), 42);
-        });
-    }
-
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.api.exceptions;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class PlcIncompatibleDatatypeExceptionTest {
+
+    @Test
+    public void constructor() {
+        assertThrows(PlcIncompatibleDatatypeException.class, () -> {
+            throw new PlcIncompatibleDatatypeException("Foo".getClass(), 42);
+        });
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcInvalidFieldExceptionTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcInvalidFieldExceptionTest.java
index f869626d37f..2133bffe919 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcInvalidFieldExceptionTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcInvalidFieldExceptionTest.java
@@ -1,59 +1,59 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.api.exceptions;
-
-import org.junit.jupiter.api.Test;
-
-import java.util.regex.Pattern;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-class PlcInvalidFieldExceptionTest {
-
-    @Test
-    public void simpleFieldStringConstructor() {
-        assertThrows(PlcInvalidFieldException.class, () -> {
-            throw new PlcInvalidFieldException("Pattern");
-        });
-    }
-
-    @Test
-    public void simpleFieldStringAndPatternConstructor() {
-        assertThrows(PlcInvalidFieldException.class, () -> {
-            throw new PlcInvalidFieldException("Pattern", Pattern.compile("foo"));
-        });
-    }
-
-    @Test
-    public void simpleFieldStringPatternAndReadableStringConstructor() {
-        assertThrows(PlcInvalidFieldException.class, () -> {
-            throw new PlcInvalidFieldException("Pattern", Pattern.compile("foo"), "readable");
-        });
-    }
-
-    @Test
-    public void getFieldToBeParsed() {
-        PlcInvalidFieldException ex = new PlcInvalidFieldException("Pattern");
-        assertThat(ex.getFieldToBeParsed(), equalTo("Pattern"));
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.api.exceptions;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.regex.Pattern;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class PlcInvalidFieldExceptionTest {
+
+    @Test
+    public void simpleFieldStringConstructor() {
+        assertThrows(PlcInvalidFieldException.class, () -> {
+            throw new PlcInvalidFieldException("Pattern");
+        });
+    }
+
+    @Test
+    public void simpleFieldStringAndPatternConstructor() {
+        assertThrows(PlcInvalidFieldException.class, () -> {
+            throw new PlcInvalidFieldException("Pattern", Pattern.compile("foo"));
+        });
+    }
+
+    @Test
+    public void simpleFieldStringPatternAndReadableStringConstructor() {
+        assertThrows(PlcInvalidFieldException.class, () -> {
+            throw new PlcInvalidFieldException("Pattern", Pattern.compile("foo"), "readable");
+        });
+    }
+
+    @Test
+    public void getFieldToBeParsed() {
+        PlcInvalidFieldException ex = new PlcInvalidFieldException("Pattern");
+        assertThat(ex.getFieldToBeParsed(), equalTo("Pattern"));
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcIoExceptionTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcIoExceptionTest.java
index 8a77b0edf2a..8b2391a4b82 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcIoExceptionTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcIoExceptionTest.java
@@ -1,56 +1,56 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.api.exceptions;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-class PlcIoExceptionTest {
-
-    @Test
-    public void simpleStringConstructor() {
-        assertThrows(PlcIoException.class,() -> {
-            throw new PlcIoException("Foo");
-        });
-    }
-
-    @Test
-    public void simpleThrowableConstructor() {
-        assertThrows(PlcIoException.class,() -> {
-            throw new PlcIoException(new IllegalArgumentException("bar"));
-        });
-    }
-
-    @Test
-    public void simpleStringAndThrowableConstructor() {
-        assertThrows(PlcIoException.class,() -> {
-            throw new PlcIoException("foo", new IllegalArgumentException("bar"));
-        });
-    }
-
-    @Test
-    public void complexStringAndThrowableConstructor() {
-        assertThrows(PlcIoException.class,() -> {
-            throw new PlcIoException("foo", new IllegalArgumentException("bar"), false, false);
-        });
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.api.exceptions;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class PlcIoExceptionTest {
+
+    @Test
+    public void simpleStringConstructor() {
+        assertThrows(PlcIoException.class,() -> {
+            throw new PlcIoException("Foo");
+        });
+    }
+
+    @Test
+    public void simpleThrowableConstructor() {
+        assertThrows(PlcIoException.class,() -> {
+            throw new PlcIoException(new IllegalArgumentException("bar"));
+        });
+    }
+
+    @Test
+    public void simpleStringAndThrowableConstructor() {
+        assertThrows(PlcIoException.class,() -> {
+            throw new PlcIoException("foo", new IllegalArgumentException("bar"));
+        });
+    }
+
+    @Test
+    public void complexStringAndThrowableConstructor() {
+        assertThrows(PlcIoException.class,() -> {
+            throw new PlcIoException("foo", new IllegalArgumentException("bar"), false, false);
+        });
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcNotImplementedExceptionTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcNotImplementedExceptionTest.java
index 278b2f460f3..cee83fbf3cc 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcNotImplementedExceptionTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcNotImplementedExceptionTest.java
@@ -1,35 +1,35 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.api.exceptions;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-class PlcNotImplementedExceptionTest {
-
-    @Test
-    public void simpleStringConstructor() {
-        assertThrows(PlcNotImplementedException.class,() -> {
-            throw new PlcNotImplementedException("Foo");
-        });
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.api.exceptions;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class PlcNotImplementedExceptionTest {
+
+    @Test
+    public void simpleStringConstructor() {
+        assertThrows(PlcNotImplementedException.class,() -> {
+            throw new PlcNotImplementedException("Foo");
+        });
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcProtocolExceptionTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcProtocolExceptionTest.java
index 6e97b046608..776839e2d5f 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcProtocolExceptionTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcProtocolExceptionTest.java
@@ -1,56 +1,56 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.api.exceptions;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-class PlcProtocolExceptionTest {
-
-    @Test
-    public void simpleStringConstructor() {
-        assertThrows(PlcProtocolException.class,() -> {
-            throw new PlcProtocolException("Foo");
-        });
-    }
-
-    @Test
-    public void simpleThrowableConstructor() {
-        assertThrows(PlcProtocolException.class,() -> {
-            throw new PlcProtocolException(new IllegalArgumentException("bar"));
-        });
-    }
-
-    @Test
-    public void simpleStringAndThrowableConstructor() {
-        assertThrows(PlcProtocolException.class,() -> {
-            throw new PlcProtocolException("foo", new IllegalArgumentException("bar"));
-        });
-    }
-
-    @Test
-    public void complexStringAndThrowableConstructor() {
-        assertThrows(PlcProtocolException.class,() -> {
-            throw new PlcProtocolException("foo", new IllegalArgumentException("bar"), false, false);
-        });
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.api.exceptions;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class PlcProtocolExceptionTest {
+
+    @Test
+    public void simpleStringConstructor() {
+        assertThrows(PlcProtocolException.class,() -> {
+            throw new PlcProtocolException("Foo");
+        });
+    }
+
+    @Test
+    public void simpleThrowableConstructor() {
+        assertThrows(PlcProtocolException.class,() -> {
+            throw new PlcProtocolException(new IllegalArgumentException("bar"));
+        });
+    }
+
+    @Test
+    public void simpleStringAndThrowableConstructor() {
+        assertThrows(PlcProtocolException.class,() -> {
+            throw new PlcProtocolException("foo", new IllegalArgumentException("bar"));
+        });
+    }
+
+    @Test
+    public void complexStringAndThrowableConstructor() {
+        assertThrows(PlcProtocolException.class,() -> {
+            throw new PlcProtocolException("foo", new IllegalArgumentException("bar"), false, false);
+        });
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcProtocolPayloadTooBigExceptionTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcProtocolPayloadTooBigExceptionTest.java
index 2e3200ae171..d176b5e20ad 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcProtocolPayloadTooBigExceptionTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcProtocolPayloadTooBigExceptionTest.java
@@ -1,42 +1,42 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.api.exceptions;
-
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-class PlcProtocolPayloadTooBigExceptionTest {
-
-    @Test
-    public void simpleStringConstructor() {
-        PlcProtocolPayloadTooBigException exception = assertThrows(PlcProtocolPayloadTooBigException. class,() -> {
-            throw new PlcProtocolPayloadTooBigException("protocolName", 1024, 1040, "payload");
-        });
-
-        assertThat(exception.getProtocolName(), equalTo("protocolName"));
-        assertThat(exception.getMaxSize(), equalTo(1024));
-        assertThat(exception.getActualSize(), equalTo(1040));
-        assertThat(exception.getPayload(), equalTo("payload"));
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.api.exceptions;
+
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class PlcProtocolPayloadTooBigExceptionTest {
+
+    @Test
+    public void simpleStringConstructor() {
+        PlcProtocolPayloadTooBigException exception = assertThrows(PlcProtocolPayloadTooBigException. class,() -> {
+            throw new PlcProtocolPayloadTooBigException("protocolName", 1024, 1040, "payload");
+        });
+
+        assertThat(exception.getProtocolName(), equalTo("protocolName"));
+        assertThat(exception.getMaxSize(), equalTo(1024));
+        assertThat(exception.getActualSize(), equalTo(1040));
+        assertThat(exception.getPayload(), equalTo("payload"));
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcRuntimeExceptionTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcRuntimeExceptionTest.java
index 8985c52baf2..9361ae085f7 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcRuntimeExceptionTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcRuntimeExceptionTest.java
@@ -1,56 +1,56 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.api.exceptions;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-class PlcRuntimeExceptionTest {
-
-    @Test
-    public void simpleStringConstructor() {
-        assertThrows(PlcRuntimeException.class,() -> {
-            throw new PlcRuntimeException("Foo");
-        });
-    }
-
-    @Test
-    public void simpleThrowableConstructor() {
-        assertThrows(PlcRuntimeException.class,() -> {
-            throw new PlcRuntimeException(new IllegalArgumentException("bar"));
-        });
-    }
-
-    @Test
-    public void simpleStringAndThrowableConstructor() {
-        assertThrows(PlcRuntimeException.class,() -> {
-            throw new PlcRuntimeException("foo", new IllegalArgumentException("bar"));
-        });
-    }
-
-    @Test
-    public void complexStringAndThrowableConstructor() {
-        assertThrows(PlcRuntimeException.class,() -> {
-            throw new PlcRuntimeException("foo", new IllegalArgumentException("bar"), false, false);
-        });
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.api.exceptions;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class PlcRuntimeExceptionTest {
+
+    @Test
+    public void simpleStringConstructor() {
+        assertThrows(PlcRuntimeException.class,() -> {
+            throw new PlcRuntimeException("Foo");
+        });
+    }
+
+    @Test
+    public void simpleThrowableConstructor() {
+        assertThrows(PlcRuntimeException.class,() -> {
+            throw new PlcRuntimeException(new IllegalArgumentException("bar"));
+        });
+    }
+
+    @Test
+    public void simpleStringAndThrowableConstructor() {
+        assertThrows(PlcRuntimeException.class,() -> {
+            throw new PlcRuntimeException("foo", new IllegalArgumentException("bar"));
+        });
+    }
+
+    @Test
+    public void complexStringAndThrowableConstructor() {
+        assertThrows(PlcRuntimeException.class,() -> {
+            throw new PlcRuntimeException("foo", new IllegalArgumentException("bar"), false, false);
+        });
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcTimeoutExceptionTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcTimeoutExceptionTest.java
index 344f7f9bdb2..cdcd38f8b55 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcTimeoutExceptionTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcTimeoutExceptionTest.java
@@ -1,39 +1,39 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.api.exceptions;
-
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-class PlcTimeoutExceptionTest {
-
-    @Test
-    public void simpleStringConstructor() {
-        PlcTimeoutException exception = assertThrows(PlcTimeoutException.class,() -> {
-            throw new PlcTimeoutException(1024L);
-        });
-
-        assertThat(exception.getTimeout(), equalTo(1024L));
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.api.exceptions;
+
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class PlcTimeoutExceptionTest {
+
+    @Test
+    public void simpleStringConstructor() {
+        PlcTimeoutException exception = assertThrows(PlcTimeoutException.class,() -> {
+            throw new PlcTimeoutException(1024L);
+        });
+
+        assertThat(exception.getTimeout(), equalTo(1024L));
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedDataTypeExceptionTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedDataTypeExceptionTest.java
index cf46fc48efb..006c0aeb218 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedDataTypeExceptionTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedDataTypeExceptionTest.java
@@ -1,63 +1,63 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.api.exceptions;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-class PlcUnsupportedDataTypeExceptionTest {
-
-    @Test
-    public void simpleTypeConstructor() {
-        assertThrows(PlcUnsupportedDataTypeException.class,() -> {
-            throw new PlcUnsupportedDataTypeException(Long.class);
-        });
-    }
-
-    @Test
-    public void simpleStringConstructor() {
-        assertThrows(PlcUnsupportedDataTypeException.class,() -> {
-            throw new PlcUnsupportedDataTypeException("Foo");
-        });
-    }
-
-    @Test
-    public void simpleThrowableConstructor() {
-        assertThrows(PlcUnsupportedDataTypeException.class,() -> {
-            throw new PlcUnsupportedDataTypeException(new IllegalArgumentException("bar"));
-        });
-    }
-
-    @Test
-    public void simpleStringAndThrowableConstructor() {
-        assertThrows(PlcUnsupportedDataTypeException.class,() -> {
-            throw new PlcUnsupportedDataTypeException("foo", new IllegalArgumentException("bar"));
-        });
-    }
-
-    @Test
-    public void complexStringAndThrowableConstructor() {
-        assertThrows(PlcUnsupportedDataTypeException.class,() -> {
-            throw new PlcUnsupportedDataTypeException("foo", new IllegalArgumentException("bar"), false, false);
-        });
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.api.exceptions;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class PlcUnsupportedDataTypeExceptionTest {
+
+    @Test
+    public void simpleTypeConstructor() {
+        assertThrows(PlcUnsupportedDataTypeException.class,() -> {
+            throw new PlcUnsupportedDataTypeException(Long.class);
+        });
+    }
+
+    @Test
+    public void simpleStringConstructor() {
+        assertThrows(PlcUnsupportedDataTypeException.class,() -> {
+            throw new PlcUnsupportedDataTypeException("Foo");
+        });
+    }
+
+    @Test
+    public void simpleThrowableConstructor() {
+        assertThrows(PlcUnsupportedDataTypeException.class,() -> {
+            throw new PlcUnsupportedDataTypeException(new IllegalArgumentException("bar"));
+        });
+    }
+
+    @Test
+    public void simpleStringAndThrowableConstructor() {
+        assertThrows(PlcUnsupportedDataTypeException.class,() -> {
+            throw new PlcUnsupportedDataTypeException("foo", new IllegalArgumentException("bar"));
+        });
+    }
+
+    @Test
+    public void complexStringAndThrowableConstructor() {
+        assertThrows(PlcUnsupportedDataTypeException.class,() -> {
+            throw new PlcUnsupportedDataTypeException("foo", new IllegalArgumentException("bar"), false, false);
+        });
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedOperationExceptionTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedOperationExceptionTest.java
index 58f7b726eb1..1e0285dc370 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedOperationExceptionTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedOperationExceptionTest.java
@@ -1,35 +1,35 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.api.exceptions;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-class PlcUnsupportedOperationExceptionTest {
-
-    @Test
-    public void simpleStringConstructor() {
-        assertThrows(PlcUnsupportedOperationException.class, () -> {
-            throw new PlcUnsupportedOperationException("Foo");
-        });
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.api.exceptions;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class PlcUnsupportedOperationExceptionTest {
+
+    @Test
+    public void simpleStringConstructor() {
+        assertThrows(PlcUnsupportedOperationException.class, () -> {
+            throw new PlcUnsupportedOperationException("Foo");
+        });
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/APIMessageTests.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/APIMessageTests.java
index c5709b123e9..402ed78f8e2 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/APIMessageTests.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/APIMessageTests.java
@@ -1,268 +1,268 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.api.messages;
-
-public class APIMessageTests {
-
-    /*@Test
-    @Category(FastTests.class)
-    public void readRequestItemSize() {
-        MockField field = new MockField("mock:/DATA");
-        PlcReadRequestItem<Byte> readRequestItem = new PlcReadRequestItem<>(Byte.class, field, 1);
-        assertThat("Unexpected field", readRequestItem.getField(), equalTo(field));
-        assertThat("Unexpected data type", readRequestItem.getDatatype(), equalTo(Byte.class));
-        assertThat("Unexpected size", readRequestItem.getSize(), equalTo(1));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void readRequestItem() {
-        MockField field = new MockField("mock:/DATA");
-        PlcReadRequestItem<Byte> readRequestItem = new PlcReadRequestItem<>(Byte.class, field);
-        assertThat("Unexpected field", readRequestItem.getField(), equalTo(field));
-        assertThat("Unexpected data type", readRequestItem.getDatatype(), equalTo(Byte.class));
-        assertThat("Unexpected size", readRequestItem.getSize(), equalTo(1));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void readResponseItem() {
-        MockField field = new MockField("mock:/DATA");
-        PlcReadRequestItem<Byte> readRequestItem = new PlcReadRequestItem<>(Byte.class, field, 1);
-        PlcReadResponseItem<Byte> readResponseItem = new PlcReadResponseItem<>(readRequestItem, PlcResponseCode.OK);
-        assertThat("Unexpected response code", readResponseItem.getResponseCode(), equalTo(PlcResponseCode.OK));
-        assertThat(readResponseItem.getValues(), empty());
-        assertThat("Unexpected read request item", readResponseItem.getRequestItem(), equalTo(readRequestItem));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void writeRequestItem() {
-        MockField field = new MockField("mock:/DATA");
-        PlcWriteRequestItem<Byte> writeRequestItem = new PlcWriteRequestItem<>(Byte.class, field, (byte) 0x45);
-
-        assertThat("Unexpected field", writeRequestItem.getField(), equalTo(field));
-        assertThat("Unexpected data type", writeRequestItem.getDatatype(), equalTo(Byte.class));
-        assertThat("Unexpected value", writeRequestItem.getValues().get(0), equalTo((byte) 0x45));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void writeRequestItems() {
-        MockField field = new MockField("mock:/DATA");
-        Byte data[] = {(byte) 0x23, (byte) 0x84};
-        PlcWriteRequestItem<Byte> writeRequestItem = new PlcWriteRequestItem<>(Byte.class, field, data);
-        assertThat("Unexpected field", writeRequestItem.getField(), equalTo(field));
-        assertThat("Unexpected data type", writeRequestItem.getDatatype(), equalTo(Byte.class));
-        assertThat("Unexpected value", writeRequestItem.getValues().get(0), equalTo((byte) 0x23));
-        assertThat("Unexpected value", writeRequestItem.getValues().get(1), equalTo((byte) 0x84));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void writeResponseItem() {
-        MockField field = new MockField("mock:/DATA");
-        PlcWriteRequestItem<Byte> writeRequestItem = new PlcWriteRequestItem<>(Byte.class, field, (byte) 0x3B);
-        PlcWriteResponseItem<Byte> writeResponseItem = new PlcWriteResponseItem<>(writeRequestItem, PlcResponseCode.OK);
-        assertThat("Unexpected response code", writeResponseItem.getResponseCode(), equalTo(PlcResponseCode.OK));
-        assertThat("Unexpected response item", writeResponseItem.getRequestItem(), equalTo(writeRequestItem));
-    }
-
-    @Test
-    public void plcProprietaryRequest() {
-        Object customMessage = new Object();
-        PlcProprietaryRequest<Object> plcProprietaryRequest = new PlcProprietaryRequest<>(customMessage);
-        assertThat("Unexpected request type", plcProprietaryRequest.getProprietaryRequest(), equalTo(customMessage));
-    }
-
-    @Test
-    public void plcProprietaryResponse() {
-        Object customMessage = new Object();
-        Object customMessageResponse = new Object();
-        PlcProprietaryResponse<Object> plcProprietaryResponse = new PlcProprietaryResponse<>(new PlcProprietaryRequest<>(customMessage), customMessageResponse);
-        assertThat("Unexpected response type", plcProprietaryResponse.getResponse(), equalTo(customMessageResponse));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void plcReadRequestEmpty() {
-        PlcReadRequest plcReadRequest = new PlcReadRequest();
-        assertThat(plcReadRequest.getRequestItems(), empty());
-        assertThat("Expected request items to be zero", plcReadRequest.getNumberOfItems(), equalTo(0));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void plcReadRequestField() {
-        MockField field = new MockField("mock:/DATA");
-        PlcReadRequest plcReadRequest = new TypeSafePlcReadRequest<>(Byte.class, field);
-        assertThat("Expected one request item", plcReadRequest.getRequestItems(), hasSize(1));
-        assertThat("Expected one request item", plcReadRequest.getNumberOfItems(), equalTo(1));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void plcReadRequestSize() {
-        MockField field = new MockField("mock:/DATA");
-        PlcReadRequest plcReadRequest = PlcReadRequest.builder().addItem(Byte.class, field, (byte) 1).build(Byte.class);
-        assertThat("Expected one request item", plcReadRequest.getRequestItems(), hasSize(1));
-        assertThat("Expected one request item", plcReadRequest.getNumberOfItems(), equalTo(1));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void plcReadRequestAddItem() {
-        PlcReadRequest plcReadRequest = new PlcReadRequest();
-        assertThat(plcReadRequest.getRequestItems(), empty());
-        assertThat("Expected request items to be zero", plcReadRequest.getNumberOfItems(), equalTo(0));
-        MockField field = new MockField("mock:/DATA");
-        PlcReadRequestItem<Byte> readRequestItem = new PlcReadRequestItem<>(Byte.class, field, (byte) 1);
-        plcReadRequest.addItem(readRequestItem);
-        assertThat("Expected one request item", plcReadRequest.getRequestItems(), hasSize(1));
-        assertThat("Expected one request item", plcReadRequest.getNumberOfItems(), equalTo(1));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void plcReadResponse() {
-        PlcReadRequest plcReadRequest = new PlcReadRequest();
-        List<PlcReadResponseItem<?>> responseItems = new ArrayList<>();
-        MockField field = new MockField("mock:/DATA");
-        PlcReadRequestItem<Byte> readRequestItem = new PlcReadRequestItem<>(Byte.class, field, 1);
-        PlcReadResponseItem<Byte> readResponseItem = new PlcReadResponseItem<>(readRequestItem, PlcResponseCode.OK);
-        responseItems.add(readResponseItem);
-        PlcReadResponse plcReadResponse = new PlcReadResponse(plcReadRequest, responseItems);
-        assertThat("Unexpected number of response items", plcReadResponse.getProprietaryRequest().getNumberOfItems(), equalTo(0));
-        assertThat("Unexpected read request", plcReadResponse.getProprietaryRequest(), equalTo(plcReadRequest));
-        assertThat("Unexpected number of response items", plcReadResponse.getResponseItems(), hasSize(1));
-        assertThat("Unexpected items in response items", plcReadResponse.getResponseItems(), contains(readResponseItem));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void plcWriteRequestEmpty() {
-        PlcWriteRequest plcWriteRequest = new PlcWriteRequest();
-        assertThat(plcWriteRequest.getRequestItems(), empty());
-        assertThat("Expected request items to be zero", plcWriteRequest.getNumberOfItems(), equalTo(0));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void plcWriteRequestObject() {
-        MockField field = new MockField("mock:/DATA");
-        PlcWriteRequest plcWriteRequest = new TypeSafePlcWriteRequest<>(Byte.class, field, (byte) 0x33);
-        assertThat("Expected one request item", plcWriteRequest.getRequestItems(), hasSize(1));
-        assertThat("Expected one request item", plcWriteRequest.getNumberOfItems(), equalTo(1));
-        List values = plcWriteRequest.getRequestItems().get(0).getValues();
-        assertThat(values.get(0), equalTo((byte) 0x33));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void plcWriteRequestObjects() {
-        MockField field = new MockField("mock:/DATA");
-        Byte[] data = {(byte) 0x22, (byte) 0x66};
-        PlcWriteRequest plcWriteRequest = new TypeSafePlcWriteRequest<>(Byte.class, field, data);
-        assertThat("Expected one request item", plcWriteRequest.getRequestItems(), hasSize(1));
-        assertThat("Expected one request item", plcWriteRequest.getNumberOfItems(), equalTo(1));
-        List values = plcWriteRequest.getRequestItems().get(0).getValues();
-        assertThat(values.get(0), equalTo((byte) 0x22));
-        assertThat(values.get(1), equalTo((byte) 0x66));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void plcWriteResponse() {
-        PlcWriteRequest plcWriteRequest = new PlcWriteRequest();
-        List<PlcWriteResponseItem<?>> responseItems = new ArrayList<>();
-        MockField field = new MockField("mock:/DATA");
-        PlcWriteRequestItem<Byte> writeRequestItem = new PlcWriteRequestItem<>(Byte.class, field, (byte) 1);
-        PlcWriteResponseItem<Byte> writeResponseItem = new PlcWriteResponseItem<>(writeRequestItem, PlcResponseCode.OK);
-        responseItems.add(writeResponseItem);
-        PlcWriteResponse plcReadResponse = new PlcWriteResponse(plcWriteRequest, responseItems);
-        assertThat("Unexpected number of response items", plcReadResponse.getProprietaryRequest().getNumberOfItems(), equalTo(0));
-        assertThat("Unexpected read request", plcReadResponse.getProprietaryRequest(), equalTo(plcWriteRequest));
-        assertThat("Unexpected number of response items", plcReadResponse.getResponseItems(), hasSize(1));
-        assertThat("Unexpected items in response items", plcReadResponse.getResponseItems(), contains(writeResponseItem));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void bulkPlcWriteResponseGetValue() {
-        PlcWriteRequest plcWriteRequest = new PlcWriteRequest();
-        List<PlcWriteResponseItem<?>> responseItems = new ArrayList<>();
-        MockField field = new MockField("mock:/DATA");
-        PlcWriteRequestItem<Byte> writeRequestItem1 = new PlcWriteRequestItem<>(Byte.class, field, (byte) 1);
-        PlcWriteRequestItem<Byte> writeRequestItem2 = new PlcWriteRequestItem<>(Byte.class, field, (byte) 1);
-        PlcWriteResponseItem<Byte> writeResponseItem1 = new PlcWriteResponseItem<>(writeRequestItem1, PlcResponseCode.OK);
-        PlcWriteResponseItem<Byte> writeResponseItem2 = new PlcWriteResponseItem<>(writeRequestItem2, PlcResponseCode.OK);
-        responseItems.add(writeResponseItem1);
-        responseItems.add(writeResponseItem2);
-        PlcWriteResponse plcWriteResponse = new PlcWriteResponse(plcWriteRequest, responseItems);
-        Optional<PlcWriteResponseItem<Byte>> responseValue1 = plcWriteResponse.getValue(writeRequestItem1);
-        Optional<PlcWriteResponseItem<Byte>> responseValue2 = plcWriteResponse.getValue(writeRequestItem2);
-        assertThat("Unexpected items in response items", responseValue1, equalTo(Optional.of(writeResponseItem1)));
-        assertThat("Unexpected items in response items", responseValue2, equalTo(Optional.of(writeResponseItem2)));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void nonExistingItemPlcWriteResponseGetValue() {
-        PlcWriteRequest plcWriteRequest = new PlcWriteRequest();
-        List<PlcWriteResponseItem<?>> responseItems = new ArrayList<>();
-        MockField field = new MockField("mock:/DATA");
-        PlcWriteRequestItem<Byte> nonExistingWriteRequestItem = new PlcWriteRequestItem<>(Byte.class, field, (byte) 1);
-        PlcWriteResponse plcWriteResponse = new PlcWriteResponse(plcWriteRequest, responseItems);
-        Optional<PlcWriteResponseItem<Byte>> responseValue1 = plcWriteResponse.getValue(nonExistingWriteRequestItem);
-        assertThat("Unexpected items in response items", responseValue1, equalTo(Optional.empty()));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void bulkPlcReadResponseGetValue() {
-        PlcReadRequest plcReadRequest = new PlcReadRequest();
-        List<PlcReadResponseItem<?>> responseItems = new ArrayList<>();
-        MockField field = new MockField("mock:/DATA");
-        PlcReadRequestItem<Byte> readRequestItem1 = new PlcReadRequestItem<>(Byte.class, field, 1);
-        PlcReadRequestItem<Byte> readRequestItem2 = new PlcReadRequestItem<>(Byte.class, field, 1);
-        PlcReadResponseItem<Byte> readResponseItem1 = new PlcReadResponseItem<>(readRequestItem1, PlcResponseCode.OK);
-        PlcReadResponseItem<Byte> readResponseItem2 = new PlcReadResponseItem<>(readRequestItem2, PlcResponseCode.OK);
-        responseItems.add(readResponseItem1);
-        responseItems.add(readResponseItem2);
-        PlcReadResponse plcReadResponse = new PlcReadResponse(plcReadRequest, responseItems);
-        Optional<PlcReadResponseItem<Byte>> responseValue1 = plcReadResponse.getValue(readRequestItem1);
-        Optional<PlcReadResponseItem<Byte>> responseValue2 = plcReadResponse.getValue(readRequestItem2);
-        assertThat("Unexpected items in response items", responseValue1, equalTo(Optional.of(readResponseItem1)));
-        assertThat("Unexpected items in response items", responseValue2, equalTo(Optional.of(readResponseItem2)));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void nonExistingItemPlcReadResponseGetValue() {
-        PlcReadRequest plcReadRequest = new PlcReadRequest();
-        List<PlcReadResponseItem<?>> responseItems = new ArrayList<>();
-        MockField field = new MockField("mock:/DATA");
-        PlcReadRequestItem<Byte> nonExistingReadRequestItem = new PlcReadRequestItem<>(Byte.class, field, 1);
-        PlcReadResponse plcReadResponse = new PlcReadResponse(plcReadRequest, responseItems);
-        Optional<PlcReadResponseItem<Byte>> responseValue1 = plcReadResponse.getValue(nonExistingReadRequestItem);
-        assertThat("Unexpected items in response items", responseValue1, equalTo(Optional.empty()));
-    }*/
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.api.messages;
+
+public class APIMessageTests {
+
+    /*@Test
+    @Category(FastTests.class)
+    public void readRequestItemSize() {
+        MockField field = new MockField("mock:/DATA");
+        PlcReadRequestItem<Byte> readRequestItem = new PlcReadRequestItem<>(Byte.class, field, 1);
+        assertThat("Unexpected field", readRequestItem.getField(), equalTo(field));
+        assertThat("Unexpected data type", readRequestItem.getDatatype(), equalTo(Byte.class));
+        assertThat("Unexpected size", readRequestItem.getSize(), equalTo(1));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void readRequestItem() {
+        MockField field = new MockField("mock:/DATA");
+        PlcReadRequestItem<Byte> readRequestItem = new PlcReadRequestItem<>(Byte.class, field);
+        assertThat("Unexpected field", readRequestItem.getField(), equalTo(field));
+        assertThat("Unexpected data type", readRequestItem.getDatatype(), equalTo(Byte.class));
+        assertThat("Unexpected size", readRequestItem.getSize(), equalTo(1));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void readResponseItem() {
+        MockField field = new MockField("mock:/DATA");
+        PlcReadRequestItem<Byte> readRequestItem = new PlcReadRequestItem<>(Byte.class, field, 1);
+        PlcReadResponseItem<Byte> readResponseItem = new PlcReadResponseItem<>(readRequestItem, PlcResponseCode.OK);
+        assertThat("Unexpected response code", readResponseItem.getResponseCode(), equalTo(PlcResponseCode.OK));
+        assertThat(readResponseItem.getValues(), empty());
+        assertThat("Unexpected read request item", readResponseItem.getRequestItem(), equalTo(readRequestItem));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void writeRequestItem() {
+        MockField field = new MockField("mock:/DATA");
+        PlcWriteRequestItem<Byte> writeRequestItem = new PlcWriteRequestItem<>(Byte.class, field, (byte) 0x45);
+
+        assertThat("Unexpected field", writeRequestItem.getField(), equalTo(field));
+        assertThat("Unexpected data type", writeRequestItem.getDatatype(), equalTo(Byte.class));
+        assertThat("Unexpected value", writeRequestItem.getValues().get(0), equalTo((byte) 0x45));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void writeRequestItems() {
+        MockField field = new MockField("mock:/DATA");
+        Byte data[] = {(byte) 0x23, (byte) 0x84};
+        PlcWriteRequestItem<Byte> writeRequestItem = new PlcWriteRequestItem<>(Byte.class, field, data);
+        assertThat("Unexpected field", writeRequestItem.getField(), equalTo(field));
+        assertThat("Unexpected data type", writeRequestItem.getDatatype(), equalTo(Byte.class));
+        assertThat("Unexpected value", writeRequestItem.getValues().get(0), equalTo((byte) 0x23));
+        assertThat("Unexpected value", writeRequestItem.getValues().get(1), equalTo((byte) 0x84));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void writeResponseItem() {
+        MockField field = new MockField("mock:/DATA");
+        PlcWriteRequestItem<Byte> writeRequestItem = new PlcWriteRequestItem<>(Byte.class, field, (byte) 0x3B);
+        PlcWriteResponseItem<Byte> writeResponseItem = new PlcWriteResponseItem<>(writeRequestItem, PlcResponseCode.OK);
+        assertThat("Unexpected response code", writeResponseItem.getResponseCode(), equalTo(PlcResponseCode.OK));
+        assertThat("Unexpected response item", writeResponseItem.getRequestItem(), equalTo(writeRequestItem));
+    }
+
+    @Test
+    public void plcProprietaryRequest() {
+        Object customMessage = new Object();
+        PlcProprietaryRequest<Object> plcProprietaryRequest = new PlcProprietaryRequest<>(customMessage);
+        assertThat("Unexpected request type", plcProprietaryRequest.getProprietaryRequest(), equalTo(customMessage));
+    }
+
+    @Test
+    public void plcProprietaryResponse() {
+        Object customMessage = new Object();
+        Object customMessageResponse = new Object();
+        PlcProprietaryResponse<Object> plcProprietaryResponse = new PlcProprietaryResponse<>(new PlcProprietaryRequest<>(customMessage), customMessageResponse);
+        assertThat("Unexpected response type", plcProprietaryResponse.getResponse(), equalTo(customMessageResponse));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void plcReadRequestEmpty() {
+        PlcReadRequest plcReadRequest = new PlcReadRequest();
+        assertThat(plcReadRequest.getRequestItems(), empty());
+        assertThat("Expected request items to be zero", plcReadRequest.getNumberOfItems(), equalTo(0));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void plcReadRequestField() {
+        MockField field = new MockField("mock:/DATA");
+        PlcReadRequest plcReadRequest = new TypeSafePlcReadRequest<>(Byte.class, field);
+        assertThat("Expected one request item", plcReadRequest.getRequestItems(), hasSize(1));
+        assertThat("Expected one request item", plcReadRequest.getNumberOfItems(), equalTo(1));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void plcReadRequestSize() {
+        MockField field = new MockField("mock:/DATA");
+        PlcReadRequest plcReadRequest = PlcReadRequest.builder().addItem(Byte.class, field, (byte) 1).build(Byte.class);
+        assertThat("Expected one request item", plcReadRequest.getRequestItems(), hasSize(1));
+        assertThat("Expected one request item", plcReadRequest.getNumberOfItems(), equalTo(1));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void plcReadRequestAddItem() {
+        PlcReadRequest plcReadRequest = new PlcReadRequest();
+        assertThat(plcReadRequest.getRequestItems(), empty());
+        assertThat("Expected request items to be zero", plcReadRequest.getNumberOfItems(), equalTo(0));
+        MockField field = new MockField("mock:/DATA");
+        PlcReadRequestItem<Byte> readRequestItem = new PlcReadRequestItem<>(Byte.class, field, (byte) 1);
+        plcReadRequest.addItem(readRequestItem);
+        assertThat("Expected one request item", plcReadRequest.getRequestItems(), hasSize(1));
+        assertThat("Expected one request item", plcReadRequest.getNumberOfItems(), equalTo(1));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void plcReadResponse() {
+        PlcReadRequest plcReadRequest = new PlcReadRequest();
+        List<PlcReadResponseItem<?>> responseItems = new ArrayList<>();
+        MockField field = new MockField("mock:/DATA");
+        PlcReadRequestItem<Byte> readRequestItem = new PlcReadRequestItem<>(Byte.class, field, 1);
+        PlcReadResponseItem<Byte> readResponseItem = new PlcReadResponseItem<>(readRequestItem, PlcResponseCode.OK);
+        responseItems.add(readResponseItem);
+        PlcReadResponse plcReadResponse = new PlcReadResponse(plcReadRequest, responseItems);
+        assertThat("Unexpected number of response items", plcReadResponse.getProprietaryRequest().getNumberOfItems(), equalTo(0));
+        assertThat("Unexpected read request", plcReadResponse.getProprietaryRequest(), equalTo(plcReadRequest));
+        assertThat("Unexpected number of response items", plcReadResponse.getResponseItems(), hasSize(1));
+        assertThat("Unexpected items in response items", plcReadResponse.getResponseItems(), contains(readResponseItem));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void plcWriteRequestEmpty() {
+        PlcWriteRequest plcWriteRequest = new PlcWriteRequest();
+        assertThat(plcWriteRequest.getRequestItems(), empty());
+        assertThat("Expected request items to be zero", plcWriteRequest.getNumberOfItems(), equalTo(0));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void plcWriteRequestObject() {
+        MockField field = new MockField("mock:/DATA");
+        PlcWriteRequest plcWriteRequest = new TypeSafePlcWriteRequest<>(Byte.class, field, (byte) 0x33);
+        assertThat("Expected one request item", plcWriteRequest.getRequestItems(), hasSize(1));
+        assertThat("Expected one request item", plcWriteRequest.getNumberOfItems(), equalTo(1));
+        List values = plcWriteRequest.getRequestItems().get(0).getValues();
+        assertThat(values.get(0), equalTo((byte) 0x33));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void plcWriteRequestObjects() {
+        MockField field = new MockField("mock:/DATA");
+        Byte[] data = {(byte) 0x22, (byte) 0x66};
+        PlcWriteRequest plcWriteRequest = new TypeSafePlcWriteRequest<>(Byte.class, field, data);
+        assertThat("Expected one request item", plcWriteRequest.getRequestItems(), hasSize(1));
+        assertThat("Expected one request item", plcWriteRequest.getNumberOfItems(), equalTo(1));
+        List values = plcWriteRequest.getRequestItems().get(0).getValues();
+        assertThat(values.get(0), equalTo((byte) 0x22));
+        assertThat(values.get(1), equalTo((byte) 0x66));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void plcWriteResponse() {
+        PlcWriteRequest plcWriteRequest = new PlcWriteRequest();
+        List<PlcWriteResponseItem<?>> responseItems = new ArrayList<>();
+        MockField field = new MockField("mock:/DATA");
+        PlcWriteRequestItem<Byte> writeRequestItem = new PlcWriteRequestItem<>(Byte.class, field, (byte) 1);
+        PlcWriteResponseItem<Byte> writeResponseItem = new PlcWriteResponseItem<>(writeRequestItem, PlcResponseCode.OK);
+        responseItems.add(writeResponseItem);
+        PlcWriteResponse plcReadResponse = new PlcWriteResponse(plcWriteRequest, responseItems);
+        assertThat("Unexpected number of response items", plcReadResponse.getProprietaryRequest().getNumberOfItems(), equalTo(0));
+        assertThat("Unexpected read request", plcReadResponse.getProprietaryRequest(), equalTo(plcWriteRequest));
+        assertThat("Unexpected number of response items", plcReadResponse.getResponseItems(), hasSize(1));
+        assertThat("Unexpected items in response items", plcReadResponse.getResponseItems(), contains(writeResponseItem));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void bulkPlcWriteResponseGetValue() {
+        PlcWriteRequest plcWriteRequest = new PlcWriteRequest();
+        List<PlcWriteResponseItem<?>> responseItems = new ArrayList<>();
+        MockField field = new MockField("mock:/DATA");
+        PlcWriteRequestItem<Byte> writeRequestItem1 = new PlcWriteRequestItem<>(Byte.class, field, (byte) 1);
+        PlcWriteRequestItem<Byte> writeRequestItem2 = new PlcWriteRequestItem<>(Byte.class, field, (byte) 1);
+        PlcWriteResponseItem<Byte> writeResponseItem1 = new PlcWriteResponseItem<>(writeRequestItem1, PlcResponseCode.OK);
+        PlcWriteResponseItem<Byte> writeResponseItem2 = new PlcWriteResponseItem<>(writeRequestItem2, PlcResponseCode.OK);
+        responseItems.add(writeResponseItem1);
+        responseItems.add(writeResponseItem2);
+        PlcWriteResponse plcWriteResponse = new PlcWriteResponse(plcWriteRequest, responseItems);
+        Optional<PlcWriteResponseItem<Byte>> responseValue1 = plcWriteResponse.getValue(writeRequestItem1);
+        Optional<PlcWriteResponseItem<Byte>> responseValue2 = plcWriteResponse.getValue(writeRequestItem2);
+        assertThat("Unexpected items in response items", responseValue1, equalTo(Optional.of(writeResponseItem1)));
+        assertThat("Unexpected items in response items", responseValue2, equalTo(Optional.of(writeResponseItem2)));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void nonExistingItemPlcWriteResponseGetValue() {
+        PlcWriteRequest plcWriteRequest = new PlcWriteRequest();
+        List<PlcWriteResponseItem<?>> responseItems = new ArrayList<>();
+        MockField field = new MockField("mock:/DATA");
+        PlcWriteRequestItem<Byte> nonExistingWriteRequestItem = new PlcWriteRequestItem<>(Byte.class, field, (byte) 1);
+        PlcWriteResponse plcWriteResponse = new PlcWriteResponse(plcWriteRequest, responseItems);
+        Optional<PlcWriteResponseItem<Byte>> responseValue1 = plcWriteResponse.getValue(nonExistingWriteRequestItem);
+        assertThat("Unexpected items in response items", responseValue1, equalTo(Optional.empty()));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void bulkPlcReadResponseGetValue() {
+        PlcReadRequest plcReadRequest = new PlcReadRequest();
+        List<PlcReadResponseItem<?>> responseItems = new ArrayList<>();
+        MockField field = new MockField("mock:/DATA");
+        PlcReadRequestItem<Byte> readRequestItem1 = new PlcReadRequestItem<>(Byte.class, field, 1);
+        PlcReadRequestItem<Byte> readRequestItem2 = new PlcReadRequestItem<>(Byte.class, field, 1);
+        PlcReadResponseItem<Byte> readResponseItem1 = new PlcReadResponseItem<>(readRequestItem1, PlcResponseCode.OK);
+        PlcReadResponseItem<Byte> readResponseItem2 = new PlcReadResponseItem<>(readRequestItem2, PlcResponseCode.OK);
+        responseItems.add(readResponseItem1);
+        responseItems.add(readResponseItem2);
+        PlcReadResponse plcReadResponse = new PlcReadResponse(plcReadRequest, responseItems);
+        Optional<PlcReadResponseItem<Byte>> responseValue1 = plcReadResponse.getValue(readRequestItem1);
+        Optional<PlcReadResponseItem<Byte>> responseValue2 = plcReadResponse.getValue(readRequestItem2);
+        assertThat("Unexpected items in response items", responseValue1, equalTo(Optional.of(readResponseItem1)));
+        assertThat("Unexpected items in response items", responseValue2, equalTo(Optional.of(readResponseItem2)));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void nonExistingItemPlcReadResponseGetValue() {
+        PlcReadRequest plcReadRequest = new PlcReadRequest();
+        List<PlcReadResponseItem<?>> responseItems = new ArrayList<>();
+        MockField field = new MockField("mock:/DATA");
+        PlcReadRequestItem<Byte> nonExistingReadRequestItem = new PlcReadRequestItem<>(Byte.class, field, 1);
+        PlcReadResponse plcReadResponse = new PlcReadResponse(plcReadRequest, responseItems);
+        Optional<PlcReadResponseItem<Byte>> responseValue1 = plcReadResponse.getValue(nonExistingReadRequestItem);
+        assertThat("Unexpected items in response items", responseValue1, equalTo(Optional.empty()));
+    }*/
+
+}
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcProprietaryRequestTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcProprietaryRequestTest.java
index 25b5d30d0c9..fc7740aed59 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcProprietaryRequestTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcProprietaryRequestTest.java
@@ -1,45 +1,45 @@
-/*
- 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
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.api.messages;
-
-import org.junit.Test;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
-public class PlcProprietaryRequestTest {
-
-/*    @Test
-    public void constructor() {
-        new PlcProprietaryRequest<>(new Object());
-    }
-
-    @Test
-    public void equalsAndHashCode() {
-        Object object = new Object();
-        PlcProprietaryRequest SUT = new PlcProprietaryRequest<>(object);
-        PlcProprietaryRequest other = new PlcProprietaryRequest<>(object);
-        assertThat(SUT.hashCode(), equalTo(other.hashCode()));
-        assertThat(SUT.equals(other), equalTo(true));
-        assertThat(SUT.equals(new Object()), equalTo(false));
-        assertEquals(SUT, SUT);
-    }*/
-
+/*
+ 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
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.api.messages;
+
+import org.junit.Test;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
+public class PlcProprietaryRequestTest {
+
+/*    @Test
+    public void constructor() {
+        new PlcProprietaryRequest<>(new Object());
+    }
+
+    @Test
+    public void equalsAndHashCode() {
+        Object object = new Object();
+        PlcProprietaryRequest SUT = new PlcProprietaryRequest<>(object);
+        PlcProprietaryRequest other = new PlcProprietaryRequest<>(object);
+        assertThat(SUT.hashCode(), equalTo(other.hashCode()));
+        assertThat(SUT.equals(other), equalTo(true));
+        assertThat(SUT.equals(new Object()), equalTo(false));
+        assertEquals(SUT, SUT);
+    }*/
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcProprietaryResponseTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcProprietaryResponseTest.java
index deab80ea9a4..1c2ad45d70e 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcProprietaryResponseTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcProprietaryResponseTest.java
@@ -1,55 +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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.api.messages;
-
-import org.hamcrest.core.IsEqual;
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.mock;
-
-public class PlcProprietaryResponseTest {
-
-/*    @Test
-    public void constructor() {
-        new PlcProprietaryResponse<>(mock(PlcProprietaryRequest.class), new Object());
-    }
-
-    @Test
-    public void getValue() {
-        Object customResponse = new Object();
-        Object response = new PlcProprietaryResponse<>(mock(PlcProprietaryRequest.class), customResponse).getResponse();
-        assertThat(response, equalTo(customResponse));
-    }
-
-    @Test
-    public void equalsAndHashCode() {
-        Object customResponse = new Object();
-        PlcProprietaryRequest request = mock(PlcProprietaryRequest.class);
-        PlcProprietaryResponse SUT = new PlcProprietaryResponse<>(request, customResponse);
-        PlcProprietaryResponse other = new PlcProprietaryResponse<>(request, customResponse);
-        assertThat(SUT.hashCode(), IsEqual.equalTo(other.hashCode()));
-        assertThat(SUT.equals(other), IsEqual.equalTo(true));
-        assertThat(SUT.equals(new Object()), IsEqual.equalTo(false));
-        assertEquals(SUT, SUT);
-    }*/
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.api.messages;
+
+import org.hamcrest.core.IsEqual;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.mock;
+
+public class PlcProprietaryResponseTest {
+
+/*    @Test
+    public void constructor() {
+        new PlcProprietaryResponse<>(mock(PlcProprietaryRequest.class), new Object());
+    }
+
+    @Test
+    public void getValue() {
+        Object customResponse = new Object();
+        Object response = new PlcProprietaryResponse<>(mock(PlcProprietaryRequest.class), customResponse).getResponse();
+        assertThat(response, equalTo(customResponse));
+    }
+
+    @Test
+    public void equalsAndHashCode() {
+        Object customResponse = new Object();
+        PlcProprietaryRequest request = mock(PlcProprietaryRequest.class);
+        PlcProprietaryResponse SUT = new PlcProprietaryResponse<>(request, customResponse);
+        PlcProprietaryResponse other = new PlcProprietaryResponse<>(request, customResponse);
+        assertThat(SUT.hashCode(), IsEqual.equalTo(other.hashCode()));
+        assertThat(SUT.equals(other), IsEqual.equalTo(true));
+        assertThat(SUT.equals(new Object()), IsEqual.equalTo(false));
+        assertEquals(SUT, SUT);
+    }*/
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcReadRequestTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcReadRequestTest.java
index 30dc1bf610a..b47c4df6023 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcReadRequestTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcReadRequestTest.java
@@ -1,109 +1,109 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.api.messages;
-
-import org.apache.plc4x.java.api.model.PlcField;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.Collections;
-
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
-
-public class PlcReadRequestTest {
-
-/*    PlcField dummyField;
-
-    @Before
-    public void setUp() {
-        dummyField = mock(PlcField.class);
-    }
-
-    @Test
-    public void constructor() {
-        new PlcReadRequest();
-        new PlcReadRequest(new PlcReadRequestItem<>(String.class, dummyField));
-        new PlcReadRequest(String.class, dummyField);
-        new PlcReadRequest(String.class, dummyField, 13);
-        new PlcReadRequest(Collections.singletonList(new PlcReadRequestItem<>(String.class, dummyField)));
-    }
-
-    @Test
-    public void builder() {
-        { // empty
-            try {
-                PlcReadRequest.builder().build();
-                fail("An empty builder should not be allowed to build a request");
-            } catch (IllegalStateException e) {
-                // expected
-            }
-        }
-        { // one item
-            PlcReadRequest.builder()
-                .addItem(String.class, dummyField)
-                .build();
-        }
-        { // one item sized
-            PlcReadRequest.builder()
-                .addItem(String.class, dummyField, 13)
-                .build();
-        }
-        { // one item prebuild
-            PlcReadRequest.builder()
-                .addItem(new PlcReadRequestItem<>(String.class, dummyField))
-                .build();
-        }
-        { // two different item
-            PlcReadRequest.builder()
-                .addItem(String.class, dummyField)
-                .addItem(Byte.class, dummyField)
-                .build();
-        }
-        { // two different item typeSafe
-            try {
-                PlcReadRequest.builder()
-                    .addItem(String.class, dummyField)
-                    .addItem(Byte.class, dummyField)
-                    .build(String.class);
-                fail("Should not succeed in building with mixed types.");
-            } catch (IllegalStateException e) {
-                // expected
-            }
-        }
-        { // two different item typeSafe
-            try {
-                PlcReadRequest.builder()
-                    .addItem(String.class, dummyField)
-                    .addItem(Byte.class, dummyField)
-                    .build(Byte.class);
-                fail("Should not succeed in building with mismatch of types.");
-            } catch (ClassCastException e) {
-                // expected
-            }
-        }
-        { // two equal item typeSafe
-            PlcReadRequest.builder()
-                .addItem(Byte.class, dummyField)
-                .addItem(Byte.class, dummyField)
-                .build(Byte.class);
-        }
-    }*/
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.api.messages;
+
+import org.apache.plc4x.java.api.model.PlcField;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Collections;
+
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+
+public class PlcReadRequestTest {
+
+/*    PlcField dummyField;
+
+    @Before
+    public void setUp() {
+        dummyField = mock(PlcField.class);
+    }
+
+    @Test
+    public void constructor() {
+        new PlcReadRequest();
+        new PlcReadRequest(new PlcReadRequestItem<>(String.class, dummyField));
+        new PlcReadRequest(String.class, dummyField);
+        new PlcReadRequest(String.class, dummyField, 13);
+        new PlcReadRequest(Collections.singletonList(new PlcReadRequestItem<>(String.class, dummyField)));
+    }
+
+    @Test
+    public void builder() {
+        { // empty
+            try {
+                PlcReadRequest.builder().build();
+                fail("An empty builder should not be allowed to build a request");
+            } catch (IllegalStateException e) {
+                // expected
+            }
+        }
+        { // one item
+            PlcReadRequest.builder()
+                .addItem(String.class, dummyField)
+                .build();
+        }
+        { // one item sized
+            PlcReadRequest.builder()
+                .addItem(String.class, dummyField, 13)
+                .build();
+        }
+        { // one item prebuild
+            PlcReadRequest.builder()
+                .addItem(new PlcReadRequestItem<>(String.class, dummyField))
+                .build();
+        }
+        { // two different item
+            PlcReadRequest.builder()
+                .addItem(String.class, dummyField)
+                .addItem(Byte.class, dummyField)
+                .build();
+        }
+        { // two different item typeSafe
+            try {
+                PlcReadRequest.builder()
+                    .addItem(String.class, dummyField)
+                    .addItem(Byte.class, dummyField)
+                    .build(String.class);
+                fail("Should not succeed in building with mixed types.");
+            } catch (IllegalStateException e) {
+                // expected
+            }
+        }
+        { // two different item typeSafe
+            try {
+                PlcReadRequest.builder()
+                    .addItem(String.class, dummyField)
+                    .addItem(Byte.class, dummyField)
+                    .build(Byte.class);
+                fail("Should not succeed in building with mismatch of types.");
+            } catch (ClassCastException e) {
+                // expected
+            }
+        }
+        { // two equal item typeSafe
+            PlcReadRequest.builder()
+                .addItem(Byte.class, dummyField)
+                .addItem(Byte.class, dummyField)
+                .build(Byte.class);
+        }
+    }*/
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcReadResponseTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcReadResponseTest.java
index 9cfb9327236..b4a7ad1c756 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcReadResponseTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcReadResponseTest.java
@@ -1,43 +1,43 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.api.messages;
-
-import org.junit.Test;
-
-import java.util.Collections;
-import java.util.List;
-
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
-
-public class PlcReadResponseTest {
-
-/*    @Test
-    public void constructor() {
-        new PlcReadResponse(mock(PlcReadRequest.class), mock(PlcReadResponseItem.class));
-        new PlcReadResponse(mock(PlcReadRequest.class), (List) Collections.singletonList(mock(PlcReadResponseItem.class)));
-    }
-
-    @Test
-    public void getValue() {
-        new PlcReadResponse(mock(PlcReadRequest.class), (List) Collections.singletonList(mock(PlcReadResponseItem.class, RETURNS_DEEP_STUBS)))
-            .getValue(mock(PlcReadRequestItem.class));
-    }*/
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.api.messages;
+
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+
+public class PlcReadResponseTest {
+
+/*    @Test
+    public void constructor() {
+        new PlcReadResponse(mock(PlcReadRequest.class), mock(PlcReadResponseItem.class));
+        new PlcReadResponse(mock(PlcReadRequest.class), (List) Collections.singletonList(mock(PlcReadResponseItem.class)));
+    }
+
+    @Test
+    public void getValue() {
+        new PlcReadResponse(mock(PlcReadRequest.class), (List) Collections.singletonList(mock(PlcReadResponseItem.class, RETURNS_DEEP_STUBS)))
+            .getValue(mock(PlcReadRequestItem.class));
+    }*/
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcRequestTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcRequestTest.java
index 5db67f2e82b..ca8d75b7879 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcRequestTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcRequestTest.java
@@ -1,107 +1,107 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.api.messages;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Optional;
-
-import static org.hamcrest.collection.IsEmptyCollection.empty;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
-
-public class PlcRequestTest {
-
-/*    private List<RequestItem> requestItems;
-
-    private PlcRequest<RequestItem> SUT;
-
-    @Before
-    public void setUp() {
-        requestItems = new ArrayList<>();
-        SUT = new PlcRequest<RequestItem>(requestItems) {
-        };
-    }
-
-    @Test
-    public void addItem() {
-        SUT.addItem(mock(RequestItem.class));
-    }
-
-    @Test
-    public void getRequestItems() {
-        assertThat(SUT.getRequestItems(), empty());
-    }
-
-    @Test
-    public void getRequestItem() {
-        assertThat(SUT.getRequestItem(), equalTo(Optional.empty()));
-        requestItems.add(mock(RequestItem.class));
-        assertThat(SUT.getRequestItem().isPresent(), is(true));
-        requestItems.add(mock(RequestItem.class));
-        try {
-            SUT.getRequestItem();
-            fail("Too many items in PlcRequest should have failed.");
-        } catch (IllegalStateException e) {
-            // expected
-        }
-    }
-
-    @Test
-    public void setRequestItem() {
-        SUT.setRequestItem(mock(RequestItem.class));
-        requestItems.add(mock(RequestItem.class));
-        try {
-            SUT.setRequestItem(mock(RequestItem.class));
-        } catch (IllegalStateException e) {
-            // expected
-        }
-    }
-
-    @Test
-    public void getNumberOfItems() {
-        assertThat(SUT.getNumberOfItems(), equalTo(0));
-    }
-
-    @Test
-    public void isMultiValue() {
-        assertThat(SUT.isMultiValue(), is(false));
-    }
-
-    @Test
-    public void isEmpty() {
-        assertThat(SUT.isEmpty(), is(true));
-    }
-
-    @Test
-    public void equalsAndHashCode() {
-        PlcRequest other = new PlcRequest<RequestItem>(requestItems) {
-        };
-        assertThat(SUT.hashCode(), equalTo(other.hashCode()));
-        assertThat(SUT.equals(other), equalTo(true));
-        assertThat(SUT.equals(new Object()), equalTo(false));
-        assertEquals(SUT, SUT);
-    }*/
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.api.messages;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Optional;
+
+import static org.hamcrest.collection.IsEmptyCollection.empty;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+
+public class PlcRequestTest {
+
+/*    private List<RequestItem> requestItems;
+
+    private PlcRequest<RequestItem> SUT;
+
+    @Before
+    public void setUp() {
+        requestItems = new ArrayList<>();
+        SUT = new PlcRequest<RequestItem>(requestItems) {
+        };
+    }
+
+    @Test
+    public void addItem() {
+        SUT.addItem(mock(RequestItem.class));
+    }
+
+    @Test
+    public void getRequestItems() {
+        assertThat(SUT.getRequestItems(), empty());
+    }
+
+    @Test
+    public void getRequestItem() {
+        assertThat(SUT.getRequestItem(), equalTo(Optional.empty()));
+        requestItems.add(mock(RequestItem.class));
+        assertThat(SUT.getRequestItem().isPresent(), is(true));
+        requestItems.add(mock(RequestItem.class));
+        try {
+            SUT.getRequestItem();
+            fail("Too many items in PlcRequest should have failed.");
+        } catch (IllegalStateException e) {
+            // expected
+        }
+    }
+
+    @Test
+    public void setRequestItem() {
+        SUT.setRequestItem(mock(RequestItem.class));
+        requestItems.add(mock(RequestItem.class));
+        try {
+            SUT.setRequestItem(mock(RequestItem.class));
+        } catch (IllegalStateException e) {
+            // expected
+        }
+    }
+
+    @Test
+    public void getNumberOfItems() {
+        assertThat(SUT.getNumberOfItems(), equalTo(0));
+    }
+
+    @Test
+    public void isMultiValue() {
+        assertThat(SUT.isMultiValue(), is(false));
+    }
+
+    @Test
+    public void isEmpty() {
+        assertThat(SUT.isEmpty(), is(true));
+    }
+
+    @Test
+    public void equalsAndHashCode() {
+        PlcRequest other = new PlcRequest<RequestItem>(requestItems) {
+        };
+        assertThat(SUT.hashCode(), equalTo(other.hashCode()));
+        assertThat(SUT.equals(other), equalTo(true));
+        assertThat(SUT.equals(new Object()), equalTo(false));
+        assertEquals(SUT, SUT);
+    }*/
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcResponseTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcResponseTest.java
index 2b2a65202a4..3c02a68e284 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcResponseTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcResponseTest.java
@@ -1,91 +1,91 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.api.messages;
-
-public class PlcResponseTest {
-
-/*    private PlcResponse<PlcRequest, ResponseItem, RequestItem> SUT;
-
-    private List<ResponseItem> responseItems;
-
-    private PlcRequest plcRequest;
-
-    @Before
-    public void setUp() {
-        responseItems = new ArrayList<>();
-        plcRequest = mock(PlcRequest.class);
-        SUT = new PlcResponse<PlcRequest, ResponseItem, RequestItem>(plcRequest, responseItems) {
-        };
-    }
-
-    @Test
-    public void getProprietaryRequest() {
-        assertThat(SUT.getProprietaryRequest(), notNullValue());
-    }
-
-    @Test
-    public void getResponseItems() {
-        assertThat(SUT.getResponseItems(), empty());
-    }
-
-    @Test
-    public void getResponseItem() {
-        assertThat(SUT.getResponseItem(), equalTo(Optional.empty()));
-        responseItems.add(mock(ResponseItem.class));
-        assertThat(SUT.getResponseItem().isPresent(), is(true));
-        responseItems.add(mock(ResponseItem.class));
-        try {
-            SUT.getResponseItem();
-            fail("PlcResponse.getResponseItem() should fail if contains multiple items.");
-        } catch (IllegalStateException e) {
-            // expected
-        }
-    }
-
-    @Test
-    public void getNumberOfItems() {
-        assertThat(SUT.getNumberOfItems(), equalTo(0));
-    }
-
-    @Test
-    public void isMultiValue() {
-        assertThat(SUT.isMultiValue(), is(false));
-    }
-
-    @Test
-    public void isEmpty() {
-        assertThat(SUT.isEmpty(), is(true));
-    }
-
-    @Test
-    public void getValue() {
-        assertThat(SUT.getValue(null), equalTo(Optional.empty()));
-    }
-
-    @Test
-    public void equalsAndHashCode() {
-        PlcResponse other = new PlcResponse<PlcRequest, ResponseItem, RequestItem>(plcRequest, responseItems) {
-        };
-        assertThat(SUT.hashCode(), equalTo(other.hashCode()));
-        assertThat(SUT.equals(other), equalTo(true));
-        assertThat(SUT.equals(new Object()), equalTo(false));
-        assertEquals(SUT, SUT);
-    }*/
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.api.messages;
+
+public class PlcResponseTest {
+
+/*    private PlcResponse<PlcRequest, ResponseItem, RequestItem> SUT;
+
+    private List<ResponseItem> responseItems;
+
+    private PlcRequest plcRequest;
+
+    @Before
+    public void setUp() {
+        responseItems = new ArrayList<>();
+        plcRequest = mock(PlcRequest.class);
+        SUT = new PlcResponse<PlcRequest, ResponseItem, RequestItem>(plcRequest, responseItems) {
+        };
+    }
+
+    @Test
+    public void getProprietaryRequest() {
+        assertThat(SUT.getProprietaryRequest(), notNullValue());
+    }
+
+    @Test
+    public void getResponseItems() {
+        assertThat(SUT.getResponseItems(), empty());
+    }
+
+    @Test
+    public void getResponseItem() {
+        assertThat(SUT.getResponseItem(), equalTo(Optional.empty()));
+        responseItems.add(mock(ResponseItem.class));
+        assertThat(SUT.getResponseItem().isPresent(), is(true));
+        responseItems.add(mock(ResponseItem.class));
+        try {
+            SUT.getResponseItem();
+            fail("PlcResponse.getResponseItem() should fail if contains multiple items.");
+        } catch (IllegalStateException e) {
+            // expected
+        }
+    }
+
+    @Test
+    public void getNumberOfItems() {
+        assertThat(SUT.getNumberOfItems(), equalTo(0));
+    }
+
+    @Test
+    public void isMultiValue() {
+        assertThat(SUT.isMultiValue(), is(false));
+    }
+
+    @Test
+    public void isEmpty() {
+        assertThat(SUT.isEmpty(), is(true));
+    }
+
+    @Test
+    public void getValue() {
+        assertThat(SUT.getValue(null), equalTo(Optional.empty()));
+    }
+
+    @Test
+    public void equalsAndHashCode() {
+        PlcResponse other = new PlcResponse<PlcRequest, ResponseItem, RequestItem>(plcRequest, responseItems) {
+        };
+        assertThat(SUT.hashCode(), equalTo(other.hashCode()));
+        assertThat(SUT.equals(other), equalTo(true));
+        assertThat(SUT.equals(new Object()), equalTo(false));
+        assertEquals(SUT, SUT);
+    }*/
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcSubscriptionEventTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcSubscriptionEventTest.java
index d512b08907b..bd3ec315cc1 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcSubscriptionEventTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcSubscriptionEventTest.java
@@ -1,59 +1,59 @@
-/*
- 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
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.api.messages;
-
-import org.junit.Test;
-
-import java.util.List;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.mock;
-
-public class PlcSubscriptionEventTest {
-
-/*    @Test
-    public void constructor() {
-        new PlcSubscriptionEvent(mock(List.class));
-    }
-
-    @Test
-    public void getEvents() {
-        List mock = mock(List.class);
-        List<SubscriptionEventItem<?>> eventItems = new PlcSubscriptionEvent(mock).getEventItems();
-        assertSame(eventItems, mock);
-    }
-
-    @Test
-    public void equalsAndHashCode() {
-        List eventItems = mock(List.class);
-        PlcSubscriptionEvent thiis = new PlcSubscriptionEvent(eventItems);
-        PlcSubscriptionEvent other = new PlcSubscriptionEvent(eventItems);
-        assertThat(thiis.hashCode(), equalTo(other.hashCode()));
-        assertThat(thiis.equals(other), equalTo(true));
-        assertThat(thiis.equals(new Object()), equalTo(false));
-        assertEquals(thiis, thiis);
-    }
-
-    @Test
-    public void testToString() {
-        new PlcSubscriptionEvent(mock(List.class)).toString();
-    }*/
-
+/*
+ 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
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.api.messages;
+
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
+
+public class PlcSubscriptionEventTest {
+
+/*    @Test
+    public void constructor() {
+        new PlcSubscriptionEvent(mock(List.class));
+    }
+
+    @Test
+    public void getEvents() {
+        List mock = mock(List.class);
+        List<SubscriptionEventItem<?>> eventItems = new PlcSubscriptionEvent(mock).getEventItems();
+        assertSame(eventItems, mock);
+    }
+
+    @Test
+    public void equalsAndHashCode() {
+        List eventItems = mock(List.class);
+        PlcSubscriptionEvent thiis = new PlcSubscriptionEvent(eventItems);
+        PlcSubscriptionEvent other = new PlcSubscriptionEvent(eventItems);
+        assertThat(thiis.hashCode(), equalTo(other.hashCode()));
+        assertThat(thiis.equals(other), equalTo(true));
+        assertThat(thiis.equals(new Object()), equalTo(false));
+        assertEquals(thiis, thiis);
+    }
+
+    @Test
+    public void testToString() {
+        new PlcSubscriptionEvent(mock(List.class)).toString();
+    }*/
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcSubscriptionRequestTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcSubscriptionRequestTest.java
index c554bf5e907..ce17b7b7686 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcSubscriptionRequestTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcSubscriptionRequestTest.java
@@ -1,30 +1,30 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.api.messages;
-
-import org.junit.Test;
-
-public class PlcSubscriptionRequestTest {
-
-/*    @Test
-    public void testToString() {
-        new PlcSubscriptionRequest().toString();
-    }*/
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.api.messages;
+
+import org.junit.Test;
+
+public class PlcSubscriptionRequestTest {
+
+/*    @Test
+    public void testToString() {
+        new PlcSubscriptionRequest().toString();
+    }*/
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcSubscriptionResponseTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcSubscriptionResponseTest.java
index 6921a5c036b..c7831380e5b 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcSubscriptionResponseTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcSubscriptionResponseTest.java
@@ -1,39 +1,39 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.api.messages;
-
-import org.junit.Test;
-
-import java.util.List;
-
-import static org.mockito.Mockito.mock;
-
-public class PlcSubscriptionResponseTest {
-
-/*    @Test
-    public void constructor() {
-        new PlcSubscriptionResponse(mock(PlcSubscriptionRequest.class), mock(List.class));
-    }
-
-    @Test
-    public void testToString() {
-        new PlcSubscriptionResponse(mock(PlcSubscriptionRequest.class), mock(List.class)).toString();
-    }*/
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.api.messages;
+
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.mockito.Mockito.mock;
+
+public class PlcSubscriptionResponseTest {
+
+/*    @Test
+    public void constructor() {
+        new PlcSubscriptionResponse(mock(PlcSubscriptionRequest.class), mock(List.class));
+    }
+
+    @Test
+    public void testToString() {
+        new PlcSubscriptionResponse(mock(PlcSubscriptionRequest.class), mock(List.class)).toString();
+    }*/
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionRequestTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionRequestTest.java
index d939e00ebf9..d76b18dc1b7 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionRequestTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionRequestTest.java
@@ -1,76 +1,76 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.api.messages;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.List;
-
-import static org.hamcrest.collection.IsEmptyCollection.empty;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.mock;
-
-public class PlcUnsubscriptionRequestTest {
-
-/*    private PlcUnsubscriptionRequest SUT;
-
-    @Before
-    public void setUp() {
-        SUT = new PlcUnsubscriptionRequest();
-    }
-
-    @Test
-    public void constructor() {
-        new PlcUnsubscriptionRequest();
-        new PlcUnsubscriptionRequest(mock(List.class));
-    }
-
-    @Test
-    public void addItem() {
-        SUT.addItem(mock(UnsubscriptionRequestItem.class));
-    }
-
-    @Test
-    public void getRequestItems() {
-        assertThat(SUT.getRequestItems(), empty());
-    }
-
-    @Test
-    public void getNumberOfItems() {
-        assertThat(SUT.getNumberOfItems(), equalTo(0));
-    }
-
-    @Test
-    public void equalsAndHashCode() {
-        PlcUnsubscriptionRequest other = new PlcUnsubscriptionRequest();
-        assertThat(SUT.hashCode(), equalTo(other.hashCode()));
-        assertThat(SUT.equals(other), equalTo(true));
-        assertThat(SUT.equals(new Object()), equalTo(false));
-        assertEquals(SUT, SUT);
-    }
-
-    @Test
-    public void testToString() {
-        SUT.toString();
-    }*/
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.api.messages;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.hamcrest.collection.IsEmptyCollection.empty;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.mock;
+
+public class PlcUnsubscriptionRequestTest {
+
+/*    private PlcUnsubscriptionRequest SUT;
+
+    @Before
+    public void setUp() {
+        SUT = new PlcUnsubscriptionRequest();
+    }
+
+    @Test
+    public void constructor() {
+        new PlcUnsubscriptionRequest();
+        new PlcUnsubscriptionRequest(mock(List.class));
+    }
+
+    @Test
+    public void addItem() {
+        SUT.addItem(mock(UnsubscriptionRequestItem.class));
+    }
+
+    @Test
+    public void getRequestItems() {
+        assertThat(SUT.getRequestItems(), empty());
+    }
+
+    @Test
+    public void getNumberOfItems() {
+        assertThat(SUT.getNumberOfItems(), equalTo(0));
+    }
+
+    @Test
+    public void equalsAndHashCode() {
+        PlcUnsubscriptionRequest other = new PlcUnsubscriptionRequest();
+        assertThat(SUT.hashCode(), equalTo(other.hashCode()));
+        assertThat(SUT.equals(other), equalTo(true));
+        assertThat(SUT.equals(new Object()), equalTo(false));
+        assertEquals(SUT, SUT);
+    }
+
+    @Test
+    public void testToString() {
+        SUT.toString();
+    }*/
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionResponseTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionResponseTest.java
index 8384b571d9e..3f844bf068d 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionResponseTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionResponseTest.java
@@ -1,30 +1,30 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.api.messages;
-
-import org.junit.Test;
-
-public class PlcUnsubscriptionResponseTest {
-
-/*    @Test
-    public void testToString() {
-        new PlcUnsubscriptionResponse().toString();
-    }*/
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.api.messages;
+
+import org.junit.Test;
+
+public class PlcUnsubscriptionResponseTest {
+
+/*    @Test
+    public void testToString() {
+        new PlcUnsubscriptionResponse().toString();
+    }*/
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcWriteRequestTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcWriteRequestTest.java
index 7f7c8ea0a67..edd3c02c3d6 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcWriteRequestTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcWriteRequestTest.java
@@ -1,113 +1,113 @@
-/*
- 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
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.api.messages;
-
-import org.apache.plc4x.java.api.model.PlcField;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.Collections;
-
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
-
-public class PlcWriteRequestTest {
-
-/*    PlcField dummyField;
-
-    @Before
-    public void setUp() {
-        dummyField = mock(PlcField.class);
-    }
-
-    @Test
-    public void constructor() {
-        new PlcWriteRequest();
-        new PlcWriteRequest(new PlcWriteRequestItem<>(String.class, dummyField, ""));
-        new PlcWriteRequest(String.class, dummyField);
-        new PlcWriteRequest(Collections.singletonList(new PlcWriteRequestItem<>(String.class, dummyField)));
-    }
-
-    @Test
-    public void builder() {
-        { // empty
-            try {
-                PlcWriteRequest.builder().build();
-                fail("An empty build should fail.");
-            } catch (IllegalStateException e) {
-                // expected
-            }
-        }
-        { // one item implicit type
-            PlcWriteRequest.builder()
-                .addItem(dummyField, "")
-                .build();
-        }
-        { // one item
-            PlcWriteRequest.builder()
-                .addItem(String.class, dummyField)
-                .build();
-        }
-        { // one item prebuild
-            PlcWriteRequest.builder()
-                .addItem(new PlcWriteRequestItem<>(String.class, dummyField))
-                .build();
-        }
-        { // two different item
-            PlcWriteRequest.builder()
-                .addItem(String.class, dummyField)
-                .addItem(Byte.class, dummyField)
-                .build();
-        }
-        { // two different item typeSafe
-            try {
-                PlcWriteRequest.builder()
-                    .addItem(String.class, dummyField)
-                    .addItem(Byte.class, dummyField)
-                    .build(String.class);
-                fail("Mixed types build should fail.");
-            } catch (IllegalStateException e) {
-                // expected
-            }
-        }
-        { // two different item typeSafe
-            try {
-                PlcWriteRequest.builder()
-                    .addItem(String.class, dummyField)
-                    .addItem(Byte.class, dummyField)
-                    .build(Byte.class);
-                fail("Mismatch of types should have failed.");
-            } catch (ClassCastException e) {
-                // expected
-            }
-        }
-        { // two equal item typeSafe
-            PlcWriteRequest.builder()
-                .addItem(Byte.class, dummyField)
-                .addItem(Byte.class, dummyField)
-                .build(Byte.class);
-        }
-    }
-
-    @Test
-    public void testToString() {
-        new PlcWriteRequest().toString();
-    }*/
-
+/*
+ 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
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.api.messages;
+
+import org.apache.plc4x.java.api.model.PlcField;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Collections;
+
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+
+public class PlcWriteRequestTest {
+
+/*    PlcField dummyField;
+
+    @Before
+    public void setUp() {
+        dummyField = mock(PlcField.class);
+    }
+
+    @Test
+    public void constructor() {
+        new PlcWriteRequest();
+        new PlcWriteRequest(new PlcWriteRequestItem<>(String.class, dummyField, ""));
+        new PlcWriteRequest(String.class, dummyField);
+        new PlcWriteRequest(Collections.singletonList(new PlcWriteRequestItem<>(String.class, dummyField)));
+    }
+
+    @Test
+    public void builder() {
+        { // empty
+            try {
+                PlcWriteRequest.builder().build();
+                fail("An empty build should fail.");
+            } catch (IllegalStateException e) {
+                // expected
+            }
+        }
+        { // one item implicit type
+            PlcWriteRequest.builder()
+                .addItem(dummyField, "")
+                .build();
+        }
+        { // one item
+            PlcWriteRequest.builder()
+                .addItem(String.class, dummyField)
+                .build();
+        }
+        { // one item prebuild
+            PlcWriteRequest.builder()
+                .addItem(new PlcWriteRequestItem<>(String.class, dummyField))
+                .build();
+        }
+        { // two different item
+            PlcWriteRequest.builder()
+                .addItem(String.class, dummyField)
+                .addItem(Byte.class, dummyField)
+                .build();
+        }
+        { // two different item typeSafe
+            try {
+                PlcWriteRequest.builder()
+                    .addItem(String.class, dummyField)
+                    .addItem(Byte.class, dummyField)
+                    .build(String.class);
+                fail("Mixed types build should fail.");
+            } catch (IllegalStateException e) {
+                // expected
+            }
+        }
+        { // two different item typeSafe
+            try {
+                PlcWriteRequest.builder()
+                    .addItem(String.class, dummyField)
+                    .addItem(Byte.class, dummyField)
+                    .build(Byte.class);
+                fail("Mismatch of types should have failed.");
+            } catch (ClassCastException e) {
+                // expected
+            }
+        }
+        { // two equal item typeSafe
+            PlcWriteRequest.builder()
+                .addItem(Byte.class, dummyField)
+                .addItem(Byte.class, dummyField)
+                .build(Byte.class);
+        }
+    }
+
+    @Test
+    public void testToString() {
+        new PlcWriteRequest().toString();
+    }*/
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcWriteResponseTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcWriteResponseTest.java
index e88f7a0e291..c20fbde9787 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcWriteResponseTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcWriteResponseTest.java
@@ -1,48 +1,48 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.api.messages;
-
-import org.junit.Test;
-
-import java.util.Collections;
-import java.util.List;
-
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
-
-public class PlcWriteResponseTest {
-
-/*    @Test
-    public void constructor() {
-        new PlcWriteResponse(mock(PlcWriteRequest.class), mock(PlcWriteResponseItem.class));
-        new PlcWriteResponse(mock(PlcWriteRequest.class), (List) Collections.singletonList(mock(PlcWriteResponseItem.class)));
-    }
-
-    @Test
-    public void getValue() {
-        new PlcWriteResponse(mock(PlcWriteRequest.class), (List) Collections.singletonList(mock(PlcWriteResponseItem.class, RETURNS_DEEP_STUBS)))
-            .getValue(mock(PlcWriteRequestItem.class));
-    }
-
-    @Test
-    public void testToString() {
-        new PlcWriteResponse(mock(PlcWriteRequest.class), mock(PlcWriteResponseItem.class)).toString();
-    }*/
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.api.messages;
+
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+
+public class PlcWriteResponseTest {
+
+/*    @Test
+    public void constructor() {
+        new PlcWriteResponse(mock(PlcWriteRequest.class), mock(PlcWriteResponseItem.class));
+        new PlcWriteResponse(mock(PlcWriteRequest.class), (List) Collections.singletonList(mock(PlcWriteResponseItem.class)));
+    }
+
+    @Test
+    public void getValue() {
+        new PlcWriteResponse(mock(PlcWriteRequest.class), (List) Collections.singletonList(mock(PlcWriteResponseItem.class, RETURNS_DEEP_STUBS)))
+            .getValue(mock(PlcWriteRequestItem.class));
+    }
+
+    @Test
+    public void testToString() {
+        new PlcWriteResponse(mock(PlcWriteRequest.class), mock(PlcWriteResponseItem.class)).toString();
+    }*/
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/mock/MockField.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/mock/MockField.java
index a69f9e7e25d..69cad2d4018 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/mock/MockField.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/mock/MockField.java
@@ -1,52 +1,52 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.api.messages.mock;
-
-import org.apache.plc4x.java.api.model.PlcField;
-
-public class MockField implements PlcField {
-
-  private final String field;
-  
-  public MockField(String field) {
-    this.field = field;
-  }
-  
-  public String getField() {
-    return field;
-  }
-  
-  @Override
-  public String toString() {
-    return "mock field: "+ field;
-  }
-  
-  @Override
-  public boolean equals(Object o) {
-    return o != null
-        && o instanceof MockField
-        && ((MockField)o).field.equals(this.field);
-  }
-
-  @Override
-  public int hashCode() {
-    return field.hashCode();
-  }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.messages.mock;
+
+import org.apache.plc4x.java.api.model.PlcField;
+
+public class MockField implements PlcField {
+
+  private final String field;
+  
+  public MockField(String field) {
+    this.field = field;
+  }
+  
+  public String getField() {
+    return field;
+  }
+  
+  @Override
+  public String toString() {
+    return "mock field: "+ field;
+  }
+  
+  @Override
+  public boolean equals(Object o) {
+    return o != null
+        && o instanceof MockField
+        && ((MockField)o).field.equals(this.field);
+  }
+
+  @Override
+  public int hashCode() {
+    return field.hashCode();
+  }
+
+}
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadRequestTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadRequestTest.java
index 190a5a1f1a5..de57ecda776 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadRequestTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadRequestTest.java
@@ -1,77 +1,77 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.api.messages.specific;
-
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.Collections;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class TypeSafePlcReadRequestTest {
-
-/*    PlcReadRequestItem<String> readRequestItemString;
-
-    @Before
-    public void setUp() {
-        readRequestItemString = new PlcReadRequestItem<>(String.class, mock(PlcField.class));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void constuctor() {
-        new TypeSafePlcReadRequest<>(String.class);
-        new TypeSafePlcReadRequest<>(String.class, mock(PlcReadRequest.class));
-        PlcReadRequest request = mock(PlcReadRequest.class);
-        when(request.getRequestItems()).thenReturn(Collections.singletonList(readRequestItemString));
-        new TypeSafePlcReadRequest<>(String.class, request);
-        new TypeSafePlcReadRequest<>(String.class, mock(PlcField.class));
-        new TypeSafePlcReadRequest<>(String.class, mock(PlcField.class), 3);
-        new TypeSafePlcReadRequest<>(String.class, readRequestItemString);
-
-        // expected to fail
-        new TypeSafePlcReadRequest<>(Byte.class, request);
-    }
-
-    @Test
-    public void addItem() {
-        new TypeSafePlcReadRequest<>(String.class).addItem(readRequestItemString);
-    }
-
-    @Test
-    public void getCheckedReadRequestItems() {
-        new TypeSafePlcReadRequest<>(String.class).getCheckedReadRequestItems();
-    }
-
-    @Test
-    public void getRequestItem() {
-        new TypeSafePlcReadRequest<>(String.class).getRequestItem();
-    }
-
-    @Test
-    public void getDataType() {
-        assertThat(new TypeSafePlcReadRequest<>(String.class).getDataType(), equalTo(String.class));
-    }*/
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.api.messages.specific;
+
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Collections;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class TypeSafePlcReadRequestTest {
+
+/*    PlcReadRequestItem<String> readRequestItemString;
+
+    @Before
+    public void setUp() {
+        readRequestItemString = new PlcReadRequestItem<>(String.class, mock(PlcField.class));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void constuctor() {
+        new TypeSafePlcReadRequest<>(String.class);
+        new TypeSafePlcReadRequest<>(String.class, mock(PlcReadRequest.class));
+        PlcReadRequest request = mock(PlcReadRequest.class);
+        when(request.getRequestItems()).thenReturn(Collections.singletonList(readRequestItemString));
+        new TypeSafePlcReadRequest<>(String.class, request);
+        new TypeSafePlcReadRequest<>(String.class, mock(PlcField.class));
+        new TypeSafePlcReadRequest<>(String.class, mock(PlcField.class), 3);
+        new TypeSafePlcReadRequest<>(String.class, readRequestItemString);
+
+        // expected to fail
+        new TypeSafePlcReadRequest<>(Byte.class, request);
+    }
+
+    @Test
+    public void addItem() {
+        new TypeSafePlcReadRequest<>(String.class).addItem(readRequestItemString);
+    }
+
+    @Test
+    public void getCheckedReadRequestItems() {
+        new TypeSafePlcReadRequest<>(String.class).getCheckedReadRequestItems();
+    }
+
+    @Test
+    public void getRequestItem() {
+        new TypeSafePlcReadRequest<>(String.class).getRequestItem();
+    }
+
+    @Test
+    public void getDataType() {
+        assertThat(new TypeSafePlcReadRequest<>(String.class).getDataType(), equalTo(String.class));
+    }*/
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadResponseTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadResponseTest.java
index 258a95a697a..f80588fa7ed 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadResponseTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadResponseTest.java
@@ -1,83 +1,83 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.api.messages.specific;
-
-public class TypeSafePlcReadResponseTest {
-
-/*    PlcReadResponseItem<String> readResponseItemString;
-
-    @Before
-    public void setUp() {
-        PlcReadRequestItem<String> mock = mock(PlcReadRequestItem.class);
-        when(mock.getDatatype()).thenReturn(String.class);
-        readResponseItemString = new PlcReadResponseItem<>(mock, PlcResponseCode.OK, "", "");
-    }
-
-    @Test
-    public void constuctor() {
-        TypeSafePlcReadRequest<String> mock = mock(TypeSafePlcReadRequest.class);
-        when(mock.getDataType()).thenReturn(String.class);
-        new TypeSafePlcReadResponse<>(mock, readResponseItemString);
-        new TypeSafePlcReadResponse<>(mock, Collections.singletonList(readResponseItemString));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void constuctorWrong() {
-        TypeSafePlcReadRequest<Byte> mock = mock(TypeSafePlcReadRequest.class);
-        when(mock.getDataType()).thenReturn(Byte.class);
-
-        // expects an exception
-        new TypeSafePlcReadResponse(mock, readResponseItemString);
-    }
-
-    @Test
-    public void of() {
-        {
-            TypeSafePlcReadResponse.of(mock(PlcReadResponse.class, RETURNS_DEEP_STUBS), String.class);
-        }
-        {
-            PlcReadResponse response = mock(PlcReadResponse.class, RETURNS_DEEP_STUBS);
-            TypeSafePlcReadRequest typeSafePlcReadRequest = mock(TypeSafePlcReadRequest.class, RETURNS_DEEP_STUBS);
-            when(typeSafePlcReadRequest.getDataType()).thenReturn(String.class);
-            when(response.getProprietaryRequest()).thenReturn(typeSafePlcReadRequest);
-            TypeSafePlcReadResponse.of(response, String.class);
-        }
-        {
-            PlcReadResponse response = mock(PlcReadResponse.class, RETURNS_DEEP_STUBS);
-            when(response.getResponseItems()).thenReturn((List) Collections.singletonList(readResponseItemString));
-            TypeSafePlcReadResponse.of(response, String.class);
-        }
-    }
-
-    @Test
-    public void getProprietaryRequest() {
-        new TypeSafePlcReadResponse<>(mock(TypeSafePlcReadRequest.class), Collections.emptyList()).getProprietaryRequest();
-    }
-
-    @Test
-    public void getResponseItems() {
-        new TypeSafePlcReadResponse<>(mock(TypeSafePlcReadRequest.class), Collections.emptyList()).getResponseItems();
-    }
-
-    @Test
-    public void getResponseItem() {
-        new TypeSafePlcReadResponse<>(mock(TypeSafePlcReadRequest.class), Collections.emptyList()).getResponseItem();
-    }*/
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.api.messages.specific;
+
+public class TypeSafePlcReadResponseTest {
+
+/*    PlcReadResponseItem<String> readResponseItemString;
+
+    @Before
+    public void setUp() {
+        PlcReadRequestItem<String> mock = mock(PlcReadRequestItem.class);
+        when(mock.getDatatype()).thenReturn(String.class);
+        readResponseItemString = new PlcReadResponseItem<>(mock, PlcResponseCode.OK, "", "");
+    }
+
+    @Test
+    public void constuctor() {
+        TypeSafePlcReadRequest<String> mock = mock(TypeSafePlcReadRequest.class);
+        when(mock.getDataType()).thenReturn(String.class);
+        new TypeSafePlcReadResponse<>(mock, readResponseItemString);
+        new TypeSafePlcReadResponse<>(mock, Collections.singletonList(readResponseItemString));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void constuctorWrong() {
+        TypeSafePlcReadRequest<Byte> mock = mock(TypeSafePlcReadRequest.class);
+        when(mock.getDataType()).thenReturn(Byte.class);
+
+        // expects an exception
+        new TypeSafePlcReadResponse(mock, readResponseItemString);
+    }
+
+    @Test
+    public void of() {
+        {
+            TypeSafePlcReadResponse.of(mock(PlcReadResponse.class, RETURNS_DEEP_STUBS), String.class);
+        }
+        {
+            PlcReadResponse response = mock(PlcReadResponse.class, RETURNS_DEEP_STUBS);
+            TypeSafePlcReadRequest typeSafePlcReadRequest = mock(TypeSafePlcReadRequest.class, RETURNS_DEEP_STUBS);
+            when(typeSafePlcReadRequest.getDataType()).thenReturn(String.class);
+            when(response.getProprietaryRequest()).thenReturn(typeSafePlcReadRequest);
+            TypeSafePlcReadResponse.of(response, String.class);
+        }
+        {
+            PlcReadResponse response = mock(PlcReadResponse.class, RETURNS_DEEP_STUBS);
+            when(response.getResponseItems()).thenReturn((List) Collections.singletonList(readResponseItemString));
+            TypeSafePlcReadResponse.of(response, String.class);
+        }
+    }
+
+    @Test
+    public void getProprietaryRequest() {
+        new TypeSafePlcReadResponse<>(mock(TypeSafePlcReadRequest.class), Collections.emptyList()).getProprietaryRequest();
+    }
+
+    @Test
+    public void getResponseItems() {
+        new TypeSafePlcReadResponse<>(mock(TypeSafePlcReadRequest.class), Collections.emptyList()).getResponseItems();
+    }
+
+    @Test
+    public void getResponseItem() {
+        new TypeSafePlcReadResponse<>(mock(TypeSafePlcReadRequest.class), Collections.emptyList()).getResponseItem();
+    }*/
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteRequestTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteRequestTest.java
index 6375160cc94..1c3af0ecdfd 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteRequestTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteRequestTest.java
@@ -1,77 +1,77 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.api.messages.specific;
-
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.Collections;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class TypeSafePlcWriteRequestTest {
-
-/*    PlcWriteRequestItem<String> writeRequestItemString;
-
-    @Before
-    public void setUp() {
-        writeRequestItemString = new PlcWriteRequestItem<>(String.class, mock(PlcField.class));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void constuctor() {
-        new TypeSafePlcWriteRequest<>(String.class);
-        new TypeSafePlcWriteRequest<>(String.class, mock(PlcWriteRequest.class));
-        PlcWriteRequest request = mock(PlcWriteRequest.class);
-        when(request.getRequestItems()).thenReturn(Collections.singletonList(writeRequestItemString));
-        new TypeSafePlcWriteRequest<>(String.class, request);
-        new TypeSafePlcWriteRequest<>(String.class, mock(PlcField.class));
-        new TypeSafePlcWriteRequest<>(String.class, mock(PlcField.class), "");
-        new TypeSafePlcWriteRequest<>(String.class, writeRequestItemString);
-
-        // expects an exception
-        new TypeSafePlcWriteRequest<>(Byte.class, request);
-    }
-
-    @Test
-    public void addItem() {
-        new TypeSafePlcWriteRequest<>(String.class).addItem(writeRequestItemString);
-    }
-
-    @Test
-    public void getCheckedWriteRequestItems() {
-        new TypeSafePlcWriteRequest<>(String.class).getCheckedRequestItems();
-    }
-
-    @Test
-    public void getRequestItem() {
-        new TypeSafePlcWriteRequest<>(String.class).getRequestItem();
-    }
-
-    @Test
-    public void getDataType() {
-        assertThat(new TypeSafePlcWriteRequest<>(String.class).getDataType(), equalTo(String.class));
-    }*/
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.api.messages.specific;
+
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Collections;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class TypeSafePlcWriteRequestTest {
+
+/*    PlcWriteRequestItem<String> writeRequestItemString;
+
+    @Before
+    public void setUp() {
+        writeRequestItemString = new PlcWriteRequestItem<>(String.class, mock(PlcField.class));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void constuctor() {
+        new TypeSafePlcWriteRequest<>(String.class);
+        new TypeSafePlcWriteRequest<>(String.class, mock(PlcWriteRequest.class));
+        PlcWriteRequest request = mock(PlcWriteRequest.class);
+        when(request.getRequestItems()).thenReturn(Collections.singletonList(writeRequestItemString));
+        new TypeSafePlcWriteRequest<>(String.class, request);
+        new TypeSafePlcWriteRequest<>(String.class, mock(PlcField.class));
+        new TypeSafePlcWriteRequest<>(String.class, mock(PlcField.class), "");
+        new TypeSafePlcWriteRequest<>(String.class, writeRequestItemString);
+
+        // expects an exception
+        new TypeSafePlcWriteRequest<>(Byte.class, request);
+    }
+
+    @Test
+    public void addItem() {
+        new TypeSafePlcWriteRequest<>(String.class).addItem(writeRequestItemString);
+    }
+
+    @Test
+    public void getCheckedWriteRequestItems() {
+        new TypeSafePlcWriteRequest<>(String.class).getCheckedRequestItems();
+    }
+
+    @Test
+    public void getRequestItem() {
+        new TypeSafePlcWriteRequest<>(String.class).getRequestItem();
+    }
+
+    @Test
+    public void getDataType() {
+        assertThat(new TypeSafePlcWriteRequest<>(String.class).getDataType(), equalTo(String.class));
+    }*/
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteResponseTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteResponseTest.java
index 0c6fcb366b9..a811efc3df6 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteResponseTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteResponseTest.java
@@ -1,68 +1,68 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.api.messages.specific;
-
-public class TypeSafePlcWriteResponseTest {
-
-/*    PlcWriteResponseItem<String> writeResponseItemString;
-
-    @Before
-    public void setUp() {
-        writeResponseItemString = new PlcWriteResponseItem<>(mock(PlcWriteRequestItem.class), PlcResponseCode.OK);
-    }
-
-    @Test
-    public void constuctor() {
-        new TypeSafePlcWriteResponse<>(mock(TypeSafePlcWriteRequest.class), writeResponseItemString);
-        new TypeSafePlcWriteResponse<>(mock(TypeSafePlcWriteRequest.class), Collections.singletonList(writeResponseItemString));
-    }
-
-    @Test
-    public void of() {
-        {
-            TypeSafePlcWriteResponse.of(mock(PlcWriteResponse.class, RETURNS_DEEP_STUBS));
-        }
-        {
-            PlcWriteResponse response = mock(PlcWriteResponse.class, RETURNS_DEEP_STUBS);
-            when(response.getProprietaryRequest()).thenReturn(mock(TypeSafePlcWriteRequest.class, RETURNS_DEEP_STUBS));
-            TypeSafePlcWriteResponse.of(response);
-        }
-        {
-            PlcWriteResponse response = mock(PlcWriteResponse.class, RETURNS_DEEP_STUBS);
-            when(response.getResponseItems()).thenReturn((List) Collections.singletonList(writeResponseItemString));
-            TypeSafePlcWriteResponse.of(response);
-        }
-    }
-
-    @Test
-    public void getProprietaryRequest() {
-        new TypeSafePlcWriteResponse<>(mock(TypeSafePlcWriteRequest.class), Collections.emptyList()).getProprietaryRequest();
-    }
-
-    @Test
-    public void getResponseItems() {
-        new TypeSafePlcWriteResponse<>(mock(TypeSafePlcWriteRequest.class), Collections.emptyList()).getResponseItems();
-    }
-
-    @Test
-    public void getResponseItem() {
-        new TypeSafePlcWriteResponse<>(mock(TypeSafePlcWriteRequest.class), Collections.emptyList()).getResponseItem();
-    }*/
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.api.messages.specific;
+
+public class TypeSafePlcWriteResponseTest {
+
+/*    PlcWriteResponseItem<String> writeResponseItemString;
+
+    @Before
+    public void setUp() {
+        writeResponseItemString = new PlcWriteResponseItem<>(mock(PlcWriteRequestItem.class), PlcResponseCode.OK);
+    }
+
+    @Test
+    public void constuctor() {
+        new TypeSafePlcWriteResponse<>(mock(TypeSafePlcWriteRequest.class), writeResponseItemString);
+        new TypeSafePlcWriteResponse<>(mock(TypeSafePlcWriteRequest.class), Collections.singletonList(writeResponseItemString));
+    }
+
+    @Test
+    public void of() {
+        {
+            TypeSafePlcWriteResponse.of(mock(PlcWriteResponse.class, RETURNS_DEEP_STUBS));
+        }
+        {
+            PlcWriteResponse response = mock(PlcWriteResponse.class, RETURNS_DEEP_STUBS);
+            when(response.getProprietaryRequest()).thenReturn(mock(TypeSafePlcWriteRequest.class, RETURNS_DEEP_STUBS));
+            TypeSafePlcWriteResponse.of(response);
+        }
+        {
+            PlcWriteResponse response = mock(PlcWriteResponse.class, RETURNS_DEEP_STUBS);
+            when(response.getResponseItems()).thenReturn((List) Collections.singletonList(writeResponseItemString));
+            TypeSafePlcWriteResponse.of(response);
+        }
+    }
+
+    @Test
+    public void getProprietaryRequest() {
+        new TypeSafePlcWriteResponse<>(mock(TypeSafePlcWriteRequest.class), Collections.emptyList()).getProprietaryRequest();
+    }
+
+    @Test
+    public void getResponseItems() {
+        new TypeSafePlcWriteResponse<>(mock(TypeSafePlcWriteRequest.class), Collections.emptyList()).getResponseItems();
+    }
+
+    @Test
+    public void getResponseItem() {
+        new TypeSafePlcWriteResponse<>(mock(TypeSafePlcWriteRequest.class), Collections.emptyList()).getResponseItem();
+    }*/
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/types/PlcClientDatatypeTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/types/PlcClientDatatypeTest.java
index 2d8c976fc8a..02d8e494f88 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/types/PlcClientDatatypeTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/types/PlcClientDatatypeTest.java
@@ -1,46 +1,46 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.api.types;
-
-
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.junit.Assert.assertThat;
-
-
-class PlcClientDatatypeTest {
-
-    @Test
-    public void testConstants() {
-        assertThat(PlcClientDatatype.BOOLEAN, notNullValue());
-        assertThat(PlcClientDatatype.BYTE, notNullValue());
-        assertThat(PlcClientDatatype.SHORT, notNullValue());
-        assertThat(PlcClientDatatype.INTEGER, notNullValue());
-        assertThat(PlcClientDatatype.LONG, notNullValue());
-        assertThat(PlcClientDatatype.FLOAT, notNullValue());
-        assertThat(PlcClientDatatype.DOUBLE, notNullValue());
-        assertThat(PlcClientDatatype.STRING, notNullValue());
-        assertThat(PlcClientDatatype.TIME, notNullValue());
-        assertThat(PlcClientDatatype.DATE, notNullValue());
-        assertThat(PlcClientDatatype.DATE_TIME, notNullValue());
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.api.types;
+
+
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.junit.Assert.assertThat;
+
+
+class PlcClientDatatypeTest {
+
+    @Test
+    public void testConstants() {
+        assertThat(PlcClientDatatype.BOOLEAN, notNullValue());
+        assertThat(PlcClientDatatype.BYTE, notNullValue());
+        assertThat(PlcClientDatatype.SHORT, notNullValue());
+        assertThat(PlcClientDatatype.INTEGER, notNullValue());
+        assertThat(PlcClientDatatype.LONG, notNullValue());
+        assertThat(PlcClientDatatype.FLOAT, notNullValue());
+        assertThat(PlcClientDatatype.DOUBLE, notNullValue());
+        assertThat(PlcClientDatatype.STRING, notNullValue());
+        assertThat(PlcClientDatatype.TIME, notNullValue());
+        assertThat(PlcClientDatatype.DATE, notNullValue());
+        assertThat(PlcClientDatatype.DATE_TIME, notNullValue());
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/types/PlcResponseCodeTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/types/PlcResponseCodeTest.java
index 304ae158552..8613b89dcc4 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/types/PlcResponseCodeTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/types/PlcResponseCodeTest.java
@@ -1,39 +1,39 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.api.types;
-
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.junit.Assert.assertThat;
-
-class PlcResponseCodeTest {
-
-    @Test
-    public void testConstants() {
-        assertThat(PlcResponseCode.OK, notNullValue());
-        assertThat(PlcResponseCode.INTERNAL_ERROR, notNullValue());
-        assertThat(PlcResponseCode.NOT_FOUND, notNullValue());
-        assertThat(PlcResponseCode.INVALID_ADDRESS, notNullValue());
-        assertThat(PlcResponseCode.INVALID_DATATYPE, notNullValue());
-        assertThat(PlcResponseCode.RESPONSE_PENDING, notNullValue());
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.api.types;
+
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.junit.Assert.assertThat;
+
+class PlcResponseCodeTest {
+
+    @Test
+    public void testConstants() {
+        assertThat(PlcResponseCode.OK, notNullValue());
+        assertThat(PlcResponseCode.INTERNAL_ERROR, notNullValue());
+        assertThat(PlcResponseCode.NOT_FOUND, notNullValue());
+        assertThat(PlcResponseCode.INVALID_ADDRESS, notNullValue());
+        assertThat(PlcResponseCode.INVALID_DATATYPE, notNullValue());
+        assertThat(PlcResponseCode.RESPONSE_PENDING, notNullValue());
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/types/PlcSubscriptionTypeTest.java b/plc4j/api/src/test/java/org/apache/plc4x/java/api/types/PlcSubscriptionTypeTest.java
index b33f832f547..3071064b8b5 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/types/PlcSubscriptionTypeTest.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/api/types/PlcSubscriptionTypeTest.java
@@ -1,36 +1,36 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.api.types;
-
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.junit.Assert.assertThat;
-
-class PlcSubscriptionTypeTest {
-
-    @Test
-    public void testConstants() {
-        assertThat(PlcSubscriptionType.CHANGE_OF_STATE, notNullValue());
-        assertThat(PlcSubscriptionType.CYCLIC, notNullValue());
-        assertThat(PlcSubscriptionType.EVENT, notNullValue());
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.api.types;
+
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.junit.Assert.assertThat;
+
+class PlcSubscriptionTypeTest {
+
+    @Test
+    public void testConstants() {
+        assertThat(PlcSubscriptionType.CHANGE_OF_STATE, notNullValue());
+        assertThat(PlcSubscriptionType.CYCLIC, notNullValue());
+        assertThat(PlcSubscriptionType.EVENT, notNullValue());
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/mock/DuplicateMockDriver.java b/plc4j/api/src/test/java/org/apache/plc4x/java/mock/DuplicateMockDriver.java
index c998aa2e6f4..bbe7e578d42 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/mock/DuplicateMockDriver.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/mock/DuplicateMockDriver.java
@@ -1,23 +1,23 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.mock;
-
-public class DuplicateMockDriver extends MockDriver {
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.mock;
+
+public class DuplicateMockDriver extends MockDriver {
+}
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/mock/MockDriver.java b/plc4j/api/src/test/java/org/apache/plc4x/java/mock/MockDriver.java
index d119b426edd..a14cffd2a49 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/mock/MockDriver.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/mock/MockDriver.java
@@ -1,55 +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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.mock;
-
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.spi.PlcDriver;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class MockDriver implements PlcDriver {
-
-    @Override
-    public String getProtocolCode() {
-        return "spi-mock";
-    }
-
-    @Override
-    public String getProtocolName() {
-        return "Mock Protocol Implementation";
-    }
-
-    @Override
-    public PlcConnection connect(String url) {
-        MockPlcConnection connection = mock(MockPlcConnection.class);
-        when(connection.isConnected()).thenReturn(true);
-        return connection;
-    }
-
-    @Override
-    public PlcConnection connect(String url, PlcAuthentication authentication) {
-        MockPlcConnection connection = mock(MockPlcConnection.class);
-        when(connection.isConnected()).thenReturn(true);
-        when(connection.getAuthentication()).thenReturn(authentication);
-        return connection;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.mock;
+
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.authentication.PlcAuthentication;
+import org.apache.plc4x.java.spi.PlcDriver;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class MockDriver implements PlcDriver {
+
+    @Override
+    public String getProtocolCode() {
+        return "spi-mock";
+    }
+
+    @Override
+    public String getProtocolName() {
+        return "Mock Protocol Implementation";
+    }
+
+    @Override
+    public PlcConnection connect(String url) {
+        MockPlcConnection connection = mock(MockPlcConnection.class);
+        when(connection.isConnected()).thenReturn(true);
+        return connection;
+    }
+
+    @Override
+    public PlcConnection connect(String url, PlcAuthentication authentication) {
+        MockPlcConnection connection = mock(MockPlcConnection.class);
+        when(connection.isConnected()).thenReturn(true);
+        when(connection.getAuthentication()).thenReturn(authentication);
+        return connection;
+    }
+
+}
diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/mock/MockPlcConnection.java b/plc4j/api/src/test/java/org/apache/plc4x/java/mock/MockPlcConnection.java
index 5258df63951..6ffc77a1fd2 100644
--- a/plc4j/api/src/test/java/org/apache/plc4x/java/mock/MockPlcConnection.java
+++ b/plc4j/api/src/test/java/org/apache/plc4x/java/mock/MockPlcConnection.java
@@ -1,29 +1,29 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.mock;
-
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-
-public interface MockPlcConnection extends PlcConnection {
-
-    PlcAuthentication getAuthentication();
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.mock;
+
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.authentication.PlcAuthentication;
+
+public interface MockPlcConnection extends PlcConnection {
+
+    PlcAuthentication getAuthentication();
+
+}
diff --git a/plc4j/api/src/test/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver b/plc4j/api/src/test/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
index f552b7283cc..a3489f9b194 100644
--- a/plc4j/api/src/test/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
+++ b/plc4j/api/src/test/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
@@ -1,19 +1,19 @@
-#
-# 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
-#
-#   http://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.
-#
-org.apache.plc4x.java.mock.MockDriver
+#
+# 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
+#
+#   http://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.
+#
+org.apache.plc4x.java.mock.MockDriver
diff --git a/plc4j/api/src/test/resources/test/META-INF/services/org.apache.plc4x.java.spi.PlcDriver b/plc4j/api/src/test/resources/test/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
index 4211709aa97..a5e470cf2d7 100644
--- a/plc4j/api/src/test/resources/test/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
+++ b/plc4j/api/src/test/resources/test/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
@@ -1,19 +1,19 @@
-#
-# 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
-#
-#   http://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.
-#
-org.apache.plc4x.java.mock.DuplicateMockDriver
+#
+# 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
+#
+#   http://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.
+#
+org.apache.plc4x.java.mock.DuplicateMockDriver
diff --git a/plc4j/drivers/ab-eth/pom.xml b/plc4j/drivers/ab-eth/pom.xml
index f3a3c78fba0..5de82e37635 100644
--- a/plc4j/drivers/ab-eth/pom.xml
+++ b/plc4j/drivers/ab-eth/pom.xml
@@ -1,132 +1,132 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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
-  ~
-  ~   http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-drivers</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-driver-ab-eth</artifactId>
-  <name>PLC4J: Driver: AB-ETH</name>
-  <description>Implementation of a PLC4X driver able to speak using the Allen Bradley AB-ETH protocol.</description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.plc4x.plugins</groupId>
-        <artifactId>plc4x-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>generate-driver</goal>
-            </goals>
-            <configuration>
-              <protocolName>ab-eth</protocolName>
-              <languageName>java</languageName>
-              <outputFlavor>read-write</outputFlavor>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <usedDependencies combine.children="append">
-            <usedDependency>org.apache.plc4x:plc4x-build-utils-language-java</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4x-protocols-ab-eth</usedDependency>
-          </usedDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-utils-driver-base-java</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base-tcp</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-buffer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-utils-protocol-test-utils</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-build-utils-language-java</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-protocols-ab-eth</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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
+  ~
+  ~   http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-drivers</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-driver-ab-eth</artifactId>
+  <name>PLC4J: Driver: AB-ETH</name>
+  <description>Implementation of a PLC4X driver able to speak using the Allen Bradley AB-ETH protocol.</description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.plc4x.plugins</groupId>
+        <artifactId>plc4x-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>generate-driver</goal>
+            </goals>
+            <configuration>
+              <protocolName>ab-eth</protocolName>
+              <languageName>java</languageName>
+              <outputFlavor>read-write</outputFlavor>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <usedDependencies combine.children="append">
+            <usedDependency>org.apache.plc4x:plc4x-build-utils-language-java</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4x-protocols-ab-eth</usedDependency>
+          </usedDependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-utils-driver-base-java</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base-tcp</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-utils-protocol-test-utils</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-build-utils-language-java</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-protocols-ab-eth</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/AbEthDriver.java b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/AbEthDriver.java
index 708de9bce8e..c95e6af3082 100644
--- a/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/AbEthDriver.java
+++ b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/AbEthDriver.java
@@ -1,72 +1,72 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.abeth;
-
-import org.apache.plc4x.java.abeth.connection.AbEthPlcConnection;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.spi.PlcDriver;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class AbEthDriver implements PlcDriver {
-
-    private static final Pattern ABETH_URI_PATTERN = Pattern.compile("^ab-eth://(?<host>.*)/(?<station>\\d{1,2})(?<params>\\?.*)?");
-
-    @Override
-    public String getProtocolCode() {
-        return "ab-eth";
-    }
-
-    @Override
-    public String getProtocolName() {
-        return "Allen Bradley ETH";
-    }
-
-    @Override
-    public PlcConnection connect(String url) throws PlcConnectionException {
-        Matcher matcher = ABETH_URI_PATTERN.matcher(url);
-        if (!matcher.matches()) {
-            throw new PlcConnectionException(
-                "Connection url doesn't match the format 'ab-eth://{host|ip}/{station}'");
-        }
-        int station = Integer.parseInt(matcher.group("station"));
-        String host = matcher.group("host");
-        String params = matcher.group("params") != null ? matcher.group("params").substring(1) : null;
-
-        try {
-            InetAddress serverInetAddress = InetAddress.getByName(host);
-            return new AbEthPlcConnection(serverInetAddress, station, params);
-        } catch (UnknownHostException e) {
-            throw new PlcConnectionException("Error parsing address", e);
-        } catch (Exception e) {
-            throw new PlcConnectionException("Error connecting to host", e);
-        }
-    }
-
-    @Override
-    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
-        throw new PlcConnectionException("AB-ETH connections don't support authentication.");
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.abeth;
+
+import org.apache.plc4x.java.abeth.connection.AbEthPlcConnection;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.authentication.PlcAuthentication;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.spi.PlcDriver;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class AbEthDriver implements PlcDriver {
+
+    private static final Pattern ABETH_URI_PATTERN = Pattern.compile("^ab-eth://(?<host>.*)/(?<station>\\d{1,2})(?<params>\\?.*)?");
+
+    @Override
+    public String getProtocolCode() {
+        return "ab-eth";
+    }
+
+    @Override
+    public String getProtocolName() {
+        return "Allen Bradley ETH";
+    }
+
+    @Override
+    public PlcConnection connect(String url) throws PlcConnectionException {
+        Matcher matcher = ABETH_URI_PATTERN.matcher(url);
+        if (!matcher.matches()) {
+            throw new PlcConnectionException(
+                "Connection url doesn't match the format 'ab-eth://{host|ip}/{station}'");
+        }
+        int station = Integer.parseInt(matcher.group("station"));
+        String host = matcher.group("host");
+        String params = matcher.group("params") != null ? matcher.group("params").substring(1) : null;
+
+        try {
+            InetAddress serverInetAddress = InetAddress.getByName(host);
+            return new AbEthPlcConnection(serverInetAddress, station, params);
+        } catch (UnknownHostException e) {
+            throw new PlcConnectionException("Error parsing address", e);
+        } catch (Exception e) {
+            throw new PlcConnectionException("Error connecting to host", e);
+        }
+    }
+
+    @Override
+    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
+        throw new PlcConnectionException("AB-ETH connections don't support authentication.");
+    }
+
+}
diff --git a/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/connection/AbEthFieldHandler.java b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/connection/AbEthFieldHandler.java
index 913736adf23..04dba377326 100644
--- a/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/connection/AbEthFieldHandler.java
+++ b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/connection/AbEthFieldHandler.java
@@ -1,36 +1,36 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.abeth.connection;
-
-import org.apache.plc4x.java.abeth.model.AbEthField;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.connection.DefaultPlcFieldHandler;
-
-public class AbEthFieldHandler extends DefaultPlcFieldHandler {
-
-    @Override
-    public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
-        if (AbEthField.matches(fieldQuery)) {
-            return AbEthField.of(fieldQuery);
-        }
-        throw new PlcInvalidFieldException(fieldQuery);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.abeth.connection;
+
+import org.apache.plc4x.java.abeth.model.AbEthField;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.connection.DefaultPlcFieldHandler;
+
+public class AbEthFieldHandler extends DefaultPlcFieldHandler {
+
+    @Override
+    public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
+        if (AbEthField.matches(fieldQuery)) {
+            return AbEthField.of(fieldQuery);
+        }
+        throw new PlcInvalidFieldException(fieldQuery);
+    }
+
+}
diff --git a/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/connection/AbEthPlcConnection.java b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/connection/AbEthPlcConnection.java
index db93855e20b..baf05de11e5 100644
--- a/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/connection/AbEthPlcConnection.java
+++ b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/connection/AbEthPlcConnection.java
@@ -1,159 +1,159 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.abeth.connection;
-
-import io.netty.channel.*;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.plc4x.java.abeth.model.AbEthField;
-import org.apache.plc4x.java.abeth.protocol.AbEthProtocol;
-import org.apache.plc4x.java.abeth.protocol.Plc4xAbEthProtocol;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.connection.ChannelFactory;
-import org.apache.plc4x.java.base.connection.NettyPlcConnection;
-import org.apache.plc4x.java.base.events.ConnectEvent;
-import org.apache.plc4x.java.base.events.ConnectedEvent;
-import org.apache.plc4x.java.base.messages.*;
-import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.InetAddress;
-import java.util.concurrent.CompletableFuture;
-
-public class AbEthPlcConnection extends NettyPlcConnection implements PlcReader {
-
-    private static final int AB_ETH_PORT = 2222;
-    private static final Logger logger = LoggerFactory.getLogger(AbEthPlcConnection.class);
-
-    private final int station;
-
-
-    public AbEthPlcConnection(InetAddress address, int station, String params) {
-        this(new TcpSocketChannelFactory(address, AB_ETH_PORT), station, params);
-        logger.info("Setting up AB-ETH Connection with: host-name {}", address.getHostAddress());
-    }
-
-    public AbEthPlcConnection(ChannelFactory channelFactory, int station, String params) {
-        super(channelFactory, true);
-        this.station = station;
-
-        if (!StringUtils.isEmpty(params)) {
-            for (String param : params.split("&")) {
-                String[] paramElements = param.split("=");
-                String paramName = paramElements[0];
-                if (paramElements.length == 2) {
-                    String paramValue = paramElements[1];
-                    switch (paramName) {
-                        default:
-                            logger.debug("Unknown parameter {} with value {}", paramName, paramValue);
-                    }
-                } else {
-                    logger.debug("Unknown no-value parameter {}", paramName);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void sendChannelCreatedEvent() {
-        logger.trace("Channel was created, firing ChannelCreated Event");
-        // Send an event to the pipeline telling the Protocol filters what's going on.
-        channel.pipeline().fireUserEventTriggered(new ConnectEvent());
-    }
-
-    @Override
-    public PlcField prepareField(String fieldQuery) throws PlcInvalidFieldException {
-        return AbEthField.of(fieldQuery);
-    }
-
-    @Override
-    protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
-        return new ChannelInitializer() {
-            @Override
-            protected void initChannel(Channel channel) {
-                // Build the protocol stack for communicating with the s7 protocol.
-                ChannelPipeline pipeline = channel.pipeline();
-                pipeline.addLast(new ChannelInboundHandlerAdapter() {
-                    @Override
-                    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
-                        if (evt instanceof ConnectedEvent) {
-                            sessionSetupCompleteFuture.complete(null);
-                        } else {
-                            super.userEventTriggered(ctx, evt);
-                        }
-                    }
-                });
-                pipeline.addLast(new AbEthProtocol());
-                pipeline.addLast(new Plc4xAbEthProtocol(station));
-            }
-        };
-    }
-
-    @Override
-    public boolean canRead() {
-        return true;
-    }
-
-    @Override
-    public PlcReadRequest.Builder readRequestBuilder() {
-        return new DefaultPlcReadRequest.Builder(this, new AbEthFieldHandler());
-    }
-
-    @Override
-    public void close() {
-        logger.debug("Closing PlcConnection...");
-        // Close the channel gracefully
-        if ((channel != null) && channel.isOpen()) {
-            logger.debug("Channel is still connected, Closing channel...");
-            // Close the channel
-            channel.close();
-
-            // Do some additional cleanup operations ...
-            // In normal operation, the channels event loop has a parent, however when running with
-            // the embedded channel for unit tests, parent is null.
-            if (channel.eventLoop().parent() != null) {
-                logger.trace("Shutting down EventLoop gracefully...");
-                channel.eventLoop().parent().shutdownGracefully();
-                logger.trace("Eventloop is shutted down");
-            }
-        }
-        // Dereference
-        channel = null;
-        connected = false;
-    }
-
-    @Override
-    public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
-        InternalPlcReadRequest internalReadRequest = checkInternal(readRequest, InternalPlcReadRequest.class);
-        CompletableFuture<InternalPlcReadResponse> future = new CompletableFuture<>();
-        PlcRequestContainer<InternalPlcReadRequest, InternalPlcReadResponse> container =
-            new PlcRequestContainer<>(internalReadRequest, future);
-        channel.writeAndFlush(container).addListener(f -> {
-            if (!f.isSuccess()) {
-                future.completeExceptionally(f.cause());
-            }
-        });
-        return future
-            .thenApply(PlcReadResponse.class::cast);
-    }
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.abeth.connection;
+
+import io.netty.channel.*;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.plc4x.java.abeth.model.AbEthField;
+import org.apache.plc4x.java.abeth.protocol.AbEthProtocol;
+import org.apache.plc4x.java.abeth.protocol.Plc4xAbEthProtocol;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.connection.ChannelFactory;
+import org.apache.plc4x.java.base.connection.NettyPlcConnection;
+import org.apache.plc4x.java.base.events.ConnectEvent;
+import org.apache.plc4x.java.base.events.ConnectedEvent;
+import org.apache.plc4x.java.base.messages.*;
+import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.InetAddress;
+import java.util.concurrent.CompletableFuture;
+
+public class AbEthPlcConnection extends NettyPlcConnection implements PlcReader {
+
+    private static final int AB_ETH_PORT = 2222;
+    private static final Logger logger = LoggerFactory.getLogger(AbEthPlcConnection.class);
+
+    private final int station;
+
+
+    public AbEthPlcConnection(InetAddress address, int station, String params) {
+        this(new TcpSocketChannelFactory(address, AB_ETH_PORT), station, params);
+        logger.info("Setting up AB-ETH Connection with: host-name {}", address.getHostAddress());
+    }
+
+    public AbEthPlcConnection(ChannelFactory channelFactory, int station, String params) {
+        super(channelFactory, true);
+        this.station = station;
+
+        if (!StringUtils.isEmpty(params)) {
+            for (String param : params.split("&")) {
+                String[] paramElements = param.split("=");
+                String paramName = paramElements[0];
+                if (paramElements.length == 2) {
+                    String paramValue = paramElements[1];
+                    switch (paramName) {
+                        default:
+                            logger.debug("Unknown parameter {} with value {}", paramName, paramValue);
+                    }
+                } else {
+                    logger.debug("Unknown no-value parameter {}", paramName);
+                }
+            }
+        }
+    }
+
+    @Override
+    protected void sendChannelCreatedEvent() {
+        logger.trace("Channel was created, firing ChannelCreated Event");
+        // Send an event to the pipeline telling the Protocol filters what's going on.
+        channel.pipeline().fireUserEventTriggered(new ConnectEvent());
+    }
+
+    @Override
+    public PlcField prepareField(String fieldQuery) throws PlcInvalidFieldException {
+        return AbEthField.of(fieldQuery);
+    }
+
+    @Override
+    protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
+        return new ChannelInitializer() {
+            @Override
+            protected void initChannel(Channel channel) {
+                // Build the protocol stack for communicating with the s7 protocol.
+                ChannelPipeline pipeline = channel.pipeline();
+                pipeline.addLast(new ChannelInboundHandlerAdapter() {
+                    @Override
+                    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+                        if (evt instanceof ConnectedEvent) {
+                            sessionSetupCompleteFuture.complete(null);
+                        } else {
+                            super.userEventTriggered(ctx, evt);
+                        }
+                    }
+                });
+                pipeline.addLast(new AbEthProtocol());
+                pipeline.addLast(new Plc4xAbEthProtocol(station));
+            }
+        };
+    }
+
+    @Override
+    public boolean canRead() {
+        return true;
+    }
+
+    @Override
+    public PlcReadRequest.Builder readRequestBuilder() {
+        return new DefaultPlcReadRequest.Builder(this, new AbEthFieldHandler());
+    }
+
+    @Override
+    public void close() {
+        logger.debug("Closing PlcConnection...");
+        // Close the channel gracefully
+        if ((channel != null) && channel.isOpen()) {
+            logger.debug("Channel is still connected, Closing channel...");
+            // Close the channel
+            channel.close();
+
+            // Do some additional cleanup operations ...
+            // In normal operation, the channels event loop has a parent, however when running with
+            // the embedded channel for unit tests, parent is null.
+            if (channel.eventLoop().parent() != null) {
+                logger.trace("Shutting down EventLoop gracefully...");
+                channel.eventLoop().parent().shutdownGracefully();
+                logger.trace("Eventloop is shutted down");
+            }
+        }
+        // Dereference
+        channel = null;
+        connected = false;
+    }
+
+    @Override
+    public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
+        InternalPlcReadRequest internalReadRequest = checkInternal(readRequest, InternalPlcReadRequest.class);
+        CompletableFuture<InternalPlcReadResponse> future = new CompletableFuture<>();
+        PlcRequestContainer<InternalPlcReadRequest, InternalPlcReadResponse> container =
+            new PlcRequestContainer<>(internalReadRequest, future);
+        channel.writeAndFlush(container).addListener(f -> {
+            if (!f.isSuccess()) {
+                future.completeExceptionally(f.cause());
+            }
+        });
+        return future
+            .thenApply(PlcReadResponse.class::cast);
+    }
 }
\ No newline at end of file
diff --git a/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/model/AbEthField.java b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/model/AbEthField.java
index 1aee13207fd..8cac7ab830f 100644
--- a/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/model/AbEthField.java
+++ b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/model/AbEthField.java
@@ -1,105 +1,105 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.abeth.model;
-
-import org.apache.plc4x.java.abeth.model.types.FileType;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.model.PlcField;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class AbEthField implements PlcField {
-
-    private static final Pattern ADDRESS_PATTERN =
-//        Pattern.compile("^N(?<fileNumber>\\d{1,7}):(?<elementNumber>\\d{1,7})/(?<bitNumber>\\d{1,7}):(?<dataType>[a-zA-Z_]+)(\\[(?<size>\\d+)])?");
-        Pattern.compile("^N(?<fileNumber>\\d{1,7}):(?<elementNumber>\\d{1,7})(/(?<bitNumber>\\d{1,7}))?:(?<dataType>[a-zA-Z_]+)(\\[(?<size>\\d+)])?");
-
-
-    private static final String FILE_NUMBER = "fileNumber";
-    private static final String ELEMENT_NUMBER = "elementNumber";
-//    private static final String SUB_ELEMENT_NUMBER = "subElementNumber";
-    private static final String BIT_NUMBER = "bitNumber";
-    private static final String DATA_TYPE = "dataType";
-    private static final String SIZE = "size";
-
-    private final short byteSize;
-    private final short fileNumber;
-    private final FileType fileType;
-    private final short elementNumber;
-    private final short bitNumber;
-
-    public AbEthField(short byteSize, short fileNumber, FileType fileType, short elementNumber, short bitNumber) {
-        this.byteSize = byteSize;
-        this.fileNumber = fileNumber;
-        this.fileType = fileType;
-        this.elementNumber = elementNumber;
-        this.bitNumber = bitNumber;
-    }
-
-    public short getByteSize() {
-        return byteSize;
-    }
-
-    public short getFileNumber() {
-        return fileNumber;
-    }
-
-    public FileType getFileType() {
-        return fileType;
-    }
-
-    public short getElementNumber() {
-        return elementNumber;
-    }
-
-    public short getBitNumber() {
-        return bitNumber;
-    }
-
-    public static boolean matches(String fieldString) {
-        return ADDRESS_PATTERN.matcher(fieldString).matches();
-    }
-
-    public static AbEthField of(String fieldString) {
-        Matcher matcher = ADDRESS_PATTERN.matcher(fieldString);
-        if(matcher.matches()) {
-            short fileNumber = Short.parseShort(matcher.group(FILE_NUMBER));
-            short elementNumber = Short.parseShort(matcher.group(ELEMENT_NUMBER));
-            short bitNumber = (matcher.group(BIT_NUMBER) != null) ? Short.parseShort(matcher.group(BIT_NUMBER)) : 0;  //Short.parseShort(matcher.group(BIT_NUMBER));
-            FileType fileType = FileType.valueOf(matcher.group(DATA_TYPE).toUpperCase());
-
-            short byteSize;
-            switch (fileType) {
-                case WORD:
-                case SINGLEBIT:
-                    byteSize = 2;
-                    break;
-                case DWORD:
-                    byteSize = 4;
-                    break;
-                default:
-                    byteSize = Short.parseShort(matcher.group(SIZE));
-            }
-            return new AbEthField(byteSize, fileNumber, fileType, elementNumber, bitNumber);
-        }
-        throw new PlcInvalidFieldException("Unable to parse field address: " + fieldString);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.abeth.model;
+
+import org.apache.plc4x.java.abeth.model.types.FileType;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.model.PlcField;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class AbEthField implements PlcField {
+
+    private static final Pattern ADDRESS_PATTERN =
+//        Pattern.compile("^N(?<fileNumber>\\d{1,7}):(?<elementNumber>\\d{1,7})/(?<bitNumber>\\d{1,7}):(?<dataType>[a-zA-Z_]+)(\\[(?<size>\\d+)])?");
+        Pattern.compile("^N(?<fileNumber>\\d{1,7}):(?<elementNumber>\\d{1,7})(/(?<bitNumber>\\d{1,7}))?:(?<dataType>[a-zA-Z_]+)(\\[(?<size>\\d+)])?");
+
+
+    private static final String FILE_NUMBER = "fileNumber";
+    private static final String ELEMENT_NUMBER = "elementNumber";
+//    private static final String SUB_ELEMENT_NUMBER = "subElementNumber";
+    private static final String BIT_NUMBER = "bitNumber";
+    private static final String DATA_TYPE = "dataType";
+    private static final String SIZE = "size";
+
+    private final short byteSize;
+    private final short fileNumber;
+    private final FileType fileType;
+    private final short elementNumber;
+    private final short bitNumber;
+
+    public AbEthField(short byteSize, short fileNumber, FileType fileType, short elementNumber, short bitNumber) {
+        this.byteSize = byteSize;
+        this.fileNumber = fileNumber;
+        this.fileType = fileType;
+        this.elementNumber = elementNumber;
+        this.bitNumber = bitNumber;
+    }
+
+    public short getByteSize() {
+        return byteSize;
+    }
+
+    public short getFileNumber() {
+        return fileNumber;
+    }
+
+    public FileType getFileType() {
+        return fileType;
+    }
+
+    public short getElementNumber() {
+        return elementNumber;
+    }
+
+    public short getBitNumber() {
+        return bitNumber;
+    }
+
+    public static boolean matches(String fieldString) {
+        return ADDRESS_PATTERN.matcher(fieldString).matches();
+    }
+
+    public static AbEthField of(String fieldString) {
+        Matcher matcher = ADDRESS_PATTERN.matcher(fieldString);
+        if(matcher.matches()) {
+            short fileNumber = Short.parseShort(matcher.group(FILE_NUMBER));
+            short elementNumber = Short.parseShort(matcher.group(ELEMENT_NUMBER));
+            short bitNumber = (matcher.group(BIT_NUMBER) != null) ? Short.parseShort(matcher.group(BIT_NUMBER)) : 0;  //Short.parseShort(matcher.group(BIT_NUMBER));
+            FileType fileType = FileType.valueOf(matcher.group(DATA_TYPE).toUpperCase());
+
+            short byteSize;
+            switch (fileType) {
+                case WORD:
+                case SINGLEBIT:
+                    byteSize = 2;
+                    break;
+                case DWORD:
+                    byteSize = 4;
+                    break;
+                default:
+                    byteSize = Short.parseShort(matcher.group(SIZE));
+            }
+            return new AbEthField(byteSize, fileNumber, fileType, elementNumber, bitNumber);
+        }
+        throw new PlcInvalidFieldException("Unable to parse field address: " + fieldString);
+    }
+
+}
diff --git a/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/model/types/FileType.java b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/model/types/FileType.java
index 186c5c8ec94..b73be664103 100644
--- a/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/model/types/FileType.java
+++ b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/model/types/FileType.java
@@ -1,65 +1,65 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.abeth.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public enum FileType {
-
-    HURZ((short) 0x64),
-    STATUS((short) 0x84),
-    BIT((short) 0x85),
-    TIMER((short) 0x86),
-    COUNTER((short) 0x87),
-    CONTROL((short) 0x88),
-    INTEGER((short) 0x89),
-    FLOAT((short) 0x8A),
-    OUTPUT((short) 0x8B),
-    INPUT((short) 0x8C),
-    STRING((short) 0x8D),
-    ASCII((short) 0x8E),
-    BCD((short) 0x8F),
-    WORD((short) 0x89),  // custom 2-byte Integer
-    DWORD((short) 0x89), // custom 4-byte Integer
-    SINGLEBIT((short) 0x89); // custom single bit from Integer file, no official AB type
-
-    private final short typeCode;
-
-    FileType(short typeCode) {
-        this.typeCode = typeCode;
-    }
-
-    public short getTypeCode() {
-        return typeCode;
-    }
-
-    private static final Map<Short, FileType> map;
-    static {
-        map = new HashMap<>();
-        for (FileType dataType : FileType.values()) {
-            map.put(dataType.typeCode, dataType);
-        }
-    }
-
-    public static FileType valueOf(short code) {
-        return map.get(code);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.abeth.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum FileType {
+
+    HURZ((short) 0x64),
+    STATUS((short) 0x84),
+    BIT((short) 0x85),
+    TIMER((short) 0x86),
+    COUNTER((short) 0x87),
+    CONTROL((short) 0x88),
+    INTEGER((short) 0x89),
+    FLOAT((short) 0x8A),
+    OUTPUT((short) 0x8B),
+    INPUT((short) 0x8C),
+    STRING((short) 0x8D),
+    ASCII((short) 0x8E),
+    BCD((short) 0x8F),
+    WORD((short) 0x89),  // custom 2-byte Integer
+    DWORD((short) 0x89), // custom 4-byte Integer
+    SINGLEBIT((short) 0x89); // custom single bit from Integer file, no official AB type
+
+    private final short typeCode;
+
+    FileType(short typeCode) {
+        this.typeCode = typeCode;
+    }
+
+    public short getTypeCode() {
+        return typeCode;
+    }
+
+    private static final Map<Short, FileType> map;
+    static {
+        map = new HashMap<>();
+        for (FileType dataType : FileType.values()) {
+            map.put(dataType.typeCode, dataType);
+        }
+    }
+
+    public static FileType valueOf(short code) {
+        return map.get(code);
+    }
+
+}
diff --git a/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/protocol/AbEthProtocol.java b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/protocol/AbEthProtocol.java
index d4e558508c1..9ec20d359fb 100644
--- a/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/protocol/AbEthProtocol.java
+++ b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/protocol/AbEthProtocol.java
@@ -1,61 +1,61 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.abeth.protocol;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.abeth.readwrite.CIPEncapsulationPacket;
-import org.apache.plc4x.java.abeth.readwrite.io.CIPEncapsulationPacketIO;
-import org.apache.plc4x.java.base.GeneratedDriverByteToMessageCodec;
-import org.apache.plc4x.java.utils.MessageIO;
-import org.apache.plc4x.java.utils.ParseException;
-import org.apache.plc4x.java.utils.ReadBuffer;
-import org.apache.plc4x.java.utils.WriteBuffer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AbEthProtocol extends GeneratedDriverByteToMessageCodec<CIPEncapsulationPacket> {
-
-    private static final Logger logger = LoggerFactory.getLogger(AbEthProtocol.class);
-
-    public AbEthProtocol() {
-        super(new MessageIO<CIPEncapsulationPacket, CIPEncapsulationPacket>() {
-            @Override
-            public CIPEncapsulationPacket parse(ReadBuffer io) throws ParseException {
-                return CIPEncapsulationPacketIO.parse(io);
-            }
-
-            @Override
-            public void serialize(WriteBuffer io, CIPEncapsulationPacket value) throws ParseException {
-                CIPEncapsulationPacketIO.serialize(io, value);
-            }
-        });
-        logger.trace("Created new AB-ETH protocol");
-    }
-
-    @Override
-    protected int getPacketSize(ByteBuf byteBuf) {
-        return byteBuf.readableBytes();
-    }
-
-    @Override
-    protected void removeRestOfCorruptPackage(ByteBuf byteBuf) {
-        // Nothing to do here ...
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.abeth.protocol;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.abeth.readwrite.CIPEncapsulationPacket;
+import org.apache.plc4x.java.abeth.readwrite.io.CIPEncapsulationPacketIO;
+import org.apache.plc4x.java.base.GeneratedDriverByteToMessageCodec;
+import org.apache.plc4x.java.utils.MessageIO;
+import org.apache.plc4x.java.utils.ParseException;
+import org.apache.plc4x.java.utils.ReadBuffer;
+import org.apache.plc4x.java.utils.WriteBuffer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AbEthProtocol extends GeneratedDriverByteToMessageCodec<CIPEncapsulationPacket> {
+
+    private static final Logger logger = LoggerFactory.getLogger(AbEthProtocol.class);
+
+    public AbEthProtocol() {
+        super(new MessageIO<CIPEncapsulationPacket, CIPEncapsulationPacket>() {
+            @Override
+            public CIPEncapsulationPacket parse(ReadBuffer io) throws ParseException {
+                return CIPEncapsulationPacketIO.parse(io);
+            }
+
+            @Override
+            public void serialize(WriteBuffer io, CIPEncapsulationPacket value) throws ParseException {
+                CIPEncapsulationPacketIO.serialize(io, value);
+            }
+        });
+        logger.trace("Created new AB-ETH protocol");
+    }
+
+    @Override
+    protected int getPacketSize(ByteBuf byteBuf) {
+        return byteBuf.readableBytes();
+    }
+
+    @Override
+    protected void removeRestOfCorruptPackage(ByteBuf byteBuf) {
+        // Nothing to do here ...
+    }
+
+}
diff --git a/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/protocol/Plc4xAbEthProtocol.java b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/protocol/Plc4xAbEthProtocol.java
index 8da5bb1acad..ec636e663e5 100644
--- a/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/protocol/Plc4xAbEthProtocol.java
+++ b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/protocol/Plc4xAbEthProtocol.java
@@ -1,251 +1,251 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.abeth.protocol;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.abeth.model.AbEthField;
-import org.apache.plc4x.java.abeth.readwrite.*;
-import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcRequest;
-import org.apache.plc4x.java.api.messages.PlcResponse;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.PlcMessageToMessageCodec;
-import org.apache.plc4x.java.base.events.ConnectEvent;
-import org.apache.plc4x.java.base.events.ConnectedEvent;
-import org.apache.plc4x.java.base.messages.DefaultPlcReadResponse;
-import org.apache.plc4x.java.base.messages.InternalPlcReadRequest;
-import org.apache.plc4x.java.base.messages.PlcRequestContainer;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-import org.apache.plc4x.java.base.messages.items.DefaultBooleanFieldItem;
-import org.apache.plc4x.java.base.messages.items.DefaultIntegerFieldItem;
-import org.apache.plc4x.java.base.messages.items.DefaultShortFieldItem;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class Plc4xAbEthProtocol extends PlcMessageToMessageCodec<CIPEncapsulationPacket, PlcRequestContainer> {
-
-    private static final Logger logger = LoggerFactory.getLogger(Plc4xAbEthProtocol.class);
-
-    private static final AtomicInteger transactionCounterGenerator = new AtomicInteger(10);
-    private static final short[] emptySenderContext = new short[] {(short) 0x00 ,(short) 0x00 ,(short) 0x00,
-        (short) 0x00,(short) 0x00,(short) 0x00, (short) 0x00,(short) 0x00};
-
-    private long sessionHandle;
-    private Map<Integer, PlcRequestContainer> requests;
-    private int station;
-
-    public Plc4xAbEthProtocol(int station) {
-        logger.trace("Created new instance of PLC4X-AB-ETH Protocol");
-        this.requests = new HashMap<>();
-        this.station = station;
-    }
-
-    @Override
-    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
-        logger.trace("Registered user event {}", evt);
-        // If the connection has just been established, start setting up the connection
-        // by sending a connection request to the plc.
-        if (evt instanceof ConnectEvent) {
-            logger.debug("AB-ETH Sending Connection Request");
-            // Open the session on ISO Transport Protocol first.
-            CIPEncapsulationConnectionRequest connectionRequest = new CIPEncapsulationConnectionRequest(0L, 0L,
-                emptySenderContext, 0L);
-            ctx.channel().writeAndFlush(connectionRequest);
-        } else {
-            super.userEventTriggered(ctx, evt);
-        }
-    }
-
-    @Override
-    protected void encode(ChannelHandlerContext ctx, PlcRequestContainer msg, List<Object> out) throws Exception {
-        logger.trace("Encoding {}", msg);
-        PlcRequest request = msg.getRequest();
-
-        // reset counter since two byte values are possible in DF1
-        if (transactionCounterGenerator.get() > 65000) {
-            transactionCounterGenerator.set(10);
-        }
-
-        if (request instanceof PlcReadRequest) {
-            PlcReadRequest readRequest = (PlcReadRequest) msg.getRequest();
-
-            for (String fieldName : readRequest.getFieldNames()) {
-                PlcField field = readRequest.getField(fieldName);
-                if (!(field instanceof AbEthField)) {
-                    throw new PlcProtocolException("The field should have been of type AbEthField");
-                }
-                AbEthField abEthField = (AbEthField) field;
-
-                DF1RequestProtectedTypedLogicalRead logicalRead = new DF1RequestProtectedTypedLogicalRead(
-                    abEthField.getByteSize(), abEthField.getFileNumber(), abEthField.getFileType().getTypeCode(),
-                    abEthField.getElementNumber(), (short) 0); // Subelementnumber default to zero
-                // origin/sender: constant = 5
-                DF1RequestMessage requestMessage = new DF1CommandRequestMessage(
-                    (short) station, (short) 5, (short) 0, transactionCounterGenerator.incrementAndGet(), logicalRead);
-                CIPEncapsulationReadRequest read = new CIPEncapsulationReadRequest(
-                    sessionHandle, 0, emptySenderContext, 0, requestMessage);
-
-                requests.put(requestMessage.getTransactionCounter(), msg);
-
-                out.add(read);
-            }
-        } else {
-            ctx.fireExceptionCaught(
-                new PlcProtocolException("Unsupported request type " + request.getClass().getName()));
-        }
-    }
-
-    @Override
-    protected void decode(ChannelHandlerContext ctx, CIPEncapsulationPacket packet, List<Object> out) throws Exception {
-        logger.trace("Received {}, decoding...", packet);
-        if(packet instanceof CIPEncapsulationConnectionResponse) {
-            CIPEncapsulationConnectionResponse connectionResponse = (CIPEncapsulationConnectionResponse) packet;
-            // Save the session handle
-            sessionHandle = connectionResponse.getSessionHandle();
-
-            // Tell Netty we're finished connecting
-            ctx.channel().pipeline().fireUserEventTriggered(new ConnectedEvent());
-        } else {
-            // We're currently just expecting responses.
-            if (!(packet instanceof CIPEncapsulationReadResponse)) {
-                return;
-            }
-            CIPEncapsulationReadResponse cipResponse = (CIPEncapsulationReadResponse) packet;
-            int transactionCounter = cipResponse.getResponse().getTransactionCounter();
-            if(!requests.containsKey(transactionCounter)) {
-                ctx.fireExceptionCaught(
-                    new PlcProtocolException(
-                        "Couldn't find request for response with transaction counter " + transactionCounter));
-                return;
-            }
-
-            PlcRequestContainer requestContainer = requests.remove(transactionCounter);
-            PlcRequest request = requestContainer.getRequest();
-            PlcResponse response = null;
-            if (request instanceof PlcReadRequest) {
-                response = decodeReadResponse(cipResponse, requestContainer);
-            } else {
-                ctx.fireExceptionCaught(
-                    new PlcProtocolException("Unsupported request type " + request.getClass().getName()));
-            }
-
-            // Confirm the response being handled.
-            if (response != null) {
-                requestContainer.getResponseFuture().complete(response);
-            }
-        }
-    }
-
-    private PlcResponse decodeReadResponse(
-        CIPEncapsulationReadResponse plcReadResponse, PlcRequestContainer requestContainer) {
-
-        InternalPlcReadRequest plcReadRequest = (InternalPlcReadRequest) requestContainer.getRequest();
-
-        Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> values = new HashMap<>();
-        for (String fieldName : plcReadRequest.getFieldNames()) {
-            AbEthField field = (AbEthField) plcReadRequest.getField(fieldName);
-            PlcResponseCode responseCode = decodeResponseCode(plcReadResponse.getResponse().getStatus());
-
-            BaseDefaultFieldItem fieldItem = null;
-            if (responseCode == PlcResponseCode.OK) {
-                try {
-                    switch (field.getFileType()) {
-                        case INTEGER: // output as single bytes
-                            if(plcReadResponse.getResponse() instanceof DF1CommandResponseMessageProtectedTypedLogicalRead) {
-                                DF1CommandResponseMessageProtectedTypedLogicalRead df1PTLR = (DF1CommandResponseMessageProtectedTypedLogicalRead) plcReadResponse.getResponse();
-                                short[] data = df1PTLR.getData();
-                                Short[] convData = new Short[data.length];
-                                for(int i = 0; i < data.length; i++) {
-                                    convData[i] = data[i];
-                                }
-                                fieldItem = new DefaultShortFieldItem(convData);
-                            }
-                            break;
-                        case WORD:
-                            if(plcReadResponse.getResponse() instanceof DF1CommandResponseMessageProtectedTypedLogicalRead) {
-                                DF1CommandResponseMessageProtectedTypedLogicalRead df1PTLR = (DF1CommandResponseMessageProtectedTypedLogicalRead) plcReadResponse.getResponse();
-                                short[] data = df1PTLR.getData();
-                                if (((data[1]>> 7) & 1) == 0)  {
-                                    fieldItem = new DefaultIntegerFieldItem((data[1] << 8) + data[0]);  // positive number
-                                } else {
-                                    fieldItem = new DefaultIntegerFieldItem((((~data[1] & 0b01111111) << 8) + (~(data[0]-1) & 0b11111111))  * -1);  // negative number
-                                }
-                            }
-                            break;
-                        case DWORD:
-                            if(plcReadResponse.getResponse() instanceof DF1CommandResponseMessageProtectedTypedLogicalRead) {
-                                DF1CommandResponseMessageProtectedTypedLogicalRead df1PTLR = (DF1CommandResponseMessageProtectedTypedLogicalRead) plcReadResponse.getResponse();
-                                short[] data = df1PTLR.getData();
-                                if (((data[3]>> 7) & 1) == 0)  {
-                                    fieldItem = new DefaultIntegerFieldItem((data[3] << 24) + (data[2] << 16) + (data[1] << 8) + data[0]);  // positive number
-                                } else {
-                                    fieldItem = new DefaultIntegerFieldItem((((~data[3] & 0b01111111) << 24) + ((~(data[2]-1) & 0b11111111) << 16)+ ((~(data[1]-1) & 0b11111111) << 8) + (~(data[0]-1) & 0b11111111))  * -1);  // negative number
-                                }
-                            }
-                            break;
-                        case SINGLEBIT:
-                            if(plcReadResponse.getResponse() instanceof DF1CommandResponseMessageProtectedTypedLogicalRead) {
-                                DF1CommandResponseMessageProtectedTypedLogicalRead df1PTLR = (DF1CommandResponseMessageProtectedTypedLogicalRead) plcReadResponse.getResponse();
-                                short[] data = df1PTLR.getData();
-                                if (field.getBitNumber() < 8) {
-                                    fieldItem = new DefaultBooleanFieldItem((data[0] & (1 <<  field.getBitNumber())) != 0);         // read from first byte
-                                } else {
-                                    fieldItem = new DefaultBooleanFieldItem((data[1] & (1 << (field.getBitNumber() - 8) )) != 0);   // read from second byte
-                                }
-                            }
-                            break;
-                        default:
-                            logger.warn("Problem during decoding of field {}: Decoding of file type not implemented; " +
-                                "FieldInformation: {}", fieldName, field);
-                    }
-                }
-                catch (Exception e) {
-                    logger.warn("Some other error occurred casting field {}, FieldInformation: {}",fieldName, field,e);
-                }
-            }
-            Pair<PlcResponseCode, BaseDefaultFieldItem> result = new ImmutablePair<>(responseCode, fieldItem);
-            values.put(fieldName, result);
-        }
-
-        return new DefaultPlcReadResponse(plcReadRequest, values);
-    }
-
-    private PlcResponseCode decodeResponseCode(short status) {
-        if(status == 0) {
-            return PlcResponseCode.OK;
-        }
-        return PlcResponseCode.NOT_FOUND;
-    }
-
-    private BaseDefaultFieldItem decodeReadResponseUnsignedByteField(AbEthField field, ByteBuf data) {
-        Short[] shorts = null;//readAllValues(Short.class, field, i -> data.readUnsignedByte());
-        return new DefaultShortFieldItem(shorts);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.abeth.protocol;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.abeth.model.AbEthField;
+import org.apache.plc4x.java.abeth.readwrite.*;
+import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcRequest;
+import org.apache.plc4x.java.api.messages.PlcResponse;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.PlcMessageToMessageCodec;
+import org.apache.plc4x.java.base.events.ConnectEvent;
+import org.apache.plc4x.java.base.events.ConnectedEvent;
+import org.apache.plc4x.java.base.messages.DefaultPlcReadResponse;
+import org.apache.plc4x.java.base.messages.InternalPlcReadRequest;
+import org.apache.plc4x.java.base.messages.PlcRequestContainer;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+import org.apache.plc4x.java.base.messages.items.DefaultBooleanFieldItem;
+import org.apache.plc4x.java.base.messages.items.DefaultIntegerFieldItem;
+import org.apache.plc4x.java.base.messages.items.DefaultShortFieldItem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class Plc4xAbEthProtocol extends PlcMessageToMessageCodec<CIPEncapsulationPacket, PlcRequestContainer> {
+
+    private static final Logger logger = LoggerFactory.getLogger(Plc4xAbEthProtocol.class);
+
+    private static final AtomicInteger transactionCounterGenerator = new AtomicInteger(10);
+    private static final short[] emptySenderContext = new short[] {(short) 0x00 ,(short) 0x00 ,(short) 0x00,
+        (short) 0x00,(short) 0x00,(short) 0x00, (short) 0x00,(short) 0x00};
+
+    private long sessionHandle;
+    private Map<Integer, PlcRequestContainer> requests;
+    private int station;
+
+    public Plc4xAbEthProtocol(int station) {
+        logger.trace("Created new instance of PLC4X-AB-ETH Protocol");
+        this.requests = new HashMap<>();
+        this.station = station;
+    }
+
+    @Override
+    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+        logger.trace("Registered user event {}", evt);
+        // If the connection has just been established, start setting up the connection
+        // by sending a connection request to the plc.
+        if (evt instanceof ConnectEvent) {
+            logger.debug("AB-ETH Sending Connection Request");
+            // Open the session on ISO Transport Protocol first.
+            CIPEncapsulationConnectionRequest connectionRequest = new CIPEncapsulationConnectionRequest(0L, 0L,
+                emptySenderContext, 0L);
+            ctx.channel().writeAndFlush(connectionRequest);
+        } else {
+            super.userEventTriggered(ctx, evt);
+        }
+    }
+
+    @Override
+    protected void encode(ChannelHandlerContext ctx, PlcRequestContainer msg, List<Object> out) throws Exception {
+        logger.trace("Encoding {}", msg);
+        PlcRequest request = msg.getRequest();
+
+        // reset counter since two byte values are possible in DF1
+        if (transactionCounterGenerator.get() > 65000) {
+            transactionCounterGenerator.set(10);
+        }
+
+        if (request instanceof PlcReadRequest) {
+            PlcReadRequest readRequest = (PlcReadRequest) msg.getRequest();
+
+            for (String fieldName : readRequest.getFieldNames()) {
+                PlcField field = readRequest.getField(fieldName);
+                if (!(field instanceof AbEthField)) {
+                    throw new PlcProtocolException("The field should have been of type AbEthField");
+                }
+                AbEthField abEthField = (AbEthField) field;
+
+                DF1RequestProtectedTypedLogicalRead logicalRead = new DF1RequestProtectedTypedLogicalRead(
+                    abEthField.getByteSize(), abEthField.getFileNumber(), abEthField.getFileType().getTypeCode(),
+                    abEthField.getElementNumber(), (short) 0); // Subelementnumber default to zero
+                // origin/sender: constant = 5
+                DF1RequestMessage requestMessage = new DF1CommandRequestMessage(
+                    (short) station, (short) 5, (short) 0, transactionCounterGenerator.incrementAndGet(), logicalRead);
+                CIPEncapsulationReadRequest read = new CIPEncapsulationReadRequest(
+                    sessionHandle, 0, emptySenderContext, 0, requestMessage);
+
+                requests.put(requestMessage.getTransactionCounter(), msg);
+
+                out.add(read);
+            }
+        } else {
+            ctx.fireExceptionCaught(
+                new PlcProtocolException("Unsupported request type " + request.getClass().getName()));
+        }
+    }
+
+    @Override
+    protected void decode(ChannelHandlerContext ctx, CIPEncapsulationPacket packet, List<Object> out) throws Exception {
+        logger.trace("Received {}, decoding...", packet);
+        if(packet instanceof CIPEncapsulationConnectionResponse) {
+            CIPEncapsulationConnectionResponse connectionResponse = (CIPEncapsulationConnectionResponse) packet;
+            // Save the session handle
+            sessionHandle = connectionResponse.getSessionHandle();
+
+            // Tell Netty we're finished connecting
+            ctx.channel().pipeline().fireUserEventTriggered(new ConnectedEvent());
+        } else {
+            // We're currently just expecting responses.
+            if (!(packet instanceof CIPEncapsulationReadResponse)) {
+                return;
+            }
+            CIPEncapsulationReadResponse cipResponse = (CIPEncapsulationReadResponse) packet;
+            int transactionCounter = cipResponse.getResponse().getTransactionCounter();
+            if(!requests.containsKey(transactionCounter)) {
+                ctx.fireExceptionCaught(
+                    new PlcProtocolException(
+                        "Couldn't find request for response with transaction counter " + transactionCounter));
+                return;
+            }
+
+            PlcRequestContainer requestContainer = requests.remove(transactionCounter);
+            PlcRequest request = requestContainer.getRequest();
+            PlcResponse response = null;
+            if (request instanceof PlcReadRequest) {
+                response = decodeReadResponse(cipResponse, requestContainer);
+            } else {
+                ctx.fireExceptionCaught(
+                    new PlcProtocolException("Unsupported request type " + request.getClass().getName()));
+            }
+
+            // Confirm the response being handled.
+            if (response != null) {
+                requestContainer.getResponseFuture().complete(response);
+            }
+        }
+    }
+
+    private PlcResponse decodeReadResponse(
+        CIPEncapsulationReadResponse plcReadResponse, PlcRequestContainer requestContainer) {
+
+        InternalPlcReadRequest plcReadRequest = (InternalPlcReadRequest) requestContainer.getRequest();
+
+        Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> values = new HashMap<>();
+        for (String fieldName : plcReadRequest.getFieldNames()) {
+            AbEthField field = (AbEthField) plcReadRequest.getField(fieldName);
+            PlcResponseCode responseCode = decodeResponseCode(plcReadResponse.getResponse().getStatus());
+
+            BaseDefaultFieldItem fieldItem = null;
+            if (responseCode == PlcResponseCode.OK) {
+                try {
+                    switch (field.getFileType()) {
+                        case INTEGER: // output as single bytes
+                            if(plcReadResponse.getResponse() instanceof DF1CommandResponseMessageProtectedTypedLogicalRead) {
+                                DF1CommandResponseMessageProtectedTypedLogicalRead df1PTLR = (DF1CommandResponseMessageProtectedTypedLogicalRead) plcReadResponse.getResponse();
+                                short[] data = df1PTLR.getData();
+                                Short[] convData = new Short[data.length];
+                                for(int i = 0; i < data.length; i++) {
+                                    convData[i] = data[i];
+                                }
+                                fieldItem = new DefaultShortFieldItem(convData);
+                            }
+                            break;
+                        case WORD:
+                            if(plcReadResponse.getResponse() instanceof DF1CommandResponseMessageProtectedTypedLogicalRead) {
+                                DF1CommandResponseMessageProtectedTypedLogicalRead df1PTLR = (DF1CommandResponseMessageProtectedTypedLogicalRead) plcReadResponse.getResponse();
+                                short[] data = df1PTLR.getData();
+                                if (((data[1]>> 7) & 1) == 0)  {
+                                    fieldItem = new DefaultIntegerFieldItem((data[1] << 8) + data[0]);  // positive number
+                                } else {
+                                    fieldItem = new DefaultIntegerFieldItem((((~data[1] & 0b01111111) << 8) + (~(data[0]-1) & 0b11111111))  * -1);  // negative number
+                                }
+                            }
+                            break;
+                        case DWORD:
+                            if(plcReadResponse.getResponse() instanceof DF1CommandResponseMessageProtectedTypedLogicalRead) {
+                                DF1CommandResponseMessageProtectedTypedLogicalRead df1PTLR = (DF1CommandResponseMessageProtectedTypedLogicalRead) plcReadResponse.getResponse();
+                                short[] data = df1PTLR.getData();
+                                if (((data[3]>> 7) & 1) == 0)  {
+                                    fieldItem = new DefaultIntegerFieldItem((data[3] << 24) + (data[2] << 16) + (data[1] << 8) + data[0]);  // positive number
+                                } else {
+                                    fieldItem = new DefaultIntegerFieldItem((((~data[3] & 0b01111111) << 24) + ((~(data[2]-1) & 0b11111111) << 16)+ ((~(data[1]-1) & 0b11111111) << 8) + (~(data[0]-1) & 0b11111111))  * -1);  // negative number
+                                }
+                            }
+                            break;
+                        case SINGLEBIT:
+                            if(plcReadResponse.getResponse() instanceof DF1CommandResponseMessageProtectedTypedLogicalRead) {
+                                DF1CommandResponseMessageProtectedTypedLogicalRead df1PTLR = (DF1CommandResponseMessageProtectedTypedLogicalRead) plcReadResponse.getResponse();
+                                short[] data = df1PTLR.getData();
+                                if (field.getBitNumber() < 8) {
+                                    fieldItem = new DefaultBooleanFieldItem((data[0] & (1 <<  field.getBitNumber())) != 0);         // read from first byte
+                                } else {
+                                    fieldItem = new DefaultBooleanFieldItem((data[1] & (1 << (field.getBitNumber() - 8) )) != 0);   // read from second byte
+                                }
+                            }
+                            break;
+                        default:
+                            logger.warn("Problem during decoding of field {}: Decoding of file type not implemented; " +
+                                "FieldInformation: {}", fieldName, field);
+                    }
+                }
+                catch (Exception e) {
+                    logger.warn("Some other error occurred casting field {}, FieldInformation: {}",fieldName, field,e);
+                }
+            }
+            Pair<PlcResponseCode, BaseDefaultFieldItem> result = new ImmutablePair<>(responseCode, fieldItem);
+            values.put(fieldName, result);
+        }
+
+        return new DefaultPlcReadResponse(plcReadRequest, values);
+    }
+
+    private PlcResponseCode decodeResponseCode(short status) {
+        if(status == 0) {
+            return PlcResponseCode.OK;
+        }
+        return PlcResponseCode.NOT_FOUND;
+    }
+
+    private BaseDefaultFieldItem decodeReadResponseUnsignedByteField(AbEthField field, ByteBuf data) {
+        Short[] shorts = null;//readAllValues(Short.class, field, i -> data.readUnsignedByte());
+        return new DefaultShortFieldItem(shorts);
+    }
+
+}
diff --git a/plc4j/drivers/ab-eth/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver b/plc4j/drivers/ab-eth/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
index a8f485e4d3b..8d74e44af2f 100644
--- a/plc4j/drivers/ab-eth/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
+++ b/plc4j/drivers/ab-eth/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
@@ -1,19 +1,19 @@
-#
-# 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
-#
-#   http://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.
-#
-org.apache.plc4x.java.abeth.AbEthDriver
+#
+# 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
+#
+#   http://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.
+#
+org.apache.plc4x.java.abeth.AbEthDriver
diff --git a/plc4j/drivers/ab-eth/src/test/java/org/apache/plc4x/protocol/abeth/AbEthTest.java b/plc4j/drivers/ab-eth/src/test/java/org/apache/plc4x/protocol/abeth/AbEthTest.java
index 39b275f192a..ba25e366e06 100644
--- a/plc4j/drivers/ab-eth/src/test/java/org/apache/plc4x/protocol/abeth/AbEthTest.java
+++ b/plc4j/drivers/ab-eth/src/test/java/org/apache/plc4x/protocol/abeth/AbEthTest.java
@@ -1,30 +1,30 @@
-/*
-  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
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-*/
-
-package org.apache.plc4x.protocol.abeth;
-
-import org.apache.plc4x.protocol.test.ProtocolTestsuiteRunner;
-
-public class AbEthTest extends ProtocolTestsuiteRunner {
-
-    public AbEthTest() {
-        super("/testsuite/AbEthTestsuite.xml");
-    }
-
-}
+/*
+  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
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+*/
+
+package org.apache.plc4x.protocol.abeth;
+
+import org.apache.plc4x.protocol.test.ProtocolTestsuiteRunner;
+
+public class AbEthTest extends ProtocolTestsuiteRunner {
+
+    public AbEthTest() {
+        super("/testsuite/AbEthTestsuite.xml");
+    }
+
+}
diff --git a/plc4j/drivers/ab-eth/src/test/resources/testsuite/AbEthTestsuite.xml b/plc4j/drivers/ab-eth/src/test/resources/testsuite/AbEthTestsuite.xml
index d7ab531204c..863f4a560af 100644
--- a/plc4j/drivers/ab-eth/src/test/resources/testsuite/AbEthTestsuite.xml
+++ b/plc4j/drivers/ab-eth/src/test/resources/testsuite/AbEthTestsuite.xml
@@ -1,162 +1,162 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<test:testsuite xmlns:test="https://plc4x.apache.org/schemas/testsuite.xsd"
-                bigEndian="false">
-
-  <name>Allen-Bradley ETH</name>
-
-  <testcase>
-    <name>Connection Request</name>
-    <raw>01010000000000000000000000040005000000000000000000000000</raw>
-    <root-type>CIPEncapsulationPacket</root-type>
-    <xml>
-      <CIPEncapsulationConnectionRequest className="org.apache.plc4x.java.abeth.readwrite.CIPEncapsulationConnectionRequest">
-        <sessionHandle>0</sessionHandle>
-        <status>0</status>
-        <senderContext>
-          <senderContext>0</senderContext>
-          <senderContext>4</senderContext>
-          <senderContext>0</senderContext>
-          <senderContext>5</senderContext>
-          <senderContext>0</senderContext>
-          <senderContext>0</senderContext>
-          <senderContext>0</senderContext>
-          <senderContext>0</senderContext>
-        </senderContext>
-        <options>0</options>
-      </CIPEncapsulationConnectionRequest>
-    </xml>
-  </testcase>
-
-  <testcase>
-    <name>Connection Response</name>
-    <raw>02010000000003320000000000040005000000000000000000000000</raw>
-    <root-type>CIPEncapsulationPacket</root-type>
-    <xml>
-      <CIPEncapsulationConnectionResponse className="org.apache.plc4x.java.abeth.readwrite.CIPEncapsulationConnectionResponse">
-        <sessionHandle>818</sessionHandle>
-        <status>0</status>
-        <senderContext>
-          <senderContext>0</senderContext>
-          <senderContext>4</senderContext>
-          <senderContext>0</senderContext>
-          <senderContext>5</senderContext>
-          <senderContext>0</senderContext>
-          <senderContext>0</senderContext>
-          <senderContext>0</senderContext>
-          <senderContext>0</senderContext>
-        </senderContext>
-        <options>0</options>
-      </CIPEncapsulationConnectionResponse>
-    </xml>
-  </testcase>
-
-  <testcase>
-    <name>Protected Typed Logical Read Request</name>
-    <raw>0107000e000003320000000040000000000000000000000000000000080500000f000401a21800640000</raw>
-    <root-type>CIPEncapsulationPacket</root-type>
-    <xml>
-      <CIPEncapsulationReadRequest className="org.apache.plc4x.java.abeth.readwrite.CIPEncapsulationReadRequest">
-        <sessionHandle>818</sessionHandle>
-        <status>0</status>
-        <senderContext>
-          <senderContext>64</senderContext>
-          <senderContext>0</senderContext>
-          <senderContext>0</senderContext>
-          <senderContext>0</senderContext>
-          <senderContext>0</senderContext>
-          <senderContext>0</senderContext>
-          <senderContext>0</senderContext>
-          <senderContext>0</senderContext>
-        </senderContext>
-        <options>0</options>
-        <request className="org.apache.plc4x.java.abeth.readwrite.DF1CommandRequestMessage">
-          <destinationAddress>8</destinationAddress>
-          <sourceAddress>5</sourceAddress>
-          <status>0</status>
-          <transactionCounter>1025</transactionCounter>
-          <command className="org.apache.plc4x.java.abeth.readwrite.DF1RequestProtectedTypedLogicalRead">
-            <byteSize>24</byteSize>
-            <fileNumber>0</fileNumber>
-            <fileType>100</fileType>
-            <elementNumber>0</elementNumber>
-            <subElementNumber>0</subElementNumber>
-          </command>
-        </request>
-      </CIPEncapsulationReadRequest>
-    </xml>
-  </testcase>
-
-  <testcase>
-    <name>Protected Typed Logical Read Response</name>
-    <raw>02070020000003320000000040000000000000000000000000000000000508004f000401910101000900040405001f02010003000404050000024000</raw>
-    <root-type>CIPEncapsulationPacket</root-type>
-    <xml>
-      <CIPEncapsulationReadResponse className="org.apache.plc4x.java.abeth.readwrite.CIPEncapsulationReadResponse">
-        <sessionHandle>818</sessionHandle>
-        <status>0</status>
-        <senderContext>
-          <senderContext>64</senderContext>
-          <senderContext>0</senderContext>
-          <senderContext>0</senderContext>
-          <senderContext>0</senderContext>
-          <senderContext>0</senderContext>
-          <senderContext>0</senderContext>
-          <senderContext>0</senderContext>
-          <senderContext>0</senderContext>
-        </senderContext>
-        <options>0</options>
-        <response className="org.apache.plc4x.java.abeth.readwrite.DF1CommandResponseMessageProtectedTypedLogicalRead">
-          <destinationAddress>5</destinationAddress>
-          <sourceAddress>8</sourceAddress>
-          <status>0</status>
-          <transactionCounter>1025</transactionCounter>
-          <data>
-            <data>145</data>
-            <data>1</data>
-            <data>1</data>
-            <data>0</data>
-            <data>9</data>
-            <data>0</data>
-            <data>4</data>
-            <data>4</data>
-            <data>5</data>
-            <data>0</data>
-            <data>31</data>
-            <data>2</data>
-            <data>1</data>
-            <data>0</data>
-            <data>3</data>
-            <data>0</data>
-            <data>4</data>
-            <data>4</data>
-            <data>5</data>
-            <data>0</data>
-            <data>0</data>
-            <data>2</data>
-            <data>64</data>
-            <data>0</data>
-          </data>
-        </response>
-      </CIPEncapsulationReadResponse>
-    </xml>
-  </testcase>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<test:testsuite xmlns:test="https://plc4x.apache.org/schemas/testsuite.xsd"
+                bigEndian="false">
+
+  <name>Allen-Bradley ETH</name>
+
+  <testcase>
+    <name>Connection Request</name>
+    <raw>01010000000000000000000000040005000000000000000000000000</raw>
+    <root-type>CIPEncapsulationPacket</root-type>
+    <xml>
+      <CIPEncapsulationConnectionRequest className="org.apache.plc4x.java.abeth.readwrite.CIPEncapsulationConnectionRequest">
+        <sessionHandle>0</sessionHandle>
+        <status>0</status>
+        <senderContext>
+          <senderContext>0</senderContext>
+          <senderContext>4</senderContext>
+          <senderContext>0</senderContext>
+          <senderContext>5</senderContext>
+          <senderContext>0</senderContext>
+          <senderContext>0</senderContext>
+          <senderContext>0</senderContext>
+          <senderContext>0</senderContext>
+        </senderContext>
+        <options>0</options>
+      </CIPEncapsulationConnectionRequest>
+    </xml>
+  </testcase>
+
+  <testcase>
+    <name>Connection Response</name>
+    <raw>02010000000003320000000000040005000000000000000000000000</raw>
+    <root-type>CIPEncapsulationPacket</root-type>
+    <xml>
+      <CIPEncapsulationConnectionResponse className="org.apache.plc4x.java.abeth.readwrite.CIPEncapsulationConnectionResponse">
+        <sessionHandle>818</sessionHandle>
+        <status>0</status>
+        <senderContext>
+          <senderContext>0</senderContext>
+          <senderContext>4</senderContext>
+          <senderContext>0</senderContext>
+          <senderContext>5</senderContext>
+          <senderContext>0</senderContext>
+          <senderContext>0</senderContext>
+          <senderContext>0</senderContext>
+          <senderContext>0</senderContext>
+        </senderContext>
+        <options>0</options>
+      </CIPEncapsulationConnectionResponse>
+    </xml>
+  </testcase>
+
+  <testcase>
+    <name>Protected Typed Logical Read Request</name>
+    <raw>0107000e000003320000000040000000000000000000000000000000080500000f000401a21800640000</raw>
+    <root-type>CIPEncapsulationPacket</root-type>
+    <xml>
+      <CIPEncapsulationReadRequest className="org.apache.plc4x.java.abeth.readwrite.CIPEncapsulationReadRequest">
+        <sessionHandle>818</sessionHandle>
+        <status>0</status>
+        <senderContext>
+          <senderContext>64</senderContext>
+          <senderContext>0</senderContext>
+          <senderContext>0</senderContext>
+          <senderContext>0</senderContext>
+          <senderContext>0</senderContext>
+          <senderContext>0</senderContext>
+          <senderContext>0</senderContext>
+          <senderContext>0</senderContext>
+        </senderContext>
+        <options>0</options>
+        <request className="org.apache.plc4x.java.abeth.readwrite.DF1CommandRequestMessage">
+          <destinationAddress>8</destinationAddress>
+          <sourceAddress>5</sourceAddress>
+          <status>0</status>
+          <transactionCounter>1025</transactionCounter>
+          <command className="org.apache.plc4x.java.abeth.readwrite.DF1RequestProtectedTypedLogicalRead">
+            <byteSize>24</byteSize>
+            <fileNumber>0</fileNumber>
+            <fileType>100</fileType>
+            <elementNumber>0</elementNumber>
+            <subElementNumber>0</subElementNumber>
+          </command>
+        </request>
+      </CIPEncapsulationReadRequest>
+    </xml>
+  </testcase>
+
+  <testcase>
+    <name>Protected Typed Logical Read Response</name>
+    <raw>02070020000003320000000040000000000000000000000000000000000508004f000401910101000900040405001f02010003000404050000024000</raw>
+    <root-type>CIPEncapsulationPacket</root-type>
+    <xml>
+      <CIPEncapsulationReadResponse className="org.apache.plc4x.java.abeth.readwrite.CIPEncapsulationReadResponse">
+        <sessionHandle>818</sessionHandle>
+        <status>0</status>
+        <senderContext>
+          <senderContext>64</senderContext>
+          <senderContext>0</senderContext>
+          <senderContext>0</senderContext>
+          <senderContext>0</senderContext>
+          <senderContext>0</senderContext>
+          <senderContext>0</senderContext>
+          <senderContext>0</senderContext>
+          <senderContext>0</senderContext>
+        </senderContext>
+        <options>0</options>
+        <response className="org.apache.plc4x.java.abeth.readwrite.DF1CommandResponseMessageProtectedTypedLogicalRead">
+          <destinationAddress>5</destinationAddress>
+          <sourceAddress>8</sourceAddress>
+          <status>0</status>
+          <transactionCounter>1025</transactionCounter>
+          <data>
+            <data>145</data>
+            <data>1</data>
+            <data>1</data>
+            <data>0</data>
+            <data>9</data>
+            <data>0</data>
+            <data>4</data>
+            <data>4</data>
+            <data>5</data>
+            <data>0</data>
+            <data>31</data>
+            <data>2</data>
+            <data>1</data>
+            <data>0</data>
+            <data>3</data>
+            <data>0</data>
+            <data>4</data>
+            <data>4</data>
+            <data>5</data>
+            <data>0</data>
+            <data>0</data>
+            <data>2</data>
+            <data>64</data>
+            <data>0</data>
+          </data>
+        </response>
+      </CIPEncapsulationReadResponse>
+    </xml>
+  </testcase>
+
 </test:testsuite>
\ No newline at end of file
diff --git a/plc4j/drivers/ads/pom.xml b/plc4j/drivers/ads/pom.xml
index 31fafc49962..1c88501f973 100644
--- a/plc4j/drivers/ads/pom.xml
+++ b/plc4j/drivers/ads/pom.xml
@@ -1,109 +1,109 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-drivers</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-driver-ads</artifactId>
-  <name>PLC4J: Driver: ADS</name>
-  <description>Implementation of a PLC4X driver able to speak with Beckhoff devices using the ADS protocol.</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-ads</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base-tcp</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base-serial</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-buffer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-common</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-configuration2</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base-test</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-utils-test-utils</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>osgi.cmpn</artifactId>
-      <version>6.0.0</version>
-      <scope>provided</scope>
-    </dependency>
- </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-drivers</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-driver-ads</artifactId>
+  <name>PLC4J: Driver: ADS</name>
+  <description>Implementation of a PLC4X driver able to speak with Beckhoff devices using the ADS protocol.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-ads</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base-tcp</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base-serial</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-common</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-configuration2</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base-test</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-utils-test-utils</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>osgi.cmpn</artifactId>
+      <version>6.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+ </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/AdsPlcDriver.java b/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/AdsPlcDriver.java
index e6f3c345077..ab4d853537e 100644
--- a/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/AdsPlcDriver.java
+++ b/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/AdsPlcDriver.java
@@ -1,108 +1,108 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.connection.AdsConnectionFactory;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.spi.PlcDriver;
-import org.osgi.service.component.annotations.Component;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Implementation of the ADS protocol, based on:
- * - ADS Protocol
- * - TCP
- * - Serial
- */
-@Component(service = PlcDriver.class, immediate = true)
-public class AdsPlcDriver implements PlcDriver {
-
-    public static final Pattern ADS_ADDRESS_PATTERN =
-        Pattern.compile("(?<targetAmsNetId>" + AmsNetId.AMS_NET_ID_PATTERN + "):(?<targetAmsPort>" + AmsPort.AMS_PORT_PATTERN + ")"
-            + "(/"
-            + "(?<sourceAmsNetId>" + AmsNetId.AMS_NET_ID_PATTERN + "):(?<sourceAmsPort>" + AmsPort.AMS_PORT_PATTERN + ")"
-            + ")?");
-    public static final Pattern INET_ADDRESS_PATTERN = Pattern.compile("tcp://(?<host>[\\w.]+)(:(?<port>\\d*))?");
-    public static final Pattern SERIAL_PATTERN = Pattern.compile("serial://(?<serialDefinition>((?!/\\d).)*)");
-    public static final Pattern ADS_URI_PATTERN = Pattern.compile("^ads:(" + INET_ADDRESS_PATTERN + "|" + SERIAL_PATTERN + ")/" + ADS_ADDRESS_PATTERN + "(\\?.*)?");
-
-    private AdsConnectionFactory adsConnectionFactory;
-
-    public AdsPlcDriver() {
-        this.adsConnectionFactory = new AdsConnectionFactory();
-    }
-
-    public AdsPlcDriver(AdsConnectionFactory adsConnectionFactory) {
-        this.adsConnectionFactory = adsConnectionFactory;
-    }
-
-    @Override
-    public String getProtocolCode() {
-        return "ads";
-    }
-
-    @Override
-    public String getProtocolName() {
-        return "Beckhoff Twincat ADS";
-    }
-
-    @Override
-    public PlcConnection connect(String url) throws PlcConnectionException {
-        Matcher matcher = ADS_URI_PATTERN.matcher(url);
-        if (!matcher.matches()) {
-            throw new PlcConnectionException(
-                "Connection url " + url + " doesn't match 'ads://{{host|ip}|serial:definition}/{targetAmsNetId}:{targetAmsPort}/{sourceAmsNetId}:{sourceAmsPort}' RAW:" + ADS_URI_PATTERN);
-        }
-        String host = matcher.group("host");
-        String serialDefinition = matcher.group("serialDefinition");
-        String portString = matcher.group("port");
-        Integer port = StringUtils.isNotBlank(portString) ? Integer.parseInt(portString) : null;
-        AmsNetId targetAmsNetId = AmsNetId.of(matcher.group("targetAmsNetId"));
-        AmsPort targetAmsPort = AmsPort.of(matcher.group("targetAmsPort"));
-        String sourceAmsNetIdString = matcher.group("sourceAmsNetId");
-        AmsNetId sourceAmsNetId = StringUtils.isNotBlank(sourceAmsNetIdString) ? AmsNetId.of(sourceAmsNetIdString) : null;
-        String sourceAmsPortString = matcher.group("sourceAmsPort");
-        AmsPort sourceAmsPort = StringUtils.isNotBlank(sourceAmsPortString) ? AmsPort.of(sourceAmsPortString) : null;
-
-        if (serialDefinition != null) {
-            return adsConnectionFactory.adsSerialPlcConnectionOf(serialDefinition, targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
-        } else {
-            try {
-                return adsConnectionFactory.adsTcpPlcConnectionOf(InetAddress.getByName(host), port, targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
-            } catch (UnknownHostException e) {
-                throw new PlcConnectionException(e);
-            }
-        }
-    }
-
-    @Override
-    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
-        throw new PlcConnectionException("Basic ADS connections don't support authentication.");
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.connection.AdsConnectionFactory;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.authentication.PlcAuthentication;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.spi.PlcDriver;
+import org.osgi.service.component.annotations.Component;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Implementation of the ADS protocol, based on:
+ * - ADS Protocol
+ * - TCP
+ * - Serial
+ */
+@Component(service = PlcDriver.class, immediate = true)
+public class AdsPlcDriver implements PlcDriver {
+
+    public static final Pattern ADS_ADDRESS_PATTERN =
+        Pattern.compile("(?<targetAmsNetId>" + AmsNetId.AMS_NET_ID_PATTERN + "):(?<targetAmsPort>" + AmsPort.AMS_PORT_PATTERN + ")"
+            + "(/"
+            + "(?<sourceAmsNetId>" + AmsNetId.AMS_NET_ID_PATTERN + "):(?<sourceAmsPort>" + AmsPort.AMS_PORT_PATTERN + ")"
+            + ")?");
+    public static final Pattern INET_ADDRESS_PATTERN = Pattern.compile("tcp://(?<host>[\\w.]+)(:(?<port>\\d*))?");
+    public static final Pattern SERIAL_PATTERN = Pattern.compile("serial://(?<serialDefinition>((?!/\\d).)*)");
+    public static final Pattern ADS_URI_PATTERN = Pattern.compile("^ads:(" + INET_ADDRESS_PATTERN + "|" + SERIAL_PATTERN + ")/" + ADS_ADDRESS_PATTERN + "(\\?.*)?");
+
+    private AdsConnectionFactory adsConnectionFactory;
+
+    public AdsPlcDriver() {
+        this.adsConnectionFactory = new AdsConnectionFactory();
+    }
+
+    public AdsPlcDriver(AdsConnectionFactory adsConnectionFactory) {
+        this.adsConnectionFactory = adsConnectionFactory;
+    }
+
+    @Override
+    public String getProtocolCode() {
+        return "ads";
+    }
+
+    @Override
+    public String getProtocolName() {
+        return "Beckhoff Twincat ADS";
+    }
+
+    @Override
+    public PlcConnection connect(String url) throws PlcConnectionException {
+        Matcher matcher = ADS_URI_PATTERN.matcher(url);
+        if (!matcher.matches()) {
+            throw new PlcConnectionException(
+                "Connection url " + url + " doesn't match 'ads://{{host|ip}|serial:definition}/{targetAmsNetId}:{targetAmsPort}/{sourceAmsNetId}:{sourceAmsPort}' RAW:" + ADS_URI_PATTERN);
+        }
+        String host = matcher.group("host");
+        String serialDefinition = matcher.group("serialDefinition");
+        String portString = matcher.group("port");
+        Integer port = StringUtils.isNotBlank(portString) ? Integer.parseInt(portString) : null;
+        AmsNetId targetAmsNetId = AmsNetId.of(matcher.group("targetAmsNetId"));
+        AmsPort targetAmsPort = AmsPort.of(matcher.group("targetAmsPort"));
+        String sourceAmsNetIdString = matcher.group("sourceAmsNetId");
+        AmsNetId sourceAmsNetId = StringUtils.isNotBlank(sourceAmsNetIdString) ? AmsNetId.of(sourceAmsNetIdString) : null;
+        String sourceAmsPortString = matcher.group("sourceAmsPort");
+        AmsPort sourceAmsPort = StringUtils.isNotBlank(sourceAmsPortString) ? AmsPort.of(sourceAmsPortString) : null;
+
+        if (serialDefinition != null) {
+            return adsConnectionFactory.adsSerialPlcConnectionOf(serialDefinition, targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
+        } else {
+            try {
+                return adsConnectionFactory.adsTcpPlcConnectionOf(InetAddress.getByName(host), port, targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
+            } catch (UnknownHostException e) {
+                throw new PlcConnectionException(e);
+            }
+        }
+    }
+
+    @Override
+    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
+        throw new PlcConnectionException("Basic ADS connections don't support authentication.");
+    }
+
+}
diff --git a/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java b/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java
index bce172e9675..494a802b120 100644
--- a/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java
+++ b/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java
@@ -1,249 +1,249 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.connection;
-
-import io.netty.channel.ChannelFuture;
-import org.apache.commons.configuration2.Configuration;
-import org.apache.commons.configuration2.SystemConfiguration;
-import org.apache.plc4x.java.ads.api.commands.AdsReadWriteRequest;
-import org.apache.plc4x.java.ads.api.commands.AdsReadWriteResponse;
-import org.apache.plc4x.java.ads.api.commands.AdsWriteRequest;
-import org.apache.plc4x.java.ads.api.commands.types.*;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-import org.apache.plc4x.java.ads.model.AdsPlcFieldHandler;
-import org.apache.plc4x.java.ads.model.DirectAdsField;
-import org.apache.plc4x.java.ads.model.SymbolicAdsField;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.messages.*;
-import org.apache.plc4x.java.base.connection.ChannelFactory;
-import org.apache.plc4x.java.base.connection.NettyPlcConnection;
-import org.apache.plc4x.java.base.messages.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.*;
-
-public abstract class AdsAbstractPlcConnection extends NettyPlcConnection implements PlcReader, PlcWriter, PlcProprietarySender {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(AdsAbstractPlcConnection.class);
-
-    protected static final Configuration CONF = new SystemConfiguration();
-    protected static final long SYMBOL_RESOLVE_TIMEOUT = CONF.getLong("plc4x.adsconnection.symbol.resolve,timeout", 3000);
-
-    protected final AmsNetId targetAmsNetId;
-
-    protected final AmsPort targetAmsPort;
-
-    protected final AmsNetId sourceAmsNetId;
-
-    protected final AmsPort sourceAmsPort;
-
-    protected final ConcurrentMap<SymbolicAdsField, DirectAdsField> fieldMapping;
-
-    protected AdsAbstractPlcConnection(ChannelFactory channelFactory, AmsNetId targetAmsNetId, AmsPort targetAmsPort) {
-        this(channelFactory, targetAmsNetId, targetAmsPort, generateAMSNetId(), generateAMSPort());
-    }
-
-    protected AdsAbstractPlcConnection(ChannelFactory channelFactory, AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort) {
-        super(channelFactory);
-        this.targetAmsNetId = targetAmsNetId;
-        this.targetAmsPort = targetAmsPort;
-        this.sourceAmsNetId = sourceAmsNetId;
-        this.sourceAmsPort = sourceAmsPort;
-        this.fieldMapping = new ConcurrentHashMap<>();
-    }
-
-    public AmsNetId getTargetAmsNetId() {
-        return targetAmsNetId;
-    }
-
-    public AmsPort getTargetAmsPort() {
-        return targetAmsPort;
-    }
-
-    public AmsNetId getSourceAmsNetId() {
-        return sourceAmsNetId;
-    }
-
-    public AmsPort getSourceAmsPort() {
-        return sourceAmsPort;
-    }
-
-    @Override
-    public boolean canRead() {
-        return true;
-    }
-
-    @Override
-    public boolean canWrite() {
-        return true;
-    }
-
-    @Override
-    public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
-        mapFields(readRequest);
-        CompletableFuture<InternalPlcReadResponse> readFuture = new CompletableFuture<>();
-        ChannelFuture channelFuture = channel.writeAndFlush(new PlcRequestContainer<>((InternalPlcReadRequest) readRequest, readFuture));
-        channelFuture.addListener(future -> {
-            if (!future.isSuccess()) {
-                readFuture.completeExceptionally(future.cause());
-            }
-        });
-        return readFuture
-            .thenApply(PlcReadResponse.class::cast);
-    }
-
-    @Override
-    public PlcReadRequest.Builder readRequestBuilder() {
-        return new DefaultPlcReadRequest.Builder(this, new AdsPlcFieldHandler());
-    }
-
-    @Override
-    public PlcWriteRequest.Builder writeRequestBuilder() {
-        return new DefaultPlcWriteRequest.Builder(this, new AdsPlcFieldHandler());
-    }
-
-    @Override
-    public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
-        mapFields(writeRequest);
-        CompletableFuture<InternalPlcWriteResponse> writeFuture = new CompletableFuture<>();
-        ChannelFuture channelFuture = channel.writeAndFlush(new PlcRequestContainer<>((InternalPlcWriteRequest) writeRequest, writeFuture));
-        channelFuture.addListener(future -> {
-            if (!future.isSuccess()) {
-                writeFuture.completeExceptionally(future.cause());
-            }
-        });
-        return writeFuture
-            .thenApply(PlcWriteResponse.class::cast);
-    }
-
-    @Override
-    public <T> CompletableFuture<PlcProprietaryResponse<T>> send(PlcProprietaryRequest proprietaryRequest) {
-        CompletableFuture<InternalPlcProprietaryResponse<T>> sendFuture = new CompletableFuture<>();
-        ChannelFuture channelFuture = channel.writeAndFlush(new PlcRequestContainer<>((InternalPlcProprietaryRequest) proprietaryRequest, sendFuture));
-        channelFuture.addListener(future -> {
-            if (!future.isSuccess()) {
-                sendFuture.completeExceptionally(future.cause());
-            }
-        });
-        return sendFuture
-            .thenApply(PlcProprietaryResponse.class::cast);
-    }
-
-    protected void mapFields(PlcFieldRequest request) {
-        request.getFields().stream()
-            .parallel()
-            .filter(SymbolicAdsField.class::isInstance)
-            .map(SymbolicAdsField.class::cast)
-            .forEach(this::mapFields);
-    }
-
-    protected void mapFields(SymbolicAdsField symbolicAdsField) {
-        // If the map doesn't contain an entry for the given symbolicAdsField,
-        // resolve it and add it to the map.
-        fieldMapping.computeIfAbsent(symbolicAdsField, symbolicAdsFieldInternal -> {
-            LOGGER.debug("Resolving {}", symbolicAdsFieldInternal);
-            AdsReadWriteRequest adsReadWriteRequest = AdsReadWriteRequest.of(
-                targetAmsNetId,
-                targetAmsPort,
-                sourceAmsNetId,
-                sourceAmsPort,
-                Invoke.NONE,
-                IndexGroup.ReservedGroups.ADSIGRP_SYM_HNDBYNAME,
-                IndexOffset.NONE,
-                ReadLength.of(IndexOffset.NUM_BYTES),
-                Data.of(symbolicAdsFieldInternal.getSymbolicField())
-            );
-
-            // TODO: This is blocking, should be changed to be async.
-            CompletableFuture<InternalPlcProprietaryResponse<AdsReadWriteResponse>> getHandelFuture = new CompletableFuture<>();
-            channel.writeAndFlush(new PlcRequestContainer<>(new DefaultPlcProprietaryRequest<>(adsReadWriteRequest), getHandelFuture));
-            InternalPlcProprietaryResponse<AdsReadWriteResponse> getHandleResponse = getFromFuture(getHandelFuture, SYMBOL_RESOLVE_TIMEOUT);
-            AdsReadWriteResponse response = getHandleResponse.getResponse();
-
-            if (response.getResult().toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-                throw new PlcRuntimeException("Non error code received " + response.getResult());
-            }
-
-            IndexOffset symbolHandle = IndexOffset.of(response.getData().getBytes());
-            return DirectAdsField.of(IndexGroup.ReservedGroups.ADSIGRP_SYM_VALBYHND.getAsLong(), symbolHandle.getAsLong(), symbolicAdsFieldInternal.getAdsDataType(), symbolicAdsFieldInternal.getNumberOfElements());
-        });
-    }
-
-    protected static AmsNetId generateAMSNetId() {
-        return AmsNetId.of("0.0.0.0.0.0");
-    }
-
-    protected static AmsPort generateAMSPort() {
-        return AmsPort.of(0);
-    }
-
-    @Override
-    public void close() throws PlcConnectionException {
-        fieldMapping.values().stream()
-            .parallel()
-            .map(adsField -> AdsWriteRequest.of(
-                targetAmsNetId,
-                targetAmsPort,
-                sourceAmsNetId,
-                sourceAmsPort,
-                Invoke.NONE,
-                IndexGroup.ReservedGroups.ADSIGRP_SYM_RELEASEHND,
-                IndexOffset.NONE,
-                Data.of(IndexGroup.of(adsField.getIndexGroup()).getBytes())
-            ))
-            .map(adsWriteRequest -> new PlcRequestContainer<>(new DefaultPlcProprietaryRequest<>(adsWriteRequest), new CompletableFuture<>()))
-            // We don't need a response so we just supply a throw away future.
-            .forEach(channel::write);
-        channel.flush();
-        super.close();
-    }
-
-    /**
-     * Clears the fieldMapping.
-     */
-    public void clearMapping() {
-        fieldMapping.clear();
-    }
-
-    protected <T> T getFromFuture(CompletableFuture<T> future, long timeout) {
-        try {
-            return future.get(timeout, TimeUnit.MILLISECONDS);
-        } catch (InterruptedException e) {
-            LOGGER.warn("Interrupted!", e);
-            Thread.currentThread().interrupt();
-            throw new PlcRuntimeException(e);
-        } catch (ExecutionException | TimeoutException e) {
-            throw new PlcRuntimeException(e);
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "AdsAbstractPlcConnection{" +
-            "targetAmsNetId=" + targetAmsNetId +
-            ", targetAmsPort=" + targetAmsPort +
-            ", sourceAmsNetId=" + sourceAmsNetId +
-            ", sourceAmsPort=" + sourceAmsPort +
-            "} " + super.toString();
-    }
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.connection;
+
+import io.netty.channel.ChannelFuture;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.SystemConfiguration;
+import org.apache.plc4x.java.ads.api.commands.AdsReadWriteRequest;
+import org.apache.plc4x.java.ads.api.commands.AdsReadWriteResponse;
+import org.apache.plc4x.java.ads.api.commands.AdsWriteRequest;
+import org.apache.plc4x.java.ads.api.commands.types.*;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+import org.apache.plc4x.java.ads.model.AdsPlcFieldHandler;
+import org.apache.plc4x.java.ads.model.DirectAdsField;
+import org.apache.plc4x.java.ads.model.SymbolicAdsField;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.messages.*;
+import org.apache.plc4x.java.base.connection.ChannelFactory;
+import org.apache.plc4x.java.base.connection.NettyPlcConnection;
+import org.apache.plc4x.java.base.messages.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.*;
+
+public abstract class AdsAbstractPlcConnection extends NettyPlcConnection implements PlcReader, PlcWriter, PlcProprietarySender {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(AdsAbstractPlcConnection.class);
+
+    protected static final Configuration CONF = new SystemConfiguration();
+    protected static final long SYMBOL_RESOLVE_TIMEOUT = CONF.getLong("plc4x.adsconnection.symbol.resolve,timeout", 3000);
+
+    protected final AmsNetId targetAmsNetId;
+
+    protected final AmsPort targetAmsPort;
+
+    protected final AmsNetId sourceAmsNetId;
+
+    protected final AmsPort sourceAmsPort;
+
+    protected final ConcurrentMap<SymbolicAdsField, DirectAdsField> fieldMapping;
+
+    protected AdsAbstractPlcConnection(ChannelFactory channelFactory, AmsNetId targetAmsNetId, AmsPort targetAmsPort) {
+        this(channelFactory, targetAmsNetId, targetAmsPort, generateAMSNetId(), generateAMSPort());
+    }
+
+    protected AdsAbstractPlcConnection(ChannelFactory channelFactory, AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort) {
+        super(channelFactory);
+        this.targetAmsNetId = targetAmsNetId;
+        this.targetAmsPort = targetAmsPort;
+        this.sourceAmsNetId = sourceAmsNetId;
+        this.sourceAmsPort = sourceAmsPort;
+        this.fieldMapping = new ConcurrentHashMap<>();
+    }
+
+    public AmsNetId getTargetAmsNetId() {
+        return targetAmsNetId;
+    }
+
+    public AmsPort getTargetAmsPort() {
+        return targetAmsPort;
+    }
+
+    public AmsNetId getSourceAmsNetId() {
+        return sourceAmsNetId;
+    }
+
+    public AmsPort getSourceAmsPort() {
+        return sourceAmsPort;
+    }
+
+    @Override
+    public boolean canRead() {
+        return true;
+    }
+
+    @Override
+    public boolean canWrite() {
+        return true;
+    }
+
+    @Override
+    public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
+        mapFields(readRequest);
+        CompletableFuture<InternalPlcReadResponse> readFuture = new CompletableFuture<>();
+        ChannelFuture channelFuture = channel.writeAndFlush(new PlcRequestContainer<>((InternalPlcReadRequest) readRequest, readFuture));
+        channelFuture.addListener(future -> {
+            if (!future.isSuccess()) {
+                readFuture.completeExceptionally(future.cause());
+            }
+        });
+        return readFuture
+            .thenApply(PlcReadResponse.class::cast);
+    }
+
+    @Override
+    public PlcReadRequest.Builder readRequestBuilder() {
+        return new DefaultPlcReadRequest.Builder(this, new AdsPlcFieldHandler());
+    }
+
+    @Override
+    public PlcWriteRequest.Builder writeRequestBuilder() {
+        return new DefaultPlcWriteRequest.Builder(this, new AdsPlcFieldHandler());
+    }
+
+    @Override
+    public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
+        mapFields(writeRequest);
+        CompletableFuture<InternalPlcWriteResponse> writeFuture = new CompletableFuture<>();
+        ChannelFuture channelFuture = channel.writeAndFlush(new PlcRequestContainer<>((InternalPlcWriteRequest) writeRequest, writeFuture));
+        channelFuture.addListener(future -> {
+            if (!future.isSuccess()) {
+                writeFuture.completeExceptionally(future.cause());
+            }
+        });
+        return writeFuture
+            .thenApply(PlcWriteResponse.class::cast);
+    }
+
+    @Override
+    public <T> CompletableFuture<PlcProprietaryResponse<T>> send(PlcProprietaryRequest proprietaryRequest) {
+        CompletableFuture<InternalPlcProprietaryResponse<T>> sendFuture = new CompletableFuture<>();
+        ChannelFuture channelFuture = channel.writeAndFlush(new PlcRequestContainer<>((InternalPlcProprietaryRequest) proprietaryRequest, sendFuture));
+        channelFuture.addListener(future -> {
+            if (!future.isSuccess()) {
+                sendFuture.completeExceptionally(future.cause());
+            }
+        });
+        return sendFuture
+            .thenApply(PlcProprietaryResponse.class::cast);
+    }
+
+    protected void mapFields(PlcFieldRequest request) {
+        request.getFields().stream()
+            .parallel()
+            .filter(SymbolicAdsField.class::isInstance)
+            .map(SymbolicAdsField.class::cast)
+            .forEach(this::mapFields);
+    }
+
+    protected void mapFields(SymbolicAdsField symbolicAdsField) {
+        // If the map doesn't contain an entry for the given symbolicAdsField,
+        // resolve it and add it to the map.
+        fieldMapping.computeIfAbsent(symbolicAdsField, symbolicAdsFieldInternal -> {
+            LOGGER.debug("Resolving {}", symbolicAdsFieldInternal);
+            AdsReadWriteRequest adsReadWriteRequest = AdsReadWriteRequest.of(
+                targetAmsNetId,
+                targetAmsPort,
+                sourceAmsNetId,
+                sourceAmsPort,
+                Invoke.NONE,
+                IndexGroup.ReservedGroups.ADSIGRP_SYM_HNDBYNAME,
+                IndexOffset.NONE,
+                ReadLength.of(IndexOffset.NUM_BYTES),
+                Data.of(symbolicAdsFieldInternal.getSymbolicField())
+            );
+
+            // TODO: This is blocking, should be changed to be async.
+            CompletableFuture<InternalPlcProprietaryResponse<AdsReadWriteResponse>> getHandelFuture = new CompletableFuture<>();
+            channel.writeAndFlush(new PlcRequestContainer<>(new DefaultPlcProprietaryRequest<>(adsReadWriteRequest), getHandelFuture));
+            InternalPlcProprietaryResponse<AdsReadWriteResponse> getHandleResponse = getFromFuture(getHandelFuture, SYMBOL_RESOLVE_TIMEOUT);
+            AdsReadWriteResponse response = getHandleResponse.getResponse();
+
+            if (response.getResult().toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+                throw new PlcRuntimeException("Non error code received " + response.getResult());
+            }
+
+            IndexOffset symbolHandle = IndexOffset.of(response.getData().getBytes());
+            return DirectAdsField.of(IndexGroup.ReservedGroups.ADSIGRP_SYM_VALBYHND.getAsLong(), symbolHandle.getAsLong(), symbolicAdsFieldInternal.getAdsDataType(), symbolicAdsFieldInternal.getNumberOfElements());
+        });
+    }
+
+    protected static AmsNetId generateAMSNetId() {
+        return AmsNetId.of("0.0.0.0.0.0");
+    }
+
+    protected static AmsPort generateAMSPort() {
+        return AmsPort.of(0);
+    }
+
+    @Override
+    public void close() throws PlcConnectionException {
+        fieldMapping.values().stream()
+            .parallel()
+            .map(adsField -> AdsWriteRequest.of(
+                targetAmsNetId,
+                targetAmsPort,
+                sourceAmsNetId,
+                sourceAmsPort,
+                Invoke.NONE,
+                IndexGroup.ReservedGroups.ADSIGRP_SYM_RELEASEHND,
+                IndexOffset.NONE,
+                Data.of(IndexGroup.of(adsField.getIndexGroup()).getBytes())
+            ))
+            .map(adsWriteRequest -> new PlcRequestContainer<>(new DefaultPlcProprietaryRequest<>(adsWriteRequest), new CompletableFuture<>()))
+            // We don't need a response so we just supply a throw away future.
+            .forEach(channel::write);
+        channel.flush();
+        super.close();
+    }
+
+    /**
+     * Clears the fieldMapping.
+     */
+    public void clearMapping() {
+        fieldMapping.clear();
+    }
+
+    protected <T> T getFromFuture(CompletableFuture<T> future, long timeout) {
+        try {
+            return future.get(timeout, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException e) {
+            LOGGER.warn("Interrupted!", e);
+            Thread.currentThread().interrupt();
+            throw new PlcRuntimeException(e);
+        } catch (ExecutionException | TimeoutException e) {
+            throw new PlcRuntimeException(e);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "AdsAbstractPlcConnection{" +
+            "targetAmsNetId=" + targetAmsNetId +
+            ", targetAmsPort=" + targetAmsPort +
+            ", sourceAmsNetId=" + sourceAmsNetId +
+            ", sourceAmsPort=" + sourceAmsPort +
+            "} " + super.toString();
+    }
+}
diff --git a/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsConnectionFactory.java b/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsConnectionFactory.java
index 6dca9252c6a..ba9d822ef93 100644
--- a/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsConnectionFactory.java
+++ b/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsConnectionFactory.java
@@ -1,58 +1,58 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.connection;
-
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-
-import java.net.InetAddress;
-import java.util.Objects;
-
-public class AdsConnectionFactory {
-
-    public AdsTcpPlcConnection adsTcpPlcConnectionOf(InetAddress address, Integer port, AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort) {
-        Objects.requireNonNull(address);
-        Objects.requireNonNull(targetAmsNetId);
-        Objects.requireNonNull(targetAmsPort);
-        if (sourceAmsNetId == null || sourceAmsPort == null) {
-            if (port == null) {
-                return AdsTcpPlcConnection.of(address, targetAmsNetId, targetAmsPort);
-            } else {
-                return AdsTcpPlcConnection.of(address, port, targetAmsNetId, targetAmsPort);
-            }
-        } else {
-            if (port == null) {
-                return AdsTcpPlcConnection.of(address, targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
-            } else {
-                return AdsTcpPlcConnection.of(address, port, targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
-            }
-        }
-    }
-
-    public AdsSerialPlcConnection adsSerialPlcConnectionOf(String serialPort, AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort) {
-        Objects.requireNonNull(serialPort);
-        Objects.requireNonNull(targetAmsNetId);
-        Objects.requireNonNull(targetAmsPort);
-        if (sourceAmsNetId == null || sourceAmsPort == null) {
-            return AdsSerialPlcConnection.of(serialPort, targetAmsNetId, targetAmsPort);
-        } else {
-            return AdsSerialPlcConnection.of(serialPort, targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
-        }
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.connection;
+
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+
+import java.net.InetAddress;
+import java.util.Objects;
+
+public class AdsConnectionFactory {
+
+    public AdsTcpPlcConnection adsTcpPlcConnectionOf(InetAddress address, Integer port, AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort) {
+        Objects.requireNonNull(address);
+        Objects.requireNonNull(targetAmsNetId);
+        Objects.requireNonNull(targetAmsPort);
+        if (sourceAmsNetId == null || sourceAmsPort == null) {
+            if (port == null) {
+                return AdsTcpPlcConnection.of(address, targetAmsNetId, targetAmsPort);
+            } else {
+                return AdsTcpPlcConnection.of(address, port, targetAmsNetId, targetAmsPort);
+            }
+        } else {
+            if (port == null) {
+                return AdsTcpPlcConnection.of(address, targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
+            } else {
+                return AdsTcpPlcConnection.of(address, port, targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
+            }
+        }
+    }
+
+    public AdsSerialPlcConnection adsSerialPlcConnectionOf(String serialPort, AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort) {
+        Objects.requireNonNull(serialPort);
+        Objects.requireNonNull(targetAmsNetId);
+        Objects.requireNonNull(targetAmsPort);
+        if (sourceAmsNetId == null || sourceAmsPort == null) {
+            return AdsSerialPlcConnection.of(serialPort, targetAmsNetId, targetAmsPort);
+        } else {
+            return AdsSerialPlcConnection.of(serialPort, targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
+        }
+    }
+}
diff --git a/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnection.java b/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnection.java
index c079647e29e..1c3dc5980c3 100644
--- a/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnection.java
+++ b/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnection.java
@@ -1,70 +1,70 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.connection;
-
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.ChannelPipeline;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.protocol.Ads2PayloadProtocol;
-import org.apache.plc4x.java.ads.protocol.Payload2SerialProtocol;
-import org.apache.plc4x.java.ads.protocol.Plc4x2AdsProtocol;
-import org.apache.plc4x.java.ads.protocol.util.SingleMessageRateLimiter;
-import org.apache.plc4x.java.serial.connection.connection.SerialChannelFactory;
-import org.apache.plc4x.java.base.protocol.SingleItemToSingleRequestProtocol;
-
-import java.util.concurrent.CompletableFuture;
-
-public class AdsSerialPlcConnection extends AdsAbstractPlcConnection {
-
-    private AdsSerialPlcConnection(String serialPort, AmsNetId targetAmsNetId, AmsPort targetAmsPort) {
-        this(serialPort, targetAmsNetId, targetAmsPort, generateAMSNetId(), generateAMSPort());
-    }
-
-    private AdsSerialPlcConnection(String serialPort, AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort) {
-        super(new SerialChannelFactory(serialPort), targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
-    }
-
-    public static AdsSerialPlcConnection of(String serialPort, AmsNetId targetAmsNetId, AmsPort targetAmsPort) {
-        return new AdsSerialPlcConnection(serialPort, targetAmsNetId, targetAmsPort);
-    }
-
-    public static AdsSerialPlcConnection of(String serialPort, AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort) {
-        return new AdsSerialPlcConnection(serialPort, targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
-    }
-
-    @Override
-    protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
-        return new ChannelInitializer() {
-            @Override
-            protected void initChannel(Channel channel) {
-                // Build the protocol stack for communicating with the ads protocol.
-                ChannelPipeline pipeline = channel.pipeline();
-                pipeline.addLast(new Payload2SerialProtocol());
-                pipeline.addLast(new SingleMessageRateLimiter());
-                pipeline.addLast(new Ads2PayloadProtocol());
-                pipeline.addLast(new Plc4x2AdsProtocol(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, fieldMapping));
-                pipeline.addLast(new SingleItemToSingleRequestProtocol(AdsSerialPlcConnection.this, AdsSerialPlcConnection.this, null, timer));
-            }
-        };
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.connection;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelPipeline;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.protocol.Ads2PayloadProtocol;
+import org.apache.plc4x.java.ads.protocol.Payload2SerialProtocol;
+import org.apache.plc4x.java.ads.protocol.Plc4x2AdsProtocol;
+import org.apache.plc4x.java.ads.protocol.util.SingleMessageRateLimiter;
+import org.apache.plc4x.java.serial.connection.connection.SerialChannelFactory;
+import org.apache.plc4x.java.base.protocol.SingleItemToSingleRequestProtocol;
+
+import java.util.concurrent.CompletableFuture;
+
+public class AdsSerialPlcConnection extends AdsAbstractPlcConnection {
+
+    private AdsSerialPlcConnection(String serialPort, AmsNetId targetAmsNetId, AmsPort targetAmsPort) {
+        this(serialPort, targetAmsNetId, targetAmsPort, generateAMSNetId(), generateAMSPort());
+    }
+
+    private AdsSerialPlcConnection(String serialPort, AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort) {
+        super(new SerialChannelFactory(serialPort), targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
+    }
+
+    public static AdsSerialPlcConnection of(String serialPort, AmsNetId targetAmsNetId, AmsPort targetAmsPort) {
+        return new AdsSerialPlcConnection(serialPort, targetAmsNetId, targetAmsPort);
+    }
+
+    public static AdsSerialPlcConnection of(String serialPort, AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort) {
+        return new AdsSerialPlcConnection(serialPort, targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
+    }
+
+    @Override
+    protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
+        return new ChannelInitializer() {
+            @Override
+            protected void initChannel(Channel channel) {
+                // Build the protocol stack for communicating with the ads protocol.
+                ChannelPipeline pipeline = channel.pipeline();
+                pipeline.addLast(new Payload2SerialProtocol());
+                pipeline.addLast(new SingleMessageRateLimiter());
+                pipeline.addLast(new Ads2PayloadProtocol());
+                pipeline.addLast(new Plc4x2AdsProtocol(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, fieldMapping));
+                pipeline.addLast(new SingleItemToSingleRequestProtocol(AdsSerialPlcConnection.this, AdsSerialPlcConnection.this, null, timer));
+            }
+        };
+    }
+
+}
diff --git a/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java b/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java
index 5c5c9154b4f..85b116b1f20 100644
--- a/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java
+++ b/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java
@@ -1,375 +1,375 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.connection;
-
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.ChannelPipeline;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.ads.api.commands.*;
-import org.apache.plc4x.java.ads.api.commands.types.*;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-import org.apache.plc4x.java.ads.model.*;
-import org.apache.plc4x.java.ads.protocol.Ads2PayloadProtocol;
-import org.apache.plc4x.java.ads.protocol.Payload2TcpProtocol;
-import org.apache.plc4x.java.ads.protocol.Plc4x2AdsProtocol;
-import org.apache.plc4x.java.ads.protocol.util.LittleEndianDecoder;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.messages.*;
-import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
-import org.apache.plc4x.java.base.messages.*;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-import org.apache.plc4x.java.base.model.DefaultPlcConsumerRegistration;
-import org.apache.plc4x.java.base.model.InternalPlcConsumerRegistration;
-import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
-import org.apache.plc4x.java.base.model.SubscriptionPlcField;
-import org.apache.plc4x.java.base.protocol.SingleItemToSingleRequestProtocol;
-import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.Inet4Address;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.time.Duration;
-import java.time.Instant;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-public class AdsTcpPlcConnection extends AdsAbstractPlcConnection implements PlcSubscriber {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(AdsTcpPlcConnection.class);
-
-    private static final int TCP_PORT = 48898;
-
-    private static final long ADD_DEVICE_TIMEOUT = CONF.getLong("plc4x.adsconnection.add.device,timeout", 3000);
-    private static final long DEL_DEVICE_TIMEOUT = CONF.getLong("plc4x.adsconnection.del.device,timeout", 3000);
-
-    private static AtomicInteger localPorts = new AtomicInteger(30000);
-
-    private Map<InternalPlcConsumerRegistration, Consumer<AdsDeviceNotificationRequest>> consumerRegistrations = new HashMap<>();
-
-    private AdsTcpPlcConnection(InetAddress address, AmsNetId targetAmsNetId, AmsPort targetAmsPort) {
-        this(address, targetAmsNetId, targetAmsPort, generateAMSNetId(), generateAMSPort());
-    }
-
-    private AdsTcpPlcConnection(InetAddress address, Integer port, AmsNetId targetAmsNetId, AmsPort targetAmsPort) {
-        this(address, port, targetAmsNetId, targetAmsPort, generateAMSNetId(), generateAMSPort());
-    }
-
-    private AdsTcpPlcConnection(InetAddress address, AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort) {
-        this(address, null, targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
-    }
-
-    private AdsTcpPlcConnection(InetAddress address, Integer port, AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort) {
-        super(new TcpSocketChannelFactory(address, port != null ? port : TCP_PORT), targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
-    }
-
-    public static AdsTcpPlcConnection of(InetAddress address, AmsNetId targetAmsNetId, AmsPort targetAmsPort) {
-        return new AdsTcpPlcConnection(address, targetAmsNetId, targetAmsPort);
-    }
-
-    public static AdsTcpPlcConnection of(InetAddress address, Integer port, AmsNetId targetAmsNetId, AmsPort targetAmsPort) {
-        return new AdsTcpPlcConnection(address, port, targetAmsNetId, targetAmsPort);
-    }
-
-    public static AdsTcpPlcConnection of(InetAddress address, AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort) {
-        return new AdsTcpPlcConnection(address, null, targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
-    }
-
-    public static AdsTcpPlcConnection of(InetAddress address, Integer port, AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort) {
-        return new AdsTcpPlcConnection(address, port, targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
-    }
-
-    @Override
-    protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
-        return new ChannelInitializer() {
-            @Override
-            protected void initChannel(Channel channel) {
-                // Build the protocol stack for communicating with the ads protocol.
-                ChannelPipeline pipeline = channel.pipeline();
-                pipeline.addLast(new Payload2TcpProtocol());
-                pipeline.addLast(new Ads2PayloadProtocol());
-                pipeline.addLast(new Plc4x2AdsProtocol(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, fieldMapping));
-                pipeline.addLast(new SingleItemToSingleRequestProtocol(AdsTcpPlcConnection.this, AdsTcpPlcConnection.this, AdsTcpPlcConnection.this, timer, SingleItemToSingleRequestProtocol.SplitConfig.builder().dontSplitSubscribe().dontSplitUnsubscribe().build(), false));
-            }
-        };
-    }
-
-    public InetAddress getRemoteAddress() {
-        return ((TcpSocketChannelFactory) channelFactory).getAddress();
-    }
-
-    protected static AmsNetId generateAMSNetId() {
-        try {
-            return AmsNetId.of(Inet4Address.getLocalHost().getHostAddress() + ".1.1");
-        } catch (UnknownHostException e) {
-            throw new PlcRuntimeException(e);
-        }
-    }
-
-    protected static AmsPort generateAMSPort() {
-        return AmsPort.of(localPorts.getAndIncrement());
-    }
-
-    @Override
-    public CompletableFuture<PlcSubscriptionResponse> subscribe(PlcSubscriptionRequest plcSubscriptionRequest) {
-        InternalPlcSubscriptionRequest internalPlcSubscriptionRequest = checkInternal(plcSubscriptionRequest, InternalPlcSubscriptionRequest.class);
-        CompletableFuture<PlcSubscriptionResponse> future = new CompletableFuture<>();
-
-        Map<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> responseItems = internalPlcSubscriptionRequest.getSubscriptionPlcFieldMap().entrySet().stream()
-            .map(subscriptionPlcFieldEntry -> {
-                final String plcFieldName = subscriptionPlcFieldEntry.getKey();
-                final SubscriptionPlcField subscriptionPlcField = subscriptionPlcFieldEntry.getValue();
-                final PlcField field = Objects.requireNonNull(subscriptionPlcField.getPlcField());
-
-                final IndexGroup indexGroup;
-                final IndexOffset indexOffset;
-                final AdsDataType adsDataType;
-                final int numberOfElements;
-                // If this is a symbolic field, it has to be resolved first.
-                // TODO: This is blocking, should be changed to be async.
-                if (field instanceof SymbolicAdsField) {
-                    mapFields((SymbolicAdsField) field);
-                    DirectAdsField directAdsField = fieldMapping.get(field);
-                    if (directAdsField == null) {
-                        throw new PlcRuntimeException("Unresolvable field " + field);
-                    }
-                    indexGroup = IndexGroup.of(directAdsField.getIndexGroup());
-                    indexOffset = IndexOffset.of(directAdsField.getIndexOffset());
-                    adsDataType = directAdsField.getAdsDataType();
-                    numberOfElements = directAdsField.getNumberOfElements();
-                }
-                // If it's no symbolic field, we can continue immediately
-                // without having to do any resolving.
-                else if (field instanceof DirectAdsField) {
-                    DirectAdsField directAdsField = (DirectAdsField) field;
-                    indexGroup = IndexGroup.of(directAdsField.getIndexGroup());
-                    indexOffset = IndexOffset.of(directAdsField.getIndexOffset());
-                    adsDataType = directAdsField.getAdsDataType();
-                    numberOfElements = directAdsField.getNumberOfElements();
-                } else {
-                    throw new IllegalArgumentException("Unsupported field type " + field.getClass());
-                }
-
-                final TransmissionMode transmissionMode;
-                long cycleTime = 4000000;
-                switch (subscriptionPlcField.getPlcSubscriptionType()) {
-                    case CYCLIC:
-                        transmissionMode = TransmissionMode.DefinedValues.ADSTRANS_SERVERCYCLE;
-                        cycleTime = subscriptionPlcField.getDuration().orElse(Duration.ofSeconds(1)).toMillis();
-                        break;
-                    case CHANGE_OF_STATE:
-                        transmissionMode = TransmissionMode.DefinedValues.ADSTRANS_SERVERONCHA;
-                        break;
-                    default:
-                        throw new PlcRuntimeException("Unmapped type " + subscriptionPlcField.getPlcSubscriptionType());
-                }
-
-                // Prepare the subscription request itself.
-                AdsAddDeviceNotificationRequest adsAddDeviceNotificationRequest = AdsAddDeviceNotificationRequest.of(
-                    targetAmsNetId,
-                    targetAmsPort,
-                    sourceAmsNetId,
-                    sourceAmsPort,
-                    Invoke.NONE,
-                    indexGroup,
-                    indexOffset,
-                    Length.of(adsDataType.getTargetByteSize() * (long) numberOfElements),
-                    transmissionMode,
-                    // We set max delay to cycle time as we don't have a second parameter for this in the plc4j-api
-                    MaxDelay.of(cycleTime + 1),
-                    CycleTime.of(cycleTime)
-                );
-
-                // Send the request to the plc and wait for a response
-                // TODO: This is blocking, should be changed to be async.
-                CompletableFuture<InternalPlcProprietaryResponse<AdsAddDeviceNotificationResponse>> addDeviceFuture = new CompletableFuture<>();
-                channel.writeAndFlush(new PlcRequestContainer<>(new DefaultPlcProprietaryRequest<>(adsAddDeviceNotificationRequest), addDeviceFuture));
-                InternalPlcProprietaryResponse<AdsAddDeviceNotificationResponse> addDeviceResponse = getFromFuture(addDeviceFuture, ADD_DEVICE_TIMEOUT);
-                AdsAddDeviceNotificationResponse response = addDeviceResponse.getResponse();
-
-                // Abort if we got anything but a successful response.
-                if (response.getResult().toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-                    throw new PlcRuntimeException("Error code received " + response.getResult());
-                }
-                PlcSubscriptionHandle adsSubscriptionHandle = new AdsSubscriptionHandle(this, plcFieldName, adsDataType, response.getNotificationHandle());
-                return Pair.of(plcFieldName, Pair.of(PlcResponseCode.OK, adsSubscriptionHandle));
-            })
-            .collect(Collectors.toMap(Pair::getKey, Pair::getValue));
-
-        future.complete(new DefaultPlcSubscriptionResponse(internalPlcSubscriptionRequest, responseItems));
-        return future;
-    }
-
-    @Override
-    public CompletableFuture<PlcUnsubscriptionResponse> unsubscribe(PlcUnsubscriptionRequest plcUnsubscriptionRequest) {
-        InternalPlcUnsubscriptionRequest internalPlcUnsubscriptionRequest = checkInternal(plcUnsubscriptionRequest, InternalPlcUnsubscriptionRequest.class);
-        for (InternalPlcSubscriptionHandle internalPlcSubscriptionHandle : internalPlcUnsubscriptionRequest.getInternalPlcSubscriptionHandles()) {
-            if (internalPlcSubscriptionHandle instanceof AdsSubscriptionHandle) {
-                AdsSubscriptionHandle adsSubscriptionHandle = (AdsSubscriptionHandle) internalPlcSubscriptionHandle;
-                AdsDeleteDeviceNotificationRequest adsDeleteDeviceNotificationRequest =
-                    AdsDeleteDeviceNotificationRequest.of(
-                        targetAmsNetId,
-                        targetAmsPort,
-                        sourceAmsNetId,
-                        sourceAmsPort,
-                        Invoke.NONE,
-                        adsSubscriptionHandle.getNotificationHandle()
-                    );
-                CompletableFuture<InternalPlcProprietaryResponse<AdsDeleteDeviceNotificationResponse>> deleteDeviceFuture =
-                    new CompletableFuture<>();
-                channel.writeAndFlush(new PlcRequestContainer<>(new DefaultPlcProprietaryRequest<>(adsDeleteDeviceNotificationRequest), deleteDeviceFuture));
-
-                InternalPlcProprietaryResponse<AdsDeleteDeviceNotificationResponse> deleteDeviceResponse =
-                    getFromFuture(deleteDeviceFuture, DEL_DEVICE_TIMEOUT);
-                AdsDeleteDeviceNotificationResponse response = deleteDeviceResponse.getResponse();
-                if (response.getResult().toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-                    throw new PlcRuntimeException("Non error code received " + response.getResult());
-                }
-            }
-        }
-        CompletableFuture<PlcUnsubscriptionResponse> future = new CompletableFuture<>();
-        future.complete(new DefaultPlcUnsubscriptionResponse(internalPlcUnsubscriptionRequest));
-        return future;
-    }
-
-    @Override
-    public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer, Collection<PlcSubscriptionHandle> handles) {
-        return register(consumer, handles.toArray(new PlcSubscriptionHandle[0]));
-    }
-
-    public InternalPlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer, PlcSubscriptionHandle... handles) {
-        Objects.requireNonNull(consumer);
-        Objects.requireNonNull(handles);
-        InternalPlcSubscriptionHandle[] internalPlcSubscriptionHandles = new InternalPlcSubscriptionHandle[handles.length];
-        for (int i = 0; i < handles.length; i++) {
-            internalPlcSubscriptionHandles[i] = checkInternal(handles[i], InternalPlcSubscriptionHandle.class);
-        }
-
-        InternalPlcConsumerRegistration internalPlcConsumerRegistration = new DefaultPlcConsumerRegistration(this, consumer, internalPlcSubscriptionHandles);
-        Map<NotificationHandle, AdsSubscriptionHandle> notificationHandleAdsSubscriptionHandleMap = Arrays.stream(internalPlcSubscriptionHandles)
-            .map(subscriptionHandle -> checkInternal(subscriptionHandle, AdsSubscriptionHandle.class))
-            .collect(Collectors.toConcurrentMap(AdsSubscriptionHandle::getNotificationHandle, Function.identity()));
-
-        Consumer<AdsDeviceNotificationRequest> adsDeviceNotificationRequestConsumer =
-            adsDeviceNotificationRequest -> adsDeviceNotificationRequest.getAdsStampHeaders().forEach(adsStampHeader -> {
-                Instant timeStamp = adsStampHeader.getTimeStamp().getAsDate().toInstant();
-
-                Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> fields = new HashMap<>();
-                adsStampHeader.getAdsNotificationSamples()
-                    .forEach(adsNotificationSample -> {
-                        NotificationHandle notificationHandle = adsNotificationSample.getNotificationHandle();
-                        Data data = adsNotificationSample.getData();
-                        AdsSubscriptionHandle adsSubscriptionHandle = notificationHandleAdsSubscriptionHandleMap.get(notificationHandle);
-                        if (adsSubscriptionHandle == null) {
-                            // TODO: we might want to refactor this so that we don't subscribe to everything in the first place.
-                            // TODO: rather than we add a Consumer with the handle as key
-                            LOGGER.trace("We are not interested in this sample {} with handle {}", adsNotificationSample, notificationHandle);
-                            return;
-                        }
-                        String plcFieldName = adsSubscriptionHandle.getPlcFieldName();
-                        AdsDataType adsDataType = adsSubscriptionHandle.getAdsDataType();
-                        try {
-                            BaseDefaultFieldItem baseDefaultFieldItem = LittleEndianDecoder.decodeData(adsDataType, data.getBytes());
-                            fields.put(plcFieldName, Pair.of(PlcResponseCode.OK, baseDefaultFieldItem));
-                        } catch (RuntimeException e) {
-                            LOGGER.error("Can't decode {}", data, e);
-                        }
-
-                    });
-                try {
-                    PlcSubscriptionEvent subscriptionEventItem = new DefaultPlcSubscriptionEvent(timeStamp, fields);
-                    consumer.accept(subscriptionEventItem);
-                } catch (RuntimeException e) {
-                    LOGGER.error("Can't dispatch adsStampHeader {}", adsStampHeader, e);
-                }
-            });
-
-        // Store the reference for so it can be uses for later
-        consumerRegistrations.put(internalPlcConsumerRegistration, adsDeviceNotificationRequestConsumer);
-        // register the actual consumer.
-        getChannel().pipeline().get(Plc4x2AdsProtocol.class).addConsumer(adsDeviceNotificationRequestConsumer);
-
-        return internalPlcConsumerRegistration;
-    }
-
-    @Override
-    public void unregister(PlcConsumerRegistration plcConsumerRegistration) {
-        InternalPlcConsumerRegistration internalPlcConsumerRegistration = checkInternal(plcConsumerRegistration, InternalPlcConsumerRegistration.class);
-        Consumer<AdsDeviceNotificationRequest> adsDeviceNotificationRequestConsumer = consumerRegistrations.remove(internalPlcConsumerRegistration);
-        if (adsDeviceNotificationRequestConsumer == null) {
-            return;
-        }
-        getChannel().pipeline().get(Plc4x2AdsProtocol.class).removeConsumer(adsDeviceNotificationRequestConsumer);
-    }
-
-    @Override
-    public boolean canSubscribe() {
-        return true;
-    }
-
-    @Override
-    public PlcSubscriptionRequest.Builder subscriptionRequestBuilder() {
-        return new DefaultPlcSubscriptionRequest.Builder(this, new AdsPlcFieldHandler());
-    }
-
-    @Override
-    public PlcUnsubscriptionRequest.Builder unsubscriptionRequestBuilder() {
-        return new DefaultPlcUnsubscriptionRequest.Builder(this);
-    }
-
-    @Override
-    public void close() throws PlcConnectionException {
-        try {
-            consumerRegistrations.values().forEach(getChannel().pipeline().get(Plc4x2AdsProtocol.class)::removeConsumer);
-            List<PlcSubscriptionHandle> collect = consumerRegistrations.keySet().stream()
-                .map(InternalPlcConsumerRegistration::getAssociatedHandles)
-                .flatMap(Collection::stream)
-                .map(PlcSubscriptionHandle.class::cast)
-                .collect(Collectors.toList());
-
-            PlcUnsubscriptionRequest plcUnsubscriptionRequest = new DefaultPlcUnsubscriptionRequest.Builder(this).addHandles(collect).build();
-            unsubscribe(plcUnsubscriptionRequest).get(5, TimeUnit.SECONDS);
-
-            consumerRegistrations.clear();
-        } catch (InterruptedException e) {
-            LOGGER.warn("Exception while closing", e);
-            Thread.currentThread().interrupt();
-        } catch (RuntimeException | ExecutionException | TimeoutException e) {
-            LOGGER.warn("Exception while closing", e);
-        }
-        super.close();
-    }
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.connection;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelPipeline;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.ads.api.commands.*;
+import org.apache.plc4x.java.ads.api.commands.types.*;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+import org.apache.plc4x.java.ads.model.*;
+import org.apache.plc4x.java.ads.protocol.Ads2PayloadProtocol;
+import org.apache.plc4x.java.ads.protocol.Payload2TcpProtocol;
+import org.apache.plc4x.java.ads.protocol.Plc4x2AdsProtocol;
+import org.apache.plc4x.java.ads.protocol.util.LittleEndianDecoder;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.messages.*;
+import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
+import org.apache.plc4x.java.base.messages.*;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+import org.apache.plc4x.java.base.model.DefaultPlcConsumerRegistration;
+import org.apache.plc4x.java.base.model.InternalPlcConsumerRegistration;
+import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
+import org.apache.plc4x.java.base.model.SubscriptionPlcField;
+import org.apache.plc4x.java.base.protocol.SingleItemToSingleRequestProtocol;
+import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+public class AdsTcpPlcConnection extends AdsAbstractPlcConnection implements PlcSubscriber {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(AdsTcpPlcConnection.class);
+
+    private static final int TCP_PORT = 48898;
+
+    private static final long ADD_DEVICE_TIMEOUT = CONF.getLong("plc4x.adsconnection.add.device,timeout", 3000);
+    private static final long DEL_DEVICE_TIMEOUT = CONF.getLong("plc4x.adsconnection.del.device,timeout", 3000);
+
+    private static AtomicInteger localPorts = new AtomicInteger(30000);
+
+    private Map<InternalPlcConsumerRegistration, Consumer<AdsDeviceNotificationRequest>> consumerRegistrations = new HashMap<>();
+
+    private AdsTcpPlcConnection(InetAddress address, AmsNetId targetAmsNetId, AmsPort targetAmsPort) {
+        this(address, targetAmsNetId, targetAmsPort, generateAMSNetId(), generateAMSPort());
+    }
+
+    private AdsTcpPlcConnection(InetAddress address, Integer port, AmsNetId targetAmsNetId, AmsPort targetAmsPort) {
+        this(address, port, targetAmsNetId, targetAmsPort, generateAMSNetId(), generateAMSPort());
+    }
+
+    private AdsTcpPlcConnection(InetAddress address, AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort) {
+        this(address, null, targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
+    }
+
+    private AdsTcpPlcConnection(InetAddress address, Integer port, AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort) {
+        super(new TcpSocketChannelFactory(address, port != null ? port : TCP_PORT), targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
+    }
+
+    public static AdsTcpPlcConnection of(InetAddress address, AmsNetId targetAmsNetId, AmsPort targetAmsPort) {
+        return new AdsTcpPlcConnection(address, targetAmsNetId, targetAmsPort);
+    }
+
+    public static AdsTcpPlcConnection of(InetAddress address, Integer port, AmsNetId targetAmsNetId, AmsPort targetAmsPort) {
+        return new AdsTcpPlcConnection(address, port, targetAmsNetId, targetAmsPort);
+    }
+
+    public static AdsTcpPlcConnection of(InetAddress address, AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort) {
+        return new AdsTcpPlcConnection(address, null, targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
+    }
+
+    public static AdsTcpPlcConnection of(InetAddress address, Integer port, AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort) {
+        return new AdsTcpPlcConnection(address, port, targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
+    }
+
+    @Override
+    protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
+        return new ChannelInitializer() {
+            @Override
+            protected void initChannel(Channel channel) {
+                // Build the protocol stack for communicating with the ads protocol.
+                ChannelPipeline pipeline = channel.pipeline();
+                pipeline.addLast(new Payload2TcpProtocol());
+                pipeline.addLast(new Ads2PayloadProtocol());
+                pipeline.addLast(new Plc4x2AdsProtocol(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, fieldMapping));
+                pipeline.addLast(new SingleItemToSingleRequestProtocol(AdsTcpPlcConnection.this, AdsTcpPlcConnection.this, AdsTcpPlcConnection.this, timer, SingleItemToSingleRequestProtocol.SplitConfig.builder().dontSplitSubscribe().dontSplitUnsubscribe().build(), false));
+            }
+        };
+    }
+
+    public InetAddress getRemoteAddress() {
+        return ((TcpSocketChannelFactory) channelFactory).getAddress();
+    }
+
+    protected static AmsNetId generateAMSNetId() {
+        try {
+            return AmsNetId.of(Inet4Address.getLocalHost().getHostAddress() + ".1.1");
+        } catch (UnknownHostException e) {
+            throw new PlcRuntimeException(e);
+        }
+    }
+
+    protected static AmsPort generateAMSPort() {
+        return AmsPort.of(localPorts.getAndIncrement());
+    }
+
+    @Override
+    public CompletableFuture<PlcSubscriptionResponse> subscribe(PlcSubscriptionRequest plcSubscriptionRequest) {
+        InternalPlcSubscriptionRequest internalPlcSubscriptionRequest = checkInternal(plcSubscriptionRequest, InternalPlcSubscriptionRequest.class);
+        CompletableFuture<PlcSubscriptionResponse> future = new CompletableFuture<>();
+
+        Map<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> responseItems = internalPlcSubscriptionRequest.getSubscriptionPlcFieldMap().entrySet().stream()
+            .map(subscriptionPlcFieldEntry -> {
+                final String plcFieldName = subscriptionPlcFieldEntry.getKey();
+                final SubscriptionPlcField subscriptionPlcField = subscriptionPlcFieldEntry.getValue();
+                final PlcField field = Objects.requireNonNull(subscriptionPlcField.getPlcField());
+
+                final IndexGroup indexGroup;
+                final IndexOffset indexOffset;
+                final AdsDataType adsDataType;
+                final int numberOfElements;
+                // If this is a symbolic field, it has to be resolved first.
+                // TODO: This is blocking, should be changed to be async.
+                if (field instanceof SymbolicAdsField) {
+                    mapFields((SymbolicAdsField) field);
+                    DirectAdsField directAdsField = fieldMapping.get(field);
+                    if (directAdsField == null) {
+                        throw new PlcRuntimeException("Unresolvable field " + field);
+                    }
+                    indexGroup = IndexGroup.of(directAdsField.getIndexGroup());
+                    indexOffset = IndexOffset.of(directAdsField.getIndexOffset());
+                    adsDataType = directAdsField.getAdsDataType();
+                    numberOfElements = directAdsField.getNumberOfElements();
+                }
+                // If it's no symbolic field, we can continue immediately
+                // without having to do any resolving.
+                else if (field instanceof DirectAdsField) {
+                    DirectAdsField directAdsField = (DirectAdsField) field;
+                    indexGroup = IndexGroup.of(directAdsField.getIndexGroup());
+                    indexOffset = IndexOffset.of(directAdsField.getIndexOffset());
+                    adsDataType = directAdsField.getAdsDataType();
+                    numberOfElements = directAdsField.getNumberOfElements();
+                } else {
+                    throw new IllegalArgumentException("Unsupported field type " + field.getClass());
+                }
+
+                final TransmissionMode transmissionMode;
+                long cycleTime = 4000000;
+                switch (subscriptionPlcField.getPlcSubscriptionType()) {
+                    case CYCLIC:
+                        transmissionMode = TransmissionMode.DefinedValues.ADSTRANS_SERVERCYCLE;
+                        cycleTime = subscriptionPlcField.getDuration().orElse(Duration.ofSeconds(1)).toMillis();
+                        break;
+                    case CHANGE_OF_STATE:
+                        transmissionMode = TransmissionMode.DefinedValues.ADSTRANS_SERVERONCHA;
+                        break;
+                    default:
+                        throw new PlcRuntimeException("Unmapped type " + subscriptionPlcField.getPlcSubscriptionType());
+                }
+
+                // Prepare the subscription request itself.
+                AdsAddDeviceNotificationRequest adsAddDeviceNotificationRequest = AdsAddDeviceNotificationRequest.of(
+                    targetAmsNetId,
+                    targetAmsPort,
+                    sourceAmsNetId,
+                    sourceAmsPort,
+                    Invoke.NONE,
+                    indexGroup,
+                    indexOffset,
+                    Length.of(adsDataType.getTargetByteSize() * (long) numberOfElements),
+                    transmissionMode,
+                    // We set max delay to cycle time as we don't have a second parameter for this in the plc4j-api
+                    MaxDelay.of(cycleTime + 1),
+                    CycleTime.of(cycleTime)
+                );
+
+                // Send the request to the plc and wait for a response
+                // TODO: This is blocking, should be changed to be async.
+                CompletableFuture<InternalPlcProprietaryResponse<AdsAddDeviceNotificationResponse>> addDeviceFuture = new CompletableFuture<>();
+                channel.writeAndFlush(new PlcRequestContainer<>(new DefaultPlcProprietaryRequest<>(adsAddDeviceNotificationRequest), addDeviceFuture));
+                InternalPlcProprietaryResponse<AdsAddDeviceNotificationResponse> addDeviceResponse = getFromFuture(addDeviceFuture, ADD_DEVICE_TIMEOUT);
+                AdsAddDeviceNotificationResponse response = addDeviceResponse.getResponse();
+
+                // Abort if we got anything but a successful response.
+                if (response.getResult().toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+                    throw new PlcRuntimeException("Error code received " + response.getResult());
+                }
+                PlcSubscriptionHandle adsSubscriptionHandle = new AdsSubscriptionHandle(this, plcFieldName, adsDataType, response.getNotificationHandle());
+                return Pair.of(plcFieldName, Pair.of(PlcResponseCode.OK, adsSubscriptionHandle));
+            })
+            .collect(Collectors.toMap(Pair::getKey, Pair::getValue));
+
+        future.complete(new DefaultPlcSubscriptionResponse(internalPlcSubscriptionRequest, responseItems));
+        return future;
+    }
+
+    @Override
+    public CompletableFuture<PlcUnsubscriptionResponse> unsubscribe(PlcUnsubscriptionRequest plcUnsubscriptionRequest) {
+        InternalPlcUnsubscriptionRequest internalPlcUnsubscriptionRequest = checkInternal(plcUnsubscriptionRequest, InternalPlcUnsubscriptionRequest.class);
+        for (InternalPlcSubscriptionHandle internalPlcSubscriptionHandle : internalPlcUnsubscriptionRequest.getInternalPlcSubscriptionHandles()) {
+            if (internalPlcSubscriptionHandle instanceof AdsSubscriptionHandle) {
+                AdsSubscriptionHandle adsSubscriptionHandle = (AdsSubscriptionHandle) internalPlcSubscriptionHandle;
+                AdsDeleteDeviceNotificationRequest adsDeleteDeviceNotificationRequest =
+                    AdsDeleteDeviceNotificationRequest.of(
+                        targetAmsNetId,
+                        targetAmsPort,
+                        sourceAmsNetId,
+                        sourceAmsPort,
+                        Invoke.NONE,
+                        adsSubscriptionHandle.getNotificationHandle()
+                    );
+                CompletableFuture<InternalPlcProprietaryResponse<AdsDeleteDeviceNotificationResponse>> deleteDeviceFuture =
+                    new CompletableFuture<>();
+                channel.writeAndFlush(new PlcRequestContainer<>(new DefaultPlcProprietaryRequest<>(adsDeleteDeviceNotificationRequest), deleteDeviceFuture));
+
+                InternalPlcProprietaryResponse<AdsDeleteDeviceNotificationResponse> deleteDeviceResponse =
+                    getFromFuture(deleteDeviceFuture, DEL_DEVICE_TIMEOUT);
+                AdsDeleteDeviceNotificationResponse response = deleteDeviceResponse.getResponse();
+                if (response.getResult().toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+                    throw new PlcRuntimeException("Non error code received " + response.getResult());
+                }
+            }
+        }
+        CompletableFuture<PlcUnsubscriptionResponse> future = new CompletableFuture<>();
+        future.complete(new DefaultPlcUnsubscriptionResponse(internalPlcUnsubscriptionRequest));
+        return future;
+    }
+
+    @Override
+    public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer, Collection<PlcSubscriptionHandle> handles) {
+        return register(consumer, handles.toArray(new PlcSubscriptionHandle[0]));
+    }
+
+    public InternalPlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer, PlcSubscriptionHandle... handles) {
+        Objects.requireNonNull(consumer);
+        Objects.requireNonNull(handles);
+        InternalPlcSubscriptionHandle[] internalPlcSubscriptionHandles = new InternalPlcSubscriptionHandle[handles.length];
+        for (int i = 0; i < handles.length; i++) {
+            internalPlcSubscriptionHandles[i] = checkInternal(handles[i], InternalPlcSubscriptionHandle.class);
+        }
+
+        InternalPlcConsumerRegistration internalPlcConsumerRegistration = new DefaultPlcConsumerRegistration(this, consumer, internalPlcSubscriptionHandles);
+        Map<NotificationHandle, AdsSubscriptionHandle> notificationHandleAdsSubscriptionHandleMap = Arrays.stream(internalPlcSubscriptionHandles)
+            .map(subscriptionHandle -> checkInternal(subscriptionHandle, AdsSubscriptionHandle.class))
+            .collect(Collectors.toConcurrentMap(AdsSubscriptionHandle::getNotificationHandle, Function.identity()));
+
+        Consumer<AdsDeviceNotificationRequest> adsDeviceNotificationRequestConsumer =
+            adsDeviceNotificationRequest -> adsDeviceNotificationRequest.getAdsStampHeaders().forEach(adsStampHeader -> {
+                Instant timeStamp = adsStampHeader.getTimeStamp().getAsDate().toInstant();
+
+                Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> fields = new HashMap<>();
+                adsStampHeader.getAdsNotificationSamples()
+                    .forEach(adsNotificationSample -> {
+                        NotificationHandle notificationHandle = adsNotificationSample.getNotificationHandle();
+                        Data data = adsNotificationSample.getData();
+                        AdsSubscriptionHandle adsSubscriptionHandle = notificationHandleAdsSubscriptionHandleMap.get(notificationHandle);
+                        if (adsSubscriptionHandle == null) {
+                            // TODO: we might want to refactor this so that we don't subscribe to everything in the first place.
+                            // TODO: rather than we add a Consumer with the handle as key
+                            LOGGER.trace("We are not interested in this sample {} with handle {}", adsNotificationSample, notificationHandle);
+                            return;
+                        }
+                        String plcFieldName = adsSubscriptionHandle.getPlcFieldName();
+                        AdsDataType adsDataType = adsSubscriptionHandle.getAdsDataType();
+                        try {
+                            BaseDefaultFieldItem baseDefaultFieldItem = LittleEndianDecoder.decodeData(adsDataType, data.getBytes());
+                            fields.put(plcFieldName, Pair.of(PlcResponseCode.OK, baseDefaultFieldItem));
+                        } catch (RuntimeException e) {
+                            LOGGER.error("Can't decode {}", data, e);
+                        }
+
+                    });
+                try {
+                    PlcSubscriptionEvent subscriptionEventItem = new DefaultPlcSubscriptionEvent(timeStamp, fields);
+                    consumer.accept(subscriptionEventItem);
+                } catch (RuntimeException e) {
+                    LOGGER.error("Can't dispatch adsStampHeader {}", adsStampHeader, e);
+                }
+            });
+
+        // Store the reference for so it can be uses for later
+        consumerRegistrations.put(internalPlcConsumerRegistration, adsDeviceNotificationRequestConsumer);
+        // register the actual consumer.
+        getChannel().pipeline().get(Plc4x2AdsProtocol.class).addConsumer(adsDeviceNotificationRequestConsumer);
+
+        return internalPlcConsumerRegistration;
+    }
+
+    @Override
+    public void unregister(PlcConsumerRegistration plcConsumerRegistration) {
+        InternalPlcConsumerRegistration internalPlcConsumerRegistration = checkInternal(plcConsumerRegistration, InternalPlcConsumerRegistration.class);
+        Consumer<AdsDeviceNotificationRequest> adsDeviceNotificationRequestConsumer = consumerRegistrations.remove(internalPlcConsumerRegistration);
+        if (adsDeviceNotificationRequestConsumer == null) {
+            return;
+        }
+        getChannel().pipeline().get(Plc4x2AdsProtocol.class).removeConsumer(adsDeviceNotificationRequestConsumer);
+    }
+
+    @Override
+    public boolean canSubscribe() {
+        return true;
+    }
+
+    @Override
+    public PlcSubscriptionRequest.Builder subscriptionRequestBuilder() {
+        return new DefaultPlcSubscriptionRequest.Builder(this, new AdsPlcFieldHandler());
+    }
+
+    @Override
+    public PlcUnsubscriptionRequest.Builder unsubscriptionRequestBuilder() {
+        return new DefaultPlcUnsubscriptionRequest.Builder(this);
+    }
+
+    @Override
+    public void close() throws PlcConnectionException {
+        try {
+            consumerRegistrations.values().forEach(getChannel().pipeline().get(Plc4x2AdsProtocol.class)::removeConsumer);
+            List<PlcSubscriptionHandle> collect = consumerRegistrations.keySet().stream()
+                .map(InternalPlcConsumerRegistration::getAssociatedHandles)
+                .flatMap(Collection::stream)
+                .map(PlcSubscriptionHandle.class::cast)
+                .collect(Collectors.toList());
+
+            PlcUnsubscriptionRequest plcUnsubscriptionRequest = new DefaultPlcUnsubscriptionRequest.Builder(this).addHandles(collect).build();
+            unsubscribe(plcUnsubscriptionRequest).get(5, TimeUnit.SECONDS);
+
+            consumerRegistrations.clear();
+        } catch (InterruptedException e) {
+            LOGGER.warn("Exception while closing", e);
+            Thread.currentThread().interrupt();
+        } catch (RuntimeException | ExecutionException | TimeoutException e) {
+            LOGGER.warn("Exception while closing", e);
+        }
+        super.close();
+    }
+}
diff --git a/plc4j/drivers/ads/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver b/plc4j/drivers/ads/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
index 1b92548cde5..ef1ac475471 100644
--- a/plc4j/drivers/ads/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
+++ b/plc4j/drivers/ads/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
@@ -1,19 +1,19 @@
-#
-# 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
-#
-#   http://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.
-#
-org.apache.plc4x.java.ads.AdsPlcDriver
+#
+# 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
+#
+#   http://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.
+#
+org.apache.plc4x.java.ads.AdsPlcDriver
diff --git a/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/AdsPlcDriverTest.java b/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/AdsPlcDriverTest.java
index 5fc5185fe8c..fb302334c42 100644
--- a/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/AdsPlcDriverTest.java
+++ b/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/AdsPlcDriverTest.java
@@ -1,164 +1,164 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.ads;
-
-
-import io.netty.channel.ConnectTimeoutException;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.ads.connection.AdsConnectionFactory;
-import org.apache.plc4x.java.ads.connection.AdsTcpPlcConnection;
-import org.apache.plc4x.java.api.authentication.PlcUsernamePasswordAuthentication;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.exceptions.PlcException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.mock.connection.tcp.TcpHexDumper;
-import org.apache.plc4x.test.RequireInternetConnection;
-import org.junit.jupiter.api.*;
-
-import java.net.ConnectException;
-import java.util.regex.Pattern;
-import java.util.stream.Stream;
-
-import static org.apache.plc4x.java.ads.AdsPlcDriver.*;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.mock;
-
-public class AdsPlcDriverTest {
-
-    public TcpHexDumper tcpHexDumper = new TcpHexDumper(0, 2);
-
-    @BeforeEach
-    public void before() throws Throwable {
-        tcpHexDumper.before();
-    }
-
-    @AfterEach
-    public void after() {
-        tcpHexDumper.after();
-    }
-
-    @Test
-    public void testAdsAddressPattern() {
-        assertMatching(ADS_ADDRESS_PATTERN, "0.0.0.0.0.0:13");
-        assertMatching(ADS_ADDRESS_PATTERN, "0.0.0.0.0.0:13/0.0.0.0.0.0:13");
-
-        assertMatching(INET_ADDRESS_PATTERN, "tcp://localhost");
-        assertMatching(INET_ADDRESS_PATTERN, "tcp://localhost:3131");
-        assertMatching(INET_ADDRESS_PATTERN, "tcp://www.google.de");
-        assertMatching(INET_ADDRESS_PATTERN, "tcp://www.google.de:443");
-
-        assertMatching(SERIAL_PATTERN, "serial:///dev/com1");
-        assertMatching(SERIAL_PATTERN, "serial://COM1");
-        assertMatching(SERIAL_PATTERN, "serial:///dev/ttyUSB0");
-
-        assertMatching(ADS_URI_PATTERN, "ads:tcp://www.google.de/0.0.0.0.0.0:13");
-        assertMatching(ADS_URI_PATTERN, "ads:tcp://www.google.de:443/0.0.0.0.0.0:13");
-        assertMatching(ADS_URI_PATTERN, "ads:serial:///dev/com1/0.0.0.0.0.0:13");
-        assertMatching(ADS_URI_PATTERN, "ads:serial://COM1/0.0.0.0.0.0:13");
-        assertMatching(ADS_URI_PATTERN, "ads:serial:///dev/ttyUSB0/0.0.0.0.0.0:13");
-
-        assertMatching(ADS_URI_PATTERN, "ads:serial:///dev/ttyUSB0/0.0.0.0.0.0:13?some=random&parameters=true");
-    }
-
-    @Test
-    @RequireInternetConnection
-    public void testDriverWithCompleteUrls() {
-        AdsPlcDriver SUT = new AdsPlcDriver(mock(AdsConnectionFactory.class));
-        Stream.of(
-            "ads:tcp://www.google.de/0.0.0.0.0.0:13",
-            "ads:tcp://www.google.de:443/0.0.0.0.0.0:13",
-            "ads:serial:///dev/com1/0.0.0.0.0.0:13",
-            "ads:serial://COM1/0.0.0.0.0.0:13",
-            "ads:serial:///dev/ttyUSB0/0.0.0.0.0.0:13"
-        ).forEach(url -> {
-            try {
-                SUT.connect(url);
-            } catch (PlcConnectionException e) {
-                throw new PlcRuntimeException(e);
-            }
-        });
-    }
-
-    private void assertMatching(Pattern pattern, String match) {
-        if (!pattern.matcher(match).matches()) {
-            fail(pattern + "doesn't match " + match);
-        }
-    }
-
-    @Test
-    public void getConnection() throws Exception {
-        AdsTcpPlcConnection adsConnection = (AdsTcpPlcConnection)
-            new PlcDriverManager().getConnection("ads:tcp://localhost:" + tcpHexDumper.getPort() + "/0.0.0.0.0.0:13");
-        assertEquals(adsConnection.getTargetAmsNetId().toString(), "0.0.0.0.0.0");
-        assertEquals(adsConnection.getTargetAmsPort().toString(), "13");
-        adsConnection.close();
-    }
-
-    @Test
-    public void getConnectionNoAuthSupported() throws Exception {
-        Assertions.assertThrows(PlcConnectionException.class, () ->
-            new PlcDriverManager().getConnection("ads:tcp://localhost:" + tcpHexDumper.getPort() + "/0.0.0.0.0.0:13",
-                new PlcUsernamePasswordAuthentication("admin", "admin"))
-        );
-    }
-
-    @Test
-    public void getConnectionUnknownHost() {
-        try {
-            new PlcDriverManager().getConnection("ads:tcp://nowhere:8080/0.0.0.0.0.0:13");
-            fail();
-        } catch (Exception e) {
-            assert((e instanceof PlcConnectionException) ||
-                // When running this test on systems with an internet provider that redirects
-                // all unknown hosts to a default host (For showing adds), one of these will
-                // be thrown instead.
-                (e instanceof ConnectTimeoutException) ||
-                (e.getCause() instanceof ConnectException));
-        }
-    }
-
-    @Test
-    public void getConnectionUnknownPort() throws Exception {
-        Assertions.assertThrows(PlcConnectionException.class, () ->
-            new PlcDriverManager().getConnection("ads:tcp://nowhere:unknown/0.0.0.0.0.0:13")
-        );
-    }
-
-    /**
-     * In this test case the 'ads' driver should report an invalid url format.
-     *
-     * @throws PlcException something went wrong
-     */
-    @Test
-    public void getConnectionInvalidUrl() throws PlcException {
-        Assertions.assertThrows(PlcConnectionException.class, () ->
-            new PlcDriverManager().getConnection("ads:tcp://localhost/hurz/2")
-        );
-    }
-
-    @Test
-    public void getProtocol() {
-        AdsPlcDriver driver = new AdsPlcDriver();
-        assertThat(driver.getProtocolCode(), is("ads"));
-        assertThat(driver.getProtocolName(), is("Beckhoff Twincat ADS"));
-    }
-
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.ads;
+
+
+import io.netty.channel.ConnectTimeoutException;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.ads.connection.AdsConnectionFactory;
+import org.apache.plc4x.java.ads.connection.AdsTcpPlcConnection;
+import org.apache.plc4x.java.api.authentication.PlcUsernamePasswordAuthentication;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.exceptions.PlcException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.mock.connection.tcp.TcpHexDumper;
+import org.apache.plc4x.test.RequireInternetConnection;
+import org.junit.jupiter.api.*;
+
+import java.net.ConnectException;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+
+import static org.apache.plc4x.java.ads.AdsPlcDriver.*;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
+
+public class AdsPlcDriverTest {
+
+    public TcpHexDumper tcpHexDumper = new TcpHexDumper(0, 2);
+
+    @BeforeEach
+    public void before() throws Throwable {
+        tcpHexDumper.before();
+    }
+
+    @AfterEach
+    public void after() {
+        tcpHexDumper.after();
+    }
+
+    @Test
+    public void testAdsAddressPattern() {
+        assertMatching(ADS_ADDRESS_PATTERN, "0.0.0.0.0.0:13");
+        assertMatching(ADS_ADDRESS_PATTERN, "0.0.0.0.0.0:13/0.0.0.0.0.0:13");
+
+        assertMatching(INET_ADDRESS_PATTERN, "tcp://localhost");
+        assertMatching(INET_ADDRESS_PATTERN, "tcp://localhost:3131");
+        assertMatching(INET_ADDRESS_PATTERN, "tcp://www.google.de");
+        assertMatching(INET_ADDRESS_PATTERN, "tcp://www.google.de:443");
+
+        assertMatching(SERIAL_PATTERN, "serial:///dev/com1");
+        assertMatching(SERIAL_PATTERN, "serial://COM1");
+        assertMatching(SERIAL_PATTERN, "serial:///dev/ttyUSB0");
+
+        assertMatching(ADS_URI_PATTERN, "ads:tcp://www.google.de/0.0.0.0.0.0:13");
+        assertMatching(ADS_URI_PATTERN, "ads:tcp://www.google.de:443/0.0.0.0.0.0:13");
+        assertMatching(ADS_URI_PATTERN, "ads:serial:///dev/com1/0.0.0.0.0.0:13");
+        assertMatching(ADS_URI_PATTERN, "ads:serial://COM1/0.0.0.0.0.0:13");
+        assertMatching(ADS_URI_PATTERN, "ads:serial:///dev/ttyUSB0/0.0.0.0.0.0:13");
+
+        assertMatching(ADS_URI_PATTERN, "ads:serial:///dev/ttyUSB0/0.0.0.0.0.0:13?some=random&parameters=true");
+    }
+
+    @Test
+    @RequireInternetConnection
+    public void testDriverWithCompleteUrls() {
+        AdsPlcDriver SUT = new AdsPlcDriver(mock(AdsConnectionFactory.class));
+        Stream.of(
+            "ads:tcp://www.google.de/0.0.0.0.0.0:13",
+            "ads:tcp://www.google.de:443/0.0.0.0.0.0:13",
+            "ads:serial:///dev/com1/0.0.0.0.0.0:13",
+            "ads:serial://COM1/0.0.0.0.0.0:13",
+            "ads:serial:///dev/ttyUSB0/0.0.0.0.0.0:13"
+        ).forEach(url -> {
+            try {
+                SUT.connect(url);
+            } catch (PlcConnectionException e) {
+                throw new PlcRuntimeException(e);
+            }
+        });
+    }
+
+    private void assertMatching(Pattern pattern, String match) {
+        if (!pattern.matcher(match).matches()) {
+            fail(pattern + "doesn't match " + match);
+        }
+    }
+
+    @Test
+    public void getConnection() throws Exception {
+        AdsTcpPlcConnection adsConnection = (AdsTcpPlcConnection)
+            new PlcDriverManager().getConnection("ads:tcp://localhost:" + tcpHexDumper.getPort() + "/0.0.0.0.0.0:13");
+        assertEquals(adsConnection.getTargetAmsNetId().toString(), "0.0.0.0.0.0");
+        assertEquals(adsConnection.getTargetAmsPort().toString(), "13");
+        adsConnection.close();
+    }
+
+    @Test
+    public void getConnectionNoAuthSupported() throws Exception {
+        Assertions.assertThrows(PlcConnectionException.class, () ->
+            new PlcDriverManager().getConnection("ads:tcp://localhost:" + tcpHexDumper.getPort() + "/0.0.0.0.0.0:13",
+                new PlcUsernamePasswordAuthentication("admin", "admin"))
+        );
+    }
+
+    @Test
+    public void getConnectionUnknownHost() {
+        try {
+            new PlcDriverManager().getConnection("ads:tcp://nowhere:8080/0.0.0.0.0.0:13");
+            fail();
+        } catch (Exception e) {
+            assert((e instanceof PlcConnectionException) ||
+                // When running this test on systems with an internet provider that redirects
+                // all unknown hosts to a default host (For showing adds), one of these will
+                // be thrown instead.
+                (e instanceof ConnectTimeoutException) ||
+                (e.getCause() instanceof ConnectException));
+        }
+    }
+
+    @Test
+    public void getConnectionUnknownPort() throws Exception {
+        Assertions.assertThrows(PlcConnectionException.class, () ->
+            new PlcDriverManager().getConnection("ads:tcp://nowhere:unknown/0.0.0.0.0.0:13")
+        );
+    }
+
+    /**
+     * In this test case the 'ads' driver should report an invalid url format.
+     *
+     * @throws PlcException something went wrong
+     */
+    @Test
+    public void getConnectionInvalidUrl() throws PlcException {
+        Assertions.assertThrows(PlcConnectionException.class, () ->
+            new PlcDriverManager().getConnection("ads:tcp://localhost/hurz/2")
+        );
+    }
+
+    @Test
+    public void getProtocol() {
+        AdsPlcDriver driver = new AdsPlcDriver();
+        assertThat(driver.getProtocolCode(), is("ads"));
+        assertThat(driver.getProtocolName(), is("Beckhoff Twincat ADS"));
+    }
+
+
+}
diff --git a/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/adslib/ADSClientNotificationExample.java b/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/adslib/ADSClientNotificationExample.java
index 67bf68c6e94..73c7a71a7e9 100644
--- a/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/adslib/ADSClientNotificationExample.java
+++ b/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/adslib/ADSClientNotificationExample.java
@@ -1,283 +1,283 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.adslib;
-
-import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.plc4x.java.ads.api.commands.types.*;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
-
-import java.io.Console;
-import java.io.PrintStream;
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.plc4x.java.ads.adslib.AdsLib.*;
-
-/**
- * Test ported from <a href="https://github.com/Beckhoff/ADS/blob/master/example/example.cpp">github</a>
- * <p>
- * On github there is a test project which can be used to test the protocol. The example there uses a c++ implementation.
- */
-@SuppressWarnings("all")
-public class ADSClientNotificationExample {
-
-    private static void NotifyCallback(ImmutablePair<AmsNetId, AmsPort> pAddr, TimeStamp timeStamp, AdsNotificationSample notificationSample, int hUser) {
-        Data notificationSampleData = notificationSample.getData();
-        byte[] data = notificationSampleData.getBytes();
-        System.out.print("NetId: " + pAddr.left +
-            " hUser 0x" + Integer.toHexString(hUser) +
-            " sample time: " + timeStamp.getAsDate() +
-            " sample size: " + notificationSample.getSampleSize().getAsLong() +
-            " value: ");
-        assert data.length == notificationSample.getSampleSize().getAsLong();
-        System.out.println(" 0x" + Hex.encodeHexString(data));
-    }
-
-    private static SymbolHandle getHandleByNameExample(PrintStream out, long port, ImmutablePair<AmsNetId, AmsPort> server, String handleName) {
-        Output<byte[]> handle = new Output<>();
-        Result handleStatus = AdsSyncReadWriteReqEx2(port,
-            server,
-            IndexGroup.ReservedGroups.ADSIGRP_SYM_HNDBYNAME,
-            IndexOffset.NONE,
-            ReadLength.of(4),
-            handle,
-            WriteLength.of(handleName.length()),
-            Data.of(handleName),
-            new Output<>());
-        if (handleStatus.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-            out.println("Create handle for '" + handleName + "' failed with: " + handleStatus);
-            return null;
-        }
-        return SymbolHandle.of(handle.value);
-    }
-
-    private static void releaseHandleExample(PrintStream out, long port, ImmutablePair<AmsNetId, AmsPort> server, SymbolHandle handle) {
-        Result releaseHandle = AdsSyncWriteReqEx(port, server, IndexGroup.ReservedGroups.ADSIGRP_SYM_RELEASEHND, IndexOffset.NONE, WriteLength.of(4), Data.of(handle.getBytes()));
-        if (releaseHandle.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-            out.println("Release handle " + handle + "' failed with: " + releaseHandle);
-        }
-    }
-
-
-    private static void notificationExample(PrintStream out, long port, ImmutablePair<AmsNetId, AmsPort> server) {
-        AdsNotificationAttribute adsNotificationAttribute = AdsNotificationAttribute.of(
-            Length.of(1),
-            AdsNotificationAttribute.ADSTRANS_SERVERCYCLE,
-            MaxDelay.of(0),
-            CycleTime.of(4000000)
-        );
-
-        Output<Long> notificationHandle = new Output<>();
-        int hUser = 0;
-
-        Result addStatus = AdsSyncAddDeviceNotificationReqEx(port,
-            server,
-            IndexGroup.of(0x4020),
-            IndexOffset.of(4),
-            adsNotificationAttribute,
-            ADSClientNotificationExample::NotifyCallback,
-            hUser,
-            notificationHandle);
-
-        if (addStatus.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-            out.println("Add device notification failed with: " + addStatus);
-            return;
-        }
-
-        out.println("Hit ENTER to stop notifications");
-        tryInteractiveWait();
-
-        Result delStatus = AdsSyncDelDeviceNotificationReqEx(port, server, NotificationHandle.of(notificationHandle.value));
-        if (delStatus.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-            out.println("Delete device notification failed with: " + delStatus);
-            return;
-        }
-    }
-
-    private static void notificationByNameExample(PrintStream out, long port, ImmutablePair<AmsNetId, AmsPort> server) {
-        AdsNotificationAttribute adsNotificationAttribute = AdsNotificationAttribute.of(
-            Length.of(1),
-            AdsNotificationAttribute.ADSTRANS_SERVERCYCLE,
-            MaxDelay.of(0),
-            CycleTime.of(4000000)
-        );
-        Output<Long> notificationHandle = new Output<>();
-        int hUser = 0;
-
-        SymbolHandle handle;
-
-        out.println("notificationByNameExample():");
-        handle = getHandleByNameExample(out, port, server, "MAIN.byByte[4]");
-        if (handle == null) {
-            return;
-        }
-
-        Result addStatus = AdsSyncAddDeviceNotificationReqEx(port,
-            server,
-            IndexGroup.ReservedGroups.ADSIGRP_SYM_VALBYHND,
-            IndexOffset.of(handle.getAsLong()),
-            adsNotificationAttribute,
-            ADSClientNotificationExample::NotifyCallback,
-            hUser,
-            notificationHandle);
-        if (addStatus.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-            out.println("Add device notification failed with: " + addStatus);
-            return;
-        }
-
-        out.println("Hit ENTER to stop by name notifications");
-        tryInteractiveWait();
-
-        Result delStatus = AdsSyncDelDeviceNotificationReqEx(port, server, NotificationHandle.of(notificationHandle.value));
-        if (delStatus.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-            out.println("Delete device notification failed with: " + delStatus);
-            return;
-        }
-        releaseHandleExample(out, port, server, handle);
-    }
-
-    private static void readExample(PrintStream out, long port, ImmutablePair<AmsNetId, AmsPort> server) {
-        Output<Integer> bytesRead = new Output<>();
-        Output<byte[]> buffer = new Output<>();
-
-        out.println("readExample():");
-        for (int i = 0; i < 8; ++i) {
-            Result status = AdsSyncReadReqEx2(port, server, IndexGroup.of(0x4020), IndexOffset.NONE, Length.of(4), buffer, bytesRead);
-            if (status.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-                out.println("ADS read failed with: " + status);
-                return;
-            }
-            out.println("ADS read " + bytesRead.value + " bytes, value: 0x" + Hex.encodeHexString(buffer.value));
-        }
-    }
-
-    private static void readByNameExample(PrintStream out, long port, ImmutablePair<AmsNetId, AmsPort> server) {
-        Output<Integer> bytesRead = new Output<>();
-        Output<byte[]> buffer = new Output<>();
-        SymbolHandle handle;
-
-        out.println("readByNameExample():");
-        handle = getHandleByNameExample(out, port, server, "MAIN.byByte[4]");
-        if (handle == null) {
-            return;
-        }
-
-        for (int i = 0; i < 8; ++i) {
-            Result status = AdsSyncReadReqEx2(port, server, IndexGroup.ReservedGroups.ADSIGRP_SYM_VALBYHND, IndexOffset.of(handle.getAsLong()), Length.of(4), buffer, bytesRead);
-            if (status.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-                out.println("ADS read failed with: " + status);
-                return;
-            }
-            out.println("ADS read " + bytesRead.value + " bytes, value: 0x" + Hex.encodeHexString(buffer.value));
-        }
-        releaseHandleExample(out, port, server, handle);
-    }
-
-    private static void readStateExample(PrintStream out, long port, ImmutablePair<AmsNetId, AmsPort> server) {
-        Output<Integer> adsState = new Output<>();
-        Output<Integer> devState = new Output<>();
-
-        Result status = AdsSyncReadStateReqEx(port, server, adsState, devState);
-        if (status.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-            out.println("ADS read failed with: " + status);
-            return;
-        }
-        out.println("ADS state: " + adsState.value + " devState: " + devState.value);
-    }
-
-    private static void runExample(String remoteNetIdString, String remoteIpV4, PrintStream out) {
-        AmsNetId remoteNetId = AmsNetId.of(remoteNetIdString);
-
-        // uncomment and adjust if automatic AmsNetId deduction is not working as expected
-        AdsSetLocalAddress(AmsNetId.of("10.10.56.23.1.1"));
-
-        // add local route to your EtherCAT Master
-        if (AdsAddRoute(remoteNetId, remoteIpV4).toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-            out.println("Adding ADS route failed, did you specified valid addresses?");
-            return;
-        }
-
-        // open a new ADS port
-        long port = AdsPortOpenEx();
-        if (port < 0) {
-            out.println("Open ADS port failed");
-            return;
-        }
-
-
-        ImmutablePair<AmsNetId, AmsPort> remote = ImmutablePair.of(remoteNetId, AmsPort.of(851));
-
-        notificationExample(out, port, remote);
-        notificationByNameExample(out, port, remote);
-        readExample(out, port, remote);
-        readByNameExample(out, port, remote);
-        readStateExample(out, port, remote);
-
-        Result closeStatus = AdsPortCloseEx(port);
-        if (closeStatus.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-            out.println("Close ADS port failed with: " + closeStatus);
-        }
-
-        AdsDelRoute(remoteNetId);
-    }
-
-    public static void main(String... args) {
-        String remoteNetIdString = "10.10.64.40.1.1";
-        String remoteIpV4 = "10.10.64.40";
-        if (args.length == 2) {
-            remoteIpV4 = args[0];
-            remoteNetIdString = args[1];
-            System.out.println("Using supplied arguments " + remoteIpV4 + "/" + remoteNetIdString);
-        }
-        runExample(remoteNetIdString, remoteIpV4, System.out);
-        System.exit(0);
-    }
-
-    /////
-    // Utils
-    private static void tryInteractiveWait() {
-        Console console = System.console();
-        if (console != null) {
-            console.readLine();
-        } else {
-            try {
-                int timeout = Integer.valueOf(System.getProperty("input.timeout", "3"));
-                System.out.println("Using timeout of " + timeout + "Seconds as System.console() is not available. Override with -Dinput.timeout=3");
-                TimeUnit.SECONDS.sleep(timeout);
-                System.out.println("Timeout reached enter pressed");
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    static class SymbolHandle extends UnsignedIntLEByteValue {
-
-        public SymbolHandle(byte... bytes) {
-            super(bytes);
-        }
-
-        public static SymbolHandle of(byte... bytes) {
-            return new SymbolHandle(bytes);
-        }
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.adslib;
+
+import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.plc4x.java.ads.api.commands.types.*;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
+
+import java.io.Console;
+import java.io.PrintStream;
+import java.util.concurrent.TimeUnit;
+
+import static org.apache.plc4x.java.ads.adslib.AdsLib.*;
+
+/**
+ * Test ported from <a href="https://github.com/Beckhoff/ADS/blob/master/example/example.cpp">github</a>
+ * <p>
+ * On github there is a test project which can be used to test the protocol. The example there uses a c++ implementation.
+ */
+@SuppressWarnings("all")
+public class ADSClientNotificationExample {
+
+    private static void NotifyCallback(ImmutablePair<AmsNetId, AmsPort> pAddr, TimeStamp timeStamp, AdsNotificationSample notificationSample, int hUser) {
+        Data notificationSampleData = notificationSample.getData();
+        byte[] data = notificationSampleData.getBytes();
+        System.out.print("NetId: " + pAddr.left +
+            " hUser 0x" + Integer.toHexString(hUser) +
+            " sample time: " + timeStamp.getAsDate() +
+            " sample size: " + notificationSample.getSampleSize().getAsLong() +
+            " value: ");
+        assert data.length == notificationSample.getSampleSize().getAsLong();
+        System.out.println(" 0x" + Hex.encodeHexString(data));
+    }
+
+    private static SymbolHandle getHandleByNameExample(PrintStream out, long port, ImmutablePair<AmsNetId, AmsPort> server, String handleName) {
+        Output<byte[]> handle = new Output<>();
+        Result handleStatus = AdsSyncReadWriteReqEx2(port,
+            server,
+            IndexGroup.ReservedGroups.ADSIGRP_SYM_HNDBYNAME,
+            IndexOffset.NONE,
+            ReadLength.of(4),
+            handle,
+            WriteLength.of(handleName.length()),
+            Data.of(handleName),
+            new Output<>());
+        if (handleStatus.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+            out.println("Create handle for '" + handleName + "' failed with: " + handleStatus);
+            return null;
+        }
+        return SymbolHandle.of(handle.value);
+    }
+
+    private static void releaseHandleExample(PrintStream out, long port, ImmutablePair<AmsNetId, AmsPort> server, SymbolHandle handle) {
+        Result releaseHandle = AdsSyncWriteReqEx(port, server, IndexGroup.ReservedGroups.ADSIGRP_SYM_RELEASEHND, IndexOffset.NONE, WriteLength.of(4), Data.of(handle.getBytes()));
+        if (releaseHandle.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+            out.println("Release handle " + handle + "' failed with: " + releaseHandle);
+        }
+    }
+
+
+    private static void notificationExample(PrintStream out, long port, ImmutablePair<AmsNetId, AmsPort> server) {
+        AdsNotificationAttribute adsNotificationAttribute = AdsNotificationAttribute.of(
+            Length.of(1),
+            AdsNotificationAttribute.ADSTRANS_SERVERCYCLE,
+            MaxDelay.of(0),
+            CycleTime.of(4000000)
+        );
+
+        Output<Long> notificationHandle = new Output<>();
+        int hUser = 0;
+
+        Result addStatus = AdsSyncAddDeviceNotificationReqEx(port,
+            server,
+            IndexGroup.of(0x4020),
+            IndexOffset.of(4),
+            adsNotificationAttribute,
+            ADSClientNotificationExample::NotifyCallback,
+            hUser,
+            notificationHandle);
+
+        if (addStatus.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+            out.println("Add device notification failed with: " + addStatus);
+            return;
+        }
+
+        out.println("Hit ENTER to stop notifications");
+        tryInteractiveWait();
+
+        Result delStatus = AdsSyncDelDeviceNotificationReqEx(port, server, NotificationHandle.of(notificationHandle.value));
+        if (delStatus.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+            out.println("Delete device notification failed with: " + delStatus);
+            return;
+        }
+    }
+
+    private static void notificationByNameExample(PrintStream out, long port, ImmutablePair<AmsNetId, AmsPort> server) {
+        AdsNotificationAttribute adsNotificationAttribute = AdsNotificationAttribute.of(
+            Length.of(1),
+            AdsNotificationAttribute.ADSTRANS_SERVERCYCLE,
+            MaxDelay.of(0),
+            CycleTime.of(4000000)
+        );
+        Output<Long> notificationHandle = new Output<>();
+        int hUser = 0;
+
+        SymbolHandle handle;
+
+        out.println("notificationByNameExample():");
+        handle = getHandleByNameExample(out, port, server, "MAIN.byByte[4]");
+        if (handle == null) {
+            return;
+        }
+
+        Result addStatus = AdsSyncAddDeviceNotificationReqEx(port,
+            server,
+            IndexGroup.ReservedGroups.ADSIGRP_SYM_VALBYHND,
+            IndexOffset.of(handle.getAsLong()),
+            adsNotificationAttribute,
+            ADSClientNotificationExample::NotifyCallback,
+            hUser,
+            notificationHandle);
+        if (addStatus.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+            out.println("Add device notification failed with: " + addStatus);
+            return;
+        }
+
+        out.println("Hit ENTER to stop by name notifications");
+        tryInteractiveWait();
+
+        Result delStatus = AdsSyncDelDeviceNotificationReqEx(port, server, NotificationHandle.of(notificationHandle.value));
+        if (delStatus.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+            out.println("Delete device notification failed with: " + delStatus);
+            return;
+        }
+        releaseHandleExample(out, port, server, handle);
+    }
+
+    private static void readExample(PrintStream out, long port, ImmutablePair<AmsNetId, AmsPort> server) {
+        Output<Integer> bytesRead = new Output<>();
+        Output<byte[]> buffer = new Output<>();
+
+        out.println("readExample():");
+        for (int i = 0; i < 8; ++i) {
+            Result status = AdsSyncReadReqEx2(port, server, IndexGroup.of(0x4020), IndexOffset.NONE, Length.of(4), buffer, bytesRead);
+            if (status.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+                out.println("ADS read failed with: " + status);
+                return;
+            }
+            out.println("ADS read " + bytesRead.value + " bytes, value: 0x" + Hex.encodeHexString(buffer.value));
+        }
+    }
+
+    private static void readByNameExample(PrintStream out, long port, ImmutablePair<AmsNetId, AmsPort> server) {
+        Output<Integer> bytesRead = new Output<>();
+        Output<byte[]> buffer = new Output<>();
+        SymbolHandle handle;
+
+        out.println("readByNameExample():");
+        handle = getHandleByNameExample(out, port, server, "MAIN.byByte[4]");
+        if (handle == null) {
+            return;
+        }
+
+        for (int i = 0; i < 8; ++i) {
+            Result status = AdsSyncReadReqEx2(port, server, IndexGroup.ReservedGroups.ADSIGRP_SYM_VALBYHND, IndexOffset.of(handle.getAsLong()), Length.of(4), buffer, bytesRead);
+            if (status.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+                out.println("ADS read failed with: " + status);
+                return;
+            }
+            out.println("ADS read " + bytesRead.value + " bytes, value: 0x" + Hex.encodeHexString(buffer.value));
+        }
+        releaseHandleExample(out, port, server, handle);
+    }
+
+    private static void readStateExample(PrintStream out, long port, ImmutablePair<AmsNetId, AmsPort> server) {
+        Output<Integer> adsState = new Output<>();
+        Output<Integer> devState = new Output<>();
+
+        Result status = AdsSyncReadStateReqEx(port, server, adsState, devState);
+        if (status.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+            out.println("ADS read failed with: " + status);
+            return;
+        }
+        out.println("ADS state: " + adsState.value + " devState: " + devState.value);
+    }
+
+    private static void runExample(String remoteNetIdString, String remoteIpV4, PrintStream out) {
+        AmsNetId remoteNetId = AmsNetId.of(remoteNetIdString);
+
+        // uncomment and adjust if automatic AmsNetId deduction is not working as expected
+        AdsSetLocalAddress(AmsNetId.of("10.10.56.23.1.1"));
+
+        // add local route to your EtherCAT Master
+        if (AdsAddRoute(remoteNetId, remoteIpV4).toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+            out.println("Adding ADS route failed, did you specified valid addresses?");
+            return;
+        }
+
+        // open a new ADS port
+        long port = AdsPortOpenEx();
+        if (port < 0) {
+            out.println("Open ADS port failed");
+            return;
+        }
+
+
+        ImmutablePair<AmsNetId, AmsPort> remote = ImmutablePair.of(remoteNetId, AmsPort.of(851));
+
+        notificationExample(out, port, remote);
+        notificationByNameExample(out, port, remote);
+        readExample(out, port, remote);
+        readByNameExample(out, port, remote);
+        readStateExample(out, port, remote);
+
+        Result closeStatus = AdsPortCloseEx(port);
+        if (closeStatus.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+            out.println("Close ADS port failed with: " + closeStatus);
+        }
+
+        AdsDelRoute(remoteNetId);
+    }
+
+    public static void main(String... args) {
+        String remoteNetIdString = "10.10.64.40.1.1";
+        String remoteIpV4 = "10.10.64.40";
+        if (args.length == 2) {
+            remoteIpV4 = args[0];
+            remoteNetIdString = args[1];
+            System.out.println("Using supplied arguments " + remoteIpV4 + "/" + remoteNetIdString);
+        }
+        runExample(remoteNetIdString, remoteIpV4, System.out);
+        System.exit(0);
+    }
+
+    /////
+    // Utils
+    private static void tryInteractiveWait() {
+        Console console = System.console();
+        if (console != null) {
+            console.readLine();
+        } else {
+            try {
+                int timeout = Integer.valueOf(System.getProperty("input.timeout", "3"));
+                System.out.println("Using timeout of " + timeout + "Seconds as System.console() is not available. Override with -Dinput.timeout=3");
+                TimeUnit.SECONDS.sleep(timeout);
+                System.out.println("Timeout reached enter pressed");
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    static class SymbolHandle extends UnsignedIntLEByteValue {
+
+        public SymbolHandle(byte... bytes) {
+            super(bytes);
+        }
+
+        public static SymbolHandle of(byte... bytes) {
+            return new SymbolHandle(bytes);
+        }
+    }
+}
diff --git a/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/adslib/AdsLib.java b/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/adslib/AdsLib.java
index 08a31daebdb..abeac419139 100644
--- a/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/adslib/AdsLib.java
+++ b/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/adslib/AdsLib.java
@@ -1,565 +1,565 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.adslib;
-
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Triple;
-import org.apache.plc4x.java.ads.api.commands.*;
-import org.apache.plc4x.java.ads.api.commands.types.*;
-import org.apache.plc4x.java.ads.api.generic.types.AmsError;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.Inet4Address;
-import java.net.UnknownHostException;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-/**
- * Ported from <a href="https://github.com/Beckhoff/ADS">github AdsLib</a>
- */
-@SuppressWarnings("all")
-public class AdsLib {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(AdsLib.class);
-
-    private static final AmsRouter amsRouter = new AmsRouter();
-
-    private static AmsRouter GetRouter() {
-        return amsRouter;
-    }
-
-    /**
-     * Add new ams route to target system
-     *
-     * @param ams address of the target system
-     * @param ip  address of the target system
-     * @return [ADS Return Code](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/ads_returncodes.htm?id=17663)
-     */
-    public static Result AdsAddRoute(AmsNetId ams, String ip) {
-        try {
-            return GetRouter().AddRoute(ams, (Inet4Address) Inet4Address.getByName(ip));
-        } catch (UnknownHostException e) {
-            LOGGER.error("Error adding route", e);
-            return Result.of(AdsReturnCode.ADS_CODE_1);
-        }
-    }
-
-    /**
-     * Delete ams route that had previously been added with AdsAddRoute().
-     *
-     * @param ams address of the target system
-     */
-    public static void AdsDelRoute(AmsNetId ams) {
-        GetRouter().DelRoute(ams);
-    }
-
-    /**
-     * The connection (communication port) to the message router is
-     * closed. The port to be closed must previously have been opened via
-     * an AdsPortOpenEx() call.
-     *
-     * @param port port number of an Ads port that had previously been opened with AdsPortOpenEx().
-     * @return [ADS Return Code](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/ads_returncodes.htm?id=17663)
-     */
-    public static Result AdsPortCloseEx(long port) {
-        return GetRouter().ClosePort((int) port);
-    }
-
-    /**
-     * Establishes a connection (communication port) to the message
-     * router. The port number returned by AdsPortOpenEx() is required as
-     * parameter for further AdsLib function calls.
-     *
-     * @return port number of a new Ads port or 0 if no more ports available
-     */
-    public static long AdsPortOpenEx() {
-        return GetRouter().OpenPort();
-    }
-
-    /**
-     * Returns the local NetId and port number.
-     *
-     * @param port  port number of an Ads port that had previously been opened with AdsPortOpenEx().
-     * @param pAddr Pointer to the structure of type {@code ImmutablePair<AmsNetId, AmsPort>}.
-     * @return [ADS Return Code](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/ads_returncodes.htm?id=17663)
-     */
-    public static Result AdsGetLocalAddressEx(long port, Output<ImmutablePair<AmsNetId, AmsPort>> pAddr) {
-        return GetRouter().GetLocalAddress((int) port, pAddr);
-    }
-
-    /**
-     * Change local NetId
-     *
-     * @param ams local AmsNetId
-     */
-    public static void AdsSetLocalAddress(AmsNetId ams) {
-        GetRouter().SetLocalAddress(ams);
-    }
-
-    /**
-     * Reads data synchronously from an ADS server.
-     *
-     * @param port         port number of an Ads port that had previously been opened with AdsPortOpenEx().
-     * @param pAddr        Structure with NetId and port number of the ADS server.
-     * @param indexGroup   Index Group.
-     * @param indexOffset  Index Offset.
-     * @param bufferLength Length of the data in bytes.
-     * @param buffer       Pointer to a data buffer that will receive the data.
-     * @param bytesRead    pointer to a variable. If successful, this variable will return the number of actually read data bytes.
-     * @return [ADS Return Code](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/ads_returncodes.htm?id=17663)
-     */
-    public static Result AdsSyncReadReqEx2(long port,
-                                           ImmutablePair<AmsNetId, AmsPort> pAddr,
-                                           IndexGroup indexGroup,
-                                           IndexOffset indexOffset,
-                                           Length bufferLength,
-                                           Output<byte[]> buffer,
-                                           Output<Integer> bytesRead) {
-        Output<ImmutablePair<AmsNetId, AmsPort>> localAmsNet = new Output<>();
-        Result getLocalAddressResult = GetRouter().GetLocalAddress((int) port, localAmsNet);
-        if (getLocalAddressResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-            return getLocalAddressResult;
-        }
-        AdsReadRequest adsReadRequest = AdsReadRequest.of(
-            pAddr.left,
-            pAddr.right,
-            localAmsNet.value.left,
-            localAmsNet.value.right,
-            Invoke.NONE,
-            indexGroup,
-            indexOffset,
-            bufferLength
-        );
-
-        AmsRequest<AdsReadRequest, AdsReadResponse> request = AmsRequest.of(adsReadRequest);
-        AmsError adsRequestResult = GetRouter().AdsRequest(request);
-        if (adsRequestResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-            return Result.of(adsRequestResult.getAsLong());
-        }
-        try {
-            AdsReadResponse response = request.getResponseFuture().get(3, TimeUnit.SECONDS);
-            byte[] bytes = response.getData().getBytes();
-            buffer.value = bytes;
-            bytesRead.value = bytes.length;
-            return response.getResult();
-        } catch (ExecutionException | TimeoutException e) {
-            e.printStackTrace();
-            return Result.of(AdsReturnCode.ADS_CODE_1);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-            Thread.currentThread().interrupt();
-            return Result.of(AdsReturnCode.ADS_CODE_1);
-        }
-    }
-
-    /**
-     * Reads the identification and version number of an ADS server.
-     *
-     * @param port    port number of an Ads port that had previously been opened with AdsPortOpenEx().
-     * @param pAddr   Structure with NetId and port number of the ADS server.
-     * @param devName Pointer to a character string of at least 16 bytes, that will receive the name of the ADS device.
-     * @param version Address of a variable of type AdsVersion, which will receive the version number, revision number and the build number.
-     * @return [ADS Return Code](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/ads_returncodes.htm?id=17663)
-     */
-    public static Result AdsSyncReadDeviceInfoReqEx(long port, ImmutablePair<AmsNetId, AmsPort> pAddr, Output<String> devName, Output<Triple<Byte, Byte, Integer>> version) {
-        Output<ImmutablePair<AmsNetId, AmsPort>> localAmsNet = new Output<>();
-        Result getLocalAddressResult = GetRouter().GetLocalAddress((int) port, localAmsNet);
-        if (getLocalAddressResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-            return getLocalAddressResult;
-        }
-        AdsReadDeviceInfoRequest adsReadDeviceInfoRequest = AdsReadDeviceInfoRequest.of(
-            pAddr.left,
-            pAddr.right,
-            localAmsNet.value.left,
-            localAmsNet.value.right,
-            Invoke.NONE
-        );
-        AmsRequest<AdsReadDeviceInfoRequest, AdsReadDeviceInfoResponse> request = AmsRequest.of(adsReadDeviceInfoRequest);
-        AmsError adsRequestResult = GetRouter().AdsRequest(request);
-        if (adsRequestResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-            return Result.of(adsRequestResult.getAsLong());
-        }
-        try {
-            AdsReadDeviceInfoResponse response = request.getResponseFuture().get(3, TimeUnit.SECONDS);
-            devName.value = new String(response.getDevice().getBytes());
-            version.value = Triple.of(response.getMajorVersion().getAsByte(), response.getMinorVersion().getAsByte(), response.getVersion().getAsInt());
-            return response.getResult();
-        } catch (InterruptedException | ExecutionException | TimeoutException e) {
-            e.printStackTrace();
-            return Result.of(AdsReturnCode.ADS_CODE_1);
-        }
-    }
-
-    /**
-     * Reads the ADS status and the device status from an ADS server.
-     *
-     * @param port     port number of an Ads port that had previously been opened with AdsPortOpenEx().
-     * @param pAddr    Structure with NetId and port number of the ADS server.
-     * @param adsState Address of a variable that will receive the ADS status (see data type [ADSSTATE](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/tcadsdll_enumadsstate.htm?id=17630)).
-     * @param devState Address of a variable that will receive the device status.
-     * @return [ADS Return Code](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/ads_returncodes.htm?id=17663)
-     */
-    public static Result AdsSyncReadStateReqEx(long port, ImmutablePair<AmsNetId, AmsPort> pAddr, Output<Integer> adsState, Output<Integer> devState) {
-        Output<ImmutablePair<AmsNetId, AmsPort>> localAmsNet = new Output<>();
-        Result getLocalAddressResult = GetRouter().GetLocalAddress((int) port, localAmsNet);
-        if (getLocalAddressResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-            return getLocalAddressResult;
-        }
-        AdsReadStateRequest adsReadStateRequest = AdsReadStateRequest.of(
-            pAddr.left,
-            pAddr.right,
-            localAmsNet.value.left,
-            localAmsNet.value.right,
-            Invoke.NONE
-        );
-        AmsRequest<AdsReadStateRequest, AdsReadStateResponse> request = AmsRequest.of(adsReadStateRequest);
-        AmsError adsRequestResult = GetRouter().AdsRequest(request);
-        if (adsRequestResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-            return Result.of(adsRequestResult.getAsLong());
-        }
-        try {
-            AdsReadStateResponse response = request.getResponseFuture().get(3, TimeUnit.SECONDS);
-            adsState.value = response.getAdsState().getAsInt();
-            devState.value = response.getDeviceState().getAsInt();
-            return response.getResult();
-        } catch (ExecutionException | TimeoutException e) {
-            e.printStackTrace();
-            return Result.of(AdsReturnCode.ADS_CODE_1);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-            Thread.currentThread().interrupt();
-            return Result.of(AdsReturnCode.ADS_CODE_1);
-        }
-    }
-
-    /**
-     * Writes data synchronously into an ADS server and receives data back from the ADS server.
-     *
-     * @param port        port number of an Ads port that had previously been opened with AdsPortOpenEx().
-     * @param pAddr       Structure with NetId and port number of the ADS server.
-     * @param indexGroup  Index Group.
-     * @param indexOffset Index Offset.
-     * @param readLength  Length, in bytes, of the read buffer readData.
-     * @param readData    Buffer for data read from the ADS server.
-     * @param writeLength Length of the data, in bytes, send to the ADS server.
-     * @param writeData   Buffer with data send to the ADS server.
-     * @param bytesRead   pointer to a variable. If successful, this variable will return the number of actually read data bytes.
-     * @return [ADS Return Code](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/ads_returncodes.htm?id=17663)
-     */
-    public static Result AdsSyncReadWriteReqEx2(long port,
-                                                ImmutablePair<AmsNetId, AmsPort> pAddr,
-                                                IndexGroup indexGroup,
-                                                IndexOffset indexOffset,
-                                                ReadLength readLength,
-                                                Output<byte[]> readData,
-                                                WriteLength writeLength,
-                                                Data writeData,
-                                                Output<Integer> bytesRead) {
-        Output<ImmutablePair<AmsNetId, AmsPort>> localAmsNet = new Output<>();
-        Result getLocalAddressResult = GetRouter().GetLocalAddress((int) port, localAmsNet);
-        if (getLocalAddressResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-            return getLocalAddressResult;
-        }
-        AdsReadWriteRequest adsReadWriteRequest = AdsReadWriteRequest.of(
-            pAddr.left,
-            pAddr.right,
-            localAmsNet.value.left,
-            localAmsNet.value.right,
-            Invoke.NONE,
-            indexGroup,
-            indexOffset,
-            readLength,
-            writeData
-        );
-        AmsRequest<AdsReadWriteRequest, AdsReadWriteResponse> request = AmsRequest.of(adsReadWriteRequest);
-        AmsError adsRequestResult = GetRouter().AdsRequest(request);
-        if (adsRequestResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-            return Result.of(adsRequestResult.getAsLong());
-        }
-        try {
-            AdsReadWriteResponse response = request.getResponseFuture().get(3, TimeUnit.SECONDS);
-            byte[] bytes = response.getData().getBytes();
-            readData.value = bytes;
-            bytesRead.value = bytes.length;
-            return response.getResult();
-        } catch (InterruptedException | ExecutionException | TimeoutException e) {
-            e.printStackTrace();
-            return Result.of(AdsReturnCode.ADS_CODE_1);
-        }
-    }
-
-    /**
-     * Writes data synchronously to an ADS server.
-     *
-     * @param port         port number of an Ads port that had previously been opened with AdsPortOpenEx().
-     * @param pAddr        Structure with NetId and port number of the ADS server.
-     * @param indexGroup   Index Group.
-     * @param indexOffset  Index Offset.
-     * @param bufferLength Length of the data, in bytes, send to the ADS server.
-     * @param buffer       Buffer with data send to the ADS server.
-     * @return [ADS Return Code](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/ads_returncodes.htm?id=17663)
-     */
-    public static Result AdsSyncWriteReqEx(long port,
-                                           ImmutablePair<AmsNetId, AmsPort> pAddr,
-                                           IndexGroup indexGroup,
-                                           IndexOffset indexOffset,
-                                           WriteLength bufferLength,
-                                           Data buffer) {
-        Output<ImmutablePair<AmsNetId, AmsPort>> localAmsNet = new Output<>();
-        Result getLocalAddressResult = GetRouter().GetLocalAddress((int) port, localAmsNet);
-        if (getLocalAddressResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-            return getLocalAddressResult;
-        }
-        AdsWriteRequest adsWriteRequest = AdsWriteRequest.of(
-            pAddr.left,
-            pAddr.right,
-            localAmsNet.value.left,
-            localAmsNet.value.right,
-            Invoke.NONE,
-            indexGroup,
-            indexOffset,
-            buffer
-        );
-        AmsRequest<AdsWriteRequest, AdsWriteResponse> request = AmsRequest.of(adsWriteRequest);
-        AmsError adsRequestResult = GetRouter().AdsRequest(request);
-        if (adsRequestResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-            return Result.of(adsRequestResult.getAsLong());
-        }
-        try {
-            AdsWriteResponse response = request.getResponseFuture().get(3, TimeUnit.SECONDS);
-            return response.getResult();
-        } catch (ExecutionException | TimeoutException e) {
-            e.printStackTrace();
-            return Result.of(AdsReturnCode.ADS_CODE_1);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-            Thread.currentThread().interrupt();
-            return Result.of(AdsReturnCode.ADS_CODE_1);
-        }
-    }
-
-    /**
-     * Changes the ADS status and the device status of an ADS server.
-     *
-     * @param port         port number of an Ads port that had previously been opened with AdsPortOpenEx().
-     * @param pAddr        Structure with NetId and port number of the ADS server.
-     * @param adsState     New ADS status.
-     * @param devState     New device status.
-     * @param bufferLength Length of the additional data, in bytes, send to the ADS server.
-     * @param buffer       Buffer with additional data send to the ADS server.
-     * @return [ADS Return Code](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/ads_returncodes.htm?id=17663)
-     */
-    public static Result AdsSyncWriteControlReqEx(long port,
-                                                  ImmutablePair<AmsNetId, AmsPort> pAddr,
-                                                  short adsState,
-                                                  short devState,
-                                                  int bufferLength,
-                                                  byte[] buffer) {
-        Output<ImmutablePair<AmsNetId, AmsPort>> localAmsNet = new Output<>();
-        Result getLocalAddressResult = GetRouter().GetLocalAddress((int) port, localAmsNet);
-        if (getLocalAddressResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-            return getLocalAddressResult;
-        }
-        AdsWriteControlRequest adsWriteControlRequest = AdsWriteControlRequest.of(
-            pAddr.left,
-            pAddr.right,
-            localAmsNet.value.left,
-            localAmsNet.value.right,
-            Invoke.NONE,
-            AdsState.of(adsState),
-            DeviceState.of(devState),
-            Data.of(buffer)
-        );
-        AmsRequest<AdsWriteControlRequest, AdsWriteControlResponse> request = AmsRequest.of(adsWriteControlRequest);
-        AmsError adsRequestResult = GetRouter().AdsRequest(request);
-        if (adsRequestResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-            return Result.of(adsRequestResult.getAsLong());
-        }
-        try {
-            AdsWriteControlResponse response = request.getResponseFuture().get(3, TimeUnit.SECONDS);
-            return response.getResult();
-        } catch (InterruptedException | ExecutionException | TimeoutException e) {
-            e.printStackTrace();
-            return Result.of(AdsReturnCode.ADS_CODE_1);
-        }
-    }
-
-    /**
-     * A notification is defined within an ADS server (e.g. PLC). When a
-     * certain event occurs a function (the callback function) is invoked in
-     * the ADS client (C program).
-     *
-     * @param port          port number of an Ads port that had previously been opened with AdsPortOpenEx().
-     * @param pAddr         Structure with NetId and port number of the ADS server.
-     * @param indexGroup    Index Group.
-     * @param indexOffset   Index Offset.
-     * @param attribute     Pointer to the structure that contains further information.
-     * @param pFunc         Pointer to the structure describing the callback function.
-     * @param hUser         32-bit value that is passed to the callback function.
-     * @param pNotification Address of the variable that will receive the handle of the notification.
-     * @return [ADS Return Code](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/ads_returncodes.htm?id=17663)
-     */
-    public static Result AdsSyncAddDeviceNotificationReqEx(long port,
-                                                           ImmutablePair<AmsNetId, AmsPort> pAddr,
-                                                           IndexGroup indexGroup,
-                                                           IndexOffset indexOffset,
-                                                           AdsNotificationAttribute attribute,
-                                                           PAdsNotificationFuncEx pFunc,
-                                                           int hUser,
-                                                           Output<Long> pNotification) {
-        Output<ImmutablePair<AmsNetId, AmsPort>> localAmsNet = new Output<>();
-        Result getLocalAddressResult = GetRouter().GetLocalAddress((int) port, localAmsNet);
-        if (getLocalAddressResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-            return getLocalAddressResult;
-        }
-        AdsAddDeviceNotificationRequest adsAddDeviceNotificationRequest = AdsAddDeviceNotificationRequest.of(
-            pAddr.left,
-            pAddr.right,
-            localAmsNet.value.left,
-            localAmsNet.value.right,
-            Invoke.NONE,
-            indexGroup,
-            indexOffset,
-            attribute.length,
-            attribute.transmissionMode,
-            attribute.maxDelay,
-            attribute.cycleTime
-        );
-        AmsRouter.Notification notify = AmsRouter.Notification.of(pFunc, hUser, attribute.length, pAddr, port);
-        AmsRequest<AdsAddDeviceNotificationRequest, AdsAddDeviceNotificationResponse> request = AmsRequest.of(adsAddDeviceNotificationRequest);
-        AmsError adsRequestResult = GetRouter().AddNotification(request, pNotification, notify);
-        if (adsRequestResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-            return Result.of(adsRequestResult.getAsLong());
-        }
-        try {
-            AdsAddDeviceNotificationResponse response = request.getResponseFuture().get(3, TimeUnit.SECONDS);
-            return response.getResult();
-        } catch (ExecutionException | TimeoutException e) {
-            e.printStackTrace();
-            return Result.of(AdsReturnCode.ADS_CODE_1);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-            Thread.currentThread().interrupt();
-            return Result.of(AdsReturnCode.ADS_CODE_1);
-        }
-    }
-
-    /**
-     * A notification defined previously is deleted from an ADS server.
-     *
-     * @param port               port number of an Ads port that had previously been opened with AdsPortOpenEx().
-     * @param pAddr              Structure with NetId and port number of the ADS server.
-     * @param notificationHandle Address of the variable that contains the handle of the notification.
-     * @return [ADS Return Code](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/ads_returncodes.htm?id=17663)
-     */
-    public static Result AdsSyncDelDeviceNotificationReqEx(long port, ImmutablePair<AmsNetId, AmsPort> pAddr, NotificationHandle notificationHandle) {
-        Output<ImmutablePair<AmsNetId, AmsPort>> localAmsNet = new Output<>();
-        Result getLocalAddressResult = GetRouter().GetLocalAddress((int) port, localAmsNet);
-        if (getLocalAddressResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-            return getLocalAddressResult;
-        }
-        AdsDeleteDeviceNotificationRequest adsDeleteDeviceNotificationRequest = AdsDeleteDeviceNotificationRequest.of(
-            pAddr.left,
-            pAddr.right,
-            localAmsNet.value.left,
-            localAmsNet.value.right,
-            Invoke.NONE,
-            notificationHandle
-        );
-        AmsRequest<AdsDeleteDeviceNotificationRequest, AdsDeleteDeviceNotificationResponse> request = AmsRequest.of(adsDeleteDeviceNotificationRequest);
-        AmsError adsRequestResult = GetRouter().DelNotification((int) port, pAddr, request);
-        if (adsRequestResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-            return Result.of(adsRequestResult.getAsLong());
-        }
-        try {
-            AdsDeleteDeviceNotificationResponse response = request.getResponseFuture().get(3, TimeUnit.SECONDS);
-            return response.getResult();
-        } catch (ExecutionException | TimeoutException e) {
-            e.printStackTrace();
-            return Result.of(AdsReturnCode.ADS_CODE_1);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-            Thread.currentThread().interrupt();
-            return Result.of(AdsReturnCode.ADS_CODE_1);
-        }
-    }
-
-    /**
-     * Read the configured timeout for the ADS functions. The standard value is 5000 ms.
-     *
-     * @param port    port number of an Ads port that had previously been opened with AdsPortOpenEx().
-     * @param timeout Buffer to store timeout value in ms.
-     * @return [ADS Return Code](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/ads_returncodes.htm?id=17663)
-     */
-    public static Result AdsSyncGetTimeoutEx(long port, Output<Integer> timeout) {
-        return GetRouter().GetTimeout((int) port, timeout);
-    }
-
-    /**
-     * Alters the timeout for the ADS functions. The standard value is 5000 ms.
-     *
-     * @param port    port number of an Ads port that had previously been opened with AdsPortOpenEx().
-     * @param timeout Timeout in ms.
-     * @return [ADS Return Code](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/ads_returncodes.htm?id=17663)
-     */
-    public static Result AdsSyncSetTimeoutEx(long port, int timeout) {
-        return GetRouter().SetTimeout((int) port, timeout);
-    }
-
-    ////
-    // Utils
-
-    /**
-     * Ported from <a href="https://github.com/Beckhoff/ADS">github AdsLib</a>
-     */
-    @FunctionalInterface
-    public interface PAdsNotificationFuncEx {
-        void notifyCallback(ImmutablePair<AmsNetId, AmsPort> pAddr, TimeStamp timeStamp, AdsNotificationSample notificationSample, int hUser);
-    }
-
-    /**
-     * Ported from <a href="https://github.com/Beckhoff/ADS">github AdsLib</a>
-     */
-    public static class AdsNotificationAttribute {
-
-        public static TransmissionMode ADSTRANS_SERVERCYCLE = TransmissionMode.of(3);
-
-        public final Length length;
-        public final TransmissionMode transmissionMode;
-        public final MaxDelay maxDelay;
-        public final CycleTime cycleTime;
-
-        public AdsNotificationAttribute(Length length, TransmissionMode transmissionMode, MaxDelay maxDelay, CycleTime cycleTime) {
-            this.length = length;
-            this.transmissionMode = transmissionMode;
-            this.maxDelay = maxDelay;
-            this.cycleTime = cycleTime;
-        }
-
-        public static AdsNotificationAttribute of(Length length, TransmissionMode transmissionMode, MaxDelay maxDelay, CycleTime cycleTime) {
-            return new AdsNotificationAttribute(length, transmissionMode, maxDelay, cycleTime);
-        }
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.adslib;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Triple;
+import org.apache.plc4x.java.ads.api.commands.*;
+import org.apache.plc4x.java.ads.api.commands.types.*;
+import org.apache.plc4x.java.ads.api.generic.types.AmsError;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.Inet4Address;
+import java.net.UnknownHostException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+/**
+ * Ported from <a href="https://github.com/Beckhoff/ADS">github AdsLib</a>
+ */
+@SuppressWarnings("all")
+public class AdsLib {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(AdsLib.class);
+
+    private static final AmsRouter amsRouter = new AmsRouter();
+
+    private static AmsRouter GetRouter() {
+        return amsRouter;
+    }
+
+    /**
+     * Add new ams route to target system
+     *
+     * @param ams address of the target system
+     * @param ip  address of the target system
+     * @return [ADS Return Code](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/ads_returncodes.htm?id=17663)
+     */
+    public static Result AdsAddRoute(AmsNetId ams, String ip) {
+        try {
+            return GetRouter().AddRoute(ams, (Inet4Address) Inet4Address.getByName(ip));
+        } catch (UnknownHostException e) {
+            LOGGER.error("Error adding route", e);
+            return Result.of(AdsReturnCode.ADS_CODE_1);
+        }
+    }
+
+    /**
+     * Delete ams route that had previously been added with AdsAddRoute().
+     *
+     * @param ams address of the target system
+     */
+    public static void AdsDelRoute(AmsNetId ams) {
+        GetRouter().DelRoute(ams);
+    }
+
+    /**
+     * The connection (communication port) to the message router is
+     * closed. The port to be closed must previously have been opened via
+     * an AdsPortOpenEx() call.
+     *
+     * @param port port number of an Ads port that had previously been opened with AdsPortOpenEx().
+     * @return [ADS Return Code](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/ads_returncodes.htm?id=17663)
+     */
+    public static Result AdsPortCloseEx(long port) {
+        return GetRouter().ClosePort((int) port);
+    }
+
+    /**
+     * Establishes a connection (communication port) to the message
+     * router. The port number returned by AdsPortOpenEx() is required as
+     * parameter for further AdsLib function calls.
+     *
+     * @return port number of a new Ads port or 0 if no more ports available
+     */
+    public static long AdsPortOpenEx() {
+        return GetRouter().OpenPort();
+    }
+
+    /**
+     * Returns the local NetId and port number.
+     *
+     * @param port  port number of an Ads port that had previously been opened with AdsPortOpenEx().
+     * @param pAddr Pointer to the structure of type {@code ImmutablePair<AmsNetId, AmsPort>}.
+     * @return [ADS Return Code](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/ads_returncodes.htm?id=17663)
+     */
+    public static Result AdsGetLocalAddressEx(long port, Output<ImmutablePair<AmsNetId, AmsPort>> pAddr) {
+        return GetRouter().GetLocalAddress((int) port, pAddr);
+    }
+
+    /**
+     * Change local NetId
+     *
+     * @param ams local AmsNetId
+     */
+    public static void AdsSetLocalAddress(AmsNetId ams) {
+        GetRouter().SetLocalAddress(ams);
+    }
+
+    /**
+     * Reads data synchronously from an ADS server.
+     *
+     * @param port         port number of an Ads port that had previously been opened with AdsPortOpenEx().
+     * @param pAddr        Structure with NetId and port number of the ADS server.
+     * @param indexGroup   Index Group.
+     * @param indexOffset  Index Offset.
+     * @param bufferLength Length of the data in bytes.
+     * @param buffer       Pointer to a data buffer that will receive the data.
+     * @param bytesRead    pointer to a variable. If successful, this variable will return the number of actually read data bytes.
+     * @return [ADS Return Code](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/ads_returncodes.htm?id=17663)
+     */
+    public static Result AdsSyncReadReqEx2(long port,
+                                           ImmutablePair<AmsNetId, AmsPort> pAddr,
+                                           IndexGroup indexGroup,
+                                           IndexOffset indexOffset,
+                                           Length bufferLength,
+                                           Output<byte[]> buffer,
+                                           Output<Integer> bytesRead) {
+        Output<ImmutablePair<AmsNetId, AmsPort>> localAmsNet = new Output<>();
+        Result getLocalAddressResult = GetRouter().GetLocalAddress((int) port, localAmsNet);
+        if (getLocalAddressResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+            return getLocalAddressResult;
+        }
+        AdsReadRequest adsReadRequest = AdsReadRequest.of(
+            pAddr.left,
+            pAddr.right,
+            localAmsNet.value.left,
+            localAmsNet.value.right,
+            Invoke.NONE,
+            indexGroup,
+            indexOffset,
+            bufferLength
+        );
+
+        AmsRequest<AdsReadRequest, AdsReadResponse> request = AmsRequest.of(adsReadRequest);
+        AmsError adsRequestResult = GetRouter().AdsRequest(request);
+        if (adsRequestResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+            return Result.of(adsRequestResult.getAsLong());
+        }
+        try {
+            AdsReadResponse response = request.getResponseFuture().get(3, TimeUnit.SECONDS);
+            byte[] bytes = response.getData().getBytes();
+            buffer.value = bytes;
+            bytesRead.value = bytes.length;
+            return response.getResult();
+        } catch (ExecutionException | TimeoutException e) {
+            e.printStackTrace();
+            return Result.of(AdsReturnCode.ADS_CODE_1);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+            Thread.currentThread().interrupt();
+            return Result.of(AdsReturnCode.ADS_CODE_1);
+        }
+    }
+
+    /**
+     * Reads the identification and version number of an ADS server.
+     *
+     * @param port    port number of an Ads port that had previously been opened with AdsPortOpenEx().
+     * @param pAddr   Structure with NetId and port number of the ADS server.
+     * @param devName Pointer to a character string of at least 16 bytes, that will receive the name of the ADS device.
+     * @param version Address of a variable of type AdsVersion, which will receive the version number, revision number and the build number.
+     * @return [ADS Return Code](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/ads_returncodes.htm?id=17663)
+     */
+    public static Result AdsSyncReadDeviceInfoReqEx(long port, ImmutablePair<AmsNetId, AmsPort> pAddr, Output<String> devName, Output<Triple<Byte, Byte, Integer>> version) {
+        Output<ImmutablePair<AmsNetId, AmsPort>> localAmsNet = new Output<>();
+        Result getLocalAddressResult = GetRouter().GetLocalAddress((int) port, localAmsNet);
+        if (getLocalAddressResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+            return getLocalAddressResult;
+        }
+        AdsReadDeviceInfoRequest adsReadDeviceInfoRequest = AdsReadDeviceInfoRequest.of(
+            pAddr.left,
+            pAddr.right,
+            localAmsNet.value.left,
+            localAmsNet.value.right,
+            Invoke.NONE
+        );
+        AmsRequest<AdsReadDeviceInfoRequest, AdsReadDeviceInfoResponse> request = AmsRequest.of(adsReadDeviceInfoRequest);
+        AmsError adsRequestResult = GetRouter().AdsRequest(request);
+        if (adsRequestResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+            return Result.of(adsRequestResult.getAsLong());
+        }
+        try {
+            AdsReadDeviceInfoResponse response = request.getResponseFuture().get(3, TimeUnit.SECONDS);
+            devName.value = new String(response.getDevice().getBytes());
+            version.value = Triple.of(response.getMajorVersion().getAsByte(), response.getMinorVersion().getAsByte(), response.getVersion().getAsInt());
+            return response.getResult();
+        } catch (InterruptedException | ExecutionException | TimeoutException e) {
+            e.printStackTrace();
+            return Result.of(AdsReturnCode.ADS_CODE_1);
+        }
+    }
+
+    /**
+     * Reads the ADS status and the device status from an ADS server.
+     *
+     * @param port     port number of an Ads port that had previously been opened with AdsPortOpenEx().
+     * @param pAddr    Structure with NetId and port number of the ADS server.
+     * @param adsState Address of a variable that will receive the ADS status (see data type [ADSSTATE](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/tcadsdll_enumadsstate.htm?id=17630)).
+     * @param devState Address of a variable that will receive the device status.
+     * @return [ADS Return Code](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/ads_returncodes.htm?id=17663)
+     */
+    public static Result AdsSyncReadStateReqEx(long port, ImmutablePair<AmsNetId, AmsPort> pAddr, Output<Integer> adsState, Output<Integer> devState) {
+        Output<ImmutablePair<AmsNetId, AmsPort>> localAmsNet = new Output<>();
+        Result getLocalAddressResult = GetRouter().GetLocalAddress((int) port, localAmsNet);
+        if (getLocalAddressResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+            return getLocalAddressResult;
+        }
+        AdsReadStateRequest adsReadStateRequest = AdsReadStateRequest.of(
+            pAddr.left,
+            pAddr.right,
+            localAmsNet.value.left,
+            localAmsNet.value.right,
+            Invoke.NONE
+        );
+        AmsRequest<AdsReadStateRequest, AdsReadStateResponse> request = AmsRequest.of(adsReadStateRequest);
+        AmsError adsRequestResult = GetRouter().AdsRequest(request);
+        if (adsRequestResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+            return Result.of(adsRequestResult.getAsLong());
+        }
+        try {
+            AdsReadStateResponse response = request.getResponseFuture().get(3, TimeUnit.SECONDS);
+            adsState.value = response.getAdsState().getAsInt();
+            devState.value = response.getDeviceState().getAsInt();
+            return response.getResult();
+        } catch (ExecutionException | TimeoutException e) {
+            e.printStackTrace();
+            return Result.of(AdsReturnCode.ADS_CODE_1);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+            Thread.currentThread().interrupt();
+            return Result.of(AdsReturnCode.ADS_CODE_1);
+        }
+    }
+
+    /**
+     * Writes data synchronously into an ADS server and receives data back from the ADS server.
+     *
+     * @param port        port number of an Ads port that had previously been opened with AdsPortOpenEx().
+     * @param pAddr       Structure with NetId and port number of the ADS server.
+     * @param indexGroup  Index Group.
+     * @param indexOffset Index Offset.
+     * @param readLength  Length, in bytes, of the read buffer readData.
+     * @param readData    Buffer for data read from the ADS server.
+     * @param writeLength Length of the data, in bytes, send to the ADS server.
+     * @param writeData   Buffer with data send to the ADS server.
+     * @param bytesRead   pointer to a variable. If successful, this variable will return the number of actually read data bytes.
+     * @return [ADS Return Code](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/ads_returncodes.htm?id=17663)
+     */
+    public static Result AdsSyncReadWriteReqEx2(long port,
+                                                ImmutablePair<AmsNetId, AmsPort> pAddr,
+                                                IndexGroup indexGroup,
+                                                IndexOffset indexOffset,
+                                                ReadLength readLength,
+                                                Output<byte[]> readData,
+                                                WriteLength writeLength,
+                                                Data writeData,
+                                                Output<Integer> bytesRead) {
+        Output<ImmutablePair<AmsNetId, AmsPort>> localAmsNet = new Output<>();
+        Result getLocalAddressResult = GetRouter().GetLocalAddress((int) port, localAmsNet);
+        if (getLocalAddressResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+            return getLocalAddressResult;
+        }
+        AdsReadWriteRequest adsReadWriteRequest = AdsReadWriteRequest.of(
+            pAddr.left,
+            pAddr.right,
+            localAmsNet.value.left,
+            localAmsNet.value.right,
+            Invoke.NONE,
+            indexGroup,
+            indexOffset,
+            readLength,
+            writeData
+        );
+        AmsRequest<AdsReadWriteRequest, AdsReadWriteResponse> request = AmsRequest.of(adsReadWriteRequest);
+        AmsError adsRequestResult = GetRouter().AdsRequest(request);
+        if (adsRequestResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+            return Result.of(adsRequestResult.getAsLong());
+        }
+        try {
+            AdsReadWriteResponse response = request.getResponseFuture().get(3, TimeUnit.SECONDS);
+            byte[] bytes = response.getData().getBytes();
+            readData.value = bytes;
+            bytesRead.value = bytes.length;
+            return response.getResult();
+        } catch (InterruptedException | ExecutionException | TimeoutException e) {
+            e.printStackTrace();
+            return Result.of(AdsReturnCode.ADS_CODE_1);
+        }
+    }
+
+    /**
+     * Writes data synchronously to an ADS server.
+     *
+     * @param port         port number of an Ads port that had previously been opened with AdsPortOpenEx().
+     * @param pAddr        Structure with NetId and port number of the ADS server.
+     * @param indexGroup   Index Group.
+     * @param indexOffset  Index Offset.
+     * @param bufferLength Length of the data, in bytes, send to the ADS server.
+     * @param buffer       Buffer with data send to the ADS server.
+     * @return [ADS Return Code](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/ads_returncodes.htm?id=17663)
+     */
+    public static Result AdsSyncWriteReqEx(long port,
+                                           ImmutablePair<AmsNetId, AmsPort> pAddr,
+                                           IndexGroup indexGroup,
+                                           IndexOffset indexOffset,
+                                           WriteLength bufferLength,
+                                           Data buffer) {
+        Output<ImmutablePair<AmsNetId, AmsPort>> localAmsNet = new Output<>();
+        Result getLocalAddressResult = GetRouter().GetLocalAddress((int) port, localAmsNet);
+        if (getLocalAddressResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+            return getLocalAddressResult;
+        }
+        AdsWriteRequest adsWriteRequest = AdsWriteRequest.of(
+            pAddr.left,
+            pAddr.right,
+            localAmsNet.value.left,
+            localAmsNet.value.right,
+            Invoke.NONE,
+            indexGroup,
+            indexOffset,
+            buffer
+        );
+        AmsRequest<AdsWriteRequest, AdsWriteResponse> request = AmsRequest.of(adsWriteRequest);
+        AmsError adsRequestResult = GetRouter().AdsRequest(request);
+        if (adsRequestResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+            return Result.of(adsRequestResult.getAsLong());
+        }
+        try {
+            AdsWriteResponse response = request.getResponseFuture().get(3, TimeUnit.SECONDS);
+            return response.getResult();
+        } catch (ExecutionException | TimeoutException e) {
+            e.printStackTrace();
+            return Result.of(AdsReturnCode.ADS_CODE_1);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+            Thread.currentThread().interrupt();
+            return Result.of(AdsReturnCode.ADS_CODE_1);
+        }
+    }
+
+    /**
+     * Changes the ADS status and the device status of an ADS server.
+     *
+     * @param port         port number of an Ads port that had previously been opened with AdsPortOpenEx().
+     * @param pAddr        Structure with NetId and port number of the ADS server.
+     * @param adsState     New ADS status.
+     * @param devState     New device status.
+     * @param bufferLength Length of the additional data, in bytes, send to the ADS server.
+     * @param buffer       Buffer with additional data send to the ADS server.
+     * @return [ADS Return Code](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/ads_returncodes.htm?id=17663)
+     */
+    public static Result AdsSyncWriteControlReqEx(long port,
+                                                  ImmutablePair<AmsNetId, AmsPort> pAddr,
+                                                  short adsState,
+                                                  short devState,
+                                                  int bufferLength,
+                                                  byte[] buffer) {
+        Output<ImmutablePair<AmsNetId, AmsPort>> localAmsNet = new Output<>();
+        Result getLocalAddressResult = GetRouter().GetLocalAddress((int) port, localAmsNet);
+        if (getLocalAddressResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+            return getLocalAddressResult;
+        }
+        AdsWriteControlRequest adsWriteControlRequest = AdsWriteControlRequest.of(
+            pAddr.left,
+            pAddr.right,
+            localAmsNet.value.left,
+            localAmsNet.value.right,
+            Invoke.NONE,
+            AdsState.of(adsState),
+            DeviceState.of(devState),
+            Data.of(buffer)
+        );
+        AmsRequest<AdsWriteControlRequest, AdsWriteControlResponse> request = AmsRequest.of(adsWriteControlRequest);
+        AmsError adsRequestResult = GetRouter().AdsRequest(request);
+        if (adsRequestResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+            return Result.of(adsRequestResult.getAsLong());
+        }
+        try {
+            AdsWriteControlResponse response = request.getResponseFuture().get(3, TimeUnit.SECONDS);
+            return response.getResult();
+        } catch (InterruptedException | ExecutionException | TimeoutException e) {
+            e.printStackTrace();
+            return Result.of(AdsReturnCode.ADS_CODE_1);
+        }
+    }
+
+    /**
+     * A notification is defined within an ADS server (e.g. PLC). When a
+     * certain event occurs a function (the callback function) is invoked in
+     * the ADS client (C program).
+     *
+     * @param port          port number of an Ads port that had previously been opened with AdsPortOpenEx().
+     * @param pAddr         Structure with NetId and port number of the ADS server.
+     * @param indexGroup    Index Group.
+     * @param indexOffset   Index Offset.
+     * @param attribute     Pointer to the structure that contains further information.
+     * @param pFunc         Pointer to the structure describing the callback function.
+     * @param hUser         32-bit value that is passed to the callback function.
+     * @param pNotification Address of the variable that will receive the handle of the notification.
+     * @return [ADS Return Code](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/ads_returncodes.htm?id=17663)
+     */
+    public static Result AdsSyncAddDeviceNotificationReqEx(long port,
+                                                           ImmutablePair<AmsNetId, AmsPort> pAddr,
+                                                           IndexGroup indexGroup,
+                                                           IndexOffset indexOffset,
+                                                           AdsNotificationAttribute attribute,
+                                                           PAdsNotificationFuncEx pFunc,
+                                                           int hUser,
+                                                           Output<Long> pNotification) {
+        Output<ImmutablePair<AmsNetId, AmsPort>> localAmsNet = new Output<>();
+        Result getLocalAddressResult = GetRouter().GetLocalAddress((int) port, localAmsNet);
+        if (getLocalAddressResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+            return getLocalAddressResult;
+        }
+        AdsAddDeviceNotificationRequest adsAddDeviceNotificationRequest = AdsAddDeviceNotificationRequest.of(
+            pAddr.left,
+            pAddr.right,
+            localAmsNet.value.left,
+            localAmsNet.value.right,
+            Invoke.NONE,
+            indexGroup,
+            indexOffset,
+            attribute.length,
+            attribute.transmissionMode,
+            attribute.maxDelay,
+            attribute.cycleTime
+        );
+        AmsRouter.Notification notify = AmsRouter.Notification.of(pFunc, hUser, attribute.length, pAddr, port);
+        AmsRequest<AdsAddDeviceNotificationRequest, AdsAddDeviceNotificationResponse> request = AmsRequest.of(adsAddDeviceNotificationRequest);
+        AmsError adsRequestResult = GetRouter().AddNotification(request, pNotification, notify);
+        if (adsRequestResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+            return Result.of(adsRequestResult.getAsLong());
+        }
+        try {
+            AdsAddDeviceNotificationResponse response = request.getResponseFuture().get(3, TimeUnit.SECONDS);
+            return response.getResult();
+        } catch (ExecutionException | TimeoutException e) {
+            e.printStackTrace();
+            return Result.of(AdsReturnCode.ADS_CODE_1);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+            Thread.currentThread().interrupt();
+            return Result.of(AdsReturnCode.ADS_CODE_1);
+        }
+    }
+
+    /**
+     * A notification defined previously is deleted from an ADS server.
+     *
+     * @param port               port number of an Ads port that had previously been opened with AdsPortOpenEx().
+     * @param pAddr              Structure with NetId and port number of the ADS server.
+     * @param notificationHandle Address of the variable that contains the handle of the notification.
+     * @return [ADS Return Code](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/ads_returncodes.htm?id=17663)
+     */
+    public static Result AdsSyncDelDeviceNotificationReqEx(long port, ImmutablePair<AmsNetId, AmsPort> pAddr, NotificationHandle notificationHandle) {
+        Output<ImmutablePair<AmsNetId, AmsPort>> localAmsNet = new Output<>();
+        Result getLocalAddressResult = GetRouter().GetLocalAddress((int) port, localAmsNet);
+        if (getLocalAddressResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+            return getLocalAddressResult;
+        }
+        AdsDeleteDeviceNotificationRequest adsDeleteDeviceNotificationRequest = AdsDeleteDeviceNotificationRequest.of(
+            pAddr.left,
+            pAddr.right,
+            localAmsNet.value.left,
+            localAmsNet.value.right,
+            Invoke.NONE,
+            notificationHandle
+        );
+        AmsRequest<AdsDeleteDeviceNotificationRequest, AdsDeleteDeviceNotificationResponse> request = AmsRequest.of(adsDeleteDeviceNotificationRequest);
+        AmsError adsRequestResult = GetRouter().DelNotification((int) port, pAddr, request);
+        if (adsRequestResult.toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+            return Result.of(adsRequestResult.getAsLong());
+        }
+        try {
+            AdsDeleteDeviceNotificationResponse response = request.getResponseFuture().get(3, TimeUnit.SECONDS);
+            return response.getResult();
+        } catch (ExecutionException | TimeoutException e) {
+            e.printStackTrace();
+            return Result.of(AdsReturnCode.ADS_CODE_1);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+            Thread.currentThread().interrupt();
+            return Result.of(AdsReturnCode.ADS_CODE_1);
+        }
+    }
+
+    /**
+     * Read the configured timeout for the ADS functions. The standard value is 5000 ms.
+     *
+     * @param port    port number of an Ads port that had previously been opened with AdsPortOpenEx().
+     * @param timeout Buffer to store timeout value in ms.
+     * @return [ADS Return Code](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/ads_returncodes.htm?id=17663)
+     */
+    public static Result AdsSyncGetTimeoutEx(long port, Output<Integer> timeout) {
+        return GetRouter().GetTimeout((int) port, timeout);
+    }
+
+    /**
+     * Alters the timeout for the ADS functions. The standard value is 5000 ms.
+     *
+     * @param port    port number of an Ads port that had previously been opened with AdsPortOpenEx().
+     * @param timeout Timeout in ms.
+     * @return [ADS Return Code](http://infosys.beckhoff.de/content/1033/tc3_adsdll2/html/ads_returncodes.htm?id=17663)
+     */
+    public static Result AdsSyncSetTimeoutEx(long port, int timeout) {
+        return GetRouter().SetTimeout((int) port, timeout);
+    }
+
+    ////
+    // Utils
+
+    /**
+     * Ported from <a href="https://github.com/Beckhoff/ADS">github AdsLib</a>
+     */
+    @FunctionalInterface
+    public interface PAdsNotificationFuncEx {
+        void notifyCallback(ImmutablePair<AmsNetId, AmsPort> pAddr, TimeStamp timeStamp, AdsNotificationSample notificationSample, int hUser);
+    }
+
+    /**
+     * Ported from <a href="https://github.com/Beckhoff/ADS">github AdsLib</a>
+     */
+    public static class AdsNotificationAttribute {
+
+        public static TransmissionMode ADSTRANS_SERVERCYCLE = TransmissionMode.of(3);
+
+        public final Length length;
+        public final TransmissionMode transmissionMode;
+        public final MaxDelay maxDelay;
+        public final CycleTime cycleTime;
+
+        public AdsNotificationAttribute(Length length, TransmissionMode transmissionMode, MaxDelay maxDelay, CycleTime cycleTime) {
+            this.length = length;
+            this.transmissionMode = transmissionMode;
+            this.maxDelay = maxDelay;
+            this.cycleTime = cycleTime;
+        }
+
+        public static AdsNotificationAttribute of(Length length, TransmissionMode transmissionMode, MaxDelay maxDelay, CycleTime cycleTime) {
+            return new AdsNotificationAttribute(length, transmissionMode, maxDelay, cycleTime);
+        }
+    }
+
+}
diff --git a/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/adslib/AmsRequest.java b/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/adslib/AmsRequest.java
index a6e59627f7b..c0ace593de5 100644
--- a/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/adslib/AmsRequest.java
+++ b/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/adslib/AmsRequest.java
@@ -1,51 +1,51 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.adslib;
-
-import org.apache.plc4x.java.ads.api.generic.AmsPacket;
-import org.apache.plc4x.java.base.messages.DefaultPlcProprietaryRequest;
-import org.apache.plc4x.java.base.messages.PlcProprietaryRequest;
-
-import java.util.concurrent.CompletableFuture;
-
-/**
- * Ported from <a href="https://github.com/Beckhoff/ADS">github AdsLib</a>
- */
-public class AmsRequest<REQUEST extends AmsPacket, RESPONSE extends AmsPacket> {
-
-    private final PlcProprietaryRequest<REQUEST> request;
-    private final CompletableFuture<RESPONSE> responseFuture;
-
-    private AmsRequest(REQUEST amsPacket, CompletableFuture<RESPONSE> responseFuture) {
-        this.request = new DefaultPlcProprietaryRequest<>(amsPacket);
-        this.responseFuture = responseFuture;
-    }
-
-    public static <REQUEST extends AmsPacket, RESPONSE extends AmsPacket> AmsRequest<REQUEST, RESPONSE> of(REQUEST amsPacket) {
-        return new AmsRequest<>(amsPacket, new CompletableFuture<>());
-    }
-
-    public PlcProprietaryRequest<REQUEST> getRequest() {
-        return request;
-    }
-
-    public CompletableFuture<RESPONSE> getResponseFuture() {
-        return responseFuture;
-    }
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.adslib;
+
+import org.apache.plc4x.java.ads.api.generic.AmsPacket;
+import org.apache.plc4x.java.base.messages.DefaultPlcProprietaryRequest;
+import org.apache.plc4x.java.base.messages.PlcProprietaryRequest;
+
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * Ported from <a href="https://github.com/Beckhoff/ADS">github AdsLib</a>
+ */
+public class AmsRequest<REQUEST extends AmsPacket, RESPONSE extends AmsPacket> {
+
+    private final PlcProprietaryRequest<REQUEST> request;
+    private final CompletableFuture<RESPONSE> responseFuture;
+
+    private AmsRequest(REQUEST amsPacket, CompletableFuture<RESPONSE> responseFuture) {
+        this.request = new DefaultPlcProprietaryRequest<>(amsPacket);
+        this.responseFuture = responseFuture;
+    }
+
+    public static <REQUEST extends AmsPacket, RESPONSE extends AmsPacket> AmsRequest<REQUEST, RESPONSE> of(REQUEST amsPacket) {
+        return new AmsRequest<>(amsPacket, new CompletableFuture<>());
+    }
+
+    public PlcProprietaryRequest<REQUEST> getRequest() {
+        return request;
+    }
+
+    public CompletableFuture<RESPONSE> getResponseFuture() {
+        return responseFuture;
+    }
+}
diff --git a/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/adslib/AmsRouter.java b/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/adslib/AmsRouter.java
index 2ed46249053..c91678375db 100644
--- a/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/adslib/AmsRouter.java
+++ b/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/adslib/AmsRouter.java
@@ -1,384 +1,384 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.adslib;
-
-import org.apache.commons.lang3.mutable.MutableInt;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.plc4x.java.ads.api.commands.*;
-import org.apache.plc4x.java.ads.api.commands.types.*;
-import org.apache.plc4x.java.ads.api.generic.AmsPacket;
-import org.apache.plc4x.java.ads.api.generic.types.AmsError;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.connection.AdsTcpPlcConnection;
-import org.apache.plc4x.java.ads.protocol.Plc4x2AdsProtocol;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.base.messages.PlcProprietaryRequest;
-import org.apache.plc4x.java.base.messages.PlcProprietaryResponse;
-
-import java.io.IOException;
-import java.net.*;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.*;
-import java.util.function.Consumer;
-
-/**
- * Ported from <a href="https://github.com/Beckhoff/ADS">github AdsLib</a>
- */
-@SuppressWarnings("all")
-public class AmsRouter {
-
-    private static final int NUM_PORTS_MAX = 128;
-    private static final int PORT_BASE = 30000;
-
-    private AmsNetId localAddr;
-
-    private Map<InetAddress, AdsTcpPlcConnection> connections = new HashMap<>();
-    private Map<AmsNetId, AdsTcpPlcConnection> mapping = new HashMap<>();
-    private Map<AdsTcpPlcConnection, MutableInt> refCounts = new HashMap<>();
-
-    private Map<Integer, AdsLibPort> ports = new HashMap<>();
-
-    public AmsRouter() {
-        try {
-            // TODO: ensure we have ipv4
-            this.localAddr = AmsNetId.of(Inet4Address.getLocalHost().getHostAddress() + ".1.1");
-        } catch (UnknownHostException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public AmsRouter(AmsNetId localAddr) {
-        this.localAddr = localAddr;
-    }
-
-    synchronized Result AddRoute(AmsNetId ams, Inet4Address ip) {
-        AdsTcpPlcConnection oldConnection = GetConnection(ams);
-        if (oldConnection != null && !(ip.equals(((InetSocketAddress) oldConnection.getChannel().remoteAddress()).getAddress()))) {
-            /*
-             There is already a route for this AmsNetId, but with
-             a different IP. The old route has to be deleted, first!
-             */
-            return Result.of(AdsReturnCode.ADS_CODE_1286);
-        }
-
-        AdsTcpPlcConnection conn = connections.get(ip);
-        if (conn == null) {
-            AdsTcpPlcConnection newConnection = AdsTcpPlcConnection.of(ip, null, null);
-            // TODO: add listener here:
-            try {
-                newConnection.connect();
-            } catch (PlcConnectionException e) {
-                throw new RuntimeException(e);
-            }
-            connections.put(ip, newConnection);
-            conn = newConnection;
-
-            /* in case no local AmsNetId was set previously, we derive one */
-            if (localAddr == null) {
-                localAddr = conn.getSourceAmsNetId();
-            }
-        }
-
-        MutableInt refCounter = refCounts.getOrDefault(conn, new MutableInt());
-        refCounter.increment();
-        mapping.put(ams, conn);
-        return localAddr == null ? Result.of(AdsReturnCode.ADS_CODE_1) : Result.of(AdsReturnCode.ADS_CODE_0);
-    }
-
-    synchronized void DelRoute(AmsNetId ams) {
-        AdsTcpPlcConnection route = mapping.get(ams);
-        if (route != null) {
-            AdsTcpPlcConnection conn = route;
-            try {
-                conn.close();
-            } catch (PlcConnectionException e) {
-                throw new RuntimeException(e);
-            }
-            MutableInt refCounter = refCounts.getOrDefault(conn, new MutableInt());
-            if (0 == refCounter.decrementAndGet()) {
-                mapping.remove(ams);
-                refCounts.remove(conn);
-                DeleteIfLastConnection(conn);
-            }
-        }
-    }
-
-    void DeleteIfLastConnection(AdsTcpPlcConnection conn) {
-        if (conn != null) {
-            if (mapping.containsValue(conn)) {
-                return;
-            }
-            connections.remove(conn.getRemoteAddress());
-        }
-    }
-
-    synchronized int OpenPort() {
-        try {
-            AdsLibPort adsLibPort = new AdsLibPort(mapping);
-            int localPort = adsLibPort.getLocalPort();
-            ports.put(localPort, adsLibPort);
-            return localPort;
-        } catch (IOException e) {
-            return 0;
-        }
-    }
-
-    synchronized Result ClosePort(int port) {
-        AdsLibPort serverSocket = ports.get(port);
-        if (serverSocket == null || (serverSocket.getLocalPort() < PORT_BASE) || (serverSocket.getLocalPort() >= PORT_BASE + NUM_PORTS_MAX)) {
-            return Result.of(AdsReturnCode.ADS_CODE_1864);
-        }
-        serverSocket.close();
-        return Result.of(AdsReturnCode.ADS_CODE_0);
-    }
-
-    synchronized Result GetLocalAddress(int port, Output<ImmutablePair<AmsNetId, AmsPort>> pAddr) {
-        if ((port < PORT_BASE) || (port >= PORT_BASE + NUM_PORTS_MAX)) {
-            return Result.of(AdsReturnCode.ADS_CODE_1864);
-        }
-
-        AdsLibPort serverSocket = ports.get(port);
-        if (serverSocket == null) {
-            return Result.of(AdsReturnCode.ADS_CODE_1864);
-        }
-
-        AmsPort amsPort = AmsPort.of(serverSocket.getLocalPort());
-        pAddr.value = ImmutablePair.of(localAddr, amsPort);
-        return Result.of(AdsReturnCode.ADS_CODE_0);
-    }
-
-    synchronized void SetLocalAddress(AmsNetId netId) {
-        localAddr = netId;
-    }
-
-    synchronized Result GetTimeout(int port, Output<Integer> timeout) {
-        if ((port < PORT_BASE) || (port >= PORT_BASE + NUM_PORTS_MAX)) {
-            return Result.of(AdsReturnCode.ADS_CODE_1864);
-        }
-        AdsLibPort serverSocket = ports.get(port);
-        timeout.value = serverSocket.getSoTimeout();
-        return Result.of(AdsReturnCode.ADS_CODE_0);
-    }
-
-    synchronized Result SetTimeout(int port, int timeout) {
-        if ((port < PORT_BASE) || (port >= PORT_BASE + NUM_PORTS_MAX)) {
-            return Result.of(AdsReturnCode.ADS_CODE_1864);
-        }
-        AdsLibPort serverSocket = ports.get(port);
-        serverSocket.setSoTimeout(timeout);
-        return Result.of(AdsReturnCode.ADS_CODE_0);
-    }
-
-    synchronized AdsTcpPlcConnection GetConnection(AmsNetId amsDest) {
-        AdsTcpPlcConnection conn = mapping.get(amsDest);
-        if (conn == null) {
-            return null;
-        }
-        return connections.get(conn.getRemoteAddress());
-    }
-
-    <T extends AmsPacket, R extends AmsPacket> AmsError AdsRequest(AmsRequest<T, R> request) {
-        PlcProprietaryRequest<T> plcProprietaryRequest = request.getRequest();
-
-        AdsTcpPlcConnection ads = GetConnection(plcProprietaryRequest.getProprietaryRequest().getAmsHeader().getTargetAmsNetId());
-        if (ads == null) {
-            return AmsError.of(AdsReturnCode.ADS_CODE_7);
-        }
-        CompletableFuture<PlcProprietaryResponse<R>> completableFuture = ads.send(plcProprietaryRequest);
-        try {
-            PlcProprietaryResponse<R> response = completableFuture.get(3, TimeUnit.SECONDS);
-            request.getResponseFuture().complete(response.getResponse());
-            return response.getResponse().getAmsHeader().getCode();
-        } catch (ExecutionException | TimeoutException e) {
-            e.printStackTrace();
-            return AmsError.of(AdsReturnCode.ADS_CODE_1864);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-            Thread.currentThread().interrupt();
-            return AmsError.of(AdsReturnCode.ADS_CODE_1864);
-        }
-    }
-
-    AmsError AddNotification(AmsRequest<AdsAddDeviceNotificationRequest, AdsAddDeviceNotificationResponse> request, Output<Long> pNotification, Notification notify) {
-        PlcProprietaryRequest<AdsAddDeviceNotificationRequest> plcProprietaryRequest = request.getRequest();
-        //if (request.bytesRead) {
-        //    request.bytesRead = 0;
-        //}
-
-        AdsTcpPlcConnection ads = GetConnection(plcProprietaryRequest.getProprietaryRequest().getAmsHeader().getTargetAmsNetId());
-        if (ads == null) {
-            return AmsError.of(AdsReturnCode.ADS_CODE_7);
-        }
-
-        AdsLibPort port = ports.get(plcProprietaryRequest.getProprietaryRequest().getAmsHeader().getSourceAmsPort().getAsInt());
-        CompletableFuture<PlcProprietaryResponse<AdsAddDeviceNotificationResponse>> send = ads.send(plcProprietaryRequest);
-        try {
-            PlcProprietaryResponse<AdsAddDeviceNotificationResponse> response = send.get(3, TimeUnit.SECONDS);
-            if (response.getResponse().getResult().toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
-                return AmsError.of(response.getResponse().getResult().getAsLong());
-            }
-            pNotification.value = response.getResponse().getNotificationHandle().getAsLong();
-            port.AddNotification(pNotification.value, notify);
-            request.getResponseFuture().complete(response.getResponse());
-            return response.getResponse().getAmsHeader().getCode();
-        } catch (ExecutionException | TimeoutException e) {
-            e.printStackTrace();
-            return AmsError.of(AdsReturnCode.ADS_CODE_1);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-            Thread.currentThread().interrupt();
-            return AmsError.of(AdsReturnCode.ADS_CODE_1);
-        }
-    }
-
-    AmsError DelNotification(int port, ImmutablePair<AmsNetId, AmsPort> pAddr, AmsRequest<AdsDeleteDeviceNotificationRequest, AdsDeleteDeviceNotificationResponse> request) {
-        PlcProprietaryRequest<AdsDeleteDeviceNotificationRequest> plcProprietaryRequest = request.getRequest();
-
-        AdsTcpPlcConnection ads = GetConnection(plcProprietaryRequest.getProprietaryRequest().getAmsHeader().getTargetAmsNetId());
-        if (ads == null) {
-            return AmsError.of(AdsReturnCode.ADS_CODE_7);
-        }
-
-        AdsLibPort adsLibPort = ports.get(port);
-        CompletableFuture<PlcProprietaryResponse<AdsDeleteDeviceNotificationResponse>> send = ads.send(plcProprietaryRequest);
-        try {
-            PlcProprietaryResponse<AdsDeleteDeviceNotificationResponse> response = send.get(3, TimeUnit.SECONDS);
-
-            adsLibPort.DelNotification(pAddr, plcProprietaryRequest.getProprietaryRequest().getNotificationHandle());
-            request.getResponseFuture().complete(response.getResponse());
-            return response.getResponse().getAmsHeader().getCode();
-        } catch (ExecutionException | TimeoutException e) {
-            e.printStackTrace();
-            return AmsError.of(AdsReturnCode.ADS_CODE_1);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-            Thread.currentThread().interrupt();
-            return AmsError.of(AdsReturnCode.ADS_CODE_1);
-        }
-    }
-
-    static class Notification {
-
-        AdsLib.PAdsNotificationFuncEx pFunc;
-        int hUser;
-        Length length;
-        ImmutablePair<AmsNetId, AmsPort> pAddr;
-        long port;
-
-        Notification(AdsLib.PAdsNotificationFuncEx pFunc, int hUser, Length length, ImmutablePair<AmsNetId, AmsPort> pAddr, long port) {
-            this.pFunc = pFunc;
-            this.hUser = hUser;
-            this.length = length;
-            this.pAddr = pAddr;
-            this.port = port;
-        }
-
-        static Notification of(AdsLib.PAdsNotificationFuncEx pFunc, int hUser, Length length, ImmutablePair<AmsNetId, AmsPort> pAddr, long port) {
-            return new Notification(pFunc, hUser, length, pAddr, port);
-        }
-
-    }
-
-    static class AdsLibPort implements Consumer<AdsDeviceNotificationRequest> {
-
-        private ServerSocket serverSocket;
-        private Map<Long, Notification> notificationMap;
-        private Map<AmsNetId, AdsTcpPlcConnection> mapping;
-
-        public AdsLibPort(Map<AmsNetId, AdsTcpPlcConnection> mapping) throws IOException {
-            notificationMap = new ConcurrentHashMap<>();
-            this.mapping = mapping;
-            ServerSocket socket = null;
-            for (int i = PORT_BASE; i < PORT_BASE + NUM_PORTS_MAX; i++) {
-                try {
-                    socket = new ServerSocket(i);
-                } catch (IOException ignore) {
-                }
-            }
-            if (socket == null) {
-                throw new IOException("Unable to open server in port range(" + PORT_BASE + '-' + PORT_BASE + NUM_PORTS_MAX + ')');
-            }
-            socket.setReuseAddress(true);
-            serverSocket = socket;
-        }
-
-        public int getLocalPort() {
-            return serverSocket.getLocalPort();
-        }
-
-        public void close() {
-            try {
-                serverSocket.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-            for (AdsTcpPlcConnection adsTcpPlcConnection : mapping.values()) {
-                adsTcpPlcConnection.getChannel().pipeline().get(Plc4x2AdsProtocol.class).removeConsumer(this);
-            }
-        }
-
-        public Integer getSoTimeout() {
-            try {
-                return serverSocket.getSoTimeout();
-            } catch (IOException e) {
-                e.printStackTrace();
-                return -1;
-            }
-        }
-
-        public void setSoTimeout(int soTimeout) {
-            try {
-                serverSocket.setSoTimeout(soTimeout);
-            } catch (SocketException e) {
-                e.printStackTrace();
-            }
-        }
-
-        public void AddNotification(Long notificationHandle, Notification notify) {
-            notificationMap.put(notificationHandle, notify);
-            AdsTcpPlcConnection connection = mapping.get(notify.pAddr.left);
-            // TODO: filter for addr
-            connection.getChannel().pipeline().get(Plc4x2AdsProtocol.class).addConsumer(this);
-        }
-
-        public void DelNotification(ImmutablePair<AmsNetId, AmsPort> pAddr, NotificationHandle notificationHandle) {
-            // Note. pAddr is not used for anything.
-            notificationMap.remove(notificationHandle.getAsLong());
-            AdsTcpPlcConnection connection = mapping.get(pAddr.left);
-            // TODO: filter for addr
-            connection.getChannel().pipeline().get(Plc4x2AdsProtocol.class).addConsumer(this);
-        }
-
-        @Override
-        public void accept(AdsDeviceNotificationRequest adsDeviceNotificationRequest) {
-            for (AdsStampHeader adsStampHeader : adsDeviceNotificationRequest.getAdsStampHeaders()) {
-                TimeStamp timeStamp = adsStampHeader.getTimeStamp();
-                for (AdsNotificationSample adsNotificationSample : adsStampHeader.getAdsNotificationSamples()) {
-                    NotificationHandle notificationHandle = adsNotificationSample.getNotificationHandle();
-                    Notification notification = notificationMap.get(notificationHandle.getAsLong());
-                    notification.pFunc.notifyCallback(notification.pAddr, timeStamp, adsNotificationSample, notification.hUser);
-                }
-            }
-        }
-    }
-
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.adslib;
+
+import org.apache.commons.lang3.mutable.MutableInt;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.plc4x.java.ads.api.commands.*;
+import org.apache.plc4x.java.ads.api.commands.types.*;
+import org.apache.plc4x.java.ads.api.generic.AmsPacket;
+import org.apache.plc4x.java.ads.api.generic.types.AmsError;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.connection.AdsTcpPlcConnection;
+import org.apache.plc4x.java.ads.protocol.Plc4x2AdsProtocol;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.base.messages.PlcProprietaryRequest;
+import org.apache.plc4x.java.base.messages.PlcProprietaryResponse;
+
+import java.io.IOException;
+import java.net.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.*;
+import java.util.function.Consumer;
+
+/**
+ * Ported from <a href="https://github.com/Beckhoff/ADS">github AdsLib</a>
+ */
+@SuppressWarnings("all")
+public class AmsRouter {
+
+    private static final int NUM_PORTS_MAX = 128;
+    private static final int PORT_BASE = 30000;
+
+    private AmsNetId localAddr;
+
+    private Map<InetAddress, AdsTcpPlcConnection> connections = new HashMap<>();
+    private Map<AmsNetId, AdsTcpPlcConnection> mapping = new HashMap<>();
+    private Map<AdsTcpPlcConnection, MutableInt> refCounts = new HashMap<>();
+
+    private Map<Integer, AdsLibPort> ports = new HashMap<>();
+
+    public AmsRouter() {
+        try {
+            // TODO: ensure we have ipv4
+            this.localAddr = AmsNetId.of(Inet4Address.getLocalHost().getHostAddress() + ".1.1");
+        } catch (UnknownHostException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public AmsRouter(AmsNetId localAddr) {
+        this.localAddr = localAddr;
+    }
+
+    synchronized Result AddRoute(AmsNetId ams, Inet4Address ip) {
+        AdsTcpPlcConnection oldConnection = GetConnection(ams);
+        if (oldConnection != null && !(ip.equals(((InetSocketAddress) oldConnection.getChannel().remoteAddress()).getAddress()))) {
+            /*
+             There is already a route for this AmsNetId, but with
+             a different IP. The old route has to be deleted, first!
+             */
+            return Result.of(AdsReturnCode.ADS_CODE_1286);
+        }
+
+        AdsTcpPlcConnection conn = connections.get(ip);
+        if (conn == null) {
+            AdsTcpPlcConnection newConnection = AdsTcpPlcConnection.of(ip, null, null);
+            // TODO: add listener here:
+            try {
+                newConnection.connect();
+            } catch (PlcConnectionException e) {
+                throw new RuntimeException(e);
+            }
+            connections.put(ip, newConnection);
+            conn = newConnection;
+
+            /* in case no local AmsNetId was set previously, we derive one */
+            if (localAddr == null) {
+                localAddr = conn.getSourceAmsNetId();
+            }
+        }
+
+        MutableInt refCounter = refCounts.getOrDefault(conn, new MutableInt());
+        refCounter.increment();
+        mapping.put(ams, conn);
+        return localAddr == null ? Result.of(AdsReturnCode.ADS_CODE_1) : Result.of(AdsReturnCode.ADS_CODE_0);
+    }
+
+    synchronized void DelRoute(AmsNetId ams) {
+        AdsTcpPlcConnection route = mapping.get(ams);
+        if (route != null) {
+            AdsTcpPlcConnection conn = route;
+            try {
+                conn.close();
+            } catch (PlcConnectionException e) {
+                throw new RuntimeException(e);
+            }
+            MutableInt refCounter = refCounts.getOrDefault(conn, new MutableInt());
+            if (0 == refCounter.decrementAndGet()) {
+                mapping.remove(ams);
+                refCounts.remove(conn);
+                DeleteIfLastConnection(conn);
+            }
+        }
+    }
+
+    void DeleteIfLastConnection(AdsTcpPlcConnection conn) {
+        if (conn != null) {
+            if (mapping.containsValue(conn)) {
+                return;
+            }
+            connections.remove(conn.getRemoteAddress());
+        }
+    }
+
+    synchronized int OpenPort() {
+        try {
+            AdsLibPort adsLibPort = new AdsLibPort(mapping);
+            int localPort = adsLibPort.getLocalPort();
+            ports.put(localPort, adsLibPort);
+            return localPort;
+        } catch (IOException e) {
+            return 0;
+        }
+    }
+
+    synchronized Result ClosePort(int port) {
+        AdsLibPort serverSocket = ports.get(port);
+        if (serverSocket == null || (serverSocket.getLocalPort() < PORT_BASE) || (serverSocket.getLocalPort() >= PORT_BASE + NUM_PORTS_MAX)) {
+            return Result.of(AdsReturnCode.ADS_CODE_1864);
+        }
+        serverSocket.close();
+        return Result.of(AdsReturnCode.ADS_CODE_0);
+    }
+
+    synchronized Result GetLocalAddress(int port, Output<ImmutablePair<AmsNetId, AmsPort>> pAddr) {
+        if ((port < PORT_BASE) || (port >= PORT_BASE + NUM_PORTS_MAX)) {
+            return Result.of(AdsReturnCode.ADS_CODE_1864);
+        }
+
+        AdsLibPort serverSocket = ports.get(port);
+        if (serverSocket == null) {
+            return Result.of(AdsReturnCode.ADS_CODE_1864);
+        }
+
+        AmsPort amsPort = AmsPort.of(serverSocket.getLocalPort());
+        pAddr.value = ImmutablePair.of(localAddr, amsPort);
+        return Result.of(AdsReturnCode.ADS_CODE_0);
+    }
+
+    synchronized void SetLocalAddress(AmsNetId netId) {
+        localAddr = netId;
+    }
+
+    synchronized Result GetTimeout(int port, Output<Integer> timeout) {
+        if ((port < PORT_BASE) || (port >= PORT_BASE + NUM_PORTS_MAX)) {
+            return Result.of(AdsReturnCode.ADS_CODE_1864);
+        }
+        AdsLibPort serverSocket = ports.get(port);
+        timeout.value = serverSocket.getSoTimeout();
+        return Result.of(AdsReturnCode.ADS_CODE_0);
+    }
+
+    synchronized Result SetTimeout(int port, int timeout) {
+        if ((port < PORT_BASE) || (port >= PORT_BASE + NUM_PORTS_MAX)) {
+            return Result.of(AdsReturnCode.ADS_CODE_1864);
+        }
+        AdsLibPort serverSocket = ports.get(port);
+        serverSocket.setSoTimeout(timeout);
+        return Result.of(AdsReturnCode.ADS_CODE_0);
+    }
+
+    synchronized AdsTcpPlcConnection GetConnection(AmsNetId amsDest) {
+        AdsTcpPlcConnection conn = mapping.get(amsDest);
+        if (conn == null) {
+            return null;
+        }
+        return connections.get(conn.getRemoteAddress());
+    }
+
+    <T extends AmsPacket, R extends AmsPacket> AmsError AdsRequest(AmsRequest<T, R> request) {
+        PlcProprietaryRequest<T> plcProprietaryRequest = request.getRequest();
+
+        AdsTcpPlcConnection ads = GetConnection(plcProprietaryRequest.getProprietaryRequest().getAmsHeader().getTargetAmsNetId());
+        if (ads == null) {
+            return AmsError.of(AdsReturnCode.ADS_CODE_7);
+        }
+        CompletableFuture<PlcProprietaryResponse<R>> completableFuture = ads.send(plcProprietaryRequest);
+        try {
+            PlcProprietaryResponse<R> response = completableFuture.get(3, TimeUnit.SECONDS);
+            request.getResponseFuture().complete(response.getResponse());
+            return response.getResponse().getAmsHeader().getCode();
+        } catch (ExecutionException | TimeoutException e) {
+            e.printStackTrace();
+            return AmsError.of(AdsReturnCode.ADS_CODE_1864);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+            Thread.currentThread().interrupt();
+            return AmsError.of(AdsReturnCode.ADS_CODE_1864);
+        }
+    }
+
+    AmsError AddNotification(AmsRequest<AdsAddDeviceNotificationRequest, AdsAddDeviceNotificationResponse> request, Output<Long> pNotification, Notification notify) {
+        PlcProprietaryRequest<AdsAddDeviceNotificationRequest> plcProprietaryRequest = request.getRequest();
+        //if (request.bytesRead) {
+        //    request.bytesRead = 0;
+        //}
+
+        AdsTcpPlcConnection ads = GetConnection(plcProprietaryRequest.getProprietaryRequest().getAmsHeader().getTargetAmsNetId());
+        if (ads == null) {
+            return AmsError.of(AdsReturnCode.ADS_CODE_7);
+        }
+
+        AdsLibPort port = ports.get(plcProprietaryRequest.getProprietaryRequest().getAmsHeader().getSourceAmsPort().getAsInt());
+        CompletableFuture<PlcProprietaryResponse<AdsAddDeviceNotificationResponse>> send = ads.send(plcProprietaryRequest);
+        try {
+            PlcProprietaryResponse<AdsAddDeviceNotificationResponse> response = send.get(3, TimeUnit.SECONDS);
+            if (response.getResponse().getResult().toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+                return AmsError.of(response.getResponse().getResult().getAsLong());
+            }
+            pNotification.value = response.getResponse().getNotificationHandle().getAsLong();
+            port.AddNotification(pNotification.value, notify);
+            request.getResponseFuture().complete(response.getResponse());
+            return response.getResponse().getAmsHeader().getCode();
+        } catch (ExecutionException | TimeoutException e) {
+            e.printStackTrace();
+            return AmsError.of(AdsReturnCode.ADS_CODE_1);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+            Thread.currentThread().interrupt();
+            return AmsError.of(AdsReturnCode.ADS_CODE_1);
+        }
+    }
+
+    AmsError DelNotification(int port, ImmutablePair<AmsNetId, AmsPort> pAddr, AmsRequest<AdsDeleteDeviceNotificationRequest, AdsDeleteDeviceNotificationResponse> request) {
+        PlcProprietaryRequest<AdsDeleteDeviceNotificationRequest> plcProprietaryRequest = request.getRequest();
+
+        AdsTcpPlcConnection ads = GetConnection(plcProprietaryRequest.getProprietaryRequest().getAmsHeader().getTargetAmsNetId());
+        if (ads == null) {
+            return AmsError.of(AdsReturnCode.ADS_CODE_7);
+        }
+
+        AdsLibPort adsLibPort = ports.get(port);
+        CompletableFuture<PlcProprietaryResponse<AdsDeleteDeviceNotificationResponse>> send = ads.send(plcProprietaryRequest);
+        try {
+            PlcProprietaryResponse<AdsDeleteDeviceNotificationResponse> response = send.get(3, TimeUnit.SECONDS);
+
+            adsLibPort.DelNotification(pAddr, plcProprietaryRequest.getProprietaryRequest().getNotificationHandle());
+            request.getResponseFuture().complete(response.getResponse());
+            return response.getResponse().getAmsHeader().getCode();
+        } catch (ExecutionException | TimeoutException e) {
+            e.printStackTrace();
+            return AmsError.of(AdsReturnCode.ADS_CODE_1);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+            Thread.currentThread().interrupt();
+            return AmsError.of(AdsReturnCode.ADS_CODE_1);
+        }
+    }
+
+    static class Notification {
+
+        AdsLib.PAdsNotificationFuncEx pFunc;
+        int hUser;
+        Length length;
+        ImmutablePair<AmsNetId, AmsPort> pAddr;
+        long port;
+
+        Notification(AdsLib.PAdsNotificationFuncEx pFunc, int hUser, Length length, ImmutablePair<AmsNetId, AmsPort> pAddr, long port) {
+            this.pFunc = pFunc;
+            this.hUser = hUser;
+            this.length = length;
+            this.pAddr = pAddr;
+            this.port = port;
+        }
+
+        static Notification of(AdsLib.PAdsNotificationFuncEx pFunc, int hUser, Length length, ImmutablePair<AmsNetId, AmsPort> pAddr, long port) {
+            return new Notification(pFunc, hUser, length, pAddr, port);
+        }
+
+    }
+
+    static class AdsLibPort implements Consumer<AdsDeviceNotificationRequest> {
+
+        private ServerSocket serverSocket;
+        private Map<Long, Notification> notificationMap;
+        private Map<AmsNetId, AdsTcpPlcConnection> mapping;
+
+        public AdsLibPort(Map<AmsNetId, AdsTcpPlcConnection> mapping) throws IOException {
+            notificationMap = new ConcurrentHashMap<>();
+            this.mapping = mapping;
+            ServerSocket socket = null;
+            for (int i = PORT_BASE; i < PORT_BASE + NUM_PORTS_MAX; i++) {
+                try {
+                    socket = new ServerSocket(i);
+                } catch (IOException ignore) {
+                }
+            }
+            if (socket == null) {
+                throw new IOException("Unable to open server in port range(" + PORT_BASE + '-' + PORT_BASE + NUM_PORTS_MAX + ')');
+            }
+            socket.setReuseAddress(true);
+            serverSocket = socket;
+        }
+
+        public int getLocalPort() {
+            return serverSocket.getLocalPort();
+        }
+
+        public void close() {
+            try {
+                serverSocket.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            for (AdsTcpPlcConnection adsTcpPlcConnection : mapping.values()) {
+                adsTcpPlcConnection.getChannel().pipeline().get(Plc4x2AdsProtocol.class).removeConsumer(this);
+            }
+        }
+
+        public Integer getSoTimeout() {
+            try {
+                return serverSocket.getSoTimeout();
+            } catch (IOException e) {
+                e.printStackTrace();
+                return -1;
+            }
+        }
+
+        public void setSoTimeout(int soTimeout) {
+            try {
+                serverSocket.setSoTimeout(soTimeout);
+            } catch (SocketException e) {
+                e.printStackTrace();
+            }
+        }
+
+        public void AddNotification(Long notificationHandle, Notification notify) {
+            notificationMap.put(notificationHandle, notify);
+            AdsTcpPlcConnection connection = mapping.get(notify.pAddr.left);
+            // TODO: filter for addr
+            connection.getChannel().pipeline().get(Plc4x2AdsProtocol.class).addConsumer(this);
+        }
+
+        public void DelNotification(ImmutablePair<AmsNetId, AmsPort> pAddr, NotificationHandle notificationHandle) {
+            // Note. pAddr is not used for anything.
+            notificationMap.remove(notificationHandle.getAsLong());
+            AdsTcpPlcConnection connection = mapping.get(pAddr.left);
+            // TODO: filter for addr
+            connection.getChannel().pipeline().get(Plc4x2AdsProtocol.class).addConsumer(this);
+        }
+
+        @Override
+        public void accept(AdsDeviceNotificationRequest adsDeviceNotificationRequest) {
+            for (AdsStampHeader adsStampHeader : adsDeviceNotificationRequest.getAdsStampHeaders()) {
+                TimeStamp timeStamp = adsStampHeader.getTimeStamp();
+                for (AdsNotificationSample adsNotificationSample : adsStampHeader.getAdsNotificationSamples()) {
+                    NotificationHandle notificationHandle = adsNotificationSample.getNotificationHandle();
+                    Notification notification = notificationMap.get(notificationHandle.getAsLong());
+                    notification.pFunc.notifyCallback(notification.pAddr, timeStamp, adsNotificationSample, notification.hUser);
+                }
+            }
+        }
+    }
+
+
+}
diff --git a/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/adslib/Output.java b/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/adslib/Output.java
index a9dd1ec4a6b..03e93e667f3 100644
--- a/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/adslib/Output.java
+++ b/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/adslib/Output.java
@@ -1,38 +1,38 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.adslib;
-
-public final class Output<T> {
-
-    public T value;
-
-    public Output() {
-    }
-
-    public Output(T value) {
-        this.value = value;
-    }
-
-    @Override
-    public String toString() {
-        return "Output{" +
-            "value=" + value +
-            '}';
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.adslib;
+
+public final class Output<T> {
+
+    public T value;
+
+    public Output() {
+    }
+
+    public Output(T value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return "Output{" +
+            "value=" + value +
+            '}';
+    }
+}
diff --git a/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/adslib/package-info.java b/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/adslib/package-info.java
index fd5b92a61e8..be56289c4b1 100644
--- a/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/adslib/package-info.java
+++ b/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/adslib/package-info.java
@@ -1,24 +1,24 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://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.
- */
-/**
- * Ported from <a href="https://github.com/Beckhoff/ADS/AdsLib">github</a>
- * <p>
- * The purpose of this is to validate the plc4x implementation against a reference test.
- */
+/*
+ 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
+
+   http://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.
+ */
+/**
+ * Ported from <a href="https://github.com/Beckhoff/ADS/AdsLib">github</a>
+ * <p>
+ * The purpose of this is to validate the plc4x implementation against a reference test.
+ */
 package org.apache.plc4x.java.ads.adslib;
\ No newline at end of file
diff --git a/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnectionTest.java b/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnectionTest.java
index db48b074127..a55c758d944 100644
--- a/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnectionTest.java
+++ b/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnectionTest.java
@@ -1,350 +1,350 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.connection;
-
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelHandler;
-import io.netty.util.concurrent.Future;
-import io.netty.util.concurrent.GenericFutureListener;
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.plc4x.java.ads.api.commands.AdsReadWriteResponse;
-import org.apache.plc4x.java.ads.api.commands.types.Data;
-import org.apache.plc4x.java.ads.api.commands.types.Result;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.model.DirectAdsField;
-import org.apache.plc4x.java.ads.model.SymbolicAdsField;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.messages.PlcFieldRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.messages.PlcWriteResponse;
-import org.apache.plc4x.java.base.connection.ChannelFactory;
-import org.apache.plc4x.java.base.messages.*;
-import org.assertj.core.api.WithAssertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Map;
-import java.util.Queue;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.*;
-
-@SuppressWarnings("unchecked")
-@ExtendWith(MockitoExtension.class)
-class AdsAbstractPlcConnectionTest implements WithAssertions {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(AdsAbstractPlcConnectionTest.class);
-
-    private AdsAbstractPlcConnection SUT;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private ChannelFactory channelFactory;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Channel channel;
-
-    @BeforeEach
-    void setUp() throws Exception {
-        SUT = new AdsAbstractPlcConnection(channelFactory, mock(AmsNetId.class), mock(AmsPort.class), mock(AmsNetId.class), mock(AmsPort.class)) {
-            @Override
-            protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
-                return null;
-            }
-        };
-
-        when(channelFactory.createChannel(any())).thenReturn(channel);
-
-        SUT.connect();
-    }
-
-    @Nested
-    class Lifecycle {
-        @Test
-        void lazyConstructor() {
-            AdsAbstractPlcConnection constructed = new AdsAbstractPlcConnection(channelFactory, mock(AmsNetId.class), mock(AmsPort.class)) {
-                @Override
-                protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
-                    return null;
-                }
-            };
-            assertEquals(AdsAbstractPlcConnection.generateAMSNetId(), constructed.getSourceAmsNetId());
-            assertEquals(AdsAbstractPlcConnection.generateAMSPort(), constructed.getSourceAmsPort());
-        }
-
-        @Test
-        void close() throws Exception {
-            Map fieldMapping = (Map) FieldUtils.getDeclaredField(AdsAbstractPlcConnection.class, "fieldMapping", true).get(SUT);
-            fieldMapping.put(mock(SymbolicAdsField.class), mock(DirectAdsField.class));
-            SUT.close();
-        }
-    }
-
-
-    @Nested
-    class Communication {
-
-        @Test
-        void read() {
-            CompletableFuture<PlcReadResponse> read = SUT.read(mock(InternalPlcReadRequest.class));
-            assertNotNull(read);
-
-            simulatePipelineError(() -> SUT.read(mock(InternalPlcReadRequest.class)));
-        }
-
-        @Test
-        void write() {
-            CompletableFuture<PlcWriteResponse> write = SUT.write(mock(InternalPlcWriteRequest.class));
-            assertNotNull(write);
-
-            simulatePipelineError(() -> SUT.write(mock(InternalPlcWriteRequest.class)));
-        }
-
-        @Test
-        void send() {
-            CompletableFuture send = SUT.send(mock(InternalPlcProprietaryRequest.class));
-            assertNotNull(send);
-
-            simulatePipelineError(() -> SUT.send(mock(InternalPlcProprietaryRequest.class)));
-        }
-
-        void simulatePipelineError(FutureProducingTestRunnable futureProducingTestRunnable) {
-            ChannelFuture channelFuture = mock(ChannelFuture.class);
-            // Simulate error in the pipeline
-            when(channelFuture.addListener(any())).thenAnswer(invocation -> {
-                Future future = mock(Future.class);
-                when(future.isSuccess()).thenReturn(false);
-                when(future.cause()).thenReturn(new DummyException());
-                GenericFutureListener genericFutureListener = invocation.getArgument(0);
-                genericFutureListener.operationComplete(future);
-                return mock(ChannelFuture.class);
-            });
-            when(channel.writeAndFlush(any())).thenReturn(channelFuture);
-            assertThrows(DummyException.class, () -> {
-                CompletableFuture completableFuture = futureProducingTestRunnable.run();
-                try {
-                    completableFuture.get(3, TimeUnit.SECONDS);
-                    fail("Should have thrown a ExecutionException");
-                } catch (ExecutionException e) {
-                    if (e.getCause() instanceof DummyException) {
-                        throw (DummyException) e.getCause();
-                    }
-                    throw e;
-                }
-            });
-        }
-    }
-
-    @Nested
-    class Symbolic {
-
-        @BeforeEach
-        void setUp() {
-            SUT.clearMapping();
-        }
-
-        @Test
-        void mapFields() {
-            SUT.mapFields(mock(PlcFieldRequest.class));
-        }
-
-        @Test
-        void mapSingleField() {
-            when(channel.writeAndFlush(any(PlcRequestContainer.class))).then(invocation -> {
-                PlcRequestContainer plcRequestContainer = invocation.getArgument(0);
-                PlcProprietaryResponse plcProprietaryResponse = Mockito.mock(InternalPlcProprietaryResponse.class, RETURNS_DEEP_STUBS);
-                AdsReadWriteResponse adsReadWriteResponse = Mockito.mock(AdsReadWriteResponse.class, RETURNS_DEEP_STUBS);
-                when(adsReadWriteResponse.getResult()).thenReturn(Result.of(0));
-                when(adsReadWriteResponse.getData()).thenReturn(Data.of(new byte[]{1, 2, 3, 4}));
-                when(plcProprietaryResponse.getResponse()).thenReturn(adsReadWriteResponse);
-                plcRequestContainer.getResponseFuture().complete(plcProprietaryResponse);
-                return mock(ChannelFuture.class);
-            });
-
-            SUT.mapFields(SymbolicAdsField.of("Main.byByte[0]:BYTE"));
-            SUT.mapFields(SymbolicAdsField.of("Main.byByte[0]:BYTE"));
-            verify(channel, times(1)).writeAndFlush(any(PlcRequestContainer.class));
-            SUT.clearMapping();
-            reset(channel);
-        }
-
-        @Test
-        void mapSingleFieldNegative() {
-            when(channel.writeAndFlush(any(PlcRequestContainer.class))).then(invocation -> {
-                PlcRequestContainer plcRequestContainer = invocation.getArgument(0);
-                PlcProprietaryResponse plcProprietaryResponse = Mockito.mock(InternalPlcProprietaryResponse.class, RETURNS_DEEP_STUBS);
-                AdsReadWriteResponse adsReadWriteResponse = Mockito.mock(AdsReadWriteResponse.class, RETURNS_DEEP_STUBS);
-                when(adsReadWriteResponse.getResult()).thenReturn(Result.of(1));
-                when(plcProprietaryResponse.getResponse()).thenReturn(adsReadWriteResponse);
-                plcRequestContainer.getResponseFuture().complete(plcProprietaryResponse);
-                return mock(ChannelFuture.class);
-            });
-
-            assertThatThrownBy(() -> SUT.mapFields(SymbolicAdsField.of("Main.byByte[0]:INT64")))
-                .isInstanceOf(PlcRuntimeException.class)
-                .hasMessageMatching("Non error code received .*");
-            verify(channel, times(1)).writeAndFlush(any(PlcRequestContainer.class));
-            SUT.clearMapping();
-            reset(channel);
-        }
-    }
-
-
-    @Nested
-    class Misc {
-        @Test
-        void remainingMethods() {
-            assertThat(SUT.canRead()).isTrue();
-            assertThat(SUT.canWrite()).isTrue();
-            assertThat(SUT.readRequestBuilder()).isNotNull();
-            assertThat(SUT.writeRequestBuilder()).isNotNull();
-        }
-
-        @Test
-        void testToString() {
-            String s = SUT.toString();
-            assertNotNull(s);
-        }
-
-        @Test
-        void getTargetAmsNetId() {
-            AmsNetId targetAmsNetId = SUT.getTargetAmsNetId();
-            assertNotNull(targetAmsNetId);
-        }
-
-        @Test
-        void getTargetAmsPort() {
-            AmsPort targetAmsPort = SUT.getTargetAmsPort();
-            assertNotNull(targetAmsPort);
-        }
-
-        @Test
-        void getSourceAmsNetId() {
-            AmsNetId sourceAmsNetId = SUT.getSourceAmsNetId();
-            assertNotNull(sourceAmsNetId);
-        }
-
-        @Test
-        void getSourceAmsPort() {
-            AmsPort sourceAmsPort = SUT.getSourceAmsPort();
-            assertNotNull(sourceAmsPort);
-        }
-
-        @Test
-        void generateAMSNetId() {
-            AmsNetId targetAmsNetId = AdsAbstractPlcConnection.generateAMSNetId();
-            assertNotNull(targetAmsNetId);
-        }
-
-        @Test
-        void generateAMSPort() {
-            AmsPort amsPort = AdsAbstractPlcConnection.generateAMSPort();
-            assertNotNull(amsPort);
-        }
-
-
-        @Test
-        void getFromFuture() throws Exception {
-            runInThread(() -> {
-                CompletableFuture completableFuture = mock(CompletableFuture.class, RETURNS_DEEP_STUBS);
-                when(completableFuture.get(any(long.class), any(TimeUnit.class))).thenReturn(new Object());
-                Object fromFuture = SUT.getFromFuture(completableFuture, 1);
-                assertNotNull(fromFuture);
-            });
-            runInThread(() -> {
-                CompletableFuture completableFuture = mock(CompletableFuture.class, RETURNS_DEEP_STUBS);
-                when(completableFuture.get(anyLong(), any())).thenThrow(InterruptedException.class);
-                assertThrows(PlcRuntimeException.class, () -> SUT.getFromFuture(completableFuture, 1));
-            });
-            runInThread(() -> {
-                CompletableFuture completableFuture = mock(CompletableFuture.class, RETURNS_DEEP_STUBS);
-                when(completableFuture.get(anyLong(), any())).thenThrow(ExecutionException.class);
-                assertThrows(PlcRuntimeException.class, () -> SUT.getFromFuture(completableFuture, 1));
-            });
-            runInThread(() -> {
-                CompletableFuture completableFuture = mock(CompletableFuture.class, RETURNS_DEEP_STUBS);
-                when(completableFuture.get(anyLong(), any())).thenThrow(TimeoutException.class);
-                assertThrows(PlcRuntimeException.class, () -> SUT.getFromFuture(completableFuture, 1));
-            });
-            assertFalse("The current Thread should not be interrupted", Thread.currentThread().isInterrupted());
-        }
-
-        /**
-         * Runs tests steps in a dedicated {@link Thread} so a possible {@link InterruptedException} doesn't lead to a
-         * interrupt flag being set on the main Thread ({@link Thread#isInterrupted}).
-         *
-         * @param testRunnable a special {@link Runnable} which adds a {@code throws Exception} to the {@code run} signature.
-         * @throws InterruptedException when this {@link Thread} gets interrupted.
-         */
-        void runInThread(TestRunnable testRunnable) throws InterruptedException {
-            Thread thread = new Thread(() -> {
-                try {
-                    testRunnable.run();
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
-                }
-            });
-            Queue<Throwable> uncaughtExceptions = new ConcurrentLinkedQueue<>();
-            thread.setUncaughtExceptionHandler((t, e) -> uncaughtExceptions.add(e));
-            thread.start();
-            thread.join();
-            if (!uncaughtExceptions.isEmpty()) {
-                uncaughtExceptions.forEach(throwable -> LOGGER.error("Assertion Error: Unexpected Exception", throwable));
-                throw new AssertionError("Test failures. Check log");
-            }
-        }
-    }
-
-    /**
-     * Variant of {@link Runnable} which adds a {@code throws Exception} to the {@code run} signature.
-     */
-    private interface TestRunnable {
-        /**
-         * @throws Exception when the test throws a exception.
-         * @see Runnable#run()
-         */
-        void run() throws Exception;
-    }
-
-    private static class DummyException extends Exception {
-
-    }
-
-    @FunctionalInterface
-    private interface FutureProducingTestRunnable {
-        CompletableFuture run() throws Exception;
-    }
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.connection;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.plc4x.java.ads.api.commands.AdsReadWriteResponse;
+import org.apache.plc4x.java.ads.api.commands.types.Data;
+import org.apache.plc4x.java.ads.api.commands.types.Result;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.model.DirectAdsField;
+import org.apache.plc4x.java.ads.model.SymbolicAdsField;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.messages.PlcFieldRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.messages.PlcWriteResponse;
+import org.apache.plc4x.java.base.connection.ChannelFactory;
+import org.apache.plc4x.java.base.messages.*;
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+import java.util.Queue;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.*;
+
+@SuppressWarnings("unchecked")
+@ExtendWith(MockitoExtension.class)
+class AdsAbstractPlcConnectionTest implements WithAssertions {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(AdsAbstractPlcConnectionTest.class);
+
+    private AdsAbstractPlcConnection SUT;
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private ChannelFactory channelFactory;
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Channel channel;
+
+    @BeforeEach
+    void setUp() throws Exception {
+        SUT = new AdsAbstractPlcConnection(channelFactory, mock(AmsNetId.class), mock(AmsPort.class), mock(AmsNetId.class), mock(AmsPort.class)) {
+            @Override
+            protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
+                return null;
+            }
+        };
+
+        when(channelFactory.createChannel(any())).thenReturn(channel);
+
+        SUT.connect();
+    }
+
+    @Nested
+    class Lifecycle {
+        @Test
+        void lazyConstructor() {
+            AdsAbstractPlcConnection constructed = new AdsAbstractPlcConnection(channelFactory, mock(AmsNetId.class), mock(AmsPort.class)) {
+                @Override
+                protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
+                    return null;
+                }
+            };
+            assertEquals(AdsAbstractPlcConnection.generateAMSNetId(), constructed.getSourceAmsNetId());
+            assertEquals(AdsAbstractPlcConnection.generateAMSPort(), constructed.getSourceAmsPort());
+        }
+
+        @Test
+        void close() throws Exception {
+            Map fieldMapping = (Map) FieldUtils.getDeclaredField(AdsAbstractPlcConnection.class, "fieldMapping", true).get(SUT);
+            fieldMapping.put(mock(SymbolicAdsField.class), mock(DirectAdsField.class));
+            SUT.close();
+        }
+    }
+
+
+    @Nested
+    class Communication {
+
+        @Test
+        void read() {
+            CompletableFuture<PlcReadResponse> read = SUT.read(mock(InternalPlcReadRequest.class));
+            assertNotNull(read);
+
+            simulatePipelineError(() -> SUT.read(mock(InternalPlcReadRequest.class)));
+        }
+
+        @Test
+        void write() {
+            CompletableFuture<PlcWriteResponse> write = SUT.write(mock(InternalPlcWriteRequest.class));
+            assertNotNull(write);
+
+            simulatePipelineError(() -> SUT.write(mock(InternalPlcWriteRequest.class)));
+        }
+
+        @Test
+        void send() {
+            CompletableFuture send = SUT.send(mock(InternalPlcProprietaryRequest.class));
+            assertNotNull(send);
+
+            simulatePipelineError(() -> SUT.send(mock(InternalPlcProprietaryRequest.class)));
+        }
+
+        void simulatePipelineError(FutureProducingTestRunnable futureProducingTestRunnable) {
+            ChannelFuture channelFuture = mock(ChannelFuture.class);
+            // Simulate error in the pipeline
+            when(channelFuture.addListener(any())).thenAnswer(invocation -> {
+                Future future = mock(Future.class);
+                when(future.isSuccess()).thenReturn(false);
+                when(future.cause()).thenReturn(new DummyException());
+                GenericFutureListener genericFutureListener = invocation.getArgument(0);
+                genericFutureListener.operationComplete(future);
+                return mock(ChannelFuture.class);
+            });
+            when(channel.writeAndFlush(any())).thenReturn(channelFuture);
+            assertThrows(DummyException.class, () -> {
+                CompletableFuture completableFuture = futureProducingTestRunnable.run();
+                try {
+                    completableFuture.get(3, TimeUnit.SECONDS);
+                    fail("Should have thrown a ExecutionException");
+                } catch (ExecutionException e) {
+                    if (e.getCause() instanceof DummyException) {
+                        throw (DummyException) e.getCause();
+                    }
+                    throw e;
+                }
+            });
+        }
+    }
+
+    @Nested
+    class Symbolic {
+
+        @BeforeEach
+        void setUp() {
+            SUT.clearMapping();
+        }
+
+        @Test
+        void mapFields() {
+            SUT.mapFields(mock(PlcFieldRequest.class));
+        }
+
+        @Test
+        void mapSingleField() {
+            when(channel.writeAndFlush(any(PlcRequestContainer.class))).then(invocation -> {
+                PlcRequestContainer plcRequestContainer = invocation.getArgument(0);
+                PlcProprietaryResponse plcProprietaryResponse = Mockito.mock(InternalPlcProprietaryResponse.class, RETURNS_DEEP_STUBS);
+                AdsReadWriteResponse adsReadWriteResponse = Mockito.mock(AdsReadWriteResponse.class, RETURNS_DEEP_STUBS);
+                when(adsReadWriteResponse.getResult()).thenReturn(Result.of(0));
+                when(adsReadWriteResponse.getData()).thenReturn(Data.of(new byte[]{1, 2, 3, 4}));
+                when(plcProprietaryResponse.getResponse()).thenReturn(adsReadWriteResponse);
+                plcRequestContainer.getResponseFuture().complete(plcProprietaryResponse);
+                return mock(ChannelFuture.class);
+            });
+
+            SUT.mapFields(SymbolicAdsField.of("Main.byByte[0]:BYTE"));
+            SUT.mapFields(SymbolicAdsField.of("Main.byByte[0]:BYTE"));
+            verify(channel, times(1)).writeAndFlush(any(PlcRequestContainer.class));
+            SUT.clearMapping();
+            reset(channel);
+        }
+
+        @Test
+        void mapSingleFieldNegative() {
+            when(channel.writeAndFlush(any(PlcRequestContainer.class))).then(invocation -> {
+                PlcRequestContainer plcRequestContainer = invocation.getArgument(0);
+                PlcProprietaryResponse plcProprietaryResponse = Mockito.mock(InternalPlcProprietaryResponse.class, RETURNS_DEEP_STUBS);
+                AdsReadWriteResponse adsReadWriteResponse = Mockito.mock(AdsReadWriteResponse.class, RETURNS_DEEP_STUBS);
+                when(adsReadWriteResponse.getResult()).thenReturn(Result.of(1));
+                when(plcProprietaryResponse.getResponse()).thenReturn(adsReadWriteResponse);
+                plcRequestContainer.getResponseFuture().complete(plcProprietaryResponse);
+                return mock(ChannelFuture.class);
+            });
+
+            assertThatThrownBy(() -> SUT.mapFields(SymbolicAdsField.of("Main.byByte[0]:INT64")))
+                .isInstanceOf(PlcRuntimeException.class)
+                .hasMessageMatching("Non error code received .*");
+            verify(channel, times(1)).writeAndFlush(any(PlcRequestContainer.class));
+            SUT.clearMapping();
+            reset(channel);
+        }
+    }
+
+
+    @Nested
+    class Misc {
+        @Test
+        void remainingMethods() {
+            assertThat(SUT.canRead()).isTrue();
+            assertThat(SUT.canWrite()).isTrue();
+            assertThat(SUT.readRequestBuilder()).isNotNull();
+            assertThat(SUT.writeRequestBuilder()).isNotNull();
+        }
+
+        @Test
+        void testToString() {
+            String s = SUT.toString();
+            assertNotNull(s);
+        }
+
+        @Test
+        void getTargetAmsNetId() {
+            AmsNetId targetAmsNetId = SUT.getTargetAmsNetId();
+            assertNotNull(targetAmsNetId);
+        }
+
+        @Test
+        void getTargetAmsPort() {
+            AmsPort targetAmsPort = SUT.getTargetAmsPort();
+            assertNotNull(targetAmsPort);
+        }
+
+        @Test
+        void getSourceAmsNetId() {
+            AmsNetId sourceAmsNetId = SUT.getSourceAmsNetId();
+            assertNotNull(sourceAmsNetId);
+        }
+
+        @Test
+        void getSourceAmsPort() {
+            AmsPort sourceAmsPort = SUT.getSourceAmsPort();
+            assertNotNull(sourceAmsPort);
+        }
+
+        @Test
+        void generateAMSNetId() {
+            AmsNetId targetAmsNetId = AdsAbstractPlcConnection.generateAMSNetId();
+            assertNotNull(targetAmsNetId);
+        }
+
+        @Test
+        void generateAMSPort() {
+            AmsPort amsPort = AdsAbstractPlcConnection.generateAMSPort();
+            assertNotNull(amsPort);
+        }
+
+
+        @Test
+        void getFromFuture() throws Exception {
+            runInThread(() -> {
+                CompletableFuture completableFuture = mock(CompletableFuture.class, RETURNS_DEEP_STUBS);
+                when(completableFuture.get(any(long.class), any(TimeUnit.class))).thenReturn(new Object());
+                Object fromFuture = SUT.getFromFuture(completableFuture, 1);
+                assertNotNull(fromFuture);
+            });
+            runInThread(() -> {
+                CompletableFuture completableFuture = mock(CompletableFuture.class, RETURNS_DEEP_STUBS);
+                when(completableFuture.get(anyLong(), any())).thenThrow(InterruptedException.class);
+                assertThrows(PlcRuntimeException.class, () -> SUT.getFromFuture(completableFuture, 1));
+            });
+            runInThread(() -> {
+                CompletableFuture completableFuture = mock(CompletableFuture.class, RETURNS_DEEP_STUBS);
+                when(completableFuture.get(anyLong(), any())).thenThrow(ExecutionException.class);
+                assertThrows(PlcRuntimeException.class, () -> SUT.getFromFuture(completableFuture, 1));
+            });
+            runInThread(() -> {
+                CompletableFuture completableFuture = mock(CompletableFuture.class, RETURNS_DEEP_STUBS);
+                when(completableFuture.get(anyLong(), any())).thenThrow(TimeoutException.class);
+                assertThrows(PlcRuntimeException.class, () -> SUT.getFromFuture(completableFuture, 1));
+            });
+            assertFalse("The current Thread should not be interrupted", Thread.currentThread().isInterrupted());
+        }
+
+        /**
+         * Runs tests steps in a dedicated {@link Thread} so a possible {@link InterruptedException} doesn't lead to a
+         * interrupt flag being set on the main Thread ({@link Thread#isInterrupted}).
+         *
+         * @param testRunnable a special {@link Runnable} which adds a {@code throws Exception} to the {@code run} signature.
+         * @throws InterruptedException when this {@link Thread} gets interrupted.
+         */
+        void runInThread(TestRunnable testRunnable) throws InterruptedException {
+            Thread thread = new Thread(() -> {
+                try {
+                    testRunnable.run();
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            });
+            Queue<Throwable> uncaughtExceptions = new ConcurrentLinkedQueue<>();
+            thread.setUncaughtExceptionHandler((t, e) -> uncaughtExceptions.add(e));
+            thread.start();
+            thread.join();
+            if (!uncaughtExceptions.isEmpty()) {
+                uncaughtExceptions.forEach(throwable -> LOGGER.error("Assertion Error: Unexpected Exception", throwable));
+                throw new AssertionError("Test failures. Check log");
+            }
+        }
+    }
+
+    /**
+     * Variant of {@link Runnable} which adds a {@code throws Exception} to the {@code run} signature.
+     */
+    private interface TestRunnable {
+        /**
+         * @throws Exception when the test throws a exception.
+         * @see Runnable#run()
+         */
+        void run() throws Exception;
+    }
+
+    private static class DummyException extends Exception {
+
+    }
+
+    @FunctionalInterface
+    private interface FutureProducingTestRunnable {
+        CompletableFuture run() throws Exception;
+    }
 }
\ No newline at end of file
diff --git a/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsConnectionFactoryTest.java b/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsConnectionFactoryTest.java
index 4f41499a779..0ea633b0118 100644
--- a/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsConnectionFactoryTest.java
+++ b/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsConnectionFactoryTest.java
@@ -1,165 +1,165 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.connection;
-
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.base.connection.NettyPlcConnection;
-import org.apache.plc4x.java.serial.connection.connection.SerialChannelFactory;
-import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import java.net.InetAddress;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-@RunWith(MockitoJUnitRunner.class)
-public class AdsConnectionFactoryTest {
-
-    @InjectMocks
-    private AdsConnectionFactory SUT;
-
-    @Mock
-    private InetAddress inetAddress;
-
-    @Mock
-    private AmsNetId targetAmsNetId;
-
-    @Mock
-    private AmsPort targetAmsPort;
-
-    @Mock
-    private AmsNetId sourceAmsNetId;
-
-    @Mock
-    private AmsPort sourceAmsPort;
-
-    @Test
-    public void adsTcpPlcConnectionOf() throws Exception {
-        {
-            assertThrows(NullPointerException.class, () -> SUT.adsTcpPlcConnectionOf(null, null, null, null, null, null));
-            assertThrows(NullPointerException.class, () -> SUT.adsTcpPlcConnectionOf(inetAddress, null, null, null, null, null));
-            assertThrows(NullPointerException.class, () -> SUT.adsTcpPlcConnectionOf(inetAddress, null, targetAmsNetId, null, null, null));
-        }
-        {
-            AdsTcpPlcConnection adsTcpPlcConnection = SUT.adsTcpPlcConnectionOf(inetAddress, null, targetAmsNetId, targetAmsPort, null, null);
-            assertEquals(inetAddress, adsTcpPlcConnection.getRemoteAddress());
-            assertEquals(targetAmsNetId, adsTcpPlcConnection.getTargetAmsNetId());
-            assertEquals(targetAmsPort, adsTcpPlcConnection.getTargetAmsPort());
-            assertNotEquals(sourceAmsNetId, adsTcpPlcConnection.getSourceAmsNetId());
-            assertNotEquals(sourceAmsPort, adsTcpPlcConnection.getSourceAmsPort());
-            assertGeneratedPort(adsTcpPlcConnection);
-        }
-        {
-            AdsTcpPlcConnection adsTcpPlcConnection = SUT.adsTcpPlcConnectionOf(inetAddress, 13, targetAmsNetId, targetAmsPort, null, null);
-            assertEquals(inetAddress, adsTcpPlcConnection.getRemoteAddress());
-            assertEquals(targetAmsNetId, adsTcpPlcConnection.getTargetAmsNetId());
-            assertEquals(targetAmsPort, adsTcpPlcConnection.getTargetAmsPort());
-            assertNotEquals(sourceAmsNetId, adsTcpPlcConnection.getSourceAmsNetId());
-            assertNotEquals(sourceAmsPort, adsTcpPlcConnection.getSourceAmsPort());
-            assertPort(adsTcpPlcConnection, 13);
-        }
-        {
-            AdsTcpPlcConnection adsTcpPlcConnection = SUT.adsTcpPlcConnectionOf(inetAddress, null, targetAmsNetId, targetAmsPort, sourceAmsNetId, null);
-            assertEquals(inetAddress, adsTcpPlcConnection.getRemoteAddress());
-            assertEquals(targetAmsNetId, adsTcpPlcConnection.getTargetAmsNetId());
-            assertEquals(targetAmsPort, adsTcpPlcConnection.getTargetAmsPort());
-            assertNotEquals(sourceAmsNetId, adsTcpPlcConnection.getSourceAmsNetId());
-            assertNotEquals(sourceAmsPort, adsTcpPlcConnection.getSourceAmsPort());
-            assertGeneratedPort(adsTcpPlcConnection);
-        }
-        {
-            AdsTcpPlcConnection adsTcpPlcConnection = SUT.adsTcpPlcConnectionOf(inetAddress, null, targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
-            assertEquals(inetAddress, adsTcpPlcConnection.getRemoteAddress());
-            assertEquals(targetAmsNetId, adsTcpPlcConnection.getTargetAmsNetId());
-            assertEquals(targetAmsPort, adsTcpPlcConnection.getTargetAmsPort());
-            assertEquals(sourceAmsNetId, adsTcpPlcConnection.getSourceAmsNetId());
-            assertEquals(sourceAmsPort, adsTcpPlcConnection.getSourceAmsPort());
-            assertGeneratedPort(adsTcpPlcConnection);
-        }
-        {
-            AdsTcpPlcConnection adsTcpPlcConnection = SUT.adsTcpPlcConnectionOf(inetAddress, 13, targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
-            assertEquals(inetAddress, adsTcpPlcConnection.getRemoteAddress());
-            assertEquals(targetAmsNetId, adsTcpPlcConnection.getTargetAmsNetId());
-            assertEquals(targetAmsPort, adsTcpPlcConnection.getTargetAmsPort());
-            assertEquals(sourceAmsNetId, adsTcpPlcConnection.getSourceAmsNetId());
-            assertEquals(sourceAmsPort, adsTcpPlcConnection.getSourceAmsPort());
-            assertPort(adsTcpPlcConnection, 13);
-        }
-    }
-
-    public void assertGeneratedPort(AdsTcpPlcConnection adsTcpPlcConnection) throws Exception {
-        assertPort(adsTcpPlcConnection, 48898);
-    }
-
-    public void assertPort(AdsTcpPlcConnection adsTcpPlcConnection, int port) throws Exception {
-        TcpSocketChannelFactory channelFactory = (TcpSocketChannelFactory) FieldUtils
-            .getDeclaredField(NettyPlcConnection.class, "channelFactory", true)
-            .get(adsTcpPlcConnection);
-        Assert.assertEquals(port, channelFactory.getPort());
-    }
-
-    @Test
-    public void adsSerialPlcConnectionOf() throws Exception {
-        {
-            assertThrows(NullPointerException.class, () -> SUT.adsSerialPlcConnectionOf(null, null, null, null, null));
-            assertThrows(NullPointerException.class, () -> SUT.adsSerialPlcConnectionOf("/dev/ttyS01", null, null, null, null));
-            assertThrows(NullPointerException.class, () -> SUT.adsSerialPlcConnectionOf("/dev/ttyS01", targetAmsNetId, null, null, null));
-        }
-        {
-            AdsSerialPlcConnection adsSerialPlcConnection = SUT.adsSerialPlcConnectionOf("/dev/ttyS01", targetAmsNetId, targetAmsPort, null, null);
-            assertEquals(targetAmsNetId, adsSerialPlcConnection.getTargetAmsNetId());
-            assertEquals(targetAmsPort, adsSerialPlcConnection.getTargetAmsPort());
-            assertNotEquals(sourceAmsNetId, adsSerialPlcConnection.getSourceAmsNetId());
-            assertNotEquals(sourceAmsPort, adsSerialPlcConnection.getSourceAmsPort());
-            assertPort(adsSerialPlcConnection, "/dev/ttyS01");
-        }
-        {
-            AdsSerialPlcConnection adsSerialPlcConnection = SUT.adsSerialPlcConnectionOf("/dev/ttyS01", targetAmsNetId, targetAmsPort, sourceAmsNetId, null);
-            assertEquals(targetAmsNetId, adsSerialPlcConnection.getTargetAmsNetId());
-            assertEquals(targetAmsPort, adsSerialPlcConnection.getTargetAmsPort());
-            assertNotEquals(sourceAmsNetId, adsSerialPlcConnection.getSourceAmsNetId());
-            assertNotEquals(sourceAmsPort, adsSerialPlcConnection.getSourceAmsPort());
-            assertPort(adsSerialPlcConnection, "/dev/ttyS01");
-        }
-        {
-            AdsSerialPlcConnection adsSerialPlcConnection = SUT.adsSerialPlcConnectionOf("/dev/ttyS01", targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
-            assertEquals(targetAmsNetId, adsSerialPlcConnection.getTargetAmsNetId());
-            assertEquals(targetAmsPort, adsSerialPlcConnection.getTargetAmsPort());
-            assertEquals(sourceAmsNetId, adsSerialPlcConnection.getSourceAmsNetId());
-            assertEquals(sourceAmsPort, adsSerialPlcConnection.getSourceAmsPort());
-            assertPort(adsSerialPlcConnection, "/dev/ttyS01");
-        }
-    }
-
-    public void assertPort(AdsSerialPlcConnection adsSerialPlcConnection, String serialPort) throws Exception {
-        SerialChannelFactory channelFactory = (SerialChannelFactory) FieldUtils
-            .getDeclaredField(NettyPlcConnection.class, "channelFactory", true)
-            .get(adsSerialPlcConnection);
-        Assert.assertEquals(serialPort, channelFactory.getSerialPort());
-    }
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.connection;
+
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.base.connection.NettyPlcConnection;
+import org.apache.plc4x.java.serial.connection.connection.SerialChannelFactory;
+import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import java.net.InetAddress;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+@RunWith(MockitoJUnitRunner.class)
+public class AdsConnectionFactoryTest {
+
+    @InjectMocks
+    private AdsConnectionFactory SUT;
+
+    @Mock
+    private InetAddress inetAddress;
+
+    @Mock
+    private AmsNetId targetAmsNetId;
+
+    @Mock
+    private AmsPort targetAmsPort;
+
+    @Mock
+    private AmsNetId sourceAmsNetId;
+
+    @Mock
+    private AmsPort sourceAmsPort;
+
+    @Test
+    public void adsTcpPlcConnectionOf() throws Exception {
+        {
+            assertThrows(NullPointerException.class, () -> SUT.adsTcpPlcConnectionOf(null, null, null, null, null, null));
+            assertThrows(NullPointerException.class, () -> SUT.adsTcpPlcConnectionOf(inetAddress, null, null, null, null, null));
+            assertThrows(NullPointerException.class, () -> SUT.adsTcpPlcConnectionOf(inetAddress, null, targetAmsNetId, null, null, null));
+        }
+        {
+            AdsTcpPlcConnection adsTcpPlcConnection = SUT.adsTcpPlcConnectionOf(inetAddress, null, targetAmsNetId, targetAmsPort, null, null);
+            assertEquals(inetAddress, adsTcpPlcConnection.getRemoteAddress());
+            assertEquals(targetAmsNetId, adsTcpPlcConnection.getTargetAmsNetId());
+            assertEquals(targetAmsPort, adsTcpPlcConnection.getTargetAmsPort());
+            assertNotEquals(sourceAmsNetId, adsTcpPlcConnection.getSourceAmsNetId());
+            assertNotEquals(sourceAmsPort, adsTcpPlcConnection.getSourceAmsPort());
+            assertGeneratedPort(adsTcpPlcConnection);
+        }
+        {
+            AdsTcpPlcConnection adsTcpPlcConnection = SUT.adsTcpPlcConnectionOf(inetAddress, 13, targetAmsNetId, targetAmsPort, null, null);
+            assertEquals(inetAddress, adsTcpPlcConnection.getRemoteAddress());
+            assertEquals(targetAmsNetId, adsTcpPlcConnection.getTargetAmsNetId());
+            assertEquals(targetAmsPort, adsTcpPlcConnection.getTargetAmsPort());
+            assertNotEquals(sourceAmsNetId, adsTcpPlcConnection.getSourceAmsNetId());
+            assertNotEquals(sourceAmsPort, adsTcpPlcConnection.getSourceAmsPort());
+            assertPort(adsTcpPlcConnection, 13);
+        }
+        {
+            AdsTcpPlcConnection adsTcpPlcConnection = SUT.adsTcpPlcConnectionOf(inetAddress, null, targetAmsNetId, targetAmsPort, sourceAmsNetId, null);
+            assertEquals(inetAddress, adsTcpPlcConnection.getRemoteAddress());
+            assertEquals(targetAmsNetId, adsTcpPlcConnection.getTargetAmsNetId());
+            assertEquals(targetAmsPort, adsTcpPlcConnection.getTargetAmsPort());
+            assertNotEquals(sourceAmsNetId, adsTcpPlcConnection.getSourceAmsNetId());
+            assertNotEquals(sourceAmsPort, adsTcpPlcConnection.getSourceAmsPort());
+            assertGeneratedPort(adsTcpPlcConnection);
+        }
+        {
+            AdsTcpPlcConnection adsTcpPlcConnection = SUT.adsTcpPlcConnectionOf(inetAddress, null, targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
+            assertEquals(inetAddress, adsTcpPlcConnection.getRemoteAddress());
+            assertEquals(targetAmsNetId, adsTcpPlcConnection.getTargetAmsNetId());
+            assertEquals(targetAmsPort, adsTcpPlcConnection.getTargetAmsPort());
+            assertEquals(sourceAmsNetId, adsTcpPlcConnection.getSourceAmsNetId());
+            assertEquals(sourceAmsPort, adsTcpPlcConnection.getSourceAmsPort());
+            assertGeneratedPort(adsTcpPlcConnection);
+        }
+        {
+            AdsTcpPlcConnection adsTcpPlcConnection = SUT.adsTcpPlcConnectionOf(inetAddress, 13, targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
+            assertEquals(inetAddress, adsTcpPlcConnection.getRemoteAddress());
+            assertEquals(targetAmsNetId, adsTcpPlcConnection.getTargetAmsNetId());
+            assertEquals(targetAmsPort, adsTcpPlcConnection.getTargetAmsPort());
+            assertEquals(sourceAmsNetId, adsTcpPlcConnection.getSourceAmsNetId());
+            assertEquals(sourceAmsPort, adsTcpPlcConnection.getSourceAmsPort());
+            assertPort(adsTcpPlcConnection, 13);
+        }
+    }
+
+    public void assertGeneratedPort(AdsTcpPlcConnection adsTcpPlcConnection) throws Exception {
+        assertPort(adsTcpPlcConnection, 48898);
+    }
+
+    public void assertPort(AdsTcpPlcConnection adsTcpPlcConnection, int port) throws Exception {
+        TcpSocketChannelFactory channelFactory = (TcpSocketChannelFactory) FieldUtils
+            .getDeclaredField(NettyPlcConnection.class, "channelFactory", true)
+            .get(adsTcpPlcConnection);
+        Assert.assertEquals(port, channelFactory.getPort());
+    }
+
+    @Test
+    public void adsSerialPlcConnectionOf() throws Exception {
+        {
+            assertThrows(NullPointerException.class, () -> SUT.adsSerialPlcConnectionOf(null, null, null, null, null));
+            assertThrows(NullPointerException.class, () -> SUT.adsSerialPlcConnectionOf("/dev/ttyS01", null, null, null, null));
+            assertThrows(NullPointerException.class, () -> SUT.adsSerialPlcConnectionOf("/dev/ttyS01", targetAmsNetId, null, null, null));
+        }
+        {
+            AdsSerialPlcConnection adsSerialPlcConnection = SUT.adsSerialPlcConnectionOf("/dev/ttyS01", targetAmsNetId, targetAmsPort, null, null);
+            assertEquals(targetAmsNetId, adsSerialPlcConnection.getTargetAmsNetId());
+            assertEquals(targetAmsPort, adsSerialPlcConnection.getTargetAmsPort());
+            assertNotEquals(sourceAmsNetId, adsSerialPlcConnection.getSourceAmsNetId());
+            assertNotEquals(sourceAmsPort, adsSerialPlcConnection.getSourceAmsPort());
+            assertPort(adsSerialPlcConnection, "/dev/ttyS01");
+        }
+        {
+            AdsSerialPlcConnection adsSerialPlcConnection = SUT.adsSerialPlcConnectionOf("/dev/ttyS01", targetAmsNetId, targetAmsPort, sourceAmsNetId, null);
+            assertEquals(targetAmsNetId, adsSerialPlcConnection.getTargetAmsNetId());
+            assertEquals(targetAmsPort, adsSerialPlcConnection.getTargetAmsPort());
+            assertNotEquals(sourceAmsNetId, adsSerialPlcConnection.getSourceAmsNetId());
+            assertNotEquals(sourceAmsPort, adsSerialPlcConnection.getSourceAmsPort());
+            assertPort(adsSerialPlcConnection, "/dev/ttyS01");
+        }
+        {
+            AdsSerialPlcConnection adsSerialPlcConnection = SUT.adsSerialPlcConnectionOf("/dev/ttyS01", targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
+            assertEquals(targetAmsNetId, adsSerialPlcConnection.getTargetAmsNetId());
+            assertEquals(targetAmsPort, adsSerialPlcConnection.getTargetAmsPort());
+            assertEquals(sourceAmsNetId, adsSerialPlcConnection.getSourceAmsNetId());
+            assertEquals(sourceAmsPort, adsSerialPlcConnection.getSourceAmsPort());
+            assertPort(adsSerialPlcConnection, "/dev/ttyS01");
+        }
+    }
+
+    public void assertPort(AdsSerialPlcConnection adsSerialPlcConnection, String serialPort) throws Exception {
+        SerialChannelFactory channelFactory = (SerialChannelFactory) FieldUtils
+            .getDeclaredField(NettyPlcConnection.class, "channelFactory", true)
+            .get(adsSerialPlcConnection);
+        Assert.assertEquals(serialPort, channelFactory.getSerialPort());
+    }
 }
\ No newline at end of file
diff --git a/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnectionTest.java b/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnectionTest.java
index 398b3f267a7..70ee499a09b 100644
--- a/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnectionTest.java
+++ b/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnectionTest.java
@@ -1,243 +1,243 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.connection;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.embedded.EmbeddedChannel;
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.commons.lang3.reflect.MethodUtils;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.serial.AmsSerialAcknowledgeFrame;
-import org.apache.plc4x.java.ads.api.serial.AmsSerialFrame;
-import org.apache.plc4x.java.ads.api.serial.types.*;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.base.connection.NettyPlcConnection;
-import org.apache.plc4x.java.serial.connection.connection.SerialChannelFactory;
-import org.apache.plc4x.java.serial.connection.connection.SerialSocketAddress;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.ArgumentMatchers.any;
-
-public class AdsSerialPlcConnectionTest {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(AdsSerialPlcConnectionTest.class);
-
-    private AdsSerialPlcConnection SUT;
-
-    @Before
-    public void setUp() {
-        SUT = AdsSerialPlcConnection.of("/dev/tty0", AmsNetId.of("0.0.0.0.0.0"), AmsPort.of(13));
-    }
-
-    @After
-    public void tearDown() {
-        SUT = null;
-    }
-
-    @Test
-    public void initialState() {
-        assertEquals(SUT.getTargetAmsNetId().toString(), "0.0.0.0.0.0");
-        assertEquals(SUT.getTargetAmsPort().toString(), "13");
-    }
-
-
-    @Test
-    public void testRead() throws Exception {
-        prepareSerialSimulator();
-        PlcReadRequest request = SUT.readRequestBuilder().addItem("test", "0/0:BYTE").build();
-        CompletableFuture<PlcReadResponse> read = SUT.read(request);
-        PlcReadResponse plcReadResponse = read.get(30, TimeUnit.SECONDS);
-        assertNotNull(plcReadResponse);
-    }
-
-    private void prepareSerialSimulator() throws Exception {
-        Field channelFactoryField = FieldUtils.getField(NettyPlcConnection.class, "channelFactory", true);
-        SerialChannelFactory serialChannelFactory = (SerialChannelFactory) channelFactoryField.get(SUT);
-        SerialChannelFactory serialChannelFactorySpied = Mockito.spy(serialChannelFactory);
-        EmbeddedChannel embeddedChannel = new EmbeddedChannel(SUT.getChannelHandler(null));
-        embeddedChannel.connect(new SerialSocketAddress("/dev/tty0"));
-        Mockito.doReturn(embeddedChannel).when(serialChannelFactorySpied).createChannel(any());
-        channelFactoryField.set(SUT, serialChannelFactorySpied);
-        SUT.connect();
-        new SerialSimulator(embeddedChannel).start();
-    }
-
-    private class SerialSimulator extends Thread {
-
-        private EmbeddedChannel embeddedChannel;
-
-        private SimulatorState state = SimulatorState.RECEIVE_REQUEST;
-
-        private byte[] currentInvokeId = new byte[0];
-
-        public SerialSimulator(EmbeddedChannel embeddedChannel) {
-            super("Serial Simulator");
-            this.embeddedChannel = embeddedChannel;
-        }
-
-        @Override
-        public void run() {
-            while (true) {
-                LOGGER.trace("in state {}. CurrentInvokeId: {}", state, currentInvokeId);
-                switch (state) {
-                    // Receiving state
-                    case RECEIVE_REQUEST: {
-                        LOGGER.info("Waiting for normal message");
-                        ByteBuf outputBuffer;
-                        while ((outputBuffer = embeddedChannel.readOutbound()) == null) {
-                            LOGGER.trace("No buffer available yet");
-                            if (!trySleep()) {
-                                return;
-                            }
-                        }
-                        int headerBytes = MagicCookie.NUM_BYTES + TransmitterAddress.NUM_BYTES + ReceiverAddress.NUM_BYTES + FragmentNumber.NUM_BYTES;
-                        LOGGER.info("Skipping " + headerBytes + " bytes");
-                        outputBuffer.skipBytes(headerBytes);
-                        short dataLength = outputBuffer.readUnsignedByte();
-                        LOGGER.info("Expect at least " + dataLength + "bytes");
-                        while (outputBuffer.readableBytes() < dataLength) {
-                            if (!trySleep()) {
-                                return;
-                            }
-                        }
-                        byte[] bytes = new byte[dataLength];
-                        LOGGER.info("Read " + dataLength + "bytes. Having " + outputBuffer.readableBytes() + "bytes");
-                        outputBuffer.readBytes(bytes);
-                        currentInvokeId = Arrays.copyOfRange(bytes, 28, 32);
-                        outputBuffer.skipBytes(CRC.NUM_BYTES);
-                        LOGGER.info("Wrote Inbound");
-                        state = SimulatorState.ACK_MESSAGE;
-                        if (!trySleep()) {
-                            return;
-                        }
-                    }
-                    break;
-                    case ACK_MESSAGE: {
-                        ByteBuf byteBuf = AmsSerialAcknowledgeFrame.of(
-                            TransmitterAddress.of((byte) 0x0),
-                            ReceiverAddress.of((byte) 0x0),
-                            FragmentNumber.of((byte) 0)
-                        ).getByteBuf();
-                        try {
-                            MethodUtils.invokeMethod(byteBuf, true, "setRefCnt", 2);
-                        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-                            throw new RuntimeException(e);
-                        }
-                        embeddedChannel.writeOneInbound(byteBuf);
-                        LOGGER.info("Acked Message");
-                        state = SimulatorState.SEND_RESPONSE;
-                    }
-                    case SEND_RESPONSE: {
-                        LOGGER.info("Sending data message");
-                        ByteBuf byteBuf = AmsSerialFrame.of(
-                            FragmentNumber.of((byte) 0),
-                            UserData.of(
-                                new byte[]{
-                                    /*NetID Empfaenger */    (byte) 0xC0, (byte) 0xA8, 0x64, (byte) 0x9C, 0x01, 0x01,
-                                    /*Portnummer       */    0x01, (byte) 0x80,
-                                    /*NetID Sender     */    (byte) 0xC0, (byte) 0xA8, 0x64, (byte) 0xAE, 0x01, 0x01,
-                                    /*Portnummer       */    0x21, 0x03,
-                                    /*Response Lesen   */    0x02, 0x00,
-                                    /*Status           */    0x05, 0x00,
-                                    /*Anzahl Daten     */    0x0A, 0x00, 0x00, 0x00,
-                                    /*Fehlercode       */    0x00, 0x00, 0x00, 0x00,
-                                    /*InvokeID         */    currentInvokeId[0], currentInvokeId[1], currentInvokeId[2], currentInvokeId[3],
-                                    /*Ergebnis         */    0x00, 0x00, 0x00, 0x00,
-                                    /*Anzahl Daten     */    0x02, 0x00, 0x00, 0x00,
-                                    /*Daten            */    (byte) 0xAF, 0x27
-                                }
-                            )
-                        ).getByteBuf();
-                        try {
-                            MethodUtils.invokeMethod(byteBuf, true, "setRefCnt", 2);
-                        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-                            throw new RuntimeException(e);
-                        }
-                        embeddedChannel.writeOneInbound(byteBuf);
-                        LOGGER.info("Wrote Inbound");
-                        state = SimulatorState.WAIT_FOR_ACK;
-                        if (!trySleep()) {
-                            return;
-                        }
-                    }
-                    break;
-                    case WAIT_FOR_ACK: {
-                        LOGGER.info("Waiting for ack message");
-                        ByteBuf outputBuffer;
-                        while ((outputBuffer = embeddedChannel.readOutbound()) == null) {
-                            if (!trySleep()) {
-                                return;
-                            }
-                        }
-                        int headerBytes = MagicCookie.NUM_BYTES + TransmitterAddress.NUM_BYTES + ReceiverAddress.NUM_BYTES + FragmentNumber.NUM_BYTES;
-                        LOGGER.info("Skipping " + headerBytes + " bytes");
-                        outputBuffer.skipBytes(headerBytes);
-                        short dataLength = outputBuffer.readUnsignedByte();
-                        LOGGER.info("Expect " + dataLength + "bytes");
-                        state = SimulatorState.DONE;
-                        if (!trySleep()) {
-                            return;
-                        }
-                    }
-                    case DONE: {
-                        LOGGER.info("Plc is Done. Goodbye");
-                        return;
-                    }
-                    default:
-                        throw new IllegalStateException("Illegal state number" + state);
-                }
-            }
-
-        }
-
-        private boolean trySleep() {
-            try {
-                TimeUnit.MILLISECONDS.sleep(10);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-                Thread.currentThread().interrupt();
-                return false;
-            }
-            return true;
-        }
-    }
-
-    private enum SimulatorState {
-        RECEIVE_REQUEST,
-        ACK_MESSAGE,
-        SEND_RESPONSE,
-        WAIT_FOR_ACK,
-        DONE
-    }
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.connection;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.embedded.EmbeddedChannel;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.commons.lang3.reflect.MethodUtils;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.serial.AmsSerialAcknowledgeFrame;
+import org.apache.plc4x.java.ads.api.serial.AmsSerialFrame;
+import org.apache.plc4x.java.ads.api.serial.types.*;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.base.connection.NettyPlcConnection;
+import org.apache.plc4x.java.serial.connection.connection.SerialChannelFactory;
+import org.apache.plc4x.java.serial.connection.connection.SerialSocketAddress;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
+
+public class AdsSerialPlcConnectionTest {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(AdsSerialPlcConnectionTest.class);
+
+    private AdsSerialPlcConnection SUT;
+
+    @Before
+    public void setUp() {
+        SUT = AdsSerialPlcConnection.of("/dev/tty0", AmsNetId.of("0.0.0.0.0.0"), AmsPort.of(13));
+    }
+
+    @After
+    public void tearDown() {
+        SUT = null;
+    }
+
+    @Test
+    public void initialState() {
+        assertEquals(SUT.getTargetAmsNetId().toString(), "0.0.0.0.0.0");
+        assertEquals(SUT.getTargetAmsPort().toString(), "13");
+    }
+
+
+    @Test
+    public void testRead() throws Exception {
+        prepareSerialSimulator();
+        PlcReadRequest request = SUT.readRequestBuilder().addItem("test", "0/0:BYTE").build();
+        CompletableFuture<PlcReadResponse> read = SUT.read(request);
+        PlcReadResponse plcReadResponse = read.get(30, TimeUnit.SECONDS);
+        assertNotNull(plcReadResponse);
+    }
+
+    private void prepareSerialSimulator() throws Exception {
+        Field channelFactoryField = FieldUtils.getField(NettyPlcConnection.class, "channelFactory", true);
+        SerialChannelFactory serialChannelFactory = (SerialChannelFactory) channelFactoryField.get(SUT);
+        SerialChannelFactory serialChannelFactorySpied = Mockito.spy(serialChannelFactory);
+        EmbeddedChannel embeddedChannel = new EmbeddedChannel(SUT.getChannelHandler(null));
+        embeddedChannel.connect(new SerialSocketAddress("/dev/tty0"));
+        Mockito.doReturn(embeddedChannel).when(serialChannelFactorySpied).createChannel(any());
+        channelFactoryField.set(SUT, serialChannelFactorySpied);
+        SUT.connect();
+        new SerialSimulator(embeddedChannel).start();
+    }
+
+    private class SerialSimulator extends Thread {
+
+        private EmbeddedChannel embeddedChannel;
+
+        private SimulatorState state = SimulatorState.RECEIVE_REQUEST;
+
+        private byte[] currentInvokeId = new byte[0];
+
+        public SerialSimulator(EmbeddedChannel embeddedChannel) {
+            super("Serial Simulator");
+            this.embeddedChannel = embeddedChannel;
+        }
+
+        @Override
+        public void run() {
+            while (true) {
+                LOGGER.trace("in state {}. CurrentInvokeId: {}", state, currentInvokeId);
+                switch (state) {
+                    // Receiving state
+                    case RECEIVE_REQUEST: {
+                        LOGGER.info("Waiting for normal message");
+                        ByteBuf outputBuffer;
+                        while ((outputBuffer = embeddedChannel.readOutbound()) == null) {
+                            LOGGER.trace("No buffer available yet");
+                            if (!trySleep()) {
+                                return;
+                            }
+                        }
+                        int headerBytes = MagicCookie.NUM_BYTES + TransmitterAddress.NUM_BYTES + ReceiverAddress.NUM_BYTES + FragmentNumber.NUM_BYTES;
+                        LOGGER.info("Skipping " + headerBytes + " bytes");
+                        outputBuffer.skipBytes(headerBytes);
+                        short dataLength = outputBuffer.readUnsignedByte();
+                        LOGGER.info("Expect at least " + dataLength + "bytes");
+                        while (outputBuffer.readableBytes() < dataLength) {
+                            if (!trySleep()) {
+                                return;
+                            }
+                        }
+                        byte[] bytes = new byte[dataLength];
+                        LOGGER.info("Read " + dataLength + "bytes. Having " + outputBuffer.readableBytes() + "bytes");
+                        outputBuffer.readBytes(bytes);
+                        currentInvokeId = Arrays.copyOfRange(bytes, 28, 32);
+                        outputBuffer.skipBytes(CRC.NUM_BYTES);
+                        LOGGER.info("Wrote Inbound");
+                        state = SimulatorState.ACK_MESSAGE;
+                        if (!trySleep()) {
+                            return;
+                        }
+                    }
+                    break;
+                    case ACK_MESSAGE: {
+                        ByteBuf byteBuf = AmsSerialAcknowledgeFrame.of(
+                            TransmitterAddress.of((byte) 0x0),
+                            ReceiverAddress.of((byte) 0x0),
+                            FragmentNumber.of((byte) 0)
+                        ).getByteBuf();
+                        try {
+                            MethodUtils.invokeMethod(byteBuf, true, "setRefCnt", 2);
+                        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+                            throw new RuntimeException(e);
+                        }
+                        embeddedChannel.writeOneInbound(byteBuf);
+                        LOGGER.info("Acked Message");
+                        state = SimulatorState.SEND_RESPONSE;
+                    }
+                    case SEND_RESPONSE: {
+                        LOGGER.info("Sending data message");
+                        ByteBuf byteBuf = AmsSerialFrame.of(
+                            FragmentNumber.of((byte) 0),
+                            UserData.of(
+                                new byte[]{
+                                    /*NetID Empfaenger */    (byte) 0xC0, (byte) 0xA8, 0x64, (byte) 0x9C, 0x01, 0x01,
+                                    /*Portnummer       */    0x01, (byte) 0x80,
+                                    /*NetID Sender     */    (byte) 0xC0, (byte) 0xA8, 0x64, (byte) 0xAE, 0x01, 0x01,
+                                    /*Portnummer       */    0x21, 0x03,
+                                    /*Response Lesen   */    0x02, 0x00,
+                                    /*Status           */    0x05, 0x00,
+                                    /*Anzahl Daten     */    0x0A, 0x00, 0x00, 0x00,
+                                    /*Fehlercode       */    0x00, 0x00, 0x00, 0x00,
+                                    /*InvokeID         */    currentInvokeId[0], currentInvokeId[1], currentInvokeId[2], currentInvokeId[3],
+                                    /*Ergebnis         */    0x00, 0x00, 0x00, 0x00,
+                                    /*Anzahl Daten     */    0x02, 0x00, 0x00, 0x00,
+                                    /*Daten            */    (byte) 0xAF, 0x27
+                                }
+                            )
+                        ).getByteBuf();
+                        try {
+                            MethodUtils.invokeMethod(byteBuf, true, "setRefCnt", 2);
+                        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+                            throw new RuntimeException(e);
+                        }
+                        embeddedChannel.writeOneInbound(byteBuf);
+                        LOGGER.info("Wrote Inbound");
+                        state = SimulatorState.WAIT_FOR_ACK;
+                        if (!trySleep()) {
+                            return;
+                        }
+                    }
+                    break;
+                    case WAIT_FOR_ACK: {
+                        LOGGER.info("Waiting for ack message");
+                        ByteBuf outputBuffer;
+                        while ((outputBuffer = embeddedChannel.readOutbound()) == null) {
+                            if (!trySleep()) {
+                                return;
+                            }
+                        }
+                        int headerBytes = MagicCookie.NUM_BYTES + TransmitterAddress.NUM_BYTES + ReceiverAddress.NUM_BYTES + FragmentNumber.NUM_BYTES;
+                        LOGGER.info("Skipping " + headerBytes + " bytes");
+                        outputBuffer.skipBytes(headerBytes);
+                        short dataLength = outputBuffer.readUnsignedByte();
+                        LOGGER.info("Expect " + dataLength + "bytes");
+                        state = SimulatorState.DONE;
+                        if (!trySleep()) {
+                            return;
+                        }
+                    }
+                    case DONE: {
+                        LOGGER.info("Plc is Done. Goodbye");
+                        return;
+                    }
+                    default:
+                        throw new IllegalStateException("Illegal state number" + state);
+                }
+            }
+
+        }
+
+        private boolean trySleep() {
+            try {
+                TimeUnit.MILLISECONDS.sleep(10);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+                Thread.currentThread().interrupt();
+                return false;
+            }
+            return true;
+        }
+    }
+
+    private enum SimulatorState {
+        RECEIVE_REQUEST,
+        ACK_MESSAGE,
+        SEND_RESPONSE,
+        WAIT_FOR_ACK,
+        DONE
+    }
 }
\ No newline at end of file
diff --git a/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnectionTests.java b/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnectionTests.java
index fbc4d21e730..1b05145f057 100644
--- a/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnectionTests.java
+++ b/plc4j/drivers/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnectionTests.java
@@ -1,191 +1,191 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.ads.connection;
-
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelHandler;
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.plc4x.java.ads.api.commands.AdsAddDeviceNotificationResponse;
-import org.apache.plc4x.java.ads.api.commands.AdsDeleteDeviceNotificationResponse;
-import org.apache.plc4x.java.ads.api.commands.AdsDeviceNotificationRequest;
-import org.apache.plc4x.java.ads.api.commands.types.AdsNotificationSample;
-import org.apache.plc4x.java.ads.api.commands.types.AdsStampHeader;
-import org.apache.plc4x.java.ads.api.commands.types.Data;
-import org.apache.plc4x.java.ads.api.commands.types.Length;
-import org.apache.plc4x.java.ads.api.commands.types.NotificationHandle;
-import org.apache.plc4x.java.ads.api.commands.types.Result;
-import org.apache.plc4x.java.ads.api.commands.types.Stamps;
-import org.apache.plc4x.java.ads.api.commands.types.TimeStamp;
-import org.apache.plc4x.java.ads.api.generic.AmsHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.model.AdsDataType;
-import org.apache.plc4x.java.ads.model.AdsSubscriptionHandle;
-import org.apache.plc4x.java.ads.model.DirectAdsField;
-import org.apache.plc4x.java.ads.protocol.Plc4x2AdsProtocol;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
-import org.apache.plc4x.java.api.types.PlcSubscriptionType;
-import org.apache.plc4x.java.base.messages.*;
-import org.apache.plc4x.java.base.model.InternalPlcConsumerRegistration;
-import org.apache.plc4x.java.base.model.SubscriptionPlcField;
-import org.assertj.core.api.WithAssertions;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.net.InetAddress;
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Consumer;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
-
-@ExtendWith(MockitoExtension.class)
-class AdsTcpPlcConnectionTests implements WithAssertions {
-
-    AdsTcpPlcConnection SUT;
-
-    @Mock
-    Channel channelMock;
-
-    @Mock
-    PlcSubscriber plcSubscriber;
-
-    ExecutorService executorService;
-
-    @BeforeEach
-    void setUp() throws Exception {
-        SUT = AdsTcpPlcConnection.of(InetAddress.getByName("localhost"), AmsNetId.of("0.0.0.0.0.0"), AmsPort.of(13));
-        // TODO: Refactor this to use the TestChannelFactory instead.
-        channelMock = Mockito.mock(Channel.class, RETURNS_DEEP_STUBS);
-        FieldUtils.writeField(SUT, "channel", channelMock, true);
-        executorService = Executors.newFixedThreadPool(10);
-    }
-
-    @AfterEach
-    void tearDown() {
-        executorService.shutdownNow();
-        SUT = null;
-    }
-
-    @Nested
-    class Lifecycle {
-        @Test
-        void initialState() {
-            assertEquals(SUT.getTargetAmsNetId().toString(), "0.0.0.0.0.0");
-            assertEquals(SUT.getTargetAmsPort().toString(), "13");
-        }
-    }
-
-    @Nested
-    class Subscription {
-        @Test
-        void subscribe() {
-            when(channelMock.writeAndFlush(any(PlcRequestContainer.class))).then(invocation -> {
-                PlcRequestContainer plcRequestContainer = invocation.getArgument(0);
-                PlcProprietaryResponse plcProprietaryResponse = Mockito.mock(InternalPlcProprietaryResponse.class, RETURNS_DEEP_STUBS);
-                AdsAddDeviceNotificationResponse adsAddDeviceNotificationResponse = Mockito.mock(AdsAddDeviceNotificationResponse.class, RETURNS_DEEP_STUBS);
-                when(adsAddDeviceNotificationResponse.getResult()).thenReturn(Result.of(0));
-                when(adsAddDeviceNotificationResponse.getNotificationHandle()).thenReturn(NotificationHandle.of(1));
-                when(plcProprietaryResponse.getResponse()).thenReturn(adsAddDeviceNotificationResponse);
-                plcRequestContainer.getResponseFuture().complete(plcProprietaryResponse);
-                return mock(ChannelFuture.class);
-            });
-
-            SUT.subscribe(new DefaultPlcSubscriptionRequest(
-                plcSubscriber,
-                new LinkedHashMap<>(
-                    Collections.singletonMap("field1",
-                        new SubscriptionPlcField(PlcSubscriptionType.CYCLIC, DirectAdsField.of("0/0:BOOL"), Duration.of(1, ChronoUnit.SECONDS)))
-                )
-            ));
-        }
-
-        @Test
-        void unsubscribe() {
-            when(channelMock.writeAndFlush(any(PlcRequestContainer.class))).then(invocation -> {
-                PlcRequestContainer plcRequestContainer = invocation.getArgument(0);
-                PlcProprietaryResponse plcProprietaryResponse = Mockito.mock(InternalPlcProprietaryResponse.class, RETURNS_DEEP_STUBS);
-                AdsDeleteDeviceNotificationResponse adsDeleteDeviceNotificationResponse = Mockito.mock(AdsDeleteDeviceNotificationResponse.class, RETURNS_DEEP_STUBS);
-                when(adsDeleteDeviceNotificationResponse.getResult()).thenReturn(Result.of(0));
-                when(plcProprietaryResponse.getResponse()).thenReturn(adsDeleteDeviceNotificationResponse);
-                plcRequestContainer.getResponseFuture().complete(plcProprietaryResponse);
-                return mock(ChannelFuture.class);
-            });
-
-            SUT.unsubscribe(new DefaultPlcUnsubscriptionRequest(plcSubscriber,
-                Collections.singletonList(new AdsSubscriptionHandle(plcSubscriber, "hurz", AdsDataType.BYTE, NotificationHandle.of(1))))
-            );
-        }
-    }
-
-    @Nested
-    class Registration {
-        @Captor
-        ArgumentCaptor<Consumer<AdsDeviceNotificationRequest>> consumerArgumentCaptor;
-
-        @Test
-        void register() throws Exception {
-            Plc4x2AdsProtocol plc4x2AdsProtocol = mock(Plc4x2AdsProtocol.class);
-            // (Class<ChannelHandler>) (Object) -> https://bugs.eclipse.org/bugs/show_bug.cgi?id=535853
-            when(channelMock.pipeline().get((Class<ChannelHandler>) (Object) Plc4x2AdsProtocol.class)).thenReturn(plc4x2AdsProtocol);
-
-            AtomicReference<PlcSubscriptionEvent> plcSubscriptionEventAtomicReference = new AtomicReference<>();
-            SUT.register(plcSubscriptionEventAtomicReference::set);
-            verify(plc4x2AdsProtocol).addConsumer(consumerArgumentCaptor.capture());
-
-            consumerArgumentCaptor.getValue().accept(AdsDeviceNotificationRequest.of(mock(AmsHeader.class), Length.of(1), Stamps.of(1), Collections.singletonList(AdsStampHeader.of(TimeStamp.of(1), Collections.singletonList(AdsNotificationSample.of(NotificationHandle.of(1), Data.of("Hello World!")))))));
-            TimeUnit.MILLISECONDS.sleep(100);
-            assertThat(plcSubscriptionEventAtomicReference).isNotNull();
-        }
-
-        @Test
-        void unregister() {
-            SUT.unregister(mock(InternalPlcConsumerRegistration.class));
-        }
-    }
-
-    @Nested
-    class Misc {
-        @Test
-        void remainingMethods() {
-            assertThat(SUT.canSubscribe()).isTrue();
-            assertThat(SUT.subscriptionRequestBuilder()).isNotNull();
-            assertThat(SUT.unsubscriptionRequestBuilder()).isNotNull();
-        }
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.ads.connection;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.plc4x.java.ads.api.commands.AdsAddDeviceNotificationResponse;
+import org.apache.plc4x.java.ads.api.commands.AdsDeleteDeviceNotificationResponse;
+import org.apache.plc4x.java.ads.api.commands.AdsDeviceNotificationRequest;
+import org.apache.plc4x.java.ads.api.commands.types.AdsNotificationSample;
+import org.apache.plc4x.java.ads.api.commands.types.AdsStampHeader;
+import org.apache.plc4x.java.ads.api.commands.types.Data;
+import org.apache.plc4x.java.ads.api.commands.types.Length;
+import org.apache.plc4x.java.ads.api.commands.types.NotificationHandle;
+import org.apache.plc4x.java.ads.api.commands.types.Result;
+import org.apache.plc4x.java.ads.api.commands.types.Stamps;
+import org.apache.plc4x.java.ads.api.commands.types.TimeStamp;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.model.AdsDataType;
+import org.apache.plc4x.java.ads.model.AdsSubscriptionHandle;
+import org.apache.plc4x.java.ads.model.DirectAdsField;
+import org.apache.plc4x.java.ads.protocol.Plc4x2AdsProtocol;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
+import org.apache.plc4x.java.api.types.PlcSubscriptionType;
+import org.apache.plc4x.java.base.messages.*;
+import org.apache.plc4x.java.base.model.InternalPlcConsumerRegistration;
+import org.apache.plc4x.java.base.model.SubscriptionPlcField;
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.net.InetAddress;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class AdsTcpPlcConnectionTests implements WithAssertions {
+
+    AdsTcpPlcConnection SUT;
+
+    @Mock
+    Channel channelMock;
+
+    @Mock
+    PlcSubscriber plcSubscriber;
+
+    ExecutorService executorService;
+
+    @BeforeEach
+    void setUp() throws Exception {
+        SUT = AdsTcpPlcConnection.of(InetAddress.getByName("localhost"), AmsNetId.of("0.0.0.0.0.0"), AmsPort.of(13));
+        // TODO: Refactor this to use the TestChannelFactory instead.
+        channelMock = Mockito.mock(Channel.class, RETURNS_DEEP_STUBS);
+        FieldUtils.writeField(SUT, "channel", channelMock, true);
+        executorService = Executors.newFixedThreadPool(10);
+    }
+
+    @AfterEach
+    void tearDown() {
+        executorService.shutdownNow();
+        SUT = null;
+    }
+
+    @Nested
+    class Lifecycle {
+        @Test
+        void initialState() {
+            assertEquals(SUT.getTargetAmsNetId().toString(), "0.0.0.0.0.0");
+            assertEquals(SUT.getTargetAmsPort().toString(), "13");
+        }
+    }
+
+    @Nested
+    class Subscription {
+        @Test
+        void subscribe() {
+            when(channelMock.writeAndFlush(any(PlcRequestContainer.class))).then(invocation -> {
+                PlcRequestContainer plcRequestContainer = invocation.getArgument(0);
+                PlcProprietaryResponse plcProprietaryResponse = Mockito.mock(InternalPlcProprietaryResponse.class, RETURNS_DEEP_STUBS);
+                AdsAddDeviceNotificationResponse adsAddDeviceNotificationResponse = Mockito.mock(AdsAddDeviceNotificationResponse.class, RETURNS_DEEP_STUBS);
+                when(adsAddDeviceNotificationResponse.getResult()).thenReturn(Result.of(0));
+                when(adsAddDeviceNotificationResponse.getNotificationHandle()).thenReturn(NotificationHandle.of(1));
+                when(plcProprietaryResponse.getResponse()).thenReturn(adsAddDeviceNotificationResponse);
+                plcRequestContainer.getResponseFuture().complete(plcProprietaryResponse);
+                return mock(ChannelFuture.class);
+            });
+
+            SUT.subscribe(new DefaultPlcSubscriptionRequest(
+                plcSubscriber,
+                new LinkedHashMap<>(
+                    Collections.singletonMap("field1",
+                        new SubscriptionPlcField(PlcSubscriptionType.CYCLIC, DirectAdsField.of("0/0:BOOL"), Duration.of(1, ChronoUnit.SECONDS)))
+                )
+            ));
+        }
+
+        @Test
+        void unsubscribe() {
+            when(channelMock.writeAndFlush(any(PlcRequestContainer.class))).then(invocation -> {
+                PlcRequestContainer plcRequestContainer = invocation.getArgument(0);
+                PlcProprietaryResponse plcProprietaryResponse = Mockito.mock(InternalPlcProprietaryResponse.class, RETURNS_DEEP_STUBS);
+                AdsDeleteDeviceNotificationResponse adsDeleteDeviceNotificationResponse = Mockito.mock(AdsDeleteDeviceNotificationResponse.class, RETURNS_DEEP_STUBS);
+                when(adsDeleteDeviceNotificationResponse.getResult()).thenReturn(Result.of(0));
+                when(plcProprietaryResponse.getResponse()).thenReturn(adsDeleteDeviceNotificationResponse);
+                plcRequestContainer.getResponseFuture().complete(plcProprietaryResponse);
+                return mock(ChannelFuture.class);
+            });
+
+            SUT.unsubscribe(new DefaultPlcUnsubscriptionRequest(plcSubscriber,
+                Collections.singletonList(new AdsSubscriptionHandle(plcSubscriber, "hurz", AdsDataType.BYTE, NotificationHandle.of(1))))
+            );
+        }
+    }
+
+    @Nested
+    class Registration {
+        @Captor
+        ArgumentCaptor<Consumer<AdsDeviceNotificationRequest>> consumerArgumentCaptor;
+
+        @Test
+        void register() throws Exception {
+            Plc4x2AdsProtocol plc4x2AdsProtocol = mock(Plc4x2AdsProtocol.class);
+            // (Class<ChannelHandler>) (Object) -> https://bugs.eclipse.org/bugs/show_bug.cgi?id=535853
+            when(channelMock.pipeline().get((Class<ChannelHandler>) (Object) Plc4x2AdsProtocol.class)).thenReturn(plc4x2AdsProtocol);
+
+            AtomicReference<PlcSubscriptionEvent> plcSubscriptionEventAtomicReference = new AtomicReference<>();
+            SUT.register(plcSubscriptionEventAtomicReference::set);
+            verify(plc4x2AdsProtocol).addConsumer(consumerArgumentCaptor.capture());
+
+            consumerArgumentCaptor.getValue().accept(AdsDeviceNotificationRequest.of(mock(AmsHeader.class), Length.of(1), Stamps.of(1), Collections.singletonList(AdsStampHeader.of(TimeStamp.of(1), Collections.singletonList(AdsNotificationSample.of(NotificationHandle.of(1), Data.of("Hello World!")))))));
+            TimeUnit.MILLISECONDS.sleep(100);
+            assertThat(plcSubscriptionEventAtomicReference).isNotNull();
+        }
+
+        @Test
+        void unregister() {
+            SUT.unregister(mock(InternalPlcConsumerRegistration.class));
+        }
+    }
+
+    @Nested
+    class Misc {
+        @Test
+        void remainingMethods() {
+            assertThat(SUT.canSubscribe()).isTrue();
+            assertThat(SUT.subscriptionRequestBuilder()).isNotNull();
+            assertThat(SUT.unsubscriptionRequestBuilder()).isNotNull();
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/drivers/ethernet-ip/pom.xml b/plc4j/drivers/ethernet-ip/pom.xml
index 31999309c94..eea59909b0f 100644
--- a/plc4j/drivers/ethernet-ip/pom.xml
+++ b/plc4j/drivers/ethernet-ip/pom.xml
@@ -1,119 +1,119 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-drivers</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-driver-ethernet-ip</artifactId>
-  <name>PLC4J: Driver: Ethernet/IP</name>
-  <description>Implementation of a PLC4X driver able to speak with devices using the Ethernet/IP protocol.</description>
-
-  <properties>
-    <ethernetip-driver.version>1.2.0</ethernetip-driver.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-ethernet-ip</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base-tcp</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.digitalpetri.enip</groupId>
-      <artifactId>cip-core</artifactId>
-      <version>${ethernetip-driver.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-buffer</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>com.digitalpetri.enip</groupId>
-      <artifactId>enip-client</artifactId>
-      <version>${ethernetip-driver.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.digitalpetri.enip</groupId>
-      <artifactId>cip-client</artifactId>
-      <version>${ethernetip-driver.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>osgi.cmpn</artifactId>
-      <version>6.0.0</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <repositories>
-    <repository>
-      <id>ossrh</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-drivers</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-driver-ethernet-ip</artifactId>
+  <name>PLC4J: Driver: Ethernet/IP</name>
+  <description>Implementation of a PLC4X driver able to speak with devices using the Ethernet/IP protocol.</description>
+
+  <properties>
+    <ethernetip-driver.version>1.2.0</ethernetip-driver.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-ethernet-ip</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base-tcp</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.digitalpetri.enip</groupId>
+      <artifactId>cip-core</artifactId>
+      <version>${ethernetip-driver.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.digitalpetri.enip</groupId>
+      <artifactId>enip-client</artifactId>
+      <version>${ethernetip-driver.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.digitalpetri.enip</groupId>
+      <artifactId>cip-client</artifactId>
+      <version>${ethernetip-driver.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>osgi.cmpn</artifactId>
+      <version>6.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+  <repositories>
+    <repository>
+      <id>ossrh</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </repository>
+  </repositories>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/drivers/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/EtherNetIpPlcDriver.java b/plc4j/drivers/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/EtherNetIpPlcDriver.java
index 9a98e085aa2..9ac98d2a969 100644
--- a/plc4j/drivers/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/EtherNetIpPlcDriver.java
+++ b/plc4j/drivers/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/EtherNetIpPlcDriver.java
@@ -1,83 +1,83 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.ethernetip;
-
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.ethernetip.connection.EtherNetIpTcpPlcConnection;
-import org.apache.plc4x.java.spi.PlcDriver;
-import org.osgi.service.component.annotations.Component;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Implementation of the Ethernet/IP protocol, based on the driver implementation available at:
- * https://github.com/digitalpetri/ethernet-ip/
- *
- * Spec:
- * http://read.pudn.com/downloads166/ebook/763212/EIP-CIP-V2-1.0.pdf
- */
-@Component(service = PlcDriver.class, immediate = true)
-public class EtherNetIpPlcDriver implements PlcDriver {
-
-    private static final Pattern ETHERNETIP_URI_PATTERN = Pattern.compile("^eip://(?<host>[\\w.]+)(:(?<port>\\d*))?(?<params>\\?.*)?");
-
-    @Override
-    public String getProtocolCode() {
-        return "eip";
-    }
-
-    @Override
-    public String getProtocolName() {
-        return "EtherNet/IP (TCP)";
-    }
-
-    @Override
-    public PlcConnection connect(String url) throws PlcConnectionException {
-        Matcher matcher = ETHERNETIP_URI_PATTERN.matcher(url);
-        if (!matcher.matches()) {
-            throw new PlcConnectionException(
-                "Connection url doesn't match the format 'eip//{port|host}'");
-        }
-
-        String host = matcher.group("host");
-        String port = matcher.group("port");
-        String params = matcher.group("params") != null ? matcher.group("params").substring(1) : null;
-        try {
-            InetAddress inetAddress = InetAddress.getByName(host);
-            if (port == null) {
-                return new EtherNetIpTcpPlcConnection(inetAddress, params);
-            } else {
-                return new EtherNetIpTcpPlcConnection(inetAddress, Integer.valueOf(port), params);
-            }
-        } catch (UnknownHostException e) {
-            throw new PlcConnectionException("Unknown host" + host, e);
-        }
-    }
-
-    @Override
-    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
-        throw new PlcConnectionException("EtherNet/IP connections don't support authentication.");
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.ethernetip;
+
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.authentication.PlcAuthentication;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.ethernetip.connection.EtherNetIpTcpPlcConnection;
+import org.apache.plc4x.java.spi.PlcDriver;
+import org.osgi.service.component.annotations.Component;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Implementation of the Ethernet/IP protocol, based on the driver implementation available at:
+ * https://github.com/digitalpetri/ethernet-ip/
+ *
+ * Spec:
+ * http://read.pudn.com/downloads166/ebook/763212/EIP-CIP-V2-1.0.pdf
+ */
+@Component(service = PlcDriver.class, immediate = true)
+public class EtherNetIpPlcDriver implements PlcDriver {
+
+    private static final Pattern ETHERNETIP_URI_PATTERN = Pattern.compile("^eip://(?<host>[\\w.]+)(:(?<port>\\d*))?(?<params>\\?.*)?");
+
+    @Override
+    public String getProtocolCode() {
+        return "eip";
+    }
+
+    @Override
+    public String getProtocolName() {
+        return "EtherNet/IP (TCP)";
+    }
+
+    @Override
+    public PlcConnection connect(String url) throws PlcConnectionException {
+        Matcher matcher = ETHERNETIP_URI_PATTERN.matcher(url);
+        if (!matcher.matches()) {
+            throw new PlcConnectionException(
+                "Connection url doesn't match the format 'eip//{port|host}'");
+        }
+
+        String host = matcher.group("host");
+        String port = matcher.group("port");
+        String params = matcher.group("params") != null ? matcher.group("params").substring(1) : null;
+        try {
+            InetAddress inetAddress = InetAddress.getByName(host);
+            if (port == null) {
+                return new EtherNetIpTcpPlcConnection(inetAddress, params);
+            } else {
+                return new EtherNetIpTcpPlcConnection(inetAddress, Integer.valueOf(port), params);
+            }
+        } catch (UnknownHostException e) {
+            throw new PlcConnectionException("Unknown host" + host, e);
+        }
+    }
+
+    @Override
+    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
+        throw new PlcConnectionException("EtherNet/IP connections don't support authentication.");
+    }
+
+}
diff --git a/plc4j/drivers/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java b/plc4j/drivers/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java
index 332fd9be15c..c1f83c9dbb3 100644
--- a/plc4j/drivers/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java
+++ b/plc4j/drivers/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java
@@ -1,107 +1,107 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.ethernetip.connection;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.messages.PlcWriteResponse;
-import org.apache.plc4x.java.base.connection.ChannelFactory;
-import org.apache.plc4x.java.base.connection.NettyPlcConnection;
-import org.apache.plc4x.java.base.messages.*;
-import org.apache.plc4x.java.ethernetip.netty.util.EnipPlcFieldHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.CompletableFuture;
-
-public abstract class BaseEtherNetIpPlcConnection extends NettyPlcConnection implements PlcReader, PlcWriter {
-
-    private static final Logger logger = LoggerFactory.getLogger(BaseEtherNetIpPlcConnection.class);
-
-    BaseEtherNetIpPlcConnection(ChannelFactory channelFactory, String params) {
-        super(channelFactory, true);
-
-        if (!StringUtils.isEmpty(params)) {
-            for (String param : params.split("&")) {
-                String[] paramElements = param.split("=");
-                String paramName = paramElements[0];
-                if (paramElements.length == 2) {
-                    String paramValue = paramElements[1];
-                    switch (paramName) {
-                        default:
-                            logger.debug("Unknown parameter {} with value {}", paramName, paramValue);
-                    }
-                } else {
-                    logger.debug("Unknown no-value parameter {}", paramName);
-                }
-            }
-        }
-    }
-
-    @Override
-    public boolean canRead() {
-        return true;
-    }
-
-    @Override
-    public boolean canWrite() {
-        return true;
-    }
-
-    @Override
-    public PlcReadRequest.Builder readRequestBuilder() {
-        return new DefaultPlcReadRequest.Builder(this, new EnipPlcFieldHandler());
-    }
-
-    @Override
-    public PlcWriteRequest.Builder writeRequestBuilder() {
-        return new DefaultPlcWriteRequest.Builder(this, new EnipPlcFieldHandler());
-    }
-
-    @Override
-    public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
-        CompletableFuture<InternalPlcReadResponse> future = new CompletableFuture<>();
-        PlcRequestContainer<InternalPlcReadRequest, InternalPlcReadResponse> container =
-            new PlcRequestContainer<>((InternalPlcReadRequest) readRequest, future);
-        channel.writeAndFlush(container).addListener(f -> {
-            if (!f.isSuccess()) {
-                future.completeExceptionally(f.cause());
-            }
-        });
-        return future
-            .thenApply(PlcReadResponse.class::cast);
-    }
-
-    @Override
-    public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
-        CompletableFuture<InternalPlcWriteResponse> future = new CompletableFuture<>();
-        PlcRequestContainer<InternalPlcWriteRequest, InternalPlcWriteResponse> container =
-            new PlcRequestContainer<>((InternalPlcWriteRequest) writeRequest, future);
-        channel.writeAndFlush(container).addListener(f -> {
-            if (!f.isSuccess()) {
-                future.completeExceptionally(f.cause());
-            }
-        });
-        return future
-            .thenApply(PlcWriteResponse.class::cast);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.ethernetip.connection;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteResponse;
+import org.apache.plc4x.java.base.connection.ChannelFactory;
+import org.apache.plc4x.java.base.connection.NettyPlcConnection;
+import org.apache.plc4x.java.base.messages.*;
+import org.apache.plc4x.java.ethernetip.netty.util.EnipPlcFieldHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.CompletableFuture;
+
+public abstract class BaseEtherNetIpPlcConnection extends NettyPlcConnection implements PlcReader, PlcWriter {
+
+    private static final Logger logger = LoggerFactory.getLogger(BaseEtherNetIpPlcConnection.class);
+
+    BaseEtherNetIpPlcConnection(ChannelFactory channelFactory, String params) {
+        super(channelFactory, true);
+
+        if (!StringUtils.isEmpty(params)) {
+            for (String param : params.split("&")) {
+                String[] paramElements = param.split("=");
+                String paramName = paramElements[0];
+                if (paramElements.length == 2) {
+                    String paramValue = paramElements[1];
+                    switch (paramName) {
+                        default:
+                            logger.debug("Unknown parameter {} with value {}", paramName, paramValue);
+                    }
+                } else {
+                    logger.debug("Unknown no-value parameter {}", paramName);
+                }
+            }
+        }
+    }
+
+    @Override
+    public boolean canRead() {
+        return true;
+    }
+
+    @Override
+    public boolean canWrite() {
+        return true;
+    }
+
+    @Override
+    public PlcReadRequest.Builder readRequestBuilder() {
+        return new DefaultPlcReadRequest.Builder(this, new EnipPlcFieldHandler());
+    }
+
+    @Override
+    public PlcWriteRequest.Builder writeRequestBuilder() {
+        return new DefaultPlcWriteRequest.Builder(this, new EnipPlcFieldHandler());
+    }
+
+    @Override
+    public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
+        CompletableFuture<InternalPlcReadResponse> future = new CompletableFuture<>();
+        PlcRequestContainer<InternalPlcReadRequest, InternalPlcReadResponse> container =
+            new PlcRequestContainer<>((InternalPlcReadRequest) readRequest, future);
+        channel.writeAndFlush(container).addListener(f -> {
+            if (!f.isSuccess()) {
+                future.completeExceptionally(f.cause());
+            }
+        });
+        return future
+            .thenApply(PlcReadResponse.class::cast);
+    }
+
+    @Override
+    public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
+        CompletableFuture<InternalPlcWriteResponse> future = new CompletableFuture<>();
+        PlcRequestContainer<InternalPlcWriteRequest, InternalPlcWriteResponse> container =
+            new PlcRequestContainer<>((InternalPlcWriteRequest) writeRequest, future);
+        channel.writeAndFlush(container).addListener(f -> {
+            if (!f.isSuccess()) {
+                future.completeExceptionally(f.cause());
+            }
+        });
+        return future
+            .thenApply(PlcWriteResponse.class::cast);
+    }
+
+}
diff --git a/plc4j/drivers/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/connection/EtherNetIpTcpPlcConnection.java b/plc4j/drivers/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/connection/EtherNetIpTcpPlcConnection.java
index ccf1ee1ec3f..24f405e2424 100644
--- a/plc4j/drivers/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/connection/EtherNetIpTcpPlcConnection.java
+++ b/plc4j/drivers/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/connection/EtherNetIpTcpPlcConnection.java
@@ -1,84 +1,84 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.ethernetip.connection;
-
-import io.netty.channel.*;
-import org.apache.plc4x.java.base.connection.ChannelFactory;
-import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
-import org.apache.plc4x.java.base.events.ConnectEvent;
-import org.apache.plc4x.java.base.events.ConnectedEvent;
-import org.apache.plc4x.java.ethernetip.netty.EnipCodec;
-import org.apache.plc4x.java.ethernetip.netty.Plc4XEtherNetIpProtocol;
-import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.InetAddress;
-import java.util.concurrent.CompletableFuture;
-
-public class EtherNetIpTcpPlcConnection extends BaseEtherNetIpPlcConnection {
-
-    // Port 44818
-    private static final int ETHERNET_IP_TCP_PORT = 0xAF12;
-
-    private static final Logger logger = LoggerFactory.getLogger(EtherNetIpTcpPlcConnection.class);
-
-    public EtherNetIpTcpPlcConnection(InetAddress address, String params) {
-        this(new TcpSocketChannelFactory(address, ETHERNET_IP_TCP_PORT), params);
-        logger.info("Configured EtherNetIpTcpPlcConnection with: host-name {}", address.getHostAddress());
-    }
-
-    public EtherNetIpTcpPlcConnection(InetAddress address, int port, String params) {
-        this(new TcpSocketChannelFactory(address, port), params);
-        logger.info("Configured EtherNetIpTcpPlcConnection with: host-name {}", address.getHostAddress());
-    }
-
-    public EtherNetIpTcpPlcConnection(ChannelFactory channelFactory, String params) {
-        super(channelFactory, params);
-    }
-
-    @Override
-    protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
-        return new ChannelInitializer() {
-            @Override
-            protected void initChannel(Channel channel) {
-                ChannelPipeline pipeline = channel.pipeline();
-                pipeline.addLast(new ChannelInboundHandlerAdapter() {
-                    @Override
-                    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
-                        if (evt instanceof ConnectedEvent) {
-                            sessionSetupCompleteFuture.complete(null);
-                        } else {
-                            super.userEventTriggered(ctx, evt);
-                        }
-                    }
-                });
-                pipeline.addLast(new EnipCodec());
-                pipeline.addLast(new Plc4XEtherNetIpProtocol());
-            }
-        };
-    }
-
-    @Override
-    protected void sendChannelCreatedEvent() {
-        // Send an event to the pipeline telling the Protocol filters what's going on.
-        channel.pipeline().fireUserEventTriggered(new ConnectEvent());
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.ethernetip.connection;
+
+import io.netty.channel.*;
+import org.apache.plc4x.java.base.connection.ChannelFactory;
+import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
+import org.apache.plc4x.java.base.events.ConnectEvent;
+import org.apache.plc4x.java.base.events.ConnectedEvent;
+import org.apache.plc4x.java.ethernetip.netty.EnipCodec;
+import org.apache.plc4x.java.ethernetip.netty.Plc4XEtherNetIpProtocol;
+import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.InetAddress;
+import java.util.concurrent.CompletableFuture;
+
+public class EtherNetIpTcpPlcConnection extends BaseEtherNetIpPlcConnection {
+
+    // Port 44818
+    private static final int ETHERNET_IP_TCP_PORT = 0xAF12;
+
+    private static final Logger logger = LoggerFactory.getLogger(EtherNetIpTcpPlcConnection.class);
+
+    public EtherNetIpTcpPlcConnection(InetAddress address, String params) {
+        this(new TcpSocketChannelFactory(address, ETHERNET_IP_TCP_PORT), params);
+        logger.info("Configured EtherNetIpTcpPlcConnection with: host-name {}", address.getHostAddress());
+    }
+
+    public EtherNetIpTcpPlcConnection(InetAddress address, int port, String params) {
+        this(new TcpSocketChannelFactory(address, port), params);
+        logger.info("Configured EtherNetIpTcpPlcConnection with: host-name {}", address.getHostAddress());
+    }
+
+    public EtherNetIpTcpPlcConnection(ChannelFactory channelFactory, String params) {
+        super(channelFactory, params);
+    }
+
+    @Override
+    protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
+        return new ChannelInitializer() {
+            @Override
+            protected void initChannel(Channel channel) {
+                ChannelPipeline pipeline = channel.pipeline();
+                pipeline.addLast(new ChannelInboundHandlerAdapter() {
+                    @Override
+                    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+                        if (evt instanceof ConnectedEvent) {
+                            sessionSetupCompleteFuture.complete(null);
+                        } else {
+                            super.userEventTriggered(ctx, evt);
+                        }
+                    }
+                });
+                pipeline.addLast(new EnipCodec());
+                pipeline.addLast(new Plc4XEtherNetIpProtocol());
+            }
+        };
+    }
+
+    @Override
+    protected void sendChannelCreatedEvent() {
+        // Send an event to the pipeline telling the Protocol filters what's going on.
+        channel.pipeline().fireUserEventTriggered(new ConnectEvent());
+    }
+
+}
diff --git a/plc4j/drivers/ethernet-ip/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver b/plc4j/drivers/ethernet-ip/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
index 9d35f1f6346..d1d4c476648 100644
--- a/plc4j/drivers/ethernet-ip/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
+++ b/plc4j/drivers/ethernet-ip/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
@@ -1,19 +1,19 @@
-#
-# 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
-#
-#   http://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.
-#
-org.apache.plc4x.java.ethernetip.EtherNetIpPlcDriver
+#
+# 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
+#
+#   http://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.
+#
+org.apache.plc4x.java.ethernetip.EtherNetIpPlcDriver
diff --git a/plc4j/drivers/ethernet-ip/src/test/java/org/apache/plc4x/java/ethernetip/EnipTest.java b/plc4j/drivers/ethernet-ip/src/test/java/org/apache/plc4x/java/ethernetip/EnipTest.java
index a12f8095820..0425ff6f8e0 100644
--- a/plc4j/drivers/ethernet-ip/src/test/java/org/apache/plc4x/java/ethernetip/EnipTest.java
+++ b/plc4j/drivers/ethernet-ip/src/test/java/org/apache/plc4x/java/ethernetip/EnipTest.java
@@ -1,65 +1,65 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.ethernetip;
-
-import com.digitalpetri.enip.EtherNetIpClientConfig;
-import com.digitalpetri.enip.cip.CipClient;
-import com.digitalpetri.enip.cip.epath.EPath;
-import com.digitalpetri.enip.cip.epath.LogicalSegment;
-import com.digitalpetri.enip.cip.epath.PortSegment;
-import com.digitalpetri.enip.cip.services.GetAttributeSingleService;
-
-import java.time.Duration;
-
-public class EnipTest {
-
-    public static void main(String[] args) throws Exception {
-        EtherNetIpClientConfig config = EtherNetIpClientConfig.builder("10.10.64.30")
-            .setSerialNumber(0x00)
-            .setVendorId(0x00)
-            .setTimeout(Duration.ofSeconds(2))
-            .build();
-
-        // backplane, slot 0
-        EPath.PaddedEPath connectionPath = new EPath.PaddedEPath(
-            new PortSegment(1, new byte[]{(byte) 0}));
-
-        CipClient client = new CipClient(config, connectionPath);
-
-        client.connect().get();
-
-        GetAttributeSingleService service = new GetAttributeSingleService(
-            new EPath.PaddedEPath(new LogicalSegment.ClassId(0x04), new LogicalSegment.InstanceId(0x69), new LogicalSegment.AttributeId(0x03)));
-
-        client.invoke(service).whenComplete((as, ex) -> {
-            if (as != null) {
-                try {
-                    short value = as.readShort();
-                    System.out.println(String.format("Value is %s", value));
-                } catch (Throwable t) {
-                    t.printStackTrace();
-                }
-            } else {
-                ex.printStackTrace();
-            }
-        });
-
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.ethernetip;
+
+import com.digitalpetri.enip.EtherNetIpClientConfig;
+import com.digitalpetri.enip.cip.CipClient;
+import com.digitalpetri.enip.cip.epath.EPath;
+import com.digitalpetri.enip.cip.epath.LogicalSegment;
+import com.digitalpetri.enip.cip.epath.PortSegment;
+import com.digitalpetri.enip.cip.services.GetAttributeSingleService;
+
+import java.time.Duration;
+
+public class EnipTest {
+
+    public static void main(String[] args) throws Exception {
+        EtherNetIpClientConfig config = EtherNetIpClientConfig.builder("10.10.64.30")
+            .setSerialNumber(0x00)
+            .setVendorId(0x00)
+            .setTimeout(Duration.ofSeconds(2))
+            .build();
+
+        // backplane, slot 0
+        EPath.PaddedEPath connectionPath = new EPath.PaddedEPath(
+            new PortSegment(1, new byte[]{(byte) 0}));
+
+        CipClient client = new CipClient(config, connectionPath);
+
+        client.connect().get();
+
+        GetAttributeSingleService service = new GetAttributeSingleService(
+            new EPath.PaddedEPath(new LogicalSegment.ClassId(0x04), new LogicalSegment.InstanceId(0x69), new LogicalSegment.AttributeId(0x03)));
+
+        client.invoke(service).whenComplete((as, ex) -> {
+            if (as != null) {
+                try {
+                    short value = as.readShort();
+                    System.out.println(String.format("Value is %s", value));
+                } catch (Throwable t) {
+                    t.printStackTrace();
+                }
+            } else {
+                ex.printStackTrace();
+            }
+        });
+
+    }
+
+}
diff --git a/plc4j/drivers/ethernet-ip/src/test/java/org/apache/plc4x/java/ethernetip/ManualPlc4XEtherNetIpTest.java b/plc4j/drivers/ethernet-ip/src/test/java/org/apache/plc4x/java/ethernetip/ManualPlc4XEtherNetIpTest.java
index 8fa2fbd8e2a..ad7ade40f37 100644
--- a/plc4j/drivers/ethernet-ip/src/test/java/org/apache/plc4x/java/ethernetip/ManualPlc4XEtherNetIpTest.java
+++ b/plc4j/drivers/ethernet-ip/src/test/java/org/apache/plc4x/java/ethernetip/ManualPlc4XEtherNetIpTest.java
@@ -1,55 +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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ethernetip;
-
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-
-import java.util.concurrent.CompletableFuture;
-
-public class ManualPlc4XEtherNetIpTest {
-
-    public static void main(String... args) {
-        // Connection to our IoT Lab WAGO device.
-        String connectionUrl = "eip://10.10.64.30:44818";
-        try (PlcConnection plcConnection = new PlcDriverManager().getConnection(connectionUrl)) {
-            System.out.println("PlcConnection " + plcConnection);
-
-            PlcReadRequest readRequest = plcConnection.readRequestBuilder()
-                .addItem("field", "#4#105#3").build();
-
-            // Execute the read operation.
-            CompletableFuture<? extends PlcReadResponse> response = readRequest.execute();
-            PlcReadResponse readResponse = response.get();
-
-            // Output the response.
-            for (String fieldName : readResponse.getFieldNames()) {
-                readResponse.getAllLongs(fieldName).stream().map(
-                    value -> "Value: " + value.toString()).forEach(System.out::println);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            System.exit(1);
-        }
-        System.exit(0);
-    }
-
-}
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ethernetip;
+
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+
+import java.util.concurrent.CompletableFuture;
+
+public class ManualPlc4XEtherNetIpTest {
+
+    public static void main(String... args) {
+        // Connection to our IoT Lab WAGO device.
+        String connectionUrl = "eip://10.10.64.30:44818";
+        try (PlcConnection plcConnection = new PlcDriverManager().getConnection(connectionUrl)) {
+            System.out.println("PlcConnection " + plcConnection);
+
+            PlcReadRequest readRequest = plcConnection.readRequestBuilder()
+                .addItem("field", "#4#105#3").build();
+
+            // Execute the read operation.
+            CompletableFuture<? extends PlcReadResponse> response = readRequest.execute();
+            PlcReadResponse readResponse = response.get();
+
+            // Output the response.
+            for (String fieldName : readResponse.getFieldNames()) {
+                readResponse.getAllLongs(fieldName).stream().map(
+                    value -> "Value: " + value.toString()).forEach(System.out::println);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.exit(1);
+        }
+        System.exit(0);
+    }
+
+}
diff --git a/plc4j/drivers/modbus/pom.xml b/plc4j/drivers/modbus/pom.xml
index 64fafd4478b..b5d510fca58 100644
--- a/plc4j/drivers/modbus/pom.xml
+++ b/plc4j/drivers/modbus/pom.xml
@@ -1,101 +1,101 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-drivers</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-driver-modbus</artifactId>
-  <name>PLC4J: Driver: Modbus</name>
-  <description>Implementation of a PLC4X driver able to speak with devices using the Modbus protocol.</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-modbus</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base-tcp</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base-serial</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-buffer</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>com.digitalpetri.modbus</groupId>
-      <artifactId>modbus-codec</artifactId>
-      <version>1.1.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base-test</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>osgi.cmpn</artifactId>
-      <version>6.0.0</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-drivers</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-driver-modbus</artifactId>
+  <name>PLC4J: Driver: Modbus</name>
+  <description>Implementation of a PLC4X driver able to speak with devices using the Modbus protocol.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-modbus</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base-tcp</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base-serial</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.digitalpetri.modbus</groupId>
+      <artifactId>modbus-codec</artifactId>
+      <version>1.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base-test</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>osgi.cmpn</artifactId>
+      <version>6.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/ModbusPlcDriver.java b/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/ModbusPlcDriver.java
index 4801feb1958..f84b1df2077 100644
--- a/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/ModbusPlcDriver.java
+++ b/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/ModbusPlcDriver.java
@@ -1,95 +1,95 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.modbus;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.modbus.connection.ModbusConnectionFactory;
-import org.apache.plc4x.java.spi.PlcDriver;
-import org.osgi.service.component.annotations.Component;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Implementation of the Modbus protocol, based on:
- * - Modbus Protocol (http://www.modbus.org/docs/Modbus_Application_Protocol_V1_1b3.pdf)
- */
-@Component(service = PlcDriver.class, immediate = true)
-public class ModbusPlcDriver implements PlcDriver {
-
-    public static final Pattern INET_ADDRESS_PATTERN = Pattern.compile("tcp://(?<host>[\\w.]+)(:(?<port>\\d*))?");
-    public static final Pattern SERIAL_PATTERN = Pattern.compile("serial://(?<serialDefinition>((?!/\\d).)*)");
-    public static final Pattern MODBUS_URI_PATTERN = Pattern.compile("^modbus:(" + INET_ADDRESS_PATTERN + "|" + SERIAL_PATTERN + ")/?" + "(?<params>\\?.*)?");
-
-    private ModbusConnectionFactory modbusConnectionFactory;
-
-    public ModbusPlcDriver() {
-        this.modbusConnectionFactory = new ModbusConnectionFactory();
-    }
-
-    public ModbusPlcDriver(ModbusConnectionFactory modbusConnectionFactory) {
-        this.modbusConnectionFactory = modbusConnectionFactory;
-    }
-
-    @Override
-    public String getProtocolCode() {
-        return "modbus";
-    }
-
-    @Override
-    public String getProtocolName() {
-        return "Modbus (TCP / Serial)";
-    }
-
-    @Override
-    public PlcConnection connect(String url) throws PlcConnectionException {
-        Matcher matcher = MODBUS_URI_PATTERN.matcher(url);
-        if (!matcher.matches()) {
-            throw new PlcConnectionException(
-                "Connection url doesn't match the format 'modbus:{type}//{port|host}'");
-        }
-
-        String host = matcher.group("host");
-        String serialDefinition = matcher.group("serialDefinition");
-        String portString = matcher.group("port");
-        Integer port = StringUtils.isNotBlank(portString) ? Integer.parseInt(portString) : null;
-        String params = matcher.group("params") != null ? matcher.group("params").substring(1) : null;
-
-        if (serialDefinition != null) {
-            return modbusConnectionFactory.modbusSerialPlcConnectionOf(serialDefinition, params);
-        } else {
-            try {
-                return modbusConnectionFactory.modbusTcpPlcConnectionOf(InetAddress.getByName(host), port, params);
-            } catch (UnknownHostException e) {
-                throw new PlcConnectionException(e);
-            }
-        }
-    }
-
-    @Override
-    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
-        throw new PlcConnectionException("Modbus connections don't support authentication.");
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.modbus;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.authentication.PlcAuthentication;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.modbus.connection.ModbusConnectionFactory;
+import org.apache.plc4x.java.spi.PlcDriver;
+import org.osgi.service.component.annotations.Component;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Implementation of the Modbus protocol, based on:
+ * - Modbus Protocol (http://www.modbus.org/docs/Modbus_Application_Protocol_V1_1b3.pdf)
+ */
+@Component(service = PlcDriver.class, immediate = true)
+public class ModbusPlcDriver implements PlcDriver {
+
+    public static final Pattern INET_ADDRESS_PATTERN = Pattern.compile("tcp://(?<host>[\\w.]+)(:(?<port>\\d*))?");
+    public static final Pattern SERIAL_PATTERN = Pattern.compile("serial://(?<serialDefinition>((?!/\\d).)*)");
+    public static final Pattern MODBUS_URI_PATTERN = Pattern.compile("^modbus:(" + INET_ADDRESS_PATTERN + "|" + SERIAL_PATTERN + ")/?" + "(?<params>\\?.*)?");
+
+    private ModbusConnectionFactory modbusConnectionFactory;
+
+    public ModbusPlcDriver() {
+        this.modbusConnectionFactory = new ModbusConnectionFactory();
+    }
+
+    public ModbusPlcDriver(ModbusConnectionFactory modbusConnectionFactory) {
+        this.modbusConnectionFactory = modbusConnectionFactory;
+    }
+
+    @Override
+    public String getProtocolCode() {
+        return "modbus";
+    }
+
+    @Override
+    public String getProtocolName() {
+        return "Modbus (TCP / Serial)";
+    }
+
+    @Override
+    public PlcConnection connect(String url) throws PlcConnectionException {
+        Matcher matcher = MODBUS_URI_PATTERN.matcher(url);
+        if (!matcher.matches()) {
+            throw new PlcConnectionException(
+                "Connection url doesn't match the format 'modbus:{type}//{port|host}'");
+        }
+
+        String host = matcher.group("host");
+        String serialDefinition = matcher.group("serialDefinition");
+        String portString = matcher.group("port");
+        Integer port = StringUtils.isNotBlank(portString) ? Integer.parseInt(portString) : null;
+        String params = matcher.group("params") != null ? matcher.group("params").substring(1) : null;
+
+        if (serialDefinition != null) {
+            return modbusConnectionFactory.modbusSerialPlcConnectionOf(serialDefinition, params);
+        } else {
+            try {
+                return modbusConnectionFactory.modbusTcpPlcConnectionOf(InetAddress.getByName(host), port, params);
+            } catch (UnknownHostException e) {
+                throw new PlcConnectionException(e);
+            }
+        }
+    }
+
+    @Override
+    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
+        throw new PlcConnectionException("Modbus connections don't support authentication.");
+    }
+
+}
diff --git a/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java b/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java
index bac1c3862ab..23ad4d9cba4 100644
--- a/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java
+++ b/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java
@@ -1,117 +1,117 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.modbus.connection;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.messages.PlcWriteResponse;
-import org.apache.plc4x.java.base.connection.ChannelFactory;
-import org.apache.plc4x.java.base.connection.NettyPlcConnection;
-import org.apache.plc4x.java.base.messages.*;
-import org.apache.plc4x.java.modbus.util.ModbusPlcFieldHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.CompletableFuture;
-
-public abstract class BaseModbusPlcConnection extends NettyPlcConnection implements PlcReader, PlcWriter {
-
-    private static final Logger logger = LoggerFactory.getLogger(BaseModbusPlcConnection.class);
-
-    // This slaveId defaults to 0 which is a broadcast.
-    private short slaveId = 0;
-
-    BaseModbusPlcConnection(ChannelFactory channelFactory, String params) {
-        super(channelFactory);
-
-        if (!StringUtils.isEmpty(params)) {
-            for (String param : params.split("&")) {
-                String[] paramElements = param.split("=");
-                String paramName = paramElements[0];
-                if (paramElements.length == 2) {
-                    String paramValue = paramElements[1];
-                    switch (paramName) {
-                        case "slaveId": {
-                            slaveId = Short.parseShort(paramValue);
-                        }
-                        default:
-                            logger.debug("Unknown parameter {} with value {}", paramName, paramValue);
-                    }
-                } else {
-                    logger.debug("Unknown no-value parameter {}", paramName);
-                }
-            }
-        }
-    }
-
-    @Override
-    public boolean canRead() {
-        return true;
-    }
-
-    @Override
-    public boolean canWrite() {
-        return true;
-    }
-
-    @Override
-    public PlcReadRequest.Builder readRequestBuilder() {
-        return new DefaultPlcReadRequest.Builder(this, new ModbusPlcFieldHandler());
-    }
-
-    @Override
-    public PlcWriteRequest.Builder writeRequestBuilder() {
-        return new DefaultPlcWriteRequest.Builder(this, new ModbusPlcFieldHandler());
-    }
-
-    @Override
-    public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
-        CompletableFuture<InternalPlcReadResponse> future = new CompletableFuture<>();
-        PlcRequestContainer<InternalPlcReadRequest, InternalPlcReadResponse> container =
-            new PlcRequestContainer<>((InternalPlcReadRequest) readRequest, future);
-        channel.writeAndFlush(container).addListener(f -> {
-            if (!f.isSuccess()) {
-                future.completeExceptionally(f.cause());
-            }
-        });
-        return future
-            .thenApply(PlcReadResponse.class::cast);
-    }
-
-    @Override
-    public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
-        CompletableFuture<InternalPlcWriteResponse> future = new CompletableFuture<>();
-        PlcRequestContainer<InternalPlcWriteRequest, InternalPlcWriteResponse> container =
-            new PlcRequestContainer<>((InternalPlcWriteRequest) writeRequest, future);
-        channel.writeAndFlush(container).addListener(f -> {
-            if (!f.isSuccess()) {
-                future.completeExceptionally(f.cause());
-            }
-        });
-        return future
-            .thenApply(PlcWriteResponse.class::cast);
-    }
-
-    public short getSlaveId() {
-        return slaveId;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.modbus.connection;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteResponse;
+import org.apache.plc4x.java.base.connection.ChannelFactory;
+import org.apache.plc4x.java.base.connection.NettyPlcConnection;
+import org.apache.plc4x.java.base.messages.*;
+import org.apache.plc4x.java.modbus.util.ModbusPlcFieldHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.CompletableFuture;
+
+public abstract class BaseModbusPlcConnection extends NettyPlcConnection implements PlcReader, PlcWriter {
+
+    private static final Logger logger = LoggerFactory.getLogger(BaseModbusPlcConnection.class);
+
+    // This slaveId defaults to 0 which is a broadcast.
+    private short slaveId = 0;
+
+    BaseModbusPlcConnection(ChannelFactory channelFactory, String params) {
+        super(channelFactory);
+
+        if (!StringUtils.isEmpty(params)) {
+            for (String param : params.split("&")) {
+                String[] paramElements = param.split("=");
+                String paramName = paramElements[0];
+                if (paramElements.length == 2) {
+                    String paramValue = paramElements[1];
+                    switch (paramName) {
+                        case "slaveId": {
+                            slaveId = Short.parseShort(paramValue);
+                        }
+                        default:
+                            logger.debug("Unknown parameter {} with value {}", paramName, paramValue);
+                    }
+                } else {
+                    logger.debug("Unknown no-value parameter {}", paramName);
+                }
+            }
+        }
+    }
+
+    @Override
+    public boolean canRead() {
+        return true;
+    }
+
+    @Override
+    public boolean canWrite() {
+        return true;
+    }
+
+    @Override
+    public PlcReadRequest.Builder readRequestBuilder() {
+        return new DefaultPlcReadRequest.Builder(this, new ModbusPlcFieldHandler());
+    }
+
+    @Override
+    public PlcWriteRequest.Builder writeRequestBuilder() {
+        return new DefaultPlcWriteRequest.Builder(this, new ModbusPlcFieldHandler());
+    }
+
+    @Override
+    public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
+        CompletableFuture<InternalPlcReadResponse> future = new CompletableFuture<>();
+        PlcRequestContainer<InternalPlcReadRequest, InternalPlcReadResponse> container =
+            new PlcRequestContainer<>((InternalPlcReadRequest) readRequest, future);
+        channel.writeAndFlush(container).addListener(f -> {
+            if (!f.isSuccess()) {
+                future.completeExceptionally(f.cause());
+            }
+        });
+        return future
+            .thenApply(PlcReadResponse.class::cast);
+    }
+
+    @Override
+    public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
+        CompletableFuture<InternalPlcWriteResponse> future = new CompletableFuture<>();
+        PlcRequestContainer<InternalPlcWriteRequest, InternalPlcWriteResponse> container =
+            new PlcRequestContainer<>((InternalPlcWriteRequest) writeRequest, future);
+        channel.writeAndFlush(container).addListener(f -> {
+            if (!f.isSuccess()) {
+                future.completeExceptionally(f.cause());
+            }
+        });
+        return future
+            .thenApply(PlcWriteResponse.class::cast);
+    }
+
+    public short getSlaveId() {
+        return slaveId;
+    }
+
+}
diff --git a/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/ModbusConnectionFactory.java b/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/ModbusConnectionFactory.java
index bf23c5d8f35..b8b7fbd4fa3 100644
--- a/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/ModbusConnectionFactory.java
+++ b/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/ModbusConnectionFactory.java
@@ -1,40 +1,40 @@
-/*
- 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
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.modbus.connection;
-
-import java.net.InetAddress;
-import java.util.Objects;
-
-public class ModbusConnectionFactory {
-
-    public ModbusTcpPlcConnection modbusTcpPlcConnectionOf(InetAddress address, Integer port, String params) {
-        Objects.requireNonNull(address);
-
-        if (port == null) {
-            return ModbusTcpPlcConnection.of(address, params);
-        } else {
-            return ModbusTcpPlcConnection.of(address, port, params);
-        }
-    }
-
-    public ModbusSerialPlcConnection modbusSerialPlcConnectionOf(String serialPort, String params) {
-        Objects.requireNonNull(serialPort);
-        return ModbusSerialPlcConnection.of(serialPort, params);
-    }
-}
+/*
+ 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
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.modbus.connection;
+
+import java.net.InetAddress;
+import java.util.Objects;
+
+public class ModbusConnectionFactory {
+
+    public ModbusTcpPlcConnection modbusTcpPlcConnectionOf(InetAddress address, Integer port, String params) {
+        Objects.requireNonNull(address);
+
+        if (port == null) {
+            return ModbusTcpPlcConnection.of(address, params);
+        } else {
+            return ModbusTcpPlcConnection.of(address, port, params);
+        }
+    }
+
+    public ModbusSerialPlcConnection modbusSerialPlcConnectionOf(String serialPort, String params) {
+        Objects.requireNonNull(serialPort);
+        return ModbusSerialPlcConnection.of(serialPort, params);
+    }
+}
diff --git a/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/ModbusSerialPlcConnection.java b/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/ModbusSerialPlcConnection.java
index e3f0695495b..ae85c8e8331 100644
--- a/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/ModbusSerialPlcConnection.java
+++ b/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/ModbusSerialPlcConnection.java
@@ -1,47 +1,47 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.modbus.connection;
-
-import io.netty.channel.ChannelHandler;
-import org.apache.commons.lang3.NotImplementedException;
-import org.apache.plc4x.java.serial.connection.connection.SerialChannelFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.CompletableFuture;
-
-public class ModbusSerialPlcConnection extends BaseModbusPlcConnection {
-
-    private static final Logger logger = LoggerFactory.getLogger(ModbusSerialPlcConnection.class);
-
-    private ModbusSerialPlcConnection(String port, String params) {
-        super(new SerialChannelFactory(port), params);
-        logger.info("Configured ModbusSerialPlcConnection with: serial-port {}", port);
-    }
-
-    public static ModbusSerialPlcConnection of(String serialPort, String params) {
-        return new ModbusSerialPlcConnection(serialPort, params);
-    }
-
-    @Override
-    protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
-        throw new NotImplementedException("Not implemented yet");
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.modbus.connection;
+
+import io.netty.channel.ChannelHandler;
+import org.apache.commons.lang3.NotImplementedException;
+import org.apache.plc4x.java.serial.connection.connection.SerialChannelFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.CompletableFuture;
+
+public class ModbusSerialPlcConnection extends BaseModbusPlcConnection {
+
+    private static final Logger logger = LoggerFactory.getLogger(ModbusSerialPlcConnection.class);
+
+    private ModbusSerialPlcConnection(String port, String params) {
+        super(new SerialChannelFactory(port), params);
+        logger.info("Configured ModbusSerialPlcConnection with: serial-port {}", port);
+    }
+
+    public static ModbusSerialPlcConnection of(String serialPort, String params) {
+        return new ModbusSerialPlcConnection(serialPort, params);
+    }
+
+    @Override
+    protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
+        throw new NotImplementedException("Not implemented yet");
+    }
+
+}
diff --git a/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/ModbusTcpPlcConnection.java b/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/ModbusTcpPlcConnection.java
index 3fb196b4597..15404032e99 100644
--- a/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/ModbusTcpPlcConnection.java
+++ b/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/ModbusTcpPlcConnection.java
@@ -1,81 +1,81 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.modbus.connection;
-
-import com.digitalpetri.modbus.codec.ModbusRequestEncoder;
-import com.digitalpetri.modbus.codec.ModbusResponseDecoder;
-import com.digitalpetri.modbus.codec.ModbusTcpCodec;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelInitializer;
-import org.apache.plc4x.java.base.connection.ChannelFactory;
-import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
-import org.apache.plc4x.java.base.protocol.SingleItemToSingleRequestProtocol;
-import org.apache.plc4x.java.modbus.netty.Plc4XModbusProtocol;
-import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.InetAddress;
-import java.util.concurrent.CompletableFuture;
-
-public class ModbusTcpPlcConnection extends BaseModbusPlcConnection {
-
-    private static final int MODBUS_TCP_PORT = 502;
-
-    private static final Logger logger = LoggerFactory.getLogger(ModbusTcpPlcConnection.class);
-
-    private ModbusTcpPlcConnection(InetAddress address, String params) {
-        this(new TcpSocketChannelFactory(address, MODBUS_TCP_PORT), params);
-        logger.info("Configured ModbusTcpPlcConnection with: host-name {}", address.getHostAddress());
-    }
-
-    public ModbusTcpPlcConnection(InetAddress address, int port, String params) {
-        this(new TcpSocketChannelFactory(address, port), params);
-        logger.info("Configured ModbusTcpPlcConnection with: host-name {}", address.getHostAddress());
-    }
-
-    public ModbusTcpPlcConnection(ChannelFactory channelFactory, String params) {
-        super(channelFactory, params);
-    }
-
-    public static ModbusTcpPlcConnection of(InetAddress address, String params) {
-        return new ModbusTcpPlcConnection(address, params);
-    }
-
-    public static ModbusTcpPlcConnection of(InetAddress address, int port, String params) {
-        return new ModbusTcpPlcConnection(address, port, params);
-    }
-
-    @Override
-    protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
-        return new ChannelInitializer() {
-            @Override
-            protected void initChannel(Channel channel) {
-                channel.pipeline().addLast(new ModbusTcpCodec(new ModbusRequestEncoder(), new ModbusResponseDecoder()));
-                channel.pipeline().addLast(new Plc4XModbusProtocol(getSlaveId()));
-                channel.pipeline().addLast(new SingleItemToSingleRequestProtocol(ModbusTcpPlcConnection.this, ModbusTcpPlcConnection.this, null, timer, null, false));
-            }
-        };
-    }
-
-    public InetAddress getRemoteAddress() {
-        return ((TcpSocketChannelFactory) channelFactory).getAddress();
-    }
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.modbus.connection;
+
+import com.digitalpetri.modbus.codec.ModbusRequestEncoder;
+import com.digitalpetri.modbus.codec.ModbusResponseDecoder;
+import com.digitalpetri.modbus.codec.ModbusTcpCodec;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelInitializer;
+import org.apache.plc4x.java.base.connection.ChannelFactory;
+import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
+import org.apache.plc4x.java.base.protocol.SingleItemToSingleRequestProtocol;
+import org.apache.plc4x.java.modbus.netty.Plc4XModbusProtocol;
+import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.InetAddress;
+import java.util.concurrent.CompletableFuture;
+
+public class ModbusTcpPlcConnection extends BaseModbusPlcConnection {
+
+    private static final int MODBUS_TCP_PORT = 502;
+
+    private static final Logger logger = LoggerFactory.getLogger(ModbusTcpPlcConnection.class);
+
+    private ModbusTcpPlcConnection(InetAddress address, String params) {
+        this(new TcpSocketChannelFactory(address, MODBUS_TCP_PORT), params);
+        logger.info("Configured ModbusTcpPlcConnection with: host-name {}", address.getHostAddress());
+    }
+
+    public ModbusTcpPlcConnection(InetAddress address, int port, String params) {
+        this(new TcpSocketChannelFactory(address, port), params);
+        logger.info("Configured ModbusTcpPlcConnection with: host-name {}", address.getHostAddress());
+    }
+
+    public ModbusTcpPlcConnection(ChannelFactory channelFactory, String params) {
+        super(channelFactory, params);
+    }
+
+    public static ModbusTcpPlcConnection of(InetAddress address, String params) {
+        return new ModbusTcpPlcConnection(address, params);
+    }
+
+    public static ModbusTcpPlcConnection of(InetAddress address, int port, String params) {
+        return new ModbusTcpPlcConnection(address, port, params);
+    }
+
+    @Override
+    protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
+        return new ChannelInitializer() {
+            @Override
+            protected void initChannel(Channel channel) {
+                channel.pipeline().addLast(new ModbusTcpCodec(new ModbusRequestEncoder(), new ModbusResponseDecoder()));
+                channel.pipeline().addLast(new Plc4XModbusProtocol(getSlaveId()));
+                channel.pipeline().addLast(new SingleItemToSingleRequestProtocol(ModbusTcpPlcConnection.this, ModbusTcpPlcConnection.this, null, timer, null, false));
+            }
+        };
+    }
+
+    public InetAddress getRemoteAddress() {
+        return ((TcpSocketChannelFactory) channelFactory).getAddress();
+    }
+}
diff --git a/plc4j/drivers/modbus/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver b/plc4j/drivers/modbus/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
index 8df2ee46b8e..5e82b3da921 100644
--- a/plc4j/drivers/modbus/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
+++ b/plc4j/drivers/modbus/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
@@ -1,19 +1,19 @@
-#
-# 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
-#
-#   http://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.
-#
-org.apache.plc4x.java.modbus.ModbusPlcDriver
+#
+# 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
+#
+#   http://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.
+#
+org.apache.plc4x.java.modbus.ModbusPlcDriver
diff --git a/plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/ModbusPlcDriverTest.java b/plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/ModbusPlcDriverTest.java
index 1e2bb721e42..80d7acf30ae 100644
--- a/plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/ModbusPlcDriverTest.java
+++ b/plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/ModbusPlcDriverTest.java
@@ -1,125 +1,125 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.modbus;
-
-
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.authentication.PlcUsernamePasswordAuthentication;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.exceptions.PlcException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.mock.connection.tcp.TcpHexDumper;
-import org.apache.plc4x.java.modbus.connection.ModbusConnectionFactory;
-import org.apache.plc4x.java.modbus.connection.ModbusTcpPlcConnection;
-import org.junit.Rule;
-import org.junit.Test;
-
-import java.util.regex.Pattern;
-import java.util.stream.Stream;
-
-import static org.apache.plc4x.java.modbus.ModbusPlcDriver.INET_ADDRESS_PATTERN;
-import static org.apache.plc4x.java.modbus.ModbusPlcDriver.SERIAL_PATTERN;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
-
-public class ModbusPlcDriverTest {
-
-    @Rule
-    public TcpHexDumper tcpHexDumper = new TcpHexDumper(0, 2);
-
-    @Test
-    public void testModbusAddressPattern() {
-        assertMatching(INET_ADDRESS_PATTERN, "tcp://localhost");
-        assertMatching(INET_ADDRESS_PATTERN, "tcp://localhost:3131");
-        assertMatching(INET_ADDRESS_PATTERN, "tcp://www.google.de");
-        assertMatching(INET_ADDRESS_PATTERN, "tcp://www.google.de:443");
-
-        assertMatching(SERIAL_PATTERN, "serial:///dev/com1");
-        assertMatching(SERIAL_PATTERN, "serial://COM1");
-        assertMatching(SERIAL_PATTERN, "serial:///dev/ttyUSB0");
-    }
-
-    @Test
-    public void testDriverWithCompleteUrls() {
-        ModbusPlcDriver SUT = new ModbusPlcDriver(mock(ModbusConnectionFactory.class));
-        Stream.of(
-            "modbus:tcp://localhost",
-            "modbus:tcp://localhost:443",
-            "modbus:serial:///dev/com1",
-            "modbus:serial://COM1",
-            "modbus:serial:///dev/ttyUSB0"
-        ).forEach(url -> {
-            try {
-                SUT.connect(url);
-            } catch (PlcConnectionException e) {
-                throw new PlcRuntimeException(e);
-            }
-        });
-    }
-
-    private void assertMatching(Pattern pattern, String match) {
-        if (!pattern.matcher(match).matches()) {
-            fail(pattern + "doesn't match " + match);
-        }
-    }
-
-    @Test
-    public void getConnection() throws Exception {
-        ModbusTcpPlcConnection modbusConnection = (ModbusTcpPlcConnection)
-            new PlcDriverManager().getConnection("modbus:tcp://localhost:" + tcpHexDumper.getPort());
-        modbusConnection.close();
-    }
-
-    @Test(expected = PlcConnectionException.class)
-    public void getConnectionNoAuthSupported() throws Exception {
-        new PlcDriverManager().getConnection("modbus:tcp://localhost:" + tcpHexDumper.getPort(),
-            new PlcUsernamePasswordAuthentication("admin", "admin"));
-    }
-
-    @Test(expected = PlcConnectionException.class)
-    public void getConnectionUnknownHost() throws Exception {
-        new PlcDriverManager().getConnection("modbus:tcp://IHopeThisHostDoesntExistAAAAAAAAhhhhhhh:8080");
-    }
-
-    @Test(expected = PlcConnectionException.class)
-    public void getConnectionUnknownPort() throws Exception {
-        new PlcDriverManager().getConnection("modbus:tcp://localhost:unknown");
-    }
-
-    /**
-     * In this test case the 'modbus' driver should report an invalid url format.
-     *
-     * @throws PlcException something went wrong
-     */
-    @Test(expected = PlcConnectionException.class)
-    public void getConnectionInvalidUrl() throws PlcException {
-        new PlcDriverManager().getConnection("modbus:tcp://localhost/hurz/2");
-    }
-
-    @Test
-    public void getProtocol() {
-        ModbusPlcDriver driver = new ModbusPlcDriver();
-        assertThat(driver.getProtocolCode(), is("modbus"));
-        assertThat(driver.getProtocolName(), is("Modbus (TCP / Serial)"));
-    }
-
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.modbus;
+
+
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.authentication.PlcUsernamePasswordAuthentication;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.exceptions.PlcException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.mock.connection.tcp.TcpHexDumper;
+import org.apache.plc4x.java.modbus.connection.ModbusConnectionFactory;
+import org.apache.plc4x.java.modbus.connection.ModbusTcpPlcConnection;
+import org.junit.Rule;
+import org.junit.Test;
+
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+
+import static org.apache.plc4x.java.modbus.ModbusPlcDriver.INET_ADDRESS_PATTERN;
+import static org.apache.plc4x.java.modbus.ModbusPlcDriver.SERIAL_PATTERN;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+
+public class ModbusPlcDriverTest {
+
+    @Rule
+    public TcpHexDumper tcpHexDumper = new TcpHexDumper(0, 2);
+
+    @Test
+    public void testModbusAddressPattern() {
+        assertMatching(INET_ADDRESS_PATTERN, "tcp://localhost");
+        assertMatching(INET_ADDRESS_PATTERN, "tcp://localhost:3131");
+        assertMatching(INET_ADDRESS_PATTERN, "tcp://www.google.de");
+        assertMatching(INET_ADDRESS_PATTERN, "tcp://www.google.de:443");
+
+        assertMatching(SERIAL_PATTERN, "serial:///dev/com1");
+        assertMatching(SERIAL_PATTERN, "serial://COM1");
+        assertMatching(SERIAL_PATTERN, "serial:///dev/ttyUSB0");
+    }
+
+    @Test
+    public void testDriverWithCompleteUrls() {
+        ModbusPlcDriver SUT = new ModbusPlcDriver(mock(ModbusConnectionFactory.class));
+        Stream.of(
+            "modbus:tcp://localhost",
+            "modbus:tcp://localhost:443",
+            "modbus:serial:///dev/com1",
+            "modbus:serial://COM1",
+            "modbus:serial:///dev/ttyUSB0"
+        ).forEach(url -> {
+            try {
+                SUT.connect(url);
+            } catch (PlcConnectionException e) {
+                throw new PlcRuntimeException(e);
+            }
+        });
+    }
+
+    private void assertMatching(Pattern pattern, String match) {
+        if (!pattern.matcher(match).matches()) {
+            fail(pattern + "doesn't match " + match);
+        }
+    }
+
+    @Test
+    public void getConnection() throws Exception {
+        ModbusTcpPlcConnection modbusConnection = (ModbusTcpPlcConnection)
+            new PlcDriverManager().getConnection("modbus:tcp://localhost:" + tcpHexDumper.getPort());
+        modbusConnection.close();
+    }
+
+    @Test(expected = PlcConnectionException.class)
+    public void getConnectionNoAuthSupported() throws Exception {
+        new PlcDriverManager().getConnection("modbus:tcp://localhost:" + tcpHexDumper.getPort(),
+            new PlcUsernamePasswordAuthentication("admin", "admin"));
+    }
+
+    @Test(expected = PlcConnectionException.class)
+    public void getConnectionUnknownHost() throws Exception {
+        new PlcDriverManager().getConnection("modbus:tcp://IHopeThisHostDoesntExistAAAAAAAAhhhhhhh:8080");
+    }
+
+    @Test(expected = PlcConnectionException.class)
+    public void getConnectionUnknownPort() throws Exception {
+        new PlcDriverManager().getConnection("modbus:tcp://localhost:unknown");
+    }
+
+    /**
+     * In this test case the 'modbus' driver should report an invalid url format.
+     *
+     * @throws PlcException something went wrong
+     */
+    @Test(expected = PlcConnectionException.class)
+    public void getConnectionInvalidUrl() throws PlcException {
+        new PlcDriverManager().getConnection("modbus:tcp://localhost/hurz/2");
+    }
+
+    @Test
+    public void getProtocol() {
+        ModbusPlcDriver driver = new ModbusPlcDriver();
+        assertThat(driver.getProtocolCode(), is("modbus"));
+        assertThat(driver.getProtocolName(), is("Modbus (TCP / Serial)"));
+    }
+
+
+}
diff --git a/plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnectionTest.java b/plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnectionTest.java
index e3e8eb42d16..6e7bd0439ac 100644
--- a/plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnectionTest.java
+++ b/plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnectionTest.java
@@ -1,156 +1,156 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.modbus.connection;
-
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelHandler;
-import io.netty.util.concurrent.Future;
-import io.netty.util.concurrent.GenericFutureListener;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.messages.PlcWriteResponse;
-import org.apache.plc4x.java.base.connection.ChannelFactory;
-import org.apache.plc4x.java.base.messages.InternalPlcReadRequest;
-import org.apache.plc4x.java.base.messages.InternalPlcWriteRequest;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-@RunWith(MockitoJUnitRunner.class)
-@SuppressWarnings("unchecked")
-public class BaseModbusPlcConnectionTest {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(BaseModbusPlcConnectionTest.class);
-
-    private BaseModbusPlcConnection SUT;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private ChannelFactory channelFactory;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Channel channel;
-
-    @Before
-    public void setUp() throws Exception {
-        SUT = new BaseModbusPlcConnection(channelFactory, null) {
-            @Override
-            protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
-                return null;
-            }
-        };
-
-        when(channelFactory.createChannel(any())).thenReturn(channel);
-
-        SUT.connect();
-    }
-
-    @Test
-    public void lazyConstructor() {
-        new BaseModbusPlcConnection(channelFactory, null) {
-            @Override
-            protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
-                return null;
-            }
-        };
-    }
-
-    @Test
-    public void read() {
-        CompletableFuture<PlcReadResponse> read = SUT.read(mock(InternalPlcReadRequest.class));
-        assertNotNull(read);
-
-        simulatePipelineError(() -> SUT.read(mock(InternalPlcReadRequest.class)));
-    }
-
-    @Test
-    public void write() {
-        CompletableFuture<PlcWriteResponse> write = SUT.write(mock(InternalPlcWriteRequest.class));
-        assertNotNull(write);
-
-        simulatePipelineError(() -> SUT.write(mock(InternalPlcWriteRequest.class)));
-    }
-
-    public void simulatePipelineError(FutureProducingTestRunnable futureProducingTestRunnable) {
-        ChannelFuture channelFuture = mock(ChannelFuture.class);
-        // Simulate error in the pipeline
-        when(channelFuture.addListener(any())).thenAnswer(invocation -> {
-            Future future = mock(Future.class);
-            when(future.isSuccess()).thenReturn(false);
-            when(future.cause()).thenReturn(new DummyException());
-            GenericFutureListener genericFutureListener = invocation.getArgument(0);
-            genericFutureListener.operationComplete(future);
-            return mock(ChannelFuture.class);
-        });
-        when(channel.writeAndFlush(any())).thenReturn(channelFuture);
-        assertThrows(DummyException.class, () -> {
-            CompletableFuture completableFuture = futureProducingTestRunnable.run();
-            try {
-                completableFuture.get(3, TimeUnit.SECONDS);
-                fail("Should have thrown a ExecutionException");
-            } catch (ExecutionException e) {
-                if (e.getCause() instanceof DummyException) {
-                    throw (DummyException) e.getCause();
-                }
-                throw e;
-            }
-        });
-    }
-
-    @Test
-    public void testToString() {
-        String s = SUT.toString();
-        assertNotNull(s);
-    }
-
-    /**
-     * Variant of {@link Runnable} which adds a {@code throws Exception} to the {@code run} signature.
-     */
-    private interface TestRunnable {
-        /**
-         * @throws Exception when the test throws a exception.
-         * @see Runnable#run()
-         */
-        void run() throws Exception;
-    }
-
-    private static class DummyException extends Exception {
-
-    }
-
-    @FunctionalInterface
-    private interface FutureProducingTestRunnable {
-        CompletableFuture run() throws Exception;
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.modbus.connection;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.messages.PlcWriteResponse;
+import org.apache.plc4x.java.base.connection.ChannelFactory;
+import org.apache.plc4x.java.base.messages.InternalPlcReadRequest;
+import org.apache.plc4x.java.base.messages.InternalPlcWriteRequest;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+@SuppressWarnings("unchecked")
+public class BaseModbusPlcConnectionTest {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(BaseModbusPlcConnectionTest.class);
+
+    private BaseModbusPlcConnection SUT;
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private ChannelFactory channelFactory;
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Channel channel;
+
+    @Before
+    public void setUp() throws Exception {
+        SUT = new BaseModbusPlcConnection(channelFactory, null) {
+            @Override
+            protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
+                return null;
+            }
+        };
+
+        when(channelFactory.createChannel(any())).thenReturn(channel);
+
+        SUT.connect();
+    }
+
+    @Test
+    public void lazyConstructor() {
+        new BaseModbusPlcConnection(channelFactory, null) {
+            @Override
+            protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
+                return null;
+            }
+        };
+    }
+
+    @Test
+    public void read() {
+        CompletableFuture<PlcReadResponse> read = SUT.read(mock(InternalPlcReadRequest.class));
+        assertNotNull(read);
+
+        simulatePipelineError(() -> SUT.read(mock(InternalPlcReadRequest.class)));
+    }
+
+    @Test
+    public void write() {
+        CompletableFuture<PlcWriteResponse> write = SUT.write(mock(InternalPlcWriteRequest.class));
+        assertNotNull(write);
+
+        simulatePipelineError(() -> SUT.write(mock(InternalPlcWriteRequest.class)));
+    }
+
+    public void simulatePipelineError(FutureProducingTestRunnable futureProducingTestRunnable) {
+        ChannelFuture channelFuture = mock(ChannelFuture.class);
+        // Simulate error in the pipeline
+        when(channelFuture.addListener(any())).thenAnswer(invocation -> {
+            Future future = mock(Future.class);
+            when(future.isSuccess()).thenReturn(false);
+            when(future.cause()).thenReturn(new DummyException());
+            GenericFutureListener genericFutureListener = invocation.getArgument(0);
+            genericFutureListener.operationComplete(future);
+            return mock(ChannelFuture.class);
+        });
+        when(channel.writeAndFlush(any())).thenReturn(channelFuture);
+        assertThrows(DummyException.class, () -> {
+            CompletableFuture completableFuture = futureProducingTestRunnable.run();
+            try {
+                completableFuture.get(3, TimeUnit.SECONDS);
+                fail("Should have thrown a ExecutionException");
+            } catch (ExecutionException e) {
+                if (e.getCause() instanceof DummyException) {
+                    throw (DummyException) e.getCause();
+                }
+                throw e;
+            }
+        });
+    }
+
+    @Test
+    public void testToString() {
+        String s = SUT.toString();
+        assertNotNull(s);
+    }
+
+    /**
+     * Variant of {@link Runnable} which adds a {@code throws Exception} to the {@code run} signature.
+     */
+    private interface TestRunnable {
+        /**
+         * @throws Exception when the test throws a exception.
+         * @see Runnable#run()
+         */
+        void run() throws Exception;
+    }
+
+    private static class DummyException extends Exception {
+
+    }
+
+    @FunctionalInterface
+    private interface FutureProducingTestRunnable {
+        CompletableFuture run() throws Exception;
+    }
 }
\ No newline at end of file
diff --git a/plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/ModbusConnectionFactoryTest.java b/plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/ModbusConnectionFactoryTest.java
index 4c8775b6bb8..253f262a4e5 100644
--- a/plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/ModbusConnectionFactoryTest.java
+++ b/plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/ModbusConnectionFactoryTest.java
@@ -1,95 +1,95 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.modbus.connection;
-
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.plc4x.java.base.connection.NettyPlcConnection;
-import org.apache.plc4x.java.serial.connection.connection.SerialChannelFactory;
-import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import java.net.InetAddress;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-@RunWith(MockitoJUnitRunner.class)
-public class ModbusConnectionFactoryTest {
-
-    @InjectMocks
-    private ModbusConnectionFactory SUT;
-
-    @Mock
-    private InetAddress inetAddress;
-
-
-    @Test
-    public void modbusTcpPlcConnectionOf() throws Exception {
-        {
-            assertThrows(NullPointerException.class, () -> SUT.modbusTcpPlcConnectionOf(null, null, null));
-        }
-        {
-            ModbusTcpPlcConnection modbusTcpPlcConnection = SUT.modbusTcpPlcConnectionOf(inetAddress, null, null);
-            assertGeneratedPort(modbusTcpPlcConnection);
-        }
-        {
-            ModbusTcpPlcConnection modbusTcpPlcConnection = SUT.modbusTcpPlcConnectionOf(inetAddress, 13, null);
-            assertEquals(inetAddress, modbusTcpPlcConnection.getRemoteAddress());
-            assertPort(modbusTcpPlcConnection, 13);
-        }
-        {
-            ModbusTcpPlcConnection modbusTcpPlcConnection = SUT.modbusTcpPlcConnectionOf(inetAddress, null, "xyz");
-            assertEquals(inetAddress, modbusTcpPlcConnection.getRemoteAddress());
-            assertGeneratedPort(modbusTcpPlcConnection);
-        }
-    }
-
-    public void assertGeneratedPort(ModbusTcpPlcConnection modbusTcpPlcConnection) throws Exception {
-        assertPort(modbusTcpPlcConnection, 502);
-    }
-
-    public void assertPort(ModbusTcpPlcConnection modbusTcpPlcConnection, int port) throws Exception {
-        TcpSocketChannelFactory channelFactory = (TcpSocketChannelFactory) FieldUtils
-            .getDeclaredField(NettyPlcConnection.class, "channelFactory", true)
-            .get(modbusTcpPlcConnection);
-        assertEquals(port, channelFactory.getPort());
-    }
-
-    @Test
-    public void modbusSerialPlcConnectionOf() throws Exception {
-        {
-            assertThrows(NullPointerException.class, () -> SUT.modbusSerialPlcConnectionOf(null, null));
-        }
-        {
-            ModbusSerialPlcConnection modbusSerialPlcConnection = SUT.modbusSerialPlcConnectionOf("/dev/ttyS01", null);
-            assertPort(modbusSerialPlcConnection, "/dev/ttyS01");
-        }
-    }
-
-    public void assertPort(ModbusSerialPlcConnection modbusSerialPlcConnection, String serialPort) throws Exception {
-        SerialChannelFactory channelFactory = (SerialChannelFactory) FieldUtils
-            .getDeclaredField(NettyPlcConnection.class, "channelFactory", true)
-            .get(modbusSerialPlcConnection);
-        assertEquals(serialPort, channelFactory.getSerialPort());
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.modbus.connection;
+
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.plc4x.java.base.connection.NettyPlcConnection;
+import org.apache.plc4x.java.serial.connection.connection.SerialChannelFactory;
+import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import java.net.InetAddress;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ModbusConnectionFactoryTest {
+
+    @InjectMocks
+    private ModbusConnectionFactory SUT;
+
+    @Mock
+    private InetAddress inetAddress;
+
+
+    @Test
+    public void modbusTcpPlcConnectionOf() throws Exception {
+        {
+            assertThrows(NullPointerException.class, () -> SUT.modbusTcpPlcConnectionOf(null, null, null));
+        }
+        {
+            ModbusTcpPlcConnection modbusTcpPlcConnection = SUT.modbusTcpPlcConnectionOf(inetAddress, null, null);
+            assertGeneratedPort(modbusTcpPlcConnection);
+        }
+        {
+            ModbusTcpPlcConnection modbusTcpPlcConnection = SUT.modbusTcpPlcConnectionOf(inetAddress, 13, null);
+            assertEquals(inetAddress, modbusTcpPlcConnection.getRemoteAddress());
+            assertPort(modbusTcpPlcConnection, 13);
+        }
+        {
+            ModbusTcpPlcConnection modbusTcpPlcConnection = SUT.modbusTcpPlcConnectionOf(inetAddress, null, "xyz");
+            assertEquals(inetAddress, modbusTcpPlcConnection.getRemoteAddress());
+            assertGeneratedPort(modbusTcpPlcConnection);
+        }
+    }
+
+    public void assertGeneratedPort(ModbusTcpPlcConnection modbusTcpPlcConnection) throws Exception {
+        assertPort(modbusTcpPlcConnection, 502);
+    }
+
+    public void assertPort(ModbusTcpPlcConnection modbusTcpPlcConnection, int port) throws Exception {
+        TcpSocketChannelFactory channelFactory = (TcpSocketChannelFactory) FieldUtils
+            .getDeclaredField(NettyPlcConnection.class, "channelFactory", true)
+            .get(modbusTcpPlcConnection);
+        assertEquals(port, channelFactory.getPort());
+    }
+
+    @Test
+    public void modbusSerialPlcConnectionOf() throws Exception {
+        {
+            assertThrows(NullPointerException.class, () -> SUT.modbusSerialPlcConnectionOf(null, null));
+        }
+        {
+            ModbusSerialPlcConnection modbusSerialPlcConnection = SUT.modbusSerialPlcConnectionOf("/dev/ttyS01", null);
+            assertPort(modbusSerialPlcConnection, "/dev/ttyS01");
+        }
+    }
+
+    public void assertPort(ModbusSerialPlcConnection modbusSerialPlcConnection, String serialPort) throws Exception {
+        SerialChannelFactory channelFactory = (SerialChannelFactory) FieldUtils
+            .getDeclaredField(NettyPlcConnection.class, "channelFactory", true)
+            .get(modbusSerialPlcConnection);
+        assertEquals(serialPort, channelFactory.getSerialPort());
+    }
 }
\ No newline at end of file
diff --git a/plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/ModbusSerialPlcConnectionTest.java b/plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/ModbusSerialPlcConnectionTest.java
index a7b466b97e1..b96a6d05108 100644
--- a/plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/ModbusSerialPlcConnectionTest.java
+++ b/plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/ModbusSerialPlcConnectionTest.java
@@ -1,217 +1,217 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.modbus.connection;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.embedded.EmbeddedChannel;
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.commons.lang3.reflect.MethodUtils;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.base.connection.NettyPlcConnection;
-import org.apache.plc4x.java.serial.connection.connection.SerialChannelFactory;
-import org.apache.plc4x.java.serial.connection.connection.SerialSocketAddress;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
-@Ignore("Not yet implemented in modbus")
-public class ModbusSerialPlcConnectionTest {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ModbusSerialPlcConnectionTest.class);
-
-    private ModbusSerialPlcConnection SUT;
-
-    @Before
-    public void setUp() {
-        SUT = ModbusSerialPlcConnection.of("/dev/tty0", null);
-    }
-
-    @After
-    public void tearDown() {
-        SUT = null;
-    }
-
-    @Test
-    public void testRead() throws Exception {
-        prepareSerialSimulator();
-        PlcReadRequest readRequest = SUT.readRequestBuilder().addItem("randomRead", "0/0").build();
-        CompletableFuture<PlcReadResponse> read = SUT.read(readRequest);
-        PlcReadResponse plcReadResponse = read.get(30, TimeUnit.SECONDS);
-        assertNotNull(plcReadResponse);
-    }
-
-    private void prepareSerialSimulator() throws Exception {
-        Field channelFactoryField = FieldUtils.getField(NettyPlcConnection.class, "channelFactory", true);
-        SerialChannelFactory serialChannelFactory = (SerialChannelFactory) channelFactoryField.get(SUT);
-        SerialChannelFactory serialChannelFactorySpied = spy(serialChannelFactory);
-        EmbeddedChannel embeddedChannel = new EmbeddedChannel(SUT.getChannelHandler(null));
-        embeddedChannel.connect(new SerialSocketAddress("/dev/tty0"));
-        doReturn(embeddedChannel).when(serialChannelFactorySpied).createChannel(any());
-        channelFactoryField.set(SUT, serialChannelFactorySpied);
-        SUT.connect();
-        new SerialSimulator(embeddedChannel).start();
-    }
-
-    private class SerialSimulator extends Thread {
-
-        private EmbeddedChannel embeddedChannel;
-
-        private SimulatorState state = SimulatorState.RECEIVE_REQUEST;
-
-        private byte[] currentInvokeId = new byte[0];
-
-        public SerialSimulator(EmbeddedChannel embeddedChannel) {
-            super("Serial Simulator");
-            this.embeddedChannel = embeddedChannel;
-        }
-
-        @Override
-        public void run() {
-            while (true) {
-                LOGGER.trace("in state {}. CurrentInvokeId: {}", state, currentInvokeId);
-                switch (state) {
-                    // Receiving state
-                    case RECEIVE_REQUEST: {
-                        LOGGER.info("Waiting for normal message");
-                        ByteBuf outputBuffer;
-                        while ((outputBuffer = embeddedChannel.readOutbound()) == null) {
-                            LOGGER.trace("No buffer available yet");
-                            if (!trySleep()) {
-                                return;
-                            }
-                        }
-                        // TODO
-                        int headerBytes = 4711;
-                        LOGGER.info("Skipping " + headerBytes + " bytes");
-                        outputBuffer.skipBytes(headerBytes);
-                        short dataLength = outputBuffer.readUnsignedByte();
-                        LOGGER.info("Expect at least " + dataLength + "bytes");
-                        while (outputBuffer.readableBytes() < dataLength) {
-                            if (!trySleep()) {
-                                return;
-                            }
-                        }
-                        byte[] bytes = new byte[dataLength];
-                        LOGGER.info("Read " + dataLength + "bytes. Having " + outputBuffer.readableBytes() + "bytes");
-                        outputBuffer.readBytes(bytes);
-                        currentInvokeId = Arrays.copyOfRange(bytes, 28, 32);
-                        // TODO
-                        outputBuffer.skipBytes(4711);
-                        LOGGER.info("Wrote Inbound");
-                        state = SimulatorState.ACK_MESSAGE;
-                        if (!trySleep()) {
-                            return;
-                        }
-                    }
-                    break;
-                    case ACK_MESSAGE: {
-                        // TODO
-                        ByteBuf byteBuf = Unpooled.buffer();
-                        try {
-                            MethodUtils.invokeMethod(byteBuf, true, "setRefCnt", 2);
-                        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-                            throw new RuntimeException(e);
-                        }
-                        embeddedChannel.writeOneInbound(byteBuf);
-                        LOGGER.info("Acked Message");
-                        state = SimulatorState.SEND_RESPONSE;
-                    }
-                    case SEND_RESPONSE: {
-                        LOGGER.info("Sending data message");
-                        //TODO:
-                        ByteBuf byteBuf = Unpooled.buffer();
-                        try {
-                            MethodUtils.invokeMethod(byteBuf, true, "setRefCnt", 2);
-                        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-                            throw new RuntimeException(e);
-                        }
-                        embeddedChannel.writeOneInbound(byteBuf);
-                        LOGGER.info("Wrote Inbound");
-                        state = SimulatorState.WAIT_FOR_ACK;
-                        if (!trySleep()) {
-                            return;
-                        }
-                    }
-                    break;
-                    case WAIT_FOR_ACK: {
-                        LOGGER.info("Waiting for ack message");
-                        ByteBuf outputBuffer;
-                        while ((outputBuffer = embeddedChannel.readOutbound()) == null) {
-                            if (!trySleep()) {
-                                return;
-                            }
-                        }
-                        //TODO:
-                        int headerBytes = 4711;
-                        LOGGER.info("Skipping " + headerBytes + " bytes");
-                        outputBuffer.skipBytes(headerBytes);
-                        short dataLength = outputBuffer.readUnsignedByte();
-                        LOGGER.info("Expect " + dataLength + "bytes");
-                        state = SimulatorState.DONE;
-                        if (!trySleep()) {
-                            return;
-                        }
-                    }
-                    case DONE: {
-                        LOGGER.info("Plc is Done. Goodbye");
-                        return;
-                    }
-                    default:
-                        throw new IllegalStateException("Illegal state number" + state);
-                }
-            }
-
-        }
-
-        private boolean trySleep() {
-            try {
-                TimeUnit.MILLISECONDS.sleep(10);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-                Thread.currentThread().interrupt();
-                return false;
-            }
-            return true;
-        }
-    }
-
-    private enum SimulatorState {
-        RECEIVE_REQUEST,
-        ACK_MESSAGE,
-        SEND_RESPONSE,
-        WAIT_FOR_ACK,
-        DONE
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.modbus.connection;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.embedded.EmbeddedChannel;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.commons.lang3.reflect.MethodUtils;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.base.connection.NettyPlcConnection;
+import org.apache.plc4x.java.serial.connection.connection.SerialChannelFactory;
+import org.apache.plc4x.java.serial.connection.connection.SerialSocketAddress;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+@Ignore("Not yet implemented in modbus")
+public class ModbusSerialPlcConnectionTest {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ModbusSerialPlcConnectionTest.class);
+
+    private ModbusSerialPlcConnection SUT;
+
+    @Before
+    public void setUp() {
+        SUT = ModbusSerialPlcConnection.of("/dev/tty0", null);
+    }
+
+    @After
+    public void tearDown() {
+        SUT = null;
+    }
+
+    @Test
+    public void testRead() throws Exception {
+        prepareSerialSimulator();
+        PlcReadRequest readRequest = SUT.readRequestBuilder().addItem("randomRead", "0/0").build();
+        CompletableFuture<PlcReadResponse> read = SUT.read(readRequest);
+        PlcReadResponse plcReadResponse = read.get(30, TimeUnit.SECONDS);
+        assertNotNull(plcReadResponse);
+    }
+
+    private void prepareSerialSimulator() throws Exception {
+        Field channelFactoryField = FieldUtils.getField(NettyPlcConnection.class, "channelFactory", true);
+        SerialChannelFactory serialChannelFactory = (SerialChannelFactory) channelFactoryField.get(SUT);
+        SerialChannelFactory serialChannelFactorySpied = spy(serialChannelFactory);
+        EmbeddedChannel embeddedChannel = new EmbeddedChannel(SUT.getChannelHandler(null));
+        embeddedChannel.connect(new SerialSocketAddress("/dev/tty0"));
+        doReturn(embeddedChannel).when(serialChannelFactorySpied).createChannel(any());
+        channelFactoryField.set(SUT, serialChannelFactorySpied);
+        SUT.connect();
+        new SerialSimulator(embeddedChannel).start();
+    }
+
+    private class SerialSimulator extends Thread {
+
+        private EmbeddedChannel embeddedChannel;
+
+        private SimulatorState state = SimulatorState.RECEIVE_REQUEST;
+
+        private byte[] currentInvokeId = new byte[0];
+
+        public SerialSimulator(EmbeddedChannel embeddedChannel) {
+            super("Serial Simulator");
+            this.embeddedChannel = embeddedChannel;
+        }
+
+        @Override
+        public void run() {
+            while (true) {
+                LOGGER.trace("in state {}. CurrentInvokeId: {}", state, currentInvokeId);
+                switch (state) {
+                    // Receiving state
+                    case RECEIVE_REQUEST: {
+                        LOGGER.info("Waiting for normal message");
+                        ByteBuf outputBuffer;
+                        while ((outputBuffer = embeddedChannel.readOutbound()) == null) {
+                            LOGGER.trace("No buffer available yet");
+                            if (!trySleep()) {
+                                return;
+                            }
+                        }
+                        // TODO
+                        int headerBytes = 4711;
+                        LOGGER.info("Skipping " + headerBytes + " bytes");
+                        outputBuffer.skipBytes(headerBytes);
+                        short dataLength = outputBuffer.readUnsignedByte();
+                        LOGGER.info("Expect at least " + dataLength + "bytes");
+                        while (outputBuffer.readableBytes() < dataLength) {
+                            if (!trySleep()) {
+                                return;
+                            }
+                        }
+                        byte[] bytes = new byte[dataLength];
+                        LOGGER.info("Read " + dataLength + "bytes. Having " + outputBuffer.readableBytes() + "bytes");
+                        outputBuffer.readBytes(bytes);
+                        currentInvokeId = Arrays.copyOfRange(bytes, 28, 32);
+                        // TODO
+                        outputBuffer.skipBytes(4711);
+                        LOGGER.info("Wrote Inbound");
+                        state = SimulatorState.ACK_MESSAGE;
+                        if (!trySleep()) {
+                            return;
+                        }
+                    }
+                    break;
+                    case ACK_MESSAGE: {
+                        // TODO
+                        ByteBuf byteBuf = Unpooled.buffer();
+                        try {
+                            MethodUtils.invokeMethod(byteBuf, true, "setRefCnt", 2);
+                        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+                            throw new RuntimeException(e);
+                        }
+                        embeddedChannel.writeOneInbound(byteBuf);
+                        LOGGER.info("Acked Message");
+                        state = SimulatorState.SEND_RESPONSE;
+                    }
+                    case SEND_RESPONSE: {
+                        LOGGER.info("Sending data message");
+                        //TODO:
+                        ByteBuf byteBuf = Unpooled.buffer();
+                        try {
+                            MethodUtils.invokeMethod(byteBuf, true, "setRefCnt", 2);
+                        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+                            throw new RuntimeException(e);
+                        }
+                        embeddedChannel.writeOneInbound(byteBuf);
+                        LOGGER.info("Wrote Inbound");
+                        state = SimulatorState.WAIT_FOR_ACK;
+                        if (!trySleep()) {
+                            return;
+                        }
+                    }
+                    break;
+                    case WAIT_FOR_ACK: {
+                        LOGGER.info("Waiting for ack message");
+                        ByteBuf outputBuffer;
+                        while ((outputBuffer = embeddedChannel.readOutbound()) == null) {
+                            if (!trySleep()) {
+                                return;
+                            }
+                        }
+                        //TODO:
+                        int headerBytes = 4711;
+                        LOGGER.info("Skipping " + headerBytes + " bytes");
+                        outputBuffer.skipBytes(headerBytes);
+                        short dataLength = outputBuffer.readUnsignedByte();
+                        LOGGER.info("Expect " + dataLength + "bytes");
+                        state = SimulatorState.DONE;
+                        if (!trySleep()) {
+                            return;
+                        }
+                    }
+                    case DONE: {
+                        LOGGER.info("Plc is Done. Goodbye");
+                        return;
+                    }
+                    default:
+                        throw new IllegalStateException("Illegal state number" + state);
+                }
+            }
+
+        }
+
+        private boolean trySleep() {
+            try {
+                TimeUnit.MILLISECONDS.sleep(10);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+                Thread.currentThread().interrupt();
+                return false;
+            }
+            return true;
+        }
+    }
+
+    private enum SimulatorState {
+        RECEIVE_REQUEST,
+        ACK_MESSAGE,
+        SEND_RESPONSE,
+        WAIT_FOR_ACK,
+        DONE
+    }
 }
\ No newline at end of file
diff --git a/plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/ModbusTcpPlcConnectionTests.java b/plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/ModbusTcpPlcConnectionTests.java
index 90b67f937e7..7f5c75c6d9a 100644
--- a/plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/ModbusTcpPlcConnectionTests.java
+++ b/plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/ModbusTcpPlcConnectionTests.java
@@ -1,60 +1,60 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.modbus.connection;
-
-import io.netty.channel.Channel;
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.InetAddress;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
-
-public class ModbusTcpPlcConnectionTests {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ModbusTcpPlcConnectionTests.class);
-
-    private ModbusTcpPlcConnection SUT;
-
-    private Channel channelMock;
-
-    private ExecutorService executorService;
-
-    @Before
-    public void setUp() throws Exception {
-        SUT = ModbusTcpPlcConnection.of(InetAddress.getByName("localhost"), null);
-        channelMock = mock(Channel.class, RETURNS_DEEP_STUBS);
-        FieldUtils.writeField(SUT, "channel", channelMock, true);
-        executorService = Executors.newFixedThreadPool(10);
-    }
-
-    @After
-    public void tearDown() {
-        executorService.shutdownNow();
-        SUT = null;
-    }
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.modbus.connection;
+
+import io.netty.channel.Channel;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.InetAddress;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+
+public class ModbusTcpPlcConnectionTests {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ModbusTcpPlcConnectionTests.class);
+
+    private ModbusTcpPlcConnection SUT;
+
+    private Channel channelMock;
+
+    private ExecutorService executorService;
+
+    @Before
+    public void setUp() throws Exception {
+        SUT = ModbusTcpPlcConnection.of(InetAddress.getByName("localhost"), null);
+        channelMock = mock(Channel.class, RETURNS_DEEP_STUBS);
+        FieldUtils.writeField(SUT, "channel", channelMock, true);
+        executorService = Executors.newFixedThreadPool(10);
+    }
+
+    @After
+    public void tearDown() {
+        executorService.shutdownNow();
+        SUT = null;
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/drivers/opcua/pom.xml b/plc4j/drivers/opcua/pom.xml
index 6944779641a..5b50af49d1f 100644
--- a/plc4j/drivers/opcua/pom.xml
+++ b/plc4j/drivers/opcua/pom.xml
@@ -1,92 +1,92 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-drivers</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-driver-opcua</artifactId>
-  <name>PLC4J: Driver: OPC UA</name>
-  <description>Implementation of a PLC4X driver able to speak with devices using the OPC UA protocol.</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.eclipse.milo</groupId>
-      <artifactId>sdk-client</artifactId>
-      <version>0.3.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.milo</groupId>
-      <artifactId>stack-core</artifactId>
-      <version>0.3.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.milo</groupId>
-      <artifactId>stack-client</artifactId>
-      <version>0.3.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>osgi.cmpn</artifactId>
-      <version>6.0.0</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-
-  <!--
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <usedDependencies combine.children="append">
-            <usedDependency>org.eclipse.milo:sdk-client</usedDependency>
-          </usedDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-drivers</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-driver-opcua</artifactId>
+  <name>PLC4J: Driver: OPC UA</name>
+  <description>Implementation of a PLC4X driver able to speak with devices using the OPC UA protocol.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.eclipse.milo</groupId>
+      <artifactId>sdk-client</artifactId>
+      <version>0.3.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.milo</groupId>
+      <artifactId>stack-core</artifactId>
+      <version>0.3.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.milo</groupId>
+      <artifactId>stack-client</artifactId>
+      <version>0.3.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>osgi.cmpn</artifactId>
+      <version>6.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+
+  <!--
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <usedDependencies combine.children="append">
+            <usedDependency>org.eclipse.milo:sdk-client</usedDependency>
+          </usedDependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  -->
 </project>
\ No newline at end of file
diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/OpcuaPlcDriver.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/OpcuaPlcDriver.java
index 3a27aa136b8..76d216719a4 100644
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/OpcuaPlcDriver.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/OpcuaPlcDriver.java
@@ -1,96 +1,96 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-*/
-package org.apache.plc4x.java.opcua;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.opcua.connection.OpcuaConnectionFactory;
-import org.apache.plc4x.java.spi.PlcDriver;
-import org.osgi.service.component.annotations.Component;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-
-/**
- * Implementation of the OPC UA protocol, based on:
- * - Eclipse Milo (https://github.com/eclipse/milo)
- *
- * @author Matthias Milan Stlrljic
- * Created by Matthias Milan Stlrljic on 10.05.2019
- */
-@Component(service = PlcDriver.class, immediate = true)
-public class OpcuaPlcDriver implements PlcDriver {
-
-
-
-    public static final Pattern INET_ADDRESS_PATTERN = Pattern.compile("tcp://(?<host>[\\w.-]+)(:(?<port>\\d*))?");
-    public static final Pattern OPCUA_URI_PATTERN = Pattern.compile("^opcua:(" + INET_ADDRESS_PATTERN + ")?" + "(?<params>/[\\w/]+)?");
-    private static final int requestTimeout = 10000;
-    private OpcuaConnectionFactory opcuaConnectionFactory;
-
-    public OpcuaPlcDriver() {
-        this.opcuaConnectionFactory = new OpcuaConnectionFactory();
-    }
-
-    public OpcuaPlcDriver(OpcuaConnectionFactory opcuaConnectionFactory) {
-        this.opcuaConnectionFactory = opcuaConnectionFactory;
-    }
-
-    @Override
-    public String getProtocolCode() {
-        return "opcua";
-    }
-
-    @Override
-    public String getProtocolName() {
-        return "OPC UA (TCP)";
-    }
-
-    @Override
-    public PlcConnection connect(String url) throws PlcConnectionException {
-        Matcher matcher = OPCUA_URI_PATTERN.matcher(url);
-
-        if (!matcher.matches()) {
-            throw new PlcConnectionException(
-                "Connection url doesn't match the format 'opcua:{type}//{port|host}'");
-        }
-
-        String host = matcher.group("host");
-        String portString = matcher.group("port");
-        Integer port = StringUtils.isNotBlank(portString) ? Integer.parseInt(portString) : null;
-        String params = matcher.group("params") != null ? matcher.group("params").substring(1) : null;
-
-        try {
-            return opcuaConnectionFactory.opcuaTcpPlcConnectionOf(InetAddress.getByName(host), port, params, requestTimeout);
-        } catch (UnknownHostException e) {
-            throw new PlcConnectionException(e);
-        }
-    }
-
-    @Override
-    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
-        throw new PlcConnectionException("opcua does not support Auth at this state");
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+package org.apache.plc4x.java.opcua;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.authentication.PlcAuthentication;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.opcua.connection.OpcuaConnectionFactory;
+import org.apache.plc4x.java.spi.PlcDriver;
+import org.osgi.service.component.annotations.Component;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+/**
+ * Implementation of the OPC UA protocol, based on:
+ * - Eclipse Milo (https://github.com/eclipse/milo)
+ *
+ * @author Matthias Milan Stlrljic
+ * Created by Matthias Milan Stlrljic on 10.05.2019
+ */
+@Component(service = PlcDriver.class, immediate = true)
+public class OpcuaPlcDriver implements PlcDriver {
+
+
+
+    public static final Pattern INET_ADDRESS_PATTERN = Pattern.compile("tcp://(?<host>[\\w.-]+)(:(?<port>\\d*))?");
+    public static final Pattern OPCUA_URI_PATTERN = Pattern.compile("^opcua:(" + INET_ADDRESS_PATTERN + ")?" + "(?<params>/[\\w/]+)?");
+    private static final int requestTimeout = 10000;
+    private OpcuaConnectionFactory opcuaConnectionFactory;
+
+    public OpcuaPlcDriver() {
+        this.opcuaConnectionFactory = new OpcuaConnectionFactory();
+    }
+
+    public OpcuaPlcDriver(OpcuaConnectionFactory opcuaConnectionFactory) {
+        this.opcuaConnectionFactory = opcuaConnectionFactory;
+    }
+
+    @Override
+    public String getProtocolCode() {
+        return "opcua";
+    }
+
+    @Override
+    public String getProtocolName() {
+        return "OPC UA (TCP)";
+    }
+
+    @Override
+    public PlcConnection connect(String url) throws PlcConnectionException {
+        Matcher matcher = OPCUA_URI_PATTERN.matcher(url);
+
+        if (!matcher.matches()) {
+            throw new PlcConnectionException(
+                "Connection url doesn't match the format 'opcua:{type}//{port|host}'");
+        }
+
+        String host = matcher.group("host");
+        String portString = matcher.group("port");
+        Integer port = StringUtils.isNotBlank(portString) ? Integer.parseInt(portString) : null;
+        String params = matcher.group("params") != null ? matcher.group("params").substring(1) : null;
+
+        try {
+            return opcuaConnectionFactory.opcuaTcpPlcConnectionOf(InetAddress.getByName(host), port, params, requestTimeout);
+        } catch (UnknownHostException e) {
+            throw new PlcConnectionException(e);
+        }
+    }
+
+    @Override
+    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
+        throw new PlcConnectionException("opcua does not support Auth at this state");
+    }
+
+}
diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/BaseOpcuaPlcConnection.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/BaseOpcuaPlcConnection.java
index 50a5bd0633c..de5872fd16e 100644
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/BaseOpcuaPlcConnection.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/BaseOpcuaPlcConnection.java
@@ -1,95 +1,95 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-*/
-package org.apache.plc4x.java.opcua.connection;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
-import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.base.connection.AbstractPlcConnection;
-import org.apache.plc4x.java.base.messages.*;
-import org.apache.plc4x.java.opcua.protocol.OpcuaPlcFieldHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author Matthias Milan Stlrljic
- * Created by Matthias Milan Stlrljic on 10.05.2019
- */
-public abstract class BaseOpcuaPlcConnection extends AbstractPlcConnection implements PlcReader, PlcWriter, PlcSubscriber {
-
-    private static final Logger logger = LoggerFactory.getLogger(BaseOpcuaPlcConnection.class);
-
-    BaseOpcuaPlcConnection(String params) {
-
-        if (!StringUtils.isEmpty(params)) {
-            for (String param : params.split("&")) {
-                String[] paramElements = param.split("=");
-                String paramName = paramElements[0];
-                if (paramElements.length == 2) {
-                    String paramValue = paramElements[1];
-                    switch (paramName) {
-                        default:
-                            logger.debug("Unknown parameter {} with value {}", paramName, paramValue);
-                    }
-                } else {
-                    logger.debug("Unknown no-value parameter {}", paramName);
-                }
-            }
-        }
-    }
-
-    @Override
-    public boolean canRead() {
-        return true;
-    }
-
-    @Override
-    public boolean canWrite() {
-        return true;
-    }
-
-    @Override
-    public PlcReadRequest.Builder readRequestBuilder() {
-        return new DefaultPlcReadRequest.Builder(this, new OpcuaPlcFieldHandler());
-    }
-
-    @Override
-    public PlcWriteRequest.Builder writeRequestBuilder() {
-        return new DefaultPlcWriteRequest.Builder(this, new OpcuaPlcFieldHandler());
-    }
-
-    @Override
-    public boolean canSubscribe() {
-        return true;
-    }
-
-    @Override
-    public PlcSubscriptionRequest.Builder subscriptionRequestBuilder() {
-        return new DefaultPlcSubscriptionRequest.Builder(this, new OpcuaPlcFieldHandler());
-    }
-
-    @Override
-    public PlcUnsubscriptionRequest.Builder unsubscriptionRequestBuilder() {
-        return new DefaultPlcUnsubscriptionRequest.Builder(this);
-    }
-
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+package org.apache.plc4x.java.opcua.connection;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.base.connection.AbstractPlcConnection;
+import org.apache.plc4x.java.base.messages.*;
+import org.apache.plc4x.java.opcua.protocol.OpcuaPlcFieldHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author Matthias Milan Stlrljic
+ * Created by Matthias Milan Stlrljic on 10.05.2019
+ */
+public abstract class BaseOpcuaPlcConnection extends AbstractPlcConnection implements PlcReader, PlcWriter, PlcSubscriber {
+
+    private static final Logger logger = LoggerFactory.getLogger(BaseOpcuaPlcConnection.class);
+
+    BaseOpcuaPlcConnection(String params) {
+
+        if (!StringUtils.isEmpty(params)) {
+            for (String param : params.split("&")) {
+                String[] paramElements = param.split("=");
+                String paramName = paramElements[0];
+                if (paramElements.length == 2) {
+                    String paramValue = paramElements[1];
+                    switch (paramName) {
+                        default:
+                            logger.debug("Unknown parameter {} with value {}", paramName, paramValue);
+                    }
+                } else {
+                    logger.debug("Unknown no-value parameter {}", paramName);
+                }
+            }
+        }
+    }
+
+    @Override
+    public boolean canRead() {
+        return true;
+    }
+
+    @Override
+    public boolean canWrite() {
+        return true;
+    }
+
+    @Override
+    public PlcReadRequest.Builder readRequestBuilder() {
+        return new DefaultPlcReadRequest.Builder(this, new OpcuaPlcFieldHandler());
+    }
+
+    @Override
+    public PlcWriteRequest.Builder writeRequestBuilder() {
+        return new DefaultPlcWriteRequest.Builder(this, new OpcuaPlcFieldHandler());
+    }
+
+    @Override
+    public boolean canSubscribe() {
+        return true;
+    }
+
+    @Override
+    public PlcSubscriptionRequest.Builder subscriptionRequestBuilder() {
+        return new DefaultPlcSubscriptionRequest.Builder(this, new OpcuaPlcFieldHandler());
+    }
+
+    @Override
+    public PlcUnsubscriptionRequest.Builder unsubscriptionRequestBuilder() {
+        return new DefaultPlcUnsubscriptionRequest.Builder(this);
+    }
+
+
+}
diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaConnectionFactory.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaConnectionFactory.java
index 5c399f30843..c2c20e4f9e2 100644
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaConnectionFactory.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaConnectionFactory.java
@@ -1,39 +1,39 @@
-/*
- 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
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-*/
-package org.apache.plc4x.java.opcua.connection;
-
-import java.net.InetAddress;
-import java.util.Objects;
-/**
- * @author Matthias Milan Stlrljic
- * Created by Matthias Milan Stlrljic on 10.05.2019
- */
-public class OpcuaConnectionFactory {
-
-    public OpcuaTcpPlcConnection opcuaTcpPlcConnectionOf(InetAddress address, Integer port, String params, int requestTimeout) {
-        Objects.requireNonNull(address);
-
-        if (port == null) {
-            return OpcuaTcpPlcConnection.of(address, params, requestTimeout);
-        } else {
-            return OpcuaTcpPlcConnection.of(address, port, params, requestTimeout);
-        }
-    }
-
-}
+/*
+ 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
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+package org.apache.plc4x.java.opcua.connection;
+
+import java.net.InetAddress;
+import java.util.Objects;
+/**
+ * @author Matthias Milan Stlrljic
+ * Created by Matthias Milan Stlrljic on 10.05.2019
+ */
+public class OpcuaConnectionFactory {
+
+    public OpcuaTcpPlcConnection opcuaTcpPlcConnectionOf(InetAddress address, Integer port, String params, int requestTimeout) {
+        Objects.requireNonNull(address);
+
+        if (port == null) {
+            return OpcuaTcpPlcConnection.of(address, params, requestTimeout);
+        } else {
+            return OpcuaTcpPlcConnection.of(address, port, params, requestTimeout);
+        }
+    }
+
+}
diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnection.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnection.java
index a14dfa8c42b..4a5b7abdc01 100644
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnection.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnection.java
@@ -1,464 +1,464 @@
-/*
- 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
-
-     http://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.
- * @author Matthias Milan Stlrljic
- * Created by Matthias Milan Stlrljic on 10.05.2019
- */
-package org.apache.plc4x.java.opcua.connection;
-
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.messages.*;
-import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.messages.*;
-import org.apache.plc4x.java.base.messages.items.*;
-import org.apache.plc4x.java.base.model.SubscriptionPlcField;
-import org.apache.plc4x.java.opcua.protocol.OpcuaField;
-import org.apache.plc4x.java.opcua.protocol.OpcuaSubsriptionHandle;
-import org.eclipse.milo.opcua.sdk.client.OpcUaClient;
-import org.eclipse.milo.opcua.sdk.client.api.config.OpcUaClientConfig;
-import org.eclipse.milo.opcua.sdk.client.api.identity.AnonymousProvider;
-import org.eclipse.milo.opcua.sdk.client.api.identity.IdentityProvider;
-import org.eclipse.milo.opcua.sdk.client.api.subscriptions.UaMonitoredItem;
-import org.eclipse.milo.opcua.sdk.client.api.subscriptions.UaSubscription;
-import org.eclipse.milo.opcua.stack.client.DiscoveryClient;
-import org.eclipse.milo.opcua.stack.core.AttributeId;
-import org.eclipse.milo.opcua.stack.core.Identifiers;
-import org.eclipse.milo.opcua.stack.core.UaException;
-import org.eclipse.milo.opcua.stack.core.security.SecurityPolicy;
-import org.eclipse.milo.opcua.stack.core.types.builtin.*;
-import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger;
-import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UShort;
-import org.eclipse.milo.opcua.stack.core.types.enumerated.MonitoringMode;
-import org.eclipse.milo.opcua.stack.core.types.enumerated.TimestampsToReturn;
-import org.eclipse.milo.opcua.stack.core.types.structured.EndpointDescription;
-import org.eclipse.milo.opcua.stack.core.types.structured.MonitoredItemCreateRequest;
-import org.eclipse.milo.opcua.stack.core.types.structured.MonitoringParameters;
-import org.eclipse.milo.opcua.stack.core.types.structured.ReadValueId;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.math.BigInteger;
-import java.net.InetAddress;
-import java.time.Duration;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.uint;
-
-public class OpcuaTcpPlcConnection extends BaseOpcuaPlcConnection {
-
-    private static final int OPCUA_DEFAULT_TCP_PORT = 4840;
-
-    private static final Logger logger = LoggerFactory.getLogger(OpcuaTcpPlcConnection.class);
-    private InetAddress address;
-    private int requestTimeout = 5000;
-    private int port;
-    private String params;
-    private OpcUaClient client;
-    private boolean isConnected = false;
-    private  final AtomicLong clientHandles = new AtomicLong(1L);
-
-    private OpcuaTcpPlcConnection(InetAddress address, String params, int requestTimeout) {
-        this( address, OPCUA_DEFAULT_TCP_PORT,  params, requestTimeout);
-        logger.info("Configured OpcuaTcpPlcConnection with: host-name {}", address.getHostAddress());
-    }
-
-    public OpcuaTcpPlcConnection(InetAddress address, int port, String params, int requestTimeout) {
-        this(params);
-        logger.info("Configured OpcuaTcpPlcConnection with: host-name {}", address.getHostAddress());
-        this.address = address;
-        this.port = port;
-        this.params = params;
-        this.requestTimeout = requestTimeout;
-    }
-
-    public OpcuaTcpPlcConnection(String params) {
-        super(params);
-    }
-
-    public static OpcuaTcpPlcConnection of(InetAddress address, String params, int requestTimeout) {
-        return new OpcuaTcpPlcConnection(address, params, requestTimeout);
-    }
-
-    public static OpcuaTcpPlcConnection of(InetAddress address, int port, String params, int requestTimeout) {
-        return new OpcuaTcpPlcConnection(address, port, params, requestTimeout);
-    }
-
-    public static BaseDefaultFieldItem encodeFieldItem(DataValue value){
-        NodeId typeNode = value.getValue().getDataType().get();
-        Object objValue = value.getValue().getValue();
-
-        if(typeNode.equals(Identifiers.Boolean)){
-            return new DefaultBooleanFieldItem((Boolean)objValue);
-        }else if (typeNode.equals(Identifiers.ByteString)){
-            byte[] array = ((ByteString)objValue).bytes();
-            Byte[] byteArry = new Byte[array.length];
-            int counter = 0;
-            for (byte bytie: array
-            ) {
-                byteArry[counter] = bytie;
-                counter++;
-            }
-            return new DefaultByteArrayFieldItem(byteArry);
-        }else if (typeNode.equals(Identifiers.Integer)){
-            return new DefaultIntegerFieldItem((Integer)objValue);
-        }else if (typeNode.equals(Identifiers.Int16)){
-            return new DefaultShortFieldItem((Short)objValue);
-        }else if (typeNode.equals(Identifiers.Int32)){
-            return new DefaultIntegerFieldItem((Integer)objValue);
-        }else if (typeNode.equals(Identifiers.Int64)){
-            return new DefaultLongFieldItem((Long)objValue);
-        }else if (typeNode.equals(Identifiers.UInteger)){
-            return new DefaultLongFieldItem((Long)objValue);
-        }else if (typeNode.equals(Identifiers.UInt16)){
-            return new DefaultIntegerFieldItem(((UShort)objValue).intValue());
-        }else if (typeNode.equals(Identifiers.UInt32)){
-            return new DefaultLongFieldItem(((UInteger)objValue).longValue());
-        }else if (typeNode.equals(Identifiers.UInt64)){
-            return new DefaultBigIntegerFieldItem(new BigInteger(objValue.toString()));
-        }else if (typeNode.equals(Identifiers.Byte)){
-            return new DefaultShortFieldItem(Short.valueOf(objValue.toString()));
-        }else if (typeNode.equals(Identifiers.Float)){
-            return new DefaultFloatFieldItem((Float)objValue);
-        }else if (typeNode.equals(Identifiers.Double)){
-            return new DefaultDoubleFieldItem((Double)objValue);
-        }else if (typeNode.equals(Identifiers.SByte)){
-            return new DefaultByteFieldItem((Byte)objValue);
-        }else {
-            return new DefaultStringFieldItem(objValue.toString());
-        }
-
-    }
-
-    public InetAddress getRemoteAddress() {
-        return address;
-    }
-
-    @Override
-    public void connect() throws PlcConnectionException {
-        List<EndpointDescription> endpoints =  null;
-
-        try {
-            endpoints = DiscoveryClient.getEndpoints(getEndpointUrl(address, port, params)).get();
-        //TODO Exception should be handeled better when the Discovery-API of Milo is stable
-        } catch (Exception ex) {
-            // try the explicit discovery endpoint as well
-            String discoveryUrl = getEndpointUrl(address, port, params);
-
-            if (!discoveryUrl.endsWith("/")) {
-                discoveryUrl += "/";
-            }
-            discoveryUrl += "discovery";
-
-            logger.info("Trying explicit discovery URL: {}", discoveryUrl);
-            try {
-                endpoints = DiscoveryClient.getEndpoints(discoveryUrl).get();
-            } catch (InterruptedException | ExecutionException e) {
-                throw new PlcConnectionException("Unable to discover URL:" + discoveryUrl);
-            }
-        }
-
-        EndpointDescription endpoint = endpoints.stream()
-                .filter(e -> e.getSecurityPolicyUri().equals(getSecurityPolicy().getUri()))
-                .filter(endpointFilter())
-                .findFirst()
-                .orElseThrow(() -> new PlcConnectionException("No desired endpoints from"));
-
-        OpcUaClientConfig config = OpcUaClientConfig.builder()
-            .setApplicationName(LocalizedText.english("eclipse milo opc-ua client of the apache PLC4X:PLC4J project"))
-            .setApplicationUri("urn:eclipse:milo:plc4x:client")
-            .setEndpoint(endpoint)
-            .setIdentityProvider(getIdentityProvider())
-            .setRequestTimeout(UInteger.valueOf(requestTimeout))
-            .build();
-
-        try {
-            this.client =  OpcUaClient.create(config);
-            this.client.connect().get();
-            isConnected = true;
-        } catch (UaException e) {
-            isConnected = false;
-            String message = (config == null) ? "NULL" : config.toString();
-            throw  new PlcConnectionException("The given input values are a not valid OPC UA connection configuration [CONFIG]: " + message);
-        } catch (InterruptedException | ExecutionException e) {
-            isConnected = false;
-            throw  new PlcConnectionException("Error while creation of the connection because of : " + e.getMessage());
-        }
-    }
-
-    @Override
-    public boolean isConnected() {
-        return client != null && isConnected;
-    }
-
-    @Override
-    public void close() throws Exception {
-        if(client != null){
-            client.disconnect().get();
-            isConnected = false;
-        }
-    }
-
-    @Override
-    public CompletableFuture<PlcSubscriptionResponse> subscribe(PlcSubscriptionRequest subscriptionRequest) {
-        InternalPlcSubscriptionRequest internalPlcSubscriptionRequest = checkInternal(subscriptionRequest, InternalPlcSubscriptionRequest.class);
-        CompletableFuture<PlcSubscriptionResponse> future = CompletableFuture.supplyAsync(() ->{
-            Map<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> responseItems = internalPlcSubscriptionRequest.getSubscriptionPlcFieldMap().entrySet().stream()
-            .map(subscriptionPlcFieldEntry -> {
-                final String plcFieldName = subscriptionPlcFieldEntry.getKey();
-                final SubscriptionPlcField subscriptionPlcField = subscriptionPlcFieldEntry.getValue();
-                final OpcuaField field = (OpcuaField)Objects.requireNonNull(subscriptionPlcField.getPlcField());
-                long cycleTime = subscriptionPlcField.getDuration().orElse(Duration.ofSeconds(1)).toMillis();
-                NodeId idNode = generateNodeId(field);
-                ReadValueId readValueId = new ReadValueId(
-                    idNode,
-                    AttributeId.Value.uid(), null, QualifiedName.NULL_VALUE);
-                UInteger clientHandle = uint(clientHandles.getAndIncrement());
-
-                MonitoringParameters parameters = new MonitoringParameters(
-                    clientHandle,
-                    (double) cycleTime,     // sampling interval
-                    null,       // filter, null means use default
-                    uint(1),   // queue size
-                    true        // discard oldest
-                );
-                MonitoringMode monitoringMode;
-                switch (subscriptionPlcField.getPlcSubscriptionType()) {
-                    case CYCLIC:
-                        monitoringMode = MonitoringMode.Sampling;
-                        break;
-                    case CHANGE_OF_STATE:
-                        monitoringMode = MonitoringMode.Reporting;
-                        break;
-                    case EVENT:
-                        monitoringMode = MonitoringMode.Reporting;
-                        break;
-                    default: monitoringMode = MonitoringMode.Reporting;
-                }
-
-                PlcSubscriptionHandle subHandle = null;
-                PlcResponseCode responseCode = PlcResponseCode.ACCESS_DENIED;
-                try {
-                    UaSubscription subscription = client.getSubscriptionManager().createSubscription(1000.0).get();
-
-                    MonitoredItemCreateRequest request = new MonitoredItemCreateRequest(
-                        readValueId, monitoringMode, parameters);
-                    List<MonitoredItemCreateRequest> requestList = new LinkedList<>();
-                    requestList.add(request);
-                    OpcuaSubsriptionHandle subsriptionHandle = new OpcuaSubsriptionHandle(plcFieldName, clientHandle);
-                    BiConsumer<UaMonitoredItem, Integer> onItemCreated =
-                        (item, id) -> item.setValueConsumer(subsriptionHandle::onSubscriptionValue);
-
-                    List<UaMonitoredItem> items = subscription.createMonitoredItems(
-                        TimestampsToReturn.Both,
-                        requestList,
-                        onItemCreated
-                    ).get();
-
-                    subHandle = subsriptionHandle;
-                    responseCode = PlcResponseCode.OK;
-                } catch (InterruptedException | ExecutionException e) {
-                    logger.warn("Unable to subscribe Elements because of: {}", e.getMessage());
-                }
-
-
-                return Pair.of(plcFieldName, Pair.of(responseCode, subHandle));
-            })
-            .collect(Collectors.toMap(Pair::getKey, Pair::getValue));
-            return (PlcSubscriptionResponse) new DefaultPlcSubscriptionResponse(internalPlcSubscriptionRequest, responseItems);
-        });
-
-        return future;
-    }
-
-    @Override
-    public CompletableFuture<PlcUnsubscriptionResponse> unsubscribe(PlcUnsubscriptionRequest unsubscriptionRequest) {
-        InternalPlcUnsubscriptionRequest internalPlcUnsubscriptionRequest = checkInternal(unsubscriptionRequest, InternalPlcUnsubscriptionRequest.class);
-        internalPlcUnsubscriptionRequest.getInternalPlcSubscriptionHandles().forEach(o -> {
-            OpcuaSubsriptionHandle opcSubHandle = (OpcuaSubsriptionHandle) o;
-            try {
-                client.getSubscriptionManager().deleteSubscription(opcSubHandle.getClientHandle()).get();
-            } catch (InterruptedException | ExecutionException e) {
-                logger.warn("Unable to unsubscribe Elements because of: {}", e.getMessage());
-            }
-        });
-
-        return null;
-    }
-
-    @Override
-    public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer, Collection<PlcSubscriptionHandle> handles) {
-        List<PlcConsumerRegistration> unregisters = new LinkedList<>();
-        handles.forEach(plcSubscriptionHandle -> unregisters.add(plcSubscriptionHandle.register(consumer)));
-
-        return () -> unregisters.forEach(PlcConsumerRegistration::unregister);
-    }
-
-    @Override
-    public void unregister(PlcConsumerRegistration registration) {
-        registration.unregister();
-    }
-
-    @Override
-    public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
-        CompletableFuture<PlcReadResponse> future = CompletableFuture.supplyAsync(() -> {
-            readRequest.getFields();
-            Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> fields = new HashMap<>();
-            List<NodeId> readValueIds = new LinkedList<>();
-            List<PlcField> readPLCValues = readRequest.getFields();
-            for (PlcField field: readPLCValues) {
-                NodeId idNode = generateNodeId((OpcuaField) field);
-                readValueIds.add(idNode);
-            }
-
-            CompletableFuture<List<DataValue>> dataValueCompletableFuture = client.readValues(0.0, TimestampsToReturn.Both, readValueIds);
-            List<DataValue> readValues = null;
-            try {
-                readValues = dataValueCompletableFuture.get();
-            } catch (InterruptedException | ExecutionException e) {
-                logger.warn("Unable to read Elements because of: {}", e.getMessage());
-            }
-            for(int counter = 0; counter < readValueIds.size(); counter++){
-                PlcResponseCode resultCode = PlcResponseCode.OK;
-                BaseDefaultFieldItem stringItem = null;
-                if(readValues == null || readValues.size() <= counter || !readValues.get(counter).getStatusCode().isGood()){
-                    resultCode = PlcResponseCode.NOT_FOUND;
-                }else{
-                    stringItem = encodeFieldItem(readValues.get(counter));
-
-                }
-                Pair<PlcResponseCode, BaseDefaultFieldItem> newPair = new ImmutablePair<>(resultCode, stringItem);
-                fields.put((String) readRequest.getFieldNames().toArray()[counter], newPair);
-
-
-            }
-            InternalPlcReadRequest internalPlcReadRequest = checkInternal(readRequest, InternalPlcReadRequest.class);
-            return (PlcReadResponse) new DefaultPlcReadResponse(internalPlcReadRequest, fields );
-        });
-
-
-        return future;
-    }
-
-
-    @Override
-    public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
-        CompletableFuture<PlcWriteResponse> future;
-        future = CompletableFuture.supplyAsync(() -> {
-
-            InternalPlcWriteRequest internalPlcWriteRequest = (InternalPlcWriteRequest) writeRequest;
-
-            List<PlcField> writePLCValues = writeRequest.getFields();
-            LinkedList<DataValue> values = new LinkedList<>();
-            LinkedList<NodeId> ids = new LinkedList<>();
-            LinkedList<String> names = new LinkedList<>();
-            Map<String, PlcResponseCode> fieldResponse = new HashMap<>();
-            for (String fieldName: writeRequest.getFieldNames()) {
-                OpcuaField uaField = (OpcuaField) writeRequest.getField(fieldName);
-                NodeId idNode = generateNodeId(uaField);
-                Variant var = new Variant(internalPlcWriteRequest.getFieldItem(fieldName).getObject(0));
-                DataValue value = new DataValue(var, null, null);
-                ids.add(idNode);
-                names.add(fieldName);
-                values.add(value);
-            }
-            CompletableFuture<List<StatusCode>> opcRequest =
-                client.writeValues(ids, values);
-            List<StatusCode> statusCodes = null;
-            try {
-                statusCodes = opcRequest.get();
-            } catch (InterruptedException | ExecutionException e) {
-                statusCodes = new LinkedList<>();
-                for(int counter = 0; counter < ids.size(); counter++){
-                    ((LinkedList<StatusCode>) statusCodes).push(StatusCode.BAD);
-                }
-            }
-
-            for(int counter = 0; counter < names.size(); counter++){
-                PlcResponseCode resultCode;
-                if(statusCodes != null && statusCodes.size() > counter){
-                    if(statusCodes.get(counter).isGood()){
-                        resultCode = PlcResponseCode.OK;
-                    }else if(statusCodes.get(counter).isUncertain()){
-                        resultCode = PlcResponseCode.NOT_FOUND;
-                    }else {
-                        resultCode = PlcResponseCode.ACCESS_DENIED;
-                    }
-                }else{
-                    resultCode = PlcResponseCode.ACCESS_DENIED;
-                }
-                fieldResponse.put(names.get(counter), resultCode);
-            }
-            InternalPlcWriteRequest internalPlcReadRequest = checkInternal(writeRequest, InternalPlcWriteRequest.class);
-            PlcWriteResponse response = new DefaultPlcWriteResponse(internalPlcReadRequest, fieldResponse);
-            return response;
-        });
-
-
-        return future;
-    }
-
-
-    private NodeId generateNodeId(OpcuaField uaField){
-        NodeId idNode = null;
-        switch (uaField.getIdentifierType()) {
-            case STRING_IDENTIFIER:
-                idNode = new NodeId(uaField.getNamespace(), uaField.getIdentifier());
-                break;
-            case NUMBER_IDENTIFIER:
-                idNode = new NodeId(uaField.getNamespace(), UInteger.valueOf(uaField.getIdentifier()));
-                break;
-            case GUID_IDENTIFIER:
-                idNode = new NodeId(uaField.getNamespace(), UUID.fromString(uaField.getIdentifier()));
-                break;
-            case BINARY_IDENTIFIER:
-                idNode = new NodeId(uaField.getNamespace(), new ByteString(uaField.getIdentifier().getBytes()));
-                break;
-
-            default: idNode = new NodeId(uaField.getNamespace(), uaField.getIdentifier());
-        }
-
-        return  idNode;
-    }
-
-    private String getEndpointUrl(InetAddress address, Integer port, String params) {
-        return "opc.tcp://" + address.getHostAddress() +":" + port + "/" + params;
-    }
-
-    private Predicate<EndpointDescription> endpointFilter() {
-        return e -> true;
-    }
-
-    private SecurityPolicy getSecurityPolicy() {
-        return SecurityPolicy.None;
-    }
-
-    private IdentityProvider getIdentityProvider() {
-        return new AnonymousProvider();
-    }
-}
+/*
+ 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
+
+     http://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.
+ * @author Matthias Milan Stlrljic
+ * Created by Matthias Milan Stlrljic on 10.05.2019
+ */
+package org.apache.plc4x.java.opcua.connection;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.messages.*;
+import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.messages.*;
+import org.apache.plc4x.java.base.messages.items.*;
+import org.apache.plc4x.java.base.model.SubscriptionPlcField;
+import org.apache.plc4x.java.opcua.protocol.OpcuaField;
+import org.apache.plc4x.java.opcua.protocol.OpcuaSubsriptionHandle;
+import org.eclipse.milo.opcua.sdk.client.OpcUaClient;
+import org.eclipse.milo.opcua.sdk.client.api.config.OpcUaClientConfig;
+import org.eclipse.milo.opcua.sdk.client.api.identity.AnonymousProvider;
+import org.eclipse.milo.opcua.sdk.client.api.identity.IdentityProvider;
+import org.eclipse.milo.opcua.sdk.client.api.subscriptions.UaMonitoredItem;
+import org.eclipse.milo.opcua.sdk.client.api.subscriptions.UaSubscription;
+import org.eclipse.milo.opcua.stack.client.DiscoveryClient;
+import org.eclipse.milo.opcua.stack.core.AttributeId;
+import org.eclipse.milo.opcua.stack.core.Identifiers;
+import org.eclipse.milo.opcua.stack.core.UaException;
+import org.eclipse.milo.opcua.stack.core.security.SecurityPolicy;
+import org.eclipse.milo.opcua.stack.core.types.builtin.*;
+import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger;
+import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UShort;
+import org.eclipse.milo.opcua.stack.core.types.enumerated.MonitoringMode;
+import org.eclipse.milo.opcua.stack.core.types.enumerated.TimestampsToReturn;
+import org.eclipse.milo.opcua.stack.core.types.structured.EndpointDescription;
+import org.eclipse.milo.opcua.stack.core.types.structured.MonitoredItemCreateRequest;
+import org.eclipse.milo.opcua.stack.core.types.structured.MonitoringParameters;
+import org.eclipse.milo.opcua.stack.core.types.structured.ReadValueId;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.math.BigInteger;
+import java.net.InetAddress;
+import java.time.Duration;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.uint;
+
+public class OpcuaTcpPlcConnection extends BaseOpcuaPlcConnection {
+
+    private static final int OPCUA_DEFAULT_TCP_PORT = 4840;
+
+    private static final Logger logger = LoggerFactory.getLogger(OpcuaTcpPlcConnection.class);
+    private InetAddress address;
+    private int requestTimeout = 5000;
+    private int port;
+    private String params;
+    private OpcUaClient client;
+    private boolean isConnected = false;
+    private  final AtomicLong clientHandles = new AtomicLong(1L);
+
+    private OpcuaTcpPlcConnection(InetAddress address, String params, int requestTimeout) {
+        this( address, OPCUA_DEFAULT_TCP_PORT,  params, requestTimeout);
+        logger.info("Configured OpcuaTcpPlcConnection with: host-name {}", address.getHostAddress());
+    }
+
+    public OpcuaTcpPlcConnection(InetAddress address, int port, String params, int requestTimeout) {
+        this(params);
+        logger.info("Configured OpcuaTcpPlcConnection with: host-name {}", address.getHostAddress());
+        this.address = address;
+        this.port = port;
+        this.params = params;
+        this.requestTimeout = requestTimeout;
+    }
+
+    public OpcuaTcpPlcConnection(String params) {
+        super(params);
+    }
+
+    public static OpcuaTcpPlcConnection of(InetAddress address, String params, int requestTimeout) {
+        return new OpcuaTcpPlcConnection(address, params, requestTimeout);
+    }
+
+    public static OpcuaTcpPlcConnection of(InetAddress address, int port, String params, int requestTimeout) {
+        return new OpcuaTcpPlcConnection(address, port, params, requestTimeout);
+    }
+
+    public static BaseDefaultFieldItem encodeFieldItem(DataValue value){
+        NodeId typeNode = value.getValue().getDataType().get();
+        Object objValue = value.getValue().getValue();
+
+        if(typeNode.equals(Identifiers.Boolean)){
+            return new DefaultBooleanFieldItem((Boolean)objValue);
+        }else if (typeNode.equals(Identifiers.ByteString)){
+            byte[] array = ((ByteString)objValue).bytes();
+            Byte[] byteArry = new Byte[array.length];
+            int counter = 0;
+            for (byte bytie: array
+            ) {
+                byteArry[counter] = bytie;
+                counter++;
+            }
+            return new DefaultByteArrayFieldItem(byteArry);
+        }else if (typeNode.equals(Identifiers.Integer)){
+            return new DefaultIntegerFieldItem((Integer)objValue);
+        }else if (typeNode.equals(Identifiers.Int16)){
+            return new DefaultShortFieldItem((Short)objValue);
+        }else if (typeNode.equals(Identifiers.Int32)){
+            return new DefaultIntegerFieldItem((Integer)objValue);
+        }else if (typeNode.equals(Identifiers.Int64)){
+            return new DefaultLongFieldItem((Long)objValue);
+        }else if (typeNode.equals(Identifiers.UInteger)){
+            return new DefaultLongFieldItem((Long)objValue);
+        }else if (typeNode.equals(Identifiers.UInt16)){
+            return new DefaultIntegerFieldItem(((UShort)objValue).intValue());
+        }else if (typeNode.equals(Identifiers.UInt32)){
+            return new DefaultLongFieldItem(((UInteger)objValue).longValue());
+        }else if (typeNode.equals(Identifiers.UInt64)){
+            return new DefaultBigIntegerFieldItem(new BigInteger(objValue.toString()));
+        }else if (typeNode.equals(Identifiers.Byte)){
+            return new DefaultShortFieldItem(Short.valueOf(objValue.toString()));
+        }else if (typeNode.equals(Identifiers.Float)){
+            return new DefaultFloatFieldItem((Float)objValue);
+        }else if (typeNode.equals(Identifiers.Double)){
+            return new DefaultDoubleFieldItem((Double)objValue);
+        }else if (typeNode.equals(Identifiers.SByte)){
+            return new DefaultByteFieldItem((Byte)objValue);
+        }else {
+            return new DefaultStringFieldItem(objValue.toString());
+        }
+
+    }
+
+    public InetAddress getRemoteAddress() {
+        return address;
+    }
+
+    @Override
+    public void connect() throws PlcConnectionException {
+        List<EndpointDescription> endpoints =  null;
+
+        try {
+            endpoints = DiscoveryClient.getEndpoints(getEndpointUrl(address, port, params)).get();
+        //TODO Exception should be handeled better when the Discovery-API of Milo is stable
+        } catch (Exception ex) {
+            // try the explicit discovery endpoint as well
+            String discoveryUrl = getEndpointUrl(address, port, params);
+
+            if (!discoveryUrl.endsWith("/")) {
+                discoveryUrl += "/";
+            }
+            discoveryUrl += "discovery";
+
+            logger.info("Trying explicit discovery URL: {}", discoveryUrl);
+            try {
+                endpoints = DiscoveryClient.getEndpoints(discoveryUrl).get();
+            } catch (InterruptedException | ExecutionException e) {
+                throw new PlcConnectionException("Unable to discover URL:" + discoveryUrl);
+            }
+        }
+
+        EndpointDescription endpoint = endpoints.stream()
+                .filter(e -> e.getSecurityPolicyUri().equals(getSecurityPolicy().getUri()))
+                .filter(endpointFilter())
+                .findFirst()
+                .orElseThrow(() -> new PlcConnectionException("No desired endpoints from"));
+
+        OpcUaClientConfig config = OpcUaClientConfig.builder()
+            .setApplicationName(LocalizedText.english("eclipse milo opc-ua client of the apache PLC4X:PLC4J project"))
+            .setApplicationUri("urn:eclipse:milo:plc4x:client")
+            .setEndpoint(endpoint)
+            .setIdentityProvider(getIdentityProvider())
+            .setRequestTimeout(UInteger.valueOf(requestTimeout))
+            .build();
+
+        try {
+            this.client =  OpcUaClient.create(config);
+            this.client.connect().get();
+            isConnected = true;
+        } catch (UaException e) {
+            isConnected = false;
+            String message = (config == null) ? "NULL" : config.toString();
+            throw  new PlcConnectionException("The given input values are a not valid OPC UA connection configuration [CONFIG]: " + message);
+        } catch (InterruptedException | ExecutionException e) {
+            isConnected = false;
+            throw  new PlcConnectionException("Error while creation of the connection because of : " + e.getMessage());
+        }
+    }
+
+    @Override
+    public boolean isConnected() {
+        return client != null && isConnected;
+    }
+
+    @Override
+    public void close() throws Exception {
+        if(client != null){
+            client.disconnect().get();
+            isConnected = false;
+        }
+    }
+
+    @Override
+    public CompletableFuture<PlcSubscriptionResponse> subscribe(PlcSubscriptionRequest subscriptionRequest) {
+        InternalPlcSubscriptionRequest internalPlcSubscriptionRequest = checkInternal(subscriptionRequest, InternalPlcSubscriptionRequest.class);
+        CompletableFuture<PlcSubscriptionResponse> future = CompletableFuture.supplyAsync(() ->{
+            Map<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> responseItems = internalPlcSubscriptionRequest.getSubscriptionPlcFieldMap().entrySet().stream()
+            .map(subscriptionPlcFieldEntry -> {
+                final String plcFieldName = subscriptionPlcFieldEntry.getKey();
+                final SubscriptionPlcField subscriptionPlcField = subscriptionPlcFieldEntry.getValue();
+                final OpcuaField field = (OpcuaField)Objects.requireNonNull(subscriptionPlcField.getPlcField());
+                long cycleTime = subscriptionPlcField.getDuration().orElse(Duration.ofSeconds(1)).toMillis();
+                NodeId idNode = generateNodeId(field);
+                ReadValueId readValueId = new ReadValueId(
+                    idNode,
+                    AttributeId.Value.uid(), null, QualifiedName.NULL_VALUE);
+                UInteger clientHandle = uint(clientHandles.getAndIncrement());
+
+                MonitoringParameters parameters = new MonitoringParameters(
+                    clientHandle,
+                    (double) cycleTime,     // sampling interval
+                    null,       // filter, null means use default
+                    uint(1),   // queue size
+                    true        // discard oldest
+                );
+                MonitoringMode monitoringMode;
+                switch (subscriptionPlcField.getPlcSubscriptionType()) {
+                    case CYCLIC:
+                        monitoringMode = MonitoringMode.Sampling;
+                        break;
+                    case CHANGE_OF_STATE:
+                        monitoringMode = MonitoringMode.Reporting;
+                        break;
+                    case EVENT:
+                        monitoringMode = MonitoringMode.Reporting;
+                        break;
+                    default: monitoringMode = MonitoringMode.Reporting;
+                }
+
+                PlcSubscriptionHandle subHandle = null;
+                PlcResponseCode responseCode = PlcResponseCode.ACCESS_DENIED;
+                try {
+                    UaSubscription subscription = client.getSubscriptionManager().createSubscription(1000.0).get();
+
+                    MonitoredItemCreateRequest request = new MonitoredItemCreateRequest(
+                        readValueId, monitoringMode, parameters);
+                    List<MonitoredItemCreateRequest> requestList = new LinkedList<>();
+                    requestList.add(request);
+                    OpcuaSubsriptionHandle subsriptionHandle = new OpcuaSubsriptionHandle(plcFieldName, clientHandle);
+                    BiConsumer<UaMonitoredItem, Integer> onItemCreated =
+                        (item, id) -> item.setValueConsumer(subsriptionHandle::onSubscriptionValue);
+
+                    List<UaMonitoredItem> items = subscription.createMonitoredItems(
+                        TimestampsToReturn.Both,
+                        requestList,
+                        onItemCreated
+                    ).get();
+
+                    subHandle = subsriptionHandle;
+                    responseCode = PlcResponseCode.OK;
+                } catch (InterruptedException | ExecutionException e) {
+                    logger.warn("Unable to subscribe Elements because of: {}", e.getMessage());
+                }
+
+
+                return Pair.of(plcFieldName, Pair.of(responseCode, subHandle));
+            })
+            .collect(Collectors.toMap(Pair::getKey, Pair::getValue));
+            return (PlcSubscriptionResponse) new DefaultPlcSubscriptionResponse(internalPlcSubscriptionRequest, responseItems);
+        });
+
+        return future;
+    }
+
+    @Override
+    public CompletableFuture<PlcUnsubscriptionResponse> unsubscribe(PlcUnsubscriptionRequest unsubscriptionRequest) {
+        InternalPlcUnsubscriptionRequest internalPlcUnsubscriptionRequest = checkInternal(unsubscriptionRequest, InternalPlcUnsubscriptionRequest.class);
+        internalPlcUnsubscriptionRequest.getInternalPlcSubscriptionHandles().forEach(o -> {
+            OpcuaSubsriptionHandle opcSubHandle = (OpcuaSubsriptionHandle) o;
+            try {
+                client.getSubscriptionManager().deleteSubscription(opcSubHandle.getClientHandle()).get();
+            } catch (InterruptedException | ExecutionException e) {
+                logger.warn("Unable to unsubscribe Elements because of: {}", e.getMessage());
+            }
+        });
+
+        return null;
+    }
+
+    @Override
+    public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer, Collection<PlcSubscriptionHandle> handles) {
+        List<PlcConsumerRegistration> unregisters = new LinkedList<>();
+        handles.forEach(plcSubscriptionHandle -> unregisters.add(plcSubscriptionHandle.register(consumer)));
+
+        return () -> unregisters.forEach(PlcConsumerRegistration::unregister);
+    }
+
+    @Override
+    public void unregister(PlcConsumerRegistration registration) {
+        registration.unregister();
+    }
+
+    @Override
+    public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
+        CompletableFuture<PlcReadResponse> future = CompletableFuture.supplyAsync(() -> {
+            readRequest.getFields();
+            Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> fields = new HashMap<>();
+            List<NodeId> readValueIds = new LinkedList<>();
+            List<PlcField> readPLCValues = readRequest.getFields();
+            for (PlcField field: readPLCValues) {
+                NodeId idNode = generateNodeId((OpcuaField) field);
+                readValueIds.add(idNode);
+            }
+
+            CompletableFuture<List<DataValue>> dataValueCompletableFuture = client.readValues(0.0, TimestampsToReturn.Both, readValueIds);
+            List<DataValue> readValues = null;
+            try {
+                readValues = dataValueCompletableFuture.get();
+            } catch (InterruptedException | ExecutionException e) {
+                logger.warn("Unable to read Elements because of: {}", e.getMessage());
+            }
+            for(int counter = 0; counter < readValueIds.size(); counter++){
+                PlcResponseCode resultCode = PlcResponseCode.OK;
+                BaseDefaultFieldItem stringItem = null;
+                if(readValues == null || readValues.size() <= counter || !readValues.get(counter).getStatusCode().isGood()){
+                    resultCode = PlcResponseCode.NOT_FOUND;
+                }else{
+                    stringItem = encodeFieldItem(readValues.get(counter));
+
+                }
+                Pair<PlcResponseCode, BaseDefaultFieldItem> newPair = new ImmutablePair<>(resultCode, stringItem);
+                fields.put((String) readRequest.getFieldNames().toArray()[counter], newPair);
+
+
+            }
+            InternalPlcReadRequest internalPlcReadRequest = checkInternal(readRequest, InternalPlcReadRequest.class);
+            return (PlcReadResponse) new DefaultPlcReadResponse(internalPlcReadRequest, fields );
+        });
+
+
+        return future;
+    }
+
+
+    @Override
+    public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
+        CompletableFuture<PlcWriteResponse> future;
+        future = CompletableFuture.supplyAsync(() -> {
+
+            InternalPlcWriteRequest internalPlcWriteRequest = (InternalPlcWriteRequest) writeRequest;
+
+            List<PlcField> writePLCValues = writeRequest.getFields();
+            LinkedList<DataValue> values = new LinkedList<>();
+            LinkedList<NodeId> ids = new LinkedList<>();
+            LinkedList<String> names = new LinkedList<>();
+            Map<String, PlcResponseCode> fieldResponse = new HashMap<>();
+            for (String fieldName: writeRequest.getFieldNames()) {
+                OpcuaField uaField = (OpcuaField) writeRequest.getField(fieldName);
+                NodeId idNode = generateNodeId(uaField);
+                Variant var = new Variant(internalPlcWriteRequest.getFieldItem(fieldName).getObject(0));
+                DataValue value = new DataValue(var, null, null);
+                ids.add(idNode);
+                names.add(fieldName);
+                values.add(value);
+            }
+            CompletableFuture<List<StatusCode>> opcRequest =
+                client.writeValues(ids, values);
+            List<StatusCode> statusCodes = null;
+            try {
+                statusCodes = opcRequest.get();
+            } catch (InterruptedException | ExecutionException e) {
+                statusCodes = new LinkedList<>();
+                for(int counter = 0; counter < ids.size(); counter++){
+                    ((LinkedList<StatusCode>) statusCodes).push(StatusCode.BAD);
+                }
+            }
+
+            for(int counter = 0; counter < names.size(); counter++){
+                PlcResponseCode resultCode;
+                if(statusCodes != null && statusCodes.size() > counter){
+                    if(statusCodes.get(counter).isGood()){
+                        resultCode = PlcResponseCode.OK;
+                    }else if(statusCodes.get(counter).isUncertain()){
+                        resultCode = PlcResponseCode.NOT_FOUND;
+                    }else {
+                        resultCode = PlcResponseCode.ACCESS_DENIED;
+                    }
+                }else{
+                    resultCode = PlcResponseCode.ACCESS_DENIED;
+                }
+                fieldResponse.put(names.get(counter), resultCode);
+            }
+            InternalPlcWriteRequest internalPlcReadRequest = checkInternal(writeRequest, InternalPlcWriteRequest.class);
+            PlcWriteResponse response = new DefaultPlcWriteResponse(internalPlcReadRequest, fieldResponse);
+            return response;
+        });
+
+
+        return future;
+    }
+
+
+    private NodeId generateNodeId(OpcuaField uaField){
+        NodeId idNode = null;
+        switch (uaField.getIdentifierType()) {
+            case STRING_IDENTIFIER:
+                idNode = new NodeId(uaField.getNamespace(), uaField.getIdentifier());
+                break;
+            case NUMBER_IDENTIFIER:
+                idNode = new NodeId(uaField.getNamespace(), UInteger.valueOf(uaField.getIdentifier()));
+                break;
+            case GUID_IDENTIFIER:
+                idNode = new NodeId(uaField.getNamespace(), UUID.fromString(uaField.getIdentifier()));
+                break;
+            case BINARY_IDENTIFIER:
+                idNode = new NodeId(uaField.getNamespace(), new ByteString(uaField.getIdentifier().getBytes()));
+                break;
+
+            default: idNode = new NodeId(uaField.getNamespace(), uaField.getIdentifier());
+        }
+
+        return  idNode;
+    }
+
+    private String getEndpointUrl(InetAddress address, Integer port, String params) {
+        return "opc.tcp://" + address.getHostAddress() +":" + port + "/" + params;
+    }
+
+    private Predicate<EndpointDescription> endpointFilter() {
+        return e -> true;
+    }
+
+    private SecurityPolicy getSecurityPolicy() {
+        return SecurityPolicy.None;
+    }
+
+    private IdentityProvider getIdentityProvider() {
+        return new AnonymousProvider();
+    }
+}
diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaField.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaField.java
index fcc2bf55229..4f2b3670712 100644
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaField.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaField.java
@@ -1,118 +1,118 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.opcua.protocol;
-
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.opcua.protocol.model.OpcuaIdentifierType;
-
-import java.util.Objects;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-/**
- * @author Matthias Milan Stlrljic
- * Created by Matthias Milan Stlrljic on 10.05.2019
- */
-public class OpcuaField implements PlcField {
-    //TODO: Add a correct regex definition of all the different sub-types of the identifiers --> requires perhaps individual type definitions
-    public static final Pattern ADDRESS_PATTERN = Pattern.compile("^ns=(?<namespace>\\d+);((?<identifierType>[isgb])=((?<identifier>[\\w.\\-/=%_]+))?)");
-
-    private final OpcuaIdentifierType identifierType;
-
-    private final int namespace;
-
-    private final String identifier;
-
-    protected OpcuaField(int namespace, OpcuaIdentifierType identifierType, String identifier) {
-        this.namespace = namespace;
-        this.identifier = identifier;
-        this.identifierType = identifierType;
-        if (this.identifier == null || this.namespace < 0) {
-            throw new IllegalArgumentException("Identifier can not be null or Namespace can not be lower then 0.");
-        }
-    }
-
-    private OpcuaField(Integer namespace, String identifier, OpcuaIdentifierType identifierType) {
-        this.identifier = Objects.requireNonNull(identifier);
-        this.identifierType = Objects.requireNonNull(identifierType);
-        this.namespace = namespace != null ? namespace : 0;
-        if (this.namespace < 0) {
-            throw new IllegalArgumentException("namespace must be greater then zero. Was " + this.namespace);
-        }
-    }
-
-    public static OpcuaField of(String address) {
-        Matcher matcher = ADDRESS_PATTERN.matcher(address);
-        if (!matcher.matches()) {
-            throw new PlcInvalidFieldException(address, ADDRESS_PATTERN, "{address}");
-        }
-        String identifier = matcher.group("identifier");
-
-        String identifierTypeString = matcher.group("identifierType");
-        OpcuaIdentifierType identifierType = OpcuaIdentifierType.fromString(identifierTypeString);
-
-        String namespaceString = matcher.group("namespace");
-        Integer namespace = namespaceString != null ? Integer.valueOf(namespaceString) : 0;
-
-        return new OpcuaField(namespace, identifier, identifierType);
-    }
-
-
-    public static boolean matches(String address) {
-        return ADDRESS_PATTERN.matcher(address).matches();
-    }
-
-    public int getNamespace() {
-        return namespace;
-    }
-
-    public String getIdentifier() {
-        return identifier;
-    }
-
-    public OpcuaIdentifierType getIdentifierType() {
-        return identifierType;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof OpcuaField)) {
-            return false;
-        }
-        OpcuaField that = (OpcuaField) o;
-        return namespace == that.namespace && identifier.equals(that.identifier) && identifierType == that.identifierType;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(namespace);
-    }
-
-    @Override
-    public String toString() {
-        return "OpcuaField{" +
-            "namespace=" + namespace +
-            "identifierType=" + identifierType.getText() +
-            "identifier=" + identifier +
-            '}';
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.opcua.protocol;
+
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.opcua.protocol.model.OpcuaIdentifierType;
+
+import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+/**
+ * @author Matthias Milan Stlrljic
+ * Created by Matthias Milan Stlrljic on 10.05.2019
+ */
+public class OpcuaField implements PlcField {
+    //TODO: Add a correct regex definition of all the different sub-types of the identifiers --> requires perhaps individual type definitions
+    public static final Pattern ADDRESS_PATTERN = Pattern.compile("^ns=(?<namespace>\\d+);((?<identifierType>[isgb])=((?<identifier>[\\w.\\-/=%_]+))?)");
+
+    private final OpcuaIdentifierType identifierType;
+
+    private final int namespace;
+
+    private final String identifier;
+
+    protected OpcuaField(int namespace, OpcuaIdentifierType identifierType, String identifier) {
+        this.namespace = namespace;
+        this.identifier = identifier;
+        this.identifierType = identifierType;
+        if (this.identifier == null || this.namespace < 0) {
+            throw new IllegalArgumentException("Identifier can not be null or Namespace can not be lower then 0.");
+        }
+    }
+
+    private OpcuaField(Integer namespace, String identifier, OpcuaIdentifierType identifierType) {
+        this.identifier = Objects.requireNonNull(identifier);
+        this.identifierType = Objects.requireNonNull(identifierType);
+        this.namespace = namespace != null ? namespace : 0;
+        if (this.namespace < 0) {
+            throw new IllegalArgumentException("namespace must be greater then zero. Was " + this.namespace);
+        }
+    }
+
+    public static OpcuaField of(String address) {
+        Matcher matcher = ADDRESS_PATTERN.matcher(address);
+        if (!matcher.matches()) {
+            throw new PlcInvalidFieldException(address, ADDRESS_PATTERN, "{address}");
+        }
+        String identifier = matcher.group("identifier");
+
+        String identifierTypeString = matcher.group("identifierType");
+        OpcuaIdentifierType identifierType = OpcuaIdentifierType.fromString(identifierTypeString);
+
+        String namespaceString = matcher.group("namespace");
+        Integer namespace = namespaceString != null ? Integer.valueOf(namespaceString) : 0;
+
+        return new OpcuaField(namespace, identifier, identifierType);
+    }
+
+
+    public static boolean matches(String address) {
+        return ADDRESS_PATTERN.matcher(address).matches();
+    }
+
+    public int getNamespace() {
+        return namespace;
+    }
+
+    public String getIdentifier() {
+        return identifier;
+    }
+
+    public OpcuaIdentifierType getIdentifierType() {
+        return identifierType;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof OpcuaField)) {
+            return false;
+        }
+        OpcuaField that = (OpcuaField) o;
+        return namespace == that.namespace && identifier.equals(that.identifier) && identifierType == that.identifierType;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(namespace);
+    }
+
+    @Override
+    public String toString() {
+        return "OpcuaField{" +
+            "namespace=" + namespace +
+            "identifierType=" + identifierType.getText() +
+            "identifier=" + identifier +
+            '}';
+    }
+}
diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaPlcFieldHandler.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaPlcFieldHandler.java
index bb44a8e9a75..8e6b75f03c1 100644
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaPlcFieldHandler.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaPlcFieldHandler.java
@@ -1,151 +1,151 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-*/
-package org.apache.plc4x.java.opcua.protocol;
-
-
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.connection.DefaultPlcFieldHandler;
-import org.apache.plc4x.java.base.messages.items.*;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-/**
- * @author Matthias Milan Stlrljic
- * Created by Matthias Milan Stlrljic on 10.05.2019
- */
-public class OpcuaPlcFieldHandler extends DefaultPlcFieldHandler {
-
-    @Override
-    public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
-        if (OpcuaField.matches(fieldQuery)) {
-            return OpcuaField.of(fieldQuery);
-        }
-        throw new PlcInvalidFieldException(fieldQuery);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeString(PlcField field, Object[] values) {
-        OpcuaField adsField = (OpcuaField) field;
-        ArrayList<String> resultSet = new ArrayList<>();
-        for(Object item : values){
-            resultSet.add(item.toString());
-        }
-        return new DefaultStringFieldItem(resultSet.toArray(new String[0]));
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeBoolean(PlcField field, Object[] values) {
-        OpcuaField adsField = (OpcuaField) field;
-        ArrayList<Boolean> resultSet = new ArrayList<>();
-        for(Object item : values){
-            resultSet.add((Boolean) item);
-        }
-        return new DefaultBooleanFieldItem(resultSet.toArray(new Boolean[0]));
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeByte(PlcField field, Object[] values) {
-        OpcuaField adsField = (OpcuaField) field;
-        ArrayList<Byte> resultSet = new ArrayList<>();
-        for(Object item : values){
-            resultSet.add((Byte) item);
-        }
-        return new DefaultByteFieldItem(resultSet.toArray(new Byte[0]));
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeShort(PlcField field, Object[] values) {
-        OpcuaField adsField = (OpcuaField) field;
-        ArrayList<Short> resultSet = new ArrayList<>();
-        for(Object item : values){
-            resultSet.add((Short) item);
-        }
-        return new DefaultShortFieldItem(resultSet.toArray(new Short[0]));
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeInteger(PlcField field, Object[] values) {
-        OpcuaField adsField = (OpcuaField) field;
-        ArrayList<Integer> resultSet = new ArrayList<>();
-        for(Object item : values){
-            resultSet.add((Integer) item);
-        }
-        return new DefaultIntegerFieldItem(resultSet.toArray(new Integer[0]));
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeBigInteger(PlcField field, Object[] values) {
-        OpcuaField adsField = (OpcuaField) field;
-        ArrayList<BigInteger> resultSet = new ArrayList<>();
-        for(Object item : values){
-            resultSet.add((BigInteger) item);
-        }
-        return new DefaultBigIntegerFieldItem(resultSet.toArray(new BigInteger[0]));
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeLong(PlcField field, Object[] values) {
-        OpcuaField adsField = (OpcuaField) field;
-        ArrayList<Long> resultSet = new ArrayList<>();
-        for(Object item : values){
-            resultSet.add((Long) item);
-        }
-        return new DefaultLongFieldItem(resultSet.toArray(new Long[0]));
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeFloat(PlcField field, Object[] values) {
-        OpcuaField adsField = (OpcuaField) field;
-        ArrayList<Float> resultSet = new ArrayList<>();
-        for(Object item : values){
-            resultSet.add((Float) item);
-        }
-        return new DefaultFloatFieldItem(resultSet.toArray(new Float[0]));
-    }
-
-
-
-    @Override
-    public BaseDefaultFieldItem encodeDouble(PlcField field, Object[] values) {
-        OpcuaField adsField = (OpcuaField) field;
-        ArrayList<Double> resultSet = new ArrayList<>();
-        for(Object item : values){
-            resultSet.add((Double) item);
-        }
-        return new DefaultDoubleFieldItem(resultSet.toArray(new Double[0]));
-    }
-
-
-    @Override
-    public BaseDefaultFieldItem encodeByteArray(PlcField field, Object[] values) {
-        OpcuaField adsField = (OpcuaField) field;
-        Byte[][] byteArray = new Byte[values.length][];
-        int innerCounter = 0;
-        for(Object item : values){
-            byte[] itemArray = (byte[]) item;
-            byteArray[innerCounter] = new Byte[((byte[]) item).length];
-            for(int counter = 0; counter < itemArray.length; counter++){
-                byteArray[innerCounter][counter] = itemArray[counter];
-            }
-            innerCounter++;
-        }
-        return new DefaultByteArrayFieldItem(byteArray);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+package org.apache.plc4x.java.opcua.protocol;
+
+
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.connection.DefaultPlcFieldHandler;
+import org.apache.plc4x.java.base.messages.items.*;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+/**
+ * @author Matthias Milan Stlrljic
+ * Created by Matthias Milan Stlrljic on 10.05.2019
+ */
+public class OpcuaPlcFieldHandler extends DefaultPlcFieldHandler {
+
+    @Override
+    public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
+        if (OpcuaField.matches(fieldQuery)) {
+            return OpcuaField.of(fieldQuery);
+        }
+        throw new PlcInvalidFieldException(fieldQuery);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeString(PlcField field, Object[] values) {
+        OpcuaField adsField = (OpcuaField) field;
+        ArrayList<String> resultSet = new ArrayList<>();
+        for(Object item : values){
+            resultSet.add(item.toString());
+        }
+        return new DefaultStringFieldItem(resultSet.toArray(new String[0]));
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeBoolean(PlcField field, Object[] values) {
+        OpcuaField adsField = (OpcuaField) field;
+        ArrayList<Boolean> resultSet = new ArrayList<>();
+        for(Object item : values){
+            resultSet.add((Boolean) item);
+        }
+        return new DefaultBooleanFieldItem(resultSet.toArray(new Boolean[0]));
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeByte(PlcField field, Object[] values) {
+        OpcuaField adsField = (OpcuaField) field;
+        ArrayList<Byte> resultSet = new ArrayList<>();
+        for(Object item : values){
+            resultSet.add((Byte) item);
+        }
+        return new DefaultByteFieldItem(resultSet.toArray(new Byte[0]));
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeShort(PlcField field, Object[] values) {
+        OpcuaField adsField = (OpcuaField) field;
+        ArrayList<Short> resultSet = new ArrayList<>();
+        for(Object item : values){
+            resultSet.add((Short) item);
+        }
+        return new DefaultShortFieldItem(resultSet.toArray(new Short[0]));
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeInteger(PlcField field, Object[] values) {
+        OpcuaField adsField = (OpcuaField) field;
+        ArrayList<Integer> resultSet = new ArrayList<>();
+        for(Object item : values){
+            resultSet.add((Integer) item);
+        }
+        return new DefaultIntegerFieldItem(resultSet.toArray(new Integer[0]));
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeBigInteger(PlcField field, Object[] values) {
+        OpcuaField adsField = (OpcuaField) field;
+        ArrayList<BigInteger> resultSet = new ArrayList<>();
+        for(Object item : values){
+            resultSet.add((BigInteger) item);
+        }
+        return new DefaultBigIntegerFieldItem(resultSet.toArray(new BigInteger[0]));
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeLong(PlcField field, Object[] values) {
+        OpcuaField adsField = (OpcuaField) field;
+        ArrayList<Long> resultSet = new ArrayList<>();
+        for(Object item : values){
+            resultSet.add((Long) item);
+        }
+        return new DefaultLongFieldItem(resultSet.toArray(new Long[0]));
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeFloat(PlcField field, Object[] values) {
+        OpcuaField adsField = (OpcuaField) field;
+        ArrayList<Float> resultSet = new ArrayList<>();
+        for(Object item : values){
+            resultSet.add((Float) item);
+        }
+        return new DefaultFloatFieldItem(resultSet.toArray(new Float[0]));
+    }
+
+
+
+    @Override
+    public BaseDefaultFieldItem encodeDouble(PlcField field, Object[] values) {
+        OpcuaField adsField = (OpcuaField) field;
+        ArrayList<Double> resultSet = new ArrayList<>();
+        for(Object item : values){
+            resultSet.add((Double) item);
+        }
+        return new DefaultDoubleFieldItem(resultSet.toArray(new Double[0]));
+    }
+
+
+    @Override
+    public BaseDefaultFieldItem encodeByteArray(PlcField field, Object[] values) {
+        OpcuaField adsField = (OpcuaField) field;
+        Byte[][] byteArray = new Byte[values.length][];
+        int innerCounter = 0;
+        for(Object item : values){
+            byte[] itemArray = (byte[]) item;
+            byteArray[innerCounter] = new Byte[((byte[]) item).length];
+            for(int counter = 0; counter < itemArray.length; counter++){
+                byteArray[innerCounter][counter] = itemArray[counter];
+            }
+            innerCounter++;
+        }
+        return new DefaultByteArrayFieldItem(byteArray);
+    }
+}
diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubsriptionHandle.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubsriptionHandle.java
index 9975a9076b9..f80dc1df723 100644
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubsriptionHandle.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubsriptionHandle.java
@@ -1,82 +1,82 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-*/
-package org.apache.plc4x.java.opcua.protocol;
-
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
-import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
-import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.messages.DefaultPlcSubscriptionEvent;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-import org.apache.plc4x.java.opcua.connection.OpcuaTcpPlcConnection;
-import org.eclipse.milo.opcua.sdk.client.api.subscriptions.UaMonitoredItem;
-import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue;
-import org.eclipse.milo.opcua.stack.core.types.builtin.StatusCode;
-import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger;
-
-import java.time.Instant;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Consumer;
-/**
- * @author Matthias Milan Stlrljic
- * Created by Matthias Milan Stlrljic on 10.05.2019
- */
-public class OpcuaSubsriptionHandle implements PlcSubscriptionHandle {
-    Set< Consumer<PlcSubscriptionEvent>> consumers = new HashSet<>();
-    String fieldName;
-    public UInteger getClientHandle() {
-        return clientHandle;
-    }
-
-    UInteger clientHandle;
-
-    public  OpcuaSubsriptionHandle(String fieldName, UInteger clientHandle){
-        this.clientHandle = clientHandle;
-        this.fieldName = fieldName;
-    }
-    @Override
-    public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer) {
-        consumers.add(consumer);
-        return () -> {consumers.remove(consumer);};
-    }
-
-    public void onSubscriptionValue(UaMonitoredItem item, DataValue value) {
-        consumers.forEach(plcSubscriptionEventConsumer -> {
-            PlcResponseCode resultCode = PlcResponseCode.OK;
-            BaseDefaultFieldItem stringItem = null;
-            if(value.getStatusCode() != StatusCode.GOOD){
-                resultCode = PlcResponseCode.NOT_FOUND;
-            }else{
-                stringItem = OpcuaTcpPlcConnection.encodeFieldItem(value);
-
-            }
-            Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> fields = new HashMap<>();
-            Pair<PlcResponseCode, BaseDefaultFieldItem> newPair = new ImmutablePair<>(resultCode, stringItem);
-            fields.put(fieldName, newPair);
-            PlcSubscriptionEvent event = new DefaultPlcSubscriptionEvent(Instant.now(), fields);
-            plcSubscriptionEventConsumer.accept(event);
-        });
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+package org.apache.plc4x.java.opcua.protocol;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
+import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.messages.DefaultPlcSubscriptionEvent;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+import org.apache.plc4x.java.opcua.connection.OpcuaTcpPlcConnection;
+import org.eclipse.milo.opcua.sdk.client.api.subscriptions.UaMonitoredItem;
+import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue;
+import org.eclipse.milo.opcua.stack.core.types.builtin.StatusCode;
+import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger;
+
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Consumer;
+/**
+ * @author Matthias Milan Stlrljic
+ * Created by Matthias Milan Stlrljic on 10.05.2019
+ */
+public class OpcuaSubsriptionHandle implements PlcSubscriptionHandle {
+    Set< Consumer<PlcSubscriptionEvent>> consumers = new HashSet<>();
+    String fieldName;
+    public UInteger getClientHandle() {
+        return clientHandle;
+    }
+
+    UInteger clientHandle;
+
+    public  OpcuaSubsriptionHandle(String fieldName, UInteger clientHandle){
+        this.clientHandle = clientHandle;
+        this.fieldName = fieldName;
+    }
+    @Override
+    public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer) {
+        consumers.add(consumer);
+        return () -> {consumers.remove(consumer);};
+    }
+
+    public void onSubscriptionValue(UaMonitoredItem item, DataValue value) {
+        consumers.forEach(plcSubscriptionEventConsumer -> {
+            PlcResponseCode resultCode = PlcResponseCode.OK;
+            BaseDefaultFieldItem stringItem = null;
+            if(value.getStatusCode() != StatusCode.GOOD){
+                resultCode = PlcResponseCode.NOT_FOUND;
+            }else{
+                stringItem = OpcuaTcpPlcConnection.encodeFieldItem(value);
+
+            }
+            Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> fields = new HashMap<>();
+            Pair<PlcResponseCode, BaseDefaultFieldItem> newPair = new ImmutablePair<>(resultCode, stringItem);
+            fields.put(fieldName, newPair);
+            PlcSubscriptionEvent event = new DefaultPlcSubscriptionEvent(Instant.now(), fields);
+            plcSubscriptionEventConsumer.accept(event);
+        });
+    }
+
+}
diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/model/OpcuaDataTypes.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/model/OpcuaDataTypes.java
index af951375b6e..7d5dae1d0d5 100644
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/model/OpcuaDataTypes.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/model/OpcuaDataTypes.java
@@ -1,46 +1,46 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-*/
-package org.apache.plc4x.java.opcua.protocol.model;
-/**
- * @author Matthias Milan Stlrljic
- * Created by Matthias Milan Stlrljic on 10.05.2019
- */
-public enum OpcuaDataTypes {
-    BOOL,
-    SByte,
-    Byte,
-    INT16,
-    UINT16,
-    INT32,
-    UINT32,
-    INT64,
-    UINT64,
-    FLOAT,
-    DOUBLE,
-    STATUS_CODE,
-    STRING,
-    DATE_TIME,
-    GUID,
-    BYTE_STRING,
-    XML_ELEMENT,
-    NODE_ID,
-    EXPANDABLE_NODE_ID,
-    QUALIFIED_NAME
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+package org.apache.plc4x.java.opcua.protocol.model;
+/**
+ * @author Matthias Milan Stlrljic
+ * Created by Matthias Milan Stlrljic on 10.05.2019
+ */
+public enum OpcuaDataTypes {
+    BOOL,
+    SByte,
+    Byte,
+    INT16,
+    UINT16,
+    INT32,
+    UINT32,
+    INT64,
+    UINT64,
+    FLOAT,
+    DOUBLE,
+    STATUS_CODE,
+    STRING,
+    DATE_TIME,
+    GUID,
+    BYTE_STRING,
+    XML_ELEMENT,
+    NODE_ID,
+    EXPANDABLE_NODE_ID,
+    QUALIFIED_NAME
+
+}
diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/model/OpcuaIdentifierType.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/model/OpcuaIdentifierType.java
index 3122deb11b7..3e567a313cd 100644
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/model/OpcuaIdentifierType.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/model/OpcuaIdentifierType.java
@@ -1,49 +1,49 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.opcua.protocol.model;
-
-/**
- * @author Matthias Milan Stlrljic
- * Created by Matthias Milan Stlrljic on 10.05.2019
- */
-public enum OpcuaIdentifierType {
-    STRING_IDENTIFIER("s"),
-    NUMBER_IDENTIFIER("i"),
-    GUID_IDENTIFIER("g"),
-    BINARY_IDENTIFIER("BINARY_IDENTIFIER");
-
-    private String text;
-
-    OpcuaIdentifierType(String text) {
-        this.text = text;
-    }
-
-    public String getText() {
-        return this.text;
-    }
-
-    public static OpcuaIdentifierType fromString(String text) {
-        for (OpcuaIdentifierType type : OpcuaIdentifierType.values()) {
-            if (type.text.equalsIgnoreCase(text)) {
-                return type;
-            }
-        }
-        throw new IllegalArgumentException("No constant with text " + text + " found");
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.opcua.protocol.model;
+
+/**
+ * @author Matthias Milan Stlrljic
+ * Created by Matthias Milan Stlrljic on 10.05.2019
+ */
+public enum OpcuaIdentifierType {
+    STRING_IDENTIFIER("s"),
+    NUMBER_IDENTIFIER("i"),
+    GUID_IDENTIFIER("g"),
+    BINARY_IDENTIFIER("BINARY_IDENTIFIER");
+
+    private String text;
+
+    OpcuaIdentifierType(String text) {
+        this.text = text;
+    }
+
+    public String getText() {
+        return this.text;
+    }
+
+    public static OpcuaIdentifierType fromString(String text) {
+        for (OpcuaIdentifierType type : OpcuaIdentifierType.values()) {
+            if (type.text.equalsIgnoreCase(text)) {
+                return type;
+            }
+        }
+        throw new IllegalArgumentException("No constant with text " + text + " found");
+    }
+}
diff --git a/plc4j/drivers/opcua/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver b/plc4j/drivers/opcua/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
index fe96e3ab7cc..18baa93ada3 100644
--- a/plc4j/drivers/opcua/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
+++ b/plc4j/drivers/opcua/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
@@ -1,19 +1,19 @@
-#
-# 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
-#
-#   http://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.
-#
-org.apache.plc4x.java.opcua.OpcuaPlcDriver
+#
+# 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
+#
+#   http://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.
+#
+org.apache.plc4x.java.opcua.OpcuaPlcDriver
diff --git a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/ManualPLC4XOpcua.java b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/ManualPLC4XOpcua.java
index 7708a89e5cd..52452385327 100644
--- a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/ManualPLC4XOpcua.java
+++ b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/ManualPLC4XOpcua.java
@@ -1,145 +1,145 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-*/
-package org.apache.plc4x.java.opcua;
-
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.messages.*;
-import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.types.PlcSubscriptionType;
-import org.apache.plc4x.java.base.messages.DefaultPlcSubscriptionRequest;
-import org.apache.plc4x.java.base.model.SubscriptionPlcField;
-import org.apache.plc4x.java.opcua.connection.OpcuaTcpPlcConnection;
-import org.apache.plc4x.java.opcua.protocol.OpcuaField;
-import org.apache.plc4x.java.opcua.protocol.OpcuaPlcFieldHandler;
-
-import java.math.BigInteger;
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.function.Consumer;
-/**
- * This class serves only as a manual entry point for ad-hoc tests of the OPC UA PLC4J driver.
- *
- *
- * The current version is tested against a public server, which is to be replaced later by a separate instance of the Milo framework.
- * Afterwards the code represented here will be used as an example for the introduction page.
- *
- * TODO: replace current public server with local Milo instance
- *
- * @author Matthias Milan Stlrljic
- * Created by Matthias Milan Stlrljic on 10.05.2019
- */
-public class ManualPLC4XOpcua {
-    private static final String BOOL_IDENTIFIER = "ns=2;i=10844";
-    private static final String BYTE_STRING_IDENTIFIER = "ns=2;i=10858";
-    private static final String BYTE_IDENTIFIER = "ns=2;i=10846";
-    private static final String DOUBLE_IDENTIFIER = "ns=2;i=10854";
-    private static final String FLOAT_IDENTIFIER = "ns=2;i=10853";
-    private static final String INT16_IDENTIFIER = "ns=2;i=10847";
-    private static final String INT32_IDENTIFIER = "ns=2;i=10849";
-    private static final String INT64_IDENTIFIER = "ns=2;i=10851";
-    private static final String INTEGER_IDENTIFIER = "ns=2;i=10869";
-    private static final String SBYTE_IDENTIFIER = "ns=2;i=10845";
-    private static final String STRING_IDENTIFIER = "ns=2;i=10855";
-    private static final String UINT16_IDENTIFIER = "ns=2;i=10848";
-    private static final String UINT32_IDENTIFIER = "ns=2;i=10850";
-    private static final String UINT64_IDENTIFIER = "ns=2;i=10852";
-    private static final String UINTEGER_IDENTIFIER = "ns=2;i=10870";
-    private static final String DOES_NOT_EXIST_IDENTIFIER = "ns=2;i=12512623";
-
-
-    public static void main(String args[]){
-
-
-        OpcuaTcpPlcConnection opcuaConnection = null;
-        OpcuaPlcFieldHandler fieldH = new OpcuaPlcFieldHandler();
-        PlcField field = fieldH.createField("ns=2;i=10855");
-        try {
-            opcuaConnection = (OpcuaTcpPlcConnection)
-                new PlcDriverManager().getConnection("opcua:tcp://opcua.demo-this.com:51210/UA/SampleServer");
-
-        } catch (PlcConnectionException e) {
-            e.printStackTrace();
-        }
-        try {
-            PlcReadRequest.Builder builder = opcuaConnection.readRequestBuilder();
-            builder.addItem("Bool", BOOL_IDENTIFIER);
-            builder.addItem("ByteString", BYTE_STRING_IDENTIFIER);
-            builder.addItem("Byte", BYTE_IDENTIFIER);
-            builder.addItem("Double", DOUBLE_IDENTIFIER);
-            builder.addItem("Float", FLOAT_IDENTIFIER);
-            builder.addItem("Int16", INT16_IDENTIFIER);
-            builder.addItem("Int32", INT32_IDENTIFIER);
-            builder.addItem("Int64", INT64_IDENTIFIER);
-            builder.addItem("Integer", INTEGER_IDENTIFIER);
-            builder.addItem("SByte", SBYTE_IDENTIFIER);
-            builder.addItem("String", STRING_IDENTIFIER);
-            builder.addItem("UInt16", UINT16_IDENTIFIER);
-            builder.addItem("UInt32", UINT32_IDENTIFIER);
-            builder.addItem("UInt64", UINT64_IDENTIFIER);
-            builder.addItem("UInteger", UINTEGER_IDENTIFIER);
-
-            builder.addItem("DoesNotExists", DOES_NOT_EXIST_IDENTIFIER);
-
-            PlcReadRequest request = builder.build();
-            PlcReadResponse response = opcuaConnection.read(request).get();
-            Collection coll = response.getAllStrings("String");
-
-            PlcWriteRequest.Builder wBuilder = opcuaConnection.writeRequestBuilder();
-            wBuilder.addItem("w-Bool", BOOL_IDENTIFIER, true);
-            wBuilder.addItem("w-ByteString", BYTE_STRING_IDENTIFIER, "TEST".getBytes());
-            wBuilder.addItem("w-Byte", BYTE_IDENTIFIER, (byte)1);
-            wBuilder.addItem("w-Double", DOUBLE_IDENTIFIER, (double)0.25);
-            wBuilder.addItem("w-Float", FLOAT_IDENTIFIER, (float)0.25);
-            wBuilder.addItem("w-INT16", INT16_IDENTIFIER, (short)12);
-            wBuilder.addItem("w-Int32", INT32_IDENTIFIER, (int)314);
-            wBuilder.addItem("w-Int64", INT64_IDENTIFIER, (long)123125);
-            wBuilder.addItem("w-Integer", INTEGER_IDENTIFIER, (int)314);
-            wBuilder.addItem("w-SByte", SBYTE_IDENTIFIER, (short)23);
-            wBuilder.addItem("w-String", STRING_IDENTIFIER, "TEST");
-            wBuilder.addItem("w-UInt16", UINT16_IDENTIFIER, (int)222);
-            wBuilder.addItem("w-UInt32", UINT32_IDENTIFIER, (long)21412);
-            wBuilder.addItem("w-UInt64", UINT64_IDENTIFIER, new BigInteger("1245152"));
-            wBuilder.addItem("w-UInteger", UINTEGER_IDENTIFIER, new BigInteger("1245152"));
-            PlcWriteRequest writeRequest = wBuilder.build();
-            PlcWriteResponse wResponse = opcuaConnection.write(writeRequest).get();
-
-            PlcSubscriptionResponse subResp = opcuaConnection.subscribe(new DefaultPlcSubscriptionRequest(
-                opcuaConnection,
-                new LinkedHashMap<>(
-                    Collections.singletonMap("field1",
-                        new SubscriptionPlcField(PlcSubscriptionType.CHANGE_OF_STATE, OpcuaField.of(STRING_IDENTIFIER), Duration.of(1, ChronoUnit.SECONDS)))
-                )
-            )).get();
-
-            Consumer<PlcSubscriptionEvent> consumer = plcSubscriptionEvent -> System.out.println(plcSubscriptionEvent.toString());
-            PlcConsumerRegistration registration = opcuaConnection.register(consumer, subResp.getSubscriptionHandles());
-            Thread.sleep(7000);
-            registration.unregister();
-            Thread.sleep(20000);
-            opcuaConnection.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+package org.apache.plc4x.java.opcua;
+
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.messages.*;
+import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcSubscriptionType;
+import org.apache.plc4x.java.base.messages.DefaultPlcSubscriptionRequest;
+import org.apache.plc4x.java.base.model.SubscriptionPlcField;
+import org.apache.plc4x.java.opcua.connection.OpcuaTcpPlcConnection;
+import org.apache.plc4x.java.opcua.protocol.OpcuaField;
+import org.apache.plc4x.java.opcua.protocol.OpcuaPlcFieldHandler;
+
+import java.math.BigInteger;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.function.Consumer;
+/**
+ * This class serves only as a manual entry point for ad-hoc tests of the OPC UA PLC4J driver.
+ *
+ *
+ * The current version is tested against a public server, which is to be replaced later by a separate instance of the Milo framework.
+ * Afterwards the code represented here will be used as an example for the introduction page.
+ *
+ * TODO: replace current public server with local Milo instance
+ *
+ * @author Matthias Milan Stlrljic
+ * Created by Matthias Milan Stlrljic on 10.05.2019
+ */
+public class ManualPLC4XOpcua {
+    private static final String BOOL_IDENTIFIER = "ns=2;i=10844";
+    private static final String BYTE_STRING_IDENTIFIER = "ns=2;i=10858";
+    private static final String BYTE_IDENTIFIER = "ns=2;i=10846";
+    private static final String DOUBLE_IDENTIFIER = "ns=2;i=10854";
+    private static final String FLOAT_IDENTIFIER = "ns=2;i=10853";
+    private static final String INT16_IDENTIFIER = "ns=2;i=10847";
+    private static final String INT32_IDENTIFIER = "ns=2;i=10849";
+    private static final String INT64_IDENTIFIER = "ns=2;i=10851";
+    private static final String INTEGER_IDENTIFIER = "ns=2;i=10869";
+    private static final String SBYTE_IDENTIFIER = "ns=2;i=10845";
+    private static final String STRING_IDENTIFIER = "ns=2;i=10855";
+    private static final String UINT16_IDENTIFIER = "ns=2;i=10848";
+    private static final String UINT32_IDENTIFIER = "ns=2;i=10850";
+    private static final String UINT64_IDENTIFIER = "ns=2;i=10852";
+    private static final String UINTEGER_IDENTIFIER = "ns=2;i=10870";
+    private static final String DOES_NOT_EXIST_IDENTIFIER = "ns=2;i=12512623";
+
+
+    public static void main(String args[]){
+
+
+        OpcuaTcpPlcConnection opcuaConnection = null;
+        OpcuaPlcFieldHandler fieldH = new OpcuaPlcFieldHandler();
+        PlcField field = fieldH.createField("ns=2;i=10855");
+        try {
+            opcuaConnection = (OpcuaTcpPlcConnection)
+                new PlcDriverManager().getConnection("opcua:tcp://opcua.demo-this.com:51210/UA/SampleServer");
+
+        } catch (PlcConnectionException e) {
+            e.printStackTrace();
+        }
+        try {
+            PlcReadRequest.Builder builder = opcuaConnection.readRequestBuilder();
+            builder.addItem("Bool", BOOL_IDENTIFIER);
+            builder.addItem("ByteString", BYTE_STRING_IDENTIFIER);
+            builder.addItem("Byte", BYTE_IDENTIFIER);
+            builder.addItem("Double", DOUBLE_IDENTIFIER);
+            builder.addItem("Float", FLOAT_IDENTIFIER);
+            builder.addItem("Int16", INT16_IDENTIFIER);
+            builder.addItem("Int32", INT32_IDENTIFIER);
+            builder.addItem("Int64", INT64_IDENTIFIER);
+            builder.addItem("Integer", INTEGER_IDENTIFIER);
+            builder.addItem("SByte", SBYTE_IDENTIFIER);
+            builder.addItem("String", STRING_IDENTIFIER);
+            builder.addItem("UInt16", UINT16_IDENTIFIER);
+            builder.addItem("UInt32", UINT32_IDENTIFIER);
+            builder.addItem("UInt64", UINT64_IDENTIFIER);
+            builder.addItem("UInteger", UINTEGER_IDENTIFIER);
+
+            builder.addItem("DoesNotExists", DOES_NOT_EXIST_IDENTIFIER);
+
+            PlcReadRequest request = builder.build();
+            PlcReadResponse response = opcuaConnection.read(request).get();
+            Collection coll = response.getAllStrings("String");
+
+            PlcWriteRequest.Builder wBuilder = opcuaConnection.writeRequestBuilder();
+            wBuilder.addItem("w-Bool", BOOL_IDENTIFIER, true);
+            wBuilder.addItem("w-ByteString", BYTE_STRING_IDENTIFIER, "TEST".getBytes());
+            wBuilder.addItem("w-Byte", BYTE_IDENTIFIER, (byte)1);
+            wBuilder.addItem("w-Double", DOUBLE_IDENTIFIER, (double)0.25);
+            wBuilder.addItem("w-Float", FLOAT_IDENTIFIER, (float)0.25);
+            wBuilder.addItem("w-INT16", INT16_IDENTIFIER, (short)12);
+            wBuilder.addItem("w-Int32", INT32_IDENTIFIER, (int)314);
+            wBuilder.addItem("w-Int64", INT64_IDENTIFIER, (long)123125);
+            wBuilder.addItem("w-Integer", INTEGER_IDENTIFIER, (int)314);
+            wBuilder.addItem("w-SByte", SBYTE_IDENTIFIER, (short)23);
+            wBuilder.addItem("w-String", STRING_IDENTIFIER, "TEST");
+            wBuilder.addItem("w-UInt16", UINT16_IDENTIFIER, (int)222);
+            wBuilder.addItem("w-UInt32", UINT32_IDENTIFIER, (long)21412);
+            wBuilder.addItem("w-UInt64", UINT64_IDENTIFIER, new BigInteger("1245152"));
+            wBuilder.addItem("w-UInteger", UINTEGER_IDENTIFIER, new BigInteger("1245152"));
+            PlcWriteRequest writeRequest = wBuilder.build();
+            PlcWriteResponse wResponse = opcuaConnection.write(writeRequest).get();
+
+            PlcSubscriptionResponse subResp = opcuaConnection.subscribe(new DefaultPlcSubscriptionRequest(
+                opcuaConnection,
+                new LinkedHashMap<>(
+                    Collections.singletonMap("field1",
+                        new SubscriptionPlcField(PlcSubscriptionType.CHANGE_OF_STATE, OpcuaField.of(STRING_IDENTIFIER), Duration.of(1, ChronoUnit.SECONDS)))
+                )
+            )).get();
+
+            Consumer<PlcSubscriptionEvent> consumer = plcSubscriptionEvent -> System.out.println(plcSubscriptionEvent.toString());
+            PlcConsumerRegistration registration = opcuaConnection.register(consumer, subResp.getSubscriptionHandles());
+            Thread.sleep(7000);
+            registration.unregister();
+            Thread.sleep(20000);
+            opcuaConnection.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java
index 8c502ed2fed..8f2d3614ced 100644
--- a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java
+++ b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java
@@ -1,67 +1,67 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-*/
-package org.apache.plc4x.java.opcua;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.apache.plc4x.java.opcua.OpcuaPlcDriver.INET_ADDRESS_PATTERN;
-import static org.apache.plc4x.java.opcua.OpcuaPlcDriver.OPCUA_URI_PATTERN;
-import static org.apache.plc4x.java.opcua.UtilsTest.assertMatching;
-/**
- * @author Matthias Milan Stlrljic
- * Created by Matthias Milan Stlrljic on 10.05.2019
- */
-public class OpcuaPlcDriverTest {
-    @BeforeEach
-    public void before() {
-    }
-
-    @AfterEach
-    public void after() {
-
-    }
-
-    @Test
-    public void testOpcuaAddressPattern() {
-
-        assertMatching(INET_ADDRESS_PATTERN, "tcp://localhost");
-        assertMatching(INET_ADDRESS_PATTERN, "tcp://localhost:3131");
-        assertMatching(INET_ADDRESS_PATTERN, "tcp://www.google.de");
-        assertMatching(INET_ADDRESS_PATTERN, "tcp://www.google.de:443");
-        assertMatching(INET_ADDRESS_PATTERN, "tcp://127.0.0.1");
-        assertMatching(INET_ADDRESS_PATTERN, "tcp://127.0.0.1:251");
-        assertMatching(INET_ADDRESS_PATTERN, "tcp://254.254.254.254:1337");
-        assertMatching(INET_ADDRESS_PATTERN, "tcp://254.254.254.254");
-
-
-        assertMatching(OPCUA_URI_PATTERN, "opcua:tcp://localhost");
-        assertMatching(OPCUA_URI_PATTERN, "opcua:tcp://localhost:3131");
-        assertMatching(OPCUA_URI_PATTERN, "opcua:tcp://www.google.de");
-        assertMatching(OPCUA_URI_PATTERN, "opcua:tcp://www.google.de:443");
-        assertMatching(OPCUA_URI_PATTERN, "opcua:tcp://127.0.0.1");
-        assertMatching(OPCUA_URI_PATTERN, "opcua:tcp://127.0.0.1:251");
-        assertMatching(OPCUA_URI_PATTERN, "opcua:tcp://254.254.254.254:1337");
-        assertMatching(OPCUA_URI_PATTERN, "opcua:tcp://254.254.254.254");
-
-
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+package org.apache.plc4x.java.opcua;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.plc4x.java.opcua.OpcuaPlcDriver.INET_ADDRESS_PATTERN;
+import static org.apache.plc4x.java.opcua.OpcuaPlcDriver.OPCUA_URI_PATTERN;
+import static org.apache.plc4x.java.opcua.UtilsTest.assertMatching;
+/**
+ * @author Matthias Milan Stlrljic
+ * Created by Matthias Milan Stlrljic on 10.05.2019
+ */
+public class OpcuaPlcDriverTest {
+    @BeforeEach
+    public void before() {
+    }
+
+    @AfterEach
+    public void after() {
+
+    }
+
+    @Test
+    public void testOpcuaAddressPattern() {
+
+        assertMatching(INET_ADDRESS_PATTERN, "tcp://localhost");
+        assertMatching(INET_ADDRESS_PATTERN, "tcp://localhost:3131");
+        assertMatching(INET_ADDRESS_PATTERN, "tcp://www.google.de");
+        assertMatching(INET_ADDRESS_PATTERN, "tcp://www.google.de:443");
+        assertMatching(INET_ADDRESS_PATTERN, "tcp://127.0.0.1");
+        assertMatching(INET_ADDRESS_PATTERN, "tcp://127.0.0.1:251");
+        assertMatching(INET_ADDRESS_PATTERN, "tcp://254.254.254.254:1337");
+        assertMatching(INET_ADDRESS_PATTERN, "tcp://254.254.254.254");
+
+
+        assertMatching(OPCUA_URI_PATTERN, "opcua:tcp://localhost");
+        assertMatching(OPCUA_URI_PATTERN, "opcua:tcp://localhost:3131");
+        assertMatching(OPCUA_URI_PATTERN, "opcua:tcp://www.google.de");
+        assertMatching(OPCUA_URI_PATTERN, "opcua:tcp://www.google.de:443");
+        assertMatching(OPCUA_URI_PATTERN, "opcua:tcp://127.0.0.1");
+        assertMatching(OPCUA_URI_PATTERN, "opcua:tcp://127.0.0.1:251");
+        assertMatching(OPCUA_URI_PATTERN, "opcua:tcp://254.254.254.254:1337");
+        assertMatching(OPCUA_URI_PATTERN, "opcua:tcp://254.254.254.254");
+
+
+    }
+
+}
diff --git a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/UtilsTest.java b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/UtilsTest.java
index 2e84a0b63a6..545afb5a035 100644
--- a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/UtilsTest.java
+++ b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/UtilsTest.java
@@ -1,40 +1,40 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-*/
-package org.apache.plc4x.java.opcua;
-
-import java.util.regex.Pattern;
-
-import static org.junit.Assert.fail;
-/**
- * @author Matthias Milan Stlrljic
- * Created by Matthias Milan Stlrljic on 10.05.2019
- */
-public class UtilsTest {
-    public static void assertMatching(Pattern pattern, String match) {
-        if (!pattern.matcher(match).matches()) {
-            fail(pattern + "doesn't match " + match);
-        }
-    }
-
-    public static void assertNoMatching(Pattern pattern, String match) {
-        if (pattern.matcher(match).matches()) {
-            fail(pattern + "does match " + match + " but should not");
-        }
-    }
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+package org.apache.plc4x.java.opcua;
+
+import java.util.regex.Pattern;
+
+import static org.junit.Assert.fail;
+/**
+ * @author Matthias Milan Stlrljic
+ * Created by Matthias Milan Stlrljic on 10.05.2019
+ */
+public class UtilsTest {
+    public static void assertMatching(Pattern pattern, String match) {
+        if (!pattern.matcher(match).matches()) {
+            fail(pattern + "doesn't match " + match);
+        }
+    }
+
+    public static void assertNoMatching(Pattern pattern, String match) {
+        if (pattern.matcher(match).matches()) {
+            fail(pattern + "does match " + match + " but should not");
+        }
+    }
+}
diff --git a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnectionTest.java b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnectionTest.java
index 5a42c5e28ae..1a00ef7bb00 100644
--- a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnectionTest.java
+++ b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnectionTest.java
@@ -1,36 +1,36 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-*/
-package org.apache.plc4x.java.opcua.connection;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-/**
- * @author Matthias Milan Stlrljic
- * Created by Matthias Milan Stlrljic on 10.05.2019
- */
-public class OpcuaTcpPlcConnectionTest {
-    @BeforeEach
-    public void before() {
-    }
-
-    @AfterEach
-    public void after() {
-
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+package org.apache.plc4x.java.opcua.connection;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+/**
+ * @author Matthias Milan Stlrljic
+ * Created by Matthias Milan Stlrljic on 10.05.2019
+ */
+public class OpcuaTcpPlcConnectionTest {
+    @BeforeEach
+    public void before() {
+    }
+
+    @AfterEach
+    public void after() {
+
+    }
+}
diff --git a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaFieldTest.java b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaFieldTest.java
index 828a0e6ac80..605ffc3dd18 100644
--- a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaFieldTest.java
+++ b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaFieldTest.java
@@ -1,51 +1,51 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-*/
-package org.apache.plc4x.java.opcua.protocol;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.apache.plc4x.java.opcua.UtilsTest.assertMatching;
-import static org.apache.plc4x.java.opcua.protocol.OpcuaField.ADDRESS_PATTERN;
-/**
- * @author Matthias Milan Stlrljic
- * Created by Matthias Milan Stlrljic on 10.05.2019
- */
-public class OpcuaFieldTest {
-
-    @BeforeEach
-    public void before() {
-    }
-
-    @AfterEach
-    public void after() {
-
-    }
-
-    @Test
-    public void testOpcuaAddressPattern() {
-
-        assertMatching(ADDRESS_PATTERN, "ns=2;i=10846");
-        assertMatching(ADDRESS_PATTERN, "ns=2;s=test.variable.name.inspect");
-        assertMatching(ADDRESS_PATTERN, "ns=2;g=09087e75-8e5e-499b-954f-f2a8624db28a");
-        assertMatching(ADDRESS_PATTERN, "ns=2;b=asvaewavarahreb==");
-
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+package org.apache.plc4x.java.opcua.protocol;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.plc4x.java.opcua.UtilsTest.assertMatching;
+import static org.apache.plc4x.java.opcua.protocol.OpcuaField.ADDRESS_PATTERN;
+/**
+ * @author Matthias Milan Stlrljic
+ * Created by Matthias Milan Stlrljic on 10.05.2019
+ */
+public class OpcuaFieldTest {
+
+    @BeforeEach
+    public void before() {
+    }
+
+    @AfterEach
+    public void after() {
+
+    }
+
+    @Test
+    public void testOpcuaAddressPattern() {
+
+        assertMatching(ADDRESS_PATTERN, "ns=2;i=10846");
+        assertMatching(ADDRESS_PATTERN, "ns=2;s=test.variable.name.inspect");
+        assertMatching(ADDRESS_PATTERN, "ns=2;g=09087e75-8e5e-499b-954f-f2a8624db28a");
+        assertMatching(ADDRESS_PATTERN, "ns=2;b=asvaewavarahreb==");
+
+    }
+}
diff --git a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaPlcFieldHandlerTest.java b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaPlcFieldHandlerTest.java
index 044de340e3f..be1110bedc4 100644
--- a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaPlcFieldHandlerTest.java
+++ b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaPlcFieldHandlerTest.java
@@ -1,36 +1,36 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-*/
-package org.apache.plc4x.java.opcua.protocol;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-/**
- * @author Matthias Milan Stlrljic
- * Created by Matthias Milan Stlrljic on 10.05.2019
- */
-public class OpcuaPlcFieldHandlerTest {
-    @BeforeEach
-    public void before() {
-    }
-
-    @AfterEach
-    public void after() {
-
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+package org.apache.plc4x.java.opcua.protocol;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+/**
+ * @author Matthias Milan Stlrljic
+ * Created by Matthias Milan Stlrljic on 10.05.2019
+ */
+public class OpcuaPlcFieldHandlerTest {
+    @BeforeEach
+    public void before() {
+    }
+
+    @AfterEach
+    public void after() {
+
+    }
+}
diff --git a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubscriptionHandleTest.java b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubscriptionHandleTest.java
index 153d4ca85dc..8a254451589 100644
--- a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubscriptionHandleTest.java
+++ b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubscriptionHandleTest.java
@@ -1,36 +1,36 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-*/
-package org.apache.plc4x.java.opcua.protocol;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-/**
- * @author Matthias Milan Stlrljic
- * Created by Matthias Milan Stlrljic on 10.05.2019
- */
-public class OpcuaSubscriptionHandleTest {
-    @BeforeEach
-    public void before() {
-    }
-
-    @AfterEach
-    public void after() {
-
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+package org.apache.plc4x.java.opcua.protocol;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+/**
+ * @author Matthias Milan Stlrljic
+ * Created by Matthias Milan Stlrljic on 10.05.2019
+ */
+public class OpcuaSubscriptionHandleTest {
+    @BeforeEach
+    public void before() {
+    }
+
+    @AfterEach
+    public void after() {
+
+    }
+}
diff --git a/plc4j/drivers/pom.xml b/plc4j/drivers/pom.xml
index 611ed29d3cb..cf033c69baf 100644
--- a/plc4j/drivers/pom.xml
+++ b/plc4j/drivers/pom.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-drivers</artifactId>
-  <packaging>pom</packaging>
-
-  <name>PLC4J: Drivers</name>
-  <description>Wrapper project for all PLC4J driver implementations.</description>
-
-  <modules>
-    <module>ab-eth</module>
-    <module>ads</module>
-    <module>ethernet-ip</module>
-    <module>modbus</module>
-    <module>s7</module>
-	<module>opcua</module>
-  </modules>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-drivers</artifactId>
+  <packaging>pom</packaging>
+
+  <name>PLC4J: Drivers</name>
+  <description>Wrapper project for all PLC4J driver implementations.</description>
+
+  <modules>
+    <module>ab-eth</module>
+    <module>ads</module>
+    <module>ethernet-ip</module>
+    <module>modbus</module>
+    <module>s7</module>
+	<module>opcua</module>
+  </modules>
+
+</project>
diff --git a/plc4j/drivers/s7/README.md b/plc4j/drivers/s7/README.md
index 048dcc52ef7..17602b26c8c 100644
--- a/plc4j/drivers/s7/README.md
+++ b/plc4j/drivers/s7/README.md
@@ -1,33 +1,33 @@
-<!--
-
-  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
-
-      http://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.
-
--->
-# S7 Driver
-
-## Siemens LOGO
-
-The S7 driver supports communication with Siemens LOGO devices, if the S7 communication is enabled.
-
-However the implementation seems to be not as advanced as the normal S7 devices. 
-In case of an unexpected message, the PLC doesn't resond with an error message, but it just closes the connection without and error message.
-Therefore we need to provide the type of controller as part of the connection string.
-
-A valid Siemens LOGO connection string looks as follows:
-
-   s7://10.10.64.21/0/0?controller-type=LOGO
-   
+<!--
+
+  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
+
+      http://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.
+
+-->
+# S7 Driver
+
+## Siemens LOGO
+
+The S7 driver supports communication with Siemens LOGO devices, if the S7 communication is enabled.
+
+However the implementation seems to be not as advanced as the normal S7 devices. 
+In case of an unexpected message, the PLC doesn't resond with an error message, but it just closes the connection without and error message.
+Therefore we need to provide the type of controller as part of the connection string.
+
+A valid Siemens LOGO connection string looks as follows:
+
+   s7://10.10.64.21/0/0?controller-type=LOGO
+   
 By specifying the controller-type, the driver doesn't try to read the CPU Services Data. 
\ No newline at end of file
diff --git a/plc4j/drivers/s7/pom.xml b/plc4j/drivers/s7/pom.xml
index bda98aa5f29..3606525f391 100644
--- a/plc4j/drivers/s7/pom.xml
+++ b/plc4j/drivers/s7/pom.xml
@@ -1,143 +1,143 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-drivers</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-driver-s7</artifactId>
-  <name>PLC4J: Driver: S7</name>
-  <description>Implementation of a PLC4X driver able to speak with S7 devices using the S7 protocol.</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-iso-on-tcp</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-iso-tp</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-s7</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base-tcp</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-buffer</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-configuration2</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base-test</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.pcap4j</groupId>
-      <artifactId>pcap4j-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.pcap4j</groupId>
-      <artifactId>pcap4j-packetfactory-static</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-utils-test-utils</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>osgi.cmpn</artifactId>
-      <version>6.0.0</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <usedDependencies combine.children="append">
-            <usedDependency>org.pcap4j:pcap4j-packetfactory-static</usedDependency>
-          </usedDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-drivers</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-driver-s7</artifactId>
+  <name>PLC4J: Driver: S7</name>
+  <description>Implementation of a PLC4X driver able to speak with S7 devices using the S7 protocol.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-iso-on-tcp</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-iso-tp</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-s7</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base-tcp</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-configuration2</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base-test</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.pcap4j</groupId>
+      <artifactId>pcap4j-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.pcap4j</groupId>
+      <artifactId>pcap4j-packetfactory-static</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-utils-test-utils</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>osgi.cmpn</artifactId>
+      <version>6.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <usedDependencies combine.children="append">
+            <usedDependency>org.pcap4j:pcap4j-packetfactory-static</usedDependency>
+          </usedDependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/S7PlcDriver.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/S7PlcDriver.java
index 8612e4733c7..6797348401a 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/S7PlcDriver.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/S7PlcDriver.java
@@ -1,83 +1,115 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7;
-
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.s7.connection.S7PlcConnection;
-import org.apache.plc4x.java.spi.PlcDriver;
-import org.osgi.service.component.annotations.Component;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Implementation of the S7 protocol, based on:
- * - S7 Protocol
- * - ISO Transport Protocol (Class 0) (https://tools.ietf.org/html/rfc905)
- * - ISO on TCP (https://tools.ietf.org/html/rfc1006)
- * - TCP
- */
-@Component(service = PlcDriver.class, immediate = true)
-public class S7PlcDriver implements PlcDriver {
-
-    private static final Pattern S7_URI_PATTERN = Pattern.compile("^s7://(?<host>.*)/(?<rack>\\d{1,4})/(?<slot>\\d{1,4})(?<params>\\?.*)?");
-
-    @Override
-    public String getProtocolCode() {
-        return "s7";
-    }
-
-    @Override
-    public String getProtocolName() {
-        return "Siemens S7 (Basic)";
-    }
-
-    @Override
-    public PlcConnection connect(String url) throws PlcConnectionException {
-        Matcher matcher = S7_URI_PATTERN.matcher(url);
-        if (!matcher.matches()) {
-            throw new PlcConnectionException(
-                "Connection url doesn't match the format 's7://{host|ip}/{rack}/{slot}'");
-        }
-        String host = matcher.group("host");
-
-        int rack = Integer.parseInt(matcher.group("rack"));
-        int slot = Integer.parseInt(matcher.group("slot"));
-        String params = matcher.group("params") != null ? matcher.group("params").substring(1) : null;
-
-        try {
-            InetAddress serverInetAddress = InetAddress.getByName(host);
-            return new S7PlcConnection(serverInetAddress, rack, slot, params);
-        } catch (UnknownHostException e) {
-            throw new PlcConnectionException("Error parsing address", e);
-        } catch (Exception e) {
-            throw new PlcConnectionException("Error connecting to host", e);
-        }
-    }
-
-    @Override
-    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
-        throw new PlcConnectionException("Basic S7 connections don't support authentication.");
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7;
+
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.authentication.PlcAuthentication;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.s7.connection.S7PlcConnection;
+import org.apache.plc4x.java.spi.PlcDriver;
+import org.osgi.service.component.annotations.Component;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Implementation of the S7 protocol, based on:
+ * - S7 Protocol
+ * - ISO Transport Protocol (Class 0) (https://tools.ietf.org/html/rfc905)
+ * - ISO on TCP (https://tools.ietf.org/html/rfc1006)
+ * - TCP
+ * - Support for R and H systems.
+ */
+@Component(service = PlcDriver.class, immediate = true)
+public class S7PlcDriver implements PlcDriver {
+
+    private static final Pattern S7_URI_PATTERN = Pattern.compile("^s7://(?<host>.*)/(?<rack>\\d{1,4})/(?<slot>\\d{1,4})(?<params>\\?.*)?");
+    private static final Pattern S7H_URI_PATTERN = Pattern.compile("^s7://(?<host0>.*):(?<rack0>\\d{1,4}):(?<slot0>\\d{1,4})/(?<host1>.*):(?<rack1>\\d{1,4}):(?<slot1>\\d{1,4})(?<params>\\?.*)?");    
+
+    
+    @Override
+    public String getProtocolCode() {
+        return "s7";
+    }
+
+    @Override
+    public String getProtocolName() {
+        return "Siemens S7 (Basic)";
+    }
+
+    @Override
+    public PlcConnection connect(String url) throws PlcConnectionException {
+        boolean isHSystem = false;
+        String params = null;
+        String[] hosts = new String[2];
+        int[] racks = new int[2];
+        int[] slots = new int[2];
+        InetAddress[] plcInetAddress = new InetAddress[2];
+        
+        Matcher matcher = S7_URI_PATTERN.matcher(url);
+        Matcher hmatcher = S7H_URI_PATTERN.matcher(url);
+        
+        isHSystem = hmatcher.matches();
+        
+        if (!matcher.matches()) {
+            if  (!hmatcher.matches()) 
+            throw new PlcConnectionException(
+                "Connection url doesn't match the format 's7://{host|ip}/{rack}/{slot}' or s7://{host0|ip0}:{rack0}:{slot0}/{host1|ip1}:{rack1}:{slot1}'");
+        }
+        if (!isHSystem) {
+            hosts[0] = matcher.group("host");
+            racks[0] = Integer.parseInt(matcher.group("rack"));
+            slots[0] = Integer.parseInt(matcher.group("slot"));
+            params = matcher.group("params") != null ? matcher.group("params").substring(1) : null;
+        } else {
+            hosts[0] = hmatcher.group("host0");
+            racks[0] = Integer.parseInt(hmatcher.group("rack0"));
+            slots[0] = Integer.parseInt(hmatcher.group("slot0"));
+            hosts[1] = hmatcher.group("host1");        
+            racks[1] = Integer.parseInt(hmatcher.group("rack1"));
+            slots[1] = Integer.parseInt(hmatcher.group("slot1"));
+            System.out.println(hosts[0] + ":" + racks[0]+ ":" + slots[0]);
+            System.out.println(hosts[1] + ":" + racks[1]+ ":" + slots[1]);
+            params = hmatcher.group("params") != null ? hmatcher.group("params").substring(1) : null;  
+        }
+        
+        try {
+            if (isHSystem) {
+                plcInetAddress[0] = InetAddress.getByName(hosts[0]);
+                plcInetAddress[1] = InetAddress.getByName(hosts[1]);                
+                return new S7PlcConnection(plcInetAddress, racks, slots, params);                              
+            } else {
+                plcInetAddress[0] = InetAddress.getByName(hosts[0]);
+                return new S7PlcConnection(plcInetAddress[0], racks[0], slots[0], params);  
+            }
+        } catch (UnknownHostException e) {
+            throw new PlcConnectionException("Error parsing address", e);
+        } catch (Exception e) {
+            throw new PlcConnectionException("Error connecting to host", e);
+        }
+    }
+
+    @Override
+    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
+        throw new PlcConnectionException("Basic S7 connections don't support authentication.");
+    }
+
+}
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
index 9ef18d53747..630b39fa484 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
@@ -1,669 +1,712 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.s7.connection;
-
-import io.netty.buffer.Unpooled;
-import io.netty.channel.*;
-import java.net.InetAddress;
-import java.time.Instant;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.function.Consumer;
-import org.apache.commons.configuration2.Configuration;
-import org.apache.commons.configuration2.SystemConfiguration;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse;
-import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
-import org.apache.plc4x.java.api.messages.PlcUnsubscriptionResponse;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.messages.PlcWriteResponse;
-import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
-import org.apache.plc4x.java.base.connection.ChannelFactory;
-import org.apache.plc4x.java.base.connection.NettyPlcConnection;
-import org.apache.plc4x.java.base.events.ConnectEvent;
-import org.apache.plc4x.java.base.events.ConnectedEvent;
-import org.apache.plc4x.java.base.messages.*;
-import org.apache.plc4x.java.isoontcp.protocol.IsoOnTcpProtocol;
-import org.apache.plc4x.java.isotp.protocol.IsoTPProtocol;
-import org.apache.plc4x.java.isotp.protocol.model.tpdus.DisconnectRequestTpdu;
-import org.apache.plc4x.java.isotp.protocol.model.types.DeviceGroup;
-import org.apache.plc4x.java.isotp.protocol.model.types.DisconnectReason;
-import org.apache.plc4x.java.isotp.protocol.model.types.TpduSize;
-import org.apache.plc4x.java.s7.model.S7Field;
-import org.apache.plc4x.java.s7.netty.Plc4XS7Protocol;
-import org.apache.plc4x.java.s7.netty.S7Protocol;
-import org.apache.plc4x.java.s7.netty.model.messages.S7PushMessage;
-import org.apache.plc4x.java.s7.netty.model.params.CpuDiagnosticPushParameter;
-import org.apache.plc4x.java.s7.netty.model.params.CpuServicesPushParameter;
-import org.apache.plc4x.java.s7.netty.model.payloads.AlarmMessagePayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.CpuCyclicServicesResponsePayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.CpuDiagnosticMessagePayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
-import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterSubFunctionGroup;
-import org.apache.plc4x.java.s7.netty.model.types.MemoryArea;
-import org.apache.plc4x.java.s7.netty.model.types.SubscribedEventType;
-import org.apache.plc4x.java.s7.netty.strategies.LongS7MessageProcessorCodec;
-import org.apache.plc4x.java.s7.netty.util.S7PlcFieldEventHandler;
-import org.apache.plc4x.java.s7.netty.util.S7PlcFieldHandler;
-import org.apache.plc4x.java.s7.protocol.S7CyclicServicesSubscriptionHandle;
-import org.apache.plc4x.java.s7.protocol.S7DiagnosticSubscriptionHandle;
-import org.apache.plc4x.java.s7.protocol.event.S7AlarmEvent;
-import org.apache.plc4x.java.s7.protocol.event.S7CyclicValueEvent;
-import org.apache.plc4x.java.s7.protocol.event.S7Event;
-import org.apache.plc4x.java.s7.protocol.event.S7ModeEvent;
-import org.apache.plc4x.java.s7.protocol.event.S7SysEvent;
-import org.apache.plc4x.java.s7.types.S7ControllerType;
-import org.apache.plc4x.java.s7.utils.S7TsapIdEncoder;
-import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Class implementing the Connection handling for Siemens S7.
- * The adressing of Values in S7 works as follows:
- * <p>
- * For adressing values from Datablocks the following syntax is used:
- * <pre>
- *     DATA_BLOCKS/{blockNumer}/{byteOffset}
- * </pre>
- * <p>
- * For adressing data from other memory segments like I/O, Markers, ...
- * <pre>
- *     {memory area}/{byte offset}
- *     or
- *     {memory area}/{byte offset}/{bit offset}
- * </pre>
- * where the {bit-offset} is optional.
- * All Available Memory Areas for this mode are defined in the {@link MemoryArea} enum.
- */
-public class S7PlcConnection extends NettyPlcConnection implements PlcReader, PlcWriter, PlcSubscriber {
-
-    private static final int ISO_ON_TCP_PORT = 102;
-
-    // Fetch values from configuration
-    private static final Configuration CONF = new SystemConfiguration();
-    private static final long CLOSE_DEVICE_TIMEOUT_MS = CONF.getLong("plc4x.s7connection.close.device,timeout", 1_000);
-
-    private static final Logger logger = LoggerFactory.getLogger(S7PlcConnection.class);
-
-    private final int rack;
-    private final int slot;
-
-    private final short paramPduSize;
-    private final short paramMaxAmqCaller;
-    private final short paramMaxAmqCallee;
-    private final S7ControllerType paramControllerType;
-
-    private BlockingQueue<S7PushMessage> alarmsqueue;
-    
-    Map<Consumer, Collection<PlcSubscriptionHandle>> cyclicServicesSubscriptions = new HashMap();
-    
-    Map<SubscribedEventType, Map<Short, PlcSubscriptionHandle>> pushEventHandles = new HashMap();    
-    Map<Short, Collection<PlcSubscriptionHandle>> cyclicServicesHandles = new HashMap();
-    
-    private EventLoop alarmsloopthread;
-
-    public S7PlcConnection(InetAddress address, int rack, int slot, String params) {
-        this(new TcpSocketChannelFactory(address, ISO_ON_TCP_PORT), rack, slot, params);
-
-        logger.info("Setting up S7 Connection with: host-name {}, rack {}, slot {}, pdu-size {}, max-amq-caller {}, " +
-                "max-amq-callee {}", address.getHostAddress(), rack, slot,
-            paramPduSize, paramMaxAmqCaller, paramMaxAmqCallee);
-    }
-
-    public S7PlcConnection(ChannelFactory channelFactory, int rack, int slot, String params) {
-        super(channelFactory, true);
-
-        this.rack = rack;
-        this.slot = slot;
-
-        short curParamPduSize = 1024;
-        short curParamMaxAmqCaller = 8;
-        short curParamMaxAmqCallee = 8;
-        S7ControllerType curParamControllerType = S7ControllerType.ANY;
-
-        if (!StringUtils.isEmpty(params)) {
-            for (String param : params.split("&")) {
-                String[] paramElements = param.split("=");
-                String paramName = paramElements[0];
-                if (paramElements.length == 2) {
-                    String paramValue = paramElements[1];
-                    switch (paramName) {
-                        case "pdu-size":
-                            curParamPduSize = Short.parseShort(paramValue);
-                            break;
-                        case "max-amq-caller":
-                            curParamMaxAmqCaller = Short.parseShort(paramValue);
-                            break;
-                        case "max-amq-callee":
-                            curParamMaxAmqCallee = Short.parseShort(paramValue);
-                            break;
-                        case "controller-type":
-                            curParamControllerType = S7ControllerType.valueOf(paramValue);
-                            break;
-                        default:
-                            logger.debug("Unknown parameter {} with value {}", paramName, paramValue);
-                    }
-                } else {
-                    logger.debug("Unknown no-value parameter {}", paramName);
-                }
-            }
-        }
-
-        // It seems that the LOGO devices are a little picky about the pdu-size.
-        // Instead of handling this out, they just hang up without any error message.
-        // So in case of a LOGO controller, set this to a known working value.
-        if(curParamControllerType == S7ControllerType.LOGO && curParamPduSize == 1024) {
-            curParamPduSize = 480;
-        }
-
-        // IsoTP uses pre defined sizes. Find the smallest box,
-        // that would be able to contain the requested pdu size.
-        this.paramPduSize = curParamPduSize;
-        this.paramMaxAmqCaller = curParamMaxAmqCaller;
-        this.paramMaxAmqCallee = curParamMaxAmqCallee;
-        this.paramControllerType = curParamControllerType;
-                    
-        /*
-         * Take into account that the size of this buffer depends on the final device.
-         * S7-300 goes from 20 to 300 and for S7-400 it goes from 300 to 10000. 
-         * Depending on the configuration of the alarm system, a large number of 
-         * them should be expected when starting the connection. 
-         * (Examples of this are PCS7 and Braumat).
-         * Alarm filtering, ack, etc. must be performed by the client application.
-        */
-        this.alarmsqueue = new ArrayBlockingQueue<>(1024);
-        
-        Map<Short, PlcSubscriptionHandle> usrEventHandle = new HashMap();
-        Map<Short, PlcSubscriptionHandle> sysEventHandle = new HashMap();
-        Map<Short, PlcSubscriptionHandle> modeEventHandle = new HashMap();
-        Map<Short, PlcSubscriptionHandle> almEventHandle = new HashMap();
-        
-        pushEventHandles.put(SubscribedEventType.USR, usrEventHandle);
-        pushEventHandles.put(SubscribedEventType.SYS, sysEventHandle);
-        pushEventHandles.put(SubscribedEventType.MODE, modeEventHandle);
-        pushEventHandles.put(SubscribedEventType.ALM_S, almEventHandle);
-        pushEventHandles.put(SubscribedEventType.ALM_8, almEventHandle);
-        
-        alarmsloopthread = new EventLoop(channel,
-                                this.alarmsqueue,
-                                cyclicServicesSubscriptions,
-                                pushEventHandles,
-                                cyclicServicesHandles);
-
-    }
-
-    @Override
-    public boolean canRead() {
-        return true;
-    }
-
-    @Override
-    public boolean canWrite() {
-        return true;
-    }
-    
-    @Override
-    protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
-        //short calledTsapId = S7TsapIdEncoder.encodeS7TsapId(DeviceGroup.OS, 0, 0);
-        //short callingTsapId = S7TsapIdEncoder.encodeS7TsapId(DeviceGroup.PG_OR_PC, rack, slot);
-        short calledTsapId = S7TsapIdEncoder.encodeS7TsapId(DeviceGroup.PG_OR_PC, rack, slot);
-        short callingTsapId = S7TsapIdEncoder.encodeS7TsapId(DeviceGroup.OS, 0, 0);
-        
-        return new ChannelInitializer() {
-            @Override
-            protected void initChannel(Channel channel) {
-                // Build the protocol stack for communicating with the s7 protocol.
-                ChannelPipeline pipeline = channel.pipeline();
-                pipeline.addLast(new ChannelInboundHandlerAdapter() {
-                    @Override
-                    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
-                        if (evt instanceof ConnectedEvent) {
-                            sessionSetupCompleteFuture.complete(null);
-                        } else {
-                            super.userEventTriggered(ctx, evt);
-                        }
-                    }
-                });
-                pipeline.addLast(new IsoOnTcpProtocol());
-                pipeline.addLast(new IsoTPProtocol(callingTsapId, calledTsapId, TpduSize.valueForGivenSize(paramPduSize)));
-                pipeline.addLast(new S7Protocol(paramMaxAmqCaller, paramMaxAmqCallee, paramPduSize, paramControllerType,
-                    null)); //null <-> new DefaultS7MessageProcessor()
-                pipeline.addLast(new LongS7MessageProcessorCodec());
-                pipeline.addLast(new Plc4XS7Protocol(alarmsqueue));
-            }
-        };
-    }
-
-    @Override
-    protected void sendChannelCreatedEvent() {
-        // Send an event to the pipeline telling the Protocol filters what's going on.
-        channel.pipeline().fireUserEventTriggered(new ConnectEvent());
-    }
-
-    @Override
-    public PlcField prepareField(String fieldQuery) throws PlcInvalidFieldException {
-        return S7Field.of(fieldQuery);
-    }
-
-    public int getRack() {
-        return rack;
-    }
-
-    public int getSlot() {
-        return slot;
-    }
-
-    public short getParamPduSize() {
-        return paramPduSize;
-    }
-
-    public int getParamMaxAmqCaller() {
-        return paramMaxAmqCaller;
-    }
-
-    public int getParamMaxAmqCallee() {
-        return paramMaxAmqCallee;
-    }
-
-    public S7ControllerType getParamControllerType() {
-        return paramControllerType;
-    }
-
-    @Override
-    public void connect() throws PlcConnectionException {
-        super.connect(); 
-        alarmsloopthread.start();
-    }
-
-    
-    @Override
-    public void close() throws PlcConnectionException {
-        alarmsloopthread.cancel();
-        if ((channel != null) && channel.isOpen()) {
-            // Send the PLC a message that the connection is being closed.
-            DisconnectRequestTpdu disconnectRequest = new DisconnectRequestTpdu(
-                (short) 0x0000, (short) 0x000F, DisconnectReason.NORMAL, Collections.emptyList(),
-                Unpooled.EMPTY_BUFFER);
-
-            // In case of an ISO TP Class 0 connection, the remote is usually expected to actively
-            // close the connection. So we add a listener waiting for this to happen.
-            CompletableFuture<Void> disconnectFuture = new CompletableFuture<>();
-            channel.closeFuture().addListener(
-                (ChannelFutureListener) future -> disconnectFuture.complete(null));
-
-            // Send the disconnect request.
-            channel.writeAndFlush(disconnectRequest);
-            // Wait for the configured time for the remote to close the session.
-            try {
-                disconnectFuture.get(CLOSE_DEVICE_TIMEOUT_MS, TimeUnit.MILLISECONDS);
-            }
-            // If the remote didn't close the connection within the given time-frame, we have to take
-            // care of closing the connection.
-            catch (TimeoutException e) {
-                logger.debug("Remote didn't close connection within the configured timeout of {} ms, shutting down actively.", CLOSE_DEVICE_TIMEOUT_MS, e);
-                channel.close();
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-            } catch (ExecutionException e) {
-                throw new PlcConnectionException(e);
-            }
-
-            // Do some additional cleanup operations ...
-            // In normal operation, the channels event loop has a parent, however when running with
-            // the embedded channel for unit tests, parent is null.
-            if (channel.eventLoop().parent() != null) {
-                channel.eventLoop().parent().shutdownGracefully();
-            }
-        }
-        super.close();
-    }
-
-    @Override
-    public PlcReadRequest.Builder readRequestBuilder() {
-        return new DefaultPlcReadRequest.Builder(this, new S7PlcFieldHandler());
-    }
-
-    @Override
-    public PlcWriteRequest.Builder writeRequestBuilder() {
-        return new DefaultPlcWriteRequest.Builder(this, new S7PlcFieldHandler());
-    }
-
-    @Override
-    public PlcSubscriptionRequest.Builder subscriptionRequestBuilder() {
-        return new DefaultPlcSubscriptionRequest.Builder(this, new S7PlcFieldEventHandler());
-    }    
-    
-    @Override
-    public PlcUnsubscriptionRequest.Builder unsubscriptionRequestBuilder() {
-        return new DefaultPlcUnsubscriptionRequest.Builder(this);
-    }
-
-    @Override
-    public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
-        InternalPlcReadRequest internalReadRequest = checkInternal(readRequest, InternalPlcReadRequest.class);
-        CompletableFuture<InternalPlcReadResponse> future = new CompletableFuture<>();
-        PlcRequestContainer<InternalPlcReadRequest, InternalPlcReadResponse> container =
-            new PlcRequestContainer<>(internalReadRequest, future);
-        channel.writeAndFlush(container).addListener(f -> {
-            if (!f.isSuccess()) {
-                future.completeExceptionally(f.cause());
-            }
-        });
-        return future
-            .thenApply(PlcReadResponse.class::cast);
-    }
-
-    @Override
-    public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
-        InternalPlcWriteRequest internalWriteRequest = checkInternal(writeRequest, InternalPlcWriteRequest.class);
-        CompletableFuture<InternalPlcWriteResponse> future = new CompletableFuture<>();
-        PlcRequestContainer<InternalPlcWriteRequest, InternalPlcWriteResponse> container =
-            new PlcRequestContainer<>(internalWriteRequest, future);
-        channel.writeAndFlush(container).addListener(f -> {
-            if (!f.isSuccess()) {
-                future.completeExceptionally(f.cause());
-            }
-        });
-        return future
-            .thenApply(PlcWriteResponse.class::cast);
-    }
-
-    @Override
-    public CompletableFuture<PlcSubscriptionResponse> subscribe(PlcSubscriptionRequest subscriptionRequest) {
-        
-        InternalPlcSubscriptionRequest internalSubsRequest = checkInternal(subscriptionRequest, InternalPlcSubscriptionRequest.class);
-        
-        CompletableFuture<InternalPlcSubscriptionResponse> future = new CompletableFuture<>();
-        
-        PlcRequestContainer<InternalPlcSubscriptionRequest, InternalPlcSubscriptionResponse> container =
-            new PlcRequestContainer<>(internalSubsRequest, future);
-        
-        channel.writeAndFlush(container).addListener(f -> {
-            if (!f.isSuccess()) {
-                future.completeExceptionally(f.cause());
-            }
-        });       
-        
-        return future.thenApply(PlcSubscriptionResponse.class::cast);       
-    }
-
-    @Override
-    public CompletableFuture<PlcUnsubscriptionResponse> unsubscribe(PlcUnsubscriptionRequest unsubscriptionRequest) {
-        
-        InternalPlcUnsubscriptionRequest internalUnsubsRequest = checkInternal(unsubscriptionRequest, InternalPlcUnsubscriptionRequest.class);
-        
-        CompletableFuture<InternalPlcUnsubscriptionResponse> future = new CompletableFuture<>();
-        
-        PlcRequestContainer<InternalPlcUnsubscriptionRequest, InternalPlcUnsubscriptionResponse> container =
-            new PlcRequestContainer<>(internalUnsubsRequest, future);
-        
-        channel.writeAndFlush(container).addListener(f -> {
-            if (!f.isSuccess()) {
-                future.completeExceptionally(f.cause());
-            }
-        });      
-        
-        return future.thenApply(PlcUnsubscriptionResponse.class::cast);        
-    }
-
-    @Override
-    public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer, Collection<PlcSubscriptionHandle> handles) {
-        //Add any handler to 
-        Object objHandle = handles.toArray()[0];
-
-        if (objHandle instanceof S7CyclicServicesSubscriptionHandle) {
-            S7CyclicServicesSubscriptionHandle firtsHandle = (S7CyclicServicesSubscriptionHandle) objHandle;
-            handles.forEach(handle ->{            
-                S7CyclicServicesSubscriptionHandle s7handle = (S7CyclicServicesSubscriptionHandle) handle; 
-                s7handle.getConsumers().add(consumer);                           
-            });
-            
-            if (!cyclicServicesHandles.containsKey(firtsHandle.getJobId())){
-                cyclicServicesHandles.put((short) firtsHandle.getJobId(), handles);
-            }
-        }
-            
-        handles.forEach(handle ->{            
-            if (handle instanceof S7DiagnosticSubscriptionHandle) {
-                S7DiagnosticSubscriptionHandle s7handle = (S7DiagnosticSubscriptionHandle) handle; 
-                s7handle.getConsumers().add(consumer);
-                s7handle.getSubscribedevents().forEach((event)->{
-                    pushEventHandles.get(event).put(s7handle.getJobId(), s7handle);
-                });
-                
-            }
-        });
-        
-        if (!cyclicServicesSubscriptions.containsKey(consumer)){
-            cyclicServicesSubscriptions.put(consumer, handles);
-        }
-        
-        return null;
-    }
-
-    @Override
-    public void unregister(PlcConsumerRegistration registration) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    private class EventLoop extends Thread {
-        private volatile boolean cancelled;
-        private final Channel channel;
-        private boolean alarmquery;
-        private int delay;
-        private final Map<Consumer, Collection<PlcSubscriptionHandle>> cyclicServicesSubscriptions; 
-        private final Map<SubscribedEventType, Map<Short, PlcSubscriptionHandle>> pushEventHandles;        
-        private final Map<Short, Collection<PlcSubscriptionHandle>> cyclicServicesHandles;
-        private final BlockingQueue<S7PushMessage> alarmsqueue;
-        
-        EventLoop(Channel channel, 
-                BlockingQueue<S7PushMessage> alarmsqueue, 
-                Map<Consumer, Collection<PlcSubscriptionHandle>> cyclicServicesSubscriptions,
-                Map<SubscribedEventType, Map<Short, PlcSubscriptionHandle>> pushEventHandles,
-                Map<Short, Collection<PlcSubscriptionHandle>> cyclicServicesHandles) {
-            this.channel = channel;
-            this.alarmsqueue = alarmsqueue;
-            this.cyclicServicesSubscriptions = cyclicServicesSubscriptions;
-            this.pushEventHandles = pushEventHandles;
-            this.cyclicServicesHandles = cyclicServicesHandles;
-            this.alarmquery = true;
-            this.delay = 1000;
-        }
-        
-        @Override
-        public void run() {
-            while (!cancelled) { 
-                try {
-                    S7PushMessage msg = alarmsqueue.poll(delay, TimeUnit.MILLISECONDS);
-                    
-                    if (msg != null){
-                        if (msg instanceof AlarmMessagePayload){
-                            AlarmMessagePayload themsg = (AlarmMessagePayload) msg;
-                            logger.debug("AlarmMessagePayload: " + themsg);
-                            dispathAlmEvents(pushEventHandles.get(SubscribedEventType.ALM_8), themsg); 
-                            
-                        } else if (msg instanceof CpuDiagnosticPushParameter) {                            
-                            CpuDiagnosticPushParameter themsg = (CpuDiagnosticPushParameter) msg;
-                            logger.debug("CpuDiagnosticPushParameter: " + themsg);  
-                            dispathModeEvents(pushEventHandles.get(SubscribedEventType.MODE), themsg);
-                            
-                        } else if (msg instanceof CpuDiagnosticMessagePayload) {
-                            CpuDiagnosticMessagePayload themsg = (CpuDiagnosticMessagePayload) msg;
-                            logger.debug("CpuDiagnosticMessagePayload: " + themsg);
-                            int EventID = Short.toUnsignedInt(themsg.getMsg().getEventID());
-                            if ((EventID >= 0x0A000) & (EventID <= 0x0BFFF)) {
-                                dispathSysEvents(pushEventHandles.get(SubscribedEventType.USR), themsg);  
-                            } else {
-                                dispathSysEvents(pushEventHandles.get(SubscribedEventType.SYS), themsg);                                
-                            }
-                            
-                        } else if (msg instanceof CpuServicesPushParameter) {
-                            CpuServicesPushParameter themsg = (CpuServicesPushParameter) msg;
-                            logger.debug("CpuServicesPushParameter: " + themsg);
-                            
-                        } else if (msg instanceof CpuCyclicServicesResponsePayload) {
-                            CpuCyclicServicesResponsePayload themsg = (CpuCyclicServicesResponsePayload) msg;
-                            logger.debug("CpuCyclicServicesResponsePayload: " + themsg + " JobId:" + themsg.getJobId());
-                            
-                            Collection<PlcSubscriptionHandle> handles =  cyclicServicesHandles.get((short)themsg.getJobId());
-                            if (handles != null) {
-                                int i=0;
-                                for(PlcSubscriptionHandle handle:handles) {
-                                    AssociatedValueItem itemValue = ((S7CyclicServicesSubscriptionHandle) handle).getValueItem();
-                                    AssociatedValueItem newValue = themsg.getItems().get(i);
-                                    synchronized(newValue) {
-                                        itemValue.getData().setBytes(0, newValue.getData());
-                                    }                                    
-                                    i++;
-                                }; 
-                                
-                                if (cyclicServicesSubscriptions.containsValue(handles)){
-                                    Map<String, AssociatedValueItem> eventData = new HashMap();
-                                    synchronized(handles){
-                                        for (PlcSubscriptionHandle  handle:handles){
-                                            S7CyclicServicesSubscriptionHandle s7Handle = (S7CyclicServicesSubscriptionHandle) handle;
-                                            AssociatedValueItem newItem = new AssociatedValueItem(s7Handle.getValueItem().getReturnCode(),
-                                                                                    s7Handle.getValueItem().getDataTransportSize(),
-                                                                                    s7Handle.getValueItem().getLength(),
-                                                                                    s7Handle.getValueItem().getData().copy());
-                                            eventData.put(s7Handle.getFieldName(), newItem);                                        
-                                        }
-                                    };
-                                    
-                                    S7CyclicServicesSubscriptionHandle s7Handle = 
-                                            (S7CyclicServicesSubscriptionHandle) handles.toArray()[0];
-                                    Consumer<PlcSubscriptionEvent> consumer = 
-                                            (Consumer<PlcSubscriptionEvent> )s7Handle.getConsumers().toArray()[0];
-                                    S7CyclicValueEvent event = new S7CyclicValueEvent(eventData);
-                                    consumer.accept(event);
-                                }; 
-                                
-                            };
-                            
-                        } else {
-                            logger.info("Object type: " + msg.getClass());
-                        }                       
-                    } else {
-                        if (alarmquery){
-                            //TODO Send alarm query to plc
-                        } else {
-                            
-                        }
-                    }
-                                                            
-                } catch (InterruptedException ex) {
-                    logger.info(ex.getLocalizedMessage());
-                }
-            }
-            logger.info("Closing the alarm loop.");
-        }
-        
-        private void dispathAlmEvents(Map<Short, PlcSubscriptionHandle> handles, AlarmMessagePayload payload)
-        {          
-            List<S7Event> alarmsEvent = null;
-            Object object = payload.getMsgtype();
-            if (object != null) {
-                if (object instanceof CpuServicesParameterSubFunctionGroup) {
-                    CpuServicesParameterSubFunctionGroup subFunction = (CpuServicesParameterSubFunctionGroup) object;
-                    alarmsEvent = S7AlarmEvent.getAlarmsEvents(subFunction, payload);
-                }
-            }     
-            
-            for (PlcSubscriptionHandle handle:handles.values()){ 
-                S7DiagnosticSubscriptionHandle s7handle = (S7DiagnosticSubscriptionHandle) handle;
-                for (Consumer consumer:s7handle.getConsumers()){ 
-                    if (alarmsEvent != null) {
-                        for (S7Event event:alarmsEvent) {
-                            consumer.accept(event);
-                        }
-                    }
-                };
-            };              
-        }         
-        
-        private void dispathSysEvents(Map<Short, PlcSubscriptionHandle> handles, CpuDiagnosticMessagePayload payload)
-        {
-            handles.forEach((index,handle)->{
-                S7DiagnosticSubscriptionHandle thehandle = (S7DiagnosticSubscriptionHandle) handle;
-                thehandle.getConsumers().forEach((consumer)->{
-                    S7SysEvent event = new S7SysEvent(payload.getMsg());
-                    consumer.accept(event);
-                });
-            });              
-        }        
-        
-        private void dispathModeEvents(Map<Short, PlcSubscriptionHandle> handles, CpuDiagnosticPushParameter parameter)
-        {
-            handles.forEach((index,handle)->{
-                S7DiagnosticSubscriptionHandle thehandle = (S7DiagnosticSubscriptionHandle) handle;
-                thehandle.getConsumers().forEach((consumer)->{
-                    S7ModeEvent event = new S7ModeEvent(Instant.now(), parameter);
-                    consumer.accept(event);
-                });
-            });              
-        }              
-        
-        private void UpdateCyclicServicesData(S7CyclicServicesSubscriptionHandle handle, AssociatedValueItem newValue){
-            AssociatedValueItem itemValue = handle.getValueItem();
-
-            synchronized(newValue) {
-                itemValue.getData().setBytes(0, newValue.getData());
-            }
-            
-            cyclicServicesSubscriptions.forEach((consumer,handles)->{
-                if (handles.contains(handle)){
-                   
-                    if (consumer != null) {
-                        consumer.accept(null);
-                    };                    
-                    
-                }
-            });
-            
-        }              
-        
-        public void cancel() {
-            cancelled = true;  
-        }
-
-        public boolean isCancelled() {
-            return cancelled;
-        }
-        
-    }    
-    
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.s7.connection;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.*;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+import java.net.InetAddress;
+import java.time.Instant;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.function.Consumer;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.SystemConfiguration;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse;
+import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcUnsubscriptionResponse;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteResponse;
+import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+import org.apache.plc4x.java.base.connection.ChannelFactory;
+import org.apache.plc4x.java.base.connection.NettyPlcConnection;
+import org.apache.plc4x.java.base.events.ConnectEvent;
+import org.apache.plc4x.java.base.events.ConnectedEvent;
+import org.apache.plc4x.java.base.messages.*;
+import org.apache.plc4x.java.isoontcp.protocol.IsoOnTcpProtocol;
+import org.apache.plc4x.java.isotp.protocol.IsoTPProtocol;
+import org.apache.plc4x.java.isotp.protocol.model.tpdus.DisconnectRequestTpdu;
+import org.apache.plc4x.java.isotp.protocol.model.types.DeviceGroup;
+import org.apache.plc4x.java.isotp.protocol.model.types.DisconnectReason;
+import org.apache.plc4x.java.isotp.protocol.model.types.TpduSize;
+import org.apache.plc4x.java.s7.model.S7Field;
+import org.apache.plc4x.java.s7.netty.Plc4XS7Protocol;
+import org.apache.plc4x.java.s7.netty.S7HEmbeddedChannelFactory;
+import org.apache.plc4x.java.s7.netty.S7HProxy;
+import org.apache.plc4x.java.s7.netty.S7Protocol;
+import org.apache.plc4x.java.s7.netty.model.messages.S7PushMessage;
+import org.apache.plc4x.java.s7.netty.model.params.CpuDiagnosticPushParameter;
+import org.apache.plc4x.java.s7.netty.model.params.CpuServicesPushParameter;
+import org.apache.plc4x.java.s7.netty.model.payloads.AlarmMessagePayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuCyclicServicesResponsePayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuDiagnosticMessagePayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
+import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterSubFunctionGroup;
+import org.apache.plc4x.java.s7.netty.model.types.MemoryArea;
+import org.apache.plc4x.java.s7.netty.model.types.SubscribedEventType;
+import org.apache.plc4x.java.s7.netty.strategies.LongS7MessageProcessorCodec;
+import org.apache.plc4x.java.s7.netty.util.S7PlcFieldEventHandler;
+import org.apache.plc4x.java.s7.netty.util.S7PlcFieldHandler;
+import org.apache.plc4x.java.s7.protocol.S7CyclicServicesSubscriptionHandle;
+import org.apache.plc4x.java.s7.protocol.S7DiagnosticSubscriptionHandle;
+import org.apache.plc4x.java.s7.protocol.event.S7AlarmEvent;
+import org.apache.plc4x.java.s7.protocol.event.S7CyclicValueEvent;
+import org.apache.plc4x.java.s7.protocol.event.S7Event;
+import org.apache.plc4x.java.s7.protocol.event.S7ModeEvent;
+import org.apache.plc4x.java.s7.protocol.event.S7SysEvent;
+import org.apache.plc4x.java.s7.types.S7ControllerType;
+import org.apache.plc4x.java.s7.utils.S7TsapIdEncoder;
+import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Class implementing the Connection handling for Siemens S7.
+ * The adressing of Values in S7 works as follows:
+ * <p>
+ * For adressing values from Datablocks the following syntax is used:
+ * <pre>
+ *     DATA_BLOCKS/{blockNumer}/{byteOffset}
+ * </pre>
+ * <p>
+ * For adressing data from other memory segments like I/O, Markers, ...
+ * <pre>
+ *     {memory area}/{byte offset}
+ *     or
+ *     {memory area}/{byte offset}/{bit offset}
+ * </pre>
+ * where the {bit-offset} is optional.
+ * All Available Memory Areas for this mode are defined in the {@link MemoryArea} enum.
+ */
+public class S7PlcConnection extends NettyPlcConnection implements PlcReader, PlcWriter, PlcSubscriber {
+
+    private static final int ISO_ON_TCP_PORT = 102;
+
+    // Fetch values from configuration
+    private static final Configuration CONF = new SystemConfiguration();
+    private static final long CLOSE_DEVICE_TIMEOUT_MS = CONF.getLong("plc4x.s7connection.close.device,timeout", 1_000);
+
+    private static final Logger logger = LoggerFactory.getLogger(S7PlcConnection.class);
+
+    private boolean isHSystem;
+    
+    private final int rack;
+    private final int slot;
+    
+    int[] racks = new int[2];
+    int[] slots = new int[2];
+
+    private InetAddress[] haddress;    
+
+    private final short paramPduSize;
+    private final short paramMaxAmqCaller;
+    private final short paramMaxAmqCallee;
+    private final S7ControllerType paramControllerType;
+
+    private BlockingQueue<S7PushMessage> alarmsqueue;
+    
+    Map<Consumer, Collection<PlcSubscriptionHandle>> cyclicServicesSubscriptions = new HashMap();
+    
+    Map<SubscribedEventType, Map<Short, PlcSubscriptionHandle>> pushEventHandles = new HashMap();    
+    Map<Short, Collection<PlcSubscriptionHandle>> cyclicServicesHandles = new HashMap();
+    
+    private EventLoop alarmsloopthread;
+
+    public S7PlcConnection(InetAddress address, int rack, int slot, String params) {
+        this(new TcpSocketChannelFactory(address, ISO_ON_TCP_PORT), rack, slot, params);        
+        this.isHSystem = false;
+        
+        logger.info("Setting up S7 Connection with: host-name {}, rack {}, slot {}, pdu-size {}, max-amq-caller {}, " +
+                "max-amq-callee {}", address.getHostAddress(), rack, slot,
+            paramPduSize, paramMaxAmqCaller, paramMaxAmqCallee);
+    }
+    
+    /*
+    * Support for high availability R/H systems.
+    * H systems must have two independent racks, say Rack0 and Rack1. By default
+    * we will select Rack0 as master, however, it should be noted that this is 
+    * field selectable through a switch on the back of the S7400H CPU.
+    * To date there is no S7-1500 R/H system available to perform the tests, 
+    * so the tests will be guaranteed only with S7-400H systems.
+    */
+    public S7PlcConnection(InetAddress[] address, int[] racks, int[] slots, String params) {   
+        this(new S7HEmbeddedChannelFactory(), racks[0], slots[0], params);
+        this.isHSystem = true;     
+        
+        this.racks = racks;
+        this.slots = slots;
+        
+        this.haddress = address;
+
+        logger.info("Setting up S7H Connection with: host-name {}, rack {}, slot {}, pdu-size {}, max-amq-caller {}, " +
+                "max-amq-callee {}", address[0].getHostAddress(), racks[0], slots[0],
+            paramPduSize, paramMaxAmqCaller, paramMaxAmqCallee);
+    }
+    
+    public S7PlcConnection(ChannelFactory channelFactory, int rack, int slot, String params) {
+        super(channelFactory, true);
+
+        this.rack = rack;
+        this.slot = slot;        
+                      
+        short curParamPduSize = 1024;
+        short curParamMaxAmqCaller = 8;
+        short curParamMaxAmqCallee = 8;
+        S7ControllerType curParamControllerType = S7ControllerType.ANY;
+
+        if (!StringUtils.isEmpty(params)) {
+            for (String param : params.split("&")) {
+                String[] paramElements = param.split("=");
+                String paramName = paramElements[0];
+                if (paramElements.length == 2) {
+                    String paramValue = paramElements[1];
+                    switch (paramName) {
+                        case "pdu-size":
+                            curParamPduSize = Short.parseShort(paramValue);
+                            break;
+                        case "max-amq-caller":
+                            curParamMaxAmqCaller = Short.parseShort(paramValue);
+                            break;
+                        case "max-amq-callee":
+                            curParamMaxAmqCallee = Short.parseShort(paramValue);
+                            break;
+                        case "controller-type":
+                            curParamControllerType = S7ControllerType.valueOf(paramValue);
+                            break;
+                        default:
+                            logger.debug("Unknown parameter {} with value {}", paramName, paramValue);
+                    }
+                } else {
+                    logger.debug("Unknown no-value parameter {}", paramName);
+                }
+            }
+        }
+
+        // It seems that the LOGO devices are a little picky about the pdu-size.
+        // Instead of handling this out, they just hang up without any error message.
+        // So in case of a LOGO controller, set this to a known working value.
+        if(curParamControllerType == S7ControllerType.LOGO && curParamPduSize == 1024) {
+            curParamPduSize = 480;
+        }
+
+        // IsoTP uses pre defined sizes. Find the smallest box,
+        // that would be able to contain the requested pdu size.
+        this.paramPduSize = curParamPduSize;
+        this.paramMaxAmqCaller = curParamMaxAmqCaller;
+        this.paramMaxAmqCallee = curParamMaxAmqCallee;
+        this.paramControllerType = curParamControllerType;
+                    
+        /*
+         * Take into account that the size of this buffer depends on the final device.
+         * S7-300 goes from 20 to 300 and for S7-400 it goes from 300 to 10000. 
+         * Depending on the configuration of the alarm system, a large number of 
+         * them should be expected when starting the connection. 
+         * (Examples of this are PCS7 and Braumat).
+         * Alarm filtering, ack, etc. must be performed by the client application.
+        */
+        this.alarmsqueue = new ArrayBlockingQueue<>(1024);
+        
+        Map<Short, PlcSubscriptionHandle> usrEventHandle = new HashMap();
+        Map<Short, PlcSubscriptionHandle> sysEventHandle = new HashMap();
+        Map<Short, PlcSubscriptionHandle> modeEventHandle = new HashMap();
+        Map<Short, PlcSubscriptionHandle> almEventHandle = new HashMap();
+        
+        pushEventHandles.put(SubscribedEventType.USR, usrEventHandle);
+        pushEventHandles.put(SubscribedEventType.SYS, sysEventHandle);
+        pushEventHandles.put(SubscribedEventType.MODE, modeEventHandle);
+        pushEventHandles.put(SubscribedEventType.ALM_S, almEventHandle);
+        pushEventHandles.put(SubscribedEventType.ALM_8, almEventHandle);
+        
+        alarmsloopthread = new EventLoop(channel,
+                                this.alarmsqueue,
+                                cyclicServicesSubscriptions,
+                                pushEventHandles,
+                                cyclicServicesHandles);
+
+    }
+
+    @Override
+    public boolean canRead() {
+        return true;
+    }
+
+    @Override
+    public boolean canWrite() {
+        return true;
+    }
+    
+    @Override
+    protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
+        //short calledTsapId = S7TsapIdEncoder.encodeS7TsapId(DeviceGroup.OS, 0, 0);
+        //short callingTsapId = S7TsapIdEncoder.encodeS7TsapId(DeviceGroup.PG_OR_PC, rack, slot);
+        short calledTsapId = S7TsapIdEncoder.encodeS7TsapId(DeviceGroup.PG_OR_PC, rack, slot);
+        short callingTsapId = S7TsapIdEncoder.encodeS7TsapId(DeviceGroup.OS, 0, 0);
+        
+        return new ChannelInitializer() {
+            @Override
+            protected void initChannel(Channel channel) {
+                // Build the protocol stack for communicating with the s7 protocol.
+                ChannelPipeline pipeline = channel.pipeline();
+                pipeline.addLast(new ChannelInboundHandlerAdapter() {
+                    @Override
+                    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+                        if (evt instanceof ConnectedEvent) {
+                            sessionSetupCompleteFuture.complete(null);
+                        } else {
+                            super.userEventTriggered(ctx, evt);
+                        }
+                    }
+                });
+                
+                if (isHSystem) {
+                    pipeline.addLast(new S7HProxy(haddress, racks, slots)); 
+                } else {
+                    pipeline.addLast(new IsoOnTcpProtocol());
+                    pipeline.addLast(new IsoTPProtocol(callingTsapId, calledTsapId, TpduSize.valueForGivenSize(paramPduSize)));                    
+                }
+                pipeline.addLast(new S7Protocol(paramMaxAmqCaller, paramMaxAmqCallee, paramPduSize, paramControllerType,
+                    null)); //null <-> new DefaultS7MessageProcessor()
+                pipeline.addLast(new LongS7MessageProcessorCodec());
+                pipeline.addLast(new Plc4XS7Protocol(alarmsqueue));
+            }
+        };
+    }
+  
+    @Override
+    protected void sendChannelCreatedEvent() {
+        // Send an event to the pipeline telling the Protocol filters what's going on.
+        channel.pipeline().fireUserEventTriggered(new ConnectEvent());
+    }
+
+    @Override
+    public PlcField prepareField(String fieldQuery) throws PlcInvalidFieldException {
+        return S7Field.of(fieldQuery);
+    }
+
+    public int getRack() {
+        return rack;
+    }
+
+    public int getSlot() {
+        return slot;
+    }
+
+    public short getParamPduSize() {
+        return paramPduSize;
+    }
+
+    public int getParamMaxAmqCaller() {
+        return paramMaxAmqCaller;
+    }
+
+    public int getParamMaxAmqCallee() {
+        return paramMaxAmqCallee;
+    }
+
+    public S7ControllerType getParamControllerType() {
+        return paramControllerType;
+    }
+
+    @Override
+    public void connect() throws PlcConnectionException {
+        super.connect();
+        alarmsloopthread.start();
+    }
+
+    
+    @Override
+    public void close() throws PlcConnectionException {
+        alarmsloopthread.cancel();
+        if ((channel != null) && channel.isOpen()) {
+            // Send the PLC a message that the connection is being closed.
+            DisconnectRequestTpdu disconnectRequest = new DisconnectRequestTpdu(
+                (short) 0x0000, (short) 0x000F, DisconnectReason.NORMAL, Collections.emptyList(),
+                Unpooled.EMPTY_BUFFER);
+
+            // In case of an ISO TP Class 0 connection, the remote is usually expected to actively
+            // close the connection. So we add a listener waiting for this to happen.
+            CompletableFuture<Void> disconnectFuture = new CompletableFuture<>();
+            channel.closeFuture().addListener(
+                (ChannelFutureListener) future -> disconnectFuture.complete(null));
+
+            // Send the disconnect request.
+            channel.writeAndFlush(disconnectRequest);
+            // Wait for the configured time for the remote to close the session.
+            try {
+                disconnectFuture.get(CLOSE_DEVICE_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+            }
+            // If the remote didn't close the connection within the given time-frame, we have to take
+            // care of closing the connection.
+            catch (TimeoutException e) {
+                logger.debug("Remote didn't close connection within the configured timeout of {} ms, shutting down actively.", CLOSE_DEVICE_TIMEOUT_MS, e);
+                channel.close();
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            } catch (ExecutionException e) {
+                throw new PlcConnectionException(e);
+            }
+
+            // Do some additional cleanup operations ...
+            // In normal operation, the channels event loop has a parent, however when running with
+            // the embedded channel for unit tests, parent is null.
+            if (channel.eventLoop().parent() != null) {
+                channel.eventLoop().parent().shutdownGracefully();
+            }
+        }
+        super.close();
+    }
+
+    @Override
+    public PlcReadRequest.Builder readRequestBuilder() {
+        return new DefaultPlcReadRequest.Builder(this, new S7PlcFieldHandler());
+    }
+
+    @Override
+    public PlcWriteRequest.Builder writeRequestBuilder() {
+        return new DefaultPlcWriteRequest.Builder(this, new S7PlcFieldHandler());
+    }
+
+    @Override
+    public PlcSubscriptionRequest.Builder subscriptionRequestBuilder() {
+        return new DefaultPlcSubscriptionRequest.Builder(this, new S7PlcFieldEventHandler());
+    }    
+    
+    @Override
+    public PlcUnsubscriptionRequest.Builder unsubscriptionRequestBuilder() {
+        return new DefaultPlcUnsubscriptionRequest.Builder(this);
+    }
+
+    @Override
+    public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
+        InternalPlcReadRequest internalReadRequest = checkInternal(readRequest, InternalPlcReadRequest.class);
+        CompletableFuture<InternalPlcReadResponse> future = new CompletableFuture<>();
+        PlcRequestContainer<InternalPlcReadRequest, InternalPlcReadResponse> container =
+            new PlcRequestContainer<>(internalReadRequest, future);
+        channel.writeAndFlush(container).addListener(f -> {
+            if (!f.isSuccess()) {
+                future.completeExceptionally(f.cause());
+            }
+        });
+        return future
+            .thenApply(PlcReadResponse.class::cast);
+    }
+
+    @Override
+    public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
+        InternalPlcWriteRequest internalWriteRequest = checkInternal(writeRequest, InternalPlcWriteRequest.class);
+        CompletableFuture<InternalPlcWriteResponse> future = new CompletableFuture<>();
+        PlcRequestContainer<InternalPlcWriteRequest, InternalPlcWriteResponse> container =
+            new PlcRequestContainer<>(internalWriteRequest, future);
+        channel.writeAndFlush(container).addListener(f -> {
+            if (!f.isSuccess()) {
+                future.completeExceptionally(f.cause());
+            }
+        });
+        return future
+            .thenApply(PlcWriteResponse.class::cast);
+    }
+
+    @Override
+    public CompletableFuture<PlcSubscriptionResponse> subscribe(PlcSubscriptionRequest subscriptionRequest) {
+        
+        InternalPlcSubscriptionRequest internalSubsRequest = checkInternal(subscriptionRequest, InternalPlcSubscriptionRequest.class);
+        
+        CompletableFuture<InternalPlcSubscriptionResponse> future = new CompletableFuture<>();
+        
+        PlcRequestContainer<InternalPlcSubscriptionRequest, InternalPlcSubscriptionResponse> container =
+            new PlcRequestContainer<>(internalSubsRequest, future);
+        
+        channel.writeAndFlush(container).addListener(f -> {
+            if (!f.isSuccess()) {
+                future.completeExceptionally(f.cause());
+            }
+        });       
+        
+        return future.thenApply(PlcSubscriptionResponse.class::cast);       
+    }
+
+    @Override
+    public CompletableFuture<PlcUnsubscriptionResponse> unsubscribe(PlcUnsubscriptionRequest unsubscriptionRequest) {
+        
+        InternalPlcUnsubscriptionRequest internalUnsubsRequest = checkInternal(unsubscriptionRequest, InternalPlcUnsubscriptionRequest.class);
+        
+        CompletableFuture<InternalPlcUnsubscriptionResponse> future = new CompletableFuture<>();
+        
+        PlcRequestContainer<InternalPlcUnsubscriptionRequest, InternalPlcUnsubscriptionResponse> container =
+            new PlcRequestContainer<>(internalUnsubsRequest, future);
+        
+        channel.writeAndFlush(container).addListener(f -> {
+            if (!f.isSuccess()) {
+                future.completeExceptionally(f.cause());
+            }
+        });      
+        
+        return future.thenApply(PlcUnsubscriptionResponse.class::cast);        
+    }
+
+    @Override
+    public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer, Collection<PlcSubscriptionHandle> handles) {
+        //Add any handler to 
+        Object objHandle = handles.toArray()[0];
+
+        if (objHandle instanceof S7CyclicServicesSubscriptionHandle) {
+            S7CyclicServicesSubscriptionHandle firtsHandle = (S7CyclicServicesSubscriptionHandle) objHandle;
+            handles.forEach(handle ->{            
+                S7CyclicServicesSubscriptionHandle s7handle = (S7CyclicServicesSubscriptionHandle) handle; 
+                s7handle.getConsumers().add(consumer);                           
+            });
+            
+            if (!cyclicServicesHandles.containsKey(firtsHandle.getJobId())){
+                cyclicServicesHandles.put((short) firtsHandle.getJobId(), handles);
+            }
+        }
+            
+        handles.forEach(handle ->{            
+            if (handle instanceof S7DiagnosticSubscriptionHandle) {
+                S7DiagnosticSubscriptionHandle s7handle = (S7DiagnosticSubscriptionHandle) handle; 
+                s7handle.getConsumers().add(consumer);
+                s7handle.getSubscribedevents().forEach((event)->{
+                    pushEventHandles.get(event).put(s7handle.getJobId(), s7handle);
+                });
+                
+            }
+        });
+        
+        if (!cyclicServicesSubscriptions.containsKey(consumer)){
+            cyclicServicesSubscriptions.put(consumer, handles);
+        }
+        
+        return null;
+    }
+
+    @Override
+    public void unregister(PlcConsumerRegistration registration) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+  
+    
+    private class EventLoop extends Thread {
+        private volatile boolean cancelled;
+        private final Channel channel;
+        private boolean alarmquery;
+        private int delay;
+        private final Map<Consumer, Collection<PlcSubscriptionHandle>> cyclicServicesSubscriptions; 
+        private final Map<SubscribedEventType, Map<Short, PlcSubscriptionHandle>> pushEventHandles;        
+        private final Map<Short, Collection<PlcSubscriptionHandle>> cyclicServicesHandles;
+        private final BlockingQueue<S7PushMessage> alarmsqueue;
+        
+        EventLoop(Channel channel, 
+                BlockingQueue<S7PushMessage> alarmsqueue, 
+                Map<Consumer, Collection<PlcSubscriptionHandle>> cyclicServicesSubscriptions,
+                Map<SubscribedEventType, Map<Short, PlcSubscriptionHandle>> pushEventHandles,
+                Map<Short, Collection<PlcSubscriptionHandle>> cyclicServicesHandles) {
+            this.channel = channel;
+            this.alarmsqueue = alarmsqueue;
+            this.cyclicServicesSubscriptions = cyclicServicesSubscriptions;
+            this.pushEventHandles = pushEventHandles;
+            this.cyclicServicesHandles = cyclicServicesHandles;
+            this.alarmquery = true;
+            this.delay = 1000;
+        }
+        
+        @Override
+        public void run() {
+            while (!cancelled) { 
+                try {
+                    S7PushMessage msg = alarmsqueue.poll(delay, TimeUnit.MILLISECONDS);
+                    
+                    if (msg != null){
+                        if (msg instanceof AlarmMessagePayload){
+                            AlarmMessagePayload themsg = (AlarmMessagePayload) msg;
+                            logger.debug("AlarmMessagePayload: " + themsg);
+                            dispathAlmEvents(pushEventHandles.get(SubscribedEventType.ALM_8), themsg); 
+                            
+                        } else if (msg instanceof CpuDiagnosticPushParameter) {                            
+                            CpuDiagnosticPushParameter themsg = (CpuDiagnosticPushParameter) msg;
+                            logger.debug("CpuDiagnosticPushParameter: " + themsg);  
+                            dispathModeEvents(pushEventHandles.get(SubscribedEventType.MODE), themsg);
+                            
+                        } else if (msg instanceof CpuDiagnosticMessagePayload) {
+                            CpuDiagnosticMessagePayload themsg = (CpuDiagnosticMessagePayload) msg;
+                            logger.debug("CpuDiagnosticMessagePayload: " + themsg);
+                            int EventID = Short.toUnsignedInt(themsg.getMsg().getEventID());
+                            if ((EventID >= 0x0A000) & (EventID <= 0x0BFFF)) {
+                                dispathSysEvents(pushEventHandles.get(SubscribedEventType.USR), themsg);  
+                            } else {
+                                dispathSysEvents(pushEventHandles.get(SubscribedEventType.SYS), themsg);                                
+                            }
+                            
+                        } else if (msg instanceof CpuServicesPushParameter) {
+                            CpuServicesPushParameter themsg = (CpuServicesPushParameter) msg;
+                            logger.debug("CpuServicesPushParameter: " + themsg);
+                            
+                        } else if (msg instanceof CpuCyclicServicesResponsePayload) {
+                            CpuCyclicServicesResponsePayload themsg = (CpuCyclicServicesResponsePayload) msg;
+                            logger.debug("CpuCyclicServicesResponsePayload: " + themsg + " JobId:" + themsg.getJobId());
+                            
+                            Collection<PlcSubscriptionHandle> handles =  cyclicServicesHandles.get((short)themsg.getJobId());
+                            if (handles != null) {
+                                int i=0;
+                                for(PlcSubscriptionHandle handle:handles) {
+                                    AssociatedValueItem itemValue = ((S7CyclicServicesSubscriptionHandle) handle).getValueItem();
+                                    AssociatedValueItem newValue = themsg.getItems().get(i);
+                                    synchronized(newValue) {
+                                        itemValue.getData().setBytes(0, newValue.getData());
+                                    }                                    
+                                    i++;
+                                }; 
+                                
+                                if (cyclicServicesSubscriptions.containsValue(handles)){
+                                    Map<String, AssociatedValueItem> eventData = new HashMap();
+                                    synchronized(handles){
+                                        for (PlcSubscriptionHandle  handle:handles){
+                                            S7CyclicServicesSubscriptionHandle s7Handle = (S7CyclicServicesSubscriptionHandle) handle;
+                                            AssociatedValueItem newItem = new AssociatedValueItem(s7Handle.getValueItem().getReturnCode(),
+                                                                                    s7Handle.getValueItem().getDataTransportSize(),
+                                                                                    s7Handle.getValueItem().getLength(),
+                                                                                    s7Handle.getValueItem().getData().copy());
+                                            eventData.put(s7Handle.getFieldName(), newItem);                                        
+                                        }
+                                    };
+                                    
+                                    S7CyclicServicesSubscriptionHandle s7Handle = 
+                                            (S7CyclicServicesSubscriptionHandle) handles.toArray()[0];
+                                    Consumer<PlcSubscriptionEvent> consumer = 
+                                            (Consumer<PlcSubscriptionEvent> )s7Handle.getConsumers().toArray()[0];
+                                    S7CyclicValueEvent event = new S7CyclicValueEvent(eventData);
+                                    consumer.accept(event);
+                                }; 
+                                
+                            };
+                            
+                        } else {
+                            logger.info("Object type: " + msg.getClass());
+                        }                       
+                    } else {
+                        if (alarmquery){
+                            //TODO Send alarm query to plc
+                        } else {
+                            
+                        }
+                    }
+                                                            
+                } catch (InterruptedException ex) {
+                    logger.info(ex.getLocalizedMessage());
+                }
+            }
+            logger.info("Closing the alarm loop.");
+        }
+        
+        private void dispathAlmEvents(Map<Short, PlcSubscriptionHandle> handles, AlarmMessagePayload payload)
+        {          
+            List<S7Event> alarmsEvent = null;
+            Object object = payload.getMsgtype();
+            if (object != null) {
+                if (object instanceof CpuServicesParameterSubFunctionGroup) {
+                    CpuServicesParameterSubFunctionGroup subFunction = (CpuServicesParameterSubFunctionGroup) object;
+                    alarmsEvent = S7AlarmEvent.getAlarmsEvents(subFunction, payload);
+                }
+            }     
+            
+            for (PlcSubscriptionHandle handle:handles.values()){ 
+                S7DiagnosticSubscriptionHandle s7handle = (S7DiagnosticSubscriptionHandle) handle;
+                for (Consumer consumer:s7handle.getConsumers()){ 
+                    if (alarmsEvent != null) {
+                        for (S7Event event:alarmsEvent) {
+                            consumer.accept(event);
+                        }
+                    }
+                };
+            };              
+        }         
+        
+        private void dispathSysEvents(Map<Short, PlcSubscriptionHandle> handles, CpuDiagnosticMessagePayload payload)
+        {
+            handles.forEach((index,handle)->{
+                S7DiagnosticSubscriptionHandle thehandle = (S7DiagnosticSubscriptionHandle) handle;
+                thehandle.getConsumers().forEach((consumer)->{
+                    S7SysEvent event = new S7SysEvent(payload.getMsg());
+                    consumer.accept(event);
+                });
+            });              
+        }        
+        
+        private void dispathModeEvents(Map<Short, PlcSubscriptionHandle> handles, CpuDiagnosticPushParameter parameter)
+        {
+            handles.forEach((index,handle)->{
+                S7DiagnosticSubscriptionHandle thehandle = (S7DiagnosticSubscriptionHandle) handle;
+                thehandle.getConsumers().forEach((consumer)->{
+                    S7ModeEvent event = new S7ModeEvent(Instant.now(), parameter);
+                    consumer.accept(event);
+                });
+            });              
+        }              
+        
+        private void UpdateCyclicServicesData(S7CyclicServicesSubscriptionHandle handle, AssociatedValueItem newValue){
+            AssociatedValueItem itemValue = handle.getValueItem();
+
+            synchronized(newValue) {
+                itemValue.getData().setBytes(0, newValue.getData());
+            }
+            
+            cyclicServicesSubscriptions.forEach((consumer,handles)->{
+                if (handles.contains(handle)){
+                   
+                    if (consumer != null) {
+                        consumer.accept(null);
+                    };                    
+                    
+                }
+            });
+            
+        }              
+        
+        public void cancel() {
+            cancelled = true;  
+        }
+
+        public boolean isCancelled() {
+            return cancelled;
+        }
+        
+    }    
+    
+}
diff --git a/plc4j/drivers/s7/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver b/plc4j/drivers/s7/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
index 09986004376..3ec28d8af37 100644
--- a/plc4j/drivers/s7/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
+++ b/plc4j/drivers/s7/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
@@ -1,19 +1,19 @@
-#
-# 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
-#
-#   http://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.
-#
-org.apache.plc4x.java.s7.S7PlcDriver
+#
+# 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
+#
+#   http://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.
+#
+org.apache.plc4x.java.s7.S7PlcDriver
diff --git a/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/BenchmarkS7.java b/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/BenchmarkS7.java
index 827ea3e3584..752496dfede 100644
--- a/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/BenchmarkS7.java
+++ b/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/BenchmarkS7.java
@@ -1,90 +1,90 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.s7;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.embedded.EmbeddedChannel;
-import org.apache.commons.codec.binary.Hex;
-import org.apache.plc4x.java.base.PlcMessageToMessageCodec;
-import org.apache.plc4x.java.base.messages.PlcRequestContainer;
-import org.apache.plc4x.java.isoontcp.protocol.IsoOnTcpProtocol;
-import org.apache.plc4x.java.isotp.protocol.IsoTPProtocol;
-import org.apache.plc4x.java.isotp.protocol.model.types.TpduSize;
-import org.apache.plc4x.java.s7.netty.S7Protocol;
-import org.apache.plc4x.java.s7.netty.model.messages.S7Message;
-import org.apache.plc4x.java.s7.types.S7ControllerType;
-
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-
-public class BenchmarkS7 {
-
-    public static void main(String[] args) throws Exception {
-        byte[] data = Hex.decodeHex("0300006702f080320100000001005600000407120a10060001032b84000160120a10020001032b840001a0120a10010001032b840001a9120a10050001032b84000150120a10020001032b84000198120a10040001032b84000140120a10020001032b84000190");
-        TimedMessageCodec timedMessageCodec = new TimedMessageCodec();
-        EmbeddedChannel channel = new EmbeddedChannel(
-            new IsoOnTcpProtocol(),
-            new IsoTPProtocol((short) 0, (short) 0, TpduSize.SIZE_512),
-            new S7Protocol((short) 1, (short) 1, (short) 512, S7ControllerType.S7_1500, null),
-            timedMessageCodec
-            );
-
-        long start = System.currentTimeMillis();
-        int numRuns = 20000;
-        for(int i = 0; i < numRuns; i++) {
-            run(data, channel, timedMessageCodec);
-        }
-        long end = System.currentTimeMillis();
-        System.out.println("Parsed " + numRuns + " packets in " + (end - start) + "ms");
-        System.out.println("That's " + ((float) (end - start) / numRuns) + "ms per packet");
-    }
-
-    public static void run(byte[] data, EmbeddedChannel channel, TimedMessageCodec timedMessageCodec) {
-        CompletableFuture<S7Message> future = new CompletableFuture<>();
-        timedMessageCodec.setFuture(future);
-        channel.writeInbound(Unpooled.wrappedBuffer(data));
-        try {
-            future.get();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private static class TimedMessageCodec extends PlcMessageToMessageCodec<S7Message, PlcRequestContainer> {
-
-        CompletableFuture<S7Message> future;
-
-        public void setFuture(CompletableFuture<S7Message> future) {
-            this.future = future;
-        }
-
-        @Override
-        protected void encode(ChannelHandlerContext ctx, PlcRequestContainer msg, List<Object> out) throws Exception {
-
-        }
-
-        @Override
-        protected void decode(ChannelHandlerContext ctx, S7Message msg, List<Object> out) throws Exception {
-            future.complete(msg);
-        }
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.embedded.EmbeddedChannel;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.plc4x.java.base.PlcMessageToMessageCodec;
+import org.apache.plc4x.java.base.messages.PlcRequestContainer;
+import org.apache.plc4x.java.isoontcp.protocol.IsoOnTcpProtocol;
+import org.apache.plc4x.java.isotp.protocol.IsoTPProtocol;
+import org.apache.plc4x.java.isotp.protocol.model.types.TpduSize;
+import org.apache.plc4x.java.s7.netty.S7Protocol;
+import org.apache.plc4x.java.s7.netty.model.messages.S7Message;
+import org.apache.plc4x.java.s7.types.S7ControllerType;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
+public class BenchmarkS7 {
+
+    public static void main(String[] args) throws Exception {
+        byte[] data = Hex.decodeHex("0300006702f080320100000001005600000407120a10060001032b84000160120a10020001032b840001a0120a10010001032b840001a9120a10050001032b84000150120a10020001032b84000198120a10040001032b84000140120a10020001032b84000190");
+        TimedMessageCodec timedMessageCodec = new TimedMessageCodec();
+        EmbeddedChannel channel = new EmbeddedChannel(
+            new IsoOnTcpProtocol(),
+            new IsoTPProtocol((short) 0, (short) 0, TpduSize.SIZE_512),
+            new S7Protocol((short) 1, (short) 1, (short) 512, S7ControllerType.S7_1500, null),
+            timedMessageCodec
+            );
+
+        long start = System.currentTimeMillis();
+        int numRuns = 20000;
+        for(int i = 0; i < numRuns; i++) {
+            run(data, channel, timedMessageCodec);
+        }
+        long end = System.currentTimeMillis();
+        System.out.println("Parsed " + numRuns + " packets in " + (end - start) + "ms");
+        System.out.println("That's " + ((float) (end - start) / numRuns) + "ms per packet");
+    }
+
+    public static void run(byte[] data, EmbeddedChannel channel, TimedMessageCodec timedMessageCodec) {
+        CompletableFuture<S7Message> future = new CompletableFuture<>();
+        timedMessageCodec.setFuture(future);
+        channel.writeInbound(Unpooled.wrappedBuffer(data));
+        try {
+            future.get();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static class TimedMessageCodec extends PlcMessageToMessageCodec<S7Message, PlcRequestContainer> {
+
+        CompletableFuture<S7Message> future;
+
+        public void setFuture(CompletableFuture<S7Message> future) {
+            this.future = future;
+        }
+
+        @Override
+        protected void encode(ChannelHandlerContext ctx, PlcRequestContainer msg, List<Object> out) throws Exception {
+
+        }
+
+        @Override
+        protected void decode(ChannelHandlerContext ctx, S7Message msg, List<Object> out) throws Exception {
+            future.complete(msg);
+        }
+    }
+
+}
diff --git a/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcDriverTest.java b/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcDriverTest.java
index 76329e9ea93..2e58e07f1ef 100644
--- a/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcDriverTest.java
+++ b/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcDriverTest.java
@@ -1,81 +1,81 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7;
-
-import org.apache.plc4x.java.api.authentication.PlcUsernamePasswordAuthentication;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.exceptions.PlcException;
-import org.apache.plc4x.java.s7.connection.S7PlcConnection;
-import org.apache.plc4x.test.FastTests;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-
-public class S7PlcDriverTest {
-
-    @Test
-    @Category(FastTests.class)
-    public void getProtocolCode() {
-        assertThat(new S7PlcDriver().getProtocolCode(), equalTo("s7"));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void getProtocolName() {
-        assertThat(new S7PlcDriver().getProtocolName(), equalTo("Siemens S7 (Basic)"));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void getConnection() throws PlcException {
-        S7PlcConnection s7Connection = (S7PlcConnection) new S7PlcDriver().connect("s7://localhost/1/2");
-        assertThat(s7Connection.getRack(), equalTo(1));
-        assertThat(s7Connection.getSlot(), equalTo(2));
-    }
-
-    @Test(expected = PlcConnectionException.class)
-    @Category(FastTests.class)
-    @Ignore("This test tends to fail on systems with DNS providers that proivde default IPs")
-    public void getConnectionToUnknownHost() throws PlcException {
-        new S7PlcDriver().connect("s7://IHopeThisHostDoesntExistAAAAAAAAhhhhhhh/1/2");
-    }
-
-    /**
-     * In this test case the 's7' driver should report an invalid url format.
-     */
-    @Test(expected = PlcConnectionException.class)
-    @Category(FastTests.class)
-    public void getConnectionInvalidUrl() throws PlcConnectionException {
-        new S7PlcDriver().connect("s7://localhost/hurz/2");
-    }
-
-    /**
-     * In this test case the 's7' driver should report an error as this protocol
-     * doesn't support authentication.
-     */
-    @Test(expected = PlcConnectionException.class)
-    @Category(FastTests.class)
-    public void getConnectionWithAuthentication() throws PlcConnectionException {
-        new S7PlcDriver().connect("s7://localhost/1/2", new PlcUsernamePasswordAuthentication("user", "pass"));
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7;
+
+import org.apache.plc4x.java.api.authentication.PlcUsernamePasswordAuthentication;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.exceptions.PlcException;
+import org.apache.plc4x.java.s7.connection.S7PlcConnection;
+import org.apache.plc4x.test.FastTests;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+
+public class S7PlcDriverTest {
+
+    @Test
+    @Category(FastTests.class)
+    public void getProtocolCode() {
+        assertThat(new S7PlcDriver().getProtocolCode(), equalTo("s7"));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void getProtocolName() {
+        assertThat(new S7PlcDriver().getProtocolName(), equalTo("Siemens S7 (Basic)"));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void getConnection() throws PlcException {
+        S7PlcConnection s7Connection = (S7PlcConnection) new S7PlcDriver().connect("s7://localhost/1/2");
+        assertThat(s7Connection.getRack(), equalTo(1));
+        assertThat(s7Connection.getSlot(), equalTo(2));
+    }
+
+    @Test(expected = PlcConnectionException.class)
+    @Category(FastTests.class)
+    @Ignore("This test tends to fail on systems with DNS providers that proivde default IPs")
+    public void getConnectionToUnknownHost() throws PlcException {
+        new S7PlcDriver().connect("s7://IHopeThisHostDoesntExistAAAAAAAAhhhhhhh/1/2");
+    }
+
+    /**
+     * In this test case the 's7' driver should report an invalid url format.
+     */
+    @Test(expected = PlcConnectionException.class)
+    @Category(FastTests.class)
+    public void getConnectionInvalidUrl() throws PlcConnectionException {
+        new S7PlcDriver().connect("s7://localhost/hurz/2");
+    }
+
+    /**
+     * In this test case the 's7' driver should report an error as this protocol
+     * doesn't support authentication.
+     */
+    @Test(expected = PlcConnectionException.class)
+    @Category(FastTests.class)
+    public void getConnectionWithAuthentication() throws PlcConnectionException {
+        new S7PlcDriver().connect("s7://localhost/1/2", new PlcUsernamePasswordAuthentication("user", "pass"));
+    }
+
+}
diff --git a/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/connection/S7PlcConnectionIT.java b/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/connection/S7PlcConnectionIT.java
index 66d58d2fa30..af1642cee88 100644
--- a/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/connection/S7PlcConnectionIT.java
+++ b/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/connection/S7PlcConnectionIT.java
@@ -1,137 +1,137 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.connection;
-
-import io.netty.channel.embedded.EmbeddedChannel;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.messages.PlcWriteResponse;
-import org.apache.plc4x.test.RequirePcapNg;
-import org.junit.Rule;
-import org.junit.jupiter.api.*;
-import org.junit.rules.Timeout;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.junit.Assert.assertThat;
-
-public class S7PlcConnectionIT {
-
-    @Rule
-    public Timeout globalTimeout = Timeout.seconds(4); // 4 seconds max per method tested
-
-    private S7PlcTestConnection SUT;
-
-    @BeforeEach
-    public void setUp() {
-        SUT = new S7PlcTestConnection(1, 2,
-            "pdu-size=128&max-amq-caller=2&max-amq-callee=3&unknown=parameter&unknown-flag");
-    }
-
-    @AfterEach
-    public void tearDown() throws PlcConnectionException{
-        if(SUT.isConnected()) {
-            SUT.close();
-        }
-        SUT = null;
-    }
-
-    @Test
-    public void connectAndClose() throws Exception {
-        SUT.connect();
-        SUT.close();
-    }
-
-    @Test
-    @Disabled("Seems the RequirePcapNg doesn't work with Java 12")
-    @RequirePcapNg
-    public void read(TestInfo testInfo) throws Exception {
-        SUT.connect();
-        EmbeddedChannel channel = (EmbeddedChannel) SUT.getChannel();
-        assertThat("No outbound messages should exist.", channel.outboundMessages().size(), equalTo(0));
-
-        PlcReadRequest request = SUT.readRequestBuilder().addItem("test", "%Q0.4:BOOL").build();
-        CompletableFuture<PlcReadResponse> responseFuture = SUT.read(request);
-        // Check that one message has been sent.
-        assertThat("Exactly one outbound message should exist after sending.",
-            channel.outboundMessages().size(), equalTo(1));
-        SUT.verifyPcapFile("org/apache/plc4x/java/s7/connection/s7-read-var-request.pcap", testInfo);
-
-        // Manually feed a packet response into the channel.
-        SUT.sendPcapFile("org/apache/plc4x/java/s7/connection/s7-read-var-response.pcap");
-
-        // Now get the response as it was processed by the connection.
-        PlcReadResponse response = responseFuture.get(200, TimeUnit.MILLISECONDS);
-
-        assertThat(response, notNullValue());
-
-        SUT.close();
-    }
-
-    /**
-     * In case of a slow network connection Netty tends to call the IsoOnTcpProtocol decode method
-     * prior to reading the full packet. Therefor we usually check if enough bytes have been read.
-     * If not we give up and wait for Netty to call again.
-     *
-     * In case of a fast connection with large response sizes it seems that Netty splits up the
-     * responses into 512 byte chunks.
-     */
-    @Test
-    @Disabled
-    @RequirePcapNg
-    public void readLargeResponse() throws Exception {
-        SUT.connect();
-        EmbeddedChannel channel = (EmbeddedChannel) SUT.getChannel();
-        assertThat("No outbound messages should exist.", channel.outboundMessages().size(), equalTo(0));
-
-        SUT.sendPcapFile("org/apache/plc4x/java/s7/connection/s7-read-large-response.pcap");
-    }
-
-    @Test
-    @Disabled("Seems the RequirePcapNg doesn't work with Java 12")
-    @RequirePcapNg
-    public void write(TestInfo testInfo) throws Exception {
-        SUT.connect();
-        EmbeddedChannel channel = (EmbeddedChannel) SUT.getChannel();
-        assertThat("No outbound messages should exist.", channel.outboundMessages().size(), equalTo(0));
-
-        PlcWriteRequest request = SUT.writeRequestBuilder().addItem("test", "%Q0.4:BOOL", true).build();
-        CompletableFuture<PlcWriteResponse> responseFuture = SUT.write(request);
-        // Check that one message has been sent.
-        assertThat("Exactly one outbound message should exist after sending.",
-            channel.outboundMessages().size(), equalTo(1));
-        SUT.verifyPcapFile("org/apache/plc4x/java/s7/connection/s7-write-var-request.pcap", testInfo);
-
-        // Manually feed a packet response into the channel.
-        SUT.sendPcapFile("org/apache/plc4x/java/s7/connection/s7-write-var-response.pcap");
-
-        // Now get the response as it was processed by the connection.
-        PlcWriteResponse response = responseFuture.get(200, TimeUnit.MILLISECONDS);
-
-        assertThat(response, notNullValue());
-
-        SUT.close();
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.connection;
+
+import io.netty.channel.embedded.EmbeddedChannel;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteResponse;
+import org.apache.plc4x.test.RequirePcapNg;
+import org.junit.Rule;
+import org.junit.jupiter.api.*;
+import org.junit.rules.Timeout;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.junit.Assert.assertThat;
+
+public class S7PlcConnectionIT {
+
+    @Rule
+    public Timeout globalTimeout = Timeout.seconds(4); // 4 seconds max per method tested
+
+    private S7PlcTestConnection SUT;
+
+    @BeforeEach
+    public void setUp() {
+        SUT = new S7PlcTestConnection(1, 2,
+            "pdu-size=128&max-amq-caller=2&max-amq-callee=3&unknown=parameter&unknown-flag");
+    }
+
+    @AfterEach
+    public void tearDown() throws PlcConnectionException{
+        if(SUT.isConnected()) {
+            SUT.close();
+        }
+        SUT = null;
+    }
+
+    @Test
+    public void connectAndClose() throws Exception {
+        SUT.connect();
+        SUT.close();
+    }
+
+    @Test
+    @Disabled("Seems the RequirePcapNg doesn't work with Java 12")
+    @RequirePcapNg
+    public void read(TestInfo testInfo) throws Exception {
+        SUT.connect();
+        EmbeddedChannel channel = (EmbeddedChannel) SUT.getChannel();
+        assertThat("No outbound messages should exist.", channel.outboundMessages().size(), equalTo(0));
+
+        PlcReadRequest request = SUT.readRequestBuilder().addItem("test", "%Q0.4:BOOL").build();
+        CompletableFuture<PlcReadResponse> responseFuture = SUT.read(request);
+        // Check that one message has been sent.
+        assertThat("Exactly one outbound message should exist after sending.",
+            channel.outboundMessages().size(), equalTo(1));
+        SUT.verifyPcapFile("org/apache/plc4x/java/s7/connection/s7-read-var-request.pcap", testInfo);
+
+        // Manually feed a packet response into the channel.
+        SUT.sendPcapFile("org/apache/plc4x/java/s7/connection/s7-read-var-response.pcap");
+
+        // Now get the response as it was processed by the connection.
+        PlcReadResponse response = responseFuture.get(200, TimeUnit.MILLISECONDS);
+
+        assertThat(response, notNullValue());
+
+        SUT.close();
+    }
+
+    /**
+     * In case of a slow network connection Netty tends to call the IsoOnTcpProtocol decode method
+     * prior to reading the full packet. Therefor we usually check if enough bytes have been read.
+     * If not we give up and wait for Netty to call again.
+     *
+     * In case of a fast connection with large response sizes it seems that Netty splits up the
+     * responses into 512 byte chunks.
+     */
+    @Test
+    @Disabled
+    @RequirePcapNg
+    public void readLargeResponse() throws Exception {
+        SUT.connect();
+        EmbeddedChannel channel = (EmbeddedChannel) SUT.getChannel();
+        assertThat("No outbound messages should exist.", channel.outboundMessages().size(), equalTo(0));
+
+        SUT.sendPcapFile("org/apache/plc4x/java/s7/connection/s7-read-large-response.pcap");
+    }
+
+    @Test
+    @Disabled("Seems the RequirePcapNg doesn't work with Java 12")
+    @RequirePcapNg
+    public void write(TestInfo testInfo) throws Exception {
+        SUT.connect();
+        EmbeddedChannel channel = (EmbeddedChannel) SUT.getChannel();
+        assertThat("No outbound messages should exist.", channel.outboundMessages().size(), equalTo(0));
+
+        PlcWriteRequest request = SUT.writeRequestBuilder().addItem("test", "%Q0.4:BOOL", true).build();
+        CompletableFuture<PlcWriteResponse> responseFuture = SUT.write(request);
+        // Check that one message has been sent.
+        assertThat("Exactly one outbound message should exist after sending.",
+            channel.outboundMessages().size(), equalTo(1));
+        SUT.verifyPcapFile("org/apache/plc4x/java/s7/connection/s7-write-var-request.pcap", testInfo);
+
+        // Manually feed a packet response into the channel.
+        SUT.sendPcapFile("org/apache/plc4x/java/s7/connection/s7-write-var-response.pcap");
+
+        // Now get the response as it was processed by the connection.
+        PlcWriteResponse response = responseFuture.get(200, TimeUnit.MILLISECONDS);
+
+        assertThat(response, notNullValue());
+
+        SUT.close();
+    }
+
+}
diff --git a/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/connection/S7PlcConnectionTests.java b/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/connection/S7PlcConnectionTests.java
index cb28cb0df27..25f2a946028 100644
--- a/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/connection/S7PlcConnectionTests.java
+++ b/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/connection/S7PlcConnectionTests.java
@@ -1,93 +1,93 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.s7.connection;
-
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.exceptions.PlcUnsupportedOperationException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.s7.model.S7Field;
-import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.junit.Assert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-public class S7PlcConnectionTests {
-
-    private S7PlcTestConnection SUT;
-
-    @Before
-    public void setUp() {
-        SUT = new S7PlcTestConnection(1, 2,
-            "pdu-size=128&max-amq-caller=2&max-amq-callee=3&unknown=parameter&unknown-flag");
-    }
-
-    @After
-    public void tearDown() {
-        SUT = null;
-    }
-
-    @Test
-    public void initialState() {
-        assertThat("Rack is incorrect", SUT.getRack(), equalTo(1) );
-        assertThat("Slot is incorrect", SUT.getSlot(), equalTo(2) );
-        assertThat("Pdu size is incorrect", SUT.getParamPduSize(), equalTo((short) 128));
-        assertThat("Max AMQ Caller size is incorrect", SUT.getParamMaxAmqCaller(), equalTo(2) );
-        assertThat("Max AMQ Callee size is incorrect", SUT.getParamMaxAmqCallee(), equalTo(3) );
-    }
-
-    /**
-     * When configuring a connection to a LOGO device, then the pdu size has to be set to a different value.
-     */
-    @Test
-    public void initialStateLogo() {
-        SUT = new S7PlcTestConnection(1, 2, "controller-type=LOGO");
-        assertThat("Pdu size is incorrect", SUT.getParamPduSize(), equalTo((short) 480));
-    }
-
-    @Test
-    public void capabilities() {
-        assertThat(SUT.canRead(), equalTo(true));
-        assertThat(SUT.readRequestBuilder(), notNullValue());
-
-        assertThat(SUT.canWrite(), equalTo(true));
-        assertThat(SUT.writeRequestBuilder(), notNullValue());
-
-        assertThat(SUT.canSubscribe(), equalTo(false));
-        assertThrows(PlcUnsupportedOperationException.class, () -> SUT.subscriptionRequestBuilder());
-        assertThrows(PlcUnsupportedOperationException.class, () -> SUT.unsubscriptionRequestBuilder());
-    }
-
-    @Test
-    public void prepareField() {
-        final PlcField field = SUT.prepareField("%DB1.DBX38.1:BOOL");
-        assertThat(field.getClass(), equalTo(S7Field.class));
-        assertThat(((S7Field) field).getDataType(), equalTo(TransportSize.BOOL));
-    }
-
-    @Test(expected = PlcInvalidFieldException.class)
-    public void prepareFieldFails() {
-        SUT.prepareField("this is a bad field query");
-    }
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.connection;
+
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.exceptions.PlcUnsupportedOperationException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.s7.model.S7Field;
+import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class S7PlcConnectionTests {
+
+    private S7PlcTestConnection SUT;
+
+    @Before
+    public void setUp() {
+        SUT = new S7PlcTestConnection(1, 2,
+            "pdu-size=128&max-amq-caller=2&max-amq-callee=3&unknown=parameter&unknown-flag");
+    }
+
+    @After
+    public void tearDown() {
+        SUT = null;
+    }
+
+    @Test
+    public void initialState() {
+        assertThat("Rack is incorrect", SUT.getRack(), equalTo(1) );
+        assertThat("Slot is incorrect", SUT.getSlot(), equalTo(2) );
+        assertThat("Pdu size is incorrect", SUT.getParamPduSize(), equalTo((short) 128));
+        assertThat("Max AMQ Caller size is incorrect", SUT.getParamMaxAmqCaller(), equalTo(2) );
+        assertThat("Max AMQ Callee size is incorrect", SUT.getParamMaxAmqCallee(), equalTo(3) );
+    }
+
+    /**
+     * When configuring a connection to a LOGO device, then the pdu size has to be set to a different value.
+     */
+    @Test
+    public void initialStateLogo() {
+        SUT = new S7PlcTestConnection(1, 2, "controller-type=LOGO");
+        assertThat("Pdu size is incorrect", SUT.getParamPduSize(), equalTo((short) 480));
+    }
+
+    @Test
+    public void capabilities() {
+        assertThat(SUT.canRead(), equalTo(true));
+        assertThat(SUT.readRequestBuilder(), notNullValue());
+
+        assertThat(SUT.canWrite(), equalTo(true));
+        assertThat(SUT.writeRequestBuilder(), notNullValue());
+
+        assertThat(SUT.canSubscribe(), equalTo(false));
+        assertThrows(PlcUnsupportedOperationException.class, () -> SUT.subscriptionRequestBuilder());
+        assertThrows(PlcUnsupportedOperationException.class, () -> SUT.unsubscriptionRequestBuilder());
+    }
+
+    @Test
+    public void prepareField() {
+        final PlcField field = SUT.prepareField("%DB1.DBX38.1:BOOL");
+        assertThat(field.getClass(), equalTo(S7Field.class));
+        assertThat(((S7Field) field).getDataType(), equalTo(TransportSize.BOOL));
+    }
+
+    @Test(expected = PlcInvalidFieldException.class)
+    public void prepareFieldFails() {
+        SUT.prepareField("this is a bad field query");
+    }
 }
\ No newline at end of file
diff --git a/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/connection/S7PlcTestConnection.java b/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/connection/S7PlcTestConnection.java
index db28bef7288..ef107e1d2c6 100644
--- a/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/connection/S7PlcTestConnection.java
+++ b/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/connection/S7PlcTestConnection.java
@@ -1,204 +1,204 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.connection;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.embedded.EmbeddedChannel;
-import org.apache.commons.io.IOUtils;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.mock.connection.TestChannelFactory;
-import org.junit.jupiter.api.TestInfo;
-import org.pcap4j.core.*;
-import org.pcap4j.packet.Packet;
-import org.pcap4j.packet.namednumber.DataLinkType;
-
-import java.io.EOFException;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.Objects;
-import java.util.concurrent.TimeoutException;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-
-public class S7PlcTestConnection extends S7PlcConnection {
-
-    public S7PlcTestConnection(int rack, int slot, String params) {
-        super(new TestChannelFactory(), rack, slot, params);
-    }
-
-    /*
-            byte[] setupCommunicationResponse = toByteArray(
-            new int[] {
-                // ISO on TCP packet
-                0x03, 0x00,
-                0x00, 0x1B,
-                // ISO TP packet
-                0x02,
-                TpduCode.DATA.getCode(),
-                0x80,
-                S7Protocol.S7_PROTOCOL_MAGIC_NUMBER,
-                MessageType.ACK_DATA.getCode(), 0x00, 0x00,
-                0x00, 0x01,
-                // Parameter Length
-                0x00, 0x08,
-                // Data Length
-                0x00, 0x00,
-                // Error codes
-                0x00, 0x00,
-                // Parameters:
-                ParameterType.SETUP_COMMUNICATION.getCode(), 0x00, 0x00, 0x08, 0x00, 0x08, 0x01, 0x00
-            });
-        dumpArrayToPcapFile("s7-setup-communication-response.pcap", setupCommunicationResponse);
-     */
-
-    @Override
-    protected void sendChannelCreatedEvent() {
-        EmbeddedChannel channel = (EmbeddedChannel) getChannel();
-
-        // Send an event to the pipeline telling the Protocol filters what's going on.
-        super.sendChannelCreatedEvent();
-
-        ByteBuf writtenData = channel.readOutbound();
-        if(writtenData == null) {
-            throw new PlcRuntimeException("Error reading initial channel output");
-        }
-        byte[] connectionRequest = new byte[writtenData.readableBytes()];
-        writtenData.readBytes(connectionRequest);
-        // TODO: Check the content of the Iso TP connection request.
-
-        // Send an Iso TP connection response back to the pipeline.
-        byte[] connectionConfirm = readPcapFile("org/apache/plc4x/java/s7/connection/iso-tp-connect-response.pcap");
-        channel.writeInbound(Unpooled.wrappedBuffer(connectionConfirm));
-
-        // Read a S7 Setup Communication request.
-        writtenData = channel.readOutbound();
-        byte[] setupCommunicationRequest = new byte[writtenData.readableBytes()];
-        writtenData.readBytes(setupCommunicationRequest);
-        // TODO: Check the content of the S7 Setup Communication connection request.
-
-        // Send an S7 Setup Communication response back to the pipeline.
-        byte[] setupCommunicationResponse = readPcapFile(
-            "org/apache/plc4x/java/s7/connection/s7-setup-communication-response.pcap");
-        channel.writeInbound(Unpooled.wrappedBuffer(setupCommunicationResponse));
-
-        // Read a S7 CPU Functions request.
-        writtenData = channel.readOutbound();
-        byte[] cpuFunctionsRequest = new byte[writtenData.readableBytes()];
-        writtenData.readBytes(cpuFunctionsRequest);
-        // TODO: Check the content of the S7 Setup Communication connection request.
-
-        // Send an S7 CPU Functions response back to the pipeline.
-        byte[] cpuFunctionsResponse = readPcapFile(
-            "org/apache/plc4x/java/s7/connection/s7-cpu-functions-response.pcap");
-        // Override the type of reported S7 device.
-        switch (getParamControllerType()) {
-            case S7_1200:
-                cpuFunctionsResponse[48] = '2';
-                break;
-            case S7_1500:
-                cpuFunctionsResponse[48] = '5';
-                break;
-            case S7_300:
-                cpuFunctionsResponse[48] = '3';
-                break;
-            case S7_400:
-                cpuFunctionsResponse[48] = '4';
-                break;
-            default:
-                cpuFunctionsResponse[48] = '1';
-                break;
-        }
-        channel.writeInbound(Unpooled.wrappedBuffer(cpuFunctionsResponse));
-    }
-
-    public static byte[] readPcapFile(String filename) {
-        try {
-            InputStream in = S7PlcTestConnection.class.getClassLoader().getResourceAsStream(filename);
-            byte[] pcap = IOUtils.toByteArray(in);
-            byte[] data = new byte[pcap.length - 94];
-            System.arraycopy(pcap, 94, data, 0, pcap.length - 94);
-            return data;
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public void sendPcapFile(String filename) {
-        try {
-            ClassLoader classLoader = getClass().getClassLoader();
-            File file = new File(Objects.requireNonNull(classLoader.getResource(filename)).getFile());
-            PcapHandle responsePcap = Pcaps.openOffline(file.getAbsolutePath());
-            Packet packet = responsePcap.getNextPacketEx();
-            byte[] data = packet.getPayload().getPayload().getPayload().getRawData();
-
-            EmbeddedChannel channel = (EmbeddedChannel) getChannel();
-            channel.writeInbound(Unpooled.wrappedBuffer(data));
-        } catch (PcapNativeException | EOFException | TimeoutException | NotOpenException e) {
-            throw new RuntimeException("Error sending pacap file " + filename, e);
-        }
-    }
-
-    public void verifyPcapFile(String filename, TestInfo testInfo) {
-        try {
-            ClassLoader classLoader = getClass().getClassLoader();
-            File file = new File(Objects.requireNonNull(classLoader.getResource(filename)).getFile());
-            PcapHandle responsePcap = Pcaps.openOffline(file.getAbsolutePath());
-            Packet packet = responsePcap.getNextPacketEx();
-            byte[] refData = packet.getPayload().getPayload().getPayload().getRawData();
-
-            // Get the systems output.
-            EmbeddedChannel channel = (EmbeddedChannel) getChannel();
-            ByteBuf request = channel.readOutbound();
-
-            // Check the sizes are equal.
-            assertThat(refData.length, equalTo(request.readableBytes()));
-
-            // Read the raw data sent to the output.
-            byte[] actData = new byte[request.readableBytes()];
-            request.readBytes(actData);
-
-            // Compare the actual output to the reference output
-            if(!Arrays.equals(actData, refData)) {
-                String currentWorkingDir = System.getProperty("user.dir");
-                Class<?> testClass = testInfo.getTestClass().orElse(Object.class);
-                Method testMethod = testInfo.getTestMethod().orElse(null);
-                String fileName = currentWorkingDir + "/target/failsafe-reports/failure-" + testClass.getSimpleName() + "-"  + testMethod.getName() + ".pcap";
-                try (PcapHandle handle = Pcaps.openDead(DataLinkType.EN10MB, 65536)) {
-                    PcapDumper dumper = handle.dumpOpen(fileName);
-                    dumper.dumpRaw(actData);
-                    dumper.flush();
-                }
-                for (int i = 0; i < actData.length; i++) {
-                    if (actData[i] != refData[i]) {
-                        fail("Mismatch at position " + i);
-                    }
-                }
-            }
-        } catch (Exception e) {
-            throw new RuntimeException("Error sending pacap file " + filename, e);
-        }
-    }
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.connection;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.embedded.EmbeddedChannel;
+import org.apache.commons.io.IOUtils;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.mock.connection.TestChannelFactory;
+import org.junit.jupiter.api.TestInfo;
+import org.pcap4j.core.*;
+import org.pcap4j.packet.Packet;
+import org.pcap4j.packet.namednumber.DataLinkType;
+
+import java.io.EOFException;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.concurrent.TimeoutException;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
+public class S7PlcTestConnection extends S7PlcConnection {
+
+    public S7PlcTestConnection(int rack, int slot, String params) {
+        super(new TestChannelFactory(), rack, slot, params);
+    }
+
+    /*
+            byte[] setupCommunicationResponse = toByteArray(
+            new int[] {
+                // ISO on TCP packet
+                0x03, 0x00,
+                0x00, 0x1B,
+                // ISO TP packet
+                0x02,
+                TpduCode.DATA.getCode(),
+                0x80,
+                S7Protocol.S7_PROTOCOL_MAGIC_NUMBER,
+                MessageType.ACK_DATA.getCode(), 0x00, 0x00,
+                0x00, 0x01,
+                // Parameter Length
+                0x00, 0x08,
+                // Data Length
+                0x00, 0x00,
+                // Error codes
+                0x00, 0x00,
+                // Parameters:
+                ParameterType.SETUP_COMMUNICATION.getCode(), 0x00, 0x00, 0x08, 0x00, 0x08, 0x01, 0x00
+            });
+        dumpArrayToPcapFile("s7-setup-communication-response.pcap", setupCommunicationResponse);
+     */
+
+    @Override
+    protected void sendChannelCreatedEvent() {
+        EmbeddedChannel channel = (EmbeddedChannel) getChannel();
+
+        // Send an event to the pipeline telling the Protocol filters what's going on.
+        super.sendChannelCreatedEvent();
+
+        ByteBuf writtenData = channel.readOutbound();
+        if(writtenData == null) {
+            throw new PlcRuntimeException("Error reading initial channel output");
+        }
+        byte[] connectionRequest = new byte[writtenData.readableBytes()];
+        writtenData.readBytes(connectionRequest);
+        // TODO: Check the content of the Iso TP connection request.
+
+        // Send an Iso TP connection response back to the pipeline.
+        byte[] connectionConfirm = readPcapFile("org/apache/plc4x/java/s7/connection/iso-tp-connect-response.pcap");
+        channel.writeInbound(Unpooled.wrappedBuffer(connectionConfirm));
+
+        // Read a S7 Setup Communication request.
+        writtenData = channel.readOutbound();
+        byte[] setupCommunicationRequest = new byte[writtenData.readableBytes()];
+        writtenData.readBytes(setupCommunicationRequest);
+        // TODO: Check the content of the S7 Setup Communication connection request.
+
+        // Send an S7 Setup Communication response back to the pipeline.
+        byte[] setupCommunicationResponse = readPcapFile(
+            "org/apache/plc4x/java/s7/connection/s7-setup-communication-response.pcap");
+        channel.writeInbound(Unpooled.wrappedBuffer(setupCommunicationResponse));
+
+        // Read a S7 CPU Functions request.
+        writtenData = channel.readOutbound();
+        byte[] cpuFunctionsRequest = new byte[writtenData.readableBytes()];
+        writtenData.readBytes(cpuFunctionsRequest);
+        // TODO: Check the content of the S7 Setup Communication connection request.
+
+        // Send an S7 CPU Functions response back to the pipeline.
+        byte[] cpuFunctionsResponse = readPcapFile(
+            "org/apache/plc4x/java/s7/connection/s7-cpu-functions-response.pcap");
+        // Override the type of reported S7 device.
+        switch (getParamControllerType()) {
+            case S7_1200:
+                cpuFunctionsResponse[48] = '2';
+                break;
+            case S7_1500:
+                cpuFunctionsResponse[48] = '5';
+                break;
+            case S7_300:
+                cpuFunctionsResponse[48] = '3';
+                break;
+            case S7_400:
+                cpuFunctionsResponse[48] = '4';
+                break;
+            default:
+                cpuFunctionsResponse[48] = '1';
+                break;
+        }
+        channel.writeInbound(Unpooled.wrappedBuffer(cpuFunctionsResponse));
+    }
+
+    public static byte[] readPcapFile(String filename) {
+        try {
+            InputStream in = S7PlcTestConnection.class.getClassLoader().getResourceAsStream(filename);
+            byte[] pcap = IOUtils.toByteArray(in);
+            byte[] data = new byte[pcap.length - 94];
+            System.arraycopy(pcap, 94, data, 0, pcap.length - 94);
+            return data;
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public void sendPcapFile(String filename) {
+        try {
+            ClassLoader classLoader = getClass().getClassLoader();
+            File file = new File(Objects.requireNonNull(classLoader.getResource(filename)).getFile());
+            PcapHandle responsePcap = Pcaps.openOffline(file.getAbsolutePath());
+            Packet packet = responsePcap.getNextPacketEx();
+            byte[] data = packet.getPayload().getPayload().getPayload().getRawData();
+
+            EmbeddedChannel channel = (EmbeddedChannel) getChannel();
+            channel.writeInbound(Unpooled.wrappedBuffer(data));
+        } catch (PcapNativeException | EOFException | TimeoutException | NotOpenException e) {
+            throw new RuntimeException("Error sending pacap file " + filename, e);
+        }
+    }
+
+    public void verifyPcapFile(String filename, TestInfo testInfo) {
+        try {
+            ClassLoader classLoader = getClass().getClassLoader();
+            File file = new File(Objects.requireNonNull(classLoader.getResource(filename)).getFile());
+            PcapHandle responsePcap = Pcaps.openOffline(file.getAbsolutePath());
+            Packet packet = responsePcap.getNextPacketEx();
+            byte[] refData = packet.getPayload().getPayload().getPayload().getRawData();
+
+            // Get the systems output.
+            EmbeddedChannel channel = (EmbeddedChannel) getChannel();
+            ByteBuf request = channel.readOutbound();
+
+            // Check the sizes are equal.
+            assertThat(refData.length, equalTo(request.readableBytes()));
+
+            // Read the raw data sent to the output.
+            byte[] actData = new byte[request.readableBytes()];
+            request.readBytes(actData);
+
+            // Compare the actual output to the reference output
+            if(!Arrays.equals(actData, refData)) {
+                String currentWorkingDir = System.getProperty("user.dir");
+                Class<?> testClass = testInfo.getTestClass().orElse(Object.class);
+                Method testMethod = testInfo.getTestMethod().orElse(null);
+                String fileName = currentWorkingDir + "/target/failsafe-reports/failure-" + testClass.getSimpleName() + "-"  + testMethod.getName() + ".pcap";
+                try (PcapHandle handle = Pcaps.openDead(DataLinkType.EN10MB, 65536)) {
+                    PcapDumper dumper = handle.dumpOpen(fileName);
+                    dumper.dumpRaw(actData);
+                    dumper.flush();
+                }
+                for (int i = 0; i < actData.length; i++) {
+                    if (actData[i] != refData[i]) {
+                        fail("Mismatch at position " + i);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new RuntimeException("Error sending pacap file " + filename, e);
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/connection/issues/PLC4X47Test.java b/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/connection/issues/PLC4X47Test.java
index 9509f4f860c..66c83e97c85 100644
--- a/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/connection/issues/PLC4X47Test.java
+++ b/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/connection/issues/PLC4X47Test.java
@@ -1,51 +1,51 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.s7.connection.issues;
-
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.s7.connection.S7PlcConnection;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-
-public class PLC4X47Test {
-
-    @Test
-    @Disabled
-    public void testLargeRequest() throws Exception {
-        /*TestChannelFactory channelFactory = new TestChannelFactory();
-        S7PlcConnection connection = new S7PlcConnection( channelFactory, 1, 1, "");
-        connection.connect();
-        EmbeddedChannel channel = channelFactory.getChannel();*/
-        S7PlcConnection connection = (S7PlcConnection) new PlcDriverManager().getConnection("s7://10.10.64.20/1/1");
-
-        PlcReadRequest.Builder builder = connection.readRequestBuilder();
-        for (int i = 1; i <= 30; i++) {
-            // just the first byte of each db
-            builder.addItem("field-" + i, "%DB3.DB" + i + ":SINT");
-        }
-        PlcReadRequest readRequest = builder.build();
-        PlcReadResponse readResponse = connection.read(readRequest).get();
-        System.out.println(readResponse.getFieldNames().size());
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.connection.issues;
+
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.s7.connection.S7PlcConnection;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+
+public class PLC4X47Test {
+
+    @Test
+    @Disabled
+    public void testLargeRequest() throws Exception {
+        /*TestChannelFactory channelFactory = new TestChannelFactory();
+        S7PlcConnection connection = new S7PlcConnection( channelFactory, 1, 1, "");
+        connection.connect();
+        EmbeddedChannel channel = channelFactory.getChannel();*/
+        S7PlcConnection connection = (S7PlcConnection) new PlcDriverManager().getConnection("s7://10.10.64.20/1/1");
+
+        PlcReadRequest.Builder builder = connection.readRequestBuilder();
+        for (int i = 1; i <= 30; i++) {
+            // just the first byte of each db
+            builder.addItem("field-" + i, "%DB3.DB" + i + ":SINT");
+        }
+        PlcReadRequest readRequest = builder.build();
+        PlcReadResponse readResponse = connection.read(readRequest).get();
+        System.out.println(readResponse.getFieldNames().size());
+    }
+
+}
diff --git a/plc4j/drivers/simulated/pom.xml b/plc4j/drivers/simulated/pom.xml
index 5daf0032c79..52269eacf20 100644
--- a/plc4j/drivers/simulated/pom.xml
+++ b/plc4j/drivers/simulated/pom.xml
@@ -1,68 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-drivers</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-driver-simulated</artifactId>
-  <name>PLC4J: Driver: Simulated</name>
-  <description>Implementation of a PLC4X driver able to speak a simulated device.</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-text</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>nl.jqno.equalsverifier</groupId>
-      <artifactId>equalsverifier</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>osgi.cmpn</artifactId>
-      <version>6.0.0</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-drivers</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-driver-simulated</artifactId>
+  <name>PLC4J: Driver: Simulated</name>
+  <description>Implementation of a PLC4X driver able to speak a simulated device.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-text</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>nl.jqno.equalsverifier</groupId>
+      <artifactId>equalsverifier</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>osgi.cmpn</artifactId>
+      <version>6.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/SimulatedPlcDriver.java b/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/SimulatedPlcDriver.java
index d1e1ef46afc..6c08666bcb1 100644
--- a/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/SimulatedPlcDriver.java
+++ b/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/SimulatedPlcDriver.java
@@ -1,65 +1,65 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.simulated;
-
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.simulated.connection.SimulatedPlcConnection;
-import org.apache.plc4x.java.simulated.connection.TestDevice;
-import org.apache.plc4x.java.spi.PlcDriver;
-import org.osgi.service.component.annotations.Component;
-
-/**
- * Test driver holding its state in the client process.
- * The URL schema is {@code test:<device_name>}.
- * Devices are created each time a connection is established and should not be reused.
- * Every device contains a random value generator accessible by address {@code random}.
- * Any value can be stored into test devices, however the state will be gone when connection is closed.
- */
-@Component(service = PlcDriver.class, immediate = true)
-public class SimulatedPlcDriver implements PlcDriver {
-
-    @Override
-    public String getProtocolCode() {
-        return "test";
-    }
-
-    @Override
-    public String getProtocolName() {
-        return "PLC4X Test Protocol";
-    }
-
-    @Override
-    public PlcConnection connect(String url) throws PlcConnectionException {
-        // TODO: perform further checks
-        String deviceName = url.substring(5);
-        if (deviceName.isEmpty()) {
-            throw new PlcConnectionException("Invalid URL: no device name given.");
-        }
-        TestDevice device = new TestDevice(deviceName);
-        return new SimulatedPlcConnection(device);
-    }
-
-    @Override
-    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
-        throw new PlcConnectionException("Test driver does not support authentication.");
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.simulated;
+
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.authentication.PlcAuthentication;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.simulated.connection.SimulatedPlcConnection;
+import org.apache.plc4x.java.simulated.connection.TestDevice;
+import org.apache.plc4x.java.spi.PlcDriver;
+import org.osgi.service.component.annotations.Component;
+
+/**
+ * Test driver holding its state in the client process.
+ * The URL schema is {@code test:<device_name>}.
+ * Devices are created each time a connection is established and should not be reused.
+ * Every device contains a random value generator accessible by address {@code random}.
+ * Any value can be stored into test devices, however the state will be gone when connection is closed.
+ */
+@Component(service = PlcDriver.class, immediate = true)
+public class SimulatedPlcDriver implements PlcDriver {
+
+    @Override
+    public String getProtocolCode() {
+        return "test";
+    }
+
+    @Override
+    public String getProtocolName() {
+        return "PLC4X Test Protocol";
+    }
+
+    @Override
+    public PlcConnection connect(String url) throws PlcConnectionException {
+        // TODO: perform further checks
+        String deviceName = url.substring(5);
+        if (deviceName.isEmpty()) {
+            throw new PlcConnectionException("Invalid URL: no device name given.");
+        }
+        TestDevice device = new TestDevice(deviceName);
+        return new SimulatedPlcConnection(device);
+    }
+
+    @Override
+    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
+        throw new PlcConnectionException("Test driver does not support authentication.");
+    }
+
+}
diff --git a/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/SimulatedPlcConnection.java b/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/SimulatedPlcConnection.java
index 805d9afc98a..6c05ea886d2 100644
--- a/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/SimulatedPlcConnection.java
+++ b/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/SimulatedPlcConnection.java
@@ -1,219 +1,219 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.simulated.connection;
-
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.messages.*;
-import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
-import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.connection.AbstractPlcConnection;
-import org.apache.plc4x.java.base.messages.*;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-import org.apache.plc4x.java.base.model.*;
-
-import java.time.Instant;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Consumer;
-
-/**
- * Connection to a test device.
- * This class is not thread-safe.
- */
-public class SimulatedPlcConnection extends AbstractPlcConnection implements PlcReader, PlcWriter, PlcSubscriber {
-
-    private final TestDevice device;
-
-    private boolean connected = false;
-
-    private Map<InternalPlcSubscriptionHandle, InternalPlcConsumerRegistration> registrations = new ConcurrentHashMap<>();
-
-    private Map<Integer, Consumer<PlcSubscriptionEvent>> consumerIdMap = new ConcurrentHashMap<>();
-
-    public SimulatedPlcConnection(TestDevice device) {
-        this.device = device;
-    }
-
-    @Override
-    public void connect() {
-        connected = true;
-    }
-
-    @Override
-    public boolean isConnected() {
-        return connected;
-    }
-
-    @Override
-    public void close() {
-        connected = false;
-    }
-
-    @Override
-    public boolean canRead() {
-        return true;
-    }
-
-    @Override
-    public boolean canWrite() {
-        return true;
-    }
-
-    @Override
-    public boolean canSubscribe() {
-        return true;
-    }
-
-    @Override
-    public PlcReadRequest.Builder readRequestBuilder() {
-        return new DefaultPlcReadRequest.Builder(this, new TestFieldHandler());
-    }
-
-    @Override
-    public PlcWriteRequest.Builder writeRequestBuilder() {
-        return new DefaultPlcWriteRequest.Builder(this, new TestFieldHandler());
-    }
-
-    @Override
-    public PlcSubscriptionRequest.Builder subscriptionRequestBuilder() {
-        return new DefaultPlcSubscriptionRequest.Builder(this, new TestFieldHandler());
-    }
-
-    @Override
-    public PlcUnsubscriptionRequest.Builder unsubscriptionRequestBuilder() {
-        return new DefaultPlcUnsubscriptionRequest.Builder(this);
-    }
-
-    @Override
-    public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
-        InternalPlcReadRequest request = checkInternal(readRequest, InternalPlcReadRequest.class);
-        Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> fields = new HashMap<>();
-        for (String fieldName : request.getFieldNames()) {
-            TestField field = (TestField) request.getField(fieldName);
-            Optional<BaseDefaultFieldItem> fieldItemOptional = device.get(field);
-            ImmutablePair<PlcResponseCode, BaseDefaultFieldItem> fieldPair;
-            boolean present = fieldItemOptional.isPresent();
-            fieldPair = present
-                ? new ImmutablePair<>(PlcResponseCode.OK, fieldItemOptional.get())
-                : new ImmutablePair<>(PlcResponseCode.NOT_FOUND, null);
-            fields.put(fieldName, fieldPair);
-        }
-        PlcReadResponse response = new DefaultPlcReadResponse(request, fields);
-        return CompletableFuture.completedFuture(response);
-    }
-
-    @Override
-    public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
-        InternalPlcWriteRequest request = checkInternal(writeRequest, InternalPlcWriteRequest.class);
-        Map<String, PlcResponseCode> fields = new HashMap<>();
-        for (String fieldName : request.getFieldNames()) {
-            TestField field = (TestField) request.getField(fieldName);
-            BaseDefaultFieldItem fieldItem = request.getFieldItem(fieldName);
-            device.set(field, fieldItem);
-            fields.put(fieldName, PlcResponseCode.OK);
-        }
-        PlcWriteResponse response = new DefaultPlcWriteResponse(request, fields);
-        return CompletableFuture.completedFuture(response);
-    }
-
-    @Override
-    public String toString() {
-        return String.format("test:%s", device);
-    }
-
-    @Override
-    public CompletableFuture<PlcSubscriptionResponse> subscribe(PlcSubscriptionRequest subscriptionRequest) {
-        InternalPlcSubscriptionRequest request = checkInternal(subscriptionRequest, InternalPlcSubscriptionRequest.class);
-        LinkedHashMap<String, SubscriptionPlcField> subscriptionPlcFieldMap = request.getSubscriptionPlcFieldMap();
-
-        Map<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> values = new HashMap<>();
-        subscriptionPlcFieldMap.forEach((name, subscriptionPlcField) -> {
-            InternalPlcSubscriptionHandle handle = new DefaultPlcSubscriptionHandle(this);
-            switch (subscriptionPlcField.getPlcSubscriptionType()) {
-                case CYCLIC:
-                    device.addCyclicSubscription(dispatchSubscriptionEvent(name, handle), handle, (TestField) subscriptionPlcField.getPlcField(), subscriptionPlcField.getDuration().orElseThrow(RuntimeException::new));
-                    break;
-                case CHANGE_OF_STATE:
-                    device.addChangeOfStateSubscription(dispatchSubscriptionEvent(name, handle), handle, (TestField) subscriptionPlcField.getPlcField());
-                    break;
-                case EVENT:
-                    device.addEventSubscription(dispatchSubscriptionEvent(name, handle), handle, (TestField) subscriptionPlcField.getPlcField());
-                    break;
-            }
-            values.put(name, Pair.of(PlcResponseCode.OK, handle));
-        });
-
-        PlcSubscriptionResponse response = new DefaultPlcSubscriptionResponse(request, values);
-        return CompletableFuture.completedFuture(response);
-    }
-
-    private Consumer<BaseDefaultFieldItem> dispatchSubscriptionEvent(String name, InternalPlcSubscriptionHandle handle) {
-        return fieldItem -> {
-            InternalPlcConsumerRegistration plcConsumerRegistration = registrations.get(handle);
-            if (plcConsumerRegistration == null) {
-                return;
-            }
-            int consumerHash = plcConsumerRegistration.getConsumerHash();
-            Consumer<PlcSubscriptionEvent> consumer = consumerIdMap.get(consumerHash);
-            if (consumer == null) {
-                return;
-            }
-            consumer.accept(new DefaultPlcSubscriptionEvent(Instant.now(), Collections.singletonMap(name, Pair.of(PlcResponseCode.OK, fieldItem))));
-        };
-    }
-
-    @Override
-    public CompletableFuture<PlcUnsubscriptionResponse> unsubscribe(PlcUnsubscriptionRequest unsubscriptionRequest) {
-        InternalPlcUnsubscriptionRequest request = checkInternal(unsubscriptionRequest, InternalPlcUnsubscriptionRequest.class);
-
-        device.removeHandles(request.getInternalPlcSubscriptionHandles());
-
-        PlcUnsubscriptionResponse response = new DefaultPlcUnsubscriptionResponse(request);
-        return CompletableFuture.completedFuture(response);
-    }
-
-    @Override
-    public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer, Collection<PlcSubscriptionHandle> handles) {
-        InternalPlcConsumerRegistration plcConsumerRegistration = new DefaultPlcConsumerRegistration(this, consumer, handles.toArray(new InternalPlcSubscriptionHandle[0]));
-        handles.stream()
-            .map(InternalPlcSubscriptionHandle.class::cast)
-            .forEach(handle -> registrations.put(handle, plcConsumerRegistration));
-        consumerIdMap.put(plcConsumerRegistration.getConsumerHash(), consumer);
-        return plcConsumerRegistration;
-    }
-
-    @Override
-    public void unregister(PlcConsumerRegistration registration) {
-        Iterator<Map.Entry<InternalPlcSubscriptionHandle, InternalPlcConsumerRegistration>> entryIterator = registrations.entrySet().iterator();
-        while (entryIterator.hasNext()) {
-            Map.Entry<InternalPlcSubscriptionHandle, InternalPlcConsumerRegistration> entry = entryIterator.next();
-            if (!entry.getValue().equals(registration)) {
-                continue;
-            }
-            InternalPlcConsumerRegistration value = entry.getValue();
-            int consumerHash = value.getConsumerHash();
-            consumerIdMap.remove(consumerHash);
-            device.removeHandles(value.getAssociatedHandles());
-            entryIterator.remove();
-        }
-    }
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.simulated.connection;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.messages.*;
+import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.connection.AbstractPlcConnection;
+import org.apache.plc4x.java.base.messages.*;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+import org.apache.plc4x.java.base.model.*;
+
+import java.time.Instant;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Consumer;
+
+/**
+ * Connection to a test device.
+ * This class is not thread-safe.
+ */
+public class SimulatedPlcConnection extends AbstractPlcConnection implements PlcReader, PlcWriter, PlcSubscriber {
+
+    private final TestDevice device;
+
+    private boolean connected = false;
+
+    private Map<InternalPlcSubscriptionHandle, InternalPlcConsumerRegistration> registrations = new ConcurrentHashMap<>();
+
+    private Map<Integer, Consumer<PlcSubscriptionEvent>> consumerIdMap = new ConcurrentHashMap<>();
+
+    public SimulatedPlcConnection(TestDevice device) {
+        this.device = device;
+    }
+
+    @Override
+    public void connect() {
+        connected = true;
+    }
+
+    @Override
+    public boolean isConnected() {
+        return connected;
+    }
+
+    @Override
+    public void close() {
+        connected = false;
+    }
+
+    @Override
+    public boolean canRead() {
+        return true;
+    }
+
+    @Override
+    public boolean canWrite() {
+        return true;
+    }
+
+    @Override
+    public boolean canSubscribe() {
+        return true;
+    }
+
+    @Override
+    public PlcReadRequest.Builder readRequestBuilder() {
+        return new DefaultPlcReadRequest.Builder(this, new TestFieldHandler());
+    }
+
+    @Override
+    public PlcWriteRequest.Builder writeRequestBuilder() {
+        return new DefaultPlcWriteRequest.Builder(this, new TestFieldHandler());
+    }
+
+    @Override
+    public PlcSubscriptionRequest.Builder subscriptionRequestBuilder() {
+        return new DefaultPlcSubscriptionRequest.Builder(this, new TestFieldHandler());
+    }
+
+    @Override
+    public PlcUnsubscriptionRequest.Builder unsubscriptionRequestBuilder() {
+        return new DefaultPlcUnsubscriptionRequest.Builder(this);
+    }
+
+    @Override
+    public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
+        InternalPlcReadRequest request = checkInternal(readRequest, InternalPlcReadRequest.class);
+        Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> fields = new HashMap<>();
+        for (String fieldName : request.getFieldNames()) {
+            TestField field = (TestField) request.getField(fieldName);
+            Optional<BaseDefaultFieldItem> fieldItemOptional = device.get(field);
+            ImmutablePair<PlcResponseCode, BaseDefaultFieldItem> fieldPair;
+            boolean present = fieldItemOptional.isPresent();
+            fieldPair = present
+                ? new ImmutablePair<>(PlcResponseCode.OK, fieldItemOptional.get())
+                : new ImmutablePair<>(PlcResponseCode.NOT_FOUND, null);
+            fields.put(fieldName, fieldPair);
+        }
+        PlcReadResponse response = new DefaultPlcReadResponse(request, fields);
+        return CompletableFuture.completedFuture(response);
+    }
+
+    @Override
+    public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
+        InternalPlcWriteRequest request = checkInternal(writeRequest, InternalPlcWriteRequest.class);
+        Map<String, PlcResponseCode> fields = new HashMap<>();
+        for (String fieldName : request.getFieldNames()) {
+            TestField field = (TestField) request.getField(fieldName);
+            BaseDefaultFieldItem fieldItem = request.getFieldItem(fieldName);
+            device.set(field, fieldItem);
+            fields.put(fieldName, PlcResponseCode.OK);
+        }
+        PlcWriteResponse response = new DefaultPlcWriteResponse(request, fields);
+        return CompletableFuture.completedFuture(response);
+    }
+
+    @Override
+    public String toString() {
+        return String.format("test:%s", device);
+    }
+
+    @Override
+    public CompletableFuture<PlcSubscriptionResponse> subscribe(PlcSubscriptionRequest subscriptionRequest) {
+        InternalPlcSubscriptionRequest request = checkInternal(subscriptionRequest, InternalPlcSubscriptionRequest.class);
+        LinkedHashMap<String, SubscriptionPlcField> subscriptionPlcFieldMap = request.getSubscriptionPlcFieldMap();
+
+        Map<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> values = new HashMap<>();
+        subscriptionPlcFieldMap.forEach((name, subscriptionPlcField) -> {
+            InternalPlcSubscriptionHandle handle = new DefaultPlcSubscriptionHandle(this);
+            switch (subscriptionPlcField.getPlcSubscriptionType()) {
+                case CYCLIC:
+                    device.addCyclicSubscription(dispatchSubscriptionEvent(name, handle), handle, (TestField) subscriptionPlcField.getPlcField(), subscriptionPlcField.getDuration().orElseThrow(RuntimeException::new));
+                    break;
+                case CHANGE_OF_STATE:
+                    device.addChangeOfStateSubscription(dispatchSubscriptionEvent(name, handle), handle, (TestField) subscriptionPlcField.getPlcField());
+                    break;
+                case EVENT:
+                    device.addEventSubscription(dispatchSubscriptionEvent(name, handle), handle, (TestField) subscriptionPlcField.getPlcField());
+                    break;
+            }
+            values.put(name, Pair.of(PlcResponseCode.OK, handle));
+        });
+
+        PlcSubscriptionResponse response = new DefaultPlcSubscriptionResponse(request, values);
+        return CompletableFuture.completedFuture(response);
+    }
+
+    private Consumer<BaseDefaultFieldItem> dispatchSubscriptionEvent(String name, InternalPlcSubscriptionHandle handle) {
+        return fieldItem -> {
+            InternalPlcConsumerRegistration plcConsumerRegistration = registrations.get(handle);
+            if (plcConsumerRegistration == null) {
+                return;
+            }
+            int consumerHash = plcConsumerRegistration.getConsumerHash();
+            Consumer<PlcSubscriptionEvent> consumer = consumerIdMap.get(consumerHash);
+            if (consumer == null) {
+                return;
+            }
+            consumer.accept(new DefaultPlcSubscriptionEvent(Instant.now(), Collections.singletonMap(name, Pair.of(PlcResponseCode.OK, fieldItem))));
+        };
+    }
+
+    @Override
+    public CompletableFuture<PlcUnsubscriptionResponse> unsubscribe(PlcUnsubscriptionRequest unsubscriptionRequest) {
+        InternalPlcUnsubscriptionRequest request = checkInternal(unsubscriptionRequest, InternalPlcUnsubscriptionRequest.class);
+
+        device.removeHandles(request.getInternalPlcSubscriptionHandles());
+
+        PlcUnsubscriptionResponse response = new DefaultPlcUnsubscriptionResponse(request);
+        return CompletableFuture.completedFuture(response);
+    }
+
+    @Override
+    public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer, Collection<PlcSubscriptionHandle> handles) {
+        InternalPlcConsumerRegistration plcConsumerRegistration = new DefaultPlcConsumerRegistration(this, consumer, handles.toArray(new InternalPlcSubscriptionHandle[0]));
+        handles.stream()
+            .map(InternalPlcSubscriptionHandle.class::cast)
+            .forEach(handle -> registrations.put(handle, plcConsumerRegistration));
+        consumerIdMap.put(plcConsumerRegistration.getConsumerHash(), consumer);
+        return plcConsumerRegistration;
+    }
+
+    @Override
+    public void unregister(PlcConsumerRegistration registration) {
+        Iterator<Map.Entry<InternalPlcSubscriptionHandle, InternalPlcConsumerRegistration>> entryIterator = registrations.entrySet().iterator();
+        while (entryIterator.hasNext()) {
+            Map.Entry<InternalPlcSubscriptionHandle, InternalPlcConsumerRegistration> entry = entryIterator.next();
+            if (!entry.getValue().equals(registration)) {
+                continue;
+            }
+            InternalPlcConsumerRegistration value = entry.getValue();
+            int consumerHash = value.getConsumerHash();
+            consumerIdMap.remove(consumerHash);
+            device.removeHandles(value.getAssociatedHandles());
+            entryIterator.remove();
+        }
+    }
+}
diff --git a/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestDevice.java b/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestDevice.java
index f9dd5566ba5..e322a4f43c8 100644
--- a/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestDevice.java
+++ b/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestDevice.java
@@ -1,199 +1,199 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.simulated.connection;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
-
-import java.time.Duration;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.function.Consumer;
-
-/**
- * Test device storing its state in memory.
- * Values are stored in a HashMap.
- */
-public class TestDevice {
-
-    private final Random random = new Random();
-
-    private final String name;
-
-    private final Map<TestField, BaseDefaultFieldItem> state = new HashMap<>();
-
-    private final Map<PlcSubscriptionHandle, ScheduledFuture<?>> cyclicSubscriptions = new HashMap<>();
-
-    private final Map<PlcSubscriptionHandle, Future<?>> eventSubscriptions = new HashMap<>();
-
-    private final IdentityHashMap<PlcSubscriptionHandle, Pair<TestField, Consumer<BaseDefaultFieldItem>>> changeOfStateSubscriptions = new IdentityHashMap<>();
-
-    private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
-
-    private final ExecutorService pool = Executors.newCachedThreadPool();
-
-    public TestDevice(String name) {
-        this.name = name;
-    }
-
-    public Optional<BaseDefaultFieldItem> get(TestField field) {
-        Objects.requireNonNull(field);
-        switch (field.getType()) {
-            case STATE:
-                return Optional.ofNullable(state.get(field));
-            case RANDOM:
-                return Optional.of(randomValue(field.getDataType()));
-            case STDOUT:
-                return Optional.empty();
-        }
-        throw new IllegalArgumentException("Unsupported field type: " + field.getType().name());
-    }
-
-    public void set(TestField field, BaseDefaultFieldItem value) {
-        Objects.requireNonNull(field);
-        switch (field.getType()) {
-            case STATE:
-                changeOfStateSubscriptions.values().stream()
-                    .filter(pair -> pair.getKey().equals(field))
-                    .map(Pair::getValue)
-                    .forEach(baseDefaultFieldItemConsumer -> baseDefaultFieldItemConsumer.accept(value));
-                state.put(field, value);
-                return;
-            case STDOUT:
-                System.out.printf("TEST PLC STDOUT [%s]: %s%n", field.getName(), Objects.toString(value.getValues()[0]));
-                return;
-            case RANDOM:
-                System.out.printf("TEST PLC RANDOM [%s]: %s%n", field.getName(), Objects.toString(value.getValues()[0]));
-                return;
-        }
-        throw new IllegalArgumentException("Unsupported field type: " + field.getType().name());
-    }
-
-    @SuppressWarnings("unchecked")
-    private BaseDefaultFieldItem randomValue(Class<?> type) {
-        Object result = null;
-
-        if (type.equals(Byte.class)) {
-            result = (byte) random.nextInt(1 << 8);
-        }
-
-        if (type.equals(Short.class)) {
-            result = (short) random.nextInt(1 << 16);
-        }
-
-        if (type.equals(Integer.class)) {
-            result = random.nextInt();
-        }
-
-        if (type.equals(Long.class)) {
-            result = random.nextLong();
-        }
-
-        if (type.equals(Float.class)) {
-            result = random.nextFloat();
-        }
-
-        if (type.equals(Double.class)) {
-            result = random.nextDouble();
-        }
-
-        if (type.equals(Boolean.class)) {
-            result = random.nextBoolean();
-        }
-
-        if (type.equals(String.class)) {
-            int length = random.nextInt(100);
-            StringBuilder sb = new StringBuilder(length);
-            for (int i = 0; i < length; i++) {
-                char c = (char) ('a' + random.nextInt(26));
-                sb.append(c);
-            }
-            result = sb.toString();
-        }
-
-        if (type.equals(byte[].class)) {
-            int length = random.nextInt(100);
-            byte[] bytes = new byte[length];
-            random.nextBytes(bytes);
-            result = bytes;
-        }
-
-        return new TestFieldItem(new Object[]{result});
-    }
-
-    @Override
-    public String toString() {
-        return name;
-    }
-
-    public void addCyclicSubscription(Consumer<BaseDefaultFieldItem> consumer, PlcSubscriptionHandle handle, TestField plcField, Duration duration) {
-        ScheduledFuture<?> scheduledFuture = scheduler.scheduleAtFixedRate(() -> {
-            BaseDefaultFieldItem baseDefaultFieldItem = state.get(plcField);
-            if (baseDefaultFieldItem == null) {
-                return;
-            }
-            consumer.accept(baseDefaultFieldItem);
-        }, duration.toMillis(), duration.toMillis(), TimeUnit.MILLISECONDS);
-        cyclicSubscriptions.put(handle, scheduledFuture);
-    }
-
-    public void addChangeOfStateSubscription(Consumer<BaseDefaultFieldItem> consumer, PlcSubscriptionHandle handle, TestField plcField) {
-        changeOfStateSubscriptions.put(handle, Pair.of(plcField, consumer));
-    }
-
-    public void addEventSubscription(Consumer<BaseDefaultFieldItem> consumer, PlcSubscriptionHandle handle, TestField plcField) {
-        Future<?> submit = pool.submit(() -> {
-            while (!Thread.currentThread().isInterrupted()) {
-                BaseDefaultFieldItem baseDefaultFieldItem = state.get(plcField);
-                if (baseDefaultFieldItem == null) {
-                    continue;
-                }
-                consumer.accept(baseDefaultFieldItem);
-                try {
-                    TimeUnit.SECONDS.sleep((long) (Math.random() * 10));
-                } catch (InterruptedException ignore) {
-                    Thread.currentThread().interrupt();
-                    return;
-                }
-            }
-        });
-
-        eventSubscriptions.put(handle, submit);
-    }
-
-    public void removeHandles(Collection<? extends InternalPlcSubscriptionHandle> internalPlcSubscriptionHandles) {
-        internalPlcSubscriptionHandles.forEach(handle -> {
-            ScheduledFuture<?> remove = cyclicSubscriptions.remove(handle);
-            if (remove == null) {
-                return;
-            }
-            remove.cancel(true);
-        });
-        internalPlcSubscriptionHandles.forEach(handle -> {
-            Future<?> remove = eventSubscriptions.remove(handle);
-            if (remove == null) {
-                return;
-            }
-            remove.cancel(true);
-        });
-        internalPlcSubscriptionHandles.forEach(changeOfStateSubscriptions::remove);
-    }
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.simulated.connection;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
+
+import java.time.Duration;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.Consumer;
+
+/**
+ * Test device storing its state in memory.
+ * Values are stored in a HashMap.
+ */
+public class TestDevice {
+
+    private final Random random = new Random();
+
+    private final String name;
+
+    private final Map<TestField, BaseDefaultFieldItem> state = new HashMap<>();
+
+    private final Map<PlcSubscriptionHandle, ScheduledFuture<?>> cyclicSubscriptions = new HashMap<>();
+
+    private final Map<PlcSubscriptionHandle, Future<?>> eventSubscriptions = new HashMap<>();
+
+    private final IdentityHashMap<PlcSubscriptionHandle, Pair<TestField, Consumer<BaseDefaultFieldItem>>> changeOfStateSubscriptions = new IdentityHashMap<>();
+
+    private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
+
+    private final ExecutorService pool = Executors.newCachedThreadPool();
+
+    public TestDevice(String name) {
+        this.name = name;
+    }
+
+    public Optional<BaseDefaultFieldItem> get(TestField field) {
+        Objects.requireNonNull(field);
+        switch (field.getType()) {
+            case STATE:
+                return Optional.ofNullable(state.get(field));
+            case RANDOM:
+                return Optional.of(randomValue(field.getDataType()));
+            case STDOUT:
+                return Optional.empty();
+        }
+        throw new IllegalArgumentException("Unsupported field type: " + field.getType().name());
+    }
+
+    public void set(TestField field, BaseDefaultFieldItem value) {
+        Objects.requireNonNull(field);
+        switch (field.getType()) {
+            case STATE:
+                changeOfStateSubscriptions.values().stream()
+                    .filter(pair -> pair.getKey().equals(field))
+                    .map(Pair::getValue)
+                    .forEach(baseDefaultFieldItemConsumer -> baseDefaultFieldItemConsumer.accept(value));
+                state.put(field, value);
+                return;
+            case STDOUT:
+                System.out.printf("TEST PLC STDOUT [%s]: %s%n", field.getName(), Objects.toString(value.getValues()[0]));
+                return;
+            case RANDOM:
+                System.out.printf("TEST PLC RANDOM [%s]: %s%n", field.getName(), Objects.toString(value.getValues()[0]));
+                return;
+        }
+        throw new IllegalArgumentException("Unsupported field type: " + field.getType().name());
+    }
+
+    @SuppressWarnings("unchecked")
+    private BaseDefaultFieldItem randomValue(Class<?> type) {
+        Object result = null;
+
+        if (type.equals(Byte.class)) {
+            result = (byte) random.nextInt(1 << 8);
+        }
+
+        if (type.equals(Short.class)) {
+            result = (short) random.nextInt(1 << 16);
+        }
+
+        if (type.equals(Integer.class)) {
+            result = random.nextInt();
+        }
+
+        if (type.equals(Long.class)) {
+            result = random.nextLong();
+        }
+
+        if (type.equals(Float.class)) {
+            result = random.nextFloat();
+        }
+
+        if (type.equals(Double.class)) {
+            result = random.nextDouble();
+        }
+
+        if (type.equals(Boolean.class)) {
+            result = random.nextBoolean();
+        }
+
+        if (type.equals(String.class)) {
+            int length = random.nextInt(100);
+            StringBuilder sb = new StringBuilder(length);
+            for (int i = 0; i < length; i++) {
+                char c = (char) ('a' + random.nextInt(26));
+                sb.append(c);
+            }
+            result = sb.toString();
+        }
+
+        if (type.equals(byte[].class)) {
+            int length = random.nextInt(100);
+            byte[] bytes = new byte[length];
+            random.nextBytes(bytes);
+            result = bytes;
+        }
+
+        return new TestFieldItem(new Object[]{result});
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+
+    public void addCyclicSubscription(Consumer<BaseDefaultFieldItem> consumer, PlcSubscriptionHandle handle, TestField plcField, Duration duration) {
+        ScheduledFuture<?> scheduledFuture = scheduler.scheduleAtFixedRate(() -> {
+            BaseDefaultFieldItem baseDefaultFieldItem = state.get(plcField);
+            if (baseDefaultFieldItem == null) {
+                return;
+            }
+            consumer.accept(baseDefaultFieldItem);
+        }, duration.toMillis(), duration.toMillis(), TimeUnit.MILLISECONDS);
+        cyclicSubscriptions.put(handle, scheduledFuture);
+    }
+
+    public void addChangeOfStateSubscription(Consumer<BaseDefaultFieldItem> consumer, PlcSubscriptionHandle handle, TestField plcField) {
+        changeOfStateSubscriptions.put(handle, Pair.of(plcField, consumer));
+    }
+
+    public void addEventSubscription(Consumer<BaseDefaultFieldItem> consumer, PlcSubscriptionHandle handle, TestField plcField) {
+        Future<?> submit = pool.submit(() -> {
+            while (!Thread.currentThread().isInterrupted()) {
+                BaseDefaultFieldItem baseDefaultFieldItem = state.get(plcField);
+                if (baseDefaultFieldItem == null) {
+                    continue;
+                }
+                consumer.accept(baseDefaultFieldItem);
+                try {
+                    TimeUnit.SECONDS.sleep((long) (Math.random() * 10));
+                } catch (InterruptedException ignore) {
+                    Thread.currentThread().interrupt();
+                    return;
+                }
+            }
+        });
+
+        eventSubscriptions.put(handle, submit);
+    }
+
+    public void removeHandles(Collection<? extends InternalPlcSubscriptionHandle> internalPlcSubscriptionHandles) {
+        internalPlcSubscriptionHandles.forEach(handle -> {
+            ScheduledFuture<?> remove = cyclicSubscriptions.remove(handle);
+            if (remove == null) {
+                return;
+            }
+            remove.cancel(true);
+        });
+        internalPlcSubscriptionHandles.forEach(handle -> {
+            Future<?> remove = eventSubscriptions.remove(handle);
+            if (remove == null) {
+                return;
+            }
+            remove.cancel(true);
+        });
+        internalPlcSubscriptionHandles.forEach(changeOfStateSubscriptions::remove);
+    }
+}
diff --git a/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestField.java b/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestField.java
index 3c14c0aa6f0..921de4a83f2 100644
--- a/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestField.java
+++ b/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestField.java
@@ -1,128 +1,128 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.simulated.connection;
-
-import org.apache.commons.text.WordUtils;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Objects;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Test address for accessing values in virtual devices.
- */
-public class TestField implements PlcField {
-
-    private static final Logger logger = LoggerFactory.getLogger(TestField.class);
-
-    /**
-     * Examples:
-     * - {@code RANDOM/foo:INTEGER}
-     * - {@code STDOUT/foo:STRING}
-     */
-    private static final Pattern ADDRESS_PATTERN = Pattern.compile("^(?<type>\\w+)/(?<name>\\w+):(?<dataType>[a-zA-Z]++)(\\[(?<numElements>\\d+)])?$");
-
-    private final TestType type;
-    private final String name;
-    private final Class<?> dataType;
-    private final int numElements;
-
-    private TestField(TestType type, String name, Class<?> dataType, int numElements) {
-        this.type = type;
-        this.name = name;
-        this.dataType = dataType;
-        this.numElements = numElements;
-    }
-
-    public static TestField of(String fieldString) throws PlcInvalidFieldException {
-        Matcher matcher = ADDRESS_PATTERN.matcher(fieldString);
-        if (matcher.matches()) {
-            TestType type = TestType.valueOf(matcher.group("type"));
-            String name = matcher.group("name");
-            String dataTypeName = WordUtils.capitalizeFully(matcher.group("dataType"));
-            int numElements = 1;
-            if (matcher.group("numElements") != null) {
-                numElements = Integer.parseInt(matcher.group("numElements"));
-            }
-            try {
-                Class<?> dataType = Class.forName("java.lang." + dataTypeName);
-                return new TestField(type, name, dataType, numElements);
-            } catch (ClassNotFoundException e) {
-                logger.error("Unsupported type: " + dataTypeName, e);
-                throw new PlcInvalidFieldException("Unsupported type: " + dataTypeName);
-            }
-        }
-        throw new PlcInvalidFieldException("Unable to parse address: " + fieldString);
-    }
-
-    static boolean matches(String fieldString) {
-        return ADDRESS_PATTERN.matcher(fieldString).matches();
-    }
-
-    public TestType getType() {
-        return type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public Class<?> getDataType() {
-        return dataType;
-    }
-
-    public int getNumElements() {
-        return numElements;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TestField testField = (TestField) o;
-        return numElements == testField.numElements &&
-            type == testField.type &&
-            Objects.equals(name, testField.name) &&
-            Objects.equals(dataType, testField.dataType);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(type, name, dataType, numElements);
-    }
-
-    @Override
-    public String toString() {
-        return "TestField{" +
-            "type=" + type +
-            ", name='" + name + '\'' +
-            ", dataType=" + dataType +
-            ", numElements=" + numElements +
-            '}';
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.simulated.connection;
+
+import org.apache.commons.text.WordUtils;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Test address for accessing values in virtual devices.
+ */
+public class TestField implements PlcField {
+
+    private static final Logger logger = LoggerFactory.getLogger(TestField.class);
+
+    /**
+     * Examples:
+     * - {@code RANDOM/foo:INTEGER}
+     * - {@code STDOUT/foo:STRING}
+     */
+    private static final Pattern ADDRESS_PATTERN = Pattern.compile("^(?<type>\\w+)/(?<name>\\w+):(?<dataType>[a-zA-Z]++)(\\[(?<numElements>\\d+)])?$");
+
+    private final TestType type;
+    private final String name;
+    private final Class<?> dataType;
+    private final int numElements;
+
+    private TestField(TestType type, String name, Class<?> dataType, int numElements) {
+        this.type = type;
+        this.name = name;
+        this.dataType = dataType;
+        this.numElements = numElements;
+    }
+
+    public static TestField of(String fieldString) throws PlcInvalidFieldException {
+        Matcher matcher = ADDRESS_PATTERN.matcher(fieldString);
+        if (matcher.matches()) {
+            TestType type = TestType.valueOf(matcher.group("type"));
+            String name = matcher.group("name");
+            String dataTypeName = WordUtils.capitalizeFully(matcher.group("dataType"));
+            int numElements = 1;
+            if (matcher.group("numElements") != null) {
+                numElements = Integer.parseInt(matcher.group("numElements"));
+            }
+            try {
+                Class<?> dataType = Class.forName("java.lang." + dataTypeName);
+                return new TestField(type, name, dataType, numElements);
+            } catch (ClassNotFoundException e) {
+                logger.error("Unsupported type: " + dataTypeName, e);
+                throw new PlcInvalidFieldException("Unsupported type: " + dataTypeName);
+            }
+        }
+        throw new PlcInvalidFieldException("Unable to parse address: " + fieldString);
+    }
+
+    static boolean matches(String fieldString) {
+        return ADDRESS_PATTERN.matcher(fieldString).matches();
+    }
+
+    public TestType getType() {
+        return type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Class<?> getDataType() {
+        return dataType;
+    }
+
+    public int getNumElements() {
+        return numElements;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        TestField testField = (TestField) o;
+        return numElements == testField.numElements &&
+            type == testField.type &&
+            Objects.equals(name, testField.name) &&
+            Objects.equals(dataType, testField.dataType);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(type, name, dataType, numElements);
+    }
+
+    @Override
+    public String toString() {
+        return "TestField{" +
+            "type=" + type +
+            ", name='" + name + '\'' +
+            ", dataType=" + dataType +
+            ", numElements=" + numElements +
+            '}';
+    }
+
+}
diff --git a/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestFieldHandler.java b/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestFieldHandler.java
index 44d71519659..659ea6ecbdc 100644
--- a/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestFieldHandler.java
+++ b/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestFieldHandler.java
@@ -1,174 +1,174 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.simulated.connection;
-
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.connection.PlcFieldHandler;
-import org.apache.plc4x.java.base.messages.items.*;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.Arrays;
-
-public class TestFieldHandler implements PlcFieldHandler {
-
-    @Override
-    public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
-        if (TestField.matches(fieldQuery)) {
-            return TestField.of(fieldQuery);
-        }
-        throw new PlcInvalidFieldException(fieldQuery);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeBoolean(PlcField field, Object[] values) {
-        TestField testField = (TestField) field;
-        if (testField.getDataType() == Boolean.class) {
-            return new DefaultBooleanFieldItem((Boolean[]) values);
-        }
-        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeByte(PlcField field, Object[] values) {
-        TestField testField = (TestField) field;
-        if (testField.getDataType() == Byte.class) {
-            return new DefaultLongFieldItem(Arrays.stream(values).map(x -> new Long((Byte) x)).toArray(Long[]::new));
-        }
-        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeShort(PlcField field, Object[] values) {
-        TestField testField = (TestField) field;
-        if (testField.getDataType() == Short.class) {
-            return new DefaultLongFieldItem(Arrays.stream(values).map(x -> new Long((Short) x)).toArray(Long[]::new));
-        }
-        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeInteger(PlcField field, Object[] values) {
-        TestField testField = (TestField) field;
-        if (testField.getDataType() == Integer.class) {
-            return new DefaultLongFieldItem(Arrays.stream(values).map(x -> new Long((Integer) x)).toArray(Long[]::new));
-        }
-        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeBigInteger(PlcField field, Object[] values) {
-        TestField testField = (TestField) field;
-        if (testField.getDataType() == BigInteger.class) {
-            return new DefaultLongFieldItem(Arrays.stream(values).map(x -> ((BigInteger) x).longValue()).toArray(Long[]::new));
-        }
-        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeLong(PlcField field, Object[] values) {
-        TestField testField = (TestField) field;
-        if (testField.getDataType() == Long.class) {
-            return new DefaultLongFieldItem((Long[]) values);
-        }
-        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeFloat(PlcField field, Object[] values) {
-        TestField testField = (TestField) field;
-        if (testField.getDataType() == Float.class) {
-            return new DefaultFloatFieldItem((Float[]) values);
-        }
-        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeBigDecimal(PlcField field, Object[] values) {
-        TestField testField = (TestField) field;
-        if (testField.getDataType() == BigDecimal.class) {
-            return new DefaultBigDecimalFieldItem((BigDecimal[]) values);
-        }
-        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeDouble(PlcField field, Object[] values) {
-        TestField testField = (TestField) field;
-        if (testField.getDataType() == Double.class) {
-            return new DefaultDoubleFieldItem((Double[]) values);
-        }
-        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeString(PlcField field, Object[] values) {
-        TestField testField = (TestField) field;
-        if (testField.getDataType() == String.class) {
-            return new DefaultStringFieldItem((String[]) values);
-        }
-        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeTime(PlcField field, Object[] values) {
-        TestField testField = (TestField) field;
-        if (testField.getDataType() == LocalTime.class) {
-            return new DefaultLocalTimeFieldItem((LocalTime[]) values);
-        }
-        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeDate(PlcField field, Object[] values) {
-        TestField testField = (TestField) field;
-        if (testField.getDataType() == LocalDate.class) {
-            return new DefaultLocalDateFieldItem((LocalDate[]) values);
-        }
-        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeDateTime(PlcField field, Object[] values) {
-        TestField testField = (TestField) field;
-        if (testField.getDataType() == LocalDateTime.class) {
-            return new DefaultLocalDateTimeFieldItem((LocalDateTime[]) values);
-        }
-        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeByteArray(PlcField field, Object[] values) {
-        TestField testField = (TestField) field;
-        if (testField.getDataType() == byte[].class) {
-            return new DefaultByteArrayFieldItem(Arrays.stream(values).map(Byte.class::cast).toArray(Byte[]::new));
-        }
-        if (testField.getDataType() == Byte[].class) {
-            return new DefaultByteArrayFieldItem((Byte[]) values);
-        }
-        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.simulated.connection;
+
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.connection.PlcFieldHandler;
+import org.apache.plc4x.java.base.messages.items.*;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.Arrays;
+
+public class TestFieldHandler implements PlcFieldHandler {
+
+    @Override
+    public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
+        if (TestField.matches(fieldQuery)) {
+            return TestField.of(fieldQuery);
+        }
+        throw new PlcInvalidFieldException(fieldQuery);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeBoolean(PlcField field, Object[] values) {
+        TestField testField = (TestField) field;
+        if (testField.getDataType() == Boolean.class) {
+            return new DefaultBooleanFieldItem((Boolean[]) values);
+        }
+        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeByte(PlcField field, Object[] values) {
+        TestField testField = (TestField) field;
+        if (testField.getDataType() == Byte.class) {
+            return new DefaultLongFieldItem(Arrays.stream(values).map(x -> new Long((Byte) x)).toArray(Long[]::new));
+        }
+        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeShort(PlcField field, Object[] values) {
+        TestField testField = (TestField) field;
+        if (testField.getDataType() == Short.class) {
+            return new DefaultLongFieldItem(Arrays.stream(values).map(x -> new Long((Short) x)).toArray(Long[]::new));
+        }
+        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeInteger(PlcField field, Object[] values) {
+        TestField testField = (TestField) field;
+        if (testField.getDataType() == Integer.class) {
+            return new DefaultLongFieldItem(Arrays.stream(values).map(x -> new Long((Integer) x)).toArray(Long[]::new));
+        }
+        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeBigInteger(PlcField field, Object[] values) {
+        TestField testField = (TestField) field;
+        if (testField.getDataType() == BigInteger.class) {
+            return new DefaultLongFieldItem(Arrays.stream(values).map(x -> ((BigInteger) x).longValue()).toArray(Long[]::new));
+        }
+        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeLong(PlcField field, Object[] values) {
+        TestField testField = (TestField) field;
+        if (testField.getDataType() == Long.class) {
+            return new DefaultLongFieldItem((Long[]) values);
+        }
+        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeFloat(PlcField field, Object[] values) {
+        TestField testField = (TestField) field;
+        if (testField.getDataType() == Float.class) {
+            return new DefaultFloatFieldItem((Float[]) values);
+        }
+        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeBigDecimal(PlcField field, Object[] values) {
+        TestField testField = (TestField) field;
+        if (testField.getDataType() == BigDecimal.class) {
+            return new DefaultBigDecimalFieldItem((BigDecimal[]) values);
+        }
+        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDouble(PlcField field, Object[] values) {
+        TestField testField = (TestField) field;
+        if (testField.getDataType() == Double.class) {
+            return new DefaultDoubleFieldItem((Double[]) values);
+        }
+        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeString(PlcField field, Object[] values) {
+        TestField testField = (TestField) field;
+        if (testField.getDataType() == String.class) {
+            return new DefaultStringFieldItem((String[]) values);
+        }
+        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeTime(PlcField field, Object[] values) {
+        TestField testField = (TestField) field;
+        if (testField.getDataType() == LocalTime.class) {
+            return new DefaultLocalTimeFieldItem((LocalTime[]) values);
+        }
+        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDate(PlcField field, Object[] values) {
+        TestField testField = (TestField) field;
+        if (testField.getDataType() == LocalDate.class) {
+            return new DefaultLocalDateFieldItem((LocalDate[]) values);
+        }
+        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDateTime(PlcField field, Object[] values) {
+        TestField testField = (TestField) field;
+        if (testField.getDataType() == LocalDateTime.class) {
+            return new DefaultLocalDateTimeFieldItem((LocalDateTime[]) values);
+        }
+        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeByteArray(PlcField field, Object[] values) {
+        TestField testField = (TestField) field;
+        if (testField.getDataType() == byte[].class) {
+            return new DefaultByteArrayFieldItem(Arrays.stream(values).map(Byte.class::cast).toArray(Byte[]::new));
+        }
+        if (testField.getDataType() == Byte[].class) {
+            return new DefaultByteArrayFieldItem((Byte[]) values);
+        }
+        throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
+    }
+
+}
diff --git a/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestFieldItem.java b/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestFieldItem.java
index e65ec8d768a..e567d071722 100644
--- a/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestFieldItem.java
+++ b/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestFieldItem.java
@@ -1,35 +1,35 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.simulated.connection;
-
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-
-public class TestFieldItem<T> extends BaseDefaultFieldItem<T> {
-
-    public TestFieldItem(T... values) {
-        super(values);
-    }
-
-    @Override
-    public Object getObject(int index) {
-        return getValue(index);
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.simulated.connection;
+
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+
+public class TestFieldItem<T> extends BaseDefaultFieldItem<T> {
+
+    public TestFieldItem(T... values) {
+        super(values);
+    }
+
+    @Override
+    public Object getObject(int index) {
+        return getValue(index);
+    }
+
+}
diff --git a/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestType.java b/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestType.java
index d0d8d436161..76c170654a4 100644
--- a/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestType.java
+++ b/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestType.java
@@ -1,28 +1,28 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.simulated.connection;
-
-public enum TestType {
-
-    RANDOM,
-    STATE,
-    STDOUT
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.simulated.connection;
+
+public enum TestType {
+
+    RANDOM,
+    STATE,
+    STDOUT
+
+}
diff --git a/plc4j/drivers/simulated/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver b/plc4j/drivers/simulated/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
index 37f903847c6..f425d2eaf99 100644
--- a/plc4j/drivers/simulated/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
+++ b/plc4j/drivers/simulated/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
@@ -1,38 +1,38 @@
-#
-# 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
-#
-#     http://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.
-#
-
-#
-# 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
-#
-#   http://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.
-#
-org.apache.plc4x.java.simulated.SimulatedPlcDriver
+#
+# 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
+#
+#     http://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.
+#
+
+#
+# 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
+#
+#   http://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.
+#
+org.apache.plc4x.java.simulated.SimulatedPlcDriver
diff --git a/plc4j/drivers/simulated/src/test/java/org/apache/plc4x/java/simulated/SimulatedPlcDriverTest.java b/plc4j/drivers/simulated/src/test/java/org/apache/plc4x/java/simulated/SimulatedPlcDriverTest.java
index 6a5d9e8309a..a180fbfd75c 100644
--- a/plc4j/drivers/simulated/src/test/java/org/apache/plc4x/java/simulated/SimulatedPlcDriverTest.java
+++ b/plc4j/drivers/simulated/src/test/java/org/apache/plc4x/java/simulated/SimulatedPlcDriverTest.java
@@ -1,57 +1,57 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.simulated;
-
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.simulated.connection.SimulatedPlcConnection;
-import org.assertj.core.api.WithAssertions;
-import org.junit.jupiter.api.Test;
-
-class SimulatedPlcDriverTest implements WithAssertions {
-
-    SimulatedPlcDriver SUT = new SimulatedPlcDriver();
-
-    @Test
-    void getProtocolCode() {
-        assertThat(SUT.getProtocolCode()).isEqualTo("test");
-    }
-
-    @Test
-    void getProtocolName() {
-        assertThat(SUT.getProtocolName()).isEqualTo("PLC4X Test Protocol");
-    }
-
-    @Test
-    void connect() throws Exception {
-        assertThat(SUT.connect("test:foobar")).isInstanceOf(SimulatedPlcConnection.class);
-    }
-
-    @Test
-    void connect_secure() {
-        assertThatThrownBy(() -> SUT.connect(null, null)).isInstanceOf(PlcConnectionException.class);
-    }
-
-    @Test
-    void wrongUrl() {
-        assertThatThrownBy(() -> SUT.connect("test:"))
-            .isInstanceOf(PlcConnectionException.class)
-            .hasMessage("Invalid URL: no device name given.");
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.simulated;
+
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.simulated.connection.SimulatedPlcConnection;
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.Test;
+
+class SimulatedPlcDriverTest implements WithAssertions {
+
+    SimulatedPlcDriver SUT = new SimulatedPlcDriver();
+
+    @Test
+    void getProtocolCode() {
+        assertThat(SUT.getProtocolCode()).isEqualTo("test");
+    }
+
+    @Test
+    void getProtocolName() {
+        assertThat(SUT.getProtocolName()).isEqualTo("PLC4X Test Protocol");
+    }
+
+    @Test
+    void connect() throws Exception {
+        assertThat(SUT.connect("test:foobar")).isInstanceOf(SimulatedPlcConnection.class);
+    }
+
+    @Test
+    void connect_secure() {
+        assertThatThrownBy(() -> SUT.connect(null, null)).isInstanceOf(PlcConnectionException.class);
+    }
+
+    @Test
+    void wrongUrl() {
+        assertThatThrownBy(() -> SUT.connect("test:"))
+            .isInstanceOf(PlcConnectionException.class)
+            .hasMessage("Invalid URL: no device name given.");
+    }
 }
\ No newline at end of file
diff --git a/plc4j/drivers/simulated/src/test/java/org/apache/plc4x/java/simulated/connection/SimulatedPlcConnectionTest.java b/plc4j/drivers/simulated/src/test/java/org/apache/plc4x/java/simulated/connection/SimulatedPlcConnectionTest.java
index 579352a402a..12989bdcf73 100644
--- a/plc4j/drivers/simulated/src/test/java/org/apache/plc4x/java/simulated/connection/SimulatedPlcConnectionTest.java
+++ b/plc4j/drivers/simulated/src/test/java/org/apache/plc4x/java/simulated/connection/SimulatedPlcConnectionTest.java
@@ -1,245 +1,245 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.simulated.connection;
-
-import org.apache.plc4x.java.api.messages.*;
-import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
-import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
-import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
-import org.assertj.core.api.WithAssertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.time.Duration;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Queue;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
-
-import static org.mockito.Mockito.mock;
-
-@ExtendWith(MockitoExtension.class)
-class SimulatedPlcConnectionTest implements WithAssertions {
-
-    SimulatedPlcConnection SUT;
-
-    @Mock
-    TestDevice mockDevice;
-
-    @BeforeEach
-    void setUp() {
-        SUT = new SimulatedPlcConnection(mockDevice);
-    }
-
-    @Nested
-    class Lifecyle {
-        @Test
-        void connect() {
-            assertThat(SUT.isConnected()).isFalse();
-            SUT.connect();
-            assertThat(SUT.isConnected()).isTrue();
-        }
-
-        @Test
-        void isConnected() {
-            assertThat(SUT.isConnected()).isFalse();
-        }
-
-        @Test
-        void close() {
-            assertThat(SUT.isConnected()).isFalse();
-            SUT.close();
-            assertThat(SUT.isConnected()).isFalse();
-        }
-    }
-
-    @Nested
-    class ReadWrite {
-        @Test
-        void read() throws Exception {
-            PlcReadRequest plcReadRequest = SUT.readRequestBuilder()
-                .addItem("foo", "RANDOM/foo:String")
-                .build();
-
-            CompletableFuture<PlcReadResponse> read = SUT.read(plcReadRequest);
-            PlcReadResponse response = read.get(1, TimeUnit.SECONDS);
-            assertThat(response).isNotNull();
-        }
-
-        @Test
-        void write() throws Exception {
-            PlcWriteRequest plcWriteRequest = SUT.writeRequestBuilder()
-                .addItem("bar", "RANDOM/foo:String", "foobar")
-                .build();
-
-            CompletableFuture<PlcWriteResponse> write = SUT.write(plcWriteRequest);
-            PlcWriteResponse response = write.get(1, TimeUnit.SECONDS);
-            assertThat(response).isNotNull();
-        }
-    }
-
-    @Nested
-    class Subscription {
-        @Test
-        void subscribe() throws Exception {
-            PlcSubscriptionRequest plcSubscriptionRequest = SUT.subscriptionRequestBuilder()
-                .addCyclicField("foo1", "STATE/foo:String", Duration.ofSeconds(1))
-                .addChangeOfStateField("foo2", "STATE/foo:String")
-                .addEventField("foo3", "STATE/foo:String")
-                .build();
-
-            CompletableFuture<PlcSubscriptionResponse> subscribe = SUT.subscribe(plcSubscriptionRequest);
-            PlcSubscriptionResponse plcSubscriptionResponse = subscribe.get(1, TimeUnit.SECONDS);
-            Collection<PlcSubscriptionHandle> subscriptionHandles = plcSubscriptionResponse.getSubscriptionHandles();
-            assertThat(subscriptionHandles).isNotEmpty();
-        }
-
-        @Test
-        void unsubscribe() throws Exception {
-            PlcUnsubscriptionRequest plcUnsubscriptionRequest = SUT.unsubscriptionRequestBuilder()
-                .addHandles(mock(InternalPlcSubscriptionHandle.class))
-                .build();
-
-            CompletableFuture<PlcUnsubscriptionResponse> unsubscribe = SUT.unsubscribe(plcUnsubscriptionRequest);
-            PlcUnsubscriptionResponse plcUnsubscriptionResponse = unsubscribe.get(1, TimeUnit.SECONDS);
-            assertThat(plcUnsubscriptionResponse).isNotNull();
-        }
-    }
-
-    @Nested
-    class Registration {
-        @Test
-        void register() {
-            PlcConsumerRegistration register = SUT.register(mock(Consumer.class), Collections.emptyList());
-            assertThat(register).isNotNull();
-        }
-
-        @Test
-        void unregister() {
-            SUT.unregister(mock(PlcConsumerRegistration.class));
-        }
-    }
-
-    @Nested
-    class Roundtrip {
-        @BeforeEach
-        void setUp() {
-            SUT = new SimulatedPlcConnection(new TestDevice("roundtripdevice"));
-        }
-
-        @Test
-        void subscription() throws Exception {
-            PlcWriteRequest plcWriteRequest = SUT.writeRequestBuilder()
-                .addItem("cyclic", "STATE/cyclic:STRING", "initialcyclic")
-                .addItem("state", "STATE/state:STRING", "initialstate")
-                .addItem("event", "STATE/event:STRING", "initialevent")
-                .build();
-
-            SUT.write(plcWriteRequest).get(1, TimeUnit.SECONDS);
-
-            PlcSubscriptionRequest plcSubscriptionRequest = SUT.subscriptionRequestBuilder()
-                .addCyclicField("cyclic", "STATE/cyclic:String", Duration.ofSeconds(1))
-                .addChangeOfStateField("state", "STATE/state:String")
-                .addEventField("event", "STATE/event:String")
-                .build();
-
-            PlcSubscriptionResponse plcSubscriptionResponse = SUT.subscribe(plcSubscriptionRequest).get(1, TimeUnit.SECONDS);
-            Queue<PlcSubscriptionEvent> cyclicQueue = new ConcurrentLinkedQueue<>();
-            PlcConsumerRegistration cyclicRegistration = plcSubscriptionResponse.getSubscriptionHandle("cyclic").register(cyclicQueue::add);
-            Queue<PlcSubscriptionEvent> stateQueue = new ConcurrentLinkedQueue<>();
-            PlcConsumerRegistration stateRegistration = plcSubscriptionResponse.getSubscriptionHandle("state").register(stateQueue::add);
-            Queue<PlcSubscriptionEvent> eventQueue = new ConcurrentLinkedQueue<>();
-            PlcConsumerRegistration eventRegistration = plcSubscriptionResponse.getSubscriptionHandle("event").register(eventQueue::add);
-            assertThat(plcSubscriptionResponse.getFieldNames()).isNotEmpty();
-            TimeUnit.SECONDS.sleep(10);
-
-            PlcWriteRequest plcWriteRequest2 = SUT.writeRequestBuilder()
-                .addItem("cyclic", "STATE/cyclic:STRING", "changedcyclic")
-                .addItem("state", "STATE/state:STRING", "changedstate")
-                .addItem("event", "STATE/event:STRING", "changedevent")
-                .build();
-
-            SUT.write(plcWriteRequest2).get(1, TimeUnit.SECONDS);
-            cyclicRegistration.unregister();
-            stateRegistration.unregister();
-            eventRegistration.unregister();
-
-            assertThat(cyclicQueue).isNotEmpty();
-            cyclicQueue.forEach(plcSubscriptionEvent -> assertThat(plcSubscriptionEvent.getFieldNames()).containsOnly("cyclic")
-            );
-            assertThat(stateQueue).isNotEmpty();
-            stateQueue.forEach(plcSubscriptionEvent -> assertThat(plcSubscriptionEvent.getFieldNames()).containsOnly("state")
-            );
-            assertThat(eventQueue).isNotEmpty();
-            eventQueue.forEach(plcSubscriptionEvent -> assertThat(plcSubscriptionEvent.getFieldNames()).containsOnly("event")
-            );
-        }
-    }
-
-    @Nested
-    class Misc {
-        @Test
-        void testToString() {
-            assertThat(SUT.toString()).isEqualTo("test:mockDevice");
-        }
-
-        @Test
-        void canRead() {
-            assertThat(SUT.canRead()).isTrue();
-        }
-
-        @Test
-        void canWrite() {
-            assertThat(SUT.canWrite()).isTrue();
-        }
-
-        @Test
-        void canSubscribe() {
-            assertThat(SUT.canSubscribe()).isTrue();
-        }
-
-        @Test
-        void readRequestBuilder() {
-            assertThat(SUT.readRequestBuilder()).isNotNull();
-        }
-
-        @Test
-        void writeRequestBuilder() {
-            assertThat(SUT.writeRequestBuilder()).isNotNull();
-        }
-
-        @Test
-        void subscriptionRequestBuilder() {
-            assertThat(SUT.subscriptionRequestBuilder()).isNotNull();
-        }
-
-        @Test
-        void unsubscriptionRequestBuilder() {
-            assertThat(SUT.unsubscriptionRequestBuilder()).isNotNull();
-        }
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.simulated.connection;
+
+import org.apache.plc4x.java.api.messages.*;
+import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.time.Duration;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Queue;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+
+import static org.mockito.Mockito.mock;
+
+@ExtendWith(MockitoExtension.class)
+class SimulatedPlcConnectionTest implements WithAssertions {
+
+    SimulatedPlcConnection SUT;
+
+    @Mock
+    TestDevice mockDevice;
+
+    @BeforeEach
+    void setUp() {
+        SUT = new SimulatedPlcConnection(mockDevice);
+    }
+
+    @Nested
+    class Lifecyle {
+        @Test
+        void connect() {
+            assertThat(SUT.isConnected()).isFalse();
+            SUT.connect();
+            assertThat(SUT.isConnected()).isTrue();
+        }
+
+        @Test
+        void isConnected() {
+            assertThat(SUT.isConnected()).isFalse();
+        }
+
+        @Test
+        void close() {
+            assertThat(SUT.isConnected()).isFalse();
+            SUT.close();
+            assertThat(SUT.isConnected()).isFalse();
+        }
+    }
+
+    @Nested
+    class ReadWrite {
+        @Test
+        void read() throws Exception {
+            PlcReadRequest plcReadRequest = SUT.readRequestBuilder()
+                .addItem("foo", "RANDOM/foo:String")
+                .build();
+
+            CompletableFuture<PlcReadResponse> read = SUT.read(plcReadRequest);
+            PlcReadResponse response = read.get(1, TimeUnit.SECONDS);
+            assertThat(response).isNotNull();
+        }
+
+        @Test
+        void write() throws Exception {
+            PlcWriteRequest plcWriteRequest = SUT.writeRequestBuilder()
+                .addItem("bar", "RANDOM/foo:String", "foobar")
+                .build();
+
+            CompletableFuture<PlcWriteResponse> write = SUT.write(plcWriteRequest);
+            PlcWriteResponse response = write.get(1, TimeUnit.SECONDS);
+            assertThat(response).isNotNull();
+        }
+    }
+
+    @Nested
+    class Subscription {
+        @Test
+        void subscribe() throws Exception {
+            PlcSubscriptionRequest plcSubscriptionRequest = SUT.subscriptionRequestBuilder()
+                .addCyclicField("foo1", "STATE/foo:String", Duration.ofSeconds(1))
+                .addChangeOfStateField("foo2", "STATE/foo:String")
+                .addEventField("foo3", "STATE/foo:String")
+                .build();
+
+            CompletableFuture<PlcSubscriptionResponse> subscribe = SUT.subscribe(plcSubscriptionRequest);
+            PlcSubscriptionResponse plcSubscriptionResponse = subscribe.get(1, TimeUnit.SECONDS);
+            Collection<PlcSubscriptionHandle> subscriptionHandles = plcSubscriptionResponse.getSubscriptionHandles();
+            assertThat(subscriptionHandles).isNotEmpty();
+        }
+
+        @Test
+        void unsubscribe() throws Exception {
+            PlcUnsubscriptionRequest plcUnsubscriptionRequest = SUT.unsubscriptionRequestBuilder()
+                .addHandles(mock(InternalPlcSubscriptionHandle.class))
+                .build();
+
+            CompletableFuture<PlcUnsubscriptionResponse> unsubscribe = SUT.unsubscribe(plcUnsubscriptionRequest);
+            PlcUnsubscriptionResponse plcUnsubscriptionResponse = unsubscribe.get(1, TimeUnit.SECONDS);
+            assertThat(plcUnsubscriptionResponse).isNotNull();
+        }
+    }
+
+    @Nested
+    class Registration {
+        @Test
+        void register() {
+            PlcConsumerRegistration register = SUT.register(mock(Consumer.class), Collections.emptyList());
+            assertThat(register).isNotNull();
+        }
+
+        @Test
+        void unregister() {
+            SUT.unregister(mock(PlcConsumerRegistration.class));
+        }
+    }
+
+    @Nested
+    class Roundtrip {
+        @BeforeEach
+        void setUp() {
+            SUT = new SimulatedPlcConnection(new TestDevice("roundtripdevice"));
+        }
+
+        @Test
+        void subscription() throws Exception {
+            PlcWriteRequest plcWriteRequest = SUT.writeRequestBuilder()
+                .addItem("cyclic", "STATE/cyclic:STRING", "initialcyclic")
+                .addItem("state", "STATE/state:STRING", "initialstate")
+                .addItem("event", "STATE/event:STRING", "initialevent")
+                .build();
+
+            SUT.write(plcWriteRequest).get(1, TimeUnit.SECONDS);
+
+            PlcSubscriptionRequest plcSubscriptionRequest = SUT.subscriptionRequestBuilder()
+                .addCyclicField("cyclic", "STATE/cyclic:String", Duration.ofSeconds(1))
+                .addChangeOfStateField("state", "STATE/state:String")
+                .addEventField("event", "STATE/event:String")
+                .build();
+
+            PlcSubscriptionResponse plcSubscriptionResponse = SUT.subscribe(plcSubscriptionRequest).get(1, TimeUnit.SECONDS);
+            Queue<PlcSubscriptionEvent> cyclicQueue = new ConcurrentLinkedQueue<>();
+            PlcConsumerRegistration cyclicRegistration = plcSubscriptionResponse.getSubscriptionHandle("cyclic").register(cyclicQueue::add);
+            Queue<PlcSubscriptionEvent> stateQueue = new ConcurrentLinkedQueue<>();
+            PlcConsumerRegistration stateRegistration = plcSubscriptionResponse.getSubscriptionHandle("state").register(stateQueue::add);
+            Queue<PlcSubscriptionEvent> eventQueue = new ConcurrentLinkedQueue<>();
+            PlcConsumerRegistration eventRegistration = plcSubscriptionResponse.getSubscriptionHandle("event").register(eventQueue::add);
+            assertThat(plcSubscriptionResponse.getFieldNames()).isNotEmpty();
+            TimeUnit.SECONDS.sleep(10);
+
+            PlcWriteRequest plcWriteRequest2 = SUT.writeRequestBuilder()
+                .addItem("cyclic", "STATE/cyclic:STRING", "changedcyclic")
+                .addItem("state", "STATE/state:STRING", "changedstate")
+                .addItem("event", "STATE/event:STRING", "changedevent")
+                .build();
+
+            SUT.write(plcWriteRequest2).get(1, TimeUnit.SECONDS);
+            cyclicRegistration.unregister();
+            stateRegistration.unregister();
+            eventRegistration.unregister();
+
+            assertThat(cyclicQueue).isNotEmpty();
+            cyclicQueue.forEach(plcSubscriptionEvent -> assertThat(plcSubscriptionEvent.getFieldNames()).containsOnly("cyclic")
+            );
+            assertThat(stateQueue).isNotEmpty();
+            stateQueue.forEach(plcSubscriptionEvent -> assertThat(plcSubscriptionEvent.getFieldNames()).containsOnly("state")
+            );
+            assertThat(eventQueue).isNotEmpty();
+            eventQueue.forEach(plcSubscriptionEvent -> assertThat(plcSubscriptionEvent.getFieldNames()).containsOnly("event")
+            );
+        }
+    }
+
+    @Nested
+    class Misc {
+        @Test
+        void testToString() {
+            assertThat(SUT.toString()).isEqualTo("test:mockDevice");
+        }
+
+        @Test
+        void canRead() {
+            assertThat(SUT.canRead()).isTrue();
+        }
+
+        @Test
+        void canWrite() {
+            assertThat(SUT.canWrite()).isTrue();
+        }
+
+        @Test
+        void canSubscribe() {
+            assertThat(SUT.canSubscribe()).isTrue();
+        }
+
+        @Test
+        void readRequestBuilder() {
+            assertThat(SUT.readRequestBuilder()).isNotNull();
+        }
+
+        @Test
+        void writeRequestBuilder() {
+            assertThat(SUT.writeRequestBuilder()).isNotNull();
+        }
+
+        @Test
+        void subscriptionRequestBuilder() {
+            assertThat(SUT.subscriptionRequestBuilder()).isNotNull();
+        }
+
+        @Test
+        void unsubscriptionRequestBuilder() {
+            assertThat(SUT.unsubscriptionRequestBuilder()).isNotNull();
+        }
+    }
 }
\ No newline at end of file
diff --git a/plc4j/drivers/simulated/src/test/java/org/apache/plc4x/java/simulated/connection/TestDeviceTest.java b/plc4j/drivers/simulated/src/test/java/org/apache/plc4x/java/simulated/connection/TestDeviceTest.java
index fbe3f3641aa..f11bc3fb952 100644
--- a/plc4j/drivers/simulated/src/test/java/org/apache/plc4x/java/simulated/connection/TestDeviceTest.java
+++ b/plc4j/drivers/simulated/src/test/java/org/apache/plc4x/java/simulated/connection/TestDeviceTest.java
@@ -1,56 +1,56 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.simulated.connection;
-
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-import org.apache.plc4x.java.base.messages.items.DefaultLongFieldItem;
-import org.junit.jupiter.api.Test;
-
-import java.util.Optional;
-
-import static org.junit.Assert.*;
-
-public class TestDeviceTest {
-
-    @Test
-    public void random() {
-        TestDevice device = new TestDevice("foobar");
-        TestField field = TestField.of("RANDOM/foo:INTEGER");
-
-        Optional<BaseDefaultFieldItem> value = device.get(field);
-
-        assertTrue(value.isPresent());
-    }
-
-    @Test
-    public void read() {
-        TestDevice device = new TestDevice("foobar");
-        TestField field = TestField.of("STATE/bar:INTEGER");
-
-        Optional<BaseDefaultFieldItem> value = device.get(field);
-        assertFalse(value.isPresent());
-
-        device.set(field, new DefaultLongFieldItem((long) 42));
-        value = device.get(field);
-        assertTrue(value.isPresent());
-        BaseDefaultFieldItem fieldItem = value.get();
-        assertEquals(42L, (long) fieldItem.getLong(0));
-    }
-
-}
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.simulated.connection;
+
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+import org.apache.plc4x.java.base.messages.items.DefaultLongFieldItem;
+import org.junit.jupiter.api.Test;
+
+import java.util.Optional;
+
+import static org.junit.Assert.*;
+
+public class TestDeviceTest {
+
+    @Test
+    public void random() {
+        TestDevice device = new TestDevice("foobar");
+        TestField field = TestField.of("RANDOM/foo:INTEGER");
+
+        Optional<BaseDefaultFieldItem> value = device.get(field);
+
+        assertTrue(value.isPresent());
+    }
+
+    @Test
+    public void read() {
+        TestDevice device = new TestDevice("foobar");
+        TestField field = TestField.of("STATE/bar:INTEGER");
+
+        Optional<BaseDefaultFieldItem> value = device.get(field);
+        assertFalse(value.isPresent());
+
+        device.set(field, new DefaultLongFieldItem((long) 42));
+        value = device.get(field);
+        assertTrue(value.isPresent());
+        BaseDefaultFieldItem fieldItem = value.get();
+        assertEquals(42L, (long) fieldItem.getLong(0));
+    }
+
+}
diff --git a/plc4j/drivers/simulated/src/test/java/org/apache/plc4x/java/simulated/connection/TestFieldHandlerTest.java b/plc4j/drivers/simulated/src/test/java/org/apache/plc4x/java/simulated/connection/TestFieldHandlerTest.java
index 9fff3417b3a..4f786d55ba4 100644
--- a/plc4j/drivers/simulated/src/test/java/org/apache/plc4x/java/simulated/connection/TestFieldHandlerTest.java
+++ b/plc4j/drivers/simulated/src/test/java/org/apache/plc4x/java/simulated/connection/TestFieldHandlerTest.java
@@ -1,133 +1,133 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.simulated.connection;
-
-import org.assertj.core.api.WithAssertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-
-import static org.mockito.Mockito.when;
-
-@ExtendWith(MockitoExtension.class)
-@SuppressWarnings("unchecked")
-class TestFieldHandlerTest implements WithAssertions {
-
-    TestFieldHandler SUT = new TestFieldHandler();
-
-    @Mock
-    TestField plcField;
-
-    @Test
-    void createField() {
-        assertThat(SUT.createField("STATE/bar:INTEGER")).isNotNull();
-    }
-
-    @Test
-    void encodeBoolean() {
-        when(plcField.getDataType()).thenReturn((Class) Boolean.class);
-        assertThat(SUT.encodeBoolean(plcField, new Boolean[0])).isNotNull();
-    }
-
-    @Test
-    void encodeByte() {
-        when(plcField.getDataType()).thenReturn((Class) Byte.class);
-        assertThat(SUT.encodeByte(plcField, new Byte[0])).isNotNull();
-    }
-
-    @Test
-    void encodeShort() {
-        when(plcField.getDataType()).thenReturn((Class) Short.class);
-        assertThat(SUT.encodeShort(plcField, new Short[0])).isNotNull();
-    }
-
-    @Test
-    void encodeInteger() {
-        when(plcField.getDataType()).thenReturn((Class) Integer.class);
-        assertThat(SUT.encodeInteger(plcField, new Integer[0])).isNotNull();
-    }
-
-    @Test
-    void encodeBigInteger() {
-        when(plcField.getDataType()).thenReturn((Class) BigInteger.class);
-        assertThat(SUT.encodeBigInteger(plcField, new BigInteger[0])).isNotNull();
-    }
-
-    @Test
-    void encodeLong() {
-        when(plcField.getDataType()).thenReturn((Class) Long.class);
-        assertThat(SUT.encodeLong(plcField, new Long[0])).isNotNull();
-    }
-
-    @Test
-    void encodeFloat() {
-        when(plcField.getDataType()).thenReturn((Class) Float.class);
-        assertThat(SUT.encodeFloat(plcField, new Float[0])).isNotNull();
-    }
-
-    @Test
-    void encodeBigDecimal() {
-        when(plcField.getDataType()).thenReturn((Class) BigDecimal.class);
-        assertThat(SUT.encodeBigDecimal(plcField, new BigDecimal[0])).isNotNull();
-    }
-
-    @Test
-    void encodeDouble() {
-        when(plcField.getDataType()).thenReturn((Class) Double.class);
-        assertThat(SUT.encodeDouble(plcField, new Double[0])).isNotNull();
-    }
-
-    @Test
-    void encodeString() {
-        when(plcField.getDataType()).thenReturn((Class) String.class);
-        assertThat(SUT.encodeString(plcField, new String[0])).isNotNull();
-    }
-
-    @Test
-    void encodeTime() {
-        when(plcField.getDataType()).thenReturn((Class) LocalTime.class);
-        assertThat(SUT.encodeTime(plcField, new LocalTime[0])).isNotNull();
-    }
-
-    @Test
-    void encodeDate() {
-        when(plcField.getDataType()).thenReturn((Class) LocalDate.class);
-        assertThat(SUT.encodeDate(plcField, new LocalDate[0])).isNotNull();
-    }
-
-    @Test
-    void encodeDateTime() {
-        when(plcField.getDataType()).thenReturn((Class) LocalDateTime.class);
-        assertThat(SUT.encodeDateTime(plcField, new LocalDateTime[0])).isNotNull();
-    }
-
-    @Test
-    void encodeByteArray() {
-        when(plcField.getDataType()).thenReturn((Class) Byte[].class);
-        assertThat(SUT.encodeByteArray(plcField, new Byte[0])).isNotNull();
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.simulated.connection;
+
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+@SuppressWarnings("unchecked")
+class TestFieldHandlerTest implements WithAssertions {
+
+    TestFieldHandler SUT = new TestFieldHandler();
+
+    @Mock
+    TestField plcField;
+
+    @Test
+    void createField() {
+        assertThat(SUT.createField("STATE/bar:INTEGER")).isNotNull();
+    }
+
+    @Test
+    void encodeBoolean() {
+        when(plcField.getDataType()).thenReturn((Class) Boolean.class);
+        assertThat(SUT.encodeBoolean(plcField, new Boolean[0])).isNotNull();
+    }
+
+    @Test
+    void encodeByte() {
+        when(plcField.getDataType()).thenReturn((Class) Byte.class);
+        assertThat(SUT.encodeByte(plcField, new Byte[0])).isNotNull();
+    }
+
+    @Test
+    void encodeShort() {
+        when(plcField.getDataType()).thenReturn((Class) Short.class);
+        assertThat(SUT.encodeShort(plcField, new Short[0])).isNotNull();
+    }
+
+    @Test
+    void encodeInteger() {
+        when(plcField.getDataType()).thenReturn((Class) Integer.class);
+        assertThat(SUT.encodeInteger(plcField, new Integer[0])).isNotNull();
+    }
+
+    @Test
+    void encodeBigInteger() {
+        when(plcField.getDataType()).thenReturn((Class) BigInteger.class);
+        assertThat(SUT.encodeBigInteger(plcField, new BigInteger[0])).isNotNull();
+    }
+
+    @Test
+    void encodeLong() {
+        when(plcField.getDataType()).thenReturn((Class) Long.class);
+        assertThat(SUT.encodeLong(plcField, new Long[0])).isNotNull();
+    }
+
+    @Test
+    void encodeFloat() {
+        when(plcField.getDataType()).thenReturn((Class) Float.class);
+        assertThat(SUT.encodeFloat(plcField, new Float[0])).isNotNull();
+    }
+
+    @Test
+    void encodeBigDecimal() {
+        when(plcField.getDataType()).thenReturn((Class) BigDecimal.class);
+        assertThat(SUT.encodeBigDecimal(plcField, new BigDecimal[0])).isNotNull();
+    }
+
+    @Test
+    void encodeDouble() {
+        when(plcField.getDataType()).thenReturn((Class) Double.class);
+        assertThat(SUT.encodeDouble(plcField, new Double[0])).isNotNull();
+    }
+
+    @Test
+    void encodeString() {
+        when(plcField.getDataType()).thenReturn((Class) String.class);
+        assertThat(SUT.encodeString(plcField, new String[0])).isNotNull();
+    }
+
+    @Test
+    void encodeTime() {
+        when(plcField.getDataType()).thenReturn((Class) LocalTime.class);
+        assertThat(SUT.encodeTime(plcField, new LocalTime[0])).isNotNull();
+    }
+
+    @Test
+    void encodeDate() {
+        when(plcField.getDataType()).thenReturn((Class) LocalDate.class);
+        assertThat(SUT.encodeDate(plcField, new LocalDate[0])).isNotNull();
+    }
+
+    @Test
+    void encodeDateTime() {
+        when(plcField.getDataType()).thenReturn((Class) LocalDateTime.class);
+        assertThat(SUT.encodeDateTime(plcField, new LocalDateTime[0])).isNotNull();
+    }
+
+    @Test
+    void encodeByteArray() {
+        when(plcField.getDataType()).thenReturn((Class) Byte[].class);
+        assertThat(SUT.encodeByteArray(plcField, new Byte[0])).isNotNull();
+    }
 }
\ No newline at end of file
diff --git a/plc4j/drivers/simulated/src/test/java/org/apache/plc4x/java/simulated/connection/TestFieldItemTest.java b/plc4j/drivers/simulated/src/test/java/org/apache/plc4x/java/simulated/connection/TestFieldItemTest.java
index bad6841fdc9..af3fd069d76 100644
--- a/plc4j/drivers/simulated/src/test/java/org/apache/plc4x/java/simulated/connection/TestFieldItemTest.java
+++ b/plc4j/drivers/simulated/src/test/java/org/apache/plc4x/java/simulated/connection/TestFieldItemTest.java
@@ -1,31 +1,31 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.simulated.connection;
-
-import org.assertj.core.api.WithAssertions;
-import org.junit.jupiter.api.Test;
-
-class TestFieldItemTest implements WithAssertions {
-
-    @Test
-    void getObject() {
-        assertThat(new TestFieldItem<String>("").getObject(0)).isNotNull();
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.simulated.connection;
+
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.Test;
+
+class TestFieldItemTest implements WithAssertions {
+
+    @Test
+    void getObject() {
+        assertThat(new TestFieldItem<String>("").getObject(0)).isNotNull();
+    }
 }
\ No newline at end of file
diff --git a/plc4j/drivers/simulated/src/test/java/org/apache/plc4x/java/simulated/connection/TestFieldTest.java b/plc4j/drivers/simulated/src/test/java/org/apache/plc4x/java/simulated/connection/TestFieldTest.java
index f2e5c53c4d8..f9fda1fbe4c 100644
--- a/plc4j/drivers/simulated/src/test/java/org/apache/plc4x/java/simulated/connection/TestFieldTest.java
+++ b/plc4j/drivers/simulated/src/test/java/org/apache/plc4x/java/simulated/connection/TestFieldTest.java
@@ -1,61 +1,61 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.simulated.connection;
-
-import nl.jqno.equalsverifier.EqualsVerifier;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-public class TestFieldTest {
-
-    @Test
-    public void constructor() {
-        assertThat(TestField.matches("RANDOM/test:Integer[2]"), equalTo(true));
-        TestField field = TestField.of("RANDOM/test:Integer[2]");
-        assertThat(field.getType(), equalTo(TestType.RANDOM));
-        assertThat(field.getName(), equalTo("test"));
-        assertThat(field.getDataType(), equalTo(Integer.class));
-        assertThat(field.getNumElements(), equalTo(2));
-        assertThat(field.toString(),
-            equalTo("TestField{type=RANDOM, name='test', dataType=class java.lang.Integer, numElements=2}"));
-    }
-
-    @Test
-    public void invalidType() {
-        assertThat(TestField.matches("RANDOM/test:Foo"), equalTo(true));
-        assertThrows(PlcInvalidFieldException.class, () -> TestField.of("RANDOM/test:Foo"));
-    }
-
-    @Test
-    public void invalidAddress() {
-        assertThat(TestField.matches("Foo"), equalTo(false));
-        assertThrows(PlcInvalidFieldException.class, () -> TestField.of("Foo"));
-    }
-
-    @Test
-    public void equalsTest() {
-        EqualsVerifier.forClass(TestField.class).usingGetClass().verify();
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.simulated.connection;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class TestFieldTest {
+
+    @Test
+    public void constructor() {
+        assertThat(TestField.matches("RANDOM/test:Integer[2]"), equalTo(true));
+        TestField field = TestField.of("RANDOM/test:Integer[2]");
+        assertThat(field.getType(), equalTo(TestType.RANDOM));
+        assertThat(field.getName(), equalTo("test"));
+        assertThat(field.getDataType(), equalTo(Integer.class));
+        assertThat(field.getNumElements(), equalTo(2));
+        assertThat(field.toString(),
+            equalTo("TestField{type=RANDOM, name='test', dataType=class java.lang.Integer, numElements=2}"));
+    }
+
+    @Test
+    public void invalidType() {
+        assertThat(TestField.matches("RANDOM/test:Foo"), equalTo(true));
+        assertThrows(PlcInvalidFieldException.class, () -> TestField.of("RANDOM/test:Foo"));
+    }
+
+    @Test
+    public void invalidAddress() {
+        assertThat(TestField.matches("Foo"), equalTo(false));
+        assertThrows(PlcInvalidFieldException.class, () -> TestField.of("Foo"));
+    }
+
+    @Test
+    public void equalsTest() {
+        EqualsVerifier.forClass(TestField.class).usingGetClass().verify();
+    }
+
+}
diff --git a/plc4j/examples/dummy-driver/pom.xml b/plc4j/examples/dummy-driver/pom.xml
index cd3a47f1171..25129818e03 100644
--- a/plc4j/examples/dummy-driver/pom.xml
+++ b/plc4j/examples/dummy-driver/pom.xml
@@ -1,96 +1,96 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.examples</groupId>
-    <artifactId>plc4j-examples</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-dummy-driver</artifactId>
-  <name>PLC4J: Examples: Protocol: Dummy</name>
-  <description>
-    Implementation of a PLC4X driver able to speak a non existent dummy protocol.
-    This module should be used as inspiration for implementing own drivers.
-  </description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base-tcp</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-buffer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-codec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <!-- Disable building the uber-jar -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.1</version>
-        <executions>
-          <execution>
-            <id>generate-uber-jar</id>
-            <phase>none</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- This is currently a work in progress ... skip this till it reaches a slightly more mature state -->
-      <plugin>
-        <groupId>org.sonarsource.scanner.maven</groupId>
-        <artifactId>sonar-maven-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.examples</groupId>
+    <artifactId>plc4j-examples</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-dummy-driver</artifactId>
+  <name>PLC4J: Examples: Protocol: Dummy</name>
+  <description>
+    Implementation of a PLC4X driver able to speak a non existent dummy protocol.
+    This module should be used as inspiration for implementing own drivers.
+  </description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base-tcp</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <!-- Disable building the uber-jar -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.2.1</version>
+        <executions>
+          <execution>
+            <id>generate-uber-jar</id>
+            <phase>none</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- This is currently a work in progress ... skip this till it reaches a slightly more mature state -->
+      <plugin>
+        <groupId>org.sonarsource.scanner.maven</groupId>
+        <artifactId>sonar-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/DummyDriver.java b/plc4j/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/DummyDriver.java
index 76e54f1a5eb..587ef4ab4f9 100644
--- a/plc4j/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/DummyDriver.java
+++ b/plc4j/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/DummyDriver.java
@@ -1,67 +1,67 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.examples.dummydriver;
-
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.examples.dummydriver.connection.DummyConnection;
-import org.apache.plc4x.java.spi.PlcDriver;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class DummyDriver implements PlcDriver {
-
-    private static final Pattern DUMMY_URI_PATTERN = Pattern.compile("^dummy://(?<host>.*)");
-
-    @Override
-    public String getProtocolCode() {
-        return "dummy";
-    }
-
-    @Override
-    public String getProtocolName() {
-        return "Dummy";
-    }
-
-    @Override
-    public PlcConnection connect(String url) throws PlcConnectionException {
-        Matcher matcher = DUMMY_URI_PATTERN.matcher(url);
-        if (!matcher.matches()) {
-            throw new PlcConnectionException(
-                "Connection url doesn't match the format 'dummy://{host|ip}'");
-        }
-        String host = matcher.group("host");
-        try {
-            InetAddress hostAddress = InetAddress.getByName(host);
-            return new DummyConnection(hostAddress);
-        } catch (UnknownHostException e) {
-            throw new PlcConnectionException("Error", e);
-        }
-    }
-
-    @Override
-    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
-        throw new PlcConnectionException("Dummy connections don't support authentication.");
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.examples.dummydriver;
+
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.authentication.PlcAuthentication;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.examples.dummydriver.connection.DummyConnection;
+import org.apache.plc4x.java.spi.PlcDriver;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class DummyDriver implements PlcDriver {
+
+    private static final Pattern DUMMY_URI_PATTERN = Pattern.compile("^dummy://(?<host>.*)");
+
+    @Override
+    public String getProtocolCode() {
+        return "dummy";
+    }
+
+    @Override
+    public String getProtocolName() {
+        return "Dummy";
+    }
+
+    @Override
+    public PlcConnection connect(String url) throws PlcConnectionException {
+        Matcher matcher = DUMMY_URI_PATTERN.matcher(url);
+        if (!matcher.matches()) {
+            throw new PlcConnectionException(
+                "Connection url doesn't match the format 'dummy://{host|ip}'");
+        }
+        String host = matcher.group("host");
+        try {
+            InetAddress hostAddress = InetAddress.getByName(host);
+            return new DummyConnection(hostAddress);
+        } catch (UnknownHostException e) {
+            throw new PlcConnectionException("Error", e);
+        }
+    }
+
+    @Override
+    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
+        throw new PlcConnectionException("Dummy connections don't support authentication.");
+    }
+
+}
diff --git a/plc4j/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/connection/DummyConnection.java b/plc4j/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/connection/DummyConnection.java
index 5925f9c3acf..a94fd87ca84 100644
--- a/plc4j/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/connection/DummyConnection.java
+++ b/plc4j/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/connection/DummyConnection.java
@@ -1,78 +1,78 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.examples.dummydriver.connection;
-
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelInitializer;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.messages.PlcWriteResponse;
-import org.apache.plc4x.java.base.connection.NettyPlcConnection;
-import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
-import org.apache.plc4x.java.base.messages.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.InetAddress;
-import java.util.concurrent.CompletableFuture;
-
-public class DummyConnection extends NettyPlcConnection implements PlcReader, PlcWriter {
-
-    @SuppressWarnings("unused")
-    private static final Logger logger = LoggerFactory.getLogger(DummyConnection.class);
-
-    @SuppressWarnings("unused")
-    private boolean connected;
-
-    public DummyConnection(InetAddress host) {
-        super(new TcpSocketChannelFactory(host, 42));
-    }
-
-    @Override
-    protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
-        return new ChannelInitializer() {
-            @Override
-            protected void initChannel(Channel channel) {
-            }
-        };
-    }
-
-    @Override
-    public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
-        CompletableFuture<InternalPlcReadResponse> readFuture = new CompletableFuture<>();
-        PlcRequestContainer<InternalPlcReadRequest, InternalPlcReadResponse> container =
-            new PlcRequestContainer<>((InternalPlcReadRequest) readRequest, readFuture);
-        channel.writeAndFlush(container);
-        return readFuture
-            .thenApply(PlcReadResponse.class::cast);
-    }
-
-    @Override
-    public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
-        CompletableFuture<InternalPlcWriteResponse> writeFuture = new CompletableFuture<>();
-        PlcRequestContainer<InternalPlcWriteRequest, InternalPlcWriteResponse> container =
-            new PlcRequestContainer<>((InternalPlcWriteRequest) writeRequest, writeFuture);
-        channel.writeAndFlush(container);
-        return writeFuture
-            .thenApply(PlcWriteResponse.class::cast);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.examples.dummydriver.connection;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelInitializer;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteResponse;
+import org.apache.plc4x.java.base.connection.NettyPlcConnection;
+import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
+import org.apache.plc4x.java.base.messages.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.InetAddress;
+import java.util.concurrent.CompletableFuture;
+
+public class DummyConnection extends NettyPlcConnection implements PlcReader, PlcWriter {
+
+    @SuppressWarnings("unused")
+    private static final Logger logger = LoggerFactory.getLogger(DummyConnection.class);
+
+    @SuppressWarnings("unused")
+    private boolean connected;
+
+    public DummyConnection(InetAddress host) {
+        super(new TcpSocketChannelFactory(host, 42));
+    }
+
+    @Override
+    protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
+        return new ChannelInitializer() {
+            @Override
+            protected void initChannel(Channel channel) {
+            }
+        };
+    }
+
+    @Override
+    public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
+        CompletableFuture<InternalPlcReadResponse> readFuture = new CompletableFuture<>();
+        PlcRequestContainer<InternalPlcReadRequest, InternalPlcReadResponse> container =
+            new PlcRequestContainer<>((InternalPlcReadRequest) readRequest, readFuture);
+        channel.writeAndFlush(container);
+        return readFuture
+            .thenApply(PlcReadResponse.class::cast);
+    }
+
+    @Override
+    public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
+        CompletableFuture<InternalPlcWriteResponse> writeFuture = new CompletableFuture<>();
+        PlcRequestContainer<InternalPlcWriteRequest, InternalPlcWriteResponse> container =
+            new PlcRequestContainer<>((InternalPlcWriteRequest) writeRequest, writeFuture);
+        channel.writeAndFlush(container);
+        return writeFuture
+            .thenApply(PlcWriteResponse.class::cast);
+    }
+
+}
diff --git a/plc4j/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/model/DummyField.java b/plc4j/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/model/DummyField.java
index ab45b4f48d5..5be798725e8 100644
--- a/plc4j/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/model/DummyField.java
+++ b/plc4j/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/model/DummyField.java
@@ -1,35 +1,35 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.examples.dummydriver.model;
-
-import org.apache.plc4x.java.api.model.PlcField;
-
-public class DummyField implements PlcField {
-
-    private final int address;
-
-    public DummyField(int address) {
-        this.address = address;
-    }
-
-    public int getAddress() {
-        return address;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.examples.dummydriver.model;
+
+import org.apache.plc4x.java.api.model.PlcField;
+
+public class DummyField implements PlcField {
+
+    private final int address;
+
+    public DummyField(int address) {
+        this.address = address;
+    }
+
+    public int getAddress() {
+        return address;
+    }
+
+}
diff --git a/plc4j/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/netty/DummyProtocol.java b/plc4j/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/netty/DummyProtocol.java
index 96514c79e52..92ad5ec9f10 100644
--- a/plc4j/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/netty/DummyProtocol.java
+++ b/plc4j/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/netty/DummyProtocol.java
@@ -1,75 +1,75 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.examples.dummydriver.netty;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufUtil;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToMessageCodec;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcRequest;
-import org.apache.plc4x.java.base.messages.PlcRequestContainer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-
-public class DummyProtocol extends MessageToMessageCodec<ByteBuf, PlcRequestContainer> {
-
-    private static final Logger logger = LoggerFactory.getLogger(DummyProtocol.class);
-
-    @Override
-    protected void encode(ChannelHandlerContext ctx, PlcRequestContainer in, List<Object> out) {
-        PlcRequest request = in.getRequest();
-        if (request instanceof PlcReadRequest) {
-
-            // Simple ICMP (Ping packet)
-            byte[] rawData = new byte[] {
-                // Type (ICMP Ping Request) & Code (just 0)
-                (byte) 0x08, (byte) 0x00,
-                // Checksum
-                (byte) 0xe3, (byte) 0xe5,
-                // Identifier
-                (byte) 0x00, (byte) 0x01,
-                // Sequence Number
-                (byte) 0x00, (byte) 0x00,
-                // Payload (Just random data that was used to fit to the checksum)
-                (byte) 0x00, (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04, (byte) 0x05, (byte) 0x06, (byte) 0x07, (byte) 0x08, (byte) 0x09};
-
-            ByteBuf buf = Unpooled.buffer();
-            buf.writeBytes(rawData);
-
-            out.add(buf);
-        }
-    }
-
-    @Override
-    protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) {
-        if(logger.isTraceEnabled()) {
-            logger.trace("Got Data: {}", ByteBufUtil.hexDump(in));
-        }
-        // If at least 4 bytes are readable, peek into them (without changing the read position)
-        // and get the packet length. Only if the available amount of readable bytes is larger or
-        // equal to this, continue processing the rest.
-        if(in.readableBytes() >= 4) {
-        }
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.examples.dummydriver.netty;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageCodec;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcRequest;
+import org.apache.plc4x.java.base.messages.PlcRequestContainer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+public class DummyProtocol extends MessageToMessageCodec<ByteBuf, PlcRequestContainer> {
+
+    private static final Logger logger = LoggerFactory.getLogger(DummyProtocol.class);
+
+    @Override
+    protected void encode(ChannelHandlerContext ctx, PlcRequestContainer in, List<Object> out) {
+        PlcRequest request = in.getRequest();
+        if (request instanceof PlcReadRequest) {
+
+            // Simple ICMP (Ping packet)
+            byte[] rawData = new byte[] {
+                // Type (ICMP Ping Request) & Code (just 0)
+                (byte) 0x08, (byte) 0x00,
+                // Checksum
+                (byte) 0xe3, (byte) 0xe5,
+                // Identifier
+                (byte) 0x00, (byte) 0x01,
+                // Sequence Number
+                (byte) 0x00, (byte) 0x00,
+                // Payload (Just random data that was used to fit to the checksum)
+                (byte) 0x00, (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04, (byte) 0x05, (byte) 0x06, (byte) 0x07, (byte) 0x08, (byte) 0x09};
+
+            ByteBuf buf = Unpooled.buffer();
+            buf.writeBytes(rawData);
+
+            out.add(buf);
+        }
+    }
+
+    @Override
+    protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) {
+        if(logger.isTraceEnabled()) {
+            logger.trace("Got Data: {}", ByteBufUtil.hexDump(in));
+        }
+        // If at least 4 bytes are readable, peek into them (without changing the read position)
+        // and get the packet length. Only if the available amount of readable bytes is larger or
+        // equal to this, continue processing the rest.
+        if(in.readableBytes() >= 4) {
+        }
+    }
+
+}
diff --git a/plc4j/examples/dummy-driver/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver b/plc4j/examples/dummy-driver/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
index b8ccc4d8122..a9497683664 100644
--- a/plc4j/examples/dummy-driver/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
+++ b/plc4j/examples/dummy-driver/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
@@ -1,19 +1,19 @@
-#
-# 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
-#
-#   http://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.
-#
-org.apache.plc4x.java.examples.dummydriver.DummyDriver
+#
+# 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
+#
+#   http://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.
+#
+org.apache.plc4x.java.examples.dummydriver.DummyDriver
diff --git a/plc4j/examples/hello-cloud-azure/pom.xml b/plc4j/examples/hello-cloud-azure/pom.xml
index 22a2b6c7b9d..9bb5611b552 100644
--- a/plc4j/examples/hello-cloud-azure/pom.xml
+++ b/plc4j/examples/hello-cloud-azure/pom.xml
@@ -1,145 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.examples</groupId>
-    <artifactId>plc4j-examples</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-hello-cloud-azure</artifactId>
-  <name>PLC4J: Examples: Cloud: Azure IoT Hub</name>
-  <description>
-    Implementation of a PLC4X application gathering information from
-    a PLC and making that available in an Azure IoT Hub.
-  </description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.microsoft.azure.sdk.iot</groupId>
-      <artifactId>iot-device-client</artifactId>
-      <version>1.16.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-      <version>1.4</version>
-    </dependency>
-
-    <!-- Required driver implementation -->
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ads</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ethernet-ip</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-modbus</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-opcua</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-s7</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-simulated</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-
-  <!-- Managed dependencies to eliminate transitively importing libraries with CVEs -->
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-core</artifactId>
-        <version>2.10.0</version>
-      </dependency>
-      <dependency>
-        <groupId>com.github.jnr</groupId>
-        <artifactId>jnr-ffi</artifactId>
-        <version>2.1.8</version>
-      </dependency>
-      <dependency>
-        <groupId>com.github.jnr</groupId>
-        <artifactId>jffi</artifactId>
-        <version>1.2.17</version>
-      </dependency>
-      <dependency>
-        <groupId>com.github.jnr</groupId>
-        <artifactId>jffi</artifactId>
-        <version>1.2.17</version>
-        <classifier>native</classifier>
-      </dependency>
-      <dependency>
-        <groupId>org.bouncycastle</groupId>
-        <artifactId>bcmail-jdk15on</artifactId>
-        <version>1.60</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <usedDependencies>
-            <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
-          </usedDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.examples</groupId>
+    <artifactId>plc4j-examples</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-hello-cloud-azure</artifactId>
+  <name>PLC4J: Examples: Cloud: Azure IoT Hub</name>
+  <description>
+    Implementation of a PLC4X application gathering information from
+    a PLC and making that available in an Azure IoT Hub.
+  </description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.microsoft.azure.sdk.iot</groupId>
+      <artifactId>iot-device-client</artifactId>
+      <version>1.16.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <version>1.4</version>
+    </dependency>
+
+    <!-- Required driver implementation -->
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ads</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ethernet-ip</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-modbus</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-opcua</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-s7</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-simulated</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+
+  <!-- Managed dependencies to eliminate transitively importing libraries with CVEs -->
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-core</artifactId>
+        <version>2.10.0</version>
+      </dependency>
+      <dependency>
+        <groupId>com.github.jnr</groupId>
+        <artifactId>jnr-ffi</artifactId>
+        <version>2.1.8</version>
+      </dependency>
+      <dependency>
+        <groupId>com.github.jnr</groupId>
+        <artifactId>jffi</artifactId>
+        <version>1.2.17</version>
+      </dependency>
+      <dependency>
+        <groupId>com.github.jnr</groupId>
+        <artifactId>jffi</artifactId>
+        <version>1.2.17</version>
+        <classifier>native</classifier>
+      </dependency>
+      <dependency>
+        <groupId>org.bouncycastle</groupId>
+        <artifactId>bcmail-jdk15on</artifactId>
+        <version>1.60</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <usedDependencies>
+            <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
+          </usedDependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/examples/hello-cloud-azure/src/main/java/org/apache/plc4x/java/examples/cloud/azure/CliOptions.java b/plc4j/examples/hello-cloud-azure/src/main/java/org/apache/plc4x/java/examples/cloud/azure/CliOptions.java
index c8f77393d91..9068049e39f 100644
--- a/plc4j/examples/hello-cloud-azure/src/main/java/org/apache/plc4x/java/examples/cloud/azure/CliOptions.java
+++ b/plc4j/examples/hello-cloud-azure/src/main/java/org/apache/plc4x/java/examples/cloud/azure/CliOptions.java
@@ -1,99 +1,99 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.examples.cloud.azure;
-
-import org.apache.commons.cli.*;
-
-public class CliOptions {
-
-    private static Options options;
-
-    private final String plc4xConnectionString;
-    private final String plc4xFieldAddress;
-    private final String iotHubConnectionString;
-
-    public static CliOptions fromArgs(String[] args) {
-        options = new Options();
-        // Required arguments
-        options.addOption(
-            Option.builder()
-                .type(String.class)
-                .longOpt("plc4x-connection-string")
-                .hasArg()
-                .desc("Connection String")
-                .required()
-                .build());
-        options.addOption(
-            Option.builder()
-                .type(String.class)
-                .longOpt("plc4x-field-address")
-                .hasArg()
-                .desc("Field Address.")
-                .required()
-                .build());
-        options.addOption(
-            Option.builder()
-                .type(String.class)
-                .longOpt("iot-hub-connection-string")
-                .hasArg()
-                .desc("IoT Hub Connection String.")
-                .required()
-                .build());
-
-        CommandLineParser parser = new DefaultParser();
-        CommandLine commandLine;
-        try {
-            commandLine = parser.parse(options, args);
-
-            String plc4xConnectionString = commandLine.getOptionValue("plc4x-connection-string");
-            String plc4xFieldAddress = commandLine.getOptionValue("plc4x-field-address");
-            String iotHubConnectionString = commandLine.getOptionValue("iot-hub-connection-string");
-
-            return new CliOptions(plc4xConnectionString, plc4xFieldAddress, iotHubConnectionString);
-        } catch (ParseException e) {
-            System.err.println(e.getMessage());
-            return null;
-        }
-    }
-
-    public static void printHelp() {
-        HelpFormatter formatter = new HelpFormatter();
-        formatter.printHelp("S7PlcToAzureIoTHubSample", options);
-    }
-
-    public CliOptions(String plc4xConnectionString, String plc4xFieldAddress, String iotHubConnectionString) {
-        this.plc4xConnectionString = plc4xConnectionString;
-        this.plc4xFieldAddress = plc4xFieldAddress;
-        this.iotHubConnectionString = iotHubConnectionString;
-    }
-
-    public String getPlc4xConnectionString() {
-        return plc4xConnectionString;
-    }
-
-    public String getPlc4xFieldAddress() {
-        return plc4xFieldAddress;
-    }
-
-    protected String getIotHubConnectionString() {
-        return iotHubConnectionString;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.examples.cloud.azure;
+
+import org.apache.commons.cli.*;
+
+public class CliOptions {
+
+    private static Options options;
+
+    private final String plc4xConnectionString;
+    private final String plc4xFieldAddress;
+    private final String iotHubConnectionString;
+
+    public static CliOptions fromArgs(String[] args) {
+        options = new Options();
+        // Required arguments
+        options.addOption(
+            Option.builder()
+                .type(String.class)
+                .longOpt("plc4x-connection-string")
+                .hasArg()
+                .desc("Connection String")
+                .required()
+                .build());
+        options.addOption(
+            Option.builder()
+                .type(String.class)
+                .longOpt("plc4x-field-address")
+                .hasArg()
+                .desc("Field Address.")
+                .required()
+                .build());
+        options.addOption(
+            Option.builder()
+                .type(String.class)
+                .longOpt("iot-hub-connection-string")
+                .hasArg()
+                .desc("IoT Hub Connection String.")
+                .required()
+                .build());
+
+        CommandLineParser parser = new DefaultParser();
+        CommandLine commandLine;
+        try {
+            commandLine = parser.parse(options, args);
+
+            String plc4xConnectionString = commandLine.getOptionValue("plc4x-connection-string");
+            String plc4xFieldAddress = commandLine.getOptionValue("plc4x-field-address");
+            String iotHubConnectionString = commandLine.getOptionValue("iot-hub-connection-string");
+
+            return new CliOptions(plc4xConnectionString, plc4xFieldAddress, iotHubConnectionString);
+        } catch (ParseException e) {
+            System.err.println(e.getMessage());
+            return null;
+        }
+    }
+
+    public static void printHelp() {
+        HelpFormatter formatter = new HelpFormatter();
+        formatter.printHelp("S7PlcToAzureIoTHubSample", options);
+    }
+
+    public CliOptions(String plc4xConnectionString, String plc4xFieldAddress, String iotHubConnectionString) {
+        this.plc4xConnectionString = plc4xConnectionString;
+        this.plc4xFieldAddress = plc4xFieldAddress;
+        this.iotHubConnectionString = iotHubConnectionString;
+    }
+
+    public String getPlc4xConnectionString() {
+        return plc4xConnectionString;
+    }
+
+    public String getPlc4xFieldAddress() {
+        return plc4xFieldAddress;
+    }
+
+    protected String getIotHubConnectionString() {
+        return iotHubConnectionString;
+    }
+
+}
diff --git a/plc4j/examples/hello-cloud-azure/src/main/java/org/apache/plc4x/java/examples/cloud/azure/S7PlcToAzureIoTHubSample.java b/plc4j/examples/hello-cloud-azure/src/main/java/org/apache/plc4x/java/examples/cloud/azure/S7PlcToAzureIoTHubSample.java
index 6eb625adb71..36fa8b9fdbe 100644
--- a/plc4j/examples/hello-cloud-azure/src/main/java/org/apache/plc4x/java/examples/cloud/azure/S7PlcToAzureIoTHubSample.java
+++ b/plc4j/examples/hello-cloud-azure/src/main/java/org/apache/plc4x/java/examples/cloud/azure/S7PlcToAzureIoTHubSample.java
@@ -1,86 +1,86 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.examples.cloud.azure;
-
-import com.microsoft.azure.sdk.iot.device.DeviceClient;
-import com.microsoft.azure.sdk.iot.device.IotHubClientProtocol;
-import com.microsoft.azure.sdk.iot.device.Message;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.TimeUnit;
-
-public class S7PlcToAzureIoTHubSample {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(S7PlcToAzureIoTHubSample.class);
-
-    private static final String FIELD_NAME = "value";
-
-    /**
-     * Example code do demonstrate sending events from an S7 device to Microsoft Azure IoT Hub
-     *
-     * @param args Expected: [plc4x connection string, plc4x field address, IoT-Hub connection string].
-     */
-    public static void main(String[] args) throws Exception {
-        CliOptions options = CliOptions.fromArgs(args);
-        if (options == null) {
-            CliOptions.printHelp();
-            // Could not parse.
-            System.exit(1);
-        }
-
-        LOGGER.info("Connecting {}, {}, {}", options.getPlc4xConnectionString(), options.getPlc4xFieldAddress(),
-            options.getIotHubConnectionString());
-
-        // Open both a connection to the remote PLC as well as a connection to the cloud service.
-        try (PlcConnection plcConnection = new PlcDriverManager().getConnection(options.getPlc4xConnectionString());
-             DeviceClient client = new DeviceClient(options.getIotHubConnectionString(), IotHubClientProtocol.MQTT)) {
-            LOGGER.info("Connected");
-
-            client.open();
-
-            // Prepare a read request.
-            PlcReadRequest request = plcConnection.readRequestBuilder()
-                .addItem(FIELD_NAME, options.getPlc4xFieldAddress()).build();
-
-            while (!Thread.currentThread().isInterrupted()) {
-                // Simulate telemetry.
-                PlcReadResponse response = request.execute().get();
-                response.getAllLongs(FIELD_NAME)
-                    .forEach(longValue -> {
-                            String result = Long.toBinaryString(longValue);
-                            LOGGER.info("Outputs {}", result);
-                            Message msg = new Message("{ \"bits\" : \"" + result + "\"}");
-
-                            // Send the message.
-                            client.sendEventAsync(msg, (responseStatus, callbackContext) -> LOGGER.info("Received status: ", responseStatus), new Object());
-                        }
-                    );
-
-                // Wait a second.
-                TimeUnit.SECONDS.sleep(1);
-            }
-        }
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.examples.cloud.azure;
+
+import com.microsoft.azure.sdk.iot.device.DeviceClient;
+import com.microsoft.azure.sdk.iot.device.IotHubClientProtocol;
+import com.microsoft.azure.sdk.iot.device.Message;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.TimeUnit;
+
+public class S7PlcToAzureIoTHubSample {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(S7PlcToAzureIoTHubSample.class);
+
+    private static final String FIELD_NAME = "value";
+
+    /**
+     * Example code do demonstrate sending events from an S7 device to Microsoft Azure IoT Hub
+     *
+     * @param args Expected: [plc4x connection string, plc4x field address, IoT-Hub connection string].
+     */
+    public static void main(String[] args) throws Exception {
+        CliOptions options = CliOptions.fromArgs(args);
+        if (options == null) {
+            CliOptions.printHelp();
+            // Could not parse.
+            System.exit(1);
+        }
+
+        LOGGER.info("Connecting {}, {}, {}", options.getPlc4xConnectionString(), options.getPlc4xFieldAddress(),
+            options.getIotHubConnectionString());
+
+        // Open both a connection to the remote PLC as well as a connection to the cloud service.
+        try (PlcConnection plcConnection = new PlcDriverManager().getConnection(options.getPlc4xConnectionString());
+             DeviceClient client = new DeviceClient(options.getIotHubConnectionString(), IotHubClientProtocol.MQTT)) {
+            LOGGER.info("Connected");
+
+            client.open();
+
+            // Prepare a read request.
+            PlcReadRequest request = plcConnection.readRequestBuilder()
+                .addItem(FIELD_NAME, options.getPlc4xFieldAddress()).build();
+
+            while (!Thread.currentThread().isInterrupted()) {
+                // Simulate telemetry.
+                PlcReadResponse response = request.execute().get();
+                response.getAllLongs(FIELD_NAME)
+                    .forEach(longValue -> {
+                            String result = Long.toBinaryString(longValue);
+                            LOGGER.info("Outputs {}", result);
+                            Message msg = new Message("{ \"bits\" : \"" + result + "\"}");
+
+                            // Send the message.
+                            client.sendEventAsync(msg, (responseStatus, callbackContext) -> LOGGER.info("Received status: ", responseStatus), new Object());
+                        }
+                    );
+
+                // Wait a second.
+                TimeUnit.SECONDS.sleep(1);
+            }
+        }
+    }
+
+}
diff --git a/plc4j/examples/hello-cloud-google/README.md b/plc4j/examples/hello-cloud-google/README.md
index 4f948fc966c..172bf0095da 100644
--- a/plc4j/examples/hello-cloud-google/README.md
+++ b/plc4j/examples/hello-cloud-google/README.md
@@ -1,61 +1,61 @@
-<!--
-
-  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
-
-      http://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.
-
--->
-# Plc to Google IoT Core Adapter
-
-This Adapter opens a MQTT Bridge to Google Cloud IoT Core.
-
-To run this code, you need an account to the google cloud and a project.
-You need to create a device registry and add a device to it, as described here:
-https://cloud.google.com/iot/docs/how-tos/devices
-
-Then, you can run the PlcToGoogleIoTCoreSample to connect tho google and send some values into the cloud.
-Some sample arguments:
-
-    -project-id=myprojectname
-    -registry-id=plc4x-test
-    -cloud-region=europe-west1
-    -device-id=plc4x-test-device
-    -private-key-file=../../../rsa_private_pkcs8
-    -algorithm=RS256
-
-Some documentation can be found here:
-https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/iot/api-client/manager#cloud-iot-core-java-mqtt-example
-This code was adapted from:
-https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/iot/api-client/manager#cloud-iot-core-java-mqtt-example
-
-To retrieve the messages, you can subscribe to Cloud Pub/Sub.
-For example, you could install the google cloud sdk (gcloud) and run:
-
-    gcloud auth login
-    gcloud config set myprojectname
-    gcloud iot devices configs list --project=myprojectname \\
-        --region=europe-west1 \\
-        --registry=myplc4x-test-registry \\
-        --device=myplc4x-test-device \\
-        --limit=5
-    gcloud pubsub subscriptions create --topic plc4x-test-events plc4x-test-subscription
-    gcloud pubsub subscriptions pull --auto-ack plc4x-test-subscription
-
-
-To pull more than one message, use the option --limit [number]
-
-For further reference to the Cloud Pub/Sub, see:
-https://cloud.google.com/pubsub/docs/quickstart-cli
-https://cloud.google.com/sdk/gcloud/reference/alpha/pubsub/subscriptions/pull
-
+<!--
+
+  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
+
+      http://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.
+
+-->
+# Plc to Google IoT Core Adapter
+
+This Adapter opens a MQTT Bridge to Google Cloud IoT Core.
+
+To run this code, you need an account to the google cloud and a project.
+You need to create a device registry and add a device to it, as described here:
+https://cloud.google.com/iot/docs/how-tos/devices
+
+Then, you can run the PlcToGoogleIoTCoreSample to connect tho google and send some values into the cloud.
+Some sample arguments:
+
+    -project-id=myprojectname
+    -registry-id=plc4x-test
+    -cloud-region=europe-west1
+    -device-id=plc4x-test-device
+    -private-key-file=../../../rsa_private_pkcs8
+    -algorithm=RS256
+
+Some documentation can be found here:
+https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/iot/api-client/manager#cloud-iot-core-java-mqtt-example
+This code was adapted from:
+https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/iot/api-client/manager#cloud-iot-core-java-mqtt-example
+
+To retrieve the messages, you can subscribe to Cloud Pub/Sub.
+For example, you could install the google cloud sdk (gcloud) and run:
+
+    gcloud auth login
+    gcloud config set myprojectname
+    gcloud iot devices configs list --project=myprojectname \\
+        --region=europe-west1 \\
+        --registry=myplc4x-test-registry \\
+        --device=myplc4x-test-device \\
+        --limit=5
+    gcloud pubsub subscriptions create --topic plc4x-test-events plc4x-test-subscription
+    gcloud pubsub subscriptions pull --auto-ack plc4x-test-subscription
+
+
+To pull more than one message, use the option --limit [number]
+
+For further reference to the Cloud Pub/Sub, see:
+https://cloud.google.com/pubsub/docs/quickstart-cli
+https://cloud.google.com/sdk/gcloud/reference/alpha/pubsub/subscriptions/pull
+
diff --git a/plc4j/examples/hello-cloud-google/pom.xml b/plc4j/examples/hello-cloud-google/pom.xml
index 7de1c05d230..92866241865 100644
--- a/plc4j/examples/hello-cloud-google/pom.xml
+++ b/plc4j/examples/hello-cloud-google/pom.xml
@@ -1,150 +1,150 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.examples</groupId>
-    <artifactId>plc4j-examples</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-hello-cloud-google</artifactId>
-  <name>PLC4J: Examples: Cloud: Google Cloud IoT Core</name>
-  <description>
-    Implementation of a PLC4X application gathering information from
-    a PLC and making that available in an the Google Cloud IoT Core.
-  </description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.eclipse.paho</groupId>
-      <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
-      <version>1.2.1</version>
-    </dependency>
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.jsonwebtoken</groupId>
-      <artifactId>jjwt</artifactId>
-      <version>0.9.1</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-      <version>1.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>log4j-over-slf4j</artifactId>
-      <version>1.7.25</version>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-    </dependency>
-
-    <!-- Required driver implementation -->
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ads</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ethernet-ip</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-modbus</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-opcua</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-s7</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-simulated</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <usedDependencies combine.children="append">
-            <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
-            <usedDependency>org.slf4j:log4j-over-slf4j</usedDependency>
-          </usedDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.qpid</groupId>
-        <artifactId>proton-j</artifactId>
-        <version>0.18.0</version>
-      </dependency>
-      <dependency>
-        <groupId>com.squareup.okhttp</groupId>
-        <artifactId>okhttp</artifactId>
-        <version>2.7.4</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>httpclient</artifactId>
-        <version>4.5.6</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.examples</groupId>
+    <artifactId>plc4j-examples</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-hello-cloud-google</artifactId>
+  <name>PLC4J: Examples: Cloud: Google Cloud IoT Core</name>
+  <description>
+    Implementation of a PLC4X application gathering information from
+    a PLC and making that available in an the Google Cloud IoT Core.
+  </description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.eclipse.paho</groupId>
+      <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
+      <version>1.2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.jsonwebtoken</groupId>
+      <artifactId>jjwt</artifactId>
+      <version>0.9.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <version>1.4</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.25</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+    </dependency>
+
+    <!-- Required driver implementation -->
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ads</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ethernet-ip</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-modbus</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-opcua</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-s7</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-simulated</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <usedDependencies combine.children="append">
+            <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
+            <usedDependency>org.slf4j:log4j-over-slf4j</usedDependency>
+          </usedDependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.qpid</groupId>
+        <artifactId>proton-j</artifactId>
+        <version>0.18.0</version>
+      </dependency>
+      <dependency>
+        <groupId>com.squareup.okhttp</groupId>
+        <artifactId>okhttp</artifactId>
+        <version>2.7.4</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient</artifactId>
+        <version>4.5.6</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 </project>
\ No newline at end of file
diff --git a/plc4j/examples/hello-cloud-google/src/main/java/org/apache/plc4x/java/examples/cloud/google/CliOptions.java b/plc4j/examples/hello-cloud-google/src/main/java/org/apache/plc4x/java/examples/cloud/google/CliOptions.java
index 82c1b6e0f6b..9d79eb30e16 100644
--- a/plc4j/examples/hello-cloud-google/src/main/java/org/apache/plc4x/java/examples/cloud/google/CliOptions.java
+++ b/plc4j/examples/hello-cloud-google/src/main/java/org/apache/plc4x/java/examples/cloud/google/CliOptions.java
@@ -1,222 +1,222 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.examples.cloud.google;
-
-import org.apache.commons.cli.*;
-
-/** Command line options for the MQTT example. */
-public class CliOptions {
-
-    private static Options options;
-
-    private final String projectId;
-    private final String registryId;
-    private final String deviceId;
-    private final String privateKeyFile;
-    private final String algorithm;
-    private final String cloudRegion;
-    private final int tokenExpMins;
-    private final String mqttBridgeHostname;
-    private final short mqttBridgePort;
-    private final String messageType;
-
-    public static CliOptions fromArgs(String[] args) {
-        options = new Options();
-        // Required arguments
-        options.addOption(
-            Option.builder()
-                .type(String.class)
-                .longOpt("project-id")
-                .hasArg()
-                .desc("GCP cloud project name.")
-                .required()
-                .build());
-        options.addOption(
-            Option.builder()
-                .type(String.class)
-                .longOpt("registry-id")
-                .hasArg()
-                .desc("Cloud IoT Core registry id.")
-                .required()
-                .build());
-        options.addOption(
-            Option.builder()
-                .type(String.class)
-                .longOpt("device-id")
-                .hasArg()
-                .desc("Cloud IoT Core device id.")
-                .required()
-                .build());
-        options.addOption(
-            Option.builder()
-                .type(String.class)
-                .longOpt("private-key-file")
-                .hasArg()
-                .desc("Path to private key file.")
-                .required()
-                .build());
-        options.addOption(
-            Option.builder()
-                .type(String.class)
-                .longOpt("algorithm")
-                .hasArg()
-                .desc("Encryption algorithm to use to generate the JWT. Either 'RS256' or 'ES256'.")
-                .required()
-                .build());
-
-        // Optional arguments.
-        options.addOption(
-            Option.builder()
-                .type(String.class)
-                .longOpt("cloud-region")
-                .hasArg()
-                .desc("GCP cloud region.")
-                .build());
-        options.addOption(
-            Option.builder()
-                .type(String.class)
-                .longOpt("mqtt-bridge-hostname")
-                .hasArg()
-                .desc("MQTT bridge hostname.")
-                .build());
-        options.addOption(
-            Option.builder()
-                .type(Number.class)
-                .longOpt("token-exp-minutes")
-                .hasArg()
-                .desc("Minutes to JWT token refresh (token expiration time).")
-                .build());
-        options.addOption(
-            Option.builder()
-                .type(Number.class)
-                .longOpt("mqtt-bridge-port")
-                .hasArg()
-                .desc("MQTT bridge port.")
-                .build());
-        options.addOption(
-            Option.builder()
-                .type(String.class)
-                .longOpt("message-type")
-                .hasArg()
-                .desc("Indicates whether the message is a telemetry event or a device state message")
-                .build());
-
-        CommandLineParser parser = new DefaultParser();
-        CommandLine commandLine;
-        try {
-            commandLine = parser.parse(options, args);
-
-            String projectId = commandLine.getOptionValue("project-id");
-            String registryId = commandLine.getOptionValue("registry-id");
-            String deviceId = commandLine.getOptionValue("device-id");
-            String privateKeyFile = commandLine.getOptionValue("private-key-file");
-            String algorithm = commandLine.getOptionValue("algorithm");
-            String cloudRegion = "europe-west1";
-            if (commandLine.hasOption("cloud-region")) {
-                cloudRegion = commandLine.getOptionValue("cloud-region");
-            }
-            int tokenExpMins = 20;
-            if (commandLine.hasOption("token-exp-minutes")) {
-                tokenExpMins =
-                    ((Number) commandLine.getParsedOptionValue("token-exp-minutes")).intValue();
-            }
-            String mqttBridgeHostname = "mqtt.googleapis.com";
-            if (commandLine.hasOption("mqtt-bridge-hostname")) {
-                mqttBridgeHostname = commandLine.getOptionValue("mqtt-bridge-hostname");
-            }
-            short mqttBridgePort = 8883;
-            if (commandLine.hasOption("mqtt-bridge-port")) {
-                mqttBridgePort =
-                    ((Number) commandLine.getParsedOptionValue("mqtt-bridge-port")).shortValue();
-            }
-            String messageType = "event";
-            if (commandLine.hasOption("message-type")) {
-                messageType = commandLine.getOptionValue("message-type");
-            }
-
-            return new CliOptions(projectId, registryId, deviceId, privateKeyFile, algorithm, cloudRegion, tokenExpMins,
-                mqttBridgeHostname, mqttBridgePort, messageType);
-        } catch (ParseException e) {
-            System.err.println(e.getMessage());
-            return null;
-        }
-    }
-
-    public static void printHelp() {
-        HelpFormatter formatter = new HelpFormatter();
-        formatter.printHelp("S7PlcToGoogleIoTCoreSample", options);
-    }
-
-    public CliOptions(String projectId, String registryId, String deviceId, String privateKeyFile, String algorithm,
-                      String cloudRegion, int tokenExpMins, String mqttBridgeHostname, short mqttBridgePort,
-                      String messageType) {
-        this.projectId = projectId;
-        this.registryId = registryId;
-        this.deviceId = deviceId;
-        this.privateKeyFile = privateKeyFile;
-        this.algorithm = algorithm;
-        this.cloudRegion = cloudRegion;
-        this.tokenExpMins = tokenExpMins;
-        this.mqttBridgeHostname = mqttBridgeHostname;
-        this.mqttBridgePort = mqttBridgePort;
-        this.messageType = messageType;
-    }
-
-    public String getProjectId() {
-        return projectId;
-    }
-
-    public String getRegistryId() {
-        return registryId;
-    }
-
-    public String getDeviceId() {
-        return deviceId;
-    }
-
-    public String getPrivateKeyFile() {
-        return privateKeyFile;
-    }
-
-    public String getAlgorithm() {
-        return algorithm;
-    }
-
-    public String getCloudRegion() {
-        return cloudRegion;
-    }
-
-    public int getTokenExpMins() {
-        return tokenExpMins;
-    }
-
-    public String getMqttBridgeHostname() {
-        return mqttBridgeHostname;
-    }
-
-    public short getMqttBridgePort() {
-        return mqttBridgePort;
-    }
-
-    public String getMessageType() {
-        return messageType;
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.examples.cloud.google;
+
+import org.apache.commons.cli.*;
+
+/** Command line options for the MQTT example. */
+public class CliOptions {
+
+    private static Options options;
+
+    private final String projectId;
+    private final String registryId;
+    private final String deviceId;
+    private final String privateKeyFile;
+    private final String algorithm;
+    private final String cloudRegion;
+    private final int tokenExpMins;
+    private final String mqttBridgeHostname;
+    private final short mqttBridgePort;
+    private final String messageType;
+
+    public static CliOptions fromArgs(String[] args) {
+        options = new Options();
+        // Required arguments
+        options.addOption(
+            Option.builder()
+                .type(String.class)
+                .longOpt("project-id")
+                .hasArg()
+                .desc("GCP cloud project name.")
+                .required()
+                .build());
+        options.addOption(
+            Option.builder()
+                .type(String.class)
+                .longOpt("registry-id")
+                .hasArg()
+                .desc("Cloud IoT Core registry id.")
+                .required()
+                .build());
+        options.addOption(
+            Option.builder()
+                .type(String.class)
+                .longOpt("device-id")
+                .hasArg()
+                .desc("Cloud IoT Core device id.")
+                .required()
+                .build());
+        options.addOption(
+            Option.builder()
+                .type(String.class)
+                .longOpt("private-key-file")
+                .hasArg()
+                .desc("Path to private key file.")
+                .required()
+                .build());
+        options.addOption(
+            Option.builder()
+                .type(String.class)
+                .longOpt("algorithm")
+                .hasArg()
+                .desc("Encryption algorithm to use to generate the JWT. Either 'RS256' or 'ES256'.")
+                .required()
+                .build());
+
+        // Optional arguments.
+        options.addOption(
+            Option.builder()
+                .type(String.class)
+                .longOpt("cloud-region")
+                .hasArg()
+                .desc("GCP cloud region.")
+                .build());
+        options.addOption(
+            Option.builder()
+                .type(String.class)
+                .longOpt("mqtt-bridge-hostname")
+                .hasArg()
+                .desc("MQTT bridge hostname.")
+                .build());
+        options.addOption(
+            Option.builder()
+                .type(Number.class)
+                .longOpt("token-exp-minutes")
+                .hasArg()
+                .desc("Minutes to JWT token refresh (token expiration time).")
+                .build());
+        options.addOption(
+            Option.builder()
+                .type(Number.class)
+                .longOpt("mqtt-bridge-port")
+                .hasArg()
+                .desc("MQTT bridge port.")
+                .build());
+        options.addOption(
+            Option.builder()
+                .type(String.class)
+                .longOpt("message-type")
+                .hasArg()
+                .desc("Indicates whether the message is a telemetry event or a device state message")
+                .build());
+
+        CommandLineParser parser = new DefaultParser();
+        CommandLine commandLine;
+        try {
+            commandLine = parser.parse(options, args);
+
+            String projectId = commandLine.getOptionValue("project-id");
+            String registryId = commandLine.getOptionValue("registry-id");
+            String deviceId = commandLine.getOptionValue("device-id");
+            String privateKeyFile = commandLine.getOptionValue("private-key-file");
+            String algorithm = commandLine.getOptionValue("algorithm");
+            String cloudRegion = "europe-west1";
+            if (commandLine.hasOption("cloud-region")) {
+                cloudRegion = commandLine.getOptionValue("cloud-region");
+            }
+            int tokenExpMins = 20;
+            if (commandLine.hasOption("token-exp-minutes")) {
+                tokenExpMins =
+                    ((Number) commandLine.getParsedOptionValue("token-exp-minutes")).intValue();
+            }
+            String mqttBridgeHostname = "mqtt.googleapis.com";
+            if (commandLine.hasOption("mqtt-bridge-hostname")) {
+                mqttBridgeHostname = commandLine.getOptionValue("mqtt-bridge-hostname");
+            }
+            short mqttBridgePort = 8883;
+            if (commandLine.hasOption("mqtt-bridge-port")) {
+                mqttBridgePort =
+                    ((Number) commandLine.getParsedOptionValue("mqtt-bridge-port")).shortValue();
+            }
+            String messageType = "event";
+            if (commandLine.hasOption("message-type")) {
+                messageType = commandLine.getOptionValue("message-type");
+            }
+
+            return new CliOptions(projectId, registryId, deviceId, privateKeyFile, algorithm, cloudRegion, tokenExpMins,
+                mqttBridgeHostname, mqttBridgePort, messageType);
+        } catch (ParseException e) {
+            System.err.println(e.getMessage());
+            return null;
+        }
+    }
+
+    public static void printHelp() {
+        HelpFormatter formatter = new HelpFormatter();
+        formatter.printHelp("S7PlcToGoogleIoTCoreSample", options);
+    }
+
+    public CliOptions(String projectId, String registryId, String deviceId, String privateKeyFile, String algorithm,
+                      String cloudRegion, int tokenExpMins, String mqttBridgeHostname, short mqttBridgePort,
+                      String messageType) {
+        this.projectId = projectId;
+        this.registryId = registryId;
+        this.deviceId = deviceId;
+        this.privateKeyFile = privateKeyFile;
+        this.algorithm = algorithm;
+        this.cloudRegion = cloudRegion;
+        this.tokenExpMins = tokenExpMins;
+        this.mqttBridgeHostname = mqttBridgeHostname;
+        this.mqttBridgePort = mqttBridgePort;
+        this.messageType = messageType;
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public String getRegistryId() {
+        return registryId;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public String getPrivateKeyFile() {
+        return privateKeyFile;
+    }
+
+    public String getAlgorithm() {
+        return algorithm;
+    }
+
+    public String getCloudRegion() {
+        return cloudRegion;
+    }
+
+    public int getTokenExpMins() {
+        return tokenExpMins;
+    }
+
+    public String getMqttBridgeHostname() {
+        return mqttBridgeHostname;
+    }
+
+    public short getMqttBridgePort() {
+        return mqttBridgePort;
+    }
+
+    public String getMessageType() {
+        return messageType;
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/examples/hello-cloud-google/src/main/java/org/apache/plc4x/java/examples/cloud/google/S7PlcToGoogleIoTCoreSample.java b/plc4j/examples/hello-cloud-google/src/main/java/org/apache/plc4x/java/examples/cloud/google/S7PlcToGoogleIoTCoreSample.java
index 61484e67498..d9ec28870fc 100644
--- a/plc4j/examples/hello-cloud-google/src/main/java/org/apache/plc4x/java/examples/cloud/google/S7PlcToGoogleIoTCoreSample.java
+++ b/plc4j/examples/hello-cloud-google/src/main/java/org/apache/plc4x/java/examples/cloud/google/S7PlcToGoogleIoTCoreSample.java
@@ -1,286 +1,286 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.examples.cloud.google;
-
-import io.jsonwebtoken.JwtBuilder;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.eclipse.paho.client.mqttv3.*;
-import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
-import org.joda.time.DateTime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.security.KeyFactory;
-import java.security.NoSuchAlgorithmException;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.PKCS8EncodedKeySpec;
-
-// [START iot_mqtt_includes]
-// [END iot_mqtt_includes]
-
-public class S7PlcToGoogleIoTCoreSample {
-
-    private static final Logger logger = LoggerFactory.getLogger(S7PlcToGoogleIoTCoreSample.class);
-
-    // [START iot_mqtt_jwt]
-
-    /**
-     * Create a Cloud IoT Core JWT for the given project id, signed with the given RSA key.
-     */
-    private static String createJwtRsa(String projectId, String privateKeyFile)
-        throws IOException, NoSuchAlgorithmException, InvalidKeySpecException {
-        DateTime now = new DateTime();
-        // Create a JWT to authenticate this device. The device will be disconnected after the token
-        // expires, and will have to reconnect with a new token. The audience field should always be set
-        // to the GCP project id.
-        JwtBuilder jwtBuilder =
-            Jwts.builder()
-                .setIssuedAt(now.toDate())
-                .setExpiration(now.plusMinutes(20).toDate())
-                .setAudience(projectId);
-
-        byte[] keyBytes = Files.readAllBytes(Paths.get(privateKeyFile));
-        PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(keyBytes);
-        KeyFactory kf = KeyFactory.getInstance("RSA");
-
-        return jwtBuilder.signWith(SignatureAlgorithm.RS256, kf.generatePrivate(spec)).compact();
-    }
-
-    /**
-     * Create a Cloud IoT Core JWT for the given project id, signed with the given ES key.
-     */
-    private static String createJwtEs(String projectId, String privateKeyFile)
-        throws IOException, NoSuchAlgorithmException, InvalidKeySpecException {
-        DateTime now = new DateTime();
-        // Create a JWT to authenticate this device. The device will be disconnected after the token
-        // expires, and will have to reconnect with a new token. The audience field should always be set
-        // to the GCP project id.
-        JwtBuilder jwtBuilder =
-            Jwts.builder()
-                .setIssuedAt(now.toDate())
-                .setExpiration(now.plusMinutes(20).toDate())
-                .setAudience(projectId);
-
-        byte[] keyBytes = Files.readAllBytes(Paths.get(privateKeyFile));
-        PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(keyBytes);
-        KeyFactory kf = KeyFactory.getInstance("EC");
-
-        return jwtBuilder.signWith(SignatureAlgorithm.ES256, kf.generatePrivate(spec)).compact();
-    }
-    // [END iot_mqtt_jwt]
-
-    /**
-     * Attaches the callback used when configuration changes occur.
-     */
-    private static void attachCallback(MqttClient client, String deviceId) throws MqttException {
-        // [START iot_mqtt_configcallback]
-        MqttCallback mCallback = new MqttCallback() {
-            @Override
-            public void connectionLost(Throwable cause) {
-                // Do nothing...
-            }
-
-            @Override
-            public void messageArrived(String topic, MqttMessage message) {
-                String payload = new String(message.getPayload());
-                System.out.println("Payload : " + payload);
-                // TODO: Insert your parsing / handling of the configuration message here.
-            }
-
-            @Override
-            public void deliveryComplete(IMqttDeliveryToken token) {
-                // Do nothing;
-            }
-        };
-
-        String configTopic = String.format("/devices/%s/config", deviceId);
-        client.subscribe(configTopic, 1);
-
-        client.setCallback(mCallback);
-    }
-    // [END iot_mqtt_configcallback]
-
-
-    private static void setConnectPassword(CliOptions options, MqttConnectOptions connectOptions)
-        throws NoSuchAlgorithmException, IOException, InvalidKeySpecException {
-        switch (options.getAlgorithm()) {
-            case "RS256":
-                connectOptions.setPassword(
-                    createJwtRsa(options.getProjectId(), options.getPrivateKeyFile()).toCharArray());
-                break;
-            case "ES256":
-                connectOptions.setPassword(
-                    createJwtEs(options.getProjectId(), options.getPrivateKeyFile()).toCharArray());
-                break;
-            default:
-                throw new IllegalArgumentException(
-                    "Invalid algorithm " + options.getAlgorithm()
-                        + ". Should be one of 'RS256' or 'ES256'.");
-        }
-    }
-
-    /**
-     * Example code do demonstrate sending events from an S7 device to Microsoft Azure IoT Hub
-     *
-     * @param args Expected: [plc4x connection string, plc4x address, IoT-Hub connection string].
-     */
-    public static void main(String[] args) throws Exception {
-
-        // [START iot_mqtt_configuremqtt]
-        CliOptions options = CliOptions.fromArgs(args);
-        if (options == null) {
-            CliOptions.printHelp();
-            // Could not parse.
-            System.exit(1);
-        }
-
-        // Build the connection string for Google's Cloud IoT Core MQTT server. Only SSL
-        // connections are accepted. For server authentication, the JVM's root certificates
-        // are used.
-        final String mqttServerAddress =
-            String.format("ssl://%s:%s", options.getMqttBridgeHostname(), options.getMqttBridgePort());
-
-        // Create our MQTT client. The mqttClientId is a unique string that identifies this device. For
-        // Google Cloud IoT Core, it must be in the format below.
-        final String mqttClientId =
-            String.format("projects/%s/locations/%s/registries/%s/devices/%s",
-                options.getProjectId(), options.getCloudRegion(), options.getRegistryId(), options.getDeviceId());
-
-        MqttConnectOptions connectOptions = new MqttConnectOptions();
-        // Note that the Google Cloud IoT Core only supports MQTT 3.1.1, and Paho requires that we
-        // explictly set this. If you don't set MQTT version, the server will immediately close its
-        // connection to your device.
-        connectOptions.setMqttVersion(MqttConnectOptions.MQTT_VERSION_3_1_1);
-
-        // With Google Cloud IoT Core, the username field is ignored, however it must be set for the
-        // Paho client library to send the password field. The password field is used to transmit a JWT
-        // to authorize the device.
-        connectOptions.setUserName("unused");
-
-        DateTime iat = new DateTime();
-        setConnectPassword(options, connectOptions);
-        // [END iot_mqtt_configuremqtt]
-
-        // [START iot_mqtt_publish]
-        // Create a client, and connect to the Google MQTT bridge.
-        MqttClient client = new MqttClient(mqttServerAddress, mqttClientId, new MemoryPersistence());
-
-        // Both connect and publish operations may fail. If they do, allow retries but with an
-        // exponential backoff time period.
-        long initialConnectIntervalMillis = 500L;
-        long maxConnectIntervalMillis = 6000L;
-        long maxConnectRetryTimeElapsedMillis = 900000L;
-        float intervalMultiplier = 1.5f;
-
-        long retryIntervalMs = initialConnectIntervalMillis;
-        long totalRetryTimeMs = 0;
-
-        while (!client.isConnected() && totalRetryTimeMs < maxConnectRetryTimeElapsedMillis) {
-            try {
-                client.connect(connectOptions);
-            } catch (MqttException e) {
-                int reason = e.getReasonCode();
-
-                // If the connection is lost or if the server cannot be connected, allow retries, but with
-                // exponential backoff.
-                System.out.println("An error occurred: " + e.getMessage());
-                if (reason == MqttException.REASON_CODE_CONNECTION_LOST
-                    || reason == MqttException.REASON_CODE_SERVER_CONNECT_ERROR) {
-                    System.out.println("Retrying in " + retryIntervalMs / 1000.0 + " seconds.");
-                    Thread.sleep(retryIntervalMs);
-                    totalRetryTimeMs += retryIntervalMs;
-                    retryIntervalMs *= intervalMultiplier;
-                    if (retryIntervalMs > maxConnectIntervalMillis) {
-                        retryIntervalMs = maxConnectIntervalMillis;
-                    }
-                } else {
-                    throw e;
-                }
-            }
-        }
-
-        attachCallback(client, options.getDeviceId());
-
-        // Publish to the events or state topic based on the flag.
-        String subTopic = "event".equals(options.getMessageType()) ? "events" : options.getMessageType();
-
-        // The MQTT topic that this device will publish telemetry data to. The MQTT topic name is
-        // required to be in the format below. Note that this is not the same as the device registry's
-        // Cloud Pub/Sub topic.
-        String mqttTopic = String.format("/devices/%s/%s", options.getDeviceId(), subTopic);
-
-        // Connect to Plc
-        logger.info("Connecting to Plc");
-        try (PlcConnection plcConnection = new PlcDriverManager().getConnection("s7://10.10.64.20/1/1")) {
-            logger.info("Connected");
-
-            PlcReadRequest readRequest = plcConnection.readRequestBuilder().addItem("outputs", "OUTPUTS/0").build();
-
-            while (!Thread.currentThread().isInterrupted()) {
-
-                PlcReadResponse plcReadResponse = readRequest.execute().get();
-
-                // Refresh the connection credentials before the JWT expires.
-                // [START iot_mqtt_jwt_refresh]
-                long secsSinceRefresh = ((new DateTime()).getMillis() - iat.getMillis()) / 1000;
-                if (secsSinceRefresh > (options.getTokenExpMins() * 60)) {
-                    System.out.format("\tRefreshing token after: %d seconds%n", secsSinceRefresh);
-                    iat = new DateTime();
-                    setConnectPassword(options, connectOptions);
-                    client.disconnect();
-                    client.connect();
-                    attachCallback(client, options.getDeviceId());
-                }
-                // [END iot_mqtt_jwt_refresh]
-
-                // Send data to cloud
-                for (String fieldName : plcReadResponse.getFieldNames()) {
-                    Long l = plcReadResponse.getLong(fieldName);
-                    byte[] array = ByteBuffer.allocate(8).putLong(l).array();
-                    String result = Long.toBinaryString(l);
-                    System.out.println("Outputs: " + result);
-                    // Publish "array" to the MQTT topic. qos=1 means at least once delivery. Cloud IoT Core
-                    // also supports qos=0 for at most once delivery.
-                    MqttMessage message = new MqttMessage(array);
-                    message.setQos(1);
-                    client.publish(mqttTopic, message);
-                    if ("event".equals(options.getMessageType())) {
-                        // Send telemetry events every second
-                        Thread.sleep(1000);
-                    } else {
-                        // Note: Update Device state less frequently than with telemetry events
-                        Thread.sleep(5000);
-                    }
-                }
-            }
-        }
-
-        System.out.println("Sent all messages. Goodbye!");
-        // [END iot_mqtt_publish]
-    }
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.examples.cloud.google;
+
+import io.jsonwebtoken.JwtBuilder;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.eclipse.paho.client.mqttv3.*;
+import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
+import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.security.KeyFactory;
+import java.security.NoSuchAlgorithmException;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.PKCS8EncodedKeySpec;
+
+// [START iot_mqtt_includes]
+// [END iot_mqtt_includes]
+
+public class S7PlcToGoogleIoTCoreSample {
+
+    private static final Logger logger = LoggerFactory.getLogger(S7PlcToGoogleIoTCoreSample.class);
+
+    // [START iot_mqtt_jwt]
+
+    /**
+     * Create a Cloud IoT Core JWT for the given project id, signed with the given RSA key.
+     */
+    private static String createJwtRsa(String projectId, String privateKeyFile)
+        throws IOException, NoSuchAlgorithmException, InvalidKeySpecException {
+        DateTime now = new DateTime();
+        // Create a JWT to authenticate this device. The device will be disconnected after the token
+        // expires, and will have to reconnect with a new token. The audience field should always be set
+        // to the GCP project id.
+        JwtBuilder jwtBuilder =
+            Jwts.builder()
+                .setIssuedAt(now.toDate())
+                .setExpiration(now.plusMinutes(20).toDate())
+                .setAudience(projectId);
+
+        byte[] keyBytes = Files.readAllBytes(Paths.get(privateKeyFile));
+        PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(keyBytes);
+        KeyFactory kf = KeyFactory.getInstance("RSA");
+
+        return jwtBuilder.signWith(SignatureAlgorithm.RS256, kf.generatePrivate(spec)).compact();
+    }
+
+    /**
+     * Create a Cloud IoT Core JWT for the given project id, signed with the given ES key.
+     */
+    private static String createJwtEs(String projectId, String privateKeyFile)
+        throws IOException, NoSuchAlgorithmException, InvalidKeySpecException {
+        DateTime now = new DateTime();
+        // Create a JWT to authenticate this device. The device will be disconnected after the token
+        // expires, and will have to reconnect with a new token. The audience field should always be set
+        // to the GCP project id.
+        JwtBuilder jwtBuilder =
+            Jwts.builder()
+                .setIssuedAt(now.toDate())
+                .setExpiration(now.plusMinutes(20).toDate())
+                .setAudience(projectId);
+
+        byte[] keyBytes = Files.readAllBytes(Paths.get(privateKeyFile));
+        PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(keyBytes);
+        KeyFactory kf = KeyFactory.getInstance("EC");
+
+        return jwtBuilder.signWith(SignatureAlgorithm.ES256, kf.generatePrivate(spec)).compact();
+    }
+    // [END iot_mqtt_jwt]
+
+    /**
+     * Attaches the callback used when configuration changes occur.
+     */
+    private static void attachCallback(MqttClient client, String deviceId) throws MqttException {
+        // [START iot_mqtt_configcallback]
+        MqttCallback mCallback = new MqttCallback() {
+            @Override
+            public void connectionLost(Throwable cause) {
+                // Do nothing...
+            }
+
+            @Override
+            public void messageArrived(String topic, MqttMessage message) {
+                String payload = new String(message.getPayload());
+                System.out.println("Payload : " + payload);
+                // TODO: Insert your parsing / handling of the configuration message here.
+            }
+
+            @Override
+            public void deliveryComplete(IMqttDeliveryToken token) {
+                // Do nothing;
+            }
+        };
+
+        String configTopic = String.format("/devices/%s/config", deviceId);
+        client.subscribe(configTopic, 1);
+
+        client.setCallback(mCallback);
+    }
+    // [END iot_mqtt_configcallback]
+
+
+    private static void setConnectPassword(CliOptions options, MqttConnectOptions connectOptions)
+        throws NoSuchAlgorithmException, IOException, InvalidKeySpecException {
+        switch (options.getAlgorithm()) {
+            case "RS256":
+                connectOptions.setPassword(
+                    createJwtRsa(options.getProjectId(), options.getPrivateKeyFile()).toCharArray());
+                break;
+            case "ES256":
+                connectOptions.setPassword(
+                    createJwtEs(options.getProjectId(), options.getPrivateKeyFile()).toCharArray());
+                break;
+            default:
+                throw new IllegalArgumentException(
+                    "Invalid algorithm " + options.getAlgorithm()
+                        + ". Should be one of 'RS256' or 'ES256'.");
+        }
+    }
+
+    /**
+     * Example code do demonstrate sending events from an S7 device to Microsoft Azure IoT Hub
+     *
+     * @param args Expected: [plc4x connection string, plc4x address, IoT-Hub connection string].
+     */
+    public static void main(String[] args) throws Exception {
+
+        // [START iot_mqtt_configuremqtt]
+        CliOptions options = CliOptions.fromArgs(args);
+        if (options == null) {
+            CliOptions.printHelp();
+            // Could not parse.
+            System.exit(1);
+        }
+
+        // Build the connection string for Google's Cloud IoT Core MQTT server. Only SSL
+        // connections are accepted. For server authentication, the JVM's root certificates
+        // are used.
+        final String mqttServerAddress =
+            String.format("ssl://%s:%s", options.getMqttBridgeHostname(), options.getMqttBridgePort());
+
+        // Create our MQTT client. The mqttClientId is a unique string that identifies this device. For
+        // Google Cloud IoT Core, it must be in the format below.
+        final String mqttClientId =
+            String.format("projects/%s/locations/%s/registries/%s/devices/%s",
+                options.getProjectId(), options.getCloudRegion(), options.getRegistryId(), options.getDeviceId());
+
+        MqttConnectOptions connectOptions = new MqttConnectOptions();
+        // Note that the Google Cloud IoT Core only supports MQTT 3.1.1, and Paho requires that we
+        // explictly set this. If you don't set MQTT version, the server will immediately close its
+        // connection to your device.
+        connectOptions.setMqttVersion(MqttConnectOptions.MQTT_VERSION_3_1_1);
+
+        // With Google Cloud IoT Core, the username field is ignored, however it must be set for the
+        // Paho client library to send the password field. The password field is used to transmit a JWT
+        // to authorize the device.
+        connectOptions.setUserName("unused");
+
+        DateTime iat = new DateTime();
+        setConnectPassword(options, connectOptions);
+        // [END iot_mqtt_configuremqtt]
+
+        // [START iot_mqtt_publish]
+        // Create a client, and connect to the Google MQTT bridge.
+        MqttClient client = new MqttClient(mqttServerAddress, mqttClientId, new MemoryPersistence());
+
+        // Both connect and publish operations may fail. If they do, allow retries but with an
+        // exponential backoff time period.
+        long initialConnectIntervalMillis = 500L;
+        long maxConnectIntervalMillis = 6000L;
+        long maxConnectRetryTimeElapsedMillis = 900000L;
+        float intervalMultiplier = 1.5f;
+
+        long retryIntervalMs = initialConnectIntervalMillis;
+        long totalRetryTimeMs = 0;
+
+        while (!client.isConnected() && totalRetryTimeMs < maxConnectRetryTimeElapsedMillis) {
+            try {
+                client.connect(connectOptions);
+            } catch (MqttException e) {
+                int reason = e.getReasonCode();
+
+                // If the connection is lost or if the server cannot be connected, allow retries, but with
+                // exponential backoff.
+                System.out.println("An error occurred: " + e.getMessage());
+                if (reason == MqttException.REASON_CODE_CONNECTION_LOST
+                    || reason == MqttException.REASON_CODE_SERVER_CONNECT_ERROR) {
+                    System.out.println("Retrying in " + retryIntervalMs / 1000.0 + " seconds.");
+                    Thread.sleep(retryIntervalMs);
+                    totalRetryTimeMs += retryIntervalMs;
+                    retryIntervalMs *= intervalMultiplier;
+                    if (retryIntervalMs > maxConnectIntervalMillis) {
+                        retryIntervalMs = maxConnectIntervalMillis;
+                    }
+                } else {
+                    throw e;
+                }
+            }
+        }
+
+        attachCallback(client, options.getDeviceId());
+
+        // Publish to the events or state topic based on the flag.
+        String subTopic = "event".equals(options.getMessageType()) ? "events" : options.getMessageType();
+
+        // The MQTT topic that this device will publish telemetry data to. The MQTT topic name is
+        // required to be in the format below. Note that this is not the same as the device registry's
+        // Cloud Pub/Sub topic.
+        String mqttTopic = String.format("/devices/%s/%s", options.getDeviceId(), subTopic);
+
+        // Connect to Plc
+        logger.info("Connecting to Plc");
+        try (PlcConnection plcConnection = new PlcDriverManager().getConnection("s7://10.10.64.20/1/1")) {
+            logger.info("Connected");
+
+            PlcReadRequest readRequest = plcConnection.readRequestBuilder().addItem("outputs", "OUTPUTS/0").build();
+
+            while (!Thread.currentThread().isInterrupted()) {
+
+                PlcReadResponse plcReadResponse = readRequest.execute().get();
+
+                // Refresh the connection credentials before the JWT expires.
+                // [START iot_mqtt_jwt_refresh]
+                long secsSinceRefresh = ((new DateTime()).getMillis() - iat.getMillis()) / 1000;
+                if (secsSinceRefresh > (options.getTokenExpMins() * 60)) {
+                    System.out.format("\tRefreshing token after: %d seconds%n", secsSinceRefresh);
+                    iat = new DateTime();
+                    setConnectPassword(options, connectOptions);
+                    client.disconnect();
+                    client.connect();
+                    attachCallback(client, options.getDeviceId());
+                }
+                // [END iot_mqtt_jwt_refresh]
+
+                // Send data to cloud
+                for (String fieldName : plcReadResponse.getFieldNames()) {
+                    Long l = plcReadResponse.getLong(fieldName);
+                    byte[] array = ByteBuffer.allocate(8).putLong(l).array();
+                    String result = Long.toBinaryString(l);
+                    System.out.println("Outputs: " + result);
+                    // Publish "array" to the MQTT topic. qos=1 means at least once delivery. Cloud IoT Core
+                    // also supports qos=0 for at most once delivery.
+                    MqttMessage message = new MqttMessage(array);
+                    message.setQos(1);
+                    client.publish(mqttTopic, message);
+                    if ("event".equals(options.getMessageType())) {
+                        // Send telemetry events every second
+                        Thread.sleep(1000);
+                    } else {
+                        // Note: Update Device state less frequently than with telemetry events
+                        Thread.sleep(5000);
+                    }
+                }
+            }
+        }
+
+        System.out.println("Sent all messages. Goodbye!");
+        // [END iot_mqtt_publish]
+    }
+}
diff --git a/plc4j/examples/hello-cloud-google/src/main/resources/logback.xml b/plc4j/examples/hello-cloud-google/src/main/resources/logback.xml
index 0fd17eaec52..85ea9489abf 100644
--- a/plc4j/examples/hello-cloud-google/src/main/resources/logback.xml
+++ b/plc4j/examples/hello-cloud-google/src/main/resources/logback.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoders are assigned the type
-         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <!--<logger level="OFF" name="io.netty.util" additivity="false">-->
-    <!--<appender-ref ref="STDOUT" />-->
-  <!--</logger>-->
-
-  <root level="info">
-    <appender-ref ref="STDOUT" />
-  </root>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <!--<logger level="OFF" name="io.netty.util" additivity="false">-->
+    <!--<appender-ref ref="STDOUT" />-->
+  <!--</logger>-->
+
+  <root level="info">
+    <appender-ref ref="STDOUT" />
+  </root>
+
 </configuration>
\ No newline at end of file
diff --git a/plc4j/examples/hello-connectivity-kafka/kafka-connector.yml b/plc4j/examples/hello-connectivity-kafka/kafka-connector.yml
index c5aa992440c..c1d33398515 100644
--- a/plc4j/examples/hello-connectivity-kafka/kafka-connector.yml
+++ b/plc4j/examples/hello-connectivity-kafka/kafka-connector.yml
@@ -1,34 +1,34 @@
-# ----------------------------------------------------------------------------
-# 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
-#
-#    http://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.
-# ----------------------------------------------------------------------------
----
-kafka:
-  topic-name: test-topic
-  bootstrap-servers: localhost:9092
-plc:
-  connection: test:plc4x-example-mqtt
-  addresses:
-  - name: intParam1
-    address: RANDOM/foo:INTEGER
-    size: 1
-    type: java.lang.Integer
-  - name: intParam2
-    address: RANDOM/bar:INTEGER
-    size: 1
-    type: java.lang.Integer
-polling-interval: 1000
+# ----------------------------------------------------------------------------
+# 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
+#
+#    http://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.
+# ----------------------------------------------------------------------------
+---
+kafka:
+  topic-name: test-topic
+  bootstrap-servers: localhost:9092
+plc:
+  connection: test:plc4x-example-mqtt
+  addresses:
+  - name: intParam1
+    address: RANDOM/foo:INTEGER
+    size: 1
+    type: java.lang.Integer
+  - name: intParam2
+    address: RANDOM/bar:INTEGER
+    size: 1
+    type: java.lang.Integer
+polling-interval: 1000
diff --git a/plc4j/examples/hello-connectivity-kafka/pom.xml b/plc4j/examples/hello-connectivity-kafka/pom.xml
index 491bdb390c1..797b64c1454 100644
--- a/plc4j/examples/hello-connectivity-kafka/pom.xml
+++ b/plc4j/examples/hello-connectivity-kafka/pom.xml
@@ -1,201 +1,201 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.examples</groupId>
-    <artifactId>plc4j-examples</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-hello-connectivity-kafka</artifactId>
-  <name>PLC4J: Examples: Connectivity: Kafka</name>
-  <description>Sample application that reads data from a connected PLC and publishes this information to a Kafka topic.</description>
-
-  <properties>
-    <app.main.class>org.apache.plc4x.java.examples.connectivity.kafka.KafkaConnector</app.main.class>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-apache-edgent</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.edgent</groupId>
-      <artifactId>edgent-api-function</artifactId>
-      <version>1.2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.edgent</groupId>
-      <artifactId>edgent-api-topology</artifactId>
-      <version>1.2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.edgent</groupId>
-      <artifactId>edgent-providers-direct</artifactId>
-      <version>1.2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.edgent</groupId>
-      <artifactId>edgent-connectors-kafka</artifactId>
-      <version>1.2.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
-      <artifactId>jackson-dataformat-yaml</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-    </dependency>
-
-    <!-- Required driver implementation -->
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ads</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ethernet-ip</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-modbus</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-opcua</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-s7</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-simulated</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>commons-collections</groupId>
-        <artifactId>commons-collections</artifactId>
-        <version>3.2.2</version>
-      </dependency>
-      <dependency>
-        <groupId>com.101tec</groupId>
-        <artifactId>zkclient</artifactId>
-        <version>0.10</version>
-      </dependency>
-      <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>1.2.17</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.kafka</groupId>
-        <artifactId>kafka_2.10</artifactId>
-        <version>0.10.2.2</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.kafka</groupId>
-        <artifactId>kafka-clients</artifactId>
-        <version>0.10.2.2</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.zookeeper</groupId>
-        <artifactId>zookeeper</artifactId>
-        <version>3.4.13</version>
-      </dependency>
-      <dependency>
-        <groupId>org.scala-lang</groupId>
-        <artifactId>scala-library</artifactId>
-        <version>2.10.7</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
-        <version>1.7.25</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <usedDependencies>
-            <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
-          </usedDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.examples</groupId>
+    <artifactId>plc4j-examples</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-hello-connectivity-kafka</artifactId>
+  <name>PLC4J: Examples: Connectivity: Kafka</name>
+  <description>Sample application that reads data from a connected PLC and publishes this information to a Kafka topic.</description>
+
+  <properties>
+    <app.main.class>org.apache.plc4x.java.examples.connectivity.kafka.KafkaConnector</app.main.class>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-apache-edgent</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.edgent</groupId>
+      <artifactId>edgent-api-function</artifactId>
+      <version>1.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.edgent</groupId>
+      <artifactId>edgent-api-topology</artifactId>
+      <version>1.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.edgent</groupId>
+      <artifactId>edgent-providers-direct</artifactId>
+      <version>1.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.edgent</groupId>
+      <artifactId>edgent-connectors-kafka</artifactId>
+      <version>1.2.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-yaml</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+    </dependency>
+
+    <!-- Required driver implementation -->
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ads</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ethernet-ip</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-modbus</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-opcua</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-s7</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-simulated</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <version>3.2.2</version>
+      </dependency>
+      <dependency>
+        <groupId>com.101tec</groupId>
+        <artifactId>zkclient</artifactId>
+        <version>0.10</version>
+      </dependency>
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>1.2.17</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.kafka</groupId>
+        <artifactId>kafka_2.10</artifactId>
+        <version>0.10.2.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.kafka</groupId>
+        <artifactId>kafka-clients</artifactId>
+        <version>0.10.2.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.zookeeper</groupId>
+        <artifactId>zookeeper</artifactId>
+        <version>3.4.13</version>
+      </dependency>
+      <dependency>
+        <groupId>org.scala-lang</groupId>
+        <artifactId>scala-library</artifactId>
+        <version>2.10.7</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <version>1.7.25</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <usedDependencies>
+            <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
+          </usedDependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/examples/hello-connectivity-kafka/server.sh b/plc4j/examples/hello-connectivity-kafka/server.sh
index d351c191c00..859d514d16f 100755
--- a/plc4j/examples/hello-connectivity-kafka/server.sh
+++ b/plc4j/examples/hello-connectivity-kafka/server.sh
@@ -1,31 +1,31 @@
-#!/usr/bin/env bash
-# ----------------------------------------------------------------------------
-# 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
-#
-#    http://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.
-# ----------------------------------------------------------------------------
-
-cd ${KAFKA_HOME}/bin
-
-# Start Zookeeper
-./zookeeper-server-start.sh -daemon ../config/zookeeper.properties
-
-# Start Kafka
-./kafka-server-start.sh -daemon ../config/server.properties
-
-# Start a Kafka consumer that simply dumps everything to the console
-./kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic test-topic --from-beginning
-
+#!/usr/bin/env bash
+# ----------------------------------------------------------------------------
+# 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
+#
+#    http://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.
+# ----------------------------------------------------------------------------
+
+cd ${KAFKA_HOME}/bin
+
+# Start Zookeeper
+./zookeeper-server-start.sh -daemon ../config/zookeeper.properties
+
+# Start Kafka
+./kafka-server-start.sh -daemon ../config/server.properties
+
+# Start a Kafka consumer that simply dumps everything to the console
+./kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic test-topic --from-beginning
+
diff --git a/plc4j/examples/hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/KafkaConnector.java b/plc4j/examples/hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/KafkaConnector.java
index 31eb2b90e3d..a631d98f21d 100644
--- a/plc4j/examples/hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/KafkaConnector.java
+++ b/plc4j/examples/hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/KafkaConnector.java
@@ -1,135 +1,135 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.examples.connectivity.kafka;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.edgent.connectors.kafka.KafkaProducer;
-import org.apache.edgent.function.Supplier;
-import org.apache.edgent.providers.direct.DirectProvider;
-import org.apache.edgent.topology.TStream;
-import org.apache.edgent.topology.Topology;
-import org.apache.plc4x.edgent.PlcConnectionAdapter;
-import org.apache.plc4x.edgent.PlcFunctions;
-import org.apache.plc4x.java.api.exceptions.PlcException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.examples.connectivity.kafka.model.Configuration;
-import org.apache.plc4x.java.examples.connectivity.kafka.model.PlcFieldConfig;
-import org.apache.plc4x.java.examples.connectivity.kafka.model.PlcMemoryBlock;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-public class KafkaConnector {
-
-    private static final Logger logger = LoggerFactory.getLogger(KafkaConnector.class);
-
-    private Configuration config;
-    private PlcConnectionAdapter plcAdapter;
-
-    private KafkaConnector(String propsPath) {
-        if(StringUtils.isEmpty(propsPath)) {
-            logger.error("Empty configuration file parameter");
-            throw new IllegalArgumentException("Empty configuration file parameter");
-        }
-        File propsFile = new File(propsPath);
-        if(!(propsFile.exists() && propsFile.isFile())) {
-            logger.error("Invalid configuration file {}", propsFile.getPath());
-            throw new IllegalArgumentException("Invalid configuration file " + propsFile.getPath());
-        }
-        ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
-        try {
-            config = mapper.readValue(propsFile, Configuration.class);
-            plcAdapter = new PlcConnectionAdapter(config.getPlcConfig().getConnection());
-        } catch (IOException e) {
-            logger.error("Error parsing configuration", e);
-        }
-    }
-
-    private void run() throws PlcException {
-        DirectProvider dp = new DirectProvider();
-        Topology top = dp.newTopology("kafka-bridge");
-
-        // Build the entire request.
-        PlcReadRequest.Builder builder = plcAdapter.readRequestBuilder();
-        for(PlcMemoryBlock plcMemoryBlock : config.getPlcConfig().getPlcMemoryBlocks()) {
-            for (PlcFieldConfig address : config.getPlcConfig().getPlcFields()) {
-                builder = builder.addItem(plcMemoryBlock.getName() + "/" + address.getName(),
-                    "DATA_BLOCKS/" + plcMemoryBlock.getAddress() + "/" + address.getAddress());
-            }
-        }
-        PlcReadRequest readRequest = builder.build();
-
-        // Create a supplier that is able to read the batch we just created.
-        Supplier<PlcReadResponse> plcSupplier = PlcFunctions.batchSupplier(plcAdapter, readRequest);
-
-        // Start polling our plc source in the given interval.
-        TStream<PlcReadResponse> source = top.poll(plcSupplier, config.getPollingInterval(), TimeUnit.MILLISECONDS);
-
-        // Convert the byte into a string.
-        TStream<String> jsonSource = source.map(value -> {
-            JsonObject jsonObject = new JsonObject();
-            value.getFieldNames().forEach(fieldName -> {
-                if(value.getNumberOfValues(fieldName) == 1) {
-                    jsonObject.addProperty(fieldName, value.getObject(fieldName).toString());
-                } else if (value.getNumberOfValues(fieldName) > 1) {
-                    JsonArray values = new JsonArray();
-                    value.getAllBytes(fieldName).forEach(values::add);
-                    jsonObject.add(fieldName, values);
-                }
-            });
-            return jsonObject.toString();
-        });
-
-        // Publish the stream to the topic. The String tuple is the message value.
-        // Create the Kafka Producer broker connector
-        Map<String,Object> kafkaConfig = createKafkaConfig();
-        KafkaProducer kafka = new KafkaProducer(top, () -> kafkaConfig);
-        kafka.publish(jsonSource, config.getKafkaConfig().getTopicName());
-
-        dp.submit(top);
-    }
-
-    private Map<String,Object> createKafkaConfig() {
-        Map<String,Object> kafkaConfig = new HashMap<>();
-        kafkaConfig.put("bootstrap.servers", config.getKafkaConfig().getBootstrapServers());
-        if(config.getKafkaConfig().getProperties() != null) {
-            kafkaConfig.putAll(config.getKafkaConfig().getProperties());
-        }
-        return kafkaConfig;
-    }
-
-    public static void main(String[] args) throws Exception {
-        if(args.length != 1) {
-            System.out.println("Usage: KafkaBridge {path-to-kafka-connector.yml}");
-        }
-        KafkaConnector kafkaBridge = new KafkaConnector(args[0]);
-        kafkaBridge.run();
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.examples.connectivity.kafka;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.edgent.connectors.kafka.KafkaProducer;
+import org.apache.edgent.function.Supplier;
+import org.apache.edgent.providers.direct.DirectProvider;
+import org.apache.edgent.topology.TStream;
+import org.apache.edgent.topology.Topology;
+import org.apache.plc4x.edgent.PlcConnectionAdapter;
+import org.apache.plc4x.edgent.PlcFunctions;
+import org.apache.plc4x.java.api.exceptions.PlcException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.examples.connectivity.kafka.model.Configuration;
+import org.apache.plc4x.java.examples.connectivity.kafka.model.PlcFieldConfig;
+import org.apache.plc4x.java.examples.connectivity.kafka.model.PlcMemoryBlock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+public class KafkaConnector {
+
+    private static final Logger logger = LoggerFactory.getLogger(KafkaConnector.class);
+
+    private Configuration config;
+    private PlcConnectionAdapter plcAdapter;
+
+    private KafkaConnector(String propsPath) {
+        if(StringUtils.isEmpty(propsPath)) {
+            logger.error("Empty configuration file parameter");
+            throw new IllegalArgumentException("Empty configuration file parameter");
+        }
+        File propsFile = new File(propsPath);
+        if(!(propsFile.exists() && propsFile.isFile())) {
+            logger.error("Invalid configuration file {}", propsFile.getPath());
+            throw new IllegalArgumentException("Invalid configuration file " + propsFile.getPath());
+        }
+        ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
+        try {
+            config = mapper.readValue(propsFile, Configuration.class);
+            plcAdapter = new PlcConnectionAdapter(config.getPlcConfig().getConnection());
+        } catch (IOException e) {
+            logger.error("Error parsing configuration", e);
+        }
+    }
+
+    private void run() throws PlcException {
+        DirectProvider dp = new DirectProvider();
+        Topology top = dp.newTopology("kafka-bridge");
+
+        // Build the entire request.
+        PlcReadRequest.Builder builder = plcAdapter.readRequestBuilder();
+        for(PlcMemoryBlock plcMemoryBlock : config.getPlcConfig().getPlcMemoryBlocks()) {
+            for (PlcFieldConfig address : config.getPlcConfig().getPlcFields()) {
+                builder = builder.addItem(plcMemoryBlock.getName() + "/" + address.getName(),
+                    "DATA_BLOCKS/" + plcMemoryBlock.getAddress() + "/" + address.getAddress());
+            }
+        }
+        PlcReadRequest readRequest = builder.build();
+
+        // Create a supplier that is able to read the batch we just created.
+        Supplier<PlcReadResponse> plcSupplier = PlcFunctions.batchSupplier(plcAdapter, readRequest);
+
+        // Start polling our plc source in the given interval.
+        TStream<PlcReadResponse> source = top.poll(plcSupplier, config.getPollingInterval(), TimeUnit.MILLISECONDS);
+
+        // Convert the byte into a string.
+        TStream<String> jsonSource = source.map(value -> {
+            JsonObject jsonObject = new JsonObject();
+            value.getFieldNames().forEach(fieldName -> {
+                if(value.getNumberOfValues(fieldName) == 1) {
+                    jsonObject.addProperty(fieldName, value.getObject(fieldName).toString());
+                } else if (value.getNumberOfValues(fieldName) > 1) {
+                    JsonArray values = new JsonArray();
+                    value.getAllBytes(fieldName).forEach(values::add);
+                    jsonObject.add(fieldName, values);
+                }
+            });
+            return jsonObject.toString();
+        });
+
+        // Publish the stream to the topic. The String tuple is the message value.
+        // Create the Kafka Producer broker connector
+        Map<String,Object> kafkaConfig = createKafkaConfig();
+        KafkaProducer kafka = new KafkaProducer(top, () -> kafkaConfig);
+        kafka.publish(jsonSource, config.getKafkaConfig().getTopicName());
+
+        dp.submit(top);
+    }
+
+    private Map<String,Object> createKafkaConfig() {
+        Map<String,Object> kafkaConfig = new HashMap<>();
+        kafkaConfig.put("bootstrap.servers", config.getKafkaConfig().getBootstrapServers());
+        if(config.getKafkaConfig().getProperties() != null) {
+            kafkaConfig.putAll(config.getKafkaConfig().getProperties());
+        }
+        return kafkaConfig;
+    }
+
+    public static void main(String[] args) throws Exception {
+        if(args.length != 1) {
+            System.out.println("Usage: KafkaBridge {path-to-kafka-connector.yml}");
+        }
+        KafkaConnector kafkaBridge = new KafkaConnector(args[0]);
+        kafkaBridge.run();
+    }
+
+}
diff --git a/plc4j/examples/hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/model/Configuration.java b/plc4j/examples/hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/model/Configuration.java
index 127797a8f2a..ffeca85c247 100644
--- a/plc4j/examples/hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/model/Configuration.java
+++ b/plc4j/examples/hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/model/Configuration.java
@@ -1,56 +1,56 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.examples.connectivity.kafka.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public class Configuration {
-
-    @JsonProperty("kafka")
-    private KafkaConfig kafkaConfig;
-    @JsonProperty("plc")
-    private PlcConfig plcConfig;
-    @JsonProperty("polling-interval")
-    private int pollingInterval;
-
-    public KafkaConfig getKafkaConfig() {
-        return kafkaConfig;
-    }
-
-    public void setKafkaConfig(KafkaConfig kafkaConfig) {
-        this.kafkaConfig = kafkaConfig;
-    }
-
-    public PlcConfig getPlcConfig() {
-        return plcConfig;
-    }
-
-    public void setPlcConfig(PlcConfig plcConfig) {
-        this.plcConfig = plcConfig;
-    }
-
-    public int getPollingInterval() {
-        return pollingInterval;
-    }
-
-    public void setPollingInterval(int pollingInterval) {
-        this.pollingInterval = pollingInterval;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.examples.connectivity.kafka.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class Configuration {
+
+    @JsonProperty("kafka")
+    private KafkaConfig kafkaConfig;
+    @JsonProperty("plc")
+    private PlcConfig plcConfig;
+    @JsonProperty("polling-interval")
+    private int pollingInterval;
+
+    public KafkaConfig getKafkaConfig() {
+        return kafkaConfig;
+    }
+
+    public void setKafkaConfig(KafkaConfig kafkaConfig) {
+        this.kafkaConfig = kafkaConfig;
+    }
+
+    public PlcConfig getPlcConfig() {
+        return plcConfig;
+    }
+
+    public void setPlcConfig(PlcConfig plcConfig) {
+        this.plcConfig = plcConfig;
+    }
+
+    public int getPollingInterval() {
+        return pollingInterval;
+    }
+
+    public void setPollingInterval(int pollingInterval) {
+        this.pollingInterval = pollingInterval;
+    }
+
+}
diff --git a/plc4j/examples/hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/model/KafkaConfig.java b/plc4j/examples/hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/model/KafkaConfig.java
index 600add41d79..3a8305daf18 100644
--- a/plc4j/examples/hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/model/KafkaConfig.java
+++ b/plc4j/examples/hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/model/KafkaConfig.java
@@ -1,57 +1,57 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.examples.connectivity.kafka.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.Map;
-
-public class KafkaConfig {
-
-    @JsonProperty("topic-name")
-    private String topicName;
-    @JsonProperty("bootstrap-servers")
-    private String bootstrapServers;
-    @JsonProperty("properties")
-    private Map<String, String> properties;
-
-    public String getTopicName() {
-        return topicName;
-    }
-
-    public void setTopicName(String topicName) {
-        this.topicName = topicName;
-    }
-
-    public String getBootstrapServers() {
-        return bootstrapServers;
-    }
-
-    public void setBootstrapServers(String bootstrapServers) {
-        this.bootstrapServers = bootstrapServers;
-    }
-
-    public Map<String, String> getProperties() {
-        return properties;
-    }
-
-    public void setProperties(Map<String, String> properties) {
-        this.properties = properties;
-    }
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.examples.connectivity.kafka.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Map;
+
+public class KafkaConfig {
+
+    @JsonProperty("topic-name")
+    private String topicName;
+    @JsonProperty("bootstrap-servers")
+    private String bootstrapServers;
+    @JsonProperty("properties")
+    private Map<String, String> properties;
+
+    public String getTopicName() {
+        return topicName;
+    }
+
+    public void setTopicName(String topicName) {
+        this.topicName = topicName;
+    }
+
+    public String getBootstrapServers() {
+        return bootstrapServers;
+    }
+
+    public void setBootstrapServers(String bootstrapServers) {
+        this.bootstrapServers = bootstrapServers;
+    }
+
+    public Map<String, String> getProperties() {
+        return properties;
+    }
+
+    public void setProperties(Map<String, String> properties) {
+        this.properties = properties;
+    }
+}
diff --git a/plc4j/examples/hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/model/PlcConfig.java b/plc4j/examples/hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/model/PlcConfig.java
index 7bbf55b46bd..7cbe571acbd 100644
--- a/plc4j/examples/hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/model/PlcConfig.java
+++ b/plc4j/examples/hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/model/PlcConfig.java
@@ -1,57 +1,57 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.examples.connectivity.kafka.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.List;
-
-public class PlcConfig {
-
-    private String connection;
-    @JsonProperty("memory-blocks")
-    private List<PlcMemoryBlock> plcMemoryBlocks;
-    @JsonProperty("addresses")
-    private List<PlcFieldConfig> plcFields;
-
-    public String getConnection() {
-        return connection;
-    }
-
-    public void setConnection(String connection) {
-        this.connection = connection;
-    }
-
-    public List<PlcMemoryBlock> getPlcMemoryBlocks() {
-        return plcMemoryBlocks;
-    }
-
-    public void setPlcMemoryBlocks(List<PlcMemoryBlock> plcMemoryBlocks) {
-        this.plcMemoryBlocks = plcMemoryBlocks;
-    }
-
-    public List<PlcFieldConfig> getPlcFields() {
-        return plcFields;
-    }
-
-    public void setPlcFields(List<PlcFieldConfig> plcFields) {
-        this.plcFields = plcFields;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.examples.connectivity.kafka.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+
+public class PlcConfig {
+
+    private String connection;
+    @JsonProperty("memory-blocks")
+    private List<PlcMemoryBlock> plcMemoryBlocks;
+    @JsonProperty("addresses")
+    private List<PlcFieldConfig> plcFields;
+
+    public String getConnection() {
+        return connection;
+    }
+
+    public void setConnection(String connection) {
+        this.connection = connection;
+    }
+
+    public List<PlcMemoryBlock> getPlcMemoryBlocks() {
+        return plcMemoryBlocks;
+    }
+
+    public void setPlcMemoryBlocks(List<PlcMemoryBlock> plcMemoryBlocks) {
+        this.plcMemoryBlocks = plcMemoryBlocks;
+    }
+
+    public List<PlcFieldConfig> getPlcFields() {
+        return plcFields;
+    }
+
+    public void setPlcFields(List<PlcFieldConfig> plcFields) {
+        this.plcFields = plcFields;
+    }
+
+}
diff --git a/plc4j/examples/hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/model/PlcFieldConfig.java b/plc4j/examples/hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/model/PlcFieldConfig.java
index 196c53e56fa..52cccb51d59 100644
--- a/plc4j/examples/hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/model/PlcFieldConfig.java
+++ b/plc4j/examples/hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/model/PlcFieldConfig.java
@@ -1,69 +1,69 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.examples.connectivity.kafka.model;
-
-public class PlcFieldConfig {
-
-    private String name;
-    private String description;
-    private String address;
-    private int size;
-    private Class<?> type;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public int getSize() {
-        return size;
-    }
-
-    public void setSize(int size) {
-        this.size = size;
-    }
-
-    public Class<?> getType() {
-        return type;
-    }
-
-    public void setType(Class<?> type) {
-        this.type = type;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.examples.connectivity.kafka.model;
+
+public class PlcFieldConfig {
+
+    private String name;
+    private String description;
+    private String address;
+    private int size;
+    private Class<?> type;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public int getSize() {
+        return size;
+    }
+
+    public void setSize(int size) {
+        this.size = size;
+    }
+
+    public Class<?> getType() {
+        return type;
+    }
+
+    public void setType(Class<?> type) {
+        this.type = type;
+    }
+
+}
diff --git a/plc4j/examples/hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/model/PlcMemoryBlock.java b/plc4j/examples/hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/model/PlcMemoryBlock.java
index 9b04de0f2da..405ee482a23 100644
--- a/plc4j/examples/hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/model/PlcMemoryBlock.java
+++ b/plc4j/examples/hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/model/PlcMemoryBlock.java
@@ -1,41 +1,41 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.examples.connectivity.kafka.model;
-
-public class PlcMemoryBlock {
-
-    private String name;
-    private String address;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.examples.connectivity.kafka.model;
+
+public class PlcMemoryBlock {
+
+    private String name;
+    private String address;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+}
diff --git a/plc4j/examples/hello-connectivity-kafka/src/main/resources/logback.xml b/plc4j/examples/hello-connectivity-kafka/src/main/resources/logback.xml
index bba8e02477e..c495c632ee2 100644
--- a/plc4j/examples/hello-connectivity-kafka/src/main/resources/logback.xml
+++ b/plc4j/examples/hello-connectivity-kafka/src/main/resources/logback.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoders are assigned the type
-         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="warn">
-    <appender-ref ref="STDOUT" />
-  </root>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="warn">
+    <appender-ref ref="STDOUT" />
+  </root>
+
 </configuration>
\ No newline at end of file
diff --git a/plc4j/examples/hello-connectivity-mqtt/mqtt-connector.yml b/plc4j/examples/hello-connectivity-mqtt/mqtt-connector.yml
index a0b1c154267..7ce18d1bc1f 100644
--- a/plc4j/examples/hello-connectivity-mqtt/mqtt-connector.yml
+++ b/plc4j/examples/hello-connectivity-mqtt/mqtt-connector.yml
@@ -1,35 +1,35 @@
-# ----------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#    http://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.
-# ----------------------------------------------------------------------------
----
-mqtt:
-  topic-name: plc4x/test-topic
-  server-host: test.mosquitto.org
-  server-port: 1883
-plc:
-  connection: test:plc4x-example-mqtt
-  addresses:
-    - name: intParam
-      address: RANDOM/foo:INTEGER
-      size: 1
-      type: java.lang.Integer
-    - name: intParam2
-      address: RANDOM/bar:INTEGER
-      size: 1
-      type: java.lang.Integer
-polling-interval: 2000
+# ----------------------------------------------------------------------------
+# 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
+#
+#    http://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.
+# ----------------------------------------------------------------------------
+---
+mqtt:
+  topic-name: plc4x/test-topic
+  server-host: test.mosquitto.org
+  server-port: 1883
+plc:
+  connection: test:plc4x-example-mqtt
+  addresses:
+    - name: intParam
+      address: RANDOM/foo:INTEGER
+      size: 1
+      type: java.lang.Integer
+    - name: intParam2
+      address: RANDOM/bar:INTEGER
+      size: 1
+      type: java.lang.Integer
+polling-interval: 2000
diff --git a/plc4j/examples/hello-connectivity-mqtt/pom.xml b/plc4j/examples/hello-connectivity-mqtt/pom.xml
index a0d9c7e0b91..c7c1c1c2923 100644
--- a/plc4j/examples/hello-connectivity-mqtt/pom.xml
+++ b/plc4j/examples/hello-connectivity-mqtt/pom.xml
@@ -1,154 +1,154 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.examples</groupId>
-    <artifactId>plc4j-examples</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-hello-connectivity-mqtt</artifactId>
-  <name>PLC4J: Examples: Connectivity: MQTT</name>
-  <description>Sample application, that reads data from a connected PLC and publishes this information via MQTT.</description>
-
-  <properties>
-    <app.main.class>org.apache.plc4x.java.examples.connectivity.mqtt.MqttConnector</app.main.class>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.hivemq</groupId>
-      <artifactId>hivemq-mqtt-client</artifactId>
-      <version>1.0.0</version>
-    </dependency>
-    <dependency>
-      <groupId>io.reactivex.rxjava2</groupId>
-      <artifactId>rxjava</artifactId>
-      <version>2.1.12</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
-      <artifactId>jackson-dataformat-yaml</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-    </dependency>
-
-    <!-- Required driver implementation -->
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ads</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ethernet-ip</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-modbus</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-opcua</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-s7</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-simulated</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <usedDependencies>
-            <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
-          </usedDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <repositories>
-    <repository>
-      <id>jfrog-snapshot</id>
-      <url>https://oss.jfrog.org/artifactory/oss-snapshot-local</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.examples</groupId>
+    <artifactId>plc4j-examples</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-hello-connectivity-mqtt</artifactId>
+  <name>PLC4J: Examples: Connectivity: MQTT</name>
+  <description>Sample application, that reads data from a connected PLC and publishes this information via MQTT.</description>
+
+  <properties>
+    <app.main.class>org.apache.plc4x.java.examples.connectivity.mqtt.MqttConnector</app.main.class>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.hivemq</groupId>
+      <artifactId>hivemq-mqtt-client</artifactId>
+      <version>1.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>io.reactivex.rxjava2</groupId>
+      <artifactId>rxjava</artifactId>
+      <version>2.1.12</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-yaml</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+    </dependency>
+
+    <!-- Required driver implementation -->
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ads</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ethernet-ip</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-modbus</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-opcua</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-s7</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-simulated</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <usedDependencies>
+            <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
+          </usedDependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <repositories>
+    <repository>
+      <id>jfrog-snapshot</id>
+      <url>https://oss.jfrog.org/artifactory/oss-snapshot-local</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/MqttConnector.java b/plc4j/examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/MqttConnector.java
index 5abb0783cb2..70255effe67 100644
--- a/plc4j/examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/MqttConnector.java
+++ b/plc4j/examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/MqttConnector.java
@@ -1,154 +1,154 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.examples.connectivity.mqtt;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.hivemq.client.mqtt.MqttClient;
-import com.hivemq.client.mqtt.datatypes.MqttQos;
-import com.hivemq.client.mqtt.mqtt3.Mqtt3RxClient;
-import com.hivemq.client.mqtt.mqtt3.message.connect.connack.Mqtt3ConnAck;
-import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish;
-import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishResult;
-import io.reactivex.Flowable;
-import io.reactivex.Single;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.exceptions.PlcException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.examples.connectivity.mqtt.model.Configuration;
-import org.apache.plc4x.java.examples.connectivity.mqtt.model.PlcFieldConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
-public class MqttConnector {
-
-    private static final Logger logger = LoggerFactory.getLogger(MqttConnector.class);
-
-    private Configuration config;
-
-    private MqttConnector(String propsPath) {
-        if(StringUtils.isEmpty(propsPath)) {
-            logger.error("Empty configuration file parameter");
-            throw new IllegalArgumentException("Empty configuration file parameter");
-        }
-        File propsFile = new File(propsPath);
-        if(!(propsFile.exists() && propsFile.isFile())) {
-            logger.error("Invalid configuration file {}", propsFile.getPath());
-            throw new IllegalArgumentException("Invalid configuration file " + propsFile.getPath());
-        }
-        ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
-        try {
-            config = mapper.readValue(propsFile, Configuration.class);
-        } catch (IOException e) {
-            logger.error("Error parsing configuration", e);
-        }
-    }
-
-    private void run() throws PlcException {
-        // Create a new MQTT client.
-        final Mqtt3RxClient client = MqttClient.builder()
-            .identifier(UUID.randomUUID().toString())
-            .serverHost(config.getMqttConfig().getServerHost())
-            .serverPort(config.getMqttConfig().getServerPort())
-            .useMqttVersion3()
-            .buildRx();
-
-        // Connect to the MQTT broker.
-        final Single<Mqtt3ConnAck> connAckSingle = client.connect().timeout(10, TimeUnit.SECONDS);
-
-        // Connect to the PLC.
-        try (PlcConnection plcConnection = new PlcDriverManager().getConnection(config.getPlcConfig().getConnection())) {
-
-            // Check if this connection support reading of data.
-            if (!plcConnection.getMetadata().canRead()) {
-                System.err.println("This connection doesn't support reading.");
-                return;
-            }
-
-            // Create a new read request.
-            PlcReadRequest.Builder builder = plcConnection.readRequestBuilder();
-            for (PlcFieldConfig fieldConfig : config.getPlcConfig().getPlcFields()) {
-                builder = builder.addItem(fieldConfig.getName(), fieldConfig.getAddress());
-            }
-            PlcReadRequest readRequest = builder.build();
-
-            // Send a message containing the PLC read response.
-            Flowable<Mqtt3Publish> messagesToPublish = Flowable.generate(emitter -> {
-                PlcReadResponse response = readRequest.execute().get();
-                String jsonPayload = getPayload(response);
-                final Mqtt3Publish publishMessage = Mqtt3Publish.builder()
-                    .topic(config.getMqttConfig().getTopicName())
-                    .qos(MqttQos.AT_LEAST_ONCE)
-                    .payload(jsonPayload.getBytes())
-                    .build();
-                emitter.onNext(publishMessage);
-            });
-
-            // Emit 1 message only every 100 milliseconds.
-            messagesToPublish = messagesToPublish.zipWith(Flowable.interval(
-                config.getPollingInterval(), TimeUnit.MILLISECONDS), (publish, aLong) -> publish);
-
-            final Single<Mqtt3ConnAck> connectScenario = connAckSingle
-                .doOnSuccess(connAck -> System.out.println("Connected with return code " + connAck.getReturnCode()))
-                .doOnError(throwable -> System.out.println("Connection failed, " + throwable.getMessage()));
-
-            final Flowable<Mqtt3PublishResult> publishScenario = client.publish(messagesToPublish)
-                .doOnNext(publishResult -> System.out.println(
-                    "Publish acknowledged: " + new String(publishResult.getPublish().getPayloadAsBytes())));
-
-            connectScenario.toCompletable().andThen(publishScenario).blockingSubscribe();
-        } catch (Exception e) {
-            throw new PlcException("Error creating connection to " + config.getPlcConfig().getConnection(), e);
-        }
-    }
-
-    private String getPayload(PlcReadResponse response) {
-        JsonObject jsonObject = new JsonObject();
-        response.getFieldNames().forEach(fieldName -> {
-            if(response.getNumberOfValues(fieldName) == 1) {
-                jsonObject.addProperty(fieldName, response.getObject(fieldName).toString());
-            } else if (response.getNumberOfValues(fieldName) > 1) {
-                JsonArray values = new JsonArray();
-                response.getAllBytes(fieldName).forEach(values::add);
-                jsonObject.add(fieldName, values);
-            }
-        });
-        return jsonObject.toString();
-    }
-
-    public static void main(String[] args) throws Exception {
-        if(args.length != 1) {
-            System.out.println("Usage: MqttConnector {path-to-mqtt-connector.yml}");
-        }
-        MqttConnector mqttConnector = new MqttConnector(args[0]);
-        mqttConnector.run();
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.examples.connectivity.mqtt;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.hivemq.client.mqtt.MqttClient;
+import com.hivemq.client.mqtt.datatypes.MqttQos;
+import com.hivemq.client.mqtt.mqtt3.Mqtt3RxClient;
+import com.hivemq.client.mqtt.mqtt3.message.connect.connack.Mqtt3ConnAck;
+import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish;
+import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishResult;
+import io.reactivex.Flowable;
+import io.reactivex.Single;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.exceptions.PlcException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.examples.connectivity.mqtt.model.Configuration;
+import org.apache.plc4x.java.examples.connectivity.mqtt.model.PlcFieldConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+public class MqttConnector {
+
+    private static final Logger logger = LoggerFactory.getLogger(MqttConnector.class);
+
+    private Configuration config;
+
+    private MqttConnector(String propsPath) {
+        if(StringUtils.isEmpty(propsPath)) {
+            logger.error("Empty configuration file parameter");
+            throw new IllegalArgumentException("Empty configuration file parameter");
+        }
+        File propsFile = new File(propsPath);
+        if(!(propsFile.exists() && propsFile.isFile())) {
+            logger.error("Invalid configuration file {}", propsFile.getPath());
+            throw new IllegalArgumentException("Invalid configuration file " + propsFile.getPath());
+        }
+        ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
+        try {
+            config = mapper.readValue(propsFile, Configuration.class);
+        } catch (IOException e) {
+            logger.error("Error parsing configuration", e);
+        }
+    }
+
+    private void run() throws PlcException {
+        // Create a new MQTT client.
+        final Mqtt3RxClient client = MqttClient.builder()
+            .identifier(UUID.randomUUID().toString())
+            .serverHost(config.getMqttConfig().getServerHost())
+            .serverPort(config.getMqttConfig().getServerPort())
+            .useMqttVersion3()
+            .buildRx();
+
+        // Connect to the MQTT broker.
+        final Single<Mqtt3ConnAck> connAckSingle = client.connect().timeout(10, TimeUnit.SECONDS);
+
+        // Connect to the PLC.
+        try (PlcConnection plcConnection = new PlcDriverManager().getConnection(config.getPlcConfig().getConnection())) {
+
+            // Check if this connection support reading of data.
+            if (!plcConnection.getMetadata().canRead()) {
+                System.err.println("This connection doesn't support reading.");
+                return;
+            }
+
+            // Create a new read request.
+            PlcReadRequest.Builder builder = plcConnection.readRequestBuilder();
+            for (PlcFieldConfig fieldConfig : config.getPlcConfig().getPlcFields()) {
+                builder = builder.addItem(fieldConfig.getName(), fieldConfig.getAddress());
+            }
+            PlcReadRequest readRequest = builder.build();
+
+            // Send a message containing the PLC read response.
+            Flowable<Mqtt3Publish> messagesToPublish = Flowable.generate(emitter -> {
+                PlcReadResponse response = readRequest.execute().get();
+                String jsonPayload = getPayload(response);
+                final Mqtt3Publish publishMessage = Mqtt3Publish.builder()
+                    .topic(config.getMqttConfig().getTopicName())
+                    .qos(MqttQos.AT_LEAST_ONCE)
+                    .payload(jsonPayload.getBytes())
+                    .build();
+                emitter.onNext(publishMessage);
+            });
+
+            // Emit 1 message only every 100 milliseconds.
+            messagesToPublish = messagesToPublish.zipWith(Flowable.interval(
+                config.getPollingInterval(), TimeUnit.MILLISECONDS), (publish, aLong) -> publish);
+
+            final Single<Mqtt3ConnAck> connectScenario = connAckSingle
+                .doOnSuccess(connAck -> System.out.println("Connected with return code " + connAck.getReturnCode()))
+                .doOnError(throwable -> System.out.println("Connection failed, " + throwable.getMessage()));
+
+            final Flowable<Mqtt3PublishResult> publishScenario = client.publish(messagesToPublish)
+                .doOnNext(publishResult -> System.out.println(
+                    "Publish acknowledged: " + new String(publishResult.getPublish().getPayloadAsBytes())));
+
+            connectScenario.toCompletable().andThen(publishScenario).blockingSubscribe();
+        } catch (Exception e) {
+            throw new PlcException("Error creating connection to " + config.getPlcConfig().getConnection(), e);
+        }
+    }
+
+    private String getPayload(PlcReadResponse response) {
+        JsonObject jsonObject = new JsonObject();
+        response.getFieldNames().forEach(fieldName -> {
+            if(response.getNumberOfValues(fieldName) == 1) {
+                jsonObject.addProperty(fieldName, response.getObject(fieldName).toString());
+            } else if (response.getNumberOfValues(fieldName) > 1) {
+                JsonArray values = new JsonArray();
+                response.getAllBytes(fieldName).forEach(values::add);
+                jsonObject.add(fieldName, values);
+            }
+        });
+        return jsonObject.toString();
+    }
+
+    public static void main(String[] args) throws Exception {
+        if(args.length != 1) {
+            System.out.println("Usage: MqttConnector {path-to-mqtt-connector.yml}");
+        }
+        MqttConnector mqttConnector = new MqttConnector(args[0]);
+        mqttConnector.run();
+    }
+
+}
diff --git a/plc4j/examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/model/Configuration.java b/plc4j/examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/model/Configuration.java
index 5bf93f0d7db..9061095f288 100644
--- a/plc4j/examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/model/Configuration.java
+++ b/plc4j/examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/model/Configuration.java
@@ -1,56 +1,56 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.examples.connectivity.mqtt.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public class Configuration {
-
-    @JsonProperty("mqtt")
-    private MqttConfig mqttConfig;
-    @JsonProperty("plc")
-    private PlcConfig plcConfig;
-    @JsonProperty("polling-interval")
-    private int pollingInterval;
-
-    public MqttConfig getMqttConfig() {
-        return mqttConfig;
-    }
-
-    public void setMqttConfig(MqttConfig mqttConfig) {
-        this.mqttConfig = mqttConfig;
-    }
-
-    public PlcConfig getPlcConfig() {
-        return plcConfig;
-    }
-
-    public void setPlcConfig(PlcConfig plcConfig) {
-        this.plcConfig = plcConfig;
-    }
-
-    public int getPollingInterval() {
-        return pollingInterval;
-    }
-
-    public void setPollingInterval(int pollingInterval) {
-        this.pollingInterval = pollingInterval;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.examples.connectivity.mqtt.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class Configuration {
+
+    @JsonProperty("mqtt")
+    private MqttConfig mqttConfig;
+    @JsonProperty("plc")
+    private PlcConfig plcConfig;
+    @JsonProperty("polling-interval")
+    private int pollingInterval;
+
+    public MqttConfig getMqttConfig() {
+        return mqttConfig;
+    }
+
+    public void setMqttConfig(MqttConfig mqttConfig) {
+        this.mqttConfig = mqttConfig;
+    }
+
+    public PlcConfig getPlcConfig() {
+        return plcConfig;
+    }
+
+    public void setPlcConfig(PlcConfig plcConfig) {
+        this.plcConfig = plcConfig;
+    }
+
+    public int getPollingInterval() {
+        return pollingInterval;
+    }
+
+    public void setPollingInterval(int pollingInterval) {
+        this.pollingInterval = pollingInterval;
+    }
+
+}
diff --git a/plc4j/examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/model/MqttConfig.java b/plc4j/examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/model/MqttConfig.java
index 7f287d4cfcb..58a085c75b7 100644
--- a/plc4j/examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/model/MqttConfig.java
+++ b/plc4j/examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/model/MqttConfig.java
@@ -1,56 +1,56 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.examples.connectivity.mqtt.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public class MqttConfig {
-
-    @JsonProperty("topic-name")
-    private String topicName;
-    @JsonProperty("server-host")
-    private String serverHost;
-    @JsonProperty("server-port")
-    private int serverPort;
-
-    public String getTopicName() {
-        return topicName;
-    }
-
-    public void setTopicName(String topicName) {
-        this.topicName = topicName;
-    }
-
-    public String getServerHost() {
-        return serverHost;
-    }
-
-    public void setServerHost(String serverHost) {
-        this.serverHost = serverHost;
-    }
-
-    public int getServerPort() {
-        return serverPort;
-    }
-
-    public void setServerPort(int serverPort) {
-        this.serverPort = serverPort;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.examples.connectivity.mqtt.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class MqttConfig {
+
+    @JsonProperty("topic-name")
+    private String topicName;
+    @JsonProperty("server-host")
+    private String serverHost;
+    @JsonProperty("server-port")
+    private int serverPort;
+
+    public String getTopicName() {
+        return topicName;
+    }
+
+    public void setTopicName(String topicName) {
+        this.topicName = topicName;
+    }
+
+    public String getServerHost() {
+        return serverHost;
+    }
+
+    public void setServerHost(String serverHost) {
+        this.serverHost = serverHost;
+    }
+
+    public int getServerPort() {
+        return serverPort;
+    }
+
+    public void setServerPort(int serverPort) {
+        this.serverPort = serverPort;
+    }
+
+}
diff --git a/plc4j/examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/model/PlcConfig.java b/plc4j/examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/model/PlcConfig.java
index 3fce84c6802..f5798083175 100644
--- a/plc4j/examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/model/PlcConfig.java
+++ b/plc4j/examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/model/PlcConfig.java
@@ -1,57 +1,57 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.examples.connectivity.mqtt.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.List;
-
-public class PlcConfig {
-
-    private String connection;
-    @JsonProperty("memory-blocks")
-    private List<PlcMemoryBlock> plcMemoryBlocks;
-    @JsonProperty("addresses")
-    private List<PlcFieldConfig> plcFields;
-
-    public String getConnection() {
-        return connection;
-    }
-
-    public void setConnection(String connection) {
-        this.connection = connection;
-    }
-
-    public List<PlcMemoryBlock> getPlcMemoryBlocks() {
-        return plcMemoryBlocks;
-    }
-
-    public void setPlcMemoryBlocks(List<PlcMemoryBlock> plcMemoryBlocks) {
-        this.plcMemoryBlocks = plcMemoryBlocks;
-    }
-
-    public List<PlcFieldConfig> getPlcFields() {
-        return plcFields;
-    }
-
-    public void setPlcFields(List<PlcFieldConfig> plcFields) {
-        this.plcFields = plcFields;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.examples.connectivity.mqtt.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+
+public class PlcConfig {
+
+    private String connection;
+    @JsonProperty("memory-blocks")
+    private List<PlcMemoryBlock> plcMemoryBlocks;
+    @JsonProperty("addresses")
+    private List<PlcFieldConfig> plcFields;
+
+    public String getConnection() {
+        return connection;
+    }
+
+    public void setConnection(String connection) {
+        this.connection = connection;
+    }
+
+    public List<PlcMemoryBlock> getPlcMemoryBlocks() {
+        return plcMemoryBlocks;
+    }
+
+    public void setPlcMemoryBlocks(List<PlcMemoryBlock> plcMemoryBlocks) {
+        this.plcMemoryBlocks = plcMemoryBlocks;
+    }
+
+    public List<PlcFieldConfig> getPlcFields() {
+        return plcFields;
+    }
+
+    public void setPlcFields(List<PlcFieldConfig> plcFields) {
+        this.plcFields = plcFields;
+    }
+
+}
diff --git a/plc4j/examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/model/PlcFieldConfig.java b/plc4j/examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/model/PlcFieldConfig.java
index fbf72aeaf4a..c0a19791926 100644
--- a/plc4j/examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/model/PlcFieldConfig.java
+++ b/plc4j/examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/model/PlcFieldConfig.java
@@ -1,69 +1,69 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.examples.connectivity.mqtt.model;
-
-public class PlcFieldConfig {
-
-    private String name;
-    private String description;
-    private String address;
-    private int size;
-    private Class<?> type;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public int getSize() {
-        return size;
-    }
-
-    public void setSize(int size) {
-        this.size = size;
-    }
-
-    public Class<?> getType() {
-        return type;
-    }
-
-    public void setType(Class<?> type) {
-        this.type = type;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.examples.connectivity.mqtt.model;
+
+public class PlcFieldConfig {
+
+    private String name;
+    private String description;
+    private String address;
+    private int size;
+    private Class<?> type;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public int getSize() {
+        return size;
+    }
+
+    public void setSize(int size) {
+        this.size = size;
+    }
+
+    public Class<?> getType() {
+        return type;
+    }
+
+    public void setType(Class<?> type) {
+        this.type = type;
+    }
+
+}
diff --git a/plc4j/examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/model/PlcMemoryBlock.java b/plc4j/examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/model/PlcMemoryBlock.java
index 89292faec56..f0c1b34c299 100644
--- a/plc4j/examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/model/PlcMemoryBlock.java
+++ b/plc4j/examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/model/PlcMemoryBlock.java
@@ -1,41 +1,41 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.examples.connectivity.mqtt.model;
-
-public class PlcMemoryBlock {
-
-    private String name;
-    private String address;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.examples.connectivity.mqtt.model;
+
+public class PlcMemoryBlock {
+
+    private String name;
+    private String address;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+}
diff --git a/plc4j/examples/hello-connectivity-mqtt/src/main/resources/logback.xml b/plc4j/examples/hello-connectivity-mqtt/src/main/resources/logback.xml
index bba8e02477e..c495c632ee2 100644
--- a/plc4j/examples/hello-connectivity-mqtt/src/main/resources/logback.xml
+++ b/plc4j/examples/hello-connectivity-mqtt/src/main/resources/logback.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoders are assigned the type
-         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="warn">
-    <appender-ref ref="STDOUT" />
-  </root>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="warn">
+    <appender-ref ref="STDOUT" />
+  </root>
+
 </configuration>
\ No newline at end of file
diff --git a/plc4j/examples/hello-integration-edgent/pom.xml b/plc4j/examples/hello-integration-edgent/pom.xml
index 7d58379ed43..717a4ec0a99 100644
--- a/plc4j/examples/hello-integration-edgent/pom.xml
+++ b/plc4j/examples/hello-integration-edgent/pom.xml
@@ -1,129 +1,129 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.examples</groupId>
-    <artifactId>plc4j-examples</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-hello-integration-edgent</artifactId>
-  <name>PLC4J: Examples: Edgent</name>
-  <description>Application using Edgent to output PLC data to the console.</description>
-
-  <properties>
-    <app.main.class>org.apache.plc4x.java.examples.integration.edgent.PlcLogger</app.main.class>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-apache-edgent</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.edgent</groupId>
-      <artifactId>edgent-api-function</artifactId>
-      <version>1.2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.edgent</groupId>
-      <artifactId>edgent-api-topology</artifactId>
-      <version>1.2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.edgent</groupId>
-      <artifactId>edgent-providers-direct</artifactId>
-      <version>1.2.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-      <version>1.4</version>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-    </dependency>
-
-    <!-- Required driver implementation -->
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ads</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ethernet-ip</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-modbus</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-opcua</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-s7</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-simulated</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <usedDependencies>
-            <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
-          </usedDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.examples</groupId>
+    <artifactId>plc4j-examples</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-hello-integration-edgent</artifactId>
+  <name>PLC4J: Examples: Edgent</name>
+  <description>Application using Edgent to output PLC data to the console.</description>
+
+  <properties>
+    <app.main.class>org.apache.plc4x.java.examples.integration.edgent.PlcLogger</app.main.class>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-apache-edgent</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.edgent</groupId>
+      <artifactId>edgent-api-function</artifactId>
+      <version>1.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.edgent</groupId>
+      <artifactId>edgent-api-topology</artifactId>
+      <version>1.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.edgent</groupId>
+      <artifactId>edgent-providers-direct</artifactId>
+      <version>1.2.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <version>1.4</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+    </dependency>
+
+    <!-- Required driver implementation -->
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ads</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ethernet-ip</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-modbus</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-opcua</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-s7</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-simulated</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <usedDependencies>
+            <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
+          </usedDependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/examples/hello-integration-edgent/src/main/java/org/apache/plc4x/java/examples/integration/edgent/CliOptions.java b/plc4j/examples/hello-integration-edgent/src/main/java/org/apache/plc4x/java/examples/integration/edgent/CliOptions.java
index d049e52aed2..bb7c4f8562a 100644
--- a/plc4j/examples/hello-integration-edgent/src/main/java/org/apache/plc4x/java/examples/integration/edgent/CliOptions.java
+++ b/plc4j/examples/hello-integration-edgent/src/main/java/org/apache/plc4x/java/examples/integration/edgent/CliOptions.java
@@ -1,99 +1,99 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.examples.integration.edgent;
-
-import org.apache.commons.cli.*;
-
-public class CliOptions {
-
-    private static Options options;
-
-    private final String connectionString;
-    private final String fieldAddress;
-    private final int pollingInterval;
-
-    public static CliOptions fromArgs(String[] args) {
-        options = new Options();
-        // Required arguments
-        options.addOption(
-            Option.builder()
-                .type(String.class)
-                .longOpt("connection-string")
-                .hasArg()
-                .desc("Connection String")
-                .required()
-                .build());
-        options.addOption(
-            Option.builder()
-                .type(String.class)
-                .longOpt("field-address")
-                .hasArg()
-                .desc("Field Address.")
-                .required()
-                .build());
-        options.addOption(
-            Option.builder()
-                .type(Integer.class)
-                .longOpt("polling-interval")
-                .hasArg()
-                .desc("Polling Interval (milliseconds).")
-                .required()
-                .build());
-
-        CommandLineParser parser = new DefaultParser();
-        CommandLine commandLine;
-        try {
-            commandLine = parser.parse(options, args);
-
-            String connectionString = commandLine.getOptionValue("connection-string");
-            String fieldAddress = commandLine.getOptionValue("field-address");
-            int pollingInterval = Integer.parseInt(commandLine.getOptionValue("polling-interval"));
-
-            return new CliOptions(connectionString, fieldAddress, pollingInterval);
-        } catch (ParseException e) {
-            System.err.println(e.getMessage());
-            return null;
-        }
-    }
-
-    public static void printHelp() {
-        HelpFormatter formatter = new HelpFormatter();
-        formatter.printHelp("PlcLogger", options);
-    }
-
-    public CliOptions(String connectionString, String fieldAddress, int pollingInterval) {
-        this.connectionString = connectionString;
-        this.fieldAddress = fieldAddress;
-        this.pollingInterval = pollingInterval;
-    }
-
-    public String getConnectionString() {
-        return connectionString;
-    }
-
-    public String getFieldAddress() {
-        return fieldAddress;
-    }
-
-    public int getPollingInterval() {
-        return pollingInterval;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.examples.integration.edgent;
+
+import org.apache.commons.cli.*;
+
+public class CliOptions {
+
+    private static Options options;
+
+    private final String connectionString;
+    private final String fieldAddress;
+    private final int pollingInterval;
+
+    public static CliOptions fromArgs(String[] args) {
+        options = new Options();
+        // Required arguments
+        options.addOption(
+            Option.builder()
+                .type(String.class)
+                .longOpt("connection-string")
+                .hasArg()
+                .desc("Connection String")
+                .required()
+                .build());
+        options.addOption(
+            Option.builder()
+                .type(String.class)
+                .longOpt("field-address")
+                .hasArg()
+                .desc("Field Address.")
+                .required()
+                .build());
+        options.addOption(
+            Option.builder()
+                .type(Integer.class)
+                .longOpt("polling-interval")
+                .hasArg()
+                .desc("Polling Interval (milliseconds).")
+                .required()
+                .build());
+
+        CommandLineParser parser = new DefaultParser();
+        CommandLine commandLine;
+        try {
+            commandLine = parser.parse(options, args);
+
+            String connectionString = commandLine.getOptionValue("connection-string");
+            String fieldAddress = commandLine.getOptionValue("field-address");
+            int pollingInterval = Integer.parseInt(commandLine.getOptionValue("polling-interval"));
+
+            return new CliOptions(connectionString, fieldAddress, pollingInterval);
+        } catch (ParseException e) {
+            System.err.println(e.getMessage());
+            return null;
+        }
+    }
+
+    public static void printHelp() {
+        HelpFormatter formatter = new HelpFormatter();
+        formatter.printHelp("PlcLogger", options);
+    }
+
+    public CliOptions(String connectionString, String fieldAddress, int pollingInterval) {
+        this.connectionString = connectionString;
+        this.fieldAddress = fieldAddress;
+        this.pollingInterval = pollingInterval;
+    }
+
+    public String getConnectionString() {
+        return connectionString;
+    }
+
+    public String getFieldAddress() {
+        return fieldAddress;
+    }
+
+    public int getPollingInterval() {
+        return pollingInterval;
+    }
+
+}
diff --git a/plc4j/examples/hello-integration-edgent/src/main/java/org/apache/plc4x/java/examples/integration/edgent/PlcLogger.java b/plc4j/examples/hello-integration-edgent/src/main/java/org/apache/plc4x/java/examples/integration/edgent/PlcLogger.java
index b1b5a130093..571057ce5b1 100644
--- a/plc4j/examples/hello-integration-edgent/src/main/java/org/apache/plc4x/java/examples/integration/edgent/PlcLogger.java
+++ b/plc4j/examples/hello-integration-edgent/src/main/java/org/apache/plc4x/java/examples/integration/edgent/PlcLogger.java
@@ -1,59 +1,59 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.examples.integration.edgent;
-
-import org.apache.edgent.function.Supplier;
-import org.apache.edgent.providers.direct.DirectProvider;
-import org.apache.edgent.topology.TStream;
-import org.apache.edgent.topology.Topology;
-import org.apache.plc4x.edgent.PlcConnectionAdapter;
-import org.apache.plc4x.edgent.PlcFunctions;
-
-import java.util.concurrent.TimeUnit;
-
-public class PlcLogger {
-
-    public static void main(String[] args) throws Exception {
-        CliOptions options = CliOptions.fromArgs(args);
-        if (options == null) {
-            CliOptions.printHelp();
-            // Could not parse.
-            System.exit(1);
-        }
-
-        // Get a plc connection.
-        try (PlcConnectionAdapter plcAdapter = new PlcConnectionAdapter(options.getConnectionString())) {
-            // Initialize the Edgent core.
-            DirectProvider dp = new DirectProvider();
-            Topology top = dp.newTopology();
-
-            // Define the event stream.
-            // 1) PLC4X source generating a stream of bytes.
-            Supplier<Byte> plcSupplier = PlcFunctions.byteSupplier(plcAdapter, options.getFieldAddress());
-            // 2) Use polling to get an item from the byte-stream in regular intervals.
-            TStream<Byte> source = top.poll(plcSupplier, options.getPollingInterval(), TimeUnit.MILLISECONDS);
-            // 3) Output the events in the stream on the console.
-            source.print();
-
-            // Submit the topology and hereby start the event streams.
-            dp.submit(top);
-        }
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.examples.integration.edgent;
+
+import org.apache.edgent.function.Supplier;
+import org.apache.edgent.providers.direct.DirectProvider;
+import org.apache.edgent.topology.TStream;
+import org.apache.edgent.topology.Topology;
+import org.apache.plc4x.edgent.PlcConnectionAdapter;
+import org.apache.plc4x.edgent.PlcFunctions;
+
+import java.util.concurrent.TimeUnit;
+
+public class PlcLogger {
+
+    public static void main(String[] args) throws Exception {
+        CliOptions options = CliOptions.fromArgs(args);
+        if (options == null) {
+            CliOptions.printHelp();
+            // Could not parse.
+            System.exit(1);
+        }
+
+        // Get a plc connection.
+        try (PlcConnectionAdapter plcAdapter = new PlcConnectionAdapter(options.getConnectionString())) {
+            // Initialize the Edgent core.
+            DirectProvider dp = new DirectProvider();
+            Topology top = dp.newTopology();
+
+            // Define the event stream.
+            // 1) PLC4X source generating a stream of bytes.
+            Supplier<Byte> plcSupplier = PlcFunctions.byteSupplier(plcAdapter, options.getFieldAddress());
+            // 2) Use polling to get an item from the byte-stream in regular intervals.
+            TStream<Byte> source = top.poll(plcSupplier, options.getPollingInterval(), TimeUnit.MILLISECONDS);
+            // 3) Output the events in the stream on the console.
+            source.print();
+
+            // Submit the topology and hereby start the event streams.
+            dp.submit(top);
+        }
+    }
+
+}
diff --git a/plc4j/examples/hello-integration-edgent/src/main/resources/logback.xml b/plc4j/examples/hello-integration-edgent/src/main/resources/logback.xml
index 27d40c0c608..514ad8a176b 100644
--- a/plc4j/examples/hello-integration-edgent/src/main/resources/logback.xml
+++ b/plc4j/examples/hello-integration-edgent/src/main/resources/logback.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoders are assigned the type
-         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="info">
-    <appender-ref ref="STDOUT" />
-  </root>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="info">
+    <appender-ref ref="STDOUT" />
+  </root>
+
 </configuration>
\ No newline at end of file
diff --git a/plc4j/examples/hello-integration-iotdb/pom.xml b/plc4j/examples/hello-integration-iotdb/pom.xml
index 4d4ddfaaec9..44a0a714059 100644
--- a/plc4j/examples/hello-integration-iotdb/pom.xml
+++ b/plc4j/examples/hello-integration-iotdb/pom.xml
@@ -1,136 +1,136 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.examples</groupId>
-    <artifactId>plc4j-examples</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-hello-integration-iotdb</artifactId>
-  <name>PLC4J: Examples: IoTDB</name>
-  <description>Application using Edgent to output PLC data to the IoTDB.</description>
-
-  <properties>
-    <app.main.class>org.apache.plc4x.java.examples.integration.iotdb.PlcLogger</app.main.class>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-apache-edgent</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.edgent</groupId>
-      <artifactId>edgent-api-function</artifactId>
-      <version>1.2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.edgent</groupId>
-      <artifactId>edgent-api-topology</artifactId>
-      <version>1.2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.edgent</groupId>
-      <artifactId>edgent-providers-direct</artifactId>
-      <version>1.2.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-      <version>1.4</version>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-    </dependency>
-
-    <!-- Required driver implementation -->
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ads</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ethernet-ip</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-modbus</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-opcua</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-s7</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-simulated</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-
-    <!-- iotdb -->
-    <dependency>
-      <groupId>org.apache.iotdb</groupId>
-      <artifactId>iotdb-jdbc</artifactId>
-      <version>0.8.1</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <usedDependencies>
-            <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
-          </usedDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.examples</groupId>
+    <artifactId>plc4j-examples</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-hello-integration-iotdb</artifactId>
+  <name>PLC4J: Examples: IoTDB</name>
+  <description>Application using Edgent to output PLC data to the IoTDB.</description>
+
+  <properties>
+    <app.main.class>org.apache.plc4x.java.examples.integration.iotdb.PlcLogger</app.main.class>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-apache-edgent</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.edgent</groupId>
+      <artifactId>edgent-api-function</artifactId>
+      <version>1.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.edgent</groupId>
+      <artifactId>edgent-api-topology</artifactId>
+      <version>1.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.edgent</groupId>
+      <artifactId>edgent-providers-direct</artifactId>
+      <version>1.2.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <version>1.4</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+    </dependency>
+
+    <!-- Required driver implementation -->
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ads</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ethernet-ip</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-modbus</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-opcua</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-s7</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-simulated</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+
+    <!-- iotdb -->
+    <dependency>
+      <groupId>org.apache.iotdb</groupId>
+      <artifactId>iotdb-jdbc</artifactId>
+      <version>0.8.1</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <usedDependencies>
+            <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
+          </usedDependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/examples/hello-integration-iotdb/src/main/java/org/apache/plc4x/java/examples/integration/iotdb/CliOptions.java b/plc4j/examples/hello-integration-iotdb/src/main/java/org/apache/plc4x/java/examples/integration/iotdb/CliOptions.java
index cd6130253fc..395bdaa4a44 100644
--- a/plc4j/examples/hello-integration-iotdb/src/main/java/org/apache/plc4x/java/examples/integration/iotdb/CliOptions.java
+++ b/plc4j/examples/hello-integration-iotdb/src/main/java/org/apache/plc4x/java/examples/integration/iotdb/CliOptions.java
@@ -1,188 +1,188 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.examples.integration.iotdb;
-
-import org.apache.commons.cli.*;
-
-public class CliOptions {
-
-    private static Options options;
-
-    private final String connectionString;
-    private final String fieldAddress;
-    private final int pollingInterval;
-    private final String iotdbIpPort;
-    private final String user;
-    private final String password;
-    private final String storageGroup;
-    private final String device;
-    private final String datatype;
-
-    public static CliOptions fromArgs(String[] args) {
-        options = new Options();
-        // Required arguments
-        options.addOption(
-            Option.builder()
-                .type(String.class)
-                .longOpt("connection-string")
-                .hasArg()
-                .desc("Connection String")
-                .required()
-                .build());
-        options.addOption(
-            Option.builder()
-                .type(String.class)
-                .longOpt("field-address")
-                .hasArg()
-                .desc("Field Address.")
-                .required()
-                .build());
-        options.addOption(
-            Option.builder()
-                .type(Integer.class)
-                .longOpt("polling-interval")
-                .hasArg()
-                .desc("Polling Interval (milliseconds).")
-                .required()
-                .build());
-        options.addOption(
-            Option.builder()
-                .type(Integer.class)
-                .longOpt("iotdb-address")
-                .hasArg()
-                .desc("The address and port of IoTDB server. format: ip:port")
-                .required()
-                .build());
-        options.addOption(
-            Option.builder()
-                .type(Integer.class)
-                .longOpt("iotdb-user-name")
-                .hasArg()
-                .desc("The connection user that has privilege to write data into IoTDB")
-                .required()
-                .build());
-        options.addOption(
-            Option.builder()
-                .type(Integer.class)
-                .longOpt("iotdb-user-password")
-                .hasArg()
-                .desc("The connection user password that has privilege to write data into IoTDB")
-                .required()
-                .build());
-        options.addOption(
-            Option.builder()
-                .type(Integer.class)
-                .longOpt("iotdb-sg")
-                .hasArg()
-                .desc("The Storage group name, e.g., testapp")
-                .required()
-                .build());
-        options.addOption(
-            Option.builder()
-                .type(Integer.class)
-                .longOpt("iotdb-device")
-                .hasArg()
-                .desc("The device name, e.g., mitsubishi.D58501")
-                .required()
-                .build());
-        options.addOption(
-            Option.builder()
-                .type(Integer.class)
-                .longOpt("iotdb-datatype")
-                .hasArg()
-                .desc("The data type of the field")
-                .required()
-                .build());
-
-        CommandLineParser parser = new DefaultParser();
-        CommandLine commandLine;
-        try {
-            commandLine = parser.parse(options, args);
-
-            String connectionString = commandLine.getOptionValue("connection-string");
-            String fieldAddress = commandLine.getOptionValue("field-address");
-            int pollingInterval = Integer.parseInt(commandLine.getOptionValue("polling-interval"));
-            String iotdbIpPort = commandLine.getOptionValue("iotdb-address");
-            String user = commandLine.getOptionValue("iotdb-user-name");
-            String password = commandLine.getOptionValue("iotdb-user-password");
-            String storageGroup = commandLine.getOptionValue("iotdb-sg");
-            String device = commandLine.getOptionValue("iotdb-device");
-            String datatype = commandLine.getOptionValue("iotdb-datatype");
-
-            return new CliOptions(connectionString, fieldAddress, pollingInterval, iotdbIpPort, user, password, storageGroup, device, datatype);
-        } catch (ParseException e) {
-            System.err.println(e.getMessage());
-            return null;
-        }
-    }
-
-    public static void printHelp() {
-        HelpFormatter formatter = new HelpFormatter();
-        formatter.printHelp("PlcLogger", options);
-    }
-
-    public CliOptions(String connectionString, String fieldAddress, int pollingInterval, String iotdbIpPort, String user, String password, String storageGroup, String device, String datatype) {
-        this.connectionString = connectionString;
-        this.fieldAddress = fieldAddress;
-        this.pollingInterval = pollingInterval;
-        this.iotdbIpPort = iotdbIpPort;
-        this.user = user;
-        this.password = password;
-        this.storageGroup = storageGroup;
-        this.device = device;
-        this.datatype = datatype;
-    }
-
-    public String getConnectionString() {
-        return connectionString;
-    }
-
-    public String getFieldAddress() {
-        return fieldAddress;
-    }
-
-    public int getPollingInterval() {
-        return pollingInterval;
-    }
-
-    public String getIotdbIpPort() {
-        return iotdbIpPort;
-    }
-
-    public String getUser() {
-        return user;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public String getStorageGroup() {
-        return storageGroup;
-    }
-
-    public String getDevice() {
-        return device;
-    }
-
-    public String getDatatype() {
-        return datatype;
-    }
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.examples.integration.iotdb;
+
+import org.apache.commons.cli.*;
+
+public class CliOptions {
+
+    private static Options options;
+
+    private final String connectionString;
+    private final String fieldAddress;
+    private final int pollingInterval;
+    private final String iotdbIpPort;
+    private final String user;
+    private final String password;
+    private final String storageGroup;
+    private final String device;
+    private final String datatype;
+
+    public static CliOptions fromArgs(String[] args) {
+        options = new Options();
+        // Required arguments
+        options.addOption(
+            Option.builder()
+                .type(String.class)
+                .longOpt("connection-string")
+                .hasArg()
+                .desc("Connection String")
+                .required()
+                .build());
+        options.addOption(
+            Option.builder()
+                .type(String.class)
+                .longOpt("field-address")
+                .hasArg()
+                .desc("Field Address.")
+                .required()
+                .build());
+        options.addOption(
+            Option.builder()
+                .type(Integer.class)
+                .longOpt("polling-interval")
+                .hasArg()
+                .desc("Polling Interval (milliseconds).")
+                .required()
+                .build());
+        options.addOption(
+            Option.builder()
+                .type(Integer.class)
+                .longOpt("iotdb-address")
+                .hasArg()
+                .desc("The address and port of IoTDB server. format: ip:port")
+                .required()
+                .build());
+        options.addOption(
+            Option.builder()
+                .type(Integer.class)
+                .longOpt("iotdb-user-name")
+                .hasArg()
+                .desc("The connection user that has privilege to write data into IoTDB")
+                .required()
+                .build());
+        options.addOption(
+            Option.builder()
+                .type(Integer.class)
+                .longOpt("iotdb-user-password")
+                .hasArg()
+                .desc("The connection user password that has privilege to write data into IoTDB")
+                .required()
+                .build());
+        options.addOption(
+            Option.builder()
+                .type(Integer.class)
+                .longOpt("iotdb-sg")
+                .hasArg()
+                .desc("The Storage group name, e.g., testapp")
+                .required()
+                .build());
+        options.addOption(
+            Option.builder()
+                .type(Integer.class)
+                .longOpt("iotdb-device")
+                .hasArg()
+                .desc("The device name, e.g., mitsubishi.D58501")
+                .required()
+                .build());
+        options.addOption(
+            Option.builder()
+                .type(Integer.class)
+                .longOpt("iotdb-datatype")
+                .hasArg()
+                .desc("The data type of the field")
+                .required()
+                .build());
+
+        CommandLineParser parser = new DefaultParser();
+        CommandLine commandLine;
+        try {
+            commandLine = parser.parse(options, args);
+
+            String connectionString = commandLine.getOptionValue("connection-string");
+            String fieldAddress = commandLine.getOptionValue("field-address");
+            int pollingInterval = Integer.parseInt(commandLine.getOptionValue("polling-interval"));
+            String iotdbIpPort = commandLine.getOptionValue("iotdb-address");
+            String user = commandLine.getOptionValue("iotdb-user-name");
+            String password = commandLine.getOptionValue("iotdb-user-password");
+            String storageGroup = commandLine.getOptionValue("iotdb-sg");
+            String device = commandLine.getOptionValue("iotdb-device");
+            String datatype = commandLine.getOptionValue("iotdb-datatype");
+
+            return new CliOptions(connectionString, fieldAddress, pollingInterval, iotdbIpPort, user, password, storageGroup, device, datatype);
+        } catch (ParseException e) {
+            System.err.println(e.getMessage());
+            return null;
+        }
+    }
+
+    public static void printHelp() {
+        HelpFormatter formatter = new HelpFormatter();
+        formatter.printHelp("PlcLogger", options);
+    }
+
+    public CliOptions(String connectionString, String fieldAddress, int pollingInterval, String iotdbIpPort, String user, String password, String storageGroup, String device, String datatype) {
+        this.connectionString = connectionString;
+        this.fieldAddress = fieldAddress;
+        this.pollingInterval = pollingInterval;
+        this.iotdbIpPort = iotdbIpPort;
+        this.user = user;
+        this.password = password;
+        this.storageGroup = storageGroup;
+        this.device = device;
+        this.datatype = datatype;
+    }
+
+    public String getConnectionString() {
+        return connectionString;
+    }
+
+    public String getFieldAddress() {
+        return fieldAddress;
+    }
+
+    public int getPollingInterval() {
+        return pollingInterval;
+    }
+
+    public String getIotdbIpPort() {
+        return iotdbIpPort;
+    }
+
+    public String getUser() {
+        return user;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public String getStorageGroup() {
+        return storageGroup;
+    }
+
+    public String getDevice() {
+        return device;
+    }
+
+    public String getDatatype() {
+        return datatype;
+    }
+}
diff --git a/plc4j/examples/hello-integration-iotdb/src/main/java/org/apache/plc4x/java/examples/integration/iotdb/PlcLogger.java b/plc4j/examples/hello-integration-iotdb/src/main/java/org/apache/plc4x/java/examples/integration/iotdb/PlcLogger.java
index e7aa9b6e9cd..6ef7d5e79d3 100644
--- a/plc4j/examples/hello-integration-iotdb/src/main/java/org/apache/plc4x/java/examples/integration/iotdb/PlcLogger.java
+++ b/plc4j/examples/hello-integration-iotdb/src/main/java/org/apache/plc4x/java/examples/integration/iotdb/PlcLogger.java
@@ -1,139 +1,139 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.examples.integration.iotdb;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import org.apache.edgent.function.Supplier;
-import org.apache.edgent.providers.direct.DirectProvider;
-import org.apache.edgent.topology.TStream;
-import org.apache.edgent.topology.Topology;
-import org.apache.iotdb.jdbc.IoTDBSQLException;
-import org.apache.plc4x.edgent.PlcConnectionAdapter;
-import org.apache.plc4x.edgent.PlcFunctions;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * using this example, you can store data one by one into IoTDB.
- *
- * modified according to hello-integration-edgent
- *
- * arguments example:
- * --connection-string test://127.0.0.1 --field-address RANDOM/foo:BYTE  --polling-interval 1000
- * --iotdb-address 127.0.0.1:6667 --iotdb-user-name root --iotdb-user-password root --iotdb-sg mi
- * --iotdb-device d1 --iotdb-datatype INT32
- */
-public class PlcLogger {
-
-    //IoTDB JDBC connection
-    static Connection connection;
-
-    //IoTDB JDBC Statement
-    static Statement statement;
-
-    //Time series ID
-    static String timeSeries;
-
-    //device ID
-    static String deviceId;
-
-    //sensor ID
-    static String sensor;
-
-    public static void main(String[] args) throws Exception {
-        CliOptions options = CliOptions.fromArgs(args);
-        if (options == null) {
-            CliOptions.printHelp();
-            // Could not parse.
-            System.exit(1);
-        }
-
-        deviceId = String.format("root.%s.%s", options.getStorageGroup(), options.getDevice());
-        sensor = options.getFieldAddress().replace("/", "_").replace(":", "_");
-        timeSeries = String.format("%s.%s", deviceId, sensor);
-
-        // Get IoTDB connection
-        Class.forName("org.apache.iotdb.jdbc.IoTDBDriver");
-        connection = DriverManager.getConnection("jdbc:iotdb://" + options.getIotdbIpPort()+"/",
-            options.getUser(), options.getPassword());
-        statement = connection.createStatement();
-
-        //as we do not know whether the storage group is created or not, we can init the storage
-        // group in force.
-        try {
-            statement.execute("SET STORAGE GROUP TO root." + options.getStorageGroup());
-        } catch (IoTDBSQLException e) {
-            //from v0.9.0, you can use the error code to check whether the sg exists.
-            System.err.println(e.getMessage());
-        }
-
-        //before IoTDB v0.9, we have to create timeseries manually
-        try {
-            statement.execute(String.format("CREATE TIMESERIES %s WITH DATATYPE=%s, ENCODING=RLE",
-                timeSeries, options.getDatatype()));
-        } catch (IoTDBSQLException e) {
-            //from v0.9.0, you can use the error code to check whether the time series exists.
-            System.err.println(e.getMessage());
-        }
-
-        // Get a plc connection.
-        try (PlcConnectionAdapter plcAdapter = new PlcConnectionAdapter(options.getConnectionString())) {
-            // Initialize the Edgent core.
-            DirectProvider dp = new DirectProvider();
-            Topology top = dp.newTopology();
-
-            // Define the event stream.
-            // 1) PLC4X source generating a stream of bytes.
-            Supplier<Byte> plcSupplier = PlcFunctions.byteSupplier(plcAdapter,
-                options.getFieldAddress());
-            // 2) Use polling to get an item from the byte-stream in regular intervals.
-            TStream<Byte> source = top.poll(plcSupplier, options.getPollingInterval(),
-                TimeUnit.MILLISECONDS);
-            // 3) Output the events in the stream to IoTDB.
-            source.peek(x->storeData(x));
-
-            // Submit the topology and hereby start the event streams.
-            dp.submit(top);
-        }
-        //close IoTDB client.
-        Runtime.getRuntime().addShutdownHook(new Thread() {
-            public void run() {
-                try {
-                    connection.close();
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-            }
-        });
-    }
-
-    private static void storeData(Byte x) {
-        try {
-            statement.execute(String.format("insert into %s  (timestamp, %s) values (%d, %s)",
-                deviceId, sensor, System.currentTimeMillis(), x.byteValue()+""));
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.examples.integration.iotdb;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import org.apache.edgent.function.Supplier;
+import org.apache.edgent.providers.direct.DirectProvider;
+import org.apache.edgent.topology.TStream;
+import org.apache.edgent.topology.Topology;
+import org.apache.iotdb.jdbc.IoTDBSQLException;
+import org.apache.plc4x.edgent.PlcConnectionAdapter;
+import org.apache.plc4x.edgent.PlcFunctions;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * using this example, you can store data one by one into IoTDB.
+ *
+ * modified according to hello-integration-edgent
+ *
+ * arguments example:
+ * --connection-string test://127.0.0.1 --field-address RANDOM/foo:BYTE  --polling-interval 1000
+ * --iotdb-address 127.0.0.1:6667 --iotdb-user-name root --iotdb-user-password root --iotdb-sg mi
+ * --iotdb-device d1 --iotdb-datatype INT32
+ */
+public class PlcLogger {
+
+    //IoTDB JDBC connection
+    static Connection connection;
+
+    //IoTDB JDBC Statement
+    static Statement statement;
+
+    //Time series ID
+    static String timeSeries;
+
+    //device ID
+    static String deviceId;
+
+    //sensor ID
+    static String sensor;
+
+    public static void main(String[] args) throws Exception {
+        CliOptions options = CliOptions.fromArgs(args);
+        if (options == null) {
+            CliOptions.printHelp();
+            // Could not parse.
+            System.exit(1);
+        }
+
+        deviceId = String.format("root.%s.%s", options.getStorageGroup(), options.getDevice());
+        sensor = options.getFieldAddress().replace("/", "_").replace(":", "_");
+        timeSeries = String.format("%s.%s", deviceId, sensor);
+
+        // Get IoTDB connection
+        Class.forName("org.apache.iotdb.jdbc.IoTDBDriver");
+        connection = DriverManager.getConnection("jdbc:iotdb://" + options.getIotdbIpPort()+"/",
+            options.getUser(), options.getPassword());
+        statement = connection.createStatement();
+
+        //as we do not know whether the storage group is created or not, we can init the storage
+        // group in force.
+        try {
+            statement.execute("SET STORAGE GROUP TO root." + options.getStorageGroup());
+        } catch (IoTDBSQLException e) {
+            //from v0.9.0, you can use the error code to check whether the sg exists.
+            System.err.println(e.getMessage());
+        }
+
+        //before IoTDB v0.9, we have to create timeseries manually
+        try {
+            statement.execute(String.format("CREATE TIMESERIES %s WITH DATATYPE=%s, ENCODING=RLE",
+                timeSeries, options.getDatatype()));
+        } catch (IoTDBSQLException e) {
+            //from v0.9.0, you can use the error code to check whether the time series exists.
+            System.err.println(e.getMessage());
+        }
+
+        // Get a plc connection.
+        try (PlcConnectionAdapter plcAdapter = new PlcConnectionAdapter(options.getConnectionString())) {
+            // Initialize the Edgent core.
+            DirectProvider dp = new DirectProvider();
+            Topology top = dp.newTopology();
+
+            // Define the event stream.
+            // 1) PLC4X source generating a stream of bytes.
+            Supplier<Byte> plcSupplier = PlcFunctions.byteSupplier(plcAdapter,
+                options.getFieldAddress());
+            // 2) Use polling to get an item from the byte-stream in regular intervals.
+            TStream<Byte> source = top.poll(plcSupplier, options.getPollingInterval(),
+                TimeUnit.MILLISECONDS);
+            // 3) Output the events in the stream to IoTDB.
+            source.peek(x->storeData(x));
+
+            // Submit the topology and hereby start the event streams.
+            dp.submit(top);
+        }
+        //close IoTDB client.
+        Runtime.getRuntime().addShutdownHook(new Thread() {
+            public void run() {
+                try {
+                    connection.close();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
+    private static void storeData(Byte x) {
+        try {
+            statement.execute(String.format("insert into %s  (timestamp, %s) values (%d, %s)",
+                deviceId, sensor, System.currentTimeMillis(), x.byteValue()+""));
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+}
diff --git a/plc4j/examples/hello-integration-iotdb/src/main/resources/logback.xml b/plc4j/examples/hello-integration-iotdb/src/main/resources/logback.xml
index 27d40c0c608..514ad8a176b 100644
--- a/plc4j/examples/hello-integration-iotdb/src/main/resources/logback.xml
+++ b/plc4j/examples/hello-integration-iotdb/src/main/resources/logback.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoders are assigned the type
-         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="info">
-    <appender-ref ref="STDOUT" />
-  </root>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="info">
+    <appender-ref ref="STDOUT" />
+  </root>
+
 </configuration>
\ No newline at end of file
diff --git a/plc4j/examples/hello-opm/pom.xml b/plc4j/examples/hello-opm/pom.xml
index 456231683af..22648e0cfa0 100644
--- a/plc4j/examples/hello-opm/pom.xml
+++ b/plc4j/examples/hello-opm/pom.xml
@@ -1,123 +1,123 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.examples</groupId>
-    <artifactId>plc4j-examples</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-hello-opm</artifactId>
-  <name>PLC4J: Examples: Hello OPM</name>
-  <description>Hello World example of PLC4X using the OPM feature.</description>
-
-  <properties>
-    <app.main.class>org.apache.plc4x.java.examples.helloopm.HelloOpm</app.main.class>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-opm</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-connection-pool</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>log4j-over-slf4j</artifactId>
-      <version>1.7.25</version>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-    </dependency>
-
-    <!-- Required driver implementation -->
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ads</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ethernet-ip</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-modbus</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-opcua</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-s7</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-simulated</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <usedDependencies combine.children="append">
-            <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
-            <usedDependency>org.slf4j:log4j-over-slf4j</usedDependency>
-          </usedDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.examples</groupId>
+    <artifactId>plc4j-examples</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-hello-opm</artifactId>
+  <name>PLC4J: Examples: Hello OPM</name>
+  <description>Hello World example of PLC4X using the OPM feature.</description>
+
+  <properties>
+    <app.main.class>org.apache.plc4x.java.examples.helloopm.HelloOpm</app.main.class>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-opm</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-connection-pool</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.25</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+    </dependency>
+
+    <!-- Required driver implementation -->
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ads</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ethernet-ip</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-modbus</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-opcua</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-s7</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-simulated</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <usedDependencies combine.children="append">
+            <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
+            <usedDependency>org.slf4j:log4j-over-slf4j</usedDependency>
+          </usedDependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/examples/hello-opm/src/main/java/org/apache/plc4x/java/examples/helloopm/HelloOpm.java b/plc4j/examples/hello-opm/src/main/java/org/apache/plc4x/java/examples/helloopm/HelloOpm.java
index a843d7b568c..8742a985730 100644
--- a/plc4j/examples/hello-opm/src/main/java/org/apache/plc4x/java/examples/helloopm/HelloOpm.java
+++ b/plc4j/examples/hello-opm/src/main/java/org/apache/plc4x/java/examples/helloopm/HelloOpm.java
@@ -1,109 +1,109 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.examples.helloopm;
-
-import org.apache.plc4x.java.opm.OPMException;
-import org.apache.plc4x.java.opm.PlcEntity;
-import org.apache.plc4x.java.opm.PlcEntityManager;
-import org.apache.plc4x.java.opm.PlcField;
-import org.apache.plc4x.java.utils.connectionpool.PooledPlcDriverManager;
-
-/**
- * This Example shows how to use OPM from plc4j via the @{@link PlcEntityManager}.
- * A @{@link PooledPlcDriverManager} is used to optimize the acces and to allow for automatic reconnection.
- *
- * The {@link PlcEntityManager} is similar to JPAs EntityManager.
- * The "connected" Entity (shootCounter) can be kept and passed around and stays connected in the sense that all calls
- * to a getter are forwared to the PLC.
- * Finally, one can disconnect the Entity.
- *
- * This MT works against Tims S7 in NĆ¼rtingen.
- * Thus, parameters have to be tuned possibly to get "good" values.
- *
- * @author julian
- * Created by julian on 31.10.18
- */
-public class HelloOpm {
-
-    private static final String ADDRESS = "s7://192.168.167.210/0/0";
-    private static final String PLC_FIELD_ADDRESS = "%DB225.DBW0:INT";
-    private final PlcEntityManager entityManager;
-
-    public static void main(String[] args) throws OPMException {
-        HelloOpm helloOpm = new HelloOpm();
-        // Do a fetch via connected entity
-        helloOpm.readValueFromPlcUsingConnectedEntity();
-        // Do a fetch via read
-        helloOpm.readValueFromPlcUsingRead();
-        // Stop the application
-        System.exit(0);
-    }
-
-    public HelloOpm() {
-        entityManager = new PlcEntityManager(new PooledPlcDriverManager());
-    }
-
-    /**
-     * The {@link PlcEntityManager#connect(Class, String)} method returns a "connected" Entity, i.e., a proxy Object.
-     * Whenever a getter is called on the Proxy object (whose Field Variable is annotated with @{@link PlcEntity}
-     * a call to the PLC is made to fetch the value.
-     * If another method is called on the Entity all Fields are feched from the Plc first, and then the method is
-     * invoked.
-     *
-     * @throws OPMException
-     */
-    public void readValueFromPlcUsingConnectedEntity() throws OPMException {
-        // Fetch connected Entity
-        DistanceSensor distanceSensor = entityManager.connect(DistanceSensor.class, ADDRESS);
-        // Read shoot values a hundred times
-        long distance = distanceSensor.getDistance();
-        System.out.println("Current distance: " + distance);
-        // Disconnect the Entity (not necessary)
-        entityManager.disconnect(distanceSensor);
-    }
-
-    /**
-     * The {@link PlcEntityManager#read(Class, String)} method fetches all fields annotated with @{@link PlcField}
-     * <b>once</b> and injects them in the new instance. After the constructing this is a regular POJO with no fancy
-     * functionality.
-     *
-     * @throws OPMException
-     */
-    public void readValueFromPlcUsingRead() throws OPMException {
-        // Read Entity from PLC
-        DistanceSensor distanceSensor = entityManager.read(DistanceSensor.class, ADDRESS);
-        System.out.println("Current distance: " + distanceSensor.getDistance());
-    }
-
-    /**
-     * Example entity which maps one field on a PLC where a Distance Sensor is connected.
-     */
-    @PlcEntity
-    public static class DistanceSensor {
-
-        @PlcField(PLC_FIELD_ADDRESS)
-        private long distance;
-
-        public long getDistance() {
-            return distance;
-        }
-
-    }
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.examples.helloopm;
+
+import org.apache.plc4x.java.opm.OPMException;
+import org.apache.plc4x.java.opm.PlcEntity;
+import org.apache.plc4x.java.opm.PlcEntityManager;
+import org.apache.plc4x.java.opm.PlcField;
+import org.apache.plc4x.java.utils.connectionpool.PooledPlcDriverManager;
+
+/**
+ * This Example shows how to use OPM from plc4j via the @{@link PlcEntityManager}.
+ * A @{@link PooledPlcDriverManager} is used to optimize the acces and to allow for automatic reconnection.
+ *
+ * The {@link PlcEntityManager} is similar to JPAs EntityManager.
+ * The "connected" Entity (shootCounter) can be kept and passed around and stays connected in the sense that all calls
+ * to a getter are forwared to the PLC.
+ * Finally, one can disconnect the Entity.
+ *
+ * This MT works against Tims S7 in NĆ¼rtingen.
+ * Thus, parameters have to be tuned possibly to get "good" values.
+ *
+ * @author julian
+ * Created by julian on 31.10.18
+ */
+public class HelloOpm {
+
+    private static final String ADDRESS = "s7://192.168.167.210/0/0";
+    private static final String PLC_FIELD_ADDRESS = "%DB225.DBW0:INT";
+    private final PlcEntityManager entityManager;
+
+    public static void main(String[] args) throws OPMException {
+        HelloOpm helloOpm = new HelloOpm();
+        // Do a fetch via connected entity
+        helloOpm.readValueFromPlcUsingConnectedEntity();
+        // Do a fetch via read
+        helloOpm.readValueFromPlcUsingRead();
+        // Stop the application
+        System.exit(0);
+    }
+
+    public HelloOpm() {
+        entityManager = new PlcEntityManager(new PooledPlcDriverManager());
+    }
+
+    /**
+     * The {@link PlcEntityManager#connect(Class, String)} method returns a "connected" Entity, i.e., a proxy Object.
+     * Whenever a getter is called on the Proxy object (whose Field Variable is annotated with @{@link PlcEntity}
+     * a call to the PLC is made to fetch the value.
+     * If another method is called on the Entity all Fields are feched from the Plc first, and then the method is
+     * invoked.
+     *
+     * @throws OPMException
+     */
+    public void readValueFromPlcUsingConnectedEntity() throws OPMException {
+        // Fetch connected Entity
+        DistanceSensor distanceSensor = entityManager.connect(DistanceSensor.class, ADDRESS);
+        // Read shoot values a hundred times
+        long distance = distanceSensor.getDistance();
+        System.out.println("Current distance: " + distance);
+        // Disconnect the Entity (not necessary)
+        entityManager.disconnect(distanceSensor);
+    }
+
+    /**
+     * The {@link PlcEntityManager#read(Class, String)} method fetches all fields annotated with @{@link PlcField}
+     * <b>once</b> and injects them in the new instance. After the constructing this is a regular POJO with no fancy
+     * functionality.
+     *
+     * @throws OPMException
+     */
+    public void readValueFromPlcUsingRead() throws OPMException {
+        // Read Entity from PLC
+        DistanceSensor distanceSensor = entityManager.read(DistanceSensor.class, ADDRESS);
+        System.out.println("Current distance: " + distanceSensor.getDistance());
+    }
+
+    /**
+     * Example entity which maps one field on a PLC where a Distance Sensor is connected.
+     */
+    @PlcEntity
+    public static class DistanceSensor {
+
+        @PlcField(PLC_FIELD_ADDRESS)
+        private long distance;
+
+        public long getDistance() {
+            return distance;
+        }
+
+    }
 }
\ No newline at end of file
diff --git a/plc4j/examples/hello-opm/src/main/resources/logback.xml b/plc4j/examples/hello-opm/src/main/resources/logback.xml
index 27d40c0c608..514ad8a176b 100644
--- a/plc4j/examples/hello-opm/src/main/resources/logback.xml
+++ b/plc4j/examples/hello-opm/src/main/resources/logback.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoders are assigned the type
-         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="info">
-    <appender-ref ref="STDOUT" />
-  </root>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="info">
+    <appender-ref ref="STDOUT" />
+  </root>
+
 </configuration>
\ No newline at end of file
diff --git a/plc4j/examples/hello-storage-elasticsearch/README.adoc b/plc4j/examples/hello-storage-elasticsearch/README.adoc
index 869730fafbc..e5069ff434a 100644
--- a/plc4j/examples/hello-storage-elasticsearch/README.adoc
+++ b/plc4j/examples/hello-storage-elasticsearch/README.adoc
@@ -1,66 +1,66 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== IoT Factory example
-
-In this example we will be running the full stack of tools for a rudimentary factory dashboard.
-
-This example however is everything but production ready.
-First of all we use create an Elasticsearch single node cluster embedded within the applications VM.
-Secondly we communicate with the `cluster` using the NodeClient, which is super-easy to use, but shouldn't be used in production type environments.
-
-We decided to go this path because this way it's super-easy to setup everything and running the example is nothing but starting a Java application.
-
-=== What else do I need?
-
-In General:
-- A PLC
-- A Factory
-
-Even if you might be able to get your hands on a PLC I doubt you have a spare factory available.
-
-This example is built to visualize a virtual factory simulated with https://factoryio.com/[Factory I/O].
-
-We have decided to stick with one of the on-board examples, to make it as easy as possible for you to reproduce.
-The example we used is: "Sorting by Height".
-
-Here's a video demonstrating this:
-https://www.youtube.com/watch?v=B0n8gT1vto4
-
-You can run this with a real PLC or use a PLC simulator.
-In our IoT lab we are currently running this with the real S7-1200.
-
-=== What happens in detail?
-
-When the application is started it first starts up an Elasticsearch node.
-
-After that is up and running, it checks if the indexes we are going to write to exist.
-
-If they don't and we would just have ES create them on the fly, we wouldn't be able to use the time-data in the time fields as they would be treated as numbers.
-
-Any non-existent indexes are created.
-
-After that an `Apache Edgent` instance is created and one stream is created to fetch the state of all 8 outputs of the PLC every 100ms.
-
-This stream is then split up.
-
-One branch simply dumps the data into the `factory-data` index.
-
-The second branch is a little more complex as it monitors the state of the left and right conveyors to extrapolate if a new `big` or `small box is being transported.
-
-Only when a new box is detected an entry is written into the `product-data` index.
-
+//
+//  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
+//
+//      http://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.
+//
+
+== IoT Factory example
+
+In this example we will be running the full stack of tools for a rudimentary factory dashboard.
+
+This example however is everything but production ready.
+First of all we use create an Elasticsearch single node cluster embedded within the applications VM.
+Secondly we communicate with the `cluster` using the NodeClient, which is super-easy to use, but shouldn't be used in production type environments.
+
+We decided to go this path because this way it's super-easy to setup everything and running the example is nothing but starting a Java application.
+
+=== What else do I need?
+
+In General:
+- A PLC
+- A Factory
+
+Even if you might be able to get your hands on a PLC I doubt you have a spare factory available.
+
+This example is built to visualize a virtual factory simulated with https://factoryio.com/[Factory I/O].
+
+We have decided to stick with one of the on-board examples, to make it as easy as possible for you to reproduce.
+The example we used is: "Sorting by Height".
+
+Here's a video demonstrating this:
+https://www.youtube.com/watch?v=B0n8gT1vto4
+
+You can run this with a real PLC or use a PLC simulator.
+In our IoT lab we are currently running this with the real S7-1200.
+
+=== What happens in detail?
+
+When the application is started it first starts up an Elasticsearch node.
+
+After that is up and running, it checks if the indexes we are going to write to exist.
+
+If they don't and we would just have ES create them on the fly, we wouldn't be able to use the time-data in the time fields as they would be treated as numbers.
+
+Any non-existent indexes are created.
+
+After that an `Apache Edgent` instance is created and one stream is created to fetch the state of all 8 outputs of the PLC every 100ms.
+
+This stream is then split up.
+
+One branch simply dumps the data into the `factory-data` index.
+
+The second branch is a little more complex as it monitors the state of the left and right conveyors to extrapolate if a new `big` or `small box is being transported.
+
+Only when a new box is detected an entry is written into the `product-data` index.
+
diff --git a/plc4j/examples/hello-storage-elasticsearch/pom.xml b/plc4j/examples/hello-storage-elasticsearch/pom.xml
index bbacca9e2f9..ab2d39fc4ea 100644
--- a/plc4j/examples/hello-storage-elasticsearch/pom.xml
+++ b/plc4j/examples/hello-storage-elasticsearch/pom.xml
@@ -1,193 +1,193 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.examples</groupId>
-    <artifactId>plc4j-examples</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-hello-storage-elasticsearch</artifactId>
-  <name>PLC4J: Examples: Storage: ElasticSearch</name>
-  <description>Client application demonstrating PLC4X in our virtual IoT Factory using ElasticSearch.</description>
-
-  <properties>
-    <app.main.class>org.apache.plc4x.java.examples.storage.elasticsearch.ElasticsearchStorage</app.main.class>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-apache-edgent</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-      <version>1.4</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.edgent</groupId>
-      <artifactId>edgent-api-function</artifactId>
-      <version>1.2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.edgent</groupId>
-      <artifactId>edgent-api-topology</artifactId>
-      <version>1.2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.edgent</groupId>
-      <artifactId>edgent-providers-direct</artifactId>
-      <version>1.2.0</version>
-    </dependency>
-
-    <!-- Elasticsearch dependencies -->
-    <dependency>
-      <groupId>org.elasticsearch</groupId>
-      <artifactId>elasticsearch</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.elasticsearch</groupId>
-      <artifactId>elasticsearch-x-content</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.elasticsearch.plugin</groupId>
-      <artifactId>transport-netty4-client</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.locationtech.spatial4j</groupId>
-      <artifactId>spatial4j</artifactId>
-      <version>0.7</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
-      <version>2.11.2</version>
-    </dependency>
-
-    <!-- Required driver implementation -->
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ads</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ethernet-ip</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-modbus</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-opcua</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-s7</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-simulated</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <!-- Filter out some resources -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.1</version>
-        <executions>
-          <execution>
-            <id>generate-uber-jar</id>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <filters>
-                <filter>
-                  <artifact>*:*</artifact>
-                  <excludes>
-                    <exclude>META-INF/*.RSA</exclude>
-                    <exclude>META-INF/*.SF</exclude>
-                  </excludes>
-                </filter>
-              </filters>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <usedDependencies combine.children="append">
-            <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
-            <usedDependency>org.apache.logging.log4j:log4j-slf4j-impl</usedDependency>
-            <usedDependency>org.locationtech.spatial4j:spatial4j</usedDependency>
-          </usedDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.examples</groupId>
+    <artifactId>plc4j-examples</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-hello-storage-elasticsearch</artifactId>
+  <name>PLC4J: Examples: Storage: ElasticSearch</name>
+  <description>Client application demonstrating PLC4X in our virtual IoT Factory using ElasticSearch.</description>
+
+  <properties>
+    <app.main.class>org.apache.plc4x.java.examples.storage.elasticsearch.ElasticsearchStorage</app.main.class>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-apache-edgent</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <version>1.4</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.edgent</groupId>
+      <artifactId>edgent-api-function</artifactId>
+      <version>1.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.edgent</groupId>
+      <artifactId>edgent-api-topology</artifactId>
+      <version>1.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.edgent</groupId>
+      <artifactId>edgent-providers-direct</artifactId>
+      <version>1.2.0</version>
+    </dependency>
+
+    <!-- Elasticsearch dependencies -->
+    <dependency>
+      <groupId>org.elasticsearch</groupId>
+      <artifactId>elasticsearch</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.elasticsearch</groupId>
+      <artifactId>elasticsearch-x-content</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.elasticsearch.plugin</groupId>
+      <artifactId>transport-netty4-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.locationtech.spatial4j</groupId>
+      <artifactId>spatial4j</artifactId>
+      <version>0.7</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j-impl</artifactId>
+      <version>2.11.2</version>
+    </dependency>
+
+    <!-- Required driver implementation -->
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ads</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ethernet-ip</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-modbus</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-opcua</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-s7</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-simulated</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <!-- Filter out some resources -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.2.1</version>
+        <executions>
+          <execution>
+            <id>generate-uber-jar</id>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <filters>
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/*.RSA</exclude>
+                    <exclude>META-INF/*.SF</exclude>
+                  </excludes>
+                </filter>
+              </filters>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <usedDependencies combine.children="append">
+            <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
+            <usedDependency>org.apache.logging.log4j:log4j-slf4j-impl</usedDependency>
+            <usedDependency>org.locationtech.spatial4j:spatial4j</usedDependency>
+          </usedDependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/examples/hello-storage-elasticsearch/src/main/java/org/apache/plc4x/java/examples/storage/elasticsearch/CliOptions.java b/plc4j/examples/hello-storage-elasticsearch/src/main/java/org/apache/plc4x/java/examples/storage/elasticsearch/CliOptions.java
index 77b3107bc47..51078d8ba51 100644
--- a/plc4j/examples/hello-storage-elasticsearch/src/main/java/org/apache/plc4x/java/examples/storage/elasticsearch/CliOptions.java
+++ b/plc4j/examples/hello-storage-elasticsearch/src/main/java/org/apache/plc4x/java/examples/storage/elasticsearch/CliOptions.java
@@ -1,82 +1,82 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.examples.storage.elasticsearch;
-
-
-import org.apache.commons.cli.*;
-
-public class CliOptions {
-
-    private static Options options;
-
-    private final String plc4xConnectionString;
-    private final String plc4xFieldAddress;
-
-    public static CliOptions fromArgs(String[] args) {
-        options = new Options();
-        // Required arguments
-        options.addOption(
-            Option.builder()
-                .type(String.class)
-                .longOpt("plc4x-connection-string")
-                .hasArg()
-                .desc("Connection String")
-                .build());
-        options.addOption(
-            Option.builder()
-                .type(String.class)
-                .longOpt("plc4x-field-address")
-                .hasArg()
-                .desc("Field Address")
-                .build());
-
-        CommandLineParser parser = new DefaultParser();
-        CommandLine commandLine;
-        try {
-            commandLine = parser.parse(options, args);
-
-            String plc4xConnectionString = commandLine.getOptionValue("plc4x-connection-string");
-            String plc4xFieldAddress = commandLine.getOptionValue("plc4x-field-address");
-
-            return new CliOptions(plc4xConnectionString, plc4xFieldAddress);
-        } catch (ParseException e) {
-            System.err.println(e.getMessage());
-            return null;
-        }
-    }
-
-    public static void printHelp() {
-        HelpFormatter formatter = new HelpFormatter();
-        formatter.printHelp("S7PlcToElasticSearchSample", options);
-    }
-
-    public CliOptions(String plc4xConnectionString, String plc4xFieldAddress) {
-        this.plc4xConnectionString = plc4xConnectionString != null ? plc4xConnectionString : "s7://10.10.64.20/1/1";
-        this.plc4xFieldAddress = plc4xFieldAddress != null ? plc4xFieldAddress : "%Q0:BYTE";
-    }
-
-    public String getPlc4xConnectionString() {
-        return plc4xConnectionString;
-    }
-
-    public String getPlc4xFieldAddress() {
-        return plc4xFieldAddress;
-    }
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.examples.storage.elasticsearch;
+
+
+import org.apache.commons.cli.*;
+
+public class CliOptions {
+
+    private static Options options;
+
+    private final String plc4xConnectionString;
+    private final String plc4xFieldAddress;
+
+    public static CliOptions fromArgs(String[] args) {
+        options = new Options();
+        // Required arguments
+        options.addOption(
+            Option.builder()
+                .type(String.class)
+                .longOpt("plc4x-connection-string")
+                .hasArg()
+                .desc("Connection String")
+                .build());
+        options.addOption(
+            Option.builder()
+                .type(String.class)
+                .longOpt("plc4x-field-address")
+                .hasArg()
+                .desc("Field Address")
+                .build());
+
+        CommandLineParser parser = new DefaultParser();
+        CommandLine commandLine;
+        try {
+            commandLine = parser.parse(options, args);
+
+            String plc4xConnectionString = commandLine.getOptionValue("plc4x-connection-string");
+            String plc4xFieldAddress = commandLine.getOptionValue("plc4x-field-address");
+
+            return new CliOptions(plc4xConnectionString, plc4xFieldAddress);
+        } catch (ParseException e) {
+            System.err.println(e.getMessage());
+            return null;
+        }
+    }
+
+    public static void printHelp() {
+        HelpFormatter formatter = new HelpFormatter();
+        formatter.printHelp("S7PlcToElasticSearchSample", options);
+    }
+
+    public CliOptions(String plc4xConnectionString, String plc4xFieldAddress) {
+        this.plc4xConnectionString = plc4xConnectionString != null ? plc4xConnectionString : "s7://10.10.64.20/1/1";
+        this.plc4xFieldAddress = plc4xFieldAddress != null ? plc4xFieldAddress : "%Q0:BYTE";
+    }
+
+    public String getPlc4xConnectionString() {
+        return plc4xConnectionString;
+    }
+
+    public String getPlc4xFieldAddress() {
+        return plc4xFieldAddress;
+    }
 }
\ No newline at end of file
diff --git a/plc4j/examples/hello-storage-elasticsearch/src/main/java/org/apache/plc4x/java/examples/storage/elasticsearch/ElasticsearchStorage.java b/plc4j/examples/hello-storage-elasticsearch/src/main/java/org/apache/plc4x/java/examples/storage/elasticsearch/ElasticsearchStorage.java
index 88e66f5a98b..38c4a9ba938 100644
--- a/plc4j/examples/hello-storage-elasticsearch/src/main/java/org/apache/plc4x/java/examples/storage/elasticsearch/ElasticsearchStorage.java
+++ b/plc4j/examples/hello-storage-elasticsearch/src/main/java/org/apache/plc4x/java/examples/storage/elasticsearch/ElasticsearchStorage.java
@@ -1,267 +1,267 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.examples.storage.elasticsearch;
-
-import org.apache.edgent.function.Supplier;
-import org.apache.edgent.providers.direct.DirectProvider;
-import org.apache.edgent.topology.TStream;
-import org.apache.edgent.topology.Topology;
-import org.apache.plc4x.edgent.PlcConnectionAdapter;
-import org.apache.plc4x.edgent.PlcFunctions;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
-import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
-import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequest;
-import org.elasticsearch.action.index.IndexResponse;
-import org.elasticsearch.client.Client;
-import org.elasticsearch.client.IndicesAdminClient;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentFactory;
-import org.elasticsearch.common.xcontent.XContentType;
-import org.elasticsearch.node.InternalSettingsPreparer;
-import org.elasticsearch.node.Node;
-import org.elasticsearch.node.NodeValidationException;
-import org.elasticsearch.plugins.Plugin;
-import org.elasticsearch.transport.Netty4Plugin;
-
-import java.io.IOException;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-public class ElasticsearchStorage {
-    private static CliOptions options;
-
-    public enum ConveyorState {
-        STOPPED,
-        RUNNING_LEFT,
-        RUNNING_RIGHT
-    }
-
-    private static class IotElasticsearchFactoryException extends RuntimeException {
-        private IotElasticsearchFactoryException(String message) {
-            super(message);
-        }
-        private IotElasticsearchFactoryException(String message, Throwable cause) {
-            super(message, cause);
-        }
-    }
-
-    private static class MyNode extends Node {
-        private MyNode(Settings preparedSettings, Collection<Class<? extends Plugin>> classpathPlugins) {
-            super(InternalSettingsPreparer.prepareEnvironment(
-                preparedSettings, Collections.emptyMap(), null, () -> "hello-es"), classpathPlugins, true);
-        }
-    }
-
-    private ConveyorState conveyorState = ConveyorState.STOPPED;
-
-    private Node startElasticsearchNode() {
-        try {
-            Node node = new MyNode(Settings.builder()
-                .put("transport.type", "netty4")
-                .put("http.type", "netty4")
-                .put("http.cors.enabled", "true")
-                .put("path.home", "elasticsearch-data")
-                .put("network.host", "0.0.0.0")
-                .build(), Collections.singletonList(Netty4Plugin.class));
-            node.start();
-            return node;
-        } catch (NodeValidationException e) {
-            throw new IotElasticsearchFactoryException("Could not start Elasticsearch node.", e);
-        }
-    }
-
-    private void prepareIndexes(Client esClient) {
-        IndicesAdminClient indicesAdminClient = esClient.admin().indices();
-
-        // Check if the factory-data index exists and create it, if it doesn't.
-        IndicesExistsRequest factoryDataIndexExistsRequest =
-            indicesAdminClient.prepareExists("iot-factory-data").request();
-        if(!indicesAdminClient.exists(factoryDataIndexExistsRequest).actionGet().isExists()) {
-            CreateIndexRequest createIndexRequest = new CreateIndexRequest("iot-factory-data");
-            createIndexRequest.mapping("FactoryData",
-                "{\n" +
-                    "            \"properties\": {\n" +
-                    "                \"time\": {\n" +
-                    "                    \"type\": \"date\"\n" +
-                    "                }\n" +
-                    "            }\n" +
-                    "        }", XContentType.JSON);
-            CreateIndexResponse createIndexResponse = indicesAdminClient.create(createIndexRequest).actionGet();
-            if(!createIndexResponse.isAcknowledged()) {
-                throw new IotElasticsearchFactoryException("Could not create index 'iot-factory-data'");
-            }
-        }
-
-        // Check if the product-data index exists and create it, if it doesn't.
-        IndicesExistsRequest productDataIndexExistsRequest =
-            indicesAdminClient.prepareExists("iot-product-data").request();
-        if(!indicesAdminClient.exists(productDataIndexExistsRequest).actionGet().isExists()) {
-            CreateIndexRequest createIndexRequest = new CreateIndexRequest("iot-product-data");
-            createIndexRequest.mapping("ProductData",
-                "{\n" +
-                    "            \"properties\": {\n" +
-                    "                \"time\": {\n" +
-                    "                    \"type\": \"date\"\n" +
-                    "                },\n" +
-                    "                \"type\": {\n" +
-                    "                    \"type\": \"keyword\"\n" +
-                    "                }\n" +
-                    "            }\n" +
-                    "        }", XContentType.JSON);
-            CreateIndexResponse createIndexResponse = indicesAdminClient.create(createIndexRequest).actionGet();
-            if(!createIndexResponse.isAcknowledged()) {
-                throw new IotElasticsearchFactoryException("Could not create index 'iot-product-data'");
-            }
-        }
-    }
-
-    private void runFactory() {
-        // Start an Elasticsearch node.
-        Node esNode = startElasticsearchNode();
-        Client esClient = esNode.client();
-        // Register a shutdown hook.
-        final Thread mainThread = Thread.currentThread();
-        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
-            try {
-                esNode.close();
-                mainThread.join();
-            } catch (IOException | InterruptedException e) {
-                throw new PlcRuntimeException("Error closing ES Node", e);
-            }
-        }));
-        System.out.println("Started Elasticsearch node on port 9200");
-
-        // Make sure the indexes exist prior to writing to them.
-        prepareIndexes(esClient);
-
-        // Get a plc connection.
-        try (PlcConnectionAdapter plcAdapter = new PlcConnectionAdapter(options.getPlc4xConnectionString())) {
-            // Initialize the Edgent core.
-            DirectProvider dp = new DirectProvider();
-            Topology top = dp.newTopology();
-
-            // Define the event stream.
-            // 1) PLC4X source generating a stream of bytes.
-            Supplier<List<Boolean>> plcSupplier = PlcFunctions.booleanListSupplier(plcAdapter,
-                options.getPlc4xFieldAddress());
-            // 2) Use polling to get an item from the byte-stream in regular intervals.
-            TStream<List<Boolean>> plcOutputStates = top.poll(plcSupplier, 100, TimeUnit.MILLISECONDS);
-
-            // 3a) Create a stream that pumps all data into a 'factory-data' index.
-            TStream<XContentBuilder> factoryData = plcOutputStates.map(this::translatePlcInput);
-            TStream<IndexResponse> factoryDataResponses = factoryData.map(
-                value -> esClient.prepareIndex("iot-factory-data", "FactoryData").setSource(value).get());
-            factoryDataResponses.print();
-
-            // 3b) Create a stream that does some local analysis to detect big and small boxes and to only output
-            //     something to the 'product-data' index, if a new item is detected.
-            TStream<XContentBuilder> productData = plcOutputStates.map(this::handlePlcInput);
-            TStream<IndexResponse> productDataResponses = productData.map(
-                value -> esClient.prepareIndex("iot-product-data", "ProductData").setSource(value).get());
-            productDataResponses.print();
-
-            // Submit the topology and hereby start the event streams.
-            dp.submit(top);
-        } catch (Exception e) {
-            throw new IotElasticsearchFactoryException("Error while connecting or disconnecting from the PLC.", e);
-        }
-    }
-
-    private XContentBuilder translatePlcInput(List<Boolean> input) {
-        boolean conveyorEntry = input.get(0);
-        boolean load = input.get(1);
-        boolean unload = input.get(2);
-        boolean transferLeft = input.get(3);
-        boolean transferRight = input.get(4);
-        boolean conveyorLeft = input.get(5);
-        boolean conveyorRight = input.get(6);
-
-        try(XContentBuilder builder = XContentFactory.jsonBuilder()
-            .startObject()
-            .field("time", Calendar.getInstance().getTimeInMillis())
-            .field("conveyorEntry", conveyorEntry)
-            .field("load", load)
-            .field( "unload", unload)
-            .field( "transferLeft", transferLeft)
-            .field( "transferRight", transferRight)
-            .field( "conveyorLeft", conveyorLeft)
-            .field( "conveyorRight", conveyorRight)
-            .endObject()) {
-            return builder;
-        } catch (IOException e) {
-            throw new IotElasticsearchFactoryException("Error building JSON message.", e);
-        }
-    }
-
-    private XContentBuilder handlePlcInput(List<Boolean> input) {
-        boolean transferLeft = input.get(3);
-        boolean transferRight = input.get(4);
-
-        if (conveyorState == ConveyorState.STOPPED) {
-            if (transferLeft) {
-                conveyorState = ConveyorState.RUNNING_LEFT;
-                try (XContentBuilder builder = XContentFactory.jsonBuilder()
-                    .startObject()
-                    .field("time", Calendar.getInstance().getTimeInMillis())
-                    .field("type", "small")
-                    .endObject()) {
-                    return builder;
-                } catch (IOException e) {
-                    throw new IotElasticsearchFactoryException("Error building JSON message.", e);
-                }
-            } else if (transferRight){
-                conveyorState = ConveyorState.RUNNING_RIGHT;
-                try (XContentBuilder builder = XContentFactory.jsonBuilder()
-                    .startObject()
-                    .field("time", Calendar.getInstance().getTimeInMillis())
-                    .field("type", "large")
-                    .endObject()) {
-                    return builder;
-                } catch (IOException e) {
-                    throw new IotElasticsearchFactoryException("Error building JSON message.", e);
-                }
-            }
-        } else if (!(transferLeft || transferRight)) {
-            conveyorState = ConveyorState.STOPPED;
-        }
-        return null;
-    }
-
-    public static void main(String[] args) {
-        options = CliOptions.fromArgs(args);
-        if (options == null) {
-            CliOptions.printHelp();
-            // Could not parse.
-            System.exit(1);
-        }
-
-        System.out.println("Connecting to " + options.getPlc4xConnectionString()+ " with field address " +
-            options.getPlc4xFieldAddress());
-
-        ElasticsearchStorage factory = new ElasticsearchStorage();
-        factory.runFactory();
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.examples.storage.elasticsearch;
+
+import org.apache.edgent.function.Supplier;
+import org.apache.edgent.providers.direct.DirectProvider;
+import org.apache.edgent.topology.TStream;
+import org.apache.edgent.topology.Topology;
+import org.apache.plc4x.edgent.PlcConnectionAdapter;
+import org.apache.plc4x.edgent.PlcFunctions;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
+import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
+import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequest;
+import org.elasticsearch.action.index.IndexResponse;
+import org.elasticsearch.client.Client;
+import org.elasticsearch.client.IndicesAdminClient;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.node.InternalSettingsPreparer;
+import org.elasticsearch.node.Node;
+import org.elasticsearch.node.NodeValidationException;
+import org.elasticsearch.plugins.Plugin;
+import org.elasticsearch.transport.Netty4Plugin;
+
+import java.io.IOException;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+public class ElasticsearchStorage {
+    private static CliOptions options;
+
+    public enum ConveyorState {
+        STOPPED,
+        RUNNING_LEFT,
+        RUNNING_RIGHT
+    }
+
+    private static class IotElasticsearchFactoryException extends RuntimeException {
+        private IotElasticsearchFactoryException(String message) {
+            super(message);
+        }
+        private IotElasticsearchFactoryException(String message, Throwable cause) {
+            super(message, cause);
+        }
+    }
+
+    private static class MyNode extends Node {
+        private MyNode(Settings preparedSettings, Collection<Class<? extends Plugin>> classpathPlugins) {
+            super(InternalSettingsPreparer.prepareEnvironment(
+                preparedSettings, Collections.emptyMap(), null, () -> "hello-es"), classpathPlugins, true);
+        }
+    }
+
+    private ConveyorState conveyorState = ConveyorState.STOPPED;
+
+    private Node startElasticsearchNode() {
+        try {
+            Node node = new MyNode(Settings.builder()
+                .put("transport.type", "netty4")
+                .put("http.type", "netty4")
+                .put("http.cors.enabled", "true")
+                .put("path.home", "elasticsearch-data")
+                .put("network.host", "0.0.0.0")
+                .build(), Collections.singletonList(Netty4Plugin.class));
+            node.start();
+            return node;
+        } catch (NodeValidationException e) {
+            throw new IotElasticsearchFactoryException("Could not start Elasticsearch node.", e);
+        }
+    }
+
+    private void prepareIndexes(Client esClient) {
+        IndicesAdminClient indicesAdminClient = esClient.admin().indices();
+
+        // Check if the factory-data index exists and create it, if it doesn't.
+        IndicesExistsRequest factoryDataIndexExistsRequest =
+            indicesAdminClient.prepareExists("iot-factory-data").request();
+        if(!indicesAdminClient.exists(factoryDataIndexExistsRequest).actionGet().isExists()) {
+            CreateIndexRequest createIndexRequest = new CreateIndexRequest("iot-factory-data");
+            createIndexRequest.mapping("FactoryData",
+                "{\n" +
+                    "            \"properties\": {\n" +
+                    "                \"time\": {\n" +
+                    "                    \"type\": \"date\"\n" +
+                    "                }\n" +
+                    "            }\n" +
+                    "        }", XContentType.JSON);
+            CreateIndexResponse createIndexResponse = indicesAdminClient.create(createIndexRequest).actionGet();
+            if(!createIndexResponse.isAcknowledged()) {
+                throw new IotElasticsearchFactoryException("Could not create index 'iot-factory-data'");
+            }
+        }
+
+        // Check if the product-data index exists and create it, if it doesn't.
+        IndicesExistsRequest productDataIndexExistsRequest =
+            indicesAdminClient.prepareExists("iot-product-data").request();
+        if(!indicesAdminClient.exists(productDataIndexExistsRequest).actionGet().isExists()) {
+            CreateIndexRequest createIndexRequest = new CreateIndexRequest("iot-product-data");
+            createIndexRequest.mapping("ProductData",
+                "{\n" +
+                    "            \"properties\": {\n" +
+                    "                \"time\": {\n" +
+                    "                    \"type\": \"date\"\n" +
+                    "                },\n" +
+                    "                \"type\": {\n" +
+                    "                    \"type\": \"keyword\"\n" +
+                    "                }\n" +
+                    "            }\n" +
+                    "        }", XContentType.JSON);
+            CreateIndexResponse createIndexResponse = indicesAdminClient.create(createIndexRequest).actionGet();
+            if(!createIndexResponse.isAcknowledged()) {
+                throw new IotElasticsearchFactoryException("Could not create index 'iot-product-data'");
+            }
+        }
+    }
+
+    private void runFactory() {
+        // Start an Elasticsearch node.
+        Node esNode = startElasticsearchNode();
+        Client esClient = esNode.client();
+        // Register a shutdown hook.
+        final Thread mainThread = Thread.currentThread();
+        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+            try {
+                esNode.close();
+                mainThread.join();
+            } catch (IOException | InterruptedException e) {
+                throw new PlcRuntimeException("Error closing ES Node", e);
+            }
+        }));
+        System.out.println("Started Elasticsearch node on port 9200");
+
+        // Make sure the indexes exist prior to writing to them.
+        prepareIndexes(esClient);
+
+        // Get a plc connection.
+        try (PlcConnectionAdapter plcAdapter = new PlcConnectionAdapter(options.getPlc4xConnectionString())) {
+            // Initialize the Edgent core.
+            DirectProvider dp = new DirectProvider();
+            Topology top = dp.newTopology();
+
+            // Define the event stream.
+            // 1) PLC4X source generating a stream of bytes.
+            Supplier<List<Boolean>> plcSupplier = PlcFunctions.booleanListSupplier(plcAdapter,
+                options.getPlc4xFieldAddress());
+            // 2) Use polling to get an item from the byte-stream in regular intervals.
+            TStream<List<Boolean>> plcOutputStates = top.poll(plcSupplier, 100, TimeUnit.MILLISECONDS);
+
+            // 3a) Create a stream that pumps all data into a 'factory-data' index.
+            TStream<XContentBuilder> factoryData = plcOutputStates.map(this::translatePlcInput);
+            TStream<IndexResponse> factoryDataResponses = factoryData.map(
+                value -> esClient.prepareIndex("iot-factory-data", "FactoryData").setSource(value).get());
+            factoryDataResponses.print();
+
+            // 3b) Create a stream that does some local analysis to detect big and small boxes and to only output
+            //     something to the 'product-data' index, if a new item is detected.
+            TStream<XContentBuilder> productData = plcOutputStates.map(this::handlePlcInput);
+            TStream<IndexResponse> productDataResponses = productData.map(
+                value -> esClient.prepareIndex("iot-product-data", "ProductData").setSource(value).get());
+            productDataResponses.print();
+
+            // Submit the topology and hereby start the event streams.
+            dp.submit(top);
+        } catch (Exception e) {
+            throw new IotElasticsearchFactoryException("Error while connecting or disconnecting from the PLC.", e);
+        }
+    }
+
+    private XContentBuilder translatePlcInput(List<Boolean> input) {
+        boolean conveyorEntry = input.get(0);
+        boolean load = input.get(1);
+        boolean unload = input.get(2);
+        boolean transferLeft = input.get(3);
+        boolean transferRight = input.get(4);
+        boolean conveyorLeft = input.get(5);
+        boolean conveyorRight = input.get(6);
+
+        try(XContentBuilder builder = XContentFactory.jsonBuilder()
+            .startObject()
+            .field("time", Calendar.getInstance().getTimeInMillis())
+            .field("conveyorEntry", conveyorEntry)
+            .field("load", load)
+            .field( "unload", unload)
+            .field( "transferLeft", transferLeft)
+            .field( "transferRight", transferRight)
+            .field( "conveyorLeft", conveyorLeft)
+            .field( "conveyorRight", conveyorRight)
+            .endObject()) {
+            return builder;
+        } catch (IOException e) {
+            throw new IotElasticsearchFactoryException("Error building JSON message.", e);
+        }
+    }
+
+    private XContentBuilder handlePlcInput(List<Boolean> input) {
+        boolean transferLeft = input.get(3);
+        boolean transferRight = input.get(4);
+
+        if (conveyorState == ConveyorState.STOPPED) {
+            if (transferLeft) {
+                conveyorState = ConveyorState.RUNNING_LEFT;
+                try (XContentBuilder builder = XContentFactory.jsonBuilder()
+                    .startObject()
+                    .field("time", Calendar.getInstance().getTimeInMillis())
+                    .field("type", "small")
+                    .endObject()) {
+                    return builder;
+                } catch (IOException e) {
+                    throw new IotElasticsearchFactoryException("Error building JSON message.", e);
+                }
+            } else if (transferRight){
+                conveyorState = ConveyorState.RUNNING_RIGHT;
+                try (XContentBuilder builder = XContentFactory.jsonBuilder()
+                    .startObject()
+                    .field("time", Calendar.getInstance().getTimeInMillis())
+                    .field("type", "large")
+                    .endObject()) {
+                    return builder;
+                } catch (IOException e) {
+                    throw new IotElasticsearchFactoryException("Error building JSON message.", e);
+                }
+            }
+        } else if (!(transferLeft || transferRight)) {
+            conveyorState = ConveyorState.STOPPED;
+        }
+        return null;
+    }
+
+    public static void main(String[] args) {
+        options = CliOptions.fromArgs(args);
+        if (options == null) {
+            CliOptions.printHelp();
+            // Could not parse.
+            System.exit(1);
+        }
+
+        System.out.println("Connecting to " + options.getPlc4xConnectionString()+ " with field address " +
+            options.getPlc4xFieldAddress());
+
+        ElasticsearchStorage factory = new ElasticsearchStorage();
+        factory.runFactory();
+    }
+
+}
diff --git a/plc4j/examples/hello-storage-elasticsearch/src/main/resources/log4j2.xml b/plc4j/examples/hello-storage-elasticsearch/src/main/resources/log4j2.xml
index d82c7c38ef4..30d93e8396d 100644
--- a/plc4j/examples/hello-storage-elasticsearch/src/main/resources/log4j2.xml
+++ b/plc4j/examples/hello-storage-elasticsearch/src/main/resources/log4j2.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<Configuration package="log4j.test"
-               status="WARN">
-  <Appenders>
-    <Console name="Console" target="SYSTEM_OUT">
-      <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
-    </Console>
-  </Appenders>
-  <Loggers>
-    <Logger name="io.netty.util.ResourceLeakDetector" level="fatal">
-      <AppenderRef ref="Console"/>
-    </Logger>
-    <Root level="info">
-      <AppenderRef ref="Console"/>
-    </Root>
-  </Loggers>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<Configuration package="log4j.test"
+               status="WARN">
+  <Appenders>
+    <Console name="Console" target="SYSTEM_OUT">
+      <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
+    </Console>
+  </Appenders>
+  <Loggers>
+    <Logger name="io.netty.util.ResourceLeakDetector" level="fatal">
+      <AppenderRef ref="Console"/>
+    </Logger>
+    <Root level="info">
+      <AppenderRef ref="Console"/>
+    </Root>
+  </Loggers>
 </Configuration>
\ No newline at end of file
diff --git a/plc4j/examples/hello-storage-elasticsearch/src/main/resources/logback.xml b/plc4j/examples/hello-storage-elasticsearch/src/main/resources/logback.xml
index 71652b38374..da09b6cbbce 100644
--- a/plc4j/examples/hello-storage-elasticsearch/src/main/resources/logback.xml
+++ b/plc4j/examples/hello-storage-elasticsearch/src/main/resources/logback.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoders are assigned the type
-         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <logger level="OFF" name="io.netty.util" additivity="false">
-    <appender-ref ref="STDOUT" />
-  </logger>
-
-  <root level="warn">
-    <appender-ref ref="STDOUT" />
-  </root>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <logger level="OFF" name="io.netty.util" additivity="false">
+    <appender-ref ref="STDOUT" />
+  </logger>
+
+  <root level="warn">
+    <appender-ref ref="STDOUT" />
+  </root>
+
 </configuration>
\ No newline at end of file
diff --git a/plc4j/examples/hello-webapp/client/pom.xml b/plc4j/examples/hello-webapp/client/pom.xml
index 9b3104cad38..39dfe927c87 100644
--- a/plc4j/examples/hello-webapp/client/pom.xml
+++ b/plc4j/examples/hello-webapp/client/pom.xml
@@ -1,136 +1,136 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.examples</groupId>
-    <artifactId>plc4j-hello-webapp</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-hello-webapp-client</artifactId>
-  <packaging>swf</packaging>
-
-  <name>PLC4J: Examples: Hello-Webapp: Client</name>
-
-  <build>
-    <sourceDirectory>src/main/royale</sourceDirectory>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.royale.compiler</groupId>
-        <artifactId>royale-maven-plugin</artifactId>
-        <version>${royale.version}</version>
-        <extensions>true</extensions>
-        <configuration>
-          <mainClass>HelloPLC4X.mxml</mainClass>
-          <targets>JSRoyale</targets>
-          <debug>true</debug>
-          <!--keepAs3Metadata>
-            <name>Bindable</name>
-            <name>Managed</name>
-            <name>ChangeEvent</name>
-            <name>NonCommittingChangeEvent</name>
-            <name>Transient</name>
-            <name>Mixin</name>
-          </keepAs3Metadata-->
-        </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.royale.compiler</groupId>
-            <artifactId>compiler-jx</artifactId>
-            <version>${royale.version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <usedDependencies>
-            <usedDependency>org.apache.royale.framework:Jewel</usedDependency>
-            <usedDependency>org.apache.royale.framework:Language</usedDependency>
-            <usedDependency>org.apache.royale.framework:Network</usedDependency>
-          </usedDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.royale.framework</groupId>
-      <artifactId>Jewel</artifactId>
-      <version>${royale.version}</version>
-      <type>swc</type>
-      <classifier>js</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.royale.framework</groupId>
-      <artifactId>Language</artifactId>
-      <version>${royale.version}</version>
-      <type>swc</type>
-      <classifier>js</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.royale.framework</groupId>
-      <artifactId>Network</artifactId>
-      <version>${royale.version}</version>
-      <type>swc</type>
-      <classifier>js</classifier>
-    </dependency>
-    <!--dependency>
-      <groupId>org.apache.royale.framework</groupId>
-      <artifactId>HTML</artifactId>
-      <version>${royale.version}</version>
-      <type>swc</type>
-      <classifier>js</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.royale.framework</groupId>
-      <artifactId>Collections</artifactId>
-      <version>${royale.version}</version>
-      <type>swc</type>
-      <classifier>js</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.royale.framework</groupId>
-      <artifactId>Binding</artifactId>
-      <version>${royale.version}</version>
-      <type>swc</type>
-      <classifier>js</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.royale.framework</groupId>
-      <artifactId>Graphics</artifactId>
-      <version>${royale.version}</version>
-      <type>swc</type>
-      <classifier>js</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.royale.framework</groupId>
-      <artifactId>Basic</artifactId>
-      <version>${royale.version}</version>
-      <type>swc</type>
-      <classifier>js</classifier>
-    </dependency-->
-  </dependencies>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.examples</groupId>
+    <artifactId>plc4j-hello-webapp</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-hello-webapp-client</artifactId>
+  <packaging>swf</packaging>
+
+  <name>PLC4J: Examples: Hello-Webapp: Client</name>
+
+  <build>
+    <sourceDirectory>src/main/royale</sourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.royale.compiler</groupId>
+        <artifactId>royale-maven-plugin</artifactId>
+        <version>${royale.version}</version>
+        <extensions>true</extensions>
+        <configuration>
+          <mainClass>HelloPLC4X.mxml</mainClass>
+          <targets>JSRoyale</targets>
+          <debug>true</debug>
+          <!--keepAs3Metadata>
+            <name>Bindable</name>
+            <name>Managed</name>
+            <name>ChangeEvent</name>
+            <name>NonCommittingChangeEvent</name>
+            <name>Transient</name>
+            <name>Mixin</name>
+          </keepAs3Metadata-->
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.royale.compiler</groupId>
+            <artifactId>compiler-jx</artifactId>
+            <version>${royale.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <usedDependencies>
+            <usedDependency>org.apache.royale.framework:Jewel</usedDependency>
+            <usedDependency>org.apache.royale.framework:Language</usedDependency>
+            <usedDependency>org.apache.royale.framework:Network</usedDependency>
+          </usedDependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.royale.framework</groupId>
+      <artifactId>Jewel</artifactId>
+      <version>${royale.version}</version>
+      <type>swc</type>
+      <classifier>js</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.royale.framework</groupId>
+      <artifactId>Language</artifactId>
+      <version>${royale.version}</version>
+      <type>swc</type>
+      <classifier>js</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.royale.framework</groupId>
+      <artifactId>Network</artifactId>
+      <version>${royale.version}</version>
+      <type>swc</type>
+      <classifier>js</classifier>
+    </dependency>
+    <!--dependency>
+      <groupId>org.apache.royale.framework</groupId>
+      <artifactId>HTML</artifactId>
+      <version>${royale.version}</version>
+      <type>swc</type>
+      <classifier>js</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.royale.framework</groupId>
+      <artifactId>Collections</artifactId>
+      <version>${royale.version}</version>
+      <type>swc</type>
+      <classifier>js</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.royale.framework</groupId>
+      <artifactId>Binding</artifactId>
+      <version>${royale.version}</version>
+      <type>swc</type>
+      <classifier>js</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.royale.framework</groupId>
+      <artifactId>Graphics</artifactId>
+      <version>${royale.version}</version>
+      <type>swc</type>
+      <classifier>js</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.royale.framework</groupId>
+      <artifactId>Basic</artifactId>
+      <version>${royale.version}</version>
+      <type>swc</type>
+      <classifier>js</classifier>
+    </dependency-->
+  </dependencies>
+
+</project>
diff --git a/plc4j/examples/hello-webapp/client/src/main/royale/HelloPLC4X.mxml b/plc4j/examples/hello-webapp/client/src/main/royale/HelloPLC4X.mxml
index c78bb068abe..d1c48ff3185 100644
--- a/plc4j/examples/hello-webapp/client/src/main/royale/HelloPLC4X.mxml
+++ b/plc4j/examples/hello-webapp/client/src/main/royale/HelloPLC4X.mxml
@@ -1,104 +1,104 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<j:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
-               xmlns:j="library://ns.apache.org/royale/jewel"
-               xmlns:js="library://ns.apache.org/royale/basic"
-               xmlns:service="service.*">
-
-    <j:beads>
-        <js:ContainerDataBinding/>
-        <service:RobotService id="robotService" success="onSuccess(event)"/>
-    </j:beads>
-
-
-    <fx:Script>
-        <![CDATA[
-        import org.apache.royale.events.Event;
-        import org.apache.royale.events.MouseEvent;
-
-        public function move(event:MouseEvent):void {
-            if (event.target == moveForwardLeftButton) {
-                robotService.moveForwardLeft();
-            } else if (event.target == moveForwardButton) {
-                robotService.moveForward();
-            } else if (event.target == moveForwardRightButton) {
-                robotService.moveForwardRight();
-            } else if (event.target == turnLeftButton) {
-                robotService.turnLeft();
-            } else if (event.target == stopButton) {
-                robotService.stop();
-            } else if (event.target == turnRightButton) {
-                robotService.turnRight();
-            } else if (event.target == moveBackwardLeftButton) {
-                robotService.moveBackwardLeft();
-            } else if (event.target == moveBackwardButton) {
-                robotService.moveBackward();
-            } else if (event.target == moveBackwardRightButton) {
-                robotService.moveBackwardRight();
-            }
-        }
-
-        public function onSuccess(event:Event):void {
-
-        }
-        ]]>
-    </fx:Script>
-
-    <j:initialView>
-        <j:View width="100%" height="100%">
-            <j:HGroup width="100%" height="100%">
-                <j:VGroup width="33%" height="100%">
-                    <j:Button id="moveForwardLeftButton" text="Left Forward"
-                              click="move(event)"
-                              width="100%" height="33%"/>
-                    <j:Button id="turnLeftButton" text="Left"
-                              click="move(event)"
-                              width="100%" height="33%"/>
-                    <j:Button id="moveBackwardLeftButton" text="Left Backward"
-                              click="move(event)"
-                              width="100%" height="33%"/>
-                </j:VGroup>
-                <j:VGroup width="33%" height="100%">
-                    <j:Button id="moveForwardButton" text="Forward"
-                              click="move(event)"
-                              width="100%" height="33%"/>
-                    <j:Button id="stopButton" text="Stop"
-                              click="move(event)"
-                              width="100%" height="33%"/>
-                    <j:Button id="moveBackwardButton" text="Backward"
-                              click="move(event)"
-                              width="100%" height="33%"/>
-                </j:VGroup>
-                <j:VGroup width="33%" height="100%">
-                    <j:Button id="moveForwardRightButton" text="Right Forward"
-                              click="move(event)"
-                              width="100%" height="33%"/>
-                    <j:Button id="turnRightButton" text="Right"
-                              click="move(event)"
-                              width="100%" height="33%"/>
-                    <j:Button id="moveBackwardRightButton" text="Right Backward"
-                              click="move(event)"
-                              width="100%" height="33%"/>
-                </j:VGroup>
-            </j:HGroup>
-        </j:View>
-    </j:initialView>
-
-</j:Application>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<j:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
+               xmlns:j="library://ns.apache.org/royale/jewel"
+               xmlns:js="library://ns.apache.org/royale/basic"
+               xmlns:service="service.*">
+
+    <j:beads>
+        <js:ContainerDataBinding/>
+        <service:RobotService id="robotService" success="onSuccess(event)"/>
+    </j:beads>
+
+
+    <fx:Script>
+        <![CDATA[
+        import org.apache.royale.events.Event;
+        import org.apache.royale.events.MouseEvent;
+
+        public function move(event:MouseEvent):void {
+            if (event.target == moveForwardLeftButton) {
+                robotService.moveForwardLeft();
+            } else if (event.target == moveForwardButton) {
+                robotService.moveForward();
+            } else if (event.target == moveForwardRightButton) {
+                robotService.moveForwardRight();
+            } else if (event.target == turnLeftButton) {
+                robotService.turnLeft();
+            } else if (event.target == stopButton) {
+                robotService.stop();
+            } else if (event.target == turnRightButton) {
+                robotService.turnRight();
+            } else if (event.target == moveBackwardLeftButton) {
+                robotService.moveBackwardLeft();
+            } else if (event.target == moveBackwardButton) {
+                robotService.moveBackward();
+            } else if (event.target == moveBackwardRightButton) {
+                robotService.moveBackwardRight();
+            }
+        }
+
+        public function onSuccess(event:Event):void {
+
+        }
+        ]]>
+    </fx:Script>
+
+    <j:initialView>
+        <j:View width="100%" height="100%">
+            <j:HGroup width="100%" height="100%">
+                <j:VGroup width="33%" height="100%">
+                    <j:Button id="moveForwardLeftButton" text="Left Forward"
+                              click="move(event)"
+                              width="100%" height="33%"/>
+                    <j:Button id="turnLeftButton" text="Left"
+                              click="move(event)"
+                              width="100%" height="33%"/>
+                    <j:Button id="moveBackwardLeftButton" text="Left Backward"
+                              click="move(event)"
+                              width="100%" height="33%"/>
+                </j:VGroup>
+                <j:VGroup width="33%" height="100%">
+                    <j:Button id="moveForwardButton" text="Forward"
+                              click="move(event)"
+                              width="100%" height="33%"/>
+                    <j:Button id="stopButton" text="Stop"
+                              click="move(event)"
+                              width="100%" height="33%"/>
+                    <j:Button id="moveBackwardButton" text="Backward"
+                              click="move(event)"
+                              width="100%" height="33%"/>
+                </j:VGroup>
+                <j:VGroup width="33%" height="100%">
+                    <j:Button id="moveForwardRightButton" text="Right Forward"
+                              click="move(event)"
+                              width="100%" height="33%"/>
+                    <j:Button id="turnRightButton" text="Right"
+                              click="move(event)"
+                              width="100%" height="33%"/>
+                    <j:Button id="moveBackwardRightButton" text="Right Backward"
+                              click="move(event)"
+                              width="100%" height="33%"/>
+                </j:VGroup>
+            </j:HGroup>
+        </j:View>
+    </j:initialView>
+
+</j:Application>
diff --git a/plc4j/examples/hello-webapp/client/src/main/royale/service/RobotService.as b/plc4j/examples/hello-webapp/client/src/main/royale/service/RobotService.as
index 2dd3772f692..44e61f0445e 100644
--- a/plc4j/examples/hello-webapp/client/src/main/royale/service/RobotService.as
+++ b/plc4j/examples/hello-webapp/client/src/main/royale/service/RobotService.as
@@ -1,92 +1,92 @@
-/*
- 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
-
-     http://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 service
-{
-import org.apache.royale.events.Event;
-import org.apache.royale.events.EventDispatcher;
-import org.apache.royale.net.HTTPConstants;
-import org.apache.royale.net.HTTPService;
-
-[Event(name="success", type="org.apache.royale.events.Event")]
-public class RobotService extends EventDispatcher {
-
-    private var remoteService:HTTPService;
-    private var _url:String = null;
-
-    /**
-     * constructor
-     */
-    public function RobotService() {
-        remoteService = new HTTPService();
-        remoteService.addEventListener(HTTPConstants.COMPLETE, completeHandler);
-        _url = "api/robot/move";
-    }
-
-    private function completeHandler(event:Event):void {
-        dispatchEvent(new Event("success"));
-    }
-
-    public function moveForwardLeft():void {
-        remoteService.url = _url + "?direction=forward-left";
-        remoteService.send();
-    }
-
-    public function moveForward():void {
-        remoteService.url = _url + "?direction=forward";
-        remoteService.send();
-    }
-
-    public function moveForwardRight():void {
-        remoteService.url = _url + "?direction=forward-right";
-        remoteService.send();
-    }
-
-    public function turnLeft():void {
-        remoteService.url = _url + "?direction=left";
-        remoteService.send();
-    }
-
-    public function stop():void {
-        remoteService.url = _url + "?direction=stop";
-        remoteService.send();
-    }
-
-    public function turnRight():void {
-        remoteService.url = _url + "?direction=right";
-        remoteService.send();
-    }
-
-    public function moveBackwardLeft():void {
-        remoteService.url = _url + "?direction=backward-left";
-        remoteService.send();
-    }
-
-    public function moveBackward():void {
-        remoteService.url = _url + "?direction=backward";
-        remoteService.send();
-    }
-
-    public function moveBackwardRight():void {
-        remoteService.url = _url + "?direction=backward-right";
-        remoteService.send();
-    }
-
-}
+/*
+ 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
+
+     http://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 service
+{
+import org.apache.royale.events.Event;
+import org.apache.royale.events.EventDispatcher;
+import org.apache.royale.net.HTTPConstants;
+import org.apache.royale.net.HTTPService;
+
+[Event(name="success", type="org.apache.royale.events.Event")]
+public class RobotService extends EventDispatcher {
+
+    private var remoteService:HTTPService;
+    private var _url:String = null;
+
+    /**
+     * constructor
+     */
+    public function RobotService() {
+        remoteService = new HTTPService();
+        remoteService.addEventListener(HTTPConstants.COMPLETE, completeHandler);
+        _url = "api/robot/move";
+    }
+
+    private function completeHandler(event:Event):void {
+        dispatchEvent(new Event("success"));
+    }
+
+    public function moveForwardLeft():void {
+        remoteService.url = _url + "?direction=forward-left";
+        remoteService.send();
+    }
+
+    public function moveForward():void {
+        remoteService.url = _url + "?direction=forward";
+        remoteService.send();
+    }
+
+    public function moveForwardRight():void {
+        remoteService.url = _url + "?direction=forward-right";
+        remoteService.send();
+    }
+
+    public function turnLeft():void {
+        remoteService.url = _url + "?direction=left";
+        remoteService.send();
+    }
+
+    public function stop():void {
+        remoteService.url = _url + "?direction=stop";
+        remoteService.send();
+    }
+
+    public function turnRight():void {
+        remoteService.url = _url + "?direction=right";
+        remoteService.send();
+    }
+
+    public function moveBackwardLeft():void {
+        remoteService.url = _url + "?direction=backward-left";
+        remoteService.send();
+    }
+
+    public function moveBackward():void {
+        remoteService.url = _url + "?direction=backward";
+        remoteService.send();
+    }
+
+    public function moveBackwardRight():void {
+        remoteService.url = _url + "?direction=backward-right";
+        remoteService.send();
+    }
+
+}
 }
\ No newline at end of file
diff --git a/plc4j/examples/hello-webapp/pom.xml b/plc4j/examples/hello-webapp/pom.xml
index ce6cb6849c2..989db397d34 100644
--- a/plc4j/examples/hello-webapp/pom.xml
+++ b/plc4j/examples/hello-webapp/pom.xml
@@ -1,88 +1,88 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.examples</groupId>
-    <artifactId>plc4j-examples</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-hello-webapp</artifactId>
-  <name>PLC4J: Examples: Hello-Webapp (root)</name>
-  <packaging>pom</packaging>
-
-  <properties>
-    <royale.version>0.9.4</royale.version>
-    <spring-boot.version>2.1.2.RELEASE</spring-boot.version>
-  </properties>
-
-  <modules>
-    <module>client</module>
-    <module>service</module>
-    <module>webapp</module>
-  </modules>
-
-  <build>
-    <plugins>
-      <!-- Disable building the uber-jar -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.1</version>
-        <executions>
-          <execution>
-            <id>generate-uber-jar</id>
-            <phase>none</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>com.buschmais.jqassistant</groupId>
-          <artifactId>jqassistant-maven-plugin</artifactId>
-          <configuration>
-            <skip>true</skip>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-dependencies</artifactId>
-        <version>${spring-boot.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.examples</groupId>
+    <artifactId>plc4j-examples</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-hello-webapp</artifactId>
+  <name>PLC4J: Examples: Hello-Webapp (root)</name>
+  <packaging>pom</packaging>
+
+  <properties>
+    <royale.version>0.9.4</royale.version>
+    <spring-boot.version>2.1.2.RELEASE</spring-boot.version>
+  </properties>
+
+  <modules>
+    <module>client</module>
+    <module>service</module>
+    <module>webapp</module>
+  </modules>
+
+  <build>
+    <plugins>
+      <!-- Disable building the uber-jar -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.2.1</version>
+        <executions>
+          <execution>
+            <id>generate-uber-jar</id>
+            <phase>none</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>com.buschmais.jqassistant</groupId>
+          <artifactId>jqassistant-maven-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-dependencies</artifactId>
+        <version>${spring-boot.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/examples/hello-webapp/service/pom.xml b/plc4j/examples/hello-webapp/service/pom.xml
index 2983efd0ffd..db180034603 100644
--- a/plc4j/examples/hello-webapp/service/pom.xml
+++ b/plc4j/examples/hello-webapp/service/pom.xml
@@ -1,112 +1,112 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.examples</groupId>
-    <artifactId>plc4j-hello-webapp</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-hello-webapp-service</artifactId>
-
-  <name>PLC4J: Examples: Hello-Webapp: Service</name>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <usedDependencies>
-            <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
-          </usedDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
-    </dependency>
-
-    <!-- Required driver implementation -->
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ads</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ethernet-ip</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-modbus</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-opcua</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-s7</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-simulated</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.examples</groupId>
+    <artifactId>plc4j-hello-webapp</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-hello-webapp-service</artifactId>
+
+  <name>PLC4J: Examples: Hello-Webapp: Service</name>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <usedDependencies>
+            <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
+          </usedDependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+    </dependency>
+
+    <!-- Required driver implementation -->
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ads</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ethernet-ip</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-modbus</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-opcua</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-s7</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-simulated</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/examples/hello-webapp/service/src/main/java/org/apache/plc4x/examples/robot/controllers/RobotController.java b/plc4j/examples/hello-webapp/service/src/main/java/org/apache/plc4x/examples/robot/controllers/RobotController.java
index 0b6c9bcf32e..027e296f5fb 100644
--- a/plc4j/examples/hello-webapp/service/src/main/java/org/apache/plc4x/examples/robot/controllers/RobotController.java
+++ b/plc4j/examples/hello-webapp/service/src/main/java/org/apache/plc4x/examples/robot/controllers/RobotController.java
@@ -1,105 +1,105 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.examples.robot.controllers;
-
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.PostConstruct;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-@RestController
-@RequestMapping("api/robot")
-public class RobotController {
-
-    private static final Logger logger = LoggerFactory.getLogger(RobotController.class);
-
-    private static final byte MOTOR_RIGHT_BACKWARDS = 0x01;
-    private static final byte MOTOR_RIGHT_ON = 0x02;
-    private static final byte MOTOR_LEFT_BACKWARDS = 0x04;
-    private static final byte MOTOR_LEFT_ON = 0x08;
-
-    @Value("${plc4x.connection-string}")
-    private String connectionString;
-
-    @Value("${plc4x.address-string}")
-    private String addressString;
-
-    private PlcConnection connection;
-
-    @PostConstruct
-    public void init() throws PlcConnectionException {
-        connection = new PlcDriverManager().getConnection(connectionString);
-    }
-
-    @RequestMapping("move")
-    public boolean move(@RequestParam(value="direction", defaultValue="stop") String direction) {
-        logger.info("Move in direction: " + direction);
-        byte state;
-        switch (direction) {
-            case "forward-right":
-                state = MOTOR_LEFT_ON;
-                break;
-            case "forward":
-                state = (byte) (MOTOR_LEFT_ON | MOTOR_RIGHT_ON);
-                break;
-            case "forward-left":
-                state = MOTOR_RIGHT_ON;
-                break;
-            case "left":
-                state = (byte) (MOTOR_LEFT_BACKWARDS | MOTOR_LEFT_ON | MOTOR_RIGHT_ON);
-                break;
-            case "right":
-                state = (byte) (MOTOR_LEFT_ON | MOTOR_RIGHT_BACKWARDS | MOTOR_RIGHT_ON);
-                break;
-            case "backward-right":
-                state = (byte) (MOTOR_LEFT_BACKWARDS | MOTOR_LEFT_ON);
-                break;
-            case "backward":
-                state = (byte) (MOTOR_LEFT_BACKWARDS | MOTOR_LEFT_ON | MOTOR_RIGHT_BACKWARDS | MOTOR_RIGHT_ON);
-                break;
-            case "backward-left":
-                state = (byte) (MOTOR_RIGHT_BACKWARDS | MOTOR_RIGHT_ON);
-                break;
-            default:
-                state = 0;
-                break;
-        }
-        try {
-            PlcWriteRequest updateRequest = connection.writeRequestBuilder().addItem("state", addressString, state).build();
-            updateRequest.execute().get(2000, TimeUnit.MILLISECONDS);
-            return true;
-        } catch (InterruptedException | ExecutionException | TimeoutException e) {
-            logger.error("Caught Exception:", e);
-            return false;
-        }
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.examples.robot.controllers;
+
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.PostConstruct;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+@RestController
+@RequestMapping("api/robot")
+public class RobotController {
+
+    private static final Logger logger = LoggerFactory.getLogger(RobotController.class);
+
+    private static final byte MOTOR_RIGHT_BACKWARDS = 0x01;
+    private static final byte MOTOR_RIGHT_ON = 0x02;
+    private static final byte MOTOR_LEFT_BACKWARDS = 0x04;
+    private static final byte MOTOR_LEFT_ON = 0x08;
+
+    @Value("${plc4x.connection-string}")
+    private String connectionString;
+
+    @Value("${plc4x.address-string}")
+    private String addressString;
+
+    private PlcConnection connection;
+
+    @PostConstruct
+    public void init() throws PlcConnectionException {
+        connection = new PlcDriverManager().getConnection(connectionString);
+    }
+
+    @RequestMapping("move")
+    public boolean move(@RequestParam(value="direction", defaultValue="stop") String direction) {
+        logger.info("Move in direction: " + direction);
+        byte state;
+        switch (direction) {
+            case "forward-right":
+                state = MOTOR_LEFT_ON;
+                break;
+            case "forward":
+                state = (byte) (MOTOR_LEFT_ON | MOTOR_RIGHT_ON);
+                break;
+            case "forward-left":
+                state = MOTOR_RIGHT_ON;
+                break;
+            case "left":
+                state = (byte) (MOTOR_LEFT_BACKWARDS | MOTOR_LEFT_ON | MOTOR_RIGHT_ON);
+                break;
+            case "right":
+                state = (byte) (MOTOR_LEFT_ON | MOTOR_RIGHT_BACKWARDS | MOTOR_RIGHT_ON);
+                break;
+            case "backward-right":
+                state = (byte) (MOTOR_LEFT_BACKWARDS | MOTOR_LEFT_ON);
+                break;
+            case "backward":
+                state = (byte) (MOTOR_LEFT_BACKWARDS | MOTOR_LEFT_ON | MOTOR_RIGHT_BACKWARDS | MOTOR_RIGHT_ON);
+                break;
+            case "backward-left":
+                state = (byte) (MOTOR_RIGHT_BACKWARDS | MOTOR_RIGHT_ON);
+                break;
+            default:
+                state = 0;
+                break;
+        }
+        try {
+            PlcWriteRequest updateRequest = connection.writeRequestBuilder().addItem("state", addressString, state).build();
+            updateRequest.execute().get(2000, TimeUnit.MILLISECONDS);
+            return true;
+        } catch (InterruptedException | ExecutionException | TimeoutException e) {
+            logger.error("Caught Exception:", e);
+            return false;
+        }
+    }
+
+}
diff --git a/plc4j/examples/hello-webapp/webapp/pom.xml b/plc4j/examples/hello-webapp/webapp/pom.xml
index 8990b0f3d8a..67d95963ee8 100644
--- a/plc4j/examples/hello-webapp/webapp/pom.xml
+++ b/plc4j/examples/hello-webapp/webapp/pom.xml
@@ -1,142 +1,142 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.examples</groupId>
-    <artifactId>plc4j-hello-webapp</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-hello-webapp-webapp</artifactId>
-  <packaging>war</packaging>
-
-  <name>PLC4J: Examples: Hello-Webapp: Spring-Boot WAR</name>
-
-  <properties>
-    <start.class>org.apache.plc4x.examples.robot.Application</start.class>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-maven-plugin</artifactId>
-        <version>${spring-boot.version}</version>
-        <executions>
-          <execution>
-            <id>repackage</id>
-            <goals>
-              <goal>repackage</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <mainClass>${start.class}</mainClass>
-          <executable>true</executable>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <!-- Unpack the client content into this module in order to be able to serve the client too. -->
-          <execution>
-            <id>copy-client</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>unpack-dependencies</goal>
-            </goals>
-            <configuration>
-              <includeArtifactIds>plc4j-hello-webapp-client</includeArtifactIds>
-              <outputDirectory>${project.build.outputDirectory}/static/</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-        <configuration>
-          <usedDependencies>
-            <usedDependency>org.springframework.boot:spring-boot-starter-web</usedDependency>
-            <usedDependency>org.apache.plc4x.examples:plc4j-hello-webapp-service</usedDependency>
-            <usedDependency>org.apache.plc4x.examples:plc4j-hello-webapp-client</usedDependency>
-          </usedDependencies>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifest>
-              <mainClass>${start.class}</mainClass>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x.examples</groupId>
-      <artifactId>plc4j-hello-webapp-service</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-autoconfigure</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x.examples</groupId>
-      <artifactId>plc4j-hello-webapp-client</artifactId>
-      <type>war</type>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.plc4x.examples</groupId>
-        <artifactId>plc4j-hello-webapp-client</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
-        <type>war</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.examples</groupId>
+    <artifactId>plc4j-hello-webapp</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-hello-webapp-webapp</artifactId>
+  <packaging>war</packaging>
+
+  <name>PLC4J: Examples: Hello-Webapp: Spring-Boot WAR</name>
+
+  <properties>
+    <start.class>org.apache.plc4x.examples.robot.Application</start.class>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+        <version>${spring-boot.version}</version>
+        <executions>
+          <execution>
+            <id>repackage</id>
+            <goals>
+              <goal>repackage</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <mainClass>${start.class}</mainClass>
+          <executable>true</executable>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <!-- Unpack the client content into this module in order to be able to serve the client too. -->
+          <execution>
+            <id>copy-client</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>unpack-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeArtifactIds>plc4j-hello-webapp-client</includeArtifactIds>
+              <outputDirectory>${project.build.outputDirectory}/static/</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+        <configuration>
+          <usedDependencies>
+            <usedDependency>org.springframework.boot:spring-boot-starter-web</usedDependency>
+            <usedDependency>org.apache.plc4x.examples:plc4j-hello-webapp-service</usedDependency>
+            <usedDependency>org.apache.plc4x.examples:plc4j-hello-webapp-client</usedDependency>
+          </usedDependencies>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifest>
+              <mainClass>${start.class}</mainClass>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x.examples</groupId>
+      <artifactId>plc4j-hello-webapp-service</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-autoconfigure</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x.examples</groupId>
+      <artifactId>plc4j-hello-webapp-client</artifactId>
+      <type>war</type>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.plc4x.examples</groupId>
+        <artifactId>plc4j-hello-webapp-client</artifactId>
+        <version>0.6.0-SNAPSHOT</version>
+        <type>war</type>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/examples/hello-webapp/webapp/src/main/java/org/apache/plc4x/examples/robot/Application.java b/plc4j/examples/hello-webapp/webapp/src/main/java/org/apache/plc4x/examples/robot/Application.java
index 4493cf895ad..f64dbc5899f 100644
--- a/plc4j/examples/hello-webapp/webapp/src/main/java/org/apache/plc4x/examples/robot/Application.java
+++ b/plc4j/examples/hello-webapp/webapp/src/main/java/org/apache/plc4x/examples/robot/Application.java
@@ -1,32 +1,32 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.examples.robot;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class Application {
-
-    public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.examples.robot;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class Application {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+
+}
diff --git a/plc4j/examples/hello-webapp/webapp/src/main/resources/application.properties b/plc4j/examples/hello-webapp/webapp/src/main/resources/application.properties
index 9c6a18d478c..c3a0f5ae2fa 100644
--- a/plc4j/examples/hello-webapp/webapp/src/main/resources/application.properties
+++ b/plc4j/examples/hello-webapp/webapp/src/main/resources/application.properties
@@ -1,25 +1,25 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#     http://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.
-#
-
-debug=true
-spring.mvc.view.prefix= /
-spring.mvc.view.suffix= .html
-
-plc4x.connection-string=s7://10.10.64.21/0/0?controller-type=LOGO
-plc4x.address-string=%DB1.DB1064:BYTE
+#
+# 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
+#
+#     http://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.
+#
+
+debug=true
+spring.mvc.view.prefix= /
+spring.mvc.view.suffix= .html
+
+plc4x.connection-string=s7://10.10.64.21/0/0?controller-type=LOGO
+plc4x.address-string=%DB1.DB1064:BYTE
diff --git a/plc4j/examples/hello-world-plc4x/pom.xml b/plc4j/examples/hello-world-plc4x/pom.xml
index f2e9aa55c82..dc3e893b7d7 100644
--- a/plc4j/examples/hello-world-plc4x/pom.xml
+++ b/plc4j/examples/hello-world-plc4x/pom.xml
@@ -1,130 +1,130 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.examples</groupId>
-    <artifactId>plc4j-examples</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-hello-world-plc4x</artifactId>
-  <name>PLC4J: Examples: Hello-World PLC4X</name>
-  <description>Hello world application for PLC4X.</description>
-
-  <properties>
-    <app.main.class>org.apache.plc4x.java.examples.helloplc4x.HelloPlc4x</app.main.class>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-      <version>1.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>log4j-over-slf4j</artifactId>
-      <version>1.7.25</version>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-    </dependency>
-
-    <!-- Required driver implementation -->
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ab-eth</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ads</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ethernet-ip</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-modbus</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-opcua</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-s7</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-simulated</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <usedDependencies combine.children="append">
-            <usedDependency>org.apache.plc4x:plc4j-driver-ab-eth</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
-            <usedDependency>org.slf4j:log4j-over-slf4j</usedDependency>
-          </usedDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.examples</groupId>
+    <artifactId>plc4j-examples</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-hello-world-plc4x</artifactId>
+  <name>PLC4J: Examples: Hello-World PLC4X</name>
+  <description>Hello world application for PLC4X.</description>
+
+  <properties>
+    <app.main.class>org.apache.plc4x.java.examples.helloplc4x.HelloPlc4x</app.main.class>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <version>1.4</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.25</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+    </dependency>
+
+    <!-- Required driver implementation -->
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ab-eth</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ads</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ethernet-ip</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-modbus</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-opcua</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-s7</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-simulated</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <usedDependencies combine.children="append">
+            <usedDependency>org.apache.plc4x:plc4j-driver-ab-eth</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
+            <usedDependency>org.slf4j:log4j-over-slf4j</usedDependency>
+          </usedDependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/examples/hello-world-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/CliOptions.java b/plc4j/examples/hello-world-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/CliOptions.java
index e3414742524..0461a087bd3 100644
--- a/plc4j/examples/hello-world-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/CliOptions.java
+++ b/plc4j/examples/hello-world-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/CliOptions.java
@@ -1,84 +1,84 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.examples.helloplc4x;
-
-import org.apache.commons.cli.*;
-
-public class CliOptions {
-
-    private static Options options;
-
-    private final String connectionString;
-    private final String[] fieldAddress;
-
-    public static CliOptions fromArgs(String[] args) {
-        options = new Options();
-        // Required arguments
-        options.addOption(
-            Option.builder()
-                .type(String.class)
-                .longOpt("connection-string")
-                .hasArg()
-                .desc("Connection String")
-                .required()
-                .build());
-        options.addOption(
-            Option.builder()
-                .type(String.class)
-                .longOpt("field-addresses")
-                .hasArgs()
-                .desc("Field Addresses (Space separated).")
-                .required()
-                .build());
-
-        CommandLineParser parser = new DefaultParser();
-        CommandLine commandLine;
-        try {
-            commandLine = parser.parse(options, args);
-
-            String connectionString = commandLine.getOptionValue("connection-string");
-            String[] fieldAddress = commandLine.getOptionValues("field-addresses");
-
-            return new CliOptions(connectionString, fieldAddress);
-        } catch (ParseException e) {
-            System.err.println(e.getMessage());
-            return null;
-        }
-    }
-
-    public static void printHelp() {
-        HelpFormatter formatter = new HelpFormatter();
-        formatter.printHelp("HelloPlc4x", options);
-    }
-
-    public CliOptions(String connectionString, String[] fieldAddress) {
-        this.connectionString = connectionString;
-        this.fieldAddress = fieldAddress;
-    }
-
-    public String getConnectionString() {
-        return connectionString;
-    }
-
-    public String[] getFieldAddress() {
-        return fieldAddress;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.examples.helloplc4x;
+
+import org.apache.commons.cli.*;
+
+public class CliOptions {
+
+    private static Options options;
+
+    private final String connectionString;
+    private final String[] fieldAddress;
+
+    public static CliOptions fromArgs(String[] args) {
+        options = new Options();
+        // Required arguments
+        options.addOption(
+            Option.builder()
+                .type(String.class)
+                .longOpt("connection-string")
+                .hasArg()
+                .desc("Connection String")
+                .required()
+                .build());
+        options.addOption(
+            Option.builder()
+                .type(String.class)
+                .longOpt("field-addresses")
+                .hasArgs()
+                .desc("Field Addresses (Space separated).")
+                .required()
+                .build());
+
+        CommandLineParser parser = new DefaultParser();
+        CommandLine commandLine;
+        try {
+            commandLine = parser.parse(options, args);
+
+            String connectionString = commandLine.getOptionValue("connection-string");
+            String[] fieldAddress = commandLine.getOptionValues("field-addresses");
+
+            return new CliOptions(connectionString, fieldAddress);
+        } catch (ParseException e) {
+            System.err.println(e.getMessage());
+            return null;
+        }
+    }
+
+    public static void printHelp() {
+        HelpFormatter formatter = new HelpFormatter();
+        formatter.printHelp("HelloPlc4x", options);
+    }
+
+    public CliOptions(String connectionString, String[] fieldAddress) {
+        this.connectionString = connectionString;
+        this.fieldAddress = fieldAddress;
+    }
+
+    public String getConnectionString() {
+        return connectionString;
+    }
+
+    public String[] getFieldAddress() {
+        return fieldAddress;
+    }
+
+}
diff --git a/plc4j/examples/hello-world-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java b/plc4j/examples/hello-world-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java
index dd04d78bd1a..23ea8c8e9a9 100644
--- a/plc4j/examples/hello-world-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java
+++ b/plc4j/examples/hello-world-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java
@@ -1,114 +1,114 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.examples.helloplc4x;
-
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.CompletableFuture;
-
-public class HelloPlc4x {
-
-    private static final Logger logger = LoggerFactory.getLogger(HelloPlc4x.class);
-
-    /**
-     * Example code do demonstrate using PLC4X.
-     *
-     * @param args ignored.
-     */
-    public static void main(String[] args) throws Exception {
-        CliOptions options = CliOptions.fromArgs(args);
-        if (options == null) {
-            CliOptions.printHelp();
-            // Could not parse.
-            System.exit(1);
-        }
-
-        // Establish a connection to the plc using the url provided as first argument
-        try (PlcConnection plcConnection = new PlcDriverManager().getConnection(options.getConnectionString())) {
-
-            // Check if this connection support reading of data.
-            if (!plcConnection.getMetadata().canRead()) {
-                logger.error("This connection doesn't support reading.");
-                return;
-            }
-
-            // Create a new read request:
-            // - Give the single item requested the alias name "value"
-            PlcReadRequest.Builder builder = plcConnection.readRequestBuilder();
-            for (int i = 0; i < options.getFieldAddress().length; i++) {
-                builder.addItem("value-" + i, options.getFieldAddress()[i]);
-            }
-            PlcReadRequest readRequest = builder.build();
-
-            //////////////////////////////////////////////////////////
-            // Read synchronously ...
-            // NOTICE: the ".get()" immediately lets this thread pause until
-            // the response is processed and available.
-            logger.info("Synchronous request ...");
-            PlcReadResponse syncResponse = readRequest.execute().get();
-            // Simply iterating over the field names returned in the response.
-            printResponse(syncResponse);
-
-            //////////////////////////////////////////////////////////
-            // Read asynchronously ...
-            // Register a callback executed as soon as a response arrives.
-            logger.info("Asynchronous request ...");
-            CompletableFuture<? extends PlcReadResponse> asyncResponse = readRequest.execute();
-            asyncResponse.whenComplete((readResponse, throwable) -> {
-                if (readResponse != null) {
-                    printResponse(readResponse);
-                } else {
-                    logger.error("An error occurred: " + throwable.getMessage(), throwable);
-                }
-            });
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private static void printResponse(PlcReadResponse response) {
-        for (String fieldName : response.getFieldNames()) {
-            if(response.getResponseCode(fieldName) == PlcResponseCode.OK) {
-                int numValues = response.getNumberOfValues(fieldName);
-                // If it's just one element, output just one single line.
-                if(numValues == 1) {
-                    logger.info("Value[" + fieldName + "]: " + response.getObject(fieldName));
-                }
-                // If it's more than one element, output each in a single row.
-                else {
-                    logger.info("Value[" + fieldName + "]:");
-                    for(int i = 0; i < numValues; i++) {
-                        logger.info(" - " + response.getObject(fieldName, i));
-                    }
-                }
-            }
-            // Something went wrong, to output an error message instead.
-            else {
-                logger.error("Error[" + fieldName + "]: " + response.getResponseCode(fieldName).name());
-            }
-        }
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.examples.helloplc4x;
+
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.CompletableFuture;
+
+public class HelloPlc4x {
+
+    private static final Logger logger = LoggerFactory.getLogger(HelloPlc4x.class);
+
+    /**
+     * Example code do demonstrate using PLC4X.
+     *
+     * @param args ignored.
+     */
+    public static void main(String[] args) throws Exception {
+        CliOptions options = CliOptions.fromArgs(args);
+        if (options == null) {
+            CliOptions.printHelp();
+            // Could not parse.
+            System.exit(1);
+        }
+
+        // Establish a connection to the plc using the url provided as first argument
+        try (PlcConnection plcConnection = new PlcDriverManager().getConnection(options.getConnectionString())) {
+
+            // Check if this connection support reading of data.
+            if (!plcConnection.getMetadata().canRead()) {
+                logger.error("This connection doesn't support reading.");
+                return;
+            }
+
+            // Create a new read request:
+            // - Give the single item requested the alias name "value"
+            PlcReadRequest.Builder builder = plcConnection.readRequestBuilder();
+            for (int i = 0; i < options.getFieldAddress().length; i++) {
+                builder.addItem("value-" + i, options.getFieldAddress()[i]);
+            }
+            PlcReadRequest readRequest = builder.build();
+
+            //////////////////////////////////////////////////////////
+            // Read synchronously ...
+            // NOTICE: the ".get()" immediately lets this thread pause until
+            // the response is processed and available.
+            logger.info("Synchronous request ...");
+            PlcReadResponse syncResponse = readRequest.execute().get();
+            // Simply iterating over the field names returned in the response.
+            printResponse(syncResponse);
+
+            //////////////////////////////////////////////////////////
+            // Read asynchronously ...
+            // Register a callback executed as soon as a response arrives.
+            logger.info("Asynchronous request ...");
+            CompletableFuture<? extends PlcReadResponse> asyncResponse = readRequest.execute();
+            asyncResponse.whenComplete((readResponse, throwable) -> {
+                if (readResponse != null) {
+                    printResponse(readResponse);
+                } else {
+                    logger.error("An error occurred: " + throwable.getMessage(), throwable);
+                }
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static void printResponse(PlcReadResponse response) {
+        for (String fieldName : response.getFieldNames()) {
+            if(response.getResponseCode(fieldName) == PlcResponseCode.OK) {
+                int numValues = response.getNumberOfValues(fieldName);
+                // If it's just one element, output just one single line.
+                if(numValues == 1) {
+                    logger.info("Value[" + fieldName + "]: " + response.getObject(fieldName));
+                }
+                // If it's more than one element, output each in a single row.
+                else {
+                    logger.info("Value[" + fieldName + "]:");
+                    for(int i = 0; i < numValues; i++) {
+                        logger.info(" - " + response.getObject(fieldName, i));
+                    }
+                }
+            }
+            // Something went wrong, to output an error message instead.
+            else {
+                logger.error("Error[" + fieldName + "]: " + response.getResponseCode(fieldName).name());
+            }
+        }
+    }
+
+}
diff --git a/plc4j/examples/hello-world-plc4x/src/main/resources/logback.xml b/plc4j/examples/hello-world-plc4x/src/main/resources/logback.xml
index 27d40c0c608..514ad8a176b 100644
--- a/plc4j/examples/hello-world-plc4x/src/main/resources/logback.xml
+++ b/plc4j/examples/hello-world-plc4x/src/main/resources/logback.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoders are assigned the type
-         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="info">
-    <appender-ref ref="STDOUT" />
-  </root>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="info">
+    <appender-ref ref="STDOUT" />
+  </root>
+
 </configuration>
\ No newline at end of file
diff --git a/plc4j/examples/pom.xml b/plc4j/examples/pom.xml
index 020bf79d976..c19905d2fdc 100644
--- a/plc4j/examples/pom.xml
+++ b/plc4j/examples/pom.xml
@@ -1,120 +1,120 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <groupId>org.apache.plc4x.examples</groupId>
-  <artifactId>plc4j-examples</artifactId>
-  <packaging>pom</packaging>
-
-  <name>PLC4J: Examples</name>
-  <description>Parent of all java based application example modules.</description>
-
-  <properties>
-    <app.main.class>override-this-property-in-application-pom</app.main.class>
-  </properties>
-
-  <modules>
-    <module>dummy-driver</module>
-    <module>hello-cloud-azure</module>
-    <module>hello-cloud-google</module>
-    <module>hello-connectivity-kafka</module>
-    <module>hello-connectivity-mqtt</module>
-    <module>hello-integration-edgent</module>
-    <module>hello-opm</module>
-    <module>hello-storage-elasticsearch</module>
-    <module>hello-webapp</module>
-    <module>hello-world-plc4x</module>
-    <module>hello-integration-iotdb</module>
-  </modules>
-
-  <build>
-    <plugins>
-      <!-- This is just examples including these checks here requires an insane amount of housekeeping. -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <!-- Build a fat jar containing all dependencies -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.1</version>
-        <executions>
-          <execution>
-            <id>generate-uber-jar</id>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <transformers combine.children="append">
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                  <mainClass>${app.main.class}</mainClass>
-                </transformer>
-              </transformers>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-
-    <pluginManagement>
-      <plugins>
-        <!-- No need to deploy examples in a maven repo -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-deploy-plugin</artifactId>
-          <configuration>
-            <skip>true</skip>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>ch.qos.logback</groupId>
-        <artifactId>logback-core</artifactId>
-        <version>${logback.version}</version>
-        <scope>compile</scope>
-      </dependency>
-      <dependency>
-        <groupId>ch.qos.logback</groupId>
-        <artifactId>logback-classic</artifactId>
-        <version>${logback.version}</version>
-        <scope>compile</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.apache.plc4x.examples</groupId>
+  <artifactId>plc4j-examples</artifactId>
+  <packaging>pom</packaging>
+
+  <name>PLC4J: Examples</name>
+  <description>Parent of all java based application example modules.</description>
+
+  <properties>
+    <app.main.class>override-this-property-in-application-pom</app.main.class>
+  </properties>
+
+  <modules>
+    <module>dummy-driver</module>
+    <module>hello-cloud-azure</module>
+    <module>hello-cloud-google</module>
+    <module>hello-connectivity-kafka</module>
+    <module>hello-connectivity-mqtt</module>
+    <module>hello-integration-edgent</module>
+    <module>hello-opm</module>
+    <module>hello-storage-elasticsearch</module>
+    <module>hello-webapp</module>
+    <module>hello-world-plc4x</module>
+    <module>hello-integration-iotdb</module>
+  </modules>
+
+  <build>
+    <plugins>
+      <!-- This is just examples including these checks here requires an insane amount of housekeeping. -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <!-- Build a fat jar containing all dependencies -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.2.1</version>
+        <executions>
+          <execution>
+            <id>generate-uber-jar</id>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers combine.children="append">
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>${app.main.class}</mainClass>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+
+    <pluginManagement>
+      <plugins>
+        <!-- No need to deploy examples in a maven repo -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-core</artifactId>
+        <version>${logback.version}</version>
+        <scope>compile</scope>
+      </dependency>
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-classic</artifactId>
+        <version>${logback.version}</version>
+        <scope>compile</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/integrations/apache-calcite/pom.xml b/plc4j/integrations/apache-calcite/pom.xml
index 6b367aee168..59baf0b030e 100644
--- a/plc4j/integrations/apache-calcite/pom.xml
+++ b/plc4j/integrations/apache-calcite/pom.xml
@@ -1,97 +1,97 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-integrations</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>plc4j-apache-calcite</artifactId>
-
-  <name>PLC4J: Integrations: Apache Calcite</name>
-
-  <properties>
-    <calcite-core.version>1.21.0</calcite-core.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.calcite</groupId>
-      <artifactId>calcite-core</artifactId>
-      <version>${calcite-core.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.calcite</groupId>
-      <artifactId>calcite-linq4j</artifactId>
-      <version>${calcite-core.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-scraper</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-simulated</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <!--<scope>test</scope>-->
-    </dependency>
-  </dependencies>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>com.google.protobuf</groupId>
-        <artifactId>protobuf-java</artifactId>
-        <version>3.6.1</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <usedDependencies>
-            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
-          </usedDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-integrations</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>plc4j-apache-calcite</artifactId>
+
+  <name>PLC4J: Integrations: Apache Calcite</name>
+
+  <properties>
+    <calcite-core.version>1.21.0</calcite-core.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.calcite</groupId>
+      <artifactId>calcite-core</artifactId>
+      <version>${calcite-core.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.calcite</groupId>
+      <artifactId>calcite-linq4j</artifactId>
+      <version>${calcite-core.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-scraper</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-simulated</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <!--<scope>test</scope>-->
+    </dependency>
+  </dependencies>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-java</artifactId>
+        <version>3.6.1</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <usedDependencies>
+            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
+          </usedDependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+
 </project>
\ No newline at end of file
diff --git a/plc4j/integrations/apache-calcite/src/main/java/org/apache/plc4x/Plc4xBaseTable.java b/plc4j/integrations/apache-calcite/src/main/java/org/apache/plc4x/Plc4xBaseTable.java
index 7437b42643d..5725bec0dcf 100644
--- a/plc4j/integrations/apache-calcite/src/main/java/org/apache/plc4x/Plc4xBaseTable.java
+++ b/plc4j/integrations/apache-calcite/src/main/java/org/apache/plc4x/Plc4xBaseTable.java
@@ -1,198 +1,198 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x;
-
-import org.apache.calcite.DataContext;
-import org.apache.calcite.linq4j.AbstractEnumerable;
-import org.apache.calcite.linq4j.Enumerable;
-import org.apache.calcite.linq4j.Enumerator;
-import org.apache.calcite.rel.*;
-import org.apache.calcite.rel.type.RelDataType;
-import org.apache.calcite.rel.type.RelDataTypeFactory;
-import org.apache.calcite.schema.Statistic;
-import org.apache.calcite.schema.impl.AbstractTable;
-import org.apache.calcite.util.ImmutableBitSet;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.scraper.config.JobConfiguration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * Base for Stream and "Table" version of the Plc4xTable.
- * Needs to be subclassed due to usage of "instanceof" in Calcites internals.
- */
-public abstract class Plc4xBaseTable extends AbstractTable {
-
-    private static final Logger logger = LoggerFactory.getLogger(Plc4xBaseTable.class);
-
-    private final BlockingQueue<Plc4xSchema.Record> queue;
-    private final JobConfiguration conf;
-    private final long tableCutoff;
-    private Plc4xSchema.Record current;
-    private List<String> names;
-
-    public Plc4xBaseTable(BlockingQueue<Plc4xSchema.Record> queue, JobConfiguration conf, long tableCutoff) {
-        this.tableCutoff = tableCutoff;
-        logger.info("Instantiating new PLC4X Table with configuration: {}", conf);
-        this.queue = queue;
-        this.conf = conf;
-        // Extract names
-        names = new ArrayList<>(conf.getFields().keySet());
-    }
-
-    @Override
-    public Statistic getStatistic() {
-        return new Statistic() {
-
-            public Double getRowCount() {
-                return tableCutoff > 0 ? (double)tableCutoff : null;
-            }
-
-            public boolean isKey(ImmutableBitSet columns) {
-                return false;
-            }
-
-            public List<RelReferentialConstraint> getReferentialConstraints() {
-                return Collections.emptyList();
-            }
-
-            public List<RelCollation> getCollations() {
-                return Collections.singletonList(RelCollationImpl.of(new RelFieldCollation(0, RelFieldCollation.Direction.ASCENDING)));
-            }
-
-            public RelDistribution getDistribution() {
-                return RelDistributionTraitDef.INSTANCE.getDefault();
-            }
-        };
-    }
-
-    @Override
-    public RelDataType getRowType(RelDataTypeFactory typeFactory) {
-        // Create the table spec
-        // Block until the first result is in the queue
-        CompletableFuture<Plc4xSchema.Record> future = CompletableFuture.supplyAsync(new FirstElementFetcher(queue));
-        Plc4xSchema.Record first;
-        try {
-            first = future.get(5, TimeUnit.SECONDS);
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new PlcRuntimeException("Thread was interrupted!", e);
-        } catch (ExecutionException | TimeoutException e) {
-            throw new PlcRuntimeException("Unable to fetch first record and infer arguments!", e);
-        }
-        logger.info("Inferring types for Table '{}' based on values: {}", conf.getName(), first.values);
-        // Extract types
-        List<RelDataType> types = names.stream()
-            .map(n -> {
-                Object o = first.values.get(n);
-                logger.debug("Infer field '{}' as class '{}'", n, o.getClass());
-                return typeFactory.createJavaType(o.getClass());
-            })
-            .collect(Collectors.toList());
-        List<String> pre = new ArrayList<>(Arrays.asList("timestamp", "source"));
-        pre.addAll(names);
-        List<RelDataType> preTypes = Stream.of(Timestamp.class, String.class)
-            .map(typeFactory::createJavaType)
-            .collect(Collectors.toList());
-        preTypes.addAll(types);
-        return typeFactory.createStructType(preTypes, pre);
-    }
-
-    /**
-     * if tableCutoff is positive, then the row gets limited to that.
-     */
-    public Enumerable<Object[]> scan(DataContext root) {
-        return new AbstractEnumerable<Object[]>() {
-            @Override
-            public Enumerator<Object[]> enumerator() {
-                return new Enumerator<Object[]>() {
-
-                    private final AtomicLong counter = new AtomicLong(0);
-
-                    @Override
-                    public Object[] current() {
-                        List<Object> objects = new ArrayList<>(Arrays.asList(new Timestamp(current.timestamp.toEpochMilli()), current.source));
-                        List<Object> objects2 = names.stream().map(name -> current.values.get(name)).collect(Collectors.toList());
-                        objects.addAll(objects2);
-                        return objects.toArray();
-                    }
-
-                    @Override
-                    public boolean moveNext() {
-                        try {
-                            current = queue.take();
-                            // If stream, simply return
-                            if (tableCutoff <= 0L) {
-                                return true;
-                            }
-                            // If table, return if below cutoff
-                            return counter.getAndIncrement() < tableCutoff;
-                        } catch (InterruptedException e) {
-                            Thread.currentThread().interrupt();
-                        }
-                        return false;
-                    }
-
-                    @Override
-                    public void reset() {
-                        counter.set(0);
-                    }
-
-                    @Override
-                    public void close() {
-                        // Unimplemented
-                    }
-                };
-            }
-        };
-    }
-
-    /**
-     * Waits until a first (non null) element is in the queue
-     */
-    private static class FirstElementFetcher implements Supplier<Plc4xSchema.Record> {
-
-        private final BlockingQueue<Plc4xSchema.Record> queue;
-
-        private FirstElementFetcher(BlockingQueue<Plc4xSchema.Record> queue) {
-            this.queue = queue;
-        }
-
-        @Override
-        public Plc4xSchema.Record get() {
-            Plc4xSchema.Record first;
-            do {
-                first = queue.peek();
-            } while (first == null);
-            return first;
-        }
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x;
+
+import org.apache.calcite.DataContext;
+import org.apache.calcite.linq4j.AbstractEnumerable;
+import org.apache.calcite.linq4j.Enumerable;
+import org.apache.calcite.linq4j.Enumerator;
+import org.apache.calcite.rel.*;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.rel.type.RelDataTypeFactory;
+import org.apache.calcite.schema.Statistic;
+import org.apache.calcite.schema.impl.AbstractTable;
+import org.apache.calcite.util.ImmutableBitSet;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.scraper.config.JobConfiguration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * Base for Stream and "Table" version of the Plc4xTable.
+ * Needs to be subclassed due to usage of "instanceof" in Calcites internals.
+ */
+public abstract class Plc4xBaseTable extends AbstractTable {
+
+    private static final Logger logger = LoggerFactory.getLogger(Plc4xBaseTable.class);
+
+    private final BlockingQueue<Plc4xSchema.Record> queue;
+    private final JobConfiguration conf;
+    private final long tableCutoff;
+    private Plc4xSchema.Record current;
+    private List<String> names;
+
+    public Plc4xBaseTable(BlockingQueue<Plc4xSchema.Record> queue, JobConfiguration conf, long tableCutoff) {
+        this.tableCutoff = tableCutoff;
+        logger.info("Instantiating new PLC4X Table with configuration: {}", conf);
+        this.queue = queue;
+        this.conf = conf;
+        // Extract names
+        names = new ArrayList<>(conf.getFields().keySet());
+    }
+
+    @Override
+    public Statistic getStatistic() {
+        return new Statistic() {
+
+            public Double getRowCount() {
+                return tableCutoff > 0 ? (double)tableCutoff : null;
+            }
+
+            public boolean isKey(ImmutableBitSet columns) {
+                return false;
+            }
+
+            public List<RelReferentialConstraint> getReferentialConstraints() {
+                return Collections.emptyList();
+            }
+
+            public List<RelCollation> getCollations() {
+                return Collections.singletonList(RelCollationImpl.of(new RelFieldCollation(0, RelFieldCollation.Direction.ASCENDING)));
+            }
+
+            public RelDistribution getDistribution() {
+                return RelDistributionTraitDef.INSTANCE.getDefault();
+            }
+        };
+    }
+
+    @Override
+    public RelDataType getRowType(RelDataTypeFactory typeFactory) {
+        // Create the table spec
+        // Block until the first result is in the queue
+        CompletableFuture<Plc4xSchema.Record> future = CompletableFuture.supplyAsync(new FirstElementFetcher(queue));
+        Plc4xSchema.Record first;
+        try {
+            first = future.get(5, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new PlcRuntimeException("Thread was interrupted!", e);
+        } catch (ExecutionException | TimeoutException e) {
+            throw new PlcRuntimeException("Unable to fetch first record and infer arguments!", e);
+        }
+        logger.info("Inferring types for Table '{}' based on values: {}", conf.getName(), first.values);
+        // Extract types
+        List<RelDataType> types = names.stream()
+            .map(n -> {
+                Object o = first.values.get(n);
+                logger.debug("Infer field '{}' as class '{}'", n, o.getClass());
+                return typeFactory.createJavaType(o.getClass());
+            })
+            .collect(Collectors.toList());
+        List<String> pre = new ArrayList<>(Arrays.asList("timestamp", "source"));
+        pre.addAll(names);
+        List<RelDataType> preTypes = Stream.of(Timestamp.class, String.class)
+            .map(typeFactory::createJavaType)
+            .collect(Collectors.toList());
+        preTypes.addAll(types);
+        return typeFactory.createStructType(preTypes, pre);
+    }
+
+    /**
+     * if tableCutoff is positive, then the row gets limited to that.
+     */
+    public Enumerable<Object[]> scan(DataContext root) {
+        return new AbstractEnumerable<Object[]>() {
+            @Override
+            public Enumerator<Object[]> enumerator() {
+                return new Enumerator<Object[]>() {
+
+                    private final AtomicLong counter = new AtomicLong(0);
+
+                    @Override
+                    public Object[] current() {
+                        List<Object> objects = new ArrayList<>(Arrays.asList(new Timestamp(current.timestamp.toEpochMilli()), current.source));
+                        List<Object> objects2 = names.stream().map(name -> current.values.get(name)).collect(Collectors.toList());
+                        objects.addAll(objects2);
+                        return objects.toArray();
+                    }
+
+                    @Override
+                    public boolean moveNext() {
+                        try {
+                            current = queue.take();
+                            // If stream, simply return
+                            if (tableCutoff <= 0L) {
+                                return true;
+                            }
+                            // If table, return if below cutoff
+                            return counter.getAndIncrement() < tableCutoff;
+                        } catch (InterruptedException e) {
+                            Thread.currentThread().interrupt();
+                        }
+                        return false;
+                    }
+
+                    @Override
+                    public void reset() {
+                        counter.set(0);
+                    }
+
+                    @Override
+                    public void close() {
+                        // Unimplemented
+                    }
+                };
+            }
+        };
+    }
+
+    /**
+     * Waits until a first (non null) element is in the queue
+     */
+    private static class FirstElementFetcher implements Supplier<Plc4xSchema.Record> {
+
+        private final BlockingQueue<Plc4xSchema.Record> queue;
+
+        private FirstElementFetcher(BlockingQueue<Plc4xSchema.Record> queue) {
+            this.queue = queue;
+        }
+
+        @Override
+        public Plc4xSchema.Record get() {
+            Plc4xSchema.Record first;
+            do {
+                first = queue.peek();
+            } while (first == null);
+            return first;
+        }
+    }
+
+}
diff --git a/plc4j/integrations/apache-calcite/src/main/java/org/apache/plc4x/Plc4xSchema.java b/plc4j/integrations/apache-calcite/src/main/java/org/apache/plc4x/Plc4xSchema.java
index cac60c6d987..cb8198f1e11 100644
--- a/plc4j/integrations/apache-calcite/src/main/java/org/apache/plc4x/Plc4xSchema.java
+++ b/plc4j/integrations/apache-calcite/src/main/java/org/apache/plc4x/Plc4xSchema.java
@@ -1,105 +1,105 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x;
-
-import org.apache.calcite.schema.Table;
-import org.apache.calcite.schema.impl.AbstractSchema;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.scraper.ResultHandler;
-import org.apache.plc4x.java.scraper.Scraper;
-import org.apache.plc4x.java.scraper.ScraperImpl;
-import org.apache.plc4x.java.scraper.config.JobConfiguration;
-import org.apache.plc4x.java.scraper.config.ScraperConfiguration;
-import org.apache.plc4x.java.scraper.exception.ScraperException;
-
-import java.time.Instant;
-import java.util.Map;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.BlockingQueue;
-import java.util.stream.Collectors;
-
-public class Plc4xSchema extends AbstractSchema {
-
-    protected final ScraperConfiguration configuration;
-    protected final Scraper scraper;
-    protected final QueueHandler handler;
-    protected final Map<String, BlockingQueue<Record>> queues;
-    protected final Map<String, Table> tableMap;
-
-    public Plc4xSchema(ScraperConfiguration configuration, long tableCutoff) throws ScraperException {
-        this.configuration = configuration;
-        this.handler = new QueueHandler();
-        this.scraper = new ScraperImpl(configuration, handler);
-        this.queues = configuration.getJobConfigurations().stream()
-            .collect(Collectors.toMap(
-                JobConfiguration::getName,
-                conf -> new ArrayBlockingQueue<Record>(1000)
-            ));
-        // Create the tables
-        this.tableMap = configuration.getJobConfigurations().stream()
-            .collect(Collectors.toMap(
-                JobConfiguration::getName,
-                conf -> defineTable(queues.get(conf.getName()), conf, tableCutoff)
-            ));
-        // Start the scraper
-        this.scraper.start();
-    }
-
-    Table defineTable(BlockingQueue<Record> queue, JobConfiguration configuration, Long limit) {
-        if (limit <= 0) {
-            return new Plc4xStreamTable(queue, configuration);
-        } else {
-            return new Plc4xTable(queue, configuration, limit);
-        }
-    }
-
-    @Override
-    protected Map<String, Table> getTableMap() {
-        // Return a map of all jobs
-        return this.tableMap;
-    }
-
-    public static class Record {
-
-        public final Instant timestamp;
-        public final String source;
-        public final Map<String, Object> values;
-
-        public Record(Instant timestamp, String source, Map<String, Object> values) {
-            this.timestamp = timestamp;
-            this.source = source;
-            this.values = values;
-        }
-    }
-
-    class QueueHandler implements ResultHandler {
-
-        @Override
-        public void handle(String job, String alias, Map<String, Object> results) {
-            try {
-                Record record = new Record(Instant.now(), alias, results);
-                queues.get(job).put(record);
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                throw new PlcRuntimeException("Handling got interrupted", e);
-            }
-        }
-
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x;
+
+import org.apache.calcite.schema.Table;
+import org.apache.calcite.schema.impl.AbstractSchema;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.scraper.ResultHandler;
+import org.apache.plc4x.java.scraper.Scraper;
+import org.apache.plc4x.java.scraper.ScraperImpl;
+import org.apache.plc4x.java.scraper.config.JobConfiguration;
+import org.apache.plc4x.java.scraper.config.ScraperConfiguration;
+import org.apache.plc4x.java.scraper.exception.ScraperException;
+
+import java.time.Instant;
+import java.util.Map;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.stream.Collectors;
+
+public class Plc4xSchema extends AbstractSchema {
+
+    protected final ScraperConfiguration configuration;
+    protected final Scraper scraper;
+    protected final QueueHandler handler;
+    protected final Map<String, BlockingQueue<Record>> queues;
+    protected final Map<String, Table> tableMap;
+
+    public Plc4xSchema(ScraperConfiguration configuration, long tableCutoff) throws ScraperException {
+        this.configuration = configuration;
+        this.handler = new QueueHandler();
+        this.scraper = new ScraperImpl(configuration, handler);
+        this.queues = configuration.getJobConfigurations().stream()
+            .collect(Collectors.toMap(
+                JobConfiguration::getName,
+                conf -> new ArrayBlockingQueue<Record>(1000)
+            ));
+        // Create the tables
+        this.tableMap = configuration.getJobConfigurations().stream()
+            .collect(Collectors.toMap(
+                JobConfiguration::getName,
+                conf -> defineTable(queues.get(conf.getName()), conf, tableCutoff)
+            ));
+        // Start the scraper
+        this.scraper.start();
+    }
+
+    Table defineTable(BlockingQueue<Record> queue, JobConfiguration configuration, Long limit) {
+        if (limit <= 0) {
+            return new Plc4xStreamTable(queue, configuration);
+        } else {
+            return new Plc4xTable(queue, configuration, limit);
+        }
+    }
+
+    @Override
+    protected Map<String, Table> getTableMap() {
+        // Return a map of all jobs
+        return this.tableMap;
+    }
+
+    public static class Record {
+
+        public final Instant timestamp;
+        public final String source;
+        public final Map<String, Object> values;
+
+        public Record(Instant timestamp, String source, Map<String, Object> values) {
+            this.timestamp = timestamp;
+            this.source = source;
+            this.values = values;
+        }
+    }
+
+    class QueueHandler implements ResultHandler {
+
+        @Override
+        public void handle(String job, String alias, Map<String, Object> results) {
+            try {
+                Record record = new Record(Instant.now(), alias, results);
+                queues.get(job).put(record);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw new PlcRuntimeException("Handling got interrupted", e);
+            }
+        }
+
+    }
+}
diff --git a/plc4j/integrations/apache-calcite/src/main/java/org/apache/plc4x/Plc4xSchemaFactory.java b/plc4j/integrations/apache-calcite/src/main/java/org/apache/plc4x/Plc4xSchemaFactory.java
index 452ed4718c1..31176131399 100644
--- a/plc4j/integrations/apache-calcite/src/main/java/org/apache/plc4x/Plc4xSchemaFactory.java
+++ b/plc4j/integrations/apache-calcite/src/main/java/org/apache/plc4x/Plc4xSchemaFactory.java
@@ -1,69 +1,69 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x;
-
-import org.apache.calcite.schema.Schema;
-import org.apache.calcite.schema.SchemaFactory;
-import org.apache.calcite.schema.SchemaPlus;
-import org.apache.commons.lang3.Validate;
-import org.apache.plc4x.java.scraper.config.ScraperConfiguration;
-import org.apache.plc4x.java.scraper.config.triggeredscraper.ScraperConfigurationTriggeredImpl;
-import org.apache.plc4x.java.scraper.exception.ScraperException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.util.Map;
-
-public class Plc4xSchemaFactory implements SchemaFactory {
-    private static final Logger LOGGER = LoggerFactory.getLogger(Plc4xSchemaFactory.class);
-
-    @Override
-    public Schema create(SchemaPlus parentSchema, String name, Map<String, Object> operand) {
-        // Fetch config
-        Object config = operand.get("config");
-        Validate.notNull(config, "No configuration file given. Please specify operand 'config'...'");
-        // Load configuration from file
-        ScraperConfiguration configuration;
-        try {
-            configuration = ScraperConfiguration.fromFile(config.toString(), ScraperConfigurationTriggeredImpl.class);
-        } catch (IOException e) {
-            throw new IllegalArgumentException("Unable to load configuration file!", e);
-        }
-
-        // Fetch limit
-        Object limit = operand.get("limit");
-        Validate.notNull(limit, "No limit for the number of rows for a table. Please specify operand 'config'...'");
-        long parsedLimit;
-        try {
-            parsedLimit = Long.parseLong(limit.toString());
-        } catch (NumberFormatException e) {
-            throw new IllegalArgumentException("Given limit '" + limit + "' cannot be parsed to valid long!", e);
-        }
-        // Pass the configuration to the Schema
-        try {
-            return new Plc4xSchema(configuration, parsedLimit);
-        } catch (ScraperException e) {
-            LOGGER.warn("Could not evaluate Plc4xSchema",e);
-            //ToDo Exception, but interface does not accept ... null is fishy
-            return null;
-        }
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x;
+
+import org.apache.calcite.schema.Schema;
+import org.apache.calcite.schema.SchemaFactory;
+import org.apache.calcite.schema.SchemaPlus;
+import org.apache.commons.lang3.Validate;
+import org.apache.plc4x.java.scraper.config.ScraperConfiguration;
+import org.apache.plc4x.java.scraper.config.triggeredscraper.ScraperConfigurationTriggeredImpl;
+import org.apache.plc4x.java.scraper.exception.ScraperException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.Map;
+
+public class Plc4xSchemaFactory implements SchemaFactory {
+    private static final Logger LOGGER = LoggerFactory.getLogger(Plc4xSchemaFactory.class);
+
+    @Override
+    public Schema create(SchemaPlus parentSchema, String name, Map<String, Object> operand) {
+        // Fetch config
+        Object config = operand.get("config");
+        Validate.notNull(config, "No configuration file given. Please specify operand 'config'...'");
+        // Load configuration from file
+        ScraperConfiguration configuration;
+        try {
+            configuration = ScraperConfiguration.fromFile(config.toString(), ScraperConfigurationTriggeredImpl.class);
+        } catch (IOException e) {
+            throw new IllegalArgumentException("Unable to load configuration file!", e);
+        }
+
+        // Fetch limit
+        Object limit = operand.get("limit");
+        Validate.notNull(limit, "No limit for the number of rows for a table. Please specify operand 'config'...'");
+        long parsedLimit;
+        try {
+            parsedLimit = Long.parseLong(limit.toString());
+        } catch (NumberFormatException e) {
+            throw new IllegalArgumentException("Given limit '" + limit + "' cannot be parsed to valid long!", e);
+        }
+        // Pass the configuration to the Schema
+        try {
+            return new Plc4xSchema(configuration, parsedLimit);
+        } catch (ScraperException e) {
+            LOGGER.warn("Could not evaluate Plc4xSchema",e);
+            //ToDo Exception, but interface does not accept ... null is fishy
+            return null;
+        }
+    }
+
+}
diff --git a/plc4j/integrations/apache-calcite/src/main/java/org/apache/plc4x/Plc4xStreamTable.java b/plc4j/integrations/apache-calcite/src/main/java/org/apache/plc4x/Plc4xStreamTable.java
index 8e40944ff69..2cbbfc619b2 100644
--- a/plc4j/integrations/apache-calcite/src/main/java/org/apache/plc4x/Plc4xStreamTable.java
+++ b/plc4j/integrations/apache-calcite/src/main/java/org/apache/plc4x/Plc4xStreamTable.java
@@ -1,45 +1,45 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x;
-
-import org.apache.calcite.DataContext;
-import org.apache.calcite.linq4j.Enumerable;
-import org.apache.calcite.schema.ScannableTable;
-import org.apache.calcite.schema.StreamableTable;
-import org.apache.calcite.schema.Table;
-import org.apache.plc4x.java.scraper.config.JobConfiguration;
-
-import java.util.concurrent.BlockingQueue;
-
-public class Plc4xStreamTable extends Plc4xBaseTable implements ScannableTable, StreamableTable {
-
-    public Plc4xStreamTable(BlockingQueue<Plc4xSchema.Record> queue, JobConfiguration conf) {
-        super(queue, conf, -1L);
-    }
-
-    @Override
-    public Enumerable<Object[]> scan(DataContext root) {
-        return super.scan(root);
-    }
-
-    @Override
-    public Table stream() {
-        return this;
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x;
+
+import org.apache.calcite.DataContext;
+import org.apache.calcite.linq4j.Enumerable;
+import org.apache.calcite.schema.ScannableTable;
+import org.apache.calcite.schema.StreamableTable;
+import org.apache.calcite.schema.Table;
+import org.apache.plc4x.java.scraper.config.JobConfiguration;
+
+import java.util.concurrent.BlockingQueue;
+
+public class Plc4xStreamTable extends Plc4xBaseTable implements ScannableTable, StreamableTable {
+
+    public Plc4xStreamTable(BlockingQueue<Plc4xSchema.Record> queue, JobConfiguration conf) {
+        super(queue, conf, -1L);
+    }
+
+    @Override
+    public Enumerable<Object[]> scan(DataContext root) {
+        return super.scan(root);
+    }
+
+    @Override
+    public Table stream() {
+        return this;
+    }
+}
diff --git a/plc4j/integrations/apache-calcite/src/main/java/org/apache/plc4x/Plc4xTable.java b/plc4j/integrations/apache-calcite/src/main/java/org/apache/plc4x/Plc4xTable.java
index 096c6612057..6b48db23024 100644
--- a/plc4j/integrations/apache-calcite/src/main/java/org/apache/plc4x/Plc4xTable.java
+++ b/plc4j/integrations/apache-calcite/src/main/java/org/apache/plc4x/Plc4xTable.java
@@ -1,39 +1,39 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x;
-
-import org.apache.calcite.DataContext;
-import org.apache.calcite.linq4j.Enumerable;
-import org.apache.calcite.schema.ScannableTable;
-import org.apache.plc4x.java.scraper.config.JobConfiguration;
-
-import java.util.concurrent.BlockingQueue;
-
-public class Plc4xTable extends Plc4xBaseTable implements ScannableTable {
-
-    public Plc4xTable(BlockingQueue<Plc4xSchema.Record> queue, JobConfiguration conf, long tableCutoff) {
-        super(queue, conf, tableCutoff);
-    }
-
-    @Override
-    public Enumerable<Object[]> scan(DataContext root) {
-        return super.scan(root);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x;
+
+import org.apache.calcite.DataContext;
+import org.apache.calcite.linq4j.Enumerable;
+import org.apache.calcite.schema.ScannableTable;
+import org.apache.plc4x.java.scraper.config.JobConfiguration;
+
+import java.util.concurrent.BlockingQueue;
+
+public class Plc4xTable extends Plc4xBaseTable implements ScannableTable {
+
+    public Plc4xTable(BlockingQueue<Plc4xSchema.Record> queue, JobConfiguration conf, long tableCutoff) {
+        super(queue, conf, tableCutoff);
+    }
+
+    @Override
+    public Enumerable<Object[]> scan(DataContext root) {
+        return super.scan(root);
+    }
+
+}
diff --git a/plc4j/integrations/apache-calcite/src/test/java/org/apache/plc4x/DriverManagerTest.java b/plc4j/integrations/apache-calcite/src/test/java/org/apache/plc4x/DriverManagerTest.java
index 7f6c248861b..e3f6a0091ed 100644
--- a/plc4j/integrations/apache-calcite/src/test/java/org/apache/plc4x/DriverManagerTest.java
+++ b/plc4j/integrations/apache-calcite/src/test/java/org/apache/plc4x/DriverManagerTest.java
@@ -1,88 +1,88 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x;
-
-import org.apache.calcite.jdbc.CalciteConnection;
-import org.apache.calcite.jdbc.Driver;
-import org.apache.plc4x.java.scraper.config.ScraperConfiguration;
-import org.apache.plc4x.java.scraper.config.ScraperConfigurationClassicImpl;
-import org.apache.plc4x.java.scraper.config.triggeredscraper.ScraperConfigurationTriggeredImpl;
-import org.apache.plc4x.java.scraper.exception.ScraperException;
-import org.assertj.core.api.WithAssertions;
-import org.junit.jupiter.api.Test;
-
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.util.Properties;
-
-public class DriverManagerTest implements WithAssertions {
-
-    @Test
-    void query() throws SQLException, IOException, ScraperException {
-        Driver driver = new Driver();
-        Connection connection = driver.connect("jdbc:calcite:asdf;lex=MYSQL_ANSI", new Properties());
-
-        CalciteConnection calciteConnection = connection.unwrap(CalciteConnection.class);
-        calciteConnection.getRootSchema().add("plc4x", new Plc4xSchema(ScraperConfiguration.fromFile("src/test/resources/example.yml", ScraperConfigurationClassicImpl.class), 100));
-
-        ResultSet rs = connection.prepareStatement("SELECT * FROM \"plc4x\".\"job1\"").executeQuery();
-        validateResult(rs);
-
-        connection.close();
-    }
-
-    @Test
-    void query2() throws IOException, SQLException {
-        Driver driver = new Driver();
-        Connection connection = driver.connect("jdbc:calcite:model=src/test/resources/model.json", new Properties());
-
-        ResultSet rs = connection.prepareStatement("SELECT * FROM \"PLC4X-TABLES\".\"job1\"").executeQuery();
-
-        validateResult(rs);
-
-        connection.close();
-    }
-
-    private void validateResult(ResultSet rs) throws SQLException {
-        // Assert columns
-        ResultSetMetaData metadata = rs.getMetaData();
-        assertThat(metadata.getColumnCount()).isEqualTo(4);
-        // Column names
-        assertThat(metadata.getColumnName(1)).isEqualTo("timestamp");
-        assertThat(metadata.getColumnName(2)).isEqualTo("source");
-        assertThat(metadata.getColumnName(3)).isEqualTo("test");
-        assertThat(metadata.getColumnName(4)).isEqualTo("test2");
-        // Column types
-        assertThat(metadata.getColumnTypeName(1)).isEqualTo("TIMESTAMP");
-        assertThat(metadata.getColumnTypeName(2)).isEqualTo("VARCHAR");
-        assertThat(metadata.getColumnTypeName(3)).isEqualTo("INTEGER");
-        assertThat(metadata.getColumnTypeName(4)).isEqualTo("VARCHAR");
-
-        int rowCount = 0;
-        while (rs.next()) {
-            rowCount++;
-        }
-
-        assertThat(rowCount).isEqualTo(100);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x;
+
+import org.apache.calcite.jdbc.CalciteConnection;
+import org.apache.calcite.jdbc.Driver;
+import org.apache.plc4x.java.scraper.config.ScraperConfiguration;
+import org.apache.plc4x.java.scraper.config.ScraperConfigurationClassicImpl;
+import org.apache.plc4x.java.scraper.config.triggeredscraper.ScraperConfigurationTriggeredImpl;
+import org.apache.plc4x.java.scraper.exception.ScraperException;
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.util.Properties;
+
+public class DriverManagerTest implements WithAssertions {
+
+    @Test
+    void query() throws SQLException, IOException, ScraperException {
+        Driver driver = new Driver();
+        Connection connection = driver.connect("jdbc:calcite:asdf;lex=MYSQL_ANSI", new Properties());
+
+        CalciteConnection calciteConnection = connection.unwrap(CalciteConnection.class);
+        calciteConnection.getRootSchema().add("plc4x", new Plc4xSchema(ScraperConfiguration.fromFile("src/test/resources/example.yml", ScraperConfigurationClassicImpl.class), 100));
+
+        ResultSet rs = connection.prepareStatement("SELECT * FROM \"plc4x\".\"job1\"").executeQuery();
+        validateResult(rs);
+
+        connection.close();
+    }
+
+    @Test
+    void query2() throws IOException, SQLException {
+        Driver driver = new Driver();
+        Connection connection = driver.connect("jdbc:calcite:model=src/test/resources/model.json", new Properties());
+
+        ResultSet rs = connection.prepareStatement("SELECT * FROM \"PLC4X-TABLES\".\"job1\"").executeQuery();
+
+        validateResult(rs);
+
+        connection.close();
+    }
+
+    private void validateResult(ResultSet rs) throws SQLException {
+        // Assert columns
+        ResultSetMetaData metadata = rs.getMetaData();
+        assertThat(metadata.getColumnCount()).isEqualTo(4);
+        // Column names
+        assertThat(metadata.getColumnName(1)).isEqualTo("timestamp");
+        assertThat(metadata.getColumnName(2)).isEqualTo("source");
+        assertThat(metadata.getColumnName(3)).isEqualTo("test");
+        assertThat(metadata.getColumnName(4)).isEqualTo("test2");
+        // Column types
+        assertThat(metadata.getColumnTypeName(1)).isEqualTo("TIMESTAMP");
+        assertThat(metadata.getColumnTypeName(2)).isEqualTo("VARCHAR");
+        assertThat(metadata.getColumnTypeName(3)).isEqualTo("INTEGER");
+        assertThat(metadata.getColumnTypeName(4)).isEqualTo("VARCHAR");
+
+        int rowCount = 0;
+        while (rs.next()) {
+            rowCount++;
+        }
+
+        assertThat(rowCount).isEqualTo(100);
+    }
+
+}
diff --git a/plc4j/integrations/apache-calcite/src/test/java/org/apache/plc4x/Plc4XBaseTableTest.java b/plc4j/integrations/apache-calcite/src/test/java/org/apache/plc4x/Plc4XBaseTableTest.java
index b03139378ff..386efc56375 100644
--- a/plc4j/integrations/apache-calcite/src/test/java/org/apache/plc4x/Plc4XBaseTableTest.java
+++ b/plc4j/integrations/apache-calcite/src/test/java/org/apache/plc4x/Plc4XBaseTableTest.java
@@ -1,52 +1,52 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x;
-
-import org.apache.calcite.linq4j.Enumerator;
-import org.apache.plc4x.java.scraper.config.JobConfigurationClassicImpl;
-import org.apache.plc4x.java.scraper.config.JobConfigurationImpl;
-import org.assertj.core.api.WithAssertions;
-import org.junit.jupiter.api.Test;
-
-import java.time.Instant;
-import java.util.Collections;
-import java.util.Map;
-import java.util.concurrent.ArrayBlockingQueue;
-
-class Plc4XBaseTableTest implements WithAssertions {
-
-    @Test
-    void testOnBlockingQueue() {
-        ArrayBlockingQueue<Plc4xSchema.Record> queue = new ArrayBlockingQueue<>(100);
-        Plc4xStreamTable table = new Plc4xStreamTable(queue, new JobConfigurationImpl(
-            "job1",
-            null,
-            100,
-            Collections.emptyList(),
-            Collections.singletonMap("key", "address")));
-
-        Map<String, Object> objects = Collections.singletonMap("key", "value");
-        queue.add(new Plc4xSchema.Record(Instant.now(), "", objects));
-
-        Enumerator<Object[]> enumerator = table.scan(null).enumerator();
-
-        assertThat(enumerator.moveNext()).isTrue();
-        assertThat(enumerator.current()).contains("value");
-    }
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x;
+
+import org.apache.calcite.linq4j.Enumerator;
+import org.apache.plc4x.java.scraper.config.JobConfigurationClassicImpl;
+import org.apache.plc4x.java.scraper.config.JobConfigurationImpl;
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.Test;
+
+import java.time.Instant;
+import java.util.Collections;
+import java.util.Map;
+import java.util.concurrent.ArrayBlockingQueue;
+
+class Plc4XBaseTableTest implements WithAssertions {
+
+    @Test
+    void testOnBlockingQueue() {
+        ArrayBlockingQueue<Plc4xSchema.Record> queue = new ArrayBlockingQueue<>(100);
+        Plc4xStreamTable table = new Plc4xStreamTable(queue, new JobConfigurationImpl(
+            "job1",
+            null,
+            100,
+            Collections.emptyList(),
+            Collections.singletonMap("key", "address")));
+
+        Map<String, Object> objects = Collections.singletonMap("key", "value");
+        queue.add(new Plc4xSchema.Record(Instant.now(), "", objects));
+
+        Enumerator<Object[]> enumerator = table.scan(null).enumerator();
+
+        assertThat(enumerator.moveNext()).isTrue();
+        assertThat(enumerator.current()).contains("value");
+    }
 }
\ No newline at end of file
diff --git a/plc4j/integrations/apache-calcite/src/test/java/org/apache/plc4x/Plc4xSchemaFactoryTest.java b/plc4j/integrations/apache-calcite/src/test/java/org/apache/plc4x/Plc4xSchemaFactoryTest.java
index a70eac7b647..bb5ef07a019 100644
--- a/plc4j/integrations/apache-calcite/src/test/java/org/apache/plc4x/Plc4xSchemaFactoryTest.java
+++ b/plc4j/integrations/apache-calcite/src/test/java/org/apache/plc4x/Plc4xSchemaFactoryTest.java
@@ -1,35 +1,35 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x;
-
-import org.assertj.core.api.WithAssertions;
-import org.junit.jupiter.api.Test;
-
-import java.util.Collections;
-
-class Plc4xSchemaFactoryTest implements WithAssertions {
-
-    @Test
-    void create() {
-        Plc4xSchemaFactory factory = new Plc4xSchemaFactory();
-        assertThatThrownBy(() -> factory.create(null, "", Collections.emptyMap()))
-            .isInstanceOf(NullPointerException.class)
-            .hasMessageContaining("Please specify operand 'config'...");
-    }
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x;
+
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.Collections;
+
+class Plc4xSchemaFactoryTest implements WithAssertions {
+
+    @Test
+    void create() {
+        Plc4xSchemaFactory factory = new Plc4xSchemaFactory();
+        assertThatThrownBy(() -> factory.create(null, "", Collections.emptyMap()))
+            .isInstanceOf(NullPointerException.class)
+            .hasMessageContaining("Please specify operand 'config'...");
+    }
 }
\ No newline at end of file
diff --git a/plc4j/integrations/apache-calcite/src/test/resources/example.yml b/plc4j/integrations/apache-calcite/src/test/resources/example.yml
index 7294ab06bfd..3d77b0b985d 100644
--- a/plc4j/integrations/apache-calcite/src/test/resources/example.yml
+++ b/plc4j/integrations/apache-calcite/src/test/resources/example.yml
@@ -1,32 +1,32 @@
-# ----------------------------------------------------------------------------
-# 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
-#
-#    http://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.
-# ----------------------------------------------------------------------------
----
-sources:
-  test: test:test
-  test2: test:test2
-
-jobs:
-  - name: job1
-    scrapeRate: 10
-    sources:
-    - test
-    - test2
-    fields:
-      test: 'RANDOM/test:Integer'
+# ----------------------------------------------------------------------------
+# 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
+#
+#    http://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.
+# ----------------------------------------------------------------------------
+---
+sources:
+  test: test:test
+  test2: test:test2
+
+jobs:
+  - name: job1
+    scrapeRate: 10
+    sources:
+    - test
+    - test2
+    fields:
+      test: 'RANDOM/test:Integer'
       test2: 'RANDOM/test:String'
\ No newline at end of file
diff --git a/plc4j/integrations/apache-calcite/src/test/resources/logback.xml b/plc4j/integrations/apache-calcite/src/test/resources/logback.xml
index dd243bdcf73..8a965dcd06c 100644
--- a/plc4j/integrations/apache-calcite/src/test/resources/logback.xml
+++ b/plc4j/integrations/apache-calcite/src/test/resources/logback.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="
-                  http://ch.qos.logback/xml/ns/logback
-                  https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoders are assigned the type
-         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="info">
-    <appender-ref ref="STDOUT" />
-  </root>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="
+                  http://ch.qos.logback/xml/ns/logback
+                  https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="info">
+    <appender-ref ref="STDOUT" />
+  </root>
+
 </configuration>
\ No newline at end of file
diff --git a/plc4j/integrations/apache-calcite/src/test/resources/model.json b/plc4j/integrations/apache-calcite/src/test/resources/model.json
index c19be916f93..23d9689cf06 100644
--- a/plc4j/integrations/apache-calcite/src/test/resources/model.json
+++ b/plc4j/integrations/apache-calcite/src/test/resources/model.json
@@ -1,40 +1,40 @@
-/*
- * 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
- *
- * http://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.
- */
-{
-  "version": 1,
-  "defaultSchema": "PLC4X",
-  "schemas": [
-  {
-    "name": "PLC4X",
-    "type": "custom",
-    "factory": "org.apache.plc4x.Plc4xSchemaFactory",
-    "operand": {
-      "config": "src/test/resources/example.yml",
-      "limit": -1
-    }
-  },
-  {
-    "name": "PLC4X-TABLES",
-    "type": "custom",
-    "factory": "org.apache.plc4x.Plc4xSchemaFactory",
-    "operand": {
-      "config": "src/test/resources/example.yml",
-      "limit": 100
-    }
-  }
-  ]
+/*
+ * 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
+ *
+ * http://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.
+ */
+{
+  "version": 1,
+  "defaultSchema": "PLC4X",
+  "schemas": [
+  {
+    "name": "PLC4X",
+    "type": "custom",
+    "factory": "org.apache.plc4x.Plc4xSchemaFactory",
+    "operand": {
+      "config": "src/test/resources/example.yml",
+      "limit": -1
+    }
+  },
+  {
+    "name": "PLC4X-TABLES",
+    "type": "custom",
+    "factory": "org.apache.plc4x.Plc4xSchemaFactory",
+    "operand": {
+      "config": "src/test/resources/example.yml",
+      "limit": 100
+    }
+  }
+  ]
 }
\ No newline at end of file
diff --git a/plc4j/integrations/apache-camel/pom.xml b/plc4j/integrations/apache-camel/pom.xml
index 197c0d95b11..79b814a4a70 100644
--- a/plc4j/integrations/apache-camel/pom.xml
+++ b/plc4j/integrations/apache-camel/pom.xml
@@ -1,182 +1,182 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-integrations</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-apache-camel</artifactId>
-
-  <name>PLC4J: Integrations: Apache Camel</name>
-  <description>Integration module for integrating PLC4X into Apache Camel.</description>
-
-  <properties>
-    <camel.version>2.24.2</camel.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-core</artifactId>
-      <!-- TODO: version temporary defined due to PLC4X-22-->
-      <version>${camel.version}</version>
-    </dependency>
-
-    <!-- Support camel documentation-->
-    <!-- TODO: Do we need this? -->
-    <!--dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>apt</artifactId>
-      <!- TODO: version temporary defined due to PLC4X-22->
-      <version>${camel.version}</version>
-      <scope>provided</scope>
-    </dependency-->
-
-    <!-- TODO: Do we need this? And if we do, definitely not as scope=compile -->
-    <!--dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-core</artifactId>
-        <!- TODO: version temporary defined due to PLC4X-22->
-        <exclusions>
-          <exclusion>
-            <artifactId>hamcrest-core</artifactId>
-            <groupId>org.hamcrest</groupId>
-          </exclusion>
-        </exclusions>
-      </dependency-->
-
-    <!-- Testing -->
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-test</artifactId>
-      <!-- TODO: version temporary defined due to PLC4X-22-->
-      <version>${camel.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ads</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <!-- avoids java.lang.NoClassDefFoundError: javax/activation/DataHandler in Plc4XProducerTest on Java 11-->
-      <groupId>javax.activation</groupId>
-      <artifactId>javax.activation-api</artifactId>
-      <version>1.2.0</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <dependencyManagement>
-    <dependencies>
-      <!-- Camel BOM -->
-      <!-- TODO: version temporary disabled due to PLC4X-22-->
-      <!--dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-parent</artifactId>
-        <version>2.20.1</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency-->
-    </dependencies>
-  </dependencyManagement>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-package-maven-plugin</artifactId>
-        <version>2.20.1</version>
-        <executions>
-          <execution>
-            <id>prepare</id>
-            <goals>
-              <goal>prepare-components</goal>
-            </goals>
-            <phase>generate-resources</phase>
-          </execution>
-          <execution>
-            <id>validate</id>
-            <goals>
-              <goal>validate-components</goal>
-            </goals>
-            <phase>prepare-package</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- to generate the MANIFEST-FILE of the bundle -->
-      <!-- TODO: Seems this plugin is messing up the jqassistant execution. Also it doesn't seem to have any effect on the output as it is not executed at all and there is no MANIFEST.MF in the output -->
-      <!--plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>3.5.0</version>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>${project.groupId}}.${project.artifactId}</Bundle-SymbolicName>
-            <Export-Service>org.apache.camel.spi.ComponentResolver;component=s7</Export-Service>
-          </instructions>
-        </configuration>
-      </plugin-->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.0.2</version>
-        <executions>
-          <execution>
-            <id>check-dependencies</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>analyze-only</goal>
-            </goals>
-            <configuration>
-              <failOnWarning>true</failOnWarning>
-              <ignoredDependencies combine.children="append">
-                <ignoredDependency>org.apache.plc4x:plc4j-driver-ads</ignoredDependency>
-              </ignoredDependencies>
-              <usedDependencies combine.children="append">
-                <usedDependency>javax.activation:javax.activation-api</usedDependency>
-              </usedDependencies>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-integrations</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-apache-camel</artifactId>
+
+  <name>PLC4J: Integrations: Apache Camel</name>
+  <description>Integration module for integrating PLC4X into Apache Camel.</description>
+
+  <properties>
+    <camel.version>2.24.2</camel.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
+      <!-- TODO: version temporary defined due to PLC4X-22-->
+      <version>${camel.version}</version>
+    </dependency>
+
+    <!-- Support camel documentation-->
+    <!-- TODO: Do we need this? -->
+    <!--dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>apt</artifactId>
+      <!- TODO: version temporary defined due to PLC4X-22->
+      <version>${camel.version}</version>
+      <scope>provided</scope>
+    </dependency-->
+
+    <!-- TODO: Do we need this? And if we do, definitely not as scope=compile -->
+    <!--dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-core</artifactId>
+        <!- TODO: version temporary defined due to PLC4X-22->
+        <exclusions>
+          <exclusion>
+            <artifactId>hamcrest-core</artifactId>
+            <groupId>org.hamcrest</groupId>
+          </exclusion>
+        </exclusions>
+      </dependency-->
+
+    <!-- Testing -->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-test</artifactId>
+      <!-- TODO: version temporary defined due to PLC4X-22-->
+      <version>${camel.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ads</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <!-- avoids java.lang.NoClassDefFoundError: javax/activation/DataHandler in Plc4XProducerTest on Java 11-->
+      <groupId>javax.activation</groupId>
+      <artifactId>javax.activation-api</artifactId>
+      <version>1.2.0</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <dependencyManagement>
+    <dependencies>
+      <!-- Camel BOM -->
+      <!-- TODO: version temporary disabled due to PLC4X-22-->
+      <!--dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-parent</artifactId>
+        <version>2.20.1</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency-->
+    </dependencies>
+  </dependencyManagement>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-package-maven-plugin</artifactId>
+        <version>2.20.1</version>
+        <executions>
+          <execution>
+            <id>prepare</id>
+            <goals>
+              <goal>prepare-components</goal>
+            </goals>
+            <phase>generate-resources</phase>
+          </execution>
+          <execution>
+            <id>validate</id>
+            <goals>
+              <goal>validate-components</goal>
+            </goals>
+            <phase>prepare-package</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- to generate the MANIFEST-FILE of the bundle -->
+      <!-- TODO: Seems this plugin is messing up the jqassistant execution. Also it doesn't seem to have any effect on the output as it is not executed at all and there is no MANIFEST.MF in the output -->
+      <!--plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>3.5.0</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Bundle-SymbolicName>${project.groupId}}.${project.artifactId}</Bundle-SymbolicName>
+            <Export-Service>org.apache.camel.spi.ComponentResolver;component=s7</Export-Service>
+          </instructions>
+        </configuration>
+      </plugin-->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>3.0.2</version>
+        <executions>
+          <execution>
+            <id>check-dependencies</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>analyze-only</goal>
+            </goals>
+            <configuration>
+              <failOnWarning>true</failOnWarning>
+              <ignoredDependencies combine.children="append">
+                <ignoredDependency>org.apache.plc4x:plc4j-driver-ads</ignoredDependency>
+              </ignoredDependencies>
+              <usedDependencies combine.children="append">
+                <usedDependency>javax.activation:javax.activation-api</usedDependency>
+              </usedDependencies>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/integrations/apache-camel/src/main/docs/PLC4X.adoc b/plc4j/integrations/apache-camel/src/main/docs/PLC4X.adoc
index 3aa5fe88546..fddf464df17 100644
--- a/plc4j/integrations/apache-camel/src/main/docs/PLC4X.adoc
+++ b/plc4j/integrations/apache-camel/src/main/docs/PLC4X.adoc
@@ -1,22 +1,22 @@
-//
-//  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
-//
-//      http://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.
-//
-
-// component options: START
-// component options: END
-
-// endpoint options: START
+//
+//  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
+//
+//      http://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.
+//
+
+// component options: START
+// component options: END
+
+// endpoint options: START
 // endpoint options: END
\ No newline at end of file
diff --git a/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Constants.java b/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Constants.java
index eefde57a403..452be25f059 100644
--- a/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Constants.java
+++ b/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Constants.java
@@ -1,29 +1,29 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.camel;
-
-public class Constants {
-
-    public static final String FIELD_NAME_HEADER = "fieldName";
-    public static final String FIELD_QUERY_HEADER = "fieldQuery";
-    
-    private Constants() {
-      throw new IllegalStateException("Utility class!");
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.camel;
+
+public class Constants {
+
+    public static final String FIELD_NAME_HEADER = "fieldName";
+    public static final String FIELD_QUERY_HEADER = "fieldQuery";
+    
+    private Constants() {
+      throw new IllegalStateException("Utility class!");
+    }
+}
diff --git a/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XComponent.java b/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XComponent.java
index 276cbc4c967..16e087e9e4d 100644
--- a/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XComponent.java
+++ b/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XComponent.java
@@ -1,40 +1,40 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.camel;
-
-import org.apache.camel.Endpoint;
-import org.apache.camel.impl.DefaultComponent;
-
-import java.util.Map;
-
-public class Plc4XComponent extends DefaultComponent {
-
-    @Override
-    protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
-        Endpoint endpoint = new Plc4XEndpoint(uri, this);
-        setProperties(endpoint, parameters);
-        return endpoint;
-    }
-
-    @Override
-    protected void afterConfiguration(String uri, String remaining, Endpoint endpoint, Map<String, Object> parameters) {
-        Plc4XEndpoint plc4XEndpoint = (Plc4XEndpoint) endpoint;
-        plc4XEndpoint.setDriver(remaining.split(":")[0]);
-    }
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.camel;
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.impl.DefaultComponent;
+
+import java.util.Map;
+
+public class Plc4XComponent extends DefaultComponent {
+
+    @Override
+    protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
+        Endpoint endpoint = new Plc4XEndpoint(uri, this);
+        setProperties(endpoint, parameters);
+        return endpoint;
+    }
+
+    @Override
+    protected void afterConfiguration(String uri, String remaining, Endpoint endpoint, Map<String, Object> parameters) {
+        Plc4XEndpoint plc4XEndpoint = (Plc4XEndpoint) endpoint;
+        plc4XEndpoint.setDriver(remaining.split(":")[0]);
+    }
 }
\ No newline at end of file
diff --git a/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XConsumer.java b/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XConsumer.java
index 91bf0f02977..4dbccf2a15f 100644
--- a/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XConsumer.java
+++ b/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XConsumer.java
@@ -1,125 +1,125 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.camel;
-
-import org.apache.camel.*;
-import org.apache.camel.spi.ExceptionHandler;
-import org.apache.camel.support.LoggingExceptionHandler;
-import org.apache.camel.support.ServiceSupport;
-import org.apache.camel.util.AsyncProcessorConverterHelper;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.exceptions.PlcException;
-import org.apache.plc4x.java.api.messages.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-import java.util.Collection;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-public class Plc4XConsumer extends ServiceSupport implements Consumer, java.util.function.Consumer<PlcSubscriptionEvent> {
-    private static final Logger LOGGER = LoggerFactory.getLogger(Plc4XConsumer.class);
-
-    private Plc4XEndpoint endpoint;
-    private AsyncProcessor processor;
-    private ExceptionHandler exceptionHandler;
-    private PlcConnection plcConnection;
-    private String fieldQuery;
-    private Class<?> dataType;
-    private PlcSubscriptionResponse subscriptionResponse;
-
-    public Plc4XConsumer(Plc4XEndpoint endpoint, Processor processor) throws PlcException {
-        this.endpoint = endpoint;
-        this.dataType = endpoint.getDataType();
-        this.processor = AsyncProcessorConverterHelper.convert(processor);
-        this.exceptionHandler = new LoggingExceptionHandler(endpoint.getCamelContext(), getClass());
-        String plc4xURI = endpoint.getEndpointUri().replaceFirst("plc4x:/?/?", "");
-        this.plcConnection = endpoint.getPlcDriverManager().getConnection(plc4xURI);
-        this.fieldQuery = endpoint.getAddress();
-    }
-
-    @Override
-    public String toString() {
-        return "Plc4XConsumer[" + endpoint + "]";
-    }
-
-    @Override
-    public Endpoint getEndpoint() {
-        return endpoint;
-    }
-
-    public ExceptionHandler getExceptionHandler() {
-        return exceptionHandler;
-    }
-
-    public void setExceptionHandler(ExceptionHandler exceptionHandler) {
-        this.exceptionHandler = exceptionHandler;
-    }
-
-    @Override
-    protected void doStart() throws InterruptedException, ExecutionException {
-        // TODO: Is it correct to only support one field?
-        PlcSubscriptionRequest request = plcConnection.subscriptionRequestBuilder()
-            .addCyclicField("default", fieldQuery, Duration.of(3, ChronoUnit.SECONDS)).build();
-        subscriptionResponse = request.execute().get();
-        // TODO: we need to return the plcSubscriptionResponse here too as we need this to unsubscribe...
-        // TODO: figure out what to do with this
-        // plcSubscriber.register(this, plcSubscriptionResponse.getSubscriptionHandles());
-    }
-
-    @Override
-    protected void doStop() throws InterruptedException, ExecutionException, TimeoutException {
-        PlcUnsubscriptionRequest request = plcConnection.unsubscriptionRequestBuilder().addHandles(subscriptionResponse.getSubscriptionHandles()).build();
-        CompletableFuture<? extends PlcUnsubscriptionResponse> unsubscriptionFuture = request.execute();
-        /*PlcUnsubscriptionResponse unsubscriptionResponse =*/ unsubscriptionFuture.get(5, TimeUnit.SECONDS);
-        // TODO: Handle the response ...
-        try {
-            plcConnection.close();
-        } catch (Exception e) {
-            LOGGER.error("Error closing connection", e);
-        }
-    }
-
-    @Override
-    public void accept(PlcSubscriptionEvent plcSubscriptionEvent) {
-        LOGGER.debug("Received {}", plcSubscriptionEvent);
-        try {
-            Exchange exchange = endpoint.createExchange();
-            exchange.getIn().setBody(unwrapIfSingle(plcSubscriptionEvent.getAllObjects("default")));
-            processor.process(exchange);
-        } catch (Exception e) {
-            exceptionHandler.handleException(e);
-        }
-    }
-
-    private Object unwrapIfSingle(Collection collection) {
-        if (collection.isEmpty()) {
-            return null;
-        }
-        if (collection.size() == 1) {
-            return collection.iterator().next();
-        }
-        return collection;
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.camel;
+
+import org.apache.camel.*;
+import org.apache.camel.spi.ExceptionHandler;
+import org.apache.camel.support.LoggingExceptionHandler;
+import org.apache.camel.support.ServiceSupport;
+import org.apache.camel.util.AsyncProcessorConverterHelper;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.exceptions.PlcException;
+import org.apache.plc4x.java.api.messages.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.Collection;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+public class Plc4XConsumer extends ServiceSupport implements Consumer, java.util.function.Consumer<PlcSubscriptionEvent> {
+    private static final Logger LOGGER = LoggerFactory.getLogger(Plc4XConsumer.class);
+
+    private Plc4XEndpoint endpoint;
+    private AsyncProcessor processor;
+    private ExceptionHandler exceptionHandler;
+    private PlcConnection plcConnection;
+    private String fieldQuery;
+    private Class<?> dataType;
+    private PlcSubscriptionResponse subscriptionResponse;
+
+    public Plc4XConsumer(Plc4XEndpoint endpoint, Processor processor) throws PlcException {
+        this.endpoint = endpoint;
+        this.dataType = endpoint.getDataType();
+        this.processor = AsyncProcessorConverterHelper.convert(processor);
+        this.exceptionHandler = new LoggingExceptionHandler(endpoint.getCamelContext(), getClass());
+        String plc4xURI = endpoint.getEndpointUri().replaceFirst("plc4x:/?/?", "");
+        this.plcConnection = endpoint.getPlcDriverManager().getConnection(plc4xURI);
+        this.fieldQuery = endpoint.getAddress();
+    }
+
+    @Override
+    public String toString() {
+        return "Plc4XConsumer[" + endpoint + "]";
+    }
+
+    @Override
+    public Endpoint getEndpoint() {
+        return endpoint;
+    }
+
+    public ExceptionHandler getExceptionHandler() {
+        return exceptionHandler;
+    }
+
+    public void setExceptionHandler(ExceptionHandler exceptionHandler) {
+        this.exceptionHandler = exceptionHandler;
+    }
+
+    @Override
+    protected void doStart() throws InterruptedException, ExecutionException {
+        // TODO: Is it correct to only support one field?
+        PlcSubscriptionRequest request = plcConnection.subscriptionRequestBuilder()
+            .addCyclicField("default", fieldQuery, Duration.of(3, ChronoUnit.SECONDS)).build();
+        subscriptionResponse = request.execute().get();
+        // TODO: we need to return the plcSubscriptionResponse here too as we need this to unsubscribe...
+        // TODO: figure out what to do with this
+        // plcSubscriber.register(this, plcSubscriptionResponse.getSubscriptionHandles());
+    }
+
+    @Override
+    protected void doStop() throws InterruptedException, ExecutionException, TimeoutException {
+        PlcUnsubscriptionRequest request = plcConnection.unsubscriptionRequestBuilder().addHandles(subscriptionResponse.getSubscriptionHandles()).build();
+        CompletableFuture<? extends PlcUnsubscriptionResponse> unsubscriptionFuture = request.execute();
+        /*PlcUnsubscriptionResponse unsubscriptionResponse =*/ unsubscriptionFuture.get(5, TimeUnit.SECONDS);
+        // TODO: Handle the response ...
+        try {
+            plcConnection.close();
+        } catch (Exception e) {
+            LOGGER.error("Error closing connection", e);
+        }
+    }
+
+    @Override
+    public void accept(PlcSubscriptionEvent plcSubscriptionEvent) {
+        LOGGER.debug("Received {}", plcSubscriptionEvent);
+        try {
+            Exchange exchange = endpoint.createExchange();
+            exchange.getIn().setBody(unwrapIfSingle(plcSubscriptionEvent.getAllObjects("default")));
+            processor.process(exchange);
+        } catch (Exception e) {
+            exceptionHandler.handleException(e);
+        }
+    }
+
+    private Object unwrapIfSingle(Collection collection) {
+        if (collection.isEmpty()) {
+            return null;
+        }
+        if (collection.size() == 1) {
+            return collection.iterator().next();
+        }
+        return collection;
+    }
+
+}
diff --git a/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XEndpoint.java b/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XEndpoint.java
index 9a9cec99eb1..70b7128127c 100644
--- a/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XEndpoint.java
+++ b/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XEndpoint.java
@@ -1,136 +1,136 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.camel;
-
-import org.apache.camel.*;
-import org.apache.camel.impl.DefaultEndpoint;
-import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.UriEndpoint;
-import org.apache.camel.spi.UriParam;
-import org.apache.camel.spi.UriPath;
-import org.apache.plc4x.java.PlcDriverManager;
-
-import java.util.Objects;
-
-@UriEndpoint(scheme = "plc4x", title = "PLC4X", syntax = "plc4x:driver", label = "plc4x")
-public class Plc4XEndpoint extends DefaultEndpoint {
-
-    /**
-     * The name of the PLC4X driver
-     */
-    @UriPath(label = "common")
-    @Metadata(required = "true")
-    @SuppressWarnings("unused")
-    private String driver;
-
-    /**
-     * The address for the PLC4X driver
-     */
-    @UriParam
-    @Metadata(required = "false")
-    @SuppressWarnings("unused")
-    private String address;
-
-    /**
-     * TODO: document me
-     */
-    @UriParam
-    @Metadata(required = "false")
-    @SuppressWarnings("unused")
-    private Class dataType;
-
-    private final PlcDriverManager plcDriverManager;
-
-    public Plc4XEndpoint(String endpointUri, Component component) {
-        super(endpointUri, component);
-        plcDriverManager = new PlcDriverManager();
-    }
-
-    @Override
-    public Producer createProducer() throws Exception {
-        return new Plc4XProducer(this);
-    }
-
-    @Override
-    public Consumer createConsumer(Processor processor) throws Exception {
-        return new Plc4XConsumer(this, processor);
-    }
-
-    @Override
-    public PollingConsumer createPollingConsumer() throws Exception {
-        return new Plc4XPollingConsumer(this);
-    }
-
-    @Override
-    public boolean isSingleton() {
-        return true;
-    }
-
-    public PlcDriverManager getPlcDriverManager() {
-        return plcDriverManager;
-    }
-
-    public String getDriver() {
-        return driver;
-    }
-
-    public void setDriver(String driver) {
-        this.driver = driver;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public Class getDataType() {
-        return dataType;
-    }
-
-    public void setDataType(Class dataType) {
-        this.dataType = dataType;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof Plc4XEndpoint)) {
-            return false;
-        }
-        if (!super.equals(o)) {
-            return false;
-        }
-        Plc4XEndpoint that = (Plc4XEndpoint) o;
-        return Objects.equals(getDriver(), that.getDriver()) &&
-            Objects.equals(getAddress(), that.getAddress()) &&
-            Objects.equals(getDataType(), that.getDataType()) &&
-            Objects.equals(getPlcDriverManager(), that.getPlcDriverManager());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), getDriver(), getAddress(), getDataType(), getPlcDriverManager());
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.camel;
+
+import org.apache.camel.*;
+import org.apache.camel.impl.DefaultEndpoint;
+import org.apache.camel.spi.Metadata;
+import org.apache.camel.spi.UriEndpoint;
+import org.apache.camel.spi.UriParam;
+import org.apache.camel.spi.UriPath;
+import org.apache.plc4x.java.PlcDriverManager;
+
+import java.util.Objects;
+
+@UriEndpoint(scheme = "plc4x", title = "PLC4X", syntax = "plc4x:driver", label = "plc4x")
+public class Plc4XEndpoint extends DefaultEndpoint {
+
+    /**
+     * The name of the PLC4X driver
+     */
+    @UriPath(label = "common")
+    @Metadata(required = "true")
+    @SuppressWarnings("unused")
+    private String driver;
+
+    /**
+     * The address for the PLC4X driver
+     */
+    @UriParam
+    @Metadata(required = "false")
+    @SuppressWarnings("unused")
+    private String address;
+
+    /**
+     * TODO: document me
+     */
+    @UriParam
+    @Metadata(required = "false")
+    @SuppressWarnings("unused")
+    private Class dataType;
+
+    private final PlcDriverManager plcDriverManager;
+
+    public Plc4XEndpoint(String endpointUri, Component component) {
+        super(endpointUri, component);
+        plcDriverManager = new PlcDriverManager();
+    }
+
+    @Override
+    public Producer createProducer() throws Exception {
+        return new Plc4XProducer(this);
+    }
+
+    @Override
+    public Consumer createConsumer(Processor processor) throws Exception {
+        return new Plc4XConsumer(this, processor);
+    }
+
+    @Override
+    public PollingConsumer createPollingConsumer() throws Exception {
+        return new Plc4XPollingConsumer(this);
+    }
+
+    @Override
+    public boolean isSingleton() {
+        return true;
+    }
+
+    public PlcDriverManager getPlcDriverManager() {
+        return plcDriverManager;
+    }
+
+    public String getDriver() {
+        return driver;
+    }
+
+    public void setDriver(String driver) {
+        this.driver = driver;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public Class getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(Class dataType) {
+        this.dataType = dataType;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof Plc4XEndpoint)) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+        Plc4XEndpoint that = (Plc4XEndpoint) o;
+        return Objects.equals(getDriver(), that.getDriver()) &&
+            Objects.equals(getAddress(), that.getAddress()) &&
+            Objects.equals(getDataType(), that.getDataType()) &&
+            Objects.equals(getPlcDriverManager(), that.getPlcDriverManager());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), getDriver(), getAddress(), getDataType(), getPlcDriverManager());
+    }
+
+}
diff --git a/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XPollingConsumer.java b/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XPollingConsumer.java
index 5467711f47f..98ecafbd3f6 100644
--- a/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XPollingConsumer.java
+++ b/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XPollingConsumer.java
@@ -1,135 +1,135 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.camel;
-
-import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
-import org.apache.camel.PollingConsumer;
-import org.apache.camel.spi.ExceptionHandler;
-import org.apache.camel.support.LoggingExceptionHandler;
-import org.apache.camel.support.ServiceSupport;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.exceptions.PlcException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Collection;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-public class Plc4XPollingConsumer extends ServiceSupport implements PollingConsumer {
-    private static final Logger LOGGER = LoggerFactory.getLogger(Plc4XPollingConsumer.class);
-
-    private Plc4XEndpoint endpoint;
-    private ExceptionHandler exceptionHandler;
-    private PlcConnection plcConnection;
-    private PlcReadRequest.Builder requestBuilder;
-    private Class dataType;
-
-    public Plc4XPollingConsumer(Plc4XEndpoint endpoint) throws PlcException {
-        this.endpoint = endpoint;
-        this.dataType = endpoint.getDataType();
-        this.exceptionHandler = new LoggingExceptionHandler(endpoint.getCamelContext(), getClass());
-        String plc4xURI = endpoint.getEndpointUri().replaceFirst("plc4x:/?/?", "");
-        this.plcConnection = endpoint.getPlcDriverManager().getConnection(plc4xURI);
-        this.requestBuilder = plcConnection.readRequestBuilder();
-    }
-
-    @Override
-    public String toString() {
-        return "Plc4XConsumer[" + endpoint + "]";
-    }
-
-    @Override
-    public Endpoint getEndpoint() {
-        return endpoint;
-    }
-
-    public ExceptionHandler getExceptionHandler() {
-        return exceptionHandler;
-    }
-
-    public void setExceptionHandler(ExceptionHandler exceptionHandler) {
-        this.exceptionHandler = exceptionHandler;
-    }
-
-    @Override
-    public Exchange receive() {
-        Exchange exchange = endpoint.createExchange();
-        CompletableFuture<? extends PlcReadResponse> read = createReadRequest().execute();
-        try {
-            PlcReadResponse plcReadResponse = read.get();
-            exchange.getIn().setBody(unwrapIfSingle(plcReadResponse.getAllObjects("default")));
-        } catch (InterruptedException | ExecutionException e) {
-            exchange.setException(e);
-        }
-        return exchange;
-    }
-
-    @Override
-    public Exchange receiveNoWait() {
-        return null;
-    }
-
-    @Override
-    public Exchange receive(long timeout) {
-        Exchange exchange = endpoint.createExchange();
-        CompletableFuture<? extends PlcReadResponse> read = createReadRequest().execute();
-        try {
-            PlcReadResponse plcReadResponse = read.get(timeout, TimeUnit.MILLISECONDS);
-            exchange.getIn().setBody(unwrapIfSingle(plcReadResponse.getAllObjects("default")));
-        } catch (InterruptedException | ExecutionException | TimeoutException e) {
-            exchange.setException(e);
-        }
-        return exchange;
-    }
-
-    @Override
-    protected void doStart() {
-        // We don't seem to need to do anything special here.
-    }
-
-    @Override
-    protected void doStop() {
-        try {
-            plcConnection.close();
-        } catch (Exception e) {
-            LOGGER.error("Error closing connection", e);
-        }
-    }
-
-    private PlcReadRequest createReadRequest() {
-        return requestBuilder.addItem("default", endpoint.getAddress()).build();
-    }
-
-    private Object unwrapIfSingle(Collection collection) {
-        if (collection.isEmpty()) {
-            return null;
-        }
-        if (collection.size() == 1) {
-            return collection.iterator().next();
-        }
-        return collection;
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.camel;
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import org.apache.camel.PollingConsumer;
+import org.apache.camel.spi.ExceptionHandler;
+import org.apache.camel.support.LoggingExceptionHandler;
+import org.apache.camel.support.ServiceSupport;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.exceptions.PlcException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Collection;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+public class Plc4XPollingConsumer extends ServiceSupport implements PollingConsumer {
+    private static final Logger LOGGER = LoggerFactory.getLogger(Plc4XPollingConsumer.class);
+
+    private Plc4XEndpoint endpoint;
+    private ExceptionHandler exceptionHandler;
+    private PlcConnection plcConnection;
+    private PlcReadRequest.Builder requestBuilder;
+    private Class dataType;
+
+    public Plc4XPollingConsumer(Plc4XEndpoint endpoint) throws PlcException {
+        this.endpoint = endpoint;
+        this.dataType = endpoint.getDataType();
+        this.exceptionHandler = new LoggingExceptionHandler(endpoint.getCamelContext(), getClass());
+        String plc4xURI = endpoint.getEndpointUri().replaceFirst("plc4x:/?/?", "");
+        this.plcConnection = endpoint.getPlcDriverManager().getConnection(plc4xURI);
+        this.requestBuilder = plcConnection.readRequestBuilder();
+    }
+
+    @Override
+    public String toString() {
+        return "Plc4XConsumer[" + endpoint + "]";
+    }
+
+    @Override
+    public Endpoint getEndpoint() {
+        return endpoint;
+    }
+
+    public ExceptionHandler getExceptionHandler() {
+        return exceptionHandler;
+    }
+
+    public void setExceptionHandler(ExceptionHandler exceptionHandler) {
+        this.exceptionHandler = exceptionHandler;
+    }
+
+    @Override
+    public Exchange receive() {
+        Exchange exchange = endpoint.createExchange();
+        CompletableFuture<? extends PlcReadResponse> read = createReadRequest().execute();
+        try {
+            PlcReadResponse plcReadResponse = read.get();
+            exchange.getIn().setBody(unwrapIfSingle(plcReadResponse.getAllObjects("default")));
+        } catch (InterruptedException | ExecutionException e) {
+            exchange.setException(e);
+        }
+        return exchange;
+    }
+
+    @Override
+    public Exchange receiveNoWait() {
+        return null;
+    }
+
+    @Override
+    public Exchange receive(long timeout) {
+        Exchange exchange = endpoint.createExchange();
+        CompletableFuture<? extends PlcReadResponse> read = createReadRequest().execute();
+        try {
+            PlcReadResponse plcReadResponse = read.get(timeout, TimeUnit.MILLISECONDS);
+            exchange.getIn().setBody(unwrapIfSingle(plcReadResponse.getAllObjects("default")));
+        } catch (InterruptedException | ExecutionException | TimeoutException e) {
+            exchange.setException(e);
+        }
+        return exchange;
+    }
+
+    @Override
+    protected void doStart() {
+        // We don't seem to need to do anything special here.
+    }
+
+    @Override
+    protected void doStop() {
+        try {
+            plcConnection.close();
+        } catch (Exception e) {
+            LOGGER.error("Error closing connection", e);
+        }
+    }
+
+    private PlcReadRequest createReadRequest() {
+        return requestBuilder.addItem("default", endpoint.getAddress()).build();
+    }
+
+    private Object unwrapIfSingle(Collection collection) {
+        if (collection.isEmpty()) {
+            return null;
+        }
+        if (collection.size() == 1) {
+            return collection.iterator().next();
+        }
+        return collection;
+    }
+
+}
diff --git a/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XProducer.java b/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XProducer.java
index d9f70777d4a..ef29dff6d23 100644
--- a/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XProducer.java
+++ b/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XProducer.java
@@ -1,110 +1,110 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.camel;
-
-import org.apache.camel.AsyncCallback;
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-import org.apache.camel.impl.DefaultAsyncProducer;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.exceptions.PlcException;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.messages.PlcWriteResponse;
-
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class Plc4XProducer extends DefaultAsyncProducer {
-    private PlcConnection plcConnection;
-    private AtomicInteger openRequests;
-
-    public Plc4XProducer(Plc4XEndpoint endpoint) throws PlcException {
-        super(endpoint);
-        String plc4xURI = endpoint.getEndpointUri().replaceFirst("plc4x:/?/?", "");
-        plcConnection = endpoint.getPlcDriverManager().getConnection(plc4xURI);
-        if (!plcConnection.getMetadata().canWrite()) {
-            throw new PlcException("This connection (" + plc4xURI + ") doesn't support writing.");
-        }
-        openRequests = new AtomicInteger();
-    }
-
-    @Override
-    public void process(Exchange exchange) throws Exception {
-        Message in = exchange.getIn();
-        String fieldName = in.getHeader(Constants.FIELD_NAME_HEADER, String.class);
-        String fieldQuery = in.getHeader(Constants.FIELD_QUERY_HEADER, String.class);
-        Object body = in.getBody();
-        if (body instanceof List) {
-            List<?> bodyList = in.getBody(List.class);
-            Object[] values = bodyList.toArray();
-//            builder.addItem(fieldName, fieldQuery, values);
-        } else {
-            Object value = in.getBody(Object.class);
-//            builder.addItem(fieldName, fieldQuery, value);
-        }
-        PlcWriteRequest.Builder builder = plcConnection.writeRequestBuilder();
-        CompletableFuture<? extends PlcWriteResponse> completableFuture = builder.build().execute();
-        int currentlyOpenRequests = openRequests.incrementAndGet();
-        try {
-            log.debug("Currently open requests including {}:{}", exchange, currentlyOpenRequests);
-            Object plcWriteResponse = completableFuture.get();
-            if (exchange.getPattern().isOutCapable()) {
-                Message out = exchange.getOut();
-                out.copyFrom(exchange.getIn());
-                out.setBody(plcWriteResponse);
-            } else {
-                in.setBody(plcWriteResponse);
-            }
-        } finally {
-            int openRequestsAfterFinish = openRequests.decrementAndGet();
-            log.trace("Open Requests after {}:{}", exchange, openRequestsAfterFinish);
-        }
-    }
-
-    @Override
-    public boolean process(Exchange exchange, AsyncCallback callback) {
-        try {
-            process(exchange);
-            Message out = exchange.getOut();
-            out.copyFrom(exchange.getIn());
-        } catch (Exception e) {
-            exchange.setOut(null);
-            exchange.setException(e);
-        }
-        callback.done(true);
-        return true;
-    }
-
-    @Override
-    protected void doStop() throws Exception {
-        int openRequestsAtStop = openRequests.get();
-        log.debug("Stopping with {} open requests", openRequestsAtStop);
-        if (openRequestsAtStop > 0) {
-            log.warn("There are still {} open requests", openRequestsAtStop);
-        }
-        try {
-            plcConnection.close();
-        } catch (Exception e) {
-            log.warn("Could not close {}", plcConnection, e);
-        }
-        super.doStop();
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.camel;
+
+import org.apache.camel.AsyncCallback;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.impl.DefaultAsyncProducer;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.exceptions.PlcException;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteResponse;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class Plc4XProducer extends DefaultAsyncProducer {
+    private PlcConnection plcConnection;
+    private AtomicInteger openRequests;
+
+    public Plc4XProducer(Plc4XEndpoint endpoint) throws PlcException {
+        super(endpoint);
+        String plc4xURI = endpoint.getEndpointUri().replaceFirst("plc4x:/?/?", "");
+        plcConnection = endpoint.getPlcDriverManager().getConnection(plc4xURI);
+        if (!plcConnection.getMetadata().canWrite()) {
+            throw new PlcException("This connection (" + plc4xURI + ") doesn't support writing.");
+        }
+        openRequests = new AtomicInteger();
+    }
+
+    @Override
+    public void process(Exchange exchange) throws Exception {
+        Message in = exchange.getIn();
+        String fieldName = in.getHeader(Constants.FIELD_NAME_HEADER, String.class);
+        String fieldQuery = in.getHeader(Constants.FIELD_QUERY_HEADER, String.class);
+        Object body = in.getBody();
+        if (body instanceof List) {
+            List<?> bodyList = in.getBody(List.class);
+            Object[] values = bodyList.toArray();
+//            builder.addItem(fieldName, fieldQuery, values);
+        } else {
+            Object value = in.getBody(Object.class);
+//            builder.addItem(fieldName, fieldQuery, value);
+        }
+        PlcWriteRequest.Builder builder = plcConnection.writeRequestBuilder();
+        CompletableFuture<? extends PlcWriteResponse> completableFuture = builder.build().execute();
+        int currentlyOpenRequests = openRequests.incrementAndGet();
+        try {
+            log.debug("Currently open requests including {}:{}", exchange, currentlyOpenRequests);
+            Object plcWriteResponse = completableFuture.get();
+            if (exchange.getPattern().isOutCapable()) {
+                Message out = exchange.getOut();
+                out.copyFrom(exchange.getIn());
+                out.setBody(plcWriteResponse);
+            } else {
+                in.setBody(plcWriteResponse);
+            }
+        } finally {
+            int openRequestsAfterFinish = openRequests.decrementAndGet();
+            log.trace("Open Requests after {}:{}", exchange, openRequestsAfterFinish);
+        }
+    }
+
+    @Override
+    public boolean process(Exchange exchange, AsyncCallback callback) {
+        try {
+            process(exchange);
+            Message out = exchange.getOut();
+            out.copyFrom(exchange.getIn());
+        } catch (Exception e) {
+            exchange.setOut(null);
+            exchange.setException(e);
+        }
+        callback.done(true);
+        return true;
+    }
+
+    @Override
+    protected void doStop() throws Exception {
+        int openRequestsAtStop = openRequests.get();
+        log.debug("Stopping with {} open requests", openRequestsAtStop);
+        if (openRequestsAtStop > 0) {
+            log.warn("There are still {} open requests", openRequestsAtStop);
+        }
+        try {
+            plcConnection.close();
+        } catch (Exception e) {
+            log.warn("Could not close {}", plcConnection, e);
+        }
+        super.doStop();
+    }
+
+}
diff --git a/plc4j/integrations/apache-camel/src/main/resources/META-INF/services/org/apache/camel/component/plc4x b/plc4j/integrations/apache-camel/src/main/resources/META-INF/services/org/apache/camel/component/plc4x
index 9f443db2f8c..183725c9993 100644
--- a/plc4j/integrations/apache-camel/src/main/resources/META-INF/services/org/apache/camel/component/plc4x
+++ b/plc4j/integrations/apache-camel/src/main/resources/META-INF/services/org/apache/camel/component/plc4x
@@ -1,19 +1,19 @@
-#
-# 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
-#
-#   http://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.
-#
+#
+# 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
+#
+#   http://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.
+#
 class=org.apache.plc4x.camel.Plc4XComponent
\ No newline at end of file
diff --git a/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/ConstantsTest.java b/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/ConstantsTest.java
index b13c074e0be..1526d13e63f 100644
--- a/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/ConstantsTest.java
+++ b/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/ConstantsTest.java
@@ -1,37 +1,37 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.camel;
-
-import org.junit.Test;
-
-import java.lang.reflect.Constructor;
-
-public class ConstantsTest {
-
-    @Test(expected = IllegalStateException.class)
-    public void testConstantsNotInstanceable() throws Throwable {
-        try {
-            Constructor<Constants> constructor = Constants.class.getDeclaredConstructor();
-            constructor.setAccessible(true);
-            constructor.newInstance();
-        } catch (Exception e) {
-            throw e.getCause();
-        }
-    }
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.camel;
+
+import org.junit.Test;
+
+import java.lang.reflect.Constructor;
+
+public class ConstantsTest {
+
+    @Test(expected = IllegalStateException.class)
+    public void testConstantsNotInstanceable() throws Throwable {
+        try {
+            Constructor<Constants> constructor = Constants.class.getDeclaredConstructor();
+            constructor.setAccessible(true);
+            constructor.newInstance();
+        } catch (Exception e) {
+            throw e.getCause();
+        }
+    }
 }
\ No newline at end of file
diff --git a/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/ManualTest.java b/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/ManualTest.java
index 9eff6178c88..f1a8688fecd 100644
--- a/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/ManualTest.java
+++ b/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/ManualTest.java
@@ -1,81 +1,81 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.camel;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.main.Main;
-import org.apache.camel.main.MainListenerSupport;
-import org.apache.camel.main.MainSupport;
-
-import java.util.Date;
-
-public class ManualTest {
-
-    private Main main;
-
-    public static void main(String[] args) throws Exception {
-        ManualTest example = new ManualTest();
-        example.boot();
-    }
-
-    public void boot() throws Exception {
-        // create a Main instance
-        main = new Main();
-        // bind MyBean into the registry
-        main.bind("foo", new MyBean());
-        // add routes
-        main.addRouteBuilder(new MyRouteBuilder());
-        // add event listener
-        main.addMainListener(new Events());
-        // set the properties from a file
-        main.setPropertyPlaceholderLocations("example.properties");
-        // run until you terminate the JVM
-        System.out.println("Starting Camel. Use ctrl + c to terminate the JVM.\n");
-        main.run();
-    }
-
-    private static class MyRouteBuilder extends RouteBuilder {
-        @Override
-        public void configure() {
-            from("plc4x:ads:tcp://10.10.64.40/10.10.64.40.1.1:851/192.168.113.3.1.1:30000?dataType=java.lang.Integer&address=Allgemein_S2.Station")
-                .process(exchange -> System.out.println("Invoked timer at " + new Date()))
-                .bean("foo")
-                .log("Received ${body}");
-        }
-    }
-
-    public static class MyBean {
-        public void callMe() {
-            System.out.println("MyBean.callMe method has been called");
-        }
-    }
-
-    public static class Events extends MainListenerSupport {
-
-        @Override
-        public void afterStart(MainSupport main) {
-            System.out.println("MainExample with Camel is now started!");
-        }
-
-        @Override
-        public void beforeStop(MainSupport main) {
-            System.out.println("MainExample with Camel is now being stopped!");
-        }
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.camel;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.main.Main;
+import org.apache.camel.main.MainListenerSupport;
+import org.apache.camel.main.MainSupport;
+
+import java.util.Date;
+
+public class ManualTest {
+
+    private Main main;
+
+    public static void main(String[] args) throws Exception {
+        ManualTest example = new ManualTest();
+        example.boot();
+    }
+
+    public void boot() throws Exception {
+        // create a Main instance
+        main = new Main();
+        // bind MyBean into the registry
+        main.bind("foo", new MyBean());
+        // add routes
+        main.addRouteBuilder(new MyRouteBuilder());
+        // add event listener
+        main.addMainListener(new Events());
+        // set the properties from a file
+        main.setPropertyPlaceholderLocations("example.properties");
+        // run until you terminate the JVM
+        System.out.println("Starting Camel. Use ctrl + c to terminate the JVM.\n");
+        main.run();
+    }
+
+    private static class MyRouteBuilder extends RouteBuilder {
+        @Override
+        public void configure() {
+            from("plc4x:ads:tcp://10.10.64.40/10.10.64.40.1.1:851/192.168.113.3.1.1:30000?dataType=java.lang.Integer&address=Allgemein_S2.Station")
+                .process(exchange -> System.out.println("Invoked timer at " + new Date()))
+                .bean("foo")
+                .log("Received ${body}");
+        }
+    }
+
+    public static class MyBean {
+        public void callMe() {
+            System.out.println("MyBean.callMe method has been called");
+        }
+    }
+
+    public static class Events extends MainListenerSupport {
+
+        @Override
+        public void afterStart(MainSupport main) {
+            System.out.println("MainExample with Camel is now started!");
+        }
+
+        @Override
+        public void beforeStop(MainSupport main) {
+            System.out.println("MainExample with Camel is now being stopped!");
+        }
+    }
+}
diff --git a/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/MockDriver.java b/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/MockDriver.java
index cb4e00baad9..436d072d714 100644
--- a/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/MockDriver.java
+++ b/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/MockDriver.java
@@ -1,103 +1,103 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.camel;
-
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.messages.*;
-import org.apache.plc4x.java.base.messages.DefaultPlcSubscriptionResponse;
-import org.apache.plc4x.java.base.messages.InternalPlcSubscriptionRequest;
-import org.apache.plc4x.java.base.messages.PlcSubscriber;
-import org.apache.plc4x.java.spi.PlcDriver;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.HashMap;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import static org.mockito.Mockito.*;
-
-public class MockDriver implements PlcDriver {
-
-    public static final Logger LOGGER = LoggerFactory.getLogger(MockDriver.class);
-
-    ExecutorService executorService = Executors.newFixedThreadPool(10);
-
-    @Override
-    public String getProtocolCode() {
-        return "mock";
-    }
-
-    @Override
-    public String getProtocolName() {
-        return "Mock Protocol Implementation";
-    }
-
-    @Override
-    public PlcConnection connect(String url) {
-        // Mock a connection.
-        PlcConnection plcConnectionMock = mock(PlcConnection.class, RETURNS_DEEP_STUBS);
-        when(plcConnectionMock.getMetadata().canRead()).thenReturn(true);
-        when(plcConnectionMock.getMetadata().canWrite()).thenReturn(true);
-        when(plcConnectionMock.readRequestBuilder()).thenReturn(mock(PlcReadRequest.Builder.class, RETURNS_DEEP_STUBS));
-        when(plcConnectionMock.writeRequestBuilder()).thenReturn(mock(PlcWriteRequest.Builder.class, RETURNS_DEEP_STUBS));
-        when(plcConnectionMock.subscriptionRequestBuilder()).thenReturn(mock(PlcSubscriptionRequest.Builder.class, RETURNS_DEEP_STUBS));
-        when(plcConnectionMock.unsubscriptionRequestBuilder()).thenReturn(mock(PlcUnsubscriptionRequest.Builder.class, RETURNS_DEEP_STUBS));
-
-        // Mock a typical subscriber.
-        PlcSubscriber plcSubscriber = mock(PlcSubscriber.class, RETURNS_DEEP_STUBS);
-        when(plcSubscriber.subscribe(any(PlcSubscriptionRequest.class))).thenAnswer(invocation -> {
-            LOGGER.info("Received {}", invocation);
-            // TODO: Translate this so it actually does something ...
-            /*PlcSubscriptionRequest subscriptionRequest = invocation.getArgument(0);
-            List<PlcSubscriptionResponse> responseItems =
-                subscriptionRequest.getFieldNames().stream().map(
-                    fieldName -> subscriptionRequest.getField(fieldName)).map(field -> {
-                    Consumer consumer = subscriptionRequestItem.getConsumer();
-                    executorService.submit(() -> {
-                        while (!Thread.currentThread().isInterrupted()) {
-                            consumer.accept(new SubscriptionEventItem<>(null, Calendar.getInstance(), Collections.singletonList("HelloWorld")));
-                            try {
-                                TimeUnit.MILLISECONDS.sleep(100);
-                            } catch (InterruptedException e) {
-                                Thread.currentThread().interrupt();
-                                throw new RuntimeException(e);
-                            }
-                        }
-                    });
-                    return new SubscriptionResponseItem<>(subscriptionRequestItem,
-                        mock(PlcSubscriptionHandle.class, RETURNS_DEEP_STUBS), PlcResponseCode.OK);
-                }).collect(Collectors.toList());
-            PlcSubscriptionResponse response = new PlcSubscriptionResponse(subscriptionRequest, responseItems);*/
-            PlcSubscriptionResponse response = new DefaultPlcSubscriptionResponse(mock(InternalPlcSubscriptionRequest.class), new HashMap<>());
-            CompletableFuture<PlcSubscriptionResponse> responseFuture = new CompletableFuture<>();
-            responseFuture.complete(response);
-            return responseFuture;
-        });
-        return plcConnectionMock;
-    }
-
-    @Override
-    public PlcConnection connect(String url, PlcAuthentication authentication) {
-        return connect(null);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.camel;
+
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.authentication.PlcAuthentication;
+import org.apache.plc4x.java.api.messages.*;
+import org.apache.plc4x.java.base.messages.DefaultPlcSubscriptionResponse;
+import org.apache.plc4x.java.base.messages.InternalPlcSubscriptionRequest;
+import org.apache.plc4x.java.base.messages.PlcSubscriber;
+import org.apache.plc4x.java.spi.PlcDriver;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import static org.mockito.Mockito.*;
+
+public class MockDriver implements PlcDriver {
+
+    public static final Logger LOGGER = LoggerFactory.getLogger(MockDriver.class);
+
+    ExecutorService executorService = Executors.newFixedThreadPool(10);
+
+    @Override
+    public String getProtocolCode() {
+        return "mock";
+    }
+
+    @Override
+    public String getProtocolName() {
+        return "Mock Protocol Implementation";
+    }
+
+    @Override
+    public PlcConnection connect(String url) {
+        // Mock a connection.
+        PlcConnection plcConnectionMock = mock(PlcConnection.class, RETURNS_DEEP_STUBS);
+        when(plcConnectionMock.getMetadata().canRead()).thenReturn(true);
+        when(plcConnectionMock.getMetadata().canWrite()).thenReturn(true);
+        when(plcConnectionMock.readRequestBuilder()).thenReturn(mock(PlcReadRequest.Builder.class, RETURNS_DEEP_STUBS));
+        when(plcConnectionMock.writeRequestBuilder()).thenReturn(mock(PlcWriteRequest.Builder.class, RETURNS_DEEP_STUBS));
+        when(plcConnectionMock.subscriptionRequestBuilder()).thenReturn(mock(PlcSubscriptionRequest.Builder.class, RETURNS_DEEP_STUBS));
+        when(plcConnectionMock.unsubscriptionRequestBuilder()).thenReturn(mock(PlcUnsubscriptionRequest.Builder.class, RETURNS_DEEP_STUBS));
+
+        // Mock a typical subscriber.
+        PlcSubscriber plcSubscriber = mock(PlcSubscriber.class, RETURNS_DEEP_STUBS);
+        when(plcSubscriber.subscribe(any(PlcSubscriptionRequest.class))).thenAnswer(invocation -> {
+            LOGGER.info("Received {}", invocation);
+            // TODO: Translate this so it actually does something ...
+            /*PlcSubscriptionRequest subscriptionRequest = invocation.getArgument(0);
+            List<PlcSubscriptionResponse> responseItems =
+                subscriptionRequest.getFieldNames().stream().map(
+                    fieldName -> subscriptionRequest.getField(fieldName)).map(field -> {
+                    Consumer consumer = subscriptionRequestItem.getConsumer();
+                    executorService.submit(() -> {
+                        while (!Thread.currentThread().isInterrupted()) {
+                            consumer.accept(new SubscriptionEventItem<>(null, Calendar.getInstance(), Collections.singletonList("HelloWorld")));
+                            try {
+                                TimeUnit.MILLISECONDS.sleep(100);
+                            } catch (InterruptedException e) {
+                                Thread.currentThread().interrupt();
+                                throw new RuntimeException(e);
+                            }
+                        }
+                    });
+                    return new SubscriptionResponseItem<>(subscriptionRequestItem,
+                        mock(PlcSubscriptionHandle.class, RETURNS_DEEP_STUBS), PlcResponseCode.OK);
+                }).collect(Collectors.toList());
+            PlcSubscriptionResponse response = new PlcSubscriptionResponse(subscriptionRequest, responseItems);*/
+            PlcSubscriptionResponse response = new DefaultPlcSubscriptionResponse(mock(InternalPlcSubscriptionRequest.class), new HashMap<>());
+            CompletableFuture<PlcSubscriptionResponse> responseFuture = new CompletableFuture<>();
+            responseFuture.complete(response);
+            return responseFuture;
+        });
+        return plcConnectionMock;
+    }
+
+    @Override
+    public PlcConnection connect(String url, PlcAuthentication authentication) {
+        return connect(null);
+    }
+
+}
diff --git a/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XComponentTest.java b/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XComponentTest.java
index 4030c753fb1..eb5ffa8aced 100644
--- a/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XComponentTest.java
+++ b/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XComponentTest.java
@@ -1,66 +1,66 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.camel;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-public class Plc4XComponentTest extends CamelTestSupport {
-
-    @Test
-    public void testSimpleRouting() throws Exception {
-        MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedMinimumMessageCount(1);
-        mock.expectedMessageCount(2);
-
-        template.asyncSendBody("direct:plc4x", "irrelevant");
-        template.asyncSendBody("direct:plc4x2", "irrelevant");
-
-        assertMockEndpointsSatisfied(2, TimeUnit.SECONDS);
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() {
-        return new RouteBuilder() {
-            public void configure() {
-                from("direct:plc4x")
-                    .setHeader(Constants.FIELD_QUERY_HEADER, constant(new PlcField() {
-                    }))
-                    .setBody(constant((byte) 0x0))
-                    .to("plc4x:mock:10.10.10.1/1/1")
-                    .to("mock:result");
-                from("direct:plc4x2")
-                    .setHeader(Constants.FIELD_QUERY_HEADER, constant(new PlcField() {
-                    }))
-                    .setBody(constant(Arrays.asList((byte) 0x0, (byte) 0x1, (byte) 0x2, (byte) 0x3)))
-                    .to("plc4x:mock:10.10.10.1/1/1")
-                    .to("mock:result");
-                from("plc4x:mock:10.10.10.1/1/1?address=Main.by0&dataType=java.lang.String")
-                    .log("Got ${body}");
-            }
-        };
-    }
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.camel;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+public class Plc4XComponentTest extends CamelTestSupport {
+
+    @Test
+    public void testSimpleRouting() throws Exception {
+        MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedMinimumMessageCount(1);
+        mock.expectedMessageCount(2);
+
+        template.asyncSendBody("direct:plc4x", "irrelevant");
+        template.asyncSendBody("direct:plc4x2", "irrelevant");
+
+        assertMockEndpointsSatisfied(2, TimeUnit.SECONDS);
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() {
+        return new RouteBuilder() {
+            public void configure() {
+                from("direct:plc4x")
+                    .setHeader(Constants.FIELD_QUERY_HEADER, constant(new PlcField() {
+                    }))
+                    .setBody(constant((byte) 0x0))
+                    .to("plc4x:mock:10.10.10.1/1/1")
+                    .to("mock:result");
+                from("direct:plc4x2")
+                    .setHeader(Constants.FIELD_QUERY_HEADER, constant(new PlcField() {
+                    }))
+                    .setBody(constant(Arrays.asList((byte) 0x0, (byte) 0x1, (byte) 0x2, (byte) 0x3)))
+                    .to("plc4x:mock:10.10.10.1/1/1")
+                    .to("mock:result");
+                from("plc4x:mock:10.10.10.1/1/1?address=Main.by0&dataType=java.lang.String")
+                    .log("Got ${body}");
+            }
+        };
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XConsumerTest.java b/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XConsumerTest.java
index 4ec5c8ac699..cbbecfe878a 100644
--- a/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XConsumerTest.java
+++ b/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XConsumerTest.java
@@ -1,53 +1,53 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.camel;
-
-import org.junit.Test;
-
-// TODO: implement me
-public class Plc4XConsumerTest {
-
-    @Test
-    public void toStringTest() {
-    }
-
-    @Test
-    public void getEndpoint() {
-    }
-
-    @Test
-    public void getExceptionHandler() {
-    }
-
-    @Test
-    public void setExceptionHandler() {
-    }
-
-    @Test
-    public void doStart() {
-    }
-
-    @Test
-    public void doStop() {
-    }
-
-    @Test
-    public void accept() {
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.camel;
+
+import org.junit.Test;
+
+// TODO: implement me
+public class Plc4XConsumerTest {
+
+    @Test
+    public void toStringTest() {
+    }
+
+    @Test
+    public void getEndpoint() {
+    }
+
+    @Test
+    public void getExceptionHandler() {
+    }
+
+    @Test
+    public void setExceptionHandler() {
+    }
+
+    @Test
+    public void doStart() {
+    }
+
+    @Test
+    public void doStop() {
+    }
+
+    @Test
+    public void accept() {
+    }
 }
\ No newline at end of file
diff --git a/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XEndpointTest.java b/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XEndpointTest.java
index b849e2ca379..ce640cf285a 100644
--- a/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XEndpointTest.java
+++ b/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XEndpointTest.java
@@ -1,56 +1,56 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.camel;
-
-import org.apache.camel.Component;
-import org.apache.camel.Processor;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.mock;
-
-public class Plc4XEndpointTest {
-
-    Plc4XEndpoint SUT;
-
-    @Before
-    public void setUp() {
-        SUT = new Plc4XEndpoint("plc4x:mock:10.10.10.1/1/1", mock(Component.class));
-    }
-
-    // TODO: figure out what this is
-    @Test
-    public void createProducer() throws Exception {
-        assertThat(SUT.createProducer(), notNullValue());
-    }
-
-    @Test
-    public void createConsumer() throws Exception {
-        assertThat(SUT.createConsumer(mock(Processor.class)), notNullValue());
-    }
-
-    @Test
-    public void isSingleton() {
-        assertThat(SUT.isSingleton(), is(true));
-    }
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.camel;
+
+import org.apache.camel.Component;
+import org.apache.camel.Processor;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.mock;
+
+public class Plc4XEndpointTest {
+
+    Plc4XEndpoint SUT;
+
+    @Before
+    public void setUp() {
+        SUT = new Plc4XEndpoint("plc4x:mock:10.10.10.1/1/1", mock(Component.class));
+    }
+
+    // TODO: figure out what this is
+    @Test
+    public void createProducer() throws Exception {
+        assertThat(SUT.createProducer(), notNullValue());
+    }
+
+    @Test
+    public void createConsumer() throws Exception {
+        assertThat(SUT.createConsumer(mock(Processor.class)), notNullValue());
+    }
+
+    @Test
+    public void isSingleton() {
+        assertThat(SUT.isSingleton(), is(true));
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XPollingConsumerTest.java b/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XPollingConsumerTest.java
index 10362a82459..ea1dea78ac4 100644
--- a/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XPollingConsumerTest.java
+++ b/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XPollingConsumerTest.java
@@ -1,65 +1,65 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.camel;
-
-import org.junit.Test;
-
-//TODO: implement me
-public class Plc4XPollingConsumerTest {
-
-    @Test
-    public void toStringTest() {
-    }
-
-    @Test
-    public void getEndpoint() {
-    }
-
-    @Test
-    public void getExceptionHandler() {
-    }
-
-    @Test
-    public void setExceptionHandler() {
-    }
-
-    @Test
-    public void receive() {
-    }
-
-    @Test
-    public void receiveNoWait() {
-    }
-
-    @Test
-    public void receive1() {
-    }
-
-    @Test
-    public void getReader() {
-    }
-
-    @Test
-    public void doStart() {
-    }
-
-    @Test
-    public void doStop() {
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.camel;
+
+import org.junit.Test;
+
+//TODO: implement me
+public class Plc4XPollingConsumerTest {
+
+    @Test
+    public void toStringTest() {
+    }
+
+    @Test
+    public void getEndpoint() {
+    }
+
+    @Test
+    public void getExceptionHandler() {
+    }
+
+    @Test
+    public void setExceptionHandler() {
+    }
+
+    @Test
+    public void receive() {
+    }
+
+    @Test
+    public void receiveNoWait() {
+    }
+
+    @Test
+    public void receive1() {
+    }
+
+    @Test
+    public void getReader() {
+    }
+
+    @Test
+    public void doStart() {
+    }
+
+    @Test
+    public void doStop() {
+    }
 }
\ No newline at end of file
diff --git a/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XProducerTest.java b/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XProducerTest.java
index f078c09d6c7..65d6d9e5f2d 100644
--- a/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XProducerTest.java
+++ b/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XProducerTest.java
@@ -1,115 +1,115 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.camel;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.ExchangePattern;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static org.mockito.Mockito.*;
-
-public class Plc4XProducerTest {
-
-    private Plc4XProducer SUT;
-
-    private Exchange testExchange;
-
-    @Before
-    public void setUp() throws Exception {
-        Plc4XEndpoint endpointMock = mock(Plc4XEndpoint.class, RETURNS_DEEP_STUBS);
-        when(endpointMock.getEndpointUri()).thenReturn("plc4x:mock:10.10.10.1/1/1");
-        PlcDriverManager plcDriverManagerMock = mock(PlcDriverManager.class, RETURNS_DEEP_STUBS);
-
-        when(plcDriverManagerMock.getConnection(anyString()).getMetadata().canRead()).thenReturn(true);
-        when(plcDriverManagerMock.getConnection(anyString()).getMetadata().canWrite()).thenReturn(true);
-        when(plcDriverManagerMock.getConnection(anyString()).writeRequestBuilder())
-            .thenReturn(mock(PlcWriteRequest.Builder.class, RETURNS_DEEP_STUBS));
-
-        when(endpointMock.getPlcDriverManager()).thenReturn(plcDriverManagerMock);
-        SUT = new Plc4XProducer(endpointMock);
-        testExchange = mock(Exchange.class, RETURNS_DEEP_STUBS);
-
-        when(testExchange.getIn().getHeader(eq(Constants.FIELD_NAME_HEADER), eq(String.class)))
-            .thenReturn("Hurz");
-        when(testExchange.getIn().getHeader(eq(Constants.FIELD_QUERY_HEADER), eq(String.class)))
-            .thenReturn("PlcField.class");
-    }
-
-    @Test
-    public void process() throws Exception {
-        when(testExchange.getPattern()).thenReturn(ExchangePattern.InOnly);
-        SUT.process(testExchange);
-        when(testExchange.getPattern()).thenReturn(ExchangePattern.InOut);
-        SUT.process(testExchange);
-        when(testExchange.getPattern()).thenReturn(ExchangePattern.OutOnly);
-        SUT.process(testExchange);
-        when(testExchange.getIn().getBody()).thenReturn(Arrays.asList("test","test"));
-        when(testExchange.getIn().getBody(eq(List.class))).thenReturn(Arrays.asList("test","test"));
-        SUT.process(testExchange);
-    }
-
-    @Test
-    public void process_Async() {
-        SUT.process(testExchange, doneSync -> {
-        });
-        when(testExchange.getPattern()).thenReturn(ExchangePattern.InOnly);
-        SUT.process(testExchange, doneSync -> {
-        });
-        when(testExchange.getPattern()).thenReturn(ExchangePattern.InOut);
-        SUT.process(testExchange, doneSync -> {
-        });
-        when(testExchange.getPattern()).thenReturn(ExchangePattern.OutOnly);
-        SUT.process(testExchange, doneSync -> {
-        });
-    }
-
-    @Test
-    public void doStop() throws Exception {
-        SUT.doStop();
-    }
-
-    @Test
-    public void doStopOpenRequest() throws Exception {
-        Field openRequests = SUT.getClass().getDeclaredField("openRequests");
-        openRequests.setAccessible(true);
-        AtomicInteger atomicInteger = (AtomicInteger) openRequests.get(SUT);
-        atomicInteger.incrementAndGet();
-        SUT.doStop();
-    }
-
-    @Test
-    public void doStopBadConnection() throws Exception {
-        Field openRequests = SUT.getClass().getDeclaredField("plcConnection");
-        openRequests.setAccessible(true);
-        PlcConnection plcConnectionMock = mock(PlcConnection.class);
-        doThrow(new RuntimeException("oh noes")).when(plcConnectionMock).close();
-        openRequests.set(SUT, plcConnectionMock);
-        SUT.doStop();
-    }
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.camel;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.mockito.Mockito.*;
+
+public class Plc4XProducerTest {
+
+    private Plc4XProducer SUT;
+
+    private Exchange testExchange;
+
+    @Before
+    public void setUp() throws Exception {
+        Plc4XEndpoint endpointMock = mock(Plc4XEndpoint.class, RETURNS_DEEP_STUBS);
+        when(endpointMock.getEndpointUri()).thenReturn("plc4x:mock:10.10.10.1/1/1");
+        PlcDriverManager plcDriverManagerMock = mock(PlcDriverManager.class, RETURNS_DEEP_STUBS);
+
+        when(plcDriverManagerMock.getConnection(anyString()).getMetadata().canRead()).thenReturn(true);
+        when(plcDriverManagerMock.getConnection(anyString()).getMetadata().canWrite()).thenReturn(true);
+        when(plcDriverManagerMock.getConnection(anyString()).writeRequestBuilder())
+            .thenReturn(mock(PlcWriteRequest.Builder.class, RETURNS_DEEP_STUBS));
+
+        when(endpointMock.getPlcDriverManager()).thenReturn(plcDriverManagerMock);
+        SUT = new Plc4XProducer(endpointMock);
+        testExchange = mock(Exchange.class, RETURNS_DEEP_STUBS);
+
+        when(testExchange.getIn().getHeader(eq(Constants.FIELD_NAME_HEADER), eq(String.class)))
+            .thenReturn("Hurz");
+        when(testExchange.getIn().getHeader(eq(Constants.FIELD_QUERY_HEADER), eq(String.class)))
+            .thenReturn("PlcField.class");
+    }
+
+    @Test
+    public void process() throws Exception {
+        when(testExchange.getPattern()).thenReturn(ExchangePattern.InOnly);
+        SUT.process(testExchange);
+        when(testExchange.getPattern()).thenReturn(ExchangePattern.InOut);
+        SUT.process(testExchange);
+        when(testExchange.getPattern()).thenReturn(ExchangePattern.OutOnly);
+        SUT.process(testExchange);
+        when(testExchange.getIn().getBody()).thenReturn(Arrays.asList("test","test"));
+        when(testExchange.getIn().getBody(eq(List.class))).thenReturn(Arrays.asList("test","test"));
+        SUT.process(testExchange);
+    }
+
+    @Test
+    public void process_Async() {
+        SUT.process(testExchange, doneSync -> {
+        });
+        when(testExchange.getPattern()).thenReturn(ExchangePattern.InOnly);
+        SUT.process(testExchange, doneSync -> {
+        });
+        when(testExchange.getPattern()).thenReturn(ExchangePattern.InOut);
+        SUT.process(testExchange, doneSync -> {
+        });
+        when(testExchange.getPattern()).thenReturn(ExchangePattern.OutOnly);
+        SUT.process(testExchange, doneSync -> {
+        });
+    }
+
+    @Test
+    public void doStop() throws Exception {
+        SUT.doStop();
+    }
+
+    @Test
+    public void doStopOpenRequest() throws Exception {
+        Field openRequests = SUT.getClass().getDeclaredField("openRequests");
+        openRequests.setAccessible(true);
+        AtomicInteger atomicInteger = (AtomicInteger) openRequests.get(SUT);
+        atomicInteger.incrementAndGet();
+        SUT.doStop();
+    }
+
+    @Test
+    public void doStopBadConnection() throws Exception {
+        Field openRequests = SUT.getClass().getDeclaredField("plcConnection");
+        openRequests.setAccessible(true);
+        PlcConnection plcConnectionMock = mock(PlcConnection.class);
+        doThrow(new RuntimeException("oh noes")).when(plcConnectionMock).close();
+        openRequests.set(SUT, plcConnectionMock);
+        SUT.doStop();
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/integrations/apache-camel/src/test/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver b/plc4j/integrations/apache-camel/src/test/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
index 173e0665f8b..bc0f4a19eb7 100644
--- a/plc4j/integrations/apache-camel/src/test/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
+++ b/plc4j/integrations/apache-camel/src/test/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
@@ -1,19 +1,19 @@
-#
-# 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
-#
-#   http://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.
-#
+#
+# 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
+#
+#   http://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.
+#
 org.apache.plc4x.camel.MockDriver
\ No newline at end of file
diff --git a/plc4j/integrations/apache-camel/src/test/resources/log4j2.properties b/plc4j/integrations/apache-camel/src/test/resources/log4j2.properties
index 149ffedd83c..5054691425d 100644
--- a/plc4j/integrations/apache-camel/src/test/resources/log4j2.properties
+++ b/plc4j/integrations/apache-camel/src/test/resources/log4j2.properties
@@ -1,24 +1,24 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://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.
-#
-appender.out.type=Console
-appender.out.name=out
-appender.out.layout.type=PatternLayout
-appender.out.layout.pattern=[%30.30t] %-30.30c{1} %-5p %m%n
-rootLogger.level=INFO
-rootLogger.appenderRef.out.ref=out
+#
+# 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
+#
+#   http://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.
+#
+appender.out.type=Console
+appender.out.name=out
+appender.out.layout.type=PatternLayout
+appender.out.layout.pattern=[%30.30t] %-30.30c{1} %-5p %m%n
+rootLogger.level=INFO
+rootLogger.appenderRef.out.ref=out
diff --git a/plc4j/integrations/apache-camel/src/test/resources/logback.xml b/plc4j/integrations/apache-camel/src/test/resources/logback.xml
index dd243bdcf73..8a965dcd06c 100644
--- a/plc4j/integrations/apache-camel/src/test/resources/logback.xml
+++ b/plc4j/integrations/apache-camel/src/test/resources/logback.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="
-                  http://ch.qos.logback/xml/ns/logback
-                  https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoders are assigned the type
-         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="info">
-    <appender-ref ref="STDOUT" />
-  </root>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="
+                  http://ch.qos.logback/xml/ns/logback
+                  https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="info">
+    <appender-ref ref="STDOUT" />
+  </root>
+
 </configuration>
\ No newline at end of file
diff --git a/plc4j/integrations/apache-edgent/pom.xml b/plc4j/integrations/apache-edgent/pom.xml
index 5582aecd95b..b28d84dbb5f 100644
--- a/plc4j/integrations/apache-edgent/pom.xml
+++ b/plc4j/integrations/apache-edgent/pom.xml
@@ -1,82 +1,82 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-integrations</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-apache-edgent</artifactId>
-
-  <name>PLC4J: Integrations: Apache Edgent</name>
-  <description>Integration module for integrating PLC4X into Apache Edgent.</description>
-
-  <properties>
-    <edgent.version>1.2.0</edgent.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.edgent</groupId>
-      <artifactId>edgent-api-function</artifactId>
-      <version>${edgent.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-utils-test-utils</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base-test</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-integrations</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-apache-edgent</artifactId>
+
+  <name>PLC4J: Integrations: Apache Edgent</name>
+  <description>Integration module for integrating PLC4X into Apache Edgent.</description>
+
+  <properties>
+    <edgent.version>1.2.0</edgent.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.edgent</groupId>
+      <artifactId>edgent-api-function</artifactId>
+      <version>${edgent.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-utils-test-utils</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base-test</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java b/plc4j/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java
index de43ea347aa..7510386d0c2 100644
--- a/plc4j/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java
+++ b/plc4j/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java
@@ -1,372 +1,372 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.edgent;
-
-import com.google.gson.JsonObject;
-import org.apache.edgent.function.Consumer;
-import org.apache.edgent.function.Function;
-import org.apache.edgent.function.Supplier;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.exceptions.PlcException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.types.PlcClientDatatype;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.temporal.ChronoUnit;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * PlcConnectionAdapter encapsulates a plc4x {@link PlcConnection}.
- * <p>
- * The idea here is to use PlcConnectionAdapter to enable our Edgent Supplier/Consumer
- * instances to be isolated from the details of / variability of
- * PlcConnection mgmt and such.
- * <p>
- * A PlcConnectionAdapter is subject to the constraints of the underlying
- * PlcConnection for the device.
- * <p>
- * A single PlcConnectionAdaptor represents a single underlying PlcConnection/connection
- * to a plc device.
- * <p>
- * Multiple PlcConnectionAdaptor instances, hence multiple PlcConnection instances,
- * can be created for a single plc device subject to the underlying device's protocol's
- * support for multiple connections from a single client.
- * <p>
- * A single PlcConnectionAdapter can be used by multiple threads concurrently
- * (e.g., used by multiple PlcFunctions Consumers for {@code Topology.poll()} and/or
- * multiple Suppliers for {@code TStream.sink()}).
- *
- * @see PlcFunctions
- */
-public class PlcConnectionAdapter implements AutoCloseable {
-
-    private static final Logger logger = LoggerFactory.getLogger(PlcConnectionAdapter.class);
-
-    private static final String FIELD_NAME = "default";
-
-    private String plcConnectionUrl;
-    private PlcConnection plcConnection;
-
-    /*
-     * NOTES:
-     * - if we get to the point of the application needing some feedback (possibly control)
-     *   of read or write errors, my thinking is to enhance the PlcConnectionAdapter
-     *   to enable the app to register an error callback handler or such.
-     */
-
-    public PlcConnectionAdapter(PlcConnection plcConnection) {
-        this.plcConnection = plcConnection;
-    }
-
-    public PlcConnectionAdapter(String plcConnectionUrl) {
-        this.plcConnectionUrl = plcConnectionUrl;
-    }
-
-    PlcConnection getConnection() throws PlcException {
-        synchronized (this) {
-            if (plcConnection == null) {
-                plcConnection = new PlcDriverManager().getConnection(plcConnectionUrl);
-            }
-            return plcConnection;
-        }
-    }
-
-    @Override
-    public void close() throws Exception {
-        // only close a connection this instance created/connected
-        if (plcConnectionUrl != null && plcConnection != null) {
-            plcConnection.close();
-        }
-    }
-
-    public PlcReadRequest.Builder readRequestBuilder() throws PlcException {
-        return getConnection().readRequestBuilder();
-    }
-
-    Supplier<PlcReadResponse> newSupplier(PlcReadRequest readRequest) {
-        return new Supplier<PlcReadResponse>() {
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            public PlcReadResponse get() {
-                PlcConnection connection = null;
-                try {
-                    connection = getConnection();
-                    LocalDateTime start = LocalDateTime.now();
-                    PlcReadResponse plcReadResponse = readRequest.execute().get();
-                    LocalDateTime end = LocalDateTime.now();
-                    if(logger.isTraceEnabled()) {
-                        long diff = ChronoUnit.MILLIS.between(start, end);
-                        logger.trace("Processed request in " + diff + "ms");
-                    }
-                    return plcReadResponse;
-                } catch (Exception e) {
-                    logger.error("reading from plc device {} {} failed", connection, readRequest, e);
-                    return null;
-                }
-            }
-        };
-    }
-
-    <T> Supplier<T> newSupplier(Class<T> genericDatatype, PlcClientDatatype clientDatatype, String fieldQuery) {
-        // satisfy sonar's "Reduce number of anonymous class lines" code smell
-        return new MySupplier<>(genericDatatype, clientDatatype, fieldQuery);
-    }
-
-    <T> Supplier<List<T>> newListSupplier(Class<T> genericDatatype, PlcClientDatatype clientDatatype, String fieldQuery) {
-        // satisfy sonar's "Reduce number of anonymous class lines" code smell
-        return new MyListSupplier<>(genericDatatype, clientDatatype, fieldQuery);
-    }
-
-    private class MySupplier<T> implements Supplier<T> {
-
-        private static final long serialVersionUID = 1L;
-
-        private Class<T> genericDatatype;
-        private PlcClientDatatype clientDatatype;
-        private String fieldQuery;
-
-        MySupplier(Class<T> genericDatatype, PlcClientDatatype clientDatatype, String fieldQuery) {
-            this.genericDatatype = genericDatatype;
-            this.clientDatatype = clientDatatype;
-            this.fieldQuery = fieldQuery;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        public T get() {
-            PlcConnection connection = null;
-            PlcField field = null;
-            try {
-                connection = getConnection();
-                PlcReadRequest readRequest = connection.readRequestBuilder().addItem(FIELD_NAME, fieldQuery).build();
-                PlcReadResponse readResponse = readRequest.execute().get();
-                Object value = readResponse.getObject(FIELD_NAME);
-                if (value != null) {
-                    if (genericDatatype.isAssignableFrom(value.getClass())) {
-                        return (T) value;
-                    } else {
-                        logger.error("types don't match {} should be of type {}", value.getClass(), genericDatatype);
-                    }
-                }
-            } catch (Exception e) {
-                logger.error("reading from plc device {} {} failed", connection, field, e);
-            }
-            return null;
-        }
-    }
-
-    private class MyListSupplier<T> implements Supplier<List<T>> {
-
-        private static final long serialVersionUID = 1L;
-
-        private Class<T> genericDatatype;
-        private PlcClientDatatype clientDatatype;
-        private String fieldQuery;
-
-        MyListSupplier(Class<T> genericDatatype, PlcClientDatatype clientDatatype, String fieldQuery) {
-            this.genericDatatype = genericDatatype;
-            this.clientDatatype = clientDatatype;
-            this.fieldQuery = fieldQuery;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        public List<T> get() {
-            PlcConnection connection = null;
-            PlcField field = null;
-            try {
-                connection = getConnection();
-                PlcReadRequest readRequest = connection.readRequestBuilder().addItem(FIELD_NAME, fieldQuery).build();
-                PlcReadResponse readResponse = readRequest.execute().get();
-                Object value = null;
-                switch (clientDatatype) {
-                    case BOOLEAN:
-                        value = readResponse.getAllBooleans(FIELD_NAME);
-                        break;
-                    case BYTE:
-                        value = readResponse.getAllBytes(FIELD_NAME);
-                        break;
-                    case SHORT:
-                        value = readResponse.getAllShorts(FIELD_NAME);
-                        break;
-                    case INTEGER:
-                        value = readResponse.getAllIntegers(FIELD_NAME);
-                        break;
-                    case LONG:
-                        value = readResponse.getAllLongs(FIELD_NAME);
-                        break;
-                    case FLOAT:
-                        value = readResponse.getAllFloats(FIELD_NAME);
-                        break;
-                    case DOUBLE:
-                        value = readResponse.getAllDoubles(FIELD_NAME);
-                        break;
-                    case STRING:
-                        value = readResponse.getAllStrings(FIELD_NAME);
-                        break;
-                    case TIME:
-                        value = readResponse.getAllTimes(FIELD_NAME);
-                        break;
-                    case DATE:
-                        value = readResponse.getAllDates(FIELD_NAME);
-                        break;
-                    case DATE_TIME:
-                        value = readResponse.getAllDateTimes(FIELD_NAME);
-                        break;
-                }
-                if (value != null) {
-                    return Collections.checkedList((List<T>) value, genericDatatype);
-                }
-            } catch (Exception e) {
-                logger.error("reading from plc device {} {} failed", connection, field, e);
-            }
-            return null;
-        }
-    }
-
-    <T> Consumer<T> newJsonConsumer(Class<T> genericDatatype, PlcClientDatatype clientDatatype, String fieldQuery) {
-        return new ObjectConsumer<>(genericDatatype, clientDatatype, fieldQuery);
-    }
-
-    <T> Consumer<JsonObject> newJsonConsumer(PlcClientDatatype clientDatatype, Function<JsonObject, String> fieldQueryFn, Function<JsonObject, T> fieldValueFn) {
-        return new JsonConsumer<>(clientDatatype, fieldQueryFn, fieldValueFn);
-    }
-
-    private abstract class BaseConsumer<T> implements Consumer<T> {
-
-        protected void write(PlcClientDatatype clientDatatype, String fieldQuery, Object fieldValue) {
-            PlcConnection connection = null;
-            try {
-                connection = getConnection();
-                PlcWriteRequest.Builder builder = connection.writeRequestBuilder();
-                PlcWriteRequest writeRequest = builder.build();
-                addItem(builder, clientDatatype, fieldQuery, fieldValue);
-                writeRequest.execute().get();
-            } catch (Exception e) {
-                logger.error("writing to plc device {} {} failed", connection, fieldQuery, e);
-            }
-
-        }
-
-        private void addItem(PlcWriteRequest.Builder builder,
-                             PlcClientDatatype clientDatatype, String fieldQuery, Object fieldValue) {
-            switch (clientDatatype) {
-                case BYTE:
-                    if (fieldValue instanceof Byte) {
-                        builder.addItem(FIELD_NAME, fieldQuery, (Byte) fieldValue);
-                    }
-                    break;
-                case SHORT:
-                    if (fieldValue instanceof Short) {
-                        builder.addItem(FIELD_NAME, fieldQuery, (Short) fieldValue);
-                    }
-                    break;
-                case INTEGER:
-                    if (fieldValue instanceof Integer) {
-                        builder.addItem(FIELD_NAME, fieldQuery, (Integer) fieldValue);
-                    }
-                    break;
-                case LONG:
-                    if (fieldValue instanceof Long) {
-                        builder.addItem(FIELD_NAME, fieldQuery, (Long) fieldValue);
-                    }
-                    break;
-                case FLOAT:
-                    if (fieldValue instanceof Float) {
-                        builder.addItem(FIELD_NAME, fieldQuery, (Float) fieldValue);
-                    }
-                    break;
-                case DOUBLE:
-                    if (fieldValue instanceof Double) {
-                        builder.addItem(FIELD_NAME, fieldQuery, (Double) fieldValue);
-                    }
-                    break;
-                case STRING:
-                    if (fieldValue instanceof String) {
-                        builder.addItem(FIELD_NAME, fieldQuery, (String) fieldValue);
-                    }
-                    break;
-                case TIME:
-                    if (fieldValue instanceof LocalTime) {
-                        builder.addItem(FIELD_NAME, fieldQuery, (LocalTime) fieldValue);
-                    }
-                    break;
-                case DATE:
-                    if (fieldValue instanceof LocalDate) {
-                        builder.addItem(FIELD_NAME, fieldQuery, (LocalDate) fieldValue);
-                    }
-                    break;
-                case DATE_TIME:
-                    if (fieldValue instanceof LocalDateTime) {
-                        builder.addItem(FIELD_NAME, fieldQuery, (LocalDateTime) fieldValue);
-                    }
-                    break;
-            }
-        }
-    }
-
-    private class ObjectConsumer<T> extends BaseConsumer<T> {
-        private static final long serialVersionUID = 1L;
-
-        private PlcClientDatatype clientDatatype;
-        private String fieldQuery;
-
-        ObjectConsumer(Class<T> genericDatatype, PlcClientDatatype clientDatatype, String fieldQuery) {
-            this.clientDatatype = clientDatatype;
-            this.fieldQuery = fieldQuery;
-        }
-
-        @Override
-        public void accept(Object fieldValue) {
-            write(clientDatatype, fieldQuery, fieldValue);
-        }
-    }
-
-    private class JsonConsumer<T> extends BaseConsumer<JsonObject> {
-        private static final long serialVersionUID = 1L;
-
-        private PlcClientDatatype clientDatatype;
-        private Function<JsonObject, String> fieldQueryFn;
-        private Function<JsonObject, T> fieldValueFn;
-
-        JsonConsumer(PlcClientDatatype clientDatatype, Function<JsonObject, String> fieldQueryFn, Function<JsonObject, T> fieldValueFn) {
-            this.clientDatatype = clientDatatype;
-            this.fieldQueryFn = fieldQueryFn;
-            this.fieldValueFn = fieldValueFn;
-        }
-
-        @Override
-        public void accept(JsonObject jsonObject) {
-            String fieldQuery = fieldQueryFn.apply(jsonObject);
-            Object fieldValue = fieldValueFn.apply(jsonObject);
-            write(clientDatatype, fieldQuery, fieldValue);
-        }
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.edgent;
+
+import com.google.gson.JsonObject;
+import org.apache.edgent.function.Consumer;
+import org.apache.edgent.function.Function;
+import org.apache.edgent.function.Supplier;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.exceptions.PlcException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcClientDatatype;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.temporal.ChronoUnit;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * PlcConnectionAdapter encapsulates a plc4x {@link PlcConnection}.
+ * <p>
+ * The idea here is to use PlcConnectionAdapter to enable our Edgent Supplier/Consumer
+ * instances to be isolated from the details of / variability of
+ * PlcConnection mgmt and such.
+ * <p>
+ * A PlcConnectionAdapter is subject to the constraints of the underlying
+ * PlcConnection for the device.
+ * <p>
+ * A single PlcConnectionAdaptor represents a single underlying PlcConnection/connection
+ * to a plc device.
+ * <p>
+ * Multiple PlcConnectionAdaptor instances, hence multiple PlcConnection instances,
+ * can be created for a single plc device subject to the underlying device's protocol's
+ * support for multiple connections from a single client.
+ * <p>
+ * A single PlcConnectionAdapter can be used by multiple threads concurrently
+ * (e.g., used by multiple PlcFunctions Consumers for {@code Topology.poll()} and/or
+ * multiple Suppliers for {@code TStream.sink()}).
+ *
+ * @see PlcFunctions
+ */
+public class PlcConnectionAdapter implements AutoCloseable {
+
+    private static final Logger logger = LoggerFactory.getLogger(PlcConnectionAdapter.class);
+
+    private static final String FIELD_NAME = "default";
+
+    private String plcConnectionUrl;
+    private PlcConnection plcConnection;
+
+    /*
+     * NOTES:
+     * - if we get to the point of the application needing some feedback (possibly control)
+     *   of read or write errors, my thinking is to enhance the PlcConnectionAdapter
+     *   to enable the app to register an error callback handler or such.
+     */
+
+    public PlcConnectionAdapter(PlcConnection plcConnection) {
+        this.plcConnection = plcConnection;
+    }
+
+    public PlcConnectionAdapter(String plcConnectionUrl) {
+        this.plcConnectionUrl = plcConnectionUrl;
+    }
+
+    PlcConnection getConnection() throws PlcException {
+        synchronized (this) {
+            if (plcConnection == null) {
+                plcConnection = new PlcDriverManager().getConnection(plcConnectionUrl);
+            }
+            return plcConnection;
+        }
+    }
+
+    @Override
+    public void close() throws Exception {
+        // only close a connection this instance created/connected
+        if (plcConnectionUrl != null && plcConnection != null) {
+            plcConnection.close();
+        }
+    }
+
+    public PlcReadRequest.Builder readRequestBuilder() throws PlcException {
+        return getConnection().readRequestBuilder();
+    }
+
+    Supplier<PlcReadResponse> newSupplier(PlcReadRequest readRequest) {
+        return new Supplier<PlcReadResponse>() {
+            private static final long serialVersionUID = 1L;
+
+            @Override
+            public PlcReadResponse get() {
+                PlcConnection connection = null;
+                try {
+                    connection = getConnection();
+                    LocalDateTime start = LocalDateTime.now();
+                    PlcReadResponse plcReadResponse = readRequest.execute().get();
+                    LocalDateTime end = LocalDateTime.now();
+                    if(logger.isTraceEnabled()) {
+                        long diff = ChronoUnit.MILLIS.between(start, end);
+                        logger.trace("Processed request in " + diff + "ms");
+                    }
+                    return plcReadResponse;
+                } catch (Exception e) {
+                    logger.error("reading from plc device {} {} failed", connection, readRequest, e);
+                    return null;
+                }
+            }
+        };
+    }
+
+    <T> Supplier<T> newSupplier(Class<T> genericDatatype, PlcClientDatatype clientDatatype, String fieldQuery) {
+        // satisfy sonar's "Reduce number of anonymous class lines" code smell
+        return new MySupplier<>(genericDatatype, clientDatatype, fieldQuery);
+    }
+
+    <T> Supplier<List<T>> newListSupplier(Class<T> genericDatatype, PlcClientDatatype clientDatatype, String fieldQuery) {
+        // satisfy sonar's "Reduce number of anonymous class lines" code smell
+        return new MyListSupplier<>(genericDatatype, clientDatatype, fieldQuery);
+    }
+
+    private class MySupplier<T> implements Supplier<T> {
+
+        private static final long serialVersionUID = 1L;
+
+        private Class<T> genericDatatype;
+        private PlcClientDatatype clientDatatype;
+        private String fieldQuery;
+
+        MySupplier(Class<T> genericDatatype, PlcClientDatatype clientDatatype, String fieldQuery) {
+            this.genericDatatype = genericDatatype;
+            this.clientDatatype = clientDatatype;
+            this.fieldQuery = fieldQuery;
+        }
+
+        @Override
+        @SuppressWarnings("unchecked")
+        public T get() {
+            PlcConnection connection = null;
+            PlcField field = null;
+            try {
+                connection = getConnection();
+                PlcReadRequest readRequest = connection.readRequestBuilder().addItem(FIELD_NAME, fieldQuery).build();
+                PlcReadResponse readResponse = readRequest.execute().get();
+                Object value = readResponse.getObject(FIELD_NAME);
+                if (value != null) {
+                    if (genericDatatype.isAssignableFrom(value.getClass())) {
+                        return (T) value;
+                    } else {
+                        logger.error("types don't match {} should be of type {}", value.getClass(), genericDatatype);
+                    }
+                }
+            } catch (Exception e) {
+                logger.error("reading from plc device {} {} failed", connection, field, e);
+            }
+            return null;
+        }
+    }
+
+    private class MyListSupplier<T> implements Supplier<List<T>> {
+
+        private static final long serialVersionUID = 1L;
+
+        private Class<T> genericDatatype;
+        private PlcClientDatatype clientDatatype;
+        private String fieldQuery;
+
+        MyListSupplier(Class<T> genericDatatype, PlcClientDatatype clientDatatype, String fieldQuery) {
+            this.genericDatatype = genericDatatype;
+            this.clientDatatype = clientDatatype;
+            this.fieldQuery = fieldQuery;
+        }
+
+        @Override
+        @SuppressWarnings("unchecked")
+        public List<T> get() {
+            PlcConnection connection = null;
+            PlcField field = null;
+            try {
+                connection = getConnection();
+                PlcReadRequest readRequest = connection.readRequestBuilder().addItem(FIELD_NAME, fieldQuery).build();
+                PlcReadResponse readResponse = readRequest.execute().get();
+                Object value = null;
+                switch (clientDatatype) {
+                    case BOOLEAN:
+                        value = readResponse.getAllBooleans(FIELD_NAME);
+                        break;
+                    case BYTE:
+                        value = readResponse.getAllBytes(FIELD_NAME);
+                        break;
+                    case SHORT:
+                        value = readResponse.getAllShorts(FIELD_NAME);
+                        break;
+                    case INTEGER:
+                        value = readResponse.getAllIntegers(FIELD_NAME);
+                        break;
+                    case LONG:
+                        value = readResponse.getAllLongs(FIELD_NAME);
+                        break;
+                    case FLOAT:
+                        value = readResponse.getAllFloats(FIELD_NAME);
+                        break;
+                    case DOUBLE:
+                        value = readResponse.getAllDoubles(FIELD_NAME);
+                        break;
+                    case STRING:
+                        value = readResponse.getAllStrings(FIELD_NAME);
+                        break;
+                    case TIME:
+                        value = readResponse.getAllTimes(FIELD_NAME);
+                        break;
+                    case DATE:
+                        value = readResponse.getAllDates(FIELD_NAME);
+                        break;
+                    case DATE_TIME:
+                        value = readResponse.getAllDateTimes(FIELD_NAME);
+                        break;
+                }
+                if (value != null) {
+                    return Collections.checkedList((List<T>) value, genericDatatype);
+                }
+            } catch (Exception e) {
+                logger.error("reading from plc device {} {} failed", connection, field, e);
+            }
+            return null;
+        }
+    }
+
+    <T> Consumer<T> newJsonConsumer(Class<T> genericDatatype, PlcClientDatatype clientDatatype, String fieldQuery) {
+        return new ObjectConsumer<>(genericDatatype, clientDatatype, fieldQuery);
+    }
+
+    <T> Consumer<JsonObject> newJsonConsumer(PlcClientDatatype clientDatatype, Function<JsonObject, String> fieldQueryFn, Function<JsonObject, T> fieldValueFn) {
+        return new JsonConsumer<>(clientDatatype, fieldQueryFn, fieldValueFn);
+    }
+
+    private abstract class BaseConsumer<T> implements Consumer<T> {
+
+        protected void write(PlcClientDatatype clientDatatype, String fieldQuery, Object fieldValue) {
+            PlcConnection connection = null;
+            try {
+                connection = getConnection();
+                PlcWriteRequest.Builder builder = connection.writeRequestBuilder();
+                PlcWriteRequest writeRequest = builder.build();
+                addItem(builder, clientDatatype, fieldQuery, fieldValue);
+                writeRequest.execute().get();
+            } catch (Exception e) {
+                logger.error("writing to plc device {} {} failed", connection, fieldQuery, e);
+            }
+
+        }
+
+        private void addItem(PlcWriteRequest.Builder builder,
+                             PlcClientDatatype clientDatatype, String fieldQuery, Object fieldValue) {
+            switch (clientDatatype) {
+                case BYTE:
+                    if (fieldValue instanceof Byte) {
+                        builder.addItem(FIELD_NAME, fieldQuery, (Byte) fieldValue);
+                    }
+                    break;
+                case SHORT:
+                    if (fieldValue instanceof Short) {
+                        builder.addItem(FIELD_NAME, fieldQuery, (Short) fieldValue);
+                    }
+                    break;
+                case INTEGER:
+                    if (fieldValue instanceof Integer) {
+                        builder.addItem(FIELD_NAME, fieldQuery, (Integer) fieldValue);
+                    }
+                    break;
+                case LONG:
+                    if (fieldValue instanceof Long) {
+                        builder.addItem(FIELD_NAME, fieldQuery, (Long) fieldValue);
+                    }
+                    break;
+                case FLOAT:
+                    if (fieldValue instanceof Float) {
+                        builder.addItem(FIELD_NAME, fieldQuery, (Float) fieldValue);
+                    }
+                    break;
+                case DOUBLE:
+                    if (fieldValue instanceof Double) {
+                        builder.addItem(FIELD_NAME, fieldQuery, (Double) fieldValue);
+                    }
+                    break;
+                case STRING:
+                    if (fieldValue instanceof String) {
+                        builder.addItem(FIELD_NAME, fieldQuery, (String) fieldValue);
+                    }
+                    break;
+                case TIME:
+                    if (fieldValue instanceof LocalTime) {
+                        builder.addItem(FIELD_NAME, fieldQuery, (LocalTime) fieldValue);
+                    }
+                    break;
+                case DATE:
+                    if (fieldValue instanceof LocalDate) {
+                        builder.addItem(FIELD_NAME, fieldQuery, (LocalDate) fieldValue);
+                    }
+                    break;
+                case DATE_TIME:
+                    if (fieldValue instanceof LocalDateTime) {
+                        builder.addItem(FIELD_NAME, fieldQuery, (LocalDateTime) fieldValue);
+                    }
+                    break;
+            }
+        }
+    }
+
+    private class ObjectConsumer<T> extends BaseConsumer<T> {
+        private static final long serialVersionUID = 1L;
+
+        private PlcClientDatatype clientDatatype;
+        private String fieldQuery;
+
+        ObjectConsumer(Class<T> genericDatatype, PlcClientDatatype clientDatatype, String fieldQuery) {
+            this.clientDatatype = clientDatatype;
+            this.fieldQuery = fieldQuery;
+        }
+
+        @Override
+        public void accept(Object fieldValue) {
+            write(clientDatatype, fieldQuery, fieldValue);
+        }
+    }
+
+    private class JsonConsumer<T> extends BaseConsumer<JsonObject> {
+        private static final long serialVersionUID = 1L;
+
+        private PlcClientDatatype clientDatatype;
+        private Function<JsonObject, String> fieldQueryFn;
+        private Function<JsonObject, T> fieldValueFn;
+
+        JsonConsumer(PlcClientDatatype clientDatatype, Function<JsonObject, String> fieldQueryFn, Function<JsonObject, T> fieldValueFn) {
+            this.clientDatatype = clientDatatype;
+            this.fieldQueryFn = fieldQueryFn;
+            this.fieldValueFn = fieldValueFn;
+        }
+
+        @Override
+        public void accept(JsonObject jsonObject) {
+            String fieldQuery = fieldQueryFn.apply(jsonObject);
+            Object fieldValue = fieldValueFn.apply(jsonObject);
+            write(clientDatatype, fieldQuery, fieldValue);
+        }
+    }
+
+}
diff --git a/plc4j/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcFunctions.java b/plc4j/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcFunctions.java
index 58e630d2392..8721dc8693d 100644
--- a/plc4j/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcFunctions.java
+++ b/plc4j/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcFunctions.java
@@ -1,329 +1,329 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.edgent;
-
-import com.google.gson.JsonObject;
-import org.apache.edgent.function.Consumer;
-import org.apache.edgent.function.Function;
-import org.apache.edgent.function.Supplier;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.types.PlcClientDatatype;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.List;
-
-/**
- * WIP - A plc4x Apache Edgent {@link Supplier} and {@link Consumer} connector factory.
- * <p>
- * TODO:
- * Are there cases where a single logical poll would want to read from
- * multiple addrs/data (of different types) from a device and bundle the values
- * into a single TStream tuple (e.g., a JsonObject)?  How would we support that?
- * Is there a similar need for writing to multiple addrs/values on a device?
- * Ah... NOTE: plc4c "batch" requests are coming and will help to address this.
- *
- * <p>
- * Sample use to read plc device data into an Edgent TStream:
- * <pre>{@code
- * PlcConnection plcConnection = new PlcDriverManager().getConnection("s7://192.168.0.1/0/0");
- * plcConnection.connect();
- * PlcConnectionAdapter adapter = new PlcConnectionAdapter(plcConnection));
- *
- * DirectProvider dp = new DirectProvider();
- * Topology top = dp.newTopology();
- * TStream<Byte> stream = top.poll(PlcFunctions.byteSupplier(adapter, "INPUTS/0", 1, TimeUnit.SECONDS);
- * stream.print();
- * dp.submit(top);
- * }</pre>
- * <p>
- * Sample use to write Edgent TStream data to a plc device:
- * <pre>{@code
- * PlcConnection plcConnection = new PlcDriverManager().getConnection("s7://192.168.0.1/0/0");
- * plcConnection.connect();
- * PlcConnectionAdapter adapter = new PlcConnectionAdapter(plcConnection);
- *
- * DirectProvider dp = new DirectProvider();
- * Topology top = dp.newTopology();
- *
- * TStream<Byte> stream = ...
- * stream.print();
- * TSink<Byte> sink = stream.sink(PlcFunctions.byteConsumer(adapter, "OUTPUTS/0"));
- *
- * dp.submit(top);
- * }</pre>
- */
-public class PlcFunctions {
-
-    private PlcFunctions() {
-        throw new IllegalStateException("Utility class!");
-    }
-
-    /**
-     * Create a new Edgent {@link Supplier} to read data from the
-     * plc device.
-     * <p>
-     * Every call to the returned {@link Supplier#get()} reads a
-     * new data value from the plc device address and connection
-     * associated with the {@code PlcConnectionAdapter}.
-     * <p>
-     *
-     * @param adapter    the @{link PlcConnectionAdapter}
-     * @param addressStr the plc device address string
-     * @return the {@code Supplier<T>}
-     * <p>
-     * // TODO: No need to import the Topology module for just this comment ... I think
-     * //see org.apache.edgent.topology.Topology#poll(Supplier, long, java.util.concurrent.TimeUnit)
-     */
-    /*public static Supplier<byte[]> rawSupplier(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newSupplier(byte[].class, PlcClientDatatype.RAW, addressStr);
-    }
-
-    public static Supplier<Object> objectSupplier(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newSupplier(Object.class, PlcClientDatatype.OBJECT, addressStr);
-    }*/
-
-    public static Supplier<Boolean> booleanSupplier(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newSupplier(Boolean.class, PlcClientDatatype.BOOLEAN, addressStr);
-    }
-
-    public static Supplier<List<Boolean>> booleanListSupplier(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newListSupplier(Boolean.class, PlcClientDatatype.BOOLEAN, addressStr);
-    }
-
-    public static Supplier<Byte> byteSupplier(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newSupplier(Byte.class, PlcClientDatatype.BYTE, addressStr);
-    }
-
-    public static Supplier<List<Byte>> byteListSupplier(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newListSupplier(Byte.class, PlcClientDatatype.BYTE, addressStr);
-    }
-
-    public static Supplier<Short> shortSupplier(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newSupplier(Short.class, PlcClientDatatype.SHORT, addressStr);
-    }
-
-    public static Supplier<List<Short>> shortListSupplier(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newListSupplier(Short.class, PlcClientDatatype.BYTE, addressStr);
-    }
-
-    public static Supplier<Integer> integerSupplier(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newSupplier(Integer.class, PlcClientDatatype.INTEGER, addressStr);
-    }
-
-    public static Supplier<List<Integer>> integerListSupplier(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newListSupplier(Integer.class, PlcClientDatatype.BYTE, addressStr);
-    }
-
-    public static Supplier<Long> longSupplier(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newSupplier(Long.class, PlcClientDatatype.LONG, addressStr);
-    }
-
-    public static Supplier<List<Long>> longListSupplier(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newListSupplier(Long.class, PlcClientDatatype.BYTE, addressStr);
-    }
-
-    public static Supplier<Float> floatSupplier(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newSupplier(Float.class, PlcClientDatatype.FLOAT, addressStr);
-    }
-
-    public static Supplier<List<Float>> floatListSupplier(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newListSupplier(Float.class, PlcClientDatatype.BYTE, addressStr);
-    }
-
-    public static Supplier<Double> doubleSupplier(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newSupplier(Double.class, PlcClientDatatype.DOUBLE, addressStr);
-    }
-
-    public static Supplier<List<Double>> doubleListSupplier(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newListSupplier(Double.class, PlcClientDatatype.BYTE, addressStr);
-    }
-
-    public static Supplier<String> stringSupplier(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newSupplier(String.class, PlcClientDatatype.STRING, addressStr);
-    }
-
-    public static Supplier<List<String>> stringListSupplier(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newListSupplier(String.class, PlcClientDatatype.BYTE, addressStr);
-    }
-
-    public static Supplier<LocalTime> timeSupplier(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newSupplier(LocalTime.class, PlcClientDatatype.TIME, addressStr);
-    }
-
-    public static Supplier<List<LocalTime>> timeListSupplier(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newListSupplier(LocalTime.class, PlcClientDatatype.BYTE, addressStr);
-    }
-
-    public static Supplier<LocalDate> dateSupplier(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newSupplier(LocalDate.class, PlcClientDatatype.DATE, addressStr);
-    }
-
-    public static Supplier<List<LocalDate>> dateListSupplier(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newListSupplier(LocalDate.class, PlcClientDatatype.BYTE, addressStr);
-    }
-
-    public static Supplier<LocalDateTime> dateTimeSupplier(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newSupplier(LocalDateTime.class, PlcClientDatatype.DATE_TIME, addressStr);
-    }
-
-    public static Supplier<List<LocalDateTime>> dateTimeListSupplier(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newListSupplier(LocalDateTime.class, PlcClientDatatype.BYTE, addressStr);
-    }
-
-    public static Supplier<PlcReadResponse> batchSupplier(PlcConnectionAdapter adapter, PlcReadRequest readRequest) {
-        return adapter.newSupplier(readRequest);
-    }
-
-    /**
-     * Create a new Edgent {@link Consumer} to write data to the
-     * plc device.
-     * <p>
-     * Every call to the returned {@link Consumer#accept(Object)}
-     * writes the value to the the device address and connection
-     * associated with the {@code PlcConnectionAdapter}.
-     *
-     * @param adapter    the @{link PlcConnectionAdapter}
-     * @param addressStr the plc device address string
-     * @return the {@code Consumer<T>}
-     * <p>
-     * // TODO: No need to import the Topology module for just this comment ... I think
-     * //see org.apache.edgent.topology.TStream#sink(Consumer)
-     */
-    /*public static Consumer<byte[]> rawConsumer(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newJsonConsumer(byte[].class, PlcClientDatatype.RAW, addressStr);
-    }
-
-    public static Consumer<Object> objectConsumer(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newJsonConsumer(Object.class, PlcClientDatatype.OBJECT, addressStr);
-    }*/
-
-    public static Consumer<Boolean> booleanConsumer(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newJsonConsumer(Boolean.class, PlcClientDatatype.BOOLEAN, addressStr);
-    }
-
-    public static Consumer<Byte> byteConsumer(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newJsonConsumer(Byte.class, PlcClientDatatype.BYTE, addressStr);
-    }
-
-    public static Consumer<Short> shortConsumer(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newJsonConsumer(Short.class, PlcClientDatatype.SHORT, addressStr);
-    }
-
-    public static Consumer<Integer> integerConsumer(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newJsonConsumer(Integer.class, PlcClientDatatype.INTEGER, addressStr);
-    }
-
-    public static Consumer<Long> longConsumer(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newJsonConsumer(Long.class, PlcClientDatatype.LONG, addressStr);
-    }
-
-    public static Consumer<Float> floatConsumer(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newJsonConsumer(Float.class, PlcClientDatatype.FLOAT, addressStr);
-    }
-
-    public static Consumer<Double> doubleConsumer(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newJsonConsumer(Double.class, PlcClientDatatype.DOUBLE, addressStr);
-    }
-
-    public static Consumer<String> stringConsumer(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newJsonConsumer(String.class, PlcClientDatatype.STRING, addressStr);
-    }
-
-    public static Consumer<LocalTime> timeConsumer(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newJsonConsumer(LocalTime.class, PlcClientDatatype.TIME, addressStr);
-    }
-
-    public static Consumer<LocalDate> dateConsumer(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newJsonConsumer(LocalDate.class, PlcClientDatatype.DATE, addressStr);
-    }
-
-    public static Consumer<LocalDateTime> dateTimeConsumer(PlcConnectionAdapter adapter, String addressStr) {
-        return adapter.newJsonConsumer(LocalDateTime.class, PlcClientDatatype.DATE_TIME, addressStr);
-    }
-
-    /**
-     * Create a new Edgent {@link Consumer} to write data to the
-     * plc device.
-     * <p>
-     * TODO: Is it premature to supply this?
-     * <p>
-     * Every call to the returned {@link Consumer#accept(Object)}
-     * <ul>
-     * <li>calls {@code addressFn} to get the device address string</li>
-     * <li>calls {@code valueFn} to get the {@code T} to write</li>
-     * <li>writes the value to the device address using the connection
-     * associated with the {@code PlcConnectionAdapter}.</li>
-     * </ul>
-     *
-     * @param adapter   the @{link PlcConnectionAdapter}
-     * @param addressFn {@code Function} the returns a device {@code PlcField} from a {@code JsonObject}
-     * @param valueFn   {@code Function} the returns a {@code Value} from a {@code JsonObject}
-     * @return the {@code Consumer<JsonObject>}
-     * <p>
-     * // TODO: No need to import the Topology module for just this comment ... I think
-     * //see org.apache.edgent.topology.TStream#sink(Consumer)
-     */
-    public static Consumer<JsonObject> booleanConsumer(PlcConnectionAdapter adapter, Function<JsonObject, String> addressFn, Function<JsonObject, Boolean> valueFn) {
-        return adapter.newJsonConsumer(PlcClientDatatype.BOOLEAN, addressFn, valueFn);
-    }
-
-    public static Consumer<JsonObject> byteConsumer(PlcConnectionAdapter adapter, Function<JsonObject, String> addressFn, Function<JsonObject, Byte> valueFn) {
-        return adapter.newJsonConsumer(PlcClientDatatype.BYTE, addressFn, valueFn);
-    }
-
-    public static Consumer<JsonObject> shortConsumer(PlcConnectionAdapter adapter, Function<JsonObject, String> addressFn, Function<JsonObject, Short> valueFn) {
-        return adapter.newJsonConsumer(PlcClientDatatype.SHORT, addressFn, valueFn);
-    }
-
-    public static Consumer<JsonObject> integerConsumer(PlcConnectionAdapter adapter, Function<JsonObject, String> addressFn, Function<JsonObject, Integer> valueFn) {
-        return adapter.newJsonConsumer(PlcClientDatatype.INTEGER, addressFn, valueFn);
-    }
-
-    public static Consumer<JsonObject> longConsumer(PlcConnectionAdapter adapter, Function<JsonObject, String> addressFn, Function<JsonObject, Long> valueFn) {
-        return adapter.newJsonConsumer(PlcClientDatatype.LONG, addressFn, valueFn);
-    }
-
-    public static Consumer<JsonObject> floatConsumer(PlcConnectionAdapter adapter, Function<JsonObject, String> addressFn, Function<JsonObject, Float> valueFn) {
-        return adapter.newJsonConsumer(PlcClientDatatype.FLOAT, addressFn, valueFn);
-    }
-
-    public static Consumer<JsonObject> doubleConsumer(PlcConnectionAdapter adapter, Function<JsonObject, String> addressFn, Function<JsonObject, Double> valueFn) {
-        return adapter.newJsonConsumer(PlcClientDatatype.DOUBLE, addressFn, valueFn);
-    }
-
-    public static Consumer<JsonObject> stringConsumer(PlcConnectionAdapter adapter, Function<JsonObject, String> addressFn, Function<JsonObject, String> valueFn) {
-        return adapter.newJsonConsumer(PlcClientDatatype.STRING, addressFn, valueFn);
-    }
-
-    public static Consumer<JsonObject> timeConsumer(PlcConnectionAdapter adapter, Function<JsonObject, String> addressFn, Function<JsonObject, LocalTime> valueFn) {
-        return adapter.newJsonConsumer(PlcClientDatatype.TIME, addressFn, valueFn);
-    }
-
-    public static Consumer<JsonObject> dateConsumer(PlcConnectionAdapter adapter, Function<JsonObject, String> addressFn, Function<JsonObject, LocalDate> valueFn) {
-        return adapter.newJsonConsumer(PlcClientDatatype.DATE, addressFn, valueFn);
-    }
-
-    public static Consumer<JsonObject> dateTimeConsumer(PlcConnectionAdapter adapter, Function<JsonObject, String> addressFn, Function<JsonObject, LocalDateTime> valueFn) {
-        return adapter.newJsonConsumer(PlcClientDatatype.DATE_TIME, addressFn, valueFn);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.edgent;
+
+import com.google.gson.JsonObject;
+import org.apache.edgent.function.Consumer;
+import org.apache.edgent.function.Function;
+import org.apache.edgent.function.Supplier;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.types.PlcClientDatatype;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.List;
+
+/**
+ * WIP - A plc4x Apache Edgent {@link Supplier} and {@link Consumer} connector factory.
+ * <p>
+ * TODO:
+ * Are there cases where a single logical poll would want to read from
+ * multiple addrs/data (of different types) from a device and bundle the values
+ * into a single TStream tuple (e.g., a JsonObject)?  How would we support that?
+ * Is there a similar need for writing to multiple addrs/values on a device?
+ * Ah... NOTE: plc4c "batch" requests are coming and will help to address this.
+ *
+ * <p>
+ * Sample use to read plc device data into an Edgent TStream:
+ * <pre>{@code
+ * PlcConnection plcConnection = new PlcDriverManager().getConnection("s7://192.168.0.1/0/0");
+ * plcConnection.connect();
+ * PlcConnectionAdapter adapter = new PlcConnectionAdapter(plcConnection));
+ *
+ * DirectProvider dp = new DirectProvider();
+ * Topology top = dp.newTopology();
+ * TStream<Byte> stream = top.poll(PlcFunctions.byteSupplier(adapter, "INPUTS/0", 1, TimeUnit.SECONDS);
+ * stream.print();
+ * dp.submit(top);
+ * }</pre>
+ * <p>
+ * Sample use to write Edgent TStream data to a plc device:
+ * <pre>{@code
+ * PlcConnection plcConnection = new PlcDriverManager().getConnection("s7://192.168.0.1/0/0");
+ * plcConnection.connect();
+ * PlcConnectionAdapter adapter = new PlcConnectionAdapter(plcConnection);
+ *
+ * DirectProvider dp = new DirectProvider();
+ * Topology top = dp.newTopology();
+ *
+ * TStream<Byte> stream = ...
+ * stream.print();
+ * TSink<Byte> sink = stream.sink(PlcFunctions.byteConsumer(adapter, "OUTPUTS/0"));
+ *
+ * dp.submit(top);
+ * }</pre>
+ */
+public class PlcFunctions {
+
+    private PlcFunctions() {
+        throw new IllegalStateException("Utility class!");
+    }
+
+    /**
+     * Create a new Edgent {@link Supplier} to read data from the
+     * plc device.
+     * <p>
+     * Every call to the returned {@link Supplier#get()} reads a
+     * new data value from the plc device address and connection
+     * associated with the {@code PlcConnectionAdapter}.
+     * <p>
+     *
+     * @param adapter    the @{link PlcConnectionAdapter}
+     * @param addressStr the plc device address string
+     * @return the {@code Supplier<T>}
+     * <p>
+     * // TODO: No need to import the Topology module for just this comment ... I think
+     * //see org.apache.edgent.topology.Topology#poll(Supplier, long, java.util.concurrent.TimeUnit)
+     */
+    /*public static Supplier<byte[]> rawSupplier(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newSupplier(byte[].class, PlcClientDatatype.RAW, addressStr);
+    }
+
+    public static Supplier<Object> objectSupplier(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newSupplier(Object.class, PlcClientDatatype.OBJECT, addressStr);
+    }*/
+
+    public static Supplier<Boolean> booleanSupplier(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newSupplier(Boolean.class, PlcClientDatatype.BOOLEAN, addressStr);
+    }
+
+    public static Supplier<List<Boolean>> booleanListSupplier(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newListSupplier(Boolean.class, PlcClientDatatype.BOOLEAN, addressStr);
+    }
+
+    public static Supplier<Byte> byteSupplier(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newSupplier(Byte.class, PlcClientDatatype.BYTE, addressStr);
+    }
+
+    public static Supplier<List<Byte>> byteListSupplier(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newListSupplier(Byte.class, PlcClientDatatype.BYTE, addressStr);
+    }
+
+    public static Supplier<Short> shortSupplier(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newSupplier(Short.class, PlcClientDatatype.SHORT, addressStr);
+    }
+
+    public static Supplier<List<Short>> shortListSupplier(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newListSupplier(Short.class, PlcClientDatatype.BYTE, addressStr);
+    }
+
+    public static Supplier<Integer> integerSupplier(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newSupplier(Integer.class, PlcClientDatatype.INTEGER, addressStr);
+    }
+
+    public static Supplier<List<Integer>> integerListSupplier(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newListSupplier(Integer.class, PlcClientDatatype.BYTE, addressStr);
+    }
+
+    public static Supplier<Long> longSupplier(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newSupplier(Long.class, PlcClientDatatype.LONG, addressStr);
+    }
+
+    public static Supplier<List<Long>> longListSupplier(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newListSupplier(Long.class, PlcClientDatatype.BYTE, addressStr);
+    }
+
+    public static Supplier<Float> floatSupplier(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newSupplier(Float.class, PlcClientDatatype.FLOAT, addressStr);
+    }
+
+    public static Supplier<List<Float>> floatListSupplier(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newListSupplier(Float.class, PlcClientDatatype.BYTE, addressStr);
+    }
+
+    public static Supplier<Double> doubleSupplier(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newSupplier(Double.class, PlcClientDatatype.DOUBLE, addressStr);
+    }
+
+    public static Supplier<List<Double>> doubleListSupplier(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newListSupplier(Double.class, PlcClientDatatype.BYTE, addressStr);
+    }
+
+    public static Supplier<String> stringSupplier(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newSupplier(String.class, PlcClientDatatype.STRING, addressStr);
+    }
+
+    public static Supplier<List<String>> stringListSupplier(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newListSupplier(String.class, PlcClientDatatype.BYTE, addressStr);
+    }
+
+    public static Supplier<LocalTime> timeSupplier(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newSupplier(LocalTime.class, PlcClientDatatype.TIME, addressStr);
+    }
+
+    public static Supplier<List<LocalTime>> timeListSupplier(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newListSupplier(LocalTime.class, PlcClientDatatype.BYTE, addressStr);
+    }
+
+    public static Supplier<LocalDate> dateSupplier(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newSupplier(LocalDate.class, PlcClientDatatype.DATE, addressStr);
+    }
+
+    public static Supplier<List<LocalDate>> dateListSupplier(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newListSupplier(LocalDate.class, PlcClientDatatype.BYTE, addressStr);
+    }
+
+    public static Supplier<LocalDateTime> dateTimeSupplier(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newSupplier(LocalDateTime.class, PlcClientDatatype.DATE_TIME, addressStr);
+    }
+
+    public static Supplier<List<LocalDateTime>> dateTimeListSupplier(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newListSupplier(LocalDateTime.class, PlcClientDatatype.BYTE, addressStr);
+    }
+
+    public static Supplier<PlcReadResponse> batchSupplier(PlcConnectionAdapter adapter, PlcReadRequest readRequest) {
+        return adapter.newSupplier(readRequest);
+    }
+
+    /**
+     * Create a new Edgent {@link Consumer} to write data to the
+     * plc device.
+     * <p>
+     * Every call to the returned {@link Consumer#accept(Object)}
+     * writes the value to the the device address and connection
+     * associated with the {@code PlcConnectionAdapter}.
+     *
+     * @param adapter    the @{link PlcConnectionAdapter}
+     * @param addressStr the plc device address string
+     * @return the {@code Consumer<T>}
+     * <p>
+     * // TODO: No need to import the Topology module for just this comment ... I think
+     * //see org.apache.edgent.topology.TStream#sink(Consumer)
+     */
+    /*public static Consumer<byte[]> rawConsumer(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newJsonConsumer(byte[].class, PlcClientDatatype.RAW, addressStr);
+    }
+
+    public static Consumer<Object> objectConsumer(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newJsonConsumer(Object.class, PlcClientDatatype.OBJECT, addressStr);
+    }*/
+
+    public static Consumer<Boolean> booleanConsumer(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newJsonConsumer(Boolean.class, PlcClientDatatype.BOOLEAN, addressStr);
+    }
+
+    public static Consumer<Byte> byteConsumer(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newJsonConsumer(Byte.class, PlcClientDatatype.BYTE, addressStr);
+    }
+
+    public static Consumer<Short> shortConsumer(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newJsonConsumer(Short.class, PlcClientDatatype.SHORT, addressStr);
+    }
+
+    public static Consumer<Integer> integerConsumer(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newJsonConsumer(Integer.class, PlcClientDatatype.INTEGER, addressStr);
+    }
+
+    public static Consumer<Long> longConsumer(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newJsonConsumer(Long.class, PlcClientDatatype.LONG, addressStr);
+    }
+
+    public static Consumer<Float> floatConsumer(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newJsonConsumer(Float.class, PlcClientDatatype.FLOAT, addressStr);
+    }
+
+    public static Consumer<Double> doubleConsumer(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newJsonConsumer(Double.class, PlcClientDatatype.DOUBLE, addressStr);
+    }
+
+    public static Consumer<String> stringConsumer(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newJsonConsumer(String.class, PlcClientDatatype.STRING, addressStr);
+    }
+
+    public static Consumer<LocalTime> timeConsumer(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newJsonConsumer(LocalTime.class, PlcClientDatatype.TIME, addressStr);
+    }
+
+    public static Consumer<LocalDate> dateConsumer(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newJsonConsumer(LocalDate.class, PlcClientDatatype.DATE, addressStr);
+    }
+
+    public static Consumer<LocalDateTime> dateTimeConsumer(PlcConnectionAdapter adapter, String addressStr) {
+        return adapter.newJsonConsumer(LocalDateTime.class, PlcClientDatatype.DATE_TIME, addressStr);
+    }
+
+    /**
+     * Create a new Edgent {@link Consumer} to write data to the
+     * plc device.
+     * <p>
+     * TODO: Is it premature to supply this?
+     * <p>
+     * Every call to the returned {@link Consumer#accept(Object)}
+     * <ul>
+     * <li>calls {@code addressFn} to get the device address string</li>
+     * <li>calls {@code valueFn} to get the {@code T} to write</li>
+     * <li>writes the value to the device address using the connection
+     * associated with the {@code PlcConnectionAdapter}.</li>
+     * </ul>
+     *
+     * @param adapter   the @{link PlcConnectionAdapter}
+     * @param addressFn {@code Function} the returns a device {@code PlcField} from a {@code JsonObject}
+     * @param valueFn   {@code Function} the returns a {@code Value} from a {@code JsonObject}
+     * @return the {@code Consumer<JsonObject>}
+     * <p>
+     * // TODO: No need to import the Topology module for just this comment ... I think
+     * //see org.apache.edgent.topology.TStream#sink(Consumer)
+     */
+    public static Consumer<JsonObject> booleanConsumer(PlcConnectionAdapter adapter, Function<JsonObject, String> addressFn, Function<JsonObject, Boolean> valueFn) {
+        return adapter.newJsonConsumer(PlcClientDatatype.BOOLEAN, addressFn, valueFn);
+    }
+
+    public static Consumer<JsonObject> byteConsumer(PlcConnectionAdapter adapter, Function<JsonObject, String> addressFn, Function<JsonObject, Byte> valueFn) {
+        return adapter.newJsonConsumer(PlcClientDatatype.BYTE, addressFn, valueFn);
+    }
+
+    public static Consumer<JsonObject> shortConsumer(PlcConnectionAdapter adapter, Function<JsonObject, String> addressFn, Function<JsonObject, Short> valueFn) {
+        return adapter.newJsonConsumer(PlcClientDatatype.SHORT, addressFn, valueFn);
+    }
+
+    public static Consumer<JsonObject> integerConsumer(PlcConnectionAdapter adapter, Function<JsonObject, String> addressFn, Function<JsonObject, Integer> valueFn) {
+        return adapter.newJsonConsumer(PlcClientDatatype.INTEGER, addressFn, valueFn);
+    }
+
+    public static Consumer<JsonObject> longConsumer(PlcConnectionAdapter adapter, Function<JsonObject, String> addressFn, Function<JsonObject, Long> valueFn) {
+        return adapter.newJsonConsumer(PlcClientDatatype.LONG, addressFn, valueFn);
+    }
+
+    public static Consumer<JsonObject> floatConsumer(PlcConnectionAdapter adapter, Function<JsonObject, String> addressFn, Function<JsonObject, Float> valueFn) {
+        return adapter.newJsonConsumer(PlcClientDatatype.FLOAT, addressFn, valueFn);
+    }
+
+    public static Consumer<JsonObject> doubleConsumer(PlcConnectionAdapter adapter, Function<JsonObject, String> addressFn, Function<JsonObject, Double> valueFn) {
+        return adapter.newJsonConsumer(PlcClientDatatype.DOUBLE, addressFn, valueFn);
+    }
+
+    public static Consumer<JsonObject> stringConsumer(PlcConnectionAdapter adapter, Function<JsonObject, String> addressFn, Function<JsonObject, String> valueFn) {
+        return adapter.newJsonConsumer(PlcClientDatatype.STRING, addressFn, valueFn);
+    }
+
+    public static Consumer<JsonObject> timeConsumer(PlcConnectionAdapter adapter, Function<JsonObject, String> addressFn, Function<JsonObject, LocalTime> valueFn) {
+        return adapter.newJsonConsumer(PlcClientDatatype.TIME, addressFn, valueFn);
+    }
+
+    public static Consumer<JsonObject> dateConsumer(PlcConnectionAdapter adapter, Function<JsonObject, String> addressFn, Function<JsonObject, LocalDate> valueFn) {
+        return adapter.newJsonConsumer(PlcClientDatatype.DATE, addressFn, valueFn);
+    }
+
+    public static Consumer<JsonObject> dateTimeConsumer(PlcConnectionAdapter adapter, Function<JsonObject, String> addressFn, Function<JsonObject, LocalDateTime> valueFn) {
+        return adapter.newJsonConsumer(PlcClientDatatype.DATE_TIME, addressFn, valueFn);
+    }
+
+}
diff --git a/plc4j/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/package-info.java b/plc4j/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/package-info.java
index c01a1e7e390..b64214943dc 100644
--- a/plc4j/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/package-info.java
+++ b/plc4j/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/package-info.java
@@ -1,25 +1,25 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://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.
-*/
-/**
- * Apache Edgent connector to plc4x.
- * 
- * The conneector enables creating Apache Edgent topology's
- * that source and sink data from and to plc4x devices respectively.
- */
+/*
+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
+
+  http://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.
+*/
+/**
+ * Apache Edgent connector to plc4x.
+ * 
+ * The conneector enables creating Apache Edgent topology's
+ * that source and sink data from and to plc4x devices respectively.
+ */
 package org.apache.plc4x.edgent;
\ No newline at end of file
diff --git a/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/PlcConnectionAdapterTest.java b/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/PlcConnectionAdapterTest.java
index 06ac34eb087..5c8669c5d0f 100644
--- a/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/PlcConnectionAdapterTest.java
+++ b/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/PlcConnectionAdapterTest.java
@@ -1,552 +1,552 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.edgent;
-
-import com.google.gson.JsonObject;
-import org.apache.edgent.function.Consumer;
-import org.apache.edgent.function.Function;
-import org.apache.edgent.function.Supplier;
-import org.apache.plc4x.edgent.mock.MockConnection;
-import org.apache.plc4x.edgent.mock.MockField;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.messages.PlcWriteResponse;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.messages.items.DefaultLongFieldItem;
-import org.apache.plc4x.test.FastTests;
-import org.hamcrest.core.IsInstanceOf;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.hamcrest.core.IsNot.not;
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.hamcrest.core.IsSame.sameInstance;
-import static org.junit.Assert.assertThat;
-
-public class PlcConnectionAdapterTest {
-
-    private MockConnection getMockConnection() throws PlcConnectionException {
-        return (MockConnection) new PlcDriverManager().getConnection("mock-for-edgent-integration://some-cool-url");
-    }
-
-    /*
-     * Test the PlcConnectionAdapter(PlcConnection) ctor, getConnection() and close()
-     */
-    @Test
-    @Category(FastTests.class)
-    public void testCtor1() throws Exception {
-        MockConnection mockConnection = getMockConnection();
-        PlcConnectionAdapter adapter = new PlcConnectionAdapter(mockConnection);
-        assertThat(mockConnection, sameInstance(adapter.getConnection()));
-        // and again... multiple adapter.getConnection() returns the same
-        assertThat(mockConnection, sameInstance(adapter.getConnection()));
-        adapter.close();
-    }
-
-    /*
-     * Test the PlcConnectionAdapter(url) ctor, getConnection() and close()
-     */
-    @Test
-    @Category(FastTests.class)
-    public void testCtor2() throws Exception {
-        MockConnection mockConnection = getMockConnection();
-        PlcConnectionAdapter adapter = new PlcConnectionAdapter(mockConnection.getUrl());
-        MockConnection mockConnection2 = (MockConnection) adapter.getConnection();
-        assertThat(mockConnection, not(sameInstance(mockConnection2)));
-        assertThat(mockConnection.getUrl(), sameInstance(mockConnection2.getUrl()));
-        // and again... multiple adapter.getConnection() returns the same
-        assertThat(mockConnection2, sameInstance(adapter.getConnection()));
-        adapter.close();
-    }
-
-    private <T> void checkRead(MockConnection connection, PlcReadRequest request, T value) throws InterruptedException, ExecutionException {
-        // this is really a tests of our mock tooling but knowing it's behaving as expected
-        // will help identify problems in the adapter/supplier/consumer
-        PlcField plcField = request.getFields().get(0);
-        // TODO: smart value conversion
-        connection.setFieldItem(plcField, new DefaultLongFieldItem(0L));
-
-        CompletableFuture<PlcReadResponse> cf = connection.read(request);
-
-        assertThat(cf.isDone(), is(true));
-        PlcReadResponse response = cf.get();
-        // TODO: fixme
-        // assertThat(value, equalTo(response.getResponseItems().get(0).getValues().get(0)));
-    }
-
-
-    private <T> void checkWrite(MockConnection connection, PlcWriteRequest request, T value) throws InterruptedException, ExecutionException {
-        // this is really a tests of our mock tooling but knowing it's behaving as expected
-        // will help identify problems in the adapter/supplier/consumer
-        PlcField plcField = request.getFields().get(0);
-        connection.setFieldItem(plcField, new DefaultLongFieldItem(0L));
-
-        CompletableFuture<PlcWriteResponse> cf = connection.write(request);
-
-        assertThat(cf.isDone(), is(true));
-        PlcWriteResponse response = cf.get();
-        assertThat(response, notNullValue());
-
-        // TODO: fixme
-        /*
-        Object writtenData = connection.getDataValue(request.getRequestItems().get(0).getField());
-        if (writtenData.getClass().isArray()) {
-            writtenData = Array.get(writtenData, 0);
-        }
-        if (List.class.isAssignableFrom(writtenData.getClass())) {
-            @SuppressWarnings("unchecked")
-            List<Object> writtenDataList = (List<Object>) writtenData;
-            writtenData = writtenDataList.get(0);
-        }
-        assertThat(value, equalTo(writtenData));*/
-    }
-
-    /*
-     * Verify the adapter yields the appropriate PlcReadRequest for each type and that it works.
-     */
-    @Test
-    @Category(FastTests.class)
-    public void testNewPlcReadRequest() throws Exception {
-        String addressStr = "MyReadWriteAddress/0";
-        MockField address = new MockField(addressStr);
-        PlcConnectionAdapter adapter = new PlcConnectionAdapter(getMockConnection());
-        MockConnection connection = (MockConnection) adapter.getConnection();
-
-        {
-            PlcReadRequest readRequest = adapter.readRequestBuilder().addItem("test", addressStr).build();
-            assertThat(readRequest.getNumberOfFields(), equalTo(1));
-            assertThat(readRequest.getField("test"), notNullValue());
-            assertThat(readRequest.getField("test"), IsInstanceOf.instanceOf(MockField.class));
-            assertThat(((MockField) readRequest.getField("test")).getAddress(), equalTo(addressStr));
-            checkRead(connection, readRequest, true);
-            checkRead(connection, readRequest, false);
-        }
-        /*{
-            TypeSafePlcReadRequest<Byte> request = PlcConnectionAdapter.newPlcReadRequest(Byte.class, address);
-            PlcReadRequestItem<Byte> requestItem = request.getCheckedReadRequestItems().get(0);
-            Class<Byte> dataType = requestItem.getDatatype();
-            assertThat(dataType, equalTo(Byte.class));
-            assertThat(address, sameInstance(requestItem.getField()));
-            checkRead(connection, request, (byte) 0x13);
-            checkRead(connection, request, (byte) 0x23);
-        }
-        {
-            TypeSafePlcReadRequest<Short> request = PlcConnectionAdapter.newPlcReadRequest(Short.class, address);
-            PlcReadRequestItem<Short> requestItem = request.getCheckedReadRequestItems().get(0);
-            Class<Short> dataType = requestItem.getDatatype();
-            assertThat(dataType, equalTo(Short.class));
-            assertThat(address, sameInstance(requestItem.getField()));
-            checkRead(connection, request, (short) 13);
-            checkRead(connection, request, (short) 23);
-        }
-        {
-            TypeSafePlcReadRequest<Integer> request = PlcConnectionAdapter.newPlcReadRequest(Integer.class, address);
-            PlcReadRequestItem<Integer> requestItem = request.getCheckedReadRequestItems().get(0);
-            Class<Integer> dataType = requestItem.getDatatype();
-            assertThat(dataType, equalTo(Integer.class));
-            assertThat(address, sameInstance(requestItem.getField()));
-            checkRead(connection, request, 33);
-            checkRead(connection, request, -133);
-        }
-        {
-            TypeSafePlcReadRequest<Float> request = PlcConnectionAdapter.newPlcReadRequest(Float.class, address);
-            PlcReadRequestItem<Float> requestItem = request.getCheckedReadRequestItems().get(0);
-            Class<Float> dataType = requestItem.getDatatype();
-            assertThat(dataType, equalTo(Float.class));
-            assertThat(address, sameInstance(requestItem.getField()));
-            checkRead(connection, request, 43.5f);
-            checkRead(connection, request, -143.5f);
-        }
-        {
-            TypeSafePlcReadRequest<String> request = PlcConnectionAdapter.newPlcReadRequest(String.class, address);
-            PlcReadRequestItem<String> requestItem = request.getCheckedReadRequestItems().get(0);
-            Class<String> dataType = requestItem.getDatatype();
-            assertThat(dataType, equalTo(String.class));
-            assertThat(address, sameInstance(requestItem.getField()));
-            checkRead(connection, request, "ReadySetGo");
-            checkRead(connection, request, "OneMoreTime");
-        }
-        {
-            TypeSafePlcReadRequest<Calendar> request = PlcConnectionAdapter.newPlcReadRequest(Calendar.class, address);
-            PlcReadRequestItem<Calendar> requestItem = request.getCheckedReadRequestItems().get(0);
-            Class<Calendar> dataType = requestItem.getDatatype();
-            assertThat(dataType, equalTo(Calendar.class));
-            assertThat(address, sameInstance(requestItem.getField()));
-            checkRead(connection, request, Calendar.getInstance());
-        }*/
-        adapter.close();
-    }
-
-
-    /*
-     * Verify the adapter yields the appropriate PlcWriteRequest for each type and that it works.
-     */
-    @Test
-    @Category(FastTests.class)
-    public void testNewPlcWriteRequest() throws Exception {
-        String addressStr = "MyReadWriteAddress/0";
-        MockField address = new MockField(addressStr);
-        PlcConnectionAdapter adapter = new PlcConnectionAdapter(getMockConnection());
-        MockConnection connection = (MockConnection) adapter.getConnection();
-
-        /*{
-            TypeSafePlcWriteRequest<Boolean> request = PlcConnectionAdapter.newPlcWriteRequest(address, true);
-            PlcWriteRequestItem<Boolean> requestItem = request.getCheckedRequestItems().get(0);
-            Class<Boolean> dataType = requestItem.getDatatype();
-            assertThat(dataType, typeCompatibleWith(Boolean.class));
-            assertThat(address, sameInstance(requestItem.getField()));
-            checkWrite(connection, request, true);
-        }
-        {
-            TypeSafePlcWriteRequest<Byte> request = PlcConnectionAdapter.newPlcWriteRequest(address, (byte) 0x113);
-            PlcWriteRequestItem<Byte> requestItem = request.getCheckedRequestItems().get(0);
-            Class<Byte> dataType = requestItem.getDatatype();
-            assertThat(dataType, typeCompatibleWith(Byte.class));
-            assertThat(address, sameInstance(requestItem.getField()));
-            checkWrite(connection, request, (byte) 0x113);
-        }
-        {
-            TypeSafePlcWriteRequest<Short> request = PlcConnectionAdapter.newPlcWriteRequest(address, (short) 113);
-            PlcWriteRequestItem<Short> requestItem = request.getCheckedRequestItems().get(0);
-            Class<Short> dataType = requestItem.getDatatype();
-            assertThat(dataType, typeCompatibleWith(Short.class));
-            assertThat(address, sameInstance(requestItem.getField()));
-            checkWrite(connection, request, (short) 113);
-        }
-        {
-            TypeSafePlcWriteRequest<Integer> request = PlcConnectionAdapter.newPlcWriteRequest(address, 1033);
-            PlcWriteRequestItem<Integer> requestItem = request.getCheckedRequestItems().get(0);
-            Class<Integer> dataType = requestItem.getDatatype();
-            assertThat(dataType, typeCompatibleWith(Integer.class));
-            assertThat(address, sameInstance(requestItem.getField()));
-            checkWrite(connection, request, 1033);
-        }
-        {
-            TypeSafePlcWriteRequest<Float> request = PlcConnectionAdapter.newPlcWriteRequest(address, 1043.5f);
-            PlcWriteRequestItem<Float> requestItem = request.getCheckedRequestItems().get(0);
-            Class<Float> dataType = requestItem.getDatatype();
-            assertThat(dataType, typeCompatibleWith(Float.class));
-            assertThat(address, sameInstance(requestItem.getField()));
-            checkWrite(connection, request, 1043.5f);
-        }
-        {
-            TypeSafePlcWriteRequest<String> request = PlcConnectionAdapter.newPlcWriteRequest(address, "A written value");
-            PlcWriteRequestItem<String> requestItem = request.getCheckedRequestItems().get(0);
-            Class<String> dataType = requestItem.getDatatype();
-            assertThat(dataType, typeCompatibleWith(String.class));
-            assertThat(address, sameInstance(requestItem.getField()));
-            checkWrite(connection, request, "A written value");
-        }
-        {
-            Calendar calValue = Calendar.getInstance();
-            TypeSafePlcWriteRequest<Calendar> request = PlcConnectionAdapter.newPlcWriteRequest(address, calValue);
-            PlcWriteRequestItem<Calendar> requestItem = request.getCheckedRequestItems().get(0);
-            Class<Calendar> dataType = requestItem.getDatatype();
-            assertThat(dataType, typeCompatibleWith(Calendar.class));
-            assertThat(address, sameInstance(requestItem.getField()));
-            checkWrite(connection, request, calValue);
-        }*/
-        adapter.close();
-    }
-
-    /*
-     * test PlcConnectionAdapter.newSupplier
-     */
-    @Test
-    @Category(FastTests.class)
-    public void testNewSupplier() throws Exception {
-        String addressStr = "MyReadWriteAddress/0";
-        MockField address = new MockField(addressStr);
-        PlcConnectionAdapter adapter = new PlcConnectionAdapter(getMockConnection());
-        MockConnection connection = (MockConnection) adapter.getConnection();
-
-        /*{
-            Supplier<Boolean> supplier = adapter.newSupplier(Boolean.class, addressStr);
-            assertThat(supplier, not(sameInstance(adapter.newSupplier(Boolean.class, addressStr))));
-            checkSupplier(connection, address, supplier, true, false);
-        }
-        {
-            Supplier<Byte> supplier = adapter.newSupplier(Byte.class, addressStr);
-            checkSupplier(connection, address, supplier, (byte) 0x1, (byte) 0x2, (byte) 0x3);
-        }
-        {
-            Supplier<Short> supplier = adapter.newSupplier(Short.class, addressStr);
-            checkSupplier(connection, address, supplier, (short) 1, (short) 2, (short) 3);
-        }
-        {
-            Supplier<Integer> supplier = adapter.newSupplier(Integer.class, addressStr);
-            checkSupplier(connection, address, supplier, 1000, 1001, 1002);
-        }
-        {
-            Supplier<Float> supplier = adapter.newSupplier(Float.class, addressStr);
-            checkSupplier(connection, address, supplier, 1000.5f, 1001.5f, 1002.5f);
-        }
-        {
-            Supplier<?> supplier = adapter.newSupplier(String.class, addressStr);
-            checkSupplier(connection, address, supplier, "one", "two", "three");
-        }*/
-        adapter.close();
-    }
-
-    /*
-     * test PlcConnectionAdapter.newSupplier with read exception
-     */
-    @Test
-    @Category(FastTests.class)
-    public void testNewSupplierNeg() throws Exception {
-        String addressStr = "MyReadWriteAddress/0";
-        MockField address = new MockField(addressStr);
-        PlcConnectionAdapter adapter = new PlcConnectionAdapter(getMockConnection());
-        MockConnection connection = (MockConnection) adapter.getConnection();
-
-        /*Supplier<String> supplier = adapter.newSupplier(String.class, addressStr);
-        checkSupplier(2, connection, address, supplier, "one", "two", "three");*/
-
-        adapter.close();
-    }
-
-    static <T> void checkSupplier(MockConnection connection, PlcField field, Supplier<T> supplier, Object... values) {
-        checkSupplier(0, connection, field, supplier, values);
-    }
-
-    private static <T> void checkSupplier(int readFailureCountTrigger, MockConnection connection, PlcField field, Supplier<T> supplier, Object... values) {
-        // verify that a read failure doesn't kill the consumer
-        // it logs (not verified) but returns null (as designed) and keeps working for the subsequent reads
-        connection.setReadException(readFailureCountTrigger, "This is a mock read exception");
-        int readCount = 0;
-        /*for (Object value : values) {
-            connection.setDataValue(field, value);
-            T readData = supplier.get();
-            // System.out.println("checkSupplier"+(readFailureCountTrigger > 0 ? "NEG" : "")+": value:"+value+" readData:"+readData);
-            if (readFailureCountTrigger <= 0)
-                assertThat(value, equalTo(readData));
-            else {
-                if (++readCount != readFailureCountTrigger)
-                    assertThat(value, equalTo(readData));
-                else
-                    assertThat(readData, nullValue());
-            }
-        }*/
-    }
-
-    /*
-     * test PlcConnectionAdapter.newJsonConsumer(address)
-     */
-    @Test
-    @Category(FastTests.class)
-    public void testNewConsumer1() throws Exception {
-        String addressStr = "MyReadWriteAddress/0";
-        MockField address = new MockField(addressStr);
-        PlcConnectionAdapter adapter = new PlcConnectionAdapter(getMockConnection());
-        MockConnection connection = (MockConnection) adapter.getConnection();
-
-        Consumer<?> consumer;
-
-        /*consumer = adapter.newConsumer(Boolean.class, addressStr);
-        assertThat(consumer, not(sameInstance(adapter.newConsumer(Boolean.class, addressStr))));
-        checkConsumer(connection, address, consumer, true, false);
-
-        consumer = adapter.newConsumer(Byte.class, addressStr);
-        checkConsumer(connection, address, consumer, (byte) 0x1, (byte) 0x2, (byte) 0x3);
-
-        consumer = adapter.newConsumer(Short.class, addressStr);
-        checkConsumer(connection, address, consumer, (short) 1, (short) 2, (short) 3);
-
-        consumer = adapter.newConsumer(Integer.class, addressStr);
-        checkConsumer(connection, address, consumer, 1000, 1001, 1002);
-
-        consumer = adapter.newConsumer(Float.class, addressStr);
-        checkConsumer(connection, address, consumer, 1000.5f, 1001.5f, 1002.5f);
-
-        consumer = adapter.newConsumer(String.class, addressStr);
-        checkConsumer(connection, address, consumer, "one", "two", "three");*/
-
-        adapter.close();
-    }
-
-    /*
-     * test PlcConnectionAdapter.newJsonConsumer(address) with write exception
-     */
-    @Test
-    @Category(FastTests.class)
-    public void testNewConsumer1Neg() throws Exception {
-        String addressStr = "MyReadWriteAddress/0";
-        MockField address = new MockField(addressStr);
-        PlcConnectionAdapter adapter = new PlcConnectionAdapter(getMockConnection());
-        MockConnection connection = (MockConnection) adapter.getConnection();
-
-        Consumer<?> consumer;
-
-        /*consumer = adapter.newConsumer(String.class, addressStr);
-        checkConsumer(2, connection, address, consumer, "one", "two", "three");*/
-
-        adapter.close();
-    }
-
-    static <T> void checkConsumer(MockConnection connection, PlcField field, Consumer<T> consumer, Object... values) {
-        checkConsumer(0, connection, field, consumer, values);
-    }
-
-    private static <T> void checkConsumer(int writeFailureCountTrigger, MockConnection connection, PlcField field, Consumer<T> consumer, Object... values) {
-        // verify that a write failure doesn't kill the consumer
-        // it logs (not verified) but keeps working for the subsequent writes
-        connection.setWriteException(writeFailureCountTrigger, "This is a mock write exception");
-        int writeCount = 0;
-        Object previousValue = null;
-        /*for (Object value : values) {
-            @SuppressWarnings("unchecked")
-            T tValue = (T) value;
-            consumer.accept(tValue);
-            Object writtenData = connection.getDataValue(field);
-            if (List.class.isAssignableFrom(writtenData.getClass())) {
-              @SuppressWarnings("unchecked")
-              List<Object> writtenDataList = (List<Object>) writtenData;
-                writtenData = writtenDataList.get(0);
-            }
-            if (writtenData.getClass().isArray()) {
-                writtenData = Array.get(writtenData, 0);
-            }
-            // System.out.println("checkConsumer"+(writeFailureCountTrigger > 0 ? "NEG" : "")+": value:"+value+" writtenData:"+writtenData);
-            if (writeFailureCountTrigger <= 0)
-                assertThat(value, equalTo(writtenData));
-            else {
-                if (++writeCount != writeFailureCountTrigger)
-                    assertThat(value, equalTo(writtenData));
-                else
-                    assertThat(previousValue, equalTo(writtenData));
-            }
-            previousValue = value;
-        }*/
-    }
-
-    /*
-     * test PlcConnectionAdapter.newJsonConsumer(addressFn, valueFn)
-     */
-    @Test
-    @Category(FastTests.class)
-    public void testNewConsumer2() throws Exception {
-        String addressStr = "MyReadWriteAddress/0";
-        MockField address = new MockField(addressStr);
-        PlcConnectionAdapter adapter = new PlcConnectionAdapter(getMockConnection());
-        MockConnection connection = (MockConnection) adapter.getConnection();
-
-        Consumer<JsonObject> consumer;
-
-        Function<JsonObject, String> addressFn = t -> t.get("address").getAsString();
-
-        /*consumer = adapter.newJsonConsumer(Boolean.class, addressFn, t -> t.get("value").getAsBoolean());
-        checkConsumerJson(connection, address, consumer, true, false);
-
-        consumer = adapter.newJsonConsumer(Byte.class, addressFn, t -> t.get("value").getAsByte());
-        checkConsumerJson(connection, address, consumer, (byte) 0x1, (byte) 0x2, (byte) 0x3);
-
-        consumer = adapter.newJsonConsumer(Short.class, addressFn, t -> t.get("value").getAsShort());
-        checkConsumerJson(connection, address, consumer, (short) 1, (short) 2, (short) 3);
-
-        consumer = adapter.newJsonConsumer(Integer.class, addressFn, t -> t.get("value").getAsInt());
-        checkConsumerJson(connection, address, consumer, 1000, 1001, 1002);
-
-        consumer = adapter.newJsonConsumer(Float.class, addressFn, t -> t.get("value").getAsFloat());
-        checkConsumerJson(connection, address, consumer, 1000.5f, 1001.5f, 1002.5f);
-
-        consumer = adapter.newJsonConsumer(String.class, addressFn, t -> t.get("value").getAsString());
-        checkConsumerJson(connection, address, consumer, "one", "two", "three");*/
-
-        adapter.close();
-    }
-
-    /*
-     * test PlcConnectionAdapter.newJsonConsumer(addressFn, valueFn) with write failure
-     */
-    @Test
-    @Category(FastTests.class)
-    public void testNewConsumer2Neg() throws Exception {
-        String addressStr = "MyReadWriteAddress/0";
-        MockField address = new MockField(addressStr);
-        PlcConnectionAdapter adapter = new PlcConnectionAdapter(getMockConnection());
-        MockConnection connection = (MockConnection) adapter.getConnection();
-
-        Consumer<JsonObject> consumer;
-
-        Function<JsonObject, String> addressFn = t -> t.get("address").getAsString();
-
-        /*consumer = adapter.newJsonConsumer(String.class, addressFn, t -> t.get("value").getAsString());
-        checkConsumerJson(2, connection, address, consumer, "one", "two", "three");*/
-
-        adapter.close();
-    }
-
-    static <T> void checkConsumerJson(MockConnection connection, MockField address, Consumer<JsonObject> consumer, Object... values) {
-        checkConsumerJson(0, connection, address, consumer, values);
-    }
-
-    private static <T> void checkConsumerJson(int writeFailureCountTrigger, MockConnection connection,
-                                              MockField field, Consumer<JsonObject> consumer, Object... values) {
-        if (writeFailureCountTrigger > 0) {
-            connection.setWriteException(writeFailureCountTrigger, "This is a mock write exception");
-        }
-        int writeCount = 0;
-        Object previousValue = null;
-        for (Object value : values) {
-
-            // build the JsonObject to consume
-            JsonObject jo = new JsonObject();
-            jo.addProperty("address", field.getAddress());
-            if (value instanceof Boolean) {
-                jo.addProperty("value", (Boolean) value);
-            } else if (value instanceof Number) {
-                jo.addProperty("value", (Number) value);
-            } else if (value instanceof String) {
-                jo.addProperty("value", (String) value);
-            }
-
-            consumer.accept(jo);
-
-            /*Object writtenData = connection.getDataValue(field);
-            if (writtenData.getClass().isArray()) {
-                Object[] writtenDataArray = (Object[]) writtenData;
-                writtenData = Array.get(writtenDataArray, 0);
-            }
-            if (List.class.isAssignableFrom(writtenData.getClass())) {
-                @SuppressWarnings("unchecked")
-                List<Object> writtenDataList = (List<Object>) writtenData;
-                writtenData = writtenDataList.get(0);
-            }
-            // System.out.println("checkConsumerJson"+(writeFailureCountTrigger > 0 ? "NEG" : "")+": value:"+value+" writtenData:"+writtenData);
-            if (writeFailureCountTrigger <= 0)
-                assertThat(value, equalTo(writtenData));
-            else {
-                if (++writeCount != writeFailureCountTrigger)
-                    assertThat(value, equalTo(writtenData));
-                else
-                    assertThat(previousValue, equalTo(writtenData));
-            }*/
-            previousValue = value;
-        }
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.edgent;
+
+import com.google.gson.JsonObject;
+import org.apache.edgent.function.Consumer;
+import org.apache.edgent.function.Function;
+import org.apache.edgent.function.Supplier;
+import org.apache.plc4x.edgent.mock.MockConnection;
+import org.apache.plc4x.edgent.mock.MockField;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteResponse;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.messages.items.DefaultLongFieldItem;
+import org.apache.plc4x.test.FastTests;
+import org.hamcrest.core.IsInstanceOf;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.core.IsNot.not;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.hamcrest.core.IsSame.sameInstance;
+import static org.junit.Assert.assertThat;
+
+public class PlcConnectionAdapterTest {
+
+    private MockConnection getMockConnection() throws PlcConnectionException {
+        return (MockConnection) new PlcDriverManager().getConnection("mock-for-edgent-integration://some-cool-url");
+    }
+
+    /*
+     * Test the PlcConnectionAdapter(PlcConnection) ctor, getConnection() and close()
+     */
+    @Test
+    @Category(FastTests.class)
+    public void testCtor1() throws Exception {
+        MockConnection mockConnection = getMockConnection();
+        PlcConnectionAdapter adapter = new PlcConnectionAdapter(mockConnection);
+        assertThat(mockConnection, sameInstance(adapter.getConnection()));
+        // and again... multiple adapter.getConnection() returns the same
+        assertThat(mockConnection, sameInstance(adapter.getConnection()));
+        adapter.close();
+    }
+
+    /*
+     * Test the PlcConnectionAdapter(url) ctor, getConnection() and close()
+     */
+    @Test
+    @Category(FastTests.class)
+    public void testCtor2() throws Exception {
+        MockConnection mockConnection = getMockConnection();
+        PlcConnectionAdapter adapter = new PlcConnectionAdapter(mockConnection.getUrl());
+        MockConnection mockConnection2 = (MockConnection) adapter.getConnection();
+        assertThat(mockConnection, not(sameInstance(mockConnection2)));
+        assertThat(mockConnection.getUrl(), sameInstance(mockConnection2.getUrl()));
+        // and again... multiple adapter.getConnection() returns the same
+        assertThat(mockConnection2, sameInstance(adapter.getConnection()));
+        adapter.close();
+    }
+
+    private <T> void checkRead(MockConnection connection, PlcReadRequest request, T value) throws InterruptedException, ExecutionException {
+        // this is really a tests of our mock tooling but knowing it's behaving as expected
+        // will help identify problems in the adapter/supplier/consumer
+        PlcField plcField = request.getFields().get(0);
+        // TODO: smart value conversion
+        connection.setFieldItem(plcField, new DefaultLongFieldItem(0L));
+
+        CompletableFuture<PlcReadResponse> cf = connection.read(request);
+
+        assertThat(cf.isDone(), is(true));
+        PlcReadResponse response = cf.get();
+        // TODO: fixme
+        // assertThat(value, equalTo(response.getResponseItems().get(0).getValues().get(0)));
+    }
+
+
+    private <T> void checkWrite(MockConnection connection, PlcWriteRequest request, T value) throws InterruptedException, ExecutionException {
+        // this is really a tests of our mock tooling but knowing it's behaving as expected
+        // will help identify problems in the adapter/supplier/consumer
+        PlcField plcField = request.getFields().get(0);
+        connection.setFieldItem(plcField, new DefaultLongFieldItem(0L));
+
+        CompletableFuture<PlcWriteResponse> cf = connection.write(request);
+
+        assertThat(cf.isDone(), is(true));
+        PlcWriteResponse response = cf.get();
+        assertThat(response, notNullValue());
+
+        // TODO: fixme
+        /*
+        Object writtenData = connection.getDataValue(request.getRequestItems().get(0).getField());
+        if (writtenData.getClass().isArray()) {
+            writtenData = Array.get(writtenData, 0);
+        }
+        if (List.class.isAssignableFrom(writtenData.getClass())) {
+            @SuppressWarnings("unchecked")
+            List<Object> writtenDataList = (List<Object>) writtenData;
+            writtenData = writtenDataList.get(0);
+        }
+        assertThat(value, equalTo(writtenData));*/
+    }
+
+    /*
+     * Verify the adapter yields the appropriate PlcReadRequest for each type and that it works.
+     */
+    @Test
+    @Category(FastTests.class)
+    public void testNewPlcReadRequest() throws Exception {
+        String addressStr = "MyReadWriteAddress/0";
+        MockField address = new MockField(addressStr);
+        PlcConnectionAdapter adapter = new PlcConnectionAdapter(getMockConnection());
+        MockConnection connection = (MockConnection) adapter.getConnection();
+
+        {
+            PlcReadRequest readRequest = adapter.readRequestBuilder().addItem("test", addressStr).build();
+            assertThat(readRequest.getNumberOfFields(), equalTo(1));
+            assertThat(readRequest.getField("test"), notNullValue());
+            assertThat(readRequest.getField("test"), IsInstanceOf.instanceOf(MockField.class));
+            assertThat(((MockField) readRequest.getField("test")).getAddress(), equalTo(addressStr));
+            checkRead(connection, readRequest, true);
+            checkRead(connection, readRequest, false);
+        }
+        /*{
+            TypeSafePlcReadRequest<Byte> request = PlcConnectionAdapter.newPlcReadRequest(Byte.class, address);
+            PlcReadRequestItem<Byte> requestItem = request.getCheckedReadRequestItems().get(0);
+            Class<Byte> dataType = requestItem.getDatatype();
+            assertThat(dataType, equalTo(Byte.class));
+            assertThat(address, sameInstance(requestItem.getField()));
+            checkRead(connection, request, (byte) 0x13);
+            checkRead(connection, request, (byte) 0x23);
+        }
+        {
+            TypeSafePlcReadRequest<Short> request = PlcConnectionAdapter.newPlcReadRequest(Short.class, address);
+            PlcReadRequestItem<Short> requestItem = request.getCheckedReadRequestItems().get(0);
+            Class<Short> dataType = requestItem.getDatatype();
+            assertThat(dataType, equalTo(Short.class));
+            assertThat(address, sameInstance(requestItem.getField()));
+            checkRead(connection, request, (short) 13);
+            checkRead(connection, request, (short) 23);
+        }
+        {
+            TypeSafePlcReadRequest<Integer> request = PlcConnectionAdapter.newPlcReadRequest(Integer.class, address);
+            PlcReadRequestItem<Integer> requestItem = request.getCheckedReadRequestItems().get(0);
+            Class<Integer> dataType = requestItem.getDatatype();
+            assertThat(dataType, equalTo(Integer.class));
+            assertThat(address, sameInstance(requestItem.getField()));
+            checkRead(connection, request, 33);
+            checkRead(connection, request, -133);
+        }
+        {
+            TypeSafePlcReadRequest<Float> request = PlcConnectionAdapter.newPlcReadRequest(Float.class, address);
+            PlcReadRequestItem<Float> requestItem = request.getCheckedReadRequestItems().get(0);
+            Class<Float> dataType = requestItem.getDatatype();
+            assertThat(dataType, equalTo(Float.class));
+            assertThat(address, sameInstance(requestItem.getField()));
+            checkRead(connection, request, 43.5f);
+            checkRead(connection, request, -143.5f);
+        }
+        {
+            TypeSafePlcReadRequest<String> request = PlcConnectionAdapter.newPlcReadRequest(String.class, address);
+            PlcReadRequestItem<String> requestItem = request.getCheckedReadRequestItems().get(0);
+            Class<String> dataType = requestItem.getDatatype();
+            assertThat(dataType, equalTo(String.class));
+            assertThat(address, sameInstance(requestItem.getField()));
+            checkRead(connection, request, "ReadySetGo");
+            checkRead(connection, request, "OneMoreTime");
+        }
+        {
+            TypeSafePlcReadRequest<Calendar> request = PlcConnectionAdapter.newPlcReadRequest(Calendar.class, address);
+            PlcReadRequestItem<Calendar> requestItem = request.getCheckedReadRequestItems().get(0);
+            Class<Calendar> dataType = requestItem.getDatatype();
+            assertThat(dataType, equalTo(Calendar.class));
+            assertThat(address, sameInstance(requestItem.getField()));
+            checkRead(connection, request, Calendar.getInstance());
+        }*/
+        adapter.close();
+    }
+
+
+    /*
+     * Verify the adapter yields the appropriate PlcWriteRequest for each type and that it works.
+     */
+    @Test
+    @Category(FastTests.class)
+    public void testNewPlcWriteRequest() throws Exception {
+        String addressStr = "MyReadWriteAddress/0";
+        MockField address = new MockField(addressStr);
+        PlcConnectionAdapter adapter = new PlcConnectionAdapter(getMockConnection());
+        MockConnection connection = (MockConnection) adapter.getConnection();
+
+        /*{
+            TypeSafePlcWriteRequest<Boolean> request = PlcConnectionAdapter.newPlcWriteRequest(address, true);
+            PlcWriteRequestItem<Boolean> requestItem = request.getCheckedRequestItems().get(0);
+            Class<Boolean> dataType = requestItem.getDatatype();
+            assertThat(dataType, typeCompatibleWith(Boolean.class));
+            assertThat(address, sameInstance(requestItem.getField()));
+            checkWrite(connection, request, true);
+        }
+        {
+            TypeSafePlcWriteRequest<Byte> request = PlcConnectionAdapter.newPlcWriteRequest(address, (byte) 0x113);
+            PlcWriteRequestItem<Byte> requestItem = request.getCheckedRequestItems().get(0);
+            Class<Byte> dataType = requestItem.getDatatype();
+            assertThat(dataType, typeCompatibleWith(Byte.class));
+            assertThat(address, sameInstance(requestItem.getField()));
+            checkWrite(connection, request, (byte) 0x113);
+        }
+        {
+            TypeSafePlcWriteRequest<Short> request = PlcConnectionAdapter.newPlcWriteRequest(address, (short) 113);
+            PlcWriteRequestItem<Short> requestItem = request.getCheckedRequestItems().get(0);
+            Class<Short> dataType = requestItem.getDatatype();
+            assertThat(dataType, typeCompatibleWith(Short.class));
+            assertThat(address, sameInstance(requestItem.getField()));
+            checkWrite(connection, request, (short) 113);
+        }
+        {
+            TypeSafePlcWriteRequest<Integer> request = PlcConnectionAdapter.newPlcWriteRequest(address, 1033);
+            PlcWriteRequestItem<Integer> requestItem = request.getCheckedRequestItems().get(0);
+            Class<Integer> dataType = requestItem.getDatatype();
+            assertThat(dataType, typeCompatibleWith(Integer.class));
+            assertThat(address, sameInstance(requestItem.getField()));
+            checkWrite(connection, request, 1033);
+        }
+        {
+            TypeSafePlcWriteRequest<Float> request = PlcConnectionAdapter.newPlcWriteRequest(address, 1043.5f);
+            PlcWriteRequestItem<Float> requestItem = request.getCheckedRequestItems().get(0);
+            Class<Float> dataType = requestItem.getDatatype();
+            assertThat(dataType, typeCompatibleWith(Float.class));
+            assertThat(address, sameInstance(requestItem.getField()));
+            checkWrite(connection, request, 1043.5f);
+        }
+        {
+            TypeSafePlcWriteRequest<String> request = PlcConnectionAdapter.newPlcWriteRequest(address, "A written value");
+            PlcWriteRequestItem<String> requestItem = request.getCheckedRequestItems().get(0);
+            Class<String> dataType = requestItem.getDatatype();
+            assertThat(dataType, typeCompatibleWith(String.class));
+            assertThat(address, sameInstance(requestItem.getField()));
+            checkWrite(connection, request, "A written value");
+        }
+        {
+            Calendar calValue = Calendar.getInstance();
+            TypeSafePlcWriteRequest<Calendar> request = PlcConnectionAdapter.newPlcWriteRequest(address, calValue);
+            PlcWriteRequestItem<Calendar> requestItem = request.getCheckedRequestItems().get(0);
+            Class<Calendar> dataType = requestItem.getDatatype();
+            assertThat(dataType, typeCompatibleWith(Calendar.class));
+            assertThat(address, sameInstance(requestItem.getField()));
+            checkWrite(connection, request, calValue);
+        }*/
+        adapter.close();
+    }
+
+    /*
+     * test PlcConnectionAdapter.newSupplier
+     */
+    @Test
+    @Category(FastTests.class)
+    public void testNewSupplier() throws Exception {
+        String addressStr = "MyReadWriteAddress/0";
+        MockField address = new MockField(addressStr);
+        PlcConnectionAdapter adapter = new PlcConnectionAdapter(getMockConnection());
+        MockConnection connection = (MockConnection) adapter.getConnection();
+
+        /*{
+            Supplier<Boolean> supplier = adapter.newSupplier(Boolean.class, addressStr);
+            assertThat(supplier, not(sameInstance(adapter.newSupplier(Boolean.class, addressStr))));
+            checkSupplier(connection, address, supplier, true, false);
+        }
+        {
+            Supplier<Byte> supplier = adapter.newSupplier(Byte.class, addressStr);
+            checkSupplier(connection, address, supplier, (byte) 0x1, (byte) 0x2, (byte) 0x3);
+        }
+        {
+            Supplier<Short> supplier = adapter.newSupplier(Short.class, addressStr);
+            checkSupplier(connection, address, supplier, (short) 1, (short) 2, (short) 3);
+        }
+        {
+            Supplier<Integer> supplier = adapter.newSupplier(Integer.class, addressStr);
+            checkSupplier(connection, address, supplier, 1000, 1001, 1002);
+        }
+        {
+            Supplier<Float> supplier = adapter.newSupplier(Float.class, addressStr);
+            checkSupplier(connection, address, supplier, 1000.5f, 1001.5f, 1002.5f);
+        }
+        {
+            Supplier<?> supplier = adapter.newSupplier(String.class, addressStr);
+            checkSupplier(connection, address, supplier, "one", "two", "three");
+        }*/
+        adapter.close();
+    }
+
+    /*
+     * test PlcConnectionAdapter.newSupplier with read exception
+     */
+    @Test
+    @Category(FastTests.class)
+    public void testNewSupplierNeg() throws Exception {
+        String addressStr = "MyReadWriteAddress/0";
+        MockField address = new MockField(addressStr);
+        PlcConnectionAdapter adapter = new PlcConnectionAdapter(getMockConnection());
+        MockConnection connection = (MockConnection) adapter.getConnection();
+
+        /*Supplier<String> supplier = adapter.newSupplier(String.class, addressStr);
+        checkSupplier(2, connection, address, supplier, "one", "two", "three");*/
+
+        adapter.close();
+    }
+
+    static <T> void checkSupplier(MockConnection connection, PlcField field, Supplier<T> supplier, Object... values) {
+        checkSupplier(0, connection, field, supplier, values);
+    }
+
+    private static <T> void checkSupplier(int readFailureCountTrigger, MockConnection connection, PlcField field, Supplier<T> supplier, Object... values) {
+        // verify that a read failure doesn't kill the consumer
+        // it logs (not verified) but returns null (as designed) and keeps working for the subsequent reads
+        connection.setReadException(readFailureCountTrigger, "This is a mock read exception");
+        int readCount = 0;
+        /*for (Object value : values) {
+            connection.setDataValue(field, value);
+            T readData = supplier.get();
+            // System.out.println("checkSupplier"+(readFailureCountTrigger > 0 ? "NEG" : "")+": value:"+value+" readData:"+readData);
+            if (readFailureCountTrigger <= 0)
+                assertThat(value, equalTo(readData));
+            else {
+                if (++readCount != readFailureCountTrigger)
+                    assertThat(value, equalTo(readData));
+                else
+                    assertThat(readData, nullValue());
+            }
+        }*/
+    }
+
+    /*
+     * test PlcConnectionAdapter.newJsonConsumer(address)
+     */
+    @Test
+    @Category(FastTests.class)
+    public void testNewConsumer1() throws Exception {
+        String addressStr = "MyReadWriteAddress/0";
+        MockField address = new MockField(addressStr);
+        PlcConnectionAdapter adapter = new PlcConnectionAdapter(getMockConnection());
+        MockConnection connection = (MockConnection) adapter.getConnection();
+
+        Consumer<?> consumer;
+
+        /*consumer = adapter.newConsumer(Boolean.class, addressStr);
+        assertThat(consumer, not(sameInstance(adapter.newConsumer(Boolean.class, addressStr))));
+        checkConsumer(connection, address, consumer, true, false);
+
+        consumer = adapter.newConsumer(Byte.class, addressStr);
+        checkConsumer(connection, address, consumer, (byte) 0x1, (byte) 0x2, (byte) 0x3);
+
+        consumer = adapter.newConsumer(Short.class, addressStr);
+        checkConsumer(connection, address, consumer, (short) 1, (short) 2, (short) 3);
+
+        consumer = adapter.newConsumer(Integer.class, addressStr);
+        checkConsumer(connection, address, consumer, 1000, 1001, 1002);
+
+        consumer = adapter.newConsumer(Float.class, addressStr);
+        checkConsumer(connection, address, consumer, 1000.5f, 1001.5f, 1002.5f);
+
+        consumer = adapter.newConsumer(String.class, addressStr);
+        checkConsumer(connection, address, consumer, "one", "two", "three");*/
+
+        adapter.close();
+    }
+
+    /*
+     * test PlcConnectionAdapter.newJsonConsumer(address) with write exception
+     */
+    @Test
+    @Category(FastTests.class)
+    public void testNewConsumer1Neg() throws Exception {
+        String addressStr = "MyReadWriteAddress/0";
+        MockField address = new MockField(addressStr);
+        PlcConnectionAdapter adapter = new PlcConnectionAdapter(getMockConnection());
+        MockConnection connection = (MockConnection) adapter.getConnection();
+
+        Consumer<?> consumer;
+
+        /*consumer = adapter.newConsumer(String.class, addressStr);
+        checkConsumer(2, connection, address, consumer, "one", "two", "three");*/
+
+        adapter.close();
+    }
+
+    static <T> void checkConsumer(MockConnection connection, PlcField field, Consumer<T> consumer, Object... values) {
+        checkConsumer(0, connection, field, consumer, values);
+    }
+
+    private static <T> void checkConsumer(int writeFailureCountTrigger, MockConnection connection, PlcField field, Consumer<T> consumer, Object... values) {
+        // verify that a write failure doesn't kill the consumer
+        // it logs (not verified) but keeps working for the subsequent writes
+        connection.setWriteException(writeFailureCountTrigger, "This is a mock write exception");
+        int writeCount = 0;
+        Object previousValue = null;
+        /*for (Object value : values) {
+            @SuppressWarnings("unchecked")
+            T tValue = (T) value;
+            consumer.accept(tValue);
+            Object writtenData = connection.getDataValue(field);
+            if (List.class.isAssignableFrom(writtenData.getClass())) {
+              @SuppressWarnings("unchecked")
+              List<Object> writtenDataList = (List<Object>) writtenData;
+                writtenData = writtenDataList.get(0);
+            }
+            if (writtenData.getClass().isArray()) {
+                writtenData = Array.get(writtenData, 0);
+            }
+            // System.out.println("checkConsumer"+(writeFailureCountTrigger > 0 ? "NEG" : "")+": value:"+value+" writtenData:"+writtenData);
+            if (writeFailureCountTrigger <= 0)
+                assertThat(value, equalTo(writtenData));
+            else {
+                if (++writeCount != writeFailureCountTrigger)
+                    assertThat(value, equalTo(writtenData));
+                else
+                    assertThat(previousValue, equalTo(writtenData));
+            }
+            previousValue = value;
+        }*/
+    }
+
+    /*
+     * test PlcConnectionAdapter.newJsonConsumer(addressFn, valueFn)
+     */
+    @Test
+    @Category(FastTests.class)
+    public void testNewConsumer2() throws Exception {
+        String addressStr = "MyReadWriteAddress/0";
+        MockField address = new MockField(addressStr);
+        PlcConnectionAdapter adapter = new PlcConnectionAdapter(getMockConnection());
+        MockConnection connection = (MockConnection) adapter.getConnection();
+
+        Consumer<JsonObject> consumer;
+
+        Function<JsonObject, String> addressFn = t -> t.get("address").getAsString();
+
+        /*consumer = adapter.newJsonConsumer(Boolean.class, addressFn, t -> t.get("value").getAsBoolean());
+        checkConsumerJson(connection, address, consumer, true, false);
+
+        consumer = adapter.newJsonConsumer(Byte.class, addressFn, t -> t.get("value").getAsByte());
+        checkConsumerJson(connection, address, consumer, (byte) 0x1, (byte) 0x2, (byte) 0x3);
+
+        consumer = adapter.newJsonConsumer(Short.class, addressFn, t -> t.get("value").getAsShort());
+        checkConsumerJson(connection, address, consumer, (short) 1, (short) 2, (short) 3);
+
+        consumer = adapter.newJsonConsumer(Integer.class, addressFn, t -> t.get("value").getAsInt());
+        checkConsumerJson(connection, address, consumer, 1000, 1001, 1002);
+
+        consumer = adapter.newJsonConsumer(Float.class, addressFn, t -> t.get("value").getAsFloat());
+        checkConsumerJson(connection, address, consumer, 1000.5f, 1001.5f, 1002.5f);
+
+        consumer = adapter.newJsonConsumer(String.class, addressFn, t -> t.get("value").getAsString());
+        checkConsumerJson(connection, address, consumer, "one", "two", "three");*/
+
+        adapter.close();
+    }
+
+    /*
+     * test PlcConnectionAdapter.newJsonConsumer(addressFn, valueFn) with write failure
+     */
+    @Test
+    @Category(FastTests.class)
+    public void testNewConsumer2Neg() throws Exception {
+        String addressStr = "MyReadWriteAddress/0";
+        MockField address = new MockField(addressStr);
+        PlcConnectionAdapter adapter = new PlcConnectionAdapter(getMockConnection());
+        MockConnection connection = (MockConnection) adapter.getConnection();
+
+        Consumer<JsonObject> consumer;
+
+        Function<JsonObject, String> addressFn = t -> t.get("address").getAsString();
+
+        /*consumer = adapter.newJsonConsumer(String.class, addressFn, t -> t.get("value").getAsString());
+        checkConsumerJson(2, connection, address, consumer, "one", "two", "three");*/
+
+        adapter.close();
+    }
+
+    static <T> void checkConsumerJson(MockConnection connection, MockField address, Consumer<JsonObject> consumer, Object... values) {
+        checkConsumerJson(0, connection, address, consumer, values);
+    }
+
+    private static <T> void checkConsumerJson(int writeFailureCountTrigger, MockConnection connection,
+                                              MockField field, Consumer<JsonObject> consumer, Object... values) {
+        if (writeFailureCountTrigger > 0) {
+            connection.setWriteException(writeFailureCountTrigger, "This is a mock write exception");
+        }
+        int writeCount = 0;
+        Object previousValue = null;
+        for (Object value : values) {
+
+            // build the JsonObject to consume
+            JsonObject jo = new JsonObject();
+            jo.addProperty("address", field.getAddress());
+            if (value instanceof Boolean) {
+                jo.addProperty("value", (Boolean) value);
+            } else if (value instanceof Number) {
+                jo.addProperty("value", (Number) value);
+            } else if (value instanceof String) {
+                jo.addProperty("value", (String) value);
+            }
+
+            consumer.accept(jo);
+
+            /*Object writtenData = connection.getDataValue(field);
+            if (writtenData.getClass().isArray()) {
+                Object[] writtenDataArray = (Object[]) writtenData;
+                writtenData = Array.get(writtenDataArray, 0);
+            }
+            if (List.class.isAssignableFrom(writtenData.getClass())) {
+                @SuppressWarnings("unchecked")
+                List<Object> writtenDataList = (List<Object>) writtenData;
+                writtenData = writtenDataList.get(0);
+            }
+            // System.out.println("checkConsumerJson"+(writeFailureCountTrigger > 0 ? "NEG" : "")+": value:"+value+" writtenData:"+writtenData);
+            if (writeFailureCountTrigger <= 0)
+                assertThat(value, equalTo(writtenData));
+            else {
+                if (++writeCount != writeFailureCountTrigger)
+                    assertThat(value, equalTo(writtenData));
+                else
+                    assertThat(previousValue, equalTo(writtenData));
+            }*/
+            previousValue = value;
+        }
+    }
+
+}
diff --git a/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/PlcFunctionsTest.java b/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/PlcFunctionsTest.java
index 802f68ebcd9..c55d62881db 100644
--- a/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/PlcFunctionsTest.java
+++ b/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/PlcFunctionsTest.java
@@ -1,144 +1,144 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.edgent;
-
-import com.google.gson.JsonObject;
-import org.apache.edgent.function.Consumer;
-import org.apache.edgent.function.Function;
-import org.apache.edgent.function.Supplier;
-import org.apache.plc4x.edgent.mock.MockConnection;
-import org.apache.plc4x.edgent.mock.MockField;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.test.FastTests;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-public class PlcFunctionsTest {
-
-    protected MockConnection getMockConnection() throws PlcConnectionException {
-        return (MockConnection) new PlcDriverManager().getConnection("mock-for-edgent-integration://some-cool-url");
-    }
-
-    /*
-     * test PlcConnectionAdapter.newSupplier
-     */
-    @SuppressWarnings("unchecked")
-    @Test
-    @Category(FastTests.class)
-    public void testSupplier() throws Exception {
-        String addressStr = "MyReadWriteAddress/0";
-        MockField address = new MockField(addressStr);
-        PlcConnectionAdapter adapter = new PlcConnectionAdapter(getMockConnection());
-        MockConnection connection = (MockConnection) adapter.getConnection();
-
-        Supplier<?> supplier;
-
-        supplier = PlcFunctions.booleanSupplier(adapter, addressStr);
-        PlcConnectionAdapterTest.checkSupplier(connection, address, supplier, true, false);
-
-        supplier = PlcFunctions.byteSupplier(adapter, addressStr);
-        PlcConnectionAdapterTest.checkSupplier(connection, address, supplier, (byte)0x1, (byte)0x2, (byte)0x3);
-
-        supplier = PlcFunctions.shortSupplier(adapter, addressStr);
-        PlcConnectionAdapterTest.checkSupplier(connection, address, supplier, (short)1, (short)2, (short)3);
-
-        supplier = PlcFunctions.integerSupplier(adapter, addressStr);
-        PlcConnectionAdapterTest.checkSupplier(connection, address, supplier, 1000, 1001, 1002);
-
-        supplier = PlcFunctions.floatSupplier(adapter, addressStr);
-        PlcConnectionAdapterTest.checkSupplier(connection, address, supplier, 1000.5f, 1001.5f, 1002.5f);
-
-        supplier = PlcFunctions.stringSupplier(adapter, addressStr);
-        PlcConnectionAdapterTest.checkSupplier(connection, address, supplier, "one", "two", "three");
-
-        adapter.close();
-    }
-
-    /*
-     * test PlcConnectionAdapter.newJsonConsumer(address)
-     */
-    @Test
-    @Category(FastTests.class)
-    public void testNewConsumer1() throws Exception {
-        String addressStr = "MyReadWriteAddress/0";
-        MockField address = new MockField(addressStr);
-        PlcConnectionAdapter adapter = new PlcConnectionAdapter(getMockConnection());
-        MockConnection connection = (MockConnection) adapter.getConnection();
-
-        Consumer<?> consumer;
-
-        consumer = PlcFunctions.booleanConsumer(adapter, addressStr);
-        PlcConnectionAdapterTest.checkConsumer(connection, address, consumer, true, false);
-
-        consumer = PlcFunctions.byteConsumer(adapter, addressStr);
-        PlcConnectionAdapterTest.checkConsumer(connection, address, consumer, (byte)0x1, (byte)0x2, (byte)0x3);
-
-        consumer = PlcFunctions.shortConsumer(adapter, addressStr);
-        PlcConnectionAdapterTest.checkConsumer(connection, address, consumer, (short)1, (short)2, (short)3);
-
-        consumer = PlcFunctions.integerConsumer(adapter, addressStr);
-        PlcConnectionAdapterTest.checkConsumer(connection, address, consumer, 1000, 1001, 1002);
-
-        consumer = PlcFunctions.floatConsumer(adapter, addressStr);
-        PlcConnectionAdapterTest.checkConsumer(connection, address, consumer, 1000.5f, 1001.5f, 1002.5f);
-
-        consumer = PlcFunctions.stringConsumer(adapter, addressStr);
-        PlcConnectionAdapterTest.checkConsumer(connection, address, consumer, "one", "two", "three");
-
-        adapter.close();
-    }
-
-    /*
-     * test PlcConnectionAdapter.newJsonConsumer(addressFn, valueFn)
-     */
-    @Test
-    @Category(FastTests.class)
-    public void testNewConsumer2() throws Exception {
-        String addressStr = "MyReadWriteAddress/0";
-        MockField address = new MockField(addressStr);
-        PlcConnectionAdapter adapter = new PlcConnectionAdapter(getMockConnection());
-        MockConnection connection = (MockConnection) adapter.getConnection();
-
-        Consumer<JsonObject> consumer;
-
-        Function<JsonObject,String> addressFn = t -> t.get("address").getAsString();
-
-        consumer = PlcFunctions.booleanConsumer(adapter, addressFn, t -> t.get("value").getAsBoolean());
-        PlcConnectionAdapterTest.checkConsumerJson(connection, address, consumer, true, false);
-
-        consumer = PlcFunctions.byteConsumer(adapter, addressFn, t -> t.get("value").getAsByte());
-        PlcConnectionAdapterTest.checkConsumerJson(connection, address, consumer, (byte)0x1, (byte)0x2, (byte)0x3);
-
-        consumer = PlcFunctions.shortConsumer(adapter, addressFn, t -> t.get("value").getAsShort());
-        PlcConnectionAdapterTest.checkConsumerJson(connection, address, consumer, (short)1, (short)2, (short)3);
-
-        consumer = PlcFunctions.integerConsumer(adapter, addressFn, t -> t.get("value").getAsInt());
-        PlcConnectionAdapterTest.checkConsumerJson(connection, address, consumer, 1000, 1001, 1002);
-
-        consumer = PlcFunctions.floatConsumer(adapter, addressFn, t -> t.get("value").getAsFloat());
-        PlcConnectionAdapterTest.checkConsumerJson(connection, address, consumer, 1000.5f, 1001.5f, 1002.5f);
-
-        consumer = PlcFunctions.stringConsumer(adapter, addressFn, t -> t.get("value").getAsString());
-        PlcConnectionAdapterTest.checkConsumerJson(connection, address, consumer, "one", "two", "three");
-
-        adapter.close();
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.edgent;
+
+import com.google.gson.JsonObject;
+import org.apache.edgent.function.Consumer;
+import org.apache.edgent.function.Function;
+import org.apache.edgent.function.Supplier;
+import org.apache.plc4x.edgent.mock.MockConnection;
+import org.apache.plc4x.edgent.mock.MockField;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.test.FastTests;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+public class PlcFunctionsTest {
+
+    protected MockConnection getMockConnection() throws PlcConnectionException {
+        return (MockConnection) new PlcDriverManager().getConnection("mock-for-edgent-integration://some-cool-url");
+    }
+
+    /*
+     * test PlcConnectionAdapter.newSupplier
+     */
+    @SuppressWarnings("unchecked")
+    @Test
+    @Category(FastTests.class)
+    public void testSupplier() throws Exception {
+        String addressStr = "MyReadWriteAddress/0";
+        MockField address = new MockField(addressStr);
+        PlcConnectionAdapter adapter = new PlcConnectionAdapter(getMockConnection());
+        MockConnection connection = (MockConnection) adapter.getConnection();
+
+        Supplier<?> supplier;
+
+        supplier = PlcFunctions.booleanSupplier(adapter, addressStr);
+        PlcConnectionAdapterTest.checkSupplier(connection, address, supplier, true, false);
+
+        supplier = PlcFunctions.byteSupplier(adapter, addressStr);
+        PlcConnectionAdapterTest.checkSupplier(connection, address, supplier, (byte)0x1, (byte)0x2, (byte)0x3);
+
+        supplier = PlcFunctions.shortSupplier(adapter, addressStr);
+        PlcConnectionAdapterTest.checkSupplier(connection, address, supplier, (short)1, (short)2, (short)3);
+
+        supplier = PlcFunctions.integerSupplier(adapter, addressStr);
+        PlcConnectionAdapterTest.checkSupplier(connection, address, supplier, 1000, 1001, 1002);
+
+        supplier = PlcFunctions.floatSupplier(adapter, addressStr);
+        PlcConnectionAdapterTest.checkSupplier(connection, address, supplier, 1000.5f, 1001.5f, 1002.5f);
+
+        supplier = PlcFunctions.stringSupplier(adapter, addressStr);
+        PlcConnectionAdapterTest.checkSupplier(connection, address, supplier, "one", "two", "three");
+
+        adapter.close();
+    }
+
+    /*
+     * test PlcConnectionAdapter.newJsonConsumer(address)
+     */
+    @Test
+    @Category(FastTests.class)
+    public void testNewConsumer1() throws Exception {
+        String addressStr = "MyReadWriteAddress/0";
+        MockField address = new MockField(addressStr);
+        PlcConnectionAdapter adapter = new PlcConnectionAdapter(getMockConnection());
+        MockConnection connection = (MockConnection) adapter.getConnection();
+
+        Consumer<?> consumer;
+
+        consumer = PlcFunctions.booleanConsumer(adapter, addressStr);
+        PlcConnectionAdapterTest.checkConsumer(connection, address, consumer, true, false);
+
+        consumer = PlcFunctions.byteConsumer(adapter, addressStr);
+        PlcConnectionAdapterTest.checkConsumer(connection, address, consumer, (byte)0x1, (byte)0x2, (byte)0x3);
+
+        consumer = PlcFunctions.shortConsumer(adapter, addressStr);
+        PlcConnectionAdapterTest.checkConsumer(connection, address, consumer, (short)1, (short)2, (short)3);
+
+        consumer = PlcFunctions.integerConsumer(adapter, addressStr);
+        PlcConnectionAdapterTest.checkConsumer(connection, address, consumer, 1000, 1001, 1002);
+
+        consumer = PlcFunctions.floatConsumer(adapter, addressStr);
+        PlcConnectionAdapterTest.checkConsumer(connection, address, consumer, 1000.5f, 1001.5f, 1002.5f);
+
+        consumer = PlcFunctions.stringConsumer(adapter, addressStr);
+        PlcConnectionAdapterTest.checkConsumer(connection, address, consumer, "one", "two", "three");
+
+        adapter.close();
+    }
+
+    /*
+     * test PlcConnectionAdapter.newJsonConsumer(addressFn, valueFn)
+     */
+    @Test
+    @Category(FastTests.class)
+    public void testNewConsumer2() throws Exception {
+        String addressStr = "MyReadWriteAddress/0";
+        MockField address = new MockField(addressStr);
+        PlcConnectionAdapter adapter = new PlcConnectionAdapter(getMockConnection());
+        MockConnection connection = (MockConnection) adapter.getConnection();
+
+        Consumer<JsonObject> consumer;
+
+        Function<JsonObject,String> addressFn = t -> t.get("address").getAsString();
+
+        consumer = PlcFunctions.booleanConsumer(adapter, addressFn, t -> t.get("value").getAsBoolean());
+        PlcConnectionAdapterTest.checkConsumerJson(connection, address, consumer, true, false);
+
+        consumer = PlcFunctions.byteConsumer(adapter, addressFn, t -> t.get("value").getAsByte());
+        PlcConnectionAdapterTest.checkConsumerJson(connection, address, consumer, (byte)0x1, (byte)0x2, (byte)0x3);
+
+        consumer = PlcFunctions.shortConsumer(adapter, addressFn, t -> t.get("value").getAsShort());
+        PlcConnectionAdapterTest.checkConsumerJson(connection, address, consumer, (short)1, (short)2, (short)3);
+
+        consumer = PlcFunctions.integerConsumer(adapter, addressFn, t -> t.get("value").getAsInt());
+        PlcConnectionAdapterTest.checkConsumerJson(connection, address, consumer, 1000, 1001, 1002);
+
+        consumer = PlcFunctions.floatConsumer(adapter, addressFn, t -> t.get("value").getAsFloat());
+        PlcConnectionAdapterTest.checkConsumerJson(connection, address, consumer, 1000.5f, 1001.5f, 1002.5f);
+
+        consumer = PlcFunctions.stringConsumer(adapter, addressFn, t -> t.get("value").getAsString());
+        PlcConnectionAdapterTest.checkConsumerJson(connection, address, consumer, "one", "two", "three");
+
+        adapter.close();
+    }
+
+}
diff --git a/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java b/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java
index 05d8b5de579..515b5fe4298 100644
--- a/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java
+++ b/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java
@@ -1,155 +1,155 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.edgent.mock;
-
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.exceptions.PlcIoException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.messages.PlcWriteResponse;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.messages.*;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-
-public class MockConnection extends org.apache.plc4x.java.mock.connection.MockConnection implements PlcReader, PlcWriter {
-
-    private final String url;
-    private final PlcAuthentication authentication;
-    private final Map<PlcField, BaseDefaultFieldItem<?>> dataValueMap = new HashMap<>();
-    private long curReadCnt;
-    private int readExceptionTriggerCount;
-    private String readExceptionMsg;
-    private long curWriteCnt;
-    private int writeExceptionTriggerCount;
-    private String writeExceptionMsg;
-    private boolean connected;
-
-    public MockConnection(String url) {
-        this(url, null);
-    }
-
-    public MockConnection(String url, PlcAuthentication authentication) {
-        super();
-        this.url = url;
-        this.authentication = authentication;
-        this.connected = false;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    @Override
-    public boolean canRead() {
-        return true;
-    }
-
-    @Override
-    public boolean canWrite() {
-        return true;
-    }
-
-    @Override
-    public PlcReadRequest.Builder readRequestBuilder() {
-        return new DefaultPlcReadRequest.Builder(this, new MockFieldHandler());
-    }
-
-    @Override
-    public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
-        curReadCnt++;
-        if (readExceptionTriggerCount > 0 && curReadCnt == readExceptionTriggerCount) {
-            curReadCnt = 0;
-            CompletableFuture<PlcReadResponse> cf = new CompletableFuture<>();
-            cf.completeExceptionally(new PlcIoException(readExceptionMsg));
-            return cf;
-        }
-        Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> fields = new LinkedHashMap<>();
-        for (String fieldName : readRequest.getFieldNames()) {
-            PlcField field = readRequest.getField(fieldName);
-            fields.put(fieldName, new ImmutablePair<>(PlcResponseCode.OK, getFieldItem(field)));
-        }
-        PlcReadResponse response = new DefaultPlcReadResponse((InternalPlcReadRequest) readRequest, fields);
-        return CompletableFuture.completedFuture(response);
-    }
-
-    @Override
-    public PlcWriteRequest.Builder writeRequestBuilder() {
-        return new DefaultPlcWriteRequest.Builder(this, new MockFieldHandler());
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
-        DefaultPlcWriteRequest defaultPlcWriteRequest = (DefaultPlcWriteRequest) writeRequest;
-        curWriteCnt++;
-        if (writeExceptionTriggerCount > 0 && curWriteCnt == writeExceptionTriggerCount) {
-            curWriteCnt = 0;
-            CompletableFuture<PlcWriteResponse> cf = new CompletableFuture<>();
-            cf.completeExceptionally(new PlcIoException(writeExceptionMsg));
-            return cf;
-        }
-        Map<String, PlcResponseCode> fields = new LinkedHashMap<>();
-        for (String fieldName : defaultPlcWriteRequest.getFieldNames()) {
-            PlcField field = defaultPlcWriteRequest.getField(fieldName);
-            setFieldItem(field, defaultPlcWriteRequest.getFieldItem(fieldName));
-            fields.put(fieldName, PlcResponseCode.OK);
-        }
-        PlcWriteResponse response = new DefaultPlcWriteResponse(defaultPlcWriteRequest, fields);
-
-        return CompletableFuture.completedFuture(response);
-    }
-
-    public void setFieldItem(PlcField field, BaseDefaultFieldItem<?> fieldItem) {
-        dataValueMap.put(field, fieldItem);
-    }
-
-    public BaseDefaultFieldItem<?> getFieldItem(PlcField field) {
-        return dataValueMap.get(field);
-    }
-
-    public Map<PlcField, BaseDefaultFieldItem<?>> getAllFieldItems() {
-        return dataValueMap;
-    }
-
-    public void clearAllFieldItems() {
-        dataValueMap.clear();
-    }
-
-    public void setReadException(int readTriggerCount, String msg) {
-        readExceptionTriggerCount = readTriggerCount;
-        readExceptionMsg = msg;
-        curReadCnt = 0;
-    }
-
-    public void setWriteException(int writeTriggerCount, String msg) {
-        writeExceptionTriggerCount = writeTriggerCount;
-        writeExceptionMsg = msg;
-        curWriteCnt = 0;
-    }
-
-}
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.edgent.mock;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.authentication.PlcAuthentication;
+import org.apache.plc4x.java.api.exceptions.PlcIoException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteResponse;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.messages.*;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
+public class MockConnection extends org.apache.plc4x.java.mock.connection.MockConnection implements PlcReader, PlcWriter {
+
+    private final String url;
+    private final PlcAuthentication authentication;
+    private final Map<PlcField, BaseDefaultFieldItem<?>> dataValueMap = new HashMap<>();
+    private long curReadCnt;
+    private int readExceptionTriggerCount;
+    private String readExceptionMsg;
+    private long curWriteCnt;
+    private int writeExceptionTriggerCount;
+    private String writeExceptionMsg;
+    private boolean connected;
+
+    public MockConnection(String url) {
+        this(url, null);
+    }
+
+    public MockConnection(String url, PlcAuthentication authentication) {
+        super();
+        this.url = url;
+        this.authentication = authentication;
+        this.connected = false;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    @Override
+    public boolean canRead() {
+        return true;
+    }
+
+    @Override
+    public boolean canWrite() {
+        return true;
+    }
+
+    @Override
+    public PlcReadRequest.Builder readRequestBuilder() {
+        return new DefaultPlcReadRequest.Builder(this, new MockFieldHandler());
+    }
+
+    @Override
+    public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
+        curReadCnt++;
+        if (readExceptionTriggerCount > 0 && curReadCnt == readExceptionTriggerCount) {
+            curReadCnt = 0;
+            CompletableFuture<PlcReadResponse> cf = new CompletableFuture<>();
+            cf.completeExceptionally(new PlcIoException(readExceptionMsg));
+            return cf;
+        }
+        Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> fields = new LinkedHashMap<>();
+        for (String fieldName : readRequest.getFieldNames()) {
+            PlcField field = readRequest.getField(fieldName);
+            fields.put(fieldName, new ImmutablePair<>(PlcResponseCode.OK, getFieldItem(field)));
+        }
+        PlcReadResponse response = new DefaultPlcReadResponse((InternalPlcReadRequest) readRequest, fields);
+        return CompletableFuture.completedFuture(response);
+    }
+
+    @Override
+    public PlcWriteRequest.Builder writeRequestBuilder() {
+        return new DefaultPlcWriteRequest.Builder(this, new MockFieldHandler());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
+        DefaultPlcWriteRequest defaultPlcWriteRequest = (DefaultPlcWriteRequest) writeRequest;
+        curWriteCnt++;
+        if (writeExceptionTriggerCount > 0 && curWriteCnt == writeExceptionTriggerCount) {
+            curWriteCnt = 0;
+            CompletableFuture<PlcWriteResponse> cf = new CompletableFuture<>();
+            cf.completeExceptionally(new PlcIoException(writeExceptionMsg));
+            return cf;
+        }
+        Map<String, PlcResponseCode> fields = new LinkedHashMap<>();
+        for (String fieldName : defaultPlcWriteRequest.getFieldNames()) {
+            PlcField field = defaultPlcWriteRequest.getField(fieldName);
+            setFieldItem(field, defaultPlcWriteRequest.getFieldItem(fieldName));
+            fields.put(fieldName, PlcResponseCode.OK);
+        }
+        PlcWriteResponse response = new DefaultPlcWriteResponse(defaultPlcWriteRequest, fields);
+
+        return CompletableFuture.completedFuture(response);
+    }
+
+    public void setFieldItem(PlcField field, BaseDefaultFieldItem<?> fieldItem) {
+        dataValueMap.put(field, fieldItem);
+    }
+
+    public BaseDefaultFieldItem<?> getFieldItem(PlcField field) {
+        return dataValueMap.get(field);
+    }
+
+    public Map<PlcField, BaseDefaultFieldItem<?>> getAllFieldItems() {
+        return dataValueMap;
+    }
+
+    public void clearAllFieldItems() {
+        dataValueMap.clear();
+    }
+
+    public void setReadException(int readTriggerCount, String msg) {
+        readExceptionTriggerCount = readTriggerCount;
+        readExceptionMsg = msg;
+        curReadCnt = 0;
+    }
+
+    public void setWriteException(int writeTriggerCount, String msg) {
+        writeExceptionTriggerCount = writeTriggerCount;
+        writeExceptionMsg = msg;
+        curWriteCnt = 0;
+    }
+
+}
diff --git a/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockDriver.java b/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockDriver.java
index 0a139073923..2cff702b7b8 100644
--- a/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockDriver.java
+++ b/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockDriver.java
@@ -1,48 +1,48 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.edgent.mock;
-
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.spi.PlcDriver;
-
-public class MockDriver implements PlcDriver {
-
-    @Override
-    public String getProtocolCode() {
-        return "mock-for-edgent-integration";
-    }
-
-    @Override
-    public String getProtocolName() {
-        return "Mock Protocol Implementation";
-    }
-
-    @Override
-    public PlcConnection connect(String url) throws PlcConnectionException {
-        return new MockConnection(url);
-    }
-
-    @Override
-    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
-        return new MockConnection(url, authentication);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.edgent.mock;
+
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.authentication.PlcAuthentication;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.spi.PlcDriver;
+
+public class MockDriver implements PlcDriver {
+
+    @Override
+    public String getProtocolCode() {
+        return "mock-for-edgent-integration";
+    }
+
+    @Override
+    public String getProtocolName() {
+        return "Mock Protocol Implementation";
+    }
+
+    @Override
+    public PlcConnection connect(String url) throws PlcConnectionException {
+        return new MockConnection(url);
+    }
+
+    @Override
+    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
+        return new MockConnection(url, authentication);
+    }
+
+}
diff --git a/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockField.java b/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockField.java
index 16dc9654a1b..67f1120709c 100644
--- a/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockField.java
+++ b/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockField.java
@@ -1,62 +1,62 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.edgent.mock;
-
-import org.apache.plc4x.java.api.model.PlcField;
-
-public class MockField implements PlcField {
-
-    private final String address;
-    private final MockFieldItem fieldItem;
-
-    public MockField(String address) {
-        this.address = address;
-        this.fieldItem = null;
-    }
-
-    public MockField(String address, MockFieldItem fieldItem) {
-        this.address = address;
-        this.fieldItem = fieldItem;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public MockFieldItem getFieldItem() {
-        return fieldItem;
-    }
-
-    @Override
-    public String toString() {
-        return "mock field: " + address;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return o instanceof MockField
-            && ((MockField) o).address.equals(this.address);
-    }
-
-    @Override
-    public int hashCode() {
-        return address.hashCode();
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.edgent.mock;
+
+import org.apache.plc4x.java.api.model.PlcField;
+
+public class MockField implements PlcField {
+
+    private final String address;
+    private final MockFieldItem fieldItem;
+
+    public MockField(String address) {
+        this.address = address;
+        this.fieldItem = null;
+    }
+
+    public MockField(String address, MockFieldItem fieldItem) {
+        this.address = address;
+        this.fieldItem = fieldItem;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public MockFieldItem getFieldItem() {
+        return fieldItem;
+    }
+
+    @Override
+    public String toString() {
+        return "mock field: " + address;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return o instanceof MockField
+            && ((MockField) o).address.equals(this.address);
+    }
+
+    @Override
+    public int hashCode() {
+        return address.hashCode();
+    }
+
+}
diff --git a/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockFieldHandler.java b/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockFieldHandler.java
index 788b8d7040d..9293ff2fdfa 100644
--- a/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockFieldHandler.java
+++ b/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockFieldHandler.java
@@ -1,104 +1,104 @@
-/*
- * 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.edgent.mock;
-
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.connection.PlcFieldHandler;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-
-public class MockFieldHandler implements PlcFieldHandler {
-
-    @Override
-    public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
-        return new MockField(fieldQuery);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeBoolean(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeByte(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeShort(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeInteger(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeBigInteger(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeLong(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeFloat(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeBigDecimal(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeDouble(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeString(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeTime(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeDate(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeDateTime(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeByteArray(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-}
+/*
+ * 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.edgent.mock;
+
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.connection.PlcFieldHandler;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+
+public class MockFieldHandler implements PlcFieldHandler {
+
+    @Override
+    public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
+        return new MockField(fieldQuery);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeBoolean(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeByte(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeShort(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeInteger(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeBigInteger(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeLong(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeFloat(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeBigDecimal(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDouble(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeString(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeTime(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDate(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDateTime(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeByteArray(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+}
diff --git a/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockFieldItem.java b/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockFieldItem.java
index 2a1f83fc4e3..6fd84c52c1a 100644
--- a/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockFieldItem.java
+++ b/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockFieldItem.java
@@ -1,34 +1,34 @@
-/*
- * 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.edgent.mock;
-
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-
-public class MockFieldItem extends BaseDefaultFieldItem<Object> {
-
-    public MockFieldItem(Object... values) {
-        super(values);
-    }
-
-    public Object getObject(int index) {
-        return getValue(index);
-    }
-
-}
+/*
+ * 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.edgent.mock;
+
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+
+public class MockFieldItem extends BaseDefaultFieldItem<Object> {
+
+    public MockFieldItem(Object... values) {
+        super(values);
+    }
+
+    public Object getObject(int index) {
+        return getValue(index);
+    }
+
+}
diff --git a/plc4j/integrations/apache-edgent/src/test/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver b/plc4j/integrations/apache-edgent/src/test/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
index 30d44e1b033..4bacdc33500 100644
--- a/plc4j/integrations/apache-edgent/src/test/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
+++ b/plc4j/integrations/apache-edgent/src/test/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
@@ -1,19 +1,19 @@
-#
-# 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
-#
-#   http://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.
-#
-org.apache.plc4x.edgent.mock.MockDriver
+#
+# 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
+#
+#   http://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.
+#
+org.apache.plc4x.edgent.mock.MockDriver
diff --git a/plc4j/integrations/apache-kafka/README.md b/plc4j/integrations/apache-kafka/README.md
index af05ed5b5b3..b5bcbf8053f 100644
--- a/plc4j/integrations/apache-kafka/README.md
+++ b/plc4j/integrations/apache-kafka/README.md
@@ -1,97 +1,97 @@
-<!--
-
-  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
-
-      http://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.
-
--->
-
-# Kafka Connect PLC4X Connector
-
-The PLC4X Connector streams data from any device accessible through the PLC4X interface.
-
-## Source Connector
-
-See `config/source.properties` for example configuration.
-
-## Quickstart
-
-A Kafka Connect worker can be run in two modes: 
-- Standalone
-- Distributed
-
-Both modes require a Kafka Broker instance to be available.
-Kafka Connect is part of the Kafka distribution. 
-
-In order to start a Kafka Connect system the following steps have to be performed:
-
-1) Download the latest version of Apache Kafka binaries from here: https://kafka.apache.org/downloads
-2) Unpack the archive.
-3) Copy the `target/plc4j-apache-kafka-0.6.0-SNAPSHOT-uber-jar.jar` to the Kafka `libs` directory.
-4) Copy the files in the `config` to Kafka's `configs` directory.
-
-### Start a Kafka Broker
-
-1) Open 4 console windows and change directory into that directory
-2) Start Zookeeper: 
-        
-        bin/zookeeper-server-start.sh config/zookeeper.properties 
-
-3) Start Kafka:
-        
-        bin/kafka-server-start.sh config/server.properties
-
-4) Create the "test" topic:
-        
-        bin/kafka-topics.sh --create --bootstrap-server localhost:9092 --replication-factor 1 --partitions 1 --topic test
-
-5) Start the consumer:
-        
-        bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic test --from-beginning
-
-### Start a Kafka Connect Worker (Standalone)
-
-Ideal for testing. 
-
-1) Start Kafka connect:
-        
-        bin/connect-standalone.sh config/connect-standalone.properties config/plc4x-source.properties
-
-Now watch the console window with the "kafka-console-consumer". 
-
-If you want to debug the connector, be sure to set some environment variables before starting Kafka-Connect:
-
-        export KAFKA_DEBUG=y; export DEBUG_SUSPEND_FLAG=y;
-
-In this case the startup will suspend till an IDE is connected via a remote-debugging session.
-
-### Start Kafka Connect Worker (Distributed Mode)
-
-Ideal for production.
-
-In this case the state of the node is handled by Zookeeper and the configuration of the connectors are distributed via Kafka topics.
-
-    bin/kafka-topics --create --zookeeper localhost:2181 --topic connect-configs --replication-factor 3 --partitions 1 --config cleanup.policy=compact
-    bin/kafka-topics --create --zookeeper localhost:2181 --topic connect-offsets --replication-factor 3 --partitions 50 --config cleanup.policy=compact
-    bin/kafka-topics --create --zookeeper localhost:2181 --topic connect-status --replication-factor 3 --partitions 10 --config cleanup.policy=compact
-
-Starting the worker is then as simple as this:
-
-    bin /connect-distributed.sh config/connect-distributed.properties
-    
-The configuration of the Connectors is then provided via REST interface:
-
-    curl -X POST -H "Content-Type: application/json" --data '{"name": "plc-source-test", "config": {"connector.class":"org.apache.plc4x.kafka.Plc4xSourceConnector", 
-    // TODO: Continue here ...
-    "tasks.max":"1", "file":"test.sink.txt", "topics":"connect-test" }}' http://localhost:8083/connectors
+<!--
+
+  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
+
+      http://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.
+
+-->
+
+# Kafka Connect PLC4X Connector
+
+The PLC4X Connector streams data from any device accessible through the PLC4X interface.
+
+## Source Connector
+
+See `config/source.properties` for example configuration.
+
+## Quickstart
+
+A Kafka Connect worker can be run in two modes: 
+- Standalone
+- Distributed
+
+Both modes require a Kafka Broker instance to be available.
+Kafka Connect is part of the Kafka distribution. 
+
+In order to start a Kafka Connect system the following steps have to be performed:
+
+1) Download the latest version of Apache Kafka binaries from here: https://kafka.apache.org/downloads
+2) Unpack the archive.
+3) Copy the `target/plc4j-apache-kafka-0.6.0-SNAPSHOT-uber-jar.jar` to the Kafka `libs` directory.
+4) Copy the files in the `config` to Kafka's `configs` directory.
+
+### Start a Kafka Broker
+
+1) Open 4 console windows and change directory into that directory
+2) Start Zookeeper: 
+        
+        bin/zookeeper-server-start.sh config/zookeeper.properties 
+
+3) Start Kafka:
+        
+        bin/kafka-server-start.sh config/server.properties
+
+4) Create the "test" topic:
+        
+        bin/kafka-topics.sh --create --bootstrap-server localhost:9092 --replication-factor 1 --partitions 1 --topic test
+
+5) Start the consumer:
+        
+        bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic test --from-beginning
+
+### Start a Kafka Connect Worker (Standalone)
+
+Ideal for testing. 
+
+1) Start Kafka connect:
+        
+        bin/connect-standalone.sh config/connect-standalone.properties config/plc4x-source.properties
+
+Now watch the console window with the "kafka-console-consumer". 
+
+If you want to debug the connector, be sure to set some environment variables before starting Kafka-Connect:
+
+        export KAFKA_DEBUG=y; export DEBUG_SUSPEND_FLAG=y;
+
+In this case the startup will suspend till an IDE is connected via a remote-debugging session.
+
+### Start Kafka Connect Worker (Distributed Mode)
+
+Ideal for production.
+
+In this case the state of the node is handled by Zookeeper and the configuration of the connectors are distributed via Kafka topics.
+
+    bin/kafka-topics --create --zookeeper localhost:2181 --topic connect-configs --replication-factor 3 --partitions 1 --config cleanup.policy=compact
+    bin/kafka-topics --create --zookeeper localhost:2181 --topic connect-offsets --replication-factor 3 --partitions 50 --config cleanup.policy=compact
+    bin/kafka-topics --create --zookeeper localhost:2181 --topic connect-status --replication-factor 3 --partitions 10 --config cleanup.policy=compact
+
+Starting the worker is then as simple as this:
+
+    bin /connect-distributed.sh config/connect-distributed.properties
+    
+The configuration of the Connectors is then provided via REST interface:
+
+    curl -X POST -H "Content-Type: application/json" --data '{"name": "plc-source-test", "config": {"connector.class":"org.apache.plc4x.kafka.Plc4xSourceConnector", 
+    // TODO: Continue here ...
+    "tasks.max":"1", "file":"test.sink.txt", "topics":"connect-test" }}' http://localhost:8083/connectors
diff --git a/plc4j/integrations/apache-kafka/config/plc4x-source.properties b/plc4j/integrations/apache-kafka/config/plc4x-source.properties
index 24e482235e5..05097d1f823 100644
--- a/plc4j/integrations/apache-kafka/config/plc4x-source.properties
+++ b/plc4j/integrations/apache-kafka/config/plc4x-source.properties
@@ -1,50 +1,50 @@
-#
-# 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
-#
-# http://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.
-#
-name=plc-0
-connector.class=org.apache.plc4x.kafka.Plc4xSourceConnector
-default-topic=test
-tasks.max=2
-
-sources=machineA
-
-sources.machineA.connectionString=s7://10.10.64.20/1/1
-sources.machineA.jobReferences=s7-dashboard,s7-heartbeat
-sources.machineA.jobReferences.s7-heartbeat.topic=heartbeat
-
-jobs=s7-dashboard,s7-heartbeat
-
-jobs.s7-dashboard.interval=1000
-jobs.s7-dashboard.fields=conveyorEntry,load,unload,transferLeft,transferRight,conveyorLeft,conveyorRight
-jobs.s7-dashboard.fields.conveyorEntry=%Q0.0:BOOL
-jobs.s7-dashboard.fields.load=%Q0.1:BOOL
-jobs.s7-dashboard.fields.unload=%Q0.2:BOOL
-jobs.s7-dashboard.fields.transferLeft=%Q0.3:BOOL
-jobs.s7-dashboard.fields.transferRight=%Q0.4:BOOL
-jobs.s7-dashboard.fields.conveyorLeft=%Q0.5:BOOL
-jobs.s7-dashboard.fields.conveyorRight=%Q0.6:BOOL
-
-jobs.s7-heartbeat.interval=500
-jobs.s7-heartbeat.fields=active
-jobs.s7-heartbeat.fields.active=%Q0.1:BOOL
-
-bootstrap.servers=localhost:9092
-key.converter=org.apache.kafka.connect.json.JsonConverter
-value.converter=org.apache.kafka.connect.json.JsonConverter
-key.converter.schemas.enable=true
-value.converter.schemas.enable=true
-offset.storage.file.filename=/tmp/connect.offsets
-offset.flush.interval.ms=10000
+#
+# 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
+#
+# http://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.
+#
+name=plc-0
+connector.class=org.apache.plc4x.kafka.Plc4xSourceConnector
+default-topic=test
+tasks.max=2
+
+sources=machineA
+
+sources.machineA.connectionString=s7://10.10.64.20/1/1
+sources.machineA.jobReferences=s7-dashboard,s7-heartbeat
+sources.machineA.jobReferences.s7-heartbeat.topic=heartbeat
+
+jobs=s7-dashboard,s7-heartbeat
+
+jobs.s7-dashboard.interval=1000
+jobs.s7-dashboard.fields=conveyorEntry,load,unload,transferLeft,transferRight,conveyorLeft,conveyorRight
+jobs.s7-dashboard.fields.conveyorEntry=%Q0.0:BOOL
+jobs.s7-dashboard.fields.load=%Q0.1:BOOL
+jobs.s7-dashboard.fields.unload=%Q0.2:BOOL
+jobs.s7-dashboard.fields.transferLeft=%Q0.3:BOOL
+jobs.s7-dashboard.fields.transferRight=%Q0.4:BOOL
+jobs.s7-dashboard.fields.conveyorLeft=%Q0.5:BOOL
+jobs.s7-dashboard.fields.conveyorRight=%Q0.6:BOOL
+
+jobs.s7-heartbeat.interval=500
+jobs.s7-heartbeat.fields=active
+jobs.s7-heartbeat.fields.active=%Q0.1:BOOL
+
+bootstrap.servers=localhost:9092
+key.converter=org.apache.kafka.connect.json.JsonConverter
+value.converter=org.apache.kafka.connect.json.JsonConverter
+key.converter.schemas.enable=true
+value.converter.schemas.enable=true
+offset.storage.file.filename=/tmp/connect.offsets
+offset.flush.interval.ms=10000
diff --git a/plc4j/integrations/apache-kafka/pom.xml b/plc4j/integrations/apache-kafka/pom.xml
index 09e52d4f1d1..8550d58cceb 100644
--- a/plc4j/integrations/apache-kafka/pom.xml
+++ b/plc4j/integrations/apache-kafka/pom.xml
@@ -1,152 +1,152 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-integrations</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-apache-kafka</artifactId>
-
-  <name>PLC4J: Integrations: Apache Kafka</name>
-  <description>Integration module for integrating PLC4X into Apache Kafka (Kafka-Connect-Plugin)</description>
-
-  <properties>
-    <kafka.version>2.3.0</kafka.version>
-  </properties>
-
-  <!-- Build a fat jar so the user only needs to drop in this one jar -->
-  <build>
-    <plugins>
-      <!-- Build a fat jar containing all dependencies -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <usedDependencies combine.children="append">
-            <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
-          </usedDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-scraper</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-connection-pool</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.kafka</groupId>
-      <artifactId>kafka-clients</artifactId>
-      <version>${kafka.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.kafka</groupId>
-      <artifactId>connect-api</artifactId>
-      <version>${kafka.version}</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Include all drivers -->
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ads</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ethernet-ip</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-modbus</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-opcua</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-s7</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-simulated</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-
-    <!--dependency>
-      <groupId>org.apache.kafka</groupId>
-      <artifactId>connect-runtime</artifactId>
-      <version>${kafka.version}</version>
-      <scope>provided</scope>
-    </dependency-->
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-integrations</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-apache-kafka</artifactId>
+
+  <name>PLC4J: Integrations: Apache Kafka</name>
+  <description>Integration module for integrating PLC4X into Apache Kafka (Kafka-Connect-Plugin)</description>
+
+  <properties>
+    <kafka.version>2.3.0</kafka.version>
+  </properties>
+
+  <!-- Build a fat jar so the user only needs to drop in this one jar -->
+  <build>
+    <plugins>
+      <!-- Build a fat jar containing all dependencies -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <usedDependencies combine.children="append">
+            <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
+          </usedDependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-scraper</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-connection-pool</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>kafka-clients</artifactId>
+      <version>${kafka.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>connect-api</artifactId>
+      <version>${kafka.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- Include all drivers -->
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ads</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ethernet-ip</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-modbus</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-opcua</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-s7</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-simulated</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+
+    <!--dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>connect-runtime</artifactId>
+      <version>${kafka.version}</version>
+      <scope>provided</scope>
+    </dependency-->
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceConnector.java b/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceConnector.java
index b385f940221..cd5ae014d8f 100644
--- a/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceConnector.java
+++ b/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceConnector.java
@@ -1,276 +1,276 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.kafka;
-
-import org.apache.commons.lang3.math.NumberUtils;
-import org.apache.kafka.common.config.Config;
-import org.apache.kafka.common.config.ConfigDef;
-import org.apache.kafka.common.config.ConfigValue;
-import org.apache.kafka.connect.connector.Task;
-import org.apache.kafka.connect.source.SourceConnector;
-import org.apache.plc4x.kafka.config.Job;
-import org.apache.plc4x.kafka.config.JobReference;
-import org.apache.plc4x.kafka.config.Source;
-import org.apache.plc4x.kafka.config.SourceConfig;
-import org.apache.plc4x.kafka.util.VersionUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.*;
-
-public class Plc4xSourceConnector extends SourceConnector {
-
-    private static final Logger log = LoggerFactory.getLogger(Plc4xSourceConnector.class);
-
-    public static final String DEFAULT_TOPIC_CONFIG = "default-topic";
-    private static final String DEFAULT_TOPIC_DOC = "Default topic to be used, if not otherwise configured.";
-
-    public static final String SOURCES_CONFIG = "sources";
-    private static final String SOURCES_DOC = "List of source names that will be configured.";
-
-    public static final String JOBS_CONFIG = "jobs";
-    private static final String JOBS_DOC = "List of job names that will be configured.";
-
-    private static final String CONNECTION_STRING_CONFIG = "connectionString";
-    private static final String JOB_REFERENCES_CONFIG = "jobReferences";
-    private static final String TOPIC_CONFIG = "topic";
-    private static final String INTERVAL_CONFIG = "interval";
-    private static final String FIELDS_CONFIG = "fields";
-
-    private SourceConfig sourceConfig;
-
-    @Override
-    public void start(Map<String, String> props) {
-        sourceConfig = SourceConfig.fromPropertyMap(props);
-    }
-
-    @Override
-    public void stop() {
-        sourceConfig = null;
-    }
-
-    @Override
-    public Class<? extends Task> taskClass() {
-        return Plc4xSourceTask.class;
-    }
-
-    @Override
-    public List<Map<String, String>> taskConfigs(int maxTasks) {
-        // Initially we planned to have the simple assumption that one task maps to one PLC connection.
-        // But we could easily say that one scraper instance maps to a task and one scraper task can
-        // process multiple PLC connections. But I guess this would be an optimization as we have to
-        // balance the load manually.
-        if(sourceConfig.getJobs().size() > maxTasks) {
-            // not enough tasks
-            log.warn("NOT ENOUGH TASKS!");
-            return Collections.emptyList();
-        }
-
-        // For each configured source we'll start a dedicated scraper instance collecting
-        // all the scraper jobs enabled for this source.
-        List<Map<String, String>> configs = new LinkedList<>();
-        for (Source source : sourceConfig.getSources()) {
-            // Build a list of job configurations only containing the ones referenced from
-            // the current source.
-            StringBuilder query = new StringBuilder();
-            for (JobReference jobReference : source.getJobReferences()) {
-                Job job = sourceConfig.getJob(jobReference.getName());
-                if(job == null) {
-                    log.warn(String.format("Couldn't find referenced job '%s'", jobReference.getName()));
-                } else {
-                    query.append(",").append(jobReference.getName()).append("|").append(jobReference.getTopic());
-                    query.append("|").append(job.getInterval());
-                    for (Map.Entry<String, String> field : job.getFields().entrySet()) {
-                        String fieldName = field.getKey();
-                        String fieldAddress = field.getValue();
-                        query.append("|").append(fieldName).append("#").append(fieldAddress);
-                    }
-                }
-            }
-
-            // Create a new task configuration.
-            Map<String, String> taskConfig = new HashMap<>();
-            taskConfig.put(Plc4xSourceTask.CONNECTION_NAME_CONFIG, source.getName());
-            taskConfig.put(Plc4xSourceTask.PLC4X_CONNECTION_STRING_CONFIG, source.getConnectionString());
-            taskConfig.put(Plc4xSourceTask.QUERIES_CONFIG, query.toString().substring(1));
-            configs.add(taskConfig);
-        }
-        return configs;
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public Config validate(Map<String, String> connectorConfigs) {
-        ////////////////////////////////////////////////////
-        // Get the static part of the config
-        Config config = super.validate(connectorConfigs);
-
-        ////////////////////////////////////////////////////
-        // Add the dynamic parts of the config
-
-        // Find the important config elements
-        String defaultTopic = null;
-        ConfigValue sources = null;
-        ConfigValue jobs = null;
-        for (ConfigValue configValue : config.configValues()) {
-            switch (configValue.name()) {
-                case DEFAULT_TOPIC_CONFIG:
-                    defaultTopic = (String) configValue.value();
-                    break;
-                case JOBS_CONFIG:
-                    jobs = configValue;
-                    break;
-                case SOURCES_CONFIG:
-                    sources = configValue;
-                    break;
-                default:
-                    // Just ignore the others.
-            }
-        }
-
-        // Configure the jobs first (As we reference them from the sources)
-        List<Object> foundJobs = new LinkedList<>();
-        if(jobs != null) {
-            final List<String> jobNames = (List<String>) jobs.value();
-            for (String jobName : jobNames) {
-                String jobIntervalConfig = JOBS_CONFIG + "." + jobName + "." + INTERVAL_CONFIG;
-                ConfigValue jobIntervalConfigValue = new ConfigValue(jobIntervalConfig);
-                config.configValues().add(jobIntervalConfigValue);
-                String jobIntervalString = connectorConfigs.get(jobIntervalConfig);
-                if (jobIntervalString == null) {
-                    jobIntervalConfigValue.value(null);
-                    jobIntervalConfigValue.addErrorMessage(jobIntervalConfig + " is mandatory");
-                } else if (NumberUtils.isParsable(jobIntervalString)) {
-                    int jobInterval = NumberUtils.toInt(jobIntervalString);
-                    if (jobInterval > 0) {
-                        jobIntervalConfigValue.value(jobInterval);
-                    } else {
-                        jobIntervalConfigValue.value(null);
-                        jobIntervalConfigValue.addErrorMessage(jobIntervalConfig + " must be greater than 0");
-                    }
-                } else {
-                    jobIntervalConfigValue.value(null);
-                    jobIntervalConfigValue.addErrorMessage(jobIntervalConfig + " must be a numeric value greater than 0");
-                }
-
-                String jobFieldsConfig = JOBS_CONFIG + "." + jobName + "." + FIELDS_CONFIG;
-                final ConfigValue jobFieldsConfigValue = new ConfigValue(jobFieldsConfig);
-                if (!connectorConfigs.containsKey(jobFieldsConfig)) {
-                    jobFieldsConfigValue.value(null);
-                    jobFieldsConfigValue.addErrorMessage(jobFieldsConfig + " is mandatory");
-                } else {
-                    String[] jobFieldNames = connectorConfigs.getOrDefault(jobFieldsConfig, "").split(",");
-                    jobFieldsConfigValue.value(jobFieldNames);
-                    if (jobFieldNames.length == 0) {
-                        jobFieldsConfigValue.addErrorMessage(jobFieldsConfig + " at least has to contain one field name");
-                    } else {
-                        for (String jobFieldName : jobFieldNames) {
-                            String jobFieldAddressConfig =
-                                JOBS_CONFIG + "." + jobName + "." + FIELDS_CONFIG + "." + jobFieldName;
-                            final ConfigValue jobFieldAddressConfigValue = new ConfigValue(jobFieldAddressConfig);
-                            String jobFieldAddress = connectorConfigs.get(jobFieldAddressConfig);
-                            jobFieldAddressConfigValue.value(jobFieldAddress);
-                            if ((jobFieldAddress == null) || jobFieldAddress.isEmpty()) {
-                                jobFieldAddressConfigValue.addErrorMessage(jobFieldAddressConfig + " is mandatory");
-                            }
-                            // TODO: Validate the address ...
-                        }
-                    }
-                }
-
-                foundJobs.add(jobName);
-            }
-        }
-
-        // Configure the sources
-        if(sources != null) {
-            final List<String> sourceNames = (List<String>) sources.value();
-            for (String sourceName : sourceNames) {
-                String connectionStringConfig = SOURCES_CONFIG + "." + sourceName + "." + CONNECTION_STRING_CONFIG;
-                final ConfigValue sourceConnectionStringConfigValue = new ConfigValue(connectionStringConfig);
-                config.configValues().add(sourceConnectionStringConfigValue);
-                String connectionString = connectorConfigs.get(connectionStringConfig);
-                sourceConnectionStringConfigValue.value();
-                if (connectionString == null) {
-                    sourceConnectionStringConfigValue.addErrorMessage(connectionStringConfig + " is mandatory");
-                } else {
-                    // TODO: Check if the connection string is valid.
-
-                    String sourceTopicConfig = SOURCES_CONFIG + "." + sourceName + "." + TOPIC_CONFIG;
-                    final ConfigValue sourceTopicConfigValue = new ConfigValue(sourceTopicConfig);
-                    config.configValues().add(sourceTopicConfigValue);
-                    String sourceTopic = connectorConfigs.get(sourceTopicConfig);
-                    sourceTopicConfigValue.value(sourceTopic);
-
-                    String jobReferenceNamesConfig = SOURCES_CONFIG + "." + sourceName + "." + JOB_REFERENCES_CONFIG;
-                    final ConfigValue jobReferenceNamesConfigValue = new ConfigValue(jobReferenceNamesConfig);
-                    jobReferenceNamesConfigValue.recommendedValues(foundJobs);
-                    config.configValues().add(jobReferenceNamesConfigValue);
-                    if(!connectorConfigs.containsKey(jobReferenceNamesConfig)) {
-                        jobReferenceNamesConfigValue.value(null);
-                        jobReferenceNamesConfigValue.addErrorMessage(jobReferenceNamesConfig + " is mandatory");
-                    } else {
-                        String[] jobReferenceNames = connectorConfigs.getOrDefault(jobReferenceNamesConfig, "").split(",");
-                        jobReferenceNamesConfigValue.value(jobReferenceNames);
-                        // Check at least one job is referenced
-                        if (jobReferenceNames.length == 0) {
-                            jobReferenceNamesConfigValue.addErrorMessage(jobReferenceNamesConfig + " is mandatory");
-                        }
-                        for (String jobReferenceName : jobReferenceNames) {
-                            // Check the references reference configured jobs
-                            if (!foundJobs.contains(jobReferenceName)) {
-                                jobReferenceNamesConfigValue.addErrorMessage(jobReferenceNamesConfig +
-                                    " references non-existent job " + jobReferenceName);
-                            }
-                            // Check if a topic is specified at some level
-                            else {
-                                String jobReferenceTopicNameConfig = SOURCES_CONFIG + "." + sourceName + "." +
-                                    JOB_REFERENCES_CONFIG + "." + jobReferenceName + TOPIC_CONFIG;
-                                final ConfigValue jobReferenceTopicNameConfigValue = new ConfigValue(jobReferenceTopicNameConfig);
-                                config.configValues().add(jobReferenceTopicNameConfigValue);
-                                String jobReferenceTopic = connectorConfigs.get(jobReferenceTopicNameConfig);
-                                jobReferenceTopicNameConfigValue.value(jobReferenceTopic);
-                                if ((jobReferenceTopic == null) && (sourceTopic == null) && (defaultTopic == null)) {
-                                    jobReferenceTopicNameConfigValue.addErrorMessage(
-                                        "No topic definition found at any level for " + jobReferenceTopicNameConfig);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        return config;
-    }
-
-    @Override
-    public ConfigDef config() {
-        return new ConfigDef()
-            .define(DEFAULT_TOPIC_CONFIG, ConfigDef.Type.STRING, ConfigDef.Importance.LOW, DEFAULT_TOPIC_DOC)
-            .define(SOURCES_CONFIG, ConfigDef.Type.LIST, ConfigDef.Importance.HIGH, SOURCES_DOC)
-            .define(JOBS_CONFIG, ConfigDef.Type.LIST, ConfigDef.Importance.HIGH, JOBS_DOC);
-    }
-
-    @Override
-    public String version() {
-        return VersionUtil.getVersion();
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.kafka;
+
+import org.apache.commons.lang3.math.NumberUtils;
+import org.apache.kafka.common.config.Config;
+import org.apache.kafka.common.config.ConfigDef;
+import org.apache.kafka.common.config.ConfigValue;
+import org.apache.kafka.connect.connector.Task;
+import org.apache.kafka.connect.source.SourceConnector;
+import org.apache.plc4x.kafka.config.Job;
+import org.apache.plc4x.kafka.config.JobReference;
+import org.apache.plc4x.kafka.config.Source;
+import org.apache.plc4x.kafka.config.SourceConfig;
+import org.apache.plc4x.kafka.util.VersionUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.*;
+
+public class Plc4xSourceConnector extends SourceConnector {
+
+    private static final Logger log = LoggerFactory.getLogger(Plc4xSourceConnector.class);
+
+    public static final String DEFAULT_TOPIC_CONFIG = "default-topic";
+    private static final String DEFAULT_TOPIC_DOC = "Default topic to be used, if not otherwise configured.";
+
+    public static final String SOURCES_CONFIG = "sources";
+    private static final String SOURCES_DOC = "List of source names that will be configured.";
+
+    public static final String JOBS_CONFIG = "jobs";
+    private static final String JOBS_DOC = "List of job names that will be configured.";
+
+    private static final String CONNECTION_STRING_CONFIG = "connectionString";
+    private static final String JOB_REFERENCES_CONFIG = "jobReferences";
+    private static final String TOPIC_CONFIG = "topic";
+    private static final String INTERVAL_CONFIG = "interval";
+    private static final String FIELDS_CONFIG = "fields";
+
+    private SourceConfig sourceConfig;
+
+    @Override
+    public void start(Map<String, String> props) {
+        sourceConfig = SourceConfig.fromPropertyMap(props);
+    }
+
+    @Override
+    public void stop() {
+        sourceConfig = null;
+    }
+
+    @Override
+    public Class<? extends Task> taskClass() {
+        return Plc4xSourceTask.class;
+    }
+
+    @Override
+    public List<Map<String, String>> taskConfigs(int maxTasks) {
+        // Initially we planned to have the simple assumption that one task maps to one PLC connection.
+        // But we could easily say that one scraper instance maps to a task and one scraper task can
+        // process multiple PLC connections. But I guess this would be an optimization as we have to
+        // balance the load manually.
+        if(sourceConfig.getJobs().size() > maxTasks) {
+            // not enough tasks
+            log.warn("NOT ENOUGH TASKS!");
+            return Collections.emptyList();
+        }
+
+        // For each configured source we'll start a dedicated scraper instance collecting
+        // all the scraper jobs enabled for this source.
+        List<Map<String, String>> configs = new LinkedList<>();
+        for (Source source : sourceConfig.getSources()) {
+            // Build a list of job configurations only containing the ones referenced from
+            // the current source.
+            StringBuilder query = new StringBuilder();
+            for (JobReference jobReference : source.getJobReferences()) {
+                Job job = sourceConfig.getJob(jobReference.getName());
+                if(job == null) {
+                    log.warn(String.format("Couldn't find referenced job '%s'", jobReference.getName()));
+                } else {
+                    query.append(",").append(jobReference.getName()).append("|").append(jobReference.getTopic());
+                    query.append("|").append(job.getInterval());
+                    for (Map.Entry<String, String> field : job.getFields().entrySet()) {
+                        String fieldName = field.getKey();
+                        String fieldAddress = field.getValue();
+                        query.append("|").append(fieldName).append("#").append(fieldAddress);
+                    }
+                }
+            }
+
+            // Create a new task configuration.
+            Map<String, String> taskConfig = new HashMap<>();
+            taskConfig.put(Plc4xSourceTask.CONNECTION_NAME_CONFIG, source.getName());
+            taskConfig.put(Plc4xSourceTask.PLC4X_CONNECTION_STRING_CONFIG, source.getConnectionString());
+            taskConfig.put(Plc4xSourceTask.QUERIES_CONFIG, query.toString().substring(1));
+            configs.add(taskConfig);
+        }
+        return configs;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public Config validate(Map<String, String> connectorConfigs) {
+        ////////////////////////////////////////////////////
+        // Get the static part of the config
+        Config config = super.validate(connectorConfigs);
+
+        ////////////////////////////////////////////////////
+        // Add the dynamic parts of the config
+
+        // Find the important config elements
+        String defaultTopic = null;
+        ConfigValue sources = null;
+        ConfigValue jobs = null;
+        for (ConfigValue configValue : config.configValues()) {
+            switch (configValue.name()) {
+                case DEFAULT_TOPIC_CONFIG:
+                    defaultTopic = (String) configValue.value();
+                    break;
+                case JOBS_CONFIG:
+                    jobs = configValue;
+                    break;
+                case SOURCES_CONFIG:
+                    sources = configValue;
+                    break;
+                default:
+                    // Just ignore the others.
+            }
+        }
+
+        // Configure the jobs first (As we reference them from the sources)
+        List<Object> foundJobs = new LinkedList<>();
+        if(jobs != null) {
+            final List<String> jobNames = (List<String>) jobs.value();
+            for (String jobName : jobNames) {
+                String jobIntervalConfig = JOBS_CONFIG + "." + jobName + "." + INTERVAL_CONFIG;
+                ConfigValue jobIntervalConfigValue = new ConfigValue(jobIntervalConfig);
+                config.configValues().add(jobIntervalConfigValue);
+                String jobIntervalString = connectorConfigs.get(jobIntervalConfig);
+                if (jobIntervalString == null) {
+                    jobIntervalConfigValue.value(null);
+                    jobIntervalConfigValue.addErrorMessage(jobIntervalConfig + " is mandatory");
+                } else if (NumberUtils.isParsable(jobIntervalString)) {
+                    int jobInterval = NumberUtils.toInt(jobIntervalString);
+                    if (jobInterval > 0) {
+                        jobIntervalConfigValue.value(jobInterval);
+                    } else {
+                        jobIntervalConfigValue.value(null);
+                        jobIntervalConfigValue.addErrorMessage(jobIntervalConfig + " must be greater than 0");
+                    }
+                } else {
+                    jobIntervalConfigValue.value(null);
+                    jobIntervalConfigValue.addErrorMessage(jobIntervalConfig + " must be a numeric value greater than 0");
+                }
+
+                String jobFieldsConfig = JOBS_CONFIG + "." + jobName + "." + FIELDS_CONFIG;
+                final ConfigValue jobFieldsConfigValue = new ConfigValue(jobFieldsConfig);
+                if (!connectorConfigs.containsKey(jobFieldsConfig)) {
+                    jobFieldsConfigValue.value(null);
+                    jobFieldsConfigValue.addErrorMessage(jobFieldsConfig + " is mandatory");
+                } else {
+                    String[] jobFieldNames = connectorConfigs.getOrDefault(jobFieldsConfig, "").split(",");
+                    jobFieldsConfigValue.value(jobFieldNames);
+                    if (jobFieldNames.length == 0) {
+                        jobFieldsConfigValue.addErrorMessage(jobFieldsConfig + " at least has to contain one field name");
+                    } else {
+                        for (String jobFieldName : jobFieldNames) {
+                            String jobFieldAddressConfig =
+                                JOBS_CONFIG + "." + jobName + "." + FIELDS_CONFIG + "." + jobFieldName;
+                            final ConfigValue jobFieldAddressConfigValue = new ConfigValue(jobFieldAddressConfig);
+                            String jobFieldAddress = connectorConfigs.get(jobFieldAddressConfig);
+                            jobFieldAddressConfigValue.value(jobFieldAddress);
+                            if ((jobFieldAddress == null) || jobFieldAddress.isEmpty()) {
+                                jobFieldAddressConfigValue.addErrorMessage(jobFieldAddressConfig + " is mandatory");
+                            }
+                            // TODO: Validate the address ...
+                        }
+                    }
+                }
+
+                foundJobs.add(jobName);
+            }
+        }
+
+        // Configure the sources
+        if(sources != null) {
+            final List<String> sourceNames = (List<String>) sources.value();
+            for (String sourceName : sourceNames) {
+                String connectionStringConfig = SOURCES_CONFIG + "." + sourceName + "." + CONNECTION_STRING_CONFIG;
+                final ConfigValue sourceConnectionStringConfigValue = new ConfigValue(connectionStringConfig);
+                config.configValues().add(sourceConnectionStringConfigValue);
+                String connectionString = connectorConfigs.get(connectionStringConfig);
+                sourceConnectionStringConfigValue.value();
+                if (connectionString == null) {
+                    sourceConnectionStringConfigValue.addErrorMessage(connectionStringConfig + " is mandatory");
+                } else {
+                    // TODO: Check if the connection string is valid.
+
+                    String sourceTopicConfig = SOURCES_CONFIG + "." + sourceName + "." + TOPIC_CONFIG;
+                    final ConfigValue sourceTopicConfigValue = new ConfigValue(sourceTopicConfig);
+                    config.configValues().add(sourceTopicConfigValue);
+                    String sourceTopic = connectorConfigs.get(sourceTopicConfig);
+                    sourceTopicConfigValue.value(sourceTopic);
+
+                    String jobReferenceNamesConfig = SOURCES_CONFIG + "." + sourceName + "." + JOB_REFERENCES_CONFIG;
+                    final ConfigValue jobReferenceNamesConfigValue = new ConfigValue(jobReferenceNamesConfig);
+                    jobReferenceNamesConfigValue.recommendedValues(foundJobs);
+                    config.configValues().add(jobReferenceNamesConfigValue);
+                    if(!connectorConfigs.containsKey(jobReferenceNamesConfig)) {
+                        jobReferenceNamesConfigValue.value(null);
+                        jobReferenceNamesConfigValue.addErrorMessage(jobReferenceNamesConfig + " is mandatory");
+                    } else {
+                        String[] jobReferenceNames = connectorConfigs.getOrDefault(jobReferenceNamesConfig, "").split(",");
+                        jobReferenceNamesConfigValue.value(jobReferenceNames);
+                        // Check at least one job is referenced
+                        if (jobReferenceNames.length == 0) {
+                            jobReferenceNamesConfigValue.addErrorMessage(jobReferenceNamesConfig + " is mandatory");
+                        }
+                        for (String jobReferenceName : jobReferenceNames) {
+                            // Check the references reference configured jobs
+                            if (!foundJobs.contains(jobReferenceName)) {
+                                jobReferenceNamesConfigValue.addErrorMessage(jobReferenceNamesConfig +
+                                    " references non-existent job " + jobReferenceName);
+                            }
+                            // Check if a topic is specified at some level
+                            else {
+                                String jobReferenceTopicNameConfig = SOURCES_CONFIG + "." + sourceName + "." +
+                                    JOB_REFERENCES_CONFIG + "." + jobReferenceName + TOPIC_CONFIG;
+                                final ConfigValue jobReferenceTopicNameConfigValue = new ConfigValue(jobReferenceTopicNameConfig);
+                                config.configValues().add(jobReferenceTopicNameConfigValue);
+                                String jobReferenceTopic = connectorConfigs.get(jobReferenceTopicNameConfig);
+                                jobReferenceTopicNameConfigValue.value(jobReferenceTopic);
+                                if ((jobReferenceTopic == null) && (sourceTopic == null) && (defaultTopic == null)) {
+                                    jobReferenceTopicNameConfigValue.addErrorMessage(
+                                        "No topic definition found at any level for " + jobReferenceTopicNameConfig);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return config;
+    }
+
+    @Override
+    public ConfigDef config() {
+        return new ConfigDef()
+            .define(DEFAULT_TOPIC_CONFIG, ConfigDef.Type.STRING, ConfigDef.Importance.LOW, DEFAULT_TOPIC_DOC)
+            .define(SOURCES_CONFIG, ConfigDef.Type.LIST, ConfigDef.Importance.HIGH, SOURCES_DOC)
+            .define(JOBS_CONFIG, ConfigDef.Type.LIST, ConfigDef.Importance.HIGH, JOBS_DOC);
+    }
+
+    @Override
+    public String version() {
+        return VersionUtil.getVersion();
+    }
+
+}
diff --git a/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java b/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java
index 898a8a072da..8ea96de43c8 100644
--- a/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java
+++ b/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java
@@ -1,282 +1,282 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.kafka;
-
-import org.apache.kafka.common.config.AbstractConfig;
-import org.apache.kafka.common.config.ConfigDef;
-import org.apache.kafka.connect.data.Schema;
-import org.apache.kafka.connect.data.SchemaBuilder;
-import org.apache.kafka.connect.data.Struct;
-import org.apache.kafka.connect.errors.ConnectException;
-import org.apache.kafka.connect.source.SourceRecord;
-import org.apache.kafka.connect.source.SourceTask;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.scraper.config.triggeredscraper.JobConfigurationTriggeredImplBuilder;
-import org.apache.plc4x.java.scraper.config.triggeredscraper.ScraperConfigurationTriggeredImpl;
-import org.apache.plc4x.java.scraper.config.triggeredscraper.ScraperConfigurationTriggeredImplBuilder;
-import org.apache.plc4x.java.scraper.exception.ScraperException;
-import org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl;
-import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollector;
-import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollectorImpl;
-import org.apache.plc4x.java.utils.connectionpool.PooledPlcDriverManager;
-import org.apache.plc4x.kafka.util.VersionUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.*;
-import java.util.concurrent.*;
-
-/**
- * Source Connector Task polling the data source at a given rate.
- * A timer thread is scheduled which sets the fetch flag to true every rate milliseconds.
- * When poll() is invoked, the calling thread waits until the fetch flag is set for WAIT_LIMIT_MILLIS.
- * If the flag does not become true, the method returns null, otherwise a fetch is performed.
- */
-public class Plc4xSourceTask extends SourceTask {
-
-    private static final Logger log = LoggerFactory.getLogger(Plc4xSourceTask.class);
-
-    /*
-     * Config of the task.
-     */
-    static final String CONNECTION_NAME_CONFIG = "connection-name";
-    private static final String CONNECTION_NAME_STRING_DOC = "Connection Name";
-
-    static final String PLC4X_CONNECTION_STRING_CONFIG = "plc4x-connection-string";
-    private static final String PLC4X_CONNECTION_STRING_DOC = "PLC4X Connection String";
-
-    // Syntax for the queries: {job-name}:{topic}:{rate}:{field-alias}#{field-address}:{field-alias}#{field-address}...,{topic}:{rate}:....
-    static final String QUERIES_CONFIG = "queries";
-    private static final String QUERIES_DOC = "Field queries to be sent to the PLC";
-
-    private static final ConfigDef CONFIG_DEF = new ConfigDef()
-        .define(CONNECTION_NAME_CONFIG, ConfigDef.Type.STRING, ConfigDef.Importance.HIGH, CONNECTION_NAME_STRING_DOC)
-        .define(PLC4X_CONNECTION_STRING_CONFIG, ConfigDef.Type.STRING, ConfigDef.Importance.HIGH, PLC4X_CONNECTION_STRING_DOC)
-        .define(QUERIES_CONFIG, ConfigDef.Type.LIST, ConfigDef.Importance.HIGH, QUERIES_DOC);
-
-    /*
-     * Configuration of the output.
-     */
-    private static final String SOURCE_NAME_FIELD = "source-name";
-    private static final String JOB_NAME_FIELD = "job-name";
-
-    private static final Schema KEY_SCHEMA =
-        new SchemaBuilder(Schema.Type.STRUCT)
-            .field(SOURCE_NAME_FIELD, Schema.STRING_SCHEMA)
-            .field(JOB_NAME_FIELD, Schema.STRING_SCHEMA)
-            .build();
-
-    // Internal buffer into which all incoming scraper responses are written to.
-    private ArrayBlockingQueue<SourceRecord> buffer;
-
-    @Override
-    public String version() {
-        return VersionUtil.getVersion();
-    }
-
-    @Override
-    public void start(Map<String, String> props) {
-        AbstractConfig config = new AbstractConfig(CONFIG_DEF, props);
-        String connectionName = config.getString(CONNECTION_NAME_CONFIG);
-        String plc4xConnectionString = config.getString(PLC4X_CONNECTION_STRING_CONFIG);
-        Map<String, String> topics = new HashMap<>();
-        // Create a buffer with a capacity of 1000 elements which schedules access in a fair way.
-        buffer = new ArrayBlockingQueue<>(1000, true);
-
-        ScraperConfigurationTriggeredImplBuilder builder = new ScraperConfigurationTriggeredImplBuilder();
-        builder.addSource(connectionName, plc4xConnectionString);
-
-        List<String> jobConfigs = config.getList(QUERIES_CONFIG);
-        for (String jobConfig : jobConfigs) {
-            String[] jobConfigSegments = jobConfig.split("\\|");
-            if(jobConfigSegments.length < 4) {
-                log.warn(String.format("Error in job configuration '%s'. " +
-                    "The configuration expects at least 4 segments: " +
-                    "{job-name}|{topic}|{rate}(|{field-alias}#{field-address})+", jobConfig));
-                continue;
-            }
-
-            String jobName = jobConfigSegments[0];
-            String topic = jobConfigSegments[1];
-            Integer rate = Integer.valueOf(jobConfigSegments[2]);
-            JobConfigurationTriggeredImplBuilder jobBuilder = builder.job(
-                jobName, String.format("(SCHEDULED,%s)", rate)).source(connectionName);
-            for(int i = 3; i < jobConfigSegments.length; i++) {
-                String[] fieldSegments = jobConfigSegments[i].split("#");
-                if(fieldSegments.length != 2) {
-                    log.warn(String.format("Error in job configuration '%s'. " +
-                            "The field segment expects a format {field-alias}#{field-address}, but got '%s'",
-                        jobName, jobConfigSegments[i]));
-                    continue;
-                }
-                String fieldAlias = fieldSegments[0];
-                String fieldAddress = fieldSegments[1];
-                jobBuilder.field(fieldAlias, fieldAddress);
-                topics.put(jobName, topic);
-            }
-            jobBuilder.build();
-        }
-
-        ScraperConfigurationTriggeredImpl scraperConfig = builder.build();
-
-        try {
-            PlcDriverManager plcDriverManager = new PooledPlcDriverManager();
-            TriggerCollector triggerCollector = new TriggerCollectorImpl(plcDriverManager);
-            TriggeredScraperImpl scraper = new TriggeredScraperImpl(scraperConfig, (jobName, sourceName, results) -> {
-                Long timestamp = System.currentTimeMillis();
-
-                Map<String, String> sourcePartition = new HashMap<>();
-                sourcePartition.put("sourceName", sourceName);
-                sourcePartition.put("jobName", jobName);
-
-                Map<String, Long> sourceOffset = Collections.singletonMap("offset", timestamp);
-
-                String topic = topics.get(jobName);
-
-                // Prepare the key structure.
-                Struct key = new Struct(KEY_SCHEMA)
-                    .put(SOURCE_NAME_FIELD, sourceName)
-                    .put(JOB_NAME_FIELD, jobName);
-
-                // Build the Schema for the result struct.
-                SchemaBuilder recordSchemaBuilder = SchemaBuilder.struct().name("org.apache.plc4x.kafka.JobResult");
-                for (Map.Entry<String, Object> result : results.entrySet()) {
-                    // Get field-name and -value from the results.
-                    String fieldName = result.getKey();
-                    Object fieldValue = result.getValue();
-
-                    // Get the schema for the given value type.
-                    Schema valueSchema = getSchema(fieldValue);
-
-                    // Add the schema description for the current field.
-                    recordSchemaBuilder.field(fieldName, valueSchema);
-                }
-                Schema recordSchema = recordSchemaBuilder.build();
-
-                // Build the struct itself.
-                Struct recordStruct = new Struct(recordSchema);
-                for (Map.Entry<String, Object> result : results.entrySet()) {
-                    // Get field-name and -value from the results.
-                    String fieldName = result.getKey();
-                    Object fieldValue = result.getValue();
-                    recordStruct.put(fieldName, fieldValue);
-                }
-
-                // Prepare the source-record element.
-                SourceRecord record = new SourceRecord(
-                    sourcePartition, sourceOffset,
-                    topic,
-                    KEY_SCHEMA, key,
-                    recordSchema, recordStruct
-                    );
-
-                // Add the new source-record to the buffer.
-                buffer.add(record);
-            }, triggerCollector);
-            scraper.start();
-            triggerCollector.start();
-        } catch (ScraperException e) {
-            log.error("Error starting the scraper", e);
-        }
-    }
-
-    @Override
-    public void stop() {
-        synchronized (this) {
-            // TODO: Correctly shutdown the scraper.
-            notifyAll(); // wake up thread waiting in awaitFetch
-        }
-    }
-
-    @Override
-    public List<SourceRecord> poll() {
-        if(!buffer.isEmpty()) {
-            int numElements = buffer.size();
-            List<SourceRecord> result = new ArrayList<>(numElements);
-            buffer.drainTo(result, numElements);
-            return result;
-        } else {
-            return Collections.emptyList();
-        }
-    }
-
-    private Schema getSchema(Object value) {
-        Objects.requireNonNull(value);
-
-        if(value instanceof List) {
-            List list = (List) value;
-            if(list.isEmpty()) {
-                throw new ConnectException("Unsupported empty lists.");
-            }
-            // In PLC4X list elements all contain the same type.
-            Object firstElement = list.get(0);
-            Schema elementSchema = getSchema(firstElement);
-            return SchemaBuilder.array(elementSchema).build();
-        }
-        if (value instanceof BigDecimal) {
-
-        }
-        if (value instanceof BigDecimal) {
-
-        }
-        if (value instanceof Boolean) {
-            return Schema.BOOLEAN_SCHEMA;
-        }
-        if (value instanceof byte[]) {
-            return Schema.BYTES_SCHEMA;
-        }
-        if (value instanceof Byte) {
-            return Schema.INT8_SCHEMA;
-        }
-        if (value instanceof Double) {
-            return Schema.FLOAT64_SCHEMA;
-        }
-        if (value instanceof Float) {
-            return Schema.FLOAT32_SCHEMA;
-        }
-        if (value instanceof Integer) {
-            return Schema.INT32_SCHEMA;
-        }
-        if (value instanceof LocalDate) {
-
-        }
-        if (value instanceof LocalDateTime) {
-
-        }
-        if (value instanceof LocalTime) {
-
-        }
-        if (value instanceof Long) {
-            return Schema.INT64_SCHEMA;
-        }
-        if (value instanceof Short) {
-            return Schema.INT16_SCHEMA;
-        }
-        if (value instanceof String) {
-            return Schema.STRING_SCHEMA;
-        }
-        // TODO: add support for collective and complex types
-        throw new ConnectException(String.format("Unsupported data type %s", value.getClass().getName()));
-    }
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.kafka;
+
+import org.apache.kafka.common.config.AbstractConfig;
+import org.apache.kafka.common.config.ConfigDef;
+import org.apache.kafka.connect.data.Schema;
+import org.apache.kafka.connect.data.SchemaBuilder;
+import org.apache.kafka.connect.data.Struct;
+import org.apache.kafka.connect.errors.ConnectException;
+import org.apache.kafka.connect.source.SourceRecord;
+import org.apache.kafka.connect.source.SourceTask;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.scraper.config.triggeredscraper.JobConfigurationTriggeredImplBuilder;
+import org.apache.plc4x.java.scraper.config.triggeredscraper.ScraperConfigurationTriggeredImpl;
+import org.apache.plc4x.java.scraper.config.triggeredscraper.ScraperConfigurationTriggeredImplBuilder;
+import org.apache.plc4x.java.scraper.exception.ScraperException;
+import org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl;
+import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollector;
+import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollectorImpl;
+import org.apache.plc4x.java.utils.connectionpool.PooledPlcDriverManager;
+import org.apache.plc4x.kafka.util.VersionUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.*;
+import java.util.concurrent.*;
+
+/**
+ * Source Connector Task polling the data source at a given rate.
+ * A timer thread is scheduled which sets the fetch flag to true every rate milliseconds.
+ * When poll() is invoked, the calling thread waits until the fetch flag is set for WAIT_LIMIT_MILLIS.
+ * If the flag does not become true, the method returns null, otherwise a fetch is performed.
+ */
+public class Plc4xSourceTask extends SourceTask {
+
+    private static final Logger log = LoggerFactory.getLogger(Plc4xSourceTask.class);
+
+    /*
+     * Config of the task.
+     */
+    static final String CONNECTION_NAME_CONFIG = "connection-name";
+    private static final String CONNECTION_NAME_STRING_DOC = "Connection Name";
+
+    static final String PLC4X_CONNECTION_STRING_CONFIG = "plc4x-connection-string";
+    private static final String PLC4X_CONNECTION_STRING_DOC = "PLC4X Connection String";
+
+    // Syntax for the queries: {job-name}:{topic}:{rate}:{field-alias}#{field-address}:{field-alias}#{field-address}...,{topic}:{rate}:....
+    static final String QUERIES_CONFIG = "queries";
+    private static final String QUERIES_DOC = "Field queries to be sent to the PLC";
+
+    private static final ConfigDef CONFIG_DEF = new ConfigDef()
+        .define(CONNECTION_NAME_CONFIG, ConfigDef.Type.STRING, ConfigDef.Importance.HIGH, CONNECTION_NAME_STRING_DOC)
+        .define(PLC4X_CONNECTION_STRING_CONFIG, ConfigDef.Type.STRING, ConfigDef.Importance.HIGH, PLC4X_CONNECTION_STRING_DOC)
+        .define(QUERIES_CONFIG, ConfigDef.Type.LIST, ConfigDef.Importance.HIGH, QUERIES_DOC);
+
+    /*
+     * Configuration of the output.
+     */
+    private static final String SOURCE_NAME_FIELD = "source-name";
+    private static final String JOB_NAME_FIELD = "job-name";
+
+    private static final Schema KEY_SCHEMA =
+        new SchemaBuilder(Schema.Type.STRUCT)
+            .field(SOURCE_NAME_FIELD, Schema.STRING_SCHEMA)
+            .field(JOB_NAME_FIELD, Schema.STRING_SCHEMA)
+            .build();
+
+    // Internal buffer into which all incoming scraper responses are written to.
+    private ArrayBlockingQueue<SourceRecord> buffer;
+
+    @Override
+    public String version() {
+        return VersionUtil.getVersion();
+    }
+
+    @Override
+    public void start(Map<String, String> props) {
+        AbstractConfig config = new AbstractConfig(CONFIG_DEF, props);
+        String connectionName = config.getString(CONNECTION_NAME_CONFIG);
+        String plc4xConnectionString = config.getString(PLC4X_CONNECTION_STRING_CONFIG);
+        Map<String, String> topics = new HashMap<>();
+        // Create a buffer with a capacity of 1000 elements which schedules access in a fair way.
+        buffer = new ArrayBlockingQueue<>(1000, true);
+
+        ScraperConfigurationTriggeredImplBuilder builder = new ScraperConfigurationTriggeredImplBuilder();
+        builder.addSource(connectionName, plc4xConnectionString);
+
+        List<String> jobConfigs = config.getList(QUERIES_CONFIG);
+        for (String jobConfig : jobConfigs) {
+            String[] jobConfigSegments = jobConfig.split("\\|");
+            if(jobConfigSegments.length < 4) {
+                log.warn(String.format("Error in job configuration '%s'. " +
+                    "The configuration expects at least 4 segments: " +
+                    "{job-name}|{topic}|{rate}(|{field-alias}#{field-address})+", jobConfig));
+                continue;
+            }
+
+            String jobName = jobConfigSegments[0];
+            String topic = jobConfigSegments[1];
+            Integer rate = Integer.valueOf(jobConfigSegments[2]);
+            JobConfigurationTriggeredImplBuilder jobBuilder = builder.job(
+                jobName, String.format("(SCHEDULED,%s)", rate)).source(connectionName);
+            for(int i = 3; i < jobConfigSegments.length; i++) {
+                String[] fieldSegments = jobConfigSegments[i].split("#");
+                if(fieldSegments.length != 2) {
+                    log.warn(String.format("Error in job configuration '%s'. " +
+                            "The field segment expects a format {field-alias}#{field-address}, but got '%s'",
+                        jobName, jobConfigSegments[i]));
+                    continue;
+                }
+                String fieldAlias = fieldSegments[0];
+                String fieldAddress = fieldSegments[1];
+                jobBuilder.field(fieldAlias, fieldAddress);
+                topics.put(jobName, topic);
+            }
+            jobBuilder.build();
+        }
+
+        ScraperConfigurationTriggeredImpl scraperConfig = builder.build();
+
+        try {
+            PlcDriverManager plcDriverManager = new PooledPlcDriverManager();
+            TriggerCollector triggerCollector = new TriggerCollectorImpl(plcDriverManager);
+            TriggeredScraperImpl scraper = new TriggeredScraperImpl(scraperConfig, (jobName, sourceName, results) -> {
+                Long timestamp = System.currentTimeMillis();
+
+                Map<String, String> sourcePartition = new HashMap<>();
+                sourcePartition.put("sourceName", sourceName);
+                sourcePartition.put("jobName", jobName);
+
+                Map<String, Long> sourceOffset = Collections.singletonMap("offset", timestamp);
+
+                String topic = topics.get(jobName);
+
+                // Prepare the key structure.
+                Struct key = new Struct(KEY_SCHEMA)
+                    .put(SOURCE_NAME_FIELD, sourceName)
+                    .put(JOB_NAME_FIELD, jobName);
+
+                // Build the Schema for the result struct.
+                SchemaBuilder recordSchemaBuilder = SchemaBuilder.struct().name("org.apache.plc4x.kafka.JobResult");
+                for (Map.Entry<String, Object> result : results.entrySet()) {
+                    // Get field-name and -value from the results.
+                    String fieldName = result.getKey();
+                    Object fieldValue = result.getValue();
+
+                    // Get the schema for the given value type.
+                    Schema valueSchema = getSchema(fieldValue);
+
+                    // Add the schema description for the current field.
+                    recordSchemaBuilder.field(fieldName, valueSchema);
+                }
+                Schema recordSchema = recordSchemaBuilder.build();
+
+                // Build the struct itself.
+                Struct recordStruct = new Struct(recordSchema);
+                for (Map.Entry<String, Object> result : results.entrySet()) {
+                    // Get field-name and -value from the results.
+                    String fieldName = result.getKey();
+                    Object fieldValue = result.getValue();
+                    recordStruct.put(fieldName, fieldValue);
+                }
+
+                // Prepare the source-record element.
+                SourceRecord record = new SourceRecord(
+                    sourcePartition, sourceOffset,
+                    topic,
+                    KEY_SCHEMA, key,
+                    recordSchema, recordStruct
+                    );
+
+                // Add the new source-record to the buffer.
+                buffer.add(record);
+            }, triggerCollector);
+            scraper.start();
+            triggerCollector.start();
+        } catch (ScraperException e) {
+            log.error("Error starting the scraper", e);
+        }
+    }
+
+    @Override
+    public void stop() {
+        synchronized (this) {
+            // TODO: Correctly shutdown the scraper.
+            notifyAll(); // wake up thread waiting in awaitFetch
+        }
+    }
+
+    @Override
+    public List<SourceRecord> poll() {
+        if(!buffer.isEmpty()) {
+            int numElements = buffer.size();
+            List<SourceRecord> result = new ArrayList<>(numElements);
+            buffer.drainTo(result, numElements);
+            return result;
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
+    private Schema getSchema(Object value) {
+        Objects.requireNonNull(value);
+
+        if(value instanceof List) {
+            List list = (List) value;
+            if(list.isEmpty()) {
+                throw new ConnectException("Unsupported empty lists.");
+            }
+            // In PLC4X list elements all contain the same type.
+            Object firstElement = list.get(0);
+            Schema elementSchema = getSchema(firstElement);
+            return SchemaBuilder.array(elementSchema).build();
+        }
+        if (value instanceof BigDecimal) {
+
+        }
+        if (value instanceof BigDecimal) {
+
+        }
+        if (value instanceof Boolean) {
+            return Schema.BOOLEAN_SCHEMA;
+        }
+        if (value instanceof byte[]) {
+            return Schema.BYTES_SCHEMA;
+        }
+        if (value instanceof Byte) {
+            return Schema.INT8_SCHEMA;
+        }
+        if (value instanceof Double) {
+            return Schema.FLOAT64_SCHEMA;
+        }
+        if (value instanceof Float) {
+            return Schema.FLOAT32_SCHEMA;
+        }
+        if (value instanceof Integer) {
+            return Schema.INT32_SCHEMA;
+        }
+        if (value instanceof LocalDate) {
+
+        }
+        if (value instanceof LocalDateTime) {
+
+        }
+        if (value instanceof LocalTime) {
+
+        }
+        if (value instanceof Long) {
+            return Schema.INT64_SCHEMA;
+        }
+        if (value instanceof Short) {
+            return Schema.INT16_SCHEMA;
+        }
+        if (value instanceof String) {
+            return Schema.STRING_SCHEMA;
+        }
+        // TODO: add support for collective and complex types
+        throw new ConnectException(String.format("Unsupported data type %s", value.getClass().getName()));
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/config/Defaults.java b/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/config/Defaults.java
index fcdb99e8fbc..d0185b3f3e7 100644
--- a/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/config/Defaults.java
+++ b/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/config/Defaults.java
@@ -1,33 +1,33 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.kafka.config;
-
-public class Defaults {
-
-    private final String topic;
-
-    public Defaults(String topic) {
-        this.topic = topic;
-    }
-
-    public String getTopic() {
-        return topic;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.kafka.config;
+
+public class Defaults {
+
+    private final String topic;
+
+    public Defaults(String topic) {
+        this.topic = topic;
+    }
+
+    public String getTopic() {
+        return topic;
+    }
+
+}
diff --git a/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/config/Job.java b/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/config/Job.java
index eb6705204c0..4c873b160d9 100644
--- a/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/config/Job.java
+++ b/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/config/Job.java
@@ -1,48 +1,48 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.kafka.config;
-
-import java.time.Duration;
-import java.util.Map;
-
-public class Job {
-
-    private final String name;
-    private final int interval;
-    private final Map<String, String> fields;
-
-    public Job(String name, int interval, Map<String, String> fields) {
-        this.name = name;
-        this.interval = interval;
-        this.fields = fields;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public int getInterval() {
-        return interval;
-    }
-
-    public Map<String, String> getFields() {
-        return fields;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.kafka.config;
+
+import java.time.Duration;
+import java.util.Map;
+
+public class Job {
+
+    private final String name;
+    private final int interval;
+    private final Map<String, String> fields;
+
+    public Job(String name, int interval, Map<String, String> fields) {
+        this.name = name;
+        this.interval = interval;
+        this.fields = fields;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getInterval() {
+        return interval;
+    }
+
+    public Map<String, String> getFields() {
+        return fields;
+    }
+
+}
diff --git a/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/config/JobReference.java b/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/config/JobReference.java
index 6c1741b6515..9fdd80f9ad3 100644
--- a/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/config/JobReference.java
+++ b/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/config/JobReference.java
@@ -1,39 +1,39 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.kafka.config;
-
-public class JobReference {
-
-    private final String name;
-    private final String topic;
-
-    public JobReference(String name, String topic) {
-        this.name = name;
-        this.topic = topic;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getTopic() {
-        return topic;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.kafka.config;
+
+public class JobReference {
+
+    private final String name;
+    private final String topic;
+
+    public JobReference(String name, String topic) {
+        this.name = name;
+        this.topic = topic;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getTopic() {
+        return topic;
+    }
+
+}
diff --git a/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/config/Source.java b/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/config/Source.java
index 837e9b573f1..4bd8349bb1d 100644
--- a/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/config/Source.java
+++ b/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/config/Source.java
@@ -1,45 +1,45 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.kafka.config;
-
-public class Source {
-
-    private final String name;
-    private final String connectionString;
-    private final JobReference[] jobReferences;
-
-    public Source(String name, String connectionString, JobReference[] jobReferences) {
-        this.name = name;
-        this.connectionString = connectionString;
-        this.jobReferences = jobReferences;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getConnectionString() {
-        return connectionString;
-    }
-
-    public JobReference[] getJobReferences() {
-        return jobReferences;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.kafka.config;
+
+public class Source {
+
+    private final String name;
+    private final String connectionString;
+    private final JobReference[] jobReferences;
+
+    public Source(String name, String connectionString, JobReference[] jobReferences) {
+        this.name = name;
+        this.connectionString = connectionString;
+        this.jobReferences = jobReferences;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getConnectionString() {
+        return connectionString;
+    }
+
+    public JobReference[] getJobReferences() {
+        return jobReferences;
+    }
+
+}
diff --git a/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/config/SourceConfig.java b/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/config/SourceConfig.java
index e7f70dca708..4e01796e870 100644
--- a/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/config/SourceConfig.java
+++ b/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/config/SourceConfig.java
@@ -1,107 +1,107 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.kafka.config;
-
-import org.apache.plc4x.kafka.Plc4xSourceConnector;
-
-import java.util.*;
-
-public class SourceConfig {
-
-    private static final String CONNECTION_STRING_CONFIG = "connectionString";
-    private static final String JOB_REFERENCES_CONFIG = "jobReferences";
-    private static final String TOPIC_CONFIG = "topic";
-    private static final String INTERVAL_CONFIG = "interval";
-    private static final String FIELDS_CONFIG = "fields";
-
-    private final List<Source> sources;
-    private final List<Job> jobs;
-
-    public static SourceConfig fromPropertyMap(Map<String, String> properties) {
-        String defaultTopic = properties.getOrDefault(Plc4xSourceConnector.DEFAULT_TOPIC_CONFIG, null);
-
-        String[] sourceNames = properties.getOrDefault(Plc4xSourceConnector.SOURCES_CONFIG, "").split(",");
-        List<Source> sources = new ArrayList<>(sourceNames.length);
-        for (String sourceName : sourceNames) {
-            String connectionString = properties.get(
-                Plc4xSourceConnector.SOURCES_CONFIG + "." + sourceName + "." + CONNECTION_STRING_CONFIG);
-            String sourceTopic = properties.getOrDefault(
-                Plc4xSourceConnector.SOURCES_CONFIG + "." + sourceName + "." + TOPIC_CONFIG, defaultTopic);
-            String[] jobReferenceNames = properties.get(
-                Plc4xSourceConnector.SOURCES_CONFIG + "." + sourceName + "." + JOB_REFERENCES_CONFIG).split(",");
-            JobReference[] jobReferences = new JobReference[jobReferenceNames.length];
-            for (int i = 0; i < jobReferenceNames.length; i++) {
-                String jobReferenceName = jobReferenceNames[i];
-                String topic = properties.getOrDefault(Plc4xSourceConnector.SOURCES_CONFIG + "." + sourceName + "." + JOB_REFERENCES_CONFIG +
-                    "." + jobReferenceName + "." + TOPIC_CONFIG, sourceTopic);
-                JobReference jobReference = new JobReference(jobReferenceName, topic);
-                jobReferences[i] = jobReference;
-            }
-            Source source = new Source(sourceName, connectionString, jobReferences);
-            sources.add(source);
-        }
-
-        String[] jobNames = properties.getOrDefault(Plc4xSourceConnector.JOBS_CONFIG, "").split(",");
-        List<Job> jobs = new ArrayList<>(jobNames.length);
-        for (String jobName : jobNames) {
-            int interval = Integer.parseInt(properties.get(
-                Plc4xSourceConnector.JOBS_CONFIG + "." + jobName + "." + INTERVAL_CONFIG));
-            String[] fieldNames = properties.get(
-                Plc4xSourceConnector.JOBS_CONFIG + "." + jobName + "." + FIELDS_CONFIG).split(",");
-            Map<String, String> fields = new HashMap<>();
-            for (String fieldName : fieldNames) {
-                String fieldAddress = properties.get(
-                    Plc4xSourceConnector.JOBS_CONFIG + "." + jobName + "." + FIELDS_CONFIG + "." + fieldName);
-                fields.put(fieldName, fieldAddress);
-            }
-            Job job = new Job(jobName, interval, fields);
-            jobs.add(job);
-        }
-
-        return new SourceConfig(sources, jobs);
-    }
-
-    public SourceConfig(List<Source> sources, List<Job> jobs) {
-        this.sources = sources;
-        this.jobs = jobs;
-    }
-
-    public List<Source> getSources() {
-        return sources;
-    }
-
-    public Source getSource(String sourceName) {
-        if(sources == null) {
-            return null;
-        }
-        return sources.stream().filter(source -> source.getName().equals(sourceName)).findFirst().orElse(null);
-    }
-
-    public List<Job> getJobs() {
-        return jobs;
-    }
-
-    public Job getJob(String jobName) {
-        if(jobs == null) {
-            return null;
-        }
-        return jobs.stream().filter(job -> job.getName().equals(jobName)).findFirst().orElse(null);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.kafka.config;
+
+import org.apache.plc4x.kafka.Plc4xSourceConnector;
+
+import java.util.*;
+
+public class SourceConfig {
+
+    private static final String CONNECTION_STRING_CONFIG = "connectionString";
+    private static final String JOB_REFERENCES_CONFIG = "jobReferences";
+    private static final String TOPIC_CONFIG = "topic";
+    private static final String INTERVAL_CONFIG = "interval";
+    private static final String FIELDS_CONFIG = "fields";
+
+    private final List<Source> sources;
+    private final List<Job> jobs;
+
+    public static SourceConfig fromPropertyMap(Map<String, String> properties) {
+        String defaultTopic = properties.getOrDefault(Plc4xSourceConnector.DEFAULT_TOPIC_CONFIG, null);
+
+        String[] sourceNames = properties.getOrDefault(Plc4xSourceConnector.SOURCES_CONFIG, "").split(",");
+        List<Source> sources = new ArrayList<>(sourceNames.length);
+        for (String sourceName : sourceNames) {
+            String connectionString = properties.get(
+                Plc4xSourceConnector.SOURCES_CONFIG + "." + sourceName + "." + CONNECTION_STRING_CONFIG);
+            String sourceTopic = properties.getOrDefault(
+                Plc4xSourceConnector.SOURCES_CONFIG + "." + sourceName + "." + TOPIC_CONFIG, defaultTopic);
+            String[] jobReferenceNames = properties.get(
+                Plc4xSourceConnector.SOURCES_CONFIG + "." + sourceName + "." + JOB_REFERENCES_CONFIG).split(",");
+            JobReference[] jobReferences = new JobReference[jobReferenceNames.length];
+            for (int i = 0; i < jobReferenceNames.length; i++) {
+                String jobReferenceName = jobReferenceNames[i];
+                String topic = properties.getOrDefault(Plc4xSourceConnector.SOURCES_CONFIG + "." + sourceName + "." + JOB_REFERENCES_CONFIG +
+                    "." + jobReferenceName + "." + TOPIC_CONFIG, sourceTopic);
+                JobReference jobReference = new JobReference(jobReferenceName, topic);
+                jobReferences[i] = jobReference;
+            }
+            Source source = new Source(sourceName, connectionString, jobReferences);
+            sources.add(source);
+        }
+
+        String[] jobNames = properties.getOrDefault(Plc4xSourceConnector.JOBS_CONFIG, "").split(",");
+        List<Job> jobs = new ArrayList<>(jobNames.length);
+        for (String jobName : jobNames) {
+            int interval = Integer.parseInt(properties.get(
+                Plc4xSourceConnector.JOBS_CONFIG + "." + jobName + "." + INTERVAL_CONFIG));
+            String[] fieldNames = properties.get(
+                Plc4xSourceConnector.JOBS_CONFIG + "." + jobName + "." + FIELDS_CONFIG).split(",");
+            Map<String, String> fields = new HashMap<>();
+            for (String fieldName : fieldNames) {
+                String fieldAddress = properties.get(
+                    Plc4xSourceConnector.JOBS_CONFIG + "." + jobName + "." + FIELDS_CONFIG + "." + fieldName);
+                fields.put(fieldName, fieldAddress);
+            }
+            Job job = new Job(jobName, interval, fields);
+            jobs.add(job);
+        }
+
+        return new SourceConfig(sources, jobs);
+    }
+
+    public SourceConfig(List<Source> sources, List<Job> jobs) {
+        this.sources = sources;
+        this.jobs = jobs;
+    }
+
+    public List<Source> getSources() {
+        return sources;
+    }
+
+    public Source getSource(String sourceName) {
+        if(sources == null) {
+            return null;
+        }
+        return sources.stream().filter(source -> source.getName().equals(sourceName)).findFirst().orElse(null);
+    }
+
+    public List<Job> getJobs() {
+        return jobs;
+    }
+
+    public Job getJob(String jobName) {
+        if(jobs == null) {
+            return null;
+        }
+        return jobs.stream().filter(job -> job.getName().equals(jobName)).findFirst().orElse(null);
+    }
+
+}
diff --git a/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/exceptions/ConfigurationException.java b/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/exceptions/ConfigurationException.java
index c41578aeb53..fa80b7c11e3 100644
--- a/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/exceptions/ConfigurationException.java
+++ b/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/exceptions/ConfigurationException.java
@@ -1,31 +1,31 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.kafka.exceptions;
-
-public class ConfigurationException extends Exception {
-
-    public ConfigurationException(String message) {
-        super(message);
-    }
-
-    public ConfigurationException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.kafka.exceptions;
+
+public class ConfigurationException extends Exception {
+
+    public ConfigurationException(String message) {
+        super(message);
+    }
+
+    public ConfigurationException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+}
diff --git a/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/util/VersionUtil.java b/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/util/VersionUtil.java
index 20488de9759..711fa090d80 100644
--- a/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/util/VersionUtil.java
+++ b/plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/util/VersionUtil.java
@@ -1,32 +1,32 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.kafka.util;
-
-/**
- * Utility to access version information from the jars MANIFEST.MF file, which is automatically generated by the build.
- */
-public class VersionUtil {
-    public static String getVersion() {
-        try {
-            return VersionUtil.class.getPackage().getImplementationVersion();
-        } catch (Exception ignored) {
-            return "0.0.0.0";
-        }
-    }
-}
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.kafka.util;
+
+/**
+ * Utility to access version information from the jars MANIFEST.MF file, which is automatically generated by the build.
+ */
+public class VersionUtil {
+    public static String getVersion() {
+        try {
+            return VersionUtil.class.getPackage().getImplementationVersion();
+        } catch (Exception ignored) {
+            return "0.0.0.0";
+        }
+    }
+}
diff --git a/plc4j/integrations/apache-kafka/src/test/java/org/apache/plc4x/kafka/config/SourceConfigTest.java b/plc4j/integrations/apache-kafka/src/test/java/org/apache/plc4x/kafka/config/SourceConfigTest.java
index 998c1c2ba7e..ed6063af164 100644
--- a/plc4j/integrations/apache-kafka/src/test/java/org/apache/plc4x/kafka/config/SourceConfigTest.java
+++ b/plc4j/integrations/apache-kafka/src/test/java/org/apache/plc4x/kafka/config/SourceConfigTest.java
@@ -1,82 +1,82 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.kafka.config;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import org.junit.jupiter.api.Test;
-
-import java.io.StringReader;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-public class SourceConfigTest {
-
-    @Test
-    public void parseConfig() throws Exception {
-        Properties properties = new Properties();
-        properties.load(new StringReader("name=plc-source-test\n" +
-            "connector.class=org.apache.plc4x.kafka.Plc4xSourceConnector\n" +
-            "\n" +
-            "defaults.topic=some/default\n" +
-            "\n" +
-            "sources=machineA,machineB,machineC\n" +
-            "sources.machineA.connectionString=s7://1.2.3.4/1/1\n" +
-            "sources.machineA.jobReferences=s7-dashboard,s7-heartbeat\n" +
-            "sources.machineA.jobReferences.s7-heartbeat.topic=heartbeat\n" +
-            "\n" +
-            "sources.machineB.connectionString=s7://10.20.30.40/1/1\n" +
-            "sources.machineB.topic=heartbeat\n" +
-            "sources.machineB.jobReferences=s7-heartbeat\n" +
-            "\n" +
-            "sources.machineC.connectionString=ads://1.2.3.4.5.6\n" +
-            "sources.machineC.topic=heartbeat\n" +
-            "sources.machineC.jobReferences=ads-heartbeat\n" +
-            "\n" +
-            "jobs=s7-dashboard,s7-heartbeat,ads-heartbeat\n" +
-            "jobs.s7-dashboard.interval=500\n" +
-            "jobs.s7-dashboard.fields=inputPreasure,outputPreasure,temperature\n" +
-            "jobs.s7-dashboard.fields.inputPreasure=%DB.DB1.4:INT\n" +
-            "jobs.s7-dashboard.fields.outputPreasure=%Q1:BYT\n" +
-            "jobs.s7-dashboard.fields.temperature=%I3:INT\n" +
-            "\n" +
-            "jobs.s7-heartbeat.interval=1000\n" +
-            "jobs.s7-heartbeat.fields=active\n" +
-            "jobs.s7-heartbeat.fields.active=%I0.2:BOOL\n" +
-            "\n" +
-            "jobs.ads-heartbeat.interval=1000\n" +
-            "jobs.ads-heartbeat.fields=active\n" +
-            "jobs.ads-heartbeat.fields.active=Main.running\n"));
-        SourceConfig sourceConfig = SourceConfig.fromPropertyMap(toStringMap(properties));
-
-        assertNotNull(sourceConfig);
-        assertEquals(3, sourceConfig.getSources().size(), "Expected 3 sources");
-        assertEquals(3, sourceConfig.getJobs().size(), "Expected 3 jobs");
-    }
-
-    private static Map<String, String> toStringMap(Properties properties) {
-        Map<String, String> map = new HashMap<>();
-        for (String stringPropertyName : properties.stringPropertyNames()) {
-            map.put(stringPropertyName, properties.getProperty(stringPropertyName));
-        }
-        return map;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.kafka.config;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+import java.io.StringReader;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+public class SourceConfigTest {
+
+    @Test
+    public void parseConfig() throws Exception {
+        Properties properties = new Properties();
+        properties.load(new StringReader("name=plc-source-test\n" +
+            "connector.class=org.apache.plc4x.kafka.Plc4xSourceConnector\n" +
+            "\n" +
+            "defaults.topic=some/default\n" +
+            "\n" +
+            "sources=machineA,machineB,machineC\n" +
+            "sources.machineA.connectionString=s7://1.2.3.4/1/1\n" +
+            "sources.machineA.jobReferences=s7-dashboard,s7-heartbeat\n" +
+            "sources.machineA.jobReferences.s7-heartbeat.topic=heartbeat\n" +
+            "\n" +
+            "sources.machineB.connectionString=s7://10.20.30.40/1/1\n" +
+            "sources.machineB.topic=heartbeat\n" +
+            "sources.machineB.jobReferences=s7-heartbeat\n" +
+            "\n" +
+            "sources.machineC.connectionString=ads://1.2.3.4.5.6\n" +
+            "sources.machineC.topic=heartbeat\n" +
+            "sources.machineC.jobReferences=ads-heartbeat\n" +
+            "\n" +
+            "jobs=s7-dashboard,s7-heartbeat,ads-heartbeat\n" +
+            "jobs.s7-dashboard.interval=500\n" +
+            "jobs.s7-dashboard.fields=inputPreasure,outputPreasure,temperature\n" +
+            "jobs.s7-dashboard.fields.inputPreasure=%DB.DB1.4:INT\n" +
+            "jobs.s7-dashboard.fields.outputPreasure=%Q1:BYT\n" +
+            "jobs.s7-dashboard.fields.temperature=%I3:INT\n" +
+            "\n" +
+            "jobs.s7-heartbeat.interval=1000\n" +
+            "jobs.s7-heartbeat.fields=active\n" +
+            "jobs.s7-heartbeat.fields.active=%I0.2:BOOL\n" +
+            "\n" +
+            "jobs.ads-heartbeat.interval=1000\n" +
+            "jobs.ads-heartbeat.fields=active\n" +
+            "jobs.ads-heartbeat.fields.active=Main.running\n"));
+        SourceConfig sourceConfig = SourceConfig.fromPropertyMap(toStringMap(properties));
+
+        assertNotNull(sourceConfig);
+        assertEquals(3, sourceConfig.getSources().size(), "Expected 3 sources");
+        assertEquals(3, sourceConfig.getJobs().size(), "Expected 3 jobs");
+    }
+
+    private static Map<String, String> toStringMap(Properties properties) {
+        Map<String, String> map = new HashMap<>();
+        for (String stringPropertyName : properties.stringPropertyNames()) {
+            map.put(stringPropertyName, properties.getProperty(stringPropertyName));
+        }
+        return map;
+    }
+
+}
diff --git a/plc4j/integrations/apache-nifi/nifi-plc4x-nar/false-positives.xml b/plc4j/integrations/apache-nifi/nifi-plc4x-nar/false-positives.xml
index 0f9c316e093..92fcd76813e 100644
--- a/plc4j/integrations/apache-nifi/nifi-plc4x-nar/false-positives.xml
+++ b/plc4j/integrations/apache-nifi/nifi-plc4x-nar/false-positives.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.2.xsd">
-  <suppress>
-    <notes><![CDATA[
-      The plugin is detecting our nifi-plc4x-processors module as really old NIFI artifact and reporting it as vulnerable.
-      ]]></notes>
-    <cpe>cpe:/a:apache:nifi</cpe>
-  </suppress>
-</suppressions>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.2.xsd">
+  <suppress>
+    <notes><![CDATA[
+      The plugin is detecting our nifi-plc4x-processors module as really old NIFI artifact and reporting it as vulnerable.
+      ]]></notes>
+    <cpe>cpe:/a:apache:nifi</cpe>
+  </suppress>
+</suppressions>
diff --git a/plc4j/integrations/apache-nifi/nifi-plc4x-nar/pom.xml b/plc4j/integrations/apache-nifi/nifi-plc4x-nar/pom.xml
index 320533384b3..da2ac45034e 100644
--- a/plc4j/integrations/apache-nifi/nifi-plc4x-nar/pom.xml
+++ b/plc4j/integrations/apache-nifi/nifi-plc4x-nar/pom.xml
@@ -1,104 +1,104 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-  http://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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-apache-nifi</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-nifi-plc4x-nar</artifactId>
-  <packaging>nar</packaging>
-
-  <name>PLC4J: Integrations: Apache Nifi: NAR</name>
-
-  <properties>
-    <maven.javadoc.skip>true</maven.javadoc.skip>
-    <source.skip>true</source.skip>
-  </properties>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.owasp</groupId>
-          <artifactId>dependency-check-maven</artifactId>
-          <configuration>
-            <suppressionFiles>${project.basedir}/false-positives.xml</suppressionFiles>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <configuration>
-            <usedDependencies>
-              <usedDependency>org.apache.plc4x:plc4j-nifi-plc4x-processors</usedDependency>
-              <usedDependency>org.apache.plc4x:plc4j-api</usedDependency>
-              <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency>
-              <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency>
-              <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
-              <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
-              <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
-            </usedDependencies>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-nifi-plc4x-processors</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <!-- PLC4X -->
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <!-- Bundle Drivers -->
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ads</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ethernet-ip</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-modbus</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-s7</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-simulated</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+  http://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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-apache-nifi</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-nifi-plc4x-nar</artifactId>
+  <packaging>nar</packaging>
+
+  <name>PLC4J: Integrations: Apache Nifi: NAR</name>
+
+  <properties>
+    <maven.javadoc.skip>true</maven.javadoc.skip>
+    <source.skip>true</source.skip>
+  </properties>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.owasp</groupId>
+          <artifactId>dependency-check-maven</artifactId>
+          <configuration>
+            <suppressionFiles>${project.basedir}/false-positives.xml</suppressionFiles>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <configuration>
+            <usedDependencies>
+              <usedDependency>org.apache.plc4x:plc4j-nifi-plc4x-processors</usedDependency>
+              <usedDependency>org.apache.plc4x:plc4j-api</usedDependency>
+              <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency>
+              <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency>
+              <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
+              <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
+              <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
+            </usedDependencies>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-nifi-plc4x-processors</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <!-- PLC4X -->
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <!-- Bundle Drivers -->
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ads</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ethernet-ip</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-modbus</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-s7</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-simulated</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/plc4j/integrations/apache-nifi/nifi-plc4x-processors/pom.xml b/plc4j/integrations/apache-nifi/nifi-plc4x-processors/pom.xml
index fba1dcaf295..bd6cbe06667 100644
--- a/plc4j/integrations/apache-nifi/nifi-plc4x-processors/pom.xml
+++ b/plc4j/integrations/apache-nifi/nifi-plc4x-processors/pom.xml
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-  http://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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-apache-nifi</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-nifi-plc4x-processors</artifactId>
-
-  <name>PLC4J: Integrations: Apache Nifi: Processors</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.nifi</groupId>
-      <artifactId>nifi-api</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.nifi</groupId>
-      <artifactId>nifi-mock</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+  http://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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-apache-nifi</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-nifi-plc4x-processors</artifactId>
+
+  <name>PLC4J: Integrations: Apache Nifi: Processors</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.nifi</groupId>
+      <artifactId>nifi-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.nifi</groupId>
+      <artifactId>nifi-mock</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/plc4j/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/BasePlc4xProcessor.java b/plc4j/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/BasePlc4xProcessor.java
index e4c6463bdeb..cebe0e2fa87 100644
--- a/plc4j/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/BasePlc4xProcessor.java
+++ b/plc4j/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/BasePlc4xProcessor.java
@@ -1,157 +1,157 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.nifi;
-
-import org.apache.nifi.annotation.lifecycle.OnScheduled;
-import org.apache.nifi.components.*;
-import org.apache.nifi.processor.AbstractProcessor;
-import org.apache.nifi.processor.ProcessContext;
-import org.apache.nifi.processor.ProcessorInitializationContext;
-import org.apache.nifi.processor.Relationship;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-
-import java.util.*;
-
-public abstract class BasePlc4xProcessor extends AbstractProcessor {
-
-    private static final PropertyDescriptor PLC_CONNECTION_STRING = new PropertyDescriptor
-        .Builder().name("PLC_CONNECTION_STRING")
-        .displayName("PLC connection String")
-        .description("PLC4X connection string used to connect to a given PLC device.")
-        .required(true)
-        .addValidator(new Plc4xConnectionStringValidator())
-        .build();
-    private static final PropertyDescriptor PLC_ADDRESS_STRING = new PropertyDescriptor
-        .Builder().name("PLC_ADDRESS_STRING")
-        .displayName("PLC resource address String")
-        .description("PLC4X address string used identify the resource to read/write on a given PLC device " +
-            "(Multiple values supported). The expected format is: {name}={address}(;{name}={address})*")
-        .required(true)
-        .addValidator(new Plc4xAddressStringValidator())
-        .build();
-
-    static final Relationship SUCCESS = new Relationship.Builder()
-        .name("SUCCESS")
-        .description("Successfully processed")
-        .build();
-    static final Relationship FAILURE = new Relationship.Builder()
-        .name("FAILURE")
-        .description("An error occurred processing")
-        .build();
-
-    private List<PropertyDescriptor> descriptors;
-
-    Set<Relationship> relationships;
-
-    private PlcConnection connection;
-
-    private Map<String, String> addressMap;
-
-    @Override
-    protected void init(final ProcessorInitializationContext context) {
-        this.descriptors = Arrays.asList(PLC_CONNECTION_STRING, PLC_ADDRESS_STRING);
-        this.relationships = new HashSet<>(Arrays.asList(SUCCESS, FAILURE));
-    }
-
-    PlcConnection getConnection() {
-        return connection;
-    }
-
-    Collection<String> getFields() {
-        return addressMap.keySet();
-    }
-    String getAddress(String field) {
-        return addressMap.get(field);
-    }
-
-    @Override
-    public Set<Relationship> getRelationships() {
-        return this.relationships;
-    }
-
-    @Override
-    public final List<PropertyDescriptor> getSupportedPropertyDescriptors() {
-        return descriptors;
-    }
-
-    @OnScheduled
-    public void onScheduled(final ProcessContext context) {
-        PropertyValue property = context.getProperty(PLC_CONNECTION_STRING.getName());
-        if ((connection == null) || !connection.isConnected()) {
-            try {
-                connection = new PlcDriverManager().getConnection(property.getValue());
-            } catch (PlcConnectionException e) {
-                getLogger().error("Error connecting to " + property.getValue(), e);
-            }
-        }
-
-        addressMap = new HashMap<>();
-        PropertyValue addresses = context.getProperty(PLC_ADDRESS_STRING.getName());
-        for (String segment : addresses.getValue().split(";")) {
-            String[] parts = segment.split("=");
-            if(parts.length != 2) {
-                throw new PlcRuntimeException("Invalid address format");
-            }
-            addressMap.put(parts[0], parts[1]);
-        }
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof BasePlc4xProcessor)) {
-            return false;
-        }
-        if (!super.equals(o)) {
-            return false;
-        }
-        BasePlc4xProcessor that = (BasePlc4xProcessor) o;
-        return Objects.equals(descriptors, that.descriptors) &&
-            Objects.equals(getRelationships(), that.getRelationships()) &&
-            Objects.equals(getConnection(), that.getConnection()) &&
-            Objects.equals(addressMap, that.addressMap);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), descriptors, getRelationships(), getConnection(), addressMap);
-    }
-
-    public static class Plc4xConnectionStringValidator implements Validator {
-        @Override
-        public ValidationResult validate(String subject, String input, ValidationContext context) {
-            // TODO: Add validation here ...
-            return new ValidationResult.Builder().subject(subject).explanation("").valid(true).build();
-        }
-    }
-
-    public static class Plc4xAddressStringValidator implements Validator {
-        @Override
-        public ValidationResult validate(String subject, String input, ValidationContext context) {
-            // TODO: Add validation here ...
-            return new ValidationResult.Builder().subject(subject).explanation("").valid(true).build();
-        }
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.nifi;
+
+import org.apache.nifi.annotation.lifecycle.OnScheduled;
+import org.apache.nifi.components.*;
+import org.apache.nifi.processor.AbstractProcessor;
+import org.apache.nifi.processor.ProcessContext;
+import org.apache.nifi.processor.ProcessorInitializationContext;
+import org.apache.nifi.processor.Relationship;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+
+import java.util.*;
+
+public abstract class BasePlc4xProcessor extends AbstractProcessor {
+
+    private static final PropertyDescriptor PLC_CONNECTION_STRING = new PropertyDescriptor
+        .Builder().name("PLC_CONNECTION_STRING")
+        .displayName("PLC connection String")
+        .description("PLC4X connection string used to connect to a given PLC device.")
+        .required(true)
+        .addValidator(new Plc4xConnectionStringValidator())
+        .build();
+    private static final PropertyDescriptor PLC_ADDRESS_STRING = new PropertyDescriptor
+        .Builder().name("PLC_ADDRESS_STRING")
+        .displayName("PLC resource address String")
+        .description("PLC4X address string used identify the resource to read/write on a given PLC device " +
+            "(Multiple values supported). The expected format is: {name}={address}(;{name}={address})*")
+        .required(true)
+        .addValidator(new Plc4xAddressStringValidator())
+        .build();
+
+    static final Relationship SUCCESS = new Relationship.Builder()
+        .name("SUCCESS")
+        .description("Successfully processed")
+        .build();
+    static final Relationship FAILURE = new Relationship.Builder()
+        .name("FAILURE")
+        .description("An error occurred processing")
+        .build();
+
+    private List<PropertyDescriptor> descriptors;
+
+    Set<Relationship> relationships;
+
+    private PlcConnection connection;
+
+    private Map<String, String> addressMap;
+
+    @Override
+    protected void init(final ProcessorInitializationContext context) {
+        this.descriptors = Arrays.asList(PLC_CONNECTION_STRING, PLC_ADDRESS_STRING);
+        this.relationships = new HashSet<>(Arrays.asList(SUCCESS, FAILURE));
+    }
+
+    PlcConnection getConnection() {
+        return connection;
+    }
+
+    Collection<String> getFields() {
+        return addressMap.keySet();
+    }
+    String getAddress(String field) {
+        return addressMap.get(field);
+    }
+
+    @Override
+    public Set<Relationship> getRelationships() {
+        return this.relationships;
+    }
+
+    @Override
+    public final List<PropertyDescriptor> getSupportedPropertyDescriptors() {
+        return descriptors;
+    }
+
+    @OnScheduled
+    public void onScheduled(final ProcessContext context) {
+        PropertyValue property = context.getProperty(PLC_CONNECTION_STRING.getName());
+        if ((connection == null) || !connection.isConnected()) {
+            try {
+                connection = new PlcDriverManager().getConnection(property.getValue());
+            } catch (PlcConnectionException e) {
+                getLogger().error("Error connecting to " + property.getValue(), e);
+            }
+        }
+
+        addressMap = new HashMap<>();
+        PropertyValue addresses = context.getProperty(PLC_ADDRESS_STRING.getName());
+        for (String segment : addresses.getValue().split(";")) {
+            String[] parts = segment.split("=");
+            if(parts.length != 2) {
+                throw new PlcRuntimeException("Invalid address format");
+            }
+            addressMap.put(parts[0], parts[1]);
+        }
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof BasePlc4xProcessor)) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+        BasePlc4xProcessor that = (BasePlc4xProcessor) o;
+        return Objects.equals(descriptors, that.descriptors) &&
+            Objects.equals(getRelationships(), that.getRelationships()) &&
+            Objects.equals(getConnection(), that.getConnection()) &&
+            Objects.equals(addressMap, that.addressMap);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), descriptors, getRelationships(), getConnection(), addressMap);
+    }
+
+    public static class Plc4xConnectionStringValidator implements Validator {
+        @Override
+        public ValidationResult validate(String subject, String input, ValidationContext context) {
+            // TODO: Add validation here ...
+            return new ValidationResult.Builder().subject(subject).explanation("").valid(true).build();
+        }
+    }
+
+    public static class Plc4xAddressStringValidator implements Validator {
+        @Override
+        public ValidationResult validate(String subject, String input, ValidationContext context) {
+            // TODO: Add validation here ...
+            return new ValidationResult.Builder().subject(subject).explanation("").valid(true).build();
+        }
+    }
+
+}
diff --git a/plc4j/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSinkProcessor.java b/plc4j/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSinkProcessor.java
index b0e212947cd..ebaa553bf64 100644
--- a/plc4j/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSinkProcessor.java
+++ b/plc4j/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSinkProcessor.java
@@ -1,81 +1,81 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.nifi;
-
-import org.apache.nifi.annotation.behavior.InputRequirement;
-import org.apache.nifi.annotation.behavior.ReadsAttribute;
-import org.apache.nifi.annotation.behavior.ReadsAttributes;
-import org.apache.nifi.annotation.behavior.TriggerSerially;
-import org.apache.nifi.annotation.documentation.CapabilityDescription;
-import org.apache.nifi.annotation.documentation.Tags;
-import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.processor.ProcessContext;
-import org.apache.nifi.processor.ProcessSession;
-import org.apache.nifi.processor.exception.ProcessException;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.messages.PlcWriteResponse;
-
-import java.util.concurrent.CompletableFuture;
-
-@TriggerSerially
-@Tags({"plc4x-sink"})
-@InputRequirement(InputRequirement.Requirement.INPUT_REQUIRED)
-@CapabilityDescription("Processor able to write data to industrial PLCs using Apache PLC4X")
-@ReadsAttributes({@ReadsAttribute(attribute="value", description="some value")})
-public class Plc4xSinkProcessor extends BasePlc4xProcessor {
-
-    @Override
-    public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
-        FlowFile flowFile = session.get();
-
-        // Abort if there's nothing to do.
-        if (flowFile == null) {
-            return;
-        }
-
-        // Get an instance of a component able to write to a PLC.
-        PlcConnection connection = getConnection();
-        if (!connection.getMetadata().canWrite()) {
-            throw new ProcessException("Writing not supported by connection");
-        }
-
-        // Prepare the request.
-        PlcWriteRequest.Builder builder = connection.writeRequestBuilder();
-        flowFile.getAttributes().forEach((field, value) -> {
-            String address = getAddress(field);
-            if(address != null) {
-                // TODO: Convert the String into the right type ...
-                builder.addItem(field, address, Boolean.valueOf(value));
-            }
-        });
-        PlcWriteRequest writeRequest = builder.build();
-
-        // Send the request to the PLC.
-        try {
-            final PlcWriteResponse plcWriteResponse = writeRequest.execute().get();
-            // TODO: Evaluate the response and create flow files for successful and unsuccessful updates
-            session.transfer(flowFile, SUCCESS);
-        } catch (Exception e) {
-            flowFile = session.putAttribute(flowFile, "exception", e.getLocalizedMessage());
-            session.transfer(flowFile, FAILURE);
-        }
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.nifi;
+
+import org.apache.nifi.annotation.behavior.InputRequirement;
+import org.apache.nifi.annotation.behavior.ReadsAttribute;
+import org.apache.nifi.annotation.behavior.ReadsAttributes;
+import org.apache.nifi.annotation.behavior.TriggerSerially;
+import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.Tags;
+import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.processor.ProcessContext;
+import org.apache.nifi.processor.ProcessSession;
+import org.apache.nifi.processor.exception.ProcessException;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteResponse;
+
+import java.util.concurrent.CompletableFuture;
+
+@TriggerSerially
+@Tags({"plc4x-sink"})
+@InputRequirement(InputRequirement.Requirement.INPUT_REQUIRED)
+@CapabilityDescription("Processor able to write data to industrial PLCs using Apache PLC4X")
+@ReadsAttributes({@ReadsAttribute(attribute="value", description="some value")})
+public class Plc4xSinkProcessor extends BasePlc4xProcessor {
+
+    @Override
+    public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
+        FlowFile flowFile = session.get();
+
+        // Abort if there's nothing to do.
+        if (flowFile == null) {
+            return;
+        }
+
+        // Get an instance of a component able to write to a PLC.
+        PlcConnection connection = getConnection();
+        if (!connection.getMetadata().canWrite()) {
+            throw new ProcessException("Writing not supported by connection");
+        }
+
+        // Prepare the request.
+        PlcWriteRequest.Builder builder = connection.writeRequestBuilder();
+        flowFile.getAttributes().forEach((field, value) -> {
+            String address = getAddress(field);
+            if(address != null) {
+                // TODO: Convert the String into the right type ...
+                builder.addItem(field, address, Boolean.valueOf(value));
+            }
+        });
+        PlcWriteRequest writeRequest = builder.build();
+
+        // Send the request to the PLC.
+        try {
+            final PlcWriteResponse plcWriteResponse = writeRequest.execute().get();
+            // TODO: Evaluate the response and create flow files for successful and unsuccessful updates
+            session.transfer(flowFile, SUCCESS);
+        } catch (Exception e) {
+            flowFile = session.putAttribute(flowFile, "exception", e.getLocalizedMessage());
+            session.transfer(flowFile, FAILURE);
+        }
+    }
+
+}
diff --git a/plc4j/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSourceProcessor.java b/plc4j/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSourceProcessor.java
index f11a263486d..55d7209d399 100644
--- a/plc4j/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSourceProcessor.java
+++ b/plc4j/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSourceProcessor.java
@@ -1,79 +1,79 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.nifi;
-
-import org.apache.nifi.annotation.behavior.InputRequirement;
-import org.apache.nifi.annotation.behavior.WritesAttribute;
-import org.apache.nifi.annotation.behavior.WritesAttributes;
-import org.apache.nifi.annotation.documentation.CapabilityDescription;
-import org.apache.nifi.annotation.documentation.Tags;
-import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.processor.ProcessContext;
-import org.apache.nifi.processor.ProcessSession;
-import org.apache.nifi.processor.exception.ProcessException;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-
-@Tags({"plc4x-source"})
-@InputRequirement(InputRequirement.Requirement.INPUT_FORBIDDEN)
-@CapabilityDescription("Processor able to read data from industrial PLCs using Apache PLC4X")
-@WritesAttributes({@WritesAttribute(attribute="value", description="some value")})
-public class Plc4xSourceProcessor extends BasePlc4xProcessor {
-
-    @Override
-    public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
-        // Get an instance of a component able to read from a PLC.
-        PlcConnection connection = getConnection();
-
-        // Prepare the request.
-        if (!connection.getMetadata().canRead()) {
-            throw new ProcessException("Writing not supported by connection");
-        }
-
-        FlowFile flowFile = session.create();
-        try {
-            PlcReadRequest.Builder builder = connection.readRequestBuilder();
-            getFields().forEach(field -> {
-                String address = getAddress(field);
-                if(address != null) {
-                    builder.addItem(field, address);
-                }
-            });
-            PlcReadRequest readRequest = builder.build();
-            PlcReadResponse response = readRequest.execute().get();
-            Map attributes = new HashMap<String, String>();
-            for (String fieldName : response.getFieldNames()) {
-                for(int i = 0; i < response.getNumberOfValues(fieldName); i++) {
-                    Object value = response.getObject(fieldName, i);
-                    attributes.put(fieldName, String.valueOf(value));
-                }
-            }
-            flowFile = session.putAllAttributes(flowFile, attributes);
-        } catch (InterruptedException | ExecutionException e) {
-            throw new ProcessException(e);
-        }
-        session.transfer(flowFile, SUCCESS);
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.nifi;
+
+import org.apache.nifi.annotation.behavior.InputRequirement;
+import org.apache.nifi.annotation.behavior.WritesAttribute;
+import org.apache.nifi.annotation.behavior.WritesAttributes;
+import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.Tags;
+import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.processor.ProcessContext;
+import org.apache.nifi.processor.ProcessSession;
+import org.apache.nifi.processor.exception.ProcessException;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+
+@Tags({"plc4x-source"})
+@InputRequirement(InputRequirement.Requirement.INPUT_FORBIDDEN)
+@CapabilityDescription("Processor able to read data from industrial PLCs using Apache PLC4X")
+@WritesAttributes({@WritesAttribute(attribute="value", description="some value")})
+public class Plc4xSourceProcessor extends BasePlc4xProcessor {
+
+    @Override
+    public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
+        // Get an instance of a component able to read from a PLC.
+        PlcConnection connection = getConnection();
+
+        // Prepare the request.
+        if (!connection.getMetadata().canRead()) {
+            throw new ProcessException("Writing not supported by connection");
+        }
+
+        FlowFile flowFile = session.create();
+        try {
+            PlcReadRequest.Builder builder = connection.readRequestBuilder();
+            getFields().forEach(field -> {
+                String address = getAddress(field);
+                if(address != null) {
+                    builder.addItem(field, address);
+                }
+            });
+            PlcReadRequest readRequest = builder.build();
+            PlcReadResponse response = readRequest.execute().get();
+            Map attributes = new HashMap<String, String>();
+            for (String fieldName : response.getFieldNames()) {
+                for(int i = 0; i < response.getNumberOfValues(fieldName); i++) {
+                    Object value = response.getObject(fieldName, i);
+                    attributes.put(fieldName, String.valueOf(value));
+                }
+            }
+            flowFile = session.putAllAttributes(flowFile, attributes);
+        } catch (InterruptedException | ExecutionException e) {
+            throw new ProcessException(e);
+        }
+        session.transfer(flowFile, SUCCESS);
+    }
+
+}
diff --git a/plc4j/integrations/apache-nifi/nifi-plc4x-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor b/plc4j/integrations/apache-nifi/nifi-plc4x-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
index b614dd5ff47..c0914ad8dce 100644
--- a/plc4j/integrations/apache-nifi/nifi-plc4x-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
+++ b/plc4j/integrations/apache-nifi/nifi-plc4x-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
@@ -1,17 +1,17 @@
-# 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
-#
-#     http://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.
-
-org.apache.plc4x.nifi.Plc4xSinkProcessor
+# 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
+#
+#     http://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.
+
+org.apache.plc4x.nifi.Plc4xSinkProcessor
 org.apache.plc4x.nifi.Plc4xSourceProcessor
\ No newline at end of file
diff --git a/plc4j/integrations/apache-nifi/nifi-plc4x-processors/src/test/java/org/apache/plc4x/processors/plc4x4nifi/Plc4xSinkProcessorTest.java b/plc4j/integrations/apache-nifi/nifi-plc4x-processors/src/test/java/org/apache/plc4x/processors/plc4x4nifi/Plc4xSinkProcessorTest.java
index 25eecbcbca1..df80f05575b 100644
--- a/plc4j/integrations/apache-nifi/nifi-plc4x-processors/src/test/java/org/apache/plc4x/processors/plc4x4nifi/Plc4xSinkProcessorTest.java
+++ b/plc4j/integrations/apache-nifi/nifi-plc4x-processors/src/test/java/org/apache/plc4x/processors/plc4x4nifi/Plc4xSinkProcessorTest.java
@@ -1,40 +1,40 @@
-/*
- * 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.plc4x.processors.plc4x4nifi;
-
-import org.apache.nifi.util.TestRunner;
-import org.apache.nifi.util.TestRunners;
-import org.apache.plc4x.nifi.Plc4xSinkProcessor;
-import org.junit.Before;
-import org.junit.Test;
-
-
-public class Plc4xSinkProcessorTest {
-
-    private TestRunner testRunner;
-
-    @Before
-    public void init() {
-        testRunner = TestRunners.newTestRunner(Plc4xSinkProcessor.class);
-    }
-
-    @Test
-    public void testProcessor() {
-
-    }
-
-}
+/*
+ * 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.plc4x.processors.plc4x4nifi;
+
+import org.apache.nifi.util.TestRunner;
+import org.apache.nifi.util.TestRunners;
+import org.apache.plc4x.nifi.Plc4xSinkProcessor;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class Plc4xSinkProcessorTest {
+
+    private TestRunner testRunner;
+
+    @Before
+    public void init() {
+        testRunner = TestRunners.newTestRunner(Plc4xSinkProcessor.class);
+    }
+
+    @Test
+    public void testProcessor() {
+
+    }
+
+}
diff --git a/plc4j/integrations/apache-nifi/nifi-plc4x-processors/src/test/java/org/apache/plc4x/processors/plc4x4nifi/Plc4xSourceProcessorTest.java b/plc4j/integrations/apache-nifi/nifi-plc4x-processors/src/test/java/org/apache/plc4x/processors/plc4x4nifi/Plc4xSourceProcessorTest.java
index 06a7bdad2d4..53ca35b3d43 100644
--- a/plc4j/integrations/apache-nifi/nifi-plc4x-processors/src/test/java/org/apache/plc4x/processors/plc4x4nifi/Plc4xSourceProcessorTest.java
+++ b/plc4j/integrations/apache-nifi/nifi-plc4x-processors/src/test/java/org/apache/plc4x/processors/plc4x4nifi/Plc4xSourceProcessorTest.java
@@ -1,42 +1,42 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.processors.plc4x4nifi;
-
-import org.apache.nifi.util.TestRunner;
-import org.apache.nifi.util.TestRunners;
-import org.apache.plc4x.nifi.Plc4xSourceProcessor;
-import org.junit.Before;
-import org.junit.Test;
-
-
-public class Plc4xSourceProcessorTest {
-
-    private TestRunner testRunner;
-
-    @Before
-    public void init() {
-        testRunner = TestRunners.newTestRunner(Plc4xSourceProcessor.class);
-    }
-
-    @Test
-    public void testProcessor() {
-
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.processors.plc4x4nifi;
+
+import org.apache.nifi.util.TestRunner;
+import org.apache.nifi.util.TestRunners;
+import org.apache.plc4x.nifi.Plc4xSourceProcessor;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class Plc4xSourceProcessorTest {
+
+    private TestRunner testRunner;
+
+    @Before
+    public void init() {
+        testRunner = TestRunners.newTestRunner(Plc4xSourceProcessor.class);
+    }
+
+    @Test
+    public void testProcessor() {
+
+    }
+
+}
diff --git a/plc4j/integrations/apache-nifi/pom.xml b/plc4j/integrations/apache-nifi/pom.xml
index b5b233447bb..2670e673503 100644
--- a/plc4j/integrations/apache-nifi/pom.xml
+++ b/plc4j/integrations/apache-nifi/pom.xml
@@ -1,116 +1,116 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-  http://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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-integrations</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-apache-nifi</artifactId>
-  <packaging>pom</packaging>
-
-  <name>PLC4J: Integrations: Apache Nifi</name>
-  <description>Integration module for integrating PLC4X into Apache Nifi.</description>
-
-  <properties>
-    <nifi.version>1.9.2</nifi.version>
-  </properties>
-
-  <modules>
-    <module>nifi-plc4x-processors</module>
-    <module>nifi-plc4x-nar</module>
-  </modules>
-
-  <build>
-    <plugins>
-      <!-- Add the ability to create nar packages -->
-      <plugin>
-        <groupId>org.apache.nifi</groupId>
-        <artifactId>nifi-nar-maven-plugin</artifactId>
-        <version>1.2.0</version>
-        <extensions>true</extensions>
-      </plugin>
-      <!-- Makes buildRevision and buildBranch available to the NAR Plugin so they can be populated in the MANIFEST -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>buildnumber-maven-plugin</artifactId>
-        <inherited>true</inherited>
-        <executions>
-          <execution>
-            <phase>validate</phase>
-            <goals>
-              <goal>create</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <doCheck>false</doCheck>
-          <doUpdate>false</doUpdate>
-          <shortRevisionLength>7</shortRevisionLength>
-          <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
-          <revisionOnScmFailure />
-          <buildNumberPropertyName>buildRevision</buildNumberPropertyName>
-          <scmBranchPropertyName>buildBranch</scmBranchPropertyName>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>com.buschmais.jqassistant</groupId>
-        <artifactId>jqassistant-maven-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.nifi</groupId>
-        <artifactId>nifi</artifactId>
-        <version>${nifi.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.nifi</groupId>
-        <artifactId>nifi-api</artifactId>
-        <version>${nifi.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.nifi</groupId>
-        <artifactId>nifi-utils</artifactId>
-        <version>${nifi.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.nifi</groupId>
-        <artifactId>nifi-mock</artifactId>
-        <version>${nifi.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.nifi</groupId>
-        <artifactId>nifi-nar-bundles</artifactId>
-        <version>${nifi.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+  http://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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-integrations</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-apache-nifi</artifactId>
+  <packaging>pom</packaging>
+
+  <name>PLC4J: Integrations: Apache Nifi</name>
+  <description>Integration module for integrating PLC4X into Apache Nifi.</description>
+
+  <properties>
+    <nifi.version>1.9.2</nifi.version>
+  </properties>
+
+  <modules>
+    <module>nifi-plc4x-processors</module>
+    <module>nifi-plc4x-nar</module>
+  </modules>
+
+  <build>
+    <plugins>
+      <!-- Add the ability to create nar packages -->
+      <plugin>
+        <groupId>org.apache.nifi</groupId>
+        <artifactId>nifi-nar-maven-plugin</artifactId>
+        <version>1.2.0</version>
+        <extensions>true</extensions>
+      </plugin>
+      <!-- Makes buildRevision and buildBranch available to the NAR Plugin so they can be populated in the MANIFEST -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>buildnumber-maven-plugin</artifactId>
+        <inherited>true</inherited>
+        <executions>
+          <execution>
+            <phase>validate</phase>
+            <goals>
+              <goal>create</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <doCheck>false</doCheck>
+          <doUpdate>false</doUpdate>
+          <shortRevisionLength>7</shortRevisionLength>
+          <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
+          <revisionOnScmFailure />
+          <buildNumberPropertyName>buildRevision</buildNumberPropertyName>
+          <scmBranchPropertyName>buildBranch</scmBranchPropertyName>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>com.buschmais.jqassistant</groupId>
+        <artifactId>jqassistant-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.nifi</groupId>
+        <artifactId>nifi</artifactId>
+        <version>${nifi.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.nifi</groupId>
+        <artifactId>nifi-api</artifactId>
+        <version>${nifi.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.nifi</groupId>
+        <artifactId>nifi-utils</artifactId>
+        <version>${nifi.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.nifi</groupId>
+        <artifactId>nifi-mock</artifactId>
+        <version>${nifi.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.nifi</groupId>
+        <artifactId>nifi-nar-bundles</artifactId>
+        <version>${nifi.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+</project>
diff --git a/plc4j/integrations/logstash-plugin/README.md b/plc4j/integrations/logstash-plugin/README.md
index 2eed1ea9c2d..8605bdae753 100644
--- a/plc4j/integrations/logstash-plugin/README.md
+++ b/plc4j/integrations/logstash-plugin/README.md
@@ -1,70 +1,70 @@
-<!--
-
-  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
-
-      http://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.
-
--->
-
-# Logstash Java Plugin
-
-[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-filter-java_filter_example.svg)](https://travis-ci.org/logstash-plugins/logstash-filter-java_filter_example)
-
-This is a Java plugin for [Logstash](https://github.com/elastic/logstash).
-
-It is fully free and fully open source. The license is Apache 2.0, meaning you are free to use it however you want.
-
-The documentation for Logstash Java plugins is available [here](https://www.elastic.co/guide/en/logstash/6.7/contributing-java-plugin.html).
-
-Example input pipeline for logstash:
-```
-## logstash pipeline config - input
-input {
-	## use plc4x plugin (logstash-input-plc4x)
-	plc4x {
-		## define sources (opc-ua examples)
-		sources => {
-			source1 => "opcua:tcp://opcua-server:4840/"
-			source2 => "opcua:tcp://opcua-server1:4840/"
-		}
-		## define jobs
-		jobs => {
-			job1 => {
-				# pull rate in milliseconds
-				rate => 1000
-				# sources queried by job1
-				sources => ["source1"]
-				# defined queries [logstash_internal_fieldname => "IIoT query"]
-				queries =>  {
-					PreStage => "ns=2;i=3"
-					MidStage => "ns=2;i=4"
-					PostStage => "ns=2;i=5"
-					Motor => "ns=2;i=6"
-					ConvoyerBeltTimestamp => "ns=2;i=7"
-					RobotArmTimestamp => "ns=2;i=8"
-				}
-			}
-		}
-	}
-}
-```
-
-# Build the plugin:
-
-    ./mvnw clean package -P with-logstash
-
-# To install the plugin:
-1) Copy the build plugin *logstash-input-plc4x-0.6.0.gem* from your target/gem directory to the Logstash plugin directory *logstash/plugin*
-2) Follow installation instructions from Logstash documentation: https://www.elastic.co/guide/en/logstash/current/working-with-plugins.html
+<!--
+
+  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
+
+      http://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.
+
+-->
+
+# Logstash Java Plugin
+
+[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-filter-java_filter_example.svg)](https://travis-ci.org/logstash-plugins/logstash-filter-java_filter_example)
+
+This is a Java plugin for [Logstash](https://github.com/elastic/logstash).
+
+It is fully free and fully open source. The license is Apache 2.0, meaning you are free to use it however you want.
+
+The documentation for Logstash Java plugins is available [here](https://www.elastic.co/guide/en/logstash/6.7/contributing-java-plugin.html).
+
+Example input pipeline for logstash:
+```
+## logstash pipeline config - input
+input {
+	## use plc4x plugin (logstash-input-plc4x)
+	plc4x {
+		## define sources (opc-ua examples)
+		sources => {
+			source1 => "opcua:tcp://opcua-server:4840/"
+			source2 => "opcua:tcp://opcua-server1:4840/"
+		}
+		## define jobs
+		jobs => {
+			job1 => {
+				# pull rate in milliseconds
+				rate => 1000
+				# sources queried by job1
+				sources => ["source1"]
+				# defined queries [logstash_internal_fieldname => "IIoT query"]
+				queries =>  {
+					PreStage => "ns=2;i=3"
+					MidStage => "ns=2;i=4"
+					PostStage => "ns=2;i=5"
+					Motor => "ns=2;i=6"
+					ConvoyerBeltTimestamp => "ns=2;i=7"
+					RobotArmTimestamp => "ns=2;i=8"
+				}
+			}
+		}
+	}
+}
+```
+
+# Build the plugin:
+
+    ./mvnw clean package -P with-logstash
+
+# To install the plugin:
+1) Copy the build plugin *logstash-input-plc4x-0.6.0.gem* from your target/gem directory to the Logstash plugin directory *logstash/plugin*
+2) Follow installation instructions from Logstash documentation: https://www.elastic.co/guide/en/logstash/current/working-with-plugins.html
 3) Create pipeline file (see example pipeline above)
\ No newline at end of file
diff --git a/plc4j/integrations/logstash-plugin/pom.xml b/plc4j/integrations/logstash-plugin/pom.xml
index 3b95f6bae5f..744d5a189a4 100644
--- a/plc4j/integrations/logstash-plugin/pom.xml
+++ b/plc4j/integrations/logstash-plugin/pom.xml
@@ -1,276 +1,276 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-         xmlns="http://maven.apache.org/POM/4.0.0">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-integrations</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-logstash-plugin</artifactId>
-
-  <name>PLC4J: Integrations: Logstash plugin</name>
-  <description>Integration module for integrating PLC4X into Elastic Logstash.</description>
-
-  <properties>
-    <jruby.version>9.2.8.0</jruby.version>
-  </properties>
-
-  <build>
-    <plugins>
-      <!--
-        As ruby and gem seem to have problems with Maven SNAPSHOT versions,
-        calculate how the version would be without the "SNAPSHOT" prefix and
-        make this available in the property "current-full-version".
-      -->
-      <plugin>
-        <groupId>org.codehaus.gmaven</groupId>
-        <artifactId>groovy-maven-plugin</artifactId>
-        <version>2.1</version>
-        <executions>
-          <execution>
-            <id>provide-custom-properties</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>execute</goal>
-            </goals>
-            <configuration>
-              <source>
-                // Calculate some version related stuff
-                def currentVersion = project.version as String
-                def match = (currentVersion =~ /(\d+)\.(\d+)\.(\d+)(-SNAPSHOT)?/)
-                print "\nCurrent version:                  " + currentVersion
-                if(match.count >= 1) {
-                  def majorVersion = match[0][1] as Integer
-                  def minorVersion = match[0][2] as Integer
-                  def bugfixVersion = match[0][3] as Integer
-
-                  def currentFullVersion = majorVersion + "." + minorVersion + "." + bugfixVersion
-
-                  print "\nCurrent full version:             " + currentFullVersion + " (current-full-version)"
-                  project.properties['current-full-version'] = currentFullVersion
-                }
-                print "\n"
-              </source>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- Download and unpack JRuby -->
-      <plugin>
-        <groupId>com.googlecode.maven-download-plugin</groupId>
-        <artifactId>download-maven-plugin</artifactId>
-        <version>1.4.1</version>
-        <executions>
-          <execution>
-            <id>get-jruby</id>
-            <!-- Only execute this for the parent module -->
-            <inherited>false</inherited>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>wget</goal>
-            </goals>
-            <configuration>
-              <url>https://repo1.maven.org/maven2/org/jruby/jruby-dist/${jruby.version}/jruby-dist-${jruby.version}-bin.tar.gz</url>
-              <unpack>true</unpack>
-              <outputDirectory>${project.build.directory}/jruby</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- Prepare all the resources the gem build needs -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>generate-gem-resources</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>resources</goal>
-            </goals>
-            <configuration>
-              <resources>
-                <resource>
-                  <directory>src/gem</directory>
-                  <filtering>true</filtering>
-                  <targetPath>${project.build.directory}/gem</targetPath>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- Build a fat jar containing all dependencies -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <!-- Ignore the error ... this variable is calculated in the "validate" phase -->
-              <outputFile>${project.build.directory}/gem/vendor/jar-dependencies/org/apache/plc4x/logstash-input-plc4x/${current-full-version}/logstash-input-plc4x-${current-full-version}.jar</outputFile>
-              <!-- The output is just an intermediate file, so make sure it's not installed or deployed -->
-              <shadedArtifactAttached>false</shadedArtifactAttached>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- Execute the Gem build using JRuby -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>1.6.0</version>
-        <executions>
-          <execution>
-            <id>run-gem-build</id>
-            <phase>package</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>../jruby/jruby-${jruby.version}/bin/jruby</executable>
-              <arguments>
-                <argument>-S</argument>
-                <argument>../jruby/jruby-${jruby.version}/bin/gem</argument>
-                <argument>build</argument>
-                <argument>logstash-input-plc4x.gemspec</argument>
-              </arguments>
-              <workingDirectory>${project.build.directory}/gem</workingDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- Manually tell maven to add the gem artifact built by JRuby and Gem -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>3.0.0</version>
-        <executions>
-          <execution>
-            <id>attach-gem</id>
-            <phase>package</phase>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <!-- Ignore the error ... this variable is calculated in the "validate" phase -->
-                  <file>${project.build.directory}/gem/logstash-input-plc4x-${current-full-version}.gem</file>
-                  <type>gem</type>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <!--
-        We are referencing libraries that are not directly used, we have to tell the dependency
-        plugin that they are used and it shouldn't complain and break the build.
-      -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <usedDependencies combine.children="append">
-            <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
-            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
-          </usedDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-connection-pool</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-scraper</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-tools-logstash-core</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <classifier>${logstash.version}</classifier>
-    </dependency>
-
-    <!-- Include all drivers -->
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ads</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-ethernet-ip</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-modbus</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-opcua</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-s7</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-simulated</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-integrations</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-logstash-plugin</artifactId>
+
+  <name>PLC4J: Integrations: Logstash plugin</name>
+  <description>Integration module for integrating PLC4X into Elastic Logstash.</description>
+
+  <properties>
+    <jruby.version>9.2.8.0</jruby.version>
+  </properties>
+
+  <build>
+    <plugins>
+      <!--
+        As ruby and gem seem to have problems with Maven SNAPSHOT versions,
+        calculate how the version would be without the "SNAPSHOT" prefix and
+        make this available in the property "current-full-version".
+      -->
+      <plugin>
+        <groupId>org.codehaus.gmaven</groupId>
+        <artifactId>groovy-maven-plugin</artifactId>
+        <version>2.1</version>
+        <executions>
+          <execution>
+            <id>provide-custom-properties</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>execute</goal>
+            </goals>
+            <configuration>
+              <source>
+                // Calculate some version related stuff
+                def currentVersion = project.version as String
+                def match = (currentVersion =~ /(\d+)\.(\d+)\.(\d+)(-SNAPSHOT)?/)
+                print "\nCurrent version:                  " + currentVersion
+                if(match.count >= 1) {
+                  def majorVersion = match[0][1] as Integer
+                  def minorVersion = match[0][2] as Integer
+                  def bugfixVersion = match[0][3] as Integer
+
+                  def currentFullVersion = majorVersion + "." + minorVersion + "." + bugfixVersion
+
+                  print "\nCurrent full version:             " + currentFullVersion + " (current-full-version)"
+                  project.properties['current-full-version'] = currentFullVersion
+                }
+                print "\n"
+              </source>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- Download and unpack JRuby -->
+      <plugin>
+        <groupId>com.googlecode.maven-download-plugin</groupId>
+        <artifactId>download-maven-plugin</artifactId>
+        <version>1.4.1</version>
+        <executions>
+          <execution>
+            <id>get-jruby</id>
+            <!-- Only execute this for the parent module -->
+            <inherited>false</inherited>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>wget</goal>
+            </goals>
+            <configuration>
+              <url>https://repo1.maven.org/maven2/org/jruby/jruby-dist/${jruby.version}/jruby-dist-${jruby.version}-bin.tar.gz</url>
+              <unpack>true</unpack>
+              <outputDirectory>${project.build.directory}/jruby</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- Prepare all the resources the gem build needs -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>generate-gem-resources</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>resources</goal>
+            </goals>
+            <configuration>
+              <resources>
+                <resource>
+                  <directory>src/gem</directory>
+                  <filtering>true</filtering>
+                  <targetPath>${project.build.directory}/gem</targetPath>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- Build a fat jar containing all dependencies -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <!-- Ignore the error ... this variable is calculated in the "validate" phase -->
+              <outputFile>${project.build.directory}/gem/vendor/jar-dependencies/org/apache/plc4x/logstash-input-plc4x/${current-full-version}/logstash-input-plc4x-${current-full-version}.jar</outputFile>
+              <!-- The output is just an intermediate file, so make sure it's not installed or deployed -->
+              <shadedArtifactAttached>false</shadedArtifactAttached>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- Execute the Gem build using JRuby -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.6.0</version>
+        <executions>
+          <execution>
+            <id>run-gem-build</id>
+            <phase>package</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>../jruby/jruby-${jruby.version}/bin/jruby</executable>
+              <arguments>
+                <argument>-S</argument>
+                <argument>../jruby/jruby-${jruby.version}/bin/gem</argument>
+                <argument>build</argument>
+                <argument>logstash-input-plc4x.gemspec</argument>
+              </arguments>
+              <workingDirectory>${project.build.directory}/gem</workingDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- Manually tell maven to add the gem artifact built by JRuby and Gem -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>3.0.0</version>
+        <executions>
+          <execution>
+            <id>attach-gem</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <!-- Ignore the error ... this variable is calculated in the "validate" phase -->
+                  <file>${project.build.directory}/gem/logstash-input-plc4x-${current-full-version}.gem</file>
+                  <type>gem</type>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <!--
+        We are referencing libraries that are not directly used, we have to tell the dependency
+        plugin that they are used and it shouldn't complain and break the build.
+      -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <usedDependencies combine.children="append">
+            <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
+            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
+          </usedDependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-connection-pool</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-scraper</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-tools-logstash-core</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <classifier>${logstash.version}</classifier>
+    </dependency>
+
+    <!-- Include all drivers -->
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ads</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-ethernet-ip</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-modbus</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-opcua</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-s7</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-simulated</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/plc4j/integrations/logstash-plugin/src/gem/lib/logstash-input-plc4x_jars.rb b/plc4j/integrations/logstash-plugin/src/gem/lib/logstash-input-plc4x_jars.rb
index 7b532906439..5eddc21ea14 100644
--- a/plc4j/integrations/logstash-plugin/src/gem/lib/logstash-input-plc4x_jars.rb
+++ b/plc4j/integrations/logstash-plugin/src/gem/lib/logstash-input-plc4x_jars.rb
@@ -1,22 +1,22 @@
-# ----------------------------------------------------------------------------
-# 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
-#
-#    http://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.
-# ----------------------------------------------------------------------------
-
-require 'jar_dependencies'
-# TODO replace 0.6.0 with version
+# ----------------------------------------------------------------------------
+# 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
+#
+#    http://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.
+# ----------------------------------------------------------------------------
+
+require 'jar_dependencies'
+# TODO replace 0.6.0 with version
 require_jar('${project.groupId}', 'logstash-input-plc4x', '${current-full-version}')
\ No newline at end of file
diff --git a/plc4j/integrations/logstash-plugin/src/gem/lib/logstash/inputs/plc4x.rb b/plc4j/integrations/logstash-plugin/src/gem/lib/logstash/inputs/plc4x.rb
index 8787aee8f54..e9186f91f10 100644
--- a/plc4j/integrations/logstash-plugin/src/gem/lib/logstash/inputs/plc4x.rb
+++ b/plc4j/integrations/logstash-plugin/src/gem/lib/logstash/inputs/plc4x.rb
@@ -1,29 +1,29 @@
-# ----------------------------------------------------------------------------
-# 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
-#
-#    http://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.
-# ----------------------------------------------------------------------------
-
-require 'logstash/inputs/base'
-require 'logstash/namespace'
-require 'logstash-input-plc4x_jars'
-require 'java'
-
-class LogStash::Inputs::Plc4jLogstashPlugin < LogStash::Inputs::Base
-  config_name 'plc4x'
-
-  def self.javaClass() Java::org.apache.plc4x.logstash.Plc4x.java_class; end
-end
+# ----------------------------------------------------------------------------
+# 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
+#
+#    http://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.
+# ----------------------------------------------------------------------------
+
+require 'logstash/inputs/base'
+require 'logstash/namespace'
+require 'logstash-input-plc4x_jars'
+require 'java'
+
+class LogStash::Inputs::Plc4jLogstashPlugin < LogStash::Inputs::Base
+  config_name 'plc4x'
+
+  def self.javaClass() Java::org.apache.plc4x.logstash.Plc4x.java_class; end
+end
diff --git a/plc4j/integrations/logstash-plugin/src/gem/logstash-input-plc4x.gemspec b/plc4j/integrations/logstash-plugin/src/gem/logstash-input-plc4x.gemspec
index a16567ec592..3f446ae6d12 100644
--- a/plc4j/integrations/logstash-plugin/src/gem/logstash-input-plc4x.gemspec
+++ b/plc4j/integrations/logstash-plugin/src/gem/logstash-input-plc4x.gemspec
@@ -1,42 +1,42 @@
-# ----------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#    http://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.
-# ----------------------------------------------------------------------------
-
-Gem::Specification.new do |s|
-  s.name            = 'logstash-input-plc4x'
-  s.version         = '${current-full-version}'
-  s.licenses        = ['Apache-2.0']
-  s.summary         = '${project.name}'
-  s.description     = '${project.description}'
-  s.authors         = ['Apache Software Foundation']
-  s.email           = ['dev@plc4x.apache.org']
-  s.homepage        = 'http://plc4x.apache.org/index.html'
-  s.require_paths = ['lib', 'vendor/jar-dependencies']
-
-  # Files
-  s.files = Dir["lib/**/*","*.gemspec","*.md","CONTRIBUTORS","Gemfile","LICENSE","NOTICE.TXT", "vendor/jar-dependencies/**/*.jar", "vendor/jar-dependencies/**/*.rb", "VERSION", "docs/**/*"]
-
-  # Special flag to let us know this is actually a logstash plugin
-  s.metadata = { 'logstash_plugin' => 'true', 'logstash_group' => 'input', 'java_plugin' => 'true'}
-
-  # Gem dependencies
-
-  s.add_runtime_dependency 'logstash-core-plugin-api', '>= 1.60', '<= 2.99'
-  s.add_runtime_dependency 'jar-dependencies', '~> 0'
-  s.add_development_dependency 'logstash-devutils', '~> 0'
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    http://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.
+# ----------------------------------------------------------------------------
+
+Gem::Specification.new do |s|
+  s.name            = 'logstash-input-plc4x'
+  s.version         = '${current-full-version}'
+  s.licenses        = ['Apache-2.0']
+  s.summary         = '${project.name}'
+  s.description     = '${project.description}'
+  s.authors         = ['Apache Software Foundation']
+  s.email           = ['dev@plc4x.apache.org']
+  s.homepage        = 'http://plc4x.apache.org/index.html'
+  s.require_paths = ['lib', 'vendor/jar-dependencies']
+
+  # Files
+  s.files = Dir["lib/**/*","*.gemspec","*.md","CONTRIBUTORS","Gemfile","LICENSE","NOTICE.TXT", "vendor/jar-dependencies/**/*.jar", "vendor/jar-dependencies/**/*.rb", "VERSION", "docs/**/*"]
+
+  # Special flag to let us know this is actually a logstash plugin
+  s.metadata = { 'logstash_plugin' => 'true', 'logstash_group' => 'input', 'java_plugin' => 'true'}
+
+  # Gem dependencies
+
+  s.add_runtime_dependency 'logstash-core-plugin-api', '>= 1.60', '<= 2.99'
+  s.add_runtime_dependency 'jar-dependencies', '~> 0'
+  s.add_development_dependency 'logstash-devutils', '~> 0'
 end
\ No newline at end of file
diff --git a/plc4j/integrations/logstash-plugin/src/main/java/org/apache/plc4x/logstash/Plc4x.java b/plc4j/integrations/logstash-plugin/src/main/java/org/apache/plc4x/logstash/Plc4x.java
index 381ec4d75b8..d23acfd7a6f 100644
--- a/plc4j/integrations/logstash-plugin/src/main/java/org/apache/plc4x/logstash/Plc4x.java
+++ b/plc4j/integrations/logstash-plugin/src/main/java/org/apache/plc4x/logstash/Plc4x.java
@@ -1,170 +1,170 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.logstash;
-
-import co.elastic.logstash.api.*;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.scraper.config.triggeredscraper.JobConfigurationTriggeredImplBuilder;
-import org.apache.plc4x.java.scraper.config.triggeredscraper.ScraperConfigurationTriggeredImpl;
-import org.apache.plc4x.java.scraper.config.triggeredscraper.ScraperConfigurationTriggeredImplBuilder;
-import org.apache.plc4x.java.scraper.exception.ScraperException;
-import org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl;
-import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollector;
-import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollectorImpl;
-import org.apache.plc4x.java.utils.connectionpool.PooledPlcDriverManager;
-
-import java.util.*;
-import java.util.concurrent.CountDownLatch;
-import java.util.function.Consumer;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-// class name must match plugin name
-@LogstashPlugin(name="plc4x")
-public class Plc4x implements Input {
-    static Logger logger = Logger.getLogger(Plc4x.class.getName());
-
-    public static final PluginConfigSpec<Map<String, Object>> JOB_CONFIG =
-            PluginConfigSpec.hashSetting("jobs");
-
-    public static final PluginConfigSpec<Map<String, Object>> SOURCE_CONFIG =
-            PluginConfigSpec.hashSetting("sources");
-    private final Map<String, Object> sources;
-    private final Map<String, Object> jobs;
-
-    private String id;
-    private PlcDriverManager plcDriverManager;
-    private TriggerCollector triggerCollector;
-    private TriggeredScraperImpl scraper;
-
-    private final CountDownLatch done = new CountDownLatch(1);
-
-    // all plugins must provide a constructor that accepts id, Configuration, and Context
-    public Plc4x(String id, Configuration config, Context context) {
-        // constructors should validate configuration options
-        this.id = id;
-        jobs = config.get(JOB_CONFIG);
-        sources = config.get(SOURCE_CONFIG);
-    }
-
-    @Override
-    public void start(Consumer<Map<String, Object>> consumer) {
-
-        // The start method should push Map<String, Object> instances to the supplied QueueWriter
-        // instance. Those will be converted to Event instances later in the Logstash event
-        // processing pipeline.
-        //
-        // Inputs that operate on unbounded streams of data or that poll indefinitely for new
-        // events should loop indefinitely until they receive a stop request. Inputs that produce
-        // a finite sequence of events should loop until that sequence is exhausted or until they
-        // receive a stop request, whichever comes first.
-        // Establish a connection to the plc using the url provided as first argument
-        ScraperConfigurationTriggeredImplBuilder builder = new ScraperConfigurationTriggeredImplBuilder();
-
-        for (String sourceName : sources.keySet()) {
-            Object o = sources.get(sourceName);
-            if(o instanceof String) {
-                String source = (String)o;
-                builder.addSource(sourceName, source);
-            } else {
-                logger.severe("URL of source " + sourceName + "has the wrong typ!");
-            }
-        }
-
-        for (String jobName : jobs.keySet()) {
-            Object o = jobs.get(jobName);
-            if (o instanceof  Map) {
-                Map job = (Map<String, Object>) o;
-                JobConfigurationTriggeredImplBuilder jobBuilder = builder.job(
-                    jobName, String.format("(SCHEDULED,%s)", job.get("rate")));
-                for (String source : ((List<String>) job.get("sources"))) {
-                    jobBuilder.source(source);
-                }
-                Map<String, Object> queries = (Map<String, Object>) job.get("queries");
-                for (String queryName : queries.keySet()) {
-
-                    String fieldAlias = queryName;
-                    String fieldAddress = (String) queries.get(queryName);
-                    jobBuilder.field(fieldAlias, fieldAddress);
-                }
-                jobBuilder.build();
-            } else {
-                logger.severe("Jobs of wrong Type!");
-            }
-        }
-
-        ScraperConfigurationTriggeredImpl scraperConfig = builder.build();
-        try {
-            plcDriverManager = new PooledPlcDriverManager();
-            triggerCollector = new TriggerCollectorImpl(plcDriverManager);
-            scraper = new TriggeredScraperImpl(scraperConfig, (jobName, sourceName, results) -> {
-                HashMap<String, Object> resultMap = new HashMap<String, Object>();
-                resultMap.put("jobName", jobName);
-                resultMap.put("sourceName", sourceName);
-                resultMap.put("values", results);
-
-                if (logger.getLevel().equals(Level.FINEST)) {
-                    for (Map.Entry<String, Object> result : results.entrySet()) {
-                        // Get field-name and -value from the results.
-                        String fieldName = result.getKey();
-                        Object fieldValue = result.getValue();
-                        logger.finest("fieldName: " + fieldName);
-                        logger.finest("fieldValue: " + fieldValue);
-                    }
-                }
-                consumer.accept(resultMap);
-            }, triggerCollector);
-            scraper.start();
-            triggerCollector.start();
-        } catch (ScraperException e) {
-            logger.severe("Error starting the scraper: "+ e);
-        }
-        // TODO discuss with stefan and chris
-        while(scraper.isRunning()) {
-            try {
-                Thread.sleep(1000);
-                // or maybe just yield(); ?
-            } catch (InterruptedException e) {
-                logger.severe("Error thead sleep plc4x plugin: "+ e);
-            }
-        }
-    }
-
-    @Override
-    public void stop() {
-        triggerCollector.stop();
-        scraper.stop();
-    }
-
-    @Override
-    public void awaitStop() throws InterruptedException {
-       done.await(); // blocks until input has stopped
-    }
-
-    @Override
-    public Collection<PluginConfigSpec<?>> configSchema() {
-        // should return a list of all configuration options for this plugin
-        return Arrays.asList(JOB_CONFIG, SOURCE_CONFIG);
-    }
-
-    @Override
-    public String getId() {
-        return this.id;
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.logstash;
+
+import co.elastic.logstash.api.*;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.scraper.config.triggeredscraper.JobConfigurationTriggeredImplBuilder;
+import org.apache.plc4x.java.scraper.config.triggeredscraper.ScraperConfigurationTriggeredImpl;
+import org.apache.plc4x.java.scraper.config.triggeredscraper.ScraperConfigurationTriggeredImplBuilder;
+import org.apache.plc4x.java.scraper.exception.ScraperException;
+import org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl;
+import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollector;
+import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollectorImpl;
+import org.apache.plc4x.java.utils.connectionpool.PooledPlcDriverManager;
+
+import java.util.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.function.Consumer;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+// class name must match plugin name
+@LogstashPlugin(name="plc4x")
+public class Plc4x implements Input {
+    static Logger logger = Logger.getLogger(Plc4x.class.getName());
+
+    public static final PluginConfigSpec<Map<String, Object>> JOB_CONFIG =
+            PluginConfigSpec.hashSetting("jobs");
+
+    public static final PluginConfigSpec<Map<String, Object>> SOURCE_CONFIG =
+            PluginConfigSpec.hashSetting("sources");
+    private final Map<String, Object> sources;
+    private final Map<String, Object> jobs;
+
+    private String id;
+    private PlcDriverManager plcDriverManager;
+    private TriggerCollector triggerCollector;
+    private TriggeredScraperImpl scraper;
+
+    private final CountDownLatch done = new CountDownLatch(1);
+
+    // all plugins must provide a constructor that accepts id, Configuration, and Context
+    public Plc4x(String id, Configuration config, Context context) {
+        // constructors should validate configuration options
+        this.id = id;
+        jobs = config.get(JOB_CONFIG);
+        sources = config.get(SOURCE_CONFIG);
+    }
+
+    @Override
+    public void start(Consumer<Map<String, Object>> consumer) {
+
+        // The start method should push Map<String, Object> instances to the supplied QueueWriter
+        // instance. Those will be converted to Event instances later in the Logstash event
+        // processing pipeline.
+        //
+        // Inputs that operate on unbounded streams of data or that poll indefinitely for new
+        // events should loop indefinitely until they receive a stop request. Inputs that produce
+        // a finite sequence of events should loop until that sequence is exhausted or until they
+        // receive a stop request, whichever comes first.
+        // Establish a connection to the plc using the url provided as first argument
+        ScraperConfigurationTriggeredImplBuilder builder = new ScraperConfigurationTriggeredImplBuilder();
+
+        for (String sourceName : sources.keySet()) {
+            Object o = sources.get(sourceName);
+            if(o instanceof String) {
+                String source = (String)o;
+                builder.addSource(sourceName, source);
+            } else {
+                logger.severe("URL of source " + sourceName + "has the wrong typ!");
+            }
+        }
+
+        for (String jobName : jobs.keySet()) {
+            Object o = jobs.get(jobName);
+            if (o instanceof  Map) {
+                Map job = (Map<String, Object>) o;
+                JobConfigurationTriggeredImplBuilder jobBuilder = builder.job(
+                    jobName, String.format("(SCHEDULED,%s)", job.get("rate")));
+                for (String source : ((List<String>) job.get("sources"))) {
+                    jobBuilder.source(source);
+                }
+                Map<String, Object> queries = (Map<String, Object>) job.get("queries");
+                for (String queryName : queries.keySet()) {
+
+                    String fieldAlias = queryName;
+                    String fieldAddress = (String) queries.get(queryName);
+                    jobBuilder.field(fieldAlias, fieldAddress);
+                }
+                jobBuilder.build();
+            } else {
+                logger.severe("Jobs of wrong Type!");
+            }
+        }
+
+        ScraperConfigurationTriggeredImpl scraperConfig = builder.build();
+        try {
+            plcDriverManager = new PooledPlcDriverManager();
+            triggerCollector = new TriggerCollectorImpl(plcDriverManager);
+            scraper = new TriggeredScraperImpl(scraperConfig, (jobName, sourceName, results) -> {
+                HashMap<String, Object> resultMap = new HashMap<String, Object>();
+                resultMap.put("jobName", jobName);
+                resultMap.put("sourceName", sourceName);
+                resultMap.put("values", results);
+
+                if (logger.getLevel().equals(Level.FINEST)) {
+                    for (Map.Entry<String, Object> result : results.entrySet()) {
+                        // Get field-name and -value from the results.
+                        String fieldName = result.getKey();
+                        Object fieldValue = result.getValue();
+                        logger.finest("fieldName: " + fieldName);
+                        logger.finest("fieldValue: " + fieldValue);
+                    }
+                }
+                consumer.accept(resultMap);
+            }, triggerCollector);
+            scraper.start();
+            triggerCollector.start();
+        } catch (ScraperException e) {
+            logger.severe("Error starting the scraper: "+ e);
+        }
+        // TODO discuss with stefan and chris
+        while(scraper.isRunning()) {
+            try {
+                Thread.sleep(1000);
+                // or maybe just yield(); ?
+            } catch (InterruptedException e) {
+                logger.severe("Error thead sleep plc4x plugin: "+ e);
+            }
+        }
+    }
+
+    @Override
+    public void stop() {
+        triggerCollector.stop();
+        scraper.stop();
+    }
+
+    @Override
+    public void awaitStop() throws InterruptedException {
+       done.await(); // blocks until input has stopped
+    }
+
+    @Override
+    public Collection<PluginConfigSpec<?>> configSchema() {
+        // should return a list of all configuration options for this plugin
+        return Arrays.asList(JOB_CONFIG, SOURCE_CONFIG);
+    }
+
+    @Override
+    public String getId() {
+        return this.id;
+    }
+}
diff --git a/plc4j/integrations/logstash-plugin/src/test/java/org/apache/plc4x/logstash/Plc4xInputTest.java b/plc4j/integrations/logstash-plugin/src/test/java/org/apache/plc4x/logstash/Plc4xInputTest.java
index 4e92980b415..07966e7e5b2 100644
--- a/plc4j/integrations/logstash-plugin/src/test/java/org/apache/plc4x/logstash/Plc4xInputTest.java
+++ b/plc4j/integrations/logstash-plugin/src/test/java/org/apache/plc4x/logstash/Plc4xInputTest.java
@@ -1,75 +1,75 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.logstash;
-
-import co.elastic.logstash.api.Configuration;
-import org.assertj.core.util.Maps;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.logstash.plugins.ConfigurationImpl;
-
-import java.util.*;
-import java.util.function.Consumer;
-
-public class Plc4xInputTest {
-
-    @Test
-    @Disabled("This test only works with a running instance of the freeopcua server running on the same machine")
-    public void testPlc4xInput() {
-        Map<String, Object> configValues = new HashMap<>();
-        Map<String, Object> jobValues = new HashMap<>();
-
-        Map<String,Object> queries = new HashMap<>();
-        queries.put("testfield", "ns=2;i=4");
-        List<String> sources = Collections.singletonList("TestConnection");
-
-        jobValues.put("rate", 300);
-        jobValues.put("queries", queries);
-        jobValues.put("sources", sources);
-
-        configValues.put(Plc4x.SOURCE_CONFIG.name(), Maps.newHashMap("TestConnection", "opcua:tcp://localhost:4840/freeopcua/server/"));
-        configValues.put(Plc4x.JOB_CONFIG.name(),  Maps.newHashMap("job1", jobValues));
-
-
-        Configuration config = new ConfigurationImpl(configValues);
-        Plc4x input = new Plc4x("test-id", config, null);
-        TestConsumer testConsumer = new TestConsumer();
-        input.start(testConsumer);
-
-
-        List<Map<String, Object>> events = testConsumer.getEvents();
-        System.out.println("events size: " + events.size());
-    }
-
-    private static class TestConsumer implements Consumer<Map<String, Object>> {
-
-        private List<Map<String, Object>> events = new ArrayList<>();
-
-        @Override
-        public void accept(Map<String, Object> event) {
-            synchronized (this) {
-                events.add(event);
-            }
-        }
-
-        public List<Map<String, Object>> getEvents() {
-            return events;
-        }
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.logstash;
+
+import co.elastic.logstash.api.Configuration;
+import org.assertj.core.util.Maps;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.logstash.plugins.ConfigurationImpl;
+
+import java.util.*;
+import java.util.function.Consumer;
+
+public class Plc4xInputTest {
+
+    @Test
+    @Disabled("This test only works with a running instance of the freeopcua server running on the same machine")
+    public void testPlc4xInput() {
+        Map<String, Object> configValues = new HashMap<>();
+        Map<String, Object> jobValues = new HashMap<>();
+
+        Map<String,Object> queries = new HashMap<>();
+        queries.put("testfield", "ns=2;i=4");
+        List<String> sources = Collections.singletonList("TestConnection");
+
+        jobValues.put("rate", 300);
+        jobValues.put("queries", queries);
+        jobValues.put("sources", sources);
+
+        configValues.put(Plc4x.SOURCE_CONFIG.name(), Maps.newHashMap("TestConnection", "opcua:tcp://localhost:4840/freeopcua/server/"));
+        configValues.put(Plc4x.JOB_CONFIG.name(),  Maps.newHashMap("job1", jobValues));
+
+
+        Configuration config = new ConfigurationImpl(configValues);
+        Plc4x input = new Plc4x("test-id", config, null);
+        TestConsumer testConsumer = new TestConsumer();
+        input.start(testConsumer);
+
+
+        List<Map<String, Object>> events = testConsumer.getEvents();
+        System.out.println("events size: " + events.size());
+    }
+
+    private static class TestConsumer implements Consumer<Map<String, Object>> {
+
+        private List<Map<String, Object>> events = new ArrayList<>();
+
+        @Override
+        public void accept(Map<String, Object> event) {
+            synchronized (this) {
+                events.add(event);
+            }
+        }
+
+        public List<Map<String, Object>> getEvents() {
+            return events;
+        }
+    }
+}
diff --git a/plc4j/integrations/pom.xml b/plc4j/integrations/pom.xml
index 72a11e774ce..fb0d787e16d 100644
--- a/plc4j/integrations/pom.xml
+++ b/plc4j/integrations/pom.xml
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-integrations</artifactId>
-  <packaging>pom</packaging>
-
-  <name>PLC4J: Integrations</name>
-  <description>Parent of all product specific integration modules.</description>
-
-  <modules>
-    <module>apache-camel</module>
-    <module>apache-edgent</module>
-    <module>apache-kafka</module>
-    <module>apache-nifi</module>
-    <module>apache-calcite</module>
-  </modules>
-
-  <profiles>
-    <profile>
-      <id>with-logstash</id>
-      <modules>
-        <module>logstash-plugin</module>
-      </modules>
-    </profile>
-  </profiles>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-integrations</artifactId>
+  <packaging>pom</packaging>
+
+  <name>PLC4J: Integrations</name>
+  <description>Parent of all product specific integration modules.</description>
+
+  <modules>
+    <module>apache-camel</module>
+    <module>apache-edgent</module>
+    <module>apache-kafka</module>
+    <module>apache-nifi</module>
+    <module>apache-calcite</module>
+  </modules>
+
+  <profiles>
+    <profile>
+      <id>with-logstash</id>
+      <modules>
+        <module>logstash-plugin</module>
+      </modules>
+    </profile>
+  </profiles>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/karaf-features/README.md b/plc4j/karaf-features/README.md
index 818a09733fb..dbacfefb5d0 100644
--- a/plc4j/karaf-features/README.md
+++ b/plc4j/karaf-features/README.md
@@ -1,42 +1,42 @@
-<!--
-
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://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.
-
--->
-# This module provides Karaf features for plc4x
-
-As all plc4x modules are valid OSGi bundles, this module provides Karaf features for easier 
-deployment to Apache Karaf. 
-
-## Structure
-
-The module `driver-s7-featre` contains a `feature.xml` which defines a feature to load 
-the drivers bundles and all dependent bundles.
-The module `karaf-itest` contains an integration test to ensure that the features load correct in Karaf.
-
-## Testing
-
-In the Module `karaf-itest` are integration tests which verify the generated feature.
-But as they use the feature from the local maven repository the features have to be installed first.
-The Integration tests run in the verify phase, so you can e.g. use the comman
-```$mvn
-mvn clean install verify
-```
-in the `karaf-features` module. This will first install the `driver-s7-feature` feature in the 
-maven repo and then run the Integration test.
-
-The integration tests loads the feature and checks if the feature and the most important bundle 
+<!--
+
+  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
+
+      http://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.
+
+-->
+# This module provides Karaf features for plc4x
+
+As all plc4x modules are valid OSGi bundles, this module provides Karaf features for easier 
+deployment to Apache Karaf. 
+
+## Structure
+
+The module `driver-s7-featre` contains a `feature.xml` which defines a feature to load 
+the drivers bundles and all dependent bundles.
+The module `karaf-itest` contains an integration test to ensure that the features load correct in Karaf.
+
+## Testing
+
+In the Module `karaf-itest` are integration tests which verify the generated feature.
+But as they use the feature from the local maven repository the features have to be installed first.
+The Integration tests run in the verify phase, so you can e.g. use the comman
+```$mvn
+mvn clean install verify
+```
+in the `karaf-features` module. This will first install the `driver-s7-feature` feature in the 
+maven repo and then run the Integration test.
+
+The integration tests loads the feature and checks if the feature and the most important bundle 
 can be loaded. 
\ No newline at end of file
diff --git a/plc4j/karaf-features/karaf-itest/pom.xml b/plc4j/karaf-features/karaf-itest/pom.xml
index f2e38953eba..1647cac35b9 100644
--- a/plc4j/karaf-features/karaf-itest/pom.xml
+++ b/plc4j/karaf-features/karaf-itest/pom.xml
@@ -1,188 +1,188 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>karaf-features</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>karaf-itest</artifactId>
-
-  <name>PLC4J: Karaf-Features: Integration-Tests</name>
-
-  <properties>
-    <karaf.version>4.2.6</karaf.version>
-    <pax.version>4.13.1</pax.version>
-  </properties>
-
-  <dependencies>
-    <!-- Important, have a dependency on the feature maven module that its built first -->
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>driver-s7-feature</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <!-- Provide the KarafTestSupport -->
-    <dependency>
-      <groupId>org.apache.karaf.itests</groupId>
-      <artifactId>common</artifactId>
-      <version>${karaf.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <!-- Define the Apache Karaf version to download and use for the test -->
-    <!-- We use a released version here to avoid SNAPSHOT resolution -->
-    <dependency>
-      <groupId>org.apache.karaf</groupId>
-      <artifactId>apache-karaf</artifactId>
-      <version>${karaf.version}</version>
-      <scope>test</scope>
-      <type>tar.gz</type>
-    </dependency>
-
-    <!-- Add the surefire logger api as failsafe doesn't provide this -->
-    <dependency>
-      <groupId>org.apache.maven.surefire</groupId>
-      <artifactId>surefire-logger-api</artifactId>
-      <version>${surefire.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.7.26</version>
-      <scope>test</scope>
-    </dependency>
-    <!-- Required to use shell commands in the tests -->
-    <dependency>
-      <groupId>org.apache.karaf.shell</groupId>
-      <artifactId>org.apache.karaf.shell.core</artifactId>
-      <version>${karaf.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <!-- Provide the PaxExam Karaf support -->
-    <dependency>
-      <groupId>org.ops4j.pax.exam</groupId>
-      <artifactId>pax-exam-container-karaf</artifactId>
-      <version>${pax.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <!-- Provide the PaxExam JUnit extension -->
-    <dependency>
-      <groupId>org.ops4j.pax.exam</groupId>
-      <artifactId>pax-exam-junit4</artifactId>
-      <version>${pax.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-atinject_1.0_spec</artifactId>
-      <version>1.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.awaitility</groupId>
-      <artifactId>awaitility</artifactId>
-      <version>3.1.6</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.servicemix.bundles</groupId>
-      <artifactId>org.apache.servicemix.bundles.hamcrest</artifactId>
-      <version>1.3_1</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.servicemix.tooling</groupId>
-        <artifactId>depends-maven-plugin</artifactId>
-        <version>1.4.0</version>
-        <executions>
-          <execution>
-            <id>generate-depends-file</id>
-            <goals>
-              <goal>generate-depends-file</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- See https://issues.apache.org/jira/browse/KARAF-6457 -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <configuration>
-          <forkCount>1</forkCount>
-          <reuseForks>false</reuseForks>
-          <systemPropertyVariables>
-            <org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
-            <spring31.version>3.1.4.RELEASE</spring31.version>
-            <spring32.version>3.2.18.RELEASE_1</spring32.version>
-            <spring40.version>4.0.9.RELEASE_1</spring40.version>
-            <spring41.version>4.1.9.RELEASE_1</spring41.version>
-            <spring42.version>4.2.9.RELEASE_1</spring42.version>
-            <spring43.version>4.3.25.RELEASE_1</spring43.version>
-            <spring50.version>5.0.15.RELEASE_1</spring50.version>
-            <spring51.version>5.1.9.RELEASE_1</spring51.version>
-            <spring.security31.version>3.1.4.RELEASE</spring.security31.version>
-            <spring.security42.version>4.2.4.RELEASE_1</spring.security42.version>
-            <spring.security51.version>5.1.5.RELEASE_1</spring.security51.version>
-            <activemq.version>5.15.9</activemq.version>
-            <plc4x.version>${project.version}</plc4x.version>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <!-- Karaf currently doesn't work with Java 12 and above -->
-  <!-- See: https://issues.apache.org/jira/projects/KARAF/issues/KARAF-6203 -->
-  <profiles>
-    <profile>
-      <id>java12andAbove</id>
-      <activation>
-        <jdk>(12,]</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-failsafe-plugin</artifactId>
-            <configuration>
-              <skip>true</skip>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>karaf-features</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>karaf-itest</artifactId>
+
+  <name>PLC4J: Karaf-Features: Integration-Tests</name>
+
+  <properties>
+    <karaf.version>4.2.6</karaf.version>
+    <pax.version>4.13.1</pax.version>
+  </properties>
+
+  <dependencies>
+    <!-- Important, have a dependency on the feature maven module that its built first -->
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>driver-s7-feature</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <!-- Provide the KarafTestSupport -->
+    <dependency>
+      <groupId>org.apache.karaf.itests</groupId>
+      <artifactId>common</artifactId>
+      <version>${karaf.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <!-- Define the Apache Karaf version to download and use for the test -->
+    <!-- We use a released version here to avoid SNAPSHOT resolution -->
+    <dependency>
+      <groupId>org.apache.karaf</groupId>
+      <artifactId>apache-karaf</artifactId>
+      <version>${karaf.version}</version>
+      <scope>test</scope>
+      <type>tar.gz</type>
+    </dependency>
+
+    <!-- Add the surefire logger api as failsafe doesn't provide this -->
+    <dependency>
+      <groupId>org.apache.maven.surefire</groupId>
+      <artifactId>surefire-logger-api</artifactId>
+      <version>${surefire.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.7.26</version>
+      <scope>test</scope>
+    </dependency>
+    <!-- Required to use shell commands in the tests -->
+    <dependency>
+      <groupId>org.apache.karaf.shell</groupId>
+      <artifactId>org.apache.karaf.shell.core</artifactId>
+      <version>${karaf.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <!-- Provide the PaxExam Karaf support -->
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-container-karaf</artifactId>
+      <version>${pax.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <!-- Provide the PaxExam JUnit extension -->
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-junit4</artifactId>
+      <version>${pax.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-atinject_1.0_spec</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.awaitility</groupId>
+      <artifactId>awaitility</artifactId>
+      <version>3.1.6</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.hamcrest</artifactId>
+      <version>1.3_1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.servicemix.tooling</groupId>
+        <artifactId>depends-maven-plugin</artifactId>
+        <version>1.4.0</version>
+        <executions>
+          <execution>
+            <id>generate-depends-file</id>
+            <goals>
+              <goal>generate-depends-file</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- See https://issues.apache.org/jira/browse/KARAF-6457 -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <configuration>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
+          <systemPropertyVariables>
+            <org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
+            <spring31.version>3.1.4.RELEASE</spring31.version>
+            <spring32.version>3.2.18.RELEASE_1</spring32.version>
+            <spring40.version>4.0.9.RELEASE_1</spring40.version>
+            <spring41.version>4.1.9.RELEASE_1</spring41.version>
+            <spring42.version>4.2.9.RELEASE_1</spring42.version>
+            <spring43.version>4.3.25.RELEASE_1</spring43.version>
+            <spring50.version>5.0.15.RELEASE_1</spring50.version>
+            <spring51.version>5.1.9.RELEASE_1</spring51.version>
+            <spring.security31.version>3.1.4.RELEASE</spring.security31.version>
+            <spring.security42.version>4.2.4.RELEASE_1</spring.security42.version>
+            <spring.security51.version>5.1.5.RELEASE_1</spring.security51.version>
+            <activemq.version>5.15.9</activemq.version>
+            <plc4x.version>${project.version}</plc4x.version>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <!-- Karaf currently doesn't work with Java 12 and above -->
+  <!-- See: https://issues.apache.org/jira/projects/KARAF/issues/KARAF-6203 -->
+  <profiles>
+    <profile>
+      <id>java12andAbove</id>
+      <activation>
+        <jdk>(12,]</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <configuration>
+              <skip>true</skip>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/karaf-features/karaf-itest/src/test/java/org/apache/plc4x/karaf/FeatureIT.java b/plc4j/karaf-features/karaf-itest/src/test/java/org/apache/plc4x/karaf/FeatureIT.java
index 92d79a8473f..00e930571e7 100644
--- a/plc4j/karaf-features/karaf-itest/src/test/java/org/apache/plc4x/karaf/FeatureIT.java
+++ b/plc4j/karaf-features/karaf-itest/src/test/java/org/apache/plc4x/karaf/FeatureIT.java
@@ -1,100 +1,100 @@
-/*
- * Licensed 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
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.plc4x.karaf;
-
-import org.apache.karaf.itests.KarafTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.karaf.options.KarafDistributionOption;
-import org.ops4j.pax.exam.karaf.options.LogLevelOption;
-import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerMethod;
-import org.osgi.framework.Bundle;
-
-import java.util.stream.Stream;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.ops4j.pax.exam.CoreOptions.maven;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerMethod.class)
-public class FeatureIT extends KarafTestSupport {
-
-    @Configuration
-    public Option[] config() {
-        Option[] options = new Option[]{
-            logLevel(LogLevelOption.LogLevel.DEBUG),
-            KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "plc4x.version", System.getProperty("plc4x.version")),
-        };
-        return Stream.of(super.config(), options).flatMap(Stream::of).toArray(Option[]::new);
-    }
-
-    /**
-     * Checks:
-     * - the feature can be installed
-     * - the Driver Bundle is there and active
-     * - the Bundle contains the DS for PlcDriver
-     * - the feature is installed
-     */
-    @Test
-    public void installAndAssertFeature() throws Exception {
-        // Assemble Maven URL
-        final MavenArtifactUrlReference featureRepo = maven()
-            .groupId("org.apache.plc4x")
-            .artifactId("driver-s7-feature")
-            .version(System.getProperty("plc4x.version"))
-            .type("xml")
-            .classifier("features");
-        System.out.println("Installing feature repo " + featureRepo.getURL());
-
-        // Install the feature-repo
-        addFeaturesRepository(featureRepo.getURL());
-
-        // Install the feature
-        installAndAssertFeature("driver-s7-feature");
-
-        // Print Bundles and fetch result
-        String bundles = executeCommand("bundle:list -t 0");
-
-        // Find that line
-        // 84 ā”‚ Active ā”‚  80 ā”‚ 0.6.0.SNAPSHOT ā”‚ PLC4J: Driver: S7
-        assertContains("PLC4J: Driver: S7", bundles);
-        System.out.println(bundles);
-
-        // Find Bundle for more detailed check
-        final Bundle bundle = findBundleByName("org.apache.plc4x.plc4j-driver-s7");
-
-        // Bundle has to be ACTIVE
-        assertNotNull(bundle);
-        assertEquals(Bundle.ACTIVE, bundle.getState());
-
-        // Check declarative service is present
-        String services = executeCommand("services -p " + bundle.getBundleId());
-        System.out.println("Services: " + services);
-        assertContains("component.name = org.apache.plc4x.java.s7.S7PlcDriver", services);
-        assertContains("objectClass = [org.apache.plc4x.java.spi.PlcDriver]", services);
-
-        // Just for Debugging...
-        String features = executeCommand("feature:list -i");
-        System.out.print(features);
-        assertContains("driver-s7-feature", features);
-    }
-
+/*
+ * Licensed 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
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.plc4x.karaf;
+
+import org.apache.karaf.itests.KarafTestSupport;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.karaf.options.KarafDistributionOption;
+import org.ops4j.pax.exam.karaf.options.LogLevelOption;
+import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
+import org.osgi.framework.Bundle;
+
+import java.util.stream.Stream;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.ops4j.pax.exam.CoreOptions.maven;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerMethod.class)
+public class FeatureIT extends KarafTestSupport {
+
+    @Configuration
+    public Option[] config() {
+        Option[] options = new Option[]{
+            logLevel(LogLevelOption.LogLevel.DEBUG),
+            KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "plc4x.version", System.getProperty("plc4x.version")),
+        };
+        return Stream.of(super.config(), options).flatMap(Stream::of).toArray(Option[]::new);
+    }
+
+    /**
+     * Checks:
+     * - the feature can be installed
+     * - the Driver Bundle is there and active
+     * - the Bundle contains the DS for PlcDriver
+     * - the feature is installed
+     */
+    @Test
+    public void installAndAssertFeature() throws Exception {
+        // Assemble Maven URL
+        final MavenArtifactUrlReference featureRepo = maven()
+            .groupId("org.apache.plc4x")
+            .artifactId("driver-s7-feature")
+            .version(System.getProperty("plc4x.version"))
+            .type("xml")
+            .classifier("features");
+        System.out.println("Installing feature repo " + featureRepo.getURL());
+
+        // Install the feature-repo
+        addFeaturesRepository(featureRepo.getURL());
+
+        // Install the feature
+        installAndAssertFeature("driver-s7-feature");
+
+        // Print Bundles and fetch result
+        String bundles = executeCommand("bundle:list -t 0");
+
+        // Find that line
+        // 84 ā”‚ Active ā”‚  80 ā”‚ 0.6.0.SNAPSHOT ā”‚ PLC4J: Driver: S7
+        assertContains("PLC4J: Driver: S7", bundles);
+        System.out.println(bundles);
+
+        // Find Bundle for more detailed check
+        final Bundle bundle = findBundleByName("org.apache.plc4x.plc4j-driver-s7");
+
+        // Bundle has to be ACTIVE
+        assertNotNull(bundle);
+        assertEquals(Bundle.ACTIVE, bundle.getState());
+
+        // Check declarative service is present
+        String services = executeCommand("services -p " + bundle.getBundleId());
+        System.out.println("Services: " + services);
+        assertContains("component.name = org.apache.plc4x.java.s7.S7PlcDriver", services);
+        assertContains("objectClass = [org.apache.plc4x.java.spi.PlcDriver]", services);
+
+        // Just for Debugging...
+        String features = executeCommand("feature:list -i");
+        System.out.print(features);
+        assertContains("driver-s7-feature", features);
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/karaf-features/karaf-itest/src/test/resources/etc/org.ops4j.pax.logging.cfg b/plc4j/karaf-features/karaf-itest/src/test/resources/etc/org.ops4j.pax.logging.cfg
index 285e55f901e..dc007b139f0 100644
--- a/plc4j/karaf-features/karaf-itest/src/test/resources/etc/org.ops4j.pax.logging.cfg
+++ b/plc4j/karaf-features/karaf-itest/src/test/resources/etc/org.ops4j.pax.logging.cfg
@@ -1,71 +1,71 @@
-###############################################################################
-#
-#    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
-#
-#       http://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.
-#
-################################################################################
-
-# See https://issues.apache.org/jira/browse/KARAF-6456
-
-# Common pattern layout for appenders
-log4j2.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
-
-# Root logger
-log4j2.rootLogger.level = INFO
-# uncomment to use asynchronous loggers, which require mvn:com.lmax/disruptor/3.3.2 library
-#log4j2.rootLogger.type = asyncRoot
-#log4j2.rootLogger.includeLocation = false
-log4j2.rootLogger.appenderRefs = RollingFile, PaxOsgi, Console
-log4j2.rootLogger.appenderRef.RollingFile.ref = RollingFile
-log4j2.rootLogger.appenderRef.PaxOsgi.ref = PaxOsgi
-log4j2.rootLogger.appenderRef.Console.ref = Console
-log4j2.rootLogger.appenderRef.Console.filter.threshold.type = ThresholdFilter
-log4j2.rootLogger.appenderRef.Console.filter.threshold.level = ${karaf.log.console:-OFF}
-
-# Appenders configuration
-log4j2.appenders = console, rolling, osgi
-
-# CONSOLE appender not used by default
-log4j2.appender.console.type = Console
-log4j2.appender.console.name = Console
-log4j2.appender.console.layout.type = PatternLayout
-log4j2.appender.console.layout.pattern = ${log4j2.pattern}
-
-# File appender
-log4j2.appender.rolling.type = RollingRandomAccessFile
-log4j2.appender.rolling.name = RollingFile
-log4j2.appender.rolling.fileName = ${karaf.log}/karaf.log
-log4j2.appender.rolling.filePattern = ${karaf.log}/karaf.log.%i
-# uncomment to not force a disk flush
-#log4j2.appender.rolling.immediateFlush = false
-log4j2.appender.rolling.append = true
-log4j2.appender.rolling.layout.type = PatternLayout
-log4j2.appender.rolling.layout.pattern = ${log4j2.pattern}
-log4j2.appender.rolling.policies.type = Policies
-log4j2.appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
-log4j2.appender.rolling.policies.size.size = 16MB
-
-# OSGi appender
-log4j2.appender.osgi.type = PaxOsgi
-log4j2.appender.osgi.name = PaxOsgi
-log4j2.appender.osgi.filter = *
-
-# help with identification of maven-related problems with pax-url-aether
-#log4j2.logger.aether.name = shaded.org.eclipse.aether
-#log4j2.logger.aether.level = TRACE
-#log4j2.logger.http-headers.name = shaded.org.apache.http.headers
-#log4j2.logger.http-headers.level = DEBUG
-#log4j2.logger.maven.name = org.ops4j.pax.url.mvn
+###############################################################################
+#
+#    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
+#
+#       http://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.
+#
+################################################################################
+
+# See https://issues.apache.org/jira/browse/KARAF-6456
+
+# Common pattern layout for appenders
+log4j2.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
+
+# Root logger
+log4j2.rootLogger.level = INFO
+# uncomment to use asynchronous loggers, which require mvn:com.lmax/disruptor/3.3.2 library
+#log4j2.rootLogger.type = asyncRoot
+#log4j2.rootLogger.includeLocation = false
+log4j2.rootLogger.appenderRefs = RollingFile, PaxOsgi, Console
+log4j2.rootLogger.appenderRef.RollingFile.ref = RollingFile
+log4j2.rootLogger.appenderRef.PaxOsgi.ref = PaxOsgi
+log4j2.rootLogger.appenderRef.Console.ref = Console
+log4j2.rootLogger.appenderRef.Console.filter.threshold.type = ThresholdFilter
+log4j2.rootLogger.appenderRef.Console.filter.threshold.level = ${karaf.log.console:-OFF}
+
+# Appenders configuration
+log4j2.appenders = console, rolling, osgi
+
+# CONSOLE appender not used by default
+log4j2.appender.console.type = Console
+log4j2.appender.console.name = Console
+log4j2.appender.console.layout.type = PatternLayout
+log4j2.appender.console.layout.pattern = ${log4j2.pattern}
+
+# File appender
+log4j2.appender.rolling.type = RollingRandomAccessFile
+log4j2.appender.rolling.name = RollingFile
+log4j2.appender.rolling.fileName = ${karaf.log}/karaf.log
+log4j2.appender.rolling.filePattern = ${karaf.log}/karaf.log.%i
+# uncomment to not force a disk flush
+#log4j2.appender.rolling.immediateFlush = false
+log4j2.appender.rolling.append = true
+log4j2.appender.rolling.layout.type = PatternLayout
+log4j2.appender.rolling.layout.pattern = ${log4j2.pattern}
+log4j2.appender.rolling.policies.type = Policies
+log4j2.appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
+log4j2.appender.rolling.policies.size.size = 16MB
+
+# OSGi appender
+log4j2.appender.osgi.type = PaxOsgi
+log4j2.appender.osgi.name = PaxOsgi
+log4j2.appender.osgi.filter = *
+
+# help with identification of maven-related problems with pax-url-aether
+#log4j2.logger.aether.name = shaded.org.eclipse.aether
+#log4j2.logger.aether.level = TRACE
+#log4j2.logger.http-headers.name = shaded.org.apache.http.headers
+#log4j2.logger.http-headers.level = DEBUG
+#log4j2.logger.maven.name = org.ops4j.pax.url.mvn
 #log4j2.logger.maven.level = TRACE
\ No newline at end of file
diff --git a/plc4j/karaf-features/pom.xml b/plc4j/karaf-features/pom.xml
index 8e71be4f202..171b4bf0205 100644
--- a/plc4j/karaf-features/pom.xml
+++ b/plc4j/karaf-features/pom.xml
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>karaf-features</artifactId>
-  <packaging>pom</packaging>
-
-  <name>PLC4J: Karaf-Features</name>
-
-  <modules>
-    <module>s7</module>
-    <module>karaf-itest</module>
-  </modules>
-
-  <dependencies>
-    <!-- Forcefully exclude slf4j -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.glassfish.jaxb</groupId>
-        <artifactId>jaxb-runtime</artifactId>
-        <version>2.3.2</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.configadmin</artifactId>
-        <version>1.9.14</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.karaf.tooling</groupId>
-          <artifactId>karaf-maven-plugin</artifactId>
-          <version>4.2.7</version>
-          <extensions>true</extensions>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-
-    <plugins>
-      <!-- No checking needed here -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>karaf-features</artifactId>
+  <packaging>pom</packaging>
+
+  <name>PLC4J: Karaf-Features</name>
+
+  <modules>
+    <module>s7</module>
+    <module>karaf-itest</module>
+  </modules>
+
+  <dependencies>
+    <!-- Forcefully exclude slf4j -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.glassfish.jaxb</groupId>
+        <artifactId>jaxb-runtime</artifactId>
+        <version>2.3.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.configadmin</artifactId>
+        <version>1.9.14</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.karaf.tooling</groupId>
+          <artifactId>karaf-maven-plugin</artifactId>
+          <version>4.2.7</version>
+          <extensions>true</extensions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
+    <plugins>
+      <!-- No checking needed here -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/karaf-features/s7/pom.xml b/plc4j/karaf-features/s7/pom.xml
index 6a6cb73b5b8..68ccc936b65 100644
--- a/plc4j/karaf-features/s7/pom.xml
+++ b/plc4j/karaf-features/s7/pom.xml
@@ -1,102 +1,102 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>karaf-features</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>driver-s7-feature</artifactId>
-  <packaging>pom</packaging>
-
-  <name>PLC4J: Karaf-Features: S7</name>
-
-  <!-- This would be necessary with the kar goal which works not fine, yet -->
-  <!--  <dependencies>-->
-  <!--    <dependency>-->
-  <!--      <groupId>org.apache.plc4x</groupId>-->
-  <!--      <artifactId>plc4j-driver-s7</artifactId>-->
-  <!--      <version>${project.version}</version>-->
-  <!--      <exclusions>-->
-  <!--        <exclusion>-->
-  <!--          <groupId>org.slf4j</groupId>-->
-  <!--          <artifactId>slf4j-api</artifactId>-->
-  <!--        </exclusion>-->
-  <!--      </exclusions>-->
-  <!--    </dependency>-->
-  <!--  </dependencies>-->
-
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/feature</directory>
-        <filtering>true</filtering>
-        <targetPath>${project.build.directory}/feature</targetPath>
-      </resource>
-    </resources>
-
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>resources</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!--
-        The feature plugin doesn't correctly attach the generated feature file so it
-        wouldn't be signed and hashed during a release build. By manually-attaching it
-        we make sure it's processed correctly.
-      -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>3.0.0</version>
-        <executions>
-          <execution>
-            <id>attach-features</id>
-            <phase>package</phase>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>target/feature/feature.xml</file>
-                  <classifier>features</classifier>
-                  <type>xml</type>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>karaf-features</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>driver-s7-feature</artifactId>
+  <packaging>pom</packaging>
+
+  <name>PLC4J: Karaf-Features: S7</name>
+
+  <!-- This would be necessary with the kar goal which works not fine, yet -->
+  <!--  <dependencies>-->
+  <!--    <dependency>-->
+  <!--      <groupId>org.apache.plc4x</groupId>-->
+  <!--      <artifactId>plc4j-driver-s7</artifactId>-->
+  <!--      <version>${project.version}</version>-->
+  <!--      <exclusions>-->
+  <!--        <exclusion>-->
+  <!--          <groupId>org.slf4j</groupId>-->
+  <!--          <artifactId>slf4j-api</artifactId>-->
+  <!--        </exclusion>-->
+  <!--      </exclusions>-->
+  <!--    </dependency>-->
+  <!--  </dependencies>-->
+
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/feature</directory>
+        <filtering>true</filtering>
+        <targetPath>${project.build.directory}/feature</targetPath>
+      </resource>
+    </resources>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>resources</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!--
+        The feature plugin doesn't correctly attach the generated feature file so it
+        wouldn't be signed and hashed during a release build. By manually-attaching it
+        we make sure it's processed correctly.
+      -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>3.0.0</version>
+        <executions>
+          <execution>
+            <id>attach-features</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <file>target/feature/feature.xml</file>
+                  <classifier>features</classifier>
+                  <type>xml</type>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/karaf-features/s7/src/main/feature/feature.xml b/plc4j/karaf-features/s7/src/main/feature/feature.xml
index c5fc8a4233b..a21d80f2a7c 100644
--- a/plc4j/karaf-features/s7/src/main/feature/feature.xml
+++ b/plc4j/karaf-features/s7/src/main/feature/feature.xml
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="driver-s7-feature">
-  <feature name="driver-s7-feature" description="driver-s7-feature" version="0.6.0.SNAPSHOT">
-    <details>PLC4X is an effort to create a universal library for accessing industrial programmable logic controllers
-      using a variety of protocols using a uniform API.
-    </details>
-    <feature prerequisite="true">wrap</feature>
-    <feature>scr</feature>
-    <bundle>mvn:org.apache.plc4x/plc4j-driver-s7/${project.version}</bundle>
-    <bundle>mvn:org.apache.plc4x/plc4j-api/${project.version}</bundle>
-    <bundle>mvn:org.apache.plc4x/plc4j-protocol-iso-on-tcp/${project.version}</bundle>
-    <bundle>mvn:org.apache.plc4x/plc4j-protocol-iso-tp/${project.version}</bundle>
-    <bundle>mvn:org.apache.plc4x/plc4j-protocol-s7/${project.version}</bundle>
-    <bundle>mvn:org.apache.plc4x/plc4j-protocol-driver-base/${project.version}</bundle>
-    <bundle>mvn:org.apache.plc4x/plc4j-utils-driver-base-java/${project.version}</bundle>
-    <bundle>mvn:org.apache.plc4x/plc4j-protocol-driver-base-tcp/${project.version}</bundle>
-    <bundle>mvn:io.netty/netty-codec/4.1.39.Final</bundle>
-    <bundle>mvn:com.github.jinahya/bit-io/1.4.3</bundle>
-    <bundle>mvn:commons-codec/commons-codec/1.12</bundle>
-    <bundle>mvn:io.netty/netty-common/4.1.39.Final</bundle>
-    <bundle>mvn:io.netty/netty-transport/4.1.39.Final</bundle>
-    <bundle>mvn:io.netty/netty-resolver/4.1.39.Final</bundle>
-    <bundle>mvn:io.netty/netty-buffer/4.1.39.Final</bundle>
-    <bundle>mvn:org.apache.commons/commons-configuration2/2.6</bundle>
-    <bundle>mvn:org.apache.commons/commons-text/1.8</bundle>
-    <bundle>mvn:commons-logging/commons-logging/1.2</bundle>
-    <bundle>mvn:org.apache.commons/commons-lang3/3.7</bundle>
-    <bundle>mvn:commons-io/commons-io/2.6</bundle>
-  </feature>
-</features>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="driver-s7-feature">
+  <feature name="driver-s7-feature" description="driver-s7-feature" version="0.6.0.SNAPSHOT">
+    <details>PLC4X is an effort to create a universal library for accessing industrial programmable logic controllers
+      using a variety of protocols using a uniform API.
+    </details>
+    <feature prerequisite="true">wrap</feature>
+    <feature>scr</feature>
+    <bundle>mvn:org.apache.plc4x/plc4j-driver-s7/${project.version}</bundle>
+    <bundle>mvn:org.apache.plc4x/plc4j-api/${project.version}</bundle>
+    <bundle>mvn:org.apache.plc4x/plc4j-protocol-iso-on-tcp/${project.version}</bundle>
+    <bundle>mvn:org.apache.plc4x/plc4j-protocol-iso-tp/${project.version}</bundle>
+    <bundle>mvn:org.apache.plc4x/plc4j-protocol-s7/${project.version}</bundle>
+    <bundle>mvn:org.apache.plc4x/plc4j-protocol-driver-base/${project.version}</bundle>
+    <bundle>mvn:org.apache.plc4x/plc4j-utils-driver-base-java/${project.version}</bundle>
+    <bundle>mvn:org.apache.plc4x/plc4j-protocol-driver-base-tcp/${project.version}</bundle>
+    <bundle>mvn:io.netty/netty-codec/4.1.39.Final</bundle>
+    <bundle>mvn:com.github.jinahya/bit-io/1.4.3</bundle>
+    <bundle>mvn:commons-codec/commons-codec/1.12</bundle>
+    <bundle>mvn:io.netty/netty-common/4.1.39.Final</bundle>
+    <bundle>mvn:io.netty/netty-transport/4.1.39.Final</bundle>
+    <bundle>mvn:io.netty/netty-resolver/4.1.39.Final</bundle>
+    <bundle>mvn:io.netty/netty-buffer/4.1.39.Final</bundle>
+    <bundle>mvn:org.apache.commons/commons-configuration2/2.6</bundle>
+    <bundle>mvn:org.apache.commons/commons-text/1.8</bundle>
+    <bundle>mvn:commons-logging/commons-logging/1.2</bundle>
+    <bundle>mvn:org.apache.commons/commons-lang3/3.7</bundle>
+    <bundle>mvn:commons-io/commons-io/2.6</bundle>
+  </feature>
+</features>
diff --git a/plc4j/karaf-features/s7/src/test/java/org/apache/plc4x/karaf/FeatureTest.java b/plc4j/karaf-features/s7/src/test/java/org/apache/plc4x/karaf/FeatureTest.java
index eb74608be61..39fc1e3bd34 100644
--- a/plc4j/karaf-features/s7/src/test/java/org/apache/plc4x/karaf/FeatureTest.java
+++ b/plc4j/karaf-features/s7/src/test/java/org/apache/plc4x/karaf/FeatureTest.java
@@ -1,91 +1,91 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.karaf;
-
-import org.apache.plc4x.java.spi.PlcDriver;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
-import org.ops4j.pax.exam.options.MavenUrlReference;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.ops4j.pax.exam.spi.reactors.PerMethod;
-
-import javax.inject.Inject;
-
-import java.io.File;
-
-import static org.junit.Assert.assertNotNull;
-import static org.ops4j.pax.exam.CoreOptions.bundle;
-import static org.ops4j.pax.exam.CoreOptions.junitBundles;
-import static org.ops4j.pax.exam.CoreOptions.maven;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerMethod.class)
-public class FeatureTest {
-
-    @Inject
-    private PlcDriver plcDriver;
-
-    @Configuration
-    public Option[] config() {
-        MavenArtifactUrlReference karafUrl = maven()
-            .groupId("org.apache.karaf")
-            .artifactId("apache-karaf")
-            .version("3.0.0")
-            .type("tar.gz");
-        MavenUrlReference karafStandardRepo = maven()
-            .groupId("org.apache.karaf.features")
-            .artifactId("standard")
-            .classifier("features")
-            .version("4.2.1")
-            .type("xml")
-            .versionAsInProject();
-        return new Option[] {
-            // KarafDistributionOption.debugConfiguration("5005", true),
-            karafDistributionConfiguration()
-                .frameworkUrl(karafUrl)
-                .unpackDirectory(new File("target/exam"))
-                .useDeployFolder(false),
-            keepRuntimeFolder(),
-            features(karafStandardRepo , "scr"),
-            mavenBundle()
-                .groupId("org.ops4j.pax.exam.samples")
-                .artifactId("pax-exam-sample8-ds")
-                .version("4.2.1")
-                //.versionAsInProject()
-            .start(),
-        };
-    }
-
-    @Test
-    public void getHelloService() {
-        assertNotNull(plcDriver);
-        // assertEquals("Hello Pax!", helloService.getMessage());
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.karaf;
+
+import org.apache.plc4x.java.spi.PlcDriver;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
+import org.ops4j.pax.exam.options.MavenUrlReference;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
+
+import javax.inject.Inject;
+
+import java.io.File;
+
+import static org.junit.Assert.assertNotNull;
+import static org.ops4j.pax.exam.CoreOptions.bundle;
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
+import static org.ops4j.pax.exam.CoreOptions.maven;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerMethod.class)
+public class FeatureTest {
+
+    @Inject
+    private PlcDriver plcDriver;
+
+    @Configuration
+    public Option[] config() {
+        MavenArtifactUrlReference karafUrl = maven()
+            .groupId("org.apache.karaf")
+            .artifactId("apache-karaf")
+            .version("3.0.0")
+            .type("tar.gz");
+        MavenUrlReference karafStandardRepo = maven()
+            .groupId("org.apache.karaf.features")
+            .artifactId("standard")
+            .classifier("features")
+            .version("4.2.1")
+            .type("xml")
+            .versionAsInProject();
+        return new Option[] {
+            // KarafDistributionOption.debugConfiguration("5005", true),
+            karafDistributionConfiguration()
+                .frameworkUrl(karafUrl)
+                .unpackDirectory(new File("target/exam"))
+                .useDeployFolder(false),
+            keepRuntimeFolder(),
+            features(karafStandardRepo , "scr"),
+            mavenBundle()
+                .groupId("org.ops4j.pax.exam.samples")
+                .artifactId("pax-exam-sample8-ds")
+                .version("4.2.1")
+                //.versionAsInProject()
+            .start(),
+        };
+    }
+
+    @Test
+    public void getHelloService() {
+        assertNotNull(plcDriver);
+        // assertEquals("Hello Pax!", helloService.getMessage());
+    }
+
+}
diff --git a/plc4j/pom.xml b/plc4j/pom.xml
index 62f2f98442a..759ba23734e 100644
--- a/plc4j/pom.xml
+++ b/plc4j/pom.xml
@@ -1,346 +1,346 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4x-parent</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j</artifactId>
-  <packaging>pom</packaging>
-
-  <name>PLC4J</name>
-  <description>Implementation of the protocol adapters for usage as Java library.</description>
-
-  <modules>
-    <module>api</module>
-    <module>drivers</module>
-    <module>protocols</module>
-    <module>utils</module>
-
-    <module>examples</module>
-    <module>karaf-features</module>
-  </modules>
-
-  <build>
-    <plugins>
-
-      <!-- Compile any groovy code located in "src/test/groovy" -->
-      <plugin>
-        <groupId>org.codehaus.gmavenplus</groupId>
-        <artifactId>gmavenplus-plugin</artifactId>
-        <version>1.6.2</version>
-        <executions>
-          <execution>
-            <id>compile-groovy-tests</id>
-            <phase>test-compile</phase>
-            <goals>
-              <goal>addTestSources</goal>
-              <goal>compileTests</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!--
-        This plugin doesn't really do much, it makes sure the jacoco agent
-        is downloaded and that the path to this is saved in an environment
-        variable so we can access this later on in the build.
-      -->
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <executions>
-          <!--
-              Prepares the property pointing to the JaCoCo runtime agent which
-              is passed as VM argument when Maven the Surefire plugin is executed.
-          -->
-          <execution>
-            <id>pre-unit-test</id>
-            <phase>generate-test-sources</phase>
-            <goals>
-              <goal>prepare-agent</goal>
-            </goals>
-            <configuration>
-              <!--
-                  Sets the name of the property containing the settings
-                  for JaCoCo runtime agent.
-              -->
-              <propertyName>surefireArgLine</propertyName>
-            </configuration>
-          </execution>
-          <!--
-              Prepares the property pointing to the JaCoCo runtime agent which
-              is passed as VM argument when Maven the Failsafe plugin is executed.
-          -->
-          <execution>
-            <id>pre-integration-test</id>
-            <phase>pre-integration-test</phase>
-            <goals>
-              <goal>prepare-agent-integration</goal>
-            </goals>
-            <configuration>
-              <!--
-                  Sets the name of the property containing the settings
-                  for JaCoCo runtime agent.
-              -->
-              <propertyName>failsafeArgLine</propertyName>
-            </configuration>
-          </execution>
-          <!--
-              Check if the unit-test-coverage is at least a certain minimum.
-          -->
-          <execution>
-            <id>check-coverage</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-            <configuration>
-              <!-- TODO: Turn this on as soon as possible. -->
-              <haltOnFailure>false</haltOnFailure>
-              <rules>
-                <rule implementation="org.jacoco.maven.RuleConfiguration">
-                  <element>BUNDLE</element>
-                  <limits>
-                    <!-- Fail the build if the instruction level coverage is below 80%. -->
-                    <limit implementation="org.jacoco.report.check.Limit">
-                      <counter>INSTRUCTION</counter>
-                      <value>COVEREDRATIO</value>
-                      <minimum>0.50</minimum>
-                    </limit>
-                    <!-- Fail the build if there are classes without any coverage. -->
-                    <limit implementation="org.jacoco.report.check.Limit">
-                      <counter>CLASS</counter>
-                      <value>MISSEDCOUNT</value>
-                      <maximum>0</maximum>
-                    </limit>
-                  </limits>
-                </rule>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!--
-        Make the surefire execute all unit-tests
-      -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <!--
-            We have to slightly increase the heap-size or some tests will fail.
-            Notice the @ instead of the $ as prefix? That's late evaluation.
-          -->
-          <argLine>-Xmx256m @{surefireArgLine}</argLine>
-          <includes>
-            <include>**/*Test.java</include>
-            <include>**/*Tests.java</include>
-            <include>**/*Spec.java</include>
-          </includes>
-        </configuration>
-      </plugin>
-
-      <!--
-        Generate an OSGI compatible MANIFEST file.
-      -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>bundle-manifest</id>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>manifest</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-            <exportScr>true</exportScr>
-            <instructions>
-              <_include>-bnd.bnd</_include>
-              <_removeheaders>Bnd-LastModified,Built-By</_removeheaders>
-            </instructions>
-        </configuration>
-      </plugin>
-
-      <!--
-        Use the MANIFEST file generated by the maven-bundle-plugin.
-      -->
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-          </archive>
-        </configuration>
-      </plugin>
-
-      <!--
-        Make the failsafe execute all integration-tests
-      -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>integration-test</goal>
-              <goal>verify</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <!--
-                Notice the @ instead of the $ as prefix? That's late evaluation.
-          -->
-          <argLine>@{failsafeArgLine}</argLine>
-        </configuration>
-      </plugin>
-
-      <!--
-        Even if Maven transitively pulls in dependencies, relying on these can
-        quite often cause hard to find problems. So it's a good practice to make
-        sure everything directly required is also directly added as a dependency.
-        On the other side adding unused dependency only over-complicates the
-        the dependency graph, so the maven-dependency-plugin checks we depend on
-        what we need and only that and that runtime dependencies are correctly
-        imported with runtime scope.
-      -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>check-dependencies</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>analyze-only</goal>
-            </goals>
-            <configuration>
-              <failOnWarning>true</failOnWarning>
-              <ignoredDependencies>
-                <ignoredDependency>org.assertj:assertj-core</ignoredDependency>
-                <ignoredDependency>junit:junit</ignoredDependency>
-                <ignoredDependency>org.junit.jupiter:junit-jupiter-api</ignoredDependency>
-                <ignoredDependency>org.junit.jupiter:junit-jupiter-params</ignoredDependency>
-                <ignoredDependency>org.junit.jupiter:junit-jupiter-engine</ignoredDependency>
-                <ignoredDependency>org.junit.vintage:junit-vintage-engine</ignoredDependency>
-                <ignoredDependency>org.hamcrest:hamcrest-core</ignoredDependency>
-                <ignoredDependency>org.hamcrest:hamcrest-library</ignoredDependency>
-                <ignoredDependency>org.mockito:mockito-core</ignoredDependency>
-                <ignoredDependency>org.mockito:mockito-junit-jupiter</ignoredDependency>
-                <ignoredDependency>org.slf4j:slf4j-api</ignoredDependency>
-                <ignoredDependency>ch.qos.logback:logback-classic</ignoredDependency>
-                <ignoredDependency>org.codehaus.groovy:groovy-test-junit5</ignoredDependency>
-                <ignoredDependency>org.codehaus.groovy:groovy</ignoredDependency>
-                <ignoredDependency>com.athaydes:spock-reports</ignoredDependency>
-              </ignoredDependencies>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <!-- Dependencies common to all java modules -->
-  <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- JUnit 4 Support -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <!-- JUnit 5 Support -->
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-params</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-junit-jupiter</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.codehaus.groovy</groupId>
-      <artifactId>groovy-test-junit5</artifactId>
-      <version>2.5.3</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4x-parent</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j</artifactId>
+  <packaging>pom</packaging>
+
+  <name>PLC4J</name>
+  <description>Implementation of the protocol adapters for usage as Java library.</description>
+
+  <modules>
+    <module>api</module>
+    <module>drivers</module>
+    <module>protocols</module>
+    <module>utils</module>
+
+    <module>examples</module>
+    <module>karaf-features</module>
+  </modules>
+
+  <build>
+    <plugins>
+
+      <!-- Compile any groovy code located in "src/test/groovy" -->
+      <plugin>
+        <groupId>org.codehaus.gmavenplus</groupId>
+        <artifactId>gmavenplus-plugin</artifactId>
+        <version>1.6.2</version>
+        <executions>
+          <execution>
+            <id>compile-groovy-tests</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>addTestSources</goal>
+              <goal>compileTests</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!--
+        This plugin doesn't really do much, it makes sure the jacoco agent
+        is downloaded and that the path to this is saved in an environment
+        variable so we can access this later on in the build.
+      -->
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <executions>
+          <!--
+              Prepares the property pointing to the JaCoCo runtime agent which
+              is passed as VM argument when Maven the Surefire plugin is executed.
+          -->
+          <execution>
+            <id>pre-unit-test</id>
+            <phase>generate-test-sources</phase>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+            <configuration>
+              <!--
+                  Sets the name of the property containing the settings
+                  for JaCoCo runtime agent.
+              -->
+              <propertyName>surefireArgLine</propertyName>
+            </configuration>
+          </execution>
+          <!--
+              Prepares the property pointing to the JaCoCo runtime agent which
+              is passed as VM argument when Maven the Failsafe plugin is executed.
+          -->
+          <execution>
+            <id>pre-integration-test</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>prepare-agent-integration</goal>
+            </goals>
+            <configuration>
+              <!--
+                  Sets the name of the property containing the settings
+                  for JaCoCo runtime agent.
+              -->
+              <propertyName>failsafeArgLine</propertyName>
+            </configuration>
+          </execution>
+          <!--
+              Check if the unit-test-coverage is at least a certain minimum.
+          -->
+          <execution>
+            <id>check-coverage</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <configuration>
+              <!-- TODO: Turn this on as soon as possible. -->
+              <haltOnFailure>false</haltOnFailure>
+              <rules>
+                <rule implementation="org.jacoco.maven.RuleConfiguration">
+                  <element>BUNDLE</element>
+                  <limits>
+                    <!-- Fail the build if the instruction level coverage is below 80%. -->
+                    <limit implementation="org.jacoco.report.check.Limit">
+                      <counter>INSTRUCTION</counter>
+                      <value>COVEREDRATIO</value>
+                      <minimum>0.50</minimum>
+                    </limit>
+                    <!-- Fail the build if there are classes without any coverage. -->
+                    <limit implementation="org.jacoco.report.check.Limit">
+                      <counter>CLASS</counter>
+                      <value>MISSEDCOUNT</value>
+                      <maximum>0</maximum>
+                    </limit>
+                  </limits>
+                </rule>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!--
+        Make the surefire execute all unit-tests
+      -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <!--
+            We have to slightly increase the heap-size or some tests will fail.
+            Notice the @ instead of the $ as prefix? That's late evaluation.
+          -->
+          <argLine>-Xmx256m @{surefireArgLine}</argLine>
+          <includes>
+            <include>**/*Test.java</include>
+            <include>**/*Tests.java</include>
+            <include>**/*Spec.java</include>
+          </includes>
+        </configuration>
+      </plugin>
+
+      <!--
+        Generate an OSGI compatible MANIFEST file.
+      -->
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+            <exportScr>true</exportScr>
+            <instructions>
+              <_include>-bnd.bnd</_include>
+              <_removeheaders>Bnd-LastModified,Built-By</_removeheaders>
+            </instructions>
+        </configuration>
+      </plugin>
+
+      <!--
+        Use the MANIFEST file generated by the maven-bundle-plugin.
+      -->
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
+        </configuration>
+      </plugin>
+
+      <!--
+        Make the failsafe execute all integration-tests
+      -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <!--
+                Notice the @ instead of the $ as prefix? That's late evaluation.
+          -->
+          <argLine>@{failsafeArgLine}</argLine>
+        </configuration>
+      </plugin>
+
+      <!--
+        Even if Maven transitively pulls in dependencies, relying on these can
+        quite often cause hard to find problems. So it's a good practice to make
+        sure everything directly required is also directly added as a dependency.
+        On the other side adding unused dependency only over-complicates the
+        the dependency graph, so the maven-dependency-plugin checks we depend on
+        what we need and only that and that runtime dependencies are correctly
+        imported with runtime scope.
+      -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>check-dependencies</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>analyze-only</goal>
+            </goals>
+            <configuration>
+              <failOnWarning>true</failOnWarning>
+              <ignoredDependencies>
+                <ignoredDependency>org.assertj:assertj-core</ignoredDependency>
+                <ignoredDependency>junit:junit</ignoredDependency>
+                <ignoredDependency>org.junit.jupiter:junit-jupiter-api</ignoredDependency>
+                <ignoredDependency>org.junit.jupiter:junit-jupiter-params</ignoredDependency>
+                <ignoredDependency>org.junit.jupiter:junit-jupiter-engine</ignoredDependency>
+                <ignoredDependency>org.junit.vintage:junit-vintage-engine</ignoredDependency>
+                <ignoredDependency>org.hamcrest:hamcrest-core</ignoredDependency>
+                <ignoredDependency>org.hamcrest:hamcrest-library</ignoredDependency>
+                <ignoredDependency>org.mockito:mockito-core</ignoredDependency>
+                <ignoredDependency>org.mockito:mockito-junit-jupiter</ignoredDependency>
+                <ignoredDependency>org.slf4j:slf4j-api</ignoredDependency>
+                <ignoredDependency>ch.qos.logback:logback-classic</ignoredDependency>
+                <ignoredDependency>org.codehaus.groovy:groovy-test-junit5</ignoredDependency>
+                <ignoredDependency>org.codehaus.groovy:groovy</ignoredDependency>
+                <ignoredDependency>com.athaydes:spock-reports</ignoredDependency>
+              </ignoredDependencies>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <!-- Dependencies common to all java modules -->
+  <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <!-- JUnit 4 Support -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <!-- JUnit 5 Support -->
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy-test-junit5</artifactId>
+      <version>2.5.3</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/protocols/ads/LINKS.md b/plc4j/protocols/ads/LINKS.md
index 9b619c906ad..da1e016a36d 100644
--- a/plc4j/protocols/ads/LINKS.md
+++ b/plc4j/protocols/ads/LINKS.md
@@ -1,19 +1,19 @@
-<!--
-
-  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
-
-      http://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.
-
--->
-SPEC ADS: https://infosys.beckhoff.com/english.php?content=../content/1033/tcadsamsspec/html/tcadsamsspec_intro.htm
+<!--
+
+  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
+
+      http://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.
+
+-->
+SPEC ADS: https://infosys.beckhoff.com/english.php?content=../content/1033/tcadsamsspec/html/tcadsamsspec_intro.htm
diff --git a/plc4j/protocols/ads/pom.xml b/plc4j/protocols/ads/pom.xml
index 660f5ea1e4f..da159e36536 100644
--- a/plc4j/protocols/ads/pom.xml
+++ b/plc4j/protocols/ads/pom.xml
@@ -1,111 +1,111 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-protocols</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-protocol-ads</artifactId>
-  <name>PLC4J: Protocol: ADS</name>
-  <description>Implementation of a PLC4X driver able to speak with Beckhoff ADS devices using the ADS protocol.
-  </description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-buffer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-codec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-common</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-configuration2</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>com.github.snksoft</groupId>
-      <artifactId>crc</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <!-- Used to create a pcap dump file for wireshark. -->
-    <dependency>
-      <groupId>org.pcap4j</groupId>
-      <artifactId>pcap4j-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base-test</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.spockframework</groupId>
-      <artifactId>spock-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.athaydes</groupId>
-      <artifactId>spock-reports</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-protocols</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-protocol-ads</artifactId>
+  <name>PLC4J: Protocol: ADS</name>
+  <description>Implementation of a PLC4X driver able to speak with Beckhoff ADS devices using the ADS protocol.
+  </description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-common</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-configuration2</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.github.snksoft</groupId>
+      <artifactId>crc</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <!-- Used to create a pcap dump file for wireshark. -->
+    <dependency>
+      <groupId>org.pcap4j</groupId>
+      <artifactId>pcap4j-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base-test</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.athaydes</groupId>
+      <artifactId>spock-reports</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAbstractRequest.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAbstractRequest.java
index 97b2864d645..a445f017a47 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAbstractRequest.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAbstractRequest.java
@@ -1,40 +1,40 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands;
-
-import org.apache.plc4x.java.ads.api.generic.AmsHeader;
-import org.apache.plc4x.java.ads.api.generic.AmsPacket;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-import org.apache.plc4x.java.ads.api.generic.types.State;
-
-public abstract class AdsAbstractRequest extends AmsPacket {
-    protected AdsAbstractRequest(AmsHeader amsHeader) {
-        super(amsHeader);
-    }
-
-    protected AdsAbstractRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId) {
-        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, State.DEFAULT, invokeId);
-    }
-
-    protected AdsAbstractRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, State stateId, Invoke invokeId) {
-        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, stateId, invokeId);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands;
+
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.AmsPacket;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+import org.apache.plc4x.java.ads.api.generic.types.State;
+
+public abstract class AdsAbstractRequest extends AmsPacket {
+    protected AdsAbstractRequest(AmsHeader amsHeader) {
+        super(amsHeader);
+    }
+
+    protected AdsAbstractRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId) {
+        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, State.DEFAULT, invokeId);
+    }
+
+    protected AdsAbstractRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, State stateId, Invoke invokeId) {
+        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, stateId, invokeId);
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAbstractResponse.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAbstractResponse.java
index f1a930ae0aa..b9cacb2f64c 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAbstractResponse.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAbstractResponse.java
@@ -1,40 +1,40 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands;
-
-import org.apache.plc4x.java.ads.api.generic.AmsHeader;
-import org.apache.plc4x.java.ads.api.generic.AmsPacket;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-import org.apache.plc4x.java.ads.api.generic.types.State;
-
-public abstract class AdsAbstractResponse extends AmsPacket {
-    protected AdsAbstractResponse(AmsHeader amsHeader) {
-        super(amsHeader);
-    }
-
-    protected AdsAbstractResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId) {
-        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, State.DEFAULT_RESPONSE, invokeId);
-    }
-
-    protected AdsAbstractResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, State stateId, Invoke invokeId) {
-        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, stateId, invokeId);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands;
+
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.AmsPacket;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+import org.apache.plc4x.java.ads.api.generic.types.State;
+
+public abstract class AdsAbstractResponse extends AmsPacket {
+    protected AdsAbstractResponse(AmsHeader amsHeader) {
+        super(amsHeader);
+    }
+
+    protected AdsAbstractResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId) {
+        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, State.DEFAULT_RESPONSE, invokeId);
+    }
+
+    protected AdsAbstractResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, State stateId, Invoke invokeId) {
+        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, stateId, invokeId);
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAddDeviceNotificationRequest.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAddDeviceNotificationRequest.java
index 8b1d100ad44..f44ba5543e6 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAddDeviceNotificationRequest.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAddDeviceNotificationRequest.java
@@ -1,194 +1,194 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands;
-
-import org.apache.plc4x.java.ads.api.commands.types.*;
-import org.apache.plc4x.java.ads.api.generic.AdsData;
-import org.apache.plc4x.java.ads.api.generic.AmsHeader;
-import org.apache.plc4x.java.ads.api.generic.types.*;
-import org.apache.plc4x.java.ads.api.util.ByteValue;
-
-import static java.util.Objects.requireNonNull;
-
-/**
- * A notification is created in an ADS device.
- * <p>
- * Note: We recommend to announce not more then 550 notifications per device.
- * You can increase the payload by organizing the data in structures.
- */
-@AdsCommandType(Command.ADS_ADD_DEVICE_NOTIFICATION)
-public class AdsAddDeviceNotificationRequest extends AdsAbstractRequest {
-
-    /**
-     * 4 bytes	Index Group of the data, which should be sent per notification.
-     */
-    private final IndexGroup indexGroup;
-    /**
-     * 4 bytes	Index Offset of the data, which should be sent per notification.
-     */
-    private final IndexOffset indexOffset;
-    /**
-     * 4 bytes	Length of data in bytes, which should be sent per notification.
-     */
-    private final Length length;
-    /**
-     * 4 bytes	See description of the structure ADSTRANSMODE at the ADS-DLL.
-     */
-    private final TransmissionMode transmissionMode;
-    /**
-     * 4 bytes	At the latest after this time, the ADS Device Notification is called. The unit is 1ms.
-     */
-    private final MaxDelay maxDelay;
-    /**
-     * 4 bytes	The ADS server checks if the value changes in this time slice. The unit is 1ms
-     */
-    private final CycleTime cycleTime;
-    /**
-     * 16bytes	Must be set to 0
-     */
-    private final Reserved reserved;
-
-    private AdsAddDeviceNotificationRequest(AmsHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length, TransmissionMode transmissionMode, MaxDelay maxDelay, CycleTime cycleTime) {
-        super(amsHeader);
-        this.indexGroup = requireNonNull(indexGroup);
-        this.indexOffset = requireNonNull(indexOffset);
-        this.length = requireNonNull(length);
-        this.transmissionMode = requireNonNull(transmissionMode);
-        this.maxDelay = requireNonNull(maxDelay);
-        this.cycleTime = requireNonNull(cycleTime);
-        this.reserved = Reserved.INSTANCE;
-    }
-
-    private AdsAddDeviceNotificationRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, Length length, TransmissionMode transmissionMode, MaxDelay maxDelay, CycleTime cycleTime) {
-        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, State.DEFAULT, invokeId);
-        this.indexGroup = requireNonNull(indexGroup);
-        this.indexOffset = requireNonNull(indexOffset);
-        this.length = requireNonNull(length);
-        this.transmissionMode = requireNonNull(transmissionMode);
-        this.maxDelay = requireNonNull(maxDelay);
-        this.cycleTime = requireNonNull(cycleTime);
-        this.reserved = Reserved.INSTANCE;
-    }
-
-    @Override
-    public AdsData getAdsData() {
-        return buildADSData(indexGroup, indexOffset, length, transmissionMode, maxDelay, cycleTime, reserved);
-    }
-
-    public static AdsAddDeviceNotificationRequest of(AmsHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length, TransmissionMode transmissionMode, MaxDelay maxDelay, CycleTime cycleTime) {
-        return new AdsAddDeviceNotificationRequest(amsHeader, indexGroup, indexOffset, length, transmissionMode, maxDelay, cycleTime);
-    }
-
-    public static AdsAddDeviceNotificationRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, Length length, TransmissionMode transmissionMode, MaxDelay maxDelay, CycleTime cycleTime) {
-        return new AdsAddDeviceNotificationRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, length, transmissionMode, maxDelay, cycleTime);
-    }
-
-    public IndexGroup getIndexGroup() {
-        return indexGroup;
-    }
-
-    public IndexOffset getIndexOffset() {
-        return indexOffset;
-    }
-
-    public Length getLength() {
-        return length;
-    }
-
-    public TransmissionMode getTransmissionMode() {
-        return transmissionMode;
-    }
-
-    public MaxDelay getMaxDelay() {
-        return maxDelay;
-    }
-
-    public CycleTime getCycleTime() {
-        return cycleTime;
-    }
-
-    public Reserved getReserved() {
-        return reserved;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (!(o instanceof AdsAddDeviceNotificationRequest))
-            return false;
-        if (!super.equals(o))
-            return false;
-
-        AdsAddDeviceNotificationRequest that = (AdsAddDeviceNotificationRequest) o;
-
-        if (!indexGroup.equals(that.indexGroup))
-            return false;
-        if (!indexOffset.equals(that.indexOffset))
-            return false;
-        if (!length.equals(that.length))
-            return false;
-        if (!transmissionMode.equals(that.transmissionMode))
-            return false;
-        if (!maxDelay.equals(that.maxDelay))
-            return false;
-        if (!cycleTime.equals(that.cycleTime))
-            return false;
-
-        return reserved.equals(that.reserved);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = super.hashCode();
-        result = 31 * result + indexGroup.hashCode();
-        result = 31 * result + indexOffset.hashCode();
-        result = 31 * result + length.hashCode();
-        result = 31 * result + transmissionMode.hashCode();
-        result = 31 * result + maxDelay.hashCode();
-        result = 31 * result + cycleTime.hashCode();
-        result = 31 * result + reserved.hashCode();
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "AdsAddDeviceNotificationRequest{" +
-            "indexGroup=" + indexGroup +
-            ", indexOffset=" + indexOffset +
-            ", length=" + length +
-            ", transmissionMode=" + transmissionMode +
-            ", maxDelay=" + maxDelay +
-            ", cycleTime=" + cycleTime +
-            ", reserved=" + reserved +
-            "} " + super.toString();
-    }
-
-    public static class Reserved extends ByteValue {
-
-        public static final int NUM_BYTES = 16;
-
-        private static final Reserved INSTANCE = new Reserved();
-
-        private Reserved() {
-            super((byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00);
-            assertLength(NUM_BYTES);
-        }
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands;
+
+import org.apache.plc4x.java.ads.api.commands.types.*;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.*;
+import org.apache.plc4x.java.ads.api.util.ByteValue;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * A notification is created in an ADS device.
+ * <p>
+ * Note: We recommend to announce not more then 550 notifications per device.
+ * You can increase the payload by organizing the data in structures.
+ */
+@AdsCommandType(Command.ADS_ADD_DEVICE_NOTIFICATION)
+public class AdsAddDeviceNotificationRequest extends AdsAbstractRequest {
+
+    /**
+     * 4 bytes	Index Group of the data, which should be sent per notification.
+     */
+    private final IndexGroup indexGroup;
+    /**
+     * 4 bytes	Index Offset of the data, which should be sent per notification.
+     */
+    private final IndexOffset indexOffset;
+    /**
+     * 4 bytes	Length of data in bytes, which should be sent per notification.
+     */
+    private final Length length;
+    /**
+     * 4 bytes	See description of the structure ADSTRANSMODE at the ADS-DLL.
+     */
+    private final TransmissionMode transmissionMode;
+    /**
+     * 4 bytes	At the latest after this time, the ADS Device Notification is called. The unit is 1ms.
+     */
+    private final MaxDelay maxDelay;
+    /**
+     * 4 bytes	The ADS server checks if the value changes in this time slice. The unit is 1ms
+     */
+    private final CycleTime cycleTime;
+    /**
+     * 16bytes	Must be set to 0
+     */
+    private final Reserved reserved;
+
+    private AdsAddDeviceNotificationRequest(AmsHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length, TransmissionMode transmissionMode, MaxDelay maxDelay, CycleTime cycleTime) {
+        super(amsHeader);
+        this.indexGroup = requireNonNull(indexGroup);
+        this.indexOffset = requireNonNull(indexOffset);
+        this.length = requireNonNull(length);
+        this.transmissionMode = requireNonNull(transmissionMode);
+        this.maxDelay = requireNonNull(maxDelay);
+        this.cycleTime = requireNonNull(cycleTime);
+        this.reserved = Reserved.INSTANCE;
+    }
+
+    private AdsAddDeviceNotificationRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, Length length, TransmissionMode transmissionMode, MaxDelay maxDelay, CycleTime cycleTime) {
+        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, State.DEFAULT, invokeId);
+        this.indexGroup = requireNonNull(indexGroup);
+        this.indexOffset = requireNonNull(indexOffset);
+        this.length = requireNonNull(length);
+        this.transmissionMode = requireNonNull(transmissionMode);
+        this.maxDelay = requireNonNull(maxDelay);
+        this.cycleTime = requireNonNull(cycleTime);
+        this.reserved = Reserved.INSTANCE;
+    }
+
+    @Override
+    public AdsData getAdsData() {
+        return buildADSData(indexGroup, indexOffset, length, transmissionMode, maxDelay, cycleTime, reserved);
+    }
+
+    public static AdsAddDeviceNotificationRequest of(AmsHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length, TransmissionMode transmissionMode, MaxDelay maxDelay, CycleTime cycleTime) {
+        return new AdsAddDeviceNotificationRequest(amsHeader, indexGroup, indexOffset, length, transmissionMode, maxDelay, cycleTime);
+    }
+
+    public static AdsAddDeviceNotificationRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, Length length, TransmissionMode transmissionMode, MaxDelay maxDelay, CycleTime cycleTime) {
+        return new AdsAddDeviceNotificationRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, length, transmissionMode, maxDelay, cycleTime);
+    }
+
+    public IndexGroup getIndexGroup() {
+        return indexGroup;
+    }
+
+    public IndexOffset getIndexOffset() {
+        return indexOffset;
+    }
+
+    public Length getLength() {
+        return length;
+    }
+
+    public TransmissionMode getTransmissionMode() {
+        return transmissionMode;
+    }
+
+    public MaxDelay getMaxDelay() {
+        return maxDelay;
+    }
+
+    public CycleTime getCycleTime() {
+        return cycleTime;
+    }
+
+    public Reserved getReserved() {
+        return reserved;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof AdsAddDeviceNotificationRequest))
+            return false;
+        if (!super.equals(o))
+            return false;
+
+        AdsAddDeviceNotificationRequest that = (AdsAddDeviceNotificationRequest) o;
+
+        if (!indexGroup.equals(that.indexGroup))
+            return false;
+        if (!indexOffset.equals(that.indexOffset))
+            return false;
+        if (!length.equals(that.length))
+            return false;
+        if (!transmissionMode.equals(that.transmissionMode))
+            return false;
+        if (!maxDelay.equals(that.maxDelay))
+            return false;
+        if (!cycleTime.equals(that.cycleTime))
+            return false;
+
+        return reserved.equals(that.reserved);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + indexGroup.hashCode();
+        result = 31 * result + indexOffset.hashCode();
+        result = 31 * result + length.hashCode();
+        result = 31 * result + transmissionMode.hashCode();
+        result = 31 * result + maxDelay.hashCode();
+        result = 31 * result + cycleTime.hashCode();
+        result = 31 * result + reserved.hashCode();
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "AdsAddDeviceNotificationRequest{" +
+            "indexGroup=" + indexGroup +
+            ", indexOffset=" + indexOffset +
+            ", length=" + length +
+            ", transmissionMode=" + transmissionMode +
+            ", maxDelay=" + maxDelay +
+            ", cycleTime=" + cycleTime +
+            ", reserved=" + reserved +
+            "} " + super.toString();
+    }
+
+    public static class Reserved extends ByteValue {
+
+        public static final int NUM_BYTES = 16;
+
+        private static final Reserved INSTANCE = new Reserved();
+
+        private Reserved() {
+            super((byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00);
+            assertLength(NUM_BYTES);
+        }
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAddDeviceNotificationResponse.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAddDeviceNotificationResponse.java
index 51c0f9d0a42..f63fd67971b 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAddDeviceNotificationResponse.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAddDeviceNotificationResponse.java
@@ -1,113 +1,113 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands;
-
-import org.apache.plc4x.java.ads.api.commands.types.NotificationHandle;
-import org.apache.plc4x.java.ads.api.commands.types.Result;
-import org.apache.plc4x.java.ads.api.generic.AdsData;
-import org.apache.plc4x.java.ads.api.generic.AmsHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Command;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-
-import static java.util.Objects.requireNonNull;
-
-/**
- * A notification is created in an ADS device.
- */
-@AdsCommandType(Command.ADS_ADD_DEVICE_NOTIFICATION)
-public class AdsAddDeviceNotificationResponse extends AdsAbstractResponse {
-
-    /**
-     * 4 bytes	ADS error number
-     */
-    private final Result result;
-
-    /**
-     * 4 bytes	Handle of notification
-     */
-    private final NotificationHandle notificationHandle;
-
-    private AdsAddDeviceNotificationResponse(AmsHeader amsHeader, Result result, NotificationHandle notificationHandle) {
-        super(amsHeader);
-        this.result = requireNonNull(result);
-        this.notificationHandle = requireNonNull(notificationHandle);
-    }
-
-    private AdsAddDeviceNotificationResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, NotificationHandle notificationHandle) {
-        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
-        this.result = requireNonNull(result);
-        this.notificationHandle = requireNonNull(notificationHandle);
-    }
-
-    public static AdsAddDeviceNotificationResponse of(AmsHeader amsHeader, Result result, NotificationHandle notificationHandle) {
-        return new AdsAddDeviceNotificationResponse(amsHeader, result, notificationHandle);
-    }
-
-    public static AdsAddDeviceNotificationResponse of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, NotificationHandle notificationHandle) {
-        return new AdsAddDeviceNotificationResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result, notificationHandle);
-    }
-
-    public Result getResult() {
-        return result;
-    }
-
-    public NotificationHandle getNotificationHandle() {
-        return notificationHandle;
-    }
-
-    @Override
-    public AdsData getAdsData() {
-        return buildADSData(result, notificationHandle);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (!(o instanceof AdsAddDeviceNotificationResponse))
-            return false;
-        if (!super.equals(o))
-            return false;
-
-        AdsAddDeviceNotificationResponse that = (AdsAddDeviceNotificationResponse) o;
-
-        if (!result.equals(that.result))
-            return false;
-
-        return notificationHandle.equals(that.notificationHandle);
-    }
-
-    @Override
-    public int hashCode() {
-        int result1 = super.hashCode();
-        result1 = 31 * result1 + result.hashCode();
-        result1 = 31 * result1 + notificationHandle.hashCode();
-        return result1;
-    }
-
-    @Override
-    public String toString() {
-        return "AdsAddDeviceNotificationResponse{" +
-            "result=" + result +
-            ", notificationHandle=" + notificationHandle +
-            "} " + super.toString();
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands;
+
+import org.apache.plc4x.java.ads.api.commands.types.NotificationHandle;
+import org.apache.plc4x.java.ads.api.commands.types.Result;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Command;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * A notification is created in an ADS device.
+ */
+@AdsCommandType(Command.ADS_ADD_DEVICE_NOTIFICATION)
+public class AdsAddDeviceNotificationResponse extends AdsAbstractResponse {
+
+    /**
+     * 4 bytes	ADS error number
+     */
+    private final Result result;
+
+    /**
+     * 4 bytes	Handle of notification
+     */
+    private final NotificationHandle notificationHandle;
+
+    private AdsAddDeviceNotificationResponse(AmsHeader amsHeader, Result result, NotificationHandle notificationHandle) {
+        super(amsHeader);
+        this.result = requireNonNull(result);
+        this.notificationHandle = requireNonNull(notificationHandle);
+    }
+
+    private AdsAddDeviceNotificationResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, NotificationHandle notificationHandle) {
+        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
+        this.result = requireNonNull(result);
+        this.notificationHandle = requireNonNull(notificationHandle);
+    }
+
+    public static AdsAddDeviceNotificationResponse of(AmsHeader amsHeader, Result result, NotificationHandle notificationHandle) {
+        return new AdsAddDeviceNotificationResponse(amsHeader, result, notificationHandle);
+    }
+
+    public static AdsAddDeviceNotificationResponse of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, NotificationHandle notificationHandle) {
+        return new AdsAddDeviceNotificationResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result, notificationHandle);
+    }
+
+    public Result getResult() {
+        return result;
+    }
+
+    public NotificationHandle getNotificationHandle() {
+        return notificationHandle;
+    }
+
+    @Override
+    public AdsData getAdsData() {
+        return buildADSData(result, notificationHandle);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof AdsAddDeviceNotificationResponse))
+            return false;
+        if (!super.equals(o))
+            return false;
+
+        AdsAddDeviceNotificationResponse that = (AdsAddDeviceNotificationResponse) o;
+
+        if (!result.equals(that.result))
+            return false;
+
+        return notificationHandle.equals(that.notificationHandle);
+    }
+
+    @Override
+    public int hashCode() {
+        int result1 = super.hashCode();
+        result1 = 31 * result1 + result.hashCode();
+        result1 = 31 * result1 + notificationHandle.hashCode();
+        return result1;
+    }
+
+    @Override
+    public String toString() {
+        return "AdsAddDeviceNotificationResponse{" +
+            "result=" + result +
+            ", notificationHandle=" + notificationHandle +
+            "} " + super.toString();
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsCommandType.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsCommandType.java
index 746e6bea4d2..5c7d1d70a89 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsCommandType.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsCommandType.java
@@ -1,36 +1,36 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands;
-
-import org.apache.plc4x.java.ads.api.generic.types.Command;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotates a ADS command with the according command type flag.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-@SuppressWarnings("squid:S00107")
-public @interface AdsCommandType {
-    Command value();
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands;
+
+import org.apache.plc4x.java.ads.api.generic.types.Command;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotates a ADS command with the according command type flag.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@SuppressWarnings("squid:S00107")
+public @interface AdsCommandType {
+    Command value();
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeleteDeviceNotificationRequest.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeleteDeviceNotificationRequest.java
index 5ea71ac931c..4f40e1d3524 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeleteDeviceNotificationRequest.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeleteDeviceNotificationRequest.java
@@ -1,96 +1,96 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands;
-
-import org.apache.plc4x.java.ads.api.commands.types.NotificationHandle;
-import org.apache.plc4x.java.ads.api.generic.AdsData;
-import org.apache.plc4x.java.ads.api.generic.AmsHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Command;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-
-import static java.util.Objects.requireNonNull;
-
-/**
- * One before defined notification is deleted in an ADS device.
- */
-@AdsCommandType(Command.ADS_DELETE_DEVICE_NOTIFICATION)
-public class AdsDeleteDeviceNotificationRequest extends AdsAbstractRequest {
-
-    /**
-     * 4 bytes	Handle of notification
-     */
-    private final NotificationHandle notificationHandle;
-
-    private AdsDeleteDeviceNotificationRequest(AmsHeader amsHeader, NotificationHandle notificationHandle) {
-        super(amsHeader);
-        this.notificationHandle = requireNonNull(notificationHandle);
-    }
-
-    private AdsDeleteDeviceNotificationRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, NotificationHandle notificationHandle) {
-        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
-        this.notificationHandle = requireNonNull(notificationHandle);
-    }
-
-    public static AdsDeleteDeviceNotificationRequest of(AmsHeader amsHeader, NotificationHandle notificationHandle) {
-        return new AdsDeleteDeviceNotificationRequest(amsHeader, notificationHandle);
-    }
-
-    public static AdsDeleteDeviceNotificationRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, NotificationHandle notificationHandle) {
-        return new AdsDeleteDeviceNotificationRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, notificationHandle);
-    }
-
-    public NotificationHandle getNotificationHandle() {
-        return notificationHandle;
-    }
-
-    @Override
-    public AdsData getAdsData() {
-        return buildADSData(notificationHandle);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (!(o instanceof AdsDeleteDeviceNotificationRequest))
-            return false;
-        if (!super.equals(o))
-            return false;
-
-        AdsDeleteDeviceNotificationRequest that = (AdsDeleteDeviceNotificationRequest) o;
-
-        return notificationHandle.equals(that.notificationHandle);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = super.hashCode();
-        result = 31 * result + notificationHandle.hashCode();
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "AdsDeleteDeviceNotificationRequest{" +
-            "notificationHandle=" + notificationHandle +
-            "} " + super.toString();
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands;
+
+import org.apache.plc4x.java.ads.api.commands.types.NotificationHandle;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Command;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * One before defined notification is deleted in an ADS device.
+ */
+@AdsCommandType(Command.ADS_DELETE_DEVICE_NOTIFICATION)
+public class AdsDeleteDeviceNotificationRequest extends AdsAbstractRequest {
+
+    /**
+     * 4 bytes	Handle of notification
+     */
+    private final NotificationHandle notificationHandle;
+
+    private AdsDeleteDeviceNotificationRequest(AmsHeader amsHeader, NotificationHandle notificationHandle) {
+        super(amsHeader);
+        this.notificationHandle = requireNonNull(notificationHandle);
+    }
+
+    private AdsDeleteDeviceNotificationRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, NotificationHandle notificationHandle) {
+        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
+        this.notificationHandle = requireNonNull(notificationHandle);
+    }
+
+    public static AdsDeleteDeviceNotificationRequest of(AmsHeader amsHeader, NotificationHandle notificationHandle) {
+        return new AdsDeleteDeviceNotificationRequest(amsHeader, notificationHandle);
+    }
+
+    public static AdsDeleteDeviceNotificationRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, NotificationHandle notificationHandle) {
+        return new AdsDeleteDeviceNotificationRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, notificationHandle);
+    }
+
+    public NotificationHandle getNotificationHandle() {
+        return notificationHandle;
+    }
+
+    @Override
+    public AdsData getAdsData() {
+        return buildADSData(notificationHandle);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof AdsDeleteDeviceNotificationRequest))
+            return false;
+        if (!super.equals(o))
+            return false;
+
+        AdsDeleteDeviceNotificationRequest that = (AdsDeleteDeviceNotificationRequest) o;
+
+        return notificationHandle.equals(that.notificationHandle);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + notificationHandle.hashCode();
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "AdsDeleteDeviceNotificationRequest{" +
+            "notificationHandle=" + notificationHandle +
+            "} " + super.toString();
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeleteDeviceNotificationResponse.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeleteDeviceNotificationResponse.java
index 417b9c79eea..accd9588e3c 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeleteDeviceNotificationResponse.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeleteDeviceNotificationResponse.java
@@ -1,96 +1,96 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands;
-
-import org.apache.plc4x.java.ads.api.commands.types.Result;
-import org.apache.plc4x.java.ads.api.generic.AdsData;
-import org.apache.plc4x.java.ads.api.generic.AmsHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Command;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-
-import static java.util.Objects.requireNonNull;
-
-/**
- * One before defined notification is deleted in an ADS device.
- */
-@AdsCommandType(Command.ADS_DELETE_DEVICE_NOTIFICATION)
-public class AdsDeleteDeviceNotificationResponse extends AdsAbstractResponse {
-
-    /**
-     * 4 bytes	ADS error number
-     */
-    private final Result result;
-
-    private AdsDeleteDeviceNotificationResponse(AmsHeader amsHeader, Result result) {
-        super(amsHeader);
-        this.result = requireNonNull(result);
-    }
-
-    private AdsDeleteDeviceNotificationResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result) {
-        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
-        this.result = requireNonNull(result);
-    }
-
-    public static AdsDeleteDeviceNotificationResponse of(AmsHeader amsHeader, Result result) {
-        return new AdsDeleteDeviceNotificationResponse(amsHeader, result);
-    }
-
-    public static AdsDeleteDeviceNotificationResponse of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result) {
-        return new AdsDeleteDeviceNotificationResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result);
-    }
-
-    public Result getResult() {
-        return result;
-    }
-
-    @Override
-    public AdsData getAdsData() {
-        return buildADSData(result);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (!(o instanceof AdsDeleteDeviceNotificationResponse))
-            return false;
-        if (!super.equals(o))
-            return false;
-
-        AdsDeleteDeviceNotificationResponse that = (AdsDeleteDeviceNotificationResponse) o;
-
-        return result.equals(that.result);
-    }
-
-    @Override
-    public int hashCode() {
-        int result1 = super.hashCode();
-        result1 = 31 * result1 + result.hashCode();
-        return result1;
-    }
-
-    @Override
-    public String toString() {
-        return "AdsDeleteDeviceNotificationResponse{" +
-            "result=" + result +
-            "} " + super.toString();
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands;
+
+import org.apache.plc4x.java.ads.api.commands.types.Result;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Command;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * One before defined notification is deleted in an ADS device.
+ */
+@AdsCommandType(Command.ADS_DELETE_DEVICE_NOTIFICATION)
+public class AdsDeleteDeviceNotificationResponse extends AdsAbstractResponse {
+
+    /**
+     * 4 bytes	ADS error number
+     */
+    private final Result result;
+
+    private AdsDeleteDeviceNotificationResponse(AmsHeader amsHeader, Result result) {
+        super(amsHeader);
+        this.result = requireNonNull(result);
+    }
+
+    private AdsDeleteDeviceNotificationResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result) {
+        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
+        this.result = requireNonNull(result);
+    }
+
+    public static AdsDeleteDeviceNotificationResponse of(AmsHeader amsHeader, Result result) {
+        return new AdsDeleteDeviceNotificationResponse(amsHeader, result);
+    }
+
+    public static AdsDeleteDeviceNotificationResponse of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result) {
+        return new AdsDeleteDeviceNotificationResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result);
+    }
+
+    public Result getResult() {
+        return result;
+    }
+
+    @Override
+    public AdsData getAdsData() {
+        return buildADSData(result);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof AdsDeleteDeviceNotificationResponse))
+            return false;
+        if (!super.equals(o))
+            return false;
+
+        AdsDeleteDeviceNotificationResponse that = (AdsDeleteDeviceNotificationResponse) o;
+
+        return result.equals(that.result);
+    }
+
+    @Override
+    public int hashCode() {
+        int result1 = super.hashCode();
+        result1 = 31 * result1 + result.hashCode();
+        return result1;
+    }
+
+    @Override
+    public String toString() {
+        return "AdsDeleteDeviceNotificationResponse{" +
+            "result=" + result +
+            "} " + super.toString();
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeviceNotificationRequest.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeviceNotificationRequest.java
index e502777804d..d952cec54f2 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeviceNotificationRequest.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeviceNotificationRequest.java
@@ -1,147 +1,147 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands;
-
-import org.apache.plc4x.java.ads.api.commands.types.AdsStampHeader;
-import org.apache.plc4x.java.ads.api.commands.types.Length;
-import org.apache.plc4x.java.ads.api.commands.types.Stamps;
-import org.apache.plc4x.java.ads.api.generic.AdsData;
-import org.apache.plc4x.java.ads.api.generic.AmsHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Command;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-import org.apache.plc4x.java.ads.api.util.ByteReadable;
-import org.apache.plc4x.java.ads.api.util.LengthSupplier;
-
-import java.util.List;
-
-import static java.util.Objects.requireNonNull;
-
-/**
- * Data will carry forward independently from an ADS device to a Client
- * <p>
- * The data which are transfered at the Device Notification  are multiple nested into one another. The Notification Stream contains an array with elements of type AdsStampHeader. This array again contains elements of type AdsNotificationSample.
- */
-@AdsCommandType(Command.ADS_DEVICE_NOTIFICATION)
-public class AdsDeviceNotificationRequest extends AdsAbstractRequest {
-
-    /**
-     * 4 bytes	Size of data in byte.
-     */
-    private final Length length;
-    /**
-     * 4 bytes	Number of elements of type AdsStampHeader.
-     */
-    private final Stamps stamps;
-    /**
-     * n bytes	Array with elements of type AdsStampHeader.
-     */
-    private final List<AdsStampHeader> adsStampHeaders;
-
-    private final transient LengthSupplier lengthSupplier;
-
-    private AdsDeviceNotificationRequest(AmsHeader amsHeader, Length length, Stamps stamps, List<AdsStampHeader> adsStampHeaders) {
-        super(amsHeader);
-        this.length = requireNonNull(length);
-        this.stamps = requireNonNull(stamps);
-        this.adsStampHeaders = requireNonNull(adsStampHeaders);
-        lengthSupplier = null;
-    }
-
-    private AdsDeviceNotificationRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Stamps stamps, List<AdsStampHeader> adsStampHeaders) {
-        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
-        this.length = null;
-        this.stamps = requireNonNull(stamps);
-        this.adsStampHeaders = requireNonNull(adsStampHeaders);
-        this.lengthSupplier = () -> {
-            long aggregateLength = 0;
-            for (LengthSupplier supplier : adsStampHeaders) {
-                aggregateLength += supplier.getCalculatedLength();
-            }
-            return aggregateLength + Stamps.NUM_BYTES;
-        };
-    }
-
-    public static AdsDeviceNotificationRequest of(AmsHeader amsHeader, Length length, Stamps stamps, List<AdsStampHeader> adsStampHeaders) {
-        return new AdsDeviceNotificationRequest(amsHeader, length, stamps, adsStampHeaders);
-    }
-
-    public static AdsDeviceNotificationRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Stamps stamps, List<AdsStampHeader> adsStampHeaders) {
-        return new AdsDeviceNotificationRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, stamps, adsStampHeaders);
-    }
-
-    public Length getLength() {
-        return lengthSupplier == null ? length : Length.of(lengthSupplier);
-    }
-
-    public Stamps getStamps() {
-        return stamps;
-    }
-
-    public List<AdsStampHeader> getAdsStampHeaders() {
-        return adsStampHeaders;
-    }
-
-    public LengthSupplier getLengthSupplier() {
-        return lengthSupplier;
-    }
-
-    @Override
-    public AdsData getAdsData() {
-        return buildADSData(getLength(), stamps, buildADSData(adsStampHeaders.toArray(new ByteReadable[adsStampHeaders.size()])));
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (!(o instanceof AdsDeviceNotificationRequest))
-            return false;
-        if (!super.equals(o))
-            return false;
-
-        AdsDeviceNotificationRequest that = (AdsDeviceNotificationRequest) o;
-
-        if (!getLength().equals(that.getLength()))
-            return false;
-        if (!stamps.equals(that.stamps))
-            return false;
-
-        return adsStampHeaders.equals(that.adsStampHeaders);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = super.hashCode();
-        result = 31 * result + getLength().hashCode();
-        result = 31 * result + stamps.hashCode();
-        result = 31 * result + adsStampHeaders.hashCode();
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "AdsDeviceNotificationRequest{" +
-            "length=" + getLength() +
-            ", stamps=" + stamps +
-            ", adsStampHeaders=" + adsStampHeaders +
-            "} " + super.toString();
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands;
+
+import org.apache.plc4x.java.ads.api.commands.types.AdsStampHeader;
+import org.apache.plc4x.java.ads.api.commands.types.Length;
+import org.apache.plc4x.java.ads.api.commands.types.Stamps;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Command;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+import org.apache.plc4x.java.ads.api.util.ByteReadable;
+import org.apache.plc4x.java.ads.api.util.LengthSupplier;
+
+import java.util.List;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * Data will carry forward independently from an ADS device to a Client
+ * <p>
+ * The data which are transfered at the Device Notification  are multiple nested into one another. The Notification Stream contains an array with elements of type AdsStampHeader. This array again contains elements of type AdsNotificationSample.
+ */
+@AdsCommandType(Command.ADS_DEVICE_NOTIFICATION)
+public class AdsDeviceNotificationRequest extends AdsAbstractRequest {
+
+    /**
+     * 4 bytes	Size of data in byte.
+     */
+    private final Length length;
+    /**
+     * 4 bytes	Number of elements of type AdsStampHeader.
+     */
+    private final Stamps stamps;
+    /**
+     * n bytes	Array with elements of type AdsStampHeader.
+     */
+    private final List<AdsStampHeader> adsStampHeaders;
+
+    private final transient LengthSupplier lengthSupplier;
+
+    private AdsDeviceNotificationRequest(AmsHeader amsHeader, Length length, Stamps stamps, List<AdsStampHeader> adsStampHeaders) {
+        super(amsHeader);
+        this.length = requireNonNull(length);
+        this.stamps = requireNonNull(stamps);
+        this.adsStampHeaders = requireNonNull(adsStampHeaders);
+        lengthSupplier = null;
+    }
+
+    private AdsDeviceNotificationRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Stamps stamps, List<AdsStampHeader> adsStampHeaders) {
+        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
+        this.length = null;
+        this.stamps = requireNonNull(stamps);
+        this.adsStampHeaders = requireNonNull(adsStampHeaders);
+        this.lengthSupplier = () -> {
+            long aggregateLength = 0;
+            for (LengthSupplier supplier : adsStampHeaders) {
+                aggregateLength += supplier.getCalculatedLength();
+            }
+            return aggregateLength + Stamps.NUM_BYTES;
+        };
+    }
+
+    public static AdsDeviceNotificationRequest of(AmsHeader amsHeader, Length length, Stamps stamps, List<AdsStampHeader> adsStampHeaders) {
+        return new AdsDeviceNotificationRequest(amsHeader, length, stamps, adsStampHeaders);
+    }
+
+    public static AdsDeviceNotificationRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Stamps stamps, List<AdsStampHeader> adsStampHeaders) {
+        return new AdsDeviceNotificationRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, stamps, adsStampHeaders);
+    }
+
+    public Length getLength() {
+        return lengthSupplier == null ? length : Length.of(lengthSupplier);
+    }
+
+    public Stamps getStamps() {
+        return stamps;
+    }
+
+    public List<AdsStampHeader> getAdsStampHeaders() {
+        return adsStampHeaders;
+    }
+
+    public LengthSupplier getLengthSupplier() {
+        return lengthSupplier;
+    }
+
+    @Override
+    public AdsData getAdsData() {
+        return buildADSData(getLength(), stamps, buildADSData(adsStampHeaders.toArray(new ByteReadable[adsStampHeaders.size()])));
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof AdsDeviceNotificationRequest))
+            return false;
+        if (!super.equals(o))
+            return false;
+
+        AdsDeviceNotificationRequest that = (AdsDeviceNotificationRequest) o;
+
+        if (!getLength().equals(that.getLength()))
+            return false;
+        if (!stamps.equals(that.stamps))
+            return false;
+
+        return adsStampHeaders.equals(that.adsStampHeaders);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + getLength().hashCode();
+        result = 31 * result + stamps.hashCode();
+        result = 31 * result + adsStampHeaders.hashCode();
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "AdsDeviceNotificationRequest{" +
+            "length=" + getLength() +
+            ", stamps=" + stamps +
+            ", adsStampHeaders=" + adsStampHeaders +
+            "} " + super.toString();
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeviceNotificationResponse.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeviceNotificationResponse.java
index 6491a2d546f..ff46c4d3285 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeviceNotificationResponse.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeviceNotificationResponse.java
@@ -1,40 +1,40 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands;
-
-import org.apache.plc4x.java.ads.api.generic.AdsData;
-import org.apache.plc4x.java.ads.api.generic.types.Command;
-
-/**
- * Data will carry forward independently from an ADS device to a Client
- */
-@AdsCommandType(Command.ADS_DEVICE_NOTIFICATION)
-public class AdsDeviceNotificationResponse extends AdsAbstractResponse {
-
-    protected AdsDeviceNotificationResponse() {
-        super(null);
-        // There is no {@link AdsDeviceNotificationResponse} specified
-    }
-
-    @Override
-    public AdsData getAdsData() {
-        return AdsData.EMPTY;
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands;
+
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.types.Command;
+
+/**
+ * Data will carry forward independently from an ADS device to a Client
+ */
+@AdsCommandType(Command.ADS_DEVICE_NOTIFICATION)
+public class AdsDeviceNotificationResponse extends AdsAbstractResponse {
+
+    protected AdsDeviceNotificationResponse() {
+        super(null);
+        // There is no {@link AdsDeviceNotificationResponse} specified
+    }
+
+    @Override
+    public AdsData getAdsData() {
+        return AdsData.EMPTY;
+    }
+
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadDeviceInfoRequest.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadDeviceInfoRequest.java
index 186d9779b26..02dd8f4a851 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadDeviceInfoRequest.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadDeviceInfoRequest.java
@@ -1,57 +1,57 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands;
-
-import org.apache.plc4x.java.ads.api.generic.AdsData;
-import org.apache.plc4x.java.ads.api.generic.AmsHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Command;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-
-/**
- * Reads the name and the version number of the ADS device.
- * <p>
- * No additional data required
- */
-@AdsCommandType(Command.ADS_READ_DEVICE_INFO)
-public class AdsReadDeviceInfoRequest extends AdsAbstractRequest {
-
-    private AdsReadDeviceInfoRequest(AmsHeader amsHeader) {
-        super(amsHeader);
-    }
-
-    private AdsReadDeviceInfoRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId) {
-        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
-    }
-
-    public static AdsReadDeviceInfoRequest of(AmsHeader amsHeader) {
-        return new AdsReadDeviceInfoRequest(amsHeader);
-    }
-
-    public static AdsReadDeviceInfoRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId) {
-        return new AdsReadDeviceInfoRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
-    }
-
-    @Override
-    public AdsData getAdsData() {
-        return AdsData.EMPTY;
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands;
+
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Command;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+
+/**
+ * Reads the name and the version number of the ADS device.
+ * <p>
+ * No additional data required
+ */
+@AdsCommandType(Command.ADS_READ_DEVICE_INFO)
+public class AdsReadDeviceInfoRequest extends AdsAbstractRequest {
+
+    private AdsReadDeviceInfoRequest(AmsHeader amsHeader) {
+        super(amsHeader);
+    }
+
+    private AdsReadDeviceInfoRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId) {
+        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
+    }
+
+    public static AdsReadDeviceInfoRequest of(AmsHeader amsHeader) {
+        return new AdsReadDeviceInfoRequest(amsHeader);
+    }
+
+    public static AdsReadDeviceInfoRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId) {
+        return new AdsReadDeviceInfoRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
+    }
+
+    @Override
+    public AdsData getAdsData() {
+        return AdsData.EMPTY;
+    }
+
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadDeviceInfoResponse.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadDeviceInfoResponse.java
index cd977d30834..a7524f452a9 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadDeviceInfoResponse.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadDeviceInfoResponse.java
@@ -1,152 +1,152 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands;
-
-import org.apache.plc4x.java.ads.api.commands.types.*;
-import org.apache.plc4x.java.ads.api.generic.AdsData;
-import org.apache.plc4x.java.ads.api.generic.AmsHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Command;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-
-import static java.util.Objects.requireNonNull;
-
-/**
- * Reads the name and the version number of the ADS device.
- */
-@AdsCommandType(Command.ADS_READ_DEVICE_INFO)
-public class AdsReadDeviceInfoResponse extends AdsAbstractResponse {
-    /**
-     * 4 bytes	ADS error number.
-     */
-    private final Result result;
-    /**
-     * Version	1 byte	Major version number
-     */
-    private final MajorVersion majorVersion;
-    /**
-     * Version	1 byte	Minor version number
-     */
-    private final MinorVersion minorVersion;
-    /**
-     * Build	2 bytes	Build number
-     */
-    private final Version version;
-    /**
-     * Name	16 bytes	Name of ADS device
-     */
-    private final Device device;
-
-    private AdsReadDeviceInfoResponse(AmsHeader amsHeader, Result result, MajorVersion majorVersion, MinorVersion minorVersion, Version version, Device device) {
-        super(amsHeader);
-        this.result = requireNonNull(result);
-        this.majorVersion = requireNonNull(majorVersion);
-        this.minorVersion = requireNonNull(minorVersion);
-        this.version = requireNonNull(version);
-        this.device = requireNonNull(device);
-    }
-
-    private AdsReadDeviceInfoResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, MajorVersion majorVersion, MinorVersion minorVersion, Version version, Device device) {
-        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
-        this.result = requireNonNull(result);
-        this.majorVersion = requireNonNull(majorVersion);
-        this.minorVersion = requireNonNull(minorVersion);
-        this.version = requireNonNull(version);
-        this.device = requireNonNull(device);
-    }
-
-    public static AdsReadDeviceInfoResponse of(AmsHeader amsHeader, Result result, MajorVersion majorVersion, MinorVersion minorVersion, Version version, Device device) {
-        return new AdsReadDeviceInfoResponse(amsHeader, result, majorVersion, minorVersion, version, device);
-    }
-
-    public static AdsReadDeviceInfoResponse of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, MajorVersion majorVersion, MinorVersion minorVersion, Version version, Device device) {
-        return new AdsReadDeviceInfoResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result, majorVersion, minorVersion, version, device);
-    }
-
-    public Result getResult() {
-        return result;
-    }
-
-    public MajorVersion getMajorVersion() {
-        return majorVersion;
-    }
-
-    public MinorVersion getMinorVersion() {
-        return minorVersion;
-    }
-
-    public Version getVersion() {
-        return version;
-    }
-
-    public Device getDevice() {
-        return device;
-    }
-
-    @Override
-    public AdsData getAdsData() {
-        return buildADSData(result, majorVersion, minorVersion, version, device);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (!(o instanceof AdsReadDeviceInfoResponse))
-            return false;
-        if (!super.equals(o))
-            return false;
-
-        AdsReadDeviceInfoResponse that = (AdsReadDeviceInfoResponse) o;
-
-        if (!result.equals(that.result))
-            return false;
-        if (!majorVersion.equals(that.majorVersion))
-            return false;
-        if (!minorVersion.equals(that.minorVersion))
-            return false;
-        if (!version.equals(that.version))
-            return false;
-
-        return device.equals(that.device);
-    }
-
-    @Override
-    public int hashCode() {
-        int result1 = super.hashCode();
-        result1 = 31 * result1 + result.hashCode();
-        result1 = 31 * result1 + majorVersion.hashCode();
-        result1 = 31 * result1 + minorVersion.hashCode();
-        result1 = 31 * result1 + version.hashCode();
-        result1 = 31 * result1 + device.hashCode();
-        return result1;
-    }
-
-    @Override
-    public String toString() {
-        return "AdsReadDeviceInfoResponse{" +
-            "result=" + result +
-            ", majorVersion=" + majorVersion +
-            ", minorVersion=" + minorVersion +
-            ", version=" + version +
-            ", device=" + device +
-            "} " + super.toString();
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands;
+
+import org.apache.plc4x.java.ads.api.commands.types.*;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Command;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * Reads the name and the version number of the ADS device.
+ */
+@AdsCommandType(Command.ADS_READ_DEVICE_INFO)
+public class AdsReadDeviceInfoResponse extends AdsAbstractResponse {
+    /**
+     * 4 bytes	ADS error number.
+     */
+    private final Result result;
+    /**
+     * Version	1 byte	Major version number
+     */
+    private final MajorVersion majorVersion;
+    /**
+     * Version	1 byte	Minor version number
+     */
+    private final MinorVersion minorVersion;
+    /**
+     * Build	2 bytes	Build number
+     */
+    private final Version version;
+    /**
+     * Name	16 bytes	Name of ADS device
+     */
+    private final Device device;
+
+    private AdsReadDeviceInfoResponse(AmsHeader amsHeader, Result result, MajorVersion majorVersion, MinorVersion minorVersion, Version version, Device device) {
+        super(amsHeader);
+        this.result = requireNonNull(result);
+        this.majorVersion = requireNonNull(majorVersion);
+        this.minorVersion = requireNonNull(minorVersion);
+        this.version = requireNonNull(version);
+        this.device = requireNonNull(device);
+    }
+
+    private AdsReadDeviceInfoResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, MajorVersion majorVersion, MinorVersion minorVersion, Version version, Device device) {
+        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
+        this.result = requireNonNull(result);
+        this.majorVersion = requireNonNull(majorVersion);
+        this.minorVersion = requireNonNull(minorVersion);
+        this.version = requireNonNull(version);
+        this.device = requireNonNull(device);
+    }
+
+    public static AdsReadDeviceInfoResponse of(AmsHeader amsHeader, Result result, MajorVersion majorVersion, MinorVersion minorVersion, Version version, Device device) {
+        return new AdsReadDeviceInfoResponse(amsHeader, result, majorVersion, minorVersion, version, device);
+    }
+
+    public static AdsReadDeviceInfoResponse of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, MajorVersion majorVersion, MinorVersion minorVersion, Version version, Device device) {
+        return new AdsReadDeviceInfoResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result, majorVersion, minorVersion, version, device);
+    }
+
+    public Result getResult() {
+        return result;
+    }
+
+    public MajorVersion getMajorVersion() {
+        return majorVersion;
+    }
+
+    public MinorVersion getMinorVersion() {
+        return minorVersion;
+    }
+
+    public Version getVersion() {
+        return version;
+    }
+
+    public Device getDevice() {
+        return device;
+    }
+
+    @Override
+    public AdsData getAdsData() {
+        return buildADSData(result, majorVersion, minorVersion, version, device);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof AdsReadDeviceInfoResponse))
+            return false;
+        if (!super.equals(o))
+            return false;
+
+        AdsReadDeviceInfoResponse that = (AdsReadDeviceInfoResponse) o;
+
+        if (!result.equals(that.result))
+            return false;
+        if (!majorVersion.equals(that.majorVersion))
+            return false;
+        if (!minorVersion.equals(that.minorVersion))
+            return false;
+        if (!version.equals(that.version))
+            return false;
+
+        return device.equals(that.device);
+    }
+
+    @Override
+    public int hashCode() {
+        int result1 = super.hashCode();
+        result1 = 31 * result1 + result.hashCode();
+        result1 = 31 * result1 + majorVersion.hashCode();
+        result1 = 31 * result1 + minorVersion.hashCode();
+        result1 = 31 * result1 + version.hashCode();
+        result1 = 31 * result1 + device.hashCode();
+        return result1;
+    }
+
+    @Override
+    public String toString() {
+        return "AdsReadDeviceInfoResponse{" +
+            "result=" + result +
+            ", majorVersion=" + majorVersion +
+            ", minorVersion=" + minorVersion +
+            ", version=" + version +
+            ", device=" + device +
+            "} " + super.toString();
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadRequest.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadRequest.java
index ba6d15d542b..a7213249dc2 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadRequest.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadRequest.java
@@ -1,129 +1,129 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands;
-
-import org.apache.plc4x.java.ads.api.commands.types.IndexGroup;
-import org.apache.plc4x.java.ads.api.commands.types.IndexOffset;
-import org.apache.plc4x.java.ads.api.commands.types.Length;
-import org.apache.plc4x.java.ads.api.generic.AdsData;
-import org.apache.plc4x.java.ads.api.generic.AmsHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Command;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-
-import static java.util.Objects.requireNonNull;
-
-/**
- * With ADS Read data can be read from an ADS device.  The data are addressed by the Index Group and the Index Offset
- */
-@AdsCommandType(Command.ADS_READ)
-public class AdsReadRequest extends AdsAbstractRequest {
-
-    /**
-     * 4 bytes	Index Group of the data which should be read.
-     */
-    private final IndexGroup indexGroup;
-
-    /**
-     * 4 bytes	Index Offset of the data which should be read.
-     */
-    private final IndexOffset indexOffset;
-
-    /**
-     * 4 bytes	Length of the data (in bytes) which should be read.
-     */
-    private final Length length;
-
-    private AdsReadRequest(AmsHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length) {
-        super(amsHeader);
-        this.indexGroup = requireNonNull(indexGroup);
-        this.indexOffset = requireNonNull(indexOffset);
-        this.length = requireNonNull(length);
-    }
-
-    private AdsReadRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, Length length) {
-        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
-        this.indexGroup = requireNonNull(indexGroup);
-        this.indexOffset = requireNonNull(indexOffset);
-        this.length = requireNonNull(length);
-    }
-
-    public static AdsReadRequest of(AmsHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length) {
-        return new AdsReadRequest(amsHeader, indexGroup, indexOffset, length);
-    }
-
-    public static AdsReadRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, Length length) {
-        return new AdsReadRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, length);
-    }
-
-    public IndexGroup getIndexGroup() {
-        return indexGroup;
-    }
-
-    public IndexOffset getIndexOffset() {
-        return indexOffset;
-    }
-
-    public Length getLength() {
-        return length;
-    }
-
-    @Override
-    public AdsData getAdsData() {
-        return buildADSData(indexGroup, indexOffset, length);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (!(o instanceof AdsReadRequest))
-            return false;
-        if (!super.equals(o))
-            return false;
-
-        AdsReadRequest that = (AdsReadRequest) o;
-
-        if (!indexGroup.equals(that.indexGroup))
-            return false;
-        if (!indexOffset.equals(that.indexOffset))
-            return false;
-
-        return length.equals(that.length);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = super.hashCode();
-        result = 31 * result + indexGroup.hashCode();
-        result = 31 * result + indexOffset.hashCode();
-        result = 31 * result + length.hashCode();
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "AdsReadRequest{" +
-            "indexGroup=" + indexGroup +
-            ", indexOffset=" + indexOffset +
-            ", length=" + length +
-            "} " + super.toString();
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands;
+
+import org.apache.plc4x.java.ads.api.commands.types.IndexGroup;
+import org.apache.plc4x.java.ads.api.commands.types.IndexOffset;
+import org.apache.plc4x.java.ads.api.commands.types.Length;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Command;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * With ADS Read data can be read from an ADS device.  The data are addressed by the Index Group and the Index Offset
+ */
+@AdsCommandType(Command.ADS_READ)
+public class AdsReadRequest extends AdsAbstractRequest {
+
+    /**
+     * 4 bytes	Index Group of the data which should be read.
+     */
+    private final IndexGroup indexGroup;
+
+    /**
+     * 4 bytes	Index Offset of the data which should be read.
+     */
+    private final IndexOffset indexOffset;
+
+    /**
+     * 4 bytes	Length of the data (in bytes) which should be read.
+     */
+    private final Length length;
+
+    private AdsReadRequest(AmsHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length) {
+        super(amsHeader);
+        this.indexGroup = requireNonNull(indexGroup);
+        this.indexOffset = requireNonNull(indexOffset);
+        this.length = requireNonNull(length);
+    }
+
+    private AdsReadRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, Length length) {
+        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
+        this.indexGroup = requireNonNull(indexGroup);
+        this.indexOffset = requireNonNull(indexOffset);
+        this.length = requireNonNull(length);
+    }
+
+    public static AdsReadRequest of(AmsHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length) {
+        return new AdsReadRequest(amsHeader, indexGroup, indexOffset, length);
+    }
+
+    public static AdsReadRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, Length length) {
+        return new AdsReadRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, length);
+    }
+
+    public IndexGroup getIndexGroup() {
+        return indexGroup;
+    }
+
+    public IndexOffset getIndexOffset() {
+        return indexOffset;
+    }
+
+    public Length getLength() {
+        return length;
+    }
+
+    @Override
+    public AdsData getAdsData() {
+        return buildADSData(indexGroup, indexOffset, length);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof AdsReadRequest))
+            return false;
+        if (!super.equals(o))
+            return false;
+
+        AdsReadRequest that = (AdsReadRequest) o;
+
+        if (!indexGroup.equals(that.indexGroup))
+            return false;
+        if (!indexOffset.equals(that.indexOffset))
+            return false;
+
+        return length.equals(that.length);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + indexGroup.hashCode();
+        result = 31 * result + indexOffset.hashCode();
+        result = 31 * result + length.hashCode();
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "AdsReadRequest{" +
+            "indexGroup=" + indexGroup +
+            ", indexOffset=" + indexOffset +
+            ", length=" + length +
+            "} " + super.toString();
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadResponse.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadResponse.java
index 3698b03a92b..5ddd9fbb0c9 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadResponse.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadResponse.java
@@ -1,137 +1,137 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands;
-
-import org.apache.plc4x.java.ads.api.commands.types.Data;
-import org.apache.plc4x.java.ads.api.commands.types.Length;
-import org.apache.plc4x.java.ads.api.commands.types.Result;
-import org.apache.plc4x.java.ads.api.generic.AdsData;
-import org.apache.plc4x.java.ads.api.generic.AmsHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Command;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-import org.apache.plc4x.java.ads.api.util.LengthSupplier;
-
-import static java.util.Objects.requireNonNull;
-
-/**
- * With ADS Read data can be read from an ADS device
- */
-@AdsCommandType(Command.ADS_READ)
-public class AdsReadResponse extends AdsAbstractResponse {
-
-    /**
-     * 4 bytes	ADS error number
-     */
-    private final Result result;
-    /**
-     * 4 bytes	Length of data which are supplied back.
-     */
-    private final Length length;
-    /**
-     * n bytes	Data which are supplied back.
-     */
-    private final Data data;
-
-    private final transient LengthSupplier lengthSupplier;
-
-    private AdsReadResponse(AmsHeader amsHeader, Result result, Length length, Data data) {
-        super(amsHeader);
-        this.result = requireNonNull(result);
-        this.length = requireNonNull(length);
-        this.data = requireNonNull(data);
-        this.lengthSupplier = null;
-    }
-
-    private AdsReadResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, Data data) {
-        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
-        this.result = requireNonNull(result);
-        this.length = null;
-        this.data = requireNonNull(data);
-        this.lengthSupplier = data;
-    }
-
-    public static AdsReadResponse of(AmsHeader amsHeader, Result result, Length length, Data data) {
-        return new AdsReadResponse(amsHeader, result, length, data);
-    }
-
-    public static AdsReadResponse of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, Data data) {
-        return new AdsReadResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result, data);
-    }
-
-    @Override
-    public AdsData getAdsData() {
-        return buildADSData(result, getLength(), data);
-    }
-
-    public Result getResult() {
-        return result;
-    }
-
-    public Length getLength() {
-        return lengthSupplier == null ? length : Length.of(lengthSupplier);
-    }
-
-    public Data getData() {
-        return data;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof AdsReadResponse)) {
-            return false;
-        }
-        if (!super.equals(o)) {
-            return false;
-        }
-
-        AdsReadResponse that = (AdsReadResponse) o;
-
-        if (!result.equals(that.result)) {
-            return false;
-        }
-        if (!getLength().equals(that.getLength())) {
-            return false;
-        }
-
-        return data.equals(that.data);
-    }
-
-    @Override
-    public int hashCode() {
-        int result1 = super.hashCode();
-        result1 = 31 * result1 + result.hashCode();
-        result1 = 31 * result1 + getLength().hashCode();
-        result1 = 31 * result1 + data.hashCode();
-        return result1;
-    }
-
-    @Override
-    public String toString() {
-        return "AdsReadResponse{" +
-            "result=" + result +
-            ", length=" + getLength() +
-            ", data=" + data +
-            "} " + super.toString();
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands;
+
+import org.apache.plc4x.java.ads.api.commands.types.Data;
+import org.apache.plc4x.java.ads.api.commands.types.Length;
+import org.apache.plc4x.java.ads.api.commands.types.Result;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Command;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+import org.apache.plc4x.java.ads.api.util.LengthSupplier;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * With ADS Read data can be read from an ADS device
+ */
+@AdsCommandType(Command.ADS_READ)
+public class AdsReadResponse extends AdsAbstractResponse {
+
+    /**
+     * 4 bytes	ADS error number
+     */
+    private final Result result;
+    /**
+     * 4 bytes	Length of data which are supplied back.
+     */
+    private final Length length;
+    /**
+     * n bytes	Data which are supplied back.
+     */
+    private final Data data;
+
+    private final transient LengthSupplier lengthSupplier;
+
+    private AdsReadResponse(AmsHeader amsHeader, Result result, Length length, Data data) {
+        super(amsHeader);
+        this.result = requireNonNull(result);
+        this.length = requireNonNull(length);
+        this.data = requireNonNull(data);
+        this.lengthSupplier = null;
+    }
+
+    private AdsReadResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, Data data) {
+        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
+        this.result = requireNonNull(result);
+        this.length = null;
+        this.data = requireNonNull(data);
+        this.lengthSupplier = data;
+    }
+
+    public static AdsReadResponse of(AmsHeader amsHeader, Result result, Length length, Data data) {
+        return new AdsReadResponse(amsHeader, result, length, data);
+    }
+
+    public static AdsReadResponse of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, Data data) {
+        return new AdsReadResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result, data);
+    }
+
+    @Override
+    public AdsData getAdsData() {
+        return buildADSData(result, getLength(), data);
+    }
+
+    public Result getResult() {
+        return result;
+    }
+
+    public Length getLength() {
+        return lengthSupplier == null ? length : Length.of(lengthSupplier);
+    }
+
+    public Data getData() {
+        return data;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof AdsReadResponse)) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+
+        AdsReadResponse that = (AdsReadResponse) o;
+
+        if (!result.equals(that.result)) {
+            return false;
+        }
+        if (!getLength().equals(that.getLength())) {
+            return false;
+        }
+
+        return data.equals(that.data);
+    }
+
+    @Override
+    public int hashCode() {
+        int result1 = super.hashCode();
+        result1 = 31 * result1 + result.hashCode();
+        result1 = 31 * result1 + getLength().hashCode();
+        result1 = 31 * result1 + data.hashCode();
+        return result1;
+    }
+
+    @Override
+    public String toString() {
+        return "AdsReadResponse{" +
+            "result=" + result +
+            ", length=" + getLength() +
+            ", data=" + data +
+            "} " + super.toString();
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadStateRequest.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadStateRequest.java
index e11fb94f31e..135248bb9da 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadStateRequest.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadStateRequest.java
@@ -1,57 +1,57 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands;
-
-import org.apache.plc4x.java.ads.api.generic.AdsData;
-import org.apache.plc4x.java.ads.api.generic.AmsHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Command;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-
-/**
- * Reads the ADS status and the device status of an ADS device.
- * <p>
- * No additional data required
- */
-@AdsCommandType(Command.ADS_READ_STATE)
-public class AdsReadStateRequest extends AdsAbstractRequest {
-
-    private AdsReadStateRequest(AmsHeader amsHeader) {
-        super(amsHeader);
-    }
-
-    private AdsReadStateRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId) {
-        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
-    }
-
-    public static AdsReadStateRequest of(AmsHeader amsHeader) {
-        return new AdsReadStateRequest(amsHeader);
-    }
-
-    public static AdsReadStateRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId) {
-        return new AdsReadStateRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
-    }
-
-    @Override
-    public AdsData getAdsData() {
-        return AdsData.EMPTY;
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands;
+
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Command;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+
+/**
+ * Reads the ADS status and the device status of an ADS device.
+ * <p>
+ * No additional data required
+ */
+@AdsCommandType(Command.ADS_READ_STATE)
+public class AdsReadStateRequest extends AdsAbstractRequest {
+
+    private AdsReadStateRequest(AmsHeader amsHeader) {
+        super(amsHeader);
+    }
+
+    private AdsReadStateRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId) {
+        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
+    }
+
+    public static AdsReadStateRequest of(AmsHeader amsHeader) {
+        return new AdsReadStateRequest(amsHeader);
+    }
+
+    public static AdsReadStateRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId) {
+        return new AdsReadStateRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
+    }
+
+    @Override
+    public AdsData getAdsData() {
+        return AdsData.EMPTY;
+    }
+
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadStateResponse.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadStateResponse.java
index 15ff0d29aaa..a0765f9ccd3 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadStateResponse.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadStateResponse.java
@@ -1,123 +1,123 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands;
-
-import org.apache.plc4x.java.ads.api.commands.types.AdsState;
-import org.apache.plc4x.java.ads.api.commands.types.DeviceState;
-import org.apache.plc4x.java.ads.api.commands.types.Result;
-import org.apache.plc4x.java.ads.api.generic.AdsData;
-import org.apache.plc4x.java.ads.api.generic.AmsHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Command;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-
-import static java.util.Objects.requireNonNull;
-
-/**
- * Reads the ADS status and the device status of an ADS device.
- */
-@AdsCommandType(Command.ADS_READ_STATE)
-public class AdsReadStateResponse extends AdsAbstractResponse {
-
-    /**
-     * 4 bytes	ADS error number
-     */
-    private final Result result;
-
-    /**
-     * 2 bytes	New ADS status (see data type ADSSTATE of the ADS-DLL).
-     */
-    private final AdsState adsState;
-
-    /**
-     * 2 bytes	New device status.
-     */
-    private final DeviceState deviceState;
-
-    private AdsReadStateResponse(AmsHeader amsHeader, Result result, AdsState adsState, DeviceState deviceState) {
-        super(amsHeader);
-        this.result = requireNonNull(result);
-        this.adsState = requireNonNull(adsState);
-        this.deviceState = requireNonNull(deviceState);
-    }
-
-    private AdsReadStateResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, AdsState adsState, DeviceState deviceState) {
-        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
-        this.result = requireNonNull(result);
-        this.adsState = requireNonNull(adsState);
-        this.deviceState = requireNonNull(deviceState);
-    }
-
-    public static AdsReadStateResponse of(AmsHeader amsHeader, Result result, AdsState adsState, DeviceState deviceState) {
-        return new AdsReadStateResponse(amsHeader, result, adsState, deviceState);
-    }
-
-    public static AdsReadStateResponse of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, AdsState adsState, DeviceState deviceState) {
-        return new AdsReadStateResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result, adsState, deviceState);
-    }
-
-    public Result getResult() {
-        return result;
-    }
-
-    public AdsState getAdsState() {
-        return adsState;
-    }
-
-    public DeviceState getDeviceState() {
-        return deviceState;
-    }
-
-    @Override
-    public AdsData getAdsData() {
-        return buildADSData(result, adsState, deviceState);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof AdsReadStateResponse)) return false;
-        if (!super.equals(o)) return false;
-
-        AdsReadStateResponse that = (AdsReadStateResponse) o;
-
-        if (!result.equals(that.result)) return false;
-        if (!adsState.equals(that.adsState)) return false;
-        return deviceState.equals(that.deviceState);
-    }
-
-    @Override
-    public int hashCode() {
-        int result1 = super.hashCode();
-        result1 = 31 * result1 + result.hashCode();
-        result1 = 31 * result1 + adsState.hashCode();
-        result1 = 31 * result1 + deviceState.hashCode();
-        return result1;
-    }
-
-    @Override
-    public String toString() {
-        return "AdsReadStateResponse{" +
-            "result=" + result +
-            ", adsState=" + adsState +
-            ", deviceState=" + deviceState +
-            "} " + super.toString();
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands;
+
+import org.apache.plc4x.java.ads.api.commands.types.AdsState;
+import org.apache.plc4x.java.ads.api.commands.types.DeviceState;
+import org.apache.plc4x.java.ads.api.commands.types.Result;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Command;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * Reads the ADS status and the device status of an ADS device.
+ */
+@AdsCommandType(Command.ADS_READ_STATE)
+public class AdsReadStateResponse extends AdsAbstractResponse {
+
+    /**
+     * 4 bytes	ADS error number
+     */
+    private final Result result;
+
+    /**
+     * 2 bytes	New ADS status (see data type ADSSTATE of the ADS-DLL).
+     */
+    private final AdsState adsState;
+
+    /**
+     * 2 bytes	New device status.
+     */
+    private final DeviceState deviceState;
+
+    private AdsReadStateResponse(AmsHeader amsHeader, Result result, AdsState adsState, DeviceState deviceState) {
+        super(amsHeader);
+        this.result = requireNonNull(result);
+        this.adsState = requireNonNull(adsState);
+        this.deviceState = requireNonNull(deviceState);
+    }
+
+    private AdsReadStateResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, AdsState adsState, DeviceState deviceState) {
+        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
+        this.result = requireNonNull(result);
+        this.adsState = requireNonNull(adsState);
+        this.deviceState = requireNonNull(deviceState);
+    }
+
+    public static AdsReadStateResponse of(AmsHeader amsHeader, Result result, AdsState adsState, DeviceState deviceState) {
+        return new AdsReadStateResponse(amsHeader, result, adsState, deviceState);
+    }
+
+    public static AdsReadStateResponse of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, AdsState adsState, DeviceState deviceState) {
+        return new AdsReadStateResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result, adsState, deviceState);
+    }
+
+    public Result getResult() {
+        return result;
+    }
+
+    public AdsState getAdsState() {
+        return adsState;
+    }
+
+    public DeviceState getDeviceState() {
+        return deviceState;
+    }
+
+    @Override
+    public AdsData getAdsData() {
+        return buildADSData(result, adsState, deviceState);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof AdsReadStateResponse)) return false;
+        if (!super.equals(o)) return false;
+
+        AdsReadStateResponse that = (AdsReadStateResponse) o;
+
+        if (!result.equals(that.result)) return false;
+        if (!adsState.equals(that.adsState)) return false;
+        return deviceState.equals(that.deviceState);
+    }
+
+    @Override
+    public int hashCode() {
+        int result1 = super.hashCode();
+        result1 = 31 * result1 + result.hashCode();
+        result1 = 31 * result1 + adsState.hashCode();
+        result1 = 31 * result1 + deviceState.hashCode();
+        return result1;
+    }
+
+    @Override
+    public String toString() {
+        return "AdsReadStateResponse{" +
+            "result=" + result +
+            ", adsState=" + adsState +
+            ", deviceState=" + deviceState +
+            "} " + super.toString();
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadWriteRequest.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadWriteRequest.java
index ccd73de3384..ac0b9fbf107 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadWriteRequest.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadWriteRequest.java
@@ -1,160 +1,160 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands;
-
-import org.apache.plc4x.java.ads.api.commands.types.*;
-import org.apache.plc4x.java.ads.api.generic.AdsData;
-import org.apache.plc4x.java.ads.api.generic.AmsHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Command;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-import org.apache.plc4x.java.ads.api.util.LengthSupplier;
-
-import static java.util.Objects.requireNonNull;
-
-/**
- * With ADS Read Write data will be written to an ADS device. Additionally, data can be read from the ADS device.
- * <p>
- * The data which can be read are addressed by the Index Group and the Index Offset
- */
-@AdsCommandType(Command.ADS_READ_WRITE)
-public class AdsReadWriteRequest extends AdsAbstractRequest {
-
-    /**
-     * 4 bytes	Index Group, in which the data should be written.
-     */
-    private final IndexGroup indexGroup;
-    /**
-     * 4 bytes	Index Offset, in which the data should be written
-     */
-    private final IndexOffset indexOffset;
-    /**
-     * 4 bytes	Length of data in bytes, which should be read.
-     */
-    private final ReadLength readLength;
-    /**
-     * 4 bytes	Length of data in bytes, which should be written
-     */
-    private final WriteLength writeLength;
-    /**
-     * n bytes	Data which are written in the ADS device.
-     */
-    private final Data data;
-
-    private final transient LengthSupplier writeLengthSupplier;
-
-    private AdsReadWriteRequest(AmsHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, ReadLength readLength, WriteLength writeLength, Data data) {
-        super(amsHeader);
-        this.indexGroup = requireNonNull(indexGroup);
-        this.indexOffset = requireNonNull(indexOffset);
-        this.readLength = requireNonNull(readLength);
-        this.writeLength = requireNonNull(writeLength);
-        this.data = requireNonNull(data);
-        this.writeLengthSupplier = null;
-    }
-
-    private AdsReadWriteRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, ReadLength readLength, Data data) {
-        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
-        this.indexGroup = requireNonNull(indexGroup);
-        this.indexOffset = requireNonNull(indexOffset);
-        this.readLength = requireNonNull(readLength);
-        this.writeLength = null;
-        this.data = requireNonNull(data);
-        this.writeLengthSupplier = data;
-    }
-
-    public static AdsReadWriteRequest of(AmsHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, ReadLength readLength, WriteLength writeLength, Data data) {
-        return new AdsReadWriteRequest(amsHeader, indexGroup, indexOffset, readLength, writeLength, data);
-    }
-
-    public static AdsReadWriteRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, ReadLength readLength, Data data) {
-        return new AdsReadWriteRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, readLength, data);
-    }
-
-    public IndexGroup getIndexGroup() {
-        return indexGroup;
-    }
-
-    public IndexOffset getIndexOffset() {
-        return indexOffset;
-    }
-
-    public ReadLength getReadLength() {
-        return readLength;
-    }
-
-    public WriteLength getWriteLength() {
-        return writeLengthSupplier == null ? writeLength : WriteLength.of(writeLengthSupplier.getCalculatedLength());
-    }
-
-    public Data getData() {
-        return data;
-    }
-
-    @Override
-    public AdsData getAdsData() {
-        return buildADSData(indexGroup, indexOffset, readLength, getWriteLength(), data);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (!(o instanceof AdsReadWriteRequest))
-            return false;
-        if (!super.equals(o))
-            return false;
-
-        AdsReadWriteRequest that = (AdsReadWriteRequest) o;
-
-        if (!indexGroup.equals(that.indexGroup))
-            return false;
-        if (!indexOffset.equals(that.indexOffset))
-            return false;
-        if (!readLength.equals(that.readLength))
-            return false;
-        if (!getWriteLength().equals(that.getWriteLength()))
-            return false;
-
-        return data.equals(that.data);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = super.hashCode();
-        result = 31 * result + indexGroup.hashCode();
-        result = 31 * result + indexOffset.hashCode();
-        result = 31 * result + readLength.hashCode();
-        result = 31 * result + getWriteLength().hashCode();
-        result = 31 * result + data.hashCode();
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "AdsReadWriteRequest{" +
-            "indexGroup=" + indexGroup +
-            ", indexOffset=" + indexOffset +
-            ", readLength=" + readLength +
-            ", writeLength=" + getWriteLength() +
-            ", data=" + data +
-            "} " + super.toString();
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands;
+
+import org.apache.plc4x.java.ads.api.commands.types.*;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Command;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+import org.apache.plc4x.java.ads.api.util.LengthSupplier;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * With ADS Read Write data will be written to an ADS device. Additionally, data can be read from the ADS device.
+ * <p>
+ * The data which can be read are addressed by the Index Group and the Index Offset
+ */
+@AdsCommandType(Command.ADS_READ_WRITE)
+public class AdsReadWriteRequest extends AdsAbstractRequest {
+
+    /**
+     * 4 bytes	Index Group, in which the data should be written.
+     */
+    private final IndexGroup indexGroup;
+    /**
+     * 4 bytes	Index Offset, in which the data should be written
+     */
+    private final IndexOffset indexOffset;
+    /**
+     * 4 bytes	Length of data in bytes, which should be read.
+     */
+    private final ReadLength readLength;
+    /**
+     * 4 bytes	Length of data in bytes, which should be written
+     */
+    private final WriteLength writeLength;
+    /**
+     * n bytes	Data which are written in the ADS device.
+     */
+    private final Data data;
+
+    private final transient LengthSupplier writeLengthSupplier;
+
+    private AdsReadWriteRequest(AmsHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, ReadLength readLength, WriteLength writeLength, Data data) {
+        super(amsHeader);
+        this.indexGroup = requireNonNull(indexGroup);
+        this.indexOffset = requireNonNull(indexOffset);
+        this.readLength = requireNonNull(readLength);
+        this.writeLength = requireNonNull(writeLength);
+        this.data = requireNonNull(data);
+        this.writeLengthSupplier = null;
+    }
+
+    private AdsReadWriteRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, ReadLength readLength, Data data) {
+        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
+        this.indexGroup = requireNonNull(indexGroup);
+        this.indexOffset = requireNonNull(indexOffset);
+        this.readLength = requireNonNull(readLength);
+        this.writeLength = null;
+        this.data = requireNonNull(data);
+        this.writeLengthSupplier = data;
+    }
+
+    public static AdsReadWriteRequest of(AmsHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, ReadLength readLength, WriteLength writeLength, Data data) {
+        return new AdsReadWriteRequest(amsHeader, indexGroup, indexOffset, readLength, writeLength, data);
+    }
+
+    public static AdsReadWriteRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, ReadLength readLength, Data data) {
+        return new AdsReadWriteRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, readLength, data);
+    }
+
+    public IndexGroup getIndexGroup() {
+        return indexGroup;
+    }
+
+    public IndexOffset getIndexOffset() {
+        return indexOffset;
+    }
+
+    public ReadLength getReadLength() {
+        return readLength;
+    }
+
+    public WriteLength getWriteLength() {
+        return writeLengthSupplier == null ? writeLength : WriteLength.of(writeLengthSupplier.getCalculatedLength());
+    }
+
+    public Data getData() {
+        return data;
+    }
+
+    @Override
+    public AdsData getAdsData() {
+        return buildADSData(indexGroup, indexOffset, readLength, getWriteLength(), data);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof AdsReadWriteRequest))
+            return false;
+        if (!super.equals(o))
+            return false;
+
+        AdsReadWriteRequest that = (AdsReadWriteRequest) o;
+
+        if (!indexGroup.equals(that.indexGroup))
+            return false;
+        if (!indexOffset.equals(that.indexOffset))
+            return false;
+        if (!readLength.equals(that.readLength))
+            return false;
+        if (!getWriteLength().equals(that.getWriteLength()))
+            return false;
+
+        return data.equals(that.data);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + indexGroup.hashCode();
+        result = 31 * result + indexOffset.hashCode();
+        result = 31 * result + readLength.hashCode();
+        result = 31 * result + getWriteLength().hashCode();
+        result = 31 * result + data.hashCode();
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "AdsReadWriteRequest{" +
+            "indexGroup=" + indexGroup +
+            ", indexOffset=" + indexOffset +
+            ", readLength=" + readLength +
+            ", writeLength=" + getWriteLength() +
+            ", data=" + data +
+            "} " + super.toString();
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadWriteResponse.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadWriteResponse.java
index fdc79e5105a..bc2893d7ef8 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadWriteResponse.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadWriteResponse.java
@@ -1,133 +1,133 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands;
-
-import org.apache.plc4x.java.ads.api.commands.types.Data;
-import org.apache.plc4x.java.ads.api.commands.types.Length;
-import org.apache.plc4x.java.ads.api.commands.types.Result;
-import org.apache.plc4x.java.ads.api.generic.AdsData;
-import org.apache.plc4x.java.ads.api.generic.AmsHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Command;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-import org.apache.plc4x.java.ads.api.util.LengthSupplier;
-
-import static java.util.Objects.requireNonNull;
-
-/**
- * With ADS Read Write data will be written to an ADS device. Additionally, data can be read from the ADS device.
- */
-@AdsCommandType(Command.ADS_READ_WRITE)
-public class AdsReadWriteResponse extends AdsAbstractResponse {
-
-    /**
-     * 4 bytes	ADS error number
-     */
-    private final Result result;
-
-    /**
-     * 4 bytes	Length of data which are supplied back.
-     */
-    private final Length length;
-
-    /**
-     * n bytes	Data which are supplied back.
-     */
-    private final Data data;
-
-    private final transient LengthSupplier lengthSupplier;
-
-    private AdsReadWriteResponse(AmsHeader amsHeader, Result result, Length length, Data data) {
-        super(amsHeader);
-        this.result = requireNonNull(result);
-        this.length = requireNonNull(length);
-        this.data = requireNonNull(data);
-        this.lengthSupplier = null;
-    }
-
-    private AdsReadWriteResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, Data data) {
-        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
-        this.result = requireNonNull(result);
-        this.length = null;
-        this.data = requireNonNull(data);
-        this.lengthSupplier = data;
-    }
-
-    public static AdsReadWriteResponse of(AmsHeader amsHeader, Result result, Length length, Data data) {
-        return new AdsReadWriteResponse(amsHeader, result, length, data);
-    }
-
-    public static AdsReadWriteResponse of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, Data data) {
-        return new AdsReadWriteResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result, data);
-    }
-
-    public Result getResult() {
-        return result;
-    }
-
-    public Length getLength() {
-        return lengthSupplier == null ? length : Length.of(lengthSupplier);
-    }
-
-    public Data getData() {
-        return data;
-    }
-
-    @Override
-    public AdsData getAdsData() {
-        return buildADSData(result, getLength(), data);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (!(o instanceof AdsReadWriteResponse))
-            return false;
-        if (!super.equals(o))
-            return false;
-
-        AdsReadWriteResponse that = (AdsReadWriteResponse) o;
-
-        if (!result.equals(that.result))
-            return false;
-        if (!getLength().equals(that.getLength()))
-            return false;
-        return data.equals(that.data);
-    }
-
-    @Override
-    public int hashCode() {
-        int result1 = super.hashCode();
-        result1 = 31 * result1 + result.hashCode();
-        result1 = 31 * result1 + getLength().hashCode();
-        result1 = 31 * result1 + data.hashCode();
-        return result1;
-    }
-
-    @Override
-    public String toString() {
-        return "AdsReadWriteResponse{" +
-            "result=" + result +
-            ", length=" + getLength() +
-            ", data=" + data +
-            "} " + super.toString();
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands;
+
+import org.apache.plc4x.java.ads.api.commands.types.Data;
+import org.apache.plc4x.java.ads.api.commands.types.Length;
+import org.apache.plc4x.java.ads.api.commands.types.Result;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Command;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+import org.apache.plc4x.java.ads.api.util.LengthSupplier;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * With ADS Read Write data will be written to an ADS device. Additionally, data can be read from the ADS device.
+ */
+@AdsCommandType(Command.ADS_READ_WRITE)
+public class AdsReadWriteResponse extends AdsAbstractResponse {
+
+    /**
+     * 4 bytes	ADS error number
+     */
+    private final Result result;
+
+    /**
+     * 4 bytes	Length of data which are supplied back.
+     */
+    private final Length length;
+
+    /**
+     * n bytes	Data which are supplied back.
+     */
+    private final Data data;
+
+    private final transient LengthSupplier lengthSupplier;
+
+    private AdsReadWriteResponse(AmsHeader amsHeader, Result result, Length length, Data data) {
+        super(amsHeader);
+        this.result = requireNonNull(result);
+        this.length = requireNonNull(length);
+        this.data = requireNonNull(data);
+        this.lengthSupplier = null;
+    }
+
+    private AdsReadWriteResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, Data data) {
+        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
+        this.result = requireNonNull(result);
+        this.length = null;
+        this.data = requireNonNull(data);
+        this.lengthSupplier = data;
+    }
+
+    public static AdsReadWriteResponse of(AmsHeader amsHeader, Result result, Length length, Data data) {
+        return new AdsReadWriteResponse(amsHeader, result, length, data);
+    }
+
+    public static AdsReadWriteResponse of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, Data data) {
+        return new AdsReadWriteResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result, data);
+    }
+
+    public Result getResult() {
+        return result;
+    }
+
+    public Length getLength() {
+        return lengthSupplier == null ? length : Length.of(lengthSupplier);
+    }
+
+    public Data getData() {
+        return data;
+    }
+
+    @Override
+    public AdsData getAdsData() {
+        return buildADSData(result, getLength(), data);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof AdsReadWriteResponse))
+            return false;
+        if (!super.equals(o))
+            return false;
+
+        AdsReadWriteResponse that = (AdsReadWriteResponse) o;
+
+        if (!result.equals(that.result))
+            return false;
+        if (!getLength().equals(that.getLength()))
+            return false;
+        return data.equals(that.data);
+    }
+
+    @Override
+    public int hashCode() {
+        int result1 = super.hashCode();
+        result1 = 31 * result1 + result.hashCode();
+        result1 = 31 * result1 + getLength().hashCode();
+        result1 = 31 * result1 + data.hashCode();
+        return result1;
+    }
+
+    @Override
+    public String toString() {
+        return "AdsReadWriteResponse{" +
+            "result=" + result +
+            ", length=" + getLength() +
+            ", data=" + data +
+            "} " + super.toString();
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteControlRequest.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteControlRequest.java
index 31100b840ff..094d378a941 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteControlRequest.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteControlRequest.java
@@ -1,149 +1,149 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands;
-
-import org.apache.plc4x.java.ads.api.commands.types.AdsState;
-import org.apache.plc4x.java.ads.api.commands.types.Data;
-import org.apache.plc4x.java.ads.api.commands.types.DeviceState;
-import org.apache.plc4x.java.ads.api.commands.types.Length;
-import org.apache.plc4x.java.ads.api.generic.AdsData;
-import org.apache.plc4x.java.ads.api.generic.AmsHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Command;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-import org.apache.plc4x.java.ads.api.util.LengthSupplier;
-
-import static java.util.Objects.requireNonNull;
-
-/**
- * Changes the ADS status and the device status of an ADS device.
- * Additionally it is possible to send data to the ADS device to transfer further information.
- * These data were not analysed from the current ADS devices (PLC, NC, ...)
- */
-@AdsCommandType(Command.ADS_WRITE_CONTROL)
-public class AdsWriteControlRequest extends AdsAbstractRequest {
-
-    /**
-     * 2 bytes	New ADS status (see data type ADSSTATE of the ADS-DLL).
-     */
-    private final AdsState adsState;
-    /**
-     * 2 bytes	New device status.
-     */
-    private final DeviceState deviceState;
-    /**
-     * 4 bytes	Length of data in byte.
-     */
-    private final Length length;
-    /**
-     * n bytes	Additional data which are sent to the ADS device
-     */
-    private final Data data;
-
-    private final transient LengthSupplier lengthSupplier;
-
-    private AdsWriteControlRequest(AmsHeader amsHeader, AdsState adsState, DeviceState deviceState, Length length, Data data) {
-        super(amsHeader);
-        this.adsState = requireNonNull(adsState);
-        this.deviceState = requireNonNull(deviceState);
-        this.length = requireNonNull(length);
-        this.data = requireNonNull(data);
-        this.lengthSupplier = null;
-    }
-
-    private AdsWriteControlRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, AdsState adsState, DeviceState deviceState, Data data) {
-        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
-        this.adsState = requireNonNull(adsState);
-        this.deviceState = requireNonNull(deviceState);
-        this.length = null;
-        this.data = requireNonNull(data);
-        this.lengthSupplier = data;
-    }
-
-    public static AdsWriteControlRequest of(AmsHeader amsHeader, AdsState adsState, DeviceState deviceState, Length length, Data data) {
-        return new AdsWriteControlRequest(amsHeader, adsState, deviceState, length, data);
-    }
-
-    public static AdsWriteControlRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, AdsState adsState, DeviceState deviceState, Data data) {
-        return new AdsWriteControlRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, adsState, deviceState, data);
-    }
-
-    public AdsState getAdsState() {
-        return adsState;
-    }
-
-    public DeviceState getDeviceState() {
-        return deviceState;
-    }
-
-    public Length getLength() {
-        return lengthSupplier == null ? length : Length.of(lengthSupplier);
-    }
-
-    public Data getData() {
-        return data;
-    }
-
-    @Override
-    public AdsData getAdsData() {
-        return buildADSData(adsState, deviceState, getLength(), data);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (!(o instanceof AdsWriteControlRequest))
-            return false;
-        if (!super.equals(o))
-            return false;
-
-        AdsWriteControlRequest that = (AdsWriteControlRequest) o;
-
-        if (!adsState.equals(that.adsState))
-            return false;
-        if (!deviceState.equals(that.deviceState))
-            return false;
-        if (!getLength().equals(that.getLength()))
-            return false;
-
-        return data.equals(that.data);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = super.hashCode();
-        result = 31 * result + adsState.hashCode();
-        result = 31 * result + deviceState.hashCode();
-        result = 31 * result + getLength().hashCode();
-        result = 31 * result + data.hashCode();
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "AdsWriteControlRequest{" +
-            "adsState=" + adsState +
-            ", deviceState=" + deviceState +
-            ", length=" + getLength() +
-            ", data=" + data +
-            "} " + super.toString();
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands;
+
+import org.apache.plc4x.java.ads.api.commands.types.AdsState;
+import org.apache.plc4x.java.ads.api.commands.types.Data;
+import org.apache.plc4x.java.ads.api.commands.types.DeviceState;
+import org.apache.plc4x.java.ads.api.commands.types.Length;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Command;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+import org.apache.plc4x.java.ads.api.util.LengthSupplier;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * Changes the ADS status and the device status of an ADS device.
+ * Additionally it is possible to send data to the ADS device to transfer further information.
+ * These data were not analysed from the current ADS devices (PLC, NC, ...)
+ */
+@AdsCommandType(Command.ADS_WRITE_CONTROL)
+public class AdsWriteControlRequest extends AdsAbstractRequest {
+
+    /**
+     * 2 bytes	New ADS status (see data type ADSSTATE of the ADS-DLL).
+     */
+    private final AdsState adsState;
+    /**
+     * 2 bytes	New device status.
+     */
+    private final DeviceState deviceState;
+    /**
+     * 4 bytes	Length of data in byte.
+     */
+    private final Length length;
+    /**
+     * n bytes	Additional data which are sent to the ADS device
+     */
+    private final Data data;
+
+    private final transient LengthSupplier lengthSupplier;
+
+    private AdsWriteControlRequest(AmsHeader amsHeader, AdsState adsState, DeviceState deviceState, Length length, Data data) {
+        super(amsHeader);
+        this.adsState = requireNonNull(adsState);
+        this.deviceState = requireNonNull(deviceState);
+        this.length = requireNonNull(length);
+        this.data = requireNonNull(data);
+        this.lengthSupplier = null;
+    }
+
+    private AdsWriteControlRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, AdsState adsState, DeviceState deviceState, Data data) {
+        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
+        this.adsState = requireNonNull(adsState);
+        this.deviceState = requireNonNull(deviceState);
+        this.length = null;
+        this.data = requireNonNull(data);
+        this.lengthSupplier = data;
+    }
+
+    public static AdsWriteControlRequest of(AmsHeader amsHeader, AdsState adsState, DeviceState deviceState, Length length, Data data) {
+        return new AdsWriteControlRequest(amsHeader, adsState, deviceState, length, data);
+    }
+
+    public static AdsWriteControlRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, AdsState adsState, DeviceState deviceState, Data data) {
+        return new AdsWriteControlRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, adsState, deviceState, data);
+    }
+
+    public AdsState getAdsState() {
+        return adsState;
+    }
+
+    public DeviceState getDeviceState() {
+        return deviceState;
+    }
+
+    public Length getLength() {
+        return lengthSupplier == null ? length : Length.of(lengthSupplier);
+    }
+
+    public Data getData() {
+        return data;
+    }
+
+    @Override
+    public AdsData getAdsData() {
+        return buildADSData(adsState, deviceState, getLength(), data);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof AdsWriteControlRequest))
+            return false;
+        if (!super.equals(o))
+            return false;
+
+        AdsWriteControlRequest that = (AdsWriteControlRequest) o;
+
+        if (!adsState.equals(that.adsState))
+            return false;
+        if (!deviceState.equals(that.deviceState))
+            return false;
+        if (!getLength().equals(that.getLength()))
+            return false;
+
+        return data.equals(that.data);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + adsState.hashCode();
+        result = 31 * result + deviceState.hashCode();
+        result = 31 * result + getLength().hashCode();
+        result = 31 * result + data.hashCode();
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "AdsWriteControlRequest{" +
+            "adsState=" + adsState +
+            ", deviceState=" + deviceState +
+            ", length=" + getLength() +
+            ", data=" + data +
+            "} " + super.toString();
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteControlResponse.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteControlResponse.java
index 21aed55d92d..4ac2755f37d 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteControlResponse.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteControlResponse.java
@@ -1,95 +1,95 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands;
-
-import org.apache.plc4x.java.ads.api.commands.types.Result;
-import org.apache.plc4x.java.ads.api.generic.AdsData;
-import org.apache.plc4x.java.ads.api.generic.AmsHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Command;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-
-import static java.util.Objects.requireNonNull;
-
-/**
- * Changes the ADS status and the device status of an ADS device.
- */
-@AdsCommandType(Command.ADS_WRITE_CONTROL)
-public class AdsWriteControlResponse extends AdsAbstractResponse {
-    /**
-     * 4 bytes	ADS error number
-     */
-    private final Result result;
-
-    private AdsWriteControlResponse(AmsHeader amsHeader, Result result) {
-        super(amsHeader);
-        this.result = requireNonNull(result);
-    }
-
-    private AdsWriteControlResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result) {
-        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
-        this.result = requireNonNull(result);
-    }
-
-    public static AdsWriteControlResponse of(AmsHeader amsHeader, Result result) {
-        return new AdsWriteControlResponse(amsHeader, result);
-    }
-
-    public static AdsWriteControlResponse of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result) {
-        return new AdsWriteControlResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result);
-    }
-
-    public Result getResult() {
-        return result;
-    }
-
-    @Override
-    public AdsData getAdsData() {
-        return buildADSData(result);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (!(o instanceof AdsWriteControlResponse))
-            return false;
-        if (!super.equals(o))
-            return false;
-
-        AdsWriteControlResponse that = (AdsWriteControlResponse) o;
-
-        return result.equals(that.result);
-    }
-
-    @Override
-    public int hashCode() {
-        int result1 = super.hashCode();
-        result1 = 31 * result1 + result.hashCode();
-        return result1;
-    }
-
-    @Override
-    public String toString() {
-        return "AdsWriteControlResponse{" +
-            "result=" + result +
-            "} " + super.toString();
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands;
+
+import org.apache.plc4x.java.ads.api.commands.types.Result;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Command;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * Changes the ADS status and the device status of an ADS device.
+ */
+@AdsCommandType(Command.ADS_WRITE_CONTROL)
+public class AdsWriteControlResponse extends AdsAbstractResponse {
+    /**
+     * 4 bytes	ADS error number
+     */
+    private final Result result;
+
+    private AdsWriteControlResponse(AmsHeader amsHeader, Result result) {
+        super(amsHeader);
+        this.result = requireNonNull(result);
+    }
+
+    private AdsWriteControlResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result) {
+        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
+        this.result = requireNonNull(result);
+    }
+
+    public static AdsWriteControlResponse of(AmsHeader amsHeader, Result result) {
+        return new AdsWriteControlResponse(amsHeader, result);
+    }
+
+    public static AdsWriteControlResponse of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result) {
+        return new AdsWriteControlResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result);
+    }
+
+    public Result getResult() {
+        return result;
+    }
+
+    @Override
+    public AdsData getAdsData() {
+        return buildADSData(result);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof AdsWriteControlResponse))
+            return false;
+        if (!super.equals(o))
+            return false;
+
+        AdsWriteControlResponse that = (AdsWriteControlResponse) o;
+
+        return result.equals(that.result);
+    }
+
+    @Override
+    public int hashCode() {
+        int result1 = super.hashCode();
+        result1 = 31 * result1 + result.hashCode();
+        return result1;
+    }
+
+    @Override
+    public String toString() {
+        return "AdsWriteControlResponse{" +
+            "result=" + result +
+            "} " + super.toString();
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteRequest.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteRequest.java
index 1f431f3effc..362a62839c3 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteRequest.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteRequest.java
@@ -1,148 +1,148 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands;
-
-import org.apache.plc4x.java.ads.api.commands.types.Data;
-import org.apache.plc4x.java.ads.api.commands.types.IndexGroup;
-import org.apache.plc4x.java.ads.api.commands.types.IndexOffset;
-import org.apache.plc4x.java.ads.api.commands.types.Length;
-import org.apache.plc4x.java.ads.api.generic.AdsData;
-import org.apache.plc4x.java.ads.api.generic.AmsHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Command;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-import org.apache.plc4x.java.ads.api.util.LengthSupplier;
-
-import static java.util.Objects.requireNonNull;
-
-/**
- * With ADS Write data can be written to an ADS device. The data are addressed by the Index Group and the Index Offset.
- */
-@AdsCommandType(Command.ADS_WRITE)
-public class AdsWriteRequest extends AdsAbstractRequest {
-
-    /**
-     * 4 bytes	Index Group in which the data should be written
-     */
-    private final IndexGroup indexGroup;
-    /**
-     * 4 bytes	Index Offset, in which the data should be written
-     */
-    private final IndexOffset indexOffset;
-    /**
-     * 4 bytes	Length of data in bytes which are written
-     */
-    private final Length length;
-    /**
-     * n bytes	Data which are written in the ADS device.
-     */
-    private final Data data;
-
-    private final transient LengthSupplier lengthSupplier;
-
-    private AdsWriteRequest(AmsHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length, Data data) {
-        super(amsHeader);
-        this.indexGroup = requireNonNull(indexGroup);
-        this.indexOffset = requireNonNull(indexOffset);
-        this.length = requireNonNull(length);
-        this.data = requireNonNull(data);
-        this.lengthSupplier = null;
-    }
-
-    private AdsWriteRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, Data data) {
-        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
-        this.indexGroup = requireNonNull(indexGroup);
-        this.indexOffset = requireNonNull(indexOffset);
-        this.length = null;
-        this.data = requireNonNull(data);
-        this.lengthSupplier = data;
-    }
-
-    public static AdsWriteRequest of(AmsHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length, Data data) {
-        return new AdsWriteRequest(amsHeader, indexGroup, indexOffset, length, data);
-    }
-
-    public static AdsWriteRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, Data data) {
-        return new AdsWriteRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, data);
-    }
-
-    public IndexGroup getIndexGroup() {
-        return indexGroup;
-    }
-
-    public IndexOffset getIndexOffset() {
-        return indexOffset;
-    }
-
-    public Length getLength() {
-        return lengthSupplier == null ? length : Length.of(lengthSupplier);
-    }
-
-    public Data getData() {
-        return data;
-    }
-
-    @Override
-    public AdsData getAdsData() {
-        return buildADSData(indexGroup, indexOffset, getLength(), data);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (!(o instanceof AdsWriteRequest))
-            return false;
-        if (!super.equals(o))
-            return false;
-
-        AdsWriteRequest that = (AdsWriteRequest) o;
-
-        if (!indexGroup.equals(that.indexGroup))
-            return false;
-        if (!indexOffset.equals(that.indexOffset))
-            return false;
-        if (!getLength().equals(that.getLength()))
-            return false;
-
-        return data.equals(that.data);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = super.hashCode();
-        result = 31 * result + indexGroup.hashCode();
-        result = 31 * result + indexOffset.hashCode();
-        result = 31 * result + getLength().hashCode();
-        result = 31 * result + data.hashCode();
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "AdsWriteRequest{" +
-            "indexGroup=" + indexGroup +
-            ", indexOffset=" + indexOffset +
-            ", length=" + getLength() +
-            ", data=" + data +
-            "} " + super.toString();
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands;
+
+import org.apache.plc4x.java.ads.api.commands.types.Data;
+import org.apache.plc4x.java.ads.api.commands.types.IndexGroup;
+import org.apache.plc4x.java.ads.api.commands.types.IndexOffset;
+import org.apache.plc4x.java.ads.api.commands.types.Length;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Command;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+import org.apache.plc4x.java.ads.api.util.LengthSupplier;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * With ADS Write data can be written to an ADS device. The data are addressed by the Index Group and the Index Offset.
+ */
+@AdsCommandType(Command.ADS_WRITE)
+public class AdsWriteRequest extends AdsAbstractRequest {
+
+    /**
+     * 4 bytes	Index Group in which the data should be written
+     */
+    private final IndexGroup indexGroup;
+    /**
+     * 4 bytes	Index Offset, in which the data should be written
+     */
+    private final IndexOffset indexOffset;
+    /**
+     * 4 bytes	Length of data in bytes which are written
+     */
+    private final Length length;
+    /**
+     * n bytes	Data which are written in the ADS device.
+     */
+    private final Data data;
+
+    private final transient LengthSupplier lengthSupplier;
+
+    private AdsWriteRequest(AmsHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length, Data data) {
+        super(amsHeader);
+        this.indexGroup = requireNonNull(indexGroup);
+        this.indexOffset = requireNonNull(indexOffset);
+        this.length = requireNonNull(length);
+        this.data = requireNonNull(data);
+        this.lengthSupplier = null;
+    }
+
+    private AdsWriteRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, Data data) {
+        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
+        this.indexGroup = requireNonNull(indexGroup);
+        this.indexOffset = requireNonNull(indexOffset);
+        this.length = null;
+        this.data = requireNonNull(data);
+        this.lengthSupplier = data;
+    }
+
+    public static AdsWriteRequest of(AmsHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length, Data data) {
+        return new AdsWriteRequest(amsHeader, indexGroup, indexOffset, length, data);
+    }
+
+    public static AdsWriteRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, Data data) {
+        return new AdsWriteRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, data);
+    }
+
+    public IndexGroup getIndexGroup() {
+        return indexGroup;
+    }
+
+    public IndexOffset getIndexOffset() {
+        return indexOffset;
+    }
+
+    public Length getLength() {
+        return lengthSupplier == null ? length : Length.of(lengthSupplier);
+    }
+
+    public Data getData() {
+        return data;
+    }
+
+    @Override
+    public AdsData getAdsData() {
+        return buildADSData(indexGroup, indexOffset, getLength(), data);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof AdsWriteRequest))
+            return false;
+        if (!super.equals(o))
+            return false;
+
+        AdsWriteRequest that = (AdsWriteRequest) o;
+
+        if (!indexGroup.equals(that.indexGroup))
+            return false;
+        if (!indexOffset.equals(that.indexOffset))
+            return false;
+        if (!getLength().equals(that.getLength()))
+            return false;
+
+        return data.equals(that.data);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + indexGroup.hashCode();
+        result = 31 * result + indexOffset.hashCode();
+        result = 31 * result + getLength().hashCode();
+        result = 31 * result + data.hashCode();
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "AdsWriteRequest{" +
+            "indexGroup=" + indexGroup +
+            ", indexOffset=" + indexOffset +
+            ", length=" + getLength() +
+            ", data=" + data +
+            "} " + super.toString();
+    }
+
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteResponse.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteResponse.java
index f18b405c004..7c635e09c97 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteResponse.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteResponse.java
@@ -1,96 +1,96 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands;
-
-import org.apache.plc4x.java.ads.api.commands.types.Result;
-import org.apache.plc4x.java.ads.api.generic.AdsData;
-import org.apache.plc4x.java.ads.api.generic.AmsHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Command;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-
-import static java.util.Objects.requireNonNull;
-
-/**
- * With ADS Write data can be written to an ADS device.
- */
-@AdsCommandType(Command.ADS_WRITE)
-public class AdsWriteResponse extends AdsAbstractResponse {
-
-    /**
-     * 4 bytes	ADS error number
-     */
-    private final Result result;
-
-    private AdsWriteResponse(AmsHeader amsHeader, Result result) {
-        super(amsHeader);
-        this.result = requireNonNull(result);
-    }
-
-    private AdsWriteResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result) {
-        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
-        this.result = requireNonNull(result);
-    }
-
-    public static AdsWriteResponse of(AmsHeader amsHeader, Result result) {
-        return new AdsWriteResponse(amsHeader, result);
-    }
-
-    public static AdsWriteResponse of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result) {
-        return new AdsWriteResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result);
-    }
-
-    public Result getResult() {
-        return result;
-    }
-
-    @Override
-    public AdsData getAdsData() {
-        return buildADSData(result);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (!(o instanceof AdsWriteResponse))
-            return false;
-        if (!super.equals(o))
-            return false;
-
-        AdsWriteResponse that = (AdsWriteResponse) o;
-
-        return result.equals(that.result);
-    }
-
-    @Override
-    public int hashCode() {
-        int result1 = super.hashCode();
-        result1 = 31 * result1 + result.hashCode();
-        return result1;
-    }
-
-    @Override
-    public String toString() {
-        return "AdsWriteResponse{" +
-            "result=" + result +
-            "} " + super.toString();
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands;
+
+import org.apache.plc4x.java.ads.api.commands.types.Result;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Command;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * With ADS Write data can be written to an ADS device.
+ */
+@AdsCommandType(Command.ADS_WRITE)
+public class AdsWriteResponse extends AdsAbstractResponse {
+
+    /**
+     * 4 bytes	ADS error number
+     */
+    private final Result result;
+
+    private AdsWriteResponse(AmsHeader amsHeader, Result result) {
+        super(amsHeader);
+        this.result = requireNonNull(result);
+    }
+
+    private AdsWriteResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result) {
+        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
+        this.result = requireNonNull(result);
+    }
+
+    public static AdsWriteResponse of(AmsHeader amsHeader, Result result) {
+        return new AdsWriteResponse(amsHeader, result);
+    }
+
+    public static AdsWriteResponse of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result) {
+        return new AdsWriteResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result);
+    }
+
+    public Result getResult() {
+        return result;
+    }
+
+    @Override
+    public AdsData getAdsData() {
+        return buildADSData(result);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof AdsWriteResponse))
+            return false;
+        if (!super.equals(o))
+            return false;
+
+        AdsWriteResponse that = (AdsWriteResponse) o;
+
+        return result.equals(that.result);
+    }
+
+    @Override
+    public int hashCode() {
+        int result1 = super.hashCode();
+        result1 = 31 * result1 + result.hashCode();
+        return result1;
+    }
+
+    @Override
+    public String toString() {
+        return "AdsWriteResponse{" +
+            "result=" + result +
+            "} " + super.toString();
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/UnknownCommand.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/UnknownCommand.java
index 44bf79c73f8..615354c2646 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/UnknownCommand.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/UnknownCommand.java
@@ -1,88 +1,88 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.generic.AdsData;
-import org.apache.plc4x.java.ads.api.generic.AmsHeader;
-import org.apache.plc4x.java.ads.api.generic.AmsPacket;
-import org.apache.plc4x.java.ads.api.generic.types.*;
-
-import static java.util.Objects.requireNonNull;
-
-/**
- * Unknown ADS Package
- */
-@AdsCommandType(Command.UNKNOWN)
-public class UnknownCommand extends AmsPacket {
-
-    private final transient ByteBuf remainingBytes;
-
-    private UnknownCommand(AmsHeader amsHeader, ByteBuf remainingBytes) {
-        super(amsHeader);
-        this.remainingBytes = requireNonNull(remainingBytes);
-    }
-
-    private UnknownCommand(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, State stateId, Invoke invokeId, ByteBuf remainingBytes) {
-        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, stateId, invokeId);
-        this.remainingBytes = requireNonNull(remainingBytes);
-    }
-
-    @Override
-    public AdsData getAdsData() {
-        return () -> remainingBytes;
-    }
-
-    public static UnknownCommand of(AmsHeader amsHeader, ByteBuf remainingBytes) {
-        return new UnknownCommand(amsHeader, remainingBytes);
-    }
-
-    public static UnknownCommand of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, State stateId, Invoke invokeId, ByteBuf remainingBytes) {
-        return new UnknownCommand(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, stateId, invokeId, remainingBytes);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof UnknownCommand)) {
-            return false;
-        }
-        if (!super.equals(o)) {
-            return false;
-        }
-
-        UnknownCommand that = (UnknownCommand) o;
-
-        return remainingBytes.equals(that.remainingBytes);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = super.hashCode();
-        result = 31 * result + remainingBytes.hashCode();
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "UnknownCommand";
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.AmsPacket;
+import org.apache.plc4x.java.ads.api.generic.types.*;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * Unknown ADS Package
+ */
+@AdsCommandType(Command.UNKNOWN)
+public class UnknownCommand extends AmsPacket {
+
+    private final transient ByteBuf remainingBytes;
+
+    private UnknownCommand(AmsHeader amsHeader, ByteBuf remainingBytes) {
+        super(amsHeader);
+        this.remainingBytes = requireNonNull(remainingBytes);
+    }
+
+    private UnknownCommand(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, State stateId, Invoke invokeId, ByteBuf remainingBytes) {
+        super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, stateId, invokeId);
+        this.remainingBytes = requireNonNull(remainingBytes);
+    }
+
+    @Override
+    public AdsData getAdsData() {
+        return () -> remainingBytes;
+    }
+
+    public static UnknownCommand of(AmsHeader amsHeader, ByteBuf remainingBytes) {
+        return new UnknownCommand(amsHeader, remainingBytes);
+    }
+
+    public static UnknownCommand of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, State stateId, Invoke invokeId, ByteBuf remainingBytes) {
+        return new UnknownCommand(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, stateId, invokeId, remainingBytes);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof UnknownCommand)) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+
+        UnknownCommand that = (UnknownCommand) o;
+
+        return remainingBytes.equals(that.remainingBytes);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + remainingBytes.hashCode();
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "UnknownCommand";
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/package-info.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/package-info.java
index 0ae1900b83c..b56850b2826 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/package-info.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/package-info.java
@@ -1,22 +1,22 @@
-/*
- 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
-
-   http://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.
- */
-/**
- * This package contains ams/ads generic commands.
- */
+/*
+ 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
+
+   http://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.
+ */
+/**
+ * This package contains ams/ads generic commands.
+ */
 package org.apache.plc4x.java.ads.api.commands;
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/AdsNotificationSample.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/AdsNotificationSample.java
index c963466e7e4..2da52dde980 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/AdsNotificationSample.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/AdsNotificationSample.java
@@ -1,116 +1,116 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.ByteReadable;
-import org.apache.plc4x.java.ads.api.util.LengthSupplier;
-
-import static java.util.Objects.requireNonNull;
-
-public class AdsNotificationSample implements ByteReadable {
-
-    /**
-     * 4 Bytes	Handle of notification.
-     */
-    private final NotificationHandle notificationHandle;
-    /**
-     * 4 Bytes	Size of data range in bytes.
-     */
-    private final SampleSize sampleSize;
-    /**
-     * n Bytes	Data
-     */
-    private final Data data;
-
-    private final transient LengthSupplier lengthSupplier;
-
-    private AdsNotificationSample(NotificationHandle notificationHandle, Data data) {
-        this.notificationHandle = requireNonNull(notificationHandle);
-        this.sampleSize = null;
-        this.data = requireNonNull(data);
-        lengthSupplier = data;
-    }
-
-    private AdsNotificationSample(NotificationHandle notificationHandle, SampleSize sampleSize, Data data) {
-        this.notificationHandle = requireNonNull(notificationHandle);
-        this.sampleSize = requireNonNull(sampleSize);
-        this.data = requireNonNull(data);
-        lengthSupplier = null;
-    }
-
-    public static AdsNotificationSample of(NotificationHandle notificationHandle, Data data) {
-        return new AdsNotificationSample(notificationHandle, data);
-    }
-
-    public static AdsNotificationSample of(NotificationHandle notificationHandle, SampleSize sampleSize, Data data) {
-        return new AdsNotificationSample(notificationHandle, sampleSize, data);
-    }
-
-    @Override
-    public ByteBuf getByteBuf() {
-        return buildByteBuff(notificationHandle, getSampleSize(), data);
-    }
-
-    public NotificationHandle getNotificationHandle() {
-        return notificationHandle;
-    }
-
-    public SampleSize getSampleSize() {
-        return lengthSupplier == null ? sampleSize : SampleSize.of(lengthSupplier);
-    }
-
-    public Data getData() {
-        return data;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (!(o instanceof AdsNotificationSample))
-            return false;
-
-        AdsNotificationSample that = (AdsNotificationSample) o;
-
-        if (!notificationHandle.equals(that.notificationHandle))
-            return false;
-        if (!data.equals(that.data))
-            return false;
-
-        return getSampleSize().equals(that.getSampleSize());
-    }
-
-    @Override
-    public int hashCode() {
-        int result = notificationHandle.hashCode();
-        result = 31 * result + data.hashCode();
-        result = 31 * result + getSampleSize().hashCode();
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "AdsNotificationSample{" +
-            "notificationHandle=" + notificationHandle +
-            ", sampleSize=" + getSampleSize() +
-            ", data=" + data +
-            '}';
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.ByteReadable;
+import org.apache.plc4x.java.ads.api.util.LengthSupplier;
+
+import static java.util.Objects.requireNonNull;
+
+public class AdsNotificationSample implements ByteReadable {
+
+    /**
+     * 4 Bytes	Handle of notification.
+     */
+    private final NotificationHandle notificationHandle;
+    /**
+     * 4 Bytes	Size of data range in bytes.
+     */
+    private final SampleSize sampleSize;
+    /**
+     * n Bytes	Data
+     */
+    private final Data data;
+
+    private final transient LengthSupplier lengthSupplier;
+
+    private AdsNotificationSample(NotificationHandle notificationHandle, Data data) {
+        this.notificationHandle = requireNonNull(notificationHandle);
+        this.sampleSize = null;
+        this.data = requireNonNull(data);
+        lengthSupplier = data;
+    }
+
+    private AdsNotificationSample(NotificationHandle notificationHandle, SampleSize sampleSize, Data data) {
+        this.notificationHandle = requireNonNull(notificationHandle);
+        this.sampleSize = requireNonNull(sampleSize);
+        this.data = requireNonNull(data);
+        lengthSupplier = null;
+    }
+
+    public static AdsNotificationSample of(NotificationHandle notificationHandle, Data data) {
+        return new AdsNotificationSample(notificationHandle, data);
+    }
+
+    public static AdsNotificationSample of(NotificationHandle notificationHandle, SampleSize sampleSize, Data data) {
+        return new AdsNotificationSample(notificationHandle, sampleSize, data);
+    }
+
+    @Override
+    public ByteBuf getByteBuf() {
+        return buildByteBuff(notificationHandle, getSampleSize(), data);
+    }
+
+    public NotificationHandle getNotificationHandle() {
+        return notificationHandle;
+    }
+
+    public SampleSize getSampleSize() {
+        return lengthSupplier == null ? sampleSize : SampleSize.of(lengthSupplier);
+    }
+
+    public Data getData() {
+        return data;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof AdsNotificationSample))
+            return false;
+
+        AdsNotificationSample that = (AdsNotificationSample) o;
+
+        if (!notificationHandle.equals(that.notificationHandle))
+            return false;
+        if (!data.equals(that.data))
+            return false;
+
+        return getSampleSize().equals(that.getSampleSize());
+    }
+
+    @Override
+    public int hashCode() {
+        int result = notificationHandle.hashCode();
+        result = 31 * result + data.hashCode();
+        result = 31 * result + getSampleSize().hashCode();
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "AdsNotificationSample{" +
+            "notificationHandle=" + notificationHandle +
+            ", sampleSize=" + getSampleSize() +
+            ", data=" + data +
+            '}';
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/AdsReturnCode.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/AdsReturnCode.java
index edadf216d14..08c8be5d2b8 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/AdsReturnCode.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/AdsReturnCode.java
@@ -1,237 +1,237 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import static java.lang.Long.toHexString;
-import static java.util.Objects.requireNonNull;
-
-/**
- * Based on spec from: https://infosys.beckhoff.com/content/1033/tcadscommon/html/ads_returncodes.htm
- */
-// Error codes: 0x000..., 0x500..., 0x700..., 0x1000..., 0x274C...
-public enum AdsReturnCode {
-    // Global Error Codes
-    ADS_CODE_0(0x0, 0, "no error"),
-    ADS_CODE_1(0x1, 1, "Internal error"),
-    ADS_CODE_2(0x2, 2, "No Rtime"),
-    ADS_CODE_3(0x3, 3, "Allocation locked memory error"),
-    ADS_CODE_4(0x4, 4, "Insert mailbox error", "No ADS mailbox was available to process this message.", "Reduce the number of ADS calls (e.g ADS-Sum commands or Max Delay Parameter)"),
-    ADS_CODE_5(0x5, 5, "Wrong receive HMSG"),
-    ADS_CODE_6(0x6, 6, "target port not found", "ADS Server not started"),
-    ADS_CODE_7(0x7, 7, "target machine not found", "Missing ADS routes"),
-    ADS_CODE_8(0x8, 8, "Unknown command ID"),
-    ADS_CODE_9(0x9, 9, "Bad task ID"),
-    ADS_CODE_10(0xA, 10, "No IO"),
-    ADS_CODE_11(0xB, 11, "Unknown ADS command"),
-    ADS_CODE_12(0xC, 12, "Win 32 error"),
-    ADS_CODE_13(0xD, 13, "Port not connected"),
-    ADS_CODE_14(0xE, 14, "Invalid ADS length"),
-    ADS_CODE_15(0xF, 15, "Invalid ADS Net ID"),
-    ADS_CODE_16(0x10, 16, "Low Installation level"),
-    ADS_CODE_17(0x11, 17, "No debug available"),
-    ADS_CODE_18(0x12, 18, "Port disabled"),
-    ADS_CODE_19(0x13, 19, "Port already connected"),
-    ADS_CODE_20(0x14, 20, "ADS Sync Win32 error"),
-    ADS_CODE_21(0x15, 21, "ADS Sync Timeout"),
-    ADS_CODE_22(0x16, 22, "ADS Sync AMS error"),
-    ADS_CODE_23(0x17, 23, "ADS Sync no index map"),
-    ADS_CODE_24(0x18, 24, "Invalid ADS port"),
-    ADS_CODE_25(0x19, 25, "No memory"),
-    ADS_CODE_26(0x1A, 26, "TCP send error"),
-    ADS_CODE_27(0x1B, 27, "Host unreachable"),
-    ADS_CODE_28(0x1C, 28, "Invalid AMS fragment"),
-
-
-    // Router Error Codes
-    ADS_CODE_1280(0x500, 1280, "ROUTERERR_NOLOCKEDMEMORY", "No locked memory can be allocated"),
-    ADS_CODE_1281(0x501, 1281, "ROUTERERR_RESIZEMEMORY", "The size of the  router memory could not be changed"),
-    ADS_CODE_1282(0x502, 1282, "ROUTERERR_MAILBOXFULL", "The mailbox has reached the maximum number of possible messages. The current sent message was rejected", "Check the connection between the communication partners"),
-    ADS_CODE_1283(0x503, 1283, "ROUTERERR_DEBUGBOXFULL ", "The mailbox has reached the maximum number of possible messages.The sent message will not be displayed in the debug monitor", "Check the connection to the debug monitor"),
-    ADS_CODE_1284(0x504, 1284, "ROUTERERR_UNKNOWNPORTTYPE ", "The port type is unknown"),
-    ADS_CODE_1285(0x505, 1285, "ROUTERERR_NOTINITIALIZED", "Router is not initialised"),
-    ADS_CODE_1286(0x506, 1286, "ROUTERERR_PORTALREADYINUSE ", "The desired port number is already assigned"),
-    ADS_CODE_1287(0x507, 1287, "ROUTERERR_NOTREGISTERED ", "Port not registered"),
-    ADS_CODE_1288(0x508, 1288, "ROUTERERR_NOMOREQUEUES", "The maximum number of Ports reached"),
-    ADS_CODE_1289(0x509, 1289, "ROUTERERR_INVALIDPORT ", "The port is invalid."),
-    ADS_CODE_1290(0x50A, 1290, "ROUTERERR_NOTACTIVATED ", "TwinCAT Router not active"),
-    ADS_CODE_1291(0x50B, 1291, "ROUTERERR_FRAGMENTBOXFULL"),
-    ADS_CODE_1292(0x50C, 1292, "ROUTERERR_FRAGMENTTIMEOUT"),
-    ADS_CODE_1293(0x50D, 1293, "ROUTERERR_TOBEREMOVED"),
-
-
-    // General ADS Error Codes
-    ADS_CODE_1792(0x700, 1792, "error class <device error>"),
-    ADS_CODE_1793(0x701, 1793, "Service is not supported by server"),
-    ADS_CODE_1794(0x702, 1794, "invalid index group"),
-    ADS_CODE_1795(0x703, 1795, "invalid index offset"),
-    ADS_CODE_1796(0x704, 1796, "reading/writing not permitted"),
-    ADS_CODE_1797(0x705, 1797, "parameter size not correct"),
-    ADS_CODE_1798(0x706, 1798, "invalid parameter value(s)"),
-    ADS_CODE_1799(0x707, 1799, "device is not in a ready state"),
-    ADS_CODE_1800(0x708, 1800, "device is busy"),
-    ADS_CODE_1801(0x709, 1801, "invalid context (must be in Windows)"),
-    ADS_CODE_1802(0x70A, 1802, "out of memory"),
-    ADS_CODE_1803(0x70B, 1803, "invalid parameter value(s)"),
-    ADS_CODE_1804(0x70C, 1804, "not found (files, ...)"),
-    ADS_CODE_1805(0x70D, 1805, "syntax error in command or file"),
-    ADS_CODE_1806(0x70E, 1806, "objects do not match"),
-    ADS_CODE_1807(0x70F, 1807, "object already exists"),
-    ADS_CODE_1808(0x710, 1808, "symbol not found"),
-    ADS_CODE_1809(0x711, 1809, "symbol version invalid", "Onlinechange", "Release handle and get a new one"),
-    ADS_CODE_1810(0x712, 1810, "server is in invalid state"),
-    ADS_CODE_1811(0x713, 1811, "AdsTransMode not supported"),
-    ADS_CODE_1812(0x714, 1812, "Notification handle is invalid", "Onlinechange", "Release handle and get a new one"),
-    ADS_CODE_1813(0x715, 1813, "Notification client not registered"),
-    ADS_CODE_1814(0x716, 1814, "no more notification handles"),
-    ADS_CODE_1815(0x717, 1815, "size for watch too big"),
-    ADS_CODE_1816(0x718, 1816, "device not initialized"),
-    ADS_CODE_1817(0x719, 1817, "device has a timeout"),
-    ADS_CODE_1818(0x71A, 1818, "query interface failed"),
-    ADS_CODE_1819(0x71B, 1819, "wrong interface required"),
-    ADS_CODE_1820(0x71C, 1820, "class ID is invalid"),
-    ADS_CODE_1821(0x71D, 1821, "object ID is invalid"),
-    ADS_CODE_1822(0x71E, 1822, "request is pending"),
-    ADS_CODE_1823(0x71F, 1823, "request is aborted"),
-    ADS_CODE_1824(0x720, 1824, "signal warning"),
-    ADS_CODE_1825(0x721, 1825, "invalid array index"),
-    ADS_CODE_1826(0x722, 1826, "symbol not active", "Onlinechange", "Release handle and get a new one"),
-    ADS_CODE_1827(0x723, 1827, "access denied"),
-    ADS_CODE_1828(0x724, 1828, "missing license ", "", "Activate license for TwinCAT 3 function"),
-    ADS_CODE_1836(0x72c, 1836, "exception occured during system start", "", "Check each device transistions"),
-    ADS_CODE_1856(0x740, 1856, "Error class <client error>"),
-    ADS_CODE_1857(0x741, 1857, "invalid parameter at service"),
-    ADS_CODE_1858(0x742, 1858, "polling list is empty"),
-    ADS_CODE_1859(0x743, 1859, "var connection already in use"),
-    ADS_CODE_1860(0x744, 1860, "invoke ID in use"),
-    ADS_CODE_1861(0x745, 1861, "timeout elapsed", "", "Check ADS routes of sender and receiver and your firewall setting"),
-    ADS_CODE_1862(0x746, 1862, "error in win32 subsystem"),
-    ADS_CODE_1863(0x747, 1863, "Invalid client timeout value"),
-    ADS_CODE_1864(0x748, 1864, "ads-port not opened"),
-    ADS_CODE_1872(0x750, 1872, "internal error in ads sync"),
-    ADS_CODE_1873(0x751, 1873, "hash table overflow"),
-    ADS_CODE_1874(0x752, 1874, "key not found in hash"),
-    ADS_CODE_1875(0x753, 1875, "no more symbols in cache"),
-    ADS_CODE_1876(0x754, 1876, "invalid response received"),
-    ADS_CODE_1877(0x755, 1877, "sync port is locked"),
-
-
-    // RTime Error Codes
-    ADS_CODE_4096(0x1000, 4096, "RTERR_INTERNAL ", "Internal fatal error in the TwinCAT real-time system"),
-    ADS_CODE_4097(0x1001, 4097, "RTERR_BADTIMERPERIODS", "Timer value not vaild"),
-    ADS_CODE_4098(0x1002, 4098, "RTERR_INVALIDTASKPTR", "Task pointer has the invalid value ZERO"),
-    ADS_CODE_4099(0x1003, 4099, "RTERR_INVALIDSTACKPTR", "Task stack pointer has the invalid value ZERO"),
-    ADS_CODE_4100(0x1004, 4100, "RTERR_PRIOEXISTS", "The demand task priority is already assigned"),
-    ADS_CODE_4101(0x1005, 4101, "RTERR_NOMORETCB", "No more free TCB (Task Control Block) available. Maximum number of TCBs is 64"),
-    ADS_CODE_4102(0x1006, 4102, "RTERR_NOMORESEMAS", "No more free semaphores available. Maximum number of semaphores is 64"),
-    ADS_CODE_4103(0x1007, 4103, "RTERR_NOMOREQUEUES", "No more free queue available. Maximum number of queue is 64"),
-    ADS_CODE_4104(0x1008, 4104, "TwinCAT ", "reserved."),
-    ADS_CODE_4105(0x1009, 4105, "TwinCAT ", "reserved."),
-    ADS_CODE_4106(0x100A, 4106, "TwinCAT ", "reserved."),
-    ADS_CODE_4107(0x100B, 4107, "TwinCAT ", "reserved."),
-    ADS_CODE_4108(0x100C, 4108, "TwinCAT ", "reserved."),
-    ADS_CODE_4109(0x100D, 4109, "RTERR_EXTIRQALREADYDEF", "An external synchronisation interrupt is already applied"),
-    ADS_CODE_4110(0x100E, 4110, "RTERR_EXTIRQNOTDEF", "No external synchronsiation interrupt applied"),
-    ADS_CODE_4111(0x100F, 4111, "RTERR_EXTIRQINSTALLFAILED", "The apply of the external synchronisation interrupt failed"),
-    ADS_CODE_4112(0x1010, 4112, "RTERR_IRQLNOTLESSOREQUAL", "Call of a service function in the wrong context"),
-    ADS_CODE_4119(0x1017, 4119, "RTERR_VMXNOTSUPPORTED", "Intel VT-x extension is not supported."),
-    ADS_CODE_4120(0x1018, 4120, "RTERR_VMXDISABLED", "Intel VT-x extension is not enabled in BIOS."),
-    ADS_CODE_4121(0x1019, 4121, "RTERR_VMXCONTROLSMISSING", "Missing feature in Intel VT-x extension."),
-    ADS_CODE_4122(0x101A, 4122, "RTERR_VMXENABLEFAILS", "Enabling Intel VT-x fails."),
-
-
-    // TCP Winsock Error Codes
-    ADS_CODE_10060(0x274c, 10060, "A socket operation was attempted to an unreachable host", "Host unreachable", "Check network connection via ping"),
-    ADS_CODE_10061(0x274d, 10061, "A connection attempt failed because the connected party did not properly respond after a period of time,or established connection failed because connected host has failed to respond.", "Host unreachable", "Check network connection via ping"),
-    ADS_CODE_10065(0x2751, 10065, "No connection could be made because the target machine actively refused it"),
-    UNKNOWN(0, 0, "", "", "");
-
-    private final long hex;
-    private final long dec;
-    private final String description;
-    private final String possibleCauses;
-    private final String solution;
-
-    AdsReturnCode(long hex, long dec, String description) {
-        this(hex, dec, description, "");
-    }
-
-    AdsReturnCode(long hex, long dec, String description, String possibleCauses) {
-        this(hex, dec, description, possibleCauses, "");
-    }
-
-    AdsReturnCode(long hex, long dec, String description, String possibleCauses, String solution) {
-        this.hex = hex;
-        this.dec = dec;
-        if (hex != dec) {
-            throw new IllegalArgumentException("hex " + hex + " is different from dec " + dec);
-        }
-        this.description = requireNonNull(description);
-        this.possibleCauses = possibleCauses;
-        this.solution = solution;
-    }
-
-    // TODO: optimize with map
-    public static AdsReturnCode of(long hex) {
-        for (AdsReturnCode adsReturnCode : values()) {
-            if (adsReturnCode.hex == hex) {
-                return adsReturnCode;
-            }
-        }
-        return UNKNOWN;
-    }
-
-    public static AdsReturnCode of(String name) {
-        return valueOf(name);
-    }
-
-    public static AdsReturnCode ofInt(String value) {
-        return of(Long.parseLong(value));
-    }
-
-    public long getHex() {
-        return hex;
-    }
-
-    public long getDec() {
-        return dec;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public String getPossibleCauses() {
-        return possibleCauses;
-    }
-
-    public String getSolution() {
-        return solution;
-    }
-
-    @Override
-    public String toString() {
-        return "AdsReturnCode{" +
-            "hex=" + String.format("0x%4s", toHexString(hex)).replace(' ', '0') +
-            ", dec=" + dec +
-            ", description='" + description + '\'' +
-            ", possibleCauses='" + possibleCauses + '\'' +
-            ", solution='" + solution + '\'' +
-            '}';
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import static java.lang.Long.toHexString;
+import static java.util.Objects.requireNonNull;
+
+/**
+ * Based on spec from: https://infosys.beckhoff.com/content/1033/tcadscommon/html/ads_returncodes.htm
+ */
+// Error codes: 0x000..., 0x500..., 0x700..., 0x1000..., 0x274C...
+public enum AdsReturnCode {
+    // Global Error Codes
+    ADS_CODE_0(0x0, 0, "no error"),
+    ADS_CODE_1(0x1, 1, "Internal error"),
+    ADS_CODE_2(0x2, 2, "No Rtime"),
+    ADS_CODE_3(0x3, 3, "Allocation locked memory error"),
+    ADS_CODE_4(0x4, 4, "Insert mailbox error", "No ADS mailbox was available to process this message.", "Reduce the number of ADS calls (e.g ADS-Sum commands or Max Delay Parameter)"),
+    ADS_CODE_5(0x5, 5, "Wrong receive HMSG"),
+    ADS_CODE_6(0x6, 6, "target port not found", "ADS Server not started"),
+    ADS_CODE_7(0x7, 7, "target machine not found", "Missing ADS routes"),
+    ADS_CODE_8(0x8, 8, "Unknown command ID"),
+    ADS_CODE_9(0x9, 9, "Bad task ID"),
+    ADS_CODE_10(0xA, 10, "No IO"),
+    ADS_CODE_11(0xB, 11, "Unknown ADS command"),
+    ADS_CODE_12(0xC, 12, "Win 32 error"),
+    ADS_CODE_13(0xD, 13, "Port not connected"),
+    ADS_CODE_14(0xE, 14, "Invalid ADS length"),
+    ADS_CODE_15(0xF, 15, "Invalid ADS Net ID"),
+    ADS_CODE_16(0x10, 16, "Low Installation level"),
+    ADS_CODE_17(0x11, 17, "No debug available"),
+    ADS_CODE_18(0x12, 18, "Port disabled"),
+    ADS_CODE_19(0x13, 19, "Port already connected"),
+    ADS_CODE_20(0x14, 20, "ADS Sync Win32 error"),
+    ADS_CODE_21(0x15, 21, "ADS Sync Timeout"),
+    ADS_CODE_22(0x16, 22, "ADS Sync AMS error"),
+    ADS_CODE_23(0x17, 23, "ADS Sync no index map"),
+    ADS_CODE_24(0x18, 24, "Invalid ADS port"),
+    ADS_CODE_25(0x19, 25, "No memory"),
+    ADS_CODE_26(0x1A, 26, "TCP send error"),
+    ADS_CODE_27(0x1B, 27, "Host unreachable"),
+    ADS_CODE_28(0x1C, 28, "Invalid AMS fragment"),
+
+
+    // Router Error Codes
+    ADS_CODE_1280(0x500, 1280, "ROUTERERR_NOLOCKEDMEMORY", "No locked memory can be allocated"),
+    ADS_CODE_1281(0x501, 1281, "ROUTERERR_RESIZEMEMORY", "The size of the  router memory could not be changed"),
+    ADS_CODE_1282(0x502, 1282, "ROUTERERR_MAILBOXFULL", "The mailbox has reached the maximum number of possible messages. The current sent message was rejected", "Check the connection between the communication partners"),
+    ADS_CODE_1283(0x503, 1283, "ROUTERERR_DEBUGBOXFULL ", "The mailbox has reached the maximum number of possible messages.The sent message will not be displayed in the debug monitor", "Check the connection to the debug monitor"),
+    ADS_CODE_1284(0x504, 1284, "ROUTERERR_UNKNOWNPORTTYPE ", "The port type is unknown"),
+    ADS_CODE_1285(0x505, 1285, "ROUTERERR_NOTINITIALIZED", "Router is not initialised"),
+    ADS_CODE_1286(0x506, 1286, "ROUTERERR_PORTALREADYINUSE ", "The desired port number is already assigned"),
+    ADS_CODE_1287(0x507, 1287, "ROUTERERR_NOTREGISTERED ", "Port not registered"),
+    ADS_CODE_1288(0x508, 1288, "ROUTERERR_NOMOREQUEUES", "The maximum number of Ports reached"),
+    ADS_CODE_1289(0x509, 1289, "ROUTERERR_INVALIDPORT ", "The port is invalid."),
+    ADS_CODE_1290(0x50A, 1290, "ROUTERERR_NOTACTIVATED ", "TwinCAT Router not active"),
+    ADS_CODE_1291(0x50B, 1291, "ROUTERERR_FRAGMENTBOXFULL"),
+    ADS_CODE_1292(0x50C, 1292, "ROUTERERR_FRAGMENTTIMEOUT"),
+    ADS_CODE_1293(0x50D, 1293, "ROUTERERR_TOBEREMOVED"),
+
+
+    // General ADS Error Codes
+    ADS_CODE_1792(0x700, 1792, "error class <device error>"),
+    ADS_CODE_1793(0x701, 1793, "Service is not supported by server"),
+    ADS_CODE_1794(0x702, 1794, "invalid index group"),
+    ADS_CODE_1795(0x703, 1795, "invalid index offset"),
+    ADS_CODE_1796(0x704, 1796, "reading/writing not permitted"),
+    ADS_CODE_1797(0x705, 1797, "parameter size not correct"),
+    ADS_CODE_1798(0x706, 1798, "invalid parameter value(s)"),
+    ADS_CODE_1799(0x707, 1799, "device is not in a ready state"),
+    ADS_CODE_1800(0x708, 1800, "device is busy"),
+    ADS_CODE_1801(0x709, 1801, "invalid context (must be in Windows)"),
+    ADS_CODE_1802(0x70A, 1802, "out of memory"),
+    ADS_CODE_1803(0x70B, 1803, "invalid parameter value(s)"),
+    ADS_CODE_1804(0x70C, 1804, "not found (files, ...)"),
+    ADS_CODE_1805(0x70D, 1805, "syntax error in command or file"),
+    ADS_CODE_1806(0x70E, 1806, "objects do not match"),
+    ADS_CODE_1807(0x70F, 1807, "object already exists"),
+    ADS_CODE_1808(0x710, 1808, "symbol not found"),
+    ADS_CODE_1809(0x711, 1809, "symbol version invalid", "Onlinechange", "Release handle and get a new one"),
+    ADS_CODE_1810(0x712, 1810, "server is in invalid state"),
+    ADS_CODE_1811(0x713, 1811, "AdsTransMode not supported"),
+    ADS_CODE_1812(0x714, 1812, "Notification handle is invalid", "Onlinechange", "Release handle and get a new one"),
+    ADS_CODE_1813(0x715, 1813, "Notification client not registered"),
+    ADS_CODE_1814(0x716, 1814, "no more notification handles"),
+    ADS_CODE_1815(0x717, 1815, "size for watch too big"),
+    ADS_CODE_1816(0x718, 1816, "device not initialized"),
+    ADS_CODE_1817(0x719, 1817, "device has a timeout"),
+    ADS_CODE_1818(0x71A, 1818, "query interface failed"),
+    ADS_CODE_1819(0x71B, 1819, "wrong interface required"),
+    ADS_CODE_1820(0x71C, 1820, "class ID is invalid"),
+    ADS_CODE_1821(0x71D, 1821, "object ID is invalid"),
+    ADS_CODE_1822(0x71E, 1822, "request is pending"),
+    ADS_CODE_1823(0x71F, 1823, "request is aborted"),
+    ADS_CODE_1824(0x720, 1824, "signal warning"),
+    ADS_CODE_1825(0x721, 1825, "invalid array index"),
+    ADS_CODE_1826(0x722, 1826, "symbol not active", "Onlinechange", "Release handle and get a new one"),
+    ADS_CODE_1827(0x723, 1827, "access denied"),
+    ADS_CODE_1828(0x724, 1828, "missing license ", "", "Activate license for TwinCAT 3 function"),
+    ADS_CODE_1836(0x72c, 1836, "exception occured during system start", "", "Check each device transistions"),
+    ADS_CODE_1856(0x740, 1856, "Error class <client error>"),
+    ADS_CODE_1857(0x741, 1857, "invalid parameter at service"),
+    ADS_CODE_1858(0x742, 1858, "polling list is empty"),
+    ADS_CODE_1859(0x743, 1859, "var connection already in use"),
+    ADS_CODE_1860(0x744, 1860, "invoke ID in use"),
+    ADS_CODE_1861(0x745, 1861, "timeout elapsed", "", "Check ADS routes of sender and receiver and your firewall setting"),
+    ADS_CODE_1862(0x746, 1862, "error in win32 subsystem"),
+    ADS_CODE_1863(0x747, 1863, "Invalid client timeout value"),
+    ADS_CODE_1864(0x748, 1864, "ads-port not opened"),
+    ADS_CODE_1872(0x750, 1872, "internal error in ads sync"),
+    ADS_CODE_1873(0x751, 1873, "hash table overflow"),
+    ADS_CODE_1874(0x752, 1874, "key not found in hash"),
+    ADS_CODE_1875(0x753, 1875, "no more symbols in cache"),
+    ADS_CODE_1876(0x754, 1876, "invalid response received"),
+    ADS_CODE_1877(0x755, 1877, "sync port is locked"),
+
+
+    // RTime Error Codes
+    ADS_CODE_4096(0x1000, 4096, "RTERR_INTERNAL ", "Internal fatal error in the TwinCAT real-time system"),
+    ADS_CODE_4097(0x1001, 4097, "RTERR_BADTIMERPERIODS", "Timer value not vaild"),
+    ADS_CODE_4098(0x1002, 4098, "RTERR_INVALIDTASKPTR", "Task pointer has the invalid value ZERO"),
+    ADS_CODE_4099(0x1003, 4099, "RTERR_INVALIDSTACKPTR", "Task stack pointer has the invalid value ZERO"),
+    ADS_CODE_4100(0x1004, 4100, "RTERR_PRIOEXISTS", "The demand task priority is already assigned"),
+    ADS_CODE_4101(0x1005, 4101, "RTERR_NOMORETCB", "No more free TCB (Task Control Block) available. Maximum number of TCBs is 64"),
+    ADS_CODE_4102(0x1006, 4102, "RTERR_NOMORESEMAS", "No more free semaphores available. Maximum number of semaphores is 64"),
+    ADS_CODE_4103(0x1007, 4103, "RTERR_NOMOREQUEUES", "No more free queue available. Maximum number of queue is 64"),
+    ADS_CODE_4104(0x1008, 4104, "TwinCAT ", "reserved."),
+    ADS_CODE_4105(0x1009, 4105, "TwinCAT ", "reserved."),
+    ADS_CODE_4106(0x100A, 4106, "TwinCAT ", "reserved."),
+    ADS_CODE_4107(0x100B, 4107, "TwinCAT ", "reserved."),
+    ADS_CODE_4108(0x100C, 4108, "TwinCAT ", "reserved."),
+    ADS_CODE_4109(0x100D, 4109, "RTERR_EXTIRQALREADYDEF", "An external synchronisation interrupt is already applied"),
+    ADS_CODE_4110(0x100E, 4110, "RTERR_EXTIRQNOTDEF", "No external synchronsiation interrupt applied"),
+    ADS_CODE_4111(0x100F, 4111, "RTERR_EXTIRQINSTALLFAILED", "The apply of the external synchronisation interrupt failed"),
+    ADS_CODE_4112(0x1010, 4112, "RTERR_IRQLNOTLESSOREQUAL", "Call of a service function in the wrong context"),
+    ADS_CODE_4119(0x1017, 4119, "RTERR_VMXNOTSUPPORTED", "Intel VT-x extension is not supported."),
+    ADS_CODE_4120(0x1018, 4120, "RTERR_VMXDISABLED", "Intel VT-x extension is not enabled in BIOS."),
+    ADS_CODE_4121(0x1019, 4121, "RTERR_VMXCONTROLSMISSING", "Missing feature in Intel VT-x extension."),
+    ADS_CODE_4122(0x101A, 4122, "RTERR_VMXENABLEFAILS", "Enabling Intel VT-x fails."),
+
+
+    // TCP Winsock Error Codes
+    ADS_CODE_10060(0x274c, 10060, "A socket operation was attempted to an unreachable host", "Host unreachable", "Check network connection via ping"),
+    ADS_CODE_10061(0x274d, 10061, "A connection attempt failed because the connected party did not properly respond after a period of time,or established connection failed because connected host has failed to respond.", "Host unreachable", "Check network connection via ping"),
+    ADS_CODE_10065(0x2751, 10065, "No connection could be made because the target machine actively refused it"),
+    UNKNOWN(0, 0, "", "", "");
+
+    private final long hex;
+    private final long dec;
+    private final String description;
+    private final String possibleCauses;
+    private final String solution;
+
+    AdsReturnCode(long hex, long dec, String description) {
+        this(hex, dec, description, "");
+    }
+
+    AdsReturnCode(long hex, long dec, String description, String possibleCauses) {
+        this(hex, dec, description, possibleCauses, "");
+    }
+
+    AdsReturnCode(long hex, long dec, String description, String possibleCauses, String solution) {
+        this.hex = hex;
+        this.dec = dec;
+        if (hex != dec) {
+            throw new IllegalArgumentException("hex " + hex + " is different from dec " + dec);
+        }
+        this.description = requireNonNull(description);
+        this.possibleCauses = possibleCauses;
+        this.solution = solution;
+    }
+
+    // TODO: optimize with map
+    public static AdsReturnCode of(long hex) {
+        for (AdsReturnCode adsReturnCode : values()) {
+            if (adsReturnCode.hex == hex) {
+                return adsReturnCode;
+            }
+        }
+        return UNKNOWN;
+    }
+
+    public static AdsReturnCode of(String name) {
+        return valueOf(name);
+    }
+
+    public static AdsReturnCode ofInt(String value) {
+        return of(Long.parseLong(value));
+    }
+
+    public long getHex() {
+        return hex;
+    }
+
+    public long getDec() {
+        return dec;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public String getPossibleCauses() {
+        return possibleCauses;
+    }
+
+    public String getSolution() {
+        return solution;
+    }
+
+    @Override
+    public String toString() {
+        return "AdsReturnCode{" +
+            "hex=" + String.format("0x%4s", toHexString(hex)).replace(' ', '0') +
+            ", dec=" + dec +
+            ", description='" + description + '\'' +
+            ", possibleCauses='" + possibleCauses + '\'' +
+            ", solution='" + solution + '\'' +
+            '}';
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/AdsStampHeader.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/AdsStampHeader.java
index 8a64a928491..073e5c52a5b 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/AdsStampHeader.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/AdsStampHeader.java
@@ -1,113 +1,113 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.ByteReadable;
-
-import java.util.List;
-
-import static java.util.Objects.requireNonNull;
-
-public class AdsStampHeader implements ByteReadable {
-
-    /**
-     * 8 bytes	The timestamp is coded after the Windows FILETIME format. I.e. the value contains the number of the nano seconds, which passed since 1.1.1601. In addition, the local time change is not considered. Thus the time stamp is present as universal Coordinated time (UTC).
-     */
-    private final TimeStamp timeStamp;
-    /**
-     * 4 bytes	Number of elements of type AdsNotificationSample.
-     */
-    private final Samples samples;
-    /**
-     * n bytes	Array with elements of type AdsNotificationSample.
-     */
-    private final List<AdsNotificationSample> adsNotificationSamples;
-
-    private AdsStampHeader(TimeStamp timeStamp, Samples samples, List<AdsNotificationSample> adsNotificationSamples) {
-        this.timeStamp = requireNonNull(timeStamp);
-        this.samples = requireNonNull(samples);
-        this.adsNotificationSamples = requireNonNull(adsNotificationSamples);
-    }
-
-    private AdsStampHeader(TimeStamp timeStamp, List<AdsNotificationSample> adsNotificationSamples) {
-        this.timeStamp = requireNonNull(timeStamp);
-        this.adsNotificationSamples = requireNonNull(adsNotificationSamples);
-        this.samples = Samples.of(adsNotificationSamples.size());
-    }
-
-    public static AdsStampHeader of(TimeStamp timeStamp, Samples samples, List<AdsNotificationSample> adsNotificationSamples) {
-        return new AdsStampHeader(timeStamp, samples, adsNotificationSamples);
-    }
-
-    public static AdsStampHeader of(TimeStamp timeStamp, List<AdsNotificationSample> adsNotificationSamples) {
-        return new AdsStampHeader(timeStamp, adsNotificationSamples);
-    }
-
-    @Override
-    public ByteBuf getByteBuf() {
-        return buildByteBuff(timeStamp, samples, () -> buildByteBuff(adsNotificationSamples.toArray(new ByteReadable[adsNotificationSamples.size()])));
-    }
-
-    public TimeStamp getTimeStamp() {
-        return timeStamp;
-    }
-
-    public Samples getSamples() {
-        return samples;
-    }
-
-    public List<AdsNotificationSample> getAdsNotificationSamples() {
-        return adsNotificationSamples;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (!(o instanceof AdsStampHeader))
-            return false;
-
-        AdsStampHeader that = (AdsStampHeader) o;
-
-        if (!timeStamp.equals(that.timeStamp))
-            return false;
-        if (!samples.equals(that.samples))
-            return false;
-        
-        return adsNotificationSamples.equals(that.adsNotificationSamples);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = timeStamp.hashCode();
-        result = 31 * result + samples.hashCode();
-        result = 31 * result + adsNotificationSamples.hashCode();
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "AdsStampHeader{" +
-            "timeStamp=" + timeStamp +
-            ", samples=" + samples +
-            ", adsNotificationSamples=" + adsNotificationSamples +
-            '}';
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.ByteReadable;
+
+import java.util.List;
+
+import static java.util.Objects.requireNonNull;
+
+public class AdsStampHeader implements ByteReadable {
+
+    /**
+     * 8 bytes	The timestamp is coded after the Windows FILETIME format. I.e. the value contains the number of the nano seconds, which passed since 1.1.1601. In addition, the local time change is not considered. Thus the time stamp is present as universal Coordinated time (UTC).
+     */
+    private final TimeStamp timeStamp;
+    /**
+     * 4 bytes	Number of elements of type AdsNotificationSample.
+     */
+    private final Samples samples;
+    /**
+     * n bytes	Array with elements of type AdsNotificationSample.
+     */
+    private final List<AdsNotificationSample> adsNotificationSamples;
+
+    private AdsStampHeader(TimeStamp timeStamp, Samples samples, List<AdsNotificationSample> adsNotificationSamples) {
+        this.timeStamp = requireNonNull(timeStamp);
+        this.samples = requireNonNull(samples);
+        this.adsNotificationSamples = requireNonNull(adsNotificationSamples);
+    }
+
+    private AdsStampHeader(TimeStamp timeStamp, List<AdsNotificationSample> adsNotificationSamples) {
+        this.timeStamp = requireNonNull(timeStamp);
+        this.adsNotificationSamples = requireNonNull(adsNotificationSamples);
+        this.samples = Samples.of(adsNotificationSamples.size());
+    }
+
+    public static AdsStampHeader of(TimeStamp timeStamp, Samples samples, List<AdsNotificationSample> adsNotificationSamples) {
+        return new AdsStampHeader(timeStamp, samples, adsNotificationSamples);
+    }
+
+    public static AdsStampHeader of(TimeStamp timeStamp, List<AdsNotificationSample> adsNotificationSamples) {
+        return new AdsStampHeader(timeStamp, adsNotificationSamples);
+    }
+
+    @Override
+    public ByteBuf getByteBuf() {
+        return buildByteBuff(timeStamp, samples, () -> buildByteBuff(adsNotificationSamples.toArray(new ByteReadable[adsNotificationSamples.size()])));
+    }
+
+    public TimeStamp getTimeStamp() {
+        return timeStamp;
+    }
+
+    public Samples getSamples() {
+        return samples;
+    }
+
+    public List<AdsNotificationSample> getAdsNotificationSamples() {
+        return adsNotificationSamples;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof AdsStampHeader))
+            return false;
+
+        AdsStampHeader that = (AdsStampHeader) o;
+
+        if (!timeStamp.equals(that.timeStamp))
+            return false;
+        if (!samples.equals(that.samples))
+            return false;
+        
+        return adsNotificationSamples.equals(that.adsNotificationSamples);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = timeStamp.hashCode();
+        result = 31 * result + samples.hashCode();
+        result = 31 * result + adsNotificationSamples.hashCode();
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "AdsStampHeader{" +
+            "timeStamp=" + timeStamp +
+            ", samples=" + samples +
+            ", adsNotificationSamples=" + adsNotificationSamples +
+            '}';
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/AdsState.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/AdsState.java
index dd95fb04d28..3eedb11f4ac 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/AdsState.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/AdsState.java
@@ -1,85 +1,85 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.UnsignedShortLEByteValue;
-
-@SuppressWarnings("unused") // Due to predefined AdsStates
-public class AdsState extends UnsignedShortLEByteValue {
-
-    public static final int NUM_BYTES = UnsignedShortLEByteValue.UNSIGNED_SHORT_LE_NUM_BYTES;
-
-    private AdsState(byte... values) {
-        super(values);
-    }
-
-    private AdsState(int value) {
-        super(value);
-    }
-
-    private AdsState(String value) {
-        super(value);
-    }
-
-    private AdsState(ByteBuf byteBuf) {
-        super(byteBuf);
-    }
-
-    public static AdsState of(byte... values) {
-        return new AdsState(values);
-    }
-
-    public static AdsState of(int value) {
-        return new AdsState(value);
-    }
-
-    public static AdsState of(ByteBuf byteBuf) {
-        return new AdsState(byteBuf);
-    }
-
-    public static AdsState of(String value) {
-        return new AdsState(value);
-    }
-
-    // TODO: defined as enum so we might do this too similar to AdsReturnCode
-    public static final class DefinedValues {
-        public static final AdsState ADSSTATE_INVALID = AdsState.of(0);
-        public static final AdsState ADSSTATE_IDLE = AdsState.of(1);
-        public static final AdsState ADSSTATE_RESET = AdsState.of(2);
-        public static final AdsState ADSSTATE_INIT = AdsState.of(3);
-        public static final AdsState ADSSTATE_START = AdsState.of(4);
-        public static final AdsState ADSSTATE_RUN = AdsState.of(5);
-        public static final AdsState ADSSTATE_STOP = AdsState.of(6);
-        public static final AdsState ADSSTATE_SAVECFG = AdsState.of(7);
-        public static final AdsState ADSSTATE_LOADCFG = AdsState.of(8);
-        public static final AdsState ADSSTATE_POWERFAILURE = AdsState.of(9);
-        public static final AdsState ADSSTATE_POWERGOOD = AdsState.of(10);
-        public static final AdsState ADSSTATE_ERROR = AdsState.of(11);
-        public static final AdsState ADSSTATE_SHUTDOWN = AdsState.of(12);
-        public static final AdsState ADSSTATE_SUSPEND = AdsState.of(13);
-        public static final AdsState ADSSTATE_RESUME = AdsState.of(14);
-        public static final AdsState ADSSTATE_CONFIG = AdsState.of(15);
-        public static final AdsState ADSSTATE_RECONFIG = AdsState.of(16);
-        public static final AdsState ADSSTATE_STOPPING = AdsState.of(17);
-        public static final AdsState ADSSTATE_INCOMPATIBLE = AdsState.of(18);
-        public static final AdsState ADSSTATE_EXCEPTION = AdsState.of(19);
-        public static final AdsState ADSSTATE_MAXSTATES = AdsState.of(65535);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.UnsignedShortLEByteValue;
+
+@SuppressWarnings("unused") // Due to predefined AdsStates
+public class AdsState extends UnsignedShortLEByteValue {
+
+    public static final int NUM_BYTES = UnsignedShortLEByteValue.UNSIGNED_SHORT_LE_NUM_BYTES;
+
+    private AdsState(byte... values) {
+        super(values);
+    }
+
+    private AdsState(int value) {
+        super(value);
+    }
+
+    private AdsState(String value) {
+        super(value);
+    }
+
+    private AdsState(ByteBuf byteBuf) {
+        super(byteBuf);
+    }
+
+    public static AdsState of(byte... values) {
+        return new AdsState(values);
+    }
+
+    public static AdsState of(int value) {
+        return new AdsState(value);
+    }
+
+    public static AdsState of(ByteBuf byteBuf) {
+        return new AdsState(byteBuf);
+    }
+
+    public static AdsState of(String value) {
+        return new AdsState(value);
+    }
+
+    // TODO: defined as enum so we might do this too similar to AdsReturnCode
+    public static final class DefinedValues {
+        public static final AdsState ADSSTATE_INVALID = AdsState.of(0);
+        public static final AdsState ADSSTATE_IDLE = AdsState.of(1);
+        public static final AdsState ADSSTATE_RESET = AdsState.of(2);
+        public static final AdsState ADSSTATE_INIT = AdsState.of(3);
+        public static final AdsState ADSSTATE_START = AdsState.of(4);
+        public static final AdsState ADSSTATE_RUN = AdsState.of(5);
+        public static final AdsState ADSSTATE_STOP = AdsState.of(6);
+        public static final AdsState ADSSTATE_SAVECFG = AdsState.of(7);
+        public static final AdsState ADSSTATE_LOADCFG = AdsState.of(8);
+        public static final AdsState ADSSTATE_POWERFAILURE = AdsState.of(9);
+        public static final AdsState ADSSTATE_POWERGOOD = AdsState.of(10);
+        public static final AdsState ADSSTATE_ERROR = AdsState.of(11);
+        public static final AdsState ADSSTATE_SHUTDOWN = AdsState.of(12);
+        public static final AdsState ADSSTATE_SUSPEND = AdsState.of(13);
+        public static final AdsState ADSSTATE_RESUME = AdsState.of(14);
+        public static final AdsState ADSSTATE_CONFIG = AdsState.of(15);
+        public static final AdsState ADSSTATE_RECONFIG = AdsState.of(16);
+        public static final AdsState ADSSTATE_STOPPING = AdsState.of(17);
+        public static final AdsState ADSSTATE_INCOMPATIBLE = AdsState.of(18);
+        public static final AdsState ADSSTATE_EXCEPTION = AdsState.of(19);
+        public static final AdsState ADSSTATE_MAXSTATES = AdsState.of(65535);
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/CycleTime.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/CycleTime.java
index 7c45dc27bd4..03a842853cf 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/CycleTime.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/CycleTime.java
@@ -1,59 +1,59 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
-
-public class CycleTime extends UnsignedIntLEByteValue {
-
-    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
-
-    private CycleTime(byte... values) {
-        super(values);
-    }
-
-    private CycleTime(long value) {
-        super(value);
-    }
-
-    private CycleTime(ByteBuf byteBuf) {
-        super(byteBuf);
-    }
-
-    private CycleTime(String value) {
-        super(value);
-    }
-
-    public static CycleTime of(byte... values) {
-        return new CycleTime(values);
-    }
-
-    public static CycleTime of(long value) {
-        return new CycleTime(value);
-    }
-
-    public static CycleTime of(String value) {
-        return new CycleTime(value);
-    }
-
-    public static CycleTime of(ByteBuf byteBuf) {
-        return new CycleTime(byteBuf);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
+
+public class CycleTime extends UnsignedIntLEByteValue {
+
+    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
+
+    private CycleTime(byte... values) {
+        super(values);
+    }
+
+    private CycleTime(long value) {
+        super(value);
+    }
+
+    private CycleTime(ByteBuf byteBuf) {
+        super(byteBuf);
+    }
+
+    private CycleTime(String value) {
+        super(value);
+    }
+
+    public static CycleTime of(byte... values) {
+        return new CycleTime(values);
+    }
+
+    public static CycleTime of(long value) {
+        return new CycleTime(value);
+    }
+
+    public static CycleTime of(String value) {
+        return new CycleTime(value);
+    }
+
+    public static CycleTime of(ByteBuf byteBuf) {
+        return new CycleTime(byteBuf);
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Data.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Data.java
index 74c8d712bbb..48f75f85af7 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Data.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Data.java
@@ -1,62 +1,62 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.plc4x.java.ads.api.util.ByteValue;
-
-import java.nio.charset.Charset;
-
-import static java.util.Objects.requireNonNull;
-
-public class Data extends ByteValue {
-
-    private Data(byte... values) {
-        super(values);
-    }
-
-    public Data(ByteBuf byteBuf) {
-        super(byteBuf);
-    }
-
-    public static Data of(byte... values) {
-        return new Data(values);
-    }
-
-    public static Data of(ByteBuf byteBuf) {
-        return new Data(byteBuf);
-    }
-
-    public static Data of(String value) {
-        requireNonNull(value);
-        return new Data(ArrayUtils.add(value.getBytes(), (byte) 0x0));
-    }
-
-    public static Data of(String value, Charset charset) {
-        requireNonNull(value);
-        return new Data(ArrayUtils.add(value.getBytes(charset), (byte) 0x0));
-    }
-
-    @Override
-    public String toString() {
-        // TODO: maybe we could find a way to implement this to string
-        return "Data{" + value.length + "bytes} ";
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.plc4x.java.ads.api.util.ByteValue;
+
+import java.nio.charset.Charset;
+
+import static java.util.Objects.requireNonNull;
+
+public class Data extends ByteValue {
+
+    private Data(byte... values) {
+        super(values);
+    }
+
+    public Data(ByteBuf byteBuf) {
+        super(byteBuf);
+    }
+
+    public static Data of(byte... values) {
+        return new Data(values);
+    }
+
+    public static Data of(ByteBuf byteBuf) {
+        return new Data(byteBuf);
+    }
+
+    public static Data of(String value) {
+        requireNonNull(value);
+        return new Data(ArrayUtils.add(value.getBytes(), (byte) 0x0));
+    }
+
+    public static Data of(String value, Charset charset) {
+        requireNonNull(value);
+        return new Data(ArrayUtils.add(value.getBytes(charset), (byte) 0x0));
+    }
+
+    @Override
+    public String toString() {
+        // TODO: maybe we could find a way to implement this to string
+        return "Data{" + value.length + "bytes} ";
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Device.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Device.java
index 414b997c85f..2fc6b384801 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Device.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Device.java
@@ -1,85 +1,85 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.plc4x.java.ads.api.util.ByteValue;
-import org.apache.plc4x.java.api.exceptions.PlcProtocolPayloadTooBigException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-
-import java.nio.charset.Charset;
-import java.util.Arrays;
-
-import static java.util.Objects.requireNonNull;
-
-public class Device extends ByteValue {
-
-    public static final int NUM_BYTES = 16;
-
-    private Device(byte... values) {
-        super(values);
-        assertLength(NUM_BYTES);
-    }
-
-    public static Device of(byte... values) {
-        return new Device(values);
-    }
-
-    public static Device of(ByteBuf byteBuf) {
-        byte[] values = new byte[NUM_BYTES];
-        byteBuf.readBytes(values);
-        return of(values);
-    }
-
-    public static Device of(String value) {
-        return of(value, Charset.defaultCharset());
-    }
-
-    public static Device of(String value, Charset charset) {
-        requireNonNull(value);
-        requireNonNull(charset);
-        byte[] bytes = value.getBytes(charset);
-        if (bytes.length > NUM_BYTES) {
-            throw new PlcRuntimeException(new PlcProtocolPayloadTooBigException("ADS/AMS", NUM_BYTES, bytes.length, value));
-        }
-        return new Device(Arrays.copyOf(bytes, NUM_BYTES));
-    }
-
-    @Override
-    public long getCalculatedLength() {
-        return NUM_BYTES;
-    }
-
-    public String getAsString() {
-        return getAsString(Charset.defaultCharset());
-    }
-
-    public String getAsString(Charset charset) {
-        int nullTermination = ArrayUtils.indexOf(value, (byte) 0);
-        byte[] reducedValue = Arrays.copyOfRange(value, 0, nullTermination);
-        return new String(reducedValue, charset);
-    }
-
-    @Override
-    public String toString() {
-        // TODO: this might break some outputs like surefire if this id can contain non printable characters
-        return "Device{" + getAsString() + "} " + super.toString();
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.plc4x.java.ads.api.util.ByteValue;
+import org.apache.plc4x.java.api.exceptions.PlcProtocolPayloadTooBigException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+
+import java.nio.charset.Charset;
+import java.util.Arrays;
+
+import static java.util.Objects.requireNonNull;
+
+public class Device extends ByteValue {
+
+    public static final int NUM_BYTES = 16;
+
+    private Device(byte... values) {
+        super(values);
+        assertLength(NUM_BYTES);
+    }
+
+    public static Device of(byte... values) {
+        return new Device(values);
+    }
+
+    public static Device of(ByteBuf byteBuf) {
+        byte[] values = new byte[NUM_BYTES];
+        byteBuf.readBytes(values);
+        return of(values);
+    }
+
+    public static Device of(String value) {
+        return of(value, Charset.defaultCharset());
+    }
+
+    public static Device of(String value, Charset charset) {
+        requireNonNull(value);
+        requireNonNull(charset);
+        byte[] bytes = value.getBytes(charset);
+        if (bytes.length > NUM_BYTES) {
+            throw new PlcRuntimeException(new PlcProtocolPayloadTooBigException("ADS/AMS", NUM_BYTES, bytes.length, value));
+        }
+        return new Device(Arrays.copyOf(bytes, NUM_BYTES));
+    }
+
+    @Override
+    public long getCalculatedLength() {
+        return NUM_BYTES;
+    }
+
+    public String getAsString() {
+        return getAsString(Charset.defaultCharset());
+    }
+
+    public String getAsString(Charset charset) {
+        int nullTermination = ArrayUtils.indexOf(value, (byte) 0);
+        byte[] reducedValue = Arrays.copyOfRange(value, 0, nullTermination);
+        return new String(reducedValue, charset);
+    }
+
+    @Override
+    public String toString() {
+        // TODO: this might break some outputs like surefire if this id can contain non printable characters
+        return "Device{" + getAsString() + "} " + super.toString();
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/DeviceState.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/DeviceState.java
index b1794f93d34..e1439261456 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/DeviceState.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/DeviceState.java
@@ -1,59 +1,59 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.UnsignedShortLEByteValue;
-
-public class DeviceState extends UnsignedShortLEByteValue {
-
-    public static final int NUM_BYTES = UnsignedShortLEByteValue.UNSIGNED_SHORT_LE_NUM_BYTES;
-
-    private DeviceState(byte... values) {
-        super(values);
-    }
-
-    private DeviceState(int value) {
-        super(value);
-    }
-
-    private DeviceState(String value) {
-        super(value);
-    }
-
-    private DeviceState(ByteBuf byteBuf) {
-        super(byteBuf);
-    }
-
-    public static DeviceState of(byte... values) {
-        return new DeviceState(values);
-    }
-
-    public static DeviceState of(int value) {
-        return new DeviceState(value);
-    }
-
-    public static DeviceState of(ByteBuf byteBuf) {
-        return new DeviceState(byteBuf);
-    }
-
-    public static DeviceState of(String value) {
-        return new DeviceState(value);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.UnsignedShortLEByteValue;
+
+public class DeviceState extends UnsignedShortLEByteValue {
+
+    public static final int NUM_BYTES = UnsignedShortLEByteValue.UNSIGNED_SHORT_LE_NUM_BYTES;
+
+    private DeviceState(byte... values) {
+        super(values);
+    }
+
+    private DeviceState(int value) {
+        super(value);
+    }
+
+    private DeviceState(String value) {
+        super(value);
+    }
+
+    private DeviceState(ByteBuf byteBuf) {
+        super(byteBuf);
+    }
+
+    public static DeviceState of(byte... values) {
+        return new DeviceState(values);
+    }
+
+    public static DeviceState of(int value) {
+        return new DeviceState(value);
+    }
+
+    public static DeviceState of(ByteBuf byteBuf) {
+        return new DeviceState(byteBuf);
+    }
+
+    public static DeviceState of(String value) {
+        return new DeviceState(value);
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/IndexGroup.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/IndexGroup.java
index c52a49847d3..e75ff1fa45d 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/IndexGroup.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/IndexGroup.java
@@ -1,123 +1,123 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
-
-@SuppressWarnings("unused") // Due to predefined IndexGroups
-public class IndexGroup extends UnsignedIntLEByteValue {
-
-    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
-
-    private IndexGroup(byte... values) {
-        super(values);
-    }
-
-    private IndexGroup(long value) {
-        super(value);
-    }
-
-    private IndexGroup(String value) {
-        super(value);
-    }
-
-    private IndexGroup(ByteBuf byteBuf) {
-        super(byteBuf);
-    }
-
-    public static IndexGroup of(byte... values) {
-        return new IndexGroup(values);
-    }
-
-    public static IndexGroup of(long value) {
-        return new IndexGroup(value);
-    }
-
-    public static IndexGroup of(String value) {
-        return new IndexGroup(value);
-    }
-
-    public static IndexGroup of(ByteBuf byteBuf) {
-        return new IndexGroup(byteBuf);
-    }
-
-    public static final class ReservedGroups {
-        public static final IndexGroup ADSIGRP_SYMTAB = IndexGroup.of(0xF000);
-        public static final IndexGroup ADSIGRP_SYMNAME = IndexGroup.of(0xF001);
-        public static final IndexGroup ADSIGRP_SYMVAL = IndexGroup.of(0xF002);
-        public static final IndexGroup ADSIGRP_SYM_HNDBYNAME = IndexGroup.of(0xF003);
-        public static final IndexGroup ADSIGRP_SYM_VALBYNAME = IndexGroup.of(0xF004);
-        public static final IndexGroup ADSIGRP_SYM_VALBYHND = IndexGroup.of(0xF005);
-        public static final IndexGroup ADSIGRP_SYM_RELEASEHND = IndexGroup.of(0xF006);
-        public static final IndexGroup ADSIGRP_SYM_INFOBYNAME = IndexGroup.of(0xF007);
-        public static final IndexGroup ADSIGRP_SYM_VERSION = IndexGroup.of(0xF008);
-        public static final IndexGroup ADSIGRP_SYM_INFOBYNAMEEX = IndexGroup.of(0xF009);
-        public static final IndexGroup ADSIGRP_SYM_DOWNLOAD = IndexGroup.of(0xF00A);
-        public static final IndexGroup ADSIGRP_SYM_UPLOAD = IndexGroup.of(0xF00B);
-        public static final IndexGroup ADSIGRP_SYM_UPLOADINFO = IndexGroup.of(0xF00C);
-        public static final IndexGroup ADSIGRP_SYMNOTE = IndexGroup.of(0xF010);
-        public static final IndexGroup ADSIGRP_IOIMAGE_RWIB = IndexGroup.of(0xF020);
-        public static final IndexGroup ADSIGRP_IOIMAGE_RWIX = IndexGroup.of(0xF021);
-        public static final IndexGroup ADSIGRP_IOIMAGE_RISIZE = IndexGroup.of(0xF025);
-        public static final IndexGroup ADSIGRP_IOIMAGE_RWOB = IndexGroup.of(0xF030);
-        public static final IndexGroup ADSIGRP_IOIMAGE_RWOX = IndexGroup.of(0xF031);
-        public static final IndexGroup ADSIGRP_IOIMAGE_RWOSIZE = IndexGroup.of(0xF035);
-        public static final IndexGroup ADSIGRP_IOIMAGE_CLEARI = IndexGroup.of(0xF040);
-        public static final IndexGroup ADSIGRP_IOIMAGE_CLEARO = IndexGroup.of(0xF050);
-        public static final IndexGroup ADSIGRP_IOIMAGE_RWIOB = IndexGroup.of(0xF060);
-        public static final IndexGroup ADSIGRP_DEVICE_DATA = IndexGroup.of(0xF100);
-        public static final IndexGroup ADSIOFFS_DEVDATA_ADSSTATE = IndexGroup.of(0x0000);
-        public static final IndexGroup ADSIOFFS_DEVDATA_DEVSTATE = IndexGroup.of(0x0002);
-
-        private ReservedGroups() {
-            // Container class
-        }
-    }
-
-    public static final class SystemServiceGroups {
-        public static final IndexGroup SYSTEMSERVICE_OPENCREATE = IndexGroup.of(100);
-        public static final IndexGroup SYSTEMSERVICE_OPENREAD = IndexGroup.of(101);
-        public static final IndexGroup SYSTEMSERVICE_OPENWRITE = IndexGroup.of(102);
-        public static final IndexGroup SYSTEMSERVICE_CREATEFILE = IndexGroup.of(110);
-        public static final IndexGroup SYSTEMSERVICE_CLOSEHANDLE = IndexGroup.of(111);
-        public static final IndexGroup SYSTEMSERVICE_FOPEN = IndexGroup.of(120);
-        public static final IndexGroup SYSTEMSERVICE_FCLOSE = IndexGroup.of(121);
-        public static final IndexGroup SYSTEMSERVICE_FREAD = IndexGroup.of(122);
-        public static final IndexGroup SYSTEMSERVICE_FWRITE = IndexGroup.of(123);
-        public static final IndexGroup SYSTEMSERVICE_FSEEK = IndexGroup.of(124);
-        public static final IndexGroup SYSTEMSERVICE_FTELL = IndexGroup.of(125);
-        public static final IndexGroup SYSTEMSERVICE_FGETS = IndexGroup.of(126);
-        public static final IndexGroup SYSTEMSERVICE_FPUTS = IndexGroup.of(127);
-        public static final IndexGroup SYSTEMSERVICE_FSCANF = IndexGroup.of(128);
-        public static final IndexGroup SYSTEMSERVICE_FPRINTF = IndexGroup.of(129);
-        public static final IndexGroup SYSTEMSERVICE_FEOF = IndexGroup.of(130);
-        public static final IndexGroup SYSTEMSERVICE_FDELETE = IndexGroup.of(131);
-        public static final IndexGroup SYSTEMSERVICE_FRENAME = IndexGroup.of(132);
-        public static final IndexGroup SYSTEMSERVICE_REG_HKEYLOCALMACHINE = IndexGroup.of(200);
-        public static final IndexGroup SYSTEMSERVICE_SENDEMAIL = IndexGroup.of(300);
-        public static final IndexGroup SYSTEMSERVICE_TIMESERVICES = IndexGroup.of(400);
-        public static final IndexGroup SYSTEMSERVICE_STARTPROCESS = IndexGroup.of(500);
-        public static final IndexGroup SYSTEMSERVICE_CHANGENETID = IndexGroup.of(600);
-
-        private SystemServiceGroups() {
-            // Container class
-        }
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
+
+@SuppressWarnings("unused") // Due to predefined IndexGroups
+public class IndexGroup extends UnsignedIntLEByteValue {
+
+    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
+
+    private IndexGroup(byte... values) {
+        super(values);
+    }
+
+    private IndexGroup(long value) {
+        super(value);
+    }
+
+    private IndexGroup(String value) {
+        super(value);
+    }
+
+    private IndexGroup(ByteBuf byteBuf) {
+        super(byteBuf);
+    }
+
+    public static IndexGroup of(byte... values) {
+        return new IndexGroup(values);
+    }
+
+    public static IndexGroup of(long value) {
+        return new IndexGroup(value);
+    }
+
+    public static IndexGroup of(String value) {
+        return new IndexGroup(value);
+    }
+
+    public static IndexGroup of(ByteBuf byteBuf) {
+        return new IndexGroup(byteBuf);
+    }
+
+    public static final class ReservedGroups {
+        public static final IndexGroup ADSIGRP_SYMTAB = IndexGroup.of(0xF000);
+        public static final IndexGroup ADSIGRP_SYMNAME = IndexGroup.of(0xF001);
+        public static final IndexGroup ADSIGRP_SYMVAL = IndexGroup.of(0xF002);
+        public static final IndexGroup ADSIGRP_SYM_HNDBYNAME = IndexGroup.of(0xF003);
+        public static final IndexGroup ADSIGRP_SYM_VALBYNAME = IndexGroup.of(0xF004);
+        public static final IndexGroup ADSIGRP_SYM_VALBYHND = IndexGroup.of(0xF005);
+        public static final IndexGroup ADSIGRP_SYM_RELEASEHND = IndexGroup.of(0xF006);
+        public static final IndexGroup ADSIGRP_SYM_INFOBYNAME = IndexGroup.of(0xF007);
+        public static final IndexGroup ADSIGRP_SYM_VERSION = IndexGroup.of(0xF008);
+        public static final IndexGroup ADSIGRP_SYM_INFOBYNAMEEX = IndexGroup.of(0xF009);
+        public static final IndexGroup ADSIGRP_SYM_DOWNLOAD = IndexGroup.of(0xF00A);
+        public static final IndexGroup ADSIGRP_SYM_UPLOAD = IndexGroup.of(0xF00B);
+        public static final IndexGroup ADSIGRP_SYM_UPLOADINFO = IndexGroup.of(0xF00C);
+        public static final IndexGroup ADSIGRP_SYMNOTE = IndexGroup.of(0xF010);
+        public static final IndexGroup ADSIGRP_IOIMAGE_RWIB = IndexGroup.of(0xF020);
+        public static final IndexGroup ADSIGRP_IOIMAGE_RWIX = IndexGroup.of(0xF021);
+        public static final IndexGroup ADSIGRP_IOIMAGE_RISIZE = IndexGroup.of(0xF025);
+        public static final IndexGroup ADSIGRP_IOIMAGE_RWOB = IndexGroup.of(0xF030);
+        public static final IndexGroup ADSIGRP_IOIMAGE_RWOX = IndexGroup.of(0xF031);
+        public static final IndexGroup ADSIGRP_IOIMAGE_RWOSIZE = IndexGroup.of(0xF035);
+        public static final IndexGroup ADSIGRP_IOIMAGE_CLEARI = IndexGroup.of(0xF040);
+        public static final IndexGroup ADSIGRP_IOIMAGE_CLEARO = IndexGroup.of(0xF050);
+        public static final IndexGroup ADSIGRP_IOIMAGE_RWIOB = IndexGroup.of(0xF060);
+        public static final IndexGroup ADSIGRP_DEVICE_DATA = IndexGroup.of(0xF100);
+        public static final IndexGroup ADSIOFFS_DEVDATA_ADSSTATE = IndexGroup.of(0x0000);
+        public static final IndexGroup ADSIOFFS_DEVDATA_DEVSTATE = IndexGroup.of(0x0002);
+
+        private ReservedGroups() {
+            // Container class
+        }
+    }
+
+    public static final class SystemServiceGroups {
+        public static final IndexGroup SYSTEMSERVICE_OPENCREATE = IndexGroup.of(100);
+        public static final IndexGroup SYSTEMSERVICE_OPENREAD = IndexGroup.of(101);
+        public static final IndexGroup SYSTEMSERVICE_OPENWRITE = IndexGroup.of(102);
+        public static final IndexGroup SYSTEMSERVICE_CREATEFILE = IndexGroup.of(110);
+        public static final IndexGroup SYSTEMSERVICE_CLOSEHANDLE = IndexGroup.of(111);
+        public static final IndexGroup SYSTEMSERVICE_FOPEN = IndexGroup.of(120);
+        public static final IndexGroup SYSTEMSERVICE_FCLOSE = IndexGroup.of(121);
+        public static final IndexGroup SYSTEMSERVICE_FREAD = IndexGroup.of(122);
+        public static final IndexGroup SYSTEMSERVICE_FWRITE = IndexGroup.of(123);
+        public static final IndexGroup SYSTEMSERVICE_FSEEK = IndexGroup.of(124);
+        public static final IndexGroup SYSTEMSERVICE_FTELL = IndexGroup.of(125);
+        public static final IndexGroup SYSTEMSERVICE_FGETS = IndexGroup.of(126);
+        public static final IndexGroup SYSTEMSERVICE_FPUTS = IndexGroup.of(127);
+        public static final IndexGroup SYSTEMSERVICE_FSCANF = IndexGroup.of(128);
+        public static final IndexGroup SYSTEMSERVICE_FPRINTF = IndexGroup.of(129);
+        public static final IndexGroup SYSTEMSERVICE_FEOF = IndexGroup.of(130);
+        public static final IndexGroup SYSTEMSERVICE_FDELETE = IndexGroup.of(131);
+        public static final IndexGroup SYSTEMSERVICE_FRENAME = IndexGroup.of(132);
+        public static final IndexGroup SYSTEMSERVICE_REG_HKEYLOCALMACHINE = IndexGroup.of(200);
+        public static final IndexGroup SYSTEMSERVICE_SENDEMAIL = IndexGroup.of(300);
+        public static final IndexGroup SYSTEMSERVICE_TIMESERVICES = IndexGroup.of(400);
+        public static final IndexGroup SYSTEMSERVICE_STARTPROCESS = IndexGroup.of(500);
+        public static final IndexGroup SYSTEMSERVICE_CHANGENETID = IndexGroup.of(600);
+
+        private SystemServiceGroups() {
+            // Container class
+        }
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/IndexOffset.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/IndexOffset.java
index e307f801208..c84fd7ae03a 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/IndexOffset.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/IndexOffset.java
@@ -1,73 +1,73 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
-
-@SuppressWarnings("unused") // Due to predefined IndexOffsets
-public class IndexOffset extends UnsignedIntLEByteValue {
-
-    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
-
-    public static final IndexOffset NONE = IndexOffset.of(0);
-
-    private IndexOffset(byte... values) {
-        super(values);
-    }
-
-    private IndexOffset(long value) {
-        super(value);
-    }
-
-    private IndexOffset(String value) {
-        super(value);
-    }
-
-    private IndexOffset(ByteBuf byteBuf) {
-        super(byteBuf);
-    }
-
-    public static IndexOffset of(byte... values) {
-        return new IndexOffset(values);
-    }
-
-    public static IndexOffset of(long value) {
-        return new IndexOffset(value);
-    }
-
-    public static IndexOffset of(String value) {
-        return new IndexOffset(value);
-    }
-
-    public static IndexOffset of(ByteBuf byteBuf) {
-        return new IndexOffset(byteBuf);
-    }
-
-    public static final class SystemServiceOffsets {
-        public static final IndexOffset TIMESERVICE_DATEANDTIME = IndexOffset.of(1);
-        public static final IndexOffset TIMESERVICE_SYSTEMTIMES = IndexOffset.of(2);
-        public static final IndexOffset TIMESERVICE_RTCTIMEDIFF = IndexOffset.of(3);
-        public static final IndexOffset TIMESERVICE_ADJUSTTIMETORTC = IndexOffset.of(4);
-
-        private SystemServiceOffsets() {
-            // Container class
-        }
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
+
+@SuppressWarnings("unused") // Due to predefined IndexOffsets
+public class IndexOffset extends UnsignedIntLEByteValue {
+
+    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
+
+    public static final IndexOffset NONE = IndexOffset.of(0);
+
+    private IndexOffset(byte... values) {
+        super(values);
+    }
+
+    private IndexOffset(long value) {
+        super(value);
+    }
+
+    private IndexOffset(String value) {
+        super(value);
+    }
+
+    private IndexOffset(ByteBuf byteBuf) {
+        super(byteBuf);
+    }
+
+    public static IndexOffset of(byte... values) {
+        return new IndexOffset(values);
+    }
+
+    public static IndexOffset of(long value) {
+        return new IndexOffset(value);
+    }
+
+    public static IndexOffset of(String value) {
+        return new IndexOffset(value);
+    }
+
+    public static IndexOffset of(ByteBuf byteBuf) {
+        return new IndexOffset(byteBuf);
+    }
+
+    public static final class SystemServiceOffsets {
+        public static final IndexOffset TIMESERVICE_DATEANDTIME = IndexOffset.of(1);
+        public static final IndexOffset TIMESERVICE_SYSTEMTIMES = IndexOffset.of(2);
+        public static final IndexOffset TIMESERVICE_RTCTIMEDIFF = IndexOffset.of(3);
+        public static final IndexOffset TIMESERVICE_ADJUSTTIMETORTC = IndexOffset.of(4);
+
+        private SystemServiceOffsets() {
+            // Container class
+        }
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Length.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Length.java
index 2a5255d653a..ed6622869c6 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Length.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Length.java
@@ -1,65 +1,65 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.LengthSupplier;
-import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
-
-public class Length extends UnsignedIntLEByteValue {
-
-    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
-
-    private Length(byte... values) {
-        super(values);
-    }
-
-    private Length(long value) {
-        super(value);
-    }
-
-    private Length(String length) {
-        super(length);
-    }
-
-    private Length(ByteBuf byteBuf) {
-        super(byteBuf);
-    }
-
-    public static Length of(byte... values) {
-        return new Length(values);
-    }
-
-    public static Length of(long value) {
-        return new Length(value);
-    }
-
-    public static Length of(LengthSupplier lengthSupplier) {
-        return new Length(lengthSupplier.getCalculatedLength());
-    }
-
-    public static Length of(ByteBuf byteBuf) {
-        return new Length(byteBuf);
-    }
-
-    public static Length of(String length) {
-        return new Length(length);
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.LengthSupplier;
+import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
+
+public class Length extends UnsignedIntLEByteValue {
+
+    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
+
+    private Length(byte... values) {
+        super(values);
+    }
+
+    private Length(long value) {
+        super(value);
+    }
+
+    private Length(String length) {
+        super(length);
+    }
+
+    private Length(ByteBuf byteBuf) {
+        super(byteBuf);
+    }
+
+    public static Length of(byte... values) {
+        return new Length(values);
+    }
+
+    public static Length of(long value) {
+        return new Length(value);
+    }
+
+    public static Length of(LengthSupplier lengthSupplier) {
+        return new Length(lengthSupplier.getCalculatedLength());
+    }
+
+    public static Length of(ByteBuf byteBuf) {
+        return new Length(byteBuf);
+    }
+
+    public static Length of(String length) {
+        return new Length(length);
+    }
+
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/MajorVersion.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/MajorVersion.java
index 532ebf3b2f1..f14d3a37116 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/MajorVersion.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/MajorVersion.java
@@ -1,68 +1,68 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.ByteValue;
-
-import java.util.Arrays;
-
-public class MajorVersion extends ByteValue {
-
-    public static final int NUM_BYTES = 1;
-
-    private MajorVersion(byte... values) {
-        super(values);
-        assertLength(NUM_BYTES);
-    }
-
-    public static MajorVersion of(byte... values) {
-        return new MajorVersion(values);
-    }
-
-    public static MajorVersion of(int value) {
-        return new MajorVersion((byte) value);
-    }
-
-    public static MajorVersion of(String value) {
-        return of(Integer.parseInt(value));
-    }
-
-    public static MajorVersion of(ByteBuf byteBuf) {
-        byte[] values = new byte[NUM_BYTES];
-        byteBuf.readBytes(values);
-        return of(values);
-    }
-
-    @Override
-    public long getCalculatedLength() {
-        return NUM_BYTES;
-    }
-
-    public byte getAsByte() {
-        return getBytes()[0];
-    }
-
-    @Override
-    public String toString() {
-        return "MajorVersion{" +
-            "value=" + Arrays.toString(value) +
-            "} " + super.toString();
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.ByteValue;
+
+import java.util.Arrays;
+
+public class MajorVersion extends ByteValue {
+
+    public static final int NUM_BYTES = 1;
+
+    private MajorVersion(byte... values) {
+        super(values);
+        assertLength(NUM_BYTES);
+    }
+
+    public static MajorVersion of(byte... values) {
+        return new MajorVersion(values);
+    }
+
+    public static MajorVersion of(int value) {
+        return new MajorVersion((byte) value);
+    }
+
+    public static MajorVersion of(String value) {
+        return of(Integer.parseInt(value));
+    }
+
+    public static MajorVersion of(ByteBuf byteBuf) {
+        byte[] values = new byte[NUM_BYTES];
+        byteBuf.readBytes(values);
+        return of(values);
+    }
+
+    @Override
+    public long getCalculatedLength() {
+        return NUM_BYTES;
+    }
+
+    public byte getAsByte() {
+        return getBytes()[0];
+    }
+
+    @Override
+    public String toString() {
+        return "MajorVersion{" +
+            "value=" + Arrays.toString(value) +
+            "} " + super.toString();
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/MaxDelay.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/MaxDelay.java
index 450d7036291..cd35c07f15f 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/MaxDelay.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/MaxDelay.java
@@ -1,59 +1,59 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
-
-public class MaxDelay extends UnsignedIntLEByteValue {
-
-    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
-
-    private MaxDelay(byte... values) {
-        super(values);
-    }
-
-    private MaxDelay(long value) {
-        super(value);
-    }
-
-    private MaxDelay(String value) {
-        super(value);
-    }
-
-    private MaxDelay(ByteBuf byteBuf) {
-        super(byteBuf);
-    }
-
-    public static MaxDelay of(byte... values) {
-        return new MaxDelay(values);
-    }
-
-    public static MaxDelay of(long value) {
-        return new MaxDelay(value);
-    }
-
-    public static MaxDelay of(String value) {
-        return new MaxDelay(value);
-    }
-
-    public static MaxDelay of(ByteBuf byteBuf) {
-        return new MaxDelay(byteBuf);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
+
+public class MaxDelay extends UnsignedIntLEByteValue {
+
+    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
+
+    private MaxDelay(byte... values) {
+        super(values);
+    }
+
+    private MaxDelay(long value) {
+        super(value);
+    }
+
+    private MaxDelay(String value) {
+        super(value);
+    }
+
+    private MaxDelay(ByteBuf byteBuf) {
+        super(byteBuf);
+    }
+
+    public static MaxDelay of(byte... values) {
+        return new MaxDelay(values);
+    }
+
+    public static MaxDelay of(long value) {
+        return new MaxDelay(value);
+    }
+
+    public static MaxDelay of(String value) {
+        return new MaxDelay(value);
+    }
+
+    public static MaxDelay of(ByteBuf byteBuf) {
+        return new MaxDelay(byteBuf);
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/MinorVersion.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/MinorVersion.java
index 20cb211fbc3..709f488612a 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/MinorVersion.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/MinorVersion.java
@@ -1,69 +1,69 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.ByteValue;
-
-import java.util.Arrays;
-
-public class MinorVersion extends ByteValue {
-
-    public static final int NUM_BYTES = 1;
-
-    private MinorVersion(byte... values) {
-        super(values);
-        assertLength(NUM_BYTES);
-    }
-
-    public static MinorVersion of(byte... values) {
-        return new MinorVersion(values);
-    }
-
-    public static MinorVersion of(int value) {
-        return new MinorVersion((byte) value);
-    }
-
-    public static MinorVersion of(String value) {
-        return of(Integer.parseInt(value));
-    }
-
-    public static MinorVersion of(ByteBuf byteBuf) {
-        byte[] values = new byte[NUM_BYTES];
-        byteBuf.readBytes(values);
-        return of(values);
-    }
-
-    @Override
-    public long getCalculatedLength() {
-        return NUM_BYTES;
-    }
-
-    public byte getAsByte() {
-        return getBytes()[0];
-    }
-
-    @Override
-    public String toString() {
-        return "MinorVersion{" +
-            "value=" + Arrays.toString(value) +
-            "} " + super.toString();
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.ByteValue;
+
+import java.util.Arrays;
+
+public class MinorVersion extends ByteValue {
+
+    public static final int NUM_BYTES = 1;
+
+    private MinorVersion(byte... values) {
+        super(values);
+        assertLength(NUM_BYTES);
+    }
+
+    public static MinorVersion of(byte... values) {
+        return new MinorVersion(values);
+    }
+
+    public static MinorVersion of(int value) {
+        return new MinorVersion((byte) value);
+    }
+
+    public static MinorVersion of(String value) {
+        return of(Integer.parseInt(value));
+    }
+
+    public static MinorVersion of(ByteBuf byteBuf) {
+        byte[] values = new byte[NUM_BYTES];
+        byteBuf.readBytes(values);
+        return of(values);
+    }
+
+    @Override
+    public long getCalculatedLength() {
+        return NUM_BYTES;
+    }
+
+    public byte getAsByte() {
+        return getBytes()[0];
+    }
+
+    @Override
+    public String toString() {
+        return "MinorVersion{" +
+            "value=" + Arrays.toString(value) +
+            "} " + super.toString();
+    }
+
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/NotificationHandle.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/NotificationHandle.java
index 7c03c2f07dc..c2597cf6451 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/NotificationHandle.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/NotificationHandle.java
@@ -1,59 +1,59 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
-
-public class NotificationHandle extends UnsignedIntLEByteValue {
-
-    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
-
-    private NotificationHandle(byte... values) {
-        super(values);
-    }
-
-    private NotificationHandle(long value) {
-        super(value);
-    }
-
-    private NotificationHandle(ByteBuf byteBuf) {
-        super(byteBuf);
-    }
-
-    private NotificationHandle(String value) {
-        super(value);
-    }
-
-    public static NotificationHandle of(byte... values) {
-        return new NotificationHandle(values);
-    }
-
-    public static NotificationHandle of(long value) {
-        return new NotificationHandle(value);
-    }
-
-    public static NotificationHandle of(String value) {
-        return new NotificationHandle(value);
-    }
-
-    public static NotificationHandle of(ByteBuf byteBuf) {
-        return new NotificationHandle(byteBuf);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
+
+public class NotificationHandle extends UnsignedIntLEByteValue {
+
+    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
+
+    private NotificationHandle(byte... values) {
+        super(values);
+    }
+
+    private NotificationHandle(long value) {
+        super(value);
+    }
+
+    private NotificationHandle(ByteBuf byteBuf) {
+        super(byteBuf);
+    }
+
+    private NotificationHandle(String value) {
+        super(value);
+    }
+
+    public static NotificationHandle of(byte... values) {
+        return new NotificationHandle(values);
+    }
+
+    public static NotificationHandle of(long value) {
+        return new NotificationHandle(value);
+    }
+
+    public static NotificationHandle of(String value) {
+        return new NotificationHandle(value);
+    }
+
+    public static NotificationHandle of(ByteBuf byteBuf) {
+        return new NotificationHandle(byteBuf);
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/ReadLength.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/ReadLength.java
index 7bdf6fa4a2c..4dca1944ed6 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/ReadLength.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/ReadLength.java
@@ -1,59 +1,59 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
-
-public class ReadLength extends UnsignedIntLEByteValue {
-
-    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
-
-    private ReadLength(byte... values) {
-        super(values);
-    }
-
-    private ReadLength(long value) {
-        super(value);
-    }
-
-    private ReadLength(String length) {
-        super(length);
-    }
-
-    private ReadLength(ByteBuf byteBuf) {
-        super(byteBuf);
-    }
-
-    public static ReadLength of(byte... values) {
-        return new ReadLength(values);
-    }
-
-    public static ReadLength of(long value) {
-        return new ReadLength(value);
-    }
-
-    public static ReadLength of(String length) {
-        return new ReadLength(length);
-    }
-
-    public static ReadLength of(ByteBuf byteBuf) {
-        return new ReadLength(byteBuf);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
+
+public class ReadLength extends UnsignedIntLEByteValue {
+
+    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
+
+    private ReadLength(byte... values) {
+        super(values);
+    }
+
+    private ReadLength(long value) {
+        super(value);
+    }
+
+    private ReadLength(String length) {
+        super(length);
+    }
+
+    private ReadLength(ByteBuf byteBuf) {
+        super(byteBuf);
+    }
+
+    public static ReadLength of(byte... values) {
+        return new ReadLength(values);
+    }
+
+    public static ReadLength of(long value) {
+        return new ReadLength(value);
+    }
+
+    public static ReadLength of(String length) {
+        return new ReadLength(length);
+    }
+
+    public static ReadLength of(ByteBuf byteBuf) {
+        return new ReadLength(byteBuf);
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Result.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Result.java
index 993ad867e9d..570015bdf31 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Result.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Result.java
@@ -1,74 +1,74 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
-
-import static java.util.Objects.requireNonNull;
-
-public class Result extends UnsignedIntLEByteValue {
-
-    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
-
-    private Result(byte... values) {
-        super(values);
-    }
-
-    private Result(long value) {
-        super(value);
-    }
-
-    private Result(String value) {
-        super(value);
-    }
-
-    private Result(ByteBuf byteBuf) {
-        super(byteBuf);
-    }
-
-    public static Result of(byte... values) {
-        return new Result(values);
-    }
-
-    public static Result of(long value) {
-        return new Result(value);
-    }
-
-    public static Result of(String value) {
-        return new Result(value);
-    }
-
-    public static Result of(ByteBuf byteBuf) {
-        return new Result(byteBuf);
-    }
-
-    public static Result of(AdsReturnCode adsReturnCode) {
-        return of(requireNonNull(adsReturnCode).getHex());
-    }
-
-    public AdsReturnCode toAdsReturnCode() {
-        return AdsReturnCode.of(getAsLong());
-    }
-
-    @Override
-    public String toString() {
-        return "Result{" + toAdsReturnCode() + "}";
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
+
+import static java.util.Objects.requireNonNull;
+
+public class Result extends UnsignedIntLEByteValue {
+
+    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
+
+    private Result(byte... values) {
+        super(values);
+    }
+
+    private Result(long value) {
+        super(value);
+    }
+
+    private Result(String value) {
+        super(value);
+    }
+
+    private Result(ByteBuf byteBuf) {
+        super(byteBuf);
+    }
+
+    public static Result of(byte... values) {
+        return new Result(values);
+    }
+
+    public static Result of(long value) {
+        return new Result(value);
+    }
+
+    public static Result of(String value) {
+        return new Result(value);
+    }
+
+    public static Result of(ByteBuf byteBuf) {
+        return new Result(byteBuf);
+    }
+
+    public static Result of(AdsReturnCode adsReturnCode) {
+        return of(requireNonNull(adsReturnCode).getHex());
+    }
+
+    public AdsReturnCode toAdsReturnCode() {
+        return AdsReturnCode.of(getAsLong());
+    }
+
+    @Override
+    public String toString() {
+        return "Result{" + toAdsReturnCode() + "}";
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/SampleSize.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/SampleSize.java
index 6d09f0f693e..e9f544e1513 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/SampleSize.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/SampleSize.java
@@ -1,65 +1,65 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.LengthSupplier;
-import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
-
-public class SampleSize extends UnsignedIntLEByteValue {
-
-    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
-
-    private SampleSize(byte... values) {
-        super(values);
-    }
-
-    private SampleSize(long value) {
-        super(value);
-    }
-
-    private SampleSize(String size) {
-        super(size);
-    }
-
-    private SampleSize(ByteBuf byteBuf) {
-        super(byteBuf);
-    }
-
-    public static SampleSize of(byte... values) {
-        return new SampleSize(values);
-    }
-
-    public static SampleSize of(long value) {
-        return new SampleSize(value);
-    }
-
-    public static SampleSize of(LengthSupplier lengthSupplier) {
-        return new SampleSize(lengthSupplier.getCalculatedLength());
-    }
-
-    public static SampleSize of(String size) {
-        return new SampleSize(size);
-    }
-
-    public static SampleSize of(ByteBuf byteBuf) {
-        return new SampleSize(byteBuf);
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.LengthSupplier;
+import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
+
+public class SampleSize extends UnsignedIntLEByteValue {
+
+    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
+
+    private SampleSize(byte... values) {
+        super(values);
+    }
+
+    private SampleSize(long value) {
+        super(value);
+    }
+
+    private SampleSize(String size) {
+        super(size);
+    }
+
+    private SampleSize(ByteBuf byteBuf) {
+        super(byteBuf);
+    }
+
+    public static SampleSize of(byte... values) {
+        return new SampleSize(values);
+    }
+
+    public static SampleSize of(long value) {
+        return new SampleSize(value);
+    }
+
+    public static SampleSize of(LengthSupplier lengthSupplier) {
+        return new SampleSize(lengthSupplier.getCalculatedLength());
+    }
+
+    public static SampleSize of(String size) {
+        return new SampleSize(size);
+    }
+
+    public static SampleSize of(ByteBuf byteBuf) {
+        return new SampleSize(byteBuf);
+    }
+
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Samples.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Samples.java
index 113f062b129..5699902c71c 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Samples.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Samples.java
@@ -1,60 +1,60 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
-
-public class Samples extends UnsignedIntLEByteValue {
-
-    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
-
-    private Samples(byte... values) {
-        super(values);
-    }
-
-    private Samples(long value) {
-        super(value);
-    }
-
-    private Samples(String value) {
-        super(value);
-    }
-
-    private Samples(ByteBuf byteBuf) {
-        super(byteBuf);
-    }
-
-    public static Samples of(byte... values) {
-        return new Samples(values);
-    }
-
-    public static Samples of(long value) {
-        return new Samples(value);
-    }
-
-    public static Samples of(String value) {
-        return new Samples(value);
-    }
-
-    public static Samples of(ByteBuf byteBuf) {
-        return new Samples(byteBuf);
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
+
+public class Samples extends UnsignedIntLEByteValue {
+
+    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
+
+    private Samples(byte... values) {
+        super(values);
+    }
+
+    private Samples(long value) {
+        super(value);
+    }
+
+    private Samples(String value) {
+        super(value);
+    }
+
+    private Samples(ByteBuf byteBuf) {
+        super(byteBuf);
+    }
+
+    public static Samples of(byte... values) {
+        return new Samples(values);
+    }
+
+    public static Samples of(long value) {
+        return new Samples(value);
+    }
+
+    public static Samples of(String value) {
+        return new Samples(value);
+    }
+
+    public static Samples of(ByteBuf byteBuf) {
+        return new Samples(byteBuf);
+    }
+
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Stamps.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Stamps.java
index 18908965a2a..ce0ec6c488c 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Stamps.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Stamps.java
@@ -1,59 +1,59 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
-
-public class Stamps extends UnsignedIntLEByteValue {
-
-    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
-
-    private Stamps(byte... values) {
-        super(values);
-    }
-
-    private Stamps(long value) {
-        super(value);
-    }
-
-    private Stamps(String value) {
-        super(value);
-    }
-
-    private Stamps(ByteBuf byteBuf) {
-        super(byteBuf);
-    }
-
-    public static Stamps of(byte... values) {
-        return new Stamps(values);
-    }
-
-    public static Stamps of(long value) {
-        return new Stamps(value);
-    }
-
-    public static Stamps of(String value) {
-        return new Stamps(value);
-    }
-
-    public static Stamps of(ByteBuf byteBuf) {
-        return new Stamps(byteBuf);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
+
+public class Stamps extends UnsignedIntLEByteValue {
+
+    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
+
+    private Stamps(byte... values) {
+        super(values);
+    }
+
+    private Stamps(long value) {
+        super(value);
+    }
+
+    private Stamps(String value) {
+        super(value);
+    }
+
+    private Stamps(ByteBuf byteBuf) {
+        super(byteBuf);
+    }
+
+    public static Stamps of(byte... values) {
+        return new Stamps(values);
+    }
+
+    public static Stamps of(long value) {
+        return new Stamps(value);
+    }
+
+    public static Stamps of(String value) {
+        return new Stamps(value);
+    }
+
+    public static Stamps of(ByteBuf byteBuf) {
+        return new Stamps(byteBuf);
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/TimeStamp.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/TimeStamp.java
index fc283b55297..a62b60a155c 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/TimeStamp.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/TimeStamp.java
@@ -1,172 +1,172 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.ByteValue;
-
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.util.Date;
-
-public class TimeStamp extends ByteValue {
-
-    /**
-     * @see <a href="https://github.com/java-native-access/jna/blob/master/contrib/platform/src/com/sun/jna/platform/win32/WinBase.java">java-native-access WinBase</a>
-     */
-    public static final BigInteger EPOCH_DIFF_IN_MILLIS = BigInteger.valueOf((369L * 365L + 89L) * 86400L * 1000L);
-
-    public static final int NUM_BYTES = 8;
-
-    private final BigInteger bigIntegerValue;
-
-    private TimeStamp(byte... values) {
-        super(values);
-        assertLength(NUM_BYTES);
-        bigIntegerValue = new BigInteger(new byte[]{
-            // LE
-            values[7],
-            values[6],
-            values[5],
-            values[4],
-
-            values[3],
-            values[2],
-            values[1],
-            values[0],
-        });
-    }
-
-    private TimeStamp(BigInteger value) {
-        super(ofBigInteger(value));
-        checkUnsignedBounds(value, NUM_BYTES);
-        assertLength(NUM_BYTES);
-        bigIntegerValue = value;
-    }
-
-    private static byte checkByte(byte[] valueBytes, int length, int i) {
-        return length > i ? valueBytes[i] : 0;
-    }
-
-    private static byte[] ofBigInteger(BigInteger value) {
-        byte[] valueBytes = value.toByteArray();
-        int length = valueBytes.length;
-        return ByteBuffer.allocate(NUM_BYTES)
-            // LE
-            .put(checkByte(valueBytes, length, 7))
-            .put(checkByte(valueBytes, length, 6))
-            .put(checkByte(valueBytes, length, 5))
-            .put(checkByte(valueBytes, length, 4))
-
-            .put(checkByte(valueBytes, length, 3))
-            .put(checkByte(valueBytes, length, 2))
-            .put(checkByte(valueBytes, length, 1))
-            .put(checkByte(valueBytes, length, 0))
-            .array();
-    }
-
-
-    public static TimeStamp of(BigInteger value) {
-        return new TimeStamp(javaToWinTime(value));
-    }
-
-    public static TimeStamp ofWinTime(BigInteger value) {
-        return new TimeStamp(value);
-    }
-
-    public static TimeStamp of(long value) {
-        return of(BigInteger.valueOf(value));
-    }
-
-    public static TimeStamp of(String value) {
-        return of(Long.valueOf(value));
-    }
-
-    public static TimeStamp ofWinTime(long value) {
-        return of(BigInteger.valueOf(value));
-    }
-
-    public static TimeStamp ofWinTime(String value) {
-        return of(Long.valueOf(value));
-    }
-
-    public static TimeStamp of(byte... values) {
-        return new TimeStamp(values);
-    }
-
-    public static TimeStamp of(Date timestamp) {
-        BigInteger winStamp = javaToWinTime(BigInteger.valueOf(timestamp.getTime()));
-        return new TimeStamp(winStamp);
-    }
-
-    public static TimeStamp of(ByteBuf byteBuf) {
-        byte[] values = new byte[NUM_BYTES];
-        byteBuf.readBytes(values);
-        return of(values);
-    }
-
-    public BigInteger getBigIntegerValue() {
-        return bigIntegerValue;
-    }
-
-    public Date getAsDate() {
-        return new Date(winTimeToJava(bigIntegerValue).longValue());
-    }
-
-    public static BigInteger javaToWinTime(BigInteger timeMillisSince19700101) {
-        BigInteger timeMillisSince16010101 = EPOCH_DIFF_IN_MILLIS.add(timeMillisSince19700101);
-        return timeMillisSince16010101.multiply(BigInteger.valueOf(10_000));
-    }
-
-    public static BigInteger winTimeToJava(BigInteger winTime) {
-        BigInteger timeMillisSince16010101 = winTime.divide(BigInteger.valueOf(10_000));
-        return timeMillisSince16010101.subtract(EPOCH_DIFF_IN_MILLIS);
-    }
-
-    @Override
-    public long getCalculatedLength() {
-        return NUM_BYTES;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (!(o instanceof TimeStamp))
-            return false;
-        if (!super.equals(o))
-            return false;
-
-        TimeStamp timeStamp = (TimeStamp) o;
-
-        return bigIntegerValue.equals(timeStamp.bigIntegerValue);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = super.hashCode();
-        result = 31 * result + bigIntegerValue.hashCode();
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "TimeStamp{winTime=" + getBigIntegerValue() + "/date=" + getAsDate() + "} " + super.toString();
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.ByteValue;
+
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.util.Date;
+
+public class TimeStamp extends ByteValue {
+
+    /**
+     * @see <a href="https://github.com/java-native-access/jna/blob/master/contrib/platform/src/com/sun/jna/platform/win32/WinBase.java">java-native-access WinBase</a>
+     */
+    public static final BigInteger EPOCH_DIFF_IN_MILLIS = BigInteger.valueOf((369L * 365L + 89L) * 86400L * 1000L);
+
+    public static final int NUM_BYTES = 8;
+
+    private final BigInteger bigIntegerValue;
+
+    private TimeStamp(byte... values) {
+        super(values);
+        assertLength(NUM_BYTES);
+        bigIntegerValue = new BigInteger(new byte[]{
+            // LE
+            values[7],
+            values[6],
+            values[5],
+            values[4],
+
+            values[3],
+            values[2],
+            values[1],
+            values[0],
+        });
+    }
+
+    private TimeStamp(BigInteger value) {
+        super(ofBigInteger(value));
+        checkUnsignedBounds(value, NUM_BYTES);
+        assertLength(NUM_BYTES);
+        bigIntegerValue = value;
+    }
+
+    private static byte checkByte(byte[] valueBytes, int length, int i) {
+        return length > i ? valueBytes[i] : 0;
+    }
+
+    private static byte[] ofBigInteger(BigInteger value) {
+        byte[] valueBytes = value.toByteArray();
+        int length = valueBytes.length;
+        return ByteBuffer.allocate(NUM_BYTES)
+            // LE
+            .put(checkByte(valueBytes, length, 7))
+            .put(checkByte(valueBytes, length, 6))
+            .put(checkByte(valueBytes, length, 5))
+            .put(checkByte(valueBytes, length, 4))
+
+            .put(checkByte(valueBytes, length, 3))
+            .put(checkByte(valueBytes, length, 2))
+            .put(checkByte(valueBytes, length, 1))
+            .put(checkByte(valueBytes, length, 0))
+            .array();
+    }
+
+
+    public static TimeStamp of(BigInteger value) {
+        return new TimeStamp(javaToWinTime(value));
+    }
+
+    public static TimeStamp ofWinTime(BigInteger value) {
+        return new TimeStamp(value);
+    }
+
+    public static TimeStamp of(long value) {
+        return of(BigInteger.valueOf(value));
+    }
+
+    public static TimeStamp of(String value) {
+        return of(Long.valueOf(value));
+    }
+
+    public static TimeStamp ofWinTime(long value) {
+        return of(BigInteger.valueOf(value));
+    }
+
+    public static TimeStamp ofWinTime(String value) {
+        return of(Long.valueOf(value));
+    }
+
+    public static TimeStamp of(byte... values) {
+        return new TimeStamp(values);
+    }
+
+    public static TimeStamp of(Date timestamp) {
+        BigInteger winStamp = javaToWinTime(BigInteger.valueOf(timestamp.getTime()));
+        return new TimeStamp(winStamp);
+    }
+
+    public static TimeStamp of(ByteBuf byteBuf) {
+        byte[] values = new byte[NUM_BYTES];
+        byteBuf.readBytes(values);
+        return of(values);
+    }
+
+    public BigInteger getBigIntegerValue() {
+        return bigIntegerValue;
+    }
+
+    public Date getAsDate() {
+        return new Date(winTimeToJava(bigIntegerValue).longValue());
+    }
+
+    public static BigInteger javaToWinTime(BigInteger timeMillisSince19700101) {
+        BigInteger timeMillisSince16010101 = EPOCH_DIFF_IN_MILLIS.add(timeMillisSince19700101);
+        return timeMillisSince16010101.multiply(BigInteger.valueOf(10_000));
+    }
+
+    public static BigInteger winTimeToJava(BigInteger winTime) {
+        BigInteger timeMillisSince16010101 = winTime.divide(BigInteger.valueOf(10_000));
+        return timeMillisSince16010101.subtract(EPOCH_DIFF_IN_MILLIS);
+    }
+
+    @Override
+    public long getCalculatedLength() {
+        return NUM_BYTES;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof TimeStamp))
+            return false;
+        if (!super.equals(o))
+            return false;
+
+        TimeStamp timeStamp = (TimeStamp) o;
+
+        return bigIntegerValue.equals(timeStamp.bigIntegerValue);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + bigIntegerValue.hashCode();
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "TimeStamp{winTime=" + getBigIntegerValue() + "/date=" + getAsDate() + "} " + super.toString();
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/TransmissionMode.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/TransmissionMode.java
index 83b1147bd02..aa5141bdd18 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/TransmissionMode.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/TransmissionMode.java
@@ -1,77 +1,77 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
-
-@SuppressWarnings("unused") // Due to predefined TransmissionModes
-public class TransmissionMode extends UnsignedIntLEByteValue {
-
-    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
-
-    private TransmissionMode(byte... values) {
-        super(values);
-    }
-
-    private TransmissionMode(long value) {
-        super(value);
-    }
-
-    private TransmissionMode(String value) {
-        super(value);
-    }
-
-    private TransmissionMode(ByteBuf byteBuf) {
-        super(byteBuf);
-    }
-
-    public static TransmissionMode of(byte... values) {
-        return new TransmissionMode(values);
-    }
-
-    public static TransmissionMode of(long value) {
-        return new TransmissionMode(value);
-    }
-
-    public static TransmissionMode of(String value) {
-        return new TransmissionMode(value);
-    }
-
-    public static TransmissionMode of(ByteBuf byteBuf) {
-        return new TransmissionMode(byteBuf);
-    }
-
-    // TODO: defined as enum so we might do this too similar to AdsReturnCode
-    public static final class DefinedValues {
-        public static final TransmissionMode ADSTRANS_NOTRANS = TransmissionMode.of(0);
-        public static final TransmissionMode ADSTRANS_CLIENTCYCLE = TransmissionMode.of(1);
-        public static final TransmissionMode ADSTRANS_CLIENTONCHA = TransmissionMode.of(2);
-        public static final TransmissionMode ADSTRANS_SERVERCYCLE = TransmissionMode.of(3);
-        public static final TransmissionMode ADSTRANS_SERVERONCHA = TransmissionMode.of(4);
-        public static final TransmissionMode ADSTRANS_SERVERCYCLE2 = TransmissionMode.of(5);
-        public static final TransmissionMode ADSTRANS_SERVERONCHA2 = TransmissionMode.of(6);
-        public static final TransmissionMode ADSTRANS_CLIENT1REQ = TransmissionMode.of(10);
-        public static final TransmissionMode ADSTRANS_MAXMODES = TransmissionMode.of(Integer.MAX_VALUE);
-
-        private DefinedValues() {
-            // Container class
-        }
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
+
+@SuppressWarnings("unused") // Due to predefined TransmissionModes
+public class TransmissionMode extends UnsignedIntLEByteValue {
+
+    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
+
+    private TransmissionMode(byte... values) {
+        super(values);
+    }
+
+    private TransmissionMode(long value) {
+        super(value);
+    }
+
+    private TransmissionMode(String value) {
+        super(value);
+    }
+
+    private TransmissionMode(ByteBuf byteBuf) {
+        super(byteBuf);
+    }
+
+    public static TransmissionMode of(byte... values) {
+        return new TransmissionMode(values);
+    }
+
+    public static TransmissionMode of(long value) {
+        return new TransmissionMode(value);
+    }
+
+    public static TransmissionMode of(String value) {
+        return new TransmissionMode(value);
+    }
+
+    public static TransmissionMode of(ByteBuf byteBuf) {
+        return new TransmissionMode(byteBuf);
+    }
+
+    // TODO: defined as enum so we might do this too similar to AdsReturnCode
+    public static final class DefinedValues {
+        public static final TransmissionMode ADSTRANS_NOTRANS = TransmissionMode.of(0);
+        public static final TransmissionMode ADSTRANS_CLIENTCYCLE = TransmissionMode.of(1);
+        public static final TransmissionMode ADSTRANS_CLIENTONCHA = TransmissionMode.of(2);
+        public static final TransmissionMode ADSTRANS_SERVERCYCLE = TransmissionMode.of(3);
+        public static final TransmissionMode ADSTRANS_SERVERONCHA = TransmissionMode.of(4);
+        public static final TransmissionMode ADSTRANS_SERVERCYCLE2 = TransmissionMode.of(5);
+        public static final TransmissionMode ADSTRANS_SERVERONCHA2 = TransmissionMode.of(6);
+        public static final TransmissionMode ADSTRANS_CLIENT1REQ = TransmissionMode.of(10);
+        public static final TransmissionMode ADSTRANS_MAXMODES = TransmissionMode.of(Integer.MAX_VALUE);
+
+        private DefinedValues() {
+            // Container class
+        }
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Version.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Version.java
index d97149bdd77..dd186c32d99 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Version.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Version.java
@@ -1,60 +1,60 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.UnsignedShortLEByteValue;
-
-public class Version extends UnsignedShortLEByteValue {
-
-    public static final int NUM_BYTES = UnsignedShortLEByteValue.UNSIGNED_SHORT_LE_NUM_BYTES;
-
-    private Version(byte... values) {
-        super(values);
-    }
-
-    private Version(int value) {
-        super(value);
-    }
-
-    private Version(String value) {
-        super(value);
-    }
-
-    private Version(ByteBuf byteBuf) {
-        super(byteBuf);
-    }
-
-    public static Version of(byte... values) {
-        return new Version(values);
-    }
-
-    public static Version of(int value) {
-        checkUnsignedBounds(value, NUM_BYTES);
-        return new Version(value);
-    }
-
-    public static Version of(String value) {
-        return new Version(value);
-    }
-
-    public static Version of(ByteBuf byteBuf) {
-        return new Version(byteBuf);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.UnsignedShortLEByteValue;
+
+public class Version extends UnsignedShortLEByteValue {
+
+    public static final int NUM_BYTES = UnsignedShortLEByteValue.UNSIGNED_SHORT_LE_NUM_BYTES;
+
+    private Version(byte... values) {
+        super(values);
+    }
+
+    private Version(int value) {
+        super(value);
+    }
+
+    private Version(String value) {
+        super(value);
+    }
+
+    private Version(ByteBuf byteBuf) {
+        super(byteBuf);
+    }
+
+    public static Version of(byte... values) {
+        return new Version(values);
+    }
+
+    public static Version of(int value) {
+        checkUnsignedBounds(value, NUM_BYTES);
+        return new Version(value);
+    }
+
+    public static Version of(String value) {
+        return new Version(value);
+    }
+
+    public static Version of(ByteBuf byteBuf) {
+        return new Version(byteBuf);
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/WriteLength.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/WriteLength.java
index c649c524182..91089635977 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/WriteLength.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/WriteLength.java
@@ -1,64 +1,64 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.LengthSupplier;
-import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
-
-public class WriteLength extends UnsignedIntLEByteValue {
-
-    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
-
-    private WriteLength(byte... values) {
-        super(values);
-    }
-
-    private WriteLength(long value) {
-        super(value);
-    }
-
-    private WriteLength(String length) {
-        super(length);
-    }
-
-    private WriteLength(ByteBuf byteBuf) {
-        super(byteBuf);
-    }
-
-    public static WriteLength of(byte... values) {
-        return new WriteLength(values);
-    }
-
-    public static WriteLength of(long value) {
-        return new WriteLength(value);
-    }
-
-    public static WriteLength of(LengthSupplier lengthSupplier) {
-        return new WriteLength(lengthSupplier.getCalculatedLength());
-    }
-
-    public static WriteLength of(String length) {
-        return new WriteLength(length);
-    }
-
-    public static WriteLength of(ByteBuf byteBuf) {
-        return new WriteLength(byteBuf);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.LengthSupplier;
+import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
+
+public class WriteLength extends UnsignedIntLEByteValue {
+
+    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
+
+    private WriteLength(byte... values) {
+        super(values);
+    }
+
+    private WriteLength(long value) {
+        super(value);
+    }
+
+    private WriteLength(String length) {
+        super(length);
+    }
+
+    private WriteLength(ByteBuf byteBuf) {
+        super(byteBuf);
+    }
+
+    public static WriteLength of(byte... values) {
+        return new WriteLength(values);
+    }
+
+    public static WriteLength of(long value) {
+        return new WriteLength(value);
+    }
+
+    public static WriteLength of(LengthSupplier lengthSupplier) {
+        return new WriteLength(lengthSupplier.getCalculatedLength());
+    }
+
+    public static WriteLength of(String length) {
+        return new WriteLength(length);
+    }
+
+    public static WriteLength of(ByteBuf byteBuf) {
+        return new WriteLength(byteBuf);
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/package-info.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/package-info.java
index 173d70effd7..325eb95e2cd 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/package-info.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/package-info.java
@@ -1,22 +1,22 @@
-/*
- 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
-
-   http://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.
- */
-/**
- * This package contains ams/ads generic types.
- */
+/*
+ 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
+
+   http://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.
+ */
+/**
+ * This package contains ams/ads generic types.
+ */
 package org.apache.plc4x.java.ads.api.commands.types;
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AdsData.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AdsData.java
index 032b19ff31d..c7ee9a62b9a 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AdsData.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AdsData.java
@@ -1,32 +1,32 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.generic;
-
-import io.netty.buffer.Unpooled;
-import org.apache.plc4x.java.ads.api.util.ByteReadable;
-
-/**
- * ADS Data	n bytes	The ADS data range contains the parameter of the single ADS commands. The structure of the data array depends on the ADS command. Some ADS commands require no additional data.
- */
-@FunctionalInterface
-public interface AdsData extends ByteReadable {
-
-    AdsData EMPTY = () -> Unpooled.EMPTY_BUFFER;
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.generic;
+
+import io.netty.buffer.Unpooled;
+import org.apache.plc4x.java.ads.api.util.ByteReadable;
+
+/**
+ * ADS Data	n bytes	The ADS data range contains the parameter of the single ADS commands. The structure of the data array depends on the ADS command. Some ADS commands require no additional data.
+ */
+@FunctionalInterface
+public interface AdsData extends ByteReadable {
+
+    AdsData EMPTY = () -> Unpooled.EMPTY_BUFFER;
+
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AmsHeader.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AmsHeader.java
index 26f642ec1aa..4a47200b5f4 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AmsHeader.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AmsHeader.java
@@ -1,225 +1,225 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.generic;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.generic.types.*;
-import org.apache.plc4x.java.ads.api.util.ByteReadable;
-import org.apache.plc4x.java.ads.api.util.LengthSupplier;
-
-import static java.util.Objects.requireNonNull;
-
-/**
- * AMS Header	32 bytes	The AMS/TCP-Header contains the addresses of the transmitter and receiver. In addition the AMS error code , the ADS command Id and some other information.
- */
-public class AmsHeader implements ByteReadable {
-    /**
-     * This is the AmsNetId of the station, for which the packet is intended. Remarks see below.
-     */
-    private final AmsNetId targetAmsNetId;
-    /**
-     * This is the AmsPort of the station, for which the packet is intended.
-     */
-    private final AmsPort targetAmsPort;
-    /**
-     * This contains the AmsNetId of the station, from which the packet was sent.
-     */
-    private final AmsNetId sourceAmsNetId;
-    /**
-     * This contains the AmsPort of the station, from which the packet was sent.
-     */
-    private final AmsPort sourceAmsPort;
-    /**
-     * 2 bytes.
-     */
-    private final Command commandId;
-    /**
-     * 2 bytes.
-     */
-    private final State stateFlags;
-    /**
-     * 4 bytes	Size of the data range. The unit is byte.
-     */
-    private final DataLength dataLength;
-
-    /**
-     * 4 bytes	AMS error number. See ADS Return Codes.
-     */
-    private final AmsError code;
-
-    /**
-     * 4 bytes	Free usable 32 bit array. Usually this array serves to send an Id. This Id makes is possible to assign a received response to a request, which was sent before.
-     */
-    private final Invoke invokeId;
-
-    private final transient LengthSupplier dataLengthSupplier;
-
-    private AmsHeader(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Command commandId, State stateFlags, DataLength dataLength, AmsError code, Invoke invokeId) {
-        this.targetAmsNetId = requireNonNull(targetAmsNetId);
-        this.targetAmsPort = requireNonNull(targetAmsPort);
-        this.sourceAmsNetId = requireNonNull(sourceAmsNetId);
-        this.sourceAmsPort = requireNonNull(sourceAmsPort);
-        this.commandId = requireNonNull(commandId);
-        this.stateFlags = requireNonNull(stateFlags);
-        this.dataLength = requireNonNull(dataLength);
-        this.code = requireNonNull(code);
-        this.invokeId = requireNonNull(invokeId);
-        dataLengthSupplier = null;
-
-    }
-
-    private AmsHeader(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Command commandId, State stateFlags, LengthSupplier dataLengthSupplier, AmsError code, Invoke invokeId) {
-        this.targetAmsNetId = requireNonNull(targetAmsNetId);
-        this.targetAmsPort = requireNonNull(targetAmsPort);
-        this.sourceAmsNetId = requireNonNull(sourceAmsNetId);
-        this.sourceAmsPort = requireNonNull(sourceAmsPort);
-        this.commandId = requireNonNull(commandId);
-        this.stateFlags = requireNonNull(stateFlags);
-        this.dataLength = null;
-        this.code = requireNonNull(code);
-        this.invokeId = requireNonNull(invokeId);
-        this.dataLengthSupplier = requireNonNull(dataLengthSupplier);
-    }
-
-    public static AmsHeader of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Command commandId, State stateFlags, DataLength dataLength, AmsError code, Invoke invokeId) {
-        return new AmsHeader(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, commandId, stateFlags, dataLength, code, invokeId);
-    }
-
-    public static AmsHeader of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Command commandId, State stateFlags, LengthSupplier dataLengthSupplier, AmsError code, Invoke invokeId) {
-        return new AmsHeader(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, commandId, stateFlags, dataLengthSupplier, code, invokeId);
-    }
-
-    @Override
-    public ByteBuf getByteBuf() {
-        return buildByteBuff(
-            targetAmsNetId,
-            targetAmsPort,
-            sourceAmsNetId,
-            sourceAmsPort,
-            commandId,
-            stateFlags,
-            getDataLength(),
-            code,
-            invokeId);
-    }
-
-    public AmsNetId getTargetAmsNetId() {
-        return targetAmsNetId;
-    }
-
-    public AmsPort getTargetAmsPort() {
-        return targetAmsPort;
-    }
-
-    public AmsNetId getSourceAmsNetId() {
-        return sourceAmsNetId;
-    }
-
-    public AmsPort getSourceAmsPort() {
-        return sourceAmsPort;
-    }
-
-    public Command getCommandId() {
-        return commandId;
-    }
-
-    public State getStateFlags() {
-        return stateFlags;
-    }
-
-    public DataLength getDataLength() {
-        return dataLengthSupplier == null ? dataLength : DataLength.of(dataLengthSupplier);
-    }
-
-    public AmsError getCode() {
-        return code;
-    }
-
-    public Invoke getInvokeId() {
-        return invokeId;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof AmsHeader)) {
-            return false;
-        }
-
-        AmsHeader amsHeader = (AmsHeader) o;
-
-        if (!targetAmsNetId.equals(amsHeader.targetAmsNetId)) {
-            return false;
-        }
-        if (!targetAmsPort.equals(amsHeader.targetAmsPort)) {
-            return false;
-        }
-        if (!sourceAmsNetId.equals(amsHeader.sourceAmsNetId)) {
-            return false;
-        }
-        if (!sourceAmsPort.equals(amsHeader.sourceAmsPort)) {
-            return false;
-        }
-        if (commandId != amsHeader.commandId) {
-            return false;
-        }
-        if (!stateFlags.equals(amsHeader.stateFlags)) {
-            return false;
-        }
-        if (!code.equals(amsHeader.code)) {
-            return false;
-        }
-        if (!invokeId.equals(amsHeader.invokeId)) {
-            return false;
-        }
-
-        return getDataLength().equals(((AmsHeader) o).getDataLength());
-    }
-
-    @Override
-    public int hashCode() {
-        int result = targetAmsNetId.hashCode();
-        result = 31 * result + targetAmsPort.hashCode();
-        result = 31 * result + sourceAmsNetId.hashCode();
-        result = 31 * result + sourceAmsPort.hashCode();
-        result = 31 * result + commandId.hashCode();
-        result = 31 * result + stateFlags.hashCode();
-        result = 31 * result + code.hashCode();
-        result = 31 * result + invokeId.hashCode();
-        result = 31 * result + getDataLength().hashCode();
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "AmsHeader{" +
-            "targetAmsNetId=" + targetAmsNetId +
-            ", targetAmsPort=" + targetAmsPort +
-            ", sourceAmsNetId=" + sourceAmsNetId +
-            ", sourceAmsPort=" + sourceAmsPort +
-            ", commandId=" + commandId +
-            ", stateFlags=" + stateFlags +
-            ", dataLength=" + getDataLength() +
-            ", code=" + code +
-            ", invokeId=" + invokeId +
-            '}';
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.generic;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.generic.types.*;
+import org.apache.plc4x.java.ads.api.util.ByteReadable;
+import org.apache.plc4x.java.ads.api.util.LengthSupplier;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * AMS Header	32 bytes	The AMS/TCP-Header contains the addresses of the transmitter and receiver. In addition the AMS error code , the ADS command Id and some other information.
+ */
+public class AmsHeader implements ByteReadable {
+    /**
+     * This is the AmsNetId of the station, for which the packet is intended. Remarks see below.
+     */
+    private final AmsNetId targetAmsNetId;
+    /**
+     * This is the AmsPort of the station, for which the packet is intended.
+     */
+    private final AmsPort targetAmsPort;
+    /**
+     * This contains the AmsNetId of the station, from which the packet was sent.
+     */
+    private final AmsNetId sourceAmsNetId;
+    /**
+     * This contains the AmsPort of the station, from which the packet was sent.
+     */
+    private final AmsPort sourceAmsPort;
+    /**
+     * 2 bytes.
+     */
+    private final Command commandId;
+    /**
+     * 2 bytes.
+     */
+    private final State stateFlags;
+    /**
+     * 4 bytes	Size of the data range. The unit is byte.
+     */
+    private final DataLength dataLength;
+
+    /**
+     * 4 bytes	AMS error number. See ADS Return Codes.
+     */
+    private final AmsError code;
+
+    /**
+     * 4 bytes	Free usable 32 bit array. Usually this array serves to send an Id. This Id makes is possible to assign a received response to a request, which was sent before.
+     */
+    private final Invoke invokeId;
+
+    private final transient LengthSupplier dataLengthSupplier;
+
+    private AmsHeader(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Command commandId, State stateFlags, DataLength dataLength, AmsError code, Invoke invokeId) {
+        this.targetAmsNetId = requireNonNull(targetAmsNetId);
+        this.targetAmsPort = requireNonNull(targetAmsPort);
+        this.sourceAmsNetId = requireNonNull(sourceAmsNetId);
+        this.sourceAmsPort = requireNonNull(sourceAmsPort);
+        this.commandId = requireNonNull(commandId);
+        this.stateFlags = requireNonNull(stateFlags);
+        this.dataLength = requireNonNull(dataLength);
+        this.code = requireNonNull(code);
+        this.invokeId = requireNonNull(invokeId);
+        dataLengthSupplier = null;
+
+    }
+
+    private AmsHeader(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Command commandId, State stateFlags, LengthSupplier dataLengthSupplier, AmsError code, Invoke invokeId) {
+        this.targetAmsNetId = requireNonNull(targetAmsNetId);
+        this.targetAmsPort = requireNonNull(targetAmsPort);
+        this.sourceAmsNetId = requireNonNull(sourceAmsNetId);
+        this.sourceAmsPort = requireNonNull(sourceAmsPort);
+        this.commandId = requireNonNull(commandId);
+        this.stateFlags = requireNonNull(stateFlags);
+        this.dataLength = null;
+        this.code = requireNonNull(code);
+        this.invokeId = requireNonNull(invokeId);
+        this.dataLengthSupplier = requireNonNull(dataLengthSupplier);
+    }
+
+    public static AmsHeader of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Command commandId, State stateFlags, DataLength dataLength, AmsError code, Invoke invokeId) {
+        return new AmsHeader(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, commandId, stateFlags, dataLength, code, invokeId);
+    }
+
+    public static AmsHeader of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Command commandId, State stateFlags, LengthSupplier dataLengthSupplier, AmsError code, Invoke invokeId) {
+        return new AmsHeader(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, commandId, stateFlags, dataLengthSupplier, code, invokeId);
+    }
+
+    @Override
+    public ByteBuf getByteBuf() {
+        return buildByteBuff(
+            targetAmsNetId,
+            targetAmsPort,
+            sourceAmsNetId,
+            sourceAmsPort,
+            commandId,
+            stateFlags,
+            getDataLength(),
+            code,
+            invokeId);
+    }
+
+    public AmsNetId getTargetAmsNetId() {
+        return targetAmsNetId;
+    }
+
+    public AmsPort getTargetAmsPort() {
+        return targetAmsPort;
+    }
+
+    public AmsNetId getSourceAmsNetId() {
+        return sourceAmsNetId;
+    }
+
+    public AmsPort getSourceAmsPort() {
+        return sourceAmsPort;
+    }
+
+    public Command getCommandId() {
+        return commandId;
+    }
+
+    public State getStateFlags() {
+        return stateFlags;
+    }
+
+    public DataLength getDataLength() {
+        return dataLengthSupplier == null ? dataLength : DataLength.of(dataLengthSupplier);
+    }
+
+    public AmsError getCode() {
+        return code;
+    }
+
+    public Invoke getInvokeId() {
+        return invokeId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof AmsHeader)) {
+            return false;
+        }
+
+        AmsHeader amsHeader = (AmsHeader) o;
+
+        if (!targetAmsNetId.equals(amsHeader.targetAmsNetId)) {
+            return false;
+        }
+        if (!targetAmsPort.equals(amsHeader.targetAmsPort)) {
+            return false;
+        }
+        if (!sourceAmsNetId.equals(amsHeader.sourceAmsNetId)) {
+            return false;
+        }
+        if (!sourceAmsPort.equals(amsHeader.sourceAmsPort)) {
+            return false;
+        }
+        if (commandId != amsHeader.commandId) {
+            return false;
+        }
+        if (!stateFlags.equals(amsHeader.stateFlags)) {
+            return false;
+        }
+        if (!code.equals(amsHeader.code)) {
+            return false;
+        }
+        if (!invokeId.equals(amsHeader.invokeId)) {
+            return false;
+        }
+
+        return getDataLength().equals(((AmsHeader) o).getDataLength());
+    }
+
+    @Override
+    public int hashCode() {
+        int result = targetAmsNetId.hashCode();
+        result = 31 * result + targetAmsPort.hashCode();
+        result = 31 * result + sourceAmsNetId.hashCode();
+        result = 31 * result + sourceAmsPort.hashCode();
+        result = 31 * result + commandId.hashCode();
+        result = 31 * result + stateFlags.hashCode();
+        result = 31 * result + code.hashCode();
+        result = 31 * result + invokeId.hashCode();
+        result = 31 * result + getDataLength().hashCode();
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "AmsHeader{" +
+            "targetAmsNetId=" + targetAmsNetId +
+            ", targetAmsPort=" + targetAmsPort +
+            ", sourceAmsNetId=" + sourceAmsNetId +
+            ", sourceAmsPort=" + sourceAmsPort +
+            ", commandId=" + commandId +
+            ", stateFlags=" + stateFlags +
+            ", dataLength=" + getDataLength() +
+            ", code=" + code +
+            ", invokeId=" + invokeId +
+            '}';
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AmsPacket.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AmsPacket.java
index b8a70fca70b..2cc860b01c9 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AmsPacket.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AmsPacket.java
@@ -1,92 +1,92 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.generic;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.commands.AdsCommandType;
-import org.apache.plc4x.java.ads.api.generic.types.*;
-import org.apache.plc4x.java.ads.api.util.ByteReadable;
-
-import static java.util.Objects.requireNonNull;
-
-public abstract class AmsPacket implements ByteReadable {
-
-    protected final AmsHeader amsHeader;
-
-    protected AmsPacket(AmsHeader amsHeader) {
-        this.amsHeader = amsHeader;
-    }
-
-    protected AmsPacket(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, State stateId, Invoke invokeId) {
-        if (!getClass().isAnnotationPresent(AdsCommandType.class)) {
-            throw new IllegalArgumentException(AdsCommandType.class + " need to be present.");
-        }
-        this.amsHeader = AmsHeader.of(
-            requireNonNull(targetAmsNetId),
-            requireNonNull(targetAmsPort),
-            requireNonNull(sourceAmsNetId),
-            requireNonNull(sourceAmsPort),
-            requireNonNull(getClass().getAnnotation(AdsCommandType.class).value()),
-            requireNonNull(stateId),
-            () -> getAdsData().getCalculatedLength(),
-            requireNonNull(AmsError.NONE),
-            requireNonNull(invokeId));
-    }
-
-    public AmsHeader getAmsHeader() {
-        return amsHeader;
-    }
-
-    public abstract AdsData getAdsData();
-
-    protected AdsData buildADSData(ByteReadable... byteReadables) {
-        return () -> buildByteBuff(byteReadables);
-    }
-
-    @Override
-    public ByteBuf getByteBuf() {
-        return buildByteBuff(amsHeader, getAdsData());
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof AmsPacket)) {
-            return false;
-        }
-
-        AmsPacket amsPacket = (AmsPacket) o;
-
-        return amsHeader.equals(amsPacket.amsHeader);
-    }
-
-    @Override
-    public int hashCode() {
-        return amsHeader.hashCode();
-    }
-
-    @Override
-    public String toString() {
-        return getClass().getSimpleName() + "{" +
-            "amsHeader=" + amsHeader +
-            '}';
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.generic;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.commands.AdsCommandType;
+import org.apache.plc4x.java.ads.api.generic.types.*;
+import org.apache.plc4x.java.ads.api.util.ByteReadable;
+
+import static java.util.Objects.requireNonNull;
+
+public abstract class AmsPacket implements ByteReadable {
+
+    protected final AmsHeader amsHeader;
+
+    protected AmsPacket(AmsHeader amsHeader) {
+        this.amsHeader = amsHeader;
+    }
+
+    protected AmsPacket(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, State stateId, Invoke invokeId) {
+        if (!getClass().isAnnotationPresent(AdsCommandType.class)) {
+            throw new IllegalArgumentException(AdsCommandType.class + " need to be present.");
+        }
+        this.amsHeader = AmsHeader.of(
+            requireNonNull(targetAmsNetId),
+            requireNonNull(targetAmsPort),
+            requireNonNull(sourceAmsNetId),
+            requireNonNull(sourceAmsPort),
+            requireNonNull(getClass().getAnnotation(AdsCommandType.class).value()),
+            requireNonNull(stateId),
+            () -> getAdsData().getCalculatedLength(),
+            requireNonNull(AmsError.NONE),
+            requireNonNull(invokeId));
+    }
+
+    public AmsHeader getAmsHeader() {
+        return amsHeader;
+    }
+
+    public abstract AdsData getAdsData();
+
+    protected AdsData buildADSData(ByteReadable... byteReadables) {
+        return () -> buildByteBuff(byteReadables);
+    }
+
+    @Override
+    public ByteBuf getByteBuf() {
+        return buildByteBuff(amsHeader, getAdsData());
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof AmsPacket)) {
+            return false;
+        }
+
+        AmsPacket amsPacket = (AmsPacket) o;
+
+        return amsHeader.equals(amsPacket.amsHeader);
+    }
+
+    @Override
+    public int hashCode() {
+        return amsHeader.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + "{" +
+            "amsHeader=" + amsHeader +
+            '}';
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/package-info.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/package-info.java
index d72c82800a7..2897f729de4 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/package-info.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/package-info.java
@@ -1,22 +1,22 @@
-/*
- 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
-
-   http://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.
- */
-/**
- * This package contains ams/ads generic messages.
- */
+/*
+ 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
+
+   http://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.
+ */
+/**
+ * This package contains ams/ads generic messages.
+ */
 package org.apache.plc4x.java.ads.api.generic;
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AmsError.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AmsError.java
index 0a78b8d70bf..ff3abfba4dc 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AmsError.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AmsError.java
@@ -1,73 +1,73 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.generic.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.commands.types.AdsReturnCode;
-import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
-
-import static java.util.Objects.requireNonNull;
-
-public class AmsError extends UnsignedIntLEByteValue {
-
-    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
-
-    public static final AmsError NONE = of(0);
-
-    private AmsError(byte... values) {
-        super(values);
-    }
-
-    private AmsError(long value) {
-        super(value);
-    }
-
-    private AmsError(ByteBuf byteBuf) {
-        super(byteBuf);
-    }
-
-    public static AmsError of(byte... values) {
-        return new AmsError(values);
-    }
-
-    public static AmsError of(long errorCode) {
-        return new AmsError(errorCode);
-    }
-
-    public static AmsError of(AdsReturnCode errorCode) {
-        return new AmsError(requireNonNull(errorCode).getHex());
-    }
-
-    public static AmsError of(String errorCode) {
-        return of(Long.parseLong(errorCode));
-    }
-
-    public static AmsError of(ByteBuf byteBuf) {
-        return new AmsError(byteBuf);
-    }
-
-    public AdsReturnCode toAdsReturnCode() {
-        return AdsReturnCode.of(getAsLong());
-    }
-
-    @Override
-    public String toString() {
-        return "AmsError{" + toAdsReturnCode() + "}";
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.generic.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.commands.types.AdsReturnCode;
+import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
+
+import static java.util.Objects.requireNonNull;
+
+public class AmsError extends UnsignedIntLEByteValue {
+
+    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
+
+    public static final AmsError NONE = of(0);
+
+    private AmsError(byte... values) {
+        super(values);
+    }
+
+    private AmsError(long value) {
+        super(value);
+    }
+
+    private AmsError(ByteBuf byteBuf) {
+        super(byteBuf);
+    }
+
+    public static AmsError of(byte... values) {
+        return new AmsError(values);
+    }
+
+    public static AmsError of(long errorCode) {
+        return new AmsError(errorCode);
+    }
+
+    public static AmsError of(AdsReturnCode errorCode) {
+        return new AmsError(requireNonNull(errorCode).getHex());
+    }
+
+    public static AmsError of(String errorCode) {
+        return of(Long.parseLong(errorCode));
+    }
+
+    public static AmsError of(ByteBuf byteBuf) {
+        return new AmsError(byteBuf);
+    }
+
+    public AdsReturnCode toAdsReturnCode() {
+        return AdsReturnCode.of(getAsLong());
+    }
+
+    @Override
+    public String toString() {
+        return "AmsError{" + toAdsReturnCode() + "}";
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AmsNetId.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AmsNetId.java
index 4dbe76eab97..7b133111dd7 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AmsNetId.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AmsNetId.java
@@ -1,90 +1,90 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.generic.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.plc4x.java.ads.api.util.ByteValue;
-
-import java.util.regex.Pattern;
-import java.util.stream.Stream;
-
-/**
- * It is not only possible to exchange data between TwinCAT modules on one PC, it is even possible to do so by ADS
- * methods between multiple TwinCAT PC's on the network.
- * <p>
- * Every PC on the network can be uniquely identified by a TCP/IP address, such as "172.1.2.16". The AdsAmsNetId is an
- * extension of the TCP/IP address and identifies a TwinCAT message router, e.g. "172.1.2.16.1.1". TwinCAT message
- * routers exist on every TwinCAT PC, and on every Beckhoff BCxxxx bus controller (e.g. BC3100, BC8100, BC9000, ...).
- * <p>
- * The AmsNetId consists of 6 bytes and addresses the transmitter or receiver. One possible AmsNetId would be e.g.
- * "172.16.17.10.1.1". The storage arrangement in this example is as follows:
- * <p>
- * _____0     1     2     3     4     5
- * __+-----------------------------------+
- * 0 | 127 |  16 |  17 |  10 |   1 |   1 |
- * __+-----------------------------------+
- * <p>
- * The AmsNetId is purely logical and has usually no relation to the IP address. The AmsNetId is configured at the
- * target system. At the PC for this the TwinCAT System Control is used. If you use other hardware, see the considering
- * documentation for notes about settings of the AMS NetId.
- *
- * @see <a href="https://infosys.beckhoff.com/content/1033/tcadscommon/html/tcadscommon_identadsdevice.htm?id=3991659524769593444">ADS device identification</a>
- */
-public class AmsNetId extends ByteValue {
-
-    public static final Pattern AMS_NET_ID_PATTERN =
-        Pattern.compile("\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}");
-
-    public static final int NUM_BYTES = 6;
-
-    private AmsNetId(byte... values) {
-        super(values);
-        assertLength(NUM_BYTES);
-    }
-
-    public static AmsNetId of(byte... values) {
-        return new AmsNetId(values);
-    }
-
-    public static AmsNetId of(int octed1, int octed2, int octed3, int octed4, int octed5, int octed6) {
-        return new AmsNetId((byte) octed1, (byte) octed2, (byte) octed3, (byte) octed4, (byte) octed5, (byte) octed6);
-    }
-
-    public static AmsNetId of(String address) {
-        if (!AMS_NET_ID_PATTERN.matcher(address).matches()) {
-            throw new IllegalArgumentException(address + " must match " + AMS_NET_ID_PATTERN);
-        }
-        String[] split = address.split("\\.");
-        byte[] bytes = ArrayUtils.toPrimitive(Stream.of(split).map(Integer::parseInt).map(Integer::byteValue).toArray(Byte[]::new));
-        return new AmsNetId(bytes);
-    }
-
-    public static AmsNetId of(ByteBuf byteBuf) {
-        byte[] values = new byte[NUM_BYTES];
-        byteBuf.readBytes(values);
-        return of(values);
-    }
-
-    @Override
-    public String toString() {
-        byte[] bytes = getBytes();
-        return (bytes[0] & 0xff) + "." + (bytes[1] & 0xff) + "." + (bytes[2] & 0xff) + "." + (bytes[3] & 0xff) + "." + (bytes[4] & 0xff) + "." + (bytes[5] & 0xff);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.generic.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.plc4x.java.ads.api.util.ByteValue;
+
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+
+/**
+ * It is not only possible to exchange data between TwinCAT modules on one PC, it is even possible to do so by ADS
+ * methods between multiple TwinCAT PC's on the network.
+ * <p>
+ * Every PC on the network can be uniquely identified by a TCP/IP address, such as "172.1.2.16". The AdsAmsNetId is an
+ * extension of the TCP/IP address and identifies a TwinCAT message router, e.g. "172.1.2.16.1.1". TwinCAT message
+ * routers exist on every TwinCAT PC, and on every Beckhoff BCxxxx bus controller (e.g. BC3100, BC8100, BC9000, ...).
+ * <p>
+ * The AmsNetId consists of 6 bytes and addresses the transmitter or receiver. One possible AmsNetId would be e.g.
+ * "172.16.17.10.1.1". The storage arrangement in this example is as follows:
+ * <p>
+ * _____0     1     2     3     4     5
+ * __+-----------------------------------+
+ * 0 | 127 |  16 |  17 |  10 |   1 |   1 |
+ * __+-----------------------------------+
+ * <p>
+ * The AmsNetId is purely logical and has usually no relation to the IP address. The AmsNetId is configured at the
+ * target system. At the PC for this the TwinCAT System Control is used. If you use other hardware, see the considering
+ * documentation for notes about settings of the AMS NetId.
+ *
+ * @see <a href="https://infosys.beckhoff.com/content/1033/tcadscommon/html/tcadscommon_identadsdevice.htm?id=3991659524769593444">ADS device identification</a>
+ */
+public class AmsNetId extends ByteValue {
+
+    public static final Pattern AMS_NET_ID_PATTERN =
+        Pattern.compile("\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}");
+
+    public static final int NUM_BYTES = 6;
+
+    private AmsNetId(byte... values) {
+        super(values);
+        assertLength(NUM_BYTES);
+    }
+
+    public static AmsNetId of(byte... values) {
+        return new AmsNetId(values);
+    }
+
+    public static AmsNetId of(int octed1, int octed2, int octed3, int octed4, int octed5, int octed6) {
+        return new AmsNetId((byte) octed1, (byte) octed2, (byte) octed3, (byte) octed4, (byte) octed5, (byte) octed6);
+    }
+
+    public static AmsNetId of(String address) {
+        if (!AMS_NET_ID_PATTERN.matcher(address).matches()) {
+            throw new IllegalArgumentException(address + " must match " + AMS_NET_ID_PATTERN);
+        }
+        String[] split = address.split("\\.");
+        byte[] bytes = ArrayUtils.toPrimitive(Stream.of(split).map(Integer::parseInt).map(Integer::byteValue).toArray(Byte[]::new));
+        return new AmsNetId(bytes);
+    }
+
+    public static AmsNetId of(ByteBuf byteBuf) {
+        byte[] values = new byte[NUM_BYTES];
+        byteBuf.readBytes(values);
+        return of(values);
+    }
+
+    @Override
+    public String toString() {
+        byte[] bytes = getBytes();
+        return (bytes[0] & 0xff) + "." + (bytes[1] & 0xff) + "." + (bytes[2] & 0xff) + "." + (bytes[3] & 0xff) + "." + (bytes[4] & 0xff) + "." + (bytes[5] & 0xff);
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AmsPort.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AmsPort.java
index 061e3017967..041abd2aeb9 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AmsPort.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AmsPort.java
@@ -1,132 +1,132 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.generic.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.UnsignedShortLEByteValue;
-
-import java.util.regex.Pattern;
-
-/**
- * The ADS devices in a TwinCAT message router are uniquely identified by a number referred to as the ADS-PortNr. For ADS devices this has a fixed specification, whereas pure ADS client applications (e.g. a visualisation system) are allocated a variable ADS port number when they first access the message router.
- *
- * @see <a href="https://infosys.beckhoff.com/content/1033/tcadscommon/html/tcadscommon_identadsdevice.htm?id=3991659524769593444">ADS device identification</a>
- */
-@SuppressWarnings("unused") // Due to predefined ports
-public class AmsPort extends UnsignedShortLEByteValue {
-
-    public static final Pattern AMS_PORT_PATTERN = Pattern.compile("\\d+");
-
-    public static final int NUM_BYTES = UnsignedShortLEByteValue.UNSIGNED_SHORT_LE_NUM_BYTES;
-
-    private AmsPort(byte... value) {
-        super(value);
-    }
-
-    private AmsPort(int value) {
-        super(value);
-    }
-
-    public static AmsPort of(byte... values) {
-        return new AmsPort(values);
-    }
-
-    public static AmsPort of(int port) {
-        return new AmsPort(port);
-    }
-
-    public static AmsPort of(String port) {
-        if (!AMS_PORT_PATTERN.matcher(port).matches()) {
-            throw new IllegalArgumentException(port + " must match " + AMS_PORT_PATTERN);
-        }
-        return of(Integer.parseInt(port));
-    }
-
-    public static AmsPort of(ByteBuf byteBuf) {
-        return of(byteBuf.readUnsignedShortLE());
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(getAsInt());
-    }
-
-    public static class ReservedPorts {
-
-        /**
-         * Logger (only NT-Log)
-         */
-        public static final AmsPort logger = AmsPort.of(100);
-        /**
-         * Eventlogger
-         */
-        public static final AmsPort eventLogger = AmsPort.of(110);
-        /**
-         * IO
-         */
-        public static final AmsPort io = AmsPort.of(300);
-        /**
-         * additional Task 1
-         */
-        public static final AmsPort additionalTask1 = AmsPort.of(301);
-        /**
-         * additional Task 2
-         */
-        public static final AmsPort additionalTask2 = AmsPort.of(302);
-
-        /**
-         * NC
-         */
-        public static final AmsPort nc = AmsPort.of(500);
-        /**
-         * PLC RuntimeSystem 1
-         */
-        public static final AmsPort plcRuntimeSystem1 = AmsPort.of(801);
-        /**
-         * PLC RuntimeSystem 2
-         */
-        public static final AmsPort plcRuntimeSystem2 = AmsPort.of(811);
-        /**
-         * PLC RuntimeSystem 3
-         */
-        public static final AmsPort plcRuntimeSystem3 = AmsPort.of(821);
-        /**
-         * PLC RuntimeSystem 4
-         */
-        public static final AmsPort plcRuntimeSystem4 = AmsPort.of(831);
-
-        /**
-         * Camshaft controller
-         */
-        public static final AmsPort camShaftController = AmsPort.of(900);
-
-        /**
-         * System Service
-         */
-        public static final AmsPort systemService = AmsPort.of(900);
-        /**
-         * Scope
-         */
-        public static final AmsPort scope = AmsPort.of(900);
-
-        private ReservedPorts() {
-            // Container class
-        }
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.generic.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.UnsignedShortLEByteValue;
+
+import java.util.regex.Pattern;
+
+/**
+ * The ADS devices in a TwinCAT message router are uniquely identified by a number referred to as the ADS-PortNr. For ADS devices this has a fixed specification, whereas pure ADS client applications (e.g. a visualisation system) are allocated a variable ADS port number when they first access the message router.
+ *
+ * @see <a href="https://infosys.beckhoff.com/content/1033/tcadscommon/html/tcadscommon_identadsdevice.htm?id=3991659524769593444">ADS device identification</a>
+ */
+@SuppressWarnings("unused") // Due to predefined ports
+public class AmsPort extends UnsignedShortLEByteValue {
+
+    public static final Pattern AMS_PORT_PATTERN = Pattern.compile("\\d+");
+
+    public static final int NUM_BYTES = UnsignedShortLEByteValue.UNSIGNED_SHORT_LE_NUM_BYTES;
+
+    private AmsPort(byte... value) {
+        super(value);
+    }
+
+    private AmsPort(int value) {
+        super(value);
+    }
+
+    public static AmsPort of(byte... values) {
+        return new AmsPort(values);
+    }
+
+    public static AmsPort of(int port) {
+        return new AmsPort(port);
+    }
+
+    public static AmsPort of(String port) {
+        if (!AMS_PORT_PATTERN.matcher(port).matches()) {
+            throw new IllegalArgumentException(port + " must match " + AMS_PORT_PATTERN);
+        }
+        return of(Integer.parseInt(port));
+    }
+
+    public static AmsPort of(ByteBuf byteBuf) {
+        return of(byteBuf.readUnsignedShortLE());
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(getAsInt());
+    }
+
+    public static class ReservedPorts {
+
+        /**
+         * Logger (only NT-Log)
+         */
+        public static final AmsPort logger = AmsPort.of(100);
+        /**
+         * Eventlogger
+         */
+        public static final AmsPort eventLogger = AmsPort.of(110);
+        /**
+         * IO
+         */
+        public static final AmsPort io = AmsPort.of(300);
+        /**
+         * additional Task 1
+         */
+        public static final AmsPort additionalTask1 = AmsPort.of(301);
+        /**
+         * additional Task 2
+         */
+        public static final AmsPort additionalTask2 = AmsPort.of(302);
+
+        /**
+         * NC
+         */
+        public static final AmsPort nc = AmsPort.of(500);
+        /**
+         * PLC RuntimeSystem 1
+         */
+        public static final AmsPort plcRuntimeSystem1 = AmsPort.of(801);
+        /**
+         * PLC RuntimeSystem 2
+         */
+        public static final AmsPort plcRuntimeSystem2 = AmsPort.of(811);
+        /**
+         * PLC RuntimeSystem 3
+         */
+        public static final AmsPort plcRuntimeSystem3 = AmsPort.of(821);
+        /**
+         * PLC RuntimeSystem 4
+         */
+        public static final AmsPort plcRuntimeSystem4 = AmsPort.of(831);
+
+        /**
+         * Camshaft controller
+         */
+        public static final AmsPort camShaftController = AmsPort.of(900);
+
+        /**
+         * System Service
+         */
+        public static final AmsPort systemService = AmsPort.of(900);
+        /**
+         * Scope
+         */
+        public static final AmsPort scope = AmsPort.of(900);
+
+        private ReservedPorts() {
+            // Container class
+        }
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/Command.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/Command.java
index 779a15e1b88..ca00193f1b7 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/Command.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/Command.java
@@ -1,126 +1,126 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.generic.types;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import org.apache.plc4x.java.ads.api.util.ByteReadable;
-import org.apache.plc4x.java.ads.api.util.ByteValue;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.Arrays;
-
-import static java.lang.Integer.toHexString;
-
-public enum Command implements ByteReadable {
-    INVALID(0x00),
-    ADS_READ_DEVICE_INFO(0x01),
-    ADS_READ(0x02),
-    ADS_WRITE(0x03),
-    ADS_READ_STATE(0x04),
-    ADS_WRITE_CONTROL(0x05),
-    ADS_ADD_DEVICE_NOTIFICATION(0x06),
-    ADS_DELETE_DEVICE_NOTIFICATION(0x07),
-    ADS_DEVICE_NOTIFICATION(0x08),
-    ADS_READ_WRITE(0x09),
-    /**
-     * Other commands are not defined or are used internally. Therefore the Command Id  is only allowed to contain the above enumerated values!
-     */
-    UNKNOWN();
-
-    public static final int NUM_BYTES = 2;
-
-    final byte[] value;
-
-    final int intValue;
-
-    Command() {
-        // Only used for unknown enum
-        value = new byte[0];
-        intValue = 0;
-    }
-
-    Command(int value) {
-        ByteValue.checkUnsignedBounds(value, NUM_BYTES);
-        this.intValue = value;
-        this.value = ByteBuffer.allocate(NUM_BYTES)
-            .order(ByteOrder.LITTLE_ENDIAN)
-            .putShort((short) (value & 0xffff))
-            .array();
-    }
-
-    @Override
-    public byte[] getBytes() {
-        if (this == UNKNOWN) {
-            throw new IllegalStateException("Unknown enum can't be serialized");
-        }
-        return value;
-    }
-
-    @Override
-    public ByteBuf getByteBuf() {
-        if (this == UNKNOWN) {
-            throw new IllegalStateException("Unknown enum can't be serialized");
-        }
-        return Unpooled.wrappedBuffer(value);
-    }
-
-    @Override
-    public long getCalculatedLength() {
-        return NUM_BYTES;
-    }
-
-    public static Command of(byte... bytes) {
-        // TODO: improve by using a map
-        for (Command command : values()) {
-            if (Arrays.equals(bytes, command.value)) {
-                return command;
-            }
-        }
-        return UNKNOWN;
-    }
-
-    private static Command of(int intValue) {
-        // TODO: improve by using a map
-        for (Command command : values()) {
-            if (command.intValue == intValue) {
-                return command;
-            }
-        }
-        return UNKNOWN;
-    }
-
-    public static Command of(String value) {
-        return valueOf(value);
-    }
-
-    public static Command ofInt(String intValue) {
-        return of(Integer.parseInt(intValue));
-    }
-
-    public static Command of(ByteBuf byteBuf) {
-        return of(byteBuf.readUnsignedShortLE());
-    }
-
-    @Override
-    public String toString() {
-        return name() + "/hex=" + String.format("0x%2s", toHexString(intValue)).replace(' ', '0');
-    }
-}
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.generic.types;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import org.apache.plc4x.java.ads.api.util.ByteReadable;
+import org.apache.plc4x.java.ads.api.util.ByteValue;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Arrays;
+
+import static java.lang.Integer.toHexString;
+
+public enum Command implements ByteReadable {
+    INVALID(0x00),
+    ADS_READ_DEVICE_INFO(0x01),
+    ADS_READ(0x02),
+    ADS_WRITE(0x03),
+    ADS_READ_STATE(0x04),
+    ADS_WRITE_CONTROL(0x05),
+    ADS_ADD_DEVICE_NOTIFICATION(0x06),
+    ADS_DELETE_DEVICE_NOTIFICATION(0x07),
+    ADS_DEVICE_NOTIFICATION(0x08),
+    ADS_READ_WRITE(0x09),
+    /**
+     * Other commands are not defined or are used internally. Therefore the Command Id  is only allowed to contain the above enumerated values!
+     */
+    UNKNOWN();
+
+    public static final int NUM_BYTES = 2;
+
+    final byte[] value;
+
+    final int intValue;
+
+    Command() {
+        // Only used for unknown enum
+        value = new byte[0];
+        intValue = 0;
+    }
+
+    Command(int value) {
+        ByteValue.checkUnsignedBounds(value, NUM_BYTES);
+        this.intValue = value;
+        this.value = ByteBuffer.allocate(NUM_BYTES)
+            .order(ByteOrder.LITTLE_ENDIAN)
+            .putShort((short) (value & 0xffff))
+            .array();
+    }
+
+    @Override
+    public byte[] getBytes() {
+        if (this == UNKNOWN) {
+            throw new IllegalStateException("Unknown enum can't be serialized");
+        }
+        return value;
+    }
+
+    @Override
+    public ByteBuf getByteBuf() {
+        if (this == UNKNOWN) {
+            throw new IllegalStateException("Unknown enum can't be serialized");
+        }
+        return Unpooled.wrappedBuffer(value);
+    }
+
+    @Override
+    public long getCalculatedLength() {
+        return NUM_BYTES;
+    }
+
+    public static Command of(byte... bytes) {
+        // TODO: improve by using a map
+        for (Command command : values()) {
+            if (Arrays.equals(bytes, command.value)) {
+                return command;
+            }
+        }
+        return UNKNOWN;
+    }
+
+    private static Command of(int intValue) {
+        // TODO: improve by using a map
+        for (Command command : values()) {
+            if (command.intValue == intValue) {
+                return command;
+            }
+        }
+        return UNKNOWN;
+    }
+
+    public static Command of(String value) {
+        return valueOf(value);
+    }
+
+    public static Command ofInt(String intValue) {
+        return of(Integer.parseInt(intValue));
+    }
+
+    public static Command of(ByteBuf byteBuf) {
+        return of(byteBuf.readUnsignedShortLE());
+    }
+
+    @Override
+    public String toString() {
+        return name() + "/hex=" + String.format("0x%2s", toHexString(intValue)).replace(' ', '0');
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/DataLength.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/DataLength.java
index b9037250d28..3bd98b2844a 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/DataLength.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/DataLength.java
@@ -1,64 +1,64 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.generic.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.LengthSupplier;
-import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
-
-public class DataLength extends UnsignedIntLEByteValue {
-
-    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
-
-    private DataLength(byte... values) {
-        super(values);
-    }
-
-    private DataLength(long value) {
-        super(value);
-    }
-
-    private DataLength(String length) {
-        super(length);
-    }
-
-    private DataLength(ByteBuf byteBuf) {
-        super(byteBuf);
-    }
-
-    public static DataLength of(byte... values) {
-        return new DataLength(values);
-    }
-
-    public static DataLength of(long value) {
-        return new DataLength(value);
-    }
-
-    public static DataLength of(LengthSupplier lengthSupplier) {
-        return new DataLength(lengthSupplier.getCalculatedLength());
-    }
-
-    public static DataLength of(String length) {
-        return new DataLength(length);
-    }
-
-    public static DataLength of(ByteBuf byteBuf) {
-        return new DataLength(byteBuf);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.generic.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.LengthSupplier;
+import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
+
+public class DataLength extends UnsignedIntLEByteValue {
+
+    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
+
+    private DataLength(byte... values) {
+        super(values);
+    }
+
+    private DataLength(long value) {
+        super(value);
+    }
+
+    private DataLength(String length) {
+        super(length);
+    }
+
+    private DataLength(ByteBuf byteBuf) {
+        super(byteBuf);
+    }
+
+    public static DataLength of(byte... values) {
+        return new DataLength(values);
+    }
+
+    public static DataLength of(long value) {
+        return new DataLength(value);
+    }
+
+    public static DataLength of(LengthSupplier lengthSupplier) {
+        return new DataLength(lengthSupplier.getCalculatedLength());
+    }
+
+    public static DataLength of(String length) {
+        return new DataLength(length);
+    }
+
+    public static DataLength of(ByteBuf byteBuf) {
+        return new DataLength(byteBuf);
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/Invoke.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/Invoke.java
index 8e78545e569..9f185add823 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/Invoke.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/Invoke.java
@@ -1,61 +1,61 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.generic.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
-
-public class Invoke extends UnsignedIntLEByteValue {
-
-    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
-
-    public static final Invoke NONE = of(0);
-
-    private Invoke(byte... values) {
-        super(values);
-    }
-
-    private Invoke(long value) {
-        super(value);
-    }
-
-    private Invoke(ByteBuf byteBuf) {
-        super(byteBuf);
-    }
-
-    private Invoke(String invokeId) {
-        super(invokeId);
-    }
-
-    public static Invoke of(byte... values) {
-        return new Invoke(values);
-    }
-
-    public static Invoke of(long invokeId) {
-        return new Invoke(invokeId);
-    }
-
-    public static Invoke of(String invokeId) {
-        return new Invoke(invokeId);
-    }
-
-    public static Invoke of(ByteBuf byteBuf) {
-        return new Invoke(byteBuf);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.generic.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
+
+public class Invoke extends UnsignedIntLEByteValue {
+
+    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
+
+    public static final Invoke NONE = of(0);
+
+    private Invoke(byte... values) {
+        super(values);
+    }
+
+    private Invoke(long value) {
+        super(value);
+    }
+
+    private Invoke(ByteBuf byteBuf) {
+        super(byteBuf);
+    }
+
+    private Invoke(String invokeId) {
+        super(invokeId);
+    }
+
+    public static Invoke of(byte... values) {
+        return new Invoke(values);
+    }
+
+    public static Invoke of(long invokeId) {
+        return new Invoke(invokeId);
+    }
+
+    public static Invoke of(String invokeId) {
+        return new Invoke(invokeId);
+    }
+
+    public static Invoke of(ByteBuf byteBuf) {
+        return new Invoke(byteBuf);
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/State.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/State.java
index 0f378e639b9..3a1e2deb9f2 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/State.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/State.java
@@ -1,203 +1,203 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.generic.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.UnsignedShortLEByteValue;
-
-import java.util.EnumSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.stream.Stream;
-
-import static java.lang.Integer.toBinaryString;
-import static org.apache.plc4x.java.ads.api.generic.types.State.StateMask.*;
-
-/**
- * 2 bytes	see below.
- * <p>
- * State Flags
- * Flag     Description
- * 0x0001	0: Request / 1: Response
- * 0x0004	ADS command
- * The first bit marks, whether itĀ“s a request or response. The third bit must be set to 1, to exchange data with ADS commands. The other bits are not defined or were used for other internal purposes.
- * <p>
- * Therefore the other bits must be set to 0!
- * <p>
- * Flag     Description
- * 0x000x	TCP Protocol
- * 0x004x	UDP Protocol
- * Bit number 7 marks, if it should be transfered with TCP or UDP.
- */
-public class State extends UnsignedShortLEByteValue {
-
-    public enum StateMask {
-        RESPONSE(0b0000_0000_0000_0001),
-        NO_RETURN(0b0000_0000_0000_0010),
-        ADS_COMMAND(0b0000_0000_0000_0100),
-        SYSTEM_COMMAND(0b0000_0000_0000_1000),
-        HIGH_PRIORITY_COMMAND(0b0000_0000_0001_0000),
-        TIMESTAMP_ADDED(0b0000_0000_0010_0000),
-        UDP_COMMAND(0b0000_0000_0100_0000),
-        INIT_COMMAND(0b0000_0000_1000_0000),
-        BROADCAST(0b1000_0000_0000_0000);
-
-        private final int mask;
-
-        StateMask(int mask) {
-            this.mask = mask;
-        }
-
-        public boolean applies(int value) {
-            return (value & this.mask) != 0;
-        }
-
-        boolean applies(State state) {
-            return (state.getAsInt() & this.mask) != 0;
-        }
-
-        int getMask() {
-            return mask;
-        }
-
-        @Override
-        public String toString() {
-            return name() + "/mask=" + String.format("0b%16s", toBinaryString(mask)).replace(' ', '0');
-        }
-    }
-
-    public static final State DEFAULT = State.of(ADS_COMMAND);
-
-    public static final State DEFAULT_RESPONSE = State.of(ADS_COMMAND, RESPONSE);
-
-    public static final int NUM_BYTES = UnsignedShortLEByteValue.UNSIGNED_SHORT_LE_NUM_BYTES;
-
-    private State(byte... values) {
-        super(values);
-    }
-
-    private State(int value) {
-        super(value);
-    }
-
-    private State(String stateId) {
-        super(stateId);
-    }
-
-    private State(ByteBuf byteBuf) {
-        super(byteBuf);
-    }
-
-    public static State of(byte... values) {
-        return new State(values);
-    }
-
-    public static State of(int value) {
-        return new State(value);
-    }
-
-    public static State of(ByteBuf byteBuf) {
-        return new State(byteBuf);
-    }
-
-    public static State of(String stateId) {
-        return new State(stateId);
-    }
-
-    private static State of(StateMask... stateMasks) {
-        return State.of(Stream.of(stateMasks).map(StateMask::getMask).reduce(0, (a, b) -> a | b));
-    }
-
-    private EnumSet<StateMask> getStateMaskEnumSet() {
-        List<StateMask> result = new LinkedList<>();
-        if (isResponse()) {
-            result.add(StateMask.RESPONSE);
-        }
-        if (isNoReturn()) {
-            result.add(NO_RETURN);
-        }
-        if (isADSCommand()) {
-            result.add(StateMask.ADS_COMMAND);
-        }
-        if (isSystemCommand()) {
-            result.add(StateMask.SYSTEM_COMMAND);
-        }
-        if (isHighPriorityCommand()) {
-            result.add(StateMask.HIGH_PRIORITY_COMMAND);
-        }
-        if (isTimestampAdded()) {
-            result.add(StateMask.TIMESTAMP_ADDED);
-        }
-        if (isUDPCommand()) {
-            result.add(StateMask.UDP_COMMAND);
-        }
-        if (isInitCommand()) {
-            result.add(StateMask.INIT_COMMAND);
-        }
-        if (isBroadcast()) {
-            result.add(StateMask.BROADCAST);
-        }
-        return EnumSet.copyOf(result);
-    }
-
-    private boolean isResponse() {
-        return RESPONSE.applies(this);
-    }
-
-    public boolean isRequest() {
-        return !isResponse();
-    }
-
-    private boolean isNoReturn() {
-        return NO_RETURN.applies(this);
-    }
-
-    private boolean isADSCommand() {
-        return ADS_COMMAND.applies(this);
-    }
-
-    private boolean isSystemCommand() {
-        return SYSTEM_COMMAND.applies(this);
-    }
-
-    private boolean isHighPriorityCommand() {
-        return HIGH_PRIORITY_COMMAND.applies(this);
-    }
-
-    private boolean isTimestampAdded() {
-        return TIMESTAMP_ADDED.applies(this);
-    }
-
-    private boolean isUDPCommand() {
-        return UDP_COMMAND.applies(this);
-    }
-
-    private boolean isInitCommand() {
-        return INIT_COMMAND.applies(this);
-    }
-
-    private boolean isBroadcast() {
-        return BROADCAST.applies(this);
-    }
-
-    @Override
-    public String toString() {
-        return "State{" + getStateMaskEnumSet() + "} " + super.toString();
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.generic.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.UnsignedShortLEByteValue;
+
+import java.util.EnumSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.stream.Stream;
+
+import static java.lang.Integer.toBinaryString;
+import static org.apache.plc4x.java.ads.api.generic.types.State.StateMask.*;
+
+/**
+ * 2 bytes	see below.
+ * <p>
+ * State Flags
+ * Flag     Description
+ * 0x0001	0: Request / 1: Response
+ * 0x0004	ADS command
+ * The first bit marks, whether itĀ“s a request or response. The third bit must be set to 1, to exchange data with ADS commands. The other bits are not defined or were used for other internal purposes.
+ * <p>
+ * Therefore the other bits must be set to 0!
+ * <p>
+ * Flag     Description
+ * 0x000x	TCP Protocol
+ * 0x004x	UDP Protocol
+ * Bit number 7 marks, if it should be transfered with TCP or UDP.
+ */
+public class State extends UnsignedShortLEByteValue {
+
+    public enum StateMask {
+        RESPONSE(0b0000_0000_0000_0001),
+        NO_RETURN(0b0000_0000_0000_0010),
+        ADS_COMMAND(0b0000_0000_0000_0100),
+        SYSTEM_COMMAND(0b0000_0000_0000_1000),
+        HIGH_PRIORITY_COMMAND(0b0000_0000_0001_0000),
+        TIMESTAMP_ADDED(0b0000_0000_0010_0000),
+        UDP_COMMAND(0b0000_0000_0100_0000),
+        INIT_COMMAND(0b0000_0000_1000_0000),
+        BROADCAST(0b1000_0000_0000_0000);
+
+        private final int mask;
+
+        StateMask(int mask) {
+            this.mask = mask;
+        }
+
+        public boolean applies(int value) {
+            return (value & this.mask) != 0;
+        }
+
+        boolean applies(State state) {
+            return (state.getAsInt() & this.mask) != 0;
+        }
+
+        int getMask() {
+            return mask;
+        }
+
+        @Override
+        public String toString() {
+            return name() + "/mask=" + String.format("0b%16s", toBinaryString(mask)).replace(' ', '0');
+        }
+    }
+
+    public static final State DEFAULT = State.of(ADS_COMMAND);
+
+    public static final State DEFAULT_RESPONSE = State.of(ADS_COMMAND, RESPONSE);
+
+    public static final int NUM_BYTES = UnsignedShortLEByteValue.UNSIGNED_SHORT_LE_NUM_BYTES;
+
+    private State(byte... values) {
+        super(values);
+    }
+
+    private State(int value) {
+        super(value);
+    }
+
+    private State(String stateId) {
+        super(stateId);
+    }
+
+    private State(ByteBuf byteBuf) {
+        super(byteBuf);
+    }
+
+    public static State of(byte... values) {
+        return new State(values);
+    }
+
+    public static State of(int value) {
+        return new State(value);
+    }
+
+    public static State of(ByteBuf byteBuf) {
+        return new State(byteBuf);
+    }
+
+    public static State of(String stateId) {
+        return new State(stateId);
+    }
+
+    private static State of(StateMask... stateMasks) {
+        return State.of(Stream.of(stateMasks).map(StateMask::getMask).reduce(0, (a, b) -> a | b));
+    }
+
+    private EnumSet<StateMask> getStateMaskEnumSet() {
+        List<StateMask> result = new LinkedList<>();
+        if (isResponse()) {
+            result.add(StateMask.RESPONSE);
+        }
+        if (isNoReturn()) {
+            result.add(NO_RETURN);
+        }
+        if (isADSCommand()) {
+            result.add(StateMask.ADS_COMMAND);
+        }
+        if (isSystemCommand()) {
+            result.add(StateMask.SYSTEM_COMMAND);
+        }
+        if (isHighPriorityCommand()) {
+            result.add(StateMask.HIGH_PRIORITY_COMMAND);
+        }
+        if (isTimestampAdded()) {
+            result.add(StateMask.TIMESTAMP_ADDED);
+        }
+        if (isUDPCommand()) {
+            result.add(StateMask.UDP_COMMAND);
+        }
+        if (isInitCommand()) {
+            result.add(StateMask.INIT_COMMAND);
+        }
+        if (isBroadcast()) {
+            result.add(StateMask.BROADCAST);
+        }
+        return EnumSet.copyOf(result);
+    }
+
+    private boolean isResponse() {
+        return RESPONSE.applies(this);
+    }
+
+    public boolean isRequest() {
+        return !isResponse();
+    }
+
+    private boolean isNoReturn() {
+        return NO_RETURN.applies(this);
+    }
+
+    private boolean isADSCommand() {
+        return ADS_COMMAND.applies(this);
+    }
+
+    private boolean isSystemCommand() {
+        return SYSTEM_COMMAND.applies(this);
+    }
+
+    private boolean isHighPriorityCommand() {
+        return HIGH_PRIORITY_COMMAND.applies(this);
+    }
+
+    private boolean isTimestampAdded() {
+        return TIMESTAMP_ADDED.applies(this);
+    }
+
+    private boolean isUDPCommand() {
+        return UDP_COMMAND.applies(this);
+    }
+
+    private boolean isInitCommand() {
+        return INIT_COMMAND.applies(this);
+    }
+
+    private boolean isBroadcast() {
+        return BROADCAST.applies(this);
+    }
+
+    @Override
+    public String toString() {
+        return "State{" + getStateMaskEnumSet() + "} " + super.toString();
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/package-info.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/package-info.java
index aa298805fbd..287d50c4bfb 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/package-info.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/package-info.java
@@ -1,22 +1,22 @@
-/*
- 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
-
-   http://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.
- */
-/**
- * This package contains ams/ads generic types.
- */
+/*
+ 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
+
+   http://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.
+ */
+/**
+ * This package contains ams/ads generic types.
+ */
 package org.apache.plc4x.java.ads.api.generic.types;
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/package-info.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/package-info.java
index 6bca8c9ca01..cde1e5e91bd 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/package-info.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/package-info.java
@@ -1,23 +1,23 @@
-/*
- 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
-
-   http://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.
- */
-/**
- * This package contains a replication of the specification found online.
- * @see <a href="https://infosys.beckhoff.com/english.php?content=../content/1033/tcadsamsspec/html/tcadsamsspec_intro.htm">ADS SPEC</a>
- */
+/*
+ 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
+
+   http://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.
+ */
+/**
+ * This package contains a replication of the specification found online.
+ * @see <a href="https://infosys.beckhoff.com/english.php?content=../content/1033/tcadsamsspec/html/tcadsamsspec_intro.htm">ADS SPEC</a>
+ */
 package org.apache.plc4x.java.ads.api;
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialAcknowledgeFrame.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialAcknowledgeFrame.java
index d3dfc7751d1..b3601045c4e 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialAcknowledgeFrame.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialAcknowledgeFrame.java
@@ -1,173 +1,173 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.serial;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.serial.types.*;
-import org.apache.plc4x.java.ads.api.util.ByteReadable;
-import org.apache.plc4x.java.ads.protocol.util.DigestUtil;
-
-/**
- * If an AMS serial frame has been received and the frame is OK (magic cookie OK, CRC OK, correct fragment number etc.),
- * then the receiver has to send an acknowledge frame, to inform the transmitter that the frame has arrived.
- *
- * @see <a href="https://infosys.beckhoff.com/content/1033/tcadsamsserialspec/html/tcamssericalspec_amsframe.htm?id=8115637053270715044">TwinCAT AMS via RS232 Specification</a>
- */
-public class AmsSerialAcknowledgeFrame implements ByteReadable {
-
-    public static final int ID = 0x5A01;
-
-    /**
-     * Id for detecting an AMS serial frame.
-     */
-    private final MagicCookie magicCookie;
-
-    /**
-     * Address of the sending participant. This value can always be set to 0 for an RS232 communication,
-     * since it is a 1 to 1 connection and hence the participants are unique.
-     */
-    private final TransmitterAddress transmitterAddress;
-
-    /**
-     * Receiverā€™s address. This value can always be set to 0 for an RS232 communication, since it is a 1 to 1
-     * connection and hence the participants are unique.
-     */
-    private final ReceiverAddress receiverAddress;
-
-    /**
-     * Number of the frame sent. Once the number 255 has been sent, it starts again from 0. The receiver checks this
-     * number with an internal counter.
-     */
-    private final FragmentNumber fragmentNumber;
-
-    /**
-     * The max. length of the AMS packet to be sent is 255. If larger AMS packets are to be sent then they have to be
-     * fragmented (not published at the moment).
-     */
-    private final UserDataLength userDataLength;
-
-    private final CRC crc;
-
-    private AmsSerialAcknowledgeFrame(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, CRC crc) {
-        this.magicCookie = magicCookie;
-        this.transmitterAddress = transmitterAddress;
-        this.receiverAddress = receiverAddress;
-        this.fragmentNumber = fragmentNumber;
-        this.userDataLength = userDataLength;
-        this.crc = crc;
-    }
-
-    private AmsSerialAcknowledgeFrame(TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber) {
-        this.magicCookie = MagicCookie.of(ID);
-        this.transmitterAddress = transmitterAddress;
-        this.receiverAddress = receiverAddress;
-        this.fragmentNumber = fragmentNumber;
-        this.userDataLength = UserDataLength.of((byte) 0);
-        this.crc = CRC.of(DigestUtil.calculateCrc16(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength));
-    }
-
-    public static AmsSerialAcknowledgeFrame of(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, CRC crc) {
-        return new AmsSerialAcknowledgeFrame(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, crc);
-    }
-
-    public static AmsSerialAcknowledgeFrame of(TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber) {
-        return new AmsSerialAcknowledgeFrame(transmitterAddress, receiverAddress, fragmentNumber);
-    }
-
-    @Override
-    public ByteBuf getByteBuf() {
-        return buildByteBuff(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, crc);
-    }
-
-    public MagicCookie getMagicCookie() {
-        return magicCookie;
-    }
-
-    public TransmitterAddress getTransmitterAddress() {
-        return transmitterAddress;
-    }
-
-    public ReceiverAddress getReceiverAddress() {
-        return receiverAddress;
-    }
-
-    public FragmentNumber getFragmentNumber() {
-        return fragmentNumber;
-    }
-
-    public UserDataLength getUserDataLength() {
-        return userDataLength;
-    }
-
-    public CRC getCrc() {
-        return crc;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof AmsSerialAcknowledgeFrame)) {
-            return false;
-        }
-
-        AmsSerialAcknowledgeFrame that = (AmsSerialAcknowledgeFrame) o;
-
-        if (!magicCookie.equals(that.magicCookie)) {
-            return false;
-        }
-        if (!transmitterAddress.equals(that.transmitterAddress)) {
-            return false;
-        }
-        if (!receiverAddress.equals(that.receiverAddress)) {
-            return false;
-        }
-        if (!fragmentNumber.equals(that.fragmentNumber)) {
-            return false;
-        }
-        if (!userDataLength.equals(that.userDataLength)) {
-            return false;
-        }
-        return crc.equals(that.crc);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = magicCookie.hashCode();
-        result = 31 * result + transmitterAddress.hashCode();
-        result = 31 * result + receiverAddress.hashCode();
-        result = 31 * result + fragmentNumber.hashCode();
-        result = 31 * result + userDataLength.hashCode();
-        result = 31 * result + crc.hashCode();
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "AmsSerialAcknowledgeFrame{" +
-            "magicCookie=" + magicCookie +
-            ", transmitterAddress=" + transmitterAddress +
-            ", receiverAddress=" + receiverAddress +
-            ", fragmentNumber=" + fragmentNumber +
-            ", userDataLength=" + userDataLength +
-            ", crc=" + crc +
-            '}';
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.serial;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.serial.types.*;
+import org.apache.plc4x.java.ads.api.util.ByteReadable;
+import org.apache.plc4x.java.ads.protocol.util.DigestUtil;
+
+/**
+ * If an AMS serial frame has been received and the frame is OK (magic cookie OK, CRC OK, correct fragment number etc.),
+ * then the receiver has to send an acknowledge frame, to inform the transmitter that the frame has arrived.
+ *
+ * @see <a href="https://infosys.beckhoff.com/content/1033/tcadsamsserialspec/html/tcamssericalspec_amsframe.htm?id=8115637053270715044">TwinCAT AMS via RS232 Specification</a>
+ */
+public class AmsSerialAcknowledgeFrame implements ByteReadable {
+
+    public static final int ID = 0x5A01;
+
+    /**
+     * Id for detecting an AMS serial frame.
+     */
+    private final MagicCookie magicCookie;
+
+    /**
+     * Address of the sending participant. This value can always be set to 0 for an RS232 communication,
+     * since it is a 1 to 1 connection and hence the participants are unique.
+     */
+    private final TransmitterAddress transmitterAddress;
+
+    /**
+     * Receiverā€™s address. This value can always be set to 0 for an RS232 communication, since it is a 1 to 1
+     * connection and hence the participants are unique.
+     */
+    private final ReceiverAddress receiverAddress;
+
+    /**
+     * Number of the frame sent. Once the number 255 has been sent, it starts again from 0. The receiver checks this
+     * number with an internal counter.
+     */
+    private final FragmentNumber fragmentNumber;
+
+    /**
+     * The max. length of the AMS packet to be sent is 255. If larger AMS packets are to be sent then they have to be
+     * fragmented (not published at the moment).
+     */
+    private final UserDataLength userDataLength;
+
+    private final CRC crc;
+
+    private AmsSerialAcknowledgeFrame(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, CRC crc) {
+        this.magicCookie = magicCookie;
+        this.transmitterAddress = transmitterAddress;
+        this.receiverAddress = receiverAddress;
+        this.fragmentNumber = fragmentNumber;
+        this.userDataLength = userDataLength;
+        this.crc = crc;
+    }
+
+    private AmsSerialAcknowledgeFrame(TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber) {
+        this.magicCookie = MagicCookie.of(ID);
+        this.transmitterAddress = transmitterAddress;
+        this.receiverAddress = receiverAddress;
+        this.fragmentNumber = fragmentNumber;
+        this.userDataLength = UserDataLength.of((byte) 0);
+        this.crc = CRC.of(DigestUtil.calculateCrc16(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength));
+    }
+
+    public static AmsSerialAcknowledgeFrame of(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, CRC crc) {
+        return new AmsSerialAcknowledgeFrame(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, crc);
+    }
+
+    public static AmsSerialAcknowledgeFrame of(TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber) {
+        return new AmsSerialAcknowledgeFrame(transmitterAddress, receiverAddress, fragmentNumber);
+    }
+
+    @Override
+    public ByteBuf getByteBuf() {
+        return buildByteBuff(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, crc);
+    }
+
+    public MagicCookie getMagicCookie() {
+        return magicCookie;
+    }
+
+    public TransmitterAddress getTransmitterAddress() {
+        return transmitterAddress;
+    }
+
+    public ReceiverAddress getReceiverAddress() {
+        return receiverAddress;
+    }
+
+    public FragmentNumber getFragmentNumber() {
+        return fragmentNumber;
+    }
+
+    public UserDataLength getUserDataLength() {
+        return userDataLength;
+    }
+
+    public CRC getCrc() {
+        return crc;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof AmsSerialAcknowledgeFrame)) {
+            return false;
+        }
+
+        AmsSerialAcknowledgeFrame that = (AmsSerialAcknowledgeFrame) o;
+
+        if (!magicCookie.equals(that.magicCookie)) {
+            return false;
+        }
+        if (!transmitterAddress.equals(that.transmitterAddress)) {
+            return false;
+        }
+        if (!receiverAddress.equals(that.receiverAddress)) {
+            return false;
+        }
+        if (!fragmentNumber.equals(that.fragmentNumber)) {
+            return false;
+        }
+        if (!userDataLength.equals(that.userDataLength)) {
+            return false;
+        }
+        return crc.equals(that.crc);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = magicCookie.hashCode();
+        result = 31 * result + transmitterAddress.hashCode();
+        result = 31 * result + receiverAddress.hashCode();
+        result = 31 * result + fragmentNumber.hashCode();
+        result = 31 * result + userDataLength.hashCode();
+        result = 31 * result + crc.hashCode();
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "AmsSerialAcknowledgeFrame{" +
+            "magicCookie=" + magicCookie +
+            ", transmitterAddress=" + transmitterAddress +
+            ", receiverAddress=" + receiverAddress +
+            ", fragmentNumber=" + fragmentNumber +
+            ", userDataLength=" + userDataLength +
+            ", crc=" + crc +
+            '}';
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialFrame.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialFrame.java
index 8ca399e056e..0f322afbdd1 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialFrame.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialFrame.java
@@ -1,199 +1,199 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.serial;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.serial.types.*;
-import org.apache.plc4x.java.ads.api.util.ByteReadable;
-import org.apache.plc4x.java.ads.protocol.util.DigestUtil;
-
-/**
- * An AMS packet can be transferred via RS232 with the help of an AMS serial frame.
- * The actual AMS packet is in the user data field of the frame.
- * The max. length of the AMS packet is limited to 255 bytes.
- * Therefore the max. size of an AMS serial frame is 263 bytes.
- * The fragment number is compared with an internal counter by the receiver.
- * The frame number is simply accepted and not checked when receiving the first AMS frame or in case a timeout is
- * exceeded. The CRC16 algorithm is used for calculating the checksum.
- *
- * @see <a href="https://infosys.beckhoff.com/content/1033/tcadsamsserialspec/html/tcamssericalspec_amsframe.htm?id=8115637053270715044">TwinCAT AMS via RS232 Specification</a>
- */
-public class AmsSerialFrame implements ByteReadable {
-
-    public static final int ID = 0xA501;
-
-    /**
-     * Id for detecting an AMS serial frame.
-     */
-    private final MagicCookie magicCookie;
-
-    /**
-     * Address of the sending participant. This value can always be set to 0 for an RS232 communication,
-     * since it is a 1 to 1 connection and hence the participants are unique.
-     */
-    private final TransmitterAddress transmitterAddress;
-
-    /**
-     * Receiverā€™s address. This value can always be set to 0 for an RS232 communication, since it is a 1 to 1
-     * connection and hence the participants are unique.
-     */
-    private final ReceiverAddress receiverAddress;
-
-    /**
-     * Number of the frame sent. Once the number 255 has been sent, it starts again from 0. The receiver checks this
-     * number with an internal counter.
-     */
-    private final FragmentNumber fragmentNumber;
-
-    /**
-     * The max. length of the AMS packet to be sent is 255. If larger AMS packets are to be sent then they have to be
-     * fragmented (not published at the moment).
-     */
-    private final UserDataLength userDataLength;
-
-    /**
-     * The AMS packet to be sent.
-     */
-    private final UserData userData;
-
-    private final CRC crc;
-
-    private AmsSerialFrame(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, UserData userData, CRC crc) {
-        this.magicCookie = magicCookie;
-        this.transmitterAddress = transmitterAddress;
-        this.receiverAddress = receiverAddress;
-        this.fragmentNumber = fragmentNumber;
-        this.userDataLength = userDataLength;
-        this.userData = userData;
-        this.crc = crc;
-    }
-
-    private AmsSerialFrame(FragmentNumber fragmentNumber, UserData userData) {
-        this.magicCookie = MagicCookie.of(ID);
-        this.transmitterAddress = TransmitterAddress.RS232_COMM_ADDRESS;
-        this.receiverAddress = ReceiverAddress.RS232_COMM_ADDRESS;
-        this.fragmentNumber = fragmentNumber;
-        long calculatedLength = userData.getCalculatedLength();
-        if (calculatedLength > 255) {
-            throw new IllegalArgumentException("Paket length must not exceed 255");
-        }
-        this.userDataLength = UserDataLength.of((byte) calculatedLength);
-        byte[] amsPacketBytes = userData.getBytes();
-        this.userData = UserData.of(amsPacketBytes);
-        this.crc = CRC.of(DigestUtil.calculateCrc16(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, userData));
-    }
-
-    public static AmsSerialFrame of(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, UserData userData, CRC crc) {
-        return new AmsSerialFrame(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, userData, crc);
-    }
-
-    public static AmsSerialFrame of(FragmentNumber fragmentNumber, UserData userData) {
-        return new AmsSerialFrame(fragmentNumber, userData);
-    }
-
-    @Override
-    public ByteBuf getByteBuf() {
-        return buildByteBuff(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, userData, crc);
-    }
-
-    public MagicCookie getMagicCookie() {
-        return magicCookie;
-    }
-
-    public TransmitterAddress getTransmitterAddress() {
-        return transmitterAddress;
-    }
-
-    public ReceiverAddress getReceiverAddress() {
-        return receiverAddress;
-    }
-
-    public FragmentNumber getFragmentNumber() {
-        return fragmentNumber;
-    }
-
-    public UserDataLength getUserDataLength() {
-        return userDataLength;
-    }
-
-    public UserData getUserData() {
-        return userData;
-    }
-
-    public CRC getCrc() {
-        return crc;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof AmsSerialFrame)) {
-            return false;
-        }
-
-        AmsSerialFrame that = (AmsSerialFrame) o;
-
-        if (!magicCookie.equals(that.magicCookie)) {
-            return false;
-        }
-        if (!transmitterAddress.equals(that.transmitterAddress)) {
-            return false;
-        }
-        if (!receiverAddress.equals(that.receiverAddress)) {
-            return false;
-        }
-        if (!fragmentNumber.equals(that.fragmentNumber)) {
-            return false;
-        }
-        if (!userDataLength.equals(that.userDataLength)) {
-            return false;
-        }
-        if (!userData.equals(that.userData)) {
-            return false;
-        }
-        return crc.equals(that.crc);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = magicCookie.hashCode();
-        result = 31 * result + transmitterAddress.hashCode();
-        result = 31 * result + receiverAddress.hashCode();
-        result = 31 * result + fragmentNumber.hashCode();
-        result = 31 * result + userDataLength.hashCode();
-        result = 31 * result + userData.hashCode();
-        result = 31 * result + crc.hashCode();
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "AmsSerialFrame{" +
-            "magicCookie=" + magicCookie +
-            ", transmitterAddress=" + transmitterAddress +
-            ", receiverAddress=" + receiverAddress +
-            ", fragmentNumber=" + fragmentNumber +
-            ", userDataLength=" + userDataLength +
-            ", userData=" + userData +
-            ", crc=" + crc +
-            '}';
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.serial;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.serial.types.*;
+import org.apache.plc4x.java.ads.api.util.ByteReadable;
+import org.apache.plc4x.java.ads.protocol.util.DigestUtil;
+
+/**
+ * An AMS packet can be transferred via RS232 with the help of an AMS serial frame.
+ * The actual AMS packet is in the user data field of the frame.
+ * The max. length of the AMS packet is limited to 255 bytes.
+ * Therefore the max. size of an AMS serial frame is 263 bytes.
+ * The fragment number is compared with an internal counter by the receiver.
+ * The frame number is simply accepted and not checked when receiving the first AMS frame or in case a timeout is
+ * exceeded. The CRC16 algorithm is used for calculating the checksum.
+ *
+ * @see <a href="https://infosys.beckhoff.com/content/1033/tcadsamsserialspec/html/tcamssericalspec_amsframe.htm?id=8115637053270715044">TwinCAT AMS via RS232 Specification</a>
+ */
+public class AmsSerialFrame implements ByteReadable {
+
+    public static final int ID = 0xA501;
+
+    /**
+     * Id for detecting an AMS serial frame.
+     */
+    private final MagicCookie magicCookie;
+
+    /**
+     * Address of the sending participant. This value can always be set to 0 for an RS232 communication,
+     * since it is a 1 to 1 connection and hence the participants are unique.
+     */
+    private final TransmitterAddress transmitterAddress;
+
+    /**
+     * Receiverā€™s address. This value can always be set to 0 for an RS232 communication, since it is a 1 to 1
+     * connection and hence the participants are unique.
+     */
+    private final ReceiverAddress receiverAddress;
+
+    /**
+     * Number of the frame sent. Once the number 255 has been sent, it starts again from 0. The receiver checks this
+     * number with an internal counter.
+     */
+    private final FragmentNumber fragmentNumber;
+
+    /**
+     * The max. length of the AMS packet to be sent is 255. If larger AMS packets are to be sent then they have to be
+     * fragmented (not published at the moment).
+     */
+    private final UserDataLength userDataLength;
+
+    /**
+     * The AMS packet to be sent.
+     */
+    private final UserData userData;
+
+    private final CRC crc;
+
+    private AmsSerialFrame(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, UserData userData, CRC crc) {
+        this.magicCookie = magicCookie;
+        this.transmitterAddress = transmitterAddress;
+        this.receiverAddress = receiverAddress;
+        this.fragmentNumber = fragmentNumber;
+        this.userDataLength = userDataLength;
+        this.userData = userData;
+        this.crc = crc;
+    }
+
+    private AmsSerialFrame(FragmentNumber fragmentNumber, UserData userData) {
+        this.magicCookie = MagicCookie.of(ID);
+        this.transmitterAddress = TransmitterAddress.RS232_COMM_ADDRESS;
+        this.receiverAddress = ReceiverAddress.RS232_COMM_ADDRESS;
+        this.fragmentNumber = fragmentNumber;
+        long calculatedLength = userData.getCalculatedLength();
+        if (calculatedLength > 255) {
+            throw new IllegalArgumentException("Paket length must not exceed 255");
+        }
+        this.userDataLength = UserDataLength.of((byte) calculatedLength);
+        byte[] amsPacketBytes = userData.getBytes();
+        this.userData = UserData.of(amsPacketBytes);
+        this.crc = CRC.of(DigestUtil.calculateCrc16(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, userData));
+    }
+
+    public static AmsSerialFrame of(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, UserData userData, CRC crc) {
+        return new AmsSerialFrame(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, userData, crc);
+    }
+
+    public static AmsSerialFrame of(FragmentNumber fragmentNumber, UserData userData) {
+        return new AmsSerialFrame(fragmentNumber, userData);
+    }
+
+    @Override
+    public ByteBuf getByteBuf() {
+        return buildByteBuff(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, userData, crc);
+    }
+
+    public MagicCookie getMagicCookie() {
+        return magicCookie;
+    }
+
+    public TransmitterAddress getTransmitterAddress() {
+        return transmitterAddress;
+    }
+
+    public ReceiverAddress getReceiverAddress() {
+        return receiverAddress;
+    }
+
+    public FragmentNumber getFragmentNumber() {
+        return fragmentNumber;
+    }
+
+    public UserDataLength getUserDataLength() {
+        return userDataLength;
+    }
+
+    public UserData getUserData() {
+        return userData;
+    }
+
+    public CRC getCrc() {
+        return crc;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof AmsSerialFrame)) {
+            return false;
+        }
+
+        AmsSerialFrame that = (AmsSerialFrame) o;
+
+        if (!magicCookie.equals(that.magicCookie)) {
+            return false;
+        }
+        if (!transmitterAddress.equals(that.transmitterAddress)) {
+            return false;
+        }
+        if (!receiverAddress.equals(that.receiverAddress)) {
+            return false;
+        }
+        if (!fragmentNumber.equals(that.fragmentNumber)) {
+            return false;
+        }
+        if (!userDataLength.equals(that.userDataLength)) {
+            return false;
+        }
+        if (!userData.equals(that.userData)) {
+            return false;
+        }
+        return crc.equals(that.crc);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = magicCookie.hashCode();
+        result = 31 * result + transmitterAddress.hashCode();
+        result = 31 * result + receiverAddress.hashCode();
+        result = 31 * result + fragmentNumber.hashCode();
+        result = 31 * result + userDataLength.hashCode();
+        result = 31 * result + userData.hashCode();
+        result = 31 * result + crc.hashCode();
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "AmsSerialFrame{" +
+            "magicCookie=" + magicCookie +
+            ", transmitterAddress=" + transmitterAddress +
+            ", receiverAddress=" + receiverAddress +
+            ", fragmentNumber=" + fragmentNumber +
+            ", userDataLength=" + userDataLength +
+            ", userData=" + userData +
+            ", crc=" + crc +
+            '}';
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialResetFrame.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialResetFrame.java
index 342ba0ed319..275ee2f3c89 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialResetFrame.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialResetFrame.java
@@ -1,185 +1,185 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.serial;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.serial.types.*;
-import org.apache.plc4x.java.ads.api.util.ByteReadable;
-import org.apache.plc4x.java.ads.protocol.util.DigestUtil;
-
-/**
- * In case the transmitter does not receive a valid acknowledgement after multiple transmission, then a reset frame is
- * sent. In this way the receiver is informed that a new communication is running and the receiver then accepts the
- * fragment number during the next AMS-Frame, without carrying out a check.
- */
-public class AmsSerialResetFrame implements ByteReadable {
-
-    public static final int ID = 0xA503;
-
-    /**
-     * Id for detecting an AMS serial frame.
-     */
-    private final MagicCookie magicCookie;
-
-    /**
-     * Address of the sending participant. This value can always be set to 0 for an RS232 communication,
-     * since it is a 1 to 1 connection and hence the participants are unique.
-     */
-    private final TransmitterAddress transmitterAddress;
-
-    /**
-     * Receiverā€™s address. This value can always be set to 0 for an RS232 communication, since it is a 1 to 1
-     * connection and hence the participants are unique.
-     */
-    private final ReceiverAddress receiverAddress;
-
-    /**
-     * Number of the frame sent. Once the number 255 has been sent, it starts again from 0. The receiver checks this
-     * number with an internal counter.
-     */
-    private final FragmentNumber fragmentNumber;
-
-    /**
-     * The max. length of the AMS packet to be sent is 255. If larger AMS packets are to be sent then they have to be
-     * fragmented (not published at the moment).
-     */
-    private final UserDataLength userDataLength;
-
-    private final CRC crc;
-
-    private AmsSerialResetFrame(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, CRC crc) {
-        this.magicCookie = magicCookie;
-        this.transmitterAddress = transmitterAddress;
-        this.receiverAddress = receiverAddress;
-        this.fragmentNumber = fragmentNumber;
-        this.userDataLength = userDataLength;
-        this.crc = crc;
-    }
-
-    private AmsSerialResetFrame(TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber) {
-        this.magicCookie = MagicCookie.of(ID);
-        this.transmitterAddress = transmitterAddress;
-        this.receiverAddress = receiverAddress;
-        this.fragmentNumber = FragmentNumber.of((byte) 0);
-        this.userDataLength = UserDataLength.of((byte) 0);
-        this.crc = CRC.of(DigestUtil.calculateCrc16(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength));
-    }
-
-    private AmsSerialResetFrame(FragmentNumber fragmentNumber) {
-        this.magicCookie = MagicCookie.of(ID);
-        this.transmitterAddress = TransmitterAddress.RS232_COMM_ADDRESS;
-        this.receiverAddress = ReceiverAddress.RS232_COMM_ADDRESS;
-        this.fragmentNumber = FragmentNumber.of((byte) 0);
-        this.userDataLength = UserDataLength.of((byte) 0);
-        this.crc = CRC.of(DigestUtil.calculateCrc16(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength));
-    }
-
-    public static AmsSerialResetFrame of(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, CRC crc) {
-        return new AmsSerialResetFrame(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, crc);
-    }
-
-    public static AmsSerialResetFrame of(TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber) {
-        return new AmsSerialResetFrame(transmitterAddress, receiverAddress, fragmentNumber);
-    }
-
-    public static AmsSerialResetFrame of(FragmentNumber fragmentNumber) {
-        return new AmsSerialResetFrame(fragmentNumber);
-    }
-
-    @Override
-    public ByteBuf getByteBuf() {
-        return buildByteBuff(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, crc);
-    }
-
-    public MagicCookie getMagicCookie() {
-        return magicCookie;
-    }
-
-    public TransmitterAddress getTransmitterAddress() {
-        return transmitterAddress;
-    }
-
-    public ReceiverAddress getReceiverAddress() {
-        return receiverAddress;
-    }
-
-    public FragmentNumber getFragmentNumber() {
-        return fragmentNumber;
-    }
-
-    public UserDataLength getUserDataLength() {
-        return userDataLength;
-    }
-
-    public CRC getCrc() {
-        return crc;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof AmsSerialResetFrame)) {
-            return false;
-        }
-
-        AmsSerialResetFrame that = (AmsSerialResetFrame) o;
-
-        if (!magicCookie.equals(that.magicCookie)) {
-            return false;
-        }
-        if (!transmitterAddress.equals(that.transmitterAddress)) {
-            return false;
-        }
-        if (!receiverAddress.equals(that.receiverAddress)) {
-            return false;
-        }
-        if (!fragmentNumber.equals(that.fragmentNumber)) {
-            return false;
-        }
-        if (!userDataLength.equals(that.userDataLength)) {
-            return false;
-        }
-        return crc.equals(that.crc);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = magicCookie.hashCode();
-        result = 31 * result + transmitterAddress.hashCode();
-        result = 31 * result + receiverAddress.hashCode();
-        result = 31 * result + fragmentNumber.hashCode();
-        result = 31 * result + userDataLength.hashCode();
-        result = 31 * result + crc.hashCode();
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "AmsSerialResetFrame{" +
-            "magicCookie=" + magicCookie +
-            ", transmitterAddress=" + transmitterAddress +
-            ", receiverAddress=" + receiverAddress +
-            ", fragmentNumber=" + fragmentNumber +
-            ", userDataLength=" + userDataLength +
-            ", crc=" + crc +
-            '}';
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.serial;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.serial.types.*;
+import org.apache.plc4x.java.ads.api.util.ByteReadable;
+import org.apache.plc4x.java.ads.protocol.util.DigestUtil;
+
+/**
+ * In case the transmitter does not receive a valid acknowledgement after multiple transmission, then a reset frame is
+ * sent. In this way the receiver is informed that a new communication is running and the receiver then accepts the
+ * fragment number during the next AMS-Frame, without carrying out a check.
+ */
+public class AmsSerialResetFrame implements ByteReadable {
+
+    public static final int ID = 0xA503;
+
+    /**
+     * Id for detecting an AMS serial frame.
+     */
+    private final MagicCookie magicCookie;
+
+    /**
+     * Address of the sending participant. This value can always be set to 0 for an RS232 communication,
+     * since it is a 1 to 1 connection and hence the participants are unique.
+     */
+    private final TransmitterAddress transmitterAddress;
+
+    /**
+     * Receiverā€™s address. This value can always be set to 0 for an RS232 communication, since it is a 1 to 1
+     * connection and hence the participants are unique.
+     */
+    private final ReceiverAddress receiverAddress;
+
+    /**
+     * Number of the frame sent. Once the number 255 has been sent, it starts again from 0. The receiver checks this
+     * number with an internal counter.
+     */
+    private final FragmentNumber fragmentNumber;
+
+    /**
+     * The max. length of the AMS packet to be sent is 255. If larger AMS packets are to be sent then they have to be
+     * fragmented (not published at the moment).
+     */
+    private final UserDataLength userDataLength;
+
+    private final CRC crc;
+
+    private AmsSerialResetFrame(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, CRC crc) {
+        this.magicCookie = magicCookie;
+        this.transmitterAddress = transmitterAddress;
+        this.receiverAddress = receiverAddress;
+        this.fragmentNumber = fragmentNumber;
+        this.userDataLength = userDataLength;
+        this.crc = crc;
+    }
+
+    private AmsSerialResetFrame(TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber) {
+        this.magicCookie = MagicCookie.of(ID);
+        this.transmitterAddress = transmitterAddress;
+        this.receiverAddress = receiverAddress;
+        this.fragmentNumber = FragmentNumber.of((byte) 0);
+        this.userDataLength = UserDataLength.of((byte) 0);
+        this.crc = CRC.of(DigestUtil.calculateCrc16(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength));
+    }
+
+    private AmsSerialResetFrame(FragmentNumber fragmentNumber) {
+        this.magicCookie = MagicCookie.of(ID);
+        this.transmitterAddress = TransmitterAddress.RS232_COMM_ADDRESS;
+        this.receiverAddress = ReceiverAddress.RS232_COMM_ADDRESS;
+        this.fragmentNumber = FragmentNumber.of((byte) 0);
+        this.userDataLength = UserDataLength.of((byte) 0);
+        this.crc = CRC.of(DigestUtil.calculateCrc16(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength));
+    }
+
+    public static AmsSerialResetFrame of(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, CRC crc) {
+        return new AmsSerialResetFrame(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, crc);
+    }
+
+    public static AmsSerialResetFrame of(TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber) {
+        return new AmsSerialResetFrame(transmitterAddress, receiverAddress, fragmentNumber);
+    }
+
+    public static AmsSerialResetFrame of(FragmentNumber fragmentNumber) {
+        return new AmsSerialResetFrame(fragmentNumber);
+    }
+
+    @Override
+    public ByteBuf getByteBuf() {
+        return buildByteBuff(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, crc);
+    }
+
+    public MagicCookie getMagicCookie() {
+        return magicCookie;
+    }
+
+    public TransmitterAddress getTransmitterAddress() {
+        return transmitterAddress;
+    }
+
+    public ReceiverAddress getReceiverAddress() {
+        return receiverAddress;
+    }
+
+    public FragmentNumber getFragmentNumber() {
+        return fragmentNumber;
+    }
+
+    public UserDataLength getUserDataLength() {
+        return userDataLength;
+    }
+
+    public CRC getCrc() {
+        return crc;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof AmsSerialResetFrame)) {
+            return false;
+        }
+
+        AmsSerialResetFrame that = (AmsSerialResetFrame) o;
+
+        if (!magicCookie.equals(that.magicCookie)) {
+            return false;
+        }
+        if (!transmitterAddress.equals(that.transmitterAddress)) {
+            return false;
+        }
+        if (!receiverAddress.equals(that.receiverAddress)) {
+            return false;
+        }
+        if (!fragmentNumber.equals(that.fragmentNumber)) {
+            return false;
+        }
+        if (!userDataLength.equals(that.userDataLength)) {
+            return false;
+        }
+        return crc.equals(that.crc);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = magicCookie.hashCode();
+        result = 31 * result + transmitterAddress.hashCode();
+        result = 31 * result + receiverAddress.hashCode();
+        result = 31 * result + fragmentNumber.hashCode();
+        result = 31 * result + userDataLength.hashCode();
+        result = 31 * result + crc.hashCode();
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "AmsSerialResetFrame{" +
+            "magicCookie=" + magicCookie +
+            ", transmitterAddress=" + transmitterAddress +
+            ", receiverAddress=" + receiverAddress +
+            ", fragmentNumber=" + fragmentNumber +
+            ", userDataLength=" + userDataLength +
+            ", crc=" + crc +
+            '}';
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/package-info.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/package-info.java
index 6a038f35132..cc55c239dc6 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/package-info.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/package-info.java
@@ -1,22 +1,22 @@
-/*
- 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
-
-   http://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.
- */
-/**
- * This package contains serial related api objects.
- */
+/*
+ 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
+
+   http://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.
+ */
+/**
+ * This package contains serial related api objects.
+ */
 package org.apache.plc4x.java.ads.api.serial;
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/CRC.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/CRC.java
index 9ece6c1af65..fa6344fa02c 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/CRC.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/CRC.java
@@ -1,59 +1,59 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.serial.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.UnsignedShortLEByteValue;
-
-public class CRC extends UnsignedShortLEByteValue {
-
-    public static final int NUM_BYTES = UnsignedShortLEByteValue.UNSIGNED_SHORT_LE_NUM_BYTES;
-
-    private CRC(byte... values) {
-        super(values);
-    }
-
-    private CRC(int value) {
-        super(value);
-    }
-
-    private CRC(String length) {
-        super(length);
-    }
-
-    private CRC(ByteBuf byteBuf) {
-        super(byteBuf);
-    }
-
-    public static CRC of(byte... values) {
-        return new CRC(values);
-    }
-
-    public static CRC of(int value) {
-        return new CRC(value);
-    }
-
-    public static CRC of(String length) {
-        return new CRC(length);
-    }
-
-    public static CRC of(ByteBuf byteBuf) {
-        return new CRC(byteBuf);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.serial.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.UnsignedShortLEByteValue;
+
+public class CRC extends UnsignedShortLEByteValue {
+
+    public static final int NUM_BYTES = UnsignedShortLEByteValue.UNSIGNED_SHORT_LE_NUM_BYTES;
+
+    private CRC(byte... values) {
+        super(values);
+    }
+
+    private CRC(int value) {
+        super(value);
+    }
+
+    private CRC(String length) {
+        super(length);
+    }
+
+    private CRC(ByteBuf byteBuf) {
+        super(byteBuf);
+    }
+
+    public static CRC of(byte... values) {
+        return new CRC(values);
+    }
+
+    public static CRC of(int value) {
+        return new CRC(value);
+    }
+
+    public static CRC of(String length) {
+        return new CRC(length);
+    }
+
+    public static CRC of(ByteBuf byteBuf) {
+        return new CRC(byteBuf);
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/FragmentNumber.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/FragmentNumber.java
index 71104fe2377..874b0a14aea 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/FragmentNumber.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/FragmentNumber.java
@@ -1,70 +1,70 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.serial.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.ByteValue;
-
-import static java.lang.Integer.toHexString;
-import static org.apache.commons.lang3.StringUtils.leftPad;
-
-public class FragmentNumber extends ByteValue {
-
-    public static final int NUM_BYTES = 1;
-
-    private FragmentNumber(byte value) {
-        super(value);
-    }
-
-    private FragmentNumber(byte[] value) {
-        super(value);
-    }
-
-    private FragmentNumber(ByteBuf byteBuf) {
-        this(byteBuf.readByte());
-    }
-
-    public static FragmentNumber of(byte value) {
-        return new FragmentNumber(value);
-    }
-
-    public static FragmentNumber of(byte... value) {
-        return new FragmentNumber(value);
-    }
-
-    public static FragmentNumber of(String value) {
-        return new FragmentNumber(Byte.valueOf(value));
-    }
-
-    public static FragmentNumber of(ByteBuf byteBuf) {
-        return new FragmentNumber(byteBuf);
-    }
-
-    public byte getAsByte() {
-        return value[0];
-    }
-
-    @Override
-    public String toString() {
-        return super.toString() + "{" +
-            "byteValue=" + (getAsByte() & 0xFF) +
-            ",hexValue=0x" + leftPad(toHexString(getAsByte() & 0xFF), NUM_BYTES * 2, "0") +
-            "}";
-    }
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.serial.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.ByteValue;
+
+import static java.lang.Integer.toHexString;
+import static org.apache.commons.lang3.StringUtils.leftPad;
+
+public class FragmentNumber extends ByteValue {
+
+    public static final int NUM_BYTES = 1;
+
+    private FragmentNumber(byte value) {
+        super(value);
+    }
+
+    private FragmentNumber(byte[] value) {
+        super(value);
+    }
+
+    private FragmentNumber(ByteBuf byteBuf) {
+        this(byteBuf.readByte());
+    }
+
+    public static FragmentNumber of(byte value) {
+        return new FragmentNumber(value);
+    }
+
+    public static FragmentNumber of(byte... value) {
+        return new FragmentNumber(value);
+    }
+
+    public static FragmentNumber of(String value) {
+        return new FragmentNumber(Byte.valueOf(value));
+    }
+
+    public static FragmentNumber of(ByteBuf byteBuf) {
+        return new FragmentNumber(byteBuf);
+    }
+
+    public byte getAsByte() {
+        return value[0];
+    }
+
+    @Override
+    public String toString() {
+        return super.toString() + "{" +
+            "byteValue=" + (getAsByte() & 0xFF) +
+            ",hexValue=0x" + leftPad(toHexString(getAsByte() & 0xFF), NUM_BYTES * 2, "0") +
+            "}";
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/MagicCookie.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/MagicCookie.java
index cd3b77d7fff..98b1237b757 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/MagicCookie.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/MagicCookie.java
@@ -1,59 +1,59 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.serial.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.UnsignedShortLEByteValue;
-
-public class MagicCookie extends UnsignedShortLEByteValue {
-
-    public static final int NUM_BYTES = UnsignedShortLEByteValue.UNSIGNED_SHORT_LE_NUM_BYTES;
-
-    private MagicCookie(byte... values) {
-        super(values);
-    }
-
-    private MagicCookie(int value) {
-        super(value);
-    }
-
-    private MagicCookie(String length) {
-        super(length);
-    }
-
-    private MagicCookie(ByteBuf byteBuf) {
-        super(byteBuf);
-    }
-
-    public static MagicCookie of(byte... values) {
-        return new MagicCookie(values);
-    }
-
-    public static MagicCookie of(int value) {
-        return new MagicCookie(value);
-    }
-
-    public static MagicCookie of(String length) {
-        return new MagicCookie(length);
-    }
-
-    public static MagicCookie of(ByteBuf byteBuf) {
-        return new MagicCookie(byteBuf);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.serial.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.UnsignedShortLEByteValue;
+
+public class MagicCookie extends UnsignedShortLEByteValue {
+
+    public static final int NUM_BYTES = UnsignedShortLEByteValue.UNSIGNED_SHORT_LE_NUM_BYTES;
+
+    private MagicCookie(byte... values) {
+        super(values);
+    }
+
+    private MagicCookie(int value) {
+        super(value);
+    }
+
+    private MagicCookie(String length) {
+        super(length);
+    }
+
+    private MagicCookie(ByteBuf byteBuf) {
+        super(byteBuf);
+    }
+
+    public static MagicCookie of(byte... values) {
+        return new MagicCookie(values);
+    }
+
+    public static MagicCookie of(int value) {
+        return new MagicCookie(value);
+    }
+
+    public static MagicCookie of(String length) {
+        return new MagicCookie(length);
+    }
+
+    public static MagicCookie of(ByteBuf byteBuf) {
+        return new MagicCookie(byteBuf);
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/ReceiverAddress.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/ReceiverAddress.java
index 459d00f32e1..d6eb3df0fd1 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/ReceiverAddress.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/ReceiverAddress.java
@@ -1,72 +1,72 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.serial.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.ByteValue;
-
-import static java.lang.Integer.toHexString;
-import static org.apache.commons.lang3.StringUtils.leftPad;
-
-public class ReceiverAddress extends ByteValue {
-
-    public static final int NUM_BYTES = 1;
-
-    public static final ReceiverAddress RS232_COMM_ADDRESS = ReceiverAddress.of((byte) 0);
-
-    private ReceiverAddress(byte value) {
-        super(value);
-    }
-
-    private ReceiverAddress(byte[] value) {
-        super(value);
-    }
-
-    private ReceiverAddress(ByteBuf byteBuf) {
-        this(byteBuf.readByte());
-    }
-
-    public static ReceiverAddress of(byte value) {
-        return new ReceiverAddress(value);
-    }
-
-    public static ReceiverAddress of(byte... value) {
-        return new ReceiverAddress(value);
-    }
-
-    public static ReceiverAddress of(String value) {
-        return new ReceiverAddress(Byte.valueOf(value));
-    }
-
-    public static ReceiverAddress of(ByteBuf byteBuf) {
-        return new ReceiverAddress(byteBuf);
-    }
-
-    public byte getAsByte() {
-        return value[0];
-    }
-
-    @Override
-    public String toString() {
-        return super.toString() + "{" +
-            "byteValue=" + (getAsByte() & 0xFF) +
-            ",hexValue=0x" + leftPad(toHexString(getAsByte() & 0xFF), NUM_BYTES * 2, "0") +
-            "}";
-    }
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.serial.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.ByteValue;
+
+import static java.lang.Integer.toHexString;
+import static org.apache.commons.lang3.StringUtils.leftPad;
+
+public class ReceiverAddress extends ByteValue {
+
+    public static final int NUM_BYTES = 1;
+
+    public static final ReceiverAddress RS232_COMM_ADDRESS = ReceiverAddress.of((byte) 0);
+
+    private ReceiverAddress(byte value) {
+        super(value);
+    }
+
+    private ReceiverAddress(byte[] value) {
+        super(value);
+    }
+
+    private ReceiverAddress(ByteBuf byteBuf) {
+        this(byteBuf.readByte());
+    }
+
+    public static ReceiverAddress of(byte value) {
+        return new ReceiverAddress(value);
+    }
+
+    public static ReceiverAddress of(byte... value) {
+        return new ReceiverAddress(value);
+    }
+
+    public static ReceiverAddress of(String value) {
+        return new ReceiverAddress(Byte.valueOf(value));
+    }
+
+    public static ReceiverAddress of(ByteBuf byteBuf) {
+        return new ReceiverAddress(byteBuf);
+    }
+
+    public byte getAsByte() {
+        return value[0];
+    }
+
+    @Override
+    public String toString() {
+        return super.toString() + "{" +
+            "byteValue=" + (getAsByte() & 0xFF) +
+            ",hexValue=0x" + leftPad(toHexString(getAsByte() & 0xFF), NUM_BYTES * 2, "0") +
+            "}";
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/TransmitterAddress.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/TransmitterAddress.java
index 09b3de722cc..9b98a3d7752 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/TransmitterAddress.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/TransmitterAddress.java
@@ -1,72 +1,72 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.serial.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.ByteValue;
-
-import static java.lang.Integer.toHexString;
-import static org.apache.commons.lang3.StringUtils.leftPad;
-
-public class TransmitterAddress extends ByteValue {
-
-    public static final int NUM_BYTES = 1;
-
-    public static final TransmitterAddress RS232_COMM_ADDRESS = TransmitterAddress.of((byte) 0);
-
-    private TransmitterAddress(byte value) {
-        super(value);
-    }
-
-    private TransmitterAddress(byte[] value) {
-        super(value);
-    }
-
-    private TransmitterAddress(ByteBuf byteBuf) {
-        this(byteBuf.readByte());
-    }
-
-    public static TransmitterAddress of(byte value) {
-        return new TransmitterAddress(value);
-    }
-
-    public static TransmitterAddress of(byte... value) {
-        return new TransmitterAddress(value);
-    }
-
-    public static TransmitterAddress of(String value) {
-        return new TransmitterAddress(Byte.valueOf(value));
-    }
-
-    public static TransmitterAddress of(ByteBuf byteBuf) {
-        return new TransmitterAddress(byteBuf);
-    }
-
-    public byte getAsByte() {
-        return value[0];
-    }
-
-    @Override
-    public String toString() {
-        return super.toString() + "{" +
-            "byteValue=" + (getAsByte() & 0xFF) +
-            ",hexValue=0x" + leftPad(toHexString(getAsByte() & 0xFF), NUM_BYTES * 2, "0") +
-            "}";
-    }
-}
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.serial.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.ByteValue;
+
+import static java.lang.Integer.toHexString;
+import static org.apache.commons.lang3.StringUtils.leftPad;
+
+public class TransmitterAddress extends ByteValue {
+
+    public static final int NUM_BYTES = 1;
+
+    public static final TransmitterAddress RS232_COMM_ADDRESS = TransmitterAddress.of((byte) 0);
+
+    private TransmitterAddress(byte value) {
+        super(value);
+    }
+
+    private TransmitterAddress(byte[] value) {
+        super(value);
+    }
+
+    private TransmitterAddress(ByteBuf byteBuf) {
+        this(byteBuf.readByte());
+    }
+
+    public static TransmitterAddress of(byte value) {
+        return new TransmitterAddress(value);
+    }
+
+    public static TransmitterAddress of(byte... value) {
+        return new TransmitterAddress(value);
+    }
+
+    public static TransmitterAddress of(String value) {
+        return new TransmitterAddress(Byte.valueOf(value));
+    }
+
+    public static TransmitterAddress of(ByteBuf byteBuf) {
+        return new TransmitterAddress(byteBuf);
+    }
+
+    public byte getAsByte() {
+        return value[0];
+    }
+
+    @Override
+    public String toString() {
+        return super.toString() + "{" +
+            "byteValue=" + (getAsByte() & 0xFF) +
+            ",hexValue=0x" + leftPad(toHexString(getAsByte() & 0xFF), NUM_BYTES * 2, "0") +
+            "}";
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/UserData.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/UserData.java
index cf65dd7ed0e..ce8c7276449 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/UserData.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/UserData.java
@@ -1,73 +1,73 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.serial.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.ByteValue;
-
-import java.nio.charset.Charset;
-
-import static java.util.Objects.requireNonNull;
-
-public class UserData extends ByteValue {
-
-    public static final int MAX_LENGTH = 255;
-
-    public static final UserData EMPTY = UserData.of();
-
-    private UserData(byte... values) {
-        super(values);
-        assertMaxLength();
-    }
-
-    public UserData(ByteBuf byteBuf) {
-        super(byteBuf);
-        assertMaxLength();
-    }
-
-    protected void assertMaxLength() {
-        if (value.length > MAX_LENGTH) {
-            throw new IllegalArgumentException("Max length " + MAX_LENGTH + " bytes exceeded by " + (value.length - MAX_LENGTH) + " bytes");
-        }
-    }
-
-    public static UserData of(byte... values) {
-        return new UserData(values);
-    }
-
-    public static UserData of(String value) {
-        requireNonNull(value);
-        return new UserData(value.getBytes());
-    }
-
-    public static UserData of(String value, Charset charset) {
-        requireNonNull(value);
-        return new UserData(value.getBytes(charset));
-    }
-
-    public static UserData of(ByteBuf byteBuf) {
-        return new UserData(byteBuf);
-    }
-
-    @Override
-    public String toString() {
-        // TODO: maybe we could find a way to implement this to string
-        return "UserData{" + value.length + "bytes} ";
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.serial.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.ByteValue;
+
+import java.nio.charset.Charset;
+
+import static java.util.Objects.requireNonNull;
+
+public class UserData extends ByteValue {
+
+    public static final int MAX_LENGTH = 255;
+
+    public static final UserData EMPTY = UserData.of();
+
+    private UserData(byte... values) {
+        super(values);
+        assertMaxLength();
+    }
+
+    public UserData(ByteBuf byteBuf) {
+        super(byteBuf);
+        assertMaxLength();
+    }
+
+    protected void assertMaxLength() {
+        if (value.length > MAX_LENGTH) {
+            throw new IllegalArgumentException("Max length " + MAX_LENGTH + " bytes exceeded by " + (value.length - MAX_LENGTH) + " bytes");
+        }
+    }
+
+    public static UserData of(byte... values) {
+        return new UserData(values);
+    }
+
+    public static UserData of(String value) {
+        requireNonNull(value);
+        return new UserData(value.getBytes());
+    }
+
+    public static UserData of(String value, Charset charset) {
+        requireNonNull(value);
+        return new UserData(value.getBytes(charset));
+    }
+
+    public static UserData of(ByteBuf byteBuf) {
+        return new UserData(byteBuf);
+    }
+
+    @Override
+    public String toString() {
+        // TODO: maybe we could find a way to implement this to string
+        return "UserData{" + value.length + "bytes} ";
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/UserDataLength.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/UserDataLength.java
index 7516d1c084e..481d579cd79 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/UserDataLength.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/UserDataLength.java
@@ -1,70 +1,70 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.serial.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.ByteValue;
-
-import static java.lang.Integer.toHexString;
-import static org.apache.commons.lang3.StringUtils.leftPad;
-
-public class UserDataLength extends ByteValue {
-
-    public static final int NUM_BYTES = 1;
-
-    private UserDataLength(byte value) {
-        super(value);
-    }
-
-    private UserDataLength(byte[] value) {
-        super(value);
-    }
-
-    private UserDataLength(ByteBuf byteBuf) {
-        this(byteBuf.readByte());
-    }
-
-    public static UserDataLength of(byte value) {
-        return new UserDataLength(value);
-    }
-
-    public static UserDataLength of(byte... value) {
-        return new UserDataLength(value);
-    }
-
-    public static UserDataLength of(String value) {
-        return new UserDataLength(Byte.valueOf(value));
-    }
-
-    public static UserDataLength of(ByteBuf byteBuf) {
-        return new UserDataLength(byteBuf);
-    }
-
-    public byte getAsByte() {
-        return value[0];
-    }
-
-    @Override
-    public String toString() {
-        return super.toString() + "{" +
-            "byteValue=" + (getAsByte() & 0xFF) +
-            ",hexValue=0x" + leftPad(toHexString(getAsByte() & 0xFF), NUM_BYTES * 2, "0") +
-            "}";
-    }
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.serial.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.ByteValue;
+
+import static java.lang.Integer.toHexString;
+import static org.apache.commons.lang3.StringUtils.leftPad;
+
+public class UserDataLength extends ByteValue {
+
+    public static final int NUM_BYTES = 1;
+
+    private UserDataLength(byte value) {
+        super(value);
+    }
+
+    private UserDataLength(byte[] value) {
+        super(value);
+    }
+
+    private UserDataLength(ByteBuf byteBuf) {
+        this(byteBuf.readByte());
+    }
+
+    public static UserDataLength of(byte value) {
+        return new UserDataLength(value);
+    }
+
+    public static UserDataLength of(byte... value) {
+        return new UserDataLength(value);
+    }
+
+    public static UserDataLength of(String value) {
+        return new UserDataLength(Byte.valueOf(value));
+    }
+
+    public static UserDataLength of(ByteBuf byteBuf) {
+        return new UserDataLength(byteBuf);
+    }
+
+    public byte getAsByte() {
+        return value[0];
+    }
+
+    @Override
+    public String toString() {
+        return super.toString() + "{" +
+            "byteValue=" + (getAsByte() & 0xFF) +
+            ",hexValue=0x" + leftPad(toHexString(getAsByte() & 0xFF), NUM_BYTES * 2, "0") +
+            "}";
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/package-info.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/package-info.java
index 509a7508834..20912e93a38 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/package-info.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/types/package-info.java
@@ -1,22 +1,22 @@
-/*
- 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
-
-   http://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.
- */
-/**
- * This package contains serial specific types.
- */
+/*
+ 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
+
+   http://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.
+ */
+/**
+ * This package contains serial specific types.
+ */
 package org.apache.plc4x.java.ads.api.serial.types;
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/AmsTCPPacket.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/AmsTCPPacket.java
index b2a55921f98..bd807d1b994 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/AmsTCPPacket.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/AmsTCPPacket.java
@@ -1,94 +1,94 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.tcp;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.tcp.types.UserData;
-import org.apache.plc4x.java.ads.api.util.ByteReadable;
-
-import static java.util.Objects.requireNonNull;
-
-public class AmsTCPPacket implements ByteReadable {
-    /**
-     * The ams - tcp to be sent.
-     */
-    private final AmsTcpHeader amsTcpHeader;
-
-    /**
-     * The AMS packet to be sent.
-     */
-    private final UserData userData;
-
-    private AmsTCPPacket(AmsTcpHeader amsTcpHeader, UserData userData) {
-        this.amsTcpHeader = requireNonNull(amsTcpHeader);
-        this.userData = requireNonNull(userData);
-    }
-
-    private AmsTCPPacket(UserData userData) {
-        this.userData = requireNonNull(userData);
-        // It is important that we wrap the ads data call as this will initialized in the constructor
-        // so this value will be null if we call adsData now.
-        this.amsTcpHeader = AmsTcpHeader.of(requireNonNull(userData));
-    }
-
-    public AmsTcpHeader getAmsTcpHeader() {
-        return amsTcpHeader;
-    }
-
-    @Override
-    public ByteBuf getByteBuf() {
-        return buildByteBuff(amsTcpHeader, userData);
-    }
-
-    public static AmsTCPPacket of(UserData userData) {
-        return new AmsTCPPacket(userData);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof AmsTCPPacket)) {
-            return false;
-        }
-
-        AmsTCPPacket that = (AmsTCPPacket) o;
-
-        if (!amsTcpHeader.equals(that.amsTcpHeader)) {
-            return false;
-        }
-        return userData.equals(that.userData);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = amsTcpHeader.hashCode();
-        result = 31 * result + userData.hashCode();
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "AmsTCPPacket{" +
-            "amsTcpHeader=" + amsTcpHeader +
-            ", amsPacket=" + userData +
-            '}';
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.tcp;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.tcp.types.UserData;
+import org.apache.plc4x.java.ads.api.util.ByteReadable;
+
+import static java.util.Objects.requireNonNull;
+
+public class AmsTCPPacket implements ByteReadable {
+    /**
+     * The ams - tcp to be sent.
+     */
+    private final AmsTcpHeader amsTcpHeader;
+
+    /**
+     * The AMS packet to be sent.
+     */
+    private final UserData userData;
+
+    private AmsTCPPacket(AmsTcpHeader amsTcpHeader, UserData userData) {
+        this.amsTcpHeader = requireNonNull(amsTcpHeader);
+        this.userData = requireNonNull(userData);
+    }
+
+    private AmsTCPPacket(UserData userData) {
+        this.userData = requireNonNull(userData);
+        // It is important that we wrap the ads data call as this will initialized in the constructor
+        // so this value will be null if we call adsData now.
+        this.amsTcpHeader = AmsTcpHeader.of(requireNonNull(userData));
+    }
+
+    public AmsTcpHeader getAmsTcpHeader() {
+        return amsTcpHeader;
+    }
+
+    @Override
+    public ByteBuf getByteBuf() {
+        return buildByteBuff(amsTcpHeader, userData);
+    }
+
+    public static AmsTCPPacket of(UserData userData) {
+        return new AmsTCPPacket(userData);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof AmsTCPPacket)) {
+            return false;
+        }
+
+        AmsTCPPacket that = (AmsTCPPacket) o;
+
+        if (!amsTcpHeader.equals(that.amsTcpHeader)) {
+            return false;
+        }
+        return userData.equals(that.userData);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = amsTcpHeader.hashCode();
+        result = 31 * result + userData.hashCode();
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "AmsTCPPacket{" +
+            "amsTcpHeader=" + amsTcpHeader +
+            ", amsPacket=" + userData +
+            '}';
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/AmsTcpHeader.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/AmsTcpHeader.java
index bd3a2eb4858..48ec101070d 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/AmsTcpHeader.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/AmsTcpHeader.java
@@ -1,139 +1,139 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.tcp;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.tcp.types.TcpLength;
-import org.apache.plc4x.java.ads.api.util.ByteReadable;
-import org.apache.plc4x.java.ads.api.util.ByteValue;
-import org.apache.plc4x.java.ads.api.util.LengthSupplier;
-
-import static java.util.Objects.requireNonNull;
-
-/**
- * AMS/TCP Header	6 bytes	contains the tcpLength of the data packet.
- */
-public class AmsTcpHeader implements ByteReadable {
-
-    /**
-     * These bytes must be set to 0.
-     */
-    private final Reserved reserved;
-
-    /**
-     * This array contains the length of the data packet. It consists of the AMS-Header and the enclosed ADS data. The unit is bytes.
-     * is null if length is supplied by {@link #lengthSuppliers}.
-     */
-    private final TcpLength tcpLength;
-
-    /**
-     * This array contains the length of the data packet. It consists of the AMS-Header and the enclosed ADS data. The unit is bytes.
-     * is null if length is supplied by {@link #tcpLength}.
-     */
-    private final transient LengthSupplier[] lengthSuppliers;
-
-    private AmsTcpHeader(TcpLength tcpLength) {
-        this.reserved = Reserved.CONSTANT;
-        this.tcpLength = requireNonNull(tcpLength);
-        this.lengthSuppliers = null;
-    }
-
-    private AmsTcpHeader(LengthSupplier... lengthSuppliers) {
-        this.reserved = Reserved.CONSTANT;
-        this.tcpLength = null;
-        this.lengthSuppliers = requireNonNull(lengthSuppliers);
-    }
-
-    public static AmsTcpHeader of(TcpLength tcpLength) {
-        return new AmsTcpHeader(tcpLength);
-    }
-
-    public static AmsTcpHeader of(long length) {
-        return new AmsTcpHeader(TcpLength.of(length));
-    }
-
-    public static AmsTcpHeader of(LengthSupplier... lengthSuppliers) {
-        return new AmsTcpHeader(lengthSuppliers);
-    }
-
-    public TcpLength getTcpLength() {
-        return lengthSuppliers == null ? tcpLength : TcpLength.of(getCalculatedLength());
-    }
-
-    @Override
-    public ByteBuf getByteBuf() {
-        return buildByteBuff(reserved, getTcpLength());
-    }
-
-    /**
-     * Size: 2 bytes
-     * These bytes must be set to 0.
-     */
-    public static class Reserved extends ByteValue {
-
-        public static final int NUM_BYTES = 2;
-
-        private static final Reserved CONSTANT = new Reserved();
-
-        private Reserved() {
-            super((byte) 0x00, (byte) 0x00);
-            assertLength(NUM_BYTES);
-        }
-    }
-
-    @Override
-    public long getCalculatedLength() {
-        if (lengthSuppliers == null) {
-            return tcpLength.getAsLong();
-        } else {
-            long aggregateLength = 0;
-            for (LengthSupplier supplier : lengthSuppliers) {
-                aggregateLength += supplier.getCalculatedLength();
-            }
-            return aggregateLength;
-        }
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (!(o instanceof AmsTcpHeader))
-            return false;
-
-        AmsTcpHeader that = (AmsTcpHeader) o;
-
-        return getTcpLength().equals(that.getTcpLength());
-    }
-
-    @Override
-    public int hashCode() {
-        int result = reserved.hashCode();
-        result = 31 * result + getTcpLength().hashCode();
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "AmsTcpHeader{" +
-            "reserved=" + reserved +
-            ", tcpLength=" + getTcpLength() +
-            '}';
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.tcp;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.tcp.types.TcpLength;
+import org.apache.plc4x.java.ads.api.util.ByteReadable;
+import org.apache.plc4x.java.ads.api.util.ByteValue;
+import org.apache.plc4x.java.ads.api.util.LengthSupplier;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * AMS/TCP Header	6 bytes	contains the tcpLength of the data packet.
+ */
+public class AmsTcpHeader implements ByteReadable {
+
+    /**
+     * These bytes must be set to 0.
+     */
+    private final Reserved reserved;
+
+    /**
+     * This array contains the length of the data packet. It consists of the AMS-Header and the enclosed ADS data. The unit is bytes.
+     * is null if length is supplied by {@link #lengthSuppliers}.
+     */
+    private final TcpLength tcpLength;
+
+    /**
+     * This array contains the length of the data packet. It consists of the AMS-Header and the enclosed ADS data. The unit is bytes.
+     * is null if length is supplied by {@link #tcpLength}.
+     */
+    private final transient LengthSupplier[] lengthSuppliers;
+
+    private AmsTcpHeader(TcpLength tcpLength) {
+        this.reserved = Reserved.CONSTANT;
+        this.tcpLength = requireNonNull(tcpLength);
+        this.lengthSuppliers = null;
+    }
+
+    private AmsTcpHeader(LengthSupplier... lengthSuppliers) {
+        this.reserved = Reserved.CONSTANT;
+        this.tcpLength = null;
+        this.lengthSuppliers = requireNonNull(lengthSuppliers);
+    }
+
+    public static AmsTcpHeader of(TcpLength tcpLength) {
+        return new AmsTcpHeader(tcpLength);
+    }
+
+    public static AmsTcpHeader of(long length) {
+        return new AmsTcpHeader(TcpLength.of(length));
+    }
+
+    public static AmsTcpHeader of(LengthSupplier... lengthSuppliers) {
+        return new AmsTcpHeader(lengthSuppliers);
+    }
+
+    public TcpLength getTcpLength() {
+        return lengthSuppliers == null ? tcpLength : TcpLength.of(getCalculatedLength());
+    }
+
+    @Override
+    public ByteBuf getByteBuf() {
+        return buildByteBuff(reserved, getTcpLength());
+    }
+
+    /**
+     * Size: 2 bytes
+     * These bytes must be set to 0.
+     */
+    public static class Reserved extends ByteValue {
+
+        public static final int NUM_BYTES = 2;
+
+        private static final Reserved CONSTANT = new Reserved();
+
+        private Reserved() {
+            super((byte) 0x00, (byte) 0x00);
+            assertLength(NUM_BYTES);
+        }
+    }
+
+    @Override
+    public long getCalculatedLength() {
+        if (lengthSuppliers == null) {
+            return tcpLength.getAsLong();
+        } else {
+            long aggregateLength = 0;
+            for (LengthSupplier supplier : lengthSuppliers) {
+                aggregateLength += supplier.getCalculatedLength();
+            }
+            return aggregateLength;
+        }
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof AmsTcpHeader))
+            return false;
+
+        AmsTcpHeader that = (AmsTcpHeader) o;
+
+        return getTcpLength().equals(that.getTcpLength());
+    }
+
+    @Override
+    public int hashCode() {
+        int result = reserved.hashCode();
+        result = 31 * result + getTcpLength().hashCode();
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "AmsTcpHeader{" +
+            "reserved=" + reserved +
+            ", tcpLength=" + getTcpLength() +
+            '}';
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/package-info.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/package-info.java
index 0ce991c3129..8998eb763ad 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/package-info.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/package-info.java
@@ -1,22 +1,22 @@
-/*
- 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
-
-   http://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.
- */
-/**
- * This package contains tcp related api objects.
- */
+/*
+ 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
+
+   http://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.
+ */
+/**
+ * This package contains tcp related api objects.
+ */
 package org.apache.plc4x.java.ads.api.tcp;
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/types/TcpLength.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/types/TcpLength.java
index 7c04175d9fe..b82591bd56e 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/types/TcpLength.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/types/TcpLength.java
@@ -1,61 +1,61 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.tcp.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
-
-public class TcpLength extends UnsignedIntLEByteValue {
-
-    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
-
-    public static final TcpLength NONE = of(0);
-
-    private TcpLength(byte... values) {
-        super(values);
-    }
-
-    private TcpLength(long value) {
-        super(value);
-    }
-
-    private TcpLength(String length) {
-        super(length);
-    }
-
-    private TcpLength(ByteBuf byteBuf) {
-        super(byteBuf);
-    }
-
-    public static TcpLength of(byte... values) {
-        return new TcpLength(values);
-    }
-
-    public static TcpLength of(long value) {
-        return new TcpLength(value);
-    }
-
-    public static TcpLength of(String length) {
-        return new TcpLength(length);
-    }
-
-    public static TcpLength of(ByteBuf byteBuf) {
-        return new TcpLength(byteBuf);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.tcp.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
+
+public class TcpLength extends UnsignedIntLEByteValue {
+
+    public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
+
+    public static final TcpLength NONE = of(0);
+
+    private TcpLength(byte... values) {
+        super(values);
+    }
+
+    private TcpLength(long value) {
+        super(value);
+    }
+
+    private TcpLength(String length) {
+        super(length);
+    }
+
+    private TcpLength(ByteBuf byteBuf) {
+        super(byteBuf);
+    }
+
+    public static TcpLength of(byte... values) {
+        return new TcpLength(values);
+    }
+
+    public static TcpLength of(long value) {
+        return new TcpLength(value);
+    }
+
+    public static TcpLength of(String length) {
+        return new TcpLength(length);
+    }
+
+    public static TcpLength of(ByteBuf byteBuf) {
+        return new TcpLength(byteBuf);
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/types/UserData.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/types/UserData.java
index a30bdb1ce33..38b5aa20515 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/types/UserData.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/types/UserData.java
@@ -1,63 +1,63 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.tcp.types;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.util.ByteValue;
-
-import java.nio.charset.Charset;
-
-import static java.util.Objects.requireNonNull;
-
-public class UserData extends ByteValue {
-
-    public static final UserData EMPTY = UserData.of();
-
-    private UserData(byte... values) {
-        super(values);
-    }
-
-    public UserData(ByteBuf byteBuf) {
-        super(byteBuf);
-    }
-
-    public static UserData of(byte... values) {
-        return new UserData(values);
-    }
-
-    public static UserData of(String value) {
-        requireNonNull(value);
-        return new UserData(value.getBytes());
-    }
-
-    public static UserData of(String value, Charset charset) {
-        requireNonNull(value);
-        return new UserData(value.getBytes(charset));
-    }
-
-    public static UserData of(ByteBuf byteBuf) {
-        return new UserData(byteBuf);
-    }
-
-    @Override
-    public String toString() {
-        // TODO: maybe we could find a way to implement this to string
-        return "UserData{" + value.length + "bytes} ";
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.tcp.types;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.util.ByteValue;
+
+import java.nio.charset.Charset;
+
+import static java.util.Objects.requireNonNull;
+
+public class UserData extends ByteValue {
+
+    public static final UserData EMPTY = UserData.of();
+
+    private UserData(byte... values) {
+        super(values);
+    }
+
+    public UserData(ByteBuf byteBuf) {
+        super(byteBuf);
+    }
+
+    public static UserData of(byte... values) {
+        return new UserData(values);
+    }
+
+    public static UserData of(String value) {
+        requireNonNull(value);
+        return new UserData(value.getBytes());
+    }
+
+    public static UserData of(String value, Charset charset) {
+        requireNonNull(value);
+        return new UserData(value.getBytes(charset));
+    }
+
+    public static UserData of(ByteBuf byteBuf) {
+        return new UserData(byteBuf);
+    }
+
+    @Override
+    public String toString() {
+        // TODO: maybe we could find a way to implement this to string
+        return "UserData{" + value.length + "bytes} ";
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/types/package-info.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/types/package-info.java
index 7ddb30b9b09..4a918605066 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/types/package-info.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/types/package-info.java
@@ -1,22 +1,22 @@
-/*
- 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
-
-   http://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.
- */
-/**
- * This package contains tcp specific types.
- */
+/*
+ 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
+
+   http://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.
+ */
+/**
+ * This package contains tcp specific types.
+ */
 package org.apache.plc4x.java.ads.api.tcp.types;
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/ByteBufSupplier.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/ByteBufSupplier.java
index 017ffc859a7..4b8d57123e7 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/ByteBufSupplier.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/ByteBufSupplier.java
@@ -1,27 +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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.util;
-
-import io.netty.buffer.ByteBuf;
-
-@FunctionalInterface
-public interface ByteBufSupplier {
-
-    ByteBuf getByteBuf();
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.util;
+
+import io.netty.buffer.ByteBuf;
+
+@FunctionalInterface
+public interface ByteBufSupplier {
+
+    ByteBuf getByteBuf();
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/ByteReadable.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/ByteReadable.java
index 4730bd4c4b7..61771c75636 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/ByteReadable.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/ByteReadable.java
@@ -1,54 +1,54 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.util;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import org.apache.commons.io.HexDump;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.Arrays;
-
-public interface ByteReadable extends ByteBufSupplier, LengthSupplier, Serializable {
-
-    default byte[] getBytes() {
-        ByteBuf byteBuf = getByteBuf();
-        byte[] result = new byte[byteBuf.writerIndex()];
-        byteBuf.readBytes(result);
-        return result;
-    }
-
-    @Override
-    default long getCalculatedLength() {
-        return getByteBuf().readableBytes();
-    }
-
-    default ByteBuf buildByteBuff(ByteReadable... byteReadables) {
-        return Unpooled.wrappedBuffer(Arrays.stream(byteReadables).map(ByteReadable::getByteBuf).toArray(ByteBuf[]::new));
-    }
-
-    default String dump() throws IOException {
-        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
-            HexDump.dump(getBytes(), 0, byteArrayOutputStream, 0);
-            return toString() + HexDump.EOL + byteArrayOutputStream.toString();
-        }
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.util;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import org.apache.commons.io.HexDump;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.Arrays;
+
+public interface ByteReadable extends ByteBufSupplier, LengthSupplier, Serializable {
+
+    default byte[] getBytes() {
+        ByteBuf byteBuf = getByteBuf();
+        byte[] result = new byte[byteBuf.writerIndex()];
+        byteBuf.readBytes(result);
+        return result;
+    }
+
+    @Override
+    default long getCalculatedLength() {
+        return getByteBuf().readableBytes();
+    }
+
+    default ByteBuf buildByteBuff(ByteReadable... byteReadables) {
+        return Unpooled.wrappedBuffer(Arrays.stream(byteReadables).map(ByteReadable::getByteBuf).toArray(ByteBuf[]::new));
+    }
+
+    default String dump() throws IOException {
+        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
+            HexDump.dump(getBytes(), 0, byteArrayOutputStream, 0);
+            return toString() + HexDump.EOL + byteArrayOutputStream.toString();
+        }
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/ByteValue.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/ByteValue.java
index 561aba295a1..e9b0ce8ac11 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/ByteValue.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/ByteValue.java
@@ -1,104 +1,104 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.util;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-
-import java.math.BigInteger;
-import java.util.Arrays;
-
-import static java.util.Objects.requireNonNull;
-
-public class ByteValue implements ByteReadable {
-
-    protected final byte[] value;
-
-    protected ByteValue(byte... value) {
-        this.value = requireNonNull(value);
-    }
-
-    protected ByteValue(ByteBuf byteBuf) {
-        requireNonNull(byteBuf);
-        value = new byte[byteBuf.readableBytes()];
-        byteBuf.readBytes(value);
-    }
-
-    protected void assertLength(int length) {
-        if (value.length != length) {
-            throw new IllegalArgumentException("Expected length " + length + " got " + value.length);
-        }
-    }
-
-    public static void checkUnsignedBounds(long value, int numberOfBytes) {
-        double upperBound = Math.pow((double) 2, (double) (8 * numberOfBytes));
-        if (value < 0 || value >= upperBound) {
-            throw new IllegalArgumentException("Value must between 0 and " + upperBound + ". Was " + value);
-        }
-    }
-
-    public static void checkUnsignedBounds(BigInteger value, int numberOfBytes) {
-        BigInteger upperBound = BigInteger.valueOf(2).pow(8 * numberOfBytes);
-        if (value.compareTo(BigInteger.ZERO) < 0 || value.compareTo(upperBound) >= 0) {
-            throw new IllegalArgumentException("Value must between 0 and " + upperBound + ". Was " + value);
-        }
-    }
-
-    @Override
-    public byte[] getBytes() {
-        return value;
-    }
-
-    @Override
-    public ByteBuf getByteBuf() {
-        return Unpooled.wrappedBuffer(value);
-    }
-
-    @Override
-    public long getCalculatedLength() {
-        return value.length;
-    }
-
-    public static ByteValue of(byte... values) {
-        return new ByteValue(values);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (!(o instanceof ByteValue))
-            return false;
-
-        ByteValue byteValue = (ByteValue) o;
-
-        return Arrays.equals(value, byteValue.value);
-    }
-
-    @Override
-    public int hashCode() {
-        return Arrays.hashCode(value);
-    }
-
-    @Override
-    public String toString() {
-        // TODO: maybe we could find a way to implement this to string
-        return getClass().getSimpleName() + "@" + Integer.toHexString(hashCode()) + "{bytes=" + value.length + "}";
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.util;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+
+import java.math.BigInteger;
+import java.util.Arrays;
+
+import static java.util.Objects.requireNonNull;
+
+public class ByteValue implements ByteReadable {
+
+    protected final byte[] value;
+
+    protected ByteValue(byte... value) {
+        this.value = requireNonNull(value);
+    }
+
+    protected ByteValue(ByteBuf byteBuf) {
+        requireNonNull(byteBuf);
+        value = new byte[byteBuf.readableBytes()];
+        byteBuf.readBytes(value);
+    }
+
+    protected void assertLength(int length) {
+        if (value.length != length) {
+            throw new IllegalArgumentException("Expected length " + length + " got " + value.length);
+        }
+    }
+
+    public static void checkUnsignedBounds(long value, int numberOfBytes) {
+        double upperBound = Math.pow((double) 2, (double) (8 * numberOfBytes));
+        if (value < 0 || value >= upperBound) {
+            throw new IllegalArgumentException("Value must between 0 and " + upperBound + ". Was " + value);
+        }
+    }
+
+    public static void checkUnsignedBounds(BigInteger value, int numberOfBytes) {
+        BigInteger upperBound = BigInteger.valueOf(2).pow(8 * numberOfBytes);
+        if (value.compareTo(BigInteger.ZERO) < 0 || value.compareTo(upperBound) >= 0) {
+            throw new IllegalArgumentException("Value must between 0 and " + upperBound + ". Was " + value);
+        }
+    }
+
+    @Override
+    public byte[] getBytes() {
+        return value;
+    }
+
+    @Override
+    public ByteBuf getByteBuf() {
+        return Unpooled.wrappedBuffer(value);
+    }
+
+    @Override
+    public long getCalculatedLength() {
+        return value.length;
+    }
+
+    public static ByteValue of(byte... values) {
+        return new ByteValue(values);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof ByteValue))
+            return false;
+
+        ByteValue byteValue = (ByteValue) o;
+
+        return Arrays.equals(value, byteValue.value);
+    }
+
+    @Override
+    public int hashCode() {
+        return Arrays.hashCode(value);
+    }
+
+    @Override
+    public String toString() {
+        // TODO: maybe we could find a way to implement this to string
+        return getClass().getSimpleName() + "@" + Integer.toHexString(hashCode()) + "{bytes=" + value.length + "}";
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/LengthSupplier.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/LengthSupplier.java
index 082d0178cc2..cd276f15de0 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/LengthSupplier.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/LengthSupplier.java
@@ -1,25 +1,25 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.util;
-
-@FunctionalInterface
-public interface LengthSupplier {
-
-    long getCalculatedLength();
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.util;
+
+@FunctionalInterface
+public interface LengthSupplier {
+
+    long getCalculatedLength();
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/UnsignedIntLEByteValue.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/UnsignedIntLEByteValue.java
index bedab3871d3..29453c42ccb 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/UnsignedIntLEByteValue.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/UnsignedIntLEByteValue.java
@@ -1,104 +1,104 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.util;
-
-import io.netty.buffer.ByteBuf;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-
-import static java.lang.Long.toHexString;
-import static org.apache.commons.lang3.StringUtils.leftPad;
-
-public abstract class UnsignedIntLEByteValue extends ByteValue {
-
-    public static final int UNSIGNED_INT_LE_NUM_BYTES = 4;
-
-    private final long longValue;
-
-    protected UnsignedIntLEByteValue(byte... value) {
-        super(value);
-        assertLength(UNSIGNED_INT_LE_NUM_BYTES);
-        longValue = ByteBuffer.wrap(value)
-            .order(ByteOrder.LITTLE_ENDIAN)
-            .getInt();
-    }
-
-    protected UnsignedIntLEByteValue(long value) {
-        super(ofLong(value));
-        longValue = value;
-    }
-
-    protected UnsignedIntLEByteValue(String value) {
-        this(Long.parseLong(value));
-    }
-
-    protected UnsignedIntLEByteValue(ByteBuf byteBuf) {
-        this(byteBuf.readUnsignedIntLE());
-    }
-
-    private static byte[] ofLong(long value) {
-        checkUnsignedBounds(value, UNSIGNED_INT_LE_NUM_BYTES);
-        return ByteBuffer.allocate(UNSIGNED_INT_LE_NUM_BYTES)
-            .order(ByteOrder.LITTLE_ENDIAN)
-            .putInt((int) (value & 0xffff_ffff))
-            .array();
-    }
-
-    public long getAsLong() {
-        return longValue;
-    }
-
-    @Override
-    public long getCalculatedLength() {
-        return UNSIGNED_INT_LE_NUM_BYTES;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof UnsignedIntLEByteValue)) {
-            return false;
-        }
-        if (!super.equals(o)) {
-            return false;
-        }
-
-        UnsignedIntLEByteValue that = (UnsignedIntLEByteValue) o;
-
-        return longValue == that.longValue;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = super.hashCode();
-        result = 31 * result + (int) (longValue ^ (longValue >>> 32));
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return super.toString() + "{" +
-            "longValue=" + getAsLong() +
-            ",hexValue=0x" + leftPad(toHexString(getAsLong()), UNSIGNED_INT_LE_NUM_BYTES * 2, "0") +
-            "} ";
-    }
-}
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.util;
+
+import io.netty.buffer.ByteBuf;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+import static java.lang.Long.toHexString;
+import static org.apache.commons.lang3.StringUtils.leftPad;
+
+public abstract class UnsignedIntLEByteValue extends ByteValue {
+
+    public static final int UNSIGNED_INT_LE_NUM_BYTES = 4;
+
+    private final long longValue;
+
+    protected UnsignedIntLEByteValue(byte... value) {
+        super(value);
+        assertLength(UNSIGNED_INT_LE_NUM_BYTES);
+        longValue = ByteBuffer.wrap(value)
+            .order(ByteOrder.LITTLE_ENDIAN)
+            .getInt();
+    }
+
+    protected UnsignedIntLEByteValue(long value) {
+        super(ofLong(value));
+        longValue = value;
+    }
+
+    protected UnsignedIntLEByteValue(String value) {
+        this(Long.parseLong(value));
+    }
+
+    protected UnsignedIntLEByteValue(ByteBuf byteBuf) {
+        this(byteBuf.readUnsignedIntLE());
+    }
+
+    private static byte[] ofLong(long value) {
+        checkUnsignedBounds(value, UNSIGNED_INT_LE_NUM_BYTES);
+        return ByteBuffer.allocate(UNSIGNED_INT_LE_NUM_BYTES)
+            .order(ByteOrder.LITTLE_ENDIAN)
+            .putInt((int) (value & 0xffff_ffff))
+            .array();
+    }
+
+    public long getAsLong() {
+        return longValue;
+    }
+
+    @Override
+    public long getCalculatedLength() {
+        return UNSIGNED_INT_LE_NUM_BYTES;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof UnsignedIntLEByteValue)) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+
+        UnsignedIntLEByteValue that = (UnsignedIntLEByteValue) o;
+
+        return longValue == that.longValue;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + (int) (longValue ^ (longValue >>> 32));
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return super.toString() + "{" +
+            "longValue=" + getAsLong() +
+            ",hexValue=0x" + leftPad(toHexString(getAsLong()), UNSIGNED_INT_LE_NUM_BYTES * 2, "0") +
+            "} ";
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/UnsignedShortLEByteValue.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/UnsignedShortLEByteValue.java
index bce8017c0c0..926eb6be079 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/UnsignedShortLEByteValue.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/UnsignedShortLEByteValue.java
@@ -1,104 +1,104 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.util;
-
-import io.netty.buffer.ByteBuf;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-
-import static java.lang.Integer.toHexString;
-import static org.apache.commons.lang3.StringUtils.leftPad;
-
-public abstract class UnsignedShortLEByteValue extends ByteValue {
-
-    public static final int UNSIGNED_SHORT_LE_NUM_BYTES = 2;
-
-    private final int intValue;
-
-    protected UnsignedShortLEByteValue(byte... value) {
-        super(value);
-        assertLength(UNSIGNED_SHORT_LE_NUM_BYTES);
-        intValue = ByteBuffer.wrap(value)
-            .order(ByteOrder.LITTLE_ENDIAN)
-            .getShort();
-    }
-
-    protected UnsignedShortLEByteValue(int value) {
-        super(ofInt(value));
-        intValue = value;
-    }
-
-    protected UnsignedShortLEByteValue(String value) {
-        this(Integer.parseInt(value));
-    }
-
-    protected UnsignedShortLEByteValue(ByteBuf byteBuf) {
-        this(byteBuf.readUnsignedShortLE());
-    }
-
-    private static byte[] ofInt(int value) {
-        checkUnsignedBounds(value, UNSIGNED_SHORT_LE_NUM_BYTES);
-        return ByteBuffer.allocate(UNSIGNED_SHORT_LE_NUM_BYTES)
-            .order(ByteOrder.LITTLE_ENDIAN)
-            .putShort((short) (value & 0xffff))
-            .array();
-    }
-
-    public int getAsInt() {
-        return intValue;
-    }
-
-    @Override
-    public long getCalculatedLength() {
-        return UNSIGNED_SHORT_LE_NUM_BYTES;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof UnsignedShortLEByteValue)) {
-            return false;
-        }
-        if (!super.equals(o)) {
-            return false;
-        }
-
-        UnsignedShortLEByteValue that = (UnsignedShortLEByteValue) o;
-
-        return intValue == that.intValue;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = super.hashCode();
-        result = 31 * result + intValue;
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return super.toString() + "{" +
-            "intValue=" + getAsInt() +
-            ",hexValue=0x" + leftPad(toHexString(getAsInt()), UNSIGNED_SHORT_LE_NUM_BYTES * 2, "0") +
-            "}";
-    }
-}
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.util;
+
+import io.netty.buffer.ByteBuf;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+import static java.lang.Integer.toHexString;
+import static org.apache.commons.lang3.StringUtils.leftPad;
+
+public abstract class UnsignedShortLEByteValue extends ByteValue {
+
+    public static final int UNSIGNED_SHORT_LE_NUM_BYTES = 2;
+
+    private final int intValue;
+
+    protected UnsignedShortLEByteValue(byte... value) {
+        super(value);
+        assertLength(UNSIGNED_SHORT_LE_NUM_BYTES);
+        intValue = ByteBuffer.wrap(value)
+            .order(ByteOrder.LITTLE_ENDIAN)
+            .getShort();
+    }
+
+    protected UnsignedShortLEByteValue(int value) {
+        super(ofInt(value));
+        intValue = value;
+    }
+
+    protected UnsignedShortLEByteValue(String value) {
+        this(Integer.parseInt(value));
+    }
+
+    protected UnsignedShortLEByteValue(ByteBuf byteBuf) {
+        this(byteBuf.readUnsignedShortLE());
+    }
+
+    private static byte[] ofInt(int value) {
+        checkUnsignedBounds(value, UNSIGNED_SHORT_LE_NUM_BYTES);
+        return ByteBuffer.allocate(UNSIGNED_SHORT_LE_NUM_BYTES)
+            .order(ByteOrder.LITTLE_ENDIAN)
+            .putShort((short) (value & 0xffff))
+            .array();
+    }
+
+    public int getAsInt() {
+        return intValue;
+    }
+
+    @Override
+    public long getCalculatedLength() {
+        return UNSIGNED_SHORT_LE_NUM_BYTES;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof UnsignedShortLEByteValue)) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+
+        UnsignedShortLEByteValue that = (UnsignedShortLEByteValue) o;
+
+        return intValue == that.intValue;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + intValue;
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return super.toString() + "{" +
+            "intValue=" + getAsInt() +
+            ",hexValue=0x" + leftPad(toHexString(getAsInt()), UNSIGNED_SHORT_LE_NUM_BYTES * 2, "0") +
+            "}";
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/package-info.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/package-info.java
index efcb7db7fd2..45f8a10d67f 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/package-info.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/package-info.java
@@ -1,22 +1,22 @@
-/*
- 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
-
-   http://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.
- */
-/**
- * This package contains utils regarding byte handling.
- */
+/*
+ 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
+
+   http://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.
+ */
+/**
+ * This package contains utils regarding byte handling.
+ */
 package org.apache.plc4x.java.ads.api.util;
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsDataType.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsDataType.java
index e5448131049..eec1424513e 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsDataType.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsDataType.java
@@ -1,577 +1,577 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.model;
-
-import org.apache.commons.lang3.ArrayUtils;
-
-import java.io.ByteArrayOutputStream;
-import java.math.BigInteger;
-import java.time.Duration;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.temporal.ChronoUnit;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.IntStream;
-
-/**
- * Documentation can be found here:
- *
- * @see <a href="https://infosys.beckhoff.com/english.php?content=../content/1033/tcsystemmanager/basics/TcSysMgr_DatatypeComparison.htm&id=">TwinCAT System Manager - I/O Variables</a>
- * @see <a href="https://infosys.beckhoff.com/english.php?content=../content/1033/tcplccontrol/html/tcplcctrl_plc_data_types_overview.htm&id">TwinCAT PLC Control: Data Types</a>
- */
-public enum AdsDataType {
-    // TODO: maybe this are just types for the plc ide and can be removed
-    // https://infosys.beckhoff.com/english.php?content=../content/1033/tcsystemmanager/basics/TcSysMgr_DatatypeComparison.htm&id=
-    BIT(0, 1, 8),
-    BIT8((short) 0x00, (short) 0xFF, 8),
-    BITARR8((short) 0x00, (short) 0xFF, 8),
-    BITARR16(0x0000, 0xFFFF, 16),
-    BITARR32(0x0000_0000L, 0xFFFF_FFFFL, 32),
-    INT8(Byte.MIN_VALUE, Byte.MAX_VALUE, 8),
-    INT16(Short.MIN_VALUE, Short.MAX_VALUE, 16),
-    INT32(Integer.MIN_VALUE, Integer.MAX_VALUE, 32),
-    INT64(Long.MIN_VALUE, Long.MAX_VALUE, 64),
-    UINT8((short) 0, (short) 0xFF, 8),
-    UINT16(0, 0xFFFF, 16),
-    UINT32(0L, 0xFFFF_FFFFL, 32),
-    UINT64(BigInteger.ZERO, produceUnsignedMaxValue(8), 64),
-    FLOAT(-Float.MAX_VALUE, Float.MAX_VALUE, 32),
-    DOUBLE(-Double.MAX_VALUE, Double.MAX_VALUE, 64),
-    // https://infosys.beckhoff.com/english.php?content=../content/1033/tcplccontrol/html/tcplcctrl_plc_data_types_overview.htm&id
-    // Standard Data Types
-    /**
-     * BOOL type variables may be given the values TRUE and FALSE.
-     * <p>
-     * Type	Memory use
-     * BOOL	8 Bit
-     * Note:
-     * <p>
-     * A BOOL type variable is true, if the least significant bit in the memory is set (e.g. 2#00000001 ). If no bit is set in the memory, the variable is FALSE (2#00000000). All other values canĀ“t be interpeted accurately and be displayed (***INVALID: 16#xy *** in the Online View). Such problems may appear, if for example overlapped memory ranges are used in the PLC program.
-     * <p>
-     * Example:
-     * <p>
-     * The boolean variable is in the same memory range as the byte variable.
-     */
-    BOOL((byte) 0, (byte) 1, 8),
-    /**
-     * BYTE
-     * <p>
-     * Integer data type.
-     * <p>
-     * Type	Lower bound	Upper bound	Memory use
-     * BYTE	0	255	8 Bit
-     */
-    BYTE((short) 0, (short) 255, 8),
-    /**
-     * WORD
-     * Integer data type.
-     * <p>
-     * Type	Lower bound	Upper bound	Memory use
-     * WORD	0	65535	16 Bit
-     */
-    WORD(0, 65535, 16),
-    /**
-     * DWORD
-     * Integer data type.
-     * <p>
-     * Type	Lower bound	Upper bound	Memory use
-     * DWORD	0	4294967295	32 Bit
-     */
-    DWORD(0L, 4294967295L, 32),
-    /**
-     * SINT
-     * (Short) signed integer data type.
-     * <p>
-     * Type	Lower bound	Upper bound	Memory use
-     * SINT	-128	127	8 Bit
-     */
-    SINT(Byte.MIN_VALUE, Byte.MAX_VALUE, 8),
-    /**
-     * USINT
-     * Unsigned (short) integer data type.
-     * <p>
-     * Type	Lower bound	Upper bound	Memory use
-     * USINT	0	255	8 Bit
-     */
-    USINT((short) 0, (short) 0xFF, 8),
-    /**
-     * INT
-     * Signed integer data type.
-     * <p>
-     * Type	Lower bound	Upper bound	Memory use
-     * INT	-32768	32767	16 Bit
-     */
-    INT(Short.MIN_VALUE, Short.MAX_VALUE, 16),
-    /**
-     * UINT
-     * Unsigned integer data type.
-     * <p>
-     * Type	Lower bound	Upper bound	Memory use
-     * UINT	0	65535	16 Bit
-     */
-    UINT(0, 65535, 16),
-    /**
-     * DINT
-     * Signed integer data type.
-     * <p>
-     * Type	Lower bound	Upper bound	Memory use
-     * DINT	-2147483648	2147483647	32 Bit
-     */
-    DINT(-2147483648, 2147483647, 32),
-    /**
-     * UDINT
-     * Unsigned integer data type.
-     * <p>
-     * Type	Lower bound	Upper bound	Memory use
-     * UDINT	0	4294967295	32 Bit
-     */
-    UDINT(0L, 4294967295L, 32),
-    /**
-     * LINT  (64 bit integer, currently not supported by TwinCAT)
-     */
-    LINT(Long.MIN_VALUE, Long.MAX_VALUE, 64),
-    /**
-     * ULINT (Unsigned 64 bit integer, currently not supported by TwinCAT)
-     */
-    ULINT(BigInteger.ZERO, produceUnsignedMaxValue(8), 64),
-    /**
-     * REAL
-     * 32 Bit floating point data type. It is required to represent rational numbers.
-     * <p>
-     * Type	Lower bound	Upper bound	Memory use
-     * REAL	~ -3.402823 x 1038	~ 3.402823 x 1038	32 Bit
-     */
-    REAL(-Float.MAX_VALUE, Float.MAX_VALUE, 32),
-    /**
-     * LREAL
-     * 64 Bit floating point data type. It is required to represent rational numbers.
-     * <p>
-     * Type	Lower bound	Upper bound	Memory use
-     * LREAL	~ -1.79769313486231E308	~ 1.79769313486232E308	64 Bit
-     */
-    LREAL(-Double.MAX_VALUE, Double.MAX_VALUE, 64),
-    /**
-     * STRING
-     * A STRING type variable can contain any string of characters. The size entry in the declaration determines how much memory space should be reserved for the variable. It refers to the number of characters in the string and can be placed in parentheses or square brackets.
-     * <p>
-     * Example of a string declaration with 35 characters:
-     * <p>
-     * str:STRING(35):='This is a String';
-     * Type	Memory use
-     * STRING
-     * If no size specification is given, the default size of 80 characters will be used: Memory use [Bytes] =  80 + 1 Byte for string terminated Null character;
-     * If string size specification is given: Memory use [Bytes] = String Size + 1 Byte for string terminated Null character);
-     */
-    STRING(81 * 8),
-    /**
-     * TIME
-     * Duration time. The most siginificant digit is one millisecond. The data type is handled internally like DWORD.
-     * <p>
-     * Type	Lower bound	Upper bound	Memory use
-     * TIME	T#0ms	T#71582m47s295ms	32 Bit
-     */
-    TIME(0L, Duration.ofMinutes(71582).plusSeconds(47).plusMillis(295).toMillis(), 32),
-    /**
-     * TIME_OF_DAY
-     * TOD
-     * Time of day. The most siginificant digit is one millisecond. The data type is handled internally like DWORD.
-     * <p>
-     * Type	Lower bound	Upper bound	Memory use
-     * TIME_OF_DAY
-     * TOD
-     * <p>
-     * TOD#00:00	TOD#1193:02:47.295	32 Bit
-     *///TODO: strange maximum
-    TIME_OF_DAY(0L, ChronoUnit.MILLIS.between(LocalTime.of(0, 0), LocalTime.of(23, 59, 59)), 32),
-    /**
-     * DATE
-     * Date. The most significant digit is one second. The data type is handled internally like DWORD.
-     * <p>
-     * Type	Lower bound	Upper bound	Memory use
-     * DATE	D#1970-01-01	D#2106-02-06	32 Bit
-     */
-    DATE(0L, TimeUnit.DAYS.toSeconds(ChronoUnit.DAYS.between(LocalDate.of(1970, 1, 1), LocalDate.of(2106, 2, 6))), 32),
-    /**
-     * DATE_AND_TIME
-     * DT
-     * Date and time. The most siginificant digit is one second. The data type is handled internally like DWORD.
-     * <p>
-     * Type	Lower  bound	Upper  bound	Memory use
-     * DATE_AND_TIME
-     * DT
-     * <p>
-     * DT#1970-01-01-00:00	DT#2106-02-06-06:28:15	32 Bit
-     */
-    DATE_AND_TIME(0L, ChronoUnit.SECONDS.between(LocalDateTime.of(1970, 1, 1, 0, 0), LocalDateTime.of(2106, 2, 6, 6, 28, 15)), 32),
-    //User-defined Data Types
-    /**
-     * Arrays
-     * One-, two-, and three-dimensional fields (arrays) are supported as elementary data types. Arrays can be defined both in the declaration part of a POU and in the global variable lists.
-     * <p>
-     * Syntax:
-     * <p>
-     * &lt;Field_Name&gt;:ARRAY [&lt;LowLim1&gt;..&lt;UpLim1&gt;, &lt;LowLim2&gt;..&lt;UpLim2&gt;] OF &lt;elem. Type&gt;
-     * <p>
-     * LowLim1, LowLim2 identify the lower limit of the field range; UpLim1 and UpLim2 identify the upper limit. The range values must be integers.
-     * <p>
-     * Example:
-     * <p>
-     * Card_game: ARRAY [1..13, 1..4] OF INT;
-     * <p>
-     * <p>
-     * <p>
-     * Initializing of Arrays
-     * You can initialize either all of the elements in an array or none of them.
-     * <p>
-     * Example for initializing arrays:
-     * <p>
-     * arr1 : ARRAY [1..5] OF INT := 1,2,3,4,5;
-     * arr2 : ARRAY [1..2,3..4] OF INT := 1,3(7); (* short for 1,7,7,7 *)
-     * arr3 : ARRAY [1..2,2..3,3..4] OF INT := 2(0),4(4),2,3; (* short for 0,0,4,4,4,4,2,3 *)
-     * <p>
-     * <p>
-     * <p>
-     * Example for the initialization of an array of a structure:
-     * <p>
-     * TYPE STRUCT1
-     * STRUCT
-     * p1:int;
-     * p2:int;
-     * p3:dword;
-     * END_STRUCT
-     * arr1 : ARRAY[1..3] OF STRUCT1:= (p1:=1,p2:=10,p3:=4723), (p1:=2,p2:=0,p3:=299), (p1:=14,p2:=5,p3:=112);
-     * <p>
-     * <p>
-     * Example of the partial initialization of an Array:
-     * <p>
-     * arr1 : ARRAY [1..10] OF INT := 1,2;
-     * Elements to which no value is pre-assigned are initialized with the default initial value of the basic type. In the example above, the elements arr1[3]  to arr1[10] are therefore initialized with 0.
-     * <p>
-     * <p>
-     * <p>
-     * Array components are accessed in a two-dimensional array using the following syntax:
-     * <p>
-     * &lt;Field_Name&gt;[Index1,Index2]
-     * <p>
-     * Example:
-     * <p>
-     * Card_game[9,2]
-     * <p>
-     * <p>
-     * <p>
-     * Note:
-     * <p>
-     * If you define a function in your project with the name CheckBounds, you can automatically check for out-of-range errors in arrays ! The name of the function is fixed and can only have this designation.
-     */
-    ARRAY(-1),//TODO: implement me
-    /**
-     * Pointer
-     * Variable or function block addresses are saved in pointers while a program is running. Pointer declarations have the following syntax:
-     * <p>
-     * &lt;Identifier&gt;: POINTER TO &lt;Datatype/Functionblock&gt;;
-     * A pointer can point to any data type or function block even to user-defined types. The function of the Address Operator ADR is to assign the address of a variable or function block to the pointer.
-     * A pointer can be dereferenced by adding the content operator "^" after the pointer identifier. With the help of the SIZEOF Operator, e.g. a pointer increment can be done.
-     * <p>
-     * <p>
-     * Please note: A pointer is counted up byte-wise ! You can get it counted up like it is usual in the C-Compiler by using the instruction p=p+SIZEOF(p^);.
-     * <p>
-     * <p>
-     * <p>
-     * Attention:
-     * After an Online Change there might be changes concerning the data on certain addresses. Please regard this in case of using pointers on addresses.
-     * <p>
-     * <p>
-     * <p>
-     * Example:
-     * <p>
-     * pt:POINTER TO INT;
-     * var_int1:INT := 5;
-     * var_int2:INT;
-     * <p>
-     * <p>
-     * pt := ADR(var_int1);
-     * var_int2:= pt^; (* var_int2 is now 5 *)
-     * <p>
-     * <p>
-     * Example 2 (Pointer increment):
-     * <p>
-     * ptByCurrDataOffs : POINTER TO BYTE;
-     * udiAddress       : UDINT;
-     * <p>
-     * <p>
-     * <p>
-     * (*--- pointer increment ---*)
-     * udiAddress := ptByCurrDataOffs;
-     * udiAddress := udiAddress + SIZEOF(ptByCurrDataOffs^);
-     * ptByCurrDataOffs := udiAddress;
-     * (* -- end of pointer increment ---*)
-     */
-    POINTER(-1),//TODO: implement me,
-    /**
-     * Enumeration (ENUM)
-     * Enumeration is a user-defined data type that is made up of a number of string constants. These constants are referred to as enumeration values. Enumeration values are recognized in all areas of the project even if they were locally declared within aPOU. It is best to create your enumerations as objects in the Object Organizer under the register card Data types. They begin with the keyword TYPE and end with END_TYPE.
-     * <p>
-     * Syntax:
-     * <p>
-     * TYPE &lt;Identifier&gt;:(&lt;Enum_0&gt; ,&lt;Enum_1&gt;, ...,&lt;Enum_n&gt;);END_TYPE
-     * <p>
-     * The &lt;Identifier&gt; can take on one of the enumeration values and will be initialized with the first one. These values are compatible with whole numbers which means that you can perform operations with them just as you would with INT. You can assign a number x to the &lt;Identifier&gt;. If the enumeration values are not initialized, counting will begin with 0. When initializing, make certain the initial values are increasing. The validity of the number will be reviewed at the time it is run.
-     * <p>
-     * Example:
-     * <p>
-     * TRAFFIC_SIGNAL: (Red, Yellow, Green:=10); (*The initial value for each of the colors is red 0, yellow 1, green 10 *)
-     * TRAFFIC_SIGNAL:=0; (* The value of the traffic signal is red*)
-     * FOR i:= Red TO Green DO
-     * i := i + 1;
-     * END_FOR;
-     * <p>
-     * You may not use the same enumeration value more than once.
-     * <p>
-     * Example:
-     * <p>
-     * TRAFFIC_SIGNAL: (red, yellow, green);
-     * COLOR: (blue, white, red);
-     * <p>
-     * Error: red may not be used for both TRAFFIC_SIGNAL and COLOR.
-     */
-    ENUM(-1),//TODO: implement me,
-    /**
-     * Structures (STRUCT)
-     * Structures are created as objects in the Object Organizer under the register card Data types. They begin with the keyword TYPE and end with END_TYPE.The syntax for structure declarations is as follows:
-     * <p>
-     * TYPE &lt;Structurename&gt;:
-     * STRUCT
-     * &lt;Declaration of Variables 1&gt;
-     * .
-     * .
-     * &lt;Declaration of Variables n&gt;
-     * END_STRUCT
-     * END_TYPE
-     * <p>
-     * &lt;Structurename&gt; is a type that is recognized throughout the project and can be used like a standard data type. Interlocking structures are allowed. The only restriction is that variables may not be placed at addresses (the AT declaration is not allowed!).
-     * <p>
-     * Example for a structure definition named Polygonline:
-     * <p>
-     * TYPE Polygonline:
-     * STRUCT
-     * Start:ARRAY [1..2] OF INT;
-     * Point1:ARRAY [1..2] OF INT;
-     * Point2:ARRAY [1..2] OF INT;
-     * Point3:ARRAY [1..2] OF INT;
-     * Point4:ARRAY [1..2] OF INT;
-     * End:ARRAY [1..2] OF INT;
-     * END_STRUCT
-     * END_TYPE
-     * <p>
-     * You can gain access to structure components using the following syntax:
-     * <p>
-     * &lt;Structure_Name&gt;.&lt;Componentname&gt;
-     * <p>
-     * For example, if you have a structure named "Week" that contains a component named "Monday", you can get to it by doing the following: Week.Monday
-     * <p>
-     * <p>
-     * <p>
-     * Note:
-     * Due to different alignments, structures and arrays may have different configurations and sizes on different hardware platforms (e.g. CX1000 and CX90xx).
-     * <p>
-     * During data exchange the size and structure alignment must be identical!
-     * <p>
-     * <p>
-     * <p>
-     * Example for a structure definition with name ST_ALIGN_SAMPLE:
-     * <p>
-     * TYPE ST_ALIGN_SAMPLE:
-     * STRUCT
-     * _diField1   : DINT;
-     * _byField1   : BYTE;
-     * _iField     : INT;
-     * _byField2   : BYTE;
-     * _diField2   : DINT;
-     * _pField     : POINTER TO BYTE;
-     * END_STRUCT
-     * END_TYPE
-     * <p>
-     * On CX90xx (RISC) platforms the member components of structure ST_ALIGN_SAMPLE have the following sizes and offsets:
-     * <p>
-     * _diField1 (DINT), Offset = 0 (16#0),   Size = 4
-     * _byField1 (BYTE), Offset = 4 (16#4),   Size = 1
-     * _iField (INT), Offset = 6 (16#6),   Size = 2
-     * _byField2 (BYTE), Offset = 8 (16#8),   Size = 1
-     * _diField2 (DINT), Offset = 12 (16#C),  Size = 4
-     * _pField (POINTER TO BYTE), Offset = 16 (16#10), Size = 4
-     * <p>
-     * Overall size through natural alignment with Pack(4) and so-called padding bytes: 20
-     * <p>
-     * <p>
-     * <p>
-     * On CX10xx platforms the member components of structure ST_ALIGN_SAMPLE have the following sizes and offsets:
-     * <p>
-     * _diField1 (DINT), Offset = 0 (16#0),   Size = 4
-     * _byField1 (BYTE), Offset = 4 (16#4),   Size = 1
-     * _iField (INT), Offset = 5 (16#5),   Size = 2
-     * _byField2 (BYTE), Offset = 7 (16#7),   Size = 1
-     * _diField2 (DINT), Offset = 8 (16#8),  Size = 4
-     * _pField (POINTER TO BYTE), Offset = 12 (16#C), Size = 4
-     * <p>
-     * Overall size: 16
-     * <p>
-     * <p>
-     * <p>
-     * Display of structure ST_ALIGN_SAMPLE for CX90xx platforms (RISC) with representation of the padding bytes:
-     * <p>
-     * TYPE ST_ALIGN_SAMPLE:
-     * STRUCT
-     * _diField1    : DINT;
-     * _byField1    : BYTE;
-     * _byPadding   : BYTE;
-     * _iField      : INT;
-     * _byField2    : BYTE;
-     * _a_byPadding : ARRAY[0..2] OF BYTE;
-     * _diField2    : DINT;
-     * _pField      : POINTER TO BYTE;
-     * END_STRUCT
-     * END_TYPE
-     */
-    STRUCT(-1),//TODO: implement me,
-    /**
-     * References (Alias types)
-     * You can use the user-defined derived data type to create an alternative name for a variable, constant or function block. Create your references as objects in the Object Organizer under the register card Data types. They begin with the keyword TYPE and end with END_TYPE.
-     * <p>
-     * Syntax:
-     * <p>
-     * TYPE &lt;Identifier&gt;: &lt;Assignment term&gt;;
-     * END_TYPE
-     * <p>
-     * Example:
-     * <p>
-     * TYPE message:STRING[50];
-     * END_TYPE;
-     */
-    ALIAS(-1),//TODO: implement me,
-    /**
-     * Subrange types
-     * A sub-range data type is a type whose range of values is only a subset of that of the basic type. The declaration can be carried out in the data types register, but a variable can also be directly declared with a subrange type:
-     * Syntax for the declaration in the 'Data types' register:
-     * <p>
-     * TYPE &lt;Name&gt; : &lt;Inttype&gt; (&lt;ug&gt;..&lt;og&gt;) END_TYPE;
-     * Type	Description
-     * &lt;Name&gt;	must be a valid IEC identifier
-     * &lt;Inttype&gt;	is one of the data types SINT, USINT, INT, UINT, DINT, UDINT, BYTE, WORD, DWORD (LINT, ULINT, LWORD).
-     * &lt;ug&gt;	Is a constant which must be compatible with the basic type and which sets the lower boundary of the range types. The lower boundary itself is included in this range.
-     * &lt;og&gt;	Is a constant that must be compatible with the basic type, and sets the upper boundary of the range types. The upper boundary itself is included in this basic type.
-     * Example:
-     * <p>
-     * TYPE
-     * SubInt : INT (-4095..4095);
-     * END_TYPE
-     * Direct declaration of a variable with a subrange type:
-     * <p>
-     * VAR
-     * i1 : INT (-4095..4095);
-     * i2: INT (5...10):=5;
-     * ui : UINT (0..10000);
-     * END_VAR
-     * If a constant is assigned to a subrange type (in the declaration or in the implementation) that does not apply to this range (e.g. 1:=5000), an error message is issued.
-     * In order to check for observance of range boundaries at runtime, the functions CheckRangeSigned or CheckRangeUnsigned must be introduced.
-     */
-    SUB_RANGE_DATA_TYPE(-1),//TODO: implement me,
-
-    UNKNOWN(-1);
-
-    private final String typeName;
-
-    private final Number lowerBound;
-
-    private final double lowerBoundDouble;
-
-    private final Number upperBound;
-
-    private final double upperBoundDouble;
-
-    private final int memoryUse;
-
-    private final int targetByteSize;
-
-    // TODO: BYTE.MAX default might not be the best....
-    AdsDataType(int memoryUse) {
-        this(0, Byte.MAX_VALUE, memoryUse);
-    }
-
-    AdsDataType(Number lowerBound, Number upperBound, int memoryUse) {
-        this.lowerBound = lowerBound;
-        this.lowerBoundDouble = lowerBound.doubleValue();
-        this.upperBound = upperBound;
-        this.upperBoundDouble = upperBound.doubleValue();
-        this.typeName = name();
-        this.memoryUse = memoryUse;
-        this.targetByteSize = this.memoryUse / 8;
-    }
-
-    public String getTypeName() {
-        return typeName;
-    }
-
-    public Number getLowerBound() {
-        return lowerBound;
-    }
-
-    public Number getUpperBound() {
-        return upperBound;
-    }
-
-    public int getMemoryUse() {
-        return memoryUse;
-    }
-
-    public int getTargetByteSize() {
-        return targetByteSize;
-    }
-
-    public boolean withinBounds(double other) {
-        return other >= lowerBoundDouble && other <= upperBoundDouble;
-    }
-
-    @Override
-    public String toString() {
-        return "AdsDataType{" +
-            "typeName='" + typeName + '\'' +
-            ", lowerBound=" + lowerBound +
-            ", upperBound=" + upperBound +
-            ", memoryUse=" + memoryUse +
-            ", targetByteSize=" + targetByteSize +
-            "} " + super.toString();
-    }
-
-    private static BigInteger produceUnsignedMaxValue(int numberOfBytes) {
-        return new BigInteger(
-            ArrayUtils.insert(
-                0,
-                IntStream.range(0, numberOfBytes)
-                    .map(ignore -> 0xff)
-                    .collect(
-                        ByteArrayOutputStream::new,
-                        (baos, i) -> baos.write((byte) i),
-                        (baos1, baos2) -> baos1.write(baos2.toByteArray(), 0, baos2.size())
-                    )
-                    .toByteArray(),
-                (byte) 0x0)
-        );
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.model;
+
+import org.apache.commons.lang3.ArrayUtils;
+
+import java.io.ByteArrayOutputStream;
+import java.math.BigInteger;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.temporal.ChronoUnit;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.IntStream;
+
+/**
+ * Documentation can be found here:
+ *
+ * @see <a href="https://infosys.beckhoff.com/english.php?content=../content/1033/tcsystemmanager/basics/TcSysMgr_DatatypeComparison.htm&id=">TwinCAT System Manager - I/O Variables</a>
+ * @see <a href="https://infosys.beckhoff.com/english.php?content=../content/1033/tcplccontrol/html/tcplcctrl_plc_data_types_overview.htm&id">TwinCAT PLC Control: Data Types</a>
+ */
+public enum AdsDataType {
+    // TODO: maybe this are just types for the plc ide and can be removed
+    // https://infosys.beckhoff.com/english.php?content=../content/1033/tcsystemmanager/basics/TcSysMgr_DatatypeComparison.htm&id=
+    BIT(0, 1, 8),
+    BIT8((short) 0x00, (short) 0xFF, 8),
+    BITARR8((short) 0x00, (short) 0xFF, 8),
+    BITARR16(0x0000, 0xFFFF, 16),
+    BITARR32(0x0000_0000L, 0xFFFF_FFFFL, 32),
+    INT8(Byte.MIN_VALUE, Byte.MAX_VALUE, 8),
+    INT16(Short.MIN_VALUE, Short.MAX_VALUE, 16),
+    INT32(Integer.MIN_VALUE, Integer.MAX_VALUE, 32),
+    INT64(Long.MIN_VALUE, Long.MAX_VALUE, 64),
+    UINT8((short) 0, (short) 0xFF, 8),
+    UINT16(0, 0xFFFF, 16),
+    UINT32(0L, 0xFFFF_FFFFL, 32),
+    UINT64(BigInteger.ZERO, produceUnsignedMaxValue(8), 64),
+    FLOAT(-Float.MAX_VALUE, Float.MAX_VALUE, 32),
+    DOUBLE(-Double.MAX_VALUE, Double.MAX_VALUE, 64),
+    // https://infosys.beckhoff.com/english.php?content=../content/1033/tcplccontrol/html/tcplcctrl_plc_data_types_overview.htm&id
+    // Standard Data Types
+    /**
+     * BOOL type variables may be given the values TRUE and FALSE.
+     * <p>
+     * Type	Memory use
+     * BOOL	8 Bit
+     * Note:
+     * <p>
+     * A BOOL type variable is true, if the least significant bit in the memory is set (e.g. 2#00000001 ). If no bit is set in the memory, the variable is FALSE (2#00000000). All other values canĀ“t be interpeted accurately and be displayed (***INVALID: 16#xy *** in the Online View). Such problems may appear, if for example overlapped memory ranges are used in the PLC program.
+     * <p>
+     * Example:
+     * <p>
+     * The boolean variable is in the same memory range as the byte variable.
+     */
+    BOOL((byte) 0, (byte) 1, 8),
+    /**
+     * BYTE
+     * <p>
+     * Integer data type.
+     * <p>
+     * Type	Lower bound	Upper bound	Memory use
+     * BYTE	0	255	8 Bit
+     */
+    BYTE((short) 0, (short) 255, 8),
+    /**
+     * WORD
+     * Integer data type.
+     * <p>
+     * Type	Lower bound	Upper bound	Memory use
+     * WORD	0	65535	16 Bit
+     */
+    WORD(0, 65535, 16),
+    /**
+     * DWORD
+     * Integer data type.
+     * <p>
+     * Type	Lower bound	Upper bound	Memory use
+     * DWORD	0	4294967295	32 Bit
+     */
+    DWORD(0L, 4294967295L, 32),
+    /**
+     * SINT
+     * (Short) signed integer data type.
+     * <p>
+     * Type	Lower bound	Upper bound	Memory use
+     * SINT	-128	127	8 Bit
+     */
+    SINT(Byte.MIN_VALUE, Byte.MAX_VALUE, 8),
+    /**
+     * USINT
+     * Unsigned (short) integer data type.
+     * <p>
+     * Type	Lower bound	Upper bound	Memory use
+     * USINT	0	255	8 Bit
+     */
+    USINT((short) 0, (short) 0xFF, 8),
+    /**
+     * INT
+     * Signed integer data type.
+     * <p>
+     * Type	Lower bound	Upper bound	Memory use
+     * INT	-32768	32767	16 Bit
+     */
+    INT(Short.MIN_VALUE, Short.MAX_VALUE, 16),
+    /**
+     * UINT
+     * Unsigned integer data type.
+     * <p>
+     * Type	Lower bound	Upper bound	Memory use
+     * UINT	0	65535	16 Bit
+     */
+    UINT(0, 65535, 16),
+    /**
+     * DINT
+     * Signed integer data type.
+     * <p>
+     * Type	Lower bound	Upper bound	Memory use
+     * DINT	-2147483648	2147483647	32 Bit
+     */
+    DINT(-2147483648, 2147483647, 32),
+    /**
+     * UDINT
+     * Unsigned integer data type.
+     * <p>
+     * Type	Lower bound	Upper bound	Memory use
+     * UDINT	0	4294967295	32 Bit
+     */
+    UDINT(0L, 4294967295L, 32),
+    /**
+     * LINT  (64 bit integer, currently not supported by TwinCAT)
+     */
+    LINT(Long.MIN_VALUE, Long.MAX_VALUE, 64),
+    /**
+     * ULINT (Unsigned 64 bit integer, currently not supported by TwinCAT)
+     */
+    ULINT(BigInteger.ZERO, produceUnsignedMaxValue(8), 64),
+    /**
+     * REAL
+     * 32 Bit floating point data type. It is required to represent rational numbers.
+     * <p>
+     * Type	Lower bound	Upper bound	Memory use
+     * REAL	~ -3.402823 x 1038	~ 3.402823 x 1038	32 Bit
+     */
+    REAL(-Float.MAX_VALUE, Float.MAX_VALUE, 32),
+    /**
+     * LREAL
+     * 64 Bit floating point data type. It is required to represent rational numbers.
+     * <p>
+     * Type	Lower bound	Upper bound	Memory use
+     * LREAL	~ -1.79769313486231E308	~ 1.79769313486232E308	64 Bit
+     */
+    LREAL(-Double.MAX_VALUE, Double.MAX_VALUE, 64),
+    /**
+     * STRING
+     * A STRING type variable can contain any string of characters. The size entry in the declaration determines how much memory space should be reserved for the variable. It refers to the number of characters in the string and can be placed in parentheses or square brackets.
+     * <p>
+     * Example of a string declaration with 35 characters:
+     * <p>
+     * str:STRING(35):='This is a String';
+     * Type	Memory use
+     * STRING
+     * If no size specification is given, the default size of 80 characters will be used: Memory use [Bytes] =  80 + 1 Byte for string terminated Null character;
+     * If string size specification is given: Memory use [Bytes] = String Size + 1 Byte for string terminated Null character);
+     */
+    STRING(81 * 8),
+    /**
+     * TIME
+     * Duration time. The most siginificant digit is one millisecond. The data type is handled internally like DWORD.
+     * <p>
+     * Type	Lower bound	Upper bound	Memory use
+     * TIME	T#0ms	T#71582m47s295ms	32 Bit
+     */
+    TIME(0L, Duration.ofMinutes(71582).plusSeconds(47).plusMillis(295).toMillis(), 32),
+    /**
+     * TIME_OF_DAY
+     * TOD
+     * Time of day. The most siginificant digit is one millisecond. The data type is handled internally like DWORD.
+     * <p>
+     * Type	Lower bound	Upper bound	Memory use
+     * TIME_OF_DAY
+     * TOD
+     * <p>
+     * TOD#00:00	TOD#1193:02:47.295	32 Bit
+     *///TODO: strange maximum
+    TIME_OF_DAY(0L, ChronoUnit.MILLIS.between(LocalTime.of(0, 0), LocalTime.of(23, 59, 59)), 32),
+    /**
+     * DATE
+     * Date. The most significant digit is one second. The data type is handled internally like DWORD.
+     * <p>
+     * Type	Lower bound	Upper bound	Memory use
+     * DATE	D#1970-01-01	D#2106-02-06	32 Bit
+     */
+    DATE(0L, TimeUnit.DAYS.toSeconds(ChronoUnit.DAYS.between(LocalDate.of(1970, 1, 1), LocalDate.of(2106, 2, 6))), 32),
+    /**
+     * DATE_AND_TIME
+     * DT
+     * Date and time. The most siginificant digit is one second. The data type is handled internally like DWORD.
+     * <p>
+     * Type	Lower  bound	Upper  bound	Memory use
+     * DATE_AND_TIME
+     * DT
+     * <p>
+     * DT#1970-01-01-00:00	DT#2106-02-06-06:28:15	32 Bit
+     */
+    DATE_AND_TIME(0L, ChronoUnit.SECONDS.between(LocalDateTime.of(1970, 1, 1, 0, 0), LocalDateTime.of(2106, 2, 6, 6, 28, 15)), 32),
+    //User-defined Data Types
+    /**
+     * Arrays
+     * One-, two-, and three-dimensional fields (arrays) are supported as elementary data types. Arrays can be defined both in the declaration part of a POU and in the global variable lists.
+     * <p>
+     * Syntax:
+     * <p>
+     * &lt;Field_Name&gt;:ARRAY [&lt;LowLim1&gt;..&lt;UpLim1&gt;, &lt;LowLim2&gt;..&lt;UpLim2&gt;] OF &lt;elem. Type&gt;
+     * <p>
+     * LowLim1, LowLim2 identify the lower limit of the field range; UpLim1 and UpLim2 identify the upper limit. The range values must be integers.
+     * <p>
+     * Example:
+     * <p>
+     * Card_game: ARRAY [1..13, 1..4] OF INT;
+     * <p>
+     * <p>
+     * <p>
+     * Initializing of Arrays
+     * You can initialize either all of the elements in an array or none of them.
+     * <p>
+     * Example for initializing arrays:
+     * <p>
+     * arr1 : ARRAY [1..5] OF INT := 1,2,3,4,5;
+     * arr2 : ARRAY [1..2,3..4] OF INT := 1,3(7); (* short for 1,7,7,7 *)
+     * arr3 : ARRAY [1..2,2..3,3..4] OF INT := 2(0),4(4),2,3; (* short for 0,0,4,4,4,4,2,3 *)
+     * <p>
+     * <p>
+     * <p>
+     * Example for the initialization of an array of a structure:
+     * <p>
+     * TYPE STRUCT1
+     * STRUCT
+     * p1:int;
+     * p2:int;
+     * p3:dword;
+     * END_STRUCT
+     * arr1 : ARRAY[1..3] OF STRUCT1:= (p1:=1,p2:=10,p3:=4723), (p1:=2,p2:=0,p3:=299), (p1:=14,p2:=5,p3:=112);
+     * <p>
+     * <p>
+     * Example of the partial initialization of an Array:
+     * <p>
+     * arr1 : ARRAY [1..10] OF INT := 1,2;
+     * Elements to which no value is pre-assigned are initialized with the default initial value of the basic type. In the example above, the elements arr1[3]  to arr1[10] are therefore initialized with 0.
+     * <p>
+     * <p>
+     * <p>
+     * Array components are accessed in a two-dimensional array using the following syntax:
+     * <p>
+     * &lt;Field_Name&gt;[Index1,Index2]
+     * <p>
+     * Example:
+     * <p>
+     * Card_game[9,2]
+     * <p>
+     * <p>
+     * <p>
+     * Note:
+     * <p>
+     * If you define a function in your project with the name CheckBounds, you can automatically check for out-of-range errors in arrays ! The name of the function is fixed and can only have this designation.
+     */
+    ARRAY(-1),//TODO: implement me
+    /**
+     * Pointer
+     * Variable or function block addresses are saved in pointers while a program is running. Pointer declarations have the following syntax:
+     * <p>
+     * &lt;Identifier&gt;: POINTER TO &lt;Datatype/Functionblock&gt;;
+     * A pointer can point to any data type or function block even to user-defined types. The function of the Address Operator ADR is to assign the address of a variable or function block to the pointer.
+     * A pointer can be dereferenced by adding the content operator "^" after the pointer identifier. With the help of the SIZEOF Operator, e.g. a pointer increment can be done.
+     * <p>
+     * <p>
+     * Please note: A pointer is counted up byte-wise ! You can get it counted up like it is usual in the C-Compiler by using the instruction p=p+SIZEOF(p^);.
+     * <p>
+     * <p>
+     * <p>
+     * Attention:
+     * After an Online Change there might be changes concerning the data on certain addresses. Please regard this in case of using pointers on addresses.
+     * <p>
+     * <p>
+     * <p>
+     * Example:
+     * <p>
+     * pt:POINTER TO INT;
+     * var_int1:INT := 5;
+     * var_int2:INT;
+     * <p>
+     * <p>
+     * pt := ADR(var_int1);
+     * var_int2:= pt^; (* var_int2 is now 5 *)
+     * <p>
+     * <p>
+     * Example 2 (Pointer increment):
+     * <p>
+     * ptByCurrDataOffs : POINTER TO BYTE;
+     * udiAddress       : UDINT;
+     * <p>
+     * <p>
+     * <p>
+     * (*--- pointer increment ---*)
+     * udiAddress := ptByCurrDataOffs;
+     * udiAddress := udiAddress + SIZEOF(ptByCurrDataOffs^);
+     * ptByCurrDataOffs := udiAddress;
+     * (* -- end of pointer increment ---*)
+     */
+    POINTER(-1),//TODO: implement me,
+    /**
+     * Enumeration (ENUM)
+     * Enumeration is a user-defined data type that is made up of a number of string constants. These constants are referred to as enumeration values. Enumeration values are recognized in all areas of the project even if they were locally declared within aPOU. It is best to create your enumerations as objects in the Object Organizer under the register card Data types. They begin with the keyword TYPE and end with END_TYPE.
+     * <p>
+     * Syntax:
+     * <p>
+     * TYPE &lt;Identifier&gt;:(&lt;Enum_0&gt; ,&lt;Enum_1&gt;, ...,&lt;Enum_n&gt;);END_TYPE
+     * <p>
+     * The &lt;Identifier&gt; can take on one of the enumeration values and will be initialized with the first one. These values are compatible with whole numbers which means that you can perform operations with them just as you would with INT. You can assign a number x to the &lt;Identifier&gt;. If the enumeration values are not initialized, counting will begin with 0. When initializing, make certain the initial values are increasing. The validity of the number will be reviewed at the time it is run.
+     * <p>
+     * Example:
+     * <p>
+     * TRAFFIC_SIGNAL: (Red, Yellow, Green:=10); (*The initial value for each of the colors is red 0, yellow 1, green 10 *)
+     * TRAFFIC_SIGNAL:=0; (* The value of the traffic signal is red*)
+     * FOR i:= Red TO Green DO
+     * i := i + 1;
+     * END_FOR;
+     * <p>
+     * You may not use the same enumeration value more than once.
+     * <p>
+     * Example:
+     * <p>
+     * TRAFFIC_SIGNAL: (red, yellow, green);
+     * COLOR: (blue, white, red);
+     * <p>
+     * Error: red may not be used for both TRAFFIC_SIGNAL and COLOR.
+     */
+    ENUM(-1),//TODO: implement me,
+    /**
+     * Structures (STRUCT)
+     * Structures are created as objects in the Object Organizer under the register card Data types. They begin with the keyword TYPE and end with END_TYPE.The syntax for structure declarations is as follows:
+     * <p>
+     * TYPE &lt;Structurename&gt;:
+     * STRUCT
+     * &lt;Declaration of Variables 1&gt;
+     * .
+     * .
+     * &lt;Declaration of Variables n&gt;
+     * END_STRUCT
+     * END_TYPE
+     * <p>
+     * &lt;Structurename&gt; is a type that is recognized throughout the project and can be used like a standard data type. Interlocking structures are allowed. The only restriction is that variables may not be placed at addresses (the AT declaration is not allowed!).
+     * <p>
+     * Example for a structure definition named Polygonline:
+     * <p>
+     * TYPE Polygonline:
+     * STRUCT
+     * Start:ARRAY [1..2] OF INT;
+     * Point1:ARRAY [1..2] OF INT;
+     * Point2:ARRAY [1..2] OF INT;
+     * Point3:ARRAY [1..2] OF INT;
+     * Point4:ARRAY [1..2] OF INT;
+     * End:ARRAY [1..2] OF INT;
+     * END_STRUCT
+     * END_TYPE
+     * <p>
+     * You can gain access to structure components using the following syntax:
+     * <p>
+     * &lt;Structure_Name&gt;.&lt;Componentname&gt;
+     * <p>
+     * For example, if you have a structure named "Week" that contains a component named "Monday", you can get to it by doing the following: Week.Monday
+     * <p>
+     * <p>
+     * <p>
+     * Note:
+     * Due to different alignments, structures and arrays may have different configurations and sizes on different hardware platforms (e.g. CX1000 and CX90xx).
+     * <p>
+     * During data exchange the size and structure alignment must be identical!
+     * <p>
+     * <p>
+     * <p>
+     * Example for a structure definition with name ST_ALIGN_SAMPLE:
+     * <p>
+     * TYPE ST_ALIGN_SAMPLE:
+     * STRUCT
+     * _diField1   : DINT;
+     * _byField1   : BYTE;
+     * _iField     : INT;
+     * _byField2   : BYTE;
+     * _diField2   : DINT;
+     * _pField     : POINTER TO BYTE;
+     * END_STRUCT
+     * END_TYPE
+     * <p>
+     * On CX90xx (RISC) platforms the member components of structure ST_ALIGN_SAMPLE have the following sizes and offsets:
+     * <p>
+     * _diField1 (DINT), Offset = 0 (16#0),   Size = 4
+     * _byField1 (BYTE), Offset = 4 (16#4),   Size = 1
+     * _iField (INT), Offset = 6 (16#6),   Size = 2
+     * _byField2 (BYTE), Offset = 8 (16#8),   Size = 1
+     * _diField2 (DINT), Offset = 12 (16#C),  Size = 4
+     * _pField (POINTER TO BYTE), Offset = 16 (16#10), Size = 4
+     * <p>
+     * Overall size through natural alignment with Pack(4) and so-called padding bytes: 20
+     * <p>
+     * <p>
+     * <p>
+     * On CX10xx platforms the member components of structure ST_ALIGN_SAMPLE have the following sizes and offsets:
+     * <p>
+     * _diField1 (DINT), Offset = 0 (16#0),   Size = 4
+     * _byField1 (BYTE), Offset = 4 (16#4),   Size = 1
+     * _iField (INT), Offset = 5 (16#5),   Size = 2
+     * _byField2 (BYTE), Offset = 7 (16#7),   Size = 1
+     * _diField2 (DINT), Offset = 8 (16#8),  Size = 4
+     * _pField (POINTER TO BYTE), Offset = 12 (16#C), Size = 4
+     * <p>
+     * Overall size: 16
+     * <p>
+     * <p>
+     * <p>
+     * Display of structure ST_ALIGN_SAMPLE for CX90xx platforms (RISC) with representation of the padding bytes:
+     * <p>
+     * TYPE ST_ALIGN_SAMPLE:
+     * STRUCT
+     * _diField1    : DINT;
+     * _byField1    : BYTE;
+     * _byPadding   : BYTE;
+     * _iField      : INT;
+     * _byField2    : BYTE;
+     * _a_byPadding : ARRAY[0..2] OF BYTE;
+     * _diField2    : DINT;
+     * _pField      : POINTER TO BYTE;
+     * END_STRUCT
+     * END_TYPE
+     */
+    STRUCT(-1),//TODO: implement me,
+    /**
+     * References (Alias types)
+     * You can use the user-defined derived data type to create an alternative name for a variable, constant or function block. Create your references as objects in the Object Organizer under the register card Data types. They begin with the keyword TYPE and end with END_TYPE.
+     * <p>
+     * Syntax:
+     * <p>
+     * TYPE &lt;Identifier&gt;: &lt;Assignment term&gt;;
+     * END_TYPE
+     * <p>
+     * Example:
+     * <p>
+     * TYPE message:STRING[50];
+     * END_TYPE;
+     */
+    ALIAS(-1),//TODO: implement me,
+    /**
+     * Subrange types
+     * A sub-range data type is a type whose range of values is only a subset of that of the basic type. The declaration can be carried out in the data types register, but a variable can also be directly declared with a subrange type:
+     * Syntax for the declaration in the 'Data types' register:
+     * <p>
+     * TYPE &lt;Name&gt; : &lt;Inttype&gt; (&lt;ug&gt;..&lt;og&gt;) END_TYPE;
+     * Type	Description
+     * &lt;Name&gt;	must be a valid IEC identifier
+     * &lt;Inttype&gt;	is one of the data types SINT, USINT, INT, UINT, DINT, UDINT, BYTE, WORD, DWORD (LINT, ULINT, LWORD).
+     * &lt;ug&gt;	Is a constant which must be compatible with the basic type and which sets the lower boundary of the range types. The lower boundary itself is included in this range.
+     * &lt;og&gt;	Is a constant that must be compatible with the basic type, and sets the upper boundary of the range types. The upper boundary itself is included in this basic type.
+     * Example:
+     * <p>
+     * TYPE
+     * SubInt : INT (-4095..4095);
+     * END_TYPE
+     * Direct declaration of a variable with a subrange type:
+     * <p>
+     * VAR
+     * i1 : INT (-4095..4095);
+     * i2: INT (5...10):=5;
+     * ui : UINT (0..10000);
+     * END_VAR
+     * If a constant is assigned to a subrange type (in the declaration or in the implementation) that does not apply to this range (e.g. 1:=5000), an error message is issued.
+     * In order to check for observance of range boundaries at runtime, the functions CheckRangeSigned or CheckRangeUnsigned must be introduced.
+     */
+    SUB_RANGE_DATA_TYPE(-1),//TODO: implement me,
+
+    UNKNOWN(-1);
+
+    private final String typeName;
+
+    private final Number lowerBound;
+
+    private final double lowerBoundDouble;
+
+    private final Number upperBound;
+
+    private final double upperBoundDouble;
+
+    private final int memoryUse;
+
+    private final int targetByteSize;
+
+    // TODO: BYTE.MAX default might not be the best....
+    AdsDataType(int memoryUse) {
+        this(0, Byte.MAX_VALUE, memoryUse);
+    }
+
+    AdsDataType(Number lowerBound, Number upperBound, int memoryUse) {
+        this.lowerBound = lowerBound;
+        this.lowerBoundDouble = lowerBound.doubleValue();
+        this.upperBound = upperBound;
+        this.upperBoundDouble = upperBound.doubleValue();
+        this.typeName = name();
+        this.memoryUse = memoryUse;
+        this.targetByteSize = this.memoryUse / 8;
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public Number getLowerBound() {
+        return lowerBound;
+    }
+
+    public Number getUpperBound() {
+        return upperBound;
+    }
+
+    public int getMemoryUse() {
+        return memoryUse;
+    }
+
+    public int getTargetByteSize() {
+        return targetByteSize;
+    }
+
+    public boolean withinBounds(double other) {
+        return other >= lowerBoundDouble && other <= upperBoundDouble;
+    }
+
+    @Override
+    public String toString() {
+        return "AdsDataType{" +
+            "typeName='" + typeName + '\'' +
+            ", lowerBound=" + lowerBound +
+            ", upperBound=" + upperBound +
+            ", memoryUse=" + memoryUse +
+            ", targetByteSize=" + targetByteSize +
+            "} " + super.toString();
+    }
+
+    private static BigInteger produceUnsignedMaxValue(int numberOfBytes) {
+        return new BigInteger(
+            ArrayUtils.insert(
+                0,
+                IntStream.range(0, numberOfBytes)
+                    .map(ignore -> 0xff)
+                    .collect(
+                        ByteArrayOutputStream::new,
+                        (baos, i) -> baos.write((byte) i),
+                        (baos1, baos2) -> baos1.write(baos2.toByteArray(), 0, baos2.size())
+                    )
+                    .toByteArray(),
+                (byte) 0x0)
+        );
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsField.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsField.java
index d4938e6279d..a0ab8e6b4dc 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsField.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsField.java
@@ -1,26 +1,26 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.model;
-
-import org.apache.plc4x.java.api.model.PlcField;
-
-@FunctionalInterface
-public interface AdsField extends PlcField {
-    AdsDataType getAdsDataType();
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.model;
+
+import org.apache.plc4x.java.api.model.PlcField;
+
+@FunctionalInterface
+public interface AdsField extends PlcField {
+    AdsDataType getAdsDataType();
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsPlcFieldHandler.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsPlcFieldHandler.java
index ef05777d518..88749311159 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsPlcFieldHandler.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsPlcFieldHandler.java
@@ -1,1015 +1,1015 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.model;
-
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.connection.DefaultPlcFieldHandler;
-import org.apache.plc4x.java.base.messages.items.*;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.nio.charset.StandardCharsets;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.Arrays;
-import java.util.BitSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-// TODO: implement me acording to ads. currently copy pasta from S7
-// Use endian decoders.
-// TODO: replace all ifs with switches
-public class AdsPlcFieldHandler extends DefaultPlcFieldHandler {
-
-    @Override
-    public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
-        if (DirectAdsField.matches(fieldQuery)) {
-            return DirectAdsField.of(fieldQuery);
-        } else if (SymbolicAdsField.matches(fieldQuery)) {
-            return SymbolicAdsField.of(fieldQuery);
-        }
-        throw new PlcInvalidFieldException(fieldQuery);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeBoolean(PlcField field, Object[] values) {
-        AdsField adsField = (AdsField) field;
-        // All of these types are declared as Bit or Bit-String types.
-        switch (adsField.getAdsDataType()) {
-            case BIT:
-            case BIT8:
-            case BITARR8:
-            case BITARR16:
-            case BITARR32:
-            case INT8:
-            case INT16:
-            case INT32:
-            case INT64:
-            case UINT8:
-            case UINT16:
-            case UINT32:
-            case UINT64:
-            case FLOAT:
-            case DOUBLE:
-            case BOOL:
-            case BYTE:
-            case WORD:
-            case DWORD:
-            case SINT:
-            case USINT:
-            case INT:
-            case UINT:
-            case DINT:
-            case UDINT:
-            case LINT:
-            case ULINT:
-            case REAL:
-            case LREAL:
-            case STRING:
-            case TIME:
-            case TIME_OF_DAY:
-            case DATE:
-            case DATE_AND_TIME:
-            case ARRAY:
-            case POINTER:
-            case ENUM:
-            case STRUCT:
-            case ALIAS:
-            case SUB_RANGE_DATA_TYPE:
-                return internalEncodeBoolean(field, values);
-            case UNKNOWN:
-            default:
-                throw new PlcRuntimeException("Invalid encoder for type " + adsField.getAdsDataType().name());
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeByte(PlcField field, Object[] values) {
-        AdsField adsField = (AdsField) field;
-        switch (adsField.getAdsDataType()) {
-            case BIT:
-            case BIT8:
-            case BITARR8:
-            case BITARR16:
-            case BITARR32:
-            case INT8:
-            case INT16:
-            case INT32:
-            case INT64:
-            case UINT8:
-            case UINT16:
-            case UINT32:
-            case UINT64:
-            case FLOAT:
-            case DOUBLE:
-            case BOOL:
-            case BYTE:
-            case WORD:
-            case DWORD:
-            case SINT:
-            case USINT:
-            case INT:
-            case UINT:
-            case DINT:
-            case UDINT:
-            case LINT:
-            case ULINT:
-            case REAL:
-            case LREAL:
-            case STRING:
-            case TIME:
-            case TIME_OF_DAY:
-            case DATE:
-            case DATE_AND_TIME:
-            case ARRAY:
-            case POINTER:
-            case ENUM:
-            case STRUCT:
-            case ALIAS:
-            case SUB_RANGE_DATA_TYPE:
-                return internalEncodeInteger(field, values);
-            case UNKNOWN:
-            default:
-                throw new PlcRuntimeException("Invalid encoder for type " + adsField.getAdsDataType().name());
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeShort(PlcField field, Object[] values) {
-        AdsField adsField = (AdsField) field;
-        switch (adsField.getAdsDataType()) {
-            case BIT:
-            case BIT8:
-            case BITARR8:
-            case BITARR16:
-            case BITARR32:
-            case INT8:
-            case INT16:
-            case INT32:
-            case INT64:
-            case UINT8:
-            case UINT16:
-            case UINT32:
-            case UINT64:
-            case FLOAT:
-            case DOUBLE:
-            case BOOL:
-            case BYTE:
-            case WORD:
-            case DWORD:
-            case SINT:
-            case USINT:
-            case INT:
-            case UINT:
-            case DINT:
-            case UDINT:
-            case LINT:
-            case ULINT:
-            case REAL:
-            case LREAL:
-            case STRING:
-            case TIME:
-            case TIME_OF_DAY:
-            case DATE:
-            case DATE_AND_TIME:
-            case ARRAY:
-            case POINTER:
-            case ENUM:
-            case STRUCT:
-            case ALIAS:
-            case SUB_RANGE_DATA_TYPE:
-                return internalEncodeInteger(field, values);
-            case UNKNOWN:
-            default:
-                throw new PlcRuntimeException("Invalid encoder for type " + adsField.getAdsDataType().name());
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeInteger(PlcField field, Object[] values) {
-        AdsField adsField = (AdsField) field;
-        switch (adsField.getAdsDataType()) {
-            case BIT:
-            case BIT8:
-            case BITARR8:
-            case BITARR16:
-            case BITARR32:
-            case INT8:
-            case INT16:
-            case INT32:
-            case INT64:
-            case UINT8:
-            case UINT16:
-            case UINT32:
-            case UINT64:
-            case FLOAT:
-            case DOUBLE:
-            case BOOL:
-            case BYTE:
-            case WORD:
-            case DWORD:
-            case SINT:
-            case USINT:
-            case INT:
-            case UINT:
-            case DINT:
-            case UDINT:
-            case LINT:
-            case ULINT:
-            case REAL:
-            case LREAL:
-            case STRING:
-            case TIME:
-            case TIME_OF_DAY:
-            case DATE:
-            case DATE_AND_TIME:
-            case ARRAY:
-            case POINTER:
-            case ENUM:
-            case STRUCT:
-            case ALIAS:
-            case SUB_RANGE_DATA_TYPE:
-                return internalEncodeInteger(field, values);
-            case UNKNOWN:
-            default:
-                throw new PlcRuntimeException("Invalid encoder for type " + adsField.getAdsDataType().name());
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeBigInteger(PlcField field, Object[] values) {
-        AdsField adsField = (AdsField) field;
-        switch (adsField.getAdsDataType()) {
-            case BIT:
-            case BIT8:
-            case BITARR8:
-            case BITARR16:
-            case BITARR32:
-            case INT8:
-            case INT16:
-            case INT32:
-            case INT64:
-            case UINT8:
-            case UINT16:
-            case UINT32:
-            case UINT64:
-            case FLOAT:
-            case DOUBLE:
-            case BOOL:
-            case BYTE:
-            case WORD:
-            case DWORD:
-            case SINT:
-            case USINT:
-            case INT:
-            case UINT:
-            case DINT:
-            case UDINT:
-            case LINT:
-            case ULINT:
-            case REAL:
-            case LREAL:
-            case STRING:
-            case TIME:
-            case TIME_OF_DAY:
-            case DATE:
-            case DATE_AND_TIME:
-            case ARRAY:
-            case POINTER:
-            case ENUM:
-            case STRUCT:
-            case ALIAS:
-            case SUB_RANGE_DATA_TYPE:
-                return internalEncodeInteger(field, values);
-            case UNKNOWN:
-            default:
-                throw new PlcRuntimeException("Invalid encoder for type " + adsField.getAdsDataType().name());
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeLong(PlcField field, Object[] values) {
-        AdsField adsField = (AdsField) field;
-        switch (adsField.getAdsDataType()) {
-            case BIT:
-            case BIT8:
-            case BITARR8:
-            case BITARR16:
-            case BITARR32:
-            case INT8:
-            case INT16:
-            case INT32:
-            case INT64:
-            case UINT8:
-            case UINT16:
-            case UINT32:
-            case UINT64:
-            case FLOAT:
-            case DOUBLE:
-            case BOOL:
-            case BYTE:
-            case WORD:
-            case DWORD:
-            case SINT:
-            case USINT:
-            case INT:
-            case UINT:
-            case DINT:
-            case UDINT:
-            case LINT:
-            case ULINT:
-            case REAL:
-            case LREAL:
-            case STRING:
-            case TIME:
-            case TIME_OF_DAY:
-            case DATE:
-            case DATE_AND_TIME:
-            case ARRAY:
-            case POINTER:
-            case ENUM:
-            case STRUCT:
-            case ALIAS:
-            case SUB_RANGE_DATA_TYPE:
-                return internalEncodeInteger(field, values);
-            case UNKNOWN:
-            default:
-                throw new PlcRuntimeException("Invalid encoder for type " + adsField.getAdsDataType().name());
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeFloat(PlcField field, Object[] values) {
-        AdsField adsField = (AdsField) field;
-        switch (adsField.getAdsDataType()) {
-            case BIT:
-            case BIT8:
-            case BITARR8:
-            case BITARR16:
-            case BITARR32:
-            case INT8:
-            case INT16:
-            case INT32:
-            case INT64:
-            case UINT8:
-            case UINT16:
-            case UINT32:
-            case UINT64:
-            case FLOAT:
-            case DOUBLE:
-            case BOOL:
-            case BYTE:
-            case WORD:
-            case DWORD:
-            case SINT:
-            case USINT:
-            case INT:
-            case UINT:
-            case DINT:
-            case UDINT:
-            case LINT:
-            case ULINT:
-            case REAL:
-            case LREAL:
-            case STRING:
-            case TIME:
-            case TIME_OF_DAY:
-            case DATE:
-            case DATE_AND_TIME:
-            case ARRAY:
-            case POINTER:
-            case ENUM:
-            case STRUCT:
-            case ALIAS:
-            case SUB_RANGE_DATA_TYPE:
-                return internalEncodeFloatingPoint(field, values);
-            case UNKNOWN:
-            default:
-                throw new PlcRuntimeException("Invalid encoder for type " + adsField.getAdsDataType().name());
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeDouble(PlcField field, Object[] values) {
-        AdsField adsField = (AdsField) field;
-        switch (adsField.getAdsDataType()) {
-            case BIT:
-            case BIT8:
-            case BITARR8:
-            case BITARR16:
-            case BITARR32:
-            case INT8:
-            case INT16:
-            case INT32:
-            case INT64:
-            case UINT8:
-            case UINT16:
-            case UINT32:
-            case UINT64:
-            case FLOAT:
-            case DOUBLE:
-            case BOOL:
-            case BYTE:
-            case WORD:
-            case DWORD:
-            case SINT:
-            case USINT:
-            case INT:
-            case UINT:
-            case DINT:
-            case UDINT:
-            case LINT:
-            case ULINT:
-            case REAL:
-            case LREAL:
-            case STRING:
-            case TIME:
-            case TIME_OF_DAY:
-            case DATE:
-            case DATE_AND_TIME:
-            case ARRAY:
-            case POINTER:
-            case ENUM:
-            case STRUCT:
-            case ALIAS:
-            case SUB_RANGE_DATA_TYPE:
-                return internalEncodeFloatingPoint(field, values);
-            case UNKNOWN:
-            default:
-                throw new PlcRuntimeException("Invalid encoder for type " + adsField.getAdsDataType().name());
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeString(PlcField field, Object[] values) {
-        AdsField adsField = (AdsField) field;
-        switch (adsField.getAdsDataType()) {
-            case BIT:
-            case BIT8:
-            case BITARR8:
-            case BITARR16:
-            case BITARR32:
-            case INT8:
-            case INT16:
-            case INT32:
-            case INT64:
-            case UINT8:
-            case UINT16:
-            case UINT32:
-            case UINT64:
-            case FLOAT:
-            case DOUBLE:
-            case BOOL:
-            case BYTE:
-            case WORD:
-            case DWORD:
-            case SINT:
-            case USINT:
-            case INT:
-            case UINT:
-            case DINT:
-            case UDINT:
-            case LINT:
-            case ULINT:
-            case REAL:
-            case LREAL:
-            case STRING:
-            case TIME:
-            case TIME_OF_DAY:
-            case DATE:
-            case DATE_AND_TIME:
-            case ARRAY:
-            case POINTER:
-            case ENUM:
-            case STRUCT:
-            case ALIAS:
-            case SUB_RANGE_DATA_TYPE:
-                return internalEncodeString(field, values);
-            case UNKNOWN:
-            default:
-                throw new PlcRuntimeException("Invalid encoder for type " + adsField.getAdsDataType().name());
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeTime(PlcField field, Object[] values) {
-        AdsField adsField = (AdsField) field;
-        switch (adsField.getAdsDataType()) {
-            case BIT:
-            case BIT8:
-            case BITARR8:
-            case BITARR16:
-            case BITARR32:
-            case INT8:
-            case INT16:
-            case INT32:
-            case INT64:
-            case UINT8:
-            case UINT16:
-            case UINT32:
-            case UINT64:
-            case FLOAT:
-            case DOUBLE:
-            case BOOL:
-            case BYTE:
-            case WORD:
-            case DWORD:
-            case SINT:
-            case USINT:
-            case INT:
-            case UINT:
-            case DINT:
-            case UDINT:
-            case LINT:
-            case ULINT:
-            case REAL:
-            case LREAL:
-            case STRING:
-            case TIME:
-            case TIME_OF_DAY:
-            case DATE:
-            case DATE_AND_TIME:
-            case ARRAY:
-            case POINTER:
-            case ENUM:
-            case STRUCT:
-            case ALIAS:
-            case SUB_RANGE_DATA_TYPE:
-                return internalTimeTemporal(field, values);
-            case UNKNOWN:
-            default:
-                throw new PlcRuntimeException("Invalid encoder for type " + adsField.getAdsDataType().name());
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeDate(PlcField field, Object[] values) {
-        AdsField adsField = (AdsField) field;
-        switch (adsField.getAdsDataType()) {
-            case BIT:
-            case BIT8:
-            case BITARR8:
-            case BITARR16:
-            case BITARR32:
-            case INT8:
-            case INT16:
-            case INT32:
-            case INT64:
-            case UINT8:
-            case UINT16:
-            case UINT32:
-            case UINT64:
-            case FLOAT:
-            case DOUBLE:
-            case BOOL:
-            case BYTE:
-            case WORD:
-            case DWORD:
-            case SINT:
-            case USINT:
-            case INT:
-            case UINT:
-            case DINT:
-            case UDINT:
-            case LINT:
-            case ULINT:
-            case REAL:
-            case LREAL:
-            case STRING:
-            case TIME:
-            case TIME_OF_DAY:
-            case DATE:
-            case DATE_AND_TIME:
-            case ARRAY:
-            case POINTER:
-            case ENUM:
-            case STRUCT:
-            case ALIAS:
-            case SUB_RANGE_DATA_TYPE:
-                return internalDateTemporal(field, values);
-            case UNKNOWN:
-            default:
-                throw new PlcRuntimeException("Invalid encoder for type " + adsField.getAdsDataType().name());
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeDateTime(PlcField field, Object[] values) {
-        AdsField adsField = (AdsField) field;
-        switch (adsField.getAdsDataType()) {
-            case BIT:
-            case BIT8:
-            case BITARR8:
-            case BITARR16:
-            case BITARR32:
-            case INT8:
-            case INT16:
-            case INT32:
-            case INT64:
-            case UINT8:
-            case UINT16:
-            case UINT32:
-            case UINT64:
-            case FLOAT:
-            case DOUBLE:
-            case BOOL:
-            case BYTE:
-            case WORD:
-            case DWORD:
-            case SINT:
-            case USINT:
-            case INT:
-            case UINT:
-            case DINT:
-            case UDINT:
-            case LINT:
-            case ULINT:
-            case REAL:
-            case LREAL:
-            case STRING:
-            case TIME:
-            case TIME_OF_DAY:
-            case DATE:
-            case DATE_AND_TIME:
-            case ARRAY:
-            case POINTER:
-            case ENUM:
-            case STRUCT:
-            case ALIAS:
-            case SUB_RANGE_DATA_TYPE:
-                return internalDateTimeTemporal(field, values);
-            case UNKNOWN:
-            default:
-                throw new PlcRuntimeException("Invalid encoder for type " + adsField.getAdsDataType().name());
-        }
-    }
-
-    private BaseDefaultFieldItem internalEncodeBoolean(PlcField field, Object[] values) {
-        AdsField adsField = (AdsField) field;
-        switch (adsField.getAdsDataType()) {
-            case BOOL:
-            case BYTE:
-            case WORD:
-            case DWORD:
-                break;
-            default:
-                throw new IllegalArgumentException(
-                    "Cannot assign boolean values to " + adsField.getAdsDataType().name() + " fields.");
-        }
-        List<Boolean> booleanValues = new LinkedList<>();
-        for (Object value : values) {
-            if (value instanceof Boolean) {
-                Boolean booleanValue = (Boolean) value;
-                booleanValues.add(booleanValue);
-            } else if (value instanceof Byte) {
-                Byte byteValue = (Byte) value;
-                BitSet bitSet = BitSet.valueOf(new byte[]{byteValue});
-                for (int i = 0; i < 8; i++) {
-                    booleanValues.add(bitSet.get(i));
-                }
-            } else if (value instanceof Short) {
-                Short shortValue = (Short) value;
-                BitSet bitSet = BitSet.valueOf(new long[]{shortValue});
-                for (int i = 0; i < 16; i++) {
-                    booleanValues.add(bitSet.get(i));
-                }
-            } else if (value instanceof Integer) {
-                Integer integerValue = (Integer) value;
-                BitSet bitSet = BitSet.valueOf(new long[]{integerValue});
-                for (int i = 0; i < 32; i++) {
-                    booleanValues.add(bitSet.get(i));
-                }
-            } else if (value instanceof Long) {
-                long longValue = (Long) value;
-                BitSet bitSet = BitSet.valueOf(new long[]{longValue});
-                for (int i = 0; i < 64; i++) {
-                    booleanValues.add(bitSet.get(i));
-                }
-            } else {
-                throw new IllegalArgumentException(
-                    "Value of type " + value.getClass().getName() +
-                        " is not assignable to " + adsField.getAdsDataType().name() + " fields.");
-            }
-        }
-        return new DefaultBooleanFieldItem(booleanValues.toArray(new Boolean[0]));
-    }
-
-    private BaseDefaultFieldItem internalEncodeInteger(PlcField field, Object[] values) {
-        AdsField adsField = (AdsField) field;
-        Class<? extends BaseDefaultFieldItem> fieldType;
-        switch (adsField.getAdsDataType()) {
-            case BYTE:
-                fieldType = DefaultByteFieldItem.class;
-                break;
-            case WORD:
-                fieldType = DefaultByteArrayFieldItem.class;
-                break;
-            case DWORD:
-                fieldType = DefaultByteArrayFieldItem.class;
-                break;
-            case SINT:
-                fieldType = DefaultIntegerFieldItem.class;
-                break;
-            case USINT:
-                fieldType = DefaultLongFieldItem.class;
-                break;
-            case INT:
-                fieldType = DefaultShortFieldItem.class;
-                break;
-            case UINT:
-                fieldType = DefaultIntegerFieldItem.class;
-                break;
-            case DINT:
-                fieldType = DefaultIntegerFieldItem.class;
-                break;
-            case UDINT:
-                fieldType = DefaultLongFieldItem.class;
-                break;
-            case LINT:
-                fieldType = DefaultLongFieldItem.class;
-                break;
-            case ULINT:
-                fieldType = DefaultBigIntegerFieldItem.class;
-                break;
-            case INT32:
-                fieldType = DefaultIntegerFieldItem.class;
-                break;
-            case INT64:
-                fieldType = DefaultLongFieldItem.class;
-                break;
-            default:
-                throw new IllegalArgumentException(
-                    "Cannot assign integer values to " + adsField.getAdsDataType().name() + " fields.");
-        }
-        if (fieldType == DefaultLongFieldItem.class) {
-            Long[] longValues = new Long[values.length];
-            for (int i = 0; i < values.length; i++) {
-                if (!((values[i] instanceof Byte) || (values[i] instanceof Short) ||
-                    (values[i] instanceof Integer) || (values[i] instanceof BigInteger) || (values[i] instanceof Long))) {
-                    throw new IllegalArgumentException(
-                        "Value of type " + values[i].getClass().getName() +
-                            " is not assignable to " + adsField.getAdsDataType().name() + " fields.");
-                }
-
-                Number value = (Number) values[i];
-                if (!adsField.getAdsDataType().withinBounds(value.doubleValue())) {
-                    throw new IllegalArgumentException("Value " + values[i] + " ist not within bounds of " + adsField.getAdsDataType());
-                }
-                longValues[i] = value.longValue();
-            }
-            return new DefaultLongFieldItem(longValues);
-        } else {
-            BigInteger[] bigIntegerValues = new BigInteger[values.length];
-            for (int i = 0; i < values.length; i++) {
-                BigDecimal value;
-                if (values[i] instanceof BigInteger) {
-                    value = new BigDecimal((BigInteger) values[i]);
-                } else if (((values[i] instanceof Byte) || (values[i] instanceof Short) ||
-                    (values[i] instanceof Integer) || (values[i] instanceof Long))) {
-                    value = new BigDecimal(((Number) values[i]).longValue());
-                } else {
-                    throw new IllegalArgumentException(
-                        "Value of type " + values[i].getClass().getName() +
-                            " is not assignable to " + adsField.getAdsDataType().name() + " fields.");
-                }
-                if (!adsField.getAdsDataType().withinBounds(value.doubleValue())) {
-                    throw new IllegalArgumentException("Value " + values[i] + " ist not within bounds of " + adsField.getAdsDataType());
-                }
-                bigIntegerValues[i] = value.toBigInteger();
-            }
-            return new DefaultBigIntegerFieldItem(bigIntegerValues);
-        }
-    }
-
-    private BaseDefaultFieldItem internalEncodeFloatingPoint(PlcField field, Object[] values) {
-        AdsField adsField = (AdsField) field;
-        Class<? extends BaseDefaultFieldItem> fieldType;
-        AdsDataType adsDataType = adsField.getAdsDataType();
-        switch (adsDataType) {
-            case REAL:
-                fieldType = DefaultFloatFieldItem.class;
-                break;
-            case LREAL:
-                fieldType = DefaultDoubleFieldItem.class;
-                break;
-            default:
-                throw new IllegalArgumentException(
-                    "Cannot assign floating point values to " + adsDataType.name() + " fields.");
-        }
-        if (fieldType == DefaultDoubleFieldItem.class) {
-            Double[] floatingPointValues = new Double[values.length];
-            for (int i = 0; i < values.length; i++) {
-                if (values[i] instanceof Float) {
-                    floatingPointValues[i] = ((Float) values[i]).doubleValue();
-                } else if (values[i] instanceof Double) {
-                    floatingPointValues[i] = (Double) values[i];
-                } else {
-                    throw new IllegalArgumentException(
-                        "Value of type " + values[i].getClass().getName() +
-                            " is not assignable to " + adsDataType.name() + " fields.");
-                }
-
-                Number value = (Number) values[i];
-                if (!adsDataType.withinBounds(value.doubleValue())) {
-                    throw new IllegalArgumentException("Value " + values[i] + " ist not within bounds of " + adsDataType);
-                }
-            }
-            return new DefaultDoubleFieldItem(floatingPointValues);
-        } else {
-            Float[] floatingPointValues = new Float[values.length];
-            for (int i = 0; i < values.length; i++) {
-                if (values[i] instanceof Double) {
-                    Double aDouble = (Double) values[i];
-                    if (!adsDataType.withinBounds(aDouble)) {
-                        throw new IllegalArgumentException(
-                            "Value of " + aDouble + " exceeds allowed minimum for type "
-                                + adsDataType.name() + " (min " + adsDataType.getLowerBound() + "/max +" + adsDataType.getUpperBound() + ")");
-                    }
-                    floatingPointValues[i] = aDouble.floatValue();
-                } else if (values[i] instanceof Float) {
-                    floatingPointValues[i] = (Float) values[i];
-                } else {
-                    throw new IllegalArgumentException(
-                        "Value of type " + values[i].getClass().getName() +
-                            " is not assignable to " + adsDataType.name() + " fields.");
-                }
-
-                Number value = (Number) values[i];
-                if (!adsDataType.withinBounds(value.doubleValue())) {
-                    throw new IllegalArgumentException("Value " + values[i] + " ist not within bounds of " + adsDataType);
-                }
-            }
-            return new DefaultFloatFieldItem(floatingPointValues);
-        }
-    }
-
-    private BaseDefaultFieldItem internalEncodeString(PlcField field, Object[] values) {
-        AdsField adsField = (AdsField) field;
-        Number maxLength = adsField.getAdsDataType().getUpperBound();
-        //boolean encoding16Bit;
-        switch (adsField.getAdsDataType()) {
-            case STRING:
-                //encoding16Bit = false;
-                break;
-            default:
-                throw new IllegalArgumentException(
-                    "Cannot assign string values to " + adsField.getAdsDataType().name() + " fields.");
-        }
-        List<String> stringValues = new LinkedList<>();
-        for (Object value : values) {
-            if (value instanceof String) {
-                String stringValue = (String) value;
-                if (stringValue.length() > maxLength.intValue()) {
-                    throw new IllegalArgumentException(
-                        "String length " + stringValue.length() + " exceeds allowed maximum for type "
-                            + adsField.getAdsDataType().name() + " (max " + maxLength + ")");
-                }
-                stringValues.add(stringValue);
-            }
-            // All other types just translate to max one String character.
-            else if (value instanceof Byte) {
-                Byte byteValue = (Byte) value;
-                byte[] stringBytes = new byte[]{byteValue};
-                /*if (encoding16Bit) {
-                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_16));
-                } else {*/
-                stringValues.add(new String(stringBytes, StandardCharsets.UTF_8));
-                /*}*/
-            } else if (value instanceof Short) {
-                Short shortValue = (Short) value;
-                byte[] stringBytes = new byte[2];
-                stringBytes[0] = (byte) (shortValue >> 8);
-                stringBytes[1] = (byte) (shortValue & 0xFF);
-                /*if (encoding16Bit) {
-                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_16));
-                } else {*/
-                stringValues.add(new String(stringBytes, StandardCharsets.UTF_8));
-                /*}*/
-            } else if (value instanceof Integer) {
-                Integer integerValue = (Integer) value;
-                byte[] stringBytes = new byte[4];
-                stringBytes[0] = (byte) ((integerValue >> 24) & 0xFF);
-                stringBytes[1] = (byte) ((integerValue >> 16) & 0xFF);
-                stringBytes[2] = (byte) ((integerValue >> 8) & 0xFF);
-                stringBytes[3] = (byte) (integerValue & 0xFF);
-                /*if (encoding16Bit) {
-                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_16));
-                } else {*/
-                stringValues.add(new String(stringBytes, StandardCharsets.UTF_8));
-                /*}*/
-            } else if (value instanceof Long) {
-                Long longValue = (Long) value;
-                byte[] stringBytes = new byte[8];
-                stringBytes[0] = (byte) ((longValue >> 56) & 0xFF);
-                stringBytes[1] = (byte) ((longValue >> 48) & 0xFF);
-                stringBytes[2] = (byte) ((longValue >> 40) & 0xFF);
-                stringBytes[3] = (byte) ((longValue >> 32) & 0xFF);
-                stringBytes[4] = (byte) ((longValue >> 24) & 0xFF);
-                stringBytes[5] = (byte) ((longValue >> 16) & 0xFF);
-                stringBytes[6] = (byte) ((longValue >> 8) & 0xFF);
-                stringBytes[7] = (byte) (longValue & 0xFF);
-                /*if (encoding16Bit) {
-                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_16));
-                } else {*/
-                stringValues.add(new String(stringBytes, StandardCharsets.UTF_8));
-                /*}*/
-            } else {
-                throw new IllegalArgumentException(
-                    "Value of type " + value.getClass().getName() +
-                        " is not assignable to " + adsField.getAdsDataType().name() + " fields.");
-            }
-        }
-        return new DefaultStringFieldItem(stringValues.toArray(new String[0]));
-    }
-
-    private BaseDefaultFieldItem internalTimeTemporal(PlcField field, Object[] values) {
-        AdsField adsField = (AdsField) field;
-        switch (adsField.getAdsDataType()) {
-            case TIME:
-            case DATE:
-            case DATE_AND_TIME:
-                break;
-            default:
-                throw new IllegalArgumentException(
-                    "Cannot assign temporal values to " + adsField.getAdsDataType().name() + " fields.");
-        }
-        // TODO: support other types
-        List<LocalTime> localTimeValues = Arrays.stream(values)
-            .filter(LocalTime.class::isInstance)
-            .map(LocalTime.class::cast)
-            .collect(Collectors.toList());
-        return new DefaultLocalTimeFieldItem(localTimeValues.toArray(new LocalTime[0]));
-    }
-
-    private BaseDefaultFieldItem internalDateTemporal(PlcField field, Object[] values) {
-        AdsField adsField = (AdsField) field;
-        switch (adsField.getAdsDataType()) {
-            case TIME:
-            case DATE:
-            case DATE_AND_TIME:
-                break;
-            default:
-                throw new IllegalArgumentException(
-                    "Cannot assign temporal values to " + adsField.getAdsDataType().name() + " fields.");
-        }
-        // TODO: support other types
-        List<LocalDate> localDateValues = Arrays.stream(values)
-            .filter(LocalDate.class::isInstance)
-            .map(LocalDate.class::cast)
-            .collect(Collectors.toList());
-        return new DefaultLocalDateFieldItem(localDateValues.toArray(new LocalDate[0]));
-    }
-
-    private BaseDefaultFieldItem internalDateTimeTemporal(PlcField field, Object[] values) {
-        AdsField adsField = (AdsField) field;
-        Class<? extends BaseDefaultFieldItem> fieldType;
-        switch (adsField.getAdsDataType()) {
-            case TIME:
-                fieldType = DefaultLocalTimeFieldItem.class;
-                break;
-            case DATE:
-                fieldType = DefaultLocalDateFieldItem.class;
-                break;
-            case DATE_AND_TIME:
-                fieldType = DefaultLocalDateTimeFieldItem.class;
-                break;
-            default:
-                throw new IllegalArgumentException(
-                    "Cannot assign temporal values to " + adsField.getAdsDataType().name() + " fields.");
-        }
-        // TODO: add type conversion
-        if (fieldType == DefaultLocalDateTimeFieldItem.class) {
-            return new DefaultLocalDateTimeFieldItem(Arrays.stream(values)
-                .filter(LocalDateTime.class::isInstance)
-                .map(LocalDateTime.class::cast).toArray(LocalDateTime[]::new));
-        } else if (fieldType == DefaultLocalDateFieldItem.class) {
-            return new DefaultLocalDateFieldItem(Arrays.stream(values)
-                .filter(LocalDate.class::isInstance)
-                .map(LocalDate.class::cast).toArray(LocalDate[]::new));
-        } else {
-            return new DefaultLocalTimeFieldItem(Arrays.stream(values)
-                .filter(LocalTime.class::isInstance)
-                .map(LocalTime.class::cast).toArray(LocalTime[]::new));
-        }
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.model;
+
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.connection.DefaultPlcFieldHandler;
+import org.apache.plc4x.java.base.messages.items.*;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.Arrays;
+import java.util.BitSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+// TODO: implement me acording to ads. currently copy pasta from S7
+// Use endian decoders.
+// TODO: replace all ifs with switches
+public class AdsPlcFieldHandler extends DefaultPlcFieldHandler {
+
+    @Override
+    public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
+        if (DirectAdsField.matches(fieldQuery)) {
+            return DirectAdsField.of(fieldQuery);
+        } else if (SymbolicAdsField.matches(fieldQuery)) {
+            return SymbolicAdsField.of(fieldQuery);
+        }
+        throw new PlcInvalidFieldException(fieldQuery);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeBoolean(PlcField field, Object[] values) {
+        AdsField adsField = (AdsField) field;
+        // All of these types are declared as Bit or Bit-String types.
+        switch (adsField.getAdsDataType()) {
+            case BIT:
+            case BIT8:
+            case BITARR8:
+            case BITARR16:
+            case BITARR32:
+            case INT8:
+            case INT16:
+            case INT32:
+            case INT64:
+            case UINT8:
+            case UINT16:
+            case UINT32:
+            case UINT64:
+            case FLOAT:
+            case DOUBLE:
+            case BOOL:
+            case BYTE:
+            case WORD:
+            case DWORD:
+            case SINT:
+            case USINT:
+            case INT:
+            case UINT:
+            case DINT:
+            case UDINT:
+            case LINT:
+            case ULINT:
+            case REAL:
+            case LREAL:
+            case STRING:
+            case TIME:
+            case TIME_OF_DAY:
+            case DATE:
+            case DATE_AND_TIME:
+            case ARRAY:
+            case POINTER:
+            case ENUM:
+            case STRUCT:
+            case ALIAS:
+            case SUB_RANGE_DATA_TYPE:
+                return internalEncodeBoolean(field, values);
+            case UNKNOWN:
+            default:
+                throw new PlcRuntimeException("Invalid encoder for type " + adsField.getAdsDataType().name());
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeByte(PlcField field, Object[] values) {
+        AdsField adsField = (AdsField) field;
+        switch (adsField.getAdsDataType()) {
+            case BIT:
+            case BIT8:
+            case BITARR8:
+            case BITARR16:
+            case BITARR32:
+            case INT8:
+            case INT16:
+            case INT32:
+            case INT64:
+            case UINT8:
+            case UINT16:
+            case UINT32:
+            case UINT64:
+            case FLOAT:
+            case DOUBLE:
+            case BOOL:
+            case BYTE:
+            case WORD:
+            case DWORD:
+            case SINT:
+            case USINT:
+            case INT:
+            case UINT:
+            case DINT:
+            case UDINT:
+            case LINT:
+            case ULINT:
+            case REAL:
+            case LREAL:
+            case STRING:
+            case TIME:
+            case TIME_OF_DAY:
+            case DATE:
+            case DATE_AND_TIME:
+            case ARRAY:
+            case POINTER:
+            case ENUM:
+            case STRUCT:
+            case ALIAS:
+            case SUB_RANGE_DATA_TYPE:
+                return internalEncodeInteger(field, values);
+            case UNKNOWN:
+            default:
+                throw new PlcRuntimeException("Invalid encoder for type " + adsField.getAdsDataType().name());
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeShort(PlcField field, Object[] values) {
+        AdsField adsField = (AdsField) field;
+        switch (adsField.getAdsDataType()) {
+            case BIT:
+            case BIT8:
+            case BITARR8:
+            case BITARR16:
+            case BITARR32:
+            case INT8:
+            case INT16:
+            case INT32:
+            case INT64:
+            case UINT8:
+            case UINT16:
+            case UINT32:
+            case UINT64:
+            case FLOAT:
+            case DOUBLE:
+            case BOOL:
+            case BYTE:
+            case WORD:
+            case DWORD:
+            case SINT:
+            case USINT:
+            case INT:
+            case UINT:
+            case DINT:
+            case UDINT:
+            case LINT:
+            case ULINT:
+            case REAL:
+            case LREAL:
+            case STRING:
+            case TIME:
+            case TIME_OF_DAY:
+            case DATE:
+            case DATE_AND_TIME:
+            case ARRAY:
+            case POINTER:
+            case ENUM:
+            case STRUCT:
+            case ALIAS:
+            case SUB_RANGE_DATA_TYPE:
+                return internalEncodeInteger(field, values);
+            case UNKNOWN:
+            default:
+                throw new PlcRuntimeException("Invalid encoder for type " + adsField.getAdsDataType().name());
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeInteger(PlcField field, Object[] values) {
+        AdsField adsField = (AdsField) field;
+        switch (adsField.getAdsDataType()) {
+            case BIT:
+            case BIT8:
+            case BITARR8:
+            case BITARR16:
+            case BITARR32:
+            case INT8:
+            case INT16:
+            case INT32:
+            case INT64:
+            case UINT8:
+            case UINT16:
+            case UINT32:
+            case UINT64:
+            case FLOAT:
+            case DOUBLE:
+            case BOOL:
+            case BYTE:
+            case WORD:
+            case DWORD:
+            case SINT:
+            case USINT:
+            case INT:
+            case UINT:
+            case DINT:
+            case UDINT:
+            case LINT:
+            case ULINT:
+            case REAL:
+            case LREAL:
+            case STRING:
+            case TIME:
+            case TIME_OF_DAY:
+            case DATE:
+            case DATE_AND_TIME:
+            case ARRAY:
+            case POINTER:
+            case ENUM:
+            case STRUCT:
+            case ALIAS:
+            case SUB_RANGE_DATA_TYPE:
+                return internalEncodeInteger(field, values);
+            case UNKNOWN:
+            default:
+                throw new PlcRuntimeException("Invalid encoder for type " + adsField.getAdsDataType().name());
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeBigInteger(PlcField field, Object[] values) {
+        AdsField adsField = (AdsField) field;
+        switch (adsField.getAdsDataType()) {
+            case BIT:
+            case BIT8:
+            case BITARR8:
+            case BITARR16:
+            case BITARR32:
+            case INT8:
+            case INT16:
+            case INT32:
+            case INT64:
+            case UINT8:
+            case UINT16:
+            case UINT32:
+            case UINT64:
+            case FLOAT:
+            case DOUBLE:
+            case BOOL:
+            case BYTE:
+            case WORD:
+            case DWORD:
+            case SINT:
+            case USINT:
+            case INT:
+            case UINT:
+            case DINT:
+            case UDINT:
+            case LINT:
+            case ULINT:
+            case REAL:
+            case LREAL:
+            case STRING:
+            case TIME:
+            case TIME_OF_DAY:
+            case DATE:
+            case DATE_AND_TIME:
+            case ARRAY:
+            case POINTER:
+            case ENUM:
+            case STRUCT:
+            case ALIAS:
+            case SUB_RANGE_DATA_TYPE:
+                return internalEncodeInteger(field, values);
+            case UNKNOWN:
+            default:
+                throw new PlcRuntimeException("Invalid encoder for type " + adsField.getAdsDataType().name());
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeLong(PlcField field, Object[] values) {
+        AdsField adsField = (AdsField) field;
+        switch (adsField.getAdsDataType()) {
+            case BIT:
+            case BIT8:
+            case BITARR8:
+            case BITARR16:
+            case BITARR32:
+            case INT8:
+            case INT16:
+            case INT32:
+            case INT64:
+            case UINT8:
+            case UINT16:
+            case UINT32:
+            case UINT64:
+            case FLOAT:
+            case DOUBLE:
+            case BOOL:
+            case BYTE:
+            case WORD:
+            case DWORD:
+            case SINT:
+            case USINT:
+            case INT:
+            case UINT:
+            case DINT:
+            case UDINT:
+            case LINT:
+            case ULINT:
+            case REAL:
+            case LREAL:
+            case STRING:
+            case TIME:
+            case TIME_OF_DAY:
+            case DATE:
+            case DATE_AND_TIME:
+            case ARRAY:
+            case POINTER:
+            case ENUM:
+            case STRUCT:
+            case ALIAS:
+            case SUB_RANGE_DATA_TYPE:
+                return internalEncodeInteger(field, values);
+            case UNKNOWN:
+            default:
+                throw new PlcRuntimeException("Invalid encoder for type " + adsField.getAdsDataType().name());
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeFloat(PlcField field, Object[] values) {
+        AdsField adsField = (AdsField) field;
+        switch (adsField.getAdsDataType()) {
+            case BIT:
+            case BIT8:
+            case BITARR8:
+            case BITARR16:
+            case BITARR32:
+            case INT8:
+            case INT16:
+            case INT32:
+            case INT64:
+            case UINT8:
+            case UINT16:
+            case UINT32:
+            case UINT64:
+            case FLOAT:
+            case DOUBLE:
+            case BOOL:
+            case BYTE:
+            case WORD:
+            case DWORD:
+            case SINT:
+            case USINT:
+            case INT:
+            case UINT:
+            case DINT:
+            case UDINT:
+            case LINT:
+            case ULINT:
+            case REAL:
+            case LREAL:
+            case STRING:
+            case TIME:
+            case TIME_OF_DAY:
+            case DATE:
+            case DATE_AND_TIME:
+            case ARRAY:
+            case POINTER:
+            case ENUM:
+            case STRUCT:
+            case ALIAS:
+            case SUB_RANGE_DATA_TYPE:
+                return internalEncodeFloatingPoint(field, values);
+            case UNKNOWN:
+            default:
+                throw new PlcRuntimeException("Invalid encoder for type " + adsField.getAdsDataType().name());
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDouble(PlcField field, Object[] values) {
+        AdsField adsField = (AdsField) field;
+        switch (adsField.getAdsDataType()) {
+            case BIT:
+            case BIT8:
+            case BITARR8:
+            case BITARR16:
+            case BITARR32:
+            case INT8:
+            case INT16:
+            case INT32:
+            case INT64:
+            case UINT8:
+            case UINT16:
+            case UINT32:
+            case UINT64:
+            case FLOAT:
+            case DOUBLE:
+            case BOOL:
+            case BYTE:
+            case WORD:
+            case DWORD:
+            case SINT:
+            case USINT:
+            case INT:
+            case UINT:
+            case DINT:
+            case UDINT:
+            case LINT:
+            case ULINT:
+            case REAL:
+            case LREAL:
+            case STRING:
+            case TIME:
+            case TIME_OF_DAY:
+            case DATE:
+            case DATE_AND_TIME:
+            case ARRAY:
+            case POINTER:
+            case ENUM:
+            case STRUCT:
+            case ALIAS:
+            case SUB_RANGE_DATA_TYPE:
+                return internalEncodeFloatingPoint(field, values);
+            case UNKNOWN:
+            default:
+                throw new PlcRuntimeException("Invalid encoder for type " + adsField.getAdsDataType().name());
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeString(PlcField field, Object[] values) {
+        AdsField adsField = (AdsField) field;
+        switch (adsField.getAdsDataType()) {
+            case BIT:
+            case BIT8:
+            case BITARR8:
+            case BITARR16:
+            case BITARR32:
+            case INT8:
+            case INT16:
+            case INT32:
+            case INT64:
+            case UINT8:
+            case UINT16:
+            case UINT32:
+            case UINT64:
+            case FLOAT:
+            case DOUBLE:
+            case BOOL:
+            case BYTE:
+            case WORD:
+            case DWORD:
+            case SINT:
+            case USINT:
+            case INT:
+            case UINT:
+            case DINT:
+            case UDINT:
+            case LINT:
+            case ULINT:
+            case REAL:
+            case LREAL:
+            case STRING:
+            case TIME:
+            case TIME_OF_DAY:
+            case DATE:
+            case DATE_AND_TIME:
+            case ARRAY:
+            case POINTER:
+            case ENUM:
+            case STRUCT:
+            case ALIAS:
+            case SUB_RANGE_DATA_TYPE:
+                return internalEncodeString(field, values);
+            case UNKNOWN:
+            default:
+                throw new PlcRuntimeException("Invalid encoder for type " + adsField.getAdsDataType().name());
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeTime(PlcField field, Object[] values) {
+        AdsField adsField = (AdsField) field;
+        switch (adsField.getAdsDataType()) {
+            case BIT:
+            case BIT8:
+            case BITARR8:
+            case BITARR16:
+            case BITARR32:
+            case INT8:
+            case INT16:
+            case INT32:
+            case INT64:
+            case UINT8:
+            case UINT16:
+            case UINT32:
+            case UINT64:
+            case FLOAT:
+            case DOUBLE:
+            case BOOL:
+            case BYTE:
+            case WORD:
+            case DWORD:
+            case SINT:
+            case USINT:
+            case INT:
+            case UINT:
+            case DINT:
+            case UDINT:
+            case LINT:
+            case ULINT:
+            case REAL:
+            case LREAL:
+            case STRING:
+            case TIME:
+            case TIME_OF_DAY:
+            case DATE:
+            case DATE_AND_TIME:
+            case ARRAY:
+            case POINTER:
+            case ENUM:
+            case STRUCT:
+            case ALIAS:
+            case SUB_RANGE_DATA_TYPE:
+                return internalTimeTemporal(field, values);
+            case UNKNOWN:
+            default:
+                throw new PlcRuntimeException("Invalid encoder for type " + adsField.getAdsDataType().name());
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDate(PlcField field, Object[] values) {
+        AdsField adsField = (AdsField) field;
+        switch (adsField.getAdsDataType()) {
+            case BIT:
+            case BIT8:
+            case BITARR8:
+            case BITARR16:
+            case BITARR32:
+            case INT8:
+            case INT16:
+            case INT32:
+            case INT64:
+            case UINT8:
+            case UINT16:
+            case UINT32:
+            case UINT64:
+            case FLOAT:
+            case DOUBLE:
+            case BOOL:
+            case BYTE:
+            case WORD:
+            case DWORD:
+            case SINT:
+            case USINT:
+            case INT:
+            case UINT:
+            case DINT:
+            case UDINT:
+            case LINT:
+            case ULINT:
+            case REAL:
+            case LREAL:
+            case STRING:
+            case TIME:
+            case TIME_OF_DAY:
+            case DATE:
+            case DATE_AND_TIME:
+            case ARRAY:
+            case POINTER:
+            case ENUM:
+            case STRUCT:
+            case ALIAS:
+            case SUB_RANGE_DATA_TYPE:
+                return internalDateTemporal(field, values);
+            case UNKNOWN:
+            default:
+                throw new PlcRuntimeException("Invalid encoder for type " + adsField.getAdsDataType().name());
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDateTime(PlcField field, Object[] values) {
+        AdsField adsField = (AdsField) field;
+        switch (adsField.getAdsDataType()) {
+            case BIT:
+            case BIT8:
+            case BITARR8:
+            case BITARR16:
+            case BITARR32:
+            case INT8:
+            case INT16:
+            case INT32:
+            case INT64:
+            case UINT8:
+            case UINT16:
+            case UINT32:
+            case UINT64:
+            case FLOAT:
+            case DOUBLE:
+            case BOOL:
+            case BYTE:
+            case WORD:
+            case DWORD:
+            case SINT:
+            case USINT:
+            case INT:
+            case UINT:
+            case DINT:
+            case UDINT:
+            case LINT:
+            case ULINT:
+            case REAL:
+            case LREAL:
+            case STRING:
+            case TIME:
+            case TIME_OF_DAY:
+            case DATE:
+            case DATE_AND_TIME:
+            case ARRAY:
+            case POINTER:
+            case ENUM:
+            case STRUCT:
+            case ALIAS:
+            case SUB_RANGE_DATA_TYPE:
+                return internalDateTimeTemporal(field, values);
+            case UNKNOWN:
+            default:
+                throw new PlcRuntimeException("Invalid encoder for type " + adsField.getAdsDataType().name());
+        }
+    }
+
+    private BaseDefaultFieldItem internalEncodeBoolean(PlcField field, Object[] values) {
+        AdsField adsField = (AdsField) field;
+        switch (adsField.getAdsDataType()) {
+            case BOOL:
+            case BYTE:
+            case WORD:
+            case DWORD:
+                break;
+            default:
+                throw new IllegalArgumentException(
+                    "Cannot assign boolean values to " + adsField.getAdsDataType().name() + " fields.");
+        }
+        List<Boolean> booleanValues = new LinkedList<>();
+        for (Object value : values) {
+            if (value instanceof Boolean) {
+                Boolean booleanValue = (Boolean) value;
+                booleanValues.add(booleanValue);
+            } else if (value instanceof Byte) {
+                Byte byteValue = (Byte) value;
+                BitSet bitSet = BitSet.valueOf(new byte[]{byteValue});
+                for (int i = 0; i < 8; i++) {
+                    booleanValues.add(bitSet.get(i));
+                }
+            } else if (value instanceof Short) {
+                Short shortValue = (Short) value;
+                BitSet bitSet = BitSet.valueOf(new long[]{shortValue});
+                for (int i = 0; i < 16; i++) {
+                    booleanValues.add(bitSet.get(i));
+                }
+            } else if (value instanceof Integer) {
+                Integer integerValue = (Integer) value;
+                BitSet bitSet = BitSet.valueOf(new long[]{integerValue});
+                for (int i = 0; i < 32; i++) {
+                    booleanValues.add(bitSet.get(i));
+                }
+            } else if (value instanceof Long) {
+                long longValue = (Long) value;
+                BitSet bitSet = BitSet.valueOf(new long[]{longValue});
+                for (int i = 0; i < 64; i++) {
+                    booleanValues.add(bitSet.get(i));
+                }
+            } else {
+                throw new IllegalArgumentException(
+                    "Value of type " + value.getClass().getName() +
+                        " is not assignable to " + adsField.getAdsDataType().name() + " fields.");
+            }
+        }
+        return new DefaultBooleanFieldItem(booleanValues.toArray(new Boolean[0]));
+    }
+
+    private BaseDefaultFieldItem internalEncodeInteger(PlcField field, Object[] values) {
+        AdsField adsField = (AdsField) field;
+        Class<? extends BaseDefaultFieldItem> fieldType;
+        switch (adsField.getAdsDataType()) {
+            case BYTE:
+                fieldType = DefaultByteFieldItem.class;
+                break;
+            case WORD:
+                fieldType = DefaultByteArrayFieldItem.class;
+                break;
+            case DWORD:
+                fieldType = DefaultByteArrayFieldItem.class;
+                break;
+            case SINT:
+                fieldType = DefaultIntegerFieldItem.class;
+                break;
+            case USINT:
+                fieldType = DefaultLongFieldItem.class;
+                break;
+            case INT:
+                fieldType = DefaultShortFieldItem.class;
+                break;
+            case UINT:
+                fieldType = DefaultIntegerFieldItem.class;
+                break;
+            case DINT:
+                fieldType = DefaultIntegerFieldItem.class;
+                break;
+            case UDINT:
+                fieldType = DefaultLongFieldItem.class;
+                break;
+            case LINT:
+                fieldType = DefaultLongFieldItem.class;
+                break;
+            case ULINT:
+                fieldType = DefaultBigIntegerFieldItem.class;
+                break;
+            case INT32:
+                fieldType = DefaultIntegerFieldItem.class;
+                break;
+            case INT64:
+                fieldType = DefaultLongFieldItem.class;
+                break;
+            default:
+                throw new IllegalArgumentException(
+                    "Cannot assign integer values to " + adsField.getAdsDataType().name() + " fields.");
+        }
+        if (fieldType == DefaultLongFieldItem.class) {
+            Long[] longValues = new Long[values.length];
+            for (int i = 0; i < values.length; i++) {
+                if (!((values[i] instanceof Byte) || (values[i] instanceof Short) ||
+                    (values[i] instanceof Integer) || (values[i] instanceof BigInteger) || (values[i] instanceof Long))) {
+                    throw new IllegalArgumentException(
+                        "Value of type " + values[i].getClass().getName() +
+                            " is not assignable to " + adsField.getAdsDataType().name() + " fields.");
+                }
+
+                Number value = (Number) values[i];
+                if (!adsField.getAdsDataType().withinBounds(value.doubleValue())) {
+                    throw new IllegalArgumentException("Value " + values[i] + " ist not within bounds of " + adsField.getAdsDataType());
+                }
+                longValues[i] = value.longValue();
+            }
+            return new DefaultLongFieldItem(longValues);
+        } else {
+            BigInteger[] bigIntegerValues = new BigInteger[values.length];
+            for (int i = 0; i < values.length; i++) {
+                BigDecimal value;
+                if (values[i] instanceof BigInteger) {
+                    value = new BigDecimal((BigInteger) values[i]);
+                } else if (((values[i] instanceof Byte) || (values[i] instanceof Short) ||
+                    (values[i] instanceof Integer) || (values[i] instanceof Long))) {
+                    value = new BigDecimal(((Number) values[i]).longValue());
+                } else {
+                    throw new IllegalArgumentException(
+                        "Value of type " + values[i].getClass().getName() +
+                            " is not assignable to " + adsField.getAdsDataType().name() + " fields.");
+                }
+                if (!adsField.getAdsDataType().withinBounds(value.doubleValue())) {
+                    throw new IllegalArgumentException("Value " + values[i] + " ist not within bounds of " + adsField.getAdsDataType());
+                }
+                bigIntegerValues[i] = value.toBigInteger();
+            }
+            return new DefaultBigIntegerFieldItem(bigIntegerValues);
+        }
+    }
+
+    private BaseDefaultFieldItem internalEncodeFloatingPoint(PlcField field, Object[] values) {
+        AdsField adsField = (AdsField) field;
+        Class<? extends BaseDefaultFieldItem> fieldType;
+        AdsDataType adsDataType = adsField.getAdsDataType();
+        switch (adsDataType) {
+            case REAL:
+                fieldType = DefaultFloatFieldItem.class;
+                break;
+            case LREAL:
+                fieldType = DefaultDoubleFieldItem.class;
+                break;
+            default:
+                throw new IllegalArgumentException(
+                    "Cannot assign floating point values to " + adsDataType.name() + " fields.");
+        }
+        if (fieldType == DefaultDoubleFieldItem.class) {
+            Double[] floatingPointValues = new Double[values.length];
+            for (int i = 0; i < values.length; i++) {
+                if (values[i] instanceof Float) {
+                    floatingPointValues[i] = ((Float) values[i]).doubleValue();
+                } else if (values[i] instanceof Double) {
+                    floatingPointValues[i] = (Double) values[i];
+                } else {
+                    throw new IllegalArgumentException(
+                        "Value of type " + values[i].getClass().getName() +
+                            " is not assignable to " + adsDataType.name() + " fields.");
+                }
+
+                Number value = (Number) values[i];
+                if (!adsDataType.withinBounds(value.doubleValue())) {
+                    throw new IllegalArgumentException("Value " + values[i] + " ist not within bounds of " + adsDataType);
+                }
+            }
+            return new DefaultDoubleFieldItem(floatingPointValues);
+        } else {
+            Float[] floatingPointValues = new Float[values.length];
+            for (int i = 0; i < values.length; i++) {
+                if (values[i] instanceof Double) {
+                    Double aDouble = (Double) values[i];
+                    if (!adsDataType.withinBounds(aDouble)) {
+                        throw new IllegalArgumentException(
+                            "Value of " + aDouble + " exceeds allowed minimum for type "
+                                + adsDataType.name() + " (min " + adsDataType.getLowerBound() + "/max +" + adsDataType.getUpperBound() + ")");
+                    }
+                    floatingPointValues[i] = aDouble.floatValue();
+                } else if (values[i] instanceof Float) {
+                    floatingPointValues[i] = (Float) values[i];
+                } else {
+                    throw new IllegalArgumentException(
+                        "Value of type " + values[i].getClass().getName() +
+                            " is not assignable to " + adsDataType.name() + " fields.");
+                }
+
+                Number value = (Number) values[i];
+                if (!adsDataType.withinBounds(value.doubleValue())) {
+                    throw new IllegalArgumentException("Value " + values[i] + " ist not within bounds of " + adsDataType);
+                }
+            }
+            return new DefaultFloatFieldItem(floatingPointValues);
+        }
+    }
+
+    private BaseDefaultFieldItem internalEncodeString(PlcField field, Object[] values) {
+        AdsField adsField = (AdsField) field;
+        Number maxLength = adsField.getAdsDataType().getUpperBound();
+        //boolean encoding16Bit;
+        switch (adsField.getAdsDataType()) {
+            case STRING:
+                //encoding16Bit = false;
+                break;
+            default:
+                throw new IllegalArgumentException(
+                    "Cannot assign string values to " + adsField.getAdsDataType().name() + " fields.");
+        }
+        List<String> stringValues = new LinkedList<>();
+        for (Object value : values) {
+            if (value instanceof String) {
+                String stringValue = (String) value;
+                if (stringValue.length() > maxLength.intValue()) {
+                    throw new IllegalArgumentException(
+                        "String length " + stringValue.length() + " exceeds allowed maximum for type "
+                            + adsField.getAdsDataType().name() + " (max " + maxLength + ")");
+                }
+                stringValues.add(stringValue);
+            }
+            // All other types just translate to max one String character.
+            else if (value instanceof Byte) {
+                Byte byteValue = (Byte) value;
+                byte[] stringBytes = new byte[]{byteValue};
+                /*if (encoding16Bit) {
+                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_16));
+                } else {*/
+                stringValues.add(new String(stringBytes, StandardCharsets.UTF_8));
+                /*}*/
+            } else if (value instanceof Short) {
+                Short shortValue = (Short) value;
+                byte[] stringBytes = new byte[2];
+                stringBytes[0] = (byte) (shortValue >> 8);
+                stringBytes[1] = (byte) (shortValue & 0xFF);
+                /*if (encoding16Bit) {
+                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_16));
+                } else {*/
+                stringValues.add(new String(stringBytes, StandardCharsets.UTF_8));
+                /*}*/
+            } else if (value instanceof Integer) {
+                Integer integerValue = (Integer) value;
+                byte[] stringBytes = new byte[4];
+                stringBytes[0] = (byte) ((integerValue >> 24) & 0xFF);
+                stringBytes[1] = (byte) ((integerValue >> 16) & 0xFF);
+                stringBytes[2] = (byte) ((integerValue >> 8) & 0xFF);
+                stringBytes[3] = (byte) (integerValue & 0xFF);
+                /*if (encoding16Bit) {
+                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_16));
+                } else {*/
+                stringValues.add(new String(stringBytes, StandardCharsets.UTF_8));
+                /*}*/
+            } else if (value instanceof Long) {
+                Long longValue = (Long) value;
+                byte[] stringBytes = new byte[8];
+                stringBytes[0] = (byte) ((longValue >> 56) & 0xFF);
+                stringBytes[1] = (byte) ((longValue >> 48) & 0xFF);
+                stringBytes[2] = (byte) ((longValue >> 40) & 0xFF);
+                stringBytes[3] = (byte) ((longValue >> 32) & 0xFF);
+                stringBytes[4] = (byte) ((longValue >> 24) & 0xFF);
+                stringBytes[5] = (byte) ((longValue >> 16) & 0xFF);
+                stringBytes[6] = (byte) ((longValue >> 8) & 0xFF);
+                stringBytes[7] = (byte) (longValue & 0xFF);
+                /*if (encoding16Bit) {
+                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_16));
+                } else {*/
+                stringValues.add(new String(stringBytes, StandardCharsets.UTF_8));
+                /*}*/
+            } else {
+                throw new IllegalArgumentException(
+                    "Value of type " + value.getClass().getName() +
+                        " is not assignable to " + adsField.getAdsDataType().name() + " fields.");
+            }
+        }
+        return new DefaultStringFieldItem(stringValues.toArray(new String[0]));
+    }
+
+    private BaseDefaultFieldItem internalTimeTemporal(PlcField field, Object[] values) {
+        AdsField adsField = (AdsField) field;
+        switch (adsField.getAdsDataType()) {
+            case TIME:
+            case DATE:
+            case DATE_AND_TIME:
+                break;
+            default:
+                throw new IllegalArgumentException(
+                    "Cannot assign temporal values to " + adsField.getAdsDataType().name() + " fields.");
+        }
+        // TODO: support other types
+        List<LocalTime> localTimeValues = Arrays.stream(values)
+            .filter(LocalTime.class::isInstance)
+            .map(LocalTime.class::cast)
+            .collect(Collectors.toList());
+        return new DefaultLocalTimeFieldItem(localTimeValues.toArray(new LocalTime[0]));
+    }
+
+    private BaseDefaultFieldItem internalDateTemporal(PlcField field, Object[] values) {
+        AdsField adsField = (AdsField) field;
+        switch (adsField.getAdsDataType()) {
+            case TIME:
+            case DATE:
+            case DATE_AND_TIME:
+                break;
+            default:
+                throw new IllegalArgumentException(
+                    "Cannot assign temporal values to " + adsField.getAdsDataType().name() + " fields.");
+        }
+        // TODO: support other types
+        List<LocalDate> localDateValues = Arrays.stream(values)
+            .filter(LocalDate.class::isInstance)
+            .map(LocalDate.class::cast)
+            .collect(Collectors.toList());
+        return new DefaultLocalDateFieldItem(localDateValues.toArray(new LocalDate[0]));
+    }
+
+    private BaseDefaultFieldItem internalDateTimeTemporal(PlcField field, Object[] values) {
+        AdsField adsField = (AdsField) field;
+        Class<? extends BaseDefaultFieldItem> fieldType;
+        switch (adsField.getAdsDataType()) {
+            case TIME:
+                fieldType = DefaultLocalTimeFieldItem.class;
+                break;
+            case DATE:
+                fieldType = DefaultLocalDateFieldItem.class;
+                break;
+            case DATE_AND_TIME:
+                fieldType = DefaultLocalDateTimeFieldItem.class;
+                break;
+            default:
+                throw new IllegalArgumentException(
+                    "Cannot assign temporal values to " + adsField.getAdsDataType().name() + " fields.");
+        }
+        // TODO: add type conversion
+        if (fieldType == DefaultLocalDateTimeFieldItem.class) {
+            return new DefaultLocalDateTimeFieldItem(Arrays.stream(values)
+                .filter(LocalDateTime.class::isInstance)
+                .map(LocalDateTime.class::cast).toArray(LocalDateTime[]::new));
+        } else if (fieldType == DefaultLocalDateFieldItem.class) {
+            return new DefaultLocalDateFieldItem(Arrays.stream(values)
+                .filter(LocalDate.class::isInstance)
+                .map(LocalDate.class::cast).toArray(LocalDate[]::new));
+        } else {
+            return new DefaultLocalTimeFieldItem(Arrays.stream(values)
+                .filter(LocalTime.class::isInstance)
+                .map(LocalTime.class::cast).toArray(LocalTime[]::new));
+        }
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsSubscriptionHandle.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsSubscriptionHandle.java
index e54909717fe..263286cc1c6 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsSubscriptionHandle.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsSubscriptionHandle.java
@@ -1,85 +1,85 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.ads.model;
-
-import org.apache.plc4x.java.ads.api.commands.types.NotificationHandle;
-import org.apache.plc4x.java.base.messages.PlcSubscriber;
-import org.apache.plc4x.java.base.model.DefaultPlcSubscriptionHandle;
-
-import java.util.Objects;
-
-public class AdsSubscriptionHandle extends DefaultPlcSubscriptionHandle {
-
-    private final String plcFieldName;
-
-    private final AdsDataType adsDataType;
-
-    private final NotificationHandle notificationHandle;
-
-    public AdsSubscriptionHandle(PlcSubscriber plcSubscriber, String plcFieldName, AdsDataType adsDataType, NotificationHandle notificationHandle) {
-        super(plcSubscriber);
-        this.plcFieldName = plcFieldName;
-        this.adsDataType = adsDataType;
-        this.notificationHandle = notificationHandle;
-    }
-
-    public String getPlcFieldName() {
-        return plcFieldName;
-    }
-
-    public AdsDataType getAdsDataType() {
-        return adsDataType;
-    }
-
-    public NotificationHandle getNotificationHandle() {
-        return notificationHandle;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof AdsSubscriptionHandle)) {
-            return false;
-        }
-        if (!super.equals(o)) {
-            return false;
-        }
-        AdsSubscriptionHandle that = (AdsSubscriptionHandle) o;
-        return Objects.equals(plcFieldName, that.plcFieldName) &&
-            adsDataType == that.adsDataType &&
-            Objects.equals(notificationHandle, that.notificationHandle);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), plcFieldName, adsDataType, notificationHandle);
-    }
-
-    @Override
-    public String toString() {
-        return "AdsSubscriptionHandle{" +
-            "plcFieldName='" + plcFieldName + '\'' +
-            ", adsDataType=" + adsDataType +
-            ", notificationHandle=" + notificationHandle +
-            "} " + super.toString();
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.ads.model;
+
+import org.apache.plc4x.java.ads.api.commands.types.NotificationHandle;
+import org.apache.plc4x.java.base.messages.PlcSubscriber;
+import org.apache.plc4x.java.base.model.DefaultPlcSubscriptionHandle;
+
+import java.util.Objects;
+
+public class AdsSubscriptionHandle extends DefaultPlcSubscriptionHandle {
+
+    private final String plcFieldName;
+
+    private final AdsDataType adsDataType;
+
+    private final NotificationHandle notificationHandle;
+
+    public AdsSubscriptionHandle(PlcSubscriber plcSubscriber, String plcFieldName, AdsDataType adsDataType, NotificationHandle notificationHandle) {
+        super(plcSubscriber);
+        this.plcFieldName = plcFieldName;
+        this.adsDataType = adsDataType;
+        this.notificationHandle = notificationHandle;
+    }
+
+    public String getPlcFieldName() {
+        return plcFieldName;
+    }
+
+    public AdsDataType getAdsDataType() {
+        return adsDataType;
+    }
+
+    public NotificationHandle getNotificationHandle() {
+        return notificationHandle;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof AdsSubscriptionHandle)) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+        AdsSubscriptionHandle that = (AdsSubscriptionHandle) o;
+        return Objects.equals(plcFieldName, that.plcFieldName) &&
+            adsDataType == that.adsDataType &&
+            Objects.equals(notificationHandle, that.notificationHandle);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), plcFieldName, adsDataType, notificationHandle);
+    }
+
+    @Override
+    public String toString() {
+        return "AdsSubscriptionHandle{" +
+            "plcFieldName='" + plcFieldName + '\'' +
+            ", adsDataType=" + adsDataType +
+            ", notificationHandle=" + notificationHandle +
+            "} " + super.toString();
+    }
+
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/DirectAdsField.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/DirectAdsField.java
index 27bc45f48bc..c7a52f3bc01 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/DirectAdsField.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/DirectAdsField.java
@@ -1,141 +1,141 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.model;
-
-import org.apache.plc4x.java.ads.api.util.ByteValue;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-
-import java.util.Objects;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * ADS address witch is defined by {@code indexGroup/indexOffset}. These values can be either supplied as int or hex
- * representation.
- */
-public class DirectAdsField implements AdsField {
-
-    private static final Pattern RESOURCE_ADDRESS_PATTERN = Pattern.compile("^((0[xX](?<indexGroupHex>[0-9a-fA-F]+))|(?<indexGroup>\\d+))/((0[xX](?<indexOffsetHex>[0-9a-fA-F]+))|(?<indexOffset>\\d+)):(?<adsDataType>\\w+)(\\[(?<numberOfElements>\\d)])?");
-
-    private final long indexGroup;
-
-    private final long indexOffset;
-
-    private final AdsDataType adsDataType;
-
-    private final int numberOfElements;
-
-    private DirectAdsField(long indexGroup, long indexOffset, AdsDataType adsDataType, Integer numberOfElements) {
-        ByteValue.checkUnsignedBounds(indexGroup, 4);
-        this.indexGroup = indexGroup;
-        ByteValue.checkUnsignedBounds(indexOffset, 4);
-        this.indexOffset = indexOffset;
-        this.adsDataType = Objects.requireNonNull(adsDataType);
-        this.numberOfElements = numberOfElements != null ? numberOfElements : 1;
-        if (this.numberOfElements <= 0) {
-            throw new IllegalArgumentException("numberOfElements must be greater then zero. Was " + this.numberOfElements);
-        }
-    }
-
-    public static DirectAdsField of(long indexGroup, long indexOffset, AdsDataType adsDataType, Integer numberOfElements) {
-        return new DirectAdsField(indexGroup, indexOffset, adsDataType, numberOfElements);
-    }
-
-    public static DirectAdsField of(String address) {
-        Matcher matcher = RESOURCE_ADDRESS_PATTERN.matcher(address);
-        if (!matcher.matches()) {
-            throw new PlcInvalidFieldException(address, RESOURCE_ADDRESS_PATTERN, "{indexGroup}/{indexOffset}:{adsDataType}([numberOfElements])?");
-        }
-
-        String indexGroupStringHex = matcher.group("indexGroupHex");
-        String indexGroupString = matcher.group("indexGroup");
-
-        String indexOffsetStringHex = matcher.group("indexOffsetHex");
-        String indexOffsetString = matcher.group("indexOffset");
-
-        long indexGroup;
-        if (indexGroupStringHex != null) {
-            indexGroup = Long.parseLong(indexGroupStringHex, 16);
-        } else {
-            indexGroup = Long.parseLong(indexGroupString);
-        }
-
-        long indexOffset;
-        if (indexOffsetStringHex != null) {
-            indexOffset = Long.parseLong(indexOffsetStringHex, 16);
-        } else {
-            indexOffset = Long.parseLong(indexOffsetString);
-        }
-
-        String adsDataTypeString = matcher.group("adsDataType");
-        AdsDataType adsDataType = AdsDataType.valueOf(adsDataTypeString);
-
-        String numberOfElementsString = matcher.group("numberOfElements");
-        Integer numberOfElements = numberOfElementsString != null ? Integer.valueOf(numberOfElementsString) : null;
-
-        return new DirectAdsField(indexGroup, indexOffset, adsDataType, numberOfElements);
-    }
-
-    public static boolean matches(String address) {
-        return RESOURCE_ADDRESS_PATTERN.matcher(address).matches();
-    }
-
-    public long getIndexGroup() {
-        return indexGroup;
-    }
-
-    public long getIndexOffset() {
-        return indexOffset;
-    }
-
-    @Override
-    public AdsDataType getAdsDataType() {
-        return adsDataType;
-    }
-
-    public int getNumberOfElements() {
-        return numberOfElements;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof DirectAdsField)) {
-            return false;
-        }
-        DirectAdsField that = (DirectAdsField) o;
-        return indexGroup == that.indexGroup &&
-            indexOffset == that.indexOffset;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(indexGroup, indexOffset);
-    }
-
-    @Override
-    public String toString() {
-        return "DirectAdsField{" +
-            "indexGroup=" + indexGroup +
-            ", indexOffset=" + indexOffset +
-            '}';
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.model;
+
+import org.apache.plc4x.java.ads.api.util.ByteValue;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+
+import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * ADS address witch is defined by {@code indexGroup/indexOffset}. These values can be either supplied as int or hex
+ * representation.
+ */
+public class DirectAdsField implements AdsField {
+
+    private static final Pattern RESOURCE_ADDRESS_PATTERN = Pattern.compile("^((0[xX](?<indexGroupHex>[0-9a-fA-F]+))|(?<indexGroup>\\d+))/((0[xX](?<indexOffsetHex>[0-9a-fA-F]+))|(?<indexOffset>\\d+)):(?<adsDataType>\\w+)(\\[(?<numberOfElements>\\d)])?");
+
+    private final long indexGroup;
+
+    private final long indexOffset;
+
+    private final AdsDataType adsDataType;
+
+    private final int numberOfElements;
+
+    private DirectAdsField(long indexGroup, long indexOffset, AdsDataType adsDataType, Integer numberOfElements) {
+        ByteValue.checkUnsignedBounds(indexGroup, 4);
+        this.indexGroup = indexGroup;
+        ByteValue.checkUnsignedBounds(indexOffset, 4);
+        this.indexOffset = indexOffset;
+        this.adsDataType = Objects.requireNonNull(adsDataType);
+        this.numberOfElements = numberOfElements != null ? numberOfElements : 1;
+        if (this.numberOfElements <= 0) {
+            throw new IllegalArgumentException("numberOfElements must be greater then zero. Was " + this.numberOfElements);
+        }
+    }
+
+    public static DirectAdsField of(long indexGroup, long indexOffset, AdsDataType adsDataType, Integer numberOfElements) {
+        return new DirectAdsField(indexGroup, indexOffset, adsDataType, numberOfElements);
+    }
+
+    public static DirectAdsField of(String address) {
+        Matcher matcher = RESOURCE_ADDRESS_PATTERN.matcher(address);
+        if (!matcher.matches()) {
+            throw new PlcInvalidFieldException(address, RESOURCE_ADDRESS_PATTERN, "{indexGroup}/{indexOffset}:{adsDataType}([numberOfElements])?");
+        }
+
+        String indexGroupStringHex = matcher.group("indexGroupHex");
+        String indexGroupString = matcher.group("indexGroup");
+
+        String indexOffsetStringHex = matcher.group("indexOffsetHex");
+        String indexOffsetString = matcher.group("indexOffset");
+
+        long indexGroup;
+        if (indexGroupStringHex != null) {
+            indexGroup = Long.parseLong(indexGroupStringHex, 16);
+        } else {
+            indexGroup = Long.parseLong(indexGroupString);
+        }
+
+        long indexOffset;
+        if (indexOffsetStringHex != null) {
+            indexOffset = Long.parseLong(indexOffsetStringHex, 16);
+        } else {
+            indexOffset = Long.parseLong(indexOffsetString);
+        }
+
+        String adsDataTypeString = matcher.group("adsDataType");
+        AdsDataType adsDataType = AdsDataType.valueOf(adsDataTypeString);
+
+        String numberOfElementsString = matcher.group("numberOfElements");
+        Integer numberOfElements = numberOfElementsString != null ? Integer.valueOf(numberOfElementsString) : null;
+
+        return new DirectAdsField(indexGroup, indexOffset, adsDataType, numberOfElements);
+    }
+
+    public static boolean matches(String address) {
+        return RESOURCE_ADDRESS_PATTERN.matcher(address).matches();
+    }
+
+    public long getIndexGroup() {
+        return indexGroup;
+    }
+
+    public long getIndexOffset() {
+        return indexOffset;
+    }
+
+    @Override
+    public AdsDataType getAdsDataType() {
+        return adsDataType;
+    }
+
+    public int getNumberOfElements() {
+        return numberOfElements;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof DirectAdsField)) {
+            return false;
+        }
+        DirectAdsField that = (DirectAdsField) o;
+        return indexGroup == that.indexGroup &&
+            indexOffset == that.indexOffset;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(indexGroup, indexOffset);
+    }
+
+    @Override
+    public String toString() {
+        return "DirectAdsField{" +
+            "indexGroup=" + indexGroup +
+            ", indexOffset=" + indexOffset +
+            '}';
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/SymbolicAdsField.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/SymbolicAdsField.java
index 52f972054e5..cb6692d60df 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/SymbolicAdsField.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/SymbolicAdsField.java
@@ -1,105 +1,105 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.model;
-
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-
-import java.util.Objects;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * ADS address witch is defined by symbolic name (e.g. {@code Main.items[0]}).
- */
-public class SymbolicAdsField implements AdsField {
-
-    private static final Pattern SYMBOLIC_ADDRESS_PATTERN = Pattern.compile("^(?<symbolicAddress>.+):(?<adsDataType>\\w+)(\\[(?<numberOfElements>\\d)])?");
-
-    private final String symbolicAddress;
-
-    private final AdsDataType adsDataType;
-
-    private final int numberOfElements;
-
-    private SymbolicAdsField(String symbolicAddress, AdsDataType adsDataType, Integer numberOfElements) {
-        this.symbolicAddress = Objects.requireNonNull(symbolicAddress);
-        this.adsDataType = Objects.requireNonNull(adsDataType);
-        this.numberOfElements = numberOfElements != null ? numberOfElements : 1;
-        if (this.numberOfElements <= 0) {
-            throw new IllegalArgumentException("numberOfElements must be greater then zero. Was " + this.numberOfElements);
-        }
-    }
-
-    public static SymbolicAdsField of(String address) {
-        Matcher matcher = SYMBOLIC_ADDRESS_PATTERN.matcher(address);
-        if (!matcher.matches()) {
-            throw new PlcInvalidFieldException(address, SYMBOLIC_ADDRESS_PATTERN, "{address}");
-        }
-        String symbolicAddress = matcher.group("symbolicAddress");
-
-        String adsDataTypeString = matcher.group("adsDataType");
-        AdsDataType adsDataType = AdsDataType.valueOf(adsDataTypeString);
-
-        String numberOfElementsString = matcher.group("numberOfElements");
-        Integer numberOfElements = numberOfElementsString != null ? Integer.valueOf(numberOfElementsString) : null;
-
-        return new SymbolicAdsField(symbolicAddress, adsDataType, numberOfElements);
-    }
-
-    public static boolean matches(String address) {
-        return SYMBOLIC_ADDRESS_PATTERN.matcher(address).matches();
-    }
-
-    public String getSymbolicField() {
-        return symbolicAddress;
-    }
-
-    @Override
-    public AdsDataType getAdsDataType() {
-        return adsDataType;
-    }
-
-    public int getNumberOfElements() {
-        return numberOfElements;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof SymbolicAdsField)) {
-            return false;
-        }
-        SymbolicAdsField that = (SymbolicAdsField) o;
-        return Objects.equals(symbolicAddress, that.symbolicAddress);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(symbolicAddress);
-    }
-
-    @Override
-    public String toString() {
-        return "SymbolicAdsField{" +
-            "symbolicAddress='" + symbolicAddress + '\'' +
-            '}';
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.model;
+
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+
+import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * ADS address witch is defined by symbolic name (e.g. {@code Main.items[0]}).
+ */
+public class SymbolicAdsField implements AdsField {
+
+    private static final Pattern SYMBOLIC_ADDRESS_PATTERN = Pattern.compile("^(?<symbolicAddress>.+):(?<adsDataType>\\w+)(\\[(?<numberOfElements>\\d)])?");
+
+    private final String symbolicAddress;
+
+    private final AdsDataType adsDataType;
+
+    private final int numberOfElements;
+
+    private SymbolicAdsField(String symbolicAddress, AdsDataType adsDataType, Integer numberOfElements) {
+        this.symbolicAddress = Objects.requireNonNull(symbolicAddress);
+        this.adsDataType = Objects.requireNonNull(adsDataType);
+        this.numberOfElements = numberOfElements != null ? numberOfElements : 1;
+        if (this.numberOfElements <= 0) {
+            throw new IllegalArgumentException("numberOfElements must be greater then zero. Was " + this.numberOfElements);
+        }
+    }
+
+    public static SymbolicAdsField of(String address) {
+        Matcher matcher = SYMBOLIC_ADDRESS_PATTERN.matcher(address);
+        if (!matcher.matches()) {
+            throw new PlcInvalidFieldException(address, SYMBOLIC_ADDRESS_PATTERN, "{address}");
+        }
+        String symbolicAddress = matcher.group("symbolicAddress");
+
+        String adsDataTypeString = matcher.group("adsDataType");
+        AdsDataType adsDataType = AdsDataType.valueOf(adsDataTypeString);
+
+        String numberOfElementsString = matcher.group("numberOfElements");
+        Integer numberOfElements = numberOfElementsString != null ? Integer.valueOf(numberOfElementsString) : null;
+
+        return new SymbolicAdsField(symbolicAddress, adsDataType, numberOfElements);
+    }
+
+    public static boolean matches(String address) {
+        return SYMBOLIC_ADDRESS_PATTERN.matcher(address).matches();
+    }
+
+    public String getSymbolicField() {
+        return symbolicAddress;
+    }
+
+    @Override
+    public AdsDataType getAdsDataType() {
+        return adsDataType;
+    }
+
+    public int getNumberOfElements() {
+        return numberOfElements;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof SymbolicAdsField)) {
+            return false;
+        }
+        SymbolicAdsField that = (SymbolicAdsField) o;
+        return Objects.equals(symbolicAddress, that.symbolicAddress);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(symbolicAddress);
+    }
+
+    @Override
+    public String toString() {
+        return "SymbolicAdsField{" +
+            "symbolicAddress='" + symbolicAddress + '\'' +
+            '}';
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/package-info.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/package-info.java
index a99929a83cd..bc6b7336622 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/package-info.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/package-info.java
@@ -1,22 +1,22 @@
-/*
- 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
-
-   http://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.
- */
-/**
- * This package contains plc4x specific modeling.
- */
+/*
+ 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
+
+   http://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.
+ */
+/**
+ * This package contains plc4x specific modeling.
+ */
 package org.apache.plc4x.java.ads.model;
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Ads2PayloadProtocol.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Ads2PayloadProtocol.java
index b8841e344ab..5c14dc532ba 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Ads2PayloadProtocol.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Ads2PayloadProtocol.java
@@ -1,386 +1,386 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.protocol;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToMessageCodec;
-import org.apache.commons.configuration2.Configuration;
-import org.apache.commons.configuration2.SystemConfiguration;
-import org.apache.plc4x.java.ads.api.commands.*;
-import org.apache.plc4x.java.ads.api.commands.types.*;
-import org.apache.plc4x.java.ads.api.generic.AmsHeader;
-import org.apache.plc4x.java.ads.api.generic.AmsPacket;
-import org.apache.plc4x.java.ads.api.generic.types.*;
-import org.apache.plc4x.java.ads.protocol.exception.AdsProtocolOverflowException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-public class Ads2PayloadProtocol extends MessageToMessageCodec<ByteBuf, AmsPacket> {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(Ads2PayloadProtocol.class);
-
-    private static final Configuration CONF = new SystemConfiguration();
-    private static final long MAX_NUM_STAMPS = CONF.getLong("plc4x.ads2payloadprotocol.max_num_stamps", 512L);
-    private static final long MAX_NUM_SAMPLES = CONF.getLong("plc4x.ads2payloadprotocol.max_num_samples", 1024L);
-    private static final long ADS_READ_COMMAND_MAX_BYTES = CONF.getLong("plc4x.ads2payloadprotocol.ads_read_command_max_bytes", 134217728L);
-    private static final long ADS_WRITE_COMMAND_MAX_BYTES = CONF.getLong("plc4x.ads2payloadprotocol.ads_write_command_max_bytes", 134217728L);
-    private static final long ADS_WRITE_CONTROL_COMMAND_MAX_BYTES = CONF.getLong("plc4x.ads2payloadprotocol.ads_write_control_command_max_bytes", 134217728L);
-    private static final long ADS_NOTIFICATION_SAMPLE_MAX_BYTES = CONF.getLong("plc4x.ads2payloadprotocol.ads_notification_sample_max_bytes", 134217728L);
-    private static final long ADS_READ_WRITE_COMMAND_REQUEST_MAX_BYTES = CONF.getLong("plc4x.ads2payloadprotocol.ads_read_write_command_request_max_bytes", 134217728L);
-    private static final long ADS_READ_WRITE_COMMAND_RESPONSE_MAX_BYTES = CONF.getLong("plc4x.ads2payloadprotocol.ads_read_write_command_response_max_bytes", 134217728L);
-
-    private final ConcurrentMap<Invoke, AmsPacket> requests;
-
-    public Ads2PayloadProtocol() {
-        this.requests = new ConcurrentHashMap<>();
-    }
-
-    /**
-     * Resets this protocol and discard all send requests.
-     */
-    public void reset() {
-        requests.clear();
-    }
-
-    @Override
-    protected void encode(ChannelHandlerContext channelHandlerContext, AmsPacket amsPacket, List<Object> out) {
-        LOGGER.trace("(<--OUT): {}, {}, {}", channelHandlerContext, amsPacket, out);
-        Invoke invokeId = amsPacket.getAmsHeader().getInvokeId();
-        if (invokeId != Invoke.NONE) {
-            requests.put(invokeId, amsPacket);
-        }
-        out.add(amsPacket.getByteBuf());
-    }
-
-    @Override
-    protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List<Object> out) {
-        if (byteBuf == Unpooled.EMPTY_BUFFER) {
-            // Cleanup...
-            reset();
-            return;
-        }
-        LOGGER.trace("(-->IN): {}, {}, {}", channelHandlerContext, byteBuf, out);
-        AmsNetId targetAmsNetId = AmsNetId.of(byteBuf);
-        AmsPort targetAmsPort = AmsPort.of(byteBuf);
-        AmsNetId sourceAmsNetId = AmsNetId.of(byteBuf);
-        AmsPort sourceAmsPort = AmsPort.of(byteBuf);
-        Command commandId = Command.of(byteBuf);
-        State stateId = State.of(byteBuf);
-        DataLength dataLength = DataLength.of(byteBuf);
-        AmsError errorCode = AmsError.of(byteBuf);
-        Invoke invoke = Invoke.of(byteBuf);
-        AmsPacket correlatedAmsPacket = requests.remove(invoke);
-        if (correlatedAmsPacket != null) {
-            LOGGER.debug("Correlated packet received {}", correlatedAmsPacket);
-        }
-        if (dataLength.getAsLong() > Integer.MAX_VALUE) {
-            throw new AdsProtocolOverflowException(Integer.class, dataLength.getAsLong());
-        }
-        ByteBuf commandBuffer = byteBuf.readBytes((int) dataLength.getAsLong());
-        AmsHeader amsHeader = AmsHeader.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, commandId, stateId, dataLength, errorCode, invoke);
-        final AmsPacket amsPacket;
-        switch (commandId) {
-            case INVALID:
-                amsPacket = handleInvalidCommand(commandBuffer, amsHeader);
-                break;
-            case ADS_READ_DEVICE_INFO:
-                amsPacket = handleADSReadDeviceInfoCommand(stateId, commandBuffer, amsHeader);
-                break;
-            case ADS_READ:
-                amsPacket = handleADSReadCommand(stateId, commandBuffer, amsHeader);
-                break;
-            case ADS_WRITE:
-                amsPacket = handleADSWriteCommand(stateId, commandBuffer, amsHeader);
-                break;
-            case ADS_READ_STATE:
-                amsPacket = handleADSReadStateCommand(stateId, commandBuffer, amsHeader);
-                break;
-            case ADS_WRITE_CONTROL:
-                amsPacket = handleADSWriteControlCommand(stateId, commandBuffer, amsHeader);
-                break;
-            case ADS_ADD_DEVICE_NOTIFICATION:
-                amsPacket = handleADSAddDeviceNotificationCommand(stateId, commandBuffer, amsHeader);
-                break;
-            case ADS_DELETE_DEVICE_NOTIFICATION:
-                amsPacket = handADSDeleteDeviceNotificationCommand(stateId, commandBuffer, amsHeader);
-                break;
-            case ADS_DEVICE_NOTIFICATION:
-                amsPacket = handleADSDeviceNotificationCommand(stateId, commandBuffer, amsHeader);
-                break;
-            case ADS_READ_WRITE:
-                amsPacket = handleADSReadWriteCommand(stateId, commandBuffer, amsHeader);
-                break;
-            case UNKNOWN:
-            default:
-                amsPacket = handleUnknownCommand(commandBuffer, amsHeader);
-        }
-        LOGGER.debug("Received amsPacket {}", amsPacket);
-        out.add(amsPacket);
-        if (commandBuffer.readableBytes() > 0) {
-            throw new IllegalStateException("Unread bytes left: " + commandBuffer.readableBytes());
-        }
-    }
-
-
-    private AmsPacket handleInvalidCommand(ByteBuf commandBuffer, AmsHeader amsHeader) {
-        return UnknownCommand.of(amsHeader, commandBuffer);
-    }
-
-    private AmsPacket handleADSReadDeviceInfoCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
-        AmsPacket amsPacket;
-        if (stateId.isRequest()) {
-            amsPacket = AdsReadDeviceInfoRequest.of(amsHeader);
-        } else {
-            Result result = Result.of(commandBuffer);
-            MajorVersion majorVersion = MajorVersion.of(commandBuffer);
-            MinorVersion minorVersion = MinorVersion.of(commandBuffer);
-            Version version = Version.of(commandBuffer);
-            Device device = Device.of(commandBuffer);
-            amsPacket = AdsReadDeviceInfoResponse.of(amsHeader, result, majorVersion, minorVersion, version, device);
-        }
-        return amsPacket;
-    }
-
-    private AmsPacket handleADSReadCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
-        AmsPacket amsPacket;
-        if (stateId.isRequest()) {
-            IndexGroup indexGroup = IndexGroup.of(commandBuffer);
-            IndexOffset indexOffset = IndexOffset.of(commandBuffer);
-            Length length = Length.of(commandBuffer);
-            amsPacket = AdsReadRequest.of(amsHeader, indexGroup, indexOffset, length);
-        } else {
-            Result result = Result.of(commandBuffer);
-            Length length = Length.of(commandBuffer);
-            if (length.getAsLong() > Integer.MAX_VALUE) {
-                throw new AdsProtocolOverflowException(Integer.class, length.getAsLong());
-            }
-            if (length.getAsLong() > ADS_READ_COMMAND_MAX_BYTES) {
-                throw new AdsProtocolOverflowException("ADS_READ_COMMAND_MAX_BYTES", ADS_READ_COMMAND_MAX_BYTES, length.getAsLong());
-            }
-            byte[] dataToRead = new byte[(int) length.getAsLong()];
-            commandBuffer.readBytes(dataToRead);
-            Data data = Data.of(dataToRead);
-            amsPacket = AdsReadResponse.of(amsHeader, result, length, data);
-        }
-        return amsPacket;
-    }
-
-    private AmsPacket handleADSWriteCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
-        AmsPacket amsPacket;
-        if (stateId.isRequest()) {
-            IndexGroup indexGroup = IndexGroup.of(commandBuffer);
-            IndexOffset indexOffset = IndexOffset.of(commandBuffer);
-            Length length = Length.of(commandBuffer);
-            if (length.getAsLong() > Integer.MAX_VALUE) {
-                throw new AdsProtocolOverflowException(Integer.class, length.getAsLong());
-            }
-            if (length.getAsLong() > ADS_WRITE_COMMAND_MAX_BYTES) {
-                throw new AdsProtocolOverflowException("ADS_WRITE_COMMAND_MAX_BYTES", ADS_WRITE_COMMAND_MAX_BYTES, length.getAsLong());
-            }
-            byte[] dataToRead = new byte[(int) length.getAsLong()];
-            commandBuffer.readBytes(dataToRead);
-            Data data = Data.of(dataToRead);
-            amsPacket = AdsWriteRequest.of(amsHeader, indexGroup, indexOffset, length, data);
-        } else {
-            Result result = Result.of(commandBuffer);
-            amsPacket = AdsWriteResponse.of(amsHeader, result);
-        }
-        return amsPacket;
-    }
-
-
-    private AmsPacket handleADSReadStateCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
-        AmsPacket amsPacket;
-        if (stateId.isRequest()) {
-            amsPacket = AdsReadStateRequest.of(amsHeader);
-        } else {
-            Result result = Result.of(commandBuffer);
-            AdsState adsState = AdsState.of(commandBuffer);
-            DeviceState deviceState = DeviceState.of(commandBuffer);
-            amsPacket = AdsReadStateResponse.of(amsHeader, result, adsState, deviceState);
-        }
-        return amsPacket;
-    }
-
-    private AmsPacket handleADSWriteControlCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
-        AmsPacket amsPacket;
-        if (stateId.isRequest()) {
-            AdsState adsState = AdsState.of(commandBuffer);
-            DeviceState deviceState = DeviceState.of(commandBuffer);
-            Length length = Length.of(commandBuffer);
-            if (length.getAsLong() > Integer.MAX_VALUE) {
-                throw new AdsProtocolOverflowException(Integer.class, length.getAsLong());
-            }
-            if (length.getAsLong() > ADS_WRITE_CONTROL_COMMAND_MAX_BYTES) {
-                throw new AdsProtocolOverflowException("ADS_WRITE_CONTROL_COMMAND_MAX_BYTES", ADS_WRITE_CONTROL_COMMAND_MAX_BYTES, length.getAsLong());
-            }
-            byte[] dataToRead = new byte[(int) length.getAsLong()];
-            commandBuffer.readBytes(dataToRead);
-            Data data = Data.of(dataToRead);
-            amsPacket = AdsWriteControlRequest.of(amsHeader, adsState, deviceState, length, data);
-        } else {
-            Result result = Result.of(commandBuffer);
-            amsPacket = AdsWriteControlResponse.of(amsHeader, result);
-        }
-        return amsPacket;
-    }
-
-    private AmsPacket handleADSAddDeviceNotificationCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
-        AmsPacket amsPacket;
-        if (stateId.isRequest()) {
-            IndexGroup indexGroup = IndexGroup.of(commandBuffer);
-            IndexOffset indexOffset = IndexOffset.of(commandBuffer);
-            Length length = Length.of(commandBuffer);
-            TransmissionMode transmissionMode = TransmissionMode.of(commandBuffer);
-            MaxDelay maxDelay = MaxDelay.of(commandBuffer);
-            CycleTime cycleTime = CycleTime.of(commandBuffer);
-            commandBuffer.skipBytes(AdsAddDeviceNotificationRequest.Reserved.NUM_BYTES);
-            amsPacket = AdsAddDeviceNotificationRequest.of(amsHeader, indexGroup, indexOffset, length, transmissionMode, maxDelay, cycleTime);
-        } else {
-            Result result = Result.of(commandBuffer);
-            NotificationHandle notificationHandle = NotificationHandle.of(commandBuffer);
-            amsPacket = AdsAddDeviceNotificationResponse.of(amsHeader, result, notificationHandle);
-        }
-        return amsPacket;
-    }
-
-    private AmsPacket handADSDeleteDeviceNotificationCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
-        AmsPacket amsPacket;
-        if (stateId.isRequest()) {
-            NotificationHandle notificationHandle = NotificationHandle.of(commandBuffer);
-            amsPacket = AdsDeleteDeviceNotificationRequest.of(amsHeader, notificationHandle);
-        } else {
-            Result result = Result.of(commandBuffer);
-            amsPacket = AdsDeleteDeviceNotificationResponse.of(amsHeader, result);
-        }
-        return amsPacket;
-    }
-
-    private AmsPacket handleADSDeviceNotificationCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
-        AmsPacket amsPacket;
-        if (stateId.isRequest()) {
-            Length length = Length.of(commandBuffer);
-            if (length.getAsLong() > Integer.MAX_VALUE) {
-                throw new AdsProtocolOverflowException(Integer.class, length.getAsLong());
-            }
-            Stamps stamps = Stamps.of(commandBuffer);
-            if (stamps.getAsLong() > Integer.MAX_VALUE) {
-                throw new AdsProtocolOverflowException(Integer.class, stamps.getAsLong());
-            }
-            // Note: the length includes the 4 Bytes of stamps which we read already so we substract.
-            ByteBuf adsDeviceNotificationBuffer = commandBuffer.readBytes((int) length.getAsLong() - Stamps.NUM_BYTES);
-            List<AdsStampHeader> adsStampHeaders = new ArrayList<>((int) stamps.getAsLong());
-            if (stamps.getAsLong() > MAX_NUM_STAMPS) {
-                throw new AdsProtocolOverflowException("MAX_NUM_STAMPS", MAX_NUM_STAMPS, length.getAsLong());
-            }
-            for (int i = 1; i <= stamps.getAsLong(); i++) {
-                AdsStampHeader adsStampHeader = handleStampHeader(adsDeviceNotificationBuffer);
-                adsStampHeaders.add(adsStampHeader);
-            }
-            amsPacket = AdsDeviceNotificationRequest.of(amsHeader, length, stamps, adsStampHeaders);
-        } else {
-            amsPacket = UnknownCommand.of(amsHeader, commandBuffer);
-        }
-        return amsPacket;
-    }
-
-    private AdsStampHeader handleStampHeader(ByteBuf adsDeviceNotificationBuffer) {
-        TimeStamp timeStamp = TimeStamp.of(adsDeviceNotificationBuffer);
-        Samples samples = Samples.of(adsDeviceNotificationBuffer);
-
-        List<AdsNotificationSample> adsNotificationSamples = new LinkedList<>();
-        if (samples.getAsLong() > MAX_NUM_SAMPLES) {
-            throw new AdsProtocolOverflowException("MAX_NUM_SAMPLES", MAX_NUM_SAMPLES, samples.getAsLong());
-        }
-        for (int i = 1; i <= samples.getAsLong(); i++) {
-            AdsNotificationSample adsNotificationSample = handleAdsNotificartionSample(adsDeviceNotificationBuffer);
-            adsNotificationSamples.add(adsNotificationSample);
-
-        }
-        return AdsStampHeader.of(timeStamp, samples, adsNotificationSamples);
-    }
-
-    private AdsNotificationSample handleAdsNotificartionSample(ByteBuf adsDeviceNotificationBuffer) {
-        NotificationHandle notificationHandle = NotificationHandle.of(adsDeviceNotificationBuffer);
-        SampleSize sampleSize = SampleSize.of(adsDeviceNotificationBuffer);
-        if (sampleSize.getAsLong() > Integer.MAX_VALUE) {
-            throw new AdsProtocolOverflowException(Integer.class, sampleSize.getAsLong());
-        }
-        if (sampleSize.getAsLong() > ADS_NOTIFICATION_SAMPLE_MAX_BYTES) {
-            throw new AdsProtocolOverflowException("ADS_NOTIFICATION_SAMPLE_MAX_BYTES", ADS_NOTIFICATION_SAMPLE_MAX_BYTES, sampleSize.getAsLong());
-        }
-        // TODO: do we need a special marker class for: Notice: If your handle becomes invalid, one notification without data will be send once as advice.
-        byte[] dataToRead = new byte[(int) sampleSize.getAsLong()];
-        adsDeviceNotificationBuffer.readBytes(dataToRead);
-        Data data = Data.of(dataToRead);
-        return AdsNotificationSample.of(notificationHandle, sampleSize, data);
-    }
-
-    private AmsPacket handleADSReadWriteCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
-        AmsPacket amsPacket;
-        if (stateId.isRequest()) {
-            IndexGroup indexGroup = IndexGroup.of(commandBuffer);
-            IndexOffset indexOffset = IndexOffset.of(commandBuffer);
-            ReadLength readLength = ReadLength.of(commandBuffer);
-            if (readLength.getAsLong() > Integer.MAX_VALUE) {
-                throw new AdsProtocolOverflowException(Integer.class, readLength.getAsLong());
-            }
-            WriteLength writeLength = WriteLength.of(commandBuffer);
-            if (writeLength.getAsLong() > Integer.MAX_VALUE) {
-                throw new AdsProtocolOverflowException(Integer.class, writeLength.getAsLong());
-            }
-            if (readLength.getAsLong() + writeLength.getAsLong() > Integer.MAX_VALUE) {
-                throw new AdsProtocolOverflowException(Integer.class, readLength.getAsLong() + writeLength.getAsLong());
-            }
-            if (readLength.getAsLong() > ADS_READ_WRITE_COMMAND_REQUEST_MAX_BYTES) {
-                throw new AdsProtocolOverflowException("ADS_READ_WRITE_COMMAND_REQUEST_MAX_BYTES", ADS_READ_WRITE_COMMAND_REQUEST_MAX_BYTES, readLength.getAsLong());
-            }
-            byte[] dataToRead = new byte[(int) readLength.getAsLong()];
-            commandBuffer.readBytes(dataToRead);
-            Data data = Data.of(dataToRead);
-            amsPacket = AdsReadWriteRequest.of(amsHeader, indexGroup, indexOffset, readLength, writeLength, data);
-        } else {
-            Result result = Result.of(commandBuffer);
-            Length length = Length.of(commandBuffer);
-            if (length.getAsLong() > Integer.MAX_VALUE) {
-                throw new AdsProtocolOverflowException(Integer.class, length.getAsLong());
-            }
-            if (length.getAsLong() > ADS_READ_WRITE_COMMAND_RESPONSE_MAX_BYTES) {
-                throw new AdsProtocolOverflowException("ADS_READ_WRITE_COMMAND_RESPONSE_MAX_BYTES", ADS_READ_WRITE_COMMAND_RESPONSE_MAX_BYTES, length.getAsLong());
-            }
-            byte[] dataToRead = new byte[(int) length.getAsLong()];
-            commandBuffer.readBytes(dataToRead);
-            Data data = Data.of(dataToRead);
-            amsPacket = AdsReadWriteResponse.of(amsHeader, result, length, data);
-        }
-        return amsPacket;
-    }
-
-    private AmsPacket handleUnknownCommand(ByteBuf commandBuffer, AmsHeader amsHeader) {
-        return UnknownCommand.of(amsHeader, commandBuffer);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.protocol;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageCodec;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.SystemConfiguration;
+import org.apache.plc4x.java.ads.api.commands.*;
+import org.apache.plc4x.java.ads.api.commands.types.*;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.AmsPacket;
+import org.apache.plc4x.java.ads.api.generic.types.*;
+import org.apache.plc4x.java.ads.protocol.exception.AdsProtocolOverflowException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+public class Ads2PayloadProtocol extends MessageToMessageCodec<ByteBuf, AmsPacket> {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(Ads2PayloadProtocol.class);
+
+    private static final Configuration CONF = new SystemConfiguration();
+    private static final long MAX_NUM_STAMPS = CONF.getLong("plc4x.ads2payloadprotocol.max_num_stamps", 512L);
+    private static final long MAX_NUM_SAMPLES = CONF.getLong("plc4x.ads2payloadprotocol.max_num_samples", 1024L);
+    private static final long ADS_READ_COMMAND_MAX_BYTES = CONF.getLong("plc4x.ads2payloadprotocol.ads_read_command_max_bytes", 134217728L);
+    private static final long ADS_WRITE_COMMAND_MAX_BYTES = CONF.getLong("plc4x.ads2payloadprotocol.ads_write_command_max_bytes", 134217728L);
+    private static final long ADS_WRITE_CONTROL_COMMAND_MAX_BYTES = CONF.getLong("plc4x.ads2payloadprotocol.ads_write_control_command_max_bytes", 134217728L);
+    private static final long ADS_NOTIFICATION_SAMPLE_MAX_BYTES = CONF.getLong("plc4x.ads2payloadprotocol.ads_notification_sample_max_bytes", 134217728L);
+    private static final long ADS_READ_WRITE_COMMAND_REQUEST_MAX_BYTES = CONF.getLong("plc4x.ads2payloadprotocol.ads_read_write_command_request_max_bytes", 134217728L);
+    private static final long ADS_READ_WRITE_COMMAND_RESPONSE_MAX_BYTES = CONF.getLong("plc4x.ads2payloadprotocol.ads_read_write_command_response_max_bytes", 134217728L);
+
+    private final ConcurrentMap<Invoke, AmsPacket> requests;
+
+    public Ads2PayloadProtocol() {
+        this.requests = new ConcurrentHashMap<>();
+    }
+
+    /**
+     * Resets this protocol and discard all send requests.
+     */
+    public void reset() {
+        requests.clear();
+    }
+
+    @Override
+    protected void encode(ChannelHandlerContext channelHandlerContext, AmsPacket amsPacket, List<Object> out) {
+        LOGGER.trace("(<--OUT): {}, {}, {}", channelHandlerContext, amsPacket, out);
+        Invoke invokeId = amsPacket.getAmsHeader().getInvokeId();
+        if (invokeId != Invoke.NONE) {
+            requests.put(invokeId, amsPacket);
+        }
+        out.add(amsPacket.getByteBuf());
+    }
+
+    @Override
+    protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List<Object> out) {
+        if (byteBuf == Unpooled.EMPTY_BUFFER) {
+            // Cleanup...
+            reset();
+            return;
+        }
+        LOGGER.trace("(-->IN): {}, {}, {}", channelHandlerContext, byteBuf, out);
+        AmsNetId targetAmsNetId = AmsNetId.of(byteBuf);
+        AmsPort targetAmsPort = AmsPort.of(byteBuf);
+        AmsNetId sourceAmsNetId = AmsNetId.of(byteBuf);
+        AmsPort sourceAmsPort = AmsPort.of(byteBuf);
+        Command commandId = Command.of(byteBuf);
+        State stateId = State.of(byteBuf);
+        DataLength dataLength = DataLength.of(byteBuf);
+        AmsError errorCode = AmsError.of(byteBuf);
+        Invoke invoke = Invoke.of(byteBuf);
+        AmsPacket correlatedAmsPacket = requests.remove(invoke);
+        if (correlatedAmsPacket != null) {
+            LOGGER.debug("Correlated packet received {}", correlatedAmsPacket);
+        }
+        if (dataLength.getAsLong() > Integer.MAX_VALUE) {
+            throw new AdsProtocolOverflowException(Integer.class, dataLength.getAsLong());
+        }
+        ByteBuf commandBuffer = byteBuf.readBytes((int) dataLength.getAsLong());
+        AmsHeader amsHeader = AmsHeader.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, commandId, stateId, dataLength, errorCode, invoke);
+        final AmsPacket amsPacket;
+        switch (commandId) {
+            case INVALID:
+                amsPacket = handleInvalidCommand(commandBuffer, amsHeader);
+                break;
+            case ADS_READ_DEVICE_INFO:
+                amsPacket = handleADSReadDeviceInfoCommand(stateId, commandBuffer, amsHeader);
+                break;
+            case ADS_READ:
+                amsPacket = handleADSReadCommand(stateId, commandBuffer, amsHeader);
+                break;
+            case ADS_WRITE:
+                amsPacket = handleADSWriteCommand(stateId, commandBuffer, amsHeader);
+                break;
+            case ADS_READ_STATE:
+                amsPacket = handleADSReadStateCommand(stateId, commandBuffer, amsHeader);
+                break;
+            case ADS_WRITE_CONTROL:
+                amsPacket = handleADSWriteControlCommand(stateId, commandBuffer, amsHeader);
+                break;
+            case ADS_ADD_DEVICE_NOTIFICATION:
+                amsPacket = handleADSAddDeviceNotificationCommand(stateId, commandBuffer, amsHeader);
+                break;
+            case ADS_DELETE_DEVICE_NOTIFICATION:
+                amsPacket = handADSDeleteDeviceNotificationCommand(stateId, commandBuffer, amsHeader);
+                break;
+            case ADS_DEVICE_NOTIFICATION:
+                amsPacket = handleADSDeviceNotificationCommand(stateId, commandBuffer, amsHeader);
+                break;
+            case ADS_READ_WRITE:
+                amsPacket = handleADSReadWriteCommand(stateId, commandBuffer, amsHeader);
+                break;
+            case UNKNOWN:
+            default:
+                amsPacket = handleUnknownCommand(commandBuffer, amsHeader);
+        }
+        LOGGER.debug("Received amsPacket {}", amsPacket);
+        out.add(amsPacket);
+        if (commandBuffer.readableBytes() > 0) {
+            throw new IllegalStateException("Unread bytes left: " + commandBuffer.readableBytes());
+        }
+    }
+
+
+    private AmsPacket handleInvalidCommand(ByteBuf commandBuffer, AmsHeader amsHeader) {
+        return UnknownCommand.of(amsHeader, commandBuffer);
+    }
+
+    private AmsPacket handleADSReadDeviceInfoCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
+        AmsPacket amsPacket;
+        if (stateId.isRequest()) {
+            amsPacket = AdsReadDeviceInfoRequest.of(amsHeader);
+        } else {
+            Result result = Result.of(commandBuffer);
+            MajorVersion majorVersion = MajorVersion.of(commandBuffer);
+            MinorVersion minorVersion = MinorVersion.of(commandBuffer);
+            Version version = Version.of(commandBuffer);
+            Device device = Device.of(commandBuffer);
+            amsPacket = AdsReadDeviceInfoResponse.of(amsHeader, result, majorVersion, minorVersion, version, device);
+        }
+        return amsPacket;
+    }
+
+    private AmsPacket handleADSReadCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
+        AmsPacket amsPacket;
+        if (stateId.isRequest()) {
+            IndexGroup indexGroup = IndexGroup.of(commandBuffer);
+            IndexOffset indexOffset = IndexOffset.of(commandBuffer);
+            Length length = Length.of(commandBuffer);
+            amsPacket = AdsReadRequest.of(amsHeader, indexGroup, indexOffset, length);
+        } else {
+            Result result = Result.of(commandBuffer);
+            Length length = Length.of(commandBuffer);
+            if (length.getAsLong() > Integer.MAX_VALUE) {
+                throw new AdsProtocolOverflowException(Integer.class, length.getAsLong());
+            }
+            if (length.getAsLong() > ADS_READ_COMMAND_MAX_BYTES) {
+                throw new AdsProtocolOverflowException("ADS_READ_COMMAND_MAX_BYTES", ADS_READ_COMMAND_MAX_BYTES, length.getAsLong());
+            }
+            byte[] dataToRead = new byte[(int) length.getAsLong()];
+            commandBuffer.readBytes(dataToRead);
+            Data data = Data.of(dataToRead);
+            amsPacket = AdsReadResponse.of(amsHeader, result, length, data);
+        }
+        return amsPacket;
+    }
+
+    private AmsPacket handleADSWriteCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
+        AmsPacket amsPacket;
+        if (stateId.isRequest()) {
+            IndexGroup indexGroup = IndexGroup.of(commandBuffer);
+            IndexOffset indexOffset = IndexOffset.of(commandBuffer);
+            Length length = Length.of(commandBuffer);
+            if (length.getAsLong() > Integer.MAX_VALUE) {
+                throw new AdsProtocolOverflowException(Integer.class, length.getAsLong());
+            }
+            if (length.getAsLong() > ADS_WRITE_COMMAND_MAX_BYTES) {
+                throw new AdsProtocolOverflowException("ADS_WRITE_COMMAND_MAX_BYTES", ADS_WRITE_COMMAND_MAX_BYTES, length.getAsLong());
+            }
+            byte[] dataToRead = new byte[(int) length.getAsLong()];
+            commandBuffer.readBytes(dataToRead);
+            Data data = Data.of(dataToRead);
+            amsPacket = AdsWriteRequest.of(amsHeader, indexGroup, indexOffset, length, data);
+        } else {
+            Result result = Result.of(commandBuffer);
+            amsPacket = AdsWriteResponse.of(amsHeader, result);
+        }
+        return amsPacket;
+    }
+
+
+    private AmsPacket handleADSReadStateCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
+        AmsPacket amsPacket;
+        if (stateId.isRequest()) {
+            amsPacket = AdsReadStateRequest.of(amsHeader);
+        } else {
+            Result result = Result.of(commandBuffer);
+            AdsState adsState = AdsState.of(commandBuffer);
+            DeviceState deviceState = DeviceState.of(commandBuffer);
+            amsPacket = AdsReadStateResponse.of(amsHeader, result, adsState, deviceState);
+        }
+        return amsPacket;
+    }
+
+    private AmsPacket handleADSWriteControlCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
+        AmsPacket amsPacket;
+        if (stateId.isRequest()) {
+            AdsState adsState = AdsState.of(commandBuffer);
+            DeviceState deviceState = DeviceState.of(commandBuffer);
+            Length length = Length.of(commandBuffer);
+            if (length.getAsLong() > Integer.MAX_VALUE) {
+                throw new AdsProtocolOverflowException(Integer.class, length.getAsLong());
+            }
+            if (length.getAsLong() > ADS_WRITE_CONTROL_COMMAND_MAX_BYTES) {
+                throw new AdsProtocolOverflowException("ADS_WRITE_CONTROL_COMMAND_MAX_BYTES", ADS_WRITE_CONTROL_COMMAND_MAX_BYTES, length.getAsLong());
+            }
+            byte[] dataToRead = new byte[(int) length.getAsLong()];
+            commandBuffer.readBytes(dataToRead);
+            Data data = Data.of(dataToRead);
+            amsPacket = AdsWriteControlRequest.of(amsHeader, adsState, deviceState, length, data);
+        } else {
+            Result result = Result.of(commandBuffer);
+            amsPacket = AdsWriteControlResponse.of(amsHeader, result);
+        }
+        return amsPacket;
+    }
+
+    private AmsPacket handleADSAddDeviceNotificationCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
+        AmsPacket amsPacket;
+        if (stateId.isRequest()) {
+            IndexGroup indexGroup = IndexGroup.of(commandBuffer);
+            IndexOffset indexOffset = IndexOffset.of(commandBuffer);
+            Length length = Length.of(commandBuffer);
+            TransmissionMode transmissionMode = TransmissionMode.of(commandBuffer);
+            MaxDelay maxDelay = MaxDelay.of(commandBuffer);
+            CycleTime cycleTime = CycleTime.of(commandBuffer);
+            commandBuffer.skipBytes(AdsAddDeviceNotificationRequest.Reserved.NUM_BYTES);
+            amsPacket = AdsAddDeviceNotificationRequest.of(amsHeader, indexGroup, indexOffset, length, transmissionMode, maxDelay, cycleTime);
+        } else {
+            Result result = Result.of(commandBuffer);
+            NotificationHandle notificationHandle = NotificationHandle.of(commandBuffer);
+            amsPacket = AdsAddDeviceNotificationResponse.of(amsHeader, result, notificationHandle);
+        }
+        return amsPacket;
+    }
+
+    private AmsPacket handADSDeleteDeviceNotificationCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
+        AmsPacket amsPacket;
+        if (stateId.isRequest()) {
+            NotificationHandle notificationHandle = NotificationHandle.of(commandBuffer);
+            amsPacket = AdsDeleteDeviceNotificationRequest.of(amsHeader, notificationHandle);
+        } else {
+            Result result = Result.of(commandBuffer);
+            amsPacket = AdsDeleteDeviceNotificationResponse.of(amsHeader, result);
+        }
+        return amsPacket;
+    }
+
+    private AmsPacket handleADSDeviceNotificationCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
+        AmsPacket amsPacket;
+        if (stateId.isRequest()) {
+            Length length = Length.of(commandBuffer);
+            if (length.getAsLong() > Integer.MAX_VALUE) {
+                throw new AdsProtocolOverflowException(Integer.class, length.getAsLong());
+            }
+            Stamps stamps = Stamps.of(commandBuffer);
+            if (stamps.getAsLong() > Integer.MAX_VALUE) {
+                throw new AdsProtocolOverflowException(Integer.class, stamps.getAsLong());
+            }
+            // Note: the length includes the 4 Bytes of stamps which we read already so we substract.
+            ByteBuf adsDeviceNotificationBuffer = commandBuffer.readBytes((int) length.getAsLong() - Stamps.NUM_BYTES);
+            List<AdsStampHeader> adsStampHeaders = new ArrayList<>((int) stamps.getAsLong());
+            if (stamps.getAsLong() > MAX_NUM_STAMPS) {
+                throw new AdsProtocolOverflowException("MAX_NUM_STAMPS", MAX_NUM_STAMPS, length.getAsLong());
+            }
+            for (int i = 1; i <= stamps.getAsLong(); i++) {
+                AdsStampHeader adsStampHeader = handleStampHeader(adsDeviceNotificationBuffer);
+                adsStampHeaders.add(adsStampHeader);
+            }
+            amsPacket = AdsDeviceNotificationRequest.of(amsHeader, length, stamps, adsStampHeaders);
+        } else {
+            amsPacket = UnknownCommand.of(amsHeader, commandBuffer);
+        }
+        return amsPacket;
+    }
+
+    private AdsStampHeader handleStampHeader(ByteBuf adsDeviceNotificationBuffer) {
+        TimeStamp timeStamp = TimeStamp.of(adsDeviceNotificationBuffer);
+        Samples samples = Samples.of(adsDeviceNotificationBuffer);
+
+        List<AdsNotificationSample> adsNotificationSamples = new LinkedList<>();
+        if (samples.getAsLong() > MAX_NUM_SAMPLES) {
+            throw new AdsProtocolOverflowException("MAX_NUM_SAMPLES", MAX_NUM_SAMPLES, samples.getAsLong());
+        }
+        for (int i = 1; i <= samples.getAsLong(); i++) {
+            AdsNotificationSample adsNotificationSample = handleAdsNotificartionSample(adsDeviceNotificationBuffer);
+            adsNotificationSamples.add(adsNotificationSample);
+
+        }
+        return AdsStampHeader.of(timeStamp, samples, adsNotificationSamples);
+    }
+
+    private AdsNotificationSample handleAdsNotificartionSample(ByteBuf adsDeviceNotificationBuffer) {
+        NotificationHandle notificationHandle = NotificationHandle.of(adsDeviceNotificationBuffer);
+        SampleSize sampleSize = SampleSize.of(adsDeviceNotificationBuffer);
+        if (sampleSize.getAsLong() > Integer.MAX_VALUE) {
+            throw new AdsProtocolOverflowException(Integer.class, sampleSize.getAsLong());
+        }
+        if (sampleSize.getAsLong() > ADS_NOTIFICATION_SAMPLE_MAX_BYTES) {
+            throw new AdsProtocolOverflowException("ADS_NOTIFICATION_SAMPLE_MAX_BYTES", ADS_NOTIFICATION_SAMPLE_MAX_BYTES, sampleSize.getAsLong());
+        }
+        // TODO: do we need a special marker class for: Notice: If your handle becomes invalid, one notification without data will be send once as advice.
+        byte[] dataToRead = new byte[(int) sampleSize.getAsLong()];
+        adsDeviceNotificationBuffer.readBytes(dataToRead);
+        Data data = Data.of(dataToRead);
+        return AdsNotificationSample.of(notificationHandle, sampleSize, data);
+    }
+
+    private AmsPacket handleADSReadWriteCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
+        AmsPacket amsPacket;
+        if (stateId.isRequest()) {
+            IndexGroup indexGroup = IndexGroup.of(commandBuffer);
+            IndexOffset indexOffset = IndexOffset.of(commandBuffer);
+            ReadLength readLength = ReadLength.of(commandBuffer);
+            if (readLength.getAsLong() > Integer.MAX_VALUE) {
+                throw new AdsProtocolOverflowException(Integer.class, readLength.getAsLong());
+            }
+            WriteLength writeLength = WriteLength.of(commandBuffer);
+            if (writeLength.getAsLong() > Integer.MAX_VALUE) {
+                throw new AdsProtocolOverflowException(Integer.class, writeLength.getAsLong());
+            }
+            if (readLength.getAsLong() + writeLength.getAsLong() > Integer.MAX_VALUE) {
+                throw new AdsProtocolOverflowException(Integer.class, readLength.getAsLong() + writeLength.getAsLong());
+            }
+            if (readLength.getAsLong() > ADS_READ_WRITE_COMMAND_REQUEST_MAX_BYTES) {
+                throw new AdsProtocolOverflowException("ADS_READ_WRITE_COMMAND_REQUEST_MAX_BYTES", ADS_READ_WRITE_COMMAND_REQUEST_MAX_BYTES, readLength.getAsLong());
+            }
+            byte[] dataToRead = new byte[(int) readLength.getAsLong()];
+            commandBuffer.readBytes(dataToRead);
+            Data data = Data.of(dataToRead);
+            amsPacket = AdsReadWriteRequest.of(amsHeader, indexGroup, indexOffset, readLength, writeLength, data);
+        } else {
+            Result result = Result.of(commandBuffer);
+            Length length = Length.of(commandBuffer);
+            if (length.getAsLong() > Integer.MAX_VALUE) {
+                throw new AdsProtocolOverflowException(Integer.class, length.getAsLong());
+            }
+            if (length.getAsLong() > ADS_READ_WRITE_COMMAND_RESPONSE_MAX_BYTES) {
+                throw new AdsProtocolOverflowException("ADS_READ_WRITE_COMMAND_RESPONSE_MAX_BYTES", ADS_READ_WRITE_COMMAND_RESPONSE_MAX_BYTES, length.getAsLong());
+            }
+            byte[] dataToRead = new byte[(int) length.getAsLong()];
+            commandBuffer.readBytes(dataToRead);
+            Data data = Data.of(dataToRead);
+            amsPacket = AdsReadWriteResponse.of(amsHeader, result, length, data);
+        }
+        return amsPacket;
+    }
+
+    private AmsPacket handleUnknownCommand(ByteBuf commandBuffer, AmsHeader amsHeader) {
+        return UnknownCommand.of(amsHeader, commandBuffer);
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Payload2SerialProtocol.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Payload2SerialProtocol.java
index ee57d0f2f61..2cc250ffdbd 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Payload2SerialProtocol.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Payload2SerialProtocol.java
@@ -1,176 +1,176 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.protocol;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToMessageCodec;
-import io.netty.util.ReferenceCountUtil;
-import io.netty.util.concurrent.ScheduledFuture;
-import org.apache.commons.lang3.mutable.MutableInt;
-import org.apache.plc4x.java.ads.api.serial.AmsSerialAcknowledgeFrame;
-import org.apache.plc4x.java.ads.api.serial.AmsSerialFrame;
-import org.apache.plc4x.java.ads.api.serial.AmsSerialResetFrame;
-import org.apache.plc4x.java.ads.api.serial.types.*;
-import org.apache.plc4x.java.ads.protocol.util.DigestUtil;
-import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
-import org.apache.plc4x.java.api.exceptions.PlcProtocolPayloadTooBigException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-
-public class Payload2SerialProtocol extends MessageToMessageCodec<ByteBuf, ByteBuf> {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(Payload2SerialProtocol.class);
-
-    private final AtomicInteger fragmentCounter = new AtomicInteger(0);
-
-    private AtomicReference<ScheduledFuture<?>> currentRetryer = new AtomicReference<>();
-
-    @Override
-    protected void encode(ChannelHandlerContext channelHandlerContext, ByteBuf amsPacket, List<Object> out) throws PlcProtocolPayloadTooBigException {
-        if (amsPacket == Unpooled.EMPTY_BUFFER) {
-            // Cleanup...
-            ScheduledFuture<?> scheduledFuture = currentRetryer.get();
-            if (scheduledFuture != null) {
-                scheduledFuture.cancel(true);
-            }
-            return;
-        }
-        LOGGER.trace("(<--OUT): {}, {}, {}", channelHandlerContext, amsPacket, out);
-        int fragmentNumber = fragmentCounter.getAndUpdate(value -> value > 255 ? 0 : ++value);
-        LOGGER.debug("Using fragmentNumber {} for {}", fragmentNumber, amsPacket);
-        UserData userData = UserData.of(amsPacket);
-        if (userData.getCalculatedLength() > 255) {
-            throw new PlcProtocolPayloadTooBigException("ADS/AMS", 255, (int) userData.getCalculatedLength(), amsPacket);
-        }
-        AmsSerialFrame amsSerialFrame = AmsSerialFrame.of(FragmentNumber.of((byte) fragmentNumber), userData);
-
-        MutableInt retryCount = new MutableInt(0);
-        ScheduledFuture<?> oldRetryer = currentRetryer.get();
-        if (oldRetryer != null) {
-            oldRetryer.cancel(false);
-        }
-        currentRetryer.set(channelHandlerContext.executor().scheduleAtFixedRate(() -> {
-            LOGGER.trace("Retrying {} the {} time", amsSerialFrame, retryCount);
-            int currentTry = retryCount.incrementAndGet();
-            if (currentTry > 10) {
-                // TODO: we might need to throw an exception to potentially cancel upstream waiting
-                channelHandlerContext.writeAndFlush(AmsSerialResetFrame.of(FragmentNumber.of((byte) fragmentNumber)));
-                PlcRuntimeException plcRuntimeException = new PlcRuntimeException("Retry exhausted after " + retryCount + " times");
-                channelHandlerContext.fireExceptionCaught(plcRuntimeException);
-                throw plcRuntimeException;
-            } else {
-                channelHandlerContext.writeAndFlush(amsSerialFrame);
-            }
-        }, 100, 100, TimeUnit.MILLISECONDS));
-        out.add(amsSerialFrame.getByteBuf());
-    }
-
-    @Override
-    protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List<Object> out) throws Exception {
-        LOGGER.trace("(-->IN): {}, {}, {}", channelHandlerContext, byteBuf, out);
-        if (byteBuf.readableBytes() < MagicCookie.NUM_BYTES + TransmitterAddress.NUM_BYTES + ReceiverAddress.NUM_BYTES + FragmentNumber.NUM_BYTES) {
-            return;
-        }
-        MagicCookie magicCookie = MagicCookie.of(byteBuf);
-        TransmitterAddress transmitterAddress = TransmitterAddress.of(byteBuf);
-        ReceiverAddress receiverAddress = ReceiverAddress.of(byteBuf);
-        FragmentNumber fragmentNumber = FragmentNumber.of(byteBuf);
-        int expectedFrameNumber = fragmentCounter.get() - 1;
-        if (expectedFrameNumber < 0) {
-            expectedFrameNumber = 255;
-        }
-        if (fragmentNumber.getAsByte() != expectedFrameNumber) {
-            LOGGER.warn("Unexpected fragment {} received. Expected {}", fragmentNumber, expectedFrameNumber);
-        }
-        UserDataLength userDataLength = UserDataLength.of(byteBuf);
-        UserData userData;
-        byte userDataLengthAsByte = userDataLength.getAsByte();
-        if (byteBuf.readableBytes() < userDataLengthAsByte) {
-            return;
-        }
-        if (userDataLengthAsByte > 0) {
-            byte[] userDataByteArray = new byte[userDataLengthAsByte];
-            byteBuf.readBytes(userDataByteArray);
-            userData = UserData.of(userDataByteArray);
-        } else {
-            userData = UserData.EMPTY;
-        }
-        CRC crc = CRC.of(byteBuf);
-
-        // we don't need to retransmit
-        ScheduledFuture<?> scheduledFuture = currentRetryer.get();
-        if (scheduledFuture != null) {
-            scheduledFuture.cancel(false);
-        }
-
-        Runnable postAction = null;
-        switch (magicCookie.getAsInt()) {
-            case AmsSerialFrame.ID:
-                AmsSerialFrame amsSerialFrame = AmsSerialFrame.of(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, userData, crc);
-                LOGGER.debug("Ams Serial Frame received {}", amsSerialFrame);
-                postAction = () -> {
-                    // TODO: check if this is the right way to ack a package.
-                    ChannelFuture channelFuture = channelHandlerContext.writeAndFlush(AmsSerialAcknowledgeFrame.of(transmitterAddress, receiverAddress, fragmentNumber).getByteBuf());
-                    // waiting for the ack-frame to be transmitted before we forward the package
-                    try {
-                        channelFuture.await();
-                    } catch (InterruptedException e) {
-                        Thread.currentThread().interrupt();
-                        throw new PlcRuntimeException(e);
-                    }
-                    out.add(userData.getByteBuf());
-                };
-                break;
-            case AmsSerialAcknowledgeFrame.ID:
-                AmsSerialAcknowledgeFrame amsSerialAcknowledgeFrame = AmsSerialAcknowledgeFrame.of(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, crc);
-                LOGGER.debug("Ams Serial ACK Frame received {}", amsSerialAcknowledgeFrame);
-                ReferenceCountUtil.release(byteBuf);
-                break;
-            case AmsSerialResetFrame.ID:
-                // TODO: how to react to a reset
-                AmsSerialResetFrame amsSerialResetFrame = AmsSerialResetFrame.of(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, crc);
-                LOGGER.debug("Ams Serial Reset Frame received {}", amsSerialResetFrame);
-                ReferenceCountUtil.release(byteBuf);
-                break;
-            default:
-                throw new PlcProtocolException("Unknown type: " + magicCookie);
-        }
-        CRC calculatedCrc = CRC.of(DigestUtil.calculateCrc16(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, userData));
-        if (!crc.equals(calculatedCrc)) {
-            throw new PlcProtocolException("CRC checksum wrong. Got " + crc + " expected " + calculatedCrc);
-        }
-
-        if (postAction != null) {
-            postAction.run();
-        }
-
-        if (byteBuf.readableBytes() > 0) {
-            throw new IllegalStateException("Unread bytes left: " + byteBuf.readableBytes());
-        }
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.protocol;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageCodec;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.concurrent.ScheduledFuture;
+import org.apache.commons.lang3.mutable.MutableInt;
+import org.apache.plc4x.java.ads.api.serial.AmsSerialAcknowledgeFrame;
+import org.apache.plc4x.java.ads.api.serial.AmsSerialFrame;
+import org.apache.plc4x.java.ads.api.serial.AmsSerialResetFrame;
+import org.apache.plc4x.java.ads.api.serial.types.*;
+import org.apache.plc4x.java.ads.protocol.util.DigestUtil;
+import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
+import org.apache.plc4x.java.api.exceptions.PlcProtocolPayloadTooBigException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+
+public class Payload2SerialProtocol extends MessageToMessageCodec<ByteBuf, ByteBuf> {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(Payload2SerialProtocol.class);
+
+    private final AtomicInteger fragmentCounter = new AtomicInteger(0);
+
+    private AtomicReference<ScheduledFuture<?>> currentRetryer = new AtomicReference<>();
+
+    @Override
+    protected void encode(ChannelHandlerContext channelHandlerContext, ByteBuf amsPacket, List<Object> out) throws PlcProtocolPayloadTooBigException {
+        if (amsPacket == Unpooled.EMPTY_BUFFER) {
+            // Cleanup...
+            ScheduledFuture<?> scheduledFuture = currentRetryer.get();
+            if (scheduledFuture != null) {
+                scheduledFuture.cancel(true);
+            }
+            return;
+        }
+        LOGGER.trace("(<--OUT): {}, {}, {}", channelHandlerContext, amsPacket, out);
+        int fragmentNumber = fragmentCounter.getAndUpdate(value -> value > 255 ? 0 : ++value);
+        LOGGER.debug("Using fragmentNumber {} for {}", fragmentNumber, amsPacket);
+        UserData userData = UserData.of(amsPacket);
+        if (userData.getCalculatedLength() > 255) {
+            throw new PlcProtocolPayloadTooBigException("ADS/AMS", 255, (int) userData.getCalculatedLength(), amsPacket);
+        }
+        AmsSerialFrame amsSerialFrame = AmsSerialFrame.of(FragmentNumber.of((byte) fragmentNumber), userData);
+
+        MutableInt retryCount = new MutableInt(0);
+        ScheduledFuture<?> oldRetryer = currentRetryer.get();
+        if (oldRetryer != null) {
+            oldRetryer.cancel(false);
+        }
+        currentRetryer.set(channelHandlerContext.executor().scheduleAtFixedRate(() -> {
+            LOGGER.trace("Retrying {} the {} time", amsSerialFrame, retryCount);
+            int currentTry = retryCount.incrementAndGet();
+            if (currentTry > 10) {
+                // TODO: we might need to throw an exception to potentially cancel upstream waiting
+                channelHandlerContext.writeAndFlush(AmsSerialResetFrame.of(FragmentNumber.of((byte) fragmentNumber)));
+                PlcRuntimeException plcRuntimeException = new PlcRuntimeException("Retry exhausted after " + retryCount + " times");
+                channelHandlerContext.fireExceptionCaught(plcRuntimeException);
+                throw plcRuntimeException;
+            } else {
+                channelHandlerContext.writeAndFlush(amsSerialFrame);
+            }
+        }, 100, 100, TimeUnit.MILLISECONDS));
+        out.add(amsSerialFrame.getByteBuf());
+    }
+
+    @Override
+    protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List<Object> out) throws Exception {
+        LOGGER.trace("(-->IN): {}, {}, {}", channelHandlerContext, byteBuf, out);
+        if (byteBuf.readableBytes() < MagicCookie.NUM_BYTES + TransmitterAddress.NUM_BYTES + ReceiverAddress.NUM_BYTES + FragmentNumber.NUM_BYTES) {
+            return;
+        }
+        MagicCookie magicCookie = MagicCookie.of(byteBuf);
+        TransmitterAddress transmitterAddress = TransmitterAddress.of(byteBuf);
+        ReceiverAddress receiverAddress = ReceiverAddress.of(byteBuf);
+        FragmentNumber fragmentNumber = FragmentNumber.of(byteBuf);
+        int expectedFrameNumber = fragmentCounter.get() - 1;
+        if (expectedFrameNumber < 0) {
+            expectedFrameNumber = 255;
+        }
+        if (fragmentNumber.getAsByte() != expectedFrameNumber) {
+            LOGGER.warn("Unexpected fragment {} received. Expected {}", fragmentNumber, expectedFrameNumber);
+        }
+        UserDataLength userDataLength = UserDataLength.of(byteBuf);
+        UserData userData;
+        byte userDataLengthAsByte = userDataLength.getAsByte();
+        if (byteBuf.readableBytes() < userDataLengthAsByte) {
+            return;
+        }
+        if (userDataLengthAsByte > 0) {
+            byte[] userDataByteArray = new byte[userDataLengthAsByte];
+            byteBuf.readBytes(userDataByteArray);
+            userData = UserData.of(userDataByteArray);
+        } else {
+            userData = UserData.EMPTY;
+        }
+        CRC crc = CRC.of(byteBuf);
+
+        // we don't need to retransmit
+        ScheduledFuture<?> scheduledFuture = currentRetryer.get();
+        if (scheduledFuture != null) {
+            scheduledFuture.cancel(false);
+        }
+
+        Runnable postAction = null;
+        switch (magicCookie.getAsInt()) {
+            case AmsSerialFrame.ID:
+                AmsSerialFrame amsSerialFrame = AmsSerialFrame.of(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, userData, crc);
+                LOGGER.debug("Ams Serial Frame received {}", amsSerialFrame);
+                postAction = () -> {
+                    // TODO: check if this is the right way to ack a package.
+                    ChannelFuture channelFuture = channelHandlerContext.writeAndFlush(AmsSerialAcknowledgeFrame.of(transmitterAddress, receiverAddress, fragmentNumber).getByteBuf());
+                    // waiting for the ack-frame to be transmitted before we forward the package
+                    try {
+                        channelFuture.await();
+                    } catch (InterruptedException e) {
+                        Thread.currentThread().interrupt();
+                        throw new PlcRuntimeException(e);
+                    }
+                    out.add(userData.getByteBuf());
+                };
+                break;
+            case AmsSerialAcknowledgeFrame.ID:
+                AmsSerialAcknowledgeFrame amsSerialAcknowledgeFrame = AmsSerialAcknowledgeFrame.of(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, crc);
+                LOGGER.debug("Ams Serial ACK Frame received {}", amsSerialAcknowledgeFrame);
+                ReferenceCountUtil.release(byteBuf);
+                break;
+            case AmsSerialResetFrame.ID:
+                // TODO: how to react to a reset
+                AmsSerialResetFrame amsSerialResetFrame = AmsSerialResetFrame.of(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, crc);
+                LOGGER.debug("Ams Serial Reset Frame received {}", amsSerialResetFrame);
+                ReferenceCountUtil.release(byteBuf);
+                break;
+            default:
+                throw new PlcProtocolException("Unknown type: " + magicCookie);
+        }
+        CRC calculatedCrc = CRC.of(DigestUtil.calculateCrc16(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, userData));
+        if (!crc.equals(calculatedCrc)) {
+            throw new PlcProtocolException("CRC checksum wrong. Got " + crc + " expected " + calculatedCrc);
+        }
+
+        if (postAction != null) {
+            postAction.run();
+        }
+
+        if (byteBuf.readableBytes() > 0) {
+            throw new IllegalStateException("Unread bytes left: " + byteBuf.readableBytes());
+        }
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Payload2TcpProtocol.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Payload2TcpProtocol.java
index e77af81070a..b61015a56d0 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Payload2TcpProtocol.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Payload2TcpProtocol.java
@@ -1,69 +1,69 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.protocol;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToMessageCodec;
-import org.apache.plc4x.java.ads.api.tcp.AmsTCPPacket;
-import org.apache.plc4x.java.ads.api.tcp.AmsTcpHeader;
-import org.apache.plc4x.java.ads.api.tcp.types.TcpLength;
-import org.apache.plc4x.java.ads.api.tcp.types.UserData;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-
-public class Payload2TcpProtocol extends MessageToMessageCodec<ByteBuf, ByteBuf> {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(Payload2TcpProtocol.class);
-
-    @Override
-    protected void encode(ChannelHandlerContext channelHandlerContext, ByteBuf amsPacket, List<Object> out) {
-        LOGGER.trace("(<--OUT): {}, {}, {}", channelHandlerContext, amsPacket, out);
-        out.add(AmsTCPPacket.of(UserData.of(amsPacket)).getByteBuf());
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List<Object> out) {
-        if (byteBuf == Unpooled.EMPTY_BUFFER) {
-            // Cleanup...
-            return;
-        }
-        LOGGER.trace("(-->IN): {}, {}, {}", channelHandlerContext, byteBuf, out);
-        if (byteBuf.readableBytes() < AmsTcpHeader.Reserved.NUM_BYTES + TcpLength.NUM_BYTES) {
-            // wait till we can read the length header
-            return;
-        }
-        if (byteBuf.readableBytes() < byteBuf.getUnsignedIntLE(AmsTcpHeader.Reserved.NUM_BYTES)) {
-            // wait till we have a complete ADS packet
-            return;
-        }
-        // Reserved
-        byteBuf.skipBytes(AmsTcpHeader.Reserved.NUM_BYTES);
-        TcpLength packetLength = TcpLength.of(byteBuf);
-        AmsTcpHeader amsTcpHeader = AmsTcpHeader.of(packetLength);
-        LOGGER.debug("AMS TCP Header {}", amsTcpHeader);
-
-        out.add(byteBuf.readBytes((int) packetLength.getAsLong()));
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.protocol;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageCodec;
+import org.apache.plc4x.java.ads.api.tcp.AmsTCPPacket;
+import org.apache.plc4x.java.ads.api.tcp.AmsTcpHeader;
+import org.apache.plc4x.java.ads.api.tcp.types.TcpLength;
+import org.apache.plc4x.java.ads.api.tcp.types.UserData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+public class Payload2TcpProtocol extends MessageToMessageCodec<ByteBuf, ByteBuf> {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(Payload2TcpProtocol.class);
+
+    @Override
+    protected void encode(ChannelHandlerContext channelHandlerContext, ByteBuf amsPacket, List<Object> out) {
+        LOGGER.trace("(<--OUT): {}, {}, {}", channelHandlerContext, amsPacket, out);
+        out.add(AmsTCPPacket.of(UserData.of(amsPacket)).getByteBuf());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List<Object> out) {
+        if (byteBuf == Unpooled.EMPTY_BUFFER) {
+            // Cleanup...
+            return;
+        }
+        LOGGER.trace("(-->IN): {}, {}, {}", channelHandlerContext, byteBuf, out);
+        if (byteBuf.readableBytes() < AmsTcpHeader.Reserved.NUM_BYTES + TcpLength.NUM_BYTES) {
+            // wait till we can read the length header
+            return;
+        }
+        if (byteBuf.readableBytes() < byteBuf.getUnsignedIntLE(AmsTcpHeader.Reserved.NUM_BYTES)) {
+            // wait till we have a complete ADS packet
+            return;
+        }
+        // Reserved
+        byteBuf.skipBytes(AmsTcpHeader.Reserved.NUM_BYTES);
+        TcpLength packetLength = TcpLength.of(byteBuf);
+        AmsTcpHeader amsTcpHeader = AmsTcpHeader.of(packetLength);
+        LOGGER.debug("AMS TCP Header {}", amsTcpHeader);
+
+        out.add(byteBuf.readBytes((int) packetLength.getAsLong()));
+    }
+
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocol.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocol.java
index ba64cc446b2..29acc0faebb 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocol.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocol.java
@@ -1,451 +1,451 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.protocol;
-
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToMessageCodec;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.ads.api.commands.*;
-import org.apache.plc4x.java.ads.api.commands.types.*;
-import org.apache.plc4x.java.ads.api.generic.AmsPacket;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-import org.apache.plc4x.java.ads.model.AdsDataType;
-import org.apache.plc4x.java.ads.model.AdsField;
-import org.apache.plc4x.java.ads.model.DirectAdsField;
-import org.apache.plc4x.java.ads.model.SymbolicAdsField;
-import org.apache.plc4x.java.ads.protocol.exception.AdsException;
-import org.apache.plc4x.java.api.exceptions.PlcException;
-import org.apache.plc4x.java.api.exceptions.PlcIoException;
-import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
-import org.apache.plc4x.java.api.exceptions.PlcProtocolPayloadTooBigException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcRequest;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.messages.*;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-
-import static org.apache.plc4x.java.ads.protocol.util.LittleEndianDecoder.decodeData;
-import static org.apache.plc4x.java.ads.protocol.util.LittleEndianEncoder.encodeData;
-
-public class Plc4x2AdsProtocol extends MessageToMessageCodec<AmsPacket, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse>> {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(Plc4x2AdsProtocol.class);
-
-    private static final AtomicLong correlationBuilder = new AtomicLong(1);
-
-    private final ConcurrentMap<Long, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse>> requests;
-
-    private final ConcurrentMap<SymbolicAdsField, DirectAdsField> fieldMapping;
-
-    private List<Consumer<AdsDeviceNotificationRequest>> deviceNotificationListeners;
-
-    private final AmsNetId targetAmsNetId;
-    private final AmsPort targetAmsPort;
-    private final AmsNetId sourceAmsNetId;
-    private final AmsPort sourceAmsPort;
-
-    public Plc4x2AdsProtocol(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, ConcurrentMap<SymbolicAdsField, DirectAdsField> fieldMapping) {
-        this.targetAmsNetId = targetAmsNetId;
-        this.targetAmsPort = targetAmsPort;
-        this.sourceAmsNetId = sourceAmsNetId;
-        this.sourceAmsPort = sourceAmsPort;
-        this.requests = new ConcurrentHashMap<>();
-        this.fieldMapping = fieldMapping;
-        this.deviceNotificationListeners = new LinkedList<>();
-    }
-
-    @Override
-    protected void encode(ChannelHandlerContext ctx, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> msg, List<Object> out) throws Exception {
-        LOGGER.trace("(<--OUT): {}, {}, {}", ctx, msg, out);
-        PlcRequest request = msg.getRequest();
-        if (request instanceof PlcReadRequest) {
-            encodeReadRequest(msg, out);
-        } else if (request instanceof PlcWriteRequest) {
-            encodeWriteRequest(msg, out);
-        } else if (request instanceof PlcProprietaryRequest) {
-            encodeProprietaryRequest(msg, out);
-        } else {
-            throw new PlcProtocolException("Unknown type " + request.getClass());
-        }
-    }
-
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        LOGGER.trace("(-->ERR): {}", ctx, cause);
-        if (cause instanceof AdsException) {
-            Invoke invokeId = ((AdsException) cause).getInvokeId();
-            if (invokeId != null) {
-                PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> remove = requests.remove(invokeId.getAsLong());
-                if (remove != null) {
-                    remove.getResponseFuture().completeExceptionally(new PlcIoException(cause));
-                } else {
-                    LOGGER.warn("Unrelated exception received {}", invokeId, cause);
-                }
-            } else {
-                super.exceptionCaught(ctx, cause);
-            }
-        } else if ((cause instanceof IOException) && (cause.getMessage().contains("Connection reset by peer") ||
-            cause.getMessage().contains("Operation timed out"))) {
-            String reason = cause.getMessage().contains("Connection reset by peer") ?
-                "Connection terminated unexpectedly" : "Remote host not responding";
-            if (!requests.isEmpty()) {
-                // If the connection is hung up, all still pending requests can be closed.
-                for (PlcRequestContainer requestContainer : requests.values()) {
-                    requestContainer.getResponseFuture().completeExceptionally(new PlcIoException(reason));
-                }
-                // Clear the list
-                requests.clear();
-            }
-        } else {
-            super.exceptionCaught(ctx, cause);
-        }
-    }
-
-    private void encodeWriteRequest(PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> msg, List<Object> out) throws PlcException {
-        InternalPlcWriteRequest writeRequest = (InternalPlcWriteRequest) msg.getRequest();
-        if (writeRequest.getFields().size() != 1) {
-            throw new PlcProtocolException("Only one item supported");
-        }
-        PlcField field = writeRequest.getFields().get(0);
-        if (field instanceof SymbolicAdsField) {
-            DirectAdsField mappedField = fieldMapping.get(field);
-            LOGGER.debug("Replacing {} with {}", field, mappedField);
-            field = mappedField;
-        }
-        if (!(field instanceof DirectAdsField)) {
-            throw new PlcProtocolException("PlcField not of type DirectAdsField: " + field.getClass());
-        }
-        DirectAdsField directAdsField = (DirectAdsField) field;
-        Invoke invokeId = Invoke.of(correlationBuilder.incrementAndGet());
-        IndexGroup indexGroup = IndexGroup.of(directAdsField.getIndexGroup());
-        IndexOffset indexOffset = IndexOffset.of(directAdsField.getIndexOffset());
-
-        BaseDefaultFieldItem fieldItem = writeRequest.getFieldItems().get(0);
-        Object[] values = fieldItem.getValues();
-
-        byte[] bytes = encodeData(directAdsField.getAdsDataType(), values);
-        int bytesToBeWritten = bytes.length;
-        int maxTheoreticalSize = directAdsField.getAdsDataType().getTargetByteSize() * directAdsField.getNumberOfElements();
-        if (bytesToBeWritten > maxTheoreticalSize) {
-            LOGGER.debug("Requested AdsDatatype {} is exceeded by number of bytes {}. Limit {}.", directAdsField.getAdsDataType(), bytesToBeWritten, maxTheoreticalSize);
-            throw new PlcProtocolPayloadTooBigException("ADS", maxTheoreticalSize, bytesToBeWritten, values);
-        }
-        Data data = Data.of(bytes);
-        AmsPacket amsPacket = AdsWriteRequest.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, data);
-        LOGGER.debug("encoded write request {}", amsPacket);
-        out.add(amsPacket);
-        requests.put(invokeId.getAsLong(), msg);
-    }
-
-    private void encodeReadRequest(PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> msg, List<Object> out) throws PlcException {
-        PlcReadRequest readRequest = (PlcReadRequest) msg.getRequest();
-
-        if (readRequest.getFields().size() != 1) {
-            throw new PlcProtocolException("Only one item supported");
-        }
-        PlcField field = readRequest.getFields().get(0);
-        if (field instanceof SymbolicAdsField) {
-            DirectAdsField mappedField = fieldMapping.get(field);
-            if (mappedField == null) {
-                throw new PlcProtocolException("No field mapping for " + field);
-            }
-            LOGGER.debug("Replacing {} with {}", field, mappedField);
-            field = mappedField;
-        }
-        if (!(field instanceof DirectAdsField)) {
-            throw new PlcProtocolException("PlcField not of type DirectAdsField: " + field.getClass());
-        }
-        DirectAdsField directAdsField = (DirectAdsField) field;
-        Invoke invokeId = Invoke.of(correlationBuilder.incrementAndGet());
-        IndexGroup indexGroup = IndexGroup.of(directAdsField.getIndexGroup());
-        IndexOffset indexOffset = IndexOffset.of(directAdsField.getIndexOffset());
-        AdsDataType adsDataType = directAdsField.getAdsDataType();
-        int numberOfElements = directAdsField.getNumberOfElements();
-        int readLength = adsDataType.getTargetByteSize() * numberOfElements;
-        Length length = Length.of(readLength);
-        AmsPacket amsPacket = AdsReadRequest.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, length);
-        LOGGER.debug("encoded read request {}", amsPacket);
-        out.add(amsPacket);
-        requests.put(invokeId.getAsLong(), msg);
-    }
-
-    private void encodeProprietaryRequest(PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> msg, List<Object> out) throws PlcProtocolException {
-        PlcProprietaryRequest plcProprietaryRequest = (PlcProprietaryRequest) msg.getRequest();
-        if (!(plcProprietaryRequest.getProprietaryRequest() instanceof AmsPacket)) {
-            throw new PlcProtocolException("Unsupported proprietary type for this driver " + plcProprietaryRequest.getProprietaryRequest().getClass());
-        }
-        AmsPacket amsPacket = (AmsPacket) plcProprietaryRequest.getProprietaryRequest();
-        LOGGER.debug("encoded proprietary request {}", amsPacket);
-        out.add(amsPacket);
-        requests.put(amsPacket.getAmsHeader().getInvokeId().getAsLong(), msg);
-    }
-
-    @Override
-    protected void decode(ChannelHandlerContext channelHandlerContext, AmsPacket amsPacket, List<Object> out) throws Exception {
-        LOGGER.trace("(-->IN): {}, {}, {}", channelHandlerContext, amsPacket, out);
-        if (amsPacket instanceof AdsDeviceNotificationRequest) {
-            LOGGER.debug("Received notification {}", amsPacket);
-            handleAdsDeviceNotificationRequest((AdsDeviceNotificationRequest) amsPacket);
-            return;
-        }
-        PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> plcRequestContainer = requests.remove(amsPacket.getAmsHeader().getInvokeId().getAsLong());
-        if (plcRequestContainer == null) {
-            LOGGER.info("Unmapped packet received {}", amsPacket);
-            return;
-        }
-        PlcRequest request = plcRequestContainer.getRequest();
-        final InternalPlcResponse response;
-
-        // Handle the response to a read request.
-        if (request instanceof PlcReadRequest) {
-            if (amsPacket instanceof AdsReadResponse) {
-                response = decodeReadResponse((AdsReadResponse) amsPacket, plcRequestContainer);
-            } else {
-                throw new PlcProtocolException("Wrong type correlated " + amsPacket);
-            }
-        } else if (request instanceof PlcWriteRequest) {
-            if (amsPacket instanceof AdsWriteResponse) {
-                response = decodeWriteResponse((AdsWriteResponse) amsPacket, plcRequestContainer);
-            } else {
-                throw new PlcProtocolException("Wrong type correlated " + amsPacket);
-            }
-        } else if (request instanceof PlcProprietaryRequest) {
-            response = decodeProprietaryResponse(amsPacket, plcRequestContainer);
-        } else {
-            response = null;
-        }
-        LOGGER.debug("Plc4x response {}", response);
-
-        // Confirm the response being handled.
-        if (response != null) {
-            plcRequestContainer.getResponseFuture().complete(response);
-        }
-    }
-
-    private void handleAdsDeviceNotificationRequest(AdsDeviceNotificationRequest adsDeviceNotificationRequest) {
-        for (Consumer<AdsDeviceNotificationRequest> deviceNotificationListener : deviceNotificationListeners) {
-            try {
-                deviceNotificationListener.accept(adsDeviceNotificationRequest);
-            } catch (RuntimeException e) {
-                LOGGER.error("Exception received from {} while handling {}", deviceNotificationListener, adsDeviceNotificationRequest, e);
-            }
-        }
-    }
-
-    public boolean addConsumer(Consumer<AdsDeviceNotificationRequest> adsDeviceNotificationRequestConsumer) {
-        return deviceNotificationListeners.add(adsDeviceNotificationRequestConsumer);
-    }
-
-    public boolean removeConsumer(Consumer<AdsDeviceNotificationRequest> adsDeviceNotificationRequestConsumer) {
-        return deviceNotificationListeners.remove(adsDeviceNotificationRequestConsumer);
-    }
-
-
-    @SuppressWarnings("unchecked")
-    private InternalPlcResponse decodeWriteResponse(AdsWriteResponse responseMessage, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> requestContainer) {
-        InternalPlcWriteRequest plcWriteRequest = (InternalPlcWriteRequest) requestContainer.getRequest();
-        PlcResponseCode responseCode = decodeResponseCode(responseMessage.getResult());
-
-        // TODO: does every item has the same ads response or is this whole aggregation broken?
-        Map<String, PlcResponseCode> responseItems = plcWriteRequest.getFieldNames()
-            .stream()
-            .collect(Collectors.toMap(
-                fieldName -> fieldName,
-                ignore -> responseCode
-            ));
-        return new DefaultPlcWriteResponse(plcWriteRequest, responseItems);
-    }
-
-    @SuppressWarnings("unchecked")
-    private InternalPlcResponse decodeReadResponse(AdsReadResponse responseMessage, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> requestContainer) {
-        InternalPlcReadRequest plcReadRequest = (InternalPlcReadRequest) requestContainer.getRequest();
-
-        // TODO: only single requests supported for now
-        AdsField field = (AdsField) plcReadRequest.getFields().get(0);
-
-        PlcResponseCode responseCode = decodeResponseCode(responseMessage.getResult());
-        byte[] bytes = responseMessage.getData().getBytes();
-        BaseDefaultFieldItem<?> fieldItem = decodeData(field.getAdsDataType(), bytes);
-
-        // TODO: does every item has the same ads response or is this whole aggregation broken?
-        Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> responseItems = plcReadRequest.getFieldNames()
-            .stream()
-            .collect(Collectors.toMap(
-                fieldName -> fieldName,
-                ignore -> Pair.of(responseCode, fieldItem)
-            ));
-
-        return new DefaultPlcReadResponse(plcReadRequest, responseItems);
-    }
-
-    @SuppressWarnings("unchecked")
-    private InternalPlcResponse decodeProprietaryResponse(AmsPacket amsPacket, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> plcRequestContainer) {
-        return new DefaultPlcProprietaryResponse<>((InternalPlcProprietaryRequest) plcRequestContainer.getRequest(), amsPacket);
-    }
-
-    private PlcResponseCode decodeResponseCode(Result result) {
-        switch (result.toAdsReturnCode()) {
-            case ADS_CODE_0:
-                return PlcResponseCode.OK;
-            case ADS_CODE_1:
-                return PlcResponseCode.INTERNAL_ERROR;
-            case ADS_CODE_2:
-            case ADS_CODE_3:
-            case ADS_CODE_4:
-            case ADS_CODE_5:
-                return PlcResponseCode.INTERNAL_ERROR;
-            case ADS_CODE_6:
-            case ADS_CODE_7:
-                return PlcResponseCode.INVALID_ADDRESS;
-            case ADS_CODE_8:
-            case ADS_CODE_9:
-            case ADS_CODE_10:
-            case ADS_CODE_11:
-            case ADS_CODE_12:
-            case ADS_CODE_13:
-            case ADS_CODE_14:
-            case ADS_CODE_15:
-            case ADS_CODE_16:
-            case ADS_CODE_17:
-            case ADS_CODE_18:
-            case ADS_CODE_19:
-            case ADS_CODE_20:
-            case ADS_CODE_21:
-            case ADS_CODE_22:
-            case ADS_CODE_23:
-            case ADS_CODE_24:
-            case ADS_CODE_25:
-            case ADS_CODE_26:
-            case ADS_CODE_27:
-            case ADS_CODE_28:
-            case ADS_CODE_1280:
-            case ADS_CODE_1281:
-            case ADS_CODE_1282:
-            case ADS_CODE_1283:
-            case ADS_CODE_1284:
-            case ADS_CODE_1285:
-            case ADS_CODE_1286:
-            case ADS_CODE_1287:
-            case ADS_CODE_1288:
-            case ADS_CODE_1289:
-            case ADS_CODE_1290:
-            case ADS_CODE_1291:
-            case ADS_CODE_1292:
-            case ADS_CODE_1293:
-            case ADS_CODE_1792:
-            case ADS_CODE_1793:
-            case ADS_CODE_1794:
-            case ADS_CODE_1795:
-            case ADS_CODE_1796:
-            case ADS_CODE_1797:
-            case ADS_CODE_1798:
-            case ADS_CODE_1799:
-            case ADS_CODE_1800:
-            case ADS_CODE_1801:
-            case ADS_CODE_1802:
-            case ADS_CODE_1803:
-            case ADS_CODE_1804:
-            case ADS_CODE_1805:
-            case ADS_CODE_1806:
-            case ADS_CODE_1807:
-            case ADS_CODE_1808:
-            case ADS_CODE_1809:
-            case ADS_CODE_1810:
-            case ADS_CODE_1811:
-            case ADS_CODE_1812:
-            case ADS_CODE_1813:
-            case ADS_CODE_1814:
-            case ADS_CODE_1815:
-            case ADS_CODE_1816:
-            case ADS_CODE_1817:
-            case ADS_CODE_1818:
-            case ADS_CODE_1819:
-            case ADS_CODE_1820:
-            case ADS_CODE_1821:
-            case ADS_CODE_1822:
-            case ADS_CODE_1823:
-            case ADS_CODE_1824:
-            case ADS_CODE_1825:
-            case ADS_CODE_1826:
-            case ADS_CODE_1827:
-            case ADS_CODE_1828:
-            case ADS_CODE_1836:
-            case ADS_CODE_1856:
-            case ADS_CODE_1857:
-            case ADS_CODE_1858:
-            case ADS_CODE_1859:
-            case ADS_CODE_1860:
-            case ADS_CODE_1861:
-            case ADS_CODE_1862:
-            case ADS_CODE_1863:
-            case ADS_CODE_1864:
-            case ADS_CODE_1872:
-            case ADS_CODE_1873:
-            case ADS_CODE_1874:
-            case ADS_CODE_1875:
-            case ADS_CODE_1876:
-            case ADS_CODE_1877:
-            case ADS_CODE_4096:
-            case ADS_CODE_4097:
-            case ADS_CODE_4098:
-            case ADS_CODE_4099:
-            case ADS_CODE_4100:
-            case ADS_CODE_4101:
-            case ADS_CODE_4102:
-            case ADS_CODE_4103:
-            case ADS_CODE_4104:
-            case ADS_CODE_4105:
-            case ADS_CODE_4106:
-            case ADS_CODE_4107:
-            case ADS_CODE_4108:
-            case ADS_CODE_4109:
-            case ADS_CODE_4110:
-            case ADS_CODE_4111:
-            case ADS_CODE_4112:
-            case ADS_CODE_4119:
-            case ADS_CODE_4120:
-            case ADS_CODE_4121:
-            case ADS_CODE_4122:
-            case ADS_CODE_10060:
-            case ADS_CODE_10061:
-            case ADS_CODE_10065:
-                return PlcResponseCode.INTERNAL_ERROR;
-            case UNKNOWN:
-                return PlcResponseCode.INTERNAL_ERROR;
-        }
-        throw new IllegalStateException(result.toAdsReturnCode() + " not mapped");
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.protocol;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageCodec;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.ads.api.commands.*;
+import org.apache.plc4x.java.ads.api.commands.types.*;
+import org.apache.plc4x.java.ads.api.generic.AmsPacket;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+import org.apache.plc4x.java.ads.model.AdsDataType;
+import org.apache.plc4x.java.ads.model.AdsField;
+import org.apache.plc4x.java.ads.model.DirectAdsField;
+import org.apache.plc4x.java.ads.model.SymbolicAdsField;
+import org.apache.plc4x.java.ads.protocol.exception.AdsException;
+import org.apache.plc4x.java.api.exceptions.PlcException;
+import org.apache.plc4x.java.api.exceptions.PlcIoException;
+import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
+import org.apache.plc4x.java.api.exceptions.PlcProtocolPayloadTooBigException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.messages.*;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+import static org.apache.plc4x.java.ads.protocol.util.LittleEndianDecoder.decodeData;
+import static org.apache.plc4x.java.ads.protocol.util.LittleEndianEncoder.encodeData;
+
+public class Plc4x2AdsProtocol extends MessageToMessageCodec<AmsPacket, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse>> {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(Plc4x2AdsProtocol.class);
+
+    private static final AtomicLong correlationBuilder = new AtomicLong(1);
+
+    private final ConcurrentMap<Long, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse>> requests;
+
+    private final ConcurrentMap<SymbolicAdsField, DirectAdsField> fieldMapping;
+
+    private List<Consumer<AdsDeviceNotificationRequest>> deviceNotificationListeners;
+
+    private final AmsNetId targetAmsNetId;
+    private final AmsPort targetAmsPort;
+    private final AmsNetId sourceAmsNetId;
+    private final AmsPort sourceAmsPort;
+
+    public Plc4x2AdsProtocol(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, ConcurrentMap<SymbolicAdsField, DirectAdsField> fieldMapping) {
+        this.targetAmsNetId = targetAmsNetId;
+        this.targetAmsPort = targetAmsPort;
+        this.sourceAmsNetId = sourceAmsNetId;
+        this.sourceAmsPort = sourceAmsPort;
+        this.requests = new ConcurrentHashMap<>();
+        this.fieldMapping = fieldMapping;
+        this.deviceNotificationListeners = new LinkedList<>();
+    }
+
+    @Override
+    protected void encode(ChannelHandlerContext ctx, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> msg, List<Object> out) throws Exception {
+        LOGGER.trace("(<--OUT): {}, {}, {}", ctx, msg, out);
+        PlcRequest request = msg.getRequest();
+        if (request instanceof PlcReadRequest) {
+            encodeReadRequest(msg, out);
+        } else if (request instanceof PlcWriteRequest) {
+            encodeWriteRequest(msg, out);
+        } else if (request instanceof PlcProprietaryRequest) {
+            encodeProprietaryRequest(msg, out);
+        } else {
+            throw new PlcProtocolException("Unknown type " + request.getClass());
+        }
+    }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+        LOGGER.trace("(-->ERR): {}", ctx, cause);
+        if (cause instanceof AdsException) {
+            Invoke invokeId = ((AdsException) cause).getInvokeId();
+            if (invokeId != null) {
+                PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> remove = requests.remove(invokeId.getAsLong());
+                if (remove != null) {
+                    remove.getResponseFuture().completeExceptionally(new PlcIoException(cause));
+                } else {
+                    LOGGER.warn("Unrelated exception received {}", invokeId, cause);
+                }
+            } else {
+                super.exceptionCaught(ctx, cause);
+            }
+        } else if ((cause instanceof IOException) && (cause.getMessage().contains("Connection reset by peer") ||
+            cause.getMessage().contains("Operation timed out"))) {
+            String reason = cause.getMessage().contains("Connection reset by peer") ?
+                "Connection terminated unexpectedly" : "Remote host not responding";
+            if (!requests.isEmpty()) {
+                // If the connection is hung up, all still pending requests can be closed.
+                for (PlcRequestContainer requestContainer : requests.values()) {
+                    requestContainer.getResponseFuture().completeExceptionally(new PlcIoException(reason));
+                }
+                // Clear the list
+                requests.clear();
+            }
+        } else {
+            super.exceptionCaught(ctx, cause);
+        }
+    }
+
+    private void encodeWriteRequest(PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> msg, List<Object> out) throws PlcException {
+        InternalPlcWriteRequest writeRequest = (InternalPlcWriteRequest) msg.getRequest();
+        if (writeRequest.getFields().size() != 1) {
+            throw new PlcProtocolException("Only one item supported");
+        }
+        PlcField field = writeRequest.getFields().get(0);
+        if (field instanceof SymbolicAdsField) {
+            DirectAdsField mappedField = fieldMapping.get(field);
+            LOGGER.debug("Replacing {} with {}", field, mappedField);
+            field = mappedField;
+        }
+        if (!(field instanceof DirectAdsField)) {
+            throw new PlcProtocolException("PlcField not of type DirectAdsField: " + field.getClass());
+        }
+        DirectAdsField directAdsField = (DirectAdsField) field;
+        Invoke invokeId = Invoke.of(correlationBuilder.incrementAndGet());
+        IndexGroup indexGroup = IndexGroup.of(directAdsField.getIndexGroup());
+        IndexOffset indexOffset = IndexOffset.of(directAdsField.getIndexOffset());
+
+        BaseDefaultFieldItem fieldItem = writeRequest.getFieldItems().get(0);
+        Object[] values = fieldItem.getValues();
+
+        byte[] bytes = encodeData(directAdsField.getAdsDataType(), values);
+        int bytesToBeWritten = bytes.length;
+        int maxTheoreticalSize = directAdsField.getAdsDataType().getTargetByteSize() * directAdsField.getNumberOfElements();
+        if (bytesToBeWritten > maxTheoreticalSize) {
+            LOGGER.debug("Requested AdsDatatype {} is exceeded by number of bytes {}. Limit {}.", directAdsField.getAdsDataType(), bytesToBeWritten, maxTheoreticalSize);
+            throw new PlcProtocolPayloadTooBigException("ADS", maxTheoreticalSize, bytesToBeWritten, values);
+        }
+        Data data = Data.of(bytes);
+        AmsPacket amsPacket = AdsWriteRequest.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, data);
+        LOGGER.debug("encoded write request {}", amsPacket);
+        out.add(amsPacket);
+        requests.put(invokeId.getAsLong(), msg);
+    }
+
+    private void encodeReadRequest(PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> msg, List<Object> out) throws PlcException {
+        PlcReadRequest readRequest = (PlcReadRequest) msg.getRequest();
+
+        if (readRequest.getFields().size() != 1) {
+            throw new PlcProtocolException("Only one item supported");
+        }
+        PlcField field = readRequest.getFields().get(0);
+        if (field instanceof SymbolicAdsField) {
+            DirectAdsField mappedField = fieldMapping.get(field);
+            if (mappedField == null) {
+                throw new PlcProtocolException("No field mapping for " + field);
+            }
+            LOGGER.debug("Replacing {} with {}", field, mappedField);
+            field = mappedField;
+        }
+        if (!(field instanceof DirectAdsField)) {
+            throw new PlcProtocolException("PlcField not of type DirectAdsField: " + field.getClass());
+        }
+        DirectAdsField directAdsField = (DirectAdsField) field;
+        Invoke invokeId = Invoke.of(correlationBuilder.incrementAndGet());
+        IndexGroup indexGroup = IndexGroup.of(directAdsField.getIndexGroup());
+        IndexOffset indexOffset = IndexOffset.of(directAdsField.getIndexOffset());
+        AdsDataType adsDataType = directAdsField.getAdsDataType();
+        int numberOfElements = directAdsField.getNumberOfElements();
+        int readLength = adsDataType.getTargetByteSize() * numberOfElements;
+        Length length = Length.of(readLength);
+        AmsPacket amsPacket = AdsReadRequest.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, length);
+        LOGGER.debug("encoded read request {}", amsPacket);
+        out.add(amsPacket);
+        requests.put(invokeId.getAsLong(), msg);
+    }
+
+    private void encodeProprietaryRequest(PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> msg, List<Object> out) throws PlcProtocolException {
+        PlcProprietaryRequest plcProprietaryRequest = (PlcProprietaryRequest) msg.getRequest();
+        if (!(plcProprietaryRequest.getProprietaryRequest() instanceof AmsPacket)) {
+            throw new PlcProtocolException("Unsupported proprietary type for this driver " + plcProprietaryRequest.getProprietaryRequest().getClass());
+        }
+        AmsPacket amsPacket = (AmsPacket) plcProprietaryRequest.getProprietaryRequest();
+        LOGGER.debug("encoded proprietary request {}", amsPacket);
+        out.add(amsPacket);
+        requests.put(amsPacket.getAmsHeader().getInvokeId().getAsLong(), msg);
+    }
+
+    @Override
+    protected void decode(ChannelHandlerContext channelHandlerContext, AmsPacket amsPacket, List<Object> out) throws Exception {
+        LOGGER.trace("(-->IN): {}, {}, {}", channelHandlerContext, amsPacket, out);
+        if (amsPacket instanceof AdsDeviceNotificationRequest) {
+            LOGGER.debug("Received notification {}", amsPacket);
+            handleAdsDeviceNotificationRequest((AdsDeviceNotificationRequest) amsPacket);
+            return;
+        }
+        PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> plcRequestContainer = requests.remove(amsPacket.getAmsHeader().getInvokeId().getAsLong());
+        if (plcRequestContainer == null) {
+            LOGGER.info("Unmapped packet received {}", amsPacket);
+            return;
+        }
+        PlcRequest request = plcRequestContainer.getRequest();
+        final InternalPlcResponse response;
+
+        // Handle the response to a read request.
+        if (request instanceof PlcReadRequest) {
+            if (amsPacket instanceof AdsReadResponse) {
+                response = decodeReadResponse((AdsReadResponse) amsPacket, plcRequestContainer);
+            } else {
+                throw new PlcProtocolException("Wrong type correlated " + amsPacket);
+            }
+        } else if (request instanceof PlcWriteRequest) {
+            if (amsPacket instanceof AdsWriteResponse) {
+                response = decodeWriteResponse((AdsWriteResponse) amsPacket, plcRequestContainer);
+            } else {
+                throw new PlcProtocolException("Wrong type correlated " + amsPacket);
+            }
+        } else if (request instanceof PlcProprietaryRequest) {
+            response = decodeProprietaryResponse(amsPacket, plcRequestContainer);
+        } else {
+            response = null;
+        }
+        LOGGER.debug("Plc4x response {}", response);
+
+        // Confirm the response being handled.
+        if (response != null) {
+            plcRequestContainer.getResponseFuture().complete(response);
+        }
+    }
+
+    private void handleAdsDeviceNotificationRequest(AdsDeviceNotificationRequest adsDeviceNotificationRequest) {
+        for (Consumer<AdsDeviceNotificationRequest> deviceNotificationListener : deviceNotificationListeners) {
+            try {
+                deviceNotificationListener.accept(adsDeviceNotificationRequest);
+            } catch (RuntimeException e) {
+                LOGGER.error("Exception received from {} while handling {}", deviceNotificationListener, adsDeviceNotificationRequest, e);
+            }
+        }
+    }
+
+    public boolean addConsumer(Consumer<AdsDeviceNotificationRequest> adsDeviceNotificationRequestConsumer) {
+        return deviceNotificationListeners.add(adsDeviceNotificationRequestConsumer);
+    }
+
+    public boolean removeConsumer(Consumer<AdsDeviceNotificationRequest> adsDeviceNotificationRequestConsumer) {
+        return deviceNotificationListeners.remove(adsDeviceNotificationRequestConsumer);
+    }
+
+
+    @SuppressWarnings("unchecked")
+    private InternalPlcResponse decodeWriteResponse(AdsWriteResponse responseMessage, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> requestContainer) {
+        InternalPlcWriteRequest plcWriteRequest = (InternalPlcWriteRequest) requestContainer.getRequest();
+        PlcResponseCode responseCode = decodeResponseCode(responseMessage.getResult());
+
+        // TODO: does every item has the same ads response or is this whole aggregation broken?
+        Map<String, PlcResponseCode> responseItems = plcWriteRequest.getFieldNames()
+            .stream()
+            .collect(Collectors.toMap(
+                fieldName -> fieldName,
+                ignore -> responseCode
+            ));
+        return new DefaultPlcWriteResponse(plcWriteRequest, responseItems);
+    }
+
+    @SuppressWarnings("unchecked")
+    private InternalPlcResponse decodeReadResponse(AdsReadResponse responseMessage, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> requestContainer) {
+        InternalPlcReadRequest plcReadRequest = (InternalPlcReadRequest) requestContainer.getRequest();
+
+        // TODO: only single requests supported for now
+        AdsField field = (AdsField) plcReadRequest.getFields().get(0);
+
+        PlcResponseCode responseCode = decodeResponseCode(responseMessage.getResult());
+        byte[] bytes = responseMessage.getData().getBytes();
+        BaseDefaultFieldItem<?> fieldItem = decodeData(field.getAdsDataType(), bytes);
+
+        // TODO: does every item has the same ads response or is this whole aggregation broken?
+        Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> responseItems = plcReadRequest.getFieldNames()
+            .stream()
+            .collect(Collectors.toMap(
+                fieldName -> fieldName,
+                ignore -> Pair.of(responseCode, fieldItem)
+            ));
+
+        return new DefaultPlcReadResponse(plcReadRequest, responseItems);
+    }
+
+    @SuppressWarnings("unchecked")
+    private InternalPlcResponse decodeProprietaryResponse(AmsPacket amsPacket, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> plcRequestContainer) {
+        return new DefaultPlcProprietaryResponse<>((InternalPlcProprietaryRequest) plcRequestContainer.getRequest(), amsPacket);
+    }
+
+    private PlcResponseCode decodeResponseCode(Result result) {
+        switch (result.toAdsReturnCode()) {
+            case ADS_CODE_0:
+                return PlcResponseCode.OK;
+            case ADS_CODE_1:
+                return PlcResponseCode.INTERNAL_ERROR;
+            case ADS_CODE_2:
+            case ADS_CODE_3:
+            case ADS_CODE_4:
+            case ADS_CODE_5:
+                return PlcResponseCode.INTERNAL_ERROR;
+            case ADS_CODE_6:
+            case ADS_CODE_7:
+                return PlcResponseCode.INVALID_ADDRESS;
+            case ADS_CODE_8:
+            case ADS_CODE_9:
+            case ADS_CODE_10:
+            case ADS_CODE_11:
+            case ADS_CODE_12:
+            case ADS_CODE_13:
+            case ADS_CODE_14:
+            case ADS_CODE_15:
+            case ADS_CODE_16:
+            case ADS_CODE_17:
+            case ADS_CODE_18:
+            case ADS_CODE_19:
+            case ADS_CODE_20:
+            case ADS_CODE_21:
+            case ADS_CODE_22:
+            case ADS_CODE_23:
+            case ADS_CODE_24:
+            case ADS_CODE_25:
+            case ADS_CODE_26:
+            case ADS_CODE_27:
+            case ADS_CODE_28:
+            case ADS_CODE_1280:
+            case ADS_CODE_1281:
+            case ADS_CODE_1282:
+            case ADS_CODE_1283:
+            case ADS_CODE_1284:
+            case ADS_CODE_1285:
+            case ADS_CODE_1286:
+            case ADS_CODE_1287:
+            case ADS_CODE_1288:
+            case ADS_CODE_1289:
+            case ADS_CODE_1290:
+            case ADS_CODE_1291:
+            case ADS_CODE_1292:
+            case ADS_CODE_1293:
+            case ADS_CODE_1792:
+            case ADS_CODE_1793:
+            case ADS_CODE_1794:
+            case ADS_CODE_1795:
+            case ADS_CODE_1796:
+            case ADS_CODE_1797:
+            case ADS_CODE_1798:
+            case ADS_CODE_1799:
+            case ADS_CODE_1800:
+            case ADS_CODE_1801:
+            case ADS_CODE_1802:
+            case ADS_CODE_1803:
+            case ADS_CODE_1804:
+            case ADS_CODE_1805:
+            case ADS_CODE_1806:
+            case ADS_CODE_1807:
+            case ADS_CODE_1808:
+            case ADS_CODE_1809:
+            case ADS_CODE_1810:
+            case ADS_CODE_1811:
+            case ADS_CODE_1812:
+            case ADS_CODE_1813:
+            case ADS_CODE_1814:
+            case ADS_CODE_1815:
+            case ADS_CODE_1816:
+            case ADS_CODE_1817:
+            case ADS_CODE_1818:
+            case ADS_CODE_1819:
+            case ADS_CODE_1820:
+            case ADS_CODE_1821:
+            case ADS_CODE_1822:
+            case ADS_CODE_1823:
+            case ADS_CODE_1824:
+            case ADS_CODE_1825:
+            case ADS_CODE_1826:
+            case ADS_CODE_1827:
+            case ADS_CODE_1828:
+            case ADS_CODE_1836:
+            case ADS_CODE_1856:
+            case ADS_CODE_1857:
+            case ADS_CODE_1858:
+            case ADS_CODE_1859:
+            case ADS_CODE_1860:
+            case ADS_CODE_1861:
+            case ADS_CODE_1862:
+            case ADS_CODE_1863:
+            case ADS_CODE_1864:
+            case ADS_CODE_1872:
+            case ADS_CODE_1873:
+            case ADS_CODE_1874:
+            case ADS_CODE_1875:
+            case ADS_CODE_1876:
+            case ADS_CODE_1877:
+            case ADS_CODE_4096:
+            case ADS_CODE_4097:
+            case ADS_CODE_4098:
+            case ADS_CODE_4099:
+            case ADS_CODE_4100:
+            case ADS_CODE_4101:
+            case ADS_CODE_4102:
+            case ADS_CODE_4103:
+            case ADS_CODE_4104:
+            case ADS_CODE_4105:
+            case ADS_CODE_4106:
+            case ADS_CODE_4107:
+            case ADS_CODE_4108:
+            case ADS_CODE_4109:
+            case ADS_CODE_4110:
+            case ADS_CODE_4111:
+            case ADS_CODE_4112:
+            case ADS_CODE_4119:
+            case ADS_CODE_4120:
+            case ADS_CODE_4121:
+            case ADS_CODE_4122:
+            case ADS_CODE_10060:
+            case ADS_CODE_10061:
+            case ADS_CODE_10065:
+                return PlcResponseCode.INTERNAL_ERROR;
+            case UNKNOWN:
+                return PlcResponseCode.INTERNAL_ERROR;
+        }
+        throw new IllegalStateException(result.toAdsReturnCode() + " not mapped");
+    }
+
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/exception/AdsException.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/exception/AdsException.java
index 4d216935a86..3f56c0e0252 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/exception/AdsException.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/exception/AdsException.java
@@ -1,57 +1,57 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.protocol.exception;
-
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
-
-public class AdsException extends PlcProtocolException {
-    private final Invoke invokeId;
-
-    public AdsException(Invoke invokeId, String message) {
-        super(message);
-        this.invokeId = invokeId;
-    }
-
-    public AdsException(Invoke invokeId, String message, Throwable cause) {
-        super(message, cause);
-        this.invokeId = invokeId;
-    }
-
-    public AdsException(Invoke invokeId, Throwable cause) {
-        super(cause);
-        this.invokeId = invokeId;
-    }
-
-    public AdsException(Invoke invokeId, String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-        this.invokeId = invokeId;
-    }
-
-    public Invoke getInvokeId() {
-        return invokeId;
-    }
-
-    @Override
-    public String toString() {
-        return "AdsException{" +
-            "invokeId=" + invokeId +
-            "} " + super.toString();
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.protocol.exception;
+
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
+
+public class AdsException extends PlcProtocolException {
+    private final Invoke invokeId;
+
+    public AdsException(Invoke invokeId, String message) {
+        super(message);
+        this.invokeId = invokeId;
+    }
+
+    public AdsException(Invoke invokeId, String message, Throwable cause) {
+        super(message, cause);
+        this.invokeId = invokeId;
+    }
+
+    public AdsException(Invoke invokeId, Throwable cause) {
+        super(cause);
+        this.invokeId = invokeId;
+    }
+
+    public AdsException(Invoke invokeId, String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+        this.invokeId = invokeId;
+    }
+
+    public Invoke getInvokeId() {
+        return invokeId;
+    }
+
+    @Override
+    public String toString() {
+        return "AdsException{" +
+            "invokeId=" + invokeId +
+            "} " + super.toString();
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/exception/AdsProtocolOverflowException.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/exception/AdsProtocolOverflowException.java
index 10f330a03b5..857ad5e5aa2 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/exception/AdsProtocolOverflowException.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/exception/AdsProtocolOverflowException.java
@@ -1,32 +1,32 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.ads.protocol.exception;
-
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-
-public class AdsProtocolOverflowException extends PlcRuntimeException {
-    public AdsProtocolOverflowException(Class<?> clazz, long length) {
-        super("Overflow in datatype " + clazz + " length: " + length);
-    }
-
-    public AdsProtocolOverflowException(String constantName, long expectedLength, long actualLength) {
-        super("Overflow of " + constantName + ": " + expectedLength + ". Actual " + actualLength + "bytes.");
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.ads.protocol.exception;
+
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+
+public class AdsProtocolOverflowException extends PlcRuntimeException {
+    public AdsProtocolOverflowException(Class<?> clazz, long length) {
+        super("Overflow in datatype " + clazz + " length: " + length);
+    }
+
+    public AdsProtocolOverflowException(String constantName, long expectedLength, long actualLength) {
+        super("Overflow of " + constantName + ": " + expectedLength + ". Actual " + actualLength + "bytes.");
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/package-info.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/package-info.java
index b5bc7820428..f178736a250 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/package-info.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/package-info.java
@@ -1,22 +1,22 @@
-/*
- 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
-
-   http://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.
- */
-/**
- * This package contains protocols that ads supports (tcp, serial)
- */
+/*
+ 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
+
+   http://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.
+ */
+/**
+ * This package contains protocols that ads supports (tcp, serial)
+ */
 package org.apache.plc4x.java.ads.protocol;
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/DigestUtil.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/DigestUtil.java
index 9971ebb725c..73afa644d63 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/DigestUtil.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/DigestUtil.java
@@ -1,59 +1,59 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.protocol.util;
-
-import com.github.snksoft.crc.CRC;
-import org.apache.plc4x.java.ads.api.util.ByteReadable;
-
-public class DigestUtil {
-
-    public static final CRC.Parameters CRC16 = CRC.Parameters.CRC16;
-
-    public static final CRC.Parameters CRC16_ADS = new CRC.Parameters(
-        CRC16.getWidth(),
-        CRC16.getPolynomial(),
-        0xFFFF,
-        CRC16.isReflectIn(),
-        CRC16.isReflectOut(),
-        CRC16.getFinalXor());
-
-    private static CRC crc = new CRC(CRC16_ADS);
-
-    private DigestUtil() {
-        // Utility class
-    }
-
-    public static int calculateCrc16(ByteReadable... byteReadables) {
-        if (byteReadables.length == 1) {
-            return calculateCrc16(byteReadables[0].getBytes());
-        }
-        long currentCrcValue = crc.init();
-        for (ByteReadable byteReadable : byteReadables) {
-            currentCrcValue = crc.update(currentCrcValue, byteReadable.getBytes());
-        }
-        short finalCrc = crc.finalCRC16(currentCrcValue);
-        return Short.toUnsignedInt(Short.reverseBytes(finalCrc));
-    }
-
-    public static int calculateCrc16(byte[] bytes) {
-        short finalCrc = (short) crc.calculateCRC(bytes);
-        return Short.toUnsignedInt(Short.reverseBytes(finalCrc));
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.protocol.util;
+
+import com.github.snksoft.crc.CRC;
+import org.apache.plc4x.java.ads.api.util.ByteReadable;
+
+public class DigestUtil {
+
+    public static final CRC.Parameters CRC16 = CRC.Parameters.CRC16;
+
+    public static final CRC.Parameters CRC16_ADS = new CRC.Parameters(
+        CRC16.getWidth(),
+        CRC16.getPolynomial(),
+        0xFFFF,
+        CRC16.isReflectIn(),
+        CRC16.isReflectOut(),
+        CRC16.getFinalXor());
+
+    private static CRC crc = new CRC(CRC16_ADS);
+
+    private DigestUtil() {
+        // Utility class
+    }
+
+    public static int calculateCrc16(ByteReadable... byteReadables) {
+        if (byteReadables.length == 1) {
+            return calculateCrc16(byteReadables[0].getBytes());
+        }
+        long currentCrcValue = crc.init();
+        for (ByteReadable byteReadable : byteReadables) {
+            currentCrcValue = crc.update(currentCrcValue, byteReadable.getBytes());
+        }
+        short finalCrc = crc.finalCRC16(currentCrcValue);
+        return Short.toUnsignedInt(Short.reverseBytes(finalCrc));
+    }
+
+    public static int calculateCrc16(byte[] bytes) {
+        short finalCrc = (short) crc.calculateCRC(bytes);
+        return Short.toUnsignedInt(Short.reverseBytes(finalCrc));
+    }
+
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/LittleEndianDecoder.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/LittleEndianDecoder.java
index f8eed411c91..4db0dd3785d 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/LittleEndianDecoder.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/LittleEndianDecoder.java
@@ -1,357 +1,357 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.protocol.util;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.NotImplementedException;
-import org.apache.plc4x.java.ads.model.AdsDataType;
-import org.apache.plc4x.java.api.exceptions.PlcUnsupportedDataTypeException;
-import org.apache.plc4x.java.base.messages.items.*;
-
-import java.io.ByteArrayOutputStream;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.ZoneOffset;
-import java.util.LinkedList;
-import java.util.concurrent.TimeUnit;
-
-// TODO: we might user ByteBuffer.wrap(buffer).order(ByteOrder.LITTLE_ENDIAN).putInt(port).asArray() etc
-public class LittleEndianDecoder {
-
-    private LittleEndianDecoder() {
-        // Utility class
-    }
-
-    @SuppressWarnings("unchecked")
-    public static BaseDefaultFieldItem decodeData(AdsDataType adsDataType, byte[] adsData) {
-        ByteBuf wrappedBuffer = Unpooled.wrappedBuffer(adsData);
-        switch (adsDataType) {
-            case BIT: {
-                LinkedList<Boolean> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    short aByte = wrappedBuffer.readUnsignedByte();
-                    values.offer(aByte != 0);
-                }
-                return new DefaultBooleanFieldItem(values.toArray(new Boolean[0]));
-            }
-            case BIT8: {
-                LinkedList<Boolean> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    short aByte = wrappedBuffer.readUnsignedByte();
-                    values.offer(aByte != 0);
-                }
-                return new DefaultBooleanFieldItem(values.toArray(new Boolean[0]));
-            }
-            case BITARR8: {
-                LinkedList<Short> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    short aByte = wrappedBuffer.readUnsignedByte();
-                    values.offer(aByte);
-                }
-                return new DefaultShortFieldItem(values.toArray(new Short[0]));
-            }
-            case BITARR16: {
-                LinkedList<Integer> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    int aLong = wrappedBuffer.readUnsignedShortLE();
-                    values.offer(aLong);
-                }
-                return new DefaultIntegerFieldItem(values.toArray(new Integer[0]));
-            }
-            case BITARR32: {
-                LinkedList<Long> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    long aLong = wrappedBuffer.readUnsignedIntLE();
-                    values.offer(aLong);
-                }
-                return new DefaultLongFieldItem(values.toArray(new Long[0]));
-            }
-            case INT8: {
-                LinkedList<Byte> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    byte aLong = wrappedBuffer.readByte();
-                    values.offer(aLong);
-                }
-                return new DefaultByteFieldItem(values.toArray(new Byte[0]));
-            }
-            case INT16: {
-                LinkedList<Short> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    short aLong = wrappedBuffer.readShortLE();
-                    values.offer(aLong);
-                }
-                return new DefaultShortFieldItem(values.toArray(new Short[0]));
-            }
-            case INT32: {
-                LinkedList<Integer> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    int intLE = wrappedBuffer.readIntLE();
-                    values.offer(intLE);
-                }
-                return new DefaultIntegerFieldItem(values.toArray(new Integer[0]));
-            }
-            case INT64: {
-                LinkedList<Long> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    long longLE = wrappedBuffer.readLongLE();
-                    values.offer(longLE);
-                }
-                return new DefaultLongFieldItem(values.toArray(new Long[0]));
-            }
-            case UINT8: {
-                LinkedList<Short> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    short aLong = wrappedBuffer.readUnsignedByte();
-                    values.offer(aLong);
-                }
-                return new DefaultShortFieldItem(values.toArray(new Short[0]));
-            }
-            case UINT16: {
-                LinkedList<Integer> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    int aLong = wrappedBuffer.readUnsignedShortLE();
-                    values.offer(aLong);
-                }
-                return new DefaultIntegerFieldItem(values.toArray(new Integer[0]));
-            }
-            case UINT32: {
-                LinkedList<Long> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    long aLong = wrappedBuffer.readUnsignedIntLE();
-                    values.offer(aLong);
-                }
-                return new DefaultLongFieldItem(values.toArray(new Long[0]));
-            }
-            case ULINT:
-            case UINT64: {
-                LinkedList<BigInteger> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    byte[] bytes = new byte[8];
-                    wrappedBuffer.readBytes(bytes);
-                    ArrayUtils.reverse(bytes);
-                    BigInteger bigInteger = new BigInteger(ArrayUtils.insert(0, bytes, (byte) 0x0));
-                    values.offer(bigInteger);
-                }
-                return new DefaultBigIntegerFieldItem(values.toArray(new BigInteger[0]));
-            }
-            case FLOAT: {
-                LinkedList<Float> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    // FIXME: Commented out till we are able to update to the latest netty version.
-                    float aLong = wrappedBuffer.readFloat();
-                    //float aLong = wrappedBuffer.readFloatLE();
-                    values.offer(aLong);
-                }
-                return new DefaultFloatFieldItem(values.toArray(new Float[0]));
-            }
-            case DOUBLE: {
-                LinkedList<Double> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    // FIXME: Commented out till we are able to update to the latest netty version.
-                    double aLong = wrappedBuffer.readDouble();
-                    //double aLong = wrappedBuffer.readDoubleLE();
-                    values.offer(aLong);
-                }
-                return new DefaultDoubleFieldItem(values.toArray(new Double[0]));
-            }
-            case BOOL: {
-                LinkedList<Boolean> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    short aByte = wrappedBuffer.readUnsignedByte();
-                    values.offer(aByte != 0);
-                }
-                return new DefaultBooleanFieldItem(values.toArray(new Boolean[0]));
-            }
-            case BYTE: {
-                LinkedList<Short> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    short aByte = wrappedBuffer.readUnsignedByte();
-                    values.offer(aByte);
-                }
-                return new DefaultShortFieldItem(values.toArray(new Short[0]));
-            }
-            case WORD: {
-                LinkedList<Integer> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    int aByte = wrappedBuffer.readUnsignedShortLE();
-                    values.offer(aByte);
-                }
-                return new DefaultIntegerFieldItem(values.toArray(new Integer[0]));
-            }
-            case DWORD: {
-                LinkedList<Long> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    long aByte = wrappedBuffer.readUnsignedIntLE();
-                    values.offer(aByte);
-                }
-                return new DefaultLongFieldItem(values.toArray(new Long[0]));
-            }
-            case SINT: {
-                LinkedList<Byte> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    byte aByte = wrappedBuffer.readByte();
-                    values.offer(aByte);
-                }
-                return new DefaultByteFieldItem(values.toArray(new Byte[0]));
-            }
-            case USINT: {
-                LinkedList<Short> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    short aByte = wrappedBuffer.readUnsignedByte();
-                    values.offer(aByte);
-                }
-                return new DefaultShortFieldItem(values.toArray(new Short[0]));
-            }
-            case INT: {
-                LinkedList<Short> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    short aByte = wrappedBuffer.readShortLE();
-                    values.offer(aByte);
-                }
-                return new DefaultShortFieldItem(values.toArray(new Short[0]));
-            }
-            case UINT: {
-                LinkedList<Integer> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    int aByte = wrappedBuffer.readUnsignedShortLE();
-                    values.offer(aByte);
-                }
-                return new DefaultIntegerFieldItem(values.toArray(new Integer[0]));
-            }
-            case DINT: {
-                LinkedList<Integer> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    int aByte = wrappedBuffer.readIntLE();
-                    values.offer(aByte);
-                }
-                return new DefaultIntegerFieldItem(values.toArray(new Integer[0]));
-            }
-            case UDINT: {
-                LinkedList<Long> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    long aByte = wrappedBuffer.readUnsignedIntLE();
-                    values.offer(aByte);
-                }
-                return new DefaultLongFieldItem(values.toArray(new Long[0]));
-            }
-            case LINT: {
-                LinkedList<Long> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    long aByte = wrappedBuffer.readLongLE();
-                    values.offer(aByte);
-                }
-                return new DefaultLongFieldItem(values.toArray(new Long[0]));
-            }
-            case REAL: {
-                LinkedList<Float> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    // FIXME: Commented out till we are able to update to the latest netty version.
-                    float aByte = wrappedBuffer.readFloat();
-                    //float aByte = wrappedBuffer.readFloatLE();
-                    values.offer(aByte);
-                }
-                return new DefaultFloatFieldItem(values.toArray(new Float[0]));
-            }
-            case LREAL: {
-                LinkedList<Double> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    // FIXME: Commented out till we are able to update to the latest netty version.
-                    double aByte = wrappedBuffer.readDouble();
-                    //double aByte = wrappedBuffer.readDoubleLE();
-                    values.offer(aByte);
-                }
-                return new DefaultDoubleFieldItem(values.toArray(new Double[0]));
-            }
-            case STRING: {
-                LinkedList<String> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    ByteArrayOutputStream os = new ByteArrayOutputStream();
-                    byte aByte;
-                    while ((aByte = wrappedBuffer.readByte()) != 0x0) {
-                        os.write(aByte);
-                    }
-                    values.offer(new String(os.toByteArray()));
-                }
-                return new DefaultStringFieldItem(values.toArray(new String[0]));
-            }
-            case TIME: {
-                LinkedList<Long> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    long aByte = wrappedBuffer.readUnsignedIntLE();
-                    values.offer(aByte);
-                }
-                return new DefaultLongFieldItem(values.toArray(new Long[0]));
-            }
-            case TIME_OF_DAY: {
-                LinkedList<LocalTime> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    long aByte = wrappedBuffer.readUnsignedIntLE();
-                    values.offer(LocalTime.ofNanoOfDay(TimeUnit.MILLISECONDS.toNanos(aByte)));
-                }
-                return new DefaultLocalTimeFieldItem(values.toArray(new LocalTime[0]));
-            }
-            case DATE: {
-                LinkedList<LocalDate> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    long aByte = wrappedBuffer.readUnsignedIntLE();
-                    // TODO: where to get the zone offset from
-                    LocalDateTime localDateTime = LocalDateTime.ofEpochSecond(aByte, 0, ZoneOffset.UTC);
-                    values.offer(localDateTime.toLocalDate());
-                }
-                return new DefaultLocalDateFieldItem(values.toArray(new LocalDate[0]));
-            }
-            case DATE_AND_TIME: {
-                LinkedList<LocalDateTime> values = new LinkedList<>();
-                while (wrappedBuffer.isReadable()) {
-                    long aByte = wrappedBuffer.readUnsignedIntLE();
-                    // TODO: where to get the zone offset from
-                    LocalDateTime localDateTime = LocalDateTime.ofEpochSecond(aByte, 0, ZoneOffset.UTC);
-                    values.offer(localDateTime);
-                }
-                return new DefaultLocalDateTimeFieldItem(values.toArray(new LocalDateTime[0]));
-            }
-            case ARRAY: {
-                throw new NotImplementedException("not implemented yet " + adsDataType);
-            }
-            case POINTER: {
-                throw new NotImplementedException("not implemented yet " + adsDataType);
-            }
-            case ENUM: {
-                throw new NotImplementedException("not implemented yet " + adsDataType);
-            }
-            case STRUCT: {
-                throw new NotImplementedException("not implemented yet " + adsDataType);
-            }
-            case ALIAS: {
-                throw new NotImplementedException("not implemented yet " + adsDataType);
-            }
-            case SUB_RANGE_DATA_TYPE: {
-                throw new NotImplementedException("not implemented yet " + adsDataType);
-            }
-            case UNKNOWN:
-            default:
-                throw new PlcUnsupportedDataTypeException("Unsupported adsDataType " + adsDataType);
-        }
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.protocol.util;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.NotImplementedException;
+import org.apache.plc4x.java.ads.model.AdsDataType;
+import org.apache.plc4x.java.api.exceptions.PlcUnsupportedDataTypeException;
+import org.apache.plc4x.java.base.messages.items.*;
+
+import java.io.ByteArrayOutputStream;
+import java.math.BigInteger;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneOffset;
+import java.util.LinkedList;
+import java.util.concurrent.TimeUnit;
+
+// TODO: we might user ByteBuffer.wrap(buffer).order(ByteOrder.LITTLE_ENDIAN).putInt(port).asArray() etc
+public class LittleEndianDecoder {
+
+    private LittleEndianDecoder() {
+        // Utility class
+    }
+
+    @SuppressWarnings("unchecked")
+    public static BaseDefaultFieldItem decodeData(AdsDataType adsDataType, byte[] adsData) {
+        ByteBuf wrappedBuffer = Unpooled.wrappedBuffer(adsData);
+        switch (adsDataType) {
+            case BIT: {
+                LinkedList<Boolean> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    short aByte = wrappedBuffer.readUnsignedByte();
+                    values.offer(aByte != 0);
+                }
+                return new DefaultBooleanFieldItem(values.toArray(new Boolean[0]));
+            }
+            case BIT8: {
+                LinkedList<Boolean> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    short aByte = wrappedBuffer.readUnsignedByte();
+                    values.offer(aByte != 0);
+                }
+                return new DefaultBooleanFieldItem(values.toArray(new Boolean[0]));
+            }
+            case BITARR8: {
+                LinkedList<Short> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    short aByte = wrappedBuffer.readUnsignedByte();
+                    values.offer(aByte);
+                }
+                return new DefaultShortFieldItem(values.toArray(new Short[0]));
+            }
+            case BITARR16: {
+                LinkedList<Integer> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    int aLong = wrappedBuffer.readUnsignedShortLE();
+                    values.offer(aLong);
+                }
+                return new DefaultIntegerFieldItem(values.toArray(new Integer[0]));
+            }
+            case BITARR32: {
+                LinkedList<Long> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    long aLong = wrappedBuffer.readUnsignedIntLE();
+                    values.offer(aLong);
+                }
+                return new DefaultLongFieldItem(values.toArray(new Long[0]));
+            }
+            case INT8: {
+                LinkedList<Byte> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    byte aLong = wrappedBuffer.readByte();
+                    values.offer(aLong);
+                }
+                return new DefaultByteFieldItem(values.toArray(new Byte[0]));
+            }
+            case INT16: {
+                LinkedList<Short> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    short aLong = wrappedBuffer.readShortLE();
+                    values.offer(aLong);
+                }
+                return new DefaultShortFieldItem(values.toArray(new Short[0]));
+            }
+            case INT32: {
+                LinkedList<Integer> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    int intLE = wrappedBuffer.readIntLE();
+                    values.offer(intLE);
+                }
+                return new DefaultIntegerFieldItem(values.toArray(new Integer[0]));
+            }
+            case INT64: {
+                LinkedList<Long> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    long longLE = wrappedBuffer.readLongLE();
+                    values.offer(longLE);
+                }
+                return new DefaultLongFieldItem(values.toArray(new Long[0]));
+            }
+            case UINT8: {
+                LinkedList<Short> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    short aLong = wrappedBuffer.readUnsignedByte();
+                    values.offer(aLong);
+                }
+                return new DefaultShortFieldItem(values.toArray(new Short[0]));
+            }
+            case UINT16: {
+                LinkedList<Integer> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    int aLong = wrappedBuffer.readUnsignedShortLE();
+                    values.offer(aLong);
+                }
+                return new DefaultIntegerFieldItem(values.toArray(new Integer[0]));
+            }
+            case UINT32: {
+                LinkedList<Long> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    long aLong = wrappedBuffer.readUnsignedIntLE();
+                    values.offer(aLong);
+                }
+                return new DefaultLongFieldItem(values.toArray(new Long[0]));
+            }
+            case ULINT:
+            case UINT64: {
+                LinkedList<BigInteger> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    byte[] bytes = new byte[8];
+                    wrappedBuffer.readBytes(bytes);
+                    ArrayUtils.reverse(bytes);
+                    BigInteger bigInteger = new BigInteger(ArrayUtils.insert(0, bytes, (byte) 0x0));
+                    values.offer(bigInteger);
+                }
+                return new DefaultBigIntegerFieldItem(values.toArray(new BigInteger[0]));
+            }
+            case FLOAT: {
+                LinkedList<Float> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    // FIXME: Commented out till we are able to update to the latest netty version.
+                    float aLong = wrappedBuffer.readFloat();
+                    //float aLong = wrappedBuffer.readFloatLE();
+                    values.offer(aLong);
+                }
+                return new DefaultFloatFieldItem(values.toArray(new Float[0]));
+            }
+            case DOUBLE: {
+                LinkedList<Double> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    // FIXME: Commented out till we are able to update to the latest netty version.
+                    double aLong = wrappedBuffer.readDouble();
+                    //double aLong = wrappedBuffer.readDoubleLE();
+                    values.offer(aLong);
+                }
+                return new DefaultDoubleFieldItem(values.toArray(new Double[0]));
+            }
+            case BOOL: {
+                LinkedList<Boolean> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    short aByte = wrappedBuffer.readUnsignedByte();
+                    values.offer(aByte != 0);
+                }
+                return new DefaultBooleanFieldItem(values.toArray(new Boolean[0]));
+            }
+            case BYTE: {
+                LinkedList<Short> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    short aByte = wrappedBuffer.readUnsignedByte();
+                    values.offer(aByte);
+                }
+                return new DefaultShortFieldItem(values.toArray(new Short[0]));
+            }
+            case WORD: {
+                LinkedList<Integer> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    int aByte = wrappedBuffer.readUnsignedShortLE();
+                    values.offer(aByte);
+                }
+                return new DefaultIntegerFieldItem(values.toArray(new Integer[0]));
+            }
+            case DWORD: {
+                LinkedList<Long> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    long aByte = wrappedBuffer.readUnsignedIntLE();
+                    values.offer(aByte);
+                }
+                return new DefaultLongFieldItem(values.toArray(new Long[0]));
+            }
+            case SINT: {
+                LinkedList<Byte> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    byte aByte = wrappedBuffer.readByte();
+                    values.offer(aByte);
+                }
+                return new DefaultByteFieldItem(values.toArray(new Byte[0]));
+            }
+            case USINT: {
+                LinkedList<Short> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    short aByte = wrappedBuffer.readUnsignedByte();
+                    values.offer(aByte);
+                }
+                return new DefaultShortFieldItem(values.toArray(new Short[0]));
+            }
+            case INT: {
+                LinkedList<Short> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    short aByte = wrappedBuffer.readShortLE();
+                    values.offer(aByte);
+                }
+                return new DefaultShortFieldItem(values.toArray(new Short[0]));
+            }
+            case UINT: {
+                LinkedList<Integer> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    int aByte = wrappedBuffer.readUnsignedShortLE();
+                    values.offer(aByte);
+                }
+                return new DefaultIntegerFieldItem(values.toArray(new Integer[0]));
+            }
+            case DINT: {
+                LinkedList<Integer> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    int aByte = wrappedBuffer.readIntLE();
+                    values.offer(aByte);
+                }
+                return new DefaultIntegerFieldItem(values.toArray(new Integer[0]));
+            }
+            case UDINT: {
+                LinkedList<Long> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    long aByte = wrappedBuffer.readUnsignedIntLE();
+                    values.offer(aByte);
+                }
+                return new DefaultLongFieldItem(values.toArray(new Long[0]));
+            }
+            case LINT: {
+                LinkedList<Long> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    long aByte = wrappedBuffer.readLongLE();
+                    values.offer(aByte);
+                }
+                return new DefaultLongFieldItem(values.toArray(new Long[0]));
+            }
+            case REAL: {
+                LinkedList<Float> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    // FIXME: Commented out till we are able to update to the latest netty version.
+                    float aByte = wrappedBuffer.readFloat();
+                    //float aByte = wrappedBuffer.readFloatLE();
+                    values.offer(aByte);
+                }
+                return new DefaultFloatFieldItem(values.toArray(new Float[0]));
+            }
+            case LREAL: {
+                LinkedList<Double> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    // FIXME: Commented out till we are able to update to the latest netty version.
+                    double aByte = wrappedBuffer.readDouble();
+                    //double aByte = wrappedBuffer.readDoubleLE();
+                    values.offer(aByte);
+                }
+                return new DefaultDoubleFieldItem(values.toArray(new Double[0]));
+            }
+            case STRING: {
+                LinkedList<String> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    ByteArrayOutputStream os = new ByteArrayOutputStream();
+                    byte aByte;
+                    while ((aByte = wrappedBuffer.readByte()) != 0x0) {
+                        os.write(aByte);
+                    }
+                    values.offer(new String(os.toByteArray()));
+                }
+                return new DefaultStringFieldItem(values.toArray(new String[0]));
+            }
+            case TIME: {
+                LinkedList<Long> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    long aByte = wrappedBuffer.readUnsignedIntLE();
+                    values.offer(aByte);
+                }
+                return new DefaultLongFieldItem(values.toArray(new Long[0]));
+            }
+            case TIME_OF_DAY: {
+                LinkedList<LocalTime> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    long aByte = wrappedBuffer.readUnsignedIntLE();
+                    values.offer(LocalTime.ofNanoOfDay(TimeUnit.MILLISECONDS.toNanos(aByte)));
+                }
+                return new DefaultLocalTimeFieldItem(values.toArray(new LocalTime[0]));
+            }
+            case DATE: {
+                LinkedList<LocalDate> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    long aByte = wrappedBuffer.readUnsignedIntLE();
+                    // TODO: where to get the zone offset from
+                    LocalDateTime localDateTime = LocalDateTime.ofEpochSecond(aByte, 0, ZoneOffset.UTC);
+                    values.offer(localDateTime.toLocalDate());
+                }
+                return new DefaultLocalDateFieldItem(values.toArray(new LocalDate[0]));
+            }
+            case DATE_AND_TIME: {
+                LinkedList<LocalDateTime> values = new LinkedList<>();
+                while (wrappedBuffer.isReadable()) {
+                    long aByte = wrappedBuffer.readUnsignedIntLE();
+                    // TODO: where to get the zone offset from
+                    LocalDateTime localDateTime = LocalDateTime.ofEpochSecond(aByte, 0, ZoneOffset.UTC);
+                    values.offer(localDateTime);
+                }
+                return new DefaultLocalDateTimeFieldItem(values.toArray(new LocalDateTime[0]));
+            }
+            case ARRAY: {
+                throw new NotImplementedException("not implemented yet " + adsDataType);
+            }
+            case POINTER: {
+                throw new NotImplementedException("not implemented yet " + adsDataType);
+            }
+            case ENUM: {
+                throw new NotImplementedException("not implemented yet " + adsDataType);
+            }
+            case STRUCT: {
+                throw new NotImplementedException("not implemented yet " + adsDataType);
+            }
+            case ALIAS: {
+                throw new NotImplementedException("not implemented yet " + adsDataType);
+            }
+            case SUB_RANGE_DATA_TYPE: {
+                throw new NotImplementedException("not implemented yet " + adsDataType);
+            }
+            case UNKNOWN:
+            default:
+                throw new PlcUnsupportedDataTypeException("Unsupported adsDataType " + adsDataType);
+        }
+    }
+
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/LittleEndianEncoder.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/LittleEndianEncoder.java
index 573032b11e0..74d2e1d9fb1 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/LittleEndianEncoder.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/LittleEndianEncoder.java
@@ -1,285 +1,285 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.protocol.util;
-
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.plc4x.java.ads.model.AdsDataType;
-import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
-import org.apache.plc4x.java.api.exceptions.PlcProtocolPayloadTooBigException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.exceptions.PlcUnsupportedDataTypeException;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.nio.charset.Charset;
-import java.time.*;
-import java.time.temporal.ChronoUnit;
-import java.util.Arrays;
-import java.util.stream.Stream;
-
-// TODO: we might user ByteBuffer.wrap(buffer).order(ByteOrder.LITTLE_ENDIAN).putInt(port).asArray() etc
-public class LittleEndianEncoder {
-
-    private LittleEndianEncoder() {
-        // Utility class
-    }
-
-    public static byte[] encodeData(AdsDataType adsDataType, Object... values) throws PlcProtocolException {
-        if (values.length == 0) {
-            return new byte[]{};
-        }
-        Class<?> valueType = values[0].getClass();
-        Stream<byte[]> result;
-        if (valueType == Boolean.class) {
-            result = encodeBoolean(adsDataType, Arrays.stream(values).map(Boolean.class::cast));
-        } else if (valueType == Byte.class) {
-            result = encodeByte(adsDataType, Arrays.stream(values).map(Byte.class::cast));
-        } else if (valueType == Short.class) {
-            result = encodeShort(adsDataType, Arrays.stream(values).map(Short.class::cast));
-        } else if (valueType == Integer.class) {
-            result = encodeInteger(adsDataType, Arrays.stream(values).map(Integer.class::cast));
-        } else if (valueType == Long.class) {
-            result = encodeLong(adsDataType, Arrays.stream(values).map(Long.class::cast));
-        } else if (valueType == BigInteger.class) {
-            result = encodeBigInteger(adsDataType, Arrays.stream(values).map(BigInteger.class::cast));
-        } else if (valueType == LocalTime.class) {
-            result = encodeLocalTime(adsDataType, Arrays.stream(values).map(LocalTime.class::cast));
-        } else if (valueType == LocalDate.class) {
-            result = encodeLocalDate(adsDataType, Arrays.stream(values).map(LocalDate.class::cast));
-        } else if (valueType == LocalDateTime.class) {
-            result = encodeLocalDateTime(adsDataType, Arrays.stream(values).map(LocalDateTime.class::cast));
-        } else if (valueType == Float.class) {
-            result = encodeFloat(adsDataType, Arrays.stream(values).map(Float.class::cast));
-        } else if (valueType == Double.class) {
-            result = encodeDouble(adsDataType, Arrays.stream(values).map(Double.class::cast));
-        } else if (valueType == String.class) {
-            result = encodeString(adsDataType, Arrays.stream(values).map(String.class::cast));
-        } else if (valueType == byte[].class) {
-            result = encodeByteArray(adsDataType, Arrays.stream(values).map(byte[].class::cast));
-        } else if (valueType == Byte[].class) {
-            result = encodeBigByteArray(adsDataType, Arrays.stream(values).map(Byte[].class::cast));
-        } else {
-            throw new PlcUnsupportedDataTypeException(valueType);
-        }
-
-        // TODO: maybe we can replace this by a smarter flatmap
-        try {
-            return result.collect(
-                ByteArrayOutputStream::new,
-                (bos, byteValue) -> {
-                    try {
-                        bos.write(byteValue);
-                    } catch (IOException e) {
-                        throw new PlcRuntimeException(e);
-                    }
-                },
-                (a, b) -> {
-                }).toByteArray();
-        } catch (PlcRuntimeException e) {
-            throw new PlcProtocolException("Error encoding data", e);
-        }
-    }
-
-    private static Stream<byte[]> encodeString(AdsDataType adsDataType, Stream<String> stringStream) {
-        // TODO: add boundchecks and add optional extension
-        // TODO: what do we do with utf-8 values with 2 bytes? what is the charset here?
-        return stringStream
-            .map(s -> s.getBytes(Charset.defaultCharset()))
-            // TODO: this 0 termination is from s7 but might be completly wrong in ads. Guess its a terminator
-            .map(bytes -> ArrayUtils.add(bytes, (byte) 0x0));
-    }
-
-    private static Stream<byte[]> encodeByteArray(AdsDataType adsDataType, Stream<byte[]> byteArrayStream) {
-        // TODO: add boundchecks and add optional extension
-        return byteArrayStream
-            .peek(bytes -> {
-                if (bytes.length > adsDataType.getTargetByteSize()) {
-                    throw new PlcRuntimeException(new PlcProtocolPayloadTooBigException("ads", adsDataType.getTargetByteSize(), bytes.length, bytes));
-                }
-            });
-    }
-
-    private static Stream<byte[]> encodeBigByteArray(AdsDataType adsDataType, Stream<Byte[]> byteArrayStream) {
-        // TODO: add boundchecks and add optional extension
-        return byteArrayStream.map(ArrayUtils::toPrimitive)
-            .peek(bytes -> {
-                if (bytes.length > adsDataType.getTargetByteSize()) {
-                    throw new PlcRuntimeException(new PlcProtocolPayloadTooBigException("ads", adsDataType.getTargetByteSize(), bytes.length, bytes));
-                }
-            });
-    }
-
-    private static Stream<byte[]> encodeFloat(AdsDataType adsDataType, Stream<Float> floatStream) {
-        return floatStream
-            .peek(value -> checkBound(adsDataType, value))
-            // TODO: check how ads expects this data
-            .map(Float::floatToIntBits)
-            .map(intValue -> new byte[]{
-                (byte) (intValue & 0x000000ff),
-                (byte) ((intValue & 0x0000ff00) >> 8),
-                (byte) ((intValue & 0x00ff0000) >> 16),
-                (byte) ((intValue & 0xff000000) >> 24),
-            })
-            .map(bytes -> Arrays.copyOf(bytes, adsDataType.getTargetByteSize()));
-    }
-
-    private static Stream<byte[]> encodeDouble(AdsDataType adsDataType, Stream<Double> doubleStream) {
-        return doubleStream
-            .peek(value -> checkBound(adsDataType, value))
-            // TODO: check how ads expects this data
-            .map(Double::doubleToLongBits)
-            .map(longValue -> new byte[]{
-                (byte) (longValue & 0x00000000_000000ffL),
-                (byte) ((longValue & 0x00000000_0000ff00L) >> 8),
-                (byte) ((longValue & 0x00000000_00ff0000L) >> 16),
-                (byte) ((longValue & 0x00000000_ff000000L) >> 24),
-                (byte) ((longValue & 0x000000ff_00000000L) >> 32),
-                (byte) ((longValue & 0x0000ff00_00000000L) >> 40),
-                (byte) ((longValue & 0x00ff0000_00000000L) >> 48),
-                (byte) ((longValue & 0xff000000_00000000L) >> 56),
-            })
-            .map(bytes -> Arrays.copyOf(bytes, adsDataType.getTargetByteSize()));
-    }
-
-    private static Stream<byte[]> encodeInteger(AdsDataType adsDataType, Stream<Integer> integerStream) {
-        return integerStream
-            .peek(value -> checkBound(adsDataType, value))
-            .map(intValue -> new byte[]{
-                (byte) (intValue & 0x000000ff),
-                (byte) ((intValue & 0x0000ff00) >> 8),
-                (byte) ((intValue & 0x00ff0000) >> 16),
-                (byte) ((intValue & 0xff000000) >> 24),
-            })
-            .map(bytes -> Arrays.copyOf(bytes, adsDataType.getTargetByteSize()));
-    }
-
-    private static Stream<byte[]> encodeLong(AdsDataType adsDataType, Stream<Long> longStream) {
-        return longStream
-            .peek(value -> checkBound(adsDataType, value))
-            .map(longValue -> new byte[]{
-                (byte) (longValue & 0x00000000_000000ffL),
-                (byte) ((longValue & 0x00000000_0000ff00L) >> 8),
-                (byte) ((longValue & 0x00000000_00ff0000L) >> 16),
-                (byte) ((longValue & 0x00000000_ff000000L) >> 24),
-                (byte) ((longValue & 0x000000ff_00000000L) >> 32),
-                (byte) ((longValue & 0x0000ff00_00000000L) >> 40),
-                (byte) ((longValue & 0x00ff0000_00000000L) >> 48),
-                (byte) ((longValue & 0xff000000_00000000L) >> 56),
-            })
-            .map(bytes -> Arrays.copyOf(bytes, adsDataType.getTargetByteSize()));
-    }
-
-    private static Stream<byte[]> encodeBigInteger(AdsDataType adsDataType, Stream<BigInteger> bigIntegerStream) {
-        // TODO: add boundchecks and add optional extension
-        return bigIntegerStream
-            .map(bigIntValue -> {
-                byte[] bytes = bigIntValue.toByteArray();
-                if (bytes.length > 1 && bytes[0] == 0x0) {
-                    byte[] subArray = Arrays.copyOf(ArrayUtils.subarray(bytes, 1, bytes.length), adsDataType.getTargetByteSize());
-                    ArrayUtils.reverse(subArray);
-                    return subArray;
-                } else {
-                    ArrayUtils.reverse(Arrays.copyOf(bytes, adsDataType.getTargetByteSize()));
-                    return bytes;
-                }
-            })
-            .map(bytes -> Arrays.copyOf(bytes, adsDataType.getTargetByteSize()));
-    }
-
-    private static Stream<byte[]> encodeLocalTime(AdsDataType adsDataType, Stream<LocalTime> localTimeStream) {
-        return localTimeStream
-            .map(localTime -> ChronoUnit.MILLIS.between(LocalTime.of(0, 0), localTime))
-            .peek(value -> checkBound(adsDataType, value))
-            .map(Long::intValue)
-            .map(time -> new byte[]{
-                (byte) (time & 0x00000000_000000ffL),
-                (byte) ((time & 0x00000000_0000ff00L) >> 8),
-                (byte) ((time & 0x00000000_00ff0000L) >> 16),
-                (byte) ((time & 0x00000000_ff000000L) >> 24),
-            })
-            .map(bytes -> Arrays.copyOf(bytes, adsDataType.getTargetByteSize()));
-    }
-
-    private static Stream<byte[]> encodeLocalDate(AdsDataType adsDataType, Stream<LocalDate> localDateStream) {
-        return localDateStream
-            // TODO: fixme: which offset should we use?
-            .map(localDate -> localDate.atTime(0, 0).toInstant(ZoneOffset.UTC))
-            .map(Instant::getEpochSecond)
-            .peek(value -> checkBound(adsDataType, value))
-            .map(Long::intValue)
-            .map(time -> new byte[]{
-                (byte) (time & 0x00000000_000000ffL),
-                (byte) ((time & 0x00000000_0000ff00L) >> 8),
-                (byte) ((time & 0x00000000_00ff0000L) >> 16),
-                (byte) ((time & 0x00000000_ff000000L) >> 24),
-            })
-            .map(bytes -> Arrays.copyOf(bytes, adsDataType.getTargetByteSize()));
-    }
-
-    private static Stream<byte[]> encodeLocalDateTime(AdsDataType adsDataType, Stream<LocalDateTime> localDateTimeStream) {
-        return localDateTimeStream
-            // TODO: fixme: which offset should we use?
-            .map(localDateTime -> localDateTime.toInstant(ZoneOffset.UTC))
-            .map(Instant::getEpochSecond)
-            .peek(value -> checkBound(adsDataType, value))
-            .map(time -> new byte[]{
-                (byte) (time & 0x00000000_000000ffL),
-                (byte) ((time & 0x00000000_0000ff00L) >> 8),
-                (byte) ((time & 0x00000000_00ff0000L) >> 16),
-                (byte) ((time & 0x00000000_ff000000L) >> 24),
-
-                (byte) ((time & 0x000000ff_00000000L) >> 32),
-                (byte) ((time & 0x0000ff00_00000000L) >> 40),
-                (byte) ((time & 0x00ff0000_00000000L) >> 48),
-                (byte) ((time & 0xff000000_00000000L) >> 56),
-            })
-            .map(bytes -> Arrays.copyOf(bytes, adsDataType.getTargetByteSize()));
-    }
-
-
-    private static Stream<byte[]> encodeShort(AdsDataType adsDataType, Stream<Short> shortStream) {
-        return shortStream
-            .peek(value -> checkBound(adsDataType, value))
-            .map(shortValue -> new byte[]{
-                (byte) (shortValue & 0x00ff),
-                (byte) ((shortValue & 0xff00) >> 8),
-            })
-            .map(bytes -> Arrays.copyOf(bytes, adsDataType.getTargetByteSize()));
-    }
-
-    private static Stream<byte[]> encodeByte(AdsDataType adsDataType, Stream<Byte> byteStream) {
-        return byteStream
-            .peek(value -> checkBound(adsDataType, value))
-            .map(aByte -> new byte[]{aByte})
-            .map(bytes -> Arrays.copyOf(bytes, adsDataType.getTargetByteSize()));
-    }
-
-    private static Stream<byte[]> encodeBoolean(AdsDataType adsDataType, Stream<Boolean> booleanStream) {
-        return booleanStream
-            .map(booleanValue -> new byte[]{booleanValue ? (byte) 0x01 : (byte) 0x00})
-            .map(bytes -> Arrays.copyOf(bytes, adsDataType.getTargetByteSize()));
-    }
-
-    private static void checkBound(AdsDataType adsDataType, double other) {
-        if (!adsDataType.withinBounds(other)) {
-            throw new PlcRuntimeException(other + " not within bounds of " + adsDataType);
-        }
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.protocol.util;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.plc4x.java.ads.model.AdsDataType;
+import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
+import org.apache.plc4x.java.api.exceptions.PlcProtocolPayloadTooBigException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.exceptions.PlcUnsupportedDataTypeException;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.nio.charset.Charset;
+import java.time.*;
+import java.time.temporal.ChronoUnit;
+import java.util.Arrays;
+import java.util.stream.Stream;
+
+// TODO: we might user ByteBuffer.wrap(buffer).order(ByteOrder.LITTLE_ENDIAN).putInt(port).asArray() etc
+public class LittleEndianEncoder {
+
+    private LittleEndianEncoder() {
+        // Utility class
+    }
+
+    public static byte[] encodeData(AdsDataType adsDataType, Object... values) throws PlcProtocolException {
+        if (values.length == 0) {
+            return new byte[]{};
+        }
+        Class<?> valueType = values[0].getClass();
+        Stream<byte[]> result;
+        if (valueType == Boolean.class) {
+            result = encodeBoolean(adsDataType, Arrays.stream(values).map(Boolean.class::cast));
+        } else if (valueType == Byte.class) {
+            result = encodeByte(adsDataType, Arrays.stream(values).map(Byte.class::cast));
+        } else if (valueType == Short.class) {
+            result = encodeShort(adsDataType, Arrays.stream(values).map(Short.class::cast));
+        } else if (valueType == Integer.class) {
+            result = encodeInteger(adsDataType, Arrays.stream(values).map(Integer.class::cast));
+        } else if (valueType == Long.class) {
+            result = encodeLong(adsDataType, Arrays.stream(values).map(Long.class::cast));
+        } else if (valueType == BigInteger.class) {
+            result = encodeBigInteger(adsDataType, Arrays.stream(values).map(BigInteger.class::cast));
+        } else if (valueType == LocalTime.class) {
+            result = encodeLocalTime(adsDataType, Arrays.stream(values).map(LocalTime.class::cast));
+        } else if (valueType == LocalDate.class) {
+            result = encodeLocalDate(adsDataType, Arrays.stream(values).map(LocalDate.class::cast));
+        } else if (valueType == LocalDateTime.class) {
+            result = encodeLocalDateTime(adsDataType, Arrays.stream(values).map(LocalDateTime.class::cast));
+        } else if (valueType == Float.class) {
+            result = encodeFloat(adsDataType, Arrays.stream(values).map(Float.class::cast));
+        } else if (valueType == Double.class) {
+            result = encodeDouble(adsDataType, Arrays.stream(values).map(Double.class::cast));
+        } else if (valueType == String.class) {
+            result = encodeString(adsDataType, Arrays.stream(values).map(String.class::cast));
+        } else if (valueType == byte[].class) {
+            result = encodeByteArray(adsDataType, Arrays.stream(values).map(byte[].class::cast));
+        } else if (valueType == Byte[].class) {
+            result = encodeBigByteArray(adsDataType, Arrays.stream(values).map(Byte[].class::cast));
+        } else {
+            throw new PlcUnsupportedDataTypeException(valueType);
+        }
+
+        // TODO: maybe we can replace this by a smarter flatmap
+        try {
+            return result.collect(
+                ByteArrayOutputStream::new,
+                (bos, byteValue) -> {
+                    try {
+                        bos.write(byteValue);
+                    } catch (IOException e) {
+                        throw new PlcRuntimeException(e);
+                    }
+                },
+                (a, b) -> {
+                }).toByteArray();
+        } catch (PlcRuntimeException e) {
+            throw new PlcProtocolException("Error encoding data", e);
+        }
+    }
+
+    private static Stream<byte[]> encodeString(AdsDataType adsDataType, Stream<String> stringStream) {
+        // TODO: add boundchecks and add optional extension
+        // TODO: what do we do with utf-8 values with 2 bytes? what is the charset here?
+        return stringStream
+            .map(s -> s.getBytes(Charset.defaultCharset()))
+            // TODO: this 0 termination is from s7 but might be completly wrong in ads. Guess its a terminator
+            .map(bytes -> ArrayUtils.add(bytes, (byte) 0x0));
+    }
+
+    private static Stream<byte[]> encodeByteArray(AdsDataType adsDataType, Stream<byte[]> byteArrayStream) {
+        // TODO: add boundchecks and add optional extension
+        return byteArrayStream
+            .peek(bytes -> {
+                if (bytes.length > adsDataType.getTargetByteSize()) {
+                    throw new PlcRuntimeException(new PlcProtocolPayloadTooBigException("ads", adsDataType.getTargetByteSize(), bytes.length, bytes));
+                }
+            });
+    }
+
+    private static Stream<byte[]> encodeBigByteArray(AdsDataType adsDataType, Stream<Byte[]> byteArrayStream) {
+        // TODO: add boundchecks and add optional extension
+        return byteArrayStream.map(ArrayUtils::toPrimitive)
+            .peek(bytes -> {
+                if (bytes.length > adsDataType.getTargetByteSize()) {
+                    throw new PlcRuntimeException(new PlcProtocolPayloadTooBigException("ads", adsDataType.getTargetByteSize(), bytes.length, bytes));
+                }
+            });
+    }
+
+    private static Stream<byte[]> encodeFloat(AdsDataType adsDataType, Stream<Float> floatStream) {
+        return floatStream
+            .peek(value -> checkBound(adsDataType, value))
+            // TODO: check how ads expects this data
+            .map(Float::floatToIntBits)
+            .map(intValue -> new byte[]{
+                (byte) (intValue & 0x000000ff),
+                (byte) ((intValue & 0x0000ff00) >> 8),
+                (byte) ((intValue & 0x00ff0000) >> 16),
+                (byte) ((intValue & 0xff000000) >> 24),
+            })
+            .map(bytes -> Arrays.copyOf(bytes, adsDataType.getTargetByteSize()));
+    }
+
+    private static Stream<byte[]> encodeDouble(AdsDataType adsDataType, Stream<Double> doubleStream) {
+        return doubleStream
+            .peek(value -> checkBound(adsDataType, value))
+            // TODO: check how ads expects this data
+            .map(Double::doubleToLongBits)
+            .map(longValue -> new byte[]{
+                (byte) (longValue & 0x00000000_000000ffL),
+                (byte) ((longValue & 0x00000000_0000ff00L) >> 8),
+                (byte) ((longValue & 0x00000000_00ff0000L) >> 16),
+                (byte) ((longValue & 0x00000000_ff000000L) >> 24),
+                (byte) ((longValue & 0x000000ff_00000000L) >> 32),
+                (byte) ((longValue & 0x0000ff00_00000000L) >> 40),
+                (byte) ((longValue & 0x00ff0000_00000000L) >> 48),
+                (byte) ((longValue & 0xff000000_00000000L) >> 56),
+            })
+            .map(bytes -> Arrays.copyOf(bytes, adsDataType.getTargetByteSize()));
+    }
+
+    private static Stream<byte[]> encodeInteger(AdsDataType adsDataType, Stream<Integer> integerStream) {
+        return integerStream
+            .peek(value -> checkBound(adsDataType, value))
+            .map(intValue -> new byte[]{
+                (byte) (intValue & 0x000000ff),
+                (byte) ((intValue & 0x0000ff00) >> 8),
+                (byte) ((intValue & 0x00ff0000) >> 16),
+                (byte) ((intValue & 0xff000000) >> 24),
+            })
+            .map(bytes -> Arrays.copyOf(bytes, adsDataType.getTargetByteSize()));
+    }
+
+    private static Stream<byte[]> encodeLong(AdsDataType adsDataType, Stream<Long> longStream) {
+        return longStream
+            .peek(value -> checkBound(adsDataType, value))
+            .map(longValue -> new byte[]{
+                (byte) (longValue & 0x00000000_000000ffL),
+                (byte) ((longValue & 0x00000000_0000ff00L) >> 8),
+                (byte) ((longValue & 0x00000000_00ff0000L) >> 16),
+                (byte) ((longValue & 0x00000000_ff000000L) >> 24),
+                (byte) ((longValue & 0x000000ff_00000000L) >> 32),
+                (byte) ((longValue & 0x0000ff00_00000000L) >> 40),
+                (byte) ((longValue & 0x00ff0000_00000000L) >> 48),
+                (byte) ((longValue & 0xff000000_00000000L) >> 56),
+            })
+            .map(bytes -> Arrays.copyOf(bytes, adsDataType.getTargetByteSize()));
+    }
+
+    private static Stream<byte[]> encodeBigInteger(AdsDataType adsDataType, Stream<BigInteger> bigIntegerStream) {
+        // TODO: add boundchecks and add optional extension
+        return bigIntegerStream
+            .map(bigIntValue -> {
+                byte[] bytes = bigIntValue.toByteArray();
+                if (bytes.length > 1 && bytes[0] == 0x0) {
+                    byte[] subArray = Arrays.copyOf(ArrayUtils.subarray(bytes, 1, bytes.length), adsDataType.getTargetByteSize());
+                    ArrayUtils.reverse(subArray);
+                    return subArray;
+                } else {
+                    ArrayUtils.reverse(Arrays.copyOf(bytes, adsDataType.getTargetByteSize()));
+                    return bytes;
+                }
+            })
+            .map(bytes -> Arrays.copyOf(bytes, adsDataType.getTargetByteSize()));
+    }
+
+    private static Stream<byte[]> encodeLocalTime(AdsDataType adsDataType, Stream<LocalTime> localTimeStream) {
+        return localTimeStream
+            .map(localTime -> ChronoUnit.MILLIS.between(LocalTime.of(0, 0), localTime))
+            .peek(value -> checkBound(adsDataType, value))
+            .map(Long::intValue)
+            .map(time -> new byte[]{
+                (byte) (time & 0x00000000_000000ffL),
+                (byte) ((time & 0x00000000_0000ff00L) >> 8),
+                (byte) ((time & 0x00000000_00ff0000L) >> 16),
+                (byte) ((time & 0x00000000_ff000000L) >> 24),
+            })
+            .map(bytes -> Arrays.copyOf(bytes, adsDataType.getTargetByteSize()));
+    }
+
+    private static Stream<byte[]> encodeLocalDate(AdsDataType adsDataType, Stream<LocalDate> localDateStream) {
+        return localDateStream
+            // TODO: fixme: which offset should we use?
+            .map(localDate -> localDate.atTime(0, 0).toInstant(ZoneOffset.UTC))
+            .map(Instant::getEpochSecond)
+            .peek(value -> checkBound(adsDataType, value))
+            .map(Long::intValue)
+            .map(time -> new byte[]{
+                (byte) (time & 0x00000000_000000ffL),
+                (byte) ((time & 0x00000000_0000ff00L) >> 8),
+                (byte) ((time & 0x00000000_00ff0000L) >> 16),
+                (byte) ((time & 0x00000000_ff000000L) >> 24),
+            })
+            .map(bytes -> Arrays.copyOf(bytes, adsDataType.getTargetByteSize()));
+    }
+
+    private static Stream<byte[]> encodeLocalDateTime(AdsDataType adsDataType, Stream<LocalDateTime> localDateTimeStream) {
+        return localDateTimeStream
+            // TODO: fixme: which offset should we use?
+            .map(localDateTime -> localDateTime.toInstant(ZoneOffset.UTC))
+            .map(Instant::getEpochSecond)
+            .peek(value -> checkBound(adsDataType, value))
+            .map(time -> new byte[]{
+                (byte) (time & 0x00000000_000000ffL),
+                (byte) ((time & 0x00000000_0000ff00L) >> 8),
+                (byte) ((time & 0x00000000_00ff0000L) >> 16),
+                (byte) ((time & 0x00000000_ff000000L) >> 24),
+
+                (byte) ((time & 0x000000ff_00000000L) >> 32),
+                (byte) ((time & 0x0000ff00_00000000L) >> 40),
+                (byte) ((time & 0x00ff0000_00000000L) >> 48),
+                (byte) ((time & 0xff000000_00000000L) >> 56),
+            })
+            .map(bytes -> Arrays.copyOf(bytes, adsDataType.getTargetByteSize()));
+    }
+
+
+    private static Stream<byte[]> encodeShort(AdsDataType adsDataType, Stream<Short> shortStream) {
+        return shortStream
+            .peek(value -> checkBound(adsDataType, value))
+            .map(shortValue -> new byte[]{
+                (byte) (shortValue & 0x00ff),
+                (byte) ((shortValue & 0xff00) >> 8),
+            })
+            .map(bytes -> Arrays.copyOf(bytes, adsDataType.getTargetByteSize()));
+    }
+
+    private static Stream<byte[]> encodeByte(AdsDataType adsDataType, Stream<Byte> byteStream) {
+        return byteStream
+            .peek(value -> checkBound(adsDataType, value))
+            .map(aByte -> new byte[]{aByte})
+            .map(bytes -> Arrays.copyOf(bytes, adsDataType.getTargetByteSize()));
+    }
+
+    private static Stream<byte[]> encodeBoolean(AdsDataType adsDataType, Stream<Boolean> booleanStream) {
+        return booleanStream
+            .map(booleanValue -> new byte[]{booleanValue ? (byte) 0x01 : (byte) 0x00})
+            .map(bytes -> Arrays.copyOf(bytes, adsDataType.getTargetByteSize()));
+    }
+
+    private static void checkBound(AdsDataType adsDataType, double other) {
+        if (!adsDataType.withinBounds(other)) {
+            throw new PlcRuntimeException(other + " not within bounds of " + adsDataType);
+        }
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/SingleMessageRateLimiter.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/SingleMessageRateLimiter.java
index 1f33c3b96c7..b5664dda2a6 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/SingleMessageRateLimiter.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/SingleMessageRateLimiter.java
@@ -1,124 +1,124 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.protocol.util;
-
-import io.netty.channel.ChannelDuplexHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelPromise;
-import io.netty.util.concurrent.ScheduledFuture;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.SocketAddress;
-import java.util.ArrayDeque;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-/**
- * Inspired by {@code ChannelTrafficShapingHandler} this limiter ensures only one message is sent at a time.
- */
-public class SingleMessageRateLimiter extends ChannelDuplexHandler {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(SingleMessageRateLimiter.class);
-
-    private final ArrayDeque<ToSend> messagesQueue = new ArrayDeque<>();
-
-    private AtomicBoolean messageOnTheWay = new AtomicBoolean(false);
-
-    private ScheduledFuture<?> sender;
-
-    @Override
-    public void bind(ChannelHandlerContext ctx, SocketAddress localAddress, ChannelPromise promise) throws Exception {
-        LOGGER.debug("bind({}, {}, {})", ctx, localAddress, promise);
-        super.bind(ctx, localAddress, promise);
-    }
-
-    @Override
-    public void deregister(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception {
-        LOGGER.debug("deregister({}, {})", ctx, promise);
-        super.deregister(ctx, promise);
-    }
-
-    @Override
-    public void connect(ChannelHandlerContext ctx, SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise) throws Exception {
-        LOGGER.debug("connect({}, {}, {}, {})", ctx, remoteAddress, localAddress, promise);
-        sender = ctx.executor().scheduleAtFixedRate(() -> {
-            LOGGER.trace("Woke up and doing work messageOnTheWay:{}, messageQueue:{}", messageOnTheWay, messagesQueue);
-            if (!messagesQueue.isEmpty() && messageOnTheWay.compareAndSet(false, true)) {
-                ToSend pop = messagesQueue.pop();
-                LOGGER.debug("Sending {}", pop);
-                pop.channelHandlerContext.writeAndFlush(pop.objectToSend, pop.promise);
-                LOGGER.debug("Send {}", pop);
-            }
-        }, 100, 10, TimeUnit.MILLISECONDS);
-        super.connect(ctx, remoteAddress, localAddress, promise);
-    }
-
-    @Override
-    public void disconnect(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception {
-        LOGGER.debug("disconnect({}, {}, {}, {})", ctx, promise);
-        sender.cancel(false);
-        super.disconnect(ctx, promise);
-    }
-
-    @Override
-    public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) {
-        LOGGER.trace("(<--OUT): {}, {}, {}", ctx, msg, promise);
-        if (messageOnTheWay.compareAndSet(false, true)) {
-            ctx.write(msg, promise);
-        } else {
-            messagesQueue.add(new ToSend(ctx, msg, promise));
-        }
-    }
-
-    @Override
-    public void read(ChannelHandlerContext ctx) throws Exception {
-        LOGGER.trace("(-->In): {}", ctx);
-        messageOnTheWay.set(false);
-        super.read(ctx);
-    }
-
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        LOGGER.trace("(-->ERR): {}", ctx, cause);
-        messageOnTheWay.set(false);
-        super.exceptionCaught(ctx, cause);
-    }
-
-    private static final class ToSend {
-        final ChannelHandlerContext channelHandlerContext;
-        final Object objectToSend;
-        final ChannelPromise promise;
-
-        private ToSend(ChannelHandlerContext channelHandlerContext, Object objectToSend, ChannelPromise promise) {
-            this.channelHandlerContext = channelHandlerContext;
-            this.objectToSend = objectToSend;
-            this.promise = promise;
-        }
-
-        @Override
-        public String toString() {
-            return "ToSend{" +
-                "channelHandlerContext=" + channelHandlerContext +
-                ", objectToSend=" + objectToSend +
-                ", promise=" + promise +
-                '}';
-        }
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.protocol.util;
+
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.util.concurrent.ScheduledFuture;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.SocketAddress;
+import java.util.ArrayDeque;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * Inspired by {@code ChannelTrafficShapingHandler} this limiter ensures only one message is sent at a time.
+ */
+public class SingleMessageRateLimiter extends ChannelDuplexHandler {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(SingleMessageRateLimiter.class);
+
+    private final ArrayDeque<ToSend> messagesQueue = new ArrayDeque<>();
+
+    private AtomicBoolean messageOnTheWay = new AtomicBoolean(false);
+
+    private ScheduledFuture<?> sender;
+
+    @Override
+    public void bind(ChannelHandlerContext ctx, SocketAddress localAddress, ChannelPromise promise) throws Exception {
+        LOGGER.debug("bind({}, {}, {})", ctx, localAddress, promise);
+        super.bind(ctx, localAddress, promise);
+    }
+
+    @Override
+    public void deregister(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception {
+        LOGGER.debug("deregister({}, {})", ctx, promise);
+        super.deregister(ctx, promise);
+    }
+
+    @Override
+    public void connect(ChannelHandlerContext ctx, SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise) throws Exception {
+        LOGGER.debug("connect({}, {}, {}, {})", ctx, remoteAddress, localAddress, promise);
+        sender = ctx.executor().scheduleAtFixedRate(() -> {
+            LOGGER.trace("Woke up and doing work messageOnTheWay:{}, messageQueue:{}", messageOnTheWay, messagesQueue);
+            if (!messagesQueue.isEmpty() && messageOnTheWay.compareAndSet(false, true)) {
+                ToSend pop = messagesQueue.pop();
+                LOGGER.debug("Sending {}", pop);
+                pop.channelHandlerContext.writeAndFlush(pop.objectToSend, pop.promise);
+                LOGGER.debug("Send {}", pop);
+            }
+        }, 100, 10, TimeUnit.MILLISECONDS);
+        super.connect(ctx, remoteAddress, localAddress, promise);
+    }
+
+    @Override
+    public void disconnect(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception {
+        LOGGER.debug("disconnect({}, {}, {}, {})", ctx, promise);
+        sender.cancel(false);
+        super.disconnect(ctx, promise);
+    }
+
+    @Override
+    public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) {
+        LOGGER.trace("(<--OUT): {}, {}, {}", ctx, msg, promise);
+        if (messageOnTheWay.compareAndSet(false, true)) {
+            ctx.write(msg, promise);
+        } else {
+            messagesQueue.add(new ToSend(ctx, msg, promise));
+        }
+    }
+
+    @Override
+    public void read(ChannelHandlerContext ctx) throws Exception {
+        LOGGER.trace("(-->In): {}", ctx);
+        messageOnTheWay.set(false);
+        super.read(ctx);
+    }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+        LOGGER.trace("(-->ERR): {}", ctx, cause);
+        messageOnTheWay.set(false);
+        super.exceptionCaught(ctx, cause);
+    }
+
+    private static final class ToSend {
+        final ChannelHandlerContext channelHandlerContext;
+        final Object objectToSend;
+        final ChannelPromise promise;
+
+        private ToSend(ChannelHandlerContext channelHandlerContext, Object objectToSend, ChannelPromise promise) {
+            this.channelHandlerContext = channelHandlerContext;
+            this.objectToSend = objectToSend;
+            this.promise = promise;
+        }
+
+        @Override
+        public String toString() {
+            return "ToSend{" +
+                "channelHandlerContext=" + channelHandlerContext +
+                ", objectToSend=" + objectToSend +
+                ", promise=" + promise +
+                '}';
+        }
+    }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/package-info.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/package-info.java
index f37a8089853..ad7486d5bcb 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/package-info.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/package-info.java
@@ -1,22 +1,22 @@
-/*
- 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
-
-   http://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.
- */
-/**
- * This package contains utils regarding endianess and crc digest.
- */
+/*
+ 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
+
+   http://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.
+ */
+/**
+ * This package contains utils regarding endianess and crc digest.
+ */
 package org.apache.plc4x.java.ads.protocol.util;
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/site/asciidoc/index.adoc b/plc4j/protocols/ads/src/site/asciidoc/index.adoc
index c32ea1d2130..68a21e17377 100644
--- a/plc4j/protocols/ads/src/site/asciidoc/index.adoc
+++ b/plc4j/protocols/ads/src/site/asciidoc/index.adoc
@@ -1,86 +1,86 @@
-//
-//  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
-//
-//      http://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.
-//
-:imagesdir: ./images/
-
-== ADS Protocol Java Implementation
-
-// TODO: change this copy&paste from S7... document me
-
-The current version of the ADS protocol java driver is based upon Netty 4 (http://netty.io/).
-
-As the ADS protocol running on TCP is a hierarchy of protocols, the ADS driver is implemented by providing several Protocol implementations, each encoding one layer of the protocol stack.
-
-The complete pipeline for the ADS protocol looks like this:
-
-[blockdiag,ads-netty-pipeline]
-....
-{
-    Application -> ADSPlcConnection;
-    Socket -> PLC;
-
-    group {
-        label = "PLC4X ADS Driver"
-        color = "#77FF77";
-
-        ADSPlcConnection -> Plc4XADSProtocol -> ADSProtocol -> Socket
-
-        group {
-            Plc4XADSProtocol; ADSProtocol;
-        }
-    }
-}
-....
-
-Each protocol layer implementation extends the class `MessageToMessageCodec` and is configured to consume/encode messages in the current format into messages of the next lower layer.
-
-The highest layer hereby consumes PLC4X messages, which are defined in the `plc4j-api` module, and the lowest layer produces a simple byte output.
-
-In order to implement the ADS Protocol as described in link:../../../protocols/ads/index.html[ADS Protocol] internally this is what happens inside the driver as soon as a connection is requested:
-
-[seqdiag,ads-netty-setup-communication]
-....
-{
-    Application; ADSPlcConnection; Plc4XADSProtocol; ADSProtocol; Socket; PLC;
-
-    group Pipeline {
-       "Plc4XADSProtocol";
-        "ADSProtocol";
-    }
-
-    Application -> ADSPlcConnection [label = "Calls 'connect'"]
-    ADSPlcConnection -->  Socket [label = "Creates the byte array\ncontaining the TCP on ISO\nmessage"]
-    Socket -> PLC [label = "Sends the raw byte data to\nthe PLC"]
-
-    Socket <-- PLC [label = "Sends the response to the\nSocket"]
-    Socket -> ADSProtocol [label = "Passes the binary data to\nthe pipeline"]
-    ADSPlcConnection <- ADSProtocol [label = "Sends ADSConnectionEvent(SETUP_COMPLETE) event to the\npipeline", note = "ADSPlcConnection listens for ADSConnectionEvent(SETUP_COMPLETE) events"]
-
-}
-....
-
-Above picture is a simplification. The communication of the outside with the pipeline is not implemented in a way that one component directly addresses the other.
-It is more that all communication is done with the `pipeline` and Netty then takes care of calling the right component at the right time.
-
-When writing to the pipeline from an application Netty starts at the `top` of the pipeline and asks each pipeline level if it is able and willing to handle the current message.
-If it does, the message is passed in to the `encode` method and the next component is supplied with the output of this.
-If the component can't process the message the next level is checked with the unmodified message.
-
-When reading from the Socket the Netty processes the pipeline elements the same way, but in the opposite direction and a pipeline elements `decode` method is called instead of `encode`.
-
-In addition to the normal flow of messages, a Netty pipeline also provides a messaging system. Every component can fire so-called `user events` and every component can react on them by implementing a `userEventTriggered` method.
-
+//
+//  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
+//
+//      http://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.
+//
+:imagesdir: ./images/
+
+== ADS Protocol Java Implementation
+
+// TODO: change this copy&paste from S7... document me
+
+The current version of the ADS protocol java driver is based upon Netty 4 (http://netty.io/).
+
+As the ADS protocol running on TCP is a hierarchy of protocols, the ADS driver is implemented by providing several Protocol implementations, each encoding one layer of the protocol stack.
+
+The complete pipeline for the ADS protocol looks like this:
+
+[blockdiag,ads-netty-pipeline]
+....
+{
+    Application -> ADSPlcConnection;
+    Socket -> PLC;
+
+    group {
+        label = "PLC4X ADS Driver"
+        color = "#77FF77";
+
+        ADSPlcConnection -> Plc4XADSProtocol -> ADSProtocol -> Socket
+
+        group {
+            Plc4XADSProtocol; ADSProtocol;
+        }
+    }
+}
+....
+
+Each protocol layer implementation extends the class `MessageToMessageCodec` and is configured to consume/encode messages in the current format into messages of the next lower layer.
+
+The highest layer hereby consumes PLC4X messages, which are defined in the `plc4j-api` module, and the lowest layer produces a simple byte output.
+
+In order to implement the ADS Protocol as described in link:../../../protocols/ads/index.html[ADS Protocol] internally this is what happens inside the driver as soon as a connection is requested:
+
+[seqdiag,ads-netty-setup-communication]
+....
+{
+    Application; ADSPlcConnection; Plc4XADSProtocol; ADSProtocol; Socket; PLC;
+
+    group Pipeline {
+       "Plc4XADSProtocol";
+        "ADSProtocol";
+    }
+
+    Application -> ADSPlcConnection [label = "Calls 'connect'"]
+    ADSPlcConnection -->  Socket [label = "Creates the byte array\ncontaining the TCP on ISO\nmessage"]
+    Socket -> PLC [label = "Sends the raw byte data to\nthe PLC"]
+
+    Socket <-- PLC [label = "Sends the response to the\nSocket"]
+    Socket -> ADSProtocol [label = "Passes the binary data to\nthe pipeline"]
+    ADSPlcConnection <- ADSProtocol [label = "Sends ADSConnectionEvent(SETUP_COMPLETE) event to the\npipeline", note = "ADSPlcConnection listens for ADSConnectionEvent(SETUP_COMPLETE) events"]
+
+}
+....
+
+Above picture is a simplification. The communication of the outside with the pipeline is not implemented in a way that one component directly addresses the other.
+It is more that all communication is done with the `pipeline` and Netty then takes care of calling the right component at the right time.
+
+When writing to the pipeline from an application Netty starts at the `top` of the pipeline and asks each pipeline level if it is able and willing to handle the current message.
+If it does, the message is passed in to the `encode` method and the next component is supplied with the output of this.
+If the component can't process the message the next level is checked with the unmodified message.
+
+When reading from the Socket the Netty processes the pipeline elements the same way, but in the opposite direction and a pipeline elements `decode` method is called instead of `encode`.
+
+In addition to the normal flow of messages, a Netty pipeline also provides a messaging system. Every component can fire so-called `user events` and every component can react on them by implementing a `userEventTriggered` method.
+
 This functionality is mainly used during connection setup to synchronize the sending of messages on the different layers of the protocol stack.
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/groovy/org/apache/plc4x/java/ads/protocol/util/LittleEndianDecoderSpec.groovy b/plc4j/protocols/ads/src/test/groovy/org/apache/plc4x/java/ads/protocol/util/LittleEndianDecoderSpec.groovy
index 1fcd099d6ba..95ab4119121 100644
--- a/plc4j/protocols/ads/src/test/groovy/org/apache/plc4x/java/ads/protocol/util/LittleEndianDecoderSpec.groovy
+++ b/plc4j/protocols/ads/src/test/groovy/org/apache/plc4x/java/ads/protocol/util/LittleEndianDecoderSpec.groovy
@@ -1,99 +1,99 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.ads.protocol.util
-
-import org.apache.plc4x.java.ads.model.AdsDataType
-import org.apache.plc4x.java.api.exceptions.PlcProtocolException
-import org.apache.plc4x.java.api.exceptions.PlcUnsupportedDataTypeException
-import spock.lang.Ignore
-import spock.lang.Specification
-import spock.lang.Unroll
-
-import static org.apache.plc4x.java.ads.model.AdsDataType.*
-
-class LittleEndianDecoderSpec extends Specification {
-    @Unroll
-    def "decode of #adsdt.name() using get#retrievalType.simpleName [#expectedValues]"(AdsDataType adsdt, def retrievalType, def expectedValues, def rawData) {
-        when:
-        def fieldItem = LittleEndianDecoder.decodeData(adsdt, rawData)
-
-        and:
-        def data = []
-        (0..fieldItem.numberOfValues - 1).forEach({ index ->
-            data << fieldItem."get${retrievalType.simpleName}"(index)
-        })
-
-        then:
-        assert data == expectedValues
-        where:
-        adsdt  | retrievalType | expectedValues                                     | rawData
-        BIT    | Boolean       | [true, false]                                      | [0x1, 0x0] as byte[]
-        BIT    | Byte          | [1, 0]                                             | [0x1, 0x0] as byte[]
-        BIT    | Short         | [1]                                                | [0x1] as byte[]
-        BIT    | Short         | [1]                                                | [0x1] as byte[]
-        BIT    | Short         | [1, 0]                                             | [0x1, 0x0] as byte[]
-
-        INT    | Byte          | [1]                                                | [0x1, 0x0] as byte[]
-        INT    | Short         | [1]                                                | [0x1, 0x0] as byte[]
-        INT    | Short         | [256]                                              | [0x0, 0x1] as byte[]
-        INT    | Short         | [256, 256]                                         | [0x0, 0x1, 0x0, 0x1] as byte[]
-        INT    | Integer       | [1]                                                | [0x1, 0x0] as byte[]
-        INT    | Integer       | [256]                                              | [0x0, 0x1] as byte[]
-        INT    | Integer       | [256, 256]                                         | [0x0, 0x1, 0x0, 0x1] as byte[]
-        INT    | Float         | [1.0f]                                             | [0x1, 0x0] as byte[]
-        INT    | Float         | [256f]                                             | [0x0, 0x1] as byte[]
-        INT    | Float         | [256f, 256f]                                       | [0x0, 0x1, 0x0, 0x1] as byte[]
-        INT    | Double        | [1d]                                               | [0x1, 0x0] as byte[]
-        INT    | Double        | [256d]                                             | [0x0, 0x1] as byte[]
-        INT    | Double        | [256d, 256d]                                       | [0x0, 0x1, 0x0, 0x1] as byte[]
-
-        INT32  | Integer       | [16777216]                                         | [0x0, 0x0, 0x0, 0x1] as byte[]
-        INT32  | Integer       | [16777216, 16777216]                               | [0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1] as byte[]
-
-        /*REAL   | Float         | [1.4E-45f]                                         | [0x1, 0x0, 0x0, 0x0] as byte[]
-        REAL   | Float         | [2.3509887E-38f]                                   | [0x0, 0x0, 0x0, 0x1] as byte[]
-        REAL   | Float         | [2.3509887E-38f, 2.3509887E-38f]                   | [0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1] as byte[]
-
-        LREAL  | Double        | [4.9E-324]                                         | [0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0] as byte[]
-        LREAL  | Double        | [7.2911220195563975E-304]                          | [0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1] as byte[]
-        LREAL  | Double        | [7.2911220195563975E-304, 7.2911220195563975E-304] | [0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1] as byte[]*/
-
-        STRING | String        | ["plc4x"]                                          | [0x70, 0x6c, 0x63, 0x34, 0x78, 0x0] as byte[]
-        STRING | String        | ["plc4xplc4x"]                                     | [0x70, 0x6c, 0x63, 0x34, 0x78, 0x70, 0x6c, 0x63, 0x34, 0x78, 0x0] as byte[]
-        STRING | String        | ["plc4x", "plc4x"]                                 | [0x70, 0x6c, 0x63, 0x34, 0x78, 0x0, 0x70, 0x6c, 0x63, 0x34, 0x78, 0x0] as byte[]
-    }
-
-    @Ignore("Needs finishing")
-    def "failure test with string"() {
-        when:
-        LittleEndianDecoder.decodeData(STRING, [0x01] as byte[])
-
-        then:
-        thrown PlcProtocolException
-    }
-
-    def "failure test with unsupported data type"() {
-        when:
-        LittleEndianDecoder.decodeData(UNKNOWN, new byte[10])
-
-        then:
-        thrown PlcUnsupportedDataTypeException
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.ads.protocol.util
+
+import org.apache.plc4x.java.ads.model.AdsDataType
+import org.apache.plc4x.java.api.exceptions.PlcProtocolException
+import org.apache.plc4x.java.api.exceptions.PlcUnsupportedDataTypeException
+import spock.lang.Ignore
+import spock.lang.Specification
+import spock.lang.Unroll
+
+import static org.apache.plc4x.java.ads.model.AdsDataType.*
+
+class LittleEndianDecoderSpec extends Specification {
+    @Unroll
+    def "decode of #adsdt.name() using get#retrievalType.simpleName [#expectedValues]"(AdsDataType adsdt, def retrievalType, def expectedValues, def rawData) {
+        when:
+        def fieldItem = LittleEndianDecoder.decodeData(adsdt, rawData)
+
+        and:
+        def data = []
+        (0..fieldItem.numberOfValues - 1).forEach({ index ->
+            data << fieldItem."get${retrievalType.simpleName}"(index)
+        })
+
+        then:
+        assert data == expectedValues
+        where:
+        adsdt  | retrievalType | expectedValues                                     | rawData
+        BIT    | Boolean       | [true, false]                                      | [0x1, 0x0] as byte[]
+        BIT    | Byte          | [1, 0]                                             | [0x1, 0x0] as byte[]
+        BIT    | Short         | [1]                                                | [0x1] as byte[]
+        BIT    | Short         | [1]                                                | [0x1] as byte[]
+        BIT    | Short         | [1, 0]                                             | [0x1, 0x0] as byte[]
+
+        INT    | Byte          | [1]                                                | [0x1, 0x0] as byte[]
+        INT    | Short         | [1]                                                | [0x1, 0x0] as byte[]
+        INT    | Short         | [256]                                              | [0x0, 0x1] as byte[]
+        INT    | Short         | [256, 256]                                         | [0x0, 0x1, 0x0, 0x1] as byte[]
+        INT    | Integer       | [1]                                                | [0x1, 0x0] as byte[]
+        INT    | Integer       | [256]                                              | [0x0, 0x1] as byte[]
+        INT    | Integer       | [256, 256]                                         | [0x0, 0x1, 0x0, 0x1] as byte[]
+        INT    | Float         | [1.0f]                                             | [0x1, 0x0] as byte[]
+        INT    | Float         | [256f]                                             | [0x0, 0x1] as byte[]
+        INT    | Float         | [256f, 256f]                                       | [0x0, 0x1, 0x0, 0x1] as byte[]
+        INT    | Double        | [1d]                                               | [0x1, 0x0] as byte[]
+        INT    | Double        | [256d]                                             | [0x0, 0x1] as byte[]
+        INT    | Double        | [256d, 256d]                                       | [0x0, 0x1, 0x0, 0x1] as byte[]
+
+        INT32  | Integer       | [16777216]                                         | [0x0, 0x0, 0x0, 0x1] as byte[]
+        INT32  | Integer       | [16777216, 16777216]                               | [0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1] as byte[]
+
+        /*REAL   | Float         | [1.4E-45f]                                         | [0x1, 0x0, 0x0, 0x0] as byte[]
+        REAL   | Float         | [2.3509887E-38f]                                   | [0x0, 0x0, 0x0, 0x1] as byte[]
+        REAL   | Float         | [2.3509887E-38f, 2.3509887E-38f]                   | [0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1] as byte[]
+
+        LREAL  | Double        | [4.9E-324]                                         | [0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0] as byte[]
+        LREAL  | Double        | [7.2911220195563975E-304]                          | [0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1] as byte[]
+        LREAL  | Double        | [7.2911220195563975E-304, 7.2911220195563975E-304] | [0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1] as byte[]*/
+
+        STRING | String        | ["plc4x"]                                          | [0x70, 0x6c, 0x63, 0x34, 0x78, 0x0] as byte[]
+        STRING | String        | ["plc4xplc4x"]                                     | [0x70, 0x6c, 0x63, 0x34, 0x78, 0x70, 0x6c, 0x63, 0x34, 0x78, 0x0] as byte[]
+        STRING | String        | ["plc4x", "plc4x"]                                 | [0x70, 0x6c, 0x63, 0x34, 0x78, 0x0, 0x70, 0x6c, 0x63, 0x34, 0x78, 0x0] as byte[]
+    }
+
+    @Ignore("Needs finishing")
+    def "failure test with string"() {
+        when:
+        LittleEndianDecoder.decodeData(STRING, [0x01] as byte[])
+
+        then:
+        thrown PlcProtocolException
+    }
+
+    def "failure test with unsupported data type"() {
+        when:
+        LittleEndianDecoder.decodeData(UNKNOWN, new byte[10])
+
+        then:
+        thrown PlcUnsupportedDataTypeException
+    }
+}
diff --git a/plc4j/protocols/ads/src/test/groovy/org/apache/plc4x/java/ads/protocol/util/LittleEndianEncoderSpec.groovy b/plc4j/protocols/ads/src/test/groovy/org/apache/plc4x/java/ads/protocol/util/LittleEndianEncoderSpec.groovy
index 56a02b67dc5..7501c0f71f3 100644
--- a/plc4j/protocols/ads/src/test/groovy/org/apache/plc4x/java/ads/protocol/util/LittleEndianEncoderSpec.groovy
+++ b/plc4j/protocols/ads/src/test/groovy/org/apache/plc4x/java/ads/protocol/util/LittleEndianEncoderSpec.groovy
@@ -1,53 +1,53 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.ads.protocol.util
-
-import org.apache.plc4x.java.ads.model.AdsDataType
-import spock.lang.Specification
-import spock.lang.Unroll
-
-import static org.apache.plc4x.java.ads.model.AdsDataType.*
-
-class LittleEndianEncoderSpec extends Specification {
-    @Unroll
-    def "encode of #adsdt.name() using #values"(AdsDataType adsdt, def expectedBytes, def values) {
-        when:
-        def bytes = LittleEndianEncoder.encodeData(adsdt, *values)
-
-        then:
-        assert expectedBytes == bytes
-        where:
-        adsdt  | expectedBytes                                                                                                          | values
-        SINT   | [0x01, 0x00, 0x01, 0x00] as byte[]                                                                                     | [true, false, true, false]
-
-        SINT   | [0x12, 0x03, 0x05, 0x7f] as byte[]                                                                                     | [0x12, 0x03, 0x05, 0x7f] as byte[]
-        INT    | [0x1, 0x00] as byte[]                                                                                                  | [1] as short[]
-        INT    | [0x0e, 0x00, 0x50, 0x00] as byte[]                                                                                     | [14, 80] as short[]
-        INT32  | [0x5a, 0x0a, 0x00, 0x00] as byte[]                                                                                     | [2650]
-        INT32  | [0x5a, 0x0a, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00] as byte[]                                                             | [2650, 80]
-        REAL   | [0xc3, 0xf5, 0x48, 0x40] as byte[]                                                                                     | [3.14f]
-        REAL   | [0xc3, 0xf5, 0x48, 0x40, 0x14, 0xae, 0x07, 0x40] as byte[]                                                             | [3.14f, 2.12f]
-        LREAL  | [0x1F, 0x85, 0xEB, 0x51, 0xB8, 0x1E, 0x09, 0x40] as byte[]                                                             | [3.14d]
-        LREAL  | [0x1F, 0x85, 0xEB, 0x51, 0xB8, 0x1E, 0x09, 0x40, 0xF6, 0x28, 0x5C, 0x8F, 0xC2, 0xF5, 0x00, 0x40] as byte[]             | [3.14d, 2.12d]
-        STRING | [0x70, 0x6c, 0x63, 0x34, 0x78, 0x00] as byte[]                                                                         | ["plc4x"]
-        STRING | [0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x21, 0x00] as byte[]                                     | ["HelloWorld!"]
-        STRING | [0x70, 0x6c, 0x63, 0x34, 0x78, 0x00, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x21, 0x00] as byte[] | ["plc4x", "HelloWorld!"]
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.ads.protocol.util
+
+import org.apache.plc4x.java.ads.model.AdsDataType
+import spock.lang.Specification
+import spock.lang.Unroll
+
+import static org.apache.plc4x.java.ads.model.AdsDataType.*
+
+class LittleEndianEncoderSpec extends Specification {
+    @Unroll
+    def "encode of #adsdt.name() using #values"(AdsDataType adsdt, def expectedBytes, def values) {
+        when:
+        def bytes = LittleEndianEncoder.encodeData(adsdt, *values)
+
+        then:
+        assert expectedBytes == bytes
+        where:
+        adsdt  | expectedBytes                                                                                                          | values
+        SINT   | [0x01, 0x00, 0x01, 0x00] as byte[]                                                                                     | [true, false, true, false]
+
+        SINT   | [0x12, 0x03, 0x05, 0x7f] as byte[]                                                                                     | [0x12, 0x03, 0x05, 0x7f] as byte[]
+        INT    | [0x1, 0x00] as byte[]                                                                                                  | [1] as short[]
+        INT    | [0x0e, 0x00, 0x50, 0x00] as byte[]                                                                                     | [14, 80] as short[]
+        INT32  | [0x5a, 0x0a, 0x00, 0x00] as byte[]                                                                                     | [2650]
+        INT32  | [0x5a, 0x0a, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00] as byte[]                                                             | [2650, 80]
+        REAL   | [0xc3, 0xf5, 0x48, 0x40] as byte[]                                                                                     | [3.14f]
+        REAL   | [0xc3, 0xf5, 0x48, 0x40, 0x14, 0xae, 0x07, 0x40] as byte[]                                                             | [3.14f, 2.12f]
+        LREAL  | [0x1F, 0x85, 0xEB, 0x51, 0xB8, 0x1E, 0x09, 0x40] as byte[]                                                             | [3.14d]
+        LREAL  | [0x1F, 0x85, 0xEB, 0x51, 0xB8, 0x1E, 0x09, 0x40, 0xF6, 0x28, 0x5C, 0x8F, 0xC2, 0xF5, 0x00, 0x40] as byte[]             | [3.14d, 2.12d]
+        STRING | [0x70, 0x6c, 0x63, 0x34, 0x78, 0x00] as byte[]                                                                         | ["plc4x"]
+        STRING | [0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x21, 0x00] as byte[]                                     | ["HelloWorld!"]
+        STRING | [0x70, 0x6c, 0x63, 0x34, 0x78, 0x00, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x21, 0x00] as byte[] | ["plc4x", "HelloWorld!"]
+    }
+}
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/AdsDumper.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/AdsDumper.java
index 5ebd7cb68b3..449cd4ccb3b 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/AdsDumper.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/AdsDumper.java
@@ -1,114 +1,114 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads;
-
-import org.apache.commons.lang3.RandomStringUtils;
-import org.apache.plc4x.java.ads.api.commands.AdsWriteRequest;
-import org.apache.plc4x.java.ads.api.commands.types.Data;
-import org.apache.plc4x.java.ads.api.commands.types.IndexGroup;
-import org.apache.plc4x.java.ads.api.commands.types.IndexOffset;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-import org.apache.plc4x.java.ads.api.tcp.AmsTCPPacket;
-import org.apache.plc4x.java.ads.api.tcp.types.UserData;
-import org.apache.plc4x.java.mock.connection.tcp.TcpHexDumper;
-import org.pcap4j.core.PcapDumper;
-import org.pcap4j.core.PcapHandle;
-import org.pcap4j.core.Pcaps;
-import org.pcap4j.packet.*;
-import org.pcap4j.packet.namednumber.*;
-import org.pcap4j.util.MacAddress;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.Inet4Address;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-public class AdsDumper {
-
-    private static final Logger logger = LoggerFactory.getLogger(AdsDumper.class);
-
-    public static void main(String... args) throws Exception {
-        Path dumpFile = Files.createTempFile("pcapdump", ".pcap");
-
-        try (PcapHandle handle = Pcaps.openDead(DataLinkType.EN10MB, 65536);
-             PcapDumper dumper = handle.dumpOpen(dumpFile.toAbsolutePath().toString())) {
-
-            String randomString = RandomStringUtils.randomAscii(1024);
-
-            AdsWriteRequest adsWriteRequest = AdsWriteRequest.of(
-                AmsNetId.of("192.168.99.101.1.1"),
-                AmsPort.of(851),
-                AmsNetId.of("192.168.99.1.1.1"),
-                AmsPort.of(14),
-                Invoke.of(0),
-                IndexGroup.of(1),
-                IndexOffset.of(3),
-                Data.of(randomString.getBytes())
-            );
-            AmsTCPPacket amsTCPPacket = AmsTCPPacket.of(UserData.of(adsWriteRequest.getBytes()));
-
-            //try (TcpHexDumper tcpHexDumper = TcpHexDumper.runOn(55862); Socket localhost = new Socket("localhost", tcpHexDumper.getPort())) {
-            try (TcpHexDumper tcpHexDumper = TcpHexDumper.runOn(55862); Socket localhost = new Socket("192.168.99.100", 48898)) {
-                localhost.getOutputStream().write(amsTCPPacket.getBytes());
-            }
-
-            UnknownPacket.Builder amsPacket = new UnknownPacket.Builder();
-            amsPacket.rawData(amsTCPPacket.getBytes());
-
-            TcpPacket.Builder tcpPacketBuilder = new TcpPacket.Builder();
-            tcpPacketBuilder
-                .srcAddr(InetAddress.getLocalHost())
-                .srcPort(TcpPort.getInstance((short) 13))
-                .dstAddr(InetAddress.getLocalHost())
-                .dstPort(TcpPort.getInstance((short) 48898))
-                .payloadBuilder(amsPacket)
-                .correctChecksumAtBuild(true)
-                .correctLengthAtBuild(true);
-
-            IpV4Packet.Builder ipv4PacketBuilder = new IpV4Packet.Builder();
-            ipv4PacketBuilder
-                .version(IpVersion.IPV4)
-                .tos(IpV4Rfc1349Tos.newInstance((byte) 0x75))
-                .protocol(IpNumber.TCP)
-                .srcAddr((Inet4Address) InetAddress.getLocalHost())
-                .dstAddr((Inet4Address) InetAddress.getLocalHost())
-                .payloadBuilder(tcpPacketBuilder)
-                .correctChecksumAtBuild(true)
-                .correctLengthAtBuild(true);
-
-            EthernetPacket.Builder etherPacketBuilder = new EthernetPacket.Builder();
-            etherPacketBuilder
-                .srcAddr(MacAddress.getByName("fe:00:00:00:00:01"))
-                .dstAddr(MacAddress.getByName("fe:00:00:00:00:02"))
-                .type(EtherType.IPV4)
-                .payloadBuilder(ipv4PacketBuilder)
-                .paddingAtBuild(true);
-
-            dumper.dump(etherPacketBuilder.build());
-            dumper.flush();
-
-            logger.info("Wrote {}", dumpFile);
-        }
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads;
+
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.plc4x.java.ads.api.commands.AdsWriteRequest;
+import org.apache.plc4x.java.ads.api.commands.types.Data;
+import org.apache.plc4x.java.ads.api.commands.types.IndexGroup;
+import org.apache.plc4x.java.ads.api.commands.types.IndexOffset;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+import org.apache.plc4x.java.ads.api.tcp.AmsTCPPacket;
+import org.apache.plc4x.java.ads.api.tcp.types.UserData;
+import org.apache.plc4x.java.mock.connection.tcp.TcpHexDumper;
+import org.pcap4j.core.PcapDumper;
+import org.pcap4j.core.PcapHandle;
+import org.pcap4j.core.Pcaps;
+import org.pcap4j.packet.*;
+import org.pcap4j.packet.namednumber.*;
+import org.pcap4j.util.MacAddress;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+public class AdsDumper {
+
+    private static final Logger logger = LoggerFactory.getLogger(AdsDumper.class);
+
+    public static void main(String... args) throws Exception {
+        Path dumpFile = Files.createTempFile("pcapdump", ".pcap");
+
+        try (PcapHandle handle = Pcaps.openDead(DataLinkType.EN10MB, 65536);
+             PcapDumper dumper = handle.dumpOpen(dumpFile.toAbsolutePath().toString())) {
+
+            String randomString = RandomStringUtils.randomAscii(1024);
+
+            AdsWriteRequest adsWriteRequest = AdsWriteRequest.of(
+                AmsNetId.of("192.168.99.101.1.1"),
+                AmsPort.of(851),
+                AmsNetId.of("192.168.99.1.1.1"),
+                AmsPort.of(14),
+                Invoke.of(0),
+                IndexGroup.of(1),
+                IndexOffset.of(3),
+                Data.of(randomString.getBytes())
+            );
+            AmsTCPPacket amsTCPPacket = AmsTCPPacket.of(UserData.of(adsWriteRequest.getBytes()));
+
+            //try (TcpHexDumper tcpHexDumper = TcpHexDumper.runOn(55862); Socket localhost = new Socket("localhost", tcpHexDumper.getPort())) {
+            try (TcpHexDumper tcpHexDumper = TcpHexDumper.runOn(55862); Socket localhost = new Socket("192.168.99.100", 48898)) {
+                localhost.getOutputStream().write(amsTCPPacket.getBytes());
+            }
+
+            UnknownPacket.Builder amsPacket = new UnknownPacket.Builder();
+            amsPacket.rawData(amsTCPPacket.getBytes());
+
+            TcpPacket.Builder tcpPacketBuilder = new TcpPacket.Builder();
+            tcpPacketBuilder
+                .srcAddr(InetAddress.getLocalHost())
+                .srcPort(TcpPort.getInstance((short) 13))
+                .dstAddr(InetAddress.getLocalHost())
+                .dstPort(TcpPort.getInstance((short) 48898))
+                .payloadBuilder(amsPacket)
+                .correctChecksumAtBuild(true)
+                .correctLengthAtBuild(true);
+
+            IpV4Packet.Builder ipv4PacketBuilder = new IpV4Packet.Builder();
+            ipv4PacketBuilder
+                .version(IpVersion.IPV4)
+                .tos(IpV4Rfc1349Tos.newInstance((byte) 0x75))
+                .protocol(IpNumber.TCP)
+                .srcAddr((Inet4Address) InetAddress.getLocalHost())
+                .dstAddr((Inet4Address) InetAddress.getLocalHost())
+                .payloadBuilder(tcpPacketBuilder)
+                .correctChecksumAtBuild(true)
+                .correctLengthAtBuild(true);
+
+            EthernetPacket.Builder etherPacketBuilder = new EthernetPacket.Builder();
+            etherPacketBuilder
+                .srcAddr(MacAddress.getByName("fe:00:00:00:00:01"))
+                .dstAddr(MacAddress.getByName("fe:00:00:00:00:02"))
+                .type(EtherType.IPV4)
+                .payloadBuilder(ipv4PacketBuilder)
+                .paddingAtBuild(true);
+
+            dumper.dump(etherPacketBuilder.build());
+            dumper.flush();
+
+            logger.info("Wrote {}", dumpFile);
+        }
+    }
+}
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java
index 3d4e5aa45f2..b7d9e915dd2 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java
@@ -1,94 +1,94 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads;
-
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.messages.*;
-import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
-
-import java.time.Duration;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-public class ManualPlc4XAdsTest {
-
-    public static void main(String... args) throws Exception {
-        String connectionUrl;
-        if (args.length > 0 && "serial".equalsIgnoreCase(args[0])) {
-            System.out.println("Using serial");
-            connectionUrl = "ads:serial:///dev/ttys003/10.10.64.40.1.1:851/10.10.56.23.1.1:30000";
-        } else {
-            System.out.println("Using tcp");
-            connectionUrl = "ads:tcp://10.10.64.40/10.10.64.40.1.1:851/10.10.56.23.1.1:30000";
-        }
-        // TODO: temporary workaround
-        Thread.currentThread().setUncaughtExceptionHandler((t, e) -> {
-            System.err.println(t + " - " + e.getMessage());
-            e.printStackTrace(System.err);
-            System.exit(1);
-        });
-        try (PlcConnection plcConnection = new PlcDriverManager().getConnection(connectionUrl)) {
-            System.out.println("PlcConnection " + plcConnection);
-
-            PlcReadRequest.Builder readRequestBuilder = plcConnection.readRequestBuilder();
-            PlcReadRequest readRequest = readRequestBuilder.addItem("station", "Allgemein_S2.Station:BYTE").build();
-            CompletableFuture<? extends PlcReadResponse> response = readRequest.execute();
-            PlcReadResponse readResponse = response.get();
-            System.out.println("Response " + readResponse);
-            Collection<Integer> stations = readResponse.getAllIntegers("station");
-            stations.forEach(System.out::println);
-
-            // 2. We build a subscription
-            PlcSubscriptionRequest.Builder subscriptionRequestBuilder = plcConnection.subscriptionRequestBuilder();
-            PlcSubscriptionRequest subscriptionRequest = subscriptionRequestBuilder
-                .addChangeOfStateField("stationChange", "Allgemein_S2.Station:BYTE")
-                .addCyclicField("stationChange2", "Allgemein_S2.Station:BYTE", Duration.ofSeconds(3))
-                .build();
-            PlcSubscriptionResponse plcSubscriptionResponse = subscriptionRequest.execute().get();
-
-            List<PlcConsumerRegistration> plcConsumerRegistrations = plcSubscriptionResponse.getSubscriptionHandles().stream()
-                .map(plcSubscriptionHandle -> plcSubscriptionHandle.register(plcSubscriptionEvent -> {
-                    int stationChange = plcSubscriptionEvent.getNumberOfValues("stationChange");
-                    int stationChange2 = plcSubscriptionEvent.getNumberOfValues("stationChange2");
-                    System.out.println(String.format("%s: [%d]- StationsNummer: {%d}", plcSubscriptionEvent.getTimestamp(), stationChange + stationChange2, plcSubscriptionEvent.getInteger("stationChange2")));
-                }))
-                .collect(Collectors.toList());
-
-            // Now we wait a bit
-            TimeUnit.SECONDS.sleep(10);
-
-            // we unregister the listener
-            plcConsumerRegistrations.forEach(PlcConsumerRegistration::unregister);
-
-            // we unsubscribe at the plc
-            PlcUnsubscriptionRequest.Builder unsubscriptionRequestBuilder = plcConnection.unsubscriptionRequestBuilder();
-            PlcUnsubscriptionRequest unsubscriptionRequest = unsubscriptionRequestBuilder.addHandles(plcSubscriptionResponse.getSubscriptionHandles()).build();
-            CompletableFuture<PlcUnsubscriptionResponse> unsubscriptionResponse = unsubscriptionRequest.execute();
-
-            unsubscriptionResponse
-                .get(5, TimeUnit.SECONDS);
-            System.out.println(unsubscriptionResponse);
-        }
-        System.exit(0);
-    }
-}
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads;
+
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.messages.*;
+import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
+
+import java.time.Duration;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+public class ManualPlc4XAdsTest {
+
+    public static void main(String... args) throws Exception {
+        String connectionUrl;
+        if (args.length > 0 && "serial".equalsIgnoreCase(args[0])) {
+            System.out.println("Using serial");
+            connectionUrl = "ads:serial:///dev/ttys003/10.10.64.40.1.1:851/10.10.56.23.1.1:30000";
+        } else {
+            System.out.println("Using tcp");
+            connectionUrl = "ads:tcp://10.10.64.40/10.10.64.40.1.1:851/10.10.56.23.1.1:30000";
+        }
+        // TODO: temporary workaround
+        Thread.currentThread().setUncaughtExceptionHandler((t, e) -> {
+            System.err.println(t + " - " + e.getMessage());
+            e.printStackTrace(System.err);
+            System.exit(1);
+        });
+        try (PlcConnection plcConnection = new PlcDriverManager().getConnection(connectionUrl)) {
+            System.out.println("PlcConnection " + plcConnection);
+
+            PlcReadRequest.Builder readRequestBuilder = plcConnection.readRequestBuilder();
+            PlcReadRequest readRequest = readRequestBuilder.addItem("station", "Allgemein_S2.Station:BYTE").build();
+            CompletableFuture<? extends PlcReadResponse> response = readRequest.execute();
+            PlcReadResponse readResponse = response.get();
+            System.out.println("Response " + readResponse);
+            Collection<Integer> stations = readResponse.getAllIntegers("station");
+            stations.forEach(System.out::println);
+
+            // 2. We build a subscription
+            PlcSubscriptionRequest.Builder subscriptionRequestBuilder = plcConnection.subscriptionRequestBuilder();
+            PlcSubscriptionRequest subscriptionRequest = subscriptionRequestBuilder
+                .addChangeOfStateField("stationChange", "Allgemein_S2.Station:BYTE")
+                .addCyclicField("stationChange2", "Allgemein_S2.Station:BYTE", Duration.ofSeconds(3))
+                .build();
+            PlcSubscriptionResponse plcSubscriptionResponse = subscriptionRequest.execute().get();
+
+            List<PlcConsumerRegistration> plcConsumerRegistrations = plcSubscriptionResponse.getSubscriptionHandles().stream()
+                .map(plcSubscriptionHandle -> plcSubscriptionHandle.register(plcSubscriptionEvent -> {
+                    int stationChange = plcSubscriptionEvent.getNumberOfValues("stationChange");
+                    int stationChange2 = plcSubscriptionEvent.getNumberOfValues("stationChange2");
+                    System.out.println(String.format("%s: [%d]- StationsNummer: {%d}", plcSubscriptionEvent.getTimestamp(), stationChange + stationChange2, plcSubscriptionEvent.getInteger("stationChange2")));
+                }))
+                .collect(Collectors.toList());
+
+            // Now we wait a bit
+            TimeUnit.SECONDS.sleep(10);
+
+            // we unregister the listener
+            plcConsumerRegistrations.forEach(PlcConsumerRegistration::unregister);
+
+            // we unsubscribe at the plc
+            PlcUnsubscriptionRequest.Builder unsubscriptionRequestBuilder = plcConnection.unsubscriptionRequestBuilder();
+            PlcUnsubscriptionRequest unsubscriptionRequest = unsubscriptionRequestBuilder.addHandles(plcSubscriptionResponse.getSubscriptionHandles()).build();
+            CompletableFuture<PlcUnsubscriptionResponse> unsubscriptionResponse = unsubscriptionRequest.execute();
+
+            unsubscriptionResponse
+                .get(5, TimeUnit.SECONDS);
+            System.out.println(unsubscriptionResponse);
+        }
+        System.exit(0);
+    }
+}
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/AdsDeviceNotificationResponseTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/AdsDeviceNotificationResponseTest.java
index e88fd1fa01b..8a26d78bf37 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/AdsDeviceNotificationResponseTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/AdsDeviceNotificationResponseTest.java
@@ -1,30 +1,30 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.ads.api.commands;
-
-import org.junit.jupiter.api.Test;
-
-class AdsDeviceNotificationResponseTest {
-
-    @Test
-    void coverage_test() {
-        new AdsDeviceNotificationResponse().getAdsData();
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.ads.api.commands;
+
+import org.junit.jupiter.api.Test;
+
+class AdsDeviceNotificationResponseTest {
+
+    @Test
+    void coverage_test() {
+        new AdsDeviceNotificationResponse().getAdsData();
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/CommandFactoryMethodTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/CommandFactoryMethodTest.java
index 8e0c11fc442..51f470c6dda 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/CommandFactoryMethodTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/CommandFactoryMethodTest.java
@@ -1,109 +1,109 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands;
-
-import org.apache.plc4x.java.ads.api.generic.types.Command;
-import org.apache.plc4x.java.ads.api.util.LengthSupplier;
-import org.junit.runners.Parameterized;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
-
-//@RunWith(Parameterized.class)
-public class CommandFactoryMethodTest {
-
-    @Parameterized.Parameter
-    public Class<?> clazz;
-
-    @Parameterized.Parameters(name = "{index} {0}")
-    public static Collection<Object[]> data() {
-        return Stream.of(
-            AdsAbstractRequest.class,
-            AdsAbstractResponse.class,
-            AdsAddDeviceNotificationRequest.class,
-            AdsAddDeviceNotificationResponse.class,
-            AdsDeleteDeviceNotificationRequest.class,
-            AdsDeleteDeviceNotificationResponse.class,
-            AdsDeviceNotificationRequest.class,
-            AdsDeviceNotificationResponse.class,
-            AdsReadDeviceInfoRequest.class,
-            AdsReadDeviceInfoResponse.class,
-            AdsReadRequest.class,
-            AdsReadResponse.class,
-            AdsReadStateRequest.class,
-            AdsReadStateResponse.class,
-            AdsReadWriteRequest.class,
-            AdsReadWriteResponse.class,
-            AdsWriteControlRequest.class,
-            AdsWriteControlResponse.class,
-            AdsWriteRequest.class,
-            AdsWriteResponse.class,
-            UnknownCommand.class
-        ).map(clazz -> new Object[]{clazz}).collect(Collectors.toList());
-    }
-
-    // TODO: Commented out as it was causing problems with Java 11
-    //@Test
-    public void testOf() throws Exception {
-        List<Method> getters = Arrays
-            .stream(clazz.getDeclaredMethods())
-            .filter(method -> (
-                method.getName().startsWith("get") || method.getName().startsWith("is"))
-                && Modifier.isPublic(method.getModifiers())
-                && method.getParameterCount() == 0)
-            .collect(Collectors.toList());
-        for (Method method : clazz.getDeclaredMethods()) {
-            if (!method.getName().equals("of")) {
-                continue;
-            }
-            Object invoke = method.invoke(null, Arrays.stream(method.getParameterTypes()).map(aClass -> {
-                    if (aClass == Command.class) {
-                        return Command.INVALID;
-                    } else if (aClass == LengthSupplier[].class) {
-                        return new LengthSupplier[]{() -> 0};
-                    } else if (aClass == long.class) {
-                        return 1L;
-                    } else if (aClass == List.class) {
-                        return Collections.emptyList();
-                    } else {
-                        return mock(aClass, RETURNS_DEEP_STUBS);
-                    }
-                }
-            ).toArray());
-            assertThat(invoke, notNullValue());
-            assertThat(invoke, instanceOf(clazz));
-            assertThat(invoke.toString(), not(isEmptyString()));
-            // Testing getters for the coverage (sonar)
-            for (Method getter : getters) {
-                getter.invoke(invoke);
-            }
-        }
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands;
+
+import org.apache.plc4x.java.ads.api.generic.types.Command;
+import org.apache.plc4x.java.ads.api.util.LengthSupplier;
+import org.junit.runners.Parameterized;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+
+//@RunWith(Parameterized.class)
+public class CommandFactoryMethodTest {
+
+    @Parameterized.Parameter
+    public Class<?> clazz;
+
+    @Parameterized.Parameters(name = "{index} {0}")
+    public static Collection<Object[]> data() {
+        return Stream.of(
+            AdsAbstractRequest.class,
+            AdsAbstractResponse.class,
+            AdsAddDeviceNotificationRequest.class,
+            AdsAddDeviceNotificationResponse.class,
+            AdsDeleteDeviceNotificationRequest.class,
+            AdsDeleteDeviceNotificationResponse.class,
+            AdsDeviceNotificationRequest.class,
+            AdsDeviceNotificationResponse.class,
+            AdsReadDeviceInfoRequest.class,
+            AdsReadDeviceInfoResponse.class,
+            AdsReadRequest.class,
+            AdsReadResponse.class,
+            AdsReadStateRequest.class,
+            AdsReadStateResponse.class,
+            AdsReadWriteRequest.class,
+            AdsReadWriteResponse.class,
+            AdsWriteControlRequest.class,
+            AdsWriteControlResponse.class,
+            AdsWriteRequest.class,
+            AdsWriteResponse.class,
+            UnknownCommand.class
+        ).map(clazz -> new Object[]{clazz}).collect(Collectors.toList());
+    }
+
+    // TODO: Commented out as it was causing problems with Java 11
+    //@Test
+    public void testOf() throws Exception {
+        List<Method> getters = Arrays
+            .stream(clazz.getDeclaredMethods())
+            .filter(method -> (
+                method.getName().startsWith("get") || method.getName().startsWith("is"))
+                && Modifier.isPublic(method.getModifiers())
+                && method.getParameterCount() == 0)
+            .collect(Collectors.toList());
+        for (Method method : clazz.getDeclaredMethods()) {
+            if (!method.getName().equals("of")) {
+                continue;
+            }
+            Object invoke = method.invoke(null, Arrays.stream(method.getParameterTypes()).map(aClass -> {
+                    if (aClass == Command.class) {
+                        return Command.INVALID;
+                    } else if (aClass == LengthSupplier[].class) {
+                        return new LengthSupplier[]{() -> 0};
+                    } else if (aClass == long.class) {
+                        return 1L;
+                    } else if (aClass == List.class) {
+                        return Collections.emptyList();
+                    } else {
+                        return mock(aClass, RETURNS_DEEP_STUBS);
+                    }
+                }
+            ).toArray());
+            assertThat(invoke, notNullValue());
+            assertThat(invoke, instanceOf(clazz));
+            assertThat(invoke.toString(), not(isEmptyString()));
+            // Testing getters for the coverage (sonar)
+            for (Method getter : getters) {
+                getter.invoke(invoke);
+            }
+        }
+    }
+}
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/AdsNotificationSampleTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/AdsNotificationSampleTest.java
index be6bed95ec0..04a5c7617cf 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/AdsNotificationSampleTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/AdsNotificationSampleTest.java
@@ -1,69 +1,69 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import org.junit.Test;
-
-import static org.apache.plc4x.java.mock.util.Assert.assertByteEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-public class AdsNotificationSampleTest {
-
-    @Test
-    public void builder() throws Exception {
-        {
-            AdsNotificationSample adsNotificationSample = AdsNotificationSample.of(NotificationHandle.of(13), Data.of("Hello World!"));
-            assertNotNull(adsNotificationSample);
-            byte[] expected = {
-                0x0D, 0x00, 0x00, 0x00,
-                0x0D, 0x00, 0x00, 0x00,
-                0x48, 0x65, 0x6C, 0x6C,
-                0x6F, 0x20, 0x57, 0x6F,
-                0x72, 0x6C, 0x64, 0x21,
-                0x00
-            };
-            assertByteEquals(expected, adsNotificationSample.getBytes());
-            assertEquals(SampleSize.of(13), adsNotificationSample.getSampleSize());
-            assertEquals(Data.of("Hello World!"), adsNotificationSample.getData());
-        }
-        {
-            AdsNotificationSample adsNotificationSample = AdsNotificationSample.of(NotificationHandle.of(13), SampleSize.of(13), Data.of("Hello World!"));
-            assertNotNull(adsNotificationSample);
-            byte[] expected = {
-                0x0D, 0x00, 0x00, 0x00,
-                0x0D, 0x00, 0x00, 0x00,
-                0x48, 0x65, 0x6C, 0x6C,
-                0x6F, 0x20, 0x57, 0x6F,
-                0x72, 0x6C, 0x64, 0x21,
-                0x00
-            };
-            assertByteEquals(expected, adsNotificationSample.getBytes());
-            assertEquals(SampleSize.of(13), adsNotificationSample.getSampleSize());
-            assertEquals(Data.of("Hello World!"), adsNotificationSample.getData());
-        }
-    }
-
-    @Test
-    public void sizeCalculation() {
-        AdsNotificationSample adsNotificationSample1 = AdsNotificationSample.of(NotificationHandle.of(13), SampleSize.of(13), Data.of("Hello World!"));
-        AdsNotificationSample adsNotificationSample2 = AdsNotificationSample.of(NotificationHandle.of(13), Data.of("Hello World!"));
-        assertEquals(adsNotificationSample1, adsNotificationSample2);
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import org.junit.Test;
+
+import static org.apache.plc4x.java.mock.util.Assert.assertByteEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class AdsNotificationSampleTest {
+
+    @Test
+    public void builder() throws Exception {
+        {
+            AdsNotificationSample adsNotificationSample = AdsNotificationSample.of(NotificationHandle.of(13), Data.of("Hello World!"));
+            assertNotNull(adsNotificationSample);
+            byte[] expected = {
+                0x0D, 0x00, 0x00, 0x00,
+                0x0D, 0x00, 0x00, 0x00,
+                0x48, 0x65, 0x6C, 0x6C,
+                0x6F, 0x20, 0x57, 0x6F,
+                0x72, 0x6C, 0x64, 0x21,
+                0x00
+            };
+            assertByteEquals(expected, adsNotificationSample.getBytes());
+            assertEquals(SampleSize.of(13), adsNotificationSample.getSampleSize());
+            assertEquals(Data.of("Hello World!"), adsNotificationSample.getData());
+        }
+        {
+            AdsNotificationSample adsNotificationSample = AdsNotificationSample.of(NotificationHandle.of(13), SampleSize.of(13), Data.of("Hello World!"));
+            assertNotNull(adsNotificationSample);
+            byte[] expected = {
+                0x0D, 0x00, 0x00, 0x00,
+                0x0D, 0x00, 0x00, 0x00,
+                0x48, 0x65, 0x6C, 0x6C,
+                0x6F, 0x20, 0x57, 0x6F,
+                0x72, 0x6C, 0x64, 0x21,
+                0x00
+            };
+            assertByteEquals(expected, adsNotificationSample.getBytes());
+            assertEquals(SampleSize.of(13), adsNotificationSample.getSampleSize());
+            assertEquals(Data.of("Hello World!"), adsNotificationSample.getData());
+        }
+    }
+
+    @Test
+    public void sizeCalculation() {
+        AdsNotificationSample adsNotificationSample1 = AdsNotificationSample.of(NotificationHandle.of(13), SampleSize.of(13), Data.of("Hello World!"));
+        AdsNotificationSample adsNotificationSample2 = AdsNotificationSample.of(NotificationHandle.of(13), Data.of("Hello World!"));
+        assertEquals(adsNotificationSample1, adsNotificationSample2);
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/AdsStampHeaderTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/AdsStampHeaderTest.java
index abee06d84ab..fa43ae19a76 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/AdsStampHeaderTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/AdsStampHeaderTest.java
@@ -1,90 +1,90 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import org.junit.Test;
-
-import java.util.Arrays;
-
-import static org.apache.plc4x.java.mock.util.Assert.assertByteEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-public class AdsStampHeaderTest {
-
-    @Test
-    public void builder() throws Exception {
-        {
-            AdsStampHeader adsStampHeader = AdsStampHeader.of(TimeStamp.of(13), Arrays.asList(AdsNotificationSample.of(NotificationHandle.of(13), Data.of("Hello World!")), AdsNotificationSample.of(NotificationHandle.of(14), Data.of("Hello World!"))));
-            assertNotNull(adsStampHeader);
-            byte[] expected = {
-                (byte) 0xD0, 0x7B, 0x40, (byte) 0xD5,
-                (byte) 0xDE, (byte) 0xB1, (byte) 0x9D, 0x01,
-                0x02, 0x00, 0x00, 0x00,
-                0x0D, 0x00, 0x00, 0x00,
-                0x0D, 0x00, 0x00, 0x00,
-                0x48, 0x65, 0x6C, 0x6C,
-                0x6F, 0x20, 0x57, 0x6F,
-                0x72, 0x6C, 0x64, 0x21,
-                0x00, 0x0E, 0x00, 0x00,
-                0x00, 0x0D, 0x00, 0x00,
-                0x00, 0x48, 0x65, 0x6C,
-                0x6C, 0x6F, 0x20, 0x57,
-                0x6F, 0x72, 0x6C, 0x64,
-                0x21, 0x00
-            };
-            assertByteEquals(expected, adsStampHeader.getBytes());
-            assertEquals(Samples.of(2), adsStampHeader.getSamples());
-            assertEquals(2, adsStampHeader.getAdsNotificationSamples().size());
-            assertEquals(Data.of("Hello World!"), adsStampHeader.getAdsNotificationSamples().get(0).getData());
-        }
-        {
-            AdsStampHeader adsStampHeader = AdsStampHeader.of(TimeStamp.of(13), Samples.of(2), Arrays.asList(AdsNotificationSample.of(NotificationHandle.of(13), Data.of("Hello World!")), AdsNotificationSample.of(NotificationHandle.of(14), Data.of("Hello World!"))));
-            assertNotNull(adsStampHeader);
-            byte[] expected = {
-                (byte) 0xD0, 0x7B, 0x40, (byte) 0xD5,
-                (byte) 0xDE, (byte) 0xB1, (byte) 0x9D, 0x01,
-                0x02, 0x00, 0x00, 0x00,
-                0x0D, 0x00, 0x00, 0x00,
-                0x0D, 0x00, 0x00, 0x00,
-                0x48, 0x65, 0x6C, 0x6C,
-                0x6F, 0x20, 0x57, 0x6F,
-                0x72, 0x6C, 0x64, 0x21,
-                0x00, 0x0E, 0x00, 0x00,
-                0x00, 0x0D, 0x00, 0x00,
-                0x00, 0x48, 0x65, 0x6C,
-                0x6C, 0x6F, 0x20, 0x57,
-                0x6F, 0x72, 0x6C, 0x64,
-                0x21, 0x00
-            };
-            assertByteEquals(expected, adsStampHeader.getBytes());
-            assertEquals(Samples.of(2), adsStampHeader.getSamples());
-            assertEquals(2, adsStampHeader.getAdsNotificationSamples().size());
-            assertEquals(Data.of("Hello World!"), adsStampHeader.getAdsNotificationSamples().get(0).getData());
-        }
-
-    }
-
-    @Test
-    public void sizeCalculation() {
-        AdsStampHeader adsStampHeader1 = AdsStampHeader.of(TimeStamp.of(13), Arrays.asList(AdsNotificationSample.of(NotificationHandle.of(13), Data.of("Hello World!")), AdsNotificationSample.of(NotificationHandle.of(14), Data.of("Hello World!"))));
-        AdsStampHeader adsStampHeader2 = AdsStampHeader.of(TimeStamp.of(13), Samples.of(2), Arrays.asList(AdsNotificationSample.of(NotificationHandle.of(13), Data.of("Hello World!")), AdsNotificationSample.of(NotificationHandle.of(14), Data.of("Hello World!"))));
-        assertEquals(adsStampHeader1, adsStampHeader2);
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import org.junit.Test;
+
+import java.util.Arrays;
+
+import static org.apache.plc4x.java.mock.util.Assert.assertByteEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class AdsStampHeaderTest {
+
+    @Test
+    public void builder() throws Exception {
+        {
+            AdsStampHeader adsStampHeader = AdsStampHeader.of(TimeStamp.of(13), Arrays.asList(AdsNotificationSample.of(NotificationHandle.of(13), Data.of("Hello World!")), AdsNotificationSample.of(NotificationHandle.of(14), Data.of("Hello World!"))));
+            assertNotNull(adsStampHeader);
+            byte[] expected = {
+                (byte) 0xD0, 0x7B, 0x40, (byte) 0xD5,
+                (byte) 0xDE, (byte) 0xB1, (byte) 0x9D, 0x01,
+                0x02, 0x00, 0x00, 0x00,
+                0x0D, 0x00, 0x00, 0x00,
+                0x0D, 0x00, 0x00, 0x00,
+                0x48, 0x65, 0x6C, 0x6C,
+                0x6F, 0x20, 0x57, 0x6F,
+                0x72, 0x6C, 0x64, 0x21,
+                0x00, 0x0E, 0x00, 0x00,
+                0x00, 0x0D, 0x00, 0x00,
+                0x00, 0x48, 0x65, 0x6C,
+                0x6C, 0x6F, 0x20, 0x57,
+                0x6F, 0x72, 0x6C, 0x64,
+                0x21, 0x00
+            };
+            assertByteEquals(expected, adsStampHeader.getBytes());
+            assertEquals(Samples.of(2), adsStampHeader.getSamples());
+            assertEquals(2, adsStampHeader.getAdsNotificationSamples().size());
+            assertEquals(Data.of("Hello World!"), adsStampHeader.getAdsNotificationSamples().get(0).getData());
+        }
+        {
+            AdsStampHeader adsStampHeader = AdsStampHeader.of(TimeStamp.of(13), Samples.of(2), Arrays.asList(AdsNotificationSample.of(NotificationHandle.of(13), Data.of("Hello World!")), AdsNotificationSample.of(NotificationHandle.of(14), Data.of("Hello World!"))));
+            assertNotNull(adsStampHeader);
+            byte[] expected = {
+                (byte) 0xD0, 0x7B, 0x40, (byte) 0xD5,
+                (byte) 0xDE, (byte) 0xB1, (byte) 0x9D, 0x01,
+                0x02, 0x00, 0x00, 0x00,
+                0x0D, 0x00, 0x00, 0x00,
+                0x0D, 0x00, 0x00, 0x00,
+                0x48, 0x65, 0x6C, 0x6C,
+                0x6F, 0x20, 0x57, 0x6F,
+                0x72, 0x6C, 0x64, 0x21,
+                0x00, 0x0E, 0x00, 0x00,
+                0x00, 0x0D, 0x00, 0x00,
+                0x00, 0x48, 0x65, 0x6C,
+                0x6C, 0x6F, 0x20, 0x57,
+                0x6F, 0x72, 0x6C, 0x64,
+                0x21, 0x00
+            };
+            assertByteEquals(expected, adsStampHeader.getBytes());
+            assertEquals(Samples.of(2), adsStampHeader.getSamples());
+            assertEquals(2, adsStampHeader.getAdsNotificationSamples().size());
+            assertEquals(Data.of("Hello World!"), adsStampHeader.getAdsNotificationSamples().get(0).getData());
+        }
+
+    }
+
+    @Test
+    public void sizeCalculation() {
+        AdsStampHeader adsStampHeader1 = AdsStampHeader.of(TimeStamp.of(13), Arrays.asList(AdsNotificationSample.of(NotificationHandle.of(13), Data.of("Hello World!")), AdsNotificationSample.of(NotificationHandle.of(14), Data.of("Hello World!"))));
+        AdsStampHeader adsStampHeader2 = AdsStampHeader.of(TimeStamp.of(13), Samples.of(2), Arrays.asList(AdsNotificationSample.of(NotificationHandle.of(13), Data.of("Hello World!")), AdsNotificationSample.of(NotificationHandle.of(14), Data.of("Hello World!"))));
+        assertEquals(adsStampHeader1, adsStampHeader2);
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/CommandTypesFactoryMethodTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/CommandTypesFactoryMethodTest.java
index 01a3ab02733..352f6babe74 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/CommandTypesFactoryMethodTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/CommandTypesFactoryMethodTest.java
@@ -1,156 +1,156 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
-import org.apache.plc4x.java.ads.api.util.UnsignedShortLEByteValue;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.math.BigInteger;
-import java.nio.charset.Charset;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assume.assumeThat;
-
-@RunWith(Parameterized.class)
-public class CommandTypesFactoryMethodTest {
-
-    @Parameterized.Parameter
-    public Class<?> clazz;
-
-    @Parameterized.Parameters(name = "{index} {0}")
-    public static Collection<Object[]> data() {
-        return Stream.of(
-            AdsReturnCode.class,
-            AdsStampHeader.class,
-            AdsState.class,
-            CycleTime.class,
-            Data.class,
-            Device.class,
-            DeviceState.class,
-            IndexGroup.class,
-            IndexOffset.class,
-            Length.class,
-            MajorVersion.class,
-            MaxDelay.class,
-            MinorVersion.class,
-            NotificationHandle.class,
-            ReadLength.class,
-            Result.class,
-            Samples.class,
-            SampleSize.class,
-            Stamps.class,
-            TimeStamp.class,
-            TransmissionMode.class,
-            Version.class,
-            WriteLength.class
-        ).map(clazz -> new Object[]{clazz}).collect(Collectors.toList());
-    }
-
-    @Test
-    public void innerReservedClasses() {
-        assertNotNull(IndexGroup.SystemServiceGroups.SYSTEMSERVICE_CHANGENETID);
-        assertNotNull(AdsState.DefinedValues.ADSSTATE_CONFIG);
-    }
-
-    @Test
-    public void testOfInt() throws Exception {
-        assumeThat(clazz, instanceOf(UnsignedShortLEByteValue.class));
-        Method ofMethod = clazz.getDeclaredMethod("of", int.class);
-        ofMethod.invoke(null, 1);
-    }
-
-    @Test
-    public void testOfLong() throws Exception {
-        assumeThat(clazz, instanceOf(UnsignedIntLEByteValue.class));
-        Method ofMethod = clazz.getDeclaredMethod("of", long.class);
-        ofMethod.invoke(null, 1L);
-    }
-
-    @Test
-    public void testOfString() throws Exception {
-        assumeThat(clazz, not(AdsStampHeader.class));
-        Method ofMethod = clazz.getDeclaredMethod("of", String.class);
-        ofMethod.invoke(null, clazz != AdsReturnCode.class ? "1" : "ADS_CODE_0");
-    }
-
-    @Test
-    public void testGetter() throws Exception {
-        assumeThat(clazz, not(AdsStampHeader.class));
-        List<Method> getters = Arrays
-            .stream(clazz.getDeclaredMethods())
-            .filter(method -> (
-                method.getName().startsWith("get") || method.getName().startsWith("is"))
-                && Modifier.isPublic(method.getModifiers())
-                && method.getParameterCount() == 0)
-            .collect(Collectors.toList());
-        Method ofMethod = clazz.getDeclaredMethod("of", String.class);
-        Object invoke = ofMethod.invoke(null, clazz != AdsReturnCode.class ? "1" : "ADS_CODE_0");
-        // Testing getters for the coverage (sonar)
-        for (Method getter : getters) {
-            getter.invoke(invoke);
-        }
-    }
-
-    @Test
-    public void testOfStringCharset() throws Exception {
-        assumeThat(clazz, isOneOf(Device.class, Data.class));
-        Method ofMethod = clazz.getDeclaredMethod("of", String.class, Charset.class);
-        ofMethod.invoke(null, "1", Charset.defaultCharset());
-    }
-
-    @Test
-    public void testOfWintime() throws Exception {
-        assumeThat(clazz, isOneOf(TimeStamp.class));
-        {
-            Method ofMethod = clazz.getDeclaredMethod("ofWinTime", BigInteger.class);
-            ofMethod.invoke(null, BigInteger.valueOf(1));
-        }
-        {
-            Method ofMethod = clazz.getDeclaredMethod("ofWinTime", String.class);
-            ofMethod.invoke(null, "1");
-        }
-        {
-            Method ofMethod = clazz.getDeclaredMethod("ofWinTime", long.class);
-            ofMethod.invoke(null, 1L);
-        }
-    }
-
-    @Test
-    public void testOfBytes() throws Exception {
-        assumeThat(clazz, not(AdsStampHeader.class));
-        assumeThat(clazz, not(Data.class));
-        assumeThat(clazz, not(AdsReturnCode.class));
-        Field num_bytes_field = clazz.getDeclaredField("NUM_BYTES");
-        Integer numberOfBytes = (Integer) num_bytes_field.get(null);
-        Method ofMethod = clazz.getDeclaredMethod("of", byte[].class);
-        ofMethod.invoke(null, (Object) new byte[numberOfBytes]);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
+import org.apache.plc4x.java.ads.api.util.UnsignedShortLEByteValue;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.math.BigInteger;
+import java.nio.charset.Charset;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assume.assumeThat;
+
+@RunWith(Parameterized.class)
+public class CommandTypesFactoryMethodTest {
+
+    @Parameterized.Parameter
+    public Class<?> clazz;
+
+    @Parameterized.Parameters(name = "{index} {0}")
+    public static Collection<Object[]> data() {
+        return Stream.of(
+            AdsReturnCode.class,
+            AdsStampHeader.class,
+            AdsState.class,
+            CycleTime.class,
+            Data.class,
+            Device.class,
+            DeviceState.class,
+            IndexGroup.class,
+            IndexOffset.class,
+            Length.class,
+            MajorVersion.class,
+            MaxDelay.class,
+            MinorVersion.class,
+            NotificationHandle.class,
+            ReadLength.class,
+            Result.class,
+            Samples.class,
+            SampleSize.class,
+            Stamps.class,
+            TimeStamp.class,
+            TransmissionMode.class,
+            Version.class,
+            WriteLength.class
+        ).map(clazz -> new Object[]{clazz}).collect(Collectors.toList());
+    }
+
+    @Test
+    public void innerReservedClasses() {
+        assertNotNull(IndexGroup.SystemServiceGroups.SYSTEMSERVICE_CHANGENETID);
+        assertNotNull(AdsState.DefinedValues.ADSSTATE_CONFIG);
+    }
+
+    @Test
+    public void testOfInt() throws Exception {
+        assumeThat(clazz, instanceOf(UnsignedShortLEByteValue.class));
+        Method ofMethod = clazz.getDeclaredMethod("of", int.class);
+        ofMethod.invoke(null, 1);
+    }
+
+    @Test
+    public void testOfLong() throws Exception {
+        assumeThat(clazz, instanceOf(UnsignedIntLEByteValue.class));
+        Method ofMethod = clazz.getDeclaredMethod("of", long.class);
+        ofMethod.invoke(null, 1L);
+    }
+
+    @Test
+    public void testOfString() throws Exception {
+        assumeThat(clazz, not(AdsStampHeader.class));
+        Method ofMethod = clazz.getDeclaredMethod("of", String.class);
+        ofMethod.invoke(null, clazz != AdsReturnCode.class ? "1" : "ADS_CODE_0");
+    }
+
+    @Test
+    public void testGetter() throws Exception {
+        assumeThat(clazz, not(AdsStampHeader.class));
+        List<Method> getters = Arrays
+            .stream(clazz.getDeclaredMethods())
+            .filter(method -> (
+                method.getName().startsWith("get") || method.getName().startsWith("is"))
+                && Modifier.isPublic(method.getModifiers())
+                && method.getParameterCount() == 0)
+            .collect(Collectors.toList());
+        Method ofMethod = clazz.getDeclaredMethod("of", String.class);
+        Object invoke = ofMethod.invoke(null, clazz != AdsReturnCode.class ? "1" : "ADS_CODE_0");
+        // Testing getters for the coverage (sonar)
+        for (Method getter : getters) {
+            getter.invoke(invoke);
+        }
+    }
+
+    @Test
+    public void testOfStringCharset() throws Exception {
+        assumeThat(clazz, isOneOf(Device.class, Data.class));
+        Method ofMethod = clazz.getDeclaredMethod("of", String.class, Charset.class);
+        ofMethod.invoke(null, "1", Charset.defaultCharset());
+    }
+
+    @Test
+    public void testOfWintime() throws Exception {
+        assumeThat(clazz, isOneOf(TimeStamp.class));
+        {
+            Method ofMethod = clazz.getDeclaredMethod("ofWinTime", BigInteger.class);
+            ofMethod.invoke(null, BigInteger.valueOf(1));
+        }
+        {
+            Method ofMethod = clazz.getDeclaredMethod("ofWinTime", String.class);
+            ofMethod.invoke(null, "1");
+        }
+        {
+            Method ofMethod = clazz.getDeclaredMethod("ofWinTime", long.class);
+            ofMethod.invoke(null, 1L);
+        }
+    }
+
+    @Test
+    public void testOfBytes() throws Exception {
+        assumeThat(clazz, not(AdsStampHeader.class));
+        assumeThat(clazz, not(Data.class));
+        assumeThat(clazz, not(AdsReturnCode.class));
+        Field num_bytes_field = clazz.getDeclaredField("NUM_BYTES");
+        Integer numberOfBytes = (Integer) num_bytes_field.get(null);
+        Method ofMethod = clazz.getDeclaredMethod("of", byte[].class);
+        ofMethod.invoke(null, (Object) new byte[numberOfBytes]);
+    }
+}
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/DeviceTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/DeviceTest.java
index 4c4de45da6e..9ec3932fe46 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/DeviceTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/DeviceTest.java
@@ -1,37 +1,37 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-public class DeviceTest {
-
-    @Test
-    public void stringEquals() {
-        assertEquals("HelloWorld!", Device.of("HelloWorld!").getAsString());
-    }
-
-    @Test(expected = PlcRuntimeException.class)
-    public void overflow() {
-        Device.of("asdasdasdsadssdasdasddsaasdasddsasadsadsadsdasadsadsdsadasd");
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class DeviceTest {
+
+    @Test
+    public void stringEquals() {
+        assertEquals("HelloWorld!", Device.of("HelloWorld!").getAsString());
+    }
+
+    @Test(expected = PlcRuntimeException.class)
+    public void overflow() {
+        Device.of("asdasdasdsadssdasdasddsaasdasddsasadsadsadsdasadsadsdsadasd");
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/LengthTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/LengthTest.java
index 63c05970400..6187dc3d352 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/LengthTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/LengthTest.java
@@ -1,60 +1,60 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import org.apache.commons.codec.binary.Hex;
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-public class LengthTest {
-
-    private final byte NULL_BYTE = 0x0;
-
-    @Test
-    public void ofBytes() {
-        assertEquals(0L, Length.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE).getAsLong());
-        assertThrows(IllegalArgumentException.class, () -> Length.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE));
-    }
-
-    @Test
-    public void ofLong() {
-        assertByte(Length.of(1), "0x01000000");
-        assertByte(Length.of(65535), "0xffff0000");
-        assertThrows(IllegalArgumentException.class, () -> Length.of(-1));
-        assertThrows(IllegalArgumentException.class, () -> Length.of(4294967296L));
-    }
-
-    @Test
-    public void ofString() {
-        assertByte(Length.of("1"), "0x01000000");
-    }
-
-    @Test
-    public void testToString() {
-        assertThat(Length.of("1").toString(), containsString("longValue=1,"));
-    }
-
-    private void assertByte(Length actual, String expected) {
-        assertEquals(expected, "0x" + Hex.encodeHexString(actual.getBytes()));
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import org.apache.commons.codec.binary.Hex;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class LengthTest {
+
+    private final byte NULL_BYTE = 0x0;
+
+    @Test
+    public void ofBytes() {
+        assertEquals(0L, Length.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE).getAsLong());
+        assertThrows(IllegalArgumentException.class, () -> Length.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE));
+    }
+
+    @Test
+    public void ofLong() {
+        assertByte(Length.of(1), "0x01000000");
+        assertByte(Length.of(65535), "0xffff0000");
+        assertThrows(IllegalArgumentException.class, () -> Length.of(-1));
+        assertThrows(IllegalArgumentException.class, () -> Length.of(4294967296L));
+    }
+
+    @Test
+    public void ofString() {
+        assertByte(Length.of("1"), "0x01000000");
+    }
+
+    @Test
+    public void testToString() {
+        assertThat(Length.of("1").toString(), containsString("longValue=1,"));
+    }
+
+    private void assertByte(Length actual, String expected) {
+        assertEquals(expected, "0x" + Hex.encodeHexString(actual.getBytes()));
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/ReadLengthTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/ReadLengthTest.java
index 0cc21ddc388..06ab6493de8 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/ReadLengthTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/ReadLengthTest.java
@@ -1,61 +1,61 @@
-/*
- 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
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import org.apache.commons.codec.binary.Hex;
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-
-public class ReadLengthTest {
-
-    private final byte NULL_BYTE = 0x0;
-
-    @Test
-    public void ofBytes() {
-        assertEquals(0L, ReadLength.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE).getAsLong());
-        assertThrows(IllegalArgumentException.class, () -> ReadLength.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE));
-    }
-
-    @Test
-    public void ofLong() {
-        assertByte(ReadLength.of(1), "0x01000000");
-        assertByte(ReadLength.of(65535), "0xffff0000");
-        assertThrows(IllegalArgumentException.class, () -> ReadLength.of(-1));
-        assertThrows(IllegalArgumentException.class, () -> ReadLength.of(4294967296L));
-    }
-
-    @Test
-    public void ofString() {
-        assertByte(ReadLength.of("1"), "0x01000000");
-    }
-
-    @Test
-    public void testToString() {
-        assertThat(ReadLength.of("1").toString(), containsString("longValue=1,"));
-    }
-
-    private void assertByte(ReadLength actual, String expected) {
-        assertEquals(expected, "0x" + Hex.encodeHexString(actual.getBytes()));
-    }
+/*
+ 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
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import org.apache.commons.codec.binary.Hex;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+
+public class ReadLengthTest {
+
+    private final byte NULL_BYTE = 0x0;
+
+    @Test
+    public void ofBytes() {
+        assertEquals(0L, ReadLength.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE).getAsLong());
+        assertThrows(IllegalArgumentException.class, () -> ReadLength.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE));
+    }
+
+    @Test
+    public void ofLong() {
+        assertByte(ReadLength.of(1), "0x01000000");
+        assertByte(ReadLength.of(65535), "0xffff0000");
+        assertThrows(IllegalArgumentException.class, () -> ReadLength.of(-1));
+        assertThrows(IllegalArgumentException.class, () -> ReadLength.of(4294967296L));
+    }
+
+    @Test
+    public void ofString() {
+        assertByte(ReadLength.of("1"), "0x01000000");
+    }
+
+    @Test
+    public void testToString() {
+        assertThat(ReadLength.of("1").toString(), containsString("longValue=1,"));
+    }
+
+    private void assertByte(ReadLength actual, String expected) {
+        assertEquals(expected, "0x" + Hex.encodeHexString(actual.getBytes()));
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/SampleSizeTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/SampleSizeTest.java
index edbd6038b57..6be002f65b6 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/SampleSizeTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/SampleSizeTest.java
@@ -1,61 +1,61 @@
-/*
- 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
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import org.apache.commons.codec.binary.Hex;
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-public class SampleSizeTest {
-
-    private final byte NULL_BYTE = 0x0;
-
-    @Test
-    public void ofBytes() {
-        assertEquals(0L, SampleSize.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE).getAsLong());
-        assertThrows(IllegalArgumentException.class, () -> SampleSize.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE));
-    }
-
-    @Test
-    public void ofLong() {
-        assertByte(SampleSize.of(1), "0x01000000");
-        assertByte(SampleSize.of(65535), "0xffff0000");
-        assertThrows(IllegalArgumentException.class, () -> SampleSize.of(-1));
-        assertThrows(IllegalArgumentException.class, () -> SampleSize.of(4294967296L));
-    }
-
-    @Test
-    public void ofString() {
-        assertByte(SampleSize.of("1"), "0x01000000");
-    }
-
-    @Test
-    public void testToString() {
-        assertThat(SampleSize.of("1").toString(), containsString("longValue=1,"));
-    }
-
-    private void assertByte(SampleSize actual, String expected) {
-        assertEquals(expected, "0x" + Hex.encodeHexString(actual.getBytes()));
-    }
-
+/*
+ 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
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import org.apache.commons.codec.binary.Hex;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class SampleSizeTest {
+
+    private final byte NULL_BYTE = 0x0;
+
+    @Test
+    public void ofBytes() {
+        assertEquals(0L, SampleSize.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE).getAsLong());
+        assertThrows(IllegalArgumentException.class, () -> SampleSize.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE));
+    }
+
+    @Test
+    public void ofLong() {
+        assertByte(SampleSize.of(1), "0x01000000");
+        assertByte(SampleSize.of(65535), "0xffff0000");
+        assertThrows(IllegalArgumentException.class, () -> SampleSize.of(-1));
+        assertThrows(IllegalArgumentException.class, () -> SampleSize.of(4294967296L));
+    }
+
+    @Test
+    public void ofString() {
+        assertByte(SampleSize.of("1"), "0x01000000");
+    }
+
+    @Test
+    public void testToString() {
+        assertThat(SampleSize.of("1").toString(), containsString("longValue=1,"));
+    }
+
+    private void assertByte(SampleSize actual, String expected) {
+        assertEquals(expected, "0x" + Hex.encodeHexString(actual.getBytes()));
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/SamplesTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/SamplesTest.java
index 9c27fc97bd5..163fd6bc9f2 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/SamplesTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/SamplesTest.java
@@ -1,61 +1,61 @@
-/*
- 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
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import org.apache.commons.codec.binary.Hex;
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-public class SamplesTest {
-
-    private final byte NULL_BYTE = 0x0;
-
-    @Test
-    public void ofBytes() {
-        assertEquals(0L, Samples.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE).getAsLong());
-        assertThrows(IllegalArgumentException.class, () -> Samples.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE));
-    }
-
-    @Test
-    public void ofLong() {
-        assertByte(Samples.of(1), "0x01000000");
-        assertByte(Samples.of(65535), "0xffff0000");
-        assertThrows(IllegalArgumentException.class, () -> Samples.of(-1));
-        assertThrows(IllegalArgumentException.class, () -> Samples.of(4294967296L));
-    }
-
-    @Test
-    public void ofString() {
-        assertByte(Samples.of("1"), "0x01000000");
-    }
-
-    @Test
-    public void testToString() {
-        assertThat(Samples.of("1").toString(), containsString("longValue=1,"));
-    }
-
-    private void assertByte(Samples actual, String expected) {
-        assertEquals(expected, "0x" + Hex.encodeHexString(actual.getBytes()));
-    }
-
+/*
+ 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
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import org.apache.commons.codec.binary.Hex;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class SamplesTest {
+
+    private final byte NULL_BYTE = 0x0;
+
+    @Test
+    public void ofBytes() {
+        assertEquals(0L, Samples.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE).getAsLong());
+        assertThrows(IllegalArgumentException.class, () -> Samples.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE));
+    }
+
+    @Test
+    public void ofLong() {
+        assertByte(Samples.of(1), "0x01000000");
+        assertByte(Samples.of(65535), "0xffff0000");
+        assertThrows(IllegalArgumentException.class, () -> Samples.of(-1));
+        assertThrows(IllegalArgumentException.class, () -> Samples.of(4294967296L));
+    }
+
+    @Test
+    public void ofString() {
+        assertByte(Samples.of("1"), "0x01000000");
+    }
+
+    @Test
+    public void testToString() {
+        assertThat(Samples.of("1").toString(), containsString("longValue=1,"));
+    }
+
+    private void assertByte(Samples actual, String expected) {
+        assertEquals(expected, "0x" + Hex.encodeHexString(actual.getBytes()));
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/WriteLengthTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/WriteLengthTest.java
index 2964f5518ce..9e7664e3bc6 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/WriteLengthTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/WriteLengthTest.java
@@ -1,63 +1,63 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.commands.types;
-
-import org.apache.commons.codec.binary.Hex;
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-
-public class WriteLengthTest {
-
-    private final byte NULL_BYTE = 0x0;
-
-    @Test
-    public void ofBytes() {
-        assertEquals(0L, WriteLength.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE).getAsLong());
-        assertThrows(IllegalArgumentException.class, () -> WriteLength.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE));
-    }
-
-    @Test
-    public void ofLong() {
-        assertByte(WriteLength.of(1), "0x01000000");
-        assertByte(WriteLength.of(65535), "0xffff0000");
-        assertThrows(IllegalArgumentException.class, () -> WriteLength.of(-1));
-        assertThrows(IllegalArgumentException.class, () -> WriteLength.of(4294967296L));
-    }
-
-    @Test
-    public void ofString() {
-        assertByte(WriteLength.of("1"), "0x01000000");
-    }
-
-    @Test
-    public void testToString() {
-        assertThat(WriteLength.of("1").toString(), containsString("longValue=1,"));
-    }
-
-    private void assertByte(WriteLength actual, String expected) {
-        assertEquals(expected, "0x" + Hex.encodeHexString(actual.getBytes()));
-    }
-
-
+/*
+ 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
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.commands.types;
+
+import org.apache.commons.codec.binary.Hex;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+
+public class WriteLengthTest {
+
+    private final byte NULL_BYTE = 0x0;
+
+    @Test
+    public void ofBytes() {
+        assertEquals(0L, WriteLength.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE).getAsLong());
+        assertThrows(IllegalArgumentException.class, () -> WriteLength.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE));
+    }
+
+    @Test
+    public void ofLong() {
+        assertByte(WriteLength.of(1), "0x01000000");
+        assertByte(WriteLength.of(65535), "0xffff0000");
+        assertThrows(IllegalArgumentException.class, () -> WriteLength.of(-1));
+        assertThrows(IllegalArgumentException.class, () -> WriteLength.of(4294967296L));
+    }
+
+    @Test
+    public void ofString() {
+        assertByte(WriteLength.of("1"), "0x01000000");
+    }
+
+    @Test
+    public void testToString() {
+        assertThat(WriteLength.of("1").toString(), containsString("longValue=1,"));
+    }
+
+    private void assertByte(WriteLength actual, String expected) {
+        assertEquals(expected, "0x" + Hex.encodeHexString(actual.getBytes()));
+    }
+
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/GenericFactoryMethodTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/GenericFactoryMethodTest.java
index 0cb1c715566..afcb104d773 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/GenericFactoryMethodTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/GenericFactoryMethodTest.java
@@ -1,86 +1,86 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.generic;
-
-import org.apache.plc4x.java.ads.api.generic.types.Command;
-import org.apache.plc4x.java.ads.api.util.LengthSupplier;
-import org.junit.runners.Parameterized;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
-
-//@RunWith(Parameterized.class)
-public class GenericFactoryMethodTest {
-
-    @Parameterized.Parameter
-    public Class<?> clazz;
-
-    @Parameterized.Parameters(name = "{index} {0}")
-    public static Collection<Object[]> data() {
-        return Stream.of(
-            AdsData.class,
-            AmsHeader.class
-        ).map(clazz -> new Object[]{clazz}).collect(Collectors.toList());
-    }
-
-    // TODO: Commented out as it was causing problems with Java 11
-    //@Test
-    public void testOf() throws Exception {
-        List<Method> getters = Arrays
-            .stream(clazz.getDeclaredMethods())
-            .filter(method -> (
-                method.getName().startsWith("get") || method.getName().startsWith("is"))
-                && Modifier.isPublic(method.getModifiers())
-                && method.getParameterCount() == 0)
-            .collect(Collectors.toList());
-        for (Method method : clazz.getDeclaredMethods()) {
-            if (!method.getName().equals("of")) {
-                continue;
-            }
-            Object invoke = method.invoke(null, Arrays.stream(method.getParameterTypes()).map(aClass -> {
-                if (aClass == Command.class) {
-                    return Command.INVALID;
-                } else if (aClass == LengthSupplier[].class) {
-                    return new LengthSupplier[]{() -> 0};
-                } else if (aClass == long.class) {
-                    return 1L;
-                } else {
-                    return mock(aClass, RETURNS_DEEP_STUBS);
-                }
-            }).toArray());
-            assertThat(invoke, notNullValue());
-            assertThat(invoke, instanceOf(clazz));
-            assertThat(invoke.toString(), not(isEmptyString()));
-            // Testing getters for the coverage (sonar)
-            for (Method getter : getters) {
-                getter.invoke(invoke);
-            }
-        }
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.generic;
+
+import org.apache.plc4x.java.ads.api.generic.types.Command;
+import org.apache.plc4x.java.ads.api.util.LengthSupplier;
+import org.junit.runners.Parameterized;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+
+//@RunWith(Parameterized.class)
+public class GenericFactoryMethodTest {
+
+    @Parameterized.Parameter
+    public Class<?> clazz;
+
+    @Parameterized.Parameters(name = "{index} {0}")
+    public static Collection<Object[]> data() {
+        return Stream.of(
+            AdsData.class,
+            AmsHeader.class
+        ).map(clazz -> new Object[]{clazz}).collect(Collectors.toList());
+    }
+
+    // TODO: Commented out as it was causing problems with Java 11
+    //@Test
+    public void testOf() throws Exception {
+        List<Method> getters = Arrays
+            .stream(clazz.getDeclaredMethods())
+            .filter(method -> (
+                method.getName().startsWith("get") || method.getName().startsWith("is"))
+                && Modifier.isPublic(method.getModifiers())
+                && method.getParameterCount() == 0)
+            .collect(Collectors.toList());
+        for (Method method : clazz.getDeclaredMethods()) {
+            if (!method.getName().equals("of")) {
+                continue;
+            }
+            Object invoke = method.invoke(null, Arrays.stream(method.getParameterTypes()).map(aClass -> {
+                if (aClass == Command.class) {
+                    return Command.INVALID;
+                } else if (aClass == LengthSupplier[].class) {
+                    return new LengthSupplier[]{() -> 0};
+                } else if (aClass == long.class) {
+                    return 1L;
+                } else {
+                    return mock(aClass, RETURNS_DEEP_STUBS);
+                }
+            }).toArray());
+            assertThat(invoke, notNullValue());
+            assertThat(invoke, instanceOf(clazz));
+            assertThat(invoke.toString(), not(isEmptyString()));
+            // Testing getters for the coverage (sonar)
+            for (Method getter : getters) {
+                getter.invoke(invoke);
+            }
+        }
+    }
+}
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AmsErrorTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AmsErrorTest.java
index b8bc3d2a2d2..b675120295d 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AmsErrorTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AmsErrorTest.java
@@ -1,98 +1,98 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.generic.types;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-
-public class AmsErrorTest {
-
-    @Test
-    public void errorBytes() {
-        // note bytes in reverse order
-        AmsError error = AmsError.of((byte)0x01, (byte)0x20, (byte)0x00, (byte)0x00);
-        assertThat(error.getAsLong(), is(0x2001L));
-    }
-
-    @Test
-    public void errorLong() {
-        AmsError error = AmsError.of(0xFF02L);
-        assertThat(error.getAsLong(), is(0xFF02L));
-    }
-
-    @Test
-    public void errorLongBig() {
-        AmsError error = AmsError.of(0xFFFFFFFFL);
-        assertThat(error.getAsLong(), is(0xFFFFFFFFL));
-    }
-    
-    @Test
-    public void errorString() {
-        AmsError error = AmsError.of("255");
-        assertThat(error.getAsLong(), is(0xFFL));
-    }
-
-    @Test
-    public void errorByteBuf() {
-        ByteBuf buffer = Unpooled.buffer();
-
-        // note bytes in reverse order
-        buffer.writeByte((byte)0x04);
-        buffer.writeByte((byte)0x01);
-        buffer.writeByte((byte)0x00);
-        buffer.writeByte((byte)0x00);
-
-        AmsError error = AmsError.of(buffer);
-        assertThat(error.getAsLong(), is(260L));
-    }
-
-    @Test(expected = NumberFormatException.class)
-    public void noHex() {
-        AmsError error = AmsError.of("0xFF000000");
-    }
-    
-    @Test(expected = IllegalArgumentException.class)
-    public void errorLongTooBig() {
-        AmsError error = AmsError.of(0x100000000L);
-    }
-    
-    @Test(expected = IllegalArgumentException.class)
-    public void errorNegative() {
-        AmsError error = AmsError.of(-1);
-    }
-    
-    @Test
-    public void equals() {
-        AmsError a = AmsError.of((byte) 0x1, (byte) 0x2, (byte) 0x3, (byte) 0x4);
-        AmsError b = AmsError.of((byte) 0x1, (byte) 0x2, (byte) 0x3, (byte) 0x4);
-        AmsError c = AmsError.of((byte) 0x1, (byte) 0x2, (byte) 0x3, (byte) 0xFF);
-        byte array[] = {(byte) 0x1, (byte) 0x2, (byte) 0x3, (byte) 0x4};
-
-        assertThat(a.equals(a), is(true));
-        assertThat(a.equals(b), is(true));
-        assertThat(a.equals(c), is(false));
-        assertThat(a.equals(1), is(false));
-        assertThat(a.equals((byte) 1), is(false));
-        assertThat(a.equals(array), is(false));
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.generic.types;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+public class AmsErrorTest {
+
+    @Test
+    public void errorBytes() {
+        // note bytes in reverse order
+        AmsError error = AmsError.of((byte)0x01, (byte)0x20, (byte)0x00, (byte)0x00);
+        assertThat(error.getAsLong(), is(0x2001L));
+    }
+
+    @Test
+    public void errorLong() {
+        AmsError error = AmsError.of(0xFF02L);
+        assertThat(error.getAsLong(), is(0xFF02L));
+    }
+
+    @Test
+    public void errorLongBig() {
+        AmsError error = AmsError.of(0xFFFFFFFFL);
+        assertThat(error.getAsLong(), is(0xFFFFFFFFL));
+    }
+    
+    @Test
+    public void errorString() {
+        AmsError error = AmsError.of("255");
+        assertThat(error.getAsLong(), is(0xFFL));
+    }
+
+    @Test
+    public void errorByteBuf() {
+        ByteBuf buffer = Unpooled.buffer();
+
+        // note bytes in reverse order
+        buffer.writeByte((byte)0x04);
+        buffer.writeByte((byte)0x01);
+        buffer.writeByte((byte)0x00);
+        buffer.writeByte((byte)0x00);
+
+        AmsError error = AmsError.of(buffer);
+        assertThat(error.getAsLong(), is(260L));
+    }
+
+    @Test(expected = NumberFormatException.class)
+    public void noHex() {
+        AmsError error = AmsError.of("0xFF000000");
+    }
+    
+    @Test(expected = IllegalArgumentException.class)
+    public void errorLongTooBig() {
+        AmsError error = AmsError.of(0x100000000L);
+    }
+    
+    @Test(expected = IllegalArgumentException.class)
+    public void errorNegative() {
+        AmsError error = AmsError.of(-1);
+    }
+    
+    @Test
+    public void equals() {
+        AmsError a = AmsError.of((byte) 0x1, (byte) 0x2, (byte) 0x3, (byte) 0x4);
+        AmsError b = AmsError.of((byte) 0x1, (byte) 0x2, (byte) 0x3, (byte) 0x4);
+        AmsError c = AmsError.of((byte) 0x1, (byte) 0x2, (byte) 0x3, (byte) 0xFF);
+        byte array[] = {(byte) 0x1, (byte) 0x2, (byte) 0x3, (byte) 0x4};
+
+        assertThat(a.equals(a), is(true));
+        assertThat(a.equals(b), is(true));
+        assertThat(a.equals(c), is(false));
+        assertThat(a.equals(1), is(false));
+        assertThat(a.equals((byte) 1), is(false));
+        assertThat(a.equals(array), is(false));
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AmsNetIdTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AmsNetIdTest.java
index bdc95b1da57..74925e85050 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AmsNetIdTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AmsNetIdTest.java
@@ -1,60 +1,60 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.generic.types;
-
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-
-public class AmsNetIdTest {
-
-    @Test
-    public void netIdBytes() {
-        // note bytes in reverse order
-        AmsNetId netid = AmsNetId.of((byte)0x01, (byte)0x02, (byte)0x03, (byte)0x04, (byte)0x05, (byte)0x06);
-        assertThat(netid.toString(), is("1.2.3.4.5.6"));
-    }
-
-    @Test
-    public void netIdString() {
-        // note bytes in reverse order
-        AmsNetId netid = AmsNetId.of("1.2.3.4.5.6");
-        assertThat(netid.toString(), is("1.2.3.4.5.6"));
-    }
-    
-    @Test(expected = IllegalArgumentException.class)
-    public void netIdTooShort() {
-        // note bytes in reverse order
-        AmsNetId netid = AmsNetId.of("1.2.3.4");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void netIdStringTooLong() {
-        // note bytes in reverse order
-        AmsNetId netid = AmsNetId.of("1.2.3.4.5.6.7.8");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void netIdStringWrongSeperator() {
-        // note bytes in reverse order
-        AmsNetId netid = AmsNetId.of("1:2:3:4:5:6");
-    }
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.generic.types;
+
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+public class AmsNetIdTest {
+
+    @Test
+    public void netIdBytes() {
+        // note bytes in reverse order
+        AmsNetId netid = AmsNetId.of((byte)0x01, (byte)0x02, (byte)0x03, (byte)0x04, (byte)0x05, (byte)0x06);
+        assertThat(netid.toString(), is("1.2.3.4.5.6"));
+    }
+
+    @Test
+    public void netIdString() {
+        // note bytes in reverse order
+        AmsNetId netid = AmsNetId.of("1.2.3.4.5.6");
+        assertThat(netid.toString(), is("1.2.3.4.5.6"));
+    }
+    
+    @Test(expected = IllegalArgumentException.class)
+    public void netIdTooShort() {
+        // note bytes in reverse order
+        AmsNetId netid = AmsNetId.of("1.2.3.4");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void netIdStringTooLong() {
+        // note bytes in reverse order
+        AmsNetId netid = AmsNetId.of("1.2.3.4.5.6.7.8");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void netIdStringWrongSeperator() {
+        // note bytes in reverse order
+        AmsNetId netid = AmsNetId.of("1:2:3:4:5:6");
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AmsPortTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AmsPortTest.java
index a61b3cff682..20fa3c25eb3 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AmsPortTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AmsPortTest.java
@@ -1,76 +1,76 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.generic.types;
-
-import org.apache.commons.codec.binary.Hex;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-
-public class AmsPortTest {
-
-    private final byte NULL_BYTE = 0x0;
-
-    @Test
-    public void reservedPorts() {
-        // Initialize subclass
-        assertNotNull(AmsPort.ReservedPorts.logger);
-    }
-
-    @Test
-    public void ofBytes() {
-        assertEquals("0", AmsPort.of(NULL_BYTE, NULL_BYTE).toString());
-        assertThrows(IllegalArgumentException.class, () -> AmsPort.of(NULL_BYTE, NULL_BYTE, NULL_BYTE));
-    }
-
-    @Test
-    public void ofInt() {
-        assertByte(AmsPort.of(1), "0x0100");
-        assertByte(AmsPort.of(65535), "0xffff");
-        assertThrows(IllegalArgumentException.class, () -> AmsPort.of(-1));
-        assertThrows(IllegalArgumentException.class, () -> AmsPort.of(65536));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void noStrings() {
-        AmsPort.of("port20");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void noHex() {
-        AmsPort.of("0x0100");
-    }
-
-    @Test
-    public void ofString() {
-        assertByte(AmsPort.of("1"), "0x0100");
-    }
-
-    @Test
-    public void testToString() {
-        assertEquals(AmsPort.of("1").toString(), "1");
-    }
-
-    private void assertByte(AmsPort actual, String expected) {
-        assertEquals(expected, "0x" + Hex.encodeHexString(actual.getBytes()));
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.generic.types;
+
+import org.apache.commons.codec.binary.Hex;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+
+public class AmsPortTest {
+
+    private final byte NULL_BYTE = 0x0;
+
+    @Test
+    public void reservedPorts() {
+        // Initialize subclass
+        assertNotNull(AmsPort.ReservedPorts.logger);
+    }
+
+    @Test
+    public void ofBytes() {
+        assertEquals("0", AmsPort.of(NULL_BYTE, NULL_BYTE).toString());
+        assertThrows(IllegalArgumentException.class, () -> AmsPort.of(NULL_BYTE, NULL_BYTE, NULL_BYTE));
+    }
+
+    @Test
+    public void ofInt() {
+        assertByte(AmsPort.of(1), "0x0100");
+        assertByte(AmsPort.of(65535), "0xffff");
+        assertThrows(IllegalArgumentException.class, () -> AmsPort.of(-1));
+        assertThrows(IllegalArgumentException.class, () -> AmsPort.of(65536));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void noStrings() {
+        AmsPort.of("port20");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void noHex() {
+        AmsPort.of("0x0100");
+    }
+
+    @Test
+    public void ofString() {
+        assertByte(AmsPort.of("1"), "0x0100");
+    }
+
+    @Test
+    public void testToString() {
+        assertEquals(AmsPort.of("1").toString(), "1");
+    }
+
+    private void assertByte(AmsPort actual, String expected) {
+        assertEquals(expected, "0x" + Hex.encodeHexString(actual.getBytes()));
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/CommandTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/CommandTest.java
index 4e8a39d774d..b87d7db91d8 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/CommandTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/CommandTest.java
@@ -1,57 +1,57 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.generic.types;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-
-public class CommandTest {
-
-    @Test
-    public void getBytes() {
-        byte[] result = {(byte)0x01, (byte)0x00};
-        Command command = Command.ofInt("1");
-        assertThat(command.getBytes(), is(result));
-    }
-
-    @Test
-    public void getByteBuf() {
-        ByteBuf result = Unpooled.buffer();
-        result.writeByte(0x02);
-        result.writeByte(0x00);
-        Command command = Command.ofInt("2");
-        assertThat(command.getByteBuf(), is(result));
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void getBytesUnknown() {
-        Command command = Command.UNKNOWN;
-        command.getBytes();
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void getByteBufUnknown() {
-        Command command = Command.UNKNOWN;
-        command.getByteBuf();
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.generic.types;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+public class CommandTest {
+
+    @Test
+    public void getBytes() {
+        byte[] result = {(byte)0x01, (byte)0x00};
+        Command command = Command.ofInt("1");
+        assertThat(command.getBytes(), is(result));
+    }
+
+    @Test
+    public void getByteBuf() {
+        ByteBuf result = Unpooled.buffer();
+        result.writeByte(0x02);
+        result.writeByte(0x00);
+        Command command = Command.ofInt("2");
+        assertThat(command.getByteBuf(), is(result));
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void getBytesUnknown() {
+        Command command = Command.UNKNOWN;
+        command.getBytes();
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void getByteBufUnknown() {
+        Command command = Command.UNKNOWN;
+        command.getByteBuf();
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/DataLengthTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/DataLengthTest.java
index 0bcb618de83..dc138b2312e 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/DataLengthTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/DataLengthTest.java
@@ -1,77 +1,77 @@
-/*
- 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
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.generic.types;
-
-import org.apache.commons.codec.binary.Hex;
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-
-public class DataLengthTest {
-
-    private final byte NULL_BYTE = 0x0;
-
-    @Test
-    public void ofBytesJustRight() {
-        assertEquals(0L, DataLength.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE).getAsLong());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void ofBytesTooMany() {
-        DataLength.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void ofBytesTooFew() {
-        DataLength.of(NULL_BYTE, NULL_BYTE, NULL_BYTE);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void ofBytesNone() {
-        DataLength.of();
-    }
-
-    @Test
-    public void ofLong() {
-        assertByte(DataLength.of(1), "0x01000000");
-        assertByte(DataLength.of(65535), "0xffff0000");
-        assertThrows(IllegalArgumentException.class, () -> DataLength.of(-1));
-        assertThrows(IllegalArgumentException.class, () -> DataLength.of(4294967296L));
-    }
-
-    @Test
-    public void ofString() {
-        assertByte(DataLength.of("1"), "0x01000000");
-    }
-
-    @Test
-    public void testToString() {
-        assertThat(DataLength.of("1").toString(), containsString("longValue=1,"));
-    }
-
-    private void assertByte(DataLength actual, String expected) {
-        assertEquals(expected, "0x" + Hex.encodeHexString(actual.getBytes()));
-    }
-
-
+/*
+ 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
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.generic.types;
+
+import org.apache.commons.codec.binary.Hex;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+
+public class DataLengthTest {
+
+    private final byte NULL_BYTE = 0x0;
+
+    @Test
+    public void ofBytesJustRight() {
+        assertEquals(0L, DataLength.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE).getAsLong());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void ofBytesTooMany() {
+        DataLength.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void ofBytesTooFew() {
+        DataLength.of(NULL_BYTE, NULL_BYTE, NULL_BYTE);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void ofBytesNone() {
+        DataLength.of();
+    }
+
+    @Test
+    public void ofLong() {
+        assertByte(DataLength.of(1), "0x01000000");
+        assertByte(DataLength.of(65535), "0xffff0000");
+        assertThrows(IllegalArgumentException.class, () -> DataLength.of(-1));
+        assertThrows(IllegalArgumentException.class, () -> DataLength.of(4294967296L));
+    }
+
+    @Test
+    public void ofString() {
+        assertByte(DataLength.of("1"), "0x01000000");
+    }
+
+    @Test
+    public void testToString() {
+        assertThat(DataLength.of("1").toString(), containsString("longValue=1,"));
+    }
+
+    private void assertByte(DataLength actual, String expected) {
+        assertEquals(expected, "0x" + Hex.encodeHexString(actual.getBytes()));
+    }
+
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/GenericTypesFactoryMethodTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/GenericTypesFactoryMethodTest.java
index 4cf323ed521..8ed6e6d4805 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/GenericTypesFactoryMethodTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/GenericTypesFactoryMethodTest.java
@@ -1,90 +1,90 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.generic.types;
-
-import org.apache.plc4x.java.ads.api.tcp.types.TcpLength;
-import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
-import org.apache.plc4x.java.ads.api.util.UnsignedShortLEByteValue;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.hamcrest.Matchers.instanceOf;
-import static org.junit.Assume.assumeThat;
-
-@RunWith(Parameterized.class)
-public class GenericTypesFactoryMethodTest {
-
-    @Parameterized.Parameter
-    public Class<?> clazz;
-
-    @Parameterized.Parameters(name = "{index} {0}")
-    public static Collection<Object[]> data() {
-        return Stream.of(
-            AmsError.class,
-            AmsNetId.class,
-            AmsPort.class,
-            Command.class,
-            DataLength.class,
-            Invoke.class,
-            TcpLength.class,
-            State.class
-        ).map(clazz -> new Object[]{clazz}).collect(Collectors.toList());
-    }
-
-    @Test
-    public void testOfInt() throws Exception {
-        assumeThat(clazz, instanceOf(UnsignedShortLEByteValue.class));
-        Method ofMethod = clazz.getDeclaredMethod("of", int.class);
-        ofMethod.invoke(null, 1);
-    }
-
-    @Test
-    public void testOfLong() throws Exception {
-        assumeThat(clazz, instanceOf(UnsignedIntLEByteValue.class));
-        Method ofMethod = clazz.getDeclaredMethod("of", long.class);
-        ofMethod.invoke(null, 1L);
-    }
-
-    @Test
-    public void testOfString() throws Exception {
-        Method ofMethod = clazz.getDeclaredMethod("of", String.class);
-        String testString = "1";
-        if (clazz == AmsNetId.class) {
-            testString = "1.1.1.1.1.1";
-        } else if (clazz == Command.class) {
-            testString = Command.ADS_ADD_DEVICE_NOTIFICATION.name();
-        }
-        ofMethod.invoke(null, testString);
-    }
-
-    @Test
-    public void testOfBytes() throws Exception {
-        Field num_bytes_field = clazz.getDeclaredField("NUM_BYTES");
-        Integer numberOfBytes = (Integer) num_bytes_field.get(null);
-        Method ofMethod = clazz.getDeclaredMethod("of", byte[].class);
-        ofMethod.invoke(null, (Object) new byte[numberOfBytes]);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.generic.types;
+
+import org.apache.plc4x.java.ads.api.tcp.types.TcpLength;
+import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
+import org.apache.plc4x.java.ads.api.util.UnsignedShortLEByteValue;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.hamcrest.Matchers.instanceOf;
+import static org.junit.Assume.assumeThat;
+
+@RunWith(Parameterized.class)
+public class GenericTypesFactoryMethodTest {
+
+    @Parameterized.Parameter
+    public Class<?> clazz;
+
+    @Parameterized.Parameters(name = "{index} {0}")
+    public static Collection<Object[]> data() {
+        return Stream.of(
+            AmsError.class,
+            AmsNetId.class,
+            AmsPort.class,
+            Command.class,
+            DataLength.class,
+            Invoke.class,
+            TcpLength.class,
+            State.class
+        ).map(clazz -> new Object[]{clazz}).collect(Collectors.toList());
+    }
+
+    @Test
+    public void testOfInt() throws Exception {
+        assumeThat(clazz, instanceOf(UnsignedShortLEByteValue.class));
+        Method ofMethod = clazz.getDeclaredMethod("of", int.class);
+        ofMethod.invoke(null, 1);
+    }
+
+    @Test
+    public void testOfLong() throws Exception {
+        assumeThat(clazz, instanceOf(UnsignedIntLEByteValue.class));
+        Method ofMethod = clazz.getDeclaredMethod("of", long.class);
+        ofMethod.invoke(null, 1L);
+    }
+
+    @Test
+    public void testOfString() throws Exception {
+        Method ofMethod = clazz.getDeclaredMethod("of", String.class);
+        String testString = "1";
+        if (clazz == AmsNetId.class) {
+            testString = "1.1.1.1.1.1";
+        } else if (clazz == Command.class) {
+            testString = Command.ADS_ADD_DEVICE_NOTIFICATION.name();
+        }
+        ofMethod.invoke(null, testString);
+    }
+
+    @Test
+    public void testOfBytes() throws Exception {
+        Field num_bytes_field = clazz.getDeclaredField("NUM_BYTES");
+        Integer numberOfBytes = (Integer) num_bytes_field.get(null);
+        Method ofMethod = clazz.getDeclaredMethod("of", byte[].class);
+        ofMethod.invoke(null, (Object) new byte[numberOfBytes]);
+    }
+}
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/StateTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/StateTest.java
index 2be45d7ebd3..91df45b5065 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/StateTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/StateTest.java
@@ -1,55 +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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.generic.types;
-
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
-
-public class StateTest {
-
-    // Not the best unit tests but here for coverage
-
-    @Test
-    public void stateBitFields() {
-        int bitMask = State.StateMask.RESPONSE.getMask() | State.StateMask.NO_RETURN.getMask() | State.StateMask.ADS_COMMAND.getMask()
-                        | State.StateMask.SYSTEM_COMMAND.getMask() | State.StateMask.HIGH_PRIORITY_COMMAND.getMask() | State.StateMask.TIMESTAMP_ADDED.getMask()
-                        | State.StateMask.UDP_COMMAND.getMask() | State.StateMask.INIT_COMMAND.getMask() | State.StateMask.BROADCAST.getMask();
-        State state = State.of(bitMask);
-
-        assertThat(state.toString(), not((isEmptyString())));
-    }
-
-    @Test
-    public void equals() {
-        State a = State.of((byte) 0x1, (byte) 0x2);
-        State b = State.of((byte) 0x1, (byte) 0x2);
-        State c = State.of((byte) 0x1, (byte) 0x4);
-        byte array[] = {(byte) 0x1, (byte) 0x2};
-
-        assertThat(a.equals(a), is(true));
-        assertThat(a.equals(b), is(true));
-        assertThat(a.equals(c), is(false));
-        assertThat(a.equals(1), is(false));
-        assertThat(a.equals((byte) 1), is(false));
-        assertThat(a.equals(array), is(false));
-    }
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.generic.types;
+
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.assertThat;
+
+public class StateTest {
+
+    // Not the best unit tests but here for coverage
+
+    @Test
+    public void stateBitFields() {
+        int bitMask = State.StateMask.RESPONSE.getMask() | State.StateMask.NO_RETURN.getMask() | State.StateMask.ADS_COMMAND.getMask()
+                        | State.StateMask.SYSTEM_COMMAND.getMask() | State.StateMask.HIGH_PRIORITY_COMMAND.getMask() | State.StateMask.TIMESTAMP_ADDED.getMask()
+                        | State.StateMask.UDP_COMMAND.getMask() | State.StateMask.INIT_COMMAND.getMask() | State.StateMask.BROADCAST.getMask();
+        State state = State.of(bitMask);
+
+        assertThat(state.toString(), not((isEmptyString())));
+    }
+
+    @Test
+    public void equals() {
+        State a = State.of((byte) 0x1, (byte) 0x2);
+        State b = State.of((byte) 0x1, (byte) 0x2);
+        State c = State.of((byte) 0x1, (byte) 0x4);
+        byte array[] = {(byte) 0x1, (byte) 0x2};
+
+        assertThat(a.equals(a), is(true));
+        assertThat(a.equals(b), is(true));
+        assertThat(a.equals(c), is(false));
+        assertThat(a.equals(1), is(false));
+        assertThat(a.equals((byte) 1), is(false));
+        assertThat(a.equals(array), is(false));
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/TcpLengthTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/TcpLengthTest.java
index a840adadd65..36959e14e16 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/TcpLengthTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/TcpLengthTest.java
@@ -1,63 +1,63 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.generic.types;
-
-
-import org.apache.commons.codec.binary.Hex;
-import org.apache.plc4x.java.ads.api.tcp.types.TcpLength;
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-
-public class TcpLengthTest {
-    private final byte NULL_BYTE = 0x0;
-
-    @Test
-    public void ofBytes() {
-        assertEquals(0L, TcpLength.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE).getAsLong());
-        assertThrows(IllegalArgumentException.class, () -> TcpLength.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE));
-    }
-
-    @Test
-    public void ofLong() {
-        assertByte(TcpLength.of(1), "0x01000000");
-        assertByte(TcpLength.of(65535), "0xffff0000");
-        assertThrows(IllegalArgumentException.class, () -> TcpLength.of(-1));
-        assertThrows(IllegalArgumentException.class, () -> TcpLength.of(4294967296L));
-    }
-
-    @Test
-    public void ofString() {
-        assertByte(TcpLength.of("1"), "0x01000000");
-    }
-
-    @Test
-    public void testToString() {
-        assertThat(TcpLength.of("1").toString(), containsString("longValue=1,"));
-    }
-
-    private void assertByte(TcpLength actual, String expected) {
-        assertEquals(expected, "0x" + Hex.encodeHexString(actual.getBytes()));
-    }
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.generic.types;
+
+
+import org.apache.commons.codec.binary.Hex;
+import org.apache.plc4x.java.ads.api.tcp.types.TcpLength;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+
+public class TcpLengthTest {
+    private final byte NULL_BYTE = 0x0;
+
+    @Test
+    public void ofBytes() {
+        assertEquals(0L, TcpLength.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE).getAsLong());
+        assertThrows(IllegalArgumentException.class, () -> TcpLength.of(NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE, NULL_BYTE));
+    }
+
+    @Test
+    public void ofLong() {
+        assertByte(TcpLength.of(1), "0x01000000");
+        assertByte(TcpLength.of(65535), "0xffff0000");
+        assertThrows(IllegalArgumentException.class, () -> TcpLength.of(-1));
+        assertThrows(IllegalArgumentException.class, () -> TcpLength.of(4294967296L));
+    }
+
+    @Test
+    public void ofString() {
+        assertByte(TcpLength.of("1"), "0x01000000");
+    }
+
+    @Test
+    public void testToString() {
+        assertThat(TcpLength.of("1").toString(), containsString("longValue=1,"));
+    }
+
+    private void assertByte(TcpLength actual, String expected) {
+        assertEquals(expected, "0x" + Hex.encodeHexString(actual.getBytes()));
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/serial/SerialFactoryMethodTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/serial/SerialFactoryMethodTest.java
index 15edd2722b4..1b4d9407f4a 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/serial/SerialFactoryMethodTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/serial/SerialFactoryMethodTest.java
@@ -1,83 +1,83 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.serial;
-
-import org.apache.plc4x.java.ads.api.util.ByteReadable;
-import org.junit.runners.Parameterized;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.*;
-
-//@RunWith(Parameterized.class)
-public class SerialFactoryMethodTest {
-
-    @Parameterized.Parameter
-    public Class<?> clazz;
-
-    @Parameterized.Parameters(name = "{index} {0}")
-    public static Collection<Object[]> data() {
-        return Stream.of(
-            AmsSerialAcknowledgeFrame.class,
-            AmsSerialFrame.class,
-            AmsSerialResetFrame.class
-        ).map(clazz -> new Object[]{clazz}).collect(Collectors.toList());
-    }
-
-    // TODO: Commented out as it was causing problems with Java 11
-    //@Test
-    public void testOf() throws Exception {
-        List<Method> getters = Arrays
-            .stream(clazz.getDeclaredMethods())
-            .filter(method -> (
-                method.getName().startsWith("get") || method.getName().startsWith("is"))
-                && Modifier.isPublic(method.getModifiers())
-                && method.getParameterCount() == 0)
-            .collect(Collectors.toList());
-        for (Method method : clazz.getDeclaredMethods()) {
-            if (!method.getName().equals("of")) {
-                continue;
-            }
-            Object invoke = method.invoke(null, Arrays.stream(method.getParameterTypes()).map(aClass -> {
-                if (ByteReadable.class.isAssignableFrom(aClass)) {
-                    ByteReadable mock = (ByteReadable) mock(aClass, RETURNS_DEEP_STUBS);
-                    when(mock.getBytes()).thenReturn(new byte[0]);
-                    return mock;
-                } else {
-                    return mock(aClass, RETURNS_DEEP_STUBS);
-                }
-            }).toArray());
-            assertThat(invoke, notNullValue());
-            assertThat(invoke, instanceOf(clazz));
-            assertThat(invoke.toString(), not(isEmptyString()));
-            // Testing getters for the coverage (sonar)
-            for (Method getter : getters) {
-                getter.invoke(invoke);
-            }
-        }
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.serial;
+
+import org.apache.plc4x.java.ads.api.util.ByteReadable;
+import org.junit.runners.Parameterized;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.*;
+
+//@RunWith(Parameterized.class)
+public class SerialFactoryMethodTest {
+
+    @Parameterized.Parameter
+    public Class<?> clazz;
+
+    @Parameterized.Parameters(name = "{index} {0}")
+    public static Collection<Object[]> data() {
+        return Stream.of(
+            AmsSerialAcknowledgeFrame.class,
+            AmsSerialFrame.class,
+            AmsSerialResetFrame.class
+        ).map(clazz -> new Object[]{clazz}).collect(Collectors.toList());
+    }
+
+    // TODO: Commented out as it was causing problems with Java 11
+    //@Test
+    public void testOf() throws Exception {
+        List<Method> getters = Arrays
+            .stream(clazz.getDeclaredMethods())
+            .filter(method -> (
+                method.getName().startsWith("get") || method.getName().startsWith("is"))
+                && Modifier.isPublic(method.getModifiers())
+                && method.getParameterCount() == 0)
+            .collect(Collectors.toList());
+        for (Method method : clazz.getDeclaredMethods()) {
+            if (!method.getName().equals("of")) {
+                continue;
+            }
+            Object invoke = method.invoke(null, Arrays.stream(method.getParameterTypes()).map(aClass -> {
+                if (ByteReadable.class.isAssignableFrom(aClass)) {
+                    ByteReadable mock = (ByteReadable) mock(aClass, RETURNS_DEEP_STUBS);
+                    when(mock.getBytes()).thenReturn(new byte[0]);
+                    return mock;
+                } else {
+                    return mock(aClass, RETURNS_DEEP_STUBS);
+                }
+            }).toArray());
+            assertThat(invoke, notNullValue());
+            assertThat(invoke, instanceOf(clazz));
+            assertThat(invoke.toString(), not(isEmptyString()));
+            // Testing getters for the coverage (sonar)
+            for (Method getter : getters) {
+                getter.invoke(invoke);
+            }
+        }
+    }
+}
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/serial/types/GenericTypesFactoryMethodTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/serial/types/GenericTypesFactoryMethodTest.java
index d2d8cb03144..b8244e60858 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/serial/types/GenericTypesFactoryMethodTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/serial/types/GenericTypesFactoryMethodTest.java
@@ -1,92 +1,92 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.serial.types;
-
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.Command;
-import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
-import org.apache.plc4x.java.ads.api.util.UnsignedShortLEByteValue;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.not;
-import static org.junit.Assume.assumeThat;
-
-@RunWith(Parameterized.class)
-public class GenericTypesFactoryMethodTest {
-
-    @Parameterized.Parameter
-    public Class<?> clazz;
-
-    @Parameterized.Parameters(name = "{index} {0}")
-    public static Collection<Object[]> data() {
-        return Stream.of(
-            CRC.class,
-            FragmentNumber.class,
-            MagicCookie.class,
-            ReceiverAddress.class,
-            TransmitterAddress.class,
-            UserData.class,
-            UserDataLength.class
-        ).map(clazz -> new Object[]{clazz}).collect(Collectors.toList());
-    }
-
-    @Test
-    public void testOfInt() throws Exception {
-        assumeThat(clazz, instanceOf(UnsignedShortLEByteValue.class));
-        Method ofMethod = clazz.getDeclaredMethod("of", int.class);
-        ofMethod.invoke(null, 1);
-    }
-
-    @Test
-    public void testOfLong() throws Exception {
-        assumeThat(clazz, instanceOf(UnsignedIntLEByteValue.class));
-        Method ofMethod = clazz.getDeclaredMethod("of", long.class);
-        ofMethod.invoke(null, 1L);
-    }
-
-    @Test
-    public void testOfString() throws Exception {
-        Method ofMethod = clazz.getDeclaredMethod("of", String.class);
-        String testString = "1";
-        if (clazz == AmsNetId.class) {
-            testString = "1.1.1.1.1.1";
-        } else if (clazz == Command.class) {
-            testString = Command.ADS_ADD_DEVICE_NOTIFICATION.name();
-        }
-        ofMethod.invoke(null, testString);
-    }
-
-    @Test
-    public void testOfBytes() throws Exception {
-        assumeThat(clazz, not(UserData.class));
-        Field num_bytes_field = clazz.getDeclaredField("NUM_BYTES");
-        Integer numberOfBytes = (Integer) num_bytes_field.get(null);
-        Method ofMethod = clazz.getDeclaredMethod("of", byte[].class);
-        ofMethod.invoke(null, (Object) new byte[numberOfBytes]);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.serial.types;
+
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.Command;
+import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
+import org.apache.plc4x.java.ads.api.util.UnsignedShortLEByteValue;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assume.assumeThat;
+
+@RunWith(Parameterized.class)
+public class GenericTypesFactoryMethodTest {
+
+    @Parameterized.Parameter
+    public Class<?> clazz;
+
+    @Parameterized.Parameters(name = "{index} {0}")
+    public static Collection<Object[]> data() {
+        return Stream.of(
+            CRC.class,
+            FragmentNumber.class,
+            MagicCookie.class,
+            ReceiverAddress.class,
+            TransmitterAddress.class,
+            UserData.class,
+            UserDataLength.class
+        ).map(clazz -> new Object[]{clazz}).collect(Collectors.toList());
+    }
+
+    @Test
+    public void testOfInt() throws Exception {
+        assumeThat(clazz, instanceOf(UnsignedShortLEByteValue.class));
+        Method ofMethod = clazz.getDeclaredMethod("of", int.class);
+        ofMethod.invoke(null, 1);
+    }
+
+    @Test
+    public void testOfLong() throws Exception {
+        assumeThat(clazz, instanceOf(UnsignedIntLEByteValue.class));
+        Method ofMethod = clazz.getDeclaredMethod("of", long.class);
+        ofMethod.invoke(null, 1L);
+    }
+
+    @Test
+    public void testOfString() throws Exception {
+        Method ofMethod = clazz.getDeclaredMethod("of", String.class);
+        String testString = "1";
+        if (clazz == AmsNetId.class) {
+            testString = "1.1.1.1.1.1";
+        } else if (clazz == Command.class) {
+            testString = Command.ADS_ADD_DEVICE_NOTIFICATION.name();
+        }
+        ofMethod.invoke(null, testString);
+    }
+
+    @Test
+    public void testOfBytes() throws Exception {
+        assumeThat(clazz, not(UserData.class));
+        Field num_bytes_field = clazz.getDeclaredField("NUM_BYTES");
+        Integer numberOfBytes = (Integer) num_bytes_field.get(null);
+        Method ofMethod = clazz.getDeclaredMethod("of", byte[].class);
+        ofMethod.invoke(null, (Object) new byte[numberOfBytes]);
+    }
+}
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/tcp/TcpFactoryMethodTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/tcp/TcpFactoryMethodTest.java
index 04a20baa752..4f06d4699e6 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/tcp/TcpFactoryMethodTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/tcp/TcpFactoryMethodTest.java
@@ -1,86 +1,86 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.tcp;
-
-import org.apache.plc4x.java.ads.api.generic.types.Command;
-import org.apache.plc4x.java.ads.api.util.LengthSupplier;
-import org.junit.runners.Parameterized;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
-
-//@RunWith(Parameterized.class)
-public class TcpFactoryMethodTest {
-
-    @Parameterized.Parameter
-    public Class<?> clazz;
-
-    @Parameterized.Parameters(name = "{index} {0}")
-    public static Collection<Object[]> data() {
-        return Stream.of(
-            AmsTcpHeader.class,
-            AmsTCPPacket.class
-        ).map(clazz -> new Object[]{clazz}).collect(Collectors.toList());
-    }
-
-    // TODO: Commented out as it was causing problems with Java 11
-    //@Test
-    public void testOf() throws Exception {
-        List<Method> getters = Arrays
-            .stream(clazz.getDeclaredMethods())
-            .filter(method -> (
-                method.getName().startsWith("get") || method.getName().startsWith("is"))
-                && Modifier.isPublic(method.getModifiers())
-                && method.getParameterCount() == 0)
-            .collect(Collectors.toList());
-        for (Method method : clazz.getDeclaredMethods()) {
-            if (!method.getName().equals("of")) {
-                continue;
-            }
-            Object invoke = method.invoke(null, Arrays.stream(method.getParameterTypes()).map(aClass -> {
-                if (aClass == Command.class) {
-                    return Command.INVALID;
-                } else if (aClass == LengthSupplier[].class) {
-                    return new LengthSupplier[]{() -> 0};
-                } else if (aClass == long.class) {
-                    return 1L;
-                } else {
-                    return mock(aClass, RETURNS_DEEP_STUBS);
-                }
-            }).toArray());
-            assertThat(invoke, notNullValue());
-            assertThat(invoke, instanceOf(clazz));
-            assertThat(invoke.toString(), not(isEmptyString()));
-            // Testing getters for the coverage (sonar)
-            for (Method getter : getters) {
-                getter.invoke(invoke);
-            }
-        }
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.tcp;
+
+import org.apache.plc4x.java.ads.api.generic.types.Command;
+import org.apache.plc4x.java.ads.api.util.LengthSupplier;
+import org.junit.runners.Parameterized;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+
+//@RunWith(Parameterized.class)
+public class TcpFactoryMethodTest {
+
+    @Parameterized.Parameter
+    public Class<?> clazz;
+
+    @Parameterized.Parameters(name = "{index} {0}")
+    public static Collection<Object[]> data() {
+        return Stream.of(
+            AmsTcpHeader.class,
+            AmsTCPPacket.class
+        ).map(clazz -> new Object[]{clazz}).collect(Collectors.toList());
+    }
+
+    // TODO: Commented out as it was causing problems with Java 11
+    //@Test
+    public void testOf() throws Exception {
+        List<Method> getters = Arrays
+            .stream(clazz.getDeclaredMethods())
+            .filter(method -> (
+                method.getName().startsWith("get") || method.getName().startsWith("is"))
+                && Modifier.isPublic(method.getModifiers())
+                && method.getParameterCount() == 0)
+            .collect(Collectors.toList());
+        for (Method method : clazz.getDeclaredMethods()) {
+            if (!method.getName().equals("of")) {
+                continue;
+            }
+            Object invoke = method.invoke(null, Arrays.stream(method.getParameterTypes()).map(aClass -> {
+                if (aClass == Command.class) {
+                    return Command.INVALID;
+                } else if (aClass == LengthSupplier[].class) {
+                    return new LengthSupplier[]{() -> 0};
+                } else if (aClass == long.class) {
+                    return 1L;
+                } else {
+                    return mock(aClass, RETURNS_DEEP_STUBS);
+                }
+            }).toArray());
+            assertThat(invoke, notNullValue());
+            assertThat(invoke, instanceOf(clazz));
+            assertThat(invoke.toString(), not(isEmptyString()));
+            // Testing getters for the coverage (sonar)
+            for (Method getter : getters) {
+                getter.invoke(invoke);
+            }
+        }
+    }
+}
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/tcp/types/GenericTypesFactoryMethodTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/tcp/types/GenericTypesFactoryMethodTest.java
index 2a49ceaf2de..988dcd366c5 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/tcp/types/GenericTypesFactoryMethodTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/tcp/types/GenericTypesFactoryMethodTest.java
@@ -1,87 +1,87 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.tcp.types;
-
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.Command;
-import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
-import org.apache.plc4x.java.ads.api.util.UnsignedShortLEByteValue;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.not;
-import static org.junit.Assume.assumeThat;
-
-@RunWith(Parameterized.class)
-public class GenericTypesFactoryMethodTest {
-
-    @Parameterized.Parameter
-    public Class<?> clazz;
-
-    @Parameterized.Parameters(name = "{index} {0}")
-    public static Collection<Object[]> data() {
-        return Stream.of(
-            TcpLength.class,
-            UserData.class
-        ).map(clazz -> new Object[]{clazz}).collect(Collectors.toList());
-    }
-
-    @Test
-    public void testOfInt() throws Exception {
-        assumeThat(clazz, instanceOf(UnsignedShortLEByteValue.class));
-        Method ofMethod = clazz.getDeclaredMethod("of", int.class);
-        ofMethod.invoke(null, 1);
-    }
-
-    @Test
-    public void testOfLong() throws Exception {
-        assumeThat(clazz, instanceOf(UnsignedIntLEByteValue.class));
-        Method ofMethod = clazz.getDeclaredMethod("of", long.class);
-        ofMethod.invoke(null, 1L);
-    }
-
-    @Test
-    public void testOfString() throws Exception {
-        Method ofMethod = clazz.getDeclaredMethod("of", String.class);
-        String testString = "1";
-        if (clazz == AmsNetId.class) {
-            testString = "1.1.1.1.1.1";
-        } else if (clazz == Command.class) {
-            testString = Command.ADS_ADD_DEVICE_NOTIFICATION.name();
-        }
-        ofMethod.invoke(null, testString);
-    }
-
-    @Test
-    public void testOfBytes() throws Exception {
-        assumeThat(clazz, not(UserData.class));
-        Field num_bytes_field = clazz.getDeclaredField("NUM_BYTES");
-        Integer numberOfBytes = (Integer) num_bytes_field.get(null);
-        Method ofMethod = clazz.getDeclaredMethod("of", byte[].class);
-        ofMethod.invoke(null, (Object) new byte[numberOfBytes]);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.tcp.types;
+
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.Command;
+import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
+import org.apache.plc4x.java.ads.api.util.UnsignedShortLEByteValue;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assume.assumeThat;
+
+@RunWith(Parameterized.class)
+public class GenericTypesFactoryMethodTest {
+
+    @Parameterized.Parameter
+    public Class<?> clazz;
+
+    @Parameterized.Parameters(name = "{index} {0}")
+    public static Collection<Object[]> data() {
+        return Stream.of(
+            TcpLength.class,
+            UserData.class
+        ).map(clazz -> new Object[]{clazz}).collect(Collectors.toList());
+    }
+
+    @Test
+    public void testOfInt() throws Exception {
+        assumeThat(clazz, instanceOf(UnsignedShortLEByteValue.class));
+        Method ofMethod = clazz.getDeclaredMethod("of", int.class);
+        ofMethod.invoke(null, 1);
+    }
+
+    @Test
+    public void testOfLong() throws Exception {
+        assumeThat(clazz, instanceOf(UnsignedIntLEByteValue.class));
+        Method ofMethod = clazz.getDeclaredMethod("of", long.class);
+        ofMethod.invoke(null, 1L);
+    }
+
+    @Test
+    public void testOfString() throws Exception {
+        Method ofMethod = clazz.getDeclaredMethod("of", String.class);
+        String testString = "1";
+        if (clazz == AmsNetId.class) {
+            testString = "1.1.1.1.1.1";
+        } else if (clazz == Command.class) {
+            testString = Command.ADS_ADD_DEVICE_NOTIFICATION.name();
+        }
+        ofMethod.invoke(null, testString);
+    }
+
+    @Test
+    public void testOfBytes() throws Exception {
+        assumeThat(clazz, not(UserData.class));
+        Field num_bytes_field = clazz.getDeclaredField("NUM_BYTES");
+        Integer numberOfBytes = (Integer) num_bytes_field.get(null);
+        Method ofMethod = clazz.getDeclaredMethod("of", byte[].class);
+        ofMethod.invoke(null, (Object) new byte[numberOfBytes]);
+    }
+}
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/util/ByteValueTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/util/ByteValueTest.java
index 9f0e9c6e40c..451f03c8953 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/util/ByteValueTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/util/ByteValueTest.java
@@ -1,146 +1,146 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.api.util;
-
-import io.netty.buffer.ByteBuf;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.math.BigInteger;
-
-import static java.util.Arrays.copyOfRange;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-public class ByteValueTest {
-
-    private ByteValue byteValue;
-    private long upperBound = (long) Math.pow(2, (8 * 4));
-
-    @Before
-    public void setUp() throws Exception {
-        byteValue = new ByteValue((byte) 0x1, (byte) 0x2, (byte) 0x3, (byte) 0x4);
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        byteValue = null;
-    }
-
-    @Test
-    public void assertCorrectLength() {
-        byteValue.assertLength(4); // no exception
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void assertCorrectLengthException() {
-        byteValue.assertLength(3);
-    }
-
-    @Test
-    public void checkUnsignedBoundsLong() {
-        ByteValue.checkUnsignedBounds(0, 4);
-        ByteValue.checkUnsignedBounds(upperBound - 1, 4);
-    }
-
-    @Test
-    public void checkUnsignedBoundsLongHex() {
-        // Hex representation to visualize valid bounds in bytes
-        ByteValue.checkUnsignedBounds(0x0_00_00, 2);
-        ByteValue.checkUnsignedBounds(0x0_FF_FF, 2);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void checkUnsignedBoundsLongNegative() {
-        ByteValue.checkUnsignedBounds(-1, 4);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void checkUnsignedBoundsLongTooBig() {
-        ByteValue.checkUnsignedBounds(upperBound, 4);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void checkUnsignedBoundsLongTooBigHex() {
-        ByteValue.checkUnsignedBounds(0x1_00_00, 2);
-    }
-
-    @Test
-    public void checkUnsignedBoundsBig() {
-        ByteValue.checkUnsignedBounds(new BigInteger("0"), 4);
-        ByteValue.checkUnsignedBounds(new BigInteger(Long.toString(upperBound - 1)), 4);
-    }
-
-    @Test
-    public void checkUnsignedBoundsBigHex() {
-        ByteValue.checkUnsignedBounds(BigInteger.valueOf(0x0_00_00), 2);
-        ByteValue.checkUnsignedBounds(BigInteger.valueOf(0x0_FF_FF), 2);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void checkUnsignedBoundsBigNegative() {
-        ByteValue.checkUnsignedBounds(new BigInteger("-1"), 4);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void checkUnsignedBoundsBigTooBig() {
-        ByteValue.checkUnsignedBounds(new BigInteger(Long.toString(upperBound)).add(BigInteger.ONE), 4);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void checkUnsignedBoundsBigTooBigHex() {
-        ByteValue.checkUnsignedBounds(BigInteger.valueOf(0x1_00_00), 2);
-    }
-
-    @Test
-    public void getBytes() {
-        byte[] correct = {(byte) 0x1, (byte) 0x2, (byte) 0x3, (byte) 0x4};
-        assertThat(byteValue.getBytes(), is(correct));
-    }
-
-    @Test
-    public void getByteBuf() {
-        byte[] correct = {(byte) 0x1, (byte) 0x2, (byte) 0x3, (byte) 0x4};
-        ByteBuf data = byteValue.getByteBuf();
-
-        assertThat(data.readableBytes(), is(4));
-        assertThat(data.readByte(), is((byte) 0x1));
-        assertThat(data.readByte(), is((byte) 0x2));
-        assertThat(data.readByte(), is((byte) 0x3));
-        assertThat(data.readByte(), is((byte) 0x4));
-        assertThat(copyOfRange(data.array(), 0, 4), is(correct));
-    }
-
-    @Test
-    public void equals() {
-        ByteValue a = new ByteValue(((byte) 0x1));
-        ByteValue b = new ByteValue(((byte) 0x1));
-        ByteValue c = new ByteValue(((byte) 0x2));
-        byte array[] = {(byte) 0x1};
-
-        assertThat(a.equals(a), is(true));
-        assertThat(a.equals(b), is(true));
-        assertThat(a.equals(c), is(false));
-        assertThat(a.equals(1), is(false));
-        assertThat(a.equals((byte) 1), is(false));
-        assertThat(a.equals(array), is(false));
-    }
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.api.util;
+
+import io.netty.buffer.ByteBuf;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.math.BigInteger;
+
+import static java.util.Arrays.copyOfRange;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+public class ByteValueTest {
+
+    private ByteValue byteValue;
+    private long upperBound = (long) Math.pow(2, (8 * 4));
+
+    @Before
+    public void setUp() throws Exception {
+        byteValue = new ByteValue((byte) 0x1, (byte) 0x2, (byte) 0x3, (byte) 0x4);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        byteValue = null;
+    }
+
+    @Test
+    public void assertCorrectLength() {
+        byteValue.assertLength(4); // no exception
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void assertCorrectLengthException() {
+        byteValue.assertLength(3);
+    }
+
+    @Test
+    public void checkUnsignedBoundsLong() {
+        ByteValue.checkUnsignedBounds(0, 4);
+        ByteValue.checkUnsignedBounds(upperBound - 1, 4);
+    }
+
+    @Test
+    public void checkUnsignedBoundsLongHex() {
+        // Hex representation to visualize valid bounds in bytes
+        ByteValue.checkUnsignedBounds(0x0_00_00, 2);
+        ByteValue.checkUnsignedBounds(0x0_FF_FF, 2);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void checkUnsignedBoundsLongNegative() {
+        ByteValue.checkUnsignedBounds(-1, 4);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void checkUnsignedBoundsLongTooBig() {
+        ByteValue.checkUnsignedBounds(upperBound, 4);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void checkUnsignedBoundsLongTooBigHex() {
+        ByteValue.checkUnsignedBounds(0x1_00_00, 2);
+    }
+
+    @Test
+    public void checkUnsignedBoundsBig() {
+        ByteValue.checkUnsignedBounds(new BigInteger("0"), 4);
+        ByteValue.checkUnsignedBounds(new BigInteger(Long.toString(upperBound - 1)), 4);
+    }
+
+    @Test
+    public void checkUnsignedBoundsBigHex() {
+        ByteValue.checkUnsignedBounds(BigInteger.valueOf(0x0_00_00), 2);
+        ByteValue.checkUnsignedBounds(BigInteger.valueOf(0x0_FF_FF), 2);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void checkUnsignedBoundsBigNegative() {
+        ByteValue.checkUnsignedBounds(new BigInteger("-1"), 4);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void checkUnsignedBoundsBigTooBig() {
+        ByteValue.checkUnsignedBounds(new BigInteger(Long.toString(upperBound)).add(BigInteger.ONE), 4);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void checkUnsignedBoundsBigTooBigHex() {
+        ByteValue.checkUnsignedBounds(BigInteger.valueOf(0x1_00_00), 2);
+    }
+
+    @Test
+    public void getBytes() {
+        byte[] correct = {(byte) 0x1, (byte) 0x2, (byte) 0x3, (byte) 0x4};
+        assertThat(byteValue.getBytes(), is(correct));
+    }
+
+    @Test
+    public void getByteBuf() {
+        byte[] correct = {(byte) 0x1, (byte) 0x2, (byte) 0x3, (byte) 0x4};
+        ByteBuf data = byteValue.getByteBuf();
+
+        assertThat(data.readableBytes(), is(4));
+        assertThat(data.readByte(), is((byte) 0x1));
+        assertThat(data.readByte(), is((byte) 0x2));
+        assertThat(data.readByte(), is((byte) 0x3));
+        assertThat(data.readByte(), is((byte) 0x4));
+        assertThat(copyOfRange(data.array(), 0, 4), is(correct));
+    }
+
+    @Test
+    public void equals() {
+        ByteValue a = new ByteValue(((byte) 0x1));
+        ByteValue b = new ByteValue(((byte) 0x1));
+        ByteValue c = new ByteValue(((byte) 0x2));
+        byte array[] = {(byte) 0x1};
+
+        assertThat(a.equals(a), is(true));
+        assertThat(a.equals(b), is(true));
+        assertThat(a.equals(c), is(false));
+        assertThat(a.equals(1), is(false));
+        assertThat(a.equals((byte) 1), is(false));
+        assertThat(a.equals(array), is(false));
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/model/AdsPlcFieldHandlerTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/model/AdsPlcFieldHandlerTest.java
index d81df630b42..92ecf0eff0c 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/model/AdsPlcFieldHandlerTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/model/AdsPlcFieldHandlerTest.java
@@ -1,591 +1,591 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.ads.model;
-
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.messages.items.*;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.TestInfo;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.junit.jupiter.params.provider.ValueSource;
-
-import java.lang.reflect.Array;
-import java.lang.reflect.InvocationTargetException;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.*;
-import java.util.function.BiFunction;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.fail;
-
-class AdsPlcFieldHandlerTest {
-
-    private static AdsPlcFieldHandler SUT = new AdsPlcFieldHandler();
-
-    private TestInfo testInfo;
-
-    @BeforeEach
-    void setUp(TestInfo testInfo) {
-        this.testInfo = testInfo;
-    }
-
-    @ParameterizedTest
-    @ValueSource(strings = {
-        "0/0:BOOL",
-        "0/1:WORD"
-    })
-    void createField(String fieldQuery) {
-        SUT.createField(fieldQuery);
-    }
-
-    @ParameterizedTest
-    @MethodSource("createInputArrays")
-    void encodeOneBitTypes(String name, PlcField field, Object[] values) {
-        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
-            "BOOL-BOOLEAN-MIN", "BOOL-BOOLEAN-MAX",
-            "BOOL-BYTE-MIN", "BOOL-BYTE-NIL", "BOOL-BYTE-VAL", "BOOL-BYTE-MAX",
-            "BOOL-SHORT-MIN", "BOOL-SHORT-NIL", "BOOL-SHORT-VAL", "BOOL-SHORT-MAX",
-            "BOOL-INTEGER-MIN", "BOOL-INTEGER-NIL", "BOOL-INTEGER-VAL", "BOOL-INTEGER-MAX",
-            "BOOL-LONG-MIN", "BOOL-LONG-NIL", "BOOL-LONG-VAL", "BOOL-LONG-MAX",
-
-            "BYTE-BOOLEAN-MIN", "BYTE-BOOLEAN-MAX",
-            "BYTE-BYTE-MIN", "BYTE-BYTE-NIL", "BYTE-BYTE-VAL", "BYTE-BYTE-MAX",
-            "BYTE-SHORT-MIN", "BYTE-SHORT-NIL", "BYTE-SHORT-VAL", "BYTE-SHORT-MAX",
-            "BYTE-INTEGER-MIN", "BYTE-INTEGER-NIL", "BYTE-INTEGER-VAL", "BYTE-INTEGER-MAX",
-            "BYTE-LONG-MIN", "BYTE-LONG-NIL", "BYTE-LONG-VAL", "BYTE-LONG-MAX",
-
-            "WORD-BOOLEAN-MIN", "WORD-BOOLEAN-MAX",
-            "WORD-BYTE-MIN", "WORD-BYTE-NIL", "WORD-BYTE-VAL", "WORD-BYTE-MAX",
-            "WORD-SHORT-MIN", "WORD-SHORT-NIL", "WORD-SHORT-VAL", "WORD-SHORT-MAX",
-            "WORD-INTEGER-MIN", "WORD-INTEGER-NIL", "WORD-INTEGER-VAL", "WORD-INTEGER-MAX",
-            "WORD-LONG-MIN", "WORD-LONG-NIL", "WORD-LONG-VAL", "WORD-LONG-MAX",
-
-            "DWORD-BOOLEAN-MIN", "DWORD-BOOLEAN-MAX",
-            "DWORD-BYTE-MIN", "DWORD-BYTE-NIL", "DWORD-BYTE-VAL", "DWORD-BYTE-MAX",
-            "DWORD-SHORT-MIN", "DWORD-SHORT-NIL", "DWORD-SHORT-VAL", "DWORD-SHORT-MAX",
-            "DWORD-INTEGER-MIN", "DWORD-INTEGER-NIL", "DWORD-INTEGER-VAL", "DWORD-INTEGER-MAX",
-            "DWORD-LONG-MIN", "DWORD-LONG-NIL", "DWORD-LONG-VAL", "DWORD-LONG-MAX",
-
-            "LWORD-BOOLEAN-MIN", "LWORD-BOOLEAN-MAX",
-            "LWORD-BYTE-MIN", "LWORD-BYTE-NIL", "LWORD-BYTE-VAL", "LWORD-BYTE-MAX",
-            "LWORD-SHORT-MIN", "LWORD-SHORT-NIL", "LWORD-SHORT-VAL", "LWORD-SHORT-MAX",
-            "LWORD-INTEGER-MIN", "LWORD-INTEGER-NIL", "LWORD-INTEGER-VAL", "LWORD-INTEGER-MAX",
-            "LWORD-LONG-MIN", "LWORD-LONG-NIL", "LWORD-LONG-VAL", "LWORD-LONG-MAX"
-        ));
-        encode(name, field, values, expectedSuccess, SUT::encodeBoolean);
-    }
-
-    @ParameterizedTest
-    @MethodSource("createInputArrays")
-    void encodeOneByteIntegerTypes(String name, PlcField field, Object[] values) {
-        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
-            "BYTE-BYTE-NIL", "BYTE-BYTE-VAL", "BYTE-BYTE-MAX",
-            "BYTE-SHORT-NIL", "BYTE-SHORT-VAL",
-            "BYTE-INTEGER-NIL", "BYTE-INTEGER-VAL",
-            "BYTE-LONG-NIL", "BYTE-LONG-VAL",
-
-            "SINT-BYTE-MIN", "SINT-BYTE-NIL", "SINT-BYTE-VAL", "SINT-BYTE-MAX",
-            "SINT-SHORT-NIL", "SINT-SHORT-VAL",
-            "SINT-INTEGER-NIL", "SINT-INTEGER-VAL",
-            "SINT-LONG-NIL", "SINT-LONG-VAL",
-
-            "INT32-BYTE-MIN", "INT32-BYTE-NIL", "INT32-BYTE-VAL", "INT32-BYTE-MAX",
-            "INT32-SHORT-MIN", "INT32-SHORT-NIL", "INT32-SHORT-VAL", "INT32-SHORT-MAX",
-            "INT32-INTEGER-MIN", "INT32-INTEGER-NIL", "INT32-INTEGER-VAL", "INT32-INTEGER-MAX",
-            "INT32-LONG-NIL", "INT32-LONG-VAL",
-
-            "INT64-BYTE-MIN", "INT64-BYTE-NIL", "INT64-BYTE-VAL", "INT64-BYTE-MAX",
-            "INT64-SHORT-MIN", "INT64-SHORT-NIL", "INT64-SHORT-VAL", "INT64-SHORT-MAX",
-            "INT64-INTEGER-MIN", "INT64-INTEGER-NIL", "INT64-INTEGER-VAL", "INT64-INTEGER-MAX",
-            "INT64-LONG-MIN", "INT64-LONG-NIL", "INT64-LONG-VAL", "INT64-LONG-MAX",
-
-            "WORD-BYTE-NIL", "WORD-BYTE-VAL", "WORD-BYTE-MAX",
-            "WORD-SHORT-NIL", "WORD-SHORT-VAL", "WORD-SHORT-MAX",
-            "WORD-INTEGER-NIL", "WORD-INTEGER-VAL",
-            "WORD-LONG-NIL", "WORD-LONG-VAL",
-
-            "DWORD-BYTE-NIL", "DWORD-BYTE-VAL", "DWORD-BYTE-MAX",
-            "DWORD-SHORT-NIL", "DWORD-SHORT-VAL", "DWORD-SHORT-MAX",
-            "DWORD-INTEGER-NIL", "DWORD-INTEGER-VAL", "DWORD-INTEGER-MAX",
-            "DWORD-LONG-NIL", "DWORD-LONG-VAL",
-
-            "INT-BYTE-MIN", "INT-BYTE-NIL", "INT-BYTE-VAL", "INT-BYTE-MAX",
-            "INT-SHORT-MIN", "INT-SHORT-NIL", "INT-SHORT-VAL", "INT-SHORT-MAX",
-            "INT-INTEGER-NIL", "INT-INTEGER-VAL",
-            "INT-LONG-NIL", "INT-LONG-VAL",
-
-            "UINT-BYTE-NIL", "UINT-BYTE-VAL", "UINT-BYTE-MAX",
-            "UINT-SHORT-NIL", "UINT-SHORT-VAL", "UINT-SHORT-MAX",
-            "UINT-INTEGER-NIL", "UINT-INTEGER-VAL",
-            "UINT-LONG-NIL", "UINT-LONG-VAL",
-
-            "DINT-BYTE-MIN", "DINT-BYTE-NIL", "DINT-BYTE-VAL", "DINT-BYTE-MAX",
-            "DINT-SHORT-MIN", "DINT-SHORT-NIL", "DINT-SHORT-VAL", "DINT-SHORT-MAX",
-            "DINT-INTEGER-MIN", "DINT-INTEGER-NIL", "DINT-INTEGER-VAL", "DINT-INTEGER-MAX",
-            "DINT-LONG-NIL", "DINT-LONG-VAL",
-
-            "UDINT-BYTE-NIL", "UDINT-BYTE-VAL", "UDINT-BYTE-MAX",
-            "UDINT-SHORT-NIL", "UDINT-SHORT-VAL", "UDINT-SHORT-MAX",
-            "UDINT-INTEGER-NIL", "UDINT-INTEGER-VAL", "UDINT-INTEGER-MAX",
-            "UDINT-LONG-NIL", "UDINT-LONG-VAL",
-
-            "LINT-BYTE-MIN", "LINT-BYTE-NIL", "LINT-BYTE-VAL", "LINT-BYTE-MAX",
-            "LINT-SHORT-MIN", "LINT-SHORT-NIL", "LINT-SHORT-VAL", "LINT-SHORT-MAX",
-            "LINT-INTEGER-MIN", "LINT-INTEGER-NIL", "LINT-INTEGER-VAL", "LINT-INTEGER-MAX",
-            "LINT-LONG-MIN", "LINT-LONG-NIL", "LINT-LONG-VAL", "LINT-LONG-MAX",
-
-            "ULINT-BYTE-NIL", "ULINT-BYTE-VAL", "ULINT-BYTE-MAX",
-            "ULINT-SHORT-NIL", "ULINT-SHORT-VAL", "ULINT-SHORT-MAX",
-            "ULINT-INTEGER-NIL", "ULINT-INTEGER-VAL", "ULINT-INTEGER-MAX",
-            "ULINT-LONG-NIL", "ULINT-LONG-VAL", "ULINT-LONG-MAX",
-
-            // If it's a unsigned small int field, then any negative number is out of scope.
-            "USINT-BYTE-NIL", "USINT-BYTE-VAL", "USINT-BYTE-MAX",
-            "USINT-SHORT-NIL", "USINT-SHORT-VAL",
-            "USINT-INTEGER-NIL", "USINT-INTEGER-VAL",
-            "USINT-LONG-NIL", "USINT-LONG-VAL"
-        ));
-        encode(name, field, values, expectedSuccess, SUT::encodeByte);
-    }
-
-    @ParameterizedTest
-    @MethodSource("createInputArrays")
-    void encodeTwoByteIntegerTypes(String name, PlcField field, Object[] values) {
-        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
-            "BYTE-BYTE-NIL", "BYTE-BYTE-VAL", "BYTE-BYTE-MAX",
-            "BYTE-SHORT-NIL", "BYTE-SHORT-VAL",
-            "BYTE-INTEGER-NIL", "BYTE-INTEGER-VAL",
-            "BYTE-LONG-NIL", "BYTE-LONG-VAL",
-
-            "WORD-BYTE-NIL", "WORD-BYTE-VAL", "WORD-BYTE-MAX",
-            "WORD-SHORT-NIL", "WORD-SHORT-VAL", "WORD-SHORT-MAX",
-            "WORD-INTEGER-NIL", "WORD-INTEGER-VAL",
-            "WORD-LONG-NIL", "WORD-LONG-VAL",
-
-            "DWORD-BYTE-NIL", "DWORD-BYTE-VAL", "DWORD-BYTE-MAX",
-            "DWORD-SHORT-NIL", "DWORD-SHORT-VAL", "DWORD-SHORT-MAX",
-            "DWORD-INTEGER-NIL", "DWORD-INTEGER-VAL", "DWORD-INTEGER-MAX",
-            "DWORD-LONG-NIL", "DWORD-LONG-VAL",
-
-            "INT-BYTE-MIN", "INT-BYTE-NIL", "INT-BYTE-VAL", "INT-BYTE-MAX",
-            "INT-SHORT-MIN", "INT-SHORT-NIL", "INT-SHORT-VAL", "INT-SHORT-MAX",
-            "INT-INTEGER-NIL", "INT-INTEGER-VAL",
-            "INT-LONG-NIL", "INT-LONG-VAL",
-
-            "SINT-BYTE-MIN", "SINT-BYTE-NIL", "SINT-BYTE-VAL", "SINT-BYTE-MAX",
-            "SINT-SHORT-NIL", "SINT-SHORT-VAL",
-            "SINT-INTEGER-NIL", "SINT-INTEGER-VAL",
-            "SINT-LONG-NIL", "SINT-LONG-VAL",
-
-            "USINT-BYTE-NIL", "USINT-BYTE-VAL", "USINT-BYTE-MAX",
-            "USINT-SHORT-NIL", "USINT-SHORT-VAL",
-            "USINT-INTEGER-NIL", "USINT-INTEGER-VAL",
-            "USINT-LONG-NIL", "USINT-LONG-VAL",
-
-            "DINT-BYTE-MIN", "DINT-BYTE-NIL", "DINT-BYTE-VAL", "DINT-BYTE-MAX",
-            "DINT-SHORT-MIN", "DINT-SHORT-NIL", "DINT-SHORT-VAL", "DINT-SHORT-MAX",
-            "DINT-INTEGER-MIN", "DINT-INTEGER-NIL", "DINT-INTEGER-VAL", "DINT-INTEGER-MAX",
-            "DINT-LONG-NIL", "DINT-LONG-VAL",
-
-            "UDINT-BYTE-NIL", "UDINT-BYTE-VAL", "UDINT-BYTE-MAX",
-            "UDINT-SHORT-NIL", "UDINT-SHORT-VAL", "UDINT-SHORT-MAX",
-            "UDINT-INTEGER-NIL", "UDINT-INTEGER-VAL", "UDINT-INTEGER-MAX",
-            "UDINT-LONG-NIL", "UDINT-LONG-VAL",
-
-            "LINT-BYTE-MIN", "LINT-BYTE-NIL", "LINT-BYTE-VAL", "LINT-BYTE-MAX",
-            "LINT-SHORT-MIN", "LINT-SHORT-NIL", "LINT-SHORT-VAL", "LINT-SHORT-MAX",
-            "LINT-INTEGER-MIN", "LINT-INTEGER-NIL", "LINT-INTEGER-VAL", "LINT-INTEGER-MAX",
-            "LINT-LONG-MIN", "LINT-LONG-NIL", "LINT-LONG-VAL", "LINT-LONG-MAX",
-
-            "ULINT-BYTE-NIL", "ULINT-BYTE-VAL", "ULINT-BYTE-MAX",
-            "ULINT-SHORT-NIL", "ULINT-SHORT-VAL", "ULINT-SHORT-MAX",
-            "ULINT-INTEGER-NIL", "ULINT-INTEGER-VAL", "ULINT-INTEGER-MAX",
-            "ULINT-LONG-NIL", "ULINT-LONG-VAL", "ULINT-LONG-MAX",
-
-            "INT32-BYTE-MIN", "INT32-BYTE-NIL", "INT32-BYTE-VAL", "INT32-BYTE-MAX",
-            "INT32-SHORT-MIN", "INT32-SHORT-NIL", "INT32-SHORT-VAL", "INT32-SHORT-MAX",
-            "INT32-INTEGER-MIN", "INT32-INTEGER-NIL", "INT32-INTEGER-VAL", "INT32-INTEGER-MAX",
-            "INT32-LONG-NIL", "INT32-LONG-VAL",
-
-            "INT64-BYTE-MIN", "INT64-BYTE-NIL", "INT64-BYTE-VAL", "INT64-BYTE-MAX",
-            "INT64-SHORT-MIN", "INT64-SHORT-NIL", "INT64-SHORT-VAL", "INT64-SHORT-MAX",
-            "INT64-INTEGER-MIN", "INT64-INTEGER-NIL", "INT64-INTEGER-VAL", "INT64-INTEGER-MAX",
-            "INT64-LONG-MIN", "INT64-LONG-NIL", "INT64-LONG-VAL", "INT64-LONG-MAX",
-
-            "UINT-BYTE-NIL", "UINT-BYTE-VAL", "UINT-BYTE-MAX",
-            "UINT-SHORT-NIL", "UINT-SHORT-VAL", "UINT-SHORT-MAX",
-            "UINT-INTEGER-NIL", "UINT-INTEGER-VAL",
-            "UINT-LONG-NIL", "UINT-LONG-VAL"
-        ));
-        encode(name, field, values, expectedSuccess, SUT::encodeShort);
-    }
-
-    @ParameterizedTest
-    @MethodSource("createInputArrays")
-    void encodeFourByteIntegerTypes(String name, PlcField field, Object[] values) {
-        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
-            "BYTE-BYTE-NIL", "BYTE-BYTE-VAL", "BYTE-BYTE-MAX",
-            "BYTE-SHORT-NIL", "BYTE-SHORT-VAL",
-            "BYTE-INTEGER-NIL", "BYTE-INTEGER-VAL",
-            "BYTE-LONG-NIL", "BYTE-LONG-VAL",
-
-            "WORD-BYTE-NIL", "WORD-BYTE-VAL", "WORD-BYTE-MAX",
-            "WORD-SHORT-NIL", "WORD-SHORT-VAL", "WORD-SHORT-MAX",
-            "WORD-INTEGER-NIL", "WORD-INTEGER-VAL",
-            "WORD-LONG-NIL", "WORD-LONG-VAL",
-
-            "SINT-BYTE-MIN", "SINT-BYTE-NIL", "SINT-BYTE-VAL", "SINT-BYTE-MAX",
-            "SINT-SHORT-NIL", "SINT-SHORT-VAL",
-            "SINT-INTEGER-NIL", "SINT-INTEGER-VAL",
-            "SINT-LONG-NIL", "SINT-LONG-VAL",
-
-            "USINT-BYTE-NIL", "USINT-BYTE-VAL", "USINT-BYTE-MAX",
-            "USINT-SHORT-NIL", "USINT-SHORT-VAL",
-            "USINT-INTEGER-NIL", "USINT-INTEGER-VAL",
-            "USINT-LONG-NIL", "USINT-LONG-VAL",
-
-            "INT-BYTE-MIN", "INT-BYTE-NIL", "INT-BYTE-VAL", "INT-BYTE-MAX",
-            "INT-SHORT-MIN", "INT-SHORT-VAL", "INT-SHORT-NIL", "INT-SHORT-MAX",
-            "INT-INTEGER-NIL", "INT-INTEGER-VAL",
-            "INT-LONG-NIL", "INT-LONG-VAL",
-
-            "UINT-BYTE-NIL", "UINT-BYTE-VAL", "UINT-BYTE-MAX",
-            "UINT-SHORT-NIL", "UINT-SHORT-VAL", "UINT-SHORT-MAX",
-            "UINT-INTEGER-NIL", "UINT-INTEGER-VAL",
-            "UINT-LONG-NIL", "UINT-LONG-VAL",
-
-            "LINT-BYTE-MIN", "LINT-BYTE-NIL", "LINT-BYTE-VAL", "LINT-BYTE-MAX",
-            "LINT-SHORT-MIN", "LINT-SHORT-NIL", "LINT-SHORT-VAL", "LINT-SHORT-MAX",
-            "LINT-INTEGER-MIN", "LINT-INTEGER-NIL", "LINT-INTEGER-VAL", "LINT-INTEGER-MAX",
-            "LINT-LONG-MIN", "LINT-LONG-NIL", "LINT-LONG-VAL", "LINT-LONG-MAX",
-
-            "ULINT-BYTE-NIL", "ULINT-BYTE-VAL", "ULINT-BYTE-MAX",
-            "ULINT-SHORT-NIL", "ULINT-SHORT-VAL", "ULINT-SHORT-MAX",
-            "ULINT-INTEGER-NIL", "ULINT-INTEGER-VAL", "ULINT-INTEGER-MAX",
-            "ULINT-LONG-NIL", "ULINT-LONG-VAL", "ULINT-LONG-MAX",
-
-            "DWORD-BYTE-NIL", "DWORD-BYTE-VAL", "DWORD-BYTE-MAX",
-            "DWORD-SHORT-NIL", "DWORD-SHORT-VAL", "DWORD-SHORT-MAX",
-            "DWORD-INTEGER-NIL", "DWORD-INTEGER-VAL", "DWORD-INTEGER-MAX",
-            "DWORD-LONG-NIL", "DWORD-LONG-VAL",
-
-            "DINT-BYTE-MIN", "DINT-BYTE-NIL", "DINT-BYTE-VAL", "DINT-BYTE-MAX",
-            "DINT-SHORT-MIN", "DINT-SHORT-NIL", "DINT-SHORT-VAL", "DINT-SHORT-MAX",
-            "DINT-INTEGER-MIN", "DINT-INTEGER-NIL", "DINT-INTEGER-VAL", "DINT-INTEGER-MAX",
-            "DINT-LONG-NIL", "DINT-LONG-VAL",
-
-            "UDINT-BYTE-NIL", "UDINT-BYTE-VAL", "UDINT-BYTE-MAX",
-            "UDINT-SHORT-NIL", "UDINT-SHORT-VAL", "UDINT-SHORT-MAX",
-            "UDINT-INTEGER-NIL", "UDINT-INTEGER-VAL", "UDINT-INTEGER-MAX",
-            "UDINT-LONG-NIL", "UDINT-LONG-VAL",
-
-            "INT32-BYTE-MIN", "INT32-BYTE-NIL", "INT32-BYTE-VAL", "INT32-BYTE-MAX",
-            "INT32-SHORT-MIN", "INT32-SHORT-NIL", "INT32-SHORT-VAL", "INT32-SHORT-MAX",
-            "INT32-INTEGER-MIN", "INT32-INTEGER-NIL", "INT32-INTEGER-VAL", "INT32-INTEGER-MAX",
-            "INT32-LONG-NIL", "INT32-LONG-VAL",
-
-            "INT64-BYTE-MIN", "INT64-BYTE-NIL", "INT64-BYTE-VAL", "INT64-BYTE-MAX",
-            "INT64-SHORT-MIN", "INT64-SHORT-NIL", "INT64-SHORT-VAL", "INT64-SHORT-MAX",
-            "INT64-INTEGER-MIN", "INT64-INTEGER-NIL", "INT64-INTEGER-VAL", "INT64-INTEGER-MAX",
-            "INT64-LONG-MIN", "INT64-LONG-NIL", "INT64-LONG-VAL", "INT64-LONG-MAX"
-        ));
-        encode(name, field, values, expectedSuccess, SUT::encodeInteger);
-    }
-
-    @ParameterizedTest
-    @MethodSource("createInputArrays")
-    void encodeEightByteIntegerTypes(String name, PlcField field, Object[] values) {
-        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
-            "BYTE-BYTE-NIL", "BYTE-BYTE-VAL", "BYTE-BYTE-MAX",
-            "BYTE-SHORT-NIL", "BYTE-SHORT-VAL",
-            "BYTE-INTEGER-NIL", "BYTE-INTEGER-VAL",
-            "BYTE-LONG-NIL", "BYTE-LONG-VAL",
-
-            "WORD-BYTE-NIL", "WORD-BYTE-VAL", "WORD-BYTE-MAX",
-            "WORD-SHORT-NIL", "WORD-SHORT-VAL", "WORD-SHORT-MAX",
-            "WORD-INTEGER-NIL", "WORD-INTEGER-VAL",
-            "WORD-LONG-NIL", "WORD-LONG-VAL",
-
-            "DWORD-BYTE-NIL", "DWORD-BYTE-VAL", "DWORD-BYTE-MAX",
-            "DWORD-SHORT-NIL", "DWORD-SHORT-VAL", "DWORD-SHORT-MAX",
-            "DWORD-INTEGER-NIL", "DWORD-INTEGER-VAL", "DWORD-INTEGER-MAX",
-            "DWORD-LONG-NIL", "DWORD-LONG-VAL",
-
-            "SINT-BYTE-MIN", "SINT-BYTE-NIL", "SINT-BYTE-VAL", "SINT-BYTE-MAX",
-            "SINT-SHORT-NIL", "SINT-SHORT-VAL",
-            "SINT-INTEGER-NIL", "SINT-INTEGER-VAL",
-            "SINT-LONG-NIL", "SINT-LONG-VAL",
-
-            "USINT-BYTE-NIL", "USINT-BYTE-VAL", "USINT-BYTE-MAX",
-            "USINT-SHORT-NIL", "USINT-SHORT-VAL",
-            "USINT-INTEGER-NIL", "USINT-INTEGER-VAL",
-            "USINT-LONG-NIL", "USINT-LONG-VAL",
-
-            "INT-BYTE-MIN", "INT-BYTE-NIL", "INT-BYTE-VAL", "INT-BYTE-MAX",
-            "INT-SHORT-MIN", "INT-SHORT-NIL", "INT-SHORT-VAL", "INT-SHORT-MAX",
-            "INT-INTEGER-NIL", "INT-INTEGER-VAL",
-            "INT-LONG-NIL", "INT-LONG-VAL",
-
-            "LINT-BYTE-MIN", "LINT-BYTE-NIL", "LINT-BYTE-VAL", "LINT-BYTE-MAX",
-            "LINT-SHORT-MIN", "LINT-SHORT-NIL", "LINT-SHORT-VAL", "LINT-SHORT-MAX",
-            "LINT-INTEGER-MIN", "LINT-INTEGER-NIL", "LINT-INTEGER-VAL", "LINT-INTEGER-MAX",
-            "LINT-LONG-MIN", "LINT-LONG-NIL", "LINT-LONG-VAL", "LINT-LONG-MAX",
-
-            "UINT-BYTE-NIL", "UINT-BYTE-VAL", "UINT-BYTE-MAX",
-            "UINT-SHORT-NIL", "UINT-SHORT-VAL", "UINT-SHORT-MAX",
-            "UINT-INTEGER-NIL", "UINT-INTEGER-VAL",
-            "UINT-LONG-NIL", "UINT-LONG-VAL",
-
-            "DINT-BYTE-MIN", "DINT-BYTE-NIL", "DINT-BYTE-VAL", "DINT-BYTE-MAX",
-            "DINT-SHORT-MIN", "DINT-SHORT-NIL", "DINT-SHORT-VAL", "DINT-SHORT-MAX",
-            "DINT-INTEGER-MIN", "DINT-INTEGER-NIL", "DINT-INTEGER-VAL", "DINT-INTEGER-MAX",
-            "DINT-LONG-NIL", "DINT-LONG-VAL",
-
-            "UDINT-BYTE-NIL", "UDINT-BYTE-VAL", "UDINT-BYTE-MAX",
-            "UDINT-SHORT-NIL", "UDINT-SHORT-VAL", "UDINT-SHORT-MAX",
-            "UDINT-INTEGER-NIL", "UDINT-INTEGER-VAL", "UDINT-INTEGER-MAX",
-            "UDINT-LONG-NIL", "UDINT-LONG-VAL",
-
-            "INT32-BYTE-MIN", "INT32-BYTE-NIL", "INT32-BYTE-VAL", "INT32-BYTE-MAX",
-            "INT32-SHORT-MIN", "INT32-SHORT-NIL", "INT32-SHORT-VAL", "INT32-SHORT-MAX",
-            "INT32-INTEGER-MIN", "INT32-INTEGER-NIL", "INT32-INTEGER-VAL", "INT32-INTEGER-MAX",
-            "INT32-LONG-NIL", "INT32-LONG-VAL",
-
-            "INT64-BYTE-MIN", "INT64-BYTE-NIL", "INT64-BYTE-VAL", "INT64-BYTE-MAX",
-            "INT64-SHORT-MIN", "INT64-SHORT-NIL", "INT64-SHORT-VAL", "INT64-SHORT-MAX",
-            "INT64-INTEGER-MIN", "INT64-INTEGER-NIL", "INT64-INTEGER-VAL", "INT64-INTEGER-MAX",
-            "INT64-LONG-MIN", "INT64-LONG-NIL", "INT64-LONG-VAL", "INT64-LONG-MAX",
-
-            "ULINT-BYTE-NIL", "ULINT-BYTE-VAL", "ULINT-BYTE-MAX",
-            "ULINT-SHORT-NIL", "ULINT-SHORT-VAL", "ULINT-SHORT-MAX",
-            "ULINT-INTEGER-NIL", "ULINT-INTEGER-VAL", "ULINT-INTEGER-MAX",
-            "ULINT-LONG-NIL", "ULINT-LONG-VAL", "ULINT-LONG-MAX",
-
-            "LWORD-BYTE-MIN", "LWORD-BYTE-NIL", "LWORD-BYTE-VAL", "LWORD-BYTE-MAX",
-            "LWORD-SHORT-MIN", "LWORD-SHORT-NIL", "LWORD-SHORT-VAL", "LWORD-SHORT-MAX",
-            "LWORD-INTEGER-MIN", "LWORD-INTEGER-NIL", "LWORD-INTEGER-VAL", "LWORD-INTEGER-MAX",
-            "LWORD-LONG-MIN", "LWORD-LONG-NIL", "LWORD-LONG-VAL", "LWORD-LONG-MAX"
-
-            // TODO: Somehow test ULWORD too ...
-        ));
-        encode(name, field, values, expectedSuccess, SUT::encodeLong);
-    }
-
-    @ParameterizedTest
-    @MethodSource("createInputArrays")
-    void encodeFourByteFloatTypes(String name, PlcField field, Object[] values) {
-        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
-            "REAL-FLOAT-MIN",
-            "REAL-FLOAT-NIL",
-            "REAL-FLOAT-VAL",
-            "REAL-FLOAT-MAX",
-            "REAL-DOUBLE-NIL",
-            "REAL-DOUBLE-VAL",
-            "LREAL-FLOAT-MIN",
-            "LREAL-FLOAT-NIL",
-            "LREAL-FLOAT-VAL",
-            "LREAL-FLOAT-MAX",
-            "LREAL-DOUBLE-MIN",
-            "LREAL-DOUBLE-NIL",
-            "LREAL-DOUBLE-VAL",
-            "LREAL-DOUBLE-MAX"
-        ));
-        encode(name, field, values, expectedSuccess, SUT::encodeFloat);
-    }
-
-    @ParameterizedTest
-    @MethodSource("createInputArrays")
-    void encodeEightByteFloatTypes(String name, PlcField field, Object[] values) {
-        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
-            "REAL-FLOAT-MIN", "REAL-FLOAT-NIL", "REAL-FLOAT-VAL", "REAL-FLOAT-MAX",
-            "REAL-DOUBLE-NIL", "REAL-DOUBLE-VAL",
-
-            "LREAL-FLOAT-MIN", "LREAL-FLOAT-NIL", "LREAL-FLOAT-VAL", "LREAL-FLOAT-MAX",
-            "LREAL-DOUBLE-MIN", "LREAL-DOUBLE-NIL", "LREAL-DOUBLE-VAL", "LREAL-DOUBLE-MAX"
-        ));
-        encode(name, field, values, expectedSuccess, SUT::encodeDouble);
-    }
-
-    @ParameterizedTest
-    @MethodSource("createInputArrays")
-    void encodeString(String name, PlcField field, Object[] values) {
-        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
-            "CHAR-BYTE-MIN", "CHAR-BYTE-NIL", "CHAR-BYTE-VAL", "CHAR-BYTE-MAX",
-            "CHAR-SHORT-MIN", "CHAR-SHORT-NIL", "CHAR-SHORT-VAL", "CHAR-SHORT-MAX",
-            "CHAR-INTEGER-MIN", "CHAR-INTEGER-NIL", "CHAR-INTEGER-VAL", "CHAR-INTEGER-MAX",
-            "CHAR-LONG-MIN", "CHAR-LONG-NIL", "CHAR-LONG-VAL", "CHAR-LONG-MAX",
-            "CHAR-STRING-MIN",
-            "WCHAR-BYTE-MIN", "WCHAR-BYTE-NIL", "WCHAR-BYTE-VAL", "WCHAR-BYTE-MAX",
-            "WCHAR-SHORT-MIN", "WCHAR-SHORT-NIL", "WCHAR-SHORT-VAL", "WCHAR-SHORT-MAX",
-            "WCHAR-INTEGER-MIN", "WCHAR-INTEGER-NIL", "WCHAR-INTEGER-VAL", "WCHAR-INTEGER-MAX",
-            "WCHAR-LONG-MIN", "WCHAR-LONG-NIL", "WCHAR-LONG-VAL", "WCHAR-LONG-MAX",
-            "WCHAR-STRING-MIN",
-            "STRING-BYTE-MIN", "STRING-BYTE-NIL", "STRING-BYTE-VAL", "STRING-BYTE-MAX",
-            "STRING-SHORT-MIN", "STRING-SHORT-NIL", "STRING-SHORT-VAL", "STRING-SHORT-MAX",
-            "STRING-INTEGER-MIN", "STRING-INTEGER-NIL", "STRING-INTEGER-VAL", "STRING-INTEGER-MAX",
-            "STRING-LONG-MIN", "STRING-LONG-NIL", "STRING-LONG-VAL", "STRING-LONG-MAX",
-            "STRING-STRING-MIN", "STRING-STRING-VAL", "STRING-STRING-MAX",
-            "WSTRING-BYTE-MIN", "WSTRING-BYTE-NIL", "WSTRING-BYTE-VAL", "WSTRING-BYTE-MAX",
-            "WSTRING-SHORT-MIN", "WSTRING-SHORT-NIL", "WSTRING-SHORT-VAL", "WSTRING-SHORT-MAX",
-            "WSTRING-INTEGER-MIN", "WSTRING-INTEGER-NIL", "WSTRING-INTEGER-VAL", "WSTRING-INTEGER-MAX",
-            "WSTRING-LONG-MIN", "WSTRING-LONG-NIL", "WSTRING-LONG-VAL", "WSTRING-LONG-MAX",
-            "WSTRING-STRING-MIN", "WSTRING-STRING-VAL", "WSTRING-STRING-MAX"
-        ));
-        encode(name, field, values, expectedSuccess, SUT::encodeString);
-    }
-
-    @Disabled("Not implemented yet")
-    @ParameterizedTest
-    @MethodSource("createInputArrays")
-    void encodeTime(String name, PlcField field, Object[] values) {
-        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
-        ));
-        encode(name, field, values, expectedSuccess, SUT::encodeTime);
-    }
-
-    @Disabled("Not implemented yet")
-    @ParameterizedTest
-    @MethodSource("createInputArrays")
-    void encodeDate(String name, PlcField field, Object[] values) {
-        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
-        ));
-        encode(name, field, values, expectedSuccess, SUT::encodeDate);
-    }
-
-    @Disabled("Not implemented yet")
-    @ParameterizedTest
-    @MethodSource("createInputArrays")
-    void encodeDateTime(String name, PlcField field, Object[] values) {
-        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
-        ));
-        encode(name, field, values, expectedSuccess, SUT::encodeDateTime);
-    }
-
-    private static Stream<Arguments> createInputArrays() {
-        // Generate valid fields for each ads type.
-        Map<AdsDataType, PlcField> fields = new HashMap<>();
-        Arrays.stream(AdsDataType.values()).forEach(adsDataType -> {
-            String fieldQuery = "1/2:" + adsDataType.name();
-            fields.put(adsDataType, SUT.createField(fieldQuery));
-        });
-        // Generate output for each combination of ads and Java type.
-        Stream<Arguments> values = null;
-        for (AdsDataType adsDataType : AdsDataType.values()) {
-            PlcField field = fields.get(adsDataType);
-            for (InputTypes javaType : InputTypes.values()) {
-                Object[] testValues = javaType.values;
-
-                BaseDefaultFieldItem fieldItem;
-                try {
-                    fieldItem = javaType.fieldItemType.getDeclaredConstructor(Array.newInstance(testValues[0].getClass(), 0).getClass()).newInstance(new Object[]{testValues});
-                } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
-                    throw new PlcRuntimeException("Error initializing field class " + javaType.fieldItemType.getSimpleName(), e);
-                }
-
-                Stream<Arguments> curValues;
-                // Min, Max
-                if (testValues.length == 2) {
-                    curValues = Stream.of(
-                        Arguments.of(adsDataType.name() + "-" + javaType.name() + "-MIN", field, createOneElementArray(testValues[0])),
-                        Arguments.of(adsDataType.name() + "-" + javaType.name() + "-MAX", field, createOneElementArray(testValues[1])));
-                }
-                // Value, Min, Max
-                else if (testValues.length == 3) {
-                    curValues = Stream.of(
-                        Arguments.of(adsDataType.name() + "-" + javaType.name() + "-MIN", field, createOneElementArray(testValues[1])),
-                        Arguments.of(adsDataType.name() + "-" + javaType.name() + "-VAL", field, createOneElementArray(testValues[0])),
-                        Arguments.of(adsDataType.name() + "-" + javaType.name() + "-MAX", field, createOneElementArray(testValues[2])));
-                }
-                // Zero, Value, Min, Max
-                else if (testValues.length == 4) {
-                    curValues = Stream.of(
-                        Arguments.of(adsDataType.name() + "-" + javaType.name() + "-MIN", field, createOneElementArray(testValues[2])),
-                        Arguments.of(adsDataType.name() + "-" + javaType.name() + "-NIL", field, createOneElementArray(testValues[0])),
-                        Arguments.of(adsDataType.name() + "-" + javaType.name() + "-VAL", field, createOneElementArray(testValues[1])),
-                        Arguments.of(adsDataType.name() + "-" + javaType.name() + "-MAX", field, createOneElementArray(testValues[3])));
-                } else {
-                    throw new RuntimeException("Expecting 2, 3 or 4 valued test-input");
-                }
-                if (values == null) {
-                    values = curValues;
-                } else {
-                    values = Stream.concat(values, curValues);
-                }
-            }
-        }
-        return values;
-    }
-
-    private static Object[] createOneElementArray(Object value) {
-        Class<?> type = value.getClass();
-        Object[] array = (Object[]) Array.newInstance(type, 1);
-        array[0] = value;
-        return array;
-    }
-
-    enum InputTypes {
-        BOOLEAN(DefaultBooleanFieldItem.class, new Boolean[]{false, true}),
-        BYTE(DefaultByteFieldItem.class, new Byte[]{(byte) 0, (byte) 42, Byte.MIN_VALUE, Byte.MAX_VALUE}),
-        SHORT(DefaultShortFieldItem.class, new Short[]{(short) 0, (short) 42, Short.MIN_VALUE, Short.MAX_VALUE}),
-        INTEGER(DefaultIntegerFieldItem.class, new Integer[]{0, 42, Integer.MIN_VALUE, Integer.MAX_VALUE}),
-        LONG(DefaultLongFieldItem.class, new Long[]{(long) 0, (long) 42, Long.MIN_VALUE, Long.MAX_VALUE}),
-        FLOAT(DefaultFloatFieldItem.class, new Float[]{(float) 0.0, (float) 42.23, -Float.MAX_VALUE, Float.MAX_VALUE}),
-        DOUBLE(DefaultDoubleFieldItem.class, new Double[]{0.0, 42.23, -Double.MAX_VALUE, Double.MAX_VALUE}),
-        // Creates an empty sting as min and a 254 char long string as max.
-        STRING(DefaultStringFieldItem.class, new String[]{"Hurz", "", IntStream.range(0, 127).mapToObj(i -> "a").collect(Collectors.joining(""))}),
-        TIME(DefaultLocalTimeFieldItem.class, new LocalTime[]{LocalTime.now(), LocalTime.MIDNIGHT, LocalTime.MIN, LocalTime.MAX}),
-        DATE(DefaultLocalDateFieldItem.class, new LocalDate[]{LocalDate.now(), LocalDate.MIN, LocalDate.MAX}),
-        DATETIME(DefaultLocalDateTimeFieldItem.class, new LocalDateTime[]{LocalDateTime.now(), LocalDateTime.MIN, LocalDateTime.MAX});
-
-        private final Class<? extends BaseDefaultFieldItem> fieldItemType;
-        private final Object[] values;
-
-        InputTypes(Class<? extends BaseDefaultFieldItem> fieldItemType, Object[] values) {
-            this.fieldItemType = fieldItemType;
-            this.values = values;
-        }
-    }
-
-    private void encode(String name, PlcField field, Object[] values, Set<String> expectedSuccess,
-                        BiFunction<PlcField, Object[], BaseDefaultFieldItem> encoder) {
-        boolean success = expectedSuccess.contains(name);
-        try {
-            BaseDefaultFieldItem fieldItem = encoder.apply(field, values);
-            assertNotNull(fieldItem, "A FieldItem instance should have been returned for testcase " + name);
-            if (!success) {
-                fail(testInfo.getDisplayName() + ".\nExpected to fail for testcase " + name);
-            }
-        } catch (Exception e) {
-            if (success) {
-                fail(testInfo.getDisplayName() + ".\nExpected to succeed for testcase " + name + " got exception " + e.getMessage(), e);
-            }
-        }
-    }
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.ads.model;
+
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.messages.items.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.lang.reflect.Array;
+import java.lang.reflect.InvocationTargetException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.*;
+import java.util.function.BiFunction;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
+class AdsPlcFieldHandlerTest {
+
+    private static AdsPlcFieldHandler SUT = new AdsPlcFieldHandler();
+
+    private TestInfo testInfo;
+
+    @BeforeEach
+    void setUp(TestInfo testInfo) {
+        this.testInfo = testInfo;
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {
+        "0/0:BOOL",
+        "0/1:WORD"
+    })
+    void createField(String fieldQuery) {
+        SUT.createField(fieldQuery);
+    }
+
+    @ParameterizedTest
+    @MethodSource("createInputArrays")
+    void encodeOneBitTypes(String name, PlcField field, Object[] values) {
+        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
+            "BOOL-BOOLEAN-MIN", "BOOL-BOOLEAN-MAX",
+            "BOOL-BYTE-MIN", "BOOL-BYTE-NIL", "BOOL-BYTE-VAL", "BOOL-BYTE-MAX",
+            "BOOL-SHORT-MIN", "BOOL-SHORT-NIL", "BOOL-SHORT-VAL", "BOOL-SHORT-MAX",
+            "BOOL-INTEGER-MIN", "BOOL-INTEGER-NIL", "BOOL-INTEGER-VAL", "BOOL-INTEGER-MAX",
+            "BOOL-LONG-MIN", "BOOL-LONG-NIL", "BOOL-LONG-VAL", "BOOL-LONG-MAX",
+
+            "BYTE-BOOLEAN-MIN", "BYTE-BOOLEAN-MAX",
+            "BYTE-BYTE-MIN", "BYTE-BYTE-NIL", "BYTE-BYTE-VAL", "BYTE-BYTE-MAX",
+            "BYTE-SHORT-MIN", "BYTE-SHORT-NIL", "BYTE-SHORT-VAL", "BYTE-SHORT-MAX",
+            "BYTE-INTEGER-MIN", "BYTE-INTEGER-NIL", "BYTE-INTEGER-VAL", "BYTE-INTEGER-MAX",
+            "BYTE-LONG-MIN", "BYTE-LONG-NIL", "BYTE-LONG-VAL", "BYTE-LONG-MAX",
+
+            "WORD-BOOLEAN-MIN", "WORD-BOOLEAN-MAX",
+            "WORD-BYTE-MIN", "WORD-BYTE-NIL", "WORD-BYTE-VAL", "WORD-BYTE-MAX",
+            "WORD-SHORT-MIN", "WORD-SHORT-NIL", "WORD-SHORT-VAL", "WORD-SHORT-MAX",
+            "WORD-INTEGER-MIN", "WORD-INTEGER-NIL", "WORD-INTEGER-VAL", "WORD-INTEGER-MAX",
+            "WORD-LONG-MIN", "WORD-LONG-NIL", "WORD-LONG-VAL", "WORD-LONG-MAX",
+
+            "DWORD-BOOLEAN-MIN", "DWORD-BOOLEAN-MAX",
+            "DWORD-BYTE-MIN", "DWORD-BYTE-NIL", "DWORD-BYTE-VAL", "DWORD-BYTE-MAX",
+            "DWORD-SHORT-MIN", "DWORD-SHORT-NIL", "DWORD-SHORT-VAL", "DWORD-SHORT-MAX",
+            "DWORD-INTEGER-MIN", "DWORD-INTEGER-NIL", "DWORD-INTEGER-VAL", "DWORD-INTEGER-MAX",
+            "DWORD-LONG-MIN", "DWORD-LONG-NIL", "DWORD-LONG-VAL", "DWORD-LONG-MAX",
+
+            "LWORD-BOOLEAN-MIN", "LWORD-BOOLEAN-MAX",
+            "LWORD-BYTE-MIN", "LWORD-BYTE-NIL", "LWORD-BYTE-VAL", "LWORD-BYTE-MAX",
+            "LWORD-SHORT-MIN", "LWORD-SHORT-NIL", "LWORD-SHORT-VAL", "LWORD-SHORT-MAX",
+            "LWORD-INTEGER-MIN", "LWORD-INTEGER-NIL", "LWORD-INTEGER-VAL", "LWORD-INTEGER-MAX",
+            "LWORD-LONG-MIN", "LWORD-LONG-NIL", "LWORD-LONG-VAL", "LWORD-LONG-MAX"
+        ));
+        encode(name, field, values, expectedSuccess, SUT::encodeBoolean);
+    }
+
+    @ParameterizedTest
+    @MethodSource("createInputArrays")
+    void encodeOneByteIntegerTypes(String name, PlcField field, Object[] values) {
+        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
+            "BYTE-BYTE-NIL", "BYTE-BYTE-VAL", "BYTE-BYTE-MAX",
+            "BYTE-SHORT-NIL", "BYTE-SHORT-VAL",
+            "BYTE-INTEGER-NIL", "BYTE-INTEGER-VAL",
+            "BYTE-LONG-NIL", "BYTE-LONG-VAL",
+
+            "SINT-BYTE-MIN", "SINT-BYTE-NIL", "SINT-BYTE-VAL", "SINT-BYTE-MAX",
+            "SINT-SHORT-NIL", "SINT-SHORT-VAL",
+            "SINT-INTEGER-NIL", "SINT-INTEGER-VAL",
+            "SINT-LONG-NIL", "SINT-LONG-VAL",
+
+            "INT32-BYTE-MIN", "INT32-BYTE-NIL", "INT32-BYTE-VAL", "INT32-BYTE-MAX",
+            "INT32-SHORT-MIN", "INT32-SHORT-NIL", "INT32-SHORT-VAL", "INT32-SHORT-MAX",
+            "INT32-INTEGER-MIN", "INT32-INTEGER-NIL", "INT32-INTEGER-VAL", "INT32-INTEGER-MAX",
+            "INT32-LONG-NIL", "INT32-LONG-VAL",
+
+            "INT64-BYTE-MIN", "INT64-BYTE-NIL", "INT64-BYTE-VAL", "INT64-BYTE-MAX",
+            "INT64-SHORT-MIN", "INT64-SHORT-NIL", "INT64-SHORT-VAL", "INT64-SHORT-MAX",
+            "INT64-INTEGER-MIN", "INT64-INTEGER-NIL", "INT64-INTEGER-VAL", "INT64-INTEGER-MAX",
+            "INT64-LONG-MIN", "INT64-LONG-NIL", "INT64-LONG-VAL", "INT64-LONG-MAX",
+
+            "WORD-BYTE-NIL", "WORD-BYTE-VAL", "WORD-BYTE-MAX",
+            "WORD-SHORT-NIL", "WORD-SHORT-VAL", "WORD-SHORT-MAX",
+            "WORD-INTEGER-NIL", "WORD-INTEGER-VAL",
+            "WORD-LONG-NIL", "WORD-LONG-VAL",
+
+            "DWORD-BYTE-NIL", "DWORD-BYTE-VAL", "DWORD-BYTE-MAX",
+            "DWORD-SHORT-NIL", "DWORD-SHORT-VAL", "DWORD-SHORT-MAX",
+            "DWORD-INTEGER-NIL", "DWORD-INTEGER-VAL", "DWORD-INTEGER-MAX",
+            "DWORD-LONG-NIL", "DWORD-LONG-VAL",
+
+            "INT-BYTE-MIN", "INT-BYTE-NIL", "INT-BYTE-VAL", "INT-BYTE-MAX",
+            "INT-SHORT-MIN", "INT-SHORT-NIL", "INT-SHORT-VAL", "INT-SHORT-MAX",
+            "INT-INTEGER-NIL", "INT-INTEGER-VAL",
+            "INT-LONG-NIL", "INT-LONG-VAL",
+
+            "UINT-BYTE-NIL", "UINT-BYTE-VAL", "UINT-BYTE-MAX",
+            "UINT-SHORT-NIL", "UINT-SHORT-VAL", "UINT-SHORT-MAX",
+            "UINT-INTEGER-NIL", "UINT-INTEGER-VAL",
+            "UINT-LONG-NIL", "UINT-LONG-VAL",
+
+            "DINT-BYTE-MIN", "DINT-BYTE-NIL", "DINT-BYTE-VAL", "DINT-BYTE-MAX",
+            "DINT-SHORT-MIN", "DINT-SHORT-NIL", "DINT-SHORT-VAL", "DINT-SHORT-MAX",
+            "DINT-INTEGER-MIN", "DINT-INTEGER-NIL", "DINT-INTEGER-VAL", "DINT-INTEGER-MAX",
+            "DINT-LONG-NIL", "DINT-LONG-VAL",
+
+            "UDINT-BYTE-NIL", "UDINT-BYTE-VAL", "UDINT-BYTE-MAX",
+            "UDINT-SHORT-NIL", "UDINT-SHORT-VAL", "UDINT-SHORT-MAX",
+            "UDINT-INTEGER-NIL", "UDINT-INTEGER-VAL", "UDINT-INTEGER-MAX",
+            "UDINT-LONG-NIL", "UDINT-LONG-VAL",
+
+            "LINT-BYTE-MIN", "LINT-BYTE-NIL", "LINT-BYTE-VAL", "LINT-BYTE-MAX",
+            "LINT-SHORT-MIN", "LINT-SHORT-NIL", "LINT-SHORT-VAL", "LINT-SHORT-MAX",
+            "LINT-INTEGER-MIN", "LINT-INTEGER-NIL", "LINT-INTEGER-VAL", "LINT-INTEGER-MAX",
+            "LINT-LONG-MIN", "LINT-LONG-NIL", "LINT-LONG-VAL", "LINT-LONG-MAX",
+
+            "ULINT-BYTE-NIL", "ULINT-BYTE-VAL", "ULINT-BYTE-MAX",
+            "ULINT-SHORT-NIL", "ULINT-SHORT-VAL", "ULINT-SHORT-MAX",
+            "ULINT-INTEGER-NIL", "ULINT-INTEGER-VAL", "ULINT-INTEGER-MAX",
+            "ULINT-LONG-NIL", "ULINT-LONG-VAL", "ULINT-LONG-MAX",
+
+            // If it's a unsigned small int field, then any negative number is out of scope.
+            "USINT-BYTE-NIL", "USINT-BYTE-VAL", "USINT-BYTE-MAX",
+            "USINT-SHORT-NIL", "USINT-SHORT-VAL",
+            "USINT-INTEGER-NIL", "USINT-INTEGER-VAL",
+            "USINT-LONG-NIL", "USINT-LONG-VAL"
+        ));
+        encode(name, field, values, expectedSuccess, SUT::encodeByte);
+    }
+
+    @ParameterizedTest
+    @MethodSource("createInputArrays")
+    void encodeTwoByteIntegerTypes(String name, PlcField field, Object[] values) {
+        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
+            "BYTE-BYTE-NIL", "BYTE-BYTE-VAL", "BYTE-BYTE-MAX",
+            "BYTE-SHORT-NIL", "BYTE-SHORT-VAL",
+            "BYTE-INTEGER-NIL", "BYTE-INTEGER-VAL",
+            "BYTE-LONG-NIL", "BYTE-LONG-VAL",
+
+            "WORD-BYTE-NIL", "WORD-BYTE-VAL", "WORD-BYTE-MAX",
+            "WORD-SHORT-NIL", "WORD-SHORT-VAL", "WORD-SHORT-MAX",
+            "WORD-INTEGER-NIL", "WORD-INTEGER-VAL",
+            "WORD-LONG-NIL", "WORD-LONG-VAL",
+
+            "DWORD-BYTE-NIL", "DWORD-BYTE-VAL", "DWORD-BYTE-MAX",
+            "DWORD-SHORT-NIL", "DWORD-SHORT-VAL", "DWORD-SHORT-MAX",
+            "DWORD-INTEGER-NIL", "DWORD-INTEGER-VAL", "DWORD-INTEGER-MAX",
+            "DWORD-LONG-NIL", "DWORD-LONG-VAL",
+
+            "INT-BYTE-MIN", "INT-BYTE-NIL", "INT-BYTE-VAL", "INT-BYTE-MAX",
+            "INT-SHORT-MIN", "INT-SHORT-NIL", "INT-SHORT-VAL", "INT-SHORT-MAX",
+            "INT-INTEGER-NIL", "INT-INTEGER-VAL",
+            "INT-LONG-NIL", "INT-LONG-VAL",
+
+            "SINT-BYTE-MIN", "SINT-BYTE-NIL", "SINT-BYTE-VAL", "SINT-BYTE-MAX",
+            "SINT-SHORT-NIL", "SINT-SHORT-VAL",
+            "SINT-INTEGER-NIL", "SINT-INTEGER-VAL",
+            "SINT-LONG-NIL", "SINT-LONG-VAL",
+
+            "USINT-BYTE-NIL", "USINT-BYTE-VAL", "USINT-BYTE-MAX",
+            "USINT-SHORT-NIL", "USINT-SHORT-VAL",
+            "USINT-INTEGER-NIL", "USINT-INTEGER-VAL",
+            "USINT-LONG-NIL", "USINT-LONG-VAL",
+
+            "DINT-BYTE-MIN", "DINT-BYTE-NIL", "DINT-BYTE-VAL", "DINT-BYTE-MAX",
+            "DINT-SHORT-MIN", "DINT-SHORT-NIL", "DINT-SHORT-VAL", "DINT-SHORT-MAX",
+            "DINT-INTEGER-MIN", "DINT-INTEGER-NIL", "DINT-INTEGER-VAL", "DINT-INTEGER-MAX",
+            "DINT-LONG-NIL", "DINT-LONG-VAL",
+
+            "UDINT-BYTE-NIL", "UDINT-BYTE-VAL", "UDINT-BYTE-MAX",
+            "UDINT-SHORT-NIL", "UDINT-SHORT-VAL", "UDINT-SHORT-MAX",
+            "UDINT-INTEGER-NIL", "UDINT-INTEGER-VAL", "UDINT-INTEGER-MAX",
+            "UDINT-LONG-NIL", "UDINT-LONG-VAL",
+
+            "LINT-BYTE-MIN", "LINT-BYTE-NIL", "LINT-BYTE-VAL", "LINT-BYTE-MAX",
+            "LINT-SHORT-MIN", "LINT-SHORT-NIL", "LINT-SHORT-VAL", "LINT-SHORT-MAX",
+            "LINT-INTEGER-MIN", "LINT-INTEGER-NIL", "LINT-INTEGER-VAL", "LINT-INTEGER-MAX",
+            "LINT-LONG-MIN", "LINT-LONG-NIL", "LINT-LONG-VAL", "LINT-LONG-MAX",
+
+            "ULINT-BYTE-NIL", "ULINT-BYTE-VAL", "ULINT-BYTE-MAX",
+            "ULINT-SHORT-NIL", "ULINT-SHORT-VAL", "ULINT-SHORT-MAX",
+            "ULINT-INTEGER-NIL", "ULINT-INTEGER-VAL", "ULINT-INTEGER-MAX",
+            "ULINT-LONG-NIL", "ULINT-LONG-VAL", "ULINT-LONG-MAX",
+
+            "INT32-BYTE-MIN", "INT32-BYTE-NIL", "INT32-BYTE-VAL", "INT32-BYTE-MAX",
+            "INT32-SHORT-MIN", "INT32-SHORT-NIL", "INT32-SHORT-VAL", "INT32-SHORT-MAX",
+            "INT32-INTEGER-MIN", "INT32-INTEGER-NIL", "INT32-INTEGER-VAL", "INT32-INTEGER-MAX",
+            "INT32-LONG-NIL", "INT32-LONG-VAL",
+
+            "INT64-BYTE-MIN", "INT64-BYTE-NIL", "INT64-BYTE-VAL", "INT64-BYTE-MAX",
+            "INT64-SHORT-MIN", "INT64-SHORT-NIL", "INT64-SHORT-VAL", "INT64-SHORT-MAX",
+            "INT64-INTEGER-MIN", "INT64-INTEGER-NIL", "INT64-INTEGER-VAL", "INT64-INTEGER-MAX",
+            "INT64-LONG-MIN", "INT64-LONG-NIL", "INT64-LONG-VAL", "INT64-LONG-MAX",
+
+            "UINT-BYTE-NIL", "UINT-BYTE-VAL", "UINT-BYTE-MAX",
+            "UINT-SHORT-NIL", "UINT-SHORT-VAL", "UINT-SHORT-MAX",
+            "UINT-INTEGER-NIL", "UINT-INTEGER-VAL",
+            "UINT-LONG-NIL", "UINT-LONG-VAL"
+        ));
+        encode(name, field, values, expectedSuccess, SUT::encodeShort);
+    }
+
+    @ParameterizedTest
+    @MethodSource("createInputArrays")
+    void encodeFourByteIntegerTypes(String name, PlcField field, Object[] values) {
+        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
+            "BYTE-BYTE-NIL", "BYTE-BYTE-VAL", "BYTE-BYTE-MAX",
+            "BYTE-SHORT-NIL", "BYTE-SHORT-VAL",
+            "BYTE-INTEGER-NIL", "BYTE-INTEGER-VAL",
+            "BYTE-LONG-NIL", "BYTE-LONG-VAL",
+
+            "WORD-BYTE-NIL", "WORD-BYTE-VAL", "WORD-BYTE-MAX",
+            "WORD-SHORT-NIL", "WORD-SHORT-VAL", "WORD-SHORT-MAX",
+            "WORD-INTEGER-NIL", "WORD-INTEGER-VAL",
+            "WORD-LONG-NIL", "WORD-LONG-VAL",
+
+            "SINT-BYTE-MIN", "SINT-BYTE-NIL", "SINT-BYTE-VAL", "SINT-BYTE-MAX",
+            "SINT-SHORT-NIL", "SINT-SHORT-VAL",
+            "SINT-INTEGER-NIL", "SINT-INTEGER-VAL",
+            "SINT-LONG-NIL", "SINT-LONG-VAL",
+
+            "USINT-BYTE-NIL", "USINT-BYTE-VAL", "USINT-BYTE-MAX",
+            "USINT-SHORT-NIL", "USINT-SHORT-VAL",
+            "USINT-INTEGER-NIL", "USINT-INTEGER-VAL",
+            "USINT-LONG-NIL", "USINT-LONG-VAL",
+
+            "INT-BYTE-MIN", "INT-BYTE-NIL", "INT-BYTE-VAL", "INT-BYTE-MAX",
+            "INT-SHORT-MIN", "INT-SHORT-VAL", "INT-SHORT-NIL", "INT-SHORT-MAX",
+            "INT-INTEGER-NIL", "INT-INTEGER-VAL",
+            "INT-LONG-NIL", "INT-LONG-VAL",
+
+            "UINT-BYTE-NIL", "UINT-BYTE-VAL", "UINT-BYTE-MAX",
+            "UINT-SHORT-NIL", "UINT-SHORT-VAL", "UINT-SHORT-MAX",
+            "UINT-INTEGER-NIL", "UINT-INTEGER-VAL",
+            "UINT-LONG-NIL", "UINT-LONG-VAL",
+
+            "LINT-BYTE-MIN", "LINT-BYTE-NIL", "LINT-BYTE-VAL", "LINT-BYTE-MAX",
+            "LINT-SHORT-MIN", "LINT-SHORT-NIL", "LINT-SHORT-VAL", "LINT-SHORT-MAX",
+            "LINT-INTEGER-MIN", "LINT-INTEGER-NIL", "LINT-INTEGER-VAL", "LINT-INTEGER-MAX",
+            "LINT-LONG-MIN", "LINT-LONG-NIL", "LINT-LONG-VAL", "LINT-LONG-MAX",
+
+            "ULINT-BYTE-NIL", "ULINT-BYTE-VAL", "ULINT-BYTE-MAX",
+            "ULINT-SHORT-NIL", "ULINT-SHORT-VAL", "ULINT-SHORT-MAX",
+            "ULINT-INTEGER-NIL", "ULINT-INTEGER-VAL", "ULINT-INTEGER-MAX",
+            "ULINT-LONG-NIL", "ULINT-LONG-VAL", "ULINT-LONG-MAX",
+
+            "DWORD-BYTE-NIL", "DWORD-BYTE-VAL", "DWORD-BYTE-MAX",
+            "DWORD-SHORT-NIL", "DWORD-SHORT-VAL", "DWORD-SHORT-MAX",
+            "DWORD-INTEGER-NIL", "DWORD-INTEGER-VAL", "DWORD-INTEGER-MAX",
+            "DWORD-LONG-NIL", "DWORD-LONG-VAL",
+
+            "DINT-BYTE-MIN", "DINT-BYTE-NIL", "DINT-BYTE-VAL", "DINT-BYTE-MAX",
+            "DINT-SHORT-MIN", "DINT-SHORT-NIL", "DINT-SHORT-VAL", "DINT-SHORT-MAX",
+            "DINT-INTEGER-MIN", "DINT-INTEGER-NIL", "DINT-INTEGER-VAL", "DINT-INTEGER-MAX",
+            "DINT-LONG-NIL", "DINT-LONG-VAL",
+
+            "UDINT-BYTE-NIL", "UDINT-BYTE-VAL", "UDINT-BYTE-MAX",
+            "UDINT-SHORT-NIL", "UDINT-SHORT-VAL", "UDINT-SHORT-MAX",
+            "UDINT-INTEGER-NIL", "UDINT-INTEGER-VAL", "UDINT-INTEGER-MAX",
+            "UDINT-LONG-NIL", "UDINT-LONG-VAL",
+
+            "INT32-BYTE-MIN", "INT32-BYTE-NIL", "INT32-BYTE-VAL", "INT32-BYTE-MAX",
+            "INT32-SHORT-MIN", "INT32-SHORT-NIL", "INT32-SHORT-VAL", "INT32-SHORT-MAX",
+            "INT32-INTEGER-MIN", "INT32-INTEGER-NIL", "INT32-INTEGER-VAL", "INT32-INTEGER-MAX",
+            "INT32-LONG-NIL", "INT32-LONG-VAL",
+
+            "INT64-BYTE-MIN", "INT64-BYTE-NIL", "INT64-BYTE-VAL", "INT64-BYTE-MAX",
+            "INT64-SHORT-MIN", "INT64-SHORT-NIL", "INT64-SHORT-VAL", "INT64-SHORT-MAX",
+            "INT64-INTEGER-MIN", "INT64-INTEGER-NIL", "INT64-INTEGER-VAL", "INT64-INTEGER-MAX",
+            "INT64-LONG-MIN", "INT64-LONG-NIL", "INT64-LONG-VAL", "INT64-LONG-MAX"
+        ));
+        encode(name, field, values, expectedSuccess, SUT::encodeInteger);
+    }
+
+    @ParameterizedTest
+    @MethodSource("createInputArrays")
+    void encodeEightByteIntegerTypes(String name, PlcField field, Object[] values) {
+        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
+            "BYTE-BYTE-NIL", "BYTE-BYTE-VAL", "BYTE-BYTE-MAX",
+            "BYTE-SHORT-NIL", "BYTE-SHORT-VAL",
+            "BYTE-INTEGER-NIL", "BYTE-INTEGER-VAL",
+            "BYTE-LONG-NIL", "BYTE-LONG-VAL",
+
+            "WORD-BYTE-NIL", "WORD-BYTE-VAL", "WORD-BYTE-MAX",
+            "WORD-SHORT-NIL", "WORD-SHORT-VAL", "WORD-SHORT-MAX",
+            "WORD-INTEGER-NIL", "WORD-INTEGER-VAL",
+            "WORD-LONG-NIL", "WORD-LONG-VAL",
+
+            "DWORD-BYTE-NIL", "DWORD-BYTE-VAL", "DWORD-BYTE-MAX",
+            "DWORD-SHORT-NIL", "DWORD-SHORT-VAL", "DWORD-SHORT-MAX",
+            "DWORD-INTEGER-NIL", "DWORD-INTEGER-VAL", "DWORD-INTEGER-MAX",
+            "DWORD-LONG-NIL", "DWORD-LONG-VAL",
+
+            "SINT-BYTE-MIN", "SINT-BYTE-NIL", "SINT-BYTE-VAL", "SINT-BYTE-MAX",
+            "SINT-SHORT-NIL", "SINT-SHORT-VAL",
+            "SINT-INTEGER-NIL", "SINT-INTEGER-VAL",
+            "SINT-LONG-NIL", "SINT-LONG-VAL",
+
+            "USINT-BYTE-NIL", "USINT-BYTE-VAL", "USINT-BYTE-MAX",
+            "USINT-SHORT-NIL", "USINT-SHORT-VAL",
+            "USINT-INTEGER-NIL", "USINT-INTEGER-VAL",
+            "USINT-LONG-NIL", "USINT-LONG-VAL",
+
+            "INT-BYTE-MIN", "INT-BYTE-NIL", "INT-BYTE-VAL", "INT-BYTE-MAX",
+            "INT-SHORT-MIN", "INT-SHORT-NIL", "INT-SHORT-VAL", "INT-SHORT-MAX",
+            "INT-INTEGER-NIL", "INT-INTEGER-VAL",
+            "INT-LONG-NIL", "INT-LONG-VAL",
+
+            "LINT-BYTE-MIN", "LINT-BYTE-NIL", "LINT-BYTE-VAL", "LINT-BYTE-MAX",
+            "LINT-SHORT-MIN", "LINT-SHORT-NIL", "LINT-SHORT-VAL", "LINT-SHORT-MAX",
+            "LINT-INTEGER-MIN", "LINT-INTEGER-NIL", "LINT-INTEGER-VAL", "LINT-INTEGER-MAX",
+            "LINT-LONG-MIN", "LINT-LONG-NIL", "LINT-LONG-VAL", "LINT-LONG-MAX",
+
+            "UINT-BYTE-NIL", "UINT-BYTE-VAL", "UINT-BYTE-MAX",
+            "UINT-SHORT-NIL", "UINT-SHORT-VAL", "UINT-SHORT-MAX",
+            "UINT-INTEGER-NIL", "UINT-INTEGER-VAL",
+            "UINT-LONG-NIL", "UINT-LONG-VAL",
+
+            "DINT-BYTE-MIN", "DINT-BYTE-NIL", "DINT-BYTE-VAL", "DINT-BYTE-MAX",
+            "DINT-SHORT-MIN", "DINT-SHORT-NIL", "DINT-SHORT-VAL", "DINT-SHORT-MAX",
+            "DINT-INTEGER-MIN", "DINT-INTEGER-NIL", "DINT-INTEGER-VAL", "DINT-INTEGER-MAX",
+            "DINT-LONG-NIL", "DINT-LONG-VAL",
+
+            "UDINT-BYTE-NIL", "UDINT-BYTE-VAL", "UDINT-BYTE-MAX",
+            "UDINT-SHORT-NIL", "UDINT-SHORT-VAL", "UDINT-SHORT-MAX",
+            "UDINT-INTEGER-NIL", "UDINT-INTEGER-VAL", "UDINT-INTEGER-MAX",
+            "UDINT-LONG-NIL", "UDINT-LONG-VAL",
+
+            "INT32-BYTE-MIN", "INT32-BYTE-NIL", "INT32-BYTE-VAL", "INT32-BYTE-MAX",
+            "INT32-SHORT-MIN", "INT32-SHORT-NIL", "INT32-SHORT-VAL", "INT32-SHORT-MAX",
+            "INT32-INTEGER-MIN", "INT32-INTEGER-NIL", "INT32-INTEGER-VAL", "INT32-INTEGER-MAX",
+            "INT32-LONG-NIL", "INT32-LONG-VAL",
+
+            "INT64-BYTE-MIN", "INT64-BYTE-NIL", "INT64-BYTE-VAL", "INT64-BYTE-MAX",
+            "INT64-SHORT-MIN", "INT64-SHORT-NIL", "INT64-SHORT-VAL", "INT64-SHORT-MAX",
+            "INT64-INTEGER-MIN", "INT64-INTEGER-NIL", "INT64-INTEGER-VAL", "INT64-INTEGER-MAX",
+            "INT64-LONG-MIN", "INT64-LONG-NIL", "INT64-LONG-VAL", "INT64-LONG-MAX",
+
+            "ULINT-BYTE-NIL", "ULINT-BYTE-VAL", "ULINT-BYTE-MAX",
+            "ULINT-SHORT-NIL", "ULINT-SHORT-VAL", "ULINT-SHORT-MAX",
+            "ULINT-INTEGER-NIL", "ULINT-INTEGER-VAL", "ULINT-INTEGER-MAX",
+            "ULINT-LONG-NIL", "ULINT-LONG-VAL", "ULINT-LONG-MAX",
+
+            "LWORD-BYTE-MIN", "LWORD-BYTE-NIL", "LWORD-BYTE-VAL", "LWORD-BYTE-MAX",
+            "LWORD-SHORT-MIN", "LWORD-SHORT-NIL", "LWORD-SHORT-VAL", "LWORD-SHORT-MAX",
+            "LWORD-INTEGER-MIN", "LWORD-INTEGER-NIL", "LWORD-INTEGER-VAL", "LWORD-INTEGER-MAX",
+            "LWORD-LONG-MIN", "LWORD-LONG-NIL", "LWORD-LONG-VAL", "LWORD-LONG-MAX"
+
+            // TODO: Somehow test ULWORD too ...
+        ));
+        encode(name, field, values, expectedSuccess, SUT::encodeLong);
+    }
+
+    @ParameterizedTest
+    @MethodSource("createInputArrays")
+    void encodeFourByteFloatTypes(String name, PlcField field, Object[] values) {
+        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
+            "REAL-FLOAT-MIN",
+            "REAL-FLOAT-NIL",
+            "REAL-FLOAT-VAL",
+            "REAL-FLOAT-MAX",
+            "REAL-DOUBLE-NIL",
+            "REAL-DOUBLE-VAL",
+            "LREAL-FLOAT-MIN",
+            "LREAL-FLOAT-NIL",
+            "LREAL-FLOAT-VAL",
+            "LREAL-FLOAT-MAX",
+            "LREAL-DOUBLE-MIN",
+            "LREAL-DOUBLE-NIL",
+            "LREAL-DOUBLE-VAL",
+            "LREAL-DOUBLE-MAX"
+        ));
+        encode(name, field, values, expectedSuccess, SUT::encodeFloat);
+    }
+
+    @ParameterizedTest
+    @MethodSource("createInputArrays")
+    void encodeEightByteFloatTypes(String name, PlcField field, Object[] values) {
+        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
+            "REAL-FLOAT-MIN", "REAL-FLOAT-NIL", "REAL-FLOAT-VAL", "REAL-FLOAT-MAX",
+            "REAL-DOUBLE-NIL", "REAL-DOUBLE-VAL",
+
+            "LREAL-FLOAT-MIN", "LREAL-FLOAT-NIL", "LREAL-FLOAT-VAL", "LREAL-FLOAT-MAX",
+            "LREAL-DOUBLE-MIN", "LREAL-DOUBLE-NIL", "LREAL-DOUBLE-VAL", "LREAL-DOUBLE-MAX"
+        ));
+        encode(name, field, values, expectedSuccess, SUT::encodeDouble);
+    }
+
+    @ParameterizedTest
+    @MethodSource("createInputArrays")
+    void encodeString(String name, PlcField field, Object[] values) {
+        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
+            "CHAR-BYTE-MIN", "CHAR-BYTE-NIL", "CHAR-BYTE-VAL", "CHAR-BYTE-MAX",
+            "CHAR-SHORT-MIN", "CHAR-SHORT-NIL", "CHAR-SHORT-VAL", "CHAR-SHORT-MAX",
+            "CHAR-INTEGER-MIN", "CHAR-INTEGER-NIL", "CHAR-INTEGER-VAL", "CHAR-INTEGER-MAX",
+            "CHAR-LONG-MIN", "CHAR-LONG-NIL", "CHAR-LONG-VAL", "CHAR-LONG-MAX",
+            "CHAR-STRING-MIN",
+            "WCHAR-BYTE-MIN", "WCHAR-BYTE-NIL", "WCHAR-BYTE-VAL", "WCHAR-BYTE-MAX",
+            "WCHAR-SHORT-MIN", "WCHAR-SHORT-NIL", "WCHAR-SHORT-VAL", "WCHAR-SHORT-MAX",
+            "WCHAR-INTEGER-MIN", "WCHAR-INTEGER-NIL", "WCHAR-INTEGER-VAL", "WCHAR-INTEGER-MAX",
+            "WCHAR-LONG-MIN", "WCHAR-LONG-NIL", "WCHAR-LONG-VAL", "WCHAR-LONG-MAX",
+            "WCHAR-STRING-MIN",
+            "STRING-BYTE-MIN", "STRING-BYTE-NIL", "STRING-BYTE-VAL", "STRING-BYTE-MAX",
+            "STRING-SHORT-MIN", "STRING-SHORT-NIL", "STRING-SHORT-VAL", "STRING-SHORT-MAX",
+            "STRING-INTEGER-MIN", "STRING-INTEGER-NIL", "STRING-INTEGER-VAL", "STRING-INTEGER-MAX",
+            "STRING-LONG-MIN", "STRING-LONG-NIL", "STRING-LONG-VAL", "STRING-LONG-MAX",
+            "STRING-STRING-MIN", "STRING-STRING-VAL", "STRING-STRING-MAX",
+            "WSTRING-BYTE-MIN", "WSTRING-BYTE-NIL", "WSTRING-BYTE-VAL", "WSTRING-BYTE-MAX",
+            "WSTRING-SHORT-MIN", "WSTRING-SHORT-NIL", "WSTRING-SHORT-VAL", "WSTRING-SHORT-MAX",
+            "WSTRING-INTEGER-MIN", "WSTRING-INTEGER-NIL", "WSTRING-INTEGER-VAL", "WSTRING-INTEGER-MAX",
+            "WSTRING-LONG-MIN", "WSTRING-LONG-NIL", "WSTRING-LONG-VAL", "WSTRING-LONG-MAX",
+            "WSTRING-STRING-MIN", "WSTRING-STRING-VAL", "WSTRING-STRING-MAX"
+        ));
+        encode(name, field, values, expectedSuccess, SUT::encodeString);
+    }
+
+    @Disabled("Not implemented yet")
+    @ParameterizedTest
+    @MethodSource("createInputArrays")
+    void encodeTime(String name, PlcField field, Object[] values) {
+        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
+        ));
+        encode(name, field, values, expectedSuccess, SUT::encodeTime);
+    }
+
+    @Disabled("Not implemented yet")
+    @ParameterizedTest
+    @MethodSource("createInputArrays")
+    void encodeDate(String name, PlcField field, Object[] values) {
+        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
+        ));
+        encode(name, field, values, expectedSuccess, SUT::encodeDate);
+    }
+
+    @Disabled("Not implemented yet")
+    @ParameterizedTest
+    @MethodSource("createInputArrays")
+    void encodeDateTime(String name, PlcField field, Object[] values) {
+        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
+        ));
+        encode(name, field, values, expectedSuccess, SUT::encodeDateTime);
+    }
+
+    private static Stream<Arguments> createInputArrays() {
+        // Generate valid fields for each ads type.
+        Map<AdsDataType, PlcField> fields = new HashMap<>();
+        Arrays.stream(AdsDataType.values()).forEach(adsDataType -> {
+            String fieldQuery = "1/2:" + adsDataType.name();
+            fields.put(adsDataType, SUT.createField(fieldQuery));
+        });
+        // Generate output for each combination of ads and Java type.
+        Stream<Arguments> values = null;
+        for (AdsDataType adsDataType : AdsDataType.values()) {
+            PlcField field = fields.get(adsDataType);
+            for (InputTypes javaType : InputTypes.values()) {
+                Object[] testValues = javaType.values;
+
+                BaseDefaultFieldItem fieldItem;
+                try {
+                    fieldItem = javaType.fieldItemType.getDeclaredConstructor(Array.newInstance(testValues[0].getClass(), 0).getClass()).newInstance(new Object[]{testValues});
+                } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+                    throw new PlcRuntimeException("Error initializing field class " + javaType.fieldItemType.getSimpleName(), e);
+                }
+
+                Stream<Arguments> curValues;
+                // Min, Max
+                if (testValues.length == 2) {
+                    curValues = Stream.of(
+                        Arguments.of(adsDataType.name() + "-" + javaType.name() + "-MIN", field, createOneElementArray(testValues[0])),
+                        Arguments.of(adsDataType.name() + "-" + javaType.name() + "-MAX", field, createOneElementArray(testValues[1])));
+                }
+                // Value, Min, Max
+                else if (testValues.length == 3) {
+                    curValues = Stream.of(
+                        Arguments.of(adsDataType.name() + "-" + javaType.name() + "-MIN", field, createOneElementArray(testValues[1])),
+                        Arguments.of(adsDataType.name() + "-" + javaType.name() + "-VAL", field, createOneElementArray(testValues[0])),
+                        Arguments.of(adsDataType.name() + "-" + javaType.name() + "-MAX", field, createOneElementArray(testValues[2])));
+                }
+                // Zero, Value, Min, Max
+                else if (testValues.length == 4) {
+                    curValues = Stream.of(
+                        Arguments.of(adsDataType.name() + "-" + javaType.name() + "-MIN", field, createOneElementArray(testValues[2])),
+                        Arguments.of(adsDataType.name() + "-" + javaType.name() + "-NIL", field, createOneElementArray(testValues[0])),
+                        Arguments.of(adsDataType.name() + "-" + javaType.name() + "-VAL", field, createOneElementArray(testValues[1])),
+                        Arguments.of(adsDataType.name() + "-" + javaType.name() + "-MAX", field, createOneElementArray(testValues[3])));
+                } else {
+                    throw new RuntimeException("Expecting 2, 3 or 4 valued test-input");
+                }
+                if (values == null) {
+                    values = curValues;
+                } else {
+                    values = Stream.concat(values, curValues);
+                }
+            }
+        }
+        return values;
+    }
+
+    private static Object[] createOneElementArray(Object value) {
+        Class<?> type = value.getClass();
+        Object[] array = (Object[]) Array.newInstance(type, 1);
+        array[0] = value;
+        return array;
+    }
+
+    enum InputTypes {
+        BOOLEAN(DefaultBooleanFieldItem.class, new Boolean[]{false, true}),
+        BYTE(DefaultByteFieldItem.class, new Byte[]{(byte) 0, (byte) 42, Byte.MIN_VALUE, Byte.MAX_VALUE}),
+        SHORT(DefaultShortFieldItem.class, new Short[]{(short) 0, (short) 42, Short.MIN_VALUE, Short.MAX_VALUE}),
+        INTEGER(DefaultIntegerFieldItem.class, new Integer[]{0, 42, Integer.MIN_VALUE, Integer.MAX_VALUE}),
+        LONG(DefaultLongFieldItem.class, new Long[]{(long) 0, (long) 42, Long.MIN_VALUE, Long.MAX_VALUE}),
+        FLOAT(DefaultFloatFieldItem.class, new Float[]{(float) 0.0, (float) 42.23, -Float.MAX_VALUE, Float.MAX_VALUE}),
+        DOUBLE(DefaultDoubleFieldItem.class, new Double[]{0.0, 42.23, -Double.MAX_VALUE, Double.MAX_VALUE}),
+        // Creates an empty sting as min and a 254 char long string as max.
+        STRING(DefaultStringFieldItem.class, new String[]{"Hurz", "", IntStream.range(0, 127).mapToObj(i -> "a").collect(Collectors.joining(""))}),
+        TIME(DefaultLocalTimeFieldItem.class, new LocalTime[]{LocalTime.now(), LocalTime.MIDNIGHT, LocalTime.MIN, LocalTime.MAX}),
+        DATE(DefaultLocalDateFieldItem.class, new LocalDate[]{LocalDate.now(), LocalDate.MIN, LocalDate.MAX}),
+        DATETIME(DefaultLocalDateTimeFieldItem.class, new LocalDateTime[]{LocalDateTime.now(), LocalDateTime.MIN, LocalDateTime.MAX});
+
+        private final Class<? extends BaseDefaultFieldItem> fieldItemType;
+        private final Object[] values;
+
+        InputTypes(Class<? extends BaseDefaultFieldItem> fieldItemType, Object[] values) {
+            this.fieldItemType = fieldItemType;
+            this.values = values;
+        }
+    }
+
+    private void encode(String name, PlcField field, Object[] values, Set<String> expectedSuccess,
+                        BiFunction<PlcField, Object[], BaseDefaultFieldItem> encoder) {
+        boolean success = expectedSuccess.contains(name);
+        try {
+            BaseDefaultFieldItem fieldItem = encoder.apply(field, values);
+            assertNotNull(fieldItem, "A FieldItem instance should have been returned for testcase " + name);
+            if (!success) {
+                fail(testInfo.getDisplayName() + ".\nExpected to fail for testcase " + name);
+            }
+        } catch (Exception e) {
+            if (success) {
+                fail(testInfo.getDisplayName() + ".\nExpected to succeed for testcase " + name + " got exception " + e.getMessage(), e);
+            }
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/model/DirectAdsFieldTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/model/DirectAdsFieldTest.java
index dc781d44ff4..8dfff5aee2d 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/model/DirectAdsFieldTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/model/DirectAdsFieldTest.java
@@ -1,71 +1,71 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.model;
-
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.junit.Test;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-public class DirectAdsFieldTest {
-
-    @Test
-    public void of() {
-        DirectAdsField field = DirectAdsField.of("1/10:BYTE[2]");
-        assertThat(field.getIndexGroup(), is(1L));
-        assertThat(field.getIndexOffset(), is(10L));
-        assertThat(field.getAdsDataType(), is(AdsDataType.BYTE));
-        assertThat(field.getNumberOfElements(), is(2));
-    }
-
-    @Test
-    public void ofHex() {
-        DirectAdsField field = DirectAdsField.of("0x1/0xff:BYTE[2]");
-        assertThat(field.getIndexGroup(), is(1L));
-        assertThat(field.getIndexOffset(), is(255L));
-        assertThat(field.getAdsDataType(), is(AdsDataType.BYTE));
-        assertThat(field.getNumberOfElements(), is(2));
-    }
-
-    @Test(expected = PlcInvalidFieldException.class)
-    public void stringInField() {
-        DirectAdsField field = DirectAdsField.of("group/offset");
-    }
-
-    @Test(expected = PlcInvalidFieldException.class)
-    public void singleNumberField() {
-        DirectAdsField field = DirectAdsField.of("10");
-    }
-
-    @Test(expected = PlcInvalidFieldException.class)
-    public void wrongSeperator() {
-        DirectAdsField field = DirectAdsField.of("1:10");
-    }
-
-    @Test
-    public void getGroupAndOffset() {
-        DirectAdsField field = DirectAdsField.of(2L, 20L, AdsDataType.BYTE, 1);
-        assertThat(field.getIndexGroup(), is(2L));
-        assertThat(field.getIndexOffset(), is(20L));
-        assertThat(field.getAdsDataType(), is(AdsDataType.BYTE));
-        assertThat(field.getNumberOfElements(), is(1));
-    }
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.model;
+
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+public class DirectAdsFieldTest {
+
+    @Test
+    public void of() {
+        DirectAdsField field = DirectAdsField.of("1/10:BYTE[2]");
+        assertThat(field.getIndexGroup(), is(1L));
+        assertThat(field.getIndexOffset(), is(10L));
+        assertThat(field.getAdsDataType(), is(AdsDataType.BYTE));
+        assertThat(field.getNumberOfElements(), is(2));
+    }
+
+    @Test
+    public void ofHex() {
+        DirectAdsField field = DirectAdsField.of("0x1/0xff:BYTE[2]");
+        assertThat(field.getIndexGroup(), is(1L));
+        assertThat(field.getIndexOffset(), is(255L));
+        assertThat(field.getAdsDataType(), is(AdsDataType.BYTE));
+        assertThat(field.getNumberOfElements(), is(2));
+    }
+
+    @Test(expected = PlcInvalidFieldException.class)
+    public void stringInField() {
+        DirectAdsField field = DirectAdsField.of("group/offset");
+    }
+
+    @Test(expected = PlcInvalidFieldException.class)
+    public void singleNumberField() {
+        DirectAdsField field = DirectAdsField.of("10");
+    }
+
+    @Test(expected = PlcInvalidFieldException.class)
+    public void wrongSeperator() {
+        DirectAdsField field = DirectAdsField.of("1:10");
+    }
+
+    @Test
+    public void getGroupAndOffset() {
+        DirectAdsField field = DirectAdsField.of(2L, 20L, AdsDataType.BYTE, 1);
+        assertThat(field.getIndexGroup(), is(2L));
+        assertThat(field.getIndexOffset(), is(20L));
+        assertThat(field.getAdsDataType(), is(AdsDataType.BYTE));
+        assertThat(field.getNumberOfElements(), is(1));
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/AbstractProtocolTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/AbstractProtocolTest.java
index ea01ba49e33..9958aa5ed99 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/AbstractProtocolTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/AbstractProtocolTest.java
@@ -1,151 +1,151 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.protocol;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.commands.*;
-import org.apache.plc4x.java.ads.api.commands.types.*;
-import org.apache.plc4x.java.ads.api.generic.AmsPacket;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-
-import java.util.Collections;
-import java.util.Date;
-import java.util.stream.Stream;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
-
-public class AbstractProtocolTest {
-
-    public static Stream<AmsPacket> amsPacketStream() {
-        AmsNetId targetAmsNetId = AmsNetId.of("1.2.3.4.5.6");
-        AmsPort targetAmsPort = AmsPort.of(7);
-        AmsNetId sourceAmsNetId = AmsNetId.of("8.9.10.11.12.13");
-        AmsPort sourceAmsPort = AmsPort.of(14);
-        Invoke invokeId = Invoke.of(15);
-        Data data = Data.of("Hello World!".getBytes());
-        return Stream.of(
-            AdsAddDeviceNotificationRequest.of(
-                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
-                IndexGroup.of(1), IndexOffset.of(1), Length.of(1), TransmissionMode.of(1), MaxDelay.of(1), CycleTime.of(1)),
-            AdsAddDeviceNotificationResponse.of(
-                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
-                Result.of(0),
-                NotificationHandle.of(0)
-            ),
-            AdsDeleteDeviceNotificationRequest.of(
-                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
-                NotificationHandle.of(0)
-            ),
-            AdsDeleteDeviceNotificationResponse.of(
-                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
-                Result.of(0)
-            ),
-            AdsDeviceNotificationRequest.of(
-                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
-                Stamps.of(1),
-                Collections.singletonList(
-                    // Nano times need to be offset by (1.1.1970 - 1.1.1601) years in nanos
-                    AdsStampHeader.of(TimeStamp.of(new Date()),
-                        Collections.singletonList(
-                            AdsNotificationSample.of(NotificationHandle.of(0), data))
-                    )
-                )
-            ),
-            AdsReadDeviceInfoRequest.of(
-                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId
-            ),
-            AdsReadDeviceInfoResponse.of(
-                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
-                Result.of(0),
-                MajorVersion.of((byte) 1),
-                MinorVersion.of((byte) 2),
-                Version.of(3),
-                Device.of("Random DeviceId")
-            ),
-            AdsReadRequest.of(
-                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
-                IndexGroup.of(0),
-                IndexOffset.NONE,
-                Length.of(1)
-            ),
-            AdsReadResponse.of(
-                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
-                Result.of(0),
-                data
-            ),
-            AdsReadStateRequest.of(
-                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId
-            ),
-            AdsReadStateResponse.of(
-                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
-                Result.of(0),
-                AdsState.of(0),
-                DeviceState.of(0)
-            ),
-            AdsReadWriteRequest.of(
-                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
-                IndexGroup.of(0),
-                IndexOffset.NONE,
-                ReadLength.of(data.getCalculatedLength()),
-                data
-            ),
-            AdsReadWriteResponse.of(
-                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
-                Result.of(0),
-                data
-            ),
-            AdsWriteControlRequest.of(
-                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
-                AdsState.of(0xaffe),
-                DeviceState.of(0xaffe),
-                data
-            ),
-            AdsWriteControlResponse.of(
-                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
-                Result.of(0)
-            ),
-            AdsWriteRequest.of(
-                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
-                IndexGroup.of(0),
-                IndexOffset.NONE,
-                data
-            ),
-            AdsWriteResponse.of(
-                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
-                Result.of(0)
-            )
-            /*,
-            UnknownCommand.of(
-                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, State.DEFAULT, invokeId,
-                Unpooled.wrappedBuffer(new byte[]{42})
-            )*/
-        );
-    }
-
-    public void assertByteBufferEquals(ByteBuf expected, ByteBuf actual) {
-        byte[] expectedBytes = new byte[expected.readableBytes()];
-        expected.readBytes(expectedBytes);
-        byte[] actualBytes = new byte[actual.readableBytes()];
-        actual.readBytes(actualBytes);
-        assertThat(expectedBytes, equalTo(actualBytes));
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.protocol;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.commands.*;
+import org.apache.plc4x.java.ads.api.commands.types.*;
+import org.apache.plc4x.java.ads.api.generic.AmsPacket;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+
+import java.util.Collections;
+import java.util.Date;
+import java.util.stream.Stream;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertThat;
+
+public class AbstractProtocolTest {
+
+    public static Stream<AmsPacket> amsPacketStream() {
+        AmsNetId targetAmsNetId = AmsNetId.of("1.2.3.4.5.6");
+        AmsPort targetAmsPort = AmsPort.of(7);
+        AmsNetId sourceAmsNetId = AmsNetId.of("8.9.10.11.12.13");
+        AmsPort sourceAmsPort = AmsPort.of(14);
+        Invoke invokeId = Invoke.of(15);
+        Data data = Data.of("Hello World!".getBytes());
+        return Stream.of(
+            AdsAddDeviceNotificationRequest.of(
+                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
+                IndexGroup.of(1), IndexOffset.of(1), Length.of(1), TransmissionMode.of(1), MaxDelay.of(1), CycleTime.of(1)),
+            AdsAddDeviceNotificationResponse.of(
+                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
+                Result.of(0),
+                NotificationHandle.of(0)
+            ),
+            AdsDeleteDeviceNotificationRequest.of(
+                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
+                NotificationHandle.of(0)
+            ),
+            AdsDeleteDeviceNotificationResponse.of(
+                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
+                Result.of(0)
+            ),
+            AdsDeviceNotificationRequest.of(
+                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
+                Stamps.of(1),
+                Collections.singletonList(
+                    // Nano times need to be offset by (1.1.1970 - 1.1.1601) years in nanos
+                    AdsStampHeader.of(TimeStamp.of(new Date()),
+                        Collections.singletonList(
+                            AdsNotificationSample.of(NotificationHandle.of(0), data))
+                    )
+                )
+            ),
+            AdsReadDeviceInfoRequest.of(
+                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId
+            ),
+            AdsReadDeviceInfoResponse.of(
+                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
+                Result.of(0),
+                MajorVersion.of((byte) 1),
+                MinorVersion.of((byte) 2),
+                Version.of(3),
+                Device.of("Random DeviceId")
+            ),
+            AdsReadRequest.of(
+                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
+                IndexGroup.of(0),
+                IndexOffset.NONE,
+                Length.of(1)
+            ),
+            AdsReadResponse.of(
+                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
+                Result.of(0),
+                data
+            ),
+            AdsReadStateRequest.of(
+                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId
+            ),
+            AdsReadStateResponse.of(
+                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
+                Result.of(0),
+                AdsState.of(0),
+                DeviceState.of(0)
+            ),
+            AdsReadWriteRequest.of(
+                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
+                IndexGroup.of(0),
+                IndexOffset.NONE,
+                ReadLength.of(data.getCalculatedLength()),
+                data
+            ),
+            AdsReadWriteResponse.of(
+                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
+                Result.of(0),
+                data
+            ),
+            AdsWriteControlRequest.of(
+                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
+                AdsState.of(0xaffe),
+                DeviceState.of(0xaffe),
+                data
+            ),
+            AdsWriteControlResponse.of(
+                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
+                Result.of(0)
+            ),
+            AdsWriteRequest.of(
+                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
+                IndexGroup.of(0),
+                IndexOffset.NONE,
+                data
+            ),
+            AdsWriteResponse.of(
+                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
+                Result.of(0)
+            )
+            /*,
+            UnknownCommand.of(
+                targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, State.DEFAULT, invokeId,
+                Unpooled.wrappedBuffer(new byte[]{42})
+            )*/
+        );
+    }
+
+    public void assertByteBufferEquals(ByteBuf expected, ByteBuf actual) {
+        byte[] expectedBytes = new byte[expected.readableBytes()];
+        expected.readBytes(expectedBytes);
+        byte[] actualBytes = new byte[actual.readableBytes()];
+        actual.readBytes(actualBytes);
+        assertThat(expectedBytes, equalTo(actualBytes));
+    }
+}
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Ads2PayloadProtocolTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Ads2PayloadProtocolTest.java
index 87de9ea4f46..1b437a3af33 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Ads2PayloadProtocolTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Ads2PayloadProtocolTest.java
@@ -1,99 +1,99 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.protocol;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.generic.AmsPacket;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.stream.Collectors;
-
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
-@RunWith(Parameterized.class)
-public class Ads2PayloadProtocolTest extends AbstractProtocolTest {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(Ads2PayloadProtocolTest.class);
-
-    private Ads2PayloadProtocol SUT;
-
-    @Parameterized.Parameter
-    public AmsPacket amsPacket;
-
-    @Parameterized.Parameter(1)
-    public String clazzName;
-
-    @Parameterized.Parameters(name = "{index} {1}")
-    public static Collection<Object[]> data() {
-        return amsPacketStream()
-            .map(amsPacket -> new Object[]{
-                amsPacket,
-                amsPacket.getClass().getSimpleName()
-            })
-            .collect(Collectors.toList());
-    }
-
-    @Before
-    public void setUp() throws Exception {
-        SUT = new Ads2PayloadProtocol();
-        byte[] bytes = amsPacket.getBytes();
-        LOGGER.info("amsPacket:\n{} has \n{}bytes\nHexDump:\n{}", amsPacket, bytes.length, amsPacket.dump());
-    }
-
-    @Test
-    public void encode() throws Exception {
-        ArrayList<Object> out = new ArrayList<>();
-        SUT.encode(null, amsPacket, out);
-        assertEquals(1, out.size());
-        assertThat(out, hasSize(1));
-    }
-
-    @Test
-    public void decode() throws Exception {
-        ArrayList<Object> out = new ArrayList<>();
-        SUT.decode(null, amsPacket.getByteBuf(), out);
-        assertThat(out, hasSize(1));
-    }
-
-    @Test
-    public void roundTrip() throws Exception {
-        ArrayList<Object> outbound = new ArrayList<>();
-        SUT.encode(null, amsPacket, outbound);
-        assertEquals(1, outbound.size());
-        assertThat(outbound, hasSize(1));
-        assertThat(outbound.get(0), instanceOf(ByteBuf.class));
-        ByteBuf byteBuf = (ByteBuf) outbound.get(0);
-        ArrayList<Object> inbound = new ArrayList<>();
-        SUT.decode(null, byteBuf, inbound);
-        assertEquals(1, inbound.size());
-        assertThat(inbound, hasSize(1));
-        assertThat(inbound.get(0), instanceOf(AmsPacket.class));
-        AmsPacket inboundAmsPacket = (AmsPacket) inbound.get(0);
-        assertThat("inbound divers from outbound", this.amsPacket, equalTo(inboundAmsPacket));
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.protocol;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.generic.AmsPacket;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
+@RunWith(Parameterized.class)
+public class Ads2PayloadProtocolTest extends AbstractProtocolTest {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(Ads2PayloadProtocolTest.class);
+
+    private Ads2PayloadProtocol SUT;
+
+    @Parameterized.Parameter
+    public AmsPacket amsPacket;
+
+    @Parameterized.Parameter(1)
+    public String clazzName;
+
+    @Parameterized.Parameters(name = "{index} {1}")
+    public static Collection<Object[]> data() {
+        return amsPacketStream()
+            .map(amsPacket -> new Object[]{
+                amsPacket,
+                amsPacket.getClass().getSimpleName()
+            })
+            .collect(Collectors.toList());
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        SUT = new Ads2PayloadProtocol();
+        byte[] bytes = amsPacket.getBytes();
+        LOGGER.info("amsPacket:\n{} has \n{}bytes\nHexDump:\n{}", amsPacket, bytes.length, amsPacket.dump());
+    }
+
+    @Test
+    public void encode() throws Exception {
+        ArrayList<Object> out = new ArrayList<>();
+        SUT.encode(null, amsPacket, out);
+        assertEquals(1, out.size());
+        assertThat(out, hasSize(1));
+    }
+
+    @Test
+    public void decode() throws Exception {
+        ArrayList<Object> out = new ArrayList<>();
+        SUT.decode(null, amsPacket.getByteBuf(), out);
+        assertThat(out, hasSize(1));
+    }
+
+    @Test
+    public void roundTrip() throws Exception {
+        ArrayList<Object> outbound = new ArrayList<>();
+        SUT.encode(null, amsPacket, outbound);
+        assertEquals(1, outbound.size());
+        assertThat(outbound, hasSize(1));
+        assertThat(outbound.get(0), instanceOf(ByteBuf.class));
+        ByteBuf byteBuf = (ByteBuf) outbound.get(0);
+        ArrayList<Object> inbound = new ArrayList<>();
+        SUT.decode(null, byteBuf, inbound);
+        assertEquals(1, inbound.size());
+        assertThat(inbound, hasSize(1));
+        assertThat(inbound.get(0), instanceOf(AmsPacket.class));
+        AmsPacket inboundAmsPacket = (AmsPacket) inbound.get(0);
+        assertThat("inbound divers from outbound", this.amsPacket, equalTo(inboundAmsPacket));
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Payload2SerialProtocolExampleConversationTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Payload2SerialProtocolExampleConversationTest.java
index 107d4f95cd8..59375d3f9ce 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Payload2SerialProtocolExampleConversationTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Payload2SerialProtocolExampleConversationTest.java
@@ -1,228 +1,228 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.protocol;
-
-import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelFutureListener;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.util.concurrent.EventExecutor;
-import io.netty.util.concurrent.ScheduledFuture;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.plc4x.java.ads.api.commands.AdsReadRequest;
-import org.apache.plc4x.java.ads.api.commands.AdsReadResponse;
-import org.apache.plc4x.java.ads.api.commands.types.*;
-import org.apache.plc4x.java.ads.api.generic.AmsPacket;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-import org.apache.plc4x.java.ads.api.serial.AmsSerialAcknowledgeFrame;
-import org.apache.plc4x.java.ads.api.serial.AmsSerialFrame;
-import org.apache.plc4x.java.ads.api.serial.types.FragmentNumber;
-import org.apache.plc4x.java.ads.api.serial.types.UserData;
-import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static org.apache.plc4x.java.mock.util.Assert.byteArrayEqualsTo;
-import static org.mockito.Mockito.*;
-
-/**
- * @see <a href="https://infosys.beckhoff.com/content/1033/tcadsamsserialspec/html/tcamssericalspec,0xsample.htm?id=60692407917020132">example</a>
- */
-public class Payload2SerialProtocolExampleConversationTest {
-
-    @Rule
-    public ErrorCollector errorCollector = new ErrorCollector();
-
-    private Payload2SerialProtocol SUT;
-
-    private ChannelHandlerContext channelHandlerContextMock;
-
-    @Before
-    public void setUp() {
-        ExecutorService executorService = Executors.newFixedThreadPool(10);
-        channelHandlerContextMock = mock(ChannelHandlerContext.class, RETURNS_DEEP_STUBS);
-        when(channelHandlerContextMock.toString()).thenReturn("ChannelHandlerContextMock");
-        when(channelHandlerContextMock.executor()).then(_ign -> {
-            EventExecutor eventExecutor = mock(EventExecutor.class);
-            when(eventExecutor.schedule(any(Callable.class), anyLong(), any()))
-                .then(invocation -> {
-                    Future<Object> submit = executorService.submit((Callable<Object>) invocation.getArgument(0));
-                    ScheduledFuture scheduledFuture = mock(ScheduledFuture.class);
-                    when(scheduledFuture.cancel(anyBoolean()))
-                        .then(invocation1 -> submit.cancel(invocation1.getArgument(0)));
-                    return scheduledFuture;
-                });
-            return eventExecutor;
-        });
-        ChannelFuture channelFuture = mock(ChannelFuture.class);
-        when(channelFuture.addListener(any())).then(invocation -> {
-            ChannelFutureListener channelFutureListener = invocation.getArgument(0);
-            ChannelFuture mock = mock(ChannelFuture.class);
-            when(mock.isSuccess()).thenReturn(true);
-            channelFutureListener.operationComplete(mock);
-            return mock(ChannelFuture.class);
-        });
-        when(channelHandlerContextMock.writeAndFlush(any())).thenReturn(channelFuture);
-        SUT = new Payload2SerialProtocol();
-    }
-
-    @Test(expected = PlcProtocolException.class)
-    public void testWrongCrc() throws Exception {
-        int[] exampleRequestInt = {
-            /*Magic Cookie    */    0x01, 0xA5,
-            /*Sender          */    0x00,
-            /*Empfaenger      */    0x00,
-            /*Fragmentnummer  */    0x06,
-            /*Datenlaenge     */    0x2C,
-            /*NetID Empfaenger*/    0xC0, 0xA8, 0x64, 0xAE, 0x01, 0x01,
-            /*Port Nummer     */    0x21, 0x03,
-            /*NetID Sender    */    0xC0, 0xA8, 0x64, 0x9C, 0x01, 0x01,
-            /*Portnummer      */    0x01, 0x80,
-            /*Kommando lesen  */    0x02, 0x00,
-            /*Status          */    0x04, 0x00,
-            /*Anzahl Datenbyte*/    0x0C, 0x00, 0x00, 0x00,
-            /*Fehlercode      */    0x00, 0x00, 0x00, 0x00,
-            /*InvokeID        */    0x07, 0x00, 0x00, 0x00,
-            /*Index Gruppe    */    0x05, 0xF0, 0x00, 0x00,
-            /*Index Offset    */    0x04, 0x00, 0x00, 0x9D,
-            /*Anzahl Byte     */    0x02, 0x00, 0x00, 0x00,
-            // This Checksum is flipped to provoke exception
-            /*Checksumme      */    0x28, 0x79,
-        };
-        byte[] exampleRequest = ArrayUtils.toPrimitive(Arrays
-            .stream(exampleRequestInt)
-            .mapToObj(value -> (byte) value)
-            .toArray(Byte[]::new));
-        SUT.decode(channelHandlerContextMock, Unpooled.wrappedBuffer(exampleRequest), new ArrayList<>());
-    }
-
-    @Test
-    public void exampleConversation() throws Exception {
-        FieldUtils.writeDeclaredField(SUT, "fragmentCounter", new AtomicInteger(6), true);
-        // 1. Terminal --> PLC : Request of 2 bytre data
-        int[] exampleRequestInt = {
-            /*Magic Cookie    */    0x01, 0xA5,
-            /*Sender          */    0x00,
-            /*Empfaenger      */    0x00,
-            /*Fragmentnummer  */    0x06,
-            /*Datenlaenge     */    0x2C,
-            /*NetID Empfaenger*/    0xC0, 0xA8, 0x64, 0xAE, 0x01, 0x01,
-            /*Port Nummer     */    0x21, 0x03,
-            /*NetID Sender    */    0xC0, 0xA8, 0x64, 0x9C, 0x01, 0x01,
-            /*Portnummer      */    0x01, 0x80,
-            /*Kommando lesen  */    0x02, 0x00,
-            /*Status          */    0x04, 0x00,
-            /*Anzahl Datenbyte*/    0x0C, 0x00, 0x00, 0x00,
-            /*Fehlercode      */    0x00, 0x00, 0x00, 0x00,
-            /*InvokeID        */    0x07, 0x00, 0x00, 0x00,
-            /*Index Gruppe    */    0x05, 0xF0, 0x00, 0x00,
-            /*Index Offset    */    0x04, 0x00, 0x00, 0x9D,
-            /*Anzahl Byte     */    0x02, 0x00, 0x00, 0x00,
-            /*Checksumme      */    0x82, 0x97,
-        };
-        byte[] exampleRequest = ArrayUtils.toPrimitive(Arrays
-            .stream(exampleRequestInt)
-            .mapToObj(value -> (byte) value)
-            .toArray(Byte[]::new));
-        AmsPacket amsPacket = AdsReadRequest.of(
-            AmsNetId.of(Arrays.copyOfRange(exampleRequest, 6, 12)),
-            AmsPort.of(Arrays.copyOfRange(exampleRequest, 12, 14)),
-            AmsNetId.of(Arrays.copyOfRange(exampleRequest, 14, 20)),
-            AmsPort.of(Arrays.copyOfRange(exampleRequest, 20, 22)),
-            Invoke.of(0x07),
-            IndexGroup.of(0xF0_05),
-            IndexOffset.of(0x9D_00_00_04L),
-            Length.of(0x2)
-        );
-        AmsSerialFrame amsSerialFrame = AmsSerialFrame.of(FragmentNumber.of((byte) 0x06), UserData.of(amsPacket.getBytes()));
-        errorCollector.checkThat("example request not same", amsSerialFrame.getBytes(), byteArrayEqualsTo(exampleRequest));
-        SUT.encode(channelHandlerContextMock, amsPacket.getByteBuf(), new ArrayList<>());
-
-        // PLC --> Terminal : Acknowledge:
-        int[] exampleResponsAckInt = {
-            /*Magic Cookie   */      0x01, 0x5A,
-            /*Sender         */      0x00,
-            /*Empfaenger     */      0x00,
-            /*Fragmentnummer */      0x06,
-            /*Datenlaenge    */      0x00,
-            /*Checksumme     */      0x67, 0x5A
-        };
-        byte[] exampleAckResponse = ArrayUtils.toPrimitive(Arrays
-            .stream(exampleResponsAckInt)
-            .mapToObj(value -> (byte) value)
-            .toArray(Byte[]::new));
-
-        AmsSerialAcknowledgeFrame amsSerialAcknowledgeFrame = AmsSerialAcknowledgeFrame.of(amsSerialFrame.getTransmitterAddress(), amsSerialFrame.getReceiverAddress(), amsSerialFrame.getFragmentNumber());
-        errorCollector.checkThat("ack response not same", amsSerialAcknowledgeFrame.getBytes(), byteArrayEqualsTo(exampleAckResponse));
-        SUT.decode(channelHandlerContextMock, Unpooled.wrappedBuffer(exampleAckResponse), new ArrayList<>());
-        SUT.decode(channelHandlerContextMock, amsSerialAcknowledgeFrame.getByteBuf(), new ArrayList<>());
-
-        // PLC sends data:
-        int[] exampleResponseInt = {
-            /*Magic Cookie     */    0x01, 0xA5,
-            /*Sender           */    0x00,
-            /*Empfaenger       */    0x00,
-            /*Fragmentnummer   */    0xEC,
-            /*Anzahl Daten     */    0x2A,
-            /*NetID Empfaenger */    0xC0, 0xA8, 0x64, 0x9C, 0x01, 0x01,
-            /*Portnummer       */    0x01, 0x80,
-            /*NetID Sender     */    0xC0, 0xA8, 0x64, 0xAE, 0x01, 0x01,
-            /*Portnummer       */    0x21, 0x03,
-            /*Response Lesen   */    0x02, 0x00,
-            /*Status           */    0x05, 0x00,
-            /*Anzahl Daten     */    0x0A, 0x00, 0x00, 0x00,
-            /*Fehlercode       */    0x00, 0x00, 0x00, 0x00,
-            /*InvokeID         */    0x07, 0x00, 0x00, 0x00,
-            /*Ergebnis         */    0x00, 0x00, 0x00, 0x00,
-            /*Anzahl Daten     */    0x02, 0x00, 0x00, 0x00,
-            /*Daten            */    0xAF, 0x27,
-            /*Checksumme       */    0x04, 0xA9,
-        };
-        byte[] exampleResponse = ArrayUtils.toPrimitive(Arrays
-            .stream(exampleResponseInt)
-            .mapToObj(value -> (byte) value)
-            .toArray(Byte[]::new));
-        AmsPacket amsResponsePacket = AdsReadResponse.of(
-            AmsNetId.of(Arrays.copyOfRange(exampleResponse, 6, 12)),
-            AmsPort.of(Arrays.copyOfRange(exampleResponse, 12, 14)),
-            AmsNetId.of(Arrays.copyOfRange(exampleResponse, 14, 20)),
-            AmsPort.of(Arrays.copyOfRange(exampleResponse, 20, 22)),
-            Invoke.of(0x07),
-            Result.of(0x00),
-            Data.of((byte) 0xAF, (byte) 0x27)
-        );
-        AmsSerialFrame amsResponseSerialFrame = AmsSerialFrame.of(FragmentNumber.of((byte) 0xEC), UserData.of(amsResponsePacket.getBytes()));
-        errorCollector.checkThat("read response not same", amsResponseSerialFrame.getBytes(), byteArrayEqualsTo(exampleResponse));
-        SUT.decode(channelHandlerContextMock, Unpooled.wrappedBuffer(exampleResponse), new ArrayList<>());
-        SUT.decode(channelHandlerContextMock, amsResponseSerialFrame.getByteBuf(), new ArrayList<>());
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.protocol;
+
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.concurrent.ScheduledFuture;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.plc4x.java.ads.api.commands.AdsReadRequest;
+import org.apache.plc4x.java.ads.api.commands.AdsReadResponse;
+import org.apache.plc4x.java.ads.api.commands.types.*;
+import org.apache.plc4x.java.ads.api.generic.AmsPacket;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+import org.apache.plc4x.java.ads.api.serial.AmsSerialAcknowledgeFrame;
+import org.apache.plc4x.java.ads.api.serial.AmsSerialFrame;
+import org.apache.plc4x.java.ads.api.serial.types.FragmentNumber;
+import org.apache.plc4x.java.ads.api.serial.types.UserData;
+import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ErrorCollector;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.apache.plc4x.java.mock.util.Assert.byteArrayEqualsTo;
+import static org.mockito.Mockito.*;
+
+/**
+ * @see <a href="https://infosys.beckhoff.com/content/1033/tcadsamsserialspec/html/tcamssericalspec,0xsample.htm?id=60692407917020132">example</a>
+ */
+public class Payload2SerialProtocolExampleConversationTest {
+
+    @Rule
+    public ErrorCollector errorCollector = new ErrorCollector();
+
+    private Payload2SerialProtocol SUT;
+
+    private ChannelHandlerContext channelHandlerContextMock;
+
+    @Before
+    public void setUp() {
+        ExecutorService executorService = Executors.newFixedThreadPool(10);
+        channelHandlerContextMock = mock(ChannelHandlerContext.class, RETURNS_DEEP_STUBS);
+        when(channelHandlerContextMock.toString()).thenReturn("ChannelHandlerContextMock");
+        when(channelHandlerContextMock.executor()).then(_ign -> {
+            EventExecutor eventExecutor = mock(EventExecutor.class);
+            when(eventExecutor.schedule(any(Callable.class), anyLong(), any()))
+                .then(invocation -> {
+                    Future<Object> submit = executorService.submit((Callable<Object>) invocation.getArgument(0));
+                    ScheduledFuture scheduledFuture = mock(ScheduledFuture.class);
+                    when(scheduledFuture.cancel(anyBoolean()))
+                        .then(invocation1 -> submit.cancel(invocation1.getArgument(0)));
+                    return scheduledFuture;
+                });
+            return eventExecutor;
+        });
+        ChannelFuture channelFuture = mock(ChannelFuture.class);
+        when(channelFuture.addListener(any())).then(invocation -> {
+            ChannelFutureListener channelFutureListener = invocation.getArgument(0);
+            ChannelFuture mock = mock(ChannelFuture.class);
+            when(mock.isSuccess()).thenReturn(true);
+            channelFutureListener.operationComplete(mock);
+            return mock(ChannelFuture.class);
+        });
+        when(channelHandlerContextMock.writeAndFlush(any())).thenReturn(channelFuture);
+        SUT = new Payload2SerialProtocol();
+    }
+
+    @Test(expected = PlcProtocolException.class)
+    public void testWrongCrc() throws Exception {
+        int[] exampleRequestInt = {
+            /*Magic Cookie    */    0x01, 0xA5,
+            /*Sender          */    0x00,
+            /*Empfaenger      */    0x00,
+            /*Fragmentnummer  */    0x06,
+            /*Datenlaenge     */    0x2C,
+            /*NetID Empfaenger*/    0xC0, 0xA8, 0x64, 0xAE, 0x01, 0x01,
+            /*Port Nummer     */    0x21, 0x03,
+            /*NetID Sender    */    0xC0, 0xA8, 0x64, 0x9C, 0x01, 0x01,
+            /*Portnummer      */    0x01, 0x80,
+            /*Kommando lesen  */    0x02, 0x00,
+            /*Status          */    0x04, 0x00,
+            /*Anzahl Datenbyte*/    0x0C, 0x00, 0x00, 0x00,
+            /*Fehlercode      */    0x00, 0x00, 0x00, 0x00,
+            /*InvokeID        */    0x07, 0x00, 0x00, 0x00,
+            /*Index Gruppe    */    0x05, 0xF0, 0x00, 0x00,
+            /*Index Offset    */    0x04, 0x00, 0x00, 0x9D,
+            /*Anzahl Byte     */    0x02, 0x00, 0x00, 0x00,
+            // This Checksum is flipped to provoke exception
+            /*Checksumme      */    0x28, 0x79,
+        };
+        byte[] exampleRequest = ArrayUtils.toPrimitive(Arrays
+            .stream(exampleRequestInt)
+            .mapToObj(value -> (byte) value)
+            .toArray(Byte[]::new));
+        SUT.decode(channelHandlerContextMock, Unpooled.wrappedBuffer(exampleRequest), new ArrayList<>());
+    }
+
+    @Test
+    public void exampleConversation() throws Exception {
+        FieldUtils.writeDeclaredField(SUT, "fragmentCounter", new AtomicInteger(6), true);
+        // 1. Terminal --> PLC : Request of 2 bytre data
+        int[] exampleRequestInt = {
+            /*Magic Cookie    */    0x01, 0xA5,
+            /*Sender          */    0x00,
+            /*Empfaenger      */    0x00,
+            /*Fragmentnummer  */    0x06,
+            /*Datenlaenge     */    0x2C,
+            /*NetID Empfaenger*/    0xC0, 0xA8, 0x64, 0xAE, 0x01, 0x01,
+            /*Port Nummer     */    0x21, 0x03,
+            /*NetID Sender    */    0xC0, 0xA8, 0x64, 0x9C, 0x01, 0x01,
+            /*Portnummer      */    0x01, 0x80,
+            /*Kommando lesen  */    0x02, 0x00,
+            /*Status          */    0x04, 0x00,
+            /*Anzahl Datenbyte*/    0x0C, 0x00, 0x00, 0x00,
+            /*Fehlercode      */    0x00, 0x00, 0x00, 0x00,
+            /*InvokeID        */    0x07, 0x00, 0x00, 0x00,
+            /*Index Gruppe    */    0x05, 0xF0, 0x00, 0x00,
+            /*Index Offset    */    0x04, 0x00, 0x00, 0x9D,
+            /*Anzahl Byte     */    0x02, 0x00, 0x00, 0x00,
+            /*Checksumme      */    0x82, 0x97,
+        };
+        byte[] exampleRequest = ArrayUtils.toPrimitive(Arrays
+            .stream(exampleRequestInt)
+            .mapToObj(value -> (byte) value)
+            .toArray(Byte[]::new));
+        AmsPacket amsPacket = AdsReadRequest.of(
+            AmsNetId.of(Arrays.copyOfRange(exampleRequest, 6, 12)),
+            AmsPort.of(Arrays.copyOfRange(exampleRequest, 12, 14)),
+            AmsNetId.of(Arrays.copyOfRange(exampleRequest, 14, 20)),
+            AmsPort.of(Arrays.copyOfRange(exampleRequest, 20, 22)),
+            Invoke.of(0x07),
+            IndexGroup.of(0xF0_05),
+            IndexOffset.of(0x9D_00_00_04L),
+            Length.of(0x2)
+        );
+        AmsSerialFrame amsSerialFrame = AmsSerialFrame.of(FragmentNumber.of((byte) 0x06), UserData.of(amsPacket.getBytes()));
+        errorCollector.checkThat("example request not same", amsSerialFrame.getBytes(), byteArrayEqualsTo(exampleRequest));
+        SUT.encode(channelHandlerContextMock, amsPacket.getByteBuf(), new ArrayList<>());
+
+        // PLC --> Terminal : Acknowledge:
+        int[] exampleResponsAckInt = {
+            /*Magic Cookie   */      0x01, 0x5A,
+            /*Sender         */      0x00,
+            /*Empfaenger     */      0x00,
+            /*Fragmentnummer */      0x06,
+            /*Datenlaenge    */      0x00,
+            /*Checksumme     */      0x67, 0x5A
+        };
+        byte[] exampleAckResponse = ArrayUtils.toPrimitive(Arrays
+            .stream(exampleResponsAckInt)
+            .mapToObj(value -> (byte) value)
+            .toArray(Byte[]::new));
+
+        AmsSerialAcknowledgeFrame amsSerialAcknowledgeFrame = AmsSerialAcknowledgeFrame.of(amsSerialFrame.getTransmitterAddress(), amsSerialFrame.getReceiverAddress(), amsSerialFrame.getFragmentNumber());
+        errorCollector.checkThat("ack response not same", amsSerialAcknowledgeFrame.getBytes(), byteArrayEqualsTo(exampleAckResponse));
+        SUT.decode(channelHandlerContextMock, Unpooled.wrappedBuffer(exampleAckResponse), new ArrayList<>());
+        SUT.decode(channelHandlerContextMock, amsSerialAcknowledgeFrame.getByteBuf(), new ArrayList<>());
+
+        // PLC sends data:
+        int[] exampleResponseInt = {
+            /*Magic Cookie     */    0x01, 0xA5,
+            /*Sender           */    0x00,
+            /*Empfaenger       */    0x00,
+            /*Fragmentnummer   */    0xEC,
+            /*Anzahl Daten     */    0x2A,
+            /*NetID Empfaenger */    0xC0, 0xA8, 0x64, 0x9C, 0x01, 0x01,
+            /*Portnummer       */    0x01, 0x80,
+            /*NetID Sender     */    0xC0, 0xA8, 0x64, 0xAE, 0x01, 0x01,
+            /*Portnummer       */    0x21, 0x03,
+            /*Response Lesen   */    0x02, 0x00,
+            /*Status           */    0x05, 0x00,
+            /*Anzahl Daten     */    0x0A, 0x00, 0x00, 0x00,
+            /*Fehlercode       */    0x00, 0x00, 0x00, 0x00,
+            /*InvokeID         */    0x07, 0x00, 0x00, 0x00,
+            /*Ergebnis         */    0x00, 0x00, 0x00, 0x00,
+            /*Anzahl Daten     */    0x02, 0x00, 0x00, 0x00,
+            /*Daten            */    0xAF, 0x27,
+            /*Checksumme       */    0x04, 0xA9,
+        };
+        byte[] exampleResponse = ArrayUtils.toPrimitive(Arrays
+            .stream(exampleResponseInt)
+            .mapToObj(value -> (byte) value)
+            .toArray(Byte[]::new));
+        AmsPacket amsResponsePacket = AdsReadResponse.of(
+            AmsNetId.of(Arrays.copyOfRange(exampleResponse, 6, 12)),
+            AmsPort.of(Arrays.copyOfRange(exampleResponse, 12, 14)),
+            AmsNetId.of(Arrays.copyOfRange(exampleResponse, 14, 20)),
+            AmsPort.of(Arrays.copyOfRange(exampleResponse, 20, 22)),
+            Invoke.of(0x07),
+            Result.of(0x00),
+            Data.of((byte) 0xAF, (byte) 0x27)
+        );
+        AmsSerialFrame amsResponseSerialFrame = AmsSerialFrame.of(FragmentNumber.of((byte) 0xEC), UserData.of(amsResponsePacket.getBytes()));
+        errorCollector.checkThat("read response not same", amsResponseSerialFrame.getBytes(), byteArrayEqualsTo(exampleResponse));
+        SUT.decode(channelHandlerContextMock, Unpooled.wrappedBuffer(exampleResponse), new ArrayList<>());
+        SUT.decode(channelHandlerContextMock, amsResponseSerialFrame.getByteBuf(), new ArrayList<>());
+    }
+}
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Payload2SerialProtocolTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Payload2SerialProtocolTest.java
index 91ba5727040..886ffc21221 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Payload2SerialProtocolTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Payload2SerialProtocolTest.java
@@ -1,113 +1,113 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.protocol;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelHandlerContext;
-import org.apache.plc4x.java.ads.api.serial.AmsSerialFrame;
-import org.apache.plc4x.java.ads.api.serial.types.FragmentNumber;
-import org.apache.plc4x.java.ads.api.serial.types.UserData;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.stream.Collectors;
-
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
-
-@RunWith(Parameterized.class)
-public class Payload2SerialProtocolTest extends AbstractProtocolTest {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(Payload2SerialProtocolTest.class);
-
-    private Payload2SerialProtocol SUT;
-
-    private ChannelHandlerContext channelHandlerContextMock;
-
-    @Parameterized.Parameter
-    public AmsSerialFrame amsSerialFrame;
-
-    @Parameterized.Parameter(1)
-    public String clazzName;
-
-    @Parameterized.Parameter(2)
-    public byte[] amsPacketBytes;
-
-    @Parameterized.Parameters(name = "{index} {1}")
-    public static Collection<Object[]> data() {
-        return amsPacketStream()
-            .map(amsPacket -> new Object[]{
-                AmsSerialFrame.of(FragmentNumber.of((byte) 0), UserData.of(amsPacket.getByteBuf())),
-                amsPacket.getClass().getSimpleName(),
-                amsPacket.getBytes()
-            })
-            .collect(Collectors.toList());
-    }
-
-    @Before
-    public void setUp() throws Exception {
-        SUT = new Payload2SerialProtocol();
-        channelHandlerContextMock = mock(ChannelHandlerContext.class, RETURNS_DEEP_STUBS);
-        byte[] bytes = amsSerialFrame.getBytes();
-        LOGGER.info("amsPacket:\n{} has \n{}bytes\nHexDump:\n{}", amsSerialFrame, bytes.length, amsSerialFrame.dump());
-    }
-
-    @Test
-    public void encode() throws Exception {
-        ArrayList<Object> out = new ArrayList<>();
-        SUT.encode(channelHandlerContextMock, Unpooled.wrappedBuffer(amsPacketBytes), out);
-        assertEquals(1, out.size());
-        assertThat(out, hasSize(1));
-    }
-
-    @Test
-    public void decode() throws Exception {
-        ArrayList<Object> out = new ArrayList<>();
-        SUT.decode(channelHandlerContextMock, amsSerialFrame.getByteBuf(), out);
-        assertThat(out, hasSize(1));
-    }
-
-    @Test
-    public void roundTrip() throws Exception {
-        ArrayList<Object> outbound = new ArrayList<>();
-        SUT.encode(channelHandlerContextMock, Unpooled.wrappedBuffer(amsPacketBytes), outbound);
-        assertEquals(1, outbound.size());
-        assertThat(outbound, hasSize(1));
-        assertThat(outbound.get(0), instanceOf(ByteBuf.class));
-        ByteBuf byteBuf = (ByteBuf) outbound.get(0);
-        ArrayList<Object> inbound = new ArrayList<>();
-        SUT.decode(channelHandlerContextMock, byteBuf, inbound);
-        assertEquals(1, inbound.size());
-        assertThat(inbound, hasSize(1));
-        assertThat(inbound.get(0), instanceOf(ByteBuf.class));
-        ByteBuf inboundAmsPacketByteBuf = (ByteBuf) inbound.get(0);
-        assertByteBufferEquals(Unpooled.wrappedBuffer(this.amsPacketBytes), inboundAmsPacketByteBuf);
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.protocol;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import org.apache.plc4x.java.ads.api.serial.AmsSerialFrame;
+import org.apache.plc4x.java.ads.api.serial.types.FragmentNumber;
+import org.apache.plc4x.java.ads.api.serial.types.UserData;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+
+@RunWith(Parameterized.class)
+public class Payload2SerialProtocolTest extends AbstractProtocolTest {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(Payload2SerialProtocolTest.class);
+
+    private Payload2SerialProtocol SUT;
+
+    private ChannelHandlerContext channelHandlerContextMock;
+
+    @Parameterized.Parameter
+    public AmsSerialFrame amsSerialFrame;
+
+    @Parameterized.Parameter(1)
+    public String clazzName;
+
+    @Parameterized.Parameter(2)
+    public byte[] amsPacketBytes;
+
+    @Parameterized.Parameters(name = "{index} {1}")
+    public static Collection<Object[]> data() {
+        return amsPacketStream()
+            .map(amsPacket -> new Object[]{
+                AmsSerialFrame.of(FragmentNumber.of((byte) 0), UserData.of(amsPacket.getByteBuf())),
+                amsPacket.getClass().getSimpleName(),
+                amsPacket.getBytes()
+            })
+            .collect(Collectors.toList());
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        SUT = new Payload2SerialProtocol();
+        channelHandlerContextMock = mock(ChannelHandlerContext.class, RETURNS_DEEP_STUBS);
+        byte[] bytes = amsSerialFrame.getBytes();
+        LOGGER.info("amsPacket:\n{} has \n{}bytes\nHexDump:\n{}", amsSerialFrame, bytes.length, amsSerialFrame.dump());
+    }
+
+    @Test
+    public void encode() throws Exception {
+        ArrayList<Object> out = new ArrayList<>();
+        SUT.encode(channelHandlerContextMock, Unpooled.wrappedBuffer(amsPacketBytes), out);
+        assertEquals(1, out.size());
+        assertThat(out, hasSize(1));
+    }
+
+    @Test
+    public void decode() throws Exception {
+        ArrayList<Object> out = new ArrayList<>();
+        SUT.decode(channelHandlerContextMock, amsSerialFrame.getByteBuf(), out);
+        assertThat(out, hasSize(1));
+    }
+
+    @Test
+    public void roundTrip() throws Exception {
+        ArrayList<Object> outbound = new ArrayList<>();
+        SUT.encode(channelHandlerContextMock, Unpooled.wrappedBuffer(amsPacketBytes), outbound);
+        assertEquals(1, outbound.size());
+        assertThat(outbound, hasSize(1));
+        assertThat(outbound.get(0), instanceOf(ByteBuf.class));
+        ByteBuf byteBuf = (ByteBuf) outbound.get(0);
+        ArrayList<Object> inbound = new ArrayList<>();
+        SUT.decode(channelHandlerContextMock, byteBuf, inbound);
+        assertEquals(1, inbound.size());
+        assertThat(inbound, hasSize(1));
+        assertThat(inbound.get(0), instanceOf(ByteBuf.class));
+        ByteBuf inboundAmsPacketByteBuf = (ByteBuf) inbound.get(0);
+        assertByteBufferEquals(Unpooled.wrappedBuffer(this.amsPacketBytes), inboundAmsPacketByteBuf);
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Payload2TcpProtocolTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Payload2TcpProtocolTest.java
index 49b015f6bc1..40f9779a4c9 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Payload2TcpProtocolTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Payload2TcpProtocolTest.java
@@ -1,112 +1,112 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.protocol;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelHandlerContext;
-import org.apache.plc4x.java.ads.api.tcp.AmsTCPPacket;
-import org.apache.plc4x.java.ads.api.tcp.types.UserData;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.stream.Collectors;
-
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
-
-@RunWith(Parameterized.class)
-public class Payload2TcpProtocolTest extends AbstractProtocolTest {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(Payload2TcpProtocolTest.class);
-
-    private Payload2TcpProtocol SUT;
-
-    private ChannelHandlerContext channelHandlerContextMock;
-
-    @Parameterized.Parameter
-    public AmsTCPPacket amsTCPPacket;
-
-    @Parameterized.Parameter(1)
-    public String clazzName;
-
-    @Parameterized.Parameter(2)
-    public byte[] amsPacketBytes;
-
-    @Parameterized.Parameters(name = "{index} {1}")
-    public static Collection<Object[]> data() {
-        return amsPacketStream()
-            .map(amsPacket -> new Object[]{
-                AmsTCPPacket.of(UserData.of(amsPacket.getByteBuf())),
-                amsPacket.getClass().getSimpleName(),
-                amsPacket.getBytes()
-            })
-            .collect(Collectors.toList());
-    }
-
-    @Before
-    public void setUp() throws Exception {
-        SUT = new Payload2TcpProtocol();
-        channelHandlerContextMock = mock(ChannelHandlerContext.class, RETURNS_DEEP_STUBS);
-        byte[] bytes = amsTCPPacket.getBytes();
-        LOGGER.info("amsPacket:\n{} has \n{}bytes\nHexDump:\n{}", amsTCPPacket, bytes.length, amsTCPPacket.dump());
-    }
-
-    @Test
-    public void encode() throws Exception {
-        ArrayList<Object> out = new ArrayList<>();
-        SUT.encode(channelHandlerContextMock, Unpooled.wrappedBuffer(amsPacketBytes), out);
-        assertEquals(1, out.size());
-        assertThat(out, hasSize(1));
-    }
-
-    @Test
-    public void decode() throws Exception {
-        ArrayList<Object> out = new ArrayList<>();
-        SUT.decode(channelHandlerContextMock, amsTCPPacket.getByteBuf(), out);
-        assertThat(out, hasSize(1));
-    }
-
-    @Test
-    public void roundTrip() throws Exception {
-        ArrayList<Object> outbound = new ArrayList<>();
-        SUT.encode(channelHandlerContextMock, Unpooled.wrappedBuffer(amsPacketBytes), outbound);
-        assertEquals(1, outbound.size());
-        assertThat(outbound, hasSize(1));
-        assertThat(outbound.get(0), instanceOf(ByteBuf.class));
-        ByteBuf byteBuf = (ByteBuf) outbound.get(0);
-        ArrayList<Object> inbound = new ArrayList<>();
-        SUT.decode(channelHandlerContextMock, byteBuf, inbound);
-        assertEquals(1, inbound.size());
-        assertThat(inbound, hasSize(1));
-        assertThat(inbound.get(0), instanceOf(ByteBuf.class));
-        ByteBuf inboundAmsPacket = (ByteBuf) inbound.get(0);
-        assertByteBufferEquals(Unpooled.wrappedBuffer(this.amsPacketBytes), inboundAmsPacket);
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.protocol;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import org.apache.plc4x.java.ads.api.tcp.AmsTCPPacket;
+import org.apache.plc4x.java.ads.api.tcp.types.UserData;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+
+@RunWith(Parameterized.class)
+public class Payload2TcpProtocolTest extends AbstractProtocolTest {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(Payload2TcpProtocolTest.class);
+
+    private Payload2TcpProtocol SUT;
+
+    private ChannelHandlerContext channelHandlerContextMock;
+
+    @Parameterized.Parameter
+    public AmsTCPPacket amsTCPPacket;
+
+    @Parameterized.Parameter(1)
+    public String clazzName;
+
+    @Parameterized.Parameter(2)
+    public byte[] amsPacketBytes;
+
+    @Parameterized.Parameters(name = "{index} {1}")
+    public static Collection<Object[]> data() {
+        return amsPacketStream()
+            .map(amsPacket -> new Object[]{
+                AmsTCPPacket.of(UserData.of(amsPacket.getByteBuf())),
+                amsPacket.getClass().getSimpleName(),
+                amsPacket.getBytes()
+            })
+            .collect(Collectors.toList());
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        SUT = new Payload2TcpProtocol();
+        channelHandlerContextMock = mock(ChannelHandlerContext.class, RETURNS_DEEP_STUBS);
+        byte[] bytes = amsTCPPacket.getBytes();
+        LOGGER.info("amsPacket:\n{} has \n{}bytes\nHexDump:\n{}", amsTCPPacket, bytes.length, amsTCPPacket.dump());
+    }
+
+    @Test
+    public void encode() throws Exception {
+        ArrayList<Object> out = new ArrayList<>();
+        SUT.encode(channelHandlerContextMock, Unpooled.wrappedBuffer(amsPacketBytes), out);
+        assertEquals(1, out.size());
+        assertThat(out, hasSize(1));
+    }
+
+    @Test
+    public void decode() throws Exception {
+        ArrayList<Object> out = new ArrayList<>();
+        SUT.decode(channelHandlerContextMock, amsTCPPacket.getByteBuf(), out);
+        assertThat(out, hasSize(1));
+    }
+
+    @Test
+    public void roundTrip() throws Exception {
+        ArrayList<Object> outbound = new ArrayList<>();
+        SUT.encode(channelHandlerContextMock, Unpooled.wrappedBuffer(amsPacketBytes), outbound);
+        assertEquals(1, outbound.size());
+        assertThat(outbound, hasSize(1));
+        assertThat(outbound.get(0), instanceOf(ByteBuf.class));
+        ByteBuf byteBuf = (ByteBuf) outbound.get(0);
+        ArrayList<Object> inbound = new ArrayList<>();
+        SUT.decode(channelHandlerContextMock, byteBuf, inbound);
+        assertEquals(1, inbound.size());
+        assertThat(inbound, hasSize(1));
+        assertThat(inbound.get(0), instanceOf(ByteBuf.class));
+        ByteBuf inboundAmsPacket = (ByteBuf) inbound.get(0);
+        assertByteBufferEquals(Unpooled.wrappedBuffer(this.amsPacketBytes), inboundAmsPacket);
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocolTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocolTest.java
index 0ab4c676b0b..807c142f284 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocolTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocolTest.java
@@ -1,256 +1,256 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.protocol;
-
-import org.apache.commons.lang3.NotImplementedException;
-import org.apache.commons.lang3.RandomStringUtils;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.plc4x.java.ads.api.commands.AdsReadResponse;
-import org.apache.plc4x.java.ads.api.commands.AdsWriteRequest;
-import org.apache.plc4x.java.ads.api.commands.AdsWriteResponse;
-import org.apache.plc4x.java.ads.api.commands.types.Data;
-import org.apache.plc4x.java.ads.api.commands.types.Result;
-import org.apache.plc4x.java.ads.api.generic.AmsHeader;
-import org.apache.plc4x.java.ads.api.generic.AmsPacket;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-import org.apache.plc4x.java.ads.model.AdsDataType;
-import org.apache.plc4x.java.ads.model.AdsPlcFieldHandler;
-import org.apache.plc4x.java.base.messages.*;
-import org.apache.plc4x.java.mock.protocol.Plc4XSupportedDataTypes;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.apache.plc4x.java.mock.protocol.Plc4XSupportedDataTypes.streamOfLittleEndianDataTypePairs;
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assume.assumeThat;
-
-@RunWith(Parameterized.class)
-public class Plc4x2AdsProtocolTest {
-    private static final Logger LOGGER = LoggerFactory.getLogger(Plc4x2AdsProtocolTest.class);
-
-    private Plc4x2AdsProtocol SUT;
-
-    @Rule
-    public ExpectedException expectedException = ExpectedException.none();
-    private List<String> notYetSupportedDataType = Stream.of(
-        // We can add types which are not implemented in this protocol. The exception is currently a placeholder (empty list).
-        NotImplementedException.class
-    ).map(Class::getSimpleName).collect(Collectors.toList());
-
-    @Parameterized.Parameter
-    public String payloadClazzName;
-
-    @Parameterized.Parameter(1)
-    public PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> plcRequestContainer;
-
-    @Parameterized.Parameter(2)
-    public CompletableFuture completableFuture;
-
-    @Parameterized.Parameter(3)
-    public String plcRequestContainerClassName;
-
-    @Parameterized.Parameter(4)
-    public AmsPacket amsPacket;
-
-    @Parameterized.Parameter(5)
-    public String amsPacketClassName;
-
-    @Parameterized.Parameters(name = "{index} Type:{0} {3} {5}")
-    public static Collection<Object[]> data() {
-        AmsNetId targetAmsNetId = AmsNetId.of("1.2.3.4.5.6");
-        AmsPort targetAmsPort = AmsPort.of(7);
-        AmsNetId sourceAmsNetId = AmsNetId.of("8.9.10.11.12.13");
-        AmsPort sourceAmsPort = AmsPort.of(14);
-        Invoke invokeId = Invoke.of(2);
-        return streamOfLittleEndianDataTypePairs()
-            // TODO: calender doesnt work anymore so we might need to adjust the generator above.
-            .filter(o -> o.getDataTypeClass() != LocalDateTime.class)
-            .filter(o -> o.getDataTypeClass() != Byte[].class)
-            .filter(o -> o.getDataTypeClass() != byte[].class)
-            .map(Plc4x2AdsProtocolTest::mapToAdsDataType)
-            .map(pair -> Stream.of(
-                ImmutablePair.of(
-                    new PlcRequestContainer<>(
-                        (InternalPlcRequest) new DefaultPlcWriteRequest.Builder(null, new AdsPlcFieldHandler()) // TODO: remove null
-                            .addItem(RandomStringUtils.randomAscii(10), "1/1:" + pair.adsDataType.name(), pair.getValue())
-                            .build(), new CompletableFuture<>()),
-                    AdsWriteResponse.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, Result.of(0))
-                ),
-                ImmutablePair.of(
-                    new PlcRequestContainer<>(
-                        (InternalPlcRequest) new DefaultPlcReadRequest.Builder(null, new AdsPlcFieldHandler()) // TODO: remove null
-                            .addItem(RandomStringUtils.randomAscii(10), "1/1:" + pair.adsDataType.name())
-                            .build(), new CompletableFuture<>()),
-                    AdsReadResponse.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, Result.of(0), Data.of(pair.getByteRepresentation()))
-                )
-            ))
-            .flatMap(stream -> stream)
-            // TODO: request doesn't know its type anymore... fixme
-            .map(pair -> new Object[]{"???", pair.left, pair.left.getResponseFuture(), pair.left.getRequest().getClass().getSimpleName(), pair.right, pair.right.getClass().getSimpleName()}).collect(Collectors.toList());
-    }
-
-    private static AdsDataTypePair mapToAdsDataType(Plc4XSupportedDataTypes.DataTypePair dataTypePair) {
-        Map<Class<?>, AdsDataType> dataTypeMap = new HashMap<>();
-        dataTypeMap.put(Boolean.class, AdsDataType.BOOL);
-        dataTypeMap.put(Byte.class, AdsDataType.BYTE);
-        dataTypeMap.put(Short.class, AdsDataType.INT);
-        dataTypeMap.put(Integer.class, AdsDataType.INT32);
-        dataTypeMap.put(Long.class, AdsDataType.INT64);
-        dataTypeMap.put(BigInteger.class, AdsDataType.INT64);
-        dataTypeMap.put(Float.class, AdsDataType.REAL);
-        dataTypeMap.put(Double.class, AdsDataType.LREAL);
-        dataTypeMap.put(BigDecimal.class, AdsDataType.LREAL);
-        dataTypeMap.put(String.class, AdsDataType.STRING);
-        dataTypeMap.put(LocalTime.class, AdsDataType.TIME);
-        dataTypeMap.put(LocalDate.class, AdsDataType.DATE);
-        dataTypeMap.put(LocalDateTime.class, AdsDataType.DATE_AND_TIME);
-        dataTypeMap.put(byte[].class, AdsDataType.BYTE);
-        dataTypeMap.put(Byte[].class, AdsDataType.BYTE);
-        return new AdsDataTypePair(dataTypePair, dataTypeMap.get(dataTypePair.getDataTypeClass()));
-    }
-
-    private static class AdsDataTypePair extends Plc4XSupportedDataTypes.DataTypePair {
-
-        private final AdsDataType adsDataType;
-
-        private AdsDataTypePair(Plc4XSupportedDataTypes.DataTypePair dataTypePair, AdsDataType adsDataType) {
-            super(dataTypePair.getDataTypePair());
-            this.adsDataType = Objects.requireNonNull(adsDataType);
-        }
-    }
-
-    @Before
-    public void setUp() {
-        AmsNetId targetAmsNetId = AmsNetId.of("1.2.3.4.5.6");
-        AmsPort targetAmsPort = AmsPort.of(7);
-        AmsNetId sourceAmsNetId = AmsNetId.of("8.9.10.11.12.13");
-        AmsPort sourceAmsPort = AmsPort.of(14);
-        SUT = new Plc4x2AdsProtocol(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, new ConcurrentHashMap<>());
-    }
-
-    @Test
-    public void encode() throws Exception {
-        assumeThat(payloadClazzName + " not yet implemented", notYetSupportedDataType, not(hasItem(payloadClazzName)));
-        ArrayList<Object> out = new ArrayList<>();
-        SUT.encode(null, plcRequestContainer, out);
-        assertThat(out, hasSize(1));
-        assertThat(out.get(0), instanceOf(AmsPacket.class));
-        AmsPacket amsPacket = (AmsPacket) out.get(0);
-        LOGGER.info("{}\nHexDump:\n{}", amsPacket, amsPacket.dump());
-        if (amsPacket instanceof AdsWriteRequest) {
-            AdsWriteRequest adsWriteRequest = (AdsWriteRequest) amsPacket;
-            byte[] value = adsWriteRequest.getData().getBytes();
-            if (payloadClazzName.equals(Boolean.class.getSimpleName())) {
-                assertThat(value, equalTo(new byte[]{0x1}));
-            } else if (payloadClazzName.equals(Byte.class.getSimpleName())) {
-                assertThat(value, equalTo(new byte[]{0x1}));
-            } else if (payloadClazzName.equals(Short.class.getSimpleName())) {
-                assertThat(value, equalTo(new byte[]{0x1, 0x0}));
-            } else if (payloadClazzName.equals(Integer.class.getSimpleName())) {
-                assertThat(value, equalTo(new byte[]{0x1, 0x0, 0x0, 0x0}));
-            } else if (payloadClazzName.equals(Long.class.getSimpleName())) {
-                assertThat(value, equalTo(new byte[]{0x1, 0x0, 0x0, 0x0}));
-            } else if (payloadClazzName.equals(BigInteger.class.getSimpleName())) {
-                assertThat(value, equalTo(new byte[]{0x1, 0x0, 0x0, 0x0}));
-            } else if (payloadClazzName.equals(Float.class.getSimpleName())) {
-                assertThat(value, equalTo(new byte[]{0x0, 0x0, (byte) 0x80, 0x3F}));
-            } else if (payloadClazzName.equals(Double.class.getSimpleName())) {
-                assertThat(value, equalTo(new byte[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, (byte) 0xF0, 0x3F}));
-            } else if (payloadClazzName.equals(BigDecimal.class.getSimpleName())) {
-                assertThat(value, equalTo(new byte[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, (byte) 0xF0, 0x3F}));
-            } else if (payloadClazzName.equals(String.class.getSimpleName())) {
-                assertThat(value, equalTo(new byte[]{0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x21, 0x00}));
-            } else if (payloadClazzName.equals(LocalTime.class.getSimpleName())) {
-                assertThat(value, equalTo(new byte[]{0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x21, 0x00}));
-            } else if (payloadClazzName.equals(LocalDate.class.getSimpleName())) {
-                assertThat(value, equalTo(new byte[]{0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x21, 0x00}));
-            } else if (payloadClazzName.equals(LocalDateTime.class.getSimpleName())) {
-                assertThat(value, equalTo(new byte[]{0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x21, 0x00}));
-            } else if (payloadClazzName.equals(byte[].class.getSimpleName())) {
-                assertThat(value, equalTo(new byte[]{0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x21, 0x00}));
-            } else if (payloadClazzName.equals(Byte[].class.getSimpleName())) {
-                assertThat(value, equalTo(new byte[]{0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x21, 0x00}));
-            }
-        }
-    }
-
-    @Test
-    @Ignore("This test fails on Java 12 and above")
-    public void decode() throws Exception {
-        assumeThat(payloadClazzName + " not yet implemented", notYetSupportedDataType, not(hasItem(payloadClazzName)));
-        ArrayList<Object> in = new ArrayList<>();
-        SUT.encode(null, plcRequestContainer, in);
-        assertThat(in, hasSize(1));
-        syncInvoiceId();
-        ArrayList<Object> out = new ArrayList<>();
-        LOGGER.info("{}\nHexDump:\n{}", amsPacket, amsPacket.dump());
-        SUT.decode(null, amsPacket, out);
-        assertThat(out, hasSize(0));
-        LOGGER.info("PlcRequestContainer {}", plcRequestContainer);
-        InternalPlcResponse plcResponse = plcRequestContainer.getResponseFuture().get();
-        // TODO: FIXME: this is different now after refactoring
-        //ResponseItem responseItem = (ResponseItem) plcResponse.getResponseItem().get();
-        //LOGGER.info("ResponseItem {}", responseItem);
-        if (amsPacket instanceof AdsReadResponse) {
-            // TODO: FIXME: this is different now after refactoring
-            //PlcReadResponseItem readResponseItem = (PlcReadResponseItem) responseItem;
-            //Object value = readResponseItem.getValues().get(0);
-            //defaultAssert(value);
-        }
-    }
-
-    private void syncInvoiceId() throws Exception {
-        Field correlationBuilderField = SUT.getClass().getDeclaredField("correlationBuilder");
-        correlationBuilderField.setAccessible(true);
-        AtomicLong correlationBuilder = (AtomicLong) correlationBuilderField.get(SUT);
-
-        AmsHeader amsHeader = amsPacket.getAmsHeader();
-        Field invokeIdField = amsHeader.getClass().getDeclaredField("invokeId");
-        Field modifiersField = Field.class.getDeclaredField("modifiers");
-        modifiersField.setAccessible(true);
-        modifiersField.setInt(invokeIdField, invokeIdField.getModifiers() & ~Modifier.FINAL);
-        invokeIdField.setAccessible(true);
-        invokeIdField.set(amsHeader, Invoke.of(correlationBuilder.get()));
-    }
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.protocol;
+
+import org.apache.commons.lang3.NotImplementedException;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.plc4x.java.ads.api.commands.AdsReadResponse;
+import org.apache.plc4x.java.ads.api.commands.AdsWriteRequest;
+import org.apache.plc4x.java.ads.api.commands.AdsWriteResponse;
+import org.apache.plc4x.java.ads.api.commands.types.Data;
+import org.apache.plc4x.java.ads.api.commands.types.Result;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.AmsPacket;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+import org.apache.plc4x.java.ads.model.AdsDataType;
+import org.apache.plc4x.java.ads.model.AdsPlcFieldHandler;
+import org.apache.plc4x.java.base.messages.*;
+import org.apache.plc4x.java.mock.protocol.Plc4XSupportedDataTypes;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.apache.plc4x.java.mock.protocol.Plc4XSupportedDataTypes.streamOfLittleEndianDataTypePairs;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assume.assumeThat;
+
+@RunWith(Parameterized.class)
+public class Plc4x2AdsProtocolTest {
+    private static final Logger LOGGER = LoggerFactory.getLogger(Plc4x2AdsProtocolTest.class);
+
+    private Plc4x2AdsProtocol SUT;
+
+    @Rule
+    public ExpectedException expectedException = ExpectedException.none();
+    private List<String> notYetSupportedDataType = Stream.of(
+        // We can add types which are not implemented in this protocol. The exception is currently a placeholder (empty list).
+        NotImplementedException.class
+    ).map(Class::getSimpleName).collect(Collectors.toList());
+
+    @Parameterized.Parameter
+    public String payloadClazzName;
+
+    @Parameterized.Parameter(1)
+    public PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> plcRequestContainer;
+
+    @Parameterized.Parameter(2)
+    public CompletableFuture completableFuture;
+
+    @Parameterized.Parameter(3)
+    public String plcRequestContainerClassName;
+
+    @Parameterized.Parameter(4)
+    public AmsPacket amsPacket;
+
+    @Parameterized.Parameter(5)
+    public String amsPacketClassName;
+
+    @Parameterized.Parameters(name = "{index} Type:{0} {3} {5}")
+    public static Collection<Object[]> data() {
+        AmsNetId targetAmsNetId = AmsNetId.of("1.2.3.4.5.6");
+        AmsPort targetAmsPort = AmsPort.of(7);
+        AmsNetId sourceAmsNetId = AmsNetId.of("8.9.10.11.12.13");
+        AmsPort sourceAmsPort = AmsPort.of(14);
+        Invoke invokeId = Invoke.of(2);
+        return streamOfLittleEndianDataTypePairs()
+            // TODO: calender doesnt work anymore so we might need to adjust the generator above.
+            .filter(o -> o.getDataTypeClass() != LocalDateTime.class)
+            .filter(o -> o.getDataTypeClass() != Byte[].class)
+            .filter(o -> o.getDataTypeClass() != byte[].class)
+            .map(Plc4x2AdsProtocolTest::mapToAdsDataType)
+            .map(pair -> Stream.of(
+                ImmutablePair.of(
+                    new PlcRequestContainer<>(
+                        (InternalPlcRequest) new DefaultPlcWriteRequest.Builder(null, new AdsPlcFieldHandler()) // TODO: remove null
+                            .addItem(RandomStringUtils.randomAscii(10), "1/1:" + pair.adsDataType.name(), pair.getValue())
+                            .build(), new CompletableFuture<>()),
+                    AdsWriteResponse.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, Result.of(0))
+                ),
+                ImmutablePair.of(
+                    new PlcRequestContainer<>(
+                        (InternalPlcRequest) new DefaultPlcReadRequest.Builder(null, new AdsPlcFieldHandler()) // TODO: remove null
+                            .addItem(RandomStringUtils.randomAscii(10), "1/1:" + pair.adsDataType.name())
+                            .build(), new CompletableFuture<>()),
+                    AdsReadResponse.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, Result.of(0), Data.of(pair.getByteRepresentation()))
+                )
+            ))
+            .flatMap(stream -> stream)
+            // TODO: request doesn't know its type anymore... fixme
+            .map(pair -> new Object[]{"???", pair.left, pair.left.getResponseFuture(), pair.left.getRequest().getClass().getSimpleName(), pair.right, pair.right.getClass().getSimpleName()}).collect(Collectors.toList());
+    }
+
+    private static AdsDataTypePair mapToAdsDataType(Plc4XSupportedDataTypes.DataTypePair dataTypePair) {
+        Map<Class<?>, AdsDataType> dataTypeMap = new HashMap<>();
+        dataTypeMap.put(Boolean.class, AdsDataType.BOOL);
+        dataTypeMap.put(Byte.class, AdsDataType.BYTE);
+        dataTypeMap.put(Short.class, AdsDataType.INT);
+        dataTypeMap.put(Integer.class, AdsDataType.INT32);
+        dataTypeMap.put(Long.class, AdsDataType.INT64);
+        dataTypeMap.put(BigInteger.class, AdsDataType.INT64);
+        dataTypeMap.put(Float.class, AdsDataType.REAL);
+        dataTypeMap.put(Double.class, AdsDataType.LREAL);
+        dataTypeMap.put(BigDecimal.class, AdsDataType.LREAL);
+        dataTypeMap.put(String.class, AdsDataType.STRING);
+        dataTypeMap.put(LocalTime.class, AdsDataType.TIME);
+        dataTypeMap.put(LocalDate.class, AdsDataType.DATE);
+        dataTypeMap.put(LocalDateTime.class, AdsDataType.DATE_AND_TIME);
+        dataTypeMap.put(byte[].class, AdsDataType.BYTE);
+        dataTypeMap.put(Byte[].class, AdsDataType.BYTE);
+        return new AdsDataTypePair(dataTypePair, dataTypeMap.get(dataTypePair.getDataTypeClass()));
+    }
+
+    private static class AdsDataTypePair extends Plc4XSupportedDataTypes.DataTypePair {
+
+        private final AdsDataType adsDataType;
+
+        private AdsDataTypePair(Plc4XSupportedDataTypes.DataTypePair dataTypePair, AdsDataType adsDataType) {
+            super(dataTypePair.getDataTypePair());
+            this.adsDataType = Objects.requireNonNull(adsDataType);
+        }
+    }
+
+    @Before
+    public void setUp() {
+        AmsNetId targetAmsNetId = AmsNetId.of("1.2.3.4.5.6");
+        AmsPort targetAmsPort = AmsPort.of(7);
+        AmsNetId sourceAmsNetId = AmsNetId.of("8.9.10.11.12.13");
+        AmsPort sourceAmsPort = AmsPort.of(14);
+        SUT = new Plc4x2AdsProtocol(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, new ConcurrentHashMap<>());
+    }
+
+    @Test
+    public void encode() throws Exception {
+        assumeThat(payloadClazzName + " not yet implemented", notYetSupportedDataType, not(hasItem(payloadClazzName)));
+        ArrayList<Object> out = new ArrayList<>();
+        SUT.encode(null, plcRequestContainer, out);
+        assertThat(out, hasSize(1));
+        assertThat(out.get(0), instanceOf(AmsPacket.class));
+        AmsPacket amsPacket = (AmsPacket) out.get(0);
+        LOGGER.info("{}\nHexDump:\n{}", amsPacket, amsPacket.dump());
+        if (amsPacket instanceof AdsWriteRequest) {
+            AdsWriteRequest adsWriteRequest = (AdsWriteRequest) amsPacket;
+            byte[] value = adsWriteRequest.getData().getBytes();
+            if (payloadClazzName.equals(Boolean.class.getSimpleName())) {
+                assertThat(value, equalTo(new byte[]{0x1}));
+            } else if (payloadClazzName.equals(Byte.class.getSimpleName())) {
+                assertThat(value, equalTo(new byte[]{0x1}));
+            } else if (payloadClazzName.equals(Short.class.getSimpleName())) {
+                assertThat(value, equalTo(new byte[]{0x1, 0x0}));
+            } else if (payloadClazzName.equals(Integer.class.getSimpleName())) {
+                assertThat(value, equalTo(new byte[]{0x1, 0x0, 0x0, 0x0}));
+            } else if (payloadClazzName.equals(Long.class.getSimpleName())) {
+                assertThat(value, equalTo(new byte[]{0x1, 0x0, 0x0, 0x0}));
+            } else if (payloadClazzName.equals(BigInteger.class.getSimpleName())) {
+                assertThat(value, equalTo(new byte[]{0x1, 0x0, 0x0, 0x0}));
+            } else if (payloadClazzName.equals(Float.class.getSimpleName())) {
+                assertThat(value, equalTo(new byte[]{0x0, 0x0, (byte) 0x80, 0x3F}));
+            } else if (payloadClazzName.equals(Double.class.getSimpleName())) {
+                assertThat(value, equalTo(new byte[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, (byte) 0xF0, 0x3F}));
+            } else if (payloadClazzName.equals(BigDecimal.class.getSimpleName())) {
+                assertThat(value, equalTo(new byte[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, (byte) 0xF0, 0x3F}));
+            } else if (payloadClazzName.equals(String.class.getSimpleName())) {
+                assertThat(value, equalTo(new byte[]{0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x21, 0x00}));
+            } else if (payloadClazzName.equals(LocalTime.class.getSimpleName())) {
+                assertThat(value, equalTo(new byte[]{0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x21, 0x00}));
+            } else if (payloadClazzName.equals(LocalDate.class.getSimpleName())) {
+                assertThat(value, equalTo(new byte[]{0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x21, 0x00}));
+            } else if (payloadClazzName.equals(LocalDateTime.class.getSimpleName())) {
+                assertThat(value, equalTo(new byte[]{0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x21, 0x00}));
+            } else if (payloadClazzName.equals(byte[].class.getSimpleName())) {
+                assertThat(value, equalTo(new byte[]{0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x21, 0x00}));
+            } else if (payloadClazzName.equals(Byte[].class.getSimpleName())) {
+                assertThat(value, equalTo(new byte[]{0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x21, 0x00}));
+            }
+        }
+    }
+
+    @Test
+    @Ignore("This test fails on Java 12 and above")
+    public void decode() throws Exception {
+        assumeThat(payloadClazzName + " not yet implemented", notYetSupportedDataType, not(hasItem(payloadClazzName)));
+        ArrayList<Object> in = new ArrayList<>();
+        SUT.encode(null, plcRequestContainer, in);
+        assertThat(in, hasSize(1));
+        syncInvoiceId();
+        ArrayList<Object> out = new ArrayList<>();
+        LOGGER.info("{}\nHexDump:\n{}", amsPacket, amsPacket.dump());
+        SUT.decode(null, amsPacket, out);
+        assertThat(out, hasSize(0));
+        LOGGER.info("PlcRequestContainer {}", plcRequestContainer);
+        InternalPlcResponse plcResponse = plcRequestContainer.getResponseFuture().get();
+        // TODO: FIXME: this is different now after refactoring
+        //ResponseItem responseItem = (ResponseItem) plcResponse.getResponseItem().get();
+        //LOGGER.info("ResponseItem {}", responseItem);
+        if (amsPacket instanceof AdsReadResponse) {
+            // TODO: FIXME: this is different now after refactoring
+            //PlcReadResponseItem readResponseItem = (PlcReadResponseItem) responseItem;
+            //Object value = readResponseItem.getValues().get(0);
+            //defaultAssert(value);
+        }
+    }
+
+    private void syncInvoiceId() throws Exception {
+        Field correlationBuilderField = SUT.getClass().getDeclaredField("correlationBuilder");
+        correlationBuilderField.setAccessible(true);
+        AtomicLong correlationBuilder = (AtomicLong) correlationBuilderField.get(SUT);
+
+        AmsHeader amsHeader = amsPacket.getAmsHeader();
+        Field invokeIdField = amsHeader.getClass().getDeclaredField("invokeId");
+        Field modifiersField = Field.class.getDeclaredField("modifiers");
+        modifiersField.setAccessible(true);
+        modifiersField.setInt(invokeIdField, invokeIdField.getModifiers() & ~Modifier.FINAL);
+        invokeIdField.setAccessible(true);
+        invokeIdField.set(amsHeader, Invoke.of(correlationBuilder.get()));
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/util/DigestUtilTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/util/DigestUtilTest.java
index b0c99e06bc7..28a221e942c 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/util/DigestUtilTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/util/DigestUtilTest.java
@@ -1,146 +1,146 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ads.protocol.util;
-
-import com.github.snksoft.crc.CRC;
-import io.netty.buffer.Unpooled;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-
-import static org.apache.plc4x.java.mock.util.Assert.assertByteEquals;
-import static org.junit.Assert.assertEquals;
-
-public class DigestUtilTest {
-
-    @Test
-    public void sameCalculation() {
-        assertEquals(
-            DigestUtil.calculateCrc16(new byte[]{47, 99}),
-            DigestUtil.calculateCrc16(() -> Unpooled.wrappedBuffer(new byte[]{47}), () -> Unpooled.wrappedBuffer(new byte[]{99})));
-    }
-
-    @Test
-    public void simpleUnwrap() {
-        assertEquals(
-            DigestUtil.calculateCrc16(new byte[]{47}),
-            DigestUtil.calculateCrc16(() -> Unpooled.wrappedBuffer(new byte[]{47})));
-    }
-
-    @Test
-    public void displayValue() {
-        Object[] crcs = IntStream.range(0, 256)
-            .map(value -> DigestUtil.calculateCrc16(new byte[]{(byte) value}))
-            .mapToObj(Integer::toHexString)
-            .map(s -> StringUtils.leftPad(s, 4, '0'))
-            .toArray(String[]::new);
-        for (int i = 0; i < 32; i++) {
-            String col1 = "" + (i) + '\t' + crcs[i];
-            String col2 = "" + (i + 32) + '\t' + crcs[i + 32];
-            String col3 = "" + (i + 64) + '\t' + crcs[i + 64];
-            String col4 = "" + (i + 96) + '\t' + crcs[i + 96];
-            String col5 = "" + (i + 128) + '\t' + crcs[i + 128];
-            String col6 = "" + (i + 160) + '\t' + crcs[i + 160];
-            String col7 = "" + (i + 192) + '\t' + crcs[i + 192];
-            String col8 = "" + (i + 224) + '\t' + crcs[i + 224];
-            System.out.println(col1 + "\t\t" + col2 + "\t\t" + col3 + "\t\t" + col4 + "\t\t" + col5 + "\t\t" + col6 + "\t\t" + col7 + "\t\t" + col8);
-        }
-    }
-
-    @Ignore("This test is used to find proper crc parameters and can be run manually")
-    @Test
-    public void findRightAdsCrc() throws Exception {
-        int[] exampleResponseInt = {
-            /*Magic Cookie     */    0x01, 0xA5,
-            /*Sender           */    0x00,
-            /*Empfaenger       */    0x00,
-            /*Fragmentnummer   */    0xEC,
-            /*Anzahl Daten     */    0x2A,
-            /*NetID Empfaenger */    0xC0, 0xA8, 0x64, 0x9C, 0x01, 0x01,
-            /*Portnummer       */    0x01, 0x80,
-            /*NetID Sender     */    0xC0, 0xA8, 0x64, 0xAE, 0x01, 0x01,
-            /*Portnummer       */    0x21, 0x03,
-            /*Response Lesen   */    0x02, 0x00,
-            /*Status           */    0x05, 0x00,
-            /*Anzahl Daten     */    0x0A, 0x00, 0x00, 0x00,
-            /*Fehlercode       */    0x00, 0x00, 0x00, 0x00,
-            /*InvokeID         */    0x07, 0x00, 0x00, 0x00,
-            /*Ergebnis         */    0x00, 0x00, 0x00, 0x00,
-            /*Anzahl Daten     */    0x02, 0x00, 0x00, 0x00,
-            /*Daten            */    0xAF, 0x27,
-            /*Checksumme       */    0x04, 0xA9,
-        };
-        byte[] exampleResponse = ArrayUtils.toPrimitive(Arrays
-            .stream(exampleResponseInt)
-            .mapToObj(value -> (byte) value)
-            .toArray(Byte[]::new));
-        int crcField1Index = exampleResponse.length - 2;
-        assertByteEquals((byte) 0x04, exampleResponse[crcField1Index]);
-        int crcField2Index = exampleResponse.length - 1;
-        assertByteEquals((byte) 0xA9, exampleResponse[crcField2Index]);
-
-        IntStream.range(0, 0xFFFF).forEach(polynomial -> {
-                //int polynomial = 0x8005;
-                IntStream.of(0x0000, 0xFFFF).forEach(init -> {
-                    //int init = 0x0000;
-                    Stream.of(true, false).forEach(reflectIn -> {
-                        //boolean reflectIn = true;
-                        Stream.of(true, false).forEach(reflectOut -> {
-                            //boolean reflectOut = true;
-                            // TODO: check if we can check for finalxor at all
-                            int finalXor = 0x0;
-                            CRC.Parameters params = new CRC.Parameters(16, polynomial, init, reflectIn, reflectOut, finalXor);
-                            String paramString = ""
-                                + "polynomial=0x" + StringUtils.leftPad(Integer.toHexString(polynomial), 4, '0')
-                                + ", init=0x" + StringUtils.leftPad(Integer.toHexString(init), 4, '0')
-                                + ", reflectIn=" + reflectIn
-                                + ", reflectOut=" + reflectOut
-                                + ", finalXor=" + StringUtils.leftPad(Integer.toHexString(finalXor), 4, '0') + "";
-                            CRC crcCalculator = new CRC(params);
-                            long currentCrc = crcCalculator.update(crcCalculator.init(), Arrays.copyOfRange(exampleResponse, 0, crcField1Index));
-                            short crc16 = crcCalculator.finalCRC16(currentCrc);
-                            ByteBuffer buffer = ByteBuffer.allocate(2);
-                            buffer.putShort(crc16);
-                            byte[] bytes = buffer.array();
-                            byte msb = bytes[0];
-                            byte lsb = bytes[1];
-                            if (lsb == exampleResponse[crcField1Index] && msb == exampleResponse[crcField2Index]) {
-                                System.out.println("We found a LE: " + paramString);
-                            }
-                            if (lsb == exampleResponse[crcField2Index] && msb == exampleResponse[crcField1Index]) {
-                                System.out.println("We found a BE " + paramString);
-                            }
-                            if (lsb == exampleResponse[crcField1Index] || msb == exampleResponse[crcField2Index]) {
-                                //System.out.println("We found a LE one of them");
-                            } else if (lsb == exampleResponse[crcField2Index] || msb == exampleResponse[crcField1Index]) {
-                                //System.out.println("We found a BE one of them");
-                            }
-                        });
-                    });
-                });
-            }
-        );
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.protocol.util;
+
+import com.github.snksoft.crc.CRC;
+import io.netty.buffer.Unpooled;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import static org.apache.plc4x.java.mock.util.Assert.assertByteEquals;
+import static org.junit.Assert.assertEquals;
+
+public class DigestUtilTest {
+
+    @Test
+    public void sameCalculation() {
+        assertEquals(
+            DigestUtil.calculateCrc16(new byte[]{47, 99}),
+            DigestUtil.calculateCrc16(() -> Unpooled.wrappedBuffer(new byte[]{47}), () -> Unpooled.wrappedBuffer(new byte[]{99})));
+    }
+
+    @Test
+    public void simpleUnwrap() {
+        assertEquals(
+            DigestUtil.calculateCrc16(new byte[]{47}),
+            DigestUtil.calculateCrc16(() -> Unpooled.wrappedBuffer(new byte[]{47})));
+    }
+
+    @Test
+    public void displayValue() {
+        Object[] crcs = IntStream.range(0, 256)
+            .map(value -> DigestUtil.calculateCrc16(new byte[]{(byte) value}))
+            .mapToObj(Integer::toHexString)
+            .map(s -> StringUtils.leftPad(s, 4, '0'))
+            .toArray(String[]::new);
+        for (int i = 0; i < 32; i++) {
+            String col1 = "" + (i) + '\t' + crcs[i];
+            String col2 = "" + (i + 32) + '\t' + crcs[i + 32];
+            String col3 = "" + (i + 64) + '\t' + crcs[i + 64];
+            String col4 = "" + (i + 96) + '\t' + crcs[i + 96];
+            String col5 = "" + (i + 128) + '\t' + crcs[i + 128];
+            String col6 = "" + (i + 160) + '\t' + crcs[i + 160];
+            String col7 = "" + (i + 192) + '\t' + crcs[i + 192];
+            String col8 = "" + (i + 224) + '\t' + crcs[i + 224];
+            System.out.println(col1 + "\t\t" + col2 + "\t\t" + col3 + "\t\t" + col4 + "\t\t" + col5 + "\t\t" + col6 + "\t\t" + col7 + "\t\t" + col8);
+        }
+    }
+
+    @Ignore("This test is used to find proper crc parameters and can be run manually")
+    @Test
+    public void findRightAdsCrc() throws Exception {
+        int[] exampleResponseInt = {
+            /*Magic Cookie     */    0x01, 0xA5,
+            /*Sender           */    0x00,
+            /*Empfaenger       */    0x00,
+            /*Fragmentnummer   */    0xEC,
+            /*Anzahl Daten     */    0x2A,
+            /*NetID Empfaenger */    0xC0, 0xA8, 0x64, 0x9C, 0x01, 0x01,
+            /*Portnummer       */    0x01, 0x80,
+            /*NetID Sender     */    0xC0, 0xA8, 0x64, 0xAE, 0x01, 0x01,
+            /*Portnummer       */    0x21, 0x03,
+            /*Response Lesen   */    0x02, 0x00,
+            /*Status           */    0x05, 0x00,
+            /*Anzahl Daten     */    0x0A, 0x00, 0x00, 0x00,
+            /*Fehlercode       */    0x00, 0x00, 0x00, 0x00,
+            /*InvokeID         */    0x07, 0x00, 0x00, 0x00,
+            /*Ergebnis         */    0x00, 0x00, 0x00, 0x00,
+            /*Anzahl Daten     */    0x02, 0x00, 0x00, 0x00,
+            /*Daten            */    0xAF, 0x27,
+            /*Checksumme       */    0x04, 0xA9,
+        };
+        byte[] exampleResponse = ArrayUtils.toPrimitive(Arrays
+            .stream(exampleResponseInt)
+            .mapToObj(value -> (byte) value)
+            .toArray(Byte[]::new));
+        int crcField1Index = exampleResponse.length - 2;
+        assertByteEquals((byte) 0x04, exampleResponse[crcField1Index]);
+        int crcField2Index = exampleResponse.length - 1;
+        assertByteEquals((byte) 0xA9, exampleResponse[crcField2Index]);
+
+        IntStream.range(0, 0xFFFF).forEach(polynomial -> {
+                //int polynomial = 0x8005;
+                IntStream.of(0x0000, 0xFFFF).forEach(init -> {
+                    //int init = 0x0000;
+                    Stream.of(true, false).forEach(reflectIn -> {
+                        //boolean reflectIn = true;
+                        Stream.of(true, false).forEach(reflectOut -> {
+                            //boolean reflectOut = true;
+                            // TODO: check if we can check for finalxor at all
+                            int finalXor = 0x0;
+                            CRC.Parameters params = new CRC.Parameters(16, polynomial, init, reflectIn, reflectOut, finalXor);
+                            String paramString = ""
+                                + "polynomial=0x" + StringUtils.leftPad(Integer.toHexString(polynomial), 4, '0')
+                                + ", init=0x" + StringUtils.leftPad(Integer.toHexString(init), 4, '0')
+                                + ", reflectIn=" + reflectIn
+                                + ", reflectOut=" + reflectOut
+                                + ", finalXor=" + StringUtils.leftPad(Integer.toHexString(finalXor), 4, '0') + "";
+                            CRC crcCalculator = new CRC(params);
+                            long currentCrc = crcCalculator.update(crcCalculator.init(), Arrays.copyOfRange(exampleResponse, 0, crcField1Index));
+                            short crc16 = crcCalculator.finalCRC16(currentCrc);
+                            ByteBuffer buffer = ByteBuffer.allocate(2);
+                            buffer.putShort(crc16);
+                            byte[] bytes = buffer.array();
+                            byte msb = bytes[0];
+                            byte lsb = bytes[1];
+                            if (lsb == exampleResponse[crcField1Index] && msb == exampleResponse[crcField2Index]) {
+                                System.out.println("We found a LE: " + paramString);
+                            }
+                            if (lsb == exampleResponse[crcField2Index] && msb == exampleResponse[crcField1Index]) {
+                                System.out.println("We found a BE " + paramString);
+                            }
+                            if (lsb == exampleResponse[crcField1Index] || msb == exampleResponse[crcField2Index]) {
+                                //System.out.println("We found a LE one of them");
+                            } else if (lsb == exampleResponse[crcField2Index] || msb == exampleResponse[crcField1Index]) {
+                                //System.out.println("We found a BE one of them");
+                            }
+                        });
+                    });
+                });
+            }
+        );
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/resources/logback.xml b/plc4j/protocols/ads/src/test/resources/logback.xml
index dd243bdcf73..8a965dcd06c 100644
--- a/plc4j/protocols/ads/src/test/resources/logback.xml
+++ b/plc4j/protocols/ads/src/test/resources/logback.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="
-                  http://ch.qos.logback/xml/ns/logback
-                  https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoders are assigned the type
-         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="info">
-    <appender-ref ref="STDOUT" />
-  </root>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="
+                  http://ch.qos.logback/xml/ns/logback
+                  https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="info">
+    <appender-ref ref="STDOUT" />
+  </root>
+
 </configuration>
\ No newline at end of file
diff --git a/plc4j/protocols/benchmarks/README.md b/plc4j/protocols/benchmarks/README.md
index adafdc0875d..2c144a39d7c 100644
--- a/plc4j/protocols/benchmarks/README.md
+++ b/plc4j/protocols/benchmarks/README.md
@@ -1,30 +1,30 @@
-<!--
-
-  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
-
-      http://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.
-
--->
-The benchmarks module contains micro-benchmarks for multiple protocols.
-
-It uses JMH for benchmarking (http://openjdk.java.net/projects/code-tools/jmh/)
-
-The recommendation from JMH id to run bechmarks in a separate module like this one:
-
-_The recommended way to run a JMH benchmark is to use Maven to setup a standalone project that depends on the jar files of your application. This approach is preferred to ensure that the benchmarks are correctly initialized and produce reliable results. It is possible to run benchmarks from within an existing project, and even from within an IDE, however setup is more complex and the results are less reliable._
-Source: http://openjdk.java.net/projects/code-tools/jmh/
-
-To run the test you can use a plugin for your IDE. If you want to use maven you can use the profile `run-benchmark`:
-
+<!--
+
+  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
+
+      http://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.
+
+-->
+The benchmarks module contains micro-benchmarks for multiple protocols.
+
+It uses JMH for benchmarking (http://openjdk.java.net/projects/code-tools/jmh/)
+
+The recommendation from JMH id to run bechmarks in a separate module like this one:
+
+_The recommended way to run a JMH benchmark is to use Maven to setup a standalone project that depends on the jar files of your application. This approach is preferred to ensure that the benchmarks are correctly initialized and produce reliable results. It is possible to run benchmarks from within an existing project, and even from within an IDE, however setup is more complex and the results are less reliable._
+Source: http://openjdk.java.net/projects/code-tools/jmh/
+
+To run the test you can use a plugin for your IDE. If you want to use maven you can use the profile `run-benchmark`:
+
 `mvn -Prun-benchmark verify`
\ No newline at end of file
diff --git a/plc4j/protocols/benchmarks/pom.xml b/plc4j/protocols/benchmarks/pom.xml
index 1470ff7dffb..32b449442ea 100644
--- a/plc4j/protocols/benchmarks/pom.xml
+++ b/plc4j/protocols/benchmarks/pom.xml
@@ -1,151 +1,151 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-    http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <artifactId>plc4j-protocols</artifactId>
-    <groupId>org.apache.plc4x</groupId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-protocol-benchmarks</artifactId>
-  <name>PLC4J: Protocol: Benchmarks</name>
-  <description>Runs benchmarks on ads protocols</description>
-
-  <properties>
-    <jmh.version>1.20</jmh.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-ads</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-buffer</artifactId>
-    </dependency>
-    <!-- GNU General Public License (GPL), version 2, with the Classpath exception see https://commons.apache.org/proper/commons-lang/dependencies.html-->
-    <dependency>
-      <groupId>org.openjdk.jmh</groupId>
-      <artifactId>jmh-core</artifactId>
-    </dependency>
-    <!-- GNU General Public License (GPL), version 2, with the Classpath exception see https://commons.apache.org/proper/commons-lang/dependencies.html-->
-    <dependency>
-      <groupId>org.openjdk.jmh</groupId>
-      <artifactId>jmh-generator-annprocess</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <!-- TODO: we might run this tests with a maven plugin-->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <finalName>benchmarks</finalName>
-              <transformers>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                  <mainClass>org.openjdk.jmh.Main</mainClass>
-                </transformer>
-              </transformers>
-              <filters>
-                <filter>
-                  <!--
-                      Shading signed JARs will fail without this.
-                      http://stackoverflow.com/questions/999489/invalid-signature-file-when-attempting-to-run-a-jar
-                  -->
-                  <artifact>*:*</artifact>
-                  <excludes>
-                    <exclude>META-INF/*.SF</exclude>
-                    <exclude>META-INF/*.DSA</exclude>
-                    <exclude>META-INF/*.RSA</exclude>
-                  </excludes>
-                </filter>
-              </filters>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <usedDependencies>
-            <usedDependency>org.openjdk.jmh:jmh-generator-annprocess</usedDependency>
-          </usedDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>run-benchmark</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>exec-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>run-benchmarks</id>
-                <phase>integration-test</phase>
-                <goals>
-                  <goal>exec</goal>
-                </goals>
-                <configuration>
-                  <classpathScope>test</classpathScope>
-                  <executable>${java.home}/bin/java</executable>
-                  <arguments>
-                    <argument>-classpath</argument>
-                    <classpath />
-                    <argument>org.openjdk.jmh.Main</argument>
-                    <argument>.*</argument>
-                    <!-- Optional profiling showing a stack profile -->
-                    <argument>-prof</argument>
-                    <argument>stack</argument>
-                  </arguments>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+    http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <artifactId>plc4j-protocols</artifactId>
+    <groupId>org.apache.plc4x</groupId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-protocol-benchmarks</artifactId>
+  <name>PLC4J: Protocol: Benchmarks</name>
+  <description>Runs benchmarks on ads protocols</description>
+
+  <properties>
+    <jmh.version>1.20</jmh.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-ads</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+    </dependency>
+    <!-- GNU General Public License (GPL), version 2, with the Classpath exception see https://commons.apache.org/proper/commons-lang/dependencies.html-->
+    <dependency>
+      <groupId>org.openjdk.jmh</groupId>
+      <artifactId>jmh-core</artifactId>
+    </dependency>
+    <!-- GNU General Public License (GPL), version 2, with the Classpath exception see https://commons.apache.org/proper/commons-lang/dependencies.html-->
+    <dependency>
+      <groupId>org.openjdk.jmh</groupId>
+      <artifactId>jmh-generator-annprocess</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <!-- TODO: we might run this tests with a maven plugin-->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <finalName>benchmarks</finalName>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>org.openjdk.jmh.Main</mainClass>
+                </transformer>
+              </transformers>
+              <filters>
+                <filter>
+                  <!--
+                      Shading signed JARs will fail without this.
+                      http://stackoverflow.com/questions/999489/invalid-signature-file-when-attempting-to-run-a-jar
+                  -->
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/*.SF</exclude>
+                    <exclude>META-INF/*.DSA</exclude>
+                    <exclude>META-INF/*.RSA</exclude>
+                  </excludes>
+                </filter>
+              </filters>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <usedDependencies>
+            <usedDependency>org.openjdk.jmh:jmh-generator-annprocess</usedDependency>
+          </usedDependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>run-benchmark</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>run-benchmarks</id>
+                <phase>integration-test</phase>
+                <goals>
+                  <goal>exec</goal>
+                </goals>
+                <configuration>
+                  <classpathScope>test</classpathScope>
+                  <executable>${java.home}/bin/java</executable>
+                  <arguments>
+                    <argument>-classpath</argument>
+                    <classpath />
+                    <argument>org.openjdk.jmh.Main</argument>
+                    <argument>.*</argument>
+                    <!-- Optional profiling showing a stack profile -->
+                    <argument>-prof</argument>
+                    <argument>stack</argument>
+                  </arguments>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+</project>
diff --git a/plc4j/protocols/benchmarks/src/main/java/org/apache/plc4x/java/ads/protocol/ADSProtocolBenchmark.java b/plc4j/protocols/benchmarks/src/main/java/org/apache/plc4x/java/ads/protocol/ADSProtocolBenchmark.java
index 3dd534031b8..7dff7c561e4 100644
--- a/plc4j/protocols/benchmarks/src/main/java/org/apache/plc4x/java/ads/protocol/ADSProtocolBenchmark.java
+++ b/plc4j/protocols/benchmarks/src/main/java/org/apache/plc4x/java/ads/protocol/ADSProtocolBenchmark.java
@@ -1,164 +1,164 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.ads.protocol;
-
-import io.netty.buffer.Unpooled;
-import org.apache.plc4x.java.ads.api.commands.AdsReadRequest;
-import org.apache.plc4x.java.ads.api.commands.AdsReadResponse;
-import org.apache.plc4x.java.ads.api.commands.AdsWriteRequest;
-import org.apache.plc4x.java.ads.api.commands.AdsWriteResponse;
-import org.apache.plc4x.java.ads.api.commands.types.*;
-import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
-import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-import org.openjdk.jmh.annotations.*;
-import org.openjdk.jmh.infra.Blackhole;
-
-import java.util.LinkedList;
-import java.util.concurrent.TimeUnit;
-
-public class ADSProtocolBenchmark {
-
-    @State(Scope.Benchmark)
-    public static class MyState {
-        Ads2PayloadProtocol SUT = new Ads2PayloadProtocol();
-        AdsWriteRequest adsWriteRequest = buildAdsWriteRequest();
-        byte[] adsWriteResponse = buildADSWriteResponse();
-        AdsReadRequest adsReadRequest = buildAdsReadRequest();
-        byte[] adsReadResponse = buildADSReadResponse();
-
-        @Setup(Level.Trial)
-        public void doSetup() {
-            System.out.println("Do Setup");
-        }
-
-        @TearDown(Level.Iteration)
-        public void doTearDown() {
-            System.out.println("Do TearDown");
-            SUT.reset();
-        }
-
-    }
-
-    @Benchmark
-    @Warmup(iterations = 5, time = 1)
-    @Measurement(iterations = 5, time = 1)
-    @Fork(3)
-    @BenchmarkMode(Mode.AverageTime)
-    @OutputTimeUnit(TimeUnit.NANOSECONDS)
-    public void measureEncodingAdsWriteRequest(Blackhole blackhole, MyState myState) {
-        LinkedList<Object> out = new LinkedList<>();
-        myState.SUT.encode(null, myState.adsWriteRequest, out);
-        blackhole.consume(out.remove());
-    }
-
-    @Benchmark
-    @Warmup(iterations = 5, time = 1)
-    @Measurement(iterations = 5, time = 1)
-    @Fork(3)
-    @BenchmarkMode(Mode.AverageTime)
-    @OutputTimeUnit(TimeUnit.NANOSECONDS)
-    public void measureDecodingAdsWriteResponse(Blackhole blackhole, MyState myState) {
-        LinkedList<Object> out = new LinkedList<>();
-        myState.SUT.decode(null, Unpooled.wrappedBuffer(myState.adsWriteResponse), out);
-        blackhole.consume(out.remove());
-    }
-
-    @Benchmark
-    @Warmup(iterations = 5, time = 1)
-    @Measurement(iterations = 5, time = 1)
-    @Fork(3)
-    @BenchmarkMode(Mode.AverageTime)
-    @OutputTimeUnit(TimeUnit.NANOSECONDS)
-    public void measureEncodingAdsReadRequest(Blackhole blackhole, MyState myState) {
-        LinkedList<Object> out = new LinkedList<>();
-        myState.SUT.encode(null, myState.adsReadRequest, out);
-        blackhole.consume(out.remove());
-    }
-
-    @Benchmark
-    @Warmup(iterations = 5, time = 1)
-    @Measurement(iterations = 5, time = 1)
-    @Fork(3)
-    @BenchmarkMode(Mode.AverageTime)
-    @OutputTimeUnit(TimeUnit.NANOSECONDS)
-    public void measureDecodingAdsReadResponse(Blackhole blackhole, MyState myState) {
-        LinkedList<Object> out = new LinkedList<>();
-        myState.SUT.decode(null, Unpooled.wrappedBuffer(myState.adsReadResponse), out);
-        blackhole.consume(out.remove());
-    }
-
-    private static AdsWriteRequest buildAdsWriteRequest() {
-        AmsNetId targetAmsNetId = AmsNetId.of("1.2.3.4.5.6");
-        AmsPort targetAmsPort = AmsPort.of(7);
-        AmsNetId sourceAmsNetId = AmsNetId.of("8.9.10.11.12.13");
-        AmsPort sourceAmsPort = AmsPort.of(14);
-        Invoke invokeId = Invoke.of(15);
-        Data data = Data.of("Hello World!".getBytes());
-        return AdsWriteRequest.of(
-            targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
-            IndexGroup.of(1),
-            IndexOffset.of(1),
-            data
-        );
-    }
-
-    private static byte[] buildADSWriteResponse() {
-        AmsNetId targetAmsNetId = AmsNetId.of("1.2.3.4.5.6");
-        AmsPort targetAmsPort = AmsPort.of(7);
-        AmsNetId sourceAmsNetId = AmsNetId.of("8.9.10.11.12.13");
-        AmsPort sourceAmsPort = AmsPort.of(14);
-        Invoke invokeId = Invoke.of(15);
-        Result result = Result.of(AdsReturnCode.ADS_CODE_0);
-        return AdsWriteResponse.of(
-            targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
-            result
-        ).getBytes();
-    }
-
-    private static AdsReadRequest buildAdsReadRequest() {
-        AmsNetId targetAmsNetId = AmsNetId.of("1.2.3.4.5.6");
-        AmsPort targetAmsPort = AmsPort.of(7);
-        AmsNetId sourceAmsNetId = AmsNetId.of("8.9.10.11.12.13");
-        AmsPort sourceAmsPort = AmsPort.of(14);
-        Invoke invokeId = Invoke.of(15);
-        return AdsReadRequest.of(
-            targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
-            IndexGroup.of(1),
-            IndexOffset.of(1),
-            Length.of(1)
-        );
-    }
-
-    private static byte[] buildADSReadResponse() {
-        AmsNetId targetAmsNetId = AmsNetId.of("1.2.3.4.5.6");
-        AmsPort targetAmsPort = AmsPort.of(7);
-        AmsNetId sourceAmsNetId = AmsNetId.of("8.9.10.11.12.13");
-        AmsPort sourceAmsPort = AmsPort.of(14);
-        Invoke invokeId = Invoke.of(15);
-        Result result = Result.of(AdsReturnCode.ADS_CODE_0);
-        Data data = Data.of("Hello World!".getBytes());
-        return AdsReadResponse.of(
-            targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
-            result,
-            data
-        ).getBytes();
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.ads.protocol;
+
+import io.netty.buffer.Unpooled;
+import org.apache.plc4x.java.ads.api.commands.AdsReadRequest;
+import org.apache.plc4x.java.ads.api.commands.AdsReadResponse;
+import org.apache.plc4x.java.ads.api.commands.AdsWriteRequest;
+import org.apache.plc4x.java.ads.api.commands.AdsWriteResponse;
+import org.apache.plc4x.java.ads.api.commands.types.*;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.util.LinkedList;
+import java.util.concurrent.TimeUnit;
+
+public class ADSProtocolBenchmark {
+
+    @State(Scope.Benchmark)
+    public static class MyState {
+        Ads2PayloadProtocol SUT = new Ads2PayloadProtocol();
+        AdsWriteRequest adsWriteRequest = buildAdsWriteRequest();
+        byte[] adsWriteResponse = buildADSWriteResponse();
+        AdsReadRequest adsReadRequest = buildAdsReadRequest();
+        byte[] adsReadResponse = buildADSReadResponse();
+
+        @Setup(Level.Trial)
+        public void doSetup() {
+            System.out.println("Do Setup");
+        }
+
+        @TearDown(Level.Iteration)
+        public void doTearDown() {
+            System.out.println("Do TearDown");
+            SUT.reset();
+        }
+
+    }
+
+    @Benchmark
+    @Warmup(iterations = 5, time = 1)
+    @Measurement(iterations = 5, time = 1)
+    @Fork(3)
+    @BenchmarkMode(Mode.AverageTime)
+    @OutputTimeUnit(TimeUnit.NANOSECONDS)
+    public void measureEncodingAdsWriteRequest(Blackhole blackhole, MyState myState) {
+        LinkedList<Object> out = new LinkedList<>();
+        myState.SUT.encode(null, myState.adsWriteRequest, out);
+        blackhole.consume(out.remove());
+    }
+
+    @Benchmark
+    @Warmup(iterations = 5, time = 1)
+    @Measurement(iterations = 5, time = 1)
+    @Fork(3)
+    @BenchmarkMode(Mode.AverageTime)
+    @OutputTimeUnit(TimeUnit.NANOSECONDS)
+    public void measureDecodingAdsWriteResponse(Blackhole blackhole, MyState myState) {
+        LinkedList<Object> out = new LinkedList<>();
+        myState.SUT.decode(null, Unpooled.wrappedBuffer(myState.adsWriteResponse), out);
+        blackhole.consume(out.remove());
+    }
+
+    @Benchmark
+    @Warmup(iterations = 5, time = 1)
+    @Measurement(iterations = 5, time = 1)
+    @Fork(3)
+    @BenchmarkMode(Mode.AverageTime)
+    @OutputTimeUnit(TimeUnit.NANOSECONDS)
+    public void measureEncodingAdsReadRequest(Blackhole blackhole, MyState myState) {
+        LinkedList<Object> out = new LinkedList<>();
+        myState.SUT.encode(null, myState.adsReadRequest, out);
+        blackhole.consume(out.remove());
+    }
+
+    @Benchmark
+    @Warmup(iterations = 5, time = 1)
+    @Measurement(iterations = 5, time = 1)
+    @Fork(3)
+    @BenchmarkMode(Mode.AverageTime)
+    @OutputTimeUnit(TimeUnit.NANOSECONDS)
+    public void measureDecodingAdsReadResponse(Blackhole blackhole, MyState myState) {
+        LinkedList<Object> out = new LinkedList<>();
+        myState.SUT.decode(null, Unpooled.wrappedBuffer(myState.adsReadResponse), out);
+        blackhole.consume(out.remove());
+    }
+
+    private static AdsWriteRequest buildAdsWriteRequest() {
+        AmsNetId targetAmsNetId = AmsNetId.of("1.2.3.4.5.6");
+        AmsPort targetAmsPort = AmsPort.of(7);
+        AmsNetId sourceAmsNetId = AmsNetId.of("8.9.10.11.12.13");
+        AmsPort sourceAmsPort = AmsPort.of(14);
+        Invoke invokeId = Invoke.of(15);
+        Data data = Data.of("Hello World!".getBytes());
+        return AdsWriteRequest.of(
+            targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
+            IndexGroup.of(1),
+            IndexOffset.of(1),
+            data
+        );
+    }
+
+    private static byte[] buildADSWriteResponse() {
+        AmsNetId targetAmsNetId = AmsNetId.of("1.2.3.4.5.6");
+        AmsPort targetAmsPort = AmsPort.of(7);
+        AmsNetId sourceAmsNetId = AmsNetId.of("8.9.10.11.12.13");
+        AmsPort sourceAmsPort = AmsPort.of(14);
+        Invoke invokeId = Invoke.of(15);
+        Result result = Result.of(AdsReturnCode.ADS_CODE_0);
+        return AdsWriteResponse.of(
+            targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
+            result
+        ).getBytes();
+    }
+
+    private static AdsReadRequest buildAdsReadRequest() {
+        AmsNetId targetAmsNetId = AmsNetId.of("1.2.3.4.5.6");
+        AmsPort targetAmsPort = AmsPort.of(7);
+        AmsNetId sourceAmsNetId = AmsNetId.of("8.9.10.11.12.13");
+        AmsPort sourceAmsPort = AmsPort.of(14);
+        Invoke invokeId = Invoke.of(15);
+        return AdsReadRequest.of(
+            targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
+            IndexGroup.of(1),
+            IndexOffset.of(1),
+            Length.of(1)
+        );
+    }
+
+    private static byte[] buildADSReadResponse() {
+        AmsNetId targetAmsNetId = AmsNetId.of("1.2.3.4.5.6");
+        AmsPort targetAmsPort = AmsPort.of(7);
+        AmsNetId sourceAmsNetId = AmsNetId.of("8.9.10.11.12.13");
+        AmsPort sourceAmsPort = AmsPort.of(14);
+        Invoke invokeId = Invoke.of(15);
+        Result result = Result.of(AdsReturnCode.ADS_CODE_0);
+        Data data = Data.of("Hello World!".getBytes());
+        return AdsReadResponse.of(
+            targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
+            result,
+            data
+        ).getBytes();
+    }
+}
diff --git a/plc4j/protocols/benchmarks/src/main/resources/logback.xml b/plc4j/protocols/benchmarks/src/main/resources/logback.xml
index 47ade3c574b..f42819caa06 100644
--- a/plc4j/protocols/benchmarks/src/main/resources/logback.xml
+++ b/plc4j/protocols/benchmarks/src/main/resources/logback.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-    http://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.
-  -->
-<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoders are assigned the type
-         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="ERROR">
-    <appender-ref ref="STDOUT" />
-  </root>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+    http://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.
+  -->
+<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="ERROR">
+    <appender-ref ref="STDOUT" />
+  </root>
+
 </configuration>
\ No newline at end of file
diff --git a/plc4j/protocols/delta-v/pom.xml b/plc4j/protocols/delta-v/pom.xml
index d0b309cca8e..368af9452d4 100644
--- a/plc4j/protocols/delta-v/pom.xml
+++ b/plc4j/protocols/delta-v/pom.xml
@@ -1,157 +1,157 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-protocols</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-protocol-delta-v</artifactId>
-  <name>PLC4J: Protocol: Delta-V</name>
-  <description>Implementation of a PLC4X driver able to speak with Emerson devices using the DeltaV protocol.
-  </description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.pcap4j</groupId>
-      <artifactId>pcap4j-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.pcap4j</groupId>
-      <artifactId>pcap4j-packetfactory-static</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-buffer</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-    </dependency>
-
-    <!-- InfluxDB dependencies -->
-    <dependency>
-      <groupId>org.influxdb</groupId>
-      <artifactId>influxdb-java</artifactId>
-      <version>2.15</version>
-    </dependency>
-
-    <!-- Elasticsearch dependencies -->
-    <dependency>
-      <groupId>org.elasticsearch</groupId>
-      <artifactId>elasticsearch</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.elasticsearch</groupId>
-      <artifactId>elasticsearch-x-content</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.elasticsearch.plugin</groupId>
-      <artifactId>transport-netty4-client</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>de.dentrassi.elasticsearch</groupId>
-      <artifactId>log4j2-mock</artifactId>
-      <version>0.0.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>com.squareup.okhttp3</groupId>
-        <artifactId>okhttp</artifactId>
-        <version>3.13.1</version>
-      </dependency>
-      <dependency>
-        <groupId>com.squareup.okio</groupId>
-        <artifactId>okio</artifactId>
-        <version>1.17.2</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <usedDependencies>
-            <usedDependency>org.pcap4j:pcap4j-packetfactory-static</usedDependency>
-            <usedDependency>de.dentrassi.elasticsearch:log4j2-mock</usedDependency>
-          </usedDependencies>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>1.6.0</version>
-        <configuration>
-          <classpathScope>test</classpathScope>
-          <mainClass>org.apache.plc4x.java.deltav.PoCInflux</mainClass>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <!--
-
-    This profile starts the application with a provided pcap file instead of capturing real traffic.
-
-    Run With
-    mvn exec:java -P dummy -Dpcapng.file.path="/path/to/mycool.pcapng"
-
-  -->
-  <profiles>
-    <profile>
-      <id>dummy</id>
-
-      <properties>
-        <pcapng.file.path>hurz.pcapng</pcapng.file.path>
-      </properties>
-
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>exec-maven-plugin</artifactId>
-            <version>1.6.0</version>
-            <configuration combine.children="append">
-              <arguments>${pcapng.file.path}</arguments>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-protocols</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-protocol-delta-v</artifactId>
+  <name>PLC4J: Protocol: Delta-V</name>
+  <description>Implementation of a PLC4X driver able to speak with Emerson devices using the DeltaV protocol.
+  </description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.pcap4j</groupId>
+      <artifactId>pcap4j-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.pcap4j</groupId>
+      <artifactId>pcap4j-packetfactory-static</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+    </dependency>
+
+    <!-- InfluxDB dependencies -->
+    <dependency>
+      <groupId>org.influxdb</groupId>
+      <artifactId>influxdb-java</artifactId>
+      <version>2.15</version>
+    </dependency>
+
+    <!-- Elasticsearch dependencies -->
+    <dependency>
+      <groupId>org.elasticsearch</groupId>
+      <artifactId>elasticsearch</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.elasticsearch</groupId>
+      <artifactId>elasticsearch-x-content</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.elasticsearch.plugin</groupId>
+      <artifactId>transport-netty4-client</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>de.dentrassi.elasticsearch</groupId>
+      <artifactId>log4j2-mock</artifactId>
+      <version>0.0.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.squareup.okhttp3</groupId>
+        <artifactId>okhttp</artifactId>
+        <version>3.13.1</version>
+      </dependency>
+      <dependency>
+        <groupId>com.squareup.okio</groupId>
+        <artifactId>okio</artifactId>
+        <version>1.17.2</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <usedDependencies>
+            <usedDependency>org.pcap4j:pcap4j-packetfactory-static</usedDependency>
+            <usedDependency>de.dentrassi.elasticsearch:log4j2-mock</usedDependency>
+          </usedDependencies>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.6.0</version>
+        <configuration>
+          <classpathScope>test</classpathScope>
+          <mainClass>org.apache.plc4x.java.deltav.PoCInflux</mainClass>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <!--
+
+    This profile starts the application with a provided pcap file instead of capturing real traffic.
+
+    Run With
+    mvn exec:java -P dummy -Dpcapng.file.path="/path/to/mycool.pcapng"
+
+  -->
+  <profiles>
+    <profile>
+      <id>dummy</id>
+
+      <properties>
+        <pcapng.file.path>hurz.pcapng</pcapng.file.path>
+      </properties>
+
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <version>1.6.0</version>
+            <configuration combine.children="append">
+              <arguments>${pcapng.file.path}</arguments>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/base/pom.xml b/plc4j/protocols/driver-bases/base/pom.xml
index c6d152fe5d5..8f2cf989ed0 100644
--- a/plc4j/protocols/driver-bases/base/pom.xml
+++ b/plc4j/protocols/driver-bases/base/pom.xml
@@ -1,101 +1,101 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-protocols-driver-bases</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-protocol-driver-base</artifactId>
-  <name>PLC4J: Protocol: Driver-Base: Base</name>
-  <description>Base classes needed to implement all of the other driver bases.</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-utils-driver-base-java</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-buffer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-codec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.spockframework</groupId>
-      <artifactId>spock-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.athaydes</groupId>
-      <artifactId>spock-reports</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>nl.jqno.equalsverifier</groupId>
-      <artifactId>equalsverifier</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-protocols-driver-bases</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-protocol-driver-base</artifactId>
+  <name>PLC4J: Protocol: Driver-Base: Base</name>
+  <description>Base classes needed to implement all of the other driver bases.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-utils-driver-base-java</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.athaydes</groupId>
+      <artifactId>spock-reports</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>nl.jqno.equalsverifier</groupId>
+      <artifactId>equalsverifier</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/GeneratedDriverByteToMessageCodec.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/GeneratedDriverByteToMessageCodec.java
index 5818622bc0c..b8587b70ad1 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/GeneratedDriverByteToMessageCodec.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/GeneratedDriverByteToMessageCodec.java
@@ -1,79 +1,79 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import org.apache.commons.codec.binary.Hex;
-import org.apache.plc4x.java.utils.Message;
-import org.apache.plc4x.java.utils.MessageIO;
-import org.apache.plc4x.java.utils.ReadBuffer;
-import org.apache.plc4x.java.utils.WriteBuffer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-
-public abstract class GeneratedDriverByteToMessageCodec<T extends Message> extends PlcByteToMessageCodec<T> {
-
-    private static final Logger logger = LoggerFactory.getLogger(GeneratedDriverByteToMessageCodec.class);
-
-    private MessageIO<T, T> io;
-
-    public GeneratedDriverByteToMessageCodec(MessageIO<T, T> io) {
-        this.io = io;
-    }
-
-    @Override
-    protected void encode(ChannelHandlerContext ctx, T packet, ByteBuf byteBuf) throws Exception {
-        WriteBuffer buffer = new WriteBuffer(packet.getLengthInBytes());
-        io.serialize(buffer, packet);
-        byteBuf.writeBytes(buffer.getData());
-    }
-
-    @Override
-    protected void decode(ChannelHandlerContext ctx, ByteBuf byteBuf, List<Object> out) throws Exception {
-        // Check if enough data is present to process the entire package.
-        int packetSize = getPacketSize(byteBuf);
-        if(packetSize == -1 || packetSize > byteBuf.readableBytes()) {
-            return;
-        }
-
-        byte[] bytes = new byte[packetSize];
-        byteBuf.readBytes(bytes);
-
-        ReadBuffer readBuffer = new ReadBuffer(bytes);
-        while (readBuffer.getPos() < bytes.length) {
-            try {
-                T packet = io.parse(readBuffer);
-                out.add(packet);
-            } catch (Exception e) {
-                logger.warn("Error decoding package with content [" + Hex.encodeHexString(bytes) + "]: "
-                    + e.getMessage(), e);
-                // Just remove any trailing junk ... if there is any.
-                removeRestOfCorruptPackage(byteBuf);
-            }
-        }
-    }
-
-    abstract protected int getPacketSize(ByteBuf byteBuf);
-
-    abstract protected void removeRestOfCorruptPackage(ByteBuf byteBuf);
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.plc4x.java.utils.Message;
+import org.apache.plc4x.java.utils.MessageIO;
+import org.apache.plc4x.java.utils.ReadBuffer;
+import org.apache.plc4x.java.utils.WriteBuffer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+public abstract class GeneratedDriverByteToMessageCodec<T extends Message> extends PlcByteToMessageCodec<T> {
+
+    private static final Logger logger = LoggerFactory.getLogger(GeneratedDriverByteToMessageCodec.class);
+
+    private MessageIO<T, T> io;
+
+    public GeneratedDriverByteToMessageCodec(MessageIO<T, T> io) {
+        this.io = io;
+    }
+
+    @Override
+    protected void encode(ChannelHandlerContext ctx, T packet, ByteBuf byteBuf) throws Exception {
+        WriteBuffer buffer = new WriteBuffer(packet.getLengthInBytes());
+        io.serialize(buffer, packet);
+        byteBuf.writeBytes(buffer.getData());
+    }
+
+    @Override
+    protected void decode(ChannelHandlerContext ctx, ByteBuf byteBuf, List<Object> out) throws Exception {
+        // Check if enough data is present to process the entire package.
+        int packetSize = getPacketSize(byteBuf);
+        if(packetSize == -1 || packetSize > byteBuf.readableBytes()) {
+            return;
+        }
+
+        byte[] bytes = new byte[packetSize];
+        byteBuf.readBytes(bytes);
+
+        ReadBuffer readBuffer = new ReadBuffer(bytes);
+        while (readBuffer.getPos() < bytes.length) {
+            try {
+                T packet = io.parse(readBuffer);
+                out.add(packet);
+            } catch (Exception e) {
+                logger.warn("Error decoding package with content [" + Hex.encodeHexString(bytes) + "]: "
+                    + e.getMessage(), e);
+                // Just remove any trailing junk ... if there is any.
+                removeRestOfCorruptPackage(byteBuf);
+            }
+        }
+    }
+
+    abstract protected int getPacketSize(ByteBuf byteBuf);
+
+    abstract protected void removeRestOfCorruptPackage(ByteBuf byteBuf);
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/PlcByteToMessageCodec.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/PlcByteToMessageCodec.java
index a97ef2cbb75..34ae9fdf004 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/PlcByteToMessageCodec.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/PlcByteToMessageCodec.java
@@ -1,59 +1,59 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base;
-
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.ByteToMessageCodec;
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.Field;
-
-public abstract class PlcByteToMessageCodec<OUTBOUND_IN>
-    extends ByteToMessageCodec<OUTBOUND_IN> {
-
-    private static final Logger logger = LoggerFactory.getLogger(PlcByteToMessageCodec.class);
-
-    private volatile ChannelHandler prevChannelHandler = null;
-
-    public PlcByteToMessageCodec() {
-    }
-
-    public PlcByteToMessageCodec(Class<? extends OUTBOUND_IN> outboundMessageType) {
-        super(outboundMessageType);
-    }
-
-    protected ChannelHandler getPrevChannelHandler(ChannelHandlerContext ctx) {
-        if(prevChannelHandler == null) {
-            try {
-                Field prevField = FieldUtils.getField(ctx.getClass(), "prev", true);
-                if(prevField != null) {
-                    ChannelHandlerContext prevContext = (ChannelHandlerContext) prevField.get(ctx);
-                    prevChannelHandler = prevContext.handler();
-                }
-            } catch(Exception e) {
-                logger.error("Error accessing field 'prev'", e);
-            }
-        }
-        return prevChannelHandler;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base;
+
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.ByteToMessageCodec;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Field;
+
+public abstract class PlcByteToMessageCodec<OUTBOUND_IN>
+    extends ByteToMessageCodec<OUTBOUND_IN> {
+
+    private static final Logger logger = LoggerFactory.getLogger(PlcByteToMessageCodec.class);
+
+    private volatile ChannelHandler prevChannelHandler = null;
+
+    public PlcByteToMessageCodec() {
+    }
+
+    public PlcByteToMessageCodec(Class<? extends OUTBOUND_IN> outboundMessageType) {
+        super(outboundMessageType);
+    }
+
+    protected ChannelHandler getPrevChannelHandler(ChannelHandlerContext ctx) {
+        if(prevChannelHandler == null) {
+            try {
+                Field prevField = FieldUtils.getField(ctx.getClass(), "prev", true);
+                if(prevField != null) {
+                    ChannelHandlerContext prevContext = (ChannelHandlerContext) prevField.get(ctx);
+                    prevChannelHandler = prevContext.handler();
+                }
+            } catch(Exception e) {
+                logger.error("Error accessing field 'prev'", e);
+            }
+        }
+        return prevChannelHandler;
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/PlcMessageToMessageCodec.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/PlcMessageToMessageCodec.java
index ef7ff868988..1198f5b5472 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/PlcMessageToMessageCodec.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/PlcMessageToMessageCodec.java
@@ -1,60 +1,60 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base;
-
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToMessageCodec;
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.Field;
-
-public abstract class PlcMessageToMessageCodec<INBOUND_IN, OUTBOUND_IN>
-    extends MessageToMessageCodec<INBOUND_IN, OUTBOUND_IN> {
-
-    private static final Logger logger = LoggerFactory.getLogger(PlcMessageToMessageCodec.class);
-
-    private volatile ChannelHandler prevChannelHandler = null;
-
-    public PlcMessageToMessageCodec() {
-    }
-
-    public PlcMessageToMessageCodec(Class<? extends INBOUND_IN> inboundMessageType,
-                                    Class<? extends OUTBOUND_IN> outboundMessageType) {
-        super(inboundMessageType, outboundMessageType);
-    }
-
-    protected ChannelHandler getPrevChannelHandler(ChannelHandlerContext ctx) {
-        if(prevChannelHandler == null) {
-            try {
-                Field prevField = FieldUtils.getField(ctx.getClass(), "prev", true);
-                if(prevField != null) {
-                    ChannelHandlerContext prevContext = (ChannelHandlerContext) prevField.get(ctx);
-                    prevChannelHandler = prevContext.handler();
-                }
-            } catch(Exception e) {
-                logger.error("Error accessing field 'prev'", e);
-            }
-        }
-        return prevChannelHandler;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base;
+
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageCodec;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Field;
+
+public abstract class PlcMessageToMessageCodec<INBOUND_IN, OUTBOUND_IN>
+    extends MessageToMessageCodec<INBOUND_IN, OUTBOUND_IN> {
+
+    private static final Logger logger = LoggerFactory.getLogger(PlcMessageToMessageCodec.class);
+
+    private volatile ChannelHandler prevChannelHandler = null;
+
+    public PlcMessageToMessageCodec() {
+    }
+
+    public PlcMessageToMessageCodec(Class<? extends INBOUND_IN> inboundMessageType,
+                                    Class<? extends OUTBOUND_IN> outboundMessageType) {
+        super(inboundMessageType, outboundMessageType);
+    }
+
+    protected ChannelHandler getPrevChannelHandler(ChannelHandlerContext ctx) {
+        if(prevChannelHandler == null) {
+            try {
+                Field prevField = FieldUtils.getField(ctx.getClass(), "prev", true);
+                if(prevField != null) {
+                    ChannelHandlerContext prevContext = (ChannelHandlerContext) prevField.get(ctx);
+                    prevChannelHandler = prevContext.handler();
+                }
+            } catch(Exception e) {
+                logger.error("Error accessing field 'prev'", e);
+            }
+        }
+        return prevChannelHandler;
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/AbstractPlcConnection.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/AbstractPlcConnection.java
index 9f862d75dee..15cca8b30ac 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/AbstractPlcConnection.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/AbstractPlcConnection.java
@@ -1,105 +1,105 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.connection;
-
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.exceptions.PlcUnsupportedOperationException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
-import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.metadata.PlcConnectionMetadata;
-import org.apache.plc4x.java.base.messages.InternalPlcMessage;
-
-import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
-
-/**
- * Base class for implementing connections.
- * Per default, all operations (read, write, subscribe) are unsupported.
- * Concrete implementations should override the methods indicating connection capabilities
- * and for obtaining respective request builders.
- */
-public abstract class AbstractPlcConnection implements PlcConnection, PlcConnectionMetadata {
-
-    @Override
-    public PlcConnectionMetadata getMetadata() {
-        return this;
-    }
-
-    @Override
-    public CompletableFuture<Void> ping() {
-        CompletableFuture<Void> future = new CompletableFuture<>();
-        future.completeExceptionally(new PlcUnsupportedOperationException("The connection does not support pinging"));
-        return future;
-    }
-
-    @Override
-    public boolean canRead() {
-        return false;
-    }
-
-    @Override
-    public boolean canWrite() {
-        return false;
-    }
-
-    @Override
-    public boolean canSubscribe() {
-        return false;
-    }
-
-    @Override
-    public PlcReadRequest.Builder readRequestBuilder() {
-        throw new PlcUnsupportedOperationException("The connection does not support reading");
-    }
-
-    @Override
-    public PlcWriteRequest.Builder writeRequestBuilder() {
-        throw new PlcUnsupportedOperationException("The connection does not support writing");
-    }
-
-    @Override
-    public PlcSubscriptionRequest.Builder subscriptionRequestBuilder() {
-        throw new PlcUnsupportedOperationException("The connection does not support subscription");
-    }
-
-    @Override
-    public PlcUnsubscriptionRequest.Builder unsubscriptionRequestBuilder() {
-        throw new PlcUnsupportedOperationException("The connection does not support subscription");
-    }
-
-    /**
-     * Can be used to check and cast a parameter to its required internal type (can be used for general type checking too).
-     *
-     * @param o     the object to be checked against target {@code clazz}.
-     * @param clazz the expected {@code clazz}.
-     * @param <T>   the type of the expected {@code clazz}.
-     * @return the cast type of {@code clazz}.
-     */
-    protected <T extends InternalPlcMessage> T checkInternal(Object o, Class<T> clazz) {
-        Objects.requireNonNull(o);
-        Objects.requireNonNull(clazz);
-        if (!clazz.isInstance(o)) {
-            throw new IllegalArgumentException("illegal type " + o.getClass() + ". Expected " + clazz);
-        }
-        return clazz.cast(o);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.connection;
+
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.exceptions.PlcUnsupportedOperationException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.metadata.PlcConnectionMetadata;
+import org.apache.plc4x.java.base.messages.InternalPlcMessage;
+
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * Base class for implementing connections.
+ * Per default, all operations (read, write, subscribe) are unsupported.
+ * Concrete implementations should override the methods indicating connection capabilities
+ * and for obtaining respective request builders.
+ */
+public abstract class AbstractPlcConnection implements PlcConnection, PlcConnectionMetadata {
+
+    @Override
+    public PlcConnectionMetadata getMetadata() {
+        return this;
+    }
+
+    @Override
+    public CompletableFuture<Void> ping() {
+        CompletableFuture<Void> future = new CompletableFuture<>();
+        future.completeExceptionally(new PlcUnsupportedOperationException("The connection does not support pinging"));
+        return future;
+    }
+
+    @Override
+    public boolean canRead() {
+        return false;
+    }
+
+    @Override
+    public boolean canWrite() {
+        return false;
+    }
+
+    @Override
+    public boolean canSubscribe() {
+        return false;
+    }
+
+    @Override
+    public PlcReadRequest.Builder readRequestBuilder() {
+        throw new PlcUnsupportedOperationException("The connection does not support reading");
+    }
+
+    @Override
+    public PlcWriteRequest.Builder writeRequestBuilder() {
+        throw new PlcUnsupportedOperationException("The connection does not support writing");
+    }
+
+    @Override
+    public PlcSubscriptionRequest.Builder subscriptionRequestBuilder() {
+        throw new PlcUnsupportedOperationException("The connection does not support subscription");
+    }
+
+    @Override
+    public PlcUnsubscriptionRequest.Builder unsubscriptionRequestBuilder() {
+        throw new PlcUnsupportedOperationException("The connection does not support subscription");
+    }
+
+    /**
+     * Can be used to check and cast a parameter to its required internal type (can be used for general type checking too).
+     *
+     * @param o     the object to be checked against target {@code clazz}.
+     * @param clazz the expected {@code clazz}.
+     * @param <T>   the type of the expected {@code clazz}.
+     * @return the cast type of {@code clazz}.
+     */
+    protected <T extends InternalPlcMessage> T checkInternal(Object o, Class<T> clazz) {
+        Objects.requireNonNull(o);
+        Objects.requireNonNull(clazz);
+        if (!clazz.isInstance(o)) {
+            throw new IllegalArgumentException("illegal type " + o.getClass() + ". Expected " + clazz);
+        }
+        return clazz.cast(o);
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/ChannelFactory.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/ChannelFactory.java
index b03daee3396..ad1bb2cc76c 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/ChannelFactory.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/ChannelFactory.java
@@ -1,33 +1,33 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.connection;
-
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandler;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.exceptions.PlcException;
-
-public interface ChannelFactory {
-
-    Channel createChannel(ChannelHandler channelHandler)
-        throws PlcConnectionException;
-
-    void ping() throws PlcException;
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.connection;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandler;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.exceptions.PlcException;
+
+public interface ChannelFactory {
+
+    Channel createChannel(ChannelHandler channelHandler)
+        throws PlcConnectionException;
+
+    void ping() throws PlcException;
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/DefaultPlcFieldHandler.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/DefaultPlcFieldHandler.java
index 70dcd03633e..23c3ed57419 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/DefaultPlcFieldHandler.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/DefaultPlcFieldHandler.java
@@ -1,106 +1,106 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.base.connection;
-
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-
-/**
- * Base Implementation of {@link PlcFieldHandler} which throws a {@link PlcRuntimeException} for all
- * encodeXXX methods.
- */
-public abstract class DefaultPlcFieldHandler implements PlcFieldHandler {
-
-    @Override
-    public BaseDefaultFieldItem encodeBoolean(PlcField field, Object[] values) {
-        throw new PlcRuntimeException("Invalid encoder for type " + field);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeByte(PlcField field, Object[] values) {
-        throw new PlcRuntimeException("Invalid encoder for type " + field);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeShort(PlcField field, Object[] values) {
-        throw new PlcRuntimeException("Invalid encoder for type " + field);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeInteger(PlcField field, Object[] values) {
-        throw new PlcRuntimeException("Invalid encoder for type " + field);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeBigInteger(PlcField field, Object[] values) {
-        throw new PlcRuntimeException("Invalid encoder for type " + field);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeLong(PlcField field, Object[] values) {
-        throw new PlcRuntimeException("Invalid encoder for type " + field);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeFloat(PlcField field, Object[] values) {
-        throw new PlcRuntimeException("Invalid encoder for type " + field);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeBigDecimal(PlcField field, Object[] values) {
-        throw new PlcRuntimeException("Invalid encoder for type " + field);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeDouble(PlcField field, Object[] values) {
-        throw new PlcRuntimeException("Invalid encoder for type " + field);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeString(PlcField field, Object[] values) {
-        throw new PlcRuntimeException("Invalid encoder for type " + field);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeTime(PlcField field, Object[] values) {
-        throw new PlcRuntimeException("Invalid encoder for type " + field);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeDate(PlcField field, Object[] values) {
-        throw new PlcRuntimeException("Invalid encoder for type " + field);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeDateTime(PlcField field, Object[] values) {
-        throw new PlcRuntimeException("Invalid encoder for type " + field);
-    }
-    
-    @Override
-    public BaseDefaultFieldItem encodeDuration(PlcField field, Object[] values) {
-        throw new PlcRuntimeException("Invalid encoder for type " + field);
-    }    
-
-    @Override
-    public BaseDefaultFieldItem encodeByteArray(PlcField field, Object[] values) {
-        throw new PlcRuntimeException("Invalid encoder for type " + field);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.base.connection;
+
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+
+/**
+ * Base Implementation of {@link PlcFieldHandler} which throws a {@link PlcRuntimeException} for all
+ * encodeXXX methods.
+ */
+public abstract class DefaultPlcFieldHandler implements PlcFieldHandler {
+
+    @Override
+    public BaseDefaultFieldItem encodeBoolean(PlcField field, Object[] values) {
+        throw new PlcRuntimeException("Invalid encoder for type " + field);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeByte(PlcField field, Object[] values) {
+        throw new PlcRuntimeException("Invalid encoder for type " + field);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeShort(PlcField field, Object[] values) {
+        throw new PlcRuntimeException("Invalid encoder for type " + field);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeInteger(PlcField field, Object[] values) {
+        throw new PlcRuntimeException("Invalid encoder for type " + field);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeBigInteger(PlcField field, Object[] values) {
+        throw new PlcRuntimeException("Invalid encoder for type " + field);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeLong(PlcField field, Object[] values) {
+        throw new PlcRuntimeException("Invalid encoder for type " + field);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeFloat(PlcField field, Object[] values) {
+        throw new PlcRuntimeException("Invalid encoder for type " + field);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeBigDecimal(PlcField field, Object[] values) {
+        throw new PlcRuntimeException("Invalid encoder for type " + field);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDouble(PlcField field, Object[] values) {
+        throw new PlcRuntimeException("Invalid encoder for type " + field);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeString(PlcField field, Object[] values) {
+        throw new PlcRuntimeException("Invalid encoder for type " + field);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeTime(PlcField field, Object[] values) {
+        throw new PlcRuntimeException("Invalid encoder for type " + field);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDate(PlcField field, Object[] values) {
+        throw new PlcRuntimeException("Invalid encoder for type " + field);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDateTime(PlcField field, Object[] values) {
+        throw new PlcRuntimeException("Invalid encoder for type " + field);
+    }
+    
+    @Override
+    public BaseDefaultFieldItem encodeDuration(PlcField field, Object[] values) {
+        throw new PlcRuntimeException("Invalid encoder for type " + field);
+    }    
+
+    @Override
+    public BaseDefaultFieldItem encodeByteArray(PlcField field, Object[] values) {
+        throw new PlcRuntimeException("Invalid encoder for type " + field);
+    }
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/NettyPlcConnection.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/NettyPlcConnection.java
index 3ccd2946841..d87f250f89d 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/NettyPlcConnection.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/NettyPlcConnection.java
@@ -1,132 +1,132 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.connection;
-
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandler;
-import io.netty.util.HashedWheelTimer;
-import io.netty.util.Timer;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.exceptions.PlcException;
-import org.apache.plc4x.java.api.exceptions.PlcIoException;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-
-public abstract class NettyPlcConnection extends AbstractPlcConnection {
-
-    /**
-     * a {@link HashedWheelTimer} shall be only instantiated once.
-     */
-    // TODO: maybe find a way to make this configurable per jvm
-    protected final static Timer timer = new HashedWheelTimer();
-
-    protected final ChannelFactory channelFactory;
-
-    protected final boolean awaitSessionSetupComplete;
-
-    protected Channel channel;
-
-    protected boolean connected;
-
-    protected NettyPlcConnection(ChannelFactory channelFactory) {
-        this(channelFactory, false);
-    }
-
-    protected NettyPlcConnection(ChannelFactory channelFactory, boolean awaitSessionSetupComplete) {
-        this.channelFactory = channelFactory;
-        this.awaitSessionSetupComplete = awaitSessionSetupComplete;
-        this.connected = false;
-    }
-
-    @Override
-    public void connect() throws PlcConnectionException {
-        try {
-            // As we don't just want to wait till the connection is established,
-            // define a future we can use to signal back that the s7 session is
-            // finished initializing.
-            CompletableFuture<Void> sessionSetupCompleteFuture = new CompletableFuture<>();
-
-            // Have the channel factory create a new channel instance.
-            channel = channelFactory.createChannel(getChannelHandler(sessionSetupCompleteFuture));
-            channel.closeFuture().addListener(future -> {
-                if (!sessionSetupCompleteFuture.isDone()) {
-                    sessionSetupCompleteFuture.completeExceptionally(
-                        new PlcIoException("Connection terminated by remote"));
-                }
-            });
-            // Send an event to the pipeline telling the Protocol filters what's going on.
-            sendChannelCreatedEvent();
-
-            // Wait till the connection is established.
-            if (awaitSessionSetupComplete) {
-                sessionSetupCompleteFuture.get();
-            }
-
-            // Set the connection to "connected"
-            connected = true;
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new PlcConnectionException(e);
-        } catch (ExecutionException e) {
-            throw new PlcConnectionException(e);
-        }
-    }
-
-    @Override
-    public CompletableFuture<Void> ping() {
-        CompletableFuture<Void> future = new CompletableFuture<>();
-        try {
-            // Relay the actual pinging to the channel factory ...
-            channelFactory.ping();
-            // If we got here, the ping was successful.
-            future.complete(null);
-        } catch(PlcException e) {
-            // If we got here, something went wrong.
-            future.completeExceptionally(e);
-        }
-        return future;
-    }
-
-    @Override
-    public void close() throws PlcConnectionException {
-        channel = null;
-        connected = false;
-    }
-
-    /**
-     * Check if the communication channel is active (channel.isActive()) and the driver for a given protocol
-     * has finished establishing the connection.
-     */
-    @Override
-    public boolean isConnected() {
-        return connected && channel.isActive();
-    }
-
-    public Channel getChannel() {
-        return channel;
-    }
-
-    protected abstract ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture);
-
-    protected void sendChannelCreatedEvent() {
-        // Implemented in sub-classes, if needed.
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.connection;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandler;
+import io.netty.util.HashedWheelTimer;
+import io.netty.util.Timer;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.exceptions.PlcException;
+import org.apache.plc4x.java.api.exceptions.PlcIoException;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
+public abstract class NettyPlcConnection extends AbstractPlcConnection {
+
+    /**
+     * a {@link HashedWheelTimer} shall be only instantiated once.
+     */
+    // TODO: maybe find a way to make this configurable per jvm
+    protected final static Timer timer = new HashedWheelTimer();
+
+    protected final ChannelFactory channelFactory;
+
+    protected final boolean awaitSessionSetupComplete;
+
+    protected Channel channel;
+
+    protected boolean connected;
+
+    protected NettyPlcConnection(ChannelFactory channelFactory) {
+        this(channelFactory, false);
+    }
+
+    protected NettyPlcConnection(ChannelFactory channelFactory, boolean awaitSessionSetupComplete) {
+        this.channelFactory = channelFactory;
+        this.awaitSessionSetupComplete = awaitSessionSetupComplete;
+        this.connected = false;
+    }
+
+    @Override
+    public void connect() throws PlcConnectionException {
+        try {
+            // As we don't just want to wait till the connection is established,
+            // define a future we can use to signal back that the s7 session is
+            // finished initializing.
+            CompletableFuture<Void> sessionSetupCompleteFuture = new CompletableFuture<>();
+
+            // Have the channel factory create a new channel instance.
+            channel = channelFactory.createChannel(getChannelHandler(sessionSetupCompleteFuture));
+            channel.closeFuture().addListener(future -> {
+                if (!sessionSetupCompleteFuture.isDone()) {
+                    sessionSetupCompleteFuture.completeExceptionally(
+                        new PlcIoException("Connection terminated by remote"));
+                }
+            });
+            // Send an event to the pipeline telling the Protocol filters what's going on.
+            sendChannelCreatedEvent();
+
+            // Wait till the connection is established.
+            if (awaitSessionSetupComplete) {
+                sessionSetupCompleteFuture.get();
+            }
+
+            // Set the connection to "connected"
+            connected = true;
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new PlcConnectionException(e);
+        } catch (ExecutionException e) {
+            throw new PlcConnectionException(e);
+        }
+    }
+
+    @Override
+    public CompletableFuture<Void> ping() {
+        CompletableFuture<Void> future = new CompletableFuture<>();
+        try {
+            // Relay the actual pinging to the channel factory ...
+            channelFactory.ping();
+            // If we got here, the ping was successful.
+            future.complete(null);
+        } catch(PlcException e) {
+            // If we got here, something went wrong.
+            future.completeExceptionally(e);
+        }
+        return future;
+    }
+
+    @Override
+    public void close() throws PlcConnectionException {
+        channel = null;
+        connected = false;
+    }
+
+    /**
+     * Check if the communication channel is active (channel.isActive()) and the driver for a given protocol
+     * has finished establishing the connection.
+     */
+    @Override
+    public boolean isConnected() {
+        return connected && channel.isActive();
+    }
+
+    public Channel getChannel() {
+        return channel;
+    }
+
+    protected abstract ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture);
+
+    protected void sendChannelCreatedEvent() {
+        // Implemented in sub-classes, if needed.
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/PlcFieldHandler.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/PlcFieldHandler.java
index b83d29f90b8..f1f7ee45afd 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/PlcFieldHandler.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/PlcFieldHandler.java
@@ -1,62 +1,62 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.connection;
-
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-
-/**
- * Field Handler which handles the parsing of string to {@link PlcField} and the encoding of retrieved plc values.
- */
-public interface PlcFieldHandler {
-
-    PlcField createField(String fieldQuery) throws PlcInvalidFieldException;
-
-    BaseDefaultFieldItem encodeBoolean(PlcField field, Object[] values);
-
-    BaseDefaultFieldItem encodeByte(PlcField field, Object[] values);
-
-    BaseDefaultFieldItem encodeShort(PlcField field, Object[] values);
-
-    BaseDefaultFieldItem encodeInteger(PlcField field, Object[] values);
-
-    BaseDefaultFieldItem encodeBigInteger(PlcField field, Object[] values);
-
-    BaseDefaultFieldItem encodeLong(PlcField field, Object[] values);
-
-    BaseDefaultFieldItem encodeFloat(PlcField field, Object[] values);
-
-    BaseDefaultFieldItem encodeBigDecimal(PlcField field, Object[] values);
-
-    BaseDefaultFieldItem encodeDouble(PlcField field, Object[] values);
-
-    BaseDefaultFieldItem encodeString(PlcField field, Object[] values);
-
-    BaseDefaultFieldItem encodeTime(PlcField field, Object[] values);
-
-    BaseDefaultFieldItem encodeDate(PlcField field, Object[] values);
-
-    BaseDefaultFieldItem encodeDateTime(PlcField field, Object[] values);
-    
-    BaseDefaultFieldItem encodeDuration(PlcField field, Object[] values);    
-
-    BaseDefaultFieldItem encodeByteArray(PlcField field, Object[] values);
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.connection;
+
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+
+/**
+ * Field Handler which handles the parsing of string to {@link PlcField} and the encoding of retrieved plc values.
+ */
+public interface PlcFieldHandler {
+
+    PlcField createField(String fieldQuery) throws PlcInvalidFieldException;
+
+    BaseDefaultFieldItem encodeBoolean(PlcField field, Object[] values);
+
+    BaseDefaultFieldItem encodeByte(PlcField field, Object[] values);
+
+    BaseDefaultFieldItem encodeShort(PlcField field, Object[] values);
+
+    BaseDefaultFieldItem encodeInteger(PlcField field, Object[] values);
+
+    BaseDefaultFieldItem encodeBigInteger(PlcField field, Object[] values);
+
+    BaseDefaultFieldItem encodeLong(PlcField field, Object[] values);
+
+    BaseDefaultFieldItem encodeFloat(PlcField field, Object[] values);
+
+    BaseDefaultFieldItem encodeBigDecimal(PlcField field, Object[] values);
+
+    BaseDefaultFieldItem encodeDouble(PlcField field, Object[] values);
+
+    BaseDefaultFieldItem encodeString(PlcField field, Object[] values);
+
+    BaseDefaultFieldItem encodeTime(PlcField field, Object[] values);
+
+    BaseDefaultFieldItem encodeDate(PlcField field, Object[] values);
+
+    BaseDefaultFieldItem encodeDateTime(PlcField field, Object[] values);
+    
+    BaseDefaultFieldItem encodeDuration(PlcField field, Object[] values);    
+
+    BaseDefaultFieldItem encodeByteArray(PlcField field, Object[] values);
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/events/ConnectEvent.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/events/ConnectEvent.java
index 6df4aed12cf..8b621205085 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/events/ConnectEvent.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/events/ConnectEvent.java
@@ -1,22 +1,22 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.events;
-
-public class ConnectEvent {
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.events;
+
+public class ConnectEvent {
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/events/ConnectedEvent.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/events/ConnectedEvent.java
index db937654ae2..8dd8476e3b6 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/events/ConnectedEvent.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/events/ConnectedEvent.java
@@ -1,22 +1,22 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.events;
-
-public class ConnectedEvent {
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.events;
+
+public class ConnectedEvent {
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcProprietaryRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcProprietaryRequest.java
index fc06a267b1e..99ffd4e8d15 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcProprietaryRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcProprietaryRequest.java
@@ -1,43 +1,43 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.messages.PlcResponse;
-
-import java.util.concurrent.CompletableFuture;
-
-public class DefaultPlcProprietaryRequest<REQUEST> implements InternalPlcProprietaryRequest<REQUEST> {
-
-    @Override
-    public CompletableFuture<PlcResponse> execute() {
-        throw new PlcRuntimeException("not supported"); // TODO: figure out what to do with this
-    }
-
-    private REQUEST proprietaryRequest;
-
-    public DefaultPlcProprietaryRequest(REQUEST proprietaryRequest) {
-        this.proprietaryRequest = proprietaryRequest;
-    }
-
-    @Override
-    public REQUEST getProprietaryRequest() {
-        return proprietaryRequest;
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.messages.PlcResponse;
+
+import java.util.concurrent.CompletableFuture;
+
+public class DefaultPlcProprietaryRequest<REQUEST> implements InternalPlcProprietaryRequest<REQUEST> {
+
+    @Override
+    public CompletableFuture<PlcResponse> execute() {
+        throw new PlcRuntimeException("not supported"); // TODO: figure out what to do with this
+    }
+
+    private REQUEST proprietaryRequest;
+
+    public DefaultPlcProprietaryRequest(REQUEST proprietaryRequest) {
+        this.proprietaryRequest = proprietaryRequest;
+    }
+
+    @Override
+    public REQUEST getProprietaryRequest() {
+        return proprietaryRequest;
+    }
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcProprietaryResponse.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcProprietaryResponse.java
index d36dc23ff26..bf327a927a4 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcProprietaryResponse.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcProprietaryResponse.java
@@ -1,42 +1,42 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages;
-
-public class DefaultPlcProprietaryResponse<RESPONSE> implements InternalPlcProprietaryResponse<RESPONSE> {
-
-    private final InternalPlcProprietaryRequest plcProprietaryRequest;
-
-    private final RESPONSE proprietaryResponse;
-
-    public DefaultPlcProprietaryResponse(InternalPlcProprietaryRequest plcProprietaryRequest, RESPONSE proprietaryResponse) {
-        this.plcProprietaryRequest = plcProprietaryRequest;
-        this.proprietaryResponse = proprietaryResponse;
-    }
-
-    @Override
-    public RESPONSE getResponse() {
-        return proprietaryResponse;
-    }
-
-    @Override
-    public InternalPlcProprietaryRequest getRequest() {
-        return plcProprietaryRequest;
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages;
+
+public class DefaultPlcProprietaryResponse<RESPONSE> implements InternalPlcProprietaryResponse<RESPONSE> {
+
+    private final InternalPlcProprietaryRequest plcProprietaryRequest;
+
+    private final RESPONSE proprietaryResponse;
+
+    public DefaultPlcProprietaryResponse(InternalPlcProprietaryRequest plcProprietaryRequest, RESPONSE proprietaryResponse) {
+        this.plcProprietaryRequest = plcProprietaryRequest;
+        this.proprietaryResponse = proprietaryResponse;
+    }
+
+    @Override
+    public RESPONSE getResponse() {
+        return proprietaryResponse;
+    }
+
+    @Override
+    public InternalPlcProprietaryRequest getRequest() {
+        return plcProprietaryRequest;
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadRequest.java
index 063f105cf04..088d0302d41 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadRequest.java
@@ -1,113 +1,113 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.connection.PlcFieldHandler;
-
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
-
-public class DefaultPlcReadRequest implements InternalPlcReadRequest, InternalPlcFieldRequest {
-
-    private final PlcReader reader;
-    private LinkedHashMap<String, PlcField> fields;
-
-    protected DefaultPlcReadRequest(PlcReader reader, LinkedHashMap<String, PlcField> fields) {
-        this.reader = reader;
-        this.fields = fields;
-    }
-
-    @Override
-    public CompletableFuture<PlcReadResponse> execute() {
-        return reader.read(this);
-    }
-
-    @Override
-    public int getNumberOfFields() {
-        return fields.size();
-    }
-
-    @Override
-    public LinkedHashSet<String> getFieldNames() {
-        // TODO: Check if this already is a LinkedHashSet.
-        return new LinkedHashSet<>(fields.keySet());
-    }
-
-    @Override
-    public PlcField getField(String name) {
-        return fields.get(name);
-    }
-
-    @Override
-    public List<PlcField> getFields() {
-        return new LinkedList<>(fields.values());
-    }
-
-    @Override
-    public List<Pair<String, PlcField>> getNamedFields() {
-        return fields.entrySet()
-            .stream()
-            .map(stringPlcFieldEntry -> Pair.of(stringPlcFieldEntry.getKey(), stringPlcFieldEntry.getValue()))
-            .collect(Collectors.toCollection(LinkedList::new));
-    }
-
-    protected PlcReader getReader() {
-        return reader;
-    }
-
-    public static class Builder implements PlcReadRequest.Builder {
-
-        private final PlcReader reader;
-        private final PlcFieldHandler fieldHandler;
-        private final Map<String, String> fields;
-
-        public Builder(PlcReader reader, PlcFieldHandler fieldHandler) {
-            this.reader = reader;
-            this.fieldHandler = fieldHandler;
-            fields = new TreeMap<>();
-        }
-
-        @Override
-        public PlcReadRequest.Builder addItem(String name, String fieldQuery) {
-            if (fields.containsKey(name)) {
-                throw new PlcRuntimeException("Duplicate field definition '" + name + "'");
-            }
-            fields.put(name, fieldQuery);
-            return this;
-        }
-
-        @Override
-        public PlcReadRequest build() {
-            LinkedHashMap<String, PlcField> parsedFields = new LinkedHashMap<>();
-            fields.forEach((name, fieldQuery) -> {
-                PlcField parsedField = fieldHandler.createField(fieldQuery);
-                parsedFields.put(name, parsedField);
-            });
-            return new DefaultPlcReadRequest(reader, parsedFields);
-        }
-
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.connection.PlcFieldHandler;
+
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+
+public class DefaultPlcReadRequest implements InternalPlcReadRequest, InternalPlcFieldRequest {
+
+    private final PlcReader reader;
+    private LinkedHashMap<String, PlcField> fields;
+
+    protected DefaultPlcReadRequest(PlcReader reader, LinkedHashMap<String, PlcField> fields) {
+        this.reader = reader;
+        this.fields = fields;
+    }
+
+    @Override
+    public CompletableFuture<PlcReadResponse> execute() {
+        return reader.read(this);
+    }
+
+    @Override
+    public int getNumberOfFields() {
+        return fields.size();
+    }
+
+    @Override
+    public LinkedHashSet<String> getFieldNames() {
+        // TODO: Check if this already is a LinkedHashSet.
+        return new LinkedHashSet<>(fields.keySet());
+    }
+
+    @Override
+    public PlcField getField(String name) {
+        return fields.get(name);
+    }
+
+    @Override
+    public List<PlcField> getFields() {
+        return new LinkedList<>(fields.values());
+    }
+
+    @Override
+    public List<Pair<String, PlcField>> getNamedFields() {
+        return fields.entrySet()
+            .stream()
+            .map(stringPlcFieldEntry -> Pair.of(stringPlcFieldEntry.getKey(), stringPlcFieldEntry.getValue()))
+            .collect(Collectors.toCollection(LinkedList::new));
+    }
+
+    protected PlcReader getReader() {
+        return reader;
+    }
+
+    public static class Builder implements PlcReadRequest.Builder {
+
+        private final PlcReader reader;
+        private final PlcFieldHandler fieldHandler;
+        private final Map<String, String> fields;
+
+        public Builder(PlcReader reader, PlcFieldHandler fieldHandler) {
+            this.reader = reader;
+            this.fieldHandler = fieldHandler;
+            fields = new TreeMap<>();
+        }
+
+        @Override
+        public PlcReadRequest.Builder addItem(String name, String fieldQuery) {
+            if (fields.containsKey(name)) {
+                throw new PlcRuntimeException("Duplicate field definition '" + name + "'");
+            }
+            fields.put(name, fieldQuery);
+            return this;
+        }
+
+        @Override
+        public PlcReadRequest build() {
+            LinkedHashMap<String, PlcField> parsedFields = new LinkedHashMap<>();
+            fields.forEach((name, fieldQuery) -> {
+                PlcField parsedField = fieldHandler.createField(fieldQuery);
+                parsedFields.put(name, parsedField);
+            });
+            return new DefaultPlcReadRequest(reader, parsedFields);
+        }
+
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadResponse.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadResponse.java
index 035cf89b524..7693372f74b 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadResponse.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadResponse.java
@@ -1,616 +1,616 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.messages;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.Duration;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.*;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-
-public class DefaultPlcReadResponse implements InternalPlcReadResponse {
-
-    private final InternalPlcReadRequest request;
-    private final Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> values;
-
-    public DefaultPlcReadResponse(InternalPlcReadRequest request, Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> fields) {
-        this.request = request;
-        this.values = fields;
-    }
-
-    @Override
-    public InternalPlcReadRequest getRequest() {
-        return request;
-    }
-
-    @Override
-    public int getNumberOfValues(String name) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.getNumberOfValues();
-    }
-
-    @Override
-    public Collection<String> getFieldNames() {
-        return request.getFieldNames();
-    }
-
-    @Override
-    public PlcField getField(String name) {
-        return request.getField(name);
-    }
-
-    @Override
-    public PlcResponseCode getResponseCode(String name) {
-        if (values.get(name) == null) {
-            throw new PlcInvalidFieldException(name);
-        }
-        return values.get(name).getKey();
-    }
-
-    @Override
-    public Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> getValues() {
-        return values;
-    }
-
-    @Override
-    public Object getObject(String name) {
-        if(getFieldInternal(name).getNumberOfValues()>1) {
-            return getAllObjects(name);
-        }
-        else{
-            return getObject(name, 0);
-        }
-    }
-
-    @Override
-    public Object getObject(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.getObject(index);
-    }
-
-    @Override
-    public Collection<Object> getAllObjects(String name) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        int num = fieldInternal.getNumberOfValues();
-        List<Object> objectList = new ArrayList<>(num);
-        for (int i = 0; i < num; i++) {
-            objectList.add(fieldInternal.getObject(i));
-        }
-        return objectList;
-    }
-
-    @Override
-    public boolean isValidBoolean(String name) {
-        return isValidBoolean(name, 0);
-    }
-
-    @Override
-    public boolean isValidBoolean(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.isValidBoolean(index);
-    }
-
-    @Override
-    public Boolean getBoolean(String name) {
-        return getBoolean(name, 0);
-    }
-
-    @Override
-    public Boolean getBoolean(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.getBoolean(index);
-    }
-
-    @Override
-    public Collection<Boolean> getAllBooleans(String name) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        int num = fieldInternal.getNumberOfValues();
-        List<Boolean> values = new ArrayList<>(num);
-        for (int i = 0; i < num; i++) {
-            values.add(fieldInternal.getBoolean(i));
-        }
-        return values;
-    }
-
-    @Override
-    public boolean isValidByte(String name) {
-        return isValidByte(name, 0);
-    }
-
-    @Override
-    public boolean isValidByte(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.isValidByte(index);
-    }
-
-    @Override
-    public Byte getByte(String name) {
-        return getByte(name, 0);
-    }
-
-    @Override
-    public Byte getByte(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.getByte(index);
-    }
-
-    @Override
-    public Collection<Byte> getAllBytes(String name) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        int num = fieldInternal.getNumberOfValues();
-        List<Byte> values = new ArrayList<>(num);
-        for (int i = 0; i < num; i++) {
-            values.add(fieldInternal.getByte(i));
-        }
-        return values;
-    }
-
-    @Override
-    public boolean isValidShort(String name) {
-        return isValidShort(name, 0);
-    }
-
-    @Override
-    public boolean isValidShort(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.isValidShort(index);
-    }
-
-    @Override
-    public Short getShort(String name) {
-        return getShort(name, 0);
-    }
-
-    @Override
-    public Short getShort(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.getShort(index);
-    }
-
-    @Override
-    public Collection<Short> getAllShorts(String name) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        int num = fieldInternal.getNumberOfValues();
-        List<Short> values = new ArrayList<>(num);
-        for (int i = 0; i < num; i++) {
-            values.add(fieldInternal.getShort(i));
-        }
-        return values;
-    }
-
-    @Override
-    public boolean isValidInteger(String name) {
-        return isValidInteger(name, 0);
-    }
-
-    @Override
-    public boolean isValidInteger(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.isValidInteger(index);
-    }
-
-    @Override
-    public Integer getInteger(String name) {
-        return getInteger(name, 0);
-    }
-
-    @Override
-    public Integer getInteger(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.getInteger(index);
-    }
-
-    @Override
-    public Collection<Integer> getAllIntegers(String name) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        int num = fieldInternal.getNumberOfValues();
-        List<Integer> values = new ArrayList<>(num);
-        for (int i = 0; i < num; i++) {
-            values.add(fieldInternal.getInteger(i));
-        }
-        return values;
-    }
-
-    @Override
-    public boolean isValidBigInteger(String name) {
-        return isValidBigInteger(name, 0);
-    }
-
-    @Override
-    public boolean isValidBigInteger(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.isValidInteger(index);
-    }
-
-    @Override
-    public BigInteger getBigInteger(String name) {
-        return getBigInteger(name, 0);
-    }
-
-    @Override
-    public BigInteger getBigInteger(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.getBigInteger(index);
-    }
-
-    @Override
-    public Collection<BigInteger> getAllBigIntegers(String name) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        int num = fieldInternal.getNumberOfValues();
-        List<BigInteger> values = new ArrayList<>(num);
-        for (int i = 0; i < num; i++) {
-            values.add(fieldInternal.getBigInteger(i));
-        }
-        return values;
-    }
-
-    @Override
-    public boolean isValidLong(String name) {
-        return isValidLong(name, 0);
-    }
-
-    @Override
-    public boolean isValidLong(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.isValidLong(index);
-    }
-
-    @Override
-    public Long getLong(String name) {
-        return getLong(name, 0);
-    }
-
-    @Override
-    public Long getLong(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.getLong(index);
-    }
-
-    @Override
-    public Collection<Long> getAllLongs(String name) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        int num = fieldInternal.getNumberOfValues();
-        List<Long> values = new ArrayList<>(num);
-        for (int i = 0; i < num; i++) {
-            values.add(fieldInternal.getLong(i));
-        }
-        return values;
-    }
-
-    @Override
-    public boolean isValidFloat(String name) {
-        return isValidFloat(name, 0);
-    }
-
-    @Override
-    public boolean isValidFloat(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.isValidFloat(index);
-    }
-
-    @Override
-    public Float getFloat(String name) {
-        return getFloat(name, 0);
-    }
-
-    @Override
-    public Float getFloat(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.getFloat(index);
-    }
-
-    @Override
-    public Collection<Float> getAllFloats(String name) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        int num = fieldInternal.getNumberOfValues();
-        List<Float> values = new ArrayList<>(num);
-        for (int i = 0; i < num; i++) {
-            values.add(fieldInternal.getFloat(i));
-        }
-        return values;
-    }
-
-    @Override
-    public boolean isValidDouble(String name) {
-        return isValidDouble(name, 0);
-    }
-
-    @Override
-    public boolean isValidDouble(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.isValidDouble(index);
-    }
-
-    @Override
-    public Double getDouble(String name) {
-        return getDouble(name, 0);
-    }
-
-    @Override
-    public Double getDouble(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.getDouble(index);
-    }
-
-    @Override
-    public Collection<Double> getAllDoubles(String name) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        int num = fieldInternal.getNumberOfValues();
-        List<Double> values = new ArrayList<>(num);
-        for (int i = 0; i < num; i++) {
-            values.add(fieldInternal.getDouble(i));
-        }
-        return values;
-    }
-
-    @Override
-    public boolean isValidBigDecimal(String name) {
-        return isValidBigDecimal(name, 0);
-    }
-
-    @Override
-    public boolean isValidBigDecimal(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.isValidBigDecimal(index);
-    }
-
-    @Override
-    public BigDecimal getBigDecimal(String name) {
-        return getBigDecimal(name, 0);
-    }
-
-    @Override
-    public BigDecimal getBigDecimal(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.getBigDecimal(index);
-    }
-
-    @Override
-    public Collection<BigDecimal> getAllBigDecimals(String name) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        int num = fieldInternal.getNumberOfValues();
-        List<BigDecimal> values = new ArrayList<>(num);
-        for (int i = 0; i < num; i++) {
-            values.add(fieldInternal.getBigDecimal(i));
-        }
-        return values;
-    }
-
-    @Override
-    public boolean isValidString(String name) {
-        return isValidString(name, 0);
-    }
-
-    @Override
-    public boolean isValidString(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.isValidString(index);
-    }
-
-    @Override
-    public String getString(String name) {
-        return getString(name, 0);
-    }
-
-    @Override
-    public String getString(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.getString(index);
-    }
-
-    @Override
-    public Collection<String> getAllStrings(String name) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        int num = fieldInternal.getNumberOfValues();
-        List<String> values = new ArrayList<>(num);
-        for (int i = 0; i < num; i++) {
-            values.add(fieldInternal.getString(i));
-        }
-        return values;
-    }
-
-    @Override
-    public boolean isValidTime(String name) {
-        return isValidTime(name, 0);
-    }
-
-    @Override
-    public boolean isValidTime(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.isValidTime(index);
-    }
-
-    @Override
-    public LocalTime getTime(String name) {
-        return getTime(name, 0);
-    }
-
-    @Override
-    public LocalTime getTime(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.getTime(index);
-    }
-
-    @Override
-    public Collection<LocalTime> getAllTimes(String name) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        int num = fieldInternal.getNumberOfValues();
-        List<LocalTime> values = new ArrayList<>(num);
-        for (int i = 0; i < num; i++) {
-            values.add(fieldInternal.getTime(i));
-        }
-        return values;
-    }
-
-    @Override
-    public boolean isValidDate(String name) {
-        return isValidDate(name, 0);
-    }
-
-    @Override
-    public boolean isValidDate(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.isValidDate(index);
-    }
-
-    @Override
-    public LocalDate getDate(String name) {
-        return getDate(name, 0);
-    }
-
-    @Override
-    public LocalDate getDate(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.getDate(index);
-    }
-
-    @Override
-    public Collection<LocalDate> getAllDates(String name) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        int num = fieldInternal.getNumberOfValues();
-        List<LocalDate> values = new ArrayList<>(num);
-        for (int i = 0; i < num; i++) {
-            values.add(fieldInternal.getDate(i));
-        }
-        return values;
-    }
-
-    @Override
-    public boolean isValidDateTime(String name) {
-        return isValidDateTime(name, 0);
-    }
-
-    @Override
-    public boolean isValidDateTime(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.isValidDateTime(index);
-    }
-
-    @Override
-    public LocalDateTime getDateTime(String name) {
-        return getDateTime(name, 0);
-    }
-
-    @Override
-    public LocalDateTime getDateTime(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.getDateTime(index);
-    }
-
-    @Override
-    public Collection<LocalDateTime> getAllDateTimes(String name) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        int num = fieldInternal.getNumberOfValues();
-        List<LocalDateTime> values = new ArrayList<>(num);
-        for (int i = 0; i < num; i++) {
-            values.add(fieldInternal.getDateTime(i));
-        }
-        return values;
-    }
-
-    @Override
-    public boolean isValidDuration(String name) {
-        return isValidDuration(name, 0);
-    }
-
-    @Override
-    public boolean isValidDuration(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.isValidDateTime(index);        
-    }
-
-    @Override
-    public Duration getDuration(String name) {
-        return getDuration(name, 0);
-    }
-
-    @Override
-    public Duration getDuration(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.getDuration(index);
-    }
-
-    @Override
-    public Collection<Duration> getAllDuration(String name) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        int num = fieldInternal.getNumberOfValues();
-        List<Duration> values = new ArrayList<>(num);
-        for (int i = 0; i < num; i++) {
-            values.add(fieldInternal.getDuration(i));
-        }
-        return values;
-    }
-
-    @Override
-    public boolean isValidByteArray(String name) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.isValidByteArray(0);
-    }
-
-    @Override
-    public boolean isValidByteArray(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.isValidByteArray(index);
-    }
-
-    @Override
-    public Byte[] getByteArray(String name) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.getByteArray(0);
-    }
-
-    @Override
-    public Byte[] getByteArray(String name, int index) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        return fieldInternal.getByteArray(index);
-    }
-
-    @Override
-    public Collection<Byte[]> getAllByteArrays(String name) {
-        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
-        int num = fieldInternal.getNumberOfValues();
-        List<Byte[]> values = new ArrayList<>(num);
-        for (int i = 0; i < num; i++) {
-            values.add(fieldInternal.getByteArray(i));
-        }
-        return values;
-    }
-
-    protected BaseDefaultFieldItem getFieldInternal(String name) {
-        Objects.requireNonNull(name, "Name argument required");
-        // If this field doesn't exist, ignore it.
-        if (values.get(name) == null) {
-            throw new PlcInvalidFieldException(name);
-        }
-        if (values.get(name).getKey() != PlcResponseCode.OK) {
-            throw new PlcRuntimeException("Field '" + name + "' could not be fetched, response was " + values.get(name).getKey());
-        }
-        // No need to check for "null" as this is already captured by the constructors.
-        return values.get(name).getValue();
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.messages;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.*;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+
+public class DefaultPlcReadResponse implements InternalPlcReadResponse {
+
+    private final InternalPlcReadRequest request;
+    private final Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> values;
+
+    public DefaultPlcReadResponse(InternalPlcReadRequest request, Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> fields) {
+        this.request = request;
+        this.values = fields;
+    }
+
+    @Override
+    public InternalPlcReadRequest getRequest() {
+        return request;
+    }
+
+    @Override
+    public int getNumberOfValues(String name) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.getNumberOfValues();
+    }
+
+    @Override
+    public Collection<String> getFieldNames() {
+        return request.getFieldNames();
+    }
+
+    @Override
+    public PlcField getField(String name) {
+        return request.getField(name);
+    }
+
+    @Override
+    public PlcResponseCode getResponseCode(String name) {
+        if (values.get(name) == null) {
+            throw new PlcInvalidFieldException(name);
+        }
+        return values.get(name).getKey();
+    }
+
+    @Override
+    public Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> getValues() {
+        return values;
+    }
+
+    @Override
+    public Object getObject(String name) {
+        if(getFieldInternal(name).getNumberOfValues()>1) {
+            return getAllObjects(name);
+        }
+        else{
+            return getObject(name, 0);
+        }
+    }
+
+    @Override
+    public Object getObject(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.getObject(index);
+    }
+
+    @Override
+    public Collection<Object> getAllObjects(String name) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        int num = fieldInternal.getNumberOfValues();
+        List<Object> objectList = new ArrayList<>(num);
+        for (int i = 0; i < num; i++) {
+            objectList.add(fieldInternal.getObject(i));
+        }
+        return objectList;
+    }
+
+    @Override
+    public boolean isValidBoolean(String name) {
+        return isValidBoolean(name, 0);
+    }
+
+    @Override
+    public boolean isValidBoolean(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.isValidBoolean(index);
+    }
+
+    @Override
+    public Boolean getBoolean(String name) {
+        return getBoolean(name, 0);
+    }
+
+    @Override
+    public Boolean getBoolean(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.getBoolean(index);
+    }
+
+    @Override
+    public Collection<Boolean> getAllBooleans(String name) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        int num = fieldInternal.getNumberOfValues();
+        List<Boolean> values = new ArrayList<>(num);
+        for (int i = 0; i < num; i++) {
+            values.add(fieldInternal.getBoolean(i));
+        }
+        return values;
+    }
+
+    @Override
+    public boolean isValidByte(String name) {
+        return isValidByte(name, 0);
+    }
+
+    @Override
+    public boolean isValidByte(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.isValidByte(index);
+    }
+
+    @Override
+    public Byte getByte(String name) {
+        return getByte(name, 0);
+    }
+
+    @Override
+    public Byte getByte(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.getByte(index);
+    }
+
+    @Override
+    public Collection<Byte> getAllBytes(String name) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        int num = fieldInternal.getNumberOfValues();
+        List<Byte> values = new ArrayList<>(num);
+        for (int i = 0; i < num; i++) {
+            values.add(fieldInternal.getByte(i));
+        }
+        return values;
+    }
+
+    @Override
+    public boolean isValidShort(String name) {
+        return isValidShort(name, 0);
+    }
+
+    @Override
+    public boolean isValidShort(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.isValidShort(index);
+    }
+
+    @Override
+    public Short getShort(String name) {
+        return getShort(name, 0);
+    }
+
+    @Override
+    public Short getShort(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.getShort(index);
+    }
+
+    @Override
+    public Collection<Short> getAllShorts(String name) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        int num = fieldInternal.getNumberOfValues();
+        List<Short> values = new ArrayList<>(num);
+        for (int i = 0; i < num; i++) {
+            values.add(fieldInternal.getShort(i));
+        }
+        return values;
+    }
+
+    @Override
+    public boolean isValidInteger(String name) {
+        return isValidInteger(name, 0);
+    }
+
+    @Override
+    public boolean isValidInteger(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.isValidInteger(index);
+    }
+
+    @Override
+    public Integer getInteger(String name) {
+        return getInteger(name, 0);
+    }
+
+    @Override
+    public Integer getInteger(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.getInteger(index);
+    }
+
+    @Override
+    public Collection<Integer> getAllIntegers(String name) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        int num = fieldInternal.getNumberOfValues();
+        List<Integer> values = new ArrayList<>(num);
+        for (int i = 0; i < num; i++) {
+            values.add(fieldInternal.getInteger(i));
+        }
+        return values;
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name) {
+        return isValidBigInteger(name, 0);
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.isValidInteger(index);
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name) {
+        return getBigInteger(name, 0);
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.getBigInteger(index);
+    }
+
+    @Override
+    public Collection<BigInteger> getAllBigIntegers(String name) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        int num = fieldInternal.getNumberOfValues();
+        List<BigInteger> values = new ArrayList<>(num);
+        for (int i = 0; i < num; i++) {
+            values.add(fieldInternal.getBigInteger(i));
+        }
+        return values;
+    }
+
+    @Override
+    public boolean isValidLong(String name) {
+        return isValidLong(name, 0);
+    }
+
+    @Override
+    public boolean isValidLong(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.isValidLong(index);
+    }
+
+    @Override
+    public Long getLong(String name) {
+        return getLong(name, 0);
+    }
+
+    @Override
+    public Long getLong(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.getLong(index);
+    }
+
+    @Override
+    public Collection<Long> getAllLongs(String name) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        int num = fieldInternal.getNumberOfValues();
+        List<Long> values = new ArrayList<>(num);
+        for (int i = 0; i < num; i++) {
+            values.add(fieldInternal.getLong(i));
+        }
+        return values;
+    }
+
+    @Override
+    public boolean isValidFloat(String name) {
+        return isValidFloat(name, 0);
+    }
+
+    @Override
+    public boolean isValidFloat(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.isValidFloat(index);
+    }
+
+    @Override
+    public Float getFloat(String name) {
+        return getFloat(name, 0);
+    }
+
+    @Override
+    public Float getFloat(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.getFloat(index);
+    }
+
+    @Override
+    public Collection<Float> getAllFloats(String name) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        int num = fieldInternal.getNumberOfValues();
+        List<Float> values = new ArrayList<>(num);
+        for (int i = 0; i < num; i++) {
+            values.add(fieldInternal.getFloat(i));
+        }
+        return values;
+    }
+
+    @Override
+    public boolean isValidDouble(String name) {
+        return isValidDouble(name, 0);
+    }
+
+    @Override
+    public boolean isValidDouble(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.isValidDouble(index);
+    }
+
+    @Override
+    public Double getDouble(String name) {
+        return getDouble(name, 0);
+    }
+
+    @Override
+    public Double getDouble(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.getDouble(index);
+    }
+
+    @Override
+    public Collection<Double> getAllDoubles(String name) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        int num = fieldInternal.getNumberOfValues();
+        List<Double> values = new ArrayList<>(num);
+        for (int i = 0; i < num; i++) {
+            values.add(fieldInternal.getDouble(i));
+        }
+        return values;
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name) {
+        return isValidBigDecimal(name, 0);
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.isValidBigDecimal(index);
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name) {
+        return getBigDecimal(name, 0);
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.getBigDecimal(index);
+    }
+
+    @Override
+    public Collection<BigDecimal> getAllBigDecimals(String name) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        int num = fieldInternal.getNumberOfValues();
+        List<BigDecimal> values = new ArrayList<>(num);
+        for (int i = 0; i < num; i++) {
+            values.add(fieldInternal.getBigDecimal(i));
+        }
+        return values;
+    }
+
+    @Override
+    public boolean isValidString(String name) {
+        return isValidString(name, 0);
+    }
+
+    @Override
+    public boolean isValidString(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.isValidString(index);
+    }
+
+    @Override
+    public String getString(String name) {
+        return getString(name, 0);
+    }
+
+    @Override
+    public String getString(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.getString(index);
+    }
+
+    @Override
+    public Collection<String> getAllStrings(String name) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        int num = fieldInternal.getNumberOfValues();
+        List<String> values = new ArrayList<>(num);
+        for (int i = 0; i < num; i++) {
+            values.add(fieldInternal.getString(i));
+        }
+        return values;
+    }
+
+    @Override
+    public boolean isValidTime(String name) {
+        return isValidTime(name, 0);
+    }
+
+    @Override
+    public boolean isValidTime(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.isValidTime(index);
+    }
+
+    @Override
+    public LocalTime getTime(String name) {
+        return getTime(name, 0);
+    }
+
+    @Override
+    public LocalTime getTime(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.getTime(index);
+    }
+
+    @Override
+    public Collection<LocalTime> getAllTimes(String name) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        int num = fieldInternal.getNumberOfValues();
+        List<LocalTime> values = new ArrayList<>(num);
+        for (int i = 0; i < num; i++) {
+            values.add(fieldInternal.getTime(i));
+        }
+        return values;
+    }
+
+    @Override
+    public boolean isValidDate(String name) {
+        return isValidDate(name, 0);
+    }
+
+    @Override
+    public boolean isValidDate(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.isValidDate(index);
+    }
+
+    @Override
+    public LocalDate getDate(String name) {
+        return getDate(name, 0);
+    }
+
+    @Override
+    public LocalDate getDate(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.getDate(index);
+    }
+
+    @Override
+    public Collection<LocalDate> getAllDates(String name) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        int num = fieldInternal.getNumberOfValues();
+        List<LocalDate> values = new ArrayList<>(num);
+        for (int i = 0; i < num; i++) {
+            values.add(fieldInternal.getDate(i));
+        }
+        return values;
+    }
+
+    @Override
+    public boolean isValidDateTime(String name) {
+        return isValidDateTime(name, 0);
+    }
+
+    @Override
+    public boolean isValidDateTime(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.isValidDateTime(index);
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name) {
+        return getDateTime(name, 0);
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.getDateTime(index);
+    }
+
+    @Override
+    public Collection<LocalDateTime> getAllDateTimes(String name) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        int num = fieldInternal.getNumberOfValues();
+        List<LocalDateTime> values = new ArrayList<>(num);
+        for (int i = 0; i < num; i++) {
+            values.add(fieldInternal.getDateTime(i));
+        }
+        return values;
+    }
+
+    @Override
+    public boolean isValidDuration(String name) {
+        return isValidDuration(name, 0);
+    }
+
+    @Override
+    public boolean isValidDuration(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.isValidDateTime(index);        
+    }
+
+    @Override
+    public Duration getDuration(String name) {
+        return getDuration(name, 0);
+    }
+
+    @Override
+    public Duration getDuration(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.getDuration(index);
+    }
+
+    @Override
+    public Collection<Duration> getAllDuration(String name) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        int num = fieldInternal.getNumberOfValues();
+        List<Duration> values = new ArrayList<>(num);
+        for (int i = 0; i < num; i++) {
+            values.add(fieldInternal.getDuration(i));
+        }
+        return values;
+    }
+
+    @Override
+    public boolean isValidByteArray(String name) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.isValidByteArray(0);
+    }
+
+    @Override
+    public boolean isValidByteArray(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.isValidByteArray(index);
+    }
+
+    @Override
+    public Byte[] getByteArray(String name) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.getByteArray(0);
+    }
+
+    @Override
+    public Byte[] getByteArray(String name, int index) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        return fieldInternal.getByteArray(index);
+    }
+
+    @Override
+    public Collection<Byte[]> getAllByteArrays(String name) {
+        BaseDefaultFieldItem fieldInternal = getFieldInternal(name);
+        int num = fieldInternal.getNumberOfValues();
+        List<Byte[]> values = new ArrayList<>(num);
+        for (int i = 0; i < num; i++) {
+            values.add(fieldInternal.getByteArray(i));
+        }
+        return values;
+    }
+
+    protected BaseDefaultFieldItem getFieldInternal(String name) {
+        Objects.requireNonNull(name, "Name argument required");
+        // If this field doesn't exist, ignore it.
+        if (values.get(name) == null) {
+            throw new PlcInvalidFieldException(name);
+        }
+        if (values.get(name).getKey() != PlcResponseCode.OK) {
+            throw new PlcRuntimeException("Field '" + name + "' could not be fetched, response was " + values.get(name).getKey());
+        }
+        // No need to check for "null" as this is already captured by the constructors.
+        return values.get(name).getValue();
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionEvent.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionEvent.java
index 65aa48961f6..ff5b473402f 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionEvent.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionEvent.java
@@ -1,55 +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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-
-import java.time.Instant;
-import java.util.Collection;
-import java.util.Map;
-
-public class DefaultPlcSubscriptionEvent extends DefaultPlcReadResponse implements InternalPlcSubscriptionEvent {
-
-    public final Instant timestamp;
-
-    public DefaultPlcSubscriptionEvent(Instant timestamp, Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> fields) {
-        super(null, fields);
-        this.timestamp = timestamp;
-    }
-
-    @Override
-    public Collection<String> getFieldNames() {
-        return getValues().keySet();
-    }
-
-    @Override
-    public PlcField getField(String name) {
-        throw new UnsupportedOperationException("getField('" + name + "') not supported on " + this.getClass());
-    }
-
-    @Override
-    public Instant getTimestamp() {
-        return timestamp;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+
+import java.time.Instant;
+import java.util.Collection;
+import java.util.Map;
+
+public class DefaultPlcSubscriptionEvent extends DefaultPlcReadResponse implements InternalPlcSubscriptionEvent {
+
+    public final Instant timestamp;
+
+    public DefaultPlcSubscriptionEvent(Instant timestamp, Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> fields) {
+        super(null, fields);
+        this.timestamp = timestamp;
+    }
+
+    @Override
+    public Collection<String> getFieldNames() {
+        return getValues().keySet();
+    }
+
+    @Override
+    public PlcField getField(String name) {
+        throw new UnsupportedOperationException("getField('" + name + "') not supported on " + this.getClass());
+    }
+
+    @Override
+    public Instant getTimestamp() {
+        return timestamp;
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionRequest.java
index 5fca8a8c373..622c1a94d17 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionRequest.java
@@ -1,168 +1,168 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.types.PlcSubscriptionType;
-import org.apache.plc4x.java.base.connection.PlcFieldHandler;
-import org.apache.plc4x.java.base.model.SubscriptionPlcField;
-
-import java.time.Duration;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
-
-public class DefaultPlcSubscriptionRequest implements InternalPlcSubscriptionRequest, InternalPlcFieldRequest {
-
-    private final PlcSubscriber subscriber;
-
-    private LinkedHashMap<String, SubscriptionPlcField> fields;
-
-    public DefaultPlcSubscriptionRequest(PlcSubscriber subscriber, LinkedHashMap<String, SubscriptionPlcField> fields) {
-        this.subscriber = subscriber;
-        this.fields = fields;
-    }
-
-    @Override
-    public CompletableFuture<PlcSubscriptionResponse> execute() {
-        return subscriber.subscribe(this);
-    }
-
-    @Override
-    public int getNumberOfFields() {
-        return fields.size();
-    }
-
-    @Override
-    public LinkedHashSet<String> getFieldNames() {
-        return new LinkedHashSet<>(fields.keySet());
-    }
-
-    @Override
-    public PlcField getField(String name) {
-        SubscriptionPlcField subscriptionPlcField = fields.get(name);
-        if (subscriptionPlcField == null) {
-            return null;
-        }
-        return subscriptionPlcField.getPlcField();
-    }
-
-    @Override
-    public List<PlcField> getFields() {
-        return fields.values().stream().map(SubscriptionPlcField::getPlcField).collect(Collectors.toCollection(LinkedList::new));
-    }
-
-    @Override
-    public List<SubscriptionPlcField> getSubscriptionFields() {
-        return new LinkedList<>(fields.values());
-    }
-
-    @Override
-    public LinkedHashMap<String, SubscriptionPlcField> getSubscriptionPlcFieldMap() {
-        return fields;
-    }
-
-    @Override
-    public List<Pair<String, PlcField>> getNamedFields() {
-        return fields.entrySet()
-            .stream()
-            .map(stringPlcFieldEntry -> Pair.of(stringPlcFieldEntry.getKey(), stringPlcFieldEntry.getValue().getPlcField()))
-            .collect(Collectors.toCollection(LinkedList::new));
-    }
-
-    @Override
-    public List<Pair<String, SubscriptionPlcField>> getNamedSubscriptionFields() {
-        return fields.entrySet()
-            .stream()
-            .map(stringPlcFieldEntry -> Pair.of(stringPlcFieldEntry.getKey(), stringPlcFieldEntry.getValue()))
-            .collect(Collectors.toCollection(LinkedList::new));
-    }
-
-    protected PlcSubscriber getSubscriber() {
-        return subscriber;
-    }
-
-    public static class Builder implements PlcSubscriptionRequest.Builder {
-
-        private final PlcSubscriber subscriber;
-        private final PlcFieldHandler fieldHandler;
-        private final Map<String, BuilderItem> fields;
-
-        public Builder(PlcSubscriber subscriber, PlcFieldHandler fieldHandler) {
-            this.subscriber = subscriber;
-            this.fieldHandler = fieldHandler;
-            fields = new TreeMap<>();
-        }
-
-        @Override
-        public PlcSubscriptionRequest.Builder addCyclicField(String name, String fieldQuery, Duration pollingInterval) {
-            fields.put(name, new BuilderItem(fieldQuery, PlcSubscriptionType.CYCLIC, pollingInterval));
-            return this;
-        }
-
-        @Override
-        public PlcSubscriptionRequest.Builder addChangeOfStateField(String name, String fieldQuery) {
-            fields.put(name, new BuilderItem(fieldQuery, PlcSubscriptionType.CHANGE_OF_STATE));
-            return this;
-        }
-
-        @Override
-        public PlcSubscriptionRequest.Builder addEventField(String name, String fieldQuery) {
-            if (fields.containsKey(name)) {
-                throw new PlcRuntimeException("Duplicate field definition '" + name + "'");
-            }
-            fields.put(name, new BuilderItem(fieldQuery, PlcSubscriptionType.EVENT));
-            return this;
-        }
-
-        @Override
-        public PlcSubscriptionRequest build() {
-            LinkedHashMap<String, SubscriptionPlcField> parsedFields = new LinkedHashMap<>();
-
-            fields.forEach((name, builderItem) -> {
-                PlcField parsedField = fieldHandler.createField(builderItem.fieldQuery);
-                parsedFields.put(name, new SubscriptionPlcField(builderItem.plcSubscriptionType, parsedField, builderItem.duration));
-            });
-            return new DefaultPlcSubscriptionRequest(subscriber, parsedFields);
-        }
-
-        private static class BuilderItem {
-            private final String fieldQuery;
-            private final PlcSubscriptionType plcSubscriptionType;
-            private final Duration duration;
-
-            private BuilderItem(String fieldQuery, PlcSubscriptionType plcSubscriptionType) {
-                this(fieldQuery, plcSubscriptionType, null);
-            }
-
-            private BuilderItem(String fieldQuery, PlcSubscriptionType plcSubscriptionType, Duration duration) {
-                this.fieldQuery = fieldQuery;
-                this.plcSubscriptionType = plcSubscriptionType;
-                this.duration = duration;
-            }
-
-        }
-
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcSubscriptionType;
+import org.apache.plc4x.java.base.connection.PlcFieldHandler;
+import org.apache.plc4x.java.base.model.SubscriptionPlcField;
+
+import java.time.Duration;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+
+public class DefaultPlcSubscriptionRequest implements InternalPlcSubscriptionRequest, InternalPlcFieldRequest {
+
+    private final PlcSubscriber subscriber;
+
+    private LinkedHashMap<String, SubscriptionPlcField> fields;
+
+    public DefaultPlcSubscriptionRequest(PlcSubscriber subscriber, LinkedHashMap<String, SubscriptionPlcField> fields) {
+        this.subscriber = subscriber;
+        this.fields = fields;
+    }
+
+    @Override
+    public CompletableFuture<PlcSubscriptionResponse> execute() {
+        return subscriber.subscribe(this);
+    }
+
+    @Override
+    public int getNumberOfFields() {
+        return fields.size();
+    }
+
+    @Override
+    public LinkedHashSet<String> getFieldNames() {
+        return new LinkedHashSet<>(fields.keySet());
+    }
+
+    @Override
+    public PlcField getField(String name) {
+        SubscriptionPlcField subscriptionPlcField = fields.get(name);
+        if (subscriptionPlcField == null) {
+            return null;
+        }
+        return subscriptionPlcField.getPlcField();
+    }
+
+    @Override
+    public List<PlcField> getFields() {
+        return fields.values().stream().map(SubscriptionPlcField::getPlcField).collect(Collectors.toCollection(LinkedList::new));
+    }
+
+    @Override
+    public List<SubscriptionPlcField> getSubscriptionFields() {
+        return new LinkedList<>(fields.values());
+    }
+
+    @Override
+    public LinkedHashMap<String, SubscriptionPlcField> getSubscriptionPlcFieldMap() {
+        return fields;
+    }
+
+    @Override
+    public List<Pair<String, PlcField>> getNamedFields() {
+        return fields.entrySet()
+            .stream()
+            .map(stringPlcFieldEntry -> Pair.of(stringPlcFieldEntry.getKey(), stringPlcFieldEntry.getValue().getPlcField()))
+            .collect(Collectors.toCollection(LinkedList::new));
+    }
+
+    @Override
+    public List<Pair<String, SubscriptionPlcField>> getNamedSubscriptionFields() {
+        return fields.entrySet()
+            .stream()
+            .map(stringPlcFieldEntry -> Pair.of(stringPlcFieldEntry.getKey(), stringPlcFieldEntry.getValue()))
+            .collect(Collectors.toCollection(LinkedList::new));
+    }
+
+    protected PlcSubscriber getSubscriber() {
+        return subscriber;
+    }
+
+    public static class Builder implements PlcSubscriptionRequest.Builder {
+
+        private final PlcSubscriber subscriber;
+        private final PlcFieldHandler fieldHandler;
+        private final Map<String, BuilderItem> fields;
+
+        public Builder(PlcSubscriber subscriber, PlcFieldHandler fieldHandler) {
+            this.subscriber = subscriber;
+            this.fieldHandler = fieldHandler;
+            fields = new TreeMap<>();
+        }
+
+        @Override
+        public PlcSubscriptionRequest.Builder addCyclicField(String name, String fieldQuery, Duration pollingInterval) {
+            fields.put(name, new BuilderItem(fieldQuery, PlcSubscriptionType.CYCLIC, pollingInterval));
+            return this;
+        }
+
+        @Override
+        public PlcSubscriptionRequest.Builder addChangeOfStateField(String name, String fieldQuery) {
+            fields.put(name, new BuilderItem(fieldQuery, PlcSubscriptionType.CHANGE_OF_STATE));
+            return this;
+        }
+
+        @Override
+        public PlcSubscriptionRequest.Builder addEventField(String name, String fieldQuery) {
+            if (fields.containsKey(name)) {
+                throw new PlcRuntimeException("Duplicate field definition '" + name + "'");
+            }
+            fields.put(name, new BuilderItem(fieldQuery, PlcSubscriptionType.EVENT));
+            return this;
+        }
+
+        @Override
+        public PlcSubscriptionRequest build() {
+            LinkedHashMap<String, SubscriptionPlcField> parsedFields = new LinkedHashMap<>();
+
+            fields.forEach((name, builderItem) -> {
+                PlcField parsedField = fieldHandler.createField(builderItem.fieldQuery);
+                parsedFields.put(name, new SubscriptionPlcField(builderItem.plcSubscriptionType, parsedField, builderItem.duration));
+            });
+            return new DefaultPlcSubscriptionRequest(subscriber, parsedFields);
+        }
+
+        private static class BuilderItem {
+            private final String fieldQuery;
+            private final PlcSubscriptionType plcSubscriptionType;
+            private final Duration duration;
+
+            private BuilderItem(String fieldQuery, PlcSubscriptionType plcSubscriptionType) {
+                this(fieldQuery, plcSubscriptionType, null);
+            }
+
+            private BuilderItem(String fieldQuery, PlcSubscriptionType plcSubscriptionType, Duration duration) {
+                this.fieldQuery = fieldQuery;
+                this.plcSubscriptionType = plcSubscriptionType;
+                this.duration = duration;
+            }
+
+        }
+
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionResponse.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionResponse.java
index a9ad3cf341e..e5b6bd535fa 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionResponse.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionResponse.java
@@ -1,90 +1,90 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.exceptions.PlcNotImplementedException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-public class DefaultPlcSubscriptionResponse implements InternalPlcSubscriptionResponse {
-
-    private final InternalPlcSubscriptionRequest request;
-
-    private final Map<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> values;
-
-    public DefaultPlcSubscriptionResponse(InternalPlcSubscriptionRequest request, Map<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> values) {
-        this.request = request;
-        this.values = values;
-    }
-
-    @Override
-    public PlcSubscriptionHandle getSubscriptionHandle(String name) {
-        Pair<PlcResponseCode, PlcSubscriptionHandle> response = values.get(name);
-        if (response == null) {
-            return null;
-        }
-        if (response.getKey() != PlcResponseCode.OK) {
-            throw new PlcRuntimeException("Item " + name + " failed to subscribe: " + response.getKey());
-        }
-        return response.getValue();
-    }
-
-    @Override
-    public Collection<String> getFieldNames() {
-        return values.keySet();
-    }
-
-    @Override
-    public PlcField getField(String name) {
-        throw new PlcNotImplementedException("field access not possible as these come async");
-    }
-
-    @Override
-    public PlcResponseCode getResponseCode(String name) {
-        Pair<PlcResponseCode, PlcSubscriptionHandle> response = values.get(name);
-        if (response == null) {
-            return null;
-        }
-        return response.getKey();
-    }
-
-    @Override
-    public PlcSubscriptionRequest getRequest() {
-        return request;
-    }
-
-    @Override
-    public Collection<PlcSubscriptionHandle> getSubscriptionHandles() {
-        return values.values().stream().map(Pair::getValue).collect(Collectors.toList());
-    }
-
-    @Override
-    public Map<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> getValues() {
-        return values;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.exceptions.PlcNotImplementedException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class DefaultPlcSubscriptionResponse implements InternalPlcSubscriptionResponse {
+
+    private final InternalPlcSubscriptionRequest request;
+
+    private final Map<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> values;
+
+    public DefaultPlcSubscriptionResponse(InternalPlcSubscriptionRequest request, Map<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> values) {
+        this.request = request;
+        this.values = values;
+    }
+
+    @Override
+    public PlcSubscriptionHandle getSubscriptionHandle(String name) {
+        Pair<PlcResponseCode, PlcSubscriptionHandle> response = values.get(name);
+        if (response == null) {
+            return null;
+        }
+        if (response.getKey() != PlcResponseCode.OK) {
+            throw new PlcRuntimeException("Item " + name + " failed to subscribe: " + response.getKey());
+        }
+        return response.getValue();
+    }
+
+    @Override
+    public Collection<String> getFieldNames() {
+        return values.keySet();
+    }
+
+    @Override
+    public PlcField getField(String name) {
+        throw new PlcNotImplementedException("field access not possible as these come async");
+    }
+
+    @Override
+    public PlcResponseCode getResponseCode(String name) {
+        Pair<PlcResponseCode, PlcSubscriptionHandle> response = values.get(name);
+        if (response == null) {
+            return null;
+        }
+        return response.getKey();
+    }
+
+    @Override
+    public PlcSubscriptionRequest getRequest() {
+        return request;
+    }
+
+    @Override
+    public Collection<PlcSubscriptionHandle> getSubscriptionHandles() {
+        return values.values().stream().map(Pair::getValue).collect(Collectors.toList());
+    }
+
+    @Override
+    public Map<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> getValues() {
+        return values;
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionRequest.java
index 95856fa92bf..004daa51b3b 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionRequest.java
@@ -1,90 +1,90 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
-import org.apache.plc4x.java.api.messages.PlcUnsubscriptionResponse;
-import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
-import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
-
-public class DefaultPlcUnsubscriptionRequest implements InternalPlcUnsubscriptionRequest, InternalPlcRequest {
-
-    private final PlcSubscriber subscriber;
-
-    private final Collection<? extends InternalPlcSubscriptionHandle> internalPlcSubscriptionHandles;
-
-    public DefaultPlcUnsubscriptionRequest(PlcSubscriber subscriber, Collection<? extends InternalPlcSubscriptionHandle> internalPlcSubscriptionHandles) {
-        this.subscriber = subscriber;
-        this.internalPlcSubscriptionHandles = internalPlcSubscriptionHandles;
-    }
-
-    @Override
-    public CompletableFuture<PlcUnsubscriptionResponse> execute() {
-        return subscriber.unsubscribe(this);
-    }
-
-    @Override
-    public Collection<? extends InternalPlcSubscriptionHandle> getInternalPlcSubscriptionHandles() {
-        return internalPlcSubscriptionHandles;
-    }
-
-    public static class Builder implements PlcUnsubscriptionRequest.Builder {
-
-        private final PlcSubscriber subscriber;
-        private List<InternalPlcSubscriptionHandle> plcSubscriptionHandles;
-
-        public Builder(PlcSubscriber subscriber) {
-            this.subscriber = subscriber;
-            plcSubscriptionHandles = new ArrayList<>();
-        }
-
-        public PlcUnsubscriptionRequest.Builder addHandles(PlcSubscriptionHandle plcSubscriptionHandle) {
-            plcSubscriptionHandles.add((InternalPlcSubscriptionHandle) plcSubscriptionHandle);
-            return this;
-        }
-
-        @Override
-        public PlcUnsubscriptionRequest.Builder addHandles(PlcSubscriptionHandle plcSubscriptionHandle1, PlcSubscriptionHandle... plcSubscriptionHandles) {
-            this.plcSubscriptionHandles.add((InternalPlcSubscriptionHandle) plcSubscriptionHandle1);
-            this.plcSubscriptionHandles.addAll(Arrays.stream(plcSubscriptionHandles).map(InternalPlcSubscriptionHandle.class::cast).collect(Collectors.toList()));
-            return this;
-        }
-
-        @Override
-        public PlcUnsubscriptionRequest.Builder addHandles(Collection<PlcSubscriptionHandle> plcSubscriptionHandles) {
-            this.plcSubscriptionHandles.addAll(plcSubscriptionHandles.stream().map(InternalPlcSubscriptionHandle.class::cast).collect(Collectors.toList()));
-            return this;
-        }
-
-        @Override
-        public PlcUnsubscriptionRequest build() {
-            return new DefaultPlcUnsubscriptionRequest(subscriber, plcSubscriptionHandles);
-        }
-
-
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcUnsubscriptionResponse;
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+
+public class DefaultPlcUnsubscriptionRequest implements InternalPlcUnsubscriptionRequest, InternalPlcRequest {
+
+    private final PlcSubscriber subscriber;
+
+    private final Collection<? extends InternalPlcSubscriptionHandle> internalPlcSubscriptionHandles;
+
+    public DefaultPlcUnsubscriptionRequest(PlcSubscriber subscriber, Collection<? extends InternalPlcSubscriptionHandle> internalPlcSubscriptionHandles) {
+        this.subscriber = subscriber;
+        this.internalPlcSubscriptionHandles = internalPlcSubscriptionHandles;
+    }
+
+    @Override
+    public CompletableFuture<PlcUnsubscriptionResponse> execute() {
+        return subscriber.unsubscribe(this);
+    }
+
+    @Override
+    public Collection<? extends InternalPlcSubscriptionHandle> getInternalPlcSubscriptionHandles() {
+        return internalPlcSubscriptionHandles;
+    }
+
+    public static class Builder implements PlcUnsubscriptionRequest.Builder {
+
+        private final PlcSubscriber subscriber;
+        private List<InternalPlcSubscriptionHandle> plcSubscriptionHandles;
+
+        public Builder(PlcSubscriber subscriber) {
+            this.subscriber = subscriber;
+            plcSubscriptionHandles = new ArrayList<>();
+        }
+
+        public PlcUnsubscriptionRequest.Builder addHandles(PlcSubscriptionHandle plcSubscriptionHandle) {
+            plcSubscriptionHandles.add((InternalPlcSubscriptionHandle) plcSubscriptionHandle);
+            return this;
+        }
+
+        @Override
+        public PlcUnsubscriptionRequest.Builder addHandles(PlcSubscriptionHandle plcSubscriptionHandle1, PlcSubscriptionHandle... plcSubscriptionHandles) {
+            this.plcSubscriptionHandles.add((InternalPlcSubscriptionHandle) plcSubscriptionHandle1);
+            this.plcSubscriptionHandles.addAll(Arrays.stream(plcSubscriptionHandles).map(InternalPlcSubscriptionHandle.class::cast).collect(Collectors.toList()));
+            return this;
+        }
+
+        @Override
+        public PlcUnsubscriptionRequest.Builder addHandles(Collection<PlcSubscriptionHandle> plcSubscriptionHandles) {
+            this.plcSubscriptionHandles.addAll(plcSubscriptionHandles.stream().map(InternalPlcSubscriptionHandle.class::cast).collect(Collectors.toList()));
+            return this;
+        }
+
+        @Override
+        public PlcUnsubscriptionRequest build() {
+            return new DefaultPlcUnsubscriptionRequest(subscriber, plcSubscriptionHandles);
+        }
+
+
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionResponse.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionResponse.java
index c26ac8586c5..4a439bd13f4 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionResponse.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionResponse.java
@@ -1,36 +1,36 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
-
-public class DefaultPlcUnsubscriptionResponse implements InternalPlcUnsubscriptionResponse {
-
-    private final InternalPlcUnsubscriptionRequest request;
-
-    public DefaultPlcUnsubscriptionResponse(InternalPlcUnsubscriptionRequest request) {
-        this.request = request;
-    }
-
-    @Override
-    public PlcUnsubscriptionRequest getRequest() {
-        return request;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
+
+public class DefaultPlcUnsubscriptionResponse implements InternalPlcUnsubscriptionResponse {
+
+    private final InternalPlcUnsubscriptionRequest request;
+
+    public DefaultPlcUnsubscriptionResponse(InternalPlcUnsubscriptionRequest request) {
+        this.request = request;
+    }
+
+    @Override
+    public PlcUnsubscriptionRequest getRequest() {
+        return request;
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java
index af74e05d2b5..ed16880fa31 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java
@@ -1,286 +1,286 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.messages;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.Duration;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.BiFunction;
-import java.util.stream.Collectors;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.commons.lang3.tuple.Triple;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.messages.PlcWriteResponse;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.connection.PlcFieldHandler;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-
-public class DefaultPlcWriteRequest implements InternalPlcWriteRequest, InternalPlcFieldRequest {
-
-    private final PlcWriter writer;
-    private final LinkedHashMap<String, Pair<PlcField, BaseDefaultFieldItem>> fields;
-
-    protected DefaultPlcWriteRequest(PlcWriter writer, LinkedHashMap<String, Pair<PlcField, BaseDefaultFieldItem>> fields) {
-        this.writer = writer;
-        this.fields = fields;
-    }
-
-    @Override
-    public CompletableFuture<PlcWriteResponse> execute() {
-        return writer.write(this);
-    }
-
-    @Override
-    public int getNumberOfFields() {
-        return fields.size();
-    }
-
-    @Override
-    public LinkedHashSet<String> getFieldNames() {
-        // TODO: Check if this already is a LinkedHashSet.
-        return new LinkedHashSet<>(fields.keySet());
-    }
-
-    @Override
-    public PlcField getField(String name) {
-        return fields.get(name).getKey();
-    }
-
-    @Override
-    public List<PlcField> getFields() {
-        return fields.values().stream().map(Pair::getKey).collect(Collectors.toCollection(LinkedList::new));
-    }
-
-    public BaseDefaultFieldItem getFieldItem(String name) {
-        return fields.get(name).getValue();
-    }
-
-    @Override
-    public List<BaseDefaultFieldItem> getFieldItems() {
-        return fields.values().stream().map(Pair::getValue).collect(Collectors.toCollection(LinkedList::new));
-    }
-
-    @Override
-    public List<Pair<String, PlcField>> getNamedFields() {
-        return fields.entrySet()
-            .stream()
-            .map(stringPairEntry ->
-                Pair.of(
-                    stringPairEntry.getKey(),
-                    stringPairEntry.getValue().getKey()
-                )
-            ).collect(Collectors.toCollection(LinkedList::new));
-    }
-
-    @Override
-    public List<Triple<String, PlcField, BaseDefaultFieldItem>> getNamedFieldTriples() {
-        return fields.entrySet()
-            .stream()
-            .map(stringPairEntry ->
-                Triple.of(
-                    stringPairEntry.getKey(),
-                    stringPairEntry.getValue().getKey(),
-                    stringPairEntry.getValue().getValue()
-                )
-            ).collect(Collectors.toCollection(LinkedList::new));
-    }
-
-    @Override
-    public int getNumberOfValues(String name) {
-        return fields.get(name).getValue().getNumberOfValues();
-    }
-
-    public static class Builder implements PlcWriteRequest.Builder {
-
-        private final PlcWriter writer;
-        private final PlcFieldHandler fieldHandler;
-        private final Map<String, BuilderItem<Object>> fields;
-        private final Map<Class<?>, BiFunction<PlcField, Object[], BaseDefaultFieldItem>> handlerMap;
-
-        public Builder(PlcWriter writer, PlcFieldHandler fieldHandler) {
-            this.writer = writer;
-            this.fieldHandler = fieldHandler;
-            fields = new TreeMap<>();
-            handlerMap = new HashMap<>();
-            handlerMap.put(Boolean.class, fieldHandler::encodeBoolean);
-            handlerMap.put(Byte.class, fieldHandler::encodeByte);            
-            handlerMap.put(Short.class, fieldHandler::encodeShort);
-            handlerMap.put(Integer.class, fieldHandler::encodeInteger);            
-            handlerMap.put(BigInteger.class, fieldHandler::encodeBigInteger);
-            handlerMap.put(Long.class, fieldHandler::encodeLong);
-            handlerMap.put(Float.class, fieldHandler::encodeFloat);
-            handlerMap.put(Double.class, fieldHandler::encodeDouble);
-            handlerMap.put(BigDecimal.class, fieldHandler::encodeBigDecimal);
-            handlerMap.put(Character.class, fieldHandler::encodeString);
-            handlerMap.put(String.class, fieldHandler::encodeString);
-            handlerMap.put(LocalTime.class, fieldHandler::encodeTime);
-            handlerMap.put(LocalDate.class, fieldHandler::encodeDate);
-            handlerMap.put(LocalDateTime.class, fieldHandler::encodeDateTime);
-            handlerMap.put(Duration.class, fieldHandler::encodeDuration);
-            //handlerMap.put(byte[].class, fieldHandler::encodeByteArray);
-            //handlerMap.put(Byte[].class, fieldHandler::encodeByteArray);
-            //handlerMap.put(Object[].class, fieldHandler::encodeByteArray);
-        }
-
-        @Override
-        public Builder addItem(String name, String fieldQuery, Boolean... values) {
-            return addItem(name, fieldQuery, values, fieldHandler::encodeBoolean);
-        }
-
-        @Override
-        public Builder addItem(String name, String fieldQuery, Byte... values) {
-            return addItem(name, fieldQuery, values, fieldHandler::encodeByte);
-        }
-
-        @Override
-        public Builder addItem(String name, String fieldQuery, Short... values) {
-            return addItem(name, fieldQuery, values, fieldHandler::encodeShort);
-        }
-
-        @Override
-        public Builder addItem(String name, String fieldQuery, Integer... values) {
-            return addItem(name, fieldQuery, values, fieldHandler::encodeInteger);
-        }
-
-        @Override
-        public PlcWriteRequest.Builder addItem(String name, String fieldQuery, BigInteger... values) {
-            return addItem(name, fieldQuery, values, fieldHandler::encodeBigInteger);
-        }
-
-        @Override
-        public Builder addItem(String name, String fieldQuery, Long... values) {
-            return addItem(name, fieldQuery, values, fieldHandler::encodeLong);
-        }
-
-        @Override
-        public Builder addItem(String name, String fieldQuery, Float... values) {
-            return addItem(name, fieldQuery, values, fieldHandler::encodeFloat);
-        }
-
-        @Override
-        public Builder addItem(String name, String fieldQuery, Double... values) {
-            return addItem(name, fieldQuery, values, fieldHandler::encodeDouble);
-        }
-
-        @Override
-        public Builder addItem(String name, String fieldQuery, BigDecimal... values) {
-            return addItem(name, fieldQuery, values, fieldHandler::encodeBigDecimal);
-        }
-      
-        @Override
-        public Builder addItem(String name, String fieldQuery, String... values) {
-            return addItem(name, fieldQuery, values, fieldHandler::encodeString);
-        }
-
-        @Override
-        public Builder addItem(String name, String fieldQuery, LocalTime... values) {
-            return addItem(name, fieldQuery, values, fieldHandler::encodeTime);
-        }
-
-        @Override
-        public Builder addItem(String name, String fieldQuery, LocalDate... values) {
-            return addItem(name, fieldQuery, values, fieldHandler::encodeDate);
-        }
-
-        @Override
-        public Builder addItem(String name, String fieldQuery, LocalDateTime... values) {
-            return addItem(name, fieldQuery, values, fieldHandler::encodeDateTime);
-        }
-        
-        @Override
-        public Builder addItem(String name, String fieldQuery, Duration... values) {
-            return addItem(name, fieldQuery, values, fieldHandler::encodeDuration);
-        }        
-
-        @Override
-        public Builder addItem(String name, String fieldQuery, byte[]... values) {
-            return addItem(name, fieldQuery, values, fieldHandler::encodeByteArray);
-        }
-
-        @Override
-        public Builder addItem(String name, String fieldQuery, Byte[]... values) {
-            return addItem(name, fieldQuery, values, fieldHandler::encodeByteArray);
-        }
-      
-        //@Override
-     
-
-        @Override
-        public <T> Builder addItem(String name, String fieldQuery, T... values) {
-            Objects.requireNonNull(values);
-            Class<?> checkedClazz = null;
-            for (T value : values) {
-                if (checkedClazz == null) {
-                    checkedClazz = value.getClass();
-                }
-                if (value.getClass() != checkedClazz) {
-                    throw new IllegalArgumentException("Invalid class found " + value.getClass() + ". should all be " + checkedClazz);
-                }
-            }
-            BiFunction<PlcField, Object[], BaseDefaultFieldItem> plcFieldFieldItemBiFunction = handlerMap.get(checkedClazz);
-            if (plcFieldFieldItemBiFunction == null) {
-                throw new IllegalArgumentException("no field handler for " + checkedClazz + " found");
-            }
-            return addItem(name, fieldQuery, values, plcFieldFieldItemBiFunction);
-        }
-
-        @Override
-        public PlcWriteRequest build() {
-            LinkedHashMap<String, Pair<PlcField, BaseDefaultFieldItem>> parsedFields = new LinkedHashMap<>();
-            fields.forEach((name, builderItem) -> {
-                // Compile the query string.
-                PlcField parsedField = fieldHandler.createField(builderItem.fieldQuery);
-                // Encode the payload.
-                // TODO: Depending on the field type, handle the FieldItem creation differently.
-                BaseDefaultFieldItem fieldItem = builderItem.encoder.apply(parsedField, builderItem.values);
-                parsedFields.put(name, new ImmutablePair<>(parsedField, fieldItem));
-            });
-            return new DefaultPlcWriteRequest(writer, parsedFields);
-        }
-
-        private Builder addItem(String name, String fieldQuery, Object[] values, BiFunction<PlcField, Object[], BaseDefaultFieldItem> encoder) {
-            if (fields.containsKey(name)) {
-                throw new PlcRuntimeException("Duplicate field definition '" + name + "'");
-            }
-            fields.put(name, new BuilderItem<>(fieldQuery, values, encoder));
-            return this;
-        }
-
-        private static class BuilderItem<T> {
-            private final String fieldQuery;
-            private final T[] values;
-            private final BiFunction<PlcField, T[], BaseDefaultFieldItem> encoder;
-
-            private BuilderItem(String fieldQuery, T[] values, BiFunction<PlcField, T[], BaseDefaultFieldItem> encoder) {
-                this.fieldQuery = fieldQuery;
-                this.values = values;
-                this.encoder = encoder;
-            }
-        }
-
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.messages;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.BiFunction;
+import java.util.stream.Collectors;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.commons.lang3.tuple.Triple;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteResponse;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.connection.PlcFieldHandler;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+
+public class DefaultPlcWriteRequest implements InternalPlcWriteRequest, InternalPlcFieldRequest {
+
+    private final PlcWriter writer;
+    private final LinkedHashMap<String, Pair<PlcField, BaseDefaultFieldItem>> fields;
+
+    protected DefaultPlcWriteRequest(PlcWriter writer, LinkedHashMap<String, Pair<PlcField, BaseDefaultFieldItem>> fields) {
+        this.writer = writer;
+        this.fields = fields;
+    }
+
+    @Override
+    public CompletableFuture<PlcWriteResponse> execute() {
+        return writer.write(this);
+    }
+
+    @Override
+    public int getNumberOfFields() {
+        return fields.size();
+    }
+
+    @Override
+    public LinkedHashSet<String> getFieldNames() {
+        // TODO: Check if this already is a LinkedHashSet.
+        return new LinkedHashSet<>(fields.keySet());
+    }
+
+    @Override
+    public PlcField getField(String name) {
+        return fields.get(name).getKey();
+    }
+
+    @Override
+    public List<PlcField> getFields() {
+        return fields.values().stream().map(Pair::getKey).collect(Collectors.toCollection(LinkedList::new));
+    }
+
+    public BaseDefaultFieldItem getFieldItem(String name) {
+        return fields.get(name).getValue();
+    }
+
+    @Override
+    public List<BaseDefaultFieldItem> getFieldItems() {
+        return fields.values().stream().map(Pair::getValue).collect(Collectors.toCollection(LinkedList::new));
+    }
+
+    @Override
+    public List<Pair<String, PlcField>> getNamedFields() {
+        return fields.entrySet()
+            .stream()
+            .map(stringPairEntry ->
+                Pair.of(
+                    stringPairEntry.getKey(),
+                    stringPairEntry.getValue().getKey()
+                )
+            ).collect(Collectors.toCollection(LinkedList::new));
+    }
+
+    @Override
+    public List<Triple<String, PlcField, BaseDefaultFieldItem>> getNamedFieldTriples() {
+        return fields.entrySet()
+            .stream()
+            .map(stringPairEntry ->
+                Triple.of(
+                    stringPairEntry.getKey(),
+                    stringPairEntry.getValue().getKey(),
+                    stringPairEntry.getValue().getValue()
+                )
+            ).collect(Collectors.toCollection(LinkedList::new));
+    }
+
+    @Override
+    public int getNumberOfValues(String name) {
+        return fields.get(name).getValue().getNumberOfValues();
+    }
+
+    public static class Builder implements PlcWriteRequest.Builder {
+
+        private final PlcWriter writer;
+        private final PlcFieldHandler fieldHandler;
+        private final Map<String, BuilderItem<Object>> fields;
+        private final Map<Class<?>, BiFunction<PlcField, Object[], BaseDefaultFieldItem>> handlerMap;
+
+        public Builder(PlcWriter writer, PlcFieldHandler fieldHandler) {
+            this.writer = writer;
+            this.fieldHandler = fieldHandler;
+            fields = new TreeMap<>();
+            handlerMap = new HashMap<>();
+            handlerMap.put(Boolean.class, fieldHandler::encodeBoolean);
+            handlerMap.put(Byte.class, fieldHandler::encodeByte);            
+            handlerMap.put(Short.class, fieldHandler::encodeShort);
+            handlerMap.put(Integer.class, fieldHandler::encodeInteger);            
+            handlerMap.put(BigInteger.class, fieldHandler::encodeBigInteger);
+            handlerMap.put(Long.class, fieldHandler::encodeLong);
+            handlerMap.put(Float.class, fieldHandler::encodeFloat);
+            handlerMap.put(Double.class, fieldHandler::encodeDouble);
+            handlerMap.put(BigDecimal.class, fieldHandler::encodeBigDecimal);
+            handlerMap.put(Character.class, fieldHandler::encodeString);
+            handlerMap.put(String.class, fieldHandler::encodeString);
+            handlerMap.put(LocalTime.class, fieldHandler::encodeTime);
+            handlerMap.put(LocalDate.class, fieldHandler::encodeDate);
+            handlerMap.put(LocalDateTime.class, fieldHandler::encodeDateTime);
+            handlerMap.put(Duration.class, fieldHandler::encodeDuration);
+            //handlerMap.put(byte[].class, fieldHandler::encodeByteArray);
+            //handlerMap.put(Byte[].class, fieldHandler::encodeByteArray);
+            //handlerMap.put(Object[].class, fieldHandler::encodeByteArray);
+        }
+
+        @Override
+        public Builder addItem(String name, String fieldQuery, Boolean... values) {
+            return addItem(name, fieldQuery, values, fieldHandler::encodeBoolean);
+        }
+
+        @Override
+        public Builder addItem(String name, String fieldQuery, Byte... values) {
+            return addItem(name, fieldQuery, values, fieldHandler::encodeByte);
+        }
+
+        @Override
+        public Builder addItem(String name, String fieldQuery, Short... values) {
+            return addItem(name, fieldQuery, values, fieldHandler::encodeShort);
+        }
+
+        @Override
+        public Builder addItem(String name, String fieldQuery, Integer... values) {
+            return addItem(name, fieldQuery, values, fieldHandler::encodeInteger);
+        }
+
+        @Override
+        public PlcWriteRequest.Builder addItem(String name, String fieldQuery, BigInteger... values) {
+            return addItem(name, fieldQuery, values, fieldHandler::encodeBigInteger);
+        }
+
+        @Override
+        public Builder addItem(String name, String fieldQuery, Long... values) {
+            return addItem(name, fieldQuery, values, fieldHandler::encodeLong);
+        }
+
+        @Override
+        public Builder addItem(String name, String fieldQuery, Float... values) {
+            return addItem(name, fieldQuery, values, fieldHandler::encodeFloat);
+        }
+
+        @Override
+        public Builder addItem(String name, String fieldQuery, Double... values) {
+            return addItem(name, fieldQuery, values, fieldHandler::encodeDouble);
+        }
+
+        @Override
+        public Builder addItem(String name, String fieldQuery, BigDecimal... values) {
+            return addItem(name, fieldQuery, values, fieldHandler::encodeBigDecimal);
+        }
+      
+        @Override
+        public Builder addItem(String name, String fieldQuery, String... values) {
+            return addItem(name, fieldQuery, values, fieldHandler::encodeString);
+        }
+
+        @Override
+        public Builder addItem(String name, String fieldQuery, LocalTime... values) {
+            return addItem(name, fieldQuery, values, fieldHandler::encodeTime);
+        }
+
+        @Override
+        public Builder addItem(String name, String fieldQuery, LocalDate... values) {
+            return addItem(name, fieldQuery, values, fieldHandler::encodeDate);
+        }
+
+        @Override
+        public Builder addItem(String name, String fieldQuery, LocalDateTime... values) {
+            return addItem(name, fieldQuery, values, fieldHandler::encodeDateTime);
+        }
+        
+        @Override
+        public Builder addItem(String name, String fieldQuery, Duration... values) {
+            return addItem(name, fieldQuery, values, fieldHandler::encodeDuration);
+        }        
+
+        @Override
+        public Builder addItem(String name, String fieldQuery, byte[]... values) {
+            return addItem(name, fieldQuery, values, fieldHandler::encodeByteArray);
+        }
+
+        @Override
+        public Builder addItem(String name, String fieldQuery, Byte[]... values) {
+            return addItem(name, fieldQuery, values, fieldHandler::encodeByteArray);
+        }
+      
+        //@Override
+     
+
+        @Override
+        public <T> Builder addItem(String name, String fieldQuery, T... values) {
+            Objects.requireNonNull(values);
+            Class<?> checkedClazz = null;
+            for (T value : values) {
+                if (checkedClazz == null) {
+                    checkedClazz = value.getClass();
+                }
+                if (value.getClass() != checkedClazz) {
+                    throw new IllegalArgumentException("Invalid class found " + value.getClass() + ". should all be " + checkedClazz);
+                }
+            }
+            BiFunction<PlcField, Object[], BaseDefaultFieldItem> plcFieldFieldItemBiFunction = handlerMap.get(checkedClazz);
+            if (plcFieldFieldItemBiFunction == null) {
+                throw new IllegalArgumentException("no field handler for " + checkedClazz + " found");
+            }
+            return addItem(name, fieldQuery, values, plcFieldFieldItemBiFunction);
+        }
+
+        @Override
+        public PlcWriteRequest build() {
+            LinkedHashMap<String, Pair<PlcField, BaseDefaultFieldItem>> parsedFields = new LinkedHashMap<>();
+            fields.forEach((name, builderItem) -> {
+                // Compile the query string.
+                PlcField parsedField = fieldHandler.createField(builderItem.fieldQuery);
+                // Encode the payload.
+                // TODO: Depending on the field type, handle the FieldItem creation differently.
+                BaseDefaultFieldItem fieldItem = builderItem.encoder.apply(parsedField, builderItem.values);
+                parsedFields.put(name, new ImmutablePair<>(parsedField, fieldItem));
+            });
+            return new DefaultPlcWriteRequest(writer, parsedFields);
+        }
+
+        private Builder addItem(String name, String fieldQuery, Object[] values, BiFunction<PlcField, Object[], BaseDefaultFieldItem> encoder) {
+            if (fields.containsKey(name)) {
+                throw new PlcRuntimeException("Duplicate field definition '" + name + "'");
+            }
+            fields.put(name, new BuilderItem<>(fieldQuery, values, encoder));
+            return this;
+        }
+
+        private static class BuilderItem<T> {
+            private final String fieldQuery;
+            private final T[] values;
+            private final BiFunction<PlcField, T[], BaseDefaultFieldItem> encoder;
+
+            private BuilderItem(String fieldQuery, T[] values, BiFunction<PlcField, T[], BaseDefaultFieldItem> encoder) {
+                this.fieldQuery = fieldQuery;
+                this.values = values;
+                this.encoder = encoder;
+            }
+        }
+
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteResponse.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteResponse.java
index a004f0f5a1e..2a2bf691202 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteResponse.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteResponse.java
@@ -1,62 +1,62 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-
-import java.util.Collection;
-import java.util.Map;
-
-public class DefaultPlcWriteResponse implements InternalPlcWriteResponse {
-
-    private final InternalPlcWriteRequest request;
-    private final Map<String, PlcResponseCode> values;
-
-    public DefaultPlcWriteResponse(InternalPlcWriteRequest request, Map<String, PlcResponseCode> values) {
-        this.request = request;
-        this.values = values;
-    }
-
-    @Override
-    public Map<String, PlcResponseCode> getValues() {
-        return values;
-    }
-
-    @Override
-    public InternalPlcWriteRequest getRequest() {
-        return request;
-    }
-
-    @Override
-    public Collection<String> getFieldNames() {
-        return request.getFieldNames();
-    }
-
-    @Override
-    public PlcField getField(String name) {
-        return request.getField(name);
-    }
-
-    @Override
-    public PlcResponseCode getResponseCode(String name) {
-        return values.get(name);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+
+import java.util.Collection;
+import java.util.Map;
+
+public class DefaultPlcWriteResponse implements InternalPlcWriteResponse {
+
+    private final InternalPlcWriteRequest request;
+    private final Map<String, PlcResponseCode> values;
+
+    public DefaultPlcWriteResponse(InternalPlcWriteRequest request, Map<String, PlcResponseCode> values) {
+        this.request = request;
+        this.values = values;
+    }
+
+    @Override
+    public Map<String, PlcResponseCode> getValues() {
+        return values;
+    }
+
+    @Override
+    public InternalPlcWriteRequest getRequest() {
+        return request;
+    }
+
+    @Override
+    public Collection<String> getFieldNames() {
+        return request.getFieldNames();
+    }
+
+    @Override
+    public PlcField getField(String name) {
+        return request.getField(name);
+    }
+
+    @Override
+    public PlcResponseCode getResponseCode(String name) {
+        return values.get(name);
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcFieldRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcFieldRequest.java
index 2e869c376e2..ad5eb46551b 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcFieldRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcFieldRequest.java
@@ -1,31 +1,31 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.messages.PlcFieldRequest;
-import org.apache.plc4x.java.api.model.PlcField;
-
-import java.util.List;
-
-public interface InternalPlcFieldRequest extends PlcFieldRequest, InternalPlcRequest {
-
-    List<Pair<String, PlcField>> getNamedFields();
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.messages.PlcFieldRequest;
+import org.apache.plc4x.java.api.model.PlcField;
+
+import java.util.List;
+
+public interface InternalPlcFieldRequest extends PlcFieldRequest, InternalPlcRequest {
+
+    List<Pair<String, PlcField>> getNamedFields();
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcFieldResponse.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcFieldResponse.java
index 78f632003fd..4ceb88046a5 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcFieldResponse.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcFieldResponse.java
@@ -1,26 +1,26 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.plc4x.java.api.messages.PlcFieldResponse;
-
-public interface InternalPlcFieldResponse extends PlcFieldResponse {
-
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.plc4x.java.api.messages.PlcFieldResponse;
+
+public interface InternalPlcFieldResponse extends PlcFieldResponse {
+
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcMessage.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcMessage.java
index ac26a302c2d..286065a75a2 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcMessage.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcMessage.java
@@ -1,23 +1,23 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.base.messages;
-
-public interface InternalPlcMessage {
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.base.messages;
+
+public interface InternalPlcMessage {
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcProprietaryRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcProprietaryRequest.java
index 33b5272aaeb..97b1a105742 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcProprietaryRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcProprietaryRequest.java
@@ -1,22 +1,22 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages;
-
-public interface InternalPlcProprietaryRequest<REQUEST> extends PlcProprietaryRequest<REQUEST>, InternalPlcRequest {
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages;
+
+public interface InternalPlcProprietaryRequest<REQUEST> extends PlcProprietaryRequest<REQUEST>, InternalPlcRequest {
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcProprietaryResponse.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcProprietaryResponse.java
index d42dabfcf4b..ff63ad49852 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcProprietaryResponse.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcProprietaryResponse.java
@@ -1,22 +1,22 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages;
-
-public interface InternalPlcProprietaryResponse<RESPONSE> extends PlcProprietaryResponse<RESPONSE>, InternalPlcResponse {
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages;
+
+public interface InternalPlcProprietaryResponse<RESPONSE> extends PlcProprietaryResponse<RESPONSE>, InternalPlcResponse {
 }
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcReadRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcReadRequest.java
index c787f001573..300d6c7c02a 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcReadRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcReadRequest.java
@@ -1,26 +1,26 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-
-public interface InternalPlcReadRequest extends PlcReadRequest, InternalPlcFieldRequest, InternalPlcRequest {
-
-}
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+
+public interface InternalPlcReadRequest extends PlcReadRequest, InternalPlcFieldRequest, InternalPlcRequest {
+
+}
+
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcReadResponse.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcReadResponse.java
index 50d0e4df11e..69225b7f384 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcReadResponse.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcReadResponse.java
@@ -1,31 +1,31 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-
-import java.util.Map;
-
-public interface InternalPlcReadResponse extends PlcReadResponse, InternalPlcResponse {
-
-    Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> getValues();
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+
+import java.util.Map;
+
+public interface InternalPlcReadResponse extends PlcReadResponse, InternalPlcResponse {
+
+    Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> getValues();
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcRequest.java
index b031ee33986..bfe45edfe0d 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcRequest.java
@@ -1,24 +1,24 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.plc4x.java.api.messages.PlcRequest;
-
-public interface InternalPlcRequest extends PlcRequest, InternalPlcMessage {
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.plc4x.java.api.messages.PlcRequest;
+
+public interface InternalPlcRequest extends PlcRequest, InternalPlcMessage {
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcResponse.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcResponse.java
index dde16f068f7..92189e0d080 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcResponse.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcResponse.java
@@ -1,25 +1,25 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.plc4x.java.api.messages.PlcResponse;
-
-public interface InternalPlcResponse extends PlcResponse {
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.plc4x.java.api.messages.PlcResponse;
+
+public interface InternalPlcResponse extends PlcResponse {
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcSubscriptionEvent.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcSubscriptionEvent.java
index 79ce09d1b54..965d8ca9a28 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcSubscriptionEvent.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcSubscriptionEvent.java
@@ -1,25 +1,25 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
-
-public interface InternalPlcSubscriptionEvent extends PlcSubscriptionEvent {
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
+
+public interface InternalPlcSubscriptionEvent extends PlcSubscriptionEvent {
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcSubscriptionRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcSubscriptionRequest.java
index 1e727addd70..b3bea0535ed 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcSubscriptionRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcSubscriptionRequest.java
@@ -1,36 +1,36 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
-import org.apache.plc4x.java.base.model.SubscriptionPlcField;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-
-public interface InternalPlcSubscriptionRequest extends PlcSubscriptionRequest, InternalPlcFieldRequest {
-
-    List<SubscriptionPlcField> getSubscriptionFields();
-
-    LinkedHashMap<String, SubscriptionPlcField> getSubscriptionPlcFieldMap();
-
-    List<Pair<String, SubscriptionPlcField>> getNamedSubscriptionFields();
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
+import org.apache.plc4x.java.base.model.SubscriptionPlcField;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+
+public interface InternalPlcSubscriptionRequest extends PlcSubscriptionRequest, InternalPlcFieldRequest {
+
+    List<SubscriptionPlcField> getSubscriptionFields();
+
+    LinkedHashMap<String, SubscriptionPlcField> getSubscriptionPlcFieldMap();
+
+    List<Pair<String, SubscriptionPlcField>> getNamedSubscriptionFields();
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcSubscriptionResponse.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcSubscriptionResponse.java
index 561a99a78dc..01770bcdf2e 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcSubscriptionResponse.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcSubscriptionResponse.java
@@ -1,30 +1,30 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse;
-import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-
-import java.util.Map;
-
-public interface InternalPlcSubscriptionResponse extends PlcSubscriptionResponse, InternalPlcResponse {
-    Map<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> getValues();
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse;
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+
+import java.util.Map;
+
+public interface InternalPlcSubscriptionResponse extends PlcSubscriptionResponse, InternalPlcResponse {
+    Map<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> getValues();
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcUnsubscriptionRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcUnsubscriptionRequest.java
index fd5b3ca8942..eb890cceff8 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcUnsubscriptionRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcUnsubscriptionRequest.java
@@ -1,29 +1,29 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
-import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
-
-import java.util.Collection;
-
-public interface InternalPlcUnsubscriptionRequest extends PlcUnsubscriptionRequest, InternalPlcRequest {
-
-    Collection<? extends InternalPlcSubscriptionHandle> getInternalPlcSubscriptionHandles();
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
+import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
+
+import java.util.Collection;
+
+public interface InternalPlcUnsubscriptionRequest extends PlcUnsubscriptionRequest, InternalPlcRequest {
+
+    Collection<? extends InternalPlcSubscriptionHandle> getInternalPlcSubscriptionHandles();
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcUnsubscriptionResponse.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcUnsubscriptionResponse.java
index 8529d553fb8..8d03cd42010 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcUnsubscriptionResponse.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcUnsubscriptionResponse.java
@@ -1,25 +1,25 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.plc4x.java.api.messages.PlcUnsubscriptionResponse;
-
-public interface InternalPlcUnsubscriptionResponse extends PlcUnsubscriptionResponse, InternalPlcResponse {
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.plc4x.java.api.messages.PlcUnsubscriptionResponse;
+
+public interface InternalPlcUnsubscriptionResponse extends PlcUnsubscriptionResponse, InternalPlcResponse {
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcWriteRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcWriteRequest.java
index 5a68f63dc10..dd112e9c5f0 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcWriteRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcWriteRequest.java
@@ -1,36 +1,36 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.commons.lang3.tuple.Triple;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-
-import java.util.List;
-
-public interface InternalPlcWriteRequest extends PlcWriteRequest, InternalPlcRequest {
-
-    BaseDefaultFieldItem getFieldItem(String name);
-
-    List<BaseDefaultFieldItem> getFieldItems();
-
-    List<Triple<String, PlcField, BaseDefaultFieldItem>> getNamedFieldTriples();
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.commons.lang3.tuple.Triple;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+
+import java.util.List;
+
+public interface InternalPlcWriteRequest extends PlcWriteRequest, InternalPlcRequest {
+
+    BaseDefaultFieldItem getFieldItem(String name);
+
+    List<BaseDefaultFieldItem> getFieldItems();
+
+    List<Triple<String, PlcField, BaseDefaultFieldItem>> getNamedFieldTriples();
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcWriteResponse.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcWriteResponse.java
index 06d4ad7c73c..5a1a5b4c895 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcWriteResponse.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcWriteResponse.java
@@ -1,28 +1,28 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.plc4x.java.api.messages.PlcWriteResponse;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-
-import java.util.Map;
-
-public interface InternalPlcWriteResponse extends PlcWriteResponse, InternalPlcResponse {
-    Map<String, PlcResponseCode> getValues();
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.plc4x.java.api.messages.PlcWriteResponse;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+
+import java.util.Map;
+
+public interface InternalPlcWriteResponse extends PlcWriteResponse, InternalPlcResponse {
+    Map<String, PlcResponseCode> getValues();
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietaryRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietaryRequest.java
index fdc75588930..46c02479ae7 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietaryRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietaryRequest.java
@@ -1,25 +1,25 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.plc4x.java.api.messages.PlcRequest;
-
-public interface PlcProprietaryRequest<REQUEST> extends PlcRequest {
-    REQUEST getProprietaryRequest();
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.plc4x.java.api.messages.PlcRequest;
+
+public interface PlcProprietaryRequest<REQUEST> extends PlcRequest {
+    REQUEST getProprietaryRequest();
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietaryResponse.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietaryResponse.java
index 94af885911d..d572a6d8054 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietaryResponse.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietaryResponse.java
@@ -1,25 +1,25 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.plc4x.java.api.messages.PlcResponse;
-
-public interface PlcProprietaryResponse<T> extends PlcResponse {
-    T getResponse();
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.plc4x.java.api.messages.PlcResponse;
+
+public interface PlcProprietaryResponse<T> extends PlcResponse {
+    T getResponse();
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietarySender.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietarySender.java
index 8a0ed3d7a12..f91265fa0c4 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietarySender.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietarySender.java
@@ -1,25 +1,25 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages;
-
-import java.util.concurrent.CompletableFuture;
-
-public interface PlcProprietarySender {
-    <T> CompletableFuture<PlcProprietaryResponse<T>> send(PlcProprietaryRequest proprietaryRequest);
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages;
+
+import java.util.concurrent.CompletableFuture;
+
+public interface PlcProprietarySender {
+    <T> CompletableFuture<PlcProprietaryResponse<T>> send(PlcProprietaryRequest proprietaryRequest);
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProtocolMessage.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProtocolMessage.java
index cacc6b14ad9..f2be167120c 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProtocolMessage.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProtocolMessage.java
@@ -1,25 +1,25 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.messages;
-
-public interface PlcProtocolMessage {
-
-    PlcProtocolMessage getParent();
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.messages;
+
+public interface PlcProtocolMessage {
+
+    PlcProtocolMessage getParent();
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcRawMessage.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcRawMessage.java
index b6205d9f6f6..c89bb07a06e 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcRawMessage.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcRawMessage.java
@@ -1,46 +1,46 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.messages;
-
-import io.netty.buffer.ByteBuf;
-
-public class PlcRawMessage implements PlcProtocolMessage {
-
-    private final ByteBuf userData;
-    private final PlcProtocolMessage parent;
-
-    public PlcRawMessage(ByteBuf userData) {
-        this(userData, null);
-    }
-
-    public PlcRawMessage(ByteBuf userData, PlcProtocolMessage parent) {
-        this.userData = userData;
-        this.parent = parent;
-    }
-
-    public ByteBuf getUserData() {
-        return userData;
-    }
-
-    @Override
-    public PlcProtocolMessage getParent() {
-        return parent;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.messages;
+
+import io.netty.buffer.ByteBuf;
+
+public class PlcRawMessage implements PlcProtocolMessage {
+
+    private final ByteBuf userData;
+    private final PlcProtocolMessage parent;
+
+    public PlcRawMessage(ByteBuf userData) {
+        this(userData, null);
+    }
+
+    public PlcRawMessage(ByteBuf userData, PlcProtocolMessage parent) {
+        this.userData = userData;
+        this.parent = parent;
+    }
+
+    public ByteBuf getUserData() {
+        return userData;
+    }
+
+    @Override
+    public PlcProtocolMessage getParent() {
+        return parent;
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcReader.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcReader.java
index c403ca1cef5..ea727276e03 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcReader.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcReader.java
@@ -1,40 +1,40 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Consumer;
-
-/**
- * Interface implemented by all PlcConnections that are able to read from remote resources.
- */
-public interface PlcReader {
-
-    /**
-     * Reads a requested value from a PLC.
-     *
-     * @param readRequest object describing the type and location of the value.
-     * @return a {@link CompletableFuture} giving async access to the returned value.
-     */
-    CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest);
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
+
+/**
+ * Interface implemented by all PlcConnections that are able to read from remote resources.
+ */
+public interface PlcReader {
+
+    /**
+     * Reads a requested value from a PLC.
+     *
+     * @param readRequest object describing the type and location of the value.
+     * @return a {@link CompletableFuture} giving async access to the returned value.
+     */
+    CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest);
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcRequestContainer.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcRequestContainer.java
index f378678070f..b5539e8b744 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcRequestContainer.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcRequestContainer.java
@@ -1,85 +1,85 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages;
-
-import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
-
-/**
- * Helper mostly used internally to split up big requests into multiple sub-requests.
- *
- * @param <T> type of request.
- * @param <R> type of response.
- */
-public class PlcRequestContainer<T extends InternalPlcRequest, R extends InternalPlcResponse> implements PlcProtocolMessage {
-
-    private final T request;
-    private final CompletableFuture<R> responseFuture;
-
-    public PlcRequestContainer(T request, CompletableFuture<R> responseFuture) {
-        Objects.requireNonNull(request, "Request must not be null");
-        Objects.requireNonNull(responseFuture, "Response future must not be null");
-        this.request = request;
-        this.responseFuture = responseFuture;
-    }
-
-    public T getRequest() {
-        return request;
-    }
-
-    public CompletableFuture<R> getResponseFuture() {
-        return responseFuture;
-    }
-
-    /**
-     * {@link PlcRequestContainer} objects don't have parents.
-     *
-     * @return null
-     */
-    @Override
-    public PlcProtocolMessage getParent() {
-        return null;
-    }
-
-    @Override
-    public String toString() {
-        return "PlcRequestContainer{" +
-            "request=" + request +
-            '}';
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof PlcRequestContainer)) {
-            return false;
-        }
-        PlcRequestContainer<?, ?> that = (PlcRequestContainer<?, ?>) o;
-        return Objects.equals(request, that.request) &&
-            Objects.equals(responseFuture, that.responseFuture);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(request, responseFuture);
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages;
+
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * Helper mostly used internally to split up big requests into multiple sub-requests.
+ *
+ * @param <T> type of request.
+ * @param <R> type of response.
+ */
+public class PlcRequestContainer<T extends InternalPlcRequest, R extends InternalPlcResponse> implements PlcProtocolMessage {
+
+    private final T request;
+    private final CompletableFuture<R> responseFuture;
+
+    public PlcRequestContainer(T request, CompletableFuture<R> responseFuture) {
+        Objects.requireNonNull(request, "Request must not be null");
+        Objects.requireNonNull(responseFuture, "Response future must not be null");
+        this.request = request;
+        this.responseFuture = responseFuture;
+    }
+
+    public T getRequest() {
+        return request;
+    }
+
+    public CompletableFuture<R> getResponseFuture() {
+        return responseFuture;
+    }
+
+    /**
+     * {@link PlcRequestContainer} objects don't have parents.
+     *
+     * @return null
+     */
+    @Override
+    public PlcProtocolMessage getParent() {
+        return null;
+    }
+
+    @Override
+    public String toString() {
+        return "PlcRequestContainer{" +
+            "request=" + request +
+            '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof PlcRequestContainer)) {
+            return false;
+        }
+        PlcRequestContainer<?, ?> that = (PlcRequestContainer<?, ?>) o;
+        return Objects.equals(request, that.request) &&
+            Objects.equals(responseFuture, that.responseFuture);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(request, responseFuture);
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcSubscriber.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcSubscriber.java
index 8d7eedb6219..3ecb937f13a 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcSubscriber.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcSubscriber.java
@@ -1,63 +1,63 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.plc4x.java.api.messages.*;
-import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
-import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
-
-import java.util.Collection;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Consumer;
-
-/**
- * Interface implemented by all PlcConnections that are able to receive notifications from remote resources.
- */
-public interface PlcSubscriber {
-
-    /**
-     * Subscribes to fields on the PLC.
-     *
-     * @param subscriptionRequest subscription request containing at least one subscription request item.
-     * @return subscription response containing a subscription response item for each subscription request item.
-     */
-    CompletableFuture<PlcSubscriptionResponse> subscribe(PlcSubscriptionRequest subscriptionRequest);
-
-    /**
-     * Unsubscribes from fields on the PLC. For unsubscribing the unsubscription request uses the subscription
-     * handle returned as part of the subscription response item.
-     *
-     * @param unsubscriptionRequest unsubscription request containing at least one unsubscription request item.
-     * @return unsubscription response containing a unsubscription response item for each unsubscription request item.
-     */
-    CompletableFuture<PlcUnsubscriptionResponse> unsubscribe(PlcUnsubscriptionRequest unsubscriptionRequest);
-
-    /**
-     * @param consumer
-     * @param handles
-     * @return TODO: document me
-     */
-    PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer, Collection<PlcSubscriptionHandle> handles);
-
-    /**
-     * // TODO: document me.
-     */
-    void unregister(PlcConsumerRegistration registration);
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.plc4x.java.api.messages.*;
+import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+
+import java.util.Collection;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
+
+/**
+ * Interface implemented by all PlcConnections that are able to receive notifications from remote resources.
+ */
+public interface PlcSubscriber {
+
+    /**
+     * Subscribes to fields on the PLC.
+     *
+     * @param subscriptionRequest subscription request containing at least one subscription request item.
+     * @return subscription response containing a subscription response item for each subscription request item.
+     */
+    CompletableFuture<PlcSubscriptionResponse> subscribe(PlcSubscriptionRequest subscriptionRequest);
+
+    /**
+     * Unsubscribes from fields on the PLC. For unsubscribing the unsubscription request uses the subscription
+     * handle returned as part of the subscription response item.
+     *
+     * @param unsubscriptionRequest unsubscription request containing at least one unsubscription request item.
+     * @return unsubscription response containing a unsubscription response item for each unsubscription request item.
+     */
+    CompletableFuture<PlcUnsubscriptionResponse> unsubscribe(PlcUnsubscriptionRequest unsubscriptionRequest);
+
+    /**
+     * @param consumer
+     * @param handles
+     * @return TODO: document me
+     */
+    PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer, Collection<PlcSubscriptionHandle> handles);
+
+    /**
+     * // TODO: document me.
+     */
+    void unregister(PlcConsumerRegistration registration);
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcWriter.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcWriter.java
index 13a83f42b63..d4498a69675 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcWriter.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcWriter.java
@@ -1,40 +1,40 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.messages.PlcWriteResponse;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Consumer;
-
-/**
- * Interface implemented by all PlcConnections that are able to write to remote resources.
- */
-public interface PlcWriter {
-
-    /**
-     * Writes a given value to a PLC.
-     *
-     * @param writeRequest object describing the type, location and value that whould be written.
-     * @return a {@link CompletableFuture} giving async access to the response of the write operation.
-     */
-    CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest);
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteResponse;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
+
+/**
+ * Interface implemented by all PlcConnections that are able to write to remote resources.
+ */
+public interface PlcWriter {
+
+    /**
+     * Writes a given value to a PLC.
+     *
+     * @param writeRequest object describing the type, location and value that whould be written.
+     * @return a {@link CompletableFuture} giving async access to the response of the write operation.
+     */
+    CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest);
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/BaseDefaultFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/BaseDefaultFieldItem.java
index 24c6d2868be..6057decc85a 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/BaseDefaultFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/BaseDefaultFieldItem.java
@@ -1,201 +1,201 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.messages.items;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.Duration;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.Arrays;
-import java.util.Objects;
-import org.apache.plc4x.java.api.exceptions.PlcFieldRangeException;
-import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
-
-public abstract class BaseDefaultFieldItem<T> {
-
-    private final T[] values;
-
-    protected BaseDefaultFieldItem(T[] values) {
-        this.values = Objects.requireNonNull(values);
-    }
-
-    public int getNumberOfValues() {
-        return values.length;
-    }
-
-    public abstract Object getObject(int index);
-
-    public boolean isValidBoolean(int index) {
-        return false;
-    }
-
-    public Boolean getBoolean(int index) {
-        throw new PlcIncompatibleDatatypeException(Boolean.class, index);
-    }
-
-    public boolean isValidByte(int index) {
-        return false;
-    }
-
-    public Byte getByte(int index) {
-        throw new PlcIncompatibleDatatypeException(Byte.class, index);
-    }
-
-    public boolean isValidShort(int index) {
-        return false;
-    }
-
-    public Short getShort(int index) {
-        throw new PlcIncompatibleDatatypeException(Short.class, index);
-    }
-
-    public boolean isValidInteger(int index) {
-        return false;
-    }
-
-    public Integer getInteger(int index) {
-        throw new PlcIncompatibleDatatypeException(Integer.class, index);
-    }
-
-    public boolean isValidLong(int index) {
-        return false;
-    }
-
-    public Long getLong(int index) {
-        throw new PlcIncompatibleDatatypeException(Long.class, index);
-    }
-
-    public boolean isValidBigInteger(int index) {
-        return false;
-    }
-
-    public BigInteger getBigInteger(int index) {
-        throw new PlcIncompatibleDatatypeException(BigInteger.class, index);
-    }
-
-    public boolean isValidFloat(int index) {
-        return false;
-    }
-
-    public Float getFloat(int index) {
-        throw new PlcIncompatibleDatatypeException(Float.class, index);
-    }
-
-    public boolean isValidDouble(int index) {
-        return false;
-    }
-
-    public Double getDouble(int index) {
-        throw new PlcIncompatibleDatatypeException(Double.class, index);
-    }
-
-    public boolean isValidBigDecimal(int index) {
-        return false;
-    }
-
-    public BigDecimal getBigDecimal(int index) {
-        throw new PlcIncompatibleDatatypeException(BigDecimal.class, index);
-    }
-
-    public boolean isValidString(int index) {
-        return false;
-    }
-
-    public String getString(int index) {
-        throw new PlcIncompatibleDatatypeException(String.class, index);
-    }
-
-    public boolean isValidTime(int index) {
-        return false;
-    }
-
-    public LocalTime getTime(int index) {
-        throw new PlcIncompatibleDatatypeException(LocalTime.class, index);
-    }
-
-    public boolean isValidDate(int index) {
-        return false;
-    }
-
-    public LocalDate getDate(int index) {
-        throw new PlcIncompatibleDatatypeException(LocalDate.class, index);
-    }
-
-    public boolean isValidDateTime(int index) {
-        return false;
-    }
-
-    public LocalDateTime getDateTime(int index) {
-        throw new PlcIncompatibleDatatypeException(LocalDateTime.class, index);
-    }
-    
-    public boolean isValidDuration(int index) {
-        return false;
-    }
-
-    public Duration getDuration(int index) {
-        throw new PlcIncompatibleDatatypeException(LocalDateTime.class, index);
-    }    
-
-    public boolean isValidByteArray(int index) {
-        return false;
-    }
-
-    public Byte[] getByteArray(int index) {
-        throw new PlcIncompatibleDatatypeException(Byte[].class, index);
-    }
-
-    public T[] getValues() {
-        return values;
-    }
-
-    protected T getValue(int index) {
-        if ((values == null) || (index < 0 || (index >= values.length))) {
-            throw new PlcFieldRangeException((values == null) ? -1 : values.length - 1, index);
-        }
-        return values[index];
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof BaseDefaultFieldItem)) {
-            return false;
-        }
-        BaseDefaultFieldItem<?> fieldItem = (BaseDefaultFieldItem<?>) o;
-        return Arrays.equals(values, fieldItem.values);
-    }
-
-    @Override
-    public int hashCode() {
-        return Arrays.hashCode(values);
-    }
-
-    @Override
-    public String toString() {
-        return getClass().getSimpleName() + "{" +
-            "values=" + Arrays.toString(values) +
-            '}';
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.messages.items;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.Arrays;
+import java.util.Objects;
+import org.apache.plc4x.java.api.exceptions.PlcFieldRangeException;
+import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
+
+public abstract class BaseDefaultFieldItem<T> {
+
+    private final T[] values;
+
+    protected BaseDefaultFieldItem(T[] values) {
+        this.values = Objects.requireNonNull(values);
+    }
+
+    public int getNumberOfValues() {
+        return values.length;
+    }
+
+    public abstract Object getObject(int index);
+
+    public boolean isValidBoolean(int index) {
+        return false;
+    }
+
+    public Boolean getBoolean(int index) {
+        throw new PlcIncompatibleDatatypeException(Boolean.class, index);
+    }
+
+    public boolean isValidByte(int index) {
+        return false;
+    }
+
+    public Byte getByte(int index) {
+        throw new PlcIncompatibleDatatypeException(Byte.class, index);
+    }
+
+    public boolean isValidShort(int index) {
+        return false;
+    }
+
+    public Short getShort(int index) {
+        throw new PlcIncompatibleDatatypeException(Short.class, index);
+    }
+
+    public boolean isValidInteger(int index) {
+        return false;
+    }
+
+    public Integer getInteger(int index) {
+        throw new PlcIncompatibleDatatypeException(Integer.class, index);
+    }
+
+    public boolean isValidLong(int index) {
+        return false;
+    }
+
+    public Long getLong(int index) {
+        throw new PlcIncompatibleDatatypeException(Long.class, index);
+    }
+
+    public boolean isValidBigInteger(int index) {
+        return false;
+    }
+
+    public BigInteger getBigInteger(int index) {
+        throw new PlcIncompatibleDatatypeException(BigInteger.class, index);
+    }
+
+    public boolean isValidFloat(int index) {
+        return false;
+    }
+
+    public Float getFloat(int index) {
+        throw new PlcIncompatibleDatatypeException(Float.class, index);
+    }
+
+    public boolean isValidDouble(int index) {
+        return false;
+    }
+
+    public Double getDouble(int index) {
+        throw new PlcIncompatibleDatatypeException(Double.class, index);
+    }
+
+    public boolean isValidBigDecimal(int index) {
+        return false;
+    }
+
+    public BigDecimal getBigDecimal(int index) {
+        throw new PlcIncompatibleDatatypeException(BigDecimal.class, index);
+    }
+
+    public boolean isValidString(int index) {
+        return false;
+    }
+
+    public String getString(int index) {
+        throw new PlcIncompatibleDatatypeException(String.class, index);
+    }
+
+    public boolean isValidTime(int index) {
+        return false;
+    }
+
+    public LocalTime getTime(int index) {
+        throw new PlcIncompatibleDatatypeException(LocalTime.class, index);
+    }
+
+    public boolean isValidDate(int index) {
+        return false;
+    }
+
+    public LocalDate getDate(int index) {
+        throw new PlcIncompatibleDatatypeException(LocalDate.class, index);
+    }
+
+    public boolean isValidDateTime(int index) {
+        return false;
+    }
+
+    public LocalDateTime getDateTime(int index) {
+        throw new PlcIncompatibleDatatypeException(LocalDateTime.class, index);
+    }
+    
+    public boolean isValidDuration(int index) {
+        return false;
+    }
+
+    public Duration getDuration(int index) {
+        throw new PlcIncompatibleDatatypeException(LocalDateTime.class, index);
+    }    
+
+    public boolean isValidByteArray(int index) {
+        return false;
+    }
+
+    public Byte[] getByteArray(int index) {
+        throw new PlcIncompatibleDatatypeException(Byte[].class, index);
+    }
+
+    public T[] getValues() {
+        return values;
+    }
+
+    protected T getValue(int index) {
+        if ((values == null) || (index < 0 || (index >= values.length))) {
+            throw new PlcFieldRangeException((values == null) ? -1 : values.length - 1, index);
+        }
+        return values[index];
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof BaseDefaultFieldItem)) {
+            return false;
+        }
+        BaseDefaultFieldItem<?> fieldItem = (BaseDefaultFieldItem<?>) o;
+        return Arrays.equals(values, fieldItem.values);
+    }
+
+    @Override
+    public int hashCode() {
+        return Arrays.hashCode(values);
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + "{" +
+            "values=" + Arrays.toString(values) +
+            '}';
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultBigDecimalFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultBigDecimalFieldItem.java
index c78bd05a697..f512fe58e4c 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultBigDecimalFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultBigDecimalFieldItem.java
@@ -1,171 +1,171 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.messages.items;
-
-import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-public class DefaultBigDecimalFieldItem extends BaseDefaultFieldItem<BigDecimal> {
-
-    public DefaultBigDecimalFieldItem(BigDecimal... values) {
-        super(values);
-    }
-
-    @Override
-    public Object getObject(int index) {
-        return getValue(index);
-    }
-
-    @Override
-    public boolean isValidBoolean(int index) {
-        return getValue(index) != null;
-    }
-
-    @Override
-    public Boolean getBoolean(int index) {
-        if (!isValidBoolean(index)) {
-            throw new PlcIncompatibleDatatypeException(Boolean.class, index);
-        }
-        return getValue(index).compareTo(BigDecimal.ZERO) != 0;
-    }
-
-    @Override
-    public boolean isValidByte(int index) {
-        BigDecimal value = getValue(index);
-        BigDecimal min = BigDecimal.valueOf(Byte.MIN_VALUE);
-        BigDecimal max = BigDecimal.valueOf(Byte.MAX_VALUE);
-        return (value != null) && (value.compareTo(min) >= 0) && (value.compareTo(max) <= 0);
-    }
-
-    @Override
-    public Byte getByte(int index) {
-        if (!isValidByte(index)) {
-            throw new PlcIncompatibleDatatypeException(Byte.class, index);
-        }
-        return getValue(index).byteValue();
-    }
-
-    @Override
-    public boolean isValidShort(int index) {
-        BigDecimal value = getValue(index);
-        BigDecimal min = BigDecimal.valueOf(Short.MIN_VALUE);
-        BigDecimal max = BigDecimal.valueOf(Short.MAX_VALUE);
-        return (value != null) && (value.compareTo(min) >= 0) && (value.compareTo(max) <= 0);
-    }
-
-    @Override
-    public Short getShort(int index) {
-        if (!isValidShort(index)) {
-            throw new PlcIncompatibleDatatypeException(Short.class, index);
-        }
-        return getValue(index).shortValue();
-    }
-
-    @Override
-    public boolean isValidInteger(int index) {
-        BigDecimal value = getValue(index);
-        BigDecimal min = BigDecimal.valueOf(Integer.MIN_VALUE);
-        BigDecimal max = BigDecimal.valueOf(Integer.MAX_VALUE);
-        return (value != null) && (value.compareTo(min) >= 0) && (value.compareTo(max) <= 0);
-    }
-
-    @Override
-    public Integer getInteger(int index) {
-        if (!isValidInteger(index)) {
-            throw new PlcIncompatibleDatatypeException(Integer.class, index);
-        }
-        return getValue(index).intValue();
-    }
-
-    @Override
-    public boolean isValidLong(int index) {
-        BigDecimal value = getValue(index);
-        BigDecimal min = BigDecimal.valueOf(Long.MIN_VALUE);
-        BigDecimal max = BigDecimal.valueOf(Long.MAX_VALUE);
-        return (value != null) && (value.compareTo(min) >= 0) && (value.compareTo(max) <= 0);
-    }
-
-    @Override
-    public Long getLong(int index) {
-        if (!isValidLong(index)) {
-            throw new PlcIncompatibleDatatypeException(Long.class, index);
-        }
-        return getValue(index).longValue();
-    }
-
-    public boolean isValidBigInteger(int index) {
-        BigDecimal value = getValue(index);
-        return value != null;
-    }
-
-    public BigInteger getBigInteger(int index) {
-        if (!isValidBigInteger(index)) {
-            throw new PlcIncompatibleDatatypeException(BigInteger.class, index);
-        }
-        return getValue(index).toBigInteger();
-    }
-
-    @Override
-    public boolean isValidFloat(int index) {
-        BigDecimal value = getValue(index);
-        BigDecimal min = BigDecimal.valueOf(-Float.MAX_VALUE);
-        BigDecimal max = BigDecimal.valueOf(Float.MAX_VALUE);
-        return (value != null) && (value.compareTo(min) >= 0) && (value.compareTo(max) <= 0);
-    }
-
-    @Override
-    public Float getFloat(int index) {
-        if (!isValidFloat(index)) {
-            throw new PlcIncompatibleDatatypeException(Float.class, index);
-        }
-        return getValue(index).floatValue();
-    }
-
-    @Override
-    public boolean isValidDouble(int index) {
-        BigDecimal value = getValue(index);
-        BigDecimal min = BigDecimal.valueOf(-Double.MAX_VALUE);
-        BigDecimal max = BigDecimal.valueOf(Double.MAX_VALUE);
-        return (value != null) && (value.compareTo(min) >= 0) && (value.compareTo(max) <= 0);
-    }
-
-    @Override
-    public Double getDouble(int index) {
-        if (!isValidDouble(index)) {
-            throw new PlcIncompatibleDatatypeException(Double.class, index);
-        }
-        return getValue(index).doubleValue();
-    }
-
-    public boolean isValidBigDecimal(int index) {
-        return getValue(index) != null;
-    }
-
-    public BigDecimal getBigDecimal(int index) {
-        if(!isValidBigDecimal(index)) {
-            throw new PlcIncompatibleDatatypeException(BigDecimal.class, index);
-        }
-        return getValue(index);
-    }
-
-}
-
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.messages.items;
+
+import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+public class DefaultBigDecimalFieldItem extends BaseDefaultFieldItem<BigDecimal> {
+
+    public DefaultBigDecimalFieldItem(BigDecimal... values) {
+        super(values);
+    }
+
+    @Override
+    public Object getObject(int index) {
+        return getValue(index);
+    }
+
+    @Override
+    public boolean isValidBoolean(int index) {
+        return getValue(index) != null;
+    }
+
+    @Override
+    public Boolean getBoolean(int index) {
+        if (!isValidBoolean(index)) {
+            throw new PlcIncompatibleDatatypeException(Boolean.class, index);
+        }
+        return getValue(index).compareTo(BigDecimal.ZERO) != 0;
+    }
+
+    @Override
+    public boolean isValidByte(int index) {
+        BigDecimal value = getValue(index);
+        BigDecimal min = BigDecimal.valueOf(Byte.MIN_VALUE);
+        BigDecimal max = BigDecimal.valueOf(Byte.MAX_VALUE);
+        return (value != null) && (value.compareTo(min) >= 0) && (value.compareTo(max) <= 0);
+    }
+
+    @Override
+    public Byte getByte(int index) {
+        if (!isValidByte(index)) {
+            throw new PlcIncompatibleDatatypeException(Byte.class, index);
+        }
+        return getValue(index).byteValue();
+    }
+
+    @Override
+    public boolean isValidShort(int index) {
+        BigDecimal value = getValue(index);
+        BigDecimal min = BigDecimal.valueOf(Short.MIN_VALUE);
+        BigDecimal max = BigDecimal.valueOf(Short.MAX_VALUE);
+        return (value != null) && (value.compareTo(min) >= 0) && (value.compareTo(max) <= 0);
+    }
+
+    @Override
+    public Short getShort(int index) {
+        if (!isValidShort(index)) {
+            throw new PlcIncompatibleDatatypeException(Short.class, index);
+        }
+        return getValue(index).shortValue();
+    }
+
+    @Override
+    public boolean isValidInteger(int index) {
+        BigDecimal value = getValue(index);
+        BigDecimal min = BigDecimal.valueOf(Integer.MIN_VALUE);
+        BigDecimal max = BigDecimal.valueOf(Integer.MAX_VALUE);
+        return (value != null) && (value.compareTo(min) >= 0) && (value.compareTo(max) <= 0);
+    }
+
+    @Override
+    public Integer getInteger(int index) {
+        if (!isValidInteger(index)) {
+            throw new PlcIncompatibleDatatypeException(Integer.class, index);
+        }
+        return getValue(index).intValue();
+    }
+
+    @Override
+    public boolean isValidLong(int index) {
+        BigDecimal value = getValue(index);
+        BigDecimal min = BigDecimal.valueOf(Long.MIN_VALUE);
+        BigDecimal max = BigDecimal.valueOf(Long.MAX_VALUE);
+        return (value != null) && (value.compareTo(min) >= 0) && (value.compareTo(max) <= 0);
+    }
+
+    @Override
+    public Long getLong(int index) {
+        if (!isValidLong(index)) {
+            throw new PlcIncompatibleDatatypeException(Long.class, index);
+        }
+        return getValue(index).longValue();
+    }
+
+    public boolean isValidBigInteger(int index) {
+        BigDecimal value = getValue(index);
+        return value != null;
+    }
+
+    public BigInteger getBigInteger(int index) {
+        if (!isValidBigInteger(index)) {
+            throw new PlcIncompatibleDatatypeException(BigInteger.class, index);
+        }
+        return getValue(index).toBigInteger();
+    }
+
+    @Override
+    public boolean isValidFloat(int index) {
+        BigDecimal value = getValue(index);
+        BigDecimal min = BigDecimal.valueOf(-Float.MAX_VALUE);
+        BigDecimal max = BigDecimal.valueOf(Float.MAX_VALUE);
+        return (value != null) && (value.compareTo(min) >= 0) && (value.compareTo(max) <= 0);
+    }
+
+    @Override
+    public Float getFloat(int index) {
+        if (!isValidFloat(index)) {
+            throw new PlcIncompatibleDatatypeException(Float.class, index);
+        }
+        return getValue(index).floatValue();
+    }
+
+    @Override
+    public boolean isValidDouble(int index) {
+        BigDecimal value = getValue(index);
+        BigDecimal min = BigDecimal.valueOf(-Double.MAX_VALUE);
+        BigDecimal max = BigDecimal.valueOf(Double.MAX_VALUE);
+        return (value != null) && (value.compareTo(min) >= 0) && (value.compareTo(max) <= 0);
+    }
+
+    @Override
+    public Double getDouble(int index) {
+        if (!isValidDouble(index)) {
+            throw new PlcIncompatibleDatatypeException(Double.class, index);
+        }
+        return getValue(index).doubleValue();
+    }
+
+    public boolean isValidBigDecimal(int index) {
+        return getValue(index) != null;
+    }
+
+    public BigDecimal getBigDecimal(int index) {
+        if(!isValidBigDecimal(index)) {
+            throw new PlcIncompatibleDatatypeException(BigDecimal.class, index);
+        }
+        return getValue(index);
+    }
+
+}
+
+
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultBigIntegerFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultBigIntegerFieldItem.java
index 9810d0e7712..088b8825734 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultBigIntegerFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultBigIntegerFieldItem.java
@@ -1,171 +1,171 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.messages.items;
-
-import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-public class DefaultBigIntegerFieldItem extends BaseDefaultFieldItem<BigInteger> {
-
-    public DefaultBigIntegerFieldItem(BigInteger... values) {
-        super(values);
-    }
-
-    @Override
-    public Object getObject(int index) {
-        return getValue(index);
-    }
-
-    @Override
-    public boolean isValidBoolean(int index) {
-        return getValue(index) != null;
-    }
-
-    @Override
-    public Boolean getBoolean(int index) {
-        if (!isValidBoolean(index)) {
-            throw new PlcIncompatibleDatatypeException(Boolean.class, index);
-        }
-        return getValue(index).compareTo(BigInteger.ZERO) == 0;
-    }
-
-    @Override
-    public boolean isValidByte(int index) {
-        BigInteger value = getValue(index);
-        return (value != null) && (value.compareTo(BigInteger.valueOf(Byte.MAX_VALUE)) <= 0) &&
-            (value.compareTo(BigInteger.valueOf(Byte.MIN_VALUE)) >= 0);
-    }
-
-    @Override
-    public Byte getByte(int index) {
-        if (!isValidByte(index)) {
-            throw new PlcIncompatibleDatatypeException(Byte.class, index);
-        }
-        return getValue(index).byteValue();
-    }
-
-    @Override
-    public boolean isValidShort(int index) {
-        BigInteger value = getValue(index);
-        return (value != null) && (value.compareTo(BigInteger.valueOf(Short.MAX_VALUE)) <= 0) &&
-            (value.compareTo(BigInteger.valueOf(Short.MIN_VALUE)) >= 0);
-    }
-
-    @Override
-    public Short getShort(int index) {
-        if (!isValidShort(index)) {
-            throw new PlcIncompatibleDatatypeException(Short.class, index);
-        }
-        return getValue(index).shortValue();
-    }
-
-    @Override
-    public boolean isValidInteger(int index) {
-        BigInteger value = getValue(index);
-        return (value != null) && (value.compareTo(BigInteger.valueOf(Integer.MAX_VALUE)) <= 0) &&
-            (value.compareTo(BigInteger.valueOf(Integer.MIN_VALUE)) >= 0);
-    }
-
-    @Override
-    public Integer getInteger(int index) {
-        if (!isValidInteger(index)) {
-            throw new PlcIncompatibleDatatypeException(Integer.class, index);
-        }
-        return getValue(index).intValue();
-    }
-
-    @Override
-    public boolean isValidLong(int index) {
-        BigInteger value = getValue(index);
-        return (value != null) && (value.compareTo(BigInteger.valueOf(Long.MAX_VALUE)) <= 0) &&
-            (value.compareTo(BigInteger.valueOf(Long.MIN_VALUE)) >= 0);
-    }
-
-    @Override
-    public Long getLong(int index) {
-        if (!isValidLong(index)) {
-            throw new PlcIncompatibleDatatypeException(Long.class, index);
-        }
-        return getValue(index).longValue();
-    }
-
-    public boolean isValidBigInteger(int index) {
-        return getValue(index) != null;
-    }
-
-    public BigInteger getBigInteger(int index) {
-        if (!isValidBigInteger(index)) {
-            throw new PlcIncompatibleDatatypeException(BigInteger.class, index);
-        }
-        return getValue(index);
-    }
-
-    @Override
-    public boolean isValidFloat(int index) {
-        BigInteger value = getValue(index);
-        if (value == null) {
-            return false;
-        }
-        BigDecimal decimalValue = new BigDecimal(value);
-        return (decimalValue.compareTo(BigDecimal.valueOf(Float.MAX_VALUE)) <= 0) &&
-            (decimalValue.compareTo(BigDecimal.valueOf(-Float.MAX_VALUE)) >= 0);
-    }
-
-    @Override
-    public Float getFloat(int index) {
-        if (!isValidFloat(index)) {
-            throw new PlcIncompatibleDatatypeException(Float.class, index);
-        }
-        return getValue(index).floatValue();
-    }
-
-    @Override
-    public boolean isValidDouble(int index) {
-        BigInteger value = getValue(index);
-        if (value == null) {
-            return false;
-        }
-        BigDecimal decimalValue = new BigDecimal(value);
-        return (decimalValue.compareTo(BigDecimal.valueOf(Double.MAX_VALUE)) <= 0) &&
-            (decimalValue.compareTo(BigDecimal.valueOf(-Double.MAX_VALUE)) >= 0);
-    }
-
-    @Override
-    public Double getDouble(int index) {
-        if (!isValidDouble(index)) {
-            throw new PlcIncompatibleDatatypeException(Double.class, index);
-        }
-        return getValue(index).doubleValue();
-    }
-
-    public boolean isValidBigDecimal(int index) {
-        return getValue(index) != null;
-    }
-
-    public BigDecimal getBigDecimal(int index) {
-        if(!isValidBigDecimal(index)) {
-            throw new PlcIncompatibleDatatypeException(BigDecimal.class, index);
-        }
-        return new BigDecimal(getValue(index));
-    }
-
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.messages.items;
+
+import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+public class DefaultBigIntegerFieldItem extends BaseDefaultFieldItem<BigInteger> {
+
+    public DefaultBigIntegerFieldItem(BigInteger... values) {
+        super(values);
+    }
+
+    @Override
+    public Object getObject(int index) {
+        return getValue(index);
+    }
+
+    @Override
+    public boolean isValidBoolean(int index) {
+        return getValue(index) != null;
+    }
+
+    @Override
+    public Boolean getBoolean(int index) {
+        if (!isValidBoolean(index)) {
+            throw new PlcIncompatibleDatatypeException(Boolean.class, index);
+        }
+        return getValue(index).compareTo(BigInteger.ZERO) == 0;
+    }
+
+    @Override
+    public boolean isValidByte(int index) {
+        BigInteger value = getValue(index);
+        return (value != null) && (value.compareTo(BigInteger.valueOf(Byte.MAX_VALUE)) <= 0) &&
+            (value.compareTo(BigInteger.valueOf(Byte.MIN_VALUE)) >= 0);
+    }
+
+    @Override
+    public Byte getByte(int index) {
+        if (!isValidByte(index)) {
+            throw new PlcIncompatibleDatatypeException(Byte.class, index);
+        }
+        return getValue(index).byteValue();
+    }
+
+    @Override
+    public boolean isValidShort(int index) {
+        BigInteger value = getValue(index);
+        return (value != null) && (value.compareTo(BigInteger.valueOf(Short.MAX_VALUE)) <= 0) &&
+            (value.compareTo(BigInteger.valueOf(Short.MIN_VALUE)) >= 0);
+    }
+
+    @Override
+    public Short getShort(int index) {
+        if (!isValidShort(index)) {
+            throw new PlcIncompatibleDatatypeException(Short.class, index);
+        }
+        return getValue(index).shortValue();
+    }
+
+    @Override
+    public boolean isValidInteger(int index) {
+        BigInteger value = getValue(index);
+        return (value != null) && (value.compareTo(BigInteger.valueOf(Integer.MAX_VALUE)) <= 0) &&
+            (value.compareTo(BigInteger.valueOf(Integer.MIN_VALUE)) >= 0);
+    }
+
+    @Override
+    public Integer getInteger(int index) {
+        if (!isValidInteger(index)) {
+            throw new PlcIncompatibleDatatypeException(Integer.class, index);
+        }
+        return getValue(index).intValue();
+    }
+
+    @Override
+    public boolean isValidLong(int index) {
+        BigInteger value = getValue(index);
+        return (value != null) && (value.compareTo(BigInteger.valueOf(Long.MAX_VALUE)) <= 0) &&
+            (value.compareTo(BigInteger.valueOf(Long.MIN_VALUE)) >= 0);
+    }
+
+    @Override
+    public Long getLong(int index) {
+        if (!isValidLong(index)) {
+            throw new PlcIncompatibleDatatypeException(Long.class, index);
+        }
+        return getValue(index).longValue();
+    }
+
+    public boolean isValidBigInteger(int index) {
+        return getValue(index) != null;
+    }
+
+    public BigInteger getBigInteger(int index) {
+        if (!isValidBigInteger(index)) {
+            throw new PlcIncompatibleDatatypeException(BigInteger.class, index);
+        }
+        return getValue(index);
+    }
+
+    @Override
+    public boolean isValidFloat(int index) {
+        BigInteger value = getValue(index);
+        if (value == null) {
+            return false;
+        }
+        BigDecimal decimalValue = new BigDecimal(value);
+        return (decimalValue.compareTo(BigDecimal.valueOf(Float.MAX_VALUE)) <= 0) &&
+            (decimalValue.compareTo(BigDecimal.valueOf(-Float.MAX_VALUE)) >= 0);
+    }
+
+    @Override
+    public Float getFloat(int index) {
+        if (!isValidFloat(index)) {
+            throw new PlcIncompatibleDatatypeException(Float.class, index);
+        }
+        return getValue(index).floatValue();
+    }
+
+    @Override
+    public boolean isValidDouble(int index) {
+        BigInteger value = getValue(index);
+        if (value == null) {
+            return false;
+        }
+        BigDecimal decimalValue = new BigDecimal(value);
+        return (decimalValue.compareTo(BigDecimal.valueOf(Double.MAX_VALUE)) <= 0) &&
+            (decimalValue.compareTo(BigDecimal.valueOf(-Double.MAX_VALUE)) >= 0);
+    }
+
+    @Override
+    public Double getDouble(int index) {
+        if (!isValidDouble(index)) {
+            throw new PlcIncompatibleDatatypeException(Double.class, index);
+        }
+        return getValue(index).doubleValue();
+    }
+
+    public boolean isValidBigDecimal(int index) {
+        return getValue(index) != null;
+    }
+
+    public BigDecimal getBigDecimal(int index) {
+        if(!isValidBigDecimal(index)) {
+            throw new PlcIncompatibleDatatypeException(BigDecimal.class, index);
+        }
+        return new BigDecimal(getValue(index));
+    }
+
+}
+
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultBooleanFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultBooleanFieldItem.java
index e32133df38f..d13ac0a80ca 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultBooleanFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultBooleanFieldItem.java
@@ -1,184 +1,184 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.messages.items;
-
-import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.BitSet;
-
-public class DefaultBooleanFieldItem extends BaseDefaultFieldItem<Boolean> {
-
-    public DefaultBooleanFieldItem(Boolean... values) {
-        super(values);
-    }
-
-    @Override
-    public Object getObject(int index) {
-        return getValue(index);
-    }
-
-    @Override
-    public boolean isValidBoolean(int index) {
-        return getValue(index) != null;
-    }
-
-    @Override
-    public Boolean getBoolean(int index) {
-        if (!isValidBoolean(index)) {
-            throw new PlcIncompatibleDatatypeException(Boolean.class, index);
-        }
-        return getValue(index);
-    }
-
-    @Override
-    public boolean isValidByte(int index) {
-        return isValidBoolean(index);
-    }
-
-    @Override
-    public Byte getByte(int index) {
-        if (!isValidByte(index)) {
-            throw new PlcIncompatibleDatatypeException(Byte.class, index);
-        }
-        return getValue(index) ? (byte) 1 : (byte) 0;
-    }
-
-    @Override
-    public boolean isValidShort(int index) {
-        return isValidBoolean(index);
-    }
-
-    @Override
-    public Short getShort(int index) {
-        if (!isValidShort(index)) {
-            throw new PlcIncompatibleDatatypeException(Byte.class, index);
-        }
-        return getValue(index) ? (short) 1 : (short) 0;
-    }
-
-    @Override
-    public boolean isValidInteger(int index) {
-        return isValidBoolean(index);
-    }
-
-    @Override
-    public Integer getInteger(int index) {
-        if (!isValidInteger(index)) {
-            throw new PlcIncompatibleDatatypeException(Byte.class, index);
-        }
-        return getValue(index) ? 1 : 0;
-    }
-
-    @Override
-    public boolean isValidLong(int index) {
-        return isValidBoolean(index);
-    }
-
-    @Override
-    public Long getLong(int index) {
-        if (!isValidLong(index)) {
-            throw new PlcIncompatibleDatatypeException(Byte.class, index);
-        }
-        return getValue(index) ? 1L : 0L;
-    }
-
-    @Override
-    public boolean isValidBigInteger(int index) {
-        return isValidBoolean(index);
-    }
-
-    @Override
-    public BigInteger getBigInteger(int index) {
-        if (!isValidBigInteger(index)) {
-            throw new PlcIncompatibleDatatypeException(Byte.class, index);
-        }
-        return getValue(index) ? BigInteger.ONE : BigInteger.ZERO;
-    }
-
-    @Override
-    public boolean isValidFloat(int index) {
-        return isValidBoolean(index);
-    }
-
-    @Override
-    public Float getFloat(int index) {
-        if (!isValidFloat(index)) {
-            throw new PlcIncompatibleDatatypeException(Byte.class, index);
-        }
-        return getValue(index) ? 1.0F : 0.0F;
-    }
-
-    @Override
-    public boolean isValidDouble(int index) {
-        return isValidBoolean(index);
-    }
-
-    @Override
-    public Double getDouble(int index) {
-        if (!isValidDouble(index)) {
-            throw new PlcIncompatibleDatatypeException(Byte.class, index);
-        }
-        return getValue(index) ? 1.0D : 0.0D;
-    }
-
-    @Override
-    public boolean isValidBigDecimal(int index) {
-        return isValidBoolean(index);
-    }
-
-    @Override
-    public BigDecimal getBigDecimal(int index) {
-        if (!isValidBigDecimal(index)) {
-            throw new PlcIncompatibleDatatypeException(Byte.class, index);
-        }
-        return getValue(index) ? BigDecimal.ONE : BigDecimal.ZERO;
-    }
-
-    public Byte getCompleteByte(int index) {
-        if (!isValidByte(index)) {
-            throw new PlcIncompatibleDatatypeException(Byte.class, index);
-        }
-        BitSet bitSet = new BitSet();
-        int i = 0;
-        if(getValues() != null) {
-            for (Boolean value : getValues()) {
-                bitSet.set(i, value);
-                i++;
-            }
-        }
-        // TODO: In this case the real max index is smaller than the numValues the object reports.
-        // Calculate the real number of bytes.
-        int numBytes = (i / 8) + ((i % 8 == 0) ? 0 : 1);
-        byte[] bytes = bitSet.toByteArray();
-        if (numBytes - 1 < index) {
-            return null;
-        }
-        // If the highest level bits are all false, the number of bytes is smaller than it should be,
-        // So we have to fix that and return a 0-vale byte instead.
-        if((bytes.length < numBytes) && (bytes.length <= index)) {
-            return 0x00;
-        }
-        return bytes[index];
-    }
-
-    // TODO: implement other methods according to getByte
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.messages.items;
+
+import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.BitSet;
+
+public class DefaultBooleanFieldItem extends BaseDefaultFieldItem<Boolean> {
+
+    public DefaultBooleanFieldItem(Boolean... values) {
+        super(values);
+    }
+
+    @Override
+    public Object getObject(int index) {
+        return getValue(index);
+    }
+
+    @Override
+    public boolean isValidBoolean(int index) {
+        return getValue(index) != null;
+    }
+
+    @Override
+    public Boolean getBoolean(int index) {
+        if (!isValidBoolean(index)) {
+            throw new PlcIncompatibleDatatypeException(Boolean.class, index);
+        }
+        return getValue(index);
+    }
+
+    @Override
+    public boolean isValidByte(int index) {
+        return isValidBoolean(index);
+    }
+
+    @Override
+    public Byte getByte(int index) {
+        if (!isValidByte(index)) {
+            throw new PlcIncompatibleDatatypeException(Byte.class, index);
+        }
+        return getValue(index) ? (byte) 1 : (byte) 0;
+    }
+
+    @Override
+    public boolean isValidShort(int index) {
+        return isValidBoolean(index);
+    }
+
+    @Override
+    public Short getShort(int index) {
+        if (!isValidShort(index)) {
+            throw new PlcIncompatibleDatatypeException(Byte.class, index);
+        }
+        return getValue(index) ? (short) 1 : (short) 0;
+    }
+
+    @Override
+    public boolean isValidInteger(int index) {
+        return isValidBoolean(index);
+    }
+
+    @Override
+    public Integer getInteger(int index) {
+        if (!isValidInteger(index)) {
+            throw new PlcIncompatibleDatatypeException(Byte.class, index);
+        }
+        return getValue(index) ? 1 : 0;
+    }
+
+    @Override
+    public boolean isValidLong(int index) {
+        return isValidBoolean(index);
+    }
+
+    @Override
+    public Long getLong(int index) {
+        if (!isValidLong(index)) {
+            throw new PlcIncompatibleDatatypeException(Byte.class, index);
+        }
+        return getValue(index) ? 1L : 0L;
+    }
+
+    @Override
+    public boolean isValidBigInteger(int index) {
+        return isValidBoolean(index);
+    }
+
+    @Override
+    public BigInteger getBigInteger(int index) {
+        if (!isValidBigInteger(index)) {
+            throw new PlcIncompatibleDatatypeException(Byte.class, index);
+        }
+        return getValue(index) ? BigInteger.ONE : BigInteger.ZERO;
+    }
+
+    @Override
+    public boolean isValidFloat(int index) {
+        return isValidBoolean(index);
+    }
+
+    @Override
+    public Float getFloat(int index) {
+        if (!isValidFloat(index)) {
+            throw new PlcIncompatibleDatatypeException(Byte.class, index);
+        }
+        return getValue(index) ? 1.0F : 0.0F;
+    }
+
+    @Override
+    public boolean isValidDouble(int index) {
+        return isValidBoolean(index);
+    }
+
+    @Override
+    public Double getDouble(int index) {
+        if (!isValidDouble(index)) {
+            throw new PlcIncompatibleDatatypeException(Byte.class, index);
+        }
+        return getValue(index) ? 1.0D : 0.0D;
+    }
+
+    @Override
+    public boolean isValidBigDecimal(int index) {
+        return isValidBoolean(index);
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(int index) {
+        if (!isValidBigDecimal(index)) {
+            throw new PlcIncompatibleDatatypeException(Byte.class, index);
+        }
+        return getValue(index) ? BigDecimal.ONE : BigDecimal.ZERO;
+    }
+
+    public Byte getCompleteByte(int index) {
+        if (!isValidByte(index)) {
+            throw new PlcIncompatibleDatatypeException(Byte.class, index);
+        }
+        BitSet bitSet = new BitSet();
+        int i = 0;
+        if(getValues() != null) {
+            for (Boolean value : getValues()) {
+                bitSet.set(i, value);
+                i++;
+            }
+        }
+        // TODO: In this case the real max index is smaller than the numValues the object reports.
+        // Calculate the real number of bytes.
+        int numBytes = (i / 8) + ((i % 8 == 0) ? 0 : 1);
+        byte[] bytes = bitSet.toByteArray();
+        if (numBytes - 1 < index) {
+            return null;
+        }
+        // If the highest level bits are all false, the number of bytes is smaller than it should be,
+        // So we have to fix that and return a 0-vale byte instead.
+        if((bytes.length < numBytes) && (bytes.length <= index)) {
+            return 0x00;
+        }
+        return bytes[index];
+    }
+
+    // TODO: implement other methods according to getByte
+}
+
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultByteArrayFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultByteArrayFieldItem.java
index 6d35b0b5b7c..acc56842b2f 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultByteArrayFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultByteArrayFieldItem.java
@@ -1,58 +1,58 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.messages.items;
-
-import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
-
-import java.util.Objects;
-
-public class DefaultByteArrayFieldItem extends BaseDefaultFieldItem<Byte[]> {
-
-    public DefaultByteArrayFieldItem(Byte[]... values) {
-        super(values);
-        for (Byte[] value : values) {
-            Objects.requireNonNull(value);
-        }
-    }
-
-    @Override
-    public Object getObject(int index) {
-        return getValue(index);
-    }
-
-    @Override
-    public boolean isValidByteArray(int index) {
-        Byte[] value = getValue(index);
-        return value != null;
-    }
-
-    @Override
-    public Byte[] getByteArray(int index) {
-        if(!isValidByteArray(index)) {
-            throw new PlcIncompatibleDatatypeException(Byte[].class, index);
-        }
-        return getValue(index);
-    }
-
-    //ToDo: extend conversion methods similar to @see {@link org.apache.plc4x.java.modbus.messages.items.DefaultModbusByteArrayFieldItem}
-
-    //ToDo: implement endianness for correct handling of Byte Arrays at conversion
-
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.messages.items;
+
+import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
+
+import java.util.Objects;
+
+public class DefaultByteArrayFieldItem extends BaseDefaultFieldItem<Byte[]> {
+
+    public DefaultByteArrayFieldItem(Byte[]... values) {
+        super(values);
+        for (Byte[] value : values) {
+            Objects.requireNonNull(value);
+        }
+    }
+
+    @Override
+    public Object getObject(int index) {
+        return getValue(index);
+    }
+
+    @Override
+    public boolean isValidByteArray(int index) {
+        Byte[] value = getValue(index);
+        return value != null;
+    }
+
+    @Override
+    public Byte[] getByteArray(int index) {
+        if(!isValidByteArray(index)) {
+            throw new PlcIncompatibleDatatypeException(Byte[].class, index);
+        }
+        return getValue(index);
+    }
+
+    //ToDo: extend conversion methods similar to @see {@link org.apache.plc4x.java.modbus.messages.items.DefaultModbusByteArrayFieldItem}
+
+    //ToDo: implement endianness for correct handling of Byte Arrays at conversion
+
+}
+
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultByteFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultByteFieldItem.java
index 2eb7ccf4050..5cc2dd5f6be 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultByteFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultByteFieldItem.java
@@ -1,150 +1,150 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.messages.items;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
-
-public class DefaultByteFieldItem extends BaseDefaultFieldItem<Byte> {
-
-    public DefaultByteFieldItem(Byte... values) {
-        super(values);
-    }
-
-    @Override
-    public Object getObject(int index) {
-        return getValue(index);
-    }
-
-    @Override
-    public boolean isValidBoolean(int index) {
-        return getValue(index) != null;
-    }
-
-    @Override
-    public Boolean getBoolean(int index) {
-        if (!isValidBoolean(index)) {
-            throw new PlcIncompatibleDatatypeException(Boolean.class, index);
-        }
-        return getValue(index) != 0L;
-    }
-
-    @Override
-    public boolean isValidByte(int index) {
-        return getValue(index) != null;
-    }
-
-    @Override
-    public Byte getByte(int index) {
-        if (!isValidByte(index)) {
-            throw new PlcIncompatibleDatatypeException(Byte.class, index);
-        }
-        return getValue(index);
-    }
-
-    @Override
-    public boolean isValidShort(int index) {
-        return isValidByte(index);
-    }
-
-    @Override
-    public Short getShort(int index) {
-        if (!isValidShort(index)) {
-            throw new PlcIncompatibleDatatypeException(Short.class, index);
-        }
-        return getValue(index).shortValue();
-    }
-
-    @Override
-    public boolean isValidInteger(int index) {
-        return isValidByte(index);
-    }
-
-    @Override
-    public Integer getInteger(int index) {
-        if (!isValidInteger(index)) {
-            throw new PlcIncompatibleDatatypeException(Integer.class, index);
-        }
-        return getValue(index).intValue();
-    }
-
-    @Override
-    public boolean isValidLong(int index) {
-        return isValidByte(index);
-    }
-
-    @Override
-    public Long getLong(int index) {
-        if (!isValidLong(index)) {
-            throw new PlcIncompatibleDatatypeException(Long.class, index);
-        }
-        return getValue(index).longValue();
-    }
-
-    public boolean isValidBigInteger(int index) {
-        return isValidByte(index);
-    }
-
-    public BigInteger getBigInteger(int index) {
-        if (!isValidBigInteger(index)) {
-            throw new PlcIncompatibleDatatypeException(BigInteger.class, index);
-        }
-        return BigInteger.valueOf(getValue(index));
-    }
-
-    @Override
-    public boolean isValidFloat(int index) {
-        return isValidByte(index);
-    }
-
-    @Override
-    public Float getFloat(int index) {
-        if (!isValidFloat(index)) {
-            throw new PlcIncompatibleDatatypeException(Float.class, index);
-        }
-        return getValue(index).floatValue();
-    }
-
-    @Override
-    public boolean isValidDouble(int index) {
-        return isValidByte(index);
-    }
-
-    @Override
-    public Double getDouble(int index) {
-        if (!isValidDouble(index)) {
-            throw new PlcIncompatibleDatatypeException(Double.class, index);
-        }
-        return getValue(index).doubleValue();
-    }
-
-    public boolean isValidBigDecimal(int index) {
-        return isValidByte(index);
-    }
-
-    public BigDecimal getBigDecimal(int index) {
-        if(!isValidBigDecimal(index)) {
-            throw new PlcIncompatibleDatatypeException(BigDecimal.class, index);
-        }
-        return new BigDecimal(getValue(index));
-    }
-
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.messages.items;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
+
+public class DefaultByteFieldItem extends BaseDefaultFieldItem<Byte> {
+
+    public DefaultByteFieldItem(Byte... values) {
+        super(values);
+    }
+
+    @Override
+    public Object getObject(int index) {
+        return getValue(index);
+    }
+
+    @Override
+    public boolean isValidBoolean(int index) {
+        return getValue(index) != null;
+    }
+
+    @Override
+    public Boolean getBoolean(int index) {
+        if (!isValidBoolean(index)) {
+            throw new PlcIncompatibleDatatypeException(Boolean.class, index);
+        }
+        return getValue(index) != 0L;
+    }
+
+    @Override
+    public boolean isValidByte(int index) {
+        return getValue(index) != null;
+    }
+
+    @Override
+    public Byte getByte(int index) {
+        if (!isValidByte(index)) {
+            throw new PlcIncompatibleDatatypeException(Byte.class, index);
+        }
+        return getValue(index);
+    }
+
+    @Override
+    public boolean isValidShort(int index) {
+        return isValidByte(index);
+    }
+
+    @Override
+    public Short getShort(int index) {
+        if (!isValidShort(index)) {
+            throw new PlcIncompatibleDatatypeException(Short.class, index);
+        }
+        return getValue(index).shortValue();
+    }
+
+    @Override
+    public boolean isValidInteger(int index) {
+        return isValidByte(index);
+    }
+
+    @Override
+    public Integer getInteger(int index) {
+        if (!isValidInteger(index)) {
+            throw new PlcIncompatibleDatatypeException(Integer.class, index);
+        }
+        return getValue(index).intValue();
+    }
+
+    @Override
+    public boolean isValidLong(int index) {
+        return isValidByte(index);
+    }
+
+    @Override
+    public Long getLong(int index) {
+        if (!isValidLong(index)) {
+            throw new PlcIncompatibleDatatypeException(Long.class, index);
+        }
+        return getValue(index).longValue();
+    }
+
+    public boolean isValidBigInteger(int index) {
+        return isValidByte(index);
+    }
+
+    public BigInteger getBigInteger(int index) {
+        if (!isValidBigInteger(index)) {
+            throw new PlcIncompatibleDatatypeException(BigInteger.class, index);
+        }
+        return BigInteger.valueOf(getValue(index));
+    }
+
+    @Override
+    public boolean isValidFloat(int index) {
+        return isValidByte(index);
+    }
+
+    @Override
+    public Float getFloat(int index) {
+        if (!isValidFloat(index)) {
+            throw new PlcIncompatibleDatatypeException(Float.class, index);
+        }
+        return getValue(index).floatValue();
+    }
+
+    @Override
+    public boolean isValidDouble(int index) {
+        return isValidByte(index);
+    }
+
+    @Override
+    public Double getDouble(int index) {
+        if (!isValidDouble(index)) {
+            throw new PlcIncompatibleDatatypeException(Double.class, index);
+        }
+        return getValue(index).doubleValue();
+    }
+
+    public boolean isValidBigDecimal(int index) {
+        return isValidByte(index);
+    }
+
+    public BigDecimal getBigDecimal(int index) {
+        if(!isValidBigDecimal(index)) {
+            throw new PlcIncompatibleDatatypeException(BigDecimal.class, index);
+        }
+        return new BigDecimal(getValue(index));
+    }
+
+}
+
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultDoubleFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultDoubleFieldItem.java
index a3fe810ce71..d734c24503d 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultDoubleFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultDoubleFieldItem.java
@@ -1,158 +1,158 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.messages.items;
-
-import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-public class DefaultDoubleFieldItem extends BaseDefaultFieldItem<Double> {
-
-    public DefaultDoubleFieldItem(Double... values) {
-        super(values);
-    }
-
-    @Override
-    public Object getObject(int index) {
-        return getValue(index);
-    }
-
-    @Override
-    public boolean isValidBoolean(int index) {
-        return getValue(index) != null;
-    }
-
-    @Override
-    public Boolean getBoolean(int index) {
-        if (!isValidBoolean(index)) {
-            throw new PlcIncompatibleDatatypeException(Boolean.class, index);
-        }
-        return getValue(index) != 0L;
-    }
-
-    @Override
-    public boolean isValidByte(int index) {
-        Double value = getValue(index);
-        return (value != null) && (value <= Byte.MAX_VALUE) && (value >= Byte.MIN_VALUE);
-    }
-
-    @Override
-    public Byte getByte(int index) {
-        if (!isValidByte(index)) {
-            throw new PlcIncompatibleDatatypeException(Byte.class, index);
-        }
-        return getValue(index).byteValue();
-    }
-
-    @Override
-    public boolean isValidShort(int index) {
-        Double value = getValue(index);
-        return (value != null) && (value <= Short.MAX_VALUE) && (value >= Short.MIN_VALUE);
-    }
-
-    @Override
-    public Short getShort(int index) {
-        if (!isValidShort(index)) {
-            throw new PlcIncompatibleDatatypeException(Short.class, index);
-        }
-        return getValue(index).shortValue();
-    }
-
-    @Override
-    public boolean isValidInteger(int index) {
-        Double value = getValue(index);
-        return (value != null) && (value <= Integer.MAX_VALUE) && (value >= Integer.MIN_VALUE);
-    }
-
-    @Override
-    public Integer getInteger(int index) {
-        if (!isValidInteger(index)) {
-            throw new PlcIncompatibleDatatypeException(Integer.class, index);
-        }
-        return getValue(index).intValue();
-    }
-
-    @Override
-    public boolean isValidLong(int index) {
-        Double value = getValue(index);
-        return (value != null) && (value <= Long.MAX_VALUE) && (value >= Long.MIN_VALUE);
-    }
-
-    @Override
-    public Long getLong(int index) {
-        if (!isValidLong(index)) {
-            throw new PlcIncompatibleDatatypeException(Long.class, index);
-        }
-        return getValue(index).longValue();
-    }
-
-    public boolean isValidBigInteger(int index) {
-        Double value = getValue(index);
-        return value != null;
-    }
-
-    public BigInteger getBigInteger(int index) {
-        if (!isValidBigInteger(index)) {
-            throw new PlcIncompatibleDatatypeException(BigInteger.class, index);
-        }
-        return BigInteger.valueOf(getValue(index).longValue());
-    }
-
-    @Override
-    public boolean isValidFloat(int index) {
-        Double value = getValue(index);
-        return (value != null) && (value <= Float.MAX_VALUE) && (value >= -Float.MAX_VALUE);
-    }
-
-    @Override
-    public Float getFloat(int index) {
-        if (!isValidFloat(index)) {
-            throw new PlcIncompatibleDatatypeException(Float.class, index);
-        }
-        return getValue(index).floatValue();
-    }
-
-    @Override
-    public boolean isValidDouble(int index) {
-        return getValue(index) != null;
-    }
-
-    @Override
-    public Double getDouble(int index) {
-        if (!isValidDouble(index)) {
-            throw new PlcIncompatibleDatatypeException(Double.class, index);
-        }
-        return getValue(index);
-    }
-
-    public boolean isValidBigDecimal(int index) {
-        return getValue(index) != null;
-    }
-
-    public BigDecimal getBigDecimal(int index) {
-        if(!isValidBigDecimal(index)) {
-            throw new PlcIncompatibleDatatypeException(BigDecimal.class, index);
-        }
-        return new BigDecimal(getValue(index));
-    }
-
-}
-
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.messages.items;
+
+import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+public class DefaultDoubleFieldItem extends BaseDefaultFieldItem<Double> {
+
+    public DefaultDoubleFieldItem(Double... values) {
+        super(values);
+    }
+
+    @Override
+    public Object getObject(int index) {
+        return getValue(index);
+    }
+
+    @Override
+    public boolean isValidBoolean(int index) {
+        return getValue(index) != null;
+    }
+
+    @Override
+    public Boolean getBoolean(int index) {
+        if (!isValidBoolean(index)) {
+            throw new PlcIncompatibleDatatypeException(Boolean.class, index);
+        }
+        return getValue(index) != 0L;
+    }
+
+    @Override
+    public boolean isValidByte(int index) {
+        Double value = getValue(index);
+        return (value != null) && (value <= Byte.MAX_VALUE) && (value >= Byte.MIN_VALUE);
+    }
+
+    @Override
+    public Byte getByte(int index) {
+        if (!isValidByte(index)) {
+            throw new PlcIncompatibleDatatypeException(Byte.class, index);
+        }
+        return getValue(index).byteValue();
+    }
+
+    @Override
+    public boolean isValidShort(int index) {
+        Double value = getValue(index);
+        return (value != null) && (value <= Short.MAX_VALUE) && (value >= Short.MIN_VALUE);
+    }
+
+    @Override
+    public Short getShort(int index) {
+        if (!isValidShort(index)) {
+            throw new PlcIncompatibleDatatypeException(Short.class, index);
+        }
+        return getValue(index).shortValue();
+    }
+
+    @Override
+    public boolean isValidInteger(int index) {
+        Double value = getValue(index);
+        return (value != null) && (value <= Integer.MAX_VALUE) && (value >= Integer.MIN_VALUE);
+    }
+
+    @Override
+    public Integer getInteger(int index) {
+        if (!isValidInteger(index)) {
+            throw new PlcIncompatibleDatatypeException(Integer.class, index);
+        }
+        return getValue(index).intValue();
+    }
+
+    @Override
+    public boolean isValidLong(int index) {
+        Double value = getValue(index);
+        return (value != null) && (value <= Long.MAX_VALUE) && (value >= Long.MIN_VALUE);
+    }
+
+    @Override
+    public Long getLong(int index) {
+        if (!isValidLong(index)) {
+            throw new PlcIncompatibleDatatypeException(Long.class, index);
+        }
+        return getValue(index).longValue();
+    }
+
+    public boolean isValidBigInteger(int index) {
+        Double value = getValue(index);
+        return value != null;
+    }
+
+    public BigInteger getBigInteger(int index) {
+        if (!isValidBigInteger(index)) {
+            throw new PlcIncompatibleDatatypeException(BigInteger.class, index);
+        }
+        return BigInteger.valueOf(getValue(index).longValue());
+    }
+
+    @Override
+    public boolean isValidFloat(int index) {
+        Double value = getValue(index);
+        return (value != null) && (value <= Float.MAX_VALUE) && (value >= -Float.MAX_VALUE);
+    }
+
+    @Override
+    public Float getFloat(int index) {
+        if (!isValidFloat(index)) {
+            throw new PlcIncompatibleDatatypeException(Float.class, index);
+        }
+        return getValue(index).floatValue();
+    }
+
+    @Override
+    public boolean isValidDouble(int index) {
+        return getValue(index) != null;
+    }
+
+    @Override
+    public Double getDouble(int index) {
+        if (!isValidDouble(index)) {
+            throw new PlcIncompatibleDatatypeException(Double.class, index);
+        }
+        return getValue(index);
+    }
+
+    public boolean isValidBigDecimal(int index) {
+        return getValue(index) != null;
+    }
+
+    public BigDecimal getBigDecimal(int index) {
+        if(!isValidBigDecimal(index)) {
+            throw new PlcIncompatibleDatatypeException(BigDecimal.class, index);
+        }
+        return new BigDecimal(getValue(index));
+    }
+
+}
+
+
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultDurationFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultDurationFieldItem.java
index 542fd70496f..e5cdacd9b35 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultDurationFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultDurationFieldItem.java
@@ -1,54 +1,54 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.messages.items;
-
-import java.time.Duration;
-import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-
-/**
- *
- * @author cgarcia
- */
-public class DefaultDurationFieldItem extends BaseDefaultFieldItem<Duration> {
-
-    public DefaultDurationFieldItem(Duration... values) {
-        super(values);
-    }
-    
-    @Override
-    public Object getObject(int index) {
-        return getValue(index);
-    }
-
-    @Override
-    public boolean isValidDuration(int index) {
-        return getValue(index) != null;
-    }  
-        
-    @Override
-    public Duration getDuration(int index) {
-        if (!isValidDuration(index)) {
-            throw new PlcIncompatibleDatatypeException(Duration.class, index);
-        }
-        return getValue(index);
-    }    
-    
-    
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.messages.items;
+
+import java.time.Duration;
+import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class DefaultDurationFieldItem extends BaseDefaultFieldItem<Duration> {
+
+    public DefaultDurationFieldItem(Duration... values) {
+        super(values);
+    }
+    
+    @Override
+    public Object getObject(int index) {
+        return getValue(index);
+    }
+
+    @Override
+    public boolean isValidDuration(int index) {
+        return getValue(index) != null;
+    }  
+        
+    @Override
+    public Duration getDuration(int index) {
+        if (!isValidDuration(index)) {
+            throw new PlcIncompatibleDatatypeException(Duration.class, index);
+        }
+        return getValue(index);
+    }    
+    
+    
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultFloatFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultFloatFieldItem.java
index 5e1f2b56d4a..63c128de4cc 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultFloatFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultFloatFieldItem.java
@@ -1,156 +1,156 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.messages.items;
-
-import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-public class DefaultFloatFieldItem extends BaseDefaultFieldItem<Float> {
-
-    public DefaultFloatFieldItem(Float... values) {
-        super(values);
-    }
-
-    @Override
-    public Object getObject(int index) {
-        return getValue(index);
-    }
-
-    @Override
-    public boolean isValidBoolean(int index) {
-        return getValue(index) != null;
-    }
-
-    @Override
-    public Boolean getBoolean(int index) {
-        if (!isValidBoolean(index)) {
-            throw new PlcIncompatibleDatatypeException(Boolean.class, index);
-        }
-        return getValue(index) != 0L;
-    }
-
-    @Override
-    public boolean isValidByte(int index) {
-        Float value = getValue(index);
-        return (value != null) && (value <= Byte.MAX_VALUE) && (value >= Byte.MIN_VALUE);
-    }
-
-    @Override
-    public Byte getByte(int index) {
-        if (!isValidByte(index)) {
-            throw new PlcIncompatibleDatatypeException(Byte.class, index);
-        }
-        return getValue(index).byteValue();
-    }
-
-    @Override
-    public boolean isValidShort(int index) {
-        Float value = getValue(index);
-        return (value != null) && (value <= Short.MAX_VALUE) && (value >= Short.MIN_VALUE);
-    }
-
-    @Override
-    public Short getShort(int index) {
-        if (!isValidShort(index)) {
-            throw new PlcIncompatibleDatatypeException(Short.class, index);
-        }
-        return getValue(index).shortValue();
-    }
-
-    @Override
-    public boolean isValidInteger(int index) {
-        Float value = getValue(index);
-        return (value != null) && (value <= Integer.MAX_VALUE) && (value >= Integer.MIN_VALUE);
-    }
-
-    @Override
-    public Integer getInteger(int index) {
-        if (!isValidInteger(index)) {
-            throw new PlcIncompatibleDatatypeException(Integer.class, index);
-        }
-        return getValue(index).intValue();
-    }
-
-    @Override
-    public boolean isValidLong(int index) {
-        Float value = getValue(index);
-        return (value != null) && (value <= Long.MAX_VALUE) && (value >= Long.MIN_VALUE);
-    }
-
-    @Override
-    public Long getLong(int index) {
-        if (!isValidLong(index)) {
-            throw new PlcIncompatibleDatatypeException(Long.class, index);
-        }
-        return getValue(index).longValue();
-    }
-
-    public boolean isValidBigInteger(int index) {
-        return getValue(index) != null;
-    }
-
-    public BigInteger getBigInteger(int index) {
-        if (!isValidBigInteger(index)) {
-            throw new PlcIncompatibleDatatypeException(BigInteger.class, index);
-        }
-        return BigInteger.valueOf(getValue(index).longValue());
-    }
-
-    @Override
-    public boolean isValidFloat(int index) {
-        return getValue(index) != null;
-    }
-
-    @Override
-    public Float getFloat(int index) {
-        if (!isValidFloat(index)) {
-            throw new PlcIncompatibleDatatypeException(Float.class, index);
-        }
-        return getValue(index);
-    }
-
-    @Override
-    public boolean isValidDouble(int index) {
-        return isValidFloat(index);
-    }
-
-    @Override
-    public Double getDouble(int index) {
-        if (!isValidDouble(index)) {
-            throw new PlcIncompatibleDatatypeException(Double.class, index);
-        }
-        return getValue(index).doubleValue();
-    }
-
-    public boolean isValidBigDecimal(int index) {
-        return isValidFloat(index);
-    }
-
-    public BigDecimal getBigDecimal(int index) {
-        if(!isValidBigDecimal(index)) {
-            throw new PlcIncompatibleDatatypeException(BigDecimal.class, index);
-        }
-        return new BigDecimal(getValue(index));
-    }
-
-}
-
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.messages.items;
+
+import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+public class DefaultFloatFieldItem extends BaseDefaultFieldItem<Float> {
+
+    public DefaultFloatFieldItem(Float... values) {
+        super(values);
+    }
+
+    @Override
+    public Object getObject(int index) {
+        return getValue(index);
+    }
+
+    @Override
+    public boolean isValidBoolean(int index) {
+        return getValue(index) != null;
+    }
+
+    @Override
+    public Boolean getBoolean(int index) {
+        if (!isValidBoolean(index)) {
+            throw new PlcIncompatibleDatatypeException(Boolean.class, index);
+        }
+        return getValue(index) != 0L;
+    }
+
+    @Override
+    public boolean isValidByte(int index) {
+        Float value = getValue(index);
+        return (value != null) && (value <= Byte.MAX_VALUE) && (value >= Byte.MIN_VALUE);
+    }
+
+    @Override
+    public Byte getByte(int index) {
+        if (!isValidByte(index)) {
+            throw new PlcIncompatibleDatatypeException(Byte.class, index);
+        }
+        return getValue(index).byteValue();
+    }
+
+    @Override
+    public boolean isValidShort(int index) {
+        Float value = getValue(index);
+        return (value != null) && (value <= Short.MAX_VALUE) && (value >= Short.MIN_VALUE);
+    }
+
+    @Override
+    public Short getShort(int index) {
+        if (!isValidShort(index)) {
+            throw new PlcIncompatibleDatatypeException(Short.class, index);
+        }
+        return getValue(index).shortValue();
+    }
+
+    @Override
+    public boolean isValidInteger(int index) {
+        Float value = getValue(index);
+        return (value != null) && (value <= Integer.MAX_VALUE) && (value >= Integer.MIN_VALUE);
+    }
+
+    @Override
+    public Integer getInteger(int index) {
+        if (!isValidInteger(index)) {
+            throw new PlcIncompatibleDatatypeException(Integer.class, index);
+        }
+        return getValue(index).intValue();
+    }
+
+    @Override
+    public boolean isValidLong(int index) {
+        Float value = getValue(index);
+        return (value != null) && (value <= Long.MAX_VALUE) && (value >= Long.MIN_VALUE);
+    }
+
+    @Override
+    public Long getLong(int index) {
+        if (!isValidLong(index)) {
+            throw new PlcIncompatibleDatatypeException(Long.class, index);
+        }
+        return getValue(index).longValue();
+    }
+
+    public boolean isValidBigInteger(int index) {
+        return getValue(index) != null;
+    }
+
+    public BigInteger getBigInteger(int index) {
+        if (!isValidBigInteger(index)) {
+            throw new PlcIncompatibleDatatypeException(BigInteger.class, index);
+        }
+        return BigInteger.valueOf(getValue(index).longValue());
+    }
+
+    @Override
+    public boolean isValidFloat(int index) {
+        return getValue(index) != null;
+    }
+
+    @Override
+    public Float getFloat(int index) {
+        if (!isValidFloat(index)) {
+            throw new PlcIncompatibleDatatypeException(Float.class, index);
+        }
+        return getValue(index);
+    }
+
+    @Override
+    public boolean isValidDouble(int index) {
+        return isValidFloat(index);
+    }
+
+    @Override
+    public Double getDouble(int index) {
+        if (!isValidDouble(index)) {
+            throw new PlcIncompatibleDatatypeException(Double.class, index);
+        }
+        return getValue(index).doubleValue();
+    }
+
+    public boolean isValidBigDecimal(int index) {
+        return isValidFloat(index);
+    }
+
+    public BigDecimal getBigDecimal(int index) {
+        if(!isValidBigDecimal(index)) {
+            throw new PlcIncompatibleDatatypeException(BigDecimal.class, index);
+        }
+        return new BigDecimal(getValue(index));
+    }
+
+}
+
+
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultIntegerFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultIntegerFieldItem.java
index 6d59c102756..624fb64b76d 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultIntegerFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultIntegerFieldItem.java
@@ -1,162 +1,162 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.messages.items;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalTime;
-import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
-
-public class DefaultIntegerFieldItem extends BaseDefaultFieldItem<Integer> {
-
-    public DefaultIntegerFieldItem(Integer... values) {
-        super(values);
-    }
-   
-    @Override
-    public Object getObject(int index) {
-        return getValue(index);
-    }
-
-    @Override
-    public boolean isValidBoolean(int index) {
-        return getValue(index) != null;
-    }
-
-    @Override
-    public Boolean getBoolean(int index) {
-        if (!isValidBoolean(index)) {
-            throw new PlcIncompatibleDatatypeException(Boolean.class, index);
-        }
-        return getValue(index) != 0L;
-    }
-
-    @Override
-    public boolean isValidByte(int index) {
-        Integer value = getValue(index);
-        return (value != null) && (value <= Byte.MAX_VALUE) && (value >= Byte.MIN_VALUE);
-    }
-
-    @Override
-    public Byte getByte(int index) {
-        if (!isValidByte(index)) {
-            throw new PlcIncompatibleDatatypeException(Byte.class, index);
-        }
-        return getValue(index).byteValue();
-    }
-
-    @Override
-    public boolean isValidShort(int index) {
-        Integer value = getValue(index);
-        return (value != null) && (value <= Short.MAX_VALUE) && (value >= Short.MIN_VALUE);
-    }
-
-    @Override
-    public Short getShort(int index) {
-        if (!isValidShort(index)) {
-            throw new PlcIncompatibleDatatypeException(Short.class, index);
-        }
-        return getValue(index).shortValue();
-    }
-
-    @Override
-    public boolean isValidInteger(int index) {
-        return getValue(index) != null;
-    }
-
-    @Override
-    public Integer getInteger(int index) {
-        if (!isValidInteger(index)) {
-            throw new PlcIncompatibleDatatypeException(Integer.class, index);
-        }
-        return getValue(index);
-    }
-
-    @Override
-    public boolean isValidLong(int index) {
-        return isValidInteger(index);
-    }
-
-    @Override
-    public Long getLong(int index) {
-        if (!isValidFloat(index)) {
-            throw new PlcIncompatibleDatatypeException(Long.class, index);
-        }
-        return getValue(index).longValue();
-    }
-
-    public boolean isValidBigInteger(int index) {
-        return isValidInteger(index);
-    }
-
-    public BigInteger getBigInteger(int index) {
-        if (!isValidBigInteger(index)) {
-            throw new PlcIncompatibleDatatypeException(BigInteger.class, index);
-        }
-        return BigInteger.valueOf(getValue(index));
-    }
-
-    @Override
-    public boolean isValidFloat(int index) {
-        return isValidInteger(index);
-    }
-
-    @Override
-    public Float getFloat(int index) {
-        if (!isValidFloat(index)) {
-            throw new PlcIncompatibleDatatypeException(Float.class, index);
-        }
-        return getValue(index).floatValue();
-    }
-
-    @Override
-    public boolean isValidDouble(int index) {
-        return isValidInteger(index);
-    }
-
-    @Override
-    public Double getDouble(int index) {
-        if (!isValidDouble(index)) {
-            throw new PlcIncompatibleDatatypeException(Double.class, index);
-        }
-        return getValue(index).doubleValue();
-    }
-
-    public boolean isValidBigDecimal(int index) {
-        return isValidInteger(index);
-    }
-
-    public BigDecimal getBigDecimal(int index) {
-        if(!isValidBigDecimal(index)) {
-            throw new PlcIncompatibleDatatypeException(BigDecimal.class, index);
-        }
-        return new BigDecimal(getValue(index));
-    }
-
-    @Override
-    public LocalTime getTime(int index) {
-        System.out.println("DefaultIntegerFieldItem: getTime");
-        return super.getTime(index); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    
-    
-    
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.messages.items;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.LocalTime;
+import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
+
+public class DefaultIntegerFieldItem extends BaseDefaultFieldItem<Integer> {
+
+    public DefaultIntegerFieldItem(Integer... values) {
+        super(values);
+    }
+   
+    @Override
+    public Object getObject(int index) {
+        return getValue(index);
+    }
+
+    @Override
+    public boolean isValidBoolean(int index) {
+        return getValue(index) != null;
+    }
+
+    @Override
+    public Boolean getBoolean(int index) {
+        if (!isValidBoolean(index)) {
+            throw new PlcIncompatibleDatatypeException(Boolean.class, index);
+        }
+        return getValue(index) != 0L;
+    }
+
+    @Override
+    public boolean isValidByte(int index) {
+        Integer value = getValue(index);
+        return (value != null) && (value <= Byte.MAX_VALUE) && (value >= Byte.MIN_VALUE);
+    }
+
+    @Override
+    public Byte getByte(int index) {
+        if (!isValidByte(index)) {
+            throw new PlcIncompatibleDatatypeException(Byte.class, index);
+        }
+        return getValue(index).byteValue();
+    }
+
+    @Override
+    public boolean isValidShort(int index) {
+        Integer value = getValue(index);
+        return (value != null) && (value <= Short.MAX_VALUE) && (value >= Short.MIN_VALUE);
+    }
+
+    @Override
+    public Short getShort(int index) {
+        if (!isValidShort(index)) {
+            throw new PlcIncompatibleDatatypeException(Short.class, index);
+        }
+        return getValue(index).shortValue();
+    }
+
+    @Override
+    public boolean isValidInteger(int index) {
+        return getValue(index) != null;
+    }
+
+    @Override
+    public Integer getInteger(int index) {
+        if (!isValidInteger(index)) {
+            throw new PlcIncompatibleDatatypeException(Integer.class, index);
+        }
+        return getValue(index);
+    }
+
+    @Override
+    public boolean isValidLong(int index) {
+        return isValidInteger(index);
+    }
+
+    @Override
+    public Long getLong(int index) {
+        if (!isValidFloat(index)) {
+            throw new PlcIncompatibleDatatypeException(Long.class, index);
+        }
+        return getValue(index).longValue();
+    }
+
+    public boolean isValidBigInteger(int index) {
+        return isValidInteger(index);
+    }
+
+    public BigInteger getBigInteger(int index) {
+        if (!isValidBigInteger(index)) {
+            throw new PlcIncompatibleDatatypeException(BigInteger.class, index);
+        }
+        return BigInteger.valueOf(getValue(index));
+    }
+
+    @Override
+    public boolean isValidFloat(int index) {
+        return isValidInteger(index);
+    }
+
+    @Override
+    public Float getFloat(int index) {
+        if (!isValidFloat(index)) {
+            throw new PlcIncompatibleDatatypeException(Float.class, index);
+        }
+        return getValue(index).floatValue();
+    }
+
+    @Override
+    public boolean isValidDouble(int index) {
+        return isValidInteger(index);
+    }
+
+    @Override
+    public Double getDouble(int index) {
+        if (!isValidDouble(index)) {
+            throw new PlcIncompatibleDatatypeException(Double.class, index);
+        }
+        return getValue(index).doubleValue();
+    }
+
+    public boolean isValidBigDecimal(int index) {
+        return isValidInteger(index);
+    }
+
+    public BigDecimal getBigDecimal(int index) {
+        if(!isValidBigDecimal(index)) {
+            throw new PlcIncompatibleDatatypeException(BigDecimal.class, index);
+        }
+        return new BigDecimal(getValue(index));
+    }
+
+    @Override
+    public LocalTime getTime(int index) {
+        System.out.println("DefaultIntegerFieldItem: getTime");
+        return super.getTime(index); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    
+    
+    
+}
+
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLocalDateFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLocalDateFieldItem.java
index aaf6f215696..8a541fc94ee 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLocalDateFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLocalDateFieldItem.java
@@ -1,54 +1,54 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.messages.items;
-
-import java.time.LocalDate;
-import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
-
-public class DefaultLocalDateFieldItem extends BaseDefaultFieldItem<LocalDate> {
-
-    public DefaultLocalDateFieldItem(LocalDate... values) {
-        super(values);
-    }
-
-    @Override
-    public Object getObject(int index) {
-        return getValue(index);
-    }
-
-    @Override
-    public boolean isValidDate(int index) {
-        return getValue(index) != null;
-    }
-
-    @Override
-    public Short getShort(int index) {
-        return super.getShort(index); 
-    }
-    
-    @Override
-    public LocalDate getDate(int index) {
-        if (!isValidDate(index)) {
-            throw new PlcIncompatibleDatatypeException(LocalDate.class, index);
-        }
-        return getValue(index);
-    }
-
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.messages.items;
+
+import java.time.LocalDate;
+import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
+
+public class DefaultLocalDateFieldItem extends BaseDefaultFieldItem<LocalDate> {
+
+    public DefaultLocalDateFieldItem(LocalDate... values) {
+        super(values);
+    }
+
+    @Override
+    public Object getObject(int index) {
+        return getValue(index);
+    }
+
+    @Override
+    public boolean isValidDate(int index) {
+        return getValue(index) != null;
+    }
+
+    @Override
+    public Short getShort(int index) {
+        return super.getShort(index); 
+    }
+    
+    @Override
+    public LocalDate getDate(int index) {
+        if (!isValidDate(index)) {
+            throw new PlcIncompatibleDatatypeException(LocalDate.class, index);
+        }
+        return getValue(index);
+    }
+
+}
+
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLocalDateTimeFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLocalDateTimeFieldItem.java
index 39eee6611c6..d3f7ec8d44b 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLocalDateTimeFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLocalDateTimeFieldItem.java
@@ -1,78 +1,78 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.messages.items;
-
-import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-
-public class DefaultLocalDateTimeFieldItem extends BaseDefaultFieldItem<LocalDateTime> {
-
-    public DefaultLocalDateTimeFieldItem(LocalDateTime... values) {
-        super(values);
-    }
-
-    @Override
-    public Object getObject(int index) {
-        return getValue(index);
-    }
-
-    @Override
-    public boolean isValidTime(int index) {
-        return isValidDateTime(index);
-    }
-
-    @Override
-    public LocalTime getTime(int index) {
-        if (!isValidTime(index)) {
-            throw new PlcIncompatibleDatatypeException(LocalTime.class, index);
-        }
-        return getValue(index).toLocalTime();
-    }
-
-    @Override
-    public boolean isValidDate(int index) {
-        return isValidDateTime(index);
-    }
-
-    @Override
-    public LocalDate getDate(int index) {
-        if (!isValidTime(index)) {
-            throw new PlcIncompatibleDatatypeException(LocalDate.class, index);
-        }
-        return getValue(index).toLocalDate();
-    }
-
-    @Override
-    public boolean isValidDateTime(int index) {
-        return getValue(index) != null;
-    }
-
-    @Override
-    public LocalDateTime getDateTime(int index) {
-        if (!isValidTime(index)) {
-            throw new PlcIncompatibleDatatypeException(LocalDateTime.class, index);
-        }
-        return getValue(index);
-    }
-
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.messages.items;
+
+import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+
+public class DefaultLocalDateTimeFieldItem extends BaseDefaultFieldItem<LocalDateTime> {
+
+    public DefaultLocalDateTimeFieldItem(LocalDateTime... values) {
+        super(values);
+    }
+
+    @Override
+    public Object getObject(int index) {
+        return getValue(index);
+    }
+
+    @Override
+    public boolean isValidTime(int index) {
+        return isValidDateTime(index);
+    }
+
+    @Override
+    public LocalTime getTime(int index) {
+        if (!isValidTime(index)) {
+            throw new PlcIncompatibleDatatypeException(LocalTime.class, index);
+        }
+        return getValue(index).toLocalTime();
+    }
+
+    @Override
+    public boolean isValidDate(int index) {
+        return isValidDateTime(index);
+    }
+
+    @Override
+    public LocalDate getDate(int index) {
+        if (!isValidTime(index)) {
+            throw new PlcIncompatibleDatatypeException(LocalDate.class, index);
+        }
+        return getValue(index).toLocalDate();
+    }
+
+    @Override
+    public boolean isValidDateTime(int index) {
+        return getValue(index) != null;
+    }
+
+    @Override
+    public LocalDateTime getDateTime(int index) {
+        if (!isValidTime(index)) {
+            throw new PlcIncompatibleDatatypeException(LocalDateTime.class, index);
+        }
+        return getValue(index);
+    }
+
+}
+
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLocalTimeFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLocalTimeFieldItem.java
index 15f45930ec6..587bbb9268c 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLocalTimeFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLocalTimeFieldItem.java
@@ -1,54 +1,54 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.messages.items;
-
-import java.time.LocalTime;
-import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
-
-public class DefaultLocalTimeFieldItem extends BaseDefaultFieldItem<LocalTime> {
-
-    public DefaultLocalTimeFieldItem(LocalTime... values) {
-        super(values);
-    }
-
-    @Override
-    public Object getObject(int index) {
-        return getValue(index);
-    }
-
-    @Override
-    public boolean isValidTime(int index) {
-        return getValue(index) != null;
-    }
-
-    @Override
-    public Integer getInteger(int index) {             
-        return super.getInteger(index);
-    }
-                       
-    @Override
-    public LocalTime getTime(int index) {
-        if (!isValidTime(index)) {
-            throw new PlcIncompatibleDatatypeException(LocalTime.class, index);
-        }
-        return getValue(index);
-    }
-
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.messages.items;
+
+import java.time.LocalTime;
+import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
+
+public class DefaultLocalTimeFieldItem extends BaseDefaultFieldItem<LocalTime> {
+
+    public DefaultLocalTimeFieldItem(LocalTime... values) {
+        super(values);
+    }
+
+    @Override
+    public Object getObject(int index) {
+        return getValue(index);
+    }
+
+    @Override
+    public boolean isValidTime(int index) {
+        return getValue(index) != null;
+    }
+
+    @Override
+    public Integer getInteger(int index) {             
+        return super.getInteger(index);
+    }
+                       
+    @Override
+    public LocalTime getTime(int index) {
+        if (!isValidTime(index)) {
+            throw new PlcIncompatibleDatatypeException(LocalTime.class, index);
+        }
+        return getValue(index);
+    }
+
+}
+
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLongFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLongFieldItem.java
index 67ada38371d..6123dfa9dc4 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLongFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLongFieldItem.java
@@ -1,154 +1,154 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.messages.items;
-
-import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-public class DefaultLongFieldItem extends BaseDefaultFieldItem<Long> {
-
-    public DefaultLongFieldItem(Long... values) {
-        super(values);
-    }
-
-    @Override
-    public Object getObject(int index) {
-        return getValue(index);
-    }
-
-    @Override
-    public boolean isValidBoolean(int index) {
-        return getValue(index) != null;
-    }
-
-    @Override
-    public Boolean getBoolean(int index) {
-        if (!isValidBoolean(index)) {
-            throw new PlcIncompatibleDatatypeException(Boolean.class, index);
-        }
-        return getValue(index) != 0L;
-    }
-
-    @Override
-    public boolean isValidByte(int index) {
-        Long value = getValue(index);
-        return (value != null) && (value <= Byte.MAX_VALUE) && (value >= Byte.MIN_VALUE);
-    }
-
-    @Override
-    public Byte getByte(int index) {
-        if (!isValidByte(index)) {
-            throw new PlcIncompatibleDatatypeException(Byte.class, index);
-        }
-        return getValue(index).byteValue();
-    }
-
-    @Override
-    public boolean isValidShort(int index) {
-        Long value = getValue(index);
-        return (value != null) && (value <= Short.MAX_VALUE) && (value >= Short.MIN_VALUE);
-    }
-
-    @Override
-    public Short getShort(int index) {
-        if (!isValidShort(index)) {
-            throw new PlcIncompatibleDatatypeException(Short.class, index);
-        }
-        return getValue(index).shortValue();
-    }
-
-    @Override
-    public boolean isValidInteger(int index) {
-        Long value = getValue(index);
-        return (value != null) && (value <= Integer.MAX_VALUE) && (value >= Integer.MIN_VALUE);
-    }
-
-    @Override
-    public Integer getInteger(int index) {
-        if (!isValidInteger(index)) {
-            throw new PlcIncompatibleDatatypeException(Integer.class, index);
-        }
-        return getValue(index).intValue();
-    }
-
-    @Override
-    public boolean isValidLong(int index) {
-        return getValue(index) != null;
-    }
-
-    @Override
-    public Long getLong(int index) {
-        if (!isValidLong(index)) {
-            throw new PlcIncompatibleDatatypeException(Long.class, index);
-        }
-        return getValue(index);
-    }
-
-    public boolean isValidBigInteger(int index) {
-        return isValidLong(index);
-    }
-
-    public BigInteger getBigInteger(int index) {
-        if (!isValidBigInteger(index)) {
-            throw new PlcIncompatibleDatatypeException(BigInteger.class, index);
-        }
-        return BigInteger.valueOf(getValue(index));
-    }
-
-    @Override
-    public boolean isValidFloat(int index) {
-        return isValidLong(index);
-    }
-
-    @Override
-    public Float getFloat(int index) {
-        if (!isValidFloat(index)) {
-            throw new PlcIncompatibleDatatypeException(Float.class, index);
-        }
-        return getValue(index).floatValue();
-    }
-
-    @Override
-    public boolean isValidDouble(int index) {
-        return isValidLong(index);
-    }
-
-    @Override
-    public Double getDouble(int index) {
-        if (!isValidDouble(index)) {
-            throw new PlcIncompatibleDatatypeException(Double.class, index);
-        }
-        return getValue(index).doubleValue();
-    }
-
-    public boolean isValidBigDecimal(int index) {
-        return isValidLong(index);
-    }
-
-    public BigDecimal getBigDecimal(int index) {
-        if(!isValidBigDecimal(index)) {
-            throw new PlcIncompatibleDatatypeException(BigDecimal.class, index);
-        }
-        return new BigDecimal(getValue(index));
-    }
-
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.messages.items;
+
+import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+public class DefaultLongFieldItem extends BaseDefaultFieldItem<Long> {
+
+    public DefaultLongFieldItem(Long... values) {
+        super(values);
+    }
+
+    @Override
+    public Object getObject(int index) {
+        return getValue(index);
+    }
+
+    @Override
+    public boolean isValidBoolean(int index) {
+        return getValue(index) != null;
+    }
+
+    @Override
+    public Boolean getBoolean(int index) {
+        if (!isValidBoolean(index)) {
+            throw new PlcIncompatibleDatatypeException(Boolean.class, index);
+        }
+        return getValue(index) != 0L;
+    }
+
+    @Override
+    public boolean isValidByte(int index) {
+        Long value = getValue(index);
+        return (value != null) && (value <= Byte.MAX_VALUE) && (value >= Byte.MIN_VALUE);
+    }
+
+    @Override
+    public Byte getByte(int index) {
+        if (!isValidByte(index)) {
+            throw new PlcIncompatibleDatatypeException(Byte.class, index);
+        }
+        return getValue(index).byteValue();
+    }
+
+    @Override
+    public boolean isValidShort(int index) {
+        Long value = getValue(index);
+        return (value != null) && (value <= Short.MAX_VALUE) && (value >= Short.MIN_VALUE);
+    }
+
+    @Override
+    public Short getShort(int index) {
+        if (!isValidShort(index)) {
+            throw new PlcIncompatibleDatatypeException(Short.class, index);
+        }
+        return getValue(index).shortValue();
+    }
+
+    @Override
+    public boolean isValidInteger(int index) {
+        Long value = getValue(index);
+        return (value != null) && (value <= Integer.MAX_VALUE) && (value >= Integer.MIN_VALUE);
+    }
+
+    @Override
+    public Integer getInteger(int index) {
+        if (!isValidInteger(index)) {
+            throw new PlcIncompatibleDatatypeException(Integer.class, index);
+        }
+        return getValue(index).intValue();
+    }
+
+    @Override
+    public boolean isValidLong(int index) {
+        return getValue(index) != null;
+    }
+
+    @Override
+    public Long getLong(int index) {
+        if (!isValidLong(index)) {
+            throw new PlcIncompatibleDatatypeException(Long.class, index);
+        }
+        return getValue(index);
+    }
+
+    public boolean isValidBigInteger(int index) {
+        return isValidLong(index);
+    }
+
+    public BigInteger getBigInteger(int index) {
+        if (!isValidBigInteger(index)) {
+            throw new PlcIncompatibleDatatypeException(BigInteger.class, index);
+        }
+        return BigInteger.valueOf(getValue(index));
+    }
+
+    @Override
+    public boolean isValidFloat(int index) {
+        return isValidLong(index);
+    }
+
+    @Override
+    public Float getFloat(int index) {
+        if (!isValidFloat(index)) {
+            throw new PlcIncompatibleDatatypeException(Float.class, index);
+        }
+        return getValue(index).floatValue();
+    }
+
+    @Override
+    public boolean isValidDouble(int index) {
+        return isValidLong(index);
+    }
+
+    @Override
+    public Double getDouble(int index) {
+        if (!isValidDouble(index)) {
+            throw new PlcIncompatibleDatatypeException(Double.class, index);
+        }
+        return getValue(index).doubleValue();
+    }
+
+    public boolean isValidBigDecimal(int index) {
+        return isValidLong(index);
+    }
+
+    public BigDecimal getBigDecimal(int index) {
+        if(!isValidBigDecimal(index)) {
+            throw new PlcIncompatibleDatatypeException(BigDecimal.class, index);
+        }
+        return new BigDecimal(getValue(index));
+    }
+
+}
+
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultShortFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultShortFieldItem.java
index 87ed5a6b050..bd445d8e826 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultShortFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultShortFieldItem.java
@@ -1,151 +1,151 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.messages.items;
-
-import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-public class DefaultShortFieldItem extends BaseDefaultFieldItem<Short> {
-
-    public DefaultShortFieldItem(Short... values) {
-        super(values);
-    }
-
-    @Override
-    public Object getObject(int index) {
-        return getValue(index);
-    }
-
-    @Override
-    public boolean isValidBoolean(int index) {
-        return getValue(index) != null;
-    }
-
-    @Override
-    public Boolean getBoolean(int index) {
-        if (!isValidBoolean(index)) {
-            throw new PlcIncompatibleDatatypeException(Boolean.class, index);
-        }
-        return getValue(index) != 0L;
-    }
-
-    @Override
-    public boolean isValidByte(int index) {
-        Short value = getValue(index);
-        return (value != null) && (value <= Byte.MAX_VALUE) && (value >= Byte.MIN_VALUE);
-    }
-
-    @Override
-    public Byte getByte(int index) {
-        if (!isValidByte(index)) {
-            throw new PlcIncompatibleDatatypeException(Byte.class, index);
-        }
-        return getValue(index).byteValue();
-    }
-
-    @Override
-    public boolean isValidShort(int index) {
-        return getValue(index) != null;
-    }
-
-    @Override
-    public Short getShort(int index) {
-        if (!isValidShort(index)) {
-            throw new PlcIncompatibleDatatypeException(Short.class, index);
-        }
-        return getValue(index);
-    }
-
-    @Override
-    public boolean isValidInteger(int index) {
-        return isValidShort(index);
-    }
-
-    @Override
-    public Integer getInteger(int index) {
-        if (!isValidInteger(index)) {
-            throw new PlcIncompatibleDatatypeException(Integer.class, index);
-        }
-        return getValue(index).intValue();
-    }
-
-    @Override
-    public boolean isValidLong(int index) {
-        return isValidShort(index);
-    }
-
-    @Override
-    public Long getLong(int index) {
-        if (!isValidLong(index)) {
-            throw new PlcIncompatibleDatatypeException(Long.class, index);
-        }
-        return getValue(index).longValue();
-    }
-
-    public boolean isValidBigInteger(int index) {
-        return isValidShort(index);
-    }
-
-    public BigInteger getBigInteger(int index) {
-        if (!isValidBigInteger(index)) {
-            throw new PlcIncompatibleDatatypeException(BigInteger.class, index);
-        }
-        return BigInteger.valueOf(getValue(index));
-    }
-
-    @Override
-    public boolean isValidFloat(int index) {
-        return isValidShort(index);
-    }
-
-    @Override
-    public Float getFloat(int index) {
-        if (!isValidFloat(index)) {
-            throw new PlcIncompatibleDatatypeException(Float.class, index);
-        }
-        return getValue(index).floatValue();
-    }
-
-    @Override
-    public boolean isValidDouble(int index) {
-        return isValidShort(index);
-    }
-
-    @Override
-    public Double getDouble(int index) {
-        if (!isValidDouble(index)) {
-            throw new PlcIncompatibleDatatypeException(Double.class, index);
-        }
-        return getValue(index).doubleValue();
-    }
-
-    public boolean isValidBigDecimal(int index) {
-        return isValidShort(index);
-    }
-
-    public BigDecimal getBigDecimal(int index) {
-        if(!isValidBigDecimal(index)) {
-            throw new PlcIncompatibleDatatypeException(BigDecimal.class, index);
-        }
-        return new BigDecimal(getValue(index));
-    }
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.messages.items;
+
+import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+public class DefaultShortFieldItem extends BaseDefaultFieldItem<Short> {
+
+    public DefaultShortFieldItem(Short... values) {
+        super(values);
+    }
+
+    @Override
+    public Object getObject(int index) {
+        return getValue(index);
+    }
+
+    @Override
+    public boolean isValidBoolean(int index) {
+        return getValue(index) != null;
+    }
+
+    @Override
+    public Boolean getBoolean(int index) {
+        if (!isValidBoolean(index)) {
+            throw new PlcIncompatibleDatatypeException(Boolean.class, index);
+        }
+        return getValue(index) != 0L;
+    }
+
+    @Override
+    public boolean isValidByte(int index) {
+        Short value = getValue(index);
+        return (value != null) && (value <= Byte.MAX_VALUE) && (value >= Byte.MIN_VALUE);
+    }
+
+    @Override
+    public Byte getByte(int index) {
+        if (!isValidByte(index)) {
+            throw new PlcIncompatibleDatatypeException(Byte.class, index);
+        }
+        return getValue(index).byteValue();
+    }
+
+    @Override
+    public boolean isValidShort(int index) {
+        return getValue(index) != null;
+    }
+
+    @Override
+    public Short getShort(int index) {
+        if (!isValidShort(index)) {
+            throw new PlcIncompatibleDatatypeException(Short.class, index);
+        }
+        return getValue(index);
+    }
+
+    @Override
+    public boolean isValidInteger(int index) {
+        return isValidShort(index);
+    }
+
+    @Override
+    public Integer getInteger(int index) {
+        if (!isValidInteger(index)) {
+            throw new PlcIncompatibleDatatypeException(Integer.class, index);
+        }
+        return getValue(index).intValue();
+    }
+
+    @Override
+    public boolean isValidLong(int index) {
+        return isValidShort(index);
+    }
+
+    @Override
+    public Long getLong(int index) {
+        if (!isValidLong(index)) {
+            throw new PlcIncompatibleDatatypeException(Long.class, index);
+        }
+        return getValue(index).longValue();
+    }
+
+    public boolean isValidBigInteger(int index) {
+        return isValidShort(index);
+    }
+
+    public BigInteger getBigInteger(int index) {
+        if (!isValidBigInteger(index)) {
+            throw new PlcIncompatibleDatatypeException(BigInteger.class, index);
+        }
+        return BigInteger.valueOf(getValue(index));
+    }
+
+    @Override
+    public boolean isValidFloat(int index) {
+        return isValidShort(index);
+    }
+
+    @Override
+    public Float getFloat(int index) {
+        if (!isValidFloat(index)) {
+            throw new PlcIncompatibleDatatypeException(Float.class, index);
+        }
+        return getValue(index).floatValue();
+    }
+
+    @Override
+    public boolean isValidDouble(int index) {
+        return isValidShort(index);
+    }
+
+    @Override
+    public Double getDouble(int index) {
+        if (!isValidDouble(index)) {
+            throw new PlcIncompatibleDatatypeException(Double.class, index);
+        }
+        return getValue(index).doubleValue();
+    }
+
+    public boolean isValidBigDecimal(int index) {
+        return isValidShort(index);
+    }
+
+    public BigDecimal getBigDecimal(int index) {
+        if(!isValidBigDecimal(index)) {
+            throw new PlcIncompatibleDatatypeException(BigDecimal.class, index);
+        }
+        return new BigDecimal(getValue(index));
+    }
+}
+
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultStringFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultStringFieldItem.java
index 35b5ded4439..48f024b3b54 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultStringFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultStringFieldItem.java
@@ -1,59 +1,59 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.messages.items;
-
-import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
-
-public class DefaultStringFieldItem extends BaseDefaultFieldItem<String> {
-
-    public DefaultStringFieldItem(String... values) {
-        super(values);
-    }
-
-    @Override
-    public Object getObject(int index) {
-        return getValue(index);
-    }
-
-    @Override
-    public boolean isValidByte(int index) {
-        return getValue(index) != null; 
-    }
-   
-    @Override
-    public boolean isValidString(int index) {
-        return getValue(index) != null;
-    }
-
-    @Override
-    public Byte getByte(int index) {
-        return (byte) ((String) getValue(index)).charAt(0);
-    }
-    
-    
-    @Override
-    public String getString(int index) {
-        if (!isValidString(index)) {
-            throw new PlcIncompatibleDatatypeException(String.class, index);
-        }
-        return getValue(index);
-    }
-
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.messages.items;
+
+import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
+
+public class DefaultStringFieldItem extends BaseDefaultFieldItem<String> {
+
+    public DefaultStringFieldItem(String... values) {
+        super(values);
+    }
+
+    @Override
+    public Object getObject(int index) {
+        return getValue(index);
+    }
+
+    @Override
+    public boolean isValidByte(int index) {
+        return getValue(index) != null; 
+    }
+   
+    @Override
+    public boolean isValidString(int index) {
+        return getValue(index) != null;
+    }
+
+    @Override
+    public Byte getByte(int index) {
+        return (byte) ((String) getValue(index)).charAt(0);
+    }
+    
+    
+    @Override
+    public String getString(int index) {
+        if (!isValidString(index)) {
+            throw new PlcIncompatibleDatatypeException(String.class, index);
+        }
+        return getValue(index);
+    }
+
+}
+
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/model/DefaultPlcConsumerRegistration.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/model/DefaultPlcConsumerRegistration.java
index dfcef848b02..759c2e26a81 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/model/DefaultPlcConsumerRegistration.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/model/DefaultPlcConsumerRegistration.java
@@ -1,85 +1,85 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.model;
-
-import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
-import org.apache.plc4x.java.base.messages.PlcSubscriber;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Objects;
-import java.util.function.Consumer;
-
-public class DefaultPlcConsumerRegistration implements InternalPlcConsumerRegistration {
-
-    private final PlcSubscriber plcSubscriber;
-
-    private final Collection<InternalPlcSubscriptionHandle> handles;
-
-    private final int consumerHash;
-
-    public DefaultPlcConsumerRegistration(PlcSubscriber plcSubscriber, Consumer<PlcSubscriptionEvent> consumer, InternalPlcSubscriptionHandle... handles) {
-        this.plcSubscriber = plcSubscriber;
-        this.handles = Arrays.asList(Objects.requireNonNull(handles));
-        this.consumerHash = Objects.requireNonNull(consumer).hashCode();
-    }
-
-    @Override
-    public int getConsumerHash() {
-        return consumerHash;
-    }
-
-    @Override
-    public Collection<InternalPlcSubscriptionHandle> getAssociatedHandles() {
-        return handles;
-    }
-
-    @Override
-    public void unregister() {
-        plcSubscriber.unregister(this);
-    }
-
-    @Override
-    public final boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof DefaultPlcConsumerRegistration)) {
-            return false;
-        }
-        DefaultPlcConsumerRegistration that = (DefaultPlcConsumerRegistration) o;
-        return Objects.equals(plcSubscriber, that.plcSubscriber) &&
-            Objects.equals(handles, that.handles) &&
-            consumerHash == that.consumerHash;
-    }
-
-    @Override
-    public final int hashCode() {
-        return Objects.hash(plcSubscriber, handles, consumerHash);
-    }
-
-    @Override
-    public String toString() {
-        return "DefaultPlcConsumerRegistration{" +
-            "handles=" + handles +
-            ", consumerHash=" + consumerHash +
-            '}';
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.model;
+
+import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
+import org.apache.plc4x.java.base.messages.PlcSubscriber;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Objects;
+import java.util.function.Consumer;
+
+public class DefaultPlcConsumerRegistration implements InternalPlcConsumerRegistration {
+
+    private final PlcSubscriber plcSubscriber;
+
+    private final Collection<InternalPlcSubscriptionHandle> handles;
+
+    private final int consumerHash;
+
+    public DefaultPlcConsumerRegistration(PlcSubscriber plcSubscriber, Consumer<PlcSubscriptionEvent> consumer, InternalPlcSubscriptionHandle... handles) {
+        this.plcSubscriber = plcSubscriber;
+        this.handles = Arrays.asList(Objects.requireNonNull(handles));
+        this.consumerHash = Objects.requireNonNull(consumer).hashCode();
+    }
+
+    @Override
+    public int getConsumerHash() {
+        return consumerHash;
+    }
+
+    @Override
+    public Collection<InternalPlcSubscriptionHandle> getAssociatedHandles() {
+        return handles;
+    }
+
+    @Override
+    public void unregister() {
+        plcSubscriber.unregister(this);
+    }
+
+    @Override
+    public final boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof DefaultPlcConsumerRegistration)) {
+            return false;
+        }
+        DefaultPlcConsumerRegistration that = (DefaultPlcConsumerRegistration) o;
+        return Objects.equals(plcSubscriber, that.plcSubscriber) &&
+            Objects.equals(handles, that.handles) &&
+            consumerHash == that.consumerHash;
+    }
+
+    @Override
+    public final int hashCode() {
+        return Objects.hash(plcSubscriber, handles, consumerHash);
+    }
+
+    @Override
+    public String toString() {
+        return "DefaultPlcConsumerRegistration{" +
+            "handles=" + handles +
+            ", consumerHash=" + consumerHash +
+            '}';
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/model/DefaultPlcSubscriptionHandle.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/model/DefaultPlcSubscriptionHandle.java
index 0d7d01f9b93..e739ffd030d 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/model/DefaultPlcSubscriptionHandle.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/model/DefaultPlcSubscriptionHandle.java
@@ -1,62 +1,62 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.base.model;
-
-import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
-import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
-import org.apache.plc4x.java.base.messages.PlcSubscriber;
-
-import java.util.Collections;
-import java.util.function.Consumer;
-
-// Warning: do not override equals and hashCode as these should not include the plcSubscriber.
-public class DefaultPlcSubscriptionHandle implements InternalPlcSubscriptionHandle {
-
-    private final PlcSubscriber plcSubscriber;
-
-    public DefaultPlcSubscriptionHandle(PlcSubscriber plcSubscriber) {
-        this.plcSubscriber = plcSubscriber;
-    }
-
-    @Override
-    public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer) {
-        return plcSubscriber.register(consumer, Collections.singletonList(this));
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        // A handle is unique therefore we use the default implementation from Object
-        return (this == obj);
-    }
-
-    @Override
-    public int hashCode() {
-        // A handle is unique therefore we use the default implementation from Object
-        return System.identityHashCode(this);
-    }
-
-    @Override
-    public String toString() {
-        return "DefaultPlcSubscriptionHandle{" +
-            "plcSubscriber=" + plcSubscriber +
-            '}';
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.base.model;
+
+import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
+import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
+import org.apache.plc4x.java.base.messages.PlcSubscriber;
+
+import java.util.Collections;
+import java.util.function.Consumer;
+
+// Warning: do not override equals and hashCode as these should not include the plcSubscriber.
+public class DefaultPlcSubscriptionHandle implements InternalPlcSubscriptionHandle {
+
+    private final PlcSubscriber plcSubscriber;
+
+    public DefaultPlcSubscriptionHandle(PlcSubscriber plcSubscriber) {
+        this.plcSubscriber = plcSubscriber;
+    }
+
+    @Override
+    public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer) {
+        return plcSubscriber.register(consumer, Collections.singletonList(this));
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        // A handle is unique therefore we use the default implementation from Object
+        return (this == obj);
+    }
+
+    @Override
+    public int hashCode() {
+        // A handle is unique therefore we use the default implementation from Object
+        return System.identityHashCode(this);
+    }
+
+    @Override
+    public String toString() {
+        return "DefaultPlcSubscriptionHandle{" +
+            "plcSubscriber=" + plcSubscriber +
+            '}';
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/model/InternalPlcConsumerRegistration.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/model/InternalPlcConsumerRegistration.java
index 01331113a71..7b6a287b0d4 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/model/InternalPlcConsumerRegistration.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/model/InternalPlcConsumerRegistration.java
@@ -1,32 +1,32 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.model;
-
-import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
-import org.apache.plc4x.java.base.messages.InternalPlcMessage;
-
-import java.util.Collection;
-
-public interface InternalPlcConsumerRegistration extends PlcConsumerRegistration, InternalPlcMessage {
-
-    int getConsumerHash();
-
-    Collection<? extends InternalPlcSubscriptionHandle> getAssociatedHandles();
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.model;
+
+import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
+import org.apache.plc4x.java.base.messages.InternalPlcMessage;
+
+import java.util.Collection;
+
+public interface InternalPlcConsumerRegistration extends PlcConsumerRegistration, InternalPlcMessage {
+
+    int getConsumerHash();
+
+    Collection<? extends InternalPlcSubscriptionHandle> getAssociatedHandles();
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/model/InternalPlcSubscriptionHandle.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/model/InternalPlcSubscriptionHandle.java
index e8fbc372f71..030616f2799 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/model/InternalPlcSubscriptionHandle.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/model/InternalPlcSubscriptionHandle.java
@@ -1,25 +1,25 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.model;
-
-import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
-import org.apache.plc4x.java.base.messages.InternalPlcMessage;
-
-public interface InternalPlcSubscriptionHandle extends PlcSubscriptionHandle, InternalPlcMessage {
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.model;
+
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+import org.apache.plc4x.java.base.messages.InternalPlcMessage;
+
+public interface InternalPlcSubscriptionHandle extends PlcSubscriptionHandle, InternalPlcMessage {
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/model/SubscriptionPlcField.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/model/SubscriptionPlcField.java
index e68e4c85768..ace2786641a 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/model/SubscriptionPlcField.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/model/SubscriptionPlcField.java
@@ -1,55 +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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.model;
-
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.types.PlcSubscriptionType;
-
-import java.time.Duration;
-import java.util.Optional;
-
-/**
- * special {@link PlcField} which adds a {@link PlcSubscriptionType}.
- */
-public class SubscriptionPlcField {
-
-    private final PlcSubscriptionType plcSubscriptionType;
-
-    private final PlcField plcField;
-
-    private final Duration duration;
-
-    public SubscriptionPlcField(PlcSubscriptionType plcSubscriptionType, PlcField plcField, Duration duration) {
-        this.plcSubscriptionType = plcSubscriptionType;
-        this.plcField = plcField;
-        this.duration = duration;
-    }
-
-    public PlcSubscriptionType getPlcSubscriptionType() {
-        return plcSubscriptionType;
-    }
-
-    public PlcField getPlcField() {
-        return plcField;
-    }
-
-    public Optional<Duration> getDuration() {
-        return Optional.ofNullable(duration);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.model;
+
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcSubscriptionType;
+
+import java.time.Duration;
+import java.util.Optional;
+
+/**
+ * special {@link PlcField} which adds a {@link PlcSubscriptionType}.
+ */
+public class SubscriptionPlcField {
+
+    private final PlcSubscriptionType plcSubscriptionType;
+
+    private final PlcField plcField;
+
+    private final Duration duration;
+
+    public SubscriptionPlcField(PlcSubscriptionType plcSubscriptionType, PlcField plcField, Duration duration) {
+        this.plcSubscriptionType = plcSubscriptionType;
+        this.plcField = plcField;
+        this.duration = duration;
+    }
+
+    public PlcSubscriptionType getPlcSubscriptionType() {
+        return plcSubscriptionType;
+    }
+
+    public PlcField getPlcField() {
+        return plcField;
+    }
+
+    public Optional<Duration> getDuration() {
+        return Optional.ofNullable(duration);
+    }
+}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java
index 99c4781e0b0..45643f37ff9 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java
@@ -1,646 +1,646 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.protocol;
-
-import io.netty.channel.*;
-import io.netty.util.Timeout;
-import io.netty.util.Timer;
-import io.netty.util.concurrent.Future;
-import io.netty.util.concurrent.PromiseCombiner;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.stream.Collectors;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.commons.lang3.tuple.Triple;
-import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
-import org.apache.plc4x.java.api.exceptions.PlcTimeoutException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.messages.*;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
-import org.apache.plc4x.java.base.model.SubscriptionPlcField;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * This layer can be used to split a {@link org.apache.plc4x.java.api.messages.PlcRequest} which addresses multiple {@link PlcField}s into multiple subsequent {@link org.apache.plc4x.java.api.messages.PlcRequest}s.
- */
-// TODO: add split config so we can override special requests that are allready splitted downstream
-public class SingleItemToSingleRequestProtocol extends ChannelDuplexHandler {
-
-    public static final Logger LOGGER = LoggerFactory.getLogger(SingleItemToSingleRequestProtocol.class);
-
-    private final Timer timer;
-
-    private final PlcReader reader;
-
-    private final PlcWriter writer;
-
-    private final PlcSubscriber subscriber;
-
-    // TODO: maybe better get from map
-    private long defaultReceiveTimeout;
-
-    private PendingWriteQueue queue;
-
-    private ConcurrentMap<PlcRequestContainer<InternalPlcRequest, InternalPlcResponse>, Timeout> scheduledTimeouts;
-
-    // Map to track send subcontainers
-    private ConcurrentMap<Integer, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse>> sentButUnacknowledgedSubContainer;
-
-    // Map to map tdpu to original parent container
-    // TODO: currently this could be supplied via param, only reason to keep would be for statistics.
-    private ConcurrentMap<Integer, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse>> correlationToParentContainer;
-
-    // Map to track tdpus per container
-    // TODO: currently this could be supplied via param, only reason to keep would be for statistics.
-    private ConcurrentMap<PlcRequestContainer<?, ?>, Set<Integer>> containerCorrelationIdMap;
-
-    // Map to track a list of responses per parent container
-    private ConcurrentMap<PlcRequestContainer<?, ?>, Queue<InternalPlcResponse>> responsesToBeDelivered;
-
-    private AtomicInteger correlationIdGenerator;
-
-    // TODO: maybe put in map per day or per hour
-    private AtomicLong deliveredContainers;
-
-    private AtomicLong erroredContainers;
-
-    private AtomicLong deliveredItems;
-
-    private AtomicLong erroredItems;
-
-    private SplitConfig splitConfig;
-
-    public SingleItemToSingleRequestProtocol(PlcReader reader, PlcWriter writer, PlcSubscriber subscriber, Timer timer) {
-        this(reader, writer, subscriber, timer, new SplitConfig());
-    }
-
-    public SingleItemToSingleRequestProtocol(PlcReader reader, PlcWriter writer, PlcSubscriber subscriber, Timer timer, SplitConfig splitConfig) {
-        this(reader, writer, subscriber, timer, splitConfig, true);
-    }
-
-    public SingleItemToSingleRequestProtocol(PlcReader reader, PlcWriter writer, PlcSubscriber subscriber, Timer timer, SplitConfig splitConfig, boolean betterImplementationPossible) {
-        this(reader, writer, subscriber, timer, TimeUnit.SECONDS.toMillis(30), splitConfig, betterImplementationPossible);
-    }
-
-    public SingleItemToSingleRequestProtocol(PlcReader reader, PlcWriter writer, PlcSubscriber subscriber, Timer timer, long defaultReceiveTimeout, SplitConfig splitConfig, boolean betterImplementationPossible) {
-        this.reader = reader;
-        this.writer = writer;
-        this.subscriber = subscriber;
-        this.timer = timer;
-        this.defaultReceiveTimeout = defaultReceiveTimeout;
-        this.splitConfig = splitConfig;
-        if (this.splitConfig == null) {
-            this.splitConfig = new SplitConfig();
-        }
-        if (betterImplementationPossible) {
-            String callStack = Arrays.stream(Thread.currentThread().getStackTrace())
-                .map(StackTraceElement::toString)
-                .collect(Collectors.joining("\n"));
-            LOGGER.warn("Unoptimized Usage of {} detected at:\n{}", this.getClass(), callStack);
-            LOGGER.info("Consider implementing item splitting native to the protocol.");
-        }
-    }
-
-    @Override
-    public void channelRegistered(ChannelHandlerContext ctx) throws Exception {
-        this.queue = new PendingWriteQueue(ctx);
-        this.scheduledTimeouts = new ConcurrentHashMap<>();
-        this.sentButUnacknowledgedSubContainer = new ConcurrentHashMap<>();
-        this.correlationToParentContainer = new ConcurrentHashMap<>();
-        this.containerCorrelationIdMap = new ConcurrentHashMap<>();
-        this.responsesToBeDelivered = new ConcurrentHashMap<>();
-        this.correlationIdGenerator = new AtomicInteger();
-        this.deliveredItems = new AtomicLong();
-        this.erroredItems = new AtomicLong();
-        this.deliveredContainers = new AtomicLong();
-        this.erroredContainers = new AtomicLong();
-        super.channelRegistered(ctx);
-    }
-
-    @Override
-    public void channelUnregistered(ChannelHandlerContext ctx) throws Exception {
-        this.queue.removeAndWriteAll();
-        this.scheduledTimeouts.clear();
-        this.sentButUnacknowledgedSubContainer.clear();
-        this.correlationToParentContainer.clear();
-        this.containerCorrelationIdMap.clear();
-        this.responsesToBeDelivered.clear();
-        this.correlationIdGenerator.set(0);
-        this.deliveredItems.set(0);
-        this.erroredItems.set(0);
-        this.deliveredContainers.set(0);
-        this.erroredContainers.set(0);
-        super.channelUnregistered(ctx);
-    }
-
-    @Override
-    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-        // Send everything so we get a proper failure for those pending writes
-        this.queue.removeAndWriteAll();
-        //this.timer.stop();
-        this.scheduledTimeouts.clear();
-        this.sentButUnacknowledgedSubContainer.clear();
-        this.correlationToParentContainer.clear();
-        this.containerCorrelationIdMap.clear();
-        this.responsesToBeDelivered.clear();
-        this.correlationIdGenerator.set(0);
-        this.deliveredItems.set(0);
-        this.erroredItems.set(0);
-        this.deliveredContainers.set(0);
-        this.erroredContainers.set(0);
-        super.channelInactive(ctx);
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Decoding
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    protected void tryFinish(Integer currentTdpu, InternalPlcResponse msg, CompletableFuture<InternalPlcResponse> originalResponseFuture) {
-        deliveredItems.incrementAndGet();
-        PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> subPlcRequestContainer = sentButUnacknowledgedSubContainer.remove(currentTdpu);
-        LOGGER.debug("{} got acknowledged", subPlcRequestContainer);
-        PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> originalPlcRequestContainer = correlationToParentContainer.remove(currentTdpu);
-        if (originalPlcRequestContainer == null) {
-            LOGGER.warn("Unrelated package received {}", msg);
-            return;
-        }
-        Queue<InternalPlcResponse> correlatedResponseItems = responsesToBeDelivered.computeIfAbsent(originalPlcRequestContainer, ignore -> new ConcurrentLinkedQueue<>());
-        correlatedResponseItems.add(msg);
-        Set<Integer> integers = containerCorrelationIdMap.get(originalPlcRequestContainer);
-        integers.remove(currentTdpu);
-        if (integers.isEmpty()) {
-            deliveredContainers.incrementAndGet();
-            Timeout timeout = scheduledTimeouts.remove(originalPlcRequestContainer);
-            if (timeout != null) {
-                timeout.cancel();
-            }
-
-            InternalPlcResponse plcResponse;
-            if (originalPlcRequestContainer.getRequest() instanceof InternalPlcReadRequest) {
-                InternalPlcReadRequest internalPlcReadRequest = (InternalPlcReadRequest) originalPlcRequestContainer.getRequest();
-                HashMap<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> fields = new HashMap<>();
-
-                correlatedResponseItems.stream()
-                    .map(InternalPlcReadResponse.class::cast)
-                    .map(InternalPlcReadResponse::getValues)
-                    .forEach(stringPairMap -> stringPairMap.forEach(fields::put));
-
-                plcResponse = new DefaultPlcReadResponse(internalPlcReadRequest, fields);
-            } else if (originalPlcRequestContainer.getRequest() instanceof InternalPlcWriteRequest) {
-                InternalPlcWriteRequest internalPlcWriteRequest = (InternalPlcWriteRequest) originalPlcRequestContainer.getRequest();
-                HashMap<String, PlcResponseCode> values = new HashMap<>();
-
-                correlatedResponseItems.stream()
-                    .map(InternalPlcWriteResponse.class::cast)
-                    .map(InternalPlcWriteResponse::getValues)
-                    .forEach(stringPairMap -> stringPairMap.forEach(values::put));
-
-                plcResponse = new DefaultPlcWriteResponse(internalPlcWriteRequest, values);
-            } else if (originalPlcRequestContainer.getRequest() instanceof InternalPlcSubscriptionRequest) {
-                InternalPlcSubscriptionRequest internalPlcSubscriptionRequest = (InternalPlcSubscriptionRequest) originalPlcRequestContainer.getRequest();
-                HashMap<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> fields = new HashMap<>();
-
-                correlatedResponseItems.stream()
-                    .map(InternalPlcSubscriptionResponse.class::cast)
-                    .map(InternalPlcSubscriptionResponse::getValues)
-                    .forEach(stringPairMap -> stringPairMap.forEach(fields::put));
-
-                plcResponse = new DefaultPlcSubscriptionResponse(internalPlcSubscriptionRequest, fields);
-            } else if (originalPlcRequestContainer.getRequest() instanceof InternalPlcUnsubscriptionRequest) {
-                InternalPlcUnsubscriptionRequest internalPlcUnsubscriptionRequest = (InternalPlcUnsubscriptionRequest) originalPlcRequestContainer.getRequest();
-                plcResponse = new DefaultPlcUnsubscriptionResponse(internalPlcUnsubscriptionRequest);
-            } else {
-                errored(currentTdpu, new PlcProtocolException("Unknown type detected " + originalPlcRequestContainer.getRequest().getClass()), originalResponseFuture);
-                return;
-            }
-            responsesToBeDelivered.remove(originalPlcRequestContainer);
-            containerCorrelationIdMap.remove(originalPlcRequestContainer);
-            originalResponseFuture.complete(plcResponse);
-        }
-    }
-
-    protected void errored(Integer currentTdpu, Throwable throwable, CompletableFuture<InternalPlcResponse> originalResponseFuture) {
-        erroredItems.incrementAndGet();
-        PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> subPlcRequestContainer = sentButUnacknowledgedSubContainer.remove(currentTdpu);
-        LOGGER.info("{} got errored", subPlcRequestContainer);
-
-
-        PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> originalPlcRequestContainer = correlationToParentContainer.remove(currentTdpu);
-        if (originalPlcRequestContainer == null) {
-            LOGGER.warn("Unrelated error received tdpu:{}", currentTdpu, throwable);
-        } else {
-            erroredContainers.incrementAndGet();
-            Timeout timeout = scheduledTimeouts.remove(originalPlcRequestContainer);
-            if (timeout != null) {
-                timeout.cancel();
-            }
-            responsesToBeDelivered.remove(originalPlcRequestContainer);
-
-            Set<Integer> tdpus = containerCorrelationIdMap.remove(originalPlcRequestContainer);
-            if (tdpus != null) {
-                tdpus.forEach(tdpu -> {
-                    // TODO: technically the other items didn't error so do we increment?
-                    //erroredItems.incrementAndGet();
-                    sentButUnacknowledgedSubContainer.remove(tdpu);
-                    correlationToParentContainer.remove(tdpu);
-                });
-            }
-
-            LOGGER.warn("PlcRequestContainer {} and correlationId {} failed ", correlationToParentContainer, currentTdpu, throwable);
-            originalResponseFuture.completeExceptionally(throwable);
-        }
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Encoding
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    @Override
-    public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
-        if (msg instanceof PlcRequestContainer) {
-            @SuppressWarnings("unchecked")
-            PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> in = (PlcRequestContainer<InternalPlcRequest, InternalPlcResponse>) msg;
-            Set<Integer> tdpus = containerCorrelationIdMap.computeIfAbsent(in, plcRequestContainer -> ConcurrentHashMap.newKeySet());
-
-            Timeout timeout = timer.newTimeout(timeout_ -> handleTimeout(timeout_, in, tdpus, System.nanoTime()), defaultReceiveTimeout, TimeUnit.MILLISECONDS);
-            scheduledTimeouts.put(in, timeout);
-
-            // Create a promise that has to be called multiple times.
-            PromiseCombiner promiseCombiner = new PromiseCombiner();
-            InternalPlcRequest request = in.getRequest();
-            if (request instanceof InternalPlcFieldRequest && (splitConfig.splitRead || splitConfig.splitWrite || splitConfig.splitSubscription)) {
-                InternalPlcFieldRequest internalPlcFieldRequest = (InternalPlcFieldRequest) request;
-
-                if (internalPlcFieldRequest instanceof InternalPlcReadRequest && splitConfig.splitRead) {
-                    InternalPlcReadRequest internalPlcReadRequest = (InternalPlcReadRequest) internalPlcFieldRequest;
-                    internalPlcReadRequest.getNamedFields().forEach(field -> {
-                        ChannelPromise subPromise = new DefaultChannelPromise(promise.channel());
-
-                        Integer tdpu = correlationIdGenerator.getAndIncrement();
-                        CompletableFuture<InternalPlcResponse> correlatedCompletableFuture = new CompletableFuture<>();
-                        // Important: don't chain to above as we want the above to be completed not the result of when complete
-                        correlatedCompletableFuture
-                            .thenApply(InternalPlcResponse.class::cast)
-                            .whenComplete((internalPlcResponse, throwable) -> {
-                                if (throwable != null) {
-                                    errored(tdpu, throwable, in.getResponseFuture());
-                                } else {
-                                    tryFinish(tdpu, internalPlcResponse, in.getResponseFuture());
-                                }
-                            });
-                        PlcRequestContainer<CorrelatedPlcReadRequest, InternalPlcResponse> correlatedPlcRequestContainer = new PlcRequestContainer<>(CorrelatedPlcReadRequest.of(reader, field, tdpu), correlatedCompletableFuture);
-                        correlationToParentContainer.put(tdpu, in);
-                        queue.add(correlatedPlcRequestContainer, subPromise);
-                        if (!tdpus.add(tdpu)) {
-                            throw new IllegalStateException("AtomicInteger should not create duplicated ids: " + tdpu);
-                        }
-                        promiseCombiner.add((Future) subPromise);
-                    });
-                } else if (internalPlcFieldRequest instanceof InternalPlcWriteRequest && splitConfig.splitWrite) {
-                    InternalPlcWriteRequest internalPlcWriteRequest = (InternalPlcWriteRequest) internalPlcFieldRequest;
-                    internalPlcWriteRequest.getNamedFieldTriples().forEach(fieldItemTriple -> {
-                        ChannelPromise subPromise = new DefaultChannelPromise(promise.channel());
-
-                        Integer tdpu = correlationIdGenerator.getAndIncrement();
-                        CompletableFuture<InternalPlcResponse> correlatedCompletableFuture = new CompletableFuture<>();
-                        // Important: don't chain to above as we want the above to be completed not the result of when complete
-                        correlatedCompletableFuture
-                            .thenApply(InternalPlcResponse.class::cast)
-                            .whenComplete((internalPlcResponse, throwable) -> {
-                                if (throwable != null) {
-                                    errored(tdpu, throwable, in.getResponseFuture());
-                                } else {
-                                    tryFinish(tdpu, internalPlcResponse, in.getResponseFuture());
-                                }
-                            });
-                        PlcRequestContainer<CorrelatedPlcWriteRequest, InternalPlcResponse> correlatedPlcRequestContainer = new PlcRequestContainer<>(CorrelatedPlcWriteRequest.of(writer, fieldItemTriple, tdpu), correlatedCompletableFuture);
-                        correlationToParentContainer.put(tdpu, in);
-                        queue.add(correlatedPlcRequestContainer, subPromise);
-                        if (!tdpus.add(tdpu)) {
-                            throw new IllegalStateException("AtomicInteger should not create duplicated ids: " + tdpu);
-                        }
-                        promiseCombiner.add((Future) subPromise);
-                    });
-                } else if (internalPlcFieldRequest instanceof InternalPlcSubscriptionRequest && splitConfig.splitSubscription) {
-                    InternalPlcSubscriptionRequest internalPlcSubscriptionRequest = (InternalPlcSubscriptionRequest) internalPlcFieldRequest;
-                    internalPlcSubscriptionRequest.getNamedSubscriptionFields().forEach(field -> {
-                        ChannelPromise subPromise = new DefaultChannelPromise(promise.channel());
-
-                        Integer tdpu = correlationIdGenerator.getAndIncrement();
-                        CompletableFuture<InternalPlcResponse> correlatedCompletableFuture = new CompletableFuture<>();
-                        // Important: don't chain to above as we want the above to be completed not the result of when complete
-                        correlatedCompletableFuture
-                            .thenApply(InternalPlcResponse.class::cast)
-                            .whenComplete((internalPlcResponse, throwable) -> {
-                                if (throwable != null) {
-                                    errored(tdpu, throwable, in.getResponseFuture());
-                                } else {
-                                    tryFinish(tdpu, internalPlcResponse, in.getResponseFuture());
-                                }
-                            });
-                        PlcRequestContainer<CorrelatedPlcSubscriptionRequest, InternalPlcResponse> correlatedPlcRequestContainer = new PlcRequestContainer<>(CorrelatedPlcSubscriptionRequest.of(subscriber, field, tdpu), correlatedCompletableFuture);
-                        correlationToParentContainer.put(tdpu, in);
-                        queue.add(correlatedPlcRequestContainer, subPromise);
-                        if (!tdpus.add(tdpu)) {
-                            throw new IllegalStateException("AtomicInteger should not create duplicated ids: " + tdpu);
-                        }
-                        promiseCombiner.add((Future) subPromise);
-                    });
-                } else {
-                    throw new PlcProtocolException("Unmapped request type " + request.getClass());
-                }
-            } else if (request instanceof InternalPlcUnsubscriptionRequest && splitConfig.splitUnsubscription) {
-                InternalPlcUnsubscriptionRequest internalPlcUnsubscriptionRequest = (InternalPlcUnsubscriptionRequest) request;
-                internalPlcUnsubscriptionRequest.getInternalPlcSubscriptionHandles().forEach(handle -> {
-                    ChannelPromise subPromise = new DefaultChannelPromise(promise.channel());
-
-                    Integer tdpu = correlationIdGenerator.getAndIncrement();
-                    CompletableFuture<InternalPlcResponse> correlatedCompletableFuture = new CompletableFuture<>();
-                    // Important: don't chain to above as we want the above to be completed not the result of when complete
-                    correlatedCompletableFuture
-                        .thenApply(InternalPlcResponse.class::cast)
-                        .whenComplete((internalPlcResponse, throwable) -> {
-                            if (throwable != null) {
-                                errored(tdpu, throwable, in.getResponseFuture());
-                            } else {
-                                tryFinish(tdpu, internalPlcResponse, in.getResponseFuture());
-                            }
-                        });
-                    PlcRequestContainer<CorrelatedPlcUnsubscriptionRequest, InternalPlcResponse> correlatedPlcRequestContainer = new PlcRequestContainer<>(CorrelatedPlcUnsubscriptionRequest.of(subscriber, handle, tdpu), correlatedCompletableFuture);
-                    correlationToParentContainer.put(tdpu, in);
-                    queue.add(correlatedPlcRequestContainer, subPromise);
-                    if (!tdpus.add(tdpu)) {
-                        throw new IllegalStateException("AtomicInteger should not create duplicated ids: " + tdpu);
-                    }
-                    promiseCombiner.add((Future) subPromise);
-                });
-            } else {
-                ChannelPromise subPromise = new DefaultChannelPromise(promise.channel());
-                queue.add(msg, subPromise);
-                promiseCombiner.add((Future) subPromise);
-            }
-
-            promiseCombiner.finish(promise);
-
-            // Start sending the queue content.
-            trySendingMessages(ctx);
-        } else {
-            super.write(ctx, msg, promise);
-        }
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Helpers
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    @SuppressWarnings("unchecked")
-    protected synchronized void trySendingMessages(ChannelHandlerContext ctx) {
-        while (queue.size() > 0) {
-            // Get the RequestItem that is up next in the queue.
-            PlcRequestContainer currentItem = (PlcRequestContainer) queue.current();
-            InternalPlcRequest request = currentItem.getRequest();
-
-            // Send the TPDU.
-            try {
-                ChannelFuture channelFuture = queue.removeAndWrite();
-                ctx.flush();
-                if (channelFuture == null) {
-                    break;
-                }
-            } catch (Exception e) {
-                LOGGER.error("Error sending more queues messages", e);
-                ctx.fireExceptionCaught(e);
-            }
-
-            if (request instanceof CorrelatedPlcRequest) {
-                CorrelatedPlcRequest correlatedPlcRequest = (CorrelatedPlcRequest) request;
-
-                // Add it to the list of sentButUnacknowledgedSubContainer.
-                sentButUnacknowledgedSubContainer.put(correlatedPlcRequest.getTdpu(), currentItem);
-
-                LOGGER.debug("container with id {}Ā sent: ", correlatedPlcRequest.getTdpu(), currentItem);
-            }
-        }
-        ctx.flush();
-    }
-
-    private void handleTimeout(Timeout timeout, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> in, Set<Integer> tdpus, long scheduledAt) {
-        if (timeout.isCancelled()) {
-            LOGGER.debug("container {} with timeout {} got canceled", in, timeout);
-            return;
-        }
-        LOGGER.warn("container {} timed out:{}", in, timeout);
-        erroredContainers.incrementAndGet();
-        responsesToBeDelivered.remove(in);
-        containerCorrelationIdMap.remove(in);
-        tdpus.forEach(tdpu -> {
-            erroredItems.incrementAndGet();
-            sentButUnacknowledgedSubContainer.remove(tdpu);
-            correlationToParentContainer.remove(tdpu);
-        });
-        in.getResponseFuture().completeExceptionally(new PlcTimeoutException(System.nanoTime() - scheduledAt));
-    }
-
-    protected interface CorrelatedPlcRequest extends InternalPlcRequest {
-
-        int getTdpu();
-    }
-
-    protected static class CorrelatedPlcReadRequest extends DefaultPlcReadRequest implements CorrelatedPlcRequest {
-
-        protected final int tdpu;
-
-        protected CorrelatedPlcReadRequest(PlcReader reader, LinkedHashMap<String, PlcField> fields, int tdpu) {
-            super(reader, fields);
-            this.tdpu = tdpu;
-        }
-
-        protected static CorrelatedPlcReadRequest of(PlcReader reader, Pair<String, PlcField> stringPlcFieldPair, int tdpu) {
-            LinkedHashMap<String, PlcField> fields = new LinkedHashMap<>();
-            fields.put(stringPlcFieldPair.getKey(), stringPlcFieldPair.getValue());
-            return new CorrelatedPlcReadRequest(reader, fields, tdpu);
-        }
-
-        @Override
-        public int getTdpu() {
-            return tdpu;
-        }
-    }
-
-    protected static class CorrelatedPlcWriteRequest extends DefaultPlcWriteRequest implements CorrelatedPlcRequest {
-
-        private final int tdpu;
-
-        public CorrelatedPlcWriteRequest(PlcWriter writer, LinkedHashMap<String, Pair<PlcField, BaseDefaultFieldItem>> fields, int tdpu) {
-            super(writer, fields);
-            this.tdpu = tdpu;
-        }
-
-        public static CorrelatedPlcWriteRequest of(PlcWriter writer, Triple<String, PlcField, BaseDefaultFieldItem> fieldItemTriple, int tdpu) {
-            LinkedHashMap<String, Pair<PlcField, BaseDefaultFieldItem>> fields = new LinkedHashMap<>();
-            fields.put(fieldItemTriple.getLeft(), Pair.of(fieldItemTriple.getMiddle(), fieldItemTriple.getRight()));
-            return new CorrelatedPlcWriteRequest(writer, fields, tdpu);
-        }
-
-        @Override
-        public int getTdpu() {
-            return tdpu;
-        }
-    }
-
-    protected static class CorrelatedPlcSubscriptionRequest extends DefaultPlcSubscriptionRequest implements CorrelatedPlcRequest {
-
-        protected final int tdpu;
-
-        protected CorrelatedPlcSubscriptionRequest(PlcSubscriber subscriber, LinkedHashMap<String, SubscriptionPlcField> fields, int tdpu) {
-            super(subscriber, fields);
-            this.tdpu = tdpu;
-        }
-
-        protected static CorrelatedPlcSubscriptionRequest of(PlcSubscriber subscriber, Pair<String, SubscriptionPlcField> stringPlcFieldPair, int tdpu) {
-            LinkedHashMap<String, SubscriptionPlcField> fields = new LinkedHashMap<>();
-            fields.put(stringPlcFieldPair.getKey(), stringPlcFieldPair.getValue());
-            return new CorrelatedPlcSubscriptionRequest(subscriber, fields, tdpu);
-        }
-
-        @Override
-        public int getTdpu() {
-            return tdpu;
-        }
-    }
-
-    protected static class CorrelatedPlcUnsubscriptionRequest extends DefaultPlcUnsubscriptionRequest implements CorrelatedPlcRequest {
-
-        protected final int tdpu;
-
-        protected CorrelatedPlcUnsubscriptionRequest(PlcSubscriber subscriber, LinkedList<InternalPlcSubscriptionHandle> subscriptionHandles, int tdpu) {
-            super(subscriber, subscriptionHandles);
-            this.tdpu = tdpu;
-        }
-
-        protected static CorrelatedPlcUnsubscriptionRequest of(PlcSubscriber subscriber, InternalPlcSubscriptionHandle subscriptionHandle, int tdpu) {
-            LinkedList<InternalPlcSubscriptionHandle> list = new LinkedList<>();
-            list.add(subscriptionHandle);
-            return new CorrelatedPlcUnsubscriptionRequest(subscriber, list, tdpu);
-        }
-
-        @Override
-        public int getTdpu() {
-            return tdpu;
-        }
-    }
-
-    // TODO: maybe export to jmx
-    public Map<String, Number> getStatistics() {
-        HashMap<String, Number> statistics = new HashMap<>();
-        statistics.put("queue", queue.size());
-        statistics.put("sentButUnacknowledgedSubContainer", sentButUnacknowledgedSubContainer.size());
-        statistics.put("correlationToParentContainer", correlationToParentContainer.size());
-        statistics.put("containerCorrelationIdMap", containerCorrelationIdMap.size());
-        statistics.put("responsesToBeDelivered", responsesToBeDelivered.size());
-        statistics.put("correlationIdGenerator", correlationIdGenerator.get());
-        statistics.put("deliveredItems", deliveredItems.get());
-        statistics.put("erroredItems", erroredItems.get());
-        statistics.put("deliveredContainers", deliveredContainers.get());
-        statistics.put("erroredContainers", erroredContainers.get());
-        return statistics;
-    }
-
-    public static class SplitConfig {
-        private final boolean splitRead;
-        private final boolean splitWrite;
-        private final boolean splitSubscription;
-        private final boolean splitUnsubscription;
-
-        public SplitConfig() {
-            splitRead = true;
-            splitWrite = true;
-            splitSubscription = true;
-            splitUnsubscription = true;
-        }
-
-        private SplitConfig(boolean splitRead, boolean splitWrite, boolean splitSubscription, boolean splitUnsubscription) {
-            this.splitRead = splitRead;
-            this.splitWrite = splitWrite;
-            this.splitSubscription = splitSubscription;
-            this.splitUnsubscription = splitUnsubscription;
-        }
-
-        public static SplitConfigBuilder builder() {
-            return new SplitConfigBuilder();
-        }
-
-        public static class SplitConfigBuilder {
-            private boolean splitRead = true;
-            private boolean splitWrite = true;
-            private boolean splitSubscription = true;
-            private boolean splitUnsubscription = true;
-
-            public SplitConfigBuilder splitRead() {
-                splitRead = true;
-                return this;
-            }
-
-            public SplitConfigBuilder dontSplitRead() {
-                splitRead = false;
-                return this;
-            }
-
-            public SplitConfigBuilder splitWrite() {
-                splitWrite = true;
-                return this;
-            }
-
-            public SplitConfigBuilder dontSplitWrite() {
-                splitWrite = false;
-                return this;
-            }
-
-            public SplitConfigBuilder splitSubscribe() {
-                splitSubscription = true;
-                return this;
-            }
-
-            public SplitConfigBuilder dontSplitSubscribe() {
-                splitSubscription = false;
-                return this;
-            }
-
-            public SplitConfigBuilder splitUnsubscribe() {
-                splitUnsubscription = true;
-                return this;
-            }
-
-            public SplitConfigBuilder dontSplitUnsubscribe() {
-                splitUnsubscription = false;
-                return this;
-            }
-
-            public SplitConfig build() {
-                return new SplitConfig(splitRead, splitWrite, splitSubscription, splitUnsubscription);
-            }
-        }
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.protocol;
+
+import io.netty.channel.*;
+import io.netty.util.Timeout;
+import io.netty.util.Timer;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.PromiseCombiner;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.commons.lang3.tuple.Triple;
+import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
+import org.apache.plc4x.java.api.exceptions.PlcTimeoutException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.messages.*;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
+import org.apache.plc4x.java.base.model.SubscriptionPlcField;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This layer can be used to split a {@link org.apache.plc4x.java.api.messages.PlcRequest} which addresses multiple {@link PlcField}s into multiple subsequent {@link org.apache.plc4x.java.api.messages.PlcRequest}s.
+ */
+// TODO: add split config so we can override special requests that are allready splitted downstream
+public class SingleItemToSingleRequestProtocol extends ChannelDuplexHandler {
+
+    public static final Logger LOGGER = LoggerFactory.getLogger(SingleItemToSingleRequestProtocol.class);
+
+    private final Timer timer;
+
+    private final PlcReader reader;
+
+    private final PlcWriter writer;
+
+    private final PlcSubscriber subscriber;
+
+    // TODO: maybe better get from map
+    private long defaultReceiveTimeout;
+
+    private PendingWriteQueue queue;
+
+    private ConcurrentMap<PlcRequestContainer<InternalPlcRequest, InternalPlcResponse>, Timeout> scheduledTimeouts;
+
+    // Map to track send subcontainers
+    private ConcurrentMap<Integer, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse>> sentButUnacknowledgedSubContainer;
+
+    // Map to map tdpu to original parent container
+    // TODO: currently this could be supplied via param, only reason to keep would be for statistics.
+    private ConcurrentMap<Integer, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse>> correlationToParentContainer;
+
+    // Map to track tdpus per container
+    // TODO: currently this could be supplied via param, only reason to keep would be for statistics.
+    private ConcurrentMap<PlcRequestContainer<?, ?>, Set<Integer>> containerCorrelationIdMap;
+
+    // Map to track a list of responses per parent container
+    private ConcurrentMap<PlcRequestContainer<?, ?>, Queue<InternalPlcResponse>> responsesToBeDelivered;
+
+    private AtomicInteger correlationIdGenerator;
+
+    // TODO: maybe put in map per day or per hour
+    private AtomicLong deliveredContainers;
+
+    private AtomicLong erroredContainers;
+
+    private AtomicLong deliveredItems;
+
+    private AtomicLong erroredItems;
+
+    private SplitConfig splitConfig;
+
+    public SingleItemToSingleRequestProtocol(PlcReader reader, PlcWriter writer, PlcSubscriber subscriber, Timer timer) {
+        this(reader, writer, subscriber, timer, new SplitConfig());
+    }
+
+    public SingleItemToSingleRequestProtocol(PlcReader reader, PlcWriter writer, PlcSubscriber subscriber, Timer timer, SplitConfig splitConfig) {
+        this(reader, writer, subscriber, timer, splitConfig, true);
+    }
+
+    public SingleItemToSingleRequestProtocol(PlcReader reader, PlcWriter writer, PlcSubscriber subscriber, Timer timer, SplitConfig splitConfig, boolean betterImplementationPossible) {
+        this(reader, writer, subscriber, timer, TimeUnit.SECONDS.toMillis(30), splitConfig, betterImplementationPossible);
+    }
+
+    public SingleItemToSingleRequestProtocol(PlcReader reader, PlcWriter writer, PlcSubscriber subscriber, Timer timer, long defaultReceiveTimeout, SplitConfig splitConfig, boolean betterImplementationPossible) {
+        this.reader = reader;
+        this.writer = writer;
+        this.subscriber = subscriber;
+        this.timer = timer;
+        this.defaultReceiveTimeout = defaultReceiveTimeout;
+        this.splitConfig = splitConfig;
+        if (this.splitConfig == null) {
+            this.splitConfig = new SplitConfig();
+        }
+        if (betterImplementationPossible) {
+            String callStack = Arrays.stream(Thread.currentThread().getStackTrace())
+                .map(StackTraceElement::toString)
+                .collect(Collectors.joining("\n"));
+            LOGGER.warn("Unoptimized Usage of {} detected at:\n{}", this.getClass(), callStack);
+            LOGGER.info("Consider implementing item splitting native to the protocol.");
+        }
+    }
+
+    @Override
+    public void channelRegistered(ChannelHandlerContext ctx) throws Exception {
+        this.queue = new PendingWriteQueue(ctx);
+        this.scheduledTimeouts = new ConcurrentHashMap<>();
+        this.sentButUnacknowledgedSubContainer = new ConcurrentHashMap<>();
+        this.correlationToParentContainer = new ConcurrentHashMap<>();
+        this.containerCorrelationIdMap = new ConcurrentHashMap<>();
+        this.responsesToBeDelivered = new ConcurrentHashMap<>();
+        this.correlationIdGenerator = new AtomicInteger();
+        this.deliveredItems = new AtomicLong();
+        this.erroredItems = new AtomicLong();
+        this.deliveredContainers = new AtomicLong();
+        this.erroredContainers = new AtomicLong();
+        super.channelRegistered(ctx);
+    }
+
+    @Override
+    public void channelUnregistered(ChannelHandlerContext ctx) throws Exception {
+        this.queue.removeAndWriteAll();
+        this.scheduledTimeouts.clear();
+        this.sentButUnacknowledgedSubContainer.clear();
+        this.correlationToParentContainer.clear();
+        this.containerCorrelationIdMap.clear();
+        this.responsesToBeDelivered.clear();
+        this.correlationIdGenerator.set(0);
+        this.deliveredItems.set(0);
+        this.erroredItems.set(0);
+        this.deliveredContainers.set(0);
+        this.erroredContainers.set(0);
+        super.channelUnregistered(ctx);
+    }
+
+    @Override
+    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+        // Send everything so we get a proper failure for those pending writes
+        this.queue.removeAndWriteAll();
+        //this.timer.stop();
+        this.scheduledTimeouts.clear();
+        this.sentButUnacknowledgedSubContainer.clear();
+        this.correlationToParentContainer.clear();
+        this.containerCorrelationIdMap.clear();
+        this.responsesToBeDelivered.clear();
+        this.correlationIdGenerator.set(0);
+        this.deliveredItems.set(0);
+        this.erroredItems.set(0);
+        this.deliveredContainers.set(0);
+        this.erroredContainers.set(0);
+        super.channelInactive(ctx);
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Decoding
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    protected void tryFinish(Integer currentTdpu, InternalPlcResponse msg, CompletableFuture<InternalPlcResponse> originalResponseFuture) {
+        deliveredItems.incrementAndGet();
+        PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> subPlcRequestContainer = sentButUnacknowledgedSubContainer.remove(currentTdpu);
+        LOGGER.debug("{} got acknowledged", subPlcRequestContainer);
+        PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> originalPlcRequestContainer = correlationToParentContainer.remove(currentTdpu);
+        if (originalPlcRequestContainer == null) {
+            LOGGER.warn("Unrelated package received {}", msg);
+            return;
+        }
+        Queue<InternalPlcResponse> correlatedResponseItems = responsesToBeDelivered.computeIfAbsent(originalPlcRequestContainer, ignore -> new ConcurrentLinkedQueue<>());
+        correlatedResponseItems.add(msg);
+        Set<Integer> integers = containerCorrelationIdMap.get(originalPlcRequestContainer);
+        integers.remove(currentTdpu);
+        if (integers.isEmpty()) {
+            deliveredContainers.incrementAndGet();
+            Timeout timeout = scheduledTimeouts.remove(originalPlcRequestContainer);
+            if (timeout != null) {
+                timeout.cancel();
+            }
+
+            InternalPlcResponse plcResponse;
+            if (originalPlcRequestContainer.getRequest() instanceof InternalPlcReadRequest) {
+                InternalPlcReadRequest internalPlcReadRequest = (InternalPlcReadRequest) originalPlcRequestContainer.getRequest();
+                HashMap<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> fields = new HashMap<>();
+
+                correlatedResponseItems.stream()
+                    .map(InternalPlcReadResponse.class::cast)
+                    .map(InternalPlcReadResponse::getValues)
+                    .forEach(stringPairMap -> stringPairMap.forEach(fields::put));
+
+                plcResponse = new DefaultPlcReadResponse(internalPlcReadRequest, fields);
+            } else if (originalPlcRequestContainer.getRequest() instanceof InternalPlcWriteRequest) {
+                InternalPlcWriteRequest internalPlcWriteRequest = (InternalPlcWriteRequest) originalPlcRequestContainer.getRequest();
+                HashMap<String, PlcResponseCode> values = new HashMap<>();
+
+                correlatedResponseItems.stream()
+                    .map(InternalPlcWriteResponse.class::cast)
+                    .map(InternalPlcWriteResponse::getValues)
+                    .forEach(stringPairMap -> stringPairMap.forEach(values::put));
+
+                plcResponse = new DefaultPlcWriteResponse(internalPlcWriteRequest, values);
+            } else if (originalPlcRequestContainer.getRequest() instanceof InternalPlcSubscriptionRequest) {
+                InternalPlcSubscriptionRequest internalPlcSubscriptionRequest = (InternalPlcSubscriptionRequest) originalPlcRequestContainer.getRequest();
+                HashMap<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> fields = new HashMap<>();
+
+                correlatedResponseItems.stream()
+                    .map(InternalPlcSubscriptionResponse.class::cast)
+                    .map(InternalPlcSubscriptionResponse::getValues)
+                    .forEach(stringPairMap -> stringPairMap.forEach(fields::put));
+
+                plcResponse = new DefaultPlcSubscriptionResponse(internalPlcSubscriptionRequest, fields);
+            } else if (originalPlcRequestContainer.getRequest() instanceof InternalPlcUnsubscriptionRequest) {
+                InternalPlcUnsubscriptionRequest internalPlcUnsubscriptionRequest = (InternalPlcUnsubscriptionRequest) originalPlcRequestContainer.getRequest();
+                plcResponse = new DefaultPlcUnsubscriptionResponse(internalPlcUnsubscriptionRequest);
+            } else {
+                errored(currentTdpu, new PlcProtocolException("Unknown type detected " + originalPlcRequestContainer.getRequest().getClass()), originalResponseFuture);
+                return;
+            }
+            responsesToBeDelivered.remove(originalPlcRequestContainer);
+            containerCorrelationIdMap.remove(originalPlcRequestContainer);
+            originalResponseFuture.complete(plcResponse);
+        }
+    }
+
+    protected void errored(Integer currentTdpu, Throwable throwable, CompletableFuture<InternalPlcResponse> originalResponseFuture) {
+        erroredItems.incrementAndGet();
+        PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> subPlcRequestContainer = sentButUnacknowledgedSubContainer.remove(currentTdpu);
+        LOGGER.info("{} got errored", subPlcRequestContainer);
+
+
+        PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> originalPlcRequestContainer = correlationToParentContainer.remove(currentTdpu);
+        if (originalPlcRequestContainer == null) {
+            LOGGER.warn("Unrelated error received tdpu:{}", currentTdpu, throwable);
+        } else {
+            erroredContainers.incrementAndGet();
+            Timeout timeout = scheduledTimeouts.remove(originalPlcRequestContainer);
+            if (timeout != null) {
+                timeout.cancel();
+            }
+            responsesToBeDelivered.remove(originalPlcRequestContainer);
+
+            Set<Integer> tdpus = containerCorrelationIdMap.remove(originalPlcRequestContainer);
+            if (tdpus != null) {
+                tdpus.forEach(tdpu -> {
+                    // TODO: technically the other items didn't error so do we increment?
+                    //erroredItems.incrementAndGet();
+                    sentButUnacknowledgedSubContainer.remove(tdpu);
+                    correlationToParentContainer.remove(tdpu);
+                });
+            }
+
+            LOGGER.warn("PlcRequestContainer {} and correlationId {} failed ", correlationToParentContainer, currentTdpu, throwable);
+            originalResponseFuture.completeExceptionally(throwable);
+        }
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Encoding
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
+        if (msg instanceof PlcRequestContainer) {
+            @SuppressWarnings("unchecked")
+            PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> in = (PlcRequestContainer<InternalPlcRequest, InternalPlcResponse>) msg;
+            Set<Integer> tdpus = containerCorrelationIdMap.computeIfAbsent(in, plcRequestContainer -> ConcurrentHashMap.newKeySet());
+
+            Timeout timeout = timer.newTimeout(timeout_ -> handleTimeout(timeout_, in, tdpus, System.nanoTime()), defaultReceiveTimeout, TimeUnit.MILLISECONDS);
+            scheduledTimeouts.put(in, timeout);
+
+            // Create a promise that has to be called multiple times.
+            PromiseCombiner promiseCombiner = new PromiseCombiner();
+            InternalPlcRequest request = in.getRequest();
+            if (request instanceof InternalPlcFieldRequest && (splitConfig.splitRead || splitConfig.splitWrite || splitConfig.splitSubscription)) {
+                InternalPlcFieldRequest internalPlcFieldRequest = (InternalPlcFieldRequest) request;
+
+                if (internalPlcFieldRequest instanceof InternalPlcReadRequest && splitConfig.splitRead) {
+                    InternalPlcReadRequest internalPlcReadRequest = (InternalPlcReadRequest) internalPlcFieldRequest;
+                    internalPlcReadRequest.getNamedFields().forEach(field -> {
+                        ChannelPromise subPromise = new DefaultChannelPromise(promise.channel());
+
+                        Integer tdpu = correlationIdGenerator.getAndIncrement();
+                        CompletableFuture<InternalPlcResponse> correlatedCompletableFuture = new CompletableFuture<>();
+                        // Important: don't chain to above as we want the above to be completed not the result of when complete
+                        correlatedCompletableFuture
+                            .thenApply(InternalPlcResponse.class::cast)
+                            .whenComplete((internalPlcResponse, throwable) -> {
+                                if (throwable != null) {
+                                    errored(tdpu, throwable, in.getResponseFuture());
+                                } else {
+                                    tryFinish(tdpu, internalPlcResponse, in.getResponseFuture());
+                                }
+                            });
+                        PlcRequestContainer<CorrelatedPlcReadRequest, InternalPlcResponse> correlatedPlcRequestContainer = new PlcRequestContainer<>(CorrelatedPlcReadRequest.of(reader, field, tdpu), correlatedCompletableFuture);
+                        correlationToParentContainer.put(tdpu, in);
+                        queue.add(correlatedPlcRequestContainer, subPromise);
+                        if (!tdpus.add(tdpu)) {
+                            throw new IllegalStateException("AtomicInteger should not create duplicated ids: " + tdpu);
+                        }
+                        promiseCombiner.add((Future) subPromise);
+                    });
+                } else if (internalPlcFieldRequest instanceof InternalPlcWriteRequest && splitConfig.splitWrite) {
+                    InternalPlcWriteRequest internalPlcWriteRequest = (InternalPlcWriteRequest) internalPlcFieldRequest;
+                    internalPlcWriteRequest.getNamedFieldTriples().forEach(fieldItemTriple -> {
+                        ChannelPromise subPromise = new DefaultChannelPromise(promise.channel());
+
+                        Integer tdpu = correlationIdGenerator.getAndIncrement();
+                        CompletableFuture<InternalPlcResponse> correlatedCompletableFuture = new CompletableFuture<>();
+                        // Important: don't chain to above as we want the above to be completed not the result of when complete
+                        correlatedCompletableFuture
+                            .thenApply(InternalPlcResponse.class::cast)
+                            .whenComplete((internalPlcResponse, throwable) -> {
+                                if (throwable != null) {
+                                    errored(tdpu, throwable, in.getResponseFuture());
+                                } else {
+                                    tryFinish(tdpu, internalPlcResponse, in.getResponseFuture());
+                                }
+                            });
+                        PlcRequestContainer<CorrelatedPlcWriteRequest, InternalPlcResponse> correlatedPlcRequestContainer = new PlcRequestContainer<>(CorrelatedPlcWriteRequest.of(writer, fieldItemTriple, tdpu), correlatedCompletableFuture);
+                        correlationToParentContainer.put(tdpu, in);
+                        queue.add(correlatedPlcRequestContainer, subPromise);
+                        if (!tdpus.add(tdpu)) {
+                            throw new IllegalStateException("AtomicInteger should not create duplicated ids: " + tdpu);
+                        }
+                        promiseCombiner.add((Future) subPromise);
+                    });
+                } else if (internalPlcFieldRequest instanceof InternalPlcSubscriptionRequest && splitConfig.splitSubscription) {
+                    InternalPlcSubscriptionRequest internalPlcSubscriptionRequest = (InternalPlcSubscriptionRequest) internalPlcFieldRequest;
+                    internalPlcSubscriptionRequest.getNamedSubscriptionFields().forEach(field -> {
+                        ChannelPromise subPromise = new DefaultChannelPromise(promise.channel());
+
+                        Integer tdpu = correlationIdGenerator.getAndIncrement();
+                        CompletableFuture<InternalPlcResponse> correlatedCompletableFuture = new CompletableFuture<>();
+                        // Important: don't chain to above as we want the above to be completed not the result of when complete
+                        correlatedCompletableFuture
+                            .thenApply(InternalPlcResponse.class::cast)
+                            .whenComplete((internalPlcResponse, throwable) -> {
+                                if (throwable != null) {
+                                    errored(tdpu, throwable, in.getResponseFuture());
+                                } else {
+                                    tryFinish(tdpu, internalPlcResponse, in.getResponseFuture());
+                                }
+                            });
+                        PlcRequestContainer<CorrelatedPlcSubscriptionRequest, InternalPlcResponse> correlatedPlcRequestContainer = new PlcRequestContainer<>(CorrelatedPlcSubscriptionRequest.of(subscriber, field, tdpu), correlatedCompletableFuture);
+                        correlationToParentContainer.put(tdpu, in);
+                        queue.add(correlatedPlcRequestContainer, subPromise);
+                        if (!tdpus.add(tdpu)) {
+                            throw new IllegalStateException("AtomicInteger should not create duplicated ids: " + tdpu);
+                        }
+                        promiseCombiner.add((Future) subPromise);
+                    });
+                } else {
+                    throw new PlcProtocolException("Unmapped request type " + request.getClass());
+                }
+            } else if (request instanceof InternalPlcUnsubscriptionRequest && splitConfig.splitUnsubscription) {
+                InternalPlcUnsubscriptionRequest internalPlcUnsubscriptionRequest = (InternalPlcUnsubscriptionRequest) request;
+                internalPlcUnsubscriptionRequest.getInternalPlcSubscriptionHandles().forEach(handle -> {
+                    ChannelPromise subPromise = new DefaultChannelPromise(promise.channel());
+
+                    Integer tdpu = correlationIdGenerator.getAndIncrement();
+                    CompletableFuture<InternalPlcResponse> correlatedCompletableFuture = new CompletableFuture<>();
+                    // Important: don't chain to above as we want the above to be completed not the result of when complete
+                    correlatedCompletableFuture
+                        .thenApply(InternalPlcResponse.class::cast)
+                        .whenComplete((internalPlcResponse, throwable) -> {
+                            if (throwable != null) {
+                                errored(tdpu, throwable, in.getResponseFuture());
+                            } else {
+                                tryFinish(tdpu, internalPlcResponse, in.getResponseFuture());
+                            }
+                        });
+                    PlcRequestContainer<CorrelatedPlcUnsubscriptionRequest, InternalPlcResponse> correlatedPlcRequestContainer = new PlcRequestContainer<>(CorrelatedPlcUnsubscriptionRequest.of(subscriber, handle, tdpu), correlatedCompletableFuture);
+                    correlationToParentContainer.put(tdpu, in);
+                    queue.add(correlatedPlcRequestContainer, subPromise);
+                    if (!tdpus.add(tdpu)) {
+                        throw new IllegalStateException("AtomicInteger should not create duplicated ids: " + tdpu);
+                    }
+                    promiseCombiner.add((Future) subPromise);
+                });
+            } else {
+                ChannelPromise subPromise = new DefaultChannelPromise(promise.channel());
+                queue.add(msg, subPromise);
+                promiseCombiner.add((Future) subPromise);
+            }
+
+            promiseCombiner.finish(promise);
+
+            // Start sending the queue content.
+            trySendingMessages(ctx);
+        } else {
+            super.write(ctx, msg, promise);
+        }
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Helpers
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    @SuppressWarnings("unchecked")
+    protected synchronized void trySendingMessages(ChannelHandlerContext ctx) {
+        while (queue.size() > 0) {
+            // Get the RequestItem that is up next in the queue.
+            PlcRequestContainer currentItem = (PlcRequestContainer) queue.current();
+            InternalPlcRequest request = currentItem.getRequest();
+
+            // Send the TPDU.
+            try {
+                ChannelFuture channelFuture = queue.removeAndWrite();
+                ctx.flush();
+                if (channelFuture == null) {
+                    break;
+                }
+            } catch (Exception e) {
+                LOGGER.error("Error sending more queues messages", e);
+                ctx.fireExceptionCaught(e);
+            }
+
+            if (request instanceof CorrelatedPlcRequest) {
+                CorrelatedPlcRequest correlatedPlcRequest = (CorrelatedPlcRequest) request;
+
+                // Add it to the list of sentButUnacknowledgedSubContainer.
+                sentButUnacknowledgedSubContainer.put(correlatedPlcRequest.getTdpu(), currentItem);
+
+                LOGGER.debug("container with id {}Ā sent: ", correlatedPlcRequest.getTdpu(), currentItem);
+            }
+        }
+        ctx.flush();
+    }
+
+    private void handleTimeout(Timeout timeout, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> in, Set<Integer> tdpus, long scheduledAt) {
+        if (timeout.isCancelled()) {
+            LOGGER.debug("container {} with timeout {} got canceled", in, timeout);
+            return;
+        }
+        LOGGER.warn("container {} timed out:{}", in, timeout);
+        erroredContainers.incrementAndGet();
+        responsesToBeDelivered.remove(in);
+        containerCorrelationIdMap.remove(in);
+        tdpus.forEach(tdpu -> {
+            erroredItems.incrementAndGet();
+            sentButUnacknowledgedSubContainer.remove(tdpu);
+            correlationToParentContainer.remove(tdpu);
+        });
+        in.getResponseFuture().completeExceptionally(new PlcTimeoutException(System.nanoTime() - scheduledAt));
+    }
+
+    protected interface CorrelatedPlcRequest extends InternalPlcRequest {
+
+        int getTdpu();
+    }
+
+    protected static class CorrelatedPlcReadRequest extends DefaultPlcReadRequest implements CorrelatedPlcRequest {
+
+        protected final int tdpu;
+
+        protected CorrelatedPlcReadRequest(PlcReader reader, LinkedHashMap<String, PlcField> fields, int tdpu) {
+            super(reader, fields);
+            this.tdpu = tdpu;
+        }
+
+        protected static CorrelatedPlcReadRequest of(PlcReader reader, Pair<String, PlcField> stringPlcFieldPair, int tdpu) {
+            LinkedHashMap<String, PlcField> fields = new LinkedHashMap<>();
+            fields.put(stringPlcFieldPair.getKey(), stringPlcFieldPair.getValue());
+            return new CorrelatedPlcReadRequest(reader, fields, tdpu);
+        }
+
+        @Override
+        public int getTdpu() {
+            return tdpu;
+        }
+    }
+
+    protected static class CorrelatedPlcWriteRequest extends DefaultPlcWriteRequest implements CorrelatedPlcRequest {
+
+        private final int tdpu;
+
+        public CorrelatedPlcWriteRequest(PlcWriter writer, LinkedHashMap<String, Pair<PlcField, BaseDefaultFieldItem>> fields, int tdpu) {
+            super(writer, fields);
+            this.tdpu = tdpu;
+        }
+
+        public static CorrelatedPlcWriteRequest of(PlcWriter writer, Triple<String, PlcField, BaseDefaultFieldItem> fieldItemTriple, int tdpu) {
+            LinkedHashMap<String, Pair<PlcField, BaseDefaultFieldItem>> fields = new LinkedHashMap<>();
+            fields.put(fieldItemTriple.getLeft(), Pair.of(fieldItemTriple.getMiddle(), fieldItemTriple.getRight()));
+            return new CorrelatedPlcWriteRequest(writer, fields, tdpu);
+        }
+
+        @Override
+        public int getTdpu() {
+            return tdpu;
+        }
+    }
+
+    protected static class CorrelatedPlcSubscriptionRequest extends DefaultPlcSubscriptionRequest implements CorrelatedPlcRequest {
+
+        protected final int tdpu;
+
+        protected CorrelatedPlcSubscriptionRequest(PlcSubscriber subscriber, LinkedHashMap<String, SubscriptionPlcField> fields, int tdpu) {
+            super(subscriber, fields);
+            this.tdpu = tdpu;
+        }
+
+        protected static CorrelatedPlcSubscriptionRequest of(PlcSubscriber subscriber, Pair<String, SubscriptionPlcField> stringPlcFieldPair, int tdpu) {
+            LinkedHashMap<String, SubscriptionPlcField> fields = new LinkedHashMap<>();
+            fields.put(stringPlcFieldPair.getKey(), stringPlcFieldPair.getValue());
+            return new CorrelatedPlcSubscriptionRequest(subscriber, fields, tdpu);
+        }
+
+        @Override
+        public int getTdpu() {
+            return tdpu;
+        }
+    }
+
+    protected static class CorrelatedPlcUnsubscriptionRequest extends DefaultPlcUnsubscriptionRequest implements CorrelatedPlcRequest {
+
+        protected final int tdpu;
+
+        protected CorrelatedPlcUnsubscriptionRequest(PlcSubscriber subscriber, LinkedList<InternalPlcSubscriptionHandle> subscriptionHandles, int tdpu) {
+            super(subscriber, subscriptionHandles);
+            this.tdpu = tdpu;
+        }
+
+        protected static CorrelatedPlcUnsubscriptionRequest of(PlcSubscriber subscriber, InternalPlcSubscriptionHandle subscriptionHandle, int tdpu) {
+            LinkedList<InternalPlcSubscriptionHandle> list = new LinkedList<>();
+            list.add(subscriptionHandle);
+            return new CorrelatedPlcUnsubscriptionRequest(subscriber, list, tdpu);
+        }
+
+        @Override
+        public int getTdpu() {
+            return tdpu;
+        }
+    }
+
+    // TODO: maybe export to jmx
+    public Map<String, Number> getStatistics() {
+        HashMap<String, Number> statistics = new HashMap<>();
+        statistics.put("queue", queue.size());
+        statistics.put("sentButUnacknowledgedSubContainer", sentButUnacknowledgedSubContainer.size());
+        statistics.put("correlationToParentContainer", correlationToParentContainer.size());
+        statistics.put("containerCorrelationIdMap", containerCorrelationIdMap.size());
+        statistics.put("responsesToBeDelivered", responsesToBeDelivered.size());
+        statistics.put("correlationIdGenerator", correlationIdGenerator.get());
+        statistics.put("deliveredItems", deliveredItems.get());
+        statistics.put("erroredItems", erroredItems.get());
+        statistics.put("deliveredContainers", deliveredContainers.get());
+        statistics.put("erroredContainers", erroredContainers.get());
+        return statistics;
+    }
+
+    public static class SplitConfig {
+        private final boolean splitRead;
+        private final boolean splitWrite;
+        private final boolean splitSubscription;
+        private final boolean splitUnsubscription;
+
+        public SplitConfig() {
+            splitRead = true;
+            splitWrite = true;
+            splitSubscription = true;
+            splitUnsubscription = true;
+        }
+
+        private SplitConfig(boolean splitRead, boolean splitWrite, boolean splitSubscription, boolean splitUnsubscription) {
+            this.splitRead = splitRead;
+            this.splitWrite = splitWrite;
+            this.splitSubscription = splitSubscription;
+            this.splitUnsubscription = splitUnsubscription;
+        }
+
+        public static SplitConfigBuilder builder() {
+            return new SplitConfigBuilder();
+        }
+
+        public static class SplitConfigBuilder {
+            private boolean splitRead = true;
+            private boolean splitWrite = true;
+            private boolean splitSubscription = true;
+            private boolean splitUnsubscription = true;
+
+            public SplitConfigBuilder splitRead() {
+                splitRead = true;
+                return this;
+            }
+
+            public SplitConfigBuilder dontSplitRead() {
+                splitRead = false;
+                return this;
+            }
+
+            public SplitConfigBuilder splitWrite() {
+                splitWrite = true;
+                return this;
+            }
+
+            public SplitConfigBuilder dontSplitWrite() {
+                splitWrite = false;
+                return this;
+            }
+
+            public SplitConfigBuilder splitSubscribe() {
+                splitSubscription = true;
+                return this;
+            }
+
+            public SplitConfigBuilder dontSplitSubscribe() {
+                splitSubscription = false;
+                return this;
+            }
+
+            public SplitConfigBuilder splitUnsubscribe() {
+                splitUnsubscription = true;
+                return this;
+            }
+
+            public SplitConfigBuilder dontSplitUnsubscribe() {
+                splitUnsubscription = false;
+                return this;
+            }
+
+            public SplitConfig build() {
+                return new SplitConfig(splitRead, splitWrite, splitSubscription, splitUnsubscription);
+            }
+        }
+    }
+}
diff --git a/plc4j/protocols/driver-bases/base/src/test/groovy/org/apache/plc4x/java/base/messages/DefaultPlcReadResponseSpec.groovy b/plc4j/protocols/driver-bases/base/src/test/groovy/org/apache/plc4x/java/base/messages/DefaultPlcReadResponseSpec.groovy
index 744dcb25cfe..473240ee6b0 100644
--- a/plc4j/protocols/driver-bases/base/src/test/groovy/org/apache/plc4x/java/base/messages/DefaultPlcReadResponseSpec.groovy
+++ b/plc4j/protocols/driver-bases/base/src/test/groovy/org/apache/plc4x/java/base/messages/DefaultPlcReadResponseSpec.groovy
@@ -1,86 +1,86 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.base.messages
-
-import org.apache.commons.lang3.tuple.ImmutablePair
-import org.apache.plc4x.java.api.exceptions.PlcFieldRangeException
-import org.apache.plc4x.java.api.types.PlcResponseCode
-import org.apache.plc4x.java.base.messages.items.*
-import spock.lang.Specification
-import spock.lang.Unroll
-
-import java.time.LocalDate
-import java.time.LocalDateTime
-import java.time.LocalTime
-
-class DefaultPlcReadResponseSpec extends Specification {
-
-    @Unroll
-    def "Using the different types of getters should work '#dataType'"(def dataType, def fieldType, def fieldValues) {
-        setup:
-        InternalPlcReadRequest request = Mock(InternalPlcReadRequest)
-        request.getFieldNames() >> ['foo']
-
-        when:
-        DefaultPlcReadResponse SUT = new DefaultPlcReadResponse(request,
-            ["foo": new ImmutablePair<>(PlcResponseCode.OK, fieldType.newInstance(*fieldValues))])
-
-        and:
-        def fieldNames = SUT.getFieldNames()
-        // The time fields have a "Local" added to their type names, so we must cut that off.
-        def name = dataType.simpleName.replaceAll("Local", "")
-        def valid = SUT."isValid${name}"("foo")
-        def numberOfValues = SUT.getNumberOfValues("foo")
-        def responseCode = SUT.getResponseCode("foo")
-        def firstValue = SUT."get${name}"("foo")
-        def secondValue = SUT."get${name}"("foo", 1)
-        def allValues = SUT."getAll${name}s"("foo")
-        SUT.getObject("foo")
-        SUT.getAllObjects("foo")
-        SUT."get${name}"("foo", 2)
-
-        then:
-        assert fieldNames == ['foo'] as LinkedHashSet
-        assert valid
-        assert numberOfValues == fieldValues.length
-        assert responseCode == PlcResponseCode.OK
-        assert fieldValues[0] == firstValue
-        assert fieldValues[1] == secondValue
-        assert fieldValues == allValues
-        thrown PlcFieldRangeException
-
-        where:
-        dataType      | fieldType                     | fieldValues
-        Boolean       | DefaultBooleanFieldItem       | [true, false] as boolean[]
-        Byte          | DefaultByteFieldItem          | [42, 23] as byte[]
-        Short         | DefaultShortFieldItem         | [42, 23] as short[]
-        Integer       | DefaultIntegerFieldItem       | [42, 23] as int[]
-        Long          | DefaultLongFieldItem          | [42, 23] as long[]
-        BigInteger    | DefaultBigDecimalFieldItem    | [42, 23] as BigInteger[]
-        Float         | DefaultFloatFieldItem         | [42, 23] as float[]
-        Double        | DefaultDoubleFieldItem        | [42, 23] as double[]
-        BigDecimal    | DefaultBigDecimalFieldItem    | [42, 23] as BigDecimal[]
-        String        | DefaultStringFieldItem        | ["foo", "bar"] as String[]
-        LocalTime     | DefaultLocalTimeFieldItem     | [LocalTime.NOON, LocalTime.MIDNIGHT] as LocalTime[]
-        LocalDate     | DefaultLocalDateFieldItem     | [LocalDate.MIN, LocalDate.MAX] as LocalDate[]
-        LocalDateTime | DefaultLocalDateTimeFieldItem | [LocalDateTime.MIN, LocalDateTime.MAX] as LocalDateTime[]
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.base.messages
+
+import org.apache.commons.lang3.tuple.ImmutablePair
+import org.apache.plc4x.java.api.exceptions.PlcFieldRangeException
+import org.apache.plc4x.java.api.types.PlcResponseCode
+import org.apache.plc4x.java.base.messages.items.*
+import spock.lang.Specification
+import spock.lang.Unroll
+
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalTime
+
+class DefaultPlcReadResponseSpec extends Specification {
+
+    @Unroll
+    def "Using the different types of getters should work '#dataType'"(def dataType, def fieldType, def fieldValues) {
+        setup:
+        InternalPlcReadRequest request = Mock(InternalPlcReadRequest)
+        request.getFieldNames() >> ['foo']
+
+        when:
+        DefaultPlcReadResponse SUT = new DefaultPlcReadResponse(request,
+            ["foo": new ImmutablePair<>(PlcResponseCode.OK, fieldType.newInstance(*fieldValues))])
+
+        and:
+        def fieldNames = SUT.getFieldNames()
+        // The time fields have a "Local" added to their type names, so we must cut that off.
+        def name = dataType.simpleName.replaceAll("Local", "")
+        def valid = SUT."isValid${name}"("foo")
+        def numberOfValues = SUT.getNumberOfValues("foo")
+        def responseCode = SUT.getResponseCode("foo")
+        def firstValue = SUT."get${name}"("foo")
+        def secondValue = SUT."get${name}"("foo", 1)
+        def allValues = SUT."getAll${name}s"("foo")
+        SUT.getObject("foo")
+        SUT.getAllObjects("foo")
+        SUT."get${name}"("foo", 2)
+
+        then:
+        assert fieldNames == ['foo'] as LinkedHashSet
+        assert valid
+        assert numberOfValues == fieldValues.length
+        assert responseCode == PlcResponseCode.OK
+        assert fieldValues[0] == firstValue
+        assert fieldValues[1] == secondValue
+        assert fieldValues == allValues
+        thrown PlcFieldRangeException
+
+        where:
+        dataType      | fieldType                     | fieldValues
+        Boolean       | DefaultBooleanFieldItem       | [true, false] as boolean[]
+        Byte          | DefaultByteFieldItem          | [42, 23] as byte[]
+        Short         | DefaultShortFieldItem         | [42, 23] as short[]
+        Integer       | DefaultIntegerFieldItem       | [42, 23] as int[]
+        Long          | DefaultLongFieldItem          | [42, 23] as long[]
+        BigInteger    | DefaultBigDecimalFieldItem    | [42, 23] as BigInteger[]
+        Float         | DefaultFloatFieldItem         | [42, 23] as float[]
+        Double        | DefaultDoubleFieldItem        | [42, 23] as double[]
+        BigDecimal    | DefaultBigDecimalFieldItem    | [42, 23] as BigDecimal[]
+        String        | DefaultStringFieldItem        | ["foo", "bar"] as String[]
+        LocalTime     | DefaultLocalTimeFieldItem     | [LocalTime.NOON, LocalTime.MIDNIGHT] as LocalTime[]
+        LocalDate     | DefaultLocalDateFieldItem     | [LocalDate.MIN, LocalDate.MAX] as LocalDate[]
+        LocalDateTime | DefaultLocalDateTimeFieldItem | [LocalDateTime.MIN, LocalDateTime.MAX] as LocalDateTime[]
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/test/groovy/org/apache/plc4x/java/base/messages/items/DefaultItemsSpec.groovy b/plc4j/protocols/driver-bases/base/src/test/groovy/org/apache/plc4x/java/base/messages/items/DefaultItemsSpec.groovy
index c8458962f24..024c8e98bec 100644
--- a/plc4j/protocols/driver-bases/base/src/test/groovy/org/apache/plc4x/java/base/messages/items/DefaultItemsSpec.groovy
+++ b/plc4j/protocols/driver-bases/base/src/test/groovy/org/apache/plc4x/java/base/messages/items/DefaultItemsSpec.groovy
@@ -1,217 +1,217 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages.items
-
-import nl.jqno.equalsverifier.EqualsVerifier
-import nl.jqno.equalsverifier.Warning
-import org.apache.commons.lang3.StringUtils
-import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException
-import spock.lang.Specification
-import spock.lang.Unroll
-
-import java.time.LocalDate
-import java.time.LocalDateTime
-import java.time.LocalTime
-
-class DefaultItemsSpec extends Specification {
-
-    @Unroll
-    def "The '#fieldItemType.simpleName'.isValidXYZ methods should respect the correct boundaries of the type XYZ and "(
-        Class<? extends BaseDefaultFieldItem> fieldItemType, Object value, Boolean isValidBoolean, Boolean isValidByte, Boolean isValidShort, Boolean isValidInteger,
-        Boolean isValidLong, Boolean isValidBigInteger, Boolean isValidFloat, Boolean isValidDouble, Boolean isValidBigDecimal,
-        Boolean isValidString, Boolean isValidTime, Boolean isValidDate, Boolean isValidDateTime, Boolean isValidByteArray) {
-
-        setup:
-        Object[] values = new Object[2]
-        values[0] = value
-        values[1] = null
-        BaseDefaultFieldItem fieldItem = fieldItemType.newInstance(values)
-
-        expect:
-        assert fieldItem.getNumberOfValues() == 2
-        assert fieldItem.getObject(0) == value
-        assert fieldItem.getObject(1) == null
-        assert fieldItem.getValues()[0] == value
-        assertItem(fieldItem, "Boolean", isValidBoolean)
-        assertItem(fieldItem, "Byte", isValidByte)
-        assertItem(fieldItem, "Short", isValidShort)
-        assertItem(fieldItem, "Integer", isValidInteger)
-        assertItem(fieldItem, "Long", isValidLong)
-        assertItem(fieldItem, "BigInteger", isValidBigInteger)
-        assertItem(fieldItem, "Float", isValidFloat)
-        assertItem(fieldItem, "Double", isValidDouble)
-        assertItem(fieldItem, "BigDecimal", isValidBigDecimal)
-        assertItem(fieldItem, "String", isValidString)
-        assertItem(fieldItem, "Time", isValidTime)
-        assertItem(fieldItem, "Date", isValidDate)
-        assertItem(fieldItem, "DateTime", isValidDateTime)
-        assertItem(fieldItem, "ByteArray", isValidByteArray)
-        EqualsVerifier.forClass(fieldItemType).suppress(Warning.STRICT_INHERITANCE).verify()
-        assert StringUtils.isNotBlank(fieldItem.toString())
-
-        where:
-        fieldItemType                 | value                                          || isValidBoolean | isValidByte | isValidShort | isValidInteger | isValidLong | isValidBigInteger | isValidFloat | isValidDouble | isValidBigDecimal | isValidString | isValidTime | isValidDate | isValidDateTime | isValidByteArray
-        DefaultBooleanFieldItem       | true                                           || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBooleanFieldItem       | false                                          || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-
-//      fieldItemType              | value                                      || isValidBoolean | isValidByte | isValidShort | isValidInteger | isValidLong | isValidBigInteger | isValidFloat | isValidDouble | isValidBigDecimal | isValidString | isValidTime | isValidDate | isValidDateTime | isValidByteArray
-        DefaultByteFieldItem          | (byte) 0                                       || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultByteFieldItem          | (byte) 42                                      || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultByteFieldItem          | Byte.MAX_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultByteFieldItem          | Byte.MIN_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-
-//      fieldItemType              | value                                      || isValidBoolean | isValidByte | isValidShort | isValidInteger | isValidLong | isValidBigInteger | isValidFloat | isValidDouble | isValidBigDecimal | isValidString | isValidTime | isValidDate | isValidDateTime | isValidByteArray
-        DefaultShortFieldItem         | (short) 0                                      || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultShortFieldItem         | (short) 42                                     || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultShortFieldItem         | Byte.MIN_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultShortFieldItem         | Byte.MAX_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultShortFieldItem         | Short.MAX_VALUE                                || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultShortFieldItem         | Short.MIN_VALUE                                || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-
-//      fieldItemType              | value                                      || isValidBoolean | isValidByte | isValidShort | isValidInteger | isValidLong | isValidBigInteger | isValidFloat | isValidDouble | isValidBigDecimal | isValidString | isValidTime | isValidDate | isValidDateTime | isValidByteArray
-        DefaultIntegerFieldItem       | (int) 0                                        || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultIntegerFieldItem       | (int) 42                                       || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultIntegerFieldItem       | Byte.MIN_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultIntegerFieldItem       | Byte.MAX_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultIntegerFieldItem       | Short.MAX_VALUE                                || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultIntegerFieldItem       | Short.MIN_VALUE                                || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultIntegerFieldItem       | Integer.MAX_VALUE                              || true           | false       | false        | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultIntegerFieldItem       | Integer.MIN_VALUE                              || true           | false       | false        | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-
-//      fieldItemType              | value                                      || isValidBoolean | isValidByte | isValidShort | isValidInteger | isValidLong | isValidBigInteger | isValidFloat | isValidDouble | isValidBigDecimal | isValidString | isValidTime | isValidDate | isValidDateTime | isValidByteArray
-        DefaultLongFieldItem          | (int) 0                                        || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultLongFieldItem          | (int) 42                                       || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultLongFieldItem          | Byte.MIN_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultLongFieldItem          | Byte.MAX_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultLongFieldItem          | Short.MAX_VALUE                                || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultLongFieldItem          | Short.MIN_VALUE                                || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultLongFieldItem          | Integer.MAX_VALUE                              || true           | false       | false        | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultLongFieldItem          | Integer.MIN_VALUE                              || true           | false       | false        | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultLongFieldItem          | Long.MAX_VALUE                                 || true           | false       | false        | false          | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultLongFieldItem          | Long.MIN_VALUE                                 || true           | false       | false        | false          | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-
-//      fieldItemType              | value                                      || isValidBoolean | isValidByte | isValidShort | isValidInteger | isValidLong | isValidBigInteger | isValidFloat | isValidDouble | isValidBigDecimal | isValidString | isValidTime | isValidDate | isValidDateTime | isValidByteArray
-        DefaultBigIntegerFieldItem    | (int) 0                                        || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigIntegerFieldItem    | (int) 42                                       || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigIntegerFieldItem    | Byte.MIN_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigIntegerFieldItem    | Byte.MAX_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigIntegerFieldItem    | Short.MIN_VALUE                                || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigIntegerFieldItem    | Short.MAX_VALUE                                || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigIntegerFieldItem    | Integer.MIN_VALUE                              || true           | false       | false        | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigIntegerFieldItem    | Integer.MAX_VALUE                              || true           | false       | false        | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigIntegerFieldItem    | Long.MIN_VALUE                                 || true           | false       | false        | false          | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigIntegerFieldItem    | Long.MAX_VALUE                                 || true           | false       | false        | false          | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigIntegerFieldItem    | BigInteger.valueOf(Long.MIN_VALUE).multiply(2) || true           | false       | false        | false          | false       | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigIntegerFieldItem    | BigInteger.valueOf(Long.MAX_VALUE).multiply(2) || true           | false       | false        | false          | false       | true              | true         | true          | true              | false         | false       | false       | false           | false
-
-//      fieldItemType              | value                                      || isValidBoolean | isValidByte | isValidShort | isValidInteger | isValidLong | isValidBigInteger | isValidFloat | isValidDouble | isValidBigDecimal | isValidString | isValidTime | isValidDate | isValidDateTime | isValidByteArray
-        DefaultFloatFieldItem         | (int) 0                                        || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultFloatFieldItem         | (int) 42                                       || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultFloatFieldItem         | Byte.MIN_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultFloatFieldItem         | Byte.MAX_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultFloatFieldItem         | Short.MIN_VALUE                                || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultFloatFieldItem         | Short.MAX_VALUE                                || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultFloatFieldItem         | Integer.MIN_VALUE                              || true           | false       | false        | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-// In this case the conversion to Float results in a rounding error
-//        DefaultFloatFieldItem      | Integer.MAX_VALUE                          || true           | false       | false        | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultFloatFieldItem         | Long.MIN_VALUE                                 || true           | false       | false        | false          | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultFloatFieldItem         | Long.MAX_VALUE                                 || true           | false       | false        | false          | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultFloatFieldItem         | 1.2345678912345f                               || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultFloatFieldItem         | Float.MIN_VALUE                                || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultFloatFieldItem         | -Float.MAX_VALUE                               || true           | false       | false        | false          | false       | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultFloatFieldItem         | Float.MAX_VALUE                                || true           | false       | false        | false          | false       | true              | true         | true          | true              | false         | false       | false       | false           | false
-
-//      fieldItemType              | value                                      || isValidBoolean | isValidByte | isValidShort | isValidInteger | isValidLong | isValidBigInteger | isValidFloat | isValidDouble | isValidBigDecimal | isValidString | isValidTime | isValidDate | isValidDateTime | isValidByteArray
-        DefaultDoubleFieldItem        | (int) 0                                        || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultDoubleFieldItem        | (int) 42                                       || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultDoubleFieldItem        | Byte.MIN_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultDoubleFieldItem        | Byte.MAX_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultDoubleFieldItem        | Short.MIN_VALUE                                || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultDoubleFieldItem        | Short.MAX_VALUE                                || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultDoubleFieldItem        | Integer.MIN_VALUE                              || true           | false       | false        | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultDoubleFieldItem        | Integer.MAX_VALUE                              || true           | false       | false        | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultDoubleFieldItem        | Long.MIN_VALUE                                 || true           | false       | false        | false          | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultDoubleFieldItem        | Long.MAX_VALUE                                 || true           | false       | false        | false          | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultDoubleFieldItem        | 1.23456789123456f                              || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultDoubleFieldItem        | Float.MIN_VALUE                                || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultDoubleFieldItem        | -Float.MAX_VALUE                               || true           | false       | false        | false          | false       | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultDoubleFieldItem        | Float.MAX_VALUE                                || true           | false       | false        | false          | false       | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultDoubleFieldItem        | 1.23456789012345d                              || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultDoubleFieldItem        | Double.MIN_VALUE                               || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultDoubleFieldItem        | -Double.MAX_VALUE                              || true           | false       | false        | false          | false       | true              | false        | true          | true              | false         | false       | false       | false           | false
-        DefaultDoubleFieldItem        | Double.MAX_VALUE                               || true           | false       | false        | false          | false       | true              | false        | true          | true              | false         | false       | false       | false           | false
-
-//      fieldItemType              | value                                      || isValidBoolean | isValidByte | isValidShort | isValidInteger | isValidLong | isValidBigInteger | isValidFloat | isValidDouble | isValidBigDecimal | isValidString | isValidTime | isValidDate | isValidDateTime | isValidByteArray
-        DefaultBigDecimalFieldItem    | BigDecimal.ZERO                                || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigDecimalFieldItem    | BigDecimal.ONE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(42)                         || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(Byte.MIN_VALUE)             || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(Byte.MAX_VALUE)             || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(Short.MIN_VALUE)            || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(Short.MAX_VALUE)            || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(Integer.MIN_VALUE)          || true           | false       | false        | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(Integer.MAX_VALUE)          || true           | false       | false        | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(Long.MIN_VALUE)             || true           | false       | false        | false          | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(Long.MAX_VALUE)             || true           | false       | false        | false          | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(1.23456789123456f)          || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(Float.MIN_VALUE)            || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(-Float.MAX_VALUE)           || true           | false       | false        | false          | false       | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(Float.MAX_VALUE)            || true           | false       | false        | false          | false       | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(1.23456789012345d)          || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(Double.MIN_VALUE)           || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
-        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(-Double.MAX_VALUE)          || true           | false       | false        | false          | false       | true              | false        | true          | true              | false         | false       | false       | false           | false
-        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(Double.MAX_VALUE)           || true           | false       | false        | false          | false       | true              | false        | true          | true              | false         | false       | false       | false           | false
-
-//      fieldItemType              | value                                      || isValidBoolean | isValidByte | isValidShort | isValidInteger | isValidLong | isValidBigInteger | isValidFloat | isValidDouble | isValidBigDecimal | isValidString | isValidTime | isValidDate | isValidDateTime | isValidByteArray
-        DefaultLocalTimeFieldItem     | LocalTime.now()                                || false          | false       | false        | false          | false       | false             | false        | false         | false             | false         | true        | false       | false           | false
-
-//      fieldItemType              | value                                      || isValidBoolean | isValidByte | isValidShort | isValidInteger | isValidLong | isValidBigInteger | isValidFloat | isValidDouble | isValidBigDecimal | isValidString | isValidTime | isValidDate | isValidDateTime | isValidByteArray
-        DefaultLocalDateFieldItem     | LocalDate.now()                                || false          | false       | false        | false          | false       | false             | false        | false         | false             | false         | false       | true        | false           | false
-
-//      fieldItemType              | value                                      || isValidBoolean | isValidByte | isValidShort | isValidInteger | isValidLong | isValidBigInteger | isValidFloat | isValidDouble | isValidBigDecimal | isValidString | isValidTime | isValidDate | isValidDateTime | isValidByteArray
-        DefaultLocalDateTimeFieldItem | LocalDateTime.now()                            || false          | false       | false        | false          | false       | false             | false        | false         | false             | false         | true        | true        | true            | false
-
-//      fieldItemType              | value                                      || isValidBoolean | isValidByte | isValidShort | isValidInteger | isValidLong | isValidBigInteger | isValidFloat | isValidDouble | isValidBigDecimal | isValidString | isValidTime | isValidDate | isValidDateTime | isValidByteArray
-        DefaultStringFieldItem        | "foo"                                          || false          | false       | false        | false          | false       | false             | false        | false         | false             | true         | false        | false       | false           | false
-    }
-
-    Boolean assertItem(BaseDefaultFieldItem fieldItem, String type, Boolean expectedToBeValid) {
-        assert fieldItem."isValid$type"(0) == expectedToBeValid
-        if (expectedToBeValid) {
-            assert fieldItem."get$type"(0) != null
-        } else {
-            assert getExecutionException({ fieldItem."get$type"(0) }) instanceof PlcIncompatibleDatatypeException
-        }
-        getExecutionException({ fieldItem."get$type"(42) }) instanceof PlcIncompatibleDatatypeException
-        getExecutionException({ fieldItem."get$type"(1) }) instanceof PlcIncompatibleDatatypeException
-        return true
-    }
-
-    Exception getExecutionException(Closure c) {
-        try {
-            c.call()
-            return null
-        } catch (Exception e) {
-            return e
-        }
-    }
-
-}
-
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages.items
+
+import nl.jqno.equalsverifier.EqualsVerifier
+import nl.jqno.equalsverifier.Warning
+import org.apache.commons.lang3.StringUtils
+import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException
+import spock.lang.Specification
+import spock.lang.Unroll
+
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalTime
+
+class DefaultItemsSpec extends Specification {
+
+    @Unroll
+    def "The '#fieldItemType.simpleName'.isValidXYZ methods should respect the correct boundaries of the type XYZ and "(
+        Class<? extends BaseDefaultFieldItem> fieldItemType, Object value, Boolean isValidBoolean, Boolean isValidByte, Boolean isValidShort, Boolean isValidInteger,
+        Boolean isValidLong, Boolean isValidBigInteger, Boolean isValidFloat, Boolean isValidDouble, Boolean isValidBigDecimal,
+        Boolean isValidString, Boolean isValidTime, Boolean isValidDate, Boolean isValidDateTime, Boolean isValidByteArray) {
+
+        setup:
+        Object[] values = new Object[2]
+        values[0] = value
+        values[1] = null
+        BaseDefaultFieldItem fieldItem = fieldItemType.newInstance(values)
+
+        expect:
+        assert fieldItem.getNumberOfValues() == 2
+        assert fieldItem.getObject(0) == value
+        assert fieldItem.getObject(1) == null
+        assert fieldItem.getValues()[0] == value
+        assertItem(fieldItem, "Boolean", isValidBoolean)
+        assertItem(fieldItem, "Byte", isValidByte)
+        assertItem(fieldItem, "Short", isValidShort)
+        assertItem(fieldItem, "Integer", isValidInteger)
+        assertItem(fieldItem, "Long", isValidLong)
+        assertItem(fieldItem, "BigInteger", isValidBigInteger)
+        assertItem(fieldItem, "Float", isValidFloat)
+        assertItem(fieldItem, "Double", isValidDouble)
+        assertItem(fieldItem, "BigDecimal", isValidBigDecimal)
+        assertItem(fieldItem, "String", isValidString)
+        assertItem(fieldItem, "Time", isValidTime)
+        assertItem(fieldItem, "Date", isValidDate)
+        assertItem(fieldItem, "DateTime", isValidDateTime)
+        assertItem(fieldItem, "ByteArray", isValidByteArray)
+        EqualsVerifier.forClass(fieldItemType).suppress(Warning.STRICT_INHERITANCE).verify()
+        assert StringUtils.isNotBlank(fieldItem.toString())
+
+        where:
+        fieldItemType                 | value                                          || isValidBoolean | isValidByte | isValidShort | isValidInteger | isValidLong | isValidBigInteger | isValidFloat | isValidDouble | isValidBigDecimal | isValidString | isValidTime | isValidDate | isValidDateTime | isValidByteArray
+        DefaultBooleanFieldItem       | true                                           || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBooleanFieldItem       | false                                          || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+
+//      fieldItemType              | value                                      || isValidBoolean | isValidByte | isValidShort | isValidInteger | isValidLong | isValidBigInteger | isValidFloat | isValidDouble | isValidBigDecimal | isValidString | isValidTime | isValidDate | isValidDateTime | isValidByteArray
+        DefaultByteFieldItem          | (byte) 0                                       || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultByteFieldItem          | (byte) 42                                      || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultByteFieldItem          | Byte.MAX_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultByteFieldItem          | Byte.MIN_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+
+//      fieldItemType              | value                                      || isValidBoolean | isValidByte | isValidShort | isValidInteger | isValidLong | isValidBigInteger | isValidFloat | isValidDouble | isValidBigDecimal | isValidString | isValidTime | isValidDate | isValidDateTime | isValidByteArray
+        DefaultShortFieldItem         | (short) 0                                      || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultShortFieldItem         | (short) 42                                     || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultShortFieldItem         | Byte.MIN_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultShortFieldItem         | Byte.MAX_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultShortFieldItem         | Short.MAX_VALUE                                || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultShortFieldItem         | Short.MIN_VALUE                                || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+
+//      fieldItemType              | value                                      || isValidBoolean | isValidByte | isValidShort | isValidInteger | isValidLong | isValidBigInteger | isValidFloat | isValidDouble | isValidBigDecimal | isValidString | isValidTime | isValidDate | isValidDateTime | isValidByteArray
+        DefaultIntegerFieldItem       | (int) 0                                        || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultIntegerFieldItem       | (int) 42                                       || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultIntegerFieldItem       | Byte.MIN_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultIntegerFieldItem       | Byte.MAX_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultIntegerFieldItem       | Short.MAX_VALUE                                || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultIntegerFieldItem       | Short.MIN_VALUE                                || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultIntegerFieldItem       | Integer.MAX_VALUE                              || true           | false       | false        | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultIntegerFieldItem       | Integer.MIN_VALUE                              || true           | false       | false        | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+
+//      fieldItemType              | value                                      || isValidBoolean | isValidByte | isValidShort | isValidInteger | isValidLong | isValidBigInteger | isValidFloat | isValidDouble | isValidBigDecimal | isValidString | isValidTime | isValidDate | isValidDateTime | isValidByteArray
+        DefaultLongFieldItem          | (int) 0                                        || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultLongFieldItem          | (int) 42                                       || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultLongFieldItem          | Byte.MIN_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultLongFieldItem          | Byte.MAX_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultLongFieldItem          | Short.MAX_VALUE                                || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultLongFieldItem          | Short.MIN_VALUE                                || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultLongFieldItem          | Integer.MAX_VALUE                              || true           | false       | false        | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultLongFieldItem          | Integer.MIN_VALUE                              || true           | false       | false        | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultLongFieldItem          | Long.MAX_VALUE                                 || true           | false       | false        | false          | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultLongFieldItem          | Long.MIN_VALUE                                 || true           | false       | false        | false          | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+
+//      fieldItemType              | value                                      || isValidBoolean | isValidByte | isValidShort | isValidInteger | isValidLong | isValidBigInteger | isValidFloat | isValidDouble | isValidBigDecimal | isValidString | isValidTime | isValidDate | isValidDateTime | isValidByteArray
+        DefaultBigIntegerFieldItem    | (int) 0                                        || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigIntegerFieldItem    | (int) 42                                       || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigIntegerFieldItem    | Byte.MIN_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigIntegerFieldItem    | Byte.MAX_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigIntegerFieldItem    | Short.MIN_VALUE                                || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigIntegerFieldItem    | Short.MAX_VALUE                                || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigIntegerFieldItem    | Integer.MIN_VALUE                              || true           | false       | false        | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigIntegerFieldItem    | Integer.MAX_VALUE                              || true           | false       | false        | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigIntegerFieldItem    | Long.MIN_VALUE                                 || true           | false       | false        | false          | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigIntegerFieldItem    | Long.MAX_VALUE                                 || true           | false       | false        | false          | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigIntegerFieldItem    | BigInteger.valueOf(Long.MIN_VALUE).multiply(2) || true           | false       | false        | false          | false       | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigIntegerFieldItem    | BigInteger.valueOf(Long.MAX_VALUE).multiply(2) || true           | false       | false        | false          | false       | true              | true         | true          | true              | false         | false       | false       | false           | false
+
+//      fieldItemType              | value                                      || isValidBoolean | isValidByte | isValidShort | isValidInteger | isValidLong | isValidBigInteger | isValidFloat | isValidDouble | isValidBigDecimal | isValidString | isValidTime | isValidDate | isValidDateTime | isValidByteArray
+        DefaultFloatFieldItem         | (int) 0                                        || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultFloatFieldItem         | (int) 42                                       || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultFloatFieldItem         | Byte.MIN_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultFloatFieldItem         | Byte.MAX_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultFloatFieldItem         | Short.MIN_VALUE                                || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultFloatFieldItem         | Short.MAX_VALUE                                || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultFloatFieldItem         | Integer.MIN_VALUE                              || true           | false       | false        | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+// In this case the conversion to Float results in a rounding error
+//        DefaultFloatFieldItem      | Integer.MAX_VALUE                          || true           | false       | false        | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultFloatFieldItem         | Long.MIN_VALUE                                 || true           | false       | false        | false          | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultFloatFieldItem         | Long.MAX_VALUE                                 || true           | false       | false        | false          | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultFloatFieldItem         | 1.2345678912345f                               || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultFloatFieldItem         | Float.MIN_VALUE                                || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultFloatFieldItem         | -Float.MAX_VALUE                               || true           | false       | false        | false          | false       | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultFloatFieldItem         | Float.MAX_VALUE                                || true           | false       | false        | false          | false       | true              | true         | true          | true              | false         | false       | false       | false           | false
+
+//      fieldItemType              | value                                      || isValidBoolean | isValidByte | isValidShort | isValidInteger | isValidLong | isValidBigInteger | isValidFloat | isValidDouble | isValidBigDecimal | isValidString | isValidTime | isValidDate | isValidDateTime | isValidByteArray
+        DefaultDoubleFieldItem        | (int) 0                                        || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultDoubleFieldItem        | (int) 42                                       || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultDoubleFieldItem        | Byte.MIN_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultDoubleFieldItem        | Byte.MAX_VALUE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultDoubleFieldItem        | Short.MIN_VALUE                                || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultDoubleFieldItem        | Short.MAX_VALUE                                || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultDoubleFieldItem        | Integer.MIN_VALUE                              || true           | false       | false        | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultDoubleFieldItem        | Integer.MAX_VALUE                              || true           | false       | false        | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultDoubleFieldItem        | Long.MIN_VALUE                                 || true           | false       | false        | false          | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultDoubleFieldItem        | Long.MAX_VALUE                                 || true           | false       | false        | false          | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultDoubleFieldItem        | 1.23456789123456f                              || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultDoubleFieldItem        | Float.MIN_VALUE                                || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultDoubleFieldItem        | -Float.MAX_VALUE                               || true           | false       | false        | false          | false       | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultDoubleFieldItem        | Float.MAX_VALUE                                || true           | false       | false        | false          | false       | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultDoubleFieldItem        | 1.23456789012345d                              || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultDoubleFieldItem        | Double.MIN_VALUE                               || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultDoubleFieldItem        | -Double.MAX_VALUE                              || true           | false       | false        | false          | false       | true              | false        | true          | true              | false         | false       | false       | false           | false
+        DefaultDoubleFieldItem        | Double.MAX_VALUE                               || true           | false       | false        | false          | false       | true              | false        | true          | true              | false         | false       | false       | false           | false
+
+//      fieldItemType              | value                                      || isValidBoolean | isValidByte | isValidShort | isValidInteger | isValidLong | isValidBigInteger | isValidFloat | isValidDouble | isValidBigDecimal | isValidString | isValidTime | isValidDate | isValidDateTime | isValidByteArray
+        DefaultBigDecimalFieldItem    | BigDecimal.ZERO                                || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigDecimalFieldItem    | BigDecimal.ONE                                 || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(42)                         || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(Byte.MIN_VALUE)             || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(Byte.MAX_VALUE)             || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(Short.MIN_VALUE)            || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(Short.MAX_VALUE)            || true           | false       | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(Integer.MIN_VALUE)          || true           | false       | false        | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(Integer.MAX_VALUE)          || true           | false       | false        | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(Long.MIN_VALUE)             || true           | false       | false        | false          | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(Long.MAX_VALUE)             || true           | false       | false        | false          | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(1.23456789123456f)          || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(Float.MIN_VALUE)            || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(-Float.MAX_VALUE)           || true           | false       | false        | false          | false       | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(Float.MAX_VALUE)            || true           | false       | false        | false          | false       | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(1.23456789012345d)          || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(Double.MIN_VALUE)           || true           | true        | true         | true           | true        | true              | true         | true          | true              | false         | false       | false       | false           | false
+        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(-Double.MAX_VALUE)          || true           | false       | false        | false          | false       | true              | false        | true          | true              | false         | false       | false       | false           | false
+        DefaultBigDecimalFieldItem    | BigDecimal.valueOf(Double.MAX_VALUE)           || true           | false       | false        | false          | false       | true              | false        | true          | true              | false         | false       | false       | false           | false
+
+//      fieldItemType              | value                                      || isValidBoolean | isValidByte | isValidShort | isValidInteger | isValidLong | isValidBigInteger | isValidFloat | isValidDouble | isValidBigDecimal | isValidString | isValidTime | isValidDate | isValidDateTime | isValidByteArray
+        DefaultLocalTimeFieldItem     | LocalTime.now()                                || false          | false       | false        | false          | false       | false             | false        | false         | false             | false         | true        | false       | false           | false
+
+//      fieldItemType              | value                                      || isValidBoolean | isValidByte | isValidShort | isValidInteger | isValidLong | isValidBigInteger | isValidFloat | isValidDouble | isValidBigDecimal | isValidString | isValidTime | isValidDate | isValidDateTime | isValidByteArray
+        DefaultLocalDateFieldItem     | LocalDate.now()                                || false          | false       | false        | false          | false       | false             | false        | false         | false             | false         | false       | true        | false           | false
+
+//      fieldItemType              | value                                      || isValidBoolean | isValidByte | isValidShort | isValidInteger | isValidLong | isValidBigInteger | isValidFloat | isValidDouble | isValidBigDecimal | isValidString | isValidTime | isValidDate | isValidDateTime | isValidByteArray
+        DefaultLocalDateTimeFieldItem | LocalDateTime.now()                            || false          | false       | false        | false          | false       | false             | false        | false         | false             | false         | true        | true        | true            | false
+
+//      fieldItemType              | value                                      || isValidBoolean | isValidByte | isValidShort | isValidInteger | isValidLong | isValidBigInteger | isValidFloat | isValidDouble | isValidBigDecimal | isValidString | isValidTime | isValidDate | isValidDateTime | isValidByteArray
+        DefaultStringFieldItem        | "foo"                                          || false          | false       | false        | false          | false       | false             | false        | false         | false             | true         | false        | false       | false           | false
+    }
+
+    Boolean assertItem(BaseDefaultFieldItem fieldItem, String type, Boolean expectedToBeValid) {
+        assert fieldItem."isValid$type"(0) == expectedToBeValid
+        if (expectedToBeValid) {
+            assert fieldItem."get$type"(0) != null
+        } else {
+            assert getExecutionException({ fieldItem."get$type"(0) }) instanceof PlcIncompatibleDatatypeException
+        }
+        getExecutionException({ fieldItem."get$type"(42) }) instanceof PlcIncompatibleDatatypeException
+        getExecutionException({ fieldItem."get$type"(1) }) instanceof PlcIncompatibleDatatypeException
+        return true
+    }
+
+    Exception getExecutionException(Closure c) {
+        try {
+            c.call()
+            return null
+        } catch (Exception e) {
+            return e
+        }
+    }
+
+}
+
+
diff --git a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/connection/AbstractPlcConnectionTest.java b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/connection/AbstractPlcConnectionTest.java
index 20647096d80..b6fdfe45de2 100644
--- a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/connection/AbstractPlcConnectionTest.java
+++ b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/connection/AbstractPlcConnectionTest.java
@@ -1,101 +1,101 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.base.connection;
-
-import org.apache.commons.lang3.NotImplementedException;
-import org.apache.plc4x.java.api.exceptions.PlcUnsupportedOperationException;
-import org.apache.plc4x.java.base.messages.DefaultPlcReadRequest;
-import org.apache.plc4x.java.base.messages.PlcReader;
-import org.assertj.core.api.WithAssertions;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
-
-class AbstractPlcConnectionTest implements WithAssertions {
-
-    AbstractPlcConnection SUT = new AbstractPlcConnection() {
-        @Override
-        public void connect() {
-            throw new NotImplementedException("not used");
-        }
-
-        @Override
-        public boolean isConnected() {
-            throw new NotImplementedException("not used");
-        }
-
-        @Override
-        public void close() {
-            throw new NotImplementedException("not used");
-        }
-    };
-
-    @Test
-    void getMetadata() {
-        assertThat(SUT.getMetadata()).isNotNull().isSameAs(SUT);
-    }
-
-    @Test
-    void canRead() {
-        assertThat(SUT.canRead()).isFalse();
-    }
-
-    @Test
-    void canWrite() {
-        assertThat(SUT.canWrite()).isFalse();
-    }
-
-    @Test
-    void canSubscribe() {
-        assertThat(SUT.canSubscribe()).isFalse();
-    }
-
-    @Test
-    void readRequestBuilder() {
-        assertThatThrownBy(() -> SUT.readRequestBuilder()).isInstanceOf(PlcUnsupportedOperationException.class);
-    }
-
-    @Test
-    void writeRequestBuilder() {
-        assertThatThrownBy(() -> SUT.writeRequestBuilder()).isInstanceOf(PlcUnsupportedOperationException.class);
-    }
-
-    @Test
-    void subscriptionRequestBuilder() {
-        assertThatThrownBy(() -> SUT.subscriptionRequestBuilder()).isInstanceOf(PlcUnsupportedOperationException.class);
-    }
-
-    @Test
-    void unsubscriptionRequestBuilder() {
-        assertThatThrownBy(() -> SUT.unsubscriptionRequestBuilder()).isInstanceOf(PlcUnsupportedOperationException.class);
-    }
-
-    @Test
-    void checkInternalTest() {
-        assertThrows(IllegalArgumentException.class, () -> SUT.checkInternal("Test", DefaultPlcReadRequest.class));
-        DefaultPlcReadRequest readRequest = SUT.checkInternal(
-            new DefaultPlcReadRequest.Builder(mock(PlcReader.class), mock(PlcFieldHandler.class)).build(),
-            DefaultPlcReadRequest.class);
-        assertThat(readRequest).isNotNull();
-    }
-
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.base.connection;
+
+import org.apache.commons.lang3.NotImplementedException;
+import org.apache.plc4x.java.api.exceptions.PlcUnsupportedOperationException;
+import org.apache.plc4x.java.base.messages.DefaultPlcReadRequest;
+import org.apache.plc4x.java.base.messages.PlcReader;
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+
+class AbstractPlcConnectionTest implements WithAssertions {
+
+    AbstractPlcConnection SUT = new AbstractPlcConnection() {
+        @Override
+        public void connect() {
+            throw new NotImplementedException("not used");
+        }
+
+        @Override
+        public boolean isConnected() {
+            throw new NotImplementedException("not used");
+        }
+
+        @Override
+        public void close() {
+            throw new NotImplementedException("not used");
+        }
+    };
+
+    @Test
+    void getMetadata() {
+        assertThat(SUT.getMetadata()).isNotNull().isSameAs(SUT);
+    }
+
+    @Test
+    void canRead() {
+        assertThat(SUT.canRead()).isFalse();
+    }
+
+    @Test
+    void canWrite() {
+        assertThat(SUT.canWrite()).isFalse();
+    }
+
+    @Test
+    void canSubscribe() {
+        assertThat(SUT.canSubscribe()).isFalse();
+    }
+
+    @Test
+    void readRequestBuilder() {
+        assertThatThrownBy(() -> SUT.readRequestBuilder()).isInstanceOf(PlcUnsupportedOperationException.class);
+    }
+
+    @Test
+    void writeRequestBuilder() {
+        assertThatThrownBy(() -> SUT.writeRequestBuilder()).isInstanceOf(PlcUnsupportedOperationException.class);
+    }
+
+    @Test
+    void subscriptionRequestBuilder() {
+        assertThatThrownBy(() -> SUT.subscriptionRequestBuilder()).isInstanceOf(PlcUnsupportedOperationException.class);
+    }
+
+    @Test
+    void unsubscriptionRequestBuilder() {
+        assertThatThrownBy(() -> SUT.unsubscriptionRequestBuilder()).isInstanceOf(PlcUnsupportedOperationException.class);
+    }
+
+    @Test
+    void checkInternalTest() {
+        assertThrows(IllegalArgumentException.class, () -> SUT.checkInternal("Test", DefaultPlcReadRequest.class));
+        DefaultPlcReadRequest readRequest = SUT.checkInternal(
+            new DefaultPlcReadRequest.Builder(mock(PlcReader.class), mock(PlcFieldHandler.class)).build(),
+            DefaultPlcReadRequest.class);
+        assertThat(readRequest).isNotNull();
+    }
+
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/connection/NettyPlcConnectionTest.java b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/connection/NettyPlcConnectionTest.java
index 9625502713d..9c494ba7c30 100644
--- a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/connection/NettyPlcConnectionTest.java
+++ b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/connection/NettyPlcConnectionTest.java
@@ -1,92 +1,92 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.base.connection;
-
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.embedded.EmbeddedChannel;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.base.events.ConnectEvent;
-import org.assertj.core.api.WithAssertions;
-import org.junit.jupiter.api.Test;
-
-import java.util.concurrent.CompletableFuture;
-
-
-public class NettyPlcConnectionTest implements WithAssertions {
-
-    private final ChannelFactory channelFactory = new ChannelFactory() {
-        @Override
-        public Channel createChannel(ChannelHandler channelHandler) throws PlcConnectionException {
-            return new EmbeddedChannel();
-        }
-
-        @Override
-        public void ping() {
-            // Ignore ...
-        }
-
-    };
-
-    NettyPlcConnection SUT = new NettyPlcConnection(channelFactory, true) {
-        @Override
-        protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
-            sessionSetupCompleteFuture.complete(null);
-
-            return new ChannelHandler() {
-                @Override
-                public void handlerAdded(ChannelHandlerContext ctx) {
-                }
-
-                @Override
-                public void handlerRemoved(ChannelHandlerContext ctx) {
-                }
-
-                @Override
-                public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
-                }
-            };
-        }
-
-        @Override
-        protected void sendChannelCreatedEvent() {
-            channel.pipeline().fireUserEventTriggered(new ConnectEvent());
-        }
-    };
-
-    @Test
-    public void connect() throws Exception {
-        SUT.connect();
-        Channel channel = SUT.getChannel();
-        assertThat(channel).isNotNull();
-    }
-
-    @Test
-    public void close() throws Exception {
-        SUT.close();
-    }
-
-    @Test
-    public void isConnected() {
-        SUT.isConnected();
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.base.connection;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.embedded.EmbeddedChannel;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.base.events.ConnectEvent;
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.concurrent.CompletableFuture;
+
+
+public class NettyPlcConnectionTest implements WithAssertions {
+
+    private final ChannelFactory channelFactory = new ChannelFactory() {
+        @Override
+        public Channel createChannel(ChannelHandler channelHandler) throws PlcConnectionException {
+            return new EmbeddedChannel();
+        }
+
+        @Override
+        public void ping() {
+            // Ignore ...
+        }
+
+    };
+
+    NettyPlcConnection SUT = new NettyPlcConnection(channelFactory, true) {
+        @Override
+        protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
+            sessionSetupCompleteFuture.complete(null);
+
+            return new ChannelHandler() {
+                @Override
+                public void handlerAdded(ChannelHandlerContext ctx) {
+                }
+
+                @Override
+                public void handlerRemoved(ChannelHandlerContext ctx) {
+                }
+
+                @Override
+                public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
+                }
+            };
+        }
+
+        @Override
+        protected void sendChannelCreatedEvent() {
+            channel.pipeline().fireUserEventTriggered(new ConnectEvent());
+        }
+    };
+
+    @Test
+    public void connect() throws Exception {
+        SUT.connect();
+        Channel channel = SUT.getChannel();
+        assertThat(channel).isNotNull();
+    }
+
+    @Test
+    public void close() throws Exception {
+        SUT.close();
+    }
+
+    @Test
+    public void isConnected() {
+        SUT.isConnected();
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcProprietaryRequestTest.java b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcProprietaryRequestTest.java
index f0203eac941..b2a00dd4d5b 100644
--- a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcProprietaryRequestTest.java
+++ b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcProprietaryRequestTest.java
@@ -1,48 +1,48 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-class DefaultPlcProprietaryRequestTest {
-
-    private DefaultPlcProprietaryRequest<String> SUT;
-
-    @BeforeEach
-    void setUp() {
-        SUT = new DefaultPlcProprietaryRequest<>("foo");
-    }
-
-    @Test
-    void execute() {
-        assertThrows(PlcRuntimeException.class, () -> SUT.execute());
-    }
-
-    @Test
-    void getProprietaryRequest() {
-        assertThat(SUT.getProprietaryRequest(), equalTo("foo"));
-    }
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class DefaultPlcProprietaryRequestTest {
+
+    private DefaultPlcProprietaryRequest<String> SUT;
+
+    @BeforeEach
+    void setUp() {
+        SUT = new DefaultPlcProprietaryRequest<>("foo");
+    }
+
+    @Test
+    void execute() {
+        assertThrows(PlcRuntimeException.class, () -> SUT.execute());
+    }
+
+    @Test
+    void getProprietaryRequest() {
+        assertThat(SUT.getProprietaryRequest(), equalTo("foo"));
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcProprietaryResponseTest.java b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcProprietaryResponseTest.java
index 5517e3a9294..5dcc531c1f2 100644
--- a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcProprietaryResponseTest.java
+++ b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcProprietaryResponseTest.java
@@ -1,50 +1,50 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.base.messages;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.mock;
-
-class DefaultPlcProprietaryResponseTest {
-
-    private InternalPlcProprietaryRequest request;
-    private DefaultPlcProprietaryResponse<String> SUT;
-
-    @BeforeEach
-    void setUp() {
-        request = mock(InternalPlcProprietaryRequest.class);
-        SUT = new DefaultPlcProprietaryResponse<>(request, "foo");
-    }
-
-    @Test
-    void getResponse() {
-        assertThat(SUT.getResponse(), equalTo("foo"));
-    }
-
-    @Test
-    void getRequest() {
-        assertThat(SUT.getRequest(), equalTo(request));
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.base.messages;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.mock;
+
+class DefaultPlcProprietaryResponseTest {
+
+    private InternalPlcProprietaryRequest request;
+    private DefaultPlcProprietaryResponse<String> SUT;
+
+    @BeforeEach
+    void setUp() {
+        request = mock(InternalPlcProprietaryRequest.class);
+        SUT = new DefaultPlcProprietaryResponse<>(request, "foo");
+    }
+
+    @Test
+    void getResponse() {
+        assertThat(SUT.getResponse(), equalTo("foo"));
+    }
+
+    @Test
+    void getRequest() {
+        assertThat(SUT.getRequest(), equalTo(request));
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcReadRequestTest.java b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcReadRequestTest.java
index 5bb1f30a3b0..ddf57889891 100644
--- a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcReadRequestTest.java
+++ b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcReadRequestTest.java
@@ -1,116 +1,116 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.connection.PlcFieldHandler;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.junit.Assert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-class DefaultPlcReadRequestTest {
-
-    private PlcReader reader;
-    private PlcField fooField;
-    private DefaultPlcReadRequest SUT;
-
-    @BeforeEach
-    void setUp() {
-        reader = mock(PlcReader.class);
-        fooField = mock(PlcField.class);
-        SUT = new DefaultPlcReadRequest(reader, new LinkedHashMap<>(Collections.singletonMap("foo", fooField)));
-    }
-
-    @Test
-    void execute() {
-        SUT.execute();
-    }
-
-    @Test
-    void getNumberOfFields() {
-        assertThat(SUT.getNumberOfFields(), equalTo(1));
-    }
-
-    @Test
-    void getFieldNames() {
-        LinkedHashSet<String> fieldNames = SUT.getFieldNames();
-        assertThat(fieldNames.size(), equalTo(1));
-        assertThat(fieldNames.iterator().next(), equalTo("foo"));
-    }
-
-    @Test
-    void getField() {
-        PlcField foo = SUT.getField("foo");
-        assertThat(foo, notNullValue());
-    }
-
-    @Test
-    void getFields() {
-        List<PlcField> fields = SUT.getFields();
-        assertThat(fields, notNullValue());
-        assertThat(fields.size(), equalTo(1));
-        PlcField field = fields.iterator().next();
-        assertThat(field, equalTo(fooField));
-    }
-
-    @Test
-    void getNamedFields() {
-        List<Pair<String, PlcField>> namedFields = SUT.getNamedFields();
-        assertThat(namedFields, notNullValue());
-        assertThat(namedFields.size(), equalTo(1));
-        Pair<String, PlcField> entry = namedFields.iterator().next();
-        assertThat(entry.getKey(), equalTo("foo"));
-        assertThat(entry.getValue(), equalTo(fooField));
-    }
-
-    @Test
-    void getReader() {
-        assertThat(SUT.getReader(), equalTo(reader));
-    }
-
-    @Test
-    void builder() {
-        PlcFieldHandler fieldHandler = mock(PlcFieldHandler.class);
-        when(fieldHandler.createField(anyString())).thenReturn(mock(PlcField.class));
-        DefaultPlcReadRequest.Builder builder = new DefaultPlcReadRequest.Builder(reader, fieldHandler);
-        builder.addItem("foo", "bar");
-        assertThrows(PlcRuntimeException.class, () -> builder.addItem("foo", "bar"));
-        PlcReadRequest readRequest = builder.build();
-        assertThat(readRequest, notNullValue());
-        assertThat(readRequest.getNumberOfFields(), equalTo(1));
-        assertThat(readRequest.getField("foo"), notNullValue());
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.connection.PlcFieldHandler;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class DefaultPlcReadRequestTest {
+
+    private PlcReader reader;
+    private PlcField fooField;
+    private DefaultPlcReadRequest SUT;
+
+    @BeforeEach
+    void setUp() {
+        reader = mock(PlcReader.class);
+        fooField = mock(PlcField.class);
+        SUT = new DefaultPlcReadRequest(reader, new LinkedHashMap<>(Collections.singletonMap("foo", fooField)));
+    }
+
+    @Test
+    void execute() {
+        SUT.execute();
+    }
+
+    @Test
+    void getNumberOfFields() {
+        assertThat(SUT.getNumberOfFields(), equalTo(1));
+    }
+
+    @Test
+    void getFieldNames() {
+        LinkedHashSet<String> fieldNames = SUT.getFieldNames();
+        assertThat(fieldNames.size(), equalTo(1));
+        assertThat(fieldNames.iterator().next(), equalTo("foo"));
+    }
+
+    @Test
+    void getField() {
+        PlcField foo = SUT.getField("foo");
+        assertThat(foo, notNullValue());
+    }
+
+    @Test
+    void getFields() {
+        List<PlcField> fields = SUT.getFields();
+        assertThat(fields, notNullValue());
+        assertThat(fields.size(), equalTo(1));
+        PlcField field = fields.iterator().next();
+        assertThat(field, equalTo(fooField));
+    }
+
+    @Test
+    void getNamedFields() {
+        List<Pair<String, PlcField>> namedFields = SUT.getNamedFields();
+        assertThat(namedFields, notNullValue());
+        assertThat(namedFields.size(), equalTo(1));
+        Pair<String, PlcField> entry = namedFields.iterator().next();
+        assertThat(entry.getKey(), equalTo("foo"));
+        assertThat(entry.getValue(), equalTo(fooField));
+    }
+
+    @Test
+    void getReader() {
+        assertThat(SUT.getReader(), equalTo(reader));
+    }
+
+    @Test
+    void builder() {
+        PlcFieldHandler fieldHandler = mock(PlcFieldHandler.class);
+        when(fieldHandler.createField(anyString())).thenReturn(mock(PlcField.class));
+        DefaultPlcReadRequest.Builder builder = new DefaultPlcReadRequest.Builder(reader, fieldHandler);
+        builder.addItem("foo", "bar");
+        assertThrows(PlcRuntimeException.class, () -> builder.addItem("foo", "bar"));
+        PlcReadRequest readRequest = builder.build();
+        assertThat(readRequest, notNullValue());
+        assertThat(readRequest.getNumberOfFields(), equalTo(1));
+        assertThat(readRequest.getField("foo"), notNullValue());
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcReadResponseTest.java b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcReadResponseTest.java
index 223390e682e..2c9a011269c 100644
--- a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcReadResponseTest.java
+++ b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcReadResponseTest.java
@@ -1,120 +1,120 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-import org.apache.plc4x.java.base.messages.items.DefaultByteArrayFieldItem;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.junit.Assert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-@ExtendWith(MockitoExtension.class)
-class DefaultPlcReadResponseTest {
-
-    @Mock
-    private InternalPlcReadRequest request;
-    private DefaultPlcReadResponse SUT;
-
-    @BeforeEach
-    void setUp() {
-        Byte[] data = new Byte[] {(byte) 0x42, (byte) 0x23};
-        Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> fields = new HashMap<>();
-        fields.put("foo", new ImmutablePair<>(PlcResponseCode.OK, new DefaultByteArrayFieldItem(data)));
-        fields.put("bar", new ImmutablePair<>(PlcResponseCode.NOT_FOUND, new DefaultByteArrayFieldItem(data)));
-        SUT = new DefaultPlcReadResponse(request, fields);
-    }
-
-    @Test
-    void getRequest() {
-        assertThat(SUT.getRequest(), equalTo(request));
-    }
-
-    @Test
-    void getField() {
-        when(request.getField("foo")).thenReturn(mock(PlcField.class));
-        PlcField field = SUT.getField("foo");
-        assertThat(field, notNullValue());
-    }
-
-    @Test
-    void getResponseCodeForNonexistentField() {
-        assertThrows(PlcInvalidFieldException.class, () -> SUT.getResponseCode("hurz"));
-    }
-
-    @Test
-    void isValidByteArray() {
-        boolean valid = SUT.isValidByteArray("foo");
-        assertThat(valid, equalTo(true));
-    }
-
-    @Test
-    void checkInvalidField() {
-        assertThrows(PlcInvalidFieldException.class, () -> SUT.isValidByteArray("hurz"));
-    }
-
-    @Test
-    void checkNonOkResponseCode() {
-        assertThrows(PlcRuntimeException.class, () -> SUT.isValidByteArray("bar"));
-    }
-
-    @Test
-    void isValidByteArrayWithIndex() {
-        boolean valid = SUT.isValidByteArray("foo", 0);
-        assertThat(valid, equalTo(true));
-    }
-
-    @Test
-    void getByteArray() {
-        Byte[] data = SUT.getByteArray("foo");
-        assertThat(data, notNullValue());
-    }
-
-    @Test
-    void getByteArrayWithIndex() {
-        Byte[] data = SUT.getByteArray("foo", 0);
-        assertThat(data, notNullValue());
-    }
-
-    @Test
-    void getAllByteArrays() {
-        Collection<Byte[]> byteArrays = SUT.getAllByteArrays("foo");
-        assertThat(byteArrays, notNullValue());
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+import org.apache.plc4x.java.base.messages.items.DefaultByteArrayFieldItem;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class DefaultPlcReadResponseTest {
+
+    @Mock
+    private InternalPlcReadRequest request;
+    private DefaultPlcReadResponse SUT;
+
+    @BeforeEach
+    void setUp() {
+        Byte[] data = new Byte[] {(byte) 0x42, (byte) 0x23};
+        Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> fields = new HashMap<>();
+        fields.put("foo", new ImmutablePair<>(PlcResponseCode.OK, new DefaultByteArrayFieldItem(data)));
+        fields.put("bar", new ImmutablePair<>(PlcResponseCode.NOT_FOUND, new DefaultByteArrayFieldItem(data)));
+        SUT = new DefaultPlcReadResponse(request, fields);
+    }
+
+    @Test
+    void getRequest() {
+        assertThat(SUT.getRequest(), equalTo(request));
+    }
+
+    @Test
+    void getField() {
+        when(request.getField("foo")).thenReturn(mock(PlcField.class));
+        PlcField field = SUT.getField("foo");
+        assertThat(field, notNullValue());
+    }
+
+    @Test
+    void getResponseCodeForNonexistentField() {
+        assertThrows(PlcInvalidFieldException.class, () -> SUT.getResponseCode("hurz"));
+    }
+
+    @Test
+    void isValidByteArray() {
+        boolean valid = SUT.isValidByteArray("foo");
+        assertThat(valid, equalTo(true));
+    }
+
+    @Test
+    void checkInvalidField() {
+        assertThrows(PlcInvalidFieldException.class, () -> SUT.isValidByteArray("hurz"));
+    }
+
+    @Test
+    void checkNonOkResponseCode() {
+        assertThrows(PlcRuntimeException.class, () -> SUT.isValidByteArray("bar"));
+    }
+
+    @Test
+    void isValidByteArrayWithIndex() {
+        boolean valid = SUT.isValidByteArray("foo", 0);
+        assertThat(valid, equalTo(true));
+    }
+
+    @Test
+    void getByteArray() {
+        Byte[] data = SUT.getByteArray("foo");
+        assertThat(data, notNullValue());
+    }
+
+    @Test
+    void getByteArrayWithIndex() {
+        Byte[] data = SUT.getByteArray("foo", 0);
+        assertThat(data, notNullValue());
+    }
+
+    @Test
+    void getAllByteArrays() {
+        Collection<Byte[]> byteArrays = SUT.getAllByteArrays("foo");
+        assertThat(byteArrays, notNullValue());
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionEventTest.java b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionEventTest.java
index e244247edc3..2495f151484 100644
--- a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionEventTest.java
+++ b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionEventTest.java
@@ -1,68 +1,68 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-import org.apache.plc4x.java.base.messages.items.DefaultByteFieldItem;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.time.Instant;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.junit.Assert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-class DefaultPlcSubscriptionEventTest {
-
-    private DefaultPlcSubscriptionEvent SUT;
-
-    @BeforeEach
-    void setUp() {
-        Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> fields = new HashMap<>();
-        fields.put("foo", new ImmutablePair<>(PlcResponseCode.OK, new DefaultByteFieldItem((byte) 0x42)));
-        SUT = new DefaultPlcSubscriptionEvent(Instant.now(), fields);
-    }
-
-    @Test
-    void getFieldNames() {
-        assertThat(SUT.getFieldNames(), notNullValue());
-        assertThat(SUT.getFieldNames().size(), equalTo(1));
-        assertThat(SUT.getFieldNames().iterator().next(), equalTo("foo"));
-    }
-
-    @Test
-    void getField() {
-        assertThrows(UnsupportedOperationException.class, () -> SUT.getField("foo"));
-    }
-
-    @Test
-    void getTimestamp() {
-        Instant timestamp = SUT.getTimestamp();
-        assertThat(timestamp, notNullValue());
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+import org.apache.plc4x.java.base.messages.items.DefaultByteFieldItem;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class DefaultPlcSubscriptionEventTest {
+
+    private DefaultPlcSubscriptionEvent SUT;
+
+    @BeforeEach
+    void setUp() {
+        Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> fields = new HashMap<>();
+        fields.put("foo", new ImmutablePair<>(PlcResponseCode.OK, new DefaultByteFieldItem((byte) 0x42)));
+        SUT = new DefaultPlcSubscriptionEvent(Instant.now(), fields);
+    }
+
+    @Test
+    void getFieldNames() {
+        assertThat(SUT.getFieldNames(), notNullValue());
+        assertThat(SUT.getFieldNames().size(), equalTo(1));
+        assertThat(SUT.getFieldNames().iterator().next(), equalTo("foo"));
+    }
+
+    @Test
+    void getField() {
+        assertThrows(UnsupportedOperationException.class, () -> SUT.getField("foo"));
+    }
+
+    @Test
+    void getTimestamp() {
+        Instant timestamp = SUT.getTimestamp();
+        assertThat(timestamp, notNullValue());
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionRequestTest.java b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionRequestTest.java
index 484c33edf2a..446813ae246 100644
--- a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionRequestTest.java
+++ b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionRequestTest.java
@@ -1,157 +1,157 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.connection.PlcFieldHandler;
-import org.apache.plc4x.java.base.model.SubscriptionPlcField;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.hamcrest.core.IsNull.nullValue;
-import static org.junit.Assert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-class DefaultPlcSubscriptionRequestTest {
-
-    private PlcSubscriber subscriber;
-    private PlcField fooField;
-    private SubscriptionPlcField fooSubscriptionField;
-    private DefaultPlcSubscriptionRequest SUT;
-
-    @BeforeEach
-    void setUp() {
-        subscriber = mock(PlcSubscriber.class);
-        fooField = mock(PlcField.class);
-        fooSubscriptionField = mock(SubscriptionPlcField.class);
-        when(fooSubscriptionField.getPlcField()).thenReturn(fooField);
-        SUT = new DefaultPlcSubscriptionRequest(
-            subscriber, new LinkedHashMap<>(Collections.singletonMap("foo", fooSubscriptionField)));
-    }
-
-    @Test
-    void execute() {
-        SUT.execute();
-    }
-
-    @Test
-    void getNumberOfFields() {
-        assertThat(SUT.getNumberOfFields(), equalTo(1));
-    }
-
-    @Test
-    void getFieldNames() {
-        LinkedHashSet<String> fieldNames = SUT.getFieldNames();
-        assertThat(fieldNames.size(), equalTo(1));
-        assertThat(fieldNames.iterator().next(), equalTo("foo"));
-    }
-
-    @Test
-    void getField() {
-        PlcField foo = SUT.getField("foo");
-        assertThat(foo, notNullValue());
-        PlcField bar = SUT.getField("bar");
-        assertThat(bar, nullValue());
-    }
-
-    @Test
-    void getFields() {
-        List<PlcField> fields = SUT.getFields();
-        assertThat(fields, notNullValue());
-        assertThat(fields.size(), equalTo(1));
-        PlcField field = fields.iterator().next();
-        assertThat(field, equalTo(fooField));
-    }
-
-    @Test
-    void getSubscriptionFields() {
-        List<SubscriptionPlcField> fields = SUT.getSubscriptionFields();
-        assertThat(fields, notNullValue());
-        assertThat(fields.size(), equalTo(1));
-        SubscriptionPlcField field = fields.iterator().next();
-        assertThat(field, equalTo(fooSubscriptionField));
-    }
-
-    @Test
-    void getSubscriptionPlcFieldMap() {
-        LinkedHashMap<String, SubscriptionPlcField> map = SUT.getSubscriptionPlcFieldMap();
-        assertThat(map, notNullValue());
-        assertThat(map.size(), equalTo(1));
-        assertThat(map.get("foo"), equalTo(fooSubscriptionField));
-    }
-
-    @Test
-    void getNamedFields() {
-        List<Pair<String, PlcField>> namedFields = SUT.getNamedFields();
-        assertThat(namedFields, notNullValue());
-        assertThat(namedFields.size(), equalTo(1));
-        Pair<String, PlcField> entry = namedFields.iterator().next();
-        assertThat(entry.getKey(), equalTo("foo"));
-        assertThat(entry.getValue(), equalTo(fooField));
-    }
-
-    @Test
-    void getNamedSubscriptionFields() {
-        List<Pair<String, SubscriptionPlcField>> namedFields = SUT.getNamedSubscriptionFields();
-        assertThat(namedFields, notNullValue());
-        assertThat(namedFields.size(), equalTo(1));
-        Pair<String, SubscriptionPlcField> entry = namedFields.iterator().next();
-        assertThat(entry.getKey(), equalTo("foo"));
-        assertThat(entry.getValue(), equalTo(fooSubscriptionField));
-    }
-
-    @Test
-    void getSubscriber() {
-        assertThat(SUT.getSubscriber(), equalTo(subscriber));
-    }
-
-    @Test
-    void builder() {
-        PlcFieldHandler fieldHandler = mock(PlcFieldHandler.class);
-        when(fieldHandler.createField(anyString())).thenReturn(mock(PlcField.class));
-        DefaultPlcSubscriptionRequest.Builder builder = new DefaultPlcSubscriptionRequest.Builder(subscriber, fieldHandler);
-        builder.addChangeOfStateField("state", "bar");
-        builder.addCyclicField("cyclic", "bar", Duration.of(3, ChronoUnit.SECONDS));
-        builder.addEventField("event", "bar");
-        assertThrows(PlcRuntimeException.class, () -> builder.addEventField("event", "bar"));
-        PlcSubscriptionRequest subscriptionRequest = builder.build();
-        assertThat(subscriptionRequest, notNullValue());
-        assertThat(subscriptionRequest.getNumberOfFields(), equalTo(3));
-        assertThat(subscriptionRequest.getField("state"), notNullValue());
-        assertThat(subscriptionRequest.getField("cyclic"), notNullValue());
-        assertThat(subscriptionRequest.getField("event"), notNullValue());
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.connection.PlcFieldHandler;
+import org.apache.plc4x.java.base.model.SubscriptionPlcField;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.hamcrest.core.IsNull.nullValue;
+import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class DefaultPlcSubscriptionRequestTest {
+
+    private PlcSubscriber subscriber;
+    private PlcField fooField;
+    private SubscriptionPlcField fooSubscriptionField;
+    private DefaultPlcSubscriptionRequest SUT;
+
+    @BeforeEach
+    void setUp() {
+        subscriber = mock(PlcSubscriber.class);
+        fooField = mock(PlcField.class);
+        fooSubscriptionField = mock(SubscriptionPlcField.class);
+        when(fooSubscriptionField.getPlcField()).thenReturn(fooField);
+        SUT = new DefaultPlcSubscriptionRequest(
+            subscriber, new LinkedHashMap<>(Collections.singletonMap("foo", fooSubscriptionField)));
+    }
+
+    @Test
+    void execute() {
+        SUT.execute();
+    }
+
+    @Test
+    void getNumberOfFields() {
+        assertThat(SUT.getNumberOfFields(), equalTo(1));
+    }
+
+    @Test
+    void getFieldNames() {
+        LinkedHashSet<String> fieldNames = SUT.getFieldNames();
+        assertThat(fieldNames.size(), equalTo(1));
+        assertThat(fieldNames.iterator().next(), equalTo("foo"));
+    }
+
+    @Test
+    void getField() {
+        PlcField foo = SUT.getField("foo");
+        assertThat(foo, notNullValue());
+        PlcField bar = SUT.getField("bar");
+        assertThat(bar, nullValue());
+    }
+
+    @Test
+    void getFields() {
+        List<PlcField> fields = SUT.getFields();
+        assertThat(fields, notNullValue());
+        assertThat(fields.size(), equalTo(1));
+        PlcField field = fields.iterator().next();
+        assertThat(field, equalTo(fooField));
+    }
+
+    @Test
+    void getSubscriptionFields() {
+        List<SubscriptionPlcField> fields = SUT.getSubscriptionFields();
+        assertThat(fields, notNullValue());
+        assertThat(fields.size(), equalTo(1));
+        SubscriptionPlcField field = fields.iterator().next();
+        assertThat(field, equalTo(fooSubscriptionField));
+    }
+
+    @Test
+    void getSubscriptionPlcFieldMap() {
+        LinkedHashMap<String, SubscriptionPlcField> map = SUT.getSubscriptionPlcFieldMap();
+        assertThat(map, notNullValue());
+        assertThat(map.size(), equalTo(1));
+        assertThat(map.get("foo"), equalTo(fooSubscriptionField));
+    }
+
+    @Test
+    void getNamedFields() {
+        List<Pair<String, PlcField>> namedFields = SUT.getNamedFields();
+        assertThat(namedFields, notNullValue());
+        assertThat(namedFields.size(), equalTo(1));
+        Pair<String, PlcField> entry = namedFields.iterator().next();
+        assertThat(entry.getKey(), equalTo("foo"));
+        assertThat(entry.getValue(), equalTo(fooField));
+    }
+
+    @Test
+    void getNamedSubscriptionFields() {
+        List<Pair<String, SubscriptionPlcField>> namedFields = SUT.getNamedSubscriptionFields();
+        assertThat(namedFields, notNullValue());
+        assertThat(namedFields.size(), equalTo(1));
+        Pair<String, SubscriptionPlcField> entry = namedFields.iterator().next();
+        assertThat(entry.getKey(), equalTo("foo"));
+        assertThat(entry.getValue(), equalTo(fooSubscriptionField));
+    }
+
+    @Test
+    void getSubscriber() {
+        assertThat(SUT.getSubscriber(), equalTo(subscriber));
+    }
+
+    @Test
+    void builder() {
+        PlcFieldHandler fieldHandler = mock(PlcFieldHandler.class);
+        when(fieldHandler.createField(anyString())).thenReturn(mock(PlcField.class));
+        DefaultPlcSubscriptionRequest.Builder builder = new DefaultPlcSubscriptionRequest.Builder(subscriber, fieldHandler);
+        builder.addChangeOfStateField("state", "bar");
+        builder.addCyclicField("cyclic", "bar", Duration.of(3, ChronoUnit.SECONDS));
+        builder.addEventField("event", "bar");
+        assertThrows(PlcRuntimeException.class, () -> builder.addEventField("event", "bar"));
+        PlcSubscriptionRequest subscriptionRequest = builder.build();
+        assertThat(subscriptionRequest, notNullValue());
+        assertThat(subscriptionRequest.getNumberOfFields(), equalTo(3));
+        assertThat(subscriptionRequest.getField("state"), notNullValue());
+        assertThat(subscriptionRequest.getField("cyclic"), notNullValue());
+        assertThat(subscriptionRequest.getField("event"), notNullValue());
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionResponseTest.java b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionResponseTest.java
index 7916bda31cf..159ec95c520 100644
--- a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionResponseTest.java
+++ b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionResponseTest.java
@@ -1,124 +1,124 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.exceptions.PlcNotImplementedException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
-import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.hamcrest.core.IsNull.nullValue;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
-
-class DefaultPlcSubscriptionResponseTest {
-
-    private InternalPlcSubscriptionRequest mockRequest;
-    private PlcSubscriptionHandle mockSubscriptionHandle;
-    private Map<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> mockValues;
-    private DefaultPlcSubscriptionResponse SUT;
-
-    @BeforeEach
-    @SuppressWarnings("unchecked")
-    void setUp() {
-        mockRequest = mock(InternalPlcSubscriptionRequest.class);
-        mockSubscriptionHandle = mock(PlcSubscriptionHandle.class);
-        mockValues = new HashMap<>();
-        mockValues.put("foo", new ImmutablePair(PlcResponseCode.OK, mockSubscriptionHandle));
-        mockValues.put("bar", new ImmutablePair(PlcResponseCode.NOT_FOUND, mock(PlcSubscriptionHandle.class)));
-        SUT = new DefaultPlcSubscriptionResponse(mockRequest, mockValues);
-    }
-
-    @Test
-    void getSubscriptionHandle() {
-        PlcSubscriptionHandle foo = SUT.getSubscriptionHandle("foo");
-        assertThat(foo, equalTo(mockSubscriptionHandle));
-        assertThrows(PlcRuntimeException.class, () -> SUT.getSubscriptionHandle("bar"));
-        assertThat(SUT.getSubscriptionHandle("hurz"), nullValue());
-    }
-
-    @Test
-    void getFieldNames() {
-        Collection<String> fieldNames = SUT.getFieldNames();
-        assertThat(fieldNames, notNullValue());
-        assertThat(fieldNames.size(), equalTo(2));
-        for (String fieldName : fieldNames) {
-            if(!"foo".equals(fieldName) && !"bar".equals(fieldName)) {
-                fail();
-            }
-        }
-    }
-
-    @Test
-    void getField() {
-        assertThrows(PlcNotImplementedException.class, () -> SUT.getField("foo"));
-    }
-
-    @Test
-    void getResponseCode() {
-        PlcResponseCode responseCode = SUT.getResponseCode("foo");
-        assertThat(responseCode, notNullValue());
-        assertThat(responseCode, equalTo(PlcResponseCode.OK));
-
-        responseCode = SUT.getResponseCode("hurz");
-        assertThat(responseCode, nullValue());
-    }
-
-    @Test
-    void getRequest() {
-        PlcSubscriptionRequest request = SUT.getRequest();
-        assertThat(request, equalTo(mockRequest));
-    }
-
-    @Test
-    void getSubscriptionHandles() {
-        Collection<PlcSubscriptionHandle> subscriptionHandles = SUT.getSubscriptionHandles();
-        assertThat(subscriptionHandles, notNullValue());
-        assertThat(subscriptionHandles.size(), equalTo(2));
-        boolean found = false;
-        for (PlcSubscriptionHandle subscriptionHandle : subscriptionHandles) {
-            if(subscriptionHandle.equals(mockSubscriptionHandle)) {
-                found = true;
-            }
-        }
-        assertThat(found, equalTo(true));
-    }
-
-    @Test
-    void getValues() {
-        Map<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> values = SUT.getValues();
-        assertThat(values, notNullValue());
-        assertThat(values, equalTo(mockValues));
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.exceptions.PlcNotImplementedException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.hamcrest.core.IsNull.nullValue;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+
+class DefaultPlcSubscriptionResponseTest {
+
+    private InternalPlcSubscriptionRequest mockRequest;
+    private PlcSubscriptionHandle mockSubscriptionHandle;
+    private Map<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> mockValues;
+    private DefaultPlcSubscriptionResponse SUT;
+
+    @BeforeEach
+    @SuppressWarnings("unchecked")
+    void setUp() {
+        mockRequest = mock(InternalPlcSubscriptionRequest.class);
+        mockSubscriptionHandle = mock(PlcSubscriptionHandle.class);
+        mockValues = new HashMap<>();
+        mockValues.put("foo", new ImmutablePair(PlcResponseCode.OK, mockSubscriptionHandle));
+        mockValues.put("bar", new ImmutablePair(PlcResponseCode.NOT_FOUND, mock(PlcSubscriptionHandle.class)));
+        SUT = new DefaultPlcSubscriptionResponse(mockRequest, mockValues);
+    }
+
+    @Test
+    void getSubscriptionHandle() {
+        PlcSubscriptionHandle foo = SUT.getSubscriptionHandle("foo");
+        assertThat(foo, equalTo(mockSubscriptionHandle));
+        assertThrows(PlcRuntimeException.class, () -> SUT.getSubscriptionHandle("bar"));
+        assertThat(SUT.getSubscriptionHandle("hurz"), nullValue());
+    }
+
+    @Test
+    void getFieldNames() {
+        Collection<String> fieldNames = SUT.getFieldNames();
+        assertThat(fieldNames, notNullValue());
+        assertThat(fieldNames.size(), equalTo(2));
+        for (String fieldName : fieldNames) {
+            if(!"foo".equals(fieldName) && !"bar".equals(fieldName)) {
+                fail();
+            }
+        }
+    }
+
+    @Test
+    void getField() {
+        assertThrows(PlcNotImplementedException.class, () -> SUT.getField("foo"));
+    }
+
+    @Test
+    void getResponseCode() {
+        PlcResponseCode responseCode = SUT.getResponseCode("foo");
+        assertThat(responseCode, notNullValue());
+        assertThat(responseCode, equalTo(PlcResponseCode.OK));
+
+        responseCode = SUT.getResponseCode("hurz");
+        assertThat(responseCode, nullValue());
+    }
+
+    @Test
+    void getRequest() {
+        PlcSubscriptionRequest request = SUT.getRequest();
+        assertThat(request, equalTo(mockRequest));
+    }
+
+    @Test
+    void getSubscriptionHandles() {
+        Collection<PlcSubscriptionHandle> subscriptionHandles = SUT.getSubscriptionHandles();
+        assertThat(subscriptionHandles, notNullValue());
+        assertThat(subscriptionHandles.size(), equalTo(2));
+        boolean found = false;
+        for (PlcSubscriptionHandle subscriptionHandle : subscriptionHandles) {
+            if(subscriptionHandle.equals(mockSubscriptionHandle)) {
+                found = true;
+            }
+        }
+        assertThat(found, equalTo(true));
+    }
+
+    @Test
+    void getValues() {
+        Map<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> values = SUT.getValues();
+        assertThat(values, notNullValue());
+        assertThat(values, equalTo(mockValues));
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionRequestTest.java b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionRequestTest.java
index e9883daa24f..21f88aea38d 100644
--- a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionRequestTest.java
+++ b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionRequestTest.java
@@ -1,91 +1,91 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
-import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
-import org.junit.Assert;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
-
-@ExtendWith(MockitoExtension.class)
-class DefaultPlcUnsubscriptionRequestTest {
-
-    @Mock
-    private PlcSubscriber subscriber;
-    @Mock
-    private InternalPlcSubscriptionHandle subscriptionHandle;
-    private DefaultPlcUnsubscriptionRequest SUT;
-
-    @BeforeEach
-    void setUp() {
-        SUT = new DefaultPlcUnsubscriptionRequest(subscriber, Collections.singletonList(subscriptionHandle));
-    }
-
-    @Test
-    void execute() {
-        SUT.execute();
-        verify(subscriber, times(1)).unsubscribe(any());
-    }
-
-    @Test
-    void getInternalPlcSubscriptionHandles() {
-        Collection<? extends InternalPlcSubscriptionHandle> handles = SUT.getInternalPlcSubscriptionHandles();
-        assertThat(handles, notNullValue());
-        assertThat(handles.size(), equalTo(1));
-        assertThat(handles.iterator().next(), equalTo(subscriptionHandle));
-    }
-
-    @Test
-    void builder() {
-        DefaultPlcUnsubscriptionRequest.Builder builder = new DefaultPlcUnsubscriptionRequest.Builder(subscriber);
-        builder.addHandles(subscriptionHandle);
-        PlcUnsubscriptionRequest unsubscriptionRequest = builder.build();
-        Assert.assertThat(unsubscriptionRequest, notNullValue());
-
-        InternalPlcSubscriptionHandle secondHandle = mock(InternalPlcSubscriptionHandle.class);
-        InternalPlcSubscriptionHandle thirdHandle = mock(InternalPlcSubscriptionHandle.class);
-
-        builder = new DefaultPlcUnsubscriptionRequest.Builder(subscriber);
-        builder.addHandles(subscriptionHandle, secondHandle, thirdHandle);
-        unsubscriptionRequest = builder.build();
-        Assert.assertThat(unsubscriptionRequest, notNullValue());
-
-        builder = new DefaultPlcUnsubscriptionRequest.Builder(subscriber);
-        builder.addHandles(Arrays.asList(subscriptionHandle, secondHandle, thirdHandle));
-        unsubscriptionRequest = builder.build();
-        Assert.assertThat(unsubscriptionRequest, notNullValue());
-    }
-
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
+import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
+import org.junit.Assert;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class DefaultPlcUnsubscriptionRequestTest {
+
+    @Mock
+    private PlcSubscriber subscriber;
+    @Mock
+    private InternalPlcSubscriptionHandle subscriptionHandle;
+    private DefaultPlcUnsubscriptionRequest SUT;
+
+    @BeforeEach
+    void setUp() {
+        SUT = new DefaultPlcUnsubscriptionRequest(subscriber, Collections.singletonList(subscriptionHandle));
+    }
+
+    @Test
+    void execute() {
+        SUT.execute();
+        verify(subscriber, times(1)).unsubscribe(any());
+    }
+
+    @Test
+    void getInternalPlcSubscriptionHandles() {
+        Collection<? extends InternalPlcSubscriptionHandle> handles = SUT.getInternalPlcSubscriptionHandles();
+        assertThat(handles, notNullValue());
+        assertThat(handles.size(), equalTo(1));
+        assertThat(handles.iterator().next(), equalTo(subscriptionHandle));
+    }
+
+    @Test
+    void builder() {
+        DefaultPlcUnsubscriptionRequest.Builder builder = new DefaultPlcUnsubscriptionRequest.Builder(subscriber);
+        builder.addHandles(subscriptionHandle);
+        PlcUnsubscriptionRequest unsubscriptionRequest = builder.build();
+        Assert.assertThat(unsubscriptionRequest, notNullValue());
+
+        InternalPlcSubscriptionHandle secondHandle = mock(InternalPlcSubscriptionHandle.class);
+        InternalPlcSubscriptionHandle thirdHandle = mock(InternalPlcSubscriptionHandle.class);
+
+        builder = new DefaultPlcUnsubscriptionRequest.Builder(subscriber);
+        builder.addHandles(subscriptionHandle, secondHandle, thirdHandle);
+        unsubscriptionRequest = builder.build();
+        Assert.assertThat(unsubscriptionRequest, notNullValue());
+
+        builder = new DefaultPlcUnsubscriptionRequest.Builder(subscriber);
+        builder.addHandles(Arrays.asList(subscriptionHandle, secondHandle, thirdHandle));
+        unsubscriptionRequest = builder.build();
+        Assert.assertThat(unsubscriptionRequest, notNullValue());
+    }
+
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionResponseTest.java b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionResponseTest.java
index 8e681487b0e..9486bc95bdb 100644
--- a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionResponseTest.java
+++ b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionResponseTest.java
@@ -1,48 +1,48 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.base.messages;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-
-@ExtendWith(MockitoExtension.class)
-class DefaultPlcUnsubscriptionResponseTest {
-
-    @Mock
-    private InternalPlcUnsubscriptionRequest request;
-    private DefaultPlcUnsubscriptionResponse SUT;
-
-    @BeforeEach
-    void setUp() {
-        SUT = new DefaultPlcUnsubscriptionResponse(request);
-    }
-
-    @Test
-    void getRequest() {
-        assertThat(SUT.getRequest(), equalTo(request));
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.base.messages;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+
+@ExtendWith(MockitoExtension.class)
+class DefaultPlcUnsubscriptionResponseTest {
+
+    @Mock
+    private InternalPlcUnsubscriptionRequest request;
+    private DefaultPlcUnsubscriptionResponse SUT;
+
+    @BeforeEach
+    void setUp() {
+        SUT = new DefaultPlcUnsubscriptionResponse(request);
+    }
+
+    @Test
+    void getRequest() {
+        assertThat(SUT.getRequest(), equalTo(request));
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequestTest.java b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequestTest.java
index cdf7c7f6c9e..19641aec2cb 100644
--- a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequestTest.java
+++ b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequestTest.java
@@ -1,70 +1,70 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.base.messages;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-class DefaultPlcWriteRequestTest {
-
-    @BeforeEach
-    void setUp() {
-    }
-
-    @Test
-    void execute() {
-    }
-
-    @Test
-    void getNumberOfFields() {
-    }
-
-    @Test
-    void getFieldNames() {
-    }
-
-    @Test
-    void getField() {
-    }
-
-    @Test
-    void getFields() {
-    }
-
-    @Test
-    void getFieldItem() {
-    }
-
-    @Test
-    void getFieldItems() {
-    }
-
-    @Test
-    void getNamedFields() {
-    }
-
-    @Test
-    void getNamedFieldTriples() {
-    }
-
-    @Test
-    void getNumberOfValues() {
-    }
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.base.messages;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class DefaultPlcWriteRequestTest {
+
+    @BeforeEach
+    void setUp() {
+    }
+
+    @Test
+    void execute() {
+    }
+
+    @Test
+    void getNumberOfFields() {
+    }
+
+    @Test
+    void getFieldNames() {
+    }
+
+    @Test
+    void getField() {
+    }
+
+    @Test
+    void getFields() {
+    }
+
+    @Test
+    void getFieldItem() {
+    }
+
+    @Test
+    void getFieldItems() {
+    }
+
+    @Test
+    void getNamedFields() {
+    }
+
+    @Test
+    void getNamedFieldTriples() {
+    }
+
+    @Test
+    void getNumberOfValues() {
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteResponseTest.java b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteResponseTest.java
index 3776c9cabde..5900d7f02cf 100644
--- a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteResponseTest.java
+++ b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteResponseTest.java
@@ -1,91 +1,91 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.Map;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-@ExtendWith(MockitoExtension.class)
-class DefaultPlcWriteResponseTest {
-
-    @Mock
-    private InternalPlcWriteRequest request;
-    private DefaultPlcWriteResponse SUT;
-
-    @BeforeEach
-    void setUp() {
-        SUT = new DefaultPlcWriteResponse(request, Collections.singletonMap("foo", PlcResponseCode.OK));
-    }
-
-    @Test
-    void getValues() {
-        Map<String, PlcResponseCode> values = SUT.getValues();
-        assertThat(values, notNullValue());
-        assertThat(values.size(), equalTo(1));
-        assertThat(values.keySet().iterator().next(), equalTo("foo"));
-        assertThat(values.values().iterator().next(), equalTo(PlcResponseCode.OK));
-    }
-
-    @Test
-    void getRequest() {
-        InternalPlcWriteRequest actRequest = SUT.getRequest();
-        assertThat(actRequest, equalTo(request));
-    }
-
-    @Test
-    void getFieldNames() {
-        when(request.getFieldNames()).thenReturn(new LinkedHashSet<>(Collections.singletonList("foo")));
-        Collection<String> fieldNames = SUT.getFieldNames();
-        assertThat(fieldNames, notNullValue());
-        assertThat(fieldNames.size(), equalTo(1));
-        assertThat(fieldNames.iterator().next(), equalTo("foo"));
-    }
-
-    @Test
-    void getField() {
-        when(request.getField("foo")).thenReturn(mock(PlcField.class));
-        PlcField field = SUT.getField("foo");
-        assertThat(field, notNullValue());
-    }
-
-    @Test
-    void getResponseCode() {
-        PlcResponseCode responseCode = SUT.getResponseCode("foo");
-        assertThat(responseCode, notNullValue());
-        assertThat(responseCode, equalTo(PlcResponseCode.OK));
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Map;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class DefaultPlcWriteResponseTest {
+
+    @Mock
+    private InternalPlcWriteRequest request;
+    private DefaultPlcWriteResponse SUT;
+
+    @BeforeEach
+    void setUp() {
+        SUT = new DefaultPlcWriteResponse(request, Collections.singletonMap("foo", PlcResponseCode.OK));
+    }
+
+    @Test
+    void getValues() {
+        Map<String, PlcResponseCode> values = SUT.getValues();
+        assertThat(values, notNullValue());
+        assertThat(values.size(), equalTo(1));
+        assertThat(values.keySet().iterator().next(), equalTo("foo"));
+        assertThat(values.values().iterator().next(), equalTo(PlcResponseCode.OK));
+    }
+
+    @Test
+    void getRequest() {
+        InternalPlcWriteRequest actRequest = SUT.getRequest();
+        assertThat(actRequest, equalTo(request));
+    }
+
+    @Test
+    void getFieldNames() {
+        when(request.getFieldNames()).thenReturn(new LinkedHashSet<>(Collections.singletonList("foo")));
+        Collection<String> fieldNames = SUT.getFieldNames();
+        assertThat(fieldNames, notNullValue());
+        assertThat(fieldNames.size(), equalTo(1));
+        assertThat(fieldNames.iterator().next(), equalTo("foo"));
+    }
+
+    @Test
+    void getField() {
+        when(request.getField("foo")).thenReturn(mock(PlcField.class));
+        PlcField field = SUT.getField("foo");
+        assertThat(field, notNullValue());
+    }
+
+    @Test
+    void getResponseCode() {
+        PlcResponseCode responseCode = SUT.getResponseCode("foo");
+        assertThat(responseCode, notNullValue());
+        assertThat(responseCode, equalTo(PlcResponseCode.OK));
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/PlcRawMessageTest.java b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/PlcRawMessageTest.java
index d9f3635c719..493ae97c674 100644
--- a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/PlcRawMessageTest.java
+++ b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/PlcRawMessageTest.java
@@ -1,57 +1,57 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.base.messages;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.hamcrest.core.IsNull.nullValue;
-import static org.junit.Assert.assertThat;
-
-@ExtendWith(MockitoExtension.class)
-class PlcRawMessageTest {
-
-    private ByteBuf rawData;
-    private PlcRawMessage SUT;
-
-    @BeforeEach
-    void setUp() {
-        rawData = Unpooled.wrappedBuffer("foo".getBytes());
-        SUT = new PlcRawMessage(rawData);
-    }
-
-    @Test
-    void getUserData() {
-        ByteBuf userData = SUT.getUserData();
-        assertThat(userData, equalTo(rawData));
-    }
-
-    @Test
-    void getParent() {
-        PlcProtocolMessage parent = SUT.getParent();
-        assertThat(parent, nullValue());
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.base.messages;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.core.IsNull.nullValue;
+import static org.junit.Assert.assertThat;
+
+@ExtendWith(MockitoExtension.class)
+class PlcRawMessageTest {
+
+    private ByteBuf rawData;
+    private PlcRawMessage SUT;
+
+    @BeforeEach
+    void setUp() {
+        rawData = Unpooled.wrappedBuffer("foo".getBytes());
+        SUT = new PlcRawMessage(rawData);
+    }
+
+    @Test
+    void getUserData() {
+        ByteBuf userData = SUT.getUserData();
+        assertThat(userData, equalTo(rawData));
+    }
+
+    @Test
+    void getParent() {
+        PlcProtocolMessage parent = SUT.getParent();
+        assertThat(parent, nullValue());
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/PlcRequestContainerTest.java b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/PlcRequestContainerTest.java
index 019d018de95..b474eea8ca1 100644
--- a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/PlcRequestContainerTest.java
+++ b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/PlcRequestContainerTest.java
@@ -1,82 +1,82 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages;
-
-import org.apache.plc4x.java.api.messages.PlcRequest;
-import org.hamcrest.core.IsEqual;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.mock;
-
-@SuppressWarnings("unchecked")
-public class PlcRequestContainerTest {
-
-    private PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> SUT;
-
-    private InternalPlcResponse plcResponse;
-    private InternalPlcRequest plcRequest;
-    private CompletableFuture<InternalPlcResponse> future;
-
-    @Before
-    public void setUp() {
-        plcResponse = mock(InternalPlcResponse.class);
-        plcRequest = mock(InternalPlcRequest.class);
-        future = CompletableFuture.completedFuture(plcResponse);
-        SUT = new PlcRequestContainer<>(plcRequest, future);
-    }
-
-    @Test
-    public void getRequest() {
-        PlcRequest request = SUT.getRequest();
-        assertNotNull(request);
-    }
-
-    @Test
-    public void getResponseFuture() throws Exception {
-        CompletableFuture<InternalPlcResponse> responseFuture = SUT.getResponseFuture();
-        assertNotNull(responseFuture);
-        assertNotNull(responseFuture.get(1, TimeUnit.NANOSECONDS));
-    }
-
-    @Test
-    public void getParent() {
-        PlcProtocolMessage parent = SUT.getParent();
-        assertNull(parent);
-    }
-
-    @Test
-    public void equalsAndHashCode() {
-        PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> other = new PlcRequestContainer<>(plcRequest, future);
-        assertThat(SUT.hashCode(), IsEqual.equalTo(other.hashCode()));
-        assertThat(SUT.equals(other), IsEqual.equalTo(true));
-        assertThat(SUT.equals(new Object()), IsEqual.equalTo(false));
-        assertEquals(SUT, SUT);
-    }
-
-    @Test
-    public void testToString() {
-        SUT.toString();
-    }
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.plc4x.java.api.messages.PlcRequest;
+import org.hamcrest.core.IsEqual;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
+
+@SuppressWarnings("unchecked")
+public class PlcRequestContainerTest {
+
+    private PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> SUT;
+
+    private InternalPlcResponse plcResponse;
+    private InternalPlcRequest plcRequest;
+    private CompletableFuture<InternalPlcResponse> future;
+
+    @Before
+    public void setUp() {
+        plcResponse = mock(InternalPlcResponse.class);
+        plcRequest = mock(InternalPlcRequest.class);
+        future = CompletableFuture.completedFuture(plcResponse);
+        SUT = new PlcRequestContainer<>(plcRequest, future);
+    }
+
+    @Test
+    public void getRequest() {
+        PlcRequest request = SUT.getRequest();
+        assertNotNull(request);
+    }
+
+    @Test
+    public void getResponseFuture() throws Exception {
+        CompletableFuture<InternalPlcResponse> responseFuture = SUT.getResponseFuture();
+        assertNotNull(responseFuture);
+        assertNotNull(responseFuture.get(1, TimeUnit.NANOSECONDS));
+    }
+
+    @Test
+    public void getParent() {
+        PlcProtocolMessage parent = SUT.getParent();
+        assertNull(parent);
+    }
+
+    @Test
+    public void equalsAndHashCode() {
+        PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> other = new PlcRequestContainer<>(plcRequest, future);
+        assertThat(SUT.hashCode(), IsEqual.equalTo(other.hashCode()));
+        assertThat(SUT.equals(other), IsEqual.equalTo(true));
+        assertThat(SUT.equals(new Object()), IsEqual.equalTo(false));
+        assertEquals(SUT, SUT);
+    }
+
+    @Test
+    public void testToString() {
+        SUT.toString();
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/items/DefaultLongFieldItemTest.java b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/items/DefaultLongFieldItemTest.java
index efa6bd781fa..eb70699668b 100644
--- a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/items/DefaultLongFieldItemTest.java
+++ b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/items/DefaultLongFieldItemTest.java
@@ -1,114 +1,114 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.base.messages.items;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-class DefaultLongFieldItemTest {
-
-    DefaultLongFieldItem SUT;
-
-    @BeforeEach
-    void setUp() {
-        SUT = new DefaultLongFieldItem(0L);
-    }
-
-    @AfterEach
-    void tearDown() {
-    }
-
-    @Test
-    void getObject() {
-    }
-
-    @Test
-    void isValidBoolean() {
-    }
-
-    @Test
-    void getBoolean() {
-    }
-
-    @Test
-    void isValidByte() {
-    }
-
-    @Test
-    void getByte() {
-    }
-
-    @Test
-    void isValidShort() {
-    }
-
-    @Test
-    void getShort() {
-    }
-
-    @Test
-    void isValidInteger() {
-    }
-
-    @Test
-    void getInteger() {
-    }
-
-    @Test
-    void isValidBigInteger() {
-    }
-
-    @Test
-    void getBigInteger() {
-    }
-
-    @Test
-    void isValidLong() {
-    }
-
-    @Test
-    void getLong() {
-    }
-
-    @Test
-    void isValidFloat() {
-    }
-
-    @Test
-    void getFloat() {
-    }
-
-    @Test
-    void isValidDouble() {
-    }
-
-    @Test
-    void getDouble() {
-    }
-
-    @Test
-    void isValidBigDecimal() {
-    }
-
-    @Test
-    void getBigDecimal() {
-    }
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.base.messages.items;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class DefaultLongFieldItemTest {
+
+    DefaultLongFieldItem SUT;
+
+    @BeforeEach
+    void setUp() {
+        SUT = new DefaultLongFieldItem(0L);
+    }
+
+    @AfterEach
+    void tearDown() {
+    }
+
+    @Test
+    void getObject() {
+    }
+
+    @Test
+    void isValidBoolean() {
+    }
+
+    @Test
+    void getBoolean() {
+    }
+
+    @Test
+    void isValidByte() {
+    }
+
+    @Test
+    void getByte() {
+    }
+
+    @Test
+    void isValidShort() {
+    }
+
+    @Test
+    void getShort() {
+    }
+
+    @Test
+    void isValidInteger() {
+    }
+
+    @Test
+    void getInteger() {
+    }
+
+    @Test
+    void isValidBigInteger() {
+    }
+
+    @Test
+    void getBigInteger() {
+    }
+
+    @Test
+    void isValidLong() {
+    }
+
+    @Test
+    void getLong() {
+    }
+
+    @Test
+    void isValidFloat() {
+    }
+
+    @Test
+    void getFloat() {
+    }
+
+    @Test
+    void isValidDouble() {
+    }
+
+    @Test
+    void getDouble() {
+    }
+
+    @Test
+    void isValidBigDecimal() {
+    }
+
+    @Test
+    void getBigDecimal() {
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/model/DefaultPlcConsumerRegistrationTest.java b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/model/DefaultPlcConsumerRegistrationTest.java
index 29696fac921..0dd33032a6b 100644
--- a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/model/DefaultPlcConsumerRegistrationTest.java
+++ b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/model/DefaultPlcConsumerRegistrationTest.java
@@ -1,88 +1,88 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.base.model;
-
-import nl.jqno.equalsverifier.EqualsVerifier;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
-import org.apache.plc4x.java.base.messages.PlcSubscriber;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.util.Collection;
-import java.util.function.Consumer;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.junit.Assert.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@ExtendWith(MockitoExtension.class)
-class DefaultPlcConsumerRegistrationTest {
-
-    @Mock
-    private PlcSubscriber subscriber;
-    @Mock
-    private Consumer<PlcSubscriptionEvent> consumer;
-    @Mock
-    private InternalPlcSubscriptionHandle subscriptionHandle;
-    private DefaultPlcConsumerRegistration SUT;
-
-    @BeforeEach
-    void setUp() {
-        SUT = new DefaultPlcConsumerRegistration(subscriber, consumer, subscriptionHandle);
-    }
-
-    @Test
-    void getConsumerHash() {
-        int consumerHash = SUT.getConsumerHash();
-        assertThat(consumerHash, equalTo(consumer.hashCode()));
-    }
-
-    @Test
-    void getAssociatedHandles() {
-        Collection<InternalPlcSubscriptionHandle> associatedHandles = SUT.getAssociatedHandles();
-        assertThat(associatedHandles, notNullValue());
-        assertThat(associatedHandles.size(), equalTo(1));
-        assertThat(associatedHandles.iterator().next(), equalTo(subscriptionHandle));
-    }
-
-    @Test
-    public void unregister() {
-        SUT.unregister();
-        verify(subscriber, times(1)).unregister(any());
-    }
-
-    @Test
-    public void testToString() {
-        String s = SUT.toString();
-        assertThat(s, notNullValue());
-    }
-
-    @Test
-    void equals() {
-        EqualsVerifier.forClass(DefaultPlcConsumerRegistration.class).verify();
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.base.model;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
+import org.apache.plc4x.java.base.messages.PlcSubscriber;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.Collection;
+import java.util.function.Consumer;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.junit.Assert.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+@ExtendWith(MockitoExtension.class)
+class DefaultPlcConsumerRegistrationTest {
+
+    @Mock
+    private PlcSubscriber subscriber;
+    @Mock
+    private Consumer<PlcSubscriptionEvent> consumer;
+    @Mock
+    private InternalPlcSubscriptionHandle subscriptionHandle;
+    private DefaultPlcConsumerRegistration SUT;
+
+    @BeforeEach
+    void setUp() {
+        SUT = new DefaultPlcConsumerRegistration(subscriber, consumer, subscriptionHandle);
+    }
+
+    @Test
+    void getConsumerHash() {
+        int consumerHash = SUT.getConsumerHash();
+        assertThat(consumerHash, equalTo(consumer.hashCode()));
+    }
+
+    @Test
+    void getAssociatedHandles() {
+        Collection<InternalPlcSubscriptionHandle> associatedHandles = SUT.getAssociatedHandles();
+        assertThat(associatedHandles, notNullValue());
+        assertThat(associatedHandles.size(), equalTo(1));
+        assertThat(associatedHandles.iterator().next(), equalTo(subscriptionHandle));
+    }
+
+    @Test
+    public void unregister() {
+        SUT.unregister();
+        verify(subscriber, times(1)).unregister(any());
+    }
+
+    @Test
+    public void testToString() {
+        String s = SUT.toString();
+        assertThat(s, notNullValue());
+    }
+
+    @Test
+    void equals() {
+        EqualsVerifier.forClass(DefaultPlcConsumerRegistration.class).verify();
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/model/DefaultPlcSubscriptionHandleTest.java b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/model/DefaultPlcSubscriptionHandleTest.java
index 0d04b7f8068..7d2146512b4 100644
--- a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/model/DefaultPlcSubscriptionHandleTest.java
+++ b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/model/DefaultPlcSubscriptionHandleTest.java
@@ -1,73 +1,73 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.base.model;
-
-import nl.jqno.equalsverifier.EqualsVerifier;
-import nl.jqno.equalsverifier.Warning;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
-import org.apache.plc4x.java.base.messages.PlcSubscriber;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.util.Collections;
-import java.util.function.Consumer;
-
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@ExtendWith(MockitoExtension.class)
-class DefaultPlcSubscriptionHandleTest {
-
-    @Mock
-    private PlcSubscriber subscriber;
-    @Mock
-    private Consumer<PlcSubscriptionEvent> consumer;
-    private DefaultPlcSubscriptionHandle SUT;
-
-    @BeforeEach
-    void setUp() {
-        SUT = new DefaultPlcSubscriptionHandle(subscriber);
-    }
-
-    @Test
-    void register() {
-        SUT.register(consumer);
-        verify(subscriber, times(1)).register(consumer, Collections.singletonList(SUT));
-    }
-
-    @Test
-    public void testToString() {
-        String s = SUT.toString();
-        assertThat(s, notNullValue());
-    }
-
-    @Test
-    void equals() {
-        EqualsVerifier.forClass(DefaultPlcSubscriptionHandle.class).usingGetClass()
-            .suppress(Warning.STRICT_INHERITANCE).suppress(Warning.IDENTICAL_COPY)
-            .suppress(Warning.ALL_FIELDS_SHOULD_BE_USED).verify();
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.base.model;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
+import org.apache.plc4x.java.base.messages.PlcSubscriber;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.Collections;
+import java.util.function.Consumer;
+
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+@ExtendWith(MockitoExtension.class)
+class DefaultPlcSubscriptionHandleTest {
+
+    @Mock
+    private PlcSubscriber subscriber;
+    @Mock
+    private Consumer<PlcSubscriptionEvent> consumer;
+    private DefaultPlcSubscriptionHandle SUT;
+
+    @BeforeEach
+    void setUp() {
+        SUT = new DefaultPlcSubscriptionHandle(subscriber);
+    }
+
+    @Test
+    void register() {
+        SUT.register(consumer);
+        verify(subscriber, times(1)).register(consumer, Collections.singletonList(SUT));
+    }
+
+    @Test
+    public void testToString() {
+        String s = SUT.toString();
+        assertThat(s, notNullValue());
+    }
+
+    @Test
+    void equals() {
+        EqualsVerifier.forClass(DefaultPlcSubscriptionHandle.class).usingGetClass()
+            .suppress(Warning.STRICT_INHERITANCE).suppress(Warning.IDENTICAL_COPY)
+            .suppress(Warning.ALL_FIELDS_SHOULD_BE_USED).verify();
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/model/SubscriptionPlcFieldTest.java b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/model/SubscriptionPlcFieldTest.java
index d5fc38bd6cd..b702f1fcb7f 100644
--- a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/model/SubscriptionPlcFieldTest.java
+++ b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/model/SubscriptionPlcFieldTest.java
@@ -1,68 +1,68 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.base.model;
-
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.types.PlcSubscriptionType;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-import java.util.Optional;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-
-@ExtendWith(MockitoExtension.class)
-class SubscriptionPlcFieldTest {
-
-    @Mock
-    private PlcField field;
-    private SubscriptionPlcField SUT;
-
-    @BeforeEach
-    void setUp() {
-        SUT = new SubscriptionPlcField(PlcSubscriptionType.CYCLIC, field, Duration.of(1, ChronoUnit.SECONDS));
-    }
-
-    @Test
-    void getPlcSubscriptionType() {
-        PlcSubscriptionType plcSubscriptionType = SUT.getPlcSubscriptionType();
-        assertThat(plcSubscriptionType, equalTo(PlcSubscriptionType.CYCLIC));
-    }
-
-    @Test
-    void getPlcField() {
-        PlcField plcField = SUT.getPlcField();
-        assertThat(plcField, equalTo(field));
-    }
-
-    @Test
-    void getDuration() {
-        Optional<Duration> durationOptional = SUT.getDuration();
-        assertThat(durationOptional.isPresent(), equalTo(true));
-        assertThat(durationOptional.get(), equalTo(Duration.of(1, ChronoUnit.SECONDS)));
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.base.model;
+
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcSubscriptionType;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.Optional;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+
+@ExtendWith(MockitoExtension.class)
+class SubscriptionPlcFieldTest {
+
+    @Mock
+    private PlcField field;
+    private SubscriptionPlcField SUT;
+
+    @BeforeEach
+    void setUp() {
+        SUT = new SubscriptionPlcField(PlcSubscriptionType.CYCLIC, field, Duration.of(1, ChronoUnit.SECONDS));
+    }
+
+    @Test
+    void getPlcSubscriptionType() {
+        PlcSubscriptionType plcSubscriptionType = SUT.getPlcSubscriptionType();
+        assertThat(plcSubscriptionType, equalTo(PlcSubscriptionType.CYCLIC));
+    }
+
+    @Test
+    void getPlcField() {
+        PlcField plcField = SUT.getPlcField();
+        assertThat(plcField, equalTo(field));
+    }
+
+    @Test
+    void getDuration() {
+        Optional<Duration> durationOptional = SUT.getDuration();
+        assertThat(durationOptional.isPresent(), equalTo(true));
+        assertThat(durationOptional.get(), equalTo(Duration.of(1, ChronoUnit.SECONDS)));
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocolTest.java b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocolTest.java
index cd1216c3745..f2cf07d7dd7 100644
--- a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocolTest.java
+++ b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocolTest.java
@@ -1,729 +1,729 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.base.protocol;
-
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelPromise;
-import io.netty.channel.PendingWriteQueue;
-import io.netty.util.HashedWheelTimer;
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.messages.PlcFieldRequest;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.messages.*;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
-import org.apache.plc4x.java.base.model.SubscriptionPlcField;
-import org.assertj.core.api.WithAssertions;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Answers;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
-
-@ExtendWith(MockitoExtension.class)
-class SingleItemToSingleRequestProtocolTest implements WithAssertions {
-
-    SingleItemToSingleRequestProtocol SUT;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    ChannelHandlerContext channelHandlerContext;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    ChannelPromise channelPromise;
-
-    @Mock
-    CompletableFuture<InternalPlcResponse> responseCompletableFuture;
-
-    @Mock
-    PlcReader mockReader;
-    @Mock
-    PlcWriter mockWriter;
-    @Mock
-    PlcSubscriber mockSubscriber;
-
-    @BeforeEach
-    void setUp() throws Exception {
-        SUT = new SingleItemToSingleRequestProtocol(
-            mockReader,
-            mockWriter,
-            mockSubscriber,
-            new HashedWheelTimer(),
-            TimeUnit.SECONDS.toMillis(1),
-            new SingleItemToSingleRequestProtocol.SplitConfig(),
-            false
-        );
-        SUT.channelRegistered(channelHandlerContext);
-        when(channelHandlerContext.executor().inEventLoop()).thenReturn(true);
-    }
-
-    @AfterEach
-    void tearDown() throws Exception {
-        SUT.channelUnregistered(channelHandlerContext);
-    }
-
-    @Nested
-    class Misc {
-        @Test
-        void channelRegistered() throws Exception {
-            SUT.channelRegistered(channelHandlerContext);
-            assertThat(SUT.getStatistics()).containsOnly(
-                entry("queue", 0),
-                entry("sentButUnacknowledgedSubContainer", 0),
-                entry("correlationToParentContainer", 0),
-                entry("containerCorrelationIdMap", 0),
-                entry("responsesToBeDelivered", 0),
-                entry("correlationIdGenerator", 0),
-                entry("deliveredItems", 0L),
-                entry("erroredItems", 0L),
-                entry("erroredContainers", 0L),
-                entry("deliveredContainers", 0L)
-            );
-        }
-
-        @Test
-        void channelUnregistered() throws Exception {
-            SUT.channelUnregistered(channelHandlerContext);
-            assertThat(SUT.getStatistics()).containsOnly(
-                entry("queue", 0),
-                entry("sentButUnacknowledgedSubContainer", 0),
-                entry("correlationToParentContainer", 0),
-                entry("containerCorrelationIdMap", 0),
-                entry("responsesToBeDelivered", 0),
-                entry("correlationIdGenerator", 0),
-                entry("deliveredItems", 0L),
-                entry("erroredItems", 0L),
-                entry("deliveredContainers", 0L),
-                entry("erroredContainers", 0L)
-            );
-        }
-
-        @Test
-        void channelInactive() throws Exception {
-            SUT.channelInactive(channelHandlerContext);
-            assertThat(SUT.getStatistics()).containsOnly(
-                entry("queue", 0),
-                entry("sentButUnacknowledgedSubContainer", 0),
-                entry("correlationToParentContainer", 0),
-                entry("containerCorrelationIdMap", 0),
-                entry("responsesToBeDelivered", 0),
-                entry("correlationIdGenerator", 0),
-                entry("deliveredItems", 0L),
-                entry("erroredItems", 0L),
-                entry("deliveredContainers", 0L),
-                entry("erroredContainers", 0L)
-            );
-        }
-    }
-
-    @Nested
-    class SplitConfig {
-
-        @Nested
-        class SplitOn {
-            @BeforeEach
-            void setUp() throws Exception {
-                // We setup the SUT with a special configuration
-                SUT = new SingleItemToSingleRequestProtocol(
-                    mockReader,
-                    mockWriter,
-                    mockSubscriber,
-                    new HashedWheelTimer(),
-                    TimeUnit.SECONDS.toMillis(1),
-                    SingleItemToSingleRequestProtocol.SplitConfig.builder()
-                        .dontSplitRead()
-                        .dontSplitWrite()
-                        .dontSplitSubscribe()
-                        .dontSplitUnsubscribe()
-                        .build(),
-                    false
-                );
-                SUT.channelRegistered(channelHandlerContext);
-                when(channelHandlerContext.executor().inEventLoop()).thenReturn(true);
-            }
-
-            @Test
-            void read() throws Exception {
-                // Given
-                // we have a simple read
-                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcReadRequest.build(mockReader), responseCompletableFuture);
-                // When
-                // we write this
-                SUT.write(channelHandlerContext, msg, channelPromise);
-                // then
-                // we should invoke this only one time
-                verify(channelHandlerContext, times(1)).write(eq(msg), any());
-            }
-
-            @Test
-            void write() throws Exception {
-                // Given
-                // we have a simple write
-                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcWriteRequest.build(mockWriter), responseCompletableFuture);
-                // When
-                // we write this
-                SUT.write(channelHandlerContext, msg, channelPromise);
-                // then
-                // we should invoke this only one time
-                verify(channelHandlerContext, times(1)).write(eq(msg), any());
-            }
-
-            @Test
-            void subscribe() throws Exception {
-                // Given
-                // we have a simple subscribe
-                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcSubscriptionRequest.build(mockSubscriber), responseCompletableFuture);
-                // When
-                // we write this
-                SUT.write(channelHandlerContext, msg, channelPromise);
-                // then
-                // we should invoke this only one time
-                verify(channelHandlerContext, times(1)).write(eq(msg), any());
-            }
-
-            @Test
-            void unsubsribe() throws Exception {
-                // Given
-                // we have a simple unsubscribe
-                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcUnsubscriptionRequest.build(mockSubscriber), responseCompletableFuture);
-                // When
-                // we write this
-                SUT.write(channelHandlerContext, msg, channelPromise);
-                // then
-                // we should invoke this only one time
-                verify(channelHandlerContext, times(1)).write(eq(msg), any());
-            }
-        }
-
-        @Nested
-        class SplitOff {
-            @BeforeEach
-            void setUp() throws Exception {
-                // We setup the SUT with a special configuration
-                SUT = new SingleItemToSingleRequestProtocol(
-                    mockReader,
-                    mockWriter,
-                    mockSubscriber,
-                    new HashedWheelTimer(),
-                    TimeUnit.SECONDS.toMillis(1),
-                    SingleItemToSingleRequestProtocol.SplitConfig.builder()
-                        .splitRead()
-                        .splitWrite()
-                        .splitSubscribe()
-                        .splitUnsubscribe()
-                        .build(),
-                    false
-                );
-                SUT.channelRegistered(channelHandlerContext);
-                when(channelHandlerContext.executor().inEventLoop()).thenReturn(true);
-            }
-
-            @Test
-            void read() throws Exception {
-                // Given
-                // we have a simple read
-                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcReadRequest.build(mockReader), responseCompletableFuture);
-                // When
-                // we write this
-                SUT.write(channelHandlerContext, msg, channelPromise);
-                // then
-                // we should invoke this only one time
-                verify(channelHandlerContext, times(5)).write(any(), any());
-            }
-
-            @Test
-            void write() throws Exception {
-                // Given
-                // we have a simple write
-                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcWriteRequest.build(mockWriter), responseCompletableFuture);
-                // When
-                // we write this
-                SUT.write(channelHandlerContext, msg, channelPromise);
-                // then
-                // we should invoke this only one time
-                verify(channelHandlerContext, times(5)).write(any(), any());
-            }
-
-            @Test
-            void subscribe() throws Exception {
-                // Given
-                // we have a simple subscribe
-                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcSubscriptionRequest.build(mockSubscriber), responseCompletableFuture);
-                // When
-                // we write this
-                SUT.write(channelHandlerContext, msg, channelPromise);
-                // then
-                // we should invoke this only one time
-                verify(channelHandlerContext, times(3)).write(any(), any());
-            }
-
-            @Test
-            void unsubsribe() throws Exception {
-                // Given
-                // we have a simple unsubscribe
-                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcUnsubscriptionRequest.build(mockSubscriber), responseCompletableFuture);
-                // When
-                // we write this
-                SUT.write(channelHandlerContext, msg, channelPromise);
-                // then
-                // we should invoke this only one time
-                verify(channelHandlerContext, times(3)).write(any(), any());
-            }
-        }
-
-
-    }
-
-    @Nested
-    class Roundtrip {
-        @Nested
-        class Read {
-            @Captor
-            ArgumentCaptor<PlcRequestContainer> plcRequestContainerArgumentCaptor;
-
-            @Test
-            void simpleRead() throws Exception {
-                // Given
-                // we have a simple read
-                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcReadRequest.build(mockReader), responseCompletableFuture);
-                // When
-                // we write this
-                SUT.write(channelHandlerContext, msg, channelPromise);
-                // And
-                // and we simulate that all get responded
-                verify(channelHandlerContext, times(5)).write(plcRequestContainerArgumentCaptor.capture(), any());
-                List<PlcRequestContainer> capturedDownstreamContainers = plcRequestContainerArgumentCaptor.getAllValues();
-                capturedDownstreamContainers.forEach(this::produceReadResponse);
-                // Then
-                // our complete container should complete normally
-                verify(responseCompletableFuture).complete(any());
-                // And we should have no memory leak
-                assertThat(SUT.getStatistics()).containsOnly(
-                    entry("queue", 0),
-                    entry("sentButUnacknowledgedSubContainer", 0),
-                    entry("correlationToParentContainer", 0),
-                    entry("containerCorrelationIdMap", 0),
-                    entry("responsesToBeDelivered", 0),
-                    entry("correlationIdGenerator", 5),
-                    entry("erroredItems", 0L),
-                    entry("deliveredItems", 5L),
-                    entry("deliveredContainers", 1L),
-                    entry("erroredContainers", 0L)
-                );
-            }
-
-            @Test
-            void partialRead() throws Exception {
-                // Given
-                // we have a simple read
-                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcReadRequest.build(mockReader), responseCompletableFuture);
-                // When
-                // we write this
-                SUT.write(channelHandlerContext, msg, channelPromise);
-                // And
-                // and we simulate that some one responded
-                verify(channelHandlerContext, times(5)).write(plcRequestContainerArgumentCaptor.capture(), any());
-                List<PlcRequestContainer> capturedDownstreamContainers = plcRequestContainerArgumentCaptor.getAllValues();
-                capturedDownstreamContainers.stream().findFirst().map(this::produceReadResponse);
-                // Then
-                // We create SUT with 1 seconds timeout
-                TimeUnit.SECONDS.sleep(2);
-                // our complete container should complete normally
-                verify(responseCompletableFuture).completeExceptionally(any());
-                // And we should have no memory leak
-                assertThat(SUT.getStatistics()).containsOnly(
-                    entry("queue", 0),
-                    entry("sentButUnacknowledgedSubContainer", 0),
-                    entry("correlationToParentContainer", 0),
-                    entry("containerCorrelationIdMap", 0),
-                    entry("responsesToBeDelivered", 0),
-                    entry("correlationIdGenerator", 5),
-                    entry("deliveredItems", 1L),
-                    entry("erroredItems", 4L),
-                    entry("deliveredContainers", 0L),
-                    entry("erroredContainers", 1L)
-                );
-            }
-
-            @Test
-            void partialReadOneErrored() throws Exception {
-                // Given
-                // we have a simple read
-                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcReadRequest.build(mockReader), responseCompletableFuture);
-                // When
-                // we write this
-                SUT.write(channelHandlerContext, msg, channelPromise);
-                // And
-                // and we simulate that some one responded
-                verify(channelHandlerContext, times(5)).write(plcRequestContainerArgumentCaptor.capture(), any());
-                List<PlcRequestContainer> capturedDownstreamContainers = plcRequestContainerArgumentCaptor.getAllValues();
-                capturedDownstreamContainers.stream()
-                    .findFirst()
-                    .map(plcRequestContainer ->
-                        plcRequestContainer
-                            .getResponseFuture()
-                            .completeExceptionally(new RuntimeException("ErrorOccurred"))
-                    );
-                // Then
-                // We create SUT with 1 seconds timeout
-                TimeUnit.SECONDS.sleep(2);
-                // our complete container should complete normally
-                verify(responseCompletableFuture).completeExceptionally(any());
-                // And we should have no memory leak
-                assertThat(SUT.getStatistics()).containsOnly(
-                    entry("queue", 0),
-                    entry("sentButUnacknowledgedSubContainer", 0),
-                    entry("correlationToParentContainer", 0),
-                    entry("containerCorrelationIdMap", 0),
-                    entry("responsesToBeDelivered", 0),
-                    entry("correlationIdGenerator", 5),
-                    entry("deliveredItems", 0L),
-                    entry("erroredItems", 1L),
-                    entry("deliveredContainers", 0L),
-                    entry("erroredContainers", 1L)
-                );
-            }
-
-            @Test
-            void noRead() throws Exception {
-                // Given
-                // we have a simple read
-                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcReadRequest.build(mockReader), responseCompletableFuture);
-                // When
-                // we write this
-                SUT.write(channelHandlerContext, msg, channelPromise);
-                // And
-                // and we simulate that some one responded
-                verify(channelHandlerContext, times(5)).write(any(), any());
-                // Then
-                // We create SUT with 1 seconds timeout
-                TimeUnit.SECONDS.sleep(2);
-                // our complete container should complete normally
-                verify(responseCompletableFuture).completeExceptionally(any());
-                // And we should have no memory leak
-                assertThat(SUT.getStatistics()).containsOnly(
-                    entry("queue", 0),
-                    entry("sentButUnacknowledgedSubContainer", 0),
-                    entry("correlationToParentContainer", 0),
-                    entry("containerCorrelationIdMap", 0),
-                    entry("responsesToBeDelivered", 0),
-                    entry("correlationIdGenerator", 5),
-                    entry("deliveredItems", 0L),
-                    entry("erroredItems", 5L),
-                    entry("deliveredContainers", 0L),
-                    entry("erroredContainers", 1L)
-                );
-            }
-
-            @SuppressWarnings("unchecked")
-            private Void produceReadResponse(PlcRequestContainer plcRequestContainer) {
-                InternalPlcReadRequest request = (InternalPlcReadRequest) plcRequestContainer.getRequest();
-                // TODO: we need a response for every item
-                String fieldName = request.getFieldNames().iterator().next();
-                CompletableFuture responseFuture = plcRequestContainer.getResponseFuture();
-                HashMap<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> responseFields = new HashMap<>();
-                responseFields.put(fieldName, Pair.of(PlcResponseCode.OK, mock(BaseDefaultFieldItem.class)));
-                responseFuture.complete(new DefaultPlcReadResponse(request, responseFields));
-                return null;
-            }
-        }
-
-        @Nested
-        class Write {
-            // TODO: implement me
-        }
-
-        @Nested
-        class Subscribe {
-            @Captor
-            ArgumentCaptor<PlcRequestContainer> plcRequestContainerArgumentCaptor;
-
-            @Test
-            void simpleSubscribe() throws Exception {
-                // Given
-                // we have a simple read
-                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcSubscriptionRequest.build(mockSubscriber), responseCompletableFuture);
-                // When
-                // we write this
-                SUT.write(channelHandlerContext, msg, channelPromise);
-                // And
-                // and we simulate that all get responded
-                verify(channelHandlerContext, times(3)).write(plcRequestContainerArgumentCaptor.capture(), any());
-                List<PlcRequestContainer> capturedDownstreamContainers = plcRequestContainerArgumentCaptor.getAllValues();
-                capturedDownstreamContainers.forEach(this::produceSubscriptionResponse);
-                // Then
-                // our complete container should complete normally
-                verify(responseCompletableFuture).complete(any());
-                // And we should have no memory leak
-                assertThat(SUT.getStatistics()).containsOnly(
-                    entry("queue", 0),
-                    entry("sentButUnacknowledgedSubContainer", 0),
-                    entry("correlationToParentContainer", 0),
-                    entry("containerCorrelationIdMap", 0),
-                    entry("responsesToBeDelivered", 0),
-                    entry("correlationIdGenerator", 3),
-                    entry("erroredItems", 0L),
-                    entry("deliveredItems", 3L),
-                    entry("deliveredContainers", 1L),
-                    entry("erroredContainers", 0L)
-                );
-            }
-
-            @Test
-            void simpleUnsubscribe() throws Exception {
-                // Given
-                // we have a simple read
-                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcUnsubscriptionRequest.build(mockSubscriber), responseCompletableFuture);
-                // When
-                // we write this
-                SUT.write(channelHandlerContext, msg, channelPromise);
-                // And
-                // and we simulate that all get responded
-                verify(channelHandlerContext, times(3)).write(plcRequestContainerArgumentCaptor.capture(), any());
-                List<PlcRequestContainer> capturedDownstreamContainers = plcRequestContainerArgumentCaptor.getAllValues();
-                capturedDownstreamContainers.forEach(this::produceUnsubscriptionResponse);
-                // Then
-                // our complete container should complete normally
-                verify(responseCompletableFuture).complete(any());
-                // And we should have no memory leak
-                assertThat(SUT.getStatistics()).containsOnly(
-                    entry("queue", 0),
-                    entry("sentButUnacknowledgedSubContainer", 0),
-                    entry("correlationToParentContainer", 0),
-                    entry("containerCorrelationIdMap", 0),
-                    entry("responsesToBeDelivered", 0),
-                    entry("correlationIdGenerator", 3),
-                    entry("erroredItems", 0L),
-                    entry("deliveredItems", 3L),
-                    entry("deliveredContainers", 1L),
-                    entry("erroredContainers", 0L)
-                );
-            }
-
-            @SuppressWarnings("unchecked")
-            private Void produceSubscriptionResponse(PlcRequestContainer plcRequestContainer) {
-                InternalPlcSubscriptionRequest request = (InternalPlcSubscriptionRequest) plcRequestContainer.getRequest();
-                // TODO: we need a response for every item
-                String fieldName = request.getFieldNames().iterator().next();
-                CompletableFuture responseFuture = plcRequestContainer.getResponseFuture();
-                HashMap<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> responseFields = new HashMap<>();
-                responseFields.put(fieldName, Pair.of(PlcResponseCode.OK, mock(PlcSubscriptionHandle.class)));
-                responseFuture.complete(new DefaultPlcSubscriptionResponse(request, responseFields));
-                return null;
-            }
-
-            @SuppressWarnings("unchecked")
-            private Void produceUnsubscriptionResponse(PlcRequestContainer plcRequestContainer) {
-                InternalPlcUnsubscriptionRequest request = (InternalPlcUnsubscriptionRequest) plcRequestContainer.getRequest();
-                // TODO: we need a response for every item
-                InternalPlcSubscriptionHandle internalPlcSubscriptionHandle = request.getInternalPlcSubscriptionHandles().iterator().next();
-                // TODO: handles ignored for now.
-                CompletableFuture responseFuture = plcRequestContainer.getResponseFuture();
-                responseFuture.complete(new DefaultPlcUnsubscriptionResponse(request));
-                return null;
-            }
-        }
-    }
-
-    @Nested
-    class Decoding {
-        @Test
-        void tryFinish() {
-            SUT.tryFinish(1, null, new CompletableFuture<>());
-            // TODO: add Assertions.
-        }
-
-        @Test
-        void errored() {
-            SUT.errored(1, mock(Throwable.class), new CompletableFuture<>());
-            // TODO: add Assertions.
-        }
-    }
-
-    @Nested
-    class Encoding {
-
-        @Captor
-        ArgumentCaptor<PlcRequestContainer> plcRequestContainerArgumentCaptor;
-
-        @Test
-        void empty() throws Exception {
-            // Given
-            Object msg = null;
-            // When
-            SUT.write(channelHandlerContext, msg, channelPromise);
-            // Then
-            verify(channelHandlerContext, times(1)).write(null, channelPromise);
-        }
-
-        @Test
-        void read() throws Exception {
-            // Given
-            PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcReadRequest.build(mockReader), responseCompletableFuture);
-            // When
-            SUT.write(channelHandlerContext, msg, channelPromise);
-            // Then
-            verify(channelHandlerContext, times(5)).write(plcRequestContainerArgumentCaptor.capture(), any());
-            List<PlcRequestContainer> capturedValues = plcRequestContainerArgumentCaptor.getAllValues();
-            // We check if every request as exactly one field
-            assertThat(capturedValues)
-                .allMatch(plcRequestContainer -> plcRequestContainer.getRequest() instanceof SingleItemToSingleRequestProtocol.CorrelatedPlcReadRequest)
-                .allMatch(plcRequestContainer -> ((SingleItemToSingleRequestProtocol.CorrelatedPlcReadRequest) plcRequestContainer.getRequest()).getNumberOfFields() == 1);
-            // In sum we should see all fields
-            List<String> fieldNamesList = capturedValues.stream()
-                .map(PlcRequestContainer::getRequest)
-                .map(PlcFieldRequest.class::cast)
-                .map(PlcFieldRequest::getFieldNames)
-                .flatMap(Collection::stream)
-                .collect(Collectors.toList());
-            // There should be no duplications
-            assertThat(fieldNamesList).hasSize(5);
-            assertThat(fieldNamesList).containsExactly(
-                "readField1",
-                "readField2",
-                "readField3",
-                "readField4",
-                "readField5"
-            );
-        }
-
-        @Test
-        void write() throws Exception {
-            // Given
-            PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcWriteRequest.build(mockWriter), responseCompletableFuture);
-            // When
-            SUT.write(channelHandlerContext, msg, channelPromise);
-            // Then
-            verify(channelHandlerContext, times(5)).write(plcRequestContainerArgumentCaptor.capture(), any());
-            List<PlcRequestContainer> capturedValues = plcRequestContainerArgumentCaptor.getAllValues();
-            // We check if every request as exactly one field
-            assertThat(capturedValues)
-                .allMatch(plcRequestContainer -> plcRequestContainer.getRequest() instanceof SingleItemToSingleRequestProtocol.CorrelatedPlcWriteRequest)
-                .allMatch(plcRequestContainer -> ((SingleItemToSingleRequestProtocol.CorrelatedPlcWriteRequest) plcRequestContainer.getRequest()).getNumberOfFields() == 1);
-            // In sum we should see all fields
-            List<String> fieldNamesList = capturedValues.stream()
-                .map(PlcRequestContainer::getRequest)
-                .map(PlcFieldRequest.class::cast)
-                .map(PlcFieldRequest::getFieldNames)
-                .flatMap(Collection::stream)
-                .collect(Collectors.toList());
-            // There should be no duplications
-            assertThat(fieldNamesList).hasSize(5);
-            assertThat(fieldNamesList).containsExactly(
-                "writeField1",
-                "writeField2",
-                "writeField3",
-                "writeField4",
-                "writeField5"
-            );
-        }
-
-        @Test
-        void subscribe() {
-            // TODO: implement once available
-        }
-
-        @Test
-        void unsubcribe() {
-            // TODO: implement once available
-        }
-
-        @Test
-        void trySendingMessages() throws Exception {
-            PendingWriteQueue queue = (PendingWriteQueue) FieldUtils.getField(SUT.getClass(), "queue", true).get(SUT);
-            assertThat(queue.size()).isLessThanOrEqualTo(0);
-            queue.add(mock(PlcRequestContainer.class), channelPromise);
-            assertThat(queue.size()).isGreaterThan(0);
-            SUT.trySendingMessages(channelHandlerContext);
-            assertThat(queue.size()).isLessThanOrEqualTo(0);
-        }
-    }
-
-    private static class TestDefaultPlcReadRequest extends DefaultPlcReadRequest {
-        private TestDefaultPlcReadRequest(PlcReader reader, LinkedHashMap<String, PlcField> fields) {
-            super(reader, fields);
-        }
-
-        private static TestDefaultPlcReadRequest build(PlcReader reader) {
-            LinkedHashMap<String, PlcField> fields = new LinkedHashMap<>();
-            IntStream.rangeClosed(1, 5).forEach(i -> fields.put("readField" + i, mock(PlcField.class)));
-            return new TestDefaultPlcReadRequest(reader, fields);
-        }
-    }
-
-    private static class TestDefaultPlcWriteRequest extends DefaultPlcWriteRequest {
-
-        private TestDefaultPlcWriteRequest(PlcWriter writer, LinkedHashMap<String, Pair<PlcField, BaseDefaultFieldItem>> fields) {
-            super(writer, fields);
-        }
-
-        private static TestDefaultPlcWriteRequest build(PlcWriter writer) {
-            LinkedHashMap<String, Pair<PlcField, BaseDefaultFieldItem>> fields = new LinkedHashMap<>();
-            IntStream.rangeClosed(1, 5).forEach(i -> fields.put("writeField" + i, Pair.of(mock(PlcField.class), mock(BaseDefaultFieldItem.class))));
-            return new TestDefaultPlcWriteRequest(writer, fields);
-        }
-    }
-
-    private static class TestDefaultPlcSubscriptionRequest extends DefaultPlcSubscriptionRequest {
-
-        private TestDefaultPlcSubscriptionRequest(PlcSubscriber subscriber, LinkedHashMap<String, SubscriptionPlcField> fields) {
-            super(subscriber, fields);
-        }
-
-        private static TestDefaultPlcSubscriptionRequest build(PlcSubscriber subscriber) {
-            LinkedHashMap<String, SubscriptionPlcField> fields = new LinkedHashMap<>();
-            fields.put("sub1", mock(SubscriptionPlcField.class));
-            fields.put("sub2", mock(SubscriptionPlcField.class));
-            fields.put("sub3", mock(SubscriptionPlcField.class));
-            return new TestDefaultPlcSubscriptionRequest(subscriber, fields);
-        }
-    }
-
-    private static class TestDefaultPlcUnsubscriptionRequest extends DefaultPlcUnsubscriptionRequest {
-
-        private TestDefaultPlcUnsubscriptionRequest(PlcSubscriber subscriber, Collection<? extends InternalPlcSubscriptionHandle> internalPlcSubscriptionHandles) {
-            super(subscriber, internalPlcSubscriptionHandles);
-        }
-
-        private static TestDefaultPlcUnsubscriptionRequest build(PlcSubscriber subscriber) {
-            List<InternalPlcSubscriptionHandle> internalPlcSubscriptionHandles = new LinkedList<>();
-            internalPlcSubscriptionHandles.add(mock(InternalPlcSubscriptionHandle.class));
-            internalPlcSubscriptionHandles.add(mock(InternalPlcSubscriptionHandle.class));
-            internalPlcSubscriptionHandles.add(mock(InternalPlcSubscriptionHandle.class));
-            return new TestDefaultPlcUnsubscriptionRequest(subscriber, internalPlcSubscriptionHandles);
-        }
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.base.protocol;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.PendingWriteQueue;
+import io.netty.util.HashedWheelTimer;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.messages.PlcFieldRequest;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.messages.*;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
+import org.apache.plc4x.java.base.model.SubscriptionPlcField;
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Answers;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class SingleItemToSingleRequestProtocolTest implements WithAssertions {
+
+    SingleItemToSingleRequestProtocol SUT;
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    ChannelHandlerContext channelHandlerContext;
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    ChannelPromise channelPromise;
+
+    @Mock
+    CompletableFuture<InternalPlcResponse> responseCompletableFuture;
+
+    @Mock
+    PlcReader mockReader;
+    @Mock
+    PlcWriter mockWriter;
+    @Mock
+    PlcSubscriber mockSubscriber;
+
+    @BeforeEach
+    void setUp() throws Exception {
+        SUT = new SingleItemToSingleRequestProtocol(
+            mockReader,
+            mockWriter,
+            mockSubscriber,
+            new HashedWheelTimer(),
+            TimeUnit.SECONDS.toMillis(1),
+            new SingleItemToSingleRequestProtocol.SplitConfig(),
+            false
+        );
+        SUT.channelRegistered(channelHandlerContext);
+        when(channelHandlerContext.executor().inEventLoop()).thenReturn(true);
+    }
+
+    @AfterEach
+    void tearDown() throws Exception {
+        SUT.channelUnregistered(channelHandlerContext);
+    }
+
+    @Nested
+    class Misc {
+        @Test
+        void channelRegistered() throws Exception {
+            SUT.channelRegistered(channelHandlerContext);
+            assertThat(SUT.getStatistics()).containsOnly(
+                entry("queue", 0),
+                entry("sentButUnacknowledgedSubContainer", 0),
+                entry("correlationToParentContainer", 0),
+                entry("containerCorrelationIdMap", 0),
+                entry("responsesToBeDelivered", 0),
+                entry("correlationIdGenerator", 0),
+                entry("deliveredItems", 0L),
+                entry("erroredItems", 0L),
+                entry("erroredContainers", 0L),
+                entry("deliveredContainers", 0L)
+            );
+        }
+
+        @Test
+        void channelUnregistered() throws Exception {
+            SUT.channelUnregistered(channelHandlerContext);
+            assertThat(SUT.getStatistics()).containsOnly(
+                entry("queue", 0),
+                entry("sentButUnacknowledgedSubContainer", 0),
+                entry("correlationToParentContainer", 0),
+                entry("containerCorrelationIdMap", 0),
+                entry("responsesToBeDelivered", 0),
+                entry("correlationIdGenerator", 0),
+                entry("deliveredItems", 0L),
+                entry("erroredItems", 0L),
+                entry("deliveredContainers", 0L),
+                entry("erroredContainers", 0L)
+            );
+        }
+
+        @Test
+        void channelInactive() throws Exception {
+            SUT.channelInactive(channelHandlerContext);
+            assertThat(SUT.getStatistics()).containsOnly(
+                entry("queue", 0),
+                entry("sentButUnacknowledgedSubContainer", 0),
+                entry("correlationToParentContainer", 0),
+                entry("containerCorrelationIdMap", 0),
+                entry("responsesToBeDelivered", 0),
+                entry("correlationIdGenerator", 0),
+                entry("deliveredItems", 0L),
+                entry("erroredItems", 0L),
+                entry("deliveredContainers", 0L),
+                entry("erroredContainers", 0L)
+            );
+        }
+    }
+
+    @Nested
+    class SplitConfig {
+
+        @Nested
+        class SplitOn {
+            @BeforeEach
+            void setUp() throws Exception {
+                // We setup the SUT with a special configuration
+                SUT = new SingleItemToSingleRequestProtocol(
+                    mockReader,
+                    mockWriter,
+                    mockSubscriber,
+                    new HashedWheelTimer(),
+                    TimeUnit.SECONDS.toMillis(1),
+                    SingleItemToSingleRequestProtocol.SplitConfig.builder()
+                        .dontSplitRead()
+                        .dontSplitWrite()
+                        .dontSplitSubscribe()
+                        .dontSplitUnsubscribe()
+                        .build(),
+                    false
+                );
+                SUT.channelRegistered(channelHandlerContext);
+                when(channelHandlerContext.executor().inEventLoop()).thenReturn(true);
+            }
+
+            @Test
+            void read() throws Exception {
+                // Given
+                // we have a simple read
+                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcReadRequest.build(mockReader), responseCompletableFuture);
+                // When
+                // we write this
+                SUT.write(channelHandlerContext, msg, channelPromise);
+                // then
+                // we should invoke this only one time
+                verify(channelHandlerContext, times(1)).write(eq(msg), any());
+            }
+
+            @Test
+            void write() throws Exception {
+                // Given
+                // we have a simple write
+                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcWriteRequest.build(mockWriter), responseCompletableFuture);
+                // When
+                // we write this
+                SUT.write(channelHandlerContext, msg, channelPromise);
+                // then
+                // we should invoke this only one time
+                verify(channelHandlerContext, times(1)).write(eq(msg), any());
+            }
+
+            @Test
+            void subscribe() throws Exception {
+                // Given
+                // we have a simple subscribe
+                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcSubscriptionRequest.build(mockSubscriber), responseCompletableFuture);
+                // When
+                // we write this
+                SUT.write(channelHandlerContext, msg, channelPromise);
+                // then
+                // we should invoke this only one time
+                verify(channelHandlerContext, times(1)).write(eq(msg), any());
+            }
+
+            @Test
+            void unsubsribe() throws Exception {
+                // Given
+                // we have a simple unsubscribe
+                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcUnsubscriptionRequest.build(mockSubscriber), responseCompletableFuture);
+                // When
+                // we write this
+                SUT.write(channelHandlerContext, msg, channelPromise);
+                // then
+                // we should invoke this only one time
+                verify(channelHandlerContext, times(1)).write(eq(msg), any());
+            }
+        }
+
+        @Nested
+        class SplitOff {
+            @BeforeEach
+            void setUp() throws Exception {
+                // We setup the SUT with a special configuration
+                SUT = new SingleItemToSingleRequestProtocol(
+                    mockReader,
+                    mockWriter,
+                    mockSubscriber,
+                    new HashedWheelTimer(),
+                    TimeUnit.SECONDS.toMillis(1),
+                    SingleItemToSingleRequestProtocol.SplitConfig.builder()
+                        .splitRead()
+                        .splitWrite()
+                        .splitSubscribe()
+                        .splitUnsubscribe()
+                        .build(),
+                    false
+                );
+                SUT.channelRegistered(channelHandlerContext);
+                when(channelHandlerContext.executor().inEventLoop()).thenReturn(true);
+            }
+
+            @Test
+            void read() throws Exception {
+                // Given
+                // we have a simple read
+                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcReadRequest.build(mockReader), responseCompletableFuture);
+                // When
+                // we write this
+                SUT.write(channelHandlerContext, msg, channelPromise);
+                // then
+                // we should invoke this only one time
+                verify(channelHandlerContext, times(5)).write(any(), any());
+            }
+
+            @Test
+            void write() throws Exception {
+                // Given
+                // we have a simple write
+                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcWriteRequest.build(mockWriter), responseCompletableFuture);
+                // When
+                // we write this
+                SUT.write(channelHandlerContext, msg, channelPromise);
+                // then
+                // we should invoke this only one time
+                verify(channelHandlerContext, times(5)).write(any(), any());
+            }
+
+            @Test
+            void subscribe() throws Exception {
+                // Given
+                // we have a simple subscribe
+                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcSubscriptionRequest.build(mockSubscriber), responseCompletableFuture);
+                // When
+                // we write this
+                SUT.write(channelHandlerContext, msg, channelPromise);
+                // then
+                // we should invoke this only one time
+                verify(channelHandlerContext, times(3)).write(any(), any());
+            }
+
+            @Test
+            void unsubsribe() throws Exception {
+                // Given
+                // we have a simple unsubscribe
+                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcUnsubscriptionRequest.build(mockSubscriber), responseCompletableFuture);
+                // When
+                // we write this
+                SUT.write(channelHandlerContext, msg, channelPromise);
+                // then
+                // we should invoke this only one time
+                verify(channelHandlerContext, times(3)).write(any(), any());
+            }
+        }
+
+
+    }
+
+    @Nested
+    class Roundtrip {
+        @Nested
+        class Read {
+            @Captor
+            ArgumentCaptor<PlcRequestContainer> plcRequestContainerArgumentCaptor;
+
+            @Test
+            void simpleRead() throws Exception {
+                // Given
+                // we have a simple read
+                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcReadRequest.build(mockReader), responseCompletableFuture);
+                // When
+                // we write this
+                SUT.write(channelHandlerContext, msg, channelPromise);
+                // And
+                // and we simulate that all get responded
+                verify(channelHandlerContext, times(5)).write(plcRequestContainerArgumentCaptor.capture(), any());
+                List<PlcRequestContainer> capturedDownstreamContainers = plcRequestContainerArgumentCaptor.getAllValues();
+                capturedDownstreamContainers.forEach(this::produceReadResponse);
+                // Then
+                // our complete container should complete normally
+                verify(responseCompletableFuture).complete(any());
+                // And we should have no memory leak
+                assertThat(SUT.getStatistics()).containsOnly(
+                    entry("queue", 0),
+                    entry("sentButUnacknowledgedSubContainer", 0),
+                    entry("correlationToParentContainer", 0),
+                    entry("containerCorrelationIdMap", 0),
+                    entry("responsesToBeDelivered", 0),
+                    entry("correlationIdGenerator", 5),
+                    entry("erroredItems", 0L),
+                    entry("deliveredItems", 5L),
+                    entry("deliveredContainers", 1L),
+                    entry("erroredContainers", 0L)
+                );
+            }
+
+            @Test
+            void partialRead() throws Exception {
+                // Given
+                // we have a simple read
+                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcReadRequest.build(mockReader), responseCompletableFuture);
+                // When
+                // we write this
+                SUT.write(channelHandlerContext, msg, channelPromise);
+                // And
+                // and we simulate that some one responded
+                verify(channelHandlerContext, times(5)).write(plcRequestContainerArgumentCaptor.capture(), any());
+                List<PlcRequestContainer> capturedDownstreamContainers = plcRequestContainerArgumentCaptor.getAllValues();
+                capturedDownstreamContainers.stream().findFirst().map(this::produceReadResponse);
+                // Then
+                // We create SUT with 1 seconds timeout
+                TimeUnit.SECONDS.sleep(2);
+                // our complete container should complete normally
+                verify(responseCompletableFuture).completeExceptionally(any());
+                // And we should have no memory leak
+                assertThat(SUT.getStatistics()).containsOnly(
+                    entry("queue", 0),
+                    entry("sentButUnacknowledgedSubContainer", 0),
+                    entry("correlationToParentContainer", 0),
+                    entry("containerCorrelationIdMap", 0),
+                    entry("responsesToBeDelivered", 0),
+                    entry("correlationIdGenerator", 5),
+                    entry("deliveredItems", 1L),
+                    entry("erroredItems", 4L),
+                    entry("deliveredContainers", 0L),
+                    entry("erroredContainers", 1L)
+                );
+            }
+
+            @Test
+            void partialReadOneErrored() throws Exception {
+                // Given
+                // we have a simple read
+                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcReadRequest.build(mockReader), responseCompletableFuture);
+                // When
+                // we write this
+                SUT.write(channelHandlerContext, msg, channelPromise);
+                // And
+                // and we simulate that some one responded
+                verify(channelHandlerContext, times(5)).write(plcRequestContainerArgumentCaptor.capture(), any());
+                List<PlcRequestContainer> capturedDownstreamContainers = plcRequestContainerArgumentCaptor.getAllValues();
+                capturedDownstreamContainers.stream()
+                    .findFirst()
+                    .map(plcRequestContainer ->
+                        plcRequestContainer
+                            .getResponseFuture()
+                            .completeExceptionally(new RuntimeException("ErrorOccurred"))
+                    );
+                // Then
+                // We create SUT with 1 seconds timeout
+                TimeUnit.SECONDS.sleep(2);
+                // our complete container should complete normally
+                verify(responseCompletableFuture).completeExceptionally(any());
+                // And we should have no memory leak
+                assertThat(SUT.getStatistics()).containsOnly(
+                    entry("queue", 0),
+                    entry("sentButUnacknowledgedSubContainer", 0),
+                    entry("correlationToParentContainer", 0),
+                    entry("containerCorrelationIdMap", 0),
+                    entry("responsesToBeDelivered", 0),
+                    entry("correlationIdGenerator", 5),
+                    entry("deliveredItems", 0L),
+                    entry("erroredItems", 1L),
+                    entry("deliveredContainers", 0L),
+                    entry("erroredContainers", 1L)
+                );
+            }
+
+            @Test
+            void noRead() throws Exception {
+                // Given
+                // we have a simple read
+                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcReadRequest.build(mockReader), responseCompletableFuture);
+                // When
+                // we write this
+                SUT.write(channelHandlerContext, msg, channelPromise);
+                // And
+                // and we simulate that some one responded
+                verify(channelHandlerContext, times(5)).write(any(), any());
+                // Then
+                // We create SUT with 1 seconds timeout
+                TimeUnit.SECONDS.sleep(2);
+                // our complete container should complete normally
+                verify(responseCompletableFuture).completeExceptionally(any());
+                // And we should have no memory leak
+                assertThat(SUT.getStatistics()).containsOnly(
+                    entry("queue", 0),
+                    entry("sentButUnacknowledgedSubContainer", 0),
+                    entry("correlationToParentContainer", 0),
+                    entry("containerCorrelationIdMap", 0),
+                    entry("responsesToBeDelivered", 0),
+                    entry("correlationIdGenerator", 5),
+                    entry("deliveredItems", 0L),
+                    entry("erroredItems", 5L),
+                    entry("deliveredContainers", 0L),
+                    entry("erroredContainers", 1L)
+                );
+            }
+
+            @SuppressWarnings("unchecked")
+            private Void produceReadResponse(PlcRequestContainer plcRequestContainer) {
+                InternalPlcReadRequest request = (InternalPlcReadRequest) plcRequestContainer.getRequest();
+                // TODO: we need a response for every item
+                String fieldName = request.getFieldNames().iterator().next();
+                CompletableFuture responseFuture = plcRequestContainer.getResponseFuture();
+                HashMap<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> responseFields = new HashMap<>();
+                responseFields.put(fieldName, Pair.of(PlcResponseCode.OK, mock(BaseDefaultFieldItem.class)));
+                responseFuture.complete(new DefaultPlcReadResponse(request, responseFields));
+                return null;
+            }
+        }
+
+        @Nested
+        class Write {
+            // TODO: implement me
+        }
+
+        @Nested
+        class Subscribe {
+            @Captor
+            ArgumentCaptor<PlcRequestContainer> plcRequestContainerArgumentCaptor;
+
+            @Test
+            void simpleSubscribe() throws Exception {
+                // Given
+                // we have a simple read
+                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcSubscriptionRequest.build(mockSubscriber), responseCompletableFuture);
+                // When
+                // we write this
+                SUT.write(channelHandlerContext, msg, channelPromise);
+                // And
+                // and we simulate that all get responded
+                verify(channelHandlerContext, times(3)).write(plcRequestContainerArgumentCaptor.capture(), any());
+                List<PlcRequestContainer> capturedDownstreamContainers = plcRequestContainerArgumentCaptor.getAllValues();
+                capturedDownstreamContainers.forEach(this::produceSubscriptionResponse);
+                // Then
+                // our complete container should complete normally
+                verify(responseCompletableFuture).complete(any());
+                // And we should have no memory leak
+                assertThat(SUT.getStatistics()).containsOnly(
+                    entry("queue", 0),
+                    entry("sentButUnacknowledgedSubContainer", 0),
+                    entry("correlationToParentContainer", 0),
+                    entry("containerCorrelationIdMap", 0),
+                    entry("responsesToBeDelivered", 0),
+                    entry("correlationIdGenerator", 3),
+                    entry("erroredItems", 0L),
+                    entry("deliveredItems", 3L),
+                    entry("deliveredContainers", 1L),
+                    entry("erroredContainers", 0L)
+                );
+            }
+
+            @Test
+            void simpleUnsubscribe() throws Exception {
+                // Given
+                // we have a simple read
+                PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcUnsubscriptionRequest.build(mockSubscriber), responseCompletableFuture);
+                // When
+                // we write this
+                SUT.write(channelHandlerContext, msg, channelPromise);
+                // And
+                // and we simulate that all get responded
+                verify(channelHandlerContext, times(3)).write(plcRequestContainerArgumentCaptor.capture(), any());
+                List<PlcRequestContainer> capturedDownstreamContainers = plcRequestContainerArgumentCaptor.getAllValues();
+                capturedDownstreamContainers.forEach(this::produceUnsubscriptionResponse);
+                // Then
+                // our complete container should complete normally
+                verify(responseCompletableFuture).complete(any());
+                // And we should have no memory leak
+                assertThat(SUT.getStatistics()).containsOnly(
+                    entry("queue", 0),
+                    entry("sentButUnacknowledgedSubContainer", 0),
+                    entry("correlationToParentContainer", 0),
+                    entry("containerCorrelationIdMap", 0),
+                    entry("responsesToBeDelivered", 0),
+                    entry("correlationIdGenerator", 3),
+                    entry("erroredItems", 0L),
+                    entry("deliveredItems", 3L),
+                    entry("deliveredContainers", 1L),
+                    entry("erroredContainers", 0L)
+                );
+            }
+
+            @SuppressWarnings("unchecked")
+            private Void produceSubscriptionResponse(PlcRequestContainer plcRequestContainer) {
+                InternalPlcSubscriptionRequest request = (InternalPlcSubscriptionRequest) plcRequestContainer.getRequest();
+                // TODO: we need a response for every item
+                String fieldName = request.getFieldNames().iterator().next();
+                CompletableFuture responseFuture = plcRequestContainer.getResponseFuture();
+                HashMap<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> responseFields = new HashMap<>();
+                responseFields.put(fieldName, Pair.of(PlcResponseCode.OK, mock(PlcSubscriptionHandle.class)));
+                responseFuture.complete(new DefaultPlcSubscriptionResponse(request, responseFields));
+                return null;
+            }
+
+            @SuppressWarnings("unchecked")
+            private Void produceUnsubscriptionResponse(PlcRequestContainer plcRequestContainer) {
+                InternalPlcUnsubscriptionRequest request = (InternalPlcUnsubscriptionRequest) plcRequestContainer.getRequest();
+                // TODO: we need a response for every item
+                InternalPlcSubscriptionHandle internalPlcSubscriptionHandle = request.getInternalPlcSubscriptionHandles().iterator().next();
+                // TODO: handles ignored for now.
+                CompletableFuture responseFuture = plcRequestContainer.getResponseFuture();
+                responseFuture.complete(new DefaultPlcUnsubscriptionResponse(request));
+                return null;
+            }
+        }
+    }
+
+    @Nested
+    class Decoding {
+        @Test
+        void tryFinish() {
+            SUT.tryFinish(1, null, new CompletableFuture<>());
+            // TODO: add Assertions.
+        }
+
+        @Test
+        void errored() {
+            SUT.errored(1, mock(Throwable.class), new CompletableFuture<>());
+            // TODO: add Assertions.
+        }
+    }
+
+    @Nested
+    class Encoding {
+
+        @Captor
+        ArgumentCaptor<PlcRequestContainer> plcRequestContainerArgumentCaptor;
+
+        @Test
+        void empty() throws Exception {
+            // Given
+            Object msg = null;
+            // When
+            SUT.write(channelHandlerContext, msg, channelPromise);
+            // Then
+            verify(channelHandlerContext, times(1)).write(null, channelPromise);
+        }
+
+        @Test
+        void read() throws Exception {
+            // Given
+            PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcReadRequest.build(mockReader), responseCompletableFuture);
+            // When
+            SUT.write(channelHandlerContext, msg, channelPromise);
+            // Then
+            verify(channelHandlerContext, times(5)).write(plcRequestContainerArgumentCaptor.capture(), any());
+            List<PlcRequestContainer> capturedValues = plcRequestContainerArgumentCaptor.getAllValues();
+            // We check if every request as exactly one field
+            assertThat(capturedValues)
+                .allMatch(plcRequestContainer -> plcRequestContainer.getRequest() instanceof SingleItemToSingleRequestProtocol.CorrelatedPlcReadRequest)
+                .allMatch(plcRequestContainer -> ((SingleItemToSingleRequestProtocol.CorrelatedPlcReadRequest) plcRequestContainer.getRequest()).getNumberOfFields() == 1);
+            // In sum we should see all fields
+            List<String> fieldNamesList = capturedValues.stream()
+                .map(PlcRequestContainer::getRequest)
+                .map(PlcFieldRequest.class::cast)
+                .map(PlcFieldRequest::getFieldNames)
+                .flatMap(Collection::stream)
+                .collect(Collectors.toList());
+            // There should be no duplications
+            assertThat(fieldNamesList).hasSize(5);
+            assertThat(fieldNamesList).containsExactly(
+                "readField1",
+                "readField2",
+                "readField3",
+                "readField4",
+                "readField5"
+            );
+        }
+
+        @Test
+        void write() throws Exception {
+            // Given
+            PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcWriteRequest.build(mockWriter), responseCompletableFuture);
+            // When
+            SUT.write(channelHandlerContext, msg, channelPromise);
+            // Then
+            verify(channelHandlerContext, times(5)).write(plcRequestContainerArgumentCaptor.capture(), any());
+            List<PlcRequestContainer> capturedValues = plcRequestContainerArgumentCaptor.getAllValues();
+            // We check if every request as exactly one field
+            assertThat(capturedValues)
+                .allMatch(plcRequestContainer -> plcRequestContainer.getRequest() instanceof SingleItemToSingleRequestProtocol.CorrelatedPlcWriteRequest)
+                .allMatch(plcRequestContainer -> ((SingleItemToSingleRequestProtocol.CorrelatedPlcWriteRequest) plcRequestContainer.getRequest()).getNumberOfFields() == 1);
+            // In sum we should see all fields
+            List<String> fieldNamesList = capturedValues.stream()
+                .map(PlcRequestContainer::getRequest)
+                .map(PlcFieldRequest.class::cast)
+                .map(PlcFieldRequest::getFieldNames)
+                .flatMap(Collection::stream)
+                .collect(Collectors.toList());
+            // There should be no duplications
+            assertThat(fieldNamesList).hasSize(5);
+            assertThat(fieldNamesList).containsExactly(
+                "writeField1",
+                "writeField2",
+                "writeField3",
+                "writeField4",
+                "writeField5"
+            );
+        }
+
+        @Test
+        void subscribe() {
+            // TODO: implement once available
+        }
+
+        @Test
+        void unsubcribe() {
+            // TODO: implement once available
+        }
+
+        @Test
+        void trySendingMessages() throws Exception {
+            PendingWriteQueue queue = (PendingWriteQueue) FieldUtils.getField(SUT.getClass(), "queue", true).get(SUT);
+            assertThat(queue.size()).isLessThanOrEqualTo(0);
+            queue.add(mock(PlcRequestContainer.class), channelPromise);
+            assertThat(queue.size()).isGreaterThan(0);
+            SUT.trySendingMessages(channelHandlerContext);
+            assertThat(queue.size()).isLessThanOrEqualTo(0);
+        }
+    }
+
+    private static class TestDefaultPlcReadRequest extends DefaultPlcReadRequest {
+        private TestDefaultPlcReadRequest(PlcReader reader, LinkedHashMap<String, PlcField> fields) {
+            super(reader, fields);
+        }
+
+        private static TestDefaultPlcReadRequest build(PlcReader reader) {
+            LinkedHashMap<String, PlcField> fields = new LinkedHashMap<>();
+            IntStream.rangeClosed(1, 5).forEach(i -> fields.put("readField" + i, mock(PlcField.class)));
+            return new TestDefaultPlcReadRequest(reader, fields);
+        }
+    }
+
+    private static class TestDefaultPlcWriteRequest extends DefaultPlcWriteRequest {
+
+        private TestDefaultPlcWriteRequest(PlcWriter writer, LinkedHashMap<String, Pair<PlcField, BaseDefaultFieldItem>> fields) {
+            super(writer, fields);
+        }
+
+        private static TestDefaultPlcWriteRequest build(PlcWriter writer) {
+            LinkedHashMap<String, Pair<PlcField, BaseDefaultFieldItem>> fields = new LinkedHashMap<>();
+            IntStream.rangeClosed(1, 5).forEach(i -> fields.put("writeField" + i, Pair.of(mock(PlcField.class), mock(BaseDefaultFieldItem.class))));
+            return new TestDefaultPlcWriteRequest(writer, fields);
+        }
+    }
+
+    private static class TestDefaultPlcSubscriptionRequest extends DefaultPlcSubscriptionRequest {
+
+        private TestDefaultPlcSubscriptionRequest(PlcSubscriber subscriber, LinkedHashMap<String, SubscriptionPlcField> fields) {
+            super(subscriber, fields);
+        }
+
+        private static TestDefaultPlcSubscriptionRequest build(PlcSubscriber subscriber) {
+            LinkedHashMap<String, SubscriptionPlcField> fields = new LinkedHashMap<>();
+            fields.put("sub1", mock(SubscriptionPlcField.class));
+            fields.put("sub2", mock(SubscriptionPlcField.class));
+            fields.put("sub3", mock(SubscriptionPlcField.class));
+            return new TestDefaultPlcSubscriptionRequest(subscriber, fields);
+        }
+    }
+
+    private static class TestDefaultPlcUnsubscriptionRequest extends DefaultPlcUnsubscriptionRequest {
+
+        private TestDefaultPlcUnsubscriptionRequest(PlcSubscriber subscriber, Collection<? extends InternalPlcSubscriptionHandle> internalPlcSubscriptionHandles) {
+            super(subscriber, internalPlcSubscriptionHandles);
+        }
+
+        private static TestDefaultPlcUnsubscriptionRequest build(PlcSubscriber subscriber) {
+            List<InternalPlcSubscriptionHandle> internalPlcSubscriptionHandles = new LinkedList<>();
+            internalPlcSubscriptionHandles.add(mock(InternalPlcSubscriptionHandle.class));
+            internalPlcSubscriptionHandles.add(mock(InternalPlcSubscriptionHandle.class));
+            internalPlcSubscriptionHandles.add(mock(InternalPlcSubscriptionHandle.class));
+            return new TestDefaultPlcUnsubscriptionRequest(subscriber, internalPlcSubscriptionHandles);
+        }
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/base/src/test/resources/META-INF/services/com.athaydes.spockframework.report.IReportCreator.properties b/plc4j/protocols/driver-bases/base/src/test/resources/META-INF/services/com.athaydes.spockframework.report.IReportCreator.properties
index 0759363d08a..3eba24ca463 100644
--- a/plc4j/protocols/driver-bases/base/src/test/resources/META-INF/services/com.athaydes.spockframework.report.IReportCreator.properties
+++ b/plc4j/protocols/driver-bases/base/src/test/resources/META-INF/services/com.athaydes.spockframework.report.IReportCreator.properties
@@ -1,66 +1,66 @@
-#
-# 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
-#
-#     http://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.
-#
-
-# Name of the implementation class(es) of report creator(s) to enable (separate multiple entries with commas)
-# Currently supported classes are:
-#   1. com.athaydes.spockframework.report.internal.HtmlReportCreator
-#   2. com.athaydes.spockframework.report.template.TemplateReportCreator
-com.athaydes.spockframework.report.IReportCreator=com.athaydes.spockframework.report.internal.HtmlReportCreator
-
-# Set properties of the report creator
-# For the HtmlReportCreator, the only properties available are
-# (the location of the css files is relative to the classpath):
-com.athaydes.spockframework.report.internal.HtmlReportCreator.featureReportCss=spock-feature-report.css
-com.athaydes.spockframework.report.internal.HtmlReportCreator.summaryReportCss=spock-summary-report.css
-com.athaydes.spockframework.report.internal.HtmlReportCreator.printThrowableStackTrace=false
-com.athaydes.spockframework.report.internal.HtmlReportCreator.inlineCss=true
-com.athaydes.spockframework.report.internal.HtmlReportCreator.enabled=true
-# options are: "class_name_and_title", "class_name", "title"
-com.athaydes.spockframework.report.internal.HtmlReportCreator.specSummaryNameOption=class_name_and_title
-
-# exclude Specs Table of Contents
-com.athaydes.spockframework.report.internal.HtmlReportCreator.excludeToc=false
-
-# Output directory (where the spock reports will be created) - relative to working directory
-com.athaydes.spockframework.report.outputDir=target/spock-reports
-
-# Output directory where to store the aggregated JSON report (used to support parallel builds)
-com.athaydes.spockframework.report.aggregatedJsonReportDir=
-
-# If set to true, hides blocks which do not have any description
-com.athaydes.spockframework.report.hideEmptyBlocks=false
-
-# Set the name of the project under test so it can be displayed in the report
-com.athaydes.spockframework.report.projectName=
-
-# Set the version of the project under test so it can be displayed in the report
-com.athaydes.spockframework.report.projectVersion=Unknown
-
-# Show the source code for each block
-com.athaydes.spockframework.report.showCodeBlocks=false
-
-# Set the root location of the Spock test source code (only used if showCodeBlocks is 'true')
-com.athaydes.spockframework.report.testSourceRoots=src/test/groovy
-
-# Set properties specific to the TemplateReportCreator
-com.athaydes.spockframework.report.template.TemplateReportCreator.specTemplateFile=/templateReportCreator/spec-template.md
-com.athaydes.spockframework.report.template.TemplateReportCreator.reportFileExtension=md
-com.athaydes.spockframework.report.template.TemplateReportCreator.summaryTemplateFile=/templateReportCreator/summary-template.md
-com.athaydes.spockframework.report.template.TemplateReportCreator.summaryFileName=summary.md
+#
+# 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
+#
+#     http://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.
+#
+
+# Name of the implementation class(es) of report creator(s) to enable (separate multiple entries with commas)
+# Currently supported classes are:
+#   1. com.athaydes.spockframework.report.internal.HtmlReportCreator
+#   2. com.athaydes.spockframework.report.template.TemplateReportCreator
+com.athaydes.spockframework.report.IReportCreator=com.athaydes.spockframework.report.internal.HtmlReportCreator
+
+# Set properties of the report creator
+# For the HtmlReportCreator, the only properties available are
+# (the location of the css files is relative to the classpath):
+com.athaydes.spockframework.report.internal.HtmlReportCreator.featureReportCss=spock-feature-report.css
+com.athaydes.spockframework.report.internal.HtmlReportCreator.summaryReportCss=spock-summary-report.css
+com.athaydes.spockframework.report.internal.HtmlReportCreator.printThrowableStackTrace=false
+com.athaydes.spockframework.report.internal.HtmlReportCreator.inlineCss=true
+com.athaydes.spockframework.report.internal.HtmlReportCreator.enabled=true
+# options are: "class_name_and_title", "class_name", "title"
+com.athaydes.spockframework.report.internal.HtmlReportCreator.specSummaryNameOption=class_name_and_title
+
+# exclude Specs Table of Contents
+com.athaydes.spockframework.report.internal.HtmlReportCreator.excludeToc=false
+
+# Output directory (where the spock reports will be created) - relative to working directory
+com.athaydes.spockframework.report.outputDir=target/spock-reports
+
+# Output directory where to store the aggregated JSON report (used to support parallel builds)
+com.athaydes.spockframework.report.aggregatedJsonReportDir=
+
+# If set to true, hides blocks which do not have any description
+com.athaydes.spockframework.report.hideEmptyBlocks=false
+
+# Set the name of the project under test so it can be displayed in the report
+com.athaydes.spockframework.report.projectName=
+
+# Set the version of the project under test so it can be displayed in the report
+com.athaydes.spockframework.report.projectVersion=Unknown
+
+# Show the source code for each block
+com.athaydes.spockframework.report.showCodeBlocks=false
+
+# Set the root location of the Spock test source code (only used if showCodeBlocks is 'true')
+com.athaydes.spockframework.report.testSourceRoots=src/test/groovy
+
+# Set properties specific to the TemplateReportCreator
+com.athaydes.spockframework.report.template.TemplateReportCreator.specTemplateFile=/templateReportCreator/spec-template.md
+com.athaydes.spockframework.report.template.TemplateReportCreator.reportFileExtension=md
+com.athaydes.spockframework.report.template.TemplateReportCreator.summaryTemplateFile=/templateReportCreator/summary-template.md
+com.athaydes.spockframework.report.template.TemplateReportCreator.summaryFileName=summary.md
 com.athaydes.spockframework.report.template.TemplateReportCreator.enabled=true
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/pcap-socket/pom.xml b/plc4j/protocols/driver-bases/pcap-socket/pom.xml
index e77d9a81808..7d5c9a76301 100644
--- a/plc4j/protocols/driver-bases/pcap-socket/pom.xml
+++ b/plc4j/protocols/driver-bases/pcap-socket/pom.xml
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-protocols-driver-bases</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-protocol-driver-base-pcap-socket</artifactId>
-  <name>PLC4J: Protocol: Driver-Base: PCAP</name>
-  <description>Base classes needed to implement plc4x drivers based on an simulated network device using a PCAP capture file to simulate network trafic.</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-utils-pcap-sockets</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-common</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-protocols-driver-bases</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-protocol-driver-base-pcap-socket</artifactId>
+  <name>PLC4J: Protocol: Driver-Base: PCAP</name>
+  <description>Base classes needed to implement plc4x drivers based on an simulated network device using a PCAP capture file to simulate network trafic.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-utils-pcap-sockets</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-common</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/pcap-socket/src/main/java/org/apache/plc4x/java/base/connection/PcapChannelFactory.java b/plc4j/protocols/driver-bases/pcap-socket/src/main/java/org/apache/plc4x/java/base/connection/PcapChannelFactory.java
index 6731a7694ef..9ac29790d35 100644
--- a/plc4j/protocols/driver-bases/pcap-socket/src/main/java/org/apache/plc4x/java/base/connection/PcapChannelFactory.java
+++ b/plc4j/protocols/driver-bases/pcap-socket/src/main/java/org/apache/plc4x/java/base/connection/PcapChannelFactory.java
@@ -1,101 +1,101 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.connection;
-
-import io.netty.bootstrap.Bootstrap;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.oio.OioEventLoopGroup;
-import io.netty.util.concurrent.Future;
-import io.netty.util.concurrent.GenericFutureListener;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.exceptions.PlcException;
-import org.apache.plc4x.java.utils.pcapsockets.netty.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.net.InetAddress;
-
-public class PcapChannelFactory implements ChannelFactory {
-
-    private static final Logger logger = LoggerFactory.getLogger(PcapChannelFactory.class);
-
-    private final File pcapFile;
-    private final InetAddress address;
-    private final int port;
-    private final int protocolId;
-    private final float replaySpeedFactor;
-    private final PacketHandler packetHandler;
-
-    public PcapChannelFactory(File pcapFile, InetAddress address, int port, int protocolId, float replaySpeedFactor, PacketHandler packetHandler) {
-        this.pcapFile = pcapFile;
-        this.address = address;
-        this.port = port;
-        this.protocolId = protocolId;
-        this.replaySpeedFactor = replaySpeedFactor;
-        this.packetHandler = packetHandler;
-    }
-
-    @Override
-    public Channel createChannel(ChannelHandler channelHandler)
-        throws PlcConnectionException {
-        try {
-            final EventLoopGroup workerGroup = new OioEventLoopGroup();
-
-            Bootstrap bootstrap = new Bootstrap();
-            bootstrap.group(workerGroup);
-            bootstrap.channel(PcapSocketChannel.class);
-            bootstrap.option(PcapSocketChannelOption.PACKET_HANDLER, packetHandler);
-            bootstrap.option(PcapSocketChannelOption.SPEED_FACTOR, replaySpeedFactor);
-            bootstrap.handler(channelHandler);
-
-            // Start the client.
-            ChannelFuture f = bootstrap.connect(new PcapSocketAddress(pcapFile, address, port, protocolId)).sync();
-            f.addListener(new GenericFutureListener<Future<? super Void>>() {
-                @Override public void operationComplete(Future<? super Void> future) throws Exception {
-                    if (!future.isSuccess()) {
-                        logger.info("Unable to connect, shutting down worker thread.");
-                        workerGroup.shutdownGracefully();
-                    }
-                }
-            });
-            // Wait for sync
-            f.sync();
-            f.awaitUninterruptibly();
-            // Wait till the session is finished initializing.
-            return f.channel();
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new PlcConnectionException("Error creating channel.", e);
-        }
-    }
-
-    @Override
-    public void ping() throws PlcException {
-        // Raw-Sockets are absolutely passive, so there is nothing to do for a ping.
-    }
-
-    public File getPcapFile() {
-        return pcapFile;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.connection;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.oio.OioEventLoopGroup;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.exceptions.PlcException;
+import org.apache.plc4x.java.utils.pcapsockets.netty.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.net.InetAddress;
+
+public class PcapChannelFactory implements ChannelFactory {
+
+    private static final Logger logger = LoggerFactory.getLogger(PcapChannelFactory.class);
+
+    private final File pcapFile;
+    private final InetAddress address;
+    private final int port;
+    private final int protocolId;
+    private final float replaySpeedFactor;
+    private final PacketHandler packetHandler;
+
+    public PcapChannelFactory(File pcapFile, InetAddress address, int port, int protocolId, float replaySpeedFactor, PacketHandler packetHandler) {
+        this.pcapFile = pcapFile;
+        this.address = address;
+        this.port = port;
+        this.protocolId = protocolId;
+        this.replaySpeedFactor = replaySpeedFactor;
+        this.packetHandler = packetHandler;
+    }
+
+    @Override
+    public Channel createChannel(ChannelHandler channelHandler)
+        throws PlcConnectionException {
+        try {
+            final EventLoopGroup workerGroup = new OioEventLoopGroup();
+
+            Bootstrap bootstrap = new Bootstrap();
+            bootstrap.group(workerGroup);
+            bootstrap.channel(PcapSocketChannel.class);
+            bootstrap.option(PcapSocketChannelOption.PACKET_HANDLER, packetHandler);
+            bootstrap.option(PcapSocketChannelOption.SPEED_FACTOR, replaySpeedFactor);
+            bootstrap.handler(channelHandler);
+
+            // Start the client.
+            ChannelFuture f = bootstrap.connect(new PcapSocketAddress(pcapFile, address, port, protocolId)).sync();
+            f.addListener(new GenericFutureListener<Future<? super Void>>() {
+                @Override public void operationComplete(Future<? super Void> future) throws Exception {
+                    if (!future.isSuccess()) {
+                        logger.info("Unable to connect, shutting down worker thread.");
+                        workerGroup.shutdownGracefully();
+                    }
+                }
+            });
+            // Wait for sync
+            f.sync();
+            f.awaitUninterruptibly();
+            // Wait till the session is finished initializing.
+            return f.channel();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new PlcConnectionException("Error creating channel.", e);
+        }
+    }
+
+    @Override
+    public void ping() throws PlcException {
+        // Raw-Sockets are absolutely passive, so there is nothing to do for a ping.
+    }
+
+    public File getPcapFile() {
+        return pcapFile;
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/pom.xml b/plc4j/protocols/driver-bases/pom.xml
index e35ee47719c..c25c2fbb20f 100644
--- a/plc4j/protocols/driver-bases/pom.xml
+++ b/plc4j/protocols/driver-bases/pom.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-protocols</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-protocols-driver-bases</artifactId>
-  <packaging>pom</packaging>
-
-  <name>PLC4J: Protocols: Driver-Bases</name>
-  <description>Collection of base-types for implementing different types of drivers.</description>
-
-  <modules>
-    <module>base</module>
-    <module>pcap-socket</module>
-    <module>raw-socket</module>
-    <module>serial</module>
-    <module>tcp</module>
-    <module>udp</module>
-    <module>test</module>
-  </modules>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-protocols</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-protocols-driver-bases</artifactId>
+  <packaging>pom</packaging>
+
+  <name>PLC4J: Protocols: Driver-Bases</name>
+  <description>Collection of base-types for implementing different types of drivers.</description>
+
+  <modules>
+    <module>base</module>
+    <module>pcap-socket</module>
+    <module>raw-socket</module>
+    <module>serial</module>
+    <module>tcp</module>
+    <module>udp</module>
+    <module>test</module>
+  </modules>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/raw-socket/pom.xml b/plc4j/protocols/driver-bases/raw-socket/pom.xml
index 8606649aee1..cf2d713ab1c 100644
--- a/plc4j/protocols/driver-bases/raw-socket/pom.xml
+++ b/plc4j/protocols/driver-bases/raw-socket/pom.xml
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-protocols-driver-bases</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-protocol-driver-base-raw-socket</artifactId>
-  <name>PLC4J: Protocol: Driver-Base: Raw Socket</name>
-  <description>Base classes needed to implement plc4x drivers based on Raw Socket connections.</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-utils-raw-sockets</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-common</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-protocols-driver-bases</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-protocol-driver-base-raw-socket</artifactId>
+  <name>PLC4J: Protocol: Driver-Base: Raw Socket</name>
+  <description>Base classes needed to implement plc4x drivers based on Raw Socket connections.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-utils-raw-sockets</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-common</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/raw-socket/src/main/java/org/apache/plc4x/java/base/connection/RawSocketChannelFactory.java b/plc4j/protocols/driver-bases/raw-socket/src/main/java/org/apache/plc4x/java/base/connection/RawSocketChannelFactory.java
index 5ba44c63aee..407282d223d 100644
--- a/plc4j/protocols/driver-bases/raw-socket/src/main/java/org/apache/plc4x/java/base/connection/RawSocketChannelFactory.java
+++ b/plc4j/protocols/driver-bases/raw-socket/src/main/java/org/apache/plc4x/java/base/connection/RawSocketChannelFactory.java
@@ -1,110 +1,110 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.connection;
-
-import io.netty.bootstrap.Bootstrap;
-import io.netty.channel.*;
-import io.netty.channel.oio.OioEventLoopGroup;
-import io.netty.util.concurrent.Future;
-import io.netty.util.concurrent.GenericFutureListener;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.exceptions.PlcException;
-import org.apache.plc4x.java.utils.rawsockets.netty.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.InetAddress;
-
-public class RawSocketChannelFactory implements ChannelFactory {
-
-    private static final Logger logger = LoggerFactory.getLogger(RawSocketChannelFactory.class);
-
-    private static final int PING_TIMEOUT_MS = 1_000;
-
-    private final String deviceName;
-    private final InetAddress address;
-    private final int port;
-    private final int protocolId;
-    private final PacketHandler packetHandler;
-
-    public RawSocketChannelFactory(String deviceName, InetAddress address, int port, int protocolId, PacketHandler packetHandler) {
-        this.deviceName = deviceName;
-        this.address = address;
-        this.port = port;
-        this.protocolId = protocolId;
-        this.packetHandler = packetHandler;
-    }
-
-    @Override
-    public Channel createChannel(ChannelHandler channelHandler)
-        throws PlcConnectionException {
-        try {
-            final EventLoopGroup workerGroup = new OioEventLoopGroup();
-
-            Bootstrap bootstrap = new Bootstrap();
-            bootstrap.group(workerGroup);
-            bootstrap.channel(RawSocketChannel.class);
-            bootstrap.option(RawSocketChannelOption.PACKET_HANDLER, packetHandler);
-            // TODO we should use an explicit (configurable?) timeout here
-            // bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 1000);
-            bootstrap.handler(channelHandler);
-
-            // Start the client.
-            ChannelFuture f = bootstrap.connect(new RawSocketIpAddress(deviceName, protocolId, address, port)).sync();
-            f.addListener(new GenericFutureListener<Future<? super Void>>() {
-                @Override public void operationComplete(Future<? super Void> future) throws Exception {
-                    if (!future.isSuccess()) {
-                        logger.info("Unable to connect, shutting down worker thread.");
-                        workerGroup.shutdownGracefully();
-                    }
-                }
-            });
-            // Wait for sync
-            f.sync();
-            f.awaitUninterruptibly();
-            // Wait till the session is finished initializing.
-            return f.channel();
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new PlcConnectionException("Error creating channel.", e);
-        }
-    }
-
-    @Override
-    public void ping() throws PlcException {
-        // Raw-Sockets are absolutely passive, so there is nothing to do for a ping.
-    }
-
-    public String getDeviceName() {
-        return deviceName;
-    }
-
-    public InetAddress getAddress() {
-        return address;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-    public int getProtocolId() {
-        return protocolId;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.connection;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.*;
+import io.netty.channel.oio.OioEventLoopGroup;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.exceptions.PlcException;
+import org.apache.plc4x.java.utils.rawsockets.netty.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.InetAddress;
+
+public class RawSocketChannelFactory implements ChannelFactory {
+
+    private static final Logger logger = LoggerFactory.getLogger(RawSocketChannelFactory.class);
+
+    private static final int PING_TIMEOUT_MS = 1_000;
+
+    private final String deviceName;
+    private final InetAddress address;
+    private final int port;
+    private final int protocolId;
+    private final PacketHandler packetHandler;
+
+    public RawSocketChannelFactory(String deviceName, InetAddress address, int port, int protocolId, PacketHandler packetHandler) {
+        this.deviceName = deviceName;
+        this.address = address;
+        this.port = port;
+        this.protocolId = protocolId;
+        this.packetHandler = packetHandler;
+    }
+
+    @Override
+    public Channel createChannel(ChannelHandler channelHandler)
+        throws PlcConnectionException {
+        try {
+            final EventLoopGroup workerGroup = new OioEventLoopGroup();
+
+            Bootstrap bootstrap = new Bootstrap();
+            bootstrap.group(workerGroup);
+            bootstrap.channel(RawSocketChannel.class);
+            bootstrap.option(RawSocketChannelOption.PACKET_HANDLER, packetHandler);
+            // TODO we should use an explicit (configurable?) timeout here
+            // bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 1000);
+            bootstrap.handler(channelHandler);
+
+            // Start the client.
+            ChannelFuture f = bootstrap.connect(new RawSocketIpAddress(deviceName, protocolId, address, port)).sync();
+            f.addListener(new GenericFutureListener<Future<? super Void>>() {
+                @Override public void operationComplete(Future<? super Void> future) throws Exception {
+                    if (!future.isSuccess()) {
+                        logger.info("Unable to connect, shutting down worker thread.");
+                        workerGroup.shutdownGracefully();
+                    }
+                }
+            });
+            // Wait for sync
+            f.sync();
+            f.awaitUninterruptibly();
+            // Wait till the session is finished initializing.
+            return f.channel();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new PlcConnectionException("Error creating channel.", e);
+        }
+    }
+
+    @Override
+    public void ping() throws PlcException {
+        // Raw-Sockets are absolutely passive, so there is nothing to do for a ping.
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public InetAddress getAddress() {
+        return address;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
+    public int getProtocolId() {
+        return protocolId;
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/serial/pom.xml b/plc4j/protocols/driver-bases/serial/pom.xml
index 057cbd07f1e..448da53a0e6 100644
--- a/plc4j/protocols/driver-bases/serial/pom.xml
+++ b/plc4j/protocols/driver-bases/serial/pom.xml
@@ -1,81 +1,81 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-protocols-driver-bases</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-protocol-driver-base-serial</artifactId>
-  <name>PLC4J: Protocol: Driver-Base: Serial</name>
-  <description>Base classes needed to implement plc4x drivers based on Serial connections.</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-
-
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-buffer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-codec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-common</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>com.fazecast</groupId>
-      <artifactId>jSerialComm</artifactId>
-      <version>2.5.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-protocols-driver-bases</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-protocol-driver-base-serial</artifactId>
+  <name>PLC4J: Protocol: Driver-Base: Serial</name>
+  <description>Base classes needed to implement plc4x drivers based on Serial connections.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+
+
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-common</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fazecast</groupId>
+      <artifactId>jSerialComm</artifactId>
+      <version>2.5.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialChannel.java b/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialChannel.java
index 762d3f7dea3..f00423fca30 100644
--- a/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialChannel.java
+++ b/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialChannel.java
@@ -1,635 +1,635 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.serial.connection.connection;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.channel.*;
-import io.netty.channel.nio.AbstractNioByteChannel;
-import io.netty.channel.nio.AbstractNioChannel;
-import io.netty.channel.nio.NioEventLoop;
-import io.netty.channel.socket.DuplexChannel;
-import io.netty.util.ReferenceCountUtil;
-import org.apache.commons.lang3.NotImplementedException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.SocketAddress;
-import java.nio.channels.ClosedChannelException;
-import java.nio.channels.SelectableChannel;
-import java.util.concurrent.RejectedExecutionException;
-
-/**
- * TODO write comment
- *
- * @author julian
- * Created by julian on 2019-08-10
- */
-public class SerialChannel extends AbstractNioByteChannel implements DuplexChannel {
-
-    private static final Logger logger = LoggerFactory.getLogger(SerialChannel.class);
-    private final ChannelConfig config;
-
-    private final VoidChannelPromise unsafeVoidPromise = new VoidChannelPromise(this, false);
-    private boolean readPending = false; // Did we receive an EOF?
-    private SocketAddress remoteAddress;
-    private boolean active = false;
-    private SerialSelectionKey selectionKey;
-    private SerialChannelHandler comPort;
-    private final DefaultChannelPipeline pipeline; // Copied from AbstractChannel
-
-
-    public SerialChannel() {
-        this(null, new SerialSocketChannel(new SerialSelectorProvider()));
-        ((SerialSocketChannel) javaChannel()).setChild(this);
-    }
-
-    /**
-     * Create a new instance
-     *
-     * @param parent the parent {@link Channel} by which this instance was created. May be {@code null}
-     * @param ch     the underlying {@link SelectableChannel} on which it operates
-     */
-    protected SerialChannel(Channel parent, SelectableChannel ch) {
-        super(parent, ch);
-        config = new DefaultChannelConfig(this);
-        pipeline = newChannelPipeline();
-    }
-
-    @Override
-    public NioUnsafe unsafe() {
-        return new SerialNioUnsafe();
-    }
-
-    @Override
-    public boolean isInputShutdown() {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public ChannelFuture shutdownInput() {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public ChannelFuture shutdownInput(ChannelPromise promise) {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public boolean isOutputShutdown() {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public ChannelFuture shutdownOutput() {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public ChannelFuture shutdownOutput(ChannelPromise promise) {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public boolean isShutdown() {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public ChannelFuture shutdown() {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public ChannelFuture shutdown(ChannelPromise promise) {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    protected long doWriteFileRegion(FileRegion region) throws Exception {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    protected int doReadBytes(ByteBuf buf) throws Exception {
-        if (!active) {
-            return 0;
-        }
-        logger.debug("Trying to read bytes from wire...");
-        int bytesRead = comPort.read(buf);
-        logger.debug("Read {} bytes from the wire", bytesRead);
-        return bytesRead;
-    }
-
-    @Override
-    protected int doWriteBytes(ByteBuf buf) throws Exception {
-        // Here we really write bytes to Socket!
-        if (!active) {
-            return 0;
-        }
-        logger.debug("Trying to write bytes to wire...");
-        int bytesWritten = comPort.write(buf);
-        logger.debug("Wrote {} bytes to wire!", bytesWritten);
-        return bytesWritten;
-    }
-
-    @Override
-    protected boolean doConnect(SocketAddress remoteAddress, SocketAddress localAddress) throws Exception {
-        this.remoteAddress = remoteAddress;
-        if (!(remoteAddress instanceof SerialSocketAddress)) {
-            throw new IllegalArgumentException("Socket Address has to be of type " + SerialSocketAddress.class);
-        }
-        logger.debug("Connecting to Socket Address '{}'", ((SerialSocketAddress) remoteAddress).getIdentifier());
-
-        try {
-            // A bit hacky but to make a Test Connection start the String with TEST
-            if (((SerialSocketAddress) remoteAddress).getIdentifier().startsWith("TEST")) {
-                comPort = SerialChannelHandler.DummyHandler.INSTANCE;
-            } else {
-                comPort = new SerialChannelHandler.SerialPortHandler(remoteAddress);
-            }
-            logger.debug("Using Com Port {}, trying to open port", comPort.getIdentifier());
-            if (comPort.open()) {
-                logger.debug("Opened port successful to {}", comPort.getIdentifier());
-                comPort.registerSelectionKey(selectionKey);
-
-                this.active = true;
-                return true;
-            } else {
-                logger.debug("Unable to open port {}", comPort.getIdentifier());
-                return false;
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            this.active = false;
-            return false;
-        }
-    }
-
-    @Override protected void doClose() throws Exception {
-        if (this.comPort != null) {
-            this.comPort.close();
-        }
-    }
-
-    @Override
-    protected void doFinishConnect() throws Exception {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    protected SocketAddress localAddress0() {
-        return null;
-    }
-
-    @Override
-    protected SocketAddress remoteAddress0() {
-        return null;
-    }
-
-    @Override
-    protected void doBind(SocketAddress localAddress) throws Exception {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    protected void doDisconnect() throws Exception {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public ChannelConfig config() {
-        return this.config;
-    }
-
-    @Override
-    public boolean isActive() {
-        return active;
-    }
-
-    private class SerialNioUnsafe implements NioUnsafe {
-
-        private boolean inFlush0; // Copied from AbstractUnsafe
-        private Throwable initialCloseCause; // Copied from AbstractUnsafe
-
-        private volatile ChannelOutboundBuffer outboundBuffer;
-
-        private RecvByteBufAllocator.Handle recvHandle;
-
-        public SerialNioUnsafe() {
-            try {
-                Constructor<ChannelOutboundBuffer> ctor = ChannelOutboundBuffer.class.getDeclaredConstructor(AbstractChannel.class);
-                ctor.setAccessible(true);
-                this.outboundBuffer = ctor.newInstance(SerialChannel.this);
-            } catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {
-                logger.warn("Problem with reflection", e);
-                throw new RuntimeException("Problem providing Buffer", e);
-            }
-        }
-
-        @Override
-        public SelectableChannel ch() {
-            throw new NotImplementedException("");
-        }
-
-        @Override
-        public void finishConnect() {
-            throw new NotImplementedException("");
-        }
-
-        // See NioByteUnsafe#read()
-        @Override
-        public void read() {
-            logger.debug("Reading...");
-            // TODO we should read something here, okay?!
-            final ChannelConfig config = config();
-            final ChannelPipeline pipeline = pipeline();
-            final ByteBufAllocator allocator = config.getAllocator();
-            final RecvByteBufAllocator.Handle allocHandle = recvBufAllocHandle();
-            allocHandle.reset(config);
-
-            ByteBuf byteBuf = null;
-            boolean close = false;
-            try {
-                do {
-                    byteBuf = allocHandle.allocate(allocator);
-                    allocHandle.lastBytesRead(doReadBytes(byteBuf));
-                    if (allocHandle.lastBytesRead() <= 0) {
-                        // nothing was read. release the buffer.
-                        byteBuf.release();
-                        byteBuf = null;
-                        close = allocHandle.lastBytesRead() < 0;
-                        if (close) {
-                            // There is nothing left to read as we received an EOF.
-                            readPending = false;
-                        }
-                        break;
-                    }
-
-                    allocHandle.incMessagesRead(1);
-                    readPending = false;
-                    pipeline.fireChannelRead(byteBuf);
-                    byteBuf = null;
-                } while (allocHandle.continueReading());
-
-                allocHandle.readComplete();
-                pipeline.fireChannelReadComplete();
-
-                if (close) {
-                    // TODO
-                    //closeOnRead(pipeline);
-                }
-            } catch (Throwable t) {
-                // TODO
-                // handleReadException(pipeline, byteBuf, t, close, allocHandle);
-            } finally {
-                // Check if there is a readPending which was not processed yet.
-                // This could be for two reasons:
-                // * The user called Channel.read() or ChannelHandlerContext.read() in channelRead(...) method
-                // * The user called Channel.read() or ChannelHandlerContext.read() in channelReadComplete(...) method
-                //
-                // See https://github.com/netty/netty/issues/2254
-                if (!readPending && !config.isAutoRead()) {
-                    // TODO
-                }
-            }
-        }
-
-        @Override
-        public void forceFlush() {
-            throw new NotImplementedException("");
-        }
-
-        @Override
-        public RecvByteBufAllocator.Handle recvBufAllocHandle() {
-            if (recvHandle == null) {
-                recvHandle = config().getRecvByteBufAllocator().newHandle();
-            }
-            return recvHandle;
-        }
-
-        @Override
-        public SocketAddress localAddress() {
-            throw new NotImplementedException("");
-        }
-
-        @Override
-        public SocketAddress remoteAddress() {
-            return null;
-        }
-
-        @Override
-        public void register(EventLoop eventLoop, ChannelPromise promise) {
-            // Register
-            if (!(eventLoop instanceof NioEventLoop)) {
-                throw new IllegalArgumentException("Only valid for NioEventLoop!");
-            }
-            if (!(promise.channel() instanceof SerialChannel)) {
-                throw new IllegalArgumentException("Only valid for " + SerialChannel.class + " but is " + promise.channel().getClass());
-            }
-            // Register channel to event loop
-            // We have to use reflection here, I fear
-            try {
-                Method method = NioEventLoop.class.getDeclaredMethod("unwrappedSelector");
-                method.setAccessible(true);
-                SerialPollingSelector selector = (SerialPollingSelector) method.invoke(eventLoop);
-
-                // Register the channel
-                selectionKey = (SerialSelectionKey) ((SerialChannel) promise.channel()).javaChannel().register(selector, 0, SerialChannel.this);
-
-                // Set selection key
-                final Field selectionKeyField = AbstractNioChannel.class.getDeclaredField("selectionKey");
-                selectionKeyField.setAccessible(true);
-                selectionKeyField.set(SerialChannel.this, selectionKey);
-
-                // Set event loop (again, via reflection)
-                final Field loop = AbstractChannel.class.getDeclaredField("eventLoop");
-                loop.setAccessible(true);
-                loop.set(SerialChannel.this, eventLoop);
-
-                // Register Pipeline, if necessary
-                // Ensure we call handlerAdded(...) before we actually notify the promise. This is needed as the
-                // user may already fire events through the pipeline in the ChannelFutureListener.
-                if (!(pipeline() instanceof DefaultChannelPipeline)) {
-                    throw new IllegalStateException("Pipeline should be of Type " + DefaultChannelPipeline.class);
-                }
-                // Again reflection, but has to be done in an event loop
-                eventLoop().execute(() -> {
-                    try {
-                        final Method invokeHandlerAddedIfNeeded = DefaultChannelPipeline.class.getDeclaredMethod("invokeHandlerAddedIfNeeded");
-                        invokeHandlerAddedIfNeeded.setAccessible(true);
-
-                        invokeHandlerAddedIfNeeded.invoke(pipeline());
-
-                        pipeline().fireChannelRegistered();
-                    } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
-                        e.printStackTrace();
-                    }
-                });
-
-                // Return promise
-                promise.setSuccess();
-            } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException | ClosedChannelException | NoSuchFieldException e) {
-                e.printStackTrace();
-                throw new NotImplementedException("Should register channel to event loop!!!");
-            }
-        }
-
-        @Override
-        public void bind(SocketAddress localAddress, ChannelPromise promise) {
-            throw new NotImplementedException("");
-        }
-
-        @Override
-        public void connect(SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise) {
-            SerialChannel.this.remoteAddress = remoteAddress;
-            eventLoop().execute(() -> {
-                try {
-                    final boolean sucess = doConnect(remoteAddress, localAddress);
-                    if (sucess) {
-                        // Send a message to the pipeline
-                        pipeline().fireChannelActive();
-                        // Finally, close the promise
-                        promise.setSuccess();
-                    } else {
-                        promise.setFailure(new RuntimeException("Unable to open the com port '" + ((SerialSocketAddress) remoteAddress).getIdentifier() + "'"));
-                    }
-                } catch (Exception e) {
-                    promise.setFailure(e);
-                }
-            });
-        }
-
-        @Override
-        public void disconnect(ChannelPromise promise) {
-            throw new NotImplementedException("");
-        }
-
-        @Override
-        public void close(ChannelPromise promise) {
-            logger.debug("Closing the Serial Port '{}'", ((SerialSocketAddress) SerialChannel.this.remoteAddress).getIdentifier());
-            eventLoop().execute(() -> {
-                try {
-                    doClose();
-                    promise.setSuccess();
-                } catch (Exception e) {
-                    logger.warn("Unable to close the connection", e);
-                    promise.setFailure(e);
-                }
-            });
-        }
-
-        @Override
-        public void closeForcibly() {
-            throw new NotImplementedException("");
-        }
-
-        @Override
-        public void deregister(ChannelPromise promise) {
-            throw new NotImplementedException("");
-        }
-
-        @Override
-        public final void beginRead() {
-            assert eventLoop().inEventLoop();
-
-            if (!isActive()) {
-                return;
-            }
-
-            try {
-                doBeginRead();
-            } catch (final Exception e) {
-                invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        pipeline().fireExceptionCaught(e);
-                    }
-                });
-                close(voidPromise());
-            }
-        }
-
-        private void invokeLater(Runnable task) {
-            try {
-                // This method is used by outbound operation implementations to trigger an inbound event later.
-                // They do not trigger an inbound event immediately because an outbound operation might have been
-                // triggered by another inbound event handler method.  If fired immediately, the call stack
-                // will look like this for example:
-                //
-                //   handlerA.inboundBufferUpdated() - (1) an inbound handler method closes a connection.
-                //   -> handlerA.ctx.close()
-                //      -> channel.unsafe.close()
-                //         -> handlerA.channelInactive() - (2) another inbound handler method called while in (1) yet
-                //
-                // which means the execution of two inbound handler methods of the same handler overlap undesirably.
-                eventLoop().execute(task);
-            } catch (RejectedExecutionException e) {
-                logger.warn("Can't invoke task later as EventLoop rejected it", e);
-            }
-        }
-
-        /**
-         * Copied and adapted from {@link io.netty.channel.nio.AbstractNioChannel.AbstractNioUnsafe}
-         */
-        @Override
-        public void write(Object msg, ChannelPromise promise) {
-            assert eventLoop().inEventLoop();
-
-            ChannelOutboundBuffer outboundBuffer = this.outboundBuffer;
-            if (outboundBuffer == null) {
-                // If the outboundBuffer is null we know the channel was closed and so
-                // need to fail the future right away. If it is not null the handling of the rest
-                // will be done in flush0()
-                // See https://github.com/netty/netty/issues/2362
-                close(voidPromise());
-                ReferenceCountUtil.release(msg);
-                throw new RuntimeException("Unable to write", initialCloseCause);
-            }
-
-            int size;
-            try {
-                msg = filterOutboundMessage(msg);
-                // Reflection due to privacy
-                Method estimatorHandle = DefaultChannelPipeline.class.getDeclaredMethod("estimatorHandle");
-                estimatorHandle.setAccessible(true);
-                MessageSizeEstimator.Handle handle = (MessageSizeEstimator.Handle) estimatorHandle.invoke(pipeline);
-                // end of reflection
-                size = handle.size(msg);
-                if (size < 0) {
-                    size = 0;
-                }
-            } catch (Throwable t) {
-                close(voidPromise());
-                ReferenceCountUtil.release(msg);
-                logger.error("Problem during write", t);
-                throw new RuntimeException("Problem during write", t);
-            }
-
-            outboundBuffer.addMessage(msg, size, promise);
-        }
-
-        //
-        // Start Copied from AbstractUnsafe
-        //
-
-        @Override
-        public final void flush() {
-            assert eventLoop().inEventLoop();
-
-            ChannelOutboundBuffer outboundBuffer = this.outboundBuffer;
-            if (outboundBuffer == null) {
-                return;
-            }
-
-            outboundBuffer.addFlush();
-            flush0();
-        }
-
-        @SuppressWarnings("deprecation")
-        protected void flush0() {
-            if (inFlush0) {
-                // Avoid re-entrance
-                return;
-            }
-
-            final ChannelOutboundBuffer outboundBuffer = this.outboundBuffer;
-            if (outboundBuffer == null || outboundBuffer.isEmpty()) {
-                return;
-            }
-
-            inFlush0 = true;
-
-            // Mark all pending write requests as failure if the channel is inactive.
-            if (!isActive()) {
-                try {
-                    if (isOpen()) {
-                        callFailFlushed(true);
-                    } else {
-                        // Do not trigger channelWritabilityChanged because the channel is closed already.
-                        callFailFlushed(false);
-                    }
-                } finally {
-                    inFlush0 = false;
-                }
-                return;
-            }
-
-            try {
-                doWrite(outboundBuffer);
-            } catch (Throwable t) {
-                if (t instanceof IOException && config().isAutoClose()) {
-                    /**
-                     * Just call {@link #close(ChannelPromise, Throwable, boolean)} here which will take care of
-                     * failing all flushed messages and also ensure the actual close of the underlying transport
-                     * will happen before the promises are notified.
-                     *
-                     * This is needed as otherwise {@link #isActive()} , {@link #isOpen()} and {@link #isWritable()}
-                     * may still return {@code true} even if the channel should be closed as result of the exception.
-                     */
-                    initialCloseCause = t;
-                    close(voidPromise());
-                    throw new RuntimeException("Unable to flush", t);
-                } else {
-                    try {
-                        shutdownOutput(voidPromise());
-                        throw new RuntimeException("Unable to flush", t);
-                    } catch (Throwable t2) {
-                        initialCloseCause = t;
-                        close(voidPromise());
-                        throw new RuntimeException("Unable to flush", t);
-                    }
-                }
-            } finally {
-                inFlush0 = false;
-            }
-        }
-
-        private void callFailFlushed(boolean notify) {
-            try {
-                Method failFlushed = ChannelOutboundBuffer.class.getDeclaredMethod("failFlushed", Throwable.class, boolean.class);
-                failFlushed.setAccessible(true);
-                failFlushed.invoke(new RuntimeException("Unable to Flush!"), notify);
-            } catch (Exception e) {
-                throw new IllegalStateException("Unable to call Failed Flushed!");
-            }
-        }
-
-        //
-        // End Copied from AbstractUnsafe
-        //
-
-        @Override
-        public ChannelPromise voidPromise() {
-            return unsafeVoidPromise;
-        }
-
-        @Override
-        public ChannelOutboundBuffer outboundBuffer() {
-            return this.outboundBuffer;
-        }
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.serial.connection.connection;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.*;
+import io.netty.channel.nio.AbstractNioByteChannel;
+import io.netty.channel.nio.AbstractNioChannel;
+import io.netty.channel.nio.NioEventLoop;
+import io.netty.channel.socket.DuplexChannel;
+import io.netty.util.ReferenceCountUtil;
+import org.apache.commons.lang3.NotImplementedException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.SocketAddress;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.SelectableChannel;
+import java.util.concurrent.RejectedExecutionException;
+
+/**
+ * TODO write comment
+ *
+ * @author julian
+ * Created by julian on 2019-08-10
+ */
+public class SerialChannel extends AbstractNioByteChannel implements DuplexChannel {
+
+    private static final Logger logger = LoggerFactory.getLogger(SerialChannel.class);
+    private final ChannelConfig config;
+
+    private final VoidChannelPromise unsafeVoidPromise = new VoidChannelPromise(this, false);
+    private boolean readPending = false; // Did we receive an EOF?
+    private SocketAddress remoteAddress;
+    private boolean active = false;
+    private SerialSelectionKey selectionKey;
+    private SerialChannelHandler comPort;
+    private final DefaultChannelPipeline pipeline; // Copied from AbstractChannel
+
+
+    public SerialChannel() {
+        this(null, new SerialSocketChannel(new SerialSelectorProvider()));
+        ((SerialSocketChannel) javaChannel()).setChild(this);
+    }
+
+    /**
+     * Create a new instance
+     *
+     * @param parent the parent {@link Channel} by which this instance was created. May be {@code null}
+     * @param ch     the underlying {@link SelectableChannel} on which it operates
+     */
+    protected SerialChannel(Channel parent, SelectableChannel ch) {
+        super(parent, ch);
+        config = new DefaultChannelConfig(this);
+        pipeline = newChannelPipeline();
+    }
+
+    @Override
+    public NioUnsafe unsafe() {
+        return new SerialNioUnsafe();
+    }
+
+    @Override
+    public boolean isInputShutdown() {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public ChannelFuture shutdownInput() {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public ChannelFuture shutdownInput(ChannelPromise promise) {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public boolean isOutputShutdown() {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public ChannelFuture shutdownOutput() {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public ChannelFuture shutdownOutput(ChannelPromise promise) {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public boolean isShutdown() {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public ChannelFuture shutdown() {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public ChannelFuture shutdown(ChannelPromise promise) {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    protected long doWriteFileRegion(FileRegion region) throws Exception {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    protected int doReadBytes(ByteBuf buf) throws Exception {
+        if (!active) {
+            return 0;
+        }
+        logger.debug("Trying to read bytes from wire...");
+        int bytesRead = comPort.read(buf);
+        logger.debug("Read {} bytes from the wire", bytesRead);
+        return bytesRead;
+    }
+
+    @Override
+    protected int doWriteBytes(ByteBuf buf) throws Exception {
+        // Here we really write bytes to Socket!
+        if (!active) {
+            return 0;
+        }
+        logger.debug("Trying to write bytes to wire...");
+        int bytesWritten = comPort.write(buf);
+        logger.debug("Wrote {} bytes to wire!", bytesWritten);
+        return bytesWritten;
+    }
+
+    @Override
+    protected boolean doConnect(SocketAddress remoteAddress, SocketAddress localAddress) throws Exception {
+        this.remoteAddress = remoteAddress;
+        if (!(remoteAddress instanceof SerialSocketAddress)) {
+            throw new IllegalArgumentException("Socket Address has to be of type " + SerialSocketAddress.class);
+        }
+        logger.debug("Connecting to Socket Address '{}'", ((SerialSocketAddress) remoteAddress).getIdentifier());
+
+        try {
+            // A bit hacky but to make a Test Connection start the String with TEST
+            if (((SerialSocketAddress) remoteAddress).getIdentifier().startsWith("TEST")) {
+                comPort = SerialChannelHandler.DummyHandler.INSTANCE;
+            } else {
+                comPort = new SerialChannelHandler.SerialPortHandler(remoteAddress);
+            }
+            logger.debug("Using Com Port {}, trying to open port", comPort.getIdentifier());
+            if (comPort.open()) {
+                logger.debug("Opened port successful to {}", comPort.getIdentifier());
+                comPort.registerSelectionKey(selectionKey);
+
+                this.active = true;
+                return true;
+            } else {
+                logger.debug("Unable to open port {}", comPort.getIdentifier());
+                return false;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            this.active = false;
+            return false;
+        }
+    }
+
+    @Override protected void doClose() throws Exception {
+        if (this.comPort != null) {
+            this.comPort.close();
+        }
+    }
+
+    @Override
+    protected void doFinishConnect() throws Exception {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    protected SocketAddress localAddress0() {
+        return null;
+    }
+
+    @Override
+    protected SocketAddress remoteAddress0() {
+        return null;
+    }
+
+    @Override
+    protected void doBind(SocketAddress localAddress) throws Exception {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    protected void doDisconnect() throws Exception {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public ChannelConfig config() {
+        return this.config;
+    }
+
+    @Override
+    public boolean isActive() {
+        return active;
+    }
+
+    private class SerialNioUnsafe implements NioUnsafe {
+
+        private boolean inFlush0; // Copied from AbstractUnsafe
+        private Throwable initialCloseCause; // Copied from AbstractUnsafe
+
+        private volatile ChannelOutboundBuffer outboundBuffer;
+
+        private RecvByteBufAllocator.Handle recvHandle;
+
+        public SerialNioUnsafe() {
+            try {
+                Constructor<ChannelOutboundBuffer> ctor = ChannelOutboundBuffer.class.getDeclaredConstructor(AbstractChannel.class);
+                ctor.setAccessible(true);
+                this.outboundBuffer = ctor.newInstance(SerialChannel.this);
+            } catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {
+                logger.warn("Problem with reflection", e);
+                throw new RuntimeException("Problem providing Buffer", e);
+            }
+        }
+
+        @Override
+        public SelectableChannel ch() {
+            throw new NotImplementedException("");
+        }
+
+        @Override
+        public void finishConnect() {
+            throw new NotImplementedException("");
+        }
+
+        // See NioByteUnsafe#read()
+        @Override
+        public void read() {
+            logger.debug("Reading...");
+            // TODO we should read something here, okay?!
+            final ChannelConfig config = config();
+            final ChannelPipeline pipeline = pipeline();
+            final ByteBufAllocator allocator = config.getAllocator();
+            final RecvByteBufAllocator.Handle allocHandle = recvBufAllocHandle();
+            allocHandle.reset(config);
+
+            ByteBuf byteBuf = null;
+            boolean close = false;
+            try {
+                do {
+                    byteBuf = allocHandle.allocate(allocator);
+                    allocHandle.lastBytesRead(doReadBytes(byteBuf));
+                    if (allocHandle.lastBytesRead() <= 0) {
+                        // nothing was read. release the buffer.
+                        byteBuf.release();
+                        byteBuf = null;
+                        close = allocHandle.lastBytesRead() < 0;
+                        if (close) {
+                            // There is nothing left to read as we received an EOF.
+                            readPending = false;
+                        }
+                        break;
+                    }
+
+                    allocHandle.incMessagesRead(1);
+                    readPending = false;
+                    pipeline.fireChannelRead(byteBuf);
+                    byteBuf = null;
+                } while (allocHandle.continueReading());
+
+                allocHandle.readComplete();
+                pipeline.fireChannelReadComplete();
+
+                if (close) {
+                    // TODO
+                    //closeOnRead(pipeline);
+                }
+            } catch (Throwable t) {
+                // TODO
+                // handleReadException(pipeline, byteBuf, t, close, allocHandle);
+            } finally {
+                // Check if there is a readPending which was not processed yet.
+                // This could be for two reasons:
+                // * The user called Channel.read() or ChannelHandlerContext.read() in channelRead(...) method
+                // * The user called Channel.read() or ChannelHandlerContext.read() in channelReadComplete(...) method
+                //
+                // See https://github.com/netty/netty/issues/2254
+                if (!readPending && !config.isAutoRead()) {
+                    // TODO
+                }
+            }
+        }
+
+        @Override
+        public void forceFlush() {
+            throw new NotImplementedException("");
+        }
+
+        @Override
+        public RecvByteBufAllocator.Handle recvBufAllocHandle() {
+            if (recvHandle == null) {
+                recvHandle = config().getRecvByteBufAllocator().newHandle();
+            }
+            return recvHandle;
+        }
+
+        @Override
+        public SocketAddress localAddress() {
+            throw new NotImplementedException("");
+        }
+
+        @Override
+        public SocketAddress remoteAddress() {
+            return null;
+        }
+
+        @Override
+        public void register(EventLoop eventLoop, ChannelPromise promise) {
+            // Register
+            if (!(eventLoop instanceof NioEventLoop)) {
+                throw new IllegalArgumentException("Only valid for NioEventLoop!");
+            }
+            if (!(promise.channel() instanceof SerialChannel)) {
+                throw new IllegalArgumentException("Only valid for " + SerialChannel.class + " but is " + promise.channel().getClass());
+            }
+            // Register channel to event loop
+            // We have to use reflection here, I fear
+            try {
+                Method method = NioEventLoop.class.getDeclaredMethod("unwrappedSelector");
+                method.setAccessible(true);
+                SerialPollingSelector selector = (SerialPollingSelector) method.invoke(eventLoop);
+
+                // Register the channel
+                selectionKey = (SerialSelectionKey) ((SerialChannel) promise.channel()).javaChannel().register(selector, 0, SerialChannel.this);
+
+                // Set selection key
+                final Field selectionKeyField = AbstractNioChannel.class.getDeclaredField("selectionKey");
+                selectionKeyField.setAccessible(true);
+                selectionKeyField.set(SerialChannel.this, selectionKey);
+
+                // Set event loop (again, via reflection)
+                final Field loop = AbstractChannel.class.getDeclaredField("eventLoop");
+                loop.setAccessible(true);
+                loop.set(SerialChannel.this, eventLoop);
+
+                // Register Pipeline, if necessary
+                // Ensure we call handlerAdded(...) before we actually notify the promise. This is needed as the
+                // user may already fire events through the pipeline in the ChannelFutureListener.
+                if (!(pipeline() instanceof DefaultChannelPipeline)) {
+                    throw new IllegalStateException("Pipeline should be of Type " + DefaultChannelPipeline.class);
+                }
+                // Again reflection, but has to be done in an event loop
+                eventLoop().execute(() -> {
+                    try {
+                        final Method invokeHandlerAddedIfNeeded = DefaultChannelPipeline.class.getDeclaredMethod("invokeHandlerAddedIfNeeded");
+                        invokeHandlerAddedIfNeeded.setAccessible(true);
+
+                        invokeHandlerAddedIfNeeded.invoke(pipeline());
+
+                        pipeline().fireChannelRegistered();
+                    } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+                        e.printStackTrace();
+                    }
+                });
+
+                // Return promise
+                promise.setSuccess();
+            } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException | ClosedChannelException | NoSuchFieldException e) {
+                e.printStackTrace();
+                throw new NotImplementedException("Should register channel to event loop!!!");
+            }
+        }
+
+        @Override
+        public void bind(SocketAddress localAddress, ChannelPromise promise) {
+            throw new NotImplementedException("");
+        }
+
+        @Override
+        public void connect(SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise) {
+            SerialChannel.this.remoteAddress = remoteAddress;
+            eventLoop().execute(() -> {
+                try {
+                    final boolean sucess = doConnect(remoteAddress, localAddress);
+                    if (sucess) {
+                        // Send a message to the pipeline
+                        pipeline().fireChannelActive();
+                        // Finally, close the promise
+                        promise.setSuccess();
+                    } else {
+                        promise.setFailure(new RuntimeException("Unable to open the com port '" + ((SerialSocketAddress) remoteAddress).getIdentifier() + "'"));
+                    }
+                } catch (Exception e) {
+                    promise.setFailure(e);
+                }
+            });
+        }
+
+        @Override
+        public void disconnect(ChannelPromise promise) {
+            throw new NotImplementedException("");
+        }
+
+        @Override
+        public void close(ChannelPromise promise) {
+            logger.debug("Closing the Serial Port '{}'", ((SerialSocketAddress) SerialChannel.this.remoteAddress).getIdentifier());
+            eventLoop().execute(() -> {
+                try {
+                    doClose();
+                    promise.setSuccess();
+                } catch (Exception e) {
+                    logger.warn("Unable to close the connection", e);
+                    promise.setFailure(e);
+                }
+            });
+        }
+
+        @Override
+        public void closeForcibly() {
+            throw new NotImplementedException("");
+        }
+
+        @Override
+        public void deregister(ChannelPromise promise) {
+            throw new NotImplementedException("");
+        }
+
+        @Override
+        public final void beginRead() {
+            assert eventLoop().inEventLoop();
+
+            if (!isActive()) {
+                return;
+            }
+
+            try {
+                doBeginRead();
+            } catch (final Exception e) {
+                invokeLater(new Runnable() {
+                    @Override
+                    public void run() {
+                        pipeline().fireExceptionCaught(e);
+                    }
+                });
+                close(voidPromise());
+            }
+        }
+
+        private void invokeLater(Runnable task) {
+            try {
+                // This method is used by outbound operation implementations to trigger an inbound event later.
+                // They do not trigger an inbound event immediately because an outbound operation might have been
+                // triggered by another inbound event handler method.  If fired immediately, the call stack
+                // will look like this for example:
+                //
+                //   handlerA.inboundBufferUpdated() - (1) an inbound handler method closes a connection.
+                //   -> handlerA.ctx.close()
+                //      -> channel.unsafe.close()
+                //         -> handlerA.channelInactive() - (2) another inbound handler method called while in (1) yet
+                //
+                // which means the execution of two inbound handler methods of the same handler overlap undesirably.
+                eventLoop().execute(task);
+            } catch (RejectedExecutionException e) {
+                logger.warn("Can't invoke task later as EventLoop rejected it", e);
+            }
+        }
+
+        /**
+         * Copied and adapted from {@link io.netty.channel.nio.AbstractNioChannel.AbstractNioUnsafe}
+         */
+        @Override
+        public void write(Object msg, ChannelPromise promise) {
+            assert eventLoop().inEventLoop();
+
+            ChannelOutboundBuffer outboundBuffer = this.outboundBuffer;
+            if (outboundBuffer == null) {
+                // If the outboundBuffer is null we know the channel was closed and so
+                // need to fail the future right away. If it is not null the handling of the rest
+                // will be done in flush0()
+                // See https://github.com/netty/netty/issues/2362
+                close(voidPromise());
+                ReferenceCountUtil.release(msg);
+                throw new RuntimeException("Unable to write", initialCloseCause);
+            }
+
+            int size;
+            try {
+                msg = filterOutboundMessage(msg);
+                // Reflection due to privacy
+                Method estimatorHandle = DefaultChannelPipeline.class.getDeclaredMethod("estimatorHandle");
+                estimatorHandle.setAccessible(true);
+                MessageSizeEstimator.Handle handle = (MessageSizeEstimator.Handle) estimatorHandle.invoke(pipeline);
+                // end of reflection
+                size = handle.size(msg);
+                if (size < 0) {
+                    size = 0;
+                }
+            } catch (Throwable t) {
+                close(voidPromise());
+                ReferenceCountUtil.release(msg);
+                logger.error("Problem during write", t);
+                throw new RuntimeException("Problem during write", t);
+            }
+
+            outboundBuffer.addMessage(msg, size, promise);
+        }
+
+        //
+        // Start Copied from AbstractUnsafe
+        //
+
+        @Override
+        public final void flush() {
+            assert eventLoop().inEventLoop();
+
+            ChannelOutboundBuffer outboundBuffer = this.outboundBuffer;
+            if (outboundBuffer == null) {
+                return;
+            }
+
+            outboundBuffer.addFlush();
+            flush0();
+        }
+
+        @SuppressWarnings("deprecation")
+        protected void flush0() {
+            if (inFlush0) {
+                // Avoid re-entrance
+                return;
+            }
+
+            final ChannelOutboundBuffer outboundBuffer = this.outboundBuffer;
+            if (outboundBuffer == null || outboundBuffer.isEmpty()) {
+                return;
+            }
+
+            inFlush0 = true;
+
+            // Mark all pending write requests as failure if the channel is inactive.
+            if (!isActive()) {
+                try {
+                    if (isOpen()) {
+                        callFailFlushed(true);
+                    } else {
+                        // Do not trigger channelWritabilityChanged because the channel is closed already.
+                        callFailFlushed(false);
+                    }
+                } finally {
+                    inFlush0 = false;
+                }
+                return;
+            }
+
+            try {
+                doWrite(outboundBuffer);
+            } catch (Throwable t) {
+                if (t instanceof IOException && config().isAutoClose()) {
+                    /**
+                     * Just call {@link #close(ChannelPromise, Throwable, boolean)} here which will take care of
+                     * failing all flushed messages and also ensure the actual close of the underlying transport
+                     * will happen before the promises are notified.
+                     *
+                     * This is needed as otherwise {@link #isActive()} , {@link #isOpen()} and {@link #isWritable()}
+                     * may still return {@code true} even if the channel should be closed as result of the exception.
+                     */
+                    initialCloseCause = t;
+                    close(voidPromise());
+                    throw new RuntimeException("Unable to flush", t);
+                } else {
+                    try {
+                        shutdownOutput(voidPromise());
+                        throw new RuntimeException("Unable to flush", t);
+                    } catch (Throwable t2) {
+                        initialCloseCause = t;
+                        close(voidPromise());
+                        throw new RuntimeException("Unable to flush", t);
+                    }
+                }
+            } finally {
+                inFlush0 = false;
+            }
+        }
+
+        private void callFailFlushed(boolean notify) {
+            try {
+                Method failFlushed = ChannelOutboundBuffer.class.getDeclaredMethod("failFlushed", Throwable.class, boolean.class);
+                failFlushed.setAccessible(true);
+                failFlushed.invoke(new RuntimeException("Unable to Flush!"), notify);
+            } catch (Exception e) {
+                throw new IllegalStateException("Unable to call Failed Flushed!");
+            }
+        }
+
+        //
+        // End Copied from AbstractUnsafe
+        //
+
+        @Override
+        public ChannelPromise voidPromise() {
+            return unsafeVoidPromise;
+        }
+
+        @Override
+        public ChannelOutboundBuffer outboundBuffer() {
+            return this.outboundBuffer;
+        }
+    }
+}
diff --git a/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialChannelFactory.java b/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialChannelFactory.java
index 0271211a375..815f7b4f671 100644
--- a/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialChannelFactory.java
+++ b/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialChannelFactory.java
@@ -1,83 +1,83 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.serial.connection.connection;
-
-import io.netty.bootstrap.Bootstrap;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.util.concurrent.Future;
-import io.netty.util.concurrent.GenericFutureListener;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.base.connection.ChannelFactory;
-
-import java.net.SocketAddress;
-import java.util.concurrent.Executor;
-
-public class SerialChannelFactory implements ChannelFactory {
-
-    private final String serialPort;
-
-    public SerialChannelFactory(String serialPort) {
-        this.serialPort = serialPort;
-    }
-
-    @Override
-    public Channel createChannel(ChannelHandler channelHandler)
-        throws PlcConnectionException {
-        SocketAddress address = new SerialSocketAddress(serialPort);
-
-        try {
-            Bootstrap bootstrap = new Bootstrap();
-            final NioEventLoopGroup eventLoop = new NioEventLoopGroup(0, (Executor) null, new SerialSelectorProvider());
-            bootstrap.group(eventLoop);
-            bootstrap.channel(SerialChannel.class);
-            bootstrap.handler(channelHandler);
-            // Start the client.
-            ChannelFuture f = bootstrap.connect(address);
-            f.addListener(new GenericFutureListener<Future<? super Void>>() {
-                    @Override public void operationComplete(Future<? super Void> future) throws Exception {
-                        if (future.isSuccess()) {
-                            System.out.println("Connection sucesfull!");
-                        } else {
-                            System.out.println("Connection not sucessfull: " + future.cause().getMessage());
-                            eventLoop.shutdownGracefully();
-                        }
-                    }
-                });
-            f.sync();
-            f.awaitUninterruptibly();
-            // Wait till the session is finished initializing.
-            return f.channel();
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new PlcConnectionException("Error creating channel.", e);
-        }
-    }
-
-    @Override
-    public void ping() {
-        // TODO: Do some sort of check as soon as we know how ...
-    }
-
-    public String getSerialPort() {
-        return serialPort;
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.serial.connection.connection;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.base.connection.ChannelFactory;
+
+import java.net.SocketAddress;
+import java.util.concurrent.Executor;
+
+public class SerialChannelFactory implements ChannelFactory {
+
+    private final String serialPort;
+
+    public SerialChannelFactory(String serialPort) {
+        this.serialPort = serialPort;
+    }
+
+    @Override
+    public Channel createChannel(ChannelHandler channelHandler)
+        throws PlcConnectionException {
+        SocketAddress address = new SerialSocketAddress(serialPort);
+
+        try {
+            Bootstrap bootstrap = new Bootstrap();
+            final NioEventLoopGroup eventLoop = new NioEventLoopGroup(0, (Executor) null, new SerialSelectorProvider());
+            bootstrap.group(eventLoop);
+            bootstrap.channel(SerialChannel.class);
+            bootstrap.handler(channelHandler);
+            // Start the client.
+            ChannelFuture f = bootstrap.connect(address);
+            f.addListener(new GenericFutureListener<Future<? super Void>>() {
+                    @Override public void operationComplete(Future<? super Void> future) throws Exception {
+                        if (future.isSuccess()) {
+                            System.out.println("Connection sucesfull!");
+                        } else {
+                            System.out.println("Connection not sucessfull: " + future.cause().getMessage());
+                            eventLoop.shutdownGracefully();
+                        }
+                    }
+                });
+            f.sync();
+            f.awaitUninterruptibly();
+            // Wait till the session is finished initializing.
+            return f.channel();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new PlcConnectionException("Error creating channel.", e);
+        }
+    }
+
+    @Override
+    public void ping() {
+        // TODO: Do some sort of check as soon as we know how ...
+    }
+
+    public String getSerialPort() {
+        return serialPort;
+    }
+}
diff --git a/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialChannelHandler.java b/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialChannelHandler.java
index d57cb3f748f..e960a5444e4 100644
--- a/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialChannelHandler.java
+++ b/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialChannelHandler.java
@@ -1,172 +1,172 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.serial.connection.connection;
-
-import com.fazecast.jSerialComm.SerialPort;
-import com.fazecast.jSerialComm.SerialPortDataListener;
-import com.fazecast.jSerialComm.SerialPortEvent;
-import io.netty.buffer.ByteBuf;
-
-import java.net.SocketAddress;
-import java.nio.channels.SelectionKey;
-
-/**
- * This is a wrapper mostly for testing {@link SerialChannel}, @{@link SerialPollingSelector},
- * {@link SerialSelectionKey}, @{@link SerialSelectorProvider} and @{@link SerialSocketChannel}.
- */
-public abstract class SerialChannelHandler {
-
-    private final SocketAddress address;
-
-    public SerialChannelHandler(SocketAddress address) {
-        this.address = address;
-    }
-
-    abstract boolean open();
-
-    abstract String getIdentifier();
-
-    /**
-     * This method registers the Callback to the SelectionKey / {@link java.nio.channels.Selector}
-     * which is necessary to notify the {@link java.nio.channels.Selector} about
-     * available data.
-     */
-    abstract void registerSelectionKey(SerialSelectionKey selectionKey);
-
-    public abstract void close();
-
-    /**
-     *
-     * @param buf
-     * @return Return the amoubnt of bytes written into the buffer
-     */
-    public abstract int read(ByteBuf buf);
-
-    /**
-     *
-     * @return Number of bytes written to wire
-     */
-    public abstract int write(ByteBuf buf);
-
-    public static class DummyHandler extends SerialChannelHandler {
-
-        public static final DummyHandler INSTANCE = new DummyHandler(null);
-
-        private SerialSelectionKey selectionKey;
-
-        public DummyHandler(SocketAddress address) {
-            super(address);
-        }
-
-        @Override public boolean open() {
-            return true;
-        }
-
-        @Override public String getIdentifier() {
-            return null;
-        }
-
-        @Override public void registerSelectionKey(SerialSelectionKey selectionKey) {
-            this.selectionKey = selectionKey;
-        }
-
-        @Override public void close() {
-            // NOOP
-        }
-
-        @Override
-        public int read(ByteBuf buf) {
-            buf.writeByte(1);
-            return 1;
-        }
-
-        @Override
-        public int write(ByteBuf buf) {
-            System.out.println("Haha i wrote something");
-            return 1;
-        }
-
-        public void fireEvent(int readyOp) {
-            ((SerialPollingSelector) this.selectionKey.selector())
-                .addEvent(new SerialPollingSelector.SelectorEvent(this.selectionKey, readyOp));
-        }
-    }
-
-
-    public static class SerialPortHandler extends SerialChannelHandler {
-
-        private SerialPort comPort;
-
-        public SerialPortHandler(SocketAddress address) {
-            super(address);
-            comPort = SerialPort.getCommPort(((SerialSocketAddress) address).getIdentifier());
-        }
-
-        @Override public boolean open() {
-            if (comPort.openPort()) {
-                comPort.setComPortParameters(19200, 8, SerialPort.ONE_STOP_BIT, SerialPort.NO_PARITY);
-                return true;
-            }
-            return false;
-        }
-
-        @Override public String getIdentifier() {
-            return comPort.getDescriptivePortName();
-        }
-
-        @Override public void registerSelectionKey(SerialSelectionKey selectionKey) {
-            comPort.addDataListener(new SerialPortDataListener() {
-                @Override
-                public int getListeningEvents() {
-                    return SerialPort.LISTENING_EVENT_DATA_AVAILABLE;
-                }
-
-                @Override
-                public void serialEvent(SerialPortEvent event) {
-                    ((SerialPollingSelector) selectionKey.selector())
-                        .addEvent(new SerialPollingSelector.SelectorEvent(selectionKey, SelectionKey.OP_READ));
-                }
-            });
-        }
-
-        @Override public void close() {
-            this.comPort.closePort();
-        }
-
-        @Override
-        public int read(ByteBuf buf) {
-            int bytesToRead = comPort.bytesAvailable();
-            assert bytesToRead > 0;
-            byte[] buffer = new byte[bytesToRead];
-            comPort.readBytes(buffer, bytesToRead);
-            buf.writeBytes(buffer);
-            return bytesToRead;
-        }
-
-        @Override
-        public int write(ByteBuf buf) {
-            int expectedToWrite = buf.readableBytes();
-            byte[] bytes = new byte[expectedToWrite];
-            buf.readBytes(bytes);
-            int bytesWritten = comPort.writeBytes(bytes, expectedToWrite);
-            return bytesWritten;
-        }
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.serial.connection.connection;
+
+import com.fazecast.jSerialComm.SerialPort;
+import com.fazecast.jSerialComm.SerialPortDataListener;
+import com.fazecast.jSerialComm.SerialPortEvent;
+import io.netty.buffer.ByteBuf;
+
+import java.net.SocketAddress;
+import java.nio.channels.SelectionKey;
+
+/**
+ * This is a wrapper mostly for testing {@link SerialChannel}, @{@link SerialPollingSelector},
+ * {@link SerialSelectionKey}, @{@link SerialSelectorProvider} and @{@link SerialSocketChannel}.
+ */
+public abstract class SerialChannelHandler {
+
+    private final SocketAddress address;
+
+    public SerialChannelHandler(SocketAddress address) {
+        this.address = address;
+    }
+
+    abstract boolean open();
+
+    abstract String getIdentifier();
+
+    /**
+     * This method registers the Callback to the SelectionKey / {@link java.nio.channels.Selector}
+     * which is necessary to notify the {@link java.nio.channels.Selector} about
+     * available data.
+     */
+    abstract void registerSelectionKey(SerialSelectionKey selectionKey);
+
+    public abstract void close();
+
+    /**
+     *
+     * @param buf
+     * @return Return the amoubnt of bytes written into the buffer
+     */
+    public abstract int read(ByteBuf buf);
+
+    /**
+     *
+     * @return Number of bytes written to wire
+     */
+    public abstract int write(ByteBuf buf);
+
+    public static class DummyHandler extends SerialChannelHandler {
+
+        public static final DummyHandler INSTANCE = new DummyHandler(null);
+
+        private SerialSelectionKey selectionKey;
+
+        public DummyHandler(SocketAddress address) {
+            super(address);
+        }
+
+        @Override public boolean open() {
+            return true;
+        }
+
+        @Override public String getIdentifier() {
+            return null;
+        }
+
+        @Override public void registerSelectionKey(SerialSelectionKey selectionKey) {
+            this.selectionKey = selectionKey;
+        }
+
+        @Override public void close() {
+            // NOOP
+        }
+
+        @Override
+        public int read(ByteBuf buf) {
+            buf.writeByte(1);
+            return 1;
+        }
+
+        @Override
+        public int write(ByteBuf buf) {
+            System.out.println("Haha i wrote something");
+            return 1;
+        }
+
+        public void fireEvent(int readyOp) {
+            ((SerialPollingSelector) this.selectionKey.selector())
+                .addEvent(new SerialPollingSelector.SelectorEvent(this.selectionKey, readyOp));
+        }
+    }
+
+
+    public static class SerialPortHandler extends SerialChannelHandler {
+
+        private SerialPort comPort;
+
+        public SerialPortHandler(SocketAddress address) {
+            super(address);
+            comPort = SerialPort.getCommPort(((SerialSocketAddress) address).getIdentifier());
+        }
+
+        @Override public boolean open() {
+            if (comPort.openPort()) {
+                comPort.setComPortParameters(19200, 8, SerialPort.ONE_STOP_BIT, SerialPort.NO_PARITY);
+                return true;
+            }
+            return false;
+        }
+
+        @Override public String getIdentifier() {
+            return comPort.getDescriptivePortName();
+        }
+
+        @Override public void registerSelectionKey(SerialSelectionKey selectionKey) {
+            comPort.addDataListener(new SerialPortDataListener() {
+                @Override
+                public int getListeningEvents() {
+                    return SerialPort.LISTENING_EVENT_DATA_AVAILABLE;
+                }
+
+                @Override
+                public void serialEvent(SerialPortEvent event) {
+                    ((SerialPollingSelector) selectionKey.selector())
+                        .addEvent(new SerialPollingSelector.SelectorEvent(selectionKey, SelectionKey.OP_READ));
+                }
+            });
+        }
+
+        @Override public void close() {
+            this.comPort.closePort();
+        }
+
+        @Override
+        public int read(ByteBuf buf) {
+            int bytesToRead = comPort.bytesAvailable();
+            assert bytesToRead > 0;
+            byte[] buffer = new byte[bytesToRead];
+            comPort.readBytes(buffer, bytesToRead);
+            buf.writeBytes(buffer);
+            return bytesToRead;
+        }
+
+        @Override
+        public int write(ByteBuf buf) {
+            int expectedToWrite = buf.readableBytes();
+            byte[] bytes = new byte[expectedToWrite];
+            buf.readBytes(bytes);
+            int bytesWritten = comPort.writeBytes(bytes, expectedToWrite);
+            return bytesWritten;
+        }
+    }
+}
diff --git a/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialPollingSelector.java b/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialPollingSelector.java
index 38565b0bab9..9b853521f86 100644
--- a/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialPollingSelector.java
+++ b/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialPollingSelector.java
@@ -1,176 +1,176 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.serial.connection.connection;
-
-import io.netty.util.concurrent.DefaultEventExecutor;
-import io.netty.util.concurrent.DefaultPromise;
-import org.apache.commons.lang3.NotImplementedException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.nio.channels.spi.AbstractSelectableChannel;
-import java.nio.channels.spi.AbstractSelector;
-import java.nio.channels.spi.SelectorProvider;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-
-/**
- * TODO write comment
- *
- * @author julian
- * Created by julian on 2019-08-10
- */
-class SerialPollingSelector extends AbstractSelector {
-
-    private static final Logger logger = LoggerFactory.getLogger(SerialPollingSelector.class);
-
-    private final List<SelectionKey> registeredChannels;
-    private final Set<SelectorEvent> events = ConcurrentHashMap.newKeySet();
-
-    // Use a Netty Promise
-    private final DefaultEventExecutor executor = new DefaultEventExecutor();
-    private DefaultPromise<Void> selectPromise;
-
-    public static class SelectorEvent {
-
-        private final SelectionKey key;
-
-        private final int event;
-        public SelectorEvent(SelectionKey key, int event) {
-            this.key = key;
-            this.event = event;
-        }
-
-        public SelectionKey getKey() {
-            return this.key;
-        }
-
-        public int getEvent() {
-            return event;
-        }
-
-    }
-    public SerialPollingSelector(SelectorProvider selectorProvider) {
-        super(selectorProvider);
-        registeredChannels = new ArrayList<>();
-    }
-
-    @Override
-    public Set<SelectionKey> keys() {
-        return new HashSet<>(registeredChannels);
-    }
-
-    /**
-     * Returns all keys that are in the events queue
-     * @return
-     */
-    @Override
-    public Set<SelectionKey> selectedKeys() {
-        return events.stream().map(SelectorEvent::getKey).collect(Collectors.toSet());
-    }
-
-    @Override
-    public int selectNow() throws IOException {
-        // throw new NotImplementedException("");
-        logger.debug("selectNow()");
-        // check if one channel is active
-        return events.size();
-    }
-
-    @Override
-    public int select(long timeout) throws IOException {
-        logger.debug("select({})", timeout);
-        if (events.size() > 0) {
-            return events.size();
-        }
-        this.selectPromise = new DefaultPromise<>(executor);
-        try {
-            if (selectPromise.await(timeout)) {
-                logger.debug("Promise was cancelled, new Events should be there.");
-            } else {
-                logger.debug("Promise timed out, expecting no new events.");
-            }
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new RuntimeException("Was interrupted", e);
-        }
-        return events.size();
-    }
-
-    @Override
-    public int select() throws IOException {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public Selector wakeup() {
-        // throw new NotImplementedException("Not implemented for this selector, should not be needed.");
-        // NOOP
-        return this;
-    }
-
-    public void addEvent(SelectorEvent event) {
-        logger.debug("Adding Event to Selector, canceling Promise...");
-        this.events.add(event);
-        // Add the OP to the SelectionKey
-        ((SerialSelectionKey) event.key).addReadyOp(event.event);
-        // Close the future so that the select is fired imediatly
-        if (!selectPromise.isDone()) {
-            selectPromise.setSuccess(null);
-        } else {
-            logger.debug("Promise is already cancelled, skipping that.");
-        }
-    }
-
-    public void removeEvent(SerialSelectionKey serialSelectionKey) {
-        events.removeIf(event -> event.key.equals(serialSelectionKey));
-    }
-
-    @Override
-    protected void implCloseSelector() throws IOException {
-        // TODO should we do something here?
-    }
-
-    @Override
-    protected SelectionKey register(AbstractSelectableChannel ch, int ops, Object att) {
-        logger.debug("Registering Channel for selector {} with operations {}", ch, ops);
-        if (!(ch instanceof SerialSocketChannel)) {
-            throw new IllegalArgumentException("Given channel has to be of type " + SerialSocketChannel.class);
-        }
-        final SerialSelectionKey key = new SerialSelectionKey(ch, this, ops);
-        // Attach attr
-        key.attach(att);
-        synchronized (this) {
-            // TODO is this always the case??
-            final int index = registeredChannels.size();
-            registeredChannels.add(key);
-            key.setIndex(index);
-        }
-        return key;
-    }
-
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.serial.connection.connection;
+
+import io.netty.util.concurrent.DefaultEventExecutor;
+import io.netty.util.concurrent.DefaultPromise;
+import org.apache.commons.lang3.NotImplementedException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.nio.channels.spi.AbstractSelectableChannel;
+import java.nio.channels.spi.AbstractSelector;
+import java.nio.channels.spi.SelectorProvider;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+/**
+ * TODO write comment
+ *
+ * @author julian
+ * Created by julian on 2019-08-10
+ */
+class SerialPollingSelector extends AbstractSelector {
+
+    private static final Logger logger = LoggerFactory.getLogger(SerialPollingSelector.class);
+
+    private final List<SelectionKey> registeredChannels;
+    private final Set<SelectorEvent> events = ConcurrentHashMap.newKeySet();
+
+    // Use a Netty Promise
+    private final DefaultEventExecutor executor = new DefaultEventExecutor();
+    private DefaultPromise<Void> selectPromise;
+
+    public static class SelectorEvent {
+
+        private final SelectionKey key;
+
+        private final int event;
+        public SelectorEvent(SelectionKey key, int event) {
+            this.key = key;
+            this.event = event;
+        }
+
+        public SelectionKey getKey() {
+            return this.key;
+        }
+
+        public int getEvent() {
+            return event;
+        }
+
+    }
+    public SerialPollingSelector(SelectorProvider selectorProvider) {
+        super(selectorProvider);
+        registeredChannels = new ArrayList<>();
+    }
+
+    @Override
+    public Set<SelectionKey> keys() {
+        return new HashSet<>(registeredChannels);
+    }
+
+    /**
+     * Returns all keys that are in the events queue
+     * @return
+     */
+    @Override
+    public Set<SelectionKey> selectedKeys() {
+        return events.stream().map(SelectorEvent::getKey).collect(Collectors.toSet());
+    }
+
+    @Override
+    public int selectNow() throws IOException {
+        // throw new NotImplementedException("");
+        logger.debug("selectNow()");
+        // check if one channel is active
+        return events.size();
+    }
+
+    @Override
+    public int select(long timeout) throws IOException {
+        logger.debug("select({})", timeout);
+        if (events.size() > 0) {
+            return events.size();
+        }
+        this.selectPromise = new DefaultPromise<>(executor);
+        try {
+            if (selectPromise.await(timeout)) {
+                logger.debug("Promise was cancelled, new Events should be there.");
+            } else {
+                logger.debug("Promise timed out, expecting no new events.");
+            }
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new RuntimeException("Was interrupted", e);
+        }
+        return events.size();
+    }
+
+    @Override
+    public int select() throws IOException {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public Selector wakeup() {
+        // throw new NotImplementedException("Not implemented for this selector, should not be needed.");
+        // NOOP
+        return this;
+    }
+
+    public void addEvent(SelectorEvent event) {
+        logger.debug("Adding Event to Selector, canceling Promise...");
+        this.events.add(event);
+        // Add the OP to the SelectionKey
+        ((SerialSelectionKey) event.key).addReadyOp(event.event);
+        // Close the future so that the select is fired imediatly
+        if (!selectPromise.isDone()) {
+            selectPromise.setSuccess(null);
+        } else {
+            logger.debug("Promise is already cancelled, skipping that.");
+        }
+    }
+
+    public void removeEvent(SerialSelectionKey serialSelectionKey) {
+        events.removeIf(event -> event.key.equals(serialSelectionKey));
+    }
+
+    @Override
+    protected void implCloseSelector() throws IOException {
+        // TODO should we do something here?
+    }
+
+    @Override
+    protected SelectionKey register(AbstractSelectableChannel ch, int ops, Object att) {
+        logger.debug("Registering Channel for selector {} with operations {}", ch, ops);
+        if (!(ch instanceof SerialSocketChannel)) {
+            throw new IllegalArgumentException("Given channel has to be of type " + SerialSocketChannel.class);
+        }
+        final SerialSelectionKey key = new SerialSelectionKey(ch, this, ops);
+        // Attach attr
+        key.attach(att);
+        synchronized (this) {
+            // TODO is this always the case??
+            final int index = registeredChannels.size();
+            registeredChannels.add(key);
+            key.setIndex(index);
+        }
+        return key;
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialSelectionKey.java b/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialSelectionKey.java
index 4ffeee4441d..4dffb7158b0 100644
--- a/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialSelectionKey.java
+++ b/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialSelectionKey.java
@@ -1,80 +1,80 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.serial.connection.connection;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.channels.SelectableChannel;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.nio.channels.spi.AbstractSelectionKey;
-
-class SerialSelectionKey extends AbstractSelectionKey {
-
-    private static final Logger logger = LoggerFactory.getLogger(SerialSelectionKey.class);
-
-    final SelectableChannel channel;
-    final Selector selector;
-    int index;
-    private volatile int interestOps;
-    private int readyOps;
-
-    SerialSelectionKey(SelectableChannel channel, Selector selector, int interestOps) {
-        this.channel = channel;
-        this.selector = selector;
-        this.interestOps = interestOps;
-    }
-
-    public void setIndex(int index) {
-        this.index = index;
-    }
-
-    @Override public SelectableChannel channel() {
-        return this.channel;
-    }
-
-    @Override public Selector selector() {
-        return this.selector;
-    }
-
-    @Override public int interestOps() {
-        return this.interestOps;
-    }
-
-    @Override public SelectionKey interestOps(int ops) {
-        this.interestOps = ops;
-        return this;
-    }
-
-    @Override public int readyOps() {
-        final int ops = this.readyOps;
-        this.readyOps = 0;
-        // Reset events for this here in Selector
-        ((SerialPollingSelector) selector).removeEvent(this);
-        logger.debug("Returning ready operation {}", ops);
-        return ops;
-    }
-
-    public void addReadyOp(int event) {
-        readyOps = readyOps | event;
-        logger.debug("Adding event {} to ready ops, now having ready ops {}", event, readyOps);
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.serial.connection.connection;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.channels.SelectableChannel;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.nio.channels.spi.AbstractSelectionKey;
+
+class SerialSelectionKey extends AbstractSelectionKey {
+
+    private static final Logger logger = LoggerFactory.getLogger(SerialSelectionKey.class);
+
+    final SelectableChannel channel;
+    final Selector selector;
+    int index;
+    private volatile int interestOps;
+    private int readyOps;
+
+    SerialSelectionKey(SelectableChannel channel, Selector selector, int interestOps) {
+        this.channel = channel;
+        this.selector = selector;
+        this.interestOps = interestOps;
+    }
+
+    public void setIndex(int index) {
+        this.index = index;
+    }
+
+    @Override public SelectableChannel channel() {
+        return this.channel;
+    }
+
+    @Override public Selector selector() {
+        return this.selector;
+    }
+
+    @Override public int interestOps() {
+        return this.interestOps;
+    }
+
+    @Override public SelectionKey interestOps(int ops) {
+        this.interestOps = ops;
+        return this;
+    }
+
+    @Override public int readyOps() {
+        final int ops = this.readyOps;
+        this.readyOps = 0;
+        // Reset events for this here in Selector
+        ((SerialPollingSelector) selector).removeEvent(this);
+        logger.debug("Returning ready operation {}", ops);
+        return ops;
+    }
+
+    public void addReadyOp(int event) {
+        readyOps = readyOps | event;
+        logger.debug("Adding event {} to ready ops, now having ready ops {}", event, readyOps);
+    }
+}
diff --git a/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialSelectorProvider.java b/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialSelectorProvider.java
index 6a47284088c..3bb07e9d35c 100644
--- a/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialSelectorProvider.java
+++ b/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialSelectorProvider.java
@@ -1,68 +1,68 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.serial.connection.connection;
-
-import org.apache.commons.lang3.NotImplementedException;
-
-import java.io.IOException;
-import java.net.ProtocolFamily;
-import java.nio.channels.*;
-import java.nio.channels.spi.AbstractSelector;
-import java.nio.channels.spi.SelectorProvider;
-
-/**
- * TODO write comment
- *
- * @author julian
- * Created by julian on 2019-08-10
- */
-class SerialSelectorProvider extends SelectorProvider {
-
-    @Override
-    public DatagramChannel openDatagramChannel() throws IOException {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public DatagramChannel openDatagramChannel(ProtocolFamily family) throws IOException {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public Pipe openPipe() throws IOException {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public AbstractSelector openSelector() throws IOException {
-        return new SerialPollingSelector(this);
-    }
-
-    @Override
-    public ServerSocketChannel openServerSocketChannel() throws IOException {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public SocketChannel openSocketChannel() throws IOException {
-        return new SerialSocketChannel(this);
-    }
-
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.serial.connection.connection;
+
+import org.apache.commons.lang3.NotImplementedException;
+
+import java.io.IOException;
+import java.net.ProtocolFamily;
+import java.nio.channels.*;
+import java.nio.channels.spi.AbstractSelector;
+import java.nio.channels.spi.SelectorProvider;
+
+/**
+ * TODO write comment
+ *
+ * @author julian
+ * Created by julian on 2019-08-10
+ */
+class SerialSelectorProvider extends SelectorProvider {
+
+    @Override
+    public DatagramChannel openDatagramChannel() throws IOException {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public DatagramChannel openDatagramChannel(ProtocolFamily family) throws IOException {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public Pipe openPipe() throws IOException {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public AbstractSelector openSelector() throws IOException {
+        return new SerialPollingSelector(this);
+    }
+
+    @Override
+    public ServerSocketChannel openServerSocketChannel() throws IOException {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public SocketChannel openSocketChannel() throws IOException {
+        return new SerialSocketChannel(this);
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialSocketAddress.java b/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialSocketAddress.java
index 166ab6524e8..8b533af9fcb 100644
--- a/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialSocketAddress.java
+++ b/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialSocketAddress.java
@@ -1,47 +1,47 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.serial.connection.connection;
-
-import java.net.SocketAddress;
-import java.util.Objects;
-
-public class SerialSocketAddress extends SocketAddress {
-
-    private final String identifier;
-
-    public SerialSocketAddress(String identifier) {
-        this.identifier = identifier;
-    }
-
-    public String getIdentifier() {
-        return identifier;
-    }
-
-    @Override public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        SerialSocketAddress that = (SerialSocketAddress) o;
-        return Objects.equals(identifier, that.identifier);
-    }
-
-    @Override public int hashCode() {
-        return Objects.hash(identifier);
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.serial.connection.connection;
+
+import java.net.SocketAddress;
+import java.util.Objects;
+
+public class SerialSocketAddress extends SocketAddress {
+
+    private final String identifier;
+
+    public SerialSocketAddress(String identifier) {
+        this.identifier = identifier;
+    }
+
+    public String getIdentifier() {
+        return identifier;
+    }
+
+    @Override public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        SerialSocketAddress that = (SerialSocketAddress) o;
+        return Objects.equals(identifier, that.identifier);
+    }
+
+    @Override public int hashCode() {
+        return Objects.hash(identifier);
+    }
+}
diff --git a/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialSocketChannel.java b/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialSocketChannel.java
index 340d36bb2f8..5c408233113 100644
--- a/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialSocketChannel.java
+++ b/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/serial/connection/connection/SerialSocketChannel.java
@@ -1,158 +1,158 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.serial.connection.connection;
-
-import org.apache.commons.lang3.NotImplementedException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.net.SocketOption;
-import java.nio.ByteBuffer;
-import java.nio.channels.SocketChannel;
-import java.nio.channels.spi.SelectorProvider;
-import java.util.Set;
-
-/**
- * TODO write comment
- *
- * @author julian
- * Created by julian on 2019-08-10
- */
-class SerialSocketChannel extends SocketChannel {
-
-    private static final Logger logger = LoggerFactory.getLogger(SerialSocketChannel.class);
-
-    private SerialChannel child =  null;
-
-    /**
-     * Initializes a new instance of this class.
-     *
-     * @param provider The provider that created this channel
-     */
-    protected SerialSocketChannel(SelectorProvider provider) {
-        super(provider);
-    }
-
-    @Override
-    public SocketChannel bind(SocketAddress local) throws IOException {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public <T> SocketChannel setOption(SocketOption<T> name, T value) throws IOException {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public SocketChannel shutdownInput() throws IOException {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public SocketChannel shutdownOutput() throws IOException {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public Socket socket() {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public boolean isConnected() {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public boolean isConnectionPending() {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public boolean connect(SocketAddress remote) throws IOException {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public boolean finishConnect() throws IOException {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public SocketAddress getRemoteAddress() throws IOException {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public int read(ByteBuffer dst) throws IOException {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public long read(ByteBuffer[] dsts, int offset, int length) throws IOException {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public int write(ByteBuffer src) throws IOException {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public long write(ByteBuffer[] srcs, int offset, int length) throws IOException {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public SocketAddress getLocalAddress() throws IOException {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public <T> T getOption(SocketOption<T> name) throws IOException {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    public Set<SocketOption<?>> supportedOptions() {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    protected void implCloseSelectableChannel() throws IOException {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    protected void implConfigureBlocking(boolean block) throws IOException {
-        logger.debug("Requesting Blocking mode to '{}'", block ? "blocking" : "non blocking");
-    }
-
-    public SerialChannel getChild() {
-        return child;
-    }
-
-    public void setChild(SerialChannel child) {
-        this.child = child;
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.serial.connection.connection;
+
+import org.apache.commons.lang3.NotImplementedException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.net.Socket;
+import java.net.SocketAddress;
+import java.net.SocketOption;
+import java.nio.ByteBuffer;
+import java.nio.channels.SocketChannel;
+import java.nio.channels.spi.SelectorProvider;
+import java.util.Set;
+
+/**
+ * TODO write comment
+ *
+ * @author julian
+ * Created by julian on 2019-08-10
+ */
+class SerialSocketChannel extends SocketChannel {
+
+    private static final Logger logger = LoggerFactory.getLogger(SerialSocketChannel.class);
+
+    private SerialChannel child =  null;
+
+    /**
+     * Initializes a new instance of this class.
+     *
+     * @param provider The provider that created this channel
+     */
+    protected SerialSocketChannel(SelectorProvider provider) {
+        super(provider);
+    }
+
+    @Override
+    public SocketChannel bind(SocketAddress local) throws IOException {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public <T> SocketChannel setOption(SocketOption<T> name, T value) throws IOException {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public SocketChannel shutdownInput() throws IOException {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public SocketChannel shutdownOutput() throws IOException {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public Socket socket() {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public boolean isConnected() {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public boolean isConnectionPending() {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public boolean connect(SocketAddress remote) throws IOException {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public boolean finishConnect() throws IOException {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public SocketAddress getRemoteAddress() throws IOException {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public int read(ByteBuffer dst) throws IOException {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public long read(ByteBuffer[] dsts, int offset, int length) throws IOException {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public int write(ByteBuffer src) throws IOException {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public long write(ByteBuffer[] srcs, int offset, int length) throws IOException {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public SocketAddress getLocalAddress() throws IOException {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public <T> T getOption(SocketOption<T> name) throws IOException {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    public Set<SocketOption<?>> supportedOptions() {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    protected void implCloseSelectableChannel() throws IOException {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    protected void implConfigureBlocking(boolean block) throws IOException {
+        logger.debug("Requesting Blocking mode to '{}'", block ? "blocking" : "non blocking");
+    }
+
+    public SerialChannel getChild() {
+        return child;
+    }
+
+    public void setChild(SerialChannel child) {
+        this.child = child;
+    }
+}
diff --git a/plc4j/protocols/driver-bases/serial/src/test/java/org/apache/plc4x/java/base/connection/SerialChannelFactoryTest.java b/plc4j/protocols/driver-bases/serial/src/test/java/org/apache/plc4x/java/base/connection/SerialChannelFactoryTest.java
index b62d8d04fa0..b22929b8b16 100644
--- a/plc4j/protocols/driver-bases/serial/src/test/java/org/apache/plc4x/java/base/connection/SerialChannelFactoryTest.java
+++ b/plc4j/protocols/driver-bases/serial/src/test/java/org/apache/plc4x/java/base/connection/SerialChannelFactoryTest.java
@@ -1,111 +1,111 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.base.connection;
-
-import com.fazecast.jSerialComm.SerialPort;
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInitializer;
-import io.netty.handler.codec.ByteToMessageCodec;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.serial.connection.connection.SerialChannel;
-import org.apache.plc4x.java.serial.connection.connection.SerialChannelFactory;
-import org.apache.plc4x.java.serial.connection.connection.SerialChannelHandler;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.UnknownHostException;
-import java.util.List;
-
-/**
- * TODO write comment
- *
- * @author julian
- * Created by julian on 2019-08-10
- */
-public class SerialChannelFactoryTest {
-
-    private static final Logger logger = LoggerFactory.getLogger(SerialChannelFactoryTest.class);
-
-    @Test
-    public void showAllPorts() {
-        System.out.println("-------------------------------------");
-        System.out.println(" Starting to Display all Serial Ports");
-        System.out.println("-------------------------------------");
-        for (SerialPort commPort : SerialPort.getCommPorts()) {
-            System.out.println(commPort.getDescriptivePortName());
-        }
-    }
-
-    @Test
-    public void createChannel() throws PlcConnectionException, InterruptedException, UnknownHostException {
-        SerialChannelFactory asdf = new SerialChannelFactory("TEST-port1");
-        // final TcpSocketChannelFactory factory = new TcpSocketChannelFactory(InetAddress.getLocalHost(), 5432);
-        final Channel channel = asdf.createChannel(new ChannelInitializer<SerialChannel>() {
-            @Override protected void initChannel(SerialChannel ch) throws Exception {
-                ch.pipeline().addLast(new DemoCodec());
-            }
-        });
-        Thread.sleep(100);
-        for (int i = 1; i <= 10; i++) {
-            Thread.sleep(10);
-            SerialChannelHandler.DummyHandler.INSTANCE.fireEvent(1);
-        }
-        Thread.sleep(100);
-        channel.close().sync();
-    }
-
-    @Test
-    public void createChannelToSBL() throws PlcConnectionException, InterruptedException, UnknownHostException {
-        SerialChannelFactory asdf = new SerialChannelFactory("JBLFlip3-SPPDev");
-        Channel channel = null;
-        try {
-            channel = asdf.createChannel(new ChannelInitializer<SerialChannel>() {
-                @Override protected void initChannel(SerialChannel ch) throws Exception {
-                    ch.pipeline().addLast(new DemoCodec());
-                }
-            });
-        } catch (Exception e) {
-            // do nothing
-        }
-        Thread.sleep(5_000);
-        if (channel != null) {
-            channel.close().sync();
-        }
-    }
-
-    private static class DemoCodec extends ByteToMessageCodec<Object> {
-        @Override protected void encode(ChannelHandlerContext channelHandlerContext, Object o, ByteBuf byteBuf) throws Exception {
-            // do nothing here
-        }
-
-        @Override protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List<Object> list) throws Exception {
-            byteBuf.markReaderIndex();
-            StringBuffer sb = new StringBuffer();
-            for (int i = 1; i <= byteBuf.readableBytes(); i++) {
-                sb.append(byteBuf.readByte() + ", ");
-            }
-            byteBuf.resetReaderIndex();
-            logger.debug("We currently have {} readable bytes: {}", byteBuf.readableBytes(), sb.toString());
-        }
-    }
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.base.connection;
+
+import com.fazecast.jSerialComm.SerialPort;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInitializer;
+import io.netty.handler.codec.ByteToMessageCodec;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.serial.connection.connection.SerialChannel;
+import org.apache.plc4x.java.serial.connection.connection.SerialChannelFactory;
+import org.apache.plc4x.java.serial.connection.connection.SerialChannelHandler;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.UnknownHostException;
+import java.util.List;
+
+/**
+ * TODO write comment
+ *
+ * @author julian
+ * Created by julian on 2019-08-10
+ */
+public class SerialChannelFactoryTest {
+
+    private static final Logger logger = LoggerFactory.getLogger(SerialChannelFactoryTest.class);
+
+    @Test
+    public void showAllPorts() {
+        System.out.println("-------------------------------------");
+        System.out.println(" Starting to Display all Serial Ports");
+        System.out.println("-------------------------------------");
+        for (SerialPort commPort : SerialPort.getCommPorts()) {
+            System.out.println(commPort.getDescriptivePortName());
+        }
+    }
+
+    @Test
+    public void createChannel() throws PlcConnectionException, InterruptedException, UnknownHostException {
+        SerialChannelFactory asdf = new SerialChannelFactory("TEST-port1");
+        // final TcpSocketChannelFactory factory = new TcpSocketChannelFactory(InetAddress.getLocalHost(), 5432);
+        final Channel channel = asdf.createChannel(new ChannelInitializer<SerialChannel>() {
+            @Override protected void initChannel(SerialChannel ch) throws Exception {
+                ch.pipeline().addLast(new DemoCodec());
+            }
+        });
+        Thread.sleep(100);
+        for (int i = 1; i <= 10; i++) {
+            Thread.sleep(10);
+            SerialChannelHandler.DummyHandler.INSTANCE.fireEvent(1);
+        }
+        Thread.sleep(100);
+        channel.close().sync();
+    }
+
+    @Test
+    public void createChannelToSBL() throws PlcConnectionException, InterruptedException, UnknownHostException {
+        SerialChannelFactory asdf = new SerialChannelFactory("JBLFlip3-SPPDev");
+        Channel channel = null;
+        try {
+            channel = asdf.createChannel(new ChannelInitializer<SerialChannel>() {
+                @Override protected void initChannel(SerialChannel ch) throws Exception {
+                    ch.pipeline().addLast(new DemoCodec());
+                }
+            });
+        } catch (Exception e) {
+            // do nothing
+        }
+        Thread.sleep(5_000);
+        if (channel != null) {
+            channel.close().sync();
+        }
+    }
+
+    private static class DemoCodec extends ByteToMessageCodec<Object> {
+        @Override protected void encode(ChannelHandlerContext channelHandlerContext, Object o, ByteBuf byteBuf) throws Exception {
+            // do nothing here
+        }
+
+        @Override protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List<Object> list) throws Exception {
+            byteBuf.markReaderIndex();
+            StringBuffer sb = new StringBuffer();
+            for (int i = 1; i <= byteBuf.readableBytes(); i++) {
+                sb.append(byteBuf.readByte() + ", ");
+            }
+            byteBuf.resetReaderIndex();
+            logger.debug("We currently have {} readable bytes: {}", byteBuf.readableBytes(), sb.toString());
+        }
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/tcp/pom.xml b/plc4j/protocols/driver-bases/tcp/pom.xml
index d0d63e16424..f531e1dfb95 100644
--- a/plc4j/protocols/driver-bases/tcp/pom.xml
+++ b/plc4j/protocols/driver-bases/tcp/pom.xml
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-protocols-driver-bases</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-protocol-driver-base-tcp</artifactId>
-  <name>PLC4J: Protocol: Driver-Base: TCP</name>
-  <description>Base classes needed to implement plc4x drivers based on TCP connections.</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-common</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-protocols-driver-bases</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-protocol-driver-base-tcp</artifactId>
+  <name>PLC4J: Protocol: Driver-Base: TCP</name>
+  <description>Base classes needed to implement plc4x drivers based on TCP connections.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-common</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/tcp/src/main/java/org/apache/plc4x/java/tcp/connection/TcpSocketChannelFactory.java b/plc4j/protocols/driver-bases/tcp/src/main/java/org/apache/plc4x/java/tcp/connection/TcpSocketChannelFactory.java
index ce21c6137d2..805be6356b8 100644
--- a/plc4j/protocols/driver-bases/tcp/src/main/java/org/apache/plc4x/java/tcp/connection/TcpSocketChannelFactory.java
+++ b/plc4j/protocols/driver-bases/tcp/src/main/java/org/apache/plc4x/java/tcp/connection/TcpSocketChannelFactory.java
@@ -1,112 +1,112 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.tcp.connection;
-
-import io.netty.bootstrap.Bootstrap;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelOption;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.nio.NioSocketChannel;
-import io.netty.util.concurrent.Future;
-import io.netty.util.concurrent.GenericFutureListener;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.exceptions.PlcException;
-import org.apache.plc4x.java.base.connection.ChannelFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-
-public class TcpSocketChannelFactory implements ChannelFactory {
-
-    private static final Logger logger = LoggerFactory.getLogger(TcpSocketChannelFactory.class);
-
-    private static final int PING_TIMEOUT_MS = 1_000;
-
-    private final InetAddress address;
-    private final int port;
-
-    public TcpSocketChannelFactory(InetAddress address, int port) {
-        this.address = address;
-        this.port = port;
-    }
-
-    @Override
-    public Channel createChannel(ChannelHandler channelHandler)
-        throws PlcConnectionException {
-        try {
-            final NioEventLoopGroup workerGroup = new NioEventLoopGroup();
-
-            Bootstrap bootstrap = new Bootstrap();
-            bootstrap.group(workerGroup);
-            bootstrap.channel(NioSocketChannel.class);
-            bootstrap.option(ChannelOption.SO_KEEPALIVE, true);
-            bootstrap.option(ChannelOption.TCP_NODELAY, true);
-            // TODO we should use an explicit (configurable?) timeout here
-            // bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 1000);
-            bootstrap.handler(channelHandler);
-            // Start the client.
-            final ChannelFuture f = bootstrap.connect(address, port);
-            f.addListener(new GenericFutureListener<Future<? super Void>>() {
-                @Override public void operationComplete(Future<? super Void> future) throws Exception {
-                    if (!future.isSuccess()) {
-                        logger.info("Unable to connect, shutting down worker thread.");
-                        workerGroup.shutdownGracefully();
-                    }
-                }
-            });
-            // Wait for sync
-            f.sync();
-            f.awaitUninterruptibly(); // jf: unsure if we need that
-            // Wait till the session is finished initializing.
-            return f.channel();
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new PlcConnectionException("Error creating channel.", e);
-        } catch (Exception e) {
-            throw new PlcConnectionException("Error creating channel.", e);
-        }
-    }
-
-    @Override
-    public void ping() throws PlcException {
-        // TODO: Replace this check with a more accurate one ...
-        InetSocketAddress address = new InetSocketAddress(getAddress(), getPort());
-        try (Socket s = new Socket()) {
-            s.connect(address, PING_TIMEOUT_MS);
-            // TODO keep the address for a (timely) next request???
-            s.setReuseAddress(true);
-        } catch (Exception e) {
-            throw new PlcConnectionException("Unable to ping remote host");
-        }
-    }
-
-    public InetAddress getAddress() {
-        return address;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.tcp.connection;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.exceptions.PlcException;
+import org.apache.plc4x.java.base.connection.ChannelFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+
+public class TcpSocketChannelFactory implements ChannelFactory {
+
+    private static final Logger logger = LoggerFactory.getLogger(TcpSocketChannelFactory.class);
+
+    private static final int PING_TIMEOUT_MS = 1_000;
+
+    private final InetAddress address;
+    private final int port;
+
+    public TcpSocketChannelFactory(InetAddress address, int port) {
+        this.address = address;
+        this.port = port;
+    }
+
+    @Override
+    public Channel createChannel(ChannelHandler channelHandler)
+        throws PlcConnectionException {
+        try {
+            final NioEventLoopGroup workerGroup = new NioEventLoopGroup();
+
+            Bootstrap bootstrap = new Bootstrap();
+            bootstrap.group(workerGroup);
+            bootstrap.channel(NioSocketChannel.class);
+            bootstrap.option(ChannelOption.SO_KEEPALIVE, true);
+            bootstrap.option(ChannelOption.TCP_NODELAY, true);
+            // TODO we should use an explicit (configurable?) timeout here
+            // bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 1000);
+            bootstrap.handler(channelHandler);
+            // Start the client.
+            final ChannelFuture f = bootstrap.connect(address, port);
+            f.addListener(new GenericFutureListener<Future<? super Void>>() {
+                @Override public void operationComplete(Future<? super Void> future) throws Exception {
+                    if (!future.isSuccess()) {
+                        logger.info("Unable to connect, shutting down worker thread.");
+                        workerGroup.shutdownGracefully();
+                    }
+                }
+            });
+            // Wait for sync
+            f.sync();
+            f.awaitUninterruptibly(); // jf: unsure if we need that
+            // Wait till the session is finished initializing.
+            return f.channel();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new PlcConnectionException("Error creating channel.", e);
+        } catch (Exception e) {
+            throw new PlcConnectionException("Error creating channel.", e);
+        }
+    }
+
+    @Override
+    public void ping() throws PlcException {
+        // TODO: Replace this check with a more accurate one ...
+        InetSocketAddress address = new InetSocketAddress(getAddress(), getPort());
+        try (Socket s = new Socket()) {
+            s.connect(address, PING_TIMEOUT_MS);
+            // TODO keep the address for a (timely) next request???
+            s.setReuseAddress(true);
+        } catch (Exception e) {
+            throw new PlcConnectionException("Unable to ping remote host");
+        }
+    }
+
+    public InetAddress getAddress() {
+        return address;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/test/pom.xml b/plc4j/protocols/driver-bases/test/pom.xml
index cf84e1754d0..7e031540f5b 100644
--- a/plc4j/protocols/driver-bases/test/pom.xml
+++ b/plc4j/protocols/driver-bases/test/pom.xml
@@ -1,97 +1,97 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-protocols-driver-bases</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-protocol-driver-base-test</artifactId>
-  <name>PLC4J: Protocol: Driver-Base: Test</name>
-  <description>Base classes needed to implement plc4x drivers for testing using internal byte streams.</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <!-- This is a compile dependency for this test artifact -->
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <!-- This is a compile dependency for this test artifact -->
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <!-- This is a compile dependency for this test artifact -->
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <!-- This is a compile dependency for this test artifact -->
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-junit-jupiter</artifactId>
-      <!-- This is a compile dependency for this test artifact -->
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-protocols-driver-bases</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-protocol-driver-base-test</artifactId>
+  <name>PLC4J: Protocol: Driver-Base: Test</name>
+  <description>Base classes needed to implement plc4x drivers for testing using internal byte streams.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <!-- This is a compile dependency for this test artifact -->
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-core</artifactId>
+      <!-- This is a compile dependency for this test artifact -->
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <!-- This is a compile dependency for this test artifact -->
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <!-- This is a compile dependency for this test artifact -->
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <!-- This is a compile dependency for this test artifact -->
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/MockDevice.java b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/MockDevice.java
index 999a4acc854..23239785b0a 100644
--- a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/MockDevice.java
+++ b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/MockDevice.java
@@ -1,50 +1,50 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.mock;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
-import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
-import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-
-import java.util.Collection;
-import java.util.function.Consumer;
-
-/**
- * Mock Object to do assertions on.
- */
-public interface MockDevice {
-
-    Pair<PlcResponseCode, BaseDefaultFieldItem> read(String fieldQuery);
-
-    PlcResponseCode write(String fieldQuery, Object value);
-
-    Pair<PlcResponseCode, PlcSubscriptionHandle> subscribe(String fieldQuery);
-
-    void unsubscribe();
-
-    // TODO: this might not be right here as you are not really register at the device, rather on the connection
-    PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer, Collection<PlcSubscriptionHandle> handles);
-
-    // TODO: this might not be right here as you are not really register at the device, rather on the connection
-    void unregister(PlcConsumerRegistration registration);
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.mock;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
+import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+
+import java.util.Collection;
+import java.util.function.Consumer;
+
+/**
+ * Mock Object to do assertions on.
+ */
+public interface MockDevice {
+
+    Pair<PlcResponseCode, BaseDefaultFieldItem> read(String fieldQuery);
+
+    PlcResponseCode write(String fieldQuery, Object value);
+
+    Pair<PlcResponseCode, PlcSubscriptionHandle> subscribe(String fieldQuery);
+
+    void unsubscribe();
+
+    // TODO: this might not be right here as you are not really register at the device, rather on the connection
+    PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer, Collection<PlcSubscriptionHandle> handles);
+
+    // TODO: this might not be right here as you are not really register at the device, rather on the connection
+    void unregister(PlcConsumerRegistration registration);
+}
diff --git a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/MockField.java b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/MockField.java
index b7dccc9df05..1e80445a084 100644
--- a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/MockField.java
+++ b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/MockField.java
@@ -1,49 +1,49 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.mock;
-
-import org.apache.plc4x.java.api.model.PlcField;
-
-import java.util.List;
-
-public class MockField implements PlcField {
-
-    private final String fieldQuery;
-
-    private final List<Object> values;
-
-    public MockField(String fieldQuery) {
-        this.fieldQuery = fieldQuery;
-        values = null;
-    }
-
-    public MockField(String fieldQuery, List<Object> values) {
-        this.fieldQuery = fieldQuery;
-        this.values = values;
-    }
-
-    public String getFieldQuery() {
-        return fieldQuery;
-    }
-
-    public List<Object> getValues() {
-        return values;
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.mock;
+
+import org.apache.plc4x.java.api.model.PlcField;
+
+import java.util.List;
+
+public class MockField implements PlcField {
+
+    private final String fieldQuery;
+
+    private final List<Object> values;
+
+    public MockField(String fieldQuery) {
+        this.fieldQuery = fieldQuery;
+        values = null;
+    }
+
+    public MockField(String fieldQuery, List<Object> values) {
+        this.fieldQuery = fieldQuery;
+        this.values = values;
+    }
+
+    public String getFieldQuery() {
+        return fieldQuery;
+    }
+
+    public List<Object> getValues() {
+        return values;
+    }
+}
diff --git a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/MockFieldHandler.java b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/MockFieldHandler.java
index 055769fc37a..a9d7ce99124 100644
--- a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/MockFieldHandler.java
+++ b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/MockFieldHandler.java
@@ -1,103 +1,103 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.mock;
-
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.connection.DefaultPlcFieldHandler;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-
-public class MockFieldHandler extends DefaultPlcFieldHandler {
-
-    @Override
-    public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
-        return new MockField(fieldQuery);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeBoolean(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeByte(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeShort(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeInteger(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeBigInteger(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeLong(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeFloat(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeBigDecimal(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeDouble(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeString(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeTime(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeDate(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeDateTime(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeByteArray(PlcField field, Object[] values) {
-        return new MockFieldItem(values);
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.mock;
+
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.connection.DefaultPlcFieldHandler;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+
+public class MockFieldHandler extends DefaultPlcFieldHandler {
+
+    @Override
+    public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
+        return new MockField(fieldQuery);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeBoolean(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeByte(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeShort(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeInteger(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeBigInteger(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeLong(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeFloat(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeBigDecimal(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDouble(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeString(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeTime(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDate(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDateTime(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeByteArray(PlcField field, Object[] values) {
+        return new MockFieldItem(values);
+    }
+}
diff --git a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/MockFieldItem.java b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/MockFieldItem.java
index 2942aa50155..2cee4641655 100644
--- a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/MockFieldItem.java
+++ b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/MockFieldItem.java
@@ -1,34 +1,34 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.mock;
-
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-
-public class MockFieldItem extends BaseDefaultFieldItem<Object> {
-
-    public MockFieldItem(Object... values) {
-        super(values);
-    }
-
-    public Object getObject(int index) {
-        return getValue(index);
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.mock;
+
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+
+public class MockFieldItem extends BaseDefaultFieldItem<Object> {
+
+    public MockFieldItem(Object... values) {
+        super(values);
+    }
+
+    public Object getObject(int index) {
+        return getValue(index);
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/PlcMockConnection.java b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/PlcMockConnection.java
index 3ef1cab2d98..849354e293a 100644
--- a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/PlcMockConnection.java
+++ b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/PlcMockConnection.java
@@ -1,193 +1,193 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.mock;
-
-import org.apache.commons.lang3.Validate;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.messages.*;
-import org.apache.plc4x.java.api.metadata.PlcConnectionMetadata;
-import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
-import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.messages.*;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-public class PlcMockConnection implements PlcConnection, PlcReader, PlcWriter, PlcSubscriber {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(PlcMockConnection.class);
-
-    private final PlcAuthentication authentication;
-
-    private MockDevice device;
-
-    PlcMockConnection(PlcAuthentication authentication) {
-        this.authentication = authentication;
-    }
-
-    public MockDevice getDevice() {
-        return device;
-    }
-
-    public void setDevice(MockDevice device) {
-        LOGGER.info("Set Mock Devie on Mock Connection {} with device {}", this, device);
-        this.device = device;
-    }
-
-    @Override
-    public void connect() {
-        // do nothing
-    }
-
-    @Override
-    public CompletableFuture<Void> ping() {
-        CompletableFuture<Void> future = new CompletableFuture<>();
-        future.completeExceptionally(new UnsupportedOperationException());
-        return future;
-    }
-
-    @Override
-    public boolean isConnected() {
-        return device != null;
-    }
-
-    @Override
-    public void close() {
-        LOGGER.info("Closing MockConnection with device {}", device);
-    }
-
-    @Override
-    public PlcConnectionMetadata getMetadata() {
-        return new PlcConnectionMetadata() {
-            @Override
-            public boolean canRead() {
-                return true;
-            }
-
-            @Override
-            public boolean canWrite() {
-                return true;
-            }
-
-            @Override
-            public boolean canSubscribe() {
-                return true;
-            }
-        };
-    }
-
-    @Override
-    public PlcReadRequest.Builder readRequestBuilder() {
-        return new DefaultPlcReadRequest.Builder(this, new MockFieldHandler());
-    }
-
-    @Override
-    public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
-        return CompletableFuture.supplyAsync(() -> {
-            Validate.notNull(device, "No device is set in the mock connection!");
-            LOGGER.debug("Sending read request to MockDevice");
-            Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> response = readRequest.getFieldNames().stream()
-                .collect(Collectors.toMap(
-                    Function.identity(),
-                    name -> device.read(((MockField) readRequest.getField(name)).getFieldQuery())
-                    )
-                );
-            return new DefaultPlcReadResponse((DefaultPlcReadRequest) readRequest, response);
-        });
-    }
-
-    @Override
-    public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
-        return CompletableFuture.supplyAsync(() -> {
-            Validate.notNull(device, "No device is set in the mock connection!");
-            LOGGER.debug("Sending write request to MockDevice");
-            Map<String, PlcResponseCode> response = writeRequest.getFieldNames().stream()
-                .collect(Collectors.toMap(
-                    Function.identity(),
-                    name -> device.write(((MockField) writeRequest.getField(name)).getFieldQuery(), ((MockField) writeRequest.getField(name)).getValues())
-                    )
-                );
-            return new DefaultPlcWriteResponse((DefaultPlcWriteRequest) writeRequest, response);
-        });
-    }
-
-    @Override
-    public CompletableFuture<PlcSubscriptionResponse> subscribe(PlcSubscriptionRequest subscriptionRequest) {
-        return CompletableFuture.supplyAsync(() -> {
-            Validate.notNull(device, "No device is set in the mock connection!");
-            LOGGER.debug("Sending subsribe request to MockDevice");
-            Map<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> response = subscriptionRequest.getFieldNames().stream()
-                .collect(Collectors.toMap(
-                    Function.identity(),
-                    name -> device.subscribe(((MockField) subscriptionRequest.getField(name)).getFieldQuery())
-                    )
-                );
-            return new DefaultPlcSubscriptionResponse((DefaultPlcSubscriptionRequest) subscriptionRequest, response);
-        });
-    }
-
-    @Override
-    public CompletableFuture<PlcUnsubscriptionResponse> unsubscribe(PlcUnsubscriptionRequest unsubscriptionRequest) {
-        return CompletableFuture.supplyAsync(() -> {
-            Validate.notNull(device, "No device is set in the mock connection!");
-            LOGGER.debug("Sending subsribe request to MockDevice");
-            device.unsubscribe();
-            return new DefaultPlcUnsubscriptionResponse((DefaultPlcUnsubscriptionRequest) unsubscriptionRequest);
-        });
-    }
-
-    @Override
-    public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer, Collection<PlcSubscriptionHandle> handles) {
-        return device.register(consumer, handles);
-    }
-
-    @Override
-    public void unregister(PlcConsumerRegistration registration) {
-        device.unregister(registration);
-    }
-
-    @Override
-    public PlcWriteRequest.Builder writeRequestBuilder() {
-        return new DefaultPlcWriteRequest.Builder(this, new MockFieldHandler());
-    }
-
-    @Override
-    public PlcSubscriptionRequest.Builder subscriptionRequestBuilder() {
-        return new DefaultPlcSubscriptionRequest.Builder(this, new MockFieldHandler());
-    }
-
-    @Override
-    public PlcUnsubscriptionRequest.Builder unsubscriptionRequestBuilder() {
-        return new DefaultPlcUnsubscriptionRequest.Builder(this);
-    }
-
-    public PlcAuthentication getAuthentication() {
-        return authentication;
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.mock;
+
+import org.apache.commons.lang3.Validate;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.authentication.PlcAuthentication;
+import org.apache.plc4x.java.api.messages.*;
+import org.apache.plc4x.java.api.metadata.PlcConnectionMetadata;
+import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.messages.*;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+public class PlcMockConnection implements PlcConnection, PlcReader, PlcWriter, PlcSubscriber {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PlcMockConnection.class);
+
+    private final PlcAuthentication authentication;
+
+    private MockDevice device;
+
+    PlcMockConnection(PlcAuthentication authentication) {
+        this.authentication = authentication;
+    }
+
+    public MockDevice getDevice() {
+        return device;
+    }
+
+    public void setDevice(MockDevice device) {
+        LOGGER.info("Set Mock Devie on Mock Connection {} with device {}", this, device);
+        this.device = device;
+    }
+
+    @Override
+    public void connect() {
+        // do nothing
+    }
+
+    @Override
+    public CompletableFuture<Void> ping() {
+        CompletableFuture<Void> future = new CompletableFuture<>();
+        future.completeExceptionally(new UnsupportedOperationException());
+        return future;
+    }
+
+    @Override
+    public boolean isConnected() {
+        return device != null;
+    }
+
+    @Override
+    public void close() {
+        LOGGER.info("Closing MockConnection with device {}", device);
+    }
+
+    @Override
+    public PlcConnectionMetadata getMetadata() {
+        return new PlcConnectionMetadata() {
+            @Override
+            public boolean canRead() {
+                return true;
+            }
+
+            @Override
+            public boolean canWrite() {
+                return true;
+            }
+
+            @Override
+            public boolean canSubscribe() {
+                return true;
+            }
+        };
+    }
+
+    @Override
+    public PlcReadRequest.Builder readRequestBuilder() {
+        return new DefaultPlcReadRequest.Builder(this, new MockFieldHandler());
+    }
+
+    @Override
+    public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
+        return CompletableFuture.supplyAsync(() -> {
+            Validate.notNull(device, "No device is set in the mock connection!");
+            LOGGER.debug("Sending read request to MockDevice");
+            Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> response = readRequest.getFieldNames().stream()
+                .collect(Collectors.toMap(
+                    Function.identity(),
+                    name -> device.read(((MockField) readRequest.getField(name)).getFieldQuery())
+                    )
+                );
+            return new DefaultPlcReadResponse((DefaultPlcReadRequest) readRequest, response);
+        });
+    }
+
+    @Override
+    public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
+        return CompletableFuture.supplyAsync(() -> {
+            Validate.notNull(device, "No device is set in the mock connection!");
+            LOGGER.debug("Sending write request to MockDevice");
+            Map<String, PlcResponseCode> response = writeRequest.getFieldNames().stream()
+                .collect(Collectors.toMap(
+                    Function.identity(),
+                    name -> device.write(((MockField) writeRequest.getField(name)).getFieldQuery(), ((MockField) writeRequest.getField(name)).getValues())
+                    )
+                );
+            return new DefaultPlcWriteResponse((DefaultPlcWriteRequest) writeRequest, response);
+        });
+    }
+
+    @Override
+    public CompletableFuture<PlcSubscriptionResponse> subscribe(PlcSubscriptionRequest subscriptionRequest) {
+        return CompletableFuture.supplyAsync(() -> {
+            Validate.notNull(device, "No device is set in the mock connection!");
+            LOGGER.debug("Sending subsribe request to MockDevice");
+            Map<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> response = subscriptionRequest.getFieldNames().stream()
+                .collect(Collectors.toMap(
+                    Function.identity(),
+                    name -> device.subscribe(((MockField) subscriptionRequest.getField(name)).getFieldQuery())
+                    )
+                );
+            return new DefaultPlcSubscriptionResponse((DefaultPlcSubscriptionRequest) subscriptionRequest, response);
+        });
+    }
+
+    @Override
+    public CompletableFuture<PlcUnsubscriptionResponse> unsubscribe(PlcUnsubscriptionRequest unsubscriptionRequest) {
+        return CompletableFuture.supplyAsync(() -> {
+            Validate.notNull(device, "No device is set in the mock connection!");
+            LOGGER.debug("Sending subsribe request to MockDevice");
+            device.unsubscribe();
+            return new DefaultPlcUnsubscriptionResponse((DefaultPlcUnsubscriptionRequest) unsubscriptionRequest);
+        });
+    }
+
+    @Override
+    public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer, Collection<PlcSubscriptionHandle> handles) {
+        return device.register(consumer, handles);
+    }
+
+    @Override
+    public void unregister(PlcConsumerRegistration registration) {
+        device.unregister(registration);
+    }
+
+    @Override
+    public PlcWriteRequest.Builder writeRequestBuilder() {
+        return new DefaultPlcWriteRequest.Builder(this, new MockFieldHandler());
+    }
+
+    @Override
+    public PlcSubscriptionRequest.Builder subscriptionRequestBuilder() {
+        return new DefaultPlcSubscriptionRequest.Builder(this, new MockFieldHandler());
+    }
+
+    @Override
+    public PlcUnsubscriptionRequest.Builder unsubscriptionRequestBuilder() {
+        return new DefaultPlcUnsubscriptionRequest.Builder(this);
+    }
+
+    public PlcAuthentication getAuthentication() {
+        return authentication;
+    }
+}
diff --git a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/PlcMockDriver.java b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/PlcMockDriver.java
index 34767943175..c9043e14708 100644
--- a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/PlcMockDriver.java
+++ b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/PlcMockDriver.java
@@ -1,62 +1,62 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.mock;
-
-import org.apache.plc4x.java.spi.PlcDriver;
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * Mocking Driver that keeps a Map of references to Connections so that you can fetch a reference to a connection
- * which will be acquired by someone else (via the connection string).
- * This allows for efficient Mocking.
- */
-public class PlcMockDriver implements PlcDriver {
-
-    private Map<String, PlcConnection> connectionMap = new ConcurrentHashMap<>();
-
-    @Override
-    public String getProtocolCode() {
-        return "mock";
-    }
-
-    @Override
-    public String getProtocolName() {
-        return "Mock Protocol Implementation";
-    }
-
-    @Override
-    public PlcConnection connect(String url) throws PlcConnectionException {
-        return connect(url, null);
-    }
-
-    @Override
-    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
-        String deviceName = url.substring(5);
-        if (deviceName.isEmpty()) {
-            throw new PlcConnectionException("Invalid URL: no device name given.");
-        }
-        return connectionMap.computeIfAbsent(deviceName, name -> new PlcMockConnection(authentication));
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.mock;
+
+import org.apache.plc4x.java.spi.PlcDriver;
+import org.apache.plc4x.java.api.authentication.PlcAuthentication;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Mocking Driver that keeps a Map of references to Connections so that you can fetch a reference to a connection
+ * which will be acquired by someone else (via the connection string).
+ * This allows for efficient Mocking.
+ */
+public class PlcMockDriver implements PlcDriver {
+
+    private Map<String, PlcConnection> connectionMap = new ConcurrentHashMap<>();
+
+    @Override
+    public String getProtocolCode() {
+        return "mock";
+    }
+
+    @Override
+    public String getProtocolName() {
+        return "Mock Protocol Implementation";
+    }
+
+    @Override
+    public PlcConnection connect(String url) throws PlcConnectionException {
+        return connect(url, null);
+    }
+
+    @Override
+    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
+        String deviceName = url.substring(5);
+        if (deviceName.isEmpty()) {
+            throw new PlcConnectionException("Invalid URL: no device name given.");
+        }
+        return connectionMap.computeIfAbsent(deviceName, name -> new PlcMockConnection(authentication));
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/connection/MockConnection.java b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/connection/MockConnection.java
index 8cf2005d904..a62acda44ca 100644
--- a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/connection/MockConnection.java
+++ b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/connection/MockConnection.java
@@ -1,41 +1,41 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.mock.connection;
-
-import io.netty.channel.ChannelHandler;
-import org.apache.plc4x.java.base.connection.NettyPlcConnection;
-
-import java.util.concurrent.CompletableFuture;
-
-public class MockConnection extends NettyPlcConnection {
-
-    public MockConnection() {
-        super(new TestChannelFactory());
-    }
-
-    public MockConnection(boolean awaitSessionSetupComplete) {
-        super(new TestChannelFactory(), awaitSessionSetupComplete);
-    }
-
-    @Override
-    protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
-        return null;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.mock.connection;
+
+import io.netty.channel.ChannelHandler;
+import org.apache.plc4x.java.base.connection.NettyPlcConnection;
+
+import java.util.concurrent.CompletableFuture;
+
+public class MockConnection extends NettyPlcConnection {
+
+    public MockConnection() {
+        super(new TestChannelFactory());
+    }
+
+    public MockConnection(boolean awaitSessionSetupComplete) {
+        super(new TestChannelFactory(), awaitSessionSetupComplete);
+    }
+
+    @Override
+    protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
+        return null;
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/connection/TestChannelFactory.java b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/connection/TestChannelFactory.java
index 0a9403d3dc0..02c487f7248 100644
--- a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/connection/TestChannelFactory.java
+++ b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/connection/TestChannelFactory.java
@@ -1,45 +1,45 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.mock.connection;
-
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.embedded.EmbeddedChannel;
-import org.apache.plc4x.java.base.connection.ChannelFactory;
-
-public class TestChannelFactory implements ChannelFactory {
-
-    private EmbeddedChannel channel;
-
-    @Override
-    public Channel createChannel(ChannelHandler channelHandler) {
-        channel = new EmbeddedChannel(channelHandler);
-        return channel;
-    }
-
-    @Override
-    public void ping() {
-        // Ignore ...
-    }
-
-    public EmbeddedChannel getChannel() {
-        return channel;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.mock.connection;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.embedded.EmbeddedChannel;
+import org.apache.plc4x.java.base.connection.ChannelFactory;
+
+public class TestChannelFactory implements ChannelFactory {
+
+    private EmbeddedChannel channel;
+
+    @Override
+    public Channel createChannel(ChannelHandler channelHandler) {
+        channel = new EmbeddedChannel(channelHandler);
+        return channel;
+    }
+
+    @Override
+    public void ping() {
+        // Ignore ...
+    }
+
+    public EmbeddedChannel getChannel() {
+        return channel;
+    }
+
+}
diff --git a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/connection/tcp/TcpHexDumper.java b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/connection/tcp/TcpHexDumper.java
index 0be77df9ca4..3338732d0e4 100644
--- a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/connection/tcp/TcpHexDumper.java
+++ b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/connection/tcp/TcpHexDumper.java
@@ -1,148 +1,148 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.mock.connection.tcp;
-
-import org.apache.commons.io.HexDump;
-import org.apache.commons.io.IOUtils;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.junit.rules.ExternalResource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-
-public class TcpHexDumper extends ExternalResource implements Closeable {
-
-    private static final Logger logger = LoggerFactory.getLogger(TcpHexDumper.class);
-
-    private final ExecutorService pool;
-
-    private final Integer portToUse;
-
-    private final Integer shutdownTimeout;
-
-    private ServerSocket serverSocket;
-
-    private TcpHexDumper(Integer portToUse) {
-        this(portToUse, 10);
-    }
-
-    public TcpHexDumper(Integer portToUse, Integer shutdownTimeout) {
-        pool = Executors.newCachedThreadPool();
-        this.portToUse = portToUse;
-        this.shutdownTimeout = shutdownTimeout;
-    }
-
-    private void init(int port) throws IOException, InterruptedException {
-        if (serverSocket != null) {
-            stop(true);
-        }
-        serverSocket = new ServerSocket(port);
-        logger.info("Starting pool");
-        pool.submit(() -> {
-            Socket accept;
-            try {
-                logger.info("Waiting for an incoming connection");
-                accept = serverSocket.accept();
-                logger.info("Accepted {} and starting listener", accept);
-            } catch (IOException e) {
-                throw new PlcRuntimeException(e);
-            }
-            pool.submit(() -> {
-                InputStream inputStream;
-                try {
-                    inputStream = accept.getInputStream();
-                    logger.info("Starting to read now");
-                } catch (IOException e) {
-                    throw new PlcRuntimeException(e);
-                }
-                byte[] buffer = new byte[4096];
-                try {
-                    while (IOUtils.read(inputStream, buffer) > 0) {
-                        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-                        HexDump.dump(buffer, 0, byteArrayOutputStream, 0);
-                        logger.info("Dump:\n{}", byteArrayOutputStream);
-                    }
-                } catch (IOException e) {
-                    throw new PlcRuntimeException(e);
-                }
-            });
-        });
-        logger.info("Started pool");
-    }
-
-    private void stop() throws IOException, InterruptedException {
-        stop(false);
-    }
-
-    private void stop(boolean await) throws IOException, InterruptedException {
-        serverSocket.close();
-        if (await) {
-            pool.awaitTermination(shutdownTimeout, TimeUnit.SECONDS);
-        } else {
-            pool.shutdownNow();
-        }
-        logger.info("Stopped");
-    }
-
-    @Override
-    public void after() {
-        try {
-            stop(true);
-        } catch (InterruptedException e) {
-            logger.info("Shutdown error", e);
-            Thread.currentThread().interrupt();
-        } catch (IOException e) {
-            logger.info("Shutdown error", e);
-        }
-    }
-
-    @Override
-    public void before() throws Throwable {
-        init(portToUse);
-    }
-
-    public static TcpHexDumper runOn(int port) throws IOException, InterruptedException {
-        TcpHexDumper tcpHexDumper = new TcpHexDumper(port);
-        tcpHexDumper.init(port);
-        return tcpHexDumper;
-    }
-
-    public Integer getPort() {
-        return serverSocket.getLocalPort();
-    }
-
-    @Override
-    public void close() throws IOException {
-        try {
-            stop();
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new IOException(e);
-        }
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.mock.connection.tcp;
+
+import org.apache.commons.io.HexDump;
+import org.apache.commons.io.IOUtils;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.junit.rules.ExternalResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+public class TcpHexDumper extends ExternalResource implements Closeable {
+
+    private static final Logger logger = LoggerFactory.getLogger(TcpHexDumper.class);
+
+    private final ExecutorService pool;
+
+    private final Integer portToUse;
+
+    private final Integer shutdownTimeout;
+
+    private ServerSocket serverSocket;
+
+    private TcpHexDumper(Integer portToUse) {
+        this(portToUse, 10);
+    }
+
+    public TcpHexDumper(Integer portToUse, Integer shutdownTimeout) {
+        pool = Executors.newCachedThreadPool();
+        this.portToUse = portToUse;
+        this.shutdownTimeout = shutdownTimeout;
+    }
+
+    private void init(int port) throws IOException, InterruptedException {
+        if (serverSocket != null) {
+            stop(true);
+        }
+        serverSocket = new ServerSocket(port);
+        logger.info("Starting pool");
+        pool.submit(() -> {
+            Socket accept;
+            try {
+                logger.info("Waiting for an incoming connection");
+                accept = serverSocket.accept();
+                logger.info("Accepted {} and starting listener", accept);
+            } catch (IOException e) {
+                throw new PlcRuntimeException(e);
+            }
+            pool.submit(() -> {
+                InputStream inputStream;
+                try {
+                    inputStream = accept.getInputStream();
+                    logger.info("Starting to read now");
+                } catch (IOException e) {
+                    throw new PlcRuntimeException(e);
+                }
+                byte[] buffer = new byte[4096];
+                try {
+                    while (IOUtils.read(inputStream, buffer) > 0) {
+                        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+                        HexDump.dump(buffer, 0, byteArrayOutputStream, 0);
+                        logger.info("Dump:\n{}", byteArrayOutputStream);
+                    }
+                } catch (IOException e) {
+                    throw new PlcRuntimeException(e);
+                }
+            });
+        });
+        logger.info("Started pool");
+    }
+
+    private void stop() throws IOException, InterruptedException {
+        stop(false);
+    }
+
+    private void stop(boolean await) throws IOException, InterruptedException {
+        serverSocket.close();
+        if (await) {
+            pool.awaitTermination(shutdownTimeout, TimeUnit.SECONDS);
+        } else {
+            pool.shutdownNow();
+        }
+        logger.info("Stopped");
+    }
+
+    @Override
+    public void after() {
+        try {
+            stop(true);
+        } catch (InterruptedException e) {
+            logger.info("Shutdown error", e);
+            Thread.currentThread().interrupt();
+        } catch (IOException e) {
+            logger.info("Shutdown error", e);
+        }
+    }
+
+    @Override
+    public void before() throws Throwable {
+        init(portToUse);
+    }
+
+    public static TcpHexDumper runOn(int port) throws IOException, InterruptedException {
+        TcpHexDumper tcpHexDumper = new TcpHexDumper(port);
+        tcpHexDumper.init(port);
+        return tcpHexDumper;
+    }
+
+    public Integer getPort() {
+        return serverSocket.getLocalPort();
+    }
+
+    @Override
+    public void close() throws IOException {
+        try {
+            stop();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new IOException(e);
+        }
+    }
+}
diff --git a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/protocol/Plc4XSupportedDataTypes.java b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/protocol/Plc4XSupportedDataTypes.java
index c7ed1534609..ddfb77ca6f4 100644
--- a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/protocol/Plc4XSupportedDataTypes.java
+++ b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/protocol/Plc4XSupportedDataTypes.java
@@ -1,257 +1,257 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.mock.protocol;
-
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.SerializationUtils;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.Function;
-import java.util.stream.Stream;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
-
-public class Plc4XSupportedDataTypes {
-
-    private static final Map<Class, DataTypePair<?>> littleEndianMap;
-    private static final Map<Class, DataTypePair<?>> bigEndianMap;
-
-    static {
-        littleEndianMap = new HashMap<>();
-        littleEndianMap.put(Boolean.class, DataTypePair.of(Boolean.TRUE, new byte[]{0x01}));
-        littleEndianMap.put(Byte.class, DataTypePair.of(Byte.valueOf("1"), new byte[]{0x1}));
-        littleEndianMap.put(Short.class, DataTypePair.of(Short.valueOf("1"), new byte[]{0x1, 0x0}));
-        littleEndianMap.put(Integer.class, DataTypePair.of(Integer.valueOf("1"), new byte[]{0x1, 0x0, 0x0, 0x0}));
-        littleEndianMap.put(Long.class, DataTypePair.of(BigInteger.valueOf(1), new byte[]{0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}));
-        littleEndianMap.put(BigInteger.class, DataTypePair.of(BigInteger.valueOf(1), new byte[]{0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}));
-        littleEndianMap.put(Float.class, DataTypePair.of(Float.valueOf("1"), new byte[]{0x0, 0x0, (byte) 0x80, 0x3F}));
-        littleEndianMap.put(Double.class, DataTypePair.of(Double.valueOf("1"), new byte[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, (byte) 0xF0, 0x3F}));
-        littleEndianMap.put(BigDecimal.class, DataTypePair.of(Double.valueOf("1"), new byte[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, (byte) 0xF0, 0x3F}));
-        littleEndianMap.put(String.class, DataTypePair.of(String.valueOf("Hello World!"), new byte[]{0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x21, 0x00}));
-        littleEndianMap.put(LocalTime.class, DataTypePair.of(LocalTime.ofSecondOfDay(1), new byte[]{0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}));
-        littleEndianMap.put(LocalDate.class, DataTypePair.of(LocalDate.of(1970, 1, 1), new byte[]{0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}));
-        littleEndianMap.put(LocalDateTime.class, DataTypePair.of(LocalDateTime.of(LocalDate.of(1970, 1, 1), LocalTime.ofSecondOfDay(1)), new byte[]{0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}));
-        littleEndianMap.put(byte[].class, DataTypePair.of(new byte[]{0x1, 0x2, 0x3, 0x4}, new byte[]{0x1, 0x2, 0x3, 0x4}));
-        littleEndianMap.put(Byte[].class, DataTypePair.of(new Byte[]{0x1, 0x2, 0x3, 0x4}, new byte[]{0x1, 0x2, 0x3, 0x4}));
-        bigEndianMap = new HashMap<>();
-        littleEndianMap.forEach((clazz, pair) -> {
-            Serializable serializable = pair.getValue();
-            byte[] littleEndianBytes = pair.getByteRepresentation();
-            byte[] bigEndianBytes = ArrayUtils.clone(littleEndianBytes);
-            ArrayUtils.reverse(bigEndianBytes);
-            if (clazz == byte[].class || clazz == Byte[].class) {
-                // For Byte[] or byte[] values put in should be exactly how supplied.
-                ArrayUtils.reverse(bigEndianBytes);
-            }
-            bigEndianMap.put(clazz, DataTypePair.of(serializable, bigEndianBytes));
-        });
-    }
-
-    /**
-     * A {@link Stream} of {@link Class}es plc4x can currently support.
-     *
-     * @return a stream of supported data types.
-     */
-    public static Stream<Class<? extends Serializable>> streamOfPlc4XSupportedDataTypes() {
-        return Stream.of(
-            Boolean.class,
-            Byte.class,
-            Short.class,
-            Integer.class,
-            Long.class,
-            BigInteger.class,
-            Float.class,
-            Double.class,
-            BigDecimal.class,
-            String.class,
-            LocalTime.class,
-            LocalDate.class,
-            LocalDateTime.class,
-            byte[].class,
-            Byte[].class
-        );
-    }
-
-    /**
-     * A {@link Stream} of instances of {@link Class}es plc4x can currently support with their according little endian byte representation.
-     *
-     * @return a stream of {@link DataTypePair}s of instances and their byte values.
-     * @see #streamOfPlc4XSupportedDataTypes
-     */
-    public static Stream<? extends DataTypePair<?>> streamOfLittleEndianDataTypePairs() {
-        return streamOfLittleEndianDataTypePairs(streamOfPlc4XSupportedDataTypes());
-    }
-
-    /**
-     * A {@link Stream} of instances of {@link Class}es which are defined by {@code inputStream} can currently support with their according little endian byte representation.
-     *
-     * @param inputStream a stream of {@link DataTypePair}s of instances and their byte values.
-     * @see #streamOfPlc4XSupportedDataTypes
-     */
-    public static Stream<? extends DataTypePair<?>> streamOfLittleEndianDataTypePairs(Stream<Class<? extends Serializable>> inputStream) {
-        return inputStream
-            .map(littleEndianMap::get)
-            .peek(Objects::requireNonNull);
-    }
-
-    /**
-     * A {@link Stream} of instances of {@link Class}es plc4x can currently support with their according big endian byte representation.
-     *
-     * @return a stream of {@link DataTypePair}s of instances and their byte values.
-     * @see #streamOfPlc4XSupportedDataTypes
-     */
-    public static Stream<? extends DataTypePair<?>> streamOfBigEndianDataTypePairs() {
-        return streamOfBigEndianDataTypePairs(streamOfPlc4XSupportedDataTypes());
-    }
-
-    /**
-     * A {@link Stream} of instances of {@link Class}es which are defined by {@code inputStream} can currently support with their according big endian byte representation.
-     *
-     * @param inputStream a stream of {@link DataTypePair}s of instances and their byte values.
-     * @see #streamOfPlc4XSupportedDataTypes
-     */
-    public static Stream<? extends DataTypePair<?>> streamOfBigEndianDataTypePairs(Stream<Class<? extends Serializable>> inputStream) {
-        return inputStream
-            .map(bigEndianMap::get)
-            .peek(Objects::requireNonNull);
-    }
-
-    /**
-     * Returns default value for supplied {@code clazz}.
-     *
-     * @param clazz the default value to get.
-     * @param <T>   the type of {@link Class}
-     * @return the found default.
-     */
-    @SuppressWarnings("unchecked")
-    public static <T> Optional<T> getDefaultForClass(Class<T> clazz) {
-        DataTypePair<?> pair = littleEndianMap.get(clazz);
-        if (pair == null) {
-            return Optional.empty();
-        }
-        return Optional.of((T) pair.getValue());
-    }
-
-    /**
-     * A method which compares a value against a well known default.
-     *
-     * @param actualValue the value to check.
-     */
-    public static void defaultAssert(Object actualValue) {
-        defaultAssert(actualValue, dataTypePair -> dataTypePair);
-    }
-
-    /**
-     * A method which compares a value against a well known default.
-     *
-     * @param actualValue  the value to check.
-     * @param customMapper a mapper which manipulates values before they get checked.
-     */
-    public static void defaultAssert(Object actualValue, Function<? super DataTypePair<?>, ? extends DataTypePair<?>> customMapper) {
-        littleEndianMap.values().stream().map(customMapper).forEach(pair -> assertPayloadDependentEquals(actualValue, pair.getValue()));
-    }
-
-    private static void assertPayloadDependentEquals(Object actual, Object expected) {
-        if (actual.getClass() != expected.getClass()) {
-            return;
-        }
-        assertThat(actual, equalTo(expected));
-    }
-
-    /**
-     * An wrapper for {@link Pair} that make the usage a bit more readable downstream.
-     *
-     * @param <T> the type of the contained data type.
-     */
-    public static class DataTypePair<T extends Serializable> {
-        private final Pair<T, byte[]> dataTypePair;
-
-        public DataTypePair(Pair<T, byte[]> dataTypePair) {
-            this.dataTypePair = dataTypePair;
-        }
-
-        public static <T extends Serializable> DataTypePair<T> of(T value, byte[] bytes) {
-            return new DataTypePair<>(ImmutablePair.of(value, bytes));
-        }
-
-        /**
-         * @return the value of the data type.
-         */
-        public T getValue() {
-            return SerializationUtils.clone(dataTypePair.getLeft());
-        }
-
-        /**
-         * @return the {@link Class} of the data type.
-         */
-        public Class<?> getDataTypeClass() {
-            return dataTypePair.getLeft().getClass();
-        }
-
-        /**
-         * @return The byte representation of the data type according to the endianness.
-         */
-        public byte[] getByteRepresentation() {
-            return ArrayUtils.clone(dataTypePair.getRight());
-        }
-
-        /**
-         * @return the internal pair.
-         */
-        public Pair<T, byte[]> getDataTypePair() {
-            return dataTypePair;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (!(o instanceof DataTypePair)) {
-                return false;
-            }
-            DataTypePair<?> that = (DataTypePair<?>) o;
-            return Objects.equals(dataTypePair, that.dataTypePair);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(dataTypePair);
-        }
-
-        @Override
-        public String toString() {
-            return "DataTypePair{" +
-                "dataTypePair=" + dataTypePair +
-                '}';
-        }
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.mock.protocol;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.SerializationUtils;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertThat;
+
+public class Plc4XSupportedDataTypes {
+
+    private static final Map<Class, DataTypePair<?>> littleEndianMap;
+    private static final Map<Class, DataTypePair<?>> bigEndianMap;
+
+    static {
+        littleEndianMap = new HashMap<>();
+        littleEndianMap.put(Boolean.class, DataTypePair.of(Boolean.TRUE, new byte[]{0x01}));
+        littleEndianMap.put(Byte.class, DataTypePair.of(Byte.valueOf("1"), new byte[]{0x1}));
+        littleEndianMap.put(Short.class, DataTypePair.of(Short.valueOf("1"), new byte[]{0x1, 0x0}));
+        littleEndianMap.put(Integer.class, DataTypePair.of(Integer.valueOf("1"), new byte[]{0x1, 0x0, 0x0, 0x0}));
+        littleEndianMap.put(Long.class, DataTypePair.of(BigInteger.valueOf(1), new byte[]{0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}));
+        littleEndianMap.put(BigInteger.class, DataTypePair.of(BigInteger.valueOf(1), new byte[]{0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}));
+        littleEndianMap.put(Float.class, DataTypePair.of(Float.valueOf("1"), new byte[]{0x0, 0x0, (byte) 0x80, 0x3F}));
+        littleEndianMap.put(Double.class, DataTypePair.of(Double.valueOf("1"), new byte[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, (byte) 0xF0, 0x3F}));
+        littleEndianMap.put(BigDecimal.class, DataTypePair.of(Double.valueOf("1"), new byte[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, (byte) 0xF0, 0x3F}));
+        littleEndianMap.put(String.class, DataTypePair.of(String.valueOf("Hello World!"), new byte[]{0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x21, 0x00}));
+        littleEndianMap.put(LocalTime.class, DataTypePair.of(LocalTime.ofSecondOfDay(1), new byte[]{0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}));
+        littleEndianMap.put(LocalDate.class, DataTypePair.of(LocalDate.of(1970, 1, 1), new byte[]{0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}));
+        littleEndianMap.put(LocalDateTime.class, DataTypePair.of(LocalDateTime.of(LocalDate.of(1970, 1, 1), LocalTime.ofSecondOfDay(1)), new byte[]{0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}));
+        littleEndianMap.put(byte[].class, DataTypePair.of(new byte[]{0x1, 0x2, 0x3, 0x4}, new byte[]{0x1, 0x2, 0x3, 0x4}));
+        littleEndianMap.put(Byte[].class, DataTypePair.of(new Byte[]{0x1, 0x2, 0x3, 0x4}, new byte[]{0x1, 0x2, 0x3, 0x4}));
+        bigEndianMap = new HashMap<>();
+        littleEndianMap.forEach((clazz, pair) -> {
+            Serializable serializable = pair.getValue();
+            byte[] littleEndianBytes = pair.getByteRepresentation();
+            byte[] bigEndianBytes = ArrayUtils.clone(littleEndianBytes);
+            ArrayUtils.reverse(bigEndianBytes);
+            if (clazz == byte[].class || clazz == Byte[].class) {
+                // For Byte[] or byte[] values put in should be exactly how supplied.
+                ArrayUtils.reverse(bigEndianBytes);
+            }
+            bigEndianMap.put(clazz, DataTypePair.of(serializable, bigEndianBytes));
+        });
+    }
+
+    /**
+     * A {@link Stream} of {@link Class}es plc4x can currently support.
+     *
+     * @return a stream of supported data types.
+     */
+    public static Stream<Class<? extends Serializable>> streamOfPlc4XSupportedDataTypes() {
+        return Stream.of(
+            Boolean.class,
+            Byte.class,
+            Short.class,
+            Integer.class,
+            Long.class,
+            BigInteger.class,
+            Float.class,
+            Double.class,
+            BigDecimal.class,
+            String.class,
+            LocalTime.class,
+            LocalDate.class,
+            LocalDateTime.class,
+            byte[].class,
+            Byte[].class
+        );
+    }
+
+    /**
+     * A {@link Stream} of instances of {@link Class}es plc4x can currently support with their according little endian byte representation.
+     *
+     * @return a stream of {@link DataTypePair}s of instances and their byte values.
+     * @see #streamOfPlc4XSupportedDataTypes
+     */
+    public static Stream<? extends DataTypePair<?>> streamOfLittleEndianDataTypePairs() {
+        return streamOfLittleEndianDataTypePairs(streamOfPlc4XSupportedDataTypes());
+    }
+
+    /**
+     * A {@link Stream} of instances of {@link Class}es which are defined by {@code inputStream} can currently support with their according little endian byte representation.
+     *
+     * @param inputStream a stream of {@link DataTypePair}s of instances and their byte values.
+     * @see #streamOfPlc4XSupportedDataTypes
+     */
+    public static Stream<? extends DataTypePair<?>> streamOfLittleEndianDataTypePairs(Stream<Class<? extends Serializable>> inputStream) {
+        return inputStream
+            .map(littleEndianMap::get)
+            .peek(Objects::requireNonNull);
+    }
+
+    /**
+     * A {@link Stream} of instances of {@link Class}es plc4x can currently support with their according big endian byte representation.
+     *
+     * @return a stream of {@link DataTypePair}s of instances and their byte values.
+     * @see #streamOfPlc4XSupportedDataTypes
+     */
+    public static Stream<? extends DataTypePair<?>> streamOfBigEndianDataTypePairs() {
+        return streamOfBigEndianDataTypePairs(streamOfPlc4XSupportedDataTypes());
+    }
+
+    /**
+     * A {@link Stream} of instances of {@link Class}es which are defined by {@code inputStream} can currently support with their according big endian byte representation.
+     *
+     * @param inputStream a stream of {@link DataTypePair}s of instances and their byte values.
+     * @see #streamOfPlc4XSupportedDataTypes
+     */
+    public static Stream<? extends DataTypePair<?>> streamOfBigEndianDataTypePairs(Stream<Class<? extends Serializable>> inputStream) {
+        return inputStream
+            .map(bigEndianMap::get)
+            .peek(Objects::requireNonNull);
+    }
+
+    /**
+     * Returns default value for supplied {@code clazz}.
+     *
+     * @param clazz the default value to get.
+     * @param <T>   the type of {@link Class}
+     * @return the found default.
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> Optional<T> getDefaultForClass(Class<T> clazz) {
+        DataTypePair<?> pair = littleEndianMap.get(clazz);
+        if (pair == null) {
+            return Optional.empty();
+        }
+        return Optional.of((T) pair.getValue());
+    }
+
+    /**
+     * A method which compares a value against a well known default.
+     *
+     * @param actualValue the value to check.
+     */
+    public static void defaultAssert(Object actualValue) {
+        defaultAssert(actualValue, dataTypePair -> dataTypePair);
+    }
+
+    /**
+     * A method which compares a value against a well known default.
+     *
+     * @param actualValue  the value to check.
+     * @param customMapper a mapper which manipulates values before they get checked.
+     */
+    public static void defaultAssert(Object actualValue, Function<? super DataTypePair<?>, ? extends DataTypePair<?>> customMapper) {
+        littleEndianMap.values().stream().map(customMapper).forEach(pair -> assertPayloadDependentEquals(actualValue, pair.getValue()));
+    }
+
+    private static void assertPayloadDependentEquals(Object actual, Object expected) {
+        if (actual.getClass() != expected.getClass()) {
+            return;
+        }
+        assertThat(actual, equalTo(expected));
+    }
+
+    /**
+     * An wrapper for {@link Pair} that make the usage a bit more readable downstream.
+     *
+     * @param <T> the type of the contained data type.
+     */
+    public static class DataTypePair<T extends Serializable> {
+        private final Pair<T, byte[]> dataTypePair;
+
+        public DataTypePair(Pair<T, byte[]> dataTypePair) {
+            this.dataTypePair = dataTypePair;
+        }
+
+        public static <T extends Serializable> DataTypePair<T> of(T value, byte[] bytes) {
+            return new DataTypePair<>(ImmutablePair.of(value, bytes));
+        }
+
+        /**
+         * @return the value of the data type.
+         */
+        public T getValue() {
+            return SerializationUtils.clone(dataTypePair.getLeft());
+        }
+
+        /**
+         * @return the {@link Class} of the data type.
+         */
+        public Class<?> getDataTypeClass() {
+            return dataTypePair.getLeft().getClass();
+        }
+
+        /**
+         * @return The byte representation of the data type according to the endianness.
+         */
+        public byte[] getByteRepresentation() {
+            return ArrayUtils.clone(dataTypePair.getRight());
+        }
+
+        /**
+         * @return the internal pair.
+         */
+        public Pair<T, byte[]> getDataTypePair() {
+            return dataTypePair;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (!(o instanceof DataTypePair)) {
+                return false;
+            }
+            DataTypePair<?> that = (DataTypePair<?>) o;
+            return Objects.equals(dataTypePair, that.dataTypePair);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(dataTypePair);
+        }
+
+        @Override
+        public String toString() {
+            return "DataTypePair{" +
+                "dataTypePair=" + dataTypePair +
+                '}';
+        }
+    }
+}
diff --git a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/util/Assert.java b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/util/Assert.java
index de32c1dcf90..512be413972 100644
--- a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/util/Assert.java
+++ b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/util/Assert.java
@@ -1,86 +1,86 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.mock.util;
-
-import org.apache.commons.io.HexDump;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.hamcrest.core.IsEqual;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import static java.lang.Integer.toHexString;
-import static org.apache.commons.lang3.StringUtils.leftPad;
-import static org.junit.Assert.assertEquals;
-
-public class Assert {
-
-    public static void assertByteEquals(byte expected, byte actual) {
-        String expectedHex = "0x" + leftPad(toHexString(expected), 2, '0');
-        String actualHex = "0x" + leftPad(toHexString(actual), 2, '0');
-        assertEquals(expectedHex, actualHex);
-    }
-
-    public static void assertByteEquals(byte[] expected, byte[] actual) throws IOException {
-        String expectedHex = cleanHexDump(dump(expected));
-        String actualHex = cleanHexDump(dump(actual));
-        assertEquals(expectedHex, actualHex);
-    }
-
-    public static Matcher<byte[]> byteArrayEqualsTo(byte[] expected) {
-        return new IsEqual<byte[]>(expected) {
-            @Override
-            public void describeTo(Description description) {
-                try {
-                    String dump = dump(expected);
-                    description.appendText("\n").appendText(cleanHexDump(dump));
-                } catch (IOException e) {
-                    throw new PlcRuntimeException(e);
-                }
-            }
-
-            @Override
-            public void describeMismatch(Object item, Description description) {
-                if (item == null || !(item instanceof byte[])) {
-                    super.describeMismatch(item, description);
-                    return;
-                }
-                try {
-                    String dump = dump((byte[]) item);
-                    description.appendText("was ").appendText("\n").appendText(cleanHexDump(dump));
-                } catch (IOException e) {
-                    throw new PlcRuntimeException(e);
-                }
-            }
-        };
-    }
-
-    private static String cleanHexDump(String in) {
-        return in.replaceAll("@.*\\{", "@XXXXXXXX{");
-    }
-
-    private static String dump(byte[] bytes) throws IOException {
-        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
-            HexDump.dump(bytes, 0, byteArrayOutputStream, 0);
-            return HexDump.EOL + byteArrayOutputStream.toString();
-        }
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.mock.util;
+
+import org.apache.commons.io.HexDump;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.core.IsEqual;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import static java.lang.Integer.toHexString;
+import static org.apache.commons.lang3.StringUtils.leftPad;
+import static org.junit.Assert.assertEquals;
+
+public class Assert {
+
+    public static void assertByteEquals(byte expected, byte actual) {
+        String expectedHex = "0x" + leftPad(toHexString(expected), 2, '0');
+        String actualHex = "0x" + leftPad(toHexString(actual), 2, '0');
+        assertEquals(expectedHex, actualHex);
+    }
+
+    public static void assertByteEquals(byte[] expected, byte[] actual) throws IOException {
+        String expectedHex = cleanHexDump(dump(expected));
+        String actualHex = cleanHexDump(dump(actual));
+        assertEquals(expectedHex, actualHex);
+    }
+
+    public static Matcher<byte[]> byteArrayEqualsTo(byte[] expected) {
+        return new IsEqual<byte[]>(expected) {
+            @Override
+            public void describeTo(Description description) {
+                try {
+                    String dump = dump(expected);
+                    description.appendText("\n").appendText(cleanHexDump(dump));
+                } catch (IOException e) {
+                    throw new PlcRuntimeException(e);
+                }
+            }
+
+            @Override
+            public void describeMismatch(Object item, Description description) {
+                if (item == null || !(item instanceof byte[])) {
+                    super.describeMismatch(item, description);
+                    return;
+                }
+                try {
+                    String dump = dump((byte[]) item);
+                    description.appendText("was ").appendText("\n").appendText(cleanHexDump(dump));
+                } catch (IOException e) {
+                    throw new PlcRuntimeException(e);
+                }
+            }
+        };
+    }
+
+    private static String cleanHexDump(String in) {
+        return in.replaceAll("@.*\\{", "@XXXXXXXX{");
+    }
+
+    private static String dump(byte[] bytes) throws IOException {
+        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
+            HexDump.dump(bytes, 0, byteArrayOutputStream, 0);
+            return HexDump.EOL + byteArrayOutputStream.toString();
+        }
+    }
+}
diff --git a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/util/HexUtil.java b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/util/HexUtil.java
index cf5bcc0c9b2..62eb11a8089 100644
--- a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/util/HexUtil.java
+++ b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/util/HexUtil.java
@@ -1,49 +1,49 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.mock.util;
-
-import org.apache.commons.io.HexDump;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-public class HexUtil {
-
-    /**
-     * Can be used to display a byte[] as hex string.
-     *
-     * @param bytes to be displayed.
-     * @return hexed string.
-     */
-    public static String toHex(Byte[] bytes) {
-        return toHex(ArrayUtils.toPrimitive(bytes));
-    }
-
-    public static String toHex(byte[] bytes) {
-        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
-            HexDump.dump(bytes, 0, byteArrayOutputStream, 0);
-            return byteArrayOutputStream.toString();
-        } catch (IOException e) {
-            throw new PlcRuntimeException(e);
-        }
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.mock.util;
+
+import org.apache.commons.io.HexDump;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+public class HexUtil {
+
+    /**
+     * Can be used to display a byte[] as hex string.
+     *
+     * @param bytes to be displayed.
+     * @return hexed string.
+     */
+    public static String toHex(Byte[] bytes) {
+        return toHex(ArrayUtils.toPrimitive(bytes));
+    }
+
+    public static String toHex(byte[] bytes) {
+        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
+            HexDump.dump(bytes, 0, byteArrayOutputStream, 0);
+            return byteArrayOutputStream.toString();
+        } catch (IOException e) {
+            throw new PlcRuntimeException(e);
+        }
+    }
+}
diff --git a/plc4j/protocols/driver-bases/test/src/main/resources/META-INF/services/com.athaydes.spockframework.report.IReportCreator.properties b/plc4j/protocols/driver-bases/test/src/main/resources/META-INF/services/com.athaydes.spockframework.report.IReportCreator.properties
index 0759363d08a..3eba24ca463 100644
--- a/plc4j/protocols/driver-bases/test/src/main/resources/META-INF/services/com.athaydes.spockframework.report.IReportCreator.properties
+++ b/plc4j/protocols/driver-bases/test/src/main/resources/META-INF/services/com.athaydes.spockframework.report.IReportCreator.properties
@@ -1,66 +1,66 @@
-#
-# 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
-#
-#     http://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.
-#
-
-# Name of the implementation class(es) of report creator(s) to enable (separate multiple entries with commas)
-# Currently supported classes are:
-#   1. com.athaydes.spockframework.report.internal.HtmlReportCreator
-#   2. com.athaydes.spockframework.report.template.TemplateReportCreator
-com.athaydes.spockframework.report.IReportCreator=com.athaydes.spockframework.report.internal.HtmlReportCreator
-
-# Set properties of the report creator
-# For the HtmlReportCreator, the only properties available are
-# (the location of the css files is relative to the classpath):
-com.athaydes.spockframework.report.internal.HtmlReportCreator.featureReportCss=spock-feature-report.css
-com.athaydes.spockframework.report.internal.HtmlReportCreator.summaryReportCss=spock-summary-report.css
-com.athaydes.spockframework.report.internal.HtmlReportCreator.printThrowableStackTrace=false
-com.athaydes.spockframework.report.internal.HtmlReportCreator.inlineCss=true
-com.athaydes.spockframework.report.internal.HtmlReportCreator.enabled=true
-# options are: "class_name_and_title", "class_name", "title"
-com.athaydes.spockframework.report.internal.HtmlReportCreator.specSummaryNameOption=class_name_and_title
-
-# exclude Specs Table of Contents
-com.athaydes.spockframework.report.internal.HtmlReportCreator.excludeToc=false
-
-# Output directory (where the spock reports will be created) - relative to working directory
-com.athaydes.spockframework.report.outputDir=target/spock-reports
-
-# Output directory where to store the aggregated JSON report (used to support parallel builds)
-com.athaydes.spockframework.report.aggregatedJsonReportDir=
-
-# If set to true, hides blocks which do not have any description
-com.athaydes.spockframework.report.hideEmptyBlocks=false
-
-# Set the name of the project under test so it can be displayed in the report
-com.athaydes.spockframework.report.projectName=
-
-# Set the version of the project under test so it can be displayed in the report
-com.athaydes.spockframework.report.projectVersion=Unknown
-
-# Show the source code for each block
-com.athaydes.spockframework.report.showCodeBlocks=false
-
-# Set the root location of the Spock test source code (only used if showCodeBlocks is 'true')
-com.athaydes.spockframework.report.testSourceRoots=src/test/groovy
-
-# Set properties specific to the TemplateReportCreator
-com.athaydes.spockframework.report.template.TemplateReportCreator.specTemplateFile=/templateReportCreator/spec-template.md
-com.athaydes.spockframework.report.template.TemplateReportCreator.reportFileExtension=md
-com.athaydes.spockframework.report.template.TemplateReportCreator.summaryTemplateFile=/templateReportCreator/summary-template.md
-com.athaydes.spockframework.report.template.TemplateReportCreator.summaryFileName=summary.md
+#
+# 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
+#
+#     http://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.
+#
+
+# Name of the implementation class(es) of report creator(s) to enable (separate multiple entries with commas)
+# Currently supported classes are:
+#   1. com.athaydes.spockframework.report.internal.HtmlReportCreator
+#   2. com.athaydes.spockframework.report.template.TemplateReportCreator
+com.athaydes.spockframework.report.IReportCreator=com.athaydes.spockframework.report.internal.HtmlReportCreator
+
+# Set properties of the report creator
+# For the HtmlReportCreator, the only properties available are
+# (the location of the css files is relative to the classpath):
+com.athaydes.spockframework.report.internal.HtmlReportCreator.featureReportCss=spock-feature-report.css
+com.athaydes.spockframework.report.internal.HtmlReportCreator.summaryReportCss=spock-summary-report.css
+com.athaydes.spockframework.report.internal.HtmlReportCreator.printThrowableStackTrace=false
+com.athaydes.spockframework.report.internal.HtmlReportCreator.inlineCss=true
+com.athaydes.spockframework.report.internal.HtmlReportCreator.enabled=true
+# options are: "class_name_and_title", "class_name", "title"
+com.athaydes.spockframework.report.internal.HtmlReportCreator.specSummaryNameOption=class_name_and_title
+
+# exclude Specs Table of Contents
+com.athaydes.spockframework.report.internal.HtmlReportCreator.excludeToc=false
+
+# Output directory (where the spock reports will be created) - relative to working directory
+com.athaydes.spockframework.report.outputDir=target/spock-reports
+
+# Output directory where to store the aggregated JSON report (used to support parallel builds)
+com.athaydes.spockframework.report.aggregatedJsonReportDir=
+
+# If set to true, hides blocks which do not have any description
+com.athaydes.spockframework.report.hideEmptyBlocks=false
+
+# Set the name of the project under test so it can be displayed in the report
+com.athaydes.spockframework.report.projectName=
+
+# Set the version of the project under test so it can be displayed in the report
+com.athaydes.spockframework.report.projectVersion=Unknown
+
+# Show the source code for each block
+com.athaydes.spockframework.report.showCodeBlocks=false
+
+# Set the root location of the Spock test source code (only used if showCodeBlocks is 'true')
+com.athaydes.spockframework.report.testSourceRoots=src/test/groovy
+
+# Set properties specific to the TemplateReportCreator
+com.athaydes.spockframework.report.template.TemplateReportCreator.specTemplateFile=/templateReportCreator/spec-template.md
+com.athaydes.spockframework.report.template.TemplateReportCreator.reportFileExtension=md
+com.athaydes.spockframework.report.template.TemplateReportCreator.summaryTemplateFile=/templateReportCreator/summary-template.md
+com.athaydes.spockframework.report.template.TemplateReportCreator.summaryFileName=summary.md
 com.athaydes.spockframework.report.template.TemplateReportCreator.enabled=true
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/test/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver b/plc4j/protocols/driver-bases/test/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
index ebff4aa1567..128676a4ec2 100644
--- a/plc4j/protocols/driver-bases/test/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
+++ b/plc4j/protocols/driver-bases/test/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
@@ -1,19 +1,19 @@
-#
-# 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
-#
-#   http://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.
-#
-org.apache.plc4x.java.mock.PlcMockDriver
+#
+# 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
+#
+#   http://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.
+#
+org.apache.plc4x.java.mock.PlcMockDriver
diff --git a/plc4j/protocols/driver-bases/test/src/test/java/org/apache/plc4x/java/mock/MockFieldHandlerTest.java b/plc4j/protocols/driver-bases/test/src/test/java/org/apache/plc4x/java/mock/MockFieldHandlerTest.java
index fb3d786ab8a..555887f9e26 100644
--- a/plc4j/protocols/driver-bases/test/src/test/java/org/apache/plc4x/java/mock/MockFieldHandlerTest.java
+++ b/plc4j/protocols/driver-bases/test/src/test/java/org/apache/plc4x/java/mock/MockFieldHandlerTest.java
@@ -1,111 +1,111 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.mock;
-
-import org.apache.plc4x.java.api.model.PlcField;
-import org.assertj.core.api.WithAssertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-@ExtendWith(MockitoExtension.class)
-class MockFieldHandlerTest implements WithAssertions {
-
-    MockFieldHandler SUT = new MockFieldHandler();
-
-    @Mock
-    PlcField plcField;
-
-    @Test
-    void createField() {
-        assertThat(SUT.createField("")).isNotNull();
-    }
-
-    @Test
-    void encodeBoolean() {
-        assertThat(SUT.encodeBoolean(plcField, new Object[0])).isNotNull();
-    }
-
-    @Test
-    void encodeByte() {
-        assertThat(SUT.encodeByte(plcField, new Object[0])).isNotNull();
-    }
-
-    @Test
-    void encodeShort() {
-        assertThat(SUT.encodeShort(plcField, new Object[0])).isNotNull();
-    }
-
-    @Test
-    void encodeInteger() {
-        assertThat(SUT.encodeInteger(plcField, new Object[0])).isNotNull();
-    }
-
-    @Test
-    void encodeBigInteger() {
-        assertThat(SUT.encodeBigInteger(plcField, new Object[0])).isNotNull();
-    }
-
-    @Test
-    void encodeLong() {
-        assertThat(SUT.encodeLong(plcField, new Object[0])).isNotNull();
-    }
-
-    @Test
-    void encodeFloat() {
-        assertThat(SUT.encodeFloat(plcField, new Object[0])).isNotNull();
-    }
-
-    @Test
-    void encodeBigDecimal() {
-        assertThat(SUT.encodeBigDecimal(plcField, new Object[0])).isNotNull();
-    }
-
-    @Test
-    void encodeDouble() {
-        assertThat(SUT.encodeDouble(plcField, new Object[0])).isNotNull();
-    }
-
-    @Test
-    void encodeString() {
-        assertThat(SUT.encodeString(plcField, new Object[0])).isNotNull();
-    }
-
-    @Test
-    void encodeTime() {
-        assertThat(SUT.encodeTime(plcField, new Object[0])).isNotNull();
-    }
-
-    @Test
-    void encodeDate() {
-        assertThat(SUT.encodeDate(plcField, new Object[0])).isNotNull();
-    }
-
-    @Test
-    void encodeDateTime() {
-        assertThat(SUT.encodeDateTime(plcField, new Object[0])).isNotNull();
-    }
-
-    @Test
-    void encodeByteArray() {
-        assertThat(SUT.encodeByteArray(plcField, new Object[0])).isNotNull();
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.mock;
+
+import org.apache.plc4x.java.api.model.PlcField;
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+class MockFieldHandlerTest implements WithAssertions {
+
+    MockFieldHandler SUT = new MockFieldHandler();
+
+    @Mock
+    PlcField plcField;
+
+    @Test
+    void createField() {
+        assertThat(SUT.createField("")).isNotNull();
+    }
+
+    @Test
+    void encodeBoolean() {
+        assertThat(SUT.encodeBoolean(plcField, new Object[0])).isNotNull();
+    }
+
+    @Test
+    void encodeByte() {
+        assertThat(SUT.encodeByte(plcField, new Object[0])).isNotNull();
+    }
+
+    @Test
+    void encodeShort() {
+        assertThat(SUT.encodeShort(plcField, new Object[0])).isNotNull();
+    }
+
+    @Test
+    void encodeInteger() {
+        assertThat(SUT.encodeInteger(plcField, new Object[0])).isNotNull();
+    }
+
+    @Test
+    void encodeBigInteger() {
+        assertThat(SUT.encodeBigInteger(plcField, new Object[0])).isNotNull();
+    }
+
+    @Test
+    void encodeLong() {
+        assertThat(SUT.encodeLong(plcField, new Object[0])).isNotNull();
+    }
+
+    @Test
+    void encodeFloat() {
+        assertThat(SUT.encodeFloat(plcField, new Object[0])).isNotNull();
+    }
+
+    @Test
+    void encodeBigDecimal() {
+        assertThat(SUT.encodeBigDecimal(plcField, new Object[0])).isNotNull();
+    }
+
+    @Test
+    void encodeDouble() {
+        assertThat(SUT.encodeDouble(plcField, new Object[0])).isNotNull();
+    }
+
+    @Test
+    void encodeString() {
+        assertThat(SUT.encodeString(plcField, new Object[0])).isNotNull();
+    }
+
+    @Test
+    void encodeTime() {
+        assertThat(SUT.encodeTime(plcField, new Object[0])).isNotNull();
+    }
+
+    @Test
+    void encodeDate() {
+        assertThat(SUT.encodeDate(plcField, new Object[0])).isNotNull();
+    }
+
+    @Test
+    void encodeDateTime() {
+        assertThat(SUT.encodeDateTime(plcField, new Object[0])).isNotNull();
+    }
+
+    @Test
+    void encodeByteArray() {
+        assertThat(SUT.encodeByteArray(plcField, new Object[0])).isNotNull();
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/test/src/test/java/org/apache/plc4x/java/mock/MockFieldItemTest.java b/plc4j/protocols/driver-bases/test/src/test/java/org/apache/plc4x/java/mock/MockFieldItemTest.java
index 066f87c51aa..f9e33d917d8 100644
--- a/plc4j/protocols/driver-bases/test/src/test/java/org/apache/plc4x/java/mock/MockFieldItemTest.java
+++ b/plc4j/protocols/driver-bases/test/src/test/java/org/apache/plc4x/java/mock/MockFieldItemTest.java
@@ -1,31 +1,31 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.mock;
-
-import org.assertj.core.api.WithAssertions;
-import org.junit.jupiter.api.Test;
-
-class MockFieldItemTest implements WithAssertions {
-
-    @Test
-    void getObject() {
-        assertThat(new MockFieldItem("").getObject(0)).isNotNull();
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.mock;
+
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.Test;
+
+class MockFieldItemTest implements WithAssertions {
+
+    @Test
+    void getObject() {
+        assertThat(new MockFieldItem("").getObject(0)).isNotNull();
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/test/src/test/java/org/apache/plc4x/java/mock/MockFieldTest.java b/plc4j/protocols/driver-bases/test/src/test/java/org/apache/plc4x/java/mock/MockFieldTest.java
index 5864e5977f0..8e31d0772b4 100644
--- a/plc4j/protocols/driver-bases/test/src/test/java/org/apache/plc4x/java/mock/MockFieldTest.java
+++ b/plc4j/protocols/driver-bases/test/src/test/java/org/apache/plc4x/java/mock/MockFieldTest.java
@@ -1,48 +1,48 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.mock;
-
-import org.assertj.core.api.WithAssertions;
-import org.junit.jupiter.api.Test;
-
-import java.util.Collections;
-
-class MockFieldTest implements WithAssertions {
-
-    @Test
-    void constructor1() {
-        assertThat(new MockField("")).isNotNull();
-    }
-
-    @Test
-    void constructor2() {
-        assertThat(new MockField("", Collections.emptyList())).isNotNull();
-    }
-
-    @Test
-    void getFieldQuery() {
-        new MockField("", Collections.emptyList()).getFieldQuery();
-    }
-
-    @Test
-    void getValues() {
-        new MockField("", Collections.emptyList()).getValues();
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.mock;
+
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.Collections;
+
+class MockFieldTest implements WithAssertions {
+
+    @Test
+    void constructor1() {
+        assertThat(new MockField("")).isNotNull();
+    }
+
+    @Test
+    void constructor2() {
+        assertThat(new MockField("", Collections.emptyList())).isNotNull();
+    }
+
+    @Test
+    void getFieldQuery() {
+        new MockField("", Collections.emptyList()).getFieldQuery();
+    }
+
+    @Test
+    void getValues() {
+        new MockField("", Collections.emptyList()).getValues();
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/test/src/test/java/org/apache/plc4x/java/mock/PlcMockConnectionTest.java b/plc4j/protocols/driver-bases/test/src/test/java/org/apache/plc4x/java/mock/PlcMockConnectionTest.java
index 4a1da85ace3..e61a6b4fb8f 100644
--- a/plc4j/protocols/driver-bases/test/src/test/java/org/apache/plc4x/java/mock/PlcMockConnectionTest.java
+++ b/plc4j/protocols/driver-bases/test/src/test/java/org/apache/plc4x/java/mock/PlcMockConnectionTest.java
@@ -1,164 +1,164 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.mock;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.messages.*;
-import org.apache.plc4x.java.api.metadata.PlcConnectionMetadata;
-import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.assertj.core.api.WithAssertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.util.Collections;
-import java.util.concurrent.CompletableFuture;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-@ExtendWith(MockitoExtension.class)
-class PlcMockConnectionTest implements WithAssertions {
-
-    PlcMockConnection SUT = new PlcMockConnection(null);
-
-    @Mock
-    MockDevice mockDevice;
-
-    @BeforeEach
-    void setUp() {
-        SUT.setDevice(mockDevice);
-    }
-
-    @Test
-    void getDevice() {
-        assertThat(SUT.getDevice()).isNotNull();
-    }
-
-    @Test
-    void setDevice() {
-        SUT.setDevice(null);
-    }
-
-    @Test
-    void connect() {
-        SUT.connect();
-    }
-
-    @Test
-    void isConnected() {
-        SUT.setDevice(mockDevice);
-        assertThat(SUT.isConnected()).isTrue();
-        SUT.setDevice(null);
-        assertThat(SUT.isConnected()).isFalse();
-    }
-
-    @Test
-    void close() {
-        SUT.close();
-    }
-
-    @Test
-    void getMetadata() {
-        PlcConnectionMetadata metadata = SUT.getMetadata();
-        assertThat(metadata).isNotNull();
-        assertThat(metadata.canRead()).isTrue();
-        assertThat(metadata.canWrite()).isTrue();
-        assertThat(metadata.canSubscribe()).isTrue();
-    }
-
-    @Test
-    void readRequestBuilder() {
-        assertThat(SUT.readRequestBuilder()).isNotNull();
-    }
-
-    @Test
-    void read() {
-        PlcReadRequest plcReadRequest = SUT.readRequestBuilder().build();
-        assertThat(SUT.read(plcReadRequest)).isNotNull();
-    }
-
-    @Test
-    void write() throws Exception {
-        when(mockDevice.write(any(), any())).thenReturn(PlcResponseCode.OK);
-
-        PlcWriteRequest plcWriteRequest = SUT.writeRequestBuilder()
-            .addItem("asd", "asd", "asd")
-            .build();
-        CompletableFuture<PlcWriteResponse> write = SUT.write(plcWriteRequest);
-        assertThat(write).isNotNull();
-        PlcWriteResponse plcWriteResponse = write.get();
-        assertThat(plcWriteResponse).isNotNull();
-    }
-
-    @Test
-    void subscribe() throws Exception {
-        when(mockDevice.subscribe(any())).thenReturn(Pair.of(PlcResponseCode.OK, mock(PlcSubscriptionHandle.class)));
-
-        PlcSubscriptionRequest plcSubscriptionRequest = SUT.subscriptionRequestBuilder()
-            .addChangeOfStateField("asd", "asd")
-            .build();
-        CompletableFuture<PlcSubscriptionResponse> subscribe = SUT.subscribe(plcSubscriptionRequest);
-        assertThat(subscribe).isNotNull();
-        PlcSubscriptionResponse plcSubscriptionResponse = subscribe.get();
-        assertThat(plcSubscriptionResponse).isNotNull();
-    }
-
-    @Test
-    void unsubscribe() {
-        PlcUnsubscriptionRequest unsubscriptionRequest = SUT.unsubscriptionRequestBuilder().build();
-        assertThat(SUT.unsubscribe(unsubscriptionRequest)).isNotNull();
-    }
-
-    @Test
-    void register() {
-        SUT.register(plcSubscriptionEvent -> {
-        }, Collections.emptyList());
-    }
-
-    @Test
-    void unregister() {
-        SUT.unregister(null);
-    }
-
-    @Test
-    void writeRequestBuilder() {
-        assertThat(SUT.writeRequestBuilder()).isNotNull();
-    }
-
-    @Test
-    void subscriptionRequestBuilder() {
-        assertThat(SUT.subscriptionRequestBuilder()).isNotNull();
-    }
-
-    @Test
-    void unsubscriptionRequestBuilder() {
-        assertThat(SUT.unsubscriptionRequestBuilder()).isNotNull();
-    }
-
-    @Test
-    void getAuthentication() {
-        assertThat(SUT.getAuthentication()).isNull();
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.mock;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.messages.*;
+import org.apache.plc4x.java.api.metadata.PlcConnectionMetadata;
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.Collections;
+import java.util.concurrent.CompletableFuture;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class PlcMockConnectionTest implements WithAssertions {
+
+    PlcMockConnection SUT = new PlcMockConnection(null);
+
+    @Mock
+    MockDevice mockDevice;
+
+    @BeforeEach
+    void setUp() {
+        SUT.setDevice(mockDevice);
+    }
+
+    @Test
+    void getDevice() {
+        assertThat(SUT.getDevice()).isNotNull();
+    }
+
+    @Test
+    void setDevice() {
+        SUT.setDevice(null);
+    }
+
+    @Test
+    void connect() {
+        SUT.connect();
+    }
+
+    @Test
+    void isConnected() {
+        SUT.setDevice(mockDevice);
+        assertThat(SUT.isConnected()).isTrue();
+        SUT.setDevice(null);
+        assertThat(SUT.isConnected()).isFalse();
+    }
+
+    @Test
+    void close() {
+        SUT.close();
+    }
+
+    @Test
+    void getMetadata() {
+        PlcConnectionMetadata metadata = SUT.getMetadata();
+        assertThat(metadata).isNotNull();
+        assertThat(metadata.canRead()).isTrue();
+        assertThat(metadata.canWrite()).isTrue();
+        assertThat(metadata.canSubscribe()).isTrue();
+    }
+
+    @Test
+    void readRequestBuilder() {
+        assertThat(SUT.readRequestBuilder()).isNotNull();
+    }
+
+    @Test
+    void read() {
+        PlcReadRequest plcReadRequest = SUT.readRequestBuilder().build();
+        assertThat(SUT.read(plcReadRequest)).isNotNull();
+    }
+
+    @Test
+    void write() throws Exception {
+        when(mockDevice.write(any(), any())).thenReturn(PlcResponseCode.OK);
+
+        PlcWriteRequest plcWriteRequest = SUT.writeRequestBuilder()
+            .addItem("asd", "asd", "asd")
+            .build();
+        CompletableFuture<PlcWriteResponse> write = SUT.write(plcWriteRequest);
+        assertThat(write).isNotNull();
+        PlcWriteResponse plcWriteResponse = write.get();
+        assertThat(plcWriteResponse).isNotNull();
+    }
+
+    @Test
+    void subscribe() throws Exception {
+        when(mockDevice.subscribe(any())).thenReturn(Pair.of(PlcResponseCode.OK, mock(PlcSubscriptionHandle.class)));
+
+        PlcSubscriptionRequest plcSubscriptionRequest = SUT.subscriptionRequestBuilder()
+            .addChangeOfStateField("asd", "asd")
+            .build();
+        CompletableFuture<PlcSubscriptionResponse> subscribe = SUT.subscribe(plcSubscriptionRequest);
+        assertThat(subscribe).isNotNull();
+        PlcSubscriptionResponse plcSubscriptionResponse = subscribe.get();
+        assertThat(plcSubscriptionResponse).isNotNull();
+    }
+
+    @Test
+    void unsubscribe() {
+        PlcUnsubscriptionRequest unsubscriptionRequest = SUT.unsubscriptionRequestBuilder().build();
+        assertThat(SUT.unsubscribe(unsubscriptionRequest)).isNotNull();
+    }
+
+    @Test
+    void register() {
+        SUT.register(plcSubscriptionEvent -> {
+        }, Collections.emptyList());
+    }
+
+    @Test
+    void unregister() {
+        SUT.unregister(null);
+    }
+
+    @Test
+    void writeRequestBuilder() {
+        assertThat(SUT.writeRequestBuilder()).isNotNull();
+    }
+
+    @Test
+    void subscriptionRequestBuilder() {
+        assertThat(SUT.subscriptionRequestBuilder()).isNotNull();
+    }
+
+    @Test
+    void unsubscriptionRequestBuilder() {
+        assertThat(SUT.unsubscriptionRequestBuilder()).isNotNull();
+    }
+
+    @Test
+    void getAuthentication() {
+        assertThat(SUT.getAuthentication()).isNull();
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/test/src/test/java/org/apache/plc4x/java/mock/PlcMockDriverTest.java b/plc4j/protocols/driver-bases/test/src/test/java/org/apache/plc4x/java/mock/PlcMockDriverTest.java
index b13ccbcafca..06517a383db 100644
--- a/plc4j/protocols/driver-bases/test/src/test/java/org/apache/plc4x/java/mock/PlcMockDriverTest.java
+++ b/plc4j/protocols/driver-bases/test/src/test/java/org/apache/plc4x/java/mock/PlcMockDriverTest.java
@@ -1,96 +1,96 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.mock;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.messages.items.DefaultIntegerFieldItem;
-import org.assertj.core.api.WithAssertions;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
-
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
-
-
-public class PlcMockDriverTest implements WithAssertions {
-
-    private final PlcMockDriver driver = new PlcMockDriver();
-
-    @Test
-    public void fetchTwoConnections_areEqual() throws PlcConnectionException {
-        PlcConnection conn1 = driver.connect("mock:123");
-        PlcConnection conn2 = driver.connect("mock:123");
-
-        assertEquals(conn1, conn2);
-    }
-
-    /**
-     * Example of Mock Usage.
-     * The idea is to fetch a mock connection with a specific name and prepare a {@link MockDevice} which is set there.
-     * <p>
-     * Some application code which uses the same Connection String will then automatically get the same connection
-     * and operate against the same {@link MockDevice} without the necessity to also mock field queries or other things.
-     * <p>
-     * In this example the {@link #someCodeWhichShouldDoPlcManipulation(String)} function represents the Business Logic
-     * which should be tested and where only the connection string is manipulated for the test.
-     */
-    @Test
-    public void testScenarioExample() throws PlcConnectionException, ExecutionException, InterruptedException {
-        PlcMockConnection preparingConnection = ((PlcMockConnection) driver.connect("test:123"));
-        MockDevice mock = Mockito.mock(MockDevice.class);
-        when(mock.read(any())).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultIntegerFieldItem(1)));
-        preparingConnection.setDevice(mock);
-
-        // Now we can simply inject this URL into our code and automatically have our mock
-        someCodeWhichShouldDoPlcManipulation("test:123");
-
-        // Verify that the code did indeed what we wanted it to do
-        verify(mock, times(1)).read("DB2.DBD17:INT");
-    }
-
-    @Test
-    public void wrongDevice() {
-        assertThatThrownBy(() -> driver.connect("mock:"))
-            .isInstanceOf(PlcConnectionException.class);
-    }
-
-    /**
-     * Example function that does some reading from a siemens plc using Siemens Syntax
-     *
-     * @param connection Connection String, e.g., from config
-     */
-    private void someCodeWhichShouldDoPlcManipulation(String connection) throws PlcConnectionException, ExecutionException, InterruptedException {
-        // Normally this would be from the driver manager
-        PlcConnection connect = driver.connect(connection);
-        PlcReadResponse response = connect.readRequestBuilder()
-            .addItem("value", "DB2.DBD17:INT")
-            .build()
-            .execute()
-            .get();
-        // Normally do something with the response
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.mock;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.messages.items.DefaultIntegerFieldItem;
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.util.concurrent.ExecutionException;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+
+public class PlcMockDriverTest implements WithAssertions {
+
+    private final PlcMockDriver driver = new PlcMockDriver();
+
+    @Test
+    public void fetchTwoConnections_areEqual() throws PlcConnectionException {
+        PlcConnection conn1 = driver.connect("mock:123");
+        PlcConnection conn2 = driver.connect("mock:123");
+
+        assertEquals(conn1, conn2);
+    }
+
+    /**
+     * Example of Mock Usage.
+     * The idea is to fetch a mock connection with a specific name and prepare a {@link MockDevice} which is set there.
+     * <p>
+     * Some application code which uses the same Connection String will then automatically get the same connection
+     * and operate against the same {@link MockDevice} without the necessity to also mock field queries or other things.
+     * <p>
+     * In this example the {@link #someCodeWhichShouldDoPlcManipulation(String)} function represents the Business Logic
+     * which should be tested and where only the connection string is manipulated for the test.
+     */
+    @Test
+    public void testScenarioExample() throws PlcConnectionException, ExecutionException, InterruptedException {
+        PlcMockConnection preparingConnection = ((PlcMockConnection) driver.connect("test:123"));
+        MockDevice mock = Mockito.mock(MockDevice.class);
+        when(mock.read(any())).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultIntegerFieldItem(1)));
+        preparingConnection.setDevice(mock);
+
+        // Now we can simply inject this URL into our code and automatically have our mock
+        someCodeWhichShouldDoPlcManipulation("test:123");
+
+        // Verify that the code did indeed what we wanted it to do
+        verify(mock, times(1)).read("DB2.DBD17:INT");
+    }
+
+    @Test
+    public void wrongDevice() {
+        assertThatThrownBy(() -> driver.connect("mock:"))
+            .isInstanceOf(PlcConnectionException.class);
+    }
+
+    /**
+     * Example function that does some reading from a siemens plc using Siemens Syntax
+     *
+     * @param connection Connection String, e.g., from config
+     */
+    private void someCodeWhichShouldDoPlcManipulation(String connection) throws PlcConnectionException, ExecutionException, InterruptedException {
+        // Normally this would be from the driver manager
+        PlcConnection connect = driver.connect(connection);
+        PlcReadResponse response = connect.readRequestBuilder()
+            .addItem("value", "DB2.DBD17:INT")
+            .build()
+            .execute()
+            .get();
+        // Normally do something with the response
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/udp/pom.xml b/plc4j/protocols/driver-bases/udp/pom.xml
index c7aa4854334..57c5bb60cb8 100644
--- a/plc4j/protocols/driver-bases/udp/pom.xml
+++ b/plc4j/protocols/driver-bases/udp/pom.xml
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-protocols-driver-bases</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-protocol-driver-base-udp</artifactId>
-  <name>PLC4J: Protocol: Driver-Base: UDP</name>
-  <description>Base classes needed to implement plc4x drivers based on UDP connections.</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-common</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-protocols-driver-bases</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-protocol-driver-base-udp</artifactId>
+  <name>PLC4J: Protocol: Driver-Base: UDP</name>
+  <description>Base classes needed to implement plc4x drivers based on UDP connections.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-common</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/udp/src/main/java/org/apache/plc4x/java/base/connection/UdpSocketChannelFactory.java b/plc4j/protocols/driver-bases/udp/src/main/java/org/apache/plc4x/java/base/connection/UdpSocketChannelFactory.java
index 942afc4222b..babfde6d5de 100644
--- a/plc4j/protocols/driver-bases/udp/src/main/java/org/apache/plc4x/java/base/connection/UdpSocketChannelFactory.java
+++ b/plc4j/protocols/driver-bases/udp/src/main/java/org/apache/plc4x/java/base/connection/UdpSocketChannelFactory.java
@@ -1,110 +1,110 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.base.connection;
-
-import io.netty.bootstrap.Bootstrap;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.nio.NioDatagramChannel;
-import io.netty.util.concurrent.Future;
-import io.netty.util.concurrent.GenericFutureListener;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.exceptions.PlcException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-
-public class UdpSocketChannelFactory implements ChannelFactory {
-
-    private static final Logger logger = LoggerFactory.getLogger(UdpSocketChannelFactory.class);
-
-    private static final int PING_TIMEOUT_MS = 1_000;
-
-    private final InetAddress address;
-    private final int port;
-
-    public UdpSocketChannelFactory(InetAddress address, int port) {
-        this.address = address;
-        this.port = port;
-    }
-
-    @Override
-    public Channel createChannel(ChannelHandler channelHandler)
-        throws PlcConnectionException {
-        try {
-            final NioEventLoopGroup workerGroup = new NioEventLoopGroup();
-
-            Bootstrap bootstrap = new Bootstrap();
-            bootstrap.group(workerGroup);
-            bootstrap.channel(NioDatagramChannel.class);
-            //bootstrap.option(ChannelOption.SO_KEEPALIVE, true);
-            //bootstrap.option(ChannelOption.TCP_NODELAY, true);
-            // TODO we should use an explicit (configurable?) timeout here
-            // bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 1000);
-            bootstrap.handler(channelHandler);
-            // Start the client.
-            final ChannelFuture f = bootstrap.connect(address, port);
-            f.addListener(new GenericFutureListener<Future<? super Void>>() {
-                @Override public void operationComplete(Future<? super Void> future) throws Exception {
-                    if (!future.isSuccess()) {
-                        logger.info("Unable to connect, shutting down worker thread.");
-                        workerGroup.shutdownGracefully();
-                    }
-                }
-            });
-            // Wait for sync
-            f.sync();
-            f.awaitUninterruptibly(); // jf: unsure if we need that
-            // Wait till the session is finished initializing.
-            return f.channel();
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new PlcConnectionException("Error creating channel.", e);
-        } catch (Exception e) {
-            throw new PlcConnectionException("Error creating channel.", e);
-        }
-    }
-
-    @Override
-    public void ping() throws PlcException {
-        // TODO: Replace this check with a more accurate one ...
-        InetSocketAddress address = new InetSocketAddress(getAddress(), getPort());
-        try (Socket s = new Socket()) {
-            s.connect(address, PING_TIMEOUT_MS);
-            // TODO keep the address for a (timely) next request???
-            s.setReuseAddress(true);
-        } catch (Exception e) {
-            throw new PlcConnectionException("Unable to ping remote host");
-        }
-    }
-
-    public InetAddress getAddress() {
-        return address;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.base.connection;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioDatagramChannel;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.exceptions.PlcException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+
+public class UdpSocketChannelFactory implements ChannelFactory {
+
+    private static final Logger logger = LoggerFactory.getLogger(UdpSocketChannelFactory.class);
+
+    private static final int PING_TIMEOUT_MS = 1_000;
+
+    private final InetAddress address;
+    private final int port;
+
+    public UdpSocketChannelFactory(InetAddress address, int port) {
+        this.address = address;
+        this.port = port;
+    }
+
+    @Override
+    public Channel createChannel(ChannelHandler channelHandler)
+        throws PlcConnectionException {
+        try {
+            final NioEventLoopGroup workerGroup = new NioEventLoopGroup();
+
+            Bootstrap bootstrap = new Bootstrap();
+            bootstrap.group(workerGroup);
+            bootstrap.channel(NioDatagramChannel.class);
+            //bootstrap.option(ChannelOption.SO_KEEPALIVE, true);
+            //bootstrap.option(ChannelOption.TCP_NODELAY, true);
+            // TODO we should use an explicit (configurable?) timeout here
+            // bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 1000);
+            bootstrap.handler(channelHandler);
+            // Start the client.
+            final ChannelFuture f = bootstrap.connect(address, port);
+            f.addListener(new GenericFutureListener<Future<? super Void>>() {
+                @Override public void operationComplete(Future<? super Void> future) throws Exception {
+                    if (!future.isSuccess()) {
+                        logger.info("Unable to connect, shutting down worker thread.");
+                        workerGroup.shutdownGracefully();
+                    }
+                }
+            });
+            // Wait for sync
+            f.sync();
+            f.awaitUninterruptibly(); // jf: unsure if we need that
+            // Wait till the session is finished initializing.
+            return f.channel();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new PlcConnectionException("Error creating channel.", e);
+        } catch (Exception e) {
+            throw new PlcConnectionException("Error creating channel.", e);
+        }
+    }
+
+    @Override
+    public void ping() throws PlcException {
+        // TODO: Replace this check with a more accurate one ...
+        InetSocketAddress address = new InetSocketAddress(getAddress(), getPort());
+        try (Socket s = new Socket()) {
+            s.connect(address, PING_TIMEOUT_MS);
+            // TODO keep the address for a (timely) next request???
+            s.setReuseAddress(true);
+        } catch (Exception e) {
+            throw new PlcConnectionException("Unable to ping remote host");
+        }
+    }
+
+    public InetAddress getAddress() {
+        return address;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
+}
diff --git a/plc4j/protocols/ethernet-ip/pom.xml b/plc4j/protocols/ethernet-ip/pom.xml
index e6840e4f3b3..7b8a239b052 100644
--- a/plc4j/protocols/ethernet-ip/pom.xml
+++ b/plc4j/protocols/ethernet-ip/pom.xml
@@ -1,124 +1,124 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-protocols</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-protocol-ethernet-ip</artifactId>
-  <name>PLC4J: Protocol: Ethernet/IP</name>
-  <description>Implementation of a PLC4X driver able to speak with devices using the Ethernet/IP protocol.
-  </description>
-
-  <properties>
-    <ethernetip-driver.version>1.2.0</ethernetip-driver.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.digitalpetri.enip</groupId>
-      <artifactId>cip-core</artifactId>
-      <version>${ethernetip-driver.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.digitalpetri.enip</groupId>
-      <artifactId>enip-core</artifactId>
-      <version>${ethernetip-driver.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-buffer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-codec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>check-dependencies</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>analyze-only</goal>
-            </goals>
-            <configuration>
-              <failOnWarning>true</failOnWarning>
-              <ignoredDependencies combine.children="append">
-                <ignoredDependency>com.digitalpetri.modbus:modbus-master-tcp</ignoredDependency>
-              </ignoredDependencies>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <repositories>
-    <repository>
-      <id>ossrh</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-protocols</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-protocol-ethernet-ip</artifactId>
+  <name>PLC4J: Protocol: Ethernet/IP</name>
+  <description>Implementation of a PLC4X driver able to speak with devices using the Ethernet/IP protocol.
+  </description>
+
+  <properties>
+    <ethernetip-driver.version>1.2.0</ethernetip-driver.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.digitalpetri.enip</groupId>
+      <artifactId>cip-core</artifactId>
+      <version>${ethernetip-driver.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.digitalpetri.enip</groupId>
+      <artifactId>enip-core</artifactId>
+      <version>${ethernetip-driver.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>check-dependencies</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>analyze-only</goal>
+            </goals>
+            <configuration>
+              <failOnWarning>true</failOnWarning>
+              <ignoredDependencies combine.children="append">
+                <ignoredDependency>com.digitalpetri.modbus:modbus-master-tcp</ignoredDependency>
+              </ignoredDependencies>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <repositories>
+    <repository>
+      <id>ossrh</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </repository>
+  </repositories>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/protocols/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/model/EtherNetIpField.java b/plc4j/protocols/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/model/EtherNetIpField.java
index 9308635625f..026a6031ec6 100644
--- a/plc4j/protocols/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/model/EtherNetIpField.java
+++ b/plc4j/protocols/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/model/EtherNetIpField.java
@@ -1,102 +1,102 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.ethernetip.model;
-
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.model.PlcField;
-
-import java.util.Objects;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class EtherNetIpField implements PlcField {
-
-    private static final Pattern ADDRESS_PATTERN = Pattern.compile("^#(?<class>.*?)#(?<instance>\\d{1,4})(?:#(?<attribute>\\d))?");
-
-    public static boolean matches(String addressString) {
-        return ADDRESS_PATTERN.matcher(addressString).matches();
-    }
-
-    public static EtherNetIpField of(String addressString) throws PlcInvalidFieldException {
-        Matcher matcher = ADDRESS_PATTERN.matcher(addressString);
-        if (!matcher.matches()) {
-            throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN);
-        }
-        int classNumber = Integer.parseInt(matcher.group("class"));
-        int instanceNumber = Integer.parseInt(matcher.group("instance"));
-        int attributeNumber = Integer.parseInt(matcher.group("attribute"));
-
-        return new EtherNetIpField(classNumber, instanceNumber, attributeNumber);
-    }
-
-    private final int objectNumber;
-    private final int instanceNumber;
-    private final int attributeNumber;
-
-    private int connectionId;
-
-    public EtherNetIpField(int objectNumber, int instanceNumber, int attributeNumber) {
-        this.objectNumber = objectNumber;
-        this.instanceNumber = instanceNumber;
-        this.attributeNumber = attributeNumber;
-
-        this.connectionId = -1;
-    }
-
-    public int getObjectNumber() {
-        return objectNumber;
-    }
-
-    public int getInstanceNumber() {
-        return instanceNumber;
-    }
-
-    public int getAttributeNumber() {
-        return attributeNumber;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof EtherNetIpField)) {
-            return false;
-        }
-        EtherNetIpField that = (EtherNetIpField) o;
-        return objectNumber == that.objectNumber &&
-            instanceNumber == that.instanceNumber &&
-            attributeNumber == that.attributeNumber;
-    }
-
-    @Override
-    public int hashCode() {
-
-        return Objects.hash(objectNumber, instanceNumber, attributeNumber);
-    }
-
-    @Override
-    public String toString() {
-        return "EtherNetIpField{" +
-            "object-number=" + objectNumber +
-            ", instance-number=" + instanceNumber +
-            ", attribute-number=" + attributeNumber +
-            '}';
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.ethernetip.model;
+
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.model.PlcField;
+
+import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class EtherNetIpField implements PlcField {
+
+    private static final Pattern ADDRESS_PATTERN = Pattern.compile("^#(?<class>.*?)#(?<instance>\\d{1,4})(?:#(?<attribute>\\d))?");
+
+    public static boolean matches(String addressString) {
+        return ADDRESS_PATTERN.matcher(addressString).matches();
+    }
+
+    public static EtherNetIpField of(String addressString) throws PlcInvalidFieldException {
+        Matcher matcher = ADDRESS_PATTERN.matcher(addressString);
+        if (!matcher.matches()) {
+            throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN);
+        }
+        int classNumber = Integer.parseInt(matcher.group("class"));
+        int instanceNumber = Integer.parseInt(matcher.group("instance"));
+        int attributeNumber = Integer.parseInt(matcher.group("attribute"));
+
+        return new EtherNetIpField(classNumber, instanceNumber, attributeNumber);
+    }
+
+    private final int objectNumber;
+    private final int instanceNumber;
+    private final int attributeNumber;
+
+    private int connectionId;
+
+    public EtherNetIpField(int objectNumber, int instanceNumber, int attributeNumber) {
+        this.objectNumber = objectNumber;
+        this.instanceNumber = instanceNumber;
+        this.attributeNumber = attributeNumber;
+
+        this.connectionId = -1;
+    }
+
+    public int getObjectNumber() {
+        return objectNumber;
+    }
+
+    public int getInstanceNumber() {
+        return instanceNumber;
+    }
+
+    public int getAttributeNumber() {
+        return attributeNumber;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof EtherNetIpField)) {
+            return false;
+        }
+        EtherNetIpField that = (EtherNetIpField) o;
+        return objectNumber == that.objectNumber &&
+            instanceNumber == that.instanceNumber &&
+            attributeNumber == that.attributeNumber;
+    }
+
+    @Override
+    public int hashCode() {
+
+        return Objects.hash(objectNumber, instanceNumber, attributeNumber);
+    }
+
+    @Override
+    public String toString() {
+        return "EtherNetIpField{" +
+            "object-number=" + objectNumber +
+            ", instance-number=" + instanceNumber +
+            ", attribute-number=" + attributeNumber +
+            '}';
+    }
+}
diff --git a/plc4j/protocols/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/netty/EnipCodec.java b/plc4j/protocols/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/netty/EnipCodec.java
index 96dc0481322..479aca67968 100644
--- a/plc4j/protocols/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/netty/EnipCodec.java
+++ b/plc4j/protocols/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/netty/EnipCodec.java
@@ -1,58 +1,58 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.ethernetip.netty;
-
-import com.digitalpetri.enip.EnipPacket;
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.ByteToMessageCodec;
-
-import java.nio.ByteOrder;
-import java.util.List;
-
-public class EnipCodec extends ByteToMessageCodec<EnipPacket> {
-
-    private static final int HEADER_SIZE = 24;
-    private static final int LENGTH_OFFSET = 2;
-
-    @Override
-    protected void encode(ChannelHandlerContext ctx, EnipPacket packet, ByteBuf out) {
-        EnipPacket.encode(packet, out.order(ByteOrder.LITTLE_ENDIAN));
-    }
-
-    @Override
-    protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) {
-        ByteBuf buffer = in.order(ByteOrder.LITTLE_ENDIAN);
-
-        int startIndex = buffer.readerIndex();
-
-        while (buffer.readableBytes() >= HEADER_SIZE &&
-            buffer.readableBytes() >= HEADER_SIZE + getLength(buffer, startIndex)) {
-
-            out.add(EnipPacket.decode(buffer));
-
-            startIndex = buffer.readerIndex();
-        }
-    }
-
-    private int getLength(ByteBuf buffer, int startIndex) {
-        return buffer.getUnsignedShort(startIndex + LENGTH_OFFSET);
-    }
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.ethernetip.netty;
+
+import com.digitalpetri.enip.EnipPacket;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.ByteToMessageCodec;
+
+import java.nio.ByteOrder;
+import java.util.List;
+
+public class EnipCodec extends ByteToMessageCodec<EnipPacket> {
+
+    private static final int HEADER_SIZE = 24;
+    private static final int LENGTH_OFFSET = 2;
+
+    @Override
+    protected void encode(ChannelHandlerContext ctx, EnipPacket packet, ByteBuf out) {
+        EnipPacket.encode(packet, out.order(ByteOrder.LITTLE_ENDIAN));
+    }
+
+    @Override
+    protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) {
+        ByteBuf buffer = in.order(ByteOrder.LITTLE_ENDIAN);
+
+        int startIndex = buffer.readerIndex();
+
+        while (buffer.readableBytes() >= HEADER_SIZE &&
+            buffer.readableBytes() >= HEADER_SIZE + getLength(buffer, startIndex)) {
+
+            out.add(EnipPacket.decode(buffer));
+
+            startIndex = buffer.readerIndex();
+        }
+    }
+
+    private int getLength(ByteBuf buffer, int startIndex) {
+        return buffer.getUnsignedShort(startIndex + LENGTH_OFFSET);
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/netty/Plc4XEtherNetIpProtocol.java b/plc4j/protocols/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/netty/Plc4XEtherNetIpProtocol.java
index 1dea06ed82e..1af48d95cfd 100644
--- a/plc4j/protocols/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/netty/Plc4XEtherNetIpProtocol.java
+++ b/plc4j/protocols/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/netty/Plc4XEtherNetIpProtocol.java
@@ -1,497 +1,497 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.ethernetip.netty;
-
-import com.digitalpetri.enip.EnipPacket;
-import com.digitalpetri.enip.EnipStatus;
-import com.digitalpetri.enip.cip.epath.EPath;
-import com.digitalpetri.enip.cip.epath.LogicalSegment;
-import com.digitalpetri.enip.cip.services.GetAttributeSingleService;
-import com.digitalpetri.enip.cip.structs.MessageRouterResponse;
-import com.digitalpetri.enip.commands.*;
-import com.digitalpetri.enip.cpf.*;
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToMessageCodec;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcRequest;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.events.ConnectEvent;
-import org.apache.plc4x.java.base.events.ConnectedEvent;
-import org.apache.plc4x.java.base.messages.*;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-import org.apache.plc4x.java.base.messages.items.DefaultLongFieldItem;
-import org.apache.plc4x.java.ethernetip.model.EtherNetIpField;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.charset.Charset;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicLong;
-
-public class Plc4XEtherNetIpProtocol extends MessageToMessageCodec<EnipPacket, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse>> {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(Plc4XEtherNetIpProtocol.class);
-
-    private static final int SERVICE_COMMUNICATIONS_TYPE_CODE = 0x0100;
-
-    private long sessionHandle = 0;
-    private static final AtomicLong messageId = new AtomicLong();
-
-    // General information about the remote communication endpoint.
-    private CipIdentityItem identityItem;
-    // Flag to signal, if the remote communication endpoint supports encapsulation of CIP data.
-    private boolean supportsCipEncapsulation = false;
-    // Flag to indicate, if implicit IO (subscription) is generally supported by the remote communication endpoint.
-    // This is handled via separate UDP socket, which would have to be established in parallel.
-    private boolean supportsClass0Or1UdpConnections = false;
-    // Map of non-cip interfaces, that might be used for specialized IO in future versions.
-    private Map<String, Integer> nonCipInterfaces = null;
-    // In CIP we are doing explicit connected messaging, this requires every used address to be registered at the
-    // remote server and to use that Addresses connectionId for accessing data. We are saving the references to
-    // these here.
-    // REMARK: Perhaps we should add a timeout to these so we unregister them after not being used
-    // for quire some time. Hereby freeing resources on both client and server.
-    private Map<PlcField, Long> fieldConnectionMap = new ConcurrentHashMap<>();
-
-    private final Map<Long, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse>> requestsMap = new ConcurrentHashMap<>();
-
-    /**
-     * If the IsoTP protocol is used on top of the ISO on TCP protocol, then as soon as the pipeline receives the
-     * request to connect, an IsoTP connection request TPDU must be sent in order to initialize the connection.
-     *
-     * @param ctx the current protocol layers context
-     * @param evt the event
-     * @throws Exception throws an exception if something goes wrong internally
-     */
-    @Override
-    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
-        // If the connection has just been established, start setting up the connection
-        // by sending a connection request to the plc.
-        if (evt instanceof ConnectEvent) {
-            LOGGER.debug("EtherNet/IP Protocol Sending Connection Request");
-
-            EnipPacket packet = new EnipPacket(CommandCode.RegisterSession, 0, EnipStatus.EIP_SUCCESS,
-                messageId.getAndIncrement(), new RegisterSession());
-
-            ctx.channel().writeAndFlush(packet);
-        } else {
-            super.userEventTriggered(ctx, evt);
-        }
-    }
-
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        LOGGER.trace("(-->ERR): {}", ctx, cause);
-        super.exceptionCaught(ctx, cause);
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Encoding
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    @Override
-    protected void encode(ChannelHandlerContext ctx, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> msg, List<Object> out) {
-        LOGGER.trace("(<--OUT): {}, {}, {}", ctx, msg, out);
-        // Reset transactionId on overflow
-        messageId.compareAndSet(Short.MAX_VALUE + 1L, 0);
-        PlcRequest request = msg.getRequest();
-        if (request instanceof PlcReadRequest) {
-            encodeReadRequest(msg, out);
-        } else if (request instanceof PlcWriteRequest) {
-            encodeWriteRequest(msg, out);
-        } /*else if(request instanceof PlcSubscriptionRequest) {
-            encodeSubscriptionRequest(msg, out);
-        } else if(request instanceof PlcUnsubscriptionRequest) {
-            TODO: Implement this and refactor PlcUnsubscriptionRequest first ...
-        }*/
-    }
-
-    private void encodeWriteRequest(PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> msg, List<Object> out) {
-        if (!supportsCipEncapsulation) {
-            LOGGER.warn("CIP Encapsulation not supported by remote, payload encapsulation must be handled by target and originator");
-        }
-
-        /*PlcWriteRequest request = (PlcWriteRequest) msg.getRequest();
-
-        // Create a ForwardOpen CIP request
-
-        // Create EIP UnconnectedDataItemRequest
-        UnconnectedDataItemRequest dataItem = new UnconnectedDataItemRequest(dataEncoder);
-        CpfPacket packet = new CpfPacket(new NullAddressItem(), dataItem);
-
-        // Send that via EIP SendRRData packet
-        CompletableFuture<T> future = new CompletableFuture<>();
-
-        sendRRData(new SendRRData(packet)).whenComplete((command, ex) -> {
-            if (command != null) {
-                CpfItem[] items = command.getPacket().getItems();
-
-                if (items.length == 2 &&
-                    items[0].getTypeId() == NullAddressItem.TYPE_ID &&
-                    items[1].getTypeId() == UnconnectedDataItemResponse.TYPE_ID) {
-
-                    ByteBuf data = ((UnconnectedDataItemResponse) items[1]).getData();
-
-                    future.complete(data);
-                } else {
-                    future.completeExceptionally(new Exception("received unexpected items"));
-                }
-            } else {
-                future.completeExceptionally(ex);
-            }
-        });
-
-        channelManager.getChannel().whenComplete((ch, ex) -> {
-            if (ch != null) writeCommand(ch, command, future);
-            else future.completeExceptionally(ex);
-        });*/
-
-    }
-
-    private void encodeReadRequest(PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> msg, List<Object> out) {
-        if (!supportsCipEncapsulation) {
-            LOGGER.warn("CIP Encapsulation not supported by remote, payload encapsulation must be handled by target and originator");
-        }
-
-        InternalPlcReadRequest request = (InternalPlcReadRequest) msg.getRequest();
-        for (String fieldName : request.getFieldNames()) {
-            PlcField field = request.getField(fieldName);
-
-            // CIP Part
-            EtherNetIpField enipField = (EtherNetIpField) field;
-            EPath.PaddedEPath path = new EPath.PaddedEPath(new LogicalSegment.ClassId(enipField.getObjectNumber()),
-                new LogicalSegment.InstanceId(enipField.getInstanceNumber()),
-                new LogicalSegment.AttributeId(enipField.getAttributeNumber()));
-            GetAttributeSingleService service = new GetAttributeSingleService(path);
-
-            // ENIP Part
-            EnipPacket packet = new EnipPacket(CommandCode.SendRRData, sessionHandle, EnipStatus.EIP_SUCCESS,
-                messageId.getAndIncrement(), new SendRRData(new CpfPacket(
-                new NullAddressItem(),
-                new UnconnectedDataItemRequest(service::encodeRequest)
-            )));
-
-            requestsMap.put(packet.getSenderContext(), msg);
-
-            out.add(packet);
-        }
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Decoding
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    @SuppressWarnings("unchecked")
-    @Override
-    protected void decode(ChannelHandlerContext ctx, EnipPacket msg, List<Object> out) {
-        LOGGER.trace("(-->IN): {}, {}, {}", ctx, msg, out);
-        LOGGER.debug("{}: session handle: {}, sender context: {}, EtherNetIPPacket:{}", msg, msg.getSessionHandle(), msg.getSenderContext(), msg);
-
-        EnipPacket packet = null;
-        switch (msg.getCommandCode()) {
-            case RegisterSession:
-                handleRegisterSession(ctx, msg);
-
-                // Now try getting some detailed information about the remote.
-                packet = new EnipPacket(CommandCode.ListIdentity, sessionHandle, EnipStatus.EIP_SUCCESS,
-                    messageId.getAndIncrement(), new ListIdentity());
-                break;
-
-            case UnRegisterSession:
-                handleUnregisterSession(ctx, msg);
-
-                // Spec: The receiver shall initiate a close of the underlying
-                // TCP/IP connection when it receives this command.
-                ctx.channel().disconnect();
-                break;
-
-            case ListIdentity:
-                handleListIdentity(ctx, msg);
-
-                // Now try listing the services the remote has to offer.
-                packet = new EnipPacket(CommandCode.ListServices, sessionHandle, EnipStatus.EIP_SUCCESS,
-                    messageId.getAndIncrement(), new ListServices());
-                break;
-
-            case ListInterfaces:
-                handleListInterfaces(ctx, msg);
-
-                // Here we're done connecting.
-                ctx.channel().pipeline().fireUserEventTriggered(new ConnectedEvent());
-                break;
-
-            case ListServices:
-                handleListServices(ctx, msg);
-
-                // Now try listing the interfaces the remote has to offer.
-                packet = new EnipPacket(CommandCode.ListInterfaces, sessionHandle, EnipStatus.EIP_SUCCESS,
-                    messageId.getAndIncrement(), new ListInterfaces());
-                break;
-
-            case Nop:
-                handleNop(ctx, msg);
-                break;
-
-            case SendRRData:
-                handleSendRRDataResponse(ctx, msg);
-                break;
-
-            case SendUnitData:
-                // This might be where the connected data is sent (eventually publish/subscribe communication)
-                break;
-        }
-
-        if (packet != null) {
-            ctx.channel().writeAndFlush(packet);
-        }
-    }
-
-    /**
-     * In order to do explicit connected messaging, the client has to register a session with the server.
-     * In case of a successful session registration the response will contain the sessionHandle, which is
-     * required to be used in all subsequent connected interactions.
-     *
-     * @param ctx the {@link ChannelHandlerContext} instance.
-     * @param msg the packet received from the server.
-     */
-    private void handleRegisterSession(ChannelHandlerContext ctx, EnipPacket msg) {
-        if (msg.getStatus() == EnipStatus.EIP_SUCCESS) {
-            sessionHandle = msg.getSessionHandle();
-
-            LOGGER.info("EtherNet/IP session registered session-handle {}", sessionHandle);
-        } else {
-            ctx.channel().pipeline().fireExceptionCaught(new PlcProtocolException("Got a non-success response."));
-        }
-    }
-
-    /**
-     * As connected operations allocate resources on the server and the client, when receiving a
-     * {@link UnRegisterSession} message (request or response) the locally allocated resources have
-     * to be released again. As the correct response to a UnRegisterSession is the closing of the
-     * connection by the receiving side, this incoming command must be a request sent from the
-     * server.
-     *
-     * @param ctx the {@link ChannelHandlerContext} instance.
-     * @param msg the packet received from the server.
-     */
-    private void handleUnregisterSession(ChannelHandlerContext ctx, EnipPacket msg) {
-        if (msg.getStatus() == EnipStatus.EIP_SUCCESS) {
-            // Reset all internal variables.
-            identityItem = null;
-            supportsCipEncapsulation = false;
-            supportsClass0Or1UdpConnections = false;
-            nonCipInterfaces = null;
-            fieldConnectionMap = null;
-        } else {
-            ctx.channel().pipeline().fireExceptionCaught(new PlcProtocolException("Got a non-success response."));
-        }
-    }
-
-    /**
-     * The response to a {@link ListIdentity} command contains a lot of information about the
-     * remote counterpart. In this case we just save this information for further usage.
-     *
-     * @param ctx the {@link ChannelHandlerContext} instance.
-     * @param msg the packet received from the server.
-     */
-    private void handleListIdentity(ChannelHandlerContext ctx, EnipPacket msg) {
-        if (msg.getStatus() == EnipStatus.EIP_SUCCESS) {
-            ListIdentity listIdentityResponse = (ListIdentity) msg.getCommand();
-            if (listIdentityResponse != null) {
-                identityItem = listIdentityResponse.getIdentity().orElse(null);
-                if (identityItem != null) {
-                    LOGGER.info("Connected to: \n - product name: {} \n - serial number: {} ",
-                        identityItem.getProductName().trim(), identityItem.getSerialNumber());
-                }
-            } else {
-                identityItem = null;
-            }
-        } else {
-            ctx.channel().pipeline().fireExceptionCaught(new PlcProtocolException("Got a non-success response."));
-        }
-    }
-
-    /**
-     * Some times EtherNet/IP devices support other devices than the default one.
-     * As we are required to ev eventually reference these interfaces, build a map
-     * of all the devices the remote supports. This way we can check the validity
-     * before actually sending a request.
-     *
-     * @param ctx the {@link ChannelHandlerContext} instance.
-     * @param msg the packet received from the server.
-     */
-    private void handleListInterfaces(ChannelHandlerContext ctx, EnipPacket msg) {
-        if (msg.getStatus() == EnipStatus.EIP_SUCCESS) {
-            ListInterfaces listInterfaces = (ListInterfaces) msg.getCommand();
-            if (listInterfaces != null) {
-                // If the device supports non-CIP interfaces, this array is not empty.
-                // In this case build a map so we can access the information when sending
-                // data in RR-Requests (Request-Response).
-                if (listInterfaces.getInterfaces().length > 0) {
-                    nonCipInterfaces = new HashMap<>();
-                    for (ListInterfaces.InterfaceInformation interfaceInformation : listInterfaces.getInterfaces()) {
-                        String interfaceName = new String(
-                            interfaceInformation.getData(), Charset.forName("US-ASCII")).trim();
-                        nonCipInterfaces.put(interfaceName, interfaceInformation.hashCode());
-                    }
-                } else {
-                    nonCipInterfaces = null;
-                }
-            }
-        } else {
-            ctx.channel().pipeline().fireExceptionCaught(new PlcProtocolException("Got a non-success response."));
-        }
-    }
-
-    /**
-     * Each EtherNet/IP device can support one or more so-called `services`. At least the `Communications`
-     * service is required to be supported by every EtherNet/IP compliant device. This is used for default
-     * IO operations. Usually vendors support custom services which are adjusted to their particular needs,
-     * which might be able to provide better performance than the default. In this case we are ignoring all
-     * these as supporting these would require custom adapters on the PLC4X side. However we do inspect the
-     * capabilities of the `Communications` service to check if encapsulation of CIP data is supported and
-     * if we are able to do connected implicit communication via a parallel UDP channel.
-     *
-     * @param ctx the {@link ChannelHandlerContext} instance.
-     * @param msg the packet received from the server.
-     */
-    private void handleListServices(ChannelHandlerContext ctx, EnipPacket msg) {
-        if (msg.getStatus() == EnipStatus.EIP_SUCCESS) {
-            ListServices listServices = (ListServices) msg.getCommand();
-            if (listServices != null) {
-                for (ListServices.ServiceInformation service : listServices.getServices()) {
-                    // Check if the type code matches the communications service and if bit 5 of the
-                    // capability flags is set.
-                    if (service.getTypeCode() == SERVICE_COMMUNICATIONS_TYPE_CODE) {
-                        supportsCipEncapsulation = (service.getCapabilityFlags() & 32) != 0;
-                        supportsClass0Or1UdpConnections = (service.getCapabilityFlags() & 256) != 0;
-                    }
-                }
-            } else {
-                supportsCipEncapsulation = false;
-                supportsClass0Or1UdpConnections = false;
-            }
-        } else {
-            ctx.channel().pipeline().fireExceptionCaught(new PlcProtocolException("Got a non-success response."));
-        }
-    }
-
-    /**
-     * NOP request/responses are simple no-payload messages used to check if a connection is still
-     * available. Depending on if it's a request or reply, we simply send back a NOP Reply or not.
-     * As no reply is to be generated for an incoming NOP command, this must be a NopRequest.
-     *
-     * @param ctx the {@link ChannelHandlerContext} instance.
-     * @param msg the packet received from the server.
-     */
-    private void handleNop(ChannelHandlerContext ctx, EnipPacket msg) {
-        if (msg.getStatus() == EnipStatus.EIP_SUCCESS) {
-            //Nop nop = (Nop) msg.getCommand();
-            // TODO: Reset some sort of timer ...
-        } else {
-            ctx.channel().pipeline().fireExceptionCaught(
-                new PlcProtocolException("Got a non-success flagged request."));
-        }
-    }
-
-    /**
-     * As RR Data is Request Response data and the server will not issue a request to
-     * the client, we can be pretty sure this is a response to a previously issued request.
-     * This contains the actual payload for our requests.
-     *
-     * @param ctx the {@link ChannelHandlerContext} instance.
-     * @param msg the packet received from the server.
-     */
-    private void handleSendRRDataResponse(ChannelHandlerContext ctx, EnipPacket msg) {
-        // This is where the typical request/response stuff is handled.
-        long senderContext = msg.getSenderContext();
-        PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> plcRequestContainer = requestsMap.get(senderContext);
-        if (plcRequestContainer == null) {
-            ctx.channel().pipeline().fireExceptionCaught(
-                new PlcProtocolException("Unrelated payload received for message " + msg));
-            return;
-        }
-
-        if (!(plcRequestContainer.getRequest() instanceof PlcReadRequest)) {
-            ctx.fireExceptionCaught(new PlcProtocolException("Expecting a PlcReadRequest here."));
-            return;
-        }
-        InternalPlcReadRequest request = (InternalPlcReadRequest) plcRequestContainer.getRequest();
-        PlcResponseCode responseCode;
-        if (msg.getStatus() != EnipStatus.EIP_SUCCESS) {
-            responseCode = PlcResponseCode.NOT_FOUND;
-        } else {
-            responseCode = PlcResponseCode.OK;
-        }
-
-        SendRRData sendRRDataCommand = (SendRRData) msg.getCommand();
-        if (sendRRDataCommand == null) {
-            ctx.fireExceptionCaught(new PlcProtocolException("Expecting a SendRRData command here."));
-            return;
-        }
-        CpfItem[] items = sendRRDataCommand.getPacket().getItems();
-        if (items.length != 2) {
-            ctx.fireExceptionCaught(new PlcProtocolException("Expecting 2 items here."));
-            return;
-        }
-        CpfItem payload = items[1];
-        if (!(payload instanceof UnconnectedDataItemResponse)) {
-            ctx.fireExceptionCaught(new PlcProtocolException("Item[1] should be of type UnconnectedDataItemResponse"));
-            return;
-        }
-        UnconnectedDataItemResponse enipResponse = (UnconnectedDataItemResponse) payload;
-        ByteBuf data = enipResponse.getData();
-        if (data.readableBytes() > 0) {
-            Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> values = new HashMap<>();
-            // TODO: This is not quite correct as this will probalby not work when requesting more than one item.
-            for (String fieldName : request.getFieldNames()) {
-                MessageRouterResponse cipResponse = MessageRouterResponse.decode(data);
-                short value;
-                // TODO: This is not quite correct as we assume everything is an integer.
-                if (cipResponse.getData().readableBytes() >= 2) {
-                    value = cipResponse.getData().readShort();
-                } else {
-                    value = -1;
-                }
-                DefaultLongFieldItem fieldItem = new DefaultLongFieldItem((long) value);
-                values.put(fieldName, new ImmutablePair<>(responseCode, fieldItem));
-            }
-            InternalPlcReadResponse response = new DefaultPlcReadResponse(request, values);
-            plcRequestContainer.getResponseFuture().complete(response);
-        }
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////
-    // Encoding helpers.
-    ////////////////////////////////////////////////////////////////////////////////
-
-    ////////////////////////////////////////////////////////////////////////////////
-    // Decoding helpers.
-    ////////////////////////////////////////////////////////////////////////////////
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.ethernetip.netty;
+
+import com.digitalpetri.enip.EnipPacket;
+import com.digitalpetri.enip.EnipStatus;
+import com.digitalpetri.enip.cip.epath.EPath;
+import com.digitalpetri.enip.cip.epath.LogicalSegment;
+import com.digitalpetri.enip.cip.services.GetAttributeSingleService;
+import com.digitalpetri.enip.cip.structs.MessageRouterResponse;
+import com.digitalpetri.enip.commands.*;
+import com.digitalpetri.enip.cpf.*;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageCodec;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.events.ConnectEvent;
+import org.apache.plc4x.java.base.events.ConnectedEvent;
+import org.apache.plc4x.java.base.messages.*;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+import org.apache.plc4x.java.base.messages.items.DefaultLongFieldItem;
+import org.apache.plc4x.java.ethernetip.model.EtherNetIpField;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+
+public class Plc4XEtherNetIpProtocol extends MessageToMessageCodec<EnipPacket, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse>> {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(Plc4XEtherNetIpProtocol.class);
+
+    private static final int SERVICE_COMMUNICATIONS_TYPE_CODE = 0x0100;
+
+    private long sessionHandle = 0;
+    private static final AtomicLong messageId = new AtomicLong();
+
+    // General information about the remote communication endpoint.
+    private CipIdentityItem identityItem;
+    // Flag to signal, if the remote communication endpoint supports encapsulation of CIP data.
+    private boolean supportsCipEncapsulation = false;
+    // Flag to indicate, if implicit IO (subscription) is generally supported by the remote communication endpoint.
+    // This is handled via separate UDP socket, which would have to be established in parallel.
+    private boolean supportsClass0Or1UdpConnections = false;
+    // Map of non-cip interfaces, that might be used for specialized IO in future versions.
+    private Map<String, Integer> nonCipInterfaces = null;
+    // In CIP we are doing explicit connected messaging, this requires every used address to be registered at the
+    // remote server and to use that Addresses connectionId for accessing data. We are saving the references to
+    // these here.
+    // REMARK: Perhaps we should add a timeout to these so we unregister them after not being used
+    // for quire some time. Hereby freeing resources on both client and server.
+    private Map<PlcField, Long> fieldConnectionMap = new ConcurrentHashMap<>();
+
+    private final Map<Long, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse>> requestsMap = new ConcurrentHashMap<>();
+
+    /**
+     * If the IsoTP protocol is used on top of the ISO on TCP protocol, then as soon as the pipeline receives the
+     * request to connect, an IsoTP connection request TPDU must be sent in order to initialize the connection.
+     *
+     * @param ctx the current protocol layers context
+     * @param evt the event
+     * @throws Exception throws an exception if something goes wrong internally
+     */
+    @Override
+    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+        // If the connection has just been established, start setting up the connection
+        // by sending a connection request to the plc.
+        if (evt instanceof ConnectEvent) {
+            LOGGER.debug("EtherNet/IP Protocol Sending Connection Request");
+
+            EnipPacket packet = new EnipPacket(CommandCode.RegisterSession, 0, EnipStatus.EIP_SUCCESS,
+                messageId.getAndIncrement(), new RegisterSession());
+
+            ctx.channel().writeAndFlush(packet);
+        } else {
+            super.userEventTriggered(ctx, evt);
+        }
+    }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+        LOGGER.trace("(-->ERR): {}", ctx, cause);
+        super.exceptionCaught(ctx, cause);
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Encoding
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    protected void encode(ChannelHandlerContext ctx, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> msg, List<Object> out) {
+        LOGGER.trace("(<--OUT): {}, {}, {}", ctx, msg, out);
+        // Reset transactionId on overflow
+        messageId.compareAndSet(Short.MAX_VALUE + 1L, 0);
+        PlcRequest request = msg.getRequest();
+        if (request instanceof PlcReadRequest) {
+            encodeReadRequest(msg, out);
+        } else if (request instanceof PlcWriteRequest) {
+            encodeWriteRequest(msg, out);
+        } /*else if(request instanceof PlcSubscriptionRequest) {
+            encodeSubscriptionRequest(msg, out);
+        } else if(request instanceof PlcUnsubscriptionRequest) {
+            TODO: Implement this and refactor PlcUnsubscriptionRequest first ...
+        }*/
+    }
+
+    private void encodeWriteRequest(PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> msg, List<Object> out) {
+        if (!supportsCipEncapsulation) {
+            LOGGER.warn("CIP Encapsulation not supported by remote, payload encapsulation must be handled by target and originator");
+        }
+
+        /*PlcWriteRequest request = (PlcWriteRequest) msg.getRequest();
+
+        // Create a ForwardOpen CIP request
+
+        // Create EIP UnconnectedDataItemRequest
+        UnconnectedDataItemRequest dataItem = new UnconnectedDataItemRequest(dataEncoder);
+        CpfPacket packet = new CpfPacket(new NullAddressItem(), dataItem);
+
+        // Send that via EIP SendRRData packet
+        CompletableFuture<T> future = new CompletableFuture<>();
+
+        sendRRData(new SendRRData(packet)).whenComplete((command, ex) -> {
+            if (command != null) {
+                CpfItem[] items = command.getPacket().getItems();
+
+                if (items.length == 2 &&
+                    items[0].getTypeId() == NullAddressItem.TYPE_ID &&
+                    items[1].getTypeId() == UnconnectedDataItemResponse.TYPE_ID) {
+
+                    ByteBuf data = ((UnconnectedDataItemResponse) items[1]).getData();
+
+                    future.complete(data);
+                } else {
+                    future.completeExceptionally(new Exception("received unexpected items"));
+                }
+            } else {
+                future.completeExceptionally(ex);
+            }
+        });
+
+        channelManager.getChannel().whenComplete((ch, ex) -> {
+            if (ch != null) writeCommand(ch, command, future);
+            else future.completeExceptionally(ex);
+        });*/
+
+    }
+
+    private void encodeReadRequest(PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> msg, List<Object> out) {
+        if (!supportsCipEncapsulation) {
+            LOGGER.warn("CIP Encapsulation not supported by remote, payload encapsulation must be handled by target and originator");
+        }
+
+        InternalPlcReadRequest request = (InternalPlcReadRequest) msg.getRequest();
+        for (String fieldName : request.getFieldNames()) {
+            PlcField field = request.getField(fieldName);
+
+            // CIP Part
+            EtherNetIpField enipField = (EtherNetIpField) field;
+            EPath.PaddedEPath path = new EPath.PaddedEPath(new LogicalSegment.ClassId(enipField.getObjectNumber()),
+                new LogicalSegment.InstanceId(enipField.getInstanceNumber()),
+                new LogicalSegment.AttributeId(enipField.getAttributeNumber()));
+            GetAttributeSingleService service = new GetAttributeSingleService(path);
+
+            // ENIP Part
+            EnipPacket packet = new EnipPacket(CommandCode.SendRRData, sessionHandle, EnipStatus.EIP_SUCCESS,
+                messageId.getAndIncrement(), new SendRRData(new CpfPacket(
+                new NullAddressItem(),
+                new UnconnectedDataItemRequest(service::encodeRequest)
+            )));
+
+            requestsMap.put(packet.getSenderContext(), msg);
+
+            out.add(packet);
+        }
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Decoding
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    @SuppressWarnings("unchecked")
+    @Override
+    protected void decode(ChannelHandlerContext ctx, EnipPacket msg, List<Object> out) {
+        LOGGER.trace("(-->IN): {}, {}, {}", ctx, msg, out);
+        LOGGER.debug("{}: session handle: {}, sender context: {}, EtherNetIPPacket:{}", msg, msg.getSessionHandle(), msg.getSenderContext(), msg);
+
+        EnipPacket packet = null;
+        switch (msg.getCommandCode()) {
+            case RegisterSession:
+                handleRegisterSession(ctx, msg);
+
+                // Now try getting some detailed information about the remote.
+                packet = new EnipPacket(CommandCode.ListIdentity, sessionHandle, EnipStatus.EIP_SUCCESS,
+                    messageId.getAndIncrement(), new ListIdentity());
+                break;
+
+            case UnRegisterSession:
+                handleUnregisterSession(ctx, msg);
+
+                // Spec: The receiver shall initiate a close of the underlying
+                // TCP/IP connection when it receives this command.
+                ctx.channel().disconnect();
+                break;
+
+            case ListIdentity:
+                handleListIdentity(ctx, msg);
+
+                // Now try listing the services the remote has to offer.
+                packet = new EnipPacket(CommandCode.ListServices, sessionHandle, EnipStatus.EIP_SUCCESS,
+                    messageId.getAndIncrement(), new ListServices());
+                break;
+
+            case ListInterfaces:
+                handleListInterfaces(ctx, msg);
+
+                // Here we're done connecting.
+                ctx.channel().pipeline().fireUserEventTriggered(new ConnectedEvent());
+                break;
+
+            case ListServices:
+                handleListServices(ctx, msg);
+
+                // Now try listing the interfaces the remote has to offer.
+                packet = new EnipPacket(CommandCode.ListInterfaces, sessionHandle, EnipStatus.EIP_SUCCESS,
+                    messageId.getAndIncrement(), new ListInterfaces());
+                break;
+
+            case Nop:
+                handleNop(ctx, msg);
+                break;
+
+            case SendRRData:
+                handleSendRRDataResponse(ctx, msg);
+                break;
+
+            case SendUnitData:
+                // This might be where the connected data is sent (eventually publish/subscribe communication)
+                break;
+        }
+
+        if (packet != null) {
+            ctx.channel().writeAndFlush(packet);
+        }
+    }
+
+    /**
+     * In order to do explicit connected messaging, the client has to register a session with the server.
+     * In case of a successful session registration the response will contain the sessionHandle, which is
+     * required to be used in all subsequent connected interactions.
+     *
+     * @param ctx the {@link ChannelHandlerContext} instance.
+     * @param msg the packet received from the server.
+     */
+    private void handleRegisterSession(ChannelHandlerContext ctx, EnipPacket msg) {
+        if (msg.getStatus() == EnipStatus.EIP_SUCCESS) {
+            sessionHandle = msg.getSessionHandle();
+
+            LOGGER.info("EtherNet/IP session registered session-handle {}", sessionHandle);
+        } else {
+            ctx.channel().pipeline().fireExceptionCaught(new PlcProtocolException("Got a non-success response."));
+        }
+    }
+
+    /**
+     * As connected operations allocate resources on the server and the client, when receiving a
+     * {@link UnRegisterSession} message (request or response) the locally allocated resources have
+     * to be released again. As the correct response to a UnRegisterSession is the closing of the
+     * connection by the receiving side, this incoming command must be a request sent from the
+     * server.
+     *
+     * @param ctx the {@link ChannelHandlerContext} instance.
+     * @param msg the packet received from the server.
+     */
+    private void handleUnregisterSession(ChannelHandlerContext ctx, EnipPacket msg) {
+        if (msg.getStatus() == EnipStatus.EIP_SUCCESS) {
+            // Reset all internal variables.
+            identityItem = null;
+            supportsCipEncapsulation = false;
+            supportsClass0Or1UdpConnections = false;
+            nonCipInterfaces = null;
+            fieldConnectionMap = null;
+        } else {
+            ctx.channel().pipeline().fireExceptionCaught(new PlcProtocolException("Got a non-success response."));
+        }
+    }
+
+    /**
+     * The response to a {@link ListIdentity} command contains a lot of information about the
+     * remote counterpart. In this case we just save this information for further usage.
+     *
+     * @param ctx the {@link ChannelHandlerContext} instance.
+     * @param msg the packet received from the server.
+     */
+    private void handleListIdentity(ChannelHandlerContext ctx, EnipPacket msg) {
+        if (msg.getStatus() == EnipStatus.EIP_SUCCESS) {
+            ListIdentity listIdentityResponse = (ListIdentity) msg.getCommand();
+            if (listIdentityResponse != null) {
+                identityItem = listIdentityResponse.getIdentity().orElse(null);
+                if (identityItem != null) {
+                    LOGGER.info("Connected to: \n - product name: {} \n - serial number: {} ",
+                        identityItem.getProductName().trim(), identityItem.getSerialNumber());
+                }
+            } else {
+                identityItem = null;
+            }
+        } else {
+            ctx.channel().pipeline().fireExceptionCaught(new PlcProtocolException("Got a non-success response."));
+        }
+    }
+
+    /**
+     * Some times EtherNet/IP devices support other devices than the default one.
+     * As we are required to ev eventually reference these interfaces, build a map
+     * of all the devices the remote supports. This way we can check the validity
+     * before actually sending a request.
+     *
+     * @param ctx the {@link ChannelHandlerContext} instance.
+     * @param msg the packet received from the server.
+     */
+    private void handleListInterfaces(ChannelHandlerContext ctx, EnipPacket msg) {
+        if (msg.getStatus() == EnipStatus.EIP_SUCCESS) {
+            ListInterfaces listInterfaces = (ListInterfaces) msg.getCommand();
+            if (listInterfaces != null) {
+                // If the device supports non-CIP interfaces, this array is not empty.
+                // In this case build a map so we can access the information when sending
+                // data in RR-Requests (Request-Response).
+                if (listInterfaces.getInterfaces().length > 0) {
+                    nonCipInterfaces = new HashMap<>();
+                    for (ListInterfaces.InterfaceInformation interfaceInformation : listInterfaces.getInterfaces()) {
+                        String interfaceName = new String(
+                            interfaceInformation.getData(), Charset.forName("US-ASCII")).trim();
+                        nonCipInterfaces.put(interfaceName, interfaceInformation.hashCode());
+                    }
+                } else {
+                    nonCipInterfaces = null;
+                }
+            }
+        } else {
+            ctx.channel().pipeline().fireExceptionCaught(new PlcProtocolException("Got a non-success response."));
+        }
+    }
+
+    /**
+     * Each EtherNet/IP device can support one or more so-called `services`. At least the `Communications`
+     * service is required to be supported by every EtherNet/IP compliant device. This is used for default
+     * IO operations. Usually vendors support custom services which are adjusted to their particular needs,
+     * which might be able to provide better performance than the default. In this case we are ignoring all
+     * these as supporting these would require custom adapters on the PLC4X side. However we do inspect the
+     * capabilities of the `Communications` service to check if encapsulation of CIP data is supported and
+     * if we are able to do connected implicit communication via a parallel UDP channel.
+     *
+     * @param ctx the {@link ChannelHandlerContext} instance.
+     * @param msg the packet received from the server.
+     */
+    private void handleListServices(ChannelHandlerContext ctx, EnipPacket msg) {
+        if (msg.getStatus() == EnipStatus.EIP_SUCCESS) {
+            ListServices listServices = (ListServices) msg.getCommand();
+            if (listServices != null) {
+                for (ListServices.ServiceInformation service : listServices.getServices()) {
+                    // Check if the type code matches the communications service and if bit 5 of the
+                    // capability flags is set.
+                    if (service.getTypeCode() == SERVICE_COMMUNICATIONS_TYPE_CODE) {
+                        supportsCipEncapsulation = (service.getCapabilityFlags() & 32) != 0;
+                        supportsClass0Or1UdpConnections = (service.getCapabilityFlags() & 256) != 0;
+                    }
+                }
+            } else {
+                supportsCipEncapsulation = false;
+                supportsClass0Or1UdpConnections = false;
+            }
+        } else {
+            ctx.channel().pipeline().fireExceptionCaught(new PlcProtocolException("Got a non-success response."));
+        }
+    }
+
+    /**
+     * NOP request/responses are simple no-payload messages used to check if a connection is still
+     * available. Depending on if it's a request or reply, we simply send back a NOP Reply or not.
+     * As no reply is to be generated for an incoming NOP command, this must be a NopRequest.
+     *
+     * @param ctx the {@link ChannelHandlerContext} instance.
+     * @param msg the packet received from the server.
+     */
+    private void handleNop(ChannelHandlerContext ctx, EnipPacket msg) {
+        if (msg.getStatus() == EnipStatus.EIP_SUCCESS) {
+            //Nop nop = (Nop) msg.getCommand();
+            // TODO: Reset some sort of timer ...
+        } else {
+            ctx.channel().pipeline().fireExceptionCaught(
+                new PlcProtocolException("Got a non-success flagged request."));
+        }
+    }
+
+    /**
+     * As RR Data is Request Response data and the server will not issue a request to
+     * the client, we can be pretty sure this is a response to a previously issued request.
+     * This contains the actual payload for our requests.
+     *
+     * @param ctx the {@link ChannelHandlerContext} instance.
+     * @param msg the packet received from the server.
+     */
+    private void handleSendRRDataResponse(ChannelHandlerContext ctx, EnipPacket msg) {
+        // This is where the typical request/response stuff is handled.
+        long senderContext = msg.getSenderContext();
+        PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> plcRequestContainer = requestsMap.get(senderContext);
+        if (plcRequestContainer == null) {
+            ctx.channel().pipeline().fireExceptionCaught(
+                new PlcProtocolException("Unrelated payload received for message " + msg));
+            return;
+        }
+
+        if (!(plcRequestContainer.getRequest() instanceof PlcReadRequest)) {
+            ctx.fireExceptionCaught(new PlcProtocolException("Expecting a PlcReadRequest here."));
+            return;
+        }
+        InternalPlcReadRequest request = (InternalPlcReadRequest) plcRequestContainer.getRequest();
+        PlcResponseCode responseCode;
+        if (msg.getStatus() != EnipStatus.EIP_SUCCESS) {
+            responseCode = PlcResponseCode.NOT_FOUND;
+        } else {
+            responseCode = PlcResponseCode.OK;
+        }
+
+        SendRRData sendRRDataCommand = (SendRRData) msg.getCommand();
+        if (sendRRDataCommand == null) {
+            ctx.fireExceptionCaught(new PlcProtocolException("Expecting a SendRRData command here."));
+            return;
+        }
+        CpfItem[] items = sendRRDataCommand.getPacket().getItems();
+        if (items.length != 2) {
+            ctx.fireExceptionCaught(new PlcProtocolException("Expecting 2 items here."));
+            return;
+        }
+        CpfItem payload = items[1];
+        if (!(payload instanceof UnconnectedDataItemResponse)) {
+            ctx.fireExceptionCaught(new PlcProtocolException("Item[1] should be of type UnconnectedDataItemResponse"));
+            return;
+        }
+        UnconnectedDataItemResponse enipResponse = (UnconnectedDataItemResponse) payload;
+        ByteBuf data = enipResponse.getData();
+        if (data.readableBytes() > 0) {
+            Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> values = new HashMap<>();
+            // TODO: This is not quite correct as this will probalby not work when requesting more than one item.
+            for (String fieldName : request.getFieldNames()) {
+                MessageRouterResponse cipResponse = MessageRouterResponse.decode(data);
+                short value;
+                // TODO: This is not quite correct as we assume everything is an integer.
+                if (cipResponse.getData().readableBytes() >= 2) {
+                    value = cipResponse.getData().readShort();
+                } else {
+                    value = -1;
+                }
+                DefaultLongFieldItem fieldItem = new DefaultLongFieldItem((long) value);
+                values.put(fieldName, new ImmutablePair<>(responseCode, fieldItem));
+            }
+            InternalPlcReadResponse response = new DefaultPlcReadResponse(request, values);
+            plcRequestContainer.getResponseFuture().complete(response);
+        }
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////
+    // Encoding helpers.
+    ////////////////////////////////////////////////////////////////////////////////
+
+    ////////////////////////////////////////////////////////////////////////////////
+    // Decoding helpers.
+    ////////////////////////////////////////////////////////////////////////////////
+
+}
diff --git a/plc4j/protocols/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/netty/events/EtherNetIpConnectedEvent.java b/plc4j/protocols/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/netty/events/EtherNetIpConnectedEvent.java
index ec5edf9b6a6..db0d19d840c 100644
--- a/plc4j/protocols/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/netty/events/EtherNetIpConnectedEvent.java
+++ b/plc4j/protocols/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/netty/events/EtherNetIpConnectedEvent.java
@@ -1,22 +1,22 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.ethernetip.netty.events;
-
-public class EtherNetIpConnectedEvent {
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.ethernetip.netty.events;
+
+public class EtherNetIpConnectedEvent {
+}
diff --git a/plc4j/protocols/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/netty/util/EnipPlcFieldHandler.java b/plc4j/protocols/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/netty/util/EnipPlcFieldHandler.java
index bd2fbac228c..70204f8001b 100644
--- a/plc4j/protocols/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/netty/util/EnipPlcFieldHandler.java
+++ b/plc4j/protocols/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/netty/util/EnipPlcFieldHandler.java
@@ -1,110 +1,110 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.ethernetip.netty.util;
-
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.connection.DefaultPlcFieldHandler;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-import org.apache.plc4x.java.ethernetip.model.EtherNetIpField;
-
-public class EnipPlcFieldHandler extends DefaultPlcFieldHandler {
-
-    @Override
-    public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
-        if (EtherNetIpField.matches(fieldQuery)) {
-            return EtherNetIpField.of(fieldQuery);
-        }
-        throw new PlcInvalidFieldException(fieldQuery);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeBoolean(PlcField field, Object[] values) {
-        EtherNetIpField enipField = (EtherNetIpField) field;
-        throw new PlcRuntimeException("Invalid encoder for type " + enipField);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeByte(PlcField field, Object[] values) {
-        EtherNetIpField enipField = (EtherNetIpField) field;
-        throw new PlcRuntimeException("Invalid encoder for type " + enipField);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeShort(PlcField field, Object[] values) {
-        EtherNetIpField enipField = (EtherNetIpField) field;
-        throw new PlcRuntimeException("Invalid encoder for type " + enipField);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeInteger(PlcField field, Object[] values) {
-        EtherNetIpField enipField = (EtherNetIpField) field;
-        throw new PlcRuntimeException("Invalid encoder for type " + enipField);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeBigInteger(PlcField field, Object[] values) {
-        EtherNetIpField enipField = (EtherNetIpField) field;
-        throw new PlcRuntimeException("Invalid encoder for type " + enipField);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeLong(PlcField field, Object[] values) {
-        EtherNetIpField enipField = (EtherNetIpField) field;
-        throw new PlcRuntimeException("Invalid encoder for type " + enipField);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeFloat(PlcField field, Object[] values) {
-        EtherNetIpField enipField = (EtherNetIpField) field;
-        throw new PlcRuntimeException("Invalid encoder for type " + enipField);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeDouble(PlcField field, Object[] values) {
-        EtherNetIpField enipField = (EtherNetIpField) field;
-        throw new PlcRuntimeException("Invalid encoder for type " + enipField);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeString(PlcField field, Object[] values) {
-        EtherNetIpField enipField = (EtherNetIpField) field;
-        throw new PlcRuntimeException("Invalid encoder for type " + enipField);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeTime(PlcField field, Object[] values) {
-        EtherNetIpField enipField = (EtherNetIpField) field;
-        throw new PlcRuntimeException("Invalid encoder for type " + enipField);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeDate(PlcField field, Object[] values) {
-        EtherNetIpField enipField = (EtherNetIpField) field;
-        throw new PlcRuntimeException("Invalid encoder for type " + enipField);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeDateTime(PlcField field, Object[] values) {
-        EtherNetIpField enipField = (EtherNetIpField) field;
-        throw new PlcRuntimeException("Invalid encoder for type " + enipField);
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ethernetip.netty.util;
+
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.connection.DefaultPlcFieldHandler;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+import org.apache.plc4x.java.ethernetip.model.EtherNetIpField;
+
+public class EnipPlcFieldHandler extends DefaultPlcFieldHandler {
+
+    @Override
+    public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
+        if (EtherNetIpField.matches(fieldQuery)) {
+            return EtherNetIpField.of(fieldQuery);
+        }
+        throw new PlcInvalidFieldException(fieldQuery);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeBoolean(PlcField field, Object[] values) {
+        EtherNetIpField enipField = (EtherNetIpField) field;
+        throw new PlcRuntimeException("Invalid encoder for type " + enipField);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeByte(PlcField field, Object[] values) {
+        EtherNetIpField enipField = (EtherNetIpField) field;
+        throw new PlcRuntimeException("Invalid encoder for type " + enipField);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeShort(PlcField field, Object[] values) {
+        EtherNetIpField enipField = (EtherNetIpField) field;
+        throw new PlcRuntimeException("Invalid encoder for type " + enipField);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeInteger(PlcField field, Object[] values) {
+        EtherNetIpField enipField = (EtherNetIpField) field;
+        throw new PlcRuntimeException("Invalid encoder for type " + enipField);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeBigInteger(PlcField field, Object[] values) {
+        EtherNetIpField enipField = (EtherNetIpField) field;
+        throw new PlcRuntimeException("Invalid encoder for type " + enipField);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeLong(PlcField field, Object[] values) {
+        EtherNetIpField enipField = (EtherNetIpField) field;
+        throw new PlcRuntimeException("Invalid encoder for type " + enipField);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeFloat(PlcField field, Object[] values) {
+        EtherNetIpField enipField = (EtherNetIpField) field;
+        throw new PlcRuntimeException("Invalid encoder for type " + enipField);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDouble(PlcField field, Object[] values) {
+        EtherNetIpField enipField = (EtherNetIpField) field;
+        throw new PlcRuntimeException("Invalid encoder for type " + enipField);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeString(PlcField field, Object[] values) {
+        EtherNetIpField enipField = (EtherNetIpField) field;
+        throw new PlcRuntimeException("Invalid encoder for type " + enipField);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeTime(PlcField field, Object[] values) {
+        EtherNetIpField enipField = (EtherNetIpField) field;
+        throw new PlcRuntimeException("Invalid encoder for type " + enipField);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDate(PlcField field, Object[] values) {
+        EtherNetIpField enipField = (EtherNetIpField) field;
+        throw new PlcRuntimeException("Invalid encoder for type " + enipField);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDateTime(PlcField field, Object[] values) {
+        EtherNetIpField enipField = (EtherNetIpField) field;
+        throw new PlcRuntimeException("Invalid encoder for type " + enipField);
+    }
+
+}
diff --git a/plc4j/protocols/ethernet-ip/src/site/asciidoc/index.adoc b/plc4j/protocols/ethernet-ip/src/site/asciidoc/index.adoc
index a8155f49ef1..14b5703699b 100644
--- a/plc4j/protocols/ethernet-ip/src/site/asciidoc/index.adoc
+++ b/plc4j/protocols/ethernet-ip/src/site/asciidoc/index.adoc
@@ -1,80 +1,80 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== EtherNet/IP
-
-`IP` in `EtherNet/IP` does not relate to the `Internet Protocol` but to `Industrial Protocol`, so EtherNet/IP does not necessarily have to go over `IP` but can be implemented on `ethernet frames`.
-This driver however will utilize `EtherNet/IP` based on `TCP` and `UDP`.
-
-EIP (the short form of: EtherNet/IP) generally supports two types of communication:
-
-- `Explicit messaging`: Read explicitly addressed information (Pull) (CIP Class 3 and 2)
-- `Implicit messaging`: Read information distributed by the device configuration (Push) (CIP Class 1 and 0)
-
-TCP transport is used for Explicit Messaging
-UDP transport is used for Implicit Messaging ("Real time" I/O)
-
-In Explicit Messaging (classic Request/Response) there are two different types of access:
-
-- Connected access: A handle 'connectionId' is assigned to an address and this is used to access the resource
-- Unconnected access: No handle is used and the address has to be sent with every request
-
-We'll concentrate on the connected access.
-
-In all cases the payload of the data items is dependent on the encapsulated protocol used.
-In our case we'll concentrate on the default CIP format.
-
-Explicitly addressed object consists of the following data:
-
-- Object-Number
-- Instance-Number
-- Attribute-Number
-
-The format we have decided to use is: `#{objectId}#{instanceId}#{attributeId}`.
-
-Here is the location of the Spec:
-https://www.odva.org/Portals/0/Library/Publications_Numbered/PUB00123R1_Common-Industrial_Protocol_and_Family_of_CIP_Networks.pdf
-
-As EtherNet/IP is used to encapsulate CIP traffic, this spec contains a chapter on the adaption of CIP for EtherNet/IP.
-
-Another documentation I found discussing the explicit messaging thing a little better is this:
-http://www.deltamotion.com/support/webhelp/rmctools/Communications/Ethernet/Supported_Protocols/EtherNetIP/EtherNet_IP_Explicit_Messaging.htm
-https://www.odva.org/Portals/0/Library/Publications_Numbered/PUB00213R0_EtherNetIP_Developers_Guide.pdf
-http://www.technologyuk.net/telecommunications/industrial-networks/cip.shtml
-
-=== Reading
-
-When reading values in a request/response type of communication (explicit), there are two options:
-
-- Unconnected access: Ideal when requesting information irregularly and not frequently. Less performant.
-- Connected access: Ideal when regularly requesting information. Higher performance, but requires multiple phases.
-
-We will concentrate on explicit connected access.
-
-In order to read/write values using connected access, first we have to get a connectionId for the resource we want to access.
-In subsequent read/write operations, we don't have to provide the field, but just provide the connection id and the server will already know what we want to access.
-
-Getting the connection id, is performed by sending an unconnected request to the server referencing the `Forward Open Service`.
-This will register the connection in the Server and this will stay alive until the session is terminated.
-So we have to make sure a session is created before using this service.
-
-Part of this request is a parameter `vendor id`.
-It turns out that this id has to be purchased from the ODVA organization.
-
-https://secure.odva.org/forms/spec-vendor-id-order-form.htm
-
+//
+//  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
+//
+//      http://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.
+//
+
+== EtherNet/IP
+
+`IP` in `EtherNet/IP` does not relate to the `Internet Protocol` but to `Industrial Protocol`, so EtherNet/IP does not necessarily have to go over `IP` but can be implemented on `ethernet frames`.
+This driver however will utilize `EtherNet/IP` based on `TCP` and `UDP`.
+
+EIP (the short form of: EtherNet/IP) generally supports two types of communication:
+
+- `Explicit messaging`: Read explicitly addressed information (Pull) (CIP Class 3 and 2)
+- `Implicit messaging`: Read information distributed by the device configuration (Push) (CIP Class 1 and 0)
+
+TCP transport is used for Explicit Messaging
+UDP transport is used for Implicit Messaging ("Real time" I/O)
+
+In Explicit Messaging (classic Request/Response) there are two different types of access:
+
+- Connected access: A handle 'connectionId' is assigned to an address and this is used to access the resource
+- Unconnected access: No handle is used and the address has to be sent with every request
+
+We'll concentrate on the connected access.
+
+In all cases the payload of the data items is dependent on the encapsulated protocol used.
+In our case we'll concentrate on the default CIP format.
+
+Explicitly addressed object consists of the following data:
+
+- Object-Number
+- Instance-Number
+- Attribute-Number
+
+The format we have decided to use is: `#{objectId}#{instanceId}#{attributeId}`.
+
+Here is the location of the Spec:
+https://www.odva.org/Portals/0/Library/Publications_Numbered/PUB00123R1_Common-Industrial_Protocol_and_Family_of_CIP_Networks.pdf
+
+As EtherNet/IP is used to encapsulate CIP traffic, this spec contains a chapter on the adaption of CIP for EtherNet/IP.
+
+Another documentation I found discussing the explicit messaging thing a little better is this:
+http://www.deltamotion.com/support/webhelp/rmctools/Communications/Ethernet/Supported_Protocols/EtherNetIP/EtherNet_IP_Explicit_Messaging.htm
+https://www.odva.org/Portals/0/Library/Publications_Numbered/PUB00213R0_EtherNetIP_Developers_Guide.pdf
+http://www.technologyuk.net/telecommunications/industrial-networks/cip.shtml
+
+=== Reading
+
+When reading values in a request/response type of communication (explicit), there are two options:
+
+- Unconnected access: Ideal when requesting information irregularly and not frequently. Less performant.
+- Connected access: Ideal when regularly requesting information. Higher performance, but requires multiple phases.
+
+We will concentrate on explicit connected access.
+
+In order to read/write values using connected access, first we have to get a connectionId for the resource we want to access.
+In subsequent read/write operations, we don't have to provide the field, but just provide the connection id and the server will already know what we want to access.
+
+Getting the connection id, is performed by sending an unconnected request to the server referencing the `Forward Open Service`.
+This will register the connection in the Server and this will stay alive until the session is terminated.
+So we have to make sure a session is created before using this service.
+
+Part of this request is a parameter `vendor id`.
+It turns out that this id has to be purchased from the ODVA organization.
+
+https://secure.odva.org/forms/spec-vendor-id-order-form.htm
+
 But probably we can live without a valid and registered id.
\ No newline at end of file
diff --git a/plc4j/protocols/iso-on-tcp/pom.xml b/plc4j/protocols/iso-on-tcp/pom.xml
index 1c4aa4f9cbd..c9c99c335a1 100644
--- a/plc4j/protocols/iso-on-tcp/pom.xml
+++ b/plc4j/protocols/iso-on-tcp/pom.xml
@@ -1,75 +1,75 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-protocols</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-protocol-iso-on-tcp</artifactId>
-  <name>PLC4J: Protocol: ISO on TCP</name>
-  <description>Implementation of the ISO on TCP protocol layer.</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-buffer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-utils-test-utils</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-protocols</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-protocol-iso-on-tcp</artifactId>
+  <name>PLC4J: Protocol: ISO on TCP</name>
+  <description>Implementation of the ISO on TCP protocol layer.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-utils-test-utils</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/protocols/iso-on-tcp/src/main/java/org/apache/plc4x/java/isoontcp/protocol/IsoOnTcpProtocol.java b/plc4j/protocols/iso-on-tcp/src/main/java/org/apache/plc4x/java/isoontcp/protocol/IsoOnTcpProtocol.java
index 99ab801c837..5c167a84d8b 100644
--- a/plc4j/protocols/iso-on-tcp/src/main/java/org/apache/plc4x/java/isoontcp/protocol/IsoOnTcpProtocol.java
+++ b/plc4j/protocols/iso-on-tcp/src/main/java/org/apache/plc4x/java/isoontcp/protocol/IsoOnTcpProtocol.java
@@ -1,119 +1,126 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.isoontcp.protocol;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufUtil;
-import io.netty.channel.ChannelHandlerContext;
-import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
-import org.apache.plc4x.java.base.PlcByteToMessageCodec;
-import org.apache.plc4x.java.isoontcp.protocol.model.IsoOnTcpMessage;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-
-public class IsoOnTcpProtocol extends PlcByteToMessageCodec<IsoOnTcpMessage> {
-
-    static final byte ISO_ON_TCP_MAGIC_NUMBER = 0x03;
-
-    private static final Logger logger = LoggerFactory.getLogger(IsoOnTcpProtocol.class);
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Encoding
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    @Override
-    protected void encode(ChannelHandlerContext ctx, IsoOnTcpMessage in, ByteBuf out) throws Exception {
-        logger.debug("ISO on TCP Message sent");
-        // At this point of processing all higher levels have already serialized their payload.
-        // This data is passed to the lower levels in form of an IoBuffer.
-        final ByteBuf userData = in.getUserData();
-
-        int packetSize = userData.readableBytes() + 4;
-
-        // Version (is always constant 0x03)
-        out.writeByte(ISO_ON_TCP_MAGIC_NUMBER);
-        // Reserved (is always constant 0x00)
-        out.writeByte((byte) 0x00);
-        // Packet length (including ISOonTCP header)
-        // ("remaining" returns the number of bytes left to read in this buffer.
-        // It is usually set to a read position of 0 and a limit at the end.
-        // So in general remaining is equivalent to a non-existing
-        // "userData.size()" method.)
-        out.writeShort((short) packetSize);
-
-        // Output the payload.
-        out.writeBytes(userData);
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Decoding
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    @Override
-    protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
-        if(logger.isTraceEnabled()) {
-            logger.trace("Got Data: {}", ByteBufUtil.hexDump(in));
-        }
-        // If at least 4 bytes are readable, peek into them (without changing the read position)
-        // and get the packet length. Only if the available amount of readable bytes is larger or
-        // equal to this, continue processing the rest.
-        /*if(chunkedResponse != null) {
-            chunkedResponse.writeBytes(in);
-        } else*/ if(in.readableBytes() >= 4) {
-            logger.debug("ISO on TCP Message received");
-            // The ISO on TCP protocol is really simple and in this case the buffer length
-            // will take care of the higher levels not reading more than is in the packet.
-            // So we just gobble up the header and continue reading in higher levels.
-            if (in.getByte(0) != ISO_ON_TCP_MAGIC_NUMBER) {
-                logger.warn("Expecting ISO on TCP magic number: {}", ISO_ON_TCP_MAGIC_NUMBER);
-                if (logger.isDebugEnabled()) {
-                    logger.debug("Got Data: {}", ByteBufUtil.hexDump(in));
-                }
-                // Gobble up any garbage that might be still in the buffer until the buffer is
-                // empty or we reach the potential start of the next ISO on TCP packet.
-                while ((in.readableBytes() > 0) && (in.getByte(0) != ISO_ON_TCP_MAGIC_NUMBER)) {
-                    // Read and hereby remove the invalid byte.
-                    in.readByte();
-                }
-                // If there was nothing left, just give up.
-                if(in.readableBytes() == 0) {
-                    return;
-                }
-                exceptionCaught(ctx, new PlcProtocolException(
-                    String.format("Expecting ISO on TCP magic number: %02X", ISO_ON_TCP_MAGIC_NUMBER)));
-                return;
-            }
-            // Byte 1 is a reserved byte set to 0x00
-            short packetLength = in.getShort(2);
-            if(in.readableBytes() >= packetLength) {
-                // Skip the 4 bytes we peeked into manually.
-                in.skipBytes(4);
-                // Simply place the current buffer to the output ... the next handler will continue.
-                ByteBuf payload = in.readBytes(packetLength - 4);
-                out.add(new IsoOnTcpMessage(payload));
-            /*} else {
-                chunkedResponse = Unpooled.buffer(packetLength);
-                chunkedResponse.writeBytes(in, packetLength);*/
-            }
-        }
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.isoontcp.protocol;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.channel.ChannelHandlerContext;
+import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
+import org.apache.plc4x.java.base.PlcByteToMessageCodec;
+import org.apache.plc4x.java.isoontcp.protocol.model.IsoOnTcpMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+public class IsoOnTcpProtocol extends PlcByteToMessageCodec<IsoOnTcpMessage> {
+
+    static final byte ISO_ON_TCP_MAGIC_NUMBER = 0x03;
+
+    private static final Logger logger = LoggerFactory.getLogger(IsoOnTcpProtocol.class);
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Encoding
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+        logger.info("IsoOnTcpProtocol event: " + evt.getClass().getName());       
+        super.userEventTriggered(ctx, evt);
+    }
+
+    @Override
+    protected void encode(ChannelHandlerContext ctx, IsoOnTcpMessage in, ByteBuf out) throws Exception {
+        logger.info("ISO on TCP Message sent");
+        // At this point of processing all higher levels have already serialized their payload.
+        // This data is passed to the lower levels in form of an IoBuffer.
+        final ByteBuf userData = in.getUserData();
+
+        int packetSize = userData.readableBytes() + 4;
+
+        // Version (is always constant 0x03)
+        out.writeByte(ISO_ON_TCP_MAGIC_NUMBER);
+        // Reserved (is always constant 0x00)
+        out.writeByte((byte) 0x00);
+        // Packet length (including ISOonTCP header)
+        // ("remaining" returns the number of bytes left to read in this buffer.
+        // It is usually set to a read position of 0 and a limit at the end.
+        // So in general remaining is equivalent to a non-existing
+        // "userData.size()" method.)
+        out.writeShort((short) packetSize);
+
+        // Output the payload.
+        out.writeBytes(userData);
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Decoding
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
+        logger.info("ISO TCP Message received\r\n" + ByteBufUtil.hexDump(in));
+        if(logger.isTraceEnabled()) {
+            logger.trace("Got Data: {}", ByteBufUtil.hexDump(in));
+        }
+        // If at least 4 bytes are readable, peek into them (without changing the read position)
+        // and get the packet length. Only if the available amount of readable bytes is larger or
+        // equal to this, continue processing the rest.
+        /*if(chunkedResponse != null) {
+            chunkedResponse.writeBytes(in);
+        } else*/ if(in.readableBytes() >= 4) {
+            logger.debug("ISO on TCP Message received");
+            // The ISO on TCP protocol is really simple and in this case the buffer length
+            // will take care of the higher levels not reading more than is in the packet.
+            // So we just gobble up the header and continue reading in higher levels.
+            if (in.getByte(0) != ISO_ON_TCP_MAGIC_NUMBER) {
+                logger.warn("Expecting ISO on TCP magic number: {}", ISO_ON_TCP_MAGIC_NUMBER);
+                if (logger.isDebugEnabled()) {
+                    logger.debug("Got Data: {}", ByteBufUtil.hexDump(in));
+                }
+                // Gobble up any garbage that might be still in the buffer until the buffer is
+                // empty or we reach the potential start of the next ISO on TCP packet.
+                while ((in.readableBytes() > 0) && (in.getByte(0) != ISO_ON_TCP_MAGIC_NUMBER)) {
+                    // Read and hereby remove the invalid byte.
+                    in.readByte();
+                }
+                // If there was nothing left, just give up.
+                if(in.readableBytes() == 0) {
+                    return;
+                }
+                exceptionCaught(ctx, new PlcProtocolException(
+                    String.format("Expecting ISO on TCP magic number: %02X", ISO_ON_TCP_MAGIC_NUMBER)));
+                return;
+            }
+            // Byte 1 is a reserved byte set to 0x00
+            short packetLength = in.getShort(2);
+            if(in.readableBytes() >= packetLength) {
+                // Skip the 4 bytes we peeked into manually.
+                in.skipBytes(4);
+                // Simply place the current buffer to the output ... the next handler will continue.
+                ByteBuf payload = in.readBytes(packetLength - 4);
+                out.add(new IsoOnTcpMessage(payload));
+            /*} else {
+                chunkedResponse = Unpooled.buffer(packetLength);
+                chunkedResponse.writeBytes(in, packetLength);*/
+            }
+        }
+    }
+
+}
diff --git a/plc4j/protocols/iso-on-tcp/src/main/java/org/apache/plc4x/java/isoontcp/protocol/model/IsoOnTcpMessage.java b/plc4j/protocols/iso-on-tcp/src/main/java/org/apache/plc4x/java/isoontcp/protocol/model/IsoOnTcpMessage.java
index 1500d809a72..ea8da7c4218 100644
--- a/plc4j/protocols/iso-on-tcp/src/main/java/org/apache/plc4x/java/isoontcp/protocol/model/IsoOnTcpMessage.java
+++ b/plc4j/protocols/iso-on-tcp/src/main/java/org/apache/plc4x/java/isoontcp/protocol/model/IsoOnTcpMessage.java
@@ -1,30 +1,30 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.isoontcp.protocol.model;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.base.messages.PlcRawMessage;
-
-public class IsoOnTcpMessage extends PlcRawMessage {
-
-    public IsoOnTcpMessage(ByteBuf userData) {
-        super(userData);
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.isoontcp.protocol.model;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.base.messages.PlcRawMessage;
+
+public class IsoOnTcpMessage extends PlcRawMessage {
+
+    public IsoOnTcpMessage(ByteBuf userData) {
+        super(userData);
+    }
+
+}
diff --git a/plc4j/protocols/iso-on-tcp/src/test/java/org/apache/plc4x/java/isoontcp/protocol/IsoOnTcpProtocolTest.java b/plc4j/protocols/iso-on-tcp/src/test/java/org/apache/plc4x/java/isoontcp/protocol/IsoOnTcpProtocolTest.java
index 8b158e40eba..89a334ae49b 100644
--- a/plc4j/protocols/iso-on-tcp/src/test/java/org/apache/plc4x/java/isoontcp/protocol/IsoOnTcpProtocolTest.java
+++ b/plc4j/protocols/iso-on-tcp/src/test/java/org/apache/plc4x/java/isoontcp/protocol/IsoOnTcpProtocolTest.java
@@ -1,169 +1,169 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.isoontcp.protocol;
-
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.Logger;
-import ch.qos.logback.classic.spi.LoggingEvent;
-import ch.qos.logback.core.Appender;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.embedded.EmbeddedChannel;
-import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
-import org.apache.plc4x.java.isoontcp.protocol.model.IsoOnTcpMessage;
-import org.apache.plc4x.test.FastTests;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.slf4j.LoggerFactory;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.hamcrest.core.IsNull.nullValue;
-import static org.hamcrest.core.StringContains.containsString;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.*;
-
-
-public class IsoOnTcpProtocolTest {
-
-    @Test
-    @Category(FastTests.class)
-    public void encode() {
-        IsoOnTcpMessage isoOnTcpMessage = new IsoOnTcpMessage(
-            Unpooled.wrappedBuffer(new byte[]{(byte) 0x01, (byte) 0x02, (byte) 0x03}));
-        EmbeddedChannel channel = new EmbeddedChannel(new IsoOnTcpProtocol());
-        channel.writeOutbound(isoOnTcpMessage);
-        channel.checkException();
-        Object obj = channel.readOutbound();
-        assertThat(obj, instanceOf(ByteBuf.class));
-        ByteBuf byteBuf = (ByteBuf) obj;
-        assertThat("The TCP on ISO Header should add 4 bytes to the data sent", byteBuf.readableBytes(), equalTo(4 + 3));
-        assertThat(byteBuf.getByte(0), equalTo(IsoOnTcpProtocol.ISO_ON_TCP_MAGIC_NUMBER) );
-        assertThat("The length value in the packet should reflect the size of the entire data being sent", byteBuf.getShort(2), equalTo((short) (4 + 3)) );
-    }
-
-    /**
-     * Happy path test.
-     */
-    @Test
-    @Category(FastTests.class)
-    public void decode() {
-        EmbeddedChannel channel = new EmbeddedChannel(new IsoOnTcpProtocol());
-        channel.writeInbound(Unpooled.wrappedBuffer(new byte[]{IsoOnTcpProtocol.ISO_ON_TCP_MAGIC_NUMBER,
-            (byte) 0x00, (byte) 0x00, (byte) 0x0D,
-            (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04, (byte) 0x05, (byte) 0x06, (byte) 0x07, (byte) 0x08, (byte) 0x09}));
-        channel.checkException();
-        Object obj = channel.readInbound();
-        assertThat(obj, instanceOf(IsoOnTcpMessage.class));
-        IsoOnTcpMessage isoOnTcpMessage = (IsoOnTcpMessage) obj;
-        assertThat(isoOnTcpMessage.getUserData(), notNullValue());
-        assertThat(isoOnTcpMessage.getUserData().readableBytes(), equalTo(9) );
-    }
-
-    /**
-     * If the packet doesn't start with the ISO on TCP magic byte 0x03
-     * an exception should be thrown.
-     */
-    @Test
-    @Category(FastTests.class)
-    public void decodeWrongMagicByte() {
-        try {
-            EmbeddedChannel channel = new EmbeddedChannel(new IsoOnTcpProtocol());
-            // TODO: Check this is done the same way as in the rest of the project
-
-            channel.writeInbound(Unpooled.wrappedBuffer(new byte[]{0x12,
-                (byte) 0x00, (byte) 0x00, (byte) 0x0D,
-                (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04, (byte) 0x05, (byte) 0x06, (byte) 0x07, (byte) 0x08, (byte) 0x09}));
-        } catch( Throwable throwable )
-        {
-            assertThat(throwable.getMessage(), containsString("ISO on TCP magic number") );
-            assertThat(throwable, instanceOf(PlcProtocolException.class) );
-        }
-    }
-
-    /**
-     * If the available amount of data is so small we can't even find out how big
-     * the entire package should be, nothing should be read.
-     */
-    @Test
-    @Category(FastTests.class)
-    public void decodeWayTooShort() {
-        EmbeddedChannel channel = new EmbeddedChannel(new IsoOnTcpProtocol());
-        channel.writeInbound(Unpooled.wrappedBuffer(new byte[]{IsoOnTcpProtocol.ISO_ON_TCP_MAGIC_NUMBER,
-            (byte) 0x00, (byte) 0x00, (byte) 0x0D}));
-        channel.checkException();
-        Object obj = channel.readInbound();
-        assertThat(obj, nullValue() );
-    }
-
-    /**
-     * If the available amount of data is smaller than what the packet size says
-     * it should be, nothing should be read.
-     */
-    @Test
-    @Category(FastTests.class)
-    public void decodeTooShort() {
-        EmbeddedChannel channel = new EmbeddedChannel(new IsoOnTcpProtocol());
-        channel.writeInbound(Unpooled.wrappedBuffer(new byte[]{IsoOnTcpProtocol.ISO_ON_TCP_MAGIC_NUMBER,
-            (byte) 0x00, (byte) 0x00, (byte) 0x0D,
-            (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04, (byte) 0x05, (byte) 0x06, (byte) 0x07, (byte) 0x08}));
-        channel.checkException();
-        Object obj = channel.readInbound();
-        assertThat(obj, nullValue() );
-    }
-
-    /**
-     * If logging is set to `DEBUG` then a hexdump of the entire captured packet
-     * should be logged
-     */
-    @Test
-    @Category(FastTests.class)
-    public void decodeLogPacketIfTraceLogging() {
-        // Setup the mock logger.
-        Logger root = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
-        Appender mockAppender = mock(Appender.class);
-        when(mockAppender.getName()).thenReturn("MOCK");
-        root.addAppender(mockAppender);
-        // Save the current default logging level
-        Level defaultLevel = root.getLevel();
-        try {
-            // Change the logging to TRACE.
-            root.setLevel(Level.TRACE);
-
-            // Do some deserialization
-            EmbeddedChannel channel = new EmbeddedChannel(new IsoOnTcpProtocol());
-            channel.writeInbound(Unpooled.wrappedBuffer(new byte[]{IsoOnTcpProtocol.ISO_ON_TCP_MAGIC_NUMBER,
-                (byte) 0x00, (byte) 0x00, (byte) 0x0D,
-                (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04, (byte) 0x05, (byte) 0x06, (byte) 0x07, (byte) 0x08, (byte) 0x09}));
-            channel.checkException();
-            Object obj = channel.readInbound();
-            assertThat(obj, notNullValue());
-
-            // Check that the packet dump was logged.
-            verify(mockAppender).doAppend(argThat(argument ->
-                ((LoggingEvent) argument).getFormattedMessage().contains("Got Data: 0300000d010203040506070809")));
-        } finally {
-            // Reset the log level to the default.
-            root.setLevel(defaultLevel);
-        }
-    }
-
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.isoontcp.protocol;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.LoggingEvent;
+import ch.qos.logback.core.Appender;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.embedded.EmbeddedChannel;
+import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
+import org.apache.plc4x.java.isoontcp.protocol.model.IsoOnTcpMessage;
+import org.apache.plc4x.test.FastTests;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.slf4j.LoggerFactory;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.core.IsInstanceOf.instanceOf;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.hamcrest.core.IsNull.nullValue;
+import static org.hamcrest.core.StringContains.containsString;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.*;
+
+
+public class IsoOnTcpProtocolTest {
+
+    @Test
+    @Category(FastTests.class)
+    public void encode() {
+        IsoOnTcpMessage isoOnTcpMessage = new IsoOnTcpMessage(
+            Unpooled.wrappedBuffer(new byte[]{(byte) 0x01, (byte) 0x02, (byte) 0x03}));
+        EmbeddedChannel channel = new EmbeddedChannel(new IsoOnTcpProtocol());
+        channel.writeOutbound(isoOnTcpMessage);
+        channel.checkException();
+        Object obj = channel.readOutbound();
+        assertThat(obj, instanceOf(ByteBuf.class));
+        ByteBuf byteBuf = (ByteBuf) obj;
+        assertThat("The TCP on ISO Header should add 4 bytes to the data sent", byteBuf.readableBytes(), equalTo(4 + 3));
+        assertThat(byteBuf.getByte(0), equalTo(IsoOnTcpProtocol.ISO_ON_TCP_MAGIC_NUMBER) );
+        assertThat("The length value in the packet should reflect the size of the entire data being sent", byteBuf.getShort(2), equalTo((short) (4 + 3)) );
+    }
+
+    /**
+     * Happy path test.
+     */
+    @Test
+    @Category(FastTests.class)
+    public void decode() {
+        EmbeddedChannel channel = new EmbeddedChannel(new IsoOnTcpProtocol());
+        channel.writeInbound(Unpooled.wrappedBuffer(new byte[]{IsoOnTcpProtocol.ISO_ON_TCP_MAGIC_NUMBER,
+            (byte) 0x00, (byte) 0x00, (byte) 0x0D,
+            (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04, (byte) 0x05, (byte) 0x06, (byte) 0x07, (byte) 0x08, (byte) 0x09}));
+        channel.checkException();
+        Object obj = channel.readInbound();
+        assertThat(obj, instanceOf(IsoOnTcpMessage.class));
+        IsoOnTcpMessage isoOnTcpMessage = (IsoOnTcpMessage) obj;
+        assertThat(isoOnTcpMessage.getUserData(), notNullValue());
+        assertThat(isoOnTcpMessage.getUserData().readableBytes(), equalTo(9) );
+    }
+
+    /**
+     * If the packet doesn't start with the ISO on TCP magic byte 0x03
+     * an exception should be thrown.
+     */
+    @Test
+    @Category(FastTests.class)
+    public void decodeWrongMagicByte() {
+        try {
+            EmbeddedChannel channel = new EmbeddedChannel(new IsoOnTcpProtocol());
+            // TODO: Check this is done the same way as in the rest of the project
+
+            channel.writeInbound(Unpooled.wrappedBuffer(new byte[]{0x12,
+                (byte) 0x00, (byte) 0x00, (byte) 0x0D,
+                (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04, (byte) 0x05, (byte) 0x06, (byte) 0x07, (byte) 0x08, (byte) 0x09}));
+        } catch( Throwable throwable )
+        {
+            assertThat(throwable.getMessage(), containsString("ISO on TCP magic number") );
+            assertThat(throwable, instanceOf(PlcProtocolException.class) );
+        }
+    }
+
+    /**
+     * If the available amount of data is so small we can't even find out how big
+     * the entire package should be, nothing should be read.
+     */
+    @Test
+    @Category(FastTests.class)
+    public void decodeWayTooShort() {
+        EmbeddedChannel channel = new EmbeddedChannel(new IsoOnTcpProtocol());
+        channel.writeInbound(Unpooled.wrappedBuffer(new byte[]{IsoOnTcpProtocol.ISO_ON_TCP_MAGIC_NUMBER,
+            (byte) 0x00, (byte) 0x00, (byte) 0x0D}));
+        channel.checkException();
+        Object obj = channel.readInbound();
+        assertThat(obj, nullValue() );
+    }
+
+    /**
+     * If the available amount of data is smaller than what the packet size says
+     * it should be, nothing should be read.
+     */
+    @Test
+    @Category(FastTests.class)
+    public void decodeTooShort() {
+        EmbeddedChannel channel = new EmbeddedChannel(new IsoOnTcpProtocol());
+        channel.writeInbound(Unpooled.wrappedBuffer(new byte[]{IsoOnTcpProtocol.ISO_ON_TCP_MAGIC_NUMBER,
+            (byte) 0x00, (byte) 0x00, (byte) 0x0D,
+            (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04, (byte) 0x05, (byte) 0x06, (byte) 0x07, (byte) 0x08}));
+        channel.checkException();
+        Object obj = channel.readInbound();
+        assertThat(obj, nullValue() );
+    }
+
+    /**
+     * If logging is set to `DEBUG` then a hexdump of the entire captured packet
+     * should be logged
+     */
+    @Test
+    @Category(FastTests.class)
+    public void decodeLogPacketIfTraceLogging() {
+        // Setup the mock logger.
+        Logger root = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
+        Appender mockAppender = mock(Appender.class);
+        when(mockAppender.getName()).thenReturn("MOCK");
+        root.addAppender(mockAppender);
+        // Save the current default logging level
+        Level defaultLevel = root.getLevel();
+        try {
+            // Change the logging to TRACE.
+            root.setLevel(Level.TRACE);
+
+            // Do some deserialization
+            EmbeddedChannel channel = new EmbeddedChannel(new IsoOnTcpProtocol());
+            channel.writeInbound(Unpooled.wrappedBuffer(new byte[]{IsoOnTcpProtocol.ISO_ON_TCP_MAGIC_NUMBER,
+                (byte) 0x00, (byte) 0x00, (byte) 0x0D,
+                (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04, (byte) 0x05, (byte) 0x06, (byte) 0x07, (byte) 0x08, (byte) 0x09}));
+            channel.checkException();
+            Object obj = channel.readInbound();
+            assertThat(obj, notNullValue());
+
+            // Check that the packet dump was logged.
+            verify(mockAppender).doAppend(argThat(argument ->
+                ((LoggingEvent) argument).getFormattedMessage().contains("Got Data: 0300000d010203040506070809")));
+        } finally {
+            // Reset the log level to the default.
+            root.setLevel(defaultLevel);
+        }
+    }
+
+
+}
diff --git a/plc4j/protocols/iso-tp/pom.xml b/plc4j/protocols/iso-tp/pom.xml
index 3f144ded542..ec217425d6f 100644
--- a/plc4j/protocols/iso-tp/pom.xml
+++ b/plc4j/protocols/iso-tp/pom.xml
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-protocols</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-protocol-iso-tp</artifactId>
-  <name>PLC4J: Protocol: ISO TP</name>
-  <description>Implementation of the ISO Transport Protocol layer.</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-iso-on-tcp</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-buffer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-utils-test-utils</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-protocols</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-protocol-iso-tp</artifactId>
+  <name>PLC4J: Protocol: ISO TP</name>
+  <description>Implementation of the ISO Transport Protocol layer.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-iso-on-tcp</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-utils-test-utils</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/IsoTPProtocol.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/IsoTPProtocol.java
index d486a86b55d..4c0abea0970 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/IsoTPProtocol.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/IsoTPProtocol.java
@@ -1,446 +1,446 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.isotp.protocol;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufUtil;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-import org.apache.plc4x.java.api.exceptions.PlcProtocolPayloadTooBigException;
-import org.apache.plc4x.java.base.PlcMessageToMessageCodec;
-import org.apache.plc4x.java.base.events.ConnectEvent;
-import org.apache.plc4x.java.isoontcp.protocol.IsoOnTcpProtocol;
-import org.apache.plc4x.java.isoontcp.protocol.model.IsoOnTcpMessage;
-import org.apache.plc4x.java.isotp.protocol.events.IsoTPConnectedEvent;
-import org.apache.plc4x.java.isotp.protocol.model.IsoTPMessage;
-import org.apache.plc4x.java.isotp.protocol.model.params.*;
-import org.apache.plc4x.java.isotp.protocol.model.tpdus.*;
-import org.apache.plc4x.java.isotp.protocol.model.types.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-
-public class IsoTPProtocol extends PlcMessageToMessageCodec<IsoOnTcpMessage, Tpdu> {
-
-    private static final Logger logger = LoggerFactory.getLogger(IsoTPProtocol.class);
-
-    private short callingTsapId;
-    private short calledTsapId;
-    private TpduSize tpduSize;
-
-    public IsoTPProtocol(short callingTsapId, short calledTsapId, TpduSize tpduSize) {
-        this.callingTsapId = callingTsapId;
-        this.calledTsapId = calledTsapId;
-        this.tpduSize = tpduSize;
-    }
-
-    /**
-     * If the IsoTP protocol is used on top of the ISO on TCP protocol, then as soon as the pipeline receives the
-     * request to connect, an IsoTP connection request TPDU must be sent in order to initialize the connection.
-     *
-     * @param ctx the current protocol layers context
-     * @param evt the event
-     * @throws Exception throws an exception if something goes wrong internally
-     */
-    @Override
-    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
-        ChannelHandler prevHandler = getPrevChannelHandler(ctx);
-
-        // If the connection has just been established, start setting up the connection
-        // by sending a connection request to the plc.
-        if ((prevHandler instanceof IsoOnTcpProtocol) && (evt instanceof ConnectEvent)) {
-            logger.debug("ISO Transport Protocol Sending Connection Request");
-            // Open the session on ISO Transport Protocol first.
-            ConnectionRequestTpdu connectionRequest = new ConnectionRequestTpdu(
-                (short) 0x0000, (short) 0x000F, ProtocolClass.CLASS_0,
-                Arrays.asList(
-                    new CalledTsapParameter(calledTsapId),
-                    new CallingTsapParameter(callingTsapId),
-                    new TpduSizeParameter(tpduSize)),
-                Unpooled.buffer());
-            ctx.channel().writeAndFlush(connectionRequest);
-        } else {
-            super.userEventTriggered(ctx, evt);
-        }
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Encoding
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    @Override
-    protected void encode(ChannelHandlerContext ctx, Tpdu in, List<Object> out) {
-        logger.trace("ISO Transport Protocol Message sent");
-
-        if (in == null) {
-            return;
-        }
-
-        ByteBuf buf = Unpooled.buffer();
-
-        // Header length indicator field (The length byte doesn't count)
-        buf.writeByte((byte) (getHeaderLength(in) - 1));
-        // TPDU Code (First 4 bits), Initial Credit Allocation (Second 4 bits)
-        buf.writeByte(in.getTpduCode().getCode());
-        // The fixed header of a TCP TP Packet depends highly on the selected type.
-        switch (in.getTpduCode()) {
-            case CONNECTION_REQUEST:
-            case CONNECTION_CONFIRM:
-                encodeConnectionTpdu(in, buf);
-                break;
-            case DATA:
-                encodeDataTpdu((DataTpdu) in, buf);
-                break;
-            case DISCONNECT_REQUEST:
-            case DISCONNECT_CONFIRM:
-                encodeDisconnectTpdu(in, buf);
-                break;
-            case TPDU_ERROR:
-                encodeErrorTpdu(in, buf);
-                break;
-            default:
-                if (logger.isErrorEnabled()) {
-                    logger.error("TDPU Value {} not implemented yet", in.getTpduCode().name());
-                }
-                return;
-        }
-        // Add the user-data itself.
-        buf.writeBytes(in.getUserData());
-
-        // Check if the message doesn't exceed the negotiated maximum size.
-        if(buf.writerIndex() > tpduSize.getValue()) {
-            ctx.fireExceptionCaught(new PlcProtocolPayloadTooBigException(
-                "iso-tp", tpduSize.getValue(), buf.writerIndex(), in));
-        } else {
-            out.add(new IsoOnTcpMessage(buf));
-        }
-    }
-
-    private void encodeErrorTpdu(Tpdu in, ByteBuf buf) {
-        ErrorTpdu errorTpdu = (ErrorTpdu) in;
-        buf.writeShort(errorTpdu.getDestinationReference());
-        buf.writeByte(errorTpdu.getRejectCause().getCode());
-        encodeParameters(buf, in.getParameters());
-    }
-
-    private void encodeDisconnectTpdu(Tpdu in, ByteBuf buf) {
-        DisconnectTpdu disconnectTpdu = (DisconnectTpdu) in;
-        buf.writeShort(disconnectTpdu.getDestinationReference());
-        buf.writeShort(disconnectTpdu.getSourceReference());
-        if (disconnectTpdu instanceof DisconnectRequestTpdu) {
-            DisconnectRequestTpdu disconnectRequestTpdu = (DisconnectRequestTpdu) disconnectTpdu;
-            buf.writeByte(disconnectRequestTpdu.getDisconnectReason().getCode());
-        }
-        encodeParameters(buf, in.getParameters());
-    }
-
-    private void encodeDataTpdu(DataTpdu in, ByteBuf buf) {
-        // EOT (Bit 8 = 1) / TPDU (All other bits 0)
-        buf.writeByte((byte) (in.getTpduRef() | (in.isEot() ? 0x80 : 0x00)));
-        // Note: A Data TPDU in Class 0 doesn't have parameters
-    }
-
-    private void encodeConnectionTpdu(Tpdu in, ByteBuf buf) {
-        ConnectionTpdu connectionTpdu = (ConnectionTpdu) in;
-        buf.writeShort(connectionTpdu.getDestinationReference());
-        buf.writeShort(connectionTpdu.getSourceReference());
-        buf.writeByte(connectionTpdu.getProtocolClass().getCode());
-        encodeParameters(buf, in.getParameters());
-    }
-
-    private void encodeParameters(ByteBuf out, List<Parameter> parameters) {
-        if (parameters == null) {
-            return;
-        }
-
-        for (Parameter parameter : parameters) {
-            out.writeByte(parameter.getType().getCode());
-            out.writeByte((byte) (getParameterLength(parameter) - 2));
-            switch (parameter.getType()) {
-                case CALLED_TSAP:
-                case CALLING_TSAP:
-                    TsapParameter tsap = (TsapParameter) parameter;
-                    out.writeShort(tsap.getTsapId());
-                    break;
-                case CHECKSUM:
-                    ChecksumParameter checksum = (ChecksumParameter) parameter;
-                    out.writeByte(checksum.getChecksum());
-                    break;
-                case DISCONNECT_ADDITIONAL_INFORMATION:
-                    DisconnectAdditionalInformationParameter disconnectAdditionalInformation = (DisconnectAdditionalInformationParameter) parameter;
-                    out.writeBytes(disconnectAdditionalInformation.getData());
-                    break;
-                case TPDU_SIZE:
-                    TpduSizeParameter sizeParameter = (TpduSizeParameter) parameter;
-                    out.writeByte(sizeParameter.getTpduSize().getCode());
-                    break;
-                default:
-                    if (logger.isErrorEnabled()) {
-                        logger.error("TDPU tarameter type {} not implemented yet", parameter.getType().name());
-                    }
-                    return;
-            }
-        }
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Decoding
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    @Override
-    protected void decode(ChannelHandlerContext ctx, IsoOnTcpMessage in, List<Object> out) {
-        logger.trace("ISO TP Message received");
-        if (in == null) {
-            return;
-        }
-
-        if (logger.isDebugEnabled()) {
-            logger.debug("Got Data: {}", ByteBufUtil.hexDump(in.getUserData()));
-        }
-
-        ByteBuf userData = in.getUserData();
-        if (userData.writerIndex() < 1) {
-            return;
-        }
-
-        int packetStart = userData.readerIndex();
-        byte headerLength = userData.readByte();
-        int headerEnd = packetStart + headerLength;
-        TpduCode tpduCode = TpduCode.valueOf(userData.readByte());
-        // Read fixed header part.
-        Tpdu tpdu = null;
-        List<Parameter> parameters = new LinkedList<>();
-        switch (tpduCode) {
-            case CONNECTION_REQUEST:
-            case CONNECTION_CONFIRM:
-                tpdu = decodeConnectTpdu(ctx, userData, tpduCode, parameters);
-                break;
-            case DATA:
-                tpdu = decodeDataTpdu(userData, parameters);
-                break;
-            case DISCONNECT_REQUEST:
-            case DISCONNECT_CONFIRM:
-                tpdu = decodeDisconnectTpdu(userData, tpduCode, parameters);
-                break;
-            case TPDU_ERROR:
-                tpdu = decodeErrorTpdu(userData, parameters);
-                break;
-            default:
-                if (logger.isErrorEnabled()) {
-                    logger.error("Tpdu Code {} not implemented", tpduCode.name());
-                }
-                break;
-        }
-
-        // Read variable header parameters
-        while (userData.readerIndex() < headerEnd) {
-            Parameter parameter = decodeParameter(userData);
-            if (parameter != null) {
-                parameters.add(parameter);
-            }
-        }
-
-        if (tpdu != null) {
-            // If we got a ConnectionConfirmTpdu response we are currently
-            // in the process of establishing a connection with the PLC, so
-            // Save some of the information in the session and tell the next
-            // layer to negotiate the connection parameters.
-            if (tpdu instanceof ConnectionConfirmTpdu) {
-                tpdu.getParameter(CalledTsapParameter.class).ifPresent(
-                    calledTsapParameter -> calledTsapId = calledTsapParameter.getTsapId());
-                tpdu.getParameter(TpduSizeParameter.class).ifPresent(
-                    tpduSizeParameter -> tpduSize = tpduSizeParameter.getTpduSize());
-            }
-            out.add(new IsoTPMessage(tpdu, userData));
-        }
-    }
-
-    private Tpdu decodeErrorTpdu(ByteBuf userData, List<Parameter> parameters) {
-        Tpdu tpdu;
-        short destinationReference = userData.readShort();
-        RejectCause rejectCause = RejectCause.valueOf(userData.readByte());
-        tpdu = new ErrorTpdu(destinationReference, rejectCause, parameters, userData);
-        return tpdu;
-    }
-
-    private Tpdu decodeDisconnectTpdu(ByteBuf userData, TpduCode tpduCode, List<Parameter> parameters) {
-        Tpdu tpdu;
-        short destinationReference = userData.readShort();
-        short sourceReference = userData.readShort();
-        if (tpduCode == TpduCode.DISCONNECT_REQUEST) {
-            DisconnectReason disconnectReason = DisconnectReason.valueOf(userData.readByte());
-            tpdu = new DisconnectRequestTpdu(
-                destinationReference, sourceReference, disconnectReason, parameters, userData);
-        } else {  // TpduCode.DISCONNECT_CONFIRM
-            tpdu = new DisconnectConfirmTpdu(
-                destinationReference, sourceReference, parameters, userData);
-        }
-        return tpdu;
-    }
-
-    private Tpdu decodeDataTpdu(ByteBuf userData, List<Parameter> parameters) {
-        Tpdu tpdu;
-        byte tmp = userData.readByte();
-        // Bit 8 is the EOT indicator (1 = last TPDU)
-        boolean eot = (tmp & 0x80) == 0x80;
-        // The rest is simply a 7 bit number identifying the current request.
-        byte tpduRef = (byte) (tmp & 0x7F);
-        tpdu = new DataTpdu(eot, tpduRef, parameters, userData);
-        return tpdu;
-    }
-
-    private Tpdu decodeConnectTpdu(ChannelHandlerContext ctx, ByteBuf userData, TpduCode tpduCode, List<Parameter> parameters) {
-        Tpdu tpdu;
-        short destinationReference = userData.readShort();
-        short sourceReference = userData.readShort();
-        ProtocolClass protocolClass = ProtocolClass.valueOf(userData.readByte());
-
-        if (tpduCode == TpduCode.CONNECTION_REQUEST) {
-            tpdu = new ConnectionRequestTpdu(destinationReference, sourceReference, protocolClass, parameters, userData);
-
-        } else { // TpduCode.CONNECTION_CONFIRM
-            tpdu = new ConnectionConfirmTpdu(destinationReference, sourceReference, protocolClass, parameters, userData);
-            ctx.channel().pipeline().fireUserEventTriggered(new IsoTPConnectedEvent());
-        }
-        return tpdu;
-    }
-
-    private Parameter decodeParameter(ByteBuf out) {
-        ParameterCode parameterCode = ParameterCode.valueOf(out.readByte());
-        if (parameterCode == null) {
-            logger.error("Could not find parameter code");
-            return null;
-        }
-        byte length = out.readByte();
-        switch (parameterCode) {
-            case CALLING_TSAP:
-            case CALLED_TSAP:
-                return decodeTsapParameter(out, parameterCode);
-            case CHECKSUM:
-                byte checksum = out.readByte();
-                return new ChecksumParameter(checksum);
-            case DISCONNECT_ADDITIONAL_INFORMATION:
-                byte[] data = new byte[length];
-                out.readBytes(data);
-                return new DisconnectAdditionalInformationParameter(data);
-            case TPDU_SIZE:
-                TpduSize size = TpduSize.valueOf(out.readByte());
-                return new TpduSizeParameter(size);
-            default:
-                if (logger.isErrorEnabled()) {
-                    logger.error("Parameter not implemented yet {}", parameterCode.name());
-                }
-                return null;
-        }
-    }
-
-    private Parameter decodeTsapParameter(ByteBuf out, ParameterCode parameterCode) {
-        short tsapId = out.readShort();
-        switch (parameterCode) {
-            case CALLING_TSAP:
-                return new CallingTsapParameter(tsapId);
-            case CALLED_TSAP:
-                return new CalledTsapParameter(tsapId);
-            default:
-                if (logger.isErrorEnabled()) {
-                    logger.error("Parameter not implemented yet {}", parameterCode.name());
-                }
-                return null;
-        }
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Helpers
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Return the length of the entire header in bytes (including the size field itself)
-     * This is a sum of the fixed size header defined for the given tpdu type and the
-     * lengths of all parameters.
-     *
-     * @param tpdu Tpdu to get the header length for
-     * @return length of the iso tp header
-     */
-    private short getHeaderLength(Tpdu tpdu) {
-        if (tpdu == null) {
-            return 0;
-        }
-
-        short headerLength;
-        switch (tpdu.getTpduCode()) {
-            case CONNECTION_REQUEST:
-            case CONNECTION_CONFIRM:
-                headerLength = 7;
-                break;
-            case DATA:
-                headerLength = 3;
-                break;
-            case DISCONNECT_REQUEST:
-                headerLength = 7;
-                break;
-            case DISCONNECT_CONFIRM:
-                headerLength = 6;
-                break;
-            case TPDU_ERROR:
-                headerLength = 5;
-                break;
-            default:
-                headerLength = 0;
-                break;
-        }
-        return (short) (headerLength + getParametersLength(tpdu.getParameters()));
-    }
-
-    private short getParametersLength(List<Parameter> parameters) {
-        short length = 0;
-        if (parameters != null) {
-            for (Parameter parameter : parameters) {
-                length += getParameterLength(parameter);
-            }
-        }
-        return length;
-    }
-
-    private short getParameterLength(Parameter parameter) {
-        if (parameter == null) {
-            return 0;
-        }
-        switch (parameter.getType()) {
-            case CALLED_TSAP:
-            case CALLING_TSAP:
-                return 4;
-            case CHECKSUM:
-                return 3;
-            case DISCONNECT_ADDITIONAL_INFORMATION:
-                DisconnectAdditionalInformationParameter disconnectAdditionalInformationParameter =
-                    (DisconnectAdditionalInformationParameter) parameter;
-                return (short) (2 + ((disconnectAdditionalInformationParameter.getData() != null) ?
-                    disconnectAdditionalInformationParameter.getData().length : 0));
-            case TPDU_SIZE:
-                return 3;
-            default:
-                return 0;
-        }
-    }
-
-}
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.isotp.protocol;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import org.apache.plc4x.java.api.exceptions.PlcProtocolPayloadTooBigException;
+import org.apache.plc4x.java.base.PlcMessageToMessageCodec;
+import org.apache.plc4x.java.base.events.ConnectEvent;
+import org.apache.plc4x.java.isoontcp.protocol.IsoOnTcpProtocol;
+import org.apache.plc4x.java.isoontcp.protocol.model.IsoOnTcpMessage;
+import org.apache.plc4x.java.isotp.protocol.events.IsoTPConnectedEvent;
+import org.apache.plc4x.java.isotp.protocol.model.IsoTPMessage;
+import org.apache.plc4x.java.isotp.protocol.model.params.*;
+import org.apache.plc4x.java.isotp.protocol.model.tpdus.*;
+import org.apache.plc4x.java.isotp.protocol.model.types.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+public class IsoTPProtocol extends PlcMessageToMessageCodec<IsoOnTcpMessage, Tpdu> {
+
+    private static final Logger logger = LoggerFactory.getLogger(IsoTPProtocol.class);
+
+    private short callingTsapId;
+    private short calledTsapId;
+    private TpduSize tpduSize;
+
+    public IsoTPProtocol(short callingTsapId, short calledTsapId, TpduSize tpduSize) {
+        this.callingTsapId = callingTsapId;
+        this.calledTsapId = calledTsapId;
+        this.tpduSize = tpduSize;
+    }
+
+    /**
+     * If the IsoTP protocol is used on top of the ISO on TCP protocol, then as soon as the pipeline receives the
+     * request to connect, an IsoTP connection request TPDU must be sent in order to initialize the connection.
+     *
+     * @param ctx the current protocol layers context
+     * @param evt the event
+     * @throws Exception throws an exception if something goes wrong internally
+     */
+    @Override
+    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+        ChannelHandler prevHandler = getPrevChannelHandler(ctx);
+        logger.info("IsoTPProtocol: " + evt.getClass().getName());
+        // If the connection has just been established, start setting up the connection
+        // by sending a connection request to the plc.
+        if ((prevHandler instanceof IsoOnTcpProtocol) && (evt instanceof ConnectEvent)) {
+            logger.debug("ISO Transport Protocol Sending Connection Request");
+            // Open the session on ISO Transport Protocol first.
+            ConnectionRequestTpdu connectionRequest = new ConnectionRequestTpdu(
+                (short) 0x0000, (short) 0x000F, ProtocolClass.CLASS_0,
+                Arrays.asList(
+                    new CalledTsapParameter(calledTsapId),
+                    new CallingTsapParameter(callingTsapId),
+                    new TpduSizeParameter(tpduSize)),
+                Unpooled.buffer());
+            ctx.channel().writeAndFlush(connectionRequest);
+        } else {
+            super.userEventTriggered(ctx, evt);
+        }
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Encoding
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    protected void encode(ChannelHandlerContext ctx, Tpdu in, List<Object> out) {
+        logger.trace("ISO Transport Protocol Message sent");
+
+        if (in == null) {
+            return;
+        }
+
+        ByteBuf buf = Unpooled.buffer();
+
+        // Header length indicator field (The length byte doesn't count)
+        buf.writeByte((byte) (getHeaderLength(in) - 1));
+        // TPDU Code (First 4 bits), Initial Credit Allocation (Second 4 bits)
+        buf.writeByte(in.getTpduCode().getCode());
+        // The fixed header of a TCP TP Packet depends highly on the selected type.
+        switch (in.getTpduCode()) {
+            case CONNECTION_REQUEST:
+            case CONNECTION_CONFIRM:
+                encodeConnectionTpdu(in, buf);
+                break;
+            case DATA:
+                encodeDataTpdu((DataTpdu) in, buf);
+                break;
+            case DISCONNECT_REQUEST:
+            case DISCONNECT_CONFIRM:
+                encodeDisconnectTpdu(in, buf);
+                break;
+            case TPDU_ERROR:
+                encodeErrorTpdu(in, buf);
+                break;
+            default:
+                if (logger.isErrorEnabled()) {
+                    logger.error("TDPU Value {} not implemented yet", in.getTpduCode().name());
+                }
+                return;
+        }
+        // Add the user-data itself.
+        buf.writeBytes(in.getUserData());
+
+        // Check if the message doesn't exceed the negotiated maximum size.
+        if(buf.writerIndex() > tpduSize.getValue()) {
+            ctx.fireExceptionCaught(new PlcProtocolPayloadTooBigException(
+                "iso-tp", tpduSize.getValue(), buf.writerIndex(), in));
+        } else {
+            out.add(new IsoOnTcpMessage(buf));
+        }
+    }
+
+    private void encodeErrorTpdu(Tpdu in, ByteBuf buf) {
+        ErrorTpdu errorTpdu = (ErrorTpdu) in;
+        buf.writeShort(errorTpdu.getDestinationReference());
+        buf.writeByte(errorTpdu.getRejectCause().getCode());
+        encodeParameters(buf, in.getParameters());
+    }
+
+    private void encodeDisconnectTpdu(Tpdu in, ByteBuf buf) {
+        DisconnectTpdu disconnectTpdu = (DisconnectTpdu) in;
+        buf.writeShort(disconnectTpdu.getDestinationReference());
+        buf.writeShort(disconnectTpdu.getSourceReference());
+        if (disconnectTpdu instanceof DisconnectRequestTpdu) {
+            DisconnectRequestTpdu disconnectRequestTpdu = (DisconnectRequestTpdu) disconnectTpdu;
+            buf.writeByte(disconnectRequestTpdu.getDisconnectReason().getCode());
+        }
+        encodeParameters(buf, in.getParameters());
+    }
+
+    private void encodeDataTpdu(DataTpdu in, ByteBuf buf) {
+        // EOT (Bit 8 = 1) / TPDU (All other bits 0)
+        buf.writeByte((byte) (in.getTpduRef() | (in.isEot() ? 0x80 : 0x00)));
+        // Note: A Data TPDU in Class 0 doesn't have parameters
+    }
+
+    private void encodeConnectionTpdu(Tpdu in, ByteBuf buf) {
+        ConnectionTpdu connectionTpdu = (ConnectionTpdu) in;
+        buf.writeShort(connectionTpdu.getDestinationReference());
+        buf.writeShort(connectionTpdu.getSourceReference());
+        buf.writeByte(connectionTpdu.getProtocolClass().getCode());
+        encodeParameters(buf, in.getParameters());
+    }
+
+    private void encodeParameters(ByteBuf out, List<Parameter> parameters) {
+        if (parameters == null) {
+            return;
+        }
+
+        for (Parameter parameter : parameters) {
+            out.writeByte(parameter.getType().getCode());
+            out.writeByte((byte) (getParameterLength(parameter) - 2));
+            switch (parameter.getType()) {
+                case CALLED_TSAP:
+                case CALLING_TSAP:
+                    TsapParameter tsap = (TsapParameter) parameter;
+                    out.writeShort(tsap.getTsapId());
+                    break;
+                case CHECKSUM:
+                    ChecksumParameter checksum = (ChecksumParameter) parameter;
+                    out.writeByte(checksum.getChecksum());
+                    break;
+                case DISCONNECT_ADDITIONAL_INFORMATION:
+                    DisconnectAdditionalInformationParameter disconnectAdditionalInformation = (DisconnectAdditionalInformationParameter) parameter;
+                    out.writeBytes(disconnectAdditionalInformation.getData());
+                    break;
+                case TPDU_SIZE:
+                    TpduSizeParameter sizeParameter = (TpduSizeParameter) parameter;
+                    out.writeByte(sizeParameter.getTpduSize().getCode());
+                    break;
+                default:
+                    if (logger.isErrorEnabled()) {
+                        logger.error("TDPU tarameter type {} not implemented yet", parameter.getType().name());
+                    }
+                    return;
+            }
+        }
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Decoding
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    protected void decode(ChannelHandlerContext ctx, IsoOnTcpMessage in, List<Object> out) {
+        logger.trace("ISO TP Message received");
+        if (in == null) {
+            return;
+        }
+
+        if (logger.isDebugEnabled()) {
+            logger.debug("Got Data: {}", ByteBufUtil.hexDump(in.getUserData()));
+        }
+
+        ByteBuf userData = in.getUserData();
+        if (userData.writerIndex() < 1) {
+            return;
+        }
+
+        int packetStart = userData.readerIndex();
+        byte headerLength = userData.readByte();
+        int headerEnd = packetStart + headerLength;
+        TpduCode tpduCode = TpduCode.valueOf(userData.readByte());
+        // Read fixed header part.
+        Tpdu tpdu = null;
+        List<Parameter> parameters = new LinkedList<>();
+        switch (tpduCode) {
+            case CONNECTION_REQUEST:
+            case CONNECTION_CONFIRM:
+                tpdu = decodeConnectTpdu(ctx, userData, tpduCode, parameters);
+                break;
+            case DATA:
+                tpdu = decodeDataTpdu(userData, parameters);
+                break;
+            case DISCONNECT_REQUEST:
+            case DISCONNECT_CONFIRM:
+                tpdu = decodeDisconnectTpdu(userData, tpduCode, parameters);
+                break;
+            case TPDU_ERROR:
+                tpdu = decodeErrorTpdu(userData, parameters);
+                break;
+            default:
+                if (logger.isErrorEnabled()) {
+                    logger.error("Tpdu Code {} not implemented", tpduCode.name());
+                }
+                break;
+        }
+
+        // Read variable header parameters
+        while (userData.readerIndex() < headerEnd) {
+            Parameter parameter = decodeParameter(userData);
+            if (parameter != null) {
+                parameters.add(parameter);
+            }
+        }
+
+        if (tpdu != null) {
+            // If we got a ConnectionConfirmTpdu response we are currently
+            // in the process of establishing a connection with the PLC, so
+            // Save some of the information in the session and tell the next
+            // layer to negotiate the connection parameters.
+            if (tpdu instanceof ConnectionConfirmTpdu) {
+                tpdu.getParameter(CalledTsapParameter.class).ifPresent(
+                    calledTsapParameter -> calledTsapId = calledTsapParameter.getTsapId());
+                tpdu.getParameter(TpduSizeParameter.class).ifPresent(
+                    tpduSizeParameter -> tpduSize = tpduSizeParameter.getTpduSize());
+            }
+            out.add(new IsoTPMessage(tpdu, userData));
+        }
+    }
+
+    private Tpdu decodeErrorTpdu(ByteBuf userData, List<Parameter> parameters) {
+        Tpdu tpdu;
+        short destinationReference = userData.readShort();
+        RejectCause rejectCause = RejectCause.valueOf(userData.readByte());
+        tpdu = new ErrorTpdu(destinationReference, rejectCause, parameters, userData);
+        return tpdu;
+    }
+
+    private Tpdu decodeDisconnectTpdu(ByteBuf userData, TpduCode tpduCode, List<Parameter> parameters) {
+        Tpdu tpdu;
+        short destinationReference = userData.readShort();
+        short sourceReference = userData.readShort();
+        if (tpduCode == TpduCode.DISCONNECT_REQUEST) {
+            DisconnectReason disconnectReason = DisconnectReason.valueOf(userData.readByte());
+            tpdu = new DisconnectRequestTpdu(
+                destinationReference, sourceReference, disconnectReason, parameters, userData);
+        } else {  // TpduCode.DISCONNECT_CONFIRM
+            tpdu = new DisconnectConfirmTpdu(
+                destinationReference, sourceReference, parameters, userData);
+        }
+        return tpdu;
+    }
+
+    private Tpdu decodeDataTpdu(ByteBuf userData, List<Parameter> parameters) {
+        Tpdu tpdu;
+        byte tmp = userData.readByte();
+        // Bit 8 is the EOT indicator (1 = last TPDU)
+        boolean eot = (tmp & 0x80) == 0x80;
+        // The rest is simply a 7 bit number identifying the current request.
+        byte tpduRef = (byte) (tmp & 0x7F);
+        tpdu = new DataTpdu(eot, tpduRef, parameters, userData);
+        return tpdu;
+    }
+
+    private Tpdu decodeConnectTpdu(ChannelHandlerContext ctx, ByteBuf userData, TpduCode tpduCode, List<Parameter> parameters) {
+        Tpdu tpdu;
+        short destinationReference = userData.readShort();
+        short sourceReference = userData.readShort();
+        ProtocolClass protocolClass = ProtocolClass.valueOf(userData.readByte());
+
+        if (tpduCode == TpduCode.CONNECTION_REQUEST) {
+            tpdu = new ConnectionRequestTpdu(destinationReference, sourceReference, protocolClass, parameters, userData);
+
+        } else { // TpduCode.CONNECTION_CONFIRM
+            tpdu = new ConnectionConfirmTpdu(destinationReference, sourceReference, protocolClass, parameters, userData);
+            ctx.channel().pipeline().fireUserEventTriggered(new IsoTPConnectedEvent());
+        }
+        return tpdu;
+    }
+
+    private Parameter decodeParameter(ByteBuf out) {
+        ParameterCode parameterCode = ParameterCode.valueOf(out.readByte());
+        if (parameterCode == null) {
+            logger.error("Could not find parameter code");
+            return null;
+        }
+        byte length = out.readByte();
+        switch (parameterCode) {
+            case CALLING_TSAP:
+            case CALLED_TSAP:
+                return decodeTsapParameter(out, parameterCode);
+            case CHECKSUM:
+                byte checksum = out.readByte();
+                return new ChecksumParameter(checksum);
+            case DISCONNECT_ADDITIONAL_INFORMATION:
+                byte[] data = new byte[length];
+                out.readBytes(data);
+                return new DisconnectAdditionalInformationParameter(data);
+            case TPDU_SIZE:
+                TpduSize size = TpduSize.valueOf(out.readByte());
+                return new TpduSizeParameter(size);
+            default:
+                if (logger.isErrorEnabled()) {
+                    logger.error("Parameter not implemented yet {}", parameterCode.name());
+                }
+                return null;
+        }
+    }
+
+    private Parameter decodeTsapParameter(ByteBuf out, ParameterCode parameterCode) {
+        short tsapId = out.readShort();
+        switch (parameterCode) {
+            case CALLING_TSAP:
+                return new CallingTsapParameter(tsapId);
+            case CALLED_TSAP:
+                return new CalledTsapParameter(tsapId);
+            default:
+                if (logger.isErrorEnabled()) {
+                    logger.error("Parameter not implemented yet {}", parameterCode.name());
+                }
+                return null;
+        }
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Helpers
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Return the length of the entire header in bytes (including the size field itself)
+     * This is a sum of the fixed size header defined for the given tpdu type and the
+     * lengths of all parameters.
+     *
+     * @param tpdu Tpdu to get the header length for
+     * @return length of the iso tp header
+     */
+    private short getHeaderLength(Tpdu tpdu) {
+        if (tpdu == null) {
+            return 0;
+        }
+
+        short headerLength;
+        switch (tpdu.getTpduCode()) {
+            case CONNECTION_REQUEST:
+            case CONNECTION_CONFIRM:
+                headerLength = 7;
+                break;
+            case DATA:
+                headerLength = 3;
+                break;
+            case DISCONNECT_REQUEST:
+                headerLength = 7;
+                break;
+            case DISCONNECT_CONFIRM:
+                headerLength = 6;
+                break;
+            case TPDU_ERROR:
+                headerLength = 5;
+                break;
+            default:
+                headerLength = 0;
+                break;
+        }
+        return (short) (headerLength + getParametersLength(tpdu.getParameters()));
+    }
+
+    private short getParametersLength(List<Parameter> parameters) {
+        short length = 0;
+        if (parameters != null) {
+            for (Parameter parameter : parameters) {
+                length += getParameterLength(parameter);
+            }
+        }
+        return length;
+    }
+
+    private short getParameterLength(Parameter parameter) {
+        if (parameter == null) {
+            return 0;
+        }
+        switch (parameter.getType()) {
+            case CALLED_TSAP:
+            case CALLING_TSAP:
+                return 4;
+            case CHECKSUM:
+                return 3;
+            case DISCONNECT_ADDITIONAL_INFORMATION:
+                DisconnectAdditionalInformationParameter disconnectAdditionalInformationParameter =
+                    (DisconnectAdditionalInformationParameter) parameter;
+                return (short) (2 + ((disconnectAdditionalInformationParameter.getData() != null) ?
+                    disconnectAdditionalInformationParameter.getData().length : 0));
+            case TPDU_SIZE:
+                return 3;
+            default:
+                return 0;
+        }
+    }
+
+}
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/events/IsoTPConnectedEvent.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/events/IsoTPConnectedEvent.java
index 4e9401c8420..b10c7405522 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/events/IsoTPConnectedEvent.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/events/IsoTPConnectedEvent.java
@@ -1,22 +1,22 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.isotp.protocol.events;
-
-public class IsoTPConnectedEvent {
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.isotp.protocol.events;
+
+public class IsoTPConnectedEvent {
+}
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/IsoTPMessage.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/IsoTPMessage.java
index 7e76ebecbad..8c474bc5b73 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/IsoTPMessage.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/IsoTPMessage.java
@@ -1,38 +1,38 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.isotp.protocol.model;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.base.messages.PlcRawMessage;
-import org.apache.plc4x.java.isotp.protocol.model.tpdus.Tpdu;
-
-public class IsoTPMessage extends PlcRawMessage {
-
-    private final Tpdu tpdu;
-
-    public IsoTPMessage(Tpdu tpdu, ByteBuf userData) {
-        super(userData);
-        this.tpdu = tpdu;
-    }
-
-    public Tpdu getTpdu() {
-        return tpdu;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.isotp.protocol.model;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.base.messages.PlcRawMessage;
+import org.apache.plc4x.java.isotp.protocol.model.tpdus.Tpdu;
+
+public class IsoTPMessage extends PlcRawMessage {
+
+    private final Tpdu tpdu;
+
+    public IsoTPMessage(Tpdu tpdu, ByteBuf userData) {
+        super(userData);
+        this.tpdu = tpdu;
+    }
+
+    public Tpdu getTpdu() {
+        return tpdu;
+    }
+
+}
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/CalledTsapParameter.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/CalledTsapParameter.java
index de7ce1ed249..658a4516d99 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/CalledTsapParameter.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/CalledTsapParameter.java
@@ -1,34 +1,34 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.isotp.protocol.model.params;
-
-import org.apache.plc4x.java.isotp.protocol.model.types.ParameterCode;
-
-public class CalledTsapParameter extends TsapParameter {
-
-    public CalledTsapParameter(short tsapId) {
-        super(tsapId);
-    }
-
-    @Override
-    public ParameterCode getType() {
-        return ParameterCode.CALLED_TSAP;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.isotp.protocol.model.params;
+
+import org.apache.plc4x.java.isotp.protocol.model.types.ParameterCode;
+
+public class CalledTsapParameter extends TsapParameter {
+
+    public CalledTsapParameter(short tsapId) {
+        super(tsapId);
+    }
+
+    @Override
+    public ParameterCode getType() {
+        return ParameterCode.CALLED_TSAP;
+    }
+
+}
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/CallingTsapParameter.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/CallingTsapParameter.java
index ffc62dddb35..fec6f68b152 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/CallingTsapParameter.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/CallingTsapParameter.java
@@ -1,34 +1,34 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.isotp.protocol.model.params;
-
-import org.apache.plc4x.java.isotp.protocol.model.types.ParameterCode;
-
-public class CallingTsapParameter extends TsapParameter {
-
-    public CallingTsapParameter(short tsapId) {
-        super(tsapId);
-    }
-
-    @Override
-    public ParameterCode getType() {
-        return ParameterCode.CALLING_TSAP;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.isotp.protocol.model.params;
+
+import org.apache.plc4x.java.isotp.protocol.model.types.ParameterCode;
+
+public class CallingTsapParameter extends TsapParameter {
+
+    public CallingTsapParameter(short tsapId) {
+        super(tsapId);
+    }
+
+    @Override
+    public ParameterCode getType() {
+        return ParameterCode.CALLING_TSAP;
+    }
+
+}
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/ChecksumParameter.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/ChecksumParameter.java
index d2b876a897e..7265a833d9d 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/ChecksumParameter.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/ChecksumParameter.java
@@ -1,40 +1,40 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.isotp.protocol.model.params;
-
-import org.apache.plc4x.java.isotp.protocol.model.types.ParameterCode;
-
-public class ChecksumParameter implements Parameter {
-
-    private final byte checksum;
-
-    public ChecksumParameter(byte checksum) {
-        this.checksum = checksum;
-    }
-
-    @Override
-    public ParameterCode getType() {
-        return ParameterCode.CHECKSUM;
-    }
-
-    public byte getChecksum() {
-        return checksum;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.isotp.protocol.model.params;
+
+import org.apache.plc4x.java.isotp.protocol.model.types.ParameterCode;
+
+public class ChecksumParameter implements Parameter {
+
+    private final byte checksum;
+
+    public ChecksumParameter(byte checksum) {
+        this.checksum = checksum;
+    }
+
+    @Override
+    public ParameterCode getType() {
+        return ParameterCode.CHECKSUM;
+    }
+
+    public byte getChecksum() {
+        return checksum;
+    }
+
+}
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/DisconnectAdditionalInformationParameter.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/DisconnectAdditionalInformationParameter.java
index 1d47c2d9470..8e69af26c25 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/DisconnectAdditionalInformationParameter.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/DisconnectAdditionalInformationParameter.java
@@ -1,41 +1,41 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.isotp.protocol.model.params;
-
-
-import org.apache.plc4x.java.isotp.protocol.model.types.ParameterCode;
-
-public class DisconnectAdditionalInformationParameter implements Parameter {
-
-    private final byte[] data;
-
-    public DisconnectAdditionalInformationParameter(byte[] data) {
-        this.data = data;
-    }
-
-    @Override
-    public ParameterCode getType() {
-        return ParameterCode.DISCONNECT_ADDITIONAL_INFORMATION;
-    }
-
-    public byte[] getData() {
-        return data;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.isotp.protocol.model.params;
+
+
+import org.apache.plc4x.java.isotp.protocol.model.types.ParameterCode;
+
+public class DisconnectAdditionalInformationParameter implements Parameter {
+
+    private final byte[] data;
+
+    public DisconnectAdditionalInformationParameter(byte[] data) {
+        this.data = data;
+    }
+
+    @Override
+    public ParameterCode getType() {
+        return ParameterCode.DISCONNECT_ADDITIONAL_INFORMATION;
+    }
+
+    public byte[] getData() {
+        return data;
+    }
+
+}
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/Parameter.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/Parameter.java
index 4d1878d4bb7..659716704c3 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/Parameter.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/Parameter.java
@@ -1,27 +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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.isotp.protocol.model.params;
-
-import org.apache.plc4x.java.isotp.protocol.model.types.ParameterCode;
-
-public interface Parameter {
-
-    ParameterCode getType();
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.isotp.protocol.model.params;
+
+import org.apache.plc4x.java.isotp.protocol.model.types.ParameterCode;
+
+public interface Parameter {
+
+    ParameterCode getType();
+
+}
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/TpduSizeParameter.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/TpduSizeParameter.java
index 7179273a178..74b865f4960 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/TpduSizeParameter.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/TpduSizeParameter.java
@@ -1,41 +1,41 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.isotp.protocol.model.params;
-
-import org.apache.plc4x.java.isotp.protocol.model.types.ParameterCode;
-import org.apache.plc4x.java.isotp.protocol.model.types.TpduSize;
-
-public class TpduSizeParameter implements Parameter {
-
-    private final TpduSize tpduSize;
-
-    public TpduSizeParameter(TpduSize tpduSize) {
-        this.tpduSize = tpduSize;
-    }
-
-    @Override
-    public ParameterCode getType() {
-        return ParameterCode.TPDU_SIZE;
-    }
-
-    public TpduSize getTpduSize() {
-        return tpduSize;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.isotp.protocol.model.params;
+
+import org.apache.plc4x.java.isotp.protocol.model.types.ParameterCode;
+import org.apache.plc4x.java.isotp.protocol.model.types.TpduSize;
+
+public class TpduSizeParameter implements Parameter {
+
+    private final TpduSize tpduSize;
+
+    public TpduSizeParameter(TpduSize tpduSize) {
+        this.tpduSize = tpduSize;
+    }
+
+    @Override
+    public ParameterCode getType() {
+        return ParameterCode.TPDU_SIZE;
+    }
+
+    public TpduSize getTpduSize() {
+        return tpduSize;
+    }
+
+}
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/TsapParameter.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/TsapParameter.java
index c8882fccecb..161d4d58465 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/TsapParameter.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/params/TsapParameter.java
@@ -1,36 +1,36 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.isotp.protocol.model.params;
-
-/**
- * Base class for calling and called TSAPs
- */
-public abstract class TsapParameter implements Parameter {
-
-    private final short tsapId;
-
-    public TsapParameter(short tsapId) {
-        this.tsapId = tsapId;
-    }
-
-    public short getTsapId() {
-        return tsapId;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.isotp.protocol.model.params;
+
+/**
+ * Base class for calling and called TSAPs
+ */
+public abstract class TsapParameter implements Parameter {
+
+    private final short tsapId;
+
+    public TsapParameter(short tsapId) {
+        this.tsapId = tsapId;
+    }
+
+    public short getTsapId() {
+        return tsapId;
+    }
+
+}
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/ConnectionConfirmTpdu.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/ConnectionConfirmTpdu.java
index 3931269a90d..49e57256238 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/ConnectionConfirmTpdu.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/ConnectionConfirmTpdu.java
@@ -1,34 +1,34 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.isotp.protocol.model.tpdus;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.isotp.protocol.model.params.Parameter;
-import org.apache.plc4x.java.isotp.protocol.model.types.ProtocolClass;
-import org.apache.plc4x.java.isotp.protocol.model.types.TpduCode;
-
-import java.util.List;
-
-public class ConnectionConfirmTpdu extends ConnectionTpdu {
-
-    public ConnectionConfirmTpdu(short destinationReference, short sourceReference, ProtocolClass protocolClass, List<Parameter> parameters, ByteBuf userData) {
-        super(TpduCode.CONNECTION_CONFIRM, destinationReference, sourceReference, protocolClass, parameters, userData);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.isotp.protocol.model.tpdus;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.isotp.protocol.model.params.Parameter;
+import org.apache.plc4x.java.isotp.protocol.model.types.ProtocolClass;
+import org.apache.plc4x.java.isotp.protocol.model.types.TpduCode;
+
+import java.util.List;
+
+public class ConnectionConfirmTpdu extends ConnectionTpdu {
+
+    public ConnectionConfirmTpdu(short destinationReference, short sourceReference, ProtocolClass protocolClass, List<Parameter> parameters, ByteBuf userData) {
+        super(TpduCode.CONNECTION_CONFIRM, destinationReference, sourceReference, protocolClass, parameters, userData);
+    }
+
+}
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/ConnectionRequestTpdu.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/ConnectionRequestTpdu.java
index 01218e3ed93..3b88f4dfeb8 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/ConnectionRequestTpdu.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/ConnectionRequestTpdu.java
@@ -1,34 +1,34 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.isotp.protocol.model.tpdus;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.isotp.protocol.model.params.Parameter;
-import org.apache.plc4x.java.isotp.protocol.model.types.ProtocolClass;
-import org.apache.plc4x.java.isotp.protocol.model.types.TpduCode;
-
-import java.util.List;
-
-public class ConnectionRequestTpdu extends ConnectionTpdu {
-
-    public ConnectionRequestTpdu(short destinationReference, short sourceReference, ProtocolClass protocolClass, List<Parameter> parameters, ByteBuf userData) {
-        super(TpduCode.CONNECTION_REQUEST, destinationReference, sourceReference, protocolClass, parameters, userData);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.isotp.protocol.model.tpdus;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.isotp.protocol.model.params.Parameter;
+import org.apache.plc4x.java.isotp.protocol.model.types.ProtocolClass;
+import org.apache.plc4x.java.isotp.protocol.model.types.TpduCode;
+
+import java.util.List;
+
+public class ConnectionRequestTpdu extends ConnectionTpdu {
+
+    public ConnectionRequestTpdu(short destinationReference, short sourceReference, ProtocolClass protocolClass, List<Parameter> parameters, ByteBuf userData) {
+        super(TpduCode.CONNECTION_REQUEST, destinationReference, sourceReference, protocolClass, parameters, userData);
+    }
+
+}
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/ConnectionTpdu.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/ConnectionTpdu.java
index 632effb4525..3f1545ead46 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/ConnectionTpdu.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/ConnectionTpdu.java
@@ -1,53 +1,53 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.isotp.protocol.model.tpdus;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.isotp.protocol.model.params.Parameter;
-import org.apache.plc4x.java.isotp.protocol.model.types.ProtocolClass;
-import org.apache.plc4x.java.isotp.protocol.model.types.TpduCode;
-
-import java.util.List;
-
-public abstract class ConnectionTpdu extends Tpdu {
-
-    private final short destinationReference;
-    private final short sourceReference;
-    private final ProtocolClass protocolClass;
-
-    public ConnectionTpdu(TpduCode tpduCode, short destinationReference, short sourceReference, ProtocolClass protocolClass, List<Parameter> parameters, ByteBuf userData) {
-        super(tpduCode, parameters, userData);
-        this.destinationReference = destinationReference;
-        this.sourceReference = sourceReference;
-        this.protocolClass = protocolClass;
-    }
-
-    public short getDestinationReference() {
-        return destinationReference;
-    }
-
-    public short getSourceReference() {
-        return sourceReference;
-    }
-
-    public ProtocolClass getProtocolClass() {
-        return protocolClass;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.isotp.protocol.model.tpdus;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.isotp.protocol.model.params.Parameter;
+import org.apache.plc4x.java.isotp.protocol.model.types.ProtocolClass;
+import org.apache.plc4x.java.isotp.protocol.model.types.TpduCode;
+
+import java.util.List;
+
+public abstract class ConnectionTpdu extends Tpdu {
+
+    private final short destinationReference;
+    private final short sourceReference;
+    private final ProtocolClass protocolClass;
+
+    public ConnectionTpdu(TpduCode tpduCode, short destinationReference, short sourceReference, ProtocolClass protocolClass, List<Parameter> parameters, ByteBuf userData) {
+        super(tpduCode, parameters, userData);
+        this.destinationReference = destinationReference;
+        this.sourceReference = sourceReference;
+        this.protocolClass = protocolClass;
+    }
+
+    public short getDestinationReference() {
+        return destinationReference;
+    }
+
+    public short getSourceReference() {
+        return sourceReference;
+    }
+
+    public ProtocolClass getProtocolClass() {
+        return protocolClass;
+    }
+
+}
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/CustomTpdu.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/CustomTpdu.java
index c5cbae1b70f..db04456e802 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/CustomTpdu.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/CustomTpdu.java
@@ -1,33 +1,33 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.isotp.protocol.model.tpdus;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.isotp.protocol.model.params.Parameter;
-import org.apache.plc4x.java.isotp.protocol.model.types.TpduCode;
-
-import java.util.List;
-
-public class CustomTpdu extends Tpdu  {
-
-    public CustomTpdu(Byte tpduCode, List<Parameter> parameters, ByteBuf userData) {
-        super(TpduCode.valueOf(tpduCode), parameters, userData);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.isotp.protocol.model.tpdus;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.isotp.protocol.model.params.Parameter;
+import org.apache.plc4x.java.isotp.protocol.model.types.TpduCode;
+
+import java.util.List;
+
+public class CustomTpdu extends Tpdu  {
+
+    public CustomTpdu(Byte tpduCode, List<Parameter> parameters, ByteBuf userData) {
+        super(TpduCode.valueOf(tpduCode), parameters, userData);
+    }
+
+}
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/DataTpdu.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/DataTpdu.java
index 129773d1701..bedc748f760 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/DataTpdu.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/DataTpdu.java
@@ -1,51 +1,51 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.isotp.protocol.model.tpdus;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.base.messages.PlcProtocolMessage;
-import org.apache.plc4x.java.isotp.protocol.model.params.Parameter;
-import org.apache.plc4x.java.isotp.protocol.model.types.TpduCode;
-
-import java.util.List;
-
-public class DataTpdu extends Tpdu {
-
-    private final boolean eot;
-    private final byte tpduRef;
-
-    public DataTpdu(boolean eot, byte tpduRef, List<Parameter> parameters, ByteBuf userData) {
-        this(eot, tpduRef, parameters, userData, null);
-    }
-
-    public DataTpdu(boolean eot, byte tpduRef, List<Parameter> parameters, ByteBuf userData, PlcProtocolMessage parent) {
-        super(TpduCode.DATA, parameters, userData, parent);
-        this.eot = eot;
-        this.tpduRef = tpduRef;
-    }
-
-    public boolean isEot() {
-        return eot;
-    }
-
-    public byte getTpduRef() {
-        return tpduRef;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.isotp.protocol.model.tpdus;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.base.messages.PlcProtocolMessage;
+import org.apache.plc4x.java.isotp.protocol.model.params.Parameter;
+import org.apache.plc4x.java.isotp.protocol.model.types.TpduCode;
+
+import java.util.List;
+
+public class DataTpdu extends Tpdu {
+
+    private final boolean eot;
+    private final byte tpduRef;
+
+    public DataTpdu(boolean eot, byte tpduRef, List<Parameter> parameters, ByteBuf userData) {
+        this(eot, tpduRef, parameters, userData, null);
+    }
+
+    public DataTpdu(boolean eot, byte tpduRef, List<Parameter> parameters, ByteBuf userData, PlcProtocolMessage parent) {
+        super(TpduCode.DATA, parameters, userData, parent);
+        this.eot = eot;
+        this.tpduRef = tpduRef;
+    }
+
+    public boolean isEot() {
+        return eot;
+    }
+
+    public byte getTpduRef() {
+        return tpduRef;
+    }
+
+}
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/DisconnectConfirmTpdu.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/DisconnectConfirmTpdu.java
index e6d18158410..93268c2c479 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/DisconnectConfirmTpdu.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/DisconnectConfirmTpdu.java
@@ -1,33 +1,33 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.isotp.protocol.model.tpdus;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.isotp.protocol.model.params.Parameter;
-import org.apache.plc4x.java.isotp.protocol.model.types.TpduCode;
-
-import java.util.List;
-
-public class DisconnectConfirmTpdu extends DisconnectTpdu {
-
-    public DisconnectConfirmTpdu(short destinationReference, short sourceReference, List<Parameter> parameters, ByteBuf userData) {
-        super(TpduCode.DISCONNECT_CONFIRM, destinationReference, sourceReference, parameters, userData);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.isotp.protocol.model.tpdus;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.isotp.protocol.model.params.Parameter;
+import org.apache.plc4x.java.isotp.protocol.model.types.TpduCode;
+
+import java.util.List;
+
+public class DisconnectConfirmTpdu extends DisconnectTpdu {
+
+    public DisconnectConfirmTpdu(short destinationReference, short sourceReference, List<Parameter> parameters, ByteBuf userData) {
+        super(TpduCode.DISCONNECT_CONFIRM, destinationReference, sourceReference, parameters, userData);
+    }
+
+}
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/DisconnectRequestTpdu.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/DisconnectRequestTpdu.java
index 149c36620e3..5ae189445c8 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/DisconnectRequestTpdu.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/DisconnectRequestTpdu.java
@@ -1,41 +1,41 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.isotp.protocol.model.tpdus;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.isotp.protocol.model.params.Parameter;
-import org.apache.plc4x.java.isotp.protocol.model.types.DisconnectReason;
-import org.apache.plc4x.java.isotp.protocol.model.types.TpduCode;
-
-import java.util.List;
-
-public class DisconnectRequestTpdu extends DisconnectTpdu {
-
-    private final DisconnectReason disconnectReason;
-
-    public DisconnectRequestTpdu(short destinationReference, short sourceReference, DisconnectReason disconnectReason, List<Parameter> parameters, ByteBuf userData) {
-        super(TpduCode.DISCONNECT_REQUEST, destinationReference, sourceReference, parameters, userData);
-        this.disconnectReason = disconnectReason;
-    }
-
-    public DisconnectReason getDisconnectReason() {
-        return disconnectReason;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.isotp.protocol.model.tpdus;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.isotp.protocol.model.params.Parameter;
+import org.apache.plc4x.java.isotp.protocol.model.types.DisconnectReason;
+import org.apache.plc4x.java.isotp.protocol.model.types.TpduCode;
+
+import java.util.List;
+
+public class DisconnectRequestTpdu extends DisconnectTpdu {
+
+    private final DisconnectReason disconnectReason;
+
+    public DisconnectRequestTpdu(short destinationReference, short sourceReference, DisconnectReason disconnectReason, List<Parameter> parameters, ByteBuf userData) {
+        super(TpduCode.DISCONNECT_REQUEST, destinationReference, sourceReference, parameters, userData);
+        this.disconnectReason = disconnectReason;
+    }
+
+    public DisconnectReason getDisconnectReason() {
+        return disconnectReason;
+    }
+
+}
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/DisconnectTpdu.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/DisconnectTpdu.java
index 4596d2ee603..bd3cf6813b4 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/DisconnectTpdu.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/DisconnectTpdu.java
@@ -1,46 +1,46 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.isotp.protocol.model.tpdus;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.isotp.protocol.model.params.Parameter;
-import org.apache.plc4x.java.isotp.protocol.model.types.TpduCode;
-
-import java.util.List;
-
-public abstract class DisconnectTpdu extends Tpdu {
-
-    private final short destinationReference;
-    private final short sourceReference;
-
-    public DisconnectTpdu(TpduCode tpduCode, short destinationReference, short sourceReference, List<Parameter> parameters, ByteBuf userData) {
-        super(tpduCode, parameters, userData);
-        this.destinationReference = destinationReference;
-        this.sourceReference = sourceReference;
-    }
-
-    public short getDestinationReference() {
-        return destinationReference;
-    }
-
-    public short getSourceReference() {
-        return sourceReference;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.isotp.protocol.model.tpdus;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.isotp.protocol.model.params.Parameter;
+import org.apache.plc4x.java.isotp.protocol.model.types.TpduCode;
+
+import java.util.List;
+
+public abstract class DisconnectTpdu extends Tpdu {
+
+    private final short destinationReference;
+    private final short sourceReference;
+
+    public DisconnectTpdu(TpduCode tpduCode, short destinationReference, short sourceReference, List<Parameter> parameters, ByteBuf userData) {
+        super(tpduCode, parameters, userData);
+        this.destinationReference = destinationReference;
+        this.sourceReference = sourceReference;
+    }
+
+    public short getDestinationReference() {
+        return destinationReference;
+    }
+
+    public short getSourceReference() {
+        return sourceReference;
+    }
+
+}
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/ErrorTpdu.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/ErrorTpdu.java
index a526f8aecae..d95720a6d61 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/ErrorTpdu.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/ErrorTpdu.java
@@ -1,47 +1,47 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.isotp.protocol.model.tpdus;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.isotp.protocol.model.params.Parameter;
-import org.apache.plc4x.java.isotp.protocol.model.types.RejectCause;
-import org.apache.plc4x.java.isotp.protocol.model.types.TpduCode;
-
-import java.util.List;
-
-public class ErrorTpdu extends Tpdu {
-
-    private final short destinationReference;
-    private final RejectCause rejectCause;
-
-    public ErrorTpdu(short destinationReference, RejectCause rejectCause, List<Parameter> parameters, ByteBuf userData) {
-        super(TpduCode.TPDU_ERROR, parameters, userData);
-        this.destinationReference = destinationReference;
-        this.rejectCause = rejectCause;
-    }
-
-    public short getDestinationReference() {
-        return destinationReference;
-    }
-
-    public RejectCause getRejectCause() {
-        return rejectCause;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.isotp.protocol.model.tpdus;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.isotp.protocol.model.params.Parameter;
+import org.apache.plc4x.java.isotp.protocol.model.types.RejectCause;
+import org.apache.plc4x.java.isotp.protocol.model.types.TpduCode;
+
+import java.util.List;
+
+public class ErrorTpdu extends Tpdu {
+
+    private final short destinationReference;
+    private final RejectCause rejectCause;
+
+    public ErrorTpdu(short destinationReference, RejectCause rejectCause, List<Parameter> parameters, ByteBuf userData) {
+        super(TpduCode.TPDU_ERROR, parameters, userData);
+        this.destinationReference = destinationReference;
+        this.rejectCause = rejectCause;
+    }
+
+    public short getDestinationReference() {
+        return destinationReference;
+    }
+
+    public RejectCause getRejectCause() {
+        return rejectCause;
+    }
+
+}
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/Tpdu.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/Tpdu.java
index 1f49eebbfec..9c0fae383a8 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/Tpdu.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/Tpdu.java
@@ -1,64 +1,64 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.isotp.protocol.model.tpdus;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.base.messages.PlcProtocolMessage;
-import org.apache.plc4x.java.base.messages.PlcRawMessage;
-import org.apache.plc4x.java.isotp.protocol.model.params.Parameter;
-import org.apache.plc4x.java.isotp.protocol.model.types.TpduCode;
-
-import java.util.List;
-import java.util.Optional;
-
-public abstract class Tpdu extends PlcRawMessage {
-
-    private final TpduCode tpduCode;
-    private final List<Parameter> parameters;
-
-    public Tpdu(TpduCode tpduCode, List<Parameter> parameters, ByteBuf userData) {
-        this(tpduCode, parameters, userData, null);
-    }
-
-    public Tpdu(TpduCode tpduCode, List<Parameter> parameters, ByteBuf userData, PlcProtocolMessage parent) {
-        super(userData, parent);
-        this.tpduCode = tpduCode;
-        this.parameters = parameters;
-    }
-
-    public TpduCode getTpduCode() {
-        return tpduCode;
-    }
-
-    public List<Parameter> getParameters() {
-        return parameters;
-    }
-
-    public <T extends Parameter> Optional<T> getParameter(Class<T> parameterClass) {
-        if (parameters != null) {
-            for (Parameter parameter : parameters) {
-                if (parameter.getClass() == parameterClass) {
-                    return Optional.of(parameterClass.cast(parameter));
-                }
-            }
-        }
-        return Optional.empty();
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.isotp.protocol.model.tpdus;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.base.messages.PlcProtocolMessage;
+import org.apache.plc4x.java.base.messages.PlcRawMessage;
+import org.apache.plc4x.java.isotp.protocol.model.params.Parameter;
+import org.apache.plc4x.java.isotp.protocol.model.types.TpduCode;
+
+import java.util.List;
+import java.util.Optional;
+
+public abstract class Tpdu extends PlcRawMessage {
+
+    private final TpduCode tpduCode;
+    private final List<Parameter> parameters;
+
+    public Tpdu(TpduCode tpduCode, List<Parameter> parameters, ByteBuf userData) {
+        this(tpduCode, parameters, userData, null);
+    }
+
+    public Tpdu(TpduCode tpduCode, List<Parameter> parameters, ByteBuf userData, PlcProtocolMessage parent) {
+        super(userData, parent);
+        this.tpduCode = tpduCode;
+        this.parameters = parameters;
+    }
+
+    public TpduCode getTpduCode() {
+        return tpduCode;
+    }
+
+    public List<Parameter> getParameters() {
+        return parameters;
+    }
+
+    public <T extends Parameter> Optional<T> getParameter(Class<T> parameterClass) {
+        if (parameters != null) {
+            for (Parameter parameter : parameters) {
+                if (parameter.getClass() == parameterClass) {
+                    return Optional.of(parameterClass.cast(parameter));
+                }
+            }
+        }
+        return Optional.empty();
+    }
+
+}
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/DeviceGroup.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/DeviceGroup.java
index a2ce8637a41..196fb7baeb1 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/DeviceGroup.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/DeviceGroup.java
@@ -1,51 +1,51 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.isotp.protocol.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public enum DeviceGroup {
-    PG_OR_PC((byte) 0x01),
-    OS((byte) 0x02),
-    OTHERS((byte) 0x03);
-
-    private static final Map<Byte, DeviceGroup> map;
-    static {
-        map = new HashMap<>();
-        for (DeviceGroup deviceGroup : DeviceGroup.values()) {
-            map.put(deviceGroup.code, deviceGroup);
-        }
-    }
-
-    private final byte code;
-
-    DeviceGroup(byte code) {
-        this.code = code;
-    }
-
-    public byte getCode() {
-        return code;
-    }
-
-    public static DeviceGroup valueOf(byte code) {
-        return map.get(code);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.isotp.protocol.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum DeviceGroup {
+    PG_OR_PC((byte) 0x01),
+    OS((byte) 0x02),
+    OTHERS((byte) 0x03);
+
+    private static final Map<Byte, DeviceGroup> map;
+    static {
+        map = new HashMap<>();
+        for (DeviceGroup deviceGroup : DeviceGroup.values()) {
+            map.put(deviceGroup.code, deviceGroup);
+        }
+    }
+
+    private final byte code;
+
+    DeviceGroup(byte code) {
+        this.code = code;
+    }
+
+    public byte getCode() {
+        return code;
+    }
+
+    public static DeviceGroup valueOf(byte code) {
+        return map.get(code);
+    }
+
+}
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/DisconnectReason.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/DisconnectReason.java
index a776909efbb..9deb3f22be8 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/DisconnectReason.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/DisconnectReason.java
@@ -1,64 +1,64 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.isotp.protocol.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public enum DisconnectReason {
-    // Reasons available for all classes:
-    REASON_NOT_SPECIFIED((byte) 0x00),
-    CONGESTION_AT_TSAP((byte) 0x01),
-    SESSION_ENTITY_NOT_ATACHED_TO_TSAP((byte) 0x02),
-    ADDRESS_UNKNOWN((byte) 0x03),
-
-    // Reasons only available for classes 1 to 4:
-    NORMAL((byte) 0x80),
-    REMOTE_TRANSPORT_ENTITY_CONGESTION((byte) 0x81),
-    CONNECTION_NEGOTIATION_FAILED((byte) 0x82),
-    DUPLICATE_SOURCE_REFERENCE((byte) 0x83),
-    MISMATCHED_REFERENCES((byte) 0x84),
-    PROTOCOL_ERROR((byte) 0x85),
-    REFERENCE_OVERFLOW((byte) 0x87),
-    CONNECTION_REQUEST_REFUSED((byte) 0x88),
-    HEADER_OR_PARAMETER_LENGTH_INVALID((byte) 0x8A);
-
-    private static final Map<Byte, DisconnectReason> map;
-    static {
-        map = new HashMap<>();
-        for (DisconnectReason disconnectReason : DisconnectReason.values()) {
-            map.put(disconnectReason.code, disconnectReason);
-        }
-    }
-
-    private final byte code;
-
-    DisconnectReason(byte code) {
-        this.code = code;
-    }
-
-    public byte getCode() {
-        return code;
-    }
-
-    public static DisconnectReason valueOf(byte code) {
-        return map.get(code);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.isotp.protocol.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum DisconnectReason {
+    // Reasons available for all classes:
+    REASON_NOT_SPECIFIED((byte) 0x00),
+    CONGESTION_AT_TSAP((byte) 0x01),
+    SESSION_ENTITY_NOT_ATACHED_TO_TSAP((byte) 0x02),
+    ADDRESS_UNKNOWN((byte) 0x03),
+
+    // Reasons only available for classes 1 to 4:
+    NORMAL((byte) 0x80),
+    REMOTE_TRANSPORT_ENTITY_CONGESTION((byte) 0x81),
+    CONNECTION_NEGOTIATION_FAILED((byte) 0x82),
+    DUPLICATE_SOURCE_REFERENCE((byte) 0x83),
+    MISMATCHED_REFERENCES((byte) 0x84),
+    PROTOCOL_ERROR((byte) 0x85),
+    REFERENCE_OVERFLOW((byte) 0x87),
+    CONNECTION_REQUEST_REFUSED((byte) 0x88),
+    HEADER_OR_PARAMETER_LENGTH_INVALID((byte) 0x8A);
+
+    private static final Map<Byte, DisconnectReason> map;
+    static {
+        map = new HashMap<>();
+        for (DisconnectReason disconnectReason : DisconnectReason.values()) {
+            map.put(disconnectReason.code, disconnectReason);
+        }
+    }
+
+    private final byte code;
+
+    DisconnectReason(byte code) {
+        this.code = code;
+    }
+
+    public byte getCode() {
+        return code;
+    }
+
+    public static DisconnectReason valueOf(byte code) {
+        return map.get(code);
+    }
+
+}
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/ParameterCode.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/ParameterCode.java
index 98fdf36208c..2e0c0fb3a3f 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/ParameterCode.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/ParameterCode.java
@@ -1,75 +1,75 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.isotp.protocol.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Generally based upon RFC 905, but there were some inconsistencies in the spec:
- * - RESIDUAL_ERROR_RATE was defined twice with different codes
- * - The code 0x89 was defined for two types.
- * This version was extracted from information generated by the PcapGenerator.
- */
-public enum ParameterCode {
-    ATN_EXTENDED_CHECKSUM_32BIT((byte) 0x08),
-    ATN_EXTENDED_CHECKSUM_16BIT((byte) 0x09),
-    ACKNOWLEDGE_TIME((byte) 0x85),
-    RESIDUAL_ERROR_RATE((byte) 0x86),
-    PRIORITY((byte) 0x87),
-    TRANSIT_DELAY((byte) 0x88),
-    THROUGHPUT((byte) 0x89),
-    SEQUENCE_NUMBER((byte) 0x8A),
-    REASSIGNMENT((byte) 0x8B),
-    FLOW_CONTROL((byte) 0x8C),
-    TPDU_SIZE((byte) 0xC0),
-    CALLING_TSAP((byte) 0xC1),
-    CALLED_TSAP((byte) 0xC2),
-    CHECKSUM((byte) 0xC3),
-    VERSION((byte) 0xC4),
-    SECURITY_PARAMETERS((byte) 0xC5),
-    ADDITIONAL_OPTION_SELECTION((byte) 0xC6),
-    ALTERNATIVE_PROTOCOL_CLASS((byte) 0xC7),
-    DISCONNECT_ADDITIONAL_INFORMATION((byte) 0xE0),
-    PREFERRED_MAX_PDU_SIZE((byte) 0xF0),
-    INACTIVITY_TIMER((byte) 0xF2);
-
-    private static final Map<Byte, ParameterCode> map;
-    static {
-        map = new HashMap<>();
-        for (ParameterCode parameterCode : ParameterCode.values()) {
-            map.put(parameterCode.code, parameterCode);
-        }
-    }
-
-    private final byte code;
-
-    ParameterCode(byte code) {
-        this.code = code;
-    }
-
-    public byte getCode() {
-        return code;
-    }
-
-    public static ParameterCode valueOf(byte code) {
-        return map.get(code);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.isotp.protocol.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Generally based upon RFC 905, but there were some inconsistencies in the spec:
+ * - RESIDUAL_ERROR_RATE was defined twice with different codes
+ * - The code 0x89 was defined for two types.
+ * This version was extracted from information generated by the PcapGenerator.
+ */
+public enum ParameterCode {
+    ATN_EXTENDED_CHECKSUM_32BIT((byte) 0x08),
+    ATN_EXTENDED_CHECKSUM_16BIT((byte) 0x09),
+    ACKNOWLEDGE_TIME((byte) 0x85),
+    RESIDUAL_ERROR_RATE((byte) 0x86),
+    PRIORITY((byte) 0x87),
+    TRANSIT_DELAY((byte) 0x88),
+    THROUGHPUT((byte) 0x89),
+    SEQUENCE_NUMBER((byte) 0x8A),
+    REASSIGNMENT((byte) 0x8B),
+    FLOW_CONTROL((byte) 0x8C),
+    TPDU_SIZE((byte) 0xC0),
+    CALLING_TSAP((byte) 0xC1),
+    CALLED_TSAP((byte) 0xC2),
+    CHECKSUM((byte) 0xC3),
+    VERSION((byte) 0xC4),
+    SECURITY_PARAMETERS((byte) 0xC5),
+    ADDITIONAL_OPTION_SELECTION((byte) 0xC6),
+    ALTERNATIVE_PROTOCOL_CLASS((byte) 0xC7),
+    DISCONNECT_ADDITIONAL_INFORMATION((byte) 0xE0),
+    PREFERRED_MAX_PDU_SIZE((byte) 0xF0),
+    INACTIVITY_TIMER((byte) 0xF2);
+
+    private static final Map<Byte, ParameterCode> map;
+    static {
+        map = new HashMap<>();
+        for (ParameterCode parameterCode : ParameterCode.values()) {
+            map.put(parameterCode.code, parameterCode);
+        }
+    }
+
+    private final byte code;
+
+    ParameterCode(byte code) {
+        this.code = code;
+    }
+
+    public byte getCode() {
+        return code;
+    }
+
+    public static ParameterCode valueOf(byte code) {
+        return map.get(code);
+    }
+
+}
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/ProtocolClass.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/ProtocolClass.java
index b8f1c6f31bf..4dca82dcca4 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/ProtocolClass.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/ProtocolClass.java
@@ -1,53 +1,53 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.isotp.protocol.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public enum ProtocolClass {
-    CLASS_0((byte) 0x00),
-    CLASS_1((byte) 0x10),
-    CLASS_2((byte) 0x20),
-    CLASS_3((byte) 0x30),
-    CLASS_4((byte) 0x40);
-
-    private static final Map<Byte, ProtocolClass> map;
-    static {
-        map = new HashMap<>();
-        for (ProtocolClass protocolClass : ProtocolClass.values()) {
-            map.put(protocolClass.code, protocolClass);
-        }
-    }
-
-    private final byte code;
-
-    ProtocolClass(byte code) {
-        this.code = code;
-    }
-
-    public byte getCode() {
-        return code;
-    }
-
-    public static ProtocolClass valueOf(byte code) {
-        return map.get(code);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.isotp.protocol.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum ProtocolClass {
+    CLASS_0((byte) 0x00),
+    CLASS_1((byte) 0x10),
+    CLASS_2((byte) 0x20),
+    CLASS_3((byte) 0x30),
+    CLASS_4((byte) 0x40);
+
+    private static final Map<Byte, ProtocolClass> map;
+    static {
+        map = new HashMap<>();
+        for (ProtocolClass protocolClass : ProtocolClass.values()) {
+            map.put(protocolClass.code, protocolClass);
+        }
+    }
+
+    private final byte code;
+
+    ProtocolClass(byte code) {
+        this.code = code;
+    }
+
+    public byte getCode() {
+        return code;
+    }
+
+    public static ProtocolClass valueOf(byte code) {
+        return map.get(code);
+    }
+
+}
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/RejectCause.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/RejectCause.java
index 0152bae6f89..d3e95dc5ca1 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/RejectCause.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/RejectCause.java
@@ -1,52 +1,52 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.isotp.protocol.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public enum RejectCause {
-    REASON_NOT_SPECIFIED((byte) 0x00),
-    INVALID_PARAMETER_CODE((byte) 0x01),
-    INVALID_TPDU_TYPE((byte) 0x02),
-    INVALID_PARAMETER_TYPE((byte) 0x03);
-
-    private static final Map<Byte, RejectCause> map;
-    static {
-        map = new HashMap<>();
-        for (RejectCause rejectCause : RejectCause.values()) {
-            map.put(rejectCause.code, rejectCause);
-        }
-    }
-
-    private final byte code;
-
-    RejectCause(byte code) {
-        this.code = code;
-    }
-
-    public byte getCode() {
-        return code;
-    }
-
-    public static RejectCause valueOf(byte code) {
-        return map.get(code);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.isotp.protocol.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum RejectCause {
+    REASON_NOT_SPECIFIED((byte) 0x00),
+    INVALID_PARAMETER_CODE((byte) 0x01),
+    INVALID_TPDU_TYPE((byte) 0x02),
+    INVALID_PARAMETER_TYPE((byte) 0x03);
+
+    private static final Map<Byte, RejectCause> map;
+    static {
+        map = new HashMap<>();
+        for (RejectCause rejectCause : RejectCause.values()) {
+            map.put(rejectCause.code, rejectCause);
+        }
+    }
+
+    private final byte code;
+
+    RejectCause(byte code) {
+        this.code = code;
+    }
+
+    public byte getCode() {
+        return code;
+    }
+
+    public static RejectCause valueOf(byte code) {
+        return map.get(code);
+    }
+
+}
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/TpduCode.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/TpduCode.java
index 9f63059b39e..65c1eb11056 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/TpduCode.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/TpduCode.java
@@ -1,62 +1,62 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.isotp.protocol.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public enum TpduCode {
-    DATA((byte) 0xF0),
-    DATA_ACKNOWLEDGEMENT((byte) 0x60),
-    CONNECTION_REQUEST((byte) 0xE0),
-    CONNECTION_CONFIRM((byte) 0xD0),
-    DISCONNECT_REQUEST((byte) 0x80),
-    DISCONNECT_CONFIRM((byte) 0xC0),
-    EXPEDITED_DATA((byte) 0x10),
-    EXPEDITED_DATA_ACKNOWLEDGEMENT((byte) 0x20),
-    REJECT((byte) 0x50),
-    TPDU_ERROR((byte) 0x70),
-    TPDU_UNKNOWN((byte) 0xFF);
-
-    private static final Map<Byte, TpduCode> map;
-    static {
-        map = new HashMap<>();
-        for (TpduCode tpduCode : TpduCode.values()) {
-            map.put(tpduCode.code, tpduCode);
-        }
-    }
-
-    private final byte code;
-
-    TpduCode(byte code) {
-        this.code = code;
-    }
-
-    public byte getCode() {
-        return code;
-    }
-
-    public static TpduCode valueOf(byte code) {
-        if (map.containsKey(code)) {
-            return map.get(code);
-        }
-        return TpduCode.TPDU_UNKNOWN;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.isotp.protocol.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum TpduCode {
+    DATA((byte) 0xF0),
+    DATA_ACKNOWLEDGEMENT((byte) 0x60),
+    CONNECTION_REQUEST((byte) 0xE0),
+    CONNECTION_CONFIRM((byte) 0xD0),
+    DISCONNECT_REQUEST((byte) 0x80),
+    DISCONNECT_CONFIRM((byte) 0xC0),
+    EXPEDITED_DATA((byte) 0x10),
+    EXPEDITED_DATA_ACKNOWLEDGEMENT((byte) 0x20),
+    REJECT((byte) 0x50),
+    TPDU_ERROR((byte) 0x70),
+    TPDU_UNKNOWN((byte) 0xFF);
+
+    private static final Map<Byte, TpduCode> map;
+    static {
+        map = new HashMap<>();
+        for (TpduCode tpduCode : TpduCode.values()) {
+            map.put(tpduCode.code, tpduCode);
+        }
+    }
+
+    private final byte code;
+
+    TpduCode(byte code) {
+        this.code = code;
+    }
+
+    public byte getCode() {
+        return code;
+    }
+
+    public static TpduCode valueOf(byte code) {
+        if (map.containsKey(code)) {
+            return map.get(code);
+        }
+        return TpduCode.TPDU_UNKNOWN;
+    }
+
+}
diff --git a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/TpduSize.java b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/TpduSize.java
index d6386d2523c..270d7c1a0ac 100644
--- a/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/TpduSize.java
+++ b/plc4j/protocols/iso-tp/src/main/java/org/apache/plc4x/java/isotp/protocol/model/types/TpduSize.java
@@ -1,78 +1,78 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.isotp.protocol.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public enum TpduSize {
-    SIZE_128((byte) 0x07, 128),
-    SIZE_256((byte) 0x08, 256),
-    SIZE_512((byte) 0x09, 512),
-    SIZE_1024((byte) 0x0a, 1024),
-    SIZE_2048((byte) 0x0b, 2048),
-    SIZE_4096((byte) 0x0c, 4096),
-    SIZE_8192((byte) 0x0d, 8192);
-
-    private static final Map<Byte, TpduSize> map;
-    static {
-        map = new HashMap<>();
-        for (TpduSize tpduSize : TpduSize.values()) {
-            map.put(tpduSize.code, tpduSize);
-        }
-    }
-
-    private final byte code;
-    private final int value;
-
-    TpduSize(byte code, int value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public byte getCode() {
-        return code;
-    }
-
-    public int getValue() {
-        return value;
-    }
-
-    public static TpduSize valueForGivenSize(int pduSize) {
-        if(pduSize <= 0) {
-            throw new IllegalArgumentException("PduSize has to be greater than 0");
-        }
-        for (TpduSize tpduSize : values()) {
-            if(tpduSize.getValue() >= pduSize) {
-                return tpduSize;
-            }
-        }
-        // If the requested pdu size is greater than 8MB,
-        // Simply use that as the given size is simple a
-        // requested size, if the remote responds with a
-        // lower value the application has to live with
-        // this anyway.
-        return SIZE_8192;
-    }
-
-    public static TpduSize valueOf(byte code) {
-        return map.get(code);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.isotp.protocol.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum TpduSize {
+    SIZE_128((byte) 0x07, 128),
+    SIZE_256((byte) 0x08, 256),
+    SIZE_512((byte) 0x09, 512),
+    SIZE_1024((byte) 0x0a, 1024),
+    SIZE_2048((byte) 0x0b, 2048),
+    SIZE_4096((byte) 0x0c, 4096),
+    SIZE_8192((byte) 0x0d, 8192);
+
+    private static final Map<Byte, TpduSize> map;
+    static {
+        map = new HashMap<>();
+        for (TpduSize tpduSize : TpduSize.values()) {
+            map.put(tpduSize.code, tpduSize);
+        }
+    }
+
+    private final byte code;
+    private final int value;
+
+    TpduSize(byte code, int value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public byte getCode() {
+        return code;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    public static TpduSize valueForGivenSize(int pduSize) {
+        if(pduSize <= 0) {
+            throw new IllegalArgumentException("PduSize has to be greater than 0");
+        }
+        for (TpduSize tpduSize : values()) {
+            if(tpduSize.getValue() >= pduSize) {
+                return tpduSize;
+            }
+        }
+        // If the requested pdu size is greater than 8MB,
+        // Simply use that as the given size is simple a
+        // requested size, if the remote responds with a
+        // lower value the application has to live with
+        // this anyway.
+        return SIZE_8192;
+    }
+
+    public static TpduSize valueOf(byte code) {
+        return map.get(code);
+    }
+
+}
diff --git a/plc4j/protocols/iso-tp/src/test/java/org/apache/plc4x/java/isotp/protocol/IsoTPProtocolTest.java b/plc4j/protocols/iso-tp/src/test/java/org/apache/plc4x/java/isotp/protocol/IsoTPProtocolTest.java
index d1d0fff8969..3ed3d8a7b8b 100644
--- a/plc4j/protocols/iso-tp/src/test/java/org/apache/plc4x/java/isotp/protocol/IsoTPProtocolTest.java
+++ b/plc4j/protocols/iso-tp/src/test/java/org/apache/plc4x/java/isotp/protocol/IsoTPProtocolTest.java
@@ -1,635 +1,635 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.isotp.protocol;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelHandlerContext;
-import org.apache.plc4x.java.isoontcp.protocol.model.IsoOnTcpMessage;
-import org.apache.plc4x.java.isotp.protocol.model.IsoTPMessage;
-import org.apache.plc4x.java.isotp.protocol.model.params.*;
-import org.apache.plc4x.java.isotp.protocol.model.tpdus.*;
-import org.apache.plc4x.java.isotp.protocol.model.types.*;
-import org.apache.plc4x.test.FastTests;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.ArrayList;
-import java.util.Collections;
-
-import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
-import static org.hamcrest.collection.IsEmptyCollection.empty;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
-
-public class IsoTPProtocolTest {
-
-    private IsoTPProtocol isoTPProtocol;
-    private ChannelHandlerContext ctx;
-    private ByteBuf buf;
-    private ArrayList<Object> out;
-
-    @Before
-    public void setup() {
-        byte rackNo = 1;
-        byte slotNo = 4;
-        TpduSize tpduSize = TpduSize.SIZE_512;
-
-        isoTPProtocol = new IsoTPProtocol(rackNo, slotNo, tpduSize);
-        ctx = mock(ChannelHandlerContext.class, RETURNS_DEEP_STUBS);
-        buf = Unpooled.buffer();
-        out = new ArrayList<>();
-    }
-
-    @After
-    public void terDown() {
-        isoTPProtocol = null;
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void encodeConnectionRequest() {
-        ConnectionRequestTpdu tpdu = new ConnectionRequestTpdu((short) 0x1, (short) (0x2), ProtocolClass.CLASS_0, Collections.emptyList(), buf);
-
-        isoTPProtocol.encode(ctx, tpdu, out);
-
-        assertThat("PlcRawMessage not decoded", out, hasSize(1));
-
-        ByteBuf userData = ((IsoOnTcpMessage) out.get(0)).getUserData();
-
-        assertThat(userData.writerIndex(), equalTo(7));
-        assertThat(userData.readByte(), equalTo((byte) 0x6));
-        assertThat(userData.readByte(), equalTo(TpduCode.CONNECTION_REQUEST.getCode()));
-        assertThat(userData.readShort(), equalTo((short) 0x1));
-        assertThat(userData.readShort(), equalTo((short) 0x2));
-        assertThat(userData.readByte(), equalTo(ProtocolClass.CLASS_0.getCode()));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void decodeConnectionRequest() {
-        buf.writeByte(0x6) // header length
-            .writeByte(TpduCode.CONNECTION_REQUEST.getCode())
-            .writeShort(0x01) // destination reference
-            .writeShort(0x02) // source reference
-            .writeByte(ProtocolClass.CLASS_0.getCode());
-        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
-
-        isoTPProtocol.decode(ctx, in, out);
-
-        assertThat("Message not decoded", out, hasSize(1));
-
-        ConnectionRequestTpdu requestTpdu = (ConnectionRequestTpdu) ((IsoTPMessage) out.get(0)).getTpdu();
-
-        assertThat(requestTpdu.getTpduCode(), equalTo(TpduCode.CONNECTION_REQUEST));
-        assertThat(requestTpdu.getDestinationReference(), equalTo((short) 0x1));
-        assertThat(requestTpdu.getSourceReference(), equalTo((short) 0x2));
-        assertThat(requestTpdu.getProtocolClass(), equalTo(ProtocolClass.CLASS_0));
-        assertThat(requestTpdu.getParameters(), empty());
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void encodeDisconnectionRequest() {
-        DisconnectRequestTpdu tpdu = new DisconnectRequestTpdu((short) 0x1, (short) (0x2), DisconnectReason.NORMAL, Collections.emptyList(), buf);
-
-        isoTPProtocol.encode(ctx, tpdu, out);
-
-        assertThat("Message not decoded", out, hasSize(1));
-        ByteBuf userData = ((IsoOnTcpMessage) out.get(0)).getUserData();
-
-        assertThat(userData.writerIndex(), equalTo(7));
-        assertThat(userData.readByte(), equalTo((byte) 0x6));
-        assertThat(userData.readByte(), equalTo(TpduCode.DISCONNECT_REQUEST.getCode()));
-        assertThat(userData.readShort(), equalTo((short) 0x1));
-        assertThat(userData.readShort(), equalTo((short) 0x2));
-        assertThat(userData.readByte(), equalTo(DisconnectReason.NORMAL.getCode()));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void decodeDisconnectionRequest() {
-        buf.writeByte(0x6) // header length
-            .writeByte(TpduCode.DISCONNECT_REQUEST.getCode())
-            .writeShort(0x01) // destination reference
-            .writeShort(0x02) // source reference
-            .writeByte(DisconnectReason.NORMAL.getCode());
-        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
-
-        isoTPProtocol.decode(ctx, in, out);
-
-        assertThat("Message not decoded", out, hasSize(1));
-
-        DisconnectRequestTpdu requestTpdu = (DisconnectRequestTpdu) ((IsoTPMessage) out.get(0)).getTpdu();
-
-        assertThat(requestTpdu.getTpduCode(), equalTo(TpduCode.DISCONNECT_REQUEST));
-        assertThat(requestTpdu.getDestinationReference(), equalTo((short) 0x1));
-        assertThat(requestTpdu.getSourceReference(), equalTo((short) 0x2));
-        assertThat(requestTpdu.getDisconnectReason(), equalTo(DisconnectReason.NORMAL));
-        assertThat(requestTpdu.getParameters(), empty());
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void encodeData() {
-        DataTpdu tpdu = new DataTpdu(true, (byte) 0x7, Collections.emptyList(), buf);
-
-        isoTPProtocol.encode(ctx, tpdu, out);
-
-        assertThat("Message not decoded", out, hasSize(1));
-
-        ByteBuf userData = ((IsoOnTcpMessage) out.get(0)).getUserData();
-
-        assertThat(userData.writerIndex(), equalTo(3));
-        assertThat(userData.readByte(), equalTo((byte) 0x2));
-        assertThat(userData.readByte(), equalTo(TpduCode.DATA.getCode()));
-        assertThat(userData.readByte(), equalTo((byte) 0x87));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void decodeDataEOT() {
-        buf.writeByte(0x3) // header length
-            .writeByte(TpduCode.DATA.getCode())
-            .writeByte((byte) 0x81); // Tpdu code + EOT
-        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
-
-        isoTPProtocol.decode(ctx, in, out);
-
-        assertThat("Message not decoded", out, hasSize(1));
-
-        DataTpdu requestTpdu = (DataTpdu) ((IsoTPMessage) out.get(0)).getTpdu();
-
-        assertThat(requestTpdu.getTpduCode(), equalTo(TpduCode.DATA));
-        assertThat(requestTpdu.getTpduRef(), equalTo((byte) 0x1));
-        assertThat(requestTpdu.isEot(), is(true));
-        assertThat(requestTpdu.getParameters(), empty());
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void decodeData() {
-        buf.writeByte(0x3) // header length
-            .writeByte(TpduCode.DATA.getCode())
-            .writeByte((byte) 0x1); // Tpdu code
-        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
-
-        isoTPProtocol.decode(ctx, in, out);
-
-        assertThat("Message not decoded", out, hasSize(1));
-
-        DataTpdu requestTpdu = (DataTpdu) ((IsoTPMessage) out.get(0)).getTpdu();
-
-        assertThat(requestTpdu.getTpduCode(), equalTo(TpduCode.DATA));
-        assertThat(requestTpdu.getTpduRef(), equalTo((byte) 0x1));
-        assertThat(!requestTpdu.isEot(), is(true));
-        assertThat(requestTpdu.getParameters(), empty());
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void encodeConnectionConfirm() {
-        ConnectionConfirmTpdu tpdu = new ConnectionConfirmTpdu((short) 0x1, (short) (0x2), ProtocolClass.CLASS_1, Collections.emptyList(), buf);
-
-        isoTPProtocol.encode(ctx, tpdu, out);
-
-        assertThat("Message not decoded", out, hasSize(1));
-
-        ByteBuf userData = ((IsoOnTcpMessage) out.get(0)).getUserData();
-
-        assertThat(userData.writerIndex(), equalTo(7));
-        assertThat(userData.readByte(), equalTo((byte) 0x6));
-        assertThat(userData.readByte(), equalTo(TpduCode.CONNECTION_CONFIRM.getCode()));
-        assertThat(userData.readShort(), equalTo((short) 0x1));
-        assertThat(userData.readShort(), equalTo((short) 0x2));
-        assertThat(userData.readByte(), equalTo(ProtocolClass.CLASS_1.getCode()));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void decodeConnectionConfirm() {
-        buf.writeByte(0x6) // header length
-            .writeByte(TpduCode.CONNECTION_CONFIRM.getCode())
-            .writeShort(0x01) // destination reference
-            .writeShort(0x02) // source reference
-            .writeByte(ProtocolClass.CLASS_0.getCode());
-        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
-
-        isoTPProtocol.decode(ctx, in, out);
-
-        assertThat("Message not decoded", out, hasSize(1));
-
-        ConnectionConfirmTpdu requestTpdu = (ConnectionConfirmTpdu) ((IsoTPMessage) out.get(0)).getTpdu();
-
-        assertThat(requestTpdu.getTpduCode(), equalTo(TpduCode.CONNECTION_CONFIRM));
-        assertThat(requestTpdu.getDestinationReference(), equalTo((short) 0x1));
-        assertThat(requestTpdu.getSourceReference(), equalTo((short) 0x2));
-        assertThat(requestTpdu.getProtocolClass(), equalTo(ProtocolClass.CLASS_0));
-        assertThat(requestTpdu.getParameters(), empty());
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void encodeDisconnectionConfirm() {
-        DisconnectConfirmTpdu tpdu = new DisconnectConfirmTpdu((short) 0x1, (short) (0x2), Collections.emptyList(), buf);
-
-        isoTPProtocol.encode(ctx, tpdu, out);
-
-        assertThat("Message not decoded", out, hasSize(1));
-
-        ByteBuf userData = ((IsoOnTcpMessage) out.get(0)).getUserData();
-
-        assertThat(userData.writerIndex(), equalTo(6));
-        assertThat(userData.readByte(), equalTo((byte) 0x5));
-        assertThat(userData.readByte(), equalTo(TpduCode.DISCONNECT_CONFIRM.getCode()));
-        assertThat(userData.readShort(), equalTo((short) 0x1));
-        assertThat(userData.readShort(), equalTo((short) 0x2));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void decodeDisconnectionConfirm() {
-        buf.writeByte(0x5) // header length
-            .writeByte(TpduCode.DISCONNECT_CONFIRM.getCode())
-            .writeShort(0x01) // destination reference
-            .writeShort(0x02) // source reference
-            .writeByte(DisconnectReason.NORMAL.getCode());
-        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
-
-        isoTPProtocol.decode(ctx, in, out);
-
-        assertThat("Message not decoded", out, hasSize(1));
-
-        DisconnectConfirmTpdu requestTpdu = (DisconnectConfirmTpdu) ((IsoTPMessage) out.get(0)).getTpdu();
-
-        assertThat(requestTpdu.getTpduCode(), equalTo(TpduCode.DISCONNECT_CONFIRM));
-        assertThat(requestTpdu.getDestinationReference(), equalTo((short) 0x1));
-        assertThat(requestTpdu.getSourceReference(), equalTo((short) 0x2));
-        assertThat(requestTpdu.getParameters(), empty());
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void encodeError() {
-        ErrorTpdu tpdu = new ErrorTpdu((short) 0x1, RejectCause.REASON_NOT_SPECIFIED, Collections.emptyList(), buf);
-
-        isoTPProtocol.encode(ctx, tpdu, out);
-
-        assertThat("Message not decoded", out, hasSize(1));
-
-        ByteBuf userData = ((IsoOnTcpMessage) out.get(0)).getUserData();
-
-        assertThat(userData.writerIndex(), equalTo(5));
-        assertThat(userData.readByte(), equalTo((byte) 0x4));
-        assertThat(userData.readByte(), equalTo(TpduCode.TPDU_ERROR.getCode()));
-        assertThat(userData.readShort(), equalTo((short) 0x1));
-        assertThat(userData.readByte(), equalTo(RejectCause.REASON_NOT_SPECIFIED.getCode()));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void encodeCallingParameter() {
-        ArrayList<Parameter> parmameters = new ArrayList<>();
-        short firstByte = (short) (DeviceGroup.PG_OR_PC.getCode() << 8);
-        short secondByte = (short) ((0x7 << 4) | (0xe1 & 0x0F));
-        CallingTsapParameter callingParameter = new CallingTsapParameter(
-            // slot number too big and overflows into rack
-            (short) (firstByte | secondByte));
-        parmameters.add(callingParameter);
-        ErrorTpdu tpdu = new ErrorTpdu((short) 0x1, RejectCause.REASON_NOT_SPECIFIED, parmameters, buf);
-
-        isoTPProtocol.encode(ctx, tpdu, out);
-
-        assertThat("Message not decoded", out, hasSize(1));
-
-        ByteBuf userData = ((IsoOnTcpMessage) out.get(0)).getUserData();
-
-        assertThat(userData.writerIndex(), equalTo(9));
-        assertThat(userData.readByte(), equalTo((byte) 0x8));
-        assertThat(userData.readByte(), equalTo(TpduCode.TPDU_ERROR.getCode()));
-        assertThat(userData.readShort(), equalTo((short) 0x1));
-        assertThat(userData.readByte(), equalTo(RejectCause.REASON_NOT_SPECIFIED.getCode()));
-        assertThat(userData.readByte(), equalTo(ParameterCode.CALLING_TSAP.getCode()));
-        assertThat(userData.readByte(), equalTo((byte) 0x2));
-        assertThat(userData.readByte(), equalTo(DeviceGroup.PG_OR_PC.getCode()));
-        byte rackAndSlot = userData.readByte();
-        assertThat((rackAndSlot & 0xf0) >> 4, equalTo(0x7));
-        assertThat((rackAndSlot & 0x0f), equalTo(0xe1 & 0x0f));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void encodeChecksumParameter() {
-        ArrayList<Parameter> parmameters = new ArrayList<>();
-        ChecksumParameter checksumParameter = new ChecksumParameter((byte) 0x77);
-        parmameters.add(checksumParameter);
-        ErrorTpdu tpdu = new ErrorTpdu((short) 0x1, RejectCause.REASON_NOT_SPECIFIED, parmameters, buf);
-
-        isoTPProtocol.encode(ctx, tpdu, out);
-
-        assertThat("Message not decoded", out, hasSize(1));
-
-        ByteBuf userData = ((IsoOnTcpMessage) out.get(0)).getUserData();
-
-        assertThat(userData.writerIndex(), equalTo(8));
-        assertThat(userData.readByte(), equalTo((byte) 0x7));
-        assertThat(userData.readByte(), equalTo(TpduCode.TPDU_ERROR.getCode()));
-        assertThat(userData.readShort(), equalTo((short) 0x1));
-        assertThat(userData.readByte(), equalTo(RejectCause.REASON_NOT_SPECIFIED.getCode()));
-        assertThat(userData.readByte(), equalTo(ParameterCode.CHECKSUM.getCode()));
-        assertThat(userData.readByte(), equalTo((byte) 0x1));
-        assertThat(userData.readByte(), equalTo((byte) 0x77));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void encodeAditionalInformationParameter() {
-        ArrayList<Parameter> parmameters = new ArrayList<>();
-        byte[] data = {'O', 'p', 'p', 's'};
-        DisconnectAdditionalInformationParameter informationParameter = new DisconnectAdditionalInformationParameter(data);
-        parmameters.add(informationParameter);
-        ErrorTpdu tpdu = new ErrorTpdu((short) 0x1, RejectCause.REASON_NOT_SPECIFIED, parmameters, buf);
-
-        isoTPProtocol.encode(ctx, tpdu, out);
-
-        assertThat("Message not decoded", out, hasSize(1));
-
-        ByteBuf userData = ((IsoOnTcpMessage) out.get(0)).getUserData();
-
-        assertThat(userData.writerIndex(), equalTo(11));
-        assertThat(userData.readByte(), equalTo((byte) 0xA));
-        assertThat(userData.readByte(), equalTo(TpduCode.TPDU_ERROR.getCode()));
-        assertThat(userData.readShort(), equalTo((short) 0x1));
-        assertThat(userData.readByte(), equalTo(RejectCause.REASON_NOT_SPECIFIED.getCode()));
-        assertThat(userData.readByte(), equalTo(ParameterCode.DISCONNECT_ADDITIONAL_INFORMATION.getCode()));
-        assertThat(userData.readByte(), equalTo((byte) 0x4));
-        assertThat(userData.readByte(), equalTo((byte) 'O'));
-        assertThat(userData.readByte(), equalTo((byte) 'p'));
-        assertThat(userData.readByte(), equalTo((byte) 'p'));
-        assertThat(userData.readByte(), equalTo((byte) 's'));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void encodeSizeParameter() {
-        ArrayList<Parameter> parmameters = new ArrayList<>();
-        TpduSizeParameter sizeParameter = new TpduSizeParameter(TpduSize.SIZE_512);
-        parmameters.add(sizeParameter);
-        ErrorTpdu tpdu = new ErrorTpdu((short) 0x1, RejectCause.REASON_NOT_SPECIFIED, parmameters, buf);
-
-        isoTPProtocol.encode(ctx, tpdu, out);
-
-        assertThat("Message not decoded", out, hasSize(1));
-
-        ByteBuf userData = ((IsoOnTcpMessage) out.get(0)).getUserData();
-
-        assertThat(userData.writerIndex(), equalTo(8));
-        assertThat(userData.readByte(), equalTo((byte) 0x7));
-        assertThat(userData.readByte(), equalTo(TpduCode.TPDU_ERROR.getCode()));
-        assertThat(userData.readShort(), equalTo((short) 0x1));
-        assertThat(userData.readByte(), equalTo(RejectCause.REASON_NOT_SPECIFIED.getCode()));
-        assertThat(userData.readByte(), equalTo(ParameterCode.TPDU_SIZE.getCode()));
-        assertThat(userData.readByte(), equalTo((byte) 0x1));
-        assertThat(userData.readByte(), equalTo(TpduSize.SIZE_512.getCode()));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void decodeError() {
-        buf.writeByte(0x4) // header length
-            .writeByte(TpduCode.TPDU_ERROR.getCode())
-            .writeShort(0x01) // destination reference
-            .writeByte(RejectCause.REASON_NOT_SPECIFIED.getCode());
-        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
-
-        isoTPProtocol.decode(ctx, in, out);
-
-        assertThat("Message not decoded", out, hasSize(1));
-
-        ErrorTpdu errorTpdu = (ErrorTpdu) ((IsoTPMessage) out.get(0)).getTpdu();
-
-        assertThat(errorTpdu.getTpduCode(), equalTo(TpduCode.TPDU_ERROR));
-        assertThat(errorTpdu.getDestinationReference(), equalTo((short) 0x1));
-        assertThat(errorTpdu.getRejectCause(), equalTo(RejectCause.REASON_NOT_SPECIFIED));
-        assertThat(errorTpdu.getParameters(), empty());
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void encodeNullRequest() {
-        isoTPProtocol.encode(ctx, null, out);
-        assertThat("Message not decoded", out, empty());
-
-        isoTPProtocol.encode(ctx, null, out);
-        assertThat("Message not decoded", out, empty());
-    }
-
-
-    @Test
-    @Category(FastTests.class)
-    public void decodeNull() {
-        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
-
-        isoTPProtocol.decode(ctx, in, out);
-        assertThat("Message not decoded", out, empty());
-
-        isoTPProtocol.decode(ctx, null, out);
-        assertThat("Message not decoded", out, empty());
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void encodeUnsupported() {
-        ArrayList<Parameter> parmameters = new ArrayList<>();
-        CustomTpdu tpdu = new CustomTpdu((byte) 0x7F, parmameters, buf);
-
-        isoTPProtocol.encode(ctx, tpdu, out);
-        assertThat("Message not decoded", out, empty());
-    }
-
-
-    @Test
-    @Category(FastTests.class)
-    public void decodeUnsupported() {
-        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
-        buf.writeByte(0x3) // header length
-            .writeByte(0x7F)
-            .writeShort(0x01); // destination reference
-        isoTPProtocol.decode(ctx, in, out);
-        assertThat("Message not decoded", out, empty());
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void decodeCallingParameter() {
-        buf.writeByte(0x8) // header length
-            .writeByte(TpduCode.TPDU_ERROR.getCode())
-            .writeShort(0x01) // destination reference
-            .writeByte(RejectCause.REASON_NOT_SPECIFIED.getCode()) // reject clause
-            .writeByte(ParameterCode.CALLING_TSAP.getCode())
-            .writeByte(0x2) // parameter length
-            .writeByte(DeviceGroup.PG_OR_PC.getCode())
-            .writeByte((byte) ((0x1 << 4) | 0x7));
-        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
-
-        isoTPProtocol.decode(ctx, in, out);
-
-        assertThat("Message not decoded", out, hasSize(1));
-
-        ErrorTpdu errorTpdu = (ErrorTpdu) ((IsoTPMessage) out.get(0)).getTpdu();
-
-        assertThat(errorTpdu.getTpduCode(), equalTo(TpduCode.TPDU_ERROR));
-        assertThat(errorTpdu.getDestinationReference(), equalTo((short) 0x1));
-        assertThat(errorTpdu.getRejectCause(), equalTo(RejectCause.REASON_NOT_SPECIFIED));
-        assertThat(errorTpdu.getParameters(), hasSize(1));
-        CallingTsapParameter parameter = (CallingTsapParameter) errorTpdu.getParameters().get(0);
-        assertThat(parameter.getType(), equalTo(ParameterCode.CALLING_TSAP));
-        short firstByte = (short) (DeviceGroup.PG_OR_PC.getCode() << 8);
-        short secondByte = (short) ((0x1 << 4) | (0x7 & 0x0F));
-        short expectedTsapId = (short) (firstByte | secondByte);
-        assertThat(parameter.getTsapId(), equalTo(expectedTsapId));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void decodeCalledParameter() {
-        buf.writeByte(0x8) // header length
-            .writeByte(TpduCode.TPDU_ERROR.getCode())
-            .writeShort(0x01) // destination reference
-            .writeByte(RejectCause.REASON_NOT_SPECIFIED.getCode()) // reject clause
-            .writeByte(ParameterCode.CALLED_TSAP.getCode())
-            .writeByte(0x2) // parameter length
-            .writeByte(DeviceGroup.PG_OR_PC.getCode())
-            .writeByte((byte) ((0x2 << 4) | 0x3));
-        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
-
-        isoTPProtocol.decode(ctx, in, out);
-
-        assertThat("Message not decoded", out, hasSize(1));
-
-        ErrorTpdu errorTpdu = (ErrorTpdu) ((IsoTPMessage) out.get(0)).getTpdu();
-
-        assertThat(errorTpdu.getTpduCode(), equalTo(TpduCode.TPDU_ERROR));
-        assertThat(errorTpdu.getDestinationReference(), equalTo((short) 0x1));
-        assertThat(errorTpdu.getRejectCause(), equalTo(RejectCause.REASON_NOT_SPECIFIED));
-        assertThat(errorTpdu.getParameters(), hasSize(1));
-        CalledTsapParameter parameter = (CalledTsapParameter) errorTpdu.getParameters().get(0);
-        assertThat(parameter.getType(), equalTo(ParameterCode.CALLED_TSAP));
-        short firstByte = (short) (DeviceGroup.PG_OR_PC.getCode() << 8);
-        short secondByte = (short) ((0x2 << 4) | (0x3 & 0x0F));
-        short expectedTsapId = (short) (firstByte | secondByte);
-        assertThat(parameter.getTsapId(), equalTo(expectedTsapId));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void decodeChecksumParameter() {
-        buf.writeByte(0x8) // header length
-            .writeByte(TpduCode.TPDU_ERROR.getCode())
-            .writeShort(0x01) // destination reference
-            .writeByte(RejectCause.REASON_NOT_SPECIFIED.getCode()) // reject clause
-            .writeByte(ParameterCode.CHECKSUM.getCode())
-            .writeByte(0x1) // parameter length
-            .writeByte(0x33); // checksum
-        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
-
-        isoTPProtocol.decode(ctx, in, out);
-
-        assertThat("Message not decoded", out, hasSize(1));
-
-        ErrorTpdu errorTpdu = (ErrorTpdu) ((IsoTPMessage) out.get(0)).getTpdu();
-
-        assertThat(errorTpdu.getTpduCode(), equalTo(TpduCode.TPDU_ERROR));
-        assertThat(errorTpdu.getDestinationReference(), equalTo((short) 0x1));
-        assertThat(errorTpdu.getRejectCause(), equalTo(RejectCause.REASON_NOT_SPECIFIED));
-        assertThat(errorTpdu.getParameters(), hasSize(1));
-        ChecksumParameter parameter = (ChecksumParameter) errorTpdu.getParameters().get(0);
-        assertThat(parameter.getType(), equalTo(ParameterCode.CHECKSUM));
-        assertThat(parameter.getChecksum(), equalTo((byte) 0x33));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void decodeSizeParameter() {
-        buf.writeByte(0x8) // header length
-            .writeByte(TpduCode.TPDU_ERROR.getCode())
-            .writeShort(0x01) // destination reference
-            .writeByte(RejectCause.REASON_NOT_SPECIFIED.getCode()) // reject clause
-            .writeByte(ParameterCode.TPDU_SIZE.getCode())
-            .writeByte(0x1) // parameter length
-            .writeByte(TpduSize.SIZE_256.getCode());
-        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
-
-        isoTPProtocol.decode(ctx, in, out);
-
-        assertThat("Message not decoded", out, hasSize(1));
-
-        ErrorTpdu errorTpdu = (ErrorTpdu) ((IsoTPMessage) out.get(0)).getTpdu();
-
-        assertThat(errorTpdu.getTpduCode(), equalTo(TpduCode.TPDU_ERROR));
-        assertThat(errorTpdu.getDestinationReference(), equalTo((short) 0x1));
-        assertThat(errorTpdu.getRejectCause(), equalTo(RejectCause.REASON_NOT_SPECIFIED));
-        assertThat(errorTpdu.getParameters(), hasSize(1));
-        TpduSizeParameter parameter = (TpduSizeParameter) errorTpdu.getParameters().get(0);
-        assertThat(parameter.getType(), equalTo(ParameterCode.TPDU_SIZE));
-        assertThat(parameter.getTpduSize(), equalTo(TpduSize.SIZE_256));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void decodeAdditionalInformationParameter() {
-        buf.writeByte(0x8) // header length
-            .writeByte(TpduCode.TPDU_ERROR.getCode())
-            .writeShort(0x01) // destination reference
-            .writeByte(RejectCause.REASON_NOT_SPECIFIED.getCode()) // reject clause
-            .writeByte(ParameterCode.DISCONNECT_ADDITIONAL_INFORMATION.getCode())
-            .writeByte(0x5) // parameter length
-            .writeByte('E')
-            .writeByte('r')
-            .writeByte('r')
-            .writeByte('o')
-            .writeByte('r');
-        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
-
-        isoTPProtocol.decode(ctx, in, out);
-
-        assertThat("Message not decoded", out, hasSize(1));
-
-        ErrorTpdu errorTpdu = (ErrorTpdu) ((IsoTPMessage) out.get(0)).getTpdu();
-
-        assertThat(errorTpdu.getTpduCode(), equalTo(TpduCode.TPDU_ERROR));
-        assertThat(errorTpdu.getDestinationReference(), equalTo((short) 0x1));
-        assertThat(errorTpdu.getRejectCause(), equalTo(RejectCause.REASON_NOT_SPECIFIED));
-        assertThat(errorTpdu.getParameters(), hasSize(1));
-        DisconnectAdditionalInformationParameter parameter = (DisconnectAdditionalInformationParameter) errorTpdu.getParameters().get(0);
-        assertThat(parameter.getType(), equalTo(ParameterCode.DISCONNECT_ADDITIONAL_INFORMATION));
-        byte[] data = parameter.getData();
-        assertThat(data[0], equalTo((byte) 'E'));
-        assertThat(data[1], equalTo((byte) 'r'));
-        assertThat(data[2], equalTo((byte) 'r'));
-        assertThat(data[3], equalTo((byte) 'o'));
-        assertThat(data[4], equalTo((byte) 'r'));
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.isotp.protocol;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import org.apache.plc4x.java.isoontcp.protocol.model.IsoOnTcpMessage;
+import org.apache.plc4x.java.isotp.protocol.model.IsoTPMessage;
+import org.apache.plc4x.java.isotp.protocol.model.params.*;
+import org.apache.plc4x.java.isotp.protocol.model.tpdus.*;
+import org.apache.plc4x.java.isotp.protocol.model.types.*;
+import org.apache.plc4x.test.FastTests;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.ArrayList;
+import java.util.Collections;
+
+import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
+import static org.hamcrest.collection.IsEmptyCollection.empty;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+
+public class IsoTPProtocolTest {
+
+    private IsoTPProtocol isoTPProtocol;
+    private ChannelHandlerContext ctx;
+    private ByteBuf buf;
+    private ArrayList<Object> out;
+
+    @Before
+    public void setup() {
+        byte rackNo = 1;
+        byte slotNo = 4;
+        TpduSize tpduSize = TpduSize.SIZE_512;
+
+        isoTPProtocol = new IsoTPProtocol(rackNo, slotNo, tpduSize);
+        ctx = mock(ChannelHandlerContext.class, RETURNS_DEEP_STUBS);
+        buf = Unpooled.buffer();
+        out = new ArrayList<>();
+    }
+
+    @After
+    public void terDown() {
+        isoTPProtocol = null;
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void encodeConnectionRequest() {
+        ConnectionRequestTpdu tpdu = new ConnectionRequestTpdu((short) 0x1, (short) (0x2), ProtocolClass.CLASS_0, Collections.emptyList(), buf);
+
+        isoTPProtocol.encode(ctx, tpdu, out);
+
+        assertThat("PlcRawMessage not decoded", out, hasSize(1));
+
+        ByteBuf userData = ((IsoOnTcpMessage) out.get(0)).getUserData();
+
+        assertThat(userData.writerIndex(), equalTo(7));
+        assertThat(userData.readByte(), equalTo((byte) 0x6));
+        assertThat(userData.readByte(), equalTo(TpduCode.CONNECTION_REQUEST.getCode()));
+        assertThat(userData.readShort(), equalTo((short) 0x1));
+        assertThat(userData.readShort(), equalTo((short) 0x2));
+        assertThat(userData.readByte(), equalTo(ProtocolClass.CLASS_0.getCode()));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void decodeConnectionRequest() {
+        buf.writeByte(0x6) // header length
+            .writeByte(TpduCode.CONNECTION_REQUEST.getCode())
+            .writeShort(0x01) // destination reference
+            .writeShort(0x02) // source reference
+            .writeByte(ProtocolClass.CLASS_0.getCode());
+        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
+
+        isoTPProtocol.decode(ctx, in, out);
+
+        assertThat("Message not decoded", out, hasSize(1));
+
+        ConnectionRequestTpdu requestTpdu = (ConnectionRequestTpdu) ((IsoTPMessage) out.get(0)).getTpdu();
+
+        assertThat(requestTpdu.getTpduCode(), equalTo(TpduCode.CONNECTION_REQUEST));
+        assertThat(requestTpdu.getDestinationReference(), equalTo((short) 0x1));
+        assertThat(requestTpdu.getSourceReference(), equalTo((short) 0x2));
+        assertThat(requestTpdu.getProtocolClass(), equalTo(ProtocolClass.CLASS_0));
+        assertThat(requestTpdu.getParameters(), empty());
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void encodeDisconnectionRequest() {
+        DisconnectRequestTpdu tpdu = new DisconnectRequestTpdu((short) 0x1, (short) (0x2), DisconnectReason.NORMAL, Collections.emptyList(), buf);
+
+        isoTPProtocol.encode(ctx, tpdu, out);
+
+        assertThat("Message not decoded", out, hasSize(1));
+        ByteBuf userData = ((IsoOnTcpMessage) out.get(0)).getUserData();
+
+        assertThat(userData.writerIndex(), equalTo(7));
+        assertThat(userData.readByte(), equalTo((byte) 0x6));
+        assertThat(userData.readByte(), equalTo(TpduCode.DISCONNECT_REQUEST.getCode()));
+        assertThat(userData.readShort(), equalTo((short) 0x1));
+        assertThat(userData.readShort(), equalTo((short) 0x2));
+        assertThat(userData.readByte(), equalTo(DisconnectReason.NORMAL.getCode()));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void decodeDisconnectionRequest() {
+        buf.writeByte(0x6) // header length
+            .writeByte(TpduCode.DISCONNECT_REQUEST.getCode())
+            .writeShort(0x01) // destination reference
+            .writeShort(0x02) // source reference
+            .writeByte(DisconnectReason.NORMAL.getCode());
+        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
+
+        isoTPProtocol.decode(ctx, in, out);
+
+        assertThat("Message not decoded", out, hasSize(1));
+
+        DisconnectRequestTpdu requestTpdu = (DisconnectRequestTpdu) ((IsoTPMessage) out.get(0)).getTpdu();
+
+        assertThat(requestTpdu.getTpduCode(), equalTo(TpduCode.DISCONNECT_REQUEST));
+        assertThat(requestTpdu.getDestinationReference(), equalTo((short) 0x1));
+        assertThat(requestTpdu.getSourceReference(), equalTo((short) 0x2));
+        assertThat(requestTpdu.getDisconnectReason(), equalTo(DisconnectReason.NORMAL));
+        assertThat(requestTpdu.getParameters(), empty());
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void encodeData() {
+        DataTpdu tpdu = new DataTpdu(true, (byte) 0x7, Collections.emptyList(), buf);
+
+        isoTPProtocol.encode(ctx, tpdu, out);
+
+        assertThat("Message not decoded", out, hasSize(1));
+
+        ByteBuf userData = ((IsoOnTcpMessage) out.get(0)).getUserData();
+
+        assertThat(userData.writerIndex(), equalTo(3));
+        assertThat(userData.readByte(), equalTo((byte) 0x2));
+        assertThat(userData.readByte(), equalTo(TpduCode.DATA.getCode()));
+        assertThat(userData.readByte(), equalTo((byte) 0x87));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void decodeDataEOT() {
+        buf.writeByte(0x3) // header length
+            .writeByte(TpduCode.DATA.getCode())
+            .writeByte((byte) 0x81); // Tpdu code + EOT
+        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
+
+        isoTPProtocol.decode(ctx, in, out);
+
+        assertThat("Message not decoded", out, hasSize(1));
+
+        DataTpdu requestTpdu = (DataTpdu) ((IsoTPMessage) out.get(0)).getTpdu();
+
+        assertThat(requestTpdu.getTpduCode(), equalTo(TpduCode.DATA));
+        assertThat(requestTpdu.getTpduRef(), equalTo((byte) 0x1));
+        assertThat(requestTpdu.isEot(), is(true));
+        assertThat(requestTpdu.getParameters(), empty());
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void decodeData() {
+        buf.writeByte(0x3) // header length
+            .writeByte(TpduCode.DATA.getCode())
+            .writeByte((byte) 0x1); // Tpdu code
+        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
+
+        isoTPProtocol.decode(ctx, in, out);
+
+        assertThat("Message not decoded", out, hasSize(1));
+
+        DataTpdu requestTpdu = (DataTpdu) ((IsoTPMessage) out.get(0)).getTpdu();
+
+        assertThat(requestTpdu.getTpduCode(), equalTo(TpduCode.DATA));
+        assertThat(requestTpdu.getTpduRef(), equalTo((byte) 0x1));
+        assertThat(!requestTpdu.isEot(), is(true));
+        assertThat(requestTpdu.getParameters(), empty());
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void encodeConnectionConfirm() {
+        ConnectionConfirmTpdu tpdu = new ConnectionConfirmTpdu((short) 0x1, (short) (0x2), ProtocolClass.CLASS_1, Collections.emptyList(), buf);
+
+        isoTPProtocol.encode(ctx, tpdu, out);
+
+        assertThat("Message not decoded", out, hasSize(1));
+
+        ByteBuf userData = ((IsoOnTcpMessage) out.get(0)).getUserData();
+
+        assertThat(userData.writerIndex(), equalTo(7));
+        assertThat(userData.readByte(), equalTo((byte) 0x6));
+        assertThat(userData.readByte(), equalTo(TpduCode.CONNECTION_CONFIRM.getCode()));
+        assertThat(userData.readShort(), equalTo((short) 0x1));
+        assertThat(userData.readShort(), equalTo((short) 0x2));
+        assertThat(userData.readByte(), equalTo(ProtocolClass.CLASS_1.getCode()));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void decodeConnectionConfirm() {
+        buf.writeByte(0x6) // header length
+            .writeByte(TpduCode.CONNECTION_CONFIRM.getCode())
+            .writeShort(0x01) // destination reference
+            .writeShort(0x02) // source reference
+            .writeByte(ProtocolClass.CLASS_0.getCode());
+        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
+
+        isoTPProtocol.decode(ctx, in, out);
+
+        assertThat("Message not decoded", out, hasSize(1));
+
+        ConnectionConfirmTpdu requestTpdu = (ConnectionConfirmTpdu) ((IsoTPMessage) out.get(0)).getTpdu();
+
+        assertThat(requestTpdu.getTpduCode(), equalTo(TpduCode.CONNECTION_CONFIRM));
+        assertThat(requestTpdu.getDestinationReference(), equalTo((short) 0x1));
+        assertThat(requestTpdu.getSourceReference(), equalTo((short) 0x2));
+        assertThat(requestTpdu.getProtocolClass(), equalTo(ProtocolClass.CLASS_0));
+        assertThat(requestTpdu.getParameters(), empty());
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void encodeDisconnectionConfirm() {
+        DisconnectConfirmTpdu tpdu = new DisconnectConfirmTpdu((short) 0x1, (short) (0x2), Collections.emptyList(), buf);
+
+        isoTPProtocol.encode(ctx, tpdu, out);
+
+        assertThat("Message not decoded", out, hasSize(1));
+
+        ByteBuf userData = ((IsoOnTcpMessage) out.get(0)).getUserData();
+
+        assertThat(userData.writerIndex(), equalTo(6));
+        assertThat(userData.readByte(), equalTo((byte) 0x5));
+        assertThat(userData.readByte(), equalTo(TpduCode.DISCONNECT_CONFIRM.getCode()));
+        assertThat(userData.readShort(), equalTo((short) 0x1));
+        assertThat(userData.readShort(), equalTo((short) 0x2));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void decodeDisconnectionConfirm() {
+        buf.writeByte(0x5) // header length
+            .writeByte(TpduCode.DISCONNECT_CONFIRM.getCode())
+            .writeShort(0x01) // destination reference
+            .writeShort(0x02) // source reference
+            .writeByte(DisconnectReason.NORMAL.getCode());
+        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
+
+        isoTPProtocol.decode(ctx, in, out);
+
+        assertThat("Message not decoded", out, hasSize(1));
+
+        DisconnectConfirmTpdu requestTpdu = (DisconnectConfirmTpdu) ((IsoTPMessage) out.get(0)).getTpdu();
+
+        assertThat(requestTpdu.getTpduCode(), equalTo(TpduCode.DISCONNECT_CONFIRM));
+        assertThat(requestTpdu.getDestinationReference(), equalTo((short) 0x1));
+        assertThat(requestTpdu.getSourceReference(), equalTo((short) 0x2));
+        assertThat(requestTpdu.getParameters(), empty());
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void encodeError() {
+        ErrorTpdu tpdu = new ErrorTpdu((short) 0x1, RejectCause.REASON_NOT_SPECIFIED, Collections.emptyList(), buf);
+
+        isoTPProtocol.encode(ctx, tpdu, out);
+
+        assertThat("Message not decoded", out, hasSize(1));
+
+        ByteBuf userData = ((IsoOnTcpMessage) out.get(0)).getUserData();
+
+        assertThat(userData.writerIndex(), equalTo(5));
+        assertThat(userData.readByte(), equalTo((byte) 0x4));
+        assertThat(userData.readByte(), equalTo(TpduCode.TPDU_ERROR.getCode()));
+        assertThat(userData.readShort(), equalTo((short) 0x1));
+        assertThat(userData.readByte(), equalTo(RejectCause.REASON_NOT_SPECIFIED.getCode()));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void encodeCallingParameter() {
+        ArrayList<Parameter> parmameters = new ArrayList<>();
+        short firstByte = (short) (DeviceGroup.PG_OR_PC.getCode() << 8);
+        short secondByte = (short) ((0x7 << 4) | (0xe1 & 0x0F));
+        CallingTsapParameter callingParameter = new CallingTsapParameter(
+            // slot number too big and overflows into rack
+            (short) (firstByte | secondByte));
+        parmameters.add(callingParameter);
+        ErrorTpdu tpdu = new ErrorTpdu((short) 0x1, RejectCause.REASON_NOT_SPECIFIED, parmameters, buf);
+
+        isoTPProtocol.encode(ctx, tpdu, out);
+
+        assertThat("Message not decoded", out, hasSize(1));
+
+        ByteBuf userData = ((IsoOnTcpMessage) out.get(0)).getUserData();
+
+        assertThat(userData.writerIndex(), equalTo(9));
+        assertThat(userData.readByte(), equalTo((byte) 0x8));
+        assertThat(userData.readByte(), equalTo(TpduCode.TPDU_ERROR.getCode()));
+        assertThat(userData.readShort(), equalTo((short) 0x1));
+        assertThat(userData.readByte(), equalTo(RejectCause.REASON_NOT_SPECIFIED.getCode()));
+        assertThat(userData.readByte(), equalTo(ParameterCode.CALLING_TSAP.getCode()));
+        assertThat(userData.readByte(), equalTo((byte) 0x2));
+        assertThat(userData.readByte(), equalTo(DeviceGroup.PG_OR_PC.getCode()));
+        byte rackAndSlot = userData.readByte();
+        assertThat((rackAndSlot & 0xf0) >> 4, equalTo(0x7));
+        assertThat((rackAndSlot & 0x0f), equalTo(0xe1 & 0x0f));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void encodeChecksumParameter() {
+        ArrayList<Parameter> parmameters = new ArrayList<>();
+        ChecksumParameter checksumParameter = new ChecksumParameter((byte) 0x77);
+        parmameters.add(checksumParameter);
+        ErrorTpdu tpdu = new ErrorTpdu((short) 0x1, RejectCause.REASON_NOT_SPECIFIED, parmameters, buf);
+
+        isoTPProtocol.encode(ctx, tpdu, out);
+
+        assertThat("Message not decoded", out, hasSize(1));
+
+        ByteBuf userData = ((IsoOnTcpMessage) out.get(0)).getUserData();
+
+        assertThat(userData.writerIndex(), equalTo(8));
+        assertThat(userData.readByte(), equalTo((byte) 0x7));
+        assertThat(userData.readByte(), equalTo(TpduCode.TPDU_ERROR.getCode()));
+        assertThat(userData.readShort(), equalTo((short) 0x1));
+        assertThat(userData.readByte(), equalTo(RejectCause.REASON_NOT_SPECIFIED.getCode()));
+        assertThat(userData.readByte(), equalTo(ParameterCode.CHECKSUM.getCode()));
+        assertThat(userData.readByte(), equalTo((byte) 0x1));
+        assertThat(userData.readByte(), equalTo((byte) 0x77));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void encodeAditionalInformationParameter() {
+        ArrayList<Parameter> parmameters = new ArrayList<>();
+        byte[] data = {'O', 'p', 'p', 's'};
+        DisconnectAdditionalInformationParameter informationParameter = new DisconnectAdditionalInformationParameter(data);
+        parmameters.add(informationParameter);
+        ErrorTpdu tpdu = new ErrorTpdu((short) 0x1, RejectCause.REASON_NOT_SPECIFIED, parmameters, buf);
+
+        isoTPProtocol.encode(ctx, tpdu, out);
+
+        assertThat("Message not decoded", out, hasSize(1));
+
+        ByteBuf userData = ((IsoOnTcpMessage) out.get(0)).getUserData();
+
+        assertThat(userData.writerIndex(), equalTo(11));
+        assertThat(userData.readByte(), equalTo((byte) 0xA));
+        assertThat(userData.readByte(), equalTo(TpduCode.TPDU_ERROR.getCode()));
+        assertThat(userData.readShort(), equalTo((short) 0x1));
+        assertThat(userData.readByte(), equalTo(RejectCause.REASON_NOT_SPECIFIED.getCode()));
+        assertThat(userData.readByte(), equalTo(ParameterCode.DISCONNECT_ADDITIONAL_INFORMATION.getCode()));
+        assertThat(userData.readByte(), equalTo((byte) 0x4));
+        assertThat(userData.readByte(), equalTo((byte) 'O'));
+        assertThat(userData.readByte(), equalTo((byte) 'p'));
+        assertThat(userData.readByte(), equalTo((byte) 'p'));
+        assertThat(userData.readByte(), equalTo((byte) 's'));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void encodeSizeParameter() {
+        ArrayList<Parameter> parmameters = new ArrayList<>();
+        TpduSizeParameter sizeParameter = new TpduSizeParameter(TpduSize.SIZE_512);
+        parmameters.add(sizeParameter);
+        ErrorTpdu tpdu = new ErrorTpdu((short) 0x1, RejectCause.REASON_NOT_SPECIFIED, parmameters, buf);
+
+        isoTPProtocol.encode(ctx, tpdu, out);
+
+        assertThat("Message not decoded", out, hasSize(1));
+
+        ByteBuf userData = ((IsoOnTcpMessage) out.get(0)).getUserData();
+
+        assertThat(userData.writerIndex(), equalTo(8));
+        assertThat(userData.readByte(), equalTo((byte) 0x7));
+        assertThat(userData.readByte(), equalTo(TpduCode.TPDU_ERROR.getCode()));
+        assertThat(userData.readShort(), equalTo((short) 0x1));
+        assertThat(userData.readByte(), equalTo(RejectCause.REASON_NOT_SPECIFIED.getCode()));
+        assertThat(userData.readByte(), equalTo(ParameterCode.TPDU_SIZE.getCode()));
+        assertThat(userData.readByte(), equalTo((byte) 0x1));
+        assertThat(userData.readByte(), equalTo(TpduSize.SIZE_512.getCode()));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void decodeError() {
+        buf.writeByte(0x4) // header length
+            .writeByte(TpduCode.TPDU_ERROR.getCode())
+            .writeShort(0x01) // destination reference
+            .writeByte(RejectCause.REASON_NOT_SPECIFIED.getCode());
+        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
+
+        isoTPProtocol.decode(ctx, in, out);
+
+        assertThat("Message not decoded", out, hasSize(1));
+
+        ErrorTpdu errorTpdu = (ErrorTpdu) ((IsoTPMessage) out.get(0)).getTpdu();
+
+        assertThat(errorTpdu.getTpduCode(), equalTo(TpduCode.TPDU_ERROR));
+        assertThat(errorTpdu.getDestinationReference(), equalTo((short) 0x1));
+        assertThat(errorTpdu.getRejectCause(), equalTo(RejectCause.REASON_NOT_SPECIFIED));
+        assertThat(errorTpdu.getParameters(), empty());
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void encodeNullRequest() {
+        isoTPProtocol.encode(ctx, null, out);
+        assertThat("Message not decoded", out, empty());
+
+        isoTPProtocol.encode(ctx, null, out);
+        assertThat("Message not decoded", out, empty());
+    }
+
+
+    @Test
+    @Category(FastTests.class)
+    public void decodeNull() {
+        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
+
+        isoTPProtocol.decode(ctx, in, out);
+        assertThat("Message not decoded", out, empty());
+
+        isoTPProtocol.decode(ctx, null, out);
+        assertThat("Message not decoded", out, empty());
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void encodeUnsupported() {
+        ArrayList<Parameter> parmameters = new ArrayList<>();
+        CustomTpdu tpdu = new CustomTpdu((byte) 0x7F, parmameters, buf);
+
+        isoTPProtocol.encode(ctx, tpdu, out);
+        assertThat("Message not decoded", out, empty());
+    }
+
+
+    @Test
+    @Category(FastTests.class)
+    public void decodeUnsupported() {
+        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
+        buf.writeByte(0x3) // header length
+            .writeByte(0x7F)
+            .writeShort(0x01); // destination reference
+        isoTPProtocol.decode(ctx, in, out);
+        assertThat("Message not decoded", out, empty());
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void decodeCallingParameter() {
+        buf.writeByte(0x8) // header length
+            .writeByte(TpduCode.TPDU_ERROR.getCode())
+            .writeShort(0x01) // destination reference
+            .writeByte(RejectCause.REASON_NOT_SPECIFIED.getCode()) // reject clause
+            .writeByte(ParameterCode.CALLING_TSAP.getCode())
+            .writeByte(0x2) // parameter length
+            .writeByte(DeviceGroup.PG_OR_PC.getCode())
+            .writeByte((byte) ((0x1 << 4) | 0x7));
+        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
+
+        isoTPProtocol.decode(ctx, in, out);
+
+        assertThat("Message not decoded", out, hasSize(1));
+
+        ErrorTpdu errorTpdu = (ErrorTpdu) ((IsoTPMessage) out.get(0)).getTpdu();
+
+        assertThat(errorTpdu.getTpduCode(), equalTo(TpduCode.TPDU_ERROR));
+        assertThat(errorTpdu.getDestinationReference(), equalTo((short) 0x1));
+        assertThat(errorTpdu.getRejectCause(), equalTo(RejectCause.REASON_NOT_SPECIFIED));
+        assertThat(errorTpdu.getParameters(), hasSize(1));
+        CallingTsapParameter parameter = (CallingTsapParameter) errorTpdu.getParameters().get(0);
+        assertThat(parameter.getType(), equalTo(ParameterCode.CALLING_TSAP));
+        short firstByte = (short) (DeviceGroup.PG_OR_PC.getCode() << 8);
+        short secondByte = (short) ((0x1 << 4) | (0x7 & 0x0F));
+        short expectedTsapId = (short) (firstByte | secondByte);
+        assertThat(parameter.getTsapId(), equalTo(expectedTsapId));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void decodeCalledParameter() {
+        buf.writeByte(0x8) // header length
+            .writeByte(TpduCode.TPDU_ERROR.getCode())
+            .writeShort(0x01) // destination reference
+            .writeByte(RejectCause.REASON_NOT_SPECIFIED.getCode()) // reject clause
+            .writeByte(ParameterCode.CALLED_TSAP.getCode())
+            .writeByte(0x2) // parameter length
+            .writeByte(DeviceGroup.PG_OR_PC.getCode())
+            .writeByte((byte) ((0x2 << 4) | 0x3));
+        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
+
+        isoTPProtocol.decode(ctx, in, out);
+
+        assertThat("Message not decoded", out, hasSize(1));
+
+        ErrorTpdu errorTpdu = (ErrorTpdu) ((IsoTPMessage) out.get(0)).getTpdu();
+
+        assertThat(errorTpdu.getTpduCode(), equalTo(TpduCode.TPDU_ERROR));
+        assertThat(errorTpdu.getDestinationReference(), equalTo((short) 0x1));
+        assertThat(errorTpdu.getRejectCause(), equalTo(RejectCause.REASON_NOT_SPECIFIED));
+        assertThat(errorTpdu.getParameters(), hasSize(1));
+        CalledTsapParameter parameter = (CalledTsapParameter) errorTpdu.getParameters().get(0);
+        assertThat(parameter.getType(), equalTo(ParameterCode.CALLED_TSAP));
+        short firstByte = (short) (DeviceGroup.PG_OR_PC.getCode() << 8);
+        short secondByte = (short) ((0x2 << 4) | (0x3 & 0x0F));
+        short expectedTsapId = (short) (firstByte | secondByte);
+        assertThat(parameter.getTsapId(), equalTo(expectedTsapId));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void decodeChecksumParameter() {
+        buf.writeByte(0x8) // header length
+            .writeByte(TpduCode.TPDU_ERROR.getCode())
+            .writeShort(0x01) // destination reference
+            .writeByte(RejectCause.REASON_NOT_SPECIFIED.getCode()) // reject clause
+            .writeByte(ParameterCode.CHECKSUM.getCode())
+            .writeByte(0x1) // parameter length
+            .writeByte(0x33); // checksum
+        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
+
+        isoTPProtocol.decode(ctx, in, out);
+
+        assertThat("Message not decoded", out, hasSize(1));
+
+        ErrorTpdu errorTpdu = (ErrorTpdu) ((IsoTPMessage) out.get(0)).getTpdu();
+
+        assertThat(errorTpdu.getTpduCode(), equalTo(TpduCode.TPDU_ERROR));
+        assertThat(errorTpdu.getDestinationReference(), equalTo((short) 0x1));
+        assertThat(errorTpdu.getRejectCause(), equalTo(RejectCause.REASON_NOT_SPECIFIED));
+        assertThat(errorTpdu.getParameters(), hasSize(1));
+        ChecksumParameter parameter = (ChecksumParameter) errorTpdu.getParameters().get(0);
+        assertThat(parameter.getType(), equalTo(ParameterCode.CHECKSUM));
+        assertThat(parameter.getChecksum(), equalTo((byte) 0x33));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void decodeSizeParameter() {
+        buf.writeByte(0x8) // header length
+            .writeByte(TpduCode.TPDU_ERROR.getCode())
+            .writeShort(0x01) // destination reference
+            .writeByte(RejectCause.REASON_NOT_SPECIFIED.getCode()) // reject clause
+            .writeByte(ParameterCode.TPDU_SIZE.getCode())
+            .writeByte(0x1) // parameter length
+            .writeByte(TpduSize.SIZE_256.getCode());
+        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
+
+        isoTPProtocol.decode(ctx, in, out);
+
+        assertThat("Message not decoded", out, hasSize(1));
+
+        ErrorTpdu errorTpdu = (ErrorTpdu) ((IsoTPMessage) out.get(0)).getTpdu();
+
+        assertThat(errorTpdu.getTpduCode(), equalTo(TpduCode.TPDU_ERROR));
+        assertThat(errorTpdu.getDestinationReference(), equalTo((short) 0x1));
+        assertThat(errorTpdu.getRejectCause(), equalTo(RejectCause.REASON_NOT_SPECIFIED));
+        assertThat(errorTpdu.getParameters(), hasSize(1));
+        TpduSizeParameter parameter = (TpduSizeParameter) errorTpdu.getParameters().get(0);
+        assertThat(parameter.getType(), equalTo(ParameterCode.TPDU_SIZE));
+        assertThat(parameter.getTpduSize(), equalTo(TpduSize.SIZE_256));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void decodeAdditionalInformationParameter() {
+        buf.writeByte(0x8) // header length
+            .writeByte(TpduCode.TPDU_ERROR.getCode())
+            .writeShort(0x01) // destination reference
+            .writeByte(RejectCause.REASON_NOT_SPECIFIED.getCode()) // reject clause
+            .writeByte(ParameterCode.DISCONNECT_ADDITIONAL_INFORMATION.getCode())
+            .writeByte(0x5) // parameter length
+            .writeByte('E')
+            .writeByte('r')
+            .writeByte('r')
+            .writeByte('o')
+            .writeByte('r');
+        IsoOnTcpMessage in = new IsoOnTcpMessage(buf);
+
+        isoTPProtocol.decode(ctx, in, out);
+
+        assertThat("Message not decoded", out, hasSize(1));
+
+        ErrorTpdu errorTpdu = (ErrorTpdu) ((IsoTPMessage) out.get(0)).getTpdu();
+
+        assertThat(errorTpdu.getTpduCode(), equalTo(TpduCode.TPDU_ERROR));
+        assertThat(errorTpdu.getDestinationReference(), equalTo((short) 0x1));
+        assertThat(errorTpdu.getRejectCause(), equalTo(RejectCause.REASON_NOT_SPECIFIED));
+        assertThat(errorTpdu.getParameters(), hasSize(1));
+        DisconnectAdditionalInformationParameter parameter = (DisconnectAdditionalInformationParameter) errorTpdu.getParameters().get(0);
+        assertThat(parameter.getType(), equalTo(ParameterCode.DISCONNECT_ADDITIONAL_INFORMATION));
+        byte[] data = parameter.getData();
+        assertThat(data[0], equalTo((byte) 'E'));
+        assertThat(data[1], equalTo((byte) 'r'));
+        assertThat(data[2], equalTo((byte) 'r'));
+        assertThat(data[3], equalTo((byte) 'o'));
+        assertThat(data[4], equalTo((byte) 'r'));
+    }
+
+}
diff --git a/plc4j/protocols/iso-tp/src/test/java/org/apache/plc4x/java/isotp/protocol/model/IsoTPMessageTests.java b/plc4j/protocols/iso-tp/src/test/java/org/apache/plc4x/java/isotp/protocol/model/IsoTPMessageTests.java
index e02cc260cd7..71eb394e4dc 100644
--- a/plc4j/protocols/iso-tp/src/test/java/org/apache/plc4x/java/isotp/protocol/model/IsoTPMessageTests.java
+++ b/plc4j/protocols/iso-tp/src/test/java/org/apache/plc4x/java/isotp/protocol/model/IsoTPMessageTests.java
@@ -1,61 +1,61 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.isotp.protocol.model;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import org.apache.plc4x.java.isotp.protocol.model.params.Parameter;
-import org.apache.plc4x.java.isotp.protocol.model.tpdus.ErrorTpdu;
-import org.apache.plc4x.java.isotp.protocol.model.types.RejectCause;
-import org.apache.plc4x.java.isotp.protocol.model.types.TpduCode;
-import org.apache.plc4x.test.FastTests;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Collections;
-import java.util.List;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-
-public class IsoTPMessageTests {
-
-    @Test
-    @Category(FastTests.class)
-    public void isoTPMessage() {
-        short destinationReference = 0x1;
-        RejectCause rejectCause = RejectCause.REASON_NOT_SPECIFIED;
-        List<Parameter> parameters = Collections.emptyList();
-        ByteBuf errorData = Unpooled.buffer();
-        ErrorTpdu tpdu = new ErrorTpdu(destinationReference, rejectCause, parameters, errorData);
-        ByteBuf userData = Unpooled.buffer();
-        IsoTPMessage isoTpMessage = new IsoTPMessage(tpdu, userData);
-
-        errorData.writeByte(0x72);
-        userData.writeByte(0x32);
-
-        assertThat(isoTpMessage.getTpdu().getTpduCode(), equalTo(TpduCode.TPDU_ERROR));
-        // Question: do we need two user data fields?
-        assertThat(tpdu.getUserData().readByte(), equalTo((byte) 0x72));
-        assertThat(isoTpMessage.getUserData().readByte(), equalTo((byte) 0x32));
-    }
-
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.isotp.protocol.model;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import org.apache.plc4x.java.isotp.protocol.model.params.Parameter;
+import org.apache.plc4x.java.isotp.protocol.model.tpdus.ErrorTpdu;
+import org.apache.plc4x.java.isotp.protocol.model.types.RejectCause;
+import org.apache.plc4x.java.isotp.protocol.model.types.TpduCode;
+import org.apache.plc4x.test.FastTests;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+
+public class IsoTPMessageTests {
+
+    @Test
+    @Category(FastTests.class)
+    public void isoTPMessage() {
+        short destinationReference = 0x1;
+        RejectCause rejectCause = RejectCause.REASON_NOT_SPECIFIED;
+        List<Parameter> parameters = Collections.emptyList();
+        ByteBuf errorData = Unpooled.buffer();
+        ErrorTpdu tpdu = new ErrorTpdu(destinationReference, rejectCause, parameters, errorData);
+        ByteBuf userData = Unpooled.buffer();
+        IsoTPMessage isoTpMessage = new IsoTPMessage(tpdu, userData);
+
+        errorData.writeByte(0x72);
+        userData.writeByte(0x32);
+
+        assertThat(isoTpMessage.getTpdu().getTpduCode(), equalTo(TpduCode.TPDU_ERROR));
+        // Question: do we need two user data fields?
+        assertThat(tpdu.getUserData().readByte(), equalTo((byte) 0x72));
+        assertThat(isoTpMessage.getUserData().readByte(), equalTo((byte) 0x32));
+    }
+
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/iso-tp/src/test/java/org/apache/plc4x/java/isotp/protocol/model/params/ParameterTests.java b/plc4j/protocols/iso-tp/src/test/java/org/apache/plc4x/java/isotp/protocol/model/params/ParameterTests.java
index 584a76a7baa..ac339131ad5 100644
--- a/plc4j/protocols/iso-tp/src/test/java/org/apache/plc4x/java/isotp/protocol/model/params/ParameterTests.java
+++ b/plc4j/protocols/iso-tp/src/test/java/org/apache/plc4x/java/isotp/protocol/model/params/ParameterTests.java
@@ -1,62 +1,62 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.isotp.protocol.model.params;
-
-import org.apache.plc4x.java.isotp.protocol.model.types.ParameterCode;
-import org.apache.plc4x.java.isotp.protocol.model.types.TpduSize;
-import org.apache.plc4x.test.FastTests;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-
-public class ParameterTests {
-
-    @Test
-    @Category(FastTests.class)
-    public void checksumParameter() {
-        ChecksumParameter checksumParameter = new ChecksumParameter((byte) 1);
-
-        assertThat("Checksum incorrect", checksumParameter.getChecksum(), equalTo((byte) 1));
-        assertThat(checksumParameter.getType(), equalTo(ParameterCode.CHECKSUM));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void disconnectAdditionalInformationParameter() {
-        byte[] data = {(byte) 1, (byte) 2};
-        DisconnectAdditionalInformationParameter disconnectParameter = new DisconnectAdditionalInformationParameter(data);
-
-        assertThat(disconnectParameter.getData()[0], equalTo((byte) 1));
-        assertThat(disconnectParameter.getData()[1], equalTo((byte) 2));
-        assertThat(disconnectParameter.getType(), equalTo(ParameterCode.DISCONNECT_ADDITIONAL_INFORMATION));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void tpduSizeParameter() {
-        TpduSizeParameter tpduSizeParameter = new TpduSizeParameter(TpduSize.SIZE_512);
-
-        assertThat("Tpdu size incorrect", tpduSizeParameter.getTpduSize(), equalTo(TpduSize.SIZE_512));
-        assertThat(tpduSizeParameter.getType(), equalTo(ParameterCode.TPDU_SIZE));
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.isotp.protocol.model.params;
+
+import org.apache.plc4x.java.isotp.protocol.model.types.ParameterCode;
+import org.apache.plc4x.java.isotp.protocol.model.types.TpduSize;
+import org.apache.plc4x.test.FastTests;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+
+public class ParameterTests {
+
+    @Test
+    @Category(FastTests.class)
+    public void checksumParameter() {
+        ChecksumParameter checksumParameter = new ChecksumParameter((byte) 1);
+
+        assertThat("Checksum incorrect", checksumParameter.getChecksum(), equalTo((byte) 1));
+        assertThat(checksumParameter.getType(), equalTo(ParameterCode.CHECKSUM));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void disconnectAdditionalInformationParameter() {
+        byte[] data = {(byte) 1, (byte) 2};
+        DisconnectAdditionalInformationParameter disconnectParameter = new DisconnectAdditionalInformationParameter(data);
+
+        assertThat(disconnectParameter.getData()[0], equalTo((byte) 1));
+        assertThat(disconnectParameter.getData()[1], equalTo((byte) 2));
+        assertThat(disconnectParameter.getType(), equalTo(ParameterCode.DISCONNECT_ADDITIONAL_INFORMATION));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void tpduSizeParameter() {
+        TpduSizeParameter tpduSizeParameter = new TpduSizeParameter(TpduSize.SIZE_512);
+
+        assertThat("Tpdu size incorrect", tpduSizeParameter.getTpduSize(), equalTo(TpduSize.SIZE_512));
+        assertThat(tpduSizeParameter.getType(), equalTo(ParameterCode.TPDU_SIZE));
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/iso-tp/src/test/java/org/apache/plc4x/java/isotp/protocol/model/params/TsapParameterTests.java b/plc4j/protocols/iso-tp/src/test/java/org/apache/plc4x/java/isotp/protocol/model/params/TsapParameterTests.java
index bf663d5ab22..b76b73a0b82 100644
--- a/plc4j/protocols/iso-tp/src/test/java/org/apache/plc4x/java/isotp/protocol/model/params/TsapParameterTests.java
+++ b/plc4j/protocols/iso-tp/src/test/java/org/apache/plc4x/java/isotp/protocol/model/params/TsapParameterTests.java
@@ -1,60 +1,60 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.isotp.protocol.model.params;
-
-import org.apache.plc4x.java.isotp.protocol.model.types.ParameterCode;
-import org.apache.plc4x.test.FastTests;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-
-public class TsapParameterTests {
-
-    private TsapParameter tsapParameter;
-
-    @After
-    public void tearDown() {
-        tsapParameter = null;
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void calledParameter() {
-        short calledTsapId = 0x1234;
-        tsapParameter = new CalledTsapParameter(calledTsapId);
-
-        assertThat("TSAP Id incorrect", tsapParameter.getTsapId(), equalTo(calledTsapId));
-        assertThat(tsapParameter.getType(), equalTo(ParameterCode.CALLED_TSAP));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void callingParameter() {
-        short callingTsapId = 0x4321;
-        tsapParameter = new CallingTsapParameter(callingTsapId);
-
-        assertThat("TSAP Id incorrect", tsapParameter.getTsapId(), equalTo(callingTsapId));
-        assertThat(tsapParameter.getType(), equalTo(ParameterCode.CALLING_TSAP));
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.isotp.protocol.model.params;
+
+import org.apache.plc4x.java.isotp.protocol.model.types.ParameterCode;
+import org.apache.plc4x.test.FastTests;
+import org.junit.After;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+
+public class TsapParameterTests {
+
+    private TsapParameter tsapParameter;
+
+    @After
+    public void tearDown() {
+        tsapParameter = null;
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void calledParameter() {
+        short calledTsapId = 0x1234;
+        tsapParameter = new CalledTsapParameter(calledTsapId);
+
+        assertThat("TSAP Id incorrect", tsapParameter.getTsapId(), equalTo(calledTsapId));
+        assertThat(tsapParameter.getType(), equalTo(ParameterCode.CALLED_TSAP));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void callingParameter() {
+        short callingTsapId = 0x4321;
+        tsapParameter = new CallingTsapParameter(callingTsapId);
+
+        assertThat("TSAP Id incorrect", tsapParameter.getTsapId(), equalTo(callingTsapId));
+        assertThat(tsapParameter.getType(), equalTo(ParameterCode.CALLING_TSAP));
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/iso-tp/src/test/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/IsotpModelTests.java b/plc4j/protocols/iso-tp/src/test/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/IsotpModelTests.java
index 942ed75c52e..31216fdd1f0 100644
--- a/plc4j/protocols/iso-tp/src/test/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/IsotpModelTests.java
+++ b/plc4j/protocols/iso-tp/src/test/java/org/apache/plc4x/java/isotp/protocol/model/tpdus/IsotpModelTests.java
@@ -1,185 +1,185 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.isotp.protocol.model.tpdus;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import org.apache.plc4x.java.isotp.protocol.model.params.CallingTsapParameter;
-import org.apache.plc4x.java.isotp.protocol.model.params.ChecksumParameter;
-import org.apache.plc4x.java.isotp.protocol.model.params.Parameter;
-import org.apache.plc4x.java.isotp.protocol.model.params.TpduSizeParameter;
-import org.apache.plc4x.java.isotp.protocol.model.types.*;
-import org.apache.plc4x.test.FastTests;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
-import static org.hamcrest.collection.IsEmptyCollection.empty;
-import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-
-public class IsotpModelTests {
-
-    @Test
-    @Category(FastTests.class)
-    public void errorTpdu() {
-        short destinationReference = 0x1;
-        RejectCause rejectCause = RejectCause.REASON_NOT_SPECIFIED;
-        List<Parameter> parameters = Collections.emptyList();
-        ByteBuf userData = Unpooled.buffer();
-
-        userData.writeByte(0x7F);
-
-        ErrorTpdu tpdu = new ErrorTpdu(destinationReference, rejectCause, parameters, userData);
-
-        assertThat(tpdu.getTpduCode(), equalTo(TpduCode.TPDU_ERROR));
-        assertThat("Unexpected destination reference", tpdu.getDestinationReference(), equalTo((short) 0x1));
-        assertThat(tpdu.getRejectCause(), equalTo(RejectCause.REASON_NOT_SPECIFIED));
-        assertThat(tpdu.getParameters(), empty() );
-        assertThat("Unexpected user data", tpdu.getUserData().readByte(), equalTo((byte) 0x7F));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void errorTpduParameter() {
-        short destinationReference = 0x1;
-        RejectCause rejectCause = RejectCause.REASON_NOT_SPECIFIED;
-        ArrayList<Parameter> parameters = new ArrayList<>();
-        ByteBuf userData = Unpooled.buffer();
-
-        userData.writeByte(0x7F);
-
-        ErrorTpdu tpdu = new ErrorTpdu(destinationReference, rejectCause, parameters, userData);
-
-        parameters.add(new TpduSizeParameter(TpduSize.SIZE_1024));
-        parameters.add(new ChecksumParameter((byte) 0xFF));
-
-        assertThat("Unexpected number of parameters", tpdu.getParameters(), hasSize(2));
-        assertThat("Unexpected parameter", tpdu.getParameters(), contains(parameters.toArray()));
-        assertThat("Checksum parameter should exist", tpdu.getParameter(ChecksumParameter.class).isPresent(), is(true));
-        assertThat("CallingTsapParameter parameter should not exist", !tpdu.getParameter(CallingTsapParameter.class).isPresent(), is(true));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void dataTpdu() {
-        List<Parameter> parameters = Collections.emptyList();
-        ByteBuf userData = Unpooled.buffer();
-
-        userData.writeByte(0x66);
-
-        DataTpdu tpdu = new DataTpdu(true, (byte) 0x7F, parameters, userData);
-
-        assertThat(tpdu.getTpduCode(), equalTo(TpduCode.DATA));
-        assertThat("Unexpected eot reference", tpdu.isEot(), is(true));
-        assertThat(tpdu.getTpduRef(), equalTo((byte) 0x7F));
-        assertThat("Unexpected parameters", tpdu.getParameters().isEmpty(), is(true));
-        assertThat("Unexpected user data", tpdu.getUserData().readByte(), equalTo((byte) 0x66));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void connectionRequestTpdu() {
-        short destinationReference = 0x1;
-        short sourceReference = 0x2;
-        ProtocolClass protocolClass = ProtocolClass.CLASS_0;
-        List<Parameter> parameters = Collections.emptyList();
-        ByteBuf userData = Unpooled.buffer();
-
-        userData.writeByte(0x33);
-
-        ConnectionRequestTpdu tpdu = new ConnectionRequestTpdu(destinationReference, sourceReference, protocolClass, parameters, userData);
-
-        assertThat(tpdu.getTpduCode(), equalTo(TpduCode.CONNECTION_REQUEST));
-        assertThat("Unexpected destination reference", tpdu.getDestinationReference(), equalTo((short) 0x1));
-        assertThat("Unexpected source reference", tpdu.getSourceReference(), equalTo((short) 0x2));
-        assertThat(tpdu.getProtocolClass(), equalTo(ProtocolClass.CLASS_0));
-        assertThat("Unexpected parameters", tpdu.getParameters().isEmpty(), is(true));
-        assertThat("Unexpected user data", tpdu.getUserData().readByte(), equalTo((byte) 0x33));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void connectionConfirmTpdu() {
-        short destinationReference = 0x3;
-        short sourceReference = 0x4;
-        ProtocolClass protocolClass = ProtocolClass.CLASS_1;
-        List<Parameter> parameters = Collections.emptyList();
-        ByteBuf userData = Unpooled.buffer();
-
-        userData.writeByte(0x44);
-
-        ConnectionConfirmTpdu tpdu = new ConnectionConfirmTpdu(destinationReference, sourceReference, protocolClass, parameters, userData);
-
-        assertThat(tpdu.getTpduCode(), equalTo(TpduCode.CONNECTION_CONFIRM));
-        assertThat("Unexpected destination reference", tpdu.getDestinationReference(), equalTo((short) 0x3));
-        assertThat("Unexpected source reference", tpdu.getSourceReference(), equalTo((short) 0x4));
-        assertThat(tpdu.getProtocolClass(), equalTo(ProtocolClass.CLASS_1));
-        assertThat("Unexpected parameters", tpdu.getParameters().isEmpty(), is(true));
-        assertThat("Unexpected user data", tpdu.getUserData().readByte(), equalTo((byte) 0x44));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void disconnectionRequestTpdu() {
-        short destinationReference = 0x1;
-        short sourceReference = 0x2;
-        DisconnectReason disconnectReason = DisconnectReason.ADDRESS_UNKNOWN;
-        List<Parameter> parameters = Collections.emptyList();
-        ByteBuf userData = Unpooled.buffer();
-
-        userData.writeByte(0x22);
-
-        DisconnectRequestTpdu tpdu = new DisconnectRequestTpdu(destinationReference, sourceReference, disconnectReason, parameters, userData);
-
-        assertThat(tpdu.getTpduCode(), equalTo(TpduCode.DISCONNECT_REQUEST));
-        assertThat("Unexpected destination reference", tpdu.getDestinationReference(), equalTo((short) 0x1));
-        assertThat("Unexpected source reference", tpdu.getSourceReference(), equalTo((short) 0x2));
-        assertThat(tpdu.getDisconnectReason(), equalTo(DisconnectReason.ADDRESS_UNKNOWN));
-        assertThat("Unexpected parameters", tpdu.getParameters(), empty());
-        assertThat("Unexpected user data", tpdu.getUserData().readByte(), equalTo((byte) 0x22));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void disconnectionConfirmTpdu() {
-        short destinationReference = 0x3;
-        short sourceReference = 0x4;
-        List<Parameter> parameters = Collections.emptyList();
-        ByteBuf userData = Unpooled.buffer();
-
-        userData.writeByte(0x11);
-
-        DisconnectConfirmTpdu tpdu = new DisconnectConfirmTpdu(destinationReference, sourceReference, parameters, userData);
-
-        assertThat(tpdu.getTpduCode(), equalTo(TpduCode.DISCONNECT_CONFIRM));
-        assertThat("Unexpected destination reference", tpdu.getDestinationReference(), equalTo((short) 0x3));
-        assertThat("Unexpected source reference", tpdu.getSourceReference(), equalTo((short) 0x4));
-        assertThat("Unexpected parameters", tpdu.getParameters().isEmpty(), is(true));
-        assertThat("Unexpected user data", tpdu.getUserData().readByte(), equalTo((byte) 0x11));
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.isotp.protocol.model.tpdus;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import org.apache.plc4x.java.isotp.protocol.model.params.CallingTsapParameter;
+import org.apache.plc4x.java.isotp.protocol.model.params.ChecksumParameter;
+import org.apache.plc4x.java.isotp.protocol.model.params.Parameter;
+import org.apache.plc4x.java.isotp.protocol.model.params.TpduSizeParameter;
+import org.apache.plc4x.java.isotp.protocol.model.types.*;
+import org.apache.plc4x.test.FastTests;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
+import static org.hamcrest.collection.IsEmptyCollection.empty;
+import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+
+public class IsotpModelTests {
+
+    @Test
+    @Category(FastTests.class)
+    public void errorTpdu() {
+        short destinationReference = 0x1;
+        RejectCause rejectCause = RejectCause.REASON_NOT_SPECIFIED;
+        List<Parameter> parameters = Collections.emptyList();
+        ByteBuf userData = Unpooled.buffer();
+
+        userData.writeByte(0x7F);
+
+        ErrorTpdu tpdu = new ErrorTpdu(destinationReference, rejectCause, parameters, userData);
+
+        assertThat(tpdu.getTpduCode(), equalTo(TpduCode.TPDU_ERROR));
+        assertThat("Unexpected destination reference", tpdu.getDestinationReference(), equalTo((short) 0x1));
+        assertThat(tpdu.getRejectCause(), equalTo(RejectCause.REASON_NOT_SPECIFIED));
+        assertThat(tpdu.getParameters(), empty() );
+        assertThat("Unexpected user data", tpdu.getUserData().readByte(), equalTo((byte) 0x7F));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void errorTpduParameter() {
+        short destinationReference = 0x1;
+        RejectCause rejectCause = RejectCause.REASON_NOT_SPECIFIED;
+        ArrayList<Parameter> parameters = new ArrayList<>();
+        ByteBuf userData = Unpooled.buffer();
+
+        userData.writeByte(0x7F);
+
+        ErrorTpdu tpdu = new ErrorTpdu(destinationReference, rejectCause, parameters, userData);
+
+        parameters.add(new TpduSizeParameter(TpduSize.SIZE_1024));
+        parameters.add(new ChecksumParameter((byte) 0xFF));
+
+        assertThat("Unexpected number of parameters", tpdu.getParameters(), hasSize(2));
+        assertThat("Unexpected parameter", tpdu.getParameters(), contains(parameters.toArray()));
+        assertThat("Checksum parameter should exist", tpdu.getParameter(ChecksumParameter.class).isPresent(), is(true));
+        assertThat("CallingTsapParameter parameter should not exist", !tpdu.getParameter(CallingTsapParameter.class).isPresent(), is(true));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void dataTpdu() {
+        List<Parameter> parameters = Collections.emptyList();
+        ByteBuf userData = Unpooled.buffer();
+
+        userData.writeByte(0x66);
+
+        DataTpdu tpdu = new DataTpdu(true, (byte) 0x7F, parameters, userData);
+
+        assertThat(tpdu.getTpduCode(), equalTo(TpduCode.DATA));
+        assertThat("Unexpected eot reference", tpdu.isEot(), is(true));
+        assertThat(tpdu.getTpduRef(), equalTo((byte) 0x7F));
+        assertThat("Unexpected parameters", tpdu.getParameters().isEmpty(), is(true));
+        assertThat("Unexpected user data", tpdu.getUserData().readByte(), equalTo((byte) 0x66));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void connectionRequestTpdu() {
+        short destinationReference = 0x1;
+        short sourceReference = 0x2;
+        ProtocolClass protocolClass = ProtocolClass.CLASS_0;
+        List<Parameter> parameters = Collections.emptyList();
+        ByteBuf userData = Unpooled.buffer();
+
+        userData.writeByte(0x33);
+
+        ConnectionRequestTpdu tpdu = new ConnectionRequestTpdu(destinationReference, sourceReference, protocolClass, parameters, userData);
+
+        assertThat(tpdu.getTpduCode(), equalTo(TpduCode.CONNECTION_REQUEST));
+        assertThat("Unexpected destination reference", tpdu.getDestinationReference(), equalTo((short) 0x1));
+        assertThat("Unexpected source reference", tpdu.getSourceReference(), equalTo((short) 0x2));
+        assertThat(tpdu.getProtocolClass(), equalTo(ProtocolClass.CLASS_0));
+        assertThat("Unexpected parameters", tpdu.getParameters().isEmpty(), is(true));
+        assertThat("Unexpected user data", tpdu.getUserData().readByte(), equalTo((byte) 0x33));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void connectionConfirmTpdu() {
+        short destinationReference = 0x3;
+        short sourceReference = 0x4;
+        ProtocolClass protocolClass = ProtocolClass.CLASS_1;
+        List<Parameter> parameters = Collections.emptyList();
+        ByteBuf userData = Unpooled.buffer();
+
+        userData.writeByte(0x44);
+
+        ConnectionConfirmTpdu tpdu = new ConnectionConfirmTpdu(destinationReference, sourceReference, protocolClass, parameters, userData);
+
+        assertThat(tpdu.getTpduCode(), equalTo(TpduCode.CONNECTION_CONFIRM));
+        assertThat("Unexpected destination reference", tpdu.getDestinationReference(), equalTo((short) 0x3));
+        assertThat("Unexpected source reference", tpdu.getSourceReference(), equalTo((short) 0x4));
+        assertThat(tpdu.getProtocolClass(), equalTo(ProtocolClass.CLASS_1));
+        assertThat("Unexpected parameters", tpdu.getParameters().isEmpty(), is(true));
+        assertThat("Unexpected user data", tpdu.getUserData().readByte(), equalTo((byte) 0x44));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void disconnectionRequestTpdu() {
+        short destinationReference = 0x1;
+        short sourceReference = 0x2;
+        DisconnectReason disconnectReason = DisconnectReason.ADDRESS_UNKNOWN;
+        List<Parameter> parameters = Collections.emptyList();
+        ByteBuf userData = Unpooled.buffer();
+
+        userData.writeByte(0x22);
+
+        DisconnectRequestTpdu tpdu = new DisconnectRequestTpdu(destinationReference, sourceReference, disconnectReason, parameters, userData);
+
+        assertThat(tpdu.getTpduCode(), equalTo(TpduCode.DISCONNECT_REQUEST));
+        assertThat("Unexpected destination reference", tpdu.getDestinationReference(), equalTo((short) 0x1));
+        assertThat("Unexpected source reference", tpdu.getSourceReference(), equalTo((short) 0x2));
+        assertThat(tpdu.getDisconnectReason(), equalTo(DisconnectReason.ADDRESS_UNKNOWN));
+        assertThat("Unexpected parameters", tpdu.getParameters(), empty());
+        assertThat("Unexpected user data", tpdu.getUserData().readByte(), equalTo((byte) 0x22));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void disconnectionConfirmTpdu() {
+        short destinationReference = 0x3;
+        short sourceReference = 0x4;
+        List<Parameter> parameters = Collections.emptyList();
+        ByteBuf userData = Unpooled.buffer();
+
+        userData.writeByte(0x11);
+
+        DisconnectConfirmTpdu tpdu = new DisconnectConfirmTpdu(destinationReference, sourceReference, parameters, userData);
+
+        assertThat(tpdu.getTpduCode(), equalTo(TpduCode.DISCONNECT_CONFIRM));
+        assertThat("Unexpected destination reference", tpdu.getDestinationReference(), equalTo((short) 0x3));
+        assertThat("Unexpected source reference", tpdu.getSourceReference(), equalTo((short) 0x4));
+        assertThat("Unexpected parameters", tpdu.getParameters().isEmpty(), is(true));
+        assertThat("Unexpected user data", tpdu.getUserData().readByte(), equalTo((byte) 0x11));
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/iso-tp/src/test/java/org/apache/plc4x/java/isotp/protocol/model/types/IsotpTypeTests.java b/plc4j/protocols/iso-tp/src/test/java/org/apache/plc4x/java/isotp/protocol/model/types/IsotpTypeTests.java
index 3b88a0185c5..984b75d1362 100644
--- a/plc4j/protocols/iso-tp/src/test/java/org/apache/plc4x/java/isotp/protocol/model/types/IsotpTypeTests.java
+++ b/plc4j/protocols/iso-tp/src/test/java/org/apache/plc4x/java/isotp/protocol/model/types/IsotpTypeTests.java
@@ -1,216 +1,216 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.isotp.protocol.model.types;
-
-import org.apache.plc4x.test.FastTests;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.hamcrest.core.IsNot.not;
-import static org.hamcrest.core.IsNull.nullValue;
-import static org.junit.Assert.assertThat;
-
-public class IsotpTypeTests {
-
-    @Test
-    @Category(FastTests.class)
-    public void deviceGroup() {
-        DeviceGroup deviceGroup;
-
-        deviceGroup = DeviceGroup.PG_OR_PC;
-        assertThat(deviceGroup.getCode(), equalTo((byte) 1));
-
-        deviceGroup = DeviceGroup.OS;
-        assertThat(deviceGroup.getCode(), equalTo((byte) 2));
-
-        deviceGroup = DeviceGroup.OTHERS;
-        assertThat(deviceGroup.getCode(), equalTo((byte) 3));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void deviceGroupUnknown() {
-        DeviceGroup deviceGroup = DeviceGroup.valueOf((byte) 0x40);
-
-        assertThat(deviceGroup, nullValue());
-    }
-
-
-    @Test
-    @Category(FastTests.class)
-    public void disconnectReason() {
-        DisconnectReason disconnectReason = DisconnectReason.ADDRESS_UNKNOWN;
-
-        assertThat("3 incorrectly mapped", DisconnectReason.valueOf((byte) 3), equalTo(DisconnectReason.ADDRESS_UNKNOWN));
-        assertThat(disconnectReason.getCode(), equalTo((byte) 3));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void disconnectReasonUnknown() {
-        DisconnectReason disconnectReason = DisconnectReason.valueOf((byte) 4);
-
-        assertThat(disconnectReason, nullValue());
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void parameterCode() {
-        ParameterCode parameterCode = ParameterCode.CALLING_TSAP;
-
-        assertThat(ParameterCode.valueOf((byte) 0xC1), equalTo(ParameterCode.CALLING_TSAP));
-        assertThat(parameterCode.getCode(), equalTo((byte) 0xC1));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void parameterCodeUnknown() {
-        ParameterCode parameterCode = ParameterCode.valueOf((byte) 0x90);
-
-        assertThat(parameterCode, nullValue());
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void protocolClass() {
-        ProtocolClass protocolClass;
-
-        protocolClass = ProtocolClass.CLASS_1;
-        assertThat(protocolClass.getCode(), equalTo((byte) 0x10));
-
-        protocolClass = ProtocolClass.CLASS_2;
-        assertThat(protocolClass.getCode(), equalTo((byte) 0x20));
-
-        protocolClass = ProtocolClass.CLASS_3;
-        assertThat(protocolClass.getCode(), equalTo((byte) 0x30));
-
-        protocolClass = ProtocolClass.CLASS_4;
-        assertThat(protocolClass.getCode(), equalTo((byte) 0x40));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void protocolClassUnknown() {
-        ProtocolClass protocolClass = ProtocolClass.valueOf((byte) 0x50);
-
-        assertThat(protocolClass, nullValue());
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void rejectCause() {
-        RejectCause rejectCause = RejectCause.INVALID_PARAMETER_TYPE;
-
-        assertThat(RejectCause.valueOf((byte) 0x03), equalTo(RejectCause.INVALID_PARAMETER_TYPE));
-        assertThat(rejectCause.getCode(), equalTo((byte) 0x03));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void rejectClauseUnknown() {
-        RejectCause rejectCause = RejectCause.valueOf((byte) 0x90);
-
-        assertThat(rejectCause, nullValue());
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void tpduCode() {
-        TpduCode tpduCode = TpduCode.DATA;
-
-        assertThat(TpduCode.valueOf((byte) 0xF0), equalTo(TpduCode.DATA));
-        assertThat(tpduCode.getCode(), equalTo((byte) 0xF0));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void tpduCodeUnknown() {
-        TpduCode tpduCode = TpduCode.valueOf((byte) 0x01);
-
-        assertThat(TpduCode.valueOf((byte) 0xFF), equalTo(TpduCode.TPDU_UNKNOWN));
-        assertThat(tpduCode.getCode(), equalTo((byte) 0xFF));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void typduSize() {
-        TpduSize tpduSize = TpduSize.SIZE_128;
-
-        assertThat(TpduSize.valueOf((byte) 0x07), equalTo(TpduSize.SIZE_128));
-        assertThat(tpduSize.getCode(), equalTo((byte) 0x07));
-        assertThat(tpduSize.getValue(), equalTo(128));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void tpduSizeUnknown() {
-        TpduSize tpduSize = TpduSize.valueOf((byte) 0x06);
-
-        assertThat(tpduSize, nullValue());
-    }
-
-    /**
-     * If we are requesting exactly the size of one of the iso tp
-     * pdu sizes, then exactly that box should be returned.
-     */
-    @Test
-    @Category(FastTests.class)
-    public void tpduValueForGivenExactFit() {
-        TpduSize tpduSize = TpduSize.valueForGivenSize(256);
-
-        assertThat(tpduSize, equalTo(TpduSize.SIZE_256));
-    }
-
-    /**
-     * In this case we have a given value that is in-between the boundaries of
-     * a pdu box, the method should return the next larger box.
-     */
-    @Test
-    @Category(FastTests.class)
-    public void tpduValueForGivenIntermediateSize() {
-        TpduSize tpduSize = TpduSize.valueForGivenSize(222);
-
-        assertThat(tpduSize, equalTo(TpduSize.SIZE_256));
-        assertThat(tpduSize.getValue(), not(equalTo(222)));
-    }
-
-    /**
-     * This test should cause an exception as the tpdu size has to be greater
-     * than 0 in any case.
-     */
-    @Test(expected = IllegalArgumentException.class)
-    @Category(FastTests.class)
-    public void tpduValueForGivenTooSmallSize() {
-        TpduSize.valueForGivenSize(-1);
-    }
-
-    /**
-     * In this test the tpdu size is greater than the maximum defined by the iso tp
-     * protocol spec, so it is automatically downgraded to the maximum valid value.
-     */
-    @Test
-    @Category(FastTests.class)
-    public void tpduValueForGivenTooGreatSize() {
-        TpduSize tpduSize = TpduSize.valueForGivenSize(10000);
-        assertThat(tpduSize, equalTo(TpduSize.SIZE_8192));
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.isotp.protocol.model.types;
+
+import org.apache.plc4x.test.FastTests;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.core.IsNot.not;
+import static org.hamcrest.core.IsNull.nullValue;
+import static org.junit.Assert.assertThat;
+
+public class IsotpTypeTests {
+
+    @Test
+    @Category(FastTests.class)
+    public void deviceGroup() {
+        DeviceGroup deviceGroup;
+
+        deviceGroup = DeviceGroup.PG_OR_PC;
+        assertThat(deviceGroup.getCode(), equalTo((byte) 1));
+
+        deviceGroup = DeviceGroup.OS;
+        assertThat(deviceGroup.getCode(), equalTo((byte) 2));
+
+        deviceGroup = DeviceGroup.OTHERS;
+        assertThat(deviceGroup.getCode(), equalTo((byte) 3));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void deviceGroupUnknown() {
+        DeviceGroup deviceGroup = DeviceGroup.valueOf((byte) 0x40);
+
+        assertThat(deviceGroup, nullValue());
+    }
+
+
+    @Test
+    @Category(FastTests.class)
+    public void disconnectReason() {
+        DisconnectReason disconnectReason = DisconnectReason.ADDRESS_UNKNOWN;
+
+        assertThat("3 incorrectly mapped", DisconnectReason.valueOf((byte) 3), equalTo(DisconnectReason.ADDRESS_UNKNOWN));
+        assertThat(disconnectReason.getCode(), equalTo((byte) 3));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void disconnectReasonUnknown() {
+        DisconnectReason disconnectReason = DisconnectReason.valueOf((byte) 4);
+
+        assertThat(disconnectReason, nullValue());
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void parameterCode() {
+        ParameterCode parameterCode = ParameterCode.CALLING_TSAP;
+
+        assertThat(ParameterCode.valueOf((byte) 0xC1), equalTo(ParameterCode.CALLING_TSAP));
+        assertThat(parameterCode.getCode(), equalTo((byte) 0xC1));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void parameterCodeUnknown() {
+        ParameterCode parameterCode = ParameterCode.valueOf((byte) 0x90);
+
+        assertThat(parameterCode, nullValue());
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void protocolClass() {
+        ProtocolClass protocolClass;
+
+        protocolClass = ProtocolClass.CLASS_1;
+        assertThat(protocolClass.getCode(), equalTo((byte) 0x10));
+
+        protocolClass = ProtocolClass.CLASS_2;
+        assertThat(protocolClass.getCode(), equalTo((byte) 0x20));
+
+        protocolClass = ProtocolClass.CLASS_3;
+        assertThat(protocolClass.getCode(), equalTo((byte) 0x30));
+
+        protocolClass = ProtocolClass.CLASS_4;
+        assertThat(protocolClass.getCode(), equalTo((byte) 0x40));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void protocolClassUnknown() {
+        ProtocolClass protocolClass = ProtocolClass.valueOf((byte) 0x50);
+
+        assertThat(protocolClass, nullValue());
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void rejectCause() {
+        RejectCause rejectCause = RejectCause.INVALID_PARAMETER_TYPE;
+
+        assertThat(RejectCause.valueOf((byte) 0x03), equalTo(RejectCause.INVALID_PARAMETER_TYPE));
+        assertThat(rejectCause.getCode(), equalTo((byte) 0x03));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void rejectClauseUnknown() {
+        RejectCause rejectCause = RejectCause.valueOf((byte) 0x90);
+
+        assertThat(rejectCause, nullValue());
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void tpduCode() {
+        TpduCode tpduCode = TpduCode.DATA;
+
+        assertThat(TpduCode.valueOf((byte) 0xF0), equalTo(TpduCode.DATA));
+        assertThat(tpduCode.getCode(), equalTo((byte) 0xF0));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void tpduCodeUnknown() {
+        TpduCode tpduCode = TpduCode.valueOf((byte) 0x01);
+
+        assertThat(TpduCode.valueOf((byte) 0xFF), equalTo(TpduCode.TPDU_UNKNOWN));
+        assertThat(tpduCode.getCode(), equalTo((byte) 0xFF));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void typduSize() {
+        TpduSize tpduSize = TpduSize.SIZE_128;
+
+        assertThat(TpduSize.valueOf((byte) 0x07), equalTo(TpduSize.SIZE_128));
+        assertThat(tpduSize.getCode(), equalTo((byte) 0x07));
+        assertThat(tpduSize.getValue(), equalTo(128));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void tpduSizeUnknown() {
+        TpduSize tpduSize = TpduSize.valueOf((byte) 0x06);
+
+        assertThat(tpduSize, nullValue());
+    }
+
+    /**
+     * If we are requesting exactly the size of one of the iso tp
+     * pdu sizes, then exactly that box should be returned.
+     */
+    @Test
+    @Category(FastTests.class)
+    public void tpduValueForGivenExactFit() {
+        TpduSize tpduSize = TpduSize.valueForGivenSize(256);
+
+        assertThat(tpduSize, equalTo(TpduSize.SIZE_256));
+    }
+
+    /**
+     * In this case we have a given value that is in-between the boundaries of
+     * a pdu box, the method should return the next larger box.
+     */
+    @Test
+    @Category(FastTests.class)
+    public void tpduValueForGivenIntermediateSize() {
+        TpduSize tpduSize = TpduSize.valueForGivenSize(222);
+
+        assertThat(tpduSize, equalTo(TpduSize.SIZE_256));
+        assertThat(tpduSize.getValue(), not(equalTo(222)));
+    }
+
+    /**
+     * This test should cause an exception as the tpdu size has to be greater
+     * than 0 in any case.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    @Category(FastTests.class)
+    public void tpduValueForGivenTooSmallSize() {
+        TpduSize.valueForGivenSize(-1);
+    }
+
+    /**
+     * In this test the tpdu size is greater than the maximum defined by the iso tp
+     * protocol spec, so it is automatically downgraded to the maximum valid value.
+     */
+    @Test
+    @Category(FastTests.class)
+    public void tpduValueForGivenTooGreatSize() {
+        TpduSize tpduSize = TpduSize.valueForGivenSize(10000);
+        assertThat(tpduSize, equalTo(TpduSize.SIZE_8192));
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/modbus/pom.xml b/plc4j/protocols/modbus/pom.xml
index 6958d4074a6..731c756952a 100644
--- a/plc4j/protocols/modbus/pom.xml
+++ b/plc4j/protocols/modbus/pom.xml
@@ -1,129 +1,129 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-protocols</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-protocol-modbus</artifactId>
-  <name>PLC4J: Protocol: Modbus</name>
-  <description>Implementation of a PLC4X driver able to speak with Modbus devices using the Modbus protocol.
-  </description>
-
-  <properties>
-    <modbus-driver.version>1.1.0</modbus-driver.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <!-- Just for reference can be removed later-->
-      <groupId>com.digitalpetri.modbus</groupId>
-      <artifactId>modbus-master-tcp</artifactId>
-      <version>${modbus-driver.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.digitalpetri.modbus</groupId>
-      <artifactId>modbus-core</artifactId>
-      <version>${modbus-driver.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.digitalpetri.modbus</groupId>
-      <artifactId>modbus-codec</artifactId>
-      <version>${modbus-driver.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-buffer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-codec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base-test</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>check-dependencies</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>analyze-only</goal>
-            </goals>
-            <configuration>
-              <failOnWarning>true</failOnWarning>
-              <ignoredDependencies combine.children="append">
-                <ignoredDependency>commons-io:commons-io</ignoredDependency>
-                <ignoredDependency>com.digitalpetri.modbus:modbus-master-tcp</ignoredDependency>
-              </ignoredDependencies>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-protocols</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-protocol-modbus</artifactId>
+  <name>PLC4J: Protocol: Modbus</name>
+  <description>Implementation of a PLC4X driver able to speak with Modbus devices using the Modbus protocol.
+  </description>
+
+  <properties>
+    <modbus-driver.version>1.1.0</modbus-driver.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <!-- Just for reference can be removed later-->
+      <groupId>com.digitalpetri.modbus</groupId>
+      <artifactId>modbus-master-tcp</artifactId>
+      <version>${modbus-driver.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.digitalpetri.modbus</groupId>
+      <artifactId>modbus-core</artifactId>
+      <version>${modbus-driver.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.digitalpetri.modbus</groupId>
+      <artifactId>modbus-codec</artifactId>
+      <version>${modbus-driver.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base-test</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>check-dependencies</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>analyze-only</goal>
+            </goals>
+            <configuration>
+              <failOnWarning>true</failOnWarning>
+              <ignoredDependencies combine.children="append">
+                <ignoredDependency>commons-io:commons-io</ignoredDependency>
+                <ignoredDependency>com.digitalpetri.modbus:modbus-master-tcp</ignoredDependency>
+              </ignoredDependencies>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/messages/items/DefaultModbusByteArrayFieldItem.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/messages/items/DefaultModbusByteArrayFieldItem.java
index 4f335c9f920..e179d84d883 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/messages/items/DefaultModbusByteArrayFieldItem.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/messages/items/DefaultModbusByteArrayFieldItem.java
@@ -1,327 +1,327 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.modbus.messages.items;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import java.nio.ByteOrder;
-import java.nio.charset.Charset;
-import java.util.Arrays;
-import java.util.stream.Stream;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.plc4x.java.base.messages.items.DefaultByteArrayFieldItem;
-
-/**
- * default implementation for DefaultByteArrayFieldItem for Usage within Modbus module
- * default ByteOrder is set to BIG_ENDIAN, can be selected on regarding get-method explicitly from user if needed
- */
-public class DefaultModbusByteArrayFieldItem extends DefaultByteArrayFieldItem {
-
-    private static final int SHORT_BYTES = 2;
-    private static final int INTEGER_BYTES = 4;
-    private static final int LONG_BYTES = 8;
-    private static final ByteOrder DEFAULT_ENDIANNESS = ByteOrder.BIG_ENDIAN;
-
-    private ByteOrder byteOrder;
-
-    private Byte[] completeByteArray;
-    private byte[] backend;
-    
-    private ByteBuf byteBuf = null;
-
-    public DefaultModbusByteArrayFieldItem(Byte[]... values) {
-        super(values);
-        this.byteOrder = DEFAULT_ENDIANNESS;
-        this.completeByteArray = Arrays.stream(getValues()).flatMap(Stream::of).toArray(Byte[]::new);
-        this.backend = ArrayUtils.toPrimitive(completeByteArray);
-        byteBuf = Unpooled.wrappedBuffer(backend);
-    }
-
-    @Override
-    public Object getObject(int index) {
-        return getValue(index);
-    }
-
-    @Override
-    public boolean isValidByteArray(int index) {
-        Byte[] value = getValue(index);
-        return value != null;
-    }
-
-    @Override
-    public Byte[] getByteArray(int index) {
-        return getByteArrayFromIndex(index);
-    }
-
-    @Override
-    public boolean isValidShort(int index) {
-        try{
-            short b = byteBuf.getShort(index*Short.BYTES);
-            return true;
-        } catch(Exception ex){
-            return false;
-        }
-    }
-
-    @Override
-    public Short getShort(int index) {
-        if (!isValidShort(index)){
-            return null;
-        }
-        return byteBuf.getShort(index*Short.BYTES);
-    }
-
-    /**
-     * returns the short result for the given index with explicit chose of ByteOrder
-     *
-     * @param index     index in relation to the requested data-type (here Short), see comment of regarding index-transformation
-     * @param byteOrder byte-order used for decoding of byte-array
-     * @return resulting short value if valid data is given, null otherwise
-     */
-    public Short getShort(int index, ByteOrder byteOrder) {
-        if (!isValidShort(index)) {
-            return null;
-        }
-        if (byteOrder.equals(ByteOrder.LITTLE_ENDIAN)) {
-            return byteBuf.getShortLE(index*Short.BYTES);            
-        } else {
-            return byteBuf.getShort(index*Short.BYTES);            
-        }
-
-    }
-
-    /**
-     * converts the starting index of a short array to source type Byte
-     * e.g. user wants to request the 2nd long value --&gt; index=1 --&gt; byteIndex=2
-     *
-     * @param shortIndex index from users view
-     * @return resulting byteArrayIndex
-     */
-    private static int shortIndexToByteIndex(int shortIndex) {
-        return shortIndex * SHORT_BYTES;
-    }
-
-    @Override
-    public boolean isValidInteger(int index) {
-        try{
-            int b = byteBuf.getInt(index*Integer.BYTES);
-            return true;
-        } catch(Exception ex){
-            return false;
-        }
-    }
-
-    @Override
-    public Integer getInteger(int index) {
-        if (!isValidInteger(index)){
-            return null;
-        }
-        return byteBuf.getInt(index*Integer.BYTES);
-    }
-
-    /**
-     * returns the int result for the given index with explicit chose of ByteOrder
-     *
-     * @param index     index in relation to the requested data-type (here Integer), see comment of regarding index-transformation
-     * @param byteOrder byte-order used for decoding of byte-array
-     * @return resulting short value if valid data is given, null otherwise
-     */
-    public Integer getInteger(int index, ByteOrder byteOrder) {
-        if (!isValidInteger(index)) {
-            return null;
-        }
-        if (byteOrder.equals(ByteOrder.LITTLE_ENDIAN)) {
-            return byteBuf.getIntLE(index*Integer.BYTES);            
-        } else {
-            return byteBuf.getInt(index*Integer.BYTES);            
-        }
-    }
-
-    /**
-     * converts the starting index of an int array to source type Byte
-     * e.g. user wants to request the 4th integer value --&gt; index=3 --&gt; byteIndex=12
-     *
-     * @param intIndex index from users view
-     * @return resulting byteArrayIndex
-     */
-    private static int intIndexToByteIndex(int intIndex) {
-        return intIndex * INTEGER_BYTES;
-    }
-
-    @Override
-    public boolean isValidLong(int index) {
-        try{
-            long b = byteBuf.getLong(index*Long.BYTES);
-            return true;
-        } catch(Exception ex){
-            return false;
-        }
-    }
-
-    @Override
-    public Long getLong(int index) {
-        if (!isValidLong(index)){
-            return null;
-        }
-        return byteBuf.getLong(index*Long.BYTES);
-    }
-
-    /**
-     * returns the long result for the given index with explicit chose of ByteOrder
-     *
-     * @param index     index in relation to the requested data-type (here Long), see comment of regarding index-transformation
-     * @param byteOrder byte-order used for decoding of byte-array
-     * @return resulting short value if valid data is given, null otherwise
-     */
-    public Long getLong(int index, ByteOrder byteOrder) {
-        if (!isValidLong(index)) {
-            return null;
-        }
-        if (byteOrder.equals(ByteOrder.LITTLE_ENDIAN)) {
-            return byteBuf.getLongLE(index*Long.BYTES);            
-        } else {
-            return byteBuf.getLong(index*Long.BYTES);            
-        }
-    }
-
-    /**
-     * converts the starting index of a long array to source type Byte
-     * e.g. user wants to request the 3rd long value --&gt; index=2 --&gt; byteIndex=16
-     *
-     * @param longIndex index from users view
-     * @return resulting byteArrayIndex
-     */
-    private static int longIndexToByteIndex(int longIndex) {
-        return longIndex * LONG_BYTES;
-    }
-
-    /**
-     * returns a subarray with the wanted index first
-     *
-     * @param index start-index of wanted value
-     * @return the sub-array
-     */
-    private Byte[] getByteArrayFromIndex(int index) {
-        if (index > this.completeByteArray.length) {
-            return new Byte[0];
-        }
-        return Arrays.copyOfRange(this.completeByteArray, index, this.completeByteArray.length);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        if (!super.equals(o)) {
-            return false;
-        }
-        DefaultModbusByteArrayFieldItem that = (DefaultModbusByteArrayFieldItem) o;
-        return Arrays.equals(completeByteArray, that.completeByteArray);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = super.hashCode();
-        result = 31 * result + Arrays.hashCode(completeByteArray);
-        return result;
-    }
-
-    //ToDo: Implement conversion for Float and Unsigned-Datatypes
-
-    @Override
-    public boolean isValidByte(int index) {
-        try{
-            byte b = byteBuf.getByte(index);
-            return true;
-        } catch(Exception ex){
-            return false;
-        }
-    }
-    
-    @Override
-    public Byte getByte(int index) {
-        if (!isValidByte(index)){
-            return null;
-        }
-        return byteBuf.getByte(index);
-    }
-    
-    @Override
-    public boolean isValidFloat(int index) {
-        try{
-            float f = byteBuf.getFloat(index*Float.BYTES);
-            return true;
-        } catch(Exception ex){
-            return false;
-        }
-    }
-
-    @Override
-    public Float getFloat(int index) {
-        if (!isValidFloat(index)){
-            return null;
-        }
-        return byteBuf.getFloat(index*Float.BYTES);
-    }
-  
-    @Override
-    public boolean isValidDouble(int index) {
-        try{
-            double f = byteBuf.getDouble(index*Double.BYTES);
-            return true;
-        } catch(Exception ex){
-            return false;
-        }
-    }
-
-    @Override
-    public Double getDouble(int index) {
-        if (!isValidDouble(index)){
-            return null;
-        }
-        return byteBuf.getDouble(index*Double.BYTES);
-    }    
-  
-    //TODO: index or index*2? String is byte oriented.
-    @Override
-    public boolean isValidString(int index) {
-        try{
-            CharSequence s = byteBuf.getCharSequence(index*2, byteBuf.readableBytes(), Charset.defaultCharset());
-            return true;
-        } catch(Exception ex){
-            return false;
-        }
-    }
-
-    @Override
-    public String getString(int index) {
-        if (!isValidString(index)){
-            return null;
-        }
-        CharSequence s = byteBuf.getCharSequence(index*2, byteBuf.readableBytes(), Charset.defaultCharset());        
-        return s.toString();
-    }    
-    
-    
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.modbus.messages.items;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import java.nio.ByteOrder;
+import java.nio.charset.Charset;
+import java.util.Arrays;
+import java.util.stream.Stream;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.plc4x.java.base.messages.items.DefaultByteArrayFieldItem;
+
+/**
+ * default implementation for DefaultByteArrayFieldItem for Usage within Modbus module
+ * default ByteOrder is set to BIG_ENDIAN, can be selected on regarding get-method explicitly from user if needed
+ */
+public class DefaultModbusByteArrayFieldItem extends DefaultByteArrayFieldItem {
+
+    private static final int SHORT_BYTES = 2;
+    private static final int INTEGER_BYTES = 4;
+    private static final int LONG_BYTES = 8;
+    private static final ByteOrder DEFAULT_ENDIANNESS = ByteOrder.BIG_ENDIAN;
+
+    private ByteOrder byteOrder;
+
+    private Byte[] completeByteArray;
+    private byte[] backend;
+    
+    private ByteBuf byteBuf = null;
+
+    public DefaultModbusByteArrayFieldItem(Byte[]... values) {
+        super(values);
+        this.byteOrder = DEFAULT_ENDIANNESS;
+        this.completeByteArray = Arrays.stream(getValues()).flatMap(Stream::of).toArray(Byte[]::new);
+        this.backend = ArrayUtils.toPrimitive(completeByteArray);
+        byteBuf = Unpooled.wrappedBuffer(backend);
+    }
+
+    @Override
+    public Object getObject(int index) {
+        return getValue(index);
+    }
+
+    @Override
+    public boolean isValidByteArray(int index) {
+        Byte[] value = getValue(index);
+        return value != null;
+    }
+
+    @Override
+    public Byte[] getByteArray(int index) {
+        return getByteArrayFromIndex(index);
+    }
+
+    @Override
+    public boolean isValidShort(int index) {
+        try{
+            short b = byteBuf.getShort(index*Short.BYTES);
+            return true;
+        } catch(Exception ex){
+            return false;
+        }
+    }
+
+    @Override
+    public Short getShort(int index) {
+        if (!isValidShort(index)){
+            return null;
+        }
+        return byteBuf.getShort(index*Short.BYTES);
+    }
+
+    /**
+     * returns the short result for the given index with explicit chose of ByteOrder
+     *
+     * @param index     index in relation to the requested data-type (here Short), see comment of regarding index-transformation
+     * @param byteOrder byte-order used for decoding of byte-array
+     * @return resulting short value if valid data is given, null otherwise
+     */
+    public Short getShort(int index, ByteOrder byteOrder) {
+        if (!isValidShort(index)) {
+            return null;
+        }
+        if (byteOrder.equals(ByteOrder.LITTLE_ENDIAN)) {
+            return byteBuf.getShortLE(index*Short.BYTES);            
+        } else {
+            return byteBuf.getShort(index*Short.BYTES);            
+        }
+
+    }
+
+    /**
+     * converts the starting index of a short array to source type Byte
+     * e.g. user wants to request the 2nd long value --&gt; index=1 --&gt; byteIndex=2
+     *
+     * @param shortIndex index from users view
+     * @return resulting byteArrayIndex
+     */
+    private static int shortIndexToByteIndex(int shortIndex) {
+        return shortIndex * SHORT_BYTES;
+    }
+
+    @Override
+    public boolean isValidInteger(int index) {
+        try{
+            int b = byteBuf.getInt(index*Integer.BYTES);
+            return true;
+        } catch(Exception ex){
+            return false;
+        }
+    }
+
+    @Override
+    public Integer getInteger(int index) {
+        if (!isValidInteger(index)){
+            return null;
+        }
+        return byteBuf.getInt(index*Integer.BYTES);
+    }
+
+    /**
+     * returns the int result for the given index with explicit chose of ByteOrder
+     *
+     * @param index     index in relation to the requested data-type (here Integer), see comment of regarding index-transformation
+     * @param byteOrder byte-order used for decoding of byte-array
+     * @return resulting short value if valid data is given, null otherwise
+     */
+    public Integer getInteger(int index, ByteOrder byteOrder) {
+        if (!isValidInteger(index)) {
+            return null;
+        }
+        if (byteOrder.equals(ByteOrder.LITTLE_ENDIAN)) {
+            return byteBuf.getIntLE(index*Integer.BYTES);            
+        } else {
+            return byteBuf.getInt(index*Integer.BYTES);            
+        }
+    }
+
+    /**
+     * converts the starting index of an int array to source type Byte
+     * e.g. user wants to request the 4th integer value --&gt; index=3 --&gt; byteIndex=12
+     *
+     * @param intIndex index from users view
+     * @return resulting byteArrayIndex
+     */
+    private static int intIndexToByteIndex(int intIndex) {
+        return intIndex * INTEGER_BYTES;
+    }
+
+    @Override
+    public boolean isValidLong(int index) {
+        try{
+            long b = byteBuf.getLong(index*Long.BYTES);
+            return true;
+        } catch(Exception ex){
+            return false;
+        }
+    }
+
+    @Override
+    public Long getLong(int index) {
+        if (!isValidLong(index)){
+            return null;
+        }
+        return byteBuf.getLong(index*Long.BYTES);
+    }
+
+    /**
+     * returns the long result for the given index with explicit chose of ByteOrder
+     *
+     * @param index     index in relation to the requested data-type (here Long), see comment of regarding index-transformation
+     * @param byteOrder byte-order used for decoding of byte-array
+     * @return resulting short value if valid data is given, null otherwise
+     */
+    public Long getLong(int index, ByteOrder byteOrder) {
+        if (!isValidLong(index)) {
+            return null;
+        }
+        if (byteOrder.equals(ByteOrder.LITTLE_ENDIAN)) {
+            return byteBuf.getLongLE(index*Long.BYTES);            
+        } else {
+            return byteBuf.getLong(index*Long.BYTES);            
+        }
+    }
+
+    /**
+     * converts the starting index of a long array to source type Byte
+     * e.g. user wants to request the 3rd long value --&gt; index=2 --&gt; byteIndex=16
+     *
+     * @param longIndex index from users view
+     * @return resulting byteArrayIndex
+     */
+    private static int longIndexToByteIndex(int longIndex) {
+        return longIndex * LONG_BYTES;
+    }
+
+    /**
+     * returns a subarray with the wanted index first
+     *
+     * @param index start-index of wanted value
+     * @return the sub-array
+     */
+    private Byte[] getByteArrayFromIndex(int index) {
+        if (index > this.completeByteArray.length) {
+            return new Byte[0];
+        }
+        return Arrays.copyOfRange(this.completeByteArray, index, this.completeByteArray.length);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+        DefaultModbusByteArrayFieldItem that = (DefaultModbusByteArrayFieldItem) o;
+        return Arrays.equals(completeByteArray, that.completeByteArray);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Arrays.hashCode(completeByteArray);
+        return result;
+    }
+
+    //ToDo: Implement conversion for Float and Unsigned-Datatypes
+
+    @Override
+    public boolean isValidByte(int index) {
+        try{
+            byte b = byteBuf.getByte(index);
+            return true;
+        } catch(Exception ex){
+            return false;
+        }
+    }
+    
+    @Override
+    public Byte getByte(int index) {
+        if (!isValidByte(index)){
+            return null;
+        }
+        return byteBuf.getByte(index);
+    }
+    
+    @Override
+    public boolean isValidFloat(int index) {
+        try{
+            float f = byteBuf.getFloat(index*Float.BYTES);
+            return true;
+        } catch(Exception ex){
+            return false;
+        }
+    }
+
+    @Override
+    public Float getFloat(int index) {
+        if (!isValidFloat(index)){
+            return null;
+        }
+        return byteBuf.getFloat(index*Float.BYTES);
+    }
+  
+    @Override
+    public boolean isValidDouble(int index) {
+        try{
+            double f = byteBuf.getDouble(index*Double.BYTES);
+            return true;
+        } catch(Exception ex){
+            return false;
+        }
+    }
+
+    @Override
+    public Double getDouble(int index) {
+        if (!isValidDouble(index)){
+            return null;
+        }
+        return byteBuf.getDouble(index*Double.BYTES);
+    }    
+  
+    //TODO: index or index*2? String is byte oriented.
+    @Override
+    public boolean isValidString(int index) {
+        try{
+            CharSequence s = byteBuf.getCharSequence(index*2, byteBuf.readableBytes(), Charset.defaultCharset());
+            return true;
+        } catch(Exception ex){
+            return false;
+        }
+    }
+
+    @Override
+    public String getString(int index) {
+        if (!isValidString(index)){
+            return null;
+        }
+        CharSequence s = byteBuf.getCharSequence(index*2, byteBuf.readableBytes(), Charset.defaultCharset());        
+        return s.toString();
+    }    
+    
+    
+}
+
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/CoilModbusField.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/CoilModbusField.java
index 48acc403893..614fda77e91 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/CoilModbusField.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/CoilModbusField.java
@@ -1,48 +1,48 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.modbus.model;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-
-public class CoilModbusField extends ModbusField {
-
-    public static final Pattern ADDRESS_PATTERN = Pattern.compile("coil:" + ModbusField.ADDRESS_PATTERN);
-
-    public CoilModbusField(int address, Integer quantity) {
-        super(address, quantity);
-    }
-
-    public static CoilModbusField of(String addressString) throws PlcInvalidFieldException {
-        Matcher matcher = ADDRESS_PATTERN.matcher(addressString);
-        if (!matcher.matches()) {
-            throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN);
-        }
-        int address = Integer.parseInt(matcher.group("address"));
-
-        String quantityString = matcher.group("quantity");
-        Integer quantity = quantityString != null ? Integer.valueOf(quantityString) : null;
-        if (quantity != null){ 
-            if ((quantity < 0) || (quantity > 2000)) throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN);
-        }
-        
-        return new CoilModbusField(address, quantity);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.modbus.model;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+
+public class CoilModbusField extends ModbusField {
+
+    public static final Pattern ADDRESS_PATTERN = Pattern.compile("coil:" + ModbusField.ADDRESS_PATTERN);
+
+    public CoilModbusField(int address, Integer quantity) {
+        super(address, quantity);
+    }
+
+    public static CoilModbusField of(String addressString) throws PlcInvalidFieldException {
+        Matcher matcher = ADDRESS_PATTERN.matcher(addressString);
+        if (!matcher.matches()) {
+            throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN);
+        }
+        int address = Integer.parseInt(matcher.group("address"));
+
+        String quantityString = matcher.group("quantity");
+        Integer quantity = quantityString != null ? Integer.valueOf(quantityString) : null;
+        if (quantity != null){ 
+            if ((quantity < 0) || (quantity > 2000)) throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN);
+        }
+        
+        return new CoilModbusField(address, quantity);
+    }
+}
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/MaskWriteRegisterModbusField.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/MaskWriteRegisterModbusField.java
index 2d4870d9c47..f5b3ca8e169 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/MaskWriteRegisterModbusField.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/MaskWriteRegisterModbusField.java
@@ -1,91 +1,91 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.modbus.model;
-
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-
-import java.util.Objects;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class MaskWriteRegisterModbusField extends ModbusField {
-
-    public static final Pattern ADDRESS_PATTERN = Pattern.compile("maskwrite:" + ModbusField.ADDRESS_PATTERN + "/" + "(?<andMask>\\d+)/(?<orMask>\\d+)");
-
-    private final int andMask;
-    private final int orMask;
-
-    protected MaskWriteRegisterModbusField(int address, int andMask, int orMask, Integer quantity) {
-        super(address, quantity);
-        this.andMask = andMask;
-        this.orMask = orMask;
-    }
-
-    public static MaskWriteRegisterModbusField of(String addressString) throws PlcInvalidFieldException {
-        Matcher matcher = ADDRESS_PATTERN.matcher(addressString);
-        if (!matcher.matches()) {
-            throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN);
-        }
-        int address = Integer.parseInt(matcher.group("address"));
-        int andMask = Integer.parseInt(matcher.group("andMask"));
-        int orMask = Integer.parseInt(matcher.group("orMask"));
-
-        String quantityString = matcher.group("quantity");
-        Integer quantity = quantityString != null ? Integer.valueOf(quantityString) : null;
-        return new MaskWriteRegisterModbusField(address, andMask, orMask, quantity);
-    }
-
-    public int getAndMask() {
-        return andMask;
-    }
-
-    public int getOrMask() {
-        return orMask;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof MaskWriteRegisterModbusField)) {
-            return false;
-        }
-        if (!super.equals(o)) {
-            return false;
-        }
-        MaskWriteRegisterModbusField that = (MaskWriteRegisterModbusField) o;
-        return andMask == that.andMask &&
-            orMask == that.orMask;
-    }
-
-    @Override
-    public int hashCode() {
-
-        return Objects.hash(super.hashCode(), andMask, orMask);
-    }
-
-    @Override
-    public String toString() {
-        return "MaskWriteRegisterModbusField{" +
-            "andMask=" + andMask +
-            ", orMask=" + orMask +
-            "} " + super.toString();
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.modbus.model;
+
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+
+import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class MaskWriteRegisterModbusField extends ModbusField {
+
+    public static final Pattern ADDRESS_PATTERN = Pattern.compile("maskwrite:" + ModbusField.ADDRESS_PATTERN + "/" + "(?<andMask>\\d+)/(?<orMask>\\d+)");
+
+    private final int andMask;
+    private final int orMask;
+
+    protected MaskWriteRegisterModbusField(int address, int andMask, int orMask, Integer quantity) {
+        super(address, quantity);
+        this.andMask = andMask;
+        this.orMask = orMask;
+    }
+
+    public static MaskWriteRegisterModbusField of(String addressString) throws PlcInvalidFieldException {
+        Matcher matcher = ADDRESS_PATTERN.matcher(addressString);
+        if (!matcher.matches()) {
+            throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN);
+        }
+        int address = Integer.parseInt(matcher.group("address"));
+        int andMask = Integer.parseInt(matcher.group("andMask"));
+        int orMask = Integer.parseInt(matcher.group("orMask"));
+
+        String quantityString = matcher.group("quantity");
+        Integer quantity = quantityString != null ? Integer.valueOf(quantityString) : null;
+        return new MaskWriteRegisterModbusField(address, andMask, orMask, quantity);
+    }
+
+    public int getAndMask() {
+        return andMask;
+    }
+
+    public int getOrMask() {
+        return orMask;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof MaskWriteRegisterModbusField)) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+        MaskWriteRegisterModbusField that = (MaskWriteRegisterModbusField) o;
+        return andMask == that.andMask &&
+            orMask == that.orMask;
+    }
+
+    @Override
+    public int hashCode() {
+
+        return Objects.hash(super.hashCode(), andMask, orMask);
+    }
+
+    @Override
+    public String toString() {
+        return "MaskWriteRegisterModbusField{" +
+            "andMask=" + andMask +
+            ", orMask=" + orMask +
+            "} " + super.toString();
+    }
+}
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ModbusField.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ModbusField.java
index c0d4eca0051..b171ebcafb8 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ModbusField.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ModbusField.java
@@ -1,73 +1,73 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.modbus.model;
-
-import java.util.Objects;
-import java.util.regex.Pattern;
-import org.apache.plc4x.java.api.model.PlcField;
-
-public abstract class ModbusField implements PlcField {
-
-    public static final Pattern ADDRESS_PATTERN = Pattern.compile("(?<address>\\d+)(\\[(?<quantity>\\d+?)])?");
-
-    private final int address;
-
-    private final int quantity;
-
-    protected ModbusField(int address, Integer quantity) {
-        this.address = address;
-        this.quantity = quantity != null ? quantity : 1;
-        if (this.quantity <= 0) {
-            throw new IllegalArgumentException("quantity must be greater then zero. Was " + this.quantity);
-        }
-    }
-
-    public int getAddress() {
-        return address;
-    }
-
-    public int getQuantity() {
-        return quantity;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof ModbusField)) {
-            return false;
-        }
-        ModbusField that = (ModbusField) o;
-        return address == that.address;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(address);
-    }
-
-    @Override
-    public String toString() {
-        return "ModbusField{" +
-            "address=" + address +
-            ",quantity=" + quantity +
-            '}';
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.modbus.model;
+
+import java.util.Objects;
+import java.util.regex.Pattern;
+import org.apache.plc4x.java.api.model.PlcField;
+
+public abstract class ModbusField implements PlcField {
+
+    public static final Pattern ADDRESS_PATTERN = Pattern.compile("(?<address>\\d+)(\\[(?<quantity>\\d+?)])?");
+
+    private final int address;
+
+    private final int quantity;
+
+    protected ModbusField(int address, Integer quantity) {
+        this.address = address;
+        this.quantity = quantity != null ? quantity : 1;
+        if (this.quantity <= 0) {
+            throw new IllegalArgumentException("quantity must be greater then zero. Was " + this.quantity);
+        }
+    }
+
+    public int getAddress() {
+        return address;
+    }
+
+    public int getQuantity() {
+        return quantity;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof ModbusField)) {
+            return false;
+        }
+        ModbusField that = (ModbusField) o;
+        return address == that.address;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(address);
+    }
+
+    @Override
+    public String toString() {
+        return "ModbusField{" +
+            "address=" + address +
+            ",quantity=" + quantity +
+            '}';
+    }
+}
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadDiscreteInputsModbusField.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadDiscreteInputsModbusField.java
index 18ce8d54191..5edc69b1a16 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadDiscreteInputsModbusField.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadDiscreteInputsModbusField.java
@@ -1,48 +1,48 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.modbus.model;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-
-public class ReadDiscreteInputsModbusField extends ModbusField {
-
-    public static final Pattern ADDRESS_PATTERN = Pattern.compile("readdiscreteinputs:" + ModbusField.ADDRESS_PATTERN);
-
-    public ReadDiscreteInputsModbusField(int address, Integer quantity) {
-        super(address, quantity);
-    }
-
-    public static ReadDiscreteInputsModbusField of(String addressString) throws PlcInvalidFieldException {
-        Matcher matcher = ADDRESS_PATTERN.matcher(addressString);
-        if (!matcher.matches()) {
-            throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN);
-        }
-        int address = Integer.parseInt(matcher.group("address"));
-
-        String quantityString = matcher.group("quantity");
-        Integer quantity = quantityString != null ? Integer.valueOf(quantityString) : null;  
-        if (quantity != null) {
-            if ((quantity < 0) || (quantity > 2000)) throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN);
-        }
-        
-        return new ReadDiscreteInputsModbusField(address, quantity);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.modbus.model;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+
+public class ReadDiscreteInputsModbusField extends ModbusField {
+
+    public static final Pattern ADDRESS_PATTERN = Pattern.compile("readdiscreteinputs:" + ModbusField.ADDRESS_PATTERN);
+
+    public ReadDiscreteInputsModbusField(int address, Integer quantity) {
+        super(address, quantity);
+    }
+
+    public static ReadDiscreteInputsModbusField of(String addressString) throws PlcInvalidFieldException {
+        Matcher matcher = ADDRESS_PATTERN.matcher(addressString);
+        if (!matcher.matches()) {
+            throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN);
+        }
+        int address = Integer.parseInt(matcher.group("address"));
+
+        String quantityString = matcher.group("quantity");
+        Integer quantity = quantityString != null ? Integer.valueOf(quantityString) : null;  
+        if (quantity != null) {
+            if ((quantity < 0) || (quantity > 2000)) throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN);
+        }
+        
+        return new ReadDiscreteInputsModbusField(address, quantity);
+    }
+}
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadHoldingRegistersModbusField.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadHoldingRegistersModbusField.java
index b21f50fa83b..839b1ef315d 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadHoldingRegistersModbusField.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadHoldingRegistersModbusField.java
@@ -1,48 +1,48 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.modbus.model;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-
-public class ReadHoldingRegistersModbusField extends ModbusField {
-
-    public static final Pattern ADDRESS_PATTERN = Pattern.compile("readholdingregisters:" + ModbusField.ADDRESS_PATTERN);
-
-    protected ReadHoldingRegistersModbusField(int address, Integer quantity) {
-        super(address, quantity);
-    }
-
-    public static ReadHoldingRegistersModbusField of(String addressString) throws PlcInvalidFieldException {
-        Matcher matcher = ADDRESS_PATTERN.matcher(addressString);
-        if (!matcher.matches()) {
-            throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN);
-        }
-        int address = Integer.parseInt(matcher.group("address"));
-
-        String quantityString = matcher.group("quantity");
-        Integer quantity = quantityString != null ? Integer.valueOf(quantityString) : null;
-        if (quantity != null) {
-            if ((quantity < 0) || (quantity > 125)) throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN);   
-        }
-        
-        return new ReadHoldingRegistersModbusField(address, quantity);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.modbus.model;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+
+public class ReadHoldingRegistersModbusField extends ModbusField {
+
+    public static final Pattern ADDRESS_PATTERN = Pattern.compile("readholdingregisters:" + ModbusField.ADDRESS_PATTERN);
+
+    protected ReadHoldingRegistersModbusField(int address, Integer quantity) {
+        super(address, quantity);
+    }
+
+    public static ReadHoldingRegistersModbusField of(String addressString) throws PlcInvalidFieldException {
+        Matcher matcher = ADDRESS_PATTERN.matcher(addressString);
+        if (!matcher.matches()) {
+            throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN);
+        }
+        int address = Integer.parseInt(matcher.group("address"));
+
+        String quantityString = matcher.group("quantity");
+        Integer quantity = quantityString != null ? Integer.valueOf(quantityString) : null;
+        if (quantity != null) {
+            if ((quantity < 0) || (quantity > 125)) throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN);   
+        }
+        
+        return new ReadHoldingRegistersModbusField(address, quantity);
+    }
+}
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadInputRegistersModbusField.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadInputRegistersModbusField.java
index 53d7b7ccbae..c8500b9e0be 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadInputRegistersModbusField.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadInputRegistersModbusField.java
@@ -1,48 +1,48 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.modbus.model;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-
-public class ReadInputRegistersModbusField extends ModbusField {
-
-    public static final Pattern ADDRESS_PATTERN = Pattern.compile("readinputregisters:" + ModbusField.ADDRESS_PATTERN);
-
-    protected ReadInputRegistersModbusField(int address, Integer quantity) {
-        super(address, quantity);
-    }
-
-    public static ReadInputRegistersModbusField of(String addressString) throws PlcInvalidFieldException {
-        Matcher matcher = ADDRESS_PATTERN.matcher(addressString);
-        if (!matcher.matches()) {
-            throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN);
-        }
-        int address = Integer.parseInt(matcher.group("address"));
-
-        String quantityString = matcher.group("quantity");
-        Integer quantity = quantityString != null ? Integer.valueOf(quantityString) : null;
-        if (quantity != null) {
-            if ((quantity < 0) || (quantity > 125)) throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN); 
-        }
-        
-        return new ReadInputRegistersModbusField(address, quantity);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.modbus.model;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+
+public class ReadInputRegistersModbusField extends ModbusField {
+
+    public static final Pattern ADDRESS_PATTERN = Pattern.compile("readinputregisters:" + ModbusField.ADDRESS_PATTERN);
+
+    protected ReadInputRegistersModbusField(int address, Integer quantity) {
+        super(address, quantity);
+    }
+
+    public static ReadInputRegistersModbusField of(String addressString) throws PlcInvalidFieldException {
+        Matcher matcher = ADDRESS_PATTERN.matcher(addressString);
+        if (!matcher.matches()) {
+            throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN);
+        }
+        int address = Integer.parseInt(matcher.group("address"));
+
+        String quantityString = matcher.group("quantity");
+        Integer quantity = quantityString != null ? Integer.valueOf(quantityString) : null;
+        if (quantity != null) {
+            if ((quantity < 0) || (quantity > 125)) throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN); 
+        }
+        
+        return new ReadInputRegistersModbusField(address, quantity);
+    }
+}
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/RegisterModbusField.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/RegisterModbusField.java
index 67eb0ba4692..a71a83e855d 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/RegisterModbusField.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/RegisterModbusField.java
@@ -1,49 +1,49 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.modbus.model;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-
-// TODO: Default to {@link ReadHoldingRegistersModbusField}
-public class RegisterModbusField extends ModbusField {
-
-    public static final Pattern ADDRESS_PATTERN = Pattern.compile("register:" + ModbusField.ADDRESS_PATTERN);
-
-    protected RegisterModbusField(int address, Integer quantity) {
-        super(address, quantity);
-    }
-
-    public static RegisterModbusField of(String addressString) throws PlcInvalidFieldException {
-        Matcher matcher = ADDRESS_PATTERN.matcher(addressString);
-        if (!matcher.matches()) {
-            throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN);
-        }
-        int address = Integer.parseInt(matcher.group("address"));
-
-        String quantityString = matcher.group("quantity");
-        Integer quantity = quantityString != null ? Integer.valueOf(quantityString) : null;
-        if (quantity != null){
-            if ((quantity < 0) || (quantity > 125)) throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN);   
-        }
-        
-        return new RegisterModbusField(address, quantity);
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.modbus.model;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+
+// TODO: Default to {@link ReadHoldingRegistersModbusField}
+public class RegisterModbusField extends ModbusField {
+
+    public static final Pattern ADDRESS_PATTERN = Pattern.compile("register:" + ModbusField.ADDRESS_PATTERN);
+
+    protected RegisterModbusField(int address, Integer quantity) {
+        super(address, quantity);
+    }
+
+    public static RegisterModbusField of(String addressString) throws PlcInvalidFieldException {
+        Matcher matcher = ADDRESS_PATTERN.matcher(addressString);
+        if (!matcher.matches()) {
+            throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN);
+        }
+        int address = Integer.parseInt(matcher.group("address"));
+
+        String quantityString = matcher.group("quantity");
+        Integer quantity = quantityString != null ? Integer.valueOf(quantityString) : null;
+        if (quantity != null){
+            if ((quantity < 0) || (quantity > 125)) throw new PlcInvalidFieldException(addressString, ADDRESS_PATTERN);   
+        }
+        
+        return new RegisterModbusField(address, quantity);
+    }
+}
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocol.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocol.java
index 8ddd1647209..9b666dc2b22 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocol.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocol.java
@@ -1,535 +1,535 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.modbus.netty;
-
-import com.digitalpetri.modbus.ModbusPdu;
-import com.digitalpetri.modbus.codec.ModbusTcpPayload;
-import com.digitalpetri.modbus.requests.*;
-import com.digitalpetri.modbus.responses.*;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToMessageCodec;
-import java.math.BigInteger;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.exceptions.PlcException;
-import org.apache.plc4x.java.api.exceptions.PlcNotImplementedException;
-import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
-import org.apache.plc4x.java.api.exceptions.PlcUnsupportedDataTypeException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcRequest;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.messages.*;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-import org.apache.plc4x.java.base.messages.items.DefaultBooleanFieldItem;
-import org.apache.plc4x.java.modbus.messages.items.DefaultModbusByteArrayFieldItem;
-import org.apache.plc4x.java.modbus.model.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class Plc4XModbusProtocol extends MessageToMessageCodec<ModbusTcpPayload, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse>> {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(Plc4XModbusProtocol.class);
-
-    public final AtomicInteger transactionId = new AtomicInteger();
-
-    private final ConcurrentMap<Short, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse>> requestsMap = new ConcurrentHashMap<>();
-
-    private final short slaveId;
-
-    public Plc4XModbusProtocol(short slaveId) {
-        this.slaveId = slaveId;
-    }
-
-    @Override
-    protected void encode(ChannelHandlerContext ctx, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> msg, List<Object> out) throws Exception {
-        LOGGER.trace("(<--OUT): {}, {}, {}", ctx, msg, out);
-        // Reset transactionId on overflow
-        transactionId.compareAndSet(Short.MAX_VALUE + 1, 0);
-        PlcRequest request = msg.getRequest();
-        if (request instanceof PlcReadRequest) {
-            encodeReadRequest(msg, out);
-        } else if (request instanceof PlcWriteRequest) {
-            encodeWriteRequest(msg, out);
-        }
-    }
-
-    private void encodeWriteRequest(PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> msg, List<Object> out) throws PlcException {
-        InternalPlcWriteRequest request = (InternalPlcWriteRequest) msg.getRequest();
-
-        // TODO: support multiple requests
-        if (request.getFieldNames().size() != 1) {
-            throw new PlcNotImplementedException("Only single message supported for now");
-        }
-        // TODO: check if we can map like this. Implication is that we can only work with int, short, byte and boolean
-        // TODO: for higher data types float, double etc we might need to split the bytes into chunks
-        String fieldName = request.getFieldNames().iterator().next();
-        int quantity = request.getNumberOfValues(fieldName);
-        ModbusField field = (ModbusField) request.getField(fieldName);
-        if (quantity != field.getQuantity()) {
-            LOGGER.warn("Supplied number of values [{}] don't match t the addressed quantity of [{}]", field.getQuantity(), quantity);
-        }
-
-        /*
-         * It seems that in Modbus, there are only two types of resources, that can be accessed:
-         * - Register: 2 byte value
-         * - Coil: 1 bit value
-         *
-         * Registers:
-         * When writing a bit, byte or char (a one byte or less data types) into a register the value is filled up to
-         * fit the 2 bytes.
-         * When writing a data type that has more than 2 bytes, subsequent registers are written to automatically.
-         *
-         * Coils:
-         * When transferring data from/to a coil, 8 coil values can be transferred in a single byte.
-         * Naturally a coil is a boolean data type, however, similar to the registers bigger data types can be
-         * transported, by setting multiple subsequent coils: 32bit int -> 32 coils
-         *
-         * In all cases where we are accessing more than the natural size of the datatype, we have to keep this in mind
-         * when addressing them. So if reading 2 32bit integers, this is split up into four registers. So for the second
-         * int we have to increment the address accordingly.
-         */
-        ModbusPdu modbusRequest;
-        if (field instanceof RegisterModbusField) {
-            RegisterModbusField registerModbusField = (RegisterModbusField) field;
-            if (quantity > 1) {
-                byte[] bytesToWrite = produceRegisterValue(Arrays.asList(request.getFieldItem(fieldName).getValues()));
-                // A register is a 16 bit (2 byte) value ... so every value needs 2 byte.
-                int requiredLength = 2 * quantity;
-                if (bytesToWrite.length != requiredLength) {
-                    throw new PlcProtocolException("Invalid register values created. Should be at least quantity * 2 = N bytes. Was " + bytesToWrite.length + ", expected " + requiredLength);
-                }
-                modbusRequest = new WriteMultipleRegistersRequest(registerModbusField.getAddress(), quantity, bytesToWrite);
-            } else {
-                byte[] register = produceRegisterValue(Arrays.asList(request.getFieldItem(fieldName).getValues()));
-                if ((register == null) || (register.length != 2)) {
-                    throw new PlcProtocolException("Invalid register values created. Should be 2 bytes. Was " +
-                        ((register != null) ? register.length : 0));
-                }
-                // Reconvert the two bytes back to an int.
-                int intToWrite = register[0] << 8 | register[1] & 0xff;
-                modbusRequest = new WriteSingleRegisterRequest(registerModbusField.getAddress(), intToWrite);
-            }
-        } else if (field instanceof CoilModbusField) {
-            CoilModbusField coilModbusField = (CoilModbusField) field;
-            if (quantity > 1) {
-                byte[] bytesToWrite = produceCoilValues(Arrays.asList(request.getFieldItem(fieldName).getValues()));
-                // As each coil value represents a bit, the number of bytes needed
-                // equals "ceil(quantity/8)" (a 3 bit shift is a division by 8 ... the +1 is the "ceil")
-                // (8/8)+1 = 2, but must be 1;
-                int temp = quantity - 1;
-                int requiredLength = (temp >> 3) + 1;
-                if (bytesToWrite.length != requiredLength) {
-                    throw new PlcProtocolException(
-                        "Invalid coil values created. Should be big enough to transport N bits. Was " +
-                            bytesToWrite.length + ", expected " + requiredLength);
-                }
-                modbusRequest = new WriteMultipleCoilsRequest(coilModbusField.getAddress(), quantity, bytesToWrite);
-            } else {
-                boolean booleanToWrite = produceCoilValue(Arrays.asList(request.getFieldItem(fieldName).getValues()));
-                modbusRequest = new WriteSingleCoilRequest(coilModbusField.getAddress(), booleanToWrite);
-            }
-        } else if (field instanceof MaskWriteRegisterModbusField) {
-            MaskWriteRegisterModbusField maskWriteRegisterModbusField = (MaskWriteRegisterModbusField) field;
-            if (quantity > 1) {
-                throw new PlcProtocolException("Mask write request can only write one value");
-            } else {
-                // TODO: this should be better part of the payload not the addressing.
-                int andMask = maskWriteRegisterModbusField.getAndMask();
-                int orMask = maskWriteRegisterModbusField.getOrMask();
-                modbusRequest = new MaskWriteRegisterRequest(maskWriteRegisterModbusField.getAddress(), andMask, orMask);
-            }
-        } else {
-            throw new PlcProtocolException("Unsupported field type " + field.getClass() + " for a write request.");
-        }
-        short transactionId = (short) this.transactionId.getAndIncrement();
-        requestsMap.put(transactionId, msg);
-        out.add(new ModbusTcpPayload(transactionId, slaveId, modbusRequest));
-    }
-
-    private void encodeReadRequest(PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> msg, List<Object> out) throws PlcException {
-        PlcReadRequest request = (PlcReadRequest) msg.getRequest();
-        // TODO: support multiple requests
-        if (request.getFieldNames().size() != 1) {
-            throw new PlcNotImplementedException("Only single message supported for now");
-        }
-        // TODO: check if we can map like this. Implication is that we can only work with int, short, byte and boolean
-        // TODO: for higher data types float, double etc we might need to split the bytes into chunks
-        String fieldName = request.getFieldNames().iterator().next();
-
-        ModbusField field = (ModbusField) request.getField(fieldName);
-        int quantity = field.getQuantity();
-
-        ModbusPdu modbusRequest;
-        if (field instanceof CoilModbusField) {
-            CoilModbusField coilModbusField = (CoilModbusField) field;
-            modbusRequest = new ReadCoilsRequest(coilModbusField.getAddress(), quantity);
-        } else if (field instanceof RegisterModbusField) {
-            RegisterModbusField registerModbusField = (RegisterModbusField) field;
-            modbusRequest = new ReadHoldingRegistersRequest(registerModbusField.getAddress(), quantity);
-        } else if (field instanceof ReadDiscreteInputsModbusField) {
-            ReadDiscreteInputsModbusField readDiscreteInputsModbusField = (ReadDiscreteInputsModbusField) field;
-            modbusRequest = new ReadDiscreteInputsRequest(readDiscreteInputsModbusField.getAddress(), quantity);
-        } else if (field instanceof ReadHoldingRegistersModbusField) {
-            ReadHoldingRegistersModbusField readHoldingRegistersModbusField = (ReadHoldingRegistersModbusField) field;
-            modbusRequest = new ReadHoldingRegistersRequest(readHoldingRegistersModbusField.getAddress(), quantity);
-        } else if (field instanceof ReadInputRegistersModbusField) {
-            ReadInputRegistersModbusField readInputRegistersModbusField = (ReadInputRegistersModbusField) field;
-            modbusRequest = new ReadInputRegistersRequest(readInputRegistersModbusField.getAddress(), quantity);
-        } else {
-            throw new PlcProtocolException("Unsupported field type " + field.getClass() + " for a read request.");
-        }
-        short transactionId = (short) this.transactionId.getAndIncrement();
-        requestsMap.put(transactionId, msg);
-        out.add(new ModbusTcpPayload(transactionId, slaveId, modbusRequest));
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    protected void decode(ChannelHandlerContext ctx, ModbusTcpPayload msg, List<Object> out) throws Exception {
-        LOGGER.trace("(-->IN): {}, {}, {}", ctx, msg, out);
-        LOGGER.debug("{}: transactionId: {}, unitId: {}, modbusPdu:{}", msg, msg.getTransactionId(), msg.getUnitId(), msg.getModbusPdu());
-        // TODO: implement me
-        short transactionId = msg.getTransactionId();
-        PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> plcRequestContainer = requestsMap.get(transactionId);
-        if (plcRequestContainer == null) {
-            throw new PlcProtocolException("Unrelated payload received. [transactionId: " + msg.getTransactionId() + ", unitId: " + msg.getUnitId() + ", modbusPdu: " + msg.getModbusPdu() + "]");
-        }
-
-        // TODO: only single Item supported for now
-        InternalPlcFieldRequest request = (InternalPlcFieldRequest) plcRequestContainer.getRequest();
-        // TODO: support multiple requests (Shouldn't be needed as the request wouldn't have been sent)
-        if (request.getFieldNames().size() != 1) {
-            throw new PlcNotImplementedException("Only single message supported for now");
-        }
-        String fieldName = request.getFieldNames().iterator().next();
-        ModbusField field = (ModbusField) request.getField(fieldName);
-
-        ModbusPdu modbusPdu = msg.getModbusPdu();
-        //short unitId = msg.getUnitId();
-
-        if (modbusPdu instanceof WriteMultipleCoilsResponse) {
-            // TODO: finish implementation
-            WriteMultipleCoilsResponse writeMultipleCoilsResponse = (WriteMultipleCoilsResponse) modbusPdu;
-            LOGGER.debug("{}: address:{}, quantity:{}", writeMultipleCoilsResponse, writeMultipleCoilsResponse.getAddress(), writeMultipleCoilsResponse.getQuantity());
-            Map<String, PlcResponseCode> responseValues = new HashMap<>();
-            responseValues.put(fieldName, PlcResponseCode.OK);
-            plcRequestContainer.getResponseFuture().complete(new DefaultPlcWriteResponse((InternalPlcWriteRequest) request, responseValues));
-        } else if (modbusPdu instanceof WriteMultipleRegistersResponse) {
-            // TODO: finish implementation
-            WriteMultipleRegistersResponse writeMultipleRegistersResponse = (WriteMultipleRegistersResponse) modbusPdu;
-            LOGGER.debug("{}: address:{}, quantity:{}", writeMultipleRegistersResponse, writeMultipleRegistersResponse.getAddress(), writeMultipleRegistersResponse.getQuantity());
-            Map<String, PlcResponseCode> responseValues = new HashMap<>();
-            responseValues.put(fieldName, PlcResponseCode.OK);
-            plcRequestContainer.getResponseFuture().complete(new DefaultPlcWriteResponse((InternalPlcWriteRequest) request, responseValues));
-        } else if (modbusPdu instanceof WriteSingleCoilResponse) {
-            // TODO: finish implementation
-            WriteSingleCoilResponse writeSingleCoilResponse = (WriteSingleCoilResponse) modbusPdu;
-            LOGGER.debug("{}: address:{}, value:{}", writeSingleCoilResponse, writeSingleCoilResponse.getAddress(), writeSingleCoilResponse.getValue());
-            Map<String, PlcResponseCode> responseValues = new HashMap<>();
-            responseValues.put(fieldName, PlcResponseCode.OK);
-            plcRequestContainer.getResponseFuture().complete(new DefaultPlcWriteResponse((InternalPlcWriteRequest) request, responseValues));
-        } else if (modbusPdu instanceof WriteSingleRegisterResponse) {
-            // TODO: finish implementation
-            WriteSingleRegisterResponse writeSingleRegisterResponse = (WriteSingleRegisterResponse) modbusPdu;
-            LOGGER.debug("{}: address:{}, value:{}", writeSingleRegisterResponse, writeSingleRegisterResponse.getAddress(), writeSingleRegisterResponse.getValue());
-            Map<String, PlcResponseCode> responseValues = new HashMap<>();
-            responseValues.put(fieldName, PlcResponseCode.OK);
-            plcRequestContainer.getResponseFuture().complete(new DefaultPlcWriteResponse((InternalPlcWriteRequest) request, responseValues));
-        } else if (modbusPdu instanceof ReadCoilsResponse) {
-            // TODO: finish implementation
-            ReadCoilsResponse readCoilsResponse = (ReadCoilsResponse) modbusPdu;
-            LOGGER.debug("{}: Nothing", readCoilsResponse);
-            ByteBuf byteBuf = readCoilsResponse.getCoilStatus();
-            DefaultBooleanFieldItem data = produceCoilValueList(byteBuf, field.getQuantity());
-            Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> responseValues = new HashMap<>();
-            responseValues.put(fieldName, new ImmutablePair<>(PlcResponseCode.OK, data));
-            plcRequestContainer.getResponseFuture().complete(new DefaultPlcReadResponse((InternalPlcReadRequest) request, responseValues));
-        } else if (modbusPdu instanceof ReadDiscreteInputsResponse) {
-            // TODO: finish implementation
-            ReadDiscreteInputsResponse readDiscreteInputsResponse = (ReadDiscreteInputsResponse) modbusPdu;
-            LOGGER.debug("{}: Nothing", readDiscreteInputsResponse);
-            ByteBuf byteBuf = readDiscreteInputsResponse.getInputStatus();
-            DefaultBooleanFieldItem data = produceCoilValueList(byteBuf, field.getQuantity());
-            Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> responseValues = new HashMap<>();
-            responseValues.put(fieldName, new ImmutablePair<>(PlcResponseCode.OK, data));
-            plcRequestContainer.getResponseFuture().complete(new DefaultPlcReadResponse((InternalPlcReadRequest) request, responseValues));
-        } else if (modbusPdu instanceof ReadHoldingRegistersResponse) {
-            // TODO: finish implementation
-            ReadHoldingRegistersResponse readHoldingRegistersResponse = (ReadHoldingRegistersResponse) modbusPdu;
-            LOGGER.debug("{}: Nothing", readHoldingRegistersResponse);
-            ByteBuf byteBuf = readHoldingRegistersResponse.getRegisters();
-            // TODO: use register method
-            DefaultModbusByteArrayFieldItem data = produceRegisterValueList(byteBuf, field.getQuantity());
-            Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> responseValues = new HashMap<>();
-            responseValues.put(fieldName, new ImmutablePair<>(PlcResponseCode.OK, data));
-            plcRequestContainer.getResponseFuture().complete(new DefaultPlcReadResponse((InternalPlcReadRequest) request, responseValues));
-        } else if (modbusPdu instanceof ReadInputRegistersResponse) {
-            // TODO: finish implementation
-            ReadInputRegistersResponse readInputRegistersResponse = (ReadInputRegistersResponse) modbusPdu;
-            LOGGER.debug("{}: Nothing", readInputRegistersResponse);
-            ByteBuf byteBuf = readInputRegistersResponse.getRegisters();
-            // TODO: use register method
-            DefaultModbusByteArrayFieldItem data = produceRegisterValueList(byteBuf, field.getQuantity());
-            Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> responseValues = new HashMap<>();
-            responseValues.put(fieldName, new ImmutablePair<>(PlcResponseCode.OK, data));
-            plcRequestContainer.getResponseFuture().complete(new DefaultPlcReadResponse((InternalPlcReadRequest) request, responseValues));
-        } else if (modbusPdu instanceof MaskWriteRegisterResponse) {
-            // TODO: finish implementation
-            MaskWriteRegisterResponse maskWriteRegisterResponse = (MaskWriteRegisterResponse) modbusPdu;
-            LOGGER.debug("{}: Nothing", maskWriteRegisterResponse);
-            Map<String, PlcResponseCode> responseValues = new HashMap<>();
-            responseValues.put(fieldName, PlcResponseCode.OK);
-            plcRequestContainer.getResponseFuture().complete(new DefaultPlcWriteResponse((InternalPlcWriteRequest) request, responseValues));
-        } else if (modbusPdu instanceof ExceptionResponse) {
-            ExceptionResponse exceptionResponse = (ExceptionResponse) modbusPdu;
-            throw new PlcProtocolException("Error received " + exceptionResponse.getExceptionCode());
-        } else {
-            throw new PlcProtocolException("Unsupported messageTyp type" + modbusPdu.getClass());
-        }
-    }
-
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        LOGGER.trace("(-->ERR): {}", ctx, cause);
-        super.exceptionCaught(ctx, cause);
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////
-    // Encoding helpers.
-    ////////////////////////////////////////////////////////////////////////////////
-
-    private boolean produceCoilValue(List<?> values) throws PlcProtocolException {
-        if (values.size() != 1) {
-            throw new PlcProtocolException("Only one value allowed");
-        }
-        byte multiCoil = produceCoilValues(values)[0];
-        return multiCoil != 0;
-    }
-
-    private byte[] produceCoilValues(List<?> values) throws PlcProtocolException {
-        List<Byte> coils = new LinkedList<>();
-        int items = values.size();
-        byte actualCoil = 0;
-        int i = 7;
-        
-        for (Object value : values) {
-            final boolean coilSet;
-            if (value.getClass() == Boolean.class) {
-                coilSet = (Boolean) value;
-            } else if (value.getClass() == Byte.class) {
-                if ((byte) value > 1) {
-                    throw new PlcProtocolException("Value to high to fit into Byte: " + value);
-                }
-                coilSet = (byte) value == 1;
-            } else if (value.getClass() == byte[].class) {
-                byte[] bytes = (byte[]) value;
-                if (bytes.length != 1) {
-                    throw new PlcProtocolException("Exactly one byte is allowed: " + bytes.length);
-                }
-                byte byteValue = bytes[0];
-                if (byteValue > 1) {
-                    throw new PlcProtocolException("Value to high to fit into Byte: " + value);
-                }
-                coilSet = byteValue == 1;
-            } else if (value.getClass() == Byte[].class) {
-                Byte[] bytes = (Byte[]) value;
-                if (bytes.length != 1) {
-                    throw new PlcProtocolException("Exactly one byte is allowed: " + bytes.length);
-                }
-                byte byteValue = bytes[0];
-                if (byteValue > 1) {
-                    throw new PlcProtocolException("Value to high to fit into Byte: " + value);
-                }
-                coilSet = byteValue == 1;
-            } else if (value.getClass() == Short.class) {
-                if ((short) value > 1) {
-                    throw new PlcProtocolException("Value to high to fit into Byte: " + value);
-                }
-                coilSet = (Short) value == 1;
-            } else if (value.getClass() == Integer.class) {
-                if ((int) value > 1) {
-                    throw new PlcProtocolException("Value to high to fit into Byte: " + value);
-                }
-                coilSet = (int) value == 1;
-            } else if (value.getClass() == BigInteger.class) {
-                coilSet = value.equals(BigInteger.ONE);
-            } else if (value.getClass() == Float.class) {
-                coilSet = value.equals(1.0f);
-            } else if (value.getClass() == Double.class) {
-                coilSet = value.equals(1.0d);
-            } else {
-                throw new PlcUnsupportedDataTypeException(value.getClass());
-            }
-            byte coilToSet = coilSet ? (byte) 1 : (byte) 0;
-            int pos = 7 - i;
-            actualCoil = (byte) (actualCoil & 0xff | coilToSet << pos);
-            items--;
-            i--; 
-            if ((items!=0) && (i < 0)) {
-                coils.add(actualCoil);
-                actualCoil = 0;
-                i = 7;
-            }
-            if (items==0) coils.add(actualCoil);            
-            
-        }
-        if (coils.isEmpty()) {
-            // We only have one coil
-            return new byte[]{actualCoil};
-        }
-        return ArrayUtils.toPrimitive(coils.toArray(new Byte[0]));
-    }
-
-    private byte[] produceRegisterValue(List<?> values) throws PlcProtocolException {
-        ByteBuf buffer = Unpooled.buffer();
-        long upperRegisterValue = 0xFFFFL;
-        for (Object value : values) {
-            if (value.getClass() == Boolean.class) {
-                buffer.writeByte(0);
-                buffer.writeByte((boolean) value ? 1 : 0);
-            } else if (value.getClass() == Byte.class) {
-                buffer.writeByte(0);
-                buffer.writeByte((byte) value);
-            } else if (value.getClass() == byte[].class) {
-                byte[] bytes = (byte[]) value;
-                if (bytes.length != 2) {
-                    throw new PlcProtocolException("Exactly two bytes are allowed: " + bytes.length);
-                }
-                buffer.writeBytes(bytes);
-            } else if (value.getClass() == Byte[].class) {
-                Byte[] bytes = (Byte[]) value;
-                if (bytes.length != 2) {
-                    throw new PlcProtocolException("Exactly two bytes are allowed: " + bytes.length);
-                }
-                buffer.writeBytes(ArrayUtils.toPrimitive(bytes));
-            } else if (value.getClass() == Short.class) {
-                if ((short) value < 0) {
-                    throw new PlcProtocolException("Only positive values are supported for Short: " + value);
-                }
-                buffer.writeShort((short) value);
-            } else if (value.getClass() == Integer.class) {
-                if ((int) value > upperRegisterValue) {
-                    throw new PlcProtocolException("Value to high to fit into register for Integer: " + value);
-                }
-                if ((int) value < 0) {
-                    throw new PlcProtocolException("Only positive values are supported for Integer: " + value);
-                }
-                buffer.writeShort((int) value);
-            } else if (value.getClass() == BigInteger.class) {
-                if (((BigInteger) value).compareTo(BigInteger.ZERO) < 0) {
-                    throw new PlcProtocolException("Only positive values are supported for BigInteger: " + value);
-                }
-                if (((BigInteger) value).compareTo(BigInteger.valueOf(0XFFFF_FFFFL)) > 0) {
-                    throw new PlcProtocolException("Value to high to fit into register for BigInteger: " + value);
-                }
-                // TODO: for now we can't support big values as we only write one register at once
-                if (((BigInteger) value).compareTo(BigInteger.valueOf(upperRegisterValue)) > 0) {
-                    throw new PlcProtocolException("Value to high to fit into register for BigInteger: " + value);
-                }
-                // TODO: Register has 2 bytes so we trim to 2 instead of 4 like the second if above
-                int maxBytes = 2;
-                byte[] bigIntegerBytes = ((BigInteger) value).toByteArray();
-                byte[] bytes = new byte[maxBytes];
-                int lengthToCopy = Math.min(bigIntegerBytes.length, maxBytes);
-                int srcPosition = Math.max(bigIntegerBytes.length - maxBytes, 0);
-                int destPosition = maxBytes - lengthToCopy;
-                System.arraycopy(bigIntegerBytes, srcPosition, bytes, destPosition, lengthToCopy);
-
-                // TODO: check if this is a good representation.
-                // TODO: can a big integer span multiple registers?
-                buffer.writeBytes(bytes);
-            } else if (value.getClass() == Float.class) {
-                if (((float) value) < 0) {
-                    throw new PlcProtocolException("Only positive values are supported for Float: " + value);
-                }
-                if (((float) value) > upperRegisterValue) {
-                    throw new PlcProtocolException("Value to high to fit into register for Float: " + value);
-                }
-                buffer.writeShort(Math.round((float) value));
-            } else if (value.getClass() == Double.class) {
-                if (((double) value) < 0) {
-                    throw new PlcProtocolException("Only positive values are supported for Double: " + value);
-                }
-                if (((double) value) > upperRegisterValue) {
-                    throw new PlcProtocolException("Value to high to fit into register for Double: " + value);
-                }
-                buffer.writeShort((int) Math.round((double) value));
-            } else {
-                throw new PlcUnsupportedDataTypeException(value.getClass());
-            }
-        }
-        byte[] result = new byte[buffer.writerIndex()];
-        buffer.readBytes(result);
-        return result;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////
-    // Decoding helpers.
-    ////////////////////////////////////////////////////////////////////////////////
-    private DefaultBooleanFieldItem produceCoilValueList(ByteBuf byteBuf, int expectedQuantity) {
-        if (byteBuf.readableBytes() < expectedQuantity / 8) {
-            LOGGER.warn("Expected to read {} coils but only max of {} can be supplied", expectedQuantity, byteBuf.readableBytes() * 8);
-        }
-        byte[] bytes = new byte[byteBuf.readableBytes()];
-        if (bytes.length < 1) {
-            return new DefaultBooleanFieldItem();
-        }
-        byteBuf.readBytes(bytes);
-        List<Boolean> data = new LinkedList<>();
-        int bitIndex = 0;
-        int coilIndex = 0;
-        while (coilIndex < bytes.length && data.size() < expectedQuantity) {
-            if (bitIndex > 7) {
-                // Every 8 Coils we need to increase the access
-                coilIndex++;
-                bitIndex = 0;
-                if (coilIndex >= bytes.length) {
-                    break;
-                }
-            }
-            boolean coilSet = (bytes[coilIndex] & 0xff & (1L << bitIndex)) != 0;
-            data.add(coilSet);
-            bitIndex++;
-        }
-        return new DefaultBooleanFieldItem(data.toArray(new Boolean[0]));
-    }
-
-    private DefaultModbusByteArrayFieldItem produceRegisterValueList(ByteBuf byteBuf, int expectedQuantity) throws PlcProtocolException {
-        int readableBytes = byteBuf.readableBytes();
-        if (readableBytes % 2 != 0) {
-            throw new PlcProtocolException("Readables bytes should even: " + readableBytes);
-        }
-        List<Byte[]> data = new LinkedList<>();
-        while (byteBuf.readableBytes() > 0) {
-            byte[] register = new byte[2];
-            byteBuf.readBytes(register);
-            data.add(ArrayUtils.toObject(register));
-        }
-        return new DefaultModbusByteArrayFieldItem(data.toArray(new Byte[0][0]));
-    }
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.modbus.netty;
+
+import com.digitalpetri.modbus.ModbusPdu;
+import com.digitalpetri.modbus.codec.ModbusTcpPayload;
+import com.digitalpetri.modbus.requests.*;
+import com.digitalpetri.modbus.responses.*;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageCodec;
+import java.math.BigInteger;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.exceptions.PlcException;
+import org.apache.plc4x.java.api.exceptions.PlcNotImplementedException;
+import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
+import org.apache.plc4x.java.api.exceptions.PlcUnsupportedDataTypeException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.messages.*;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+import org.apache.plc4x.java.base.messages.items.DefaultBooleanFieldItem;
+import org.apache.plc4x.java.modbus.messages.items.DefaultModbusByteArrayFieldItem;
+import org.apache.plc4x.java.modbus.model.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class Plc4XModbusProtocol extends MessageToMessageCodec<ModbusTcpPayload, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse>> {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(Plc4XModbusProtocol.class);
+
+    public final AtomicInteger transactionId = new AtomicInteger();
+
+    private final ConcurrentMap<Short, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse>> requestsMap = new ConcurrentHashMap<>();
+
+    private final short slaveId;
+
+    public Plc4XModbusProtocol(short slaveId) {
+        this.slaveId = slaveId;
+    }
+
+    @Override
+    protected void encode(ChannelHandlerContext ctx, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> msg, List<Object> out) throws Exception {
+        LOGGER.trace("(<--OUT): {}, {}, {}", ctx, msg, out);
+        // Reset transactionId on overflow
+        transactionId.compareAndSet(Short.MAX_VALUE + 1, 0);
+        PlcRequest request = msg.getRequest();
+        if (request instanceof PlcReadRequest) {
+            encodeReadRequest(msg, out);
+        } else if (request instanceof PlcWriteRequest) {
+            encodeWriteRequest(msg, out);
+        }
+    }
+
+    private void encodeWriteRequest(PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> msg, List<Object> out) throws PlcException {
+        InternalPlcWriteRequest request = (InternalPlcWriteRequest) msg.getRequest();
+
+        // TODO: support multiple requests
+        if (request.getFieldNames().size() != 1) {
+            throw new PlcNotImplementedException("Only single message supported for now");
+        }
+        // TODO: check if we can map like this. Implication is that we can only work with int, short, byte and boolean
+        // TODO: for higher data types float, double etc we might need to split the bytes into chunks
+        String fieldName = request.getFieldNames().iterator().next();
+        int quantity = request.getNumberOfValues(fieldName);
+        ModbusField field = (ModbusField) request.getField(fieldName);
+        if (quantity != field.getQuantity()) {
+            LOGGER.warn("Supplied number of values [{}] don't match t the addressed quantity of [{}]", field.getQuantity(), quantity);
+        }
+
+        /*
+         * It seems that in Modbus, there are only two types of resources, that can be accessed:
+         * - Register: 2 byte value
+         * - Coil: 1 bit value
+         *
+         * Registers:
+         * When writing a bit, byte or char (a one byte or less data types) into a register the value is filled up to
+         * fit the 2 bytes.
+         * When writing a data type that has more than 2 bytes, subsequent registers are written to automatically.
+         *
+         * Coils:
+         * When transferring data from/to a coil, 8 coil values can be transferred in a single byte.
+         * Naturally a coil is a boolean data type, however, similar to the registers bigger data types can be
+         * transported, by setting multiple subsequent coils: 32bit int -> 32 coils
+         *
+         * In all cases where we are accessing more than the natural size of the datatype, we have to keep this in mind
+         * when addressing them. So if reading 2 32bit integers, this is split up into four registers. So for the second
+         * int we have to increment the address accordingly.
+         */
+        ModbusPdu modbusRequest;
+        if (field instanceof RegisterModbusField) {
+            RegisterModbusField registerModbusField = (RegisterModbusField) field;
+            if (quantity > 1) {
+                byte[] bytesToWrite = produceRegisterValue(Arrays.asList(request.getFieldItem(fieldName).getValues()));
+                // A register is a 16 bit (2 byte) value ... so every value needs 2 byte.
+                int requiredLength = 2 * quantity;
+                if (bytesToWrite.length != requiredLength) {
+                    throw new PlcProtocolException("Invalid register values created. Should be at least quantity * 2 = N bytes. Was " + bytesToWrite.length + ", expected " + requiredLength);
+                }
+                modbusRequest = new WriteMultipleRegistersRequest(registerModbusField.getAddress(), quantity, bytesToWrite);
+            } else {
+                byte[] register = produceRegisterValue(Arrays.asList(request.getFieldItem(fieldName).getValues()));
+                if ((register == null) || (register.length != 2)) {
+                    throw new PlcProtocolException("Invalid register values created. Should be 2 bytes. Was " +
+                        ((register != null) ? register.length : 0));
+                }
+                // Reconvert the two bytes back to an int.
+                int intToWrite = register[0] << 8 | register[1] & 0xff;
+                modbusRequest = new WriteSingleRegisterRequest(registerModbusField.getAddress(), intToWrite);
+            }
+        } else if (field instanceof CoilModbusField) {
+            CoilModbusField coilModbusField = (CoilModbusField) field;
+            if (quantity > 1) {
+                byte[] bytesToWrite = produceCoilValues(Arrays.asList(request.getFieldItem(fieldName).getValues()));
+                // As each coil value represents a bit, the number of bytes needed
+                // equals "ceil(quantity/8)" (a 3 bit shift is a division by 8 ... the +1 is the "ceil")
+                // (8/8)+1 = 2, but must be 1;
+                int temp = quantity - 1;
+                int requiredLength = (temp >> 3) + 1;
+                if (bytesToWrite.length != requiredLength) {
+                    throw new PlcProtocolException(
+                        "Invalid coil values created. Should be big enough to transport N bits. Was " +
+                            bytesToWrite.length + ", expected " + requiredLength);
+                }
+                modbusRequest = new WriteMultipleCoilsRequest(coilModbusField.getAddress(), quantity, bytesToWrite);
+            } else {
+                boolean booleanToWrite = produceCoilValue(Arrays.asList(request.getFieldItem(fieldName).getValues()));
+                modbusRequest = new WriteSingleCoilRequest(coilModbusField.getAddress(), booleanToWrite);
+            }
+        } else if (field instanceof MaskWriteRegisterModbusField) {
+            MaskWriteRegisterModbusField maskWriteRegisterModbusField = (MaskWriteRegisterModbusField) field;
+            if (quantity > 1) {
+                throw new PlcProtocolException("Mask write request can only write one value");
+            } else {
+                // TODO: this should be better part of the payload not the addressing.
+                int andMask = maskWriteRegisterModbusField.getAndMask();
+                int orMask = maskWriteRegisterModbusField.getOrMask();
+                modbusRequest = new MaskWriteRegisterRequest(maskWriteRegisterModbusField.getAddress(), andMask, orMask);
+            }
+        } else {
+            throw new PlcProtocolException("Unsupported field type " + field.getClass() + " for a write request.");
+        }
+        short transactionId = (short) this.transactionId.getAndIncrement();
+        requestsMap.put(transactionId, msg);
+        out.add(new ModbusTcpPayload(transactionId, slaveId, modbusRequest));
+    }
+
+    private void encodeReadRequest(PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> msg, List<Object> out) throws PlcException {
+        PlcReadRequest request = (PlcReadRequest) msg.getRequest();
+        // TODO: support multiple requests
+        if (request.getFieldNames().size() != 1) {
+            throw new PlcNotImplementedException("Only single message supported for now");
+        }
+        // TODO: check if we can map like this. Implication is that we can only work with int, short, byte and boolean
+        // TODO: for higher data types float, double etc we might need to split the bytes into chunks
+        String fieldName = request.getFieldNames().iterator().next();
+
+        ModbusField field = (ModbusField) request.getField(fieldName);
+        int quantity = field.getQuantity();
+
+        ModbusPdu modbusRequest;
+        if (field instanceof CoilModbusField) {
+            CoilModbusField coilModbusField = (CoilModbusField) field;
+            modbusRequest = new ReadCoilsRequest(coilModbusField.getAddress(), quantity);
+        } else if (field instanceof RegisterModbusField) {
+            RegisterModbusField registerModbusField = (RegisterModbusField) field;
+            modbusRequest = new ReadHoldingRegistersRequest(registerModbusField.getAddress(), quantity);
+        } else if (field instanceof ReadDiscreteInputsModbusField) {
+            ReadDiscreteInputsModbusField readDiscreteInputsModbusField = (ReadDiscreteInputsModbusField) field;
+            modbusRequest = new ReadDiscreteInputsRequest(readDiscreteInputsModbusField.getAddress(), quantity);
+        } else if (field instanceof ReadHoldingRegistersModbusField) {
+            ReadHoldingRegistersModbusField readHoldingRegistersModbusField = (ReadHoldingRegistersModbusField) field;
+            modbusRequest = new ReadHoldingRegistersRequest(readHoldingRegistersModbusField.getAddress(), quantity);
+        } else if (field instanceof ReadInputRegistersModbusField) {
+            ReadInputRegistersModbusField readInputRegistersModbusField = (ReadInputRegistersModbusField) field;
+            modbusRequest = new ReadInputRegistersRequest(readInputRegistersModbusField.getAddress(), quantity);
+        } else {
+            throw new PlcProtocolException("Unsupported field type " + field.getClass() + " for a read request.");
+        }
+        short transactionId = (short) this.transactionId.getAndIncrement();
+        requestsMap.put(transactionId, msg);
+        out.add(new ModbusTcpPayload(transactionId, slaveId, modbusRequest));
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    protected void decode(ChannelHandlerContext ctx, ModbusTcpPayload msg, List<Object> out) throws Exception {
+        LOGGER.trace("(-->IN): {}, {}, {}", ctx, msg, out);
+        LOGGER.debug("{}: transactionId: {}, unitId: {}, modbusPdu:{}", msg, msg.getTransactionId(), msg.getUnitId(), msg.getModbusPdu());
+        // TODO: implement me
+        short transactionId = msg.getTransactionId();
+        PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> plcRequestContainer = requestsMap.get(transactionId);
+        if (plcRequestContainer == null) {
+            throw new PlcProtocolException("Unrelated payload received. [transactionId: " + msg.getTransactionId() + ", unitId: " + msg.getUnitId() + ", modbusPdu: " + msg.getModbusPdu() + "]");
+        }
+
+        // TODO: only single Item supported for now
+        InternalPlcFieldRequest request = (InternalPlcFieldRequest) plcRequestContainer.getRequest();
+        // TODO: support multiple requests (Shouldn't be needed as the request wouldn't have been sent)
+        if (request.getFieldNames().size() != 1) {
+            throw new PlcNotImplementedException("Only single message supported for now");
+        }
+        String fieldName = request.getFieldNames().iterator().next();
+        ModbusField field = (ModbusField) request.getField(fieldName);
+
+        ModbusPdu modbusPdu = msg.getModbusPdu();
+        //short unitId = msg.getUnitId();
+
+        if (modbusPdu instanceof WriteMultipleCoilsResponse) {
+            // TODO: finish implementation
+            WriteMultipleCoilsResponse writeMultipleCoilsResponse = (WriteMultipleCoilsResponse) modbusPdu;
+            LOGGER.debug("{}: address:{}, quantity:{}", writeMultipleCoilsResponse, writeMultipleCoilsResponse.getAddress(), writeMultipleCoilsResponse.getQuantity());
+            Map<String, PlcResponseCode> responseValues = new HashMap<>();
+            responseValues.put(fieldName, PlcResponseCode.OK);
+            plcRequestContainer.getResponseFuture().complete(new DefaultPlcWriteResponse((InternalPlcWriteRequest) request, responseValues));
+        } else if (modbusPdu instanceof WriteMultipleRegistersResponse) {
+            // TODO: finish implementation
+            WriteMultipleRegistersResponse writeMultipleRegistersResponse = (WriteMultipleRegistersResponse) modbusPdu;
+            LOGGER.debug("{}: address:{}, quantity:{}", writeMultipleRegistersResponse, writeMultipleRegistersResponse.getAddress(), writeMultipleRegistersResponse.getQuantity());
+            Map<String, PlcResponseCode> responseValues = new HashMap<>();
+            responseValues.put(fieldName, PlcResponseCode.OK);
+            plcRequestContainer.getResponseFuture().complete(new DefaultPlcWriteResponse((InternalPlcWriteRequest) request, responseValues));
+        } else if (modbusPdu instanceof WriteSingleCoilResponse) {
+            // TODO: finish implementation
+            WriteSingleCoilResponse writeSingleCoilResponse = (WriteSingleCoilResponse) modbusPdu;
+            LOGGER.debug("{}: address:{}, value:{}", writeSingleCoilResponse, writeSingleCoilResponse.getAddress(), writeSingleCoilResponse.getValue());
+            Map<String, PlcResponseCode> responseValues = new HashMap<>();
+            responseValues.put(fieldName, PlcResponseCode.OK);
+            plcRequestContainer.getResponseFuture().complete(new DefaultPlcWriteResponse((InternalPlcWriteRequest) request, responseValues));
+        } else if (modbusPdu instanceof WriteSingleRegisterResponse) {
+            // TODO: finish implementation
+            WriteSingleRegisterResponse writeSingleRegisterResponse = (WriteSingleRegisterResponse) modbusPdu;
+            LOGGER.debug("{}: address:{}, value:{}", writeSingleRegisterResponse, writeSingleRegisterResponse.getAddress(), writeSingleRegisterResponse.getValue());
+            Map<String, PlcResponseCode> responseValues = new HashMap<>();
+            responseValues.put(fieldName, PlcResponseCode.OK);
+            plcRequestContainer.getResponseFuture().complete(new DefaultPlcWriteResponse((InternalPlcWriteRequest) request, responseValues));
+        } else if (modbusPdu instanceof ReadCoilsResponse) {
+            // TODO: finish implementation
+            ReadCoilsResponse readCoilsResponse = (ReadCoilsResponse) modbusPdu;
+            LOGGER.debug("{}: Nothing", readCoilsResponse);
+            ByteBuf byteBuf = readCoilsResponse.getCoilStatus();
+            DefaultBooleanFieldItem data = produceCoilValueList(byteBuf, field.getQuantity());
+            Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> responseValues = new HashMap<>();
+            responseValues.put(fieldName, new ImmutablePair<>(PlcResponseCode.OK, data));
+            plcRequestContainer.getResponseFuture().complete(new DefaultPlcReadResponse((InternalPlcReadRequest) request, responseValues));
+        } else if (modbusPdu instanceof ReadDiscreteInputsResponse) {
+            // TODO: finish implementation
+            ReadDiscreteInputsResponse readDiscreteInputsResponse = (ReadDiscreteInputsResponse) modbusPdu;
+            LOGGER.debug("{}: Nothing", readDiscreteInputsResponse);
+            ByteBuf byteBuf = readDiscreteInputsResponse.getInputStatus();
+            DefaultBooleanFieldItem data = produceCoilValueList(byteBuf, field.getQuantity());
+            Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> responseValues = new HashMap<>();
+            responseValues.put(fieldName, new ImmutablePair<>(PlcResponseCode.OK, data));
+            plcRequestContainer.getResponseFuture().complete(new DefaultPlcReadResponse((InternalPlcReadRequest) request, responseValues));
+        } else if (modbusPdu instanceof ReadHoldingRegistersResponse) {
+            // TODO: finish implementation
+            ReadHoldingRegistersResponse readHoldingRegistersResponse = (ReadHoldingRegistersResponse) modbusPdu;
+            LOGGER.debug("{}: Nothing", readHoldingRegistersResponse);
+            ByteBuf byteBuf = readHoldingRegistersResponse.getRegisters();
+            // TODO: use register method
+            DefaultModbusByteArrayFieldItem data = produceRegisterValueList(byteBuf, field.getQuantity());
+            Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> responseValues = new HashMap<>();
+            responseValues.put(fieldName, new ImmutablePair<>(PlcResponseCode.OK, data));
+            plcRequestContainer.getResponseFuture().complete(new DefaultPlcReadResponse((InternalPlcReadRequest) request, responseValues));
+        } else if (modbusPdu instanceof ReadInputRegistersResponse) {
+            // TODO: finish implementation
+            ReadInputRegistersResponse readInputRegistersResponse = (ReadInputRegistersResponse) modbusPdu;
+            LOGGER.debug("{}: Nothing", readInputRegistersResponse);
+            ByteBuf byteBuf = readInputRegistersResponse.getRegisters();
+            // TODO: use register method
+            DefaultModbusByteArrayFieldItem data = produceRegisterValueList(byteBuf, field.getQuantity());
+            Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> responseValues = new HashMap<>();
+            responseValues.put(fieldName, new ImmutablePair<>(PlcResponseCode.OK, data));
+            plcRequestContainer.getResponseFuture().complete(new DefaultPlcReadResponse((InternalPlcReadRequest) request, responseValues));
+        } else if (modbusPdu instanceof MaskWriteRegisterResponse) {
+            // TODO: finish implementation
+            MaskWriteRegisterResponse maskWriteRegisterResponse = (MaskWriteRegisterResponse) modbusPdu;
+            LOGGER.debug("{}: Nothing", maskWriteRegisterResponse);
+            Map<String, PlcResponseCode> responseValues = new HashMap<>();
+            responseValues.put(fieldName, PlcResponseCode.OK);
+            plcRequestContainer.getResponseFuture().complete(new DefaultPlcWriteResponse((InternalPlcWriteRequest) request, responseValues));
+        } else if (modbusPdu instanceof ExceptionResponse) {
+            ExceptionResponse exceptionResponse = (ExceptionResponse) modbusPdu;
+            throw new PlcProtocolException("Error received " + exceptionResponse.getExceptionCode());
+        } else {
+            throw new PlcProtocolException("Unsupported messageTyp type" + modbusPdu.getClass());
+        }
+    }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+        LOGGER.trace("(-->ERR): {}", ctx, cause);
+        super.exceptionCaught(ctx, cause);
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////
+    // Encoding helpers.
+    ////////////////////////////////////////////////////////////////////////////////
+
+    private boolean produceCoilValue(List<?> values) throws PlcProtocolException {
+        if (values.size() != 1) {
+            throw new PlcProtocolException("Only one value allowed");
+        }
+        byte multiCoil = produceCoilValues(values)[0];
+        return multiCoil != 0;
+    }
+
+    private byte[] produceCoilValues(List<?> values) throws PlcProtocolException {
+        List<Byte> coils = new LinkedList<>();
+        int items = values.size();
+        byte actualCoil = 0;
+        int i = 7;
+        
+        for (Object value : values) {
+            final boolean coilSet;
+            if (value.getClass() == Boolean.class) {
+                coilSet = (Boolean) value;
+            } else if (value.getClass() == Byte.class) {
+                if ((byte) value > 1) {
+                    throw new PlcProtocolException("Value to high to fit into Byte: " + value);
+                }
+                coilSet = (byte) value == 1;
+            } else if (value.getClass() == byte[].class) {
+                byte[] bytes = (byte[]) value;
+                if (bytes.length != 1) {
+                    throw new PlcProtocolException("Exactly one byte is allowed: " + bytes.length);
+                }
+                byte byteValue = bytes[0];
+                if (byteValue > 1) {
+                    throw new PlcProtocolException("Value to high to fit into Byte: " + value);
+                }
+                coilSet = byteValue == 1;
+            } else if (value.getClass() == Byte[].class) {
+                Byte[] bytes = (Byte[]) value;
+                if (bytes.length != 1) {
+                    throw new PlcProtocolException("Exactly one byte is allowed: " + bytes.length);
+                }
+                byte byteValue = bytes[0];
+                if (byteValue > 1) {
+                    throw new PlcProtocolException("Value to high to fit into Byte: " + value);
+                }
+                coilSet = byteValue == 1;
+            } else if (value.getClass() == Short.class) {
+                if ((short) value > 1) {
+                    throw new PlcProtocolException("Value to high to fit into Byte: " + value);
+                }
+                coilSet = (Short) value == 1;
+            } else if (value.getClass() == Integer.class) {
+                if ((int) value > 1) {
+                    throw new PlcProtocolException("Value to high to fit into Byte: " + value);
+                }
+                coilSet = (int) value == 1;
+            } else if (value.getClass() == BigInteger.class) {
+                coilSet = value.equals(BigInteger.ONE);
+            } else if (value.getClass() == Float.class) {
+                coilSet = value.equals(1.0f);
+            } else if (value.getClass() == Double.class) {
+                coilSet = value.equals(1.0d);
+            } else {
+                throw new PlcUnsupportedDataTypeException(value.getClass());
+            }
+            byte coilToSet = coilSet ? (byte) 1 : (byte) 0;
+            int pos = 7 - i;
+            actualCoil = (byte) (actualCoil & 0xff | coilToSet << pos);
+            items--;
+            i--; 
+            if ((items!=0) && (i < 0)) {
+                coils.add(actualCoil);
+                actualCoil = 0;
+                i = 7;
+            }
+            if (items==0) coils.add(actualCoil);            
+            
+        }
+        if (coils.isEmpty()) {
+            // We only have one coil
+            return new byte[]{actualCoil};
+        }
+        return ArrayUtils.toPrimitive(coils.toArray(new Byte[0]));
+    }
+
+    private byte[] produceRegisterValue(List<?> values) throws PlcProtocolException {
+        ByteBuf buffer = Unpooled.buffer();
+        long upperRegisterValue = 0xFFFFL;
+        for (Object value : values) {
+            if (value.getClass() == Boolean.class) {
+                buffer.writeByte(0);
+                buffer.writeByte((boolean) value ? 1 : 0);
+            } else if (value.getClass() == Byte.class) {
+                buffer.writeByte(0);
+                buffer.writeByte((byte) value);
+            } else if (value.getClass() == byte[].class) {
+                byte[] bytes = (byte[]) value;
+                if (bytes.length != 2) {
+                    throw new PlcProtocolException("Exactly two bytes are allowed: " + bytes.length);
+                }
+                buffer.writeBytes(bytes);
+            } else if (value.getClass() == Byte[].class) {
+                Byte[] bytes = (Byte[]) value;
+                if (bytes.length != 2) {
+                    throw new PlcProtocolException("Exactly two bytes are allowed: " + bytes.length);
+                }
+                buffer.writeBytes(ArrayUtils.toPrimitive(bytes));
+            } else if (value.getClass() == Short.class) {
+                if ((short) value < 0) {
+                    throw new PlcProtocolException("Only positive values are supported for Short: " + value);
+                }
+                buffer.writeShort((short) value);
+            } else if (value.getClass() == Integer.class) {
+                if ((int) value > upperRegisterValue) {
+                    throw new PlcProtocolException("Value to high to fit into register for Integer: " + value);
+                }
+                if ((int) value < 0) {
+                    throw new PlcProtocolException("Only positive values are supported for Integer: " + value);
+                }
+                buffer.writeShort((int) value);
+            } else if (value.getClass() == BigInteger.class) {
+                if (((BigInteger) value).compareTo(BigInteger.ZERO) < 0) {
+                    throw new PlcProtocolException("Only positive values are supported for BigInteger: " + value);
+                }
+                if (((BigInteger) value).compareTo(BigInteger.valueOf(0XFFFF_FFFFL)) > 0) {
+                    throw new PlcProtocolException("Value to high to fit into register for BigInteger: " + value);
+                }
+                // TODO: for now we can't support big values as we only write one register at once
+                if (((BigInteger) value).compareTo(BigInteger.valueOf(upperRegisterValue)) > 0) {
+                    throw new PlcProtocolException("Value to high to fit into register for BigInteger: " + value);
+                }
+                // TODO: Register has 2 bytes so we trim to 2 instead of 4 like the second if above
+                int maxBytes = 2;
+                byte[] bigIntegerBytes = ((BigInteger) value).toByteArray();
+                byte[] bytes = new byte[maxBytes];
+                int lengthToCopy = Math.min(bigIntegerBytes.length, maxBytes);
+                int srcPosition = Math.max(bigIntegerBytes.length - maxBytes, 0);
+                int destPosition = maxBytes - lengthToCopy;
+                System.arraycopy(bigIntegerBytes, srcPosition, bytes, destPosition, lengthToCopy);
+
+                // TODO: check if this is a good representation.
+                // TODO: can a big integer span multiple registers?
+                buffer.writeBytes(bytes);
+            } else if (value.getClass() == Float.class) {
+                if (((float) value) < 0) {
+                    throw new PlcProtocolException("Only positive values are supported for Float: " + value);
+                }
+                if (((float) value) > upperRegisterValue) {
+                    throw new PlcProtocolException("Value to high to fit into register for Float: " + value);
+                }
+                buffer.writeShort(Math.round((float) value));
+            } else if (value.getClass() == Double.class) {
+                if (((double) value) < 0) {
+                    throw new PlcProtocolException("Only positive values are supported for Double: " + value);
+                }
+                if (((double) value) > upperRegisterValue) {
+                    throw new PlcProtocolException("Value to high to fit into register for Double: " + value);
+                }
+                buffer.writeShort((int) Math.round((double) value));
+            } else {
+                throw new PlcUnsupportedDataTypeException(value.getClass());
+            }
+        }
+        byte[] result = new byte[buffer.writerIndex()];
+        buffer.readBytes(result);
+        return result;
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////
+    // Decoding helpers.
+    ////////////////////////////////////////////////////////////////////////////////
+    private DefaultBooleanFieldItem produceCoilValueList(ByteBuf byteBuf, int expectedQuantity) {
+        if (byteBuf.readableBytes() < expectedQuantity / 8) {
+            LOGGER.warn("Expected to read {} coils but only max of {} can be supplied", expectedQuantity, byteBuf.readableBytes() * 8);
+        }
+        byte[] bytes = new byte[byteBuf.readableBytes()];
+        if (bytes.length < 1) {
+            return new DefaultBooleanFieldItem();
+        }
+        byteBuf.readBytes(bytes);
+        List<Boolean> data = new LinkedList<>();
+        int bitIndex = 0;
+        int coilIndex = 0;
+        while (coilIndex < bytes.length && data.size() < expectedQuantity) {
+            if (bitIndex > 7) {
+                // Every 8 Coils we need to increase the access
+                coilIndex++;
+                bitIndex = 0;
+                if (coilIndex >= bytes.length) {
+                    break;
+                }
+            }
+            boolean coilSet = (bytes[coilIndex] & 0xff & (1L << bitIndex)) != 0;
+            data.add(coilSet);
+            bitIndex++;
+        }
+        return new DefaultBooleanFieldItem(data.toArray(new Boolean[0]));
+    }
+
+    private DefaultModbusByteArrayFieldItem produceRegisterValueList(ByteBuf byteBuf, int expectedQuantity) throws PlcProtocolException {
+        int readableBytes = byteBuf.readableBytes();
+        if (readableBytes % 2 != 0) {
+            throw new PlcProtocolException("Readables bytes should even: " + readableBytes);
+        }
+        List<Byte[]> data = new LinkedList<>();
+        while (byteBuf.readableBytes() > 0) {
+            byte[] register = new byte[2];
+            byteBuf.readBytes(register);
+            data.add(ArrayUtils.toObject(register));
+        }
+        return new DefaultModbusByteArrayFieldItem(data.toArray(new Byte[0][0]));
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/util/ModbusPlcFieldHandler.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/util/ModbusPlcFieldHandler.java
index 1edea540441..6bfb7caf3ae 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/util/ModbusPlcFieldHandler.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/util/ModbusPlcFieldHandler.java
@@ -1,440 +1,440 @@
-/*
- 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
- 
-     http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.modbus.util;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.Duration;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.ZoneOffset;
-import java.util.BitSet;
-import java.util.LinkedList;
-import java.util.List;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.connection.DefaultPlcFieldHandler;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-import org.apache.plc4x.java.base.messages.items.DefaultBooleanFieldItem;
-import org.apache.plc4x.java.modbus.messages.items.DefaultModbusByteArrayFieldItem;
-import org.apache.plc4x.java.modbus.model.*;
-
-public class ModbusPlcFieldHandler extends DefaultPlcFieldHandler {
-
-    @Override
-    public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
-        if (MaskWriteRegisterModbusField.ADDRESS_PATTERN.matcher(fieldQuery).matches()) {
-            return MaskWriteRegisterModbusField.of(fieldQuery);
-        } else if (ReadDiscreteInputsModbusField.ADDRESS_PATTERN.matcher(fieldQuery).matches()) {
-            return ReadDiscreteInputsModbusField.of(fieldQuery);
-        } else if (ReadHoldingRegistersModbusField.ADDRESS_PATTERN.matcher(fieldQuery).matches()) {
-            return ReadHoldingRegistersModbusField.of(fieldQuery);
-        } else if (ReadInputRegistersModbusField.ADDRESS_PATTERN.matcher(fieldQuery).matches()) {
-            return ReadInputRegistersModbusField.of(fieldQuery);
-        } else if (CoilModbusField.ADDRESS_PATTERN.matcher(fieldQuery).matches()) {
-            return CoilModbusField.of(fieldQuery);
-        } else if (RegisterModbusField.ADDRESS_PATTERN.matcher(fieldQuery).matches()) {
-            return RegisterModbusField.of(fieldQuery);
-        }
-        throw new PlcInvalidFieldException(fieldQuery);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeBoolean(PlcField field, Object[] values) {
-        ModbusField modbusField = (ModbusField) field;
-        List<Boolean> booleanValues = new LinkedList<>();
-        for (Object value : values) {
-            if (value instanceof Boolean) {
-                Boolean booleanValue = (Boolean) value;
-                booleanValues.add(booleanValue);
-            } else if (value instanceof Byte) {
-                Byte byteValue = (Byte) value;
-                BitSet bitSet = BitSet.valueOf(new byte[]{byteValue});
-                for (int i = 0; i < 8; i++) {
-                    booleanValues.add(bitSet.get(i));
-                }
-            } else if (value instanceof Short) {
-                Short shortValue = (Short) value;
-                BitSet bitSet = BitSet.valueOf(new long[]{shortValue});
-                for (int i = 0; i < 16; i++) {
-                    booleanValues.add(bitSet.get(i));
-                }
-            } else if (value instanceof Integer) {
-                Integer integerValue = (Integer) value;
-                BitSet bitSet = BitSet.valueOf(new long[]{integerValue});
-                for (int i = 0; i < 32; i++) {
-                    booleanValues.add(bitSet.get(i));
-                }
-            } else if (value instanceof Long) {
-                long longValue = (Long) value;
-                BitSet bitSet = BitSet.valueOf(new long[]{longValue});
-                for (int i = 0; i < 64; i++) {
-                    booleanValues.add(bitSet.get(i));
-                }
-            } else {
-                throw new IllegalArgumentException(
-                    "Value of type " + value.getClass().getName() +
-                        " is not assignable to " + modbusField + " fields.");
-            }
-        }
-        return new DefaultBooleanFieldItem(booleanValues.toArray(new Boolean[0]));
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeByteArray(PlcField field, Object[] values) {
-        ModbusField modbusField = (ModbusField) field;
-        List<Byte[]> byteArrays = new LinkedList<>();
-        for (Object value : values) {
-            if (value instanceof byte[]) {
-                byte[] byteArray = (byte[]) value;
-                byteArrays.add(ArrayUtils.toObject(byteArray));
-            } else if (value instanceof Byte[]) {
-                Byte[] byteArray = (Byte[]) value;
-                byteArrays.add(byteArray);
-            } else {
-                throw new IllegalArgumentException(
-                    "Value of type " + value.getClass().getName() +
-                        " is not assignable to " + modbusField + " fields.");
-            }
-        }
-        return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeShort(PlcField field, Object[] values) {
-        int size = Short.BYTES;   
-        ModbusField modbusField = (ModbusField) field;
-        List<Byte[]> byteArrays = new LinkedList<>();        
-        byte[] backend = new byte[values.length * size];
-        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
-        byteBuf.clear();
-        if ((modbusField.getQuantity()*2/size) == values.length) {  
-            for (int i = 0; i < values.length; i++) {
-                if (values[i] instanceof Short){
-                    byteBuf.writeShort((Short) values[i]);
-                }
-            }
-            
-            BytesToRegisters(backend, byteArrays);     
-            
-            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
-        } else {
-            throw new IllegalArgumentException(
-                "Value of type " + values.getClass().getName() +
-                    " is not assignable to " + modbusField + " fields.");                    
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeLong(PlcField field, Object[] values) {
-        int size = Long.BYTES;          
-        ModbusField modbusField = (ModbusField) field;
-        List<Byte[]> byteArrays = new LinkedList<>();        
-        byte[] backend = new byte[values.length * size];
-        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
-        byteBuf.clear();
-        if ((modbusField.getQuantity()*2/size) == values.length) {  
-            for (int i = 0; i < values.length; i++) {
-                if (values[i] instanceof Long){
-                    byteBuf.writeLong((Long) values[i]);
-                }
-            }
-            
-            BytesToRegisters(backend, byteArrays);     
-            
-            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
-        } else {
-            throw new IllegalArgumentException(
-                "Value of type " + values.getClass().getName() +
-                    " is not assignable to " + modbusField + " fields.");                    
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeDouble(PlcField field, Object[] values) {
-        int size = Double.BYTES;          
-        ModbusField modbusField = (ModbusField) field;
-        List<Byte[]> byteArrays = new LinkedList<>();        
-        byte[] backend = new byte[values.length * size];
-        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
-        byteBuf.clear();
-        if ((modbusField.getQuantity()*2/size) == values.length) {  
-            for (int i = 0; i < values.length; i++) {
-                if (values[i] instanceof Double){
-                    byteBuf.writeDouble((Double) values[i]);
-                }
-            }
-            
-            BytesToRegisters(backend, byteArrays);     
-            
-            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
-        } else {
-            throw new IllegalArgumentException(
-                "Value of type " + values.getClass().getName() +
-                    " is not assignable to " + modbusField + " fields.");                    
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeInteger(PlcField field, Object[] values) {
-        int size = Integer.BYTES;         
-        ModbusField modbusField = (ModbusField) field;
-        List<Byte[]> byteArrays = new LinkedList<>();        
-        byte[] backend = new byte[values.length * size];
-        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
-        byteBuf.clear();
-        if ((modbusField.getQuantity()*2/size) == values.length) {  
-            for (int i = 0; i < values.length; i++) {
-                if (values[i] instanceof Integer){
-                    byteBuf.writeInt((Integer) values[i]);
-                }
-            }
-            
-            BytesToRegisters(backend, byteArrays);     
-            
-            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
-        } else {
-            throw new IllegalArgumentException(
-                "Value of type " + values.getClass().getName() +
-                    " is not assignable to " + modbusField + " fields.");                    
-        }
-    }
-    
-    @Override
-    public BaseDefaultFieldItem encodeFloat(PlcField field, Object[] values) {
-        int size = Float.BYTES;        
-        ModbusField modbusField = (ModbusField) field;
-        List<Byte[]> byteArrays = new LinkedList<>();        
-        byte[] backend = new byte[values.length * size];
-        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
-        byteBuf.clear();
-        if ((modbusField.getQuantity()*2/size) == values.length) {  
-            for (int i = 0; i < values.length; i++) {
-                if (values[i] instanceof Float){
-                    byteBuf.writeFloat((Float) values[i]);
-                }
-            }
-            
-            BytesToRegisters(backend, byteArrays);
-            
-            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
-        } else {
-            throw new IllegalArgumentException(
-                "Value of type " + values.getClass().getName() +
-                    " is not assignable to " + modbusField + " fields.");                    
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeDuration(PlcField field, Object[] values) {
-        int size = Long.BYTES;
-        ModbusField modbusField = (ModbusField) field;
-        List<Byte[]> byteArrays = new LinkedList<>();        
-        byte[] backend = new byte[values.length * size];
-        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
-        byteBuf.clear();
-        if ((modbusField.getQuantity()*2/size) == values.length) {  
-            for (int i = 0; i < values.length; i++) {
-                if (values[i] instanceof Duration){
-                    byteBuf.writeLong(((Duration) values[i]).toNanos());
-                }
-            }
-            
-            BytesToRegisters(backend, byteArrays);
-            
-            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
-        } else {
-            throw new IllegalArgumentException(
-                "Value of type " + values.getClass().getName() +
-                    " is not assignable to " + modbusField + " fields.");                    
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeTime(PlcField field, Object[] values) {
-        int size = Long.BYTES;        
-        ModbusField modbusField = (ModbusField) field;
-        List<Byte[]> byteArrays = new LinkedList<>();        
-        byte[] backend = new byte[values.length * size];
-        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
-        byteBuf.clear();
-        if ((modbusField.getQuantity()*2/size) == values.length) {  
-            for (int i = 0; i < values.length; i++) {
-                if (values[i] instanceof LocalTime){
-                    byteBuf.writeLong(((LocalTime) values[i]).toNanoOfDay());
-                }
-            }
-            
-            BytesToRegisters(backend, byteArrays);     
-            
-            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
-        } else {
-            throw new IllegalArgumentException(
-                "Value of type " + values.getClass().getName() +
-                    " is not assignable to " + modbusField + " fields.");                    
-        }
-    }
-    
-    @Override
-    public BaseDefaultFieldItem encodeDate(PlcField field, Object[] values) {
-        int size = Long.BYTES;        
-        ModbusField modbusField = (ModbusField) field;
-        List<Byte[]> byteArrays = new LinkedList<>();        
-        byte[] backend = new byte[values.length * size];
-        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
-        byteBuf.clear();
-        if ((modbusField.getQuantity()*2/size) == values.length) {   
-            for (int i = 0; i < values.length; i++) {
-                if (values[i] instanceof LocalDate){
-                    byteBuf.writeLong(((LocalDate) values[i]).toEpochDay());
-                }
-            }
-            
-            BytesToRegisters(backend, byteArrays);     
-            
-            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
-        } else {
-            throw new IllegalArgumentException(
-                "Value of type " + values.getClass().getName() +
-                    " is not assignable to " + modbusField + " fields.");                    
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeDateTime(PlcField field, Object[] values) {
-        int size = Long.BYTES;        
-        ModbusField modbusField = (ModbusField) field;
-        List<Byte[]> byteArrays = new LinkedList<>();        
-        byte[] backend = new byte[values.length * size];
-        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
-        byteBuf.clear();
-        if ((modbusField.getQuantity()*2/size) == values.length) {   
-            for (int i = 0; i < values.length; i++) {
-                if (values[i] instanceof LocalDateTime){
-                    byteBuf.writeLong(((LocalDateTime) values[i]).toEpochSecond(ZoneOffset.UTC));
-                }
-            }
-            
-            BytesToRegisters(backend, byteArrays);     
-            
-            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
-        } else {
-            throw new IllegalArgumentException(
-                "Value of type " + values.getClass().getName() +
-                    " is not assignable to " + modbusField + " fields.");                    
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeBigDecimal(PlcField field, Object[] values) {
-        int size = 4; //BigInteger
-        ModbusField modbusField = (ModbusField) field;
-        List<Byte[]> byteArrays = new LinkedList<>();        
-        byte[] backend = new byte[values.length * size];
-        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
-        byteBuf.clear();
-        if ((modbusField.getQuantity()*2/size) == values.length) {   
-            for (int i = 0; i < values.length; i++) {
-                if (values[i] instanceof BigDecimal){
-                    byteBuf.writeBytes(((BigDecimal) values[i]).toBigInteger().toByteArray());
-                }
-            }
-            
-            BytesToRegisters(backend, byteArrays);     
-            
-            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
-        } else {
-            throw new IllegalArgumentException(
-                "Value of type " + values.getClass().getName() +
-                    " is not assignable to " + modbusField + " fields.");                    
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeBigInteger(PlcField field, Object[] values) {
-        int size = 4; //BigInteger
-        ModbusField modbusField = (ModbusField) field;
-        List<Byte[]> byteArrays = new LinkedList<>();        
-        byte[] backend = new byte[values.length * size];
-        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
-        byteBuf.clear();
-        if ((modbusField.getQuantity()*2/size) == values.length) {   
-            for (int i = 0; i < values.length; i++) {
-                if (values[i] instanceof BigInteger){
-                    byteBuf.writeBytes(((BigInteger) values[i]).toByteArray());
-                }
-            }
-            
-            BytesToRegisters(backend, byteArrays);     
-            
-            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
-        } else {
-            throw new IllegalArgumentException(
-                "Value of type " + values.getClass().getName() +
-                    " is not assignable to " + modbusField + " fields.");                    
-        }
-    }
-    
-    @Override
-    public BaseDefaultFieldItem encodeString(PlcField field, Object[] values) {
-        int size = 0; //BigInteger
-        ModbusField modbusField = (ModbusField) field;
-        List<Byte[]> byteArrays = new LinkedList<>();  
-        for (Object value:values) size+=((String) value).getBytes().length;
-        size+=((size % 2) == 0)?0:1;
-        byte[] backend = new byte[values.length * size];
-        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
-        byteBuf.clear();
-
-        if ((modbusField.getQuantity()*2) == values.length) {   
-            for (int i = 0; i < values.length; i++) {
-                if (values[i] instanceof String){
-                    byteBuf.writeBytes(((String) values[i]).getBytes());
-                }
-            }
-            if(byteBuf.readableBytes()<size) byteBuf.writeByte(0);
-            BytesToRegisters(backend, byteArrays);
-            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
-        } else {
-            throw new IllegalArgumentException(
-                "Value of type " + values.getClass().getName() +
-                    " is not assignable to " + modbusField + " fields.");                    
-        }
-    }
-    
-    
-    private static void BytesToRegisters(byte[] backend, List<Byte[]> registers){
-        Byte[] tempBytes = null;        
-        int quantity = (backend.length) / 2;
-        for (int j=0; j < quantity; j++){
-            tempBytes = new Byte[2];
-            tempBytes[0] = backend[(j*2)];
-            tempBytes[1] = backend[((j*2+1))];
-            registers.add(tempBytes);
-        }        
-    }
-   
-    
-    
-    
-}
+/*
+ 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
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.modbus.util;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneOffset;
+import java.util.BitSet;
+import java.util.LinkedList;
+import java.util.List;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.connection.DefaultPlcFieldHandler;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+import org.apache.plc4x.java.base.messages.items.DefaultBooleanFieldItem;
+import org.apache.plc4x.java.modbus.messages.items.DefaultModbusByteArrayFieldItem;
+import org.apache.plc4x.java.modbus.model.*;
+
+public class ModbusPlcFieldHandler extends DefaultPlcFieldHandler {
+
+    @Override
+    public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
+        if (MaskWriteRegisterModbusField.ADDRESS_PATTERN.matcher(fieldQuery).matches()) {
+            return MaskWriteRegisterModbusField.of(fieldQuery);
+        } else if (ReadDiscreteInputsModbusField.ADDRESS_PATTERN.matcher(fieldQuery).matches()) {
+            return ReadDiscreteInputsModbusField.of(fieldQuery);
+        } else if (ReadHoldingRegistersModbusField.ADDRESS_PATTERN.matcher(fieldQuery).matches()) {
+            return ReadHoldingRegistersModbusField.of(fieldQuery);
+        } else if (ReadInputRegistersModbusField.ADDRESS_PATTERN.matcher(fieldQuery).matches()) {
+            return ReadInputRegistersModbusField.of(fieldQuery);
+        } else if (CoilModbusField.ADDRESS_PATTERN.matcher(fieldQuery).matches()) {
+            return CoilModbusField.of(fieldQuery);
+        } else if (RegisterModbusField.ADDRESS_PATTERN.matcher(fieldQuery).matches()) {
+            return RegisterModbusField.of(fieldQuery);
+        }
+        throw new PlcInvalidFieldException(fieldQuery);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeBoolean(PlcField field, Object[] values) {
+        ModbusField modbusField = (ModbusField) field;
+        List<Boolean> booleanValues = new LinkedList<>();
+        for (Object value : values) {
+            if (value instanceof Boolean) {
+                Boolean booleanValue = (Boolean) value;
+                booleanValues.add(booleanValue);
+            } else if (value instanceof Byte) {
+                Byte byteValue = (Byte) value;
+                BitSet bitSet = BitSet.valueOf(new byte[]{byteValue});
+                for (int i = 0; i < 8; i++) {
+                    booleanValues.add(bitSet.get(i));
+                }
+            } else if (value instanceof Short) {
+                Short shortValue = (Short) value;
+                BitSet bitSet = BitSet.valueOf(new long[]{shortValue});
+                for (int i = 0; i < 16; i++) {
+                    booleanValues.add(bitSet.get(i));
+                }
+            } else if (value instanceof Integer) {
+                Integer integerValue = (Integer) value;
+                BitSet bitSet = BitSet.valueOf(new long[]{integerValue});
+                for (int i = 0; i < 32; i++) {
+                    booleanValues.add(bitSet.get(i));
+                }
+            } else if (value instanceof Long) {
+                long longValue = (Long) value;
+                BitSet bitSet = BitSet.valueOf(new long[]{longValue});
+                for (int i = 0; i < 64; i++) {
+                    booleanValues.add(bitSet.get(i));
+                }
+            } else {
+                throw new IllegalArgumentException(
+                    "Value of type " + value.getClass().getName() +
+                        " is not assignable to " + modbusField + " fields.");
+            }
+        }
+        return new DefaultBooleanFieldItem(booleanValues.toArray(new Boolean[0]));
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeByteArray(PlcField field, Object[] values) {
+        ModbusField modbusField = (ModbusField) field;
+        List<Byte[]> byteArrays = new LinkedList<>();
+        for (Object value : values) {
+            if (value instanceof byte[]) {
+                byte[] byteArray = (byte[]) value;
+                byteArrays.add(ArrayUtils.toObject(byteArray));
+            } else if (value instanceof Byte[]) {
+                Byte[] byteArray = (Byte[]) value;
+                byteArrays.add(byteArray);
+            } else {
+                throw new IllegalArgumentException(
+                    "Value of type " + value.getClass().getName() +
+                        " is not assignable to " + modbusField + " fields.");
+            }
+        }
+        return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeShort(PlcField field, Object[] values) {
+        int size = Short.BYTES;   
+        ModbusField modbusField = (ModbusField) field;
+        List<Byte[]> byteArrays = new LinkedList<>();        
+        byte[] backend = new byte[values.length * size];
+        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
+        byteBuf.clear();
+        if ((modbusField.getQuantity()*2/size) == values.length) {  
+            for (int i = 0; i < values.length; i++) {
+                if (values[i] instanceof Short){
+                    byteBuf.writeShort((Short) values[i]);
+                }
+            }
+            
+            BytesToRegisters(backend, byteArrays);     
+            
+            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
+        } else {
+            throw new IllegalArgumentException(
+                "Value of type " + values.getClass().getName() +
+                    " is not assignable to " + modbusField + " fields.");                    
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeLong(PlcField field, Object[] values) {
+        int size = Long.BYTES;          
+        ModbusField modbusField = (ModbusField) field;
+        List<Byte[]> byteArrays = new LinkedList<>();        
+        byte[] backend = new byte[values.length * size];
+        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
+        byteBuf.clear();
+        if ((modbusField.getQuantity()*2/size) == values.length) {  
+            for (int i = 0; i < values.length; i++) {
+                if (values[i] instanceof Long){
+                    byteBuf.writeLong((Long) values[i]);
+                }
+            }
+            
+            BytesToRegisters(backend, byteArrays);     
+            
+            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
+        } else {
+            throw new IllegalArgumentException(
+                "Value of type " + values.getClass().getName() +
+                    " is not assignable to " + modbusField + " fields.");                    
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDouble(PlcField field, Object[] values) {
+        int size = Double.BYTES;          
+        ModbusField modbusField = (ModbusField) field;
+        List<Byte[]> byteArrays = new LinkedList<>();        
+        byte[] backend = new byte[values.length * size];
+        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
+        byteBuf.clear();
+        if ((modbusField.getQuantity()*2/size) == values.length) {  
+            for (int i = 0; i < values.length; i++) {
+                if (values[i] instanceof Double){
+                    byteBuf.writeDouble((Double) values[i]);
+                }
+            }
+            
+            BytesToRegisters(backend, byteArrays);     
+            
+            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
+        } else {
+            throw new IllegalArgumentException(
+                "Value of type " + values.getClass().getName() +
+                    " is not assignable to " + modbusField + " fields.");                    
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeInteger(PlcField field, Object[] values) {
+        int size = Integer.BYTES;         
+        ModbusField modbusField = (ModbusField) field;
+        List<Byte[]> byteArrays = new LinkedList<>();        
+        byte[] backend = new byte[values.length * size];
+        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
+        byteBuf.clear();
+        if ((modbusField.getQuantity()*2/size) == values.length) {  
+            for (int i = 0; i < values.length; i++) {
+                if (values[i] instanceof Integer){
+                    byteBuf.writeInt((Integer) values[i]);
+                }
+            }
+            
+            BytesToRegisters(backend, byteArrays);     
+            
+            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
+        } else {
+            throw new IllegalArgumentException(
+                "Value of type " + values.getClass().getName() +
+                    " is not assignable to " + modbusField + " fields.");                    
+        }
+    }
+    
+    @Override
+    public BaseDefaultFieldItem encodeFloat(PlcField field, Object[] values) {
+        int size = Float.BYTES;        
+        ModbusField modbusField = (ModbusField) field;
+        List<Byte[]> byteArrays = new LinkedList<>();        
+        byte[] backend = new byte[values.length * size];
+        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
+        byteBuf.clear();
+        if ((modbusField.getQuantity()*2/size) == values.length) {  
+            for (int i = 0; i < values.length; i++) {
+                if (values[i] instanceof Float){
+                    byteBuf.writeFloat((Float) values[i]);
+                }
+            }
+            
+            BytesToRegisters(backend, byteArrays);
+            
+            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
+        } else {
+            throw new IllegalArgumentException(
+                "Value of type " + values.getClass().getName() +
+                    " is not assignable to " + modbusField + " fields.");                    
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDuration(PlcField field, Object[] values) {
+        int size = Long.BYTES;
+        ModbusField modbusField = (ModbusField) field;
+        List<Byte[]> byteArrays = new LinkedList<>();        
+        byte[] backend = new byte[values.length * size];
+        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
+        byteBuf.clear();
+        if ((modbusField.getQuantity()*2/size) == values.length) {  
+            for (int i = 0; i < values.length; i++) {
+                if (values[i] instanceof Duration){
+                    byteBuf.writeLong(((Duration) values[i]).toNanos());
+                }
+            }
+            
+            BytesToRegisters(backend, byteArrays);
+            
+            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
+        } else {
+            throw new IllegalArgumentException(
+                "Value of type " + values.getClass().getName() +
+                    " is not assignable to " + modbusField + " fields.");                    
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeTime(PlcField field, Object[] values) {
+        int size = Long.BYTES;        
+        ModbusField modbusField = (ModbusField) field;
+        List<Byte[]> byteArrays = new LinkedList<>();        
+        byte[] backend = new byte[values.length * size];
+        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
+        byteBuf.clear();
+        if ((modbusField.getQuantity()*2/size) == values.length) {  
+            for (int i = 0; i < values.length; i++) {
+                if (values[i] instanceof LocalTime){
+                    byteBuf.writeLong(((LocalTime) values[i]).toNanoOfDay());
+                }
+            }
+            
+            BytesToRegisters(backend, byteArrays);     
+            
+            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
+        } else {
+            throw new IllegalArgumentException(
+                "Value of type " + values.getClass().getName() +
+                    " is not assignable to " + modbusField + " fields.");                    
+        }
+    }
+    
+    @Override
+    public BaseDefaultFieldItem encodeDate(PlcField field, Object[] values) {
+        int size = Long.BYTES;        
+        ModbusField modbusField = (ModbusField) field;
+        List<Byte[]> byteArrays = new LinkedList<>();        
+        byte[] backend = new byte[values.length * size];
+        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
+        byteBuf.clear();
+        if ((modbusField.getQuantity()*2/size) == values.length) {   
+            for (int i = 0; i < values.length; i++) {
+                if (values[i] instanceof LocalDate){
+                    byteBuf.writeLong(((LocalDate) values[i]).toEpochDay());
+                }
+            }
+            
+            BytesToRegisters(backend, byteArrays);     
+            
+            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
+        } else {
+            throw new IllegalArgumentException(
+                "Value of type " + values.getClass().getName() +
+                    " is not assignable to " + modbusField + " fields.");                    
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDateTime(PlcField field, Object[] values) {
+        int size = Long.BYTES;        
+        ModbusField modbusField = (ModbusField) field;
+        List<Byte[]> byteArrays = new LinkedList<>();        
+        byte[] backend = new byte[values.length * size];
+        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
+        byteBuf.clear();
+        if ((modbusField.getQuantity()*2/size) == values.length) {   
+            for (int i = 0; i < values.length; i++) {
+                if (values[i] instanceof LocalDateTime){
+                    byteBuf.writeLong(((LocalDateTime) values[i]).toEpochSecond(ZoneOffset.UTC));
+                }
+            }
+            
+            BytesToRegisters(backend, byteArrays);     
+            
+            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
+        } else {
+            throw new IllegalArgumentException(
+                "Value of type " + values.getClass().getName() +
+                    " is not assignable to " + modbusField + " fields.");                    
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeBigDecimal(PlcField field, Object[] values) {
+        int size = 4; //BigInteger
+        ModbusField modbusField = (ModbusField) field;
+        List<Byte[]> byteArrays = new LinkedList<>();        
+        byte[] backend = new byte[values.length * size];
+        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
+        byteBuf.clear();
+        if ((modbusField.getQuantity()*2/size) == values.length) {   
+            for (int i = 0; i < values.length; i++) {
+                if (values[i] instanceof BigDecimal){
+                    byteBuf.writeBytes(((BigDecimal) values[i]).toBigInteger().toByteArray());
+                }
+            }
+            
+            BytesToRegisters(backend, byteArrays);     
+            
+            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
+        } else {
+            throw new IllegalArgumentException(
+                "Value of type " + values.getClass().getName() +
+                    " is not assignable to " + modbusField + " fields.");                    
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeBigInteger(PlcField field, Object[] values) {
+        int size = 4; //BigInteger
+        ModbusField modbusField = (ModbusField) field;
+        List<Byte[]> byteArrays = new LinkedList<>();        
+        byte[] backend = new byte[values.length * size];
+        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
+        byteBuf.clear();
+        if ((modbusField.getQuantity()*2/size) == values.length) {   
+            for (int i = 0; i < values.length; i++) {
+                if (values[i] instanceof BigInteger){
+                    byteBuf.writeBytes(((BigInteger) values[i]).toByteArray());
+                }
+            }
+            
+            BytesToRegisters(backend, byteArrays);     
+            
+            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
+        } else {
+            throw new IllegalArgumentException(
+                "Value of type " + values.getClass().getName() +
+                    " is not assignable to " + modbusField + " fields.");                    
+        }
+    }
+    
+    @Override
+    public BaseDefaultFieldItem encodeString(PlcField field, Object[] values) {
+        int size = 0; //BigInteger
+        ModbusField modbusField = (ModbusField) field;
+        List<Byte[]> byteArrays = new LinkedList<>();  
+        for (Object value:values) size+=((String) value).getBytes().length;
+        size+=((size % 2) == 0)?0:1;
+        byte[] backend = new byte[values.length * size];
+        ByteBuf byteBuf = Unpooled.wrappedBuffer(backend);
+        byteBuf.clear();
+
+        if ((modbusField.getQuantity()*2) == values.length) {   
+            for (int i = 0; i < values.length; i++) {
+                if (values[i] instanceof String){
+                    byteBuf.writeBytes(((String) values[i]).getBytes());
+                }
+            }
+            if(byteBuf.readableBytes()<size) byteBuf.writeByte(0);
+            BytesToRegisters(backend, byteArrays);
+            return new DefaultModbusByteArrayFieldItem(byteArrays.toArray(new Byte[0][0]));
+        } else {
+            throw new IllegalArgumentException(
+                "Value of type " + values.getClass().getName() +
+                    " is not assignable to " + modbusField + " fields.");                    
+        }
+    }
+    
+    
+    private static void BytesToRegisters(byte[] backend, List<Byte[]> registers){
+        Byte[] tempBytes = null;        
+        int quantity = (backend.length) / 2;
+        for (int j=0; j < quantity; j++){
+            tempBytes = new Byte[2];
+            tempBytes[0] = backend[(j*2)];
+            tempBytes[1] = backend[((j*2+1))];
+            registers.add(tempBytes);
+        }        
+    }
+   
+    
+    
+    
+}
diff --git a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java
index a0870bdf73e..aca9fd66342 100644
--- a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java
+++ b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java
@@ -1,138 +1,138 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.modbus;
-
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.messages.PlcWriteResponse;
-import org.apache.plc4x.java.mock.util.HexUtil;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.stream.IntStream;
-
-public class ManualPlc4XModbusTest {
-
-    public static void main(String... args) {
-        String connectionUrl;
-        if (args.length > 0 && "serial".equalsIgnoreCase(args[0])) {
-            System.out.println("Using serial");
-            connectionUrl = "modbus:serial:///dev/ttys003";
-        } else {
-            System.out.println("Using tcp");
-            connectionUrl = "modbus:tcp://localhost:5440";
-        }
-        try (PlcConnection plcConnection = new PlcDriverManager().getConnection(connectionUrl)) {
-            System.out.println("PlcConnection " + plcConnection);
-
-            {
-                PlcReadRequest readRequest = plcConnection.readRequestBuilder()
-                .addItem("randomRegister", "register:7[3]").build();
-                PlcReadResponse readResponse = readRequest.execute().get();
-                System.out.println("Response " + readResponse);
-                readResponse.getAllByteArrays("randomRegister").stream()
-                    .map(HexUtil::toHex)
-                    .map(hex -> "Register Value: " + hex)
-                    .forEach(System.out::println);
-            }
-
-            {
-                // Read an int from 2 registers
-
-                // Just dump the actual values
-                PlcReadRequest readRequest = plcConnection.readRequestBuilder()
-                    .addItem("randomRegister", "register:3[2]").build();
-                PlcReadResponse readResponse = readRequest.execute().get();
-                System.out.println("Response " + readResponse);
-                Collection<Byte[]> randomRegisters = readResponse.getAllByteArrays("randomRegister");
-                randomRegisters.stream()
-                    .map(HexUtil::toHex)
-                    .map(hex -> "Register Value: " + hex)
-                    .forEach(System.out::println);
-
-                // Read an actual int
-                Byte[] registerBytes = randomRegisters.stream()
-                    .flatMap(Arrays::stream)
-                    .toArray(Byte[]::new);
-                int readInt = ByteBuffer.wrap(ArrayUtils.toPrimitive(registerBytes))
-                    .order(ByteOrder.BIG_ENDIAN)
-                    .getInt();
-                System.out.println("Read int " + readInt + " from register");
-            }
-
-            {
-                // Read an int from 2 registers and multiple requests
-
-                // Just dump the actual values
-                PlcReadRequest readRequest = plcConnection.readRequestBuilder()
-                    .addItem("randomRegister1", "register:1[2]")
-                    .addItem("randomRegister2", "register:10[3]")
-                    .addItem("randomRegister3", "register:20[4]")
-                    .addItem("randomRegister4", "register:30[5]")
-                    .addItem("randomRegister5", "register:40[6]")
-                    .build();
-                PlcReadResponse readResponse = readRequest.execute().get();
-                System.out.println("Response " + readResponse);
-                IntStream.range(1, 6).forEach(i -> {
-                    Collection<Byte[]> randomRegisters = readResponse.getAllByteArrays("randomRegister" + i);
-                    randomRegisters.stream()
-                        .map(HexUtil::toHex)
-                        .map(hex -> "Register " + i + " Value: " + hex)
-                        .forEach(System.out::println);
-
-                    // Read an actual int
-                    Byte[] registerBytes = randomRegisters.stream()
-                        .flatMap(Arrays::stream)
-                        .toArray(Byte[]::new);
-                    int readInt = ByteBuffer.wrap(ArrayUtils.toPrimitive(registerBytes))
-                        .order(ByteOrder.BIG_ENDIAN)
-                        .getInt();
-                    System.out.println("Read int " + i + " " + readInt + " from register");
-                });
-            }
-
-            {
-                PlcReadRequest readRequest = plcConnection.readRequestBuilder()
-                    .addItem("randomCoil", "coil:1[9]").build();
-                PlcReadResponse readResponse = readRequest.execute().get();
-                System.out.println("Response " + readResponse);
-                readResponse.getAllBooleans("randomCoil").stream()
-                    .map(hex -> "Coil Value: " + hex)
-                    .forEach(System.out::println);
-            }
-
-            {
-                PlcWriteRequest writeRequest = plcConnection.writeRequestBuilder()
-                    .addItem("randomCoilField", "coil:1", true).build();
-                PlcWriteResponse writeResponse = writeRequest.execute().get();
-                System.out.println("Response " + writeResponse);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            System.exit(1);
-        }
-        System.exit(0);
-    }
-}
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.modbus;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteResponse;
+import org.apache.plc4x.java.mock.util.HexUtil;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.stream.IntStream;
+
+public class ManualPlc4XModbusTest {
+
+    public static void main(String... args) {
+        String connectionUrl;
+        if (args.length > 0 && "serial".equalsIgnoreCase(args[0])) {
+            System.out.println("Using serial");
+            connectionUrl = "modbus:serial:///dev/ttys003";
+        } else {
+            System.out.println("Using tcp");
+            connectionUrl = "modbus:tcp://localhost:5440";
+        }
+        try (PlcConnection plcConnection = new PlcDriverManager().getConnection(connectionUrl)) {
+            System.out.println("PlcConnection " + plcConnection);
+
+            {
+                PlcReadRequest readRequest = plcConnection.readRequestBuilder()
+                .addItem("randomRegister", "register:7[3]").build();
+                PlcReadResponse readResponse = readRequest.execute().get();
+                System.out.println("Response " + readResponse);
+                readResponse.getAllByteArrays("randomRegister").stream()
+                    .map(HexUtil::toHex)
+                    .map(hex -> "Register Value: " + hex)
+                    .forEach(System.out::println);
+            }
+
+            {
+                // Read an int from 2 registers
+
+                // Just dump the actual values
+                PlcReadRequest readRequest = plcConnection.readRequestBuilder()
+                    .addItem("randomRegister", "register:3[2]").build();
+                PlcReadResponse readResponse = readRequest.execute().get();
+                System.out.println("Response " + readResponse);
+                Collection<Byte[]> randomRegisters = readResponse.getAllByteArrays("randomRegister");
+                randomRegisters.stream()
+                    .map(HexUtil::toHex)
+                    .map(hex -> "Register Value: " + hex)
+                    .forEach(System.out::println);
+
+                // Read an actual int
+                Byte[] registerBytes = randomRegisters.stream()
+                    .flatMap(Arrays::stream)
+                    .toArray(Byte[]::new);
+                int readInt = ByteBuffer.wrap(ArrayUtils.toPrimitive(registerBytes))
+                    .order(ByteOrder.BIG_ENDIAN)
+                    .getInt();
+                System.out.println("Read int " + readInt + " from register");
+            }
+
+            {
+                // Read an int from 2 registers and multiple requests
+
+                // Just dump the actual values
+                PlcReadRequest readRequest = plcConnection.readRequestBuilder()
+                    .addItem("randomRegister1", "register:1[2]")
+                    .addItem("randomRegister2", "register:10[3]")
+                    .addItem("randomRegister3", "register:20[4]")
+                    .addItem("randomRegister4", "register:30[5]")
+                    .addItem("randomRegister5", "register:40[6]")
+                    .build();
+                PlcReadResponse readResponse = readRequest.execute().get();
+                System.out.println("Response " + readResponse);
+                IntStream.range(1, 6).forEach(i -> {
+                    Collection<Byte[]> randomRegisters = readResponse.getAllByteArrays("randomRegister" + i);
+                    randomRegisters.stream()
+                        .map(HexUtil::toHex)
+                        .map(hex -> "Register " + i + " Value: " + hex)
+                        .forEach(System.out::println);
+
+                    // Read an actual int
+                    Byte[] registerBytes = randomRegisters.stream()
+                        .flatMap(Arrays::stream)
+                        .toArray(Byte[]::new);
+                    int readInt = ByteBuffer.wrap(ArrayUtils.toPrimitive(registerBytes))
+                        .order(ByteOrder.BIG_ENDIAN)
+                        .getInt();
+                    System.out.println("Read int " + i + " " + readInt + " from register");
+                });
+            }
+
+            {
+                PlcReadRequest readRequest = plcConnection.readRequestBuilder()
+                    .addItem("randomCoil", "coil:1[9]").build();
+                PlcReadResponse readResponse = readRequest.execute().get();
+                System.out.println("Response " + readResponse);
+                readResponse.getAllBooleans("randomCoil").stream()
+                    .map(hex -> "Coil Value: " + hex)
+                    .forEach(System.out::println);
+            }
+
+            {
+                PlcWriteRequest writeRequest = plcConnection.writeRequestBuilder()
+                    .addItem("randomCoilField", "coil:1", true).build();
+                PlcWriteResponse writeResponse = writeRequest.execute().get();
+                System.out.println("Response " + writeResponse);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.exit(1);
+        }
+        System.exit(0);
+    }
+}
diff --git a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/messages/items/DefaultModbusByteArrayFieldItemTest.java b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/messages/items/DefaultModbusByteArrayFieldItemTest.java
index beedcbf1daa..5cc98e5b919 100644
--- a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/messages/items/DefaultModbusByteArrayFieldItemTest.java
+++ b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/messages/items/DefaultModbusByteArrayFieldItemTest.java
@@ -1,136 +1,136 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.modbus.messages.items;
-
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-import org.junit.Test;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-@SuppressWarnings("unchecked")
-public class DefaultModbusByteArrayFieldItemTest {
-    @Test
-    public void convertByteArrayToIntegerTest() {
-        BaseDefaultFieldItem fieldItem = getFieldItemForIntegerArray();
-
-        Integer itemInteger = fieldItem.getInteger(1);
-        assertEquals(456,itemInteger,0);
-    }
-
-    @Test
-    public void convertByteArrayToIntegerTestReturnsNull() {
-        BaseDefaultFieldItem fieldItem = getFieldItemForIntegerArray();
-
-        Integer itemInteger = fieldItem.getInteger(17);
-        assertNull(itemInteger);
-    }
-
-    private static BaseDefaultFieldItem getFieldItemForIntegerArray() {
-        int sizeIntByteBuffer = 12;
-        ByteBuffer byteBuffer = ByteBuffer.allocate(sizeIntByteBuffer);
-        byteBuffer.order(ByteOrder.BIG_ENDIAN);
-        byteBuffer.putInt(0,123);
-        byteBuffer.putInt(4,456);
-        byteBuffer.putInt(8,789);
-        Byte[][] byteArray = new Byte[sizeIntByteBuffer/2][2];
-        int cntByteBuffer=0;
-        for (byte b : byteBuffer.array()) {
-            int shortIndex=cntByteBuffer/2;
-            byteArray[shortIndex][cntByteBuffer%2] = b;
-            cntByteBuffer++;
-        }
-
-        return new DefaultModbusByteArrayFieldItem(byteArray);
-    }
-
-
-    @Test
-    public void convertByteArrayToShortTest() {
-        BaseDefaultFieldItem fieldItem = getFieldItemForShortArray();
-
-        Short itemShort = fieldItem.getShort(3);
-        assertEquals(1011,itemShort,0);
-    }
-
-    @Test
-    public void convertByteArrayToShortTestReturnsNull() {
-        BaseDefaultFieldItem fieldItem = getFieldItemForShortArray();
-
-        Short itemShort = fieldItem.getShort(7);
-        assertNull(itemShort);
-    }
-
-    private static BaseDefaultFieldItem getFieldItemForShortArray() {
-        int sizeIntByteBuffer = 8;
-        ByteBuffer byteBuffer = ByteBuffer.allocate(sizeIntByteBuffer);
-        byteBuffer.order(ByteOrder.BIG_ENDIAN);
-        byteBuffer.putShort(0,(short)123);
-        byteBuffer.putShort(2,(short)456);
-        byteBuffer.putShort(4,(short)789);
-        byteBuffer.putShort(6,(short)1011);
-        Byte[][] byteArray = new Byte[sizeIntByteBuffer/2][2];
-        int cntByteBuffer=0;
-        for (byte b : byteBuffer.array()) {
-            int shortIndex=cntByteBuffer/2;
-            byteArray[shortIndex][cntByteBuffer%2] = b;
-            cntByteBuffer++;
-        }
-
-        return new DefaultModbusByteArrayFieldItem(byteArray);
-    }
-
-    @Test
-    public void convertByteArrayToLongTest() {
-        BaseDefaultFieldItem fieldItem = getFieldItemForLongArray();
-
-        Long itemLong = fieldItem.getLong(1);
-        assertEquals(456789123L,itemLong,0);
-    }
-
-    @Test
-    public void convertByteArrayToLongTestReturnsNull() {
-        BaseDefaultFieldItem fieldItem = getFieldItemForLongArray();
-
-        Long itemLong = fieldItem.getLong(4);
-        assertNull(itemLong);
-    }
-
-    private static BaseDefaultFieldItem getFieldItemForLongArray() {
-        int sizeIntByteBuffer = 32;
-        ByteBuffer byteBuffer = ByteBuffer.allocate(sizeIntByteBuffer);
-        byteBuffer.order(ByteOrder.BIG_ENDIAN);
-        byteBuffer.putLong(0,123456789L);
-        byteBuffer.putLong(8,456789123L);
-        byteBuffer.putLong(16,789123456L);
-        byteBuffer.putLong(24,101110111011L);
-        Byte[][] byteArray = new Byte[sizeIntByteBuffer/2][2];
-        int cntByteBuffer=0;
-        for (byte b : byteBuffer.array()) {
-            int shortIndex=cntByteBuffer/2;
-            byteArray[shortIndex][cntByteBuffer%2] = b;
-            cntByteBuffer++;
-        }
-
-        return new DefaultModbusByteArrayFieldItem(byteArray);
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.modbus.messages.items;
+
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+import org.junit.Test;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+@SuppressWarnings("unchecked")
+public class DefaultModbusByteArrayFieldItemTest {
+    @Test
+    public void convertByteArrayToIntegerTest() {
+        BaseDefaultFieldItem fieldItem = getFieldItemForIntegerArray();
+
+        Integer itemInteger = fieldItem.getInteger(1);
+        assertEquals(456,itemInteger,0);
+    }
+
+    @Test
+    public void convertByteArrayToIntegerTestReturnsNull() {
+        BaseDefaultFieldItem fieldItem = getFieldItemForIntegerArray();
+
+        Integer itemInteger = fieldItem.getInteger(17);
+        assertNull(itemInteger);
+    }
+
+    private static BaseDefaultFieldItem getFieldItemForIntegerArray() {
+        int sizeIntByteBuffer = 12;
+        ByteBuffer byteBuffer = ByteBuffer.allocate(sizeIntByteBuffer);
+        byteBuffer.order(ByteOrder.BIG_ENDIAN);
+        byteBuffer.putInt(0,123);
+        byteBuffer.putInt(4,456);
+        byteBuffer.putInt(8,789);
+        Byte[][] byteArray = new Byte[sizeIntByteBuffer/2][2];
+        int cntByteBuffer=0;
+        for (byte b : byteBuffer.array()) {
+            int shortIndex=cntByteBuffer/2;
+            byteArray[shortIndex][cntByteBuffer%2] = b;
+            cntByteBuffer++;
+        }
+
+        return new DefaultModbusByteArrayFieldItem(byteArray);
+    }
+
+
+    @Test
+    public void convertByteArrayToShortTest() {
+        BaseDefaultFieldItem fieldItem = getFieldItemForShortArray();
+
+        Short itemShort = fieldItem.getShort(3);
+        assertEquals(1011,itemShort,0);
+    }
+
+    @Test
+    public void convertByteArrayToShortTestReturnsNull() {
+        BaseDefaultFieldItem fieldItem = getFieldItemForShortArray();
+
+        Short itemShort = fieldItem.getShort(7);
+        assertNull(itemShort);
+    }
+
+    private static BaseDefaultFieldItem getFieldItemForShortArray() {
+        int sizeIntByteBuffer = 8;
+        ByteBuffer byteBuffer = ByteBuffer.allocate(sizeIntByteBuffer);
+        byteBuffer.order(ByteOrder.BIG_ENDIAN);
+        byteBuffer.putShort(0,(short)123);
+        byteBuffer.putShort(2,(short)456);
+        byteBuffer.putShort(4,(short)789);
+        byteBuffer.putShort(6,(short)1011);
+        Byte[][] byteArray = new Byte[sizeIntByteBuffer/2][2];
+        int cntByteBuffer=0;
+        for (byte b : byteBuffer.array()) {
+            int shortIndex=cntByteBuffer/2;
+            byteArray[shortIndex][cntByteBuffer%2] = b;
+            cntByteBuffer++;
+        }
+
+        return new DefaultModbusByteArrayFieldItem(byteArray);
+    }
+
+    @Test
+    public void convertByteArrayToLongTest() {
+        BaseDefaultFieldItem fieldItem = getFieldItemForLongArray();
+
+        Long itemLong = fieldItem.getLong(1);
+        assertEquals(456789123L,itemLong,0);
+    }
+
+    @Test
+    public void convertByteArrayToLongTestReturnsNull() {
+        BaseDefaultFieldItem fieldItem = getFieldItemForLongArray();
+
+        Long itemLong = fieldItem.getLong(4);
+        assertNull(itemLong);
+    }
+
+    private static BaseDefaultFieldItem getFieldItemForLongArray() {
+        int sizeIntByteBuffer = 32;
+        ByteBuffer byteBuffer = ByteBuffer.allocate(sizeIntByteBuffer);
+        byteBuffer.order(ByteOrder.BIG_ENDIAN);
+        byteBuffer.putLong(0,123456789L);
+        byteBuffer.putLong(8,456789123L);
+        byteBuffer.putLong(16,789123456L);
+        byteBuffer.putLong(24,101110111011L);
+        Byte[][] byteArray = new Byte[sizeIntByteBuffer/2][2];
+        int cntByteBuffer=0;
+        for (byte b : byteBuffer.array()) {
+            int shortIndex=cntByteBuffer/2;
+            byteArray[shortIndex][cntByteBuffer%2] = b;
+            cntByteBuffer++;
+        }
+
+        return new DefaultModbusByteArrayFieldItem(byteArray);
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocolTest.java b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocolTest.java
index 30b37a23289..d85538d21e3 100644
--- a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocolTest.java
+++ b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocolTest.java
@@ -1,410 +1,410 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.modbus.netty;
-
-import com.digitalpetri.modbus.ModbusPdu;
-import com.digitalpetri.modbus.codec.ModbusTcpPayload;
-import com.digitalpetri.modbus.requests.*;
-import com.digitalpetri.modbus.responses.*;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import org.apache.commons.lang3.RandomStringUtils;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.plc4x.java.api.messages.PlcResponse;
-import org.apache.plc4x.java.base.messages.*;
-import org.apache.plc4x.java.mock.protocol.Plc4XSupportedDataTypes;
-import org.apache.plc4x.java.modbus.util.ModbusPlcFieldHandler;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.math.BigInteger;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.apache.plc4x.java.mock.protocol.Plc4XSupportedDataTypes.streamOfBigEndianDataTypePairs;
-import static org.apache.plc4x.java.mock.util.Assert.assertByteEquals;
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assume.assumeThat;
-
-@RunWith(Parameterized.class)
-public class Plc4XModbusProtocolTest {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(Plc4XModbusProtocolTest.class);
-
-    private Plc4XModbusProtocol SUT;
-
-    @Rule
-    public ExpectedException expectedException = ExpectedException.none();
-    // TODO: implement these types
-    private List<String> notYetSupportedDataType = Stream.of(
-        String.class
-    ).map(Class::getSimpleName).collect(Collectors.toList());
-
-    @Parameterized.Parameter
-    public String payloadClazzName;
-
-    @Parameterized.Parameter(1)
-    public PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> plcRequestContainer;
-
-    @Parameterized.Parameter(2)
-    public CompletableFuture completableFuture;
-
-    @Parameterized.Parameter(3)
-    public String plcRequestContainerClassName;
-
-    @Parameterized.Parameter(4)
-    public ModbusTcpPayload modbusTcpPayload;
-
-    @Parameterized.Parameter(5)
-    public String modbusPduName;
-
-    @Parameterized.Parameters(name = "{index} Type:{0} {3} {5}")
-    public static Collection<Object[]> data() {
-        return streamOfBigEndianDataTypePairs()
-            .filter(o -> o.getDataTypeClass() == boolean.class
-                || o.getDataTypeClass() == byte[].class
-                || o.getDataTypeClass() == Byte[].class)
-            // Float and Double getting truncated in modbus.
-            .map(dataTypePair -> {
-                if (dataTypePair.getDataTypeClass() == Float.class) {
-                    return Plc4XSupportedDataTypes.DataTypePair.of(1f, new byte[]{0x0, 0x1});
-                } else if (dataTypePair.getDataTypeClass() == Double.class) {
-                    return Plc4XSupportedDataTypes.DataTypePair.of(1d, new byte[]{0x0, 0x1});
-                } else {
-                    return dataTypePair;
-                }
-            })
-            .map(dataTypePair -> Stream.of(
-                producePair(dataTypePair.getDataTypeClass(), "coil:1", new ReadCoilsResponse(Unpooled.wrappedBuffer(new byte[]{(byte) 0x1}))),
-                producePair("coil:1", new WriteSingleCoilResponse(1, 1), mapDataTypePairForCoil(dataTypePair).getValue()),
-                /* Read request no supported on maskwrite so how to handle?
-                producePair(pair.getDataTypeClass(), MaskWriteRegisterModbusField.of("maskwrite:1/1/2"), new MaskWriteRegisterResponse(1, 1, 2)),
-                */
-                producePair("maskwrite:1/1/2", new MaskWriteRegisterResponse(1, 1, 2), mapDataTypePairForRegister(dataTypePair).getValue()),
-                producePair(dataTypePair.getDataTypeClass(), "readdiscreteinputs:1", new ReadDiscreteInputsResponse(Unpooled.wrappedBuffer(new byte[]{(byte) 0x01}))),
-                producePair(dataTypePair.getDataTypeClass(), "readholdingregisters:1", new ReadHoldingRegistersResponse(Unpooled.wrappedBuffer(cutRegister(mapDataTypePairForRegister(dataTypePair).getByteRepresentation())))),
-                producePair(dataTypePair.getDataTypeClass(), "readinputregisters:1", new ReadInputRegistersResponse(Unpooled.wrappedBuffer(cutRegister(mapDataTypePairForRegister(dataTypePair).getByteRepresentation())))),
-                producePair("coil:1", new WriteMultipleCoilsResponse(1, 3), mapDataTypePairForCoil(dataTypePair).getValue(), mapDataTypePairForCoil(dataTypePair).getValue(), mapDataTypePairForCoil(dataTypePair).getValue()),
-                producePair("register:1", new WriteMultipleRegistersResponse(1, 3), mapDataTypePairForRegister(dataTypePair).getValue(), mapDataTypePairForRegister(dataTypePair).getValue(), mapDataTypePairForRegister(dataTypePair).getValue()),
-                producePair("register:1", new WriteSingleRegisterResponse(1, cutRegister(mapDataTypePairForRegister(dataTypePair).getByteRepresentation())[0]), mapDataTypePairForRegister(dataTypePair).getValue())
-            ))
-            .flatMap(stream -> stream)
-            // TODO: request doesn't know its type anymore... fixme
-            .map(pair -> new Object[]{Object.class.getSimpleName(), pair.left, pair.left.getResponseFuture(), pair.left.getRequest().getClass().getSimpleName(), pair.right, pair.right.getClass().getSimpleName()}).collect(Collectors.toList());
-    }
-
-    private static ImmutablePair<PlcRequestContainer<InternalPlcReadRequest, InternalPlcResponse>, ModbusTcpPayload> producePair(Class type, String field, ModbusPdu modbusPdu) {
-        return ImmutablePair.of(
-            new PlcRequestContainer<>(
-                (InternalPlcReadRequest) new DefaultPlcReadRequest.Builder(null, new ModbusPlcFieldHandler()) // TODO: remove null
-                    .addItem(RandomStringUtils.randomAlphabetic(10), field)
-                    .build(), new CompletableFuture<>()),
-            new ModbusTcpPayload((short) 0, (short) 0, modbusPdu)
-        );
-    }
-
-    @SuppressWarnings("unchecked")
-    private static ImmutablePair<PlcRequestContainer<InternalPlcWriteRequest, InternalPlcResponse>, ModbusTcpPayload> producePair(String field, ModbusPdu modbusPdu, Object... values) {
-        if (values.length == 0) {
-            throw new IllegalArgumentException("At least one value ist required");
-        }
-        if (values.length == 1) {
-            return ImmutablePair.of(
-                new PlcRequestContainer<>(
-                    (InternalPlcWriteRequest) new DefaultPlcWriteRequest.Builder(null, new ModbusPlcFieldHandler()) // TODO: remove null
-                        .addItem(RandomStringUtils.randomAlphabetic(10), field, values[0])
-                        .build(), new CompletableFuture<>()),
-                new ModbusTcpPayload((short) 0, (short) 0, modbusPdu)
-            );
-        } else {
-            return ImmutablePair.of(
-                new PlcRequestContainer<>(
-                    (InternalPlcWriteRequest) new DefaultPlcWriteRequest.Builder(null, new ModbusPlcFieldHandler()) // TODO: remove null
-                        .addItem(RandomStringUtils.randomAlphabetic(10), field, values)
-                        .build(), new CompletableFuture<>()),
-                new ModbusTcpPayload((short) 0, (short) 0, modbusPdu)
-            );
-        }
-    }
-
-    private static byte[] cutRegister(byte[] right) {
-        return new byte[]{right.length > 1 ? right[right.length - 2] : 0x0, right[right.length - 1]};
-    }
-
-    @Before
-    public void setUp() {
-        SUT = new Plc4XModbusProtocol((short) 1);
-    }
-
-    @Test
-    public void encode() throws Exception {
-        assumeThat(payloadClazzName + " not yet implemented", notYetSupportedDataType, not(hasItem(payloadClazzName)));
-        ArrayList<Object> out = new ArrayList<>();
-        SUT.encode(null, plcRequestContainer, out);
-        assertThat(out, hasSize(1));
-        assertThat(out.get(0), instanceOf(ModbusTcpPayload.class));
-        ModbusTcpPayload modbusTcpPayload = (ModbusTcpPayload) out.get(0);
-        ModbusPdu modbusPdu = modbusTcpPayload.getModbusPdu();
-        if (modbusPdu instanceof MaskWriteRegisterRequest) {
-            MaskWriteRegisterRequest maskWriteRegisterRequest = (MaskWriteRegisterRequest) modbusPdu;
-            int address = maskWriteRegisterRequest.getAddress();
-            assertThat(address, equalTo(1));
-            int andMask = maskWriteRegisterRequest.getAndMask();
-            int orMask = maskWriteRegisterRequest.getOrMask();
-            if (payloadClazzName.equals(Boolean.class.getSimpleName())) {
-                assertThat(andMask, equalTo(1));
-                assertThat(orMask, equalTo(2));
-            } else if (payloadClazzName.equals(Byte.class.getSimpleName())) {
-                assertThat(andMask, equalTo(1));
-                assertThat(orMask, equalTo(2));
-            } else if (payloadClazzName.equals(Short.class.getSimpleName())) {
-                assertThat(andMask, equalTo(1));
-                assertThat(orMask, equalTo(2));
-            } else if (payloadClazzName.equals(GregorianCalendar.class.getSimpleName())) {
-                assertThat(andMask, equalTo(1));
-                assertThat(orMask, equalTo(2));
-            } else if (payloadClazzName.equals(Float.class.getSimpleName())) {
-                assertThat(andMask, equalTo(1));
-                assertThat(orMask, equalTo(2));
-            } else if (payloadClazzName.equals(Integer.class.getSimpleName())) {
-                assertThat(andMask, equalTo(1));
-                assertThat(orMask, equalTo(2));
-            } else if (payloadClazzName.equals(BigInteger.class.getSimpleName())) {
-                assertThat(andMask, equalTo(1));
-                assertThat(orMask, equalTo(2));
-            } else if (payloadClazzName.equals(String.class.getSimpleName())) {
-                assertThat(andMask, equalTo(1));
-                assertThat(orMask, equalTo(2));
-            }
-        } else if (modbusPdu instanceof ReadCoilsRequest) {
-            ReadCoilsRequest readCoilsRequest = (ReadCoilsRequest) modbusPdu;
-            int address = readCoilsRequest.getAddress();
-            int quantity = readCoilsRequest.getQuantity();
-            assertThat(address, equalTo(1));
-            assertThat(quantity, equalTo(1));
-        } else if (modbusPdu instanceof ReadDiscreteInputsRequest) {
-            ReadDiscreteInputsRequest readCoilsRequest = (ReadDiscreteInputsRequest) modbusPdu;
-            int address = readCoilsRequest.getAddress();
-            int quantity = readCoilsRequest.getQuantity();
-            assertThat(address, equalTo(1));
-            assertThat(quantity, equalTo(1));
-        } else if (modbusPdu instanceof ReadHoldingRegistersRequest) {
-            ReadHoldingRegistersRequest readCoilsRequest = (ReadHoldingRegistersRequest) modbusPdu;
-            int address = readCoilsRequest.getAddress();
-            int quantity = readCoilsRequest.getQuantity();
-            assertThat(address, equalTo(1));
-            assertThat(quantity, equalTo(1));
-        } else if (modbusPdu instanceof ReadInputRegistersRequest) {
-            ReadInputRegistersRequest readCoilsRequest = (ReadInputRegistersRequest) modbusPdu;
-            int address = readCoilsRequest.getAddress();
-            int quantity = readCoilsRequest.getQuantity();
-            assertThat(address, equalTo(1));
-            assertThat(quantity, equalTo(1));
-        } else if (modbusPdu instanceof WriteMultipleCoilsRequest) {
-            WriteMultipleCoilsRequest writeMultipleCoilsRequest = (WriteMultipleCoilsRequest) modbusPdu;
-            int address = writeMultipleCoilsRequest.getAddress();
-            assertThat(address, equalTo(1));
-            ByteBuf value = writeMultipleCoilsRequest.getValues();
-            byte[] bytes = new byte[value.readableBytes()];
-            value.readBytes(value);
-            if (payloadClazzName.equals(Boolean.class.getSimpleName())) {
-                assertByteEquals(new byte[]{0x0}, bytes);
-            } else if (payloadClazzName.equals(Byte.class.getSimpleName())) {
-                assertByteEquals(new byte[]{0x0}, bytes);
-            } else if (payloadClazzName.equals(Short.class.getSimpleName())) {
-                assertByteEquals(new byte[]{0x0}, bytes);
-            } else if (payloadClazzName.equals(Calendar.class.getSimpleName())) {
-                assertByteEquals(new byte[]{0x0}, bytes);
-            } else if (payloadClazzName.equals(Float.class.getSimpleName())) {
-                assertByteEquals(new byte[]{0x0}, bytes);
-            } else if (payloadClazzName.equals(Integer.class.getSimpleName())) {
-                assertByteEquals(new byte[]{0x0}, bytes);
-            } else if (payloadClazzName.equals(BigInteger.class.getSimpleName())) {
-                assertByteEquals(new byte[]{0x0}, bytes);
-            } else if (payloadClazzName.equals(String.class.getSimpleName())) {
-                assertByteEquals(new byte[]{0x0}, bytes);
-            }
-        } else if (modbusPdu instanceof WriteMultipleRegistersRequest) {
-            WriteMultipleRegistersRequest writeMultipleRegistersRequest = (WriteMultipleRegistersRequest) modbusPdu;
-            int address = writeMultipleRegistersRequest.getAddress();
-            assertThat(address, equalTo(1));
-            ByteBuf value = writeMultipleRegistersRequest.getValues();
-            byte[] bytes = new byte[value.readableBytes()];
-            value.readBytes(value);
-            if (payloadClazzName.equals(Boolean.class.getSimpleName())) {
-                assertByteEquals(new byte[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, bytes);
-            } else if (payloadClazzName.equals(Byte.class.getSimpleName())) {
-                assertByteEquals(new byte[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, bytes);
-            } else if (payloadClazzName.equals(Short.class.getSimpleName())) {
-                assertByteEquals(new byte[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, bytes);
-            } else if (payloadClazzName.equals(Calendar.class.getSimpleName())) {
-                assertByteEquals(new byte[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, bytes);
-            } else if (payloadClazzName.equals(Float.class.getSimpleName())) {
-                assertByteEquals(new byte[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, bytes);
-            } else if (payloadClazzName.equals(Integer.class.getSimpleName())) {
-                assertByteEquals(new byte[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, bytes);
-            } else if (payloadClazzName.equals(BigInteger.class.getSimpleName())) {
-                assertByteEquals(new byte[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, bytes);
-            } else if (payloadClazzName.equals(String.class.getSimpleName())) {
-                assertByteEquals(new byte[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, bytes);
-            }
-        } else if (modbusPdu instanceof WriteSingleCoilRequest) {
-            WriteSingleCoilRequest writeSingleCoilRequest = (WriteSingleCoilRequest) modbusPdu;
-            int address = writeSingleCoilRequest.getAddress();
-            assertThat(address, equalTo(1));
-            int value = writeSingleCoilRequest.getValue();
-            boolean coilValue = value == 0xFF00;
-            if (payloadClazzName.equals(Boolean.class.getSimpleName())) {
-                assertThat(coilValue, equalTo(true));
-            } else if (payloadClazzName.equals(Byte.class.getSimpleName())) {
-                assertThat(coilValue, equalTo(true));
-            } else if (payloadClazzName.equals(Short.class.getSimpleName())) {
-                assertThat(coilValue, equalTo(true));
-            } else if (payloadClazzName.equals(Calendar.class.getSimpleName())) {
-                assertThat(coilValue, equalTo(true));
-            } else if (payloadClazzName.equals(Float.class.getSimpleName())) {
-                assertThat(coilValue, equalTo(true));
-            } else if (payloadClazzName.equals(Double.class.getSimpleName())) {
-                assertThat(coilValue, equalTo(true));
-            } else if (payloadClazzName.equals(Integer.class.getSimpleName())) {
-                assertThat(coilValue, equalTo(true));
-            } else if (payloadClazzName.equals(BigInteger.class.getSimpleName())) {
-                assertThat(coilValue, equalTo(true));
-            } else if (payloadClazzName.equals(String.class.getSimpleName())) {
-                assertThat(coilValue, equalTo(true));
-            }
-        } else if (modbusPdu instanceof WriteSingleRegisterRequest) {
-            WriteSingleRegisterRequest writeSingleRegisterRequest = (WriteSingleRegisterRequest) modbusPdu;
-            int address = writeSingleRegisterRequest.getAddress();
-            assertThat(address, equalTo(1));
-            int value = writeSingleRegisterRequest.getValue();
-            if (payloadClazzName.equals(Boolean.class.getSimpleName())) {
-                assertThat(value, equalTo(1));
-            } else if (payloadClazzName.equals(Byte.class.getSimpleName())) {
-                assertThat(value, equalTo(1));
-            } else if (payloadClazzName.equals(Short.class.getSimpleName())) {
-                assertThat(value, equalTo(1));
-            } else if (payloadClazzName.equals(Calendar.class.getSimpleName())) {
-                assertThat(value, equalTo(1));
-            } else if (payloadClazzName.equals(Float.class.getSimpleName())) {
-                assertThat(value, equalTo(1));
-            } else if (payloadClazzName.equals(Double.class.getSimpleName())) {
-                assertThat(value, equalTo(1));
-            } else if (payloadClazzName.equals(Integer.class.getSimpleName())) {
-                assertThat(value, equalTo(1));
-            } else if (payloadClazzName.equals(BigInteger.class.getSimpleName())) {
-                assertThat(value, equalTo(1));
-            } else if (payloadClazzName.equals(String.class.getSimpleName())) {
-                assertThat(value, equalTo(1));
-            }
-        }
-    }
-
-    @Test
-    public void decode() throws Exception {
-        assumeThat(payloadClazzName + " not yet implemented", notYetSupportedDataType, not(hasItem(payloadClazzName)));
-        ArrayList<Object> in = new ArrayList<>();
-        SUT.encode(null, plcRequestContainer, in);
-        assertThat(in, hasSize(1));
-        ArrayList<Object> out = new ArrayList<>();
-        SUT.decode(null, modbusTcpPayload, out);
-        assertThat(out, hasSize(0));
-        LOGGER.info("PlcRequestContainer {}", plcRequestContainer);
-        PlcResponse plcResponse = plcRequestContainer.getResponseFuture().get();
-        // TODO: FIXME: this is different now after refactoring
-        //ResponseItem responseItem = (ResponseItem) plcResponse.getResponseItem().get();
-        //LOGGER.info("ResponseItem {}", responseItem);
-        ModbusPdu modbusPdu = modbusTcpPayload.getModbusPdu();
-        if (modbusPdu instanceof MaskWriteRegisterResponse) {
-            // TODO: FIXME: this is different now after refactoring
-//            PlcWriteResponseItem writeResponseItem = (PlcWriteResponseItem) responseItem;
-//            assertEquals(PlcResponseCode.OK, writeResponseItem.getResponseCode());
-        } else if (modbusPdu instanceof ReadCoilsResponse) {
-            // TODO: FIXME: this is different now after refactoring
-//            PlcReadResponseItem readResponseItem = (PlcReadResponseItem) responseItem;
-//            Object value = readResponseItem.getValues().get(0);
-//            defaultAssert(value, Plc4XModbusProtocolTest::mapDataTypePairForCoil);
-        } else if (modbusPdu instanceof ReadDiscreteInputsResponse) {
-            // TODO: FIXME: this is different now after refactoring
-//            PlcReadResponseItem readResponseItem = (PlcReadResponseItem) responseItem;
-//            Object value = readResponseItem.getValues().get(0);
-//            defaultAssert(value, Plc4XModbusProtocolTest::mapDataTypePairForCoil);
-        } else if (modbusPdu instanceof ReadHoldingRegistersResponse) {
-            // TODO: FIXME: this is different now after refactoring
-//            PlcReadResponseItem readResponseItem = (PlcReadResponseItem) responseItem;
-//            Object value = readResponseItem.getValues().get(0);
-//            defaultAssert(value, Plc4XModbusProtocolTest::mapDataTypePairForRegister);
-        } else if (modbusPdu instanceof ReadInputRegistersResponse) {
-            // TODO: FIXME: this is different now after refactoring
-//            PlcReadResponseItem readResponseItem = (PlcReadResponseItem) responseItem;
-//            Object value = readResponseItem.getValues().get(0);
-//            defaultAssert(value, Plc4XModbusProtocolTest::mapDataTypePairForRegister);
-        } else if (modbusPdu instanceof WriteMultipleCoilsResponse) {
-            // TODO: FIXME: this is different now after refactoring
-//            PlcWriteResponseItem writeResponseItem = (PlcWriteResponseItem) responseItem;
-//            assertEquals(PlcResponseCode.OK, writeResponseItem.getResponseCode());
-        } else if (modbusPdu instanceof WriteMultipleRegistersResponse) {
-            // TODO: FIXME: this is different now after refactoring
-//            PlcWriteResponseItem writeResponseItem = (PlcWriteResponseItem) responseItem;
-//            assertEquals(PlcResponseCode.OK, writeResponseItem.getResponseCode());
-        } else if (modbusPdu instanceof WriteSingleCoilResponse) {
-            // TODO: FIXME: this is different now after refactoring
-//            PlcWriteResponseItem writeResponseItem = (PlcWriteResponseItem) responseItem;
-//            assertEquals(PlcResponseCode.OK, writeResponseItem.getResponseCode());
-        } else if (modbusPdu instanceof WriteSingleRegisterResponse) {
-            // TODO: FIXME: this is different now after refactoring
-//            PlcWriteResponseItem writeResponseItem = (PlcWriteResponseItem) responseItem;
-//            assertEquals(PlcResponseCode.OK, writeResponseItem.getResponseCode());
-        }
-    }
-
-    private static Plc4XSupportedDataTypes.DataTypePair mapDataTypePairForCoil(Plc4XSupportedDataTypes.DataTypePair dataTypePair) {
-        return mapDataTypePairForRegisterOrCoil(dataTypePair, 1);
-    }
-
-    private static Plc4XSupportedDataTypes.DataTypePair mapDataTypePairForRegister(Plc4XSupportedDataTypes.DataTypePair dataTypePair) {
-        return mapDataTypePairForRegisterOrCoil(dataTypePair, 2);
-    }
-
-    private static Plc4XSupportedDataTypes.DataTypePair mapDataTypePairForRegisterOrCoil(Plc4XSupportedDataTypes.DataTypePair dataTypePair, int size) {
-        byte[] byteRepresentation = dataTypePair.getByteRepresentation();
-        if (dataTypePair.getDataTypeClass() == byte[].class) {
-            byte[] value = (byte[]) dataTypePair.getValue();
-            byte[] mappedValue = Arrays.copyOfRange(value, 0, size);
-            byte[] mappedByteRepresentation = Arrays.copyOfRange(byteRepresentation, 0, size);
-            return Plc4XSupportedDataTypes.DataTypePair.of(mappedValue, mappedByteRepresentation);
-        } else if (dataTypePair.getDataTypeClass() == Byte[].class) {
-            Byte[] value = (Byte[]) dataTypePair.getValue();
-            Byte[] mappedValue = Arrays.copyOfRange(value, 0, size);
-            byte[] mappedByteRepresentation = Arrays.copyOfRange(byteRepresentation, 0, size);
-            return Plc4XSupportedDataTypes.DataTypePair.of(mappedValue, mappedByteRepresentation);
-        } else {
-            return dataTypePair;
-        }
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.modbus.netty;
+
+import com.digitalpetri.modbus.ModbusPdu;
+import com.digitalpetri.modbus.codec.ModbusTcpPayload;
+import com.digitalpetri.modbus.requests.*;
+import com.digitalpetri.modbus.responses.*;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.plc4x.java.api.messages.PlcResponse;
+import org.apache.plc4x.java.base.messages.*;
+import org.apache.plc4x.java.mock.protocol.Plc4XSupportedDataTypes;
+import org.apache.plc4x.java.modbus.util.ModbusPlcFieldHandler;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.math.BigInteger;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.apache.plc4x.java.mock.protocol.Plc4XSupportedDataTypes.streamOfBigEndianDataTypePairs;
+import static org.apache.plc4x.java.mock.util.Assert.assertByteEquals;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assume.assumeThat;
+
+@RunWith(Parameterized.class)
+public class Plc4XModbusProtocolTest {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(Plc4XModbusProtocolTest.class);
+
+    private Plc4XModbusProtocol SUT;
+
+    @Rule
+    public ExpectedException expectedException = ExpectedException.none();
+    // TODO: implement these types
+    private List<String> notYetSupportedDataType = Stream.of(
+        String.class
+    ).map(Class::getSimpleName).collect(Collectors.toList());
+
+    @Parameterized.Parameter
+    public String payloadClazzName;
+
+    @Parameterized.Parameter(1)
+    public PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> plcRequestContainer;
+
+    @Parameterized.Parameter(2)
+    public CompletableFuture completableFuture;
+
+    @Parameterized.Parameter(3)
+    public String plcRequestContainerClassName;
+
+    @Parameterized.Parameter(4)
+    public ModbusTcpPayload modbusTcpPayload;
+
+    @Parameterized.Parameter(5)
+    public String modbusPduName;
+
+    @Parameterized.Parameters(name = "{index} Type:{0} {3} {5}")
+    public static Collection<Object[]> data() {
+        return streamOfBigEndianDataTypePairs()
+            .filter(o -> o.getDataTypeClass() == boolean.class
+                || o.getDataTypeClass() == byte[].class
+                || o.getDataTypeClass() == Byte[].class)
+            // Float and Double getting truncated in modbus.
+            .map(dataTypePair -> {
+                if (dataTypePair.getDataTypeClass() == Float.class) {
+                    return Plc4XSupportedDataTypes.DataTypePair.of(1f, new byte[]{0x0, 0x1});
+                } else if (dataTypePair.getDataTypeClass() == Double.class) {
+                    return Plc4XSupportedDataTypes.DataTypePair.of(1d, new byte[]{0x0, 0x1});
+                } else {
+                    return dataTypePair;
+                }
+            })
+            .map(dataTypePair -> Stream.of(
+                producePair(dataTypePair.getDataTypeClass(), "coil:1", new ReadCoilsResponse(Unpooled.wrappedBuffer(new byte[]{(byte) 0x1}))),
+                producePair("coil:1", new WriteSingleCoilResponse(1, 1), mapDataTypePairForCoil(dataTypePair).getValue()),
+                /* Read request no supported on maskwrite so how to handle?
+                producePair(pair.getDataTypeClass(), MaskWriteRegisterModbusField.of("maskwrite:1/1/2"), new MaskWriteRegisterResponse(1, 1, 2)),
+                */
+                producePair("maskwrite:1/1/2", new MaskWriteRegisterResponse(1, 1, 2), mapDataTypePairForRegister(dataTypePair).getValue()),
+                producePair(dataTypePair.getDataTypeClass(), "readdiscreteinputs:1", new ReadDiscreteInputsResponse(Unpooled.wrappedBuffer(new byte[]{(byte) 0x01}))),
+                producePair(dataTypePair.getDataTypeClass(), "readholdingregisters:1", new ReadHoldingRegistersResponse(Unpooled.wrappedBuffer(cutRegister(mapDataTypePairForRegister(dataTypePair).getByteRepresentation())))),
+                producePair(dataTypePair.getDataTypeClass(), "readinputregisters:1", new ReadInputRegistersResponse(Unpooled.wrappedBuffer(cutRegister(mapDataTypePairForRegister(dataTypePair).getByteRepresentation())))),
+                producePair("coil:1", new WriteMultipleCoilsResponse(1, 3), mapDataTypePairForCoil(dataTypePair).getValue(), mapDataTypePairForCoil(dataTypePair).getValue(), mapDataTypePairForCoil(dataTypePair).getValue()),
+                producePair("register:1", new WriteMultipleRegistersResponse(1, 3), mapDataTypePairForRegister(dataTypePair).getValue(), mapDataTypePairForRegister(dataTypePair).getValue(), mapDataTypePairForRegister(dataTypePair).getValue()),
+                producePair("register:1", new WriteSingleRegisterResponse(1, cutRegister(mapDataTypePairForRegister(dataTypePair).getByteRepresentation())[0]), mapDataTypePairForRegister(dataTypePair).getValue())
+            ))
+            .flatMap(stream -> stream)
+            // TODO: request doesn't know its type anymore... fixme
+            .map(pair -> new Object[]{Object.class.getSimpleName(), pair.left, pair.left.getResponseFuture(), pair.left.getRequest().getClass().getSimpleName(), pair.right, pair.right.getClass().getSimpleName()}).collect(Collectors.toList());
+    }
+
+    private static ImmutablePair<PlcRequestContainer<InternalPlcReadRequest, InternalPlcResponse>, ModbusTcpPayload> producePair(Class type, String field, ModbusPdu modbusPdu) {
+        return ImmutablePair.of(
+            new PlcRequestContainer<>(
+                (InternalPlcReadRequest) new DefaultPlcReadRequest.Builder(null, new ModbusPlcFieldHandler()) // TODO: remove null
+                    .addItem(RandomStringUtils.randomAlphabetic(10), field)
+                    .build(), new CompletableFuture<>()),
+            new ModbusTcpPayload((short) 0, (short) 0, modbusPdu)
+        );
+    }
+
+    @SuppressWarnings("unchecked")
+    private static ImmutablePair<PlcRequestContainer<InternalPlcWriteRequest, InternalPlcResponse>, ModbusTcpPayload> producePair(String field, ModbusPdu modbusPdu, Object... values) {
+        if (values.length == 0) {
+            throw new IllegalArgumentException("At least one value ist required");
+        }
+        if (values.length == 1) {
+            return ImmutablePair.of(
+                new PlcRequestContainer<>(
+                    (InternalPlcWriteRequest) new DefaultPlcWriteRequest.Builder(null, new ModbusPlcFieldHandler()) // TODO: remove null
+                        .addItem(RandomStringUtils.randomAlphabetic(10), field, values[0])
+                        .build(), new CompletableFuture<>()),
+                new ModbusTcpPayload((short) 0, (short) 0, modbusPdu)
+            );
+        } else {
+            return ImmutablePair.of(
+                new PlcRequestContainer<>(
+                    (InternalPlcWriteRequest) new DefaultPlcWriteRequest.Builder(null, new ModbusPlcFieldHandler()) // TODO: remove null
+                        .addItem(RandomStringUtils.randomAlphabetic(10), field, values)
+                        .build(), new CompletableFuture<>()),
+                new ModbusTcpPayload((short) 0, (short) 0, modbusPdu)
+            );
+        }
+    }
+
+    private static byte[] cutRegister(byte[] right) {
+        return new byte[]{right.length > 1 ? right[right.length - 2] : 0x0, right[right.length - 1]};
+    }
+
+    @Before
+    public void setUp() {
+        SUT = new Plc4XModbusProtocol((short) 1);
+    }
+
+    @Test
+    public void encode() throws Exception {
+        assumeThat(payloadClazzName + " not yet implemented", notYetSupportedDataType, not(hasItem(payloadClazzName)));
+        ArrayList<Object> out = new ArrayList<>();
+        SUT.encode(null, plcRequestContainer, out);
+        assertThat(out, hasSize(1));
+        assertThat(out.get(0), instanceOf(ModbusTcpPayload.class));
+        ModbusTcpPayload modbusTcpPayload = (ModbusTcpPayload) out.get(0);
+        ModbusPdu modbusPdu = modbusTcpPayload.getModbusPdu();
+        if (modbusPdu instanceof MaskWriteRegisterRequest) {
+            MaskWriteRegisterRequest maskWriteRegisterRequest = (MaskWriteRegisterRequest) modbusPdu;
+            int address = maskWriteRegisterRequest.getAddress();
+            assertThat(address, equalTo(1));
+            int andMask = maskWriteRegisterRequest.getAndMask();
+            int orMask = maskWriteRegisterRequest.getOrMask();
+            if (payloadClazzName.equals(Boolean.class.getSimpleName())) {
+                assertThat(andMask, equalTo(1));
+                assertThat(orMask, equalTo(2));
+            } else if (payloadClazzName.equals(Byte.class.getSimpleName())) {
+                assertThat(andMask, equalTo(1));
+                assertThat(orMask, equalTo(2));
+            } else if (payloadClazzName.equals(Short.class.getSimpleName())) {
+                assertThat(andMask, equalTo(1));
+                assertThat(orMask, equalTo(2));
+            } else if (payloadClazzName.equals(GregorianCalendar.class.getSimpleName())) {
+                assertThat(andMask, equalTo(1));
+                assertThat(orMask, equalTo(2));
+            } else if (payloadClazzName.equals(Float.class.getSimpleName())) {
+                assertThat(andMask, equalTo(1));
+                assertThat(orMask, equalTo(2));
+            } else if (payloadClazzName.equals(Integer.class.getSimpleName())) {
+                assertThat(andMask, equalTo(1));
+                assertThat(orMask, equalTo(2));
+            } else if (payloadClazzName.equals(BigInteger.class.getSimpleName())) {
+                assertThat(andMask, equalTo(1));
+                assertThat(orMask, equalTo(2));
+            } else if (payloadClazzName.equals(String.class.getSimpleName())) {
+                assertThat(andMask, equalTo(1));
+                assertThat(orMask, equalTo(2));
+            }
+        } else if (modbusPdu instanceof ReadCoilsRequest) {
+            ReadCoilsRequest readCoilsRequest = (ReadCoilsRequest) modbusPdu;
+            int address = readCoilsRequest.getAddress();
+            int quantity = readCoilsRequest.getQuantity();
+            assertThat(address, equalTo(1));
+            assertThat(quantity, equalTo(1));
+        } else if (modbusPdu instanceof ReadDiscreteInputsRequest) {
+            ReadDiscreteInputsRequest readCoilsRequest = (ReadDiscreteInputsRequest) modbusPdu;
+            int address = readCoilsRequest.getAddress();
+            int quantity = readCoilsRequest.getQuantity();
+            assertThat(address, equalTo(1));
+            assertThat(quantity, equalTo(1));
+        } else if (modbusPdu instanceof ReadHoldingRegistersRequest) {
+            ReadHoldingRegistersRequest readCoilsRequest = (ReadHoldingRegistersRequest) modbusPdu;
+            int address = readCoilsRequest.getAddress();
+            int quantity = readCoilsRequest.getQuantity();
+            assertThat(address, equalTo(1));
+            assertThat(quantity, equalTo(1));
+        } else if (modbusPdu instanceof ReadInputRegistersRequest) {
+            ReadInputRegistersRequest readCoilsRequest = (ReadInputRegistersRequest) modbusPdu;
+            int address = readCoilsRequest.getAddress();
+            int quantity = readCoilsRequest.getQuantity();
+            assertThat(address, equalTo(1));
+            assertThat(quantity, equalTo(1));
+        } else if (modbusPdu instanceof WriteMultipleCoilsRequest) {
+            WriteMultipleCoilsRequest writeMultipleCoilsRequest = (WriteMultipleCoilsRequest) modbusPdu;
+            int address = writeMultipleCoilsRequest.getAddress();
+            assertThat(address, equalTo(1));
+            ByteBuf value = writeMultipleCoilsRequest.getValues();
+            byte[] bytes = new byte[value.readableBytes()];
+            value.readBytes(value);
+            if (payloadClazzName.equals(Boolean.class.getSimpleName())) {
+                assertByteEquals(new byte[]{0x0}, bytes);
+            } else if (payloadClazzName.equals(Byte.class.getSimpleName())) {
+                assertByteEquals(new byte[]{0x0}, bytes);
+            } else if (payloadClazzName.equals(Short.class.getSimpleName())) {
+                assertByteEquals(new byte[]{0x0}, bytes);
+            } else if (payloadClazzName.equals(Calendar.class.getSimpleName())) {
+                assertByteEquals(new byte[]{0x0}, bytes);
+            } else if (payloadClazzName.equals(Float.class.getSimpleName())) {
+                assertByteEquals(new byte[]{0x0}, bytes);
+            } else if (payloadClazzName.equals(Integer.class.getSimpleName())) {
+                assertByteEquals(new byte[]{0x0}, bytes);
+            } else if (payloadClazzName.equals(BigInteger.class.getSimpleName())) {
+                assertByteEquals(new byte[]{0x0}, bytes);
+            } else if (payloadClazzName.equals(String.class.getSimpleName())) {
+                assertByteEquals(new byte[]{0x0}, bytes);
+            }
+        } else if (modbusPdu instanceof WriteMultipleRegistersRequest) {
+            WriteMultipleRegistersRequest writeMultipleRegistersRequest = (WriteMultipleRegistersRequest) modbusPdu;
+            int address = writeMultipleRegistersRequest.getAddress();
+            assertThat(address, equalTo(1));
+            ByteBuf value = writeMultipleRegistersRequest.getValues();
+            byte[] bytes = new byte[value.readableBytes()];
+            value.readBytes(value);
+            if (payloadClazzName.equals(Boolean.class.getSimpleName())) {
+                assertByteEquals(new byte[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, bytes);
+            } else if (payloadClazzName.equals(Byte.class.getSimpleName())) {
+                assertByteEquals(new byte[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, bytes);
+            } else if (payloadClazzName.equals(Short.class.getSimpleName())) {
+                assertByteEquals(new byte[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, bytes);
+            } else if (payloadClazzName.equals(Calendar.class.getSimpleName())) {
+                assertByteEquals(new byte[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, bytes);
+            } else if (payloadClazzName.equals(Float.class.getSimpleName())) {
+                assertByteEquals(new byte[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, bytes);
+            } else if (payloadClazzName.equals(Integer.class.getSimpleName())) {
+                assertByteEquals(new byte[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, bytes);
+            } else if (payloadClazzName.equals(BigInteger.class.getSimpleName())) {
+                assertByteEquals(new byte[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, bytes);
+            } else if (payloadClazzName.equals(String.class.getSimpleName())) {
+                assertByteEquals(new byte[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, bytes);
+            }
+        } else if (modbusPdu instanceof WriteSingleCoilRequest) {
+            WriteSingleCoilRequest writeSingleCoilRequest = (WriteSingleCoilRequest) modbusPdu;
+            int address = writeSingleCoilRequest.getAddress();
+            assertThat(address, equalTo(1));
+            int value = writeSingleCoilRequest.getValue();
+            boolean coilValue = value == 0xFF00;
+            if (payloadClazzName.equals(Boolean.class.getSimpleName())) {
+                assertThat(coilValue, equalTo(true));
+            } else if (payloadClazzName.equals(Byte.class.getSimpleName())) {
+                assertThat(coilValue, equalTo(true));
+            } else if (payloadClazzName.equals(Short.class.getSimpleName())) {
+                assertThat(coilValue, equalTo(true));
+            } else if (payloadClazzName.equals(Calendar.class.getSimpleName())) {
+                assertThat(coilValue, equalTo(true));
+            } else if (payloadClazzName.equals(Float.class.getSimpleName())) {
+                assertThat(coilValue, equalTo(true));
+            } else if (payloadClazzName.equals(Double.class.getSimpleName())) {
+                assertThat(coilValue, equalTo(true));
+            } else if (payloadClazzName.equals(Integer.class.getSimpleName())) {
+                assertThat(coilValue, equalTo(true));
+            } else if (payloadClazzName.equals(BigInteger.class.getSimpleName())) {
+                assertThat(coilValue, equalTo(true));
+            } else if (payloadClazzName.equals(String.class.getSimpleName())) {
+                assertThat(coilValue, equalTo(true));
+            }
+        } else if (modbusPdu instanceof WriteSingleRegisterRequest) {
+            WriteSingleRegisterRequest writeSingleRegisterRequest = (WriteSingleRegisterRequest) modbusPdu;
+            int address = writeSingleRegisterRequest.getAddress();
+            assertThat(address, equalTo(1));
+            int value = writeSingleRegisterRequest.getValue();
+            if (payloadClazzName.equals(Boolean.class.getSimpleName())) {
+                assertThat(value, equalTo(1));
+            } else if (payloadClazzName.equals(Byte.class.getSimpleName())) {
+                assertThat(value, equalTo(1));
+            } else if (payloadClazzName.equals(Short.class.getSimpleName())) {
+                assertThat(value, equalTo(1));
+            } else if (payloadClazzName.equals(Calendar.class.getSimpleName())) {
+                assertThat(value, equalTo(1));
+            } else if (payloadClazzName.equals(Float.class.getSimpleName())) {
+                assertThat(value, equalTo(1));
+            } else if (payloadClazzName.equals(Double.class.getSimpleName())) {
+                assertThat(value, equalTo(1));
+            } else if (payloadClazzName.equals(Integer.class.getSimpleName())) {
+                assertThat(value, equalTo(1));
+            } else if (payloadClazzName.equals(BigInteger.class.getSimpleName())) {
+                assertThat(value, equalTo(1));
+            } else if (payloadClazzName.equals(String.class.getSimpleName())) {
+                assertThat(value, equalTo(1));
+            }
+        }
+    }
+
+    @Test
+    public void decode() throws Exception {
+        assumeThat(payloadClazzName + " not yet implemented", notYetSupportedDataType, not(hasItem(payloadClazzName)));
+        ArrayList<Object> in = new ArrayList<>();
+        SUT.encode(null, plcRequestContainer, in);
+        assertThat(in, hasSize(1));
+        ArrayList<Object> out = new ArrayList<>();
+        SUT.decode(null, modbusTcpPayload, out);
+        assertThat(out, hasSize(0));
+        LOGGER.info("PlcRequestContainer {}", plcRequestContainer);
+        PlcResponse plcResponse = plcRequestContainer.getResponseFuture().get();
+        // TODO: FIXME: this is different now after refactoring
+        //ResponseItem responseItem = (ResponseItem) plcResponse.getResponseItem().get();
+        //LOGGER.info("ResponseItem {}", responseItem);
+        ModbusPdu modbusPdu = modbusTcpPayload.getModbusPdu();
+        if (modbusPdu instanceof MaskWriteRegisterResponse) {
+            // TODO: FIXME: this is different now after refactoring
+//            PlcWriteResponseItem writeResponseItem = (PlcWriteResponseItem) responseItem;
+//            assertEquals(PlcResponseCode.OK, writeResponseItem.getResponseCode());
+        } else if (modbusPdu instanceof ReadCoilsResponse) {
+            // TODO: FIXME: this is different now after refactoring
+//            PlcReadResponseItem readResponseItem = (PlcReadResponseItem) responseItem;
+//            Object value = readResponseItem.getValues().get(0);
+//            defaultAssert(value, Plc4XModbusProtocolTest::mapDataTypePairForCoil);
+        } else if (modbusPdu instanceof ReadDiscreteInputsResponse) {
+            // TODO: FIXME: this is different now after refactoring
+//            PlcReadResponseItem readResponseItem = (PlcReadResponseItem) responseItem;
+//            Object value = readResponseItem.getValues().get(0);
+//            defaultAssert(value, Plc4XModbusProtocolTest::mapDataTypePairForCoil);
+        } else if (modbusPdu instanceof ReadHoldingRegistersResponse) {
+            // TODO: FIXME: this is different now after refactoring
+//            PlcReadResponseItem readResponseItem = (PlcReadResponseItem) responseItem;
+//            Object value = readResponseItem.getValues().get(0);
+//            defaultAssert(value, Plc4XModbusProtocolTest::mapDataTypePairForRegister);
+        } else if (modbusPdu instanceof ReadInputRegistersResponse) {
+            // TODO: FIXME: this is different now after refactoring
+//            PlcReadResponseItem readResponseItem = (PlcReadResponseItem) responseItem;
+//            Object value = readResponseItem.getValues().get(0);
+//            defaultAssert(value, Plc4XModbusProtocolTest::mapDataTypePairForRegister);
+        } else if (modbusPdu instanceof WriteMultipleCoilsResponse) {
+            // TODO: FIXME: this is different now after refactoring
+//            PlcWriteResponseItem writeResponseItem = (PlcWriteResponseItem) responseItem;
+//            assertEquals(PlcResponseCode.OK, writeResponseItem.getResponseCode());
+        } else if (modbusPdu instanceof WriteMultipleRegistersResponse) {
+            // TODO: FIXME: this is different now after refactoring
+//            PlcWriteResponseItem writeResponseItem = (PlcWriteResponseItem) responseItem;
+//            assertEquals(PlcResponseCode.OK, writeResponseItem.getResponseCode());
+        } else if (modbusPdu instanceof WriteSingleCoilResponse) {
+            // TODO: FIXME: this is different now after refactoring
+//            PlcWriteResponseItem writeResponseItem = (PlcWriteResponseItem) responseItem;
+//            assertEquals(PlcResponseCode.OK, writeResponseItem.getResponseCode());
+        } else if (modbusPdu instanceof WriteSingleRegisterResponse) {
+            // TODO: FIXME: this is different now after refactoring
+//            PlcWriteResponseItem writeResponseItem = (PlcWriteResponseItem) responseItem;
+//            assertEquals(PlcResponseCode.OK, writeResponseItem.getResponseCode());
+        }
+    }
+
+    private static Plc4XSupportedDataTypes.DataTypePair mapDataTypePairForCoil(Plc4XSupportedDataTypes.DataTypePair dataTypePair) {
+        return mapDataTypePairForRegisterOrCoil(dataTypePair, 1);
+    }
+
+    private static Plc4XSupportedDataTypes.DataTypePair mapDataTypePairForRegister(Plc4XSupportedDataTypes.DataTypePair dataTypePair) {
+        return mapDataTypePairForRegisterOrCoil(dataTypePair, 2);
+    }
+
+    private static Plc4XSupportedDataTypes.DataTypePair mapDataTypePairForRegisterOrCoil(Plc4XSupportedDataTypes.DataTypePair dataTypePair, int size) {
+        byte[] byteRepresentation = dataTypePair.getByteRepresentation();
+        if (dataTypePair.getDataTypeClass() == byte[].class) {
+            byte[] value = (byte[]) dataTypePair.getValue();
+            byte[] mappedValue = Arrays.copyOfRange(value, 0, size);
+            byte[] mappedByteRepresentation = Arrays.copyOfRange(byteRepresentation, 0, size);
+            return Plc4XSupportedDataTypes.DataTypePair.of(mappedValue, mappedByteRepresentation);
+        } else if (dataTypePair.getDataTypeClass() == Byte[].class) {
+            Byte[] value = (Byte[]) dataTypePair.getValue();
+            Byte[] mappedValue = Arrays.copyOfRange(value, 0, size);
+            byte[] mappedByteRepresentation = Arrays.copyOfRange(byteRepresentation, 0, size);
+            return Plc4XSupportedDataTypes.DataTypePair.of(mappedValue, mappedByteRepresentation);
+        } else {
+            return dataTypePair;
+        }
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/modbus/src/test/resources/logback.xml b/plc4j/protocols/modbus/src/test/resources/logback.xml
index cea5da305eb..8dc02efd40e 100644
--- a/plc4j/protocols/modbus/src/test/resources/logback.xml
+++ b/plc4j/protocols/modbus/src/test/resources/logback.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-    http://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.
-  -->
-<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="
-                  http://ch.qos.logback/xml/ns/logback
-                  https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoders are assigned the type
-         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="trace">
-    <appender-ref ref="STDOUT" />
-  </root>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+    http://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.
+  -->
+<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="
+                  http://ch.qos.logback/xml/ns/logback
+                  https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="trace">
+    <appender-ref ref="STDOUT" />
+  </root>
+
 </configuration>
\ No newline at end of file
diff --git a/plc4j/protocols/pom.xml b/plc4j/protocols/pom.xml
index dba3d6a35f6..72b4741897f 100644
--- a/plc4j/protocols/pom.xml
+++ b/plc4j/protocols/pom.xml
@@ -1,88 +1,88 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-protocols</artifactId>
-  <packaging>pom</packaging>
-
-  <name>PLC4J: Protocols</name>
-  <description>Wrapper project for all PLC4J protocol implementations.</description>
-
-  <modules>
-    <module>driver-bases</module>
-
-    <module>ads</module>
-    <module>delta-v</module>
-    <module>ethernet-ip</module>
-    <module>iso-on-tcp</module>
-    <module>iso-tp</module>
-    <module>modbus</module>
-    <module>s7</module>
-
-    <module>benchmarks</module>
-  </modules>
-
-  <build>
-    <plugins>
-      <!--
-        Generate an OSGI compatible MANIFEST file.
-      -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>bundle-manifest</id>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>manifest</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-            <instructions>
-              <_include>-bnd.bnd</_include>
-            </instructions>
-        </configuration>
-      </plugin>
-
-      <!--
-        Use the MANIFEST file generated by the maven-bundle-plugin.
-      -->
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-protocols</artifactId>
+  <packaging>pom</packaging>
+
+  <name>PLC4J: Protocols</name>
+  <description>Wrapper project for all PLC4J protocol implementations.</description>
+
+  <modules>
+    <module>driver-bases</module>
+
+    <module>ads</module>
+    <module>delta-v</module>
+    <module>ethernet-ip</module>
+    <module>iso-on-tcp</module>
+    <module>iso-tp</module>
+    <module>modbus</module>
+    <module>s7</module>
+
+    <module>benchmarks</module>
+  </modules>
+
+  <build>
+    <plugins>
+      <!--
+        Generate an OSGI compatible MANIFEST file.
+      -->
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+            <instructions>
+              <_include>-bnd.bnd</_include>
+            </instructions>
+        </configuration>
+      </plugin>
+
+      <!--
+        Use the MANIFEST file generated by the maven-bundle-plugin.
+      -->
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/plc4j/protocols/s7/LINKS.md b/plc4j/protocols/s7/LINKS.md
index 986213c80ed..631899fc1c8 100644
--- a/plc4j/protocols/s7/LINKS.md
+++ b/plc4j/protocols/s7/LINKS.md
@@ -1,25 +1,25 @@
-<!--
-
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://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.
-
--->
-Features S7 IO: https://kb.hilscher.com/display/PNS3V5/Features+-+V4 
-
-MIT Licensed Node.JS Library: https://github.com/plcpeople/nodeS7/blob/master/nodeS7.js
-
-https://github.com/plcpeople
-
+<!--
+
+  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
+
+      http://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.
+
+-->
+Features S7 IO: https://kb.hilscher.com/display/PNS3V5/Features+-+V4 
+
+MIT Licensed Node.JS Library: https://github.com/plcpeople/nodeS7/blob/master/nodeS7.js
+
+https://github.com/plcpeople
+
 https://www.google.de/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&uact=8&ved=0ahUKEwioq4K64IjXAhWsLMAKHRLDAcYQFgg-MAA&url=https%3A%2F%2Fprofibusgroup.files.wordpress.com%2F2013%2F01%2Fw4-profinet-frame-analysis-peter-thomas.pdf&usg=AOvVaw1f_sW5_I6I5x1nnvv1jX83
\ No newline at end of file
diff --git a/plc4j/protocols/s7/pom.xml b/plc4j/protocols/s7/pom.xml
index 8816c2f2604..715d02e5341 100644
--- a/plc4j/protocols/s7/pom.xml
+++ b/plc4j/protocols/s7/pom.xml
@@ -1,103 +1,107 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-protocols</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-protocol-s7</artifactId>
-  <name>PLC4J: Protocol: S7</name>
-  <description>Implementation of the S7 Protocol layer.</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-iso-tp</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-buffer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-codec</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.spockframework</groupId>
-      <artifactId>spock-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.athaydes</groupId>
-      <artifactId>spock-reports</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-utils-test-utils</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-protocols</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-protocol-s7</artifactId>
+  <name>PLC4J: Protocol: S7</name>
+  <description>Implementation of the S7 Protocol layer.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-iso-tp</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-iso-on-tcp</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.athaydes</groupId>
+      <artifactId>spock-reports</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-utils-test-utils</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java
index 58ac2387ac8..9afd0d5edce 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java
@@ -1,264 +1,264 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.model;
-
-import java.time.Duration;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.apache.commons.lang3.NotImplementedException;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.s7.netty.model.types.MemoryArea;
-import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
-
-public class S7Field implements PlcField {
-
-    //byteOffset theoretically can reach up to 2097151 ... see checkByteOffset() below --> 7digits
-    private static final Pattern ADDRESS_PATTERN =
-        Pattern.compile("^%(?<memoryArea>.)(?<transferSizeCode>[XBWD]?)(?<byteOffset>\\d{1,7})(.(?<bitOffset>[0-7]))?:(?<dataType>[a-zA-Z_5]+)(\\[(?<numElements>\\d+)])?");
-
-    //blockNumber usually has its max hat around 64000 --> 5digits
-    //TODO: S5TIME non include;
-    private static final Pattern DATA_BLOCK_ADDRESS_PATTERN =
-        Pattern.compile("^%DB(?<blockNumber>\\d{1,5}).DB(?<transferSizeCode>[XBWD]?)(?<byteOffset>\\d{1,7})(.(?<bitOffset>[0-7]))?:(?<dataType>[a-zA-Z_5]+)(\\[(?<numElements>\\d+)])?");
-                
-    private static final String DATA_TYPE = "dataType";
-    private static final String TRANSFER_SIZE_CODE = "transferSizeCode";
-    private static final String BLOCK_NUMBER = "blockNumber";
-    private static final String BYTE_OFFSET = "byteOffset";
-    private static final String BIT_OFFSET = "bitOffset";
-    private static final String NUM_ELEMENTS = "numElements";
-    private static final String MEMORY_AREA = "memoryArea";
-
-    private final TransportSize dataType;
-    private final MemoryArea memoryArea;
-    private final int blockNumber;
-    private final int byteOffset;
-    private final short bitOffset;
-    private final int numElements;
-
-    private S7Field(TransportSize dataType, MemoryArea memoryArea, int blockNumber, int byteOffset, short bitOffset, int numElements) {
-        this.dataType = dataType;
-        this.memoryArea = memoryArea;
-        this.blockNumber = blockNumber;
-        this.byteOffset = byteOffset;
-        this.bitOffset = bitOffset;
-        this.numElements = numElements;
-    }
-
-    public TransportSize getDataType() {
-        return dataType;
-    }
-
-    public MemoryArea getMemoryArea() {
-        return memoryArea;
-    }
-
-    public int getBlockNumber() {
-        return blockNumber;
-    }
-
-    public int getByteOffset() {
-        return byteOffset;
-    }
-
-    public short getBitOffset() {
-        return bitOffset;
-    }
-
-    public int getNumElements() {
-        return numElements;
-    }
-
-    public static boolean matches(String fieldString) {
-        return DATA_BLOCK_ADDRESS_PATTERN.matcher(fieldString).matches() ||
-            ADDRESS_PATTERN.matcher(fieldString).matches();
-    }
-
-    /**
-     * @return Java type of expected response.
-     *
-     * TODO validate all Methods existing are implemented
-     */
-    @Override
-    public Class<?> getDefaultJavaType() {
-        switch (dataType){
-            case BYTE:
-                return Byte.class;
-            case CHAR:
-            case STRING:
-                return String.class;
-            case USINT:
-            case SINT:
-            case UINT:
-            case INT:
-            case DINT:
-                return Integer.class;
-            case UDINT:
-            case ULINT:
-            case LINT:
-                return Long.class;
-            case BOOL:
-                return Boolean.class;
-            case REAL:
-            case LREAL:
-                return Double.class;
-            case DATE_AND_TIME:
-                return LocalDateTime.class;
-            case DATE:
-                return LocalDate.class;
-            case S5TIME:
-                return Duration.class;
-            case TIME:
-                return Duration.class;
-            case TOD:
-            case TIME_OF_DAY:
-                return LocalTime.class;                
-            default:
-                throw new NotImplementedException("The response type for datatype " + dataType + " is not yet implemented");
-        }
-    }
-
-    public static S7Field of(String fieldString) {
-        Matcher matcher = DATA_BLOCK_ADDRESS_PATTERN.matcher(fieldString);
-        if(matcher.matches()) {
-            TransportSize dataType = TransportSize.valueOf(matcher.group(DATA_TYPE));
-            MemoryArea memoryArea = MemoryArea.DATA_BLOCKS;
-            String transferSizeCode = matcher.group(TRANSFER_SIZE_CODE);
-
-            int blockNumber = checkDatablockNumber(Integer.parseInt(matcher.group(BLOCK_NUMBER)));
-
-            int byteOffset = checkByteOffset(Integer.parseInt(matcher.group(BYTE_OFFSET)));
-
-            short bitOffset = 0;
-            if(matcher.group(BIT_OFFSET) != null) {
-                bitOffset = Short.parseShort(matcher.group(BIT_OFFSET));
-            } else if(dataType == TransportSize.BOOL) {
-                throw new PlcInvalidFieldException("Expected bit offset for BOOL parameters.");
-            }
-            int numElements = 1;
-            if(matcher.group(NUM_ELEMENTS) != null) {
-                numElements = Integer.parseInt(matcher.group(NUM_ELEMENTS));
-            }
-            numElements = calcNumberOfElementsForIndividualTypes(numElements,dataType);
-            if(!transferSizeCode.isEmpty() && !dataType.getSizeCode().equals(transferSizeCode)) {
-                throw new PlcInvalidFieldException("Transfer size code '" + transferSizeCode +
-                    "' doesn't match specified data type '" + dataType.name() + "'");
-            }
-            return new S7Field(dataType, memoryArea, blockNumber, byteOffset, bitOffset, numElements);
-        } else {
-            matcher = ADDRESS_PATTERN.matcher(fieldString);
-            if (matcher.matches()) {
-                TransportSize dataType = TransportSize.valueOf(matcher.group(DATA_TYPE));
-                MemoryArea memoryArea = MemoryArea.valueOfShortName(matcher.group(MEMORY_AREA));
-                String transferSizeCode = matcher.group(TRANSFER_SIZE_CODE);
-
-                int byteOffset = checkByteOffset(Integer.parseInt(matcher.group(BYTE_OFFSET)));
-
-                short bitOffset = 0;
-                if(matcher.group(BIT_OFFSET) != null) {
-                    bitOffset = Short.parseShort(matcher.group(BIT_OFFSET));
-                } else if(dataType == TransportSize.BOOL) {
-                    throw new PlcInvalidFieldException("Expected bit offset for BOOL parameters.");
-                }
-                int numElements = 1;
-                if(matcher.group(NUM_ELEMENTS) != null) {
-                    numElements = Integer.parseInt(matcher.group(NUM_ELEMENTS));
-                }
-                
-                numElements = calcNumberOfElementsForIndividualTypes(numElements,dataType);
-                if(dataType.equals(TransportSize.STRING)){
-                    numElements  = 1;
-                }
-                
-                if(!transferSizeCode.isEmpty() && !dataType.getSizeCode().equals(transferSizeCode)) {
-                    throw new PlcInvalidFieldException("Transfer size code '" + transferSizeCode +
-                        "' doesn't match specified data type '" + dataType.name() + "'");
-                }
-                return new S7Field(dataType, memoryArea, (short) 0, byteOffset, bitOffset, numElements);
-            }
-        }
-        
-        
-        throw new PlcInvalidFieldException("Unable to parse address: " + fieldString);
-    }
-
-    /**
-     * checks if DatablockNumber of S7Field is in valid range
-     * @param blockNumber given DatablockNumber
-     * @return given blockNumber if Ok, throws PlcInvalidFieldException otherwise
-     */
-    private static int checkDatablockNumber(int blockNumber){
-        //ToDo check the value or add reference - limit eventually depending on active S7 --> make a case selection
-        if(blockNumber>64000 || blockNumber<1){
-            throw new PlcInvalidFieldException("Datablock numbers larger than 64000 or smaller than 1 are not supported.");
-        }
-        return blockNumber;
-    }
-
-    /**
-     * checks if ByteOffset from S7Field is in valid range
-     * @param byteOffset given byteOffset
-     * @return given byteOffset if Ok, throws PlcInvalidFieldException otherwise
-     */
-    private static int checkByteOffset(int byteOffset){
-        //ToDo check the value or add reference
-        if(byteOffset>2097151 || byteOffset<0){
-            throw new PlcInvalidFieldException("ByteOffset must be smaller than 2097151 and positive.");
-        }
-        return byteOffset;
-    }
-
-    /**
-     * correct the storage of "array"-like variables like STRING
-     * @param numElements auto-detected numElements (1 if no numElements in brackets has been given, x if a specific number has been given)
-     * @param dataType detected Transport-Size that represents the data-type
-     * @return corrected numElements if nessesary
-     */
-    //TODO: 
-    private static int calcNumberOfElementsForIndividualTypes(int numElements, TransportSize dataType){
-        
-        //TODO: for this version STRING is write like CHAR
-        if(dataType.equals(TransportSize.STRING)){
-            //on valid String-length add two byte because of S7-representation of Strings
-            if(numElements>1 && numElements<=254){
-                return numElements+2;
-            }
-            //connection String usage with "STRING" only --> numElements=1 --> enter default value
-            return 256;
-        }
-        return numElements;
-
-    }
-
-    @Override
-    public String toString() {
-        return "S7Field{" +
-            "dataType=" + dataType +
-            ", memoryArea=" + memoryArea +
-            ", blockNumber=" + blockNumber +
-            ", byteOffset=" + byteOffset +
-            ", bitOffset=" + bitOffset +
-            ", numElements=" + numElements +
-            '}';
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.model;
+
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.commons.lang3.NotImplementedException;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.s7.netty.model.types.MemoryArea;
+import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
+
+public class S7Field implements PlcField {
+
+    //byteOffset theoretically can reach up to 2097151 ... see checkByteOffset() below --> 7digits
+    private static final Pattern ADDRESS_PATTERN =
+        Pattern.compile("^%(?<memoryArea>.)(?<transferSizeCode>[XBWD]?)(?<byteOffset>\\d{1,7})(.(?<bitOffset>[0-7]))?:(?<dataType>[a-zA-Z_5]+)(\\[(?<numElements>\\d+)])?");
+
+    //blockNumber usually has its max hat around 64000 --> 5digits
+    //TODO: S5TIME non include;
+    private static final Pattern DATA_BLOCK_ADDRESS_PATTERN =
+        Pattern.compile("^%DB(?<blockNumber>\\d{1,5}).DB(?<transferSizeCode>[XBWD]?)(?<byteOffset>\\d{1,7})(.(?<bitOffset>[0-7]))?:(?<dataType>[a-zA-Z_5]+)(\\[(?<numElements>\\d+)])?");
+                
+    private static final String DATA_TYPE = "dataType";
+    private static final String TRANSFER_SIZE_CODE = "transferSizeCode";
+    private static final String BLOCK_NUMBER = "blockNumber";
+    private static final String BYTE_OFFSET = "byteOffset";
+    private static final String BIT_OFFSET = "bitOffset";
+    private static final String NUM_ELEMENTS = "numElements";
+    private static final String MEMORY_AREA = "memoryArea";
+
+    private final TransportSize dataType;
+    private final MemoryArea memoryArea;
+    private final int blockNumber;
+    private final int byteOffset;
+    private final short bitOffset;
+    private final int numElements;
+
+    private S7Field(TransportSize dataType, MemoryArea memoryArea, int blockNumber, int byteOffset, short bitOffset, int numElements) {
+        this.dataType = dataType;
+        this.memoryArea = memoryArea;
+        this.blockNumber = blockNumber;
+        this.byteOffset = byteOffset;
+        this.bitOffset = bitOffset;
+        this.numElements = numElements;
+    }
+
+    public TransportSize getDataType() {
+        return dataType;
+    }
+
+    public MemoryArea getMemoryArea() {
+        return memoryArea;
+    }
+
+    public int getBlockNumber() {
+        return blockNumber;
+    }
+
+    public int getByteOffset() {
+        return byteOffset;
+    }
+
+    public short getBitOffset() {
+        return bitOffset;
+    }
+
+    public int getNumElements() {
+        return numElements;
+    }
+
+    public static boolean matches(String fieldString) {
+        return DATA_BLOCK_ADDRESS_PATTERN.matcher(fieldString).matches() ||
+            ADDRESS_PATTERN.matcher(fieldString).matches();
+    }
+
+    /**
+     * @return Java type of expected response.
+     *
+     * TODO validate all Methods existing are implemented
+     */
+    @Override
+    public Class<?> getDefaultJavaType() {
+        switch (dataType){
+            case BYTE:
+                return Byte.class;
+            case CHAR:
+            case STRING:
+                return String.class;
+            case USINT:
+            case SINT:
+            case UINT:
+            case INT:
+            case DINT:
+                return Integer.class;
+            case UDINT:
+            case ULINT:
+            case LINT:
+                return Long.class;
+            case BOOL:
+                return Boolean.class;
+            case REAL:
+            case LREAL:
+                return Double.class;
+            case DATE_AND_TIME:
+                return LocalDateTime.class;
+            case DATE:
+                return LocalDate.class;
+            case S5TIME:
+                return Duration.class;
+            case TIME:
+                return Duration.class;
+            case TOD:
+            case TIME_OF_DAY:
+                return LocalTime.class;                
+            default:
+                throw new NotImplementedException("The response type for datatype " + dataType + " is not yet implemented");
+        }
+    }
+
+    public static S7Field of(String fieldString) {
+        Matcher matcher = DATA_BLOCK_ADDRESS_PATTERN.matcher(fieldString);
+        if(matcher.matches()) {
+            TransportSize dataType = TransportSize.valueOf(matcher.group(DATA_TYPE));
+            MemoryArea memoryArea = MemoryArea.DATA_BLOCKS;
+            String transferSizeCode = matcher.group(TRANSFER_SIZE_CODE);
+
+            int blockNumber = checkDatablockNumber(Integer.parseInt(matcher.group(BLOCK_NUMBER)));
+
+            int byteOffset = checkByteOffset(Integer.parseInt(matcher.group(BYTE_OFFSET)));
+
+            short bitOffset = 0;
+            if(matcher.group(BIT_OFFSET) != null) {
+                bitOffset = Short.parseShort(matcher.group(BIT_OFFSET));
+            } else if(dataType == TransportSize.BOOL) {
+                throw new PlcInvalidFieldException("Expected bit offset for BOOL parameters.");
+            }
+            int numElements = 1;
+            if(matcher.group(NUM_ELEMENTS) != null) {
+                numElements = Integer.parseInt(matcher.group(NUM_ELEMENTS));
+            }
+            numElements = calcNumberOfElementsForIndividualTypes(numElements,dataType);
+            if(!transferSizeCode.isEmpty() && !dataType.getSizeCode().equals(transferSizeCode)) {
+                throw new PlcInvalidFieldException("Transfer size code '" + transferSizeCode +
+                    "' doesn't match specified data type '" + dataType.name() + "'");
+            }
+            return new S7Field(dataType, memoryArea, blockNumber, byteOffset, bitOffset, numElements);
+        } else {
+            matcher = ADDRESS_PATTERN.matcher(fieldString);
+            if (matcher.matches()) {
+                TransportSize dataType = TransportSize.valueOf(matcher.group(DATA_TYPE));
+                MemoryArea memoryArea = MemoryArea.valueOfShortName(matcher.group(MEMORY_AREA));
+                String transferSizeCode = matcher.group(TRANSFER_SIZE_CODE);
+
+                int byteOffset = checkByteOffset(Integer.parseInt(matcher.group(BYTE_OFFSET)));
+
+                short bitOffset = 0;
+                if(matcher.group(BIT_OFFSET) != null) {
+                    bitOffset = Short.parseShort(matcher.group(BIT_OFFSET));
+                } else if(dataType == TransportSize.BOOL) {
+                    throw new PlcInvalidFieldException("Expected bit offset for BOOL parameters.");
+                }
+                int numElements = 1;
+                if(matcher.group(NUM_ELEMENTS) != null) {
+                    numElements = Integer.parseInt(matcher.group(NUM_ELEMENTS));
+                }
+                
+                numElements = calcNumberOfElementsForIndividualTypes(numElements,dataType);
+                if(dataType.equals(TransportSize.STRING)){
+                    numElements  = 1;
+                }
+                
+                if(!transferSizeCode.isEmpty() && !dataType.getSizeCode().equals(transferSizeCode)) {
+                    throw new PlcInvalidFieldException("Transfer size code '" + transferSizeCode +
+                        "' doesn't match specified data type '" + dataType.name() + "'");
+                }
+                return new S7Field(dataType, memoryArea, (short) 0, byteOffset, bitOffset, numElements);
+            }
+        }
+        
+        
+        throw new PlcInvalidFieldException("Unable to parse address: " + fieldString);
+    }
+
+    /**
+     * checks if DatablockNumber of S7Field is in valid range
+     * @param blockNumber given DatablockNumber
+     * @return given blockNumber if Ok, throws PlcInvalidFieldException otherwise
+     */
+    private static int checkDatablockNumber(int blockNumber){
+        //ToDo check the value or add reference - limit eventually depending on active S7 --> make a case selection
+        if(blockNumber>64000 || blockNumber<1){
+            throw new PlcInvalidFieldException("Datablock numbers larger than 64000 or smaller than 1 are not supported.");
+        }
+        return blockNumber;
+    }
+
+    /**
+     * checks if ByteOffset from S7Field is in valid range
+     * @param byteOffset given byteOffset
+     * @return given byteOffset if Ok, throws PlcInvalidFieldException otherwise
+     */
+    private static int checkByteOffset(int byteOffset){
+        //ToDo check the value or add reference
+        if(byteOffset>2097151 || byteOffset<0){
+            throw new PlcInvalidFieldException("ByteOffset must be smaller than 2097151 and positive.");
+        }
+        return byteOffset;
+    }
+
+    /**
+     * correct the storage of "array"-like variables like STRING
+     * @param numElements auto-detected numElements (1 if no numElements in brackets has been given, x if a specific number has been given)
+     * @param dataType detected Transport-Size that represents the data-type
+     * @return corrected numElements if nessesary
+     */
+    //TODO: 
+    private static int calcNumberOfElementsForIndividualTypes(int numElements, TransportSize dataType){
+        
+        //TODO: for this version STRING is write like CHAR
+        if(dataType.equals(TransportSize.STRING)){
+            //on valid String-length add two byte because of S7-representation of Strings
+            if(numElements>1 && numElements<=254){
+                return numElements+2;
+            }
+            //connection String usage with "STRING" only --> numElements=1 --> enter default value
+            return 256;
+        }
+        return numElements;
+
+    }
+
+    @Override
+    public String toString() {
+        return "S7Field{" +
+            "dataType=" + dataType +
+            ", memoryArea=" + memoryArea +
+            ", blockNumber=" + blockNumber +
+            ", byteOffset=" + byteOffset +
+            ", bitOffset=" + bitOffset +
+            ", numElements=" + numElements +
+            '}';
+    }
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7SslField.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7SslField.java
index cfed69a72b8..63bd45fd87b 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7SslField.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7SslField.java
@@ -1,71 +1,71 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.model;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.model.PlcField;
-
-/**
- *
- * @author cgarcia
- */
-public class S7SslField implements PlcField {
-    
-   //SZL_ID=0xYYYY;INDEX=0xZZZZ
-    private static final Pattern SSL_ADDRESS_PATTERN =
-        Pattern.compile("^SSL_ID=(?<sslId>16#[0-9a-fA-F]{4});INDEX=(?<index>16#[0-9a-fA-F]{4})");  
-    
-    private static final String SSL_ID = "sslId";    
-    private static final String INDEX = "index";    
-    
-    private final int szlId;
-    private final int index;
-
-    public S7SslField(int sslId, int index) {
-        this.szlId = sslId;
-        this.index = index;
-    }
-
-    public int getSslId() {
-        return szlId;
-    }
-
-    public int getIndex() {
-        return index;
-    }
-          
-    public static boolean matches(String fieldString) {
-        return SSL_ADDRESS_PATTERN.matcher(fieldString).matches();      
-    }   
-    
-    public static S7SslField of(String fieldString) {
-        Matcher matcher = SSL_ADDRESS_PATTERN.matcher(fieldString); 
-        if (matcher.matches()){
-            String strSxlId = matcher.group(SSL_ID);
-            String strIndex = matcher.group(INDEX);
-            strSxlId = strSxlId.replaceAll("16#", "");
-            strIndex = strIndex.replaceAll("16#", "");
-            return new S7SslField(Integer.parseInt(strSxlId, 16),Integer.parseInt(strIndex, 16));
-        }  
-        throw new PlcInvalidFieldException("Unable to parse address: " + fieldString); 
-    }    
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.model;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.model.PlcField;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7SslField implements PlcField {
+    
+   //SZL_ID=0xYYYY;INDEX=0xZZZZ
+    private static final Pattern SSL_ADDRESS_PATTERN =
+        Pattern.compile("^SSL_ID=(?<sslId>16#[0-9a-fA-F]{4});INDEX=(?<index>16#[0-9a-fA-F]{4})");  
+    
+    private static final String SSL_ID = "sslId";    
+    private static final String INDEX = "index";    
+    
+    private final int szlId;
+    private final int index;
+
+    public S7SslField(int sslId, int index) {
+        this.szlId = sslId;
+        this.index = index;
+    }
+
+    public int getSslId() {
+        return szlId;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+          
+    public static boolean matches(String fieldString) {
+        return SSL_ADDRESS_PATTERN.matcher(fieldString).matches();      
+    }   
+    
+    public static S7SslField of(String fieldString) {
+        Matcher matcher = SSL_ADDRESS_PATTERN.matcher(fieldString); 
+        if (matcher.matches()){
+            String strSxlId = matcher.group(SSL_ID);
+            String strIndex = matcher.group(INDEX);
+            strSxlId = strSxlId.replaceAll("16#", "");
+            strIndex = strIndex.replaceAll("16#", "");
+            return new S7SslField(Integer.parseInt(strSxlId, 16),Integer.parseInt(strIndex, 16));
+        }  
+        throw new PlcInvalidFieldException("Unable to parse address: " + fieldString); 
+    }    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7SubscriptionField.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7SubscriptionField.java
index 8630fca14a4..c0e9a90590c 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7SubscriptionField.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7SubscriptionField.java
@@ -1,166 +1,166 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.model;
-
-import java.util.ArrayList;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.s7.netty.model.types.AlarmQueryType;
-import org.apache.plc4x.java.s7.netty.model.types.SubscribedEventType;
-import org.apache.plc4x.java.s7.types.S7SubscriptionFieldType;
-
-/**
- *
- * @author cgarcia
- */
-public class S7SubscriptionField implements PlcField {
-
-    //Event Subscription 
-    private static final Pattern EVENT_SUBSCRIPTION_TYPE_PATTERN = 
-        Pattern.compile("(^MODE)|(^SYS)|(^USR)|(^ALM_S)|(^ALM_8)");
-    
-    //Event ack
-    private static final Pattern EVENT_ALARM_ACK_PATTERN = 
-        Pattern.compile("(^ACK:)(((?:,{0,1})(16#[0-9a-fA-F]{8}))+)");
-    
-    //Query alarms from PLC.
-    //TODO: Query SCAN 
-    private static final Pattern EVENT_ALARM_QUERY_PATTERN = 
-        Pattern.compile("(^QUERY:)((ALARM_S)|(ALARM_8))");    
-       
-    private final S7SubscriptionFieldType fieldtype;
-    private final SubscribedEventType eventtype;
-    private final S7Field s7field;    
-    private final ArrayList<Integer> ackalarms;
-    private final AlarmQueryType alarmquerytype;
-    
-    public S7SubscriptionField(S7SubscriptionFieldType fieldtype, SubscribedEventType eventtype){
-        this.fieldtype = fieldtype;
-        this.eventtype = eventtype;
-        this.s7field = null;
-        this.ackalarms = null;
-        this.alarmquerytype = null;
-    }
-       
-    public S7SubscriptionField(S7SubscriptionFieldType fieldtype, ArrayList<Integer> ackalarms){
-        this.fieldtype = fieldtype;
-        this.eventtype = null;
-        this.s7field   = null;
-        this.ackalarms = ackalarms;
-        this.alarmquerytype = null;
-    }    
-
-    public S7SubscriptionField(S7SubscriptionFieldType fieldtype, AlarmQueryType alarmquerytype){
-        this.fieldtype = fieldtype;
-        this.eventtype = null;
-        this.s7field = null;
-        this.ackalarms = null;  
-        this.alarmquerytype = alarmquerytype;        
-    }     
-    
-    public S7SubscriptionField(S7SubscriptionFieldType fieldtype, S7Field s7field){
-        this.fieldtype = fieldtype;
-        this.eventtype = null;
-        this.s7field = s7field;
-        this.ackalarms = null;  
-        this.alarmquerytype = null;        
-    }     
-
-    public S7SubscriptionFieldType getFieldtype() {
-        return fieldtype;
-    }
-
-    public SubscribedEventType getEventtype() {
-        return eventtype;
-    }
-
-    public S7Field getS7field() {
-        return s7field;
-    }
-
-    public ArrayList<Integer> getAckalarms() {
-        return ackalarms;
-    }
-
-    public AlarmQueryType getAlarmquerytype() {
-        return alarmquerytype;
-    }
-           
-    public static boolean matches(String fieldString) {
-        return EVENT_SUBSCRIPTION_TYPE_PATTERN.matcher(fieldString).matches() ||
-            EVENT_ALARM_ACK_PATTERN.matcher(fieldString).matches() ||
-            EVENT_ALARM_QUERY_PATTERN.matcher(fieldString).matches() ||
-                S7Field.matches(fieldString);
-    }     
-    
-    public static S7SubscriptionField of(String fieldString) {
-        {
-            Matcher matcher = EVENT_SUBSCRIPTION_TYPE_PATTERN.matcher(fieldString);
-            if (matcher.matches()){
-                return new S7SubscriptionField(S7SubscriptionFieldType.EVENT_SUBSCRIPTION,
-                            SubscribedEventType.valueOf(fieldString));
-            }
-        }
-        
-        {
-            //TODO: Actually only ALARM_S (SIG_1)
-            Matcher matcher = EVENT_ALARM_ACK_PATTERN.matcher(fieldString);
-            if (matcher.matches()){
-                String EventIds = matcher.group(2);
-                String[] arrStrEventId = EventIds.split(",");
-                ArrayList<Integer> arrEventId = new ArrayList<>();
-                for (String EventId:arrStrEventId){
-                    EventId = EventId.replaceAll("16#", "");
-                    arrEventId.add(Integer.parseInt(EventId, 16));                    
-                }
-                return new S7SubscriptionField(S7SubscriptionFieldType.ALARM_ACK,
-                            arrEventId);
-                
-            }            
-        }
-        
-        {
-            //TODO: Support for ALARM_8            
-            Matcher matcher = EVENT_ALARM_QUERY_PATTERN.matcher(fieldString); 
-            if (matcher.matches()){
-            return new S7SubscriptionField(S7SubscriptionFieldType.ALARM_QUERY,
-                            AlarmQueryType.ALARM_S);    
-            }
-        }
-        
-        {
-            if (S7Field.matches(fieldString)){
-                S7Field s7field = S7Field.of(fieldString);
-                switch(s7field.getDataType()) {
-                    case BYTE:
-                        
-                    default:;
-                    
-                }
-                return new S7SubscriptionField(S7SubscriptionFieldType.CYCLIC_SUBSCRIPTION,
-                            s7field);                
-            }
-        }
-        throw new PlcInvalidFieldException("Unable to parse address: " + fieldString);        
-    }
-    
-    
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.model;
+
+import java.util.ArrayList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.s7.netty.model.types.AlarmQueryType;
+import org.apache.plc4x.java.s7.netty.model.types.SubscribedEventType;
+import org.apache.plc4x.java.s7.types.S7SubscriptionFieldType;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7SubscriptionField implements PlcField {
+
+    //Event Subscription 
+    private static final Pattern EVENT_SUBSCRIPTION_TYPE_PATTERN = 
+        Pattern.compile("(^MODE)|(^SYS)|(^USR)|(^ALM_S)|(^ALM_8)");
+    
+    //Event ack
+    private static final Pattern EVENT_ALARM_ACK_PATTERN = 
+        Pattern.compile("(^ACK:)(((?:,{0,1})(16#[0-9a-fA-F]{8}))+)");
+    
+    //Query alarms from PLC.
+    //TODO: Query SCAN 
+    private static final Pattern EVENT_ALARM_QUERY_PATTERN = 
+        Pattern.compile("(^QUERY:)((ALARM_S)|(ALARM_8))");    
+       
+    private final S7SubscriptionFieldType fieldtype;
+    private final SubscribedEventType eventtype;
+    private final S7Field s7field;    
+    private final ArrayList<Integer> ackalarms;
+    private final AlarmQueryType alarmquerytype;
+    
+    public S7SubscriptionField(S7SubscriptionFieldType fieldtype, SubscribedEventType eventtype){
+        this.fieldtype = fieldtype;
+        this.eventtype = eventtype;
+        this.s7field = null;
+        this.ackalarms = null;
+        this.alarmquerytype = null;
+    }
+       
+    public S7SubscriptionField(S7SubscriptionFieldType fieldtype, ArrayList<Integer> ackalarms){
+        this.fieldtype = fieldtype;
+        this.eventtype = null;
+        this.s7field   = null;
+        this.ackalarms = ackalarms;
+        this.alarmquerytype = null;
+    }    
+
+    public S7SubscriptionField(S7SubscriptionFieldType fieldtype, AlarmQueryType alarmquerytype){
+        this.fieldtype = fieldtype;
+        this.eventtype = null;
+        this.s7field = null;
+        this.ackalarms = null;  
+        this.alarmquerytype = alarmquerytype;        
+    }     
+    
+    public S7SubscriptionField(S7SubscriptionFieldType fieldtype, S7Field s7field){
+        this.fieldtype = fieldtype;
+        this.eventtype = null;
+        this.s7field = s7field;
+        this.ackalarms = null;  
+        this.alarmquerytype = null;        
+    }     
+
+    public S7SubscriptionFieldType getFieldtype() {
+        return fieldtype;
+    }
+
+    public SubscribedEventType getEventtype() {
+        return eventtype;
+    }
+
+    public S7Field getS7field() {
+        return s7field;
+    }
+
+    public ArrayList<Integer> getAckalarms() {
+        return ackalarms;
+    }
+
+    public AlarmQueryType getAlarmquerytype() {
+        return alarmquerytype;
+    }
+           
+    public static boolean matches(String fieldString) {
+        return EVENT_SUBSCRIPTION_TYPE_PATTERN.matcher(fieldString).matches() ||
+            EVENT_ALARM_ACK_PATTERN.matcher(fieldString).matches() ||
+            EVENT_ALARM_QUERY_PATTERN.matcher(fieldString).matches() ||
+                S7Field.matches(fieldString);
+    }     
+    
+    public static S7SubscriptionField of(String fieldString) {
+        {
+            Matcher matcher = EVENT_SUBSCRIPTION_TYPE_PATTERN.matcher(fieldString);
+            if (matcher.matches()){
+                return new S7SubscriptionField(S7SubscriptionFieldType.EVENT_SUBSCRIPTION,
+                            SubscribedEventType.valueOf(fieldString));
+            }
+        }
+        
+        {
+            //TODO: Actually only ALARM_S (SIG_1)
+            Matcher matcher = EVENT_ALARM_ACK_PATTERN.matcher(fieldString);
+            if (matcher.matches()){
+                String EventIds = matcher.group(2);
+                String[] arrStrEventId = EventIds.split(",");
+                ArrayList<Integer> arrEventId = new ArrayList<>();
+                for (String EventId:arrStrEventId){
+                    EventId = EventId.replaceAll("16#", "");
+                    arrEventId.add(Integer.parseInt(EventId, 16));                    
+                }
+                return new S7SubscriptionField(S7SubscriptionFieldType.ALARM_ACK,
+                            arrEventId);
+                
+            }            
+        }
+        
+        {
+            //TODO: Support for ALARM_8            
+            Matcher matcher = EVENT_ALARM_QUERY_PATTERN.matcher(fieldString); 
+            if (matcher.matches()){
+            return new S7SubscriptionField(S7SubscriptionFieldType.ALARM_QUERY,
+                            AlarmQueryType.ALARM_S);    
+            }
+        }
+        
+        {
+            if (S7Field.matches(fieldString)){
+                S7Field s7field = S7Field.of(fieldString);
+                switch(s7field.getDataType()) {
+                    case BYTE:
+                        
+                    default:;
+                    
+                }
+                return new S7SubscriptionField(S7SubscriptionFieldType.CYCLIC_SUBSCRIPTION,
+                            s7field);                
+            }
+        }
+        throw new PlcInvalidFieldException("Unable to parse address: " + fieldString);        
+    }
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XNettyException.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XNettyException.java
index 4b370d32d2c..012d565cefb 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XNettyException.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XNettyException.java
@@ -1,37 +1,37 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty;
-
-/**
- * when exceptions within netty-implementations are thrown this class will be used
- */
-public class Plc4XNettyException extends RuntimeException{
-
-    /**
-     * Constructs a new runtime exception with the specified detail message.
-     * The cause is not initialized, and may subsequently be initialized by a
-     * call to {@link #initCause}.
-     *
-     * @param message the detail message. The detail message is saved for
-     *                later retrieval by the {@link #getMessage()} method.
-     */
-    public Plc4XNettyException(String message) {
-        super(message);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty;
+
+/**
+ * when exceptions within netty-implementations are thrown this class will be used
+ */
+public class Plc4XNettyException extends RuntimeException{
+
+    /**
+     * Constructs a new runtime exception with the specified detail message.
+     * The cause is not initialized, and may subsequently be initialized by a
+     * call to {@link #initCause}.
+     *
+     * @param message the detail message. The detail message is saved for
+     *                later retrieval by the {@link #getMessage()} method.
+     */
+    public Plc4XNettyException(String message) {
+        super(message);
+    }
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
index dee0b1a99cc..02b7ed6cba7 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
@@ -1,1818 +1,1818 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.PooledByteBufAllocator;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelFutureListener;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.util.AttributeKey;
-import java.io.IOException;
-import java.lang.reflect.Array;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.time.Duration;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.*;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Function;
-import java.util.logging.Level;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.exceptions.*;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcRequest;
-import org.apache.plc4x.java.api.messages.PlcResponse;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
-import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.PlcMessageToMessageCodec;
-import org.apache.plc4x.java.base.events.ConnectedEvent;
-import org.apache.plc4x.java.base.messages.*;
-import org.apache.plc4x.java.base.messages.items.*;
-import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
-import org.apache.plc4x.java.base.model.SubscriptionPlcField;
-import org.apache.plc4x.java.s7.model.S7Field;
-import org.apache.plc4x.java.s7.model.S7SslField;
-import org.apache.plc4x.java.s7.model.S7SubscriptionField;
-import org.apache.plc4x.java.s7.netty.events.S7ConnectedEvent;
-import org.apache.plc4x.java.s7.netty.model.messages.S7Message;
-import org.apache.plc4x.java.s7.netty.model.messages.S7PushMessage;
-import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
-import org.apache.plc4x.java.s7.netty.model.messages.S7ResponseMessage;
-import org.apache.plc4x.java.s7.netty.model.params.CpuCyclicServicesRequestParameter;
-import org.apache.plc4x.java.s7.netty.model.params.CpuServicesParameter;
-import org.apache.plc4x.java.s7.netty.model.params.CpuServicesRequestParameter;
-import org.apache.plc4x.java.s7.netty.model.params.CpuServicesResponseParameter;
-import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
-import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
-import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.AlarmMessagePayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.CpuCyclicServicesRequestPayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.CpuCyclicServicesResponsePayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.CpuMessageSubscriptionServicePayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.CpuServicesPayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
-import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.AlarmMessageItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.MessageObjectItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.S7AnyVarPayloadItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
-import org.apache.plc4x.java.s7.netty.model.types.*;
-import org.apache.plc4x.java.s7.protocol.S7ByteReadResponse;
-import org.apache.plc4x.java.s7.protocol.S7CyclicServicesSubscriptionHandle;
-import org.apache.plc4x.java.s7.protocol.S7DiagnosticSubscriptionHandle;
-import org.apache.plc4x.java.s7.utils.S7Helper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * This layer transforms between {@link PlcRequestContainer}s {@link S7Message}s.
- * And stores all "in-flight" requests in an internal structure ({@link Plc4XS7Protocol#requests}).
- * <p>
- * While sending a request, a {@link S7RequestMessage} is generated and send downstream (to the {@link S7Protocol}.
- * <p>
- * When a {@link S7ResponseMessage} is received it takes the existing request container from its Map and finishes
- * the {@link PlcRequestContainer}s future with the {@link PlcResponse}.
- */
-public class Plc4XS7Protocol extends PlcMessageToMessageCodec<S7Message, PlcRequestContainer> {
-    private static final Logger logger = LoggerFactory.getLogger( Plc4XS7Protocol.class );
-
-    public static final AtomicInteger tpduGenerator = new AtomicInteger(10);
-    private final AttributeKey<AtomicInteger> tpduGeneratorKey = AttributeKey.valueOf("tpduGeneratorKey");
-
-    private Map<Short, PlcRequestContainer> requests;
-    
-    /* 
-     * Each layer of Netty must do its work, it sends the Requests and must 
-     * verify the answers.
-     * Special case of the array bits, I need to know if additional messages 
-     * were created.
-     * Key:Tpdu, Left:Item row, Rigth: Num of Items created-1
-    */
-    private final  Map<Short, Map<Short, Integer>> requestBitArray;
-    
-    private final BlockingQueue<S7PushMessage> alarmsqueue;
-
-    public Plc4XS7Protocol() {
-        this.requests = new HashMap<>();
-        this.requestBitArray = new HashMap<>();      
-        this.alarmsqueue = null;
-    }
-    /*
-    * @param s7Type
-    * 
-    */
-    public Plc4XS7Protocol(BlockingQueue<S7PushMessage> alarmsqueue) {
-        this.requests = new HashMap<>();
-        this.requestBitArray = new HashMap<>();
-        //We need check the device here
-        this.alarmsqueue = alarmsqueue;
-    }
-        
-    /**
-     * If this protocol layer catches an {@link S7ConnectedEvent} from the protocol layer beneath,
-     * the connection establishment is finished.
-     *
-     * @param ctx the current protocol layers context
-     * @param evt the event
-     * @throws Exception throws an exception if something goes wrong internally
-     */
-    @Override
-    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
-        ctx.channel().attr(tpduGeneratorKey).set(tpduGenerator);
-        if (evt instanceof S7ConnectedEvent) {
-            ctx.channel().pipeline().fireUserEventTriggered(new ConnectedEvent());
-        } else {
-            super.userEventTriggered(ctx, evt);
-        }
-    }
-
-    /**
-     * When receiving an error inside the pipeline, we have to find out which {@link PlcRequestContainer}
-     * correlates needs to be notified about the problem. If a container is found, we can relay the
-     * exception to that by calling completeExceptionally and passing in the exception.
-     *
-     * @param ctx   the current protocol layers context
-     * @param cause the exception that was caught
-     * @throws Exception throws an exception if something goes wrong internally
-     */
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        if (cause instanceof PlcProtocolPayloadTooBigException) {
-            PlcProtocolPayloadTooBigException pptbe = (PlcProtocolPayloadTooBigException) cause;
-            if (pptbe.getPayload() instanceof S7RequestMessage) {
-                S7RequestMessage request = (S7RequestMessage) pptbe.getPayload();
-                if (request.getParent() instanceof PlcRequestContainer) {
-                    PlcRequestContainer requestContainer = (PlcRequestContainer) request.getParent();
-
-                    // Remove the current request from the unconfirmed requests list.
-                    requests.remove(request.getTpduReference());
-
-                    requestContainer.getResponseFuture().completeExceptionally(cause);
-                }
-            }
-        } else if ((cause instanceof IOException) && (cause.getMessage().contains("Connection reset by peer") ||
-            cause.getMessage().contains("Operation timed out"))) {
-            String reason = cause.getMessage().contains("Connection reset by peer") ?
-                "Connection terminated unexpectedly" : "Remote host not responding";
-            if (!requests.isEmpty()) {
-                // If the connection is hung up, all still pending requests can be closed.
-                for (PlcRequestContainer requestContainer : requests.values()) {
-                    requestContainer.getResponseFuture().completeExceptionally(new PlcIoException(reason));
-                }
-                // Clear the list
-                requests.clear();
-            }
-        } else {
-            super.exceptionCaught(ctx, cause);
-        }
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Encoding
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    @Override
-    protected void encode(ChannelHandlerContext ctx, PlcRequestContainer msg, List<Object> out) throws PlcException {
-        PlcRequest request = msg.getRequest();
-
-        if (request instanceof PlcReadRequest) {
-            encodeReadRequest(msg, out);
-        } else if (request instanceof PlcWriteRequest) {
-            encodeWriteRequest(msg, out);
-        } else if (request instanceof PlcSubscriptionRequest) {
-            encodeSubcriptionRequest(msg, out);
-        } else if (request instanceof PlcUnsubscriptionRequest) {
-            encodeUnSubcriptionRequest(msg, out);
-        }
-    }
-
-    //TODO: Todo el proceso de suscripcion a eventos, suscripcion de variable y reconocimientos de alarmas
-    // se ejecuta aqui. Se debe separar en funciones bien definidas.
-    // Subscripcion a Eventos
-    // Reconocimiento de alarmas
-    // Consulta de alarmas.
-    // Subscripcion a eventos ciclicos
-    // 
-    private void encodeSubcriptionRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
-        //Chequear el campo prueba que ya incluyte la informaciĆ³n del tipo
-                
-        PlcSubscriptionRequest subsRequest = (PlcSubscriptionRequest)  msg.getRequest();        
-
-        if ( subsRequest.getFields().get(0) instanceof S7SubscriptionField){  
-
-            S7SubscriptionField event = (S7SubscriptionField) subsRequest.getFields().get(0);
-
-            switch(event.getFieldtype()){
-                case EVENT_SUBSCRIPTION:;
-                    encodeEventSubcriptionRequest(msg, out);
-                    break;
-                case EVENT_UNSUBSCRIPTION:;
-                    encodeEventUnSubcriptionRequest(msg, out);
-                    break;
-                case ALARM_ACK:;
-                    encodeAlarmAckRequest(msg, out);
-                    break;
-                case ALARM_QUERY:;
-                    encodeAlarmQueryRequest(msg, out);
-                    break;
-                case CYCLIC_SUBSCRIPTION:;
-                    encodeCycledSubscriptionRequest(msg, out);
-                    break;
-                case CYCLIC_UNSUBSCRIPTION:;
-                    encodeCycledUnSubscriptionRequest(msg, out);
-                    break;                     
-                default:;                     
-             };
-
-        };            
-    }
-    
-    //TODO: Suppport for ALARM_8
-    private void encodeEventSubcriptionRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
-        byte subsevent = 0;
-        List<S7Parameter> parameterItems = new LinkedList<>();
-        List<S7Payload> payloadItems = new LinkedList<>();
-        AlarmType alarmType = AlarmType.ALARM_S_INITIATE;
-         
-        PlcSubscriptionRequest subsRequest = (PlcSubscriptionRequest)  msg.getRequest();
-        
-        for (String fieldName : subsRequest.getFieldNames()) {                        
-            if ( subsRequest.getField(fieldName) instanceof S7SubscriptionField){
-                 S7SubscriptionField event = (S7SubscriptionField) subsRequest.getField(fieldName);
-                 subsevent = (byte) (subsevent | event.getEventtype().getCode());
-                 if (event.getEventtype() == SubscribedEventType.ALM_8) {
-                    alarmType = AlarmType.ALARM_INITIATE;
-                 }
-            }
-        }
-        
-        CpuServicesParameter cpuservice = new CpuServicesRequestParameter(CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
-            CpuServicesParameterSubFunctionGroup.MESSAGE_SERVICE, (byte) 0x00);
-        
-        parameterItems.add(cpuservice);
-        
-       
-        S7Payload Data = new CpuMessageSubscriptionServicePayload(DataTransportErrorCode.OK,
-                                DataTransportSize.OCTET_STRING,
-                                subsevent,
-                                new String("HmiRtm  "),
-                                alarmType);
-  
-        
-        payloadItems.add(Data);
-      
-
-        
-        S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.USER_DATA,
-            (short) tpduGenerator.getAndIncrement(), 
-            parameterItems,
-            payloadItems, 
-            msg);
-
-        requests.put(s7ReadRequest.getTpduReference(), msg);
-
-        out.add(s7ReadRequest);         
-    }    
-    
- 
-    //TODO: Check for ALARM_D and ALARM_8
-    private void encodeAlarmAckRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
-        byte subsevent = 0;
-        List<S7Parameter> parameterItems = new LinkedList<>();
-        List<S7Payload> payloadItems = new LinkedList<>();
-         
-        PlcSubscriptionRequest subsRequest = (PlcSubscriptionRequest)  msg.getRequest();
-        S7SubscriptionField event = (S7SubscriptionField) subsRequest.getFields().get(0);
-
-        
-        CpuServicesParameter cpuservice = new CpuServicesRequestParameter(CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
-            CpuServicesParameterSubFunctionGroup.ALARM_ACK, (byte) 0x00);
-
-        parameterItems.add(cpuservice);
-        
-        
-        ArrayList<Object> items = new ArrayList<>();
-        for(Integer eventid:event.getAckalarms()){
-            items.add(new MessageObjectItem((byte) 0x12,
-                            (byte) 0x08,
-                            VariableAddressingMode.ALARM_ACK, 
-                            (byte) 0x00,
-                            eventid,
-                            (byte) 0x01,
-                            (byte) 0x01)); //ONLY for Alarm_SQ
-        }
-
-        AlarmMessageItem messageitem = new  AlarmMessageItem((byte) 0x09,
-                                                (byte) items.size(),
-                                                items)     ;
-        
-        S7Payload Data = new AlarmMessagePayload(DataTransportErrorCode.OK,
-                                DataTransportSize.OCTET_STRING,
-                                (2+items.size()*10),
-                                messageitem);
-        payloadItems.add(Data);
-
-        
-        S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.USER_DATA,
-            (short) tpduGenerator.getAndIncrement(), 
-            parameterItems,
-            payloadItems, 
-            msg);
-
-        requests.put(s7ReadRequest.getTpduReference(), msg);
-
-        out.add(s7ReadRequest);         
-    }   
-    
-    //TODO: Check for ALARM_D and ALARM_8
-    private void encodeAlarmQueryRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
-
-        byte subsevent = 0;
-        List<S7Parameter> parameterItems = new LinkedList<>();
-        List<S7Payload> payloadItems = new LinkedList<>();
-         
-        PlcSubscriptionRequest subsRequest = (PlcSubscriptionRequest)  msg.getRequest();
-        S7SubscriptionField event = (S7SubscriptionField) subsRequest.getFields().get(0);
-        
-        CpuServicesParameter cpuservice = new CpuServicesRequestParameter(CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
-            CpuServicesParameterSubFunctionGroup.ALARM_QUERY, (byte) 0x00);
-
-        parameterItems.add(cpuservice);
-        
-        ArrayList<Object> items = new ArrayList<>();
-        
-        //TODO: Multiple AlarmQueryType from the same request.
-        items.add(new MessageObjectItem((byte) 0x12,
-                        (byte) 0x08,
-                        VariableAddressingMode.ALARM_QUERYREQ, 
-                        QueryType.BYALARMTYPE,
-                        event.getAlarmquerytype())); //ONLY for Alarm_S
-
-
-        AlarmMessageItem messageitem = new  AlarmMessageItem((byte) 0x00,
-                                                (byte) items.size(),
-                                                items)     ;
-        
-        S7Payload Data = new AlarmMessagePayload(DataTransportErrorCode.OK,
-                                DataTransportSize.OCTET_STRING,
-                                (2+items.size()*10),
-                                messageitem);
-        payloadItems.add(Data);
-
-
-        S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.USER_DATA,
-            (short) tpduGenerator.getAndIncrement(), 
-            parameterItems,
-            payloadItems, 
-            msg);
-
-        requests.put(s7ReadRequest.getTpduReference(), msg);
-
-        out.add(s7ReadRequest);         
-    }    
-    
-    private void encodeCycledSubscriptionRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
-        List<S7Parameter> parameterItems = new LinkedList<>();
-        List<S7Payload> payloads = new LinkedList<>();        
-        DefaultPlcSubscriptionRequest prueba = (DefaultPlcSubscriptionRequest)  msg.getRequest();
-        List<SubscriptionPlcField> fields = prueba.getSubscriptionFields();
-        Optional<Duration> optionalduration = prueba.getSubscriptionFields().get(0).getDuration();
-        Duration duration  = optionalduration.get();
-        
-        List<S7AnyVarPayloadItem> payloadItems = new LinkedList<>();
-        
-        fields.forEach((action) ->{
-            PlcField field = action.getPlcField();
-            if (!(field instanceof S7SubscriptionField)) {
-                logger.info("The field should have been of type S7SubscriptionField");
-                return;
-            }  
-            S7SubscriptionField subsS7Field = (S7SubscriptionField) field; 
-            S7Field s7Field = subsS7Field.getS7field();
-            S7AnyVarPayloadItem varPayloadItem = new S7AnyVarPayloadItem(
-                SpecificationType.VARIABLE_SPECIFICATION, s7Field.getMemoryArea(),
-                s7Field.getDataType(),
-                s7Field.getNumElements(), s7Field.getBlockNumber(), s7Field.getByteOffset(), (byte) s7Field.getBitOffset());
-            payloadItems.add(varPayloadItem);            
-        });
-        
-        //TODO: Play with Time factor. Actually only 1..9
-        CpuCyclicServiceTimeBaseType timeBase = null;
-        byte timefactor = 0x00;
-        if (duration.getSeconds() == 0) {
-            timeBase = CpuCyclicServiceTimeBaseType.TB_100_MS;
-            timefactor = (byte) (duration.toMillis() / 100);
-        } else if (duration.getSeconds() <= 9) {
-            timeBase = CpuCyclicServiceTimeBaseType.TB_1_SEC;
-            timefactor = (byte) duration.getSeconds();            
-        } else if (duration.getSeconds() <= 90) {
-            timeBase = CpuCyclicServiceTimeBaseType.TB_10_SEC;
-            timefactor = (byte) (duration.getSeconds() / 10);  
-        }
-        
-        CpuCyclicServicesRequestPayload payload = new CpuCyclicServicesRequestPayload(DataTransportErrorCode.OK,
-                                                        DataTransportSize.OCTET_STRING,
-                                                        (4+payloadItems.size()*12),
-                                                        payloadItems.size(),
-                                                        timeBase,
-                                                        timefactor,
-                                                        payloadItems);
-                                                        
-        payloads.add(payload);
-        
-        CpuCyclicServicesRequestParameter parameter = new CpuCyclicServicesRequestParameter(CpuUserDataMethodType.REQUEST,
-                                                            CpuServicesParameterFunctionGroup.CYCLIC_SERVICES,
-                                                            CpuCyclicServicesParameterSubFunctionGroupType.CYCLIC_TRANSFER,
-                                                            (byte) 0x00);
-        parameterItems.add(parameter);
-        
-
-        
-        // Assemble the request.
-        S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.USER_DATA,
-            (short) tpduGenerator.getAndIncrement(), parameterItems,
-            payloads, msg);
-
-        requests.put(s7ReadRequest.getTpduReference(), msg);
-
-        out.add(s7ReadRequest);        
-    }
-    
-    private void encodeUnSubcriptionRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
-        //Chequear el campo prueba que ya incluyte la informaciĆ³n del tipo
-        InternalPlcUnsubscriptionRequest subsRequest = (InternalPlcUnsubscriptionRequest)  msg.getRequest();  
-        Collection<? extends InternalPlcSubscriptionHandle> handles = subsRequest.getInternalPlcSubscriptionHandles();
-        handles.forEach((handle)->{
-            if (handle instanceof S7CyclicServicesSubscriptionHandle) {
-                try {
-                    encodeCycledUnSubscriptionRequest(msg,out);
-                } catch (PlcException ex) {
-                    logger.info(ex.toString());
-                }
-            }
-        });
-
-    } 
-    
-    private void encodeEventUnSubcriptionRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
-        byte subsevent = 0;
-        List<S7Parameter> parameterItems = new LinkedList<>();
-        List<S7Payload> payloadItems = new LinkedList<>();
-        AlarmType alarmType = AlarmType.ALARM_S_INITIATE;
-         
-        PlcSubscriptionRequest subsRequest = (PlcSubscriptionRequest)  msg.getRequest();
-        
-        for (String fieldName : subsRequest.getFieldNames()) {                        
-            if ( subsRequest.getField(fieldName) instanceof S7SubscriptionField){
-                 S7SubscriptionField event = (S7SubscriptionField) subsRequest.getField(fieldName);
-                 subsevent = (byte) (subsevent | event.getEventtype().getCode());
-                 if (event.getEventtype() == SubscribedEventType.ALM_8) {
-                    alarmType = AlarmType.ALARM_INITIATE;
-                 }                 
-            }
-        }
-        
-        CpuServicesParameter cpuservice = new CpuServicesRequestParameter(CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
-            CpuServicesParameterSubFunctionGroup.MESSAGE_SERVICE, (byte) 0x00);
-        
-        parameterItems.add(cpuservice);
-        
-       
-        S7Payload Data = new CpuMessageSubscriptionServicePayload(DataTransportErrorCode.OK,
-                                DataTransportSize.OCTET_STRING,
-                                subsevent,
-                                new String("HmiRtm  "),
-                                alarmType);
-        
-        payloadItems.add(Data);
-
-        
-        S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.USER_DATA,
-            (short) tpduGenerator.getAndIncrement(), 
-            parameterItems,
-            payloadItems, 
-            msg);
-
-        requests.put(s7ReadRequest.getTpduReference(), msg);
-
-        out.add(s7ReadRequest);         
-    }  
-       
-    private void encodeCycledUnSubscriptionRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
- 
-        List<S7Parameter> parameterItems = new LinkedList<>();
-        List<S7Payload> payloads = new LinkedList<>();
-        byte jobId = 0x00;
-        
-        DefaultPlcUnsubscriptionRequest prueba = (DefaultPlcUnsubscriptionRequest)  msg.getRequest();
-   
-        Collection<? extends InternalPlcSubscriptionHandle> handles = prueba.getInternalPlcSubscriptionHandles();
- 
-        for(InternalPlcSubscriptionHandle ihandle:handles){
-            S7CyclicServicesSubscriptionHandle s7handle = (S7CyclicServicesSubscriptionHandle) ihandle;
-            jobId = s7handle.getJobId();
-            break;
-        } 
- 
-
-        CpuCyclicServicesRequestPayload payload = new CpuCyclicServicesRequestPayload(DataTransportErrorCode.OK,
-                                                        DataTransportSize.OCTET_STRING,
-                                                        (byte) 0x02,
-                                                        (byte) 0x05,
-                                                        jobId);
-                                                        
-        payloads.add(payload);
-
-        CpuCyclicServicesRequestParameter parameter = new CpuCyclicServicesRequestParameter(CpuUserDataMethodType.REQUEST,
-                                                            CpuServicesParameterFunctionGroup.CYCLIC_SERVICES,
-                                                            CpuCyclicServicesParameterSubFunctionGroupType.CYCLIC_UNSUBSCRIBE,
-                                                            (byte) 0x00);
-        parameterItems.add(parameter);
-        
-
-        
-        // Assemble the request.
-        S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.USER_DATA,
-            (short) tpduGenerator.getAndIncrement(), parameterItems,
-            payloads, msg);
-
-        requests.put(s7ReadRequest.getTpduReference(), msg);
-
-        out.add(s7ReadRequest);
-       
-    }
-        
-    private void encodeReadRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
-
-        List<VarParameterItem> parameterItems = new LinkedList<>();
-
-        PlcReadRequest readRequest = (PlcReadRequest) msg.getRequest();
-        
-        Short itemRow = 0;
-        Short tpdu = (short) tpduGenerator.getAndIncrement();
-        
-        for (String fieldName : readRequest.getFieldNames()) {
-            PlcField field = readRequest.getField(fieldName);
-            
-            if ((field instanceof S7SslField)) {
-                S7SslField szlfield = (S7SslField) field;
-                encodeSslReadRequest(msg,szlfield,out);
-                return;
-            } else {
-                if (!(field instanceof S7Field)) {
-                    throw new PlcProtocolException("The field should have been of type S7Field");
-                }
-
-                S7Field s7Field = (S7Field) field;
-                if(!(readRequest instanceof DefaultPlcReadRequest)) {
-                    throw new PlcException("The writeRequest should have been of type DefaultPlcWriteRequest");
-                }
-                
-                if (s7Field.getDataType() == TransportSize.BOOL){
-                    encodeWriteRequestBitFieldAndArray( tpdu,
-                            itemRow,
-                            null,
-                            s7Field, 
-                            parameterItems, 
-                            Collections.EMPTY_LIST);                                         
-                } else {
-                
-                    VarParameterItem varParameterItem = new S7AnyVarParameterItem(
-                        SpecificationType.VARIABLE_SPECIFICATION, s7Field.getMemoryArea(),
-                        s7Field.getDataType(),
-                        s7Field.getNumElements(), s7Field.getBlockNumber(), s7Field.getByteOffset(), (byte) s7Field.getBitOffset());
-                    parameterItems.add(varParameterItem);
-                }
-                
-
-            }
-            itemRow++;
-        }
-        
-        VarParameter readVarParameter = new VarParameter(ParameterType.READ_VAR, parameterItems);
-
-        // Assemble the request.
-        S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.JOB,
-            tpdu, Collections.singletonList(readVarParameter),
-            Collections.emptyList(), msg);
-
-        requests.put(s7ReadRequest.getTpduReference(), msg);
-
-        out.add(s7ReadRequest);
-    }
-
-    private void encodeSslReadRequest(PlcRequestContainer msg, S7SslField sslfield, List<Object> out) throws PlcException {
-        
-        S7RequestMessage szlRequestMessage = new S7RequestMessage(MessageType.USER_DATA,
-                (short) tpduGenerator.getAndIncrement(),
-            Collections.singletonList(new CpuServicesRequestParameter(
-                CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
-                CpuServicesParameterSubFunctionGroup.READ_SSL, (byte) 0)),
-            Collections.singletonList(new CpuServicesPayload(DataTransportErrorCode.OK, SslId.valueOf((short) (sslfield.getSslId() & 0x01FF)),
-                (short) sslfield.getIndex())), null); 
-        
-        requests.put(szlRequestMessage.getTpduReference(), msg);
-
-        out.add(szlRequestMessage);        
-    }    
-    
-    // TODO: 
-    private void encodeWriteRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
-        List<VarParameterItem> parameterItems = new LinkedList<>();
-        List<VarPayloadItem> payloadItems = new LinkedList<>();
-
-        PlcWriteRequest writeRequest = (PlcWriteRequest) msg.getRequest();
-        
-        Short itemRow = 0;
-        Short tpdu = (short) tpduGenerator.getAndIncrement();
-        for (String fieldName : writeRequest.getFieldNames()) {
-            PlcField field = writeRequest.getField(fieldName);
-            if (!(field instanceof S7Field)) {
-                throw new PlcException("The field should have been of type S7Field");
-            }
-            S7Field s7Field = (S7Field) field;
-            if(!(writeRequest instanceof DefaultPlcWriteRequest)) {
-                throw new PlcException("The writeRequest should have been of type DefaultPlcWriteRequest");
-            }
-            BaseDefaultFieldItem fieldItem = ((DefaultPlcWriteRequest) writeRequest).getFieldItem(fieldName);
-
-            // The number of elements provided in the request must match the number defined in the field, or
-            // bad things are going to happen.
-            // An exception is STRINGS, as they are implemented as byte arrays
-            // TODO: Calculate the number of correct elements for a "STRING", 
-            //       since it will be written to the PLC as a string of "CHAR" elements.
-            if (s7Field.getDataType() != TransportSize.STRING &&
-                writeRequest.getNumberOfValues(fieldName) != s7Field.getNumElements()) {
-                throw new PlcException("The number of values provided doesn't match the number specified by the field.");
-            }
-            
-            //TODO: Bit Arrays: One item request for every bit
-            
-            if (s7Field.getDataType() == TransportSize.BOOL) {
-                
-                encodeWriteRequestBitFieldAndArray( tpdu,
-                        itemRow,
-                        fieldItem,
-                        s7Field, 
-                        parameterItems, 
-                        payloadItems);            
-                
-            } else {
-
-                VarParameterItem varParameterItem = new S7AnyVarParameterItem(
-                    SpecificationType.VARIABLE_SPECIFICATION, s7Field.getMemoryArea(),
-                    s7Field.getDataType(),
-                    (s7Field.getDataType() == TransportSize.STRING)?fieldItem.getString(0).length()+2:s7Field.getNumElements(), 
-                    s7Field.getBlockNumber(), 
-                    s7Field.getByteOffset(),
-                    (byte) s7Field.getBitOffset());
-
-                parameterItems.add(varParameterItem);
-
-                DataTransportSize dataTransportSize = s7Field.getDataType().getDataTransportSize();
-
-                // TODO: Checkout if the payload items are sort of a flatMap of all request items.
-                byte[] byteData = null;
-                switch(s7Field.getDataType()) {
-                    // -----------------------------------------
-                    // Bit
-                    // -----------------------------------------
-                    case BOOL:
-                        //byteData = encodeWriteRequestBitField(fieldItem);
-                        break;
-                    // -----------------------------------------
-                    // Signed integer values
-                    // -----------------------------------------
-                    case BYTE:
-                    case SINT:
-                    case CHAR:  // 1 byte
-                        byteData = encodeWriteRequestByteField(fieldItem, true);
-                        break;                
-                    case WORD:
-                    case INT:
-                    case WCHAR:  // 2 byte (16 bit)
-                        byteData = encodeWriteRequestShortField(fieldItem, true);
-                        break;
-                    case DWORD:
-                    case DINT:  // 4 byte (32 bit)
-                        byteData = encodeWriteRequestIntegerField(fieldItem, true);
-                        break;
-                    case LWORD:
-                    case LINT:  // 8 byte (64 bit)
-                        byteData = encodeWriteRequestLongField(fieldItem, true);
-                        break;
-                    // -----------------------------------------
-                    // Unsigned integer values
-                    // -----------------------------------------
-                    // 8 bit:
-                    case USINT:
-                        byteData = encodeWriteRequestByteField(fieldItem, false);
-                        break;
-                    // 16 bit:
-                    case UINT:
-                        byteData = encodeWriteRequestShortField(fieldItem, false);
-                        break;
-                    // 32 bit:
-                    case UDINT:
-                        byteData = encodeWriteRequestIntegerField(fieldItem, false);
-                        break;
-                    // 64 bit:
-                    case ULINT:
-                        byteData = encodeWriteRequestLongField(fieldItem, false);
-                        break;
-                    // -----------------------------------------
-                    // Floating point values
-                    // -----------------------------------------
-                    case REAL:
-                        byteData = encodeWriteRequestFloatField(fieldItem);
-                        break;
-                    case LREAL:
-                        byteData = encodeWriteRequestDoubleField(fieldItem);
-                        break;
-                    // -----------------------------------------
-                    // Characters & Strings
-                    // -----------------------------------------
-                    case STRING:
-                        byteData = encodeWriteRequestStringField(fieldItem, false);
-                        break;
-                    case WSTRING:
-                        byteData = encodeWriteRequestStringField(fieldItem, true);
-                        break;
-                    // -----------------------------------------
-                    // Date & Time
-                    // -----------------------------------------
-                    case S5TIME:
-                        byteData = encodeWriteRequestS5TimeField(fieldItem, false);
-                        break;
-                    case TIME:  // 4 byte (32 bit)
-                        byteData = encodeWriteRequestTimeField(fieldItem, false);
-                        break;
-                    case TOD:
-                    case TIME_OF_DAY:
-                        byteData = encodeWriteRequestTodField(fieldItem, true);
-                        break;
-                    case DATE:  // 2 byte (16 bit)
-                        byteData = encodeWriteRequestDateField(fieldItem, true);
-                        break; 
-                    case DT:                        
-                    case DATE_AND_TIME:  // 8 byte (64 bit)
-                        byteData = encodeWriteRequestDateTimeField(fieldItem, true);
-                        break;                    
-                    default:
-                        throw new PlcProtocolException("Unsupported type.. " + s7Field.getDataType());
-                }
-
-                VarPayloadItem varPayloadItem = new VarPayloadItem(
-                DataTransportErrorCode.RESERVED, dataTransportSize, byteData);
-
-                payloadItems.add(varPayloadItem);
-            }
-            itemRow++;
-        };
-        
-        VarParameter writeVarParameter = new VarParameter(ParameterType.WRITE_VAR, parameterItems);
-        VarPayload writeVarPayload = new VarPayload(ParameterType.WRITE_VAR, payloadItems);
-
-        // Assemble the request.
-        S7RequestMessage s7WriteRequest = new S7RequestMessage(MessageType.JOB,
-            tpdu, Collections.singletonList(writeVarParameter),
-            Collections.singletonList(writeVarPayload), msg);
-
-        requests.put(s7WriteRequest.getTpduReference(), msg);
-
-        out.add(s7WriteRequest);
-    }
-    
-    
-    void encodeWriteRequestBitFieldAndArray(Short tpdu,
-            Short itemRow,
-            BaseDefaultFieldItem fieldItem,
-            S7Field s7Field, 
-            List<VarParameterItem> parameterItems, 
-            List<VarPayloadItem> payloadItems){
-        
-        int curParameterByteOffset = s7Field.getByteOffset();
-        byte curParameterBitOffset = (byte) s7Field.getBitOffset();
-        byte curPayloadBitOffset = 0; 
-        
-        //Only BITS arrays
-        if (s7Field.getNumElements() > 1) {
-            requestBitArray.computeIfAbsent(tpdu, 
-                    k->new HashMap()).put(itemRow,s7Field.getNumElements()-1);
-        }
-
-        for (int i = 0; i < s7Field.getNumElements(); i++) {
-
-            VarParameterItem varParameterItem = new S7AnyVarParameterItem(
-                SpecificationType.VARIABLE_SPECIFICATION, s7Field.getMemoryArea(),
-                s7Field.getDataType(),
-                (short) 1, 
-                s7Field.getBlockNumber(), 
-                curParameterByteOffset,
-                curParameterBitOffset);
-
-            // Create a one-byte byte array and set it to 0x01, if the corresponding bit
-            // was 1 else set it to 0x00.
-            byte[] elementData = new byte[1];
-                                   
-            parameterItems.add(varParameterItem);
-            
-            if (!(payloadItems == Collections.EMPTY_LIST)){
-                elementData[0] = (byte) (fieldItem.getBoolean(i)?0x01:0x00);                  
-                VarPayloadItem itemPayload = new VarPayloadItem(
-                    DataTransportErrorCode.RESERVED,
-                    s7Field.getDataType().getDataTransportSize(),
-                        elementData);            
-                payloadItems.add(itemPayload);
-            }
-            
-            // Calculate the new memory and bit offset.
-            curParameterBitOffset++;
-            if ((i > 0) && ((curParameterBitOffset % 8) == 0)) {
-                curParameterByteOffset++;
-                curParameterBitOffset = 0;
-            }
-            curPayloadBitOffset++;
-            if ((i > 0) && ((curPayloadBitOffset % 8) == 0)) {
-                curPayloadBitOffset = 0;
-            }                                    
-        }            
-    }
-    
-
-    byte[] encodeWriteRequestBitField(BaseDefaultFieldItem fieldItem) {
-        int numBytes = fieldItem.getNumberOfValues() >> 3 / 8;
-        byte[] byteData = new byte[numBytes];
-        BitSet bitSet = new BitSet();
-        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
-            bitSet.set(i, fieldItem.getBoolean(i));
-        }
-        byte[] src = bitSet.toByteArray();
-        System.arraycopy(src, 0, byteData, 0, Math.min(src.length, numBytes));
-        return byteData;
-    }
-
-    byte[] encodeWriteRequestByteField(BaseDefaultFieldItem fieldItem, boolean signed) {
-        int numBytes = fieldItem.getNumberOfValues();
-        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
-        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
-            if(signed) {
-                buffer.put(fieldItem.getByte(i));
-            } else {
-                buffer.put((byte) (short) fieldItem.getShort(i));
-            }
-        }
-        return buffer.array();
-    }
-
-    byte[] encodeWriteRequestShortField(BaseDefaultFieldItem fieldItem, boolean signed) {
-        int numBytes = fieldItem.getNumberOfValues() * 2;
-        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
-        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
-            if(signed) {
-                buffer.putShort(fieldItem.getShort(i));
-            } else {
-                buffer.putShort((short) (int) fieldItem.getInteger(i));
-            }
-        }
-        return buffer.array();
-    }
-
-    byte[] encodeWriteRequestIntegerField(BaseDefaultFieldItem fieldItem, boolean signed) {
-        int numBytes = fieldItem.getNumberOfValues() * 4;
-        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
-        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
-            if(signed) {
-                buffer.putInt(fieldItem.getInteger(i));
-            } else {
-                buffer.putInt((int) (long) fieldItem.getLong(i));
-            }
-        }
-        return buffer.array();
-    }
-
-    byte[] encodeWriteRequestLongField(BaseDefaultFieldItem fieldItem, boolean signed) {
-        int numBytes = fieldItem.getNumberOfValues() * 8;
-        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
-        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
-            if(signed) {
-                buffer.putLong(fieldItem.getLong(i));
-            } else {
-                // TODO: Implement this ...
-            }
-        }
-        return buffer.array();
-    }
-
-    byte[] encodeWriteRequestFloatField(BaseDefaultFieldItem fieldItem) {
-        int numBytes = fieldItem.getNumberOfValues() * 4;
-        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
-        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
-            buffer.putFloat(fieldItem.getFloat(i));
-        }
-        return buffer.array();
-    }
-
-    byte[] encodeWriteRequestDoubleField(BaseDefaultFieldItem fieldItem) {
-        int numBytes = fieldItem.getNumberOfValues() * 8;
-        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
-        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
-            buffer.putDouble(fieldItem.getDouble(i));
-        }
-        return buffer.array();
-    }
-    
-    byte[] encodeWriteRequestStringField(BaseDefaultFieldItem fieldItem, boolean isUtf16) {
-        // TODO: Implement this ...
-        String str = fieldItem.getString(0);
-        ByteBuffer buffer = ByteBuffer.allocate(str.length()+2);
-        buffer.put((byte)254);
-        buffer.put((byte)str.length());
-        buffer.put(str.getBytes());
-        return buffer.array();
-    }
-    
-    byte[] encodeWriteRequestS5TimeField(BaseDefaultFieldItem fieldItem, boolean signed) {
-        int numBytes = fieldItem.getNumberOfValues() * 2;
-        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
-        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
-            buffer.putShort(S7Helper.DurationToS5Time(fieldItem.getDuration(i)));
-        }
-        return buffer.array();
-    }    
-    
-    byte[] encodeWriteRequestTimeField(BaseDefaultFieldItem fieldItem, boolean signed) {
-        int numBytes = fieldItem.getNumberOfValues() * 4;
-        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
-        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
-            buffer.putInt(S7Helper.DurationToS7Time(fieldItem.getDuration(i)));
-        }
-        return buffer.array();
-    } 
-    
-    byte[] encodeWriteRequestTodField(BaseDefaultFieldItem fieldItem, boolean signed) {
-        int numBytes = fieldItem.getNumberOfValues() * 4;
-        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
-        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
-            buffer.putInt(S7Helper.LocalTimeToS7Tod(fieldItem.getTime(i)));
-        }
-        return buffer.array();
-    }
-    
-     byte[] encodeWriteRequestDateField(BaseDefaultFieldItem fieldItem, boolean signed) {
-        int numBytes = fieldItem.getNumberOfValues() * 2;
-        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
-        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
-            buffer.putShort(S7Helper.LocalDateToS7Date(fieldItem.getDate(i)));
-        }
-        return buffer.array();
-    }  
-     
-     byte[] encodeWriteRequestDateTimeField(BaseDefaultFieldItem fieldItem, boolean signed) {
-        int numBytes = fieldItem.getNumberOfValues() * 8;
-        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
-        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
-            buffer.put(S7Helper.LocalDateTimeToS7DateTime(fieldItem.getDateTime(i)));
-        }
-        return buffer.array();
-    }      
-    
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Decoding
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    @SuppressWarnings("unchecked")
-    @Override
-    protected void decode(ChannelHandlerContext ctx, S7Message msg, List<Object> out) throws PlcException {
-        // We're currently just expecting responses.
-
-        if (!(msg instanceof S7ResponseMessage)) {
-            logger.info("Aborta decode: " + msg.getMessageType());
-            return;
-        }
-        
-        S7ResponseMessage responseMessage = (S7ResponseMessage) msg;
-        short tpduReference = responseMessage.getTpduReference();
-
-        if (requests.containsKey(tpduReference)) {
-            // As every response has a matching request, get this request based on the tpdu.
-            PlcRequestContainer requestContainer = requests.remove(tpduReference);
-            PlcRequest request = requestContainer.getRequest();
-
-            PlcResponse response = null;
-            if (request instanceof PlcReadRequest) {
-                response = decodeReadResponse(responseMessage, requestContainer);
-                //If responseMessage is SSL type and response is null
-                //At moments Alarms and SSL request must be fragmented
-                if (response == null){ //Fragmented message? Query again!
-                    if (responseMessage.getPayloads().get(0) instanceof CpuServicesPayload){
-                        requests.put(tpduReference, requestContainer);
-                        S7RequestMessage sslRequestMessage = new S7RequestMessage(MessageType.USER_DATA,
-                                msg.getTpduReference(),
-                            Collections.singletonList(new  CpuServicesResponseParameter(
-                                CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
-                                CpuServicesParameterSubFunctionGroup.READ_SSL, 
-                                ((CpuServicesParameter) msg.getParameters().get(0)).getSequenceNumber())),
-                            Collections.singletonList(new CpuServicesPayload(DataTransportErrorCode.NOT_FOUND, 
-                                    SslId.NULL,
-                                (short) 0x0000)), null); 
-                        try {
-                            ChannelFuture future = ctx.writeAndFlush(sslRequestMessage);
-                            future.addListener(new ChannelFutureListener() {
-                                public void operationComplete(ChannelFuture future) {
-                                    logger.info("Request fragment READ_SSL done: " + future.isSuccess());
-                                }
-                            });                        
-                        } catch (Exception ex) {
-                            java.util.logging.Logger.getLogger(Plc4XS7Protocol.class.getName()).log(Level.SEVERE, null, ex);
-                        }
-                    }
-                }
-                
-            } else if (request instanceof PlcWriteRequest) {
-                response = decodeWriteResponse(responseMessage, requestContainer);
-            } else if (request instanceof PlcSubscriptionRequest) {
-                response = decodeSubscriptionResponse(responseMessage, requestContainer);
-                
-                //At moments Alarms and SSL request must be fragmented
-                if (response == null){ //Fragmented message? Query again!
-                    requests.put(tpduReference, requestContainer);
-                    List<S7Parameter> parameterItems = new LinkedList<>();
-                    List<S7Payload> payloadItems = new LinkedList<>();
-                    
-                    AlarmMessagePayload payload = new AlarmMessagePayload(DataTransportErrorCode.NOT_FOUND,
-                                                                            DataTransportSize.NULL,
-                                                                            0x0000,
-                                                                            null);
-                    payloadItems.add(payload);
-
-                    //TODO: Check multiple parameters
-                    CpuServicesParameter cpuservice = new CpuServicesResponseParameter(CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
-                    CpuServicesParameterSubFunctionGroup.ALARM_QUERY, ((CpuServicesParameter) msg.getParameters().get(0)).getSequenceNumber());
-
-                    parameterItems.add(cpuservice); 
-
-                    S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.USER_DATA,
-                        msg.getTpduReference(), 
-                        parameterItems,
-                        payloadItems, 
-                        null);  
-
-                    try {
-                        ChannelFuture future = ctx.writeAndFlush(s7ReadRequest);
-                        future.addListener(new ChannelFutureListener() {
-                            public void operationComplete(ChannelFuture future) {
-                                logger.debug("Request fragment ALARM_QUERY done: " + future.isSuccess());
-                            }
-                        });                        
-                        //out.add(s7ReadRequest);
-                        //ctx.pipeline().
-                    } catch (Exception ex) {
-                        java.util.logging.Logger.getLogger(Plc4XS7Protocol.class.getName()).log(Level.SEVERE, null, ex);
-                    }
-                    
-                }
-            } else if (request instanceof PlcUnsubscriptionRequest) {
-                response = decodeUnSubscriptionResponse(responseMessage, requestContainer);
-            } else {
-                logger.info("There is the client's request, but it is not a valid response....");
-            }
-
-            // Confirm the response being handled.
-            if (response != null) {
-                requestContainer.getResponseFuture().complete(response);
-            } else {
-                logger.info("The message could not be processed...");
-            }
-        } else {
-            //PUSH Message
-            List<S7Parameter> parameters = msg.getParameters();
-            for (S7Parameter parameter:parameters){
-                if (parameter instanceof S7PushMessage){
-                    if (!alarmsqueue.offer((S7PushMessage) parameter)){
-                        logger.info("Event queue buffer is full.");
-                    };                    
-                }    
-            }
-            
-            List<S7Payload> payloads = msg.getPayloads();  
-            //TODO: Use alarmsqueue.addAll() method using streams
-            for (S7Payload payload:payloads){
-                if (payload instanceof S7PushMessage){
-                    if (!alarmsqueue.offer((S7PushMessage) payload)){
-                        logger.info("Event queue buffer is full.");
-                    };
-                }
-            }            
-        }
-    }
-    
-    // TODO: Check if it is a CPU service response and proceed as applicable.
-    @SuppressWarnings("unchecked")
-    private PlcResponse decodeReadResponse(S7ResponseMessage responseMessage, PlcRequestContainer requestContainer) throws PlcProtocolException {
-        InternalPlcReadRequest plcReadRequest = (InternalPlcReadRequest) requestContainer.getRequest();
-        Map<Short, Integer> splitItems  = null;
-                
-        if (responseMessage.getPayloads().get(0) instanceof CpuServicesPayload){
-            return decodeSslReadResponse(responseMessage, requestContainer);
-        }
-        
-        VarPayload payload = responseMessage.getPayload(VarPayload.class)
-            .orElseThrow(() -> new PlcProtocolException("No VarPayload supplied"));
-
-        // TODO: Checkout if the payload items are sort of a flatMap of all request items.
-
-        // If the numbers of items don't match, we're in big trouble as the only
-        // way to know how to interpret the responses is by aligning them with the
-        // items from the request as this information is not returned by the PLC.
-
-        short tpdu = responseMessage.getTpduReference();
-        
-        int[] fieldOffset= new int[1];
-        fieldOffset[0] = 0;
-        if (requestBitArray.containsKey(tpdu)){
-            splitItems = requestBitArray.remove(tpdu);
-            splitItems.forEach((key,length) -> {
-                fieldOffset[0] += length;
-            });
-        }
-        
-        if ((plcReadRequest.getNumberOfFields()+fieldOffset[0]) != payload.getItems().size()) {
-            logger.info("Excepcion: " + plcReadRequest.getFieldNames().toString());
-            throw new PlcProtocolException(
-                "The number of requested items doesn't match the number of returned items Request: " + 
-                        (plcReadRequest.getNumberOfFields()+fieldOffset[0]) +
-                        " Payload: " + 
-                        payload.getItems().size());
-        }
-
-
-        
-        Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> values = new HashMap<>();
-        List<VarPayloadItem> payloadItems = payload.getItems();
-        short index = 0;
-        short itemRow = 0;
-        for (String fieldName : plcReadRequest.getFieldNames()) {
-            S7Field field = (S7Field) plcReadRequest.getField(fieldName);
-            VarPayloadItem payloadItem = payloadItems.get(itemRow);
-
-            PlcResponseCode responseCode = decodeResponseCode(payloadItem.getReturnCode());
-            BaseDefaultFieldItem fieldItem = null;
-
-            //ByteBuf data = Unpooled.copiedBuffer(payloadItem.getData());
-            ByteBuf data = PooledByteBufAllocator.DEFAULT.buffer();
-            if (payloadItem.getData() != null){
-                data.writeBytes(payloadItem.getData());
-            }
-            
-            if (responseCode == PlcResponseCode.OK) {
-                try {
-                    switch (field.getDataType()) {
-                        // -----------------------------------------
-                        // Bit
-                        // 1 responseMessage
-                        // -----------------------------------------
-                        case BOOL:
-                            if (splitItems != null){
-                                if (splitItems.containsKey(index)){
-                                    short endRow = (short)(itemRow + splitItems.get(index));
-                                    for(short i=itemRow; i<=endRow; i++){
-                                        payloadItem = payloadItems.get(i);
-                                        data.writeBytes(payloadItem.getData());
-                                    }
-                                    itemRow = endRow;
-                                }
-                            }
-                            fieldItem = decodeReadResponseBitField(field, data);                                                            
-                            break;
-                        // -----------------------------------------
-                        // Bit-strings
-                        // -----------------------------------------
-                        case BYTE:  // 1 byte
-                            fieldItem = decodeReadResponseSignedByteField(field, data);
-                            break;
-                        case WORD:  // 2 byte (16 bit)
-                            fieldItem = decodeReadResponseSignedShortField(field, data);
-                            break;
-                        case DWORD:  // 4 byte (32 bit)
-                            fieldItem = decodeReadResponseSignedIntegerField(field, data);
-                            break;
-                        case LWORD:  // 8 byte (64 bit)
-                            fieldItem = decodeReadResponseSignedLongField(field, data);
-                            break;
-                        // -----------------------------------------
-                        // Integers
-                        // -----------------------------------------
-                        // 8 bit:
-                        case SINT:
-                            fieldItem = decodeReadResponseSignedByteField(field, data);
-                            break;
-                        case USINT:
-                            fieldItem = decodeReadResponseUnsignedByteField(field, data);
-                            break;
-                        // 16 bit:
-                        case INT:
-                            fieldItem = decodeReadResponseSignedShortField(field, data);
-                            break;
-                        case UINT:
-                            fieldItem = decodeReadResponseUnsignedShortField(field, data);
-                            break;
-                        case S5TIME:
-                            fieldItem = decodeReadResponseS5Time(field, data);
-                            break;
-                        // 32 bit:
-                        case TIME:
-                            fieldItem = decodeReadResponseTime(field, data);
-                            break;
-                        case DINT:
-                            fieldItem = decodeReadResponseSignedIntegerField(field, data);
-                            break;
-                        case UDINT:
-                            fieldItem = decodeReadResponseUnsignedIntegerField(field, data);
-                            break;
-                        // 64 bit:
-                        case LINT:
-                            fieldItem = decodeReadResponseSignedLongField(field, data);
-                            break;
-                        case ULINT:
-                            fieldItem = decodeReadResponseUnsignedLongField(field, data);
-                            break;
-                        // -----------------------------------------
-                        // Floating point values
-                        // -----------------------------------------
-                        case REAL:
-                            fieldItem = decodeReadResponseFloatField(field, data);
-                            break;
-                        case LREAL:
-                            fieldItem = decodeReadResponseDoubleField(field, data);
-                            break;
-                        // -----------------------------------------
-                        // Characters & Strings
-                        // -----------------------------------------
-                        case CHAR: // 1 byte (8 bit)
-                            fieldItem = decodeReadResponseFixedLengthStringField(field.getNumElements(), false, data);
-                            break;
-                        case WCHAR: // 2 byte
-                            fieldItem = decodeReadResponseFixedLengthStringField(1, true, data);
-                            break;
-                        case STRING:
-                            fieldItem = decodeReadResponseVarLengthStringField(false, data);
-                            break;
-                        case WSTRING:
-                            fieldItem = decodeReadResponseVarLengthStringField(true, data);
-                            break;
-                        // -----------------------------------------
-                        // TIA Date-Formats
-                        // -----------------------------------------
-                        case DT:
-                        case DATE_AND_TIME:
-                            fieldItem = decodeReadResponseDateAndTime(field, data);
-                            break;
-                        case TOD:
-                        case TIME_OF_DAY:
-                            fieldItem = decodeReadResponseTimeOfDay(field, data);                            
-                            break;
-                        case DATE:
-                            fieldItem = decodeReadResponseDate(field, data);
-                            break;
-                        default:
-                            throw new PlcProtocolException("Unsupported type " + field.getDataType());
-                    }
-                }
-                catch (Plc4XNettyException e){
-                    logger.warn("Problem during casting of field {}: Exception: {}; FieldInformation: {}",fieldName,e.getMessage(),field);
-                }
-                catch (Exception e){
-                    logger.warn("Some other error occurred casting field {}, FieldInformation: {}",fieldName, field,e);
-                }
-            }
-            Pair<PlcResponseCode, BaseDefaultFieldItem> result = new ImmutablePair<>(responseCode, fieldItem);
-            values.put(fieldName, result);
-            index++;
-            itemRow++;
-        }
-
-        return new DefaultPlcReadResponse(plcReadRequest, values);
-    }
-    
-    private PlcResponse decodeSslReadResponse(S7ResponseMessage responseMessage, PlcRequestContainer requestContainer) throws PlcProtocolException {
-        InternalPlcReadRequest plcReadRequest = (InternalPlcReadRequest) requestContainer.getRequest();
-        
-        Map<String, Pair<PlcResponseCode, ByteBuf>> values = new HashMap<>();                
-        List<S7Payload> payloads = responseMessage.getPayloads();
-        
-        if (payloads.get(0) instanceof CpuServicesPayload){
-            CpuServicesPayload payload = (CpuServicesPayload) payloads.get(0); 
-            if (payload.getSslPayload() == null) {
-                logger.debug("decodeSslReadResponse: Check for fragment payload");
-                return null;
-            }
-        }
-        
-        payloads.forEach((payload)->{
-            CpuServicesPayload s7payload = (CpuServicesPayload) payload;});    
-             
-        int index = 0;
-        for (String requestName : plcReadRequest.getFieldNames()) {
-
-            CpuServicesPayload payload = (CpuServicesPayload) payloads.get(index);  
-
-            Pair<PlcResponseCode, ByteBuf> result = new ImmutablePair<>( 
-                    decodeResponseCode(payload.getReturnCode()), 
-                    payload.getSslPayload());
-            values.put(requestName, result);
-
-            index++;
-        }
-     
-        return new S7ByteReadResponse(plcReadRequest, values);
-    }    
-
-    BaseDefaultFieldItem decodeReadResponseBitField(S7Field field, ByteBuf data) {
-        Boolean[] booleans = readAllValues(Boolean.class, field, i -> data.readByte() != 0x00);
-        return new DefaultBooleanFieldItem(booleans);
-    }
-
-    BaseDefaultFieldItem decodeReadResponseByteBitStringField(S7Field field, ByteBuf data) {
-        byte[] bytes = new byte[field.getNumElements()];
-        data.readBytes(bytes);
-        return decodeBitStringField(bytes);
-    }
-
-    BaseDefaultFieldItem decodeReadResponseShortBitStringField(S7Field field, ByteBuf data) {
-        byte[] bytes = new byte[field.getNumElements() * 2];
-        data.readBytes(bytes);
-        return decodeBitStringField(bytes);
-    }
-
-    BaseDefaultFieldItem decodeReadResponseIntegerBitStringField(S7Field field, ByteBuf data) {
-        byte[] bytes = new byte[field.getNumElements() * 4];
-        data.readBytes(bytes);
-        return decodeBitStringField(bytes);
-    }
-
-    BaseDefaultFieldItem decodeReadResponseLongBitStringField(S7Field field, ByteBuf data) {
-        byte[] bytes = new byte[field.getNumElements() * 8];
-        data.readBytes(bytes);
-        return decodeBitStringField(bytes);
-    }
-
-    BaseDefaultFieldItem decodeBitStringField(byte[] bytes) {
-        BitSet bitSet = BitSet.valueOf(bytes);
-        Boolean[] booleanValues = new Boolean[8 * bytes.length];
-        int k = 0;
-        for(int i = bytes.length - 1; i >= 0; i--) {
-            for(int j = 0; j < 8; j++) {
-                booleanValues[k++] = bitSet.get(8 * i + j);
-            }
-        }
-        return new DefaultBooleanFieldItem(booleanValues);
-    }
-
-    BaseDefaultFieldItem decodeReadResponseSignedByteField(S7Field field, ByteBuf data) {
-        Byte[] bytes = readAllValues(Byte.class, field, i -> data.readByte());
-        return new DefaultByteFieldItem(bytes);
-    }
-
-    BaseDefaultFieldItem decodeReadResponseUnsignedByteField(S7Field field, ByteBuf data) {
-        Short[] shorts = readAllValues(Short.class, field, i -> data.readUnsignedByte());
-        return new DefaultShortFieldItem(shorts);
-    }
-
-    BaseDefaultFieldItem decodeReadResponseSignedShortField(S7Field field, ByteBuf data) {
-        Short[] shorts = readAllValues(Short.class, field, i -> data.readShort());
-        return new DefaultShortFieldItem(shorts);
-    }
-
-    BaseDefaultFieldItem decodeReadResponseUnsignedShortField(S7Field field, ByteBuf data) {
-        Integer[] ints = readAllValues(Integer.class, field, i -> data.readUnsignedShort());
-        return new DefaultIntegerFieldItem(ints);
-    }
-
-    BaseDefaultFieldItem decodeReadResponseSignedIntegerField(S7Field field, ByteBuf data) {
-        Integer[] ints = readAllValues(Integer.class, field, i -> data.readInt());
-        return new DefaultIntegerFieldItem(ints);
-    }
-
-    BaseDefaultFieldItem decodeReadResponseUnsignedIntegerField(S7Field field, ByteBuf data) {
-        Long[] longs = readAllValues(Long.class, field, i -> data.readUnsignedInt());
-        return new DefaultLongFieldItem(longs);
-    }
-
-    BaseDefaultFieldItem decodeReadResponseSignedLongField(S7Field field, ByteBuf data) {
-        Long[] longs = readAllValues(Long.class, field, i -> data.readLong());
-        return new DefaultLongFieldItem(longs);
-    }
-
-    BaseDefaultFieldItem decodeReadResponseUnsignedLongField(S7Field field, ByteBuf data) {
-        BigInteger[] bigIntegers = readAllValues(BigInteger.class, field, i -> readUnsigned64BitInteger(data));
-        return new DefaultBigIntegerFieldItem(bigIntegers);
-    }
-
-    BaseDefaultFieldItem decodeReadResponseFloatField(S7Field field, ByteBuf data) {
-        Float[] floats = readAllValues(Float.class, field, i -> data.readFloat());
-        return new DefaultFloatFieldItem(floats);
-    }
-
-    BaseDefaultFieldItem decodeReadResponseDoubleField(S7Field field, ByteBuf data) {
-        Double[] doubles = readAllValues(Double.class, field, i -> data.readDouble());
-        return new DefaultDoubleFieldItem(doubles);
-    }
-
-    BaseDefaultFieldItem decodeReadResponseFixedLengthStringField(int numChars, boolean isUtf16, ByteBuf data) {
-        int numBytes = isUtf16 ? numChars * 2 : numChars;
-        String stringValue = data.readCharSequence(numBytes, StandardCharsets.UTF_8).toString();
-        return new DefaultStringFieldItem(stringValue);
-    }
-
-    BaseDefaultFieldItem decodeReadResponseVarLengthStringField(boolean isUtf16, ByteBuf data) {
-        // Max length ... ignored.
-        data.skipBytes(1);
-
-        //reading out byte and transforming that to an unsigned byte within an integer, otherwise longer strings are failing
-        byte currentLengthByte = data.readByte();
-        int currentLength = currentLengthByte & 0xFF;
-        return decodeReadResponseFixedLengthStringField(currentLength, isUtf16, data);
-    }
-
-    BaseDefaultFieldItem decodeReadResponseS5Time(S7Field field,ByteBuf data) {
-        Duration[] durations = readAllValues(Duration.class,field, i -> readS5TimeToDuration(data));
-        return new DefaultDurationFieldItem(durations);
-    }
-    
-    BaseDefaultFieldItem decodeReadResponseTime(S7Field field,ByteBuf data) {
-        Duration[] durations = readAllValues(Duration.class,field, i -> readS7TimeToDuration(data));
-        return new DefaultDurationFieldItem(durations);
-    }
-    
-    BaseDefaultFieldItem decodeReadResponseTimeOfDay(S7Field field,ByteBuf data) {
-        LocalTime[] localTimes = readAllValues(LocalTime.class,field, i -> readTimeOfDay(data));
-        return new DefaultLocalTimeFieldItem(localTimes);
-    }
-
-    BaseDefaultFieldItem decodeReadResponseDate(S7Field field,ByteBuf data) {
-        LocalDate[] localDates = readAllValues(LocalDate.class,field, i -> readDate(data));
-        return new DefaultLocalDateFieldItem(localDates);
-    }
-    
-    BaseDefaultFieldItem decodeReadResponseDateAndTime(S7Field field,ByteBuf data) {
-        LocalDateTime[] localDateTimes = readAllValues(LocalDateTime.class,field, i -> readDateAndTime(data));
-        return new DefaultLocalDateTimeFieldItem(localDateTimes);
-    }    
-
-    // Returns a 32 bit unsigned value : from 0 to 4294967295 (2^32-1)
-    public static int getUDIntAt(byte[] buffer, int pos) {
-        int result;
-        result = buffer[pos] & 0x0FF;
-        result <<= 8;
-        result += buffer[pos + 1] & 0x0FF;
-        result <<= 8;
-        result += buffer[pos + 2] & 0x0FF;
-        result <<= 8;
-        result += buffer[pos + 3] & 0x0FF;
-        return result;
-    }
-
-    private static <T> T[] readAllValues(Class<T> clazz, S7Field field, Function<Integer, T> extract) {
-        try {
-            return IntStream.rangeClosed(1, field.getNumElements())
-                .mapToObj(extract::apply)
-                .collect(Collectors.toList())
-                .toArray((T[])Array.newInstance(clazz, 0));
-        } catch (IndexOutOfBoundsException e) {
-            throw new PlcRuntimeException("To few bytes in the buffer to read requested type", e);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private PlcResponse decodeWriteResponse(S7ResponseMessage responseMessage, PlcRequestContainer requestContainer) throws PlcProtocolException {
-        InternalPlcWriteRequest plcWriteRequest = (InternalPlcWriteRequest) requestContainer.getRequest();
-        Map<Short, Integer> splitItems  = null;
-        
-        
-        //TODO: if the PLC Send a error, It send only the Header with PDUR and error code.
-        //      in this condition we send a error to the client, no a exception.
-        VarPayload payload = responseMessage.getPayload(VarPayload.class)
-            .orElseThrow(() -> new PlcProtocolException("No VarPayload supplied"));
-
-        // TODO: Checkout if the payload items are sort of a flatMap of all request items.
-        // TODO: Check for array response, no payload items presents, Why?
-
-        // If the numbers of items don't match, we're in big trouble as the only
-        // way to know how to interpret the responses is by aligning them with the
-        // items from the request as this information is not returned by the PLC.
-        // If we write BitsArray -> We need to add the number of items created 
-        // for individual requests.
-        int[] numberOfFields = new int[1];
-        numberOfFields[0] = 0;
-        short tpdu = responseMessage.getTpduReference();
-        if (requestBitArray.containsKey(tpdu)) {
-            splitItems = requestBitArray.remove(tpdu);
-            splitItems.forEach((key,length)->{                
-                numberOfFields[0] += length;
-            }); 
-            numberOfFields[0] += plcWriteRequest.getNumberOfFields();
-        } else {
-            numberOfFields[0] = plcWriteRequest.getNumberOfFields();
-        }
-
-        if (numberOfFields[0] != payload.getItems().size()) {
-            throw new PlcProtocolException(
-                "The number of requested items doesn't match the number of returned items Request: " +
-                       numberOfFields[0] +
-                        " " +
-                       payload.getItems().size());
-        }
-        
-        Map<String, PlcResponseCode> values = new HashMap<>();
-        List<VarPayloadItem> payloadItems = payload.getItems();
-
-        short sFieldCount = 0;
-        short sPayloadCount = 0;
-        
-        for (String fieldName : plcWriteRequest.getFieldNames()) {
-            
-            VarPayloadItem payloadItem = payloadItems.get(sPayloadCount);
-            PlcResponseCode responseCode = decodeResponseCode(payloadItem.getReturnCode());            
-            
-            if (splitItems != null) {     
-             
-                if (splitItems.containsKey(sFieldCount)) {
-  
-                    int numberOfItems = splitItems.get(sFieldCount);                                        
-                    responseCode = decodeResponseCode(payloadItem.getReturnCode());
-                    for (short i=sPayloadCount; i<=(short)(sPayloadCount+numberOfItems); i++){
-                        if (payloadItem.getReturnCode() != DataTransportErrorCode.OK) {
-                            responseCode = decodeResponseCode(payloadItem.getReturnCode());
-                        };                        
-                        payloadItem = payloadItems.get(i);
-                    }
-                    sPayloadCount += (short) numberOfItems+1; 
-                } else {
-                    responseCode = decodeResponseCode(payloadItem.getReturnCode());
-                    sPayloadCount++;                   
-                }
-                
-            } else {
-                sPayloadCount++; 
-            }
-
-            values.put(fieldName, responseCode);
-
-            sFieldCount++; 
-        }
-        
-
-        return new DefaultPlcWriteResponse(plcWriteRequest, values);
-    }
-
-
-    private PlcResponse decodeSubscriptionResponse(S7ResponseMessage responseMessage, PlcRequestContainer requestContainer) throws PlcProtocolException {
-
-        InternalPlcSubscriptionRequest subsRequest = (InternalPlcSubscriptionRequest) requestContainer.getRequest(); 
-        //TODO: Try multiple ALARM_ACK in the same request and multiple EVENT_ID.
-        S7SubscriptionField event = (S7SubscriptionField) subsRequest.getFields().get(0);
-        
-        //TODO: Multiple parameters. Try with S7400. At this point if we have embedded more parameter will be lost.
-        CpuServicesResponseParameter parameter = (CpuServicesResponseParameter) responseMessage.getParameters().get(0);
-
-        List<S7Payload> payloads = responseMessage.getPayloads();
-        
-        Map<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> values = new HashMap<>();
-
-        //May be only one iteration?:
-        for (S7Payload payload:payloads){
-
-            if (payload instanceof AlarmMessagePayload) {
-                AlarmMessagePayload payloadItem = (AlarmMessagePayload) payload;   
-                switch(parameter.getSubFunctionGroup()){
-                    case MESSAGE_SERVICE:{
-                        List<SubscribedEventType> items = new ArrayList();
-                        PlcResponseCode responseCode = decodeResponseCode(((AlarmMessagePayload) payload).getReturnCode());
-
-                        if (responseCode == PlcResponseCode.OK) {
-                            subsRequest.getFields().forEach((field)->{
-                                S7SubscriptionField s7field = (S7SubscriptionField) field;
-                                items.add(s7field.getEventtype());
-                            });
-                        };    
-                        
-                        S7DiagnosticSubscriptionHandle handler = new S7DiagnosticSubscriptionHandle(
-                                                                        "MS",
-                                                                        responseMessage.getTpduReference(),
-                                                                        responseCode,
-                                                                        items);
-                            
-                        LinkedHashSet<String> fieldnames = subsRequest.getFieldNames();  
-                        
-                        fieldnames.forEach((fieldname)->{
-                            values.put(fieldname, new ImmutablePair(responseCode, handler)); 
-                        });
-                            
-                        }    
-                    break;
-                    case ALARM_ACK:{
-                        if (payloadItem.getLength() != 0) {
-                            List<Object> items = payloadItem.getMsg().getMsgItems();                            
-                            ArrayList<Integer> eventids = event.getAckalarms();
-                            int index = 0;
-                            for (Object item:items){
-                                // A ack response contains only the return code for every item.
-                                // Is direct response for the ALARM_ACK, don't pass to
-                                // push message handler.
-                                //subsBuilder2.addEventField("MyAck", "ACK:16#60000001,16#60000002,16#60000003");
-                                values.put("16#"+Integer.toHexString(eventids.get(index)), new ImmutablePair(decodeResponseCode((DataTransportErrorCode) item),null));                    
-                                index++;
-                            }    
-                        } else {
-                            values.put("ERROR", new ImmutablePair(PlcResponseCode.NOT_FOUND,null));                                                
-                        }
-                    }
-                    break;
-                    case ALARM_QUERY:{
-                        if (payloadItem.getMsg() == null) {
-                            return null;   
-                        } 
-
-                        if (payloadItem instanceof S7PushMessage){
-                            if (payloadItem.getMsg().getMsgItems().size() > 0){
-                                if (!alarmsqueue.offer((S7PushMessage) payload)){
-                                    logger.info("decodeSubscriptionResponse: Alarm queue buffer is full.");
-                                };
-                            }
-                            PlcResponseCode responseCode = decodeResponseCode(((AlarmMessagePayload) payload).getReturnCode());
-                            LinkedHashSet<String> fieldnames = subsRequest.getFieldNames();                                  
-                            fieldnames.forEach((fieldname)->{
-                                values.put(fieldname, new ImmutablePair(responseCode, null));                                    
-                            });                              
-                            
-                        } else {
-                            logger.debug("Check for ALARM_QUERY not attended: " + payloadItem);   
-                        }                    
-                    }
-                    break;
-                    default:;
-                } 
-            } else if (payload instanceof CpuCyclicServicesResponsePayload) {
-                              
-                    CpuCyclicServicesResponsePayload  cyclicPayloadItem = (CpuCyclicServicesResponsePayload) payload;
-                    //
-                    //
-                    if (cyclicPayloadItem.getItems().size() != 0) {
-                    
-                        List<AssociatedValueItem> valueitems = cyclicPayloadItem.getItems();
-                        Map<String,AssociatedValueItem> items = new LinkedHashMap();
-                        int i=0;
-                        if (parameter.getError().getCode() == 0x0000){                    
-                            for (String fieldname:subsRequest.getFieldNames()){
-                                items.put(fieldname, valueitems.get(i));
-                                S7CyclicServicesSubscriptionHandle handler = new S7CyclicServicesSubscriptionHandle(fieldname, 
-                                                                            parameter.getSequenceNumber(),
-                                                                            parameter.getError().getCode(),
-                                                                            valueitems.get(i));  
-                                values.put(fieldname, 
-                                        new ImmutablePair(decodeResponseCode(valueitems.get(i).getReturnCode()), 
-                                                handler));                                 
-                                i++;                        
-                            };
-                        };
-                    
-                    } else {
-                        logger.info("At least one wrong address was requested.");
-                        // Return quality code for alarm 
-                        for (String fieldname:subsRequest.getFieldNames()){
-                            values.put(fieldname, new ImmutablePair(PlcResponseCode.INVALID_ADDRESS, null));                    
-                        }
-                        
-                    } 
-                    
-                } else {
-                    logger.info("Payload not defined...");
-            } 
-        }
-        return new DefaultPlcSubscriptionResponse(subsRequest, values);
-    }
-    
-    
-    private PlcResponse decodeUnSubscriptionResponse(S7ResponseMessage responseMessage, PlcRequestContainer requestContainer) throws PlcProtocolException {
-        DefaultPlcUnsubscriptionRequest unSubsRequest = (DefaultPlcUnsubscriptionRequest) requestContainer.getRequest();
-        //TODO: Multiple parameters. Try with S7400. At this point if we have embedded more parameter will be lost.
-        CpuServicesResponseParameter parameter = (CpuServicesResponseParameter) responseMessage.getParameters().get(0);
-        InternalPlcUnsubscriptionRequest request = (InternalPlcUnsubscriptionRequest) requestContainer.getRequest();
-
-        return new DefaultPlcUnsubscriptionResponse(request);
-    }    
-    
-    private PlcResponseCode decodeResponseCode(DataTransportErrorCode dataTransportErrorCode) {
-        if (dataTransportErrorCode == null) {
-            return PlcResponseCode.INTERNAL_ERROR;
-        }
-        switch (dataTransportErrorCode) {
-            case OK:
-                return PlcResponseCode.OK;
-            case NOT_FOUND:
-                return PlcResponseCode.NOT_FOUND;
-            case INVALID_ADDRESS:
-                return PlcResponseCode.INVALID_ADDRESS;
-            case DATA_TYPE_NOT_SUPPORTED:
-                return PlcResponseCode.INVALID_DATATYPE;
-            case ACCESS_DENIED:
-                return PlcResponseCode.ACCESS_DENIED;
-            default:
-                return PlcResponseCode.INTERNAL_ERROR;
-        }
-    }
-
-    private static BigInteger readUnsignedLong(ByteBuf data) {
-        // as there is no unsigned long primitive, we have to switch to
-        // BigDecimal and manually convert the bytes to a BigDecimal.
-        // In order to be unsigned 4 bytes, we create an array of 5 bytes
-        // where the 5th byte is set to 0. The most significant bit being
-        // 0 we are guaranteed to interpret the input a positive value.
-        byte[] bytes = new byte[5];
-        // Set the first byte to 0
-        bytes[0] = 0;
-        // Read the next 4 bytes into the rest.
-        data.readBytes(bytes, 1, 4);
-        return new BigInteger(bytes);
-    }
-
-    private static BigInteger readSigned64BitInteger(ByteBuf data) {
-        byte[] bytes = new byte[8];
-        data.readBytes(bytes, 0, 8);
-        return new BigInteger(bytes);
-    }
-
-    private static BigInteger readUnsigned64BitInteger(ByteBuf data) {
-        byte[] bytes = new byte[9];
-        // Set the first byte to 0
-        bytes[0] = 0;
-        // Read the next 8 bytes into the rest.
-        data.readBytes(bytes, 1, 8);
-        return new BigInteger(bytes);
-    }
-
-    //TODO: millisoconds
-    LocalDateTime readDateAndTime(ByteBuf data) {
-        return S7Helper.S7DateTimeToLocalDateTime(data);
-    }
-
-    Duration readS5TimeToDuration(ByteBuf data){
-        return S7Helper.S5TimeToDuration(data.readShort());        
-    };
-    
-    Duration readS7TimeToDuration(ByteBuf data){
-        return S7Helper.S7TimeToDuration(data.readInt());        
-    };
-    
-    LocalTime readTimeOfDay(ByteBuf data) {
-        return S7Helper.S7TodToLocalTime(data.readInt());
-    }
-
-    LocalDate readDate(ByteBuf data) {
-        return S7Helper.S7DateToLocalDate(data.readShort());
-    }
-
-    /**
-     * converts incoming byte to an integer regarding used BCD format
-     * @param incomingByte
-     * @return converted BCD number
-     */
-    private static int convertByteToBcd(byte incomingByte) {
-        int dec = (incomingByte >> 4) * 10;
-        return dec + (incomingByte & 0x0f);
-    }
-    
-
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.PooledByteBufAllocator;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.AttributeKey;
+import java.io.IOException;
+import java.lang.reflect.Array;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.*;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
+import java.util.logging.Level;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.exceptions.*;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcRequest;
+import org.apache.plc4x.java.api.messages.PlcResponse;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.PlcMessageToMessageCodec;
+import org.apache.plc4x.java.base.events.ConnectedEvent;
+import org.apache.plc4x.java.base.messages.*;
+import org.apache.plc4x.java.base.messages.items.*;
+import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
+import org.apache.plc4x.java.base.model.SubscriptionPlcField;
+import org.apache.plc4x.java.s7.model.S7Field;
+import org.apache.plc4x.java.s7.model.S7SslField;
+import org.apache.plc4x.java.s7.model.S7SubscriptionField;
+import org.apache.plc4x.java.s7.netty.events.S7ConnectedEvent;
+import org.apache.plc4x.java.s7.netty.model.messages.S7Message;
+import org.apache.plc4x.java.s7.netty.model.messages.S7PushMessage;
+import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
+import org.apache.plc4x.java.s7.netty.model.messages.S7ResponseMessage;
+import org.apache.plc4x.java.s7.netty.model.params.CpuCyclicServicesRequestParameter;
+import org.apache.plc4x.java.s7.netty.model.params.CpuServicesParameter;
+import org.apache.plc4x.java.s7.netty.model.params.CpuServicesRequestParameter;
+import org.apache.plc4x.java.s7.netty.model.params.CpuServicesResponseParameter;
+import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
+import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
+import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.AlarmMessagePayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuCyclicServicesRequestPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuCyclicServicesResponsePayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuMessageSubscriptionServicePayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuServicesPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
+import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.AlarmMessageItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.MessageObjectItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.S7AnyVarPayloadItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
+import org.apache.plc4x.java.s7.netty.model.types.*;
+import org.apache.plc4x.java.s7.protocol.S7ByteReadResponse;
+import org.apache.plc4x.java.s7.protocol.S7CyclicServicesSubscriptionHandle;
+import org.apache.plc4x.java.s7.protocol.S7DiagnosticSubscriptionHandle;
+import org.apache.plc4x.java.s7.utils.S7Helper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This layer transforms between {@link PlcRequestContainer}s {@link S7Message}s.
+ * And stores all "in-flight" requests in an internal structure ({@link Plc4XS7Protocol#requests}).
+ * <p>
+ * While sending a request, a {@link S7RequestMessage} is generated and send downstream (to the {@link S7Protocol}.
+ * <p>
+ * When a {@link S7ResponseMessage} is received it takes the existing request container from its Map and finishes
+ * the {@link PlcRequestContainer}s future with the {@link PlcResponse}.
+ */
+public class Plc4XS7Protocol extends PlcMessageToMessageCodec<S7Message, PlcRequestContainer> {
+    private static final Logger logger = LoggerFactory.getLogger( Plc4XS7Protocol.class );
+
+    public static final AtomicInteger tpduGenerator = new AtomicInteger(10);
+    private final AttributeKey<AtomicInteger> tpduGeneratorKey = AttributeKey.valueOf("tpduGeneratorKey");
+
+    private Map<Short, PlcRequestContainer> requests;
+    
+    /* 
+     * Each layer of Netty must do its work, it sends the Requests and must 
+     * verify the answers.
+     * Special case of the array bits, I need to know if additional messages 
+     * were created.
+     * Key:Tpdu, Left:Item row, Rigth: Num of Items created-1
+    */
+    private final  Map<Short, Map<Short, Integer>> requestBitArray;
+    
+    private final BlockingQueue<S7PushMessage> alarmsqueue;
+
+    public Plc4XS7Protocol() {
+        this.requests = new HashMap<>();
+        this.requestBitArray = new HashMap<>();      
+        this.alarmsqueue = null;
+    }
+    /*
+    * @param s7Type
+    * 
+    */
+    public Plc4XS7Protocol(BlockingQueue<S7PushMessage> alarmsqueue) {
+        this.requests = new HashMap<>();
+        this.requestBitArray = new HashMap<>();
+        //We need check the device here
+        this.alarmsqueue = alarmsqueue;
+    }
+        
+    /**
+     * If this protocol layer catches an {@link S7ConnectedEvent} from the protocol layer beneath,
+     * the connection establishment is finished.
+     *
+     * @param ctx the current protocol layers context
+     * @param evt the event
+     * @throws Exception throws an exception if something goes wrong internally
+     */
+    @Override
+    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+        ctx.channel().attr(tpduGeneratorKey).set(tpduGenerator);
+        if (evt instanceof S7ConnectedEvent) {
+            ctx.channel().pipeline().fireUserEventTriggered(new ConnectedEvent());
+        } else {
+            super.userEventTriggered(ctx, evt);
+        }
+    }
+
+    /**
+     * When receiving an error inside the pipeline, we have to find out which {@link PlcRequestContainer}
+     * correlates needs to be notified about the problem. If a container is found, we can relay the
+     * exception to that by calling completeExceptionally and passing in the exception.
+     *
+     * @param ctx   the current protocol layers context
+     * @param cause the exception that was caught
+     * @throws Exception throws an exception if something goes wrong internally
+     */
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+        if (cause instanceof PlcProtocolPayloadTooBigException) {
+            PlcProtocolPayloadTooBigException pptbe = (PlcProtocolPayloadTooBigException) cause;
+            if (pptbe.getPayload() instanceof S7RequestMessage) {
+                S7RequestMessage request = (S7RequestMessage) pptbe.getPayload();
+                if (request.getParent() instanceof PlcRequestContainer) {
+                    PlcRequestContainer requestContainer = (PlcRequestContainer) request.getParent();
+
+                    // Remove the current request from the unconfirmed requests list.
+                    requests.remove(request.getTpduReference());
+
+                    requestContainer.getResponseFuture().completeExceptionally(cause);
+                }
+            }
+        } else if ((cause instanceof IOException) && (cause.getMessage().contains("Connection reset by peer") ||
+            cause.getMessage().contains("Operation timed out"))) {
+            String reason = cause.getMessage().contains("Connection reset by peer") ?
+                "Connection terminated unexpectedly" : "Remote host not responding";
+            if (!requests.isEmpty()) {
+                // If the connection is hung up, all still pending requests can be closed.
+                for (PlcRequestContainer requestContainer : requests.values()) {
+                    requestContainer.getResponseFuture().completeExceptionally(new PlcIoException(reason));
+                }
+                // Clear the list
+                requests.clear();
+            }
+        } else {
+            super.exceptionCaught(ctx, cause);
+        }
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Encoding
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    protected void encode(ChannelHandlerContext ctx, PlcRequestContainer msg, List<Object> out) throws PlcException {
+        PlcRequest request = msg.getRequest();
+
+        if (request instanceof PlcReadRequest) {
+            encodeReadRequest(msg, out);
+        } else if (request instanceof PlcWriteRequest) {
+            encodeWriteRequest(msg, out);
+        } else if (request instanceof PlcSubscriptionRequest) {
+            encodeSubcriptionRequest(msg, out);
+        } else if (request instanceof PlcUnsubscriptionRequest) {
+            encodeUnSubcriptionRequest(msg, out);
+        }
+    }
+
+    //TODO: Todo el proceso de suscripcion a eventos, suscripcion de variable y reconocimientos de alarmas
+    // se ejecuta aqui. Se debe separar en funciones bien definidas.
+    // Subscripcion a Eventos
+    // Reconocimiento de alarmas
+    // Consulta de alarmas.
+    // Subscripcion a eventos ciclicos
+    // 
+    private void encodeSubcriptionRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
+        //Chequear el campo prueba que ya incluyte la informaciĆ³n del tipo
+                
+        PlcSubscriptionRequest subsRequest = (PlcSubscriptionRequest)  msg.getRequest();        
+
+        if ( subsRequest.getFields().get(0) instanceof S7SubscriptionField){  
+
+            S7SubscriptionField event = (S7SubscriptionField) subsRequest.getFields().get(0);
+
+            switch(event.getFieldtype()){
+                case EVENT_SUBSCRIPTION:;
+                    encodeEventSubcriptionRequest(msg, out);
+                    break;
+                case EVENT_UNSUBSCRIPTION:;
+                    encodeEventUnSubcriptionRequest(msg, out);
+                    break;
+                case ALARM_ACK:;
+                    encodeAlarmAckRequest(msg, out);
+                    break;
+                case ALARM_QUERY:;
+                    encodeAlarmQueryRequest(msg, out);
+                    break;
+                case CYCLIC_SUBSCRIPTION:;
+                    encodeCycledSubscriptionRequest(msg, out);
+                    break;
+                case CYCLIC_UNSUBSCRIPTION:;
+                    encodeCycledUnSubscriptionRequest(msg, out);
+                    break;                     
+                default:;                     
+             };
+
+        };            
+    }
+    
+    //TODO: Suppport for ALARM_8
+    private void encodeEventSubcriptionRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
+        byte subsevent = 0;
+        List<S7Parameter> parameterItems = new LinkedList<>();
+        List<S7Payload> payloadItems = new LinkedList<>();
+        AlarmType alarmType = AlarmType.ALARM_S_INITIATE;
+         
+        PlcSubscriptionRequest subsRequest = (PlcSubscriptionRequest)  msg.getRequest();
+        
+        for (String fieldName : subsRequest.getFieldNames()) {                        
+            if ( subsRequest.getField(fieldName) instanceof S7SubscriptionField){
+                 S7SubscriptionField event = (S7SubscriptionField) subsRequest.getField(fieldName);
+                 subsevent = (byte) (subsevent | event.getEventtype().getCode());
+                 if (event.getEventtype() == SubscribedEventType.ALM_8) {
+                    alarmType = AlarmType.ALARM_INITIATE;
+                 }
+            }
+        }
+        
+        CpuServicesParameter cpuservice = new CpuServicesRequestParameter(CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
+            CpuServicesParameterSubFunctionGroup.MESSAGE_SERVICE, (byte) 0x00);
+        
+        parameterItems.add(cpuservice);
+        
+       
+        S7Payload Data = new CpuMessageSubscriptionServicePayload(DataTransportErrorCode.OK,
+                                DataTransportSize.OCTET_STRING,
+                                subsevent,
+                                new String("HmiRtm  "),
+                                alarmType);
+  
+        
+        payloadItems.add(Data);
+      
+
+        
+        S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.USER_DATA,
+            (short) tpduGenerator.getAndIncrement(), 
+            parameterItems,
+            payloadItems, 
+            msg);
+
+        requests.put(s7ReadRequest.getTpduReference(), msg);
+
+        out.add(s7ReadRequest);         
+    }    
+    
+ 
+    //TODO: Check for ALARM_D and ALARM_8
+    private void encodeAlarmAckRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
+        byte subsevent = 0;
+        List<S7Parameter> parameterItems = new LinkedList<>();
+        List<S7Payload> payloadItems = new LinkedList<>();
+         
+        PlcSubscriptionRequest subsRequest = (PlcSubscriptionRequest)  msg.getRequest();
+        S7SubscriptionField event = (S7SubscriptionField) subsRequest.getFields().get(0);
+
+        
+        CpuServicesParameter cpuservice = new CpuServicesRequestParameter(CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
+            CpuServicesParameterSubFunctionGroup.ALARM_ACK, (byte) 0x00);
+
+        parameterItems.add(cpuservice);
+        
+        
+        ArrayList<Object> items = new ArrayList<>();
+        for(Integer eventid:event.getAckalarms()){
+            items.add(new MessageObjectItem((byte) 0x12,
+                            (byte) 0x08,
+                            VariableAddressingMode.ALARM_ACK, 
+                            (byte) 0x00,
+                            eventid,
+                            (byte) 0x01,
+                            (byte) 0x01)); //ONLY for Alarm_SQ
+        }
+
+        AlarmMessageItem messageitem = new  AlarmMessageItem((byte) 0x09,
+                                                (byte) items.size(),
+                                                items)     ;
+        
+        S7Payload Data = new AlarmMessagePayload(DataTransportErrorCode.OK,
+                                DataTransportSize.OCTET_STRING,
+                                (2+items.size()*10),
+                                messageitem);
+        payloadItems.add(Data);
+
+        
+        S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.USER_DATA,
+            (short) tpduGenerator.getAndIncrement(), 
+            parameterItems,
+            payloadItems, 
+            msg);
+
+        requests.put(s7ReadRequest.getTpduReference(), msg);
+
+        out.add(s7ReadRequest);         
+    }   
+    
+    //TODO: Check for ALARM_D and ALARM_8
+    private void encodeAlarmQueryRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
+
+        byte subsevent = 0;
+        List<S7Parameter> parameterItems = new LinkedList<>();
+        List<S7Payload> payloadItems = new LinkedList<>();
+         
+        PlcSubscriptionRequest subsRequest = (PlcSubscriptionRequest)  msg.getRequest();
+        S7SubscriptionField event = (S7SubscriptionField) subsRequest.getFields().get(0);
+        
+        CpuServicesParameter cpuservice = new CpuServicesRequestParameter(CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
+            CpuServicesParameterSubFunctionGroup.ALARM_QUERY, (byte) 0x00);
+
+        parameterItems.add(cpuservice);
+        
+        ArrayList<Object> items = new ArrayList<>();
+        
+        //TODO: Multiple AlarmQueryType from the same request.
+        items.add(new MessageObjectItem((byte) 0x12,
+                        (byte) 0x08,
+                        VariableAddressingMode.ALARM_QUERYREQ, 
+                        QueryType.BYALARMTYPE,
+                        event.getAlarmquerytype())); //ONLY for Alarm_S
+
+
+        AlarmMessageItem messageitem = new  AlarmMessageItem((byte) 0x00,
+                                                (byte) items.size(),
+                                                items)     ;
+        
+        S7Payload Data = new AlarmMessagePayload(DataTransportErrorCode.OK,
+                                DataTransportSize.OCTET_STRING,
+                                (2+items.size()*10),
+                                messageitem);
+        payloadItems.add(Data);
+
+
+        S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.USER_DATA,
+            (short) tpduGenerator.getAndIncrement(), 
+            parameterItems,
+            payloadItems, 
+            msg);
+
+        requests.put(s7ReadRequest.getTpduReference(), msg);
+
+        out.add(s7ReadRequest);         
+    }    
+    
+    private void encodeCycledSubscriptionRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
+        List<S7Parameter> parameterItems = new LinkedList<>();
+        List<S7Payload> payloads = new LinkedList<>();        
+        DefaultPlcSubscriptionRequest prueba = (DefaultPlcSubscriptionRequest)  msg.getRequest();
+        List<SubscriptionPlcField> fields = prueba.getSubscriptionFields();
+        Optional<Duration> optionalduration = prueba.getSubscriptionFields().get(0).getDuration();
+        Duration duration  = optionalduration.get();
+        
+        List<S7AnyVarPayloadItem> payloadItems = new LinkedList<>();
+        
+        fields.forEach((action) ->{
+            PlcField field = action.getPlcField();
+            if (!(field instanceof S7SubscriptionField)) {
+                logger.info("The field should have been of type S7SubscriptionField");
+                return;
+            }  
+            S7SubscriptionField subsS7Field = (S7SubscriptionField) field; 
+            S7Field s7Field = subsS7Field.getS7field();
+            S7AnyVarPayloadItem varPayloadItem = new S7AnyVarPayloadItem(
+                SpecificationType.VARIABLE_SPECIFICATION, s7Field.getMemoryArea(),
+                s7Field.getDataType(),
+                s7Field.getNumElements(), s7Field.getBlockNumber(), s7Field.getByteOffset(), (byte) s7Field.getBitOffset());
+            payloadItems.add(varPayloadItem);            
+        });
+        
+        //TODO: Play with Time factor. Actually only 1..9
+        CpuCyclicServiceTimeBaseType timeBase = null;
+        byte timefactor = 0x00;
+        if (duration.getSeconds() == 0) {
+            timeBase = CpuCyclicServiceTimeBaseType.TB_100_MS;
+            timefactor = (byte) (duration.toMillis() / 100);
+        } else if (duration.getSeconds() <= 9) {
+            timeBase = CpuCyclicServiceTimeBaseType.TB_1_SEC;
+            timefactor = (byte) duration.getSeconds();            
+        } else if (duration.getSeconds() <= 90) {
+            timeBase = CpuCyclicServiceTimeBaseType.TB_10_SEC;
+            timefactor = (byte) (duration.getSeconds() / 10);  
+        }
+        
+        CpuCyclicServicesRequestPayload payload = new CpuCyclicServicesRequestPayload(DataTransportErrorCode.OK,
+                                                        DataTransportSize.OCTET_STRING,
+                                                        (4+payloadItems.size()*12),
+                                                        payloadItems.size(),
+                                                        timeBase,
+                                                        timefactor,
+                                                        payloadItems);
+                                                        
+        payloads.add(payload);
+        
+        CpuCyclicServicesRequestParameter parameter = new CpuCyclicServicesRequestParameter(CpuUserDataMethodType.REQUEST,
+                                                            CpuServicesParameterFunctionGroup.CYCLIC_SERVICES,
+                                                            CpuCyclicServicesParameterSubFunctionGroupType.CYCLIC_TRANSFER,
+                                                            (byte) 0x00);
+        parameterItems.add(parameter);
+        
+
+        
+        // Assemble the request.
+        S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.USER_DATA,
+            (short) tpduGenerator.getAndIncrement(), parameterItems,
+            payloads, msg);
+
+        requests.put(s7ReadRequest.getTpduReference(), msg);
+
+        out.add(s7ReadRequest);        
+    }
+    
+    private void encodeUnSubcriptionRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
+        //Chequear el campo prueba que ya incluyte la informaciĆ³n del tipo
+        InternalPlcUnsubscriptionRequest subsRequest = (InternalPlcUnsubscriptionRequest)  msg.getRequest();  
+        Collection<? extends InternalPlcSubscriptionHandle> handles = subsRequest.getInternalPlcSubscriptionHandles();
+        handles.forEach((handle)->{
+            if (handle instanceof S7CyclicServicesSubscriptionHandle) {
+                try {
+                    encodeCycledUnSubscriptionRequest(msg,out);
+                } catch (PlcException ex) {
+                    logger.info(ex.toString());
+                }
+            }
+        });
+
+    } 
+    
+    private void encodeEventUnSubcriptionRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
+        byte subsevent = 0;
+        List<S7Parameter> parameterItems = new LinkedList<>();
+        List<S7Payload> payloadItems = new LinkedList<>();
+        AlarmType alarmType = AlarmType.ALARM_S_INITIATE;
+         
+        PlcSubscriptionRequest subsRequest = (PlcSubscriptionRequest)  msg.getRequest();
+        
+        for (String fieldName : subsRequest.getFieldNames()) {                        
+            if ( subsRequest.getField(fieldName) instanceof S7SubscriptionField){
+                 S7SubscriptionField event = (S7SubscriptionField) subsRequest.getField(fieldName);
+                 subsevent = (byte) (subsevent | event.getEventtype().getCode());
+                 if (event.getEventtype() == SubscribedEventType.ALM_8) {
+                    alarmType = AlarmType.ALARM_INITIATE;
+                 }                 
+            }
+        }
+        
+        CpuServicesParameter cpuservice = new CpuServicesRequestParameter(CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
+            CpuServicesParameterSubFunctionGroup.MESSAGE_SERVICE, (byte) 0x00);
+        
+        parameterItems.add(cpuservice);
+        
+       
+        S7Payload Data = new CpuMessageSubscriptionServicePayload(DataTransportErrorCode.OK,
+                                DataTransportSize.OCTET_STRING,
+                                subsevent,
+                                new String("HmiRtm  "),
+                                alarmType);
+        
+        payloadItems.add(Data);
+
+        
+        S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.USER_DATA,
+            (short) tpduGenerator.getAndIncrement(), 
+            parameterItems,
+            payloadItems, 
+            msg);
+
+        requests.put(s7ReadRequest.getTpduReference(), msg);
+
+        out.add(s7ReadRequest);         
+    }  
+       
+    private void encodeCycledUnSubscriptionRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
+ 
+        List<S7Parameter> parameterItems = new LinkedList<>();
+        List<S7Payload> payloads = new LinkedList<>();
+        byte jobId = 0x00;
+        
+        DefaultPlcUnsubscriptionRequest prueba = (DefaultPlcUnsubscriptionRequest)  msg.getRequest();
+   
+        Collection<? extends InternalPlcSubscriptionHandle> handles = prueba.getInternalPlcSubscriptionHandles();
+ 
+        for(InternalPlcSubscriptionHandle ihandle:handles){
+            S7CyclicServicesSubscriptionHandle s7handle = (S7CyclicServicesSubscriptionHandle) ihandle;
+            jobId = s7handle.getJobId();
+            break;
+        } 
+ 
+
+        CpuCyclicServicesRequestPayload payload = new CpuCyclicServicesRequestPayload(DataTransportErrorCode.OK,
+                                                        DataTransportSize.OCTET_STRING,
+                                                        (byte) 0x02,
+                                                        (byte) 0x05,
+                                                        jobId);
+                                                        
+        payloads.add(payload);
+
+        CpuCyclicServicesRequestParameter parameter = new CpuCyclicServicesRequestParameter(CpuUserDataMethodType.REQUEST,
+                                                            CpuServicesParameterFunctionGroup.CYCLIC_SERVICES,
+                                                            CpuCyclicServicesParameterSubFunctionGroupType.CYCLIC_UNSUBSCRIBE,
+                                                            (byte) 0x00);
+        parameterItems.add(parameter);
+        
+
+        
+        // Assemble the request.
+        S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.USER_DATA,
+            (short) tpduGenerator.getAndIncrement(), parameterItems,
+            payloads, msg);
+
+        requests.put(s7ReadRequest.getTpduReference(), msg);
+
+        out.add(s7ReadRequest);
+       
+    }
+        
+    private void encodeReadRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
+
+        List<VarParameterItem> parameterItems = new LinkedList<>();
+
+        PlcReadRequest readRequest = (PlcReadRequest) msg.getRequest();
+        
+        Short itemRow = 0;
+        Short tpdu = (short) tpduGenerator.getAndIncrement();
+        
+        for (String fieldName : readRequest.getFieldNames()) {
+            PlcField field = readRequest.getField(fieldName);
+            
+            if ((field instanceof S7SslField)) {
+                S7SslField szlfield = (S7SslField) field;
+                encodeSslReadRequest(msg,szlfield,out);
+                return;
+            } else {
+                if (!(field instanceof S7Field)) {
+                    throw new PlcProtocolException("The field should have been of type S7Field");
+                }
+
+                S7Field s7Field = (S7Field) field;
+                if(!(readRequest instanceof DefaultPlcReadRequest)) {
+                    throw new PlcException("The writeRequest should have been of type DefaultPlcWriteRequest");
+                }
+                
+                if (s7Field.getDataType() == TransportSize.BOOL){
+                    encodeWriteRequestBitFieldAndArray( tpdu,
+                            itemRow,
+                            null,
+                            s7Field, 
+                            parameterItems, 
+                            Collections.EMPTY_LIST);                                         
+                } else {
+                
+                    VarParameterItem varParameterItem = new S7AnyVarParameterItem(
+                        SpecificationType.VARIABLE_SPECIFICATION, s7Field.getMemoryArea(),
+                        s7Field.getDataType(),
+                        s7Field.getNumElements(), s7Field.getBlockNumber(), s7Field.getByteOffset(), (byte) s7Field.getBitOffset());
+                    parameterItems.add(varParameterItem);
+                }
+                
+
+            }
+            itemRow++;
+        }
+        
+        VarParameter readVarParameter = new VarParameter(ParameterType.READ_VAR, parameterItems);
+
+        // Assemble the request.
+        S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.JOB,
+            tpdu, Collections.singletonList(readVarParameter),
+            Collections.emptyList(), msg);
+
+        requests.put(s7ReadRequest.getTpduReference(), msg);
+
+        out.add(s7ReadRequest);
+    }
+
+    private void encodeSslReadRequest(PlcRequestContainer msg, S7SslField sslfield, List<Object> out) throws PlcException {
+        
+        S7RequestMessage szlRequestMessage = new S7RequestMessage(MessageType.USER_DATA,
+                (short) tpduGenerator.getAndIncrement(),
+            Collections.singletonList(new CpuServicesRequestParameter(
+                CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
+                CpuServicesParameterSubFunctionGroup.READ_SSL, (byte) 0)),
+            Collections.singletonList(new CpuServicesPayload(DataTransportErrorCode.OK, SslId.valueOf((short) (sslfield.getSslId() & 0x01FF)),
+                (short) sslfield.getIndex())), null); 
+        
+        requests.put(szlRequestMessage.getTpduReference(), msg);
+
+        out.add(szlRequestMessage);        
+    }    
+    
+    // TODO: 
+    private void encodeWriteRequest(PlcRequestContainer msg, List<Object> out) throws PlcException {
+        List<VarParameterItem> parameterItems = new LinkedList<>();
+        List<VarPayloadItem> payloadItems = new LinkedList<>();
+
+        PlcWriteRequest writeRequest = (PlcWriteRequest) msg.getRequest();
+        
+        Short itemRow = 0;
+        Short tpdu = (short) tpduGenerator.getAndIncrement();
+        for (String fieldName : writeRequest.getFieldNames()) {
+            PlcField field = writeRequest.getField(fieldName);
+            if (!(field instanceof S7Field)) {
+                throw new PlcException("The field should have been of type S7Field");
+            }
+            S7Field s7Field = (S7Field) field;
+            if(!(writeRequest instanceof DefaultPlcWriteRequest)) {
+                throw new PlcException("The writeRequest should have been of type DefaultPlcWriteRequest");
+            }
+            BaseDefaultFieldItem fieldItem = ((DefaultPlcWriteRequest) writeRequest).getFieldItem(fieldName);
+
+            // The number of elements provided in the request must match the number defined in the field, or
+            // bad things are going to happen.
+            // An exception is STRINGS, as they are implemented as byte arrays
+            // TODO: Calculate the number of correct elements for a "STRING", 
+            //       since it will be written to the PLC as a string of "CHAR" elements.
+            if (s7Field.getDataType() != TransportSize.STRING &&
+                writeRequest.getNumberOfValues(fieldName) != s7Field.getNumElements()) {
+                throw new PlcException("The number of values provided doesn't match the number specified by the field.");
+            }
+            
+            //TODO: Bit Arrays: One item request for every bit
+            
+            if (s7Field.getDataType() == TransportSize.BOOL) {
+                
+                encodeWriteRequestBitFieldAndArray( tpdu,
+                        itemRow,
+                        fieldItem,
+                        s7Field, 
+                        parameterItems, 
+                        payloadItems);            
+                
+            } else {
+
+                VarParameterItem varParameterItem = new S7AnyVarParameterItem(
+                    SpecificationType.VARIABLE_SPECIFICATION, s7Field.getMemoryArea(),
+                    s7Field.getDataType(),
+                    (s7Field.getDataType() == TransportSize.STRING)?fieldItem.getString(0).length()+2:s7Field.getNumElements(), 
+                    s7Field.getBlockNumber(), 
+                    s7Field.getByteOffset(),
+                    (byte) s7Field.getBitOffset());
+
+                parameterItems.add(varParameterItem);
+
+                DataTransportSize dataTransportSize = s7Field.getDataType().getDataTransportSize();
+
+                // TODO: Checkout if the payload items are sort of a flatMap of all request items.
+                byte[] byteData = null;
+                switch(s7Field.getDataType()) {
+                    // -----------------------------------------
+                    // Bit
+                    // -----------------------------------------
+                    case BOOL:
+                        //byteData = encodeWriteRequestBitField(fieldItem);
+                        break;
+                    // -----------------------------------------
+                    // Signed integer values
+                    // -----------------------------------------
+                    case BYTE:
+                    case SINT:
+                    case CHAR:  // 1 byte
+                        byteData = encodeWriteRequestByteField(fieldItem, true);
+                        break;                
+                    case WORD:
+                    case INT:
+                    case WCHAR:  // 2 byte (16 bit)
+                        byteData = encodeWriteRequestShortField(fieldItem, true);
+                        break;
+                    case DWORD:
+                    case DINT:  // 4 byte (32 bit)
+                        byteData = encodeWriteRequestIntegerField(fieldItem, true);
+                        break;
+                    case LWORD:
+                    case LINT:  // 8 byte (64 bit)
+                        byteData = encodeWriteRequestLongField(fieldItem, true);
+                        break;
+                    // -----------------------------------------
+                    // Unsigned integer values
+                    // -----------------------------------------
+                    // 8 bit:
+                    case USINT:
+                        byteData = encodeWriteRequestByteField(fieldItem, false);
+                        break;
+                    // 16 bit:
+                    case UINT:
+                        byteData = encodeWriteRequestShortField(fieldItem, false);
+                        break;
+                    // 32 bit:
+                    case UDINT:
+                        byteData = encodeWriteRequestIntegerField(fieldItem, false);
+                        break;
+                    // 64 bit:
+                    case ULINT:
+                        byteData = encodeWriteRequestLongField(fieldItem, false);
+                        break;
+                    // -----------------------------------------
+                    // Floating point values
+                    // -----------------------------------------
+                    case REAL:
+                        byteData = encodeWriteRequestFloatField(fieldItem);
+                        break;
+                    case LREAL:
+                        byteData = encodeWriteRequestDoubleField(fieldItem);
+                        break;
+                    // -----------------------------------------
+                    // Characters & Strings
+                    // -----------------------------------------
+                    case STRING:
+                        byteData = encodeWriteRequestStringField(fieldItem, false);
+                        break;
+                    case WSTRING:
+                        byteData = encodeWriteRequestStringField(fieldItem, true);
+                        break;
+                    // -----------------------------------------
+                    // Date & Time
+                    // -----------------------------------------
+                    case S5TIME:
+                        byteData = encodeWriteRequestS5TimeField(fieldItem, false);
+                        break;
+                    case TIME:  // 4 byte (32 bit)
+                        byteData = encodeWriteRequestTimeField(fieldItem, false);
+                        break;
+                    case TOD:
+                    case TIME_OF_DAY:
+                        byteData = encodeWriteRequestTodField(fieldItem, true);
+                        break;
+                    case DATE:  // 2 byte (16 bit)
+                        byteData = encodeWriteRequestDateField(fieldItem, true);
+                        break; 
+                    case DT:                        
+                    case DATE_AND_TIME:  // 8 byte (64 bit)
+                        byteData = encodeWriteRequestDateTimeField(fieldItem, true);
+                        break;                    
+                    default:
+                        throw new PlcProtocolException("Unsupported type.. " + s7Field.getDataType());
+                }
+
+                VarPayloadItem varPayloadItem = new VarPayloadItem(
+                DataTransportErrorCode.RESERVED, dataTransportSize, byteData);
+
+                payloadItems.add(varPayloadItem);
+            }
+            itemRow++;
+        };
+        
+        VarParameter writeVarParameter = new VarParameter(ParameterType.WRITE_VAR, parameterItems);
+        VarPayload writeVarPayload = new VarPayload(ParameterType.WRITE_VAR, payloadItems);
+
+        // Assemble the request.
+        S7RequestMessage s7WriteRequest = new S7RequestMessage(MessageType.JOB,
+            tpdu, Collections.singletonList(writeVarParameter),
+            Collections.singletonList(writeVarPayload), msg);
+
+        requests.put(s7WriteRequest.getTpduReference(), msg);
+
+        out.add(s7WriteRequest);
+    }
+    
+    
+    void encodeWriteRequestBitFieldAndArray(Short tpdu,
+            Short itemRow,
+            BaseDefaultFieldItem fieldItem,
+            S7Field s7Field, 
+            List<VarParameterItem> parameterItems, 
+            List<VarPayloadItem> payloadItems){
+        
+        int curParameterByteOffset = s7Field.getByteOffset();
+        byte curParameterBitOffset = (byte) s7Field.getBitOffset();
+        byte curPayloadBitOffset = 0; 
+        
+        //Only BITS arrays
+        if (s7Field.getNumElements() > 1) {
+            requestBitArray.computeIfAbsent(tpdu, 
+                    k->new HashMap()).put(itemRow,s7Field.getNumElements()-1);
+        }
+
+        for (int i = 0; i < s7Field.getNumElements(); i++) {
+
+            VarParameterItem varParameterItem = new S7AnyVarParameterItem(
+                SpecificationType.VARIABLE_SPECIFICATION, s7Field.getMemoryArea(),
+                s7Field.getDataType(),
+                (short) 1, 
+                s7Field.getBlockNumber(), 
+                curParameterByteOffset,
+                curParameterBitOffset);
+
+            // Create a one-byte byte array and set it to 0x01, if the corresponding bit
+            // was 1 else set it to 0x00.
+            byte[] elementData = new byte[1];
+                                   
+            parameterItems.add(varParameterItem);
+            
+            if (!(payloadItems == Collections.EMPTY_LIST)){
+                elementData[0] = (byte) (fieldItem.getBoolean(i)?0x01:0x00);                  
+                VarPayloadItem itemPayload = new VarPayloadItem(
+                    DataTransportErrorCode.RESERVED,
+                    s7Field.getDataType().getDataTransportSize(),
+                        elementData);            
+                payloadItems.add(itemPayload);
+            }
+            
+            // Calculate the new memory and bit offset.
+            curParameterBitOffset++;
+            if ((i > 0) && ((curParameterBitOffset % 8) == 0)) {
+                curParameterByteOffset++;
+                curParameterBitOffset = 0;
+            }
+            curPayloadBitOffset++;
+            if ((i > 0) && ((curPayloadBitOffset % 8) == 0)) {
+                curPayloadBitOffset = 0;
+            }                                    
+        }            
+    }
+    
+
+    byte[] encodeWriteRequestBitField(BaseDefaultFieldItem fieldItem) {
+        int numBytes = fieldItem.getNumberOfValues() >> 3 / 8;
+        byte[] byteData = new byte[numBytes];
+        BitSet bitSet = new BitSet();
+        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
+            bitSet.set(i, fieldItem.getBoolean(i));
+        }
+        byte[] src = bitSet.toByteArray();
+        System.arraycopy(src, 0, byteData, 0, Math.min(src.length, numBytes));
+        return byteData;
+    }
+
+    byte[] encodeWriteRequestByteField(BaseDefaultFieldItem fieldItem, boolean signed) {
+        int numBytes = fieldItem.getNumberOfValues();
+        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
+        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
+            if(signed) {
+                buffer.put(fieldItem.getByte(i));
+            } else {
+                buffer.put((byte) (short) fieldItem.getShort(i));
+            }
+        }
+        return buffer.array();
+    }
+
+    byte[] encodeWriteRequestShortField(BaseDefaultFieldItem fieldItem, boolean signed) {
+        int numBytes = fieldItem.getNumberOfValues() * 2;
+        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
+        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
+            if(signed) {
+                buffer.putShort(fieldItem.getShort(i));
+            } else {
+                buffer.putShort((short) (int) fieldItem.getInteger(i));
+            }
+        }
+        return buffer.array();
+    }
+
+    byte[] encodeWriteRequestIntegerField(BaseDefaultFieldItem fieldItem, boolean signed) {
+        int numBytes = fieldItem.getNumberOfValues() * 4;
+        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
+        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
+            if(signed) {
+                buffer.putInt(fieldItem.getInteger(i));
+            } else {
+                buffer.putInt((int) (long) fieldItem.getLong(i));
+            }
+        }
+        return buffer.array();
+    }
+
+    byte[] encodeWriteRequestLongField(BaseDefaultFieldItem fieldItem, boolean signed) {
+        int numBytes = fieldItem.getNumberOfValues() * 8;
+        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
+        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
+            if(signed) {
+                buffer.putLong(fieldItem.getLong(i));
+            } else {
+                // TODO: Implement this ...
+            }
+        }
+        return buffer.array();
+    }
+
+    byte[] encodeWriteRequestFloatField(BaseDefaultFieldItem fieldItem) {
+        int numBytes = fieldItem.getNumberOfValues() * 4;
+        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
+        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
+            buffer.putFloat(fieldItem.getFloat(i));
+        }
+        return buffer.array();
+    }
+
+    byte[] encodeWriteRequestDoubleField(BaseDefaultFieldItem fieldItem) {
+        int numBytes = fieldItem.getNumberOfValues() * 8;
+        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
+        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
+            buffer.putDouble(fieldItem.getDouble(i));
+        }
+        return buffer.array();
+    }
+    
+    byte[] encodeWriteRequestStringField(BaseDefaultFieldItem fieldItem, boolean isUtf16) {
+        // TODO: Implement this ...
+        String str = fieldItem.getString(0);
+        ByteBuffer buffer = ByteBuffer.allocate(str.length()+2);
+        buffer.put((byte)254);
+        buffer.put((byte)str.length());
+        buffer.put(str.getBytes());
+        return buffer.array();
+    }
+    
+    byte[] encodeWriteRequestS5TimeField(BaseDefaultFieldItem fieldItem, boolean signed) {
+        int numBytes = fieldItem.getNumberOfValues() * 2;
+        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
+        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
+            buffer.putShort(S7Helper.DurationToS5Time(fieldItem.getDuration(i)));
+        }
+        return buffer.array();
+    }    
+    
+    byte[] encodeWriteRequestTimeField(BaseDefaultFieldItem fieldItem, boolean signed) {
+        int numBytes = fieldItem.getNumberOfValues() * 4;
+        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
+        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
+            buffer.putInt(S7Helper.DurationToS7Time(fieldItem.getDuration(i)));
+        }
+        return buffer.array();
+    } 
+    
+    byte[] encodeWriteRequestTodField(BaseDefaultFieldItem fieldItem, boolean signed) {
+        int numBytes = fieldItem.getNumberOfValues() * 4;
+        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
+        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
+            buffer.putInt(S7Helper.LocalTimeToS7Tod(fieldItem.getTime(i)));
+        }
+        return buffer.array();
+    }
+    
+     byte[] encodeWriteRequestDateField(BaseDefaultFieldItem fieldItem, boolean signed) {
+        int numBytes = fieldItem.getNumberOfValues() * 2;
+        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
+        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
+            buffer.putShort(S7Helper.LocalDateToS7Date(fieldItem.getDate(i)));
+        }
+        return buffer.array();
+    }  
+     
+     byte[] encodeWriteRequestDateTimeField(BaseDefaultFieldItem fieldItem, boolean signed) {
+        int numBytes = fieldItem.getNumberOfValues() * 8;
+        ByteBuffer buffer = ByteBuffer.allocate(numBytes);
+        for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
+            buffer.put(S7Helper.LocalDateTimeToS7DateTime(fieldItem.getDateTime(i)));
+        }
+        return buffer.array();
+    }      
+    
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Decoding
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    @SuppressWarnings("unchecked")
+    @Override
+    protected void decode(ChannelHandlerContext ctx, S7Message msg, List<Object> out) throws PlcException {
+        // We're currently just expecting responses.
+
+        if (!(msg instanceof S7ResponseMessage)) {
+            logger.info("Aborta decode: " + msg.getMessageType());
+            return;
+        }
+        
+        S7ResponseMessage responseMessage = (S7ResponseMessage) msg;
+        short tpduReference = responseMessage.getTpduReference();
+
+        if (requests.containsKey(tpduReference)) {
+            // As every response has a matching request, get this request based on the tpdu.
+            PlcRequestContainer requestContainer = requests.remove(tpduReference);
+            PlcRequest request = requestContainer.getRequest();
+
+            PlcResponse response = null;
+            if (request instanceof PlcReadRequest) {
+                response = decodeReadResponse(responseMessage, requestContainer);
+                //If responseMessage is SSL type and response is null
+                //At moments Alarms and SSL request must be fragmented
+                if (response == null){ //Fragmented message? Query again!
+                    if (responseMessage.getPayloads().get(0) instanceof CpuServicesPayload){
+                        requests.put(tpduReference, requestContainer);
+                        S7RequestMessage sslRequestMessage = new S7RequestMessage(MessageType.USER_DATA,
+                                msg.getTpduReference(),
+                            Collections.singletonList(new  CpuServicesResponseParameter(
+                                CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
+                                CpuServicesParameterSubFunctionGroup.READ_SSL, 
+                                ((CpuServicesParameter) msg.getParameters().get(0)).getSequenceNumber())),
+                            Collections.singletonList(new CpuServicesPayload(DataTransportErrorCode.NOT_FOUND, 
+                                    SslId.NULL,
+                                (short) 0x0000)), null); 
+                        try {
+                            ChannelFuture future = ctx.writeAndFlush(sslRequestMessage);
+                            future.addListener(new ChannelFutureListener() {
+                                public void operationComplete(ChannelFuture future) {
+                                    logger.info("Request fragment READ_SSL done: " + future.isSuccess());
+                                }
+                            });                        
+                        } catch (Exception ex) {
+                            java.util.logging.Logger.getLogger(Plc4XS7Protocol.class.getName()).log(Level.SEVERE, null, ex);
+                        }
+                    }
+                }
+                
+            } else if (request instanceof PlcWriteRequest) {
+                response = decodeWriteResponse(responseMessage, requestContainer);
+            } else if (request instanceof PlcSubscriptionRequest) {
+                response = decodeSubscriptionResponse(responseMessage, requestContainer);
+                
+                //At moments Alarms and SSL request must be fragmented
+                if (response == null){ //Fragmented message? Query again!
+                    requests.put(tpduReference, requestContainer);
+                    List<S7Parameter> parameterItems = new LinkedList<>();
+                    List<S7Payload> payloadItems = new LinkedList<>();
+                    
+                    AlarmMessagePayload payload = new AlarmMessagePayload(DataTransportErrorCode.NOT_FOUND,
+                                                                            DataTransportSize.NULL,
+                                                                            0x0000,
+                                                                            null);
+                    payloadItems.add(payload);
+
+                    //TODO: Check multiple parameters
+                    CpuServicesParameter cpuservice = new CpuServicesResponseParameter(CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
+                    CpuServicesParameterSubFunctionGroup.ALARM_QUERY, ((CpuServicesParameter) msg.getParameters().get(0)).getSequenceNumber());
+
+                    parameterItems.add(cpuservice); 
+
+                    S7RequestMessage s7ReadRequest = new S7RequestMessage(MessageType.USER_DATA,
+                        msg.getTpduReference(), 
+                        parameterItems,
+                        payloadItems, 
+                        null);  
+
+                    try {
+                        ChannelFuture future = ctx.writeAndFlush(s7ReadRequest);
+                        future.addListener(new ChannelFutureListener() {
+                            public void operationComplete(ChannelFuture future) {
+                                logger.debug("Request fragment ALARM_QUERY done: " + future.isSuccess());
+                            }
+                        });                        
+                        //out.add(s7ReadRequest);
+                        //ctx.pipeline().
+                    } catch (Exception ex) {
+                        java.util.logging.Logger.getLogger(Plc4XS7Protocol.class.getName()).log(Level.SEVERE, null, ex);
+                    }
+                    
+                }
+            } else if (request instanceof PlcUnsubscriptionRequest) {
+                response = decodeUnSubscriptionResponse(responseMessage, requestContainer);
+            } else {
+                logger.info("There is the client's request, but it is not a valid response....");
+            }
+
+            // Confirm the response being handled.
+            if (response != null) {
+                requestContainer.getResponseFuture().complete(response);
+            } else {
+                logger.info("The message could not be processed...");
+            }
+        } else {
+            //PUSH Message
+            List<S7Parameter> parameters = msg.getParameters();
+            for (S7Parameter parameter:parameters){
+                if (parameter instanceof S7PushMessage){
+                    if (!alarmsqueue.offer((S7PushMessage) parameter)){
+                        logger.info("Event queue buffer is full.");
+                    };                    
+                }    
+            }
+            
+            List<S7Payload> payloads = msg.getPayloads();  
+            //TODO: Use alarmsqueue.addAll() method using streams
+            for (S7Payload payload:payloads){
+                if (payload instanceof S7PushMessage){
+                    if (!alarmsqueue.offer((S7PushMessage) payload)){
+                        logger.info("Event queue buffer is full.");
+                    };
+                }
+            }            
+        }
+    }
+    
+    // TODO: Check if it is a CPU service response and proceed as applicable.
+    @SuppressWarnings("unchecked")
+    private PlcResponse decodeReadResponse(S7ResponseMessage responseMessage, PlcRequestContainer requestContainer) throws PlcProtocolException {
+        InternalPlcReadRequest plcReadRequest = (InternalPlcReadRequest) requestContainer.getRequest();
+        Map<Short, Integer> splitItems  = null;
+                
+        if (responseMessage.getPayloads().get(0) instanceof CpuServicesPayload){
+            return decodeSslReadResponse(responseMessage, requestContainer);
+        }
+        
+        VarPayload payload = responseMessage.getPayload(VarPayload.class)
+            .orElseThrow(() -> new PlcProtocolException("No VarPayload supplied"));
+
+        // TODO: Checkout if the payload items are sort of a flatMap of all request items.
+
+        // If the numbers of items don't match, we're in big trouble as the only
+        // way to know how to interpret the responses is by aligning them with the
+        // items from the request as this information is not returned by the PLC.
+
+        short tpdu = responseMessage.getTpduReference();
+        
+        int[] fieldOffset= new int[1];
+        fieldOffset[0] = 0;
+        if (requestBitArray.containsKey(tpdu)){
+            splitItems = requestBitArray.remove(tpdu);
+            splitItems.forEach((key,length) -> {
+                fieldOffset[0] += length;
+            });
+        }
+        
+        if ((plcReadRequest.getNumberOfFields()+fieldOffset[0]) != payload.getItems().size()) {
+            logger.info("Excepcion: " + plcReadRequest.getFieldNames().toString());
+            throw new PlcProtocolException(
+                "The number of requested items doesn't match the number of returned items Request: " + 
+                        (plcReadRequest.getNumberOfFields()+fieldOffset[0]) +
+                        " Payload: " + 
+                        payload.getItems().size());
+        }
+
+
+        
+        Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> values = new HashMap<>();
+        List<VarPayloadItem> payloadItems = payload.getItems();
+        short index = 0;
+        short itemRow = 0;
+        for (String fieldName : plcReadRequest.getFieldNames()) {
+            S7Field field = (S7Field) plcReadRequest.getField(fieldName);
+            VarPayloadItem payloadItem = payloadItems.get(itemRow);
+
+            PlcResponseCode responseCode = decodeResponseCode(payloadItem.getReturnCode());
+            BaseDefaultFieldItem fieldItem = null;
+
+            //ByteBuf data = Unpooled.copiedBuffer(payloadItem.getData());
+            ByteBuf data = PooledByteBufAllocator.DEFAULT.buffer();
+            if (payloadItem.getData() != null){
+                data.writeBytes(payloadItem.getData());
+            }
+            
+            if (responseCode == PlcResponseCode.OK) {
+                try {
+                    switch (field.getDataType()) {
+                        // -----------------------------------------
+                        // Bit
+                        // 1 responseMessage
+                        // -----------------------------------------
+                        case BOOL:
+                            if (splitItems != null){
+                                if (splitItems.containsKey(index)){
+                                    short endRow = (short)(itemRow + splitItems.get(index));
+                                    for(short i=itemRow; i<=endRow; i++){
+                                        payloadItem = payloadItems.get(i);
+                                        data.writeBytes(payloadItem.getData());
+                                    }
+                                    itemRow = endRow;
+                                }
+                            }
+                            fieldItem = decodeReadResponseBitField(field, data);                                                            
+                            break;
+                        // -----------------------------------------
+                        // Bit-strings
+                        // -----------------------------------------
+                        case BYTE:  // 1 byte
+                            fieldItem = decodeReadResponseSignedByteField(field, data);
+                            break;
+                        case WORD:  // 2 byte (16 bit)
+                            fieldItem = decodeReadResponseSignedShortField(field, data);
+                            break;
+                        case DWORD:  // 4 byte (32 bit)
+                            fieldItem = decodeReadResponseSignedIntegerField(field, data);
+                            break;
+                        case LWORD:  // 8 byte (64 bit)
+                            fieldItem = decodeReadResponseSignedLongField(field, data);
+                            break;
+                        // -----------------------------------------
+                        // Integers
+                        // -----------------------------------------
+                        // 8 bit:
+                        case SINT:
+                            fieldItem = decodeReadResponseSignedByteField(field, data);
+                            break;
+                        case USINT:
+                            fieldItem = decodeReadResponseUnsignedByteField(field, data);
+                            break;
+                        // 16 bit:
+                        case INT:
+                            fieldItem = decodeReadResponseSignedShortField(field, data);
+                            break;
+                        case UINT:
+                            fieldItem = decodeReadResponseUnsignedShortField(field, data);
+                            break;
+                        case S5TIME:
+                            fieldItem = decodeReadResponseS5Time(field, data);
+                            break;
+                        // 32 bit:
+                        case TIME:
+                            fieldItem = decodeReadResponseTime(field, data);
+                            break;
+                        case DINT:
+                            fieldItem = decodeReadResponseSignedIntegerField(field, data);
+                            break;
+                        case UDINT:
+                            fieldItem = decodeReadResponseUnsignedIntegerField(field, data);
+                            break;
+                        // 64 bit:
+                        case LINT:
+                            fieldItem = decodeReadResponseSignedLongField(field, data);
+                            break;
+                        case ULINT:
+                            fieldItem = decodeReadResponseUnsignedLongField(field, data);
+                            break;
+                        // -----------------------------------------
+                        // Floating point values
+                        // -----------------------------------------
+                        case REAL:
+                            fieldItem = decodeReadResponseFloatField(field, data);
+                            break;
+                        case LREAL:
+                            fieldItem = decodeReadResponseDoubleField(field, data);
+                            break;
+                        // -----------------------------------------
+                        // Characters & Strings
+                        // -----------------------------------------
+                        case CHAR: // 1 byte (8 bit)
+                            fieldItem = decodeReadResponseFixedLengthStringField(field.getNumElements(), false, data);
+                            break;
+                        case WCHAR: // 2 byte
+                            fieldItem = decodeReadResponseFixedLengthStringField(1, true, data);
+                            break;
+                        case STRING:
+                            fieldItem = decodeReadResponseVarLengthStringField(false, data);
+                            break;
+                        case WSTRING:
+                            fieldItem = decodeReadResponseVarLengthStringField(true, data);
+                            break;
+                        // -----------------------------------------
+                        // TIA Date-Formats
+                        // -----------------------------------------
+                        case DT:
+                        case DATE_AND_TIME:
+                            fieldItem = decodeReadResponseDateAndTime(field, data);
+                            break;
+                        case TOD:
+                        case TIME_OF_DAY:
+                            fieldItem = decodeReadResponseTimeOfDay(field, data);                            
+                            break;
+                        case DATE:
+                            fieldItem = decodeReadResponseDate(field, data);
+                            break;
+                        default:
+                            throw new PlcProtocolException("Unsupported type " + field.getDataType());
+                    }
+                }
+                catch (Plc4XNettyException e){
+                    logger.warn("Problem during casting of field {}: Exception: {}; FieldInformation: {}",fieldName,e.getMessage(),field);
+                }
+                catch (Exception e){
+                    logger.warn("Some other error occurred casting field {}, FieldInformation: {}",fieldName, field,e);
+                }
+            }
+            Pair<PlcResponseCode, BaseDefaultFieldItem> result = new ImmutablePair<>(responseCode, fieldItem);
+            values.put(fieldName, result);
+            index++;
+            itemRow++;
+        }
+
+        return new DefaultPlcReadResponse(plcReadRequest, values);
+    }
+    
+    private PlcResponse decodeSslReadResponse(S7ResponseMessage responseMessage, PlcRequestContainer requestContainer) throws PlcProtocolException {
+        InternalPlcReadRequest plcReadRequest = (InternalPlcReadRequest) requestContainer.getRequest();
+        
+        Map<String, Pair<PlcResponseCode, ByteBuf>> values = new HashMap<>();                
+        List<S7Payload> payloads = responseMessage.getPayloads();
+        
+        if (payloads.get(0) instanceof CpuServicesPayload){
+            CpuServicesPayload payload = (CpuServicesPayload) payloads.get(0); 
+            if (payload.getSslPayload() == null) {
+                logger.debug("decodeSslReadResponse: Check for fragment payload");
+                return null;
+            }
+        }
+        
+        payloads.forEach((payload)->{
+            CpuServicesPayload s7payload = (CpuServicesPayload) payload;});    
+             
+        int index = 0;
+        for (String requestName : plcReadRequest.getFieldNames()) {
+
+            CpuServicesPayload payload = (CpuServicesPayload) payloads.get(index);  
+
+            Pair<PlcResponseCode, ByteBuf> result = new ImmutablePair<>( 
+                    decodeResponseCode(payload.getReturnCode()), 
+                    payload.getSslPayload());
+            values.put(requestName, result);
+
+            index++;
+        }
+     
+        return new S7ByteReadResponse(plcReadRequest, values);
+    }    
+
+    BaseDefaultFieldItem decodeReadResponseBitField(S7Field field, ByteBuf data) {
+        Boolean[] booleans = readAllValues(Boolean.class, field, i -> data.readByte() != 0x00);
+        return new DefaultBooleanFieldItem(booleans);
+    }
+
+    BaseDefaultFieldItem decodeReadResponseByteBitStringField(S7Field field, ByteBuf data) {
+        byte[] bytes = new byte[field.getNumElements()];
+        data.readBytes(bytes);
+        return decodeBitStringField(bytes);
+    }
+
+    BaseDefaultFieldItem decodeReadResponseShortBitStringField(S7Field field, ByteBuf data) {
+        byte[] bytes = new byte[field.getNumElements() * 2];
+        data.readBytes(bytes);
+        return decodeBitStringField(bytes);
+    }
+
+    BaseDefaultFieldItem decodeReadResponseIntegerBitStringField(S7Field field, ByteBuf data) {
+        byte[] bytes = new byte[field.getNumElements() * 4];
+        data.readBytes(bytes);
+        return decodeBitStringField(bytes);
+    }
+
+    BaseDefaultFieldItem decodeReadResponseLongBitStringField(S7Field field, ByteBuf data) {
+        byte[] bytes = new byte[field.getNumElements() * 8];
+        data.readBytes(bytes);
+        return decodeBitStringField(bytes);
+    }
+
+    BaseDefaultFieldItem decodeBitStringField(byte[] bytes) {
+        BitSet bitSet = BitSet.valueOf(bytes);
+        Boolean[] booleanValues = new Boolean[8 * bytes.length];
+        int k = 0;
+        for(int i = bytes.length - 1; i >= 0; i--) {
+            for(int j = 0; j < 8; j++) {
+                booleanValues[k++] = bitSet.get(8 * i + j);
+            }
+        }
+        return new DefaultBooleanFieldItem(booleanValues);
+    }
+
+    BaseDefaultFieldItem decodeReadResponseSignedByteField(S7Field field, ByteBuf data) {
+        Byte[] bytes = readAllValues(Byte.class, field, i -> data.readByte());
+        return new DefaultByteFieldItem(bytes);
+    }
+
+    BaseDefaultFieldItem decodeReadResponseUnsignedByteField(S7Field field, ByteBuf data) {
+        Short[] shorts = readAllValues(Short.class, field, i -> data.readUnsignedByte());
+        return new DefaultShortFieldItem(shorts);
+    }
+
+    BaseDefaultFieldItem decodeReadResponseSignedShortField(S7Field field, ByteBuf data) {
+        Short[] shorts = readAllValues(Short.class, field, i -> data.readShort());
+        return new DefaultShortFieldItem(shorts);
+    }
+
+    BaseDefaultFieldItem decodeReadResponseUnsignedShortField(S7Field field, ByteBuf data) {
+        Integer[] ints = readAllValues(Integer.class, field, i -> data.readUnsignedShort());
+        return new DefaultIntegerFieldItem(ints);
+    }
+
+    BaseDefaultFieldItem decodeReadResponseSignedIntegerField(S7Field field, ByteBuf data) {
+        Integer[] ints = readAllValues(Integer.class, field, i -> data.readInt());
+        return new DefaultIntegerFieldItem(ints);
+    }
+
+    BaseDefaultFieldItem decodeReadResponseUnsignedIntegerField(S7Field field, ByteBuf data) {
+        Long[] longs = readAllValues(Long.class, field, i -> data.readUnsignedInt());
+        return new DefaultLongFieldItem(longs);
+    }
+
+    BaseDefaultFieldItem decodeReadResponseSignedLongField(S7Field field, ByteBuf data) {
+        Long[] longs = readAllValues(Long.class, field, i -> data.readLong());
+        return new DefaultLongFieldItem(longs);
+    }
+
+    BaseDefaultFieldItem decodeReadResponseUnsignedLongField(S7Field field, ByteBuf data) {
+        BigInteger[] bigIntegers = readAllValues(BigInteger.class, field, i -> readUnsigned64BitInteger(data));
+        return new DefaultBigIntegerFieldItem(bigIntegers);
+    }
+
+    BaseDefaultFieldItem decodeReadResponseFloatField(S7Field field, ByteBuf data) {
+        Float[] floats = readAllValues(Float.class, field, i -> data.readFloat());
+        return new DefaultFloatFieldItem(floats);
+    }
+
+    BaseDefaultFieldItem decodeReadResponseDoubleField(S7Field field, ByteBuf data) {
+        Double[] doubles = readAllValues(Double.class, field, i -> data.readDouble());
+        return new DefaultDoubleFieldItem(doubles);
+    }
+
+    BaseDefaultFieldItem decodeReadResponseFixedLengthStringField(int numChars, boolean isUtf16, ByteBuf data) {
+        int numBytes = isUtf16 ? numChars * 2 : numChars;
+        String stringValue = data.readCharSequence(numBytes, StandardCharsets.UTF_8).toString();
+        return new DefaultStringFieldItem(stringValue);
+    }
+
+    BaseDefaultFieldItem decodeReadResponseVarLengthStringField(boolean isUtf16, ByteBuf data) {
+        // Max length ... ignored.
+        data.skipBytes(1);
+
+        //reading out byte and transforming that to an unsigned byte within an integer, otherwise longer strings are failing
+        byte currentLengthByte = data.readByte();
+        int currentLength = currentLengthByte & 0xFF;
+        return decodeReadResponseFixedLengthStringField(currentLength, isUtf16, data);
+    }
+
+    BaseDefaultFieldItem decodeReadResponseS5Time(S7Field field,ByteBuf data) {
+        Duration[] durations = readAllValues(Duration.class,field, i -> readS5TimeToDuration(data));
+        return new DefaultDurationFieldItem(durations);
+    }
+    
+    BaseDefaultFieldItem decodeReadResponseTime(S7Field field,ByteBuf data) {
+        Duration[] durations = readAllValues(Duration.class,field, i -> readS7TimeToDuration(data));
+        return new DefaultDurationFieldItem(durations);
+    }
+    
+    BaseDefaultFieldItem decodeReadResponseTimeOfDay(S7Field field,ByteBuf data) {
+        LocalTime[] localTimes = readAllValues(LocalTime.class,field, i -> readTimeOfDay(data));
+        return new DefaultLocalTimeFieldItem(localTimes);
+    }
+
+    BaseDefaultFieldItem decodeReadResponseDate(S7Field field,ByteBuf data) {
+        LocalDate[] localDates = readAllValues(LocalDate.class,field, i -> readDate(data));
+        return new DefaultLocalDateFieldItem(localDates);
+    }
+    
+    BaseDefaultFieldItem decodeReadResponseDateAndTime(S7Field field,ByteBuf data) {
+        LocalDateTime[] localDateTimes = readAllValues(LocalDateTime.class,field, i -> readDateAndTime(data));
+        return new DefaultLocalDateTimeFieldItem(localDateTimes);
+    }    
+
+    // Returns a 32 bit unsigned value : from 0 to 4294967295 (2^32-1)
+    public static int getUDIntAt(byte[] buffer, int pos) {
+        int result;
+        result = buffer[pos] & 0x0FF;
+        result <<= 8;
+        result += buffer[pos + 1] & 0x0FF;
+        result <<= 8;
+        result += buffer[pos + 2] & 0x0FF;
+        result <<= 8;
+        result += buffer[pos + 3] & 0x0FF;
+        return result;
+    }
+
+    private static <T> T[] readAllValues(Class<T> clazz, S7Field field, Function<Integer, T> extract) {
+        try {
+            return IntStream.rangeClosed(1, field.getNumElements())
+                .mapToObj(extract::apply)
+                .collect(Collectors.toList())
+                .toArray((T[])Array.newInstance(clazz, 0));
+        } catch (IndexOutOfBoundsException e) {
+            throw new PlcRuntimeException("To few bytes in the buffer to read requested type", e);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private PlcResponse decodeWriteResponse(S7ResponseMessage responseMessage, PlcRequestContainer requestContainer) throws PlcProtocolException {
+        InternalPlcWriteRequest plcWriteRequest = (InternalPlcWriteRequest) requestContainer.getRequest();
+        Map<Short, Integer> splitItems  = null;
+        
+        
+        //TODO: if the PLC Send a error, It send only the Header with PDUR and error code.
+        //      in this condition we send a error to the client, no a exception.
+        VarPayload payload = responseMessage.getPayload(VarPayload.class)
+            .orElseThrow(() -> new PlcProtocolException("No VarPayload supplied"));
+
+        // TODO: Checkout if the payload items are sort of a flatMap of all request items.
+        // TODO: Check for array response, no payload items presents, Why?
+
+        // If the numbers of items don't match, we're in big trouble as the only
+        // way to know how to interpret the responses is by aligning them with the
+        // items from the request as this information is not returned by the PLC.
+        // If we write BitsArray -> We need to add the number of items created 
+        // for individual requests.
+        int[] numberOfFields = new int[1];
+        numberOfFields[0] = 0;
+        short tpdu = responseMessage.getTpduReference();
+        if (requestBitArray.containsKey(tpdu)) {
+            splitItems = requestBitArray.remove(tpdu);
+            splitItems.forEach((key,length)->{                
+                numberOfFields[0] += length;
+            }); 
+            numberOfFields[0] += plcWriteRequest.getNumberOfFields();
+        } else {
+            numberOfFields[0] = plcWriteRequest.getNumberOfFields();
+        }
+
+        if (numberOfFields[0] != payload.getItems().size()) {
+            throw new PlcProtocolException(
+                "The number of requested items doesn't match the number of returned items Request: " +
+                       numberOfFields[0] +
+                        " " +
+                       payload.getItems().size());
+        }
+        
+        Map<String, PlcResponseCode> values = new HashMap<>();
+        List<VarPayloadItem> payloadItems = payload.getItems();
+
+        short sFieldCount = 0;
+        short sPayloadCount = 0;
+        
+        for (String fieldName : plcWriteRequest.getFieldNames()) {
+            
+            VarPayloadItem payloadItem = payloadItems.get(sPayloadCount);
+            PlcResponseCode responseCode = decodeResponseCode(payloadItem.getReturnCode());            
+            
+            if (splitItems != null) {     
+             
+                if (splitItems.containsKey(sFieldCount)) {
+  
+                    int numberOfItems = splitItems.get(sFieldCount);                                        
+                    responseCode = decodeResponseCode(payloadItem.getReturnCode());
+                    for (short i=sPayloadCount; i<=(short)(sPayloadCount+numberOfItems); i++){
+                        if (payloadItem.getReturnCode() != DataTransportErrorCode.OK) {
+                            responseCode = decodeResponseCode(payloadItem.getReturnCode());
+                        };                        
+                        payloadItem = payloadItems.get(i);
+                    }
+                    sPayloadCount += (short) numberOfItems+1; 
+                } else {
+                    responseCode = decodeResponseCode(payloadItem.getReturnCode());
+                    sPayloadCount++;                   
+                }
+                
+            } else {
+                sPayloadCount++; 
+            }
+
+            values.put(fieldName, responseCode);
+
+            sFieldCount++; 
+        }
+        
+
+        return new DefaultPlcWriteResponse(plcWriteRequest, values);
+    }
+
+
+    private PlcResponse decodeSubscriptionResponse(S7ResponseMessage responseMessage, PlcRequestContainer requestContainer) throws PlcProtocolException {
+
+        InternalPlcSubscriptionRequest subsRequest = (InternalPlcSubscriptionRequest) requestContainer.getRequest(); 
+        //TODO: Try multiple ALARM_ACK in the same request and multiple EVENT_ID.
+        S7SubscriptionField event = (S7SubscriptionField) subsRequest.getFields().get(0);
+        
+        //TODO: Multiple parameters. Try with S7400. At this point if we have embedded more parameter will be lost.
+        CpuServicesResponseParameter parameter = (CpuServicesResponseParameter) responseMessage.getParameters().get(0);
+
+        List<S7Payload> payloads = responseMessage.getPayloads();
+        
+        Map<String, Pair<PlcResponseCode, PlcSubscriptionHandle>> values = new HashMap<>();
+
+        //May be only one iteration?:
+        for (S7Payload payload:payloads){
+
+            if (payload instanceof AlarmMessagePayload) {
+                AlarmMessagePayload payloadItem = (AlarmMessagePayload) payload;   
+                switch(parameter.getSubFunctionGroup()){
+                    case MESSAGE_SERVICE:{
+                        List<SubscribedEventType> items = new ArrayList();
+                        PlcResponseCode responseCode = decodeResponseCode(((AlarmMessagePayload) payload).getReturnCode());
+
+                        if (responseCode == PlcResponseCode.OK) {
+                            subsRequest.getFields().forEach((field)->{
+                                S7SubscriptionField s7field = (S7SubscriptionField) field;
+                                items.add(s7field.getEventtype());
+                            });
+                        };    
+                        
+                        S7DiagnosticSubscriptionHandle handler = new S7DiagnosticSubscriptionHandle(
+                                                                        "MS",
+                                                                        responseMessage.getTpduReference(),
+                                                                        responseCode,
+                                                                        items);
+                            
+                        LinkedHashSet<String> fieldnames = subsRequest.getFieldNames();  
+                        
+                        fieldnames.forEach((fieldname)->{
+                            values.put(fieldname, new ImmutablePair(responseCode, handler)); 
+                        });
+                            
+                        }    
+                    break;
+                    case ALARM_ACK:{
+                        if (payloadItem.getLength() != 0) {
+                            List<Object> items = payloadItem.getMsg().getMsgItems();                            
+                            ArrayList<Integer> eventids = event.getAckalarms();
+                            int index = 0;
+                            for (Object item:items){
+                                // A ack response contains only the return code for every item.
+                                // Is direct response for the ALARM_ACK, don't pass to
+                                // push message handler.
+                                //subsBuilder2.addEventField("MyAck", "ACK:16#60000001,16#60000002,16#60000003");
+                                values.put("16#"+Integer.toHexString(eventids.get(index)), new ImmutablePair(decodeResponseCode((DataTransportErrorCode) item),null));                    
+                                index++;
+                            }    
+                        } else {
+                            values.put("ERROR", new ImmutablePair(PlcResponseCode.NOT_FOUND,null));                                                
+                        }
+                    }
+                    break;
+                    case ALARM_QUERY:{
+                        if (payloadItem.getMsg() == null) {
+                            return null;   
+                        } 
+
+                        if (payloadItem instanceof S7PushMessage){
+                            if (payloadItem.getMsg().getMsgItems().size() > 0){
+                                if (!alarmsqueue.offer((S7PushMessage) payload)){
+                                    logger.info("decodeSubscriptionResponse: Alarm queue buffer is full.");
+                                };
+                            }
+                            PlcResponseCode responseCode = decodeResponseCode(((AlarmMessagePayload) payload).getReturnCode());
+                            LinkedHashSet<String> fieldnames = subsRequest.getFieldNames();                                  
+                            fieldnames.forEach((fieldname)->{
+                                values.put(fieldname, new ImmutablePair(responseCode, null));                                    
+                            });                              
+                            
+                        } else {
+                            logger.debug("Check for ALARM_QUERY not attended: " + payloadItem);   
+                        }                    
+                    }
+                    break;
+                    default:;
+                } 
+            } else if (payload instanceof CpuCyclicServicesResponsePayload) {
+                              
+                    CpuCyclicServicesResponsePayload  cyclicPayloadItem = (CpuCyclicServicesResponsePayload) payload;
+                    //
+                    //
+                    if (cyclicPayloadItem.getItems().size() != 0) {
+                    
+                        List<AssociatedValueItem> valueitems = cyclicPayloadItem.getItems();
+                        Map<String,AssociatedValueItem> items = new LinkedHashMap();
+                        int i=0;
+                        if (parameter.getError().getCode() == 0x0000){                    
+                            for (String fieldname:subsRequest.getFieldNames()){
+                                items.put(fieldname, valueitems.get(i));
+                                S7CyclicServicesSubscriptionHandle handler = new S7CyclicServicesSubscriptionHandle(fieldname, 
+                                                                            parameter.getSequenceNumber(),
+                                                                            parameter.getError().getCode(),
+                                                                            valueitems.get(i));  
+                                values.put(fieldname, 
+                                        new ImmutablePair(decodeResponseCode(valueitems.get(i).getReturnCode()), 
+                                                handler));                                 
+                                i++;                        
+                            };
+                        };
+                    
+                    } else {
+                        logger.info("At least one wrong address was requested.");
+                        // Return quality code for alarm 
+                        for (String fieldname:subsRequest.getFieldNames()){
+                            values.put(fieldname, new ImmutablePair(PlcResponseCode.INVALID_ADDRESS, null));                    
+                        }
+                        
+                    } 
+                    
+                } else {
+                    logger.info("Payload not defined...");
+            } 
+        }
+        return new DefaultPlcSubscriptionResponse(subsRequest, values);
+    }
+    
+    
+    private PlcResponse decodeUnSubscriptionResponse(S7ResponseMessage responseMessage, PlcRequestContainer requestContainer) throws PlcProtocolException {
+        DefaultPlcUnsubscriptionRequest unSubsRequest = (DefaultPlcUnsubscriptionRequest) requestContainer.getRequest();
+        //TODO: Multiple parameters. Try with S7400. At this point if we have embedded more parameter will be lost.
+        CpuServicesResponseParameter parameter = (CpuServicesResponseParameter) responseMessage.getParameters().get(0);
+        InternalPlcUnsubscriptionRequest request = (InternalPlcUnsubscriptionRequest) requestContainer.getRequest();
+
+        return new DefaultPlcUnsubscriptionResponse(request);
+    }    
+    
+    private PlcResponseCode decodeResponseCode(DataTransportErrorCode dataTransportErrorCode) {
+        if (dataTransportErrorCode == null) {
+            return PlcResponseCode.INTERNAL_ERROR;
+        }
+        switch (dataTransportErrorCode) {
+            case OK:
+                return PlcResponseCode.OK;
+            case NOT_FOUND:
+                return PlcResponseCode.NOT_FOUND;
+            case INVALID_ADDRESS:
+                return PlcResponseCode.INVALID_ADDRESS;
+            case DATA_TYPE_NOT_SUPPORTED:
+                return PlcResponseCode.INVALID_DATATYPE;
+            case ACCESS_DENIED:
+                return PlcResponseCode.ACCESS_DENIED;
+            default:
+                return PlcResponseCode.INTERNAL_ERROR;
+        }
+    }
+
+    private static BigInteger readUnsignedLong(ByteBuf data) {
+        // as there is no unsigned long primitive, we have to switch to
+        // BigDecimal and manually convert the bytes to a BigDecimal.
+        // In order to be unsigned 4 bytes, we create an array of 5 bytes
+        // where the 5th byte is set to 0. The most significant bit being
+        // 0 we are guaranteed to interpret the input a positive value.
+        byte[] bytes = new byte[5];
+        // Set the first byte to 0
+        bytes[0] = 0;
+        // Read the next 4 bytes into the rest.
+        data.readBytes(bytes, 1, 4);
+        return new BigInteger(bytes);
+    }
+
+    private static BigInteger readSigned64BitInteger(ByteBuf data) {
+        byte[] bytes = new byte[8];
+        data.readBytes(bytes, 0, 8);
+        return new BigInteger(bytes);
+    }
+
+    private static BigInteger readUnsigned64BitInteger(ByteBuf data) {
+        byte[] bytes = new byte[9];
+        // Set the first byte to 0
+        bytes[0] = 0;
+        // Read the next 8 bytes into the rest.
+        data.readBytes(bytes, 1, 8);
+        return new BigInteger(bytes);
+    }
+
+    //TODO: millisoconds
+    LocalDateTime readDateAndTime(ByteBuf data) {
+        return S7Helper.S7DateTimeToLocalDateTime(data);
+    }
+
+    Duration readS5TimeToDuration(ByteBuf data){
+        return S7Helper.S5TimeToDuration(data.readShort());        
+    };
+    
+    Duration readS7TimeToDuration(ByteBuf data){
+        return S7Helper.S7TimeToDuration(data.readInt());        
+    };
+    
+    LocalTime readTimeOfDay(ByteBuf data) {
+        return S7Helper.S7TodToLocalTime(data.readInt());
+    }
+
+    LocalDate readDate(ByteBuf data) {
+        return S7Helper.S7DateToLocalDate(data.readShort());
+    }
+
+    /**
+     * converts incoming byte to an integer regarding used BCD format
+     * @param incomingByte
+     * @return converted BCD number
+     */
+    private static int convertByteToBcd(byte incomingByte) {
+        int dec = (incomingByte >> 4) * 10;
+        return dec + (incomingByte & 0x0f);
+    }
+    
+
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7HEmbeddedChannelFactory.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7HEmbeddedChannelFactory.java
new file mode 100644
index 00000000000..b1c827bc013
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7HEmbeddedChannelFactory.java
@@ -0,0 +1,45 @@
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.s7.netty;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.embedded.EmbeddedChannel;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.exceptions.PlcException;
+import org.apache.plc4x.java.base.connection.ChannelFactory;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7HEmbeddedChannelFactory  implements ChannelFactory {
+
+    @Override
+    public Channel createChannel(ChannelHandler channelHandler) throws PlcConnectionException {
+         EmbeddedChannel ch = new EmbeddedChannel(channelHandler);
+         return ch;
+    }
+
+    @Override
+    public void ping() throws PlcException {
+        
+    }
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7HProxy.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7HProxy.java
new file mode 100644
index 00000000000..da89d6af954
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7HProxy.java
@@ -0,0 +1,343 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.group.ChannelGroup;
+import io.netty.channel.group.DefaultChannelGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.handler.codec.MessageToMessageCodec;
+import io.netty.util.AttributeKey;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+import io.netty.util.concurrent.GlobalEventExecutor;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import org.apache.plc4x.java.base.events.ConnectedEvent;
+import org.apache.plc4x.java.isoontcp.protocol.IsoOnTcpProtocol;
+import org.apache.plc4x.java.isotp.protocol.IsoTPProtocol;
+import org.apache.plc4x.java.isotp.protocol.events.IsoTPConnectedEvent;
+import org.apache.plc4x.java.isotp.protocol.model.types.DeviceGroup;
+import org.apache.plc4x.java.isotp.protocol.model.types.TpduSize;
+import org.apache.plc4x.java.s7.netty.events.S7ConnectedEvent;
+import org.apache.plc4x.java.s7.utils.S7TsapIdEncoder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * S7HProxy
+ * It is a proxy towards Siemens high availability systems, which are 
+ * generally made up of two (2) CPUs with or without associated CPs.
+ * . Here are the individual connections to each of the CP443-1, with 
+ * the TCP/IP protocol enabled, to which each of the messages received 
+ * from "S7Protocol" are sent.
+ * . Duplicate messages (one for each CP) are expected, so they are filtered 
+ * in this version at the "S7Protocol" level. 
+ * . There is no determinism from which CP will receive the response message.
+ * . This object is marked as "Sharable", it allows to share it with the 
+ * pipes of chrack0 and chrack1. 
+ * . Being "Sharable" is guaranteed to be threadsafe.
+ * . For simplicity and maintaining a granular control over the operations, 
+ * the use of the "ChannelGroup" is avoided, this allows informing which of the 
+ * links is down.
+ * . In this first version, packet filtering is not performed, which is left to 
+ * the following capable ones, which keep control of the requested packets.
+ * 
+ *   rack0           rack1 
+ * +--+--+-+... ...+--+--+-+
+ * |  |  | |       |  |  | |
+ * |P |C |C|       |P |C |C|
+ * |S |P |P|       |S |P |P|
+ * |  |U |1|       |  |U |1|
+ * |  |0 | |       |  |1 | |
+ * |  |  | |       |  |  | |
+ * +--+--+-+... ...+--+--+-+
+ * 
+ * @author cgarcia
+ */
+
+@Sharable
+public class S7HProxy  extends MessageToMessageCodec {
+    private static final Logger logger = LoggerFactory.getLogger(S7HProxy.class);
+    private static final int ISO_ON_TCP_PORT = 102;
+    private final AttributeKey<Short> pduSizeKey = AttributeKey.valueOf("pduSizeKey");    
+    
+    private ChannelHandlerContext ctx = null;
+    private final InetAddress[] haddress;
+    private final int[] racks;
+    private final int[] slots; 
+    private Short pduSize = 0;
+    
+    private Channel chrack0;
+    private Channel chrack1; 
+    
+    private Channel proxychannel = null;
+    
+
+    public S7HProxy(InetAddress[] haddress, int [] racks, int[] slots ) {
+        this.haddress = haddress;
+        this.racks = racks;
+        this.slots = slots;
+    }
+          
+    @Override
+    public void channelActive(ChannelHandlerContext ctx) throws Exception {
+        if (this.ctx != null) return;
+        try {
+            this.ctx = ctx;
+            proxychannel = ctx.channel();
+            pduSize = ctx.channel().attr(pduSizeKey).get();
+            
+            
+            final NioEventLoopGroup workerGroup = new NioEventLoopGroup();
+            CompletableFuture<Void> sessionSetupCompleteFuture0 = new CompletableFuture<>();
+            CompletableFuture<Void> sessionSetupCompleteFuture1 = new CompletableFuture<>();            
+            
+            Bootstrap bs_rack0 = new Bootstrap();
+            bs_rack0.group(workerGroup);
+            bs_rack0.channel(NioSocketChannel.class);
+            bs_rack0.option(ChannelOption.SO_KEEPALIVE, true);
+            bs_rack0.option(ChannelOption.TCP_NODELAY, true);
+
+            Bootstrap bs_rack1 = bs_rack0.clone(workerGroup);
+            
+            bs_rack0.handler(getChannelHandlerRack0(sessionSetupCompleteFuture0));
+            
+            bs_rack1.handler(getChannelHandlerRack1(sessionSetupCompleteFuture1));
+            
+            //Start the client for rack0.
+            System.out.println(haddress[0].getHostAddress() +" : " + haddress[1].getHostAddress());
+            final ChannelFuture f0 = bs_rack0.connect(haddress[0], ISO_ON_TCP_PORT);
+            f0.addListener(new GenericFutureListener<Future<? super Void>>() {
+                @Override public void operationComplete(Future<? super Void> future) throws Exception {
+                    if (future.isSuccess()) {
+                        proxychannel.read();
+                    } else {
+                        logger.info("Unable to connect Rack0.");
+                    } 
+                }
+            });
+            
+            try {
+                f0.await();
+                f0.awaitUninterruptibly(); // jf: unsure if we need that
+            } catch (Exception ex){
+                ex.printStackTrace();
+            }
+            
+            //Start the client for rack1.            
+            final ChannelFuture f1  = bs_rack1.connect(haddress[1], ISO_ON_TCP_PORT);
+            f1.addListener(new GenericFutureListener<Future<? super Void>>() {
+                @Override public void operationComplete(Future<? super Void> future) throws Exception {
+                    if (future.isSuccess()) {
+                        proxychannel.read();
+                    } else {
+                        logger.info("Unable to connect Rack1.");
+                    } 
+                }
+            });
+
+            try {
+                f1.await();
+                f1.awaitUninterruptibly(); // jf: unsure if we need that  
+            } catch (Exception ex){
+                ex.printStackTrace();
+            }
+            
+            if (!((f0.isDone() && f0.isSuccess()) || (f1.isDone() && f1.isSuccess()))) {
+                logger.info("RACK0 & 1: Shutdown.");
+                workerGroup.shutdownGracefully();
+                //No connections
+                proxychannel.close();
+            }
+            
+            chrack0 = f0.channel();
+            chrack1 = f1.channel();
+
+        } catch (Exception ex){
+            ex.printStackTrace();
+        }
+    }   
+    
+    @Override
+    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+        super.channelInactive(ctx); //To change body of generated methods, choose Tools | Templates.
+    }  
+           
+    /*
+     * This method intercepts user events such as "setupCommunicationRequest", 
+     * which is used to initiate communication with the CPs.
+    */
+    @Override
+    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+        logger.info("S7HProxy event: " + evt.getClass().getName()); 
+        if ((evt instanceof IsoTPConnectedEvent) ||
+            (evt instanceof S7ConnectedEvent)    ){
+            super.userEventTriggered(ctx, evt);
+            return;
+        }
+        if (chrack0.isActive())chrack0.writeAndFlush(evt).
+                addListener(new ChannelFutureListener() {
+                @Override
+                public void operationComplete(ChannelFuture future) {
+                    if (!future.isSuccess()) {
+                        logger.info("RACK0: User event send.");
+                    }
+                }
+            });
+        
+        if (chrack1.isActive())chrack1.writeAndFlush(evt).
+                addListener(new ChannelFutureListener() {
+                @Override
+                public void operationComplete(ChannelFuture future) {
+                    if (!future.isSuccess()) {
+                        logger.info("RACK1: User event send.");
+                    }
+                }
+            });
+    }
+    
+    /*
+    * 
+    * Plc4XS7Protocol -> 
+    * LongS7MessageProcessorCodec -> 
+    * S7Protocol ->
+    * S7HProxy -> +--> IsoTProtocol -> IsoOnTcpProtocol -> socket0
+    *             +--> IsoTProtocol -> IsoOnTcpProtocol -> socket1
+    */
+    @Override
+    protected void encode(ChannelHandlerContext ctx, Object msg, List out) throws Exception {
+        logger.info("ENCODE: " + msg.getClass().getName());
+        out.add(msg);
+        if (ctx != this.ctx) return;
+        if (chrack0.isActive())
+        chrack0.writeAndFlush(msg).addListener(new ChannelFutureListener() {
+                @Override
+                public void operationComplete(ChannelFuture future) {
+                    if (!future.isSuccess()) {
+                        logger.info("RACK0: Encode error");
+                    }
+                }
+            }); 
+        
+        if (chrack1.isActive())        
+        chrack1.writeAndFlush(msg).addListener(new ChannelFutureListener() {
+                @Override
+                public void operationComplete(ChannelFuture future) {
+                    if (!future.isSuccess()) {
+                        logger.info("RACK1: Encode error");
+                    }
+                }
+            });                 
+    }
+
+    /*
+    * 
+    * Plc4XS7Protocol <- 
+    * LongS7MessageProcessorCodec <- 
+    * S7Protocol <-
+    * S7HProxy <- <-+-- IsoTProtocol <- IsoOnTcpProtocol <- socket0
+    *             <-+-- IsoTProtocol <- IsoOnTcpProtocol <- socket1
+    */
+    @Override
+    protected void decode(ChannelHandlerContext ctx, Object msg, List out) throws Exception {
+        logger.info("DECODE: message decode.");        
+        out.add(msg);
+    }    
+                    
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+        super.exceptionCaught(ctx, cause); //To change body of generated methods, choose Tools | Templates.
+        logger.info(cause.getMessage());
+    }
+
+    private ChannelHandler getChannelHandlerRack0(CompletableFuture<Void> sessionSetupCompleteFuture) {
+        short calledTsapId = S7TsapIdEncoder.encodeS7TsapId(DeviceGroup.PG_OR_PC, racks[0], slots[0]);
+        short callingTsapId = S7TsapIdEncoder.encodeS7TsapId(DeviceGroup.OS, 0, 0);
+        
+        return new ChannelInitializer() {
+            @Override
+            protected void initChannel(Channel channel) {
+                // Build the protocol stack for communicating with the s7 protocol.
+                ChannelPipeline pipeline = channel.pipeline();
+                pipeline.addLast(new ChannelInboundHandlerAdapter() {
+                    @Override
+                    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+                        logger.info("Evento en el primero de la tuberia 0 ..." + evt.getClass().getName());
+                        if (evt instanceof ConnectedEvent) {
+                            sessionSetupCompleteFuture.complete(null);
+                        } else {
+                            super.userEventTriggered(ctx, evt);
+                        }
+                    }
+                });
+
+                pipeline.addLast(new IsoOnTcpProtocol());
+                pipeline.addLast(new IsoTPProtocol(callingTsapId, calledTsapId, TpduSize.valueForGivenSize(pduSize)));
+                pipeline.addLast(new S7HProxyHelper(proxychannel)); 
+            }
+        };
+    }    
+    
+    private ChannelHandler getChannelHandlerRack1(CompletableFuture<Void> sessionSetupCompleteFuture) {
+        short calledTsapId = S7TsapIdEncoder.encodeS7TsapId(DeviceGroup.PG_OR_PC, racks[1], slots[1]);
+        short callingTsapId = S7TsapIdEncoder.encodeS7TsapId(DeviceGroup.OS, 0, 0);
+        
+        return new ChannelInitializer() {
+            @Override
+            protected void initChannel(Channel channel) {
+                // Build the protocol stack for communicating with the s7 protocol.
+                ChannelPipeline pipeline = channel.pipeline();
+                pipeline.addLast(new ChannelInboundHandlerAdapter() {
+                    @Override
+                    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+                        logger.info("Evento en el primero de la tuberia 1 ..." + evt.getClass().getName());                        
+                        if (evt instanceof ConnectedEvent) {
+                            sessionSetupCompleteFuture.complete(null);
+                        } else {
+                            super.userEventTriggered(ctx, evt);
+                        }
+                    }
+                });
+
+                pipeline.addLast(new IsoOnTcpProtocol());
+                pipeline.addLast(new IsoTPProtocol(callingTsapId, calledTsapId, TpduSize.valueForGivenSize(pduSize)));
+                pipeline.addLast(new S7HProxyHelper(proxychannel));                
+            }
+        };
+    }       
+
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7HProxyHelper.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7HProxyHelper.java
new file mode 100644
index 00000000000..fe6571419ce
--- /dev/null
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7HProxyHelper.java
@@ -0,0 +1,74 @@
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.embedded.EmbeddedChannel;
+import io.netty.handler.codec.MessageToMessageCodec;
+import java.util.List;
+import org.apache.plc4x.java.base.events.ConnectEvent;
+import org.apache.plc4x.java.isotp.protocol.IsoTPProtocol;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7HProxyHelper  extends MessageToMessageCodec{
+    private static final Logger logger = LoggerFactory.getLogger(S7HProxyHelper.class);
+    private final EmbeddedChannel proxychannel;
+    
+    public S7HProxyHelper(Channel proxychannel) {
+        this.proxychannel = (EmbeddedChannel) proxychannel;
+    }
+    
+    /*
+    *  
+    */
+    @Override
+    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+        logger.info("S7HProxyHelper event: userEventTriggered: " + evt.getClass().getName());
+        proxychannel.pipeline().fireUserEventTriggered(evt);
+    }          
+    /*
+    * TODO: Chequear la propa
+    */
+    @Override
+    protected void encode(ChannelHandlerContext ctx, Object obj, List out) throws Exception {
+        logger.info("S7HProxyHelper: Encode en la cola..." + obj.getClass().getName());
+        if (obj instanceof ConnectEvent){
+            logger.info("002: Recibe objeto y es trasladado al HEAD.");
+            ctx.pipeline().fireUserEventTriggered(obj);
+        } else {
+            out.add(obj);
+        }
+    }
+
+    /*
+    * 
+    */
+    @Override
+    protected void decode(ChannelHandlerContext ctx, Object obj, List out) throws Exception {
+        logger.info("S7HProxyHelper: decode " + obj.getClass().getName());
+        proxychannel.writeInbound(obj);
+    }
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
index ba3168304ae..808d4dc2039 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
@@ -1,1921 +1,1933 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufUtil;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.*;
-import io.netty.handler.codec.MessageToMessageDecoder;
-import io.netty.util.AttributeKey;
-import io.netty.util.concurrent.Future;
-import io.netty.util.concurrent.PromiseCombiner;
-import java.lang.reflect.Field;
-import java.nio.charset.Charset;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.temporal.ChronoUnit;
-import java.util.*;
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
-import org.apache.plc4x.java.api.exceptions.PlcProtocolPayloadTooBigException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.isotp.protocol.IsoTPProtocol;
-import org.apache.plc4x.java.isotp.protocol.events.IsoTPConnectedEvent;
-import org.apache.plc4x.java.isotp.protocol.model.IsoTPMessage;
-import org.apache.plc4x.java.isotp.protocol.model.tpdus.DataTpdu;
-import org.apache.plc4x.java.s7.netty.events.S7ConnectedEvent;
-import org.apache.plc4x.java.s7.netty.model.messages.S7Message;
-import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
-import org.apache.plc4x.java.s7.netty.model.messages.S7ResponseMessage;
-import org.apache.plc4x.java.s7.netty.model.messages.SetupCommunicationRequestMessage;
-import org.apache.plc4x.java.s7.netty.model.params.*;
-import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.AlarmMessagePayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.CpuCyclicServicesRequestPayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.CpuCyclicServicesResponsePayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.CpuDiagnosticMessagePayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.CpuMessageSubscriptionServicePayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.CpuServicesPayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
-import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.AlarmMessageItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.CpuDiagnosticMessageItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.MessageObjectItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.S7AnyVarPayloadItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
-import org.apache.plc4x.java.s7.netty.model.types.*;
-import org.apache.plc4x.java.s7.netty.strategies.S7MessageProcessor;
-import org.apache.plc4x.java.s7.netty.util.S7SizeHelper;
-import org.apache.plc4x.java.s7.types.S7ControllerType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Communication Layer between the Application level ({@link Plc4XS7Protocol}) and the lower level (tcp) that sends and receives {@link S7Message}s.
- * This layer also handles the control over the "wire", i.e., the queues of incoming and outgoing messages.
- * Furthermore, here {@link S7Message}s are marshalled and unmarshalled to {@link ByteBuf}s to be send over wire.
- *
- * Before messages are send to the wire an optional {@link S7MessageProcessor} can be applied.
- *
- * @see S7MessageProcessor
- */
-public class S7Protocol extends ChannelDuplexHandler {
-
-    private static final byte S7_PROTOCOL_MAGIC_NUMBER = 0x32;
-
-    private static final Logger logger = LoggerFactory.getLogger(S7Protocol.class);
-
-    private final MessageToMessageDecoder<Object> decoder = new MessageToMessageDecoder<Object>() {
-
-        @Override
-        public boolean acceptInboundMessage(Object msg) {
-            return msg instanceof IsoTPMessage;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        protected void decode(ChannelHandlerContext ctx, Object msg, List<Object> out) {
-            S7Protocol.this.decode(ctx, (IsoTPMessage) msg, out);
-        }
-    };
-
-    private short maxAmqCaller;
-    private short maxAmqCallee;
-    private short pduSize;
-    private final AttributeKey<Short> pduSizeKey = AttributeKey.valueOf("pduSizeKey");    
-    private S7ControllerType controllerType;
-
-    // For detecting the lower layers.
-    private ChannelHandler prevChannelHandler;
-    private S7MessageProcessor messageProcessor;
-
-    // For being able to respect the max AMQ restrictions.
-    private PendingWriteQueue queue;
-    private Map<Short, DataTpdu> sentButUnacknowledgedTpdus;
-    
-    /*
-     * All fragmentsof data send by PLC are stored here,
-     * until the PLC indicates that it is the last one,
-     * then a single message is assembled.
-    */    
-    private Map<Short, Pair<LocalDateTime, Queue<ByteBuf>>> fragmentedData;
-
-    public S7Protocol(short requestedMaxAmqCaller, short requestedMaxAmqCallee, short requestedPduSize,
-                      S7ControllerType controllerType, S7MessageProcessor messageProcessor) {
-        this.maxAmqCaller = requestedMaxAmqCaller;
-        this.maxAmqCallee = requestedMaxAmqCallee;
-        this.pduSize = requestedPduSize;
-        this.controllerType = controllerType;
-        this.messageProcessor = messageProcessor;
-        sentButUnacknowledgedTpdus = new HashMap<>();
-        fragmentedData = new HashMap<>();
-    }
-
-    @Override
-    public void channelRegistered(ChannelHandlerContext ctx) {
-        this.queue = new PendingWriteQueue(ctx);
-        ctx.channel().attr(pduSizeKey).set(pduSize);
-        
-        try {
-            Field prevField = FieldUtils.getField(ctx.getClass(), "prev", true);
-            if(prevField != null) {
-                ChannelHandlerContext prevContext = (ChannelHandlerContext) prevField.get(ctx);
-                prevChannelHandler = prevContext.handler();
-            }
-        } catch(Exception e) {
-            logger.error("Error accessing field 'prev'", e);
-        }
-    }
-
-    @Override
-    public void channelUnregistered(ChannelHandlerContext ctx) throws Exception {
-        this.queue.removeAndWriteAll();
-        super.channelUnregistered(ctx);
-    }
-
-    @Override
-    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-        // Send everything so we get a proper failure for those pending writes
-        this.queue.removeAndWriteAll();
-        super.channelInactive(ctx);
-    }
-
-    /**
-     * If the S7 protocol layer is used over Iso TP, then after receiving a {@link IsoTPConnectedEvent} the
-     * corresponding S7 setup communication message has to be sent in order to negotiate the S7 protocol layer.
-     *
-     * @param ctx the current protocol layers context
-     * @param evt the event
-     * @throws Exception throws an exception if something goes wrong internally
-     */
-    @Override
-    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
-        // If we are using S7 inside of IsoTP, then we need to intercept IsoTPs connected events.
-        if ((prevChannelHandler instanceof IsoTPProtocol) && (evt instanceof IsoTPConnectedEvent)) {
-            // Setup Communication
-            SetupCommunicationRequestMessage setupCommunicationRequest =
-                new SetupCommunicationRequestMessage((short) 0, maxAmqCaller, maxAmqCallee, pduSize, null);
-
-            ctx.channel().writeAndFlush(setupCommunicationRequest);
-        }
-
-        else {
-            super.userEventTriggered(ctx, evt);
-        }
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Encoding
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    @Override
-    public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) {
-        try {
-            if(msg instanceof S7Message) {
-                S7Message in = (S7Message) msg;
-
-                // Give message processors to process the incoming message.
-                //TODO: messageProcessor move to netty next layer, no a plugin code
-                Collection<? extends S7Message> messages;
-                if ((messageProcessor != null) && (in instanceof S7RequestMessage)) {
-                    messages = messageProcessor.processRequest((S7RequestMessage) in, pduSize);
-                } else {
-                    messages = Collections.singleton(in);
-                }
-
-                // Create a promise that has to be called multiple times.
-                PromiseCombiner promiseCombiner = new PromiseCombiner();
-                for (S7Message message : messages) {
-                    ByteBuf buf = Unpooled.buffer();
-                    writeS7Message(promise.channel(), promiseCombiner, message, buf);
-                }
-                promiseCombiner.finish(promise);
-
-                // Start sending the queue content.
-                trySendingMessages(ctx);
-            }
-            // Especially during the phase of connection establishment, we might be sending
-            // messages of a lower level protocol, so if it's not S7, we forward it to the next
-            // in the pipeline and hope it can handle it. If no layer can handle it Netty will
-            // exceptionally complete the future.
-            else {
-                ctx.write(msg, promise);
-            }
-        } catch (Exception e) {
-            promise.setFailure(e);
-        }
-    }
-
-    private void writeS7Message(Channel channel, PromiseCombiner promiseCombiner,
-                                S7Message message, ByteBuf buf) throws PlcProtocolException {
-        encodeHeader(message, buf);
-        encodeParameters(message, buf);
-        encodePayloads(message, buf);
-
-        // Check if the message doesn't exceed the negotiated maximum size.
-        if (buf.writerIndex() > pduSize) {
-            throw new PlcProtocolPayloadTooBigException("s7:"+message.getTpduReference(), pduSize, buf.writerIndex(), message);
-        } else {
-            ChannelPromise subPromise = new DefaultChannelPromise(channel);
-            // The tpduRef was 0x01 but had to be changed to 0x00 in order to support Siemens LOGO devices.
-            queue.add(new DataTpdu(true, (byte) 0x00, Collections.emptyList(), buf, message), subPromise);
-            
-            promiseCombiner.add((Future) subPromise);
-            logger.debug("writeS7Message: S7 Message with id {}Ā queued", message.getTpduReference());
-        }
-    }
-
-    private void encodePayloads(S7Message in, ByteBuf buf) throws PlcProtocolException {
-        if(in.getPayloads() != null) {
-            Iterator<S7Payload> payloadIterator = in.getPayloads().iterator();
-            while(payloadIterator.hasNext()) {
-                S7Payload payload = payloadIterator.next();
-                switch (payload.getType()) {
-                    case WRITE_VAR:
-                        encodeWriteVarPayload((VarPayload) payload, buf, payloadIterator.hasNext());
-                        break;
-                    case CPU_SERVICES: 
-                        if (payload instanceof CpuServicesPayload) {
-                            encodeCpuServicesPayload((CpuServicesPayload) payload, buf);
-                        } else if (payload instanceof CpuMessageSubscriptionServicePayload) {
-                            encodeCpuMessageSubcriptionPayload((CpuMessageSubscriptionServicePayload) payload, buf);
-                        } else if (payload instanceof AlarmMessagePayload) {
-                             encodeAlarmMessagePayload((AlarmMessagePayload) payload, buf);
-                        } else if (payload instanceof CpuCyclicServicesRequestPayload){
-                            encodeCpuCyclicSubscriptionPayload((CpuCyclicServicesRequestPayload) payload, buf);
-                        }
-                        break;
-                    default:
-                        throw new PlcProtocolException("Writing payloads of type " +
-                            payload.getType().name() + " not implemented.");
-                }
-            }
-        }
-    }
-
-    /*
-    * 
-    */
-    private void encodeWriteVarPayload(VarPayload varPayload, ByteBuf buf, boolean lastItem) {
-        
-        //All payloads for the request come here
-        int i=1;
-        for (VarPayloadItem payloadItem : varPayload.getItems()) {            
-            buf.writeByte(payloadItem.getReturnCode().getCode());
-            buf.writeByte(payloadItem.getDataTransportSize().getCode());
-            //TODO: Check if this is correct?!?! Might be problems with sizeInBits = true/false
-            //TODO: This field is in BCD
-            switch (payloadItem.getDataTransportSize()){
-                case BIT: 
-                    //Check for bits length
-                    buf.writeShort(payloadItem.getData().length);                    
-                    break;
-                case BYTE_WORD_DWORD: 
-                case INTEGER:
-                    //Length in bits
-                    buf.writeShort(payloadItem.getData().length * 8);                      
-                    break;
-                case  NULL:
-                    break;
-                case DINTEGER:                    
-                case OCTET_STRING:
-                case REAL:
-                    //Length in bytes
-                    buf.writeShort(payloadItem.getData().length);                     
-                    break;
-            }           
-            buf.writeBytes(payloadItem.getData());  
-
-            // if this is not the last item and it's payload is exactly one byte, we need to output a fill-byte.
-            //if((payloadItem.getData().length == 1) && (!lastItem)) {
-          
-            if((payloadItem.getData().length == 1) && (varPayload.getItems().size() > i) || (payloadItem.getData().length % 2 != 0)) {
-                buf.writeByte(0x00); 
-            }  
-            
-            i++;            
-        }
-    }
-    
-    private void encodeCpuServicesPayload(CpuServicesPayload cpuServicesPayload, ByteBuf buf)
-            throws PlcProtocolException {
-
-        buf.writeByte(cpuServicesPayload.getReturnCode().getCode());
-
-        if (cpuServicesPayload.getReturnCode() == DataTransportErrorCode.NOT_FOUND) {
-            buf.writeByte(DataTransportSize.NULL.getCode()); 
-            buf.writeShort(0x0000);
-        // This seems to be constantly set to this.
-        } else {
-            buf.writeByte(DataTransportSize.OCTET_STRING.getCode());
-
-            // A request payload is simple.
-            if (cpuServicesPayload.getSslDataRecords().isEmpty()) {
-                buf.writeShort(4);
-                buf.writeShort(cpuServicesPayload.getSslId().getCode());
-                buf.writeShort(cpuServicesPayload.getSslIndex());
-            }
-            // The response payload contains a lot more information.
-            else {
-                throw new PlcProtocolException("Unexpected SZL Data Records");
-                /*short length = 8;
-                short sizeOfDataItem = 0;
-                for (SslDataRecord sslDataRecord : cpuServicesPayload.getSslDataRecords()) {
-                    sizeOfDataItem = (short) (sslDataRecord.getLengthInWords() * (short) 2);
-                    length += sizeOfDataItem;
-                }
-                buf.writeShort(length);
-                buf.writeShort(cpuServicesPayload.getSslId().getCode());
-                buf.writeShort(cpuServicesPayload.getSslIndex());
-                buf.writeShort(sizeOfDataItem);
-                buf.writeShort(cpuServicesPayload.getSslDataRecords().size());
-                // Output any sort of ssl list items, if there are any.
-                for (SslDataRecord sslDataRecord : cpuServicesPayload.getSslDataRecords()) {
-                    if(sslDataRecord instanceof SslModuleIdentificationDataRecord) {
-                        SslModuleIdentificationDataRecord midr = (SslModuleIdentificationDataRecord) sslDataRecord;
-                        buf.writeShort(midr.getIndex());
-                        byte[] articleNumberBytes = midr.getArticleNumber().getBytes(StandardCharsets.UTF_8);
-                        // An array full of 20 spaces.
-                        byte[] data = new byte[]{0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-                            0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20};
-                        // Copy max 20 bytes from the article number into the dest array.
-                        System.arraycopy(articleNumberBytes, 0, data, 0, 20);
-                        buf.writeBytes(data);
-                        buf.writeShort(midr.getModuleOrOsVersion());
-                        buf.writeShort(midr.getPgDescriptionFileVersion());
-                    }
-                }*/
-            }
-        }
-    }    
-    
-    private void encodeCpuMessageSubcriptionPayload(CpuMessageSubscriptionServicePayload cpuServicesPayload, ByteBuf buf)
-        throws PlcProtocolException {
-        buf.writeByte(cpuServicesPayload.getReturnCode().getCode());
-        buf.writeByte(cpuServicesPayload.getDataTransportSize().getCode());
-        if ((cpuServicesPayload.getSubscribedEvents() & 0x80) == 0){
-            buf.writeShort(0x000A);
-        } else {
-            buf.writeShort(0x000C);  
-        };
-        buf.writeByte(cpuServicesPayload.getSubscribedEvents());
-        buf.writeByte(0x00);
-        buf.writeBytes(cpuServicesPayload.getId().getBytes());
-        if ((cpuServicesPayload.getSubscribedEvents() & 0x80) == 0x80){
-            buf.writeByte(cpuServicesPayload.getAlarm().getCode());
-            buf.writeByte(0x00);
-        }
-    }  
-    
-    //TODO: Agregar ALARM_ACK
-    private void encodeAlarmMessagePayload(AlarmMessagePayload payload, ByteBuf buf) {
-
-       AlarmMessageItem alarmitem = payload.getMsg();
-       
-       buf.writeByte(payload.getReturnCode().getCode());
-       buf.writeByte(payload.getDataTransportSize().getCode());
-       buf.writeShort(payload.getLength());
-       
-       //Response for fragmented PLC response
-       //Check Plc4XS7Protocol. decode method
-       if (alarmitem == null) { return; };
-       List<Object> items = alarmitem.getMsgItems();
-       
-       buf.writeByte(alarmitem.getFunction());
-       buf.writeByte(alarmitem.getObjects());
-       
-       for(Object thisitem:items){
-           MessageObjectItem item = (MessageObjectItem) thisitem;
-           switch (item.getSyntaxID()) {
-                case S7ANY:;
-                 logger.debug("encodeAlarmMessagePayload: S7ANY no supportesd");
-                break;
-                case PBC_R_ID:;
-                 logger.debug("encodeAlarmMessagePayload: PBC_R_ID no supportesd");                
-                break;                        
-                case ALARM_LOCKFREE:;
-                 logger.debug("encodeAlarmMessagePayload: ALARM_LOCKFREE no supportesd");                
-                break;                        
-                case ALARM_IND:;
-                 logger.debug("encodeAlarmMessagePayload: ALARM no supportesd");                
-                break;                        
-                case ALARM_ACK:{
-                   logger.debug("encodeAlarmMessagePayload: ALARM_ACK");
-                   buf.writeByte(item.getVariableSpecification());
-                   buf.writeByte(item.getLength());
-                   buf.writeByte(item.getSyntaxID().getCode());
-                   buf.writeByte(item.getNumberOfValues());
-                   buf.writeInt(item.getEventID());
-                   buf.writeByte(item.getAckStateGoing());
-                   buf.writeByte(item.getAckStateComming());                    
-                };
-                break;                        
-                case ALARM_QUERYREQ:{
-                   logger.debug("encodeAlarmMessagePayload: ALARM_QUERYREQ");                    
-                   buf.writeByte(item.getVariableSpecification());
-                   buf.writeByte(item.getLength());
-                   buf.writeByte(item.getSyntaxID().getCode());
-                   buf.writeByte(0x00); //Unknown/Reserved
-                   buf.writeByte(item.getQuerytype().getCode());
-                   buf.writeByte(0x34); //Unknown/Reserved
-                   buf.writeInt(item.getAlarmtype().getCode());                     
-                };
-                break;                        
-                case NOTIFY_IND:;
-                 logger.debug("encodeAlarmMessagePayload: NOTIFY_IND no supportesd");                
-                break;                        
-                case NIC:;
-                 logger.debug("encodeAlarmMessagePayload: NIC no supportesd");                
-                break;                        
-                case DRIVEESANY:;
-                 logger.debug("encodeAlarmMessagePayload: DRIVEESANY no supportesd");                
-                break;                        
-                case DBREAD:;
-                 logger.debug("encodeAlarmMessagePayload: DBREAD no supportesd");                
-                break;                        
-                case SYM1200:;
-                 logger.debug("encodeAlarmMessagePayload: SYM1200 no supportesd");                
-                break;                        
-               default:;               
-           }
-       }         
-    }    
-
-    private void encodeCpuCyclicSubscriptionPayload(CpuCyclicServicesRequestPayload payload, ByteBuf buf) {
-        buf.writeByte(payload.getReturnCode().getCode());
-        buf.writeByte(payload.getDataTransportSize().getCode());
-        buf.writeShort(payload.getLength());
-        //Unsuscription
-        if (payload.getLength() == 2) {
-            buf.writeByte(payload.getFunction());
-            buf.writeByte(payload.getJobId());
-        } else {
-           //Suscription message
-           buf.writeShort(payload.getItemCount());
-           buf.writeByte(payload.getTimeBase().getCode());
-           buf.writeByte(payload.getTimeFactor());
-           payload.getItems().forEach((anyvar)->{
-               encodeS7AnyPayloadItem(anyvar,buf);
-           });     
-       };
-   }    
-    
-    private void encodeParameters(S7Message in, ByteBuf buf) throws PlcProtocolException {
-        for (S7Parameter s7Parameter : in.getParameters()) {
-            buf.writeByte(s7Parameter.getType().getCode());
-            switch (s7Parameter.getType()) {
-                case READ_VAR:
-                case WRITE_VAR:
-                    encodeParameterReadWriteVar(buf, (VarParameter) s7Parameter);
-                    break;
-                case SETUP_COMMUNICATION:
-                    encodeParameterSetupCommunication(buf, (SetupCommunicationParameter) s7Parameter);
-                    break;
-                case CPU_SERVICES:
-                    encodeCpuServicesParameter(buf, (CpuServicesParameter) s7Parameter);
-                    break;
-                default:
-                    throw new PlcProtocolException("Writing parameters of type " +
-                        s7Parameter.getType().name() + " not implemented.");
-            }
-        }
-    }
-
-    private void encodeHeader(S7Message in, ByteBuf buf) {
-        buf.writeByte(S7_PROTOCOL_MAGIC_NUMBER);
-        buf.writeByte(in.getMessageType().getCode());
-        // Reserved (is always constant 0x0000)
-        buf.writeShort((short) 0x0000);
-        // PDU Reference (Request Id, generated by the initiating node)
-        buf.writeShort(in.getTpduReference());
-        // S7 message parameters length
-        buf.writeShort(S7SizeHelper.getParametersLength(in.getParameters()));
-        // Data field length
-        buf.writeShort(S7SizeHelper.getPayloadsLength(in.getPayloads()));
-        // Not sure why this is implemented, we should never be sending out responses.
-        /*if (in instanceof S7ResponseMessage) {
-            S7ResponseMessage s7ResponseMessage = (S7ResponseMessage) in;
-            buf.writeByte(s7ResponseMessage.getErrorClass());
-            buf.writeByte(s7ResponseMessage.getErrorCode());
-        }*/
-    }
-
-    private void encodeParameterSetupCommunication(ByteBuf buf, SetupCommunicationParameter s7Parameter) {
-        // Reserved (is always constant 0x00)
-        buf.writeByte((byte) 0x00);
-        buf.writeShort(s7Parameter.getMaxAmqCaller());
-        buf.writeShort(s7Parameter.getMaxAmqCallee());
-        buf.writeShort(s7Parameter.getPduLength());        
-    }
-
-    private void encodeParameterReadWriteVar(ByteBuf buf, VarParameter s7Parameter) throws PlcProtocolException {
-        List<VarParameterItem> items = s7Parameter.getItems();
-        // PlcReadRequestItem count (Read one variable at a time)
-        buf.writeByte((byte) items.size());
-        for (VarParameterItem item : items) {
-            VariableAddressingMode addressMode = item.getAddressingMode();
-            if (addressMode == VariableAddressingMode.S7ANY) {
-                encodeS7AnyParameterItem(buf, (S7AnyVarParameterItem) item);
-            } else {
-                throw new PlcProtocolException("Writing VarParameterItems with addressing mode " +
-                    addressMode.name() + " not implemented");
-            }
-        }
-    }
-
-    private void encodeCpuServicesParameter(ByteBuf buf, CpuServicesParameter parameter) {
-        // Output the header for a CPU Services parameter.
-        buf.writeByte(0x01);
-        buf.writeByte(0x12);
-        // Length of the parameter.
-        
-        buf.writeByte((parameter instanceof CpuServicesRequestParameter) ? 0x04 : 0x08);
-        // Is this a request or a response?
-        buf.writeByte((parameter instanceof CpuServicesRequestParameter) ? 0x11 : 0x12);
-        // This is a mixture of request/response and function group .
-        byte nextByte = (byte) (((parameter instanceof CpuServicesRequestParameter) ?
-            (byte) 0x40 : (byte) 0x80) | parameter.getFunctionGroup().getCode());
-        
-        //For fragmented response
-        if ((parameter instanceof CpuServicesResponseParameter) && 
-                (parameter.getSequenceNumber() != 0)){
-            nextByte = (byte) (0x40 + parameter.getFunctionGroup().getCode());
-        }
-        
-        buf.writeByte(nextByte);
-        if (parameter instanceof CpuCyclicServicesRequestParameter) {
-            buf.writeByte(((CpuCyclicServicesRequestParameter) parameter).getCyclicSubFunction().getCode());
-        } else {
-            buf.writeByte(parameter.getSubFunctionGroup().getCode());
-        }
-        buf.writeByte(parameter.getSequenceNumber());
-
-        // A response parameter has some more fields.
-        // Not sure why this is implemented, we should never be sending out responses.
-        /*if(parameter instanceof CpuServicesResponseParameter) {
-            CpuServicesResponseParameter responseParameter = (CpuServicesResponseParameter) parameter;
-            buf.writeByte(responseParameter.getDataUnitReferenceNumber());
-            buf.writeByte(responseParameter.isLastDataUnit() ? 0x00 : 0x01);
-            buf.writeShort(responseParameter.getError().getCode());
-        }*/
-        //R: if parameter.getSequenceNumber() == 2 then is fragment message query
-        //   from Plc4XS7Protocol decode method.
-        if (parameter.getSequenceNumber() != 0x00) {
-            buf.writeByte(0x00); //DataUnitReferenceNumber
-            buf.writeByte(0x00); //LastDataUnit
-            buf.writeShort(0x0000); //Error code
-        }
-        
-    }
-
-    //TODO: Refactor S7AnyVarParameterItem to S7AnyVarItem
-    private void encodeS7AnyParameterItem(ByteBuf buf, S7AnyVarParameterItem s7AnyRequestItem) {
-        buf.writeByte(s7AnyRequestItem.getSpecificationType().getCode());
-        // Length of this item (excluding spec type and length)
-        buf.writeByte((byte) 0x0a);
-        buf.writeByte(s7AnyRequestItem.getAddressingMode().getCode());
-        //buf.writeByte(s7AnyRequestItem.getDataType().getTypeCode());
-        
-        buf.writeByte(s7AnyRequestItem.getDataType().getBaseType().getTypeCode());
-
-        buf.writeShort(encodeNumElements(s7AnyRequestItem));
-        buf.writeShort(s7AnyRequestItem.getDataBlockNumber());
-        buf.writeByte(s7AnyRequestItem.getMemoryArea().getCode());
-        // A S7 address is 3 bytes long. Unfortunately the byte-offset is NOT located in
-        // byte 1 and byte 2 and the bit offset in byte 3. Siemens used the last 3 bits of
-        // byte 3 for the bit-offset and the remaining 5 bits of byte 3 to contain the lowest
-        // 5 bits of the byte-offset. The highest 5 bits of byte 1 are probably left unused
-        // for future extensions.
-        buf.writeShort((short) (s7AnyRequestItem.getByteOffset() >> 5));
-        buf.writeByte((byte) ((
-                (s7AnyRequestItem.getByteOffset() & 0x1F) << 3)
-                | (s7AnyRequestItem.getBitOffset() & 0x07)));
-    }
-    
-    //TODO: Refactor S7AnyVarPayloadItem to S7AnyVarItem
-    private void encodeS7AnyPayloadItem(S7AnyVarPayloadItem s7AnyRequestItem, ByteBuf buf) {
-        buf.writeByte(s7AnyRequestItem.getSpecificationType().getCode());
-        // Length of this item (excluding spec type and length)
-        buf.writeByte((byte) 0x0a);
-        buf.writeByte(s7AnyRequestItem.getAddressingMode().getCode());
-        //buf.writeByte(s7AnyRequestItem.getDataType().getTypeCode());
-        buf.writeByte(s7AnyRequestItem.getDataType().getBaseType().getTypeCode());
-
-        buf.writeShort(encodeNumElements(s7AnyRequestItem));
-        buf.writeShort(s7AnyRequestItem.getDataBlockNumber());
-        buf.writeByte(s7AnyRequestItem.getMemoryArea().getCode());
-        // A S7 address is 3 bytes long. Unfortunately the byte-offset is NOT located in
-        // byte 1 and byte 2 and the bit offset in byte 3. Siemens used the last 3 bits of
-        // byte 3 for the bit-offset and the remaining 5 bits of byte 3 to contain the lowest
-        // 5 bits of the byte-offset. The highest 5 bits of byte 1 are probably left unused
-        // for future extensions.
-        buf.writeShort((short) (s7AnyRequestItem.getByteOffset() >> 5));
-        buf.writeByte((byte) ((
-                (s7AnyRequestItem.getByteOffset() & 0x1F) << 3)
-                | (s7AnyRequestItem.getBitOffset() & 0x07)));
-    }
-        
-    /**
-     * this is a workaround for the date and time types, as native requests with the datatypes are
-     * @return
-     */
-        //TODO: Refactor S7AnyVarParameterItem to S7AnyVarItem
-    private short encodeNumElements(S7AnyVarParameterItem s7AnyVarParameterItem){
-        switch (s7AnyVarParameterItem.getDataType()){
-            case DT:
-            case DATE_AND_TIME:
-            case TOD:
-            case TIME_OF_DAY:
-            case DATE:
-                return (short) (s7AnyVarParameterItem.getNumElements()*s7AnyVarParameterItem.getDataType().getSizeInBytes());
-            default:
-                return (short) s7AnyVarParameterItem.getNumElements();
-        }
-
-    }    
-    
-    /**
-     * this is a workaround for the date and time types, as native requests with the datatypes are
-     * @return
-     */
-    //TODO: Refactor S7AnyVarPayloadItem to S7AnyVarItem
-    private short encodeNumElements(S7AnyVarPayloadItem s7AnyVarParameterItem){
-        switch (s7AnyVarParameterItem.getDataType()){
-            case DATE_AND_TIME:
-            case TOD:
-            case TIME_OF_DAY:
-            case DATE:
-            case DT:
-                return (short) (s7AnyVarParameterItem.getNumElements()*s7AnyVarParameterItem.getDataType().getSizeInBytes());               
-            case STRING:
-               break; 
-            default:
-                return (short) s7AnyVarParameterItem.getNumElements();
-        }
-        return 0;
-    }  
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Decoding
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    @Override
-    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-        decoder.channelRead(ctx, msg);
-        super.channelRead(ctx, msg);
-    }
-
-    protected void decode(ChannelHandlerContext ctx, IsoTPMessage in, List<Object> out) {
-        if (logger.isTraceEnabled()) {
-            logger.trace("Got Data: {}", ByteBufUtil.hexDump(in.getUserData()));
-        }
-        ByteBuf userData = in.getUserData();
-        if (userData.readableBytes() == 0) {
-            return;
-        }
-                      
-        if (userData.readByte() != S7_PROTOCOL_MAGIC_NUMBER) {
-            logger.warn("Expecting S7 protocol magic number.");
-            if (logger.isDebugEnabled()) {
-                logger.debug("Got Data: {}", ByteBufUtil.hexDump(userData));
-            }
-            return;
-        }
-                
-        MessageType messageType = MessageType.valueOf(userData.readByte());
-        //Some response maybe USER_DATA
-        //Header: Userdata. Parameter:(Response)->(CPU functions)->(ALARM ack)
-           
-        //The driver freezes if it does not recognize 
-        //the MessageType.ACK type in response
-        boolean isResponse = (messageType == MessageType.ACK_DATA) || (messageType == MessageType.ACK);        
-        userData.readShort();  // Reserved (is always constant 0x0000)
-        short tpduReference = userData.readShort();
-        short headerParametersLength = userData.readShort();
-        short userDataLength = userData.readShort();
-        byte errorClass = 0;
-        byte errorCode = 0;
-
-        //If the PLC response qith error then messagetype == MessageType.ACK
-        if (isResponse) {            
-            errorClass = userData.readByte();
-            errorCode = userData.readByte();
-        }
-
-        List<S7Parameter> s7Parameters = new LinkedList<>();
-        int i = 0;
-
-        while (i < headerParametersLength) {
-            S7Parameter parameter = decodeParameter(userData, isResponse);
-            s7Parameters.add(parameter);
-            if (parameter instanceof SetupCommunicationParameter) {
-                handleSetupCommunications(ctx, (SetupCommunicationParameter) parameter);
-            }
-            i += S7SizeHelper.getParameterLength(parameter);
-        }
-        
-        List<S7Payload> s7Payloads = decodePayloads(userData, isResponse, userDataLength, s7Parameters);
-        logger.debug("S7 Message with id {}Ā received", tpduReference);
-        
-        //Case: USER_DATA CpuCyclicServicesResponseParameter
-        if (messageType == MessageType.USER_DATA){
-            if (s7Parameters.get(0) instanceof CpuCyclicServicesResponseParameter){
-                CpuCyclicServicesResponseParameter parameter = (CpuCyclicServicesResponseParameter) s7Parameters.get(0);
-                if (parameter.getSubCycFunctionGroup() == CpuCyclicServicesParameterSubFunctionGroupType.CYCLIC_UNSUBSCRIBE){
-                    isResponse = true;
-                }
-            }
-            
-            //TODO: Check for other combinations
-            if (s7Parameters.get(0) instanceof CpuServicesResponseParameter){                
-                CpuServicesResponseParameter parameter = (CpuServicesResponseParameter) s7Parameters.get(0);
-                if (parameter.getSubFunctionGroup() == CpuServicesParameterSubFunctionGroup.ALARM_ACK){
-                    isResponse = true;
-                }
-            }
-        };
-
-        if (isResponse) {
-            S7ResponseMessage responseMessage = new S7ResponseMessage(
-                messageType, tpduReference, s7Parameters, s7Payloads, errorClass, errorCode);
-
-            // Remove the current response from the list of unconfirmed messages.
-            DataTpdu requestTpdu = sentButUnacknowledgedTpdus.remove(tpduReference);
-            logger.debug("decode: S7 Message with id {}Ā remove", tpduReference);
-
-            // Get the corresponding request message.
-            S7RequestMessage requestMessage = (requestTpdu != null) ? (S7RequestMessage) requestTpdu.getParent() : null;
-
-            if(requestMessage != null) {
-                // Set this individual request to "acknowledged".
-                requestMessage.setAcknowledged(true);
-
-                // Give the request and response to a message processor to process the incoming message.
-                if(messageProcessor != null) {
-                    try {
-                        responseMessage = messageProcessor.processResponse(requestMessage, responseMessage);
-                    } catch(Exception e) {
-                        logger.error("Error processing message", e);
-                        ctx.fireExceptionCaught(e);
-                        return;
-                    }
-                }
-
-                if(responseMessage != null) {
-                    out.add(responseMessage);
-                    // If this is a USER_DATA packet the probability is high that this is
-                    // a response to the identification request, we have to handle that.
-                    if(responseMessage.getMessageType() == MessageType.USER_DATA) {
-                        for (S7Payload payload : responseMessage.getPayloads()) {
-                            if(payload instanceof CpuServicesPayload) {
-                                handleIdentifyRemote(ctx, (CpuServicesPayload) payload);
-                            }
-                        }
-                    }
-                }
-
-                // Try to send the next message (if there is one).
-                trySendingMessages(ctx);
-            }
-
-        } else {
-            // !CpuService responses are encoded as requests. 
-            // No!, we need check in the next layer Plc4XS7Protocol like response
-            for (S7Parameter s7Parameter : s7Parameters) {
-                // Only if we have a response parameter, the payload is a response payload.
-                if(s7Parameter instanceof CpuServicesResponseParameter) {
-
-                    for (S7Payload s7Payload : s7Payloads) {
-                        if((s7Payload instanceof CpuServicesPayload)) {
-                            CpuServicesPayload cpuServicesPayload = (CpuServicesPayload) s7Payload;
-                            // Remove the current response from the list of unconfirmed messages.
-                            sentButUnacknowledgedTpdus.remove(tpduReference);
-                            logger.debug("CpuServicesPayload: S7 Message with id {}Ā remove", tpduReference);  
-   
-                            handleIdentifyRemote(ctx, cpuServicesPayload);
- 
-                        } else {
-                            sentButUnacknowledgedTpdus.remove(tpduReference);
-                            logger.debug("CpuCyclicServicesResponsePayload: S7 Message with id {}Ā remove", tpduReference); 
-                        }
-                    }
-                } else if (s7Parameter instanceof CpuServicesPushParameter){
-                    //*** MENSAGE PUSH ***"
-                    //out.add(new S7ResponseMessage(messageType, tpduReference, s7Parameters, s7Payloads, errorClass, errorCode)); 
-                }
-            }            
-            //out.add(new S7RequestMessage(messageType, tpduReference, s7Parameters, s7Payloads, null));
-            out.add(new S7ResponseMessage(messageType, tpduReference, s7Parameters, s7Payloads, errorClass, errorCode)); 
-        }
-    }
-
-    private void handleSetupCommunications(ChannelHandlerContext ctx, SetupCommunicationParameter setupCommunicationParameter) {
-        maxAmqCaller = setupCommunicationParameter.getMaxAmqCaller();
-        maxAmqCallee = setupCommunicationParameter.getMaxAmqCallee();
-        pduSize = setupCommunicationParameter.getPduLength();
-        
-        ctx.channel().attr(pduSizeKey).set(pduSize);
-
-        if(logger.isInfoEnabled()) {
-            logger.info("S7Connection established pdu-size {}, max-amq-caller {}, " +
-                "max-amq-callee {}", pduSize, maxAmqCaller, maxAmqCallee);
-        }
-
-        // Only if the controller type is set to "ANY", then try to identify the PLC type.
-        if(controllerType == S7ControllerType.ANY) {
-            // Prepare a message to request the remote to identify itself.
-            S7RequestMessage identifyRemoteMessage = new S7RequestMessage(MessageType.USER_DATA, (short) 2,
-                Collections.singletonList(new CpuServicesRequestParameter(
-                    CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
-                    CpuServicesParameterSubFunctionGroup.READ_SSL, (byte) 0)),
-                Collections.singletonList(new CpuServicesPayload(DataTransportErrorCode.OK, SslId.MODULE_IDENTIFICATION,
-                    (short) 0x0000)), null);
-            ctx.channel().writeAndFlush(identifyRemoteMessage);
-        }
-        // If a concrete type was specified, then we're done here.
-        else {
-            if(logger.isDebugEnabled()) {
-                logger.debug("Successfully connected to S7: {}", controllerType.name());
-                logger.debug("- max amq caller: {}", maxAmqCaller);
-                logger.debug("- max amq callee: {}", maxAmqCallee);
-                logger.debug("- pdu size: {}", pduSize);
-            }
-            if(logger.isInfoEnabled()) {
-                logger.info("Successfully connected to S7: {} wit PDU {}", controllerType.name(),pduSize);
-            }
-
-            // Send an event that connection setup is complete.
-            ctx.channel().pipeline().fireUserEventTriggered(new S7ConnectedEvent());
-        }
-    }
-
-    private void handleIdentifyRemote(ChannelHandlerContext ctx, CpuServicesPayload cpuServicesPayload) {
-        controllerType = S7ControllerType.ANY;
-        /*
-        for (SslDataRecord sslDataRecord : cpuServicesPayload.getSslDataRecords()) {
-            if(sslDataRecord instanceof SslModuleIdentificationDataRecord) {
-                SslModuleIdentificationDataRecord sslModuleIdentificationDataRecord =
-                    (SslModuleIdentificationDataRecord) sslDataRecord;
-                if(sslModuleIdentificationDataRecord.getIndex() == (short) 0x0001) {
-                    controllerType = lookupControllerType(sslModuleIdentificationDataRecord.getArticleNumber());
-                }
-            }
-        */
-        if (cpuServicesPayload.getSslId() == SslId.MODULE_IDENTIFICATION) {
-            if ((cpuServicesPayload.getSslIndex() == 0x0000) || (cpuServicesPayload.getSslIndex() == 0x0001)){
-                ByteBuf payload = cpuServicesPayload.getSslPayload();
-                CharSequence MlfB = payload.getCharSequence(6, 20, Charset.defaultCharset());
-                controllerType = lookupControllerType(MlfB.toString());
-            }
-        }
-        if(logger.isDebugEnabled()) {
-            logger.debug("Successfully connected to S7: {}", controllerType.name());
-            logger.debug("-  max amq caller: {}", maxAmqCaller);
-            logger.debug("-  max amq callee: {}", maxAmqCallee);
-            logger.debug("-  pdu size: {}", pduSize);
-        }
-        if(logger.isInfoEnabled()) {
-            logger.info("Successfully connected to S7: {} wit PDU {}", controllerType.name(), pduSize);
-        }
-
-        // Send an event that connection setup is complete.
-        ctx.channel().pipeline().fireUserEventTriggered(new S7ConnectedEvent());
-    }
-
-    private List<S7Payload> decodePayloads(ByteBuf userData, boolean isResponse, short userDataLength, List<S7Parameter> s7Parameters) {
-        List<S7Payload> s7Payloads = new LinkedList<>();
-        for (S7Parameter s7Parameter : s7Parameters) {
-            if(s7Parameter instanceof VarParameter) {
-                VarParameter readWriteVarParameter = (VarParameter) s7Parameter;
-                VarPayload varPayload = decodeVarPayload(userData, isResponse, userDataLength, readWriteVarParameter);
-                s7Payloads.add(varPayload);
-            } else if(s7Parameter instanceof CpuServicesParameter) {
-                S7Payload cpuServicesPayload = decodeCpuServicesPayload((CpuServicesParameter)s7Parameter, userData);
-                s7Payloads.add(cpuServicesPayload);
-            } else if (s7Parameter instanceof CpuServicesPushParameter){
-                S7Payload cpuServicesPayload = decodeCpuServicesPayload((CpuServicesParameter)s7Parameter, userData);
-                s7Payloads.add(cpuServicesPayload); 
-            }
-        }
-        return s7Payloads;
-    }
-
-    private VarPayload decodeVarPayload(ByteBuf userData, boolean isResponse, short userDataLength,
-                                        VarParameter readWriteVarParameter) {
-        //System.out.println("decodeVarPayload:\r\n" + ByteBufUtil.prettyHexDump(userData));
-        List<VarPayloadItem> payloadItems = new LinkedList<>();
-
-        // Just keep on reading payloads until the provided length is read.
-        int i = 0;
-        while (i < userDataLength) {
-            DataTransportErrorCode dataTransportErrorCode = DataTransportErrorCode.valueOf(userData.readByte());
-
-            // This is a response to a WRITE_VAR request (It only contains the return code for every sent item.
-            if ((readWriteVarParameter.getType() == ParameterType.WRITE_VAR) && isResponse) {
-                // Initialize a rudimentary payload (This is updated in the Plc4XS7Protocol class
-                VarPayloadItem payload = new VarPayloadItem(dataTransportErrorCode, null, null);
-                payloadItems.add(payload);
-                i += 1;
-            }
-            // This is a response to a READ_VAR request.
-            else if ((readWriteVarParameter.getType() == ParameterType.READ_VAR) && isResponse) {
-                DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
-                short length = dataTransportSize.isSizeInBits() ?
-                    (short) Math.ceil(userData.readShort() / 8.0) : userData.readShort();
-                byte[] data = new byte[length];
-                userData.readBytes(data);
-                // Initialize a rudimentary payload (This is updated in the Plc4XS7Protocol class
-                VarPayloadItem payload = new VarPayloadItem(dataTransportErrorCode, dataTransportSize, data);
-                payloadItems.add(payload);
-                i += S7SizeHelper.getPayloadLength(payload);
-
-                // It seems that odd-byte payloads require a fill byte, but only if it's not the last item.
-                if((length % 2== 1) && (userData.readableBytes() > 0)) {
-                    userData.readByte();
-                    i++;
-                }
-            }
-        }
-
-        return new VarPayload(readWriteVarParameter.getType(), payloadItems);
-    }
-
-    private S7Payload decodeCpuServicesPayload(CpuServicesParameter parameter, ByteBuf userData) {
-        if (parameter.getFunctionGroup() == CpuServicesParameterFunctionGroup.CPU_FUNCTIONS) {
-            switch(parameter.getSubFunctionGroup()){
-                case READ_SSL: {
-                    CpuServicesPayload payload = decodeReadSslPayload(parameter, userData);
-                    return payload;
-                }
-                case MESSAGE_SERVICE:{  
-                    AlarmMessagePayload payload = decodeMessageServicePayload(parameter, userData); 
-                    return payload;            
-                }
-                case DIAG_MESSAGE:{
-                    CpuDiagnosticMessagePayload payload = decodeCpuDiagnosticMessagePayload(parameter, userData);
-                    return payload;
-                }
-                case ALARM8:;
-                    logger.info("decode ALARM8.....");
-                    
-                    break;
-                case NOTIFY:;
-                    logger.info("decode NOTIFY.....");
-                    break;
-                case ALARM8_LOCK:;
-                    logger.info("decode ALARM8_LOCK.....");
-                    break;
-                case ALARM8_UNLOCK:;
-                    logger.info("decode ALARM8_UNLOCK.....");
-                    break;
-                case SCAN:;
-                    logger.info("decode SCAN.....");
-                    break;
-                case ALARM_ACK:{  
-                    AlarmMessagePayload payload = decodeMessageServiceAckPayload(parameter, userData);                
-                    return payload;            
-                }
-                case ALARM_ACK_IND:{
-                    AlarmMessagePayload payload = decodeMessageServicePushPayload(parameter, userData);
-                    return payload;
-                }
-                case ALARM8_LOCK_IND:;
-                    logger.info("decode ALARM8_LOCK_IND.....");
-                    break;
-                case ALARM8_UNLOCK_IND:;
-                    logger.info("decode ALARM8_UNLOCK_IND.....");
-                    break;
-                case ALARM_SQ_IND:{  
-                    AlarmMessagePayload payload = decodeMessageServicePushPayload(parameter, userData);                
-                    return payload;            
-                }
-                case ALARM_S_IND: {
-                    AlarmMessagePayload payload = decodeMessageServicePushPayload(parameter, userData);
-                    return payload;
-                }
-                case ALARM_QUERY:{
-                    AlarmMessagePayload payload = decodeMessageServiceQueryPayload(parameter, userData);
-                    return payload;
-                }
-                case NOTIFY8: {
-                    AlarmMessagePayload payload = decodeMessageServicePushPayload(parameter, userData);
-                    return payload;
-                }
-                case ALARM: {
-                    AlarmMessagePayload payload = decodeMessageServicePushPayload(parameter, userData);
-                    return payload;
-                }                
-                default:;
-                    break;
-            } 
-            
-        } else if (parameter.getFunctionGroup() == CpuServicesParameterFunctionGroup.CYCLIC_SERVICES) {
-            if (parameter instanceof CpuCyclicServicesResponseParameter){
-                CpuCyclicServicesResponseParameter pushparameter = (CpuCyclicServicesResponseParameter) parameter;
-                switch(pushparameter.getSubCycFunctionGroup()){
-                    case CYCLIC_CHANGE:;
-                        break;
-                    case CYCLIC_CHANGE_MODIFY:;
-                        break;
-                    case CYCLIC_RDREC:;    
-                        break;
-                    case CYCLIC_TRANSFER: {
-                        CpuCyclicServicesResponsePayload payload = decodeCyclicServiceResponsePayload(pushparameter, userData);
-                        return payload;
-                    }
-                    case CYCLIC_UNSUBSCRIBE:{   
-                        CpuCyclicServicesResponsePayload payload = decodeCyclicServiceResponsePayload(pushparameter, userData);
-                        return payload;
-                    }
-                    default: logger.info("decodeCpuServicesPayload: No Sub Cyc Function Group.");
-                }
-            }
-        }
-        return null;
-    }
-
-    private S7Parameter decodeParameter(ByteBuf in, boolean isResponse) {
-        ParameterType parameterType = ParameterType.valueOf(in.readByte());
-        if (parameterType == null) {
-            logger.error("Could not find parameter type");
-            return null;
-        }
-        switch (parameterType) {
-            case CPU_SERVICES:
-                return decodeCpuServicesParameter(in);
-            case MODE_TRANSITION:
-                return decodePushModeTransitionParameter(in);
-            case READ_VAR:
-            case WRITE_VAR:
-                List<VarParameterItem> varParameterItems;
-                byte numItems = in.readByte();
-                if (!isResponse) {
-                    varParameterItems = decodeReadWriteVarParameter(in, numItems);
-                } else {
-                    varParameterItems = Collections.singletonList(
-                        new S7AnyVarParameterItem(null, null, null, numItems, (short) 0, (short) 0, (byte) 0));
-                }
-                return new VarParameter(parameterType, varParameterItems);
-            case SETUP_COMMUNICATION:
-                // Reserved (is always constant 0x00)
-                in.readByte();
-                short callingMaxAmq = in.readShort();
-                short calledMaxAmq = in.readShort();
-                short pduLength = in.readShort();
-                return new SetupCommunicationParameter(callingMaxAmq, calledMaxAmq, pduLength);
-            default:
-                if (logger.isErrorEnabled()) {
-                    logger.error("Unimplemented parameter type: {}", parameterType.name());
-                }
-        }
-        return null;
-    }
-
-    private CpuServicesParameter decodeCpuServicesParameter(ByteBuf in) {
-        //logger.info("decodeParameter... \r\n" + ByteBufUtil.prettyHexDump(in));        
-        if(in.readShort() != 0x0112) {
-            if (logger.isErrorEnabled()) {
-                logger.error("Expecting 0x0112 for CPU_SERVICES parameter");
-            }
-            return null;
-        }
-        
-        byte parameterLength = in.readByte();
-        if((parameterLength != 4) && (parameterLength != 8)) {
-            if (logger.isErrorEnabled()) {
-                logger.error("Parameter length should be 4 or 8, but was {}", parameterLength);
-            }
-            return null;
-        }
-        // Skipping this as it sort of contains redundant information.
-        // TODO: We need check the next byte for push message (Request/Response)
-        in.readByte();
-        byte typeAndFunctionGroup = in.readByte();
-        // If bit 7 is set, it's a request (if bit 8 is set it's a response).
-        //Must be for request: 0x40 for check X100 0X00
-        //For Push message is 0000 XXXX, Request is 0100 XXXX, Response 1000 XXXX       
-        boolean pushParameter = (typeAndFunctionGroup & 0xF0) == 0;
-        boolean requestParameter = (typeAndFunctionGroup & 0x40) != 0;
-        boolean responseParameter = (typeAndFunctionGroup & 0x80) != 0;
-        
-        // The last 4 bits contain the function group value.
-        typeAndFunctionGroup = (byte) (typeAndFunctionGroup & 0x0F);
-        
-        CpuServicesParameterFunctionGroup functionGroup =
-            CpuServicesParameterFunctionGroup.valueOf(typeAndFunctionGroup);
-
-        CpuServicesParameterSubFunctionGroup subFunctionGroup =
-            CpuServicesParameterSubFunctionGroup.valueOf(in.readByte());
-        
-        byte sequenceNumber = in.readByte();
-        
-        if(pushParameter || (responseParameter && functionGroup == CpuServicesParameterFunctionGroup.CYCLIC_SERVICES)) {
-            if (functionGroup == CpuServicesParameterFunctionGroup.CYCLIC_SERVICES ) {
-               CpuCyclicServicesParameterSubFunctionGroupType subCycFunctionGroup = 
-                       CpuCyclicServicesParameterSubFunctionGroupType.valueOf(subFunctionGroup.getCode());
-               byte dataUnitReferenceNumber = in.readByte();
-               boolean lastDataUnit = in.readByte() == 0x00;
-               ParameterError error = ParameterError.valueOf(in.readShort());
-               
-               return new CpuCyclicServicesResponseParameter(functionGroup, subCycFunctionGroup, sequenceNumber,
-                            dataUnitReferenceNumber, lastDataUnit, error);               
-            } else {
-                return new CpuServicesPushParameter(functionGroup, subFunctionGroup, sequenceNumber);            
-            }
-        } else if (requestParameter) {
-            return new CpuServicesRequestParameter(functionGroup, subFunctionGroup, sequenceNumber);            
-        } else {
-            byte dataUnitReferenceNumber = in.readByte();
-            boolean lastDataUnit = in.readByte() == 0x00;
-            ParameterError error = ParameterError.valueOf(in.readShort());
-
-            return new CpuServicesResponseParameter(functionGroup, subFunctionGroup, sequenceNumber,
-                dataUnitReferenceNumber, lastDataUnit, error);
-        }
-    }
-
-    private CpuDiagnosticPushParameter decodePushModeTransitionParameter(ByteBuf in) {
-
-        if(in.readShort() != 0x0010) {
-            if (logger.isErrorEnabled()) {
-                logger.error("Expecting 0x0010 for MODE_TRANSITION parameter");
-            }
-            return null;
-        }
-        
-        byte parameterLength = in.readByte();
-        if((parameterLength != 16)) {
-            if (logger.isErrorEnabled()) {
-                logger.error("Parameter length should be 16, but was {}", parameterLength);
-            }
-            return null;
-        }   
-        CpuUserDataMethodType usermethodtype = CpuUserDataMethodType.valueOf(in.readByte());
-        byte typeandfunc = in.readByte();
-        CpuUserDataParameterType userparamtype = CpuUserDataParameterType.valueOf((byte)(typeandfunc >> 4));
-        CpuUserDataParameterFunctionGroupType userfunction =  CpuUserDataParameterFunctionGroupType.valueOf((byte)(typeandfunc & 0x0f));
-        CpuCurrentModeType cpumode = CpuCurrentModeType.valueOf(in.readByte());
-        byte sequencenumber = in.readByte();
-        return new CpuDiagnosticPushParameter(usermethodtype, userparamtype, userfunction, cpumode, sequencenumber);
-    }        
-    
-    private List<VarParameterItem> decodeReadWriteVarParameter(ByteBuf in, byte numItems) {
-        List<VarParameterItem> items = new LinkedList<>();
-        for (int i = 0; i < numItems; i++) {
-            SpecificationType specificationType = SpecificationType.valueOf(in.readByte());
-            // Length of the rest of this item.
-            byte itemLength = in.readByte();
-            if (itemLength != 0x0a) {
-                logger.warn("Expecting a length of 10 here.");
-                return items;
-            }
-            VariableAddressingMode variableAddressingMode = VariableAddressingMode.valueOf(in.readByte());
-            if (variableAddressingMode == VariableAddressingMode.S7ANY) {
-                TransportSize dataType = TransportSize.valueOf(in.readByte());
-                short length = in.readShort();
-                short dbNumber = in.readShort();
-                byte memoryAreaCode = in.readByte();
-                MemoryArea memoryArea = MemoryArea.valueOf(memoryAreaCode);
-                if(memoryArea == null) {
-                    throw new PlcRuntimeException("Unknown memory area '" + memoryAreaCode + "'");
-                }
-                short byteAddress = (short) (in.readShort() << 5);
-                byte tmp = in.readByte();
-                // Only the least 3 bits are the bit address, the
-                byte bitAddress = (byte) (tmp & 0x07);
-                // Bits 4-8 belong to the byte address
-                byteAddress = (short) (byteAddress | (tmp >> 3));
-                S7AnyVarParameterItem item = new S7AnyVarParameterItem(
-                        specificationType, memoryArea, dataType,
-                        length, dbNumber, byteAddress, bitAddress);
-                items.add(item);
-            } else {
-                logger.error("Error parsing item type");
-                return items;
-            }
-        }
-
-        return items;
-    }
-    
-    private CpuServicesPayload decodeReadSslPayload(CpuServicesParameter parameter, ByteBuf userData){ 
-        //logger.info("decodeReadSslPayload: \r\n" + ByteBufUtil.prettyHexDump(userData));
-        CpuServicesResponseParameter thisparameter = null;
-        short length;
-        short dataUnitReferenceNumber = 0x0000;
-        boolean lastdataunit = true;
-        
-        DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
-        DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
-
-        
-        if (parameter instanceof CpuServicesResponseParameter){           
-            thisparameter = (CpuServicesResponseParameter) parameter;
-            dataUnitReferenceNumber = (short) thisparameter.getDataUnitReferenceNumber();
-            lastdataunit = thisparameter.isLastDataUnit();
-        }        
-        /*
-        if(dataTransportSize != DataTransportSize.OCTET_STRING) {
-            if(dataTransportSize == DataTransportSize.NULL) {
-                length = userData.readShort();
-                if (length == 0x0000) {
-                    return new CpuServicesPayload(returnCode, SslId.NULL, (short) 0x0000);
-                } else {
-                // TODO: Output an error.                    
-                }
-                
-            }   
-        }
-          */      
-        length = userData.readShort();         
-        //If is fragment message 
-        SslId sslId = SslId.NULL;
-        short sslIndex = 0x0000;
-        
-        
-        //Check for service not found
-        if (returnCode == DataTransportErrorCode.NOT_FOUND && !lastdataunit){
-            userData.clear();           
-            if (thisparameter != null){               
-                userData.writeShort(thisparameter.getError().getCode());
-            } else {
-                userData.writeShort(ParameterError.PROTOCOL_ERROR.getCode());
-            }
-           return new CpuServicesPayload(returnCode, sslId, sslIndex, userData);            
-        }        
-        
-        // If the length is 4 there is no `partial list length in bytes` and `partial list count` parameters.
-        if(length == 4) {
-            //logger.info("decodeReadSslPayload: error response.");
-            sslId = SslId.valueOf(userData.readShort());
-            sslIndex = userData.readShort();            
-            return new CpuServicesPayload(returnCode, sslId, sslIndex);
-        }
-        // If the length is not 4, then it has to be at least 8.
-        else if((length >= 8) || ((length == 0) && lastdataunit)) {                                           
-            if (!lastdataunit) {   
-                //TODO: Work with two fragments, we need test with 3 and more
-                Pair<LocalDateTime, Queue<ByteBuf>> fragments = fragmentedData.get(dataUnitReferenceNumber);
-                if (fragments != null) {
-                    Queue<ByteBuf> bytebufqueue = fragments.getValue();
-                    bytebufqueue.add(userData);
-                } else {
-                    sslId = SslId.valueOf(userData.readShort());
-                    sslIndex = userData.readShort();                       
-                    Queue<ByteBuf> bytebufqueue = new ArrayDeque();
-                    bytebufqueue.add(userData);
-                    Pair<LocalDateTime, Queue<ByteBuf>> firtsfragment = new ImmutablePair(LocalDateTime.now(), bytebufqueue);
-                    fragmentedData.put(dataUnitReferenceNumber, firtsfragment);
-                } 
-                return new CpuServicesPayload(returnCode, sslId, sslIndex);   
-            }
-            
-            //Reemsable the fragments   
-            
-            if (dataUnitReferenceNumber != 0x0000){
-                Pair<LocalDateTime, Queue<ByteBuf>> fragments = fragmentedData.get(dataUnitReferenceNumber);
-                if (fragments != null){ 
-                    Queue<ByteBuf> bytebufqueue = fragments.getValue();
-                    ByteBuf payload = bytebufqueue.remove();
-                    for(ByteBuf nextpayload:bytebufqueue){
-                        if (nextpayload != null) { 
-                            payload.writeBytes(nextpayload);
-                            nextpayload.release();                          
-                        };
-                    }               
-                    payload.writeBytes(userData);
-                    userData.clear();                 
-                    userData.writeBytes(payload);                
-                    payload.release();               
-                    fragmentedData.remove(dataUnitReferenceNumber);
-                    returnCode = DataTransportErrorCode.OK;
-                }                  
-            } else {
-                sslId = SslId.valueOf(userData.readShort());
-                sslIndex = userData.readShort();                  
-            }
-
-            //TODO: sslId & sslIndex in this point dont care, we need check!
-            return new CpuServicesPayload(returnCode, sslId, sslIndex, userData);
-            
-        }
-        // In all other cases, it's probably an error.
-        else {
-            // TODO: Output an error.
-        }   
-
-        return null;   
-    }    
-    
-    private AlarmMessagePayload decodeMessageServicePayload(CpuServicesParameter parameter, ByteBuf userData){
-        //logger.info(ByteBufUtil.prettyHexDump(userData));
-        AlarmType alarmtype = null;
-        DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
-        DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
-        int length = userData.readShort();
-        if (length != 0){
-            byte result = userData.readByte();
-            byte unknown = userData.readByte();
-
-            if (length>2) {
-                alarmtype = AlarmType.valueOf(userData.readByte());
-                unknown = userData.readByte();
-                unknown = userData.readByte();                        
-            } else {
-                //Free dummy byte
-
-            }
-        }
-        
-       return new AlarmMessagePayload(returnCode,
-                        dataTransportSize,
-                        alarmtype,
-                        length,
-                        null);
-    }
-    
-    private CpuDiagnosticMessagePayload decodeCpuDiagnosticMessagePayload(CpuServicesParameter parameter, ByteBuf userData){
-
-        LocalDateTime timestamp;
-        DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
-        DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
-        int length = userData.readShort(); //TODO: Validate userData length
-        short EventID = userData.readShort();
-        byte PriorityClass = userData.readByte();
-        byte ObNumber = userData.readByte();
-        short DatID = userData.readShort();
-        short Info1 =  userData.readShort();
-        int Info2 =  userData.readInt();
-        
-        //It is assumed that you have synchronized the time of your PLC with PC.
-        //TODO: Write util function for translate S7 DateTime
-        timestamp = readDateAndTime(userData);
-        
-        CpuDiagnosticMessageItem diagnosticitem = new CpuDiagnosticMessageItem(EventID,
-                                                        PriorityClass,
-                                                        ObNumber,
-                                                        DatID,
-                                                        Info1,
-                                                        Info2,
-                                                        timestamp);
-        
-        return new CpuDiagnosticMessagePayload(returnCode,
-                                    dataTransportSize,
-                                    length,
-                                    diagnosticitem);
-    }    
-    
-    private AlarmMessagePayload decodeMessageServicePushPayload(CpuServicesParameter parameter, ByteBuf userData){
-
-        List<Object> MessageObjects = new LinkedList<>();
-        List<ByteBuf> values = new LinkedList<>();
-        int length;
-        //Alarm message
-        LocalDateTime timestamp;
-        Byte FunctionID;
-        byte NumberOfMessgaeObjects;
-        byte EventGoing = 0x00;
-        byte EventComming = 0x00;
-        byte EventLastChange = 0x00;
-        
-        
-        //
-        DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
-        DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
-        length = userData.readShort();
-        
-        //It is assumed that you have synchronized the time of your PLC with PC.
-        //The most important field.
-        timestamp = readDateAndTime(userData);
-        
-        FunctionID = userData.readByte();
-        NumberOfMessgaeObjects = userData.readByte();
-
-        for (int i = 0; i < NumberOfMessgaeObjects; i++){
-            {
-                byte VariableSpecification = userData.readByte();
-                byte Length = userData.readByte();
-                VariableAddressingMode SyntaxID = VariableAddressingMode.valueOf(userData.readByte());
-                byte NumberOfValues = userData.readByte();
-                int EventID = userData.readInt();
-                
-                byte EventState = 0x00;
-                byte State = 0x00;
-                if (parameter.getSubFunctionGroup() != CpuServicesParameterSubFunctionGroup.ALARM_ACK_IND) {                                          
-                    EventState = userData.readByte();                
-                    State = userData.readByte();
-                }
-                
-                byte AckStateGoing = userData.readByte();
-                byte AckStateComming = userData.readByte();
-                
-                switch(parameter.getSubFunctionGroup()){
-                    case ALARM8:
-                    case NOTIFY8:
-                    case NOTIFY:
-                        EventGoing  = userData.readByte(); 
-                        EventComming  = userData.readByte(); 
-                        EventLastChange  = userData.readByte(); 
-                        userData.readByte(); //Reserved = 0x00
-                        break;                    
-                }                
-                
-                //TODO: If NumberOfValues == 0 then AssociatedValues is null
-                List<AssociatedValueItem> AssociatedValues = new LinkedList<>();
-                        
-                for (int j = 0; j < NumberOfValues; j++){
-                    {
-                        DataTransportErrorCode valueCode = DataTransportErrorCode.valueOf(userData.readByte());
-                        DataTransportSize valueTransportSize = DataTransportSize.valueOf(userData.readByte());
-                        int valueLength = userData.readShort();
-                        //Max length of value is 12 bytes
-                        valueLength = (valueLength >> 4)*2;
-                        
-                        ByteBuf Data = userData.readBytes(valueLength);
-                        
-                        AssociatedValues.add(new AssociatedValueItem(valueCode,
-                                                valueTransportSize,
-                                                valueLength,
-                                                Data));
-                    }
-                }
-                
-                MessageObjects.add( new MessageObjectItem(VariableSpecification,
-                                            Length,
-                                            SyntaxID,
-                                            NumberOfValues,
-                                            EventID,
-                                            EventState,
-                                            State,
-                                            AckStateGoing,
-                                            AckStateComming,
-                                            EventGoing,
-                                            EventComming, 
-                                            EventLastChange,                        
-                                            AssociatedValues));
-                
-            }            
-        }
-        
-        return new AlarmMessagePayload(returnCode,
-                        dataTransportSize,
-                        parameter.getSubFunctionGroup(),
-                        length,
-                        new AlarmMessageItem(timestamp,
-                                FunctionID,
-                                NumberOfMessgaeObjects,
-                                MessageObjects));  
-    };
-
-    private AlarmMessagePayload decodeMessageServiceQueryPayload(CpuServicesParameter parameter, ByteBuf userData){
-      
-        List<Object> MessageObjects = new LinkedList<>();
-        CpuServicesResponseParameter thisparameter = null;
-        int length;
-        byte FunctionID = 0x00;
-        byte NumberOfMessageObjects = 0x00; //Say 1, but I have 2 messages? Why?
-        DataTransportErrorCode AlarmReturnCode = DataTransportErrorCode.RESERVED;
-        DataTransportSize AlarmTransportSize = DataTransportSize.NULL;
-        int CompleteDataLength = 0x0000;
-        short dataUnitReferenceNumber = 0x0000;
-        boolean lastdataunit = true;
-        
-        //Data section
-        DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
-        DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
-        length = userData.readShort(); //Number of message objects?
-        
-        if (parameter instanceof CpuServicesResponseParameter){
-            thisparameter = (CpuServicesResponseParameter) parameter;
-            dataUnitReferenceNumber = (short) thisparameter.getDataUnitReferenceNumber();
-            lastdataunit = thisparameter.isLastDataUnit();
-        }
-        
-        //Response to query from S7-1500
-        if ((length == 0) && 
-            lastdataunit && 
-            (thisparameter.getSubFunctionGroup() == CpuServicesParameterSubFunctionGroup.ALARM_QUERY)){
-            return new AlarmMessagePayload(returnCode,
-                    dataTransportSize,
-                    CpuServicesParameterSubFunctionGroup.ALARM_QUERY,
-                    length,
-                    new AlarmMessageItem(FunctionID,
-                            NumberOfMessageObjects,
-                            AlarmReturnCode,
-                            AlarmTransportSize,
-                            CompleteDataLength,
-                            MessageObjects));              
-        }        
-        
-        //Response to query
-        if ((length == 6) && 
-            lastdataunit && 
-            (thisparameter.getSubFunctionGroup() == CpuServicesParameterSubFunctionGroup.ALARM_QUERY)){
-            //Alarm message information
-            FunctionID = userData.readByte();
-            NumberOfMessageObjects = userData.readByte();
-            AlarmReturnCode = DataTransportErrorCode.valueOf(userData.readByte());
-            AlarmTransportSize = DataTransportSize.valueOf(userData.readByte());
-            CompleteDataLength = userData.readShort();    
-            
-            return new AlarmMessagePayload(returnCode,
-                    dataTransportSize,
-                    CpuServicesParameterSubFunctionGroup.ALARM_QUERY,
-                    length,
-                    new AlarmMessageItem(FunctionID,
-                            NumberOfMessageObjects,
-                            AlarmReturnCode,
-                            AlarmTransportSize,
-                            CompleteDataLength,
-                            MessageObjects));              
-            
-        }        
-        
-        //Fragmente code
-        //The next Level query again.
-                
-        if ((length > 2) && (!lastdataunit)){
-            
-            //Is alway a CpuServicesResponseParameter instance?
-            //CpuServicesResponseParameter thisparameter = (CpuServicesResponseParameter) parameter;
-            Pair<LocalDateTime, Queue<ByteBuf>> fragments = fragmentedData.get(dataUnitReferenceNumber);
-            if (fragments != null) {
-                Queue<ByteBuf> bytebufqueue = fragments.getValue();
-                bytebufqueue.add(userData);
-            } else {
-                Queue<ByteBuf> bytebufqueue = new ArrayDeque();
-                bytebufqueue.add(userData);
-                Pair<LocalDateTime, Queue<ByteBuf>> firtsfragment = new ImmutablePair(LocalDateTime.now(), bytebufqueue);
-                fragmentedData.put(dataUnitReferenceNumber, firtsfragment);
-            }
-            
-            return new AlarmMessagePayload(returnCode,
-                        dataTransportSize,
-                        CpuServicesParameterSubFunctionGroup.ALARM_QUERY,
-                        length,
-                        null);             
-        }
-        
-        //Reemsable the fragments       
-        if (dataUnitReferenceNumber != 0x0000){
-            Pair<LocalDateTime, Queue<ByteBuf>> fragments = fragmentedData.get(dataUnitReferenceNumber);
-            if (fragments != null){ 
-                Queue<ByteBuf> bytebufqueue = fragments.getValue();
-                ByteBuf payload = bytebufqueue.remove();
-                for(ByteBuf nextpayload:bytebufqueue){
-                    if (nextpayload != null) { 
-                        payload.writeBytes(nextpayload);
-                        nextpayload.release();                          
-                    };
-                }               
-                payload.writeBytes(userData);
-                userData.clear();                 
-                userData.writeBytes(payload);                
-                payload.release();               
-                fragmentedData.remove(dataUnitReferenceNumber);
-            }            
-        }        
- 
-        //Alarm message information
-        FunctionID = userData.readByte();
-        NumberOfMessageObjects = userData.readByte();
-        AlarmReturnCode = DataTransportErrorCode.valueOf(userData.readByte());
-        AlarmTransportSize = DataTransportSize.valueOf(userData.readByte());
-        CompleteDataLength = userData.readShort();
-        
-        //Message Object
-        if (AlarmReturnCode == DataTransportErrorCode.OK){
-            ///length = 1+2+1+4+2+1+1+1+8+1+1+2+8+1+1+2 = 35
-            while (userData.isReadable(35)){              
-                byte LengthOfDataSet = userData.readByte();
-                int Unknown = userData.readShort();
-                AlarmQueryType AlarmType = AlarmQueryType.valueOf(userData.readByte());
-                int EnentID = userData.readInt();
-                Unknown = userData.readByte();
-                byte EventState =  userData.readByte();
-                byte AckStateGoing = userData.readByte();
-                byte AckStateComing = userData.readByte();  
-                
-                LocalDateTime timestampComing = null;
-                LocalDateTime timestampGoing = null;
-      
-                List<AssociatedValueItem> ComingValues = new LinkedList<>();
-                List<AssociatedValueItem> GoingValues = new LinkedList<>();
-               
-                switch(AlarmType){
-                    case ALARM_S:{
-                        //Coming data
-                        timestampComing = readDateAndTime(userData);                         
-                        DataTransportErrorCode valueCode = DataTransportErrorCode.valueOf(userData.readByte());
-                        DataTransportSize valueTransportSize = DataTransportSize.valueOf(userData.readByte());
-                        
-                        int valueLength = userData.readShort() / 8;
-                        
-                        ByteBuf Data = userData.readBytes(valueLength);
-                        ComingValues.add(new AssociatedValueItem(valueCode,
-                                                valueTransportSize,
-                                                valueLength,
-                                                Data));   
-                        //Going data
-                        timestampGoing = readDateAndTime(userData);
-                        
-                        valueCode = DataTransportErrorCode.valueOf(userData.readByte());
-                        valueTransportSize = DataTransportSize.valueOf(userData.readByte());
-                        
-                        valueLength = userData.readShort() / 8;;
-                        
-                        Data = userData.readBytes(valueLength);
-                        GoingValues.add(new AssociatedValueItem(valueCode,
-                                                valueTransportSize,
-                                                valueLength,
-                                                Data));                            
-                        }
-                    break;
-                    case ALARM_8: {
-                        //TODO: Decode values for ALARM_8
-                    }
-                    break;
-                    default:;                    
-                }
-              MessageObjects.add(new MessageObjectItem(LengthOfDataSet,
-                                        AlarmType,
-                                        EnentID,
-                                        EventState,
-                                        AckStateGoing,
-                                        AckStateComing,
-                                        timestampComing,
-                                        ComingValues,
-                                        timestampGoing,
-                                        GoingValues));
-            }    
-        }
-        
-        return new AlarmMessagePayload(returnCode,
-                    dataTransportSize,
-                    CpuServicesParameterSubFunctionGroup.ALARM_QUERY,
-                    length,
-                    new AlarmMessageItem(FunctionID,
-                            NumberOfMessageObjects,
-                            AlarmReturnCode,
-                            AlarmTransportSize,
-                            CompleteDataLength,
-                            MessageObjects));                 
-
-    }    
-    
-    private AlarmMessagePayload decodeMessageServiceAckPayload(CpuServicesParameter parameter, ByteBuf userData){
-        List<Object> MessageObjects = new LinkedList<>();
-        //Data section
-        DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
-        DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
-        int length = userData.readShort(); //Number of message objects?
-        
-        if (returnCode == DataTransportErrorCode.OK) {
-        
-            //Alarm message section
-            byte FunctionID = userData.readByte();
-            byte NumberOfMessageObjects = userData.readByte();
-
-            //In the next leve if is != null -> Success
-            for(int i=0; i< NumberOfMessageObjects; i++) {
-                MessageObjects.add(DataTransportErrorCode.valueOf(userData.readByte()));
-            };
-
-            return new AlarmMessagePayload(returnCode,
-                        dataTransportSize,
-                        CpuServicesParameterSubFunctionGroup.ALARM_QUERY,
-                        length,
-                        new AlarmMessageItem(FunctionID,
-                                NumberOfMessageObjects,
-                                MessageObjects)); 
-        }
-        
-        return new AlarmMessagePayload(returnCode,
-                    dataTransportSize,
-                    CpuServicesParameterSubFunctionGroup.ALARM_QUERY,
-                    length,
-                    null);                 
-    }    
-    
-    
-    private CpuCyclicServicesResponsePayload decodeCyclicServiceResponsePayload(CpuCyclicServicesResponseParameter parameter, ByteBuf userData){
-        //logger.info("decodeCyclicServiceResponsePayload :\r\n" + ByteBufUtil.prettyHexDump(userData));
-        DataTransportErrorCode AlarmReturnCode;
-        DataTransportSize AlarmTransportSize;
-        int length;
-        int itemcount = 0;
-        List<AssociatedValueItem> Values = new LinkedList<>();
-        
-        //Data section
-        DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
-        DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
-        length = userData.readShort(); //Number of bytes
-        
-        //Check for Unsubscribe
-        if (length != 0x0000) {
-            userData.readByte(); //TODO: Sometimes is 0x00 another 0x01, Blinking when I have TIA running
-            itemcount = (length==0?0x0000:userData.readByte());
-            try {
-                for (int i=0; i < itemcount; i++ ){                         
-                    DataTransportErrorCode valueCode = DataTransportErrorCode.valueOf(userData.readByte());
-                    DataTransportSize valueTransportSize = DataTransportSize.valueOf(userData.readByte());
-
-                    int valueLength = userData.readShort() / 8;  
-                    if ((valueLength % 2 != 0) && (userData.isReadable(valueLength+1))) {
-
-                        userData.readByte(); //Fill byte for odd number of bytes
-                    }
-
-                    ByteBuf Data = userData.readBytes(valueLength);
-
-                    Values.add(new AssociatedValueItem(valueCode,
-                                    valueTransportSize,
-                                    valueLength,
-                                    Data));            
-                }
-            } catch (Exception e) {
-                logger.info(e.getMessage());
-                return null;
-            }
-        }
-
-        return new CpuCyclicServicesResponsePayload(
-                    returnCode,
-                    dataTransportSize,
-                    parameter.getSequenceNumber(),
-                    length,
-                    itemcount,
-                    Values);
-                
-
-    }    
-    
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Helpers
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-    private synchronized void trySendingMessages(ChannelHandlerContext ctx) {
-        //logger.info("trySendingMessages {} < {}",sentButUnacknowledgedTpdus.size(),maxAmqCaller);
-        while(sentButUnacknowledgedTpdus.size() < maxAmqCaller) {
-            // Get the TPDU that is up next in the queue.
-            DataTpdu curTpdu = (DataTpdu) queue.current();
-
-            if (curTpdu != null) {
-                // Send the TPDU.
-                try {
-                    //logger.info("trySendingMessages: Trata de enviar todos los mensajes...");
-                    ChannelFuture channelFuture = queue.removeAndWrite();
-                    ctx.flush();
-                    if (channelFuture == null) {
-                        break;
-                    }
-                } catch (Exception e) {
-                    logger.debug("trySendingMessages: Error sending more queues messages", e);
-                    ctx.fireExceptionCaught(e);
-                }
-
-                if(curTpdu.getParent() != null) {
-                    //logger.info("Tiene un pariente...");
-                    // Add it to the list of sentButUnacknowledgedTpdus.
-                    // (It seems that the S7 drops the value of the COTP reference id, so we have to use the S7 one)
-                    S7RequestMessage s7RequestMessage = (S7RequestMessage) curTpdu.getParent();
-                    
-                    sentButUnacknowledgedTpdus.put(s7RequestMessage.getTpduReference(), curTpdu);
-
-                    logger.debug("trySendingMessages: S7 Message with id {}Ā sent", s7RequestMessage.getTpduReference());
-                }
-                // TODO: Perhaps remove this.
-                break;
-            } else {
-                break;
-            }
-        }
-        ctx.flush();
-    }
-
-    private S7ControllerType lookupControllerType(String articleNumber) {
-        if(!articleNumber.startsWith("6ES7 ")) {
-            return S7ControllerType.ANY;
-        }
-
-        String model = articleNumber.substring(articleNumber.indexOf(' ') + 1, articleNumber.indexOf(' ') + 2);
-        switch (model) {
-            case "2":
-                return S7ControllerType.S7_1200;
-            case "5":
-                return S7ControllerType.S7_1500;
-            case "3":
-                return S7ControllerType.S7_300;
-            case "4":
-                return S7ControllerType.S7_400;
-            default:
-                if(logger.isInfoEnabled()) {
-                    logger.info(String.format("Looking up unknown article number %s", articleNumber));
-                }
-                return S7ControllerType.ANY;
-        }
-    }
-
-    /*
-     * Date and time of day (BCD coded).
-     *          +----------------+
-     * Byte n   | Year   0 to 99 |
-     *          +----------------+
-     * Byte n+1 | Month  1 to 12 |
-     *          +----------------+
-     * Byte n+2 | Day    1 to 31 |    
-     *          +----------------+
-     * Byte n+3 | Hour   0 to 23 |    
-     *          +----------------+  
-     * Byte n+4 | Minute 0 to 59 |  
-     *          +----------------+
-     * Byte n+5 | Second 0 to 59 |     
-     *          +----------------+
-     * Byte n+6 | ms    0 to 999 |
-     * Byte n+7 | X X X X X D O W|    
-     *          +----------------+    
-     * DOW: Day of weed (last 3 bits)
-    */
-    private LocalDateTime readDateAndTime(ByteBuf data) {
-        //from Plc4XS7Protocol
-        int year=convertByteToBcd(data.readByte());
-        byte themonth = data.readByte();
-        int month=convertByteToBcd(themonth==0x00?0x01:themonth);
-        byte theday = data.readByte();
-        int day=convertByteToBcd(theday==0x00?0x01:theday);
-        int hour=convertByteToBcd(data.readByte());
-        int minute=convertByteToBcd(data.readByte());
-        int second=convertByteToBcd(data.readByte());        
-        int milliseconds = (data.readShort() & 0xfff0) >> 4;
-        
-        int cen = ((milliseconds & 0x0f00) >> 8) * 100;
-        int dec = ((milliseconds & 0x00f0) >> 4) * 10;
-        milliseconds = cen + dec + (milliseconds & 0x000f);
-        int nanoseconds = milliseconds * 1000000;
-        
-        //data-type ranges from 1990 up to 2089
-        if(year>=90){
-            year+=1900;
-        }
-        else{
-            year+=2000;
-        }
-        
-        return LocalDateTime.of(year,month,day,hour,minute,second, nanoseconds);
-    }
-    
-
-    private LocalTime readTimeOfDay(ByteBuf data) {
-        //per definition for Date_And_Time only the first 6 bytes are used
-
-        int millisSinsMidnight = data.readInt();
-
-        return LocalTime.now().withHour(0).withMinute(0).withSecond(0).withNano(0).plus(millisSinsMidnight, ChronoUnit.MILLIS);
-
-    }
-
-    private LocalDate readDate(ByteBuf data) {
-        //per definition for Date_And_Time only the first 6 bytes are used
-
-        int daysSince1990 = data.readUnsignedShort();
-
-        System.out.println(daysSince1990);
-        return LocalDate.now().withYear(1990).withDayOfMonth(1).withMonth(1).plus(daysSince1990, ChronoUnit.DAYS);
-
-    }
-
-    /**
-     * converts incoming byte to an integer regarding used BCD format
-     * @param incomingByte
-     * @return converted BCD number
-     */
-    private static int convertByteToBcd(byte incomingByte) {
-        int dec = (incomingByte >> 4) * 10;
-        return dec + (incomingByte & 0x0f);
-    }    
-
-    
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.*;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import io.netty.util.AttributeKey;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.PromiseCombiner;
+import java.lang.reflect.Field;
+import java.nio.charset.Charset;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
+import org.apache.plc4x.java.api.exceptions.PlcProtocolPayloadTooBigException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.isotp.protocol.IsoTPProtocol;
+import org.apache.plc4x.java.isotp.protocol.events.IsoTPConnectedEvent;
+import org.apache.plc4x.java.isotp.protocol.model.IsoTPMessage;
+import org.apache.plc4x.java.isotp.protocol.model.tpdus.DataTpdu;
+import org.apache.plc4x.java.s7.netty.events.S7ConnectedEvent;
+import org.apache.plc4x.java.s7.netty.model.messages.S7Message;
+import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
+import org.apache.plc4x.java.s7.netty.model.messages.S7ResponseMessage;
+import org.apache.plc4x.java.s7.netty.model.messages.SetupCommunicationRequestMessage;
+import org.apache.plc4x.java.s7.netty.model.params.*;
+import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.AlarmMessagePayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuCyclicServicesRequestPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuCyclicServicesResponsePayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuDiagnosticMessagePayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuMessageSubscriptionServicePayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuServicesPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
+import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.AlarmMessageItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.CpuDiagnosticMessageItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.MessageObjectItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.S7AnyVarPayloadItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
+import org.apache.plc4x.java.s7.netty.model.types.*;
+import org.apache.plc4x.java.s7.netty.strategies.S7MessageProcessor;
+import org.apache.plc4x.java.s7.netty.util.S7SizeHelper;
+import org.apache.plc4x.java.s7.types.S7ControllerType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Communication Layer between the Application level ({@link Plc4XS7Protocol}) and the lower level (tcp) that sends and receives {@link S7Message}s.
+ * This layer also handles the control over the "wire", i.e., the queues of incoming and outgoing messages.
+ * Furthermore, here {@link S7Message}s are marshalled and unmarshalled to {@link ByteBuf}s to be send over wire.
+ *
+ * Before messages are send to the wire an optional {@link S7MessageProcessor} can be applied.
+ *
+ * @see S7MessageProcessor
+ */
+public class S7Protocol extends ChannelDuplexHandler {
+
+    private static final byte S7_PROTOCOL_MAGIC_NUMBER = 0x32;
+
+    private static final Logger logger = LoggerFactory.getLogger(S7Protocol.class);
+
+    private final MessageToMessageDecoder<Object> decoder = new MessageToMessageDecoder<Object>() {
+
+        @Override
+        public boolean acceptInboundMessage(Object msg) {
+            return msg instanceof IsoTPMessage;
+        }
+
+        @Override
+        @SuppressWarnings("unchecked")
+        protected void decode(ChannelHandlerContext ctx, Object msg, List<Object> out) {
+            S7Protocol.this.decode(ctx, (IsoTPMessage) msg, out);
+        }
+    };
+
+    private short maxAmqCaller;
+    private short maxAmqCallee;
+    private short pduSize;
+    private final AttributeKey<Short> pduSizeKey = AttributeKey.valueOf("pduSizeKey");    
+    private S7ControllerType controllerType;
+
+    // For detecting the lower layers.
+    private ChannelHandler prevChannelHandler;
+    private S7MessageProcessor messageProcessor;
+
+    // For being able to respect the max AMQ restrictions.
+    private PendingWriteQueue queue;
+    private Map<Short, DataTpdu> sentButUnacknowledgedTpdus;
+    
+    /*
+     * All fragmentsof data send by PLC are stored here,
+     * until the PLC indicates that it is the last one,
+     * then a single message is assembled.
+    */    
+    private Map<Short, Pair<LocalDateTime, Queue<ByteBuf>>> fragmentedData;
+
+    public S7Protocol(short requestedMaxAmqCaller, short requestedMaxAmqCallee, short requestedPduSize,
+                      S7ControllerType controllerType, S7MessageProcessor messageProcessor) {
+        this.maxAmqCaller = requestedMaxAmqCaller;
+        this.maxAmqCallee = requestedMaxAmqCallee;
+        this.pduSize = requestedPduSize;
+        this.controllerType = controllerType;
+        this.messageProcessor = messageProcessor;
+        sentButUnacknowledgedTpdus = new HashMap<>();
+        fragmentedData = new HashMap<>();
+    }
+
+    @Override
+    public void channelRegistered(ChannelHandlerContext ctx) {
+        this.queue = new PendingWriteQueue(ctx);
+        ctx.channel().attr(pduSizeKey).set(pduSize);
+        
+        try {
+            Field prevField = FieldUtils.getField(ctx.getClass(), "prev", true);
+            if(prevField != null) {
+                ChannelHandlerContext prevContext = (ChannelHandlerContext) prevField.get(ctx);
+                prevChannelHandler = prevContext.handler();
+            }
+        } catch(Exception e) {
+            logger.error("Error accessing field 'prev'", e);
+        }
+    }
+
+    @Override
+    public void channelUnregistered(ChannelHandlerContext ctx) throws Exception {
+        this.queue.removeAndWriteAll();
+        super.channelUnregistered(ctx);
+    }
+
+    @Override
+    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+        // Send everything so we get a proper failure for those pending writes
+        this.queue.removeAndWriteAll();
+        super.channelInactive(ctx);
+    }
+
+    /**
+     * If the S7 protocol layer is used over Iso TP, then after receiving a 
+     * {@link IsoTPConnectedEvent} the corresponding S7 setup communication 
+     * message has to be sent in order to negotiate the S7 protocol layer.
+     *
+     * For high availability handling, the proxy must be incorporated.
+     * This will replicate the event to the communication channels.
+     * 
+     * @param ctx the current protocol layers context
+     * @param evt the event
+     * @throws Exception throws an exception if something goes wrong internally
+     */
+    @Override
+    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+        // If we are using S7 inside of IsoTP or we have a proxy, then we need 
+        // to intercept IsoTPs connected events.
+        if (((prevChannelHandler instanceof IsoTPProtocol) || 
+            (prevChannelHandler instanceof S7HProxy)) && 
+            (evt instanceof IsoTPConnectedEvent)) {
+            // Setup Communication
+            SetupCommunicationRequestMessage setupCommunicationRequest =
+                new SetupCommunicationRequestMessage((short) 0, maxAmqCaller, maxAmqCallee, pduSize, null);
+
+            ctx.channel().writeAndFlush(setupCommunicationRequest);
+        }
+
+        else {
+            super.userEventTriggered(ctx, evt);
+        }
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Encoding
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) {
+        try {
+            if(msg instanceof S7Message) {
+                S7Message in = (S7Message) msg;
+
+                // Give message processors to process the incoming message.
+                //TODO: messageProcessor move to netty next layer, no a plugin code
+                Collection<? extends S7Message> messages;
+                if ((messageProcessor != null) && (in instanceof S7RequestMessage)) {
+                    messages = messageProcessor.processRequest((S7RequestMessage) in, pduSize);
+                } else {
+                    messages = Collections.singleton(in);
+                }
+
+                // Create a promise that has to be called multiple times.
+                PromiseCombiner promiseCombiner = new PromiseCombiner();
+                for (S7Message message : messages) {
+                    ByteBuf buf = Unpooled.buffer();
+                    writeS7Message(promise.channel(), promiseCombiner, message, buf);
+                }
+                promiseCombiner.finish(promise);
+
+                // Start sending the queue content.
+                trySendingMessages(ctx);
+            }
+            // Especially during the phase of connection establishment, we might be sending
+            // messages of a lower level protocol, so if it's not S7, we forward it to the next
+            // in the pipeline and hope it can handle it. If no layer can handle it Netty will
+            // exceptionally complete the future.
+            else {
+                ctx.write(msg, promise);
+            }
+        } catch (Exception e) {
+            promise.setFailure(e);
+        }
+    }
+
+    private void writeS7Message(Channel channel, PromiseCombiner promiseCombiner,
+                                S7Message message, ByteBuf buf) throws PlcProtocolException {
+        encodeHeader(message, buf);
+        encodeParameters(message, buf);
+        encodePayloads(message, buf);
+
+        // Check if the message doesn't exceed the negotiated maximum size.
+        if (buf.writerIndex() > pduSize) {
+            throw new PlcProtocolPayloadTooBigException("s7:"+message.getTpduReference(), pduSize, buf.writerIndex(), message);
+        } else {
+            ChannelPromise subPromise = new DefaultChannelPromise(channel);
+            // The tpduRef was 0x01 but had to be changed to 0x00 in order to support Siemens LOGO devices.
+            System.out.println("S7Message; " + message.getTpduReference());
+            queue.add(new DataTpdu(true, (byte) 0x00, Collections.emptyList(), buf, message), subPromise);
+            
+            promiseCombiner.add((Future) subPromise);
+            logger.debug("writeS7Message: S7 Message with id {}Ā queued", message.getTpduReference());
+        }
+    }
+
+    private void encodePayloads(S7Message in, ByteBuf buf) throws PlcProtocolException {
+        if(in.getPayloads() != null) {
+            Iterator<S7Payload> payloadIterator = in.getPayloads().iterator();
+            while(payloadIterator.hasNext()) {
+                S7Payload payload = payloadIterator.next();
+                switch (payload.getType()) {
+                    case WRITE_VAR:
+                        encodeWriteVarPayload((VarPayload) payload, buf, payloadIterator.hasNext());
+                        break;
+                    case CPU_SERVICES: 
+                        if (payload instanceof CpuServicesPayload) {
+                            encodeCpuServicesPayload((CpuServicesPayload) payload, buf);
+                        } else if (payload instanceof CpuMessageSubscriptionServicePayload) {
+                            encodeCpuMessageSubcriptionPayload((CpuMessageSubscriptionServicePayload) payload, buf);
+                        } else if (payload instanceof AlarmMessagePayload) {
+                             encodeAlarmMessagePayload((AlarmMessagePayload) payload, buf);
+                        } else if (payload instanceof CpuCyclicServicesRequestPayload){
+                            encodeCpuCyclicSubscriptionPayload((CpuCyclicServicesRequestPayload) payload, buf);
+                        }
+                        break;
+                    default:
+                        throw new PlcProtocolException("Writing payloads of type " +
+                            payload.getType().name() + " not implemented.");
+                }
+            }
+        }
+    }
+
+    /*
+    * 
+    */
+    private void encodeWriteVarPayload(VarPayload varPayload, ByteBuf buf, boolean lastItem) {
+        
+        //All payloads for the request come here
+        int i=1;
+        for (VarPayloadItem payloadItem : varPayload.getItems()) {            
+            buf.writeByte(payloadItem.getReturnCode().getCode());
+            buf.writeByte(payloadItem.getDataTransportSize().getCode());
+            //TODO: Check if this is correct?!?! Might be problems with sizeInBits = true/false
+            //TODO: This field is in BCD
+            switch (payloadItem.getDataTransportSize()){
+                case BIT: 
+                    //Check for bits length
+                    buf.writeShort(payloadItem.getData().length);                    
+                    break;
+                case BYTE_WORD_DWORD: 
+                case INTEGER:
+                    //Length in bits
+                    buf.writeShort(payloadItem.getData().length * 8);                      
+                    break;
+                case  NULL:
+                    break;
+                case DINTEGER:                    
+                case OCTET_STRING:
+                case REAL:
+                    //Length in bytes
+                    buf.writeShort(payloadItem.getData().length);                     
+                    break;
+            }           
+            buf.writeBytes(payloadItem.getData());  
+
+            // if this is not the last item and it's payload is exactly one byte, we need to output a fill-byte.
+            //if((payloadItem.getData().length == 1) && (!lastItem)) {
+          
+            if((payloadItem.getData().length == 1) && (varPayload.getItems().size() > i) || (payloadItem.getData().length % 2 != 0)) {
+                buf.writeByte(0x00); 
+            }  
+            
+            i++;            
+        }
+    }
+    
+    private void encodeCpuServicesPayload(CpuServicesPayload cpuServicesPayload, ByteBuf buf)
+            throws PlcProtocolException {
+
+        buf.writeByte(cpuServicesPayload.getReturnCode().getCode());
+
+        if (cpuServicesPayload.getReturnCode() == DataTransportErrorCode.NOT_FOUND) {
+            buf.writeByte(DataTransportSize.NULL.getCode()); 
+            buf.writeShort(0x0000);
+        // This seems to be constantly set to this.
+        } else {
+            buf.writeByte(DataTransportSize.OCTET_STRING.getCode());
+
+            // A request payload is simple.
+            if (cpuServicesPayload.getSslDataRecords().isEmpty()) {
+                buf.writeShort(4);
+                buf.writeShort(cpuServicesPayload.getSslId().getCode());
+                buf.writeShort(cpuServicesPayload.getSslIndex());
+            }
+            // The response payload contains a lot more information.
+            else {
+                throw new PlcProtocolException("Unexpected SZL Data Records");
+                /*short length = 8;
+                short sizeOfDataItem = 0;
+                for (SslDataRecord sslDataRecord : cpuServicesPayload.getSslDataRecords()) {
+                    sizeOfDataItem = (short) (sslDataRecord.getLengthInWords() * (short) 2);
+                    length += sizeOfDataItem;
+                }
+                buf.writeShort(length);
+                buf.writeShort(cpuServicesPayload.getSslId().getCode());
+                buf.writeShort(cpuServicesPayload.getSslIndex());
+                buf.writeShort(sizeOfDataItem);
+                buf.writeShort(cpuServicesPayload.getSslDataRecords().size());
+                // Output any sort of ssl list items, if there are any.
+                for (SslDataRecord sslDataRecord : cpuServicesPayload.getSslDataRecords()) {
+                    if(sslDataRecord instanceof SslModuleIdentificationDataRecord) {
+                        SslModuleIdentificationDataRecord midr = (SslModuleIdentificationDataRecord) sslDataRecord;
+                        buf.writeShort(midr.getIndex());
+                        byte[] articleNumberBytes = midr.getArticleNumber().getBytes(StandardCharsets.UTF_8);
+                        // An array full of 20 spaces.
+                        byte[] data = new byte[]{0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+                            0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20};
+                        // Copy max 20 bytes from the article number into the dest array.
+                        System.arraycopy(articleNumberBytes, 0, data, 0, 20);
+                        buf.writeBytes(data);
+                        buf.writeShort(midr.getModuleOrOsVersion());
+                        buf.writeShort(midr.getPgDescriptionFileVersion());
+                    }
+                }*/
+            }
+        }
+    }    
+    
+    private void encodeCpuMessageSubcriptionPayload(CpuMessageSubscriptionServicePayload cpuServicesPayload, ByteBuf buf)
+        throws PlcProtocolException {
+        buf.writeByte(cpuServicesPayload.getReturnCode().getCode());
+        buf.writeByte(cpuServicesPayload.getDataTransportSize().getCode());
+        if ((cpuServicesPayload.getSubscribedEvents() & 0x80) == 0){
+            buf.writeShort(0x000A);
+        } else {
+            buf.writeShort(0x000C);  
+        };
+        buf.writeByte(cpuServicesPayload.getSubscribedEvents());
+        buf.writeByte(0x00);
+        buf.writeBytes(cpuServicesPayload.getId().getBytes());
+        if ((cpuServicesPayload.getSubscribedEvents() & 0x80) == 0x80){
+            buf.writeByte(cpuServicesPayload.getAlarm().getCode());
+            buf.writeByte(0x00);
+        }
+    }  
+    
+    //TODO: Agregar ALARM_ACK
+    private void encodeAlarmMessagePayload(AlarmMessagePayload payload, ByteBuf buf) {
+
+       AlarmMessageItem alarmitem = payload.getMsg();
+       
+       buf.writeByte(payload.getReturnCode().getCode());
+       buf.writeByte(payload.getDataTransportSize().getCode());
+       buf.writeShort(payload.getLength());
+       
+       //Response for fragmented PLC response
+       //Check Plc4XS7Protocol. decode method
+       if (alarmitem == null) { return; };
+       List<Object> items = alarmitem.getMsgItems();
+       
+       buf.writeByte(alarmitem.getFunction());
+       buf.writeByte(alarmitem.getObjects());
+       
+       for(Object thisitem:items){
+           MessageObjectItem item = (MessageObjectItem) thisitem;
+           switch (item.getSyntaxID()) {
+                case S7ANY:;
+                 logger.debug("encodeAlarmMessagePayload: S7ANY no supportesd");
+                break;
+                case PBC_R_ID:;
+                 logger.debug("encodeAlarmMessagePayload: PBC_R_ID no supportesd");                
+                break;                        
+                case ALARM_LOCKFREE:;
+                 logger.debug("encodeAlarmMessagePayload: ALARM_LOCKFREE no supportesd");                
+                break;                        
+                case ALARM_IND:;
+                 logger.debug("encodeAlarmMessagePayload: ALARM no supportesd");                
+                break;                        
+                case ALARM_ACK:{
+                   logger.debug("encodeAlarmMessagePayload: ALARM_ACK");
+                   buf.writeByte(item.getVariableSpecification());
+                   buf.writeByte(item.getLength());
+                   buf.writeByte(item.getSyntaxID().getCode());
+                   buf.writeByte(item.getNumberOfValues());
+                   buf.writeInt(item.getEventID());
+                   buf.writeByte(item.getAckStateGoing());
+                   buf.writeByte(item.getAckStateComming());                    
+                };
+                break;                        
+                case ALARM_QUERYREQ:{
+                   logger.debug("encodeAlarmMessagePayload: ALARM_QUERYREQ");                    
+                   buf.writeByte(item.getVariableSpecification());
+                   buf.writeByte(item.getLength());
+                   buf.writeByte(item.getSyntaxID().getCode());
+                   buf.writeByte(0x00); //Unknown/Reserved
+                   buf.writeByte(item.getQuerytype().getCode());
+                   buf.writeByte(0x34); //Unknown/Reserved
+                   buf.writeInt(item.getAlarmtype().getCode());                     
+                };
+                break;                        
+                case NOTIFY_IND:;
+                 logger.debug("encodeAlarmMessagePayload: NOTIFY_IND no supportesd");                
+                break;                        
+                case NIC:;
+                 logger.debug("encodeAlarmMessagePayload: NIC no supportesd");                
+                break;                        
+                case DRIVEESANY:;
+                 logger.debug("encodeAlarmMessagePayload: DRIVEESANY no supportesd");                
+                break;                        
+                case DBREAD:;
+                 logger.debug("encodeAlarmMessagePayload: DBREAD no supportesd");                
+                break;                        
+                case SYM1200:;
+                 logger.debug("encodeAlarmMessagePayload: SYM1200 no supportesd");                
+                break;                        
+               default:;               
+           }
+       }         
+    }    
+
+    private void encodeCpuCyclicSubscriptionPayload(CpuCyclicServicesRequestPayload payload, ByteBuf buf) {
+        buf.writeByte(payload.getReturnCode().getCode());
+        buf.writeByte(payload.getDataTransportSize().getCode());
+        buf.writeShort(payload.getLength());
+        //Unsuscription
+        if (payload.getLength() == 2) {
+            buf.writeByte(payload.getFunction());
+            buf.writeByte(payload.getJobId());
+        } else {
+           //Suscription message
+           buf.writeShort(payload.getItemCount());
+           buf.writeByte(payload.getTimeBase().getCode());
+           buf.writeByte(payload.getTimeFactor());
+           payload.getItems().forEach((anyvar)->{
+               encodeS7AnyPayloadItem(anyvar,buf);
+           });     
+       };
+   }    
+    
+    private void encodeParameters(S7Message in, ByteBuf buf) throws PlcProtocolException {
+        for (S7Parameter s7Parameter : in.getParameters()) {
+            buf.writeByte(s7Parameter.getType().getCode());
+            switch (s7Parameter.getType()) {
+                case READ_VAR:
+                case WRITE_VAR:
+                    encodeParameterReadWriteVar(buf, (VarParameter) s7Parameter);
+                    break;
+                case SETUP_COMMUNICATION:
+                    encodeParameterSetupCommunication(buf, (SetupCommunicationParameter) s7Parameter);
+                    break;
+                case CPU_SERVICES:
+                    encodeCpuServicesParameter(buf, (CpuServicesParameter) s7Parameter);
+                    break;
+                default:
+                    throw new PlcProtocolException("Writing parameters of type " +
+                        s7Parameter.getType().name() + " not implemented.");
+            }
+        }
+    }
+
+    private void encodeHeader(S7Message in, ByteBuf buf) {
+        buf.writeByte(S7_PROTOCOL_MAGIC_NUMBER);
+        buf.writeByte(in.getMessageType().getCode());
+        // Reserved (is always constant 0x0000)
+        buf.writeShort((short) 0x0000);
+        // PDU Reference (Request Id, generated by the initiating node)
+        buf.writeShort(in.getTpduReference());
+        // S7 message parameters length
+        buf.writeShort(S7SizeHelper.getParametersLength(in.getParameters()));
+        // Data field length
+        buf.writeShort(S7SizeHelper.getPayloadsLength(in.getPayloads()));
+        // Not sure why this is implemented, we should never be sending out responses.
+        /*if (in instanceof S7ResponseMessage) {
+            S7ResponseMessage s7ResponseMessage = (S7ResponseMessage) in;
+            buf.writeByte(s7ResponseMessage.getErrorClass());
+            buf.writeByte(s7ResponseMessage.getErrorCode());
+        }*/
+    }
+
+    private void encodeParameterSetupCommunication(ByteBuf buf, SetupCommunicationParameter s7Parameter) {
+        // Reserved (is always constant 0x00)
+        buf.writeByte((byte) 0x00);
+        buf.writeShort(s7Parameter.getMaxAmqCaller());
+        buf.writeShort(s7Parameter.getMaxAmqCallee());
+        buf.writeShort(s7Parameter.getPduLength());        
+    }
+
+    private void encodeParameterReadWriteVar(ByteBuf buf, VarParameter s7Parameter) throws PlcProtocolException {
+        List<VarParameterItem> items = s7Parameter.getItems();
+        // PlcReadRequestItem count (Read one variable at a time)
+        buf.writeByte((byte) items.size());
+        for (VarParameterItem item : items) {
+            VariableAddressingMode addressMode = item.getAddressingMode();
+            if (addressMode == VariableAddressingMode.S7ANY) {
+                encodeS7AnyParameterItem(buf, (S7AnyVarParameterItem) item);
+            } else {
+                throw new PlcProtocolException("Writing VarParameterItems with addressing mode " +
+                    addressMode.name() + " not implemented");
+            }
+        }
+    }
+
+    private void encodeCpuServicesParameter(ByteBuf buf, CpuServicesParameter parameter) {
+        // Output the header for a CPU Services parameter.
+        buf.writeByte(0x01);
+        buf.writeByte(0x12);
+        // Length of the parameter.
+        
+        buf.writeByte((parameter instanceof CpuServicesRequestParameter) ? 0x04 : 0x08);
+        // Is this a request or a response?
+        buf.writeByte((parameter instanceof CpuServicesRequestParameter) ? 0x11 : 0x12);
+        // This is a mixture of request/response and function group .
+        byte nextByte = (byte) (((parameter instanceof CpuServicesRequestParameter) ?
+            (byte) 0x40 : (byte) 0x80) | parameter.getFunctionGroup().getCode());
+        
+        //For fragmented response
+        if ((parameter instanceof CpuServicesResponseParameter) && 
+                (parameter.getSequenceNumber() != 0)){
+            nextByte = (byte) (0x40 + parameter.getFunctionGroup().getCode());
+        }
+        
+        buf.writeByte(nextByte);
+        if (parameter instanceof CpuCyclicServicesRequestParameter) {
+            buf.writeByte(((CpuCyclicServicesRequestParameter) parameter).getCyclicSubFunction().getCode());
+        } else {
+            buf.writeByte(parameter.getSubFunctionGroup().getCode());
+        }
+        buf.writeByte(parameter.getSequenceNumber());
+
+        // A response parameter has some more fields.
+        // Not sure why this is implemented, we should never be sending out responses.
+        /*if(parameter instanceof CpuServicesResponseParameter) {
+            CpuServicesResponseParameter responseParameter = (CpuServicesResponseParameter) parameter;
+            buf.writeByte(responseParameter.getDataUnitReferenceNumber());
+            buf.writeByte(responseParameter.isLastDataUnit() ? 0x00 : 0x01);
+            buf.writeShort(responseParameter.getError().getCode());
+        }*/
+        //R: if parameter.getSequenceNumber() == 2 then is fragment message query
+        //   from Plc4XS7Protocol decode method.
+        if (parameter.getSequenceNumber() != 0x00) {
+            buf.writeByte(0x00); //DataUnitReferenceNumber
+            buf.writeByte(0x00); //LastDataUnit
+            buf.writeShort(0x0000); //Error code
+        }
+        
+    }
+
+    //TODO: Refactor S7AnyVarParameterItem to S7AnyVarItem
+    private void encodeS7AnyParameterItem(ByteBuf buf, S7AnyVarParameterItem s7AnyRequestItem) {
+        buf.writeByte(s7AnyRequestItem.getSpecificationType().getCode());
+        // Length of this item (excluding spec type and length)
+        buf.writeByte((byte) 0x0a);
+        buf.writeByte(s7AnyRequestItem.getAddressingMode().getCode());
+        //buf.writeByte(s7AnyRequestItem.getDataType().getTypeCode());
+        
+        buf.writeByte(s7AnyRequestItem.getDataType().getBaseType().getTypeCode());
+
+        buf.writeShort(encodeNumElements(s7AnyRequestItem));
+        buf.writeShort(s7AnyRequestItem.getDataBlockNumber());
+        buf.writeByte(s7AnyRequestItem.getMemoryArea().getCode());
+        // A S7 address is 3 bytes long. Unfortunately the byte-offset is NOT located in
+        // byte 1 and byte 2 and the bit offset in byte 3. Siemens used the last 3 bits of
+        // byte 3 for the bit-offset and the remaining 5 bits of byte 3 to contain the lowest
+        // 5 bits of the byte-offset. The highest 5 bits of byte 1 are probably left unused
+        // for future extensions.
+        buf.writeShort((short) (s7AnyRequestItem.getByteOffset() >> 5));
+        buf.writeByte((byte) ((
+                (s7AnyRequestItem.getByteOffset() & 0x1F) << 3)
+                | (s7AnyRequestItem.getBitOffset() & 0x07)));
+    }
+    
+    //TODO: Refactor S7AnyVarPayloadItem to S7AnyVarItem
+    private void encodeS7AnyPayloadItem(S7AnyVarPayloadItem s7AnyRequestItem, ByteBuf buf) {
+        buf.writeByte(s7AnyRequestItem.getSpecificationType().getCode());
+        // Length of this item (excluding spec type and length)
+        buf.writeByte((byte) 0x0a);
+        buf.writeByte(s7AnyRequestItem.getAddressingMode().getCode());
+        //buf.writeByte(s7AnyRequestItem.getDataType().getTypeCode());
+        buf.writeByte(s7AnyRequestItem.getDataType().getBaseType().getTypeCode());
+
+        buf.writeShort(encodeNumElements(s7AnyRequestItem));
+        buf.writeShort(s7AnyRequestItem.getDataBlockNumber());
+        buf.writeByte(s7AnyRequestItem.getMemoryArea().getCode());
+        // A S7 address is 3 bytes long. Unfortunately the byte-offset is NOT located in
+        // byte 1 and byte 2 and the bit offset in byte 3. Siemens used the last 3 bits of
+        // byte 3 for the bit-offset and the remaining 5 bits of byte 3 to contain the lowest
+        // 5 bits of the byte-offset. The highest 5 bits of byte 1 are probably left unused
+        // for future extensions.
+        buf.writeShort((short) (s7AnyRequestItem.getByteOffset() >> 5));
+        buf.writeByte((byte) ((
+                (s7AnyRequestItem.getByteOffset() & 0x1F) << 3)
+                | (s7AnyRequestItem.getBitOffset() & 0x07)));
+    }
+        
+    /**
+     * this is a workaround for the date and time types, as native requests with the datatypes are
+     * @return
+     */
+        //TODO: Refactor S7AnyVarParameterItem to S7AnyVarItem
+    private short encodeNumElements(S7AnyVarParameterItem s7AnyVarParameterItem){
+        switch (s7AnyVarParameterItem.getDataType()){
+            case DT:
+            case DATE_AND_TIME:
+            case TOD:
+            case TIME_OF_DAY:
+            case DATE:
+                return (short) (s7AnyVarParameterItem.getNumElements()*s7AnyVarParameterItem.getDataType().getSizeInBytes());
+            default:
+                return (short) s7AnyVarParameterItem.getNumElements();
+        }
+
+    }    
+    
+    /**
+     * this is a workaround for the date and time types, as native requests with the datatypes are
+     * @return
+     */
+    //TODO: Refactor S7AnyVarPayloadItem to S7AnyVarItem
+    private short encodeNumElements(S7AnyVarPayloadItem s7AnyVarParameterItem){
+        switch (s7AnyVarParameterItem.getDataType()){
+            case DATE_AND_TIME:
+            case TOD:
+            case TIME_OF_DAY:
+            case DATE:
+            case DT:
+                return (short) (s7AnyVarParameterItem.getNumElements()*s7AnyVarParameterItem.getDataType().getSizeInBytes());               
+            case STRING:
+               break; 
+            default:
+                return (short) s7AnyVarParameterItem.getNumElements();
+        }
+        return 0;
+    }  
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Decoding
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+        decoder.channelRead(ctx, msg);
+        super.channelRead(ctx, msg);
+    }
+
+    protected void decode(ChannelHandlerContext ctx, IsoTPMessage in, List<Object> out) {
+        logger.info("DECODE: " + ByteBufUtil.prettyHexDump(in.getUserData()));
+        if (logger.isTraceEnabled()) {
+            logger.trace("Got Data: {}", ByteBufUtil.hexDump(in.getUserData()));
+        }
+        ByteBuf userData = in.getUserData();
+        if (userData.readableBytes() == 0) {
+            return;
+        }
+                      
+        if (userData.readByte() != S7_PROTOCOL_MAGIC_NUMBER) {
+            logger.warn("Expecting S7 protocol magic number.");
+            if (logger.isDebugEnabled()) {
+                logger.debug("Got Data: {}", ByteBufUtil.hexDump(userData));
+            }
+            return;
+        }
+                
+        MessageType messageType = MessageType.valueOf(userData.readByte());
+        //Some response maybe USER_DATA
+        //Header: Userdata. Parameter:(Response)->(CPU functions)->(ALARM ack)
+           
+        //The driver freezes if it does not recognize 
+        //the MessageType.ACK type in response
+        boolean isResponse = (messageType == MessageType.ACK_DATA) || (messageType == MessageType.ACK);        
+        userData.readShort();  // Reserved (is always constant 0x0000)
+        short tpduReference = userData.readShort();
+        short headerParametersLength = userData.readShort();
+        short userDataLength = userData.readShort();
+        byte errorClass = 0;
+        byte errorCode = 0;
+
+        //If the PLC response qith error then messagetype == MessageType.ACK
+        if (isResponse) {            
+            errorClass = userData.readByte();
+            errorCode = userData.readByte();
+        }
+
+        List<S7Parameter> s7Parameters = new LinkedList<>();
+        int i = 0;
+
+        while (i < headerParametersLength) {
+            S7Parameter parameter = decodeParameter(userData, isResponse);
+            s7Parameters.add(parameter);
+            if (parameter instanceof SetupCommunicationParameter) {
+                handleSetupCommunications(ctx, (SetupCommunicationParameter) parameter);
+            }
+            i += S7SizeHelper.getParameterLength(parameter);
+        }
+        
+        List<S7Payload> s7Payloads = decodePayloads(userData, isResponse, userDataLength, s7Parameters);
+        logger.debug("S7 Message with id {}Ā received", tpduReference);
+        
+        //Case: USER_DATA CpuCyclicServicesResponseParameter
+        if (messageType == MessageType.USER_DATA){
+            if (s7Parameters.get(0) instanceof CpuCyclicServicesResponseParameter){
+                CpuCyclicServicesResponseParameter parameter = (CpuCyclicServicesResponseParameter) s7Parameters.get(0);
+                if (parameter.getSubCycFunctionGroup() == CpuCyclicServicesParameterSubFunctionGroupType.CYCLIC_UNSUBSCRIBE){
+                    isResponse = true;
+                }
+            }
+            
+            //TODO: Check for other combinations
+            if (s7Parameters.get(0) instanceof CpuServicesResponseParameter){                
+                CpuServicesResponseParameter parameter = (CpuServicesResponseParameter) s7Parameters.get(0);
+                if (parameter.getSubFunctionGroup() == CpuServicesParameterSubFunctionGroup.ALARM_ACK){
+                    isResponse = true;
+                }
+            }
+        };
+
+        if (isResponse) {
+            S7ResponseMessage responseMessage = new S7ResponseMessage(
+                messageType, tpduReference, s7Parameters, s7Payloads, errorClass, errorCode);
+
+            // Remove the current response from the list of unconfirmed messages.
+            DataTpdu requestTpdu = sentButUnacknowledgedTpdus.remove(tpduReference);
+            logger.debug("decode: S7 Message with id {}Ā remove", tpduReference);
+
+            // Get the corresponding request message.
+            S7RequestMessage requestMessage = (requestTpdu != null) ? (S7RequestMessage) requestTpdu.getParent() : null;
+
+            if(requestMessage != null) {
+                // Set this individual request to "acknowledged".
+                requestMessage.setAcknowledged(true);
+
+                // Give the request and response to a message processor to process the incoming message.
+                if(messageProcessor != null) {
+                    try {
+                        responseMessage = messageProcessor.processResponse(requestMessage, responseMessage);
+                    } catch(Exception e) {
+                        logger.error("Error processing message", e);
+                        ctx.fireExceptionCaught(e);
+                        return;
+                    }
+                }
+
+                if(responseMessage != null) {
+                    out.add(responseMessage);
+                    // If this is a USER_DATA packet the probability is high that this is
+                    // a response to the identification request, we have to handle that.
+                    if(responseMessage.getMessageType() == MessageType.USER_DATA) {
+                        for (S7Payload payload : responseMessage.getPayloads()) {
+                            if(payload instanceof CpuServicesPayload) {
+                                handleIdentifyRemote(ctx, (CpuServicesPayload) payload);
+                            }
+                        }
+                    }
+                }
+
+                // Try to send the next message (if there is one).
+                logger.info("DECODE: Try to send the next message (if there is one).");
+                trySendingMessages(ctx);
+            }
+
+        } else {
+            // !CpuService responses are encoded as requests. 
+            // No!, we need check in the next layer Plc4XS7Protocol like response
+            for (S7Parameter s7Parameter : s7Parameters) {
+                // Only if we have a response parameter, the payload is a response payload.
+                if(s7Parameter instanceof CpuServicesResponseParameter) {
+
+                    for (S7Payload s7Payload : s7Payloads) {
+                        if((s7Payload instanceof CpuServicesPayload)) {
+                            CpuServicesPayload cpuServicesPayload = (CpuServicesPayload) s7Payload;
+                            // Remove the current response from the list of unconfirmed messages.
+                            sentButUnacknowledgedTpdus.remove(tpduReference);
+                            logger.debug("CpuServicesPayload: S7 Message with id {}Ā remove", tpduReference);  
+   
+                            handleIdentifyRemote(ctx, cpuServicesPayload);
+ 
+                        } else {
+                            sentButUnacknowledgedTpdus.remove(tpduReference);
+                            logger.debug("CpuCyclicServicesResponsePayload: S7 Message with id {}Ā remove", tpduReference); 
+                        }
+                    }
+                } else if (s7Parameter instanceof CpuServicesPushParameter){
+                    //*** MENSAGE PUSH ***"
+                    //out.add(new S7ResponseMessage(messageType, tpduReference, s7Parameters, s7Payloads, errorClass, errorCode)); 
+                }
+            }            
+            //out.add(new S7RequestMessage(messageType, tpduReference, s7Parameters, s7Payloads, null));
+            out.add(new S7ResponseMessage(messageType, tpduReference, s7Parameters, s7Payloads, errorClass, errorCode)); 
+        }
+    }
+
+    private void handleSetupCommunications(ChannelHandlerContext ctx, SetupCommunicationParameter setupCommunicationParameter) {
+        maxAmqCaller = setupCommunicationParameter.getMaxAmqCaller();
+        maxAmqCallee = setupCommunicationParameter.getMaxAmqCallee();
+        pduSize = setupCommunicationParameter.getPduLength();
+        
+        ctx.channel().attr(pduSizeKey).set(pduSize);
+
+        if(logger.isInfoEnabled()) {
+            logger.info("S7Connection established pdu-size {}, max-amq-caller {}, " +
+                "max-amq-callee {}", pduSize, maxAmqCaller, maxAmqCallee);
+        }
+
+        // Only if the controller type is set to "ANY", then try to identify the PLC type.
+        if(controllerType == S7ControllerType.ANY) {
+            // Prepare a message to request the remote to identify itself.
+            S7RequestMessage identifyRemoteMessage = new S7RequestMessage(MessageType.USER_DATA, (short) 2,
+                Collections.singletonList(new CpuServicesRequestParameter(
+                    CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
+                    CpuServicesParameterSubFunctionGroup.READ_SSL, (byte) 0)),
+                Collections.singletonList(new CpuServicesPayload(DataTransportErrorCode.OK, SslId.MODULE_IDENTIFICATION,
+                    (short) 0x0000)), null);
+            ctx.channel().writeAndFlush(identifyRemoteMessage);
+        }
+        // If a concrete type was specified, then we're done here.
+        else {
+            if(logger.isDebugEnabled()) {
+                logger.debug("Successfully connected to S7: {}", controllerType.name());
+                logger.debug("- max amq caller: {}", maxAmqCaller);
+                logger.debug("- max amq callee: {}", maxAmqCallee);
+                logger.debug("- pdu size: {}", pduSize);
+            }
+            if(logger.isInfoEnabled()) {
+                logger.info("Successfully connected to S7: {} wit PDU {}", controllerType.name(),pduSize);
+            }
+
+            // Send an event that connection setup is complete.
+            ctx.channel().pipeline().fireUserEventTriggered(new S7ConnectedEvent());
+        }
+    }
+
+    private void handleIdentifyRemote(ChannelHandlerContext ctx, CpuServicesPayload cpuServicesPayload) {
+        controllerType = S7ControllerType.ANY;
+        /*
+        for (SslDataRecord sslDataRecord : cpuServicesPayload.getSslDataRecords()) {
+            if(sslDataRecord instanceof SslModuleIdentificationDataRecord) {
+                SslModuleIdentificationDataRecord sslModuleIdentificationDataRecord =
+                    (SslModuleIdentificationDataRecord) sslDataRecord;
+                if(sslModuleIdentificationDataRecord.getIndex() == (short) 0x0001) {
+                    controllerType = lookupControllerType(sslModuleIdentificationDataRecord.getArticleNumber());
+                }
+            }
+        */
+        if (cpuServicesPayload.getSslId() == SslId.MODULE_IDENTIFICATION) {
+            if ((cpuServicesPayload.getSslIndex() == 0x0000) || (cpuServicesPayload.getSslIndex() == 0x0001)){
+                ByteBuf payload = cpuServicesPayload.getSslPayload();
+                CharSequence MlfB = payload.getCharSequence(6, 20, Charset.defaultCharset());
+                controllerType = lookupControllerType(MlfB.toString());
+            }
+        }
+        if(logger.isDebugEnabled()) {
+            logger.debug("Successfully connected to S7: {}", controllerType.name());
+            logger.debug("-  max amq caller: {}", maxAmqCaller);
+            logger.debug("-  max amq callee: {}", maxAmqCallee);
+            logger.debug("-  pdu size: {}", pduSize);
+        }
+        if(logger.isInfoEnabled()) {
+            logger.info("Successfully connected to S7: {} wit PDU {}", controllerType.name(), pduSize);
+        }
+
+        // Send an event that connection setup is complete.
+        ctx.channel().pipeline().fireUserEventTriggered(new S7ConnectedEvent());
+    }
+
+    private List<S7Payload> decodePayloads(ByteBuf userData, boolean isResponse, short userDataLength, List<S7Parameter> s7Parameters) {
+        List<S7Payload> s7Payloads = new LinkedList<>();
+        for (S7Parameter s7Parameter : s7Parameters) {
+            if(s7Parameter instanceof VarParameter) {
+                VarParameter readWriteVarParameter = (VarParameter) s7Parameter;
+                VarPayload varPayload = decodeVarPayload(userData, isResponse, userDataLength, readWriteVarParameter);
+                s7Payloads.add(varPayload);
+            } else if(s7Parameter instanceof CpuServicesParameter) {
+                S7Payload cpuServicesPayload = decodeCpuServicesPayload((CpuServicesParameter)s7Parameter, userData);
+                s7Payloads.add(cpuServicesPayload);
+            } else if (s7Parameter instanceof CpuServicesPushParameter){
+                S7Payload cpuServicesPayload = decodeCpuServicesPayload((CpuServicesParameter)s7Parameter, userData);
+                s7Payloads.add(cpuServicesPayload); 
+            }
+        }
+        return s7Payloads;
+    }
+
+    private VarPayload decodeVarPayload(ByteBuf userData, boolean isResponse, short userDataLength,
+                                        VarParameter readWriteVarParameter) {
+        //System.out.println("decodeVarPayload:\r\n" + ByteBufUtil.prettyHexDump(userData));
+        List<VarPayloadItem> payloadItems = new LinkedList<>();
+
+        // Just keep on reading payloads until the provided length is read.
+        int i = 0;
+        while (i < userDataLength) {
+            DataTransportErrorCode dataTransportErrorCode = DataTransportErrorCode.valueOf(userData.readByte());
+
+            // This is a response to a WRITE_VAR request (It only contains the return code for every sent item.
+            if ((readWriteVarParameter.getType() == ParameterType.WRITE_VAR) && isResponse) {
+                // Initialize a rudimentary payload (This is updated in the Plc4XS7Protocol class
+                VarPayloadItem payload = new VarPayloadItem(dataTransportErrorCode, null, null);
+                payloadItems.add(payload);
+                i += 1;
+            }
+            // This is a response to a READ_VAR request.
+            else if ((readWriteVarParameter.getType() == ParameterType.READ_VAR) && isResponse) {
+                DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
+                short length = dataTransportSize.isSizeInBits() ?
+                    (short) Math.ceil(userData.readShort() / 8.0) : userData.readShort();
+                byte[] data = new byte[length];
+                userData.readBytes(data);
+                // Initialize a rudimentary payload (This is updated in the Plc4XS7Protocol class
+                VarPayloadItem payload = new VarPayloadItem(dataTransportErrorCode, dataTransportSize, data);
+                payloadItems.add(payload);
+                i += S7SizeHelper.getPayloadLength(payload);
+
+                // It seems that odd-byte payloads require a fill byte, but only if it's not the last item.
+                if((length % 2== 1) && (userData.readableBytes() > 0)) {
+                    userData.readByte();
+                    i++;
+                }
+            }
+        }
+
+        return new VarPayload(readWriteVarParameter.getType(), payloadItems);
+    }
+
+    private S7Payload decodeCpuServicesPayload(CpuServicesParameter parameter, ByteBuf userData) {
+        if (parameter.getFunctionGroup() == CpuServicesParameterFunctionGroup.CPU_FUNCTIONS) {
+            switch(parameter.getSubFunctionGroup()){
+                case READ_SSL: {
+                    CpuServicesPayload payload = decodeReadSslPayload(parameter, userData);
+                    return payload;
+                }
+                case MESSAGE_SERVICE:{  
+                    AlarmMessagePayload payload = decodeMessageServicePayload(parameter, userData); 
+                    return payload;            
+                }
+                case DIAG_MESSAGE:{
+                    CpuDiagnosticMessagePayload payload = decodeCpuDiagnosticMessagePayload(parameter, userData);
+                    return payload;
+                }
+                case ALARM8:;
+                    logger.info("decode ALARM8.....");
+                    
+                    break;
+                case NOTIFY:;
+                    logger.info("decode NOTIFY.....");
+                    break;
+                case ALARM8_LOCK:;
+                    logger.info("decode ALARM8_LOCK.....");
+                    break;
+                case ALARM8_UNLOCK:;
+                    logger.info("decode ALARM8_UNLOCK.....");
+                    break;
+                case SCAN:;
+                    logger.info("decode SCAN.....");
+                    break;
+                case ALARM_ACK:{  
+                    AlarmMessagePayload payload = decodeMessageServiceAckPayload(parameter, userData);                
+                    return payload;            
+                }
+                case ALARM_ACK_IND:{
+                    AlarmMessagePayload payload = decodeMessageServicePushPayload(parameter, userData);
+                    return payload;
+                }
+                case ALARM8_LOCK_IND:;
+                    logger.info("decode ALARM8_LOCK_IND.....");
+                    break;
+                case ALARM8_UNLOCK_IND:;
+                    logger.info("decode ALARM8_UNLOCK_IND.....");
+                    break;
+                case ALARM_SQ_IND:{  
+                    AlarmMessagePayload payload = decodeMessageServicePushPayload(parameter, userData);                
+                    return payload;            
+                }
+                case ALARM_S_IND: {
+                    AlarmMessagePayload payload = decodeMessageServicePushPayload(parameter, userData);
+                    return payload;
+                }
+                case ALARM_QUERY:{
+                    AlarmMessagePayload payload = decodeMessageServiceQueryPayload(parameter, userData);
+                    return payload;
+                }
+                case NOTIFY8: {
+                    AlarmMessagePayload payload = decodeMessageServicePushPayload(parameter, userData);
+                    return payload;
+                }
+                case ALARM: {
+                    AlarmMessagePayload payload = decodeMessageServicePushPayload(parameter, userData);
+                    return payload;
+                }                
+                default:;
+                    break;
+            } 
+            
+        } else if (parameter.getFunctionGroup() == CpuServicesParameterFunctionGroup.CYCLIC_SERVICES) {
+            if (parameter instanceof CpuCyclicServicesResponseParameter){
+                CpuCyclicServicesResponseParameter pushparameter = (CpuCyclicServicesResponseParameter) parameter;
+                switch(pushparameter.getSubCycFunctionGroup()){
+                    case CYCLIC_CHANGE:;
+                        break;
+                    case CYCLIC_CHANGE_MODIFY:;
+                        break;
+                    case CYCLIC_RDREC:;    
+                        break;
+                    case CYCLIC_TRANSFER: {
+                        CpuCyclicServicesResponsePayload payload = decodeCyclicServiceResponsePayload(pushparameter, userData);
+                        return payload;
+                    }
+                    case CYCLIC_UNSUBSCRIBE:{   
+                        CpuCyclicServicesResponsePayload payload = decodeCyclicServiceResponsePayload(pushparameter, userData);
+                        return payload;
+                    }
+                    default: logger.info("decodeCpuServicesPayload: No Sub Cyc Function Group.");
+                }
+            }
+        }
+        return null;
+    }
+
+    private S7Parameter decodeParameter(ByteBuf in, boolean isResponse) {
+        ParameterType parameterType = ParameterType.valueOf(in.readByte());
+        if (parameterType == null) {
+            logger.error("Could not find parameter type");
+            return null;
+        }
+        switch (parameterType) {
+            case CPU_SERVICES:
+                return decodeCpuServicesParameter(in);
+            case MODE_TRANSITION:
+                return decodePushModeTransitionParameter(in);
+            case READ_VAR:
+            case WRITE_VAR:
+                List<VarParameterItem> varParameterItems;
+                byte numItems = in.readByte();
+                if (!isResponse) {
+                    varParameterItems = decodeReadWriteVarParameter(in, numItems);
+                } else {
+                    varParameterItems = Collections.singletonList(
+                        new S7AnyVarParameterItem(null, null, null, numItems, (short) 0, (short) 0, (byte) 0));
+                }
+                return new VarParameter(parameterType, varParameterItems);
+            case SETUP_COMMUNICATION:
+                // Reserved (is always constant 0x00)
+                in.readByte();
+                short callingMaxAmq = in.readShort();
+                short calledMaxAmq = in.readShort();
+                short pduLength = in.readShort();
+                return new SetupCommunicationParameter(callingMaxAmq, calledMaxAmq, pduLength);
+            default:
+                if (logger.isErrorEnabled()) {
+                    logger.error("Unimplemented parameter type: {}", parameterType.name());
+                }
+        }
+        return null;
+    }
+
+    private CpuServicesParameter decodeCpuServicesParameter(ByteBuf in) {
+        //logger.info("decodeParameter... \r\n" + ByteBufUtil.prettyHexDump(in));        
+        if(in.readShort() != 0x0112) {
+            if (logger.isErrorEnabled()) {
+                logger.error("Expecting 0x0112 for CPU_SERVICES parameter");
+            }
+            return null;
+        }
+        
+        byte parameterLength = in.readByte();
+        if((parameterLength != 4) && (parameterLength != 8)) {
+            if (logger.isErrorEnabled()) {
+                logger.error("Parameter length should be 4 or 8, but was {}", parameterLength);
+            }
+            return null;
+        }
+        // Skipping this as it sort of contains redundant information.
+        // TODO: We need check the next byte for push message (Request/Response)
+        in.readByte();
+        byte typeAndFunctionGroup = in.readByte();
+        // If bit 7 is set, it's a request (if bit 8 is set it's a response).
+        //Must be for request: 0x40 for check X100 0X00
+        //For Push message is 0000 XXXX, Request is 0100 XXXX, Response 1000 XXXX       
+        boolean pushParameter = (typeAndFunctionGroup & 0xF0) == 0;
+        boolean requestParameter = (typeAndFunctionGroup & 0x40) != 0;
+        boolean responseParameter = (typeAndFunctionGroup & 0x80) != 0;
+        
+        // The last 4 bits contain the function group value.
+        typeAndFunctionGroup = (byte) (typeAndFunctionGroup & 0x0F);
+        
+        CpuServicesParameterFunctionGroup functionGroup =
+            CpuServicesParameterFunctionGroup.valueOf(typeAndFunctionGroup);
+
+        CpuServicesParameterSubFunctionGroup subFunctionGroup =
+            CpuServicesParameterSubFunctionGroup.valueOf(in.readByte());
+        
+        byte sequenceNumber = in.readByte();
+        
+        if(pushParameter || (responseParameter && functionGroup == CpuServicesParameterFunctionGroup.CYCLIC_SERVICES)) {
+            if (functionGroup == CpuServicesParameterFunctionGroup.CYCLIC_SERVICES ) {
+               CpuCyclicServicesParameterSubFunctionGroupType subCycFunctionGroup = 
+                       CpuCyclicServicesParameterSubFunctionGroupType.valueOf(subFunctionGroup.getCode());
+               byte dataUnitReferenceNumber = in.readByte();
+               boolean lastDataUnit = in.readByte() == 0x00;
+               ParameterError error = ParameterError.valueOf(in.readShort());
+               
+               return new CpuCyclicServicesResponseParameter(functionGroup, subCycFunctionGroup, sequenceNumber,
+                            dataUnitReferenceNumber, lastDataUnit, error);               
+            } else {
+                return new CpuServicesPushParameter(functionGroup, subFunctionGroup, sequenceNumber);            
+            }
+        } else if (requestParameter) {
+            return new CpuServicesRequestParameter(functionGroup, subFunctionGroup, sequenceNumber);            
+        } else {
+            byte dataUnitReferenceNumber = in.readByte();
+            boolean lastDataUnit = in.readByte() == 0x00;
+            ParameterError error = ParameterError.valueOf(in.readShort());
+
+            return new CpuServicesResponseParameter(functionGroup, subFunctionGroup, sequenceNumber,
+                dataUnitReferenceNumber, lastDataUnit, error);
+        }
+    }
+
+    private CpuDiagnosticPushParameter decodePushModeTransitionParameter(ByteBuf in) {
+
+        if(in.readShort() != 0x0010) {
+            if (logger.isErrorEnabled()) {
+                logger.error("Expecting 0x0010 for MODE_TRANSITION parameter");
+            }
+            return null;
+        }
+        
+        byte parameterLength = in.readByte();
+        if((parameterLength != 16)) {
+            if (logger.isErrorEnabled()) {
+                logger.error("Parameter length should be 16, but was {}", parameterLength);
+            }
+            return null;
+        }   
+        CpuUserDataMethodType usermethodtype = CpuUserDataMethodType.valueOf(in.readByte());
+        byte typeandfunc = in.readByte();
+        CpuUserDataParameterType userparamtype = CpuUserDataParameterType.valueOf((byte)(typeandfunc >> 4));
+        CpuUserDataParameterFunctionGroupType userfunction =  CpuUserDataParameterFunctionGroupType.valueOf((byte)(typeandfunc & 0x0f));
+        CpuCurrentModeType cpumode = CpuCurrentModeType.valueOf(in.readByte());
+        byte sequencenumber = in.readByte();
+        return new CpuDiagnosticPushParameter(usermethodtype, userparamtype, userfunction, cpumode, sequencenumber);
+    }        
+    
+    private List<VarParameterItem> decodeReadWriteVarParameter(ByteBuf in, byte numItems) {
+        List<VarParameterItem> items = new LinkedList<>();
+        for (int i = 0; i < numItems; i++) {
+            SpecificationType specificationType = SpecificationType.valueOf(in.readByte());
+            // Length of the rest of this item.
+            byte itemLength = in.readByte();
+            if (itemLength != 0x0a) {
+                logger.warn("Expecting a length of 10 here.");
+                return items;
+            }
+            VariableAddressingMode variableAddressingMode = VariableAddressingMode.valueOf(in.readByte());
+            if (variableAddressingMode == VariableAddressingMode.S7ANY) {
+                TransportSize dataType = TransportSize.valueOf(in.readByte());
+                short length = in.readShort();
+                short dbNumber = in.readShort();
+                byte memoryAreaCode = in.readByte();
+                MemoryArea memoryArea = MemoryArea.valueOf(memoryAreaCode);
+                if(memoryArea == null) {
+                    throw new PlcRuntimeException("Unknown memory area '" + memoryAreaCode + "'");
+                }
+                short byteAddress = (short) (in.readShort() << 5);
+                byte tmp = in.readByte();
+                // Only the least 3 bits are the bit address, the
+                byte bitAddress = (byte) (tmp & 0x07);
+                // Bits 4-8 belong to the byte address
+                byteAddress = (short) (byteAddress | (tmp >> 3));
+                S7AnyVarParameterItem item = new S7AnyVarParameterItem(
+                        specificationType, memoryArea, dataType,
+                        length, dbNumber, byteAddress, bitAddress);
+                items.add(item);
+            } else {
+                logger.error("Error parsing item type");
+                return items;
+            }
+        }
+
+        return items;
+    }
+    
+    private CpuServicesPayload decodeReadSslPayload(CpuServicesParameter parameter, ByteBuf userData){ 
+        //logger.info("decodeReadSslPayload: \r\n" + ByteBufUtil.prettyHexDump(userData));
+        CpuServicesResponseParameter thisparameter = null;
+        short length;
+        short dataUnitReferenceNumber = 0x0000;
+        boolean lastdataunit = true;
+        
+        DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
+        DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
+
+        
+        if (parameter instanceof CpuServicesResponseParameter){           
+            thisparameter = (CpuServicesResponseParameter) parameter;
+            dataUnitReferenceNumber = (short) thisparameter.getDataUnitReferenceNumber();
+            lastdataunit = thisparameter.isLastDataUnit();
+        }        
+        /*
+        if(dataTransportSize != DataTransportSize.OCTET_STRING) {
+            if(dataTransportSize == DataTransportSize.NULL) {
+                length = userData.readShort();
+                if (length == 0x0000) {
+                    return new CpuServicesPayload(returnCode, SslId.NULL, (short) 0x0000);
+                } else {
+                // TODO: Output an error.                    
+                }
+                
+            }   
+        }
+          */      
+        length = userData.readShort();         
+        //If is fragment message 
+        SslId sslId = SslId.NULL;
+        short sslIndex = 0x0000;
+        
+        
+        //Check for service not found
+        if (returnCode == DataTransportErrorCode.NOT_FOUND && !lastdataunit){
+            userData.clear();           
+            if (thisparameter != null){               
+                userData.writeShort(thisparameter.getError().getCode());
+            } else {
+                userData.writeShort(ParameterError.PROTOCOL_ERROR.getCode());
+            }
+           return new CpuServicesPayload(returnCode, sslId, sslIndex, userData);            
+        }        
+        
+        // If the length is 4 there is no `partial list length in bytes` and `partial list count` parameters.
+        if(length == 4) {
+            //logger.info("decodeReadSslPayload: error response.");
+            sslId = SslId.valueOf(userData.readShort());
+            sslIndex = userData.readShort();            
+            return new CpuServicesPayload(returnCode, sslId, sslIndex);
+        }
+        // If the length is not 4, then it has to be at least 8.
+        else if((length >= 8) || ((length == 0) && lastdataunit)) {                                           
+            if (!lastdataunit) {   
+                //TODO: Work with two fragments, we need test with 3 and more
+                Pair<LocalDateTime, Queue<ByteBuf>> fragments = fragmentedData.get(dataUnitReferenceNumber);
+                if (fragments != null) {
+                    Queue<ByteBuf> bytebufqueue = fragments.getValue();
+                    bytebufqueue.add(userData);
+                } else {
+                    sslId = SslId.valueOf(userData.readShort());
+                    sslIndex = userData.readShort();                       
+                    Queue<ByteBuf> bytebufqueue = new ArrayDeque();
+                    bytebufqueue.add(userData);
+                    Pair<LocalDateTime, Queue<ByteBuf>> firtsfragment = new ImmutablePair(LocalDateTime.now(), bytebufqueue);
+                    fragmentedData.put(dataUnitReferenceNumber, firtsfragment);
+                } 
+                return new CpuServicesPayload(returnCode, sslId, sslIndex);   
+            }
+            
+            //Reemsable the fragments   
+            
+            if (dataUnitReferenceNumber != 0x0000){
+                Pair<LocalDateTime, Queue<ByteBuf>> fragments = fragmentedData.get(dataUnitReferenceNumber);
+                if (fragments != null){ 
+                    Queue<ByteBuf> bytebufqueue = fragments.getValue();
+                    ByteBuf payload = bytebufqueue.remove();
+                    for(ByteBuf nextpayload:bytebufqueue){
+                        if (nextpayload != null) { 
+                            payload.writeBytes(nextpayload);
+                            nextpayload.release();                          
+                        };
+                    }               
+                    payload.writeBytes(userData);
+                    userData.clear();                 
+                    userData.writeBytes(payload);                
+                    payload.release();               
+                    fragmentedData.remove(dataUnitReferenceNumber);
+                    returnCode = DataTransportErrorCode.OK;
+                }                  
+            } else {
+                sslId = SslId.valueOf(userData.readShort());
+                sslIndex = userData.readShort();                  
+            }
+
+            //TODO: sslId & sslIndex in this point dont care, we need check!
+            return new CpuServicesPayload(returnCode, sslId, sslIndex, userData);
+            
+        }
+        // In all other cases, it's probably an error.
+        else {
+            // TODO: Output an error.
+        }   
+
+        return null;   
+    }    
+    
+    private AlarmMessagePayload decodeMessageServicePayload(CpuServicesParameter parameter, ByteBuf userData){
+        //logger.info(ByteBufUtil.prettyHexDump(userData));
+        AlarmType alarmtype = null;
+        DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
+        DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
+        int length = userData.readShort();
+        if (length != 0){
+            byte result = userData.readByte();
+            byte unknown = userData.readByte();
+
+            if (length>2) {
+                alarmtype = AlarmType.valueOf(userData.readByte());
+                unknown = userData.readByte();
+                unknown = userData.readByte();                        
+            } else {
+                //Free dummy byte
+
+            }
+        }
+        
+       return new AlarmMessagePayload(returnCode,
+                        dataTransportSize,
+                        alarmtype,
+                        length,
+                        null);
+    }
+    
+    private CpuDiagnosticMessagePayload decodeCpuDiagnosticMessagePayload(CpuServicesParameter parameter, ByteBuf userData){
+
+        LocalDateTime timestamp;
+        DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
+        DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
+        int length = userData.readShort(); //TODO: Validate userData length
+        short EventID = userData.readShort();
+        byte PriorityClass = userData.readByte();
+        byte ObNumber = userData.readByte();
+        short DatID = userData.readShort();
+        short Info1 =  userData.readShort();
+        int Info2 =  userData.readInt();
+        
+        //It is assumed that you have synchronized the time of your PLC with PC.
+        //TODO: Write util function for translate S7 DateTime
+        timestamp = readDateAndTime(userData);
+        
+        CpuDiagnosticMessageItem diagnosticitem = new CpuDiagnosticMessageItem(EventID,
+                                                        PriorityClass,
+                                                        ObNumber,
+                                                        DatID,
+                                                        Info1,
+                                                        Info2,
+                                                        timestamp);
+        
+        return new CpuDiagnosticMessagePayload(returnCode,
+                                    dataTransportSize,
+                                    length,
+                                    diagnosticitem);
+    }    
+    
+    private AlarmMessagePayload decodeMessageServicePushPayload(CpuServicesParameter parameter, ByteBuf userData){
+
+        List<Object> MessageObjects = new LinkedList<>();
+        List<ByteBuf> values = new LinkedList<>();
+        int length;
+        //Alarm message
+        LocalDateTime timestamp;
+        Byte FunctionID;
+        byte NumberOfMessgaeObjects;
+        byte EventGoing = 0x00;
+        byte EventComming = 0x00;
+        byte EventLastChange = 0x00;
+        
+        
+        //
+        DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
+        DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
+        length = userData.readShort();
+        
+        //It is assumed that you have synchronized the time of your PLC with PC.
+        //The most important field.
+        timestamp = readDateAndTime(userData);
+        
+        FunctionID = userData.readByte();
+        NumberOfMessgaeObjects = userData.readByte();
+
+        for (int i = 0; i < NumberOfMessgaeObjects; i++){
+            {
+                byte VariableSpecification = userData.readByte();
+                byte Length = userData.readByte();
+                VariableAddressingMode SyntaxID = VariableAddressingMode.valueOf(userData.readByte());
+                byte NumberOfValues = userData.readByte();
+                int EventID = userData.readInt();
+                
+                byte EventState = 0x00;
+                byte State = 0x00;
+                if (parameter.getSubFunctionGroup() != CpuServicesParameterSubFunctionGroup.ALARM_ACK_IND) {                                          
+                    EventState = userData.readByte();                
+                    State = userData.readByte();
+                }
+                
+                byte AckStateGoing = userData.readByte();
+                byte AckStateComming = userData.readByte();
+                
+                switch(parameter.getSubFunctionGroup()){
+                    case ALARM8:
+                    case NOTIFY8:
+                    case NOTIFY:
+                        EventGoing  = userData.readByte(); 
+                        EventComming  = userData.readByte(); 
+                        EventLastChange  = userData.readByte(); 
+                        userData.readByte(); //Reserved = 0x00
+                        break;                    
+                }                
+                
+                //TODO: If NumberOfValues == 0 then AssociatedValues is null
+                List<AssociatedValueItem> AssociatedValues = new LinkedList<>();
+                        
+                for (int j = 0; j < NumberOfValues; j++){
+                    {
+                        DataTransportErrorCode valueCode = DataTransportErrorCode.valueOf(userData.readByte());
+                        DataTransportSize valueTransportSize = DataTransportSize.valueOf(userData.readByte());
+                        int valueLength = userData.readShort();
+                        //Max length of value is 12 bytes
+                        valueLength = (valueLength >> 4)*2;
+                        
+                        ByteBuf Data = userData.readBytes(valueLength);
+                        
+                        AssociatedValues.add(new AssociatedValueItem(valueCode,
+                                                valueTransportSize,
+                                                valueLength,
+                                                Data));
+                    }
+                }
+                
+                MessageObjects.add( new MessageObjectItem(VariableSpecification,
+                                            Length,
+                                            SyntaxID,
+                                            NumberOfValues,
+                                            EventID,
+                                            EventState,
+                                            State,
+                                            AckStateGoing,
+                                            AckStateComming,
+                                            EventGoing,
+                                            EventComming, 
+                                            EventLastChange,                        
+                                            AssociatedValues));
+                
+            }            
+        }
+        
+        return new AlarmMessagePayload(returnCode,
+                        dataTransportSize,
+                        parameter.getSubFunctionGroup(),
+                        length,
+                        new AlarmMessageItem(timestamp,
+                                FunctionID,
+                                NumberOfMessgaeObjects,
+                                MessageObjects));  
+    };
+
+    private AlarmMessagePayload decodeMessageServiceQueryPayload(CpuServicesParameter parameter, ByteBuf userData){
+      
+        List<Object> MessageObjects = new LinkedList<>();
+        CpuServicesResponseParameter thisparameter = null;
+        int length;
+        byte FunctionID = 0x00;
+        byte NumberOfMessageObjects = 0x00; //Say 1, but I have 2 messages? Why?
+        DataTransportErrorCode AlarmReturnCode = DataTransportErrorCode.RESERVED;
+        DataTransportSize AlarmTransportSize = DataTransportSize.NULL;
+        int CompleteDataLength = 0x0000;
+        short dataUnitReferenceNumber = 0x0000;
+        boolean lastdataunit = true;
+        
+        //Data section
+        DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
+        DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
+        length = userData.readShort(); //Number of message objects?
+        
+        if (parameter instanceof CpuServicesResponseParameter){
+            thisparameter = (CpuServicesResponseParameter) parameter;
+            dataUnitReferenceNumber = (short) thisparameter.getDataUnitReferenceNumber();
+            lastdataunit = thisparameter.isLastDataUnit();
+        }
+        
+        //Response to query from S7-1500
+        if ((length == 0) && 
+            lastdataunit && 
+            (thisparameter.getSubFunctionGroup() == CpuServicesParameterSubFunctionGroup.ALARM_QUERY)){
+            return new AlarmMessagePayload(returnCode,
+                    dataTransportSize,
+                    CpuServicesParameterSubFunctionGroup.ALARM_QUERY,
+                    length,
+                    new AlarmMessageItem(FunctionID,
+                            NumberOfMessageObjects,
+                            AlarmReturnCode,
+                            AlarmTransportSize,
+                            CompleteDataLength,
+                            MessageObjects));              
+        }        
+        
+        //Response to query
+        if ((length == 6) && 
+            lastdataunit && 
+            (thisparameter.getSubFunctionGroup() == CpuServicesParameterSubFunctionGroup.ALARM_QUERY)){
+            //Alarm message information
+            FunctionID = userData.readByte();
+            NumberOfMessageObjects = userData.readByte();
+            AlarmReturnCode = DataTransportErrorCode.valueOf(userData.readByte());
+            AlarmTransportSize = DataTransportSize.valueOf(userData.readByte());
+            CompleteDataLength = userData.readShort();    
+            
+            return new AlarmMessagePayload(returnCode,
+                    dataTransportSize,
+                    CpuServicesParameterSubFunctionGroup.ALARM_QUERY,
+                    length,
+                    new AlarmMessageItem(FunctionID,
+                            NumberOfMessageObjects,
+                            AlarmReturnCode,
+                            AlarmTransportSize,
+                            CompleteDataLength,
+                            MessageObjects));              
+            
+        }        
+        
+        //Fragmente code
+        //The next Level query again.
+                
+        if ((length > 2) && (!lastdataunit)){
+            
+            //Is alway a CpuServicesResponseParameter instance?
+            //CpuServicesResponseParameter thisparameter = (CpuServicesResponseParameter) parameter;
+            Pair<LocalDateTime, Queue<ByteBuf>> fragments = fragmentedData.get(dataUnitReferenceNumber);
+            if (fragments != null) {
+                Queue<ByteBuf> bytebufqueue = fragments.getValue();
+                bytebufqueue.add(userData);
+            } else {
+                Queue<ByteBuf> bytebufqueue = new ArrayDeque();
+                bytebufqueue.add(userData);
+                Pair<LocalDateTime, Queue<ByteBuf>> firtsfragment = new ImmutablePair(LocalDateTime.now(), bytebufqueue);
+                fragmentedData.put(dataUnitReferenceNumber, firtsfragment);
+            }
+            
+            return new AlarmMessagePayload(returnCode,
+                        dataTransportSize,
+                        CpuServicesParameterSubFunctionGroup.ALARM_QUERY,
+                        length,
+                        null);             
+        }
+        
+        //Reemsable the fragments       
+        if (dataUnitReferenceNumber != 0x0000){
+            Pair<LocalDateTime, Queue<ByteBuf>> fragments = fragmentedData.get(dataUnitReferenceNumber);
+            if (fragments != null){ 
+                Queue<ByteBuf> bytebufqueue = fragments.getValue();
+                ByteBuf payload = bytebufqueue.remove();
+                for(ByteBuf nextpayload:bytebufqueue){
+                    if (nextpayload != null) { 
+                        payload.writeBytes(nextpayload);
+                        nextpayload.release();                          
+                    };
+                }               
+                payload.writeBytes(userData);
+                userData.clear();                 
+                userData.writeBytes(payload);                
+                payload.release();               
+                fragmentedData.remove(dataUnitReferenceNumber);
+            }            
+        }        
+ 
+        //Alarm message information
+        FunctionID = userData.readByte();
+        NumberOfMessageObjects = userData.readByte();
+        AlarmReturnCode = DataTransportErrorCode.valueOf(userData.readByte());
+        AlarmTransportSize = DataTransportSize.valueOf(userData.readByte());
+        CompleteDataLength = userData.readShort();
+        
+        //Message Object
+        if (AlarmReturnCode == DataTransportErrorCode.OK){
+            ///length = 1+2+1+4+2+1+1+1+8+1+1+2+8+1+1+2 = 35
+            while (userData.isReadable(35)){              
+                byte LengthOfDataSet = userData.readByte();
+                int Unknown = userData.readShort();
+                AlarmQueryType AlarmType = AlarmQueryType.valueOf(userData.readByte());
+                int EnentID = userData.readInt();
+                Unknown = userData.readByte();
+                byte EventState =  userData.readByte();
+                byte AckStateGoing = userData.readByte();
+                byte AckStateComing = userData.readByte();  
+                
+                LocalDateTime timestampComing = null;
+                LocalDateTime timestampGoing = null;
+      
+                List<AssociatedValueItem> ComingValues = new LinkedList<>();
+                List<AssociatedValueItem> GoingValues = new LinkedList<>();
+               
+                switch(AlarmType){
+                    case ALARM_S:{
+                        //Coming data
+                        timestampComing = readDateAndTime(userData);                         
+                        DataTransportErrorCode valueCode = DataTransportErrorCode.valueOf(userData.readByte());
+                        DataTransportSize valueTransportSize = DataTransportSize.valueOf(userData.readByte());
+                        
+                        int valueLength = userData.readShort() / 8;
+                        
+                        ByteBuf Data = userData.readBytes(valueLength);
+                        ComingValues.add(new AssociatedValueItem(valueCode,
+                                                valueTransportSize,
+                                                valueLength,
+                                                Data));   
+                        //Going data
+                        timestampGoing = readDateAndTime(userData);
+                        
+                        valueCode = DataTransportErrorCode.valueOf(userData.readByte());
+                        valueTransportSize = DataTransportSize.valueOf(userData.readByte());
+                        
+                        valueLength = userData.readShort() / 8;;
+                        
+                        Data = userData.readBytes(valueLength);
+                        GoingValues.add(new AssociatedValueItem(valueCode,
+                                                valueTransportSize,
+                                                valueLength,
+                                                Data));                            
+                        }
+                    break;
+                    case ALARM_8: {
+                        //TODO: Decode values for ALARM_8
+                    }
+                    break;
+                    default:;                    
+                }
+              MessageObjects.add(new MessageObjectItem(LengthOfDataSet,
+                                        AlarmType,
+                                        EnentID,
+                                        EventState,
+                                        AckStateGoing,
+                                        AckStateComing,
+                                        timestampComing,
+                                        ComingValues,
+                                        timestampGoing,
+                                        GoingValues));
+            }    
+        }
+        
+        return new AlarmMessagePayload(returnCode,
+                    dataTransportSize,
+                    CpuServicesParameterSubFunctionGroup.ALARM_QUERY,
+                    length,
+                    new AlarmMessageItem(FunctionID,
+                            NumberOfMessageObjects,
+                            AlarmReturnCode,
+                            AlarmTransportSize,
+                            CompleteDataLength,
+                            MessageObjects));                 
+
+    }    
+    
+    private AlarmMessagePayload decodeMessageServiceAckPayload(CpuServicesParameter parameter, ByteBuf userData){
+        List<Object> MessageObjects = new LinkedList<>();
+        //Data section
+        DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
+        DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
+        int length = userData.readShort(); //Number of message objects?
+        
+        if (returnCode == DataTransportErrorCode.OK) {
+        
+            //Alarm message section
+            byte FunctionID = userData.readByte();
+            byte NumberOfMessageObjects = userData.readByte();
+
+            //In the next leve if is != null -> Success
+            for(int i=0; i< NumberOfMessageObjects; i++) {
+                MessageObjects.add(DataTransportErrorCode.valueOf(userData.readByte()));
+            };
+
+            return new AlarmMessagePayload(returnCode,
+                        dataTransportSize,
+                        CpuServicesParameterSubFunctionGroup.ALARM_QUERY,
+                        length,
+                        new AlarmMessageItem(FunctionID,
+                                NumberOfMessageObjects,
+                                MessageObjects)); 
+        }
+        
+        return new AlarmMessagePayload(returnCode,
+                    dataTransportSize,
+                    CpuServicesParameterSubFunctionGroup.ALARM_QUERY,
+                    length,
+                    null);                 
+    }    
+    
+    
+    private CpuCyclicServicesResponsePayload decodeCyclicServiceResponsePayload(CpuCyclicServicesResponseParameter parameter, ByteBuf userData){
+        //logger.info("decodeCyclicServiceResponsePayload :\r\n" + ByteBufUtil.prettyHexDump(userData));
+        DataTransportErrorCode AlarmReturnCode;
+        DataTransportSize AlarmTransportSize;
+        int length;
+        int itemcount = 0;
+        List<AssociatedValueItem> Values = new LinkedList<>();
+        
+        //Data section
+        DataTransportErrorCode returnCode = DataTransportErrorCode.valueOf(userData.readByte());
+        DataTransportSize dataTransportSize = DataTransportSize.valueOf(userData.readByte());
+        length = userData.readShort(); //Number of bytes
+        
+        //Check for Unsubscribe
+        if (length != 0x0000) {
+            userData.readByte(); //TODO: Sometimes is 0x00 another 0x01, Blinking when I have TIA running
+            itemcount = (length==0?0x0000:userData.readByte());
+            try {
+                for (int i=0; i < itemcount; i++ ){                         
+                    DataTransportErrorCode valueCode = DataTransportErrorCode.valueOf(userData.readByte());
+                    DataTransportSize valueTransportSize = DataTransportSize.valueOf(userData.readByte());
+
+                    int valueLength = userData.readShort() / 8;  
+                    if ((valueLength % 2 != 0) && (userData.isReadable(valueLength+1))) {
+
+                        userData.readByte(); //Fill byte for odd number of bytes
+                    }
+
+                    ByteBuf Data = userData.readBytes(valueLength);
+
+                    Values.add(new AssociatedValueItem(valueCode,
+                                    valueTransportSize,
+                                    valueLength,
+                                    Data));            
+                }
+            } catch (Exception e) {
+                logger.info(e.getMessage());
+                return null;
+            }
+        }
+
+        return new CpuCyclicServicesResponsePayload(
+                    returnCode,
+                    dataTransportSize,
+                    parameter.getSequenceNumber(),
+                    length,
+                    itemcount,
+                    Values);
+                
+
+    }    
+    
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Helpers
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+    private synchronized void trySendingMessages(ChannelHandlerContext ctx) {
+        logger.info("trySendingMessages {} < {}",sentButUnacknowledgedTpdus.size(),maxAmqCaller);
+        while(sentButUnacknowledgedTpdus.size() < maxAmqCaller) {
+            // Get the TPDU that is up next in the queue.
+            DataTpdu curTpdu = (DataTpdu) queue.current();
+
+            if (curTpdu != null) {
+                // Send the TPDU.
+                try {
+                    //logger.info("trySendingMessages: Trata de enviar todos los mensajes...");
+                    S7Message message = (S7Message) curTpdu.getParent();
+                    System.out.println(">S7Message: " + message.getTpduReference());
+                    ChannelFuture channelFuture = queue.removeAndWrite();
+                    ctx.flush();
+                    if (channelFuture == null) {
+                        break;
+                    }
+                } catch (Exception e) {
+                    logger.debug("trySendingMessages: Error sending more queues messages", e);
+                    ctx.fireExceptionCaught(e);
+                }
+
+                if(curTpdu.getParent() != null) {
+                    //logger.info("Tiene un pariente...");
+                    // Add it to the list of sentButUnacknowledgedTpdus.
+                    // (It seems that the S7 drops the value of the COTP reference id, so we have to use the S7 one)
+                    S7RequestMessage s7RequestMessage = (S7RequestMessage) curTpdu.getParent();
+                    
+                    sentButUnacknowledgedTpdus.put(s7RequestMessage.getTpduReference(), curTpdu);
+
+                    logger.debug("trySendingMessages: S7 Message with id {}Ā sent", s7RequestMessage.getTpduReference());
+                }
+                // TODO: Perhaps remove this.
+                break;
+            } else {
+                break;
+            }
+        }
+        ctx.flush();
+    }
+
+    private S7ControllerType lookupControllerType(String articleNumber) {
+        if(!articleNumber.startsWith("6ES7 ")) {
+            return S7ControllerType.ANY;
+        }
+
+        String model = articleNumber.substring(articleNumber.indexOf(' ') + 1, articleNumber.indexOf(' ') + 2);
+        switch (model) {
+            case "2":
+                return S7ControllerType.S7_1200;
+            case "5":
+                return S7ControllerType.S7_1500;
+            case "3":
+                return S7ControllerType.S7_300;
+            case "4":
+                return S7ControllerType.S7_400;
+            default:
+                if(logger.isInfoEnabled()) {
+                    logger.info(String.format("Looking up unknown article number %s", articleNumber));
+                }
+                return S7ControllerType.ANY;
+        }
+    }
+
+    /*
+     * Date and time of day (BCD coded).
+     *          +----------------+
+     * Byte n   | Year   0 to 99 |
+     *          +----------------+
+     * Byte n+1 | Month  1 to 12 |
+     *          +----------------+
+     * Byte n+2 | Day    1 to 31 |    
+     *          +----------------+
+     * Byte n+3 | Hour   0 to 23 |    
+     *          +----------------+  
+     * Byte n+4 | Minute 0 to 59 |  
+     *          +----------------+
+     * Byte n+5 | Second 0 to 59 |     
+     *          +----------------+
+     * Byte n+6 | ms    0 to 999 |
+     * Byte n+7 | X X X X X D O W|    
+     *          +----------------+    
+     * DOW: Day of weed (last 3 bits)
+    */
+    private LocalDateTime readDateAndTime(ByteBuf data) {
+        //from Plc4XS7Protocol
+        int year=convertByteToBcd(data.readByte());
+        byte themonth = data.readByte();
+        int month=convertByteToBcd(themonth==0x00?0x01:themonth);
+        byte theday = data.readByte();
+        int day=convertByteToBcd(theday==0x00?0x01:theday);
+        int hour=convertByteToBcd(data.readByte());
+        int minute=convertByteToBcd(data.readByte());
+        int second=convertByteToBcd(data.readByte());        
+        int milliseconds = (data.readShort() & 0xfff0) >> 4;
+        
+        int cen = ((milliseconds & 0x0f00) >> 8) * 100;
+        int dec = ((milliseconds & 0x00f0) >> 4) * 10;
+        milliseconds = cen + dec + (milliseconds & 0x000f);
+        int nanoseconds = milliseconds * 1000000;
+        
+        //data-type ranges from 1990 up to 2089
+        if(year>=90){
+            year+=1900;
+        }
+        else{
+            year+=2000;
+        }
+        
+        return LocalDateTime.of(year,month,day,hour,minute,second, nanoseconds);
+    }
+    
+
+    private LocalTime readTimeOfDay(ByteBuf data) {
+        //per definition for Date_And_Time only the first 6 bytes are used
+
+        int millisSinsMidnight = data.readInt();
+
+        return LocalTime.now().withHour(0).withMinute(0).withSecond(0).withNano(0).plus(millisSinsMidnight, ChronoUnit.MILLIS);
+
+    }
+
+    private LocalDate readDate(ByteBuf data) {
+        //per definition for Date_And_Time only the first 6 bytes are used
+
+        int daysSince1990 = data.readUnsignedShort();
+
+        System.out.println(daysSince1990);
+        return LocalDate.now().withYear(1990).withDayOfMonth(1).withMonth(1).plus(daysSince1990, ChronoUnit.DAYS);
+
+    }
+
+    /**
+     * converts incoming byte to an integer regarding used BCD format
+     * @param incomingByte
+     * @return converted BCD number
+     */
+    private static int convertByteToBcd(byte incomingByte) {
+        int dec = (incomingByte >> 4) * 10;
+        return dec + (incomingByte & 0x0f);
+    }    
+
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/events/S7Alarm.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/events/S7Alarm.java
index a368ffc9405..e9006587c75 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/events/S7Alarm.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/events/S7Alarm.java
@@ -1,528 +1,528 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.netty.events;
-
-import io.netty.buffer.ByteBuf;
-import static io.netty.buffer.Unpooled.buffer;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.ZoneOffset;
-import java.util.Collection;
-import java.util.Hashtable;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.MessageObjectItem;
-
-/**
- * The S7Alarm object is a wrapper around MessageObjectItem to maintain 
- * compatibility with the top layer.
- * At this point we can have any of the Push messages generated by the PLC for 
- * an event or a query request from the application, usually executed when the 
- * connection is initiated. The messages from the PLC can be of type:
- * . Alarm
- * . Alarm_8
- * . Alarm_8P
- * . Alarm_S
- * . Alarm_SQ
- * . Alarm_D
- * . Alarm_DQ
- * . Alarm_DQ
- * . Notify
- * . Notify_8P
- * To correctly evaluate the message, the "Subfunction" and "SyntaxId" field 
- * must be evaluated. In the case of the "Subfunction =" ALARM_QUERY "query, 
- * the type will be stored in" SyntaxId "
- * 
- * @author cgarcia
- */
-public class S7Alarm implements PlcSubscriptionEvent {
-    
-    private final MessageObjectItem s7alarm;
-    
-    private static final String SIG_1 = "SIG_1";
-    private static final String SIG_2 = "SIG_2";
-    private static final String SIG_3 = "SIG_3";
-    private static final String SIG_4 = "SIG_4";
-    private static final String SIG_5 = "SIG_5";
-    private static final String SIG_6 = "SIG_6";
-    private static final String SIG_7 = "SIG_7";
-    private static final String SIG_8 = "SIG_8";
-    
-    private static final Hashtable<String,Integer> SIGS = new Hashtable<String,Integer>() 
-    {{ put(SIG_1, 0);     
-       put(SIG_2, 1);     
-       put(SIG_3, 2);     
-       put(SIG_4, 3);     
-       put(SIG_5, 4);     
-       put(SIG_6, 5);
-       put(SIG_7, 6);
-       put(SIG_8, 7);}};
-    
-
-    public S7Alarm(MessageObjectItem s7alarm) {
-        this.s7alarm = s7alarm;
-    }
-    
-    @Override
-    public Instant getTimestamp() {        
-        return s7alarm.getTimestampComing().toInstant(ZoneOffset.UTC);
-    }
-
-    @Override
-    public PlcReadRequest getRequest() {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public int getNumberOfValues(String name) {
-        return s7alarm.getComingValues().size();
-    }
-
-    @Override
-    public Object getObject(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Object getObject(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<Object> getAllObjects(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidBoolean(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidBoolean(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Boolean getBoolean(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Boolean getBoolean(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<Boolean> getAllBooleans(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidByte(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidByte(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Byte getByte(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Byte getByte(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<Byte> getAllBytes(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidShort(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidShort(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Short getShort(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Short getShort(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<Short> getAllShorts(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Integer getInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Integer getInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<Integer> getAllIntegers(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidBigInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidBigInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public BigInteger getBigInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public BigInteger getBigInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<BigInteger> getAllBigIntegers(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidLong(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidLong(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Long getLong(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Long getLong(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<Long> getAllLongs(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidFloat(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidFloat(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Float getFloat(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Float getFloat(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<Float> getAllFloats(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidDouble(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidDouble(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Double getDouble(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Double getDouble(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<Double> getAllDoubles(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidBigDecimal(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidBigDecimal(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public BigDecimal getBigDecimal(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public BigDecimal getBigDecimal(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<BigDecimal> getAllBigDecimals(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidString(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidString(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public String getString(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public String getString(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<String> getAllStrings(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public LocalTime getTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public LocalTime getTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<LocalTime> getAllTimes(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidDate(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidDate(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public LocalDate getDate(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public LocalDate getDate(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<LocalDate> getAllDates(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidDateTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidDateTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public LocalDateTime getDateTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public LocalDateTime getDateTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<LocalDateTime> getAllDateTimes(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidByteArray(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidByteArray(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Byte[] getByteArray(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Byte[] getByteArray(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<Byte[]> getAllByteArrays(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<String> getFieldNames() {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public PlcField getField(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public PlcResponseCode getResponseCode(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-    
-    public ByteBuf getData(String name) {
-        return s7alarm.getComingValues().get(0).getData();
-    }
-
-    @Override
-    public boolean isValidDuration(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidDuration(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Duration getDuration(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Duration getDuration(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<Duration> getAllDuration(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-    
-    
-    
-    
-    public ByteBuf getAllData() {
-        ByteBuf copy = buffer(12);
-        for(AssociatedValueItem item:s7alarm.getComingValues() ){
-            copy.writeBytes(item.getData());
-        }
-        return copy;
-    }
-    
-    
-    
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.events;
+
+import io.netty.buffer.ByteBuf;
+import static io.netty.buffer.Unpooled.buffer;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneOffset;
+import java.util.Collection;
+import java.util.Hashtable;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.MessageObjectItem;
+
+/**
+ * The S7Alarm object is a wrapper around MessageObjectItem to maintain 
+ * compatibility with the top layer.
+ * At this point we can have any of the Push messages generated by the PLC for 
+ * an event or a query request from the application, usually executed when the 
+ * connection is initiated. The messages from the PLC can be of type:
+ * . Alarm
+ * . Alarm_8
+ * . Alarm_8P
+ * . Alarm_S
+ * . Alarm_SQ
+ * . Alarm_D
+ * . Alarm_DQ
+ * . Alarm_DQ
+ * . Notify
+ * . Notify_8P
+ * To correctly evaluate the message, the "Subfunction" and "SyntaxId" field 
+ * must be evaluated. In the case of the "Subfunction =" ALARM_QUERY "query, 
+ * the type will be stored in" SyntaxId "
+ * 
+ * @author cgarcia
+ */
+public class S7Alarm implements PlcSubscriptionEvent {
+    
+    private final MessageObjectItem s7alarm;
+    
+    private static final String SIG_1 = "SIG_1";
+    private static final String SIG_2 = "SIG_2";
+    private static final String SIG_3 = "SIG_3";
+    private static final String SIG_4 = "SIG_4";
+    private static final String SIG_5 = "SIG_5";
+    private static final String SIG_6 = "SIG_6";
+    private static final String SIG_7 = "SIG_7";
+    private static final String SIG_8 = "SIG_8";
+    
+    private static final Hashtable<String,Integer> SIGS = new Hashtable<String,Integer>() 
+    {{ put(SIG_1, 0);     
+       put(SIG_2, 1);     
+       put(SIG_3, 2);     
+       put(SIG_4, 3);     
+       put(SIG_5, 4);     
+       put(SIG_6, 5);
+       put(SIG_7, 6);
+       put(SIG_8, 7);}};
+    
+
+    public S7Alarm(MessageObjectItem s7alarm) {
+        this.s7alarm = s7alarm;
+    }
+    
+    @Override
+    public Instant getTimestamp() {        
+        return s7alarm.getTimestampComing().toInstant(ZoneOffset.UTC);
+    }
+
+    @Override
+    public PlcReadRequest getRequest() {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public int getNumberOfValues(String name) {
+        return s7alarm.getComingValues().size();
+    }
+
+    @Override
+    public Object getObject(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Object getObject(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Object> getAllObjects(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidBoolean(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidBoolean(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Boolean getBoolean(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Boolean getBoolean(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Boolean> getAllBooleans(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidByte(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidByte(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Byte getByte(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Byte getByte(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Byte> getAllBytes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidShort(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidShort(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Short getShort(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Short getShort(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Short> getAllShorts(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Integer getInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Integer getInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Integer> getAllIntegers(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<BigInteger> getAllBigIntegers(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidLong(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidLong(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Long getLong(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Long getLong(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Long> getAllLongs(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidFloat(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidFloat(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Float getFloat(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Float getFloat(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Float> getAllFloats(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDouble(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDouble(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Double getDouble(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Double getDouble(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Double> getAllDoubles(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<BigDecimal> getAllBigDecimals(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidString(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidString(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public String getString(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public String getString(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<String> getAllStrings(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public LocalTime getTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public LocalTime getTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<LocalTime> getAllTimes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDate(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDate(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public LocalDate getDate(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public LocalDate getDate(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<LocalDate> getAllDates(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDateTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDateTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<LocalDateTime> getAllDateTimes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidByteArray(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidByteArray(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Byte[] getByteArray(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Byte[] getByteArray(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Byte[]> getAllByteArrays(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<String> getFieldNames() {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public PlcField getField(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public PlcResponseCode getResponseCode(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+    
+    public ByteBuf getData(String name) {
+        return s7alarm.getComingValues().get(0).getData();
+    }
+
+    @Override
+    public boolean isValidDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDuration(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Duration getDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Duration getDuration(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Duration> getAllDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+    
+    
+    
+    
+    public ByteBuf getAllData() {
+        ByteBuf copy = buffer(12);
+        for(AssociatedValueItem item:s7alarm.getComingValues() ){
+            copy.writeBytes(item.getData());
+        }
+        return copy;
+    }
+    
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/events/S7ConnectedEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/events/S7ConnectedEvent.java
index 254dbee293f..3c2a96e030e 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/events/S7ConnectedEvent.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/events/S7ConnectedEvent.java
@@ -1,22 +1,22 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.events;
-
-public class S7ConnectedEvent {
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.events;
+
+public class S7ConnectedEvent {
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7Message.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7Message.java
index c554e44a215..af1eb41e238 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7Message.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7Message.java
@@ -1,99 +1,99 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.messages;
-
-import org.apache.plc4x.java.base.messages.PlcProtocolMessage;
-import org.apache.plc4x.java.base.messages.PlcRawMessage;
-import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
-import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
-import org.apache.plc4x.java.s7.netty.model.types.MessageType;
-
-import java.util.List;
-import java.util.Optional;
-
-/**
- * Container for Request and Responses to and from S7.
- * Contains the following information
- * <ul>
- *     <li>messageType - type of the message as {@link MessageType}</li>
- *     <li>tpudReference - internal counter from {@link org.apache.plc4x.java.s7.netty.Plc4XS7Protocol} for tracking and correlation</li>
- *     <li>parameters - description of command(s) to perform (read or write) and the exact address range</li>
- *     <li>payloads - possible payload (for writes)</li>
- * </ul>
- */
-public abstract class S7Message extends PlcRawMessage {
-
-    private final MessageType messageType;
-    private final short tpduReference;
-    private final List<S7Parameter> parameters;
-    private final List<S7Payload> payloads;
-
-    protected S7Message(MessageType messageType, short tpduReference, List<S7Parameter> parameters,
-                        List<S7Payload> payloads) {
-        this(messageType, tpduReference, parameters, payloads, null);
-    }
-
-    protected S7Message(MessageType messageType, short tpduReference, List<S7Parameter> parameters,
-                        List<S7Payload> payloads, PlcProtocolMessage parent) {
-        super(null, parent);
-        this.messageType = messageType;
-        this.tpduReference = tpduReference;
-        this.parameters = parameters;
-        this.payloads = payloads;
-    }
-
-    public MessageType getMessageType() {
-        return messageType;
-    }
-
-    public short getTpduReference() {
-        return tpduReference;
-    }
-
-    public List<S7Parameter> getParameters() {
-        return parameters;
-    }
-
-    public <T> Optional<T> getParameter(Class<T> parameterType) {
-        if (parameters != null) {
-            for (S7Parameter s7Parameter : parameters) {
-                if (s7Parameter.getClass() == parameterType) {
-                    return Optional.of(parameterType.cast(s7Parameter));
-                }
-            }
-        }
-        return Optional.empty();
-    }
-
-    public List<S7Payload> getPayloads() {
-        return payloads;
-    }
-
-    public <T> Optional<T> getPayload(Class<T> payloadType) {
-        if (payloads != null) {
-            for (S7Payload s7Payload : payloads) {
-                if (s7Payload.getClass() == payloadType) {
-                    return Optional.of(payloadType.cast(s7Payload));
-                }
-            }
-        }
-        return Optional.empty();
-    }
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.messages;
+
+import org.apache.plc4x.java.base.messages.PlcProtocolMessage;
+import org.apache.plc4x.java.base.messages.PlcRawMessage;
+import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
+import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
+import org.apache.plc4x.java.s7.netty.model.types.MessageType;
+
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * Container for Request and Responses to and from S7.
+ * Contains the following information
+ * <ul>
+ *     <li>messageType - type of the message as {@link MessageType}</li>
+ *     <li>tpudReference - internal counter from {@link org.apache.plc4x.java.s7.netty.Plc4XS7Protocol} for tracking and correlation</li>
+ *     <li>parameters - description of command(s) to perform (read or write) and the exact address range</li>
+ *     <li>payloads - possible payload (for writes)</li>
+ * </ul>
+ */
+public abstract class S7Message extends PlcRawMessage {
+
+    private final MessageType messageType;
+    private final short tpduReference;
+    private final List<S7Parameter> parameters;
+    private final List<S7Payload> payloads;
+
+    protected S7Message(MessageType messageType, short tpduReference, List<S7Parameter> parameters,
+                        List<S7Payload> payloads) {
+        this(messageType, tpduReference, parameters, payloads, null);
+    }
+
+    protected S7Message(MessageType messageType, short tpduReference, List<S7Parameter> parameters,
+                        List<S7Payload> payloads, PlcProtocolMessage parent) {
+        super(null, parent);
+        this.messageType = messageType;
+        this.tpduReference = tpduReference;
+        this.parameters = parameters;
+        this.payloads = payloads;
+    }
+
+    public MessageType getMessageType() {
+        return messageType;
+    }
+
+    public short getTpduReference() {
+        return tpduReference;
+    }
+
+    public List<S7Parameter> getParameters() {
+        return parameters;
+    }
+
+    public <T> Optional<T> getParameter(Class<T> parameterType) {
+        if (parameters != null) {
+            for (S7Parameter s7Parameter : parameters) {
+                if (s7Parameter.getClass() == parameterType) {
+                    return Optional.of(parameterType.cast(s7Parameter));
+                }
+            }
+        }
+        return Optional.empty();
+    }
+
+    public List<S7Payload> getPayloads() {
+        return payloads;
+    }
+
+    public <T> Optional<T> getPayload(Class<T> payloadType) {
+        if (payloads != null) {
+            for (S7Payload s7Payload : payloads) {
+                if (s7Payload.getClass() == payloadType) {
+                    return Optional.of(payloadType.cast(s7Payload));
+                }
+            }
+        }
+        return Optional.empty();
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7PushMessage.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7PushMessage.java
index 29835684d3c..a882e9b56a3 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7PushMessage.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7PushMessage.java
@@ -1,28 +1,28 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.netty.model.messages;
-
-/**
- *
- * @author cgarcia
- */
-public interface S7PushMessage {
-    
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.messages;
+
+/**
+ *
+ * @author cgarcia
+ */
+public interface S7PushMessage {
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7RequestMessage.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7RequestMessage.java
index a06bebd4541..944ee936792 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7RequestMessage.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7RequestMessage.java
@@ -1,80 +1,80 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.messages;
-
-import java.util.List;
-import org.apache.plc4x.java.base.messages.PlcProtocolMessage;
-import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
-import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
-import org.apache.plc4x.java.s7.netty.model.types.MessageType;
-import org.apache.plc4x.java.s7.netty.util.S7ResponseSizeEstimator;
-import org.apache.plc4x.java.s7.netty.util.S7SizeHelper;
-
-/**
- * Container Object for Requests to S7 which additionally stores information if the request was acknowledged (by the PLC?).
- *
- * @see S7Message for the other attributes.
- */
-public class S7RequestMessage extends S7Message {
-
-    private boolean acknowledged;
-    private int requestSize;
-
-    public S7RequestMessage(MessageType messageType, short tpduReference, List<S7Parameter> s7Parameters,
-                            List<S7Payload> s7Payloads, PlcProtocolMessage parent) {
-        super(messageType, tpduReference, s7Parameters, s7Payloads, parent);
-        acknowledged = false;
-        
-        this.requestSize = CalcSize();
-    }
-
-    public boolean isAcknowledged() {
-        return acknowledged;
-    }
-
-    public void setAcknowledged(boolean acknowledged) {
-        this.acknowledged = acknowledged;
-    }
-    
-    public int getRequestSize() {
-        return this.requestSize;
-    }   
-    
-    private int CalcSize(){
-        int size = 0;
-        S7Parameter parameter = this.getParameters().get(0);
-        switch (parameter.getType()) {
-            case READ_VAR:
-                size = S7ResponseSizeEstimator.getEstimatedResponseMessageSize(this);                
-                break;
-            case WRITE_VAR:
-                size = 10 + 
-                S7SizeHelper.getParametersLength(this.getParameters()) + 
-                S7SizeHelper.getPayloadsLength(this.getPayloads());
-                break;
-            case SETUP_COMMUNICATION:
-                return 8;
-            default:
-                ;
-        }        
-        return size;
-    }
-    
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.messages;
+
+import java.util.List;
+import org.apache.plc4x.java.base.messages.PlcProtocolMessage;
+import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
+import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
+import org.apache.plc4x.java.s7.netty.model.types.MessageType;
+import org.apache.plc4x.java.s7.netty.util.S7ResponseSizeEstimator;
+import org.apache.plc4x.java.s7.netty.util.S7SizeHelper;
+
+/**
+ * Container Object for Requests to S7 which additionally stores information if the request was acknowledged (by the PLC?).
+ *
+ * @see S7Message for the other attributes.
+ */
+public class S7RequestMessage extends S7Message {
+
+    private boolean acknowledged;
+    private int requestSize;
+
+    public S7RequestMessage(MessageType messageType, short tpduReference, List<S7Parameter> s7Parameters,
+                            List<S7Payload> s7Payloads, PlcProtocolMessage parent) {
+        super(messageType, tpduReference, s7Parameters, s7Payloads, parent);
+        acknowledged = false;
+        
+        this.requestSize = CalcSize();
+    }
+
+    public boolean isAcknowledged() {
+        return acknowledged;
+    }
+
+    public void setAcknowledged(boolean acknowledged) {
+        this.acknowledged = acknowledged;
+    }
+    
+    public int getRequestSize() {
+        return this.requestSize;
+    }   
+    
+    private int CalcSize(){
+        int size = 0;
+        S7Parameter parameter = this.getParameters().get(0);
+        switch (parameter.getType()) {
+            case READ_VAR:
+                size = S7ResponseSizeEstimator.getEstimatedResponseMessageSize(this);                
+                break;
+            case WRITE_VAR:
+                size = 10 + 
+                S7SizeHelper.getParametersLength(this.getParameters()) + 
+                S7SizeHelper.getPayloadsLength(this.getPayloads());
+                break;
+            case SETUP_COMMUNICATION:
+                return 8;
+            default:
+                ;
+        }        
+        return size;
+    }
+    
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7ResponseMessage.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7ResponseMessage.java
index b3e8922115c..38cf0fb82a8 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7ResponseMessage.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7ResponseMessage.java
@@ -1,50 +1,50 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.messages;
-
-import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
-import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
-import org.apache.plc4x.java.s7.netty.model.types.MessageType;
-
-import java.util.List;
-
-/**
- * Response from S7 PLC that additionally contains error information.
- */
-public class S7ResponseMessage extends S7Message {
-
-    private final byte errorClass;
-    private final byte errorCode;
-
-    public S7ResponseMessage(MessageType messageType, short tpduReference, List<S7Parameter> s7Parameters, List<S7Payload> s7Payloads,
-                             byte errorClass, byte errorCode) {
-        super(messageType, tpduReference, s7Parameters, s7Payloads);
-        this.errorClass = errorClass;
-        this.errorCode = errorCode;
-    }
-
-    public byte getErrorClass() {
-        return errorClass;
-    }
-
-    public byte getErrorCode() {
-        return errorCode;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.messages;
+
+import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
+import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
+import org.apache.plc4x.java.s7.netty.model.types.MessageType;
+
+import java.util.List;
+
+/**
+ * Response from S7 PLC that additionally contains error information.
+ */
+public class S7ResponseMessage extends S7Message {
+
+    private final byte errorClass;
+    private final byte errorCode;
+
+    public S7ResponseMessage(MessageType messageType, short tpduReference, List<S7Parameter> s7Parameters, List<S7Payload> s7Payloads,
+                             byte errorClass, byte errorCode) {
+        super(messageType, tpduReference, s7Parameters, s7Payloads);
+        this.errorClass = errorClass;
+        this.errorCode = errorCode;
+    }
+
+    public byte getErrorClass() {
+        return errorClass;
+    }
+
+    public byte getErrorCode() {
+        return errorCode;
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/SetupCommunicationRequestMessage.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/SetupCommunicationRequestMessage.java
index 8194fa8b025..b5918822e4e 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/SetupCommunicationRequestMessage.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/SetupCommunicationRequestMessage.java
@@ -1,35 +1,35 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.messages;
-
-import org.apache.plc4x.java.base.messages.PlcProtocolMessage;
-import org.apache.plc4x.java.s7.netty.model.params.SetupCommunicationParameter;
-import org.apache.plc4x.java.s7.netty.model.types.MessageType;
-
-import java.util.Collections;
-
-public class SetupCommunicationRequestMessage extends S7RequestMessage {
-
-    public SetupCommunicationRequestMessage(short tpduReference, short maxAmqCaller, short maxAmqCallee,
-                                            short pduLength, PlcProtocolMessage parent) {
-        super(MessageType.JOB, tpduReference, Collections.singletonList(
-            new SetupCommunicationParameter(maxAmqCaller, maxAmqCallee, pduLength)), Collections.emptyList(), parent);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.messages;
+
+import org.apache.plc4x.java.base.messages.PlcProtocolMessage;
+import org.apache.plc4x.java.s7.netty.model.params.SetupCommunicationParameter;
+import org.apache.plc4x.java.s7.netty.model.types.MessageType;
+
+import java.util.Collections;
+
+public class SetupCommunicationRequestMessage extends S7RequestMessage {
+
+    public SetupCommunicationRequestMessage(short tpduReference, short maxAmqCaller, short maxAmqCallee,
+                                            short pduLength, PlcProtocolMessage parent) {
+        super(MessageType.JOB, tpduReference, Collections.singletonList(
+            new SetupCommunicationParameter(maxAmqCaller, maxAmqCallee, pduLength)), Collections.emptyList(), parent);
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuCyclicServicesRequestParameter.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuCyclicServicesRequestParameter.java
index 9c2dd231f5c..bf4d2f28f41 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuCyclicServicesRequestParameter.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuCyclicServicesRequestParameter.java
@@ -1,60 +1,60 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.netty.model.params;
-
-import org.apache.plc4x.java.s7.netty.model.types.CpuCyclicServicesParameterSubFunctionGroupType;
-import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterFunctionGroup;
-import org.apache.plc4x.java.s7.netty.model.types.CpuUserDataMethodType;
-import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
-
-/**
- *
- * @author cgarcia
- */
-public class CpuCyclicServicesRequestParameter extends CpuServicesRequestParameter {
-    private CpuUserDataMethodType Method;    
-    private CpuCyclicServicesParameterSubFunctionGroupType cyclicSubFunction;
-
-    public CpuCyclicServicesRequestParameter(CpuUserDataMethodType Method, 
-            CpuServicesParameterFunctionGroup functionGroup, 
-            CpuCyclicServicesParameterSubFunctionGroupType cyclicSubFunction, 
-            byte sequenceNumber) {
-        super(functionGroup, null, sequenceNumber);
-        this.Method = Method;
-        this.cyclicSubFunction = cyclicSubFunction;
-    }
-
-    public CpuUserDataMethodType getMethod() {
-        return Method;
-    }
-
-    public CpuCyclicServicesParameterSubFunctionGroupType getCyclicSubFunction() {
-        return cyclicSubFunction;
-    }
-    
-    /*
-    * TODO: The parameter type is not consistent for all posible objects. Must be evaluated.
-    */
-    @Override
-    public ParameterType getType() {        
-        return ParameterType.CPU_SERVICES;
-    }
-    
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.params;
+
+import org.apache.plc4x.java.s7.netty.model.types.CpuCyclicServicesParameterSubFunctionGroupType;
+import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterFunctionGroup;
+import org.apache.plc4x.java.s7.netty.model.types.CpuUserDataMethodType;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class CpuCyclicServicesRequestParameter extends CpuServicesRequestParameter {
+    private CpuUserDataMethodType Method;    
+    private CpuCyclicServicesParameterSubFunctionGroupType cyclicSubFunction;
+
+    public CpuCyclicServicesRequestParameter(CpuUserDataMethodType Method, 
+            CpuServicesParameterFunctionGroup functionGroup, 
+            CpuCyclicServicesParameterSubFunctionGroupType cyclicSubFunction, 
+            byte sequenceNumber) {
+        super(functionGroup, null, sequenceNumber);
+        this.Method = Method;
+        this.cyclicSubFunction = cyclicSubFunction;
+    }
+
+    public CpuUserDataMethodType getMethod() {
+        return Method;
+    }
+
+    public CpuCyclicServicesParameterSubFunctionGroupType getCyclicSubFunction() {
+        return cyclicSubFunction;
+    }
+    
+    /*
+    * TODO: The parameter type is not consistent for all posible objects. Must be evaluated.
+    */
+    @Override
+    public ParameterType getType() {        
+        return ParameterType.CPU_SERVICES;
+    }
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuCyclicServicesResponseParameter.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuCyclicServicesResponseParameter.java
index 9208ca04fd5..89fcf892aab 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuCyclicServicesResponseParameter.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuCyclicServicesResponseParameter.java
@@ -1,50 +1,50 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.params;
-
-import org.apache.plc4x.java.s7.netty.model.types.CpuCyclicServicesParameterSubFunctionGroupType;
-import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterFunctionGroup;
-import org.apache.plc4x.java.s7.netty.model.types.ParameterError;
-import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
-
-public class CpuCyclicServicesResponseParameter extends CpuServicesResponseParameter {
-
-    private CpuCyclicServicesParameterSubFunctionGroupType subCycFunctionGroup;
-
-    public CpuCyclicServicesResponseParameter(
-            CpuServicesParameterFunctionGroup functionGroup,              
-            CpuCyclicServicesParameterSubFunctionGroupType subCycFunctionGroup, 
-            byte sequenceNumber,
-            byte dataUnitReferenceNumber, 
-            boolean lastDataUnit, 
-            ParameterError error) {
-        super(functionGroup, null, sequenceNumber, dataUnitReferenceNumber, lastDataUnit, error);
-        this.subCycFunctionGroup = subCycFunctionGroup;
-    }
-
-    public CpuCyclicServicesParameterSubFunctionGroupType getSubCycFunctionGroup() {
-        return subCycFunctionGroup;
-    }
-
-    @Override
-    public ParameterType getType() {
-        return ParameterType.CPU_SERVICES;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.params;
+
+import org.apache.plc4x.java.s7.netty.model.types.CpuCyclicServicesParameterSubFunctionGroupType;
+import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterFunctionGroup;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterError;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+
+public class CpuCyclicServicesResponseParameter extends CpuServicesResponseParameter {
+
+    private CpuCyclicServicesParameterSubFunctionGroupType subCycFunctionGroup;
+
+    public CpuCyclicServicesResponseParameter(
+            CpuServicesParameterFunctionGroup functionGroup,              
+            CpuCyclicServicesParameterSubFunctionGroupType subCycFunctionGroup, 
+            byte sequenceNumber,
+            byte dataUnitReferenceNumber, 
+            boolean lastDataUnit, 
+            ParameterError error) {
+        super(functionGroup, null, sequenceNumber, dataUnitReferenceNumber, lastDataUnit, error);
+        this.subCycFunctionGroup = subCycFunctionGroup;
+    }
+
+    public CpuCyclicServicesParameterSubFunctionGroupType getSubCycFunctionGroup() {
+        return subCycFunctionGroup;
+    }
+
+    @Override
+    public ParameterType getType() {
+        return ParameterType.CPU_SERVICES;
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuDiagnosticPushParameter.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuDiagnosticPushParameter.java
index 40b364a54c9..f818b2e707c 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuDiagnosticPushParameter.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuDiagnosticPushParameter.java
@@ -1,87 +1,87 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.params;
-
-import org.apache.plc4x.java.s7.netty.model.messages.S7PushMessage;
-import org.apache.plc4x.java.s7.netty.model.types.CpuCurrentModeType;
-import org.apache.plc4x.java.s7.netty.model.types.CpuUserDataMethodType;
-import org.apache.plc4x.java.s7.netty.model.types.CpuUserDataParameterFunctionGroupType;
-import org.apache.plc4x.java.s7.netty.model.types.CpuUserDataParameterType;
-import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
-
-/**
- *
- * @author cgarcia
- */
-public class CpuDiagnosticPushParameter implements S7Parameter, S7PushMessage {
-    
-    private CpuUserDataMethodType Method;
-    private CpuUserDataParameterType parameterType;
-    private CpuUserDataParameterFunctionGroupType ParameterFunction;
-    private CpuCurrentModeType CurrentMode;
-    private byte sequenceNumber;
-
-    public CpuDiagnosticPushParameter(
-            CpuUserDataMethodType Method, 
-            CpuUserDataParameterType ParameterType, 
-            CpuUserDataParameterFunctionGroupType ParameterFunction, 
-            CpuCurrentModeType CurrentMode, 
-            byte sequenceNumber) {
-        this.Method = Method;
-        this.parameterType = ParameterType;
-        this.ParameterFunction = ParameterFunction;
-        this.CurrentMode = CurrentMode;
-        this.sequenceNumber = sequenceNumber;
-    }
-
-    public CpuUserDataMethodType getMethod() {
-        return Method;
-    }
-
-    public CpuUserDataParameterType getParameterType() {
-        return parameterType;
-    }
-
-    public CpuUserDataParameterFunctionGroupType getParameterFunction() {
-        return ParameterFunction;
-    }
-
-    public CpuCurrentModeType getCurrentMode() {
-        return CurrentMode;
-    }
-
-    @Override
-    public ParameterType getType() {
-        return ParameterType.MODE_TRANSITION;
-    }
-
-    @Override
-    public String toString() {
-        return "CpuDiagnosticPushParameter{" + "Method=" + Method 
-                + ", parameterType=" + parameterType 
-                + ", ParameterFunction=" + ParameterFunction 
-                + ", CurrentMode=" + CurrentMode 
-                + ", sequenceNumber=" + sequenceNumber 
-                + '}';
-    }
-
-
-
-    
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.params;
+
+import org.apache.plc4x.java.s7.netty.model.messages.S7PushMessage;
+import org.apache.plc4x.java.s7.netty.model.types.CpuCurrentModeType;
+import org.apache.plc4x.java.s7.netty.model.types.CpuUserDataMethodType;
+import org.apache.plc4x.java.s7.netty.model.types.CpuUserDataParameterFunctionGroupType;
+import org.apache.plc4x.java.s7.netty.model.types.CpuUserDataParameterType;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class CpuDiagnosticPushParameter implements S7Parameter, S7PushMessage {
+    
+    private CpuUserDataMethodType Method;
+    private CpuUserDataParameterType parameterType;
+    private CpuUserDataParameterFunctionGroupType ParameterFunction;
+    private CpuCurrentModeType CurrentMode;
+    private byte sequenceNumber;
+
+    public CpuDiagnosticPushParameter(
+            CpuUserDataMethodType Method, 
+            CpuUserDataParameterType ParameterType, 
+            CpuUserDataParameterFunctionGroupType ParameterFunction, 
+            CpuCurrentModeType CurrentMode, 
+            byte sequenceNumber) {
+        this.Method = Method;
+        this.parameterType = ParameterType;
+        this.ParameterFunction = ParameterFunction;
+        this.CurrentMode = CurrentMode;
+        this.sequenceNumber = sequenceNumber;
+    }
+
+    public CpuUserDataMethodType getMethod() {
+        return Method;
+    }
+
+    public CpuUserDataParameterType getParameterType() {
+        return parameterType;
+    }
+
+    public CpuUserDataParameterFunctionGroupType getParameterFunction() {
+        return ParameterFunction;
+    }
+
+    public CpuCurrentModeType getCurrentMode() {
+        return CurrentMode;
+    }
+
+    @Override
+    public ParameterType getType() {
+        return ParameterType.MODE_TRANSITION;
+    }
+
+    @Override
+    public String toString() {
+        return "CpuDiagnosticPushParameter{" + "Method=" + Method 
+                + ", parameterType=" + parameterType 
+                + ", ParameterFunction=" + ParameterFunction 
+                + ", CurrentMode=" + CurrentMode 
+                + ", sequenceNumber=" + sequenceNumber 
+                + '}';
+    }
+
+
+
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesParameter.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesParameter.java
index e87ea4e9c3f..e176fc6e05d 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesParameter.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesParameter.java
@@ -1,54 +1,54 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.params;
-
-import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterSubFunctionGroup;
-import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterFunctionGroup;
-import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
-
-public abstract class CpuServicesParameter implements S7Parameter {
-
-    private CpuServicesParameterFunctionGroup functionGroup;
-    private CpuServicesParameterSubFunctionGroup subFunctionGroup;
-    private byte sequenceNumber;
-
-    public CpuServicesParameter(CpuServicesParameterFunctionGroup functionGroup, CpuServicesParameterSubFunctionGroup subFunctionGroup, byte sequenceNumber) {
-        this.functionGroup = functionGroup;
-        this.subFunctionGroup = subFunctionGroup;
-        this.sequenceNumber = sequenceNumber;
-    }
-
-    @Override
-    public ParameterType getType() {
-        return ParameterType.CPU_SERVICES;
-    }
-
-    public CpuServicesParameterFunctionGroup getFunctionGroup() {
-        return functionGroup;
-    }
-
-    public CpuServicesParameterSubFunctionGroup getSubFunctionGroup() {
-        return subFunctionGroup;
-    }
-
-    public byte getSequenceNumber() {
-        return sequenceNumber;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.params;
+
+import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterSubFunctionGroup;
+import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterFunctionGroup;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+
+public abstract class CpuServicesParameter implements S7Parameter {
+
+    private CpuServicesParameterFunctionGroup functionGroup;
+    private CpuServicesParameterSubFunctionGroup subFunctionGroup;
+    private byte sequenceNumber;
+
+    public CpuServicesParameter(CpuServicesParameterFunctionGroup functionGroup, CpuServicesParameterSubFunctionGroup subFunctionGroup, byte sequenceNumber) {
+        this.functionGroup = functionGroup;
+        this.subFunctionGroup = subFunctionGroup;
+        this.sequenceNumber = sequenceNumber;
+    }
+
+    @Override
+    public ParameterType getType() {
+        return ParameterType.CPU_SERVICES;
+    }
+
+    public CpuServicesParameterFunctionGroup getFunctionGroup() {
+        return functionGroup;
+    }
+
+    public CpuServicesParameterSubFunctionGroup getSubFunctionGroup() {
+        return subFunctionGroup;
+    }
+
+    public byte getSequenceNumber() {
+        return sequenceNumber;
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesPushParameter.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesPushParameter.java
index 36b93c25b10..72bba64119a 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesPushParameter.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesPushParameter.java
@@ -1,56 +1,56 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.params;
-
-import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterFunctionGroup;
-import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterSubFunctionGroup;
-import org.apache.plc4x.java.s7.netty.model.types.ParameterError;
-
-/**
- *
- * @author cgarcia
- */
-public class CpuServicesPushParameter extends CpuServicesParameter {
-    
-    private byte dataUnitReferenceNumber;
-    private boolean lastDataUnit;
-    private ParameterError error;
-    
-    public CpuServicesPushParameter(CpuServicesParameterFunctionGroup functionGroup, CpuServicesParameterSubFunctionGroup subFunctionGroup, byte sequenceNumber) {
-        super(functionGroup, subFunctionGroup, sequenceNumber);
-    }
-
-    public byte getDataUnitReferenceNumber() {
-        return dataUnitReferenceNumber;
-    }
-
-    public boolean isLastDataUnit() {
-        return lastDataUnit;
-    }
-
-    public ParameterError getError() {
-        return error;
-    }
-
-    @Override
-    public String toString() {
-        return "CpuServicesPushParameter{" + "dataUnitReferenceNumber=" + dataUnitReferenceNumber + ", lastDataUnit=" + lastDataUnit + ", error=" + error + '}';
-    }
-    
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.params;
+
+import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterFunctionGroup;
+import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterSubFunctionGroup;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterError;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class CpuServicesPushParameter extends CpuServicesParameter {
+    
+    private byte dataUnitReferenceNumber;
+    private boolean lastDataUnit;
+    private ParameterError error;
+    
+    public CpuServicesPushParameter(CpuServicesParameterFunctionGroup functionGroup, CpuServicesParameterSubFunctionGroup subFunctionGroup, byte sequenceNumber) {
+        super(functionGroup, subFunctionGroup, sequenceNumber);
+    }
+
+    public byte getDataUnitReferenceNumber() {
+        return dataUnitReferenceNumber;
+    }
+
+    public boolean isLastDataUnit() {
+        return lastDataUnit;
+    }
+
+    public ParameterError getError() {
+        return error;
+    }
+
+    @Override
+    public String toString() {
+        return "CpuServicesPushParameter{" + "dataUnitReferenceNumber=" + dataUnitReferenceNumber + ", lastDataUnit=" + lastDataUnit + ", error=" + error + '}';
+    }
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesRequestParameter.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesRequestParameter.java
index ee9509fdfb1..76cba92b92a 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesRequestParameter.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesRequestParameter.java
@@ -1,33 +1,33 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.params;
-
-import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterFunctionGroup;
-import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterSubFunctionGroup;
-
-public class CpuServicesRequestParameter extends CpuServicesParameter {
-
-    public CpuServicesRequestParameter(CpuServicesParameterFunctionGroup functionGroup, 
-            CpuServicesParameterSubFunctionGroup subFunctionGroup, 
-            byte sequenceNumber) {
-        
-        super(functionGroup, subFunctionGroup, sequenceNumber);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.params;
+
+import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterFunctionGroup;
+import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterSubFunctionGroup;
+
+public class CpuServicesRequestParameter extends CpuServicesParameter {
+
+    public CpuServicesRequestParameter(CpuServicesParameterFunctionGroup functionGroup, 
+            CpuServicesParameterSubFunctionGroup subFunctionGroup, 
+            byte sequenceNumber) {
+        
+        super(functionGroup, subFunctionGroup, sequenceNumber);
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesResponseParameter.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesResponseParameter.java
index e46a54c74cc..d672a299fa1 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesResponseParameter.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesResponseParameter.java
@@ -1,65 +1,65 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.params;
-
-import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterFunctionGroup;
-import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterSubFunctionGroup;
-import org.apache.plc4x.java.s7.netty.model.types.ParameterError;
-
-public class CpuServicesResponseParameter extends CpuServicesParameter {
-
-    private byte dataUnitReferenceNumber;
-    private boolean lastDataUnit;
-    private ParameterError error;
-
-    public CpuServicesResponseParameter(CpuServicesParameterFunctionGroup functionGroup, 
-            CpuServicesParameterSubFunctionGroup subFunctionGroup,
-            byte sequenceNumber) {
-        
-        super(functionGroup, subFunctionGroup, sequenceNumber);
-        this.dataUnitReferenceNumber = 0x00;
-        this.lastDataUnit = false;
-        this.error = null;
-    }    
-    
-    public CpuServicesResponseParameter(CpuServicesParameterFunctionGroup functionGroup, 
-            CpuServicesParameterSubFunctionGroup subFunctionGroup,
-            byte sequenceNumber, 
-            byte dataUnitReferenceNumber, 
-            boolean lastDataUnit, ParameterError error) {
-        
-        super(functionGroup, subFunctionGroup, sequenceNumber);
-        this.dataUnitReferenceNumber = dataUnitReferenceNumber;
-        this.lastDataUnit = lastDataUnit;
-        this.error = error;
-    }
-
-    public byte getDataUnitReferenceNumber() {
-        return dataUnitReferenceNumber;
-    }
-
-    public boolean isLastDataUnit() {
-        return lastDataUnit;
-    }
-
-    public ParameterError getError() {
-        return error;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.params;
+
+import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterFunctionGroup;
+import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterSubFunctionGroup;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterError;
+
+public class CpuServicesResponseParameter extends CpuServicesParameter {
+
+    private byte dataUnitReferenceNumber;
+    private boolean lastDataUnit;
+    private ParameterError error;
+
+    public CpuServicesResponseParameter(CpuServicesParameterFunctionGroup functionGroup, 
+            CpuServicesParameterSubFunctionGroup subFunctionGroup,
+            byte sequenceNumber) {
+        
+        super(functionGroup, subFunctionGroup, sequenceNumber);
+        this.dataUnitReferenceNumber = 0x00;
+        this.lastDataUnit = false;
+        this.error = null;
+    }    
+    
+    public CpuServicesResponseParameter(CpuServicesParameterFunctionGroup functionGroup, 
+            CpuServicesParameterSubFunctionGroup subFunctionGroup,
+            byte sequenceNumber, 
+            byte dataUnitReferenceNumber, 
+            boolean lastDataUnit, ParameterError error) {
+        
+        super(functionGroup, subFunctionGroup, sequenceNumber);
+        this.dataUnitReferenceNumber = dataUnitReferenceNumber;
+        this.lastDataUnit = lastDataUnit;
+        this.error = error;
+    }
+
+    public byte getDataUnitReferenceNumber() {
+        return dataUnitReferenceNumber;
+    }
+
+    public boolean isLastDataUnit() {
+        return lastDataUnit;
+    }
+
+    public ParameterError getError() {
+        return error;
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/S7Parameter.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/S7Parameter.java
index 5b479f298c4..594f0f3cb13 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/S7Parameter.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/S7Parameter.java
@@ -1,27 +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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.params;
-
-import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
-
-public interface S7Parameter {
-
-    ParameterType getType();
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.params;
+
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+
+public interface S7Parameter {
+
+    ParameterType getType();
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/SetupCommunicationParameter.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/SetupCommunicationParameter.java
index 323653b08d3..14cea827b8c 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/SetupCommunicationParameter.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/SetupCommunicationParameter.java
@@ -1,52 +1,52 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.params;
-
-import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
-
-public class SetupCommunicationParameter implements S7Parameter {
-
-    private final short maxAmqCaller;
-    private final short maxAmqCallee;
-    private final short pduLength;
-
-    public SetupCommunicationParameter(short maxAmqCaller, short maxAmqCallee, short pduLength) {
-        this.maxAmqCaller = maxAmqCaller;
-        this.maxAmqCallee = maxAmqCallee;
-        this.pduLength = pduLength;
-    }
-
-    @Override
-    public ParameterType getType() {
-        return ParameterType.SETUP_COMMUNICATION;
-    }
-
-    public short getMaxAmqCaller() {
-        return maxAmqCaller;
-    }
-
-    public short getMaxAmqCallee() {
-        return maxAmqCallee;
-    }
-
-    public short getPduLength() {
-        return pduLength;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.params;
+
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+
+public class SetupCommunicationParameter implements S7Parameter {
+
+    private final short maxAmqCaller;
+    private final short maxAmqCallee;
+    private final short pduLength;
+
+    public SetupCommunicationParameter(short maxAmqCaller, short maxAmqCallee, short pduLength) {
+        this.maxAmqCaller = maxAmqCaller;
+        this.maxAmqCallee = maxAmqCallee;
+        this.pduLength = pduLength;
+    }
+
+    @Override
+    public ParameterType getType() {
+        return ParameterType.SETUP_COMMUNICATION;
+    }
+
+    public short getMaxAmqCaller() {
+        return maxAmqCaller;
+    }
+
+    public short getMaxAmqCallee() {
+        return maxAmqCallee;
+    }
+
+    public short getPduLength() {
+        return pduLength;
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/VarParameter.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/VarParameter.java
index e0b18aac8b6..af9d167ab2c 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/VarParameter.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/VarParameter.java
@@ -1,54 +1,54 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.params;
-
-import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
-
-import java.util.List;
-
-/**
- * "Command" Message to inform PLC of wanted operation.
- * Also contains {@link VarParameter#items} that hold detailed information on the "Command", e.g.,
- * addresses to read or to write to.
- */
-public class VarParameter implements S7Parameter {
-
-    private final ParameterType type;
-    private final List<VarParameterItem> items;
-
-    public VarParameter(ParameterType type, List<VarParameterItem> items) {
-        this.type = type;
-        this.items = items;
-    }
-
-    @Override
-    public ParameterType getType() {
-        return type;
-    }
-
-    public List<VarParameterItem> getItems() {
-        return items;
-    }
-
-    public void mergeParameter(VarParameter otherParameter) {
-        items.addAll(otherParameter.getItems());
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.params;
+
+import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+
+import java.util.List;
+
+/**
+ * "Command" Message to inform PLC of wanted operation.
+ * Also contains {@link VarParameter#items} that hold detailed information on the "Command", e.g.,
+ * addresses to read or to write to.
+ */
+public class VarParameter implements S7Parameter {
+
+    private final ParameterType type;
+    private final List<VarParameterItem> items;
+
+    public VarParameter(ParameterType type, List<VarParameterItem> items) {
+        this.type = type;
+        this.items = items;
+    }
+
+    @Override
+    public ParameterType getType() {
+        return type;
+    }
+
+    public List<VarParameterItem> getItems() {
+        return items;
+    }
+
+    public void mergeParameter(VarParameter otherParameter) {
+        items.addAll(otherParameter.getItems());
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/items/S7AnyVarParameterItem.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/items/S7AnyVarParameterItem.java
index 876c82c974d..e3f8ec6a17d 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/items/S7AnyVarParameterItem.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/items/S7AnyVarParameterItem.java
@@ -1,94 +1,94 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.params.items;
-
-import org.apache.plc4x.java.s7.netty.model.types.MemoryArea;
-import org.apache.plc4x.java.s7.netty.model.types.SpecificationType;
-import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
-import org.apache.plc4x.java.s7.netty.model.types.VariableAddressingMode;
-
-/**
- * "Low-level" description of S7 Address range and the necessary size for transportation of values.
- * Is used as Arguments of {@link org.apache.plc4x.java.s7.netty.model.params.VarParameter} object.
- *
- * Contains the information to read one or more sequential values of the same datatype starting from given offset in a memory region
- * and also contains the transportation size of the datatype read.
- *
- * In detail:
- * <ul>
- *     <li>transportSize - {@link TransportSize} of the datatype</li>
- *     <li>numElements - number of consecutive elements to be read</li>
- *     <li>dataBlockNumber - number of the datablock</li>
- *     <li>bit / byteOffset where the adress starts</li>
- * </ul>
- */
-public class S7AnyVarParameterItem implements VarParameterItem {
-
-    private final SpecificationType specificationType;
-    private final MemoryArea memoryArea;
-    private final TransportSize dataType;
-    private final int numElements;
-    private final int dataBlockNumber;
-    private final int byteOffset;
-    private final byte bitOffset;
-
-    public S7AnyVarParameterItem(SpecificationType specificationType, MemoryArea memoryArea, TransportSize dataType, int numElements, int dataBlockNumber, int byteOffset, byte bitOffset) {
-        this.specificationType = specificationType;
-        this.memoryArea = memoryArea;
-        this.dataType = dataType;
-        this.numElements = numElements;
-        this.dataBlockNumber = dataBlockNumber;
-        this.byteOffset = byteOffset;
-        this.bitOffset = bitOffset;
-    }
-
-    @Override
-    public VariableAddressingMode getAddressingMode() {
-        return VariableAddressingMode.S7ANY;
-    }
-
-    public SpecificationType getSpecificationType() {
-        return specificationType;
-    }
-
-    public MemoryArea getMemoryArea() {
-        return memoryArea;
-    }
-
-    public TransportSize getDataType() {
-        return dataType;
-    }
-
-    public int getNumElements() {
-        return numElements;
-    }
-
-    public int getDataBlockNumber() {
-        return dataBlockNumber;
-    }
-
-    public int getByteOffset() {
-        return byteOffset;
-    }
-
-    public byte getBitOffset() {
-        return bitOffset;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.params.items;
+
+import org.apache.plc4x.java.s7.netty.model.types.MemoryArea;
+import org.apache.plc4x.java.s7.netty.model.types.SpecificationType;
+import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
+import org.apache.plc4x.java.s7.netty.model.types.VariableAddressingMode;
+
+/**
+ * "Low-level" description of S7 Address range and the necessary size for transportation of values.
+ * Is used as Arguments of {@link org.apache.plc4x.java.s7.netty.model.params.VarParameter} object.
+ *
+ * Contains the information to read one or more sequential values of the same datatype starting from given offset in a memory region
+ * and also contains the transportation size of the datatype read.
+ *
+ * In detail:
+ * <ul>
+ *     <li>transportSize - {@link TransportSize} of the datatype</li>
+ *     <li>numElements - number of consecutive elements to be read</li>
+ *     <li>dataBlockNumber - number of the datablock</li>
+ *     <li>bit / byteOffset where the adress starts</li>
+ * </ul>
+ */
+public class S7AnyVarParameterItem implements VarParameterItem {
+
+    private final SpecificationType specificationType;
+    private final MemoryArea memoryArea;
+    private final TransportSize dataType;
+    private final int numElements;
+    private final int dataBlockNumber;
+    private final int byteOffset;
+    private final byte bitOffset;
+
+    public S7AnyVarParameterItem(SpecificationType specificationType, MemoryArea memoryArea, TransportSize dataType, int numElements, int dataBlockNumber, int byteOffset, byte bitOffset) {
+        this.specificationType = specificationType;
+        this.memoryArea = memoryArea;
+        this.dataType = dataType;
+        this.numElements = numElements;
+        this.dataBlockNumber = dataBlockNumber;
+        this.byteOffset = byteOffset;
+        this.bitOffset = bitOffset;
+    }
+
+    @Override
+    public VariableAddressingMode getAddressingMode() {
+        return VariableAddressingMode.S7ANY;
+    }
+
+    public SpecificationType getSpecificationType() {
+        return specificationType;
+    }
+
+    public MemoryArea getMemoryArea() {
+        return memoryArea;
+    }
+
+    public TransportSize getDataType() {
+        return dataType;
+    }
+
+    public int getNumElements() {
+        return numElements;
+    }
+
+    public int getDataBlockNumber() {
+        return dataBlockNumber;
+    }
+
+    public int getByteOffset() {
+        return byteOffset;
+    }
+
+    public byte getBitOffset() {
+        return bitOffset;
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/items/VarParameterItem.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/items/VarParameterItem.java
index 2cbb5a518d1..8ed5f9c1dbb 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/items/VarParameterItem.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/items/VarParameterItem.java
@@ -1,27 +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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.params.items;
-
-import org.apache.plc4x.java.s7.netty.model.types.VariableAddressingMode;
-
-public interface VarParameterItem {
-
-    VariableAddressingMode getAddressingMode();
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.params.items;
+
+import org.apache.plc4x.java.s7.netty.model.types.VariableAddressingMode;
+
+public interface VarParameterItem {
+
+    VariableAddressingMode getAddressingMode();
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/AlarmMessagePayload.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/AlarmMessagePayload.java
index ffe817b4e2b..1019199f040 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/AlarmMessagePayload.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/AlarmMessagePayload.java
@@ -1,101 +1,101 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.netty.model.payloads;
-
-import org.apache.plc4x.java.s7.netty.model.messages.S7PushMessage;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.AlarmMessageItem;
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
-import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
-
-/**
- *
- * @author cgarcia
- */
-public class AlarmMessagePayload implements S7Payload, S7PushMessage {
-        
-    private final DataTransportErrorCode returnCode;
-    private final DataTransportSize dataTransportSize;
-    private final Object msgtype; 
-    private final Integer length;
-    private final AlarmMessageItem msg;    
-
-    public AlarmMessagePayload(DataTransportErrorCode returnCode, 
-            DataTransportSize dataTransportSize, 
-            Integer length,
-            AlarmMessageItem msg) {
-        this.returnCode = returnCode;
-        this.dataTransportSize = dataTransportSize;
-        this.msgtype = null;
-        this.length = length;
-        this.msg = msg;
-    }    
-    
-    public AlarmMessagePayload(DataTransportErrorCode returnCode, 
-            DataTransportSize dataTransportSize, 
-            Object msgtype, 
-            Integer length,
-            AlarmMessageItem msg) {
-        this.returnCode = returnCode;
-        this.dataTransportSize = dataTransportSize;
-        this.msgtype = msgtype;
-        this.length = length;
-        this.msg = msg;
-    }
-
-
-    @Override
-    public ParameterType getType() {
-        return ParameterType.CPU_SERVICES;
-    }
-
-    public DataTransportErrorCode getReturnCode() {
-        return returnCode;
-    }
-
-    public DataTransportSize getDataTransportSize() {
-        return dataTransportSize;
-    }
-
-    public Object getMsgtype() {
-        return msgtype;
-    }
-
-    public Integer getLength() {
-        return length;
-    }
-
-    public AlarmMessageItem getMsg() {
-        return msg;
-    }
-
-    @Override
-    public String toString() {
-        return "AlarmMessagePayload{" + "returnCode=" + returnCode 
-                + ", dataTransportSize=" + dataTransportSize 
-                + ", msgtype=" + msgtype 
-                + ", length=" + length 
-                + ", msg=" + msg 
-                + '}';
-    }
-    
-    
-    
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.payloads;
+
+import org.apache.plc4x.java.s7.netty.model.messages.S7PushMessage;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.AlarmMessageItem;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class AlarmMessagePayload implements S7Payload, S7PushMessage {
+        
+    private final DataTransportErrorCode returnCode;
+    private final DataTransportSize dataTransportSize;
+    private final Object msgtype; 
+    private final Integer length;
+    private final AlarmMessageItem msg;    
+
+    public AlarmMessagePayload(DataTransportErrorCode returnCode, 
+            DataTransportSize dataTransportSize, 
+            Integer length,
+            AlarmMessageItem msg) {
+        this.returnCode = returnCode;
+        this.dataTransportSize = dataTransportSize;
+        this.msgtype = null;
+        this.length = length;
+        this.msg = msg;
+    }    
+    
+    public AlarmMessagePayload(DataTransportErrorCode returnCode, 
+            DataTransportSize dataTransportSize, 
+            Object msgtype, 
+            Integer length,
+            AlarmMessageItem msg) {
+        this.returnCode = returnCode;
+        this.dataTransportSize = dataTransportSize;
+        this.msgtype = msgtype;
+        this.length = length;
+        this.msg = msg;
+    }
+
+
+    @Override
+    public ParameterType getType() {
+        return ParameterType.CPU_SERVICES;
+    }
+
+    public DataTransportErrorCode getReturnCode() {
+        return returnCode;
+    }
+
+    public DataTransportSize getDataTransportSize() {
+        return dataTransportSize;
+    }
+
+    public Object getMsgtype() {
+        return msgtype;
+    }
+
+    public Integer getLength() {
+        return length;
+    }
+
+    public AlarmMessageItem getMsg() {
+        return msg;
+    }
+
+    @Override
+    public String toString() {
+        return "AlarmMessagePayload{" + "returnCode=" + returnCode 
+                + ", dataTransportSize=" + dataTransportSize 
+                + ", msgtype=" + msgtype 
+                + ", length=" + length 
+                + ", msg=" + msg 
+                + '}';
+    }
+    
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesRequestPayload.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesRequestPayload.java
index aeffe15cd10..bab50613cd4 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesRequestPayload.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesRequestPayload.java
@@ -1,121 +1,121 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.netty.model.payloads;
-
-import java.util.List;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.S7AnyVarPayloadItem;
-import org.apache.plc4x.java.s7.netty.model.types.CpuCyclicServiceTimeBaseType;
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
-import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
-
-/**
- *
- * @author cgarcia
- */
-public class CpuCyclicServicesRequestPayload implements S7Payload {
-    private final DataTransportErrorCode returnCode;
-    private final DataTransportSize dataTransportSize;
-    private final int length;
-    private final int itemCount;
-    private final CpuCyclicServiceTimeBaseType timeBase;
-    private final byte timeFactor;
-    private final List<S7AnyVarPayloadItem> items;  
-    //For Cancel Subcription
-    private final byte function;
-    private final byte jobId;
-    
-    public CpuCyclicServicesRequestPayload(DataTransportErrorCode returnCode, 
-            DataTransportSize dataTransportSize, 
-            int length, 
-            int itemCount, 
-            CpuCyclicServiceTimeBaseType timeBase, 
-            byte timeFactor, 
-            List<S7AnyVarPayloadItem> items) {
-        this.returnCode = returnCode;
-        this.dataTransportSize = dataTransportSize;
-        this.length = length;
-        this.itemCount = itemCount;
-        this.timeBase = timeBase;
-        this.timeFactor = timeFactor;
-        this.items = items;
-        this.function = 0x00;
-        this.jobId = 0x00;
-    }
-
-
-    public CpuCyclicServicesRequestPayload(DataTransportErrorCode returnCode, 
-            DataTransportSize dataTransportSize, 
-            int length,
-            byte function,
-            byte jobId) {
-        this.returnCode = returnCode;
-        this.dataTransportSize = dataTransportSize;
-        this.length = length;
-        this.itemCount = 0x00;
-        this.timeBase = null;
-        this.timeFactor = 0x00;
-        this.items = null;
-        this.function = function;
-        this.jobId = jobId;
-    }
-    
-    public DataTransportErrorCode getReturnCode() {
-        return returnCode;
-    }
-
-    public DataTransportSize getDataTransportSize() {
-        return dataTransportSize;
-    }
-
-    public int getLength() {
-        return length;
-    }
-
-    public int getItemCount() {
-        return itemCount;
-    }
-
-    public CpuCyclicServiceTimeBaseType getTimeBase() {
-        return timeBase;
-    }
-
-    public byte getTimeFactor() {
-        return timeFactor;
-    }
-
-    public List<S7AnyVarPayloadItem> getItems() {
-        return items;
-    }
-
-    public byte getFunction() {
-        return function;
-    }
-
-    public byte getJobId() {
-        return jobId;
-    }
-    
-    @Override
-    public ParameterType getType() {
-        return ParameterType.CPU_SERVICES;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.payloads;
+
+import java.util.List;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.S7AnyVarPayloadItem;
+import org.apache.plc4x.java.s7.netty.model.types.CpuCyclicServiceTimeBaseType;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class CpuCyclicServicesRequestPayload implements S7Payload {
+    private final DataTransportErrorCode returnCode;
+    private final DataTransportSize dataTransportSize;
+    private final int length;
+    private final int itemCount;
+    private final CpuCyclicServiceTimeBaseType timeBase;
+    private final byte timeFactor;
+    private final List<S7AnyVarPayloadItem> items;  
+    //For Cancel Subcription
+    private final byte function;
+    private final byte jobId;
+    
+    public CpuCyclicServicesRequestPayload(DataTransportErrorCode returnCode, 
+            DataTransportSize dataTransportSize, 
+            int length, 
+            int itemCount, 
+            CpuCyclicServiceTimeBaseType timeBase, 
+            byte timeFactor, 
+            List<S7AnyVarPayloadItem> items) {
+        this.returnCode = returnCode;
+        this.dataTransportSize = dataTransportSize;
+        this.length = length;
+        this.itemCount = itemCount;
+        this.timeBase = timeBase;
+        this.timeFactor = timeFactor;
+        this.items = items;
+        this.function = 0x00;
+        this.jobId = 0x00;
+    }
+
+
+    public CpuCyclicServicesRequestPayload(DataTransportErrorCode returnCode, 
+            DataTransportSize dataTransportSize, 
+            int length,
+            byte function,
+            byte jobId) {
+        this.returnCode = returnCode;
+        this.dataTransportSize = dataTransportSize;
+        this.length = length;
+        this.itemCount = 0x00;
+        this.timeBase = null;
+        this.timeFactor = 0x00;
+        this.items = null;
+        this.function = function;
+        this.jobId = jobId;
+    }
+    
+    public DataTransportErrorCode getReturnCode() {
+        return returnCode;
+    }
+
+    public DataTransportSize getDataTransportSize() {
+        return dataTransportSize;
+    }
+
+    public int getLength() {
+        return length;
+    }
+
+    public int getItemCount() {
+        return itemCount;
+    }
+
+    public CpuCyclicServiceTimeBaseType getTimeBase() {
+        return timeBase;
+    }
+
+    public byte getTimeFactor() {
+        return timeFactor;
+    }
+
+    public List<S7AnyVarPayloadItem> getItems() {
+        return items;
+    }
+
+    public byte getFunction() {
+        return function;
+    }
+
+    public byte getJobId() {
+        return jobId;
+    }
+    
+    @Override
+    public ParameterType getType() {
+        return ParameterType.CPU_SERVICES;
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesResponsePayload.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesResponsePayload.java
index a7cf4e8ed7e..50dda07fee2 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesResponsePayload.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesResponsePayload.java
@@ -1,84 +1,84 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.netty.model.payloads;
-
-import java.util.List;
-import org.apache.plc4x.java.s7.netty.model.messages.S7PushMessage;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
-import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
-
-/**
- *
- * @author cgarcia
- */
-public class CpuCyclicServicesResponsePayload implements S7Payload, S7PushMessage {
-    private final DataTransportErrorCode returnCode;
-    private final DataTransportSize dataTransportSize;
-    private final byte jobId;
-    private final int length;
-    private final int itemCount;
-    private final List<AssociatedValueItem> items;    
-
-    public CpuCyclicServicesResponsePayload(DataTransportErrorCode returnCode, 
-            DataTransportSize dataTransportSize, 
-            byte jobId, 
-            int length, 
-            int itemCount, 
-            List<AssociatedValueItem> items) {
-        this.returnCode = returnCode;
-        this.dataTransportSize = dataTransportSize;
-        this.jobId = jobId;
-        this.length = length;
-        this.itemCount = itemCount;
-        this.items = items;
-    }
-
-    public DataTransportErrorCode getReturnCode() {
-        return returnCode;
-    }
-
-    public DataTransportSize getDataTransportSize() {
-        return dataTransportSize;
-    }
-
-    public int getLength() {
-        return length;
-    }
-
-    public byte getJobId() {
-        return jobId;
-    }    
-    
-    public int getItemCount() {
-        return itemCount;
-    }
-
-    public List<AssociatedValueItem> getItems() {
-        return items;
-    }
-
-    @Override
-    public ParameterType getType() {
-        return ParameterType.CPU_SERVICES;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.payloads;
+
+import java.util.List;
+import org.apache.plc4x.java.s7.netty.model.messages.S7PushMessage;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class CpuCyclicServicesResponsePayload implements S7Payload, S7PushMessage {
+    private final DataTransportErrorCode returnCode;
+    private final DataTransportSize dataTransportSize;
+    private final byte jobId;
+    private final int length;
+    private final int itemCount;
+    private final List<AssociatedValueItem> items;    
+
+    public CpuCyclicServicesResponsePayload(DataTransportErrorCode returnCode, 
+            DataTransportSize dataTransportSize, 
+            byte jobId, 
+            int length, 
+            int itemCount, 
+            List<AssociatedValueItem> items) {
+        this.returnCode = returnCode;
+        this.dataTransportSize = dataTransportSize;
+        this.jobId = jobId;
+        this.length = length;
+        this.itemCount = itemCount;
+        this.items = items;
+    }
+
+    public DataTransportErrorCode getReturnCode() {
+        return returnCode;
+    }
+
+    public DataTransportSize getDataTransportSize() {
+        return dataTransportSize;
+    }
+
+    public int getLength() {
+        return length;
+    }
+
+    public byte getJobId() {
+        return jobId;
+    }    
+    
+    public int getItemCount() {
+        return itemCount;
+    }
+
+    public List<AssociatedValueItem> getItems() {
+        return items;
+    }
+
+    @Override
+    public ParameterType getType() {
+        return ParameterType.CPU_SERVICES;
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesUnsubscribePayload.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesUnsubscribePayload.java
index fa1cdd74dc6..c3ae9eaacf0 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesUnsubscribePayload.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuCyclicServicesUnsubscribePayload.java
@@ -1,79 +1,79 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.netty.model.payloads;
-
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
-import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
-
-/**
- *
- * @author cgarcia
- */
-public class CpuCyclicServicesUnsubscribePayload implements S7Payload {
-    private final DataTransportErrorCode returnCode;
-    private final DataTransportSize dataTransportSize;
-    private final int length;
-    private final byte function;
-    private final byte jobId;
-
-    public CpuCyclicServicesUnsubscribePayload(DataTransportErrorCode returnCode, 
-            DataTransportSize dataTransportSize, 
-            int length, 
-            byte function, 
-            byte jobId) {
-        this.returnCode = returnCode;
-        this.dataTransportSize = dataTransportSize;
-        this.length = length;
-        this.function = function;
-        this.jobId = jobId;
-    }
-
-    public DataTransportErrorCode getReturnCode() {
-        return returnCode;
-    }
-
-    public DataTransportSize getDataTransportSize() {
-        return dataTransportSize;
-    }
-
-    public int getLength() {
-        return length;
-    }
-
-    public byte getFunction() {
-        return function;
-    }
-
-    public byte getJobId() {
-        return jobId;
-    }
-
-    
-
-
-
-
-    @Override
-    public ParameterType getType() {
-        return ParameterType.CPU_SERVICES;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.payloads;
+
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class CpuCyclicServicesUnsubscribePayload implements S7Payload {
+    private final DataTransportErrorCode returnCode;
+    private final DataTransportSize dataTransportSize;
+    private final int length;
+    private final byte function;
+    private final byte jobId;
+
+    public CpuCyclicServicesUnsubscribePayload(DataTransportErrorCode returnCode, 
+            DataTransportSize dataTransportSize, 
+            int length, 
+            byte function, 
+            byte jobId) {
+        this.returnCode = returnCode;
+        this.dataTransportSize = dataTransportSize;
+        this.length = length;
+        this.function = function;
+        this.jobId = jobId;
+    }
+
+    public DataTransportErrorCode getReturnCode() {
+        return returnCode;
+    }
+
+    public DataTransportSize getDataTransportSize() {
+        return dataTransportSize;
+    }
+
+    public int getLength() {
+        return length;
+    }
+
+    public byte getFunction() {
+        return function;
+    }
+
+    public byte getJobId() {
+        return jobId;
+    }
+
+    
+
+
+
+
+    @Override
+    public ParameterType getType() {
+        return ParameterType.CPU_SERVICES;
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuDiagnosticMessagePayload.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuDiagnosticMessagePayload.java
index fbf5c35ee54..5ab6b2ee678 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuDiagnosticMessagePayload.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuDiagnosticMessagePayload.java
@@ -1,82 +1,82 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.netty.model.payloads;
-
-import org.apache.plc4x.java.s7.netty.model.messages.S7PushMessage;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.CpuDiagnosticMessageItem;
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
-import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
-
-/**
- *
- * @author cgarcia
- */
-public class CpuDiagnosticMessagePayload implements S7Payload, S7PushMessage {
-    
-    private final DataTransportErrorCode returnCode;
-    private final DataTransportSize dataTransportSize;
-    private final Integer length;
-    private final CpuDiagnosticMessageItem msg;    
-
-    public CpuDiagnosticMessagePayload(DataTransportErrorCode returnCode, DataTransportSize dataTransportSize, Integer length, CpuDiagnosticMessageItem msg) {
-        this.returnCode = returnCode;
-        this.dataTransportSize = dataTransportSize;
-        this.length = length;
-        this.msg = msg;
-    }
-
-    public DataTransportErrorCode getReturnCode() {
-        return returnCode;
-    }
-
-    public DataTransportSize getDataTransportSize() {
-        return dataTransportSize;
-    }
-
-    public Integer getLength() {
-        return length;
-    }
-
-    public CpuDiagnosticMessageItem getMsg() {
-        return msg;
-    }
-
-    @Override
-    public ParameterType getType() {
-        return ParameterType.CPU_SERVICES;
-    }
-
-    @Override
-    public String toString() {
-        return "CpuDiagnosticMessagePayload{" + "returnCode=" + returnCode 
-                + ", dataTransportSize=" + dataTransportSize 
-                + ", length=" + length 
-                + ", msg=" + msg 
-                + '}';
-    }
-
-
-
-
-    
-    
-    
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.payloads;
+
+import org.apache.plc4x.java.s7.netty.model.messages.S7PushMessage;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.CpuDiagnosticMessageItem;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class CpuDiagnosticMessagePayload implements S7Payload, S7PushMessage {
+    
+    private final DataTransportErrorCode returnCode;
+    private final DataTransportSize dataTransportSize;
+    private final Integer length;
+    private final CpuDiagnosticMessageItem msg;    
+
+    public CpuDiagnosticMessagePayload(DataTransportErrorCode returnCode, DataTransportSize dataTransportSize, Integer length, CpuDiagnosticMessageItem msg) {
+        this.returnCode = returnCode;
+        this.dataTransportSize = dataTransportSize;
+        this.length = length;
+        this.msg = msg;
+    }
+
+    public DataTransportErrorCode getReturnCode() {
+        return returnCode;
+    }
+
+    public DataTransportSize getDataTransportSize() {
+        return dataTransportSize;
+    }
+
+    public Integer getLength() {
+        return length;
+    }
+
+    public CpuDiagnosticMessageItem getMsg() {
+        return msg;
+    }
+
+    @Override
+    public ParameterType getType() {
+        return ParameterType.CPU_SERVICES;
+    }
+
+    @Override
+    public String toString() {
+        return "CpuDiagnosticMessagePayload{" + "returnCode=" + returnCode 
+                + ", dataTransportSize=" + dataTransportSize 
+                + ", length=" + length 
+                + ", msg=" + msg 
+                + '}';
+    }
+
+
+
+
+    
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuMessageSubscriptionResponsePayload.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuMessageSubscriptionResponsePayload.java
index ff52f4f5919..d3d6cd4ca43 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuMessageSubscriptionResponsePayload.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuMessageSubscriptionResponsePayload.java
@@ -1,59 +1,59 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.netty.model.payloads;
-
-import org.apache.plc4x.java.s7.netty.model.types.AlarmType;
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
-import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
-
-/**
- *
- * @author cgarcia
- */
-public class CpuMessageSubscriptionResponsePayload implements S7Payload  {
-
-    private final DataTransportErrorCode returnCode;
-    private final DataTransportSize dataTransportSize;
-    private final int Length;
-    private final byte Result;
-    private final AlarmType alarm;
-
-    public CpuMessageSubscriptionResponsePayload(DataTransportErrorCode returnCode, 
-            DataTransportSize dataTransportSize, 
-            int Length, 
-            byte Result, 
-            AlarmType alarm) {
-        
-        this.returnCode = returnCode;
-        this.dataTransportSize = dataTransportSize;
-        this.Length = Length;
-        this.Result = Result;
-        this.alarm = alarm;
-    }
-    
-    
-    
-    @Override
-    public ParameterType getType() {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-    
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.payloads;
+
+import org.apache.plc4x.java.s7.netty.model.types.AlarmType;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class CpuMessageSubscriptionResponsePayload implements S7Payload  {
+
+    private final DataTransportErrorCode returnCode;
+    private final DataTransportSize dataTransportSize;
+    private final int Length;
+    private final byte Result;
+    private final AlarmType alarm;
+
+    public CpuMessageSubscriptionResponsePayload(DataTransportErrorCode returnCode, 
+            DataTransportSize dataTransportSize, 
+            int Length, 
+            byte Result, 
+            AlarmType alarm) {
+        
+        this.returnCode = returnCode;
+        this.dataTransportSize = dataTransportSize;
+        this.Length = Length;
+        this.Result = Result;
+        this.alarm = alarm;
+    }
+    
+    
+    
+    @Override
+    public ParameterType getType() {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuMessageSubscriptionServicePayload.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuMessageSubscriptionServicePayload.java
index df234ac112b..9fd96063d02 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuMessageSubscriptionServicePayload.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuMessageSubscriptionServicePayload.java
@@ -1,77 +1,77 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.payloads;
-
-import org.apache.plc4x.java.s7.netty.model.types.AlarmType;
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
-import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
-
-/**
- *
- * @author cgarcia
- */
-public class CpuMessageSubscriptionServicePayload implements S7Payload {
-
-    private final DataTransportErrorCode returnCode;
-    private final DataTransportSize dataTransportSize;
-    private final byte SubscribedEvents;
-    private final String Id; //8 bytes string
-    private final AlarmType alarm;
-
-
-    public CpuMessageSubscriptionServicePayload (DataTransportErrorCode returnCode,
-            DataTransportSize dataTransportSize, 
-            byte SubscribedEvents, 
-            String Id, 
-            AlarmType alarm) {
-        
-        this.returnCode = returnCode;
-        this.dataTransportSize = dataTransportSize;
-        this.SubscribedEvents = SubscribedEvents;
-        this.Id = Id;
-        this.alarm = alarm;
-    }
-    
-    @Override
-    public ParameterType getType() {
-        return ParameterType.CPU_SERVICES;
-    }
-
-    public DataTransportErrorCode getReturnCode() {
-        return returnCode;
-    }
-
-    public DataTransportSize getDataTransportSize() {
-        return dataTransportSize;
-    }
-
-    public byte getSubscribedEvents() {
-        return SubscribedEvents;
-    }
-
-    public String getId() {
-        return Id;
-    }
-  
-    public AlarmType getAlarm() {
-        return alarm;
-    }    
-    
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.payloads;
+
+import org.apache.plc4x.java.s7.netty.model.types.AlarmType;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class CpuMessageSubscriptionServicePayload implements S7Payload {
+
+    private final DataTransportErrorCode returnCode;
+    private final DataTransportSize dataTransportSize;
+    private final byte SubscribedEvents;
+    private final String Id; //8 bytes string
+    private final AlarmType alarm;
+
+
+    public CpuMessageSubscriptionServicePayload (DataTransportErrorCode returnCode,
+            DataTransportSize dataTransportSize, 
+            byte SubscribedEvents, 
+            String Id, 
+            AlarmType alarm) {
+        
+        this.returnCode = returnCode;
+        this.dataTransportSize = dataTransportSize;
+        this.SubscribedEvents = SubscribedEvents;
+        this.Id = Id;
+        this.alarm = alarm;
+    }
+    
+    @Override
+    public ParameterType getType() {
+        return ParameterType.CPU_SERVICES;
+    }
+
+    public DataTransportErrorCode getReturnCode() {
+        return returnCode;
+    }
+
+    public DataTransportSize getDataTransportSize() {
+        return dataTransportSize;
+    }
+
+    public byte getSubscribedEvents() {
+        return SubscribedEvents;
+    }
+
+    public String getId() {
+        return Id;
+    }
+  
+    public AlarmType getAlarm() {
+        return alarm;
+    }    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuServicesPayload.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuServicesPayload.java
index 8f1e1b1a608..97910072f03 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuServicesPayload.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuServicesPayload.java
@@ -1,86 +1,86 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.payloads;
-
-import io.netty.buffer.ByteBuf;
-import java.util.Collections;
-import java.util.List;
-import org.apache.plc4x.java.s7.netty.model.payloads.ssls.SslDataRecord;
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
-import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
-import org.apache.plc4x.java.s7.netty.model.types.SslId;
-
-public class CpuServicesPayload implements S7Payload {
-
-    private DataTransportErrorCode returnCode;
-    private SslId sslId;
-    private short sslIndex;
-    private List<SslDataRecord> sslDataRecords;
-    private ByteBuf sslPayload;
-
-    public CpuServicesPayload(DataTransportErrorCode returnCode, SslId sslId, short sslIndex) {
-        this.returnCode = returnCode;
-        this.sslId = sslId;
-        this.sslIndex = sslIndex;
-        this.sslDataRecords = Collections.emptyList();
-        this.sslPayload = null;        
-    }
-
-    public CpuServicesPayload(DataTransportErrorCode returnCode, SslId sslId, short sslIndex, List<SslDataRecord> sslDataRecords) {
-        this.returnCode = returnCode;
-        this.sslId = sslId;
-        this.sslIndex = sslIndex;
-        this.sslDataRecords = sslDataRecords;
-        this.sslPayload = null;        
-    }
-    
-    public CpuServicesPayload(DataTransportErrorCode returnCode, SslId sslId, short sslIndex, ByteBuf sslPayload) {
-        this.returnCode = returnCode;
-        this.sslId = sslId;
-        this.sslIndex = sslIndex;
-        this.sslDataRecords = null;
-        this.sslPayload = sslPayload;
-    }    
-
-    @Override
-    public ParameterType getType() {
-        return ParameterType.CPU_SERVICES;
-    }
-
-    public DataTransportErrorCode getReturnCode() {
-        return returnCode;
-    }
-
-    public SslId getSslId() {
-        return sslId;
-    }
-
-    public short getSslIndex() {
-        return sslIndex;
-    }
-
-    public List<SslDataRecord> getSslDataRecords() {
-        return sslDataRecords;
-    }
-
-    public ByteBuf getSslPayload() {
-        return sslPayload;
-    }
-       
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.payloads;
+
+import io.netty.buffer.ByteBuf;
+import java.util.Collections;
+import java.util.List;
+import org.apache.plc4x.java.s7.netty.model.payloads.ssls.SslDataRecord;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+import org.apache.plc4x.java.s7.netty.model.types.SslId;
+
+public class CpuServicesPayload implements S7Payload {
+
+    private DataTransportErrorCode returnCode;
+    private SslId sslId;
+    private short sslIndex;
+    private List<SslDataRecord> sslDataRecords;
+    private ByteBuf sslPayload;
+
+    public CpuServicesPayload(DataTransportErrorCode returnCode, SslId sslId, short sslIndex) {
+        this.returnCode = returnCode;
+        this.sslId = sslId;
+        this.sslIndex = sslIndex;
+        this.sslDataRecords = Collections.emptyList();
+        this.sslPayload = null;        
+    }
+
+    public CpuServicesPayload(DataTransportErrorCode returnCode, SslId sslId, short sslIndex, List<SslDataRecord> sslDataRecords) {
+        this.returnCode = returnCode;
+        this.sslId = sslId;
+        this.sslIndex = sslIndex;
+        this.sslDataRecords = sslDataRecords;
+        this.sslPayload = null;        
+    }
+    
+    public CpuServicesPayload(DataTransportErrorCode returnCode, SslId sslId, short sslIndex, ByteBuf sslPayload) {
+        this.returnCode = returnCode;
+        this.sslId = sslId;
+        this.sslIndex = sslIndex;
+        this.sslDataRecords = null;
+        this.sslPayload = sslPayload;
+    }    
+
+    @Override
+    public ParameterType getType() {
+        return ParameterType.CPU_SERVICES;
+    }
+
+    public DataTransportErrorCode getReturnCode() {
+        return returnCode;
+    }
+
+    public SslId getSslId() {
+        return sslId;
+    }
+
+    public short getSslIndex() {
+        return sslIndex;
+    }
+
+    public List<SslDataRecord> getSslDataRecords() {
+        return sslDataRecords;
+    }
+
+    public ByteBuf getSslPayload() {
+        return sslPayload;
+    }
+       
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/S7Payload.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/S7Payload.java
index 85b74989304..28ebe2b18e4 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/S7Payload.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/S7Payload.java
@@ -1,27 +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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.payloads;
-
-import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
-
-public interface S7Payload {
-
-    ParameterType getType();
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.payloads;
+
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+
+public interface S7Payload {
+
+    ParameterType getType();
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/VarPayload.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/VarPayload.java
index 9c094d35348..8986cc527b8 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/VarPayload.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/VarPayload.java
@@ -1,59 +1,59 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.payloads;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
-import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
-
-/**
- * Used for writes to S7 as part of a Valid {@link org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage} together
- * with a suitable {@link org.apache.plc4x.java.s7.netty.model.params.VarParameter} Object.
- * Contains the values to write as {@link VarPayloadItem}s.
- */
-public class VarPayload implements S7Payload {
-
-    private final ParameterType parameterType;
-
-    private final List<VarPayloadItem> payloadItems;
-
-    public VarPayload(ParameterType parameterType, List<VarPayloadItem> payloadItems) {
-        this.parameterType = parameterType;
-        this.payloadItems = payloadItems;
-    }
-
-    @Override
-    public ParameterType getType() {
-        return parameterType;
-    }
-
-    public List<VarPayloadItem> getItems() {
-        return payloadItems;
-    }
-
-    public VarPayload mergePayload(VarPayload otherPayload) {
-        List<VarPayloadItem> mergedItems = new ArrayList<>(payloadItems.size() + otherPayload.getItems().size());
-        mergedItems.addAll(payloadItems);
-        mergedItems.addAll(otherPayload.getItems());
-
-        return new VarPayload(parameterType, mergedItems);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.payloads;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+
+/**
+ * Used for writes to S7 as part of a Valid {@link org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage} together
+ * with a suitable {@link org.apache.plc4x.java.s7.netty.model.params.VarParameter} Object.
+ * Contains the values to write as {@link VarPayloadItem}s.
+ */
+public class VarPayload implements S7Payload {
+
+    private final ParameterType parameterType;
+
+    private final List<VarPayloadItem> payloadItems;
+
+    public VarPayload(ParameterType parameterType, List<VarPayloadItem> payloadItems) {
+        this.parameterType = parameterType;
+        this.payloadItems = payloadItems;
+    }
+
+    @Override
+    public ParameterType getType() {
+        return parameterType;
+    }
+
+    public List<VarPayloadItem> getItems() {
+        return payloadItems;
+    }
+
+    public VarPayload mergePayload(VarPayload otherPayload) {
+        List<VarPayloadItem> mergedItems = new ArrayList<>(payloadItems.size() + otherPayload.getItems().size());
+        mergedItems.addAll(payloadItems);
+        mergedItems.addAll(otherPayload.getItems());
+
+        return new VarPayload(parameterType, mergedItems);
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AlarmMessageItem.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AlarmMessageItem.java
index d5dfc56fdb2..048fefb0128 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AlarmMessageItem.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AlarmMessageItem.java
@@ -1,126 +1,126 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.netty.model.payloads.items;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
-
-/**
- *
- * @author cgarcia
- */
-public class AlarmMessageItem {
-    private final DataTransportErrorCode returnCode;
-    private final DataTransportSize dataTransportSize;
-    private final LocalDateTime timestamp;
-    private final byte function;
-    private final byte objects;
-    private final int Length;
-    private final List<Object> msgItems; 
-   
-    
-    public AlarmMessageItem(byte function, 
-            byte objects, 
-            List<Object> msgItems) {
-        
-        this.timestamp = null;
-        this.function = function;
-        this.objects = objects;
-        this.msgItems = msgItems;
-        this.returnCode = null;
-        this.dataTransportSize = null;
-        this.Length = 0;
-    }    
-    
-    public AlarmMessageItem(LocalDateTime timestamp, 
-            byte function, 
-            byte objects, 
-            List<Object> msgItems) {
-        
-        this.timestamp = timestamp;
-        this.function = function;
-        this.objects = objects;
-        this.msgItems = msgItems;
-        this.returnCode = null;
-        this.dataTransportSize = null;
-        this.Length = 0;
-    }
-    
-    public AlarmMessageItem(byte function,
-            byte objects,
-            DataTransportErrorCode returnCode,
-            DataTransportSize dataTransportSize,
-            int Length,
-            List<Object> msgItems){
-        this.function = function;
-        this.objects = objects;
-        this.returnCode = returnCode;
-        this.dataTransportSize = dataTransportSize;
-        this.Length = Length;
-        this.timestamp = null; 
-        this.msgItems = msgItems;
-    };
-            
-            
-
-    public DataTransportErrorCode getReturnCode() {
-        return returnCode;
-    }
-
-    public DataTransportSize getDataTransportSize() {
-        return dataTransportSize;
-    }
-
-    public LocalDateTime getTimestamp() {
-        return timestamp;
-    }
-
-    public byte getFunction() {
-        return function;
-    }
-
-    public byte getObjects() {
-        return objects;
-    }
-
-    public int getLength() {
-        return Length;
-    }
-
-    public List<Object> getMsgItems() {
-        return msgItems;
-    }
-
-    @Override
-    public String toString() {
-        return "AlarmMessageItem{" + "returnCode=" + returnCode 
-                + ", dataTransportSize=" + dataTransportSize 
-                + ", timestamp=" + timestamp 
-                + ", function=" + function 
-                + ", objects=" + objects 
-                + ", Length=" + Length 
-                + ", msgItems=" + msgItems 
-                + '}';
-    }
-    
-    
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.payloads.items;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class AlarmMessageItem {
+    private final DataTransportErrorCode returnCode;
+    private final DataTransportSize dataTransportSize;
+    private final LocalDateTime timestamp;
+    private final byte function;
+    private final byte objects;
+    private final int Length;
+    private final List<Object> msgItems; 
+   
+    
+    public AlarmMessageItem(byte function, 
+            byte objects, 
+            List<Object> msgItems) {
+        
+        this.timestamp = null;
+        this.function = function;
+        this.objects = objects;
+        this.msgItems = msgItems;
+        this.returnCode = null;
+        this.dataTransportSize = null;
+        this.Length = 0;
+    }    
+    
+    public AlarmMessageItem(LocalDateTime timestamp, 
+            byte function, 
+            byte objects, 
+            List<Object> msgItems) {
+        
+        this.timestamp = timestamp;
+        this.function = function;
+        this.objects = objects;
+        this.msgItems = msgItems;
+        this.returnCode = null;
+        this.dataTransportSize = null;
+        this.Length = 0;
+    }
+    
+    public AlarmMessageItem(byte function,
+            byte objects,
+            DataTransportErrorCode returnCode,
+            DataTransportSize dataTransportSize,
+            int Length,
+            List<Object> msgItems){
+        this.function = function;
+        this.objects = objects;
+        this.returnCode = returnCode;
+        this.dataTransportSize = dataTransportSize;
+        this.Length = Length;
+        this.timestamp = null; 
+        this.msgItems = msgItems;
+    };
+            
+            
+
+    public DataTransportErrorCode getReturnCode() {
+        return returnCode;
+    }
+
+    public DataTransportSize getDataTransportSize() {
+        return dataTransportSize;
+    }
+
+    public LocalDateTime getTimestamp() {
+        return timestamp;
+    }
+
+    public byte getFunction() {
+        return function;
+    }
+
+    public byte getObjects() {
+        return objects;
+    }
+
+    public int getLength() {
+        return Length;
+    }
+
+    public List<Object> getMsgItems() {
+        return msgItems;
+    }
+
+    @Override
+    public String toString() {
+        return "AlarmMessageItem{" + "returnCode=" + returnCode 
+                + ", dataTransportSize=" + dataTransportSize 
+                + ", timestamp=" + timestamp 
+                + ", function=" + function 
+                + ", objects=" + objects 
+                + ", Length=" + Length 
+                + ", msgItems=" + msgItems 
+                + '}';
+    }
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AssociatedValueItem.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AssociatedValueItem.java
index dfee604a861..fe0a5f7916f 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AssociatedValueItem.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/AssociatedValueItem.java
@@ -1,69 +1,69 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.netty.model.payloads.items;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufUtil;
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
-
-/**
- *
- * @author cgarcia
- */
-public class AssociatedValueItem {
-    private final DataTransportErrorCode returnCode;
-    private final DataTransportSize dataTransportSize;
-    private final int Length;
-    private final ByteBuf Data;   
-
-    public AssociatedValueItem(DataTransportErrorCode returnCode, DataTransportSize dataTransportSize, int Length, ByteBuf Data) {
-        this.returnCode = returnCode;
-        this.dataTransportSize = dataTransportSize;
-        this.Length = Length;
-        this.Data = Data;
-    }
-
-    public DataTransportErrorCode getReturnCode() {
-        return returnCode;
-    }
-
-    public DataTransportSize getDataTransportSize() {
-        return dataTransportSize;
-    }
-
-    public int getLength() {
-        return Length;
-    }
-
-    public ByteBuf getData() {
-        return Data;
-    }
-
-    @Override
-    public String toString() {
-        return "AssociatedValueItem{" + "returnCode=" + returnCode 
-                + ", dataTransportSize=" + dataTransportSize 
-                + ", Length=" + Length 
-                + ", Data=" + ByteBufUtil.hexDump(Data) 
-                + '}';
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.payloads.items;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class AssociatedValueItem {
+    private final DataTransportErrorCode returnCode;
+    private final DataTransportSize dataTransportSize;
+    private final int Length;
+    private final ByteBuf Data;   
+
+    public AssociatedValueItem(DataTransportErrorCode returnCode, DataTransportSize dataTransportSize, int Length, ByteBuf Data) {
+        this.returnCode = returnCode;
+        this.dataTransportSize = dataTransportSize;
+        this.Length = Length;
+        this.Data = Data;
+    }
+
+    public DataTransportErrorCode getReturnCode() {
+        return returnCode;
+    }
+
+    public DataTransportSize getDataTransportSize() {
+        return dataTransportSize;
+    }
+
+    public int getLength() {
+        return Length;
+    }
+
+    public ByteBuf getData() {
+        return Data;
+    }
+
+    @Override
+    public String toString() {
+        return "AssociatedValueItem{" + "returnCode=" + returnCode 
+                + ", dataTransportSize=" + dataTransportSize 
+                + ", Length=" + Length 
+                + ", Data=" + ByteBufUtil.hexDump(Data) 
+                + '}';
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/CpuDiagnosticMessageItem.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/CpuDiagnosticMessageItem.java
index 0ed066d9177..51742a224ad 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/CpuDiagnosticMessageItem.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/CpuDiagnosticMessageItem.java
@@ -1,95 +1,95 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.netty.model.payloads.items;
-
-import java.time.LocalDateTime;
-
-/**
- * Diagnostic message from PLC, is transfer by payload.
- * EventID: System specific messages W#16#8xyz and W#16#9xyz.
- *          User messages W#16#Axyz and W#16#Bxyz
- *          where x=0 output event, x=1 input event
- *          and yz hex number in message handler.
- * 
- * @author cgarcia
- */
-public class CpuDiagnosticMessageItem {
-    
-    private final Short EventID;
-    private final Byte PriorityClass;
-    private final Byte ObNumber;
-    private final Short DatID;   
-    private final Short Info1;   
-    private final Integer Info2; 
-    private LocalDateTime TimeStamp;
-    
-    public CpuDiagnosticMessageItem(Short EventID, Byte PriorityClass, Byte ObNumber, Short DatID, Short Info1, Integer Info2, LocalDateTime TimeStamp) {
-        this.EventID = EventID;
-        this.PriorityClass = PriorityClass;
-        this.ObNumber = ObNumber;
-        this.DatID = DatID;
-        this.Info1 = Info1;
-        this.Info2 = Info2;
-        this.TimeStamp = TimeStamp;
-    }
-
-    public Short getEventID() {
-        return EventID;
-    }
-
-    public Byte getPriorityClass() {
-        return PriorityClass;
-    }
-
-    public Byte getObNumber() {
-        return ObNumber;
-    }
-
-    public Short getDatID() {
-        return DatID;
-    }
-
-    public Short getInfo1() {
-        return Info1;
-    }
-
-    public Integer getInfo2() {
-        return Info2;
-    }
-
-    public LocalDateTime getTimeStamp() {
-        return TimeStamp;
-    }
-
-    @Override
-    public String toString() {
-        return "CpuDiagnosticMessageItem{" + "EventID=" + EventID 
-                + ", PriorityClass=" + PriorityClass 
-                + ", ObNumber=" + ObNumber 
-                + ", DatID=" + DatID 
-                + ", Info1=" + Info1 
-                + ", Info2=" + Info2 
-                + ", TimeStamp=" + TimeStamp 
-                + '}';
-    }
-
-
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.payloads.items;
+
+import java.time.LocalDateTime;
+
+/**
+ * Diagnostic message from PLC, is transfer by payload.
+ * EventID: System specific messages W#16#8xyz and W#16#9xyz.
+ *          User messages W#16#Axyz and W#16#Bxyz
+ *          where x=0 output event, x=1 input event
+ *          and yz hex number in message handler.
+ * 
+ * @author cgarcia
+ */
+public class CpuDiagnosticMessageItem {
+    
+    private final Short EventID;
+    private final Byte PriorityClass;
+    private final Byte ObNumber;
+    private final Short DatID;   
+    private final Short Info1;   
+    private final Integer Info2; 
+    private LocalDateTime TimeStamp;
+    
+    public CpuDiagnosticMessageItem(Short EventID, Byte PriorityClass, Byte ObNumber, Short DatID, Short Info1, Integer Info2, LocalDateTime TimeStamp) {
+        this.EventID = EventID;
+        this.PriorityClass = PriorityClass;
+        this.ObNumber = ObNumber;
+        this.DatID = DatID;
+        this.Info1 = Info1;
+        this.Info2 = Info2;
+        this.TimeStamp = TimeStamp;
+    }
+
+    public Short getEventID() {
+        return EventID;
+    }
+
+    public Byte getPriorityClass() {
+        return PriorityClass;
+    }
+
+    public Byte getObNumber() {
+        return ObNumber;
+    }
+
+    public Short getDatID() {
+        return DatID;
+    }
+
+    public Short getInfo1() {
+        return Info1;
+    }
+
+    public Integer getInfo2() {
+        return Info2;
+    }
+
+    public LocalDateTime getTimeStamp() {
+        return TimeStamp;
+    }
+
+    @Override
+    public String toString() {
+        return "CpuDiagnosticMessageItem{" + "EventID=" + EventID 
+                + ", PriorityClass=" + PriorityClass 
+                + ", ObNumber=" + ObNumber 
+                + ", DatID=" + DatID 
+                + ", Info1=" + Info1 
+                + ", Info2=" + Info2 
+                + ", TimeStamp=" + TimeStamp 
+                + '}';
+    }
+
+
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/MessageObjectItem.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/MessageObjectItem.java
index a8effbc48f3..529f18e104d 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/MessageObjectItem.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/MessageObjectItem.java
@@ -1,334 +1,334 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.netty.model.payloads.items;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import org.apache.plc4x.java.s7.netty.model.types.AlarmQueryType;
-import org.apache.plc4x.java.s7.netty.model.types.QueryType;
-import org.apache.plc4x.java.s7.netty.model.types.VariableAddressingMode;
-
-/**
- *
- * @author cgarcia
- */
-public class MessageObjectItem {
-    
-    private final byte VariableSpecification;
-    private final byte Length;
-    private final VariableAddressingMode SyntaxID;
-    private final byte NumberOfValues;
-    private final int EventID;
-    private final byte EventState;
-    private final byte State;
-    private final byte AckStateGoing;
-    private final byte AckStateComming;
-    private final byte EventGoing;
-    private final byte EventComming;
-    private final byte EventLastChange;
-    private final LocalDateTime TimestampComing;
-    private final LocalDateTime TimestampGoing;
-    private final List<AssociatedValueItem> ComingValues;
-    private final List<AssociatedValueItem> GoingValues;  
-    //For Query alarms.
-    private final QueryType querytype;
-    private final AlarmQueryType alarmtype;
-     
-    //For Query request
-    public MessageObjectItem(byte VariableSpecification, 
-            byte Length, 
-            VariableAddressingMode SyntaxID, 
-            QueryType querytype, 
-            AlarmQueryType alarmtype) {
-        
-        this.VariableSpecification = VariableSpecification;
-        this.Length = Length;
-        this.SyntaxID = SyntaxID;
-        this.NumberOfValues = 0x00;
-        this.EventID = 0x0000;
-        this.EventState = 0x00;
-        this.State = 0x00;
-        this.AckStateGoing = 0x00;
-        this.AckStateComming = 0x00;
-        this.EventGoing = 0x00;
-        this.EventComming = 0x00;
-        this.EventLastChange = 0x00;
-        this.TimestampComing = null;
-        this.ComingValues = null;
-        this.TimestampGoing = null;               
-        this.GoingValues = null;
-        this.querytype = querytype;
-        this.alarmtype = alarmtype;
-    }   
-    
-    //For Query reply
-    public MessageObjectItem(byte Length, 
-            AlarmQueryType alarmtype, 
-            int EventID, 
-            byte EventState, 
-            byte AckStateGoing, 
-            byte AckStateComming, 
-            LocalDateTime TimestampComing,
-            List<AssociatedValueItem> ComingValues,
-            LocalDateTime TimestampGoing, 
-            List<AssociatedValueItem> GoingValues) {
-        
-        this.VariableSpecification = 0x00;
-        this.Length = Length;
-        this.SyntaxID = null;
-        this.NumberOfValues = 0x00;
-        this.EventID = EventID;
-        this.EventState = EventState;
-        this.State = 0x00;
-        this.AckStateGoing = AckStateGoing;
-        this.AckStateComming = AckStateComming;
-        this.EventGoing = 0x00;
-        this.EventComming = 0x00;
-        this.EventLastChange = 0x00;        
-        this.TimestampComing = TimestampComing;
-        this.ComingValues = ComingValues;
-        this.TimestampGoing = TimestampGoing;               
-        this.GoingValues = GoingValues;
-        this.querytype = null;
-        this.alarmtype = alarmtype;        
-    }    
-
-    public MessageObjectItem(byte VariableSpecification, 
-            byte Length, 
-            VariableAddressingMode SyntaxID, 
-            byte NumberOfValues, 
-            int EventID, 
-            byte AckStateGoing, 
-            byte AckStateComming) {
-        
-        this.VariableSpecification = VariableSpecification;
-        this.Length = Length;
-        this.SyntaxID = SyntaxID;
-        this.NumberOfValues = NumberOfValues;
-        this.EventID = EventID;
-        this.EventState = 0x00;
-        this.State = 0x00;
-        this.AckStateGoing = AckStateGoing;
-        this.AckStateComming = AckStateComming;
-        this.EventGoing = 0x00;
-        this.EventComming = 0x00;
-        this.EventLastChange = 0x00;        
-        this.TimestampComing = null;
-        this.ComingValues = null;
-        this.TimestampGoing = null;               
-        this.GoingValues = null;
-        this.querytype = null;
-        this.alarmtype = null;
-    }    
-    
-    public MessageObjectItem(byte VariableSpecification, 
-            byte Length, 
-            VariableAddressingMode SyntaxID, 
-            byte NumberOfValues, 
-            int EventID, 
-            byte EventState, 
-            byte State, 
-            byte AckStateGoing, 
-            byte AckStateComming, 
-            List<AssociatedValueItem> Values) {
-        
-        this.VariableSpecification = VariableSpecification;
-        this.Length = Length;
-        this.SyntaxID = SyntaxID;
-        this.NumberOfValues = NumberOfValues;
-        this.EventID = EventID;
-        this.EventState = EventState;
-        this.State = State;
-        this.AckStateGoing = AckStateGoing;
-        this.AckStateComming = AckStateComming;
-        this.EventGoing = 0x00;
-        this.EventComming = 0x00;
-        this.EventLastChange = 0x00;        
-        this.TimestampComing = null;
-        this.ComingValues = Values;
-        this.TimestampGoing = null;               
-        this.GoingValues = null;
-        this.querytype = null;
-        this.alarmtype = null;        
-    }
-    
-    public MessageObjectItem(byte VariableSpecification, 
-            byte Length, 
-            VariableAddressingMode SyntaxID, 
-            byte NumberOfValues, 
-            int EventID, 
-            byte EventState, 
-            byte State, 
-            byte AckStateGoing, 
-            byte AckStateComming,
-            LocalDateTime TimestampComing,
-            List<AssociatedValueItem> ComingValues,
-            LocalDateTime TimestampGoing,
-            List<AssociatedValueItem> GoingValues) {
-        
-        this.VariableSpecification = VariableSpecification;
-        this.Length = Length;
-        this.SyntaxID = SyntaxID;
-        this.NumberOfValues = NumberOfValues;
-        this.EventID = EventID;
-        this.EventState = EventState;
-        this.State = State;
-        this.AckStateGoing = AckStateGoing;
-        this.AckStateComming = AckStateComming;
-        this.EventGoing = 0x00;
-        this.EventComming = 0x00;
-        this.EventLastChange = 0x00;        
-        this.TimestampComing = TimestampComing;
-        this.ComingValues = ComingValues;
-        this.TimestampGoing = TimestampGoing;               
-        this.GoingValues = GoingValues;
-        this.querytype = null;
-        this.alarmtype = null;        
-    }    
-    
-    public MessageObjectItem(byte VariableSpecification, 
-            byte Length, 
-            VariableAddressingMode SyntaxID, 
-            byte NumberOfValues, 
-            int EventID, 
-            byte EventState, 
-            byte State, 
-            byte AckStateGoing, 
-            byte AckStateComming,
-            byte EventGoing,
-            byte EventComming,
-            byte EventLastChange,
-            List<AssociatedValueItem> ComingValues) {
-        
-        this.VariableSpecification = VariableSpecification;
-        this.Length = Length;
-        this.SyntaxID = SyntaxID;
-        this.NumberOfValues = NumberOfValues;
-        this.EventID = EventID;
-        this.EventState = EventState;
-        this.State = State;
-        this.AckStateGoing = AckStateGoing;
-        this.AckStateComming = AckStateComming;
-        this.EventGoing = 0x00;
-        this.EventComming = 0x00;
-        this.EventLastChange = 0x00;        
-        this.TimestampComing = null;
-        this.ComingValues = ComingValues;
-        this.TimestampGoing = null;               
-        this.GoingValues = null;
-        this.querytype = null;
-        this.alarmtype = null;        
-    }     
-    
-    public byte getVariableSpecification() {
-        return VariableSpecification;
-    }
-
-    public byte getLength() {
-        return Length;
-    }
-
-    public VariableAddressingMode getSyntaxID() {
-        return SyntaxID;
-    }
-
-    public byte getNumberOfValues() {
-        return NumberOfValues;
-    }
-
-    public int getEventID() {
-        return EventID;
-    }
-
-    public byte getEventState() {
-        return EventState;
-    }
-
-    public byte getState() {
-        return State;
-    }
-
-    public byte getAckStateGoing() {
-        return AckStateGoing;
-    }
-
-    public byte getAckStateComming() {
-        return AckStateComming;
-    }
-
-    public LocalDateTime getTimestampComing() {
-        return TimestampComing;
-    }
-
-    public byte getEventGoing() {
-        return EventGoing;
-    }
-
-    public byte getEventComming() {
-        return EventComming;
-    }
-
-    public byte getEventLastChange() {
-        return EventLastChange;
-    }
-    
-    public LocalDateTime getTimestampGoing() {
-        return TimestampGoing;
-    }
-
-    public List<AssociatedValueItem> getComingValues() {
-        return ComingValues;
-    }
-
-    public List<AssociatedValueItem> getGoingValues() {
-        return GoingValues;
-    }
-
-    public QueryType getQuerytype() {
-        return querytype;
-    }
-
-    public AlarmQueryType getAlarmtype() {
-        return alarmtype;
-    }
-
-    @Override
-    public String toString() {
-        return "MessageObjectItem{" + "VariableSpecification=" + VariableSpecification +
-                ", Length=" + Length +
-                ", SyntaxID=" + SyntaxID +
-                ", NumberOfValues=" + NumberOfValues +
-                ", EventID=" + EventID +
-                ", EventState=" + EventState +
-                ", State=" + State +
-                ", AckStateGoing=" + AckStateGoing +
-                ", AckStateComming=" + AckStateComming +
-                ", TimestampComing=" + TimestampComing +
-                ", TimestampGoing=" + TimestampGoing +
-                ", ComingValues=" + ComingValues +
-                ", GoingValues=" + GoingValues +
-                ", querytype=" + querytype +
-                ", alarmtype=" + alarmtype + '}';
-    }
-        
-
-
-    
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.payloads.items;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import org.apache.plc4x.java.s7.netty.model.types.AlarmQueryType;
+import org.apache.plc4x.java.s7.netty.model.types.QueryType;
+import org.apache.plc4x.java.s7.netty.model.types.VariableAddressingMode;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class MessageObjectItem {
+    
+    private final byte VariableSpecification;
+    private final byte Length;
+    private final VariableAddressingMode SyntaxID;
+    private final byte NumberOfValues;
+    private final int EventID;
+    private final byte EventState;
+    private final byte State;
+    private final byte AckStateGoing;
+    private final byte AckStateComming;
+    private final byte EventGoing;
+    private final byte EventComming;
+    private final byte EventLastChange;
+    private final LocalDateTime TimestampComing;
+    private final LocalDateTime TimestampGoing;
+    private final List<AssociatedValueItem> ComingValues;
+    private final List<AssociatedValueItem> GoingValues;  
+    //For Query alarms.
+    private final QueryType querytype;
+    private final AlarmQueryType alarmtype;
+     
+    //For Query request
+    public MessageObjectItem(byte VariableSpecification, 
+            byte Length, 
+            VariableAddressingMode SyntaxID, 
+            QueryType querytype, 
+            AlarmQueryType alarmtype) {
+        
+        this.VariableSpecification = VariableSpecification;
+        this.Length = Length;
+        this.SyntaxID = SyntaxID;
+        this.NumberOfValues = 0x00;
+        this.EventID = 0x0000;
+        this.EventState = 0x00;
+        this.State = 0x00;
+        this.AckStateGoing = 0x00;
+        this.AckStateComming = 0x00;
+        this.EventGoing = 0x00;
+        this.EventComming = 0x00;
+        this.EventLastChange = 0x00;
+        this.TimestampComing = null;
+        this.ComingValues = null;
+        this.TimestampGoing = null;               
+        this.GoingValues = null;
+        this.querytype = querytype;
+        this.alarmtype = alarmtype;
+    }   
+    
+    //For Query reply
+    public MessageObjectItem(byte Length, 
+            AlarmQueryType alarmtype, 
+            int EventID, 
+            byte EventState, 
+            byte AckStateGoing, 
+            byte AckStateComming, 
+            LocalDateTime TimestampComing,
+            List<AssociatedValueItem> ComingValues,
+            LocalDateTime TimestampGoing, 
+            List<AssociatedValueItem> GoingValues) {
+        
+        this.VariableSpecification = 0x00;
+        this.Length = Length;
+        this.SyntaxID = null;
+        this.NumberOfValues = 0x00;
+        this.EventID = EventID;
+        this.EventState = EventState;
+        this.State = 0x00;
+        this.AckStateGoing = AckStateGoing;
+        this.AckStateComming = AckStateComming;
+        this.EventGoing = 0x00;
+        this.EventComming = 0x00;
+        this.EventLastChange = 0x00;        
+        this.TimestampComing = TimestampComing;
+        this.ComingValues = ComingValues;
+        this.TimestampGoing = TimestampGoing;               
+        this.GoingValues = GoingValues;
+        this.querytype = null;
+        this.alarmtype = alarmtype;        
+    }    
+
+    public MessageObjectItem(byte VariableSpecification, 
+            byte Length, 
+            VariableAddressingMode SyntaxID, 
+            byte NumberOfValues, 
+            int EventID, 
+            byte AckStateGoing, 
+            byte AckStateComming) {
+        
+        this.VariableSpecification = VariableSpecification;
+        this.Length = Length;
+        this.SyntaxID = SyntaxID;
+        this.NumberOfValues = NumberOfValues;
+        this.EventID = EventID;
+        this.EventState = 0x00;
+        this.State = 0x00;
+        this.AckStateGoing = AckStateGoing;
+        this.AckStateComming = AckStateComming;
+        this.EventGoing = 0x00;
+        this.EventComming = 0x00;
+        this.EventLastChange = 0x00;        
+        this.TimestampComing = null;
+        this.ComingValues = null;
+        this.TimestampGoing = null;               
+        this.GoingValues = null;
+        this.querytype = null;
+        this.alarmtype = null;
+    }    
+    
+    public MessageObjectItem(byte VariableSpecification, 
+            byte Length, 
+            VariableAddressingMode SyntaxID, 
+            byte NumberOfValues, 
+            int EventID, 
+            byte EventState, 
+            byte State, 
+            byte AckStateGoing, 
+            byte AckStateComming, 
+            List<AssociatedValueItem> Values) {
+        
+        this.VariableSpecification = VariableSpecification;
+        this.Length = Length;
+        this.SyntaxID = SyntaxID;
+        this.NumberOfValues = NumberOfValues;
+        this.EventID = EventID;
+        this.EventState = EventState;
+        this.State = State;
+        this.AckStateGoing = AckStateGoing;
+        this.AckStateComming = AckStateComming;
+        this.EventGoing = 0x00;
+        this.EventComming = 0x00;
+        this.EventLastChange = 0x00;        
+        this.TimestampComing = null;
+        this.ComingValues = Values;
+        this.TimestampGoing = null;               
+        this.GoingValues = null;
+        this.querytype = null;
+        this.alarmtype = null;        
+    }
+    
+    public MessageObjectItem(byte VariableSpecification, 
+            byte Length, 
+            VariableAddressingMode SyntaxID, 
+            byte NumberOfValues, 
+            int EventID, 
+            byte EventState, 
+            byte State, 
+            byte AckStateGoing, 
+            byte AckStateComming,
+            LocalDateTime TimestampComing,
+            List<AssociatedValueItem> ComingValues,
+            LocalDateTime TimestampGoing,
+            List<AssociatedValueItem> GoingValues) {
+        
+        this.VariableSpecification = VariableSpecification;
+        this.Length = Length;
+        this.SyntaxID = SyntaxID;
+        this.NumberOfValues = NumberOfValues;
+        this.EventID = EventID;
+        this.EventState = EventState;
+        this.State = State;
+        this.AckStateGoing = AckStateGoing;
+        this.AckStateComming = AckStateComming;
+        this.EventGoing = 0x00;
+        this.EventComming = 0x00;
+        this.EventLastChange = 0x00;        
+        this.TimestampComing = TimestampComing;
+        this.ComingValues = ComingValues;
+        this.TimestampGoing = TimestampGoing;               
+        this.GoingValues = GoingValues;
+        this.querytype = null;
+        this.alarmtype = null;        
+    }    
+    
+    public MessageObjectItem(byte VariableSpecification, 
+            byte Length, 
+            VariableAddressingMode SyntaxID, 
+            byte NumberOfValues, 
+            int EventID, 
+            byte EventState, 
+            byte State, 
+            byte AckStateGoing, 
+            byte AckStateComming,
+            byte EventGoing,
+            byte EventComming,
+            byte EventLastChange,
+            List<AssociatedValueItem> ComingValues) {
+        
+        this.VariableSpecification = VariableSpecification;
+        this.Length = Length;
+        this.SyntaxID = SyntaxID;
+        this.NumberOfValues = NumberOfValues;
+        this.EventID = EventID;
+        this.EventState = EventState;
+        this.State = State;
+        this.AckStateGoing = AckStateGoing;
+        this.AckStateComming = AckStateComming;
+        this.EventGoing = 0x00;
+        this.EventComming = 0x00;
+        this.EventLastChange = 0x00;        
+        this.TimestampComing = null;
+        this.ComingValues = ComingValues;
+        this.TimestampGoing = null;               
+        this.GoingValues = null;
+        this.querytype = null;
+        this.alarmtype = null;        
+    }     
+    
+    public byte getVariableSpecification() {
+        return VariableSpecification;
+    }
+
+    public byte getLength() {
+        return Length;
+    }
+
+    public VariableAddressingMode getSyntaxID() {
+        return SyntaxID;
+    }
+
+    public byte getNumberOfValues() {
+        return NumberOfValues;
+    }
+
+    public int getEventID() {
+        return EventID;
+    }
+
+    public byte getEventState() {
+        return EventState;
+    }
+
+    public byte getState() {
+        return State;
+    }
+
+    public byte getAckStateGoing() {
+        return AckStateGoing;
+    }
+
+    public byte getAckStateComming() {
+        return AckStateComming;
+    }
+
+    public LocalDateTime getTimestampComing() {
+        return TimestampComing;
+    }
+
+    public byte getEventGoing() {
+        return EventGoing;
+    }
+
+    public byte getEventComming() {
+        return EventComming;
+    }
+
+    public byte getEventLastChange() {
+        return EventLastChange;
+    }
+    
+    public LocalDateTime getTimestampGoing() {
+        return TimestampGoing;
+    }
+
+    public List<AssociatedValueItem> getComingValues() {
+        return ComingValues;
+    }
+
+    public List<AssociatedValueItem> getGoingValues() {
+        return GoingValues;
+    }
+
+    public QueryType getQuerytype() {
+        return querytype;
+    }
+
+    public AlarmQueryType getAlarmtype() {
+        return alarmtype;
+    }
+
+    @Override
+    public String toString() {
+        return "MessageObjectItem{" + "VariableSpecification=" + VariableSpecification +
+                ", Length=" + Length +
+                ", SyntaxID=" + SyntaxID +
+                ", NumberOfValues=" + NumberOfValues +
+                ", EventID=" + EventID +
+                ", EventState=" + EventState +
+                ", State=" + State +
+                ", AckStateGoing=" + AckStateGoing +
+                ", AckStateComming=" + AckStateComming +
+                ", TimestampComing=" + TimestampComing +
+                ", TimestampGoing=" + TimestampGoing +
+                ", ComingValues=" + ComingValues +
+                ", GoingValues=" + GoingValues +
+                ", querytype=" + querytype +
+                ", alarmtype=" + alarmtype + '}';
+    }
+        
+
+
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/S7AnyVarPayloadItem.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/S7AnyVarPayloadItem.java
index 512cbced5a9..f3e8e416e3f 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/S7AnyVarPayloadItem.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/S7AnyVarPayloadItem.java
@@ -1,95 +1,95 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.payloads.items;
-
-import org.apache.plc4x.java.s7.netty.model.params.items.*;
-import org.apache.plc4x.java.s7.netty.model.types.MemoryArea;
-import org.apache.plc4x.java.s7.netty.model.types.SpecificationType;
-import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
-import org.apache.plc4x.java.s7.netty.model.types.VariableAddressingMode;
-
-/**
- * "Low-level" description of S7 Address range and the necessary size for transportation of values.
- * Is used as Arguments of {@link org.apache.plc4x.java.s7.netty.model.params.VarParameter} object.
- *
- * Contains the information to read one or more sequential values of the same datatype starting from given offset in a memory region
- * and also contains the transportation size of the datatype read.
- *
- * In detail:
- * <ul>
- *     <li>transportSize - {@link TransportSize} of the datatype</li>
- *     <li>numElements - number of consecutive elements to be read</li>
- *     <li>dataBlockNumber - number of the datablock</li>
- *     <li>bit / byteOffset where the adress starts</li>
- * </ul>
- */
-public class S7AnyVarPayloadItem implements VarParameterItem {
-
-    private final SpecificationType specificationType;
-    private final MemoryArea memoryArea;
-    private final TransportSize dataType;
-    private final int numElements;
-    private final int dataBlockNumber;
-    private final int byteOffset;
-    private final byte bitOffset;
-
-    public S7AnyVarPayloadItem(SpecificationType specificationType, MemoryArea memoryArea, TransportSize dataType, int numElements, int dataBlockNumber, int byteOffset, byte bitOffset) {
-        this.specificationType = specificationType;
-        this.memoryArea = memoryArea;
-        this.dataType = dataType;
-        this.numElements = numElements;
-        this.dataBlockNumber = dataBlockNumber;
-        this.byteOffset = byteOffset;
-        this.bitOffset = bitOffset;
-    }
-
-    @Override
-    public VariableAddressingMode getAddressingMode() {
-        return VariableAddressingMode.S7ANY;
-    }
-
-    public SpecificationType getSpecificationType() {
-        return specificationType;
-    }
-
-    public MemoryArea getMemoryArea() {
-        return memoryArea;
-    }
-
-    public TransportSize getDataType() {
-        return dataType;
-    }
-
-    public int getNumElements() {
-        return numElements;
-    }
-
-    public int getDataBlockNumber() {
-        return dataBlockNumber;
-    }
-
-    public int getByteOffset() {
-        return byteOffset;
-    }
-
-    public byte getBitOffset() {
-        return bitOffset;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.payloads.items;
+
+import org.apache.plc4x.java.s7.netty.model.params.items.*;
+import org.apache.plc4x.java.s7.netty.model.types.MemoryArea;
+import org.apache.plc4x.java.s7.netty.model.types.SpecificationType;
+import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
+import org.apache.plc4x.java.s7.netty.model.types.VariableAddressingMode;
+
+/**
+ * "Low-level" description of S7 Address range and the necessary size for transportation of values.
+ * Is used as Arguments of {@link org.apache.plc4x.java.s7.netty.model.params.VarParameter} object.
+ *
+ * Contains the information to read one or more sequential values of the same datatype starting from given offset in a memory region
+ * and also contains the transportation size of the datatype read.
+ *
+ * In detail:
+ * <ul>
+ *     <li>transportSize - {@link TransportSize} of the datatype</li>
+ *     <li>numElements - number of consecutive elements to be read</li>
+ *     <li>dataBlockNumber - number of the datablock</li>
+ *     <li>bit / byteOffset where the adress starts</li>
+ * </ul>
+ */
+public class S7AnyVarPayloadItem implements VarParameterItem {
+
+    private final SpecificationType specificationType;
+    private final MemoryArea memoryArea;
+    private final TransportSize dataType;
+    private final int numElements;
+    private final int dataBlockNumber;
+    private final int byteOffset;
+    private final byte bitOffset;
+
+    public S7AnyVarPayloadItem(SpecificationType specificationType, MemoryArea memoryArea, TransportSize dataType, int numElements, int dataBlockNumber, int byteOffset, byte bitOffset) {
+        this.specificationType = specificationType;
+        this.memoryArea = memoryArea;
+        this.dataType = dataType;
+        this.numElements = numElements;
+        this.dataBlockNumber = dataBlockNumber;
+        this.byteOffset = byteOffset;
+        this.bitOffset = bitOffset;
+    }
+
+    @Override
+    public VariableAddressingMode getAddressingMode() {
+        return VariableAddressingMode.S7ANY;
+    }
+
+    public SpecificationType getSpecificationType() {
+        return specificationType;
+    }
+
+    public MemoryArea getMemoryArea() {
+        return memoryArea;
+    }
+
+    public TransportSize getDataType() {
+        return dataType;
+    }
+
+    public int getNumElements() {
+        return numElements;
+    }
+
+    public int getDataBlockNumber() {
+        return dataBlockNumber;
+    }
+
+    public int getByteOffset() {
+        return byteOffset;
+    }
+
+    public byte getBitOffset() {
+        return bitOffset;
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/VarPayloadItem.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/VarPayloadItem.java
index 9cf9b9b39d6..873e3416e5d 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/VarPayloadItem.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/items/VarPayloadItem.java
@@ -1,58 +1,58 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.payloads.items;
-
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
-
-public class VarPayloadItem {
-
-    private final DataTransportErrorCode returnCode;
-    private final DataTransportSize dataTransportSize;
-    private final byte[] data;
-
-    public VarPayloadItem(DataTransportErrorCode returnCode, DataTransportSize dataTransportSize, byte[] data) {
-        this.returnCode = returnCode;
-        this.dataTransportSize = dataTransportSize;
-        this.data = data;
-    }
-
-    public DataTransportErrorCode getReturnCode() {
-        return returnCode;
-    }
-
-    public DataTransportSize getDataTransportSize() {
-        return dataTransportSize;
-    }
-
-    public byte[] getData() {
-        return data;
-    }
-
-    @Override
-    public String toString() {
-        return "VarPayloadItem{" + 
-                "returnCode=" + returnCode + 
-                ", dataTransportSize=" + dataTransportSize + 
-                ", data=" + data.length + '}';
-    }
-
-    
-    
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.payloads.items;
+
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
+
+public class VarPayloadItem {
+
+    private final DataTransportErrorCode returnCode;
+    private final DataTransportSize dataTransportSize;
+    private final byte[] data;
+
+    public VarPayloadItem(DataTransportErrorCode returnCode, DataTransportSize dataTransportSize, byte[] data) {
+        this.returnCode = returnCode;
+        this.dataTransportSize = dataTransportSize;
+        this.data = data;
+    }
+
+    public DataTransportErrorCode getReturnCode() {
+        return returnCode;
+    }
+
+    public DataTransportSize getDataTransportSize() {
+        return dataTransportSize;
+    }
+
+    public byte[] getData() {
+        return data;
+    }
+
+    @Override
+    public String toString() {
+        return "VarPayloadItem{" + 
+                "returnCode=" + returnCode + 
+                ", dataTransportSize=" + dataTransportSize + 
+                ", data=" + data.length + '}';
+    }
+
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/ssls/SslDataRecord.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/ssls/SslDataRecord.java
index c5e06ec9365..855bca741b6 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/ssls/SslDataRecord.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/ssls/SslDataRecord.java
@@ -1,25 +1,25 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.payloads.ssls;
-
-public interface SslDataRecord {
-
-    short getLengthInWords();
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.payloads.ssls;
+
+public interface SslDataRecord {
+
+    short getLengthInWords();
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/ssls/SslModuleIdentificationDataRecord.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/ssls/SslModuleIdentificationDataRecord.java
index 0481c9eebe6..ead8b047c90 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/ssls/SslModuleIdentificationDataRecord.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/ssls/SslModuleIdentificationDataRecord.java
@@ -1,66 +1,66 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.payloads.ssls;
-
-public class SslModuleIdentificationDataRecord implements SslDataRecord {
-
-    public static final short INDEX_MODULE = 0x0001;
-    public static final short INDEX_BASIC_HARDWARE = 0x0006;
-    public static final short INDEX_BASIC_FIRMWARE = 0x0007;
-
-    private short index;
-    private String articleNumber;
-    private short bgType;
-    private short moduleOrOsVersion;
-    private short pgDescriptionFileVersion;
-
-    public SslModuleIdentificationDataRecord(short index, String articleNumber, short bgType, short moduleOrOsVersion, short pgDescriptionFileVersion) {
-        this.index = index;
-        this.articleNumber = articleNumber;
-        this.bgType = bgType;
-        this.moduleOrOsVersion = moduleOrOsVersion;
-        this.pgDescriptionFileVersion = pgDescriptionFileVersion;
-    }
-
-    @Override
-    public short getLengthInWords() {
-        return 14;
-    }
-
-    public short getIndex() {
-        return index;
-    }
-
-    public String getArticleNumber() {
-        return articleNumber;
-    }
-
-    public short getBgType() {
-        return bgType;
-    }
-
-    public short getModuleOrOsVersion() {
-        return moduleOrOsVersion;
-    }
-
-    public short getPgDescriptionFileVersion() {
-        return pgDescriptionFileVersion;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.payloads.ssls;
+
+public class SslModuleIdentificationDataRecord implements SslDataRecord {
+
+    public static final short INDEX_MODULE = 0x0001;
+    public static final short INDEX_BASIC_HARDWARE = 0x0006;
+    public static final short INDEX_BASIC_FIRMWARE = 0x0007;
+
+    private short index;
+    private String articleNumber;
+    private short bgType;
+    private short moduleOrOsVersion;
+    private short pgDescriptionFileVersion;
+
+    public SslModuleIdentificationDataRecord(short index, String articleNumber, short bgType, short moduleOrOsVersion, short pgDescriptionFileVersion) {
+        this.index = index;
+        this.articleNumber = articleNumber;
+        this.bgType = bgType;
+        this.moduleOrOsVersion = moduleOrOsVersion;
+        this.pgDescriptionFileVersion = pgDescriptionFileVersion;
+    }
+
+    @Override
+    public short getLengthInWords() {
+        return 14;
+    }
+
+    public short getIndex() {
+        return index;
+    }
+
+    public String getArticleNumber() {
+        return articleNumber;
+    }
+
+    public short getBgType() {
+        return bgType;
+    }
+
+    public short getModuleOrOsVersion() {
+        return moduleOrOsVersion;
+    }
+
+    public short getPgDescriptionFileVersion() {
+        return pgDescriptionFileVersion;
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/AlarmQueryType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/AlarmQueryType.java
index 7dac7ac5a9f..35eb786ed45 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/AlarmQueryType.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/AlarmQueryType.java
@@ -1,74 +1,74 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.s7.netty.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- *
- * @author cgarcia
- */
-public enum AlarmQueryType {
-    
-    SCAN("SCAN", (byte) 0x01),
-    ALARM_8("ALARM_8", (byte) 0x02),
-    ALARM_S("ALARM_S", (byte) 0x04),
-    NONE("NONE", (byte) 0x00);
-    
-    
-    private static final Map<Byte, AlarmQueryType> map;
-    
-    static {
-        map = new HashMap<>();
-        for (AlarmQueryType  subevent : AlarmQueryType .values()) {
-            map.put(subevent.code, subevent);
-        }
-    }    
-    
-    private final String event;
-    private final byte code;
-    
-    AlarmQueryType(String event, byte code){
-        this.event = event;
-        this.code = code;
-    }
-    
-    public String getEvent(){
-        return event;
-    }    
-    
-    public byte getCode() {
-        return code;
-    }    
-    
-    public static AlarmQueryType  valueOfEvent(String event) {
-        for (AlarmQueryType  value : AlarmQueryType .values()) {
-            if(value.getEvent().equals(event)) {
-                return value;
-            }
-        }
-        return null;
-    }
-
-    public static AlarmQueryType  valueOf(byte code) {
-        return map.get(code);
-    }    
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum AlarmQueryType {
+    
+    SCAN("SCAN", (byte) 0x01),
+    ALARM_8("ALARM_8", (byte) 0x02),
+    ALARM_S("ALARM_S", (byte) 0x04),
+    NONE("NONE", (byte) 0x00);
+    
+    
+    private static final Map<Byte, AlarmQueryType> map;
+    
+    static {
+        map = new HashMap<>();
+        for (AlarmQueryType  subevent : AlarmQueryType .values()) {
+            map.put(subevent.code, subevent);
+        }
+    }    
+    
+    private final String event;
+    private final byte code;
+    
+    AlarmQueryType(String event, byte code){
+        this.event = event;
+        this.code = code;
+    }
+    
+    public String getEvent(){
+        return event;
+    }    
+    
+    public byte getCode() {
+        return code;
+    }    
+    
+    public static AlarmQueryType  valueOfEvent(String event) {
+        for (AlarmQueryType  value : AlarmQueryType .values()) {
+            if(value.getEvent().equals(event)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static AlarmQueryType  valueOf(byte code) {
+        return map.get(code);
+    }    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/AlarmType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/AlarmType.java
index 9fb87785fb0..2adf049987c 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/AlarmType.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/AlarmType.java
@@ -1,81 +1,81 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.s7.netty.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.plc4x.java.api.model.PlcField;
-
-/**
- *
- * @author cgarcia
- */
-public enum AlarmType implements PlcField {
-    
-    SCAN_ABORT("SCAN_ABORT", (byte) 0x00),
-    SCAN_INITIATE("SCAN_INITIATE", (byte) 0x01),
-    ALARM_ABORT("ALARM_ABORT", (byte) 0x04),
-    ALARM_INITIATE("ALARM_INITIATE", (byte) 0x05),
-    ALARM_S_ABORT("ALARM_S_ABORT", (byte) 0x08),
-    ALARM_S_INITIATE("ALARM_S_INITIATE", (byte) 0x09),
-    NONE("NONE", (byte) 0xff),
-    ;
-    
-    
-    private static final Map<Byte, AlarmType> map;
-    
-    static {
-        map = new HashMap<>();
-        for (AlarmType subevent : AlarmType.values()) {
-            map.put(subevent.code, subevent);
-        }
-    }    
-    
-    private final String event;
-    private final byte code;
-    
-    AlarmType(String event, byte code){
-        this.event = event;
-        this.code = code;
-    }
-    
-    public String getEvent(){
-        return event;
-    }    
-    
-    public byte getCode() {
-        return code;
-    }    
-    
-    public static AlarmType valueOfEvent(String event) {
-        for (AlarmType value : AlarmType.values()) {
-            if(value.getEvent().equals(event)) {
-                return value;
-            }
-        }
-        return null;
-    }
-
-    public static AlarmType valueOf(byte code) {
-        return map.get(code);
-    }
-    
-    
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.plc4x.java.api.model.PlcField;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum AlarmType implements PlcField {
+    
+    SCAN_ABORT("SCAN_ABORT", (byte) 0x00),
+    SCAN_INITIATE("SCAN_INITIATE", (byte) 0x01),
+    ALARM_ABORT("ALARM_ABORT", (byte) 0x04),
+    ALARM_INITIATE("ALARM_INITIATE", (byte) 0x05),
+    ALARM_S_ABORT("ALARM_S_ABORT", (byte) 0x08),
+    ALARM_S_INITIATE("ALARM_S_INITIATE", (byte) 0x09),
+    NONE("NONE", (byte) 0xff),
+    ;
+    
+    
+    private static final Map<Byte, AlarmType> map;
+    
+    static {
+        map = new HashMap<>();
+        for (AlarmType subevent : AlarmType.values()) {
+            map.put(subevent.code, subevent);
+        }
+    }    
+    
+    private final String event;
+    private final byte code;
+    
+    AlarmType(String event, byte code){
+        this.event = event;
+        this.code = code;
+    }
+    
+    public String getEvent(){
+        return event;
+    }    
+    
+    public byte getCode() {
+        return code;
+    }    
+    
+    public static AlarmType valueOfEvent(String event) {
+        for (AlarmType value : AlarmType.values()) {
+            if(value.getEvent().equals(event)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static AlarmType valueOf(byte code) {
+        return map.get(code);
+    }
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuCurrentModeType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuCurrentModeType.java
index 626c205ace9..e7e88ccfaec 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuCurrentModeType.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuCurrentModeType.java
@@ -1,83 +1,83 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.s7.netty.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.plc4x.java.api.model.PlcField;
-
-/**
- *
- * @author cgarcia
- */
-public enum CpuCurrentModeType implements PlcField {
-    
-    STOP("STOP", (byte) 0x00),
-    WARM_RESTART("WARM_RESTART", (byte) 0x01),
-    RUN("RUN", (byte) 0x02),
-    HOT_RESTART("HOT_RESTART", (byte) 0x03),
-    HOLD("HOLD", (byte) 0x04),
-    COLD_RESTART("COLD_RESTART", (byte) 0x06),
-    RUN_R("RUN_R", (byte) 0x09),
-    LINK_UP("LINK_UP", (byte) 0x0b),
-    UPDATE("UPDATE", (byte) 0x0c),
-    ;
-    
-    
-    private static final Map<Byte, CpuCurrentModeType> map;
-    
-    static {
-        map = new HashMap<>();
-        for (CpuCurrentModeType subevent : CpuCurrentModeType.values()) {
-            map.put(subevent.code, subevent);
-        }
-    }    
-    
-    private final String event;
-    private final byte code;
-    
-    CpuCurrentModeType(String event, byte code){
-        this.event = event;
-        this.code = code;
-    }
-    
-    public String getEvent(){
-        return event;
-    }    
-    
-    public byte getCode() {
-        return code;
-    }    
-    
-    public static CpuCurrentModeType valueOfEvent(String event) {
-        for (CpuCurrentModeType value : CpuCurrentModeType.values()) {
-            if(value.getEvent().equals(event)) {
-                return value;
-            }
-        }
-        return null;
-    }
-
-    public static CpuCurrentModeType valueOf(byte code) {
-        return map.get(code);
-    }
-    
-    
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.plc4x.java.api.model.PlcField;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum CpuCurrentModeType implements PlcField {
+    
+    STOP("STOP", (byte) 0x00),
+    WARM_RESTART("WARM_RESTART", (byte) 0x01),
+    RUN("RUN", (byte) 0x02),
+    HOT_RESTART("HOT_RESTART", (byte) 0x03),
+    HOLD("HOLD", (byte) 0x04),
+    COLD_RESTART("COLD_RESTART", (byte) 0x06),
+    RUN_R("RUN_R", (byte) 0x09),
+    LINK_UP("LINK_UP", (byte) 0x0b),
+    UPDATE("UPDATE", (byte) 0x0c),
+    ;
+    
+    
+    private static final Map<Byte, CpuCurrentModeType> map;
+    
+    static {
+        map = new HashMap<>();
+        for (CpuCurrentModeType subevent : CpuCurrentModeType.values()) {
+            map.put(subevent.code, subevent);
+        }
+    }    
+    
+    private final String event;
+    private final byte code;
+    
+    CpuCurrentModeType(String event, byte code){
+        this.event = event;
+        this.code = code;
+    }
+    
+    public String getEvent(){
+        return event;
+    }    
+    
+    public byte getCode() {
+        return code;
+    }    
+    
+    public static CpuCurrentModeType valueOfEvent(String event) {
+        for (CpuCurrentModeType value : CpuCurrentModeType.values()) {
+            if(value.getEvent().equals(event)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static CpuCurrentModeType valueOf(byte code) {
+        return map.get(code);
+    }
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuCyclicServiceTimeBaseType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuCyclicServiceTimeBaseType.java
index add0100ae72..c964b05e655 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuCyclicServiceTimeBaseType.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuCyclicServiceTimeBaseType.java
@@ -1,76 +1,76 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.s7.netty.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.plc4x.java.api.model.PlcField;
-
-/**
- *
- * @author cgarcia
- */
-public enum CpuCyclicServiceTimeBaseType implements PlcField {
-    
-    TB_100_MS("100 MS", (byte) 0x00),
-    TB_1_SEC("1 SECOND", (byte) 0x01),
-    TB_10_SEC("10 SECONDS", (byte) 0x02);
-    
-    
-    private static final Map<Byte, CpuCyclicServiceTimeBaseType> map;
-    
-    static {
-        map = new HashMap<>();
-        for (CpuCyclicServiceTimeBaseType subevent : CpuCyclicServiceTimeBaseType.values()) {
-            map.put(subevent.code, subevent);
-        }
-    }    
-    
-    private final String event;
-    private final byte code;
-    
-    CpuCyclicServiceTimeBaseType(String event, byte code){
-        this.event = event;
-        this.code = code;
-    }
-    
-    public String getEvent(){
-        return event;
-    }    
-    
-    public byte getCode() {
-        return code;
-    }    
-    
-    public static CpuCyclicServiceTimeBaseType valueOfEvent(String event) {
-        for (CpuCyclicServiceTimeBaseType value : CpuCyclicServiceTimeBaseType.values()) {
-            if(value.getEvent().equals(event)) {
-                return value;
-            }
-        }
-        return null;
-    }
-
-    public static CpuCyclicServiceTimeBaseType valueOf(byte code) {
-        return map.get(code);
-    }
-    
-    
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.plc4x.java.api.model.PlcField;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum CpuCyclicServiceTimeBaseType implements PlcField {
+    
+    TB_100_MS("100 MS", (byte) 0x00),
+    TB_1_SEC("1 SECOND", (byte) 0x01),
+    TB_10_SEC("10 SECONDS", (byte) 0x02);
+    
+    
+    private static final Map<Byte, CpuCyclicServiceTimeBaseType> map;
+    
+    static {
+        map = new HashMap<>();
+        for (CpuCyclicServiceTimeBaseType subevent : CpuCyclicServiceTimeBaseType.values()) {
+            map.put(subevent.code, subevent);
+        }
+    }    
+    
+    private final String event;
+    private final byte code;
+    
+    CpuCyclicServiceTimeBaseType(String event, byte code){
+        this.event = event;
+        this.code = code;
+    }
+    
+    public String getEvent(){
+        return event;
+    }    
+    
+    public byte getCode() {
+        return code;
+    }    
+    
+    public static CpuCyclicServiceTimeBaseType valueOfEvent(String event) {
+        for (CpuCyclicServiceTimeBaseType value : CpuCyclicServiceTimeBaseType.values()) {
+            if(value.getEvent().equals(event)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static CpuCyclicServiceTimeBaseType valueOf(byte code) {
+        return map.get(code);
+    }
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuCyclicServicesParameterSubFunctionGroupType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuCyclicServicesParameterSubFunctionGroupType.java
index 0ad38d55aa2..edda1ee5548 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuCyclicServicesParameterSubFunctionGroupType.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuCyclicServicesParameterSubFunctionGroupType.java
@@ -1,79 +1,79 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.s7.netty.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.plc4x.java.api.model.PlcField;
-
-/**
- *
- * @author cgarcia
- */
-public enum CpuCyclicServicesParameterSubFunctionGroupType implements PlcField {
-    
-    CYCLIC_TRANSFER("CYCLIC_TRANSFER", (byte) 0x01),
-    CYCLIC_UNSUBSCRIBE("CYCLIC_UNSUBSCRIBE", (byte) 0x04),
-    CYCLIC_CHANGE("CYCLIC_CHANGE", (byte) 0x05),
-    CYCLIC_CHANGE_MODIFY("CYCLIC_CHANGE_MODIFY", (byte) 0x07),
-    CYCLIC_RDREC("CYCLIC_RDREC", (byte) 0x08),
-    ;
-    
-    
-    private static final Map<Byte, CpuCyclicServicesParameterSubFunctionGroupType> map;
-    
-    static {
-        map = new HashMap<>();
-        for (CpuCyclicServicesParameterSubFunctionGroupType subevent : CpuCyclicServicesParameterSubFunctionGroupType.values()) {
-            map.put(subevent.code, subevent);
-        }
-    }    
-    
-    private final String event;
-    private final byte code;
-    
-    CpuCyclicServicesParameterSubFunctionGroupType(String event, byte code){
-        this.event = event;
-        this.code = code;
-    }
-    
-    public String getEvent(){
-        return event;
-    }    
-    
-    public byte getCode() {
-        return code;
-    }    
-    
-    public static CpuCyclicServicesParameterSubFunctionGroupType valueOfEvent(String event) {
-        for (CpuCyclicServicesParameterSubFunctionGroupType value : CpuCyclicServicesParameterSubFunctionGroupType.values()) {
-            if(value.getEvent().equals(event)) {
-                return value;
-            }
-        }
-        return null;
-    }
-
-    public static CpuCyclicServicesParameterSubFunctionGroupType valueOf(byte code) {
-        return map.get(code);
-    }
-    
-    
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.plc4x.java.api.model.PlcField;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum CpuCyclicServicesParameterSubFunctionGroupType implements PlcField {
+    
+    CYCLIC_TRANSFER("CYCLIC_TRANSFER", (byte) 0x01),
+    CYCLIC_UNSUBSCRIBE("CYCLIC_UNSUBSCRIBE", (byte) 0x04),
+    CYCLIC_CHANGE("CYCLIC_CHANGE", (byte) 0x05),
+    CYCLIC_CHANGE_MODIFY("CYCLIC_CHANGE_MODIFY", (byte) 0x07),
+    CYCLIC_RDREC("CYCLIC_RDREC", (byte) 0x08),
+    ;
+    
+    
+    private static final Map<Byte, CpuCyclicServicesParameterSubFunctionGroupType> map;
+    
+    static {
+        map = new HashMap<>();
+        for (CpuCyclicServicesParameterSubFunctionGroupType subevent : CpuCyclicServicesParameterSubFunctionGroupType.values()) {
+            map.put(subevent.code, subevent);
+        }
+    }    
+    
+    private final String event;
+    private final byte code;
+    
+    CpuCyclicServicesParameterSubFunctionGroupType(String event, byte code){
+        this.event = event;
+        this.code = code;
+    }
+    
+    public String getEvent(){
+        return event;
+    }    
+    
+    public byte getCode() {
+        return code;
+    }    
+    
+    public static CpuCyclicServicesParameterSubFunctionGroupType valueOfEvent(String event) {
+        for (CpuCyclicServicesParameterSubFunctionGroupType value : CpuCyclicServicesParameterSubFunctionGroupType.values()) {
+            if(value.getEvent().equals(event)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static CpuCyclicServicesParameterSubFunctionGroupType valueOf(byte code) {
+        return map.get(code);
+    }
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterFunctionGroup.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterFunctionGroup.java
index e01f91dced1..223dcc262f3 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterFunctionGroup.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterFunctionGroup.java
@@ -1,65 +1,65 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public enum CpuServicesParameterFunctionGroup {
-
-    MODE_TRANSITION((byte) 0x00),
-    PROGRAMMER_COMMANDS((byte) 0x01),
-    CYCLIC_SERVICES((byte) 0x02),
-    BLOCK_FUNCTIONS((byte) 0x03),
-    CPU_FUNCTIONS((byte) 0x04),
-    SECURITY((byte) 0x05),
-    PCB_BSEND_BRECV((byte) 0x06),
-    TIMER_FUNCTIONS((byte) 0x07),
-    NC_PROGRAMMING((byte) 0x0f);
-
-    private static final Logger logger = LoggerFactory.getLogger(CpuServicesParameterFunctionGroup.class);
-
-    private static final Map<Byte, CpuServicesParameterFunctionGroup> map;
-    static {
-        map = new HashMap<>();
-        for (CpuServicesParameterFunctionGroup cpuServicesParameterFunctionGroup : CpuServicesParameterFunctionGroup.values()) {
-            map.put(cpuServicesParameterFunctionGroup.code, cpuServicesParameterFunctionGroup);
-        }
-    }
-
-    private final byte code;
-
-    CpuServicesParameterFunctionGroup(byte code) {
-        this.code = code;
-    }
-
-    public byte getCode() {
-        return code;
-    }
-
-    public static CpuServicesParameterFunctionGroup valueOf(byte code) {
-        if(!map.containsKey(code)) {
-            logger.error("CpuServicesParameterFunctionGroup for code {} not found", code);
-        }
-        return map.get(code);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public enum CpuServicesParameterFunctionGroup {
+
+    MODE_TRANSITION((byte) 0x00),
+    PROGRAMMER_COMMANDS((byte) 0x01),
+    CYCLIC_SERVICES((byte) 0x02),
+    BLOCK_FUNCTIONS((byte) 0x03),
+    CPU_FUNCTIONS((byte) 0x04),
+    SECURITY((byte) 0x05),
+    PCB_BSEND_BRECV((byte) 0x06),
+    TIMER_FUNCTIONS((byte) 0x07),
+    NC_PROGRAMMING((byte) 0x0f);
+
+    private static final Logger logger = LoggerFactory.getLogger(CpuServicesParameterFunctionGroup.class);
+
+    private static final Map<Byte, CpuServicesParameterFunctionGroup> map;
+    static {
+        map = new HashMap<>();
+        for (CpuServicesParameterFunctionGroup cpuServicesParameterFunctionGroup : CpuServicesParameterFunctionGroup.values()) {
+            map.put(cpuServicesParameterFunctionGroup.code, cpuServicesParameterFunctionGroup);
+        }
+    }
+
+    private final byte code;
+
+    CpuServicesParameterFunctionGroup(byte code) {
+        this.code = code;
+    }
+
+    public byte getCode() {
+        return code;
+    }
+
+    public static CpuServicesParameterFunctionGroup valueOf(byte code) {
+        if(!map.containsKey(code)) {
+            logger.error("CpuServicesParameterFunctionGroup for code {} not found", code);
+        }
+        return map.get(code);
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterSubFunctionGroup.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterSubFunctionGroup.java
index e388e91f76d..95b00b21be6 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterSubFunctionGroup.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterSubFunctionGroup.java
@@ -1,74 +1,74 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public enum CpuServicesParameterSubFunctionGroup {
-
-    READ_SSL((byte) 0x01),
-    MESSAGE_SERVICE((byte) 0x02),
-    DIAG_MESSAGE((byte) 0x03),
-    ALARM((byte) 0x04),
-    ALARM8((byte) 0x05),
-    NOTIFY((byte) 0x06),
-    ALARM8_LOCK((byte) 0x07),
-    ALARM8_UNLOCK((byte) 0x08),
-    SCAN((byte) 0x09),
-    ALARM_ACK((byte) 0x0b),
-    ALARM_ACK_IND((byte) 0x0c),    
-    ALARM8_LOCK_IND((byte) 0x0d),
-    ALARM8_UNLOCK_IND((byte) 0x0e),
-    ALARM_SQ_IND((byte) 0x11),  
-    ALARM_S_IND((byte) 0x12),    
-    ALARM_QUERY((byte) 0x13),    
-    NOTIFY8((byte) 0x16),
-    NONE((byte) 0x00); //TODO
-
-    private static final Logger logger = LoggerFactory.getLogger(CpuServicesParameterSubFunctionGroup.class);
-
-    private static final Map<Byte, CpuServicesParameterSubFunctionGroup> map;
-    static {
-        map = new HashMap<>();
-        for (CpuServicesParameterSubFunctionGroup cpuServicesParameterSubFunctionGroup : CpuServicesParameterSubFunctionGroup.values()) {
-            map.put(cpuServicesParameterSubFunctionGroup.code, cpuServicesParameterSubFunctionGroup);
-        }
-    }
-
-    private final byte code;
-
-    CpuServicesParameterSubFunctionGroup(byte code) {
-        this.code = code;
-    }
-
-    public byte getCode() {
-        return code;
-    }
-
-    public static CpuServicesParameterSubFunctionGroup valueOf(byte code) {
-        if(!map.containsKey(code)) {
-            logger.error("CpuServicesParameterSubFunctionGroup for code {} not found", code);
-        }
-        return map.get(code);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public enum CpuServicesParameterSubFunctionGroup {
+
+    READ_SSL((byte) 0x01),
+    MESSAGE_SERVICE((byte) 0x02),
+    DIAG_MESSAGE((byte) 0x03),
+    ALARM((byte) 0x04),
+    ALARM8((byte) 0x05),
+    NOTIFY((byte) 0x06),
+    ALARM8_LOCK((byte) 0x07),
+    ALARM8_UNLOCK((byte) 0x08),
+    SCAN((byte) 0x09),
+    ALARM_ACK((byte) 0x0b),
+    ALARM_ACK_IND((byte) 0x0c),    
+    ALARM8_LOCK_IND((byte) 0x0d),
+    ALARM8_UNLOCK_IND((byte) 0x0e),
+    ALARM_SQ_IND((byte) 0x11),  
+    ALARM_S_IND((byte) 0x12),    
+    ALARM_QUERY((byte) 0x13),    
+    NOTIFY8((byte) 0x16),
+    NONE((byte) 0x00); //TODO
+
+    private static final Logger logger = LoggerFactory.getLogger(CpuServicesParameterSubFunctionGroup.class);
+
+    private static final Map<Byte, CpuServicesParameterSubFunctionGroup> map;
+    static {
+        map = new HashMap<>();
+        for (CpuServicesParameterSubFunctionGroup cpuServicesParameterSubFunctionGroup : CpuServicesParameterSubFunctionGroup.values()) {
+            map.put(cpuServicesParameterSubFunctionGroup.code, cpuServicesParameterSubFunctionGroup);
+        }
+    }
+
+    private final byte code;
+
+    CpuServicesParameterSubFunctionGroup(byte code) {
+        this.code = code;
+    }
+
+    public byte getCode() {
+        return code;
+    }
+
+    public static CpuServicesParameterSubFunctionGroup valueOf(byte code) {
+        if(!map.containsKey(code)) {
+            logger.error("CpuServicesParameterSubFunctionGroup for code {} not found", code);
+        }
+        return map.get(code);
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuUserDataMethodType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuUserDataMethodType.java
index 7043e7d7de2..eda78d57679 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuUserDataMethodType.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuUserDataMethodType.java
@@ -1,77 +1,77 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.s7.netty.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.plc4x.java.api.model.PlcField;
-
-/**
- *
- * @author cgarcia
- */
-public enum CpuUserDataMethodType implements PlcField {
-    
-    UNDEF("UNDEF", (byte) 0x00),
-    REQUEST("REQUEST", (byte) 0x11),
-    RESPONSE("RESPONSE", (byte) 0x12),
-    ;
-    
-    
-    private static final Map<Byte, CpuUserDataMethodType> map;
-    
-    static {
-        map = new HashMap<>();
-        for (CpuUserDataMethodType subevent : CpuUserDataMethodType.values()) {
-            map.put(subevent.code, subevent);
-        }
-    }    
-    
-    private final String event;
-    private final byte code;
-    
-    CpuUserDataMethodType(String event, byte code){
-        this.event = event;
-        this.code = code;
-    }
-    
-    public String getEvent(){
-        return event;
-    }    
-    
-    public byte getCode() {
-        return code;
-    }    
-    
-    public static CpuUserDataMethodType valueOfEvent(String event) {
-        for (CpuUserDataMethodType value : CpuUserDataMethodType.values()) {
-            if(value.getEvent().equals(event)) {
-                return value;
-            }
-        }
-        return null;
-    }
-
-    public static CpuUserDataMethodType valueOf(byte code) {
-        return map.get(code);
-    }
-    
-    
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.plc4x.java.api.model.PlcField;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum CpuUserDataMethodType implements PlcField {
+    
+    UNDEF("UNDEF", (byte) 0x00),
+    REQUEST("REQUEST", (byte) 0x11),
+    RESPONSE("RESPONSE", (byte) 0x12),
+    ;
+    
+    
+    private static final Map<Byte, CpuUserDataMethodType> map;
+    
+    static {
+        map = new HashMap<>();
+        for (CpuUserDataMethodType subevent : CpuUserDataMethodType.values()) {
+            map.put(subevent.code, subevent);
+        }
+    }    
+    
+    private final String event;
+    private final byte code;
+    
+    CpuUserDataMethodType(String event, byte code){
+        this.event = event;
+        this.code = code;
+    }
+    
+    public String getEvent(){
+        return event;
+    }    
+    
+    public byte getCode() {
+        return code;
+    }    
+    
+    public static CpuUserDataMethodType valueOfEvent(String event) {
+        for (CpuUserDataMethodType value : CpuUserDataMethodType.values()) {
+            if(value.getEvent().equals(event)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static CpuUserDataMethodType valueOf(byte code) {
+        return map.get(code);
+    }
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuUserDataParameterFunctionGroupType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuUserDataParameterFunctionGroupType.java
index b392d26947d..aa889825803 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuUserDataParameterFunctionGroupType.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuUserDataParameterFunctionGroupType.java
@@ -1,83 +1,83 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.s7.netty.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.plc4x.java.api.model.PlcField;
-
-/**
- *
- * @author cgarcia
- */
-public enum CpuUserDataParameterFunctionGroupType implements PlcField {
-    
-    MODE_TRANSITION("MODE_TRANSITION", (byte) 0x00),
-    PROG_COMMANDS("PROG", (byte) 0x01),
-    CYCLIC_SERVICES("CYCLIC_SERVICES", (byte) 0x02),
-    BLOCK_FUNCTIONS("BLOCK", (byte) 0x03),
-    CPU_FUNCTIONS("CPU_FUNCTIONS", (byte) 0x04),
-    SECURITY("SECURITY", (byte) 0x05),
-    PBC("PBC", (byte) 0x06),
-    TIME_FUNCTIONS("TIME_FUNCTIONS", (byte) 0x07),
-    NCPRG("NCPRG", (byte) 0x0f),
-    ;
-    
-    
-    private static final Map<Byte, CpuUserDataParameterFunctionGroupType> map;
-    
-    static {
-        map = new HashMap<>();
-        for (CpuUserDataParameterFunctionGroupType subevent : CpuUserDataParameterFunctionGroupType.values()) {
-            map.put(subevent.code, subevent);
-        }
-    }    
-    
-    private final String event;
-    private final byte code;
-    
-    CpuUserDataParameterFunctionGroupType(String event, byte code){
-        this.event = event;
-        this.code = code;
-    }
-    
-    public String getEvent(){
-        return event;
-    }    
-    
-    public byte getCode() {
-        return code;
-    }    
-    
-    public static CpuUserDataParameterFunctionGroupType valueOfEvent(String event) {
-        for (CpuUserDataParameterFunctionGroupType value : CpuUserDataParameterFunctionGroupType.values()) {
-            if(value.getEvent().equals(event)) {
-                return value;
-            }
-        }
-        return null;
-    }
-
-    public static CpuUserDataParameterFunctionGroupType valueOf(byte code) {
-        return map.get(code);
-    }
-    
-    
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.plc4x.java.api.model.PlcField;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum CpuUserDataParameterFunctionGroupType implements PlcField {
+    
+    MODE_TRANSITION("MODE_TRANSITION", (byte) 0x00),
+    PROG_COMMANDS("PROG", (byte) 0x01),
+    CYCLIC_SERVICES("CYCLIC_SERVICES", (byte) 0x02),
+    BLOCK_FUNCTIONS("BLOCK", (byte) 0x03),
+    CPU_FUNCTIONS("CPU_FUNCTIONS", (byte) 0x04),
+    SECURITY("SECURITY", (byte) 0x05),
+    PBC("PBC", (byte) 0x06),
+    TIME_FUNCTIONS("TIME_FUNCTIONS", (byte) 0x07),
+    NCPRG("NCPRG", (byte) 0x0f),
+    ;
+    
+    
+    private static final Map<Byte, CpuUserDataParameterFunctionGroupType> map;
+    
+    static {
+        map = new HashMap<>();
+        for (CpuUserDataParameterFunctionGroupType subevent : CpuUserDataParameterFunctionGroupType.values()) {
+            map.put(subevent.code, subevent);
+        }
+    }    
+    
+    private final String event;
+    private final byte code;
+    
+    CpuUserDataParameterFunctionGroupType(String event, byte code){
+        this.event = event;
+        this.code = code;
+    }
+    
+    public String getEvent(){
+        return event;
+    }    
+    
+    public byte getCode() {
+        return code;
+    }    
+    
+    public static CpuUserDataParameterFunctionGroupType valueOfEvent(String event) {
+        for (CpuUserDataParameterFunctionGroupType value : CpuUserDataParameterFunctionGroupType.values()) {
+            if(value.getEvent().equals(event)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static CpuUserDataParameterFunctionGroupType valueOf(byte code) {
+        return map.get(code);
+    }
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuUserDataParameterType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuUserDataParameterType.java
index d51fc26ff1a..f1dbfff153c 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuUserDataParameterType.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuUserDataParameterType.java
@@ -1,80 +1,80 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.s7.netty.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.plc4x.java.api.model.PlcField;
-
-/**
- *
- * @author cgarcia
- */
-public enum CpuUserDataParameterType implements PlcField {
-    
-    PUSH("PUSH", (byte) 0x00),
-    REQUEST("REQUEST", (byte) 0x04),
-    RESPONSE("RESPONSE", (byte) 0x08),
-    NCPUSH("BLOCK", (byte) 0x03),
-    NCREQUEST("CPU_FUNCTIONS", (byte) 0x07),
-    NCRESPONSE("SECURITY", (byte) 0x0B),
-    ;
-    
-    
-    private static final Map<Byte, CpuUserDataParameterType> map;
-    
-    static {
-        map = new HashMap<>();
-        for (CpuUserDataParameterType subevent : CpuUserDataParameterType.values()) {
-            map.put(subevent.code, subevent);
-        }
-    }    
-    
-    private final String event;
-    private final byte code;
-    
-    CpuUserDataParameterType(String event, byte code){
-        this.event = event;
-        this.code = code;
-    }
-    
-    public String getEvent(){
-        return event;
-    }    
-    
-    public byte getCode() {
-        return code;
-    }    
-    
-    public static CpuUserDataParameterType valueOfEvent(String event) {
-        for (CpuUserDataParameterType value : CpuUserDataParameterType.values()) {
-            if(value.getEvent().equals(event)) {
-                return value;
-            }
-        }
-        return null;
-    }
-
-    public static CpuUserDataParameterType valueOf(byte code) {
-        return map.get(code);
-    }
-    
-    
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.plc4x.java.api.model.PlcField;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum CpuUserDataParameterType implements PlcField {
+    
+    PUSH("PUSH", (byte) 0x00),
+    REQUEST("REQUEST", (byte) 0x04),
+    RESPONSE("RESPONSE", (byte) 0x08),
+    NCPUSH("BLOCK", (byte) 0x03),
+    NCREQUEST("CPU_FUNCTIONS", (byte) 0x07),
+    NCRESPONSE("SECURITY", (byte) 0x0B),
+    ;
+    
+    
+    private static final Map<Byte, CpuUserDataParameterType> map;
+    
+    static {
+        map = new HashMap<>();
+        for (CpuUserDataParameterType subevent : CpuUserDataParameterType.values()) {
+            map.put(subevent.code, subevent);
+        }
+    }    
+    
+    private final String event;
+    private final byte code;
+    
+    CpuUserDataParameterType(String event, byte code){
+        this.event = event;
+        this.code = code;
+    }
+    
+    public String getEvent(){
+        return event;
+    }    
+    
+    public byte getCode() {
+        return code;
+    }    
+    
+    public static CpuUserDataParameterType valueOfEvent(String event) {
+        for (CpuUserDataParameterType value : CpuUserDataParameterType.values()) {
+            if(value.getEvent().equals(event)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static CpuUserDataParameterType valueOf(byte code) {
+        return map.get(code);
+    }
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportErrorCode.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportErrorCode.java
index 90159606ef0..76b73192ab6 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportErrorCode.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportErrorCode.java
@@ -1,62 +1,62 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public enum DataTransportErrorCode {
-    RESERVED((byte) 0x00),
-    OK((byte) 0xFF),
-    ACCESS_DENIED((byte) 0x03),
-    INVALID_ADDRESS((byte) 0x05),
-    DATA_TYPE_NOT_SUPPORTED((byte) 0x06),
-    DATA_TYPE_INCONSISTENT((byte) 0x07),
-    NOT_FOUND((byte) 0x0A);
-
-    private static final Logger logger = LoggerFactory.getLogger(DataTransportErrorCode.class);
-
-    private static final Map<Byte, DataTransportErrorCode> map;
-    static {
-        map = new HashMap<>();
-        for (DataTransportErrorCode dataTransportErrorCode : DataTransportErrorCode.values()) {
-            map.put(dataTransportErrorCode.code, dataTransportErrorCode);
-        }
-    }
-
-    private byte code;
-
-    DataTransportErrorCode(byte code) {
-        this.code = code;
-    }
-
-    public byte getCode() {
-        return code;
-    }
-
-    public static DataTransportErrorCode valueOf(byte code) {
-        if (!map.containsKey(code)) {
-            logger.error("No DataTransportErrorCode for code {}", code);
-        }
-        return map.get(code);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public enum DataTransportErrorCode {
+    RESERVED((byte) 0x00),
+    OK((byte) 0xFF),
+    ACCESS_DENIED((byte) 0x03),
+    INVALID_ADDRESS((byte) 0x05),
+    DATA_TYPE_NOT_SUPPORTED((byte) 0x06),
+    DATA_TYPE_INCONSISTENT((byte) 0x07),
+    NOT_FOUND((byte) 0x0A);
+
+    private static final Logger logger = LoggerFactory.getLogger(DataTransportErrorCode.class);
+
+    private static final Map<Byte, DataTransportErrorCode> map;
+    static {
+        map = new HashMap<>();
+        for (DataTransportErrorCode dataTransportErrorCode : DataTransportErrorCode.values()) {
+            map.put(dataTransportErrorCode.code, dataTransportErrorCode);
+        }
+    }
+
+    private byte code;
+
+    DataTransportErrorCode(byte code) {
+        this.code = code;
+    }
+
+    public byte getCode() {
+        return code;
+    }
+
+    public static DataTransportErrorCode valueOf(byte code) {
+        if (!map.containsKey(code)) {
+            logger.error("No DataTransportErrorCode for code {}", code);
+        }
+        return map.get(code);
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportSize.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportSize.java
index e93a34eecbf..c4eb5256ff3 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportSize.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportSize.java
@@ -1,64 +1,64 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * (Values determined by evaluating generated ".pcap" files)
- */
-public enum DataTransportSize {
-    NULL((byte) 0x00, false),
-    BIT((byte) 0x03, true),
-    BYTE_WORD_DWORD((byte) 0x04, true),
-    INTEGER((byte) 0x05, true),
-    DINTEGER((byte) 0x06, false),
-    REAL((byte) 0x07, false),
-    OCTET_STRING((byte) 0x09, false);
-
-    private static final Map<Byte, DataTransportSize> map;
-    static {
-        map = new HashMap<>();
-        for (DataTransportSize dataTransportSize : DataTransportSize.values()) {
-            map.put(dataTransportSize.code, dataTransportSize);
-        }
-    }
-
-    private final byte code;
-    private final boolean sizeInBits;
-
-    DataTransportSize(byte code, boolean sizeInBits) {
-        this.code = code;
-        this.sizeInBits = sizeInBits;
-    }
-
-    public byte getCode() {
-        return code;
-    }
-
-    public boolean isSizeInBits() {
-        return sizeInBits;
-    }
-
-    public static DataTransportSize valueOf(byte code) {
-        return map.get(code);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * (Values determined by evaluating generated ".pcap" files)
+ */
+public enum DataTransportSize {
+    NULL((byte) 0x00, false),
+    BIT((byte) 0x03, true),
+    BYTE_WORD_DWORD((byte) 0x04, true),
+    INTEGER((byte) 0x05, true),
+    DINTEGER((byte) 0x06, false),
+    REAL((byte) 0x07, false),
+    OCTET_STRING((byte) 0x09, false);
+
+    private static final Map<Byte, DataTransportSize> map;
+    static {
+        map = new HashMap<>();
+        for (DataTransportSize dataTransportSize : DataTransportSize.values()) {
+            map.put(dataTransportSize.code, dataTransportSize);
+        }
+    }
+
+    private final byte code;
+    private final boolean sizeInBits;
+
+    DataTransportSize(byte code, boolean sizeInBits) {
+        this.code = code;
+        this.sizeInBits = sizeInBits;
+    }
+
+    public byte getCode() {
+        return code;
+    }
+
+    public boolean isSizeInBits() {
+        return sizeInBits;
+    }
+
+    public static DataTransportSize valueOf(byte code) {
+        return map.get(code);
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/HeaderErrorClass.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/HeaderErrorClass.java
index 9c225307ca5..9e0384fbd6d 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/HeaderErrorClass.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/HeaderErrorClass.java
@@ -1,55 +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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public enum HeaderErrorClass {
-    NO_ERROR((byte) 0x00),
-    APPLICATION_RELATIONSHIP_ERROR((byte) 0x81),
-    OBJECT_DEFINITION_ERROR((byte) 0x82),
-    NO_RESOURCES_AVAILABLE_ERROR((byte) 0x83),
-    ERROR_ON_SERVICE_PROCESSING((byte) 0x84),
-    ERROR_ON_SUPPLIES((byte) 0x85),
-    ACCESS_ERROR((byte) 0x87);
-
-    private static final Map<Byte, HeaderErrorClass> map;
-    static {
-        map = new HashMap<>();
-        for (HeaderErrorClass headerErrorClass : HeaderErrorClass.values()) {
-            map.put(headerErrorClass.code, headerErrorClass);
-        }
-    }
-
-    private final byte code;
-
-    HeaderErrorClass(byte code) {
-        this.code = code;
-    }
-
-    public byte getCode() {
-        return code;
-    }
-
-    public static HeaderErrorClass valueOf(byte code) {
-        return map.get(code);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum HeaderErrorClass {
+    NO_ERROR((byte) 0x00),
+    APPLICATION_RELATIONSHIP_ERROR((byte) 0x81),
+    OBJECT_DEFINITION_ERROR((byte) 0x82),
+    NO_RESOURCES_AVAILABLE_ERROR((byte) 0x83),
+    ERROR_ON_SERVICE_PROCESSING((byte) 0x84),
+    ERROR_ON_SUPPLIES((byte) 0x85),
+    ACCESS_ERROR((byte) 0x87);
+
+    private static final Map<Byte, HeaderErrorClass> map;
+    static {
+        map = new HashMap<>();
+        for (HeaderErrorClass headerErrorClass : HeaderErrorClass.values()) {
+            map.put(headerErrorClass.code, headerErrorClass);
+        }
+    }
+
+    private final byte code;
+
+    HeaderErrorClass(byte code) {
+        this.code = code;
+    }
+
+    public byte getCode() {
+        return code;
+    }
+
+    public static HeaderErrorClass valueOf(byte code) {
+        return map.get(code);
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/MemoryArea.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/MemoryArea.java
index 107687c13a7..521d5d41216 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/MemoryArea.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/MemoryArea.java
@@ -1,83 +1,83 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * (Values determined by evaluating generated ".pcap" files)
- */
-public enum MemoryArea {
-    COUNTERS("C", (byte) 0x1C), /* Renamed from "S7 Counters" */ // TODO: Double check shortName
-    TIMERS("T", (byte) 0x1D), /* Renamed from "S7 Timers" */ // TODO: Double check shortName
-    DIRECT_PERIPHERAL_ACCESS("D", (byte) 0x80), // TODO: Double check shortName
-    INPUTS("I", (byte) 0x81),
-    OUTPUTS("Q", (byte) 0x82),
-    FLAGS_MARKERS("M", (byte) 0x83),
-    DATA_BLOCKS("DB", (byte) 0x84),
-    INSTANCE_DATA_BLOCKS("DBI", (byte) 0x85), // TODO: Double check shortName
-    LOCAL_DATA("LD", (byte) 0x86); // TODO: Double check shortName
-
-    // TODO: I think we should remove these ...
-    /*S7_200_SYSTEM_INFO(null, (byte) 0x03), * Renamed from "System info of 200 family" *
-    S7_200_FLAGS(null, (byte) 0x05), * Renamed from "System flags of 200 family" *
-    S7_200_INPUTS(null, (byte) 0x06), * Renamed from "System inputs of 200 family" *
-    S7_200_OUTPUTS(null, (byte) 0x07), * Renamed from "System outputs of 200 family" *
-    S7_200_IEC_COUNTERS(null, (byte) 0x1E), * Renamed from "IEC counters (200 family)" *
-    S7_200_IEC_TIMERS(null, (byte) 0x1F); * Renamed from "IEC timers (200 family)" */
-
-    private static final Map<Byte, MemoryArea> map;
-    static {
-        map = new HashMap<>();
-        for (MemoryArea memoryArea : MemoryArea.values()) {
-            map.put(memoryArea.code, memoryArea);
-        }
-    }
-
-    private final String shortName;
-    private final byte code;
-
-    MemoryArea(String shortName, byte code) {
-        this.shortName = shortName;
-        this.code = code;
-    }
-
-    public String getShortName() {
-        return shortName;
-    }
-
-    public byte getCode() {
-        return code;
-    }
-
-    public static MemoryArea valueOfShortName(String shortName) {
-        for (MemoryArea value : MemoryArea.values()) {
-            if(value.getShortName().equals(shortName)) {
-                return value;
-            }
-        }
-        return null;
-    }
-
-    public static MemoryArea valueOf(byte code) {
-        return map.get(code);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * (Values determined by evaluating generated ".pcap" files)
+ */
+public enum MemoryArea {
+    COUNTERS("C", (byte) 0x1C), /* Renamed from "S7 Counters" */ // TODO: Double check shortName
+    TIMERS("T", (byte) 0x1D), /* Renamed from "S7 Timers" */ // TODO: Double check shortName
+    DIRECT_PERIPHERAL_ACCESS("D", (byte) 0x80), // TODO: Double check shortName
+    INPUTS("I", (byte) 0x81),
+    OUTPUTS("Q", (byte) 0x82),
+    FLAGS_MARKERS("M", (byte) 0x83),
+    DATA_BLOCKS("DB", (byte) 0x84),
+    INSTANCE_DATA_BLOCKS("DBI", (byte) 0x85), // TODO: Double check shortName
+    LOCAL_DATA("LD", (byte) 0x86); // TODO: Double check shortName
+
+    // TODO: I think we should remove these ...
+    /*S7_200_SYSTEM_INFO(null, (byte) 0x03), * Renamed from "System info of 200 family" *
+    S7_200_FLAGS(null, (byte) 0x05), * Renamed from "System flags of 200 family" *
+    S7_200_INPUTS(null, (byte) 0x06), * Renamed from "System inputs of 200 family" *
+    S7_200_OUTPUTS(null, (byte) 0x07), * Renamed from "System outputs of 200 family" *
+    S7_200_IEC_COUNTERS(null, (byte) 0x1E), * Renamed from "IEC counters (200 family)" *
+    S7_200_IEC_TIMERS(null, (byte) 0x1F); * Renamed from "IEC timers (200 family)" */
+
+    private static final Map<Byte, MemoryArea> map;
+    static {
+        map = new HashMap<>();
+        for (MemoryArea memoryArea : MemoryArea.values()) {
+            map.put(memoryArea.code, memoryArea);
+        }
+    }
+
+    private final String shortName;
+    private final byte code;
+
+    MemoryArea(String shortName, byte code) {
+        this.shortName = shortName;
+        this.code = code;
+    }
+
+    public String getShortName() {
+        return shortName;
+    }
+
+    public byte getCode() {
+        return code;
+    }
+
+    public static MemoryArea valueOfShortName(String shortName) {
+        for (MemoryArea value : MemoryArea.values()) {
+            if(value.getShortName().equals(shortName)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static MemoryArea valueOf(byte code) {
+        return map.get(code);
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/MessageType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/MessageType.java
index f0974efb9b7..bc6cba8f7e8 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/MessageType.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/MessageType.java
@@ -1,55 +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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * (Values determined by evaluating generated ".pcap" files)
- */
-public enum MessageType {
-    JOB((byte) 0x01),
-    ACK((byte) 0x02),
-    ACK_DATA((byte) 0x03),
-    USER_DATA((byte) 0x07); /* Renamed from "Userdata" */
-
-    private static final Map<Byte, MessageType> map;
-    static {
-        map = new HashMap<>();
-        for (MessageType messageType : MessageType.values()) {
-            map.put(messageType.code, messageType);
-        }
-    }
-
-    private final byte code;
-
-    MessageType(byte code) {
-        this.code = code;
-    }
-
-    public byte getCode() {
-        return code;
-    }
-
-    public static MessageType valueOf(byte code) {
-        return map.get(code);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * (Values determined by evaluating generated ".pcap" files)
+ */
+public enum MessageType {
+    JOB((byte) 0x01),
+    ACK((byte) 0x02),
+    ACK_DATA((byte) 0x03),
+    USER_DATA((byte) 0x07); /* Renamed from "Userdata" */
+
+    private static final Map<Byte, MessageType> map;
+    static {
+        map = new HashMap<>();
+        for (MessageType messageType : MessageType.values()) {
+            map.put(messageType.code, messageType);
+        }
+    }
+
+    private final byte code;
+
+    MessageType(byte code) {
+        this.code = code;
+    }
+
+    public byte getCode() {
+        return code;
+    }
+
+    public static MessageType valueOf(byte code) {
+        return map.get(code);
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterError.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterError.java
index 90b6d6bedaf..95080f2e23e 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterError.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterError.java
@@ -1,70 +1,70 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public enum ParameterError {
-    NO_ERROR((short) 0x0000),
-    INVALID_BLOCK_TYPE_NUMBER((short) 0x0110),
-    INVALID_PARAMETER((short) 0x0112),
-    PG_RESSOURCE_ERROR((short) 0x011A),
-    PLC_RESSOURCE_ERROR((short) 0x011B),
-    PROTOCOL_ERROR((short) 0x011C),
-    USER_BUFFER_TOO_SHORT((short) 0x011F),
-    REQUEST_ERROR((short) 0x0141),
-    VERSION_MISMATCH((short) 0x01C0),
-    NOT_IMPLEMENTED((short) 0x01F0),
-    L7_INVALID_CPU_STATE((short) 0x8001),
-    L7_PDU_SIZE_ERROR((short) 0x8500),
-    L7_INVALID_SZL_ID((short) 0xD401),
-    L7_INVALID_INDEX((short) 0xD402),
-    L7_DGS_CONNECTION_ALREADY_ANNOUNCED((short) 0xD403),
-    L7_MAX_USER_NB((short) 0xD404),
-    L7_DGS_FUNCTION_PARAMETER_SYNTAX_ERROR((short) 0xD405),
-    L7_NO_INFO((short) 0xD406),
-    L7_PRT_FUNCTION_PARAMETER_SYNTAX_ERROR((short) 0xD601),
-    L7_INVALID_VARIABLE_ADDRESS((short) 0xD801),
-    L7_UNKNOWN_REQUEST((short) 0xD802),
-    L7_INVALID_REQUEST_STATUS((short) 0xD803);
-
-    private static final Map<Short, ParameterError> map;
-    static {
-        map = new HashMap<>();
-        for (ParameterError parameterError : ParameterError.values()) {
-            map.put(parameterError.code, parameterError);
-        }
-    }
-
-    private final short code;
-
-    ParameterError(short code) {
-        this.code = code;
-    }
-
-    public short getCode() {
-        return code;
-    }
-
-    public static ParameterError valueOf(short code) {
-        return map.get(code);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum ParameterError {
+    NO_ERROR((short) 0x0000),
+    INVALID_BLOCK_TYPE_NUMBER((short) 0x0110),
+    INVALID_PARAMETER((short) 0x0112),
+    PG_RESSOURCE_ERROR((short) 0x011A),
+    PLC_RESSOURCE_ERROR((short) 0x011B),
+    PROTOCOL_ERROR((short) 0x011C),
+    USER_BUFFER_TOO_SHORT((short) 0x011F),
+    REQUEST_ERROR((short) 0x0141),
+    VERSION_MISMATCH((short) 0x01C0),
+    NOT_IMPLEMENTED((short) 0x01F0),
+    L7_INVALID_CPU_STATE((short) 0x8001),
+    L7_PDU_SIZE_ERROR((short) 0x8500),
+    L7_INVALID_SZL_ID((short) 0xD401),
+    L7_INVALID_INDEX((short) 0xD402),
+    L7_DGS_CONNECTION_ALREADY_ANNOUNCED((short) 0xD403),
+    L7_MAX_USER_NB((short) 0xD404),
+    L7_DGS_FUNCTION_PARAMETER_SYNTAX_ERROR((short) 0xD405),
+    L7_NO_INFO((short) 0xD406),
+    L7_PRT_FUNCTION_PARAMETER_SYNTAX_ERROR((short) 0xD601),
+    L7_INVALID_VARIABLE_ADDRESS((short) 0xD801),
+    L7_UNKNOWN_REQUEST((short) 0xD802),
+    L7_INVALID_REQUEST_STATUS((short) 0xD803);
+
+    private static final Map<Short, ParameterError> map;
+    static {
+        map = new HashMap<>();
+        for (ParameterError parameterError : ParameterError.values()) {
+            map.put(parameterError.code, parameterError);
+        }
+    }
+
+    private final short code;
+
+    ParameterError(short code) {
+        this.code = code;
+    }
+
+    public short getCode() {
+        return code;
+    }
+
+    public static ParameterError valueOf(short code) {
+        return map.get(code);
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterType.java
index 629124f73e9..deadedf9ccc 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterType.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterType.java
@@ -1,72 +1,72 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * (Values determined by evaluating generated ".pcap" files)
- */
-public enum ParameterType {
-    CPU_SERVICES((byte) 0x00),
-    MODE_TRANSITION((byte) 0x01),
-    READ_VAR((byte) 0x04),
-    WRITE_VAR((byte) 0x05),
-    ALARM_ACK((byte) 0x0b),
-    REQUEST_DOWNLOAD((byte) 0x1A),
-    DOWNLOAD_BLOCK((byte) 0x1B),
-    DOWNLOAD_ENDED((byte) 0x1C),
-    START_UPLOAD((byte) 0x1D),
-    UPLOAD((byte) 0x1E),
-    END_UPLOAD((byte) 0x1F),
-    PI_SERVICE((byte) 0x28),
-    PLC_STOP((byte) 0x29),
-    SETUP_COMMUNICATION((byte) 0xF0);
-
-    private static final Logger logger = LoggerFactory.getLogger(ParameterType.class);
-
-    private static final Map<Byte, ParameterType> map;
-    static {
-        map = new HashMap<>();
-        for (ParameterType parameterType : ParameterType.values()) {
-            map.put(parameterType.code, parameterType);
-        }
-    }
-
-    private final byte code;
-
-    ParameterType(byte code) {
-        this.code = code;
-    }
-
-    public byte getCode() {
-        return code;
-    }
-
-    public static ParameterType valueOf(byte code) {
-        if(!map.containsKey(code)) {
-            logger.error("ParameterType for code {} not found", code);
-        }
-        return map.get(code);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * (Values determined by evaluating generated ".pcap" files)
+ */
+public enum ParameterType {
+    CPU_SERVICES((byte) 0x00),
+    MODE_TRANSITION((byte) 0x01),
+    READ_VAR((byte) 0x04),
+    WRITE_VAR((byte) 0x05),
+    ALARM_ACK((byte) 0x0b),
+    REQUEST_DOWNLOAD((byte) 0x1A),
+    DOWNLOAD_BLOCK((byte) 0x1B),
+    DOWNLOAD_ENDED((byte) 0x1C),
+    START_UPLOAD((byte) 0x1D),
+    UPLOAD((byte) 0x1E),
+    END_UPLOAD((byte) 0x1F),
+    PI_SERVICE((byte) 0x28),
+    PLC_STOP((byte) 0x29),
+    SETUP_COMMUNICATION((byte) 0xF0);
+
+    private static final Logger logger = LoggerFactory.getLogger(ParameterType.class);
+
+    private static final Map<Byte, ParameterType> map;
+    static {
+        map = new HashMap<>();
+        for (ParameterType parameterType : ParameterType.values()) {
+            map.put(parameterType.code, parameterType);
+        }
+    }
+
+    private final byte code;
+
+    ParameterType(byte code) {
+        this.code = code;
+    }
+
+    public byte getCode() {
+        return code;
+    }
+
+    public static ParameterType valueOf(byte code) {
+        if(!map.containsKey(code)) {
+            logger.error("ParameterType for code {} not found", code);
+        }
+        return map.get(code);
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/PushEventType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/PushEventType.java
index ca9e0b01cbe..06aa44fda90 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/PushEventType.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/PushEventType.java
@@ -1,67 +1,67 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.s7.netty.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.plc4x.java.api.model.PlcField;
-
-/**
- *
- * @author cgarcia
- */
-public enum PushEventType implements PlcField {
-    
-    ALARM_SQ("ALARM_SQ"),
-    ALARM_S("ALARM_S"),
-    ALARM_SC("ALARM_SC"),
-    ALARM_DQ("ALARM_DQ"),
-    ALARM_D("ALARM_D"),
-    NOTIFY_8P("NOTIFY_8P"),
-    ALARM("ALARM"),
-    ALARM_8("ALARM_8"),
-    ALARM_8P("ALARM_8P"),
-    NOTIFY("NOTIFY");
-    
-    private static final Map<String, PushEventType> map;
-    
-    static {
-        map = new HashMap<>();
-        for (PushEventType s7event : PushEventType.values()) {
-            map.put(s7event.event, s7event);
-        }
-    }
-    
-    private final String event;
-
-    PushEventType(String event){
-        this.event = event;
-    }
-    
-    public String getEvent(){
-        return event;
-    }
-    
-    public static PushEventType valueOfEvent(String event) {
-         return map.get(event);
-    }
-    
-    
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.plc4x.java.api.model.PlcField;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum PushEventType implements PlcField {
+    
+    ALARM_SQ("ALARM_SQ"),
+    ALARM_S("ALARM_S"),
+    ALARM_SC("ALARM_SC"),
+    ALARM_DQ("ALARM_DQ"),
+    ALARM_D("ALARM_D"),
+    NOTIFY_8P("NOTIFY_8P"),
+    ALARM("ALARM"),
+    ALARM_8("ALARM_8"),
+    ALARM_8P("ALARM_8P"),
+    NOTIFY("NOTIFY");
+    
+    private static final Map<String, PushEventType> map;
+    
+    static {
+        map = new HashMap<>();
+        for (PushEventType s7event : PushEventType.values()) {
+            map.put(s7event.event, s7event);
+        }
+    }
+    
+    private final String event;
+
+    PushEventType(String event){
+        this.event = event;
+    }
+    
+    public String getEvent(){
+        return event;
+    }
+    
+    public static PushEventType valueOfEvent(String event) {
+         return map.get(event);
+    }
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/QueryType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/QueryType.java
index 9ee92e22c7b..d897b3538b8 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/QueryType.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/QueryType.java
@@ -1,73 +1,73 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.s7.netty.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- *
- * @author cgarcia
- */
-public enum QueryType {
-    
-    BYALARMTYPE("BYALARMTYPE", (byte) 0x01),
-    BYEVENTID("BYEVENTID", (byte) 0x02),
-    NONE("NONE", (byte) 0x00);
-    
-    
-    private static final Map<Byte, QueryType> map;
-    
-    static {
-        map = new HashMap<>();
-        for (QueryType  subevent : QueryType .values()) {
-            map.put(subevent.code, subevent);
-        }
-    }    
-    
-    private final String event;
-    private final byte code;
-    
-    QueryType(String event, byte code){
-        this.event = event;
-        this.code = code;
-    }
-    
-    public String getEvent(){
-        return event;
-    }    
-    
-    public byte getCode() {
-        return code;
-    }    
-    
-    public static QueryType  valueOfEvent(String event) {
-        for (QueryType  value : QueryType .values()) {
-            if(value.getEvent().equals(event)) {
-                return value;
-            }
-        }
-        return null;
-    }
-
-    public static QueryType  valueOf(byte code) {
-        return map.get(code);
-    }    
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum QueryType {
+    
+    BYALARMTYPE("BYALARMTYPE", (byte) 0x01),
+    BYEVENTID("BYEVENTID", (byte) 0x02),
+    NONE("NONE", (byte) 0x00);
+    
+    
+    private static final Map<Byte, QueryType> map;
+    
+    static {
+        map = new HashMap<>();
+        for (QueryType  subevent : QueryType .values()) {
+            map.put(subevent.code, subevent);
+        }
+    }    
+    
+    private final String event;
+    private final byte code;
+    
+    QueryType(String event, byte code){
+        this.event = event;
+        this.code = code;
+    }
+    
+    public String getEvent(){
+        return event;
+    }    
+    
+    public byte getCode() {
+        return code;
+    }    
+    
+    public static QueryType  valueOfEvent(String event) {
+        for (QueryType  value : QueryType .values()) {
+            if(value.getEvent().equals(event)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static QueryType  valueOf(byte code) {
+        return map.get(code);
+    }    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SpecificationType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SpecificationType.java
index a78e9e7f669..1c4efa22373 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SpecificationType.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SpecificationType.java
@@ -1,52 +1,52 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * (Values determined by evaluating generated ".pcap" files)
- */
-public enum SpecificationType {
-    VARIABLE_SPECIFICATION((byte) 0x12);
-
-    private static final Map<Byte, SpecificationType> map;
-    static {
-        map = new HashMap<>();
-        for (SpecificationType specificationType : SpecificationType.values()) {
-            map.put(specificationType.code, specificationType);
-        }
-    }
-
-    private final byte code;
-
-    SpecificationType(byte code) {
-        this.code = code;
-    }
-
-    public byte getCode() {
-        return code;
-    }
-
-    public static SpecificationType valueOf(byte code) {
-        return map.get(code);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * (Values determined by evaluating generated ".pcap" files)
+ */
+public enum SpecificationType {
+    VARIABLE_SPECIFICATION((byte) 0x12);
+
+    private static final Map<Byte, SpecificationType> map;
+    static {
+        map = new HashMap<>();
+        for (SpecificationType specificationType : SpecificationType.values()) {
+            map.put(specificationType.code, specificationType);
+        }
+    }
+
+    private final byte code;
+
+    SpecificationType(byte code) {
+        this.code = code;
+    }
+
+    public byte getCode() {
+        return code;
+    }
+
+    public static SpecificationType valueOf(byte code) {
+        return map.get(code);
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SslId.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SslId.java
index 26d42c27175..de1eb6d0b38 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SslId.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SslId.java
@@ -1,102 +1,102 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * An SSL ID is a short value build up the following way:
- * Bits 15-12: Module class
- * Bits 11-8:  Number of the partial list extract
- * Bits 7-0:   Number of the partial list
- *
- * Device Class:
- * - 0000: CPU
- * - 0100: IM
- * - 1000: FM
- * - 1100: CP
- */
-public enum SslId {
-
-    // S7 300-400 ID's
-    MODULE_IDENTIFICATION((short) 0x0011),
-    CPU_CHARACTERISTICS((short) 0x0012),
-    USER_MEMORY_AREAS((short) 0x0013),
-    SYSTEM_AREAS((short) 0x0014),
-    BLOCK_TYPES((short) 0x0015),
-    COMPONENT_IDENTIFICATION_ALL((short) 0x001c),
-    COMPONENT_IDENTIFICATION_INDV((short) 0x0011c),
-    COMPONENT_IDENTIFICATION_ALL_H((short) 0x0021c),
-    COMPONENT_IDENTIFICATION_INDV_H((short) 0x0031c),
-    COMPONENT_IDENTIFICATION_PARTIAL((short) 0x00F1c),
-    INTERRUPT_STATUS((short) 0x0022),
-    ASSIGNMENT_BETWEEN_PROCESS_IMAGE_PARTITIONS_AND_OBS((short) 0x0025),
-    COMPUTATION_STATUS_DATA((short) 0x0032),
-    H_CPU_GROUP_INFORMATION((short) 0x0071),
-    STATUS_OF_THE_MODULE_LEDS((short) 0x0074),
-    SWITCHED_DP_SLAVES_IN_THE_H_SYSTEM((short) 0x0075),
-    DP_MASTER_SYSTEM_INFORMATION((short) 0x0090),    
-    MODULE_STATUS_INFORMATION((short) 0x0091),
-    RACK_STATION_STATUS_INFORMATION_1((short) 0x0092),
-    RACK_STATION_STATUS_INFORMATION_2((short) 0x0094),
-    EXTENDED_DP_MASTER_SYSTEM_PROFINET_IO_SYSTEM_INFORMATION((short) 0x0095),
-    MODULE_STATUS_INFORMATION_PROFINET_IO_AND_PROFINET_DP((short) 0x0096),
-    MODULE_STATUS_INFORMATION_PROFINET_IO((short) 0x009C),
-    DIAGNOSTIC_BUFFER_OF_THE_CPU((short) 0x00A0),
-    MODULE_DIAGNOSTIC_INFORMATION_DATA_RECORD_0((short) 0x00B1),
-    MODULE_DIAGNOSTIC_INFORMATION_DATA_RECORD_1_GEOGRAPHICAL_ADDRESS((short) 0x00B2),
-    MODULE_DIAGNOSTIC_INFORMATION_DATA_RECORD_1_LOGICAL_ADDRESS((short) 0x00B3),
-    DIAGNOSTIC_DATA_OF_A_DP_SLAVE((short) 0x00B4),    
-    IDENTIFICATION_OF_ALL_COMPONENTS((short) 0x001c),
-    INFORMATION_ABOUT_COMMUNICATION_UNIT((short) 0x0131),
-    CURRENT_MODE_TRANSITION((short) 0x0424),
-    NULL((short) 0x0000);
-
-    private static final Logger logger = LoggerFactory.getLogger(SslId.class);
-
-    private static final Map<Short, SslId> map;
-    static {
-        map = new HashMap<>();
-        for (SslId sslId : SslId.values()) {
-            map.put(sslId.code, sslId);
-        }
-    }
-
-    private final short code;
-
-    SslId(short code) {
-        this.code = code;
-    }
-
-    public short getCode() {
-        return code;
-    }
-
-    public static SslId valueOf(short code) {
-        if(!map.containsKey(code)) {
-            logger.error("SslId for code {} not found", code);
-        }
-        return map.get(code);
-    }
-
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * An SSL ID is a short value build up the following way:
+ * Bits 15-12: Module class
+ * Bits 11-8:  Number of the partial list extract
+ * Bits 7-0:   Number of the partial list
+ *
+ * Device Class:
+ * - 0000: CPU
+ * - 0100: IM
+ * - 1000: FM
+ * - 1100: CP
+ */
+public enum SslId {
+
+    // S7 300-400 ID's
+    MODULE_IDENTIFICATION((short) 0x0011),
+    CPU_CHARACTERISTICS((short) 0x0012),
+    USER_MEMORY_AREAS((short) 0x0013),
+    SYSTEM_AREAS((short) 0x0014),
+    BLOCK_TYPES((short) 0x0015),
+    COMPONENT_IDENTIFICATION_ALL((short) 0x001c),
+    COMPONENT_IDENTIFICATION_INDV((short) 0x0011c),
+    COMPONENT_IDENTIFICATION_ALL_H((short) 0x0021c),
+    COMPONENT_IDENTIFICATION_INDV_H((short) 0x0031c),
+    COMPONENT_IDENTIFICATION_PARTIAL((short) 0x00F1c),
+    INTERRUPT_STATUS((short) 0x0022),
+    ASSIGNMENT_BETWEEN_PROCESS_IMAGE_PARTITIONS_AND_OBS((short) 0x0025),
+    COMPUTATION_STATUS_DATA((short) 0x0032),
+    H_CPU_GROUP_INFORMATION((short) 0x0071),
+    STATUS_OF_THE_MODULE_LEDS((short) 0x0074),
+    SWITCHED_DP_SLAVES_IN_THE_H_SYSTEM((short) 0x0075),
+    DP_MASTER_SYSTEM_INFORMATION((short) 0x0090),    
+    MODULE_STATUS_INFORMATION((short) 0x0091),
+    RACK_STATION_STATUS_INFORMATION_1((short) 0x0092),
+    RACK_STATION_STATUS_INFORMATION_2((short) 0x0094),
+    EXTENDED_DP_MASTER_SYSTEM_PROFINET_IO_SYSTEM_INFORMATION((short) 0x0095),
+    MODULE_STATUS_INFORMATION_PROFINET_IO_AND_PROFINET_DP((short) 0x0096),
+    MODULE_STATUS_INFORMATION_PROFINET_IO((short) 0x009C),
+    DIAGNOSTIC_BUFFER_OF_THE_CPU((short) 0x00A0),
+    MODULE_DIAGNOSTIC_INFORMATION_DATA_RECORD_0((short) 0x00B1),
+    MODULE_DIAGNOSTIC_INFORMATION_DATA_RECORD_1_GEOGRAPHICAL_ADDRESS((short) 0x00B2),
+    MODULE_DIAGNOSTIC_INFORMATION_DATA_RECORD_1_LOGICAL_ADDRESS((short) 0x00B3),
+    DIAGNOSTIC_DATA_OF_A_DP_SLAVE((short) 0x00B4),    
+    IDENTIFICATION_OF_ALL_COMPONENTS((short) 0x001c),
+    INFORMATION_ABOUT_COMMUNICATION_UNIT((short) 0x0131),
+    CURRENT_MODE_TRANSITION((short) 0x0424),
+    NULL((short) 0x0000);
+
+    private static final Logger logger = LoggerFactory.getLogger(SslId.class);
+
+    private static final Map<Short, SslId> map;
+    static {
+        map = new HashMap<>();
+        for (SslId sslId : SslId.values()) {
+            map.put(sslId.code, sslId);
+        }
+    }
+
+    private final short code;
+
+    SslId(short code) {
+        this.code = code;
+    }
+
+    public short getCode() {
+        return code;
+    }
+
+    public static SslId valueOf(short code) {
+        if(!map.containsKey(code)) {
+            logger.error("SslId for code {} not found", code);
+        }
+        return map.get(code);
+    }
+
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SubscribedEventType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SubscribedEventType.java
index 3c64845a23c..8e2636dd448 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SubscribedEventType.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SubscribedEventType.java
@@ -1,77 +1,77 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.s7.netty.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.plc4x.java.api.model.PlcField;
-
-/**
- *
- * @author cgarcia
- */
-public enum SubscribedEventType implements PlcField {
-    
-    MODE("MODE", (byte) 0x01),
-    SYS("SYS", (byte) 0x02),
-    USR("USR", (byte) 0x04),
-    ALM_S("ALM_S", (byte) 0x80),
-    ALM_8("ALM_8", (byte) 0x80);
-    
-    private static final Map<Byte, SubscribedEventType> map;
-    
-    static {
-        map = new HashMap<>();
-        for (SubscribedEventType subevent : SubscribedEventType.values()) {
-            map.put(subevent.code, subevent);
-        }
-    }    
-    
-    private final String event;
-    private final byte code;
-    
-    SubscribedEventType(String event, byte code){
-        this.event = event;
-        this.code = code;
-    }
-    
-    public String getEvent(){
-        return event;
-    }    
-    
-    public byte getCode() {
-        return code;
-    }    
-    
-    public static SubscribedEventType valueOfEvent(String event) {
-        for (SubscribedEventType value : SubscribedEventType.values()) {
-            if(value.getEvent().equals(event)) {
-                return value;
-            }
-        }
-        return null;
-    }
-
-    public static SubscribedEventType valueOf(byte code) {
-        return map.get(code);
-    }
-    
-    
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.plc4x.java.api.model.PlcField;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum SubscribedEventType implements PlcField {
+    
+    MODE("MODE", (byte) 0x01),
+    SYS("SYS", (byte) 0x02),
+    USR("USR", (byte) 0x04),
+    ALM_S("ALM_S", (byte) 0x80),
+    ALM_8("ALM_8", (byte) 0x80);
+    
+    private static final Map<Byte, SubscribedEventType> map;
+    
+    static {
+        map = new HashMap<>();
+        for (SubscribedEventType subevent : SubscribedEventType.values()) {
+            map.put(subevent.code, subevent);
+        }
+    }    
+    
+    private final String event;
+    private final byte code;
+    
+    SubscribedEventType(String event, byte code){
+        this.event = event;
+        this.code = code;
+    }
+    
+    public String getEvent(){
+        return event;
+    }    
+    
+    public byte getCode() {
+        return code;
+    }    
+    
+    public static SubscribedEventType valueOfEvent(String event) {
+        for (SubscribedEventType value : SubscribedEventType.values()) {
+            if(value.getEvent().equals(event)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static SubscribedEventType valueOf(byte code) {
+        return map.get(code);
+    }
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/TransportSize.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/TransportSize.java
index 9e4b11144f4..320aca45aa2 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/TransportSize.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/TransportSize.java
@@ -1,203 +1,203 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.s7.netty.model.types;
-
-import java.util.*;
-import org.apache.plc4x.java.s7.types.S7ControllerType;
-
-public enum TransportSize {
-
-    /**
-     * TODO: For the types with code 0x00 we need to put some additional effort in reverse engineering the codes for these types.
-     */
-    // -----------------------------------------
-    // Single bit
-    // -----------------------------------------
-    BOOL(0x01, "X", 1, null, DataTransportSize.BIT, S7ControllerType.ANY),
-
-    // -----------------------------------------
-    // Bit strings
-    // -----------------------------------------
-    BYTE(0x02, "B", 1, null, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
-    WORD(0x04, "W", 2, null, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
-    DWORD(0x06, "D", 4, null, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
-    // Only got a basic TIA license (S7-1500 needed to find this out)
-    // TODO: Find the code
-    LWORD(0x00, "X", 8, null, null, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
-
-    // -----------------------------------------
-    // Integers
-    // -----------------------------------------
-    // Signed Int
-    INT(0x05, "W", 2, null, DataTransportSize.INTEGER, S7ControllerType.ANY),
-    // Unsigned Int
-    UINT(0x05, "W", 2, INT, DataTransportSize.INTEGER, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
-    // (Signed) Small Int
-    SINT(0x02, "B", 1, INT, DataTransportSize.INTEGER, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
-    // Unsigned Small Int
-    USINT(0x02, "B", 1, INT, DataTransportSize.INTEGER, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
-    // Double Precision Int
-    DINT(0x07, "D", 4, null, DataTransportSize.INTEGER, S7ControllerType.ANY),
-    // Unsigned Double Precision Int
-    UDINT(0x07, "D", 4, INT, DataTransportSize.INTEGER, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
-    // Only got a basic TIA license (S7-1500 needed to find this out)
-    // TODO: Find the code
-    LINT(0x00, "X", 8, INT, null, S7ControllerType.S7_1500),
-    // Only got a basic TIA license (S7-1500 needed to find this out)
-    // TODO: Find the code
-    ULINT(0x00, "X", 16, INT, null, S7ControllerType.S7_1500),
-
-    // -----------------------------------------
-    // Reals
-    // -----------------------------------------
-    REAL(0x08, "D", 4, null, DataTransportSize.REAL, S7ControllerType.ANY),
-    // TODO: Find the code
-    LREAL(0x00, "X", 8, REAL, null, S7ControllerType.S7_1200, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
-
-    // -----------------------------------------
-    // Durations
-    // -----------------------------------------
-    // IEC time
-    TIME(0x0B, "D", 1, DWORD, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
-    // TODO: Find the code
-    LTIME(0x00, "X", 8, TIME, null, S7ControllerType.S7_1500),
-
-    // -----------------------------------------
-    // Date
-    // -----------------------------------------
-    // IEC date (yyyy-m-d)
-    DATE(0x02, "W", 1, WORD, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
-
-    // -----------------------------------------
-    // Time of day
-    // -----------------------------------------
-    // Time (hh:mm:ss.S)
-    TOD(0x02, "D", 4, BYTE, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
-    TIME_OF_DAY(0x02, "D", 4, BYTE, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
-    
-    // -----------------------------------------
-    // Simatic S5 time
-    // Base time 10,100,1000,10000 mseg.
-    // -----------------------------------------
-    S5TIME(0x0C, "W", 1, WORD, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
-
-    // -----------------------------------------
-    // Date and time of day
-    // -----------------------------------------
-    DT(0x02, "X", 8, BYTE, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.S7_1500, S7ControllerType.S7_300, S7ControllerType.S7_400),
-    DATE_AND_TIME(0x02, "X", 8, BYTE, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.S7_1500, S7ControllerType.S7_300, S7ControllerType.S7_400),
-
-    // -----------------------------------------
-    // ASCII Strings
-    // -----------------------------------------
-    // Single-byte character
-    CHAR(0x03, "B", 1, null, DataTransportSize.OCTET_STRING, S7ControllerType.ANY),
-    // Double-byte character
-    // TODO: Find the code (Perhaps 0x13)
-    WCHAR(0x13, "B", 2, null, null, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
-    // Variable-length single-byte character string
-    STRING(0x03, "B", 1, null, DataTransportSize.OCTET_STRING, S7ControllerType.ANY),
-    // Variable-length double-byte character string
-    // TODO: Find the code (Perhaps 0x13)
-    WSTRING(0x00, "B", 1, null, DataTransportSize.OCTET_STRING, S7ControllerType.S7_1200, S7ControllerType.S7_1500);
-
-    /* TO BE CONTINUED */
-
-    // Codes and their types:
-    // 0x1C: Counter
-    // 0x1D: Timer
-    // 0x1E: IEC Timer
-    // 0x1F: IEC Counter
-    // 0x20: HS Counter
-    //
-
-    private static final Map<Byte, TransportSize> map;
-    static {
-        map = new HashMap<>();
-        for (TransportSize dataType : TransportSize.values()) {
-            map.put(dataType.typeCode, dataType);
-        }
-    }
-
-    private final byte typeCode;
-    private final String sizeCode;
-    private final int sizeInBytes;
-    private final Set<S7ControllerType> supportedControllerTypes;
-    private final TransportSize baseType;
-    private final DataTransportSize dataTransportSize;
-
-    TransportSize(int typeCode, String sizeCode, int sizeInBytes, TransportSize baseType, DataTransportSize dataTransportSize,
-                  S7ControllerType... supportedControllerTypes) {
-        this.typeCode = (byte) typeCode;
-        this.sizeCode = sizeCode;
-        this.sizeInBytes = sizeInBytes;
-        this.supportedControllerTypes = new HashSet<>(Arrays.asList(supportedControllerTypes));
-        this.baseType = baseType;
-        this.dataTransportSize = dataTransportSize;
-    }
-
-    public byte getTypeCode() {
-        return typeCode;
-    }
-
-    public String getSizeCode() {
-        return sizeCode;
-    }
-
-    public int getSizeInBytes() {
-        return sizeInBytes;
-    }
-
-    public boolean isBaseType() {
-        return baseType == null;
-    }
-
-    public TransportSize getBaseType() {
-        // If this is a base-type itself, the baseType is null, in all
-        // other cases it is set.
-        if (baseType == null) {
-            return this;
-        } else {
-            return baseType;
-        }
-    }
-
-    public TransportSize getSubType(String sizeCode) {
-        // Try to find a sub-type with this base type for which the size code matches.
-        for (TransportSize value : values()) {
-            if ((value.baseType == this) && (value.sizeCode != null) && (value.sizeCode.equals(sizeCode))) {
-                return value;
-            }
-        }
-        return null;
-    }
-
-    public DataTransportSize getDataTransportSize() {
-        return dataTransportSize;
-    }
-
-    boolean isControllerTypeSupported(S7ControllerType controllerType) {
-        return supportedControllerTypes.contains(controllerType);
-    }
-
-    public static TransportSize valueOf(byte code) {
-        return map.get(code);
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.*;
+import org.apache.plc4x.java.s7.types.S7ControllerType;
+
+public enum TransportSize {
+
+    /**
+     * TODO: For the types with code 0x00 we need to put some additional effort in reverse engineering the codes for these types.
+     */
+    // -----------------------------------------
+    // Single bit
+    // -----------------------------------------
+    BOOL(0x01, "X", 1, null, DataTransportSize.BIT, S7ControllerType.ANY),
+
+    // -----------------------------------------
+    // Bit strings
+    // -----------------------------------------
+    BYTE(0x02, "B", 1, null, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
+    WORD(0x04, "W", 2, null, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
+    DWORD(0x06, "D", 4, null, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
+    // Only got a basic TIA license (S7-1500 needed to find this out)
+    // TODO: Find the code
+    LWORD(0x00, "X", 8, null, null, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
+
+    // -----------------------------------------
+    // Integers
+    // -----------------------------------------
+    // Signed Int
+    INT(0x05, "W", 2, null, DataTransportSize.INTEGER, S7ControllerType.ANY),
+    // Unsigned Int
+    UINT(0x05, "W", 2, INT, DataTransportSize.INTEGER, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
+    // (Signed) Small Int
+    SINT(0x02, "B", 1, INT, DataTransportSize.INTEGER, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
+    // Unsigned Small Int
+    USINT(0x02, "B", 1, INT, DataTransportSize.INTEGER, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
+    // Double Precision Int
+    DINT(0x07, "D", 4, null, DataTransportSize.INTEGER, S7ControllerType.ANY),
+    // Unsigned Double Precision Int
+    UDINT(0x07, "D", 4, INT, DataTransportSize.INTEGER, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
+    // Only got a basic TIA license (S7-1500 needed to find this out)
+    // TODO: Find the code
+    LINT(0x00, "X", 8, INT, null, S7ControllerType.S7_1500),
+    // Only got a basic TIA license (S7-1500 needed to find this out)
+    // TODO: Find the code
+    ULINT(0x00, "X", 16, INT, null, S7ControllerType.S7_1500),
+
+    // -----------------------------------------
+    // Reals
+    // -----------------------------------------
+    REAL(0x08, "D", 4, null, DataTransportSize.REAL, S7ControllerType.ANY),
+    // TODO: Find the code
+    LREAL(0x00, "X", 8, REAL, null, S7ControllerType.S7_1200, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
+
+    // -----------------------------------------
+    // Durations
+    // -----------------------------------------
+    // IEC time
+    TIME(0x0B, "D", 1, DWORD, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
+    // TODO: Find the code
+    LTIME(0x00, "X", 8, TIME, null, S7ControllerType.S7_1500),
+
+    // -----------------------------------------
+    // Date
+    // -----------------------------------------
+    // IEC date (yyyy-m-d)
+    DATE(0x02, "W", 1, WORD, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
+
+    // -----------------------------------------
+    // Time of day
+    // -----------------------------------------
+    // Time (hh:mm:ss.S)
+    TOD(0x02, "D", 4, BYTE, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
+    TIME_OF_DAY(0x02, "D", 4, BYTE, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
+    
+    // -----------------------------------------
+    // Simatic S5 time
+    // Base time 10,100,1000,10000 mseg.
+    // -----------------------------------------
+    S5TIME(0x0C, "W", 1, WORD, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
+
+    // -----------------------------------------
+    // Date and time of day
+    // -----------------------------------------
+    DT(0x02, "X", 8, BYTE, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.S7_1500, S7ControllerType.S7_300, S7ControllerType.S7_400),
+    DATE_AND_TIME(0x02, "X", 8, BYTE, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.S7_1500, S7ControllerType.S7_300, S7ControllerType.S7_400),
+
+    // -----------------------------------------
+    // ASCII Strings
+    // -----------------------------------------
+    // Single-byte character
+    CHAR(0x03, "B", 1, null, DataTransportSize.OCTET_STRING, S7ControllerType.ANY),
+    // Double-byte character
+    // TODO: Find the code (Perhaps 0x13)
+    WCHAR(0x13, "B", 2, null, null, S7ControllerType.S7_1200, S7ControllerType.S7_1500),
+    // Variable-length single-byte character string
+    STRING(0x03, "B", 1, null, DataTransportSize.OCTET_STRING, S7ControllerType.ANY),
+    // Variable-length double-byte character string
+    // TODO: Find the code (Perhaps 0x13)
+    WSTRING(0x00, "B", 1, null, DataTransportSize.OCTET_STRING, S7ControllerType.S7_1200, S7ControllerType.S7_1500);
+
+    /* TO BE CONTINUED */
+
+    // Codes and their types:
+    // 0x1C: Counter
+    // 0x1D: Timer
+    // 0x1E: IEC Timer
+    // 0x1F: IEC Counter
+    // 0x20: HS Counter
+    //
+
+    private static final Map<Byte, TransportSize> map;
+    static {
+        map = new HashMap<>();
+        for (TransportSize dataType : TransportSize.values()) {
+            map.put(dataType.typeCode, dataType);
+        }
+    }
+
+    private final byte typeCode;
+    private final String sizeCode;
+    private final int sizeInBytes;
+    private final Set<S7ControllerType> supportedControllerTypes;
+    private final TransportSize baseType;
+    private final DataTransportSize dataTransportSize;
+
+    TransportSize(int typeCode, String sizeCode, int sizeInBytes, TransportSize baseType, DataTransportSize dataTransportSize,
+                  S7ControllerType... supportedControllerTypes) {
+        this.typeCode = (byte) typeCode;
+        this.sizeCode = sizeCode;
+        this.sizeInBytes = sizeInBytes;
+        this.supportedControllerTypes = new HashSet<>(Arrays.asList(supportedControllerTypes));
+        this.baseType = baseType;
+        this.dataTransportSize = dataTransportSize;
+    }
+
+    public byte getTypeCode() {
+        return typeCode;
+    }
+
+    public String getSizeCode() {
+        return sizeCode;
+    }
+
+    public int getSizeInBytes() {
+        return sizeInBytes;
+    }
+
+    public boolean isBaseType() {
+        return baseType == null;
+    }
+
+    public TransportSize getBaseType() {
+        // If this is a base-type itself, the baseType is null, in all
+        // other cases it is set.
+        if (baseType == null) {
+            return this;
+        } else {
+            return baseType;
+        }
+    }
+
+    public TransportSize getSubType(String sizeCode) {
+        // Try to find a sub-type with this base type for which the size code matches.
+        for (TransportSize value : values()) {
+            if ((value.baseType == this) && (value.sizeCode != null) && (value.sizeCode.equals(sizeCode))) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public DataTransportSize getDataTransportSize() {
+        return dataTransportSize;
+    }
+
+    boolean isControllerTypeSupported(S7ControllerType controllerType) {
+        return supportedControllerTypes.contains(controllerType);
+    }
+
+    public static TransportSize valueOf(byte code) {
+        return map.get(code);
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/VariableAddressingMode.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/VariableAddressingMode.java
index 0e5b241ab61..dceb1d750ba 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/VariableAddressingMode.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/VariableAddressingMode.java
@@ -1,65 +1,65 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.model.types;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * (Values determined by evaluating generated ".pcap" files)
- * Renamed from "SyntaxId".
- * 
- * Is the same DataItemSyntaxIdType
- */
-public enum VariableAddressingMode {
-    S7ANY((byte) 0x10),
-    PBC_R_ID((byte) 0x13),
-    ALARM_LOCKFREE((byte) 0x15),
-    ALARM_IND((byte) 0x16),
-    ALARM_ACK((byte) 0x19),
-    ALARM_QUERYREQ((byte) 0x1a),
-    NOTIFY_IND((byte) 0x1c),
-    NIC((byte) 0x82),
-    DRIVEESANY((byte) 0xa2),
-    DBREAD((byte) 0xb0),
-    SYM1200((byte) 0xb2); /* Renamed from "1200SYM" */
-
-    private static final Map<Byte, VariableAddressingMode> map;
-    static {
-        map = new HashMap<>();
-        for (VariableAddressingMode variableAddressingMode : VariableAddressingMode.values()) {
-            map.put(variableAddressingMode.code, variableAddressingMode);
-        }
-    }
-
-    private final byte code;
-
-    VariableAddressingMode(byte code) {
-        this.code = code;
-    }
-
-    public byte getCode() {
-        return code;
-    }
-
-    public static VariableAddressingMode valueOf(byte code) {
-        return map.get(code);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * (Values determined by evaluating generated ".pcap" files)
+ * Renamed from "SyntaxId".
+ * 
+ * Is the same DataItemSyntaxIdType
+ */
+public enum VariableAddressingMode {
+    S7ANY((byte) 0x10),
+    PBC_R_ID((byte) 0x13),
+    ALARM_LOCKFREE((byte) 0x15),
+    ALARM_IND((byte) 0x16),
+    ALARM_ACK((byte) 0x19),
+    ALARM_QUERYREQ((byte) 0x1a),
+    NOTIFY_IND((byte) 0x1c),
+    NIC((byte) 0x82),
+    DRIVEESANY((byte) 0xa2),
+    DBREAD((byte) 0xb0),
+    SYM1200((byte) 0xb2); /* Renamed from "1200SYM" */
+
+    private static final Map<Byte, VariableAddressingMode> map;
+    static {
+        map = new HashMap<>();
+        for (VariableAddressingMode variableAddressingMode : VariableAddressingMode.values()) {
+            map.put(variableAddressingMode.code, variableAddressingMode);
+        }
+    }
+
+    private final byte code;
+
+    VariableAddressingMode(byte code) {
+        this.code = code;
+    }
+
+    public byte getCode() {
+        return code;
+    }
+
+    public static VariableAddressingMode valueOf(byte code) {
+        return map.get(code);
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessor.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessor.java
index 5e1e77e36df..60b1da3d7e8 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessor.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessor.java
@@ -1,526 +1,526 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.strategies;
-
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.commons.lang3.NotImplementedException;
-import org.apache.plc4x.java.api.exceptions.PlcException;
-import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.base.messages.PlcProtocolMessage;
-import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
-import org.apache.plc4x.java.s7.netty.model.messages.S7ResponseMessage;
-import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
-import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
-import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
-import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
-import org.apache.plc4x.java.s7.netty.model.types.MessageType;
-import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
-import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
-import org.apache.plc4x.java.s7.netty.util.S7RequestSizeCalculator;
-import org.apache.plc4x.java.s7.netty.util.S7ResponseSizeEstimator;
-
-/**
- * While a SetupCommunication message is no problem, when reading or writing data,
- * situations could arise that have to be handled. The following situations have to
- * be handled:
- * - The number of request items is so big, that the resulting PDU would exceed the
- *   agreed upon PDU size: The request has to be split up into multiple requests.
- * - If large blocks of data are requested by request items the result of a request
- *   could exceed the PDU size: The requests has to be split up into multiple requests
- *   where each requests response doesn't exceed the PDU size.
- *
- * The following optimizations should be implemented:
- * - If blocks are read which are in near proximity to each other it could be better
- *   to replace multiple requests by one that includes multiple blocks.
- * - Rearranging the order of request items could reduce the number of needed PDUs.
- */
-public class DefaultS7MessageProcessor implements S7MessageProcessor {
-
-    private AtomicInteger tpduRefGen;
-
-    public DefaultS7MessageProcessor() {
-        this.tpduRefGen = new AtomicInteger(1);
-    }
-
-    @Override
-    public Collection<S7RequestMessage> processRequest(S7RequestMessage request, int pduSize) throws PlcException {
-        // The following considerations have to be taken into account:
-        // - The size of all parameters and payloads of a message cannot exceed the negotiated PDU size
-        // - When reading data, the size of the returned data cannot exceed the negotiated PDU size
-        //
-        // Examples:
-        // - Size of the request exceeds the maximum
-        //  When having a negotiated max PDU size of 256, the maximum size of individual addresses can be at most 18
-        //  If more are sent, the S7 will respond with a frame error.
-        // - Size of the response exceeds the maximum
-        //  When reading two Strings of each 200 bytes length, the size of the request is ok, however the PLC would
-        //  have to send back 400 bytes of String data, which would exceed the PDU size. In this case the first String
-        //  is correctly returned, but for the second item the PLC will return a code of 0x03 = Access Denied
-        // - A S7 device doesn't seem to accept more than one write item. So if we are doing write operations, we
-        //  have to split that up into one message per written item. This also seems to affect arrays. So if
-        //  an array of values is written, we have to also split up that array into single writes.
-
-        Optional<VarParameter> varParameterOptional = request.getParameter(VarParameter.class);
-        if (varParameterOptional.isPresent()) {
-            VarParameter varParameter = varParameterOptional.get();
-
-            // If this is a read operation, try to get as many items in as possible.
-            if(varParameter.getType() == ParameterType.READ_VAR) {
-                return processReadVarParameter(request, varParameter, pduSize).getRequestMessages();
-            }
-
-            // If this is a write operation, split up every array item into single value items
-            // and every item into a separate message.
-            else if(varParameter.getType() == ParameterType.WRITE_VAR) {
-                return processWriteVarParameter(request, varParameter).getRequestMessages();
-            }
-        }
-
-        return Collections.singletonList(request);
-    }
-
-    private S7CompositeRequestMessage processReadVarParameter(S7RequestMessage request, VarParameter varParameter, int pduSize) {
-        // Create a new composite request message.
-        S7CompositeRequestMessage compositeRequestMessage = new S7CompositeRequestMessage(request);
-
-        // Create a var parameter without any items (yet).
-        VarParameter subVarParameter = new VarParameter(varParameter.getType(), new LinkedList<>());
-
-        // Create a sub message with only this empty parameter.
-        S7RequestMessage subMessage = new S7RequestMessage(
-            request.getMessageType(), (short) tpduRefGen.getAndIncrement(),
-            Collections.singletonList(subVarParameter), Collections.emptyList(), compositeRequestMessage);
-
-        // Add this sub-message to the composite.
-        compositeRequestMessage.addRequestMessage(subMessage);
-
-        // This calculates the size of the header for the request and response.
-        int initialRequestSize = S7RequestSizeCalculator.getRequestMessageSize(subMessage);
-        int curRequestSize = initialRequestSize;
-        int initialResponseSize = S7ResponseSizeEstimator.getEstimatedResponseMessageSize(subMessage);
-        int curResponseSize = initialResponseSize;
-
-        VarParameter preProcessedVarParameter = new VarParameter(varParameter.getType(), new LinkedList<>());
-        for (VarParameterItem varParameterItem : varParameter.getItems()) {
-            // Use the S7RequestSizeCalculator to calculate the actual and estimated item sizes.
-            int itemRequestSize = S7RequestSizeCalculator.getRequestItemTotalSize(
-                varParameterItem, null);
-            int itemResponseSize = S7ResponseSizeEstimator.getEstimatedResponseReadItemTotalSize(
-                varParameterItem, null);
-
-            // If the item would not fit into a separate message, we have to split it.
-            if((initialRequestSize + itemRequestSize > pduSize) || (initialResponseSize + itemResponseSize > pduSize)) {
-                // The max response size is the size of the empty response, plus the type and num-items (each one byte) of one VarParameter, plus the size of the header one VarPayloadItem
-                int maxResponseSize = pduSize - (initialResponseSize + 2 + 4);
-
-                S7AnyVarParameterItem s7AnyVarParameterItem = ((S7AnyVarParameterItem) varParameterItem);
-                int maxNumElements = (int) Math.floor(
-                    (double) maxResponseSize / (double) s7AnyVarParameterItem.getDataType().getSizeInBytes());
-                int sizeMaxNumElementInBytes = maxNumElements * s7AnyVarParameterItem.getDataType().getSizeInBytes();
-                int remainingNumElements = s7AnyVarParameterItem.getNumElements();
-                int curByteOffset = s7AnyVarParameterItem.getByteOffset();
-
-                while(remainingNumElements > 0) {
-                    int numCurElements = Math.min(remainingNumElements, maxNumElements);
-                    VarParameterItem subVarParameterItem = new S7AnyVarParameterItem(
-                        s7AnyVarParameterItem.getSpecificationType(), s7AnyVarParameterItem.getMemoryArea(),
-                        s7AnyVarParameterItem.getDataType(), numCurElements, s7AnyVarParameterItem.getDataBlockNumber(),
-                        curByteOffset, (byte) 0);
-                    preProcessedVarParameter.getItems().add(subVarParameterItem);
-
-                    remainingNumElements -= maxNumElements;
-                    curByteOffset += sizeMaxNumElementInBytes;
-                }
-            }
-            // In all other cases, just forward the item.
-            else {
-                preProcessedVarParameter.getItems().add(varParameterItem);
-            }
-        }
-
-        // For each var item of the original request, try adding them to the current sub-message
-        // as long as it or the resulting response does not exceed the max PDU size.
-        for (VarParameterItem varParameterItem : preProcessedVarParameter.getItems()) {
-            // Use the S7RequestSizeCalculator to calculate the actual and estimated item sizes.
-            int itemRequestSize = S7RequestSizeCalculator.getRequestItemTotalSize(
-                varParameterItem, null);
-            int itemResponseSize = S7ResponseSizeEstimator.getEstimatedResponseReadItemTotalSize(
-                varParameterItem, null);
-
-            // If adding this item, would exceed either the request or response size,
-            // create a new sub-message and add this item to that.
-            if ((curRequestSize + itemRequestSize > pduSize) || (curResponseSize + itemResponseSize > pduSize)) {
-                // Create a new var parameter without any items (yet).
-                subVarParameter = new VarParameter(varParameter.getType(), new LinkedList<>());
-
-                // Create a new sub message with only this empty parameter.
-                subMessage = new S7RequestMessage(
-                    request.getMessageType(), (short) tpduRefGen.getAndIncrement(),
-                    Collections.singletonList(subVarParameter),
-                    Collections.emptyList(), compositeRequestMessage);
-
-                // Reset the message size
-                curRequestSize = S7RequestSizeCalculator.getRequestMessageSize(subMessage) + itemRequestSize;
-                curResponseSize = S7ResponseSizeEstimator.getEstimatedResponseMessageSize(subMessage) + itemResponseSize;
-
-                // Add this new sub-message to the composite.
-                compositeRequestMessage.addRequestMessage(subMessage);
-            } else {
-                // Increment the current sizes.
-                curRequestSize += itemRequestSize;
-                curResponseSize += itemResponseSize;
-            }
-
-            subVarParameter.getItems().add(varParameterItem);
-        }
-        return compositeRequestMessage;
-    }
-
-    private S7CompositeRequestMessage processWriteVarParameter(S7RequestMessage request, VarParameter varParameter)
-            throws PlcProtocolException {
-        // Create a new composite request message.
-        S7CompositeRequestMessage compositeRequestMessage = new S7CompositeRequestMessage(request);
-
-        VarPayload varPayload = request.getPayload(VarPayload.class)
-            .orElseThrow(() -> new PlcProtocolException("Expecting payloads for a write request"));
-        if(varParameter.getItems().size() != varPayload.getItems().size()) {
-            throw new PlcProtocolException("Number of items in parameter and payload don't match");
-        }
-        List<VarParameterItem> parameterItems = varParameter.getItems();
-        List<VarPayloadItem> payloadItems = varPayload.getItems();
-
-        for (int i = 0; i < parameterItems.size(); i++) {
-            VarParameterItem varParameterItem = parameterItems.get(i);
-            VarPayloadItem varPayloadItem = payloadItems.get(i);
-
-            if (varParameterItem instanceof S7AnyVarParameterItem) {
-                S7AnyVarParameterItem s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameterItem;
-                int byteOffset = s7AnyVarParameterItem.getByteOffset();
-                if (s7AnyVarParameterItem.getDataType() == TransportSize.BOOL) {
-                    processBooleanWriteVarParameter(request, varParameter, varPayload, s7AnyVarParameterItem,
-                        varPayloadItem, byteOffset, compositeRequestMessage);
-                } else {
-                    processNonBooleanWriteVarParameter(request, varParameter, varPayload, s7AnyVarParameterItem,
-                        varPayloadItem, byteOffset, compositeRequestMessage);
-                }
-            } else {
-                throw new NotImplementedException("Handling of other element types not implemented.");
-            }
-        }
-        return compositeRequestMessage;
-    }
-
-    private void processBooleanWriteVarParameter(S7RequestMessage request, VarParameter varParameter, VarPayload varPayload,
-                                         S7AnyVarParameterItem s7AnyVarParameterItem, VarPayloadItem varPayloadItem,
-                                         int byteOffset, S7CompositeRequestMessage compositeRequestMessage) {
-        int curParameterByteOffset = byteOffset;
-        byte curParameterBitOffset = s7AnyVarParameterItem.getBitOffset();
-        byte curPayloadBitOffset = 0;
-        for (int i = 0; i < s7AnyVarParameterItem.getNumElements(); i++) {
-            // Create a new message with only one single value item in the var parameter.
-            VarParameterItem item = new S7AnyVarParameterItem(
-                s7AnyVarParameterItem.getSpecificationType(),
-                s7AnyVarParameterItem.getMemoryArea(),
-                s7AnyVarParameterItem.getDataType(), (short) 1,
-                s7AnyVarParameterItem.getDataBlockNumber(),
-                curParameterByteOffset, curParameterBitOffset);
-            S7Parameter subVarParameter = new VarParameter(varParameter.getType(),
-                Collections.singletonList(item));
-
-            // Create a one-byte byte array and set it to 0x01, if the corresponding bit
-            // was 1 else set it to 0x00.
-            byte[] elementData = new byte[1];
-            short curPayloadByteOffset = (short) ((short) i / 8);
-            elementData[0] = (byte) ((varPayloadItem.getData()[curPayloadByteOffset] >> curPayloadBitOffset) & 0x01);
-
-            // Create the new payload item.
-            VarPayloadItem itemPayload = new VarPayloadItem(
-                varPayloadItem.getReturnCode(),
-                varPayloadItem.getDataTransportSize(), elementData);
-            S7Payload subVarPayload = new VarPayload(varPayload.getType(),
-                Collections.singletonList(itemPayload));
-
-            // Create a new sub message.
-            S7RequestMessage subMessage = new S7RequestMessage(
-                request.getMessageType(), (short) tpduRefGen.getAndIncrement(),
-                Collections.singletonList(subVarParameter),
-                Collections.singletonList(subVarPayload),
-                compositeRequestMessage);
-
-            // Add the new message to the composite.
-            compositeRequestMessage.addRequestMessage(subMessage);
-
-            // Calculate the new memory and bit offset.
-            curParameterBitOffset++;
-            if ((i > 0) && ((curParameterBitOffset % 8) == 0)) {
-                curParameterByteOffset++;
-                curParameterBitOffset = 0;
-            }
-            curPayloadBitOffset++;
-            if ((i > 0) && ((curPayloadBitOffset % 8) == 0)) {
-                curPayloadBitOffset = 0;
-            }
-        }
-    }
-
-    //TODO: STRING: S7 native string (kmVENEZUELA) where k=254 & m=9
-    //TODO: %MB200:BYTE[250] -> %MB200..%MB299, %MB300..%MB399, %MB400..%MB449,        
-    private void processNonBooleanWriteVarParameter(S7RequestMessage request, VarParameter varParameter, VarPayload varPayload,
-                                            S7AnyVarParameterItem s7AnyVarParameterItem, VarPayloadItem varPayloadItem,
-                                            int byteOffset, S7CompositeRequestMessage compositeRequestMessage) {
-        int curByteOffset = byteOffset;
-        int payloadPosition = 0;
-        int numElements = 1;
-        
-        //Check for size
-        if (varPayloadItem.getData().length > 100){
-            numElements = s7AnyVarParameterItem.getNumElements();
-        };
-        
-        for (int i = 0; i < numElements; i++) {
-
-            int elementSize = 1;
-            elementSize = (s7AnyVarParameterItem.getDataType() == TransportSize.STRING)?
-                    varPayloadItem.getData().length:s7AnyVarParameterItem.getDataType().getSizeInBytes();
-            
-            short auxElements = 1;
-            /*
-            auxElements = (s7AnyVarParameterItem.getDataType() == TransportSize.STRING)?
-                    (short) varPayloadItem.getData().length:(short) 0x01;            
-            */
-            // Create a new message with only one single value item in the var parameter.
-            //TODO: For ARRAYs, check the size, for break the message
-            int divisor = (s7AnyVarParameterItem.getDataType().getBaseType()== null)?
-                            s7AnyVarParameterItem.getDataType().getSizeInBytes():
-                            s7AnyVarParameterItem.getDataType().getSizeInBytes()*
-                            s7AnyVarParameterItem.getDataType().getBaseType().getSizeInBytes();
-            
-            auxElements = (short) (varPayloadItem.getData().length / divisor);
- 
-            if (auxElements != 1){
-                elementSize = varPayloadItem.getData().length;
-            }
-                                    
-            VarParameterItem itemParameter = new S7AnyVarParameterItem(
-                s7AnyVarParameterItem.getSpecificationType(),
-                s7AnyVarParameterItem.getMemoryArea(),
-                s7AnyVarParameterItem.getDataType(), auxElements,
-                s7AnyVarParameterItem.getDataBlockNumber(),
-                curByteOffset, (byte) 0);
-            
-            S7Parameter subVarParameter = new VarParameter(varParameter.getType(),
-                Collections.singletonList(itemParameter));
-
-            // Split up the big array into a separate byte-array that contains a single element.
-            byte[] elementData = new byte[elementSize];
-            System.arraycopy(varPayloadItem.getData(), payloadPosition, elementData, 0, elementSize);
-            payloadPosition += elementSize;
-
-            // Create the new payload item.
-            VarPayloadItem itemPayload = new VarPayloadItem(
-                varPayloadItem.getReturnCode(),
-                varPayloadItem.getDataTransportSize(), elementData);
-            S7Payload subVarPayload = new VarPayload(varPayload.getType(),
-                Collections.singletonList(itemPayload));
-
-            // Create a new sub message.
-            S7RequestMessage subMessage = new S7RequestMessage(
-                request.getMessageType(), (short) tpduRefGen.getAndIncrement(),
-                Collections.singletonList(subVarParameter),
-                Collections.singletonList(subVarPayload),
-                compositeRequestMessage);
-
-            // Add the new message to the composite.
-            compositeRequestMessage.addRequestMessage(subMessage);
-
-            // Calculate the new memory offset.
-            curByteOffset += elementSize;
-        }
-    }
-
-    @Override
-    public S7ResponseMessage processResponse(S7RequestMessage request, S7ResponseMessage response) {
-        // If it's a split-up message, check if all parts are now acknowledged.
-        if (request.getParent() instanceof S7CompositeRequestMessage) {
-            S7CompositeRequestMessage parent = (S7CompositeRequestMessage) request.getParent();
-
-            // Add the response to the container so we can add it's information to the composite response.
-            parent.addResponseMessage(response);
-
-            // If all parts of this split-up message are now acknowledged, create a unified
-            // response object and pass that up to the higher layers.
-            if (parent.isAcknowledged()) {
-                return getMergedResponseMessage(parent.originalRequest, parent.getResponseMessages());
-            } else {
-                return null;
-            }
-        }
-        // If it's an ordinary request, simply forward it  to the higher layers.
-        else {
-            return response;
-        }
-    }
-
-    //TODO: bad S7ResponseMessage when write ARRAYS, the payload is not the ReturnCode
-    private S7ResponseMessage getMergedResponseMessage(S7RequestMessage requestMessage,
-                                                       Collection<? extends S7ResponseMessage> responses) {
-        MessageType messageType = null;
-        short tpduReference = requestMessage.getTpduReference();
-        List<S7Parameter> s7Parameters = new LinkedList<>();
-        List<S7Payload> s7Payloads = new LinkedList<>();
-
-        Optional<VarParameter> varParameterOptional = requestMessage.getParameter(VarParameter.class);
-
-        // This is neither a read request nor a write request, just merge all parameters together.
-        if(!varParameterOptional.isPresent()) {
-            for (S7ResponseMessage response : responses) {
-                messageType = response.getMessageType();
-                s7Parameters.addAll(response.getParameters());
-                s7Payloads.addAll(response.getPayloads());
-            }
-        }
-
-        // This is a read or write request, we have to merge all the items in the var parameter.
-        else {
-            List<VarParameterItem> parameterItems = new LinkedList<>();
-            List<VarPayloadItem> payloadItems = new LinkedList<>();
-            for (S7ResponseMessage response : responses) {
-                messageType = response.getMessageType();
-                parameterItems.addAll(response.getParameter(VarParameter.class)
-                    .orElseThrow(() -> new PlcRuntimeException(
-                        "Every response of a Read message should have a VarParameter instance")).getItems());
-                Optional<VarPayload> payload = response.getPayload(VarPayload.class);
-                payload.ifPresent(varPayload -> payloadItems.addAll(varPayload.getItems()));
-            }
-
-            List<VarParameterItem> mergedParameterItems = new LinkedList<>();
-            List<VarPayloadItem> mergedPayloadItems = new LinkedList<>();
-            VarParameter varParameter = varParameterOptional.get();
-
-            int responseOffset = 0;
-            for(int i = 0; i < varParameter.getItems().size(); i++) {
-                S7AnyVarParameterItem requestItem = (S7AnyVarParameterItem) varParameter.getItems().get(i);
-
-                // Get the pairs of corresponding parameter and payload items.
-                S7AnyVarParameterItem responseParameterItem = (S7AnyVarParameterItem) parameterItems.get(0);
-                VarPayloadItem responsePayloadItem = payloadItems.get(i + responseOffset);
-
-                if(responsePayloadItem.getReturnCode() == DataTransportErrorCode.OK) {
-                    int dataOffset = (responsePayloadItem.getData() != null) ? responsePayloadItem.getData().length : 0;
-
-                    // The resulting parameter items is identical to the request parameter item.
-                    mergedParameterItems.add(requestItem);
-
-                    // The payload will have to be merged and the return codes will have to be examined.
-                    if (requestItem.getNumElements() != responseParameterItem.getNumElements()) {
-                        int itemSizeInBytes = requestItem.getDataType().getSizeInBytes();
-                        int totalSizeInBytes = requestItem.getNumElements() * itemSizeInBytes;
-
-                        if (varParameter.getType() == ParameterType.READ_VAR) {
-                            byte[] data = new byte[totalSizeInBytes];
-                            System.arraycopy(responsePayloadItem.getData(), 0, data, 0, responsePayloadItem.getData().length);
-
-                            // Now iterate over the succeeding pairs of parameters and payloads till we have
-                            // found the original number of elements.
-                            while (dataOffset < totalSizeInBytes) {
-                                responseOffset++;
-
-                                // Get the next payload item in the list.
-                                responsePayloadItem = payloadItems.get(i + responseOffset);
-
-                                // Copy the data of this item behind the previous content.
-                                if (varParameter.getType() == ParameterType.READ_VAR) {
-                                    System.arraycopy(responsePayloadItem.getData(), 0, data, dataOffset, responsePayloadItem.getData().length);
-                                    dataOffset += responsePayloadItem.getData().length;
-                                }
-                            }
-
-                            mergedPayloadItems.add(new VarPayloadItem(DataTransportErrorCode.OK,
-                                responsePayloadItem.getDataTransportSize(), data));
-                        }
-                    } else {
-                        mergedPayloadItems.add(responsePayloadItem);
-                    }
-                } else {
-                    mergedPayloadItems.add(responsePayloadItem);
-                }
-            }
-
-            s7Parameters.add(new VarParameter(varParameter.getType(), mergedParameterItems));
-            s7Payloads.add(new VarPayload(varParameter.getType(), mergedPayloadItems));
-        }
-        // TODO: The error codes are wrong
-        return new S7ResponseMessage(messageType, tpduReference, s7Parameters, s7Payloads, (byte) 0xFF, (byte) 0xFF);
-    }
-
-    static class S7CompositeRequestMessage implements PlcProtocolMessage {
-
-        private S7RequestMessage originalRequest;
-        private List<S7RequestMessage> requestMessages;
-        private List<S7ResponseMessage> responseMessages;
-
-        S7CompositeRequestMessage(S7RequestMessage originalRequest) {
-            this.originalRequest = originalRequest;
-            this.requestMessages = new LinkedList<>();
-            this.responseMessages = new LinkedList<>();
-        }
-
-        @Override
-        public PlcProtocolMessage getParent() {
-            return originalRequest;
-        }
-
-        /**
-         * A {@link S7CompositeRequestMessage} is only acknowledged, if all children are acknowledged.
-         *
-         * @return true if all children are acknowledged.
-         */
-        private boolean isAcknowledged() {
-            for (S7RequestMessage requestMessage : requestMessages) {
-                if(!requestMessage.isAcknowledged()) {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        void addRequestMessage(S7RequestMessage requestMessage) {
-            requestMessages.add(requestMessage);
-        }
-
-        public List<S7RequestMessage> getRequestMessages() {
-            return requestMessages;
-        }
-
-        private void addResponseMessage(S7ResponseMessage responseMessage) {
-            responseMessages.add(responseMessage);
-        }
-
-        public List<S7ResponseMessage> getResponseMessages() {
-            return responseMessages;
-        }
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.strategies;
+
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.commons.lang3.NotImplementedException;
+import org.apache.plc4x.java.api.exceptions.PlcException;
+import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.base.messages.PlcProtocolMessage;
+import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
+import org.apache.plc4x.java.s7.netty.model.messages.S7ResponseMessage;
+import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
+import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
+import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
+import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
+import org.apache.plc4x.java.s7.netty.model.types.MessageType;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
+import org.apache.plc4x.java.s7.netty.util.S7RequestSizeCalculator;
+import org.apache.plc4x.java.s7.netty.util.S7ResponseSizeEstimator;
+
+/**
+ * While a SetupCommunication message is no problem, when reading or writing data,
+ * situations could arise that have to be handled. The following situations have to
+ * be handled:
+ * - The number of request items is so big, that the resulting PDU would exceed the
+ *   agreed upon PDU size: The request has to be split up into multiple requests.
+ * - If large blocks of data are requested by request items the result of a request
+ *   could exceed the PDU size: The requests has to be split up into multiple requests
+ *   where each requests response doesn't exceed the PDU size.
+ *
+ * The following optimizations should be implemented:
+ * - If blocks are read which are in near proximity to each other it could be better
+ *   to replace multiple requests by one that includes multiple blocks.
+ * - Rearranging the order of request items could reduce the number of needed PDUs.
+ */
+public class DefaultS7MessageProcessor implements S7MessageProcessor {
+
+    private AtomicInteger tpduRefGen;
+
+    public DefaultS7MessageProcessor() {
+        this.tpduRefGen = new AtomicInteger(1);
+    }
+
+    @Override
+    public Collection<S7RequestMessage> processRequest(S7RequestMessage request, int pduSize) throws PlcException {
+        // The following considerations have to be taken into account:
+        // - The size of all parameters and payloads of a message cannot exceed the negotiated PDU size
+        // - When reading data, the size of the returned data cannot exceed the negotiated PDU size
+        //
+        // Examples:
+        // - Size of the request exceeds the maximum
+        //  When having a negotiated max PDU size of 256, the maximum size of individual addresses can be at most 18
+        //  If more are sent, the S7 will respond with a frame error.
+        // - Size of the response exceeds the maximum
+        //  When reading two Strings of each 200 bytes length, the size of the request is ok, however the PLC would
+        //  have to send back 400 bytes of String data, which would exceed the PDU size. In this case the first String
+        //  is correctly returned, but for the second item the PLC will return a code of 0x03 = Access Denied
+        // - A S7 device doesn't seem to accept more than one write item. So if we are doing write operations, we
+        //  have to split that up into one message per written item. This also seems to affect arrays. So if
+        //  an array of values is written, we have to also split up that array into single writes.
+
+        Optional<VarParameter> varParameterOptional = request.getParameter(VarParameter.class);
+        if (varParameterOptional.isPresent()) {
+            VarParameter varParameter = varParameterOptional.get();
+
+            // If this is a read operation, try to get as many items in as possible.
+            if(varParameter.getType() == ParameterType.READ_VAR) {
+                return processReadVarParameter(request, varParameter, pduSize).getRequestMessages();
+            }
+
+            // If this is a write operation, split up every array item into single value items
+            // and every item into a separate message.
+            else if(varParameter.getType() == ParameterType.WRITE_VAR) {
+                return processWriteVarParameter(request, varParameter).getRequestMessages();
+            }
+        }
+
+        return Collections.singletonList(request);
+    }
+
+    private S7CompositeRequestMessage processReadVarParameter(S7RequestMessage request, VarParameter varParameter, int pduSize) {
+        // Create a new composite request message.
+        S7CompositeRequestMessage compositeRequestMessage = new S7CompositeRequestMessage(request);
+
+        // Create a var parameter without any items (yet).
+        VarParameter subVarParameter = new VarParameter(varParameter.getType(), new LinkedList<>());
+
+        // Create a sub message with only this empty parameter.
+        S7RequestMessage subMessage = new S7RequestMessage(
+            request.getMessageType(), (short) tpduRefGen.getAndIncrement(),
+            Collections.singletonList(subVarParameter), Collections.emptyList(), compositeRequestMessage);
+
+        // Add this sub-message to the composite.
+        compositeRequestMessage.addRequestMessage(subMessage);
+
+        // This calculates the size of the header for the request and response.
+        int initialRequestSize = S7RequestSizeCalculator.getRequestMessageSize(subMessage);
+        int curRequestSize = initialRequestSize;
+        int initialResponseSize = S7ResponseSizeEstimator.getEstimatedResponseMessageSize(subMessage);
+        int curResponseSize = initialResponseSize;
+
+        VarParameter preProcessedVarParameter = new VarParameter(varParameter.getType(), new LinkedList<>());
+        for (VarParameterItem varParameterItem : varParameter.getItems()) {
+            // Use the S7RequestSizeCalculator to calculate the actual and estimated item sizes.
+            int itemRequestSize = S7RequestSizeCalculator.getRequestItemTotalSize(
+                varParameterItem, null);
+            int itemResponseSize = S7ResponseSizeEstimator.getEstimatedResponseReadItemTotalSize(
+                varParameterItem, null);
+
+            // If the item would not fit into a separate message, we have to split it.
+            if((initialRequestSize + itemRequestSize > pduSize) || (initialResponseSize + itemResponseSize > pduSize)) {
+                // The max response size is the size of the empty response, plus the type and num-items (each one byte) of one VarParameter, plus the size of the header one VarPayloadItem
+                int maxResponseSize = pduSize - (initialResponseSize + 2 + 4);
+
+                S7AnyVarParameterItem s7AnyVarParameterItem = ((S7AnyVarParameterItem) varParameterItem);
+                int maxNumElements = (int) Math.floor(
+                    (double) maxResponseSize / (double) s7AnyVarParameterItem.getDataType().getSizeInBytes());
+                int sizeMaxNumElementInBytes = maxNumElements * s7AnyVarParameterItem.getDataType().getSizeInBytes();
+                int remainingNumElements = s7AnyVarParameterItem.getNumElements();
+                int curByteOffset = s7AnyVarParameterItem.getByteOffset();
+
+                while(remainingNumElements > 0) {
+                    int numCurElements = Math.min(remainingNumElements, maxNumElements);
+                    VarParameterItem subVarParameterItem = new S7AnyVarParameterItem(
+                        s7AnyVarParameterItem.getSpecificationType(), s7AnyVarParameterItem.getMemoryArea(),
+                        s7AnyVarParameterItem.getDataType(), numCurElements, s7AnyVarParameterItem.getDataBlockNumber(),
+                        curByteOffset, (byte) 0);
+                    preProcessedVarParameter.getItems().add(subVarParameterItem);
+
+                    remainingNumElements -= maxNumElements;
+                    curByteOffset += sizeMaxNumElementInBytes;
+                }
+            }
+            // In all other cases, just forward the item.
+            else {
+                preProcessedVarParameter.getItems().add(varParameterItem);
+            }
+        }
+
+        // For each var item of the original request, try adding them to the current sub-message
+        // as long as it or the resulting response does not exceed the max PDU size.
+        for (VarParameterItem varParameterItem : preProcessedVarParameter.getItems()) {
+            // Use the S7RequestSizeCalculator to calculate the actual and estimated item sizes.
+            int itemRequestSize = S7RequestSizeCalculator.getRequestItemTotalSize(
+                varParameterItem, null);
+            int itemResponseSize = S7ResponseSizeEstimator.getEstimatedResponseReadItemTotalSize(
+                varParameterItem, null);
+
+            // If adding this item, would exceed either the request or response size,
+            // create a new sub-message and add this item to that.
+            if ((curRequestSize + itemRequestSize > pduSize) || (curResponseSize + itemResponseSize > pduSize)) {
+                // Create a new var parameter without any items (yet).
+                subVarParameter = new VarParameter(varParameter.getType(), new LinkedList<>());
+
+                // Create a new sub message with only this empty parameter.
+                subMessage = new S7RequestMessage(
+                    request.getMessageType(), (short) tpduRefGen.getAndIncrement(),
+                    Collections.singletonList(subVarParameter),
+                    Collections.emptyList(), compositeRequestMessage);
+
+                // Reset the message size
+                curRequestSize = S7RequestSizeCalculator.getRequestMessageSize(subMessage) + itemRequestSize;
+                curResponseSize = S7ResponseSizeEstimator.getEstimatedResponseMessageSize(subMessage) + itemResponseSize;
+
+                // Add this new sub-message to the composite.
+                compositeRequestMessage.addRequestMessage(subMessage);
+            } else {
+                // Increment the current sizes.
+                curRequestSize += itemRequestSize;
+                curResponseSize += itemResponseSize;
+            }
+
+            subVarParameter.getItems().add(varParameterItem);
+        }
+        return compositeRequestMessage;
+    }
+
+    private S7CompositeRequestMessage processWriteVarParameter(S7RequestMessage request, VarParameter varParameter)
+            throws PlcProtocolException {
+        // Create a new composite request message.
+        S7CompositeRequestMessage compositeRequestMessage = new S7CompositeRequestMessage(request);
+
+        VarPayload varPayload = request.getPayload(VarPayload.class)
+            .orElseThrow(() -> new PlcProtocolException("Expecting payloads for a write request"));
+        if(varParameter.getItems().size() != varPayload.getItems().size()) {
+            throw new PlcProtocolException("Number of items in parameter and payload don't match");
+        }
+        List<VarParameterItem> parameterItems = varParameter.getItems();
+        List<VarPayloadItem> payloadItems = varPayload.getItems();
+
+        for (int i = 0; i < parameterItems.size(); i++) {
+            VarParameterItem varParameterItem = parameterItems.get(i);
+            VarPayloadItem varPayloadItem = payloadItems.get(i);
+
+            if (varParameterItem instanceof S7AnyVarParameterItem) {
+                S7AnyVarParameterItem s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameterItem;
+                int byteOffset = s7AnyVarParameterItem.getByteOffset();
+                if (s7AnyVarParameterItem.getDataType() == TransportSize.BOOL) {
+                    processBooleanWriteVarParameter(request, varParameter, varPayload, s7AnyVarParameterItem,
+                        varPayloadItem, byteOffset, compositeRequestMessage);
+                } else {
+                    processNonBooleanWriteVarParameter(request, varParameter, varPayload, s7AnyVarParameterItem,
+                        varPayloadItem, byteOffset, compositeRequestMessage);
+                }
+            } else {
+                throw new NotImplementedException("Handling of other element types not implemented.");
+            }
+        }
+        return compositeRequestMessage;
+    }
+
+    private void processBooleanWriteVarParameter(S7RequestMessage request, VarParameter varParameter, VarPayload varPayload,
+                                         S7AnyVarParameterItem s7AnyVarParameterItem, VarPayloadItem varPayloadItem,
+                                         int byteOffset, S7CompositeRequestMessage compositeRequestMessage) {
+        int curParameterByteOffset = byteOffset;
+        byte curParameterBitOffset = s7AnyVarParameterItem.getBitOffset();
+        byte curPayloadBitOffset = 0;
+        for (int i = 0; i < s7AnyVarParameterItem.getNumElements(); i++) {
+            // Create a new message with only one single value item in the var parameter.
+            VarParameterItem item = new S7AnyVarParameterItem(
+                s7AnyVarParameterItem.getSpecificationType(),
+                s7AnyVarParameterItem.getMemoryArea(),
+                s7AnyVarParameterItem.getDataType(), (short) 1,
+                s7AnyVarParameterItem.getDataBlockNumber(),
+                curParameterByteOffset, curParameterBitOffset);
+            S7Parameter subVarParameter = new VarParameter(varParameter.getType(),
+                Collections.singletonList(item));
+
+            // Create a one-byte byte array and set it to 0x01, if the corresponding bit
+            // was 1 else set it to 0x00.
+            byte[] elementData = new byte[1];
+            short curPayloadByteOffset = (short) ((short) i / 8);
+            elementData[0] = (byte) ((varPayloadItem.getData()[curPayloadByteOffset] >> curPayloadBitOffset) & 0x01);
+
+            // Create the new payload item.
+            VarPayloadItem itemPayload = new VarPayloadItem(
+                varPayloadItem.getReturnCode(),
+                varPayloadItem.getDataTransportSize(), elementData);
+            S7Payload subVarPayload = new VarPayload(varPayload.getType(),
+                Collections.singletonList(itemPayload));
+
+            // Create a new sub message.
+            S7RequestMessage subMessage = new S7RequestMessage(
+                request.getMessageType(), (short) tpduRefGen.getAndIncrement(),
+                Collections.singletonList(subVarParameter),
+                Collections.singletonList(subVarPayload),
+                compositeRequestMessage);
+
+            // Add the new message to the composite.
+            compositeRequestMessage.addRequestMessage(subMessage);
+
+            // Calculate the new memory and bit offset.
+            curParameterBitOffset++;
+            if ((i > 0) && ((curParameterBitOffset % 8) == 0)) {
+                curParameterByteOffset++;
+                curParameterBitOffset = 0;
+            }
+            curPayloadBitOffset++;
+            if ((i > 0) && ((curPayloadBitOffset % 8) == 0)) {
+                curPayloadBitOffset = 0;
+            }
+        }
+    }
+
+    //TODO: STRING: S7 native string (kmVENEZUELA) where k=254 & m=9
+    //TODO: %MB200:BYTE[250] -> %MB200..%MB299, %MB300..%MB399, %MB400..%MB449,        
+    private void processNonBooleanWriteVarParameter(S7RequestMessage request, VarParameter varParameter, VarPayload varPayload,
+                                            S7AnyVarParameterItem s7AnyVarParameterItem, VarPayloadItem varPayloadItem,
+                                            int byteOffset, S7CompositeRequestMessage compositeRequestMessage) {
+        int curByteOffset = byteOffset;
+        int payloadPosition = 0;
+        int numElements = 1;
+        
+        //Check for size
+        if (varPayloadItem.getData().length > 100){
+            numElements = s7AnyVarParameterItem.getNumElements();
+        };
+        
+        for (int i = 0; i < numElements; i++) {
+
+            int elementSize = 1;
+            elementSize = (s7AnyVarParameterItem.getDataType() == TransportSize.STRING)?
+                    varPayloadItem.getData().length:s7AnyVarParameterItem.getDataType().getSizeInBytes();
+            
+            short auxElements = 1;
+            /*
+            auxElements = (s7AnyVarParameterItem.getDataType() == TransportSize.STRING)?
+                    (short) varPayloadItem.getData().length:(short) 0x01;            
+            */
+            // Create a new message with only one single value item in the var parameter.
+            //TODO: For ARRAYs, check the size, for break the message
+            int divisor = (s7AnyVarParameterItem.getDataType().getBaseType()== null)?
+                            s7AnyVarParameterItem.getDataType().getSizeInBytes():
+                            s7AnyVarParameterItem.getDataType().getSizeInBytes()*
+                            s7AnyVarParameterItem.getDataType().getBaseType().getSizeInBytes();
+            
+            auxElements = (short) (varPayloadItem.getData().length / divisor);
+ 
+            if (auxElements != 1){
+                elementSize = varPayloadItem.getData().length;
+            }
+                                    
+            VarParameterItem itemParameter = new S7AnyVarParameterItem(
+                s7AnyVarParameterItem.getSpecificationType(),
+                s7AnyVarParameterItem.getMemoryArea(),
+                s7AnyVarParameterItem.getDataType(), auxElements,
+                s7AnyVarParameterItem.getDataBlockNumber(),
+                curByteOffset, (byte) 0);
+            
+            S7Parameter subVarParameter = new VarParameter(varParameter.getType(),
+                Collections.singletonList(itemParameter));
+
+            // Split up the big array into a separate byte-array that contains a single element.
+            byte[] elementData = new byte[elementSize];
+            System.arraycopy(varPayloadItem.getData(), payloadPosition, elementData, 0, elementSize);
+            payloadPosition += elementSize;
+
+            // Create the new payload item.
+            VarPayloadItem itemPayload = new VarPayloadItem(
+                varPayloadItem.getReturnCode(),
+                varPayloadItem.getDataTransportSize(), elementData);
+            S7Payload subVarPayload = new VarPayload(varPayload.getType(),
+                Collections.singletonList(itemPayload));
+
+            // Create a new sub message.
+            S7RequestMessage subMessage = new S7RequestMessage(
+                request.getMessageType(), (short) tpduRefGen.getAndIncrement(),
+                Collections.singletonList(subVarParameter),
+                Collections.singletonList(subVarPayload),
+                compositeRequestMessage);
+
+            // Add the new message to the composite.
+            compositeRequestMessage.addRequestMessage(subMessage);
+
+            // Calculate the new memory offset.
+            curByteOffset += elementSize;
+        }
+    }
+
+    @Override
+    public S7ResponseMessage processResponse(S7RequestMessage request, S7ResponseMessage response) {
+        // If it's a split-up message, check if all parts are now acknowledged.
+        if (request.getParent() instanceof S7CompositeRequestMessage) {
+            S7CompositeRequestMessage parent = (S7CompositeRequestMessage) request.getParent();
+
+            // Add the response to the container so we can add it's information to the composite response.
+            parent.addResponseMessage(response);
+
+            // If all parts of this split-up message are now acknowledged, create a unified
+            // response object and pass that up to the higher layers.
+            if (parent.isAcknowledged()) {
+                return getMergedResponseMessage(parent.originalRequest, parent.getResponseMessages());
+            } else {
+                return null;
+            }
+        }
+        // If it's an ordinary request, simply forward it  to the higher layers.
+        else {
+            return response;
+        }
+    }
+
+    //TODO: bad S7ResponseMessage when write ARRAYS, the payload is not the ReturnCode
+    private S7ResponseMessage getMergedResponseMessage(S7RequestMessage requestMessage,
+                                                       Collection<? extends S7ResponseMessage> responses) {
+        MessageType messageType = null;
+        short tpduReference = requestMessage.getTpduReference();
+        List<S7Parameter> s7Parameters = new LinkedList<>();
+        List<S7Payload> s7Payloads = new LinkedList<>();
+
+        Optional<VarParameter> varParameterOptional = requestMessage.getParameter(VarParameter.class);
+
+        // This is neither a read request nor a write request, just merge all parameters together.
+        if(!varParameterOptional.isPresent()) {
+            for (S7ResponseMessage response : responses) {
+                messageType = response.getMessageType();
+                s7Parameters.addAll(response.getParameters());
+                s7Payloads.addAll(response.getPayloads());
+            }
+        }
+
+        // This is a read or write request, we have to merge all the items in the var parameter.
+        else {
+            List<VarParameterItem> parameterItems = new LinkedList<>();
+            List<VarPayloadItem> payloadItems = new LinkedList<>();
+            for (S7ResponseMessage response : responses) {
+                messageType = response.getMessageType();
+                parameterItems.addAll(response.getParameter(VarParameter.class)
+                    .orElseThrow(() -> new PlcRuntimeException(
+                        "Every response of a Read message should have a VarParameter instance")).getItems());
+                Optional<VarPayload> payload = response.getPayload(VarPayload.class);
+                payload.ifPresent(varPayload -> payloadItems.addAll(varPayload.getItems()));
+            }
+
+            List<VarParameterItem> mergedParameterItems = new LinkedList<>();
+            List<VarPayloadItem> mergedPayloadItems = new LinkedList<>();
+            VarParameter varParameter = varParameterOptional.get();
+
+            int responseOffset = 0;
+            for(int i = 0; i < varParameter.getItems().size(); i++) {
+                S7AnyVarParameterItem requestItem = (S7AnyVarParameterItem) varParameter.getItems().get(i);
+
+                // Get the pairs of corresponding parameter and payload items.
+                S7AnyVarParameterItem responseParameterItem = (S7AnyVarParameterItem) parameterItems.get(0);
+                VarPayloadItem responsePayloadItem = payloadItems.get(i + responseOffset);
+
+                if(responsePayloadItem.getReturnCode() == DataTransportErrorCode.OK) {
+                    int dataOffset = (responsePayloadItem.getData() != null) ? responsePayloadItem.getData().length : 0;
+
+                    // The resulting parameter items is identical to the request parameter item.
+                    mergedParameterItems.add(requestItem);
+
+                    // The payload will have to be merged and the return codes will have to be examined.
+                    if (requestItem.getNumElements() != responseParameterItem.getNumElements()) {
+                        int itemSizeInBytes = requestItem.getDataType().getSizeInBytes();
+                        int totalSizeInBytes = requestItem.getNumElements() * itemSizeInBytes;
+
+                        if (varParameter.getType() == ParameterType.READ_VAR) {
+                            byte[] data = new byte[totalSizeInBytes];
+                            System.arraycopy(responsePayloadItem.getData(), 0, data, 0, responsePayloadItem.getData().length);
+
+                            // Now iterate over the succeeding pairs of parameters and payloads till we have
+                            // found the original number of elements.
+                            while (dataOffset < totalSizeInBytes) {
+                                responseOffset++;
+
+                                // Get the next payload item in the list.
+                                responsePayloadItem = payloadItems.get(i + responseOffset);
+
+                                // Copy the data of this item behind the previous content.
+                                if (varParameter.getType() == ParameterType.READ_VAR) {
+                                    System.arraycopy(responsePayloadItem.getData(), 0, data, dataOffset, responsePayloadItem.getData().length);
+                                    dataOffset += responsePayloadItem.getData().length;
+                                }
+                            }
+
+                            mergedPayloadItems.add(new VarPayloadItem(DataTransportErrorCode.OK,
+                                responsePayloadItem.getDataTransportSize(), data));
+                        }
+                    } else {
+                        mergedPayloadItems.add(responsePayloadItem);
+                    }
+                } else {
+                    mergedPayloadItems.add(responsePayloadItem);
+                }
+            }
+
+            s7Parameters.add(new VarParameter(varParameter.getType(), mergedParameterItems));
+            s7Payloads.add(new VarPayload(varParameter.getType(), mergedPayloadItems));
+        }
+        // TODO: The error codes are wrong
+        return new S7ResponseMessage(messageType, tpduReference, s7Parameters, s7Payloads, (byte) 0xFF, (byte) 0xFF);
+    }
+
+    static class S7CompositeRequestMessage implements PlcProtocolMessage {
+
+        private S7RequestMessage originalRequest;
+        private List<S7RequestMessage> requestMessages;
+        private List<S7ResponseMessage> responseMessages;
+
+        S7CompositeRequestMessage(S7RequestMessage originalRequest) {
+            this.originalRequest = originalRequest;
+            this.requestMessages = new LinkedList<>();
+            this.responseMessages = new LinkedList<>();
+        }
+
+        @Override
+        public PlcProtocolMessage getParent() {
+            return originalRequest;
+        }
+
+        /**
+         * A {@link S7CompositeRequestMessage} is only acknowledged, if all children are acknowledged.
+         *
+         * @return true if all children are acknowledged.
+         */
+        private boolean isAcknowledged() {
+            for (S7RequestMessage requestMessage : requestMessages) {
+                if(!requestMessage.isAcknowledged()) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        void addRequestMessage(S7RequestMessage requestMessage) {
+            requestMessages.add(requestMessage);
+        }
+
+        public List<S7RequestMessage> getRequestMessages() {
+            return requestMessages;
+        }
+
+        private void addResponseMessage(S7ResponseMessage responseMessage) {
+            responseMessages.add(responseMessage);
+        }
+
+        public List<S7ResponseMessage> getResponseMessages() {
+            return responseMessages;
+        }
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/LongS7MessageProcessorCodec.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/LongS7MessageProcessorCodec.java
index c89beb459dc..30b39d3f458 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/LongS7MessageProcessorCodec.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/LongS7MessageProcessorCodec.java
@@ -1,655 +1,655 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.strategies;
-
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToMessageCodec;
-import io.netty.util.AttributeKey;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.plc4x.java.base.messages.PlcProtocolMessage;
-import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
-import org.apache.plc4x.java.s7.netty.model.messages.S7ResponseMessage;
-import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
-import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
-import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
-import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
-import org.apache.plc4x.java.s7.netty.model.types.MessageType;
-import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
-import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- *
- * @author cgarcia
- */
-public class LongS7MessageProcessorCodec extends
-             MessageToMessageCodec<S7ResponseMessage, S7RequestMessage>{
-    
-    private static final Logger LOGGER = LoggerFactory.getLogger(LongS7MessageProcessorCodec.class );
-    private final AttributeKey<Short> pduSizeKey = AttributeKey.valueOf("pduSizeKey");
-    private final AttributeKey<AtomicInteger> tpduGeneratorKey = AttributeKey.valueOf("tpduGeneratorKey");
-    
-    private final Map<Short, S7CompositeRequestMessage> compRequestMessages;
-    
-    private Short pduSize = 0;
-    private AtomicInteger tpduGenerator;
-
-    public LongS7MessageProcessorCodec() {
-        this.compRequestMessages = new LinkedHashMap<>(10);
-    }
-             
-    @Override
-    protected void encode(ChannelHandlerContext ctx, S7RequestMessage request, List<Object> out) throws Exception {
-        pduSize = ctx.channel().attr(pduSizeKey).get();
-        tpduGenerator = ctx.channel().attr(tpduGeneratorKey).get();
-        
-        Optional<VarParameter> varParameterOptional = request.getParameter(VarParameter.class);
-        if (varParameterOptional.isPresent()) {
-            VarParameter varParameter = varParameterOptional.get();
-            /* Requests whose size is larger than the psuSize should be 
-            *processed or if it is smaller than this but contains a number 
-            *of elements greater than 18 */
-            if ((pduSize < 1024) && (tpduGenerator != null) && (
-                    (request.getRequestSize() > pduSize) ||
-                    ((request.getRequestSize() < pduSize) && (varParameter.getItems().size() > 18)))){
-                if (varParameter.getType() == ParameterType.READ_VAR){
-                    LinkedHashMap<Short, S7RequestMessage> splitRequest = SplitLongReadRequestMessageGroup(request);
-                    out.addAll(splitRequest.values());
-                    return;                    
-                } else if(varParameter.getType() == ParameterType.WRITE_VAR){
-                    LinkedHashMap<Short, S7RequestMessage> splitRequest = SplitLongWriteRequestMessageGroup(request);
-                    out.addAll(splitRequest.values());
-                    return;
-                }
-            }       
-        }
-        out.add(request);
-    }
-
-    @Override
-    protected void decode(ChannelHandlerContext ctx, S7ResponseMessage response, List<Object> out) throws Exception {
-        S7CompositeRequestMessage compRequestMessage = compRequestMessages.get(response.getTpduReference());
-        if (compRequestMessage != null) {
-            compRequestMessage.addResponseMessage(response);
-            if (compRequestMessage.isCompleted()){
-                S7ResponseMessage res = AssemblyResponseMessage(compRequestMessage, response);
-                out.add(res);
-                return;
-            }
-        }
-        out.add(response);
-    }
-    
-    /************************************************************************
-    * SPLIT SECTION
-    ************************************************************************/
-    
-    /*
-    * This method split original S7RequestMessage using 80% rule.
-    * Another problem when tpduGenerator returns to zero (short type).
-    * TODO: split for individual item when item.size > pduSize
-    */
-    private LinkedHashMap<Short, S7RequestMessage> SplitLongWriteRequestMessageGroup(S7RequestMessage request){
-        
-        boolean firtsRow = true;
-        S7CompositeRequestMessage compRequestMessage = new S7CompositeRequestMessage(request);
-
-        compRequestMessages.put(request.getTpduReference(), compRequestMessage);
-
-        List<S7RequestMessage> splitRequests = new LinkedList<>();
-
-        Optional<VarParameter> varParameterOptional = request.getParameter(VarParameter.class);        
-        VarParameter parameters =  varParameterOptional.get();
-                
-        Optional<VarPayload> varPayloadOptional = request.getPayload(VarPayload.class); 
-        VarPayload payloads = varPayloadOptional.get();
-               
-        short itemSize = 0;
-        short actualSize = 0;
-        short maxItemSize = (short) Math.round(pduSize * 0.8);
-        
-        S7Parameter parameter = null;
-        S7Payload payload = null;
-       
-        List<VarParameterItem> parameterItems = (LinkedList)parameters.getItems();
-        List<VarPayloadItem> payloadItems  = (LinkedList)payloads.getItems();
-        List<VarParameterItem> splitParameters = new LinkedList<>();
-        List<VarPayloadItem> splitPayloads = new LinkedList<>();
-                       
-        S7AnyVarParameterItem s7AnyVarParameterItem = null;
-        
-        //No se estan generando en orden
-        Iterator<VarParameterItem> itParameter = parameterItems.iterator();
-        Iterator<VarPayloadItem> itPayload = payloadItems.iterator();
-        int i = 0;
-        while (itParameter.hasNext()) {
-                                    
-            VarParameterItem varParameterItem = itParameter.next();
-            VarPayloadItem varPayloadItem = itPayload.next();            
-                        
-            if (varParameterItem instanceof S7AnyVarParameterItem) {
-                s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameterItem;
-            }
-
-            //TODO: for odd size count the fill 0x00 byte
-            itemSize = (short)(28 + varPayloadItem.getData().length); //Header+Parameter+data
-            actualSize = (short)(28 + 14*(splitPayloads.size()));//Header+Parameter
-            for(VarPayloadItem item:splitPayloads){
-                actualSize = (short) (actualSize +item.getData().length); //+=data.length
-            };
-            
-            LOGGER.debug("SplitLongWriteRequestMessageGroup itemSize: " + itemSize + " actualSize: " + actualSize);
-            
-            //TODO: Item size is > pduSize the Split is in the user layer. 
-            if (itemSize > pduSize){
-                //TODO: Evaluate that the fractional message should be blocked 
-                //      by the next layer. The response message indicating poor 
-                //      quality must also be generated at this point.
-                if (!splitParameters.isEmpty()){
-                    PrepareMessagesToNextLayer(request.getMessageType(),
-                    parameters.getType(),
-                    splitParameters,
-                    splitPayloads,
-                    compRequestMessage); 
-                    
-                    splitParameters = new LinkedList<>();
-                    splitPayloads = new LinkedList<>();                    
-                }
-                
-                short tpdu = PrepareMessagesToNextLayer(request.getMessageType(),
-                                parameters.getType(),
-                                Collections.singletonList(varParameterItem),
-                                Collections.singletonList(varPayloadItem),
-                                compRequestMessage);                 
-                
-                VarParameter writeVarParameter = new VarParameter(parameters.getType(), 
-                        Collections.singletonList(varParameterItem));
-                VarPayload writeVarPayload = new VarPayload(parameters.getType(), 
-                        Collections.singletonList(varPayloadItem));
-                //This message generates an "error" from the PLC, which is discarded.
-                S7RequestMessage splitRequest = new S7RequestMessage(request.getMessageType(),
-                    tpdu, Collections.singletonList(writeVarParameter),
-                    Collections.EMPTY_LIST, compRequestMessage);
-                                              
-                VarParameter ackVarParameter = new VarParameter(parameters.getType(), 
-                    Collections.singletonList(
-                        new S7AnyVarParameterItem(null, null, null, 0x01, (short) 0, (short) 0, (byte) 0)));
-                VarPayload ackVarPayload = new VarPayload(parameters.getType(), 
-                        Collections.singletonList( new VarPayloadItem(DataTransportErrorCode.ACCESS_DENIED, null, null)));                
-                
-                S7ResponseMessage responseMessage = new S7ResponseMessage(
-                    MessageType.ACK_DATA, 
-                    splitRequest.getTpduReference(), 
-                    Collections.singletonList(ackVarParameter), 
-                    Collections.singletonList(ackVarPayload), 
-                    (byte) 0x81, //Application relationship 
-                    (byte) 0x04); //Service no implemented or frame error
-               /* 
-                compRequestMessage.getResponseMessages().put(
-                        responseMessage.getTpduReference(), 
-                        responseMessage);
-                */
-               
-                compRequestMessage.getRequestMessages().put(splitRequest.getTpduReference(),splitRequest);  
-                compRequestMessages.put(splitRequest.getTpduReference(), compRequestMessage);
-                //A fault response is generated, with poor quality, allowing 
-                //to follow the writing process for the other Items.
-                
-                //throw new Plc4XNettyException("Write item request size bigger than " + pduSize+
-                //            " bytes. Split the Item in smaller units."); 
-                
-            } else if ((itemSize > maxItemSize) && ((itemSize <  pduSize))){
-                //TODO: Add a S7RequestMessage to the list                               
-                PrepareMessagesToNextLayer(request.getMessageType(),
-                        parameters.getType(),
-                        splitParameters,
-                        splitPayloads,
-                        compRequestMessage); 
-                
-            } else if (!firtsRow){
-               
-                if ((((itemSize + actualSize) >= maxItemSize) && 
-                     ((itemSize + actualSize) <= pduSize)) || 
-                        (!itParameter.hasNext())){  
-                    splitParameters.add(varParameterItem);
-                    splitPayloads.add(varPayloadItem);  
-                    
-                    PrepareMessagesToNextLayer(request.getMessageType(),
-                            parameters.getType(),
-                            splitParameters,
-                            splitPayloads,
-                            compRequestMessage); 
-                    
-                    splitParameters = new LinkedList<>();
-                    splitPayloads = new LinkedList<>();
-                } else if (((itemSize + actualSize) >= pduSize)){  
-                    PrepareMessagesToNextLayer(request.getMessageType(),
-                            parameters.getType(),
-                            splitParameters,
-                            splitPayloads,
-                            compRequestMessage); 
-                    splitParameters = new LinkedList<>();
-                    splitPayloads = new LinkedList<>(); 
-                    splitParameters.add(varParameterItem);
-                    splitPayloads.add(varPayloadItem);                      
-                }
-                else {
-                    splitParameters.add(varParameterItem);
-                    splitPayloads.add(varPayloadItem);                    
-                }                
-            } else {
-                splitParameters.add(varParameterItem);
-                splitPayloads.add(varPayloadItem);
-            }
-            firtsRow = false;
-        }
-                        
-        if (!splitParameters.isEmpty()){
-            PrepareMessagesToNextLayer(request.getMessageType(),
-                    parameters.getType(),
-                    splitParameters,
-                    splitPayloads,
-                    compRequestMessage);        
-        }
-   
-        return compRequestMessage.getRequestMessages();
-    };
-
-    private LinkedHashMap<Short, S7RequestMessage> SplitLongReadRequestMessageGroup(S7RequestMessage request){
-
-        S7CompositeRequestMessage compRequestMessage = new S7CompositeRequestMessage(request);      
-        compRequestMessages.put(request.getTpduReference(), compRequestMessage);
-        
-        Optional<VarParameter> varParameterOptional = request.getParameter(VarParameter.class);        
-        VarParameter parameters =  varParameterOptional.get();                
-        
-        boolean firtsRow = true;
-        short itemSize = 0;
-        short actualSize = 0;
-        short maxItemSize = (short) Math.round(pduSize * 0.8);        
-        
-        
-        List<VarParameterItem> parameterItems = parameters.getItems();
-
-        List<VarParameterItem> splitParameters = new LinkedList<>();
-        List<VarPayloadItem> splitPayloads = new LinkedList<>();
-
-        for (int i = 0; i < parameterItems.size(); i++) {
-            
-            VarParameterItem varParameterItem = parameterItems.get(i);
-            
-            itemSize = (short)(2 + getEstimatedResponseReadVarPayloadItemSize(varParameterItem));
-            actualSize = 0;
-            for(VarParameterItem item:splitParameters){
-                actualSize = (short) (actualSize + getEstimatedResponseReadVarPayloadItemSize(item)); //+=data.length
-            };     
-            
-            //TODO: Item size is > pduSize the Split is in the user layer. 
-            if (itemSize > pduSize){
-                //TODO: Evaluate that the fractional message should be blocked 
-                //      by the next layer. The response message indicating poor 
-                //      quality must also be generated at this point.
-                if (!splitParameters.isEmpty()){
-                    PrepareMessagesToNextLayer(request.getMessageType(),
-                    parameters.getType(),
-                    splitParameters,
-                    Collections.EMPTY_LIST,
-                    compRequestMessage); 
-                    
-                    splitParameters = new LinkedList<>();
-                    splitPayloads = new LinkedList<>();                    
-                }                
-                
-                short tpdu = PrepareMessagesToNextLayer(request.getMessageType(),
-                                parameters.getType(),
-                                Collections.singletonList(varParameterItem),
-                                Collections.EMPTY_LIST,
-                                compRequestMessage);                 
-                
-                //throw new Plc4XNettyException("Read item request size bigger than " + pduSize+
-                //            " bytes. Split the Item in smaller units."); 
-                
-            } else if ((itemSize > maxItemSize) && ((itemSize <  pduSize))){
-                
-                if (!splitParameters.isEmpty()){
-                    PrepareMessagesToNextLayer(request.getMessageType(),
-                    parameters.getType(),
-                    splitParameters,
-                    Collections.EMPTY_LIST,
-                    compRequestMessage); 
-                    
-                    splitParameters = new LinkedList<>();
-                    splitPayloads = new LinkedList<>();                    
-                }                                     
-                
-                VarParameter writeVarParameter = new VarParameter(parameters.getType(), 
-                        Collections.singletonList(varParameterItem ));
-                
-                S7RequestMessage splitRequest = new S7RequestMessage(request.getMessageType(),
-                    (short) tpduGenerator.getAndIncrement(), Collections.singletonList(writeVarParameter),
-                    Collections.EMPTY_LIST, compRequestMessage);
-                
-                compRequestMessage.getRequestMessages().put(splitRequest.getTpduReference(),splitRequest);  
-                compRequestMessages.put(splitRequest.getTpduReference(), compRequestMessage); 
-                itemSize = 0;
-                
-            }  else if (!firtsRow){
-                              
-                if ((((itemSize + actualSize) >= maxItemSize) && 
-                     ((itemSize + actualSize) <= pduSize)) ||
-                       (splitParameters.size() > 16) ){  
-                      
-                    splitParameters.add(varParameterItem);
-                    
-                    VarParameter writeVarParameter = new VarParameter(parameters.getType(), splitParameters);
-
-                    S7RequestMessage splitRequest = new S7RequestMessage(request.getMessageType(),
-                        (short) tpduGenerator.getAndIncrement(), Collections.singletonList(writeVarParameter),
-                        Collections.EMPTY_LIST, compRequestMessage);
-
-                    compRequestMessage.getRequestMessages().put(splitRequest.getTpduReference(),splitRequest); 
-                    compRequestMessages.put(splitRequest.getTpduReference(), compRequestMessage);
-                    
-                    splitParameters = new LinkedList<>();                                   
-                    splitPayloads = new LinkedList<>();
-                    itemSize = 0;
-                    
-                } else if ((((itemSize + actualSize) >= maxItemSize) && 
-                     ((itemSize + actualSize) > pduSize))){ 
-                    
-                    if (!splitParameters.isEmpty()){
-                        PrepareMessagesToNextLayer(request.getMessageType(),
-                        parameters.getType(),
-                        splitParameters,
-                        Collections.EMPTY_LIST,
-                        compRequestMessage); 
-
-                        splitParameters = new LinkedList<>();
-                        splitPayloads = new LinkedList<>();                    
-                    }                                  
-                    
-                    VarParameter writeVarParameter = new VarParameter(parameters.getType(), 
-                            Collections.singletonList(varParameterItem ));
-
-                    S7RequestMessage splitRequest = new S7RequestMessage(request.getMessageType(),
-                        (short) tpduGenerator.getAndIncrement(), Collections.singletonList(writeVarParameter),
-                        Collections.EMPTY_LIST, compRequestMessage);
-
-                    compRequestMessage.getRequestMessages().put(splitRequest.getTpduReference(),splitRequest);  
-                    compRequestMessages.put(splitRequest.getTpduReference(), compRequestMessage); 
-                    itemSize = 0;
-                    
-                }  else {
-                    splitParameters.add(varParameterItem);                   
-                }                 
-                
-            } else {
-                splitParameters.add(varParameterItem);
-            }
-            
-            if((i == (parameterItems.size() - 1)) && (splitParameters.size() !=0)){
-                VarParameter writeVarParameter = new VarParameter(parameters.getType(), splitParameters);
-
-                S7RequestMessage splitRequest = new S7RequestMessage(request.getMessageType(),
-                    (short) tpduGenerator.getAndIncrement(), Collections.singletonList(writeVarParameter),
-                    Collections.EMPTY_LIST, compRequestMessage);
-
-                compRequestMessage.getRequestMessages().put(splitRequest.getTpduReference(),splitRequest); 
-                compRequestMessages.put(splitRequest.getTpduReference(), compRequestMessage);
-
-                splitParameters = new LinkedList<>();                                   
-                splitPayloads = new LinkedList<>();
-                itemSize = 0;                   
-            }
-            
-            firtsRow = false;          
-     
-        }        
-                
-        return compRequestMessage.getRequestMessages();       
-    }    
-    
-    
-    /************************************************************************
-    * ASSEMBLY RESPONSE MESSAGE
-    ************************************************************************/
-    
-    /*
-    * Try to assemble a response message from the response fragments.
-    * Since the PLC can handle at least two requests and depending on 
-    * the load of its CPUs, the response order is not granted.
-    * TODO: If the connection is lost, the queue is invalid and must be deleted.
-    * TODO: The PLC reporta error, only the header is send. 
-    *       Example Error Class 0x81, Error code 0x04
-    */
-    private S7ResponseMessage AssemblyResponseMessage(S7CompositeRequestMessage compRequestMessage, 
-            S7ResponseMessage response){
-        
-        List<S7Parameter> splitParameters = new LinkedList<>();
-        List<S7Payload> splitPayloads = new LinkedList<>();
-        List<VarPayloadItem> payloadItems = new LinkedList<>();
-        
-        ParameterType parameterType = ParameterType.WRITE_VAR;
-        int numParameters = 0x000;
-        short tpduReference = 0x0000;
-                
-        LinkedHashMap<Short, S7RequestMessage> requestMessages =
-                compRequestMessage.getRequestMessages();
-        
-        LinkedHashMap<Short, S7ResponseMessage> responseMessages =
-                compRequestMessage.getResponseMessages();
-        
-        tpduReference =((S7RequestMessage) compRequestMessage.getParent()).getTpduReference();
-        //Always the firts element is the response the pdu number    
-        Iterator<Entry<Short, S7RequestMessage>> iterRequest = requestMessages.entrySet().iterator();
-        
-        while(iterRequest.hasNext()){
-
-            Entry<Short, S7RequestMessage> itemRequest = iterRequest.next();
-            S7ResponseMessage msgResponse = (S7ResponseMessage) responseMessages.get(itemRequest.getKey());
-                        
-            //If no present we have a error code in the Header
-            Optional<VarParameter> varParameterOptional = msgResponse.getParameter(VarParameter.class); 
-            if (varParameterOptional.isPresent()){
-                VarParameter parameters =  varParameterOptional.get();
-                parameterType = parameters.getType();
-                //Como extraer los parametros del mensaje de respuesta            
-                List<VarParameterItem> varParameterItems = parameters.getItems();
-
-                S7AnyVarParameterItem s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameterItems.get(0);
-
-                numParameters += s7AnyVarParameterItem.getNumElements();
-
-                List<S7Payload> payloads = msgResponse.getPayloads();
-                
-                splitPayloads.addAll(payloads);                
-            } else {
-                //Error from PLC
-                LOGGER.info("Error for tpud " + msgResponse.getTpduReference() +
-                            " Error class: " + msgResponse.getErrorClass() +
-                            " Error code" + msgResponse.getErrorCode());
-                S7RequestMessage msgRequest = (S7RequestMessage) requestMessages.get(msgResponse.getTpduReference());
-
-                VarParameter requestParameters = (VarParameter) msgRequest.getParameters().get(0);
-                parameterType = requestParameters.getType();
-                List<VarParameterItem> varParameterItems = requestParameters.getItems();
-                S7AnyVarParameterItem s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameterItems.get(0);  
-                numParameters += s7AnyVarParameterItem.getNumElements();  
-                VarPayload ackVarPayload = new VarPayload(requestParameters.getType(), 
-                    Collections.singletonList( new VarPayloadItem(DataTransportErrorCode.ACCESS_DENIED, null, null)));                     
-                splitPayloads.addAll(Collections.singletonList(ackVarPayload)); 
-                                
-            }
-
-        }
-
-        //Clean request messages
-        Set<Short> setKeys = requestMessages.keySet();
-        setKeys.forEach(key->{compRequestMessages.remove(key);});
-        compRequestMessages.remove(tpduReference);
-                
-        List<VarParameterItem> varParameterItems;
-        varParameterItems = Collections.singletonList(
-                        new S7AnyVarParameterItem(null, null, null, numParameters , (short) 0, (short) 0, (byte) 0));
-
-        S7Parameter s7Parameter = new VarParameter(parameterType, varParameterItems);
-        
-        splitParameters.add(s7Parameter); 
-        
-        for(S7Payload s7Payload:splitPayloads){
-            VarPayload varPayload = (VarPayload) s7Payload;
-            payloadItems.addAll(varPayload.getItems());            
-        }
-                       
-        S7ResponseMessage res = new S7ResponseMessage(response.getMessageType(),
-                tpduReference,
-                splitParameters,
-                Collections.singletonList(new VarPayload(parameterType, payloadItems)), 
-                (byte)0x00, (byte)0x00);
-
-        return res;
-    }
-    
-    /************************************************************************
-    * UTILITYS
-    ************************************************************************/    
-    
-
-    static class S7CompositeRequestMessage implements PlcProtocolMessage {
-
-        private S7RequestMessage originalRequest;
-        private LinkedHashMap<Short, S7RequestMessage> requestMessages;
-        private LinkedHashMap<Short, S7ResponseMessage> responseMessages;
-
-        S7CompositeRequestMessage(S7RequestMessage originalRequest) {
-            this.originalRequest = originalRequest;
-            this.requestMessages = new LinkedHashMap<>();
-            this.responseMessages = new LinkedHashMap<>();
-        }
-
-        @Override
-        public PlcProtocolMessage getParent() {
-            return originalRequest;
-        }
-
-        /**
-         * A {@link S7CompositeRequestMessage} is only acknowledged, if all children are acknowledged.
-         *
-         * @return true if all children are acknowledged.
-         */
-        private boolean isAcknowledged() {
-            /*
-            for (S7RequestMessage requestMessage : requestMessages) {
-                if(!requestMessage.isAcknowledged()) {
-                    return false;
-                }
-            }*/
-            return true;
-        }
-
-        void addRequestMessage(S7RequestMessage requestMessage) {
-            requestMessages.put(requestMessage.getTpduReference(),requestMessage);
-        }
-
-        public LinkedHashMap getRequestMessages() {
-            return requestMessages;
-        }
-
-        private void addResponseMessage(S7ResponseMessage responseMessage) {
-            responseMessages.putIfAbsent(responseMessage.getTpduReference(),responseMessage);
-        }
-
-        public LinkedHashMap getResponseMessages() {
-            return  responseMessages;
-        }
-        
-        public boolean isCompleted(){            
-            return ((requestMessages.size() - responseMessages.size()) == 0) ;
-        }
-    }
-    
-    //TODO: Use BaseType for length calculation. (Ok)
-    //TODO: For S7 STRING, maximum length is 254 -> One STRING request -> S7RequestMessage. HMI used CHAR array's 
-    private static short getEstimatedResponseReadVarPayloadItemSize(VarParameterItem varParameterItem) {
-        // A var payload item always has a minimum size of 4 bytes (return code, transport size, size (two bytes))
-        short length = 4;
-        short base =0;
-        S7AnyVarParameterItem s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameterItem;
-        
-        base = (s7AnyVarParameterItem.getDataType().getBaseType() == null)?
-                (short) s7AnyVarParameterItem.getDataType().getSizeInBytes():
-                (short)(s7AnyVarParameterItem.getDataType().getSizeInBytes() *
-                s7AnyVarParameterItem.getDataType().getBaseType().getSizeInBytes());
-        
-        length +=
-            s7AnyVarParameterItem.getNumElements() * base;
-        // It seems that bit payloads need a additional separating 0x00 byte.
-        if(s7AnyVarParameterItem.getDataType() == TransportSize.BOOL) {
-            length += 1;
-        }
-        return length;
-    }
-
-
-    private short PrepareMessagesToNextLayer(MessageType msgType,
-            ParameterType parameter,
-            List<VarParameterItem> splitParameters,
-            List<VarPayloadItem> splitPayloads,
-            S7CompositeRequestMessage compMsg){
-            
-            VarParameter writeVarParameter = new VarParameter(parameter, splitParameters);
-            VarPayload writeVarPayload = new VarPayload(parameter, splitPayloads); 
-            
-            short tpdu = (short) tpduGenerator.getAndIncrement();                        
-            
-            LOGGER.debug("SendMessagesToNextLayer tpdu: " + tpdu + 
-                    " Parameters:" + splitParameters.size() +
-                    " Payloads: " + splitPayloads.size());
-            
-            S7RequestMessage splitRequest = new S7RequestMessage(msgType,
-                tpdu,
-                Collections.singletonList(writeVarParameter),
-                (splitPayloads == Collections.EMPTY_LIST)?
-                        Collections.EMPTY_LIST:
-                        Collections.singletonList(writeVarPayload),
-                compMsg);            
-
-            compMsg.getRequestMessages().put(splitRequest.getTpduReference(),splitRequest);  
-            compRequestMessages.put(splitRequest.getTpduReference(), compMsg);
-            
-            return tpdu;
-    }
-    
-    
-    
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.strategies;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageCodec;
+import io.netty.util.AttributeKey;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.plc4x.java.base.messages.PlcProtocolMessage;
+import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
+import org.apache.plc4x.java.s7.netty.model.messages.S7ResponseMessage;
+import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
+import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
+import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
+import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
+import org.apache.plc4x.java.s7.netty.model.types.MessageType;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class LongS7MessageProcessorCodec extends
+             MessageToMessageCodec<S7ResponseMessage, S7RequestMessage>{
+    
+    private static final Logger LOGGER = LoggerFactory.getLogger(LongS7MessageProcessorCodec.class );
+    private final AttributeKey<Short> pduSizeKey = AttributeKey.valueOf("pduSizeKey");
+    private final AttributeKey<AtomicInteger> tpduGeneratorKey = AttributeKey.valueOf("tpduGeneratorKey");
+    
+    private final Map<Short, S7CompositeRequestMessage> compRequestMessages;
+    
+    private Short pduSize = 0;
+    private AtomicInteger tpduGenerator;
+
+    public LongS7MessageProcessorCodec() {
+        this.compRequestMessages = new LinkedHashMap<>(10);
+    }
+             
+    @Override
+    protected void encode(ChannelHandlerContext ctx, S7RequestMessage request, List<Object> out) throws Exception {
+        pduSize = ctx.channel().attr(pduSizeKey).get();
+        tpduGenerator = ctx.channel().attr(tpduGeneratorKey).get();
+        
+        Optional<VarParameter> varParameterOptional = request.getParameter(VarParameter.class);
+        if (varParameterOptional.isPresent()) {
+            VarParameter varParameter = varParameterOptional.get();
+            /* Requests whose size is larger than the psuSize should be 
+            *processed or if it is smaller than this but contains a number 
+            *of elements greater than 18 */
+            if ((pduSize < 1024) && (tpduGenerator != null) && (
+                    (request.getRequestSize() > pduSize) ||
+                    ((request.getRequestSize() < pduSize) && (varParameter.getItems().size() > 18)))){
+                if (varParameter.getType() == ParameterType.READ_VAR){
+                    LinkedHashMap<Short, S7RequestMessage> splitRequest = SplitLongReadRequestMessageGroup(request);
+                    out.addAll(splitRequest.values());
+                    return;                    
+                } else if(varParameter.getType() == ParameterType.WRITE_VAR){
+                    LinkedHashMap<Short, S7RequestMessage> splitRequest = SplitLongWriteRequestMessageGroup(request);
+                    out.addAll(splitRequest.values());
+                    return;
+                }
+            }       
+        }
+        out.add(request);
+    }
+
+    @Override
+    protected void decode(ChannelHandlerContext ctx, S7ResponseMessage response, List<Object> out) throws Exception {
+        S7CompositeRequestMessage compRequestMessage = compRequestMessages.get(response.getTpduReference());
+        if (compRequestMessage != null) {
+            compRequestMessage.addResponseMessage(response);
+            if (compRequestMessage.isCompleted()){
+                S7ResponseMessage res = AssemblyResponseMessage(compRequestMessage, response);
+                out.add(res);
+                return;
+            }
+        }
+        out.add(response);
+    }
+    
+    /************************************************************************
+    * SPLIT SECTION
+    ************************************************************************/
+    
+    /*
+    * This method split original S7RequestMessage using 80% rule.
+    * Another problem when tpduGenerator returns to zero (short type).
+    * TODO: split for individual item when item.size > pduSize
+    */
+    private LinkedHashMap<Short, S7RequestMessage> SplitLongWriteRequestMessageGroup(S7RequestMessage request){
+        
+        boolean firtsRow = true;
+        S7CompositeRequestMessage compRequestMessage = new S7CompositeRequestMessage(request);
+
+        compRequestMessages.put(request.getTpduReference(), compRequestMessage);
+
+        List<S7RequestMessage> splitRequests = new LinkedList<>();
+
+        Optional<VarParameter> varParameterOptional = request.getParameter(VarParameter.class);        
+        VarParameter parameters =  varParameterOptional.get();
+                
+        Optional<VarPayload> varPayloadOptional = request.getPayload(VarPayload.class); 
+        VarPayload payloads = varPayloadOptional.get();
+               
+        short itemSize = 0;
+        short actualSize = 0;
+        short maxItemSize = (short) Math.round(pduSize * 0.8);
+        
+        S7Parameter parameter = null;
+        S7Payload payload = null;
+       
+        List<VarParameterItem> parameterItems = (LinkedList)parameters.getItems();
+        List<VarPayloadItem> payloadItems  = (LinkedList)payloads.getItems();
+        List<VarParameterItem> splitParameters = new LinkedList<>();
+        List<VarPayloadItem> splitPayloads = new LinkedList<>();
+                       
+        S7AnyVarParameterItem s7AnyVarParameterItem = null;
+        
+        //No se estan generando en orden
+        Iterator<VarParameterItem> itParameter = parameterItems.iterator();
+        Iterator<VarPayloadItem> itPayload = payloadItems.iterator();
+        int i = 0;
+        while (itParameter.hasNext()) {
+                                    
+            VarParameterItem varParameterItem = itParameter.next();
+            VarPayloadItem varPayloadItem = itPayload.next();            
+                        
+            if (varParameterItem instanceof S7AnyVarParameterItem) {
+                s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameterItem;
+            }
+
+            //TODO: for odd size count the fill 0x00 byte
+            itemSize = (short)(28 + varPayloadItem.getData().length); //Header+Parameter+data
+            actualSize = (short)(28 + 14*(splitPayloads.size()));//Header+Parameter
+            for(VarPayloadItem item:splitPayloads){
+                actualSize = (short) (actualSize +item.getData().length); //+=data.length
+            };
+            
+            LOGGER.debug("SplitLongWriteRequestMessageGroup itemSize: " + itemSize + " actualSize: " + actualSize);
+            
+            //TODO: Item size is > pduSize the Split is in the user layer. 
+            if (itemSize > pduSize){
+                //TODO: Evaluate that the fractional message should be blocked 
+                //      by the next layer. The response message indicating poor 
+                //      quality must also be generated at this point.
+                if (!splitParameters.isEmpty()){
+                    PrepareMessagesToNextLayer(request.getMessageType(),
+                    parameters.getType(),
+                    splitParameters,
+                    splitPayloads,
+                    compRequestMessage); 
+                    
+                    splitParameters = new LinkedList<>();
+                    splitPayloads = new LinkedList<>();                    
+                }
+                
+                short tpdu = PrepareMessagesToNextLayer(request.getMessageType(),
+                                parameters.getType(),
+                                Collections.singletonList(varParameterItem),
+                                Collections.singletonList(varPayloadItem),
+                                compRequestMessage);                 
+                
+                VarParameter writeVarParameter = new VarParameter(parameters.getType(), 
+                        Collections.singletonList(varParameterItem));
+                VarPayload writeVarPayload = new VarPayload(parameters.getType(), 
+                        Collections.singletonList(varPayloadItem));
+                //This message generates an "error" from the PLC, which is discarded.
+                S7RequestMessage splitRequest = new S7RequestMessage(request.getMessageType(),
+                    tpdu, Collections.singletonList(writeVarParameter),
+                    Collections.EMPTY_LIST, compRequestMessage);
+                                              
+                VarParameter ackVarParameter = new VarParameter(parameters.getType(), 
+                    Collections.singletonList(
+                        new S7AnyVarParameterItem(null, null, null, 0x01, (short) 0, (short) 0, (byte) 0)));
+                VarPayload ackVarPayload = new VarPayload(parameters.getType(), 
+                        Collections.singletonList( new VarPayloadItem(DataTransportErrorCode.ACCESS_DENIED, null, null)));                
+                
+                S7ResponseMessage responseMessage = new S7ResponseMessage(
+                    MessageType.ACK_DATA, 
+                    splitRequest.getTpduReference(), 
+                    Collections.singletonList(ackVarParameter), 
+                    Collections.singletonList(ackVarPayload), 
+                    (byte) 0x81, //Application relationship 
+                    (byte) 0x04); //Service no implemented or frame error
+               /* 
+                compRequestMessage.getResponseMessages().put(
+                        responseMessage.getTpduReference(), 
+                        responseMessage);
+                */
+               
+                compRequestMessage.getRequestMessages().put(splitRequest.getTpduReference(),splitRequest);  
+                compRequestMessages.put(splitRequest.getTpduReference(), compRequestMessage);
+                //A fault response is generated, with poor quality, allowing 
+                //to follow the writing process for the other Items.
+                
+                //throw new Plc4XNettyException("Write item request size bigger than " + pduSize+
+                //            " bytes. Split the Item in smaller units."); 
+                
+            } else if ((itemSize > maxItemSize) && ((itemSize <  pduSize))){
+                //TODO: Add a S7RequestMessage to the list                               
+                PrepareMessagesToNextLayer(request.getMessageType(),
+                        parameters.getType(),
+                        splitParameters,
+                        splitPayloads,
+                        compRequestMessage); 
+                
+            } else if (!firtsRow){
+               
+                if ((((itemSize + actualSize) >= maxItemSize) && 
+                     ((itemSize + actualSize) <= pduSize)) || 
+                        (!itParameter.hasNext())){  
+                    splitParameters.add(varParameterItem);
+                    splitPayloads.add(varPayloadItem);  
+                    
+                    PrepareMessagesToNextLayer(request.getMessageType(),
+                            parameters.getType(),
+                            splitParameters,
+                            splitPayloads,
+                            compRequestMessage); 
+                    
+                    splitParameters = new LinkedList<>();
+                    splitPayloads = new LinkedList<>();
+                } else if (((itemSize + actualSize) >= pduSize)){  
+                    PrepareMessagesToNextLayer(request.getMessageType(),
+                            parameters.getType(),
+                            splitParameters,
+                            splitPayloads,
+                            compRequestMessage); 
+                    splitParameters = new LinkedList<>();
+                    splitPayloads = new LinkedList<>(); 
+                    splitParameters.add(varParameterItem);
+                    splitPayloads.add(varPayloadItem);                      
+                }
+                else {
+                    splitParameters.add(varParameterItem);
+                    splitPayloads.add(varPayloadItem);                    
+                }                
+            } else {
+                splitParameters.add(varParameterItem);
+                splitPayloads.add(varPayloadItem);
+            }
+            firtsRow = false;
+        }
+                        
+        if (!splitParameters.isEmpty()){
+            PrepareMessagesToNextLayer(request.getMessageType(),
+                    parameters.getType(),
+                    splitParameters,
+                    splitPayloads,
+                    compRequestMessage);        
+        }
+   
+        return compRequestMessage.getRequestMessages();
+    };
+
+    private LinkedHashMap<Short, S7RequestMessage> SplitLongReadRequestMessageGroup(S7RequestMessage request){
+
+        S7CompositeRequestMessage compRequestMessage = new S7CompositeRequestMessage(request);      
+        compRequestMessages.put(request.getTpduReference(), compRequestMessage);
+        
+        Optional<VarParameter> varParameterOptional = request.getParameter(VarParameter.class);        
+        VarParameter parameters =  varParameterOptional.get();                
+        
+        boolean firtsRow = true;
+        short itemSize = 0;
+        short actualSize = 0;
+        short maxItemSize = (short) Math.round(pduSize * 0.8);        
+        
+        
+        List<VarParameterItem> parameterItems = parameters.getItems();
+
+        List<VarParameterItem> splitParameters = new LinkedList<>();
+        List<VarPayloadItem> splitPayloads = new LinkedList<>();
+
+        for (int i = 0; i < parameterItems.size(); i++) {
+            
+            VarParameterItem varParameterItem = parameterItems.get(i);
+            
+            itemSize = (short)(2 + getEstimatedResponseReadVarPayloadItemSize(varParameterItem));
+            actualSize = 0;
+            for(VarParameterItem item:splitParameters){
+                actualSize = (short) (actualSize + getEstimatedResponseReadVarPayloadItemSize(item)); //+=data.length
+            };     
+            
+            //TODO: Item size is > pduSize the Split is in the user layer. 
+            if (itemSize > pduSize){
+                //TODO: Evaluate that the fractional message should be blocked 
+                //      by the next layer. The response message indicating poor 
+                //      quality must also be generated at this point.
+                if (!splitParameters.isEmpty()){
+                    PrepareMessagesToNextLayer(request.getMessageType(),
+                    parameters.getType(),
+                    splitParameters,
+                    Collections.EMPTY_LIST,
+                    compRequestMessage); 
+                    
+                    splitParameters = new LinkedList<>();
+                    splitPayloads = new LinkedList<>();                    
+                }                
+                
+                short tpdu = PrepareMessagesToNextLayer(request.getMessageType(),
+                                parameters.getType(),
+                                Collections.singletonList(varParameterItem),
+                                Collections.EMPTY_LIST,
+                                compRequestMessage);                 
+                
+                //throw new Plc4XNettyException("Read item request size bigger than " + pduSize+
+                //            " bytes. Split the Item in smaller units."); 
+                
+            } else if ((itemSize > maxItemSize) && ((itemSize <  pduSize))){
+                
+                if (!splitParameters.isEmpty()){
+                    PrepareMessagesToNextLayer(request.getMessageType(),
+                    parameters.getType(),
+                    splitParameters,
+                    Collections.EMPTY_LIST,
+                    compRequestMessage); 
+                    
+                    splitParameters = new LinkedList<>();
+                    splitPayloads = new LinkedList<>();                    
+                }                                     
+                
+                VarParameter writeVarParameter = new VarParameter(parameters.getType(), 
+                        Collections.singletonList(varParameterItem ));
+                
+                S7RequestMessage splitRequest = new S7RequestMessage(request.getMessageType(),
+                    (short) tpduGenerator.getAndIncrement(), Collections.singletonList(writeVarParameter),
+                    Collections.EMPTY_LIST, compRequestMessage);
+                
+                compRequestMessage.getRequestMessages().put(splitRequest.getTpduReference(),splitRequest);  
+                compRequestMessages.put(splitRequest.getTpduReference(), compRequestMessage); 
+                itemSize = 0;
+                
+            }  else if (!firtsRow){
+                              
+                if ((((itemSize + actualSize) >= maxItemSize) && 
+                     ((itemSize + actualSize) <= pduSize)) ||
+                       (splitParameters.size() > 16) ){  
+                      
+                    splitParameters.add(varParameterItem);
+                    
+                    VarParameter writeVarParameter = new VarParameter(parameters.getType(), splitParameters);
+
+                    S7RequestMessage splitRequest = new S7RequestMessage(request.getMessageType(),
+                        (short) tpduGenerator.getAndIncrement(), Collections.singletonList(writeVarParameter),
+                        Collections.EMPTY_LIST, compRequestMessage);
+
+                    compRequestMessage.getRequestMessages().put(splitRequest.getTpduReference(),splitRequest); 
+                    compRequestMessages.put(splitRequest.getTpduReference(), compRequestMessage);
+                    
+                    splitParameters = new LinkedList<>();                                   
+                    splitPayloads = new LinkedList<>();
+                    itemSize = 0;
+                    
+                } else if ((((itemSize + actualSize) >= maxItemSize) && 
+                     ((itemSize + actualSize) > pduSize))){ 
+                    
+                    if (!splitParameters.isEmpty()){
+                        PrepareMessagesToNextLayer(request.getMessageType(),
+                        parameters.getType(),
+                        splitParameters,
+                        Collections.EMPTY_LIST,
+                        compRequestMessage); 
+
+                        splitParameters = new LinkedList<>();
+                        splitPayloads = new LinkedList<>();                    
+                    }                                  
+                    
+                    VarParameter writeVarParameter = new VarParameter(parameters.getType(), 
+                            Collections.singletonList(varParameterItem ));
+
+                    S7RequestMessage splitRequest = new S7RequestMessage(request.getMessageType(),
+                        (short) tpduGenerator.getAndIncrement(), Collections.singletonList(writeVarParameter),
+                        Collections.EMPTY_LIST, compRequestMessage);
+
+                    compRequestMessage.getRequestMessages().put(splitRequest.getTpduReference(),splitRequest);  
+                    compRequestMessages.put(splitRequest.getTpduReference(), compRequestMessage); 
+                    itemSize = 0;
+                    
+                }  else {
+                    splitParameters.add(varParameterItem);                   
+                }                 
+                
+            } else {
+                splitParameters.add(varParameterItem);
+            }
+            
+            if((i == (parameterItems.size() - 1)) && (splitParameters.size() !=0)){
+                VarParameter writeVarParameter = new VarParameter(parameters.getType(), splitParameters);
+
+                S7RequestMessage splitRequest = new S7RequestMessage(request.getMessageType(),
+                    (short) tpduGenerator.getAndIncrement(), Collections.singletonList(writeVarParameter),
+                    Collections.EMPTY_LIST, compRequestMessage);
+
+                compRequestMessage.getRequestMessages().put(splitRequest.getTpduReference(),splitRequest); 
+                compRequestMessages.put(splitRequest.getTpduReference(), compRequestMessage);
+
+                splitParameters = new LinkedList<>();                                   
+                splitPayloads = new LinkedList<>();
+                itemSize = 0;                   
+            }
+            
+            firtsRow = false;          
+     
+        }        
+                
+        return compRequestMessage.getRequestMessages();       
+    }    
+    
+    
+    /************************************************************************
+    * ASSEMBLY RESPONSE MESSAGE
+    ************************************************************************/
+    
+    /*
+    * Try to assemble a response message from the response fragments.
+    * Since the PLC can handle at least two requests and depending on 
+    * the load of its CPUs, the response order is not granted.
+    * TODO: If the connection is lost, the queue is invalid and must be deleted.
+    * TODO: The PLC reporta error, only the header is send. 
+    *       Example Error Class 0x81, Error code 0x04
+    */
+    private S7ResponseMessage AssemblyResponseMessage(S7CompositeRequestMessage compRequestMessage, 
+            S7ResponseMessage response){
+        
+        List<S7Parameter> splitParameters = new LinkedList<>();
+        List<S7Payload> splitPayloads = new LinkedList<>();
+        List<VarPayloadItem> payloadItems = new LinkedList<>();
+        
+        ParameterType parameterType = ParameterType.WRITE_VAR;
+        int numParameters = 0x000;
+        short tpduReference = 0x0000;
+                
+        LinkedHashMap<Short, S7RequestMessage> requestMessages =
+                compRequestMessage.getRequestMessages();
+        
+        LinkedHashMap<Short, S7ResponseMessage> responseMessages =
+                compRequestMessage.getResponseMessages();
+        
+        tpduReference =((S7RequestMessage) compRequestMessage.getParent()).getTpduReference();
+        //Always the firts element is the response the pdu number    
+        Iterator<Entry<Short, S7RequestMessage>> iterRequest = requestMessages.entrySet().iterator();
+        
+        while(iterRequest.hasNext()){
+
+            Entry<Short, S7RequestMessage> itemRequest = iterRequest.next();
+            S7ResponseMessage msgResponse = (S7ResponseMessage) responseMessages.get(itemRequest.getKey());
+                        
+            //If no present we have a error code in the Header
+            Optional<VarParameter> varParameterOptional = msgResponse.getParameter(VarParameter.class); 
+            if (varParameterOptional.isPresent()){
+                VarParameter parameters =  varParameterOptional.get();
+                parameterType = parameters.getType();
+                //Como extraer los parametros del mensaje de respuesta            
+                List<VarParameterItem> varParameterItems = parameters.getItems();
+
+                S7AnyVarParameterItem s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameterItems.get(0);
+
+                numParameters += s7AnyVarParameterItem.getNumElements();
+
+                List<S7Payload> payloads = msgResponse.getPayloads();
+                
+                splitPayloads.addAll(payloads);                
+            } else {
+                //Error from PLC
+                LOGGER.info("Error for tpud " + msgResponse.getTpduReference() +
+                            " Error class: " + msgResponse.getErrorClass() +
+                            " Error code" + msgResponse.getErrorCode());
+                S7RequestMessage msgRequest = (S7RequestMessage) requestMessages.get(msgResponse.getTpduReference());
+
+                VarParameter requestParameters = (VarParameter) msgRequest.getParameters().get(0);
+                parameterType = requestParameters.getType();
+                List<VarParameterItem> varParameterItems = requestParameters.getItems();
+                S7AnyVarParameterItem s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameterItems.get(0);  
+                numParameters += s7AnyVarParameterItem.getNumElements();  
+                VarPayload ackVarPayload = new VarPayload(requestParameters.getType(), 
+                    Collections.singletonList( new VarPayloadItem(DataTransportErrorCode.ACCESS_DENIED, null, null)));                     
+                splitPayloads.addAll(Collections.singletonList(ackVarPayload)); 
+                                
+            }
+
+        }
+
+        //Clean request messages
+        Set<Short> setKeys = requestMessages.keySet();
+        setKeys.forEach(key->{compRequestMessages.remove(key);});
+        compRequestMessages.remove(tpduReference);
+                
+        List<VarParameterItem> varParameterItems;
+        varParameterItems = Collections.singletonList(
+                        new S7AnyVarParameterItem(null, null, null, numParameters , (short) 0, (short) 0, (byte) 0));
+
+        S7Parameter s7Parameter = new VarParameter(parameterType, varParameterItems);
+        
+        splitParameters.add(s7Parameter); 
+        
+        for(S7Payload s7Payload:splitPayloads){
+            VarPayload varPayload = (VarPayload) s7Payload;
+            payloadItems.addAll(varPayload.getItems());            
+        }
+                       
+        S7ResponseMessage res = new S7ResponseMessage(response.getMessageType(),
+                tpduReference,
+                splitParameters,
+                Collections.singletonList(new VarPayload(parameterType, payloadItems)), 
+                (byte)0x00, (byte)0x00);
+
+        return res;
+    }
+    
+    /************************************************************************
+    * UTILITYS
+    ************************************************************************/    
+    
+
+    static class S7CompositeRequestMessage implements PlcProtocolMessage {
+
+        private S7RequestMessage originalRequest;
+        private LinkedHashMap<Short, S7RequestMessage> requestMessages;
+        private LinkedHashMap<Short, S7ResponseMessage> responseMessages;
+
+        S7CompositeRequestMessage(S7RequestMessage originalRequest) {
+            this.originalRequest = originalRequest;
+            this.requestMessages = new LinkedHashMap<>();
+            this.responseMessages = new LinkedHashMap<>();
+        }
+
+        @Override
+        public PlcProtocolMessage getParent() {
+            return originalRequest;
+        }
+
+        /**
+         * A {@link S7CompositeRequestMessage} is only acknowledged, if all children are acknowledged.
+         *
+         * @return true if all children are acknowledged.
+         */
+        private boolean isAcknowledged() {
+            /*
+            for (S7RequestMessage requestMessage : requestMessages) {
+                if(!requestMessage.isAcknowledged()) {
+                    return false;
+                }
+            }*/
+            return true;
+        }
+
+        void addRequestMessage(S7RequestMessage requestMessage) {
+            requestMessages.put(requestMessage.getTpduReference(),requestMessage);
+        }
+
+        public LinkedHashMap getRequestMessages() {
+            return requestMessages;
+        }
+
+        private void addResponseMessage(S7ResponseMessage responseMessage) {
+            responseMessages.putIfAbsent(responseMessage.getTpduReference(),responseMessage);
+        }
+
+        public LinkedHashMap getResponseMessages() {
+            return  responseMessages;
+        }
+        
+        public boolean isCompleted(){            
+            return ((requestMessages.size() - responseMessages.size()) == 0) ;
+        }
+    }
+    
+    //TODO: Use BaseType for length calculation. (Ok)
+    //TODO: For S7 STRING, maximum length is 254 -> One STRING request -> S7RequestMessage. HMI used CHAR array's 
+    private static short getEstimatedResponseReadVarPayloadItemSize(VarParameterItem varParameterItem) {
+        // A var payload item always has a minimum size of 4 bytes (return code, transport size, size (two bytes))
+        short length = 4;
+        short base =0;
+        S7AnyVarParameterItem s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameterItem;
+        
+        base = (s7AnyVarParameterItem.getDataType().getBaseType() == null)?
+                (short) s7AnyVarParameterItem.getDataType().getSizeInBytes():
+                (short)(s7AnyVarParameterItem.getDataType().getSizeInBytes() *
+                s7AnyVarParameterItem.getDataType().getBaseType().getSizeInBytes());
+        
+        length +=
+            s7AnyVarParameterItem.getNumElements() * base;
+        // It seems that bit payloads need a additional separating 0x00 byte.
+        if(s7AnyVarParameterItem.getDataType() == TransportSize.BOOL) {
+            length += 1;
+        }
+        return length;
+    }
+
+
+    private short PrepareMessagesToNextLayer(MessageType msgType,
+            ParameterType parameter,
+            List<VarParameterItem> splitParameters,
+            List<VarPayloadItem> splitPayloads,
+            S7CompositeRequestMessage compMsg){
+            
+            VarParameter writeVarParameter = new VarParameter(parameter, splitParameters);
+            VarPayload writeVarPayload = new VarPayload(parameter, splitPayloads); 
+            
+            short tpdu = (short) tpduGenerator.getAndIncrement();                        
+            
+            LOGGER.debug("SendMessagesToNextLayer tpdu: " + tpdu + 
+                    " Parameters:" + splitParameters.size() +
+                    " Payloads: " + splitPayloads.size());
+            
+            S7RequestMessage splitRequest = new S7RequestMessage(msgType,
+                tpdu,
+                Collections.singletonList(writeVarParameter),
+                (splitPayloads == Collections.EMPTY_LIST)?
+                        Collections.EMPTY_LIST:
+                        Collections.singletonList(writeVarPayload),
+                compMsg);            
+
+            compMsg.getRequestMessages().put(splitRequest.getTpduReference(),splitRequest);  
+            compRequestMessages.put(splitRequest.getTpduReference(), compMsg);
+            
+            return tpdu;
+    }
+    
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/S7MessageProcessor.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/S7MessageProcessor.java
index 10d5c80d6ff..7356f2d1d69 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/S7MessageProcessor.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/S7MessageProcessor.java
@@ -1,38 +1,38 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.strategies;
-
-import org.apache.plc4x.java.api.exceptions.PlcException;
-import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
-import org.apache.plc4x.java.s7.netty.model.messages.S7ResponseMessage;
-
-import java.util.Collection;
-
-/**
- * Some times the messages being sent have to be manipulated before
- * being able to send them. For example eventually a request has to
- * be split up into multiple ones to respect the maximum PDU size.
- */
-public interface S7MessageProcessor {
-
-    Collection<S7RequestMessage> processRequest(S7RequestMessage request, int pduSize) throws PlcException;
-
-    S7ResponseMessage processResponse(S7RequestMessage request, S7ResponseMessage response) throws PlcException;
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.strategies;
+
+import org.apache.plc4x.java.api.exceptions.PlcException;
+import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
+import org.apache.plc4x.java.s7.netty.model.messages.S7ResponseMessage;
+
+import java.util.Collection;
+
+/**
+ * Some times the messages being sent have to be manipulated before
+ * being able to send them. For example eventually a request has to
+ * be split up into multiple ones to respect the maximum PDU size.
+ */
+public interface S7MessageProcessor {
+
+    Collection<S7RequestMessage> processRequest(S7RequestMessage request, int pduSize) throws PlcException;
+
+    S7ResponseMessage processResponse(S7RequestMessage request, S7ResponseMessage response) throws PlcException;
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldEventHandler.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldEventHandler.java
index 560944aef22..ecadb57f51c 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldEventHandler.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldEventHandler.java
@@ -1,41 +1,41 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.s7.netty.util;
-
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.connection.DefaultPlcFieldHandler;
-import org.apache.plc4x.java.s7.model.S7SubscriptionField;
-
-/**
- *
- * 
- */
-public class S7PlcFieldEventHandler extends DefaultPlcFieldHandler {
-
-    @Override
-    public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
-        if (S7SubscriptionField.matches(fieldQuery)) {
-            return S7SubscriptionField.of(fieldQuery);
-        }
-        throw new PlcInvalidFieldException(fieldQuery);
-    }
-    
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty.util;
+
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.connection.DefaultPlcFieldHandler;
+import org.apache.plc4x.java.s7.model.S7SubscriptionField;
+
+/**
+ *
+ * 
+ */
+public class S7PlcFieldEventHandler extends DefaultPlcFieldHandler {
+
+    @Override
+    public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
+        if (S7SubscriptionField.matches(fieldQuery)) {
+            return S7SubscriptionField.of(fieldQuery);
+        }
+        throw new PlcInvalidFieldException(fieldQuery);
+    }
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandler.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandler.java
index bc52e72d390..26ed253d4f3 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandler.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandler.java
@@ -1,677 +1,677 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.util;
-
-import java.lang.reflect.InvocationTargetException;
-import java.math.BigInteger;
-import java.nio.charset.StandardCharsets;
-import java.time.Duration;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.BitSet;
-import java.util.LinkedList;
-import java.util.List;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.connection.DefaultPlcFieldHandler;
-import org.apache.plc4x.java.base.messages.items.*;
-import org.apache.plc4x.java.s7.model.S7Field;
-import org.apache.plc4x.java.s7.model.S7SslField;
-
-public class S7PlcFieldHandler extends DefaultPlcFieldHandler {
-
-    @Override
-    public PlcField createField(String fieldQuery) {
-        if (S7Field.matches(fieldQuery)) {
-            return S7Field.of(fieldQuery);
-        }
-        if (S7SslField.matches(fieldQuery)) {
-            return S7SslField.of(fieldQuery);
-        }  
-        throw new PlcInvalidFieldException(fieldQuery);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeBoolean(PlcField field, Object[] values) {
-        S7Field s7Field = (S7Field) field;
-        // All of these types are declared as Bit or Bit-String types.
-        switch (s7Field.getDataType()) {
-            case BOOL:
-            case BYTE:
-            case WORD:
-            case DWORD:
-            case LWORD:
-                return internalEncodeBoolean(field, values);
-            default:
-                throw new PlcRuntimeException("Invalid encoder for type " + s7Field.getDataType().name());
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeByte(PlcField field, Object[] values) {
-        S7Field s7Field = (S7Field) field;
-        // All of these types are declared as Bit or Bit-String types.
-        switch (s7Field.getDataType()) {
-            case BYTE:
-            case SINT:
-            case USINT:
-            case CHAR:
-                return internalEncodeInteger(field, values);
-            default:
-                throw new PlcRuntimeException("Invalid encoder for type " + s7Field.getDataType().name());
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeShort(PlcField field, Object[] values) {
-        S7Field s7Field = (S7Field) field;
-        switch (s7Field.getDataType()) {
-            case WORD:
-            case INT:
-            case UINT:
-            case DATE: //TODO: Check for S71200/S71500
-                return internalEncodeInteger(field, values);
-            default:
-                throw new PlcRuntimeException("Invalid encoder for type " + s7Field.getDataType().name());
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeInteger(PlcField field, Object[] values) {
-        S7Field s7Field = (S7Field) field;
-        switch (s7Field.getDataType()) {
-            case DWORD:
-            case DINT:
-            case UDINT:
-            case TIME: //TODO: Check for S71200/S71500
-                return internalEncodeInteger(field, values);
-            default:
-                throw new PlcRuntimeException("encodeInteger: Invalid encoder for type " + s7Field.getDataType().name());
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeBigInteger(PlcField field, Object[] values) {
-        S7Field s7Field = (S7Field) field;
-        switch (s7Field.getDataType()) {
-            case DWORD:
-            case DINT:
-            case UDINT:
-                return internalEncodeInteger(field, values);
-            default:
-                throw new PlcRuntimeException("Invalid encoder for type " + s7Field.getDataType().name());
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeLong(PlcField field, Object[] values) {
-        S7Field s7Field = (S7Field) field;
-        switch (s7Field.getDataType()) {
-            case LWORD:
-            case LINT:
-            case ULINT:
-            case DT:
-            case DATE_AND_TIME:
-                return internalEncodeInteger(field, values);
-            default:
-                throw new PlcRuntimeException("Invalid encoder for type " + s7Field.getDataType().name());
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeFloat(PlcField field, Object[] values) {
-        S7Field s7Field = (S7Field) field;
-        switch (s7Field.getDataType()) {
-            case REAL:
-                return internalEncodeFloatingPoint(field, values);
-            default:
-                throw new PlcRuntimeException("Invalid encoder for type " + s7Field.getDataType().name());
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeDouble(PlcField field, Object[] values) {
-        S7Field s7Field = (S7Field) field;
-        switch (s7Field.getDataType()) {
-            case LREAL:
-                return internalEncodeFloatingPoint(field, values);
-            default:
-                throw new PlcRuntimeException("Invalid encoder for type " + s7Field.getDataType().name());
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeString(PlcField field, Object[] values) {
-        S7Field s7Field = (S7Field) field;
-        switch (s7Field.getDataType()) {
-            case CHAR:
-            case WCHAR:
-            case STRING:
-            case WSTRING:
-                return internalEncodeString(field, values);
-            default:
-                throw new PlcRuntimeException("encodeString: Invalid encoder for type " + s7Field.getDataType().name());
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeTime(PlcField field, Object[] values) {
-        S7Field s7Field = (S7Field) field;
-        switch (s7Field.getDataType()) {
-            case TIME:
-            case TOD:
-            case TIME_OF_DAY:                
-                return internalEncodeTemporal(field, values);
-            default:
-                throw new PlcRuntimeException("encodeTime: Invalid encoder for type " + s7Field.getDataType().name());
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeDate(PlcField field, Object[] values) {
-        S7Field s7Field = (S7Field) field;
-        switch (s7Field.getDataType()) {
-            case DATE:
-                return internalEncodeTemporal(field, values);
-            default:
-                throw new PlcRuntimeException("encodeDate: Invalid encoder for type " + s7Field.getDataType().name());
-        }
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeDateTime(PlcField field, Object[] values) {
-        S7Field s7Field = (S7Field) field;
-        switch (s7Field.getDataType()) {
-            case DT:
-            case DATE_AND_TIME:
-                return internalEncodeTemporal(field, values);
-            default:
-                throw new PlcRuntimeException("encodeDateTime: Invalid encoder for type " + s7Field.getDataType().name());
-        }
-    }
-    
-    @Override
-    public BaseDefaultFieldItem encodeDuration(PlcField field, Object[] values) {
-        S7Field s7Field = (S7Field) field;
-        switch (s7Field.getDataType()) {
-            case TIME:          
-            case S5TIME:
-                return internalEncodeTemporal(field, values);
-            default:
-                throw new PlcRuntimeException("encodeDuration: Invalid encoder for type " + s7Field.getDataType().name());
-        }
-    }    
-
-    private BaseDefaultFieldItem internalEncodeBoolean(PlcField field, Object[] values) {
-        S7Field s7Field = (S7Field) field;
-        switch (s7Field.getDataType()) {
-            case BOOL:
-            case BYTE:
-            case WORD:
-            case DWORD:
-            case LWORD:
-                break;
-            default:
-                throw new IllegalArgumentException(
-                    "Cannot assign boolean values to " + s7Field.getDataType().name() + " fields.");
-        }
-        List<Boolean> booleanValues = new LinkedList<>();
-        for (Object value : values) {
-            if (value instanceof Boolean) {
-                Boolean booleanValue = (Boolean) value;
-                booleanValues.add(booleanValue);
-            } else if (value instanceof Byte) {
-                Byte byteValue = (Byte) value;
-                BitSet bitSet = BitSet.valueOf(new byte[]{byteValue});
-                for (int i = 0; i < 8; i++) {
-                    booleanValues.add(bitSet.get(i));
-                }
-            } else if (value instanceof Short) {
-                Short shortValue = (Short) value;
-                BitSet bitSet = BitSet.valueOf(new long[]{shortValue});
-                for (int i = 0; i < 16; i++) {
-                    booleanValues.add(bitSet.get(i));
-                }
-            } else if (value instanceof Integer) {
-                Integer integerValue = (Integer) value;
-                BitSet bitSet = BitSet.valueOf(new long[]{integerValue});
-                for (int i = 0; i < 32; i++) {
-                    booleanValues.add(bitSet.get(i));
-                }
-            } else if (value instanceof Long) {
-                long longValue = (Long) value;
-                BitSet bitSet = BitSet.valueOf(new long[]{longValue});
-                for (int i = 0; i < 64; i++) {
-                    booleanValues.add(bitSet.get(i));
-                }
-            } else {
-                throw new IllegalArgumentException(
-                    "Value of type " + value.getClass().getName() +
-                        " is not assignable to " + s7Field.getDataType().name() + " fields.");
-            }
-        }
-        return new DefaultBooleanFieldItem(booleanValues.toArray(new Boolean[0]));
-    }
-
-    private BaseDefaultFieldItem internalEncodeInteger(PlcField field, Object[] values) {
-        S7Field s7Field = (S7Field) field;
-
-        // Initialize the constraints.
-        BigInteger minValue;
-        BigInteger maxValue;
-        Class<? extends BaseDefaultFieldItem> fieldType;
-        Class<?> valueType;
-        Object[] castedValues;
-        switch (s7Field.getDataType()) {
-            case BYTE:
-                minValue = BigInteger.valueOf((long) Byte.MIN_VALUE);
-                maxValue = BigInteger.valueOf((long) Byte.MAX_VALUE);
-                fieldType = DefaultByteFieldItem.class;
-                valueType = Byte[].class;
-                castedValues = new Byte[values.length];
-                break;
-            case DATE:
-            case WORD:
-                minValue = BigInteger.valueOf((long) Short.MIN_VALUE);
-                maxValue = BigInteger.valueOf((long) Short.MAX_VALUE);
-                fieldType = DefaultShortFieldItem.class;
-                valueType = Short[].class;
-                castedValues = new Short[values.length];
-                break;
-            case TIME:
-            case TOD:
-            case TIME_OF_DAY:
-            case DWORD:
-                minValue = BigInteger.valueOf((long) Integer.MIN_VALUE);
-                maxValue = BigInteger.valueOf((long) Integer.MAX_VALUE);
-                fieldType = DefaultIntegerFieldItem.class;
-                valueType = Integer[].class;
-                castedValues = new Integer[values.length];
-                break;
-            case DT:
-            case DATE_AND_TIME:
-            case LWORD:
-                minValue = BigInteger.valueOf(Long.MIN_VALUE);
-                maxValue = BigInteger.valueOf(Long.MAX_VALUE);
-                fieldType = DefaultLongFieldItem.class;
-                valueType = Long[].class;
-                castedValues = new Long[values.length];
-                break;
-            case SINT:
-                minValue = BigInteger.valueOf((long) Byte.MIN_VALUE);
-                maxValue = BigInteger.valueOf((long) Byte.MAX_VALUE);
-                fieldType = DefaultByteFieldItem.class;
-                valueType = Byte[].class;
-                castedValues = new Byte[values.length];
-                break;
-            case USINT:
-                minValue = BigInteger.valueOf((long) 0);
-                maxValue = BigInteger.valueOf((long) Byte.MAX_VALUE * 2);
-                fieldType = DefaultShortFieldItem.class;
-                valueType = Short[].class;
-                castedValues = new Short[values.length];
-                break;
-            case INT:
-                minValue = BigInteger.valueOf((long) Short.MIN_VALUE);
-                maxValue = BigInteger.valueOf((long) Short.MAX_VALUE);
-                fieldType = DefaultShortFieldItem.class;
-                valueType = Short[].class;
-                castedValues = new Short[values.length];
-                break;
-            case UINT:
-                minValue = BigInteger.valueOf((long) 0);
-                maxValue = BigInteger.valueOf(((long) Short.MAX_VALUE) * 2);
-                fieldType = DefaultIntegerFieldItem.class;
-                valueType = Integer[].class;
-                castedValues = new Integer[values.length];
-                break;
-            case DINT:
-                minValue = BigInteger.valueOf((long) Integer.MIN_VALUE);
-                maxValue = BigInteger.valueOf((long) Integer.MAX_VALUE);
-                fieldType = DefaultIntegerFieldItem.class;
-                valueType = Integer[].class;
-                castedValues = new Integer[values.length];
-                break;
-            case UDINT:
-                minValue = BigInteger.valueOf((long) 0);
-                maxValue = BigInteger.valueOf(((long) Integer.MAX_VALUE) * 2);
-                fieldType = DefaultLongFieldItem.class;
-                valueType = Long[].class;
-                castedValues = new Long[values.length];
-                break;
-            case LINT:
-                minValue = BigInteger.valueOf(Long.MIN_VALUE);
-                maxValue = BigInteger.valueOf(Long.MAX_VALUE);
-                fieldType = DefaultLongFieldItem.class;
-                valueType = Long[].class;
-                castedValues = new Long[values.length];
-                break;
-            case ULINT:
-                minValue = BigInteger.valueOf((long) 0);
-                maxValue = BigInteger.valueOf(Long.MAX_VALUE).multiply(BigInteger.valueOf((long) 2));
-                fieldType = DefaultBigIntegerFieldItem.class;
-                valueType = BigInteger[].class;
-                castedValues = new BigInteger[values.length];
-                break;
-            default:
-                throw new IllegalArgumentException(
-                    "Cannot assign integer values to " + s7Field.getDataType().name() + " fields.");
-        }
-
-        // Check the constraints
-        for (int i = 0; i < values.length; i++) {
-            BigInteger value;
-            if (values[i] instanceof BigInteger) {
-                value = (BigInteger) values[i];
-            } else if ((values[i] instanceof Byte) || (values[i] instanceof Short) ||
-                (values[i] instanceof Integer) || (values[i] instanceof Long)) {
-                value = BigInteger.valueOf(((Number) values[i]).longValue());
-            } else {
-                throw new IllegalArgumentException(
-                    "Value of type " + values[i].getClass().getName() +
-                        " is not assignable to " + s7Field.getDataType().name() + " fields.");
-            }
-            if (minValue.compareTo(value) > 0) {
-                throw new IllegalArgumentException(
-                    "Value of " + value.toString() + " exceeds allowed minimum for type "
-                        + s7Field.getDataType().name() + " (min " + minValue.toString() + ")");
-            }
-            if (maxValue.compareTo(value) < 0) {
-                throw new IllegalArgumentException(
-                    "Value of " + value.toString() + " exceeds allowed maximum for type "
-                        + s7Field.getDataType().name() + " (max " + maxValue.toString() + ")");
-            }
-            if (valueType == Byte[].class) {
-                castedValues[i] = value.byteValue();
-            } else if (valueType == Short[].class) {
-                castedValues[i] = value.shortValue();
-            } else if (valueType == Integer[].class) {
-                castedValues[i] = value.intValue();
-            } else if (valueType == Long[].class) {
-                castedValues[i] = value.longValue();
-            } else {
-                castedValues[i] = value;
-            }
-        }
-
-        // Create the field item.
-        try {
-            return fieldType.getDeclaredConstructor(valueType).newInstance(new Object[]{castedValues});
-        } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
-            throw new PlcRuntimeException("Error initializing field class " + fieldType.getSimpleName(), e);
-        }
-    }
-
-    private BaseDefaultFieldItem internalEncodeFloatingPoint(PlcField field, Object[] values) {
-        S7Field s7Field = (S7Field) field;
-
-        // Initialize the constraints.
-        Double minValue;
-        Double maxValue;
-        Class<? extends BaseDefaultFieldItem> fieldType;
-        Class<?> valueType;
-        Object[] castedValues;
-        switch (s7Field.getDataType()) {
-            case REAL:
-                minValue = (double) -Float.MAX_VALUE;
-                maxValue = (double) Float.MAX_VALUE;
-                fieldType = DefaultFloatFieldItem.class;
-                valueType = Float[].class;
-                castedValues = new Float[values.length];
-                break;
-            case LREAL:
-                minValue = -Double.MAX_VALUE;
-                maxValue = Double.MAX_VALUE;
-                fieldType = DefaultDoubleFieldItem.class;
-                valueType = Double[].class;
-                castedValues = new Double[values.length];
-                break;
-            default:
-                throw new IllegalArgumentException(
-                    "Cannot assign floating point values to " + s7Field.getDataType().name() + " fields.");
-        }
-
-        // Check the constraints
-        for (int i = 0; i < values.length; i++) {
-            Double value;
-            if (values[i] instanceof Float) {
-                value = ((Float) values[i]).doubleValue();
-            } else if (values[i] instanceof Double) {
-                value = (Double) values[i];
-            } else {
-                throw new IllegalArgumentException(
-                    "Value of type " + values[i].getClass().getName() +
-                        " is not assignable to " + s7Field.getDataType().name() + " fields.");
-            }
-            if (value < minValue) {
-                throw new IllegalArgumentException(
-                    "Value of " + value + " exceeds allowed minimum for type "
-                        + s7Field.getDataType().name() + " (min " + minValue.toString() + ")");
-            }
-            if (value > maxValue) {
-                throw new IllegalArgumentException(
-                    "Value of " + value + " exceeds allowed maximum for type "
-                        + s7Field.getDataType().name() + " (max " + maxValue.toString() + ")");
-            }
-            if (valueType == Float[].class) {
-                castedValues[i] = value.floatValue();
-            } else {
-                castedValues[i] = value;
-            }
-        }
-
-        // Create the field item.
-        try {
-            return fieldType.getDeclaredConstructor(valueType).newInstance(new Object[]{castedValues});
-        } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
-            throw new PlcRuntimeException("Error initializing field class " + fieldType.getSimpleName(), e);
-        }
-    }
-
-    private BaseDefaultFieldItem internalEncodeString(PlcField field, Object[] values) {
-        S7Field s7Field = (S7Field) field;
-
-        // Initialize the constraints.
-        int maxLength;
-        boolean encoding16Bit;
-        switch (s7Field.getDataType()) {
-            case CHAR:
-                maxLength = 1;
-                encoding16Bit = false;
-                break;
-            case WCHAR:
-                maxLength = 1;
-                encoding16Bit = true;
-                break;
-            case STRING:
-                maxLength = 254;
-                encoding16Bit = false;
-                break;
-            case WSTRING:
-                maxLength = 254;
-                encoding16Bit = true;
-                break;
-            default:
-                throw new IllegalArgumentException(
-                    "Cannot assign string values to " + s7Field.getDataType().name() + " fields.");
-        }
-
-        // Check the constraints and create the strings.
-        List<String> stringValues = new LinkedList<>();
-        for (Object value : values) {
-            if (value instanceof String) {
-                String stringValue = (String) value;                
-                if (stringValue.length() > maxLength) {
-                    throw new IllegalArgumentException(
-                        "String length " + stringValue.length() + " exceeds allowed maximum for type "
-                            + s7Field.getDataType().name() + " (max " + maxLength + ")");
-                }
-                stringValues.add(stringValue);
-            }
-            // All other types just translate to max one String character.
-            else if (value instanceof Byte) {
-                Byte byteValue = (Byte) value;
-                byte[] stringBytes = new byte[]{byteValue};
-                if (encoding16Bit) {
-                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_16));
-                } else {
-                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_8));
-                }
-            } else if (value instanceof Character) {
-                Character characterValue = (Character) value;
-                byte[] stringBytes = new byte[]{(byte) characterValue.charValue()};
-                if (encoding16Bit) {
-                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_16));
-                } else {
-                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_8));
-                }                
-            } else if (value instanceof Short) {
-                Short shortValue = (Short) value;
-                byte[] stringBytes = new byte[2];
-                stringBytes[0] = (byte) (shortValue >> 8);
-                stringBytes[1] = (byte) (shortValue & 0xFF);
-                if (encoding16Bit) {
-                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_16));
-                } else {
-                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_8));
-                }
-            } else if (value instanceof Integer) {
-                Integer integerValue = (Integer) value;
-                byte[] stringBytes = new byte[4];
-                stringBytes[0] = (byte) ((integerValue >> 24) & 0xFF);
-                stringBytes[1] = (byte) ((integerValue >> 16) & 0xFF);
-                stringBytes[2] = (byte) ((integerValue >> 8) & 0xFF);
-                stringBytes[3] = (byte) (integerValue & 0xFF);
-                if (encoding16Bit) {
-                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_16));
-                } else {
-                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_8));
-                }
-            } else if (value instanceof Long) {
-                Long longValue = (Long) value;
-                byte[] stringBytes = new byte[8];
-                stringBytes[0] = (byte) ((longValue >> 56) & 0xFF);
-                stringBytes[1] = (byte) ((longValue >> 48) & 0xFF);
-                stringBytes[2] = (byte) ((longValue >> 40) & 0xFF);
-                stringBytes[3] = (byte) ((longValue >> 32) & 0xFF);
-                stringBytes[4] = (byte) ((longValue >> 24) & 0xFF);
-                stringBytes[5] = (byte) ((longValue >> 16) & 0xFF);
-                stringBytes[6] = (byte) ((longValue >> 8) & 0xFF);
-                stringBytes[7] = (byte) (longValue & 0xFF);
-                if (encoding16Bit) {
-                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_16));
-                } else {
-                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_8));
-                }
-            } else {
-                throw new IllegalArgumentException(
-                    "Value of type " + value.getClass().getName() +
-                        " is not assignable to " + s7Field.getDataType().name() + " fields.");
-            }
-        }
-
-        // Create the field item.
-        return new DefaultStringFieldItem(stringValues.toArray(new String[0]));
-    }
-
-    private BaseDefaultFieldItem internalEncodeTemporal(PlcField field, Object[] values) {
-        S7Field s7Field = (S7Field) field;
-        BigInteger minValue;
-        BigInteger maxValue;
-        Class<? extends BaseDefaultFieldItem> fieldType = null;
-        Class<?> valueType = null;
-        Object[] castedValues = null;        
-        switch (s7Field.getDataType()) {
-            case S5TIME:
-                // TODO: Check new type
-                minValue = BigInteger.valueOf(0x0000);
-                maxValue = BigInteger.valueOf(0x3999);  
-                fieldType = DefaultDurationFieldItem.class;
-                valueType = Duration[].class;
-                castedValues = new Duration[values.length];
-                for (int i=0; i<values.length; i++){
-                    castedValues[i]  = (Duration) values[i];                
-                };
-                break;
-            case TIME:
-                // TODO: I think I should implement this some time ...
-                minValue = BigInteger.valueOf((long) Integer.MIN_VALUE);
-                maxValue = BigInteger.valueOf((long) Integer.MAX_VALUE);
-                fieldType = DefaultDurationFieldItem.class;
-                valueType = Duration[].class;
-                castedValues = new Duration[values.length];
-                for (int i=0; i<values.length; i++){
-                    castedValues[i]  = (Duration) values[i];
-                }
-                break;
-            case DATE:
-                // TODO: I think I should implement this some time ...
-
-                minValue = BigInteger.valueOf(0x0000);
-                maxValue = BigInteger.valueOf(0xFFFF);
-                fieldType = DefaultLocalDateFieldItem.class;
-                valueType = LocalDate[].class;
-                castedValues = new LocalDate[values.length];
-                for (int i=0; i<values.length; i++){
-                    castedValues[i]  = (LocalDate) values[i];
-                }      
-                break;
-            case TOD:    
-            case TIME_OF_DAY:
-                // TODO: I think I should implement this some time ...  
-                minValue = BigInteger.valueOf((long) Integer.MIN_VALUE);
-                maxValue = BigInteger.valueOf((long) Integer.MAX_VALUE);
-                fieldType = DefaultLocalTimeFieldItem.class;
-                valueType = LocalTime[].class;
-                castedValues = new LocalTime[values.length];
-                for (int i=0; i<values.length; i++){
-                    castedValues[i]  = (LocalTime) values[i];
-                }      
-                break; 
-            case DT:
-            case DATE_AND_TIME:
-                // TODO: I think I should implement this some time ...  
-                minValue = BigInteger.valueOf((long) Integer.MIN_VALUE);
-                maxValue = BigInteger.valueOf((long) Integer.MAX_VALUE);
-                fieldType = DefaultLocalDateTimeFieldItem.class;
-                valueType = LocalDateTime[].class;
-                castedValues = new LocalDateTime[values.length];
-                for (int i=0; i<values.length; i++){
-                    castedValues[i]  = (LocalDateTime) values[i];
-                }      
-                break;      
-            default:
-                throw new IllegalArgumentException(
-                    "Cannot assign temporal values to " + s7Field.getDataType().name() + " fields.");
-        };
-        
-        
-        
-        
-        // Create the field item.
-        try {
-            return fieldType.getDeclaredConstructor(valueType).newInstance(new Object[]{castedValues});
-        } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
-            throw new PlcRuntimeException("Error initializing field class " + fieldType.getSimpleName(), e);
-        }        
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.util;
+
+import java.lang.reflect.InvocationTargetException;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.BitSet;
+import java.util.LinkedList;
+import java.util.List;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.connection.DefaultPlcFieldHandler;
+import org.apache.plc4x.java.base.messages.items.*;
+import org.apache.plc4x.java.s7.model.S7Field;
+import org.apache.plc4x.java.s7.model.S7SslField;
+
+public class S7PlcFieldHandler extends DefaultPlcFieldHandler {
+
+    @Override
+    public PlcField createField(String fieldQuery) {
+        if (S7Field.matches(fieldQuery)) {
+            return S7Field.of(fieldQuery);
+        }
+        if (S7SslField.matches(fieldQuery)) {
+            return S7SslField.of(fieldQuery);
+        }  
+        throw new PlcInvalidFieldException(fieldQuery);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeBoolean(PlcField field, Object[] values) {
+        S7Field s7Field = (S7Field) field;
+        // All of these types are declared as Bit or Bit-String types.
+        switch (s7Field.getDataType()) {
+            case BOOL:
+            case BYTE:
+            case WORD:
+            case DWORD:
+            case LWORD:
+                return internalEncodeBoolean(field, values);
+            default:
+                throw new PlcRuntimeException("Invalid encoder for type " + s7Field.getDataType().name());
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeByte(PlcField field, Object[] values) {
+        S7Field s7Field = (S7Field) field;
+        // All of these types are declared as Bit or Bit-String types.
+        switch (s7Field.getDataType()) {
+            case BYTE:
+            case SINT:
+            case USINT:
+            case CHAR:
+                return internalEncodeInteger(field, values);
+            default:
+                throw new PlcRuntimeException("Invalid encoder for type " + s7Field.getDataType().name());
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeShort(PlcField field, Object[] values) {
+        S7Field s7Field = (S7Field) field;
+        switch (s7Field.getDataType()) {
+            case WORD:
+            case INT:
+            case UINT:
+            case DATE: //TODO: Check for S71200/S71500
+                return internalEncodeInteger(field, values);
+            default:
+                throw new PlcRuntimeException("Invalid encoder for type " + s7Field.getDataType().name());
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeInteger(PlcField field, Object[] values) {
+        S7Field s7Field = (S7Field) field;
+        switch (s7Field.getDataType()) {
+            case DWORD:
+            case DINT:
+            case UDINT:
+            case TIME: //TODO: Check for S71200/S71500
+                return internalEncodeInteger(field, values);
+            default:
+                throw new PlcRuntimeException("encodeInteger: Invalid encoder for type " + s7Field.getDataType().name());
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeBigInteger(PlcField field, Object[] values) {
+        S7Field s7Field = (S7Field) field;
+        switch (s7Field.getDataType()) {
+            case DWORD:
+            case DINT:
+            case UDINT:
+                return internalEncodeInteger(field, values);
+            default:
+                throw new PlcRuntimeException("Invalid encoder for type " + s7Field.getDataType().name());
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeLong(PlcField field, Object[] values) {
+        S7Field s7Field = (S7Field) field;
+        switch (s7Field.getDataType()) {
+            case LWORD:
+            case LINT:
+            case ULINT:
+            case DT:
+            case DATE_AND_TIME:
+                return internalEncodeInteger(field, values);
+            default:
+                throw new PlcRuntimeException("Invalid encoder for type " + s7Field.getDataType().name());
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeFloat(PlcField field, Object[] values) {
+        S7Field s7Field = (S7Field) field;
+        switch (s7Field.getDataType()) {
+            case REAL:
+                return internalEncodeFloatingPoint(field, values);
+            default:
+                throw new PlcRuntimeException("Invalid encoder for type " + s7Field.getDataType().name());
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDouble(PlcField field, Object[] values) {
+        S7Field s7Field = (S7Field) field;
+        switch (s7Field.getDataType()) {
+            case LREAL:
+                return internalEncodeFloatingPoint(field, values);
+            default:
+                throw new PlcRuntimeException("Invalid encoder for type " + s7Field.getDataType().name());
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeString(PlcField field, Object[] values) {
+        S7Field s7Field = (S7Field) field;
+        switch (s7Field.getDataType()) {
+            case CHAR:
+            case WCHAR:
+            case STRING:
+            case WSTRING:
+                return internalEncodeString(field, values);
+            default:
+                throw new PlcRuntimeException("encodeString: Invalid encoder for type " + s7Field.getDataType().name());
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeTime(PlcField field, Object[] values) {
+        S7Field s7Field = (S7Field) field;
+        switch (s7Field.getDataType()) {
+            case TIME:
+            case TOD:
+            case TIME_OF_DAY:                
+                return internalEncodeTemporal(field, values);
+            default:
+                throw new PlcRuntimeException("encodeTime: Invalid encoder for type " + s7Field.getDataType().name());
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDate(PlcField field, Object[] values) {
+        S7Field s7Field = (S7Field) field;
+        switch (s7Field.getDataType()) {
+            case DATE:
+                return internalEncodeTemporal(field, values);
+            default:
+                throw new PlcRuntimeException("encodeDate: Invalid encoder for type " + s7Field.getDataType().name());
+        }
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeDateTime(PlcField field, Object[] values) {
+        S7Field s7Field = (S7Field) field;
+        switch (s7Field.getDataType()) {
+            case DT:
+            case DATE_AND_TIME:
+                return internalEncodeTemporal(field, values);
+            default:
+                throw new PlcRuntimeException("encodeDateTime: Invalid encoder for type " + s7Field.getDataType().name());
+        }
+    }
+    
+    @Override
+    public BaseDefaultFieldItem encodeDuration(PlcField field, Object[] values) {
+        S7Field s7Field = (S7Field) field;
+        switch (s7Field.getDataType()) {
+            case TIME:          
+            case S5TIME:
+                return internalEncodeTemporal(field, values);
+            default:
+                throw new PlcRuntimeException("encodeDuration: Invalid encoder for type " + s7Field.getDataType().name());
+        }
+    }    
+
+    private BaseDefaultFieldItem internalEncodeBoolean(PlcField field, Object[] values) {
+        S7Field s7Field = (S7Field) field;
+        switch (s7Field.getDataType()) {
+            case BOOL:
+            case BYTE:
+            case WORD:
+            case DWORD:
+            case LWORD:
+                break;
+            default:
+                throw new IllegalArgumentException(
+                    "Cannot assign boolean values to " + s7Field.getDataType().name() + " fields.");
+        }
+        List<Boolean> booleanValues = new LinkedList<>();
+        for (Object value : values) {
+            if (value instanceof Boolean) {
+                Boolean booleanValue = (Boolean) value;
+                booleanValues.add(booleanValue);
+            } else if (value instanceof Byte) {
+                Byte byteValue = (Byte) value;
+                BitSet bitSet = BitSet.valueOf(new byte[]{byteValue});
+                for (int i = 0; i < 8; i++) {
+                    booleanValues.add(bitSet.get(i));
+                }
+            } else if (value instanceof Short) {
+                Short shortValue = (Short) value;
+                BitSet bitSet = BitSet.valueOf(new long[]{shortValue});
+                for (int i = 0; i < 16; i++) {
+                    booleanValues.add(bitSet.get(i));
+                }
+            } else if (value instanceof Integer) {
+                Integer integerValue = (Integer) value;
+                BitSet bitSet = BitSet.valueOf(new long[]{integerValue});
+                for (int i = 0; i < 32; i++) {
+                    booleanValues.add(bitSet.get(i));
+                }
+            } else if (value instanceof Long) {
+                long longValue = (Long) value;
+                BitSet bitSet = BitSet.valueOf(new long[]{longValue});
+                for (int i = 0; i < 64; i++) {
+                    booleanValues.add(bitSet.get(i));
+                }
+            } else {
+                throw new IllegalArgumentException(
+                    "Value of type " + value.getClass().getName() +
+                        " is not assignable to " + s7Field.getDataType().name() + " fields.");
+            }
+        }
+        return new DefaultBooleanFieldItem(booleanValues.toArray(new Boolean[0]));
+    }
+
+    private BaseDefaultFieldItem internalEncodeInteger(PlcField field, Object[] values) {
+        S7Field s7Field = (S7Field) field;
+
+        // Initialize the constraints.
+        BigInteger minValue;
+        BigInteger maxValue;
+        Class<? extends BaseDefaultFieldItem> fieldType;
+        Class<?> valueType;
+        Object[] castedValues;
+        switch (s7Field.getDataType()) {
+            case BYTE:
+                minValue = BigInteger.valueOf((long) Byte.MIN_VALUE);
+                maxValue = BigInteger.valueOf((long) Byte.MAX_VALUE);
+                fieldType = DefaultByteFieldItem.class;
+                valueType = Byte[].class;
+                castedValues = new Byte[values.length];
+                break;
+            case DATE:
+            case WORD:
+                minValue = BigInteger.valueOf((long) Short.MIN_VALUE);
+                maxValue = BigInteger.valueOf((long) Short.MAX_VALUE);
+                fieldType = DefaultShortFieldItem.class;
+                valueType = Short[].class;
+                castedValues = new Short[values.length];
+                break;
+            case TIME:
+            case TOD:
+            case TIME_OF_DAY:
+            case DWORD:
+                minValue = BigInteger.valueOf((long) Integer.MIN_VALUE);
+                maxValue = BigInteger.valueOf((long) Integer.MAX_VALUE);
+                fieldType = DefaultIntegerFieldItem.class;
+                valueType = Integer[].class;
+                castedValues = new Integer[values.length];
+                break;
+            case DT:
+            case DATE_AND_TIME:
+            case LWORD:
+                minValue = BigInteger.valueOf(Long.MIN_VALUE);
+                maxValue = BigInteger.valueOf(Long.MAX_VALUE);
+                fieldType = DefaultLongFieldItem.class;
+                valueType = Long[].class;
+                castedValues = new Long[values.length];
+                break;
+            case SINT:
+                minValue = BigInteger.valueOf((long) Byte.MIN_VALUE);
+                maxValue = BigInteger.valueOf((long) Byte.MAX_VALUE);
+                fieldType = DefaultByteFieldItem.class;
+                valueType = Byte[].class;
+                castedValues = new Byte[values.length];
+                break;
+            case USINT:
+                minValue = BigInteger.valueOf((long) 0);
+                maxValue = BigInteger.valueOf((long) Byte.MAX_VALUE * 2);
+                fieldType = DefaultShortFieldItem.class;
+                valueType = Short[].class;
+                castedValues = new Short[values.length];
+                break;
+            case INT:
+                minValue = BigInteger.valueOf((long) Short.MIN_VALUE);
+                maxValue = BigInteger.valueOf((long) Short.MAX_VALUE);
+                fieldType = DefaultShortFieldItem.class;
+                valueType = Short[].class;
+                castedValues = new Short[values.length];
+                break;
+            case UINT:
+                minValue = BigInteger.valueOf((long) 0);
+                maxValue = BigInteger.valueOf(((long) Short.MAX_VALUE) * 2);
+                fieldType = DefaultIntegerFieldItem.class;
+                valueType = Integer[].class;
+                castedValues = new Integer[values.length];
+                break;
+            case DINT:
+                minValue = BigInteger.valueOf((long) Integer.MIN_VALUE);
+                maxValue = BigInteger.valueOf((long) Integer.MAX_VALUE);
+                fieldType = DefaultIntegerFieldItem.class;
+                valueType = Integer[].class;
+                castedValues = new Integer[values.length];
+                break;
+            case UDINT:
+                minValue = BigInteger.valueOf((long) 0);
+                maxValue = BigInteger.valueOf(((long) Integer.MAX_VALUE) * 2);
+                fieldType = DefaultLongFieldItem.class;
+                valueType = Long[].class;
+                castedValues = new Long[values.length];
+                break;
+            case LINT:
+                minValue = BigInteger.valueOf(Long.MIN_VALUE);
+                maxValue = BigInteger.valueOf(Long.MAX_VALUE);
+                fieldType = DefaultLongFieldItem.class;
+                valueType = Long[].class;
+                castedValues = new Long[values.length];
+                break;
+            case ULINT:
+                minValue = BigInteger.valueOf((long) 0);
+                maxValue = BigInteger.valueOf(Long.MAX_VALUE).multiply(BigInteger.valueOf((long) 2));
+                fieldType = DefaultBigIntegerFieldItem.class;
+                valueType = BigInteger[].class;
+                castedValues = new BigInteger[values.length];
+                break;
+            default:
+                throw new IllegalArgumentException(
+                    "Cannot assign integer values to " + s7Field.getDataType().name() + " fields.");
+        }
+
+        // Check the constraints
+        for (int i = 0; i < values.length; i++) {
+            BigInteger value;
+            if (values[i] instanceof BigInteger) {
+                value = (BigInteger) values[i];
+            } else if ((values[i] instanceof Byte) || (values[i] instanceof Short) ||
+                (values[i] instanceof Integer) || (values[i] instanceof Long)) {
+                value = BigInteger.valueOf(((Number) values[i]).longValue());
+            } else {
+                throw new IllegalArgumentException(
+                    "Value of type " + values[i].getClass().getName() +
+                        " is not assignable to " + s7Field.getDataType().name() + " fields.");
+            }
+            if (minValue.compareTo(value) > 0) {
+                throw new IllegalArgumentException(
+                    "Value of " + value.toString() + " exceeds allowed minimum for type "
+                        + s7Field.getDataType().name() + " (min " + minValue.toString() + ")");
+            }
+            if (maxValue.compareTo(value) < 0) {
+                throw new IllegalArgumentException(
+                    "Value of " + value.toString() + " exceeds allowed maximum for type "
+                        + s7Field.getDataType().name() + " (max " + maxValue.toString() + ")");
+            }
+            if (valueType == Byte[].class) {
+                castedValues[i] = value.byteValue();
+            } else if (valueType == Short[].class) {
+                castedValues[i] = value.shortValue();
+            } else if (valueType == Integer[].class) {
+                castedValues[i] = value.intValue();
+            } else if (valueType == Long[].class) {
+                castedValues[i] = value.longValue();
+            } else {
+                castedValues[i] = value;
+            }
+        }
+
+        // Create the field item.
+        try {
+            return fieldType.getDeclaredConstructor(valueType).newInstance(new Object[]{castedValues});
+        } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+            throw new PlcRuntimeException("Error initializing field class " + fieldType.getSimpleName(), e);
+        }
+    }
+
+    private BaseDefaultFieldItem internalEncodeFloatingPoint(PlcField field, Object[] values) {
+        S7Field s7Field = (S7Field) field;
+
+        // Initialize the constraints.
+        Double minValue;
+        Double maxValue;
+        Class<? extends BaseDefaultFieldItem> fieldType;
+        Class<?> valueType;
+        Object[] castedValues;
+        switch (s7Field.getDataType()) {
+            case REAL:
+                minValue = (double) -Float.MAX_VALUE;
+                maxValue = (double) Float.MAX_VALUE;
+                fieldType = DefaultFloatFieldItem.class;
+                valueType = Float[].class;
+                castedValues = new Float[values.length];
+                break;
+            case LREAL:
+                minValue = -Double.MAX_VALUE;
+                maxValue = Double.MAX_VALUE;
+                fieldType = DefaultDoubleFieldItem.class;
+                valueType = Double[].class;
+                castedValues = new Double[values.length];
+                break;
+            default:
+                throw new IllegalArgumentException(
+                    "Cannot assign floating point values to " + s7Field.getDataType().name() + " fields.");
+        }
+
+        // Check the constraints
+        for (int i = 0; i < values.length; i++) {
+            Double value;
+            if (values[i] instanceof Float) {
+                value = ((Float) values[i]).doubleValue();
+            } else if (values[i] instanceof Double) {
+                value = (Double) values[i];
+            } else {
+                throw new IllegalArgumentException(
+                    "Value of type " + values[i].getClass().getName() +
+                        " is not assignable to " + s7Field.getDataType().name() + " fields.");
+            }
+            if (value < minValue) {
+                throw new IllegalArgumentException(
+                    "Value of " + value + " exceeds allowed minimum for type "
+                        + s7Field.getDataType().name() + " (min " + minValue.toString() + ")");
+            }
+            if (value > maxValue) {
+                throw new IllegalArgumentException(
+                    "Value of " + value + " exceeds allowed maximum for type "
+                        + s7Field.getDataType().name() + " (max " + maxValue.toString() + ")");
+            }
+            if (valueType == Float[].class) {
+                castedValues[i] = value.floatValue();
+            } else {
+                castedValues[i] = value;
+            }
+        }
+
+        // Create the field item.
+        try {
+            return fieldType.getDeclaredConstructor(valueType).newInstance(new Object[]{castedValues});
+        } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+            throw new PlcRuntimeException("Error initializing field class " + fieldType.getSimpleName(), e);
+        }
+    }
+
+    private BaseDefaultFieldItem internalEncodeString(PlcField field, Object[] values) {
+        S7Field s7Field = (S7Field) field;
+
+        // Initialize the constraints.
+        int maxLength;
+        boolean encoding16Bit;
+        switch (s7Field.getDataType()) {
+            case CHAR:
+                maxLength = 1;
+                encoding16Bit = false;
+                break;
+            case WCHAR:
+                maxLength = 1;
+                encoding16Bit = true;
+                break;
+            case STRING:
+                maxLength = 254;
+                encoding16Bit = false;
+                break;
+            case WSTRING:
+                maxLength = 254;
+                encoding16Bit = true;
+                break;
+            default:
+                throw new IllegalArgumentException(
+                    "Cannot assign string values to " + s7Field.getDataType().name() + " fields.");
+        }
+
+        // Check the constraints and create the strings.
+        List<String> stringValues = new LinkedList<>();
+        for (Object value : values) {
+            if (value instanceof String) {
+                String stringValue = (String) value;                
+                if (stringValue.length() > maxLength) {
+                    throw new IllegalArgumentException(
+                        "String length " + stringValue.length() + " exceeds allowed maximum for type "
+                            + s7Field.getDataType().name() + " (max " + maxLength + ")");
+                }
+                stringValues.add(stringValue);
+            }
+            // All other types just translate to max one String character.
+            else if (value instanceof Byte) {
+                Byte byteValue = (Byte) value;
+                byte[] stringBytes = new byte[]{byteValue};
+                if (encoding16Bit) {
+                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_16));
+                } else {
+                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_8));
+                }
+            } else if (value instanceof Character) {
+                Character characterValue = (Character) value;
+                byte[] stringBytes = new byte[]{(byte) characterValue.charValue()};
+                if (encoding16Bit) {
+                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_16));
+                } else {
+                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_8));
+                }                
+            } else if (value instanceof Short) {
+                Short shortValue = (Short) value;
+                byte[] stringBytes = new byte[2];
+                stringBytes[0] = (byte) (shortValue >> 8);
+                stringBytes[1] = (byte) (shortValue & 0xFF);
+                if (encoding16Bit) {
+                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_16));
+                } else {
+                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_8));
+                }
+            } else if (value instanceof Integer) {
+                Integer integerValue = (Integer) value;
+                byte[] stringBytes = new byte[4];
+                stringBytes[0] = (byte) ((integerValue >> 24) & 0xFF);
+                stringBytes[1] = (byte) ((integerValue >> 16) & 0xFF);
+                stringBytes[2] = (byte) ((integerValue >> 8) & 0xFF);
+                stringBytes[3] = (byte) (integerValue & 0xFF);
+                if (encoding16Bit) {
+                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_16));
+                } else {
+                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_8));
+                }
+            } else if (value instanceof Long) {
+                Long longValue = (Long) value;
+                byte[] stringBytes = new byte[8];
+                stringBytes[0] = (byte) ((longValue >> 56) & 0xFF);
+                stringBytes[1] = (byte) ((longValue >> 48) & 0xFF);
+                stringBytes[2] = (byte) ((longValue >> 40) & 0xFF);
+                stringBytes[3] = (byte) ((longValue >> 32) & 0xFF);
+                stringBytes[4] = (byte) ((longValue >> 24) & 0xFF);
+                stringBytes[5] = (byte) ((longValue >> 16) & 0xFF);
+                stringBytes[6] = (byte) ((longValue >> 8) & 0xFF);
+                stringBytes[7] = (byte) (longValue & 0xFF);
+                if (encoding16Bit) {
+                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_16));
+                } else {
+                    stringValues.add(new String(stringBytes, StandardCharsets.UTF_8));
+                }
+            } else {
+                throw new IllegalArgumentException(
+                    "Value of type " + value.getClass().getName() +
+                        " is not assignable to " + s7Field.getDataType().name() + " fields.");
+            }
+        }
+
+        // Create the field item.
+        return new DefaultStringFieldItem(stringValues.toArray(new String[0]));
+    }
+
+    private BaseDefaultFieldItem internalEncodeTemporal(PlcField field, Object[] values) {
+        S7Field s7Field = (S7Field) field;
+        BigInteger minValue;
+        BigInteger maxValue;
+        Class<? extends BaseDefaultFieldItem> fieldType = null;
+        Class<?> valueType = null;
+        Object[] castedValues = null;        
+        switch (s7Field.getDataType()) {
+            case S5TIME:
+                // TODO: Check new type
+                minValue = BigInteger.valueOf(0x0000);
+                maxValue = BigInteger.valueOf(0x3999);  
+                fieldType = DefaultDurationFieldItem.class;
+                valueType = Duration[].class;
+                castedValues = new Duration[values.length];
+                for (int i=0; i<values.length; i++){
+                    castedValues[i]  = (Duration) values[i];                
+                };
+                break;
+            case TIME:
+                // TODO: I think I should implement this some time ...
+                minValue = BigInteger.valueOf((long) Integer.MIN_VALUE);
+                maxValue = BigInteger.valueOf((long) Integer.MAX_VALUE);
+                fieldType = DefaultDurationFieldItem.class;
+                valueType = Duration[].class;
+                castedValues = new Duration[values.length];
+                for (int i=0; i<values.length; i++){
+                    castedValues[i]  = (Duration) values[i];
+                }
+                break;
+            case DATE:
+                // TODO: I think I should implement this some time ...
+
+                minValue = BigInteger.valueOf(0x0000);
+                maxValue = BigInteger.valueOf(0xFFFF);
+                fieldType = DefaultLocalDateFieldItem.class;
+                valueType = LocalDate[].class;
+                castedValues = new LocalDate[values.length];
+                for (int i=0; i<values.length; i++){
+                    castedValues[i]  = (LocalDate) values[i];
+                }      
+                break;
+            case TOD:    
+            case TIME_OF_DAY:
+                // TODO: I think I should implement this some time ...  
+                minValue = BigInteger.valueOf((long) Integer.MIN_VALUE);
+                maxValue = BigInteger.valueOf((long) Integer.MAX_VALUE);
+                fieldType = DefaultLocalTimeFieldItem.class;
+                valueType = LocalTime[].class;
+                castedValues = new LocalTime[values.length];
+                for (int i=0; i<values.length; i++){
+                    castedValues[i]  = (LocalTime) values[i];
+                }      
+                break; 
+            case DT:
+            case DATE_AND_TIME:
+                // TODO: I think I should implement this some time ...  
+                minValue = BigInteger.valueOf((long) Integer.MIN_VALUE);
+                maxValue = BigInteger.valueOf((long) Integer.MAX_VALUE);
+                fieldType = DefaultLocalDateTimeFieldItem.class;
+                valueType = LocalDateTime[].class;
+                castedValues = new LocalDateTime[values.length];
+                for (int i=0; i<values.length; i++){
+                    castedValues[i]  = (LocalDateTime) values[i];
+                }      
+                break;      
+            default:
+                throw new IllegalArgumentException(
+                    "Cannot assign temporal values to " + s7Field.getDataType().name() + " fields.");
+        };
+        
+        
+        
+        
+        // Create the field item.
+        try {
+            return fieldType.getDeclaredConstructor(valueType).newInstance(new Object[]{castedValues});
+        } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+            throw new PlcRuntimeException("Error initializing field class " + fieldType.getSimpleName(), e);
+        }        
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7RequestSizeCalculator.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7RequestSizeCalculator.java
index 392c1c90942..3d722eae49e 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7RequestSizeCalculator.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7RequestSizeCalculator.java
@@ -1,158 +1,158 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.util;
-
-import org.apache.commons.lang3.NotImplementedException;
-import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
-import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
-import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
-import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
-import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
-import org.apache.plc4x.java.s7.netty.model.types.VariableAddressingMode;
-
-import java.util.List;
-
-/**
- * When sending S7 messages we have to pay attention to the size of the message
- * in it's serialized form as we have to stay below the agreed upon maximum
- * PDU size. This helper calculates this message size and hereby helps implementing
- * different strategies for optimizing requests.
- */
-public class S7RequestSizeCalculator {
-
-    private S7RequestSizeCalculator() {
-        // We don't want this to be instantiated.
-    }
-
-    /**
-     * Calculate the size of a request message.
-     *
-     * @param requestMessage the request message we want to get the size for.
-     * @return the size in bytes this message will have.
-     */
-    public static short getRequestMessageSize(S7RequestMessage requestMessage) {
-        // The fixed header size.
-        short size = 10;
-        size += getRequestParametersSize(requestMessage.getParameters());
-        size += getRequestPayloadsSize(requestMessage.getPayloads());
-        return size;
-    }
-
-    /**
-     * Calculates the size adding an item (parameter and eventually payload) would add to any existing
-     * message.
-     *
-     * @param varParameterItem parameter item.
-     * @param varPayloadItem corresponding payload (can be null).
-     * @return size in bytes this item would add to an existing request message.
-     */
-    public static short getRequestItemTotalSize(VarParameterItem varParameterItem, VarPayloadItem varPayloadItem) {
-        return (short) (getRequestReadWriteVarParameterItemSize(varParameterItem) + ((varPayloadItem != null) ?
-            getRequestWriteVarPayloadItemSize(varPayloadItem) : 0));
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Internal Request size calculations.
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    private static short getRequestParametersSize(List<S7Parameter> parameters) {
-        short l = 0;
-        if (parameters != null) {
-            for (S7Parameter parameter : parameters) {
-                l += getRequestParameterSize(parameter);
-            }
-        }
-        return l;
-    }
-
-    private static short getRequestParameterSize(S7Parameter parameter) {
-        switch (parameter.getType()) {
-            case READ_VAR:
-            case WRITE_VAR:
-                return getRequestReadWriteVarParameterSize((VarParameter) parameter);
-            case SETUP_COMMUNICATION:
-                return 8;
-            default:
-                throw new NotImplementedException("Not implemented");
-        }
-    }
-
-    private static short getRequestReadWriteVarParameterSize(VarParameter varParameter) {
-        // A var parameter always has a minimum size of 2 bytes (type of parameter, number of items)
-        short length = 2;
-        // Then come the items ...
-        for (VarParameterItem varParameterItem : varParameter.getItems()) {
-            length += getRequestReadWriteVarParameterItemSize(varParameterItem);
-        }
-        return length;
-    }
-
-    private static short getRequestReadWriteVarParameterItemSize(VarParameterItem varParameterItem) {
-        VariableAddressingMode addressMode = varParameterItem.getAddressingMode();
-        // S7 Any items have a fixed size of 12 bytes.
-        if (addressMode == VariableAddressingMode.S7ANY) {
-            return 12;
-        } else {
-            throw new NotImplementedException("Not implemented");
-        }
-    }
-
-    private static short getRequestPayloadsSize(List<S7Payload> payloads) {
-        short l = 0;
-        if (payloads != null) {
-            for (S7Payload payload : payloads) {
-                l += getRequestPayloadSize(payload);
-            }
-        }
-        return l;
-    }
-
-    private static short getRequestPayloadSize(S7Payload payload) {
-        switch (payload.getType()) {
-            case WRITE_VAR:
-                return getRequestWriteVarPayloadSize((VarPayload) payload);
-            default:
-                throw new NotImplementedException("Not implemented");
-        }
-    }
-
-    private static short getRequestWriteVarPayloadSize(VarPayload varPayload) {
-        short length = 0;
-        // Then come the items ...
-        for (VarPayloadItem varPayloadItem : varPayload.getItems()) {
-            length += getRequestWriteVarPayloadItemSize(varPayloadItem);
-        }
-        return length;
-    }
-
-    private static short getRequestWriteVarPayloadItemSize(VarPayloadItem varPayloadItem) {
-        // A var payload item always has a minimum size of 4 bytes (return code, transport size, size (two bytes))
-        short length = 4;
-        // Data is a byte array ... so there is no need to translate this into number of bytes.
-        length += varPayloadItem.getData().length;
-        // It seems that bit payloads need a additional separating 0x00 byte.
-        if(varPayloadItem.getDataTransportSize().isSizeInBits()) {
-            length += 1;
-        }
-        return length;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.util;
+
+import org.apache.commons.lang3.NotImplementedException;
+import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
+import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
+import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
+import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
+import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
+import org.apache.plc4x.java.s7.netty.model.types.VariableAddressingMode;
+
+import java.util.List;
+
+/**
+ * When sending S7 messages we have to pay attention to the size of the message
+ * in it's serialized form as we have to stay below the agreed upon maximum
+ * PDU size. This helper calculates this message size and hereby helps implementing
+ * different strategies for optimizing requests.
+ */
+public class S7RequestSizeCalculator {
+
+    private S7RequestSizeCalculator() {
+        // We don't want this to be instantiated.
+    }
+
+    /**
+     * Calculate the size of a request message.
+     *
+     * @param requestMessage the request message we want to get the size for.
+     * @return the size in bytes this message will have.
+     */
+    public static short getRequestMessageSize(S7RequestMessage requestMessage) {
+        // The fixed header size.
+        short size = 10;
+        size += getRequestParametersSize(requestMessage.getParameters());
+        size += getRequestPayloadsSize(requestMessage.getPayloads());
+        return size;
+    }
+
+    /**
+     * Calculates the size adding an item (parameter and eventually payload) would add to any existing
+     * message.
+     *
+     * @param varParameterItem parameter item.
+     * @param varPayloadItem corresponding payload (can be null).
+     * @return size in bytes this item would add to an existing request message.
+     */
+    public static short getRequestItemTotalSize(VarParameterItem varParameterItem, VarPayloadItem varPayloadItem) {
+        return (short) (getRequestReadWriteVarParameterItemSize(varParameterItem) + ((varPayloadItem != null) ?
+            getRequestWriteVarPayloadItemSize(varPayloadItem) : 0));
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Internal Request size calculations.
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    private static short getRequestParametersSize(List<S7Parameter> parameters) {
+        short l = 0;
+        if (parameters != null) {
+            for (S7Parameter parameter : parameters) {
+                l += getRequestParameterSize(parameter);
+            }
+        }
+        return l;
+    }
+
+    private static short getRequestParameterSize(S7Parameter parameter) {
+        switch (parameter.getType()) {
+            case READ_VAR:
+            case WRITE_VAR:
+                return getRequestReadWriteVarParameterSize((VarParameter) parameter);
+            case SETUP_COMMUNICATION:
+                return 8;
+            default:
+                throw new NotImplementedException("Not implemented");
+        }
+    }
+
+    private static short getRequestReadWriteVarParameterSize(VarParameter varParameter) {
+        // A var parameter always has a minimum size of 2 bytes (type of parameter, number of items)
+        short length = 2;
+        // Then come the items ...
+        for (VarParameterItem varParameterItem : varParameter.getItems()) {
+            length += getRequestReadWriteVarParameterItemSize(varParameterItem);
+        }
+        return length;
+    }
+
+    private static short getRequestReadWriteVarParameterItemSize(VarParameterItem varParameterItem) {
+        VariableAddressingMode addressMode = varParameterItem.getAddressingMode();
+        // S7 Any items have a fixed size of 12 bytes.
+        if (addressMode == VariableAddressingMode.S7ANY) {
+            return 12;
+        } else {
+            throw new NotImplementedException("Not implemented");
+        }
+    }
+
+    private static short getRequestPayloadsSize(List<S7Payload> payloads) {
+        short l = 0;
+        if (payloads != null) {
+            for (S7Payload payload : payloads) {
+                l += getRequestPayloadSize(payload);
+            }
+        }
+        return l;
+    }
+
+    private static short getRequestPayloadSize(S7Payload payload) {
+        switch (payload.getType()) {
+            case WRITE_VAR:
+                return getRequestWriteVarPayloadSize((VarPayload) payload);
+            default:
+                throw new NotImplementedException("Not implemented");
+        }
+    }
+
+    private static short getRequestWriteVarPayloadSize(VarPayload varPayload) {
+        short length = 0;
+        // Then come the items ...
+        for (VarPayloadItem varPayloadItem : varPayload.getItems()) {
+            length += getRequestWriteVarPayloadItemSize(varPayloadItem);
+        }
+        return length;
+    }
+
+    private static short getRequestWriteVarPayloadItemSize(VarPayloadItem varPayloadItem) {
+        // A var payload item always has a minimum size of 4 bytes (return code, transport size, size (two bytes))
+        short length = 4;
+        // Data is a byte array ... so there is no need to translate this into number of bytes.
+        length += varPayloadItem.getData().length;
+        // It seems that bit payloads need a additional separating 0x00 byte.
+        if(varPayloadItem.getDataTransportSize().isSizeInBits()) {
+            length += 1;
+        }
+        return length;
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7ResponseSizeEstimator.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7ResponseSizeEstimator.java
index db8fe06cf88..9f097ed27b5 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7ResponseSizeEstimator.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7ResponseSizeEstimator.java
@@ -1,179 +1,179 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.util;
-
-import java.util.List;
-import org.apache.commons.lang3.NotImplementedException;
-import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
-import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
-import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
-import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
-import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
-
-/**
- * When sending S7 messages we have to also pay attention to the expected size
- * of a response for a given request. This helper estimates this response size
- * and hereby helps implementing different strategies for optimizing requests.
- */
-public class S7ResponseSizeEstimator {
-
-    private S7ResponseSizeEstimator() {
-        // We don't want this to be instantiated.
-    }
-
-    /**
-     * Estimate the size of the response for a given request object.
-     * This is needed in order to decide if a request will be able to be processed
-     * as S7 PLCs will return errors if a request will produce a response that exceeds
-     * the agreed upon PDU size.
-     *
-     * @param requestMessage the request message for which we want to estimate the response size for.
-     * @return the estimated size in bytes the response for this message will have.
-     */
-    public static short getEstimatedResponseMessageSize(S7RequestMessage requestMessage) {
-        // The fixed header size (two bytes more than the request for error class and code values).
-        short size = 12;
-        size += getEstimatedResponseParametersSize(requestMessage.getParameters());
-        size += getEstimatedResponsePayloadsSize(requestMessage.getParameters());
-        return size;
-    }
-
-    /**
-     * Calculates the estimated size adding an item (parameter and eventually payload) would add to the
-     * response for a current request message. While for the parameters the size of the items depends on
-     * if they are requests or responses, the payload depends on if it's a read or write operation.
-     *
-     * @param varParameterItem parameter item.
-     * @param varPayloadItem payload item.
-     * @return size in bytes in the corresponding response message, this item would add to an existing response message.
-     */
-    public static short getEstimatedResponseReadItemTotalSize(VarParameterItem varParameterItem,
-                                                              VarPayloadItem varPayloadItem) {
-        // If both are provided, this is a write request.
-        if(varPayloadItem != null) {
-            // When writing values the item size in the response is constantly 1 byte.
-            return getEstimatedResponseWriteVarPayloadItemSize(varParameterItem);
-        }
-        // If the payload is empty, this is a read request and the response could contain real information.
-        else {
-            return getEstimatedResponseReadVarPayloadItemSize(varParameterItem);
-        }
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Internal Response size estimations.
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    private static short getEstimatedResponseParametersSize(List<S7Parameter> parameters) {
-        short l = 0;
-        if (parameters != null) {
-            for (S7Parameter parameter : parameters) {
-                l += getEstimatedResponseParameterSize(parameter);
-            }
-        }
-        return l;
-    }
-
-    private static short getEstimatedResponseParameterSize(S7Parameter parameter) {
-        switch (parameter.getType()) {
-            case READ_VAR:
-            case WRITE_VAR:
-                return getEstimatedResponseReadWriteVarParameterSize((VarParameter) parameter);
-            case SETUP_COMMUNICATION:
-                return 8;
-            default:
-                throw new NotImplementedException("Not implemented");
-        }
-    }
-
-    private static short getEstimatedResponseReadWriteVarParameterSize(VarParameter varParameter) {
-        // In the response the var parameter only consists of the type and number of items.
-        return 2;
-    }
-
-    private static short getEstimatedResponsePayloadsSize(List<S7Parameter> parameters) {
-        short l = 0;
-        if (parameters != null) {
-            for (S7Parameter parameter : parameters) {
-                l += getEstimatedResponsePayloadSize(parameter);
-            }
-        }
-        return l;
-    }
-
-    private static short getEstimatedResponsePayloadSize(S7Parameter parameter) {
-        switch (parameter.getType()) {
-            case READ_VAR:
-                return getEstimatedResponseReadVarPayloadSize((VarParameter) parameter);
-            case WRITE_VAR:
-                return getEstimatedResponseWriteVarPayloadSize((VarParameter) parameter);
-            // As we already handled all cases in the parameter size section, SETUP_COMMUNICATION
-            // is the last possible option.
-            default :
-                return 0;
-        }
-    }
-
-    private static short getEstimatedResponseReadVarPayloadSize(VarParameter varParameter) {
-        short length = 0;
-        // Then come the items ...
-        for (VarParameterItem varParameterItem : varParameter.getItems()) {
-            length += getEstimatedResponseReadVarPayloadItemSize(varParameterItem);
-        }
-        return length;
-    }
-
-    //TODO: Use BaseType for length calculation. (Ok)
-    //TODO: For S7 STRING, maximum length is 254 -> One STRING request -> S7RequestMessage. HMI used CHAR array's 
-    private static short getEstimatedResponseReadVarPayloadItemSize(VarParameterItem varParameterItem) {
-        // A var payload item always has a minimum size of 4 bytes (return code, transport size, size (two bytes))
-        short length = 4;
-        short base =0;
-        S7AnyVarParameterItem s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameterItem;
-        
-        base = (s7AnyVarParameterItem.getDataType().getBaseType() == null)?
-                (short) s7AnyVarParameterItem.getDataType().getSizeInBytes():
-                (short)(s7AnyVarParameterItem.getDataType().getSizeInBytes() *
-                s7AnyVarParameterItem.getDataType().getBaseType().getSizeInBytes());
-        
-        length +=
-            s7AnyVarParameterItem.getNumElements() * base;
-        // It seems that bit payloads need a additional separating 0x00 byte.
-        if(s7AnyVarParameterItem.getDataType() == TransportSize.BOOL) {
-            length += 1;
-        }
-        return length;
-    }
-
-    private static short getEstimatedResponseWriteVarPayloadSize(VarParameter varParameter) {
-        short length = 0;
-        for (VarParameterItem varParameterItem : varParameter.getItems()) {
-            length += getEstimatedResponseWriteVarPayloadItemSize(varParameterItem);
-        }
-        return length;
-    }
-
-    private static short getEstimatedResponseWriteVarPayloadItemSize(VarParameterItem varParameterItem) {
-        // This is just one byte containing the error code.
-        return 1;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.util;
+
+import java.util.List;
+import org.apache.commons.lang3.NotImplementedException;
+import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
+import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
+import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
+import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
+import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
+
+/**
+ * When sending S7 messages we have to also pay attention to the expected size
+ * of a response for a given request. This helper estimates this response size
+ * and hereby helps implementing different strategies for optimizing requests.
+ */
+public class S7ResponseSizeEstimator {
+
+    private S7ResponseSizeEstimator() {
+        // We don't want this to be instantiated.
+    }
+
+    /**
+     * Estimate the size of the response for a given request object.
+     * This is needed in order to decide if a request will be able to be processed
+     * as S7 PLCs will return errors if a request will produce a response that exceeds
+     * the agreed upon PDU size.
+     *
+     * @param requestMessage the request message for which we want to estimate the response size for.
+     * @return the estimated size in bytes the response for this message will have.
+     */
+    public static short getEstimatedResponseMessageSize(S7RequestMessage requestMessage) {
+        // The fixed header size (two bytes more than the request for error class and code values).
+        short size = 12;
+        size += getEstimatedResponseParametersSize(requestMessage.getParameters());
+        size += getEstimatedResponsePayloadsSize(requestMessage.getParameters());
+        return size;
+    }
+
+    /**
+     * Calculates the estimated size adding an item (parameter and eventually payload) would add to the
+     * response for a current request message. While for the parameters the size of the items depends on
+     * if they are requests or responses, the payload depends on if it's a read or write operation.
+     *
+     * @param varParameterItem parameter item.
+     * @param varPayloadItem payload item.
+     * @return size in bytes in the corresponding response message, this item would add to an existing response message.
+     */
+    public static short getEstimatedResponseReadItemTotalSize(VarParameterItem varParameterItem,
+                                                              VarPayloadItem varPayloadItem) {
+        // If both are provided, this is a write request.
+        if(varPayloadItem != null) {
+            // When writing values the item size in the response is constantly 1 byte.
+            return getEstimatedResponseWriteVarPayloadItemSize(varParameterItem);
+        }
+        // If the payload is empty, this is a read request and the response could contain real information.
+        else {
+            return getEstimatedResponseReadVarPayloadItemSize(varParameterItem);
+        }
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Internal Response size estimations.
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    private static short getEstimatedResponseParametersSize(List<S7Parameter> parameters) {
+        short l = 0;
+        if (parameters != null) {
+            for (S7Parameter parameter : parameters) {
+                l += getEstimatedResponseParameterSize(parameter);
+            }
+        }
+        return l;
+    }
+
+    private static short getEstimatedResponseParameterSize(S7Parameter parameter) {
+        switch (parameter.getType()) {
+            case READ_VAR:
+            case WRITE_VAR:
+                return getEstimatedResponseReadWriteVarParameterSize((VarParameter) parameter);
+            case SETUP_COMMUNICATION:
+                return 8;
+            default:
+                throw new NotImplementedException("Not implemented");
+        }
+    }
+
+    private static short getEstimatedResponseReadWriteVarParameterSize(VarParameter varParameter) {
+        // In the response the var parameter only consists of the type and number of items.
+        return 2;
+    }
+
+    private static short getEstimatedResponsePayloadsSize(List<S7Parameter> parameters) {
+        short l = 0;
+        if (parameters != null) {
+            for (S7Parameter parameter : parameters) {
+                l += getEstimatedResponsePayloadSize(parameter);
+            }
+        }
+        return l;
+    }
+
+    private static short getEstimatedResponsePayloadSize(S7Parameter parameter) {
+        switch (parameter.getType()) {
+            case READ_VAR:
+                return getEstimatedResponseReadVarPayloadSize((VarParameter) parameter);
+            case WRITE_VAR:
+                return getEstimatedResponseWriteVarPayloadSize((VarParameter) parameter);
+            // As we already handled all cases in the parameter size section, SETUP_COMMUNICATION
+            // is the last possible option.
+            default :
+                return 0;
+        }
+    }
+
+    private static short getEstimatedResponseReadVarPayloadSize(VarParameter varParameter) {
+        short length = 0;
+        // Then come the items ...
+        for (VarParameterItem varParameterItem : varParameter.getItems()) {
+            length += getEstimatedResponseReadVarPayloadItemSize(varParameterItem);
+        }
+        return length;
+    }
+
+    //TODO: Use BaseType for length calculation. (Ok)
+    //TODO: For S7 STRING, maximum length is 254 -> One STRING request -> S7RequestMessage. HMI used CHAR array's 
+    private static short getEstimatedResponseReadVarPayloadItemSize(VarParameterItem varParameterItem) {
+        // A var payload item always has a minimum size of 4 bytes (return code, transport size, size (two bytes))
+        short length = 4;
+        short base =0;
+        S7AnyVarParameterItem s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameterItem;
+        
+        base = (s7AnyVarParameterItem.getDataType().getBaseType() == null)?
+                (short) s7AnyVarParameterItem.getDataType().getSizeInBytes():
+                (short)(s7AnyVarParameterItem.getDataType().getSizeInBytes() *
+                s7AnyVarParameterItem.getDataType().getBaseType().getSizeInBytes());
+        
+        length +=
+            s7AnyVarParameterItem.getNumElements() * base;
+        // It seems that bit payloads need a additional separating 0x00 byte.
+        if(s7AnyVarParameterItem.getDataType() == TransportSize.BOOL) {
+            length += 1;
+        }
+        return length;
+    }
+
+    private static short getEstimatedResponseWriteVarPayloadSize(VarParameter varParameter) {
+        short length = 0;
+        for (VarParameterItem varParameterItem : varParameter.getItems()) {
+            length += getEstimatedResponseWriteVarPayloadItemSize(varParameterItem);
+        }
+        return length;
+    }
+
+    private static short getEstimatedResponseWriteVarPayloadItemSize(VarParameterItem varParameterItem) {
+        // This is just one byte containing the error code.
+        return 1;
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelper.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelper.java
index 47505d11be2..50be40a25bb 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelper.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelper.java
@@ -1,177 +1,177 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.util;
-
-import java.util.List;
-import org.apache.plc4x.java.s7.netty.model.params.CpuCyclicServicesRequestParameter;
-import org.apache.plc4x.java.s7.netty.model.params.CpuServicesRequestParameter;
-import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
-import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
-import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.AlarmMessagePayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.CpuCyclicServicesRequestPayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.CpuMessageSubscriptionServicePayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.CpuServicesPayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
-import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.ssls.SslDataRecord;
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
-import org.apache.plc4x.java.s7.netty.model.types.VariableAddressingMode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class S7SizeHelper {
-
-    private static final Logger logger = LoggerFactory.getLogger(S7SizeHelper.class);
-
-    private S7SizeHelper() {
-        // We don't want this to be instantiated.
-    }
-
-    public static short getParametersLength(List<S7Parameter> parameters) {
-        short l = 0;
-        if (parameters != null) {
-            for (S7Parameter parameter : parameters) {
-                l += getParameterLength(parameter);
-            }
-        }
-        return l;
-    }
-
-    public static short getPayloadsLength(List<S7Payload> payloads) {
-        short l = 0;
-        if (payloads == null) {
-            return 0;
-        }
-
-        for (S7Payload payload : payloads) {
-            if(payload instanceof VarPayload) {
-                VarPayload varPayload = (VarPayload) payload;
-                int i=1;
-                for (VarPayloadItem payloadItem : varPayload.getItems()) {
-                    //Check for "Fill Byte"
-                    if((payloadItem.getData().length == 1) && (varPayload.getItems().size() > i) || (payloadItem.getData().length % 2 != 0)) {
-                        l += 1;
-                    }
-                    l += getPayloadLength(payloadItem);
-                    i++;
-                }
-            } else if(payload instanceof CpuServicesPayload) {
-                CpuServicesPayload cpuServicesPayload = (CpuServicesPayload) payload;
-                if(cpuServicesPayload.getReturnCode() == DataTransportErrorCode.NOT_FOUND ){
-                    return 4;
-                } else  if(cpuServicesPayload.getSslDataRecords().isEmpty()) {
-                    return 8;
-                } else {
-                    short length = 0;
-                    for (SslDataRecord sslDataRecord : cpuServicesPayload.getSslDataRecords()) {
-                        length += sslDataRecord.getLengthInWords() * 2;
-                    }
-                    return length;
-                }
-            } else if(payload instanceof CpuMessageSubscriptionServicePayload) {
-                CpuMessageSubscriptionServicePayload submsg = (CpuMessageSubscriptionServicePayload) payload;
-                if ((submsg.getSubscribedEvents() & 0x80) == 0x00){
-                    return 14;
-                } else {
-                    return 16;                    
-                }
-  
-            } else if(payload instanceof AlarmMessagePayload) {
-                AlarmMessagePayload data = (AlarmMessagePayload) payload;
-                l += data.getLength();
-                l += 0x04; //TODO: Check for other combinations
-                return l;
-            } else if(payload instanceof CpuCyclicServicesRequestPayload) {
-                CpuCyclicServicesRequestPayload data = (CpuCyclicServicesRequestPayload) payload;
-                l += data.getLength();
-                l += 0x04; //TODO: Check for other combinations
-                return l;
-            }
-        }
-        return l;
-    }
-
-    public static short getParameterLength(S7Parameter parameter) {
-        if (parameter == null) {
-            return 0;
-        }
-
-        switch (parameter.getType()) {
-            case MODE_TRANSITION:
-                return 8;
-            case READ_VAR:
-            case WRITE_VAR:
-                return getReadWriteVarParameterLength((VarParameter) parameter);
-            case SETUP_COMMUNICATION:
-                return 8;
-            case CPU_SERVICES:
-                if(parameter instanceof CpuServicesRequestParameter) {
-                    return 8;
-                } else if(parameter instanceof CpuCyclicServicesRequestParameter) {
-                    return 8;   
-                } else {
-                    return 12;
-                }
-            default:
-                logger.error("Not implemented");
-                return 0;
-        }
-    }
-
-    public static short getReadWriteVarParameterLength(VarParameter parameter) {
-        short length = 2;
-        for (VarParameterItem varParameterItem : parameter.getItems()) {
-            VariableAddressingMode addressMode = varParameterItem.getAddressingMode();
-
-            if (addressMode == VariableAddressingMode.S7ANY) {
-                length += 12;
-            } else {
-                logger.error("Not implemented");
-            }
-        }
-        return length;
-    }
-
-    public static short getPayloadLength(VarParameterItem parameterItem) {
-        if (parameterItem == null) {
-            return 0;
-        }
-
-        if(parameterItem instanceof S7AnyVarParameterItem) {
-            S7AnyVarParameterItem anyVarParameterItem = (S7AnyVarParameterItem) parameterItem;
-            return (short) (4 + (
-                (anyVarParameterItem.getNumElements()) * anyVarParameterItem.getDataType().getSizeInBytes()));
-        } else {
-            logger.error("Not implemented");
-            return 0;
-        }
-    }
-
-    public static short getPayloadLength(VarPayloadItem payloadItem) {
-        if (payloadItem == null) {
-            return 0;
-        }
-
-        return (short) (4 + payloadItem.getData().length);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.util;
+
+import java.util.List;
+import org.apache.plc4x.java.s7.netty.model.params.CpuCyclicServicesRequestParameter;
+import org.apache.plc4x.java.s7.netty.model.params.CpuServicesRequestParameter;
+import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
+import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
+import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.AlarmMessagePayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuCyclicServicesRequestPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuMessageSubscriptionServicePayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuServicesPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
+import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.ssls.SslDataRecord;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
+import org.apache.plc4x.java.s7.netty.model.types.VariableAddressingMode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class S7SizeHelper {
+
+    private static final Logger logger = LoggerFactory.getLogger(S7SizeHelper.class);
+
+    private S7SizeHelper() {
+        // We don't want this to be instantiated.
+    }
+
+    public static short getParametersLength(List<S7Parameter> parameters) {
+        short l = 0;
+        if (parameters != null) {
+            for (S7Parameter parameter : parameters) {
+                l += getParameterLength(parameter);
+            }
+        }
+        return l;
+    }
+
+    public static short getPayloadsLength(List<S7Payload> payloads) {
+        short l = 0;
+        if (payloads == null) {
+            return 0;
+        }
+
+        for (S7Payload payload : payloads) {
+            if(payload instanceof VarPayload) {
+                VarPayload varPayload = (VarPayload) payload;
+                int i=1;
+                for (VarPayloadItem payloadItem : varPayload.getItems()) {
+                    //Check for "Fill Byte"
+                    if((payloadItem.getData().length == 1) && (varPayload.getItems().size() > i) || (payloadItem.getData().length % 2 != 0)) {
+                        l += 1;
+                    }
+                    l += getPayloadLength(payloadItem);
+                    i++;
+                }
+            } else if(payload instanceof CpuServicesPayload) {
+                CpuServicesPayload cpuServicesPayload = (CpuServicesPayload) payload;
+                if(cpuServicesPayload.getReturnCode() == DataTransportErrorCode.NOT_FOUND ){
+                    return 4;
+                } else  if(cpuServicesPayload.getSslDataRecords().isEmpty()) {
+                    return 8;
+                } else {
+                    short length = 0;
+                    for (SslDataRecord sslDataRecord : cpuServicesPayload.getSslDataRecords()) {
+                        length += sslDataRecord.getLengthInWords() * 2;
+                    }
+                    return length;
+                }
+            } else if(payload instanceof CpuMessageSubscriptionServicePayload) {
+                CpuMessageSubscriptionServicePayload submsg = (CpuMessageSubscriptionServicePayload) payload;
+                if ((submsg.getSubscribedEvents() & 0x80) == 0x00){
+                    return 14;
+                } else {
+                    return 16;                    
+                }
+  
+            } else if(payload instanceof AlarmMessagePayload) {
+                AlarmMessagePayload data = (AlarmMessagePayload) payload;
+                l += data.getLength();
+                l += 0x04; //TODO: Check for other combinations
+                return l;
+            } else if(payload instanceof CpuCyclicServicesRequestPayload) {
+                CpuCyclicServicesRequestPayload data = (CpuCyclicServicesRequestPayload) payload;
+                l += data.getLength();
+                l += 0x04; //TODO: Check for other combinations
+                return l;
+            }
+        }
+        return l;
+    }
+
+    public static short getParameterLength(S7Parameter parameter) {
+        if (parameter == null) {
+            return 0;
+        }
+
+        switch (parameter.getType()) {
+            case MODE_TRANSITION:
+                return 8;
+            case READ_VAR:
+            case WRITE_VAR:
+                return getReadWriteVarParameterLength((VarParameter) parameter);
+            case SETUP_COMMUNICATION:
+                return 8;
+            case CPU_SERVICES:
+                if(parameter instanceof CpuServicesRequestParameter) {
+                    return 8;
+                } else if(parameter instanceof CpuCyclicServicesRequestParameter) {
+                    return 8;   
+                } else {
+                    return 12;
+                }
+            default:
+                logger.error("Not implemented");
+                return 0;
+        }
+    }
+
+    public static short getReadWriteVarParameterLength(VarParameter parameter) {
+        short length = 2;
+        for (VarParameterItem varParameterItem : parameter.getItems()) {
+            VariableAddressingMode addressMode = varParameterItem.getAddressingMode();
+
+            if (addressMode == VariableAddressingMode.S7ANY) {
+                length += 12;
+            } else {
+                logger.error("Not implemented");
+            }
+        }
+        return length;
+    }
+
+    public static short getPayloadLength(VarParameterItem parameterItem) {
+        if (parameterItem == null) {
+            return 0;
+        }
+
+        if(parameterItem instanceof S7AnyVarParameterItem) {
+            S7AnyVarParameterItem anyVarParameterItem = (S7AnyVarParameterItem) parameterItem;
+            return (short) (4 + (
+                (anyVarParameterItem.getNumElements()) * anyVarParameterItem.getDataType().getSizeInBytes()));
+        } else {
+            logger.error("Not implemented");
+            return 0;
+        }
+    }
+
+    public static short getPayloadLength(VarPayloadItem payloadItem) {
+        if (payloadItem == null) {
+            return 0;
+        }
+
+        return (short) (4 + payloadItem.getData().length);
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7ByteReadResponse.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7ByteReadResponse.java
index 5c43374836b..125dfdee719 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7ByteReadResponse.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7ByteReadResponse.java
@@ -1,508 +1,508 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.protocol;
-
-import io.netty.buffer.ByteBuf;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.Duration;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Objects;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.messages.InternalPlcReadRequest;
-import org.apache.plc4x.java.base.messages.InternalPlcReadResponse;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-
-/**
- *
- * @author cgarcia
- */
-public class S7ByteReadResponse implements InternalPlcReadResponse{
-    
-    private final InternalPlcReadRequest request;
-    private final Map<String, Pair<PlcResponseCode, ByteBuf>> values;        
-
-    public S7ByteReadResponse(InternalPlcReadRequest request, Map<String, Pair<PlcResponseCode, ByteBuf>> values) {
-        this.request = request;
-        this.values = values;
-    }
-
-    /**
-     *
-     * @return
-     */
-    @Override
-    public Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> getValues() {
-        return null;
-    }
-   
-    public Map<String, Pair<PlcResponseCode, ByteBuf>> getByteBufValues() {
-        return values;
-    }   
-    
-    public ByteBuf getByteBufValues(String name) {
-     ByteBuf bytebuf = getByteBufInternal(name);         
-    return bytebuf;
-    }  
-
-    @Override
-    public InternalPlcReadRequest  getRequest() {
-        return request;
-    }
-
-    @Override
-    public int getNumberOfValues(String name) {
-        ByteBuf bytebuf = getByteBufInternal(name);
-        return bytebuf.capacity();
-    }
-
-    @Override
-    public Object getObject(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Object getObject(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Collection<Object> getAllObjects(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidBoolean(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidBoolean(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Boolean getBoolean(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Boolean getBoolean(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Collection<Boolean> getAllBooleans(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidByte(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidByte(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Byte getByte(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Byte getByte(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Collection<Byte> getAllBytes(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidShort(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidShort(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Short getShort(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Short getShort(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Collection<Short> getAllShorts(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Integer getInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Integer getInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Collection<Integer> getAllIntegers(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidBigInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidBigInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public BigInteger getBigInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public BigInteger getBigInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Collection<BigInteger> getAllBigIntegers(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidLong(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidLong(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Long getLong(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Long getLong(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Collection<Long> getAllLongs(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidFloat(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidFloat(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Float getFloat(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Float getFloat(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Collection<Float> getAllFloats(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidDouble(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidDouble(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Double getDouble(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Double getDouble(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Collection<Double> getAllDoubles(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidBigDecimal(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidBigDecimal(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public BigDecimal getBigDecimal(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public BigDecimal getBigDecimal(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Collection<BigDecimal> getAllBigDecimals(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidString(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidString(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public String getString(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public String getString(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Collection<String> getAllStrings(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public LocalTime getTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public LocalTime getTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Collection<LocalTime> getAllTimes(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidDate(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidDate(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public LocalDate getDate(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public LocalDate getDate(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Collection<LocalDate> getAllDates(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidDateTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidDateTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public LocalDateTime getDateTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public LocalDateTime getDateTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Collection<LocalDateTime> getAllDateTimes(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidByteArray(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public boolean isValidByteArray(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Byte[] getByteArray(String name) {
-        ByteBuf bytebuf = getByteBufInternal(name);
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Byte[] getByteArray(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Collection<Byte[]> getAllByteArrays(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");  
-    }
-
-    @Override
-    public Collection<String> getFieldNames() {
-        return request.getFieldNames();
-    }
-
-    @Override
-    public PlcField getField(String name) {
-        return request.getField(name);
-    }
-
-    @Override
-    public PlcResponseCode getResponseCode(String name) {
-        if (values.get(name) == null) {
-            throw new PlcInvalidFieldException(name);
-        }
-        return values.get(name).getKey();
-    }
-
-    @Override
-    public boolean isValidDuration(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidDuration(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Duration getDuration(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Duration getDuration(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<Duration> getAllDuration(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }            
-    
-    protected ByteBuf getByteBufInternal(String name) {
-        Objects.requireNonNull(name, "Name argument required");
-        // If this field doesn't exist, ignore it.
-        if (values.get(name) == null) {
-            throw new PlcInvalidFieldException(name);
-        }
-        //TODO: Check for error respont
-        /*
-        if (values.get(name).getKey() != PlcResponseCode.OK) {
-            throw new PlcRuntimeException("Field '" + name + "' could not be fetched, response was " + values.get(name).getKey());
-        }
-        */
-        // No need to check for "null" as this is already captured by the constructors.
-        return values.get(name).getValue();
-    }    
-    
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.protocol;
+
+import io.netty.buffer.ByteBuf;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Objects;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.messages.InternalPlcReadRequest;
+import org.apache.plc4x.java.base.messages.InternalPlcReadResponse;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7ByteReadResponse implements InternalPlcReadResponse{
+    
+    private final InternalPlcReadRequest request;
+    private final Map<String, Pair<PlcResponseCode, ByteBuf>> values;        
+
+    public S7ByteReadResponse(InternalPlcReadRequest request, Map<String, Pair<PlcResponseCode, ByteBuf>> values) {
+        this.request = request;
+        this.values = values;
+    }
+
+    /**
+     *
+     * @return
+     */
+    @Override
+    public Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> getValues() {
+        return null;
+    }
+   
+    public Map<String, Pair<PlcResponseCode, ByteBuf>> getByteBufValues() {
+        return values;
+    }   
+    
+    public ByteBuf getByteBufValues(String name) {
+     ByteBuf bytebuf = getByteBufInternal(name);         
+    return bytebuf;
+    }  
+
+    @Override
+    public InternalPlcReadRequest  getRequest() {
+        return request;
+    }
+
+    @Override
+    public int getNumberOfValues(String name) {
+        ByteBuf bytebuf = getByteBufInternal(name);
+        return bytebuf.capacity();
+    }
+
+    @Override
+    public Object getObject(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Object getObject(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<Object> getAllObjects(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidBoolean(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidBoolean(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Boolean getBoolean(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Boolean getBoolean(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<Boolean> getAllBooleans(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidByte(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidByte(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Byte getByte(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Byte getByte(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<Byte> getAllBytes(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidShort(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidShort(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Short getShort(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Short getShort(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<Short> getAllShorts(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Integer getInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Integer getInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<Integer> getAllIntegers(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<BigInteger> getAllBigIntegers(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidLong(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidLong(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Long getLong(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Long getLong(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<Long> getAllLongs(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidFloat(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidFloat(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Float getFloat(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Float getFloat(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<Float> getAllFloats(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidDouble(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidDouble(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Double getDouble(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Double getDouble(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<Double> getAllDoubles(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<BigDecimal> getAllBigDecimals(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidString(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidString(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public String getString(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public String getString(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<String> getAllStrings(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public LocalTime getTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public LocalTime getTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<LocalTime> getAllTimes(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidDate(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidDate(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public LocalDate getDate(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public LocalDate getDate(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<LocalDate> getAllDates(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidDateTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidDateTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<LocalDateTime> getAllDateTimes(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidByteArray(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public boolean isValidByteArray(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Byte[] getByteArray(String name) {
+        ByteBuf bytebuf = getByteBufInternal(name);
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Byte[] getByteArray(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<Byte[]> getAllByteArrays(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");  
+    }
+
+    @Override
+    public Collection<String> getFieldNames() {
+        return request.getFieldNames();
+    }
+
+    @Override
+    public PlcField getField(String name) {
+        return request.getField(name);
+    }
+
+    @Override
+    public PlcResponseCode getResponseCode(String name) {
+        if (values.get(name) == null) {
+            throw new PlcInvalidFieldException(name);
+        }
+        return values.get(name).getKey();
+    }
+
+    @Override
+    public boolean isValidDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDuration(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Duration getDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Duration getDuration(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Duration> getAllDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }            
+    
+    protected ByteBuf getByteBufInternal(String name) {
+        Objects.requireNonNull(name, "Name argument required");
+        // If this field doesn't exist, ignore it.
+        if (values.get(name) == null) {
+            throw new PlcInvalidFieldException(name);
+        }
+        //TODO: Check for error respont
+        /*
+        if (values.get(name).getKey() != PlcResponseCode.OK) {
+            throw new PlcRuntimeException("Field '" + name + "' could not be fetched, response was " + values.get(name).getKey());
+        }
+        */
+        // No need to check for "null" as this is already captured by the constructors.
+        return values.get(name).getValue();
+    }    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7CyclicServicesSubscriptionHandle.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7CyclicServicesSubscriptionHandle.java
index 11dbf684c06..b0414dbd801 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7CyclicServicesSubscriptionHandle.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7CyclicServicesSubscriptionHandle.java
@@ -1,79 +1,79 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-*/
-package org.apache.plc4x.java.s7.protocol;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.function.Consumer;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
-import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
-import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
-
-/**
- *
- * @author cgarcia
- */
-public class S7CyclicServicesSubscriptionHandle implements InternalPlcSubscriptionHandle {
-    
-    Set<Consumer<PlcSubscriptionEvent>> consumers = new HashSet<>();
-        
-    //CyClic Services information hanler
-    private final String fieldName; //Subscription id from the request
-    private final byte jobId; //Job-Id from cyclic subscriotion
-    private final short error; //Register the error from the suscription.
-    private final AssociatedValueItem item;
-
-    public S7CyclicServicesSubscriptionHandle(String fieldName, 
-            byte jobId, 
-            short error, 
-            AssociatedValueItem item) {
-        this.fieldName = fieldName;
-        this.jobId = jobId;
-        this.error = error;
-        this.item = item;
-    }
-
-    public Set<Consumer<PlcSubscriptionEvent>> getConsumers() {
-        return consumers;
-    }
-
-    public String getFieldName() {
-        return fieldName;
-    }
-    
-    public byte getJobId() {
-        return jobId;
-    }
-
-    public short getError() {
-        return error;
-    }
-    
-    public AssociatedValueItem getValueItem(){
-        return item;
-    }
-                           
-    @Override
-    public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer) {
-        consumers.add(consumer);
-        return () -> {consumers.remove(consumer);};
-    }
-    
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+package org.apache.plc4x.java.s7.protocol;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.function.Consumer;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
+import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
+import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7CyclicServicesSubscriptionHandle implements InternalPlcSubscriptionHandle {
+    
+    Set<Consumer<PlcSubscriptionEvent>> consumers = new HashSet<>();
+        
+    //CyClic Services information hanler
+    private final String fieldName; //Subscription id from the request
+    private final byte jobId; //Job-Id from cyclic subscriotion
+    private final short error; //Register the error from the suscription.
+    private final AssociatedValueItem item;
+
+    public S7CyclicServicesSubscriptionHandle(String fieldName, 
+            byte jobId, 
+            short error, 
+            AssociatedValueItem item) {
+        this.fieldName = fieldName;
+        this.jobId = jobId;
+        this.error = error;
+        this.item = item;
+    }
+
+    public Set<Consumer<PlcSubscriptionEvent>> getConsumers() {
+        return consumers;
+    }
+
+    public String getFieldName() {
+        return fieldName;
+    }
+    
+    public byte getJobId() {
+        return jobId;
+    }
+
+    public short getError() {
+        return error;
+    }
+    
+    public AssociatedValueItem getValueItem(){
+        return item;
+    }
+                           
+    @Override
+    public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer) {
+        consumers.add(consumer);
+        return () -> {consumers.remove(consumer);};
+    }
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7DiagnosticSubscriptionHandle.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7DiagnosticSubscriptionHandle.java
index e681537d9b8..11e803e25d5 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7DiagnosticSubscriptionHandle.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/S7DiagnosticSubscriptionHandle.java
@@ -1,80 +1,80 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-*/
-package org.apache.plc4x.java.s7.protocol;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.function.Consumer;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
-import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
-import org.apache.plc4x.java.s7.netty.model.types.SubscribedEventType;
-
-/**
- *
- * @author cgarcia
- */
-public class S7DiagnosticSubscriptionHandle implements InternalPlcSubscriptionHandle{
-    Set<Consumer<PlcSubscriptionEvent>> consumers = new HashSet<>();
-    
-    //CyClic Services information hanler
-    private final String fieldName; //Subscription id from the request
-    private final short jobId; //Job-Id from cyclic subscriotion
-    private final PlcResponseCode error; //Register the error from the suscription.       
-    private final List<SubscribedEventType> subscribedevents;     //Diagnostic events
-
-    public S7DiagnosticSubscriptionHandle(String fieldName, 
-            short jobId, 
-            PlcResponseCode error, 
-            List<SubscribedEventType> subscribedevents) {
-        this.fieldName = fieldName;
-        this.jobId = jobId;
-        this.error = error;
-        this.subscribedevents = subscribedevents;
-    }
-
-    public String getFieldName() {
-        return fieldName;
-    }
-
-    public short getJobId() {
-        return jobId;
-    }
-
-    public PlcResponseCode getError() {
-        return error;
-    }
-
-    public List<SubscribedEventType> getSubscribedevents() {
-        return subscribedevents;
-    }
-
-    public Set<Consumer<PlcSubscriptionEvent>> getConsumers() {
-        return consumers;
-    }            
-    
-    @Override
-    public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer) {
-        consumers.add(consumer);
-        return () -> {consumers.remove(consumer);};
-    }
-    
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+package org.apache.plc4x.java.s7.protocol;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Consumer;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
+import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
+import org.apache.plc4x.java.s7.netty.model.types.SubscribedEventType;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7DiagnosticSubscriptionHandle implements InternalPlcSubscriptionHandle{
+    Set<Consumer<PlcSubscriptionEvent>> consumers = new HashSet<>();
+    
+    //CyClic Services information hanler
+    private final String fieldName; //Subscription id from the request
+    private final short jobId; //Job-Id from cyclic subscriotion
+    private final PlcResponseCode error; //Register the error from the suscription.       
+    private final List<SubscribedEventType> subscribedevents;     //Diagnostic events
+
+    public S7DiagnosticSubscriptionHandle(String fieldName, 
+            short jobId, 
+            PlcResponseCode error, 
+            List<SubscribedEventType> subscribedevents) {
+        this.fieldName = fieldName;
+        this.jobId = jobId;
+        this.error = error;
+        this.subscribedevents = subscribedevents;
+    }
+
+    public String getFieldName() {
+        return fieldName;
+    }
+
+    public short getJobId() {
+        return jobId;
+    }
+
+    public PlcResponseCode getError() {
+        return error;
+    }
+
+    public List<SubscribedEventType> getSubscribedevents() {
+        return subscribedevents;
+    }
+
+    public Set<Consumer<PlcSubscriptionEvent>> getConsumers() {
+        return consumers;
+    }            
+    
+    @Override
+    public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer) {
+        consumers.add(consumer);
+        return () -> {consumers.remove(consumer);};
+    }
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmEvent.java
index cb16056e89a..132ab6e9418 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmEvent.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7AlarmEvent.java
@@ -1,698 +1,698 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.protocol.event;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.ZoneOffset;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.s7.netty.model.payloads.AlarmMessagePayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.AlarmMessageItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.MessageObjectItem;
-import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterSubFunctionGroup;
-
-/**
- *
- * @author cgarcia
- */
-public class S7AlarmEvent implements S7Event {
-    
-    public enum Fields{
-        MAP,
-        
-        TYPE,
-        TIMESTAMP,
-        TIMESTAMP_GOING,
-        TIMESTAMP_COMING,        
-        
-        EVENT_ID,
-        EVENT_STATE,
-        STATE,
-        ACKSTATE_GOING,
-        ACKSTATE_COMING,
-        EVENT_GOING,
-        EVENT_COMING,
-        EVENT_LAST_CHANGE,
-    
-        SIG,
-        SIG_1,
-        SIG_2,
-        SIG_3,
-        SIG_4,    
-        SIG_5,
-        SIG_6,
-        SIG_7,
-        SIG_8,
-
-        SIG_STATE,
-        SIG_1_STATE,
-        SIG_2_STATE,
-        SIG_3_STATE,
-        SIG_4_STATE,    
-        SIG_5_STATE,
-        SIG_6_STATE,
-        SIG_7_STATE,
-        SIG_8_STATE,    
-
-        SIG_DATA,
-        SIG_1_DATA,
-        SIG_2_DATA,
-        SIG_3_DATA,
-        SIG_4_DATA,    
-        SIG_5_DATA,
-        SIG_6_DATA,
-        SIG_7_DATA,
-        SIG_8_DATA,
-        SIG_1_DATA_GOING,
-        SIG_2_DATA_GOING,
-        SIG_3_DATA_GOING,
-        SIG_4_DATA_GOING,    
-        SIG_5_DATA_GOING,
-        SIG_6_DATA_GOING,
-        SIG_7_DATA_GOING,
-        SIG_8_DATA_GOING,
-        SIG_1_DATA_COMING,
-        SIG_2_DATA_COMING,
-        SIG_3_DATA_COMING,
-        SIG_4_DATA_COMING,    
-        SIG_5_DATA_COMING,
-        SIG_6_DATA_COMING,
-        SIG_7_DATA_COMING,
-        SIG_8_DATA_COMING,
-        
-    }
-
-    //private final Instant timeStamp;
-    private final Map<String, Object> map; 
-
-    public S7AlarmEvent(Map<String, Object> map) {
-        this.map = map;                      
-    }
-    
-    public static List<S7Event> getAlarmsEvents(CpuServicesParameterSubFunctionGroup subFunction, 
-                                        AlarmMessagePayload payload){
-        List<S7Event> alarmEvents = new ArrayList();
-        Map<String, Object> map = new HashMap(); 
-        Instant timeStamp;
-        int index = 0;
-        AssociatedValueItem itemValue;
-        byte[] datos;
-
-        AlarmMessageItem msgItem = payload.getMsg();
-        List<Object> objects = msgItem.getMsgItems();
-        for (Object object:objects){
-            MessageObjectItem item = (MessageObjectItem) object;
-            alarmEvents.add(createAlarmEvent(subFunction, msgItem, item));
-        }
-
-        return alarmEvents;
-    }
-
-    private static S7AlarmEvent createAlarmEvent(CpuServicesParameterSubFunctionGroup subFunction,
-                                    AlarmMessageItem msgItem,
-                                    MessageObjectItem message){
-        Map<String, Object> map = new HashMap();
-        AssociatedValueItem itemValue;
-        byte[] datos;
-        switch(subFunction){    
-            case ALARM_QUERY:{
-                switch(message.getAlarmtype()){
-                    case ALARM_S:
-                        map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.ALARM_S_IND.getCode()); 
-                        map.put(Fields.EVENT_ID.name(), message.getEventID());
-                        map.put(Fields.EVENT_STATE.name(), message.getEventState());
-                        map.put(Fields.ACKSTATE_GOING.name(), message.getAckStateGoing());
-                        map.put(Fields.ACKSTATE_COMING.name(), message.getAckStateComming()); 
-                        
-                        map.put(Fields.TIMESTAMP_GOING.name(), message.getTimestampGoing().toInstant(ZoneOffset.UTC));
-                        
-                        AssociatedValueItem itemg = message.getComingValues().get(0);
-                        datos = new byte[itemg.getLength()];
-                        if (itemg.getLength() != 0) {
-                            itemg.getData().getBytes(0, datos);
-                        };
-                        map.put(Fields.SIG_1_DATA_GOING.name(), datos);                        
-                        
-                        map.put(Fields.TIMESTAMP_COMING.name(), message.getTimestampComing().toInstant(ZoneOffset.UTC));
-                        
-                        AssociatedValueItem itemc = message.getComingValues().get(0);
-                        datos = new byte[itemc.getLength()];                        
-                        if (itemc.getLength() != 0) {
-                            itemc.getData().getBytes(0, datos);                        
-                        }
-                        map.put(Fields.SIG_1_DATA_COMING.name(), datos);                        
-                        break;
-                        
-                    case ALARM_8:                        
-                        map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.ALARM8);
-                        break;
-                    case SCAN:
-                        map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.SCAN);
-                        break;
-                    case NONE:
-                        map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.NONE);
-                        break;
-                    default:;
-                }                
-            }
-            break;
-            case ALARM_ACK_IND:;
-                map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.ALARM_ACK_IND.getCode()); 
-                map.put(Fields.TIMESTAMP.name(), msgItem.getTimestamp().toInstant(ZoneOffset.UTC));
-                map.put(Fields.EVENT_ID.name(), message.getEventID()); 
-                map.put(Fields.EVENT_STATE.name(), message.getEventState());
-                map.put(Fields.STATE.name(), message.getState());
-                map.put(Fields.ACKSTATE_GOING.name(), message.getAckStateGoing());
-                map.put(Fields.ACKSTATE_COMING.name(), message.getAckStateComming());                 
-            break;
-            case ALARM_SQ_IND:             
-            case ALARM_S_IND:{
-                map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.ALARM_S_IND.getCode()); 
-                map.put(Fields.TIMESTAMP.name(), msgItem.getTimestamp().toInstant(ZoneOffset.UTC));
-                map.put(Fields.EVENT_ID.name(), message.getEventID());
-                map.put(Fields.EVENT_STATE.name(), message.getEventState());
-                map.put(Fields.STATE.name(), message.getState());
-                map.put(Fields.ACKSTATE_GOING.name(), message.getAckStateGoing());
-                map.put(Fields.ACKSTATE_COMING.name(), message.getAckStateComming()); 
-                AssociatedValueItem itemc = message.getComingValues().get(0);
-                datos = new byte[itemc.getLength()];
-                if (itemc.getLength() != 0) {
-                    itemc.getData().getBytes(0, datos);                        
-                }
-                map.put(Fields.SIG_1_DATA.name(), datos);                 
-            };
-            break;
-            case NOTIFY8:{
-                map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.NOTIFY8.getCode());
-                map.put(Fields.TIMESTAMP.name(), msgItem.getTimestamp().toInstant(ZoneOffset.UTC));
-                map.put(Fields.EVENT_ID.name(), message.getEventID());
-                map.put(Fields.EVENT_STATE.name(), message.getEventState());
-                map.put(Fields.STATE.name(), message.getState());
-                map.put(Fields.ACKSTATE_GOING.name(), message.getAckStateGoing());
-                map.put(Fields.ACKSTATE_COMING.name(), message.getAckStateComming());
-                map.put(Fields.EVENT_GOING.name(), message.getEventGoing());
-                map.put(Fields.EVENT_COMING.name(), message.getEventComming());                
-                map.put(Fields.EVENT_LAST_CHANGE.name(), message.getEventLastChange());  
-                for(int i = 0; i < message.getNumberOfValues(); i++){                
-                    itemValue = message.getComingValues().get(i);
-                    datos = new byte[itemValue.getLength()];
-                    map.put("SIG_"+ (i+1) +"_STATE", itemValue.getReturnCode().getCode());
-                    itemValue.getData().getBytes(0, datos);
-                    map.put("SIG_"+ (i+1) +"_DATA", datos);
-                }                  
-            }
-            break;
-            case ALARM: {   
-                map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.ALARM.getCode());
-                map.put(Fields.TIMESTAMP.name(), msgItem.getTimestamp().toInstant(ZoneOffset.UTC));
-                map.put(Fields.EVENT_ID.name(), message.getEventID());
-                map.put(Fields.EVENT_STATE.name(), message.getEventState());
-                map.put(Fields.STATE.name(), message.getState());
-                map.put(Fields.ACKSTATE_GOING.name(), message.getAckStateGoing());
-                map.put(Fields.ACKSTATE_COMING.name(), message.getAckStateComming()); 
-                for(int i = 0; i < message.getNumberOfValues(); i++){                
-                    itemValue = message.getComingValues().get(i);
-                    datos = new byte[itemValue.getLength()];
-                    map.put("SIG_"+ (i+1) +"_STATE", itemValue.getReturnCode().getCode());
-                    itemValue.getData().getBytes(0, datos);
-                    map.put("SIG_"+ (i+1) +"_DATA", datos);
-                }                  
-            }
-            break;
-            case ALARM8: {
-                System.out.println("PROCESANDO ALARM 8");
-            }
-            break;
-                
-        }
-                
-        return new S7AlarmEvent(map);
-    }
-    
-    
-    
-    @Override
-    public Instant getTimestamp() {
-        return (Instant) map.get(Fields.TIMESTAMP.name());
-    }
-
-    @Override
-    public PlcReadRequest getRequest() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-        
-    @Override
-    public int getNumberOfValues(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Object getObject(String name) {
-        switch(Fields.valueOf(name)){
-            case MAP: return map;
-            default:;
-        }
-        return null;
-    }
-
-    @Override
-    public Object getObject(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Collection<Object> getAllObjects(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidBoolean(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidBoolean(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Boolean getBoolean(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Boolean getBoolean(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Collection<Boolean> getAllBooleans(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidByte(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidByte(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Byte getByte(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Byte getByte(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Collection<Byte> getAllBytes(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidShort(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidShort(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Short getShort(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Short getShort(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Collection<Short> getAllShorts(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Integer getInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Integer getInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Collection<Integer> getAllIntegers(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidBigInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidBigInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public BigInteger getBigInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public BigInteger getBigInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Collection<BigInteger> getAllBigIntegers(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidLong(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidLong(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Long getLong(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Long getLong(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Collection<Long> getAllLongs(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidFloat(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidFloat(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Float getFloat(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Float getFloat(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Collection<Float> getAllFloats(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidDouble(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidDouble(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Double getDouble(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Double getDouble(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Collection<Double> getAllDoubles(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidBigDecimal(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidBigDecimal(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public BigDecimal getBigDecimal(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public BigDecimal getBigDecimal(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Collection<BigDecimal> getAllBigDecimals(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidString(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidString(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public String getString(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public String getString(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Collection<String> getAllStrings(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public LocalTime getTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public LocalTime getTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Collection<LocalTime> getAllTimes(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidDate(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidDate(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public LocalDate getDate(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public LocalDate getDate(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Collection<LocalDate> getAllDates(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidDateTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidDateTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public LocalDateTime getDateTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public LocalDateTime getDateTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Collection<LocalDateTime> getAllDateTimes(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidByteArray(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidByteArray(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Byte[] getByteArray(String name) {
-        return (Byte[]) map.get(name);
-    }
-
-    @Override
-    public Byte[] getByteArray(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Collection<Byte[]> getAllByteArrays(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Collection<String> getFieldNames() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public PlcField getField(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public PlcResponseCode getResponseCode(String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean isValidDuration(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidDuration(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Duration getDuration(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Duration getDuration(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<Duration> getAllDuration(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    
-    
-    
-    @Override
-    public Map<String, Object> getMap() {
-        return map;
-    }
-    
-        
-    
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.protocol.event;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneOffset;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.s7.netty.model.payloads.AlarmMessagePayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.AlarmMessageItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.MessageObjectItem;
+import org.apache.plc4x.java.s7.netty.model.types.CpuServicesParameterSubFunctionGroup;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7AlarmEvent implements S7Event {
+    
+    public enum Fields{
+        MAP,
+        
+        TYPE,
+        TIMESTAMP,
+        TIMESTAMP_GOING,
+        TIMESTAMP_COMING,        
+        
+        EVENT_ID,
+        EVENT_STATE,
+        STATE,
+        ACKSTATE_GOING,
+        ACKSTATE_COMING,
+        EVENT_GOING,
+        EVENT_COMING,
+        EVENT_LAST_CHANGE,
+    
+        SIG,
+        SIG_1,
+        SIG_2,
+        SIG_3,
+        SIG_4,    
+        SIG_5,
+        SIG_6,
+        SIG_7,
+        SIG_8,
+
+        SIG_STATE,
+        SIG_1_STATE,
+        SIG_2_STATE,
+        SIG_3_STATE,
+        SIG_4_STATE,    
+        SIG_5_STATE,
+        SIG_6_STATE,
+        SIG_7_STATE,
+        SIG_8_STATE,    
+
+        SIG_DATA,
+        SIG_1_DATA,
+        SIG_2_DATA,
+        SIG_3_DATA,
+        SIG_4_DATA,    
+        SIG_5_DATA,
+        SIG_6_DATA,
+        SIG_7_DATA,
+        SIG_8_DATA,
+        SIG_1_DATA_GOING,
+        SIG_2_DATA_GOING,
+        SIG_3_DATA_GOING,
+        SIG_4_DATA_GOING,    
+        SIG_5_DATA_GOING,
+        SIG_6_DATA_GOING,
+        SIG_7_DATA_GOING,
+        SIG_8_DATA_GOING,
+        SIG_1_DATA_COMING,
+        SIG_2_DATA_COMING,
+        SIG_3_DATA_COMING,
+        SIG_4_DATA_COMING,    
+        SIG_5_DATA_COMING,
+        SIG_6_DATA_COMING,
+        SIG_7_DATA_COMING,
+        SIG_8_DATA_COMING,
+        
+    }
+
+    //private final Instant timeStamp;
+    private final Map<String, Object> map; 
+
+    public S7AlarmEvent(Map<String, Object> map) {
+        this.map = map;                      
+    }
+    
+    public static List<S7Event> getAlarmsEvents(CpuServicesParameterSubFunctionGroup subFunction, 
+                                        AlarmMessagePayload payload){
+        List<S7Event> alarmEvents = new ArrayList();
+        Map<String, Object> map = new HashMap(); 
+        Instant timeStamp;
+        int index = 0;
+        AssociatedValueItem itemValue;
+        byte[] datos;
+
+        AlarmMessageItem msgItem = payload.getMsg();
+        List<Object> objects = msgItem.getMsgItems();
+        for (Object object:objects){
+            MessageObjectItem item = (MessageObjectItem) object;
+            alarmEvents.add(createAlarmEvent(subFunction, msgItem, item));
+        }
+
+        return alarmEvents;
+    }
+
+    private static S7AlarmEvent createAlarmEvent(CpuServicesParameterSubFunctionGroup subFunction,
+                                    AlarmMessageItem msgItem,
+                                    MessageObjectItem message){
+        Map<String, Object> map = new HashMap();
+        AssociatedValueItem itemValue;
+        byte[] datos;
+        switch(subFunction){    
+            case ALARM_QUERY:{
+                switch(message.getAlarmtype()){
+                    case ALARM_S:
+                        map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.ALARM_S_IND.getCode()); 
+                        map.put(Fields.EVENT_ID.name(), message.getEventID());
+                        map.put(Fields.EVENT_STATE.name(), message.getEventState());
+                        map.put(Fields.ACKSTATE_GOING.name(), message.getAckStateGoing());
+                        map.put(Fields.ACKSTATE_COMING.name(), message.getAckStateComming()); 
+                        
+                        map.put(Fields.TIMESTAMP_GOING.name(), message.getTimestampGoing().toInstant(ZoneOffset.UTC));
+                        
+                        AssociatedValueItem itemg = message.getComingValues().get(0);
+                        datos = new byte[itemg.getLength()];
+                        if (itemg.getLength() != 0) {
+                            itemg.getData().getBytes(0, datos);
+                        };
+                        map.put(Fields.SIG_1_DATA_GOING.name(), datos);                        
+                        
+                        map.put(Fields.TIMESTAMP_COMING.name(), message.getTimestampComing().toInstant(ZoneOffset.UTC));
+                        
+                        AssociatedValueItem itemc = message.getComingValues().get(0);
+                        datos = new byte[itemc.getLength()];                        
+                        if (itemc.getLength() != 0) {
+                            itemc.getData().getBytes(0, datos);                        
+                        }
+                        map.put(Fields.SIG_1_DATA_COMING.name(), datos);                        
+                        break;
+                        
+                    case ALARM_8:                        
+                        map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.ALARM8);
+                        break;
+                    case SCAN:
+                        map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.SCAN);
+                        break;
+                    case NONE:
+                        map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.NONE);
+                        break;
+                    default:;
+                }                
+            }
+            break;
+            case ALARM_ACK_IND:;
+                map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.ALARM_ACK_IND.getCode()); 
+                map.put(Fields.TIMESTAMP.name(), msgItem.getTimestamp().toInstant(ZoneOffset.UTC));
+                map.put(Fields.EVENT_ID.name(), message.getEventID()); 
+                map.put(Fields.EVENT_STATE.name(), message.getEventState());
+                map.put(Fields.STATE.name(), message.getState());
+                map.put(Fields.ACKSTATE_GOING.name(), message.getAckStateGoing());
+                map.put(Fields.ACKSTATE_COMING.name(), message.getAckStateComming());                 
+            break;
+            case ALARM_SQ_IND:             
+            case ALARM_S_IND:{
+                map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.ALARM_S_IND.getCode()); 
+                map.put(Fields.TIMESTAMP.name(), msgItem.getTimestamp().toInstant(ZoneOffset.UTC));
+                map.put(Fields.EVENT_ID.name(), message.getEventID());
+                map.put(Fields.EVENT_STATE.name(), message.getEventState());
+                map.put(Fields.STATE.name(), message.getState());
+                map.put(Fields.ACKSTATE_GOING.name(), message.getAckStateGoing());
+                map.put(Fields.ACKSTATE_COMING.name(), message.getAckStateComming()); 
+                AssociatedValueItem itemc = message.getComingValues().get(0);
+                datos = new byte[itemc.getLength()];
+                if (itemc.getLength() != 0) {
+                    itemc.getData().getBytes(0, datos);                        
+                }
+                map.put(Fields.SIG_1_DATA.name(), datos);                 
+            };
+            break;
+            case NOTIFY8:{
+                map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.NOTIFY8.getCode());
+                map.put(Fields.TIMESTAMP.name(), msgItem.getTimestamp().toInstant(ZoneOffset.UTC));
+                map.put(Fields.EVENT_ID.name(), message.getEventID());
+                map.put(Fields.EVENT_STATE.name(), message.getEventState());
+                map.put(Fields.STATE.name(), message.getState());
+                map.put(Fields.ACKSTATE_GOING.name(), message.getAckStateGoing());
+                map.put(Fields.ACKSTATE_COMING.name(), message.getAckStateComming());
+                map.put(Fields.EVENT_GOING.name(), message.getEventGoing());
+                map.put(Fields.EVENT_COMING.name(), message.getEventComming());                
+                map.put(Fields.EVENT_LAST_CHANGE.name(), message.getEventLastChange());  
+                for(int i = 0; i < message.getNumberOfValues(); i++){                
+                    itemValue = message.getComingValues().get(i);
+                    datos = new byte[itemValue.getLength()];
+                    map.put("SIG_"+ (i+1) +"_STATE", itemValue.getReturnCode().getCode());
+                    itemValue.getData().getBytes(0, datos);
+                    map.put("SIG_"+ (i+1) +"_DATA", datos);
+                }                  
+            }
+            break;
+            case ALARM: {   
+                map.put(Fields.TYPE.toString(), CpuServicesParameterSubFunctionGroup.ALARM.getCode());
+                map.put(Fields.TIMESTAMP.name(), msgItem.getTimestamp().toInstant(ZoneOffset.UTC));
+                map.put(Fields.EVENT_ID.name(), message.getEventID());
+                map.put(Fields.EVENT_STATE.name(), message.getEventState());
+                map.put(Fields.STATE.name(), message.getState());
+                map.put(Fields.ACKSTATE_GOING.name(), message.getAckStateGoing());
+                map.put(Fields.ACKSTATE_COMING.name(), message.getAckStateComming()); 
+                for(int i = 0; i < message.getNumberOfValues(); i++){                
+                    itemValue = message.getComingValues().get(i);
+                    datos = new byte[itemValue.getLength()];
+                    map.put("SIG_"+ (i+1) +"_STATE", itemValue.getReturnCode().getCode());
+                    itemValue.getData().getBytes(0, datos);
+                    map.put("SIG_"+ (i+1) +"_DATA", datos);
+                }                  
+            }
+            break;
+            case ALARM8: {
+                System.out.println("PROCESANDO ALARM 8");
+            }
+            break;
+                
+        }
+                
+        return new S7AlarmEvent(map);
+    }
+    
+    
+    
+    @Override
+    public Instant getTimestamp() {
+        return (Instant) map.get(Fields.TIMESTAMP.name());
+    }
+
+    @Override
+    public PlcReadRequest getRequest() {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+        
+    @Override
+    public int getNumberOfValues(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Object getObject(String name) {
+        switch(Fields.valueOf(name)){
+            case MAP: return map;
+            default:;
+        }
+        return null;
+    }
+
+    @Override
+    public Object getObject(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<Object> getAllObjects(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidBoolean(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidBoolean(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Boolean getBoolean(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Boolean getBoolean(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<Boolean> getAllBooleans(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidByte(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidByte(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Byte getByte(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Byte getByte(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<Byte> getAllBytes(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidShort(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidShort(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Short getShort(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Short getShort(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<Short> getAllShorts(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Integer getInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Integer getInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<Integer> getAllIntegers(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<BigInteger> getAllBigIntegers(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidLong(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidLong(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Long getLong(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Long getLong(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<Long> getAllLongs(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidFloat(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidFloat(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Float getFloat(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Float getFloat(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<Float> getAllFloats(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidDouble(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidDouble(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Double getDouble(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Double getDouble(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<Double> getAllDoubles(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<BigDecimal> getAllBigDecimals(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidString(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidString(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public String getString(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public String getString(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<String> getAllStrings(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public LocalTime getTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public LocalTime getTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<LocalTime> getAllTimes(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidDate(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidDate(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public LocalDate getDate(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public LocalDate getDate(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<LocalDate> getAllDates(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidDateTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidDateTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<LocalDateTime> getAllDateTimes(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidByteArray(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidByteArray(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Byte[] getByteArray(String name) {
+        return (Byte[]) map.get(name);
+    }
+
+    @Override
+    public Byte[] getByteArray(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<Byte[]> getAllByteArrays(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<String> getFieldNames() {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public PlcField getField(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public PlcResponseCode getResponseCode(String name) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean isValidDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDuration(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Duration getDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Duration getDuration(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Duration> getAllDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    
+    
+    
+    @Override
+    public Map<String, Object> getMap() {
+        return map;
+    }
+    
+        
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7CyclicValueEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7CyclicValueEvent.java
index a5a51d4c7a5..4168e2091e9 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7CyclicValueEvent.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7CyclicValueEvent.java
@@ -1,475 +1,475 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.protocol.event;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.Collection;
-import java.util.Map;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
-import static org.apache.plc4x.java.s7.utils.S7Helper.decodeResponseCode;
-
-/**
- *
- * @author cgarcia
- */
-public class S7CyclicValueEvent implements PlcSubscriptionEvent {
-
-    private final Map<String, AssociatedValueItem> items;
-    private final Instant instant;
-    
-    public S7CyclicValueEvent(Map<String, AssociatedValueItem> items) {
-        this.items = items;
-        this.instant = Instant.now();
-    }
-
-    @Override
-    public Instant getTimestamp() {
-        return instant;
-    }
-
-    @Override
-    public PlcReadRequest getRequest() {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public int getNumberOfValues(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Object getObject(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Object getObject(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Object> getAllObjects(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidBoolean(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidBoolean(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Boolean getBoolean(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Boolean getBoolean(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Boolean> getAllBooleans(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidByte(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidByte(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Byte getByte(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Byte getByte(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Byte> getAllBytes(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidShort(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidShort(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Short getShort(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Short getShort(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Short> getAllShorts(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Integer getInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Integer getInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Integer> getAllIntegers(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidBigInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidBigInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public BigInteger getBigInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public BigInteger getBigInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<BigInteger> getAllBigIntegers(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidLong(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidLong(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Long getLong(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Long getLong(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Long> getAllLongs(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidFloat(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidFloat(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Float getFloat(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Float getFloat(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Float> getAllFloats(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidDouble(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidDouble(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Double getDouble(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Double getDouble(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Double> getAllDoubles(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidBigDecimal(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidBigDecimal(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public BigDecimal getBigDecimal(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public BigDecimal getBigDecimal(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<BigDecimal> getAllBigDecimals(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidString(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidString(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public String getString(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public String getString(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<String> getAllStrings(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public LocalTime getTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public LocalTime getTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<LocalTime> getAllTimes(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidDate(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidDate(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public LocalDate getDate(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public LocalDate getDate(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<LocalDate> getAllDates(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidDateTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidDateTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public LocalDateTime getDateTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public LocalDateTime getDateTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<LocalDateTime> getAllDateTimes(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidDuration(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidDuration(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Duration getDuration(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Duration getDuration(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Duration> getAllDuration(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidByteArray(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidByteArray(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Byte[] getByteArray(String name) {
-        byte[] bytes = new byte[items.get(name).getData().readableBytes()];
-        items.get(name).getData().duplicate().readBytes(bytes);
-        return ArrayUtils.toObject(bytes); 
-    }
-
-    @Override
-    public Byte[] getByteArray(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Byte[]> getAllByteArrays(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<String> getFieldNames() {
-        return items.keySet();
-    }
-
-    @Override
-    public PlcField getField(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public PlcResponseCode getResponseCode(String name) {
-        return decodeResponseCode(items.get(name).getReturnCode());
-    }
-    
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.protocol.event;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.Collection;
+import java.util.Map;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.AssociatedValueItem;
+import static org.apache.plc4x.java.s7.utils.S7Helper.decodeResponseCode;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7CyclicValueEvent implements PlcSubscriptionEvent {
+
+    private final Map<String, AssociatedValueItem> items;
+    private final Instant instant;
+    
+    public S7CyclicValueEvent(Map<String, AssociatedValueItem> items) {
+        this.items = items;
+        this.instant = Instant.now();
+    }
+
+    @Override
+    public Instant getTimestamp() {
+        return instant;
+    }
+
+    @Override
+    public PlcReadRequest getRequest() {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public int getNumberOfValues(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Object getObject(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Object getObject(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Object> getAllObjects(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBoolean(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBoolean(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Boolean getBoolean(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Boolean getBoolean(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Boolean> getAllBooleans(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidByte(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidByte(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Byte getByte(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Byte getByte(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Byte> getAllBytes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidShort(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidShort(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Short getShort(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Short getShort(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Short> getAllShorts(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Integer getInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Integer getInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Integer> getAllIntegers(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<BigInteger> getAllBigIntegers(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidLong(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidLong(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Long getLong(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Long getLong(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Long> getAllLongs(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidFloat(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidFloat(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Float getFloat(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Float getFloat(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Float> getAllFloats(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDouble(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDouble(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Double getDouble(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Double getDouble(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Double> getAllDoubles(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<BigDecimal> getAllBigDecimals(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidString(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidString(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public String getString(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public String getString(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<String> getAllStrings(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalTime getTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalTime getTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<LocalTime> getAllTimes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDate(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDate(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalDate getDate(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalDate getDate(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<LocalDate> getAllDates(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDateTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDateTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<LocalDateTime> getAllDateTimes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDuration(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Duration getDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Duration getDuration(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Duration> getAllDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidByteArray(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidByteArray(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Byte[] getByteArray(String name) {
+        byte[] bytes = new byte[items.get(name).getData().readableBytes()];
+        items.get(name).getData().duplicate().readBytes(bytes);
+        return ArrayUtils.toObject(bytes); 
+    }
+
+    @Override
+    public Byte[] getByteArray(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Byte[]> getAllByteArrays(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<String> getFieldNames() {
+        return items.keySet();
+    }
+
+    @Override
+    public PlcField getField(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public PlcResponseCode getResponseCode(String name) {
+        return decodeResponseCode(items.get(name).getReturnCode());
+    }
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Event.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Event.java
index 04c9fe619a8..743a4a18cc8 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Event.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7Event.java
@@ -1,55 +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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.protocol.event;
-
-import java.util.Map;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
-
-/**
- * Like JMS but different.
- * Maintain the same pattern as JMS MapMessage. 
- * S7Event is a Map whose key is a String and its value is an 
- * Object of primitive values.
- * Classes derived from the S7Event must respect the following 
- * conversion table.
- * 
- *  |        | boolean byte short char int long float double String byte[]
- *  |--------+-------------------------------------------------------------
- *  |boolean |    X                                            X
- *  |byte    |          X     X         X   X                  X
- *  |short   |                X         X   X                  X
- *  |char    |                     X                           X
- *  |int     |                          X   X                  X
- *  |long    |                              X                  X
- *  |float   |                                    X     X      X
- *  |double  |                                          X      X
- *  |String  |    X     X     X         X   X     X     X      X
- *  |byte[]  |                                                        X
- *  |--------+-------------------------------------------------------------
- * 
- * @author cgarcia
- */
-public interface S7Event extends PlcSubscriptionEvent{
-    
-        
-    public Map<String, Object> getMap();
-    
-    
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.protocol.event;
+
+import java.util.Map;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
+
+/**
+ * Like JMS but different.
+ * Maintain the same pattern as JMS MapMessage. 
+ * S7Event is a Map whose key is a String and its value is an 
+ * Object of primitive values.
+ * Classes derived from the S7Event must respect the following 
+ * conversion table.
+ * 
+ *  |        | boolean byte short char int long float double String byte[]
+ *  |--------+-------------------------------------------------------------
+ *  |boolean |    X                                            X
+ *  |byte    |          X     X         X   X                  X
+ *  |short   |                X         X   X                  X
+ *  |char    |                     X                           X
+ *  |int     |                          X   X                  X
+ *  |long    |                              X                  X
+ *  |float   |                                    X     X      X
+ *  |double  |                                          X      X
+ *  |String  |    X     X     X         X   X     X     X      X
+ *  |byte[]  |                                                        X
+ *  |--------+-------------------------------------------------------------
+ * 
+ * @author cgarcia
+ */
+public interface S7Event extends PlcSubscriptionEvent{
+    
+        
+    public Map<String, Object> getMap();
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7ModeEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7ModeEvent.java
index c3eeb4557ef..09ba178dd23 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7ModeEvent.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7ModeEvent.java
@@ -1,526 +1,526 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.protocol.event;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.s7.netty.model.params.CpuDiagnosticPushParameter;
-import org.apache.plc4x.java.s7.netty.model.types.CpuCurrentModeType;
-import org.apache.plc4x.java.s7.netty.model.types.CpuUserDataMethodType;
-import org.apache.plc4x.java.s7.netty.model.types.CpuUserDataParameterFunctionGroupType;
-import org.apache.plc4x.java.s7.netty.model.types.CpuUserDataParameterType;
-
-/**
- *
- * @author cgarcia
- */
-public class S7ModeEvent implements S7Event {
-    
-    public enum Fields{
-        MAP,
-        METHOD,
-        TYPE,
-        FUNCTION,
-        CURRENT_MODE
-    }
-   
-    private final Instant timeStamp;
-    private Map<String, Object> map = new HashMap();
-
-    public S7ModeEvent(Instant timeStamp, CpuDiagnosticPushParameter parameter) {
-      map.put(Fields.METHOD.name(), parameter.getMethod());
-      map.put(Fields.TYPE.name(), parameter.getParameterType());
-      map.put(Fields.FUNCTION.name(), parameter.getParameterFunction());
-      map.put(Fields.CURRENT_MODE.name(), parameter.getCurrentMode());
-      this.timeStamp = timeStamp;
-    }
-
-    @Override
-    public Instant getTimestamp() {
-        return timeStamp;
-    }
-
-    @Override
-    public PlcReadRequest getRequest() {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public int getNumberOfValues(String name) {
-        return 0x01; 
-    }
-
-    @Override
-    public Object getObject(String name) {
-        switch(Fields.valueOf(name)){
-            case MAP: return map;
-            default:;
-        }
-        return null;
-    }
-
-    @Override
-    public Object getObject(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Object> getAllObjects(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidBoolean(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidBoolean(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Boolean getBoolean(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Boolean getBoolean(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Boolean> getAllBooleans(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidByte(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidByte(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Byte getByte(String name) {
-        Object object = map.get(name);
-        if (object != null) {
-            if (object instanceof CpuUserDataMethodType){
-                return ((CpuUserDataMethodType) object).getCode();
-            } else if (object instanceof CpuUserDataParameterType) {
-                return ((CpuUserDataParameterType) object).getCode();
-            } else if (object instanceof CpuUserDataParameterFunctionGroupType) {
-                return ((CpuUserDataParameterFunctionGroupType) object).getCode();
-            } else if (object instanceof CpuCurrentModeType) {
-                return ((CpuCurrentModeType) object).getCode();
-            }
-        }
-        return 0x00;
-    }
-
-    @Override
-    public Byte getByte(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Byte> getAllBytes(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidShort(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidShort(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Short getShort(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Short getShort(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Short> getAllShorts(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Integer getInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Integer getInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Integer> getAllIntegers(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidBigInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidBigInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public BigInteger getBigInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public BigInteger getBigInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<BigInteger> getAllBigIntegers(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidLong(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidLong(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Long getLong(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Long getLong(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Long> getAllLongs(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidFloat(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidFloat(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Float getFloat(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Float getFloat(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Float> getAllFloats(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidDouble(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidDouble(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Double getDouble(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Double getDouble(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Double> getAllDoubles(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidBigDecimal(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidBigDecimal(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public BigDecimal getBigDecimal(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public BigDecimal getBigDecimal(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<BigDecimal> getAllBigDecimals(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidString(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidString(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public String getString(String name) {
-        Object object = map.get(name);
-        if (object != null) {
-            if (object instanceof CpuUserDataMethodType){
-                return ((CpuUserDataMethodType) object).getEvent();
-            } else if (object instanceof CpuUserDataParameterType) {
-                return ((CpuUserDataParameterType) object).getEvent();
-            } else if (object instanceof CpuUserDataParameterFunctionGroupType) {
-                return ((CpuUserDataParameterFunctionGroupType) object).getEvent();
-            } else if (object instanceof CpuCurrentModeType) {
-                return ((CpuCurrentModeType) object).getEvent();
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public String getString(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<String> getAllStrings(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public LocalTime getTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public LocalTime getTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<LocalTime> getAllTimes(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidDate(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidDate(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public LocalDate getDate(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public LocalDate getDate(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<LocalDate> getAllDates(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidDateTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidDateTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public LocalDateTime getDateTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public LocalDateTime getDateTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<LocalDateTime> getAllDateTimes(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidByteArray(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidByteArray(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Byte[] getByteArray(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Byte[] getByteArray(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Byte[]> getAllByteArrays(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<String> getFieldNames() {
-        return map.keySet(); 
-    }
-
-    @Override
-    public PlcField getField(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public PlcResponseCode getResponseCode(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidDuration(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidDuration(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Duration getDuration(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Duration getDuration(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<Duration> getAllDuration(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-    
-    @Override
-    public String toString() {
-        return "S7ModeEvent{" + "timeStamp=" + timeStamp + ", map=" + map + '}';
-    }
-
-    @Override
-    public Map<String, Object> getMap() {
-        return map;
-    }
- 
-    
-    
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.protocol.event;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.s7.netty.model.params.CpuDiagnosticPushParameter;
+import org.apache.plc4x.java.s7.netty.model.types.CpuCurrentModeType;
+import org.apache.plc4x.java.s7.netty.model.types.CpuUserDataMethodType;
+import org.apache.plc4x.java.s7.netty.model.types.CpuUserDataParameterFunctionGroupType;
+import org.apache.plc4x.java.s7.netty.model.types.CpuUserDataParameterType;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7ModeEvent implements S7Event {
+    
+    public enum Fields{
+        MAP,
+        METHOD,
+        TYPE,
+        FUNCTION,
+        CURRENT_MODE
+    }
+   
+    private final Instant timeStamp;
+    private Map<String, Object> map = new HashMap();
+
+    public S7ModeEvent(Instant timeStamp, CpuDiagnosticPushParameter parameter) {
+      map.put(Fields.METHOD.name(), parameter.getMethod());
+      map.put(Fields.TYPE.name(), parameter.getParameterType());
+      map.put(Fields.FUNCTION.name(), parameter.getParameterFunction());
+      map.put(Fields.CURRENT_MODE.name(), parameter.getCurrentMode());
+      this.timeStamp = timeStamp;
+    }
+
+    @Override
+    public Instant getTimestamp() {
+        return timeStamp;
+    }
+
+    @Override
+    public PlcReadRequest getRequest() {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public int getNumberOfValues(String name) {
+        return 0x01; 
+    }
+
+    @Override
+    public Object getObject(String name) {
+        switch(Fields.valueOf(name)){
+            case MAP: return map;
+            default:;
+        }
+        return null;
+    }
+
+    @Override
+    public Object getObject(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Object> getAllObjects(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBoolean(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBoolean(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Boolean getBoolean(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Boolean getBoolean(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Boolean> getAllBooleans(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidByte(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidByte(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Byte getByte(String name) {
+        Object object = map.get(name);
+        if (object != null) {
+            if (object instanceof CpuUserDataMethodType){
+                return ((CpuUserDataMethodType) object).getCode();
+            } else if (object instanceof CpuUserDataParameterType) {
+                return ((CpuUserDataParameterType) object).getCode();
+            } else if (object instanceof CpuUserDataParameterFunctionGroupType) {
+                return ((CpuUserDataParameterFunctionGroupType) object).getCode();
+            } else if (object instanceof CpuCurrentModeType) {
+                return ((CpuCurrentModeType) object).getCode();
+            }
+        }
+        return 0x00;
+    }
+
+    @Override
+    public Byte getByte(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Byte> getAllBytes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidShort(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidShort(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Short getShort(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Short getShort(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Short> getAllShorts(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Integer getInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Integer getInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Integer> getAllIntegers(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<BigInteger> getAllBigIntegers(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidLong(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidLong(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Long getLong(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Long getLong(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Long> getAllLongs(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidFloat(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidFloat(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Float getFloat(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Float getFloat(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Float> getAllFloats(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDouble(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDouble(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Double getDouble(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Double getDouble(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Double> getAllDoubles(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<BigDecimal> getAllBigDecimals(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidString(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidString(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public String getString(String name) {
+        Object object = map.get(name);
+        if (object != null) {
+            if (object instanceof CpuUserDataMethodType){
+                return ((CpuUserDataMethodType) object).getEvent();
+            } else if (object instanceof CpuUserDataParameterType) {
+                return ((CpuUserDataParameterType) object).getEvent();
+            } else if (object instanceof CpuUserDataParameterFunctionGroupType) {
+                return ((CpuUserDataParameterFunctionGroupType) object).getEvent();
+            } else if (object instanceof CpuCurrentModeType) {
+                return ((CpuCurrentModeType) object).getEvent();
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public String getString(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<String> getAllStrings(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalTime getTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalTime getTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<LocalTime> getAllTimes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDate(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDate(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalDate getDate(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalDate getDate(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<LocalDate> getAllDates(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDateTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDateTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<LocalDateTime> getAllDateTimes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidByteArray(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidByteArray(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Byte[] getByteArray(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Byte[] getByteArray(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Byte[]> getAllByteArrays(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<String> getFieldNames() {
+        return map.keySet(); 
+    }
+
+    @Override
+    public PlcField getField(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public PlcResponseCode getResponseCode(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDuration(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Duration getDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Duration getDuration(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Duration> getAllDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+    
+    @Override
+    public String toString() {
+        return "S7ModeEvent{" + "timeStamp=" + timeStamp + ", map=" + map + '}';
+    }
+
+    @Override
+    public Map<String, Object> getMap() {
+        return map;
+    }
+ 
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7SysEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7SysEvent.java
index 7bb537da9a3..6353333c3f9 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7SysEvent.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7SysEvent.java
@@ -1,520 +1,520 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.protocol.event;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.ZoneOffset;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.CpuDiagnosticMessageItem;
-
-/**
- *
- * @author cgarcia
- */
-public class S7SysEvent implements S7Event{
- 
-    public enum Fields{
-        TIMESTAMP,
-        EVENT_ID,
-        PRIORITY_CLASS,
-        OB_NUMBER,
-        DAT_ID,
-        INFO1,
-        INFO2       
-    }
-    
-    private final Instant timeStamp;
-    private Map<String, Object> map = new HashMap();
-
-    public S7SysEvent(CpuDiagnosticMessageItem item) {
-        map.put(Fields.EVENT_ID.name(), item.getEventID());
-        map.put(Fields.PRIORITY_CLASS.name(), item.getPriorityClass());
-        map.put(Fields.OB_NUMBER.name(), item.getObNumber());
-        map.put(Fields.DAT_ID.name(), item.getDatID());
-        map.put(Fields.INFO1.name(), item.getInfo1());
-        map.put(Fields.INFO2.name(), item.getInfo2());
-        this.timeStamp = item.getTimeStamp().toInstant(ZoneOffset.UTC);
-        map.put(Fields.TIMESTAMP.name(),this.timeStamp);
-    }
-
-    @Override
-    public Instant getTimestamp() {
-        return timeStamp; 
-    }
-
-    @Override
-    public PlcReadRequest getRequest() {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public int getNumberOfValues(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Object getObject(String name) {
-        switch(S7AlarmEvent.Fields.valueOf(name)){
-            case MAP: return map;
-            default:;
-        }
-        return null;
-    }
-
-    @Override
-    public Object getObject(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Object> getAllObjects(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidBoolean(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidBoolean(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Boolean getBoolean(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Boolean getBoolean(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Boolean> getAllBooleans(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidByte(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidByte(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Byte getByte(String name) {
-        Object object = map.get(name);
-        if (object instanceof Byte){
-            return (Byte) object;
-        }
-        return null;
-    }
-
-    @Override
-    public Byte getByte(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Byte> getAllBytes(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidShort(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidShort(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Short getShort(String name) {
-        Object object = map.get(name);
-        if (object instanceof Short){
-            return (Short) object;
-        }
-        return null;
-    }
-
-    @Override
-    public Short getShort(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Short> getAllShorts(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Integer getInteger(String name) {
-        Object object = map.get(name);
-        if (object instanceof Integer){
-            return (Integer) object;
-        }
-        return null; 
-    }
-
-    @Override
-    public Integer getInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Integer> getAllIntegers(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidBigInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidBigInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public BigInteger getBigInteger(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public BigInteger getBigInteger(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<BigInteger> getAllBigIntegers(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidLong(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidLong(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Long getLong(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Long getLong(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Long> getAllLongs(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidFloat(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidFloat(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Float getFloat(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Float getFloat(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Float> getAllFloats(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidDouble(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidDouble(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Double getDouble(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Double getDouble(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Double> getAllDoubles(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidBigDecimal(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidBigDecimal(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public BigDecimal getBigDecimal(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public BigDecimal getBigDecimal(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<BigDecimal> getAllBigDecimals(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidString(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidString(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public String getString(String name) {
-        Object object = map.get(name);
-        if (object instanceof Integer){
-            return object.toString();
-        }
-        return null;         
-    }
-
-    @Override
-    public String getString(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<String> getAllStrings(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public LocalTime getTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public LocalTime getTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<LocalTime> getAllTimes(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidDate(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidDate(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public LocalDate getDate(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public LocalDate getDate(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<LocalDate> getAllDates(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidDateTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidDateTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public LocalDateTime getDateTime(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public LocalDateTime getDateTime(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<LocalDateTime> getAllDateTimes(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidByteArray(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidByteArray(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Byte[] getByteArray(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Byte[] getByteArray(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<Byte[]> getAllByteArrays(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public Collection<String> getFieldNames() {
-        return map.keySet();
-    }
-
-    @Override
-    public PlcField getField(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public PlcResponseCode getResponseCode(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); 
-    }
-
-    @Override
-    public boolean isValidDuration(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean isValidDuration(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Duration getDuration(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Duration getDuration(String name, int index) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Collection<Duration> getAllDuration(String name) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-    
-    @Override
-    public String toString() {
-        return "S7SysEvent{" + "timeStamp=" + timeStamp + ", map=" + map + '}';
-    }
-
-    @Override
-    public Map<String, Object> getMap() {
-        return map;
-    }
-    
-    
-    
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.protocol.event;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneOffset;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.CpuDiagnosticMessageItem;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7SysEvent implements S7Event{
+ 
+    public enum Fields{
+        TIMESTAMP,
+        EVENT_ID,
+        PRIORITY_CLASS,
+        OB_NUMBER,
+        DAT_ID,
+        INFO1,
+        INFO2       
+    }
+    
+    private final Instant timeStamp;
+    private Map<String, Object> map = new HashMap();
+
+    public S7SysEvent(CpuDiagnosticMessageItem item) {
+        map.put(Fields.EVENT_ID.name(), item.getEventID());
+        map.put(Fields.PRIORITY_CLASS.name(), item.getPriorityClass());
+        map.put(Fields.OB_NUMBER.name(), item.getObNumber());
+        map.put(Fields.DAT_ID.name(), item.getDatID());
+        map.put(Fields.INFO1.name(), item.getInfo1());
+        map.put(Fields.INFO2.name(), item.getInfo2());
+        this.timeStamp = item.getTimeStamp().toInstant(ZoneOffset.UTC);
+        map.put(Fields.TIMESTAMP.name(),this.timeStamp);
+    }
+
+    @Override
+    public Instant getTimestamp() {
+        return timeStamp; 
+    }
+
+    @Override
+    public PlcReadRequest getRequest() {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public int getNumberOfValues(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Object getObject(String name) {
+        switch(S7AlarmEvent.Fields.valueOf(name)){
+            case MAP: return map;
+            default:;
+        }
+        return null;
+    }
+
+    @Override
+    public Object getObject(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Object> getAllObjects(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBoolean(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBoolean(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Boolean getBoolean(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Boolean getBoolean(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Boolean> getAllBooleans(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidByte(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidByte(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Byte getByte(String name) {
+        Object object = map.get(name);
+        if (object instanceof Byte){
+            return (Byte) object;
+        }
+        return null;
+    }
+
+    @Override
+    public Byte getByte(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Byte> getAllBytes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidShort(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidShort(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Short getShort(String name) {
+        Object object = map.get(name);
+        if (object instanceof Short){
+            return (Short) object;
+        }
+        return null;
+    }
+
+    @Override
+    public Short getShort(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Short> getAllShorts(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Integer getInteger(String name) {
+        Object object = map.get(name);
+        if (object instanceof Integer){
+            return (Integer) object;
+        }
+        return null; 
+    }
+
+    @Override
+    public Integer getInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Integer> getAllIntegers(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBigInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public BigInteger getBigInteger(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<BigInteger> getAllBigIntegers(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidLong(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidLong(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Long getLong(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Long getLong(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Long> getAllLongs(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidFloat(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidFloat(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Float getFloat(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Float getFloat(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Float> getAllFloats(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDouble(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDouble(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Double getDouble(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Double getDouble(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Double> getAllDoubles(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidBigDecimal(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<BigDecimal> getAllBigDecimals(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidString(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidString(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public String getString(String name) {
+        Object object = map.get(name);
+        if (object instanceof Integer){
+            return object.toString();
+        }
+        return null;         
+    }
+
+    @Override
+    public String getString(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<String> getAllStrings(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalTime getTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalTime getTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<LocalTime> getAllTimes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDate(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDate(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalDate getDate(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalDate getDate(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<LocalDate> getAllDates(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDateTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDateTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public LocalDateTime getDateTime(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<LocalDateTime> getAllDateTimes(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidByteArray(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidByteArray(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Byte[] getByteArray(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Byte[] getByteArray(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<Byte[]> getAllByteArrays(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public Collection<String> getFieldNames() {
+        return map.keySet();
+    }
+
+    @Override
+    public PlcField getField(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public PlcResponseCode getResponseCode(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public boolean isValidDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean isValidDuration(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Duration getDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Duration getDuration(String name, int index) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Collection<Duration> getAllDuration(String name) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+    
+    @Override
+    public String toString() {
+        return "S7SysEvent{" + "timeStamp=" + timeStamp + ", map=" + map + '}';
+    }
+
+    @Override
+    public Map<String, Object> getMap() {
+        return map;
+    }
+    
+    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7UserEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7UserEvent.java
index ed5ffbe9801..51bc5bbf635 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7UserEvent.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/protocol/event/S7UserEvent.java
@@ -1,28 +1,28 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.protocol.event;
-
-/**
- *
- * @author cgarcia
- */
-public class S7UserEvent {
-    
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.protocol.event;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class S7UserEvent {
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/types/S7ControllerType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/types/S7ControllerType.java
index c06c94ebedb..ff13360ab7d 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/types/S7ControllerType.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/types/S7ControllerType.java
@@ -1,30 +1,32 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.types;
-
-public enum S7ControllerType {
-
-    ANY,
-    S7_300,
-    S7_400,
-    S7_1200,
-    S7_1500,
-    LOGO
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.types;
+
+public enum S7ControllerType {
+
+    ANY,
+    S7_300,
+    S7_400,
+    S7_400H,
+    S7_1200,
+    S7_1500,
+    S7_1500H,
+    LOGO
+
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/types/S7SubscriptionFieldType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/types/S7SubscriptionFieldType.java
index 60afd253fad..01e5a80bf3e 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/types/S7SubscriptionFieldType.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/types/S7SubscriptionFieldType.java
@@ -1,34 +1,34 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.types;
-
-/**
- *
- * @author cgarcia
- */
-public enum S7SubscriptionFieldType {
-   
-    EVENT_SUBSCRIPTION,
-    EVENT_UNSUBSCRIPTION,
-    ALARM_ACK,
-    ALARM_QUERY,
-    CYCLIC_SUBSCRIPTION,
-    CYCLIC_UNSUBSCRIPTION;
-    
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.types;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum S7SubscriptionFieldType {
+   
+    EVENT_SUBSCRIPTION,
+    EVENT_UNSUBSCRIPTION,
+    ALARM_ACK,
+    ALARM_QUERY,
+    CYCLIC_SUBSCRIPTION,
+    CYCLIC_UNSUBSCRIPTION;
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7DiagnosticEventId.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7DiagnosticEventId.java
index e03890fbccd..0e4bb54f371 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7DiagnosticEventId.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7DiagnosticEventId.java
@@ -1,685 +1,685 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.s7.utils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- *  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
- *  |15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1|
- *  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
- *  \__________/\__________/\____________________/
- *   Event class     IDs         Event number
- * 
- *   Event Class:
- *      1   Standard OB Events
- *      2   Synchronous errors
- *      3   Asynchronous errors
- *      4   Mode transition
- *      5   Run-time events
- *      6   Communications events
- *      7   Events for fail-safe and fault tolerant systems
- *      8   Standardized diagnostic data on modules
- *      9   Predefined user events
- *    A,B   Freely definable events
- *  C,D,E   Reserved
- *      F   Events for modules other than CPUs (for example, CPs, FMs)
- * 
- *  IDs (Bit)
- *      8   0:Event leaving state, 1:Event entering state
- *      9   1:Entry in diagnostic buffer
- *     10   1:Internal error
- *     11   1:External error
- * 
- * @author cgarcia
- */
-public enum S7DiagnosticEventId {
-
-    EVENTID_0x113A((short) 0x113A, "Start request for cyclic interrupt OB with special handling (S7-300 only)"),
-    EVENTID_0x1155((short) 0x1155, "Status alarm for PROFIBUS DP"),
-    EVENTID_0x1156((short) 0x1156, "Update interrupt for PROFIBUS DP"),
-    EVENTID_0x1157((short) 0x1157, "Manufacturer interrupt for PROFIBUS DP"),
-    EVENTID_0x1158((short) 0x1158, "Status interrupt for PROFINET IO"),
-    EVENTID_0x1159((short) 0x1159, "Update interrupt for PROFINET IO"),
-    EVENTID_0x115A((short) 0x115A, "Manufacturer interrupt for PROFINET IO"),
-    EVENTID_0x115B((short) 0x115B, "IO: Profile-specific interrupt"),
-    EVENTID_0x116A((short) 0x116A, "Technology synchronization interrupt"),
-    
-    //Event Class 1 - Standard OB Events
-    EVENTID_0x1381((short) 0x1381, "Request for manual warm restart"),
-    EVENTID_0x1382((short) 0x1382, "Request for automatic warm restart"),
-    EVENTID_0x1383((short) 0x1383, "Request for manual hot restart"),
-    EVENTID_0x1384((short) 0x1384, "Request for automatic hot restart"),
-    EVENTID_0x1385((short) 0x1385, "Request for manual cold restart"),
-    EVENTID_0x1386((short) 0x1386, "Request for automatic cold restart"),
-    EVENTID_0x1387((short) 0x1387, "Master CPU: request for manual cold restart"),
-    EVENTID_0x1388((short) 0x1388, "Master CPU: request for automatic cold restart"),
-    EVENTID_0x138A((short) 0x138A, "Master CPU: request for manual warm restart"),
-    EVENTID_0x138B((short) 0x138B, "Master CPU: request for automatic warm restart"),
-    EVENTID_0x138C((short) 0x138C, "Standby CPU: request for manual hot restart"),
-    EVENTID_0x138D((short) 0x138D, "Standby CPU: request for automatic hot restart"),
-    
-    //Event Class 2 - Synchronous Errors
-    EVENTID_0x2521((short) 0x2521, "BCD conversion error"),
-    EVENTID_0x2522((short) 0x2522, "Area length error when reading"),
-    EVENTID_0x2523((short) 0x2523, "Area length error when writing"),
-    EVENTID_0x2524((short) 0x2524, "Area error when reading"),
-    EVENTID_0x2525((short) 0x2525, "Area error when writing"),
-    EVENTID_0x2526((short) 0x2526, "Timer number error"),
-    EVENTID_0x2527((short) 0x2527, "Counter number error"),
-    EVENTID_0x2528((short) 0x2528, "Alignment error when reading"),
-    EVENTID_0x2529((short) 0x2529, "Alignment error when writing"),
-    EVENTID_0x2530((short) 0x2530, "Write error when accessing the DB"),
-    EVENTID_0x2531((short) 0x2531, "Write error when accessing the DI"),
-    EVENTID_0x2532((short) 0x2532, "Block number error when opening a DB"),
-    EVENTID_0x2533((short) 0x2533, "Block number error when opening a DI"),
-    EVENTID_0x2534((short) 0x2534, "Block number error when calling an FC"),
-    EVENTID_0x2535((short) 0x2535, "Block number error when calling an FB"),
-    EVENTID_0x253A((short) 0x253A, "DB not loaded"),
-    EVENTID_0x253C((short) 0x253C, "FC not loaded"),
-    EVENTID_0x253D((short) 0x253D, "SFC not loaded"),
-    EVENTID_0x253E((short) 0x253E, "FB not loaded"),
-    EVENTID_0x253F((short) 0x253F, "SFB not loaded"),
-    EVENTID_0x2942((short) 0x2942, "I/O access error, reading"),
-    EVENTID_0x2943((short) 0x2943, "I/O access error, writing"),
-
-    
-    //Event Class 3 - Asynchronous Errors
-    EVENTID_0x3501((short) 0x3501, "Cycle time exceeded"),
-    EVENTID_0x3502((short) 0x3502, "User interface (OB or FRB) request error"),
-    EVENTID_0x3503((short) 0x3503, "Delay too long processing a priority class"),
-    EVENTID_0x3505((short) 0x3505, "Time-of-day interrupt(s) skipped due to new clock setting"),
-    EVENTID_0x3506((short) 0x3506, "Time-of-day interrupt(s) skipped when changing to RUN after HOLD"),
-    EVENTID_0x3507((short) 0x3507, "Multiple OB request errors caused internal buffer overflow"),
-    EVENTID_0x3508((short) 0x3508, "Synchronous cycle interrupt-timing error"),
-    EVENTID_0x3509((short) 0x3509, "Interrupt loss due to excess interrupt load"),
-    EVENTID_0x350A((short) 0x350A, "Resume RUN mode after CiR"),
-    EVENTID_0x350B((short) 0x350B, "Technology synchronization interrupt - timing error"),
-    EVENTID_0x3571((short) 0x3571, "Nesting depth too high in nesting levels"),
-    EVENTID_0x3572((short) 0x3572, "Nesting depth for Master Control Relays too high"),
-    EVENTID_0x3573((short) 0x3573, "Nesting depth too high after synchronous errors"),
-    EVENTID_0x3574((short) 0x3574, "Nesting depth for block calls (U stack) too high"),
-    EVENTID_0x3575((short) 0x3575, "Nesting depth for block calls (B stack) too high"),
-    EVENTID_0x3576((short) 0x3576, "Local data allocation error"),
-    EVENTID_0x3578((short) 0x3578, "Unknown instruction"),
-    EVENTID_0x357A((short) 0x357A, "Jump instruction to target outside of the block"),
-    EVENTID_0x3582((short) 0x3582, "Memory error detected and corrected by operating system"),
-    EVENTID_0x3583((short) 0x3583, "Accumulation of detected and corrected memo errors"),
-    EVENTID_0x3585((short) 0x3585, "Error in the PC operating system (only for LC RTX)"),
-    EVENTID_0x3587((short) 0x3587, "Multi-bit memory error detected and corrected"),
-    EVENTID_0x35A1((short) 0x35A1, "User interface (OB or FRB) not found"),
-    EVENTID_0x35A2((short) 0x35A2, "OB not loaded (started by SFC or operating system due to configuration)"),
-    EVENTID_0x35A3((short) 0x35A3, "Error when operating system accesses a block"),
-    EVENTID_0x35A4((short) 0x35A4, "PROFInet Interface DB cannot be addressed"),
-    EVENTID_0x35D2((short) 0x35D2, "Diagnostic entries cannot be sent at present"),
-    EVENTID_0x35D3((short) 0x35D3, "Synchronization frames cannot be sent"),
-    EVENTID_0x35D4((short) 0x35D4, "Illegal time jump resulting from synchronization"),
-    EVENTID_0x35D5((short) 0x35D5, "Error adopting the synchronization time"),
-    EVENTID_0x35E1((short) 0x35E1, "Incorrect frame ID in GD"),
-    EVENTID_0x35E2((short) 0x35E2, "GD packet status cannot be entered in DB"),
-    EVENTID_0x35E3((short) 0x35E3, "Frame length error in GD"),
-    EVENTID_0x35E4((short) 0x35E4, "Illegal GD packet number received"),
-    EVENTID_0x35E5((short) 0x35E5, "Error accessing DB in communication SFBs for configured S7 connections"),
-    EVENTID_0x35E6((short) 0x35E6, "GD total status cannot be entered in DB"),
-    EVENTID_0x3821((short) 0x3821, "BATTF: failure on at least one backup battery of the central rack, problem eliminated"),
-    EVENTID_0x3822((short) 0x3822, "BAF: failure of backup voltage on central rack, problem eliminated"),
-    EVENTID_0x3823((short) 0x3823, "24 volt supply failure on central rack, problem eliminated"),
-    EVENTID_0x3825((short) 0x3825, "BATTF: failure on at least one backup battery of the redundant central rack, problem eliminated"),
-    EVENTID_0x3826((short) 0x3826, "BAF: failure of backup voltage on redundant central rack, problem eliminated"),
-    EVENTID_0x3827((short) 0x3827, "24 volt supply failure on redundant central rack, problem eliminated"),
-    EVENTID_0x3831((short) 0x3831, "BATTF: failure of at least one backup battery of the expansion rack, problem eliminated"),
-    EVENTID_0x3832((short) 0x3832, "BAF: failure of backup voltage on expansion rack, problem eliminated"),
-    EVENTID_0x3833((short) 0x3833, "24 volt supply failure on at least one expansion rack, problem eliminated"),
-    EVENTID_0x3842((short) 0x3842, "Module OK"),
-    EVENTID_0x3854((short) 0x3854, "PROFINET IO interface submodule/submodule and matches the configured interface submodule/submodule"),
-    EVENTID_0x3855((short) 0x3855, "PROFINET IO interface submodule/submodule inserted, but does not match the configured interface submodule/submodule"),
-    EVENTID_0x3856((short) 0x3856, "PROFINET IO interface submodule/submodule inserted, but error in module parameter assignment"),
-    EVENTID_0x3858((short) 0x3858, "PROFINET IO interface submodule access error corrected"),
-    EVENTID_0x3861((short) 0x3861, "Module/interface module inserted, module type OK"),
-    EVENTID_0x3863((short) 0x3863, "Module/interface module plugged in, but wrong module type"),
-    EVENTID_0x3864((short) 0x3864, "Module/interface module plugged in, but causing problem (type ID unreadable)"),
-    EVENTID_0x3865((short) 0x3865, "Module plugged in, but error in module parameter assignment"),
-    EVENTID_0x3866((short) 0x3866, "Module can be addressed again, load voltage error removed"),
-    EVENTID_0x3881((short) 0x3881, "Interface error leaving state"),
-    EVENTID_0x3884((short) 0x3884, "Interface module plugged in"),
-    EVENTID_0x38B3((short) 0x38B3, "I/O access error when updating the process image input table"),
-    EVENTID_0x38B4((short) 0x38B4, "I/O access error when transferring the process image to the output modules"),
-    EVENTID_0x38C1((short) 0x38C1, "Expansion rack operational again (1 to 21), leaving state"),
-    EVENTID_0x38C2((short) 0x38C2, "Expansion rack operational again but mismatch between setpoint and actual configuration"),
-    EVENTID_0x38C4((short) 0x38C4, "Distributed I/Os: station failure, leaving state"),
-    EVENTID_0x38C5((short) 0x38C5, "Distributed I/Os: station fault, leaving state"),
-    EVENTID_0x38C6((short) 0x38C6, "Expansion rack operational again, but error(s) in module parameter assignment"),
-    EVENTID_0x38C7((short) 0x38C7, "DP: station operational again, but error(s) in module parameter assignment"),
-    EVENTID_0x38C8((short) 0x38C8, "DP: station operational again, but mismatch between setpoint and actual configuration"),
-    EVENTID_0x38CB((short) 0x38CB, "PROFINET IO station operational again"),
-    EVENTID_0x38CC((short) 0x38CC, "PROFINET IO station error corrected"),
-    EVENTID_0x3921((short) 0x3921, "BATTF: failure on at least one backup battery of the central rack"),
-    EVENTID_0x3922((short) 0x3922, "BAF: failure of backup voltage on central rack"),
-    EVENTID_0x3923((short) 0x3923, "24 volt supply failure on central rack"),
-    EVENTID_0x3925((short) 0x3925, "BATTF: failure on at least one backup battery of the redundant central rack"),
-    EVENTID_0x3926((short) 0x3926, "BAF: failure of backup voltage on redundant central rack"),
-    EVENTID_0x3927((short) 0x3927, "24 volt supply failure on redundant central rack"),
-    EVENTID_0x3931((short) 0x3931, "BATTF: failure of at least one backup battery of the expansion rack"),
-    EVENTID_0x3932((short) 0x3932, "BAF: failure of backup voltage on expansion rack"),
-    EVENTID_0x3933((short) 0x3933, "24 volt supply failure on at least one expansion rack"),
-    EVENTID_0x3942((short) 0x3942, "Module error"),
-    EVENTID_0x3951((short) 0x3951, "PROFINET IO submodule removed"),
-    EVENTID_0x3954((short) 0x3954, "PROFINET IO interface submodule/submodule removed"),
-    EVENTID_0x3961((short) 0x3961, "Module/interface module removed, cannot be addressed"),
-    EVENTID_0x3966((short) 0x3966, "Module cannot be addressed, load voltage error"),
-    EVENTID_0x3968((short) 0x3968, "Module reconfiguration has ended with error"),
-    EVENTID_0x3981((short) 0x3981, "Interface error entering state"),
-    EVENTID_0x3984((short) 0x3984, "Interface module removed"),
-    EVENTID_0x3986((short) 0x3986, "Performance of an H-Sync link negatively affected"),
-    EVENTID_0x39B1((short) 0x39B1, "I/O access error when updating the process image input table"),
-    EVENTID_0x39B2((short) 0x39B2, "I/O access error when transferring the process image to the output modules"),
-    EVENTID_0x39B3((short) 0x39B3, "I/O access error when updating the process image input table"),
-    EVENTID_0x39B4((short) 0x39B4, "I/O access error when transferring the process image to the output modules"),
-    EVENTID_0x39C1((short) 0x39C1, "Expansion rack failure (1 to 21), entering state"),
-    EVENTID_0x39C3((short) 0x39C3, "Distributed I/Os: master system failure entering state"),
-    EVENTID_0x39C4((short) 0x39C4, "Distributed I/Os: station failure, entering state"),
-    EVENTID_0x39C5((short) 0x39C5, "Distributed I/Os: station fault, entering state"),
-    EVENTID_0x39CA((short) 0x39CA, "PROFINET IO system failure"),
-    EVENTID_0x39CB((short) 0x39CB, "PROFINET IO station failure"),
-    EVENTID_0x39CC((short) 0x39CC, "PROFINET IO station error"),
-    EVENTID_0x39CD((short) 0x39CD, "PROFINET IO station operational again, but expected configuration does not match actual configuration"),
-    EVENTID_0x39CE((short) 0x39CE, "PROFINET IO station operational again, but error(s) in module parameter assignment"),
-    EVENTID_0x42F3((short) 0x42F3, "Checksum error detected and corrected by the operating system"),
-
-    
-    //Event Class 4 - Stop Events and Other Mode Changes
-    EVENTID_0x4300((short) 0x4300, "Backed-up power on"),
-    EVENTID_0x4301((short) 0x4301, "Mode transition from STOP to STARTUP"),
-    EVENTID_0x4302((short) 0x4302, "Mode transition from STARTUP to RUN"),
-    EVENTID_0x4303((short) 0x4303, "STOP caused by stop switch being activated"),
-    EVENTID_0x4304((short) 0x4304, "STOP caused by PG STOP operation or by SFB 20 STOP"),
-    EVENTID_0x4305((short) 0x4305, "HOLD: breakpoint reached"),
-    EVENTID_0x4306((short) 0x4306, "HOLD: breakpoint exited"),
-    EVENTID_0x4307((short) 0x4307, "Memory reset started by PG operation"),
-    EVENTID_0x4308((short) 0x4308, "Memory reset started by switch setting"),
-    EVENTID_0x4309((short) 0x4309, "Memory reset started automatically (power on not backed up)"),
-    EVENTID_0x430A((short) 0x430A, "HOLD exited, transition to STOP"),
-    EVENTID_0x430D((short) 0x430D, "STOP caused by other CPU in multicomputing"),
-    EVENTID_0x430E((short) 0x430E, "Memory reset executed"),
-    EVENTID_0x430F((short) 0x430F, "STOP on the module due to STOP on a CPU"),
-    EVENTID_0x4318((short) 0x4318, "Start of CiR"),
-    EVENTID_0x4319((short) 0x4319, "CiR completed"),
-    EVENTID_0x4357((short) 0x4357, "Module watchdog started"),
-    EVENTID_0x4358((short) 0x4358, "All modules are ready for operation"),
-    EVENTID_0x43B0((short) 0x43B0, "Firmware update was successful"),
-    EVENTID_0x43B4((short) 0x43B4, "Error in firmware fuse"),
-    EVENTID_0x43B6((short) 0x43B6, "Firmware updates canceled by redundant modules"),
-    EVENTID_0x43D3((short) 0x43D3, "STOP on standby CPU"),
-    EVENTID_0x43DC((short) 0x43DC, "Abort during link-up with switchover"),
-    EVENTID_0x43DE((short) 0x43DE, "Updating aborted due to monitoring time being exceeded during the n-th attempt, new update attempt initiated"),
-    EVENTID_0x43DF((short) 0x43DF, "Updating aborted for final time due to monitoring time being exceeded after completing the maximum amount of attempts. User intervention required"),
-    EVENTID_0x43E0((short) 0x43E0, "Change from solo mode after link-up"),
-    EVENTID_0x43E1((short) 0x43E1, "Change from link-up after updating"),
-    EVENTID_0x43E2((short) 0x43E2, "Change from updating to redundant mode"),
-    EVENTID_0x43E3((short) 0x43E3, "Master CPU: change from redundant mode to solo mode"),
-    EVENTID_0x43E4((short) 0x43E4, "Standby CPU: change from redundant mode after error-search mode"),
-    EVENTID_0x43E5((short) 0x43E5, "Standby CPU: change from error-search mode after link-up or STOP"),
-    EVENTID_0x43E6((short) 0x43E6, "Link-up aborted on the standby CPU"),
-    EVENTID_0x43E7((short) 0x43E7, "Updating aborted on the standby CPU"),
-    EVENTID_0x43E8((short) 0x43E8, "Standby CPU: change from link-up after startup"),
-    EVENTID_0x43E9((short) 0x43E9, "Standby CPU: change from startup after updating"),
-    EVENTID_0x43F1((short) 0x43F1, "Reserve-master switchover"),
-    EVENTID_0x43F2((short) 0x43F2, "Coupling of incompatible H-CPUs blocked by system program"),
-    EVENTID_0x4510((short) 0x4510, "STOP violation of the CPU's data range"),
-    EVENTID_0x4520((short) 0x4520, "DEFECTIVE: STOP not possible"),
-    EVENTID_0x4521((short) 0x4521, "DEFECTIVE: failure of instruction processing processor"),
-    EVENTID_0x4522((short) 0x4522, "DEFECTIVE: failure of clock chip"),
-    EVENTID_0x4523((short) 0x4523, "DEFECTIVE: failure of clock pulse generator"),
-    EVENTID_0x4524((short) 0x4524, "DEFECTIVE: failure of timer update function"),
-    EVENTID_0x4525((short) 0x4525, "DEFECTIVE: failure of multicomputing synchronization"),
-    EVENTID_0x4527((short) 0x4527, "DEFECTIVE: failure of I/O access monitoring"),
-    EVENTID_0x4528((short) 0x4528, "DEFECTIVE: failure of scan time monitoring"),
-    EVENTID_0x4530((short) 0x4530, "DEFECTIVE: memory test error in internal memory"),
-    EVENTID_0x4532((short) 0x4532, "DEFECTIVE: failure of core resources"),
-    EVENTID_0x4536((short) 0x4536, "DEFECTIVE: switch defective"),
-    EVENTID_0x4540((short) 0x4540, "STOP: Memory expansion of the internal work memory has gaps. First memory expansion too small or missing"),
-    EVENTID_0x4541((short) 0x4541, "STOP caused by priority class system"),
-    EVENTID_0x4542((short) 0x4542, "STOP caused by object management system"),
-    EVENTID_0x4543((short) 0x4543, "STOP caused by test functions"),
-    EVENTID_0x4544((short) 0x4544, "STOP caused by diagnostic system"),
-    EVENTID_0x4545((short) 0x4545, "STOP caused by communication system"),
-    EVENTID_0x4546((short) 0x4546, "STOP caused by CPU memory management"),
-    EVENTID_0x4547((short) 0x4547, "STOP caused by process image management"),
-    EVENTID_0x4548((short) 0x4548, "STOP caused by I/O management"),
-    EVENTID_0x454A((short) 0x454A, "STOP caused by configuration: an OB deselected with STEP 7 was being loaded into the CPU during STARTUP"),
-    EVENTID_0x4550((short) 0x4550, "DEFECTIVE: internal system error"),
-    EVENTID_0x4555((short) 0x4555, "No restart possible, monitoring time elapsed"),
-    EVENTID_0x4556((short) 0x4556, "STOP: memory reset request from communication system / due to data inconsistency"),
-    EVENTID_0x4562((short) 0x4562, "STOP caused by programming error (OB not loaded or not possible)"),
-    EVENTID_0x4563((short) 0x4563, "STOP caused by I/O access error (OB not loaded or not possible)"),
-    EVENTID_0x4567((short) 0x4567, "STOP caused by H event"),
-    EVENTID_0x4568((short) 0x4568, "STOP caused by time error (OB not loaded or not possible)"),
-    EVENTID_0x456A((short) 0x456A, "STOP caused by diagnostic interrupt (OB not loaded or not possible)"),
-    EVENTID_0x456B((short) 0x456B, "STOP caused by removing/inserting module (OB not loaded or not possible)"),
-    EVENTID_0x456C((short) 0x456C, "STOP caused by CPU hardware error (OB not loaded or not possible, or no FRB)"),
-    EVENTID_0x456D((short) 0x456D, "STOP caused by program sequence error (OB not loaded or not possible)"),
-    EVENTID_0x456E((short) 0x456E, "STOP caused by communication error (OB not loaded or not possible)"),
-    EVENTID_0x456F((short) 0x456F, "STOP caused by rack failure OB (OB not loaded or not possible)"),
-    EVENTID_0x4570((short) 0x4570, "STOP caused by process interrupt (OB not loaded or not possible)"),
-    EVENTID_0x4571((short) 0x4571, "STOP caused by nesting stack error"),
-    EVENTID_0x4572((short) 0x4572, "STOP caused by master control relay stack error"),
-    EVENTID_0x4573((short) 0x4573, "STOP caused by exceeding the nesting depth for synchronous errors"),
-    EVENTID_0x4574((short) 0x4574, "STOP caused by exceeding interrupt stack nesting depth in the priority class stack"),
-    EVENTID_0x4575((short) 0x4575, "STOP caused by exceeding block stack nesting depth in the priority class stack"),
-    EVENTID_0x4576((short) 0x4576, "STOP caused by error when allocating the local data"),
-    EVENTID_0x4578((short) 0x4578, "STOP caused by unknown opcode"),
-    EVENTID_0x457A((short) 0x457A, "STOP caused by code length error"),
-    EVENTID_0x457B((short) 0x457B, "STOP caused by DB not being loaded on on-board I/Os"),
-    EVENTID_0x457D((short) 0x457D, "Reset/clear request because the version of the internal interface to the integrated technology was changed"),
-    EVENTID_0x457F((short) 0x457F, "STOP caused by STOP command"),
-    EVENTID_0x4580((short) 0x4580, "STOP: back-up buffer contents inconsistent (no transition to RUN)"),
-    EVENTID_0x4590((short) 0x4590, "STOP caused by overloading the internal functions"),
-    EVENTID_0x45D5((short) 0x45D5, "LINK-UP rejected due to mismatched CPU memory configuration of the sub-PLC"),
-    EVENTID_0x45D6((short) 0x45D6, "LINK-UP rejected due to mismatched system program of the sub-PLC"),
-    EVENTID_0x45D8((short) 0x45D8, "DEFECTIVE: hardware fault detected due to other error"),
-    EVENTID_0x45D9((short) 0x45D9, "STOP due to SYNC module error"),
-    EVENTID_0x45DA((short) 0x45DA, "STOP due to synchronization error between H CPUs"),
-    EVENTID_0x45DD((short) 0x45DD, "LINK-UP rejected due to running test or other online functions"),
-    EVENTID_0x4926((short) 0x4926, "DEFECTIVE: failure of the watchdog for I/O access"),
-    EVENTID_0x4931((short) 0x4931, "STOP or DEFECTIVE: memory test error in memory submodule"),
-    EVENTID_0x4933((short) 0x4933, "Checksum error"),
-    EVENTID_0x4934((short) 0x4934, "DEFECTIVE: memory not available"),
-    EVENTID_0x4935((short) 0x4935, "DEFECTIVE: cancelled by watchdog/processor exceptions"),
-    EVENTID_0x4949((short) 0x4949, "STOP caused by continuous hardware interrupt"),
-    EVENTID_0x494D((short) 0x494D, "STOP caused by I/O error"),
-    EVENTID_0x494E((short) 0x494E, "STOP caused by power failure"),
-    EVENTID_0x494F((short) 0x494F, "STOP caused by configuration error"),
-    EVENTID_0x4959((short) 0x4959, "One or more modules not ready for operation"),
-    EVENTID_0x497C((short) 0x497C, "STOP caused by integrated technology"),
-    EVENTID_0x49A0((short) 0x49A0, "STOP caused by parameter assignment error or non-permissible variation of setpoint and actual extension: Start-up blocked"),
-    EVENTID_0x49A1((short) 0x49A1, "STOP caused by parameter assignment error: memory reset request"),
-    EVENTID_0x49A2((short) 0x49A2, "STOP caused by error in parameter modification: startup disabled"),
-    EVENTID_0x49A3((short) 0x49A3, "STOP caused by error in parameter modification: memory reset request"),
-    EVENTID_0x49A4((short) 0x49A4, "STOP: inconsistency in configuration data"),
-    EVENTID_0x49A5((short) 0x49A5, "STOP: distributed I/Os: inconsistency in the loaded configuration information"),
-    EVENTID_0x49A6((short) 0x49A6, "STOP: distributed I/Os: invalid configuration information"),
-    EVENTID_0x49A7((short) 0x49A7, "STOP: distributed I/Os: no configuration information"),
-    EVENTID_0x49A8((short) 0x49A8, "STOP: error indicated by the interface module for the distributed I/Os"),
-    EVENTID_0x49B1((short) 0x49B1, "Firmware update data incorrect"),
-    EVENTID_0x49B2((short) 0x49B2, "Firmware update: hardware version does not match firmware"),
-    EVENTID_0x49B3((short) 0x49B3, "Firmware update: module type does not match firmware"),
-    EVENTID_0x49D0((short) 0x49D0, "LINK-UP aborted due to violation of coordination rules"),
-    EVENTID_0x49D1((short) 0x49D1, "LINK-UP/UPDATE sequence aborted"),
-    EVENTID_0x49D2((short) 0x49D2, "Standby CPU changed to STOP due to STOP on the master CPU during link-up"),
-    EVENTID_0x49D4((short) 0x49D4, "STOP on a master, since partner CPU is also a master (link-up error)"),
-    EVENTID_0x49D7((short) 0x49D7, "LINK-UP rejected due to change in user program or in configuration"),
-    EVENTID_0x42F4((short) 0x42F4, "Standby CPU: connection/update via SFC90 is locked in the master CPU"),
-            
-    //Event Class 5 - Mode Run-time Events
-    EVENTID_0x530D((short) 0x530D, "New startup information in the STOP mode"),
-    EVENTID_0x510F((short) 0x510F, "A problem as occurred with WinLC. This problem has caused the CPU to go into STOP mode or has caused a fault in the CPU"),    
-    EVENTID_0x5311((short) 0x5311, "Startup despite Not Ready message from module(s)"),
-    EVENTID_0x5371((short) 0x5371, "Distributed I/Os: end of the synchronization with a DP master"),
-    EVENTID_0x5380((short) 0x5380, "Diagnostic buffer entries of interrupt and asynchronous errors disabled"),
-    EVENTID_0x5395((short) 0x5395, "Distributed I/Os: reset of a DP master"),
-    EVENTID_0x53A2((short) 0x53A2, "Download of technology firmware successful"),
-    EVENTID_0x53A4((short) 0x53A4, "Download of technology DB not successful"),
-    EVENTID_0x5445((short) 0x5445, "Start of System reconfiguration in RUN mode"),
-    EVENTID_0x5481((short) 0x5481, "All licenses for runtime software are complete again"),
-    EVENTID_0x5498((short) 0x5498, "No more inconsistency with DP master systems due to CiR"),
-    EVENTID_0x5545((short) 0x5545, "Start of System reconfiguration in RUN mode"),
-    EVENTID_0x5581((short) 0x5581, "One or several licenses for runtime software are missing"),
-    EVENTID_0x558A((short) 0x558A, "Difference between the MLFB of the configured and inserted CPU"),
-    EVENTID_0x558B((short) 0x558B, "Difference in the firmware version of the configured and inserted CPU"),
-    EVENTID_0x5598((short) 0x5598, "Start of possible inconsistency with DP master systems due to CiR"),
-    EVENTID_0x55A5((short) 0x55A5, "Version conflict: internal interface with integrated technology"),
-    EVENTID_0x55A6((short) 0x55A6, "The maximum number of technology objects has been exceeded"),
-    EVENTID_0x55A7((short) 0x55A7, "A technology DB of this type is already present"),
-    EVENTID_0x5879((short) 0x5879, "Diagnostic message from DP interface: EXTF LED off"),
-    EVENTID_0x5960((short) 0x5960, "Parameter assignment error when switching"),
-    EVENTID_0x5961((short) 0x5961, "Parameter assignment error"),
-    EVENTID_0x5962((short) 0x5962, "Parameter assignment error preventing startup"),
-    EVENTID_0x5963((short) 0x5963, "Parameter assignment error with memory reset request"),
-    EVENTID_0x5966((short) 0x5966, "Parameter assignment error when switching"),
-    EVENTID_0x5969((short) 0x5969, "Parameter assignment error with startup blocked"),
-    EVENTID_0x596A((short) 0x596A, "PROFINET IO: IP address of an IO device already present"),
-    EVENTID_0x596B((short) 0x596B, "IP address of an Ethernet interface already exists"),
-    EVENTID_0x596C((short) 0x596C, "Name of an Ethernet interface already exists"),
-    EVENTID_0x596D((short) 0x596D, "The existing network configuration does not mach the system requirements or configuration"),
-    EVENTID_0x5979((short) 0x5979, "Diagnostic message from DP interface: EXTF LED on"),
-    EVENTID_0x597C((short) 0x597C, "DP Global Control command failed or moved"),
-    EVENTID_0x59A0((short) 0x59A0, "The interrupt can not be associated in the CPU"),
-    EVENTID_0x59A1((short) 0x59A1, "Configuration error in the integrated technology"),
-    EVENTID_0x59A3((short) 0x59A3, "Error when downloading the integrated technology"),
-    EVENTID_0x53FF((short) 0x53FF, "Reset to factory setting"),
-    
-
-    
-    //Event Class 6 - Communication Events
-    EVENTID_0x6316((short) 0x6316, "Interface error when starting programmable controller"),
-    EVENTID_0x6353((short) 0x6353, "Firmware update: Start of firmware download over the network"),
-    EVENTID_0x6390((short) 0x6390, "Formatting of Micro Memory Card complete"),
-    EVENTID_0x6500((short) 0x6500, "Connection ID exists twice on module"),
-    EVENTID_0x6501((short) 0x6501, "Connection resources inadequate"),
-    EVENTID_0x6502((short) 0x6502, "Error in the connection description"),
-    EVENTID_0x6510((short) 0x6510, "CFB structure error detected in instance DB when evaluating EPROM"),
-    EVENTID_0x6514((short) 0x6514, "GD packet number exists twice on the module"),
-    EVENTID_0x6515((short) 0x6515, "Inconsistent length specifications in GD configuration information"),
-    EVENTID_0x6521((short) 0x6521, "No memory submodule and no internal memory available"),
-    EVENTID_0x6522((short) 0x6522, "Illegal memory submodule: replace submodule and reset memory"),
-    EVENTID_0x6523((short) 0x6523, "Memory reset request due to error accessing submodule"),
-    EVENTID_0x6524((short) 0x6524, "Memory reset request due to error in block header"),
-    EVENTID_0x6526((short) 0x6526, "Memory reset request due to memory replacement"),
-    EVENTID_0x6527((short) 0x6527, "Memory replaced, therefore restart not possible"),
-    EVENTID_0x6528((short) 0x6528, "Object handling function in the STOP/HOLD mode, no restart possible"),
-    EVENTID_0x6529((short) 0x6529, "No startup possible during the load"),
-    EVENTID_0x652A((short) 0x652A, "No startup because block exists twice in user memory user program function"),
-    EVENTID_0x652B((short) 0x652B, "No startup because block is too long for submodule - replace submodule"),
-    EVENTID_0x652C((short) 0x652C, "No startup due to illegal OB on submodule"),
-    EVENTID_0x6532((short) 0x6532, "No startup because illegal configuration information on submodule"),
-    EVENTID_0x6533((short) 0x6533, "Memory reset request because of invalid submodule content"),
-    EVENTID_0x6534((short) 0x6534, "No startup: block exists more than once on submodule"),
-    EVENTID_0x6535((short) 0x6535, "No startup: not enough memory to transfer block from submodule"),
-    EVENTID_0x6536((short) 0x6536, "No startup: submodule contains an illegal block number"),
-    EVENTID_0x6537((short) 0x6537, "No startup: submodule contains a block with an illegal length"),
-    EVENTID_0x6538((short) 0x6538, "Local data or write-protection ID (for DB) of a block illegal for CPU"),
-    EVENTID_0x6539((short) 0x6539, "Illegal command in block (detected by compiler)"),
-    EVENTID_0x653A((short) 0x653A, "Memory reset request because local OB data on submodule too short"),
-    EVENTID_0x6543((short) 0x6543, "No startup: illegal block type"),
-    EVENTID_0x6544((short) 0x6544, "No startup: attribute relevant for processing illegal"),
-    EVENTID_0x6545((short) 0x6545, "Source language illegal"),
-    EVENTID_0x6546((short) 0x6546, "Maximum amount of configuration information reached"),
-    EVENTID_0x6547((short) 0x6547, "Parameter assignment error assigning parameters to modules (not on P bus, cancel download)"),
-    EVENTID_0x6548((short) 0x6548, "Plausibility error during block check"),
-    EVENTID_0x6549((short) 0x6549, "Structure error in block"),
-    EVENTID_0x6550((short) 0x6550, "A block has an error in the CRC"),
-    EVENTID_0x6551((short) 0x6551, "A block has no CRC"),
-    EVENTID_0x6253((short) 0x6253, "Firmware update: End of firmware download over the network"),    
-    EVENTID_0x6560((short) 0x6560, "SCAN overflow"),
-    EVENTID_0x6805((short) 0x6805, "Resource problem on configured connections, eliminated"),
-    EVENTID_0x6881((short) 0x6881, "Interface error leaving state"),
-    EVENTID_0x6905((short) 0x6905, "Resource problem on configured connections"),
-    EVENTID_0x6981((short) 0x6981, "Interface error entering state"),
-    
-    //Event Class 7 - H/F Events
-    EVENTID_0x72A2((short) 0x72A2, "Failure of a DP master or a DP master system"),
-    EVENTID_0x72A3((short) 0x72A3, "Redundancy restored on the DP slave"),
-    EVENTID_0x72DB((short) 0x72DB, "Safety program: safety mode disabled"),
-    EVENTID_0x72E0((short) 0x72E0, "Loss of redundancy in communication, problem eliminated"),
-    EVENTID_0x7301((short) 0x7301, "Loss of redundancy (1 of 2) due to failure of a CPU"),
-    EVENTID_0x7302((short) 0x7302, "Loss of redundancy (1 of 2) due to STOP on the standby triggered by user"),
-    EVENTID_0x7303((short) 0x7303, "H system (1 of 2) changed to redundant mode"),
-    EVENTID_0x7323((short) 0x7323, "Discrepancy found in operating system data"),
-    EVENTID_0x7331((short) 0x7331, "Standby-master switchover due to master failure"),
-    EVENTID_0x7333((short) 0x7333, "Standby-master switchover due to system modification during runtime"),
-    EVENTID_0x7334((short) 0x7334, "Standby-master switchover due to communication error at the synchronization module"),
-    EVENTID_0x7340((short) 0x7340, "Synchronization error in user program due to elapsed wait time"),
-    EVENTID_0x7341((short) 0x7341, "Synchronization error in user program due to waiting at different synchronization points"),
-    EVENTID_0x7342((short) 0x7342, "Synchronization error in operating system due to waiting at different synchronization points"),
-    EVENTID_0x7343((short) 0x7343, "Synchronization error in operating system due to elapsed wait time"),
-    EVENTID_0x7344((short) 0x7344, "Synchronization error in operating system due to incorrect data"),
-    EVENTID_0x734A((short) 0x734A, "The \"Re-enable\" job triggered by SFC 90 \"H_CTRL\" was executed"),
-    EVENTID_0x73A3((short) 0x73A3, "Loss of redundancy on the DP slave"),
-    EVENTID_0x73C1((short) 0x73C1, "Update process canceled"),
-    EVENTID_0x73C2((short) 0x73C2, "Updating aborted due to monitoring time being exceeded during the n-th attempt (1 = n = max. possible number of update attempts after abort due to excessive monitoring time)"),
-    EVENTID_0x73D8((short) 0x73D8, "Safety mode disabled"),
-    EVENTID_0x73DB((short) 0x73DB, "Safety program: safety mode enabled"),
-    EVENTID_0x73E0((short) 0x73E0, "Loss of redundancy in communication"),
-    EVENTID_0x74DD((short) 0x74DD, "Safety program: Shutdown of a fail-save runtime group disabled"),
-    EVENTID_0x74DE((short) 0x74DE, "Safety program: Shutdown of the F program disabled"),
-    EVENTID_0x74DF((short) 0x74DF, "Start of F program initialization"),
-    EVENTID_0x7520((short) 0x7520, "Error in RAM comparison"),
-    EVENTID_0x7521((short) 0x7521, "Error in comparison of process image output value"),
-    EVENTID_0x7522((short) 0x7522, "Error in comparison of memory bits, timers, or counters"),
-    EVENTID_0x75D1((short) 0x75D1, "Safety program: Internal CPU error"),
-    EVENTID_0x75D2((short) 0x75D2, "Safety program error: Cycle time time-out"),
-    EVENTID_0x75D6((short) 0x75D6, "Data corrupted in safety program prior to the output to F I/O"),
-    EVENTID_0x75D7((short) 0x75D7, "Data corrupted in safety program prior to the output to partner F-CPU"),
-    EVENTID_0x75D9((short) 0x75D9, "Invalid REAL number in a DB"),
-    EVENTID_0x75DA((short) 0x75DA, "Safety program: Error in safety data format"),
-    EVENTID_0x75DC((short) 0x75DC, "Runtime group, internal protocol error"),
-    EVENTID_0x75DD((short) 0x75DD, "Safety program: Shutdown of a fail-save runtime group enabled"),
-    EVENTID_0x75DE((short) 0x75DE, "Safety program: Shutdown of the F program enabled"),
-    EVENTID_0x75DF((short) 0x75DF, "End of F program initialization"),
-    EVENTID_0x75E1((short) 0x75E1, "Safety program: Error in FB \"F_PLK\" or \"F_PLK_O\" or \"F_CYC_CO\" or \"F_TEST\" or \"F_TESTC\""),
-    EVENTID_0x75E2((short) 0x75E2, "Safety program: Area length error"),
-    EVENTID_0x7852((short) 0x7852, "SYNC module inserted"),
-    EVENTID_0x7855((short) 0x7855, "SYNC module eliminated"),
-    EVENTID_0x78D3((short) 0x78D3, "Communication error between PROFIsafe and F I/O"),
-    EVENTID_0x78D4((short) 0x78D4, "Error in safety relevant communication between F CPUs"),
-    EVENTID_0x78D5((short) 0x78D5, "Error in safety relevant communication between F CPUs"),
-    EVENTID_0x78E3((short) 0x78E3, "F-I/O device input channel depassivated"),
-    EVENTID_0x78E4((short) 0x78E4, "F-I/O device output channel depassivated"),
-    EVENTID_0x78E5((short) 0x78E5, "F-I/O device depassivated"),
-    EVENTID_0x7934((short) 0x7934, "Standby-master switchover due to connection problem at the SYNC module"),
-    EVENTID_0x7950((short) 0x7950, "Synchronization module missing"),
-    EVENTID_0x7951((short) 0x7951, "Change at the SYNC module without Power On"),
-    EVENTID_0x7952((short) 0x7952, "SYNC module removed"),
-    EVENTID_0x7953((short) 0x7953, "Change at the SYNC-module without reset"),
-    EVENTID_0x7954((short) 0x7954, "SYNC module: rack number assigned twice"),
-    EVENTID_0x7955((short) 0x7955, "SYNC module error"),
-    EVENTID_0x7956((short) 0x7956, "Illegal rack number set on SYNC module"),
-    EVENTID_0x7960((short) 0x7960, "Redundant I/O: Time-out of discrepancy time at digital input, error is not yet localized"),
-    EVENTID_0x7961((short) 0x7961, "Redundant I/O, digital input error: Signal change after expiration of the discrepancy time"),
-    EVENTID_0x7962((short) 0x7962, "Redundant I/O: Digital input error"),
-    EVENTID_0x796F((short) 0x796F, "Redundant I/O: The I/O was globally disabled"),
-    EVENTID_0x7970((short) 0x7970, "Redundant I/O: Digital output error"),
-    EVENTID_0x7980((short) 0x7980, "Redundant I/O: Time-out of discrepancy time at analog input"),
-    EVENTID_0x7981((short) 0x7981, "Redundant I/O: Analog input error"),
-    EVENTID_0x7990((short) 0x7990, "Redundant I/O: Analog output error"),
-    EVENTID_0x79D3((short) 0x79D3, "Communication error between PROFIsafe and F I/O"),
-    EVENTID_0x79D4((short) 0x79D4, "Error in safety relevant communication between F CPUs"),
-    EVENTID_0x79D5((short) 0x79D5, "Error in safety relevant communication between F CPUs"),
-    EVENTID_0x79E3((short) 0x79E3, "F-I/O device input channel passivated"),
-    EVENTID_0x79E4((short) 0x79E4, "F-I/O device output channel passivated"),
-    EVENTID_0x79E5((short) 0x79E5, "F-I/O device passivated"),
-    EVENTID_0x79E6((short) 0x79E6, "Inconsistent safety program"),
-    EVENTID_0x79E7((short) 0x79E7, "Simulation block (F system block) loaded"),
-    EVENTID_0x73E8((short) 0x73E8, "Consistency of the safety program verified by testing"),
-    EVENTID_0x73E9((short) 0x73E9, "Consistency of the safety program cannot be checked"),
-    
-    //Event Class 8 - Diagnostic Events for Modules
-    EVENTID_0x8x00((short) 0x8000, "Module fault/OK"),
-    EVENTID_0x8x01((short) 0x8001, "Internal error"),
-    EVENTID_0x8x02((short) 0x8002, "External error"),
-    EVENTID_0x8x03((short) 0x8003, "Channel error"),
-    EVENTID_0x8x04((short) 0x8004, "External error"),
-    EVENTID_0x8x05((short) 0x8005, "No front connector"),
-    EVENTID_0x8x06((short) 0x8006, "No parameter assignment"),
-    EVENTID_0x8x07((short) 0x8007, "Incorrect parameters in module"),  
-    EVENTID_0x8x30((short) 0x8030, "User submodule incorrect/not found"),
-    EVENTID_0x8x31((short) 0x8031, "Communication problem"),
-    EVENTID_0x8x32((short) 0x8032, "Operating mode: RUN/STOP (STOP: entering state, RUN: leaving state)"),
-    EVENTID_0x8x33((short) 0x8033, "Time monitoring responded (watchdog)"),
-    EVENTID_0x8x34((short) 0x8034, "Internal module power failure"),
-    EVENTID_0x8x35((short) 0x8035, "BATTF: battery exhausted"),
-    EVENTID_0x8x36((short) 0x8036, "Total backup failed"),
-    EVENTID_0x8x40((short) 0x8040, "Expansion rack failed"),
-    EVENTID_0x8x41((short) 0x8041, "Processor failure"),
-    EVENTID_0x8x42((short) 0x8042, "EPROM error"),
-    EVENTID_0x8x43((short) 0x8043, "RAM error"),
-    EVENTID_0x8x44((short) 0x8044, "ADC/DAC error"),
-    EVENTID_0x8x45((short) 0x8045, "Fuse blown"),
-    EVENTID_0x8x46((short) 0x8046, "Hardware interrupt lost"),    
-    EVENTID_0x8x50((short) 0x8050, "Configuration/parameter assignment error. Analog input"), 
-    EVENTID_0x8x51((short) 0x8051, "Common mode error"), 
-    EVENTID_0x8x52((short) 0x8052, "Short circuit to phase"),
-    EVENTID_0x8x53((short) 0x8053, "Short circuit to ground"),
-    EVENTID_0x8x54((short) 0x8054, "Wire break"),
-    EVENTID_0x8x55((short) 0x8055, "Reference channel error"),
-    EVENTID_0x8x56((short) 0x8056, "Below measuring range"),
-    EVENTID_0x8x57((short) 0x8057, "Above measuring range"),
-    EVENTID_0x8x60((short) 0x8060, "Configuration/parameter assignment error. Analog output"),
-    EVENTID_0x8x61((short) 0x8061, "Common mode error"),
-    EVENTID_0x8x62((short) 0x8062, "Short circuit to phase"),
-    EVENTID_0x8x63((short) 0x8063, "Short circuit to ground"),
-    EVENTID_0x8x64((short) 0x8064, "Wire break"),
-    EVENTID_0x8x66((short) 0x8066, "No load voltage"),
-    EVENTID_0x8x70((short) 0x8070, "Configuration/parameter assignment error. Digital input"),
-    EVENTID_0x8x71((short) 0x8071, "Chassis ground fault"),
-    EVENTID_0x8x72((short) 0x8072, "Short circuit to phase (sensor)"),
-    EVENTID_0x8x73((short) 0x8073, "Short circuit to ground (sensor)"),
-    EVENTID_0x8x74((short) 0x8074, "Wire break"),
-    EVENTID_0x8x75((short) 0x8075, "No sensor power supply"),
-    EVENTID_0x8x80((short) 0x8080, "Configuration/parameter assignment error. Digital output"),
-    EVENTID_0x8x81((short) 0x8081, "Chassis ground fault"),
-    EVENTID_0x8x82((short) 0x8082, "Short circuit to phase"),
-    EVENTID_0x8x83((short) 0x8083, "Short circuit to ground"),
-    EVENTID_0x8x84((short) 0x8084, "Wire break"),
-    EVENTID_0x8x85((short) 0x8085, "Fuse tripped"),
-    EVENTID_0x8x86((short) 0x8086, "No load voltage"),
-    EVENTID_0x8x87((short) 0x8087, "Excess temperature"),
-    EVENTID_0x8xB0((short) 0x80B0, "Counter module, signal A faulty. FM"),
-    EVENTID_0x8xB1((short) 0x80B1, "Counter module, signal B faulty"),
-    EVENTID_0x8xB2((short) 0x80B2, "Counter module, signal N faulty"),
-    EVENTID_0x8xB3((short) 0x80B3, "Counter module, incorrect value passed between the channels"),
-    EVENTID_0x8xB4((short) 0x80B4, "Counter module, 5.2 V sensor supply faulty"),
-    EVENTID_0x8xB5((short) 0x80B5, "Counter module, 24 V sensor supply faulty"),
-    
-    //Event Class 9 - Standard User Events
-    EVENTID_0x9001((short) 0x9001, "Automatic mode"),
-    EVENTID_0x9101((short) 0x9101, "Manual mode"),
-    EVENTID_0x9x02((short) 0x9002, "OPEN/CLOSED, ON/OFF"),
-    EVENTID_0x9x03((short) 0x9003, "Manual command enable"),
-    EVENTID_0x9x04((short) 0x9004, "Unit protective command (OPEN/CLOSED)"),
-    EVENTID_0x9x05((short) 0x9005, "Process enable"),
-    EVENTID_0x9x06((short) 0x9006, "System protection command"),
-    EVENTID_0x9x07((short) 0x9007, "Process value monitoring responded"),
-    EVENTID_0x9x08((short) 0x9008, "Manipulated variable monitoring responded"),
-    EVENTID_0x9x09((short) 0x9009, "System deviation greater than permitted"),
-    EVENTID_0x9x0A((short) 0x900A, "Limit position error"),
-    EVENTID_0x9x0B((short) 0x900B, "Runtime error"),
-    EVENTID_0x9x0C((short) 0x900C, "Command execution error (sequencer)"),
-    EVENTID_0x9x0D((short) 0x900D, "Operating status running > OPEN"),
-    EVENTID_0x9x0E((short) 0x900E, "Operating status running > CLOSED"),
-    EVENTID_0x9x0F((short) 0x900F, "Command blocking"),
-    EVENTID_0x9x11((short) 0x9011, "Process status OPEN/ON"),
-    EVENTID_0x9x12((short) 0x9012, "Process status CLOSED/OFF"),
-    EVENTID_0x9x13((short) 0x9013, "Process status intermediate position"),
-    EVENTID_0x9x14((short) 0x9014, "Process status ON via AUTO"),
-    EVENTID_0x9x15((short) 0x9015, "Process status ON via manual"),
-    EVENTID_0x9x16((short) 0x9016, "Process status ON via protective command"),
-    EVENTID_0x9x17((short) 0x9017, "Process status OFF via AUTO"),
-    EVENTID_0x9x18((short) 0x9018, "Process status OFF via manual"),
-    EVENTID_0x9x19((short) 0x9019, "Process status OFF via protective command"),
-    EVENTID_0x9x21((short) 0x9021, "Function error on approach"),
-    EVENTID_0x9x22((short) 0x9022, "Function error on leaving"),
-    EVENTID_0x9x31((short) 0x9031, "Actuator (DE/WE) limit position OPEN"),
-    EVENTID_0x9x32((short) 0x9032, "Actuator (DE/WE) limit position not OPEN"),
-    EVENTID_0x9x33((short) 0x9033, "Actuator (DE/WE) limit position CLOSED"),
-    EVENTID_0x9x34((short) 0x9034, "Actuator (DE/WE) limit position not CLOSED"),
-    EVENTID_0x9x41((short) 0x9041, "Illegal status, tolerance time elapsed"),
-    EVENTID_0x9x42((short) 0x9042, "Illegal status, tolerance time not elapsed"),
-    EVENTID_0x9x43((short) 0x9043, "Interlock error, tolerance time = 0"),
-    EVENTID_0x9x44((short) 0x9044, "Interlock error, tolerance time > 0"),
-    EVENTID_0x9x45((short) 0x9045, "No reaction"),
-    EVENTID_0x9x46((short) 0x9046, "Final status exited illegally, tolerance time = 0"),
-    EVENTID_0x9x47((short) 0x9047, "Final status exited illegally, tolerance time > 0"),
-    EVENTID_0x9x50((short) 0x9050, "Upper limit of signal range USR"),
-    EVENTID_0x9x51((short) 0x9051, "Upper limit of measuring range UMR"),
-    EVENTID_0x9x52((short) 0x9052, "Lower limit of signal range LSR"),
-    EVENTID_0x9x53((short) 0x9053, "Lower limit of measuring range LMR"),
-    EVENTID_0x9x54((short) 0x9054, "Upper alarm limit UAL"),
-    EVENTID_0x9x55((short) 0x9055, "Upper warning limit UWL"),
-    EVENTID_0x9x56((short) 0x9056, "Upper tolerance limit UTL"),
-    EVENTID_0x9x57((short) 0x9057, "Lower tolerance limit LTL"),
-    EVENTID_0x9x58((short) 0x9058, "Lower warning limit LWL"),
-    EVENTID_0x9x59((short) 0x9059, "Lower alarm limit LAL"),
-    EVENTID_0x9x60((short) 0x9060, "GRAPH7 step entering/leaving"),
-    EVENTID_0x9x61((short) 0x9061, "GRAPH7 interlock error"),
-    EVENTID_0x9x62((short) 0x9062, "GRAPH7 execution error"),
-    EVENTID_0x9x63((short) 0x9063, "GRAPH7 error noted"),
-    EVENTID_0x9x64((short) 0x9064, "GRAPH7 error acknowledged"),
-    EVENTID_0x9x70((short) 0x9070, "Trend exceeded in positive direction"),
-    EVENTID_0x9x71((short) 0x9071, "Trend exceeded in negative direction"),
-    EVENTID_0x9x72((short) 0x9072, "No reaction"),
-    EVENTID_0x9x73((short) 0x9073, "Final state exited illegally"),
-    EVENTID_0x9x80((short) 0x9080, "Limit value exceeded, tolerance time = 0"),
-    EVENTID_0x9x81((short) 0x9081, "Limit value exceeded, tolerance time > 0"),
-    EVENTID_0x9x82((short) 0x9082, "Below limit value, tolerance time = 0"),
-    EVENTID_0x9x83((short) 0x9083, "Below limit value, tolerance time > 0"),
-    EVENTID_0x9x84((short) 0x9084, "Gradient exceeded, tolerance time = 0"),
-    EVENTID_0x9x85((short) 0x9085, "Gradient exceeded, tolerance time > 0"),
-    EVENTID_0x9x86((short) 0x9086, "Below gradient, tolerance time = 0"),
-    EVENTID_0x9x87((short) 0x9087, "Below gradient, tolerance time > 0"),
-    EVENTID_0x9090((short) 0x9090, "User parameter assignment error entering/leaving"),
-    EVENTID_0x9190((short) 0x9190, "User parameter assignment error entering/leaving"),
-    EVENTID_0x91F0((short) 0x91F0, "Overflow"),
-    EVENTID_0x91F1((short) 0x91F1, "Underflow"),
-    EVENTID_0x91F2((short) 0x91F2, "Division by 0"),
-    EVENTID_0x91F3((short) 0x91F3, "Illegal calculation operation"),
-    
-    //Event Classes A and B - Free User Events
-    
-    
-    //Event Classes C,D & E - Reserved Event Classes
-    
-    //Event Classes F -  Reserved for modules not in central 
-    //                   rack (for example, CPs or FMs)
-    
-    EVENTID_0x0000((short) 0x0000, "NULL: Check for user information.");
-
-    
-    
-    private static final Map<Short, S7DiagnosticEventId> map;
-    
-    private static final Map<Short, String> idstr;
-    
-    static {
-        map = new HashMap<>();
-        idstr = new HashMap<>();
-        for (S7DiagnosticEventId  event : S7DiagnosticEventId.values()) {
-            map.put(event.code, event);
-        }
-       
-        idstr.put((short) 0x0000, "Event leaving state. ");
-        idstr.put((short) 0x0100, "Event entering state. ");
-        idstr.put((short) 0x0200, "Entry in diagnostic buffer. ");
-        idstr.put((short) 0x0400, "Internal error. ");
-        idstr.put((short) 0x0800, "External error. ");
-    }    
-    
-    private final String description;
-    private final short code;
-    
-    S7DiagnosticEventId(final short code, final String description){
-        this.code = code;        
-        this.description = description;
-    }
-    
-    public String getDescription(){
-        //short id = (short) (code & 0x0F00);
-        return description;
-    }    
-    
-    public short getCode() {
-        return code;
-    }    
-
-    public static S7DiagnosticEventId  valueOf(short code) {
-        
-        Integer intcode = Short.toUnsignedInt(code);
-        
-        if ((intcode > 0x8000) && (intcode < 0xA000)){
-            if ((intcode != 0x9101) && (intcode != 0x9190) && (intcode != 0x91F0)
-                    && (intcode != 0x91F1) && (intcode != 0x91F2)
-                    && (intcode != 0x91F3))
-            intcode = (intcode & 0xF0FF);
-        } else if (((intcode >= 0xA000) && (intcode <= 0xBFFF))) intcode = 0x0000;
-                
-        return map.get(intcode.shortValue());
-    }    
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.utils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+ *  |15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1|
+ *  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+ *  \__________/\__________/\____________________/
+ *   Event class     IDs         Event number
+ * 
+ *   Event Class:
+ *      1   Standard OB Events
+ *      2   Synchronous errors
+ *      3   Asynchronous errors
+ *      4   Mode transition
+ *      5   Run-time events
+ *      6   Communications events
+ *      7   Events for fail-safe and fault tolerant systems
+ *      8   Standardized diagnostic data on modules
+ *      9   Predefined user events
+ *    A,B   Freely definable events
+ *  C,D,E   Reserved
+ *      F   Events for modules other than CPUs (for example, CPs, FMs)
+ * 
+ *  IDs (Bit)
+ *      8   0:Event leaving state, 1:Event entering state
+ *      9   1:Entry in diagnostic buffer
+ *     10   1:Internal error
+ *     11   1:External error
+ * 
+ * @author cgarcia
+ */
+public enum S7DiagnosticEventId {
+
+    EVENTID_0x113A((short) 0x113A, "Start request for cyclic interrupt OB with special handling (S7-300 only)"),
+    EVENTID_0x1155((short) 0x1155, "Status alarm for PROFIBUS DP"),
+    EVENTID_0x1156((short) 0x1156, "Update interrupt for PROFIBUS DP"),
+    EVENTID_0x1157((short) 0x1157, "Manufacturer interrupt for PROFIBUS DP"),
+    EVENTID_0x1158((short) 0x1158, "Status interrupt for PROFINET IO"),
+    EVENTID_0x1159((short) 0x1159, "Update interrupt for PROFINET IO"),
+    EVENTID_0x115A((short) 0x115A, "Manufacturer interrupt for PROFINET IO"),
+    EVENTID_0x115B((short) 0x115B, "IO: Profile-specific interrupt"),
+    EVENTID_0x116A((short) 0x116A, "Technology synchronization interrupt"),
+    
+    //Event Class 1 - Standard OB Events
+    EVENTID_0x1381((short) 0x1381, "Request for manual warm restart"),
+    EVENTID_0x1382((short) 0x1382, "Request for automatic warm restart"),
+    EVENTID_0x1383((short) 0x1383, "Request for manual hot restart"),
+    EVENTID_0x1384((short) 0x1384, "Request for automatic hot restart"),
+    EVENTID_0x1385((short) 0x1385, "Request for manual cold restart"),
+    EVENTID_0x1386((short) 0x1386, "Request for automatic cold restart"),
+    EVENTID_0x1387((short) 0x1387, "Master CPU: request for manual cold restart"),
+    EVENTID_0x1388((short) 0x1388, "Master CPU: request for automatic cold restart"),
+    EVENTID_0x138A((short) 0x138A, "Master CPU: request for manual warm restart"),
+    EVENTID_0x138B((short) 0x138B, "Master CPU: request for automatic warm restart"),
+    EVENTID_0x138C((short) 0x138C, "Standby CPU: request for manual hot restart"),
+    EVENTID_0x138D((short) 0x138D, "Standby CPU: request for automatic hot restart"),
+    
+    //Event Class 2 - Synchronous Errors
+    EVENTID_0x2521((short) 0x2521, "BCD conversion error"),
+    EVENTID_0x2522((short) 0x2522, "Area length error when reading"),
+    EVENTID_0x2523((short) 0x2523, "Area length error when writing"),
+    EVENTID_0x2524((short) 0x2524, "Area error when reading"),
+    EVENTID_0x2525((short) 0x2525, "Area error when writing"),
+    EVENTID_0x2526((short) 0x2526, "Timer number error"),
+    EVENTID_0x2527((short) 0x2527, "Counter number error"),
+    EVENTID_0x2528((short) 0x2528, "Alignment error when reading"),
+    EVENTID_0x2529((short) 0x2529, "Alignment error when writing"),
+    EVENTID_0x2530((short) 0x2530, "Write error when accessing the DB"),
+    EVENTID_0x2531((short) 0x2531, "Write error when accessing the DI"),
+    EVENTID_0x2532((short) 0x2532, "Block number error when opening a DB"),
+    EVENTID_0x2533((short) 0x2533, "Block number error when opening a DI"),
+    EVENTID_0x2534((short) 0x2534, "Block number error when calling an FC"),
+    EVENTID_0x2535((short) 0x2535, "Block number error when calling an FB"),
+    EVENTID_0x253A((short) 0x253A, "DB not loaded"),
+    EVENTID_0x253C((short) 0x253C, "FC not loaded"),
+    EVENTID_0x253D((short) 0x253D, "SFC not loaded"),
+    EVENTID_0x253E((short) 0x253E, "FB not loaded"),
+    EVENTID_0x253F((short) 0x253F, "SFB not loaded"),
+    EVENTID_0x2942((short) 0x2942, "I/O access error, reading"),
+    EVENTID_0x2943((short) 0x2943, "I/O access error, writing"),
+
+    
+    //Event Class 3 - Asynchronous Errors
+    EVENTID_0x3501((short) 0x3501, "Cycle time exceeded"),
+    EVENTID_0x3502((short) 0x3502, "User interface (OB or FRB) request error"),
+    EVENTID_0x3503((short) 0x3503, "Delay too long processing a priority class"),
+    EVENTID_0x3505((short) 0x3505, "Time-of-day interrupt(s) skipped due to new clock setting"),
+    EVENTID_0x3506((short) 0x3506, "Time-of-day interrupt(s) skipped when changing to RUN after HOLD"),
+    EVENTID_0x3507((short) 0x3507, "Multiple OB request errors caused internal buffer overflow"),
+    EVENTID_0x3508((short) 0x3508, "Synchronous cycle interrupt-timing error"),
+    EVENTID_0x3509((short) 0x3509, "Interrupt loss due to excess interrupt load"),
+    EVENTID_0x350A((short) 0x350A, "Resume RUN mode after CiR"),
+    EVENTID_0x350B((short) 0x350B, "Technology synchronization interrupt - timing error"),
+    EVENTID_0x3571((short) 0x3571, "Nesting depth too high in nesting levels"),
+    EVENTID_0x3572((short) 0x3572, "Nesting depth for Master Control Relays too high"),
+    EVENTID_0x3573((short) 0x3573, "Nesting depth too high after synchronous errors"),
+    EVENTID_0x3574((short) 0x3574, "Nesting depth for block calls (U stack) too high"),
+    EVENTID_0x3575((short) 0x3575, "Nesting depth for block calls (B stack) too high"),
+    EVENTID_0x3576((short) 0x3576, "Local data allocation error"),
+    EVENTID_0x3578((short) 0x3578, "Unknown instruction"),
+    EVENTID_0x357A((short) 0x357A, "Jump instruction to target outside of the block"),
+    EVENTID_0x3582((short) 0x3582, "Memory error detected and corrected by operating system"),
+    EVENTID_0x3583((short) 0x3583, "Accumulation of detected and corrected memo errors"),
+    EVENTID_0x3585((short) 0x3585, "Error in the PC operating system (only for LC RTX)"),
+    EVENTID_0x3587((short) 0x3587, "Multi-bit memory error detected and corrected"),
+    EVENTID_0x35A1((short) 0x35A1, "User interface (OB or FRB) not found"),
+    EVENTID_0x35A2((short) 0x35A2, "OB not loaded (started by SFC or operating system due to configuration)"),
+    EVENTID_0x35A3((short) 0x35A3, "Error when operating system accesses a block"),
+    EVENTID_0x35A4((short) 0x35A4, "PROFInet Interface DB cannot be addressed"),
+    EVENTID_0x35D2((short) 0x35D2, "Diagnostic entries cannot be sent at present"),
+    EVENTID_0x35D3((short) 0x35D3, "Synchronization frames cannot be sent"),
+    EVENTID_0x35D4((short) 0x35D4, "Illegal time jump resulting from synchronization"),
+    EVENTID_0x35D5((short) 0x35D5, "Error adopting the synchronization time"),
+    EVENTID_0x35E1((short) 0x35E1, "Incorrect frame ID in GD"),
+    EVENTID_0x35E2((short) 0x35E2, "GD packet status cannot be entered in DB"),
+    EVENTID_0x35E3((short) 0x35E3, "Frame length error in GD"),
+    EVENTID_0x35E4((short) 0x35E4, "Illegal GD packet number received"),
+    EVENTID_0x35E5((short) 0x35E5, "Error accessing DB in communication SFBs for configured S7 connections"),
+    EVENTID_0x35E6((short) 0x35E6, "GD total status cannot be entered in DB"),
+    EVENTID_0x3821((short) 0x3821, "BATTF: failure on at least one backup battery of the central rack, problem eliminated"),
+    EVENTID_0x3822((short) 0x3822, "BAF: failure of backup voltage on central rack, problem eliminated"),
+    EVENTID_0x3823((short) 0x3823, "24 volt supply failure on central rack, problem eliminated"),
+    EVENTID_0x3825((short) 0x3825, "BATTF: failure on at least one backup battery of the redundant central rack, problem eliminated"),
+    EVENTID_0x3826((short) 0x3826, "BAF: failure of backup voltage on redundant central rack, problem eliminated"),
+    EVENTID_0x3827((short) 0x3827, "24 volt supply failure on redundant central rack, problem eliminated"),
+    EVENTID_0x3831((short) 0x3831, "BATTF: failure of at least one backup battery of the expansion rack, problem eliminated"),
+    EVENTID_0x3832((short) 0x3832, "BAF: failure of backup voltage on expansion rack, problem eliminated"),
+    EVENTID_0x3833((short) 0x3833, "24 volt supply failure on at least one expansion rack, problem eliminated"),
+    EVENTID_0x3842((short) 0x3842, "Module OK"),
+    EVENTID_0x3854((short) 0x3854, "PROFINET IO interface submodule/submodule and matches the configured interface submodule/submodule"),
+    EVENTID_0x3855((short) 0x3855, "PROFINET IO interface submodule/submodule inserted, but does not match the configured interface submodule/submodule"),
+    EVENTID_0x3856((short) 0x3856, "PROFINET IO interface submodule/submodule inserted, but error in module parameter assignment"),
+    EVENTID_0x3858((short) 0x3858, "PROFINET IO interface submodule access error corrected"),
+    EVENTID_0x3861((short) 0x3861, "Module/interface module inserted, module type OK"),
+    EVENTID_0x3863((short) 0x3863, "Module/interface module plugged in, but wrong module type"),
+    EVENTID_0x3864((short) 0x3864, "Module/interface module plugged in, but causing problem (type ID unreadable)"),
+    EVENTID_0x3865((short) 0x3865, "Module plugged in, but error in module parameter assignment"),
+    EVENTID_0x3866((short) 0x3866, "Module can be addressed again, load voltage error removed"),
+    EVENTID_0x3881((short) 0x3881, "Interface error leaving state"),
+    EVENTID_0x3884((short) 0x3884, "Interface module plugged in"),
+    EVENTID_0x38B3((short) 0x38B3, "I/O access error when updating the process image input table"),
+    EVENTID_0x38B4((short) 0x38B4, "I/O access error when transferring the process image to the output modules"),
+    EVENTID_0x38C1((short) 0x38C1, "Expansion rack operational again (1 to 21), leaving state"),
+    EVENTID_0x38C2((short) 0x38C2, "Expansion rack operational again but mismatch between setpoint and actual configuration"),
+    EVENTID_0x38C4((short) 0x38C4, "Distributed I/Os: station failure, leaving state"),
+    EVENTID_0x38C5((short) 0x38C5, "Distributed I/Os: station fault, leaving state"),
+    EVENTID_0x38C6((short) 0x38C6, "Expansion rack operational again, but error(s) in module parameter assignment"),
+    EVENTID_0x38C7((short) 0x38C7, "DP: station operational again, but error(s) in module parameter assignment"),
+    EVENTID_0x38C8((short) 0x38C8, "DP: station operational again, but mismatch between setpoint and actual configuration"),
+    EVENTID_0x38CB((short) 0x38CB, "PROFINET IO station operational again"),
+    EVENTID_0x38CC((short) 0x38CC, "PROFINET IO station error corrected"),
+    EVENTID_0x3921((short) 0x3921, "BATTF: failure on at least one backup battery of the central rack"),
+    EVENTID_0x3922((short) 0x3922, "BAF: failure of backup voltage on central rack"),
+    EVENTID_0x3923((short) 0x3923, "24 volt supply failure on central rack"),
+    EVENTID_0x3925((short) 0x3925, "BATTF: failure on at least one backup battery of the redundant central rack"),
+    EVENTID_0x3926((short) 0x3926, "BAF: failure of backup voltage on redundant central rack"),
+    EVENTID_0x3927((short) 0x3927, "24 volt supply failure on redundant central rack"),
+    EVENTID_0x3931((short) 0x3931, "BATTF: failure of at least one backup battery of the expansion rack"),
+    EVENTID_0x3932((short) 0x3932, "BAF: failure of backup voltage on expansion rack"),
+    EVENTID_0x3933((short) 0x3933, "24 volt supply failure on at least one expansion rack"),
+    EVENTID_0x3942((short) 0x3942, "Module error"),
+    EVENTID_0x3951((short) 0x3951, "PROFINET IO submodule removed"),
+    EVENTID_0x3954((short) 0x3954, "PROFINET IO interface submodule/submodule removed"),
+    EVENTID_0x3961((short) 0x3961, "Module/interface module removed, cannot be addressed"),
+    EVENTID_0x3966((short) 0x3966, "Module cannot be addressed, load voltage error"),
+    EVENTID_0x3968((short) 0x3968, "Module reconfiguration has ended with error"),
+    EVENTID_0x3981((short) 0x3981, "Interface error entering state"),
+    EVENTID_0x3984((short) 0x3984, "Interface module removed"),
+    EVENTID_0x3986((short) 0x3986, "Performance of an H-Sync link negatively affected"),
+    EVENTID_0x39B1((short) 0x39B1, "I/O access error when updating the process image input table"),
+    EVENTID_0x39B2((short) 0x39B2, "I/O access error when transferring the process image to the output modules"),
+    EVENTID_0x39B3((short) 0x39B3, "I/O access error when updating the process image input table"),
+    EVENTID_0x39B4((short) 0x39B4, "I/O access error when transferring the process image to the output modules"),
+    EVENTID_0x39C1((short) 0x39C1, "Expansion rack failure (1 to 21), entering state"),
+    EVENTID_0x39C3((short) 0x39C3, "Distributed I/Os: master system failure entering state"),
+    EVENTID_0x39C4((short) 0x39C4, "Distributed I/Os: station failure, entering state"),
+    EVENTID_0x39C5((short) 0x39C5, "Distributed I/Os: station fault, entering state"),
+    EVENTID_0x39CA((short) 0x39CA, "PROFINET IO system failure"),
+    EVENTID_0x39CB((short) 0x39CB, "PROFINET IO station failure"),
+    EVENTID_0x39CC((short) 0x39CC, "PROFINET IO station error"),
+    EVENTID_0x39CD((short) 0x39CD, "PROFINET IO station operational again, but expected configuration does not match actual configuration"),
+    EVENTID_0x39CE((short) 0x39CE, "PROFINET IO station operational again, but error(s) in module parameter assignment"),
+    EVENTID_0x42F3((short) 0x42F3, "Checksum error detected and corrected by the operating system"),
+
+    
+    //Event Class 4 - Stop Events and Other Mode Changes
+    EVENTID_0x4300((short) 0x4300, "Backed-up power on"),
+    EVENTID_0x4301((short) 0x4301, "Mode transition from STOP to STARTUP"),
+    EVENTID_0x4302((short) 0x4302, "Mode transition from STARTUP to RUN"),
+    EVENTID_0x4303((short) 0x4303, "STOP caused by stop switch being activated"),
+    EVENTID_0x4304((short) 0x4304, "STOP caused by PG STOP operation or by SFB 20 STOP"),
+    EVENTID_0x4305((short) 0x4305, "HOLD: breakpoint reached"),
+    EVENTID_0x4306((short) 0x4306, "HOLD: breakpoint exited"),
+    EVENTID_0x4307((short) 0x4307, "Memory reset started by PG operation"),
+    EVENTID_0x4308((short) 0x4308, "Memory reset started by switch setting"),
+    EVENTID_0x4309((short) 0x4309, "Memory reset started automatically (power on not backed up)"),
+    EVENTID_0x430A((short) 0x430A, "HOLD exited, transition to STOP"),
+    EVENTID_0x430D((short) 0x430D, "STOP caused by other CPU in multicomputing"),
+    EVENTID_0x430E((short) 0x430E, "Memory reset executed"),
+    EVENTID_0x430F((short) 0x430F, "STOP on the module due to STOP on a CPU"),
+    EVENTID_0x4318((short) 0x4318, "Start of CiR"),
+    EVENTID_0x4319((short) 0x4319, "CiR completed"),
+    EVENTID_0x4357((short) 0x4357, "Module watchdog started"),
+    EVENTID_0x4358((short) 0x4358, "All modules are ready for operation"),
+    EVENTID_0x43B0((short) 0x43B0, "Firmware update was successful"),
+    EVENTID_0x43B4((short) 0x43B4, "Error in firmware fuse"),
+    EVENTID_0x43B6((short) 0x43B6, "Firmware updates canceled by redundant modules"),
+    EVENTID_0x43D3((short) 0x43D3, "STOP on standby CPU"),
+    EVENTID_0x43DC((short) 0x43DC, "Abort during link-up with switchover"),
+    EVENTID_0x43DE((short) 0x43DE, "Updating aborted due to monitoring time being exceeded during the n-th attempt, new update attempt initiated"),
+    EVENTID_0x43DF((short) 0x43DF, "Updating aborted for final time due to monitoring time being exceeded after completing the maximum amount of attempts. User intervention required"),
+    EVENTID_0x43E0((short) 0x43E0, "Change from solo mode after link-up"),
+    EVENTID_0x43E1((short) 0x43E1, "Change from link-up after updating"),
+    EVENTID_0x43E2((short) 0x43E2, "Change from updating to redundant mode"),
+    EVENTID_0x43E3((short) 0x43E3, "Master CPU: change from redundant mode to solo mode"),
+    EVENTID_0x43E4((short) 0x43E4, "Standby CPU: change from redundant mode after error-search mode"),
+    EVENTID_0x43E5((short) 0x43E5, "Standby CPU: change from error-search mode after link-up or STOP"),
+    EVENTID_0x43E6((short) 0x43E6, "Link-up aborted on the standby CPU"),
+    EVENTID_0x43E7((short) 0x43E7, "Updating aborted on the standby CPU"),
+    EVENTID_0x43E8((short) 0x43E8, "Standby CPU: change from link-up after startup"),
+    EVENTID_0x43E9((short) 0x43E9, "Standby CPU: change from startup after updating"),
+    EVENTID_0x43F1((short) 0x43F1, "Reserve-master switchover"),
+    EVENTID_0x43F2((short) 0x43F2, "Coupling of incompatible H-CPUs blocked by system program"),
+    EVENTID_0x4510((short) 0x4510, "STOP violation of the CPU's data range"),
+    EVENTID_0x4520((short) 0x4520, "DEFECTIVE: STOP not possible"),
+    EVENTID_0x4521((short) 0x4521, "DEFECTIVE: failure of instruction processing processor"),
+    EVENTID_0x4522((short) 0x4522, "DEFECTIVE: failure of clock chip"),
+    EVENTID_0x4523((short) 0x4523, "DEFECTIVE: failure of clock pulse generator"),
+    EVENTID_0x4524((short) 0x4524, "DEFECTIVE: failure of timer update function"),
+    EVENTID_0x4525((short) 0x4525, "DEFECTIVE: failure of multicomputing synchronization"),
+    EVENTID_0x4527((short) 0x4527, "DEFECTIVE: failure of I/O access monitoring"),
+    EVENTID_0x4528((short) 0x4528, "DEFECTIVE: failure of scan time monitoring"),
+    EVENTID_0x4530((short) 0x4530, "DEFECTIVE: memory test error in internal memory"),
+    EVENTID_0x4532((short) 0x4532, "DEFECTIVE: failure of core resources"),
+    EVENTID_0x4536((short) 0x4536, "DEFECTIVE: switch defective"),
+    EVENTID_0x4540((short) 0x4540, "STOP: Memory expansion of the internal work memory has gaps. First memory expansion too small or missing"),
+    EVENTID_0x4541((short) 0x4541, "STOP caused by priority class system"),
+    EVENTID_0x4542((short) 0x4542, "STOP caused by object management system"),
+    EVENTID_0x4543((short) 0x4543, "STOP caused by test functions"),
+    EVENTID_0x4544((short) 0x4544, "STOP caused by diagnostic system"),
+    EVENTID_0x4545((short) 0x4545, "STOP caused by communication system"),
+    EVENTID_0x4546((short) 0x4546, "STOP caused by CPU memory management"),
+    EVENTID_0x4547((short) 0x4547, "STOP caused by process image management"),
+    EVENTID_0x4548((short) 0x4548, "STOP caused by I/O management"),
+    EVENTID_0x454A((short) 0x454A, "STOP caused by configuration: an OB deselected with STEP 7 was being loaded into the CPU during STARTUP"),
+    EVENTID_0x4550((short) 0x4550, "DEFECTIVE: internal system error"),
+    EVENTID_0x4555((short) 0x4555, "No restart possible, monitoring time elapsed"),
+    EVENTID_0x4556((short) 0x4556, "STOP: memory reset request from communication system / due to data inconsistency"),
+    EVENTID_0x4562((short) 0x4562, "STOP caused by programming error (OB not loaded or not possible)"),
+    EVENTID_0x4563((short) 0x4563, "STOP caused by I/O access error (OB not loaded or not possible)"),
+    EVENTID_0x4567((short) 0x4567, "STOP caused by H event"),
+    EVENTID_0x4568((short) 0x4568, "STOP caused by time error (OB not loaded or not possible)"),
+    EVENTID_0x456A((short) 0x456A, "STOP caused by diagnostic interrupt (OB not loaded or not possible)"),
+    EVENTID_0x456B((short) 0x456B, "STOP caused by removing/inserting module (OB not loaded or not possible)"),
+    EVENTID_0x456C((short) 0x456C, "STOP caused by CPU hardware error (OB not loaded or not possible, or no FRB)"),
+    EVENTID_0x456D((short) 0x456D, "STOP caused by program sequence error (OB not loaded or not possible)"),
+    EVENTID_0x456E((short) 0x456E, "STOP caused by communication error (OB not loaded or not possible)"),
+    EVENTID_0x456F((short) 0x456F, "STOP caused by rack failure OB (OB not loaded or not possible)"),
+    EVENTID_0x4570((short) 0x4570, "STOP caused by process interrupt (OB not loaded or not possible)"),
+    EVENTID_0x4571((short) 0x4571, "STOP caused by nesting stack error"),
+    EVENTID_0x4572((short) 0x4572, "STOP caused by master control relay stack error"),
+    EVENTID_0x4573((short) 0x4573, "STOP caused by exceeding the nesting depth for synchronous errors"),
+    EVENTID_0x4574((short) 0x4574, "STOP caused by exceeding interrupt stack nesting depth in the priority class stack"),
+    EVENTID_0x4575((short) 0x4575, "STOP caused by exceeding block stack nesting depth in the priority class stack"),
+    EVENTID_0x4576((short) 0x4576, "STOP caused by error when allocating the local data"),
+    EVENTID_0x4578((short) 0x4578, "STOP caused by unknown opcode"),
+    EVENTID_0x457A((short) 0x457A, "STOP caused by code length error"),
+    EVENTID_0x457B((short) 0x457B, "STOP caused by DB not being loaded on on-board I/Os"),
+    EVENTID_0x457D((short) 0x457D, "Reset/clear request because the version of the internal interface to the integrated technology was changed"),
+    EVENTID_0x457F((short) 0x457F, "STOP caused by STOP command"),
+    EVENTID_0x4580((short) 0x4580, "STOP: back-up buffer contents inconsistent (no transition to RUN)"),
+    EVENTID_0x4590((short) 0x4590, "STOP caused by overloading the internal functions"),
+    EVENTID_0x45D5((short) 0x45D5, "LINK-UP rejected due to mismatched CPU memory configuration of the sub-PLC"),
+    EVENTID_0x45D6((short) 0x45D6, "LINK-UP rejected due to mismatched system program of the sub-PLC"),
+    EVENTID_0x45D8((short) 0x45D8, "DEFECTIVE: hardware fault detected due to other error"),
+    EVENTID_0x45D9((short) 0x45D9, "STOP due to SYNC module error"),
+    EVENTID_0x45DA((short) 0x45DA, "STOP due to synchronization error between H CPUs"),
+    EVENTID_0x45DD((short) 0x45DD, "LINK-UP rejected due to running test or other online functions"),
+    EVENTID_0x4926((short) 0x4926, "DEFECTIVE: failure of the watchdog for I/O access"),
+    EVENTID_0x4931((short) 0x4931, "STOP or DEFECTIVE: memory test error in memory submodule"),
+    EVENTID_0x4933((short) 0x4933, "Checksum error"),
+    EVENTID_0x4934((short) 0x4934, "DEFECTIVE: memory not available"),
+    EVENTID_0x4935((short) 0x4935, "DEFECTIVE: cancelled by watchdog/processor exceptions"),
+    EVENTID_0x4949((short) 0x4949, "STOP caused by continuous hardware interrupt"),
+    EVENTID_0x494D((short) 0x494D, "STOP caused by I/O error"),
+    EVENTID_0x494E((short) 0x494E, "STOP caused by power failure"),
+    EVENTID_0x494F((short) 0x494F, "STOP caused by configuration error"),
+    EVENTID_0x4959((short) 0x4959, "One or more modules not ready for operation"),
+    EVENTID_0x497C((short) 0x497C, "STOP caused by integrated technology"),
+    EVENTID_0x49A0((short) 0x49A0, "STOP caused by parameter assignment error or non-permissible variation of setpoint and actual extension: Start-up blocked"),
+    EVENTID_0x49A1((short) 0x49A1, "STOP caused by parameter assignment error: memory reset request"),
+    EVENTID_0x49A2((short) 0x49A2, "STOP caused by error in parameter modification: startup disabled"),
+    EVENTID_0x49A3((short) 0x49A3, "STOP caused by error in parameter modification: memory reset request"),
+    EVENTID_0x49A4((short) 0x49A4, "STOP: inconsistency in configuration data"),
+    EVENTID_0x49A5((short) 0x49A5, "STOP: distributed I/Os: inconsistency in the loaded configuration information"),
+    EVENTID_0x49A6((short) 0x49A6, "STOP: distributed I/Os: invalid configuration information"),
+    EVENTID_0x49A7((short) 0x49A7, "STOP: distributed I/Os: no configuration information"),
+    EVENTID_0x49A8((short) 0x49A8, "STOP: error indicated by the interface module for the distributed I/Os"),
+    EVENTID_0x49B1((short) 0x49B1, "Firmware update data incorrect"),
+    EVENTID_0x49B2((short) 0x49B2, "Firmware update: hardware version does not match firmware"),
+    EVENTID_0x49B3((short) 0x49B3, "Firmware update: module type does not match firmware"),
+    EVENTID_0x49D0((short) 0x49D0, "LINK-UP aborted due to violation of coordination rules"),
+    EVENTID_0x49D1((short) 0x49D1, "LINK-UP/UPDATE sequence aborted"),
+    EVENTID_0x49D2((short) 0x49D2, "Standby CPU changed to STOP due to STOP on the master CPU during link-up"),
+    EVENTID_0x49D4((short) 0x49D4, "STOP on a master, since partner CPU is also a master (link-up error)"),
+    EVENTID_0x49D7((short) 0x49D7, "LINK-UP rejected due to change in user program or in configuration"),
+    EVENTID_0x42F4((short) 0x42F4, "Standby CPU: connection/update via SFC90 is locked in the master CPU"),
+            
+    //Event Class 5 - Mode Run-time Events
+    EVENTID_0x530D((short) 0x530D, "New startup information in the STOP mode"),
+    EVENTID_0x510F((short) 0x510F, "A problem as occurred with WinLC. This problem has caused the CPU to go into STOP mode or has caused a fault in the CPU"),    
+    EVENTID_0x5311((short) 0x5311, "Startup despite Not Ready message from module(s)"),
+    EVENTID_0x5371((short) 0x5371, "Distributed I/Os: end of the synchronization with a DP master"),
+    EVENTID_0x5380((short) 0x5380, "Diagnostic buffer entries of interrupt and asynchronous errors disabled"),
+    EVENTID_0x5395((short) 0x5395, "Distributed I/Os: reset of a DP master"),
+    EVENTID_0x53A2((short) 0x53A2, "Download of technology firmware successful"),
+    EVENTID_0x53A4((short) 0x53A4, "Download of technology DB not successful"),
+    EVENTID_0x5445((short) 0x5445, "Start of System reconfiguration in RUN mode"),
+    EVENTID_0x5481((short) 0x5481, "All licenses for runtime software are complete again"),
+    EVENTID_0x5498((short) 0x5498, "No more inconsistency with DP master systems due to CiR"),
+    EVENTID_0x5545((short) 0x5545, "Start of System reconfiguration in RUN mode"),
+    EVENTID_0x5581((short) 0x5581, "One or several licenses for runtime software are missing"),
+    EVENTID_0x558A((short) 0x558A, "Difference between the MLFB of the configured and inserted CPU"),
+    EVENTID_0x558B((short) 0x558B, "Difference in the firmware version of the configured and inserted CPU"),
+    EVENTID_0x5598((short) 0x5598, "Start of possible inconsistency with DP master systems due to CiR"),
+    EVENTID_0x55A5((short) 0x55A5, "Version conflict: internal interface with integrated technology"),
+    EVENTID_0x55A6((short) 0x55A6, "The maximum number of technology objects has been exceeded"),
+    EVENTID_0x55A7((short) 0x55A7, "A technology DB of this type is already present"),
+    EVENTID_0x5879((short) 0x5879, "Diagnostic message from DP interface: EXTF LED off"),
+    EVENTID_0x5960((short) 0x5960, "Parameter assignment error when switching"),
+    EVENTID_0x5961((short) 0x5961, "Parameter assignment error"),
+    EVENTID_0x5962((short) 0x5962, "Parameter assignment error preventing startup"),
+    EVENTID_0x5963((short) 0x5963, "Parameter assignment error with memory reset request"),
+    EVENTID_0x5966((short) 0x5966, "Parameter assignment error when switching"),
+    EVENTID_0x5969((short) 0x5969, "Parameter assignment error with startup blocked"),
+    EVENTID_0x596A((short) 0x596A, "PROFINET IO: IP address of an IO device already present"),
+    EVENTID_0x596B((short) 0x596B, "IP address of an Ethernet interface already exists"),
+    EVENTID_0x596C((short) 0x596C, "Name of an Ethernet interface already exists"),
+    EVENTID_0x596D((short) 0x596D, "The existing network configuration does not mach the system requirements or configuration"),
+    EVENTID_0x5979((short) 0x5979, "Diagnostic message from DP interface: EXTF LED on"),
+    EVENTID_0x597C((short) 0x597C, "DP Global Control command failed or moved"),
+    EVENTID_0x59A0((short) 0x59A0, "The interrupt can not be associated in the CPU"),
+    EVENTID_0x59A1((short) 0x59A1, "Configuration error in the integrated technology"),
+    EVENTID_0x59A3((short) 0x59A3, "Error when downloading the integrated technology"),
+    EVENTID_0x53FF((short) 0x53FF, "Reset to factory setting"),
+    
+
+    
+    //Event Class 6 - Communication Events
+    EVENTID_0x6316((short) 0x6316, "Interface error when starting programmable controller"),
+    EVENTID_0x6353((short) 0x6353, "Firmware update: Start of firmware download over the network"),
+    EVENTID_0x6390((short) 0x6390, "Formatting of Micro Memory Card complete"),
+    EVENTID_0x6500((short) 0x6500, "Connection ID exists twice on module"),
+    EVENTID_0x6501((short) 0x6501, "Connection resources inadequate"),
+    EVENTID_0x6502((short) 0x6502, "Error in the connection description"),
+    EVENTID_0x6510((short) 0x6510, "CFB structure error detected in instance DB when evaluating EPROM"),
+    EVENTID_0x6514((short) 0x6514, "GD packet number exists twice on the module"),
+    EVENTID_0x6515((short) 0x6515, "Inconsistent length specifications in GD configuration information"),
+    EVENTID_0x6521((short) 0x6521, "No memory submodule and no internal memory available"),
+    EVENTID_0x6522((short) 0x6522, "Illegal memory submodule: replace submodule and reset memory"),
+    EVENTID_0x6523((short) 0x6523, "Memory reset request due to error accessing submodule"),
+    EVENTID_0x6524((short) 0x6524, "Memory reset request due to error in block header"),
+    EVENTID_0x6526((short) 0x6526, "Memory reset request due to memory replacement"),
+    EVENTID_0x6527((short) 0x6527, "Memory replaced, therefore restart not possible"),
+    EVENTID_0x6528((short) 0x6528, "Object handling function in the STOP/HOLD mode, no restart possible"),
+    EVENTID_0x6529((short) 0x6529, "No startup possible during the load"),
+    EVENTID_0x652A((short) 0x652A, "No startup because block exists twice in user memory user program function"),
+    EVENTID_0x652B((short) 0x652B, "No startup because block is too long for submodule - replace submodule"),
+    EVENTID_0x652C((short) 0x652C, "No startup due to illegal OB on submodule"),
+    EVENTID_0x6532((short) 0x6532, "No startup because illegal configuration information on submodule"),
+    EVENTID_0x6533((short) 0x6533, "Memory reset request because of invalid submodule content"),
+    EVENTID_0x6534((short) 0x6534, "No startup: block exists more than once on submodule"),
+    EVENTID_0x6535((short) 0x6535, "No startup: not enough memory to transfer block from submodule"),
+    EVENTID_0x6536((short) 0x6536, "No startup: submodule contains an illegal block number"),
+    EVENTID_0x6537((short) 0x6537, "No startup: submodule contains a block with an illegal length"),
+    EVENTID_0x6538((short) 0x6538, "Local data or write-protection ID (for DB) of a block illegal for CPU"),
+    EVENTID_0x6539((short) 0x6539, "Illegal command in block (detected by compiler)"),
+    EVENTID_0x653A((short) 0x653A, "Memory reset request because local OB data on submodule too short"),
+    EVENTID_0x6543((short) 0x6543, "No startup: illegal block type"),
+    EVENTID_0x6544((short) 0x6544, "No startup: attribute relevant for processing illegal"),
+    EVENTID_0x6545((short) 0x6545, "Source language illegal"),
+    EVENTID_0x6546((short) 0x6546, "Maximum amount of configuration information reached"),
+    EVENTID_0x6547((short) 0x6547, "Parameter assignment error assigning parameters to modules (not on P bus, cancel download)"),
+    EVENTID_0x6548((short) 0x6548, "Plausibility error during block check"),
+    EVENTID_0x6549((short) 0x6549, "Structure error in block"),
+    EVENTID_0x6550((short) 0x6550, "A block has an error in the CRC"),
+    EVENTID_0x6551((short) 0x6551, "A block has no CRC"),
+    EVENTID_0x6253((short) 0x6253, "Firmware update: End of firmware download over the network"),    
+    EVENTID_0x6560((short) 0x6560, "SCAN overflow"),
+    EVENTID_0x6805((short) 0x6805, "Resource problem on configured connections, eliminated"),
+    EVENTID_0x6881((short) 0x6881, "Interface error leaving state"),
+    EVENTID_0x6905((short) 0x6905, "Resource problem on configured connections"),
+    EVENTID_0x6981((short) 0x6981, "Interface error entering state"),
+    
+    //Event Class 7 - H/F Events
+    EVENTID_0x72A2((short) 0x72A2, "Failure of a DP master or a DP master system"),
+    EVENTID_0x72A3((short) 0x72A3, "Redundancy restored on the DP slave"),
+    EVENTID_0x72DB((short) 0x72DB, "Safety program: safety mode disabled"),
+    EVENTID_0x72E0((short) 0x72E0, "Loss of redundancy in communication, problem eliminated"),
+    EVENTID_0x7301((short) 0x7301, "Loss of redundancy (1 of 2) due to failure of a CPU"),
+    EVENTID_0x7302((short) 0x7302, "Loss of redundancy (1 of 2) due to STOP on the standby triggered by user"),
+    EVENTID_0x7303((short) 0x7303, "H system (1 of 2) changed to redundant mode"),
+    EVENTID_0x7323((short) 0x7323, "Discrepancy found in operating system data"),
+    EVENTID_0x7331((short) 0x7331, "Standby-master switchover due to master failure"),
+    EVENTID_0x7333((short) 0x7333, "Standby-master switchover due to system modification during runtime"),
+    EVENTID_0x7334((short) 0x7334, "Standby-master switchover due to communication error at the synchronization module"),
+    EVENTID_0x7340((short) 0x7340, "Synchronization error in user program due to elapsed wait time"),
+    EVENTID_0x7341((short) 0x7341, "Synchronization error in user program due to waiting at different synchronization points"),
+    EVENTID_0x7342((short) 0x7342, "Synchronization error in operating system due to waiting at different synchronization points"),
+    EVENTID_0x7343((short) 0x7343, "Synchronization error in operating system due to elapsed wait time"),
+    EVENTID_0x7344((short) 0x7344, "Synchronization error in operating system due to incorrect data"),
+    EVENTID_0x734A((short) 0x734A, "The \"Re-enable\" job triggered by SFC 90 \"H_CTRL\" was executed"),
+    EVENTID_0x73A3((short) 0x73A3, "Loss of redundancy on the DP slave"),
+    EVENTID_0x73C1((short) 0x73C1, "Update process canceled"),
+    EVENTID_0x73C2((short) 0x73C2, "Updating aborted due to monitoring time being exceeded during the n-th attempt (1 = n = max. possible number of update attempts after abort due to excessive monitoring time)"),
+    EVENTID_0x73D8((short) 0x73D8, "Safety mode disabled"),
+    EVENTID_0x73DB((short) 0x73DB, "Safety program: safety mode enabled"),
+    EVENTID_0x73E0((short) 0x73E0, "Loss of redundancy in communication"),
+    EVENTID_0x74DD((short) 0x74DD, "Safety program: Shutdown of a fail-save runtime group disabled"),
+    EVENTID_0x74DE((short) 0x74DE, "Safety program: Shutdown of the F program disabled"),
+    EVENTID_0x74DF((short) 0x74DF, "Start of F program initialization"),
+    EVENTID_0x7520((short) 0x7520, "Error in RAM comparison"),
+    EVENTID_0x7521((short) 0x7521, "Error in comparison of process image output value"),
+    EVENTID_0x7522((short) 0x7522, "Error in comparison of memory bits, timers, or counters"),
+    EVENTID_0x75D1((short) 0x75D1, "Safety program: Internal CPU error"),
+    EVENTID_0x75D2((short) 0x75D2, "Safety program error: Cycle time time-out"),
+    EVENTID_0x75D6((short) 0x75D6, "Data corrupted in safety program prior to the output to F I/O"),
+    EVENTID_0x75D7((short) 0x75D7, "Data corrupted in safety program prior to the output to partner F-CPU"),
+    EVENTID_0x75D9((short) 0x75D9, "Invalid REAL number in a DB"),
+    EVENTID_0x75DA((short) 0x75DA, "Safety program: Error in safety data format"),
+    EVENTID_0x75DC((short) 0x75DC, "Runtime group, internal protocol error"),
+    EVENTID_0x75DD((short) 0x75DD, "Safety program: Shutdown of a fail-save runtime group enabled"),
+    EVENTID_0x75DE((short) 0x75DE, "Safety program: Shutdown of the F program enabled"),
+    EVENTID_0x75DF((short) 0x75DF, "End of F program initialization"),
+    EVENTID_0x75E1((short) 0x75E1, "Safety program: Error in FB \"F_PLK\" or \"F_PLK_O\" or \"F_CYC_CO\" or \"F_TEST\" or \"F_TESTC\""),
+    EVENTID_0x75E2((short) 0x75E2, "Safety program: Area length error"),
+    EVENTID_0x7852((short) 0x7852, "SYNC module inserted"),
+    EVENTID_0x7855((short) 0x7855, "SYNC module eliminated"),
+    EVENTID_0x78D3((short) 0x78D3, "Communication error between PROFIsafe and F I/O"),
+    EVENTID_0x78D4((short) 0x78D4, "Error in safety relevant communication between F CPUs"),
+    EVENTID_0x78D5((short) 0x78D5, "Error in safety relevant communication between F CPUs"),
+    EVENTID_0x78E3((short) 0x78E3, "F-I/O device input channel depassivated"),
+    EVENTID_0x78E4((short) 0x78E4, "F-I/O device output channel depassivated"),
+    EVENTID_0x78E5((short) 0x78E5, "F-I/O device depassivated"),
+    EVENTID_0x7934((short) 0x7934, "Standby-master switchover due to connection problem at the SYNC module"),
+    EVENTID_0x7950((short) 0x7950, "Synchronization module missing"),
+    EVENTID_0x7951((short) 0x7951, "Change at the SYNC module without Power On"),
+    EVENTID_0x7952((short) 0x7952, "SYNC module removed"),
+    EVENTID_0x7953((short) 0x7953, "Change at the SYNC-module without reset"),
+    EVENTID_0x7954((short) 0x7954, "SYNC module: rack number assigned twice"),
+    EVENTID_0x7955((short) 0x7955, "SYNC module error"),
+    EVENTID_0x7956((short) 0x7956, "Illegal rack number set on SYNC module"),
+    EVENTID_0x7960((short) 0x7960, "Redundant I/O: Time-out of discrepancy time at digital input, error is not yet localized"),
+    EVENTID_0x7961((short) 0x7961, "Redundant I/O, digital input error: Signal change after expiration of the discrepancy time"),
+    EVENTID_0x7962((short) 0x7962, "Redundant I/O: Digital input error"),
+    EVENTID_0x796F((short) 0x796F, "Redundant I/O: The I/O was globally disabled"),
+    EVENTID_0x7970((short) 0x7970, "Redundant I/O: Digital output error"),
+    EVENTID_0x7980((short) 0x7980, "Redundant I/O: Time-out of discrepancy time at analog input"),
+    EVENTID_0x7981((short) 0x7981, "Redundant I/O: Analog input error"),
+    EVENTID_0x7990((short) 0x7990, "Redundant I/O: Analog output error"),
+    EVENTID_0x79D3((short) 0x79D3, "Communication error between PROFIsafe and F I/O"),
+    EVENTID_0x79D4((short) 0x79D4, "Error in safety relevant communication between F CPUs"),
+    EVENTID_0x79D5((short) 0x79D5, "Error in safety relevant communication between F CPUs"),
+    EVENTID_0x79E3((short) 0x79E3, "F-I/O device input channel passivated"),
+    EVENTID_0x79E4((short) 0x79E4, "F-I/O device output channel passivated"),
+    EVENTID_0x79E5((short) 0x79E5, "F-I/O device passivated"),
+    EVENTID_0x79E6((short) 0x79E6, "Inconsistent safety program"),
+    EVENTID_0x79E7((short) 0x79E7, "Simulation block (F system block) loaded"),
+    EVENTID_0x73E8((short) 0x73E8, "Consistency of the safety program verified by testing"),
+    EVENTID_0x73E9((short) 0x73E9, "Consistency of the safety program cannot be checked"),
+    
+    //Event Class 8 - Diagnostic Events for Modules
+    EVENTID_0x8x00((short) 0x8000, "Module fault/OK"),
+    EVENTID_0x8x01((short) 0x8001, "Internal error"),
+    EVENTID_0x8x02((short) 0x8002, "External error"),
+    EVENTID_0x8x03((short) 0x8003, "Channel error"),
+    EVENTID_0x8x04((short) 0x8004, "External error"),
+    EVENTID_0x8x05((short) 0x8005, "No front connector"),
+    EVENTID_0x8x06((short) 0x8006, "No parameter assignment"),
+    EVENTID_0x8x07((short) 0x8007, "Incorrect parameters in module"),  
+    EVENTID_0x8x30((short) 0x8030, "User submodule incorrect/not found"),
+    EVENTID_0x8x31((short) 0x8031, "Communication problem"),
+    EVENTID_0x8x32((short) 0x8032, "Operating mode: RUN/STOP (STOP: entering state, RUN: leaving state)"),
+    EVENTID_0x8x33((short) 0x8033, "Time monitoring responded (watchdog)"),
+    EVENTID_0x8x34((short) 0x8034, "Internal module power failure"),
+    EVENTID_0x8x35((short) 0x8035, "BATTF: battery exhausted"),
+    EVENTID_0x8x36((short) 0x8036, "Total backup failed"),
+    EVENTID_0x8x40((short) 0x8040, "Expansion rack failed"),
+    EVENTID_0x8x41((short) 0x8041, "Processor failure"),
+    EVENTID_0x8x42((short) 0x8042, "EPROM error"),
+    EVENTID_0x8x43((short) 0x8043, "RAM error"),
+    EVENTID_0x8x44((short) 0x8044, "ADC/DAC error"),
+    EVENTID_0x8x45((short) 0x8045, "Fuse blown"),
+    EVENTID_0x8x46((short) 0x8046, "Hardware interrupt lost"),    
+    EVENTID_0x8x50((short) 0x8050, "Configuration/parameter assignment error. Analog input"), 
+    EVENTID_0x8x51((short) 0x8051, "Common mode error"), 
+    EVENTID_0x8x52((short) 0x8052, "Short circuit to phase"),
+    EVENTID_0x8x53((short) 0x8053, "Short circuit to ground"),
+    EVENTID_0x8x54((short) 0x8054, "Wire break"),
+    EVENTID_0x8x55((short) 0x8055, "Reference channel error"),
+    EVENTID_0x8x56((short) 0x8056, "Below measuring range"),
+    EVENTID_0x8x57((short) 0x8057, "Above measuring range"),
+    EVENTID_0x8x60((short) 0x8060, "Configuration/parameter assignment error. Analog output"),
+    EVENTID_0x8x61((short) 0x8061, "Common mode error"),
+    EVENTID_0x8x62((short) 0x8062, "Short circuit to phase"),
+    EVENTID_0x8x63((short) 0x8063, "Short circuit to ground"),
+    EVENTID_0x8x64((short) 0x8064, "Wire break"),
+    EVENTID_0x8x66((short) 0x8066, "No load voltage"),
+    EVENTID_0x8x70((short) 0x8070, "Configuration/parameter assignment error. Digital input"),
+    EVENTID_0x8x71((short) 0x8071, "Chassis ground fault"),
+    EVENTID_0x8x72((short) 0x8072, "Short circuit to phase (sensor)"),
+    EVENTID_0x8x73((short) 0x8073, "Short circuit to ground (sensor)"),
+    EVENTID_0x8x74((short) 0x8074, "Wire break"),
+    EVENTID_0x8x75((short) 0x8075, "No sensor power supply"),
+    EVENTID_0x8x80((short) 0x8080, "Configuration/parameter assignment error. Digital output"),
+    EVENTID_0x8x81((short) 0x8081, "Chassis ground fault"),
+    EVENTID_0x8x82((short) 0x8082, "Short circuit to phase"),
+    EVENTID_0x8x83((short) 0x8083, "Short circuit to ground"),
+    EVENTID_0x8x84((short) 0x8084, "Wire break"),
+    EVENTID_0x8x85((short) 0x8085, "Fuse tripped"),
+    EVENTID_0x8x86((short) 0x8086, "No load voltage"),
+    EVENTID_0x8x87((short) 0x8087, "Excess temperature"),
+    EVENTID_0x8xB0((short) 0x80B0, "Counter module, signal A faulty. FM"),
+    EVENTID_0x8xB1((short) 0x80B1, "Counter module, signal B faulty"),
+    EVENTID_0x8xB2((short) 0x80B2, "Counter module, signal N faulty"),
+    EVENTID_0x8xB3((short) 0x80B3, "Counter module, incorrect value passed between the channels"),
+    EVENTID_0x8xB4((short) 0x80B4, "Counter module, 5.2 V sensor supply faulty"),
+    EVENTID_0x8xB5((short) 0x80B5, "Counter module, 24 V sensor supply faulty"),
+    
+    //Event Class 9 - Standard User Events
+    EVENTID_0x9001((short) 0x9001, "Automatic mode"),
+    EVENTID_0x9101((short) 0x9101, "Manual mode"),
+    EVENTID_0x9x02((short) 0x9002, "OPEN/CLOSED, ON/OFF"),
+    EVENTID_0x9x03((short) 0x9003, "Manual command enable"),
+    EVENTID_0x9x04((short) 0x9004, "Unit protective command (OPEN/CLOSED)"),
+    EVENTID_0x9x05((short) 0x9005, "Process enable"),
+    EVENTID_0x9x06((short) 0x9006, "System protection command"),
+    EVENTID_0x9x07((short) 0x9007, "Process value monitoring responded"),
+    EVENTID_0x9x08((short) 0x9008, "Manipulated variable monitoring responded"),
+    EVENTID_0x9x09((short) 0x9009, "System deviation greater than permitted"),
+    EVENTID_0x9x0A((short) 0x900A, "Limit position error"),
+    EVENTID_0x9x0B((short) 0x900B, "Runtime error"),
+    EVENTID_0x9x0C((short) 0x900C, "Command execution error (sequencer)"),
+    EVENTID_0x9x0D((short) 0x900D, "Operating status running > OPEN"),
+    EVENTID_0x9x0E((short) 0x900E, "Operating status running > CLOSED"),
+    EVENTID_0x9x0F((short) 0x900F, "Command blocking"),
+    EVENTID_0x9x11((short) 0x9011, "Process status OPEN/ON"),
+    EVENTID_0x9x12((short) 0x9012, "Process status CLOSED/OFF"),
+    EVENTID_0x9x13((short) 0x9013, "Process status intermediate position"),
+    EVENTID_0x9x14((short) 0x9014, "Process status ON via AUTO"),
+    EVENTID_0x9x15((short) 0x9015, "Process status ON via manual"),
+    EVENTID_0x9x16((short) 0x9016, "Process status ON via protective command"),
+    EVENTID_0x9x17((short) 0x9017, "Process status OFF via AUTO"),
+    EVENTID_0x9x18((short) 0x9018, "Process status OFF via manual"),
+    EVENTID_0x9x19((short) 0x9019, "Process status OFF via protective command"),
+    EVENTID_0x9x21((short) 0x9021, "Function error on approach"),
+    EVENTID_0x9x22((short) 0x9022, "Function error on leaving"),
+    EVENTID_0x9x31((short) 0x9031, "Actuator (DE/WE) limit position OPEN"),
+    EVENTID_0x9x32((short) 0x9032, "Actuator (DE/WE) limit position not OPEN"),
+    EVENTID_0x9x33((short) 0x9033, "Actuator (DE/WE) limit position CLOSED"),
+    EVENTID_0x9x34((short) 0x9034, "Actuator (DE/WE) limit position not CLOSED"),
+    EVENTID_0x9x41((short) 0x9041, "Illegal status, tolerance time elapsed"),
+    EVENTID_0x9x42((short) 0x9042, "Illegal status, tolerance time not elapsed"),
+    EVENTID_0x9x43((short) 0x9043, "Interlock error, tolerance time = 0"),
+    EVENTID_0x9x44((short) 0x9044, "Interlock error, tolerance time > 0"),
+    EVENTID_0x9x45((short) 0x9045, "No reaction"),
+    EVENTID_0x9x46((short) 0x9046, "Final status exited illegally, tolerance time = 0"),
+    EVENTID_0x9x47((short) 0x9047, "Final status exited illegally, tolerance time > 0"),
+    EVENTID_0x9x50((short) 0x9050, "Upper limit of signal range USR"),
+    EVENTID_0x9x51((short) 0x9051, "Upper limit of measuring range UMR"),
+    EVENTID_0x9x52((short) 0x9052, "Lower limit of signal range LSR"),
+    EVENTID_0x9x53((short) 0x9053, "Lower limit of measuring range LMR"),
+    EVENTID_0x9x54((short) 0x9054, "Upper alarm limit UAL"),
+    EVENTID_0x9x55((short) 0x9055, "Upper warning limit UWL"),
+    EVENTID_0x9x56((short) 0x9056, "Upper tolerance limit UTL"),
+    EVENTID_0x9x57((short) 0x9057, "Lower tolerance limit LTL"),
+    EVENTID_0x9x58((short) 0x9058, "Lower warning limit LWL"),
+    EVENTID_0x9x59((short) 0x9059, "Lower alarm limit LAL"),
+    EVENTID_0x9x60((short) 0x9060, "GRAPH7 step entering/leaving"),
+    EVENTID_0x9x61((short) 0x9061, "GRAPH7 interlock error"),
+    EVENTID_0x9x62((short) 0x9062, "GRAPH7 execution error"),
+    EVENTID_0x9x63((short) 0x9063, "GRAPH7 error noted"),
+    EVENTID_0x9x64((short) 0x9064, "GRAPH7 error acknowledged"),
+    EVENTID_0x9x70((short) 0x9070, "Trend exceeded in positive direction"),
+    EVENTID_0x9x71((short) 0x9071, "Trend exceeded in negative direction"),
+    EVENTID_0x9x72((short) 0x9072, "No reaction"),
+    EVENTID_0x9x73((short) 0x9073, "Final state exited illegally"),
+    EVENTID_0x9x80((short) 0x9080, "Limit value exceeded, tolerance time = 0"),
+    EVENTID_0x9x81((short) 0x9081, "Limit value exceeded, tolerance time > 0"),
+    EVENTID_0x9x82((short) 0x9082, "Below limit value, tolerance time = 0"),
+    EVENTID_0x9x83((short) 0x9083, "Below limit value, tolerance time > 0"),
+    EVENTID_0x9x84((short) 0x9084, "Gradient exceeded, tolerance time = 0"),
+    EVENTID_0x9x85((short) 0x9085, "Gradient exceeded, tolerance time > 0"),
+    EVENTID_0x9x86((short) 0x9086, "Below gradient, tolerance time = 0"),
+    EVENTID_0x9x87((short) 0x9087, "Below gradient, tolerance time > 0"),
+    EVENTID_0x9090((short) 0x9090, "User parameter assignment error entering/leaving"),
+    EVENTID_0x9190((short) 0x9190, "User parameter assignment error entering/leaving"),
+    EVENTID_0x91F0((short) 0x91F0, "Overflow"),
+    EVENTID_0x91F1((short) 0x91F1, "Underflow"),
+    EVENTID_0x91F2((short) 0x91F2, "Division by 0"),
+    EVENTID_0x91F3((short) 0x91F3, "Illegal calculation operation"),
+    
+    //Event Classes A and B - Free User Events
+    
+    
+    //Event Classes C,D & E - Reserved Event Classes
+    
+    //Event Classes F -  Reserved for modules not in central 
+    //                   rack (for example, CPs or FMs)
+    
+    EVENTID_0x0000((short) 0x0000, "NULL: Check for user information.");
+
+    
+    
+    private static final Map<Short, S7DiagnosticEventId> map;
+    
+    private static final Map<Short, String> idstr;
+    
+    static {
+        map = new HashMap<>();
+        idstr = new HashMap<>();
+        for (S7DiagnosticEventId  event : S7DiagnosticEventId.values()) {
+            map.put(event.code, event);
+        }
+       
+        idstr.put((short) 0x0000, "Event leaving state. ");
+        idstr.put((short) 0x0100, "Event entering state. ");
+        idstr.put((short) 0x0200, "Entry in diagnostic buffer. ");
+        idstr.put((short) 0x0400, "Internal error. ");
+        idstr.put((short) 0x0800, "External error. ");
+    }    
+    
+    private final String description;
+    private final short code;
+    
+    S7DiagnosticEventId(final short code, final String description){
+        this.code = code;        
+        this.description = description;
+    }
+    
+    public String getDescription(){
+        //short id = (short) (code & 0x0F00);
+        return description;
+    }    
+    
+    public short getCode() {
+        return code;
+    }    
+
+    public static S7DiagnosticEventId  valueOf(short code) {
+        
+        Integer intcode = Short.toUnsignedInt(code);
+        
+        if ((intcode > 0x8000) && (intcode < 0xA000)){
+            if ((intcode != 0x9101) && (intcode != 0x9190) && (intcode != 0x91F0)
+                    && (intcode != 0x91F1) && (intcode != 0x91F2)
+                    && (intcode != 0x91F3))
+            intcode = (intcode & 0xF0FF);
+        } else if (((intcode >= 0xA000) && (intcode <= 0xBFFF))) intcode = 0x0000;
+                
+        return map.get(intcode.shortValue());
+    }    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7Helper.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7Helper.java
index 66fbf405c1f..0b5e1dd2ef6 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7Helper.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7Helper.java
@@ -1,1359 +1,1359 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.s7.utils;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufUtil;
-import java.time.Duration;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.temporal.ChronoUnit;
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
-
-/**
- *  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
- *  |15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1|
- *  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
- *  \__________/\__________/\____________________/
- *   Module      Number of   Number of the partial 
- *   class       the partial list
- *               list 
- *               extract
- * 
- *  <b>Module Class:</b>
- *  +--------------+-----------------+ 
- *  | Module class | Coding (Binary) |
- *  +--------------|-----------------+
- *  |     CPU      |      0000       | 
- *  +--------------|-----------------+
- *  |     IM       |      0100       | 
- *  +--------------|-----------------+
- *  |     FM       |      1000       | 
- *  +--------------|-----------------+
- *  |     CP       |      1100       | 
- *  +--------------|-----------------+
- * 
- *  <b>Possible SSL Partial Lists:</b>
- *  +-----------------------------------------------------------|--------------+
- *  | Module class                                              |    SSL-ID    |
- *  +-----------------------------------------------------------|--------------+
- *  | Module identification                                     |    16#xy11   |
- *  +-----------------------------------------------------------|--------------+
- *  | CPU characteristics                                       |    16#xy12   |
- *  +-----------------------------------------------------------|--------------+
- *  | User memory areas                                         |    16#xy13   |
- *  +-----------------------------------------------------------|--------------+
- *  | System areas                                              |    16#xy14   |
- *  +-----------------------------------------------------------|--------------+
- *  | Block types                                               |    16#xy15   |
- *  +-----------------------------------------------------------|--------------+
- *  | Interrupt status                                          |    16#xy22   |
- *  +-----------------------------------------------------------|--------------+
- *  | Assignment between process image partitions and OBs       |    16#xy25   |
- *  +-----------------------------------------------------------|--------------+
- *  | Communication status data                                 |    16#xy32   |
- *  +-----------------------------------------------------------|--------------+
- *  | H CPU group information                                   |    16#xy71   |
- *  +-----------------------------------------------------------|--------------+
- *  | Status of the module LEDs                                 |    16#xy74   |
- *  +-----------------------------------------------------------|--------------+
- *  | Switched DP slaves in the H-system                        |    16#xy75   |
- *  +-----------------------------------------------------------|--------------+
- *  | Module status information                                 |    16#xy91   |
- *  +-----------------------------------------------------------|--------------+
- *  | Rack / station status information                         |    16#xy92   |
- *  +-----------------------------------------------------------|--------------+
- *  | Rack / station status information                         |    16#xy94   |
- *  +-----------------------------------------------------------|--------------+
- *  | Extended DP master system / PROFINET IO system information|    16#xy95   |
- *  +-----------------------------------------------------------|--------------+
- *  | Module status information, PROFINET IO and PROFIBUS DP    |    16#xy96   |
- *  +-----------------------------------------------------------|--------------+
- *  | Tool changer information (PROFINET IO)                    |    16#xy9C   |
- *  +-----------------------------------------------------------|--------------+
- *  | Diagnostic buffer of the CPU                              |    16#xyA0   |
- *  +-----------------------------------------------------------|--------------+
- *  | Module diagnostic information (data record 0)             |    16#xyB1   |
- *  +-----------------------------------------------------------|--------------+
- *  | Module diagnostic information (data record 1),            |    16#xyB2   |
- *  | geographical address                                      |              |
- *  +-----------------------------------------------------------|--------------+
- *  | Module diagnostic information (data record 1),            |    16#xyB3   |
- *  | logical address                                           |              |
- *  +-----------------------------------------------------------|--------------+
- *  | Diagnostic data of a DP slave                             |    16#xyB4   |
- *  +-----------------------------------------------------------|--------------+
- * 
- * 
- * @author cgarcia
- */
-
-public class S7Helper {
-    
-    /**
-     * 
-     */
-    public enum OB {
-        FREE_CYC(0X0000,"OB1 Free cycle"),
-        
-        //Time of day
-        TOD_INT0(0X000A,"OB10 Time of day interrupt"),
-        TOD_INT1(0X000B,"OB11 Time of day interrupt"),
-        TOD_INT2(0X000C,"OB12 Time of day interrupt"),
-        TOD_INT3(0X000D,"OB13 Time of day interrupt"),
-        TOD_INT4(0X000E,"OB14 Time of day interrupt"),
-        TOD_INT5(0X000F,"OB15 Time of day interrupt"),
-        TOD_INT6(0X0010,"OB16 Time of day interrupt"),
-        TOD_INT7(0X0011,"OB17 Time of day interrupt"),        
-        
-        //Time delay
-        DEL_INT0(0X0014,"OB20 Time delay interrupt"),
-        DEL_INT1(0X0015,"OB21 Time delay interrupt"),
-        DEL_INT2(0X0016,"OB22 Time delay interrupt"),
-        DEL_INT3(0X0017,"OB23 Time delay interrupt"),        
-        
-        //Cyclic
-        CYC_INT0(0X001E,"OB30 Cyclic interrupt"),
-        CYC_INT1(0X001F,"OB31 Cyclic interrupt"),
-        CYC_INT2(0X0020,"OB32 Cyclic interrupt"),
-        CYC_INT3(0X0021,"OB33 Cyclic interrupt"),
-        CYC_INT4(0X0022,"OB34 Cyclic interrupt"),
-        CYC_INT5(0X0023,"OB35 Cyclic interrupt"),
-        CYC_INT6(0X0024,"OB36 Cyclic interrupt"),
-        CYC_INT7(0X0025,"OB37 Cyclic interrupt"),
-        CYC_INT8(0X0026,"OB38 Cyclic interrupt"),
-                
-        //Hardware interrupts
-        HW_INT0(0X0028,"OB40 Hardware interrupt"),
-        HW_INT1(0X0029,"OB41 Hardware interrupt"),
-        HW_INT2(0X002A,"OB42 Hardware interrupt"),
-        HW_INT3(0X002B,"OB43 Hardware interrupt"),
-        HW_INT4(0X002C,"OB44 Hardware interrupt"),
-        HW_INT5(0X002D,"OB45 Hardware interrupt"),
-        HW_INT6(0X002E,"OB46 Hardware interrupt"),
-        HW_INT7(0X002F,"OB47 Hardware interrupt"),
-        
-        //Startup
-        BACKGROUND(0X005A,"OB90 Background"),
-        COMPLETE_RESTART(0X0064,"OB100 Startup"),
-        RESTART(0X0064,"OB101 Background"),
-        COLD_RESTART(0X005A,"OB101 Background"),
-        
-        //Fault interrupts
-        CYC_FLT(0X0051,"OB80 Time execution error interrupt"),
-        PS_FLT(0X0051,"OB81 Power supply interrupt"),
-        IO_FLT1(0X0052,"OB82 Module diagnostic interrupt"),
-        IO_FLT2(0X0053,"OB83 Module change interrupt"),
-        CPU_FLT(0X0054,"OB84 CPU hardware error interrupt"),        
-        OBNL_FLT(0X0055,"OB85 Program execution error interrupt"),
-        RACK_FLT(0X0056,"OB86 Rack fault interrupt"),
-        COMM_FLT(0X0057,"OB87 Communication error interrupt"),        
-        BREAKUP_ERR(0X0058,"OB88 Process interrupt"),        
-        SYNC_ERR(0X0079,"OB120 Synchronous error interrupt"),
-        PROG_ERR(0X0079,"OB121 Program error interrupt"),
-        MOD_ERR(0X007A,"OB122 Module error interrupt");
-
-        private int code;
-        private String description;
-
-        private static final Map<Integer, OB> map;
-
-        static {
-            map = new HashMap<>();
-            for (OB obid : OB.values()) {
-                map.put(obid.code, obid);
-            }
-        }         
-        
-        OB(final int code, final String description){
-            this.code = code;
-            this.description = description;
-        }
-
-        public int getCode(){
-            return code;
-        }
-
-        public String getDescription(){
-            return description;
-        }
-
-        public static OB valueOf(int code) {
-            return map.get(code);
-        }            
-        
-        
-    }    
-    
-    
-    /**
-     * 
-     */
-    public enum MODULE{
-        CPU(0X00),
-        IM(0X04),
-        FM(0X80),
-        CP(0XC0);
-        
-        private int code;
-        
-        MODULE(final int code){
-            this.code = code;
-        }
-        
-        public int getCode(){
-            return code;
-        }        
-    }
-    
-    /**
-     * 
-     */
-    public enum LED_ID {
-        SF(0X0001,"Group error"),
-        INTF(0X0002,"Internal error"),
-        EXTF(0X0003,"External error"),        
-        RUN(0X0004,"RUN"),        
-        STOP(0X0005,"STOP"),        
-        FRCE(0X0006,"Force"),        
-        CRST(0X0007,"Cold restart"),        
-        BAF(0X0008,"Battery fault"),        
-        USR(0X0009,"User defined"),        
-        USR1(0X000A,"User defined"),        
-        BUS1F(0X000B,"Bus error interface 1"),
-        BUS2F(0X000C,"Bus error interface 2"),
-        REDF(0X000D,"Redundancy error"),
-        MSTR(0X000E,"Master"),
-        RACK0(0X000F,"Rack number 0"),
-        RACK1(0X0010,"Rack number 1"),
-        RACK2(0X0011,"Rack number 2"),
-        IFM1F(0X0012,"Interface error interface module 1"),
-        IFM2F(0X0013,"Interface error interface module 2"),
-        BUS3F(0X0014,"Bus error interface 3"),
-        MAINT(0X0015,"Maintenance demand"),
-        DC24V(0X0016,"DC24V"),
-        BUS5F(0X0017,"Bus error interface 5"),
-        BUS8F(0X0018,"Bus error interface 8"),
-        IF(0X0080,"Init failure"),
-        UF(0X0081,"User failure"),
-        MF(0X0082,"Monitoring failure"),
-        CF(0X0083,"Communication failure"),
-        TF(0X0084,"Task failure"),
-        APPL_STATE_RED(0X00EC,"APPL_STATE_RED"),
-        APPL_STATE_GREEN(0X00ED,"APPL_STATE_GREEN");
-
-        private int code;
-        private String description;
-
-        private static final Map<Integer, LED_ID> map;
-
-        static {
-            map = new HashMap<>();
-            for (LED_ID ledid : LED_ID.values()) {
-                map.put(ledid.code, ledid);
-            }
-        }         
-        
-        LED_ID(final int code, final String description){
-            this.code = code;
-            this.description = description;
-        }
-
-        public int getCode(){
-            return code;
-        }
-
-        public String getDescription(){
-            return description;
-        }
-
-        public static LED_ID valueOf(int code) {
-            return map.get(code);
-        }            
-        
-        
-    }
-        
-    /**
-     * 
-     */
-    public enum CPU_CHARACTERISTICS {
-        CH_0x0000(0X0000,"MC7 processing unit (group with index 0000)"),
-        CH_0x0001(0X0001,"MC7 processing generating code"),
-        CH_0x0002(0X0002,"MC7 interpreter"),
-        
-        CH_0x0100(0X0100,"Time system (group with index 0100)"),
-        CH_0x0101(0X0101,"1 ms resolution"),
-        CH_0x0102(0X0102,"10 ms resolution"),
-        CH_0x0103(0X0103,"No real time clock"),
-        CH_0x0104(0X0104,"BCD time-of-day format"),
-        CH_0x0105(0X0105,"All time-of-day functions"),
-        CH_0x0106(0X0106,"SFC 78 \"OB_RT\" is available"),
-        
-        CH_0x0200(0X0200,"System response (group with index 0200)"),
-        CH_0x0201(0X0201,"Capable of multiprocessor mode"),
-        CH_0x0202(0X0202,"Cold restart, warm restart and hot restart possible"),
-        CH_0x0203(0X0203,"Cold restart and hot restart possible"),
-        CH_0x0204(0X0204,"Warm restart and hot restart possible"),
-        CH_0x0205(0X0205,"Only warm restart possible"),
-        CH_0x0206(0X0206,"New distributed I/O configuration is possible during\n" +
-                            "RUN by using predefined resources"),
-        CH_0x0207(0X0207,"H-CPU in stand-alone mode: New distributed I/O configuration\n" +
-                            "is possible during RUN by using predefined resources"),
-        CH_0x0208(0X0208,"For taking motion control functionality into account"),
-        
-        CH_0x0300(0X0300,"MC7 Language description of the CPU (group with index 0300)"),
-        CH_0x0301(0X0301,"Reserved"),
-        CH_0x0302(0X0302,"All 32 bit fixed-point instructions"),
-        CH_0x0303(0X0303,"All floating-point instructions"),
-        CH_0x0304(0X0304,"sin, asin, cos, acos, tan, atan, sqr, sqrt, ln, exp"),
-        CH_0x0305(0X0305,"Accumulator 3/accumulator 4 with corresponding instructions\n" +
-                            "(ENT,PUSH,POP,LEAVE)"),
-        CH_0x0306(0X0306,"Master Control Relay instructions"),
-        CH_0x0307(0X0307,"Address register 1 exists with corresponding instructions"),
-        CH_0x0308(0X0308,"Address register 2 exists with corresponding instructions"),
-        CH_0x0309(0X0309,"Operations for area-crossing addressing"),
-        CH_0x030A(0X030A,"Operations for area-internal addressing"),
-        CH_0x030B(0X030B,"All memory-indirect addressing instructions for bit memory (M)"),
-        CH_0x030C(0X030C,"All memory-indirect addressing instructions for data blocks (DB)"),
-        CH_0x030D(0X030D,"All memory-indirect addressing instructions for data blocks (DI)"),
-        CH_0x030E(0X030E,"All memory-indirect addressing instructions for local data (L)"),
-        CH_0x030F(0X030F,"All instructions for parameter transfer in FCs"),
-        CH_0x0310(0X0310,"Memory bit edge instructions for process image input (I)"),
-        CH_0x0311(0X0311,"Memory bit edge instructions for process image output (Q)"),
-        CH_0x0312(0X0312,"Memory bit edge instructions for bit memory (M)"),
-        CH_0x0313(0X0313,"Memory bit edge instructions for data blocks (DB)"),
-        CH_0x0314(0X0314,"Memory bit edge instructions for data blocks (DI)"),
-        CH_0x0315(0X0315,"Memory bit edge instructions for local data (L)"),
-        CH_0x0316(0X0316,"Dynamic evaluation of the FC bit"),
-        CH_0x0317(0X0317,"Dynamic local data area with the corresponding instructions"),
-        CH_0x0318(0X0318,"Reserved"),
-        CH_0x0319(0X0319,"Reserved"),
-        
-        CH_0x0401(0X0401,"SFC 87 \"C_DIAG\" is available"),
-        CH_0x0402(0X0402,"SFC 88 \"C_CNTRL\" is available)");
-
-        private int code;
-        private String description;
-
-        private static final Map<Integer, CPU_CHARACTERISTICS > map;
-
-        static {
-            map = new HashMap<>();
-            for (CPU_CHARACTERISTICS  cpuc : CPU_CHARACTERISTICS.values()) {
-                map.put(cpuc.code, cpuc);
-            }
-        }         
-        
-        CPU_CHARACTERISTICS(final int code, final String description){
-            this.code = code;
-            this.description = description;
-        }
-
-        public int getCode(){
-            return code;
-        }
-
-        public String getDescription(){
-            return description;
-        }
-
-        public static CPU_CHARACTERISTICS valueOf(int code) {
-            return map.get(code);
-        }            
-        
-        
-    }    
-            
-    /**
-     *
-     */
-    public enum SSL {
-    ID_0x0011(0x0011,"Module identification."){
-        @Override
-        public StringBuilder execute(ByteBuf data) {
-            return ID_0xXY11(data);
-        }  
-        
-    },
-    ID_0x0012(0x0012,"CPU characteristics ."){
-        @Override
-        public StringBuilder execute(ByteBuf data) {
-            return ID_0xXY12(data);
-        }
-        
-    },
-    ID_0x0013(0x0013,"User memory areas."){
-        @Override
-        public StringBuilder execute(ByteBuf data) {
-            return ID_0xXY13(data);
-        }
-        
-    },
-    ID_0x0014(0x0014,"System areas."){
-        @Override
-        public StringBuilder execute(ByteBuf data) {
-            return ID_0xXY14(data);
-        }
-        
-    },
-    ID_0x0015(0x0015,"Block types."){
-        @Override
-        public StringBuilder execute(ByteBuf data) {
-            return ID_0xXY15(data);
-        }
-        
-    },
-    ID_0x001C(0x001C,"Component identification."){
-        @Override
-        public StringBuilder execute(ByteBuf data) {
-            return ID_0xXY1C(data);
-        }
-        
-    },    
-    ID_0x0022(0x0022,"Interrupt status."){
-        @Override
-        public StringBuilder execute(ByteBuf data) {
-            return ID_0xXY22(data);
-        }
-        
-    },
-    ID_0x0025(0x0025,"Assignment between process image partitions and OBs."){
-        @Override
-        public StringBuilder execute(ByteBuf data) {
-            return ID_0xXY25(data);
-        }
-        
-    },
-    ID_0x0032(0x0032,"Communication status data."){
-        @Override
-        public StringBuilder execute(ByteBuf data) {
-            return ID_0xXY32(data);
-        }
-        
-    },
-    ID_0x0071(0x0071,"H CPU group information."){
-        @Override
-        public StringBuilder execute(ByteBuf data) {
-            return ID_0xXY71(data);
-        }
-        
-    },
-    ID_0x0074(0x0074,"Status of the module LEDs."){
-        @Override
-        public StringBuilder execute(ByteBuf data) {
-            return ID_0xXY74(data);
-        }
-        
-    },
-    ID_0x0075(0x0075,"Switched DP slaves in the H-system."){
-        @Override
-        public StringBuilder execute(ByteBuf data) {
-            return ID_0xXY75(data);
-        }
-        
-    },
-    ID_0x0090(0x0090,"DP Master System Information."){
-        @Override
-        public StringBuilder execute(ByteBuf data) {
-            return ID_0xXY90(data);
-        }
-        
-    },    
-    ID_0x0091(0x0091,"Module status information."){
-        @Override
-        public StringBuilder execute(ByteBuf data) {
-            return ID_0xXY91(data);
-        }
-        
-    },
-    ID_0x0092(0x0092,"Rack / station status information."){
-        @Override
-        public StringBuilder execute(ByteBuf data) {
-            return ID_0xXY92(data);
-        }
-        
-    },
-    ID_0x0094(0x0094,"Rack / station status information."){
-        @Override
-        public StringBuilder execute(ByteBuf data) {
-            return ID_0xXY94(data);
-        }
-        
-    },    
-    ID_0x0095(0x0095,"Extended DP master system / PROFINET IO system information."){
-        @Override
-        public StringBuilder execute(ByteBuf data) {
-            return ID_0xXY95(data);
-        }
-        
-    },
-    ID_0x0096(0x0096,"Module status information, PROFINET IO and PROFIBUS DP."){
-        @Override
-        public StringBuilder execute(ByteBuf data) {
-            return ID_0xXY96(data);
-        }
-        
-    },
-    ID_0x009C(0x009C,"Tool changer information (PROFINET IO)."){
-        @Override
-        public StringBuilder execute(ByteBuf data) {
-            return ID_0xXY9C(data);
-        }
-        
-    },
-    ID_0x00A0(0x00A0,"Diagnostic buffer of the CPU."){
-        @Override
-        public StringBuilder execute(ByteBuf data) {
-            return ID_0xXYA0(data);
-        }
-        
-    },
-    ID_0x00B1(0x00B1,"Module diagnostic information (data record 0) ."){
-        @Override
-        public StringBuilder execute(ByteBuf data) {
-            return ID_0xXYB1(data);
-        }
-        
-    },
-    ID_0x00B2(0x00B2,"Module diagnostic information (data record 1),geographical address."){
-        @Override
-        public StringBuilder execute(ByteBuf data) {
-            return ID_0xXYB2(data);
-        }
-        
-    },
-    ID_0x00B3(0x00B3,"Module diagnostic information (data record 1),logical address."){
-        @Override
-        public StringBuilder execute(ByteBuf data) {
-            return ID_0xXYB3(data);
-        }
-        
-    },
-    ID_0x00B4(0x00B4,"Diagnostic data of a DP slave."){
-        @Override
-        public StringBuilder execute(ByteBuf data) {
-            return ID_0xXYB4(data);
-        }
-        
-    };
-
-    private int code;
-    private String description;
-    
-    private static final Map<Integer, SSL> map;
-    
-    static {
-        map = new HashMap<>();
-        for (SSL subssl : SSL.values()) {
-            map.put(subssl.code, subssl);
-        }
-    }    
-    
-    SSL(final int code, final String description){
-        this.code = code;
-        this.description = description;
-    }
-    
-    public int getCode(){
-        return code;
-    }
-    
-    public String getDescription(){
-        return description;
-    }
-    
-    public static SSL valueOf(int code) {
-        return map.get(code);
-    }    
-    
-    public abstract StringBuilder execute(ByteBuf data);
-    
-    private static StringBuilder ID_0xXY11(ByteBuf data){
-        StringBuilder sb = new StringBuilder();
-        int ssl_length = data.readShort();
-        int ssl_count = data.readShort();
-        try {
-            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");
-            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");
-            for (int i=1; i <= ssl_count; i++){
-                sb.append("Data Record: ").append(i).append("\r\n");
-
-                sb.append("Index: ").append(data.readShort()).append("\r\n");
-                byte[] bytestr = new byte[20];
-                data.readBytes(bytestr, 0, 20);
-                sb.append("Mlfb (Order number): ").append(new String(bytestr)).append("\r\n");
-                sb.append("BGTyp (Moduler type ID): ").append(data.readShort()).append("\r\n");                
-                sb.append("Ausbg (Version of the module/hardware version): ").append(data.readShort()).append("\r\n");
-                sb.append("Ausbe (Firmware version): ").append(data.readShort()).append("\r\n");
-            }
-        } catch (Exception ex){
-            sb.append(ex.toString());
-        }
-        return sb;
-    }    
-    
-    private static StringBuilder ID_0xXY12(ByteBuf data){
-        StringBuilder sb = new StringBuilder();
-        int ssl_length = data.readShort();
-        int ssl_count = data.readShort();
-        try {
-            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");
-            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");
-            for (int i=1; i <= ssl_count; i++){
-                sb.append("Data Record: ").append(i).append("\r\n");
-                int code = data.readShort();
-                sb.append(CPU_CHARACTERISTICS.valueOf(code)).append(": ").
-                        append(CPU_CHARACTERISTICS.valueOf(code).getDescription()).append("\r\n");
-            }
-        } catch (Exception ex){
-            sb.append(ex.toString());
-        }
-        return sb;
-    }        
-    
-    private static StringBuilder ID_0xXY13(ByteBuf data){
-        StringBuilder sb = new StringBuilder();
-        int ssl_length = data.readShort();
-        int ssl_count = data.readShort();
-        try {
-            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");
-            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");
-            for (int i=1; i <= ssl_count; i++){
-                sb.append("Data Record: ").append(i).append("\r\n");
-                sb.append("Index: ").append(data.readShort()).append("\r\n");
-                int code = data.readShort();
-                int size = data.readInt();
-                int mode = data.readShort();
-                int granu = data.readShort();
-                int ber1 = data.readInt();
-                int be1egt1 = data.readInt();
-                int block1 = data.readInt();
-                int ber2 = data.readInt();
-                int be1egt2 = data.readInt();
-                int block2 = data.readInt();
-                
-                switch(code){
-                    case 0x0001:sb.append("Code (Memory Type): ").append("Volatile memory (RAM)\r\n");
-                        break;
-                    case 0x0002:sb.append("Code (Memory Type): ").append("Non-volatile memory (FEPROM)\r\n");
-                        break;
-                    case 0x0003:sb.append("Code (Memory Type): ").append("mixed memory (RAM + FEPROM)\r\n");
-                        break;
-                }
-                sb.append("Size (Total size of the selected memory (total of area 1 and area 2)): ").append(size).append("\r\n"); 
-                
-                sb.append("Mode (Volatile memory area): ").append(((mode & 0x0001) != 0)).append("\r\n"); 
-                sb.append("Mode (Non-volatile memory area): ").append(((mode & 0x0002) != 0)).append("\r\n"); 
-                sb.append("Mode (Mixed memory area): ").append(((mode & 0x0004) != 0)).append("\r\n"); 
-                sb.append("Mode (Code and data separate): ").append(((mode & 0x0008) != 0)).append("\r\n");
-                sb.append("Mode (Code and data together): ").append(((mode & 0x0010) != 0)).append("\r\n");
-                
-                sb.append("Granu (Always zero): ").append(granu).append("\r\n"); 
-                
-                sb.append("Ber1 (Size of the volatile memory area in bytes): ").append(ber1).append("\r\n");  
-                sb.append("Belegt1 (Size of the volatile memory area being used): ").append(be1egt1).append("\r\n");
-                sb.append("Block1 (Largest free block in the volatile memory area): ").append(block1).append("\r\n");
-                
-                sb.append("Ber2 (Size of the non-volatile memory area in bytes): ").append(ber2).append("\r\n");  
-                sb.append("Belegt2 (Size of the non-volatile memory area being used): ").append(be1egt2).append("\r\n");
-                sb.append("Block2 (Largest free block in the non-volatile memory area): ").append(block2).append("\r\n");                
-                               
-            }
-        } catch (Exception ex){
-            sb.append(ex.toString());
-        }
-        return sb;
-    }        
-     
-    private static StringBuilder ID_0xXY14(ByteBuf data){
-        StringBuilder sb = new StringBuilder();
-        int ssl_length = data.readShort();
-        int ssl_count = data.readShort();
-        try {
-            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");
-            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");
-            for (int i=1; i <= ssl_count; i++){
-                int index = data.readShort(); 
-                int code = data.readShort();
-                int quantity = data.readShort();
-                int reman = data.readShort();
-                
-                sb.append("Data Record: ").append(i).append("\r\n");
-                sb.append("Index: ").append(index).append(" System area: ");
-                switch(index) {
-                    case 0x0001: sb.append("PII (number in bytes)").append("\r\n");
-                        break;
-                    case 0x0002: sb.append("PIQ (number in bytes))").append("\r\n");
-                        break;
-                    case 0x0003: sb.append("memory (number in bits)").append("\r\n");
-                        break;
-                    case 0x0004: sb.append("timers (number)").append("\r\n");
-                        break;
-                    case 0x0005: sb.append("counter (number)").append("\r\n");
-                        break;
-                    case 0x0006: sb.append("number of bytes in the logical address area)").append("\r\n");
-                        break;
-                    case 0x0007: sb.append("local data (entire local data area of the CPU in bytes)").append("\r\n");
-                        break;
-                    case 0x0008: sb.append("memory (number in bytes)").append("\r\n");
-                        break;
-                    case 0x0009: sb.append("local data (entire local data area of the CPU in Kbytes)").append("\r\n");
-                        break;                        
-                }
-                sb.append("Code: ").append(code).append(" Memory type: ");
-                switch(code) {
-                    case 0x0001: sb.append("volatile memory (RAM)").append("\r\n");
-                        break;
-                    case 0x0002: sb.append("non-volatile memory (FEPROM)").append("\r\n");
-                        break; 
-                    case 0x0003: sb.append("mixed memory (RAM and FEPROM)").append("\r\n");
-                        break;                        
-                }
-                sb.append("Quantity: ").append(quantity).append("\r\n");
-                sb.append("Reman: ").append(reman).append("\r\n");
-            }
-        } catch (Exception ex){
-            sb.append(ex.toString());
-        }
-        return sb;
-    }    
-       
-    private static StringBuilder ID_0xXY15(ByteBuf data){
-        StringBuilder sb = new StringBuilder();
-        int ssl_length = data.readShort();
-        int ssl_count = data.readShort();
-        try {
-            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");;
-            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");;
-
-            for (int i=1; i <= ssl_count; i++){
-                sb.append("Data Record: ").append(i).append("\r\n");
-                int type = data.readShort();
-                switch(type){
-                    case 0x0800: sb.append("Block type: OB\r\n");
-                        break;
-                    case 0x0A00: sb.append("Block type: DB\r\n");
-                        break;
-                    case 0x0B00: sb.append("Block type: SDB\r\n");
-                        break;
-                    case 0x0C00: sb.append("Block type: FC\r\n");
-                        break;
-                    case 0x0E00: sb.append("Block type: FB\r\n");
-                        break;
-                    default: 
-                } 
-                sb.append("Maximum number of blocks of the type: ").append(data.readShort()).append("\r\n"); ;           
-                sb.append("Maximum total size of the object to be loaded in Kbytes: ").append(data.readShort()).append("\r\n"); ;
-                sb.append("Maximum length of the work memory part of a block in bytes: ").append(data.readInt()).append("\r\n"); ;                
-            }
-        } catch (Exception ex){
-            sb.append(ex.toString());
-        }
-        return sb;
-    }
-          
-    private static StringBuilder ID_0xXY1C(ByteBuf data){
-        StringBuilder sb = new StringBuilder();
-        int ssl_length = data.readShort();
-        int ssl_count = data.readShort();
-       try {
-            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");;
-            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");;
-
-            for (int i=1; i <= ssl_count; i++){
-                sb.append("Data Record: ").append(i).append("\r\n");
-                int index = data.getShort(data.readerIndex());
-                int index_b0 = data.readByte();
-                int index_b1 = data.readByte();
-                sb.append("Index: ").append(index).append("\r\n");                
-                sb.append("Index b1: ").append(index_b1).append("\r\n");
-                
-                switch(index_b1){
-                    case 0x01: 
-                    case 0x02: { 
-                        byte[] strbyte = new byte[24];
-                        data.readBytes(strbyte, 0, 24);
-                        sb.append("Name: ").append(new String(strbyte)).append("\r\n");
-                        ByteBuf  data2 = data.readSlice(8);   
-                        sb.append("Reserved: ").append(ByteBufUtil.hexDump(data2)).append("\r\n");                      
-                    };
-                        break;                        
-                    case 0x03: {
-                        byte[] strbyte = new byte[32];                        
-                        data.readBytes(strbyte, 0, 32);
-                        sb.append("Tag: ").append(new String(strbyte)).append("\r\n");                        
-                    };
-                        break;                        
-                    case 0x04: {
-                        byte[] strbyte = new byte[26];                        
-                        data.readBytes(strbyte, 0, 26);
-                        sb.append("Copyright: ").append(new String(strbyte)).append("\r\n");   
-                        ByteBuf  data2 = data.readSlice(6);   
-                        sb.append("Reserved: ").append(ByteBufUtil.hexDump(data2)).append("\r\n");                     
-                    };
-                        break;                        
-                    case 0x05: {
-                        byte[] strbyte = new byte[24];                        
-                        data.readBytes(strbyte, 0, 24);
-                        sb.append("Serial: ").append(new String(strbyte)).append("\r\n");   
-                        ByteBuf  data2 = data.readSlice(8);   
-                        sb.append("Reserved: ").append(ByteBufUtil.hexDump(data2)).append("\r\n");                         
-                    };
-                        break;                        
-                    case 0x06: {
-                        
-                    };
-                        break;                        
-                    case 0x07: {
-                        byte[] strbyte = new byte[32];                        
-                        data.readBytes(strbyte, 0, 32);
-                        sb.append("Cpu type: ").append(new String(strbyte)).append("\r\n");                          
-                    };
-                        break;                        
-                    case 0x08: {
-                        byte[] strbyte = new byte[32];                        
-                        data.readBytes(strbyte, 0, 32);
-                        sb.append("Serial mc/mmc: ").append(new String(strbyte)).append("\r\n");                         
-                    };
-                        break;                        
-                    case 0x09: {
-                        sb.append("Manufacturer ID: ").append(data.readShort()).append("\r\n");  
-                        sb.append("Profile ID: ").append(data.readShort()).append("\r\n");   
-                        sb.append("Profile specific type: ").append(data.readShort()).append("\r\n");
-                        ByteBuf  data2 = data.readSlice(26);
-                        sb.append("Reserved: ").append(ByteBufUtil.hexDump(data2)).append("\r\n");                        
-                    };
-                        break;                        
-                    case 0x0A: {
-                        byte[] strbyte = new byte[26];                        
-                        data.readBytes(strbyte, 0, 26);
-                        sb.append("OEM copyright: ").append(new String(strbyte)).append("\r\n");                        
-                        sb.append("OEM ID: ").append(data.readShort()).append("\r\n");
-                        sb.append("OEM add ID: ").append(data.readInt()).append("\r\n");
-                    };
-                        break;                        
-                    case 0x0B: {
-                        byte[] strbyte = new byte[32];                        
-                        data.readBytes(strbyte, 0, 32);
-                        sb.append("Location ID: ").append(new String(strbyte)).append("\r\n");                         
-                    };
-                        break;                        
-                    case 0x0C: {
-                        byte[] strbyte = new byte[10];                        
-                        data.readBytes(strbyte, 0, 10);
-                        sb.append("Order number sync module 1: ").append(new String(strbyte)).append("\r\n"); 
-                        data.readShort();
-                        byte[] strbyte2 = new byte[2]; 
-                        data.readBytes(strbyte2, 0, 2);
-                        sb.append("Product version: ").append(new String(strbyte2)).append("\r\n");                         
-                        data.readByte();
-                        ByteBuf  data2 = data.readSlice(17);
-                        sb.append("Vendor serial: ").append(ByteBufUtil.hexDump(data2)).append("\r\n");                         
-                    };
-                        break;                        
-                    case 0x0D: {
-                        byte[] strbyte = new byte[10];                        
-                        data.readBytes(strbyte, 0, 10);
-                        sb.append("Order number sync module 2: ").append(new String(strbyte)).append("\r\n"); 
-                        data.readShort();
-                        byte[] strbyte2 = new byte[2]; 
-                        data.readBytes(strbyte2, 0, 2);
-                        sb.append("Product version: ").append(new String(strbyte2)).append("\r\n");                         
-                        data.readByte();
-                        ByteBuf  data2 = data.readSlice(17);                        
-                        sb.append("Vendor serial: ").append(ByteBufUtil.hexDump(data2)).append("\r\n");                        
-                    };
-                        break;                        
-                    case 0x0E: {
-                        byte[] strbyte = new byte[18];                        
-                        data.readBytes(strbyte, 0, 18);
-                        sb.append("Serial number: ").append(new String(strbyte)).append("\r\n"); 
-                        ByteBuf  data2 = data.readSlice(14); 
-                        sb.append("Reserved: ").append(ByteBufUtil.hexDump(data2)).append("\r\n");                         
-                    };
-                        break;                        
-                }
-                
-            }
-        } catch (Exception ex){
-            sb.append(ex.toString());
-        }        
-        return sb;
-    }      
-    
-    private static StringBuilder ID_0xXY22(ByteBuf data){
-        StringBuilder sb = new StringBuilder();
-        int ssl_length = data.readShort();
-        int ssl_count = data.readShort();        
-        
-        try {
-            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");;
-            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");;
-
-            for (int i=1; i <= ssl_count; i++){
-                sb.append("Data Record: ").append(i).append("\r\n");
-                ByteBuf  infobytes = data.readSlice(20);
-                short al1 = data.readShort();
-                short al2 = data.readShort();
-                int al3  = data.readInt();
-                sb.append("Info: ").append(ByteBufUtil.hexDump(infobytes)).append("\r\n");
-                sb.append("al 1: ").append(Integer.toHexString(al1)).append("\r\n");
-                sb.append("al 2: ").append(Integer.toHexString(al2)).append("\r\n");
-                sb.append("al 3: ").append(Integer.toHexString(al3)).append("\r\n");
-            }        
-        }catch (Exception ex){
-            sb.append(ex.toString());
-        }        
-        return sb;
-
-    }   
-    
-    private static StringBuilder ID_0xXY25(ByteBuf data){
-        StringBuilder sb = new StringBuilder();
-        sb.append("It is not implemeted yet!");
-        return sb;
-    } 
-    
-    private static StringBuilder ID_0xXY32(ByteBuf data){
-        StringBuilder sb = new StringBuilder();
-        sb.append("It is not implemeted yet!");
-        return sb;
-    }     
-    
-    private static StringBuilder ID_0xXY71(ByteBuf data){
-        StringBuilder sb = new StringBuilder();
-        sb.append("It is not implemeted yet!");
-        return sb;
-    }     
-
-    private static StringBuilder ID_0xXY74(ByteBuf data){
-        StringBuilder sb = new StringBuilder();
-        int ssl_length = data.readShort();
-        int ssl_count = data.readShort();
-        try {
-            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");
-            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");
-            for (int i=1; i <= ssl_count; i++){
-                sb.append("Data Record: ").append(i).append("\r\n");
-                int cpu_type = data.readByte();
-                int led_id = data.readByte();
-                boolean led_onoff = (data.readByte() != 0x00);
-                int led_flashing = data.readByte();
-                
-                sb.append("Rack number: ").append((cpu_type & 0x07)).append("\r\n");
-                sb.append("CPU Type: ").append((cpu_type & 0x08) == 0x00?"Standby":"Master").append("\r\n");
-                sb.append("LED ID: ").append(LED_ID.valueOf(led_id)).append(" (").append(LED_ID.valueOf(led_id).description).append(")\r\n");
-                sb.append("LED status: ").append(led_onoff).append("\r\n");
-                switch(led_flashing){
-                    case 0x00: sb.append("LED flashing: not.").append("\r\n");
-                        break; 
-                    case 0x01: sb.append("LED blinking: normally (2 Hz).").append("\r\n");
-                        break;
-                    case 0x02: sb.append("LED blinking: slowly (0.5 Hz).").append("\r\n");
-                        break;
-                    default: sb.append("LED blinking: no information.").append("\r\n");
-                }
-            }
-        } catch (Exception ex){
-            sb.append(ex.toString());
-        }
-        return sb;
-    }  
-    
-    private static StringBuilder ID_0xXY75(ByteBuf data){
-        StringBuilder sb = new StringBuilder();
-        sb.append("It is not implemeted yet!");
-        return sb;
-    }      
-    
-    private static StringBuilder ID_0xXY90(ByteBuf data){
-        StringBuilder sb = new StringBuilder();
-        sb.append("It is not implemeted yet!");
-        return sb;
-    }     
-    
-    private static StringBuilder ID_0xXY91(ByteBuf data){
-        StringBuilder sb = new StringBuilder();
-        sb.append("It is not implemeted yet!");
-        return sb;
-    }   
-    
-    private static StringBuilder ID_0xXY92(ByteBuf data){
-        StringBuilder sb = new StringBuilder();
-        sb.append("It is not implemeted yet!");
-        return sb;
-    }  
-
-    private static StringBuilder ID_0xXY94(ByteBuf data){
-        StringBuilder sb = new StringBuilder();
-        sb.append("It is not implemeted yet!");
-        return sb;
-    }     
-    
-    private static StringBuilder ID_0xXY95(ByteBuf data){
-        StringBuilder sb = new StringBuilder();
-        sb.append("It is not implemeted yet!");
-        return sb;
-    }   
-    
-    private static StringBuilder ID_0xXY96(ByteBuf data){
-        StringBuilder sb = new StringBuilder();
-        sb.append("It is not implemeted yet!");
-        return sb;
-    }      
-    
-    private static StringBuilder ID_0xXY9C(ByteBuf data){
-        StringBuilder sb = new StringBuilder();
-        sb.append("It is not implemeted yet!");
-        return sb;
-    }      
-    
-    private static StringBuilder ID_0xXYA0(ByteBuf data){
-        StringBuilder sb = new StringBuilder();
-        int ssl_length = data.readShort();
-        int ssl_count = data.readShort(); 
-        
-        try{
-            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");
-            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");
-            int i = 1;
-            while(data.isReadable()){
-                sb.append("Data Record: ").append(i).append("\r\n");
-                Short  id = data.readShort();
-  
-                sb.append("ID: ").append(id).append("\r\n");  
-                ByteBuf infobytes = data.readSlice(10);
-                sb.append("Info: ").append(ByteBufUtil.hexDump(infobytes)).append("\r\n");
-                infobytes = data.readSlice(8);
-                sb.append("Timestamp: ").append(readDateAndTime(infobytes).toString()).append("\r\n");
-                sb.append("Desc: ").append(S7DiagnosticEventId.valueOf(id).getDescription()).append("\r\n");
-                i++;
-            }
-        } catch (Exception ex){
-            sb.append(ex.toString());
-        }        
-
-        return sb;
-    }      
-    
-    private static StringBuilder ID_0xXYB1(ByteBuf data){
-        StringBuilder sb = new StringBuilder();
-        sb.append("It is not implemeted yet!");
-        return sb;
-    }  
-
-    private static StringBuilder ID_0xXYB2(ByteBuf data){
-        StringBuilder sb = new StringBuilder();
-        sb.append("It is not implemeted yet!");
-        return sb;
-    }  
-
-    private static StringBuilder ID_0xXYB3(ByteBuf data){
-        StringBuilder sb = new StringBuilder();
-        sb.append("It is not implemeted yet!");
-        return sb;
-    }  
-
-    private static StringBuilder ID_0xXYB4(ByteBuf data){
-        StringBuilder sb = new StringBuilder();
-        sb.append("It is not implemeted yet!");
-        return sb;
-    }      
-    
-    /*
-     * Date and time of day (BCD coded).
-     *          +----------------+
-     * Byte n   | Year   0 to 99 |
-     *          +----------------+
-     * Byte n+1 | Month  1 to 12 |
-     *          +----------------+
-     * Byte n+2 | Day    1 to 31 |    
-     *          +----------------+
-     * Byte n+3 | Hour   0 to 23 |    
-     *          +----------------+  
-     * Byte n+4 | Minute 0 to 59 |  
-     *          +----------------+
-     * Byte n+5 | Second 0 to 59 |     
-     *          +----------------+
-     * Byte n+6 | ms    0 to 999 |
-     * Byte n+7 | X X X X X D O W|    
-     *          +----------------+    
-     * DOW: Day of weed (last 3 bits)
-    */
-    private static LocalDateTime readDateAndTime(ByteBuf data) {
-        //from Plc4XS7Protocol
-        int year=convertByteToBcd(data.readByte());
-        byte themonth = data.readByte();
-        int month=convertByteToBcd(themonth==0x00?0x01:themonth);
-        byte theday = data.readByte();
-        int day=convertByteToBcd(theday==0x00?0x01:theday);
-        int hour=convertByteToBcd(data.readByte());
-        int minute=convertByteToBcd(data.readByte());
-        int second=convertByteToBcd(data.readByte());        
-        int milliseconds = (data.readShort() & 0xfff0) >> 4;
-        
-        int cen = ((milliseconds & 0x0f00) >> 8) * 100;
-        int dec = ((milliseconds & 0x00f0) >> 4) * 10;
-        milliseconds = cen + dec + (milliseconds & 0x000f);
-        int nanoseconds = milliseconds * 1000000;
-        
-        //data-type ranges from 1990 up to 2089
-        if(year>=90){
-            year+=1900;
-        }
-        else{
-            year+=2000;
-        }
-        
-        return LocalDateTime.of(year,month,day,hour,minute,second, nanoseconds);
-    }    
-  
-    
-   /**
-     * converts incoming byte to an integer regarding used BCD format
-     * @param incomingByte
-     * @return converted BCD number
-     */
-    private static int convertByteToBcd(byte incomingByte) {
-        int dec = (incomingByte >> 4) * 10;
-        return dec + (incomingByte & 0x0f);
-    }  
-    
-   /**
-     * converts incoming Short to an integer regarding used BCD format
-     * @param incomingShort
-     * @return converted BCD number
-     */
-    private static short convertShortToBcd(short incomingShort) {
-        
-        short res =(short)  ((incomingShort >> 8) * 100 +
-                            (incomingShort >> 4) * 10 +
-                            (incomingShort & 0x0f));
-        return res;
-    }      
-        
- }
-    
-    /*
-    *
-    */
-    public static Duration S5TimeToDuration(Short data) {
-        Duration res;
-        short t = data;
-        long tv = (short)(((t & 0x000F))+((t & 0x00F0)>>4)*10+((t & 0x0F00) >> 8)*100);       
-        long tb = (short)(10*Math.pow(10,((t & 0xF000) >> 12)));
-        long totalms = tv*tb;
-        if (totalms <= 9990000 ){
-            res = Duration.ofMillis(totalms);
-        } else {
-            res = Duration.ofMillis(9990000);
-        }            
-        return res;
-    }
-    
-    /*
-    * 
-    */
-    public static Short DurationToS5Time(Duration data) {
-        short tv = 0;
-        short tb = 0x0000_0000;
-        short s5time = 0x0000;
-        long totalms = data.toMillis();
-        
-        if ((totalms >= 0) && (totalms <= 9990000)) {
-            
-            if ((totalms>=0) && ((totalms<=9990))){
-                tb = 0x0000_0000; //10 ms
-                tv = (short)(totalms / 10);                
-            } else  if ((totalms>9990) && ((totalms<=99900))){                 
-                tb = 0x0000_0001;// 100 ms
-                tv = (short)(totalms / 100);
-            } else if ((totalms>99900) && ((totalms<=999000))){
-                tb = 0x0000_0002;//1000 ms
-                tv = (short)(totalms / 1000);                
-            } else if ((totalms>999000) && ((totalms<=9990000))){
-                tb = 0x0000_0003;//10000 ms
-                tv = (short)(totalms / 10000);                
-            }            
-           
-            short uni = (short)(tv % 10);
-            short dec = (short)((tv / 10) % 10);
-            short cen = (short)((tv / 100) % 10);
-
-            s5time = (short)(((tb)<<12) | (cen << 8) | (dec << 4) | (uni));
-        }
-        return s5time;
-    }   
-
-    public static Duration S7TimeToDuration(Integer data) {
-        Duration res = Duration.ZERO;
-        if (data>= 0){
-            res = res.plusMillis((long) data);
-        } else {
-            long ms = 0x8000_0000  - (data & 0x8000_0000);
-            res = res.minusMillis((long) data);
-        }
-        
-        return res;
-    }  
-    
-    public static Integer DurationToS7Time(Duration data) {
-        Integer res = 0x0000_0000;
-        if (data.isNegative()){
-            res = (int) data.toMillis() + 0x8000_0000;
-        } else {
-            res = (int) data.toMillis();            
-        }
-        return res;
-    } 
-
-    public static LocalTime S7TodToLocalTime(Integer data) {
-        if (data > 0x0526_5bff) data=0x0526_5bff;
-        if (data < 0) data=0x0000_0000;
-        LocalTime res = LocalTime.MIDNIGHT.plusNanos((long)data*1_000_000);
-        return res;
-    }  
-
-    public static Integer LocalTimeToS7Tod(LocalTime data) {        
-        return (int)(data.toNanoOfDay() / 1_000_000);
-    }
-    
-    public static LocalDate S7DateToLocalDate(Short data) {
-        LocalDate res = LocalDate.of(1990, 1, 1);
-        res = res.plusDays((long) data);
-        return res;
-    }
-    
-    public static Short LocalDateToS7Date(LocalDate data) {
-        LocalDate ini = LocalDate.of(1990, 1, 1);
-        long resl  = ChronoUnit.DAYS.between(ini, data);
-        short res = (short) resl;
-        return res;
-    }  
-    
-    /*
-     * Date and time of day (BCD coded).
-     *          +----------------+
-     * Byte n   | Year   0 to 99 |
-     *          +----------------+
-     * Byte n+1 | Month  1 to 12 |
-     *          +----------------+
-     * Byte n+2 | Day    1 to 31 |    
-     *          +----------------+
-     * Byte n+3 | Hour   0 to 23 |    
-     *          +----------------+  
-     * Byte n+4 | Minute 0 to 59 |  
-     *          +----------------+
-     * Byte n+5 | Second 0 to 59 |     
-     *          +----------------+
-     * Byte n+6 | ms    0 to 999 |
-     * Byte n+7 | X X X X X D O W|    
-     *          +----------------+    
-     * DOW: Day of weed (last 3 bits)
-    */
-    public static LocalDateTime S7DateTimeToLocalDateTime(ByteBuf data) {
-        //from Plc4XS7Protocol
-        int year=   byteBCDToInt(data.readByte());       
-        int month=  byteBCDToInt(data.readByte());
-        int day =   byteBCDToInt(data.readByte());
-        int hour=   byteBCDToInt(data.readByte());
-        int minute= byteBCDToInt(data.readByte());
-        int second= byteBCDToInt(data.readByte());   
-        int millih= byteBCDToInt(data.readByte()) * 10;
-        
-        int milll= (data.readByte() >> 4);
-         
-        int milliseconds = millih + milll;
-        int nanoseconds = milliseconds * 1000000;
-        //At this point a dont need the day of week
-        //data-type ranges from 1990 up to 2089
-        if(year>=90){
-            year+=1900;
-        }
-        else{
-            year+=2000;
-        }
-        
-        return LocalDateTime.of(year,month,day,hour,minute,second, nanoseconds);
-    }    
-  
-    public static byte[] LocalDateTimeToS7DateTime(LocalDateTime data) {
-        byte[] res = new byte[8];
-        
-        res[0] = convertByteToBcd((data.getYear() % 100));
-        res[1] = convertByteToBcd(data.getMonthValue());
-        res[2] = convertByteToBcd(data.getDayOfMonth());
-        res[3] = convertByteToBcd(data.getHour());
-        res[4] = convertByteToBcd(data.getMinute());
-        res[5] = convertByteToBcd(data.getSecond());
-        
-        long ms = (long)(data.getNano() / 1_000_000);
-        res[6] = (byte)((int)(((ms / 100) << 4) | ((ms / 10)%10))) ;
-        //Java:1 (Monday) to 7 (Sunday)->S7:1 (Sunday) to 7 (Saturday)        
-        byte dayofweek = (byte)((data.getDayOfWeek().getValue()<7)?
-                                data.getDayOfWeek().getValue()+1:
-                                (byte)0x01);
-        res[7] = (byte)(((ms % 10) << 4) | ((byte)(dayofweek)));
-                
-        return res;
-    }
-   
-    
-   /**
-     * converts incoming byte to an integer regarding used BCD format
-     * @param incomingByte
-     * @return converted BCD number
-     */
-    private static byte convertByteToBcd(int incomingByte) {
-        byte dec = (byte)((incomingByte / 10) % 10);
-        return (byte)((dec << 4) | (incomingByte % 10));
-    } 
-
-    private static int byteBCDToInt(byte bcd){
-        int res=(bcd>>4)*10 + (bcd & 0x0f);
-        return res;
-    }
-    
-    public static PlcResponseCode decodeResponseCode(DataTransportErrorCode dataTransportErrorCode) {
-        if (dataTransportErrorCode == null) {
-            return PlcResponseCode.INTERNAL_ERROR;
-        }
-        switch (dataTransportErrorCode) {
-            case OK:
-                return PlcResponseCode.OK;
-            case NOT_FOUND:
-                return PlcResponseCode.NOT_FOUND;
-            case INVALID_ADDRESS:
-                return PlcResponseCode.INVALID_ADDRESS;
-            case DATA_TYPE_NOT_SUPPORTED:
-                return PlcResponseCode.INVALID_DATATYPE;
-            case ACCESS_DENIED:
-                return PlcResponseCode.ACCESS_DENIED;
-            default:
-                return PlcResponseCode.INTERNAL_ERROR;
-        }
-    }    
-    
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.utils;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.temporal.ChronoUnit;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
+
+/**
+ *  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+ *  |15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1|
+ *  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+ *  \__________/\__________/\____________________/
+ *   Module      Number of   Number of the partial 
+ *   class       the partial list
+ *               list 
+ *               extract
+ * 
+ *  <b>Module Class:</b>
+ *  +--------------+-----------------+ 
+ *  | Module class | Coding (Binary) |
+ *  +--------------|-----------------+
+ *  |     CPU      |      0000       | 
+ *  +--------------|-----------------+
+ *  |     IM       |      0100       | 
+ *  +--------------|-----------------+
+ *  |     FM       |      1000       | 
+ *  +--------------|-----------------+
+ *  |     CP       |      1100       | 
+ *  +--------------|-----------------+
+ * 
+ *  <b>Possible SSL Partial Lists:</b>
+ *  +-----------------------------------------------------------|--------------+
+ *  | Module class                                              |    SSL-ID    |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Module identification                                     |    16#xy11   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | CPU characteristics                                       |    16#xy12   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | User memory areas                                         |    16#xy13   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | System areas                                              |    16#xy14   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Block types                                               |    16#xy15   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Interrupt status                                          |    16#xy22   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Assignment between process image partitions and OBs       |    16#xy25   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Communication status data                                 |    16#xy32   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | H CPU group information                                   |    16#xy71   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Status of the module LEDs                                 |    16#xy74   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Switched DP slaves in the H-system                        |    16#xy75   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Module status information                                 |    16#xy91   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Rack / station status information                         |    16#xy92   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Rack / station status information                         |    16#xy94   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Extended DP master system / PROFINET IO system information|    16#xy95   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Module status information, PROFINET IO and PROFIBUS DP    |    16#xy96   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Tool changer information (PROFINET IO)                    |    16#xy9C   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Diagnostic buffer of the CPU                              |    16#xyA0   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Module diagnostic information (data record 0)             |    16#xyB1   |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Module diagnostic information (data record 1),            |    16#xyB2   |
+ *  | geographical address                                      |              |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Module diagnostic information (data record 1),            |    16#xyB3   |
+ *  | logical address                                           |              |
+ *  +-----------------------------------------------------------|--------------+
+ *  | Diagnostic data of a DP slave                             |    16#xyB4   |
+ *  +-----------------------------------------------------------|--------------+
+ * 
+ * 
+ * @author cgarcia
+ */
+
+public class S7Helper {
+    
+    /**
+     * 
+     */
+    public enum OB {
+        FREE_CYC(0X0000,"OB1 Free cycle"),
+        
+        //Time of day
+        TOD_INT0(0X000A,"OB10 Time of day interrupt"),
+        TOD_INT1(0X000B,"OB11 Time of day interrupt"),
+        TOD_INT2(0X000C,"OB12 Time of day interrupt"),
+        TOD_INT3(0X000D,"OB13 Time of day interrupt"),
+        TOD_INT4(0X000E,"OB14 Time of day interrupt"),
+        TOD_INT5(0X000F,"OB15 Time of day interrupt"),
+        TOD_INT6(0X0010,"OB16 Time of day interrupt"),
+        TOD_INT7(0X0011,"OB17 Time of day interrupt"),        
+        
+        //Time delay
+        DEL_INT0(0X0014,"OB20 Time delay interrupt"),
+        DEL_INT1(0X0015,"OB21 Time delay interrupt"),
+        DEL_INT2(0X0016,"OB22 Time delay interrupt"),
+        DEL_INT3(0X0017,"OB23 Time delay interrupt"),        
+        
+        //Cyclic
+        CYC_INT0(0X001E,"OB30 Cyclic interrupt"),
+        CYC_INT1(0X001F,"OB31 Cyclic interrupt"),
+        CYC_INT2(0X0020,"OB32 Cyclic interrupt"),
+        CYC_INT3(0X0021,"OB33 Cyclic interrupt"),
+        CYC_INT4(0X0022,"OB34 Cyclic interrupt"),
+        CYC_INT5(0X0023,"OB35 Cyclic interrupt"),
+        CYC_INT6(0X0024,"OB36 Cyclic interrupt"),
+        CYC_INT7(0X0025,"OB37 Cyclic interrupt"),
+        CYC_INT8(0X0026,"OB38 Cyclic interrupt"),
+                
+        //Hardware interrupts
+        HW_INT0(0X0028,"OB40 Hardware interrupt"),
+        HW_INT1(0X0029,"OB41 Hardware interrupt"),
+        HW_INT2(0X002A,"OB42 Hardware interrupt"),
+        HW_INT3(0X002B,"OB43 Hardware interrupt"),
+        HW_INT4(0X002C,"OB44 Hardware interrupt"),
+        HW_INT5(0X002D,"OB45 Hardware interrupt"),
+        HW_INT6(0X002E,"OB46 Hardware interrupt"),
+        HW_INT7(0X002F,"OB47 Hardware interrupt"),
+        
+        //Startup
+        BACKGROUND(0X005A,"OB90 Background"),
+        COMPLETE_RESTART(0X0064,"OB100 Startup"),
+        RESTART(0X0064,"OB101 Background"),
+        COLD_RESTART(0X005A,"OB101 Background"),
+        
+        //Fault interrupts
+        CYC_FLT(0X0051,"OB80 Time execution error interrupt"),
+        PS_FLT(0X0051,"OB81 Power supply interrupt"),
+        IO_FLT1(0X0052,"OB82 Module diagnostic interrupt"),
+        IO_FLT2(0X0053,"OB83 Module change interrupt"),
+        CPU_FLT(0X0054,"OB84 CPU hardware error interrupt"),        
+        OBNL_FLT(0X0055,"OB85 Program execution error interrupt"),
+        RACK_FLT(0X0056,"OB86 Rack fault interrupt"),
+        COMM_FLT(0X0057,"OB87 Communication error interrupt"),        
+        BREAKUP_ERR(0X0058,"OB88 Process interrupt"),        
+        SYNC_ERR(0X0079,"OB120 Synchronous error interrupt"),
+        PROG_ERR(0X0079,"OB121 Program error interrupt"),
+        MOD_ERR(0X007A,"OB122 Module error interrupt");
+
+        private int code;
+        private String description;
+
+        private static final Map<Integer, OB> map;
+
+        static {
+            map = new HashMap<>();
+            for (OB obid : OB.values()) {
+                map.put(obid.code, obid);
+            }
+        }         
+        
+        OB(final int code, final String description){
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getCode(){
+            return code;
+        }
+
+        public String getDescription(){
+            return description;
+        }
+
+        public static OB valueOf(int code) {
+            return map.get(code);
+        }            
+        
+        
+    }    
+    
+    
+    /**
+     * 
+     */
+    public enum MODULE{
+        CPU(0X00),
+        IM(0X04),
+        FM(0X80),
+        CP(0XC0);
+        
+        private int code;
+        
+        MODULE(final int code){
+            this.code = code;
+        }
+        
+        public int getCode(){
+            return code;
+        }        
+    }
+    
+    /**
+     * 
+     */
+    public enum LED_ID {
+        SF(0X0001,"Group error"),
+        INTF(0X0002,"Internal error"),
+        EXTF(0X0003,"External error"),        
+        RUN(0X0004,"RUN"),        
+        STOP(0X0005,"STOP"),        
+        FRCE(0X0006,"Force"),        
+        CRST(0X0007,"Cold restart"),        
+        BAF(0X0008,"Battery fault"),        
+        USR(0X0009,"User defined"),        
+        USR1(0X000A,"User defined"),        
+        BUS1F(0X000B,"Bus error interface 1"),
+        BUS2F(0X000C,"Bus error interface 2"),
+        REDF(0X000D,"Redundancy error"),
+        MSTR(0X000E,"Master"),
+        RACK0(0X000F,"Rack number 0"),
+        RACK1(0X0010,"Rack number 1"),
+        RACK2(0X0011,"Rack number 2"),
+        IFM1F(0X0012,"Interface error interface module 1"),
+        IFM2F(0X0013,"Interface error interface module 2"),
+        BUS3F(0X0014,"Bus error interface 3"),
+        MAINT(0X0015,"Maintenance demand"),
+        DC24V(0X0016,"DC24V"),
+        BUS5F(0X0017,"Bus error interface 5"),
+        BUS8F(0X0018,"Bus error interface 8"),
+        IF(0X0080,"Init failure"),
+        UF(0X0081,"User failure"),
+        MF(0X0082,"Monitoring failure"),
+        CF(0X0083,"Communication failure"),
+        TF(0X0084,"Task failure"),
+        APPL_STATE_RED(0X00EC,"APPL_STATE_RED"),
+        APPL_STATE_GREEN(0X00ED,"APPL_STATE_GREEN");
+
+        private int code;
+        private String description;
+
+        private static final Map<Integer, LED_ID> map;
+
+        static {
+            map = new HashMap<>();
+            for (LED_ID ledid : LED_ID.values()) {
+                map.put(ledid.code, ledid);
+            }
+        }         
+        
+        LED_ID(final int code, final String description){
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getCode(){
+            return code;
+        }
+
+        public String getDescription(){
+            return description;
+        }
+
+        public static LED_ID valueOf(int code) {
+            return map.get(code);
+        }            
+        
+        
+    }
+        
+    /**
+     * 
+     */
+    public enum CPU_CHARACTERISTICS {
+        CH_0x0000(0X0000,"MC7 processing unit (group with index 0000)"),
+        CH_0x0001(0X0001,"MC7 processing generating code"),
+        CH_0x0002(0X0002,"MC7 interpreter"),
+        
+        CH_0x0100(0X0100,"Time system (group with index 0100)"),
+        CH_0x0101(0X0101,"1 ms resolution"),
+        CH_0x0102(0X0102,"10 ms resolution"),
+        CH_0x0103(0X0103,"No real time clock"),
+        CH_0x0104(0X0104,"BCD time-of-day format"),
+        CH_0x0105(0X0105,"All time-of-day functions"),
+        CH_0x0106(0X0106,"SFC 78 \"OB_RT\" is available"),
+        
+        CH_0x0200(0X0200,"System response (group with index 0200)"),
+        CH_0x0201(0X0201,"Capable of multiprocessor mode"),
+        CH_0x0202(0X0202,"Cold restart, warm restart and hot restart possible"),
+        CH_0x0203(0X0203,"Cold restart and hot restart possible"),
+        CH_0x0204(0X0204,"Warm restart and hot restart possible"),
+        CH_0x0205(0X0205,"Only warm restart possible"),
+        CH_0x0206(0X0206,"New distributed I/O configuration is possible during\n" +
+                            "RUN by using predefined resources"),
+        CH_0x0207(0X0207,"H-CPU in stand-alone mode: New distributed I/O configuration\n" +
+                            "is possible during RUN by using predefined resources"),
+        CH_0x0208(0X0208,"For taking motion control functionality into account"),
+        
+        CH_0x0300(0X0300,"MC7 Language description of the CPU (group with index 0300)"),
+        CH_0x0301(0X0301,"Reserved"),
+        CH_0x0302(0X0302,"All 32 bit fixed-point instructions"),
+        CH_0x0303(0X0303,"All floating-point instructions"),
+        CH_0x0304(0X0304,"sin, asin, cos, acos, tan, atan, sqr, sqrt, ln, exp"),
+        CH_0x0305(0X0305,"Accumulator 3/accumulator 4 with corresponding instructions\n" +
+                            "(ENT,PUSH,POP,LEAVE)"),
+        CH_0x0306(0X0306,"Master Control Relay instructions"),
+        CH_0x0307(0X0307,"Address register 1 exists with corresponding instructions"),
+        CH_0x0308(0X0308,"Address register 2 exists with corresponding instructions"),
+        CH_0x0309(0X0309,"Operations for area-crossing addressing"),
+        CH_0x030A(0X030A,"Operations for area-internal addressing"),
+        CH_0x030B(0X030B,"All memory-indirect addressing instructions for bit memory (M)"),
+        CH_0x030C(0X030C,"All memory-indirect addressing instructions for data blocks (DB)"),
+        CH_0x030D(0X030D,"All memory-indirect addressing instructions for data blocks (DI)"),
+        CH_0x030E(0X030E,"All memory-indirect addressing instructions for local data (L)"),
+        CH_0x030F(0X030F,"All instructions for parameter transfer in FCs"),
+        CH_0x0310(0X0310,"Memory bit edge instructions for process image input (I)"),
+        CH_0x0311(0X0311,"Memory bit edge instructions for process image output (Q)"),
+        CH_0x0312(0X0312,"Memory bit edge instructions for bit memory (M)"),
+        CH_0x0313(0X0313,"Memory bit edge instructions for data blocks (DB)"),
+        CH_0x0314(0X0314,"Memory bit edge instructions for data blocks (DI)"),
+        CH_0x0315(0X0315,"Memory bit edge instructions for local data (L)"),
+        CH_0x0316(0X0316,"Dynamic evaluation of the FC bit"),
+        CH_0x0317(0X0317,"Dynamic local data area with the corresponding instructions"),
+        CH_0x0318(0X0318,"Reserved"),
+        CH_0x0319(0X0319,"Reserved"),
+        
+        CH_0x0401(0X0401,"SFC 87 \"C_DIAG\" is available"),
+        CH_0x0402(0X0402,"SFC 88 \"C_CNTRL\" is available)");
+
+        private int code;
+        private String description;
+
+        private static final Map<Integer, CPU_CHARACTERISTICS > map;
+
+        static {
+            map = new HashMap<>();
+            for (CPU_CHARACTERISTICS  cpuc : CPU_CHARACTERISTICS.values()) {
+                map.put(cpuc.code, cpuc);
+            }
+        }         
+        
+        CPU_CHARACTERISTICS(final int code, final String description){
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getCode(){
+            return code;
+        }
+
+        public String getDescription(){
+            return description;
+        }
+
+        public static CPU_CHARACTERISTICS valueOf(int code) {
+            return map.get(code);
+        }            
+        
+        
+    }    
+            
+    /**
+     *
+     */
+    public enum SSL {
+    ID_0x0011(0x0011,"Module identification."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY11(data);
+        }  
+        
+    },
+    ID_0x0012(0x0012,"CPU characteristics ."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY12(data);
+        }
+        
+    },
+    ID_0x0013(0x0013,"User memory areas."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY13(data);
+        }
+        
+    },
+    ID_0x0014(0x0014,"System areas."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY14(data);
+        }
+        
+    },
+    ID_0x0015(0x0015,"Block types."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY15(data);
+        }
+        
+    },
+    ID_0x001C(0x001C,"Component identification."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY1C(data);
+        }
+        
+    },    
+    ID_0x0022(0x0022,"Interrupt status."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY22(data);
+        }
+        
+    },
+    ID_0x0025(0x0025,"Assignment between process image partitions and OBs."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY25(data);
+        }
+        
+    },
+    ID_0x0032(0x0032,"Communication status data."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY32(data);
+        }
+        
+    },
+    ID_0x0071(0x0071,"H CPU group information."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY71(data);
+        }
+        
+    },
+    ID_0x0074(0x0074,"Status of the module LEDs."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY74(data);
+        }
+        
+    },
+    ID_0x0075(0x0075,"Switched DP slaves in the H-system."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY75(data);
+        }
+        
+    },
+    ID_0x0090(0x0090,"DP Master System Information."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY90(data);
+        }
+        
+    },    
+    ID_0x0091(0x0091,"Module status information."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY91(data);
+        }
+        
+    },
+    ID_0x0092(0x0092,"Rack / station status information."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY92(data);
+        }
+        
+    },
+    ID_0x0094(0x0094,"Rack / station status information."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY94(data);
+        }
+        
+    },    
+    ID_0x0095(0x0095,"Extended DP master system / PROFINET IO system information."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY95(data);
+        }
+        
+    },
+    ID_0x0096(0x0096,"Module status information, PROFINET IO and PROFIBUS DP."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY96(data);
+        }
+        
+    },
+    ID_0x009C(0x009C,"Tool changer information (PROFINET IO)."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXY9C(data);
+        }
+        
+    },
+    ID_0x00A0(0x00A0,"Diagnostic buffer of the CPU."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXYA0(data);
+        }
+        
+    },
+    ID_0x00B1(0x00B1,"Module diagnostic information (data record 0) ."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXYB1(data);
+        }
+        
+    },
+    ID_0x00B2(0x00B2,"Module diagnostic information (data record 1),geographical address."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXYB2(data);
+        }
+        
+    },
+    ID_0x00B3(0x00B3,"Module diagnostic information (data record 1),logical address."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXYB3(data);
+        }
+        
+    },
+    ID_0x00B4(0x00B4,"Diagnostic data of a DP slave."){
+        @Override
+        public StringBuilder execute(ByteBuf data) {
+            return ID_0xXYB4(data);
+        }
+        
+    };
+
+    private int code;
+    private String description;
+    
+    private static final Map<Integer, SSL> map;
+    
+    static {
+        map = new HashMap<>();
+        for (SSL subssl : SSL.values()) {
+            map.put(subssl.code, subssl);
+        }
+    }    
+    
+    SSL(final int code, final String description){
+        this.code = code;
+        this.description = description;
+    }
+    
+    public int getCode(){
+        return code;
+    }
+    
+    public String getDescription(){
+        return description;
+    }
+    
+    public static SSL valueOf(int code) {
+        return map.get(code);
+    }    
+    
+    public abstract StringBuilder execute(ByteBuf data);
+    
+    private static StringBuilder ID_0xXY11(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        int ssl_length = data.readShort();
+        int ssl_count = data.readShort();
+        try {
+            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");
+            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");
+            for (int i=1; i <= ssl_count; i++){
+                sb.append("Data Record: ").append(i).append("\r\n");
+
+                sb.append("Index: ").append(data.readShort()).append("\r\n");
+                byte[] bytestr = new byte[20];
+                data.readBytes(bytestr, 0, 20);
+                sb.append("Mlfb (Order number): ").append(new String(bytestr)).append("\r\n");
+                sb.append("BGTyp (Moduler type ID): ").append(data.readShort()).append("\r\n");                
+                sb.append("Ausbg (Version of the module/hardware version): ").append(data.readShort()).append("\r\n");
+                sb.append("Ausbe (Firmware version): ").append(data.readShort()).append("\r\n");
+            }
+        } catch (Exception ex){
+            sb.append(ex.toString());
+        }
+        return sb;
+    }    
+    
+    private static StringBuilder ID_0xXY12(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        int ssl_length = data.readShort();
+        int ssl_count = data.readShort();
+        try {
+            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");
+            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");
+            for (int i=1; i <= ssl_count; i++){
+                sb.append("Data Record: ").append(i).append("\r\n");
+                int code = data.readShort();
+                sb.append(CPU_CHARACTERISTICS.valueOf(code)).append(": ").
+                        append(CPU_CHARACTERISTICS.valueOf(code).getDescription()).append("\r\n");
+            }
+        } catch (Exception ex){
+            sb.append(ex.toString());
+        }
+        return sb;
+    }        
+    
+    private static StringBuilder ID_0xXY13(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        int ssl_length = data.readShort();
+        int ssl_count = data.readShort();
+        try {
+            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");
+            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");
+            for (int i=1; i <= ssl_count; i++){
+                sb.append("Data Record: ").append(i).append("\r\n");
+                sb.append("Index: ").append(data.readShort()).append("\r\n");
+                int code = data.readShort();
+                int size = data.readInt();
+                int mode = data.readShort();
+                int granu = data.readShort();
+                int ber1 = data.readInt();
+                int be1egt1 = data.readInt();
+                int block1 = data.readInt();
+                int ber2 = data.readInt();
+                int be1egt2 = data.readInt();
+                int block2 = data.readInt();
+                
+                switch(code){
+                    case 0x0001:sb.append("Code (Memory Type): ").append("Volatile memory (RAM)\r\n");
+                        break;
+                    case 0x0002:sb.append("Code (Memory Type): ").append("Non-volatile memory (FEPROM)\r\n");
+                        break;
+                    case 0x0003:sb.append("Code (Memory Type): ").append("mixed memory (RAM + FEPROM)\r\n");
+                        break;
+                }
+                sb.append("Size (Total size of the selected memory (total of area 1 and area 2)): ").append(size).append("\r\n"); 
+                
+                sb.append("Mode (Volatile memory area): ").append(((mode & 0x0001) != 0)).append("\r\n"); 
+                sb.append("Mode (Non-volatile memory area): ").append(((mode & 0x0002) != 0)).append("\r\n"); 
+                sb.append("Mode (Mixed memory area): ").append(((mode & 0x0004) != 0)).append("\r\n"); 
+                sb.append("Mode (Code and data separate): ").append(((mode & 0x0008) != 0)).append("\r\n");
+                sb.append("Mode (Code and data together): ").append(((mode & 0x0010) != 0)).append("\r\n");
+                
+                sb.append("Granu (Always zero): ").append(granu).append("\r\n"); 
+                
+                sb.append("Ber1 (Size of the volatile memory area in bytes): ").append(ber1).append("\r\n");  
+                sb.append("Belegt1 (Size of the volatile memory area being used): ").append(be1egt1).append("\r\n");
+                sb.append("Block1 (Largest free block in the volatile memory area): ").append(block1).append("\r\n");
+                
+                sb.append("Ber2 (Size of the non-volatile memory area in bytes): ").append(ber2).append("\r\n");  
+                sb.append("Belegt2 (Size of the non-volatile memory area being used): ").append(be1egt2).append("\r\n");
+                sb.append("Block2 (Largest free block in the non-volatile memory area): ").append(block2).append("\r\n");                
+                               
+            }
+        } catch (Exception ex){
+            sb.append(ex.toString());
+        }
+        return sb;
+    }        
+     
+    private static StringBuilder ID_0xXY14(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        int ssl_length = data.readShort();
+        int ssl_count = data.readShort();
+        try {
+            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");
+            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");
+            for (int i=1; i <= ssl_count; i++){
+                int index = data.readShort(); 
+                int code = data.readShort();
+                int quantity = data.readShort();
+                int reman = data.readShort();
+                
+                sb.append("Data Record: ").append(i).append("\r\n");
+                sb.append("Index: ").append(index).append(" System area: ");
+                switch(index) {
+                    case 0x0001: sb.append("PII (number in bytes)").append("\r\n");
+                        break;
+                    case 0x0002: sb.append("PIQ (number in bytes))").append("\r\n");
+                        break;
+                    case 0x0003: sb.append("memory (number in bits)").append("\r\n");
+                        break;
+                    case 0x0004: sb.append("timers (number)").append("\r\n");
+                        break;
+                    case 0x0005: sb.append("counter (number)").append("\r\n");
+                        break;
+                    case 0x0006: sb.append("number of bytes in the logical address area)").append("\r\n");
+                        break;
+                    case 0x0007: sb.append("local data (entire local data area of the CPU in bytes)").append("\r\n");
+                        break;
+                    case 0x0008: sb.append("memory (number in bytes)").append("\r\n");
+                        break;
+                    case 0x0009: sb.append("local data (entire local data area of the CPU in Kbytes)").append("\r\n");
+                        break;                        
+                }
+                sb.append("Code: ").append(code).append(" Memory type: ");
+                switch(code) {
+                    case 0x0001: sb.append("volatile memory (RAM)").append("\r\n");
+                        break;
+                    case 0x0002: sb.append("non-volatile memory (FEPROM)").append("\r\n");
+                        break; 
+                    case 0x0003: sb.append("mixed memory (RAM and FEPROM)").append("\r\n");
+                        break;                        
+                }
+                sb.append("Quantity: ").append(quantity).append("\r\n");
+                sb.append("Reman: ").append(reman).append("\r\n");
+            }
+        } catch (Exception ex){
+            sb.append(ex.toString());
+        }
+        return sb;
+    }    
+       
+    private static StringBuilder ID_0xXY15(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        int ssl_length = data.readShort();
+        int ssl_count = data.readShort();
+        try {
+            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");;
+            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");;
+
+            for (int i=1; i <= ssl_count; i++){
+                sb.append("Data Record: ").append(i).append("\r\n");
+                int type = data.readShort();
+                switch(type){
+                    case 0x0800: sb.append("Block type: OB\r\n");
+                        break;
+                    case 0x0A00: sb.append("Block type: DB\r\n");
+                        break;
+                    case 0x0B00: sb.append("Block type: SDB\r\n");
+                        break;
+                    case 0x0C00: sb.append("Block type: FC\r\n");
+                        break;
+                    case 0x0E00: sb.append("Block type: FB\r\n");
+                        break;
+                    default: 
+                } 
+                sb.append("Maximum number of blocks of the type: ").append(data.readShort()).append("\r\n"); ;           
+                sb.append("Maximum total size of the object to be loaded in Kbytes: ").append(data.readShort()).append("\r\n"); ;
+                sb.append("Maximum length of the work memory part of a block in bytes: ").append(data.readInt()).append("\r\n"); ;                
+            }
+        } catch (Exception ex){
+            sb.append(ex.toString());
+        }
+        return sb;
+    }
+          
+    private static StringBuilder ID_0xXY1C(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        int ssl_length = data.readShort();
+        int ssl_count = data.readShort();
+       try {
+            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");;
+            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");;
+
+            for (int i=1; i <= ssl_count; i++){
+                sb.append("Data Record: ").append(i).append("\r\n");
+                int index = data.getShort(data.readerIndex());
+                int index_b0 = data.readByte();
+                int index_b1 = data.readByte();
+                sb.append("Index: ").append(index).append("\r\n");                
+                sb.append("Index b1: ").append(index_b1).append("\r\n");
+                
+                switch(index_b1){
+                    case 0x01: 
+                    case 0x02: { 
+                        byte[] strbyte = new byte[24];
+                        data.readBytes(strbyte, 0, 24);
+                        sb.append("Name: ").append(new String(strbyte)).append("\r\n");
+                        ByteBuf  data2 = data.readSlice(8);   
+                        sb.append("Reserved: ").append(ByteBufUtil.hexDump(data2)).append("\r\n");                      
+                    };
+                        break;                        
+                    case 0x03: {
+                        byte[] strbyte = new byte[32];                        
+                        data.readBytes(strbyte, 0, 32);
+                        sb.append("Tag: ").append(new String(strbyte)).append("\r\n");                        
+                    };
+                        break;                        
+                    case 0x04: {
+                        byte[] strbyte = new byte[26];                        
+                        data.readBytes(strbyte, 0, 26);
+                        sb.append("Copyright: ").append(new String(strbyte)).append("\r\n");   
+                        ByteBuf  data2 = data.readSlice(6);   
+                        sb.append("Reserved: ").append(ByteBufUtil.hexDump(data2)).append("\r\n");                     
+                    };
+                        break;                        
+                    case 0x05: {
+                        byte[] strbyte = new byte[24];                        
+                        data.readBytes(strbyte, 0, 24);
+                        sb.append("Serial: ").append(new String(strbyte)).append("\r\n");   
+                        ByteBuf  data2 = data.readSlice(8);   
+                        sb.append("Reserved: ").append(ByteBufUtil.hexDump(data2)).append("\r\n");                         
+                    };
+                        break;                        
+                    case 0x06: {
+                        
+                    };
+                        break;                        
+                    case 0x07: {
+                        byte[] strbyte = new byte[32];                        
+                        data.readBytes(strbyte, 0, 32);
+                        sb.append("Cpu type: ").append(new String(strbyte)).append("\r\n");                          
+                    };
+                        break;                        
+                    case 0x08: {
+                        byte[] strbyte = new byte[32];                        
+                        data.readBytes(strbyte, 0, 32);
+                        sb.append("Serial mc/mmc: ").append(new String(strbyte)).append("\r\n");                         
+                    };
+                        break;                        
+                    case 0x09: {
+                        sb.append("Manufacturer ID: ").append(data.readShort()).append("\r\n");  
+                        sb.append("Profile ID: ").append(data.readShort()).append("\r\n");   
+                        sb.append("Profile specific type: ").append(data.readShort()).append("\r\n");
+                        ByteBuf  data2 = data.readSlice(26);
+                        sb.append("Reserved: ").append(ByteBufUtil.hexDump(data2)).append("\r\n");                        
+                    };
+                        break;                        
+                    case 0x0A: {
+                        byte[] strbyte = new byte[26];                        
+                        data.readBytes(strbyte, 0, 26);
+                        sb.append("OEM copyright: ").append(new String(strbyte)).append("\r\n");                        
+                        sb.append("OEM ID: ").append(data.readShort()).append("\r\n");
+                        sb.append("OEM add ID: ").append(data.readInt()).append("\r\n");
+                    };
+                        break;                        
+                    case 0x0B: {
+                        byte[] strbyte = new byte[32];                        
+                        data.readBytes(strbyte, 0, 32);
+                        sb.append("Location ID: ").append(new String(strbyte)).append("\r\n");                         
+                    };
+                        break;                        
+                    case 0x0C: {
+                        byte[] strbyte = new byte[10];                        
+                        data.readBytes(strbyte, 0, 10);
+                        sb.append("Order number sync module 1: ").append(new String(strbyte)).append("\r\n"); 
+                        data.readShort();
+                        byte[] strbyte2 = new byte[2]; 
+                        data.readBytes(strbyte2, 0, 2);
+                        sb.append("Product version: ").append(new String(strbyte2)).append("\r\n");                         
+                        data.readByte();
+                        ByteBuf  data2 = data.readSlice(17);
+                        sb.append("Vendor serial: ").append(ByteBufUtil.hexDump(data2)).append("\r\n");                         
+                    };
+                        break;                        
+                    case 0x0D: {
+                        byte[] strbyte = new byte[10];                        
+                        data.readBytes(strbyte, 0, 10);
+                        sb.append("Order number sync module 2: ").append(new String(strbyte)).append("\r\n"); 
+                        data.readShort();
+                        byte[] strbyte2 = new byte[2]; 
+                        data.readBytes(strbyte2, 0, 2);
+                        sb.append("Product version: ").append(new String(strbyte2)).append("\r\n");                         
+                        data.readByte();
+                        ByteBuf  data2 = data.readSlice(17);                        
+                        sb.append("Vendor serial: ").append(ByteBufUtil.hexDump(data2)).append("\r\n");                        
+                    };
+                        break;                        
+                    case 0x0E: {
+                        byte[] strbyte = new byte[18];                        
+                        data.readBytes(strbyte, 0, 18);
+                        sb.append("Serial number: ").append(new String(strbyte)).append("\r\n"); 
+                        ByteBuf  data2 = data.readSlice(14); 
+                        sb.append("Reserved: ").append(ByteBufUtil.hexDump(data2)).append("\r\n");                         
+                    };
+                        break;                        
+                }
+                
+            }
+        } catch (Exception ex){
+            sb.append(ex.toString());
+        }        
+        return sb;
+    }      
+    
+    private static StringBuilder ID_0xXY22(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        int ssl_length = data.readShort();
+        int ssl_count = data.readShort();        
+        
+        try {
+            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");;
+            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");;
+
+            for (int i=1; i <= ssl_count; i++){
+                sb.append("Data Record: ").append(i).append("\r\n");
+                ByteBuf  infobytes = data.readSlice(20);
+                short al1 = data.readShort();
+                short al2 = data.readShort();
+                int al3  = data.readInt();
+                sb.append("Info: ").append(ByteBufUtil.hexDump(infobytes)).append("\r\n");
+                sb.append("al 1: ").append(Integer.toHexString(al1)).append("\r\n");
+                sb.append("al 2: ").append(Integer.toHexString(al2)).append("\r\n");
+                sb.append("al 3: ").append(Integer.toHexString(al3)).append("\r\n");
+            }        
+        }catch (Exception ex){
+            sb.append(ex.toString());
+        }        
+        return sb;
+
+    }   
+    
+    private static StringBuilder ID_0xXY25(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    } 
+    
+    private static StringBuilder ID_0xXY32(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }     
+    
+    private static StringBuilder ID_0xXY71(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }     
+
+    private static StringBuilder ID_0xXY74(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        int ssl_length = data.readShort();
+        int ssl_count = data.readShort();
+        try {
+            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");
+            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");
+            for (int i=1; i <= ssl_count; i++){
+                sb.append("Data Record: ").append(i).append("\r\n");
+                int cpu_type = data.readByte();
+                int led_id = data.readByte();
+                boolean led_onoff = (data.readByte() != 0x00);
+                int led_flashing = data.readByte();
+                
+                sb.append("Rack number: ").append((cpu_type & 0x07)).append("\r\n");
+                sb.append("CPU Type: ").append((cpu_type & 0x08) == 0x00?"Standby":"Master").append("\r\n");
+                sb.append("LED ID: ").append(LED_ID.valueOf(led_id)).append(" (").append(LED_ID.valueOf(led_id).description).append(")\r\n");
+                sb.append("LED status: ").append(led_onoff).append("\r\n");
+                switch(led_flashing){
+                    case 0x00: sb.append("LED flashing: not.").append("\r\n");
+                        break; 
+                    case 0x01: sb.append("LED blinking: normally (2 Hz).").append("\r\n");
+                        break;
+                    case 0x02: sb.append("LED blinking: slowly (0.5 Hz).").append("\r\n");
+                        break;
+                    default: sb.append("LED blinking: no information.").append("\r\n");
+                }
+            }
+        } catch (Exception ex){
+            sb.append(ex.toString());
+        }
+        return sb;
+    }  
+    
+    private static StringBuilder ID_0xXY75(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }      
+    
+    private static StringBuilder ID_0xXY90(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }     
+    
+    private static StringBuilder ID_0xXY91(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }   
+    
+    private static StringBuilder ID_0xXY92(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }  
+
+    private static StringBuilder ID_0xXY94(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }     
+    
+    private static StringBuilder ID_0xXY95(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }   
+    
+    private static StringBuilder ID_0xXY96(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }      
+    
+    private static StringBuilder ID_0xXY9C(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }      
+    
+    private static StringBuilder ID_0xXYA0(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        int ssl_length = data.readShort();
+        int ssl_count = data.readShort(); 
+        
+        try{
+            sb.append("SSL partial list length in bytes: ").append(ssl_length).append("\r\n");
+            sb.append("SSL partial list count: ").append(ssl_count).append("\r\n");
+            int i = 1;
+            while(data.isReadable()){
+                sb.append("Data Record: ").append(i).append("\r\n");
+                Short  id = data.readShort();
+  
+                sb.append("ID: ").append(id).append("\r\n");  
+                ByteBuf infobytes = data.readSlice(10);
+                sb.append("Info: ").append(ByteBufUtil.hexDump(infobytes)).append("\r\n");
+                infobytes = data.readSlice(8);
+                sb.append("Timestamp: ").append(readDateAndTime(infobytes).toString()).append("\r\n");
+                sb.append("Desc: ").append(S7DiagnosticEventId.valueOf(id).getDescription()).append("\r\n");
+                i++;
+            }
+        } catch (Exception ex){
+            sb.append(ex.toString());
+        }        
+
+        return sb;
+    }      
+    
+    private static StringBuilder ID_0xXYB1(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }  
+
+    private static StringBuilder ID_0xXYB2(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }  
+
+    private static StringBuilder ID_0xXYB3(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }  
+
+    private static StringBuilder ID_0xXYB4(ByteBuf data){
+        StringBuilder sb = new StringBuilder();
+        sb.append("It is not implemeted yet!");
+        return sb;
+    }      
+    
+    /*
+     * Date and time of day (BCD coded).
+     *          +----------------+
+     * Byte n   | Year   0 to 99 |
+     *          +----------------+
+     * Byte n+1 | Month  1 to 12 |
+     *          +----------------+
+     * Byte n+2 | Day    1 to 31 |    
+     *          +----------------+
+     * Byte n+3 | Hour   0 to 23 |    
+     *          +----------------+  
+     * Byte n+4 | Minute 0 to 59 |  
+     *          +----------------+
+     * Byte n+5 | Second 0 to 59 |     
+     *          +----------------+
+     * Byte n+6 | ms    0 to 999 |
+     * Byte n+7 | X X X X X D O W|    
+     *          +----------------+    
+     * DOW: Day of weed (last 3 bits)
+    */
+    private static LocalDateTime readDateAndTime(ByteBuf data) {
+        //from Plc4XS7Protocol
+        int year=convertByteToBcd(data.readByte());
+        byte themonth = data.readByte();
+        int month=convertByteToBcd(themonth==0x00?0x01:themonth);
+        byte theday = data.readByte();
+        int day=convertByteToBcd(theday==0x00?0x01:theday);
+        int hour=convertByteToBcd(data.readByte());
+        int minute=convertByteToBcd(data.readByte());
+        int second=convertByteToBcd(data.readByte());        
+        int milliseconds = (data.readShort() & 0xfff0) >> 4;
+        
+        int cen = ((milliseconds & 0x0f00) >> 8) * 100;
+        int dec = ((milliseconds & 0x00f0) >> 4) * 10;
+        milliseconds = cen + dec + (milliseconds & 0x000f);
+        int nanoseconds = milliseconds * 1000000;
+        
+        //data-type ranges from 1990 up to 2089
+        if(year>=90){
+            year+=1900;
+        }
+        else{
+            year+=2000;
+        }
+        
+        return LocalDateTime.of(year,month,day,hour,minute,second, nanoseconds);
+    }    
+  
+    
+   /**
+     * converts incoming byte to an integer regarding used BCD format
+     * @param incomingByte
+     * @return converted BCD number
+     */
+    private static int convertByteToBcd(byte incomingByte) {
+        int dec = (incomingByte >> 4) * 10;
+        return dec + (incomingByte & 0x0f);
+    }  
+    
+   /**
+     * converts incoming Short to an integer regarding used BCD format
+     * @param incomingShort
+     * @return converted BCD number
+     */
+    private static short convertShortToBcd(short incomingShort) {
+        
+        short res =(short)  ((incomingShort >> 8) * 100 +
+                            (incomingShort >> 4) * 10 +
+                            (incomingShort & 0x0f));
+        return res;
+    }      
+        
+ }
+    
+    /*
+    *
+    */
+    public static Duration S5TimeToDuration(Short data) {
+        Duration res;
+        short t = data;
+        long tv = (short)(((t & 0x000F))+((t & 0x00F0)>>4)*10+((t & 0x0F00) >> 8)*100);       
+        long tb = (short)(10*Math.pow(10,((t & 0xF000) >> 12)));
+        long totalms = tv*tb;
+        if (totalms <= 9990000 ){
+            res = Duration.ofMillis(totalms);
+        } else {
+            res = Duration.ofMillis(9990000);
+        }            
+        return res;
+    }
+    
+    /*
+    * 
+    */
+    public static Short DurationToS5Time(Duration data) {
+        short tv = 0;
+        short tb = 0x0000_0000;
+        short s5time = 0x0000;
+        long totalms = data.toMillis();
+        
+        if ((totalms >= 0) && (totalms <= 9990000)) {
+            
+            if ((totalms>=0) && ((totalms<=9990))){
+                tb = 0x0000_0000; //10 ms
+                tv = (short)(totalms / 10);                
+            } else  if ((totalms>9990) && ((totalms<=99900))){                 
+                tb = 0x0000_0001;// 100 ms
+                tv = (short)(totalms / 100);
+            } else if ((totalms>99900) && ((totalms<=999000))){
+                tb = 0x0000_0002;//1000 ms
+                tv = (short)(totalms / 1000);                
+            } else if ((totalms>999000) && ((totalms<=9990000))){
+                tb = 0x0000_0003;//10000 ms
+                tv = (short)(totalms / 10000);                
+            }            
+           
+            short uni = (short)(tv % 10);
+            short dec = (short)((tv / 10) % 10);
+            short cen = (short)((tv / 100) % 10);
+
+            s5time = (short)(((tb)<<12) | (cen << 8) | (dec << 4) | (uni));
+        }
+        return s5time;
+    }   
+
+    public static Duration S7TimeToDuration(Integer data) {
+        Duration res = Duration.ZERO;
+        if (data>= 0){
+            res = res.plusMillis((long) data);
+        } else {
+            long ms = 0x8000_0000  - (data & 0x8000_0000);
+            res = res.minusMillis((long) data);
+        }
+        
+        return res;
+    }  
+    
+    public static Integer DurationToS7Time(Duration data) {
+        Integer res = 0x0000_0000;
+        if (data.isNegative()){
+            res = (int) data.toMillis() + 0x8000_0000;
+        } else {
+            res = (int) data.toMillis();            
+        }
+        return res;
+    } 
+
+    public static LocalTime S7TodToLocalTime(Integer data) {
+        if (data > 0x0526_5bff) data=0x0526_5bff;
+        if (data < 0) data=0x0000_0000;
+        LocalTime res = LocalTime.MIDNIGHT.plusNanos((long)data*1_000_000);
+        return res;
+    }  
+
+    public static Integer LocalTimeToS7Tod(LocalTime data) {        
+        return (int)(data.toNanoOfDay() / 1_000_000);
+    }
+    
+    public static LocalDate S7DateToLocalDate(Short data) {
+        LocalDate res = LocalDate.of(1990, 1, 1);
+        res = res.plusDays((long) data);
+        return res;
+    }
+    
+    public static Short LocalDateToS7Date(LocalDate data) {
+        LocalDate ini = LocalDate.of(1990, 1, 1);
+        long resl  = ChronoUnit.DAYS.between(ini, data);
+        short res = (short) resl;
+        return res;
+    }  
+    
+    /*
+     * Date and time of day (BCD coded).
+     *          +----------------+
+     * Byte n   | Year   0 to 99 |
+     *          +----------------+
+     * Byte n+1 | Month  1 to 12 |
+     *          +----------------+
+     * Byte n+2 | Day    1 to 31 |    
+     *          +----------------+
+     * Byte n+3 | Hour   0 to 23 |    
+     *          +----------------+  
+     * Byte n+4 | Minute 0 to 59 |  
+     *          +----------------+
+     * Byte n+5 | Second 0 to 59 |     
+     *          +----------------+
+     * Byte n+6 | ms    0 to 999 |
+     * Byte n+7 | X X X X X D O W|    
+     *          +----------------+    
+     * DOW: Day of weed (last 3 bits)
+    */
+    public static LocalDateTime S7DateTimeToLocalDateTime(ByteBuf data) {
+        //from Plc4XS7Protocol
+        int year=   byteBCDToInt(data.readByte());       
+        int month=  byteBCDToInt(data.readByte());
+        int day =   byteBCDToInt(data.readByte());
+        int hour=   byteBCDToInt(data.readByte());
+        int minute= byteBCDToInt(data.readByte());
+        int second= byteBCDToInt(data.readByte());   
+        int millih= byteBCDToInt(data.readByte()) * 10;
+        
+        int milll= (data.readByte() >> 4);
+         
+        int milliseconds = millih + milll;
+        int nanoseconds = milliseconds * 1000000;
+        //At this point a dont need the day of week
+        //data-type ranges from 1990 up to 2089
+        if(year>=90){
+            year+=1900;
+        }
+        else{
+            year+=2000;
+        }
+        
+        return LocalDateTime.of(year,month,day,hour,minute,second, nanoseconds);
+    }    
+  
+    public static byte[] LocalDateTimeToS7DateTime(LocalDateTime data) {
+        byte[] res = new byte[8];
+        
+        res[0] = convertByteToBcd((data.getYear() % 100));
+        res[1] = convertByteToBcd(data.getMonthValue());
+        res[2] = convertByteToBcd(data.getDayOfMonth());
+        res[3] = convertByteToBcd(data.getHour());
+        res[4] = convertByteToBcd(data.getMinute());
+        res[5] = convertByteToBcd(data.getSecond());
+        
+        long ms = (long)(data.getNano() / 1_000_000);
+        res[6] = (byte)((int)(((ms / 100) << 4) | ((ms / 10)%10))) ;
+        //Java:1 (Monday) to 7 (Sunday)->S7:1 (Sunday) to 7 (Saturday)        
+        byte dayofweek = (byte)((data.getDayOfWeek().getValue()<7)?
+                                data.getDayOfWeek().getValue()+1:
+                                (byte)0x01);
+        res[7] = (byte)(((ms % 10) << 4) | ((byte)(dayofweek)));
+                
+        return res;
+    }
+   
+    
+   /**
+     * converts incoming byte to an integer regarding used BCD format
+     * @param incomingByte
+     * @return converted BCD number
+     */
+    private static byte convertByteToBcd(int incomingByte) {
+        byte dec = (byte)((incomingByte / 10) % 10);
+        return (byte)((dec << 4) | (incomingByte % 10));
+    } 
+
+    private static int byteBCDToInt(byte bcd){
+        int res=(bcd>>4)*10 + (bcd & 0x0f);
+        return res;
+    }
+    
+    public static PlcResponseCode decodeResponseCode(DataTransportErrorCode dataTransportErrorCode) {
+        if (dataTransportErrorCode == null) {
+            return PlcResponseCode.INTERNAL_ERROR;
+        }
+        switch (dataTransportErrorCode) {
+            case OK:
+                return PlcResponseCode.OK;
+            case NOT_FOUND:
+                return PlcResponseCode.NOT_FOUND;
+            case INVALID_ADDRESS:
+                return PlcResponseCode.INVALID_ADDRESS;
+            case DATA_TYPE_NOT_SUPPORTED:
+                return PlcResponseCode.INVALID_DATATYPE;
+            case ACCESS_DENIED:
+                return PlcResponseCode.ACCESS_DENIED;
+            default:
+                return PlcResponseCode.INTERNAL_ERROR;
+        }
+    }    
+    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7ParamErrorCode.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7ParamErrorCode.java
index 9fe86d25e0f..79ada36d3b1 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7ParamErrorCode.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7ParamErrorCode.java
@@ -1,276 +1,276 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.s7.utils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- *
- * @author cgarcia
- */
-public enum S7ParamErrorCode {
-
-    ERROR_0x0000((short) 0x0000, "No error"),
-    ERROR_0x0110((short) 0x0110, "Invalid block number"),
-    ERROR_0x0111((short) 0x0111, "Invalid request length"),
-    ERROR_0x0112((short) 0x0112, "Invalid parameter"),
-    ERROR_0x0113((short) 0x0113, "Invalid block type"),
-    ERROR_0x0114((short) 0x0114, "Block not found"),
-    ERROR_0x0115((short) 0x0115, "Block already exists"),
-    ERROR_0x0116((short) 0x0116, "Block is write-protected"),
-    ERROR_0x0117((short) 0x0117, "The block/operating system update is too large"),
-    ERROR_0x0118((short) 0x0118, "Invalid block number"),
-    ERROR_0x0119((short) 0x0119, "Incorrect password entered"),
-    ERROR_0x011A((short) 0x011A, "PG resource error"),
-    ERROR_0x011B((short) 0x011B, "PLC resource error"),
-    ERROR_0x011C((short) 0x011C, "Protocol error"),
-    ERROR_0x011D((short) 0x011D, "Too many blocks (module-related restriction)"),
-    ERROR_0x011E((short) 0x011E, "There is no longer a connection to the database, or S7DOS handle is invalid"),
-    ERROR_0x011F((short) 0x011F, "Result buffer too small"),
-    ERROR_0x0120((short) 0x0120, "End of block list"),
-    ERROR_0x0140((short) 0x0140, "Insufficient memory available"),
-    ERROR_0x0141((short) 0x0141, "Job cannot be processed because of a lack of resources"),
-    ERROR_0x8001((short) 0x8001, "The requested service cannot be performed while the block is in the current status"),
-    ERROR_0x8003((short) 0x8003, "S7 protocol error: Error occurred while transferring the block"),
-    ERROR_0x8100((short) 0x8100, "Application, general error: Service unknown to remote module"),
-    ERROR_0x8104((short) 0x8104, "This service is not implemented on the module or a frame error was reported"),
-    ERROR_0x8204((short) 0x8204, "The type specification for the object is inconsistent"),
-    ERROR_0x8205((short) 0x8205, "A copied block already exists and is not linked"),
-    ERROR_0x8301((short) 0x8301, "Insufficient memory space or work memory on the module, or specified storage medium not accessible"),
-    ERROR_0x8302((short) 0x8302, "Too few resources available or the processor resources are not available"),
-    ERROR_0x8304((short) 0x8304, "No further parallel upload possible. There is a resource bottleneck"),
-    ERROR_0x8305((short) 0x8305, "Function not available"),
-    ERROR_0x8306((short) 0x8306, "Insufficient work memory (for copying, linking, loading AWP)"),
-    ERROR_0x8307((short) 0x8307, "Not enough retentive work memory (for copying, linking, loading AWP)"),
-    ERROR_0x8401((short) 0x8401, "S7 protocol error: Invalid service sequence (for example, loading or uploading a block)"),
-    ERROR_0x8402((short) 0x8402, "Service cannot execute owing to status of the addressed object"),
-    ERROR_0x8404((short) 0x8404, "S7 protocol: The function cannot be performed"),
-    ERROR_0x8405((short) 0x8405, "Remote block is in DISABLE state (CFB). The function cannot be performed"),
-    ERROR_0x8500((short) 0x8500, "S7 protocol error: Wrong frames"),
-    ERROR_0x8503((short) 0x8503, "Alarm from the module: Service canceled prematurely"),
-    ERROR_0x8701((short) 0x8701, "Error addressing the object on the communications partner (for example, area length error)"),
-    ERROR_0x8702((short) 0x8702, "The requested service is not supported by the module"),
-    ERROR_0x8703((short) 0x8703, "Access to object refused"),
-    ERROR_0x8704((short) 0x8704, "Access error: Object damaged"),
-    ERROR_0xD001((short) 0xD001, "Protocol error: Illegal job number"),
-    ERROR_0xD002((short) 0xD002, "Parameter error: Illegal job variant"),
-    ERROR_0xD003((short) 0xD003, "Parameter error: Debugging function not supported by module"),
-    ERROR_0xD004((short) 0xD004, "Parameter error: Illegal job status"),
-    ERROR_0xD005((short) 0xD005, "Parameter error: Illegal job termination"),
-    ERROR_0xD006((short) 0xD006, "Parameter error: Illegal link disconnection ID"),
-    ERROR_0xD007((short) 0xD007, "Parameter error: Illegal number of buffer elements"),
-    ERROR_0xD008((short) 0xD008, "Parameter error: Illegal scan rate"),
-    ERROR_0xD009((short) 0xD009, "Parameter error: Illegal number of executions"),
-    ERROR_0xD00A((short) 0xD00A, "Parameter error: Illegal trigger event"),
-    ERROR_0xD00B((short) 0xD00B, "Parameter error: Illegal trigger condition"),
-    ERROR_0xD011((short) 0xD011, "Parameter error in path of the call environment: Block does not exist"),
-    ERROR_0xD012((short) 0xD012, "Parameter error: Wrong address in block"),
-    ERROR_0xD014((short) 0xD014, "Parameter error: Block being deleted/overwritten"),
-    ERROR_0xD015((short) 0xD015, "Parameter error: Illegal tag address"),
-    ERROR_0xD016((short) 0xD016, "Parameter error: Test jobs not possible, because of errors in user program"),
-    ERROR_0xD017((short) 0xD017, "Parameter error: Illegal trigger number"),
-    ERROR_0xD025((short) 0xD025, "Parameter error: Invalid path"),
-    ERROR_0xD026((short) 0xD026, "Parameter error: Illegal access type"),
-    ERROR_0xD027((short) 0xD027, "Parameter error: This number of data blocks is not permitted"),
-    ERROR_0xD031((short) 0xD031, "Internal protocol error"),
-    ERROR_0xD032((short) 0xD032, "Parameter error: Wrong result buffer length"),
-    ERROR_0xD033((short) 0xD033, "Protocol error: Wrong job length"),
-    ERROR_0xD03F((short) 0xD03F, "Coding error: Error in parameter section (for example, reserve bytes not equal to 0)"),
-    ERROR_0xD041((short) 0xD041, "Data error: Illegal status list ID"),
-    ERROR_0xD042((short) 0xD042, "Data error: Illegal tag address"),
-    ERROR_0xD043((short) 0xD043, "Data error: Referenced job not found, check job data"),
-    ERROR_0xD044((short) 0xD044, "Data error: Illegal tag value, check job data"),
-    ERROR_0xD045((short) 0xD045, "Data error: Exiting the ODIS control is not allowed in HOLD"),
-    ERROR_0xD046((short) 0xD046, "Data error: Illegal measuring stage during run-time measurement"),
-    ERROR_0xD047((short) 0xD047, "Data error: Illegal hierarchy in 'Read job list'"),
-    ERROR_0xD048((short) 0xD048, "Data error: Illegal deletion ID in 'Delete job'"),
-    ERROR_0xD049((short) 0xD049, "Invalid substitute ID in 'Replace job'"),
-    ERROR_0xD04A((short) 0xD04A, "Error executing 'program status'"),
-    ERROR_0xD05F((short) 0xD05F, "Coding error: Error in data section (for example, reserve bytes not equal to 0, ...)"),
-    ERROR_0xD061((short) 0xD061, "Resource error: No memory space for job"),
-    ERROR_0xD062((short) 0xD062, "Resource error: Job list full"),
-    ERROR_0xD063((short) 0xD063, "Resource error: Trigger event occupied"),
-    ERROR_0xD064((short) 0xD064, "Resource error: Not enough memory space for one result buffer element"),
-    ERROR_0xD065((short) 0xD065, "Resource error: Not enough memory space for several  result buffer elements"),
-    ERROR_0xD066((short) 0xD066, "Resource error: The timer available for run-time measurement is occupied by another job"),
-    ERROR_0xD067((short) 0xD067, "Resource error: Too many 'modify tag' jobs active (in particular multi-processor operation)"),
-    ERROR_0xD081((short) 0xD081, "Function not permitted in current mode"),
-    ERROR_0xD082((short) 0xD082, "Mode error: Cannot exit HOLD mode"),
-    ERROR_0xD0A1((short) 0xD0A1, "Function not permitted in current protection level"),
-    ERROR_0xD0A2((short) 0xD0A2, "Function not possible at present, because a function is running that modifies memory"),
-    ERROR_0xD0A3((short) 0xD0A3, "Too many 'modify tag' jobs active on the I/O (in particular multi-processor operation)"),
-    ERROR_0xD0A4((short) 0xD0A4, "Forcing' has already been established"),
-    ERROR_0xD0A5((short) 0xD0A5, "Referenced job not found"),
-    ERROR_0xD0A6((short) 0xD0A6, "Job cannot be disabled/enabled"),
-    ERROR_0xD0A7((short) 0xD0A7, "Job cannot be deleted, for example because it is currently being read"),
-    ERROR_0xD0A8((short) 0xD0A8, "Job cannot be replaced, for example because it is currently being read or deleted"),
-    ERROR_0xD0A9((short) 0xD0A9, "Job cannot be read, for example because it is currently being deleted"),
-    ERROR_0xD0AA((short) 0xD0AA, "Time limit exceeded in processing operation"),
-    ERROR_0xD0AB((short) 0xD0AB, "Invalid job parameters in process operation"),
-    ERROR_0xD0AC((short) 0xD0AC, "Invalid job data in process operation"),
-    ERROR_0xD0AD((short) 0xD0AD, "Operating mode already set"),
-    ERROR_0xD0AE((short) 0xD0AE, "The job was set up over a different connection and can only be handled over this connection"),
-    ERROR_0xD0C1((short) 0xD0C1, "At least one error has been detected while accessing the tag(s)"),
-    ERROR_0xD0C2((short) 0xD0C2, "Change to STOP/HOLD mode"),
-    ERROR_0xD0C3((short) 0xD0C3, "At least one error was detected while accessing the tag(s). Mode change to STOP/HOLD"),
-    ERROR_0xD0C4((short) 0xD0C4, "Timeout during run-time measurement"),
-    ERROR_0xD0C5((short) 0xD0C5, "Display of block stack inconsistent, because blocks were deleted/reloaded"),
-    ERROR_0xD0C6((short) 0xD0C6, "Job was automatically deleted as the jobs it referenced have been deleted"),
-    ERROR_0xD0C7((short) 0xD0C7, "The job was automatically deleted because STOP mode was exited"),
-    ERROR_0xD0C8((short) 0xD0C8, "Block status' aborted because of inconsistencies between test job and running program"),
-    ERROR_0xD0C9((short) 0xD0C9, "Exit the status area by resetting OB90"),
-    ERROR_0xD0CA((short) 0xD0CA, "Exiting the status range by resetting OB90 and access error reading tags before exiting"),
-    ERROR_0xD0CB((short) 0xD0CB, "The output disable for the peripheral outputs has been activated again"),
-    ERROR_0xD0CC((short) 0xD0CC, "The amount of data for the debugging functions is restricted by the time limit"),
-    ERROR_0xD201((short) 0xD201, "Syntax error in block name"),
-    ERROR_0xD202((short) 0xD202, "Syntax error in function parameters"),
-    ERROR_0xD205((short) 0xD205, "Linked block already exists in RAM: Conditional copying is not possible"),
-    ERROR_0xD206((short) 0xD206, "Linked block already exists in EPROM: Conditional copying is not possible"),
-    ERROR_0xD208((short) 0xD208, "Maximum number of copied (not linked) blocks on module exceeded"),
-    ERROR_0xD209((short) 0xD209, "(At least) one of the given blocks not found on the module"),
-    ERROR_0xD20A((short) 0xD20A, "The maximum number of blocks that can be linked with one job was exceeded"),
-    ERROR_0xD20B((short) 0xD20B, "The maximum number of blocks that can be deleted with one job was exceeded"),
-    ERROR_0xD20C((short) 0xD20C, "OB cannot be copied because the associated priority class does not exist"),
-    ERROR_0xD20D((short) 0xD20D, "SDB cannot be interpreted (for example, unknown number)"),
-    ERROR_0xD20E((short) 0xD20E, "No (further) block available"),
-    ERROR_0xD20F((short) 0xD20F, "Module-specific maximum block size exceeded"),
-    ERROR_0xD210((short) 0xD210, "Invalid block number"),
-    ERROR_0xD212((short) 0xD212, "Incorrect header attribute (run-time relevant)"),
-    ERROR_0xD213((short) 0xD213, "Too many SDBs. Note the restrictions on the module being used"),
-    ERROR_0xD216((short) 0xD216, "Invalid user program - reset module"),
-    ERROR_0xD217((short) 0xD217, "Protection level specified in module properties not permitted"),
-    ERROR_0xD218((short) 0xD218, "Incorrect attribute (active/passive)"),
-    ERROR_0xD219((short) 0xD219, "Incorrect block lengths (for example, incorrect length of first section or of the whole block)"),
-    ERROR_0xD21A((short) 0xD21A, "Incorrect local data length or write-protection code faulty"),
-    ERROR_0xD21B((short) 0xD21B, "Module cannot compress or compression was interrupted early"),
-    ERROR_0xD21D((short) 0xD21D, "The volume of dynamic project data transferred is illegal"),
-    ERROR_0xD21E((short) 0xD21E, "Unable to assign parameters to a module (such as FM, CP). The system data could not be linked"),
-    ERROR_0xD220((short) 0xD220, "Invalid programming language. Note the restrictions on the module being used"),
-    ERROR_0xD221((short) 0xD221, "The system data for connections or routing are not valid"),
-    ERROR_0xD222((short) 0xD222, "The system data of the global data definition contain invalid parameters"),
-    ERROR_0xD223((short) 0xD223, "Error in instance data block for communication function block or maximum number of instance DBs exceeded"),
-    ERROR_0xD224((short) 0xD224, "The SCAN system data block contains invalid parameters"),
-    ERROR_0xD225((short) 0xD225, "The DP system data block contains invalid parameters"),
-    ERROR_0xD226((short) 0xD226, "A structural error occurred in a block"),
-    ERROR_0xD230((short) 0xD230, "A structural error occurred in a block"),
-    ERROR_0xD231((short) 0xD231, "At least one loaded OB cannot be copied because the associated priority class does not exist"),
-    ERROR_0xD232((short) 0xD232, "At least one block number of a loaded block is illegal"),
-    ERROR_0xD234((short) 0xD234, "Block exists twice in the specified memory medium or in the job"),
-    ERROR_0xD235((short) 0xD235, "The block contains an incorrect checksum"),
-    ERROR_0xD236((short) 0xD236, "The block does not contain a checksum"),
-    ERROR_0xD237((short) 0xD237, "You are about to load the block twice, i.e. a block with the same time stamp already exists on the CPU"),
-    ERROR_0xD238((short) 0xD238, "At least one of the blocks specified is not a DB"),
-    ERROR_0xD239((short) 0xD239, "At least one of the DBs specified is not available as a linked variant in the load memory"),
-    ERROR_0xD23A((short) 0xD23A, "At least one of the specified DBs is considerably different from the copied and linked variant"),
-    ERROR_0xD240((short) 0xD240, "Coordination rules violated"),
-    ERROR_0xD241((short) 0xD241, "The function is not permitted in the current protection level"),
-    ERROR_0xD242((short) 0xD242, "Protection violation while processing F blocks"),
-    ERROR_0xD250((short) 0xD250, "Update and module ID or version do not match"),
-    ERROR_0xD251((short) 0xD251, "Incorrect sequence of operating system components"),
-    ERROR_0xD252((short) 0xD252, "Checksum error"),
-    ERROR_0xD253((short) 0xD253, "No executable loader available; update only possible using a memory card"),
-    ERROR_0xD254((short) 0xD254, "Storage error in operating system"),
-    ERROR_0xD280((short) 0xD280, "Error compiling block in S7-300 CPU"),
-    ERROR_0xD2A1((short) 0xD2A1, "Another block function or a trigger on a block is active"),
-    ERROR_0xD2A2((short) 0xD2A2, "A trigger is active on a block. Complete the debugging function first"),
-    ERROR_0xD2A3((short) 0xD2A3, "The block is not active (linked), the block is occupied or the block is currently marked for deletion"),
-    ERROR_0xD2A4((short) 0xD2A4, "The block is already being processed by another block function"),
-    ERROR_0xD2A6((short) 0xD2A6, "It is not possible to save and change the user program simultaneously"),
-    ERROR_0xD2A7((short) 0xD2A7, "The block has the attribute 'unlinked' or is not processed"),
-    ERROR_0xD2A8((short) 0xD2A8, "An active debugging function is preventing parameters from being assigned to the CPU"),
-    ERROR_0xD2A9((short) 0xD2A9, "New parameters are being assigned to the CPU"),
-    ERROR_0xD2AA((short) 0xD2AA, "New parameters are currently being assigned to the modules"),
-    ERROR_0xD2AB((short) 0xD2AB, "The dynamic configuration limits are currently being changed"),
-    ERROR_0xD2AC((short) 0xD2AC, "A running active or deactivate assignment (SFC 12) is temporarily preventing R-KiR process"),
-    ERROR_0xD2B0((short) 0xD2B0, "An error occurred while configuring in RUN (CiR)"),
-    ERROR_0xD2C0((short) 0xD2C0, "The maximum number of technological objects has been exceeded"),
-    ERROR_0xD2C1((short) 0xD2C1, "The same technology data block already exists on the module"),
-    ERROR_0xD2C2((short) 0xD2C2, "Downloading the user program or downloading the hardware configuration is not possible"),
-    ERROR_0xD401((short) 0xD401, "Information function unavailable"),
-    ERROR_0xD402((short) 0xD402, "Information function unavailable"),
-    ERROR_0xD403((short) 0xD403, "Service has already been logged on/off (Diagnostics/PMC)"),
-    ERROR_0xD404((short) 0xD404, "Maximum number of nodes reached. No more logons possible for diagnostics/PMC"),
-    ERROR_0xD405((short) 0xD405, "Service not supported or syntax error in function parameters"),
-    ERROR_0xD406((short) 0xD406, "Required information currently unavailable"),
-    ERROR_0xD407((short) 0xD407, "Diagnostics error occurred"),
-    ERROR_0xD408((short) 0xD408, "Update aborted"),
-    ERROR_0xD409((short) 0xD409, "Error on DP bus"),
-    ERROR_0xD601((short) 0xD601, "Syntax error in function parameter"),
-    ERROR_0xD602((short) 0xD602, "Incorrect password entered"),
-    ERROR_0xD603((short) 0xD603, "The connection has already been legitimized"),
-    ERROR_0xD604((short) 0xD604, "The connection has already been enabled"),
-    ERROR_0xD605((short) 0xD605, "Legitimization not possible because password does not exist"),
-    ERROR_0xD801((short) 0xD801, "At least one tag address is invalid"),
-    ERROR_0xD802((short) 0xD802, "Specified job does not exist"),
-    ERROR_0xD803((short) 0xD803, "Illegal job status"),
-    ERROR_0xD804((short) 0xD804, "Illegal cycle time (illegal time base or multiple)"),
-    ERROR_0xD805((short) 0xD805, "No more cyclic read jobs can be set up"),
-    ERROR_0xD806((short) 0xD806, "The referenced job is in a state in which the requested function cannot be performed"),
-    ERROR_0xD807((short) 0xD807, "Function aborted due to overload, meaning executing the read cycle takes longer than the set scan cycle time"),
-    ERROR_0xDC01((short) 0xDC01, "Date and/or time invalid"),
-    ERROR_0xE201((short) 0xE201, "CPU is already the master"),
-    ERROR_0xE202((short) 0xE202, "Connect and update not possible due to different user program in flash module"),
-    ERROR_0xE203((short) 0xE203, "Connect and update not possible due to different firmware"),
-    ERROR_0xE204((short) 0xE204, "Connect and update not possible due to different memory configuration"),
-    ERROR_0xE205((short) 0xE205, "Connect/update aborted due to synchronization error"),
-    ERROR_0xE206((short) 0xE206, "Connect/update denied due to coordination violation"),
-    ERROR_0xEF01((short) 0xEF01, "S7 protocol error: Error at ID2; only 00H permitted in job"),
-    ERROR_0xEF02((short) 0xEF02, "S7 protocol error: Error at ID2; set of resources does not exist"),;
-
-    
-    private static final Map<Short, S7ParamErrorCode> map;
-    
-    static {
-        map = new HashMap<>();
-        for (S7ParamErrorCode  subevent : S7ParamErrorCode .values()) {
-            map.put(subevent.code, subevent);
-        }
-    }    
-    
-    private final String event;
-    private final short code;
-    
-    S7ParamErrorCode(short code, String event){
-        this.event = event;
-        this.code = code;
-    }
-    
-    public String getEvent(){
-        return event;
-    }    
-    
-    public short getCode() {
-        return code;
-    }    
-    
-    public static S7ParamErrorCode  valueOfEvent(String event) {
-        for (S7ParamErrorCode  value : S7ParamErrorCode .values()) {
-            if(value.getEvent().equals(event)) {
-                return value;
-            }
-        }
-        return null;
-    }
-
-    public static S7ParamErrorCode  valueOf(short code) {
-        return map.get(code);
-    }    
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.utils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @author cgarcia
+ */
+public enum S7ParamErrorCode {
+
+    ERROR_0x0000((short) 0x0000, "No error"),
+    ERROR_0x0110((short) 0x0110, "Invalid block number"),
+    ERROR_0x0111((short) 0x0111, "Invalid request length"),
+    ERROR_0x0112((short) 0x0112, "Invalid parameter"),
+    ERROR_0x0113((short) 0x0113, "Invalid block type"),
+    ERROR_0x0114((short) 0x0114, "Block not found"),
+    ERROR_0x0115((short) 0x0115, "Block already exists"),
+    ERROR_0x0116((short) 0x0116, "Block is write-protected"),
+    ERROR_0x0117((short) 0x0117, "The block/operating system update is too large"),
+    ERROR_0x0118((short) 0x0118, "Invalid block number"),
+    ERROR_0x0119((short) 0x0119, "Incorrect password entered"),
+    ERROR_0x011A((short) 0x011A, "PG resource error"),
+    ERROR_0x011B((short) 0x011B, "PLC resource error"),
+    ERROR_0x011C((short) 0x011C, "Protocol error"),
+    ERROR_0x011D((short) 0x011D, "Too many blocks (module-related restriction)"),
+    ERROR_0x011E((short) 0x011E, "There is no longer a connection to the database, or S7DOS handle is invalid"),
+    ERROR_0x011F((short) 0x011F, "Result buffer too small"),
+    ERROR_0x0120((short) 0x0120, "End of block list"),
+    ERROR_0x0140((short) 0x0140, "Insufficient memory available"),
+    ERROR_0x0141((short) 0x0141, "Job cannot be processed because of a lack of resources"),
+    ERROR_0x8001((short) 0x8001, "The requested service cannot be performed while the block is in the current status"),
+    ERROR_0x8003((short) 0x8003, "S7 protocol error: Error occurred while transferring the block"),
+    ERROR_0x8100((short) 0x8100, "Application, general error: Service unknown to remote module"),
+    ERROR_0x8104((short) 0x8104, "This service is not implemented on the module or a frame error was reported"),
+    ERROR_0x8204((short) 0x8204, "The type specification for the object is inconsistent"),
+    ERROR_0x8205((short) 0x8205, "A copied block already exists and is not linked"),
+    ERROR_0x8301((short) 0x8301, "Insufficient memory space or work memory on the module, or specified storage medium not accessible"),
+    ERROR_0x8302((short) 0x8302, "Too few resources available or the processor resources are not available"),
+    ERROR_0x8304((short) 0x8304, "No further parallel upload possible. There is a resource bottleneck"),
+    ERROR_0x8305((short) 0x8305, "Function not available"),
+    ERROR_0x8306((short) 0x8306, "Insufficient work memory (for copying, linking, loading AWP)"),
+    ERROR_0x8307((short) 0x8307, "Not enough retentive work memory (for copying, linking, loading AWP)"),
+    ERROR_0x8401((short) 0x8401, "S7 protocol error: Invalid service sequence (for example, loading or uploading a block)"),
+    ERROR_0x8402((short) 0x8402, "Service cannot execute owing to status of the addressed object"),
+    ERROR_0x8404((short) 0x8404, "S7 protocol: The function cannot be performed"),
+    ERROR_0x8405((short) 0x8405, "Remote block is in DISABLE state (CFB). The function cannot be performed"),
+    ERROR_0x8500((short) 0x8500, "S7 protocol error: Wrong frames"),
+    ERROR_0x8503((short) 0x8503, "Alarm from the module: Service canceled prematurely"),
+    ERROR_0x8701((short) 0x8701, "Error addressing the object on the communications partner (for example, area length error)"),
+    ERROR_0x8702((short) 0x8702, "The requested service is not supported by the module"),
+    ERROR_0x8703((short) 0x8703, "Access to object refused"),
+    ERROR_0x8704((short) 0x8704, "Access error: Object damaged"),
+    ERROR_0xD001((short) 0xD001, "Protocol error: Illegal job number"),
+    ERROR_0xD002((short) 0xD002, "Parameter error: Illegal job variant"),
+    ERROR_0xD003((short) 0xD003, "Parameter error: Debugging function not supported by module"),
+    ERROR_0xD004((short) 0xD004, "Parameter error: Illegal job status"),
+    ERROR_0xD005((short) 0xD005, "Parameter error: Illegal job termination"),
+    ERROR_0xD006((short) 0xD006, "Parameter error: Illegal link disconnection ID"),
+    ERROR_0xD007((short) 0xD007, "Parameter error: Illegal number of buffer elements"),
+    ERROR_0xD008((short) 0xD008, "Parameter error: Illegal scan rate"),
+    ERROR_0xD009((short) 0xD009, "Parameter error: Illegal number of executions"),
+    ERROR_0xD00A((short) 0xD00A, "Parameter error: Illegal trigger event"),
+    ERROR_0xD00B((short) 0xD00B, "Parameter error: Illegal trigger condition"),
+    ERROR_0xD011((short) 0xD011, "Parameter error in path of the call environment: Block does not exist"),
+    ERROR_0xD012((short) 0xD012, "Parameter error: Wrong address in block"),
+    ERROR_0xD014((short) 0xD014, "Parameter error: Block being deleted/overwritten"),
+    ERROR_0xD015((short) 0xD015, "Parameter error: Illegal tag address"),
+    ERROR_0xD016((short) 0xD016, "Parameter error: Test jobs not possible, because of errors in user program"),
+    ERROR_0xD017((short) 0xD017, "Parameter error: Illegal trigger number"),
+    ERROR_0xD025((short) 0xD025, "Parameter error: Invalid path"),
+    ERROR_0xD026((short) 0xD026, "Parameter error: Illegal access type"),
+    ERROR_0xD027((short) 0xD027, "Parameter error: This number of data blocks is not permitted"),
+    ERROR_0xD031((short) 0xD031, "Internal protocol error"),
+    ERROR_0xD032((short) 0xD032, "Parameter error: Wrong result buffer length"),
+    ERROR_0xD033((short) 0xD033, "Protocol error: Wrong job length"),
+    ERROR_0xD03F((short) 0xD03F, "Coding error: Error in parameter section (for example, reserve bytes not equal to 0)"),
+    ERROR_0xD041((short) 0xD041, "Data error: Illegal status list ID"),
+    ERROR_0xD042((short) 0xD042, "Data error: Illegal tag address"),
+    ERROR_0xD043((short) 0xD043, "Data error: Referenced job not found, check job data"),
+    ERROR_0xD044((short) 0xD044, "Data error: Illegal tag value, check job data"),
+    ERROR_0xD045((short) 0xD045, "Data error: Exiting the ODIS control is not allowed in HOLD"),
+    ERROR_0xD046((short) 0xD046, "Data error: Illegal measuring stage during run-time measurement"),
+    ERROR_0xD047((short) 0xD047, "Data error: Illegal hierarchy in 'Read job list'"),
+    ERROR_0xD048((short) 0xD048, "Data error: Illegal deletion ID in 'Delete job'"),
+    ERROR_0xD049((short) 0xD049, "Invalid substitute ID in 'Replace job'"),
+    ERROR_0xD04A((short) 0xD04A, "Error executing 'program status'"),
+    ERROR_0xD05F((short) 0xD05F, "Coding error: Error in data section (for example, reserve bytes not equal to 0, ...)"),
+    ERROR_0xD061((short) 0xD061, "Resource error: No memory space for job"),
+    ERROR_0xD062((short) 0xD062, "Resource error: Job list full"),
+    ERROR_0xD063((short) 0xD063, "Resource error: Trigger event occupied"),
+    ERROR_0xD064((short) 0xD064, "Resource error: Not enough memory space for one result buffer element"),
+    ERROR_0xD065((short) 0xD065, "Resource error: Not enough memory space for several  result buffer elements"),
+    ERROR_0xD066((short) 0xD066, "Resource error: The timer available for run-time measurement is occupied by another job"),
+    ERROR_0xD067((short) 0xD067, "Resource error: Too many 'modify tag' jobs active (in particular multi-processor operation)"),
+    ERROR_0xD081((short) 0xD081, "Function not permitted in current mode"),
+    ERROR_0xD082((short) 0xD082, "Mode error: Cannot exit HOLD mode"),
+    ERROR_0xD0A1((short) 0xD0A1, "Function not permitted in current protection level"),
+    ERROR_0xD0A2((short) 0xD0A2, "Function not possible at present, because a function is running that modifies memory"),
+    ERROR_0xD0A3((short) 0xD0A3, "Too many 'modify tag' jobs active on the I/O (in particular multi-processor operation)"),
+    ERROR_0xD0A4((short) 0xD0A4, "Forcing' has already been established"),
+    ERROR_0xD0A5((short) 0xD0A5, "Referenced job not found"),
+    ERROR_0xD0A6((short) 0xD0A6, "Job cannot be disabled/enabled"),
+    ERROR_0xD0A7((short) 0xD0A7, "Job cannot be deleted, for example because it is currently being read"),
+    ERROR_0xD0A8((short) 0xD0A8, "Job cannot be replaced, for example because it is currently being read or deleted"),
+    ERROR_0xD0A9((short) 0xD0A9, "Job cannot be read, for example because it is currently being deleted"),
+    ERROR_0xD0AA((short) 0xD0AA, "Time limit exceeded in processing operation"),
+    ERROR_0xD0AB((short) 0xD0AB, "Invalid job parameters in process operation"),
+    ERROR_0xD0AC((short) 0xD0AC, "Invalid job data in process operation"),
+    ERROR_0xD0AD((short) 0xD0AD, "Operating mode already set"),
+    ERROR_0xD0AE((short) 0xD0AE, "The job was set up over a different connection and can only be handled over this connection"),
+    ERROR_0xD0C1((short) 0xD0C1, "At least one error has been detected while accessing the tag(s)"),
+    ERROR_0xD0C2((short) 0xD0C2, "Change to STOP/HOLD mode"),
+    ERROR_0xD0C3((short) 0xD0C3, "At least one error was detected while accessing the tag(s). Mode change to STOP/HOLD"),
+    ERROR_0xD0C4((short) 0xD0C4, "Timeout during run-time measurement"),
+    ERROR_0xD0C5((short) 0xD0C5, "Display of block stack inconsistent, because blocks were deleted/reloaded"),
+    ERROR_0xD0C6((short) 0xD0C6, "Job was automatically deleted as the jobs it referenced have been deleted"),
+    ERROR_0xD0C7((short) 0xD0C7, "The job was automatically deleted because STOP mode was exited"),
+    ERROR_0xD0C8((short) 0xD0C8, "Block status' aborted because of inconsistencies between test job and running program"),
+    ERROR_0xD0C9((short) 0xD0C9, "Exit the status area by resetting OB90"),
+    ERROR_0xD0CA((short) 0xD0CA, "Exiting the status range by resetting OB90 and access error reading tags before exiting"),
+    ERROR_0xD0CB((short) 0xD0CB, "The output disable for the peripheral outputs has been activated again"),
+    ERROR_0xD0CC((short) 0xD0CC, "The amount of data for the debugging functions is restricted by the time limit"),
+    ERROR_0xD201((short) 0xD201, "Syntax error in block name"),
+    ERROR_0xD202((short) 0xD202, "Syntax error in function parameters"),
+    ERROR_0xD205((short) 0xD205, "Linked block already exists in RAM: Conditional copying is not possible"),
+    ERROR_0xD206((short) 0xD206, "Linked block already exists in EPROM: Conditional copying is not possible"),
+    ERROR_0xD208((short) 0xD208, "Maximum number of copied (not linked) blocks on module exceeded"),
+    ERROR_0xD209((short) 0xD209, "(At least) one of the given blocks not found on the module"),
+    ERROR_0xD20A((short) 0xD20A, "The maximum number of blocks that can be linked with one job was exceeded"),
+    ERROR_0xD20B((short) 0xD20B, "The maximum number of blocks that can be deleted with one job was exceeded"),
+    ERROR_0xD20C((short) 0xD20C, "OB cannot be copied because the associated priority class does not exist"),
+    ERROR_0xD20D((short) 0xD20D, "SDB cannot be interpreted (for example, unknown number)"),
+    ERROR_0xD20E((short) 0xD20E, "No (further) block available"),
+    ERROR_0xD20F((short) 0xD20F, "Module-specific maximum block size exceeded"),
+    ERROR_0xD210((short) 0xD210, "Invalid block number"),
+    ERROR_0xD212((short) 0xD212, "Incorrect header attribute (run-time relevant)"),
+    ERROR_0xD213((short) 0xD213, "Too many SDBs. Note the restrictions on the module being used"),
+    ERROR_0xD216((short) 0xD216, "Invalid user program - reset module"),
+    ERROR_0xD217((short) 0xD217, "Protection level specified in module properties not permitted"),
+    ERROR_0xD218((short) 0xD218, "Incorrect attribute (active/passive)"),
+    ERROR_0xD219((short) 0xD219, "Incorrect block lengths (for example, incorrect length of first section or of the whole block)"),
+    ERROR_0xD21A((short) 0xD21A, "Incorrect local data length or write-protection code faulty"),
+    ERROR_0xD21B((short) 0xD21B, "Module cannot compress or compression was interrupted early"),
+    ERROR_0xD21D((short) 0xD21D, "The volume of dynamic project data transferred is illegal"),
+    ERROR_0xD21E((short) 0xD21E, "Unable to assign parameters to a module (such as FM, CP). The system data could not be linked"),
+    ERROR_0xD220((short) 0xD220, "Invalid programming language. Note the restrictions on the module being used"),
+    ERROR_0xD221((short) 0xD221, "The system data for connections or routing are not valid"),
+    ERROR_0xD222((short) 0xD222, "The system data of the global data definition contain invalid parameters"),
+    ERROR_0xD223((short) 0xD223, "Error in instance data block for communication function block or maximum number of instance DBs exceeded"),
+    ERROR_0xD224((short) 0xD224, "The SCAN system data block contains invalid parameters"),
+    ERROR_0xD225((short) 0xD225, "The DP system data block contains invalid parameters"),
+    ERROR_0xD226((short) 0xD226, "A structural error occurred in a block"),
+    ERROR_0xD230((short) 0xD230, "A structural error occurred in a block"),
+    ERROR_0xD231((short) 0xD231, "At least one loaded OB cannot be copied because the associated priority class does not exist"),
+    ERROR_0xD232((short) 0xD232, "At least one block number of a loaded block is illegal"),
+    ERROR_0xD234((short) 0xD234, "Block exists twice in the specified memory medium or in the job"),
+    ERROR_0xD235((short) 0xD235, "The block contains an incorrect checksum"),
+    ERROR_0xD236((short) 0xD236, "The block does not contain a checksum"),
+    ERROR_0xD237((short) 0xD237, "You are about to load the block twice, i.e. a block with the same time stamp already exists on the CPU"),
+    ERROR_0xD238((short) 0xD238, "At least one of the blocks specified is not a DB"),
+    ERROR_0xD239((short) 0xD239, "At least one of the DBs specified is not available as a linked variant in the load memory"),
+    ERROR_0xD23A((short) 0xD23A, "At least one of the specified DBs is considerably different from the copied and linked variant"),
+    ERROR_0xD240((short) 0xD240, "Coordination rules violated"),
+    ERROR_0xD241((short) 0xD241, "The function is not permitted in the current protection level"),
+    ERROR_0xD242((short) 0xD242, "Protection violation while processing F blocks"),
+    ERROR_0xD250((short) 0xD250, "Update and module ID or version do not match"),
+    ERROR_0xD251((short) 0xD251, "Incorrect sequence of operating system components"),
+    ERROR_0xD252((short) 0xD252, "Checksum error"),
+    ERROR_0xD253((short) 0xD253, "No executable loader available; update only possible using a memory card"),
+    ERROR_0xD254((short) 0xD254, "Storage error in operating system"),
+    ERROR_0xD280((short) 0xD280, "Error compiling block in S7-300 CPU"),
+    ERROR_0xD2A1((short) 0xD2A1, "Another block function or a trigger on a block is active"),
+    ERROR_0xD2A2((short) 0xD2A2, "A trigger is active on a block. Complete the debugging function first"),
+    ERROR_0xD2A3((short) 0xD2A3, "The block is not active (linked), the block is occupied or the block is currently marked for deletion"),
+    ERROR_0xD2A4((short) 0xD2A4, "The block is already being processed by another block function"),
+    ERROR_0xD2A6((short) 0xD2A6, "It is not possible to save and change the user program simultaneously"),
+    ERROR_0xD2A7((short) 0xD2A7, "The block has the attribute 'unlinked' or is not processed"),
+    ERROR_0xD2A8((short) 0xD2A8, "An active debugging function is preventing parameters from being assigned to the CPU"),
+    ERROR_0xD2A9((short) 0xD2A9, "New parameters are being assigned to the CPU"),
+    ERROR_0xD2AA((short) 0xD2AA, "New parameters are currently being assigned to the modules"),
+    ERROR_0xD2AB((short) 0xD2AB, "The dynamic configuration limits are currently being changed"),
+    ERROR_0xD2AC((short) 0xD2AC, "A running active or deactivate assignment (SFC 12) is temporarily preventing R-KiR process"),
+    ERROR_0xD2B0((short) 0xD2B0, "An error occurred while configuring in RUN (CiR)"),
+    ERROR_0xD2C0((short) 0xD2C0, "The maximum number of technological objects has been exceeded"),
+    ERROR_0xD2C1((short) 0xD2C1, "The same technology data block already exists on the module"),
+    ERROR_0xD2C2((short) 0xD2C2, "Downloading the user program or downloading the hardware configuration is not possible"),
+    ERROR_0xD401((short) 0xD401, "Information function unavailable"),
+    ERROR_0xD402((short) 0xD402, "Information function unavailable"),
+    ERROR_0xD403((short) 0xD403, "Service has already been logged on/off (Diagnostics/PMC)"),
+    ERROR_0xD404((short) 0xD404, "Maximum number of nodes reached. No more logons possible for diagnostics/PMC"),
+    ERROR_0xD405((short) 0xD405, "Service not supported or syntax error in function parameters"),
+    ERROR_0xD406((short) 0xD406, "Required information currently unavailable"),
+    ERROR_0xD407((short) 0xD407, "Diagnostics error occurred"),
+    ERROR_0xD408((short) 0xD408, "Update aborted"),
+    ERROR_0xD409((short) 0xD409, "Error on DP bus"),
+    ERROR_0xD601((short) 0xD601, "Syntax error in function parameter"),
+    ERROR_0xD602((short) 0xD602, "Incorrect password entered"),
+    ERROR_0xD603((short) 0xD603, "The connection has already been legitimized"),
+    ERROR_0xD604((short) 0xD604, "The connection has already been enabled"),
+    ERROR_0xD605((short) 0xD605, "Legitimization not possible because password does not exist"),
+    ERROR_0xD801((short) 0xD801, "At least one tag address is invalid"),
+    ERROR_0xD802((short) 0xD802, "Specified job does not exist"),
+    ERROR_0xD803((short) 0xD803, "Illegal job status"),
+    ERROR_0xD804((short) 0xD804, "Illegal cycle time (illegal time base or multiple)"),
+    ERROR_0xD805((short) 0xD805, "No more cyclic read jobs can be set up"),
+    ERROR_0xD806((short) 0xD806, "The referenced job is in a state in which the requested function cannot be performed"),
+    ERROR_0xD807((short) 0xD807, "Function aborted due to overload, meaning executing the read cycle takes longer than the set scan cycle time"),
+    ERROR_0xDC01((short) 0xDC01, "Date and/or time invalid"),
+    ERROR_0xE201((short) 0xE201, "CPU is already the master"),
+    ERROR_0xE202((short) 0xE202, "Connect and update not possible due to different user program in flash module"),
+    ERROR_0xE203((short) 0xE203, "Connect and update not possible due to different firmware"),
+    ERROR_0xE204((short) 0xE204, "Connect and update not possible due to different memory configuration"),
+    ERROR_0xE205((short) 0xE205, "Connect/update aborted due to synchronization error"),
+    ERROR_0xE206((short) 0xE206, "Connect/update denied due to coordination violation"),
+    ERROR_0xEF01((short) 0xEF01, "S7 protocol error: Error at ID2; only 00H permitted in job"),
+    ERROR_0xEF02((short) 0xEF02, "S7 protocol error: Error at ID2; set of resources does not exist"),;
+
+    
+    private static final Map<Short, S7ParamErrorCode> map;
+    
+    static {
+        map = new HashMap<>();
+        for (S7ParamErrorCode  subevent : S7ParamErrorCode .values()) {
+            map.put(subevent.code, subevent);
+        }
+    }    
+    
+    private final String event;
+    private final short code;
+    
+    S7ParamErrorCode(short code, String event){
+        this.event = event;
+        this.code = code;
+    }
+    
+    public String getEvent(){
+        return event;
+    }    
+    
+    public short getCode() {
+        return code;
+    }    
+    
+    public static S7ParamErrorCode  valueOfEvent(String event) {
+        for (S7ParamErrorCode  value : S7ParamErrorCode .values()) {
+            if(value.getEvent().equals(event)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static S7ParamErrorCode  valueOf(short code) {
+        return map.get(code);
+    }    
+}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7TsapIdEncoder.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7TsapIdEncoder.java
index c2250b6d695..29e57fee6cd 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7TsapIdEncoder.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7TsapIdEncoder.java
@@ -1,48 +1,48 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.utils;
-
-import org.apache.plc4x.java.isotp.protocol.model.types.DeviceGroup;
-
-public class S7TsapIdEncoder {
-
-    private S7TsapIdEncoder() {
-        // Prevent this from being instantiated.
-    }
-
-    public static short encodeS7TsapId(DeviceGroup deviceGroup, int rack, int slot) {
-        short firstByte = (short) (deviceGroup.getCode() << 8);
-        short secondByte = (short) ((rack << 4) | (slot & 0x0F));
-        return (short) (firstByte | secondByte);
-    }
-
-    public static DeviceGroup decodeDeviceGroup(short tsapId) {
-        byte deviceGroupCode = (byte) ((tsapId >> 8) & (0xFF));
-        return DeviceGroup.valueOf(deviceGroupCode);
-    }
-
-    public static int decodeRack(short tsapId) {
-        return (tsapId >> 4) & 0xF;
-    }
-
-    public static int decodeSlot(short tsapId) {
-        return tsapId & 0xF;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.utils;
+
+import org.apache.plc4x.java.isotp.protocol.model.types.DeviceGroup;
+
+public class S7TsapIdEncoder {
+
+    private S7TsapIdEncoder() {
+        // Prevent this from being instantiated.
+    }
+
+    public static short encodeS7TsapId(DeviceGroup deviceGroup, int rack, int slot) {
+        short firstByte = (short) (deviceGroup.getCode() << 8);
+        short secondByte = (short) ((rack << 4) | (slot & 0x0F));
+        return (short) (firstByte | secondByte);
+    }
+
+    public static DeviceGroup decodeDeviceGroup(short tsapId) {
+        byte deviceGroupCode = (byte) ((tsapId >> 8) & (0xFF));
+        return DeviceGroup.valueOf(deviceGroupCode);
+    }
+
+    public static int decodeRack(short tsapId) {
+        return (tsapId >> 4) & 0xF;
+    }
+
+    public static int decodeSlot(short tsapId) {
+        return tsapId & 0xF;
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/site/asciidoc/index.adoc b/plc4j/protocols/s7/src/site/asciidoc/index.adoc
index fa5bd033374..1acf9f598e8 100644
--- a/plc4j/protocols/s7/src/site/asciidoc/index.adoc
+++ b/plc4j/protocols/s7/src/site/asciidoc/index.adoc
@@ -1,101 +1,101 @@
-//
-//  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
-//
-//      http://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.
-//
-:imagesdir: ./images/
-
-== S7 Protocol Java Implementation
-
-The current version of the S7 protocol java driver is based upon Netty 4 (http://netty.io/).
-
-As the S7 protocol running on TCP is a hierarchy of protocols, the S7 driver is implemented by providing several Protocol implementations, each encoding one layer of the protocol stack.
-
-The complete pipeline for the S7 protocol looks like this:
-
-[blockdiag,s7-netty-pipeline]
-....
-{
-    Application -> S7PlcConnection;
-    Socket -> PLC;
-
-    group {
-        label = "PLC4X S7 Driver"
-        color = "#77FF77";
-
-        S7PlcConnection -> Plc4XS7Protocol -> S7Protocol -> IsoTPProtocol -> IsoOnTcpProtocol -> Socket
-
-        group {
-            Plc4XS7Protocol; S7Protocol; IsoTPProtocol; IsoOnTcpProtocol;
-        }
-    }
-}
-....
-
-Each protocol layer implementation extends the class `MessageToMessageCodec` and is configured to consume/encode messages in the current format into messages of the next lower layer.
-
-The highest layer hereby consumes PLC4X messages, which are defined in the `plc4j-api` module, and the lowest layer produces a simple byte output.
-
-In order to implement the S7 Protocol as described in link:../../../protocols/s7/index.html[S7 Protocol] internally this is what happens inside the driver as soon as a connection is requested:
-
-[seqdiag,s7-netty-setup-communication]
-....
-{
-    Application; S7PlcConnection; Plc4XS7Protocol; S7Protocol; IsoTPProtocol; IsoOnTcpProtocol; Socket; PLC;
-
-    group Pipeline {
-       "Plc4XS7Protocol";
-        "S7Protocol";
-        "IsoTPProtocol";
-        "IsoOnTcpProtocol";
-    }
-
-    Application -> S7PlcConnection [label = "Calls 'connect'"]
-    S7PlcConnection --> IsoTPProtocol [label = "Fires S7ConnectionEvent(INITIAL) event to the pipeline", note = "IsoTPProtocol listens for S7ConnectionEvent(INITIAL) events"]
-    IsoTPProtocol -> IsoOnTcpProtocol [label = "Creates new IsoOnTcp\nconnection request message"]
-    IsoOnTcpProtocol -> Socket [label = "Creates the byte array\ncontaining the TCP on ISO\nmessage"]
-    Socket -> PLC [label = "Sends the raw byte data to\nthe PLC"]
-
-    Socket <- PLC [label = "Sends the response to the\nSocket"]
-    IsoOnTcpProtocol <- Socket [label = "Passes the binary data to\nthe pipeline"]
-    IsoTPProtocol <- IsoOnTcpProtocol [label = "Creates new IsoOnTcp message containing binary user data"]
-
-    IsoTPProtocol --> S7Protocol [label = "Sends S7ConnectionEvent(\nISO_TP_CONNECTION_RESPONSE_\nRECEIVED) event to the\npipeline", note = "S7Protocol listens for S7ConnectionEvent(ISO_TP_CONNECTION_RESPONSE_RECEIVED) events"]
-
-    IsoTPProtocol <- S7Protocol [label = "Creates new ISO TP Data\nmessage containing an\n S7 SetupCommunictaion\nmessage"]
-    IsoTPProtocol -> IsoOnTcpProtocol [label = "Creates new IsoOnTcp message"]
-    IsoOnTcpProtocol -> Socket [label = "Creates the byte array\ncontaining the TCP on ISO\nmessage"]
-    Socket -> PLC [label = "Sends the raw byte data to\nthe PLC"]
-
-    Socket <-- PLC [label = "Sends the response to the\nSocket"]
-    IsoOnTcpProtocol <- Socket [label = "Passes the binary data to\nthe pipeline"]
-    IsoTPProtocol <- IsoOnTcpProtocol [label = "Creates new IsoOnTcp message containing binary user data"]
-    IsoTPProtocol -> S7Protocol
-    S7PlcConnection <- S7Protocol [label = "Sends S7ConnectionEvent(SETUP_COMPLETE) event to the\npipeline", note = "S7PlcConnection listens for S7ConnectionEvent(SETUP_COMPLETE) events"]
-
-}
-....
-
-Above picture is a simplification. The communication of the outside with the pipeline is not implemented in a way that one component directly addresses the other.
-It is more that all communication is done with the `pipeline` and Netty then takes care of calling the right component at the right time.
-
-When writing to the pipeline from an application Netty starts at the `top` of the pipeline and asks each pipeline level if it is able and willing to handle the current message.
-If it does, the message is passed in to the `encode` method and the next component is supplied with the output of this.
-If the component can't process the message the next level is checked with the unmodified message.
-
-When reading from the Socket the Netty processes the pipeline elements the same way, but in the opposite direction and a pipeline elements `decode` method is called instead of `encode`.
-
-In addition to the normal flow of messages, a Netty pipeline also provides a messaging system. Every component can fire so-called `user events` and every component can react on them by implementing a `userEventTriggered` method.
-
+//
+//  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
+//
+//      http://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.
+//
+:imagesdir: ./images/
+
+== S7 Protocol Java Implementation
+
+The current version of the S7 protocol java driver is based upon Netty 4 (http://netty.io/).
+
+As the S7 protocol running on TCP is a hierarchy of protocols, the S7 driver is implemented by providing several Protocol implementations, each encoding one layer of the protocol stack.
+
+The complete pipeline for the S7 protocol looks like this:
+
+[blockdiag,s7-netty-pipeline]
+....
+{
+    Application -> S7PlcConnection;
+    Socket -> PLC;
+
+    group {
+        label = "PLC4X S7 Driver"
+        color = "#77FF77";
+
+        S7PlcConnection -> Plc4XS7Protocol -> S7Protocol -> IsoTPProtocol -> IsoOnTcpProtocol -> Socket
+
+        group {
+            Plc4XS7Protocol; S7Protocol; IsoTPProtocol; IsoOnTcpProtocol;
+        }
+    }
+}
+....
+
+Each protocol layer implementation extends the class `MessageToMessageCodec` and is configured to consume/encode messages in the current format into messages of the next lower layer.
+
+The highest layer hereby consumes PLC4X messages, which are defined in the `plc4j-api` module, and the lowest layer produces a simple byte output.
+
+In order to implement the S7 Protocol as described in link:../../../protocols/s7/index.html[S7 Protocol] internally this is what happens inside the driver as soon as a connection is requested:
+
+[seqdiag,s7-netty-setup-communication]
+....
+{
+    Application; S7PlcConnection; Plc4XS7Protocol; S7Protocol; IsoTPProtocol; IsoOnTcpProtocol; Socket; PLC;
+
+    group Pipeline {
+       "Plc4XS7Protocol";
+        "S7Protocol";
+        "IsoTPProtocol";
+        "IsoOnTcpProtocol";
+    }
+
+    Application -> S7PlcConnection [label = "Calls 'connect'"]
+    S7PlcConnection --> IsoTPProtocol [label = "Fires S7ConnectionEvent(INITIAL) event to the pipeline", note = "IsoTPProtocol listens for S7ConnectionEvent(INITIAL) events"]
+    IsoTPProtocol -> IsoOnTcpProtocol [label = "Creates new IsoOnTcp\nconnection request message"]
+    IsoOnTcpProtocol -> Socket [label = "Creates the byte array\ncontaining the TCP on ISO\nmessage"]
+    Socket -> PLC [label = "Sends the raw byte data to\nthe PLC"]
+
+    Socket <- PLC [label = "Sends the response to the\nSocket"]
+    IsoOnTcpProtocol <- Socket [label = "Passes the binary data to\nthe pipeline"]
+    IsoTPProtocol <- IsoOnTcpProtocol [label = "Creates new IsoOnTcp message containing binary user data"]
+
+    IsoTPProtocol --> S7Protocol [label = "Sends S7ConnectionEvent(\nISO_TP_CONNECTION_RESPONSE_\nRECEIVED) event to the\npipeline", note = "S7Protocol listens for S7ConnectionEvent(ISO_TP_CONNECTION_RESPONSE_RECEIVED) events"]
+
+    IsoTPProtocol <- S7Protocol [label = "Creates new ISO TP Data\nmessage containing an\n S7 SetupCommunictaion\nmessage"]
+    IsoTPProtocol -> IsoOnTcpProtocol [label = "Creates new IsoOnTcp message"]
+    IsoOnTcpProtocol -> Socket [label = "Creates the byte array\ncontaining the TCP on ISO\nmessage"]
+    Socket -> PLC [label = "Sends the raw byte data to\nthe PLC"]
+
+    Socket <-- PLC [label = "Sends the response to the\nSocket"]
+    IsoOnTcpProtocol <- Socket [label = "Passes the binary data to\nthe pipeline"]
+    IsoTPProtocol <- IsoOnTcpProtocol [label = "Creates new IsoOnTcp message containing binary user data"]
+    IsoTPProtocol -> S7Protocol
+    S7PlcConnection <- S7Protocol [label = "Sends S7ConnectionEvent(SETUP_COMPLETE) event to the\npipeline", note = "S7PlcConnection listens for S7ConnectionEvent(SETUP_COMPLETE) events"]
+
+}
+....
+
+Above picture is a simplification. The communication of the outside with the pipeline is not implemented in a way that one component directly addresses the other.
+It is more that all communication is done with the `pipeline` and Netty then takes care of calling the right component at the right time.
+
+When writing to the pipeline from an application Netty starts at the `top` of the pipeline and asks each pipeline level if it is able and willing to handle the current message.
+If it does, the message is passed in to the `encode` method and the next component is supplied with the output of this.
+If the component can't process the message the next level is checked with the unmodified message.
+
+When reading from the Socket the Netty processes the pipeline elements the same way, but in the opposite direction and a pipeline elements `decode` method is called instead of `encode`.
+
+In addition to the normal flow of messages, a Netty pipeline also provides a messaging system. Every component can fire so-called `user events` and every component can react on them by implementing a `userEventTriggered` method.
+
 This functionality is mainly used during connection setup to synchronize the sending of messages on the different layers of the protocol stack.
\ No newline at end of file
diff --git a/plc4j/protocols/s7/src/test/groovy/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolSpec.groovy b/plc4j/protocols/s7/src/test/groovy/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolSpec.groovy
index b6b5a7fbe95..eefcbb55110 100644
--- a/plc4j/protocols/s7/src/test/groovy/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolSpec.groovy
+++ b/plc4j/protocols/s7/src/test/groovy/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolSpec.groovy
@@ -1,278 +1,278 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.s7.netty
-
-import io.netty.channel.ChannelFuture
-import io.netty.channel.ChannelHandlerContext
-import io.netty.channel.ChannelOutboundHandlerAdapter
-import io.netty.channel.ChannelPromise
-import io.netty.channel.embedded.EmbeddedChannel
-import org.apache.plc4x.java.api.exceptions.PlcProtocolException
-import org.apache.plc4x.java.api.messages.PlcReadRequest
-import org.apache.plc4x.java.api.messages.PlcReadResponse
-import org.apache.plc4x.java.api.messages.PlcResponse
-import org.apache.plc4x.java.api.messages.PlcWriteRequest
-import org.apache.plc4x.java.api.types.PlcResponseCode
-import org.apache.plc4x.java.base.messages.*
-import org.apache.plc4x.java.s7.netty.model.messages.S7Message
-import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage
-import org.apache.plc4x.java.s7.netty.model.messages.S7ResponseMessage
-import org.apache.plc4x.java.s7.netty.model.params.S7Parameter
-import org.apache.plc4x.java.s7.netty.model.params.VarParameter
-import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem
-import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload
-import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload
-import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem
-import org.apache.plc4x.java.s7.netty.model.types.*
-import org.apache.plc4x.java.s7.netty.util.S7PlcFieldHandler
-import spock.lang.Specification
-import spock.lang.Unroll
-
-import java.lang.reflect.Field
-import java.util.concurrent.CompletableFuture
-import java.util.concurrent.TimeUnit
-
-import static org.mockito.Mockito.mock
-
-class Plc4XS7ProtocolSpec extends Specification {
-
-    private EmbeddedChannel SUT
-    private PlcReadRequest.Builder readRequestBuilder
-    private PlcWriteRequest.Builder writeRequestBuilder
-    private CompletableFuture<S7Message> writeFuture
-    private CompletableFuture<PlcResponse> readFuture
-
-    @Unroll
-    def "Test encoding the different PLC read requests: '#address'"(String address, boolean expectedSuccess, MemoryArea expectedMemoryArea, int dataBlockNumber, int byteOffset, int bitOffset, int numItems, TransportSize datatype) {
-        setup:
-        initTest(null)
-        CompletableFuture<InternalPlcReadRequest> future = new CompletableFuture<>()
-        PlcRequestContainer container = new PlcRequestContainer(
-            (DefaultPlcReadRequest) readRequestBuilder.addItem("foo", address).build(), future)
-        ChannelFuture channelFuture = SUT.writeOneOutbound(container)
-        S7Message writtenMessage = writeFuture.get(100, TimeUnit.MILLISECONDS)
-        Throwable exception = channelFuture.cause()
-
-        expect:
-        assert channelFuture.isSuccess() == expectedSuccess
-        assert expectedSuccess ? exception == null : exception != null
-        assert expectedSuccess ? writtenMessage != null : writtenMessage == null
-        if(expectedSuccess)
-            assertReadRequestSuccess(writtenMessage, expectedMemoryArea, dataBlockNumber, byteOffset, bitOffset, numItems, datatype)
-        else
-            assertFailure(exception)
-
-        where:
-        address    | expectedSuccess | expectedMemoryArea | dataBlockNumber | byteOffset | bitOffset | numItems | datatype
-        "%Q0:BYTE" | true            | MemoryArea.OUTPUTS | 0               | 0          | 0         | 1        | TransportSize.BYTE
-    }
-
-    void assertReadRequestSuccess(S7Message writtenMessage, MemoryArea memoryArea, int dataBlockNumber, int byteOffset, int bitOffset, int numItems, TransportSize datatype) {
-        assert writtenMessage instanceof S7RequestMessage
-        assert writtenMessage.getParameters().size() == 1
-        assert writtenMessage.getPayloads().isEmpty()
-        assert writtenMessage.getParent() != null
-
-        assert writtenMessage.getParameters().get(0) instanceof VarParameter
-        VarParameter varParameter = (VarParameter) writtenMessage.getParameters().get(0)
-        assert varParameter.getItems().size() == 1
-
-        assert varParameter.getItems().get(0) instanceof S7AnyVarParameterItem
-        S7AnyVarParameterItem s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameter.getItems().get(0)
-        assert s7AnyVarParameterItem.getSpecificationType() == SpecificationType.VARIABLE_SPECIFICATION
-        assert s7AnyVarParameterItem.getMemoryArea() == memoryArea
-        assert s7AnyVarParameterItem.getDataBlockNumber() == (short) dataBlockNumber
-        assert s7AnyVarParameterItem.getByteOffset() == (short) byteOffset
-        assert s7AnyVarParameterItem.getBitOffset() == (byte) bitOffset
-        assert s7AnyVarParameterItem.getNumElements() == numItems
-        assert s7AnyVarParameterItem.getDataType() == datatype
-    }
-
-    @Unroll
-    def "Test encoding the different PLC write requests: '#address'"(String address, Object value, boolean expectedSuccess, MemoryArea expectedMemoryArea, int dataBlockNumber, int byteOffset, int bitOffset, int numItems, TransportSize datatype) {
-        setup:
-        initTest(null)
-        CompletableFuture<InternalPlcWriteRequest> future = new CompletableFuture<>()
-        PlcRequestContainer container = new PlcRequestContainer(
-            (DefaultPlcWriteRequest) writeRequestBuilder.addItem("foo", address, value).build(), future)
-        ChannelFuture channelFuture = SUT.writeOneOutbound(container)
-        S7Message writtenMessage = writeFuture.get(100, TimeUnit.MILLISECONDS)
-        Throwable exception = channelFuture.cause()
-
-        expect:
-        assert channelFuture.isSuccess() == expectedSuccess
-        assert expectedSuccess ? exception == null : exception != null
-        assert expectedSuccess ? writtenMessage != null : writtenMessage == null
-        if(expectedSuccess)
-            assertWriteRequestSuccess(writtenMessage, expectedMemoryArea, dataBlockNumber, byteOffset, bitOffset, numItems, datatype)
-        else
-            assertFailure(exception)
-
-        where:
-        address             | value               || expectedSuccess | expectedMemoryArea | dataBlockNumber | byteOffset | bitOffset | numItems | datatype
-        "%Q3.4:BOOL"        | true                || true            | MemoryArea.OUTPUTS | 0               | 3          | 4         | 1        | TransportSize.BOOL
-        "%Q3:SINT"          | (byte) 0x42         || true            | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.SINT
-        "%Q3:INT"           | (short) 0x4223      || true            | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.INT
-        "%Q3:DINT"          | (int) 4223          || true            | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.DINT
-        "%Q3:LINT"          | (long) 4223123      || true            | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.LINT
-        "%Q3:USINT"         | (byte) 0x42         || true            | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.USINT
-        "%Q3:UINT"          | (short) 0x4223      || true            | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.UINT
-        "%Q3:UDINT"         | (int) 4223          || true            | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.UDINT
-        "%Q3:ULINT"         | (long) 4223123      || true            | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.ULINT
-        "%Q3:REAL"          | (float) 42.312      || true            | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.REAL
-        "%Q3:LREAL"         | (double) 42.32      || true            | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.LREAL
-        "%Q3:STRING"        | "foo"               || true            | MemoryArea.OUTPUTS | 0               | 3          | 0         | 256      | TransportSize.STRING
-        "%Q3:WSTRING"       | "bar"               || true            | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.WSTRING
-        //"%Q3:DATE_AND_TIME" | LocalDateTime.now() || false           | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.DATE_AND_TIME
-    }
-
-    void assertWriteRequestSuccess(S7Message writtenMessage, MemoryArea memoryArea, int dataBlockNumber, int byteOffset, int bitOffset, int numItems, TransportSize datatype) {
-        assert writtenMessage instanceof S7RequestMessage
-        assert writtenMessage.getParameters().size() == 1
-        assert writtenMessage.getPayloads().size() == 1
-        assert writtenMessage.getParent() != null
-
-        assert writtenMessage.getParameters().get(0) instanceof VarParameter
-        VarParameter varParameter = (VarParameter) writtenMessage.getParameters().get(0)
-        assert varParameter.getItems().size() == 1
-
-        assert varParameter.getItems().get(0) instanceof S7AnyVarParameterItem
-        S7AnyVarParameterItem s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameter.getItems().get(0)
-        assert s7AnyVarParameterItem.getSpecificationType() == SpecificationType.VARIABLE_SPECIFICATION
-        assert s7AnyVarParameterItem.getMemoryArea() == memoryArea
-        assert s7AnyVarParameterItem.getDataBlockNumber() == (short) dataBlockNumber
-        assert s7AnyVarParameterItem.getByteOffset() == (short) byteOffset
-        assert s7AnyVarParameterItem.getBitOffset() == (byte) bitOffset
-        assert s7AnyVarParameterItem.getNumElements() == numItems
-        assert s7AnyVarParameterItem.getDataType() == datatype
-
-        assert writtenMessage.getPayloads().get(0) instanceof VarPayload
-        VarPayload varPayload = (VarPayload) writtenMessage.getPayloads().get(0)
-        assert varPayload.getItems().size() == 1
-    }
-
-
-
-    @Unroll
-    def "Test decoding the different PLC read responses: '#address'"(String address, MemoryArea memoryArea,
-                  int dataBlockNumber, int byteOffset, int bitOffset, int numItems, TransportSize datatype,
-                  DataTransportSize dataTransportSize, byte[] data, boolean expectedSuccess,
-                  PlcResponseCode expectedResponseCode, int expectedNumItems, Object[] expectedValues) {
-        setup:
-        initTest(address)
-        S7Parameter parameter = new VarParameter(ParameterType.READ_VAR, Collections.singletonList(
-            new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, memoryArea, datatype, numItems,
-                (short) dataBlockNumber, (short) byteOffset, (byte) bitOffset)))
-        S7Payload payload = new VarPayload(ParameterType.READ_VAR, Collections.singletonList(
-            new VarPayloadItem(DataTransportErrorCode.OK, dataTransportSize, data)))
-        // The tpdu has to match the id manually injected in the setup method.
-        S7Message response = new S7ResponseMessage(MessageType.JOB, (short) 1,
-            Collections.singletonList(parameter), Collections.singletonList(payload), (byte) 0, (byte) 0)
-        SUT.writeInbound(response)
-        PlcResponse receivedMessage = readFuture.get(100, TimeUnit.MILLISECONDS)
-
-        expect:
-        //assert expectedSuccess ? exception == null : exception != null
-        assert expectedSuccess ? receivedMessage != null : receivedMessage == null
-        if(expectedSuccess)
-            assertReadResponseSuccess(receivedMessage, expectedResponseCode, expectedNumItems, expectedValues)
-        else
-            assertFailure(exception)
-
-        where:
-
-        // Bit-String values
-        address      | memoryArea         | dataBlockNumber | byteOffset | bitOffset | numItems | datatype            | dataTransportSize                 | data                                             || expectedSuccess | expectedResponseCode | expectedNumItems | expectedValues
-        "%Q3.4:BOOL" | MemoryArea.OUTPUTS | 0               | 3          | 4         | 1        | TransportSize.BOOL  | DataTransportSize.BIT             | [0x01]                                           || true            | PlcResponseCode.OK   | 1                | [true]
-        "%Q3:BYTE"   | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.BYTE  | DataTransportSize.BYTE_WORD_DWORD | [0x23]                                           || true            | PlcResponseCode.OK   | 8                | [true, true, false, false, false, true, false, false]
-        "%Q3:WORD"   | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.WORD  | DataTransportSize.BYTE_WORD_DWORD | [0x43, 0xA1]                                     || true            | PlcResponseCode.OK   | 16               | [true, false, false, false, false, true, false, true, true, true, false, false, false, false, true, false]
-        "%Q3:DWORD"  | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.DWORD | DataTransportSize.BYTE_WORD_DWORD | [0x43, 0xA1, 0x11, 0xFA]                         || true            | PlcResponseCode.OK   | 32               | [false, true, false, true, true, true, true, true, true, false, false, false, true, false, false, false, true, false, false, false, false, true, false, true, true, true, false, false, false, false, true, false]
-        "%Q3:LWORD"  | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.LWORD | DataTransportSize.BYTE_WORD_DWORD | [0x43, 0xA1, 0x11, 0xFA, 0x53, 0x82, 0x13, 0x85] || true            | PlcResponseCode.OK   | 64               | [true, false, true, false, false, false, false, true, true, true, false, false, true, false, false, false, false, true, false, false, false, false, false, true, true, true, false, false, true, false, true, false, false, true, false, true, true, true, true, true, true, false, false, false, true, false, false, false, true, false, false, false, false, true, false, true, true, true, false, false, false, false, true, false]
-        // Integer values
-        //address    | memoryArea         | dataBlockNumber | byteOffset | bitOffset | numItems | datatype            | dataTransportSize                 | data                                             || expectedSuccess | expectedResponseCode | expectedNumItems | expectedValues
-        "%Q3:SINT"   | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.SINT  | DataTransportSize.INTEGER         | [0x43]                                           || true            | PlcResponseCode.OK   | 1                | [(byte) 0x43]
-        "%Q3:USINT"  | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.USINT | DataTransportSize.INTEGER         | [0xFF]                                           || true            | PlcResponseCode.OK   | 1                | [(short) 255]
-        "%Q3:INT"    | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.INT   | DataTransportSize.INTEGER         | [0x42, 0x23]                                     || true            | PlcResponseCode.OK   | 1                | [(short) 16931]
-        "%Q3:UINT"   | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.UINT  | DataTransportSize.INTEGER         | [0xFF, 0xFF]                                     || true            | PlcResponseCode.OK   | 1                | [(int) 65535]
-        "%Q3:DINT"   | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.DINT  | DataTransportSize.INTEGER         | [0x42, 0x23, 0x12, 0x74]                         || true            | PlcResponseCode.OK   | 1                | [(int) 1109594740]
-        "%Q3:UDINT"  | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.UDINT | DataTransportSize.INTEGER         | [0xFF, 0xFF, 0xFF, 0xFF]                         || true            | PlcResponseCode.OK   | 1                | [(long) 4294967295]
-        "%Q3:LINT"   | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.LINT  | DataTransportSize.INTEGER         | [0x43, 0xA1, 0x11, 0xFA, 0x53, 0x82, 0x13, 0x85] || true            | PlcResponseCode.OK   | 1                | [(long) 4873196038632117125]
-        //ULINT
-        // Floating point values
-        "%Q3:REAL"   | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.REAL  | DataTransportSize.REAL            | [0x42, 0x23, 0x12, 0x74]                         || true            | PlcResponseCode.OK   | 1                | [40.76802F]
-        "%Q3:LREAL"  | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.LREAL | DataTransportSize.REAL            | [0x43, 0xA1, 0x11, 0xFA, 0x53, 0x82, 0x13, 0x85] || true            | PlcResponseCode.OK   | 1                | [6.150197049102015e+17D]
-    }
-
-    void assertReadResponseSuccess(PlcResponse receivedMessage, PlcResponseCode expectedResponseCode, int expectedNumItems, Object[] expectedValues) {
-        assert receivedMessage instanceof PlcReadResponse
-        PlcReadResponse readResponse = (PlcReadResponse) receivedMessage
-
-        assert readResponse.getNumberOfValues("bar") == expectedNumItems
-        assert readResponse.getResponseCode("bar") == expectedResponseCode
-        Object[] actualValues = readResponse.getAllObjects("bar")
-        if(expectedValues == null) {
-            assert actualValues == null
-        } else {
-            assert actualValues.length == expectedValues.length
-            for (int i = 0; i < actualValues.length; i++) {
-                assert actualValues[i].class == expectedValues[i].class
-                assert actualValues[i] == expectedValues[i]
-            }
-        }
-    }
-
-    void assertFailure(Throwable exception) {
-        assert exception != null
-        assert exception instanceof PlcProtocolException
-    }
-
-    void initTest(String address) {
-        writeFuture = new CompletableFuture<>()
-        readRequestBuilder = new DefaultPlcReadRequest.Builder(mock(PlcReader.class), new S7PlcFieldHandler())
-        writeRequestBuilder = new DefaultPlcWriteRequest.Builder(mock(PlcWriter.class), new S7PlcFieldHandler())
-
-        Plc4XS7Protocol protocol = new Plc4XS7Protocol()
-
-        if(address) {
-            readFuture = new CompletableFuture<>()
-            // Populate the 'requests' field with some manually crafted requests.
-            Field requestsFiled = Plc4XS7Protocol.class.getDeclaredField("requests")
-            requestsFiled.setAccessible(true)
-            Map<Short, PlcRequestContainer> requestMap = (Map<Short, PlcRequestContainer>) requestsFiled.get(protocol)
-            requestMap.put((short) 1, new PlcRequestContainer<>(readRequestBuilder.addItem("bar", address).build(), readFuture))
-            //requestMap.put((short) 2, new PlcRequestContainer<>(writeRequestBuilder.addItem("bar", address, 42).build(), readFuture))
-        }
-
-        SUT = new EmbeddedChannel(new ChannelOutboundHandlerAdapter() {
-            @Override
-            void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) {
-                if(msg instanceof S7Message) {
-                    writeFuture.complete((S7Message) msg)
-                    promise.setSuccess()
-                } else {
-                    promise.setFailure(new PlcProtocolException(
-                        "Got message of type " + msg.getClass().getSimpleName()))
-                }
-            }
-        }, protocol)
-    }
-
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty
+
+import io.netty.channel.ChannelFuture
+import io.netty.channel.ChannelHandlerContext
+import io.netty.channel.ChannelOutboundHandlerAdapter
+import io.netty.channel.ChannelPromise
+import io.netty.channel.embedded.EmbeddedChannel
+import org.apache.plc4x.java.api.exceptions.PlcProtocolException
+import org.apache.plc4x.java.api.messages.PlcReadRequest
+import org.apache.plc4x.java.api.messages.PlcReadResponse
+import org.apache.plc4x.java.api.messages.PlcResponse
+import org.apache.plc4x.java.api.messages.PlcWriteRequest
+import org.apache.plc4x.java.api.types.PlcResponseCode
+import org.apache.plc4x.java.base.messages.*
+import org.apache.plc4x.java.s7.netty.model.messages.S7Message
+import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage
+import org.apache.plc4x.java.s7.netty.model.messages.S7ResponseMessage
+import org.apache.plc4x.java.s7.netty.model.params.S7Parameter
+import org.apache.plc4x.java.s7.netty.model.params.VarParameter
+import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem
+import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload
+import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload
+import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem
+import org.apache.plc4x.java.s7.netty.model.types.*
+import org.apache.plc4x.java.s7.netty.util.S7PlcFieldHandler
+import spock.lang.Specification
+import spock.lang.Unroll
+
+import java.lang.reflect.Field
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.TimeUnit
+
+import static org.mockito.Mockito.mock
+
+class Plc4XS7ProtocolSpec extends Specification {
+
+    private EmbeddedChannel SUT
+    private PlcReadRequest.Builder readRequestBuilder
+    private PlcWriteRequest.Builder writeRequestBuilder
+    private CompletableFuture<S7Message> writeFuture
+    private CompletableFuture<PlcResponse> readFuture
+
+    @Unroll
+    def "Test encoding the different PLC read requests: '#address'"(String address, boolean expectedSuccess, MemoryArea expectedMemoryArea, int dataBlockNumber, int byteOffset, int bitOffset, int numItems, TransportSize datatype) {
+        setup:
+        initTest(null)
+        CompletableFuture<InternalPlcReadRequest> future = new CompletableFuture<>()
+        PlcRequestContainer container = new PlcRequestContainer(
+            (DefaultPlcReadRequest) readRequestBuilder.addItem("foo", address).build(), future)
+        ChannelFuture channelFuture = SUT.writeOneOutbound(container)
+        S7Message writtenMessage = writeFuture.get(100, TimeUnit.MILLISECONDS)
+        Throwable exception = channelFuture.cause()
+
+        expect:
+        assert channelFuture.isSuccess() == expectedSuccess
+        assert expectedSuccess ? exception == null : exception != null
+        assert expectedSuccess ? writtenMessage != null : writtenMessage == null
+        if(expectedSuccess)
+            assertReadRequestSuccess(writtenMessage, expectedMemoryArea, dataBlockNumber, byteOffset, bitOffset, numItems, datatype)
+        else
+            assertFailure(exception)
+
+        where:
+        address    | expectedSuccess | expectedMemoryArea | dataBlockNumber | byteOffset | bitOffset | numItems | datatype
+        "%Q0:BYTE" | true            | MemoryArea.OUTPUTS | 0               | 0          | 0         | 1        | TransportSize.BYTE
+    }
+
+    void assertReadRequestSuccess(S7Message writtenMessage, MemoryArea memoryArea, int dataBlockNumber, int byteOffset, int bitOffset, int numItems, TransportSize datatype) {
+        assert writtenMessage instanceof S7RequestMessage
+        assert writtenMessage.getParameters().size() == 1
+        assert writtenMessage.getPayloads().isEmpty()
+        assert writtenMessage.getParent() != null
+
+        assert writtenMessage.getParameters().get(0) instanceof VarParameter
+        VarParameter varParameter = (VarParameter) writtenMessage.getParameters().get(0)
+        assert varParameter.getItems().size() == 1
+
+        assert varParameter.getItems().get(0) instanceof S7AnyVarParameterItem
+        S7AnyVarParameterItem s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameter.getItems().get(0)
+        assert s7AnyVarParameterItem.getSpecificationType() == SpecificationType.VARIABLE_SPECIFICATION
+        assert s7AnyVarParameterItem.getMemoryArea() == memoryArea
+        assert s7AnyVarParameterItem.getDataBlockNumber() == (short) dataBlockNumber
+        assert s7AnyVarParameterItem.getByteOffset() == (short) byteOffset
+        assert s7AnyVarParameterItem.getBitOffset() == (byte) bitOffset
+        assert s7AnyVarParameterItem.getNumElements() == numItems
+        assert s7AnyVarParameterItem.getDataType() == datatype
+    }
+
+    @Unroll
+    def "Test encoding the different PLC write requests: '#address'"(String address, Object value, boolean expectedSuccess, MemoryArea expectedMemoryArea, int dataBlockNumber, int byteOffset, int bitOffset, int numItems, TransportSize datatype) {
+        setup:
+        initTest(null)
+        CompletableFuture<InternalPlcWriteRequest> future = new CompletableFuture<>()
+        PlcRequestContainer container = new PlcRequestContainer(
+            (DefaultPlcWriteRequest) writeRequestBuilder.addItem("foo", address, value).build(), future)
+        ChannelFuture channelFuture = SUT.writeOneOutbound(container)
+        S7Message writtenMessage = writeFuture.get(100, TimeUnit.MILLISECONDS)
+        Throwable exception = channelFuture.cause()
+
+        expect:
+        assert channelFuture.isSuccess() == expectedSuccess
+        assert expectedSuccess ? exception == null : exception != null
+        assert expectedSuccess ? writtenMessage != null : writtenMessage == null
+        if(expectedSuccess)
+            assertWriteRequestSuccess(writtenMessage, expectedMemoryArea, dataBlockNumber, byteOffset, bitOffset, numItems, datatype)
+        else
+            assertFailure(exception)
+
+        where:
+        address             | value               || expectedSuccess | expectedMemoryArea | dataBlockNumber | byteOffset | bitOffset | numItems | datatype
+        "%Q3.4:BOOL"        | true                || true            | MemoryArea.OUTPUTS | 0               | 3          | 4         | 1        | TransportSize.BOOL
+        "%Q3:SINT"          | (byte) 0x42         || true            | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.SINT
+        "%Q3:INT"           | (short) 0x4223      || true            | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.INT
+        "%Q3:DINT"          | (int) 4223          || true            | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.DINT
+        "%Q3:LINT"          | (long) 4223123      || true            | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.LINT
+        "%Q3:USINT"         | (byte) 0x42         || true            | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.USINT
+        "%Q3:UINT"          | (short) 0x4223      || true            | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.UINT
+        "%Q3:UDINT"         | (int) 4223          || true            | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.UDINT
+        "%Q3:ULINT"         | (long) 4223123      || true            | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.ULINT
+        "%Q3:REAL"          | (float) 42.312      || true            | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.REAL
+        "%Q3:LREAL"         | (double) 42.32      || true            | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.LREAL
+        "%Q3:STRING"        | "foo"               || true            | MemoryArea.OUTPUTS | 0               | 3          | 0         | 256      | TransportSize.STRING
+        "%Q3:WSTRING"       | "bar"               || true            | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.WSTRING
+        //"%Q3:DATE_AND_TIME" | LocalDateTime.now() || false           | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.DATE_AND_TIME
+    }
+
+    void assertWriteRequestSuccess(S7Message writtenMessage, MemoryArea memoryArea, int dataBlockNumber, int byteOffset, int bitOffset, int numItems, TransportSize datatype) {
+        assert writtenMessage instanceof S7RequestMessage
+        assert writtenMessage.getParameters().size() == 1
+        assert writtenMessage.getPayloads().size() == 1
+        assert writtenMessage.getParent() != null
+
+        assert writtenMessage.getParameters().get(0) instanceof VarParameter
+        VarParameter varParameter = (VarParameter) writtenMessage.getParameters().get(0)
+        assert varParameter.getItems().size() == 1
+
+        assert varParameter.getItems().get(0) instanceof S7AnyVarParameterItem
+        S7AnyVarParameterItem s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameter.getItems().get(0)
+        assert s7AnyVarParameterItem.getSpecificationType() == SpecificationType.VARIABLE_SPECIFICATION
+        assert s7AnyVarParameterItem.getMemoryArea() == memoryArea
+        assert s7AnyVarParameterItem.getDataBlockNumber() == (short) dataBlockNumber
+        assert s7AnyVarParameterItem.getByteOffset() == (short) byteOffset
+        assert s7AnyVarParameterItem.getBitOffset() == (byte) bitOffset
+        assert s7AnyVarParameterItem.getNumElements() == numItems
+        assert s7AnyVarParameterItem.getDataType() == datatype
+
+        assert writtenMessage.getPayloads().get(0) instanceof VarPayload
+        VarPayload varPayload = (VarPayload) writtenMessage.getPayloads().get(0)
+        assert varPayload.getItems().size() == 1
+    }
+
+
+
+    @Unroll
+    def "Test decoding the different PLC read responses: '#address'"(String address, MemoryArea memoryArea,
+                  int dataBlockNumber, int byteOffset, int bitOffset, int numItems, TransportSize datatype,
+                  DataTransportSize dataTransportSize, byte[] data, boolean expectedSuccess,
+                  PlcResponseCode expectedResponseCode, int expectedNumItems, Object[] expectedValues) {
+        setup:
+        initTest(address)
+        S7Parameter parameter = new VarParameter(ParameterType.READ_VAR, Collections.singletonList(
+            new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, memoryArea, datatype, numItems,
+                (short) dataBlockNumber, (short) byteOffset, (byte) bitOffset)))
+        S7Payload payload = new VarPayload(ParameterType.READ_VAR, Collections.singletonList(
+            new VarPayloadItem(DataTransportErrorCode.OK, dataTransportSize, data)))
+        // The tpdu has to match the id manually injected in the setup method.
+        S7Message response = new S7ResponseMessage(MessageType.JOB, (short) 1,
+            Collections.singletonList(parameter), Collections.singletonList(payload), (byte) 0, (byte) 0)
+        SUT.writeInbound(response)
+        PlcResponse receivedMessage = readFuture.get(100, TimeUnit.MILLISECONDS)
+
+        expect:
+        //assert expectedSuccess ? exception == null : exception != null
+        assert expectedSuccess ? receivedMessage != null : receivedMessage == null
+        if(expectedSuccess)
+            assertReadResponseSuccess(receivedMessage, expectedResponseCode, expectedNumItems, expectedValues)
+        else
+            assertFailure(exception)
+
+        where:
+
+        // Bit-String values
+        address      | memoryArea         | dataBlockNumber | byteOffset | bitOffset | numItems | datatype            | dataTransportSize                 | data                                             || expectedSuccess | expectedResponseCode | expectedNumItems | expectedValues
+        "%Q3.4:BOOL" | MemoryArea.OUTPUTS | 0               | 3          | 4         | 1        | TransportSize.BOOL  | DataTransportSize.BIT             | [0x01]                                           || true            | PlcResponseCode.OK   | 1                | [true]
+        "%Q3:BYTE"   | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.BYTE  | DataTransportSize.BYTE_WORD_DWORD | [0x23]                                           || true            | PlcResponseCode.OK   | 8                | [true, true, false, false, false, true, false, false]
+        "%Q3:WORD"   | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.WORD  | DataTransportSize.BYTE_WORD_DWORD | [0x43, 0xA1]                                     || true            | PlcResponseCode.OK   | 16               | [true, false, false, false, false, true, false, true, true, true, false, false, false, false, true, false]
+        "%Q3:DWORD"  | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.DWORD | DataTransportSize.BYTE_WORD_DWORD | [0x43, 0xA1, 0x11, 0xFA]                         || true            | PlcResponseCode.OK   | 32               | [false, true, false, true, true, true, true, true, true, false, false, false, true, false, false, false, true, false, false, false, false, true, false, true, true, true, false, false, false, false, true, false]
+        "%Q3:LWORD"  | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.LWORD | DataTransportSize.BYTE_WORD_DWORD | [0x43, 0xA1, 0x11, 0xFA, 0x53, 0x82, 0x13, 0x85] || true            | PlcResponseCode.OK   | 64               | [true, false, true, false, false, false, false, true, true, true, false, false, true, false, false, false, false, true, false, false, false, false, false, true, true, true, false, false, true, false, true, false, false, true, false, true, true, true, true, true, true, false, false, false, true, false, false, false, true, false, false, false, false, true, false, true, true, true, false, false, false, false, true, false]
+        // Integer values
+        //address    | memoryArea         | dataBlockNumber | byteOffset | bitOffset | numItems | datatype            | dataTransportSize                 | data                                             || expectedSuccess | expectedResponseCode | expectedNumItems | expectedValues
+        "%Q3:SINT"   | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.SINT  | DataTransportSize.INTEGER         | [0x43]                                           || true            | PlcResponseCode.OK   | 1                | [(byte) 0x43]
+        "%Q3:USINT"  | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.USINT | DataTransportSize.INTEGER         | [0xFF]                                           || true            | PlcResponseCode.OK   | 1                | [(short) 255]
+        "%Q3:INT"    | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.INT   | DataTransportSize.INTEGER         | [0x42, 0x23]                                     || true            | PlcResponseCode.OK   | 1                | [(short) 16931]
+        "%Q3:UINT"   | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.UINT  | DataTransportSize.INTEGER         | [0xFF, 0xFF]                                     || true            | PlcResponseCode.OK   | 1                | [(int) 65535]
+        "%Q3:DINT"   | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.DINT  | DataTransportSize.INTEGER         | [0x42, 0x23, 0x12, 0x74]                         || true            | PlcResponseCode.OK   | 1                | [(int) 1109594740]
+        "%Q3:UDINT"  | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.UDINT | DataTransportSize.INTEGER         | [0xFF, 0xFF, 0xFF, 0xFF]                         || true            | PlcResponseCode.OK   | 1                | [(long) 4294967295]
+        "%Q3:LINT"   | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.LINT  | DataTransportSize.INTEGER         | [0x43, 0xA1, 0x11, 0xFA, 0x53, 0x82, 0x13, 0x85] || true            | PlcResponseCode.OK   | 1                | [(long) 4873196038632117125]
+        //ULINT
+        // Floating point values
+        "%Q3:REAL"   | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.REAL  | DataTransportSize.REAL            | [0x42, 0x23, 0x12, 0x74]                         || true            | PlcResponseCode.OK   | 1                | [40.76802F]
+        "%Q3:LREAL"  | MemoryArea.OUTPUTS | 0               | 3          | 0         | 1        | TransportSize.LREAL | DataTransportSize.REAL            | [0x43, 0xA1, 0x11, 0xFA, 0x53, 0x82, 0x13, 0x85] || true            | PlcResponseCode.OK   | 1                | [6.150197049102015e+17D]
+    }
+
+    void assertReadResponseSuccess(PlcResponse receivedMessage, PlcResponseCode expectedResponseCode, int expectedNumItems, Object[] expectedValues) {
+        assert receivedMessage instanceof PlcReadResponse
+        PlcReadResponse readResponse = (PlcReadResponse) receivedMessage
+
+        assert readResponse.getNumberOfValues("bar") == expectedNumItems
+        assert readResponse.getResponseCode("bar") == expectedResponseCode
+        Object[] actualValues = readResponse.getAllObjects("bar")
+        if(expectedValues == null) {
+            assert actualValues == null
+        } else {
+            assert actualValues.length == expectedValues.length
+            for (int i = 0; i < actualValues.length; i++) {
+                assert actualValues[i].class == expectedValues[i].class
+                assert actualValues[i] == expectedValues[i]
+            }
+        }
+    }
+
+    void assertFailure(Throwable exception) {
+        assert exception != null
+        assert exception instanceof PlcProtocolException
+    }
+
+    void initTest(String address) {
+        writeFuture = new CompletableFuture<>()
+        readRequestBuilder = new DefaultPlcReadRequest.Builder(mock(PlcReader.class), new S7PlcFieldHandler())
+        writeRequestBuilder = new DefaultPlcWriteRequest.Builder(mock(PlcWriter.class), new S7PlcFieldHandler())
+
+        Plc4XS7Protocol protocol = new Plc4XS7Protocol()
+
+        if(address) {
+            readFuture = new CompletableFuture<>()
+            // Populate the 'requests' field with some manually crafted requests.
+            Field requestsFiled = Plc4XS7Protocol.class.getDeclaredField("requests")
+            requestsFiled.setAccessible(true)
+            Map<Short, PlcRequestContainer> requestMap = (Map<Short, PlcRequestContainer>) requestsFiled.get(protocol)
+            requestMap.put((short) 1, new PlcRequestContainer<>(readRequestBuilder.addItem("bar", address).build(), readFuture))
+            //requestMap.put((short) 2, new PlcRequestContainer<>(writeRequestBuilder.addItem("bar", address, 42).build(), readFuture))
+        }
+
+        SUT = new EmbeddedChannel(new ChannelOutboundHandlerAdapter() {
+            @Override
+            void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) {
+                if(msg instanceof S7Message) {
+                    writeFuture.complete((S7Message) msg)
+                    promise.setSuccess()
+                } else {
+                    promise.setFailure(new PlcProtocolException(
+                        "Got message of type " + msg.getClass().getSimpleName()))
+                }
+            }
+        }, protocol)
+    }
+
+
+}
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/issues/PLC4X56.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/issues/PLC4X56.java
index bc608969e97..3855d474852 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/issues/PLC4X56.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/issues/PLC4X56.java
@@ -1,81 +1,81 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.issues;
-
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.s7.model.S7Field;
-import org.apache.plc4x.java.s7.netty.model.types.MemoryArea;
-import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
-import org.junit.Assert;
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-
-public class PLC4X56 {
-
-    @Test
-    void name() {
-        S7Field field = S7Field.of("%DB56.DBB100:SINT[25]");
-        assertThat(field.getMemoryArea(), equalTo(MemoryArea.DATA_BLOCKS));
-        assertThat(field.getBlockNumber(), equalTo(56));
-        assertThat(field.getByteOffset(), equalTo(100));
-        assertThat(field.getBitOffset(), equalTo((short) 0));
-        assertThat(field.getDataType(), equalTo(TransportSize.SINT));
-        assertThat(field.getNumElements(), equalTo(25));
-    }
-
-    @Test
-    public void invalidBlockLengthThrowsException() throws Exception {
-        try {
-            S7Field field = S7Field.of("%DB2000.DBB8000000:SINT[25]");
-            Assert.fail();
-        }
-        catch (PlcInvalidFieldException e){
-            e.printStackTrace();
-            // exception thrown --> Test Ok
-        }
-    }
-
-    @Test
-    public void invalidBlockNumber1ThrowsException() throws Exception {
-        try {
-            S7Field field = S7Field.of("%DB0.DBB800:SINT[25]");
-            Assert.fail();
-        }
-        catch (PlcInvalidFieldException e){
-            e.printStackTrace();
-            // exception thrown --> Test Ok
-        }
-    }
-
-    @Test
-    public void invalidBlockNumber2ThrowsException() throws Exception {
-        try {
-            S7Field field = S7Field.of("%DB80000.DBB800:SINT[25]");
-            Assert.fail();
-        }
-        catch (PlcInvalidFieldException e){
-            e.printStackTrace();
-            // exception thrown --> Test Ok
-        }
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.issues;
+
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.s7.model.S7Field;
+import org.apache.plc4x.java.s7.netty.model.types.MemoryArea;
+import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
+import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+
+public class PLC4X56 {
+
+    @Test
+    void name() {
+        S7Field field = S7Field.of("%DB56.DBB100:SINT[25]");
+        assertThat(field.getMemoryArea(), equalTo(MemoryArea.DATA_BLOCKS));
+        assertThat(field.getBlockNumber(), equalTo(56));
+        assertThat(field.getByteOffset(), equalTo(100));
+        assertThat(field.getBitOffset(), equalTo((short) 0));
+        assertThat(field.getDataType(), equalTo(TransportSize.SINT));
+        assertThat(field.getNumElements(), equalTo(25));
+    }
+
+    @Test
+    public void invalidBlockLengthThrowsException() throws Exception {
+        try {
+            S7Field field = S7Field.of("%DB2000.DBB8000000:SINT[25]");
+            Assert.fail();
+        }
+        catch (PlcInvalidFieldException e){
+            e.printStackTrace();
+            // exception thrown --> Test Ok
+        }
+    }
+
+    @Test
+    public void invalidBlockNumber1ThrowsException() throws Exception {
+        try {
+            S7Field field = S7Field.of("%DB0.DBB800:SINT[25]");
+            Assert.fail();
+        }
+        catch (PlcInvalidFieldException e){
+            e.printStackTrace();
+            // exception thrown --> Test Ok
+        }
+    }
+
+    @Test
+    public void invalidBlockNumber2ThrowsException() throws Exception {
+        try {
+            S7Field field = S7Field.of("%DB80000.DBB800:SINT[25]");
+            Assert.fail();
+        }
+        catch (PlcInvalidFieldException e){
+            e.printStackTrace();
+            // exception thrown --> Test Ok
+        }
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/PcapGenerator.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/PcapGenerator.java
index dddeed935ed..6e5e1faf9e9 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/PcapGenerator.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/PcapGenerator.java
@@ -1,318 +1,318 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7;
-
-import org.apache.commons.io.FileExistsException;
-import org.apache.commons.io.FileUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.xpath.*;
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-
-/**
- * Little helper class used to generate pcap files for usage in Wireshark.
- * As I can't use the WireShark code to define the constant values for the s7 protocol as
- * this code is licensed under GPL, with this tool, I'll simply generate loads of pcap files
- * each with slightly different values and hereby find out the constant values.
- */
-public class PcapGenerator {
-
-    private static final int CONNECT_TPDU_CODE = 99;
-    private static final int CONNECT_TPDU_CLASS = 104;
-    private static final int CONNECT_TPDU_PARAMETER_CODE = 105;
-
-    private static final byte[] CONNECT_TEMPLATE = {
-        // PCAP header
-        // Global Header:
-        //  magic number
-        (byte) 0xD4, (byte) 0xC3, (byte) 0xB2, (byte) 0xA1,
-        //  Version(major / minor)
-        (byte) 0x02, (byte) 0x00, (byte) 0x04, (byte) 0x00,
-        //  Timezone
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        // 0
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        //  Snapshot length
-        (byte) 0xFF, (byte) 0xFF, (byte) 0x00, (byte) 0x00,
-        //  Network
-        (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        // Packet header
-        //  Timestamp (seconds)
-        (byte) 0x8F, (byte) 0x46, (byte) 0x4E, (byte) 0x53,
-        //  Timestamp (microseconds)
-        (byte) 0x1B, (byte) 0x0C, (byte) 0x0C, (byte) 0x00,
-        // Packet length (in file)
-        (byte) 0x44, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        // Packet length (real)
-        (byte) 0x44, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        ///////////////////////////////////////////////////
-        // Packet content
-        // Ethernet packet
-        (byte) 0x00, (byte) 0x1B, (byte) 0x1B, (byte) 0x1A,
-        (byte) 0xD6, (byte) 0xE0, (byte) 0xB8, (byte) 0x70,
-        (byte) 0xF4, (byte) 0x6D, (byte) 0x2F, (byte) 0x58,
-        (byte) 0x08, (byte) 0x00,
-        // IP packet
-        (byte) 0x45, (byte) 0x00, (byte) 0x00, (byte) 0x36,
-        (byte) 0x6B, (byte) 0x6E, (byte) 0x40, (byte) 0x00,
-        (byte) 0x40, (byte) 0x06, (byte) 0x44, (byte) 0xDF,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        // TCP packet
-        (byte) 0xCC, (byte) 0xDE, (byte) 0x00, (byte) 0x66,
-        (byte) 0x8B, (byte) 0x9F, (byte) 0x0B, (byte) 0x76,
-        (byte) 0x00, (byte) 0x1A, (byte) 0x4D, (byte) 0x96,
-        (byte) 0x50, (byte) 0x18, (byte) 0x72, (byte) 0x10,
-        (byte) 0x1D, (byte) 0x43, (byte) 0x00, (byte) 0x00,
-        // TPKT packet
-        (byte) 0x03, (byte) 0x00, (byte) 0x00, (byte) 0x0E, // 68
-        // 98
-        (byte) 0x09,
-        (byte) 0xE0 /* TPDU Code */,
-        (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00,
-        (byte) 0x00 /* TPDU Class */,
-        (byte) 0xFF /* TPDU Parameter Code */,
-        (byte) 0x01, (byte) 0x0a
-    };
-
-    private static final int READ_VARIABLE_MESSAGE_TYPE_BYTE = 102;
-    private static final int READ_VARIABLE_FUNCTION_CODE_BYTE = 111;
-    private static final int READ_VARIABLE_SPECIFICATION_TYPE_BYTE = 113;
-    private static final int READ_VARIABLE_SYNTAX_ID_BYTE = 115;
-    private static final int READ_VARIABLE_TRANSPORT_SIZE_BYTE = 116;
-    private static final int READ_VARIABLE_MEMORY_AREA = 121;
-
-    private static final byte[] READ_VARIABLE_TEMPLATE = {
-        // PCAP header
-        (byte) 0xD4, (byte) 0xC3, (byte) 0xB2, (byte) 0xA1,
-        (byte) 0x02, (byte) 0x00, (byte) 0x04, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0xFF, (byte) 0xFF, (byte) 0x00, (byte) 0x00,
-        (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x8F, (byte) 0x46, (byte) 0x4E, (byte) 0x53,
-        (byte) 0x1B, (byte) 0x0C, (byte) 0x0C, (byte) 0x00,
-        (byte) 0x55, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x55, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        // Packet content
-        // Ethernet packet
-        (byte) 0x00, (byte) 0x1B, (byte) 0x1B, (byte) 0x1A,
-        (byte) 0xD6, (byte) 0xE0, (byte) 0xB8, (byte) 0x70,
-        (byte) 0xF4, (byte) 0x6D, (byte) 0x2F, (byte) 0x58,
-        (byte) 0x08, (byte) 0x00,
-        // IP packet
-        (byte) 0x45, (byte) 0x00, (byte) 0x00, (byte) 0x47,
-        (byte) 0x6B, (byte) 0x6E, (byte) 0x40, (byte) 0x00,
-        (byte) 0x40, (byte) 0x06, (byte) 0x44, (byte) 0xDF,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        // TCP packet
-        (byte) 0xCC, (byte) 0xDE, (byte) 0x00, (byte) 0x66,
-        (byte) 0x8B, (byte) 0x9F, (byte) 0x0B, (byte) 0x76,
-        (byte) 0x00, (byte) 0x1A, (byte) 0x4D, (byte) 0x96,
-        (byte) 0x50, (byte) 0x18, (byte) 0x72, (byte) 0x10,
-        (byte) 0x1D, (byte) 0x43, (byte) 0x00, (byte) 0x00,
-        // TPKT packet
-        (byte) 0x03, (byte) 0x00, (byte) 0x00, (byte) 0x1F,
-        //
-        (byte) 0x02, (byte) 0xF0, (byte) 0x80,
-        // S7 packet
-        // Job header
-        (byte) 0x32, (byte) 0x01 /* Raw Message Type [102] */,
-        //  Timezone
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x0E, (byte) 0x00, (byte) 0x00,
-
-        (byte) 0x04 /* Function Code [111] */, (byte) 0x01,
-        (byte) 0x12 /* Specification Type [113] */, (byte) 0x0A,
-        (byte) 0x10 /* Variable Addressing Mode [115] */,
-        (byte) 0x02 /* Variable Type [116] */, (byte) 0x00, (byte) 0x40,
-        (byte) 0x00, (byte) 0x01, (byte) 0x84 /* Memory Area [121] */, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00
-    };
-
-    private static final int READ_VARIABLE_RESPONSE_TRANSPORT_SIZE = 116;
-
-    private static final byte[] READ_VARIABLE_RESPONSE_TEMPLATE = {
-        // PCAP header
-        // Global Header:
-        //  magic number
-        (byte) 0xD4, (byte) 0xC3, (byte) 0xB2, (byte) 0xA1,
-        //  Version(major / minor)
-        (byte) 0x02, (byte) 0x00, (byte) 0x04, (byte) 0x00,
-        //  Timezone
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        // 0
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        //  Snapshot length
-        (byte) 0xFF, (byte) 0xFF, (byte) 0x00, (byte) 0x00,
-        //  Network
-        (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        // Packet header
-        //  Timestamp (seconds)
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        //  Timestamp (microseconds)
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        // Packet length (in file)
-        (byte) 0xAB, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        // Packet length (real)
-        (byte) 0xAB, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        // Packet content
-        (byte) 0x00, (byte) 0x1b, (byte) 0x1b, (byte) 0x1a,
-        (byte) 0xd6, (byte) 0xe0, (byte) 0xb8, (byte) 0x70,
-        (byte) 0xf4, (byte) 0x6d, (byte) 0x2f, (byte) 0x58,
-        (byte) 0x08, (byte) 0x00, (byte) 0x45, (byte) 0x00,
-        (byte) 0x00, (byte) 0x9d, (byte) 0x6b, (byte) 0x6e,
-        (byte) 0x40, (byte) 0x00, (byte) 0x40, (byte) 0x06,
-        (byte) 0x44, (byte) 0xdf, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0xcc, (byte) 0xde,
-        (byte) 0x00, (byte) 0x66, (byte) 0x8b, (byte) 0x9f,
-        (byte) 0x0b, (byte) 0x76, (byte) 0x00, (byte) 0x1a,
-        (byte) 0x4d, (byte) 0x96, (byte) 0x50, (byte) 0x18,
-        (byte) 0x72, (byte) 0x10, (byte) 0x1d, (byte) 0x43,
-        (byte) 0x00, (byte) 0x00, (byte) 0x03, (byte) 0x00,
-        (byte) 0x00, (byte) 0x75, (byte) 0x02, (byte) 0xf0,
-        (byte) 0x80,
-        // S7 Packet
-        (byte) 0x32, (byte) 0x03, (byte) 0x00,
-        (byte) 0x00, (byte) 0x08, (byte) 0x00, (byte) 0x00,
-        (byte) 0x02, (byte) 0x00, (byte) 0x60, (byte) 0x00,
-        (byte) 0x00,
-        // Read Var Parameter
-        (byte) 0x04, (byte) 0x01,
-        // Data
-        (byte) 0xff,
-        (byte) 0x07, (byte) 0x00, (byte) 0x5c, (byte) 0x03,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0xaa, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-        (byte) 0x00, (byte) 0x00, (byte) 0x00
-    };
-
-    public static void main(String[] args) throws Exception {
-        File outputDir = new File("target/out");
-        System.out.println("Outputting to: " + outputDir.getAbsolutePath());
-
-        //
-        generateFiles(outputDir, "read-response/transport-size", READ_VARIABLE_RESPONSE_TRANSPORT_SIZE, READ_VARIABLE_RESPONSE_TEMPLATE,
-            "//field[@name='s7comm.data.transportsize' and not(contains(@showname, 'Unknown'))]");
-
-        // Connect variable generation
-        // FIXME: Not all codes are output probably due to errors in the rest package structure
-        generateFiles(outputDir, "connect/tpdu-code", CONNECT_TPDU_CODE, CONNECT_TEMPLATE,
-            "//field[@name='cotp.type' and (substring(@value, 2, 1) = '0')]");
-        generateFiles(outputDir, "connect/tpdu-class", CONNECT_TPDU_CLASS, CONNECT_TEMPLATE,
-            "//field[@name='cotp.class' and (substring(@unmaskedvalue, 2, 1) = '0')]");
-        generateFiles(outputDir, "connect/tpdu-parameter-code", CONNECT_TPDU_PARAMETER_CODE, CONNECT_TEMPLATE,
-            "//field[@name='cotp.parameter_code' and not(contains(@showname, 'Unknown'))]");
-
-        // Read variable generation
-        generateFiles(outputDir, "read/message-type", READ_VARIABLE_MESSAGE_TYPE_BYTE, READ_VARIABLE_TEMPLATE,
-            "//field[@name='s7comm.header.rosctr' and not(contains(@showname, 'Unknown'))]");
-        generateFiles(outputDir, "read/function-code", READ_VARIABLE_FUNCTION_CODE_BYTE, READ_VARIABLE_TEMPLATE,
-            "//field[@name='s7comm.param.func' and not(contains(@showname, 'Unknown'))]");
-        generateFiles(outputDir, "read/specification-type", READ_VARIABLE_SPECIFICATION_TYPE_BYTE, READ_VARIABLE_TEMPLATE,
-            "//field[@name='s7comm.param.item.varspec' and not(contains(../@showname, 'Unknown'))]");
-        generateFiles(outputDir, "read/syntax-id", READ_VARIABLE_SYNTAX_ID_BYTE, READ_VARIABLE_TEMPLATE,
-            "//field[@name='s7comm.param.item.syntaxid' and not(contains(@showname, 'Unknown'))]");
-        generateFiles(outputDir, "read/transport-size", READ_VARIABLE_TRANSPORT_SIZE_BYTE, READ_VARIABLE_TEMPLATE,
-            "//field[@name='s7comm.param.item.transp_size' and not(contains(@showname, 'Unknown'))]");
-        generateFiles(outputDir, "read/memory-area", READ_VARIABLE_MEMORY_AREA, READ_VARIABLE_TEMPLATE,
-            "//field[@name='s7comm.param.item.area' and not(contains(@showname, 'Unknown'))]");
-
-        // Read Ack variable generation
-
-        // Write variable generation
-
-        // Write Ack variable generation
-    }
-
-    private static void generateFiles(File parentDir, String testName, int byteIndex, byte[] template, String matchXPath)
-        throws IOException, ParserConfigurationException, XPathExpressionException, InterruptedException, SAXException {
-        File testDir = new File(parentDir, testName);
-        if (!testDir.exists() && !testDir.mkdirs()) {
-            throw new FileExistsException("Error creating directory " + testDir.getAbsolutePath());
-        }
-
-        // Initialize the heavy weight XML stuff.
-        DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance();
-        domFactory.setNamespaceAware(true);
-        DocumentBuilder builder = domFactory.newDocumentBuilder();
-        XPathFactory factory = XPathFactory.newInstance();
-        XPath xpath = factory.newXPath();
-        XPathExpression expr = xpath.compile(matchXPath);
-
-        // Iterate over all possible value the current byte could have.
-        for (int i = 0; i <= 255; i++) {
-
-            // Generate a packet.
-            byte[] copy = Arrays.copyOf(template, template.length);
-            copy[byteIndex] = (byte) i;
-            File output = new File(testDir, i + ".pcap");
-            FileUtils.writeByteArrayToFile(output, copy);
-
-            // Use WireShark to decode the packet to an xml form.
-            File decodedOutput = new File(testDir, i + ".xml");
-            ProcessBuilder pb = new ProcessBuilder("tshark", "-T", "pdml", "-r", output.getAbsolutePath());
-            pb.redirectOutput(ProcessBuilder.Redirect.to(decodedOutput));
-            Process process = pb.start();
-            process.waitFor();
-
-            // Check if a given XPath is found -> A valid parameter was found.
-            Document document = builder.parse(decodedOutput);
-            NodeList list = (NodeList) expr.evaluate(document, XPathConstants.NODESET);
-
-            // If a valid parameter is found, output that to the console.
-            if (list.getLength() > 0) {
-                String name = list.item(0).getAttributes().getNamedItem("showname").getNodeValue();
-                String value = list.item(0).getAttributes().getNamedItem("value").getNodeValue();
-                System.out.println("found option for " + testName + ": " + name + " = 0x" + value);
-            }
-        }
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7;
+
+import org.apache.commons.io.FileExistsException;
+import org.apache.commons.io.FileUtils;
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.xpath.*;
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+
+/**
+ * Little helper class used to generate pcap files for usage in Wireshark.
+ * As I can't use the WireShark code to define the constant values for the s7 protocol as
+ * this code is licensed under GPL, with this tool, I'll simply generate loads of pcap files
+ * each with slightly different values and hereby find out the constant values.
+ */
+public class PcapGenerator {
+
+    private static final int CONNECT_TPDU_CODE = 99;
+    private static final int CONNECT_TPDU_CLASS = 104;
+    private static final int CONNECT_TPDU_PARAMETER_CODE = 105;
+
+    private static final byte[] CONNECT_TEMPLATE = {
+        // PCAP header
+        // Global Header:
+        //  magic number
+        (byte) 0xD4, (byte) 0xC3, (byte) 0xB2, (byte) 0xA1,
+        //  Version(major / minor)
+        (byte) 0x02, (byte) 0x00, (byte) 0x04, (byte) 0x00,
+        //  Timezone
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        // 0
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        //  Snapshot length
+        (byte) 0xFF, (byte) 0xFF, (byte) 0x00, (byte) 0x00,
+        //  Network
+        (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        // Packet header
+        //  Timestamp (seconds)
+        (byte) 0x8F, (byte) 0x46, (byte) 0x4E, (byte) 0x53,
+        //  Timestamp (microseconds)
+        (byte) 0x1B, (byte) 0x0C, (byte) 0x0C, (byte) 0x00,
+        // Packet length (in file)
+        (byte) 0x44, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        // Packet length (real)
+        (byte) 0x44, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        ///////////////////////////////////////////////////
+        // Packet content
+        // Ethernet packet
+        (byte) 0x00, (byte) 0x1B, (byte) 0x1B, (byte) 0x1A,
+        (byte) 0xD6, (byte) 0xE0, (byte) 0xB8, (byte) 0x70,
+        (byte) 0xF4, (byte) 0x6D, (byte) 0x2F, (byte) 0x58,
+        (byte) 0x08, (byte) 0x00,
+        // IP packet
+        (byte) 0x45, (byte) 0x00, (byte) 0x00, (byte) 0x36,
+        (byte) 0x6B, (byte) 0x6E, (byte) 0x40, (byte) 0x00,
+        (byte) 0x40, (byte) 0x06, (byte) 0x44, (byte) 0xDF,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        // TCP packet
+        (byte) 0xCC, (byte) 0xDE, (byte) 0x00, (byte) 0x66,
+        (byte) 0x8B, (byte) 0x9F, (byte) 0x0B, (byte) 0x76,
+        (byte) 0x00, (byte) 0x1A, (byte) 0x4D, (byte) 0x96,
+        (byte) 0x50, (byte) 0x18, (byte) 0x72, (byte) 0x10,
+        (byte) 0x1D, (byte) 0x43, (byte) 0x00, (byte) 0x00,
+        // TPKT packet
+        (byte) 0x03, (byte) 0x00, (byte) 0x00, (byte) 0x0E, // 68
+        // 98
+        (byte) 0x09,
+        (byte) 0xE0 /* TPDU Code */,
+        (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00,
+        (byte) 0x00 /* TPDU Class */,
+        (byte) 0xFF /* TPDU Parameter Code */,
+        (byte) 0x01, (byte) 0x0a
+    };
+
+    private static final int READ_VARIABLE_MESSAGE_TYPE_BYTE = 102;
+    private static final int READ_VARIABLE_FUNCTION_CODE_BYTE = 111;
+    private static final int READ_VARIABLE_SPECIFICATION_TYPE_BYTE = 113;
+    private static final int READ_VARIABLE_SYNTAX_ID_BYTE = 115;
+    private static final int READ_VARIABLE_TRANSPORT_SIZE_BYTE = 116;
+    private static final int READ_VARIABLE_MEMORY_AREA = 121;
+
+    private static final byte[] READ_VARIABLE_TEMPLATE = {
+        // PCAP header
+        (byte) 0xD4, (byte) 0xC3, (byte) 0xB2, (byte) 0xA1,
+        (byte) 0x02, (byte) 0x00, (byte) 0x04, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0xFF, (byte) 0xFF, (byte) 0x00, (byte) 0x00,
+        (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x8F, (byte) 0x46, (byte) 0x4E, (byte) 0x53,
+        (byte) 0x1B, (byte) 0x0C, (byte) 0x0C, (byte) 0x00,
+        (byte) 0x55, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x55, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        // Packet content
+        // Ethernet packet
+        (byte) 0x00, (byte) 0x1B, (byte) 0x1B, (byte) 0x1A,
+        (byte) 0xD6, (byte) 0xE0, (byte) 0xB8, (byte) 0x70,
+        (byte) 0xF4, (byte) 0x6D, (byte) 0x2F, (byte) 0x58,
+        (byte) 0x08, (byte) 0x00,
+        // IP packet
+        (byte) 0x45, (byte) 0x00, (byte) 0x00, (byte) 0x47,
+        (byte) 0x6B, (byte) 0x6E, (byte) 0x40, (byte) 0x00,
+        (byte) 0x40, (byte) 0x06, (byte) 0x44, (byte) 0xDF,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        // TCP packet
+        (byte) 0xCC, (byte) 0xDE, (byte) 0x00, (byte) 0x66,
+        (byte) 0x8B, (byte) 0x9F, (byte) 0x0B, (byte) 0x76,
+        (byte) 0x00, (byte) 0x1A, (byte) 0x4D, (byte) 0x96,
+        (byte) 0x50, (byte) 0x18, (byte) 0x72, (byte) 0x10,
+        (byte) 0x1D, (byte) 0x43, (byte) 0x00, (byte) 0x00,
+        // TPKT packet
+        (byte) 0x03, (byte) 0x00, (byte) 0x00, (byte) 0x1F,
+        //
+        (byte) 0x02, (byte) 0xF0, (byte) 0x80,
+        // S7 packet
+        // Job header
+        (byte) 0x32, (byte) 0x01 /* Raw Message Type [102] */,
+        //  Timezone
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x0E, (byte) 0x00, (byte) 0x00,
+
+        (byte) 0x04 /* Function Code [111] */, (byte) 0x01,
+        (byte) 0x12 /* Specification Type [113] */, (byte) 0x0A,
+        (byte) 0x10 /* Variable Addressing Mode [115] */,
+        (byte) 0x02 /* Variable Type [116] */, (byte) 0x00, (byte) 0x40,
+        (byte) 0x00, (byte) 0x01, (byte) 0x84 /* Memory Area [121] */, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00
+    };
+
+    private static final int READ_VARIABLE_RESPONSE_TRANSPORT_SIZE = 116;
+
+    private static final byte[] READ_VARIABLE_RESPONSE_TEMPLATE = {
+        // PCAP header
+        // Global Header:
+        //  magic number
+        (byte) 0xD4, (byte) 0xC3, (byte) 0xB2, (byte) 0xA1,
+        //  Version(major / minor)
+        (byte) 0x02, (byte) 0x00, (byte) 0x04, (byte) 0x00,
+        //  Timezone
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        // 0
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        //  Snapshot length
+        (byte) 0xFF, (byte) 0xFF, (byte) 0x00, (byte) 0x00,
+        //  Network
+        (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        // Packet header
+        //  Timestamp (seconds)
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        //  Timestamp (microseconds)
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        // Packet length (in file)
+        (byte) 0xAB, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        // Packet length (real)
+        (byte) 0xAB, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        // Packet content
+        (byte) 0x00, (byte) 0x1b, (byte) 0x1b, (byte) 0x1a,
+        (byte) 0xd6, (byte) 0xe0, (byte) 0xb8, (byte) 0x70,
+        (byte) 0xf4, (byte) 0x6d, (byte) 0x2f, (byte) 0x58,
+        (byte) 0x08, (byte) 0x00, (byte) 0x45, (byte) 0x00,
+        (byte) 0x00, (byte) 0x9d, (byte) 0x6b, (byte) 0x6e,
+        (byte) 0x40, (byte) 0x00, (byte) 0x40, (byte) 0x06,
+        (byte) 0x44, (byte) 0xdf, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0xcc, (byte) 0xde,
+        (byte) 0x00, (byte) 0x66, (byte) 0x8b, (byte) 0x9f,
+        (byte) 0x0b, (byte) 0x76, (byte) 0x00, (byte) 0x1a,
+        (byte) 0x4d, (byte) 0x96, (byte) 0x50, (byte) 0x18,
+        (byte) 0x72, (byte) 0x10, (byte) 0x1d, (byte) 0x43,
+        (byte) 0x00, (byte) 0x00, (byte) 0x03, (byte) 0x00,
+        (byte) 0x00, (byte) 0x75, (byte) 0x02, (byte) 0xf0,
+        (byte) 0x80,
+        // S7 Packet
+        (byte) 0x32, (byte) 0x03, (byte) 0x00,
+        (byte) 0x00, (byte) 0x08, (byte) 0x00, (byte) 0x00,
+        (byte) 0x02, (byte) 0x00, (byte) 0x60, (byte) 0x00,
+        (byte) 0x00,
+        // Read Var Parameter
+        (byte) 0x04, (byte) 0x01,
+        // Data
+        (byte) 0xff,
+        (byte) 0x07, (byte) 0x00, (byte) 0x5c, (byte) 0x03,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0xaa, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        (byte) 0x00, (byte) 0x00, (byte) 0x00
+    };
+
+    public static void main(String[] args) throws Exception {
+        File outputDir = new File("target/out");
+        System.out.println("Outputting to: " + outputDir.getAbsolutePath());
+
+        //
+        generateFiles(outputDir, "read-response/transport-size", READ_VARIABLE_RESPONSE_TRANSPORT_SIZE, READ_VARIABLE_RESPONSE_TEMPLATE,
+            "//field[@name='s7comm.data.transportsize' and not(contains(@showname, 'Unknown'))]");
+
+        // Connect variable generation
+        // FIXME: Not all codes are output probably due to errors in the rest package structure
+        generateFiles(outputDir, "connect/tpdu-code", CONNECT_TPDU_CODE, CONNECT_TEMPLATE,
+            "//field[@name='cotp.type' and (substring(@value, 2, 1) = '0')]");
+        generateFiles(outputDir, "connect/tpdu-class", CONNECT_TPDU_CLASS, CONNECT_TEMPLATE,
+            "//field[@name='cotp.class' and (substring(@unmaskedvalue, 2, 1) = '0')]");
+        generateFiles(outputDir, "connect/tpdu-parameter-code", CONNECT_TPDU_PARAMETER_CODE, CONNECT_TEMPLATE,
+            "//field[@name='cotp.parameter_code' and not(contains(@showname, 'Unknown'))]");
+
+        // Read variable generation
+        generateFiles(outputDir, "read/message-type", READ_VARIABLE_MESSAGE_TYPE_BYTE, READ_VARIABLE_TEMPLATE,
+            "//field[@name='s7comm.header.rosctr' and not(contains(@showname, 'Unknown'))]");
+        generateFiles(outputDir, "read/function-code", READ_VARIABLE_FUNCTION_CODE_BYTE, READ_VARIABLE_TEMPLATE,
+            "//field[@name='s7comm.param.func' and not(contains(@showname, 'Unknown'))]");
+        generateFiles(outputDir, "read/specification-type", READ_VARIABLE_SPECIFICATION_TYPE_BYTE, READ_VARIABLE_TEMPLATE,
+            "//field[@name='s7comm.param.item.varspec' and not(contains(../@showname, 'Unknown'))]");
+        generateFiles(outputDir, "read/syntax-id", READ_VARIABLE_SYNTAX_ID_BYTE, READ_VARIABLE_TEMPLATE,
+            "//field[@name='s7comm.param.item.syntaxid' and not(contains(@showname, 'Unknown'))]");
+        generateFiles(outputDir, "read/transport-size", READ_VARIABLE_TRANSPORT_SIZE_BYTE, READ_VARIABLE_TEMPLATE,
+            "//field[@name='s7comm.param.item.transp_size' and not(contains(@showname, 'Unknown'))]");
+        generateFiles(outputDir, "read/memory-area", READ_VARIABLE_MEMORY_AREA, READ_VARIABLE_TEMPLATE,
+            "//field[@name='s7comm.param.item.area' and not(contains(@showname, 'Unknown'))]");
+
+        // Read Ack variable generation
+
+        // Write variable generation
+
+        // Write Ack variable generation
+    }
+
+    private static void generateFiles(File parentDir, String testName, int byteIndex, byte[] template, String matchXPath)
+        throws IOException, ParserConfigurationException, XPathExpressionException, InterruptedException, SAXException {
+        File testDir = new File(parentDir, testName);
+        if (!testDir.exists() && !testDir.mkdirs()) {
+            throw new FileExistsException("Error creating directory " + testDir.getAbsolutePath());
+        }
+
+        // Initialize the heavy weight XML stuff.
+        DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance();
+        domFactory.setNamespaceAware(true);
+        DocumentBuilder builder = domFactory.newDocumentBuilder();
+        XPathFactory factory = XPathFactory.newInstance();
+        XPath xpath = factory.newXPath();
+        XPathExpression expr = xpath.compile(matchXPath);
+
+        // Iterate over all possible value the current byte could have.
+        for (int i = 0; i <= 255; i++) {
+
+            // Generate a packet.
+            byte[] copy = Arrays.copyOf(template, template.length);
+            copy[byteIndex] = (byte) i;
+            File output = new File(testDir, i + ".pcap");
+            FileUtils.writeByteArrayToFile(output, copy);
+
+            // Use WireShark to decode the packet to an xml form.
+            File decodedOutput = new File(testDir, i + ".xml");
+            ProcessBuilder pb = new ProcessBuilder("tshark", "-T", "pdml", "-r", output.getAbsolutePath());
+            pb.redirectOutput(ProcessBuilder.Redirect.to(decodedOutput));
+            Process process = pb.start();
+            process.waitFor();
+
+            // Check if a given XPath is found -> A valid parameter was found.
+            Document document = builder.parse(decodedOutput);
+            NodeList list = (NodeList) expr.evaluate(document, XPathConstants.NODESET);
+
+            // If a valid parameter is found, output that to the console.
+            if (list.getLength() > 0) {
+                String name = list.item(0).getAttributes().getNamedItem("showname").getNodeValue();
+                String value = list.item(0).getAttributes().getNamedItem("value").getNodeValue();
+                System.out.println("found option for " + testName + ": " + name + " = 0x" + value);
+            }
+        }
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/model/S7FieldTests.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/model/S7FieldTests.java
index fc829562a2d..46f1f0cb2c1 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/model/S7FieldTests.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/model/S7FieldTests.java
@@ -1,103 +1,103 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.model;
-
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.s7.netty.model.types.MemoryArea;
-import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
-import org.apache.plc4x.test.FastTests;
-import org.junit.experimental.categories.Category;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import java.util.stream.Stream;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.junit.Assert.*;
-
-class S7FieldTests {
-
-    private static Stream<Arguments> validFieldQueries() {
-        return Stream.of(
-            Arguments.of("%I0.1:BOOL",          TransportSize.BOOL,  MemoryArea.INPUTS,      0,  0,  1),
-            Arguments.of("%ID64:REAL",          TransportSize.REAL,  MemoryArea.INPUTS,      0,  64, 0),
-            Arguments.of("%Q0.4:BOOL",          TransportSize.BOOL,  MemoryArea.OUTPUTS,     0,  0,  4),
-            Arguments.of("%M9.0:BOOL",          TransportSize.BOOL,  MemoryArea.FLAGS_MARKERS,     0,  9,  0),
-            Arguments.of("%DB1.DBX38.1:BOOL",   TransportSize.BOOL,  MemoryArea.DATA_BLOCKS, 1,  38, 1)/*,
-            // Not quite sure about how Data Block addresses look like, in my TIA portal they all have the prefix "DB".
-            Arguments.of("%DB3.DX4.1:BOOL",     S7DataType.BOOL,  MemoryArea.DATA_BLOCKS, 3,  4,  1),
-            Arguments.of("%DB3.DB4:INT",        S7DataType.INT,   MemoryArea.DATA_BLOCKS, 3,  4,  0),
-            Arguments.of("%DB3.DB4:UINT",       S7DataType.UINT,  MemoryArea.DATA_BLOCKS, 3,  4,  0),
-            Arguments.of("%DB3.DW4:REAL",       S7DataType.REAL,  MemoryArea.DATA_BLOCKS, 3,  4,  0)*/
-        );
-    }
-
-    private static Stream<Arguments> invalidFieldQueries() {
-        return Stream.of(
-            Arguments.of("%I0:BOOL"),
-            Arguments.of("%IW64:REAL"),
-            Arguments.of("%DB1.DBX38:BOOL")
-        );
-    }
-
-    @ParameterizedTest
-    @Category(FastTests.class)
-    @MethodSource("validFieldQueries")
-    void testValidFieldQueryParsing(String fieldQuery, TransportSize expectedClientType, MemoryArea expectedMemoryArea,
-                                    int expectedMemoryBlockNumber, int expectedByteOffset, int expectedBitOffset) {
-        S7Field field = S7Field.of(fieldQuery);
-        assertThat(field, notNullValue());
-        assertThat(field.getDataType(), equalTo(expectedClientType));
-        assertThat(field.getMemoryArea(), equalTo(expectedMemoryArea));
-        assertThat(field.getBlockNumber(), equalTo(expectedMemoryBlockNumber));
-        assertThat(field.getByteOffset(), equalTo(expectedByteOffset));
-        assertThat(field.getBitOffset(), equalTo((short) expectedBitOffset));
-    }
-
-    @ParameterizedTest
-    @Category(FastTests.class)
-    @MethodSource("invalidFieldQueries")
-    void testInvalidFieldQueryParsing(String fieldQuery) {
-        try {
-            S7Field.of(fieldQuery);
-            fail("Should have thrown an exception");
-        } catch (PlcRuntimeException e) {
-            // This was expected.
-        }
-    }
-
-    @Test
-    void getDefaultJavaType() {
-        final PlcField field = S7Field.of("%DB1.DBX38.1:BOOL");
-
-        assertThat(field.getDefaultJavaType(), equalTo(Boolean.class));
-    }
-
-    @Test
-    void checkGreedyNumFieldsParsing() {
-        S7Field field = S7Field.of("%DB56.DBB100:SINT[25]");
-
-        assertEquals(25, field.getNumElements());
-    }
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.model;
+
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.s7.netty.model.types.MemoryArea;
+import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
+import org.apache.plc4x.test.FastTests;
+import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.junit.Assert.*;
+
+class S7FieldTests {
+
+    private static Stream<Arguments> validFieldQueries() {
+        return Stream.of(
+            Arguments.of("%I0.1:BOOL",          TransportSize.BOOL,  MemoryArea.INPUTS,      0,  0,  1),
+            Arguments.of("%ID64:REAL",          TransportSize.REAL,  MemoryArea.INPUTS,      0,  64, 0),
+            Arguments.of("%Q0.4:BOOL",          TransportSize.BOOL,  MemoryArea.OUTPUTS,     0,  0,  4),
+            Arguments.of("%M9.0:BOOL",          TransportSize.BOOL,  MemoryArea.FLAGS_MARKERS,     0,  9,  0),
+            Arguments.of("%DB1.DBX38.1:BOOL",   TransportSize.BOOL,  MemoryArea.DATA_BLOCKS, 1,  38, 1)/*,
+            // Not quite sure about how Data Block addresses look like, in my TIA portal they all have the prefix "DB".
+            Arguments.of("%DB3.DX4.1:BOOL",     S7DataType.BOOL,  MemoryArea.DATA_BLOCKS, 3,  4,  1),
+            Arguments.of("%DB3.DB4:INT",        S7DataType.INT,   MemoryArea.DATA_BLOCKS, 3,  4,  0),
+            Arguments.of("%DB3.DB4:UINT",       S7DataType.UINT,  MemoryArea.DATA_BLOCKS, 3,  4,  0),
+            Arguments.of("%DB3.DW4:REAL",       S7DataType.REAL,  MemoryArea.DATA_BLOCKS, 3,  4,  0)*/
+        );
+    }
+
+    private static Stream<Arguments> invalidFieldQueries() {
+        return Stream.of(
+            Arguments.of("%I0:BOOL"),
+            Arguments.of("%IW64:REAL"),
+            Arguments.of("%DB1.DBX38:BOOL")
+        );
+    }
+
+    @ParameterizedTest
+    @Category(FastTests.class)
+    @MethodSource("validFieldQueries")
+    void testValidFieldQueryParsing(String fieldQuery, TransportSize expectedClientType, MemoryArea expectedMemoryArea,
+                                    int expectedMemoryBlockNumber, int expectedByteOffset, int expectedBitOffset) {
+        S7Field field = S7Field.of(fieldQuery);
+        assertThat(field, notNullValue());
+        assertThat(field.getDataType(), equalTo(expectedClientType));
+        assertThat(field.getMemoryArea(), equalTo(expectedMemoryArea));
+        assertThat(field.getBlockNumber(), equalTo(expectedMemoryBlockNumber));
+        assertThat(field.getByteOffset(), equalTo(expectedByteOffset));
+        assertThat(field.getBitOffset(), equalTo((short) expectedBitOffset));
+    }
+
+    @ParameterizedTest
+    @Category(FastTests.class)
+    @MethodSource("invalidFieldQueries")
+    void testInvalidFieldQueryParsing(String fieldQuery) {
+        try {
+            S7Field.of(fieldQuery);
+            fail("Should have thrown an exception");
+        } catch (PlcRuntimeException e) {
+            // This was expected.
+        }
+    }
+
+    @Test
+    void getDefaultJavaType() {
+        final PlcField field = S7Field.of("%DB1.DBX38.1:BOOL");
+
+        assertThat(field.getDefaultJavaType(), equalTo(Boolean.class));
+    }
+
+    @Test
+    void checkGreedyNumFieldsParsing() {
+        S7Field field = S7Field.of("%DB56.DBB100:SINT[25]");
+
+        assertEquals(25, field.getNumElements());
+    }
 }
\ No newline at end of file
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolTest.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolTest.java
index b2d41114896..452132577a5 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolTest.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolTest.java
@@ -1,184 +1,184 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty;
-
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelOutboundHandlerAdapter;
-import io.netty.channel.ChannelPromise;
-import io.netty.channel.embedded.EmbeddedChannel;
-import io.netty.handler.codec.EncoderException;
-import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.messages.*;
-import org.apache.plc4x.java.s7.netty.model.messages.S7Message;
-import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
-import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
-import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
-import org.apache.plc4x.java.s7.netty.model.types.*;
-import org.apache.plc4x.java.s7.netty.util.S7PlcFieldHandler;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import static org.hamcrest.Matchers.*;
-import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.hamcrest.core.IsNull.nullValue;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class Plc4XS7ProtocolTest {
-
-    private EmbeddedChannel SUT;
-    private PlcReadRequest.Builder readRequestBuilder =
-        new DefaultPlcReadRequest.Builder(mock(PlcReader.class), new S7PlcFieldHandler());
-    private PlcWriteRequest.Builder writeRequestBuilder =
-        new DefaultPlcWriteRequest.Builder(mock(PlcWriter.class), new S7PlcFieldHandler());
-    private CompletableFuture<S7Message> writeFuture;
-
-    @Before
-    public void setUp() {
-        writeFuture = new CompletableFuture<>();
-        SUT = new EmbeddedChannel(new ChannelOutboundHandlerAdapter() {
-            @Override
-            public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) {
-                if(msg instanceof S7Message) {
-                    writeFuture.complete((S7Message) msg);
-                    promise.setSuccess();
-                } else {
-                    promise.setFailure(new PlcProtocolException(
-                        "Got message of type " + msg.getClass().getSimpleName()));
-                }
-            }
-        }, new Plc4XS7Protocol());
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void testInvalidFieldType() {
-        CompletableFuture<InternalPlcReadRequest> future = new CompletableFuture<>();
-        DefaultPlcReadRequest readRequest = mock(DefaultPlcReadRequest.class);
-        when(readRequest.getFieldNames()).thenReturn(new LinkedHashSet<>(Collections.singleton("foo")));
-        when(readRequest.getField("foo")).thenReturn(mock(PlcField.class));
-        PlcRequestContainer container = new PlcRequestContainer(readRequest, future);
-        ChannelFuture channelFuture = SUT.writeOneOutbound(container);
-        assertThat("The promise should have been set to 'success'", channelFuture.isSuccess(), equalTo(false));
-
-        Throwable exception = channelFuture.cause();
-        assertThat("An exception should have been thrown", exception, notNullValue());
-        assertThat(exception, instanceOf(EncoderException.class));
-        EncoderException encoderException = (EncoderException) exception;
-        assertThat(encoderException.getCause(), instanceOf(PlcProtocolException.class));
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void testSimpleReadVarRequest() throws InterruptedException, ExecutionException, TimeoutException {
-        CompletableFuture<InternalPlcReadRequest> future = new CompletableFuture<>();
-        PlcRequestContainer container = new PlcRequestContainer(
-            (DefaultPlcReadRequest) readRequestBuilder.addItem("foo", "%Q0:BYTE").build(), future);
-        ChannelFuture channelFuture = SUT.writeOneOutbound(container);
-        assertThat("The promise should have been set to 'success'", channelFuture.isSuccess(), equalTo(true));
-
-        Throwable exception = channelFuture.cause();
-        assertThat("No exception should have been thrown", exception, nullValue());
-
-        S7Message writtenMessage = writeFuture.get(100, TimeUnit.MILLISECONDS);
-        assertThat("The protocol layer should have output something", writtenMessage, notNullValue());
-        assertThat("The protocol layer should have output something", writtenMessage, instanceOf(S7RequestMessage.class));
-
-        assertThat("The message should have one parameter", writtenMessage.getParameters(), hasSize(1));
-        assertThat("The message should have no payload", writtenMessage.getPayloads(), empty());
-        assertThat("The request container should be assigned parent to the write message",
-            writtenMessage.getParent(), equalTo(container));
-
-        assertThat(writtenMessage.getParameters().get(0), instanceOf(VarParameter.class));
-        VarParameter varParameter = (VarParameter) writtenMessage.getParameters().get(0);
-        assertThat(varParameter.getItems(), hasSize(1));
-
-        assertThat(varParameter.getItems().get(0), instanceOf(S7AnyVarParameterItem.class));
-        S7AnyVarParameterItem s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameter.getItems().get(0);
-        assertThat(s7AnyVarParameterItem.getSpecificationType(), equalTo(SpecificationType.VARIABLE_SPECIFICATION));
-        assertThat(s7AnyVarParameterItem.getMemoryArea(), equalTo(MemoryArea.OUTPUTS));
-        assertThat(s7AnyVarParameterItem.getDataBlockNumber(), equalTo(0));
-        assertThat(s7AnyVarParameterItem.getByteOffset(), equalTo(0));
-        assertThat(s7AnyVarParameterItem.getBitOffset(), equalTo((byte) 0));
-        assertThat(s7AnyVarParameterItem.getNumElements(), equalTo(1));
-        assertThat(s7AnyVarParameterItem.getDataType(), equalTo(TransportSize.BYTE));
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void testSimpleWriteVarRequest() throws InterruptedException, ExecutionException, TimeoutException {
-        CompletableFuture<InternalPlcWriteRequest> future = new CompletableFuture<>();
-        PlcRequestContainer container = new PlcRequestContainer(
-            (DefaultPlcWriteRequest) writeRequestBuilder.addItem("foo", "%Q0:BYTE", (byte) 0x42).build(), future);
-        ChannelFuture channelFuture = SUT.writeOneOutbound(container);
-        assertThat("The promise should have been set to 'success'", channelFuture.isSuccess(), equalTo(true));
-
-        Throwable exception = channelFuture.cause();
-        assertThat("No exception should have been thrown", exception, nullValue());
-
-        S7Message writtenMessage = writeFuture.get(100, TimeUnit.MILLISECONDS);
-        assertThat("The protocol layer should have output something", writtenMessage, notNullValue());
-        assertThat("The protocol layer should have output something", writtenMessage, instanceOf(S7RequestMessage.class));
-
-        assertThat("The message should have one parameter", writtenMessage.getParameters(), hasSize(1));
-        assertThat("The message should have one payload", writtenMessage.getPayloads(), hasSize(1));
-        assertThat("The request container should be assigned parent to the write message",
-            writtenMessage.getParent(), equalTo(container));
-
-        assertThat(writtenMessage.getParameters().get(0), instanceOf(VarParameter.class));
-        VarParameter varParameter = (VarParameter) writtenMessage.getParameters().get(0);
-        assertThat(varParameter.getItems(), hasSize(1));
-        assertThat(varParameter.getItems().get(0), instanceOf(S7AnyVarParameterItem.class));
-        S7AnyVarParameterItem s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameter.getItems().get(0);
-        assertThat(s7AnyVarParameterItem.getSpecificationType(), equalTo(SpecificationType.VARIABLE_SPECIFICATION));
-        assertThat(s7AnyVarParameterItem.getMemoryArea(), equalTo(MemoryArea.OUTPUTS));
-        assertThat(s7AnyVarParameterItem.getDataBlockNumber(), equalTo(0));
-        assertThat(s7AnyVarParameterItem.getByteOffset(), equalTo(0));
-        assertThat(s7AnyVarParameterItem.getBitOffset(), equalTo((byte) 0));
-        assertThat(s7AnyVarParameterItem.getNumElements(), equalTo(1));
-        assertThat(s7AnyVarParameterItem.getDataType(), equalTo(TransportSize.BYTE));
-
-        assertThat(writtenMessage.getPayloads().get(0), instanceOf(VarPayload.class));
-        VarPayload varPayload = (VarPayload) writtenMessage.getPayloads().get(0);
-        assertThat(varPayload.getItems(), hasSize(1));
-        assertThat(varPayload.getItems().get(0), instanceOf(VarPayloadItem.class));
-        VarPayloadItem varPayloadItem = varPayload.getItems().get(0);
-        assertThat(varPayloadItem.getReturnCode(), equalTo(DataTransportErrorCode.RESERVED));
-        assertThat(varPayloadItem.getDataTransportSize(), equalTo(DataTransportSize.BYTE_WORD_DWORD));
-        assertThat(varPayloadItem.getData(), notNullValue());
-        assertThat(varPayloadItem.getData().length, equalTo(1));
-        assertThat(varPayloadItem.getData()[0], equalTo((byte) 0x42));
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty;
+
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelOutboundHandlerAdapter;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.embedded.EmbeddedChannel;
+import io.netty.handler.codec.EncoderException;
+import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.messages.*;
+import org.apache.plc4x.java.s7.netty.model.messages.S7Message;
+import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
+import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
+import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
+import org.apache.plc4x.java.s7.netty.model.types.*;
+import org.apache.plc4x.java.s7.netty.util.S7PlcFieldHandler;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import static org.hamcrest.Matchers.*;
+import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.hamcrest.core.IsNull.nullValue;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class Plc4XS7ProtocolTest {
+
+    private EmbeddedChannel SUT;
+    private PlcReadRequest.Builder readRequestBuilder =
+        new DefaultPlcReadRequest.Builder(mock(PlcReader.class), new S7PlcFieldHandler());
+    private PlcWriteRequest.Builder writeRequestBuilder =
+        new DefaultPlcWriteRequest.Builder(mock(PlcWriter.class), new S7PlcFieldHandler());
+    private CompletableFuture<S7Message> writeFuture;
+
+    @Before
+    public void setUp() {
+        writeFuture = new CompletableFuture<>();
+        SUT = new EmbeddedChannel(new ChannelOutboundHandlerAdapter() {
+            @Override
+            public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) {
+                if(msg instanceof S7Message) {
+                    writeFuture.complete((S7Message) msg);
+                    promise.setSuccess();
+                } else {
+                    promise.setFailure(new PlcProtocolException(
+                        "Got message of type " + msg.getClass().getSimpleName()));
+                }
+            }
+        }, new Plc4XS7Protocol());
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testInvalidFieldType() {
+        CompletableFuture<InternalPlcReadRequest> future = new CompletableFuture<>();
+        DefaultPlcReadRequest readRequest = mock(DefaultPlcReadRequest.class);
+        when(readRequest.getFieldNames()).thenReturn(new LinkedHashSet<>(Collections.singleton("foo")));
+        when(readRequest.getField("foo")).thenReturn(mock(PlcField.class));
+        PlcRequestContainer container = new PlcRequestContainer(readRequest, future);
+        ChannelFuture channelFuture = SUT.writeOneOutbound(container);
+        assertThat("The promise should have been set to 'success'", channelFuture.isSuccess(), equalTo(false));
+
+        Throwable exception = channelFuture.cause();
+        assertThat("An exception should have been thrown", exception, notNullValue());
+        assertThat(exception, instanceOf(EncoderException.class));
+        EncoderException encoderException = (EncoderException) exception;
+        assertThat(encoderException.getCause(), instanceOf(PlcProtocolException.class));
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testSimpleReadVarRequest() throws InterruptedException, ExecutionException, TimeoutException {
+        CompletableFuture<InternalPlcReadRequest> future = new CompletableFuture<>();
+        PlcRequestContainer container = new PlcRequestContainer(
+            (DefaultPlcReadRequest) readRequestBuilder.addItem("foo", "%Q0:BYTE").build(), future);
+        ChannelFuture channelFuture = SUT.writeOneOutbound(container);
+        assertThat("The promise should have been set to 'success'", channelFuture.isSuccess(), equalTo(true));
+
+        Throwable exception = channelFuture.cause();
+        assertThat("No exception should have been thrown", exception, nullValue());
+
+        S7Message writtenMessage = writeFuture.get(100, TimeUnit.MILLISECONDS);
+        assertThat("The protocol layer should have output something", writtenMessage, notNullValue());
+        assertThat("The protocol layer should have output something", writtenMessage, instanceOf(S7RequestMessage.class));
+
+        assertThat("The message should have one parameter", writtenMessage.getParameters(), hasSize(1));
+        assertThat("The message should have no payload", writtenMessage.getPayloads(), empty());
+        assertThat("The request container should be assigned parent to the write message",
+            writtenMessage.getParent(), equalTo(container));
+
+        assertThat(writtenMessage.getParameters().get(0), instanceOf(VarParameter.class));
+        VarParameter varParameter = (VarParameter) writtenMessage.getParameters().get(0);
+        assertThat(varParameter.getItems(), hasSize(1));
+
+        assertThat(varParameter.getItems().get(0), instanceOf(S7AnyVarParameterItem.class));
+        S7AnyVarParameterItem s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameter.getItems().get(0);
+        assertThat(s7AnyVarParameterItem.getSpecificationType(), equalTo(SpecificationType.VARIABLE_SPECIFICATION));
+        assertThat(s7AnyVarParameterItem.getMemoryArea(), equalTo(MemoryArea.OUTPUTS));
+        assertThat(s7AnyVarParameterItem.getDataBlockNumber(), equalTo(0));
+        assertThat(s7AnyVarParameterItem.getByteOffset(), equalTo(0));
+        assertThat(s7AnyVarParameterItem.getBitOffset(), equalTo((byte) 0));
+        assertThat(s7AnyVarParameterItem.getNumElements(), equalTo(1));
+        assertThat(s7AnyVarParameterItem.getDataType(), equalTo(TransportSize.BYTE));
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testSimpleWriteVarRequest() throws InterruptedException, ExecutionException, TimeoutException {
+        CompletableFuture<InternalPlcWriteRequest> future = new CompletableFuture<>();
+        PlcRequestContainer container = new PlcRequestContainer(
+            (DefaultPlcWriteRequest) writeRequestBuilder.addItem("foo", "%Q0:BYTE", (byte) 0x42).build(), future);
+        ChannelFuture channelFuture = SUT.writeOneOutbound(container);
+        assertThat("The promise should have been set to 'success'", channelFuture.isSuccess(), equalTo(true));
+
+        Throwable exception = channelFuture.cause();
+        assertThat("No exception should have been thrown", exception, nullValue());
+
+        S7Message writtenMessage = writeFuture.get(100, TimeUnit.MILLISECONDS);
+        assertThat("The protocol layer should have output something", writtenMessage, notNullValue());
+        assertThat("The protocol layer should have output something", writtenMessage, instanceOf(S7RequestMessage.class));
+
+        assertThat("The message should have one parameter", writtenMessage.getParameters(), hasSize(1));
+        assertThat("The message should have one payload", writtenMessage.getPayloads(), hasSize(1));
+        assertThat("The request container should be assigned parent to the write message",
+            writtenMessage.getParent(), equalTo(container));
+
+        assertThat(writtenMessage.getParameters().get(0), instanceOf(VarParameter.class));
+        VarParameter varParameter = (VarParameter) writtenMessage.getParameters().get(0);
+        assertThat(varParameter.getItems(), hasSize(1));
+        assertThat(varParameter.getItems().get(0), instanceOf(S7AnyVarParameterItem.class));
+        S7AnyVarParameterItem s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameter.getItems().get(0);
+        assertThat(s7AnyVarParameterItem.getSpecificationType(), equalTo(SpecificationType.VARIABLE_SPECIFICATION));
+        assertThat(s7AnyVarParameterItem.getMemoryArea(), equalTo(MemoryArea.OUTPUTS));
+        assertThat(s7AnyVarParameterItem.getDataBlockNumber(), equalTo(0));
+        assertThat(s7AnyVarParameterItem.getByteOffset(), equalTo(0));
+        assertThat(s7AnyVarParameterItem.getBitOffset(), equalTo((byte) 0));
+        assertThat(s7AnyVarParameterItem.getNumElements(), equalTo(1));
+        assertThat(s7AnyVarParameterItem.getDataType(), equalTo(TransportSize.BYTE));
+
+        assertThat(writtenMessage.getPayloads().get(0), instanceOf(VarPayload.class));
+        VarPayload varPayload = (VarPayload) writtenMessage.getPayloads().get(0);
+        assertThat(varPayload.getItems(), hasSize(1));
+        assertThat(varPayload.getItems().get(0), instanceOf(VarPayloadItem.class));
+        VarPayloadItem varPayloadItem = varPayload.getItems().get(0);
+        assertThat(varPayloadItem.getReturnCode(), equalTo(DataTransportErrorCode.RESERVED));
+        assertThat(varPayloadItem.getDataTransportSize(), equalTo(DataTransportSize.BYTE_WORD_DWORD));
+        assertThat(varPayloadItem.getData(), notNullValue());
+        assertThat(varPayloadItem.getData().length, equalTo(1));
+        assertThat(varPayloadItem.getData()[0], equalTo((byte) 0x42));
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/S7ProtocolTest.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/S7ProtocolTest.java
index 02a8623bc02..2bdcc20a3d9 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/S7ProtocolTest.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/S7ProtocolTest.java
@@ -1,424 +1,424 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty;
-
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.embedded.EmbeddedChannel;
-import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
-import org.apache.plc4x.java.isotp.protocol.model.tpdus.DataTpdu;
-import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
-import org.apache.plc4x.java.s7.netty.model.messages.SetupCommunicationRequestMessage;
-import org.apache.plc4x.java.s7.netty.model.params.CpuServicesRequestParameter;
-import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
-import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.CpuServicesPayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
-import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.ssls.SslModuleIdentificationDataRecord;
-import org.apache.plc4x.java.s7.netty.model.types.*;
-import org.apache.plc4x.java.s7.types.S7ControllerType;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.Collections;
-
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.hamcrest.core.IsNull.nullValue;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class S7ProtocolTest {
-
-    private EmbeddedChannel SUT;
-
-    @Before
-    public void setUp() {
-        SUT = new EmbeddedChannel(new S7Protocol((short) 10, (short) 10, (short) 50, S7ControllerType.ANY, null));
-    }
-
-    /**
-     * When not receiving S7Message objects, an exception should be thrown.
-     */
-    @Test
-    public void testWriteJunk() {
-        ChannelFuture channelFuture = SUT.writeOneOutbound("Hurz");
-        Object outbound = SUT.readOutbound();
-
-        assertThat("The protocol layer should not have output anything", outbound, nullValue());
-    }
-
-    @Test
-    public void testSetupCommunication() {
-        SUT.writeOneOutbound(
-            new SetupCommunicationRequestMessage((short) 0x03, (short) 0x04, (short) 0x05, (short) 0x06, null)
-        );
-        Object outbound = SUT.readOutbound();
-
-        assertThat("The protocol layer should have output something", outbound, notNullValue());
-        assertThat("The output should have been of type DataTpdu", outbound, instanceOf(DataTpdu.class));
-
-        DataTpdu dataTpdu = (DataTpdu) outbound;
-        assertThat("The DataTpdu shouldn't have any parameters", dataTpdu.getParameters().isEmpty(), equalTo(true));
-
-        byte[] actUserData = new byte[dataTpdu.getUserData().readableBytes()];
-        dataTpdu.getUserData().readBytes(actUserData);
-
-        byte[] refUserData = toByteArray(new int[] {
-            // Protocol Id: 0x32 => S7Comm
-            0x32,
-            // MessageType.JOB
-            0x01,
-            0x00, 0x00,
-            // Pdu Reference = 3
-            0x00, 0x03,
-            // Parameter Length = 8
-            0x00, 0x08,
-            // Payload Length = 0
-            0x00, 0x00,
-            // ParameterType.SETUP_COMMUNICATION
-            0xf0,
-            // Reserved
-            0x00,
-            // Max AMQ Calling = 0x04
-            0x00, 0x04,
-            // Max AMQ Callee = 0x05
-            0x00, 0x05,
-            // PLU Size = 0x06
-            0x00, 0x06});
-
-        assertThat("Output generated by the current layer doesn't match the expected output",
-            Arrays.equals(actUserData, refUserData), equalTo(true));
-    }
-
-    @Test
-    public void testCpuServices() {
-        SUT.writeOneOutbound(
-            new S7RequestMessage(MessageType.USER_DATA, (short) 2,
-                Collections.singletonList(new CpuServicesRequestParameter(
-                    CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
-                    CpuServicesParameterSubFunctionGroup.READ_SSL, (byte) 0)),
-                Collections.singletonList(new CpuServicesPayload(DataTransportErrorCode.OK, SslId.MODULE_IDENTIFICATION,
-                    (short) 0x0000)), null));
-        Object outbound = SUT.readOutbound();
-
-        assertThat("The protocol layer should have output something", outbound, notNullValue());
-        assertThat("The output should have been of type DataTpdu", outbound, instanceOf(DataTpdu.class));
-
-        DataTpdu dataTpdu = (DataTpdu) outbound;
-        assertThat("The DataTpdu shouldn't have any parameters", dataTpdu.getParameters().isEmpty(), equalTo(true));
-
-        byte[] actUserData = new byte[dataTpdu.getUserData().readableBytes()];
-        dataTpdu.getUserData().readBytes(actUserData);
-        outputArray(actUserData);
-        byte[] refUserData = toByteArray(new int[] {
-            // Protocol Id: 0x32 => S7Comm
-            0x32,
-            // MessageType.USER_DATA
-            0x07,
-            // Reserved
-            0x00, 0x00,
-            // Pdu Reference = 2
-            0x00, 0x02,
-            // Parameter Length = 8
-            0x00, 0x08,
-            // Payload Length = 8
-            0x00, 0x08,
-            // ParameterType.CPU_SERVICES
-            0x00,
-            // ???
-            0x01, 0x12,
-            // Parameter Length
-            0x04,
-            // Type Request
-            0x11,
-            // Type: Request = 0x4 & Subtype: CPU functions = 0x4
-            0x44,
-            // Sub-function: Read SZL
-            0x01,
-            // Sequence Number: 0x00
-            0x00,
-            //////// Payload
-            // Return code: Success
-            0xFF,
-            // Transport Size
-            0x09,
-            // Length
-            0x00, 0x04,
-            // SZL Id
-            0x00, 0x11,
-            // SZL Index
-            0x00, 0x00
-        });
-
-        assertThat("Output generated by the current layer doesn't match the expected output",
-            Arrays.equals(actUserData, refUserData), equalTo(true));
-    }
-
-    @Test
-    public void testReadVar() {
-        SUT.writeOneOutbound(
-            new S7RequestMessage(MessageType.JOB, (short) 1, Collections.singletonList(
-                new VarParameter(ParameterType.READ_VAR, Collections.singletonList(
-                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                        TransportSize.BYTE, 1, (short) 2, (short) 3, (byte) 0)))),
-                null, null));
-        Object outbound = SUT.readOutbound();
-
-        assertThat("The protocol layer should have output something", outbound, notNullValue());
-        assertThat("The output should have been of type DataTpdu", outbound, instanceOf(DataTpdu.class));
-
-        DataTpdu dataTpdu = (DataTpdu) outbound;
-        assertThat("The DataTpdu shouldn't have any parameters", dataTpdu.getParameters().isEmpty(), equalTo(true));
-
-        byte[] actUserData = new byte[dataTpdu.getUserData().readableBytes()];
-        dataTpdu.getUserData().readBytes(actUserData);
-//        outputArray(actUserData);
-        byte[] refUserData = toByteArray(new int[] {
-            // Protocol Id: 0x32 => S7Comm
-            0x32,
-            // MessageType.JOB
-            0x01,
-            0x00, 0x00,
-            // Pdu Reference = 1
-            0x00, 0x01,
-            // Parameter Length = 14
-            0x00, 0x0e,
-            // Payload Length = 0
-            0x00, 0x00,
-            // ParameterType.READ_VAR
-            0x04,
-            // Number of items = 1
-            0x01,
-                // SpecificationType.VARIABLE_SPECIFICATION
-                0x12,
-                // Variable specification length = 10
-                0x0a,
-                // S7Any type of item
-                0x10,
-                // TransportSize.BYTE = 0x02
-                0x02,
-                // Number of items = 1
-                0x00, 0x01,
-                // DB Number = 2
-                0x00, 0x02,
-                // MemoryArea.DATA_BLOCKS = 0x84
-                0x84,
-                // Address: 00000000 00000000 00010000
-                //          -----------------------...
-                //          byte address           bit
-                0x00, 0x00, 0x18});
-
-        assertThat("Output generated by the current layer doesn't match the expected output",
-            Arrays.equals(actUserData, refUserData), equalTo(true));
-    }
-
-    @Test
-    public void testWriteVar() {
-        SUT.writeOneOutbound(
-            new S7RequestMessage(MessageType.JOB, (short) 1, Collections.singletonList(
-                new VarParameter(ParameterType.WRITE_VAR, Collections.singletonList(
-                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                        TransportSize.BYTE, 1, (short) 2, (short) 3, (byte) 0)))),
-                Collections.singletonList(
-                    new VarPayload(ParameterType.WRITE_VAR, Collections.singletonList(
-                        new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[]{(byte) 0x0A})))
-                ), null));
-        Object outbound = SUT.readOutbound();
-
-        assertThat("The protocol layer should have output something", outbound, notNullValue());
-        assertThat("The output should have been of type DataTpdu", outbound, instanceOf(DataTpdu.class));
-
-        DataTpdu dataTpdu = (DataTpdu) outbound;
-        assertThat("The DataTpdu shouldn't have any parameters", dataTpdu.getParameters().isEmpty(), equalTo(true));
-
-        byte[] actUserData = new byte[dataTpdu.getUserData().readableBytes()];
-        dataTpdu.getUserData().readBytes(actUserData);
-
-        byte[] refUserData = toByteArray(new int[] {
-            // Protocol Id: 0x32 => S7Comm
-            0x32,
-            // MessageType.JOB
-            0x01,
-            0x00, 0x00,
-            // Pdu Reference = 1
-            0x00, 0x01,
-            // Parameter Length = 14
-            0x00, 0x0e,
-            // Payload Length = 5
-            0x00, 0x05,
-            // ParameterType.WRITE_VAR
-            0x05,
-            // Number of items = 1
-            0x01,
-            /////////////////////////////////////////////////////
-            // Parameters ...
-            /////////////////////////////////////////////////////
-            // SpecificationType.VARIABLE_SPECIFICATION
-            0x12,
-            // Variable specification length = 10
-            0x0a,
-            // S7Any type of item
-            0x10,
-            // TransportSize.BYTE = 0x02
-            0x02,
-            // Number of items = 1
-            0x00, 0x01,
-            // DB Number = 2
-            0x00, 0x02,
-            // MemoryArea.DATA_BLOCKS = 0x84
-            0x84,
-            // Address: 00000000 00000000 00010000
-            //          -----------------------...
-            //          byte address           bit
-            0x00, 0x00, 0x18,
-            /////////////////////////////////////////////////////
-            // Payloads
-            /////////////////////////////////////////////////////
-            // DataTransportErrorCode.OK
-            0xff,
-            // DataTransportSize.BYTE_WORD_DWOR
-            0x04,
-            // Length = 1
-            0x00, 0x01,
-            // Data: 0x0A
-            0x0a
-        });
-
-        assertThat("Output generated by the current layer doesn't match the expected output",
-            Arrays.equals(actUserData, refUserData), equalTo(true));
-    }
-
-    @Test
-    public void testTooBigTpdu() {
-        ChannelFuture channelFuture = SUT.writeOneOutbound(
-            new S7RequestMessage(MessageType.JOB, (short) 1, Collections.singletonList(
-                new VarParameter(ParameterType.READ_VAR, Arrays.asList(
-                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                        TransportSize.BYTE, 1, (short) 2, (short) 3, (byte) 0),
-                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                        TransportSize.BYTE, 1, (short) 2, (short) 3, (byte) 0),
-                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                        TransportSize.BYTE, 1, (short) 2, (short) 3, (byte) 0),
-                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                        TransportSize.BYTE, 1, (short) 2, (short) 3, (byte) 0),
-                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                        TransportSize.BYTE, 1, (short) 2, (short) 3, (byte) 0)))),
-                null, null));
-        Object outbound = SUT.readOutbound();
-        Throwable exception = channelFuture.cause();
-
-        assertThat("The protocol layer should not have output anything", outbound, nullValue());
-        assertThat("The protocol layer should have thrown an exception", exception, notNullValue());
-        assertThat("The protocol layer should have thrown an exception", exception, instanceOf(PlcProtocolException.class));
-    }
-
-    @Test
-    public void testNotImplementedParameter() {
-        ChannelFuture channelFuture = SUT.writeOneOutbound(
-            new S7RequestMessage(MessageType.JOB, (short) 1, Collections.singletonList(
-                new VarParameter(ParameterType.UPLOAD, Collections.emptyList())),
-                null, null));
-        Object outbound = SUT.readOutbound();
-        Throwable exception = channelFuture.cause();
-
-        assertThat("The protocol layer should not have output anything", outbound, nullValue());
-        assertThat("The protocol layer should have thrown an exception", exception, notNullValue());
-        assertThat("The protocol layer should have thrown an exception", exception, instanceOf(PlcProtocolException.class));
-    }
-
-    @Test
-    public void testNotImplementedPayload() {
-        S7Payload payload  = mock(S7Payload.class);
-        when(payload.getType()).thenReturn(ParameterType.UPLOAD);
-        ChannelFuture channelFuture = SUT.writeOneOutbound(
-            new S7RequestMessage(MessageType.JOB, (short) 1,
-                Collections.emptyList(),
-                Collections.singletonList(payload),
-                null));
-        Object outbound = SUT.readOutbound();
-        Throwable exception = channelFuture.cause();
-
-        assertThat("The protocol layer should not have output anything", outbound, nullValue());
-        assertThat("The protocol layer should have thrown an exception", exception, notNullValue());
-        assertThat("The protocol layer should have thrown an exception", exception, instanceOf(PlcProtocolException.class));
-    }
-
-    @Test
-    public void testNotImplementedAddressingType() {
-        VarParameterItem varParameterItem = mock(VarParameterItem.class);
-        when(varParameterItem.getAddressingMode()).thenReturn(VariableAddressingMode.ALARM_QUERYREQ);
-        ChannelFuture channelFuture = SUT.writeOneOutbound(
-            new S7RequestMessage(MessageType.JOB, (short) 1, Collections.singletonList(
-                new VarParameter(ParameterType.READ_VAR, Collections.singletonList(varParameterItem))),
-                null, null));
-        Object outbound = SUT.readOutbound();
-        Throwable exception = channelFuture.cause();
-
-        assertThat("The protocol layer should not have output anything", outbound, nullValue());
-        assertThat("The protocol layer should have thrown an exception", exception, notNullValue());
-        assertThat("The protocol layer should have thrown an exception", exception, instanceOf(PlcProtocolException.class));
-    }
-
-    @Test
-    public void cpuServicesRequestWithSzlRecords() {
-        ChannelFuture channelFuture = SUT.writeOneOutbound(
-            new S7RequestMessage(MessageType.USER_DATA, (short) 2,
-                Collections.singletonList(new CpuServicesRequestParameter(
-                    CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
-                    CpuServicesParameterSubFunctionGroup.READ_SSL, (byte) 0)),
-                Collections.singletonList(new CpuServicesPayload(DataTransportErrorCode.OK, SslId.MODULE_IDENTIFICATION,
-                    (short) 0x0000, Collections.singletonList(new SslModuleIdentificationDataRecord((short) 0, "hurz", (short) 0, (short) 0, (short) 0)))),
-                null));
-        Object outbound = SUT.readOutbound();
-        Throwable exception = channelFuture.cause();
-
-        assertThat("The protocol layer should not have output anything", outbound, nullValue());
-        assertThat("The protocol layer should have thrown an exception", exception, notNullValue());
-        assertThat("The protocol layer should have thrown an exception", exception, instanceOf(PlcProtocolException.class));
-    }
-
-    private static byte[] toByteArray(int[] input) {
-        byte[] output = new byte[input.length];
-        for (int i = 0; i < input.length; i++) {
-            if((input[i] > 0xFF) || (input[i] < 0)) {
-                throw new IllegalArgumentException("Int values passed in to 'toByteArray' should be vaild byte values.");
-            }
-            output[i] = (byte) input[i];
-        }
-        return output;
-    }
-
-    private static void outputArray(byte[] input) {
-        StringBuilder sb = new StringBuilder();
-        for (byte anInput : input) {
-            if (sb.length() > 0) {
-                sb.append(", ");
-            }
-            sb.append(String.format("0x%02x", anInput));
-        }
-        System.out.println(sb.toString());
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty;
+
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.embedded.EmbeddedChannel;
+import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
+import org.apache.plc4x.java.isotp.protocol.model.tpdus.DataTpdu;
+import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
+import org.apache.plc4x.java.s7.netty.model.messages.SetupCommunicationRequestMessage;
+import org.apache.plc4x.java.s7.netty.model.params.CpuServicesRequestParameter;
+import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
+import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.CpuServicesPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
+import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.ssls.SslModuleIdentificationDataRecord;
+import org.apache.plc4x.java.s7.netty.model.types.*;
+import org.apache.plc4x.java.s7.types.S7ControllerType;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.hamcrest.core.IsNull.nullValue;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class S7ProtocolTest {
+
+    private EmbeddedChannel SUT;
+
+    @Before
+    public void setUp() {
+        SUT = new EmbeddedChannel(new S7Protocol((short) 10, (short) 10, (short) 50, S7ControllerType.ANY, null));
+    }
+
+    /**
+     * When not receiving S7Message objects, an exception should be thrown.
+     */
+    @Test
+    public void testWriteJunk() {
+        ChannelFuture channelFuture = SUT.writeOneOutbound("Hurz");
+        Object outbound = SUT.readOutbound();
+
+        assertThat("The protocol layer should not have output anything", outbound, nullValue());
+    }
+
+    @Test
+    public void testSetupCommunication() {
+        SUT.writeOneOutbound(
+            new SetupCommunicationRequestMessage((short) 0x03, (short) 0x04, (short) 0x05, (short) 0x06, null)
+        );
+        Object outbound = SUT.readOutbound();
+
+        assertThat("The protocol layer should have output something", outbound, notNullValue());
+        assertThat("The output should have been of type DataTpdu", outbound, instanceOf(DataTpdu.class));
+
+        DataTpdu dataTpdu = (DataTpdu) outbound;
+        assertThat("The DataTpdu shouldn't have any parameters", dataTpdu.getParameters().isEmpty(), equalTo(true));
+
+        byte[] actUserData = new byte[dataTpdu.getUserData().readableBytes()];
+        dataTpdu.getUserData().readBytes(actUserData);
+
+        byte[] refUserData = toByteArray(new int[] {
+            // Protocol Id: 0x32 => S7Comm
+            0x32,
+            // MessageType.JOB
+            0x01,
+            0x00, 0x00,
+            // Pdu Reference = 3
+            0x00, 0x03,
+            // Parameter Length = 8
+            0x00, 0x08,
+            // Payload Length = 0
+            0x00, 0x00,
+            // ParameterType.SETUP_COMMUNICATION
+            0xf0,
+            // Reserved
+            0x00,
+            // Max AMQ Calling = 0x04
+            0x00, 0x04,
+            // Max AMQ Callee = 0x05
+            0x00, 0x05,
+            // PLU Size = 0x06
+            0x00, 0x06});
+
+        assertThat("Output generated by the current layer doesn't match the expected output",
+            Arrays.equals(actUserData, refUserData), equalTo(true));
+    }
+
+    @Test
+    public void testCpuServices() {
+        SUT.writeOneOutbound(
+            new S7RequestMessage(MessageType.USER_DATA, (short) 2,
+                Collections.singletonList(new CpuServicesRequestParameter(
+                    CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
+                    CpuServicesParameterSubFunctionGroup.READ_SSL, (byte) 0)),
+                Collections.singletonList(new CpuServicesPayload(DataTransportErrorCode.OK, SslId.MODULE_IDENTIFICATION,
+                    (short) 0x0000)), null));
+        Object outbound = SUT.readOutbound();
+
+        assertThat("The protocol layer should have output something", outbound, notNullValue());
+        assertThat("The output should have been of type DataTpdu", outbound, instanceOf(DataTpdu.class));
+
+        DataTpdu dataTpdu = (DataTpdu) outbound;
+        assertThat("The DataTpdu shouldn't have any parameters", dataTpdu.getParameters().isEmpty(), equalTo(true));
+
+        byte[] actUserData = new byte[dataTpdu.getUserData().readableBytes()];
+        dataTpdu.getUserData().readBytes(actUserData);
+        outputArray(actUserData);
+        byte[] refUserData = toByteArray(new int[] {
+            // Protocol Id: 0x32 => S7Comm
+            0x32,
+            // MessageType.USER_DATA
+            0x07,
+            // Reserved
+            0x00, 0x00,
+            // Pdu Reference = 2
+            0x00, 0x02,
+            // Parameter Length = 8
+            0x00, 0x08,
+            // Payload Length = 8
+            0x00, 0x08,
+            // ParameterType.CPU_SERVICES
+            0x00,
+            // ???
+            0x01, 0x12,
+            // Parameter Length
+            0x04,
+            // Type Request
+            0x11,
+            // Type: Request = 0x4 & Subtype: CPU functions = 0x4
+            0x44,
+            // Sub-function: Read SZL
+            0x01,
+            // Sequence Number: 0x00
+            0x00,
+            //////// Payload
+            // Return code: Success
+            0xFF,
+            // Transport Size
+            0x09,
+            // Length
+            0x00, 0x04,
+            // SZL Id
+            0x00, 0x11,
+            // SZL Index
+            0x00, 0x00
+        });
+
+        assertThat("Output generated by the current layer doesn't match the expected output",
+            Arrays.equals(actUserData, refUserData), equalTo(true));
+    }
+
+    @Test
+    public void testReadVar() {
+        SUT.writeOneOutbound(
+            new S7RequestMessage(MessageType.JOB, (short) 1, Collections.singletonList(
+                new VarParameter(ParameterType.READ_VAR, Collections.singletonList(
+                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                        TransportSize.BYTE, 1, (short) 2, (short) 3, (byte) 0)))),
+                null, null));
+        Object outbound = SUT.readOutbound();
+
+        assertThat("The protocol layer should have output something", outbound, notNullValue());
+        assertThat("The output should have been of type DataTpdu", outbound, instanceOf(DataTpdu.class));
+
+        DataTpdu dataTpdu = (DataTpdu) outbound;
+        assertThat("The DataTpdu shouldn't have any parameters", dataTpdu.getParameters().isEmpty(), equalTo(true));
+
+        byte[] actUserData = new byte[dataTpdu.getUserData().readableBytes()];
+        dataTpdu.getUserData().readBytes(actUserData);
+//        outputArray(actUserData);
+        byte[] refUserData = toByteArray(new int[] {
+            // Protocol Id: 0x32 => S7Comm
+            0x32,
+            // MessageType.JOB
+            0x01,
+            0x00, 0x00,
+            // Pdu Reference = 1
+            0x00, 0x01,
+            // Parameter Length = 14
+            0x00, 0x0e,
+            // Payload Length = 0
+            0x00, 0x00,
+            // ParameterType.READ_VAR
+            0x04,
+            // Number of items = 1
+            0x01,
+                // SpecificationType.VARIABLE_SPECIFICATION
+                0x12,
+                // Variable specification length = 10
+                0x0a,
+                // S7Any type of item
+                0x10,
+                // TransportSize.BYTE = 0x02
+                0x02,
+                // Number of items = 1
+                0x00, 0x01,
+                // DB Number = 2
+                0x00, 0x02,
+                // MemoryArea.DATA_BLOCKS = 0x84
+                0x84,
+                // Address: 00000000 00000000 00010000
+                //          -----------------------...
+                //          byte address           bit
+                0x00, 0x00, 0x18});
+
+        assertThat("Output generated by the current layer doesn't match the expected output",
+            Arrays.equals(actUserData, refUserData), equalTo(true));
+    }
+
+    @Test
+    public void testWriteVar() {
+        SUT.writeOneOutbound(
+            new S7RequestMessage(MessageType.JOB, (short) 1, Collections.singletonList(
+                new VarParameter(ParameterType.WRITE_VAR, Collections.singletonList(
+                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                        TransportSize.BYTE, 1, (short) 2, (short) 3, (byte) 0)))),
+                Collections.singletonList(
+                    new VarPayload(ParameterType.WRITE_VAR, Collections.singletonList(
+                        new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[]{(byte) 0x0A})))
+                ), null));
+        Object outbound = SUT.readOutbound();
+
+        assertThat("The protocol layer should have output something", outbound, notNullValue());
+        assertThat("The output should have been of type DataTpdu", outbound, instanceOf(DataTpdu.class));
+
+        DataTpdu dataTpdu = (DataTpdu) outbound;
+        assertThat("The DataTpdu shouldn't have any parameters", dataTpdu.getParameters().isEmpty(), equalTo(true));
+
+        byte[] actUserData = new byte[dataTpdu.getUserData().readableBytes()];
+        dataTpdu.getUserData().readBytes(actUserData);
+
+        byte[] refUserData = toByteArray(new int[] {
+            // Protocol Id: 0x32 => S7Comm
+            0x32,
+            // MessageType.JOB
+            0x01,
+            0x00, 0x00,
+            // Pdu Reference = 1
+            0x00, 0x01,
+            // Parameter Length = 14
+            0x00, 0x0e,
+            // Payload Length = 5
+            0x00, 0x05,
+            // ParameterType.WRITE_VAR
+            0x05,
+            // Number of items = 1
+            0x01,
+            /////////////////////////////////////////////////////
+            // Parameters ...
+            /////////////////////////////////////////////////////
+            // SpecificationType.VARIABLE_SPECIFICATION
+            0x12,
+            // Variable specification length = 10
+            0x0a,
+            // S7Any type of item
+            0x10,
+            // TransportSize.BYTE = 0x02
+            0x02,
+            // Number of items = 1
+            0x00, 0x01,
+            // DB Number = 2
+            0x00, 0x02,
+            // MemoryArea.DATA_BLOCKS = 0x84
+            0x84,
+            // Address: 00000000 00000000 00010000
+            //          -----------------------...
+            //          byte address           bit
+            0x00, 0x00, 0x18,
+            /////////////////////////////////////////////////////
+            // Payloads
+            /////////////////////////////////////////////////////
+            // DataTransportErrorCode.OK
+            0xff,
+            // DataTransportSize.BYTE_WORD_DWOR
+            0x04,
+            // Length = 1
+            0x00, 0x01,
+            // Data: 0x0A
+            0x0a
+        });
+
+        assertThat("Output generated by the current layer doesn't match the expected output",
+            Arrays.equals(actUserData, refUserData), equalTo(true));
+    }
+
+    @Test
+    public void testTooBigTpdu() {
+        ChannelFuture channelFuture = SUT.writeOneOutbound(
+            new S7RequestMessage(MessageType.JOB, (short) 1, Collections.singletonList(
+                new VarParameter(ParameterType.READ_VAR, Arrays.asList(
+                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                        TransportSize.BYTE, 1, (short) 2, (short) 3, (byte) 0),
+                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                        TransportSize.BYTE, 1, (short) 2, (short) 3, (byte) 0),
+                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                        TransportSize.BYTE, 1, (short) 2, (short) 3, (byte) 0),
+                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                        TransportSize.BYTE, 1, (short) 2, (short) 3, (byte) 0),
+                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                        TransportSize.BYTE, 1, (short) 2, (short) 3, (byte) 0)))),
+                null, null));
+        Object outbound = SUT.readOutbound();
+        Throwable exception = channelFuture.cause();
+
+        assertThat("The protocol layer should not have output anything", outbound, nullValue());
+        assertThat("The protocol layer should have thrown an exception", exception, notNullValue());
+        assertThat("The protocol layer should have thrown an exception", exception, instanceOf(PlcProtocolException.class));
+    }
+
+    @Test
+    public void testNotImplementedParameter() {
+        ChannelFuture channelFuture = SUT.writeOneOutbound(
+            new S7RequestMessage(MessageType.JOB, (short) 1, Collections.singletonList(
+                new VarParameter(ParameterType.UPLOAD, Collections.emptyList())),
+                null, null));
+        Object outbound = SUT.readOutbound();
+        Throwable exception = channelFuture.cause();
+
+        assertThat("The protocol layer should not have output anything", outbound, nullValue());
+        assertThat("The protocol layer should have thrown an exception", exception, notNullValue());
+        assertThat("The protocol layer should have thrown an exception", exception, instanceOf(PlcProtocolException.class));
+    }
+
+    @Test
+    public void testNotImplementedPayload() {
+        S7Payload payload  = mock(S7Payload.class);
+        when(payload.getType()).thenReturn(ParameterType.UPLOAD);
+        ChannelFuture channelFuture = SUT.writeOneOutbound(
+            new S7RequestMessage(MessageType.JOB, (short) 1,
+                Collections.emptyList(),
+                Collections.singletonList(payload),
+                null));
+        Object outbound = SUT.readOutbound();
+        Throwable exception = channelFuture.cause();
+
+        assertThat("The protocol layer should not have output anything", outbound, nullValue());
+        assertThat("The protocol layer should have thrown an exception", exception, notNullValue());
+        assertThat("The protocol layer should have thrown an exception", exception, instanceOf(PlcProtocolException.class));
+    }
+
+    @Test
+    public void testNotImplementedAddressingType() {
+        VarParameterItem varParameterItem = mock(VarParameterItem.class);
+        when(varParameterItem.getAddressingMode()).thenReturn(VariableAddressingMode.ALARM_QUERYREQ);
+        ChannelFuture channelFuture = SUT.writeOneOutbound(
+            new S7RequestMessage(MessageType.JOB, (short) 1, Collections.singletonList(
+                new VarParameter(ParameterType.READ_VAR, Collections.singletonList(varParameterItem))),
+                null, null));
+        Object outbound = SUT.readOutbound();
+        Throwable exception = channelFuture.cause();
+
+        assertThat("The protocol layer should not have output anything", outbound, nullValue());
+        assertThat("The protocol layer should have thrown an exception", exception, notNullValue());
+        assertThat("The protocol layer should have thrown an exception", exception, instanceOf(PlcProtocolException.class));
+    }
+
+    @Test
+    public void cpuServicesRequestWithSzlRecords() {
+        ChannelFuture channelFuture = SUT.writeOneOutbound(
+            new S7RequestMessage(MessageType.USER_DATA, (short) 2,
+                Collections.singletonList(new CpuServicesRequestParameter(
+                    CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
+                    CpuServicesParameterSubFunctionGroup.READ_SSL, (byte) 0)),
+                Collections.singletonList(new CpuServicesPayload(DataTransportErrorCode.OK, SslId.MODULE_IDENTIFICATION,
+                    (short) 0x0000, Collections.singletonList(new SslModuleIdentificationDataRecord((short) 0, "hurz", (short) 0, (short) 0, (short) 0)))),
+                null));
+        Object outbound = SUT.readOutbound();
+        Throwable exception = channelFuture.cause();
+
+        assertThat("The protocol layer should not have output anything", outbound, nullValue());
+        assertThat("The protocol layer should have thrown an exception", exception, notNullValue());
+        assertThat("The protocol layer should have thrown an exception", exception, instanceOf(PlcProtocolException.class));
+    }
+
+    private static byte[] toByteArray(int[] input) {
+        byte[] output = new byte[input.length];
+        for (int i = 0; i < input.length; i++) {
+            if((input[i] > 0xFF) || (input[i] < 0)) {
+                throw new IllegalArgumentException("Int values passed in to 'toByteArray' should be vaild byte values.");
+            }
+            output[i] = (byte) input[i];
+        }
+        return output;
+    }
+
+    private static void outputArray(byte[] input) {
+        StringBuilder sb = new StringBuilder();
+        for (byte anInput : input) {
+            if (sb.length() > 0) {
+                sb.append(", ");
+            }
+            sb.append(String.format("0x%02x", anInput));
+        }
+        System.out.println(sb.toString());
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/messages/S7MessageTests.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/messages/S7MessageTests.java
index 27c2cd17990..3c076de1ea7 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/messages/S7MessageTests.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/messages/S7MessageTests.java
@@ -1,191 +1,191 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.netty.model.messages;
-
-import org.apache.plc4x.java.s7.netty.model.params.CpuServicesParameter;
-import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
-import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
-import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
-import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
-import org.apache.plc4x.java.s7.netty.model.types.*;
-import org.apache.plc4x.test.FastTests;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
-import static org.hamcrest.collection.IsEmptyCollection.empty;
-import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.hamcrest.core.IsNull.nullValue;
-import static org.junit.Assert.assertThat;
-
-public class S7MessageTests {
-
-    @Test
-    @Category(FastTests.class)
-    public void setupCommunicationsRequestMessage() {
-        short tpduReference = 1;
-        short maxAmqCaller = 4;
-        short maxAmqCallee = 8;
-        short pduLength = 128;
-
-        SetupCommunicationRequestMessage setupMessage = new SetupCommunicationRequestMessage(
-            tpduReference, maxAmqCaller, maxAmqCallee, pduLength, null);
-
-        assertThat("Unexpected tpdu value", setupMessage.getTpduReference(), equalTo(tpduReference));
-        assertThat("Unexpected message type", setupMessage.getMessageType(), equalTo(MessageType.JOB));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void s7RequestMessage() {
-        MessageType messageType = MessageType.USER_DATA;
-        short tpduReference = 1;
-
-        S7RequestMessage message = new S7RequestMessage(
-            messageType, tpduReference, null, null, null);
-
-        assertThat("Unexpected tpdu value", message.getTpduReference(), equalTo(tpduReference));
-        assertThat("Unexpected message type", message.getMessageType(), equalTo(MessageType.USER_DATA));
-        assertThat(message.getPayloads(), nullValue());
-        assertThat(message.getParameters(), nullValue());
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void s7ResponseMessage() {
-        MessageType messageType = MessageType.USER_DATA;
-        short tpduReference = 1;
-        byte errorClass = 0x1;
-        byte errorCode = 0x23;
-
-        S7ResponseMessage message = new S7ResponseMessage(
-            messageType, tpduReference, null, null, errorClass, errorCode);
-
-        assertThat("Unexpected tpdu value", message.getTpduReference(), equalTo(tpduReference));
-        assertThat("Unexpected message type", message.getMessageType(), equalTo(MessageType.USER_DATA));
-        assertThat("Unexpected error class", message.getErrorClass(), equalTo((byte) 0x1));
-        assertThat("Unexpected error code", message.getErrorCode(), equalTo((byte) 0x23));
-        assertThat(message.getPayloads(), nullValue());
-        assertThat(message.getParameters(), nullValue());
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void s7MessageParameters() {
-        MessageType messageType = MessageType.USER_DATA;
-        short tpduReference = 1;
-        List<S7Parameter> s7Parameters = new ArrayList<>();
-        List<S7Payload> s7Payloads = new ArrayList<>();
-        ParameterType parameterType = ParameterType.READ_VAR;
-        List<VarParameterItem> parameterItems = new ArrayList<>();
-        SpecificationType specificationType = SpecificationType.VARIABLE_SPECIFICATION;
-        MemoryArea memoryArea = MemoryArea.DATA_BLOCKS;
-        TransportSize dataType = TransportSize.INT;
-        short numElements = 1;
-        byte dataBlock = (byte) 0x1;
-        byte byteOffset = (byte) 0x10;
-        byte bitOffset = (byte) 0x0;
-
-        parameterItems.add(new S7AnyVarParameterItem(specificationType, memoryArea, dataType, numElements, dataBlock, byteOffset, bitOffset));
-
-        VarParameter varParameter = new VarParameter(parameterType, parameterItems);
-
-        s7Parameters.add(varParameter);
-
-        S7RequestMessage message = new S7RequestMessage(messageType, tpduReference, s7Parameters, s7Payloads, null);
-
-        assertThat("Unexpected tpdu value", message.getTpduReference(), equalTo(tpduReference));
-        assertThat("Unexpected message type", message.getMessageType(), equalTo(MessageType.USER_DATA));
-        assertThat("Unexpected number of parameters", message.getParameters(), hasSize(1));
-        assertThat("Unexpected parameters", message.getParameters(), contains(varParameter));
-        assertThat("Parameter missing", message.getParameter(VarParameter.class).isPresent(), is(true));
-        assertThat("Parameter missing", message.getParameter(VarParameter.class).get(), equalTo(varParameter));
-        assertThat("Contains unexpected parameter", message.getParameter(CpuServicesParameter.class).isPresent(), is(false));
-        assertThat(message.getPayloads(), empty());
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void s7MessagePayload() {
-        MessageType messageType = MessageType.USER_DATA;
-        short tpduReference = 1;
-        List<S7Parameter> s7Parameters = new ArrayList<>();
-        List<S7Payload> s7Payloads = new ArrayList<>();
-        ParameterType parameterType = ParameterType.WRITE_VAR;
-        List<VarPayloadItem> payloadItems = new ArrayList<>();
-        byte[] data = {(byte) 0x79};
-        VarPayload varPayload;
-
-        payloadItems.add(new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BIT, data));
-        varPayload = new VarPayload(parameterType, payloadItems);
-        s7Payloads.add(varPayload);
-
-        S7RequestMessage message = new S7RequestMessage(
-            messageType, tpduReference, s7Parameters, s7Payloads, null);
-
-        assertThat("Unexpected tpdu value", message.getTpduReference(), equalTo(tpduReference));
-        assertThat("Unexpected message type", message.getMessageType(), equalTo(MessageType.USER_DATA));
-        assertThat("Unexpected number of payloads", message.getPayloads(), hasSize(1));
-        assertThat("Unexpected payloads", message.getPayloads(), contains(varPayload));
-        assertThat("Payload missing", message.getPayload(VarPayload.class).isPresent(), is(true));
-        assertThat("Payload doesn't match", message.getPayload(VarPayload.class).get(), equalTo(varPayload));
-        assertThat("Contains unexpected payload", message.getPayload(VarParameter.class).isPresent(), is(false)); // No other parameter classes
-        assertThat(message.getParameters(), empty());
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void s7AnyVarParameterItem() {
-        MessageType messageType = MessageType.USER_DATA;
-        short tpduReference = 1;
-        List<S7Parameter> s7Parameters = new ArrayList<>();
-        List<S7Payload> s7Payloads = new ArrayList<>();
-        ParameterType parameterType = ParameterType.READ_VAR;
-        List<VarParameterItem> parameterItems = new ArrayList<>();
-        SpecificationType specificationType = SpecificationType.VARIABLE_SPECIFICATION;
-        MemoryArea memoryArea = MemoryArea.DATA_BLOCKS;
-        TransportSize dataType = TransportSize.INT;
-        int numElements = 1;
-        int dataBlock = 0x1;
-        int byteOffset = 0x10;
-        byte bitOffset = (byte) 0x0;
-
-        S7AnyVarParameterItem parameterItem = new S7AnyVarParameterItem(
-            specificationType, memoryArea, dataType, numElements, dataBlock, byteOffset, bitOffset);
-
-        assertThat("Unexpected specification type", parameterItem.getSpecificationType(), equalTo(specificationType));
-        assertThat("Unexpected memory area", parameterItem.getMemoryArea(), equalTo(MemoryArea.DATA_BLOCKS));
-        assertThat("Unexpected transport size", parameterItem.getDataType(), equalTo(dataType));
-        assertThat("Unexpected number elements", parameterItem.getNumElements(), equalTo(numElements));
-        assertThat("Unexpected data block", parameterItem.getDataBlockNumber(), equalTo(dataBlock));
-        assertThat("Unexpected byte offset", parameterItem.getByteOffset(), equalTo(byteOffset));
-        assertThat("Unexpected bit offset", parameterItem.getBitOffset(), equalTo(bitOffset));
-        assertThat("Unexpected adressing mode", parameterItem.getAddressingMode(), equalTo(VariableAddressingMode.S7ANY));
-    }
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.messages;
+
+import org.apache.plc4x.java.s7.netty.model.params.CpuServicesParameter;
+import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
+import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
+import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
+import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
+import org.apache.plc4x.java.s7.netty.model.types.*;
+import org.apache.plc4x.test.FastTests;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
+import static org.hamcrest.collection.IsEmptyCollection.empty;
+import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.core.IsNull.nullValue;
+import static org.junit.Assert.assertThat;
+
+public class S7MessageTests {
+
+    @Test
+    @Category(FastTests.class)
+    public void setupCommunicationsRequestMessage() {
+        short tpduReference = 1;
+        short maxAmqCaller = 4;
+        short maxAmqCallee = 8;
+        short pduLength = 128;
+
+        SetupCommunicationRequestMessage setupMessage = new SetupCommunicationRequestMessage(
+            tpduReference, maxAmqCaller, maxAmqCallee, pduLength, null);
+
+        assertThat("Unexpected tpdu value", setupMessage.getTpduReference(), equalTo(tpduReference));
+        assertThat("Unexpected message type", setupMessage.getMessageType(), equalTo(MessageType.JOB));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void s7RequestMessage() {
+        MessageType messageType = MessageType.USER_DATA;
+        short tpduReference = 1;
+
+        S7RequestMessage message = new S7RequestMessage(
+            messageType, tpduReference, null, null, null);
+
+        assertThat("Unexpected tpdu value", message.getTpduReference(), equalTo(tpduReference));
+        assertThat("Unexpected message type", message.getMessageType(), equalTo(MessageType.USER_DATA));
+        assertThat(message.getPayloads(), nullValue());
+        assertThat(message.getParameters(), nullValue());
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void s7ResponseMessage() {
+        MessageType messageType = MessageType.USER_DATA;
+        short tpduReference = 1;
+        byte errorClass = 0x1;
+        byte errorCode = 0x23;
+
+        S7ResponseMessage message = new S7ResponseMessage(
+            messageType, tpduReference, null, null, errorClass, errorCode);
+
+        assertThat("Unexpected tpdu value", message.getTpduReference(), equalTo(tpduReference));
+        assertThat("Unexpected message type", message.getMessageType(), equalTo(MessageType.USER_DATA));
+        assertThat("Unexpected error class", message.getErrorClass(), equalTo((byte) 0x1));
+        assertThat("Unexpected error code", message.getErrorCode(), equalTo((byte) 0x23));
+        assertThat(message.getPayloads(), nullValue());
+        assertThat(message.getParameters(), nullValue());
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void s7MessageParameters() {
+        MessageType messageType = MessageType.USER_DATA;
+        short tpduReference = 1;
+        List<S7Parameter> s7Parameters = new ArrayList<>();
+        List<S7Payload> s7Payloads = new ArrayList<>();
+        ParameterType parameterType = ParameterType.READ_VAR;
+        List<VarParameterItem> parameterItems = new ArrayList<>();
+        SpecificationType specificationType = SpecificationType.VARIABLE_SPECIFICATION;
+        MemoryArea memoryArea = MemoryArea.DATA_BLOCKS;
+        TransportSize dataType = TransportSize.INT;
+        short numElements = 1;
+        byte dataBlock = (byte) 0x1;
+        byte byteOffset = (byte) 0x10;
+        byte bitOffset = (byte) 0x0;
+
+        parameterItems.add(new S7AnyVarParameterItem(specificationType, memoryArea, dataType, numElements, dataBlock, byteOffset, bitOffset));
+
+        VarParameter varParameter = new VarParameter(parameterType, parameterItems);
+
+        s7Parameters.add(varParameter);
+
+        S7RequestMessage message = new S7RequestMessage(messageType, tpduReference, s7Parameters, s7Payloads, null);
+
+        assertThat("Unexpected tpdu value", message.getTpduReference(), equalTo(tpduReference));
+        assertThat("Unexpected message type", message.getMessageType(), equalTo(MessageType.USER_DATA));
+        assertThat("Unexpected number of parameters", message.getParameters(), hasSize(1));
+        assertThat("Unexpected parameters", message.getParameters(), contains(varParameter));
+        assertThat("Parameter missing", message.getParameter(VarParameter.class).isPresent(), is(true));
+        assertThat("Parameter missing", message.getParameter(VarParameter.class).get(), equalTo(varParameter));
+        assertThat("Contains unexpected parameter", message.getParameter(CpuServicesParameter.class).isPresent(), is(false));
+        assertThat(message.getPayloads(), empty());
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void s7MessagePayload() {
+        MessageType messageType = MessageType.USER_DATA;
+        short tpduReference = 1;
+        List<S7Parameter> s7Parameters = new ArrayList<>();
+        List<S7Payload> s7Payloads = new ArrayList<>();
+        ParameterType parameterType = ParameterType.WRITE_VAR;
+        List<VarPayloadItem> payloadItems = new ArrayList<>();
+        byte[] data = {(byte) 0x79};
+        VarPayload varPayload;
+
+        payloadItems.add(new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BIT, data));
+        varPayload = new VarPayload(parameterType, payloadItems);
+        s7Payloads.add(varPayload);
+
+        S7RequestMessage message = new S7RequestMessage(
+            messageType, tpduReference, s7Parameters, s7Payloads, null);
+
+        assertThat("Unexpected tpdu value", message.getTpduReference(), equalTo(tpduReference));
+        assertThat("Unexpected message type", message.getMessageType(), equalTo(MessageType.USER_DATA));
+        assertThat("Unexpected number of payloads", message.getPayloads(), hasSize(1));
+        assertThat("Unexpected payloads", message.getPayloads(), contains(varPayload));
+        assertThat("Payload missing", message.getPayload(VarPayload.class).isPresent(), is(true));
+        assertThat("Payload doesn't match", message.getPayload(VarPayload.class).get(), equalTo(varPayload));
+        assertThat("Contains unexpected payload", message.getPayload(VarParameter.class).isPresent(), is(false)); // No other parameter classes
+        assertThat(message.getParameters(), empty());
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void s7AnyVarParameterItem() {
+        MessageType messageType = MessageType.USER_DATA;
+        short tpduReference = 1;
+        List<S7Parameter> s7Parameters = new ArrayList<>();
+        List<S7Payload> s7Payloads = new ArrayList<>();
+        ParameterType parameterType = ParameterType.READ_VAR;
+        List<VarParameterItem> parameterItems = new ArrayList<>();
+        SpecificationType specificationType = SpecificationType.VARIABLE_SPECIFICATION;
+        MemoryArea memoryArea = MemoryArea.DATA_BLOCKS;
+        TransportSize dataType = TransportSize.INT;
+        int numElements = 1;
+        int dataBlock = 0x1;
+        int byteOffset = 0x10;
+        byte bitOffset = (byte) 0x0;
+
+        S7AnyVarParameterItem parameterItem = new S7AnyVarParameterItem(
+            specificationType, memoryArea, dataType, numElements, dataBlock, byteOffset, bitOffset);
+
+        assertThat("Unexpected specification type", parameterItem.getSpecificationType(), equalTo(specificationType));
+        assertThat("Unexpected memory area", parameterItem.getMemoryArea(), equalTo(MemoryArea.DATA_BLOCKS));
+        assertThat("Unexpected transport size", parameterItem.getDataType(), equalTo(dataType));
+        assertThat("Unexpected number elements", parameterItem.getNumElements(), equalTo(numElements));
+        assertThat("Unexpected data block", parameterItem.getDataBlockNumber(), equalTo(dataBlock));
+        assertThat("Unexpected byte offset", parameterItem.getByteOffset(), equalTo(byteOffset));
+        assertThat("Unexpected bit offset", parameterItem.getBitOffset(), equalTo(bitOffset));
+        assertThat("Unexpected adressing mode", parameterItem.getAddressingMode(), equalTo(VariableAddressingMode.S7ANY));
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/params/S7ParameterTests.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/params/S7ParameterTests.java
index 43d9c8529a7..f55fa615aaf 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/params/S7ParameterTests.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/params/S7ParameterTests.java
@@ -1,80 +1,80 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.netty.model.params;
-
-import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.types.*;
-import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
-import org.apache.plc4x.test.FastTests;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.ArrayList;
-
-import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-
-public class S7ParameterTests {
-
-    @Test
-    @Category(FastTests.class)
-    public void varParameter() {
-        ParameterType parameterType = ParameterType.READ_VAR;
-        ArrayList<VarParameterItem> parameterItems = new ArrayList<>();
-        SpecificationType specificationType = SpecificationType.VARIABLE_SPECIFICATION;
-        MemoryArea memoryArea = MemoryArea.DATA_BLOCKS;
-        TransportSize dataType = TransportSize.INT;
-        short numElements = 1;
-        byte dataBlock = (byte) 0x1;
-        byte byteOffset = (byte) 0x10;
-        byte bitOffset = (byte) 0x0;
-
-        parameterItems.add(new S7AnyVarParameterItem(specificationType, memoryArea, dataType, numElements, dataBlock, byteOffset, bitOffset));
-
-        VarParameter varParameter = new VarParameter(parameterType, parameterItems);
-        assertThat("Unexpected parameter type", varParameter.getType(), equalTo(ParameterType.READ_VAR));
-        assertThat("Unexpected parameter items", varParameter.getItems(), contains(parameterItems.toArray()));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void cpuServicesParameter() {
-        CpuServicesParameter cpuParameter = new CpuServicesRequestParameter(
-            CpuServicesParameterFunctionGroup.CPU_FUNCTIONS, CpuServicesParameterSubFunctionGroup.READ_SSL, (byte) 0);
-        assertThat("Unexpected parameter type", cpuParameter.getType(), equalTo(ParameterType.CPU_SERVICES));
-    }
-    
-    @Test
-    @Category(FastTests.class)
-    public void setupCommunicationsParameter() {
-        short maxAmqCaller = 4;
-        short maxAmqCallee = 8;
-        short pduLength = 512;
-
-        SetupCommunicationParameter setupParameter = new SetupCommunicationParameter(maxAmqCaller, maxAmqCallee, pduLength);
-        assertThat("Unexpected parameter type", setupParameter.getType(), equalTo(ParameterType.SETUP_COMMUNICATION));
-        assertThat("Unexpected value for maxAmqCallee", setupParameter.getMaxAmqCallee(), equalTo(maxAmqCallee));
-        assertThat("Unexpected value for maxAmqCaller", setupParameter.getMaxAmqCaller(), equalTo(maxAmqCaller));
-        assertThat("Unexpected value for pduLength", setupParameter.getPduLength(), equalTo(pduLength));
-    }
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.params;
+
+import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.types.*;
+import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
+import org.apache.plc4x.test.FastTests;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.ArrayList;
+
+import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+
+public class S7ParameterTests {
+
+    @Test
+    @Category(FastTests.class)
+    public void varParameter() {
+        ParameterType parameterType = ParameterType.READ_VAR;
+        ArrayList<VarParameterItem> parameterItems = new ArrayList<>();
+        SpecificationType specificationType = SpecificationType.VARIABLE_SPECIFICATION;
+        MemoryArea memoryArea = MemoryArea.DATA_BLOCKS;
+        TransportSize dataType = TransportSize.INT;
+        short numElements = 1;
+        byte dataBlock = (byte) 0x1;
+        byte byteOffset = (byte) 0x10;
+        byte bitOffset = (byte) 0x0;
+
+        parameterItems.add(new S7AnyVarParameterItem(specificationType, memoryArea, dataType, numElements, dataBlock, byteOffset, bitOffset));
+
+        VarParameter varParameter = new VarParameter(parameterType, parameterItems);
+        assertThat("Unexpected parameter type", varParameter.getType(), equalTo(ParameterType.READ_VAR));
+        assertThat("Unexpected parameter items", varParameter.getItems(), contains(parameterItems.toArray()));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void cpuServicesParameter() {
+        CpuServicesParameter cpuParameter = new CpuServicesRequestParameter(
+            CpuServicesParameterFunctionGroup.CPU_FUNCTIONS, CpuServicesParameterSubFunctionGroup.READ_SSL, (byte) 0);
+        assertThat("Unexpected parameter type", cpuParameter.getType(), equalTo(ParameterType.CPU_SERVICES));
+    }
+    
+    @Test
+    @Category(FastTests.class)
+    public void setupCommunicationsParameter() {
+        short maxAmqCaller = 4;
+        short maxAmqCallee = 8;
+        short pduLength = 512;
+
+        SetupCommunicationParameter setupParameter = new SetupCommunicationParameter(maxAmqCaller, maxAmqCallee, pduLength);
+        assertThat("Unexpected parameter type", setupParameter.getType(), equalTo(ParameterType.SETUP_COMMUNICATION));
+        assertThat("Unexpected value for maxAmqCallee", setupParameter.getMaxAmqCallee(), equalTo(maxAmqCallee));
+        assertThat("Unexpected value for maxAmqCaller", setupParameter.getMaxAmqCaller(), equalTo(maxAmqCaller));
+        assertThat("Unexpected value for pduLength", setupParameter.getPduLength(), equalTo(pduLength));
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/payloads/S7PayloadTests.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/payloads/S7PayloadTests.java
index 38cb3691592..15d3a583685 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/payloads/S7PayloadTests.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/payloads/S7PayloadTests.java
@@ -1,132 +1,132 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.netty.model.payloads;
-
-import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.ssls.SslModuleIdentificationDataRecord;
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
-import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
-import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
-import org.apache.plc4x.java.s7.netty.model.types.SslId;
-import org.apache.plc4x.test.FastTests;
-import org.hamcrest.core.IsNull;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.ArrayList;
-import java.util.Collections;
-
-import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-
-public class S7PayloadTests {
-
-    @Test
-    @Category(FastTests.class)
-    public void varPayloadItem() {
-        DataTransportErrorCode returnCode = DataTransportErrorCode.NOT_FOUND;
-        DataTransportSize dataTransportSize = DataTransportSize.INTEGER;
-        byte[] data = {(byte)0xFF};
-
-        VarPayloadItem  varPayloadItem = new VarPayloadItem(returnCode, dataTransportSize, data);
-        assertThat("Unexpected data transport error code", varPayloadItem.getReturnCode(), equalTo(DataTransportErrorCode.NOT_FOUND));
-        assertThat("Unexpected data transport size", varPayloadItem.getDataTransportSize(), equalTo(DataTransportSize.INTEGER));
-        assertThat("Unexpected user data", varPayloadItem.getData()[0], equalTo((byte) 0xFF));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void varPayload() {
-        ParameterType parameterType = ParameterType.DOWNLOAD_ENDED;
-        ArrayList<VarPayloadItem> payloadItems = new ArrayList<>();
-        byte[] data = {(byte)0xFF};
-        
-        payloadItems.add(new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BIT, data));
-
-        VarPayload  varPayload = new VarPayload(parameterType, payloadItems);
-
-        assertThat("Unexpected parameter type", varPayload.getType(), equalTo(ParameterType.DOWNLOAD_ENDED));
-        assertThat("Unexpected payload items", varPayload.getItems(), contains(payloadItems.toArray()));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void mergeVarPayloads() {
-        VarPayload  primaryVarPayload = new VarPayload(ParameterType.READ_VAR, Collections.singletonList(new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BIT, new byte[] {(byte) 0xFF})));
-
-        assertThat(primaryVarPayload.getItems(), IsNull.notNullValue());
-        assertThat(primaryVarPayload.getItems().size(), equalTo(1));
-
-        VarPayload  secondaryVarPayload = new VarPayload(ParameterType.READ_VAR, Collections.singletonList(new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BIT, new byte[] {(byte) 0x11})));
-
-        assertThat(secondaryVarPayload.getItems(), IsNull.notNullValue());
-        assertThat(secondaryVarPayload.getItems().size(), equalTo(1));
-
-        VarPayload resultingPayload = primaryVarPayload.mergePayload(secondaryVarPayload);
-
-        assertThat(resultingPayload.getItems(), IsNull.notNullValue());
-        assertThat(resultingPayload.getItems().size(), equalTo(2));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void emptyCpuServicesPayload() {
-        CpuServicesPayload cpuServicesPayload = new CpuServicesPayload(DataTransportErrorCode.OK, SslId.CPU_CHARACTERISTICS, (short) 1);
-
-        assertThat(cpuServicesPayload.getType(), equalTo(ParameterType.CPU_SERVICES));
-        assertThat(cpuServicesPayload.getReturnCode(), equalTo(DataTransportErrorCode.OK));
-        assertThat(cpuServicesPayload.getSslId(), equalTo(SslId.CPU_CHARACTERISTICS));
-        assertThat(cpuServicesPayload.getSslIndex(), equalTo((short) 1));
-        assertThat(cpuServicesPayload.getSslDataRecords(), IsNull.notNullValue());
-        assertThat(cpuServicesPayload.getSslDataRecords().size(), equalTo(0));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void cpuServicesPayload() {
-        SslModuleIdentificationDataRecord sslModuleIdentificationDataRecord = new SslModuleIdentificationDataRecord(
-            SslModuleIdentificationDataRecord.INDEX_MODULE, "ArtNo", (short) 1, (short) 2, (short) 3);
-
-        CpuServicesPayload cpuServicesPayload = new CpuServicesPayload(DataTransportErrorCode.OK, SslId.MODULE_IDENTIFICATION, (short) 1, Collections.singletonList(sslModuleIdentificationDataRecord));
-
-        assertThat(cpuServicesPayload.getType(), equalTo(ParameterType.CPU_SERVICES));
-        assertThat(cpuServicesPayload.getReturnCode(), equalTo(DataTransportErrorCode.OK));
-        assertThat(cpuServicesPayload.getSslId(), equalTo(SslId.MODULE_IDENTIFICATION));
-        assertThat(cpuServicesPayload.getSslIndex(), equalTo((short) 1));
-        assertThat(cpuServicesPayload.getSslDataRecords(), IsNull.notNullValue());
-        assertThat(cpuServicesPayload.getSslDataRecords().size(), equalTo(1));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void sslModuleIdentificationPayload() {
-        SslModuleIdentificationDataRecord sslModuleIdentificationDataRecord = new SslModuleIdentificationDataRecord(
-            SslModuleIdentificationDataRecord.INDEX_MODULE, "ArtNo", (short) 1, (short) 2, (short) 3);
-
-        assertThat(sslModuleIdentificationDataRecord.getIndex(), equalTo(SslModuleIdentificationDataRecord.INDEX_MODULE));
-        assertThat(sslModuleIdentificationDataRecord.getArticleNumber(), equalTo("ArtNo"));
-        assertThat(sslModuleIdentificationDataRecord.getBgType(), equalTo((short) 1));
-        assertThat(sslModuleIdentificationDataRecord.getModuleOrOsVersion(), equalTo((short) 2));
-        assertThat(sslModuleIdentificationDataRecord.getPgDescriptionFileVersion(), equalTo((short) 3));
-        assertThat(sslModuleIdentificationDataRecord.getLengthInWords(), equalTo((short) 14));
-    }
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.payloads;
+
+import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.ssls.SslModuleIdentificationDataRecord;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportErrorCode;
+import org.apache.plc4x.java.s7.netty.model.types.DataTransportSize;
+import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
+import org.apache.plc4x.java.s7.netty.model.types.SslId;
+import org.apache.plc4x.test.FastTests;
+import org.hamcrest.core.IsNull;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.ArrayList;
+import java.util.Collections;
+
+import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+
+public class S7PayloadTests {
+
+    @Test
+    @Category(FastTests.class)
+    public void varPayloadItem() {
+        DataTransportErrorCode returnCode = DataTransportErrorCode.NOT_FOUND;
+        DataTransportSize dataTransportSize = DataTransportSize.INTEGER;
+        byte[] data = {(byte)0xFF};
+
+        VarPayloadItem  varPayloadItem = new VarPayloadItem(returnCode, dataTransportSize, data);
+        assertThat("Unexpected data transport error code", varPayloadItem.getReturnCode(), equalTo(DataTransportErrorCode.NOT_FOUND));
+        assertThat("Unexpected data transport size", varPayloadItem.getDataTransportSize(), equalTo(DataTransportSize.INTEGER));
+        assertThat("Unexpected user data", varPayloadItem.getData()[0], equalTo((byte) 0xFF));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void varPayload() {
+        ParameterType parameterType = ParameterType.DOWNLOAD_ENDED;
+        ArrayList<VarPayloadItem> payloadItems = new ArrayList<>();
+        byte[] data = {(byte)0xFF};
+        
+        payloadItems.add(new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BIT, data));
+
+        VarPayload  varPayload = new VarPayload(parameterType, payloadItems);
+
+        assertThat("Unexpected parameter type", varPayload.getType(), equalTo(ParameterType.DOWNLOAD_ENDED));
+        assertThat("Unexpected payload items", varPayload.getItems(), contains(payloadItems.toArray()));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void mergeVarPayloads() {
+        VarPayload  primaryVarPayload = new VarPayload(ParameterType.READ_VAR, Collections.singletonList(new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BIT, new byte[] {(byte) 0xFF})));
+
+        assertThat(primaryVarPayload.getItems(), IsNull.notNullValue());
+        assertThat(primaryVarPayload.getItems().size(), equalTo(1));
+
+        VarPayload  secondaryVarPayload = new VarPayload(ParameterType.READ_VAR, Collections.singletonList(new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BIT, new byte[] {(byte) 0x11})));
+
+        assertThat(secondaryVarPayload.getItems(), IsNull.notNullValue());
+        assertThat(secondaryVarPayload.getItems().size(), equalTo(1));
+
+        VarPayload resultingPayload = primaryVarPayload.mergePayload(secondaryVarPayload);
+
+        assertThat(resultingPayload.getItems(), IsNull.notNullValue());
+        assertThat(resultingPayload.getItems().size(), equalTo(2));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void emptyCpuServicesPayload() {
+        CpuServicesPayload cpuServicesPayload = new CpuServicesPayload(DataTransportErrorCode.OK, SslId.CPU_CHARACTERISTICS, (short) 1);
+
+        assertThat(cpuServicesPayload.getType(), equalTo(ParameterType.CPU_SERVICES));
+        assertThat(cpuServicesPayload.getReturnCode(), equalTo(DataTransportErrorCode.OK));
+        assertThat(cpuServicesPayload.getSslId(), equalTo(SslId.CPU_CHARACTERISTICS));
+        assertThat(cpuServicesPayload.getSslIndex(), equalTo((short) 1));
+        assertThat(cpuServicesPayload.getSslDataRecords(), IsNull.notNullValue());
+        assertThat(cpuServicesPayload.getSslDataRecords().size(), equalTo(0));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void cpuServicesPayload() {
+        SslModuleIdentificationDataRecord sslModuleIdentificationDataRecord = new SslModuleIdentificationDataRecord(
+            SslModuleIdentificationDataRecord.INDEX_MODULE, "ArtNo", (short) 1, (short) 2, (short) 3);
+
+        CpuServicesPayload cpuServicesPayload = new CpuServicesPayload(DataTransportErrorCode.OK, SslId.MODULE_IDENTIFICATION, (short) 1, Collections.singletonList(sslModuleIdentificationDataRecord));
+
+        assertThat(cpuServicesPayload.getType(), equalTo(ParameterType.CPU_SERVICES));
+        assertThat(cpuServicesPayload.getReturnCode(), equalTo(DataTransportErrorCode.OK));
+        assertThat(cpuServicesPayload.getSslId(), equalTo(SslId.MODULE_IDENTIFICATION));
+        assertThat(cpuServicesPayload.getSslIndex(), equalTo((short) 1));
+        assertThat(cpuServicesPayload.getSslDataRecords(), IsNull.notNullValue());
+        assertThat(cpuServicesPayload.getSslDataRecords().size(), equalTo(1));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void sslModuleIdentificationPayload() {
+        SslModuleIdentificationDataRecord sslModuleIdentificationDataRecord = new SslModuleIdentificationDataRecord(
+            SslModuleIdentificationDataRecord.INDEX_MODULE, "ArtNo", (short) 1, (short) 2, (short) 3);
+
+        assertThat(sslModuleIdentificationDataRecord.getIndex(), equalTo(SslModuleIdentificationDataRecord.INDEX_MODULE));
+        assertThat(sslModuleIdentificationDataRecord.getArticleNumber(), equalTo("ArtNo"));
+        assertThat(sslModuleIdentificationDataRecord.getBgType(), equalTo((short) 1));
+        assertThat(sslModuleIdentificationDataRecord.getModuleOrOsVersion(), equalTo((short) 2));
+        assertThat(sslModuleIdentificationDataRecord.getPgDescriptionFileVersion(), equalTo((short) 3));
+        assertThat(sslModuleIdentificationDataRecord.getLengthInWords(), equalTo((short) 14));
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/types/S7TypeTests.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/types/S7TypeTests.java
index bf0c7c00ea2..33455eea3f8 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/types/S7TypeTests.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/types/S7TypeTests.java
@@ -1,150 +1,150 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.s7.netty.model.types;
-
-import org.apache.plc4x.test.FastTests;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.hamcrest.core.IsNull.nullValue;
-import static org.junit.Assert.assertThat;
-
-public class S7TypeTests {
-
-    @Test
-    @Category(FastTests.class)
-    public void dataTransportErrorCode() {
-        DataTransportErrorCode dataTransportErrorCode = DataTransportErrorCode.INVALID_ADDRESS;
-
-        assertThat("5 incorrectly mapped", DataTransportErrorCode.valueOf((byte) 5), equalTo(DataTransportErrorCode.INVALID_ADDRESS));
-        assertThat("code is not 5", dataTransportErrorCode.getCode(), equalTo((byte) 5));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void unknownDataTransportErrorCode() {
-        DataTransportErrorCode dataTransportErrorCode = DataTransportErrorCode.INVALID_ADDRESS;
-
-        assertThat(DataTransportErrorCode.valueOf((byte) 0xFE), nullValue());
-        assertThat(DataTransportErrorCode.valueOf((byte) 0xFE), nullValue());
-
-        assertThat(dataTransportErrorCode.getCode(), equalTo((byte) 0x05));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void dataTransportSize() {
-        DataTransportSize dataTransportSize = DataTransportSize.DINTEGER;
-
-        assertThat("6 incorrectly mapped", DataTransportSize.valueOf((byte) 6), equalTo(DataTransportSize.DINTEGER));
-        assertThat(dataTransportSize.getCode(), equalTo((byte) 6));
-        assertThat("Unexpected return from bit size", dataTransportSize.isSizeInBits(), is(false));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void headerErrorClass() {
-        assertThat("incorrectly mapped", HeaderErrorClass.valueOf((byte) 0x87), equalTo(HeaderErrorClass.ACCESS_ERROR));
-
-        HeaderErrorClass headerErrorClass = HeaderErrorClass.ACCESS_ERROR;
-        assertThat(headerErrorClass.getCode(), equalTo((byte) 0x87));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void messageType() {
-        MessageType messageType = MessageType.ACK;
-
-        assertThat("2 incorrectly mapped", MessageType.valueOf((byte) 2), equalTo(MessageType.ACK));
-        assertThat("code is not 2", messageType.getCode(), equalTo((byte) 2));
-        assertThat("2 incorrectly mapped", MessageType.valueOf((byte) 2), equalTo(MessageType.ACK));
-
-        assertThat(messageType.getCode(), equalTo((byte) 2));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void parameterError() {
-        assertThat("incorrectly mapped", ParameterError.valueOf((short) 0x011C), equalTo(ParameterError.PROTOCOL_ERROR));
-
-        ParameterError parameterError = ParameterError.PROTOCOL_ERROR;
-        assertThat(parameterError.getCode(), equalTo((short) 0x011C));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void parameterType() {
-        ParameterType parameterType = ParameterType.UPLOAD;
-
-        assertThat("0x1E incorrectly mapped", ParameterType.valueOf((byte) 0x1E), equalTo(ParameterType.UPLOAD));
-        assertThat("code is not 0x1E", parameterType.getCode(), equalTo((byte) 0x1E));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void unknownParameterType() {
-        assertThat(ParameterType.valueOf((byte) 0xFF), nullValue());
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void specificationType() {
-        SpecificationType specificationType = SpecificationType.VARIABLE_SPECIFICATION;
-
-        assertThat("0x12 incorrectly mapped", SpecificationType.valueOf((byte) 0x12), equalTo(SpecificationType.VARIABLE_SPECIFICATION));
-        assertThat("code is not 0x12", specificationType.getCode(), equalTo((byte) 0x12));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void transportSize() {
-        TransportSize transportSize = TransportSize.TIME;
-
-        assertThat("0x0B incorrectly mapped", TransportSize.valueOf((byte) 0x0B), equalTo(TransportSize.TIME));
-        assertThat("code is not 0x0B", transportSize.getTypeCode(), equalTo((byte) 0x0B));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void variableAddressingMode() {
-        VariableAddressingMode variableAddressingMode = VariableAddressingMode.ALARM_ACK;
-
-        assertThat("0x19 incorrectly mapped", VariableAddressingMode.valueOf((byte) 0x19), equalTo(VariableAddressingMode.ALARM_ACK));
-        assertThat("code is not 0x19", variableAddressingMode.getCode(), equalTo((byte) 0x19));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void memoryAccess() {
-        MemoryArea memoryArea = MemoryArea.DATA_BLOCKS;
-
-        assertThat("0x84 incorrectly mapped", MemoryArea.valueOf((byte) 0x84), equalTo(MemoryArea.DATA_BLOCKS));
-        assertThat("code is not 0x84", memoryArea.getCode(), equalTo((byte) 0x84));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void unknownMemoryAccess() {
-        assertThat(MemoryArea.valueOf((byte) 0xFF), nullValue());
-    }
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.s7.netty.model.types;
+
+import org.apache.plc4x.test.FastTests;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.core.IsNull.nullValue;
+import static org.junit.Assert.assertThat;
+
+public class S7TypeTests {
+
+    @Test
+    @Category(FastTests.class)
+    public void dataTransportErrorCode() {
+        DataTransportErrorCode dataTransportErrorCode = DataTransportErrorCode.INVALID_ADDRESS;
+
+        assertThat("5 incorrectly mapped", DataTransportErrorCode.valueOf((byte) 5), equalTo(DataTransportErrorCode.INVALID_ADDRESS));
+        assertThat("code is not 5", dataTransportErrorCode.getCode(), equalTo((byte) 5));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void unknownDataTransportErrorCode() {
+        DataTransportErrorCode dataTransportErrorCode = DataTransportErrorCode.INVALID_ADDRESS;
+
+        assertThat(DataTransportErrorCode.valueOf((byte) 0xFE), nullValue());
+        assertThat(DataTransportErrorCode.valueOf((byte) 0xFE), nullValue());
+
+        assertThat(dataTransportErrorCode.getCode(), equalTo((byte) 0x05));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void dataTransportSize() {
+        DataTransportSize dataTransportSize = DataTransportSize.DINTEGER;
+
+        assertThat("6 incorrectly mapped", DataTransportSize.valueOf((byte) 6), equalTo(DataTransportSize.DINTEGER));
+        assertThat(dataTransportSize.getCode(), equalTo((byte) 6));
+        assertThat("Unexpected return from bit size", dataTransportSize.isSizeInBits(), is(false));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void headerErrorClass() {
+        assertThat("incorrectly mapped", HeaderErrorClass.valueOf((byte) 0x87), equalTo(HeaderErrorClass.ACCESS_ERROR));
+
+        HeaderErrorClass headerErrorClass = HeaderErrorClass.ACCESS_ERROR;
+        assertThat(headerErrorClass.getCode(), equalTo((byte) 0x87));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void messageType() {
+        MessageType messageType = MessageType.ACK;
+
+        assertThat("2 incorrectly mapped", MessageType.valueOf((byte) 2), equalTo(MessageType.ACK));
+        assertThat("code is not 2", messageType.getCode(), equalTo((byte) 2));
+        assertThat("2 incorrectly mapped", MessageType.valueOf((byte) 2), equalTo(MessageType.ACK));
+
+        assertThat(messageType.getCode(), equalTo((byte) 2));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void parameterError() {
+        assertThat("incorrectly mapped", ParameterError.valueOf((short) 0x011C), equalTo(ParameterError.PROTOCOL_ERROR));
+
+        ParameterError parameterError = ParameterError.PROTOCOL_ERROR;
+        assertThat(parameterError.getCode(), equalTo((short) 0x011C));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void parameterType() {
+        ParameterType parameterType = ParameterType.UPLOAD;
+
+        assertThat("0x1E incorrectly mapped", ParameterType.valueOf((byte) 0x1E), equalTo(ParameterType.UPLOAD));
+        assertThat("code is not 0x1E", parameterType.getCode(), equalTo((byte) 0x1E));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void unknownParameterType() {
+        assertThat(ParameterType.valueOf((byte) 0xFF), nullValue());
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void specificationType() {
+        SpecificationType specificationType = SpecificationType.VARIABLE_SPECIFICATION;
+
+        assertThat("0x12 incorrectly mapped", SpecificationType.valueOf((byte) 0x12), equalTo(SpecificationType.VARIABLE_SPECIFICATION));
+        assertThat("code is not 0x12", specificationType.getCode(), equalTo((byte) 0x12));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void transportSize() {
+        TransportSize transportSize = TransportSize.TIME;
+
+        assertThat("0x0B incorrectly mapped", TransportSize.valueOf((byte) 0x0B), equalTo(TransportSize.TIME));
+        assertThat("code is not 0x0B", transportSize.getTypeCode(), equalTo((byte) 0x0B));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void variableAddressingMode() {
+        VariableAddressingMode variableAddressingMode = VariableAddressingMode.ALARM_ACK;
+
+        assertThat("0x19 incorrectly mapped", VariableAddressingMode.valueOf((byte) 0x19), equalTo(VariableAddressingMode.ALARM_ACK));
+        assertThat("code is not 0x19", variableAddressingMode.getCode(), equalTo((byte) 0x19));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void memoryAccess() {
+        MemoryArea memoryArea = MemoryArea.DATA_BLOCKS;
+
+        assertThat("0x84 incorrectly mapped", MemoryArea.valueOf((byte) 0x84), equalTo(MemoryArea.DATA_BLOCKS));
+        assertThat("code is not 0x84", memoryArea.getCode(), equalTo((byte) 0x84));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void unknownMemoryAccess() {
+        assertThat(MemoryArea.valueOf((byte) 0xFF), nullValue());
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessorTest.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessorTest.java
index 9e087b42f26..de9cc34f0b9 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessorTest.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessorTest.java
@@ -1,931 +1,931 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.strategies;
-
-import org.apache.plc4x.java.api.exceptions.PlcException;
-import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
-import org.apache.plc4x.java.s7.netty.model.messages.S7ResponseMessage;
-import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
-import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
-import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
-import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
-import org.apache.plc4x.java.s7.netty.model.types.*;
-import org.hamcrest.core.IsCollectionContaining;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.*;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.lessThan;
-import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.hamcrest.core.IsNull.nullValue;
-import static org.junit.Assert.assertThat;
-
-public class DefaultS7MessageProcessorTest {
-
-    private S7MessageProcessor SUT;
-
-    @Before
-    public void setUp() {
-        SUT = new DefaultS7MessageProcessor();
-    }
-
-    /**
-     * In this test both the size of the request as well as the estimated response will be well within
-     * the bounds set by the PDU size parameter, so we are expecting the processor to not change anything.
-     *
-     * @throws PlcException something went wrong.
-     */
-    @Test
-    public void readMessageSimple() throws PlcException {
-        S7RequestMessage request = createReadMessage(
-            Collections.singletonList(
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 1, (short) 0, (byte) 0)));
-        Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250);
-
-        assertThat(processedRequests, notNullValue());
-        assertThat(processedRequests, hasSize(1));
-
-        Optional<VarParameter> parameter = processedRequests.iterator().next().getParameter(VarParameter.class);
-        assertThat(parameter.isPresent(), is(true));
-        VarParameter varParameter = parameter.get();
-        assertThat(varParameter.getItems(), hasSize(1));
-    }
-
-    /**
-     * In this test both the size of the request as well as the estimated response will be well within
-     * the bounds set by the PDU size parameter, so we are expecting the processor to not change anything.
-     *
-     * @throws PlcException something went wrong.
-     */
-    @Test
-    public void readMessageMultipleItems() throws PlcException {
-        S7RequestMessage request = createReadMessage(
-            Arrays.asList(
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 1, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 2, (short) 0, (byte) 0)));
-        Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250);
-
-        assertThat(processedRequests, notNullValue());
-        assertThat(processedRequests, hasSize(1));
-
-        Optional<VarParameter> parameter = processedRequests.iterator().next().getParameter(VarParameter.class);
-        assertThat(parameter.isPresent(), is(true));
-        VarParameter varParameter = parameter.get();
-        assertThat(varParameter.getItems(), hasSize(2));
-    }
-
-    /**
-     * The maximum number of request items to fit into a PDU with the size 250 is usually 19. So this request
-     * should just fit into one message and therefore we expect the processor to leave the message unchanged.
-     *
-     * @throws PlcException something went wrong.
-     */
-    @Test
-    public void readMessageMultipleItemsWithLargeRequestSize() throws PlcException {
-        S7RequestMessage request = createReadMessage(
-            Arrays.asList(
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 1, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 2, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 3, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 4, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 5, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 6, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 7, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 8, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 9, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 10, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 11, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 12, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 13, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 14, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 15, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 16, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 17, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 18, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 19, (short) 0, (byte) 0)));
-        Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250);
-
-        assertThat(processedRequests, notNullValue());
-        assertThat(processedRequests, hasSize(1));
-
-        Optional<VarParameter> parameter = processedRequests.iterator().next().getParameter(VarParameter.class);
-        assertThat(parameter.isPresent(), is(true));
-        VarParameter varParameter = parameter.get();
-        assertThat(varParameter.getItems(), hasSize(19));
-    }
-
-    /**
-     * In this request, the request size itself exceeds the bounds set by the PDU size parameter,
-     * therefore the processor is expected to split the one request with two items up into two requests
-     * with each one item.
-     *
-     * @throws PlcException something went wrong.
-     */
-    @Test
-    public void readMessageMultipleItemsWithTooLargeRequestSize() throws PlcException {
-        S7RequestMessage request = createReadMessage(
-            Arrays.asList(
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 1, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 2, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 3, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 4, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 5, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 6, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 7, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 8, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 9, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 10, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 11, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 12, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 13, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 14, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 15, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 16, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 17, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 18, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 19, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 20, (short) 0, (byte) 0)));
-        Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250);
-
-        assertThat(processedRequests, notNullValue());
-        assertThat(processedRequests, hasSize(2));
-
-        int totalItems = 0;
-        for (S7RequestMessage requestMessage : processedRequests) {
-            Optional<VarParameter> parameter = requestMessage.getParameter(VarParameter.class);
-            assertThat(parameter.isPresent(), is(true));
-            VarParameter varParameter = parameter.get();
-            int numItems = varParameter.getItems().size();
-            // From calculation and byte counting we know that with a pdu-size of 250 a read message can't have
-            // more than 19 items.
-            assertThat(numItems, lessThan(20));
-            totalItems += numItems;
-        }
-        // In total 20 items should have been found.
-        assertThat(totalItems, is(20));
-    }
-
-    /**
-     * In this request, the request size itself is way within the bounds set by the PDU size parameter,
-     * however the estimated size of the response would exceed this greatly, therefore the processor is
-     * expected to split the one request with two items up into two requests with each one item.
-     *
-     * @throws PlcException something went wrong.
-     */
-    @Test
-    public void readMessageCompositeWithLargeResponseSize() throws PlcException {
-        S7RequestMessage request = createReadMessage(
-            Arrays.asList(
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 200, (short) 1, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 200, (short) 2, (short) 0, (byte) 0)));
-        Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 256);
-
-        assertThat(processedRequests, notNullValue());
-        assertThat(processedRequests, hasSize(2));
-
-        for (S7RequestMessage requestMessage : processedRequests) {
-            Optional<VarParameter> parameter = requestMessage.getParameter(VarParameter.class);
-            assertThat(parameter.isPresent(), is(true));
-            VarParameter varParameter = parameter.get();
-            assertThat(varParameter.getItems(), hasSize(1));
-        }
-    }
-
-    /**
-     * In this request, the request size itself is way within the bounds set by the PDU size parameter,
-     * however the estimated size of the response would exceed this greatly. In contrast to the test above
-     * a single item is too large for being sent at all. So in this case the item should be split up into
-     * multiple element and joined together after all sub-messages are returned.
-     *
-     * @throws PlcException something went wrong.
-     */
-    @Test
-    public void readMessageWithTooLargeResponseSize() throws PlcException {
-        S7RequestMessage request = createReadMessage(
-            Collections.singletonList(
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.REAL, (short) 400, (short) 1, (short) 0, (byte) 0)));
-        Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 256);
-
-        assertThat(processedRequests, notNullValue());
-        assertThat(processedRequests, hasSize(7));
-
-        int totalNumItems = 0;
-        for (S7RequestMessage requestMessage : processedRequests) {
-            Optional<VarParameter> parameter = requestMessage.getParameter(VarParameter.class);
-            assertThat(parameter.isPresent(), is(true));
-            VarParameter varParameter = parameter.get();
-            assertThat(varParameter.getItems(), hasSize(1));
-            totalNumItems += ((S7AnyVarParameterItem) varParameter.getItems().iterator().next()).getNumElements();
-        }
-        assertThat(totalNumItems, equalTo(400));
-    }
-
-    /**
-     * In this request, we only send one single element to one single field. Nothing should be changed.
-     *
-     * @throws PlcException something went wrong.
-     */
-    @Test
-    public void writeMessageSimple() throws PlcException {
-        S7RequestMessage request = createWriteMessage(
-            Collections.singletonList(
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 1, (short) 0, (byte) 0)),
-            Collections.singletonList(
-                new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {0x00}))
-            );
-        Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250);
-
-        assertThat(processedRequests, notNullValue());
-        assertThat(processedRequests, hasSize(1));
-
-        S7RequestMessage processedRequest = processedRequests.iterator().next();
-
-        // Check the parameter
-        Optional<VarParameter> parameter = processedRequest.getParameter(VarParameter.class);
-        assertThat(parameter.isPresent(), is(true));
-        VarParameter varParameter = parameter.get();
-        assertThat(varParameter.getItems(), hasSize(1));
-
-        // Check the payload
-        Optional<VarPayload> payload = processedRequest.getPayload(VarPayload.class);
-        assertThat(payload.isPresent(), is(true));
-        VarPayload varPayload = payload.get();
-        assertThat(varPayload.getItems(), hasSize(1));
-    }
-
-    /**
-     * In this request, we send an array of bit elements to a single field, the request should be broken
-     * up into multiple single element write messages as the S7 doesn't seem to like writing of arrays.
-     *
-     * @throws PlcException something went wrong.
-     */
-    @Test
-    public void writeMessageSimpleBitArray() throws PlcException {
-        S7RequestMessage request = createWriteMessage(
-            Collections.singletonList(
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BOOL, (short) 10, (short) 1, (short) 0, (byte) 0)),
-            Collections.singletonList(
-                new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BIT, new byte[] {
-                    (byte) 0xAA, (byte) 0x02}))
-        );
-        Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250);
-
-        // Initialize a set of expected fields.
-        Set<String> expectedFields = new HashSet<>(10);
-        for(int i = 0; i < 10; i++) {
-            expectedFields.add(i / 8 + "/" + i % 8);
-        }
-
-        // We are expecting to receive 10 messages as we had an array of 10 items.
-        assertThat(processedRequests, hasSize(10));
-        // Process all the messages and check each one
-        for (S7RequestMessage processedRequest : processedRequests) {
-            Optional<VarParameter> parameterOptional = processedRequest.getParameter(VarParameter.class);
-            assertThat(parameterOptional.isPresent(), is(true));
-            VarParameter varParameter = parameterOptional.get();
-
-            Optional<VarPayload> payloadOptional = processedRequest.getPayload(VarPayload.class);
-            assertThat(payloadOptional.isPresent(), is(true));
-            VarPayload varPayload = payloadOptional.get();
-
-            assertThat(varParameter.getItems(), hasSize(1));
-            assertThat(varPayload.getItems(), hasSize(1));
-
-            VarParameterItem parameterItem = varParameter.getItems().iterator().next();
-            assertThat(parameterItem.getAddressingMode(), is(VariableAddressingMode.S7ANY));
-            S7AnyVarParameterItem s7AnyParameterItem = (S7AnyVarParameterItem) parameterItem;
-            assertThat(s7AnyParameterItem.getMemoryArea(), is(MemoryArea.DATA_BLOCKS));
-            assertThat(s7AnyParameterItem.getDataType(), is(TransportSize.BOOL));
-            assertThat(s7AnyParameterItem.getNumElements(), is(1));
-            String fieldString = s7AnyParameterItem.getByteOffset() + "/" + s7AnyParameterItem.getBitOffset();
-            assertThat(expectedFields, IsCollectionContaining.hasItem(fieldString));
-
-            VarPayloadItem payloadItem = varPayload.getItems().iterator().next();
-            // We are expecting that the payload is simply "the field of the byte + 1".
-            assertThat(payloadItem.getData().length, is(1));
-            int value = (s7AnyParameterItem.getByteOffset() * 8) + s7AnyParameterItem.getBitOffset();
-            byte expectedValue = (value % 2 == 0) ? (byte) 0x00 : (byte) 0x01;
-            assertThat(payloadItem.getData()[0], is(expectedValue));
-
-            // Remove the used field from the list of available ones.
-            expectedFields.remove(fieldString);
-        }
-
-        // In the end all fields should have been used.
-        assertThat(expectedFields, hasSize(0));
-    }
-
-    /**
-     * In this request, we send an array of elements to a single field, the request should be broken
-     * up into multiple single element write messages as the S7 doesn't seem to like writing of arrays.
-     *
-     * @throws PlcException something went wrong.
-     */
-    @Test
-    public void writeMessageSimpleByteArray() throws PlcException {
-        S7RequestMessage request = createWriteMessage(
-            Collections.singletonList(
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, 10, 1, (short) 0, (byte) 0)),
-            Collections.singletonList(
-                new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {
-                    0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A}))
-        );
-        Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250);
-
-        // Initialize a set of expected fields.
-        Set<Integer> expectedFields = new HashSet<>(10);
-        for(int i = 0; i < 10; i++) {
-            expectedFields.add(i);
-        }
-
-        // We are expecting to receive 10 messages as we had an array of 10 items.
-        assertThat(processedRequests, hasSize(10));
-        // Process all the messages and check each one
-        for (S7RequestMessage processedRequest : processedRequests) {
-            Optional<VarParameter> parameterOptional = processedRequest.getParameter(VarParameter.class);
-            assertThat(parameterOptional.isPresent(), is(true));
-            VarParameter varParameter = parameterOptional.get();
-
-            Optional<VarPayload> payloadOptional = processedRequest.getPayload(VarPayload.class);
-            assertThat(payloadOptional.isPresent(), is(true));
-            VarPayload varPayload = payloadOptional.get();
-
-            assertThat(varParameter.getItems(), hasSize(1));
-            assertThat(varPayload.getItems(), hasSize(1));
-
-            VarParameterItem parameterItem = varParameter.getItems().iterator().next();
-            assertThat(parameterItem.getAddressingMode(), is(VariableAddressingMode.S7ANY));
-            S7AnyVarParameterItem s7AnyParameterItem = (S7AnyVarParameterItem) parameterItem;
-            assertThat(s7AnyParameterItem.getMemoryArea(), is(MemoryArea.DATA_BLOCKS));
-            assertThat(s7AnyParameterItem.getDataType(), is(TransportSize.BYTE));
-            assertThat(s7AnyParameterItem.getNumElements(), is(1));
-            // Check the field is in the expected range and hasn't been used yet.
-            assertThat(expectedFields.contains(s7AnyParameterItem.getByteOffset()), is(true));
-            assertThat(s7AnyParameterItem.getBitOffset(), is((byte) 0));
-
-            VarPayloadItem payloadItem = varPayload.getItems().iterator().next();
-            // We are expecting that the payload is simply "the field of the byte + 1".
-            assertThat(payloadItem.getData().length, is(1));
-            byte expectedValue = (byte) ((byte) s7AnyParameterItem.getByteOffset() + (byte) 1);
-            assertThat(payloadItem.getData()[0], is(expectedValue));
-
-            // Remove the used field from the list of available ones.
-            expectedFields.remove(s7AnyParameterItem.getByteOffset());
-        }
-
-        // In the end all fields should have been used.
-        assertThat(expectedFields, hasSize(0));
-    }
-
-    /**
-     * In this request, we send an array of elements to a single field, the request should be broken
-     * up into multiple single element write messages as the S7 doesn't seem to like writing of arrays.
-     *
-     * @throws PlcException something went wrong.
-     */
-    @Test
-    public void writeMessageSimpleDwordArray() throws PlcException {
-        S7RequestMessage request = createWriteMessage(
-            Collections.singletonList(
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.DWORD, (short) 10, (short) 1, (short) 0, (byte) 0)),
-            Collections.singletonList(
-                new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {
-                    0x00, 0x00, 0x00, 0x01,
-                    0x00, 0x00, 0x00, 0x02,
-                    0x00, 0x00, 0x00, 0x03,
-                    0x00, 0x00, 0x00, 0x04,
-                    0x00, 0x00, 0x00, 0x05,
-                    0x00, 0x00, 0x00, 0x06,
-                    0x00, 0x00, 0x00, 0x07,
-                    0x00, 0x00, 0x00, 0x08,
-                    0x00, 0x00, 0x00, 0x09,
-                    0x00, 0x00, 0x00, 0x0A})));
-        Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250);
-
-        // Initialize a set of expected fields.
-        Set<Integer> expectedFields = new HashSet<>(10);
-        for(int i = 0; i < 10; i++) {
-            expectedFields.add((i * 4));
-        }
-
-        // We are expecting to receive 10 messages as we had an array of 10 items.
-        assertThat(processedRequests, hasSize(10));
-        // Process all the messages and check each one
-        for (S7RequestMessage processedRequest : processedRequests) {
-            Optional<VarParameter> parameterOptional = processedRequest.getParameter(VarParameter.class);
-            assertThat(parameterOptional.isPresent(), is(true));
-            VarParameter varParameter = parameterOptional.get();
-
-            Optional<VarPayload> payloadOptional = processedRequest.getPayload(VarPayload.class);
-            assertThat(payloadOptional.isPresent(), is(true));
-            VarPayload varPayload = payloadOptional.get();
-
-            assertThat(varParameter.getItems(), hasSize(1));
-            assertThat(varPayload.getItems(), hasSize(1));
-
-            VarParameterItem parameterItem = varParameter.getItems().iterator().next();
-            assertThat(parameterItem.getAddressingMode(), is(VariableAddressingMode.S7ANY));
-            S7AnyVarParameterItem s7AnyParameterItem = (S7AnyVarParameterItem) parameterItem;
-            assertThat(s7AnyParameterItem.getMemoryArea(), is(MemoryArea.DATA_BLOCKS));
-            assertThat(s7AnyParameterItem.getDataType(), is(TransportSize.DWORD));
-            assertThat(s7AnyParameterItem.getNumElements(), is(1));
-            // Check the field is in the expected range and hasn't been used yet.
-            assertThat(expectedFields.contains(s7AnyParameterItem.getByteOffset()), is(true));
-            assertThat(s7AnyParameterItem.getBitOffset(), is((byte) 0));
-
-            VarPayloadItem payloadItem = varPayload.getItems().iterator().next();
-            assertThat(payloadItem.getData().length, is(4));
-            // We are expecting that the payload is the index number of the dword item in the original array.
-            int expectedValue = (s7AnyParameterItem.getByteOffset() / 4) + 1;
-            int actualValue = (payloadItem.getData()[0] << 32) + (payloadItem.getData()[1] << 16) + (payloadItem.getData()[2] << 8) + payloadItem.getData()[3];
-            assertThat(actualValue, is(expectedValue));
-
-            // Remove the used field from the list of available ones.
-            expectedFields.remove(s7AnyParameterItem.getByteOffset());
-        }
-
-        // In the end all fields should have been used.
-        assertThat(expectedFields, hasSize(0));
-    }
-
-    /**
-     * In this test, we are writing multiple independent items in one message. This has to be split up.
-     *
-     * @throws PlcException something went wrong.
-     */
-    @Test
-    public void writeMessageMultipleItems() throws PlcException {
-        S7RequestMessage request = createWriteMessage(
-            Arrays.asList(
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BOOL, (short) 1, (short) 1, (short) 0, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 1, (short) 1, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.DWORD, (short) 1, (short) 1, (short) 2, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.REAL, (short) 1, (short) 1, (short) 5, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.INT, (short) 1, (short) 1, (short) 9, (byte) 0)),
-            Arrays.asList(
-                new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BIT, new byte[] {0x01}),
-                new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {0x02}),
-                new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {0x00, 0x00, 0x00, 0x00}),
-                new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {0x00, 0x00, 0x00, 0x00}),
-                new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {0x00, 0x00, 0x00, 0x00})
-            )
-        );
-        Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250);
-
-        assertThat(processedRequests, notNullValue());
-        assertThat(processedRequests, hasSize(5));
-
-        for (S7RequestMessage processedRequest : processedRequests) {
-            // Check the parameter
-            Optional<VarParameter> parameter = processedRequest.getParameter(VarParameter.class);
-            assertThat(parameter.isPresent(), is(true));
-            VarParameter varParameter = parameter.get();
-            assertThat(varParameter.getItems(), hasSize(1));
-
-            // Check the payload
-            Optional<VarPayload> payload = processedRequest.getPayload(VarPayload.class);
-            assertThat(payload.isPresent(), is(true));
-            VarPayload varPayload = payload.get();
-            assertThat(varPayload.getItems(), hasSize(1));
-        }
-    }
-
-    /**
-     * In this test, we are writing multiple independent array items in one message. This has to be split up both.
-     * regarding the independent items, but also regarding the array items.
-     *
-     * @throws PlcException something went wrong.
-     */
-    @Test
-    public void writeMessageMultipleArrayItems() throws PlcException {
-        S7RequestMessage request = createWriteMessage(
-            Arrays.asList(
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 2, (short) 1, (short) 1, (byte) 0),
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.DWORD, (short) 2, (short) 1, (short) 2, (byte) 0)),
-            Arrays.asList(
-                new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {
-                    0x01, 0x02}),
-                new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {
-                    0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04})
-            )
-        );
-        Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250);
-
-        assertThat(processedRequests, notNullValue());
-        assertThat(processedRequests, hasSize(4));
-
-        for (S7RequestMessage processedRequest : processedRequests) {
-            // Check the parameter
-            Optional<VarParameter> parameter = processedRequest.getParameter(VarParameter.class);
-            assertThat(parameter.isPresent(), is(true));
-            VarParameter varParameter = parameter.get();
-            assertThat(varParameter.getItems(), hasSize(1));
-
-            // Check the payload
-            Optional<VarPayload> payload = processedRequest.getPayload(VarPayload.class);
-            assertThat(payload.isPresent(), is(true));
-            VarPayload varPayload = payload.get();
-            assertThat(varPayload.getItems(), hasSize(1));
-        }
-    }
-
-    /**
-     * This test handles the special case in which a response is part of a single request message.
-     * This means that it is immediatly finished and is hereby immediatly processed.
-     *
-     * @throws PlcException
-     */
-    @Test
-    public void processSimpleMessageResponse() throws PlcException {
-        S7RequestMessage requestMessage = new S7RequestMessage(MessageType.JOB, (short) 1, Collections.emptyList(), Collections.emptyList(), null);
-        S7ResponseMessage responseMessage = new S7ResponseMessage(MessageType.JOB, (short) 1, Collections.emptyList(), Collections.emptyList(), (byte) 0x00, (byte) 0x00);
-        S7ResponseMessage processedResponse = SUT.processResponse(requestMessage, responseMessage);
-        // In this case the response should be returned unchanged.
-        assertThat(processedResponse, is(responseMessage));
-    }
-
-    /**
-     * This test handles the special case in which a response is part of a single request message.
-     * This means that it is immediately finished and is hereby immediately processed.
-     *
-     * @throws PlcException
-     */
-    @Test
-    public void processCompositeMessageReadResponse() throws PlcException {
-        S7RequestMessage originalRequestMessage = new S7RequestMessage(MessageType.JOB, (short) 1,
-            Collections.singletonList(
-                new VarParameter(ParameterType.READ_VAR,
-                    Arrays.asList(
-                        new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                            TransportSize.BYTE, (short) 1, (short) 1, (short) 2, (byte) 0),
-                        new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                            TransportSize.BYTE, (short) 1, (short) 3, (short) 4, (byte) 0))
-                )
-            ),
-            Collections.emptyList(),
-            null);
-        DefaultS7MessageProcessor.S7CompositeRequestMessage compositeRequestMessage =
-            new DefaultS7MessageProcessor.S7CompositeRequestMessage(originalRequestMessage);
-
-        S7RequestMessage fragment1RequestMessage = new S7RequestMessage(MessageType.JOB, (short) 1,
-            Collections.singletonList(
-                new VarParameter(ParameterType.READ_VAR,
-                    Arrays.asList(
-                        new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                            TransportSize.BYTE, (short) 1, (short) 1, (short) 2, (byte) 0))
-                )
-            ),
-            Collections.emptyList(),
-            compositeRequestMessage);
-        compositeRequestMessage.addRequestMessage(fragment1RequestMessage);
-
-        S7RequestMessage fragment2RequestMessage = new S7RequestMessage(MessageType.JOB, (short) 3,
-            Collections.singletonList(
-                new VarParameter(ParameterType.READ_VAR,
-                    Arrays.asList(
-                        new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                            TransportSize.BYTE, (short) 1, (short) 3, (short) 4, (byte) 0))
-                )
-            ),
-            Collections.emptyList(),
-            compositeRequestMessage);
-        compositeRequestMessage.addRequestMessage(fragment2RequestMessage);
-
-        // Virtually add a response for the first response.
-        fragment1RequestMessage.setAcknowledged(true);
-        S7ResponseMessage fragment1ResponseMessage = new S7ResponseMessage(MessageType.JOB, (short) 2,
-            Collections.singletonList(
-                new VarParameter(ParameterType.READ_VAR, new LinkedList<>(Collections.singletonList(
-                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                        TransportSize.BYTE, (short) 1, (short) 1, (short) 2, (byte) 0))))),
-            Collections.singletonList(
-                new VarPayload(ParameterType.READ_VAR, new LinkedList<>(Collections.singletonList(
-                    new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[]{0x42}))))),
-            (byte) 0x00, (byte) 0x00);
-        S7ResponseMessage processedResponse = SUT.processResponse(fragment1RequestMessage, fragment1ResponseMessage);
-        // As only one of the two requests is responded, the result should be null.
-        assertThat(processedResponse, nullValue());
-
-        // Virtually add a response for the second response.
-        fragment2RequestMessage.setAcknowledged(true);
-        S7ResponseMessage fragment2ResponseMessage = new S7ResponseMessage(MessageType.JOB, (short) 3,
-            Collections.singletonList(
-                new VarParameter(ParameterType.READ_VAR, new LinkedList<>(Collections.singletonList(
-                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                        TransportSize.BYTE, (short) 1, (short) 3, (short) 4, (byte) 0))))),
-            Collections.singletonList(
-                new VarPayload(ParameterType.READ_VAR, new LinkedList<>(Collections.singletonList(
-                    new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[]{0x23}))))),
-            (byte) 0x00, (byte) 0x00);
-        // This time we expect all messages of the composite to be acknowledged and the processResponse should
-        // return a merged version of the individual responses content.
-        processedResponse = SUT.processResponse(fragment2RequestMessage, fragment2ResponseMessage);
-        // As this is the last request being responded, the result should be not null this time.
-        assertThat(processedResponse, notNullValue());
-
-        // Check the content.
-        assertThat(processedResponse.getParameters(), hasSize(1));
-        assertThat(processedResponse.getParameter(VarParameter.class).isPresent(), is(true));
-        VarParameter varParameter = processedResponse.getParameter(VarParameter.class).get();
-        assertThat(varParameter.getItems(), hasSize(2));
-
-        assertThat(processedResponse.getPayloads(), hasSize(1));
-        assertThat(processedResponse.getPayload(VarPayload.class).isPresent(), is(true));
-
-        VarPayload varPayload = processedResponse.getPayload(VarPayload.class).get();
-        assertThat(varPayload.getItems(), hasSize(2));
-    }
-
-    /**
-     * This test handles the special case in which a response is part of a single request message.
-     * This means that it is immediately finished and is hereby immediately processed.
-     *
-     * @throws PlcException
-     */
-    @Test
-    public void processCompositeMessageMergedReadResponse() throws PlcException {
-        // Produce a composite request, consisting of an original request reading 4*10=40 items.
-        // Where this is split up into 4 sub-messages with each 10 items.
-        DefaultS7MessageProcessor.S7CompositeRequestMessage compositeRequestMessage = createCompositeReadMessage(4, 10);
-
-        List<S7RequestMessage> requestMessages = compositeRequestMessage.getRequestMessages();
-        // Generate dummy responses for each sub request.
-        List<S7ResponseMessage> responseMessages = createResponseMessages(requestMessages);
-
-        // Iterate over all pairs of requests and responses and have the processor process that.
-        S7ResponseMessage processedResponse = null;
-        int size = requestMessages.size();
-        for (int i = 0; i < size; i++) {
-            S7RequestMessage requestMessage = requestMessages.get(i);
-            S7ResponseMessage responseMessage = responseMessages.get(i);
-            requestMessage.setAcknowledged(true);
-
-            processedResponse = SUT.processResponse(requestMessage, responseMessage);
-            // Only after processing the least response, should the processor return something not null.
-            if(i < size - 1) {
-                assertThat(processedResponse, nullValue());
-            }
-        }
-
-        // Check the content.
-        assertThat(processedResponse, notNullValue());
-        assertThat(processedResponse.getParameters(), hasSize(1));
-        assertThat(processedResponse.getParameter(VarParameter.class).isPresent(), is(true));
-        VarParameter varParameter = processedResponse.getParameter(VarParameter.class).get();
-        assertThat(varParameter.getItems(), hasSize(1));
-
-        assertThat(processedResponse.getPayloads(), hasSize(1));
-        assertThat(processedResponse.getPayload(VarPayload.class).isPresent(), is(true));
-
-        VarPayload varPayload = processedResponse.getPayload(VarPayload.class).get();
-        assertThat(varPayload.getItems(), hasSize(1));
-    }
-
-    /**
-     * This test handles the special case in which a response is part of a single request message.
-     * This means that it is immediately finished and is hereby immediately processed.
-     *
-     * @throws PlcException
-     */
-    @Test
-    public void processCompositeMessageWriteResponse() throws PlcException {
-        S7RequestMessage originalRequestMessage = new S7RequestMessage(MessageType.JOB, (short) 1,
-            Collections.singletonList(
-                new VarParameter(ParameterType.WRITE_VAR, new LinkedList<>(Arrays.asList(
-                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                        TransportSize.BYTE, (short) 1, (short) 1, (short) 2, (byte) 0),
-                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                        TransportSize.BYTE, (short) 1, (short) 1, (short) 3, (byte) 0))))),
-            Collections.emptyList(), null);
-        DefaultS7MessageProcessor.S7CompositeRequestMessage compositeRequestMessage =
-            new DefaultS7MessageProcessor.S7CompositeRequestMessage(originalRequestMessage);
-
-        S7RequestMessage fragment1RequestMessage = new S7RequestMessage(MessageType.JOB, (short) 2,
-            Collections.singletonList(
-                new VarParameter(ParameterType.WRITE_VAR, new LinkedList<>(Collections.singletonList(
-                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                        TransportSize.BYTE, (short) 1, (short) 1, (short) 2, (byte) 0))))),
-            Collections.emptyList(), compositeRequestMessage);
-        compositeRequestMessage.addRequestMessage(fragment1RequestMessage);
-        S7RequestMessage fragment2RequestMessage = new S7RequestMessage(MessageType.JOB, (short) 3,
-            Collections.singletonList(
-                new VarParameter(ParameterType.WRITE_VAR, new LinkedList<>(Collections.singletonList(
-                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                        TransportSize.BYTE, (short) 1, (short) 1, (short) 3, (byte) 0))))),
-            Collections.emptyList(), compositeRequestMessage);
-        compositeRequestMessage.addRequestMessage(fragment2RequestMessage);
-
-        // Virtually add a response for the first response.
-        fragment1RequestMessage.setAcknowledged(true);
-        S7ResponseMessage fragment1ResponseMessage = new S7ResponseMessage(MessageType.JOB, (short) 2,
-            Collections.singletonList(
-                new VarParameter(ParameterType.WRITE_VAR, new LinkedList<>(Collections.singletonList(
-                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                        TransportSize.BYTE, (short) 1, (short) 1, (short) 2, (byte) 0))))),
-            Collections.singletonList(
-                new VarPayload(ParameterType.WRITE_VAR, new LinkedList<>(Collections.singletonList(
-                    new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[]{0x42}))))),
-            (byte) 0x00, (byte) 0x00);
-        S7ResponseMessage processedResponse = SUT.processResponse(fragment1RequestMessage, fragment1ResponseMessage);
-        // As only one of the two requests is responded, the result should be null.
-        assertThat(processedResponse, nullValue());
-
-        // Virtually add a response for the second response.
-        fragment2RequestMessage.setAcknowledged(true);
-        S7ResponseMessage fragment2ResponseMessage = new S7ResponseMessage(MessageType.JOB, (short) 3,
-            Collections.singletonList(
-                new VarParameter(ParameterType.WRITE_VAR, new LinkedList<>(Collections.singletonList(
-                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                        TransportSize.BYTE, (short) 1, (short) 1, (short) 3, (byte) 0))))),
-            Collections.singletonList(
-                new VarPayload(ParameterType.WRITE_VAR, new LinkedList<>(Collections.singletonList(
-                    new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[]{0x23}))))),
-            (byte) 0x00, (byte) 0x00);
-
-        // This time we expect all messages of the composite to be acknowledged and the processResponse should
-        // return a merged version of the individual responses content.
-        processedResponse = SUT.processResponse(fragment2RequestMessage, fragment2ResponseMessage);
-
-        // As this is the last request being responded, the result should be not null this time.
-        assertThat(processedResponse, notNullValue());
-
-        // Check the content.
-        assertThat(processedResponse.getParameters(), hasSize(1));
-        assertThat(processedResponse.getParameter(VarParameter.class).isPresent(), is(true));
-        VarParameter varParameter = processedResponse.getParameter(VarParameter.class).get();
-        assertThat(varParameter.getItems(), hasSize(2));
-
-        assertThat(processedResponse.getPayloads(), hasSize(1));
-        assertThat(processedResponse.getPayload(VarPayload.class).isPresent(), is(true));
-        VarPayload varPayload = processedResponse.getPayload(VarPayload.class).get();
-        assertThat(varPayload.getItems(), hasSize(2));
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Helpers
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    private S7RequestMessage createReadMessage(List<VarParameterItem> parameterItems) {
-        return new S7RequestMessage(MessageType.JOB, (short) 42,
-            Collections.singletonList(
-                new VarParameter(ParameterType.READ_VAR, parameterItems)),
-            Collections.emptyList(), null);
-    }
-
-    private S7RequestMessage createWriteMessage(List<VarParameterItem> parameterItems,
-                                                List<VarPayloadItem> payloadItems) {
-        return new S7RequestMessage(MessageType.JOB, (short) 42,
-            Collections.singletonList(
-                new VarParameter(ParameterType.WRITE_VAR, parameterItems)),
-            Collections.singletonList(
-                new VarPayload(ParameterType.WRITE_VAR, payloadItems)),
-            null);
-    }
-
-    private DefaultS7MessageProcessor.S7CompositeRequestMessage createCompositeReadMessage(int numSubMessages, int numItemsPerSubMessage) {
-        int totalItems = numSubMessages * numItemsPerSubMessage;
-        S7RequestMessage originalRequestMessage = new S7RequestMessage(MessageType.JOB, (short) 1,
-            Collections.singletonList(
-                new VarParameter(ParameterType.READ_VAR,
-                    Collections.singletonList(
-                        new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                            TransportSize.BYTE, (short) totalItems, (short) 1, (short) 0, (byte) 0))
-                )
-            ),
-            Collections.emptyList(),
-            null);
-        DefaultS7MessageProcessor.S7CompositeRequestMessage compositeRequestMessage =
-            new DefaultS7MessageProcessor.S7CompositeRequestMessage(originalRequestMessage);
-
-        int curPos = 0;
-        for(int i = 0; i < numSubMessages; i++) {
-            S7RequestMessage subMessage = new S7RequestMessage(MessageType.JOB, (short) 1,
-                Collections.singletonList(
-                    new VarParameter(ParameterType.READ_VAR,
-                        Collections.singletonList(
-                            new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                                TransportSize.BYTE, (short) numItemsPerSubMessage, (short) 1, (short) curPos, (byte) 0))
-                    )
-                ),
-                Collections.emptyList(),
-                compositeRequestMessage);
-            curPos += numItemsPerSubMessage;
-            compositeRequestMessage.addRequestMessage(subMessage);
-        }
-
-        return compositeRequestMessage;
-    }
-
-    private DefaultS7MessageProcessor.S7CompositeRequestMessage createCompositeWriteMessage() {
-        return null;
-    }
-
-    private List<S7ResponseMessage> createResponseMessages(Collection<S7RequestMessage> requests) {
-        List<S7ResponseMessage> responses = new ArrayList<>(requests.size());
-        byte counter = 0;
-        for (S7RequestMessage request : requests) {
-            List<S7Payload> payloads = new ArrayList<>(request.getParameters().size());
-            for (S7Parameter parameter : request.getParameters()) {
-                VarParameter varParameter = (VarParameter) parameter;
-                List<VarPayloadItem> varPayloadItems = new ArrayList<>(varParameter.getItems().size());
-                for (VarParameterItem item : varParameter.getItems()) {
-                    S7AnyVarParameterItem anyVarParameterItem = (S7AnyVarParameterItem) item;
-                    byte[] data = new byte[
-                        anyVarParameterItem.getDataType().getSizeInBytes() * anyVarParameterItem.getNumElements()];
-                    for(int i = 0; i < data.length; i++) {
-                        data[i] = counter++;
-                    }
-                    VarPayloadItem payloadItem = new VarPayloadItem(DataTransportErrorCode.OK,
-                        anyVarParameterItem.getDataType().getDataTransportSize(), data);
-                    varPayloadItems.add(payloadItem);
-                }
-                S7Payload payload = new VarPayload(parameter.getType(), varPayloadItems);
-                payloads.add(payload);
-            }
-            S7ResponseMessage response = new S7ResponseMessage(request.getMessageType(), request.getTpduReference(),
-                request.getParameters(), payloads, (byte) 0xFF, (byte) 0xFF);
-            responses.add(response);
-        }
-        return responses;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.strategies;
+
+import org.apache.plc4x.java.api.exceptions.PlcException;
+import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
+import org.apache.plc4x.java.s7.netty.model.messages.S7ResponseMessage;
+import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
+import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
+import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
+import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
+import org.apache.plc4x.java.s7.netty.model.types.*;
+import org.hamcrest.core.IsCollectionContaining;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.*;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.lessThan;
+import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.hamcrest.core.IsNull.nullValue;
+import static org.junit.Assert.assertThat;
+
+public class DefaultS7MessageProcessorTest {
+
+    private S7MessageProcessor SUT;
+
+    @Before
+    public void setUp() {
+        SUT = new DefaultS7MessageProcessor();
+    }
+
+    /**
+     * In this test both the size of the request as well as the estimated response will be well within
+     * the bounds set by the PDU size parameter, so we are expecting the processor to not change anything.
+     *
+     * @throws PlcException something went wrong.
+     */
+    @Test
+    public void readMessageSimple() throws PlcException {
+        S7RequestMessage request = createReadMessage(
+            Collections.singletonList(
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 1, (short) 0, (byte) 0)));
+        Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250);
+
+        assertThat(processedRequests, notNullValue());
+        assertThat(processedRequests, hasSize(1));
+
+        Optional<VarParameter> parameter = processedRequests.iterator().next().getParameter(VarParameter.class);
+        assertThat(parameter.isPresent(), is(true));
+        VarParameter varParameter = parameter.get();
+        assertThat(varParameter.getItems(), hasSize(1));
+    }
+
+    /**
+     * In this test both the size of the request as well as the estimated response will be well within
+     * the bounds set by the PDU size parameter, so we are expecting the processor to not change anything.
+     *
+     * @throws PlcException something went wrong.
+     */
+    @Test
+    public void readMessageMultipleItems() throws PlcException {
+        S7RequestMessage request = createReadMessage(
+            Arrays.asList(
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 1, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 2, (short) 0, (byte) 0)));
+        Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250);
+
+        assertThat(processedRequests, notNullValue());
+        assertThat(processedRequests, hasSize(1));
+
+        Optional<VarParameter> parameter = processedRequests.iterator().next().getParameter(VarParameter.class);
+        assertThat(parameter.isPresent(), is(true));
+        VarParameter varParameter = parameter.get();
+        assertThat(varParameter.getItems(), hasSize(2));
+    }
+
+    /**
+     * The maximum number of request items to fit into a PDU with the size 250 is usually 19. So this request
+     * should just fit into one message and therefore we expect the processor to leave the message unchanged.
+     *
+     * @throws PlcException something went wrong.
+     */
+    @Test
+    public void readMessageMultipleItemsWithLargeRequestSize() throws PlcException {
+        S7RequestMessage request = createReadMessage(
+            Arrays.asList(
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 1, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 2, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 3, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 4, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 5, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 6, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 7, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 8, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 9, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 10, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 11, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 12, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 13, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 14, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 15, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 16, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 17, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 18, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 19, (short) 0, (byte) 0)));
+        Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250);
+
+        assertThat(processedRequests, notNullValue());
+        assertThat(processedRequests, hasSize(1));
+
+        Optional<VarParameter> parameter = processedRequests.iterator().next().getParameter(VarParameter.class);
+        assertThat(parameter.isPresent(), is(true));
+        VarParameter varParameter = parameter.get();
+        assertThat(varParameter.getItems(), hasSize(19));
+    }
+
+    /**
+     * In this request, the request size itself exceeds the bounds set by the PDU size parameter,
+     * therefore the processor is expected to split the one request with two items up into two requests
+     * with each one item.
+     *
+     * @throws PlcException something went wrong.
+     */
+    @Test
+    public void readMessageMultipleItemsWithTooLargeRequestSize() throws PlcException {
+        S7RequestMessage request = createReadMessage(
+            Arrays.asList(
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 1, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 2, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 3, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 4, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 5, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 6, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 7, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 8, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 9, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 10, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 11, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 12, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 13, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 14, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 15, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 16, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 17, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 18, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 19, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 20, (short) 0, (byte) 0)));
+        Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250);
+
+        assertThat(processedRequests, notNullValue());
+        assertThat(processedRequests, hasSize(2));
+
+        int totalItems = 0;
+        for (S7RequestMessage requestMessage : processedRequests) {
+            Optional<VarParameter> parameter = requestMessage.getParameter(VarParameter.class);
+            assertThat(parameter.isPresent(), is(true));
+            VarParameter varParameter = parameter.get();
+            int numItems = varParameter.getItems().size();
+            // From calculation and byte counting we know that with a pdu-size of 250 a read message can't have
+            // more than 19 items.
+            assertThat(numItems, lessThan(20));
+            totalItems += numItems;
+        }
+        // In total 20 items should have been found.
+        assertThat(totalItems, is(20));
+    }
+
+    /**
+     * In this request, the request size itself is way within the bounds set by the PDU size parameter,
+     * however the estimated size of the response would exceed this greatly, therefore the processor is
+     * expected to split the one request with two items up into two requests with each one item.
+     *
+     * @throws PlcException something went wrong.
+     */
+    @Test
+    public void readMessageCompositeWithLargeResponseSize() throws PlcException {
+        S7RequestMessage request = createReadMessage(
+            Arrays.asList(
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 200, (short) 1, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 200, (short) 2, (short) 0, (byte) 0)));
+        Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 256);
+
+        assertThat(processedRequests, notNullValue());
+        assertThat(processedRequests, hasSize(2));
+
+        for (S7RequestMessage requestMessage : processedRequests) {
+            Optional<VarParameter> parameter = requestMessage.getParameter(VarParameter.class);
+            assertThat(parameter.isPresent(), is(true));
+            VarParameter varParameter = parameter.get();
+            assertThat(varParameter.getItems(), hasSize(1));
+        }
+    }
+
+    /**
+     * In this request, the request size itself is way within the bounds set by the PDU size parameter,
+     * however the estimated size of the response would exceed this greatly. In contrast to the test above
+     * a single item is too large for being sent at all. So in this case the item should be split up into
+     * multiple element and joined together after all sub-messages are returned.
+     *
+     * @throws PlcException something went wrong.
+     */
+    @Test
+    public void readMessageWithTooLargeResponseSize() throws PlcException {
+        S7RequestMessage request = createReadMessage(
+            Collections.singletonList(
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.REAL, (short) 400, (short) 1, (short) 0, (byte) 0)));
+        Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 256);
+
+        assertThat(processedRequests, notNullValue());
+        assertThat(processedRequests, hasSize(7));
+
+        int totalNumItems = 0;
+        for (S7RequestMessage requestMessage : processedRequests) {
+            Optional<VarParameter> parameter = requestMessage.getParameter(VarParameter.class);
+            assertThat(parameter.isPresent(), is(true));
+            VarParameter varParameter = parameter.get();
+            assertThat(varParameter.getItems(), hasSize(1));
+            totalNumItems += ((S7AnyVarParameterItem) varParameter.getItems().iterator().next()).getNumElements();
+        }
+        assertThat(totalNumItems, equalTo(400));
+    }
+
+    /**
+     * In this request, we only send one single element to one single field. Nothing should be changed.
+     *
+     * @throws PlcException something went wrong.
+     */
+    @Test
+    public void writeMessageSimple() throws PlcException {
+        S7RequestMessage request = createWriteMessage(
+            Collections.singletonList(
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 1, (short) 0, (byte) 0)),
+            Collections.singletonList(
+                new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {0x00}))
+            );
+        Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250);
+
+        assertThat(processedRequests, notNullValue());
+        assertThat(processedRequests, hasSize(1));
+
+        S7RequestMessage processedRequest = processedRequests.iterator().next();
+
+        // Check the parameter
+        Optional<VarParameter> parameter = processedRequest.getParameter(VarParameter.class);
+        assertThat(parameter.isPresent(), is(true));
+        VarParameter varParameter = parameter.get();
+        assertThat(varParameter.getItems(), hasSize(1));
+
+        // Check the payload
+        Optional<VarPayload> payload = processedRequest.getPayload(VarPayload.class);
+        assertThat(payload.isPresent(), is(true));
+        VarPayload varPayload = payload.get();
+        assertThat(varPayload.getItems(), hasSize(1));
+    }
+
+    /**
+     * In this request, we send an array of bit elements to a single field, the request should be broken
+     * up into multiple single element write messages as the S7 doesn't seem to like writing of arrays.
+     *
+     * @throws PlcException something went wrong.
+     */
+    @Test
+    public void writeMessageSimpleBitArray() throws PlcException {
+        S7RequestMessage request = createWriteMessage(
+            Collections.singletonList(
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BOOL, (short) 10, (short) 1, (short) 0, (byte) 0)),
+            Collections.singletonList(
+                new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BIT, new byte[] {
+                    (byte) 0xAA, (byte) 0x02}))
+        );
+        Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250);
+
+        // Initialize a set of expected fields.
+        Set<String> expectedFields = new HashSet<>(10);
+        for(int i = 0; i < 10; i++) {
+            expectedFields.add(i / 8 + "/" + i % 8);
+        }
+
+        // We are expecting to receive 10 messages as we had an array of 10 items.
+        assertThat(processedRequests, hasSize(10));
+        // Process all the messages and check each one
+        for (S7RequestMessage processedRequest : processedRequests) {
+            Optional<VarParameter> parameterOptional = processedRequest.getParameter(VarParameter.class);
+            assertThat(parameterOptional.isPresent(), is(true));
+            VarParameter varParameter = parameterOptional.get();
+
+            Optional<VarPayload> payloadOptional = processedRequest.getPayload(VarPayload.class);
+            assertThat(payloadOptional.isPresent(), is(true));
+            VarPayload varPayload = payloadOptional.get();
+
+            assertThat(varParameter.getItems(), hasSize(1));
+            assertThat(varPayload.getItems(), hasSize(1));
+
+            VarParameterItem parameterItem = varParameter.getItems().iterator().next();
+            assertThat(parameterItem.getAddressingMode(), is(VariableAddressingMode.S7ANY));
+            S7AnyVarParameterItem s7AnyParameterItem = (S7AnyVarParameterItem) parameterItem;
+            assertThat(s7AnyParameterItem.getMemoryArea(), is(MemoryArea.DATA_BLOCKS));
+            assertThat(s7AnyParameterItem.getDataType(), is(TransportSize.BOOL));
+            assertThat(s7AnyParameterItem.getNumElements(), is(1));
+            String fieldString = s7AnyParameterItem.getByteOffset() + "/" + s7AnyParameterItem.getBitOffset();
+            assertThat(expectedFields, IsCollectionContaining.hasItem(fieldString));
+
+            VarPayloadItem payloadItem = varPayload.getItems().iterator().next();
+            // We are expecting that the payload is simply "the field of the byte + 1".
+            assertThat(payloadItem.getData().length, is(1));
+            int value = (s7AnyParameterItem.getByteOffset() * 8) + s7AnyParameterItem.getBitOffset();
+            byte expectedValue = (value % 2 == 0) ? (byte) 0x00 : (byte) 0x01;
+            assertThat(payloadItem.getData()[0], is(expectedValue));
+
+            // Remove the used field from the list of available ones.
+            expectedFields.remove(fieldString);
+        }
+
+        // In the end all fields should have been used.
+        assertThat(expectedFields, hasSize(0));
+    }
+
+    /**
+     * In this request, we send an array of elements to a single field, the request should be broken
+     * up into multiple single element write messages as the S7 doesn't seem to like writing of arrays.
+     *
+     * @throws PlcException something went wrong.
+     */
+    @Test
+    public void writeMessageSimpleByteArray() throws PlcException {
+        S7RequestMessage request = createWriteMessage(
+            Collections.singletonList(
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, 10, 1, (short) 0, (byte) 0)),
+            Collections.singletonList(
+                new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {
+                    0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A}))
+        );
+        Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250);
+
+        // Initialize a set of expected fields.
+        Set<Integer> expectedFields = new HashSet<>(10);
+        for(int i = 0; i < 10; i++) {
+            expectedFields.add(i);
+        }
+
+        // We are expecting to receive 10 messages as we had an array of 10 items.
+        assertThat(processedRequests, hasSize(10));
+        // Process all the messages and check each one
+        for (S7RequestMessage processedRequest : processedRequests) {
+            Optional<VarParameter> parameterOptional = processedRequest.getParameter(VarParameter.class);
+            assertThat(parameterOptional.isPresent(), is(true));
+            VarParameter varParameter = parameterOptional.get();
+
+            Optional<VarPayload> payloadOptional = processedRequest.getPayload(VarPayload.class);
+            assertThat(payloadOptional.isPresent(), is(true));
+            VarPayload varPayload = payloadOptional.get();
+
+            assertThat(varParameter.getItems(), hasSize(1));
+            assertThat(varPayload.getItems(), hasSize(1));
+
+            VarParameterItem parameterItem = varParameter.getItems().iterator().next();
+            assertThat(parameterItem.getAddressingMode(), is(VariableAddressingMode.S7ANY));
+            S7AnyVarParameterItem s7AnyParameterItem = (S7AnyVarParameterItem) parameterItem;
+            assertThat(s7AnyParameterItem.getMemoryArea(), is(MemoryArea.DATA_BLOCKS));
+            assertThat(s7AnyParameterItem.getDataType(), is(TransportSize.BYTE));
+            assertThat(s7AnyParameterItem.getNumElements(), is(1));
+            // Check the field is in the expected range and hasn't been used yet.
+            assertThat(expectedFields.contains(s7AnyParameterItem.getByteOffset()), is(true));
+            assertThat(s7AnyParameterItem.getBitOffset(), is((byte) 0));
+
+            VarPayloadItem payloadItem = varPayload.getItems().iterator().next();
+            // We are expecting that the payload is simply "the field of the byte + 1".
+            assertThat(payloadItem.getData().length, is(1));
+            byte expectedValue = (byte) ((byte) s7AnyParameterItem.getByteOffset() + (byte) 1);
+            assertThat(payloadItem.getData()[0], is(expectedValue));
+
+            // Remove the used field from the list of available ones.
+            expectedFields.remove(s7AnyParameterItem.getByteOffset());
+        }
+
+        // In the end all fields should have been used.
+        assertThat(expectedFields, hasSize(0));
+    }
+
+    /**
+     * In this request, we send an array of elements to a single field, the request should be broken
+     * up into multiple single element write messages as the S7 doesn't seem to like writing of arrays.
+     *
+     * @throws PlcException something went wrong.
+     */
+    @Test
+    public void writeMessageSimpleDwordArray() throws PlcException {
+        S7RequestMessage request = createWriteMessage(
+            Collections.singletonList(
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.DWORD, (short) 10, (short) 1, (short) 0, (byte) 0)),
+            Collections.singletonList(
+                new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {
+                    0x00, 0x00, 0x00, 0x01,
+                    0x00, 0x00, 0x00, 0x02,
+                    0x00, 0x00, 0x00, 0x03,
+                    0x00, 0x00, 0x00, 0x04,
+                    0x00, 0x00, 0x00, 0x05,
+                    0x00, 0x00, 0x00, 0x06,
+                    0x00, 0x00, 0x00, 0x07,
+                    0x00, 0x00, 0x00, 0x08,
+                    0x00, 0x00, 0x00, 0x09,
+                    0x00, 0x00, 0x00, 0x0A})));
+        Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250);
+
+        // Initialize a set of expected fields.
+        Set<Integer> expectedFields = new HashSet<>(10);
+        for(int i = 0; i < 10; i++) {
+            expectedFields.add((i * 4));
+        }
+
+        // We are expecting to receive 10 messages as we had an array of 10 items.
+        assertThat(processedRequests, hasSize(10));
+        // Process all the messages and check each one
+        for (S7RequestMessage processedRequest : processedRequests) {
+            Optional<VarParameter> parameterOptional = processedRequest.getParameter(VarParameter.class);
+            assertThat(parameterOptional.isPresent(), is(true));
+            VarParameter varParameter = parameterOptional.get();
+
+            Optional<VarPayload> payloadOptional = processedRequest.getPayload(VarPayload.class);
+            assertThat(payloadOptional.isPresent(), is(true));
+            VarPayload varPayload = payloadOptional.get();
+
+            assertThat(varParameter.getItems(), hasSize(1));
+            assertThat(varPayload.getItems(), hasSize(1));
+
+            VarParameterItem parameterItem = varParameter.getItems().iterator().next();
+            assertThat(parameterItem.getAddressingMode(), is(VariableAddressingMode.S7ANY));
+            S7AnyVarParameterItem s7AnyParameterItem = (S7AnyVarParameterItem) parameterItem;
+            assertThat(s7AnyParameterItem.getMemoryArea(), is(MemoryArea.DATA_BLOCKS));
+            assertThat(s7AnyParameterItem.getDataType(), is(TransportSize.DWORD));
+            assertThat(s7AnyParameterItem.getNumElements(), is(1));
+            // Check the field is in the expected range and hasn't been used yet.
+            assertThat(expectedFields.contains(s7AnyParameterItem.getByteOffset()), is(true));
+            assertThat(s7AnyParameterItem.getBitOffset(), is((byte) 0));
+
+            VarPayloadItem payloadItem = varPayload.getItems().iterator().next();
+            assertThat(payloadItem.getData().length, is(4));
+            // We are expecting that the payload is the index number of the dword item in the original array.
+            int expectedValue = (s7AnyParameterItem.getByteOffset() / 4) + 1;
+            int actualValue = (payloadItem.getData()[0] << 32) + (payloadItem.getData()[1] << 16) + (payloadItem.getData()[2] << 8) + payloadItem.getData()[3];
+            assertThat(actualValue, is(expectedValue));
+
+            // Remove the used field from the list of available ones.
+            expectedFields.remove(s7AnyParameterItem.getByteOffset());
+        }
+
+        // In the end all fields should have been used.
+        assertThat(expectedFields, hasSize(0));
+    }
+
+    /**
+     * In this test, we are writing multiple independent items in one message. This has to be split up.
+     *
+     * @throws PlcException something went wrong.
+     */
+    @Test
+    public void writeMessageMultipleItems() throws PlcException {
+        S7RequestMessage request = createWriteMessage(
+            Arrays.asList(
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BOOL, (short) 1, (short) 1, (short) 0, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 1, (short) 1, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.DWORD, (short) 1, (short) 1, (short) 2, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.REAL, (short) 1, (short) 1, (short) 5, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.INT, (short) 1, (short) 1, (short) 9, (byte) 0)),
+            Arrays.asList(
+                new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BIT, new byte[] {0x01}),
+                new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {0x02}),
+                new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {0x00, 0x00, 0x00, 0x00}),
+                new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {0x00, 0x00, 0x00, 0x00}),
+                new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {0x00, 0x00, 0x00, 0x00})
+            )
+        );
+        Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250);
+
+        assertThat(processedRequests, notNullValue());
+        assertThat(processedRequests, hasSize(5));
+
+        for (S7RequestMessage processedRequest : processedRequests) {
+            // Check the parameter
+            Optional<VarParameter> parameter = processedRequest.getParameter(VarParameter.class);
+            assertThat(parameter.isPresent(), is(true));
+            VarParameter varParameter = parameter.get();
+            assertThat(varParameter.getItems(), hasSize(1));
+
+            // Check the payload
+            Optional<VarPayload> payload = processedRequest.getPayload(VarPayload.class);
+            assertThat(payload.isPresent(), is(true));
+            VarPayload varPayload = payload.get();
+            assertThat(varPayload.getItems(), hasSize(1));
+        }
+    }
+
+    /**
+     * In this test, we are writing multiple independent array items in one message. This has to be split up both.
+     * regarding the independent items, but also regarding the array items.
+     *
+     * @throws PlcException something went wrong.
+     */
+    @Test
+    public void writeMessageMultipleArrayItems() throws PlcException {
+        S7RequestMessage request = createWriteMessage(
+            Arrays.asList(
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 2, (short) 1, (short) 1, (byte) 0),
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.DWORD, (short) 2, (short) 1, (short) 2, (byte) 0)),
+            Arrays.asList(
+                new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {
+                    0x01, 0x02}),
+                new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {
+                    0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04})
+            )
+        );
+        Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250);
+
+        assertThat(processedRequests, notNullValue());
+        assertThat(processedRequests, hasSize(4));
+
+        for (S7RequestMessage processedRequest : processedRequests) {
+            // Check the parameter
+            Optional<VarParameter> parameter = processedRequest.getParameter(VarParameter.class);
+            assertThat(parameter.isPresent(), is(true));
+            VarParameter varParameter = parameter.get();
+            assertThat(varParameter.getItems(), hasSize(1));
+
+            // Check the payload
+            Optional<VarPayload> payload = processedRequest.getPayload(VarPayload.class);
+            assertThat(payload.isPresent(), is(true));
+            VarPayload varPayload = payload.get();
+            assertThat(varPayload.getItems(), hasSize(1));
+        }
+    }
+
+    /**
+     * This test handles the special case in which a response is part of a single request message.
+     * This means that it is immediatly finished and is hereby immediatly processed.
+     *
+     * @throws PlcException
+     */
+    @Test
+    public void processSimpleMessageResponse() throws PlcException {
+        S7RequestMessage requestMessage = new S7RequestMessage(MessageType.JOB, (short) 1, Collections.emptyList(), Collections.emptyList(), null);
+        S7ResponseMessage responseMessage = new S7ResponseMessage(MessageType.JOB, (short) 1, Collections.emptyList(), Collections.emptyList(), (byte) 0x00, (byte) 0x00);
+        S7ResponseMessage processedResponse = SUT.processResponse(requestMessage, responseMessage);
+        // In this case the response should be returned unchanged.
+        assertThat(processedResponse, is(responseMessage));
+    }
+
+    /**
+     * This test handles the special case in which a response is part of a single request message.
+     * This means that it is immediately finished and is hereby immediately processed.
+     *
+     * @throws PlcException
+     */
+    @Test
+    public void processCompositeMessageReadResponse() throws PlcException {
+        S7RequestMessage originalRequestMessage = new S7RequestMessage(MessageType.JOB, (short) 1,
+            Collections.singletonList(
+                new VarParameter(ParameterType.READ_VAR,
+                    Arrays.asList(
+                        new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                            TransportSize.BYTE, (short) 1, (short) 1, (short) 2, (byte) 0),
+                        new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                            TransportSize.BYTE, (short) 1, (short) 3, (short) 4, (byte) 0))
+                )
+            ),
+            Collections.emptyList(),
+            null);
+        DefaultS7MessageProcessor.S7CompositeRequestMessage compositeRequestMessage =
+            new DefaultS7MessageProcessor.S7CompositeRequestMessage(originalRequestMessage);
+
+        S7RequestMessage fragment1RequestMessage = new S7RequestMessage(MessageType.JOB, (short) 1,
+            Collections.singletonList(
+                new VarParameter(ParameterType.READ_VAR,
+                    Arrays.asList(
+                        new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                            TransportSize.BYTE, (short) 1, (short) 1, (short) 2, (byte) 0))
+                )
+            ),
+            Collections.emptyList(),
+            compositeRequestMessage);
+        compositeRequestMessage.addRequestMessage(fragment1RequestMessage);
+
+        S7RequestMessage fragment2RequestMessage = new S7RequestMessage(MessageType.JOB, (short) 3,
+            Collections.singletonList(
+                new VarParameter(ParameterType.READ_VAR,
+                    Arrays.asList(
+                        new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                            TransportSize.BYTE, (short) 1, (short) 3, (short) 4, (byte) 0))
+                )
+            ),
+            Collections.emptyList(),
+            compositeRequestMessage);
+        compositeRequestMessage.addRequestMessage(fragment2RequestMessage);
+
+        // Virtually add a response for the first response.
+        fragment1RequestMessage.setAcknowledged(true);
+        S7ResponseMessage fragment1ResponseMessage = new S7ResponseMessage(MessageType.JOB, (short) 2,
+            Collections.singletonList(
+                new VarParameter(ParameterType.READ_VAR, new LinkedList<>(Collections.singletonList(
+                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                        TransportSize.BYTE, (short) 1, (short) 1, (short) 2, (byte) 0))))),
+            Collections.singletonList(
+                new VarPayload(ParameterType.READ_VAR, new LinkedList<>(Collections.singletonList(
+                    new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[]{0x42}))))),
+            (byte) 0x00, (byte) 0x00);
+        S7ResponseMessage processedResponse = SUT.processResponse(fragment1RequestMessage, fragment1ResponseMessage);
+        // As only one of the two requests is responded, the result should be null.
+        assertThat(processedResponse, nullValue());
+
+        // Virtually add a response for the second response.
+        fragment2RequestMessage.setAcknowledged(true);
+        S7ResponseMessage fragment2ResponseMessage = new S7ResponseMessage(MessageType.JOB, (short) 3,
+            Collections.singletonList(
+                new VarParameter(ParameterType.READ_VAR, new LinkedList<>(Collections.singletonList(
+                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                        TransportSize.BYTE, (short) 1, (short) 3, (short) 4, (byte) 0))))),
+            Collections.singletonList(
+                new VarPayload(ParameterType.READ_VAR, new LinkedList<>(Collections.singletonList(
+                    new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[]{0x23}))))),
+            (byte) 0x00, (byte) 0x00);
+        // This time we expect all messages of the composite to be acknowledged and the processResponse should
+        // return a merged version of the individual responses content.
+        processedResponse = SUT.processResponse(fragment2RequestMessage, fragment2ResponseMessage);
+        // As this is the last request being responded, the result should be not null this time.
+        assertThat(processedResponse, notNullValue());
+
+        // Check the content.
+        assertThat(processedResponse.getParameters(), hasSize(1));
+        assertThat(processedResponse.getParameter(VarParameter.class).isPresent(), is(true));
+        VarParameter varParameter = processedResponse.getParameter(VarParameter.class).get();
+        assertThat(varParameter.getItems(), hasSize(2));
+
+        assertThat(processedResponse.getPayloads(), hasSize(1));
+        assertThat(processedResponse.getPayload(VarPayload.class).isPresent(), is(true));
+
+        VarPayload varPayload = processedResponse.getPayload(VarPayload.class).get();
+        assertThat(varPayload.getItems(), hasSize(2));
+    }
+
+    /**
+     * This test handles the special case in which a response is part of a single request message.
+     * This means that it is immediately finished and is hereby immediately processed.
+     *
+     * @throws PlcException
+     */
+    @Test
+    public void processCompositeMessageMergedReadResponse() throws PlcException {
+        // Produce a composite request, consisting of an original request reading 4*10=40 items.
+        // Where this is split up into 4 sub-messages with each 10 items.
+        DefaultS7MessageProcessor.S7CompositeRequestMessage compositeRequestMessage = createCompositeReadMessage(4, 10);
+
+        List<S7RequestMessage> requestMessages = compositeRequestMessage.getRequestMessages();
+        // Generate dummy responses for each sub request.
+        List<S7ResponseMessage> responseMessages = createResponseMessages(requestMessages);
+
+        // Iterate over all pairs of requests and responses and have the processor process that.
+        S7ResponseMessage processedResponse = null;
+        int size = requestMessages.size();
+        for (int i = 0; i < size; i++) {
+            S7RequestMessage requestMessage = requestMessages.get(i);
+            S7ResponseMessage responseMessage = responseMessages.get(i);
+            requestMessage.setAcknowledged(true);
+
+            processedResponse = SUT.processResponse(requestMessage, responseMessage);
+            // Only after processing the least response, should the processor return something not null.
+            if(i < size - 1) {
+                assertThat(processedResponse, nullValue());
+            }
+        }
+
+        // Check the content.
+        assertThat(processedResponse, notNullValue());
+        assertThat(processedResponse.getParameters(), hasSize(1));
+        assertThat(processedResponse.getParameter(VarParameter.class).isPresent(), is(true));
+        VarParameter varParameter = processedResponse.getParameter(VarParameter.class).get();
+        assertThat(varParameter.getItems(), hasSize(1));
+
+        assertThat(processedResponse.getPayloads(), hasSize(1));
+        assertThat(processedResponse.getPayload(VarPayload.class).isPresent(), is(true));
+
+        VarPayload varPayload = processedResponse.getPayload(VarPayload.class).get();
+        assertThat(varPayload.getItems(), hasSize(1));
+    }
+
+    /**
+     * This test handles the special case in which a response is part of a single request message.
+     * This means that it is immediately finished and is hereby immediately processed.
+     *
+     * @throws PlcException
+     */
+    @Test
+    public void processCompositeMessageWriteResponse() throws PlcException {
+        S7RequestMessage originalRequestMessage = new S7RequestMessage(MessageType.JOB, (short) 1,
+            Collections.singletonList(
+                new VarParameter(ParameterType.WRITE_VAR, new LinkedList<>(Arrays.asList(
+                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                        TransportSize.BYTE, (short) 1, (short) 1, (short) 2, (byte) 0),
+                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                        TransportSize.BYTE, (short) 1, (short) 1, (short) 3, (byte) 0))))),
+            Collections.emptyList(), null);
+        DefaultS7MessageProcessor.S7CompositeRequestMessage compositeRequestMessage =
+            new DefaultS7MessageProcessor.S7CompositeRequestMessage(originalRequestMessage);
+
+        S7RequestMessage fragment1RequestMessage = new S7RequestMessage(MessageType.JOB, (short) 2,
+            Collections.singletonList(
+                new VarParameter(ParameterType.WRITE_VAR, new LinkedList<>(Collections.singletonList(
+                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                        TransportSize.BYTE, (short) 1, (short) 1, (short) 2, (byte) 0))))),
+            Collections.emptyList(), compositeRequestMessage);
+        compositeRequestMessage.addRequestMessage(fragment1RequestMessage);
+        S7RequestMessage fragment2RequestMessage = new S7RequestMessage(MessageType.JOB, (short) 3,
+            Collections.singletonList(
+                new VarParameter(ParameterType.WRITE_VAR, new LinkedList<>(Collections.singletonList(
+                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                        TransportSize.BYTE, (short) 1, (short) 1, (short) 3, (byte) 0))))),
+            Collections.emptyList(), compositeRequestMessage);
+        compositeRequestMessage.addRequestMessage(fragment2RequestMessage);
+
+        // Virtually add a response for the first response.
+        fragment1RequestMessage.setAcknowledged(true);
+        S7ResponseMessage fragment1ResponseMessage = new S7ResponseMessage(MessageType.JOB, (short) 2,
+            Collections.singletonList(
+                new VarParameter(ParameterType.WRITE_VAR, new LinkedList<>(Collections.singletonList(
+                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                        TransportSize.BYTE, (short) 1, (short) 1, (short) 2, (byte) 0))))),
+            Collections.singletonList(
+                new VarPayload(ParameterType.WRITE_VAR, new LinkedList<>(Collections.singletonList(
+                    new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[]{0x42}))))),
+            (byte) 0x00, (byte) 0x00);
+        S7ResponseMessage processedResponse = SUT.processResponse(fragment1RequestMessage, fragment1ResponseMessage);
+        // As only one of the two requests is responded, the result should be null.
+        assertThat(processedResponse, nullValue());
+
+        // Virtually add a response for the second response.
+        fragment2RequestMessage.setAcknowledged(true);
+        S7ResponseMessage fragment2ResponseMessage = new S7ResponseMessage(MessageType.JOB, (short) 3,
+            Collections.singletonList(
+                new VarParameter(ParameterType.WRITE_VAR, new LinkedList<>(Collections.singletonList(
+                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                        TransportSize.BYTE, (short) 1, (short) 1, (short) 3, (byte) 0))))),
+            Collections.singletonList(
+                new VarPayload(ParameterType.WRITE_VAR, new LinkedList<>(Collections.singletonList(
+                    new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[]{0x23}))))),
+            (byte) 0x00, (byte) 0x00);
+
+        // This time we expect all messages of the composite to be acknowledged and the processResponse should
+        // return a merged version of the individual responses content.
+        processedResponse = SUT.processResponse(fragment2RequestMessage, fragment2ResponseMessage);
+
+        // As this is the last request being responded, the result should be not null this time.
+        assertThat(processedResponse, notNullValue());
+
+        // Check the content.
+        assertThat(processedResponse.getParameters(), hasSize(1));
+        assertThat(processedResponse.getParameter(VarParameter.class).isPresent(), is(true));
+        VarParameter varParameter = processedResponse.getParameter(VarParameter.class).get();
+        assertThat(varParameter.getItems(), hasSize(2));
+
+        assertThat(processedResponse.getPayloads(), hasSize(1));
+        assertThat(processedResponse.getPayload(VarPayload.class).isPresent(), is(true));
+        VarPayload varPayload = processedResponse.getPayload(VarPayload.class).get();
+        assertThat(varPayload.getItems(), hasSize(2));
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Helpers
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    private S7RequestMessage createReadMessage(List<VarParameterItem> parameterItems) {
+        return new S7RequestMessage(MessageType.JOB, (short) 42,
+            Collections.singletonList(
+                new VarParameter(ParameterType.READ_VAR, parameterItems)),
+            Collections.emptyList(), null);
+    }
+
+    private S7RequestMessage createWriteMessage(List<VarParameterItem> parameterItems,
+                                                List<VarPayloadItem> payloadItems) {
+        return new S7RequestMessage(MessageType.JOB, (short) 42,
+            Collections.singletonList(
+                new VarParameter(ParameterType.WRITE_VAR, parameterItems)),
+            Collections.singletonList(
+                new VarPayload(ParameterType.WRITE_VAR, payloadItems)),
+            null);
+    }
+
+    private DefaultS7MessageProcessor.S7CompositeRequestMessage createCompositeReadMessage(int numSubMessages, int numItemsPerSubMessage) {
+        int totalItems = numSubMessages * numItemsPerSubMessage;
+        S7RequestMessage originalRequestMessage = new S7RequestMessage(MessageType.JOB, (short) 1,
+            Collections.singletonList(
+                new VarParameter(ParameterType.READ_VAR,
+                    Collections.singletonList(
+                        new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                            TransportSize.BYTE, (short) totalItems, (short) 1, (short) 0, (byte) 0))
+                )
+            ),
+            Collections.emptyList(),
+            null);
+        DefaultS7MessageProcessor.S7CompositeRequestMessage compositeRequestMessage =
+            new DefaultS7MessageProcessor.S7CompositeRequestMessage(originalRequestMessage);
+
+        int curPos = 0;
+        for(int i = 0; i < numSubMessages; i++) {
+            S7RequestMessage subMessage = new S7RequestMessage(MessageType.JOB, (short) 1,
+                Collections.singletonList(
+                    new VarParameter(ParameterType.READ_VAR,
+                        Collections.singletonList(
+                            new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                                TransportSize.BYTE, (short) numItemsPerSubMessage, (short) 1, (short) curPos, (byte) 0))
+                    )
+                ),
+                Collections.emptyList(),
+                compositeRequestMessage);
+            curPos += numItemsPerSubMessage;
+            compositeRequestMessage.addRequestMessage(subMessage);
+        }
+
+        return compositeRequestMessage;
+    }
+
+    private DefaultS7MessageProcessor.S7CompositeRequestMessage createCompositeWriteMessage() {
+        return null;
+    }
+
+    private List<S7ResponseMessage> createResponseMessages(Collection<S7RequestMessage> requests) {
+        List<S7ResponseMessage> responses = new ArrayList<>(requests.size());
+        byte counter = 0;
+        for (S7RequestMessage request : requests) {
+            List<S7Payload> payloads = new ArrayList<>(request.getParameters().size());
+            for (S7Parameter parameter : request.getParameters()) {
+                VarParameter varParameter = (VarParameter) parameter;
+                List<VarPayloadItem> varPayloadItems = new ArrayList<>(varParameter.getItems().size());
+                for (VarParameterItem item : varParameter.getItems()) {
+                    S7AnyVarParameterItem anyVarParameterItem = (S7AnyVarParameterItem) item;
+                    byte[] data = new byte[
+                        anyVarParameterItem.getDataType().getSizeInBytes() * anyVarParameterItem.getNumElements()];
+                    for(int i = 0; i < data.length; i++) {
+                        data[i] = counter++;
+                    }
+                    VarPayloadItem payloadItem = new VarPayloadItem(DataTransportErrorCode.OK,
+                        anyVarParameterItem.getDataType().getDataTransportSize(), data);
+                    varPayloadItems.add(payloadItem);
+                }
+                S7Payload payload = new VarPayload(parameter.getType(), varPayloadItems);
+                payloads.add(payload);
+            }
+            S7ResponseMessage response = new S7ResponseMessage(request.getMessageType(), request.getTpduReference(),
+                request.getParameters(), payloads, (byte) 0xFF, (byte) 0xFF);
+            responses.add(response);
+        }
+        return responses;
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandlerTest.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandlerTest.java
index 589ebf2b7dd..db939cbbdb4 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandlerTest.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandlerTest.java
@@ -1,367 +1,367 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.util;
-
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.messages.items.*;
-import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.junit.jupiter.params.provider.ValueSource;
-
-import java.lang.reflect.Array;
-import java.lang.reflect.InvocationTargetException;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.*;
-import java.util.function.BiFunction;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.fail;
-
-class S7PlcFieldHandlerTest {
-
-    private static S7PlcFieldHandler SUT = new S7PlcFieldHandler();
-
-    @ParameterizedTest
-    @ValueSource(strings = {
-        "%DB1.DBX1.0:BOOL",
-        "%DB1.DBW1.0:WORD"
-    })
-    void createField(String fieldQuery) {
-        SUT.createField(fieldQuery);
-    }
-
-    @ParameterizedTest
-    @MethodSource("createInputArrays")
-    void encodeOneBitTypes(String name, PlcField field, Object[] values) {
-        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
-            "BOOL-BOOLEAN-MIN", "BOOL-BOOLEAN-MAX",
-            "BOOL-BYTE-MIN", "BOOL-BYTE-NIL", "BOOL-BYTE-VAL", "BOOL-BYTE-MAX",
-            "BOOL-SHORT-MIN", "BOOL-SHORT-NIL", "BOOL-SHORT-VAL", "BOOL-SHORT-MAX",
-            "BOOL-INTEGER-MIN", "BOOL-INTEGER-NIL", "BOOL-INTEGER-VAL", "BOOL-INTEGER-MAX",
-            "BOOL-LONG-MIN", "BOOL-LONG-NIL", "BOOL-LONG-VAL", "BOOL-LONG-MAX",
-
-            "BYTE-BOOLEAN-MIN", "BYTE-BOOLEAN-MAX",
-            "BYTE-BYTE-MIN", "BYTE-BYTE-NIL", "BYTE-BYTE-VAL", "BYTE-BYTE-MAX",
-            "BYTE-SHORT-MIN", "BYTE-SHORT-NIL", "BYTE-SHORT-VAL", "BYTE-SHORT-MAX",
-            "BYTE-INTEGER-MIN", "BYTE-INTEGER-NIL", "BYTE-INTEGER-VAL", "BYTE-INTEGER-MAX",
-            "BYTE-LONG-MIN", "BYTE-LONG-NIL", "BYTE-LONG-VAL", "BYTE-LONG-MAX",
-
-            "WORD-BOOLEAN-MIN", "WORD-BOOLEAN-MAX",
-            "WORD-BYTE-MIN", "WORD-BYTE-NIL", "WORD-BYTE-VAL", "WORD-BYTE-MAX",
-            "WORD-SHORT-MIN", "WORD-SHORT-NIL", "WORD-SHORT-VAL", "WORD-SHORT-MAX",
-            "WORD-INTEGER-MIN", "WORD-INTEGER-NIL", "WORD-INTEGER-VAL", "WORD-INTEGER-MAX",
-            "WORD-LONG-MIN", "WORD-LONG-NIL", "WORD-LONG-VAL", "WORD-LONG-MAX",
-
-            "DWORD-BOOLEAN-MIN", "DWORD-BOOLEAN-MAX",
-            "DWORD-BYTE-MIN", "DWORD-BYTE-NIL", "DWORD-BYTE-VAL", "DWORD-BYTE-MAX",
-            "DWORD-SHORT-MIN", "DWORD-SHORT-NIL", "DWORD-SHORT-VAL", "DWORD-SHORT-MAX",
-            "DWORD-INTEGER-MIN", "DWORD-INTEGER-NIL", "DWORD-INTEGER-VAL", "DWORD-INTEGER-MAX",
-            "DWORD-LONG-MIN", "DWORD-LONG-NIL", "DWORD-LONG-VAL", "DWORD-LONG-MAX",
-
-            "LWORD-BOOLEAN-MIN", "LWORD-BOOLEAN-MAX",
-            "LWORD-BYTE-MIN", "LWORD-BYTE-NIL", "LWORD-BYTE-VAL", "LWORD-BYTE-MAX",
-            "LWORD-SHORT-MIN", "LWORD-SHORT-NIL", "LWORD-SHORT-VAL", "LWORD-SHORT-MAX",
-            "LWORD-INTEGER-MIN", "LWORD-INTEGER-NIL", "LWORD-INTEGER-VAL", "LWORD-INTEGER-MAX",
-            "LWORD-LONG-MIN", "LWORD-LONG-NIL", "LWORD-LONG-VAL", "LWORD-LONG-MAX"
-        ));
-        encode(name, field, values, expectedSuccess, SUT::encodeBoolean);
-    }
-
-    @ParameterizedTest
-    @MethodSource("createInputArrays")
-    void encodeOneByteIntegerTypes(String name, PlcField field, Object[] values) {
-        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
-            "BYTE-BYTE-MIN", "BYTE-BYTE-NIL", "BYTE-BYTE-VAL", "BYTE-BYTE-MAX",
-            "BYTE-SHORT-NIL", "BYTE-SHORT-VAL",
-            "BYTE-INTEGER-NIL", "BYTE-INTEGER-VAL",
-            "BYTE-LONG-NIL", "BYTE-LONG-VAL",
-
-            "SINT-BYTE-MIN", "SINT-BYTE-NIL", "SINT-BYTE-VAL", "SINT-BYTE-MAX",
-            "SINT-SHORT-NIL", "SINT-SHORT-VAL",
-            "SINT-INTEGER-NIL", "SINT-INTEGER-VAL",
-            "SINT-LONG-NIL", "SINT-LONG-VAL",
-
-            // If it's a unsigned small int field, then any negative number is out of scope.
-            "USINT-BYTE-NIL", "USINT-BYTE-VAL", "USINT-BYTE-MAX",
-            "USINT-SHORT-NIL", "USINT-SHORT-VAL",
-            "USINT-INTEGER-NIL", "USINT-INTEGER-VAL",
-            "USINT-LONG-NIL", "USINT-LONG-VAL"
-        ));
-        encode(name, field, values, expectedSuccess, SUT::encodeByte);
-    }
-
-    @ParameterizedTest
-    @MethodSource("createInputArrays")
-    void encodeTwoByteIntegerTypes(String name, PlcField field, Object[] values) {
-        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
-            "WORD-BYTE-MIN", "WORD-BYTE-NIL", "WORD-BYTE-VAL", "WORD-BYTE-MAX",
-            "WORD-SHORT-MIN", "WORD-SHORT-NIL", "WORD-SHORT-VAL", "WORD-SHORT-MAX",
-            "WORD-INTEGER-NIL", "WORD-INTEGER-VAL",
-            "WORD-LONG-NIL", "WORD-LONG-VAL",
-
-            "INT-BYTE-MIN", "INT-BYTE-NIL", "INT-BYTE-VAL", "INT-BYTE-MAX",
-            "INT-SHORT-MIN", "INT-SHORT-NIL", "INT-SHORT-VAL", "INT-SHORT-MAX",
-            "INT-INTEGER-NIL", "INT-INTEGER-VAL",
-            "INT-LONG-NIL", "INT-LONG-VAL",
-
-            "UINT-BYTE-NIL", "UINT-BYTE-VAL", "UINT-BYTE-MAX",
-            "UINT-SHORT-NIL", "UINT-SHORT-VAL", "UINT-SHORT-MAX",
-            "UINT-INTEGER-NIL", "UINT-INTEGER-VAL",
-            "UINT-LONG-NIL", "UINT-LONG-VAL"
-        ));
-        encode(name, field, values, expectedSuccess, SUT::encodeShort);
-    }
-
-    @ParameterizedTest
-    @MethodSource("createInputArrays")
-    void encodeFourByteIntegerTypes(String name, PlcField field, Object[] values) {
-        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
-            "DWORD-BYTE-MIN", "DWORD-BYTE-NIL", "DWORD-BYTE-VAL", "DWORD-BYTE-MAX",
-            "DWORD-SHORT-MIN", "DWORD-SHORT-NIL", "DWORD-SHORT-VAL", "DWORD-SHORT-MAX",
-            "DWORD-INTEGER-MIN", "DWORD-INTEGER-NIL", "DWORD-INTEGER-VAL", "DWORD-INTEGER-MAX",
-            "DWORD-LONG-NIL", "DWORD-LONG-VAL",
-
-            "DINT-BYTE-MIN", "DINT-BYTE-NIL", "DINT-BYTE-VAL", "DINT-BYTE-MAX",
-            "DINT-SHORT-MIN", "DINT-SHORT-NIL", "DINT-SHORT-VAL", "DINT-SHORT-MAX",
-            "DINT-INTEGER-MIN", "DINT-INTEGER-NIL", "DINT-INTEGER-VAL", "DINT-INTEGER-MAX",
-            "DINT-LONG-NIL", "DINT-LONG-VAL",
-
-            "UDINT-BYTE-NIL", "UDINT-BYTE-VAL", "UDINT-BYTE-MAX",
-            "UDINT-SHORT-NIL", "UDINT-SHORT-VAL", "UDINT-SHORT-MAX",
-            "UDINT-INTEGER-NIL", "UDINT-INTEGER-VAL", "UDINT-INTEGER-MAX",
-            "UDINT-LONG-NIL", "UDINT-LONG-VAL"
-        ));
-        encode(name, field, values, expectedSuccess, SUT::encodeInteger);
-    }
-
-    @ParameterizedTest
-    @MethodSource("createInputArrays")
-    void encodeEightByteIntegerTypes(String name, PlcField field, Object[] values) {
-        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
-            "LINT-BYTE-MIN", "LINT-BYTE-NIL", "LINT-BYTE-VAL", "LINT-BYTE-MAX",
-            "LINT-SHORT-MIN", "LINT-SHORT-NIL", "LINT-SHORT-VAL", "LINT-SHORT-MAX",
-            "LINT-INTEGER-MIN", "LINT-INTEGER-NIL", "LINT-INTEGER-VAL", "LINT-INTEGER-MAX",
-            "LINT-LONG-MIN", "LINT-LONG-NIL", "LINT-LONG-VAL", "LINT-LONG-MAX",
-
-            "ULINT-BYTE-NIL", "ULINT-BYTE-VAL", "ULINT-BYTE-MAX",
-            "ULINT-SHORT-NIL", "ULINT-SHORT-VAL", "ULINT-SHORT-MAX",
-            "ULINT-INTEGER-NIL", "ULINT-INTEGER-VAL", "ULINT-INTEGER-MAX",
-            "ULINT-LONG-NIL", "ULINT-LONG-VAL", "ULINT-LONG-MAX",
-
-            "LWORD-BYTE-MIN", "LWORD-BYTE-NIL", "LWORD-BYTE-VAL", "LWORD-BYTE-MAX",
-            "LWORD-SHORT-MIN", "LWORD-SHORT-NIL", "LWORD-SHORT-VAL", "LWORD-SHORT-MAX",
-            "LWORD-INTEGER-MIN", "LWORD-INTEGER-NIL", "LWORD-INTEGER-VAL", "LWORD-INTEGER-MAX",
-            "LWORD-LONG-MIN", "LWORD-LONG-NIL", "LWORD-LONG-VAL", "LWORD-LONG-MAX"
-
-            // TODO: Somehow test ULWORD too ...
-        ));
-        encode(name, field, values, expectedSuccess, SUT::encodeLong);
-    }
-
-    @ParameterizedTest
-    @MethodSource("createInputArrays")
-    void encodeFourByteFloatTypes(String name, PlcField field, Object[] values) {
-        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
-            "REAL-FLOAT-MIN", "REAL-FLOAT-NIL", "REAL-FLOAT-VAL", "REAL-FLOAT-MAX",
-            "REAL-DOUBLE-NIL", "REAL-DOUBLE-VAL"
-        ));
-        encode(name, field, values, expectedSuccess, SUT::encodeFloat);
-    }
-
-    @ParameterizedTest
-    @MethodSource("createInputArrays")
-    void encodeEightByteFloatTypes(String name, PlcField field, Object[] values) {
-        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
-            "LREAL-FLOAT-MIN", "LREAL-FLOAT-NIL", "LREAL-FLOAT-VAL", "LREAL-FLOAT-MAX",
-            "LREAL-DOUBLE-MIN", "LREAL-DOUBLE-NIL", "LREAL-DOUBLE-VAL", "LREAL-DOUBLE-MAX"
-        ));
-        encode(name, field, values, expectedSuccess, SUT::encodeDouble);
-    }
-
-    @ParameterizedTest
-    @MethodSource("createInputArrays")
-    void encodeString(String name, PlcField field, Object[] values) {
-        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
-            "CHAR-BYTE-MIN", "CHAR-BYTE-NIL", "CHAR-BYTE-VAL", "CHAR-BYTE-MAX",
-            "CHAR-SHORT-MIN", "CHAR-SHORT-NIL", "CHAR-SHORT-VAL", "CHAR-SHORT-MAX",
-            "CHAR-INTEGER-MIN", "CHAR-INTEGER-NIL", "CHAR-INTEGER-VAL", "CHAR-INTEGER-MAX",
-            "CHAR-LONG-MIN", "CHAR-LONG-NIL", "CHAR-LONG-VAL", "CHAR-LONG-MAX",
-            "CHAR-STRING-MIN",
-            "WCHAR-BYTE-MIN", "WCHAR-BYTE-NIL", "WCHAR-BYTE-VAL", "WCHAR-BYTE-MAX",
-            "WCHAR-SHORT-MIN", "WCHAR-SHORT-NIL", "WCHAR-SHORT-VAL", "WCHAR-SHORT-MAX",
-            "WCHAR-INTEGER-MIN", "WCHAR-INTEGER-NIL", "WCHAR-INTEGER-VAL", "WCHAR-INTEGER-MAX",
-            "WCHAR-LONG-MIN", "WCHAR-LONG-NIL", "WCHAR-LONG-VAL", "WCHAR-LONG-MAX",
-            "WCHAR-STRING-MIN",
-            "STRING-BYTE-MIN", "STRING-BYTE-NIL", "STRING-BYTE-VAL", "STRING-BYTE-MAX",
-            "STRING-SHORT-MIN", "STRING-SHORT-NIL", "STRING-SHORT-VAL", "STRING-SHORT-MAX",
-            "STRING-INTEGER-MIN", "STRING-INTEGER-NIL", "STRING-INTEGER-VAL", "STRING-INTEGER-MAX",
-            "STRING-LONG-MIN", "STRING-LONG-NIL", "STRING-LONG-VAL", "STRING-LONG-MAX",
-            "STRING-STRING-MIN", "STRING-STRING-VAL", "STRING-STRING-MAX",
-            "WSTRING-BYTE-MIN", "WSTRING-BYTE-NIL", "WSTRING-BYTE-VAL", "WSTRING-BYTE-MAX",
-            "WSTRING-SHORT-MIN", "WSTRING-SHORT-NIL", "WSTRING-SHORT-VAL", "WSTRING-SHORT-MAX",
-            "WSTRING-INTEGER-MIN", "WSTRING-INTEGER-NIL", "WSTRING-INTEGER-VAL", "WSTRING-INTEGER-MAX",
-            "WSTRING-LONG-MIN", "WSTRING-LONG-NIL", "WSTRING-LONG-VAL", "WSTRING-LONG-MAX",
-            "WSTRING-STRING-MIN", "WSTRING-STRING-VAL", "WSTRING-STRING-MAX"
-            ));
-        encode(name, field, values, expectedSuccess, SUT::encodeString);
-    }
-
-    @Disabled("Not implemented yet")
-    @ParameterizedTest
-    @MethodSource("createInputArrays")
-    void encodeTime(String name, PlcField field, Object[] values) {
-        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
-        ));
-        encode(name, field, values, expectedSuccess, SUT::encodeTime);
-    }
-
-    @Disabled("Not implemented yet")
-    @ParameterizedTest
-    @MethodSource("createInputArrays")
-    void encodeDate(String name, PlcField field, Object[] values) {
-        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
-        ));
-        encode(name, field, values, expectedSuccess, SUT::encodeDate);
-    }
-
-    @Disabled("Not implemented yet")
-    @ParameterizedTest
-    @MethodSource("createInputArrays")
-    void encodeDateTime(String name, PlcField field, Object[] values) {
-        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
-        ));
-        encode(name, field, values, expectedSuccess, SUT::encodeDateTime);
-    }
-
-    private static Stream<Arguments> createInputArrays() {
-        // Generate valid fields for each s7 type.
-        Map<TransportSize, PlcField> fields = new HashMap<>();
-        for (TransportSize s7Type : TransportSize.values()) {
-            String sizeCode = (s7Type.getSizeCode() != null) ? s7Type.getSizeCode() : "X";
-            String fieldQuery = "%DB1.DB" + sizeCode + "1";
-            if(s7Type == TransportSize.BOOL) {
-                fieldQuery += ".0";
-            }
-            fieldQuery += ":" + s7Type.name();
-            fields.put(s7Type, SUT.createField(fieldQuery));
-        }
-        // Generate output for each combination of S7 and Java type.
-        Stream<Arguments> values = null;
-        for (TransportSize s7Type : TransportSize.values()) {
-            PlcField field = fields.get(s7Type);
-            for (InputTypes javaType : InputTypes.values()) {
-                Object[] testValues = javaType.values;
-
-                BaseDefaultFieldItem fieldItem;
-                try {
-                    fieldItem = javaType.fieldItemType.getDeclaredConstructor(Array.newInstance(testValues[0].getClass(), 0).getClass()).newInstance(new Object[]{testValues});
-                } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
-                    throw new PlcRuntimeException("Error initializing field class " + javaType.fieldItemType.getSimpleName(), e);
-                }
-
-                Stream<Arguments> curValues;
-                // Min, Max
-                if(testValues.length == 2) {
-                    curValues = Stream.of(
-                        Arguments.of(s7Type.name() + "-" + javaType.name() + "-MIN", field, createOneElementArray(testValues[0])),
-                        Arguments.of(s7Type.name() + "-" + javaType.name() + "-MAX", field, createOneElementArray(testValues[1])));
-                }
-                // Value, Min, Max
-                else if(testValues.length == 3) {
-                    curValues = Stream.of(
-                        Arguments.of(s7Type.name() + "-" + javaType.name() + "-MIN", field, createOneElementArray(testValues[1])),
-                        Arguments.of(s7Type.name() + "-" + javaType.name() + "-VAL", field, createOneElementArray(testValues[0])),
-                        Arguments.of(s7Type.name() + "-" + javaType.name() + "-MAX", field, createOneElementArray(testValues[2])));
-                }
-                // Zero, Value, Min, Max
-                else if(testValues.length == 4) {
-                    curValues = Stream.of(
-                        Arguments.of(s7Type.name() + "-" + javaType.name() + "-MIN", field, createOneElementArray(testValues[2])),
-                        Arguments.of(s7Type.name() + "-" + javaType.name() + "-NIL", field, createOneElementArray(testValues[0])),
-                        Arguments.of(s7Type.name() + "-" + javaType.name() + "-VAL", field, createOneElementArray(testValues[1])),
-                        Arguments.of(s7Type.name() + "-" + javaType.name() + "-MAX", field, createOneElementArray(testValues[3])));
-                } else {
-                    throw new RuntimeException("Expecting 2, 3 or 4 valued test-input");
-                }
-                if(values == null) {
-                    values = curValues;
-                } else {
-                    values = Stream.concat(values, curValues);
-                }
-            }
-        }
-        return values;
-    }
-
-    private static Object[] createOneElementArray(Object value) {
-        Class<?> type = value.getClass();
-        Object[] array = (Object[]) Array.newInstance(type, 1);
-        array[0] = value;
-        return array;
-    }
-
-    enum InputTypes {
-        BOOLEAN(DefaultBooleanFieldItem.class, new Boolean[]{false, true}),
-        BYTE(DefaultByteFieldItem.class, new Byte[]{(byte) 0, (byte) 42, Byte.MIN_VALUE, Byte.MAX_VALUE}),
-        SHORT(DefaultShortFieldItem.class, new Short[]{(short) 0, (short) 42, Short.MIN_VALUE, Short.MAX_VALUE}),
-        INTEGER(DefaultIntegerFieldItem.class, new Integer[]{0, 42, Integer.MIN_VALUE, Integer.MAX_VALUE}),
-        LONG(DefaultLongFieldItem.class, new Long[]{(long) 0, (long) 42, Long.MIN_VALUE, Long.MAX_VALUE}),
-        FLOAT(DefaultFloatFieldItem.class, new Float[]{(float) 0.0, (float) 42.23, -Float.MAX_VALUE, Float.MAX_VALUE}),
-        DOUBLE(DefaultDoubleFieldItem.class, new Double[]{0.0, 42.23, -Double.MAX_VALUE, Double.MAX_VALUE}),
-        // Creates an empty sting as min and a 254 char long string as max.
-        STRING(DefaultStringFieldItem.class, new String[]{"Hurz", "", IntStream.range(0, 254).mapToObj(i -> "a").collect(Collectors.joining(""))}),
-        TIME(DefaultLocalTimeFieldItem.class, new LocalTime[]{LocalTime.now(), LocalTime.MIDNIGHT, LocalTime.MIN, LocalTime.MAX}),
-        DATE(DefaultLocalDateFieldItem.class, new LocalDate[]{LocalDate.now(), LocalDate.MIN, LocalDate.MAX}),
-        DATETIME(DefaultLocalDateTimeFieldItem.class, new LocalDateTime[]{LocalDateTime.now(), LocalDateTime.MIN, LocalDateTime.MAX});
-
-        private final Class<? extends BaseDefaultFieldItem> fieldItemType;
-        private final Object[] values;
-
-        InputTypes(Class<? extends BaseDefaultFieldItem> fieldItemType, Object[] values) {
-            this.fieldItemType = fieldItemType;
-            this.values = values;
-        }
-    }
-
-    private void encode(String name, PlcField field, Object[] values, Set<String> expectedSuccess,
-                        BiFunction<PlcField, Object[], BaseDefaultFieldItem> encoder) {
-        boolean success = expectedSuccess.contains(name);
-        try {
-            BaseDefaultFieldItem fieldItem = encoder.apply(field, values);
-            assertNotNull(fieldItem, "A FieldItem instance should have been returned for testcase " + name);
-            if(!success) {
-                fail("Expected to fail for testcase " + name);
-            }
-        } catch (Exception e) {
-            if(success) {
-                fail("Expected to succeed for testcase " + name + " got exception " + e.getMessage());
-            }
-        }
-    }
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.util;
+
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.messages.items.*;
+import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.lang.reflect.Array;
+import java.lang.reflect.InvocationTargetException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.*;
+import java.util.function.BiFunction;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
+class S7PlcFieldHandlerTest {
+
+    private static S7PlcFieldHandler SUT = new S7PlcFieldHandler();
+
+    @ParameterizedTest
+    @ValueSource(strings = {
+        "%DB1.DBX1.0:BOOL",
+        "%DB1.DBW1.0:WORD"
+    })
+    void createField(String fieldQuery) {
+        SUT.createField(fieldQuery);
+    }
+
+    @ParameterizedTest
+    @MethodSource("createInputArrays")
+    void encodeOneBitTypes(String name, PlcField field, Object[] values) {
+        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
+            "BOOL-BOOLEAN-MIN", "BOOL-BOOLEAN-MAX",
+            "BOOL-BYTE-MIN", "BOOL-BYTE-NIL", "BOOL-BYTE-VAL", "BOOL-BYTE-MAX",
+            "BOOL-SHORT-MIN", "BOOL-SHORT-NIL", "BOOL-SHORT-VAL", "BOOL-SHORT-MAX",
+            "BOOL-INTEGER-MIN", "BOOL-INTEGER-NIL", "BOOL-INTEGER-VAL", "BOOL-INTEGER-MAX",
+            "BOOL-LONG-MIN", "BOOL-LONG-NIL", "BOOL-LONG-VAL", "BOOL-LONG-MAX",
+
+            "BYTE-BOOLEAN-MIN", "BYTE-BOOLEAN-MAX",
+            "BYTE-BYTE-MIN", "BYTE-BYTE-NIL", "BYTE-BYTE-VAL", "BYTE-BYTE-MAX",
+            "BYTE-SHORT-MIN", "BYTE-SHORT-NIL", "BYTE-SHORT-VAL", "BYTE-SHORT-MAX",
+            "BYTE-INTEGER-MIN", "BYTE-INTEGER-NIL", "BYTE-INTEGER-VAL", "BYTE-INTEGER-MAX",
+            "BYTE-LONG-MIN", "BYTE-LONG-NIL", "BYTE-LONG-VAL", "BYTE-LONG-MAX",
+
+            "WORD-BOOLEAN-MIN", "WORD-BOOLEAN-MAX",
+            "WORD-BYTE-MIN", "WORD-BYTE-NIL", "WORD-BYTE-VAL", "WORD-BYTE-MAX",
+            "WORD-SHORT-MIN", "WORD-SHORT-NIL", "WORD-SHORT-VAL", "WORD-SHORT-MAX",
+            "WORD-INTEGER-MIN", "WORD-INTEGER-NIL", "WORD-INTEGER-VAL", "WORD-INTEGER-MAX",
+            "WORD-LONG-MIN", "WORD-LONG-NIL", "WORD-LONG-VAL", "WORD-LONG-MAX",
+
+            "DWORD-BOOLEAN-MIN", "DWORD-BOOLEAN-MAX",
+            "DWORD-BYTE-MIN", "DWORD-BYTE-NIL", "DWORD-BYTE-VAL", "DWORD-BYTE-MAX",
+            "DWORD-SHORT-MIN", "DWORD-SHORT-NIL", "DWORD-SHORT-VAL", "DWORD-SHORT-MAX",
+            "DWORD-INTEGER-MIN", "DWORD-INTEGER-NIL", "DWORD-INTEGER-VAL", "DWORD-INTEGER-MAX",
+            "DWORD-LONG-MIN", "DWORD-LONG-NIL", "DWORD-LONG-VAL", "DWORD-LONG-MAX",
+
+            "LWORD-BOOLEAN-MIN", "LWORD-BOOLEAN-MAX",
+            "LWORD-BYTE-MIN", "LWORD-BYTE-NIL", "LWORD-BYTE-VAL", "LWORD-BYTE-MAX",
+            "LWORD-SHORT-MIN", "LWORD-SHORT-NIL", "LWORD-SHORT-VAL", "LWORD-SHORT-MAX",
+            "LWORD-INTEGER-MIN", "LWORD-INTEGER-NIL", "LWORD-INTEGER-VAL", "LWORD-INTEGER-MAX",
+            "LWORD-LONG-MIN", "LWORD-LONG-NIL", "LWORD-LONG-VAL", "LWORD-LONG-MAX"
+        ));
+        encode(name, field, values, expectedSuccess, SUT::encodeBoolean);
+    }
+
+    @ParameterizedTest
+    @MethodSource("createInputArrays")
+    void encodeOneByteIntegerTypes(String name, PlcField field, Object[] values) {
+        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
+            "BYTE-BYTE-MIN", "BYTE-BYTE-NIL", "BYTE-BYTE-VAL", "BYTE-BYTE-MAX",
+            "BYTE-SHORT-NIL", "BYTE-SHORT-VAL",
+            "BYTE-INTEGER-NIL", "BYTE-INTEGER-VAL",
+            "BYTE-LONG-NIL", "BYTE-LONG-VAL",
+
+            "SINT-BYTE-MIN", "SINT-BYTE-NIL", "SINT-BYTE-VAL", "SINT-BYTE-MAX",
+            "SINT-SHORT-NIL", "SINT-SHORT-VAL",
+            "SINT-INTEGER-NIL", "SINT-INTEGER-VAL",
+            "SINT-LONG-NIL", "SINT-LONG-VAL",
+
+            // If it's a unsigned small int field, then any negative number is out of scope.
+            "USINT-BYTE-NIL", "USINT-BYTE-VAL", "USINT-BYTE-MAX",
+            "USINT-SHORT-NIL", "USINT-SHORT-VAL",
+            "USINT-INTEGER-NIL", "USINT-INTEGER-VAL",
+            "USINT-LONG-NIL", "USINT-LONG-VAL"
+        ));
+        encode(name, field, values, expectedSuccess, SUT::encodeByte);
+    }
+
+    @ParameterizedTest
+    @MethodSource("createInputArrays")
+    void encodeTwoByteIntegerTypes(String name, PlcField field, Object[] values) {
+        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
+            "WORD-BYTE-MIN", "WORD-BYTE-NIL", "WORD-BYTE-VAL", "WORD-BYTE-MAX",
+            "WORD-SHORT-MIN", "WORD-SHORT-NIL", "WORD-SHORT-VAL", "WORD-SHORT-MAX",
+            "WORD-INTEGER-NIL", "WORD-INTEGER-VAL",
+            "WORD-LONG-NIL", "WORD-LONG-VAL",
+
+            "INT-BYTE-MIN", "INT-BYTE-NIL", "INT-BYTE-VAL", "INT-BYTE-MAX",
+            "INT-SHORT-MIN", "INT-SHORT-NIL", "INT-SHORT-VAL", "INT-SHORT-MAX",
+            "INT-INTEGER-NIL", "INT-INTEGER-VAL",
+            "INT-LONG-NIL", "INT-LONG-VAL",
+
+            "UINT-BYTE-NIL", "UINT-BYTE-VAL", "UINT-BYTE-MAX",
+            "UINT-SHORT-NIL", "UINT-SHORT-VAL", "UINT-SHORT-MAX",
+            "UINT-INTEGER-NIL", "UINT-INTEGER-VAL",
+            "UINT-LONG-NIL", "UINT-LONG-VAL"
+        ));
+        encode(name, field, values, expectedSuccess, SUT::encodeShort);
+    }
+
+    @ParameterizedTest
+    @MethodSource("createInputArrays")
+    void encodeFourByteIntegerTypes(String name, PlcField field, Object[] values) {
+        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
+            "DWORD-BYTE-MIN", "DWORD-BYTE-NIL", "DWORD-BYTE-VAL", "DWORD-BYTE-MAX",
+            "DWORD-SHORT-MIN", "DWORD-SHORT-NIL", "DWORD-SHORT-VAL", "DWORD-SHORT-MAX",
+            "DWORD-INTEGER-MIN", "DWORD-INTEGER-NIL", "DWORD-INTEGER-VAL", "DWORD-INTEGER-MAX",
+            "DWORD-LONG-NIL", "DWORD-LONG-VAL",
+
+            "DINT-BYTE-MIN", "DINT-BYTE-NIL", "DINT-BYTE-VAL", "DINT-BYTE-MAX",
+            "DINT-SHORT-MIN", "DINT-SHORT-NIL", "DINT-SHORT-VAL", "DINT-SHORT-MAX",
+            "DINT-INTEGER-MIN", "DINT-INTEGER-NIL", "DINT-INTEGER-VAL", "DINT-INTEGER-MAX",
+            "DINT-LONG-NIL", "DINT-LONG-VAL",
+
+            "UDINT-BYTE-NIL", "UDINT-BYTE-VAL", "UDINT-BYTE-MAX",
+            "UDINT-SHORT-NIL", "UDINT-SHORT-VAL", "UDINT-SHORT-MAX",
+            "UDINT-INTEGER-NIL", "UDINT-INTEGER-VAL", "UDINT-INTEGER-MAX",
+            "UDINT-LONG-NIL", "UDINT-LONG-VAL"
+        ));
+        encode(name, field, values, expectedSuccess, SUT::encodeInteger);
+    }
+
+    @ParameterizedTest
+    @MethodSource("createInputArrays")
+    void encodeEightByteIntegerTypes(String name, PlcField field, Object[] values) {
+        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
+            "LINT-BYTE-MIN", "LINT-BYTE-NIL", "LINT-BYTE-VAL", "LINT-BYTE-MAX",
+            "LINT-SHORT-MIN", "LINT-SHORT-NIL", "LINT-SHORT-VAL", "LINT-SHORT-MAX",
+            "LINT-INTEGER-MIN", "LINT-INTEGER-NIL", "LINT-INTEGER-VAL", "LINT-INTEGER-MAX",
+            "LINT-LONG-MIN", "LINT-LONG-NIL", "LINT-LONG-VAL", "LINT-LONG-MAX",
+
+            "ULINT-BYTE-NIL", "ULINT-BYTE-VAL", "ULINT-BYTE-MAX",
+            "ULINT-SHORT-NIL", "ULINT-SHORT-VAL", "ULINT-SHORT-MAX",
+            "ULINT-INTEGER-NIL", "ULINT-INTEGER-VAL", "ULINT-INTEGER-MAX",
+            "ULINT-LONG-NIL", "ULINT-LONG-VAL", "ULINT-LONG-MAX",
+
+            "LWORD-BYTE-MIN", "LWORD-BYTE-NIL", "LWORD-BYTE-VAL", "LWORD-BYTE-MAX",
+            "LWORD-SHORT-MIN", "LWORD-SHORT-NIL", "LWORD-SHORT-VAL", "LWORD-SHORT-MAX",
+            "LWORD-INTEGER-MIN", "LWORD-INTEGER-NIL", "LWORD-INTEGER-VAL", "LWORD-INTEGER-MAX",
+            "LWORD-LONG-MIN", "LWORD-LONG-NIL", "LWORD-LONG-VAL", "LWORD-LONG-MAX"
+
+            // TODO: Somehow test ULWORD too ...
+        ));
+        encode(name, field, values, expectedSuccess, SUT::encodeLong);
+    }
+
+    @ParameterizedTest
+    @MethodSource("createInputArrays")
+    void encodeFourByteFloatTypes(String name, PlcField field, Object[] values) {
+        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
+            "REAL-FLOAT-MIN", "REAL-FLOAT-NIL", "REAL-FLOAT-VAL", "REAL-FLOAT-MAX",
+            "REAL-DOUBLE-NIL", "REAL-DOUBLE-VAL"
+        ));
+        encode(name, field, values, expectedSuccess, SUT::encodeFloat);
+    }
+
+    @ParameterizedTest
+    @MethodSource("createInputArrays")
+    void encodeEightByteFloatTypes(String name, PlcField field, Object[] values) {
+        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
+            "LREAL-FLOAT-MIN", "LREAL-FLOAT-NIL", "LREAL-FLOAT-VAL", "LREAL-FLOAT-MAX",
+            "LREAL-DOUBLE-MIN", "LREAL-DOUBLE-NIL", "LREAL-DOUBLE-VAL", "LREAL-DOUBLE-MAX"
+        ));
+        encode(name, field, values, expectedSuccess, SUT::encodeDouble);
+    }
+
+    @ParameterizedTest
+    @MethodSource("createInputArrays")
+    void encodeString(String name, PlcField field, Object[] values) {
+        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
+            "CHAR-BYTE-MIN", "CHAR-BYTE-NIL", "CHAR-BYTE-VAL", "CHAR-BYTE-MAX",
+            "CHAR-SHORT-MIN", "CHAR-SHORT-NIL", "CHAR-SHORT-VAL", "CHAR-SHORT-MAX",
+            "CHAR-INTEGER-MIN", "CHAR-INTEGER-NIL", "CHAR-INTEGER-VAL", "CHAR-INTEGER-MAX",
+            "CHAR-LONG-MIN", "CHAR-LONG-NIL", "CHAR-LONG-VAL", "CHAR-LONG-MAX",
+            "CHAR-STRING-MIN",
+            "WCHAR-BYTE-MIN", "WCHAR-BYTE-NIL", "WCHAR-BYTE-VAL", "WCHAR-BYTE-MAX",
+            "WCHAR-SHORT-MIN", "WCHAR-SHORT-NIL", "WCHAR-SHORT-VAL", "WCHAR-SHORT-MAX",
+            "WCHAR-INTEGER-MIN", "WCHAR-INTEGER-NIL", "WCHAR-INTEGER-VAL", "WCHAR-INTEGER-MAX",
+            "WCHAR-LONG-MIN", "WCHAR-LONG-NIL", "WCHAR-LONG-VAL", "WCHAR-LONG-MAX",
+            "WCHAR-STRING-MIN",
+            "STRING-BYTE-MIN", "STRING-BYTE-NIL", "STRING-BYTE-VAL", "STRING-BYTE-MAX",
+            "STRING-SHORT-MIN", "STRING-SHORT-NIL", "STRING-SHORT-VAL", "STRING-SHORT-MAX",
+            "STRING-INTEGER-MIN", "STRING-INTEGER-NIL", "STRING-INTEGER-VAL", "STRING-INTEGER-MAX",
+            "STRING-LONG-MIN", "STRING-LONG-NIL", "STRING-LONG-VAL", "STRING-LONG-MAX",
+            "STRING-STRING-MIN", "STRING-STRING-VAL", "STRING-STRING-MAX",
+            "WSTRING-BYTE-MIN", "WSTRING-BYTE-NIL", "WSTRING-BYTE-VAL", "WSTRING-BYTE-MAX",
+            "WSTRING-SHORT-MIN", "WSTRING-SHORT-NIL", "WSTRING-SHORT-VAL", "WSTRING-SHORT-MAX",
+            "WSTRING-INTEGER-MIN", "WSTRING-INTEGER-NIL", "WSTRING-INTEGER-VAL", "WSTRING-INTEGER-MAX",
+            "WSTRING-LONG-MIN", "WSTRING-LONG-NIL", "WSTRING-LONG-VAL", "WSTRING-LONG-MAX",
+            "WSTRING-STRING-MIN", "WSTRING-STRING-VAL", "WSTRING-STRING-MAX"
+            ));
+        encode(name, field, values, expectedSuccess, SUT::encodeString);
+    }
+
+    @Disabled("Not implemented yet")
+    @ParameterizedTest
+    @MethodSource("createInputArrays")
+    void encodeTime(String name, PlcField field, Object[] values) {
+        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
+        ));
+        encode(name, field, values, expectedSuccess, SUT::encodeTime);
+    }
+
+    @Disabled("Not implemented yet")
+    @ParameterizedTest
+    @MethodSource("createInputArrays")
+    void encodeDate(String name, PlcField field, Object[] values) {
+        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
+        ));
+        encode(name, field, values, expectedSuccess, SUT::encodeDate);
+    }
+
+    @Disabled("Not implemented yet")
+    @ParameterizedTest
+    @MethodSource("createInputArrays")
+    void encodeDateTime(String name, PlcField field, Object[] values) {
+        Set<String> expectedSuccess = new HashSet<>(Arrays.asList(
+        ));
+        encode(name, field, values, expectedSuccess, SUT::encodeDateTime);
+    }
+
+    private static Stream<Arguments> createInputArrays() {
+        // Generate valid fields for each s7 type.
+        Map<TransportSize, PlcField> fields = new HashMap<>();
+        for (TransportSize s7Type : TransportSize.values()) {
+            String sizeCode = (s7Type.getSizeCode() != null) ? s7Type.getSizeCode() : "X";
+            String fieldQuery = "%DB1.DB" + sizeCode + "1";
+            if(s7Type == TransportSize.BOOL) {
+                fieldQuery += ".0";
+            }
+            fieldQuery += ":" + s7Type.name();
+            fields.put(s7Type, SUT.createField(fieldQuery));
+        }
+        // Generate output for each combination of S7 and Java type.
+        Stream<Arguments> values = null;
+        for (TransportSize s7Type : TransportSize.values()) {
+            PlcField field = fields.get(s7Type);
+            for (InputTypes javaType : InputTypes.values()) {
+                Object[] testValues = javaType.values;
+
+                BaseDefaultFieldItem fieldItem;
+                try {
+                    fieldItem = javaType.fieldItemType.getDeclaredConstructor(Array.newInstance(testValues[0].getClass(), 0).getClass()).newInstance(new Object[]{testValues});
+                } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+                    throw new PlcRuntimeException("Error initializing field class " + javaType.fieldItemType.getSimpleName(), e);
+                }
+
+                Stream<Arguments> curValues;
+                // Min, Max
+                if(testValues.length == 2) {
+                    curValues = Stream.of(
+                        Arguments.of(s7Type.name() + "-" + javaType.name() + "-MIN", field, createOneElementArray(testValues[0])),
+                        Arguments.of(s7Type.name() + "-" + javaType.name() + "-MAX", field, createOneElementArray(testValues[1])));
+                }
+                // Value, Min, Max
+                else if(testValues.length == 3) {
+                    curValues = Stream.of(
+                        Arguments.of(s7Type.name() + "-" + javaType.name() + "-MIN", field, createOneElementArray(testValues[1])),
+                        Arguments.of(s7Type.name() + "-" + javaType.name() + "-VAL", field, createOneElementArray(testValues[0])),
+                        Arguments.of(s7Type.name() + "-" + javaType.name() + "-MAX", field, createOneElementArray(testValues[2])));
+                }
+                // Zero, Value, Min, Max
+                else if(testValues.length == 4) {
+                    curValues = Stream.of(
+                        Arguments.of(s7Type.name() + "-" + javaType.name() + "-MIN", field, createOneElementArray(testValues[2])),
+                        Arguments.of(s7Type.name() + "-" + javaType.name() + "-NIL", field, createOneElementArray(testValues[0])),
+                        Arguments.of(s7Type.name() + "-" + javaType.name() + "-VAL", field, createOneElementArray(testValues[1])),
+                        Arguments.of(s7Type.name() + "-" + javaType.name() + "-MAX", field, createOneElementArray(testValues[3])));
+                } else {
+                    throw new RuntimeException("Expecting 2, 3 or 4 valued test-input");
+                }
+                if(values == null) {
+                    values = curValues;
+                } else {
+                    values = Stream.concat(values, curValues);
+                }
+            }
+        }
+        return values;
+    }
+
+    private static Object[] createOneElementArray(Object value) {
+        Class<?> type = value.getClass();
+        Object[] array = (Object[]) Array.newInstance(type, 1);
+        array[0] = value;
+        return array;
+    }
+
+    enum InputTypes {
+        BOOLEAN(DefaultBooleanFieldItem.class, new Boolean[]{false, true}),
+        BYTE(DefaultByteFieldItem.class, new Byte[]{(byte) 0, (byte) 42, Byte.MIN_VALUE, Byte.MAX_VALUE}),
+        SHORT(DefaultShortFieldItem.class, new Short[]{(short) 0, (short) 42, Short.MIN_VALUE, Short.MAX_VALUE}),
+        INTEGER(DefaultIntegerFieldItem.class, new Integer[]{0, 42, Integer.MIN_VALUE, Integer.MAX_VALUE}),
+        LONG(DefaultLongFieldItem.class, new Long[]{(long) 0, (long) 42, Long.MIN_VALUE, Long.MAX_VALUE}),
+        FLOAT(DefaultFloatFieldItem.class, new Float[]{(float) 0.0, (float) 42.23, -Float.MAX_VALUE, Float.MAX_VALUE}),
+        DOUBLE(DefaultDoubleFieldItem.class, new Double[]{0.0, 42.23, -Double.MAX_VALUE, Double.MAX_VALUE}),
+        // Creates an empty sting as min and a 254 char long string as max.
+        STRING(DefaultStringFieldItem.class, new String[]{"Hurz", "", IntStream.range(0, 254).mapToObj(i -> "a").collect(Collectors.joining(""))}),
+        TIME(DefaultLocalTimeFieldItem.class, new LocalTime[]{LocalTime.now(), LocalTime.MIDNIGHT, LocalTime.MIN, LocalTime.MAX}),
+        DATE(DefaultLocalDateFieldItem.class, new LocalDate[]{LocalDate.now(), LocalDate.MIN, LocalDate.MAX}),
+        DATETIME(DefaultLocalDateTimeFieldItem.class, new LocalDateTime[]{LocalDateTime.now(), LocalDateTime.MIN, LocalDateTime.MAX});
+
+        private final Class<? extends BaseDefaultFieldItem> fieldItemType;
+        private final Object[] values;
+
+        InputTypes(Class<? extends BaseDefaultFieldItem> fieldItemType, Object[] values) {
+            this.fieldItemType = fieldItemType;
+            this.values = values;
+        }
+    }
+
+    private void encode(String name, PlcField field, Object[] values, Set<String> expectedSuccess,
+                        BiFunction<PlcField, Object[], BaseDefaultFieldItem> encoder) {
+        boolean success = expectedSuccess.contains(name);
+        try {
+            BaseDefaultFieldItem fieldItem = encoder.apply(field, values);
+            assertNotNull(fieldItem, "A FieldItem instance should have been returned for testcase " + name);
+            if(!success) {
+                fail("Expected to fail for testcase " + name);
+            }
+        } catch (Exception e) {
+            if(success) {
+                fail("Expected to succeed for testcase " + name + " got exception " + e.getMessage());
+            }
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/util/S7RequestSizeCalculatorTest.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/util/S7RequestSizeCalculatorTest.java
index a7ab173c1b2..d146efdaa0a 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/util/S7RequestSizeCalculatorTest.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/util/S7RequestSizeCalculatorTest.java
@@ -1,141 +1,141 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.s7.netty.util;
-
-import org.apache.commons.lang3.NotImplementedException;
-import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
-import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
-import org.apache.plc4x.java.s7.netty.model.params.SetupCommunicationParameter;
-import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
-import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
-import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
-import org.apache.plc4x.java.s7.netty.model.types.*;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import java.util.Collections;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-class S7RequestSizeCalculatorTest {
-
-    @Test
-    void getReadVarRequestMessageSize() {
-        S7RequestMessage readVarRequest = new S7RequestMessage(
-            MessageType.JOB,
-            (short) 1,
-            Collections.singletonList(
-                new VarParameter(ParameterType.READ_VAR, Collections.singletonList(
-                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS, TransportSize.BYTE, 1, (short) 1, (short) 0, (byte) 0)))),
-            Collections.emptyList(),
-            null);
-        short size = S7RequestSizeCalculator.getRequestMessageSize(readVarRequest);
-        assertEquals(24, size);
-    }
-
-    @Test
-    void getWriteVarRequestMessageSize() {
-        S7RequestMessage readVarRequest = new S7RequestMessage(
-            MessageType.JOB,
-            (short) 1,
-            Collections.singletonList(
-                new VarParameter(ParameterType.WRITE_VAR, Collections.singletonList(
-                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS, TransportSize.BYTE, 1, (short) 1, (short) 0, (byte) 0)))),
-            Collections.singletonList(
-                new VarPayload(ParameterType.WRITE_VAR, Collections.singletonList(
-                    new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {(byte) 0x01})))),
-            null);
-        short size = S7RequestSizeCalculator.getRequestMessageSize(readVarRequest);
-        assertEquals(30, size);
-    }
-
-    @Test
-    void getSetupCommunicationRequestMessageSize() {
-        S7RequestMessage readVarRequest = new S7RequestMessage(
-            MessageType.JOB,
-            (short) 1,
-            Collections.singletonList(
-                new SetupCommunicationParameter((short) 1, (short) 2, (short) 250)),
-            Collections.emptyList(),
-            null);
-        short size = S7RequestSizeCalculator.getRequestMessageSize(readVarRequest);
-        assertEquals(18, size);
-    }
-
-    @Test
-    void getUnimplementedParameterItemTypeMessageSize() {
-        S7Parameter mockParameter = mock(S7Parameter.class);
-        when(mockParameter.getType()).thenReturn(ParameterType.UPLOAD);
-        S7RequestMessage readVarRequest = new S7RequestMessage(
-            MessageType.JOB,
-            (short) 1,
-            Collections.singletonList(mockParameter),
-            Collections.emptyList(),
-            null);
-        Assertions.assertThrows(NotImplementedException.class,
-            () -> S7RequestSizeCalculator.getRequestMessageSize(readVarRequest));
-    }
-
-    @Test
-    void getUnimplementedVarAddressingModeMessageSize() {
-        VarParameterItem mockParameterItem = mock(VarParameterItem.class);
-        when(mockParameterItem.getAddressingMode()).thenReturn(VariableAddressingMode.ALARM_QUERYREQ);
-        S7RequestMessage readVarRequest = new S7RequestMessage(
-            MessageType.JOB,
-            (short) 1,
-            Collections.singletonList(
-                new VarParameter(ParameterType.WRITE_VAR, Collections.singletonList(mockParameterItem))),
-            Collections.emptyList(),
-            null);
-        Assertions.assertThrows(NotImplementedException.class,
-            () -> S7RequestSizeCalculator.getRequestMessageSize(readVarRequest));
-    }
-
-    @Test
-    void getUnimplementedPayloadTypeMessageSize() {
-        S7Payload mockPayload = mock(S7Payload.class);
-        when(mockPayload.getType()).thenReturn(ParameterType.UPLOAD);
-        S7RequestMessage readVarRequest = new S7RequestMessage(
-            MessageType.JOB,
-            (short) 1,
-            Collections.singletonList(
-                new VarParameter(ParameterType.WRITE_VAR, Collections.singletonList(
-                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS, TransportSize.BYTE, 1, (short) 1, (short) 0, (byte) 0)))),
-            Collections.singletonList(mockPayload),
-            null);
-        Assertions.assertThrows(NotImplementedException.class,
-            () -> S7RequestSizeCalculator.getRequestMessageSize(readVarRequest));
-    }
-
-    @Test
-    void getRequestItemTotalSize() {
-        short size = S7RequestSizeCalculator.getRequestItemTotalSize(
-            new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS, TransportSize.BYTE, 1, (short) 1, (short) 0, (byte) 0),
-            new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {(byte) 0x01})
-        );
-        assertEquals(18, size);
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty.util;
+
+import org.apache.commons.lang3.NotImplementedException;
+import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
+import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
+import org.apache.plc4x.java.s7.netty.model.params.SetupCommunicationParameter;
+import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
+import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
+import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
+import org.apache.plc4x.java.s7.netty.model.types.*;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.Collections;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class S7RequestSizeCalculatorTest {
+
+    @Test
+    void getReadVarRequestMessageSize() {
+        S7RequestMessage readVarRequest = new S7RequestMessage(
+            MessageType.JOB,
+            (short) 1,
+            Collections.singletonList(
+                new VarParameter(ParameterType.READ_VAR, Collections.singletonList(
+                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS, TransportSize.BYTE, 1, (short) 1, (short) 0, (byte) 0)))),
+            Collections.emptyList(),
+            null);
+        short size = S7RequestSizeCalculator.getRequestMessageSize(readVarRequest);
+        assertEquals(24, size);
+    }
+
+    @Test
+    void getWriteVarRequestMessageSize() {
+        S7RequestMessage readVarRequest = new S7RequestMessage(
+            MessageType.JOB,
+            (short) 1,
+            Collections.singletonList(
+                new VarParameter(ParameterType.WRITE_VAR, Collections.singletonList(
+                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS, TransportSize.BYTE, 1, (short) 1, (short) 0, (byte) 0)))),
+            Collections.singletonList(
+                new VarPayload(ParameterType.WRITE_VAR, Collections.singletonList(
+                    new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {(byte) 0x01})))),
+            null);
+        short size = S7RequestSizeCalculator.getRequestMessageSize(readVarRequest);
+        assertEquals(30, size);
+    }
+
+    @Test
+    void getSetupCommunicationRequestMessageSize() {
+        S7RequestMessage readVarRequest = new S7RequestMessage(
+            MessageType.JOB,
+            (short) 1,
+            Collections.singletonList(
+                new SetupCommunicationParameter((short) 1, (short) 2, (short) 250)),
+            Collections.emptyList(),
+            null);
+        short size = S7RequestSizeCalculator.getRequestMessageSize(readVarRequest);
+        assertEquals(18, size);
+    }
+
+    @Test
+    void getUnimplementedParameterItemTypeMessageSize() {
+        S7Parameter mockParameter = mock(S7Parameter.class);
+        when(mockParameter.getType()).thenReturn(ParameterType.UPLOAD);
+        S7RequestMessage readVarRequest = new S7RequestMessage(
+            MessageType.JOB,
+            (short) 1,
+            Collections.singletonList(mockParameter),
+            Collections.emptyList(),
+            null);
+        Assertions.assertThrows(NotImplementedException.class,
+            () -> S7RequestSizeCalculator.getRequestMessageSize(readVarRequest));
+    }
+
+    @Test
+    void getUnimplementedVarAddressingModeMessageSize() {
+        VarParameterItem mockParameterItem = mock(VarParameterItem.class);
+        when(mockParameterItem.getAddressingMode()).thenReturn(VariableAddressingMode.ALARM_QUERYREQ);
+        S7RequestMessage readVarRequest = new S7RequestMessage(
+            MessageType.JOB,
+            (short) 1,
+            Collections.singletonList(
+                new VarParameter(ParameterType.WRITE_VAR, Collections.singletonList(mockParameterItem))),
+            Collections.emptyList(),
+            null);
+        Assertions.assertThrows(NotImplementedException.class,
+            () -> S7RequestSizeCalculator.getRequestMessageSize(readVarRequest));
+    }
+
+    @Test
+    void getUnimplementedPayloadTypeMessageSize() {
+        S7Payload mockPayload = mock(S7Payload.class);
+        when(mockPayload.getType()).thenReturn(ParameterType.UPLOAD);
+        S7RequestMessage readVarRequest = new S7RequestMessage(
+            MessageType.JOB,
+            (short) 1,
+            Collections.singletonList(
+                new VarParameter(ParameterType.WRITE_VAR, Collections.singletonList(
+                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS, TransportSize.BYTE, 1, (short) 1, (short) 0, (byte) 0)))),
+            Collections.singletonList(mockPayload),
+            null);
+        Assertions.assertThrows(NotImplementedException.class,
+            () -> S7RequestSizeCalculator.getRequestMessageSize(readVarRequest));
+    }
+
+    @Test
+    void getRequestItemTotalSize() {
+        short size = S7RequestSizeCalculator.getRequestItemTotalSize(
+            new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS, TransportSize.BYTE, 1, (short) 1, (short) 0, (byte) 0),
+            new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {(byte) 0x01})
+        );
+        assertEquals(18, size);
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/util/S7ResponseSizeEstimatorTest.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/util/S7ResponseSizeEstimatorTest.java
index 6116643e6e1..33eee2ae0d8 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/util/S7ResponseSizeEstimatorTest.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/util/S7ResponseSizeEstimatorTest.java
@@ -1,122 +1,122 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.s7.netty.util;
-
-import org.apache.commons.lang3.NotImplementedException;
-import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
-import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
-import org.apache.plc4x.java.s7.netty.model.params.SetupCommunicationParameter;
-import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
-import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
-import org.apache.plc4x.java.s7.netty.model.types.*;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import java.util.Collections;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-class S7ResponseSizeEstimatorTest {
-
-    @Test
-    void getEstimatedReadVarResponseSize() {
-        S7RequestMessage readVarRequest = new S7RequestMessage(
-            MessageType.JOB,
-            (short) 1,
-            Collections.singletonList(
-                new VarParameter(ParameterType.READ_VAR, Collections.singletonList(
-                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                        TransportSize.BOOL, 1, (short) 1, (short) 0, (byte) 0)))),
-            Collections.emptyList(),
-            null);
-        short size = S7ResponseSizeEstimator.getEstimatedResponseMessageSize(readVarRequest);
-        assertEquals(20, size);
-    }
-
-    @Test
-    void getEstimatedWriteVarResponseSize() {
-        S7RequestMessage readVarRequest = new S7RequestMessage(
-            MessageType.JOB,
-            (short) 1,
-            Collections.singletonList(
-                new VarParameter(ParameterType.WRITE_VAR, Collections.singletonList(
-                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                        TransportSize.BYTE, 1, (short) 1, (short) 0, (byte) 0)))),
-            Collections.singletonList(
-                new VarPayload(ParameterType.WRITE_VAR, Collections.singletonList(
-                    new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD,
-                        new byte[] {(byte) 0x01})))),
-            null);
-        short size = S7ResponseSizeEstimator.getEstimatedResponseMessageSize(readVarRequest);
-        assertEquals(15, size);
-    }
-
-    @Test
-    void getEstimatedSetupCommunicationResponseSize() {
-        S7RequestMessage readVarRequest = new S7RequestMessage(
-            MessageType.JOB,
-            (short) 1,
-            Collections.singletonList(
-                new SetupCommunicationParameter((short) 1, (short) 2, (short) 250)),
-            Collections.emptyList(),
-            null);
-        short size = S7ResponseSizeEstimator.getEstimatedResponseMessageSize(readVarRequest);
-        assertEquals(20, size);
-    }
-
-    @Test
-    void getEstimatedUnimplementedParameterItemTypeResponseSize() {
-        S7Parameter mockParameter = mock(S7Parameter.class);
-        when(mockParameter.getType()).thenReturn(ParameterType.UPLOAD);
-        S7RequestMessage readVarRequest = new S7RequestMessage(
-            MessageType.JOB,
-            (short) 1,
-            Collections.singletonList(mockParameter),
-            Collections.emptyList(),
-            null);
-        Assertions.assertThrows(NotImplementedException.class,
-            () -> S7ResponseSizeEstimator.getEstimatedResponseMessageSize(readVarRequest));
-    }
-
-    @Test
-    void getEstimatedResponseReadItemTotalSize() {
-        short size = S7ResponseSizeEstimator.getEstimatedResponseReadItemTotalSize(
-            new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                TransportSize.BYTE, 1, (short) 1, (short) 0, (byte) 0),
-            null
-        );
-        assertEquals(5, size);
-    }
-
-    @Test
-    void getEstimatedResponseWriteItemTotalSize() {
-        short size = S7ResponseSizeEstimator.getEstimatedResponseReadItemTotalSize(
-            new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                TransportSize.BYTE, 1, (short) 1, (short) 0, (byte) 0),
-            new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {(byte) 0x01})
-        );
-        assertEquals(1, size);
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.netty.util;
+
+import org.apache.commons.lang3.NotImplementedException;
+import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
+import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
+import org.apache.plc4x.java.s7.netty.model.params.SetupCommunicationParameter;
+import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
+import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
+import org.apache.plc4x.java.s7.netty.model.types.*;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.Collections;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class S7ResponseSizeEstimatorTest {
+
+    @Test
+    void getEstimatedReadVarResponseSize() {
+        S7RequestMessage readVarRequest = new S7RequestMessage(
+            MessageType.JOB,
+            (short) 1,
+            Collections.singletonList(
+                new VarParameter(ParameterType.READ_VAR, Collections.singletonList(
+                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                        TransportSize.BOOL, 1, (short) 1, (short) 0, (byte) 0)))),
+            Collections.emptyList(),
+            null);
+        short size = S7ResponseSizeEstimator.getEstimatedResponseMessageSize(readVarRequest);
+        assertEquals(20, size);
+    }
+
+    @Test
+    void getEstimatedWriteVarResponseSize() {
+        S7RequestMessage readVarRequest = new S7RequestMessage(
+            MessageType.JOB,
+            (short) 1,
+            Collections.singletonList(
+                new VarParameter(ParameterType.WRITE_VAR, Collections.singletonList(
+                    new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                        TransportSize.BYTE, 1, (short) 1, (short) 0, (byte) 0)))),
+            Collections.singletonList(
+                new VarPayload(ParameterType.WRITE_VAR, Collections.singletonList(
+                    new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD,
+                        new byte[] {(byte) 0x01})))),
+            null);
+        short size = S7ResponseSizeEstimator.getEstimatedResponseMessageSize(readVarRequest);
+        assertEquals(15, size);
+    }
+
+    @Test
+    void getEstimatedSetupCommunicationResponseSize() {
+        S7RequestMessage readVarRequest = new S7RequestMessage(
+            MessageType.JOB,
+            (short) 1,
+            Collections.singletonList(
+                new SetupCommunicationParameter((short) 1, (short) 2, (short) 250)),
+            Collections.emptyList(),
+            null);
+        short size = S7ResponseSizeEstimator.getEstimatedResponseMessageSize(readVarRequest);
+        assertEquals(20, size);
+    }
+
+    @Test
+    void getEstimatedUnimplementedParameterItemTypeResponseSize() {
+        S7Parameter mockParameter = mock(S7Parameter.class);
+        when(mockParameter.getType()).thenReturn(ParameterType.UPLOAD);
+        S7RequestMessage readVarRequest = new S7RequestMessage(
+            MessageType.JOB,
+            (short) 1,
+            Collections.singletonList(mockParameter),
+            Collections.emptyList(),
+            null);
+        Assertions.assertThrows(NotImplementedException.class,
+            () -> S7ResponseSizeEstimator.getEstimatedResponseMessageSize(readVarRequest));
+    }
+
+    @Test
+    void getEstimatedResponseReadItemTotalSize() {
+        short size = S7ResponseSizeEstimator.getEstimatedResponseReadItemTotalSize(
+            new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                TransportSize.BYTE, 1, (short) 1, (short) 0, (byte) 0),
+            null
+        );
+        assertEquals(5, size);
+    }
+
+    @Test
+    void getEstimatedResponseWriteItemTotalSize() {
+        short size = S7ResponseSizeEstimator.getEstimatedResponseReadItemTotalSize(
+            new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                TransportSize.BYTE, 1, (short) 1, (short) 0, (byte) 0),
+            new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {(byte) 0x01})
+        );
+        assertEquals(1, size);
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelperTest.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelperTest.java
index b52f39379b4..a872cc4024f 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelperTest.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/util/S7SizeHelperTest.java
@@ -1,119 +1,119 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.netty.util;
-
-import static org.hamcrest.core.Is.is;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import org.apache.plc4x.java.s7.netty.model.params.CpuServicesRequestParameter;
-import org.apache.plc4x.java.s7.netty.model.params.SetupCommunicationParameter;
-import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
-import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
-import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
-import org.apache.plc4x.java.s7.netty.model.types.*;
-import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.Collections;
-
-public class S7SizeHelperTest {
-
-    @Test
-    public void getParametersLengthTest() {
-        assertThat(S7SizeHelper.getParametersLength(null), is((short) 0));
-        assertThat(S7SizeHelper.getParametersLength(Collections.emptyList()), is((short) 0));
-        assertThat(S7SizeHelper.getParametersLength(Arrays.asList(
-            new SetupCommunicationParameter((short) 8, (short)8, (short)250),
-            new VarParameter(ParameterType.READ_VAR, Collections.singletonList(
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 0, (short) 0, (byte) 0))))), is((short) 22));
-    }
-
-    @Test
-    public void getPayloadsLengthTest() {
-        assertThat(S7SizeHelper.getPayloadsLength(null), is((short) 0));
-        assertThat(S7SizeHelper.getPayloadsLength(Collections.emptyList()), is((short) 0));
-        assertThat(S7SizeHelper.getPayloadsLength(Collections.singletonList(
-            new VarPayload(ParameterType.READ_VAR, Collections.singletonList(new VarPayloadItem(
-                DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[]{
-                (byte) 0x01}))))), is((short) 5));
-    }
-
-    @Test
-    public void getParameterLengthTest() {
-        assertThat(S7SizeHelper.getParameterLength(
-            new CpuServicesRequestParameter(CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
-                CpuServicesParameterSubFunctionGroup.READ_SSL, (byte) 0)), is((short) 8));
-        assertThat(S7SizeHelper.getParameterLength(
-            new SetupCommunicationParameter((short) 8, (short)8, (short)250)), is((short) 8));
-        assertThat(S7SizeHelper.getParameterLength(
-            new VarParameter(ParameterType.READ_VAR, Collections.emptyList())), is((short) 2));
-        assertThat(S7SizeHelper.getParameterLength(
-            new VarParameter(ParameterType.READ_VAR, Collections.singletonList(
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 0, (short) 0, (byte) 0)))), is((short) 14));
-        assertThat(S7SizeHelper.getParameterLength(
-            new VarParameter(ParameterType.WRITE_VAR, Collections.emptyList())), is((short) 2));
-        assertThat(S7SizeHelper.getParameterLength(
-            new VarParameter(ParameterType.WRITE_VAR, Collections.singletonList(
-                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-                    TransportSize.BYTE, (short) 1, (short) 0, (short) 0, (byte) 0)))), is((short) 14));
-    }
-
-    @Test
-    public void getPayloadLengthFromParameterTest() {
-        // One bit is transferred inside one byte (4 byte header and one payload)
-        assertThat(S7SizeHelper.getPayloadLength(new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-            TransportSize.BOOL, (short) 1, (short) 0, (short) 0, (byte) 0)), is((short) 5));
-        assertThat(S7SizeHelper.getPayloadLength(new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-            TransportSize.BYTE, (short) 1, (short) 0, (short) 0, (byte) 0)), is((short) 5));
-        assertThat(S7SizeHelper.getPayloadLength(new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-            TransportSize.BYTE, (short) 42, (short) 0, (short) 0, (byte) 0)), is((short) 46));
-        assertThat(S7SizeHelper.getPayloadLength(new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-            TransportSize.DWORD, (short) 1, (short) 0, (short) 0, (byte) 0)), is((short) 8));
-        assertThat(S7SizeHelper.getPayloadLength(new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
-            TransportSize.DWORD, (short) 42, (short) 0, (short) 0, (byte) 0)), is((short) 172));
-    }
-
-    @Test
-    public void getPayloadLengthFromPayloadTest() {
-        assertThat(S7SizeHelper.getPayloadLength(new VarPayloadItem(
-            DataTransportErrorCode.OK, DataTransportSize.BIT, new byte[] {
-                (byte) 0x01})), is((short) 5));
-        assertThat(S7SizeHelper.getPayloadLength(new VarPayloadItem(
-            DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {
-                (byte) 0x01})), is((short) 5));
-        assertThat(S7SizeHelper.getPayloadLength(new VarPayloadItem(
-            DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {
-                (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04, (byte) 0x05})), is((short) 9));
-        assertThat(S7SizeHelper.getPayloadLength(new VarPayloadItem(
-            DataTransportErrorCode.OK, DataTransportSize.REAL, new byte[] {
-                (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04})), is((short) 8));
-        assertThat(S7SizeHelper.getPayloadLength(new VarPayloadItem(
-            DataTransportErrorCode.OK, DataTransportSize.REAL, new byte[] {
-                (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04,
-                (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04,
-                (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04,
-                (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04})), is((short) 20));
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.netty.util;
+
+import static org.hamcrest.core.Is.is;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.apache.plc4x.java.s7.netty.model.params.CpuServicesRequestParameter;
+import org.apache.plc4x.java.s7.netty.model.params.SetupCommunicationParameter;
+import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
+import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
+import org.apache.plc4x.java.s7.netty.model.types.*;
+import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+public class S7SizeHelperTest {
+
+    @Test
+    public void getParametersLengthTest() {
+        assertThat(S7SizeHelper.getParametersLength(null), is((short) 0));
+        assertThat(S7SizeHelper.getParametersLength(Collections.emptyList()), is((short) 0));
+        assertThat(S7SizeHelper.getParametersLength(Arrays.asList(
+            new SetupCommunicationParameter((short) 8, (short)8, (short)250),
+            new VarParameter(ParameterType.READ_VAR, Collections.singletonList(
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 0, (short) 0, (byte) 0))))), is((short) 22));
+    }
+
+    @Test
+    public void getPayloadsLengthTest() {
+        assertThat(S7SizeHelper.getPayloadsLength(null), is((short) 0));
+        assertThat(S7SizeHelper.getPayloadsLength(Collections.emptyList()), is((short) 0));
+        assertThat(S7SizeHelper.getPayloadsLength(Collections.singletonList(
+            new VarPayload(ParameterType.READ_VAR, Collections.singletonList(new VarPayloadItem(
+                DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[]{
+                (byte) 0x01}))))), is((short) 5));
+    }
+
+    @Test
+    public void getParameterLengthTest() {
+        assertThat(S7SizeHelper.getParameterLength(
+            new CpuServicesRequestParameter(CpuServicesParameterFunctionGroup.CPU_FUNCTIONS,
+                CpuServicesParameterSubFunctionGroup.READ_SSL, (byte) 0)), is((short) 8));
+        assertThat(S7SizeHelper.getParameterLength(
+            new SetupCommunicationParameter((short) 8, (short)8, (short)250)), is((short) 8));
+        assertThat(S7SizeHelper.getParameterLength(
+            new VarParameter(ParameterType.READ_VAR, Collections.emptyList())), is((short) 2));
+        assertThat(S7SizeHelper.getParameterLength(
+            new VarParameter(ParameterType.READ_VAR, Collections.singletonList(
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 0, (short) 0, (byte) 0)))), is((short) 14));
+        assertThat(S7SizeHelper.getParameterLength(
+            new VarParameter(ParameterType.WRITE_VAR, Collections.emptyList())), is((short) 2));
+        assertThat(S7SizeHelper.getParameterLength(
+            new VarParameter(ParameterType.WRITE_VAR, Collections.singletonList(
+                new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+                    TransportSize.BYTE, (short) 1, (short) 0, (short) 0, (byte) 0)))), is((short) 14));
+    }
+
+    @Test
+    public void getPayloadLengthFromParameterTest() {
+        // One bit is transferred inside one byte (4 byte header and one payload)
+        assertThat(S7SizeHelper.getPayloadLength(new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+            TransportSize.BOOL, (short) 1, (short) 0, (short) 0, (byte) 0)), is((short) 5));
+        assertThat(S7SizeHelper.getPayloadLength(new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+            TransportSize.BYTE, (short) 1, (short) 0, (short) 0, (byte) 0)), is((short) 5));
+        assertThat(S7SizeHelper.getPayloadLength(new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+            TransportSize.BYTE, (short) 42, (short) 0, (short) 0, (byte) 0)), is((short) 46));
+        assertThat(S7SizeHelper.getPayloadLength(new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+            TransportSize.DWORD, (short) 1, (short) 0, (short) 0, (byte) 0)), is((short) 8));
+        assertThat(S7SizeHelper.getPayloadLength(new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
+            TransportSize.DWORD, (short) 42, (short) 0, (short) 0, (byte) 0)), is((short) 172));
+    }
+
+    @Test
+    public void getPayloadLengthFromPayloadTest() {
+        assertThat(S7SizeHelper.getPayloadLength(new VarPayloadItem(
+            DataTransportErrorCode.OK, DataTransportSize.BIT, new byte[] {
+                (byte) 0x01})), is((short) 5));
+        assertThat(S7SizeHelper.getPayloadLength(new VarPayloadItem(
+            DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {
+                (byte) 0x01})), is((short) 5));
+        assertThat(S7SizeHelper.getPayloadLength(new VarPayloadItem(
+            DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {
+                (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04, (byte) 0x05})), is((short) 9));
+        assertThat(S7SizeHelper.getPayloadLength(new VarPayloadItem(
+            DataTransportErrorCode.OK, DataTransportSize.REAL, new byte[] {
+                (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04})), is((short) 8));
+        assertThat(S7SizeHelper.getPayloadLength(new VarPayloadItem(
+            DataTransportErrorCode.OK, DataTransportSize.REAL, new byte[] {
+                (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04,
+                (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04,
+                (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04,
+                (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04})), is((short) 20));
+    }
+
+}
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/types/S7DataTypeTest.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/types/S7DataTypeTest.java
index 5bd27248d9b..68167cfdd73 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/types/S7DataTypeTest.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/types/S7DataTypeTest.java
@@ -1,57 +1,57 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.s7.types;
-
-import org.apache.plc4x.test.FastTests;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-
-public class S7DataTypeTest {
-
-/*    @Test
-    @Category(FastTests.class)
-    public void findMatchingTypeRedundantInformation() {
-        S7DataType result = S7DataType.findMatchingType(Integer.class, S7DataType.UINT, "W");
-        assertThat(result, equalTo(S7DataType.UINT));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void findMatchingTypeMissingSizeCode() {
-        S7DataType result = S7DataType.findMatchingType(Integer.class, S7DataType.UINT, null);
-        assertThat(result, equalTo(S7DataType.UINT));
-    }
-
-    @Test
-    @Category(FastTests.class)
-    public void findMatchingTypeBaseTypeAndSizeCode() {
-        S7DataType result = S7DataType.findMatchingType(Integer.class, S7DataType.INT, "W");
-        assertThat(result, equalTo(S7DataType.UINT));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    @Category(FastTests.class)
-    public void findMatchingTypeBaseTypeAndWrongSizeCode() {
-        S7DataType result = S7DataType.findMatchingType(Integer.class, S7DataType.INT, "X");
-        assertThat(result, equalTo(S7DataType.UINT));
-    }*/
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.s7.types;
+
+import org.apache.plc4x.test.FastTests;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+
+public class S7DataTypeTest {
+
+/*    @Test
+    @Category(FastTests.class)
+    public void findMatchingTypeRedundantInformation() {
+        S7DataType result = S7DataType.findMatchingType(Integer.class, S7DataType.UINT, "W");
+        assertThat(result, equalTo(S7DataType.UINT));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void findMatchingTypeMissingSizeCode() {
+        S7DataType result = S7DataType.findMatchingType(Integer.class, S7DataType.UINT, null);
+        assertThat(result, equalTo(S7DataType.UINT));
+    }
+
+    @Test
+    @Category(FastTests.class)
+    public void findMatchingTypeBaseTypeAndSizeCode() {
+        S7DataType result = S7DataType.findMatchingType(Integer.class, S7DataType.INT, "W");
+        assertThat(result, equalTo(S7DataType.UINT));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    @Category(FastTests.class)
+    public void findMatchingTypeBaseTypeAndWrongSizeCode() {
+        S7DataType result = S7DataType.findMatchingType(Integer.class, S7DataType.INT, "X");
+        assertThat(result, equalTo(S7DataType.UINT));
+    }*/
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/utils/S7TsapIdEncoderTest.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/utils/S7TsapIdEncoderTest.java
index bae498f851a..fb9c210b788 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/utils/S7TsapIdEncoderTest.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/utils/S7TsapIdEncoderTest.java
@@ -1,68 +1,68 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.s7.utils;
-
-import org.apache.plc4x.java.isotp.protocol.model.types.DeviceGroup;
-import org.junit.jupiter.api.Test;
-
-import java.lang.reflect.Constructor;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-
-class S7TsapIdEncoderTest {
-
-    @Test
-    void testConstructorPrivacy() {
-        // Check that every declared constructor is inaccessible.
-        for (Constructor<?> declaredConstructor : S7TsapIdEncoder.class.getDeclaredConstructors()) {
-            assertThat(declaredConstructor.isAccessible(), equalTo(false));
-        }
-    }
-
-    @Test
-    void encodeS7TsapId() {
-        short tsapId = S7TsapIdEncoder.encodeS7TsapId(DeviceGroup.PG_OR_PC, 1, 2);
-
-        assertThat(tsapId, equalTo((short) 0x112));
-    }
-
-    @Test
-    void decodeDeviceGroup() {
-        DeviceGroup deviceGroup = S7TsapIdEncoder.decodeDeviceGroup((short) 0x112);
-
-        assertThat(deviceGroup, equalTo(DeviceGroup.PG_OR_PC));
-    }
-
-    @Test
-    void decodeRack() {
-        int rack = S7TsapIdEncoder.decodeRack((short) 0x112);
-
-        assertThat(rack, equalTo(1));
-    }
-
-    @Test
-    void decodeSlot() {
-        int slot = S7TsapIdEncoder.decodeSlot((short) 0x112);
-
-        assertThat(slot, equalTo(2));
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.s7.utils;
+
+import org.apache.plc4x.java.isotp.protocol.model.types.DeviceGroup;
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Constructor;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+
+class S7TsapIdEncoderTest {
+
+    @Test
+    void testConstructorPrivacy() {
+        // Check that every declared constructor is inaccessible.
+        for (Constructor<?> declaredConstructor : S7TsapIdEncoder.class.getDeclaredConstructors()) {
+            assertThat(declaredConstructor.isAccessible(), equalTo(false));
+        }
+    }
+
+    @Test
+    void encodeS7TsapId() {
+        short tsapId = S7TsapIdEncoder.encodeS7TsapId(DeviceGroup.PG_OR_PC, 1, 2);
+
+        assertThat(tsapId, equalTo((short) 0x112));
+    }
+
+    @Test
+    void decodeDeviceGroup() {
+        DeviceGroup deviceGroup = S7TsapIdEncoder.decodeDeviceGroup((short) 0x112);
+
+        assertThat(deviceGroup, equalTo(DeviceGroup.PG_OR_PC));
+    }
+
+    @Test
+    void decodeRack() {
+        int rack = S7TsapIdEncoder.decodeRack((short) 0x112);
+
+        assertThat(rack, equalTo(1));
+    }
+
+    @Test
+    void decodeSlot() {
+        int slot = S7TsapIdEncoder.decodeSlot((short) 0x112);
+
+        assertThat(slot, equalTo(2));
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/protocols/s7/src/test/resources/META-INF/services/com.athaydes.spockframework.report.IReportCreator.properties b/plc4j/protocols/s7/src/test/resources/META-INF/services/com.athaydes.spockframework.report.IReportCreator.properties
index 0759363d08a..3eba24ca463 100644
--- a/plc4j/protocols/s7/src/test/resources/META-INF/services/com.athaydes.spockframework.report.IReportCreator.properties
+++ b/plc4j/protocols/s7/src/test/resources/META-INF/services/com.athaydes.spockframework.report.IReportCreator.properties
@@ -1,66 +1,66 @@
-#
-# 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
-#
-#     http://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.
-#
-
-# Name of the implementation class(es) of report creator(s) to enable (separate multiple entries with commas)
-# Currently supported classes are:
-#   1. com.athaydes.spockframework.report.internal.HtmlReportCreator
-#   2. com.athaydes.spockframework.report.template.TemplateReportCreator
-com.athaydes.spockframework.report.IReportCreator=com.athaydes.spockframework.report.internal.HtmlReportCreator
-
-# Set properties of the report creator
-# For the HtmlReportCreator, the only properties available are
-# (the location of the css files is relative to the classpath):
-com.athaydes.spockframework.report.internal.HtmlReportCreator.featureReportCss=spock-feature-report.css
-com.athaydes.spockframework.report.internal.HtmlReportCreator.summaryReportCss=spock-summary-report.css
-com.athaydes.spockframework.report.internal.HtmlReportCreator.printThrowableStackTrace=false
-com.athaydes.spockframework.report.internal.HtmlReportCreator.inlineCss=true
-com.athaydes.spockframework.report.internal.HtmlReportCreator.enabled=true
-# options are: "class_name_and_title", "class_name", "title"
-com.athaydes.spockframework.report.internal.HtmlReportCreator.specSummaryNameOption=class_name_and_title
-
-# exclude Specs Table of Contents
-com.athaydes.spockframework.report.internal.HtmlReportCreator.excludeToc=false
-
-# Output directory (where the spock reports will be created) - relative to working directory
-com.athaydes.spockframework.report.outputDir=target/spock-reports
-
-# Output directory where to store the aggregated JSON report (used to support parallel builds)
-com.athaydes.spockframework.report.aggregatedJsonReportDir=
-
-# If set to true, hides blocks which do not have any description
-com.athaydes.spockframework.report.hideEmptyBlocks=false
-
-# Set the name of the project under test so it can be displayed in the report
-com.athaydes.spockframework.report.projectName=
-
-# Set the version of the project under test so it can be displayed in the report
-com.athaydes.spockframework.report.projectVersion=Unknown
-
-# Show the source code for each block
-com.athaydes.spockframework.report.showCodeBlocks=false
-
-# Set the root location of the Spock test source code (only used if showCodeBlocks is 'true')
-com.athaydes.spockframework.report.testSourceRoots=src/test/groovy
-
-# Set properties specific to the TemplateReportCreator
-com.athaydes.spockframework.report.template.TemplateReportCreator.specTemplateFile=/templateReportCreator/spec-template.md
-com.athaydes.spockframework.report.template.TemplateReportCreator.reportFileExtension=md
-com.athaydes.spockframework.report.template.TemplateReportCreator.summaryTemplateFile=/templateReportCreator/summary-template.md
-com.athaydes.spockframework.report.template.TemplateReportCreator.summaryFileName=summary.md
+#
+# 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
+#
+#     http://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.
+#
+
+# Name of the implementation class(es) of report creator(s) to enable (separate multiple entries with commas)
+# Currently supported classes are:
+#   1. com.athaydes.spockframework.report.internal.HtmlReportCreator
+#   2. com.athaydes.spockframework.report.template.TemplateReportCreator
+com.athaydes.spockframework.report.IReportCreator=com.athaydes.spockframework.report.internal.HtmlReportCreator
+
+# Set properties of the report creator
+# For the HtmlReportCreator, the only properties available are
+# (the location of the css files is relative to the classpath):
+com.athaydes.spockframework.report.internal.HtmlReportCreator.featureReportCss=spock-feature-report.css
+com.athaydes.spockframework.report.internal.HtmlReportCreator.summaryReportCss=spock-summary-report.css
+com.athaydes.spockframework.report.internal.HtmlReportCreator.printThrowableStackTrace=false
+com.athaydes.spockframework.report.internal.HtmlReportCreator.inlineCss=true
+com.athaydes.spockframework.report.internal.HtmlReportCreator.enabled=true
+# options are: "class_name_and_title", "class_name", "title"
+com.athaydes.spockframework.report.internal.HtmlReportCreator.specSummaryNameOption=class_name_and_title
+
+# exclude Specs Table of Contents
+com.athaydes.spockframework.report.internal.HtmlReportCreator.excludeToc=false
+
+# Output directory (where the spock reports will be created) - relative to working directory
+com.athaydes.spockframework.report.outputDir=target/spock-reports
+
+# Output directory where to store the aggregated JSON report (used to support parallel builds)
+com.athaydes.spockframework.report.aggregatedJsonReportDir=
+
+# If set to true, hides blocks which do not have any description
+com.athaydes.spockframework.report.hideEmptyBlocks=false
+
+# Set the name of the project under test so it can be displayed in the report
+com.athaydes.spockframework.report.projectName=
+
+# Set the version of the project under test so it can be displayed in the report
+com.athaydes.spockframework.report.projectVersion=Unknown
+
+# Show the source code for each block
+com.athaydes.spockframework.report.showCodeBlocks=false
+
+# Set the root location of the Spock test source code (only used if showCodeBlocks is 'true')
+com.athaydes.spockframework.report.testSourceRoots=src/test/groovy
+
+# Set properties specific to the TemplateReportCreator
+com.athaydes.spockframework.report.template.TemplateReportCreator.specTemplateFile=/templateReportCreator/spec-template.md
+com.athaydes.spockframework.report.template.TemplateReportCreator.reportFileExtension=md
+com.athaydes.spockframework.report.template.TemplateReportCreator.summaryTemplateFile=/templateReportCreator/summary-template.md
+com.athaydes.spockframework.report.template.TemplateReportCreator.summaryFileName=summary.md
 com.athaydes.spockframework.report.template.TemplateReportCreator.enabled=true
\ No newline at end of file
diff --git a/plc4j/protocols/s7/src/test/resources/logback.xml b/plc4j/protocols/s7/src/test/resources/logback.xml
index a8ddebbe5ba..3e761eafa34 100644
--- a/plc4j/protocols/s7/src/test/resources/logback.xml
+++ b/plc4j/protocols/s7/src/test/resources/logback.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoders are assigned the type
-         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="trace">
-    <appender-ref ref="STDOUT" />
-  </root>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="trace">
+    <appender-ref ref="STDOUT" />
+  </root>
+
 </configuration>
\ No newline at end of file
diff --git a/plc4j/protocols/src/site/asciidoc/developers/implementing-drivers.adoc b/plc4j/protocols/src/site/asciidoc/developers/implementing-drivers.adoc
index f49c871ae8e..601cfa4ec2b 100644
--- a/plc4j/protocols/src/site/asciidoc/developers/implementing-drivers.adoc
+++ b/plc4j/protocols/src/site/asciidoc/developers/implementing-drivers.adoc
@@ -1,248 +1,248 @@
-//
-//  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
-//
-//      http://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.
-//
-:imagesdir: ./../images/
-
-== Implementing Drivers
-
-All Java drivers are implemented using https://netty.io/[Netty] which sort of evolved from https://mina.apache.org/[Apache Mina].
-
-Usually the protocols used in industrial controllers are layered protocols in which one protocol is embedded in another.
-Some times several layers can be involved. Also some times, depending on the mode a protocol is used in, one protocol can be embedded in different containers.
-
-We decided not to implement each driver in one monolithic block of code, but modeled each protocol layer separately.
-This makes the implementation and testing a lot simpler and makes the entire architecture much more flexible.
-
-Two examples would be `Modbus` and the `S7` protocol:
-The TCP variant of the `Modbus` Protocol is nothing more than adding a TCP header to a normal serial Modbus message.
-So by layering the implementations we can serve both the serial as the TCP variant with the same driver logic for the `Modbus` protocol.
-
-The `S7` Protocol is built to be transported using a protocol called `ISO TP`.
-When using the normal `TCP` communication, this is again embedded in a `ISO over TCP` protocol frame, which is then included in a `TCP` packet.
-However it is also possible to use it on native `Ethernet` Frames.
-This high-performance and reduced latency implementation would directly transport `ISO TP` packets in native `Ethernet` frames.
-
-Keeping the drivers layered, gives us the flexibility to support this.
-
-While the layers control `what` is communicated with the outside world, we have also defined a set of connectors that implement `how` our driver communicates with it.
-
-All is then put together in a so-called `pipeline`.
-
-A PLC4X driver is responsible for creating a connection.
-This connection is a synonym for a new instance of a Netty pipeline which is terminated with a corresponding connector.
-
-[ditaa,netty-pipeline]
-....
-
-
-  +------------------------------------------+
-  |c0BA                                      |
-  |               Application                |  Application
-  |                                          |
-  +---------+--------------------------------+
-            |                      ^
- - - - - - -|- - - - - - - - - - - | - - - - - - - - - - -
-            v                      |
-  +--------------------------------+---------+
-  |c05A                                      |
-  |                  PLC4X                   |
-  |                                          |
-  +---------+--------------------------------+
-  |         |                      ^         |
-  |         v                      |         |
-  |  +------------------------------------+  |
-  |  |cAAA                                |  |
-  |  |      PLC4X Driver Connection       |  |
-  |  |                                    |  |
-  |  +------+-----------------------------+  |
-  |  |      |                      ^      |  |
-  |  |      v                      |      |  |
-  |  |  +--------------------------+---+  |  |
-  |  |  |cAAA                          |  |  |
-  |  |  |     PLC4X Protocol Layer     |  |  |
-  |  |  |                              |  |  |
-  |  |  +---+--------------------------+  |  |
-  |  |      |                      ^      |  |
-  |  |      v                      |      |  |
-  |  |  +--------------------------+---+  |  |
-  |  |  :           Optional           |  |  |  PLC4X
-  |  |  |      Protocol Layer(s)       |  |  |  Netty
-  |  |  |                              |  |  |  Pipeline
-  |  |  +---+--------------------------+  |  |
-  |  |      |                      ^      |  |
-  |  |      v                      |      |  |
-  |  |  +--------------------------+---+  |  |
-  |  |  |cAAA                          |  |  |
-  |  |  |        Protocol Layer        |  |  |
-  |  |  |                              |  |  |
-  |  |  +---+--------------------------+  |  |
-  |  |      |                      ^      |  |
-  |  |      v                      |      |  |
-  |  +-----------------------------+------+  |
-  |  |cAAA                                |  |
-  |  |             Connector              |  |
-  |  |                                    |  |
-  +--+------+-----------------------------+--+
-            |                      ^
- - - - - - -|- - - - - - - - - - - | - - - - - - - - - - -
-            v                      |
-  +--------------------------------+---------+
-  |cF6F                                      |
-  |                   PLC                    |  Device
-  |                                          |
-  +------------------------------------------+
-....
-
-== Default Layers
-
-Each driver should consist of at least 2 layers:
-
-- The PLC4X Layer
-- The Protocol Layer
-
-=== The PLC4X Layer
-
-The main objective of this layer is to translate PLC4X requests into messages the target protocol understands.
-It also acts as the bridge to link the requests and corresponding responses.
-This is also the layer on which emulation of functionality should be implemented.
-
-For example S7 controllers allow reading of multiple addresses in one request.
-However they do not support writing of multiple values at once.
-The `Plc4XS7Protocol` takes care of sending multiple single-value requests to the PLC to simulate writing of multiple values.
-This simulation however should be transparent from the underlying protocol implementations.
-
-=== The Protocol Layer(s)
-
-The protocol layer(s) are responsible for encoding and decoding messages of the protocol they belong to.
-So usually we require at least one of these layers for every driver.
-
-== Connectors
-
-We currently have defined 4 different types of connectors:
-
-- Tcp Socket
-- Raw Socket
-- Serial
-- Test
-
-But this list can easily be extended as needed.
-
-=== Tcp Sockets
-
-This is the default type of connector used when implementing protocols using the normal TCP protocol.
-It is what comes with Netty out of the box and should be used if possible.
-
-=== Raw Sockets
-
-This is a special form of connector that allows implementing protocols below the TCP level.
-This is also where things start getting a little more complicated.
-As Java doesn't support communication below TCP and UDP, this option makes use of the `Java Native Interface (JNI)` to access native libs that then implement the functionality on OS level.
-The library used for this is called `libpcap` (for Linux and Mac) or `winpcap` for Windows.
-Also as creating of raw sockets requires elevated user permissions the application has to be run as `root` or (preferred option) the library has to be setup to run with root privileges (`setuid`).
-
-When setup correctly the raw socket connector allows implementing protocols right down to manually constructing `Ehternet` frames.
-
-This is currently treated as a temporary solution as we have to collect experience with this approach. Perhaps native transports implemented as part of the PLC4X project might be the more performant solution.
-
-=== Serial
-
-This connector doesn't open any form of network interface, but uses the operating systems serial ports for communication.
-It is used by some of the protocols that don't support Networking, such as the serial variant of the Modbus protocol.
-
-=== Test
-
-This connector is used for testing purposes.
-Instead of opening a connection to a device using a normal communication channel, this connector is made to be used inside unit- and integration-tests.
-It allows to manually send and receive (binary) data to and from a pipeline for testing.
-
-== Implementing a custom driver
-
-PLC4X's `DriverManager` finds it's drivers, by using the default `Java ServiceLoader`.
-This requires a file called `org.apache.plc4x.java.spi.PlcDriver` in the `META-INF/services` directory of the drivers JAR file.
-For each type of driver provided inside this JAR, one line has to be added to this file containing the fully qualified class name of the driver implementation.
-
-For the S7 driver for example all it contains is this line:
-
-    org.apache.plc4x.java.s7.S7PlcDriver
-
-A driver implementation must implement the `org.apache.plc4x.java.spi.PlcDriver` interface.
-This defines the necessary methods for the `DriverManager` to find the correct implementation and create a new connection instance.
-
-The important methods here are:
-
-- getProtocolCode
-- connect(String url)
-- connect(String url, PlcAuthentication authentication)
-
-`getProtocolCode` is used to find a driver suitable for providing a connection mathing the prefix of the PLC4X connection string.
-
-So if for example the connection string is:
-
-   s7://192.168.0.1/1/
-
-The DriverManager will look if he can find a PlcDriver implementation for which `getProtocolCode` method returns the string "s7".
-If no form of `PlcAuthentication` is provided, the normal `connect` method is then used to create a new connection instance.
-If however authentication information is provided, the second connect method is used.
-However we still have to find and implement a protocol that actually supports authentication.
-
-The probably simplest way to implement a custom connection is to extend `org.apache.plc4x.java.base.connection.NettyPlcConnection`.
-This allows passing in a `ChannelFactory` instance, which allows overriding the default communication channel used by the driver.
-
-An `AbstractPlcConnection` is required to implement a method called `getChannelHandler`.
-This is responsible for constructing the communication pipeline.
-
-Here is an example of the connection for the TCP variant of the `Modbus` protocol:
-
-....
-    public class ModbusTcpPlcConnection extends BaseModbusPlcConnection {
-
-        private static final int MODBUS_TCP_PORT = 502;
-
-        public ModbusTcpPlcConnection(InetAddress address, String params) {
-            this(new TcpSocketChannelFactory(address, MODBUS_TCP_PORT), params);
-            logger.info("Configured ModbusTcpPlcConnection with: host-name {}", address.getHostAddress());
-        }
-
-        ModbusTcpPlcConnection(ChannelFactory channelFactory, String params) {
-            super(channelFactory, params);
-        }
-
-        @Override
-        protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
-            return new ChannelInitializer() {
-                @Override
-                protected void initChannel(Channel channel) {
-                    // Build the protocol stack for communicating with the modbus protocol.
-                    ChannelPipeline pipeline = channel.pipeline();
-                    pipeline.addLast(new ModbusTcpProtocol());
-                    pipeline.addLast(new ModbusProtocol());
-                    pipeline.addLast(new Plc4XModbusProtocol());
-                }
-            };
-        }
-
-    }
-....
-
-As you can see in above example there are two constructors.
-The first one is the default, which establishes a connection using the default connector.
-As the TCP variant of the `Modbus` protocol uses normal TCP, a `TcpSocketChannelFactory` instance is used.
-However in order to test the driver, a unit- or integration-test can use the second constructor to inject a different `ChannelFactory`.
-Notice that this constructor can be package-private if the test-case is in the same package.
-Here the `TestConnectionFactory` will allow creating tests without having to worry about the physical connection and all problems that come with it.
-
-The pipeline itself is created in the `getChannelHandler` method.
-Here you have to keep in mind that the layer that is closest to the connection has to be added first, the `PLC4X Layer` last.
+//
+//  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
+//
+//      http://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.
+//
+:imagesdir: ./../images/
+
+== Implementing Drivers
+
+All Java drivers are implemented using https://netty.io/[Netty] which sort of evolved from https://mina.apache.org/[Apache Mina].
+
+Usually the protocols used in industrial controllers are layered protocols in which one protocol is embedded in another.
+Some times several layers can be involved. Also some times, depending on the mode a protocol is used in, one protocol can be embedded in different containers.
+
+We decided not to implement each driver in one monolithic block of code, but modeled each protocol layer separately.
+This makes the implementation and testing a lot simpler and makes the entire architecture much more flexible.
+
+Two examples would be `Modbus` and the `S7` protocol:
+The TCP variant of the `Modbus` Protocol is nothing more than adding a TCP header to a normal serial Modbus message.
+So by layering the implementations we can serve both the serial as the TCP variant with the same driver logic for the `Modbus` protocol.
+
+The `S7` Protocol is built to be transported using a protocol called `ISO TP`.
+When using the normal `TCP` communication, this is again embedded in a `ISO over TCP` protocol frame, which is then included in a `TCP` packet.
+However it is also possible to use it on native `Ethernet` Frames.
+This high-performance and reduced latency implementation would directly transport `ISO TP` packets in native `Ethernet` frames.
+
+Keeping the drivers layered, gives us the flexibility to support this.
+
+While the layers control `what` is communicated with the outside world, we have also defined a set of connectors that implement `how` our driver communicates with it.
+
+All is then put together in a so-called `pipeline`.
+
+A PLC4X driver is responsible for creating a connection.
+This connection is a synonym for a new instance of a Netty pipeline which is terminated with a corresponding connector.
+
+[ditaa,netty-pipeline]
+....
+
+
+  +------------------------------------------+
+  |c0BA                                      |
+  |               Application                |  Application
+  |                                          |
+  +---------+--------------------------------+
+            |                      ^
+ - - - - - -|- - - - - - - - - - - | - - - - - - - - - - -
+            v                      |
+  +--------------------------------+---------+
+  |c05A                                      |
+  |                  PLC4X                   |
+  |                                          |
+  +---------+--------------------------------+
+  |         |                      ^         |
+  |         v                      |         |
+  |  +------------------------------------+  |
+  |  |cAAA                                |  |
+  |  |      PLC4X Driver Connection       |  |
+  |  |                                    |  |
+  |  +------+-----------------------------+  |
+  |  |      |                      ^      |  |
+  |  |      v                      |      |  |
+  |  |  +--------------------------+---+  |  |
+  |  |  |cAAA                          |  |  |
+  |  |  |     PLC4X Protocol Layer     |  |  |
+  |  |  |                              |  |  |
+  |  |  +---+--------------------------+  |  |
+  |  |      |                      ^      |  |
+  |  |      v                      |      |  |
+  |  |  +--------------------------+---+  |  |
+  |  |  :           Optional           |  |  |  PLC4X
+  |  |  |      Protocol Layer(s)       |  |  |  Netty
+  |  |  |                              |  |  |  Pipeline
+  |  |  +---+--------------------------+  |  |
+  |  |      |                      ^      |  |
+  |  |      v                      |      |  |
+  |  |  +--------------------------+---+  |  |
+  |  |  |cAAA                          |  |  |
+  |  |  |        Protocol Layer        |  |  |
+  |  |  |                              |  |  |
+  |  |  +---+--------------------------+  |  |
+  |  |      |                      ^      |  |
+  |  |      v                      |      |  |
+  |  +-----------------------------+------+  |
+  |  |cAAA                                |  |
+  |  |             Connector              |  |
+  |  |                                    |  |
+  +--+------+-----------------------------+--+
+            |                      ^
+ - - - - - -|- - - - - - - - - - - | - - - - - - - - - - -
+            v                      |
+  +--------------------------------+---------+
+  |cF6F                                      |
+  |                   PLC                    |  Device
+  |                                          |
+  +------------------------------------------+
+....
+
+== Default Layers
+
+Each driver should consist of at least 2 layers:
+
+- The PLC4X Layer
+- The Protocol Layer
+
+=== The PLC4X Layer
+
+The main objective of this layer is to translate PLC4X requests into messages the target protocol understands.
+It also acts as the bridge to link the requests and corresponding responses.
+This is also the layer on which emulation of functionality should be implemented.
+
+For example S7 controllers allow reading of multiple addresses in one request.
+However they do not support writing of multiple values at once.
+The `Plc4XS7Protocol` takes care of sending multiple single-value requests to the PLC to simulate writing of multiple values.
+This simulation however should be transparent from the underlying protocol implementations.
+
+=== The Protocol Layer(s)
+
+The protocol layer(s) are responsible for encoding and decoding messages of the protocol they belong to.
+So usually we require at least one of these layers for every driver.
+
+== Connectors
+
+We currently have defined 4 different types of connectors:
+
+- Tcp Socket
+- Raw Socket
+- Serial
+- Test
+
+But this list can easily be extended as needed.
+
+=== Tcp Sockets
+
+This is the default type of connector used when implementing protocols using the normal TCP protocol.
+It is what comes with Netty out of the box and should be used if possible.
+
+=== Raw Sockets
+
+This is a special form of connector that allows implementing protocols below the TCP level.
+This is also where things start getting a little more complicated.
+As Java doesn't support communication below TCP and UDP, this option makes use of the `Java Native Interface (JNI)` to access native libs that then implement the functionality on OS level.
+The library used for this is called `libpcap` (for Linux and Mac) or `winpcap` for Windows.
+Also as creating of raw sockets requires elevated user permissions the application has to be run as `root` or (preferred option) the library has to be setup to run with root privileges (`setuid`).
+
+When setup correctly the raw socket connector allows implementing protocols right down to manually constructing `Ehternet` frames.
+
+This is currently treated as a temporary solution as we have to collect experience with this approach. Perhaps native transports implemented as part of the PLC4X project might be the more performant solution.
+
+=== Serial
+
+This connector doesn't open any form of network interface, but uses the operating systems serial ports for communication.
+It is used by some of the protocols that don't support Networking, such as the serial variant of the Modbus protocol.
+
+=== Test
+
+This connector is used for testing purposes.
+Instead of opening a connection to a device using a normal communication channel, this connector is made to be used inside unit- and integration-tests.
+It allows to manually send and receive (binary) data to and from a pipeline for testing.
+
+== Implementing a custom driver
+
+PLC4X's `DriverManager` finds it's drivers, by using the default `Java ServiceLoader`.
+This requires a file called `org.apache.plc4x.java.spi.PlcDriver` in the `META-INF/services` directory of the drivers JAR file.
+For each type of driver provided inside this JAR, one line has to be added to this file containing the fully qualified class name of the driver implementation.
+
+For the S7 driver for example all it contains is this line:
+
+    org.apache.plc4x.java.s7.S7PlcDriver
+
+A driver implementation must implement the `org.apache.plc4x.java.spi.PlcDriver` interface.
+This defines the necessary methods for the `DriverManager` to find the correct implementation and create a new connection instance.
+
+The important methods here are:
+
+- getProtocolCode
+- connect(String url)
+- connect(String url, PlcAuthentication authentication)
+
+`getProtocolCode` is used to find a driver suitable for providing a connection mathing the prefix of the PLC4X connection string.
+
+So if for example the connection string is:
+
+   s7://192.168.0.1/1/
+
+The DriverManager will look if he can find a PlcDriver implementation for which `getProtocolCode` method returns the string "s7".
+If no form of `PlcAuthentication` is provided, the normal `connect` method is then used to create a new connection instance.
+If however authentication information is provided, the second connect method is used.
+However we still have to find and implement a protocol that actually supports authentication.
+
+The probably simplest way to implement a custom connection is to extend `org.apache.plc4x.java.base.connection.NettyPlcConnection`.
+This allows passing in a `ChannelFactory` instance, which allows overriding the default communication channel used by the driver.
+
+An `AbstractPlcConnection` is required to implement a method called `getChannelHandler`.
+This is responsible for constructing the communication pipeline.
+
+Here is an example of the connection for the TCP variant of the `Modbus` protocol:
+
+....
+    public class ModbusTcpPlcConnection extends BaseModbusPlcConnection {
+
+        private static final int MODBUS_TCP_PORT = 502;
+
+        public ModbusTcpPlcConnection(InetAddress address, String params) {
+            this(new TcpSocketChannelFactory(address, MODBUS_TCP_PORT), params);
+            logger.info("Configured ModbusTcpPlcConnection with: host-name {}", address.getHostAddress());
+        }
+
+        ModbusTcpPlcConnection(ChannelFactory channelFactory, String params) {
+            super(channelFactory, params);
+        }
+
+        @Override
+        protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
+            return new ChannelInitializer() {
+                @Override
+                protected void initChannel(Channel channel) {
+                    // Build the protocol stack for communicating with the modbus protocol.
+                    ChannelPipeline pipeline = channel.pipeline();
+                    pipeline.addLast(new ModbusTcpProtocol());
+                    pipeline.addLast(new ModbusProtocol());
+                    pipeline.addLast(new Plc4XModbusProtocol());
+                }
+            };
+        }
+
+    }
+....
+
+As you can see in above example there are two constructors.
+The first one is the default, which establishes a connection using the default connector.
+As the TCP variant of the `Modbus` protocol uses normal TCP, a `TcpSocketChannelFactory` instance is used.
+However in order to test the driver, a unit- or integration-test can use the second constructor to inject a different `ChannelFactory`.
+Notice that this constructor can be package-private if the test-case is in the same package.
+Here the `TestConnectionFactory` will allow creating tests without having to worry about the physical connection and all problems that come with it.
+
+The pipeline itself is created in the `getChannelHandler` method.
+Here you have to keep in mind that the layer that is closest to the connection has to be added first, the `PLC4X Layer` last.
diff --git a/plc4j/protocols/src/site/site.xml b/plc4j/protocols/src/site/site.xml
index 85756a74f44..33675cd7492 100644
--- a/plc4j/protocols/src/site/site.xml
+++ b/plc4j/protocols/src/site/site.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- 
- 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
- 
- http://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.
- 
- -->
-<project>
-
-  <body>
-    <menu name="Users">
-    </menu>
-    <menu name="Developers">
-      <item name="Implementing Drivers" href="developers/implementing-drivers.html"/>
-    </menu>
-  </body>
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 
+ 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
+ 
+ http://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.
+ 
+ -->
+<project>
+
+  <body>
+    <menu name="Users">
+    </menu>
+    <menu name="Developers">
+      <item name="Implementing Drivers" href="developers/implementing-drivers.html"/>
+    </menu>
+  </body>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/src/site/asciidoc/index.adoc b/plc4j/src/site/asciidoc/index.adoc
index a0f6f0c3ec6..7d4f3c1b9cd 100644
--- a/plc4j/src/site/asciidoc/index.adoc
+++ b/plc4j/src/site/asciidoc/index.adoc
@@ -1,100 +1,100 @@
-//
-//  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
-//
-//      http://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.
-//
-:imagesdir: images/
-
-== About PLC4J
-
-`PLC4J` is a sub-project of `PLC4X` with implementations based on `Java` targeted at runtimes for `Java 1.8` or above.
-
-One of PLC4X's core principals is, that an application using PLC4X should be independent of the PLC or protocol being used.
-
-When addressing a resource on a remote there are two parts that are dependent on the protocol and the type of PLC:
-
-- Addressing the PLC itself
-- Addressing a resource on the PLC
-
-Providing this independence to addressing the PLC itself is completely handled by the `PlcDriverManager` the application requests a connection from.
-
-Hereby the design of the `url string` passed to the `getConnection` method is greatly inspired by `JDBC`.
-
-The protocol prefix of the url specifies the type of driver being used.
-
-For example, when connecting to a Siemens PLC using the S7/Step7 Protocol, the url: `s7://192.42.0.98/1/2` causes the driver manager to create a S7 connection instance.
-The part behind the `:` is hereby used by the driver implementation to configure that particular connection.
-
-For a S7 connection, for example, this is `IP address/host name`/`rack number`/`slot number`. For different types of connections this url structure will greatly differ.
-
-As mentioned above, the second platform dependent information is the address of resources on a PLC.
-The format of an address greatly depends on the type of connection. Therefore `parseAddress` is one of the only methods defined in the `PlcConnection` interface any connection has to implement.
-
-This method returns an object implementing the `Address` interface which then can be used by the same connection to identify remote resources.
-
-[ditaa,plc4x-architecture]
-....
-+----------------------------------------------------------------------------------------------+
-|c05A                                                                                          |
-|                                                                                              |
-|                              User Application                                                |
-|                                                                                              |
-|                                                                                              |
-|                  +-----------+------------------+------------------+------------------+------+
-|                  |           |                  |                  |                  |
-|                  |           |                  |                  |                  |
-|                  |           v                  v                  v                  v
-|                  |    +-------------+    +-------------+    +-------------+    +-------------+
-|                  |    |c0BA         |    |c0BA         |    |c0BA         |    |c0BA         |
-|                  |    |   Apache    |    |   Apache    |    |   Apache    |    |   Apache    |
-|                  |    |   Kafka     |    |    Camel    |    |   Edgent    |    |    Nifi     |
-|                  |    |   Connect   |    | Integration |    | Integration |    | Integration |
-|                  |    |             |    |             |    |             |    |             |
-+---------+--------+    +------+------+    +------+------+    +------+------+    +------+------+
-          |                    |                  |                  |                  |
-          |                    |                  |                  |                  |
-          v                    v                  v                  v                  v
-+----------------------------------------------------------------------------------------------+
-|cAAA                                                                                          |
-|                                                                                              |
-|                                             PLC4X API                                        |
-|                                                                                              |
-|                                                                                              |
-+------+---------------+---------------+---------------+---------------+---------------+-------+
-       |               |               |               |               |               |
-       |               |               |               |               |               |
-       v               v               v               v               v               v
- +-----------+   +-----------+   +-----------+   +-----------+   +-----------+   +-----------+
- |c0BA       |   |c0BA       |   |c0BA       |   |c0BA       |   |c0BA       |   |c05A       |
- |  Siemens  |   | Beckhoff  |   |  Modbus   |   |  OPC UA   |   |  Emerson  |   |   User    |
- |    S7     |   |   ADS     |   |  Driver   |   |  Driver   |   |  DeltaV   |   |  Driver   |
- |  Driver   |   |  Driver   |   |           |   |           |   |  Driver   |   |           |
- |           |   |           |   |           |   |           |   |           |   |           |
- +-----------+   +-----------+   +-----------+   +-----------+   +-----------+   +-----------+
-....
-
-=== Usage
-
-Below code example connects to a remote Siemens S7 PLC using the S7/Step7 protocol and then reads the state of the `inputs` and `outputs` from this.
-
-It also demonstrates two ways this information can be accessed:
-
-- Synchronously (The application pauses, till the response is received)
-- Asynchronously (The application continues and can
-
-[source,java]
-----
-include::../../../examples/hello-world-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java[lines=19..200]
-----
-
+//
+//  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
+//
+//      http://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.
+//
+:imagesdir: images/
+
+== About PLC4J
+
+`PLC4J` is a sub-project of `PLC4X` with implementations based on `Java` targeted at runtimes for `Java 1.8` or above.
+
+One of PLC4X's core principals is, that an application using PLC4X should be independent of the PLC or protocol being used.
+
+When addressing a resource on a remote there are two parts that are dependent on the protocol and the type of PLC:
+
+- Addressing the PLC itself
+- Addressing a resource on the PLC
+
+Providing this independence to addressing the PLC itself is completely handled by the `PlcDriverManager` the application requests a connection from.
+
+Hereby the design of the `url string` passed to the `getConnection` method is greatly inspired by `JDBC`.
+
+The protocol prefix of the url specifies the type of driver being used.
+
+For example, when connecting to a Siemens PLC using the S7/Step7 Protocol, the url: `s7://192.42.0.98/1/2` causes the driver manager to create a S7 connection instance.
+The part behind the `:` is hereby used by the driver implementation to configure that particular connection.
+
+For a S7 connection, for example, this is `IP address/host name`/`rack number`/`slot number`. For different types of connections this url structure will greatly differ.
+
+As mentioned above, the second platform dependent information is the address of resources on a PLC.
+The format of an address greatly depends on the type of connection. Therefore `parseAddress` is one of the only methods defined in the `PlcConnection` interface any connection has to implement.
+
+This method returns an object implementing the `Address` interface which then can be used by the same connection to identify remote resources.
+
+[ditaa,plc4x-architecture]
+....
++----------------------------------------------------------------------------------------------+
+|c05A                                                                                          |
+|                                                                                              |
+|                              User Application                                                |
+|                                                                                              |
+|                                                                                              |
+|                  +-----------+------------------+------------------+------------------+------+
+|                  |           |                  |                  |                  |
+|                  |           |                  |                  |                  |
+|                  |           v                  v                  v                  v
+|                  |    +-------------+    +-------------+    +-------------+    +-------------+
+|                  |    |c0BA         |    |c0BA         |    |c0BA         |    |c0BA         |
+|                  |    |   Apache    |    |   Apache    |    |   Apache    |    |   Apache    |
+|                  |    |   Kafka     |    |    Camel    |    |   Edgent    |    |    Nifi     |
+|                  |    |   Connect   |    | Integration |    | Integration |    | Integration |
+|                  |    |             |    |             |    |             |    |             |
++---------+--------+    +------+------+    +------+------+    +------+------+    +------+------+
+          |                    |                  |                  |                  |
+          |                    |                  |                  |                  |
+          v                    v                  v                  v                  v
++----------------------------------------------------------------------------------------------+
+|cAAA                                                                                          |
+|                                                                                              |
+|                                             PLC4X API                                        |
+|                                                                                              |
+|                                                                                              |
++------+---------------+---------------+---------------+---------------+---------------+-------+
+       |               |               |               |               |               |
+       |               |               |               |               |               |
+       v               v               v               v               v               v
+ +-----------+   +-----------+   +-----------+   +-----------+   +-----------+   +-----------+
+ |c0BA       |   |c0BA       |   |c0BA       |   |c0BA       |   |c0BA       |   |c05A       |
+ |  Siemens  |   | Beckhoff  |   |  Modbus   |   |  OPC UA   |   |  Emerson  |   |   User    |
+ |    S7     |   |   ADS     |   |  Driver   |   |  Driver   |   |  DeltaV   |   |  Driver   |
+ |  Driver   |   |  Driver   |   |           |   |           |   |  Driver   |   |           |
+ |           |   |           |   |           |   |           |   |           |   |           |
+ +-----------+   +-----------+   +-----------+   +-----------+   +-----------+   +-----------+
+....
+
+=== Usage
+
+Below code example connects to a remote Siemens S7 PLC using the S7/Step7 protocol and then reads the state of the `inputs` and `outputs` from this.
+
+It also demonstrates two ways this information can be accessed:
+
+- Synchronously (The application pauses, till the response is received)
+- Asynchronously (The application continues and can
+
+[source,java]
+----
+include::../../../examples/hello-world-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java[lines=19..200]
+----
+
diff --git a/plc4j/src/site/asciidoc/users/gettingstarted.adoc b/plc4j/src/site/asciidoc/users/gettingstarted.adoc
index c2a692de2ab..8919d5c15ec 100644
--- a/plc4j/src/site/asciidoc/users/gettingstarted.adoc
+++ b/plc4j/src/site/asciidoc/users/gettingstarted.adoc
@@ -1,178 +1,178 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== Getting Started
-
-=== Using the PLC4X API directly
-
-In order to write a valid PLC4X Java application, all you need, is to add a dependency to the `api module`.
-When using Maven, all you need to do is add this dependency:
-
-[subs=attributes+]
-----
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>{project-version}</version>
-    </dependency>
-----
-
-This will allow you to write a valid application, that compiles fine.
-However in order to actually connect to a device using a given protocol, you need to add this protocol implementation to the classpath.
-
-For example in order to communicate with an `S7 device` using the `S7 Protocol`, you would need to add the following dependency:
-
-[subs=attributes+]
-----
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-s7</artifactId>
-      <version>{project-version}</version>
-      <scope>runtime</scope>
-    </dependency>
-----
-
-So as soon as your project has the API and a driver implementation available, you first need to get a `PlcConnection` instance.
-This is done via the `PlcDriverManager` by asking this to create an instance for a given `PLC4X connection string`.
-
-----
-String connectionString = "s7://10.10.64.20/1/1";
-
-try (PlcConnection plcConnection = new PlcDriverManager().getConnection(connectionString)) {
-
-  ... do something with the connection here ...
-
-}
-----
-
-PLC4X generally supports a very limited set of functions, which is not due to the fact, that we didn't implement things, but that PLCs generally support a very limited set of functions.
-
-The basic functions supported by PLCs and therefore supported by PLC4X are:
-
-* Read data
-* Write data
-* Subscribe for data
-* Execute functions in the PLC
-* List resources in the PLC
-
-In general we will try to offer as many features as possible.
-So if a protocol doesn't support subscription based communication it is our goal to simulate this by polling in the background so it is transparent for the users.
-
-But there are some cases in which we can't simulate or features are simply disabled intentionally:
-
-* If a PLC and/or protocol don't support executing of functions, we simply can't provide this functionality.
-* We will be providing stripped down versions of drivers, that for example intentionally don't support any writing of data and executing of functions.
-
-Therefore we use metadata to check programmatically, if a given feature is available:
-
-----
-// Check if this connection support reading of data.
-if (!plcConnection.getMetadata().canRead()) {
-  logger.error("This connection doesn't support reading.");
-  return;
-}
-----
-
-As soon as you have ensured that a feature is available, you are ready to build a first request.
-This is done by getting a `PlcRequestBuilder`:
-
-----
-// Create a new read request:
-// - Give the single item requested the alias name "value"
-PlcReadRequest.Builder builder = plcConnection.readRequestBuilder();
-builder.addItem("value-1", "%Q0.4:BOOL");
-builder.addItem("value-2", "%Q0:BYTE");
-builder.addItem("value-3", "%I0.2:BOOL");
-builder.addItem("value-4", "%DB.DB1.4:INT");
-PlcReadRequest readRequest = builder.build();
-----
-
-
-So, as you can see, you prepare a request, by adding items to the request and in the end by calling the `build` method.
-
-The request is sent to the PLC by issuing the `execute` method on the request object:
-
-----
-CompletableFuture<? extends PlcReadResponse> asyncResponse = readRequest.execute();
-asyncResponse.whenComplete((response, throwable) -> {
-  ... process the response ...
-});
-----
-
-In general all requests are executed asynchronously.
-So as soon as the request is fully processed, the callback gets called and will contain a `readResponse`, if everything went right or a `throwable` if there were problems.
-
-However if you want to write your code in a more synchronous fashion, the following alternative will provide this:
-
-----
-PlcReadResponse response = readRequest.execute().get();
-----
-
-Processing of the responses is identical in both cases.
-The following example will demonstrate some of the options you have:
-
-----
-for (String fieldName : response.getFieldNames()) {
-    if(response.getResponseCode(fieldName) == PlcResponseCode.OK) {
-        int numValues = response.getNumberOfValues(fieldName);
-        // If it's just one element, output just one single line.
-        if(numValues == 1) {
-            logger.info("Value[" + fieldName + "]: " + response.getObject(fieldName));
-        }
-        // If it's more than one element, output each in a single row.
-        else {
-            logger.info("Value[" + fieldName + "]:");
-            for(int i = 0; i < numValues; i++) {
-                logger.info(" - " + response.getObject(fieldName, i));
-            }
-        }
-    }
-    // Something went wrong, to output an error message instead.
-    else {
-        logger.error("Error[" + fieldName + "]: " + response.getResponseCode(fieldName).name());
-    }
-}
-----
-
-In the for loop, we are demonstrating how the user can iterate over the address aliases in the response.
-In case of an ordinary read request, this will be predefined by the items in the request, however in case of a subscription response, the response might only contain some of the items that were subscribed.
-
-Before accessing the data, it is advisable to check if an item was correctly returned.
-This is done by the `getResponseCode` method for a given alias.
-If this is `PlcResponseCode.OK`, everything is ok, however it could be one of the following:
-
-- NOT_FOUND
-- ACCESS_DENIED
-- INVALID_ADDRESS
-- INVALID_DATATYPE
-- INTERNAL_ERROR
-- RESPONSE_PENDING
-
-Assuming the return code was `OK`, we can continue accessing the data.
-
-As some addresses support reading arrays, with the method `getNumberOfValues` the user can check how many items of a given type are returned.
-For convenience the response object has single-argument methods for accessing the data, which default to returning the first element.
-
-    response.getObject(fieldName)
-
-If you want to access a given element number, please use the two-argument version instead:
-
-    response.getObject(fieldName, 42)
-
-PLC4X provides getters and setters for a wide variety of Java types and automatically handles the type conversion.
-However when for example trying to get a long-value as a byte and the long-value exceeds the range supported by the smaller type, a `RuntimeException` of type `PlcIncompatibleDatatypeException`.
-In order to avoid causing this exception to be thrown, however there are `isValid{TypeName}` methods that you can use to check if the value is compatible.
+//
+//  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
+//
+//      http://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.
+//
+
+== Getting Started
+
+=== Using the PLC4X API directly
+
+In order to write a valid PLC4X Java application, all you need, is to add a dependency to the `api module`.
+When using Maven, all you need to do is add this dependency:
+
+[subs=attributes+]
+----
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>{project-version}</version>
+    </dependency>
+----
+
+This will allow you to write a valid application, that compiles fine.
+However in order to actually connect to a device using a given protocol, you need to add this protocol implementation to the classpath.
+
+For example in order to communicate with an `S7 device` using the `S7 Protocol`, you would need to add the following dependency:
+
+[subs=attributes+]
+----
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-s7</artifactId>
+      <version>{project-version}</version>
+      <scope>runtime</scope>
+    </dependency>
+----
+
+So as soon as your project has the API and a driver implementation available, you first need to get a `PlcConnection` instance.
+This is done via the `PlcDriverManager` by asking this to create an instance for a given `PLC4X connection string`.
+
+----
+String connectionString = "s7://10.10.64.20/1/1";
+
+try (PlcConnection plcConnection = new PlcDriverManager().getConnection(connectionString)) {
+
+  ... do something with the connection here ...
+
+}
+----
+
+PLC4X generally supports a very limited set of functions, which is not due to the fact, that we didn't implement things, but that PLCs generally support a very limited set of functions.
+
+The basic functions supported by PLCs and therefore supported by PLC4X are:
+
+* Read data
+* Write data
+* Subscribe for data
+* Execute functions in the PLC
+* List resources in the PLC
+
+In general we will try to offer as many features as possible.
+So if a protocol doesn't support subscription based communication it is our goal to simulate this by polling in the background so it is transparent for the users.
+
+But there are some cases in which we can't simulate or features are simply disabled intentionally:
+
+* If a PLC and/or protocol don't support executing of functions, we simply can't provide this functionality.
+* We will be providing stripped down versions of drivers, that for example intentionally don't support any writing of data and executing of functions.
+
+Therefore we use metadata to check programmatically, if a given feature is available:
+
+----
+// Check if this connection support reading of data.
+if (!plcConnection.getMetadata().canRead()) {
+  logger.error("This connection doesn't support reading.");
+  return;
+}
+----
+
+As soon as you have ensured that a feature is available, you are ready to build a first request.
+This is done by getting a `PlcRequestBuilder`:
+
+----
+// Create a new read request:
+// - Give the single item requested the alias name "value"
+PlcReadRequest.Builder builder = plcConnection.readRequestBuilder();
+builder.addItem("value-1", "%Q0.4:BOOL");
+builder.addItem("value-2", "%Q0:BYTE");
+builder.addItem("value-3", "%I0.2:BOOL");
+builder.addItem("value-4", "%DB.DB1.4:INT");
+PlcReadRequest readRequest = builder.build();
+----
+
+
+So, as you can see, you prepare a request, by adding items to the request and in the end by calling the `build` method.
+
+The request is sent to the PLC by issuing the `execute` method on the request object:
+
+----
+CompletableFuture<? extends PlcReadResponse> asyncResponse = readRequest.execute();
+asyncResponse.whenComplete((response, throwable) -> {
+  ... process the response ...
+});
+----
+
+In general all requests are executed asynchronously.
+So as soon as the request is fully processed, the callback gets called and will contain a `readResponse`, if everything went right or a `throwable` if there were problems.
+
+However if you want to write your code in a more synchronous fashion, the following alternative will provide this:
+
+----
+PlcReadResponse response = readRequest.execute().get();
+----
+
+Processing of the responses is identical in both cases.
+The following example will demonstrate some of the options you have:
+
+----
+for (String fieldName : response.getFieldNames()) {
+    if(response.getResponseCode(fieldName) == PlcResponseCode.OK) {
+        int numValues = response.getNumberOfValues(fieldName);
+        // If it's just one element, output just one single line.
+        if(numValues == 1) {
+            logger.info("Value[" + fieldName + "]: " + response.getObject(fieldName));
+        }
+        // If it's more than one element, output each in a single row.
+        else {
+            logger.info("Value[" + fieldName + "]:");
+            for(int i = 0; i < numValues; i++) {
+                logger.info(" - " + response.getObject(fieldName, i));
+            }
+        }
+    }
+    // Something went wrong, to output an error message instead.
+    else {
+        logger.error("Error[" + fieldName + "]: " + response.getResponseCode(fieldName).name());
+    }
+}
+----
+
+In the for loop, we are demonstrating how the user can iterate over the address aliases in the response.
+In case of an ordinary read request, this will be predefined by the items in the request, however in case of a subscription response, the response might only contain some of the items that were subscribed.
+
+Before accessing the data, it is advisable to check if an item was correctly returned.
+This is done by the `getResponseCode` method for a given alias.
+If this is `PlcResponseCode.OK`, everything is ok, however it could be one of the following:
+
+- NOT_FOUND
+- ACCESS_DENIED
+- INVALID_ADDRESS
+- INVALID_DATATYPE
+- INTERNAL_ERROR
+- RESPONSE_PENDING
+
+Assuming the return code was `OK`, we can continue accessing the data.
+
+As some addresses support reading arrays, with the method `getNumberOfValues` the user can check how many items of a given type are returned.
+For convenience the response object has single-argument methods for accessing the data, which default to returning the first element.
+
+    response.getObject(fieldName)
+
+If you want to access a given element number, please use the two-argument version instead:
+
+    response.getObject(fieldName, 42)
+
+PLC4X provides getters and setters for a wide variety of Java types and automatically handles the type conversion.
+However when for example trying to get a long-value as a byte and the long-value exceeds the range supported by the smaller type, a `RuntimeException` of type `PlcIncompatibleDatatypeException`.
+In order to avoid causing this exception to be thrown, however there are `isValid{TypeName}` methods that you can use to check if the value is compatible.
diff --git a/plc4j/utils/connection-pool/pom.xml b/plc4j/utils/connection-pool/pom.xml
index b34755cd019..7a29de2ca6c 100644
--- a/plc4j/utils/connection-pool/pom.xml
+++ b/plc4j/utils/connection-pool/pom.xml
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <artifactId>plc4j-utils</artifactId>
-    <groupId>org.apache.plc4x</groupId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-connection-pool</artifactId>
-
-  <name>PLC4J: Utils: Connection Pool</name>
-  <description>An implementation of a connection pool based on Apache Commons Pool.</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-pool2</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <artifactId>plc4j-utils</artifactId>
+    <groupId>org.apache.plc4x</groupId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-connection-pool</artifactId>
+
+  <name>PLC4J: Utils: Connection Pool</name>
+  <description>An implementation of a connection pool based on Apache Commons Pool.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-pool2</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/utils/connection-pool/src/main/java/org/apache/plc4x/java/utils/connectionpool/PoolKey.java b/plc4j/utils/connection-pool/src/main/java/org/apache/plc4x/java/utils/connectionpool/PoolKey.java
index 7cd719afdf1..f795ea68307 100644
--- a/plc4j/utils/connection-pool/src/main/java/org/apache/plc4x/java/utils/connectionpool/PoolKey.java
+++ b/plc4j/utils/connection-pool/src/main/java/org/apache/plc4x/java/utils/connectionpool/PoolKey.java
@@ -1,73 +1,73 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.utils.connectionpool;
-
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-
-import java.util.Objects;
-
-public abstract class PoolKey {
-    protected final String url;
-    protected final PlcAuthentication plcAuthentication;
-
-    public PoolKey(String url, PlcAuthentication plcAuthentication) {
-        this.url = url;
-        this.plcAuthentication = plcAuthentication;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public PlcAuthentication getPlcAuthentication() {
-        return plcAuthentication;
-    }
-
-    /**
-     * @return the part of the url that should be pooled.
-     */
-    public abstract String getPoolableKey();
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof PoolKey)) {
-            return false;
-        }
-        PoolKey poolKey = (PoolKey) o;
-        return Objects.equals(getPoolableKey(), poolKey.getPoolableKey()) &&
-            Objects.equals(plcAuthentication, poolKey.plcAuthentication);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(getPoolableKey(), plcAuthentication);
-    }
-
-    @Override
-    public String toString() {
-        return "PoolKey{" +
-            "url='" + url + '\'' +
-            (plcAuthentication != PooledPlcDriverManager.noPlcAuthentication ? ", plcAuthentication=" + plcAuthentication : "") +
-            '}';
-    }
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.utils.connectionpool;
+
+import org.apache.plc4x.java.api.authentication.PlcAuthentication;
+
+import java.util.Objects;
+
+public abstract class PoolKey {
+    protected final String url;
+    protected final PlcAuthentication plcAuthentication;
+
+    public PoolKey(String url, PlcAuthentication plcAuthentication) {
+        this.url = url;
+        this.plcAuthentication = plcAuthentication;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public PlcAuthentication getPlcAuthentication() {
+        return plcAuthentication;
+    }
+
+    /**
+     * @return the part of the url that should be pooled.
+     */
+    public abstract String getPoolableKey();
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof PoolKey)) {
+            return false;
+        }
+        PoolKey poolKey = (PoolKey) o;
+        return Objects.equals(getPoolableKey(), poolKey.getPoolableKey()) &&
+            Objects.equals(plcAuthentication, poolKey.plcAuthentication);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getPoolableKey(), plcAuthentication);
+    }
+
+    @Override
+    public String toString() {
+        return "PoolKey{" +
+            "url='" + url + '\'' +
+            (plcAuthentication != PooledPlcDriverManager.noPlcAuthentication ? ", plcAuthentication=" + plcAuthentication : "") +
+            '}';
+    }
 }
\ No newline at end of file
diff --git a/plc4j/utils/connection-pool/src/main/java/org/apache/plc4x/java/utils/connectionpool/PoolKeyFactory.java b/plc4j/utils/connection-pool/src/main/java/org/apache/plc4x/java/utils/connectionpool/PoolKeyFactory.java
index f72bdcec5b2..75d14519de8 100644
--- a/plc4j/utils/connection-pool/src/main/java/org/apache/plc4x/java/utils/connectionpool/PoolKeyFactory.java
+++ b/plc4j/utils/connection-pool/src/main/java/org/apache/plc4x/java/utils/connectionpool/PoolKeyFactory.java
@@ -1,104 +1,104 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.utils.connectionpool;
-
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Objects;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class PoolKeyFactory {
-
-    // TODO 11.12.18 jf: add a property to the drivers to keep this generic
-    public PoolKey getPoolKey(String url, PlcAuthentication plcAuthentication) throws PlcConnectionException {
-        Objects.requireNonNull(url);
-        URI connectionUri;
-        try {
-            connectionUri = new URI(url);
-        } catch (URISyntaxException e) {
-            throw new PlcConnectionException("Invalid plc4j connection string '" + url + "'", e);
-        }
-        String protocol = connectionUri.getScheme().toLowerCase();
-        switch (protocol) {
-            case "s7":
-                return new PoolKey(url, plcAuthentication) {
-                    private final Pattern s7URIPattern = Pattern.compile("^(?<poolablePart>s7://(?<host>.*)/(?<rack>\\d{1,4})/(?<slot>\\d{1,4}))(?<params>\\?.*)?");
-
-                    @Override
-                    public String getPoolableKey() {
-                        Matcher matcher = s7URIPattern.matcher(url);
-                        if (!matcher.matches()) {
-                            throw new IllegalArgumentException(url + " doesn't match " + s7URIPattern);
-                        }
-                        return Objects.requireNonNull(matcher.group("poolablePart"));
-                    }
-                };
-            case "ads":
-                return new PoolKey(url, plcAuthentication) {
-                    private final Pattern amsPortPattern = Pattern.compile("\\d+");
-                    private final Pattern amsNetIdPattern = Pattern.compile("\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}");
-                    private final Pattern adsAddressPattern =
-                        Pattern.compile("(?<targetAmsNetId>" + amsNetIdPattern + "):(?<targetAmsPort>" + amsPortPattern + ")"
-                            + "(/"
-                            + "(?<sourceAmsNetId>" + amsNetIdPattern + "):(?<sourceAmsPort>" + amsPortPattern + ")"
-                            + ")?");
-                    private final Pattern inetAddressPattern = Pattern.compile("tcp://(?<host>[\\w.]+)(:(?<port>\\d*))?");
-                    private final Pattern serialPattern = Pattern.compile("serial://(?<serialDefinition>((?!/\\d).)*)");
-                    private final Pattern adsUriPattern = Pattern.compile("^(?<poolablePart>ads:(" + inetAddressPattern + "|" + serialPattern + "))/" + adsAddressPattern + "(\\?.*)?");
-
-                    @Override
-                    public String getPoolableKey() {
-                        Matcher matcher =
-                            adsUriPattern.matcher(url);
-                        if (!matcher.matches()) {
-                            throw new IllegalArgumentException(url + " doesn't match " + adsUriPattern);
-                        }
-                        return Objects.requireNonNull(matcher.group("poolablePart"));
-                    }
-                };
-            case "modbus":
-                return new PoolKey(url, plcAuthentication) {
-                    private final Pattern inetAddressPattern = Pattern.compile("tcp://(?<host>[\\w.]+)(:(?<port>\\d*))?");
-                    private final Pattern serialPattern = Pattern.compile("serial://(?<serialDefinition>((?!/\\d).)*)");
-                    private final Pattern modbusUriPattern = Pattern.compile("^(?<poolablePart>modbus:(" + inetAddressPattern + "|" + serialPattern + "))/?" + "(?<params>\\?.*)?");
-
-                    @Override
-                    public String getPoolableKey() {
-                        Matcher matcher = modbusUriPattern.matcher(url);
-                        if (!matcher.matches()) {
-                            throw new IllegalArgumentException(url + " doesn't match " + modbusUriPattern);
-                        }
-                        return Objects.requireNonNull(matcher.group("poolablePart"));
-                    }
-                };
-            default:
-                return new PoolKey(url, plcAuthentication) {
-                    @Override
-                    public String getPoolableKey() {
-                        return url;
-                    }
-                };
-        }
-    }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.utils.connectionpool;
+
+import org.apache.plc4x.java.api.authentication.PlcAuthentication;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class PoolKeyFactory {
+
+    // TODO 11.12.18 jf: add a property to the drivers to keep this generic
+    public PoolKey getPoolKey(String url, PlcAuthentication plcAuthentication) throws PlcConnectionException {
+        Objects.requireNonNull(url);
+        URI connectionUri;
+        try {
+            connectionUri = new URI(url);
+        } catch (URISyntaxException e) {
+            throw new PlcConnectionException("Invalid plc4j connection string '" + url + "'", e);
+        }
+        String protocol = connectionUri.getScheme().toLowerCase();
+        switch (protocol) {
+            case "s7":
+                return new PoolKey(url, plcAuthentication) {
+                    private final Pattern s7URIPattern = Pattern.compile("^(?<poolablePart>s7://(?<host>.*)/(?<rack>\\d{1,4})/(?<slot>\\d{1,4}))(?<params>\\?.*)?");
+
+                    @Override
+                    public String getPoolableKey() {
+                        Matcher matcher = s7URIPattern.matcher(url);
+                        if (!matcher.matches()) {
+                            throw new IllegalArgumentException(url + " doesn't match " + s7URIPattern);
+                        }
+                        return Objects.requireNonNull(matcher.group("poolablePart"));
+                    }
+                };
+            case "ads":
+                return new PoolKey(url, plcAuthentication) {
+                    private final Pattern amsPortPattern = Pattern.compile("\\d+");
+                    private final Pattern amsNetIdPattern = Pattern.compile("\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}");
+                    private final Pattern adsAddressPattern =
+                        Pattern.compile("(?<targetAmsNetId>" + amsNetIdPattern + "):(?<targetAmsPort>" + amsPortPattern + ")"
+                            + "(/"
+                            + "(?<sourceAmsNetId>" + amsNetIdPattern + "):(?<sourceAmsPort>" + amsPortPattern + ")"
+                            + ")?");
+                    private final Pattern inetAddressPattern = Pattern.compile("tcp://(?<host>[\\w.]+)(:(?<port>\\d*))?");
+                    private final Pattern serialPattern = Pattern.compile("serial://(?<serialDefinition>((?!/\\d).)*)");
+                    private final Pattern adsUriPattern = Pattern.compile("^(?<poolablePart>ads:(" + inetAddressPattern + "|" + serialPattern + "))/" + adsAddressPattern + "(\\?.*)?");
+
+                    @Override
+                    public String getPoolableKey() {
+                        Matcher matcher =
+                            adsUriPattern.matcher(url);
+                        if (!matcher.matches()) {
+                            throw new IllegalArgumentException(url + " doesn't match " + adsUriPattern);
+                        }
+                        return Objects.requireNonNull(matcher.group("poolablePart"));
+                    }
+                };
+            case "modbus":
+                return new PoolKey(url, plcAuthentication) {
+                    private final Pattern inetAddressPattern = Pattern.compile("tcp://(?<host>[\\w.]+)(:(?<port>\\d*))?");
+                    private final Pattern serialPattern = Pattern.compile("serial://(?<serialDefinition>((?!/\\d).)*)");
+                    private final Pattern modbusUriPattern = Pattern.compile("^(?<poolablePart>modbus:(" + inetAddressPattern + "|" + serialPattern + "))/?" + "(?<params>\\?.*)?");
+
+                    @Override
+                    public String getPoolableKey() {
+                        Matcher matcher = modbusUriPattern.matcher(url);
+                        if (!matcher.matches()) {
+                            throw new IllegalArgumentException(url + " doesn't match " + modbusUriPattern);
+                        }
+                        return Objects.requireNonNull(matcher.group("poolablePart"));
+                    }
+                };
+            default:
+                return new PoolKey(url, plcAuthentication) {
+                    @Override
+                    public String getPoolableKey() {
+                        return url;
+                    }
+                };
+        }
+    }
+}
diff --git a/plc4j/utils/connection-pool/src/main/java/org/apache/plc4x/java/utils/connectionpool/PooledPlcConnectionFactory.java b/plc4j/utils/connection-pool/src/main/java/org/apache/plc4x/java/utils/connectionpool/PooledPlcConnectionFactory.java
index 03879eb5657..2748251ed27 100644
--- a/plc4j/utils/connection-pool/src/main/java/org/apache/plc4x/java/utils/connectionpool/PooledPlcConnectionFactory.java
+++ b/plc4j/utils/connection-pool/src/main/java/org/apache/plc4x/java/utils/connectionpool/PooledPlcConnectionFactory.java
@@ -1,46 +1,46 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package org.apache.plc4x.java.utils.connectionpool;
-
-import org.apache.commons.pool2.BaseKeyedPooledObjectFactory;
-import org.apache.commons.pool2.PooledObject;
-import org.apache.commons.pool2.impl.DefaultPooledObject;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public abstract class PooledPlcConnectionFactory extends BaseKeyedPooledObjectFactory<PoolKey, PlcConnection> {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(PooledPlcConnectionFactory.class);
-
-    @Override
-    public PooledObject<PlcConnection> wrap(PlcConnection plcConnection) {
-        LOGGER.debug("Wrapping connection {}", plcConnection);
-        return new DefaultPooledObject<>(plcConnection);
-    }
-
-    @Override
-    public void destroyObject(PoolKey key, PooledObject<PlcConnection> p) throws Exception {
-        p.getObject().close();
-    }
-
-    @Override
-    public boolean validateObject(PoolKey key, PooledObject<PlcConnection> p) {
-        return p.getObject().isConnected();
-    }
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package org.apache.plc4x.java.utils.connectionpool;
+
+import org.apache.commons.pool2.BaseKeyedPooledObjectFactory;
+import org.apache.commons.pool2.PooledObject;
+import org.apache.commons.pool2.impl.DefaultPooledObject;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public abstract class PooledPlcConnectionFactory extends BaseKeyedPooledObjectFactory<PoolKey, PlcConnection> {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PooledPlcConnectionFactory.class);
+
+    @Override
+    public PooledObject<PlcConnection> wrap(PlcConnection plcConnection) {
+        LOGGER.debug("Wrapping connection {}", plcConnection);
+        return new DefaultPooledObject<>(plcConnection);
+    }
+
+    @Override
+    public void destroyObject(PoolKey key, PooledObject<PlcConnection> p) throws Exception {
+        p.getObject().close();
+    }
+
+    @Override
+    public boolean validateObject(PoolKey key, PooledObject<PlcConnection> p) {
+        return p.getObject().isConnected();
+    }
+}
diff --git a/plc4j/utils/connection-pool/src/main/java/org/apache/plc4x/java/utils/connectionpool/PooledPlcDriverManager.java b/plc4j/utils/connection-pool/src/main/java/org/apache/plc4x/java/utils/connectionpool/PooledPlcDriverManager.java
index a88794f54fe..3e1e1ed927b 100644
--- a/plc4j/utils/connection-pool/src/main/java/org/apache/plc4x/java/utils/connectionpool/PooledPlcDriverManager.java
+++ b/plc4j/utils/connection-pool/src/main/java/org/apache/plc4x/java/utils/connectionpool/PooledPlcDriverManager.java
@@ -1,175 +1,175 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package org.apache.plc4x.java.utils.connectionpool;
-
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.commons.pool2.KeyedObjectPool;
-import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Proxy;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class PooledPlcDriverManager extends PlcDriverManager {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(PooledPlcDriverManager.class);
-
-    private KeyedObjectPool<PoolKey, PlcConnection> keyedObjectPool;
-
-    // Marker class do detected a non null value
-    static final NoPlcAuthentication noPlcAuthentication = new NoPlcAuthentication();
-
-    private final PoolKeyFactory poolKeyFactory;
-
-    public PooledPlcDriverManager() {
-        this(GenericKeyedObjectPool::new);
-    }
-
-    public PooledPlcDriverManager(PoolKeyFactory poolKeyFactory) {
-        this(GenericKeyedObjectPool::new, poolKeyFactory);
-    }
-
-    public PooledPlcDriverManager(ClassLoader classLoader) {
-        this(classLoader, new PoolKeyFactory());
-    }
-
-    public PooledPlcDriverManager(ClassLoader classLoader, PoolKeyFactory poolKeyFactory) {
-        super(classLoader);
-        setFromPoolCreator(GenericKeyedObjectPool::new);
-        this.poolKeyFactory = poolKeyFactory;
-    }
-
-    public PooledPlcDriverManager(PoolCreator poolCreator) {
-        this(poolCreator, new PoolKeyFactory());
-    }
-
-    public PooledPlcDriverManager(PoolCreator poolCreator, PoolKeyFactory poolKeyFactory) {
-        setFromPoolCreator(poolCreator);
-        this.poolKeyFactory = poolKeyFactory;
-    }
-
-    public PooledPlcDriverManager(ClassLoader classLoader, PoolCreator poolCreator) {
-        super(classLoader);
-        setFromPoolCreator(poolCreator);
-        poolKeyFactory = new PoolKeyFactory();
-    }
-
-    private void setFromPoolCreator(PoolCreator poolCreator) {
-        this.keyedObjectPool = poolCreator.createPool(new PooledPlcConnectionFactory() {
-            @Override
-            public PlcConnection create(PoolKey key) throws Exception {
-                PlcAuthentication plcAuthentication = key.plcAuthentication;
-                String url = key.url;
-                if (plcAuthentication == noPlcAuthentication) {
-                    LOGGER.debug("getting actual connection for {}", url);
-                    return PooledPlcDriverManager.super.getConnection(url);
-                } else {
-                    LOGGER.debug("getting actual connection for {} and plcAuthentication {}", url, plcAuthentication);
-                    return PooledPlcDriverManager.super.getConnection(url, plcAuthentication);
-                }
-            }
-        });
-    }
-
-    @Override
-    public PlcConnection getConnection(String url) throws PlcConnectionException {
-        return getConnection(url, noPlcAuthentication);
-    }
-
-    @Override
-    public PlcConnection getConnection(String url, PlcAuthentication authentication) throws PlcConnectionException {
-        PoolKey poolKey = poolKeyFactory.getPoolKey(url, authentication);
-        if (LOGGER.isDebugEnabled()) {
-            if (authentication != noPlcAuthentication) {
-                LOGGER.debug("Try to borrow an object for url {} and authentication {}", url, authentication);
-            } else {
-                LOGGER.debug("Try to borrow an object for url {}", url);
-            }
-        }
-        PlcConnection plcConnection;
-        try {
-            plcConnection = keyedObjectPool.borrowObject(poolKey);
-        } catch (Exception e) {
-            throw new PlcConnectionException(e);
-        }
-        // Used to invalidate a proxy
-        AtomicBoolean proxyInvalidated = new AtomicBoolean(false);
-        return (PlcConnection) Proxy.newProxyInstance(classLoader, new Class[]{PlcConnection.class}, (proxy, method, args) -> {
-            if (proxyInvalidated.get()) {
-                throw new IllegalStateException("Proxy not valid anymore");
-            }
-            if ("close".equals(method.getName())) {
-                LOGGER.debug("close called on {}", plcConnection);
-                proxyInvalidated.set(true);
-                keyedObjectPool.returnObject(poolKey, plcConnection);
-                return null;
-            } else {
-                try {
-                    return method.invoke(plcConnection, args);
-                } catch (InvocationTargetException e) {
-                    if (e.getCause().getClass() == PlcConnectionException.class) {
-                        keyedObjectPool.invalidateObject(poolKey, plcConnection);
-                        proxyInvalidated.set(true);
-                    }
-                    throw e;
-                }
-            }
-        });
-    }
-
-    @FunctionalInterface
-    public interface PoolCreator {
-        KeyedObjectPool<PoolKey, PlcConnection> createPool(PooledPlcConnectionFactory pooledPlcConnectionFactory);
-    }
-
-    // TODO: maybe export to jmx // generic poolKey has builting jmx too
-    public Map<String, Number> getStatistics() {
-        HashMap<String, Number> statistics = new HashMap<>();
-        statistics.put("numActive", keyedObjectPool.getNumActive());
-        statistics.put("numIdle", keyedObjectPool.getNumIdle());
-        if (keyedObjectPool instanceof GenericKeyedObjectPool) {
-            GenericKeyedObjectPool<PoolKey, PlcConnection> genericKeyedObjectPool = (GenericKeyedObjectPool<PoolKey, PlcConnection>) this.keyedObjectPool;
-            // Thats pretty ugly and we really should't do that...
-            try {
-                Map poolMap = (Map) FieldUtils.getField(GenericKeyedObjectPool.class, "poolMap", true).get(this.keyedObjectPool);
-                statistics.put("pools.count", poolMap.size());
-            } catch (IllegalAccessException e) {
-                throw new PlcRuntimeException(e);
-            }
-            Map<String, Integer> numActivePerKey = genericKeyedObjectPool.getNumActivePerKey();
-            for (Map.Entry<String, Integer> entry : numActivePerKey.entrySet()) {
-                statistics.put(entry.getKey() + ".numActive", entry.getValue());
-            }
-        }
-
-        return statistics;
-    }
-
-    private static final class NoPlcAuthentication implements PlcAuthentication {
-
-    }
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package org.apache.plc4x.java.utils.connectionpool;
+
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.commons.pool2.KeyedObjectPool;
+import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.authentication.PlcAuthentication;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Proxy;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class PooledPlcDriverManager extends PlcDriverManager {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PooledPlcDriverManager.class);
+
+    private KeyedObjectPool<PoolKey, PlcConnection> keyedObjectPool;
+
+    // Marker class do detected a non null value
+    static final NoPlcAuthentication noPlcAuthentication = new NoPlcAuthentication();
+
+    private final PoolKeyFactory poolKeyFactory;
+
+    public PooledPlcDriverManager() {
+        this(GenericKeyedObjectPool::new);
+    }
+
+    public PooledPlcDriverManager(PoolKeyFactory poolKeyFactory) {
+        this(GenericKeyedObjectPool::new, poolKeyFactory);
+    }
+
+    public PooledPlcDriverManager(ClassLoader classLoader) {
+        this(classLoader, new PoolKeyFactory());
+    }
+
+    public PooledPlcDriverManager(ClassLoader classLoader, PoolKeyFactory poolKeyFactory) {
+        super(classLoader);
+        setFromPoolCreator(GenericKeyedObjectPool::new);
+        this.poolKeyFactory = poolKeyFactory;
+    }
+
+    public PooledPlcDriverManager(PoolCreator poolCreator) {
+        this(poolCreator, new PoolKeyFactory());
+    }
+
+    public PooledPlcDriverManager(PoolCreator poolCreator, PoolKeyFactory poolKeyFactory) {
+        setFromPoolCreator(poolCreator);
+        this.poolKeyFactory = poolKeyFactory;
+    }
+
+    public PooledPlcDriverManager(ClassLoader classLoader, PoolCreator poolCreator) {
+        super(classLoader);
+        setFromPoolCreator(poolCreator);
+        poolKeyFactory = new PoolKeyFactory();
+    }
+
+    private void setFromPoolCreator(PoolCreator poolCreator) {
+        this.keyedObjectPool = poolCreator.createPool(new PooledPlcConnectionFactory() {
+            @Override
+            public PlcConnection create(PoolKey key) throws Exception {
+                PlcAuthentication plcAuthentication = key.plcAuthentication;
+                String url = key.url;
+                if (plcAuthentication == noPlcAuthentication) {
+                    LOGGER.debug("getting actual connection for {}", url);
+                    return PooledPlcDriverManager.super.getConnection(url);
+                } else {
+                    LOGGER.debug("getting actual connection for {} and plcAuthentication {}", url, plcAuthentication);
+                    return PooledPlcDriverManager.super.getConnection(url, plcAuthentication);
+                }
+            }
+        });
+    }
+
+    @Override
+    public PlcConnection getConnection(String url) throws PlcConnectionException {
+        return getConnection(url, noPlcAuthentication);
+    }
+
+    @Override
+    public PlcConnection getConnection(String url, PlcAuthentication authentication) throws PlcConnectionException {
+        PoolKey poolKey = poolKeyFactory.getPoolKey(url, authentication);
+        if (LOGGER.isDebugEnabled()) {
+            if (authentication != noPlcAuthentication) {
+                LOGGER.debug("Try to borrow an object for url {} and authentication {}", url, authentication);
+            } else {
+                LOGGER.debug("Try to borrow an object for url {}", url);
+            }
+        }
+        PlcConnection plcConnection;
+        try {
+            plcConnection = keyedObjectPool.borrowObject(poolKey);
+        } catch (Exception e) {
+            throw new PlcConnectionException(e);
+        }
+        // Used to invalidate a proxy
+        AtomicBoolean proxyInvalidated = new AtomicBoolean(false);
+        return (PlcConnection) Proxy.newProxyInstance(classLoader, new Class[]{PlcConnection.class}, (proxy, method, args) -> {
+            if (proxyInvalidated.get()) {
+                throw new IllegalStateException("Proxy not valid anymore");
+            }
+            if ("close".equals(method.getName())) {
+                LOGGER.debug("close called on {}", plcConnection);
+                proxyInvalidated.set(true);
+                keyedObjectPool.returnObject(poolKey, plcConnection);
+                return null;
+            } else {
+                try {
+                    return method.invoke(plcConnection, args);
+                } catch (InvocationTargetException e) {
+                    if (e.getCause().getClass() == PlcConnectionException.class) {
+                        keyedObjectPool.invalidateObject(poolKey, plcConnection);
+                        proxyInvalidated.set(true);
+                    }
+                    throw e;
+                }
+            }
+        });
+    }
+
+    @FunctionalInterface
+    public interface PoolCreator {
+        KeyedObjectPool<PoolKey, PlcConnection> createPool(PooledPlcConnectionFactory pooledPlcConnectionFactory);
+    }
+
+    // TODO: maybe export to jmx // generic poolKey has builting jmx too
+    public Map<String, Number> getStatistics() {
+        HashMap<String, Number> statistics = new HashMap<>();
+        statistics.put("numActive", keyedObjectPool.getNumActive());
+        statistics.put("numIdle", keyedObjectPool.getNumIdle());
+        if (keyedObjectPool instanceof GenericKeyedObjectPool) {
+            GenericKeyedObjectPool<PoolKey, PlcConnection> genericKeyedObjectPool = (GenericKeyedObjectPool<PoolKey, PlcConnection>) this.keyedObjectPool;
+            // Thats pretty ugly and we really should't do that...
+            try {
+                Map poolMap = (Map) FieldUtils.getField(GenericKeyedObjectPool.class, "poolMap", true).get(this.keyedObjectPool);
+                statistics.put("pools.count", poolMap.size());
+            } catch (IllegalAccessException e) {
+                throw new PlcRuntimeException(e);
+            }
+            Map<String, Integer> numActivePerKey = genericKeyedObjectPool.getNumActivePerKey();
+            for (Map.Entry<String, Integer> entry : numActivePerKey.entrySet()) {
+                statistics.put(entry.getKey() + ".numActive", entry.getValue());
+            }
+        }
+
+        return statistics;
+    }
+
+    private static final class NoPlcAuthentication implements PlcAuthentication {
+
+    }
+}
diff --git a/plc4j/utils/connection-pool/src/test/java/org/apache/plc4x/java/utils/connectionpool/PoolKeyFactoryTest.java b/plc4j/utils/connection-pool/src/test/java/org/apache/plc4x/java/utils/connectionpool/PoolKeyFactoryTest.java
index a73f9c78f05..fef262abaee 100644
--- a/plc4j/utils/connection-pool/src/test/java/org/apache/plc4x/java/utils/connectionpool/PoolKeyFactoryTest.java
+++ b/plc4j/utils/connection-pool/src/test/java/org/apache/plc4x/java/utils/connectionpool/PoolKeyFactoryTest.java
@@ -1,93 +1,93 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.utils.connectionpool;
-
-import org.assertj.core.api.WithAssertions;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-
-class PoolKeyFactoryTest implements WithAssertions {
-
-    private PoolKeyFactory SUT = new PoolKeyFactory();
-
-    @Nested
-    class Generic {
-        @Test
-        void getPoolKey() throws Exception {
-            PoolKey poolKey = SUT.getPoolKey("randomProtocol://randomHost/1/1?someOptions", PooledPlcDriverManager.noPlcAuthentication);
-            assertThat(poolKey.getUrl()).isEqualTo("randomProtocol://randomHost/1/1?someOptions");
-            assertThat(poolKey.getPlcAuthentication()).isEqualTo(PooledPlcDriverManager.noPlcAuthentication);
-            assertThat(poolKey.getPoolableKey()).isEqualTo("randomProtocol://randomHost/1/1?someOptions");
-        }
-    }
-
-    @Nested
-    class S7 {
-        @Test
-        void getPoolKey() throws Exception {
-            PoolKey poolKey = SUT.getPoolKey("s7://localhost/1/2?randomOption=true", PooledPlcDriverManager.noPlcAuthentication);
-            assertThat(poolKey.getUrl()).isEqualTo("s7://localhost/1/2?randomOption=true");
-            assertThat(poolKey.getPlcAuthentication()).isEqualTo(PooledPlcDriverManager.noPlcAuthentication);
-            assertThat(poolKey.getPoolableKey()).isEqualTo("s7://localhost/1/2");
-        }
-    }
-
-    @Nested
-    class ADS {
-        @Test
-        void getPoolKey_TCP() throws Exception {
-            PoolKey poolKey = SUT.getPoolKey("ads:tcp://10.10.64.40/10.10.64.40.1.1:851/10.10.56.23.1.1:30000", PooledPlcDriverManager.noPlcAuthentication);
-            assertThat(poolKey.getUrl()).isEqualTo("ads:tcp://10.10.64.40/10.10.64.40.1.1:851/10.10.56.23.1.1:30000");
-            assertThat(poolKey.getPlcAuthentication()).isEqualTo(PooledPlcDriverManager.noPlcAuthentication);
-            assertThat(poolKey.getPoolableKey()).isEqualTo("ads:tcp://10.10.64.40");
-        }
-
-        @Test
-        void getPoolKey_SERIAL() throws Exception {
-            PoolKey poolKey = SUT.getPoolKey("ads:serial:///dev/ttys003/10.10.64.40.1.1:851/10.10.56.23.1.1:30000", PooledPlcDriverManager.noPlcAuthentication);
-            assertThat(poolKey.getUrl()).isEqualTo("ads:serial:///dev/ttys003/10.10.64.40.1.1:851/10.10.56.23.1.1:30000");
-            assertThat(poolKey.getPlcAuthentication()).isEqualTo(PooledPlcDriverManager.noPlcAuthentication);
-            assertThat(poolKey.getPoolableKey()).isEqualTo("ads:serial:///dev/ttys003");
-        }
-    }
-
-    @Nested
-    class Modbus {
-        @Test
-        void getPoolKey_TCP() throws Exception {
-            PoolKey poolKey = SUT.getPoolKey("modbus:tcp://10.10.64.40?someRandomOption=true", PooledPlcDriverManager.noPlcAuthentication);
-            assertThat(poolKey.getUrl()).isEqualTo("modbus:tcp://10.10.64.40?someRandomOption=true");
-            assertThat(poolKey.getPlcAuthentication()).isEqualTo(PooledPlcDriverManager.noPlcAuthentication);
-            assertThat(poolKey.getPoolableKey()).isEqualTo("modbus:tcp://10.10.64.40");
-        }
-
-        @Disabled("Modbus serial pooling doesn't work right now as intended")
-        @Test
-        void getPoolKey_SERIAL() throws Exception {
-            PoolKey poolKey = SUT.getPoolKey("modbus:serial:///dev/ttys003?someRandomOption=true", PooledPlcDriverManager.noPlcAuthentication);
-            assertThat(poolKey.getUrl()).isEqualTo("modbus:serial:///dev/ttys003?someRandomOption=true");
-            assertThat(poolKey.getPlcAuthentication()).isEqualTo(PooledPlcDriverManager.noPlcAuthentication);
-            assertThat(poolKey.getPoolableKey()).isEqualTo("modbus:serial:///dev/ttys003");
-        }
-    }
-
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.utils.connectionpool;
+
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+class PoolKeyFactoryTest implements WithAssertions {
+
+    private PoolKeyFactory SUT = new PoolKeyFactory();
+
+    @Nested
+    class Generic {
+        @Test
+        void getPoolKey() throws Exception {
+            PoolKey poolKey = SUT.getPoolKey("randomProtocol://randomHost/1/1?someOptions", PooledPlcDriverManager.noPlcAuthentication);
+            assertThat(poolKey.getUrl()).isEqualTo("randomProtocol://randomHost/1/1?someOptions");
+            assertThat(poolKey.getPlcAuthentication()).isEqualTo(PooledPlcDriverManager.noPlcAuthentication);
+            assertThat(poolKey.getPoolableKey()).isEqualTo("randomProtocol://randomHost/1/1?someOptions");
+        }
+    }
+
+    @Nested
+    class S7 {
+        @Test
+        void getPoolKey() throws Exception {
+            PoolKey poolKey = SUT.getPoolKey("s7://localhost/1/2?randomOption=true", PooledPlcDriverManager.noPlcAuthentication);
+            assertThat(poolKey.getUrl()).isEqualTo("s7://localhost/1/2?randomOption=true");
+            assertThat(poolKey.getPlcAuthentication()).isEqualTo(PooledPlcDriverManager.noPlcAuthentication);
+            assertThat(poolKey.getPoolableKey()).isEqualTo("s7://localhost/1/2");
+        }
+    }
+
+    @Nested
+    class ADS {
+        @Test
+        void getPoolKey_TCP() throws Exception {
+            PoolKey poolKey = SUT.getPoolKey("ads:tcp://10.10.64.40/10.10.64.40.1.1:851/10.10.56.23.1.1:30000", PooledPlcDriverManager.noPlcAuthentication);
+            assertThat(poolKey.getUrl()).isEqualTo("ads:tcp://10.10.64.40/10.10.64.40.1.1:851/10.10.56.23.1.1:30000");
+            assertThat(poolKey.getPlcAuthentication()).isEqualTo(PooledPlcDriverManager.noPlcAuthentication);
+            assertThat(poolKey.getPoolableKey()).isEqualTo("ads:tcp://10.10.64.40");
+        }
+
+        @Test
+        void getPoolKey_SERIAL() throws Exception {
+            PoolKey poolKey = SUT.getPoolKey("ads:serial:///dev/ttys003/10.10.64.40.1.1:851/10.10.56.23.1.1:30000", PooledPlcDriverManager.noPlcAuthentication);
+            assertThat(poolKey.getUrl()).isEqualTo("ads:serial:///dev/ttys003/10.10.64.40.1.1:851/10.10.56.23.1.1:30000");
+            assertThat(poolKey.getPlcAuthentication()).isEqualTo(PooledPlcDriverManager.noPlcAuthentication);
+            assertThat(poolKey.getPoolableKey()).isEqualTo("ads:serial:///dev/ttys003");
+        }
+    }
+
+    @Nested
+    class Modbus {
+        @Test
+        void getPoolKey_TCP() throws Exception {
+            PoolKey poolKey = SUT.getPoolKey("modbus:tcp://10.10.64.40?someRandomOption=true", PooledPlcDriverManager.noPlcAuthentication);
+            assertThat(poolKey.getUrl()).isEqualTo("modbus:tcp://10.10.64.40?someRandomOption=true");
+            assertThat(poolKey.getPlcAuthentication()).isEqualTo(PooledPlcDriverManager.noPlcAuthentication);
+            assertThat(poolKey.getPoolableKey()).isEqualTo("modbus:tcp://10.10.64.40");
+        }
+
+        @Disabled("Modbus serial pooling doesn't work right now as intended")
+        @Test
+        void getPoolKey_SERIAL() throws Exception {
+            PoolKey poolKey = SUT.getPoolKey("modbus:serial:///dev/ttys003?someRandomOption=true", PooledPlcDriverManager.noPlcAuthentication);
+            assertThat(poolKey.getUrl()).isEqualTo("modbus:serial:///dev/ttys003?someRandomOption=true");
+            assertThat(poolKey.getPlcAuthentication()).isEqualTo(PooledPlcDriverManager.noPlcAuthentication);
+            assertThat(poolKey.getPoolableKey()).isEqualTo("modbus:serial:///dev/ttys003");
+        }
+    }
+
+
 }
\ No newline at end of file
diff --git a/plc4j/utils/connection-pool/src/test/java/org/apache/plc4x/java/utils/connectionpool/PooledDummyDriver.java b/plc4j/utils/connection-pool/src/test/java/org/apache/plc4x/java/utils/connectionpool/PooledDummyDriver.java
index 336379daea8..02f452f02a7 100644
--- a/plc4j/utils/connection-pool/src/test/java/org/apache/plc4x/java/utils/connectionpool/PooledDummyDriver.java
+++ b/plc4j/utils/connection-pool/src/test/java/org/apache/plc4x/java/utils/connectionpool/PooledDummyDriver.java
@@ -1,52 +1,52 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package org.apache.plc4x.java.utils.connectionpool;
-
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.spi.PlcDriver;
-
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
-
-public class PooledDummyDriver implements PlcDriver {
-
-    private PlcDriver mockedPlcDriver = mock(PlcDriver.class, RETURNS_DEEP_STUBS);
-
-    @Override
-    public String getProtocolCode() {
-        return PooledDummyDriver.class.getName();
-    }
-
-    @Override
-    public String getProtocolName() {
-        return mockedPlcDriver.getProtocolCode();
-    }
-
-    @Override
-    public PlcConnection connect(String url) throws PlcConnectionException {
-        return mockedPlcDriver.connect(url);
-    }
-
-    @Override
-    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
-        return mockedPlcDriver.connect(url, authentication);
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package org.apache.plc4x.java.utils.connectionpool;
+
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.authentication.PlcAuthentication;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.spi.PlcDriver;
+
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+
+public class PooledDummyDriver implements PlcDriver {
+
+    private PlcDriver mockedPlcDriver = mock(PlcDriver.class, RETURNS_DEEP_STUBS);
+
+    @Override
+    public String getProtocolCode() {
+        return PooledDummyDriver.class.getName();
+    }
+
+    @Override
+    public String getProtocolName() {
+        return mockedPlcDriver.getProtocolCode();
+    }
+
+    @Override
+    public PlcConnection connect(String url) throws PlcConnectionException {
+        return mockedPlcDriver.connect(url);
+    }
+
+    @Override
+    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
+        return mockedPlcDriver.connect(url, authentication);
+    }
+
+}
diff --git a/plc4j/utils/connection-pool/src/test/java/org/apache/plc4x/java/utils/connectionpool/PooledPlcDriverManagerTest.java b/plc4j/utils/connection-pool/src/test/java/org/apache/plc4x/java/utils/connectionpool/PooledPlcDriverManagerTest.java
index 510301299a9..ca420b347d5 100644
--- a/plc4j/utils/connection-pool/src/test/java/org/apache/plc4x/java/utils/connectionpool/PooledPlcDriverManagerTest.java
+++ b/plc4j/utils/connection-pool/src/test/java/org/apache/plc4x/java/utils/connectionpool/PooledPlcDriverManagerTest.java
@@ -1,367 +1,367 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package org.apache.plc4x.java.utils.connectionpool;
-
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
-import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.authentication.PlcUsernamePasswordAuthentication;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.exceptions.PlcUnsupportedOperationException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
-import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.metadata.PlcConnectionMetadata;
-import org.apache.plc4x.java.spi.PlcDriver;
-import org.assertj.core.api.WithAssertions;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.IntStream;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.*;
-
-@ExtendWith(MockitoExtension.class)
-class PooledPlcDriverManagerTest implements WithAssertions {
-
-    private static Logger LOGGER = LoggerFactory.getLogger(PooledPlcDriverManagerTest.class);
-
-    private PooledPlcDriverManager SUT = new PooledPlcDriverManager(pooledPlcConnectionFactory -> {
-        GenericKeyedObjectPoolConfig<PlcConnection> config = new GenericKeyedObjectPoolConfig<>();
-        config.setMinIdlePerKey(1);
-        config.setTestOnBorrow(true);
-        config.setTestOnReturn(true);
-        return new GenericKeyedObjectPool<>(pooledPlcConnectionFactory, config);
-    });
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    PlcDriver plcDriver;
-
-    private ExecutorService executorService;
-
-    @SuppressWarnings("unchecked")
-    @BeforeEach
-    void setUp() throws Exception {
-        Map<String, PlcDriver> driverMap = (Map) FieldUtils.getField(PooledPlcDriverManager.class, "driverMap", true).get(SUT);
-        driverMap.put("dummydummy", plcDriver);
-        executorService = Executors.newFixedThreadPool(100);
-
-        assertThat(SUT.getStatistics()).containsOnly(
-            entry("pools.count", 0),
-            entry("numActive", 0),
-            entry("numIdle", 0)
-        );
-    }
-
-    @AfterEach
-    void tearDown() {
-        executorService.shutdown();
-    }
-
-    @Test
-    void getConnection() throws Exception {
-        when(plcDriver.connect(anyString())).then(invocationOnMock -> new DummyPlcConnection(invocationOnMock.getArgument(0)));
-
-        LinkedList<Callable<PlcConnection>> callables = new LinkedList<>();
-
-        // This: should result in one open connection
-        IntStream.range(0, 8).forEach(i -> callables.add(() -> {
-            try {
-                return SUT.getConnection("dummydummy:single/socket1/socket2?fancyOption=true");
-            } catch (PlcConnectionException e) {
-                throw new RuntimeException(e);
-            }
-        }));
-
-        // This should result in five open connections
-        IntStream.range(0, 5).forEach(i -> callables.add(() -> {
-            try {
-                return SUT.getConnection("dummydummy:multi-" + i + "/socket1/socket2?fancyOption=true");
-            } catch (PlcConnectionException e) {
-                throw new RuntimeException(e);
-            }
-        }));
-
-        List<Future<PlcConnection>> futures = executorService.invokeAll(callables);
-
-        // Wait for existing connections
-        futures.forEach(plcConnectionFuture1 -> {
-            try {
-                plcConnectionFuture1.get();
-            } catch (InterruptedException | ExecutionException e) {
-                throw new RuntimeException(e);
-            }
-        });
-        LOGGER.info("Statistics after execution {}", SUT.getStatistics());
-
-        // As we have a pool size of 8 we should have only 8 + 5 calls for the separate pools
-        verify(plcDriver, times(13)).connect(anyString());
-
-        assertThat(SUT.getStatistics()).contains(
-            entry("PoolKey{url='dummydummy:single/socket1/socket2?fancyOption=true'}.numActive", 8)
-        );
-
-        futures.forEach(plcConnectionFuture -> {
-            try {
-                plcConnectionFuture.get().close();
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        });
-
-        assertThat(SUT.getStatistics()).contains(
-            entry("PoolKey{url='dummydummy:single/socket1/socket2?fancyOption=true'}.numActive", 0)
-        );
-    }
-
-    @Test
-    void getConnectionWithAuth() throws Exception {
-        when(plcDriver.connect(anyString(), any())).then(invocationOnMock -> new DummyPlcConnection(invocationOnMock.getArgument(0), invocationOnMock.getArgument(1)));
-
-        LinkedList<Callable<PlcConnection>> callables = new LinkedList<>();
-
-        // This: should result in one open connection
-        IntStream.range(0, 8).forEach(i -> callables.add(() -> {
-            try {
-                return SUT.getConnection("dummydummy:single/socket1/socket2?fancyOption=true", new PlcUsernamePasswordAuthentication("user", "passwordp954368564098Ɵ"));
-            } catch (PlcConnectionException e) {
-                throw new RuntimeException(e);
-            }
-        }));
-
-        // This should result in five open connections
-        IntStream.range(0, 5).forEach(i -> callables.add(() -> {
-            try {
-                return SUT.getConnection("dummydummy:multi-" + i + "/socket1/socket2?fancyOption=true", new PlcUsernamePasswordAuthentication("user", "passwordp954368564098Ɵ"));
-            } catch (PlcConnectionException e) {
-                throw new RuntimeException(e);
-            }
-        }));
-
-        List<Future<PlcConnection>> futures = executorService.invokeAll(callables);
-
-        futures.forEach(plcConnectionFuture1 -> {
-            try {
-                plcConnectionFuture1.get();
-            } catch (InterruptedException | ExecutionException e) {
-                throw new RuntimeException(e);
-            }
-        });
-
-        LOGGER.info("Statistics after execution {}", SUT.getStatistics());
-
-        // As we have a pool size of 8 we should have only 8 + 5 calls for the separate pools
-        verify(plcDriver, times(13)).connect(anyString(), any());
-
-        assertThat(SUT.getStatistics()).contains(
-            entry("PoolKey{url='dummydummy:single/socket1/socket2?fancyOption=true', plcAuthentication=PlcUsernamePasswordAuthentication{username='user', password='*****************'}}.numActive", 8)
-        );
-
-        futures.forEach(plcConnectionFuture -> {
-            try {
-                plcConnectionFuture.get().close();
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        });
-
-        assertThat(SUT.getStatistics()).contains(
-            entry("PoolKey{url='dummydummy:single/socket1/socket2?fancyOption=true', plcAuthentication=PlcUsernamePasswordAuthentication{username='user', password='*****************'}}.numActive", 0)
-        );
-    }
-
-    @Test
-    void connectionInvalidation() throws Exception {
-        when(plcDriver.connect(anyString())).then(invocationOnMock -> new DummyPlcConnection(invocationOnMock.getArgument(0)));
-
-        PlcConnection connection = SUT.getConnection("dummydummy:single/socket1/socket2?fancyOption=true");
-        assertThat(connection.isConnected()).isEqualTo(true);
-        assertThat(connection.getMetadata().canRead()).isEqualTo(false);
-        assertThat(connection.getMetadata().canWrite()).isEqualTo(false);
-        assertThat(connection.getMetadata().canSubscribe()).isEqualTo(false);
-
-        connection.close();
-        assertThatThrownBy(connection::connect).isInstanceOf(IllegalStateException.class).hasMessage("Proxy not valid anymore");
-        assertThatThrownBy(connection::isConnected).isInstanceOf(IllegalStateException.class).hasMessage("Proxy not valid anymore");
-        assertThatThrownBy(connection::close).isInstanceOf(IllegalStateException.class).hasMessage("Proxy not valid anymore");
-        assertThatThrownBy(connection::getMetadata).isInstanceOf(IllegalStateException.class).hasMessage("Proxy not valid anymore");
-        assertThatThrownBy(connection::readRequestBuilder).isInstanceOf(IllegalStateException.class).hasMessage("Proxy not valid anymore");
-        assertThatThrownBy(connection::writeRequestBuilder).isInstanceOf(IllegalStateException.class).hasMessage("Proxy not valid anymore");
-        assertThatThrownBy(connection::subscriptionRequestBuilder).isInstanceOf(IllegalStateException.class).hasMessage("Proxy not valid anymore");
-        assertThatThrownBy(connection::unsubscriptionRequestBuilder).isInstanceOf(IllegalStateException.class).hasMessage("Proxy not valid anymore");
-    }
-
-    @Test
-    void cleanupOfBrokenConnections() throws Exception {
-        AtomicBoolean failNow = new AtomicBoolean(false);
-        when(plcDriver.connect(anyString())).then(invocationOnMock -> {
-            DummyPlcConnection dummyPlcConnection = spy(new DummyPlcConnection(invocationOnMock.getArgument(0)));
-            // we fake an connection which breaks at this call
-            doAnswer(invocation -> {
-                if (failNow.get()) {
-                    throw new PlcConnectionException("blub");
-                }
-                return invocation.callRealMethod();
-            }).when(dummyPlcConnection).connect();
-            return dummyPlcConnection;
-        });
-
-        assertThat(SUT.getStatistics()).containsOnly(
-            entry("pools.count", 0),
-            entry("numActive", 0),
-            entry("numIdle", 0)
-        );
-        PlcConnection connection = SUT.getConnection("dummydummy:breakIt");
-        assertThat(SUT.getStatistics()).containsOnly(
-            entry("pools.count", 1),
-            entry("numActive", 1),
-            entry("numIdle", 0),
-            entry("PoolKey{url='dummydummy:breakIt'}.numActive", 1)
-        );
-        failNow.set(true);
-        try {
-            connection.connect();
-            fail("This should throw an exception");
-        } catch (Exception e) {
-            // TODO: currently UndeclaredThrowableException is the top one which should be InvocationTargetException
-            //assertThat(e).isInstanceOf(InvocationTargetException.class);
-            assertThat(e).hasRootCauseInstanceOf(PlcConnectionException.class);
-        }
-        // Faulty connection should have been discarded
-        assertThat(SUT.getStatistics()).containsOnly(
-            entry("pools.count", 0),
-            entry("numActive", 0),
-            entry("numIdle", 0)
-        );
-    }
-
-    @Test
-    public void testOtherConstructors() {
-        assertThat(new PooledPlcDriverManager()).isNotNull();
-        assertThat(new PooledPlcDriverManager(new PoolKeyFactory())).isNotNull();
-        assertThat(new PooledPlcDriverManager(PooledPlcDriverManager.class.getClassLoader())).isNotNull();
-        assertThat(new PooledPlcDriverManager(
-            PooledPlcDriverManager.class.getClassLoader(), new PoolKeyFactory())).isNotNull();
-    }
-
-    class DummyPlcConnection implements PlcConnection, PlcConnectionMetadata {
-
-        private final String url;
-
-        private final PlcAuthentication plcAuthentication;
-
-        boolean connected = false;
-
-        public DummyPlcConnection(String url) {
-            this(url, null);
-        }
-
-        public DummyPlcConnection(String url, PlcAuthentication plcAuthentication) {
-            this.url = url;
-            this.plcAuthentication = plcAuthentication;
-        }
-
-        @Override
-        public void connect() {
-            connected = true;
-        }
-
-        @Override
-        public CompletableFuture<Void> ping() {
-            CompletableFuture<Void> future = new CompletableFuture<>();
-            future.completeExceptionally(new UnsupportedOperationException());
-            return future;
-        }
-
-        @Override
-        public boolean isConnected() {
-            return connected;
-        }
-
-        @Override
-        public PlcConnectionMetadata getMetadata() {
-            return this;
-        }
-
-        @Override
-        public boolean canRead() {
-            return false;
-        }
-
-        @Override
-        public boolean canWrite() {
-            return false;
-        }
-
-        @Override
-        public boolean canSubscribe() {
-            return false;
-        }
-
-        @Override
-        public void close() {
-            connected = false;
-        }
-
-        @Override
-        public PlcReadRequest.Builder readRequestBuilder() {
-            throw new PlcUnsupportedOperationException("The connection does not support reading");
-        }
-
-        @Override
-        public PlcWriteRequest.Builder writeRequestBuilder() {
-            throw new PlcUnsupportedOperationException("The connection does not support writing");
-        }
-
-        @Override
-        public PlcSubscriptionRequest.Builder subscriptionRequestBuilder() {
-            throw new PlcUnsupportedOperationException("The connection does not support subscription");
-        }
-
-        @Override
-        public PlcUnsubscriptionRequest.Builder unsubscriptionRequestBuilder() {
-            throw new PlcUnsupportedOperationException("The connection does not support subscription");
-        }
-
-        @Override
-        public String toString() {
-            return "DummyPlcConnection{" +
-                "url='" + url + '\'' +
-                ", plcAuthentication=" + plcAuthentication +
-                ", connected=" + connected +
-                '}';
-        }
-    }
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package org.apache.plc4x.java.utils.connectionpool;
+
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
+import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.authentication.PlcAuthentication;
+import org.apache.plc4x.java.api.authentication.PlcUsernamePasswordAuthentication;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.exceptions.PlcUnsupportedOperationException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.metadata.PlcConnectionMetadata;
+import org.apache.plc4x.java.spi.PlcDriver;
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.IntStream;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class PooledPlcDriverManagerTest implements WithAssertions {
+
+    private static Logger LOGGER = LoggerFactory.getLogger(PooledPlcDriverManagerTest.class);
+
+    private PooledPlcDriverManager SUT = new PooledPlcDriverManager(pooledPlcConnectionFactory -> {
+        GenericKeyedObjectPoolConfig<PlcConnection> config = new GenericKeyedObjectPoolConfig<>();
+        config.setMinIdlePerKey(1);
+        config.setTestOnBorrow(true);
+        config.setTestOnReturn(true);
+        return new GenericKeyedObjectPool<>(pooledPlcConnectionFactory, config);
+    });
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    PlcDriver plcDriver;
+
+    private ExecutorService executorService;
+
+    @SuppressWarnings("unchecked")
+    @BeforeEach
+    void setUp() throws Exception {
+        Map<String, PlcDriver> driverMap = (Map) FieldUtils.getField(PooledPlcDriverManager.class, "driverMap", true).get(SUT);
+        driverMap.put("dummydummy", plcDriver);
+        executorService = Executors.newFixedThreadPool(100);
+
+        assertThat(SUT.getStatistics()).containsOnly(
+            entry("pools.count", 0),
+            entry("numActive", 0),
+            entry("numIdle", 0)
+        );
+    }
+
+    @AfterEach
+    void tearDown() {
+        executorService.shutdown();
+    }
+
+    @Test
+    void getConnection() throws Exception {
+        when(plcDriver.connect(anyString())).then(invocationOnMock -> new DummyPlcConnection(invocationOnMock.getArgument(0)));
+
+        LinkedList<Callable<PlcConnection>> callables = new LinkedList<>();
+
+        // This: should result in one open connection
+        IntStream.range(0, 8).forEach(i -> callables.add(() -> {
+            try {
+                return SUT.getConnection("dummydummy:single/socket1/socket2?fancyOption=true");
+            } catch (PlcConnectionException e) {
+                throw new RuntimeException(e);
+            }
+        }));
+
+        // This should result in five open connections
+        IntStream.range(0, 5).forEach(i -> callables.add(() -> {
+            try {
+                return SUT.getConnection("dummydummy:multi-" + i + "/socket1/socket2?fancyOption=true");
+            } catch (PlcConnectionException e) {
+                throw new RuntimeException(e);
+            }
+        }));
+
+        List<Future<PlcConnection>> futures = executorService.invokeAll(callables);
+
+        // Wait for existing connections
+        futures.forEach(plcConnectionFuture1 -> {
+            try {
+                plcConnectionFuture1.get();
+            } catch (InterruptedException | ExecutionException e) {
+                throw new RuntimeException(e);
+            }
+        });
+        LOGGER.info("Statistics after execution {}", SUT.getStatistics());
+
+        // As we have a pool size of 8 we should have only 8 + 5 calls for the separate pools
+        verify(plcDriver, times(13)).connect(anyString());
+
+        assertThat(SUT.getStatistics()).contains(
+            entry("PoolKey{url='dummydummy:single/socket1/socket2?fancyOption=true'}.numActive", 8)
+        );
+
+        futures.forEach(plcConnectionFuture -> {
+            try {
+                plcConnectionFuture.get().close();
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+
+        assertThat(SUT.getStatistics()).contains(
+            entry("PoolKey{url='dummydummy:single/socket1/socket2?fancyOption=true'}.numActive", 0)
+        );
+    }
+
+    @Test
+    void getConnectionWithAuth() throws Exception {
+        when(plcDriver.connect(anyString(), any())).then(invocationOnMock -> new DummyPlcConnection(invocationOnMock.getArgument(0), invocationOnMock.getArgument(1)));
+
+        LinkedList<Callable<PlcConnection>> callables = new LinkedList<>();
+
+        // This: should result in one open connection
+        IntStream.range(0, 8).forEach(i -> callables.add(() -> {
+            try {
+                return SUT.getConnection("dummydummy:single/socket1/socket2?fancyOption=true", new PlcUsernamePasswordAuthentication("user", "passwordp954368564098Ɵ"));
+            } catch (PlcConnectionException e) {
+                throw new RuntimeException(e);
+            }
+        }));
+
+        // This should result in five open connections
+        IntStream.range(0, 5).forEach(i -> callables.add(() -> {
+            try {
+                return SUT.getConnection("dummydummy:multi-" + i + "/socket1/socket2?fancyOption=true", new PlcUsernamePasswordAuthentication("user", "passwordp954368564098Ɵ"));
+            } catch (PlcConnectionException e) {
+                throw new RuntimeException(e);
+            }
+        }));
+
+        List<Future<PlcConnection>> futures = executorService.invokeAll(callables);
+
+        futures.forEach(plcConnectionFuture1 -> {
+            try {
+                plcConnectionFuture1.get();
+            } catch (InterruptedException | ExecutionException e) {
+                throw new RuntimeException(e);
+            }
+        });
+
+        LOGGER.info("Statistics after execution {}", SUT.getStatistics());
+
+        // As we have a pool size of 8 we should have only 8 + 5 calls for the separate pools
+        verify(plcDriver, times(13)).connect(anyString(), any());
+
+        assertThat(SUT.getStatistics()).contains(
+            entry("PoolKey{url='dummydummy:single/socket1/socket2?fancyOption=true', plcAuthentication=PlcUsernamePasswordAuthentication{username='user', password='*****************'}}.numActive", 8)
+        );
+
+        futures.forEach(plcConnectionFuture -> {
+            try {
+                plcConnectionFuture.get().close();
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+
+        assertThat(SUT.getStatistics()).contains(
+            entry("PoolKey{url='dummydummy:single/socket1/socket2?fancyOption=true', plcAuthentication=PlcUsernamePasswordAuthentication{username='user', password='*****************'}}.numActive", 0)
+        );
+    }
+
+    @Test
+    void connectionInvalidation() throws Exception {
+        when(plcDriver.connect(anyString())).then(invocationOnMock -> new DummyPlcConnection(invocationOnMock.getArgument(0)));
+
+        PlcConnection connection = SUT.getConnection("dummydummy:single/socket1/socket2?fancyOption=true");
+        assertThat(connection.isConnected()).isEqualTo(true);
+        assertThat(connection.getMetadata().canRead()).isEqualTo(false);
+        assertThat(connection.getMetadata().canWrite()).isEqualTo(false);
+        assertThat(connection.getMetadata().canSubscribe()).isEqualTo(false);
+
+        connection.close();
+        assertThatThrownBy(connection::connect).isInstanceOf(IllegalStateException.class).hasMessage("Proxy not valid anymore");
+        assertThatThrownBy(connection::isConnected).isInstanceOf(IllegalStateException.class).hasMessage("Proxy not valid anymore");
+        assertThatThrownBy(connection::close).isInstanceOf(IllegalStateException.class).hasMessage("Proxy not valid anymore");
+        assertThatThrownBy(connection::getMetadata).isInstanceOf(IllegalStateException.class).hasMessage("Proxy not valid anymore");
+        assertThatThrownBy(connection::readRequestBuilder).isInstanceOf(IllegalStateException.class).hasMessage("Proxy not valid anymore");
+        assertThatThrownBy(connection::writeRequestBuilder).isInstanceOf(IllegalStateException.class).hasMessage("Proxy not valid anymore");
+        assertThatThrownBy(connection::subscriptionRequestBuilder).isInstanceOf(IllegalStateException.class).hasMessage("Proxy not valid anymore");
+        assertThatThrownBy(connection::unsubscriptionRequestBuilder).isInstanceOf(IllegalStateException.class).hasMessage("Proxy not valid anymore");
+    }
+
+    @Test
+    void cleanupOfBrokenConnections() throws Exception {
+        AtomicBoolean failNow = new AtomicBoolean(false);
+        when(plcDriver.connect(anyString())).then(invocationOnMock -> {
+            DummyPlcConnection dummyPlcConnection = spy(new DummyPlcConnection(invocationOnMock.getArgument(0)));
+            // we fake an connection which breaks at this call
+            doAnswer(invocation -> {
+                if (failNow.get()) {
+                    throw new PlcConnectionException("blub");
+                }
+                return invocation.callRealMethod();
+            }).when(dummyPlcConnection).connect();
+            return dummyPlcConnection;
+        });
+
+        assertThat(SUT.getStatistics()).containsOnly(
+            entry("pools.count", 0),
+            entry("numActive", 0),
+            entry("numIdle", 0)
+        );
+        PlcConnection connection = SUT.getConnection("dummydummy:breakIt");
+        assertThat(SUT.getStatistics()).containsOnly(
+            entry("pools.count", 1),
+            entry("numActive", 1),
+            entry("numIdle", 0),
+            entry("PoolKey{url='dummydummy:breakIt'}.numActive", 1)
+        );
+        failNow.set(true);
+        try {
+            connection.connect();
+            fail("This should throw an exception");
+        } catch (Exception e) {
+            // TODO: currently UndeclaredThrowableException is the top one which should be InvocationTargetException
+            //assertThat(e).isInstanceOf(InvocationTargetException.class);
+            assertThat(e).hasRootCauseInstanceOf(PlcConnectionException.class);
+        }
+        // Faulty connection should have been discarded
+        assertThat(SUT.getStatistics()).containsOnly(
+            entry("pools.count", 0),
+            entry("numActive", 0),
+            entry("numIdle", 0)
+        );
+    }
+
+    @Test
+    public void testOtherConstructors() {
+        assertThat(new PooledPlcDriverManager()).isNotNull();
+        assertThat(new PooledPlcDriverManager(new PoolKeyFactory())).isNotNull();
+        assertThat(new PooledPlcDriverManager(PooledPlcDriverManager.class.getClassLoader())).isNotNull();
+        assertThat(new PooledPlcDriverManager(
+            PooledPlcDriverManager.class.getClassLoader(), new PoolKeyFactory())).isNotNull();
+    }
+
+    class DummyPlcConnection implements PlcConnection, PlcConnectionMetadata {
+
+        private final String url;
+
+        private final PlcAuthentication plcAuthentication;
+
+        boolean connected = false;
+
+        public DummyPlcConnection(String url) {
+            this(url, null);
+        }
+
+        public DummyPlcConnection(String url, PlcAuthentication plcAuthentication) {
+            this.url = url;
+            this.plcAuthentication = plcAuthentication;
+        }
+
+        @Override
+        public void connect() {
+            connected = true;
+        }
+
+        @Override
+        public CompletableFuture<Void> ping() {
+            CompletableFuture<Void> future = new CompletableFuture<>();
+            future.completeExceptionally(new UnsupportedOperationException());
+            return future;
+        }
+
+        @Override
+        public boolean isConnected() {
+            return connected;
+        }
+
+        @Override
+        public PlcConnectionMetadata getMetadata() {
+            return this;
+        }
+
+        @Override
+        public boolean canRead() {
+            return false;
+        }
+
+        @Override
+        public boolean canWrite() {
+            return false;
+        }
+
+        @Override
+        public boolean canSubscribe() {
+            return false;
+        }
+
+        @Override
+        public void close() {
+            connected = false;
+        }
+
+        @Override
+        public PlcReadRequest.Builder readRequestBuilder() {
+            throw new PlcUnsupportedOperationException("The connection does not support reading");
+        }
+
+        @Override
+        public PlcWriteRequest.Builder writeRequestBuilder() {
+            throw new PlcUnsupportedOperationException("The connection does not support writing");
+        }
+
+        @Override
+        public PlcSubscriptionRequest.Builder subscriptionRequestBuilder() {
+            throw new PlcUnsupportedOperationException("The connection does not support subscription");
+        }
+
+        @Override
+        public PlcUnsubscriptionRequest.Builder unsubscriptionRequestBuilder() {
+            throw new PlcUnsupportedOperationException("The connection does not support subscription");
+        }
+
+        @Override
+        public String toString() {
+            return "DummyPlcConnection{" +
+                "url='" + url + '\'' +
+                ", plcAuthentication=" + plcAuthentication +
+                ", connected=" + connected +
+                '}';
+        }
+    }
 }
\ No newline at end of file
diff --git a/plc4j/utils/connection-pool/src/test/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver b/plc4j/utils/connection-pool/src/test/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
index a2d97edcb55..9f88408e3dd 100644
--- a/plc4j/utils/connection-pool/src/test/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
+++ b/plc4j/utils/connection-pool/src/test/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
@@ -1,19 +1,19 @@
-#
-# 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
-#
-#   http://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.
-#
-org.apache.plc4x.java.utils.connectionpool.PooledDummyDriver
+#
+# 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
+#
+#   http://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.
+#
+org.apache.plc4x.java.utils.connectionpool.PooledDummyDriver
diff --git a/plc4j/utils/connection-pool/src/test/resources/logback.xml b/plc4j/utils/connection-pool/src/test/resources/logback.xml
index 31c49f0ba56..3ccaa1d0dd9 100644
--- a/plc4j/utils/connection-pool/src/test/resources/logback.xml
+++ b/plc4j/utils/connection-pool/src/test/resources/logback.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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
-  ~
-  ~     http://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.
-  -->
-<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoders are assigned the type
-         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="DEBUG">
-    <appender-ref ref="STDOUT" />
-  </root>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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
+  ~
+  ~     http://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.
+  -->
+<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="DEBUG">
+    <appender-ref ref="STDOUT" />
+  </root>
+
 </configuration>
\ No newline at end of file
diff --git a/plc4j/utils/driver-base-java/pom.xml b/plc4j/utils/driver-base-java/pom.xml
index 2adef4703ea..0d5a1dcf5b8 100644
--- a/plc4j/utils/driver-base-java/pom.xml
+++ b/plc4j/utils/driver-base-java/pom.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-utils</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-utils-driver-base-java</artifactId>
-
-  <name>PLC4J: Utils: Driver Base: Java</name>
-  <description>Base stuff containing shared base classes for java drivers.</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.github.jinahya</groupId>
-      <artifactId>bit-io</artifactId>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-utils</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-utils-driver-base-java</artifactId>
+
+  <name>PLC4J: Utils: Driver Base: Java</name>
+  <description>Base stuff containing shared base classes for java drivers.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.github.jinahya</groupId>
+      <artifactId>bit-io</artifactId>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/utils/driver-base-java/src/main/java/com/github/jinahya/bit/io/MyDefaultBitInput.java b/plc4j/utils/driver-base-java/src/main/java/com/github/jinahya/bit/io/MyDefaultBitInput.java
index eb538d9866a..0c989af32a3 100644
--- a/plc4j/utils/driver-base-java/src/main/java/com/github/jinahya/bit/io/MyDefaultBitInput.java
+++ b/plc4j/utils/driver-base-java/src/main/java/com/github/jinahya/bit/io/MyDefaultBitInput.java
@@ -1,35 +1,35 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-     http://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 com.github.jinahya.bit.io;
-
-/**
- * Modified version that exposes the position.
- */
-public class MyDefaultBitInput extends DefaultBitInput<ArrayByteInput> {
-
-    public MyDefaultBitInput(ArrayByteInput delegate) {
-        super(delegate);
-    }
-
-    public long getPos() {
-        return count;
-    }
-
-}
+/*
+ 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
+
+     http://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 com.github.jinahya.bit.io;
+
+/**
+ * Modified version that exposes the position.
+ */
+public class MyDefaultBitInput extends DefaultBitInput<ArrayByteInput> {
+
+    public MyDefaultBitInput(ArrayByteInput delegate) {
+        super(delegate);
+    }
+
+    public long getPos() {
+        return count;
+    }
+
+}
diff --git a/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/EvaluationHelper.java b/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/EvaluationHelper.java
index 8e62d797a94..886928cf3ca 100644
--- a/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/EvaluationHelper.java
+++ b/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/EvaluationHelper.java
@@ -1,53 +1,53 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.utils;
-
-public class EvaluationHelper {
-
-    public static boolean equals(Object val1, Object val2) {
-        if(val1 instanceof Number && val2 instanceof Number) {
-            Number number1 = (Number) val1;
-            Number number2 = (Number) val2;
-            return number1.doubleValue() == number2.doubleValue();
-        }
-        return false;
-    }
-
-    public static boolean notEquals(Object val1, Object val2) {
-        return true;
-    }
-
-    public static boolean greater(Object val1, Object val2) {
-        return true;
-    }
-
-    public static boolean greaterEquals(Object val1, Object val2) {
-        return true;
-    }
-
-    public static boolean smaller(Object val1, Object val2) {
-        return true;
-    }
-
-    public static boolean smallerEquals(Object val1, Object val2) {
-        return true;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.utils;
+
+public class EvaluationHelper {
+
+    public static boolean equals(Object val1, Object val2) {
+        if(val1 instanceof Number && val2 instanceof Number) {
+            Number number1 = (Number) val1;
+            Number number2 = (Number) val2;
+            return number1.doubleValue() == number2.doubleValue();
+        }
+        return false;
+    }
+
+    public static boolean notEquals(Object val1, Object val2) {
+        return true;
+    }
+
+    public static boolean greater(Object val1, Object val2) {
+        return true;
+    }
+
+    public static boolean greaterEquals(Object val1, Object val2) {
+        return true;
+    }
+
+    public static boolean smaller(Object val1, Object val2) {
+        return true;
+    }
+
+    public static boolean smallerEquals(Object val1, Object val2) {
+        return true;
+    }
+
+}
diff --git a/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/Message.java b/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/Message.java
index e12a6bb7aa3..d0394432bf8 100644
--- a/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/Message.java
+++ b/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/Message.java
@@ -1,26 +1,26 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.utils;
-
-public interface Message {
-
-    int getLengthInBytes();
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.utils;
+
+public interface Message {
+
+    int getLengthInBytes();
+
+}
diff --git a/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/MessageIO.java b/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/MessageIO.java
index 34e55365fa4..eecd79403a4 100644
--- a/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/MessageIO.java
+++ b/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/MessageIO.java
@@ -1,23 +1,23 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.utils;
-
-public interface MessageIO<PARSER_TYPE, SERIALIZER_TYPE> extends MessageInput<PARSER_TYPE>, MessageOutput<SERIALIZER_TYPE> {
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.utils;
+
+public interface MessageIO<PARSER_TYPE, SERIALIZER_TYPE> extends MessageInput<PARSER_TYPE>, MessageOutput<SERIALIZER_TYPE> {
+
+}
diff --git a/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/MessageInput.java b/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/MessageInput.java
index 02ac2c872cc..0b6308416f3 100644
--- a/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/MessageInput.java
+++ b/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/MessageInput.java
@@ -1,25 +1,25 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.utils;
-
-public interface MessageInput<PARSER_TYPE> {
-
-    PARSER_TYPE parse(ReadBuffer io) throws ParseException;
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.utils;
+
+public interface MessageInput<PARSER_TYPE> {
+
+    PARSER_TYPE parse(ReadBuffer io) throws ParseException;
+
+}
diff --git a/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/MessageOutput.java b/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/MessageOutput.java
index e15113c5bff..e6d70fe58df 100644
--- a/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/MessageOutput.java
+++ b/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/MessageOutput.java
@@ -1,25 +1,25 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.utils;
-
-public interface MessageOutput<SERIALIZER_TYPE> {
-
-    void serialize(WriteBuffer io, SERIALIZER_TYPE value) throws ParseException;
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.utils;
+
+public interface MessageOutput<SERIALIZER_TYPE> {
+
+    void serialize(WriteBuffer io, SERIALIZER_TYPE value) throws ParseException;
+
+}
diff --git a/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/ParseException.java b/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/ParseException.java
index 04ab6a17b5c..c09e74672c8 100644
--- a/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/ParseException.java
+++ b/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/ParseException.java
@@ -1,32 +1,32 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.utils;
-
-public class ParseException extends Exception {
-
-    public ParseException(String message) {
-        super(message);
-    }
-
-    public ParseException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.utils;
+
+public class ParseException extends Exception {
+
+    public ParseException(String message) {
+        super(message);
+    }
+
+    public ParseException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+}
diff --git a/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/ReadBuffer.java b/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/ReadBuffer.java
index 43ac53cfc14..51acc7e6fa6 100644
--- a/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/ReadBuffer.java
+++ b/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/ReadBuffer.java
@@ -1,219 +1,219 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.utils;
-
-import com.github.jinahya.bit.io.ArrayByteInput;
-import com.github.jinahya.bit.io.MyDefaultBitInput;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-public class ReadBuffer {
-
-    private final MyDefaultBitInput bi;
-    private final boolean littleEndian;
-
-    public ReadBuffer(byte[] input) {
-        this(input, true);
-    }
-
-    public ReadBuffer(byte[] input, boolean littleEndian) {
-        ArrayByteInput abi = new ArrayByteInput(input);
-        bi = new MyDefaultBitInput(abi);
-        this.littleEndian = littleEndian;
-    }
-
-    public int getPos() {
-        return (int) bi.getPos();
-    }
-
-    public byte peekByte(int offset) throws ParseException {
-        // Remember the old index.
-        int oldIndex = bi.getDelegate().getIndex();
-        try {
-            // Set the delegate to the desired position.
-            bi.getDelegate().index(oldIndex + offset);
-            // Read the byte.
-            return bi.readByte(false, 8);
-        } catch (IOException e) {
-            throw new ParseException("Error reading", e);
-        } finally {
-            // Reset the delegate to the old index.
-            bi.getDelegate().index(oldIndex);
-        }
-    }
-
-    public boolean readBit() throws ParseException {
-        try {
-            return bi.readBoolean();
-        } catch (IOException e) {
-            throw new ParseException("Error reading", e);
-        }
-    }
-
-    public byte readUnsignedByte(int bitLength) throws ParseException {
-        if(bitLength <= 0) {
-            throw new ParseException("unsigned byte must contain at least 1 bit");
-        }
-        if(bitLength > 4) {
-            throw new ParseException("unsigned byte can only contain max 4 bits");
-        }
-        try {
-            return bi.readByte(true, bitLength);
-        } catch (IOException e) {
-            throw new ParseException("Error reading", e);
-        }
-    }
-
-    public short readUnsignedShort(int bitLength) throws ParseException {
-        if(bitLength <= 0) {
-            throw new ParseException("unsigned short must contain at least 1 bit");
-        }
-        if(bitLength > 8) {
-            throw new ParseException("unsigned short can only contain max 8 bits");
-        }
-        try {
-            return bi.readShort(true, bitLength);
-        } catch (IOException e) {
-            throw new ParseException("Error reading", e);
-        }
-    }
-
-    public int readUnsignedInt(int bitLength) throws ParseException {
-        if(bitLength <= 0) {
-            throw new ParseException("unsigned int must contain at least 1 bit");
-        }
-        if(bitLength > 16) {
-            throw new ParseException("unsigned int can only contain max 16 bits");
-        }
-        try {
-            if(!littleEndian) {
-                return Integer.reverseBytes(bi.readInt(true, bitLength)) >> 16;
-            }
-            return bi.readInt(true, bitLength);
-        } catch (IOException e) {
-            throw new ParseException("Error reading", e);
-        }
-    }
-
-    public long readUnsignedLong(int bitLength) throws ParseException {
-        if(bitLength <= 0) {
-            throw new ParseException("unsigned long must contain at least 1 bit");
-        }
-        if(bitLength > 32) {
-            throw new ParseException("unsigned long can only contain max 32 bits");
-        }
-        try {
-            if(!littleEndian) {
-                return Long.reverseBytes(bi.readLong(true, bitLength)) >> 32;
-            }
-            return bi.readLong(true, bitLength);
-        } catch (IOException e) {
-            throw new ParseException("Error reading", e);
-        }
-    }
-
-    public BigInteger readUnsignedBigInteger(int bitLength) throws ParseException {
-        throw new UnsupportedOperationException("not implemented yet");
-    }
-
-    public byte readByte(int bitLength) throws ParseException {
-        if(bitLength <= 0) {
-            throw new ParseException("byte must contain at least 1 bit");
-        }
-        if(bitLength > 8) {
-            throw new ParseException("byte can only contain max 8 bits");
-        }
-        try {
-            return bi.readByte(false, bitLength);
-        } catch (IOException e) {
-            throw new ParseException("Error reading", e);
-        }
-    }
-
-    public short readShort(int bitLength) throws ParseException {
-        if(bitLength <= 0) {
-            throw new ParseException("short must contain at least 1 bit");
-        }
-        if(bitLength > 16) {
-            throw new ParseException("short can only contain max 16 bits");
-        }
-        try {
-            if(!littleEndian) {
-                return Short.reverseBytes(bi.readShort(false, bitLength));
-            }
-            return bi.readShort(false, bitLength);
-        } catch (IOException e) {
-            throw new ParseException("Error reading", e);
-        }
-    }
-
-    public int readInt(int bitLength) throws ParseException {
-        if(bitLength <= 0) {
-            throw new ParseException("int must contain at least 1 bit");
-        }
-        if(bitLength > 32) {
-            throw new ParseException("int can only contain max 32 bits");
-        }
-        try {
-            if(!littleEndian) {
-                return Integer.reverseBytes(bi.readInt(false, bitLength));
-            }
-            return bi.readInt(false, bitLength);
-        } catch (IOException e) {
-            throw new ParseException("Error reading", e);
-        }
-    }
-
-    public long readLong(int bitLength) throws ParseException {
-        if(bitLength <= 0) {
-            throw new ParseException("long must contain at least 1 bit");
-        }
-        if(bitLength > 64) {
-            throw new ParseException("long can only contain max 64 bits");
-        }
-        try {
-            if(!littleEndian) {
-                return Long.reverseBytes(bi.readLong(false, bitLength));
-            }
-            return bi.readLong(false, bitLength);
-        } catch (IOException e) {
-            throw new ParseException("Error reading", e);
-        }
-    }
-
-    public BigInteger readBigInteger(int bitLength) throws ParseException {
-        throw new UnsupportedOperationException("not implemented yet");
-    }
-
-    public float readFloat(int bitLength) throws ParseException {
-        throw new UnsupportedOperationException("not implemented yet");
-    }
-
-    public double readDouble(int bitLength) throws ParseException {
-        throw new UnsupportedOperationException("not implemented yet");
-    }
-
-    public BigDecimal readBigDecimal(int bitLength) throws ParseException {
-        throw new UnsupportedOperationException("not implemented yet");
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.utils;
+
+import com.github.jinahya.bit.io.ArrayByteInput;
+import com.github.jinahya.bit.io.MyDefaultBitInput;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+public class ReadBuffer {
+
+    private final MyDefaultBitInput bi;
+    private final boolean littleEndian;
+
+    public ReadBuffer(byte[] input) {
+        this(input, true);
+    }
+
+    public ReadBuffer(byte[] input, boolean littleEndian) {
+        ArrayByteInput abi = new ArrayByteInput(input);
+        bi = new MyDefaultBitInput(abi);
+        this.littleEndian = littleEndian;
+    }
+
+    public int getPos() {
+        return (int) bi.getPos();
+    }
+
+    public byte peekByte(int offset) throws ParseException {
+        // Remember the old index.
+        int oldIndex = bi.getDelegate().getIndex();
+        try {
+            // Set the delegate to the desired position.
+            bi.getDelegate().index(oldIndex + offset);
+            // Read the byte.
+            return bi.readByte(false, 8);
+        } catch (IOException e) {
+            throw new ParseException("Error reading", e);
+        } finally {
+            // Reset the delegate to the old index.
+            bi.getDelegate().index(oldIndex);
+        }
+    }
+
+    public boolean readBit() throws ParseException {
+        try {
+            return bi.readBoolean();
+        } catch (IOException e) {
+            throw new ParseException("Error reading", e);
+        }
+    }
+
+    public byte readUnsignedByte(int bitLength) throws ParseException {
+        if(bitLength <= 0) {
+            throw new ParseException("unsigned byte must contain at least 1 bit");
+        }
+        if(bitLength > 4) {
+            throw new ParseException("unsigned byte can only contain max 4 bits");
+        }
+        try {
+            return bi.readByte(true, bitLength);
+        } catch (IOException e) {
+            throw new ParseException("Error reading", e);
+        }
+    }
+
+    public short readUnsignedShort(int bitLength) throws ParseException {
+        if(bitLength <= 0) {
+            throw new ParseException("unsigned short must contain at least 1 bit");
+        }
+        if(bitLength > 8) {
+            throw new ParseException("unsigned short can only contain max 8 bits");
+        }
+        try {
+            return bi.readShort(true, bitLength);
+        } catch (IOException e) {
+            throw new ParseException("Error reading", e);
+        }
+    }
+
+    public int readUnsignedInt(int bitLength) throws ParseException {
+        if(bitLength <= 0) {
+            throw new ParseException("unsigned int must contain at least 1 bit");
+        }
+        if(bitLength > 16) {
+            throw new ParseException("unsigned int can only contain max 16 bits");
+        }
+        try {
+            if(!littleEndian) {
+                return Integer.reverseBytes(bi.readInt(true, bitLength)) >> 16;
+            }
+            return bi.readInt(true, bitLength);
+        } catch (IOException e) {
+            throw new ParseException("Error reading", e);
+        }
+    }
+
+    public long readUnsignedLong(int bitLength) throws ParseException {
+        if(bitLength <= 0) {
+            throw new ParseException("unsigned long must contain at least 1 bit");
+        }
+        if(bitLength > 32) {
+            throw new ParseException("unsigned long can only contain max 32 bits");
+        }
+        try {
+            if(!littleEndian) {
+                return Long.reverseBytes(bi.readLong(true, bitLength)) >> 32;
+            }
+            return bi.readLong(true, bitLength);
+        } catch (IOException e) {
+            throw new ParseException("Error reading", e);
+        }
+    }
+
+    public BigInteger readUnsignedBigInteger(int bitLength) throws ParseException {
+        throw new UnsupportedOperationException("not implemented yet");
+    }
+
+    public byte readByte(int bitLength) throws ParseException {
+        if(bitLength <= 0) {
+            throw new ParseException("byte must contain at least 1 bit");
+        }
+        if(bitLength > 8) {
+            throw new ParseException("byte can only contain max 8 bits");
+        }
+        try {
+            return bi.readByte(false, bitLength);
+        } catch (IOException e) {
+            throw new ParseException("Error reading", e);
+        }
+    }
+
+    public short readShort(int bitLength) throws ParseException {
+        if(bitLength <= 0) {
+            throw new ParseException("short must contain at least 1 bit");
+        }
+        if(bitLength > 16) {
+            throw new ParseException("short can only contain max 16 bits");
+        }
+        try {
+            if(!littleEndian) {
+                return Short.reverseBytes(bi.readShort(false, bitLength));
+            }
+            return bi.readShort(false, bitLength);
+        } catch (IOException e) {
+            throw new ParseException("Error reading", e);
+        }
+    }
+
+    public int readInt(int bitLength) throws ParseException {
+        if(bitLength <= 0) {
+            throw new ParseException("int must contain at least 1 bit");
+        }
+        if(bitLength > 32) {
+            throw new ParseException("int can only contain max 32 bits");
+        }
+        try {
+            if(!littleEndian) {
+                return Integer.reverseBytes(bi.readInt(false, bitLength));
+            }
+            return bi.readInt(false, bitLength);
+        } catch (IOException e) {
+            throw new ParseException("Error reading", e);
+        }
+    }
+
+    public long readLong(int bitLength) throws ParseException {
+        if(bitLength <= 0) {
+            throw new ParseException("long must contain at least 1 bit");
+        }
+        if(bitLength > 64) {
+            throw new ParseException("long can only contain max 64 bits");
+        }
+        try {
+            if(!littleEndian) {
+                return Long.reverseBytes(bi.readLong(false, bitLength));
+            }
+            return bi.readLong(false, bitLength);
+        } catch (IOException e) {
+            throw new ParseException("Error reading", e);
+        }
+    }
+
+    public BigInteger readBigInteger(int bitLength) throws ParseException {
+        throw new UnsupportedOperationException("not implemented yet");
+    }
+
+    public float readFloat(int bitLength) throws ParseException {
+        throw new UnsupportedOperationException("not implemented yet");
+    }
+
+    public double readDouble(int bitLength) throws ParseException {
+        throw new UnsupportedOperationException("not implemented yet");
+    }
+
+    public BigDecimal readBigDecimal(int bitLength) throws ParseException {
+        throw new UnsupportedOperationException("not implemented yet");
+    }
+
+}
diff --git a/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/WriteBuffer.java b/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/WriteBuffer.java
index 8c14102e122..9ad740c5ccf 100644
--- a/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/WriteBuffer.java
+++ b/plc4j/utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/WriteBuffer.java
@@ -1,208 +1,208 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.utils;
-
-import com.github.jinahya.bit.io.BitOutput;
-import com.github.jinahya.bit.io.BufferByteOutput;
-import com.github.jinahya.bit.io.DefaultBitOutput;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-
-public class WriteBuffer {
-
-    private final ByteBuffer bb;
-    private final BufferByteOutput bbo;
-    private final BitOutput bo;
-    private final boolean littleEndian;
-
-    public WriteBuffer(int size) {
-        this(size, true);
-    }
-
-    public WriteBuffer(int size, boolean littleEndian) {
-        bb = ByteBuffer.allocate(size);
-        bbo = new BufferByteOutput<>(bb);
-        bo = new DefaultBitOutput<>(bbo);
-        this.littleEndian = littleEndian;
-    }
-
-    public byte[] getData() {
-        return bb.array();
-    }
-
-    public void writeBit(boolean value) throws ParseException {
-        try {
-            bo.writeBoolean(value);
-        } catch (IOException e) {
-            throw new ParseException("Error reading", e);
-        }
-    }
-
-    public void writeUnsignedByte(int bitLength, byte value) throws ParseException {
-        if(bitLength <= 0) {
-            throw new ParseException("unsigned byte must contain at least 1 bit");
-        }
-        if(bitLength > 4) {
-            throw new ParseException("unsigned byte can only contain max 4 bits");
-        }
-        try {
-            bo.writeByte(true, bitLength, value);
-        } catch (IOException e) {
-            throw new ParseException("Error reading", e);
-        }
-    }
-
-    public void writeUnsignedShort(int bitLength, short value) throws ParseException {
-        if(bitLength <= 0) {
-            throw new ParseException("unsigned short must contain at least 1 bit");
-        }
-        if(bitLength > 8) {
-            throw new ParseException("unsigned short can only contain max 8 bits");
-        }
-        try {
-            bo.writeShort(true, bitLength, value);
-        } catch (IOException e) {
-            throw new ParseException("Error reading", e);
-        }
-    }
-
-    public void writeUnsignedInt(int bitLength, int value) throws ParseException {
-        if(bitLength <= 0) {
-            throw new ParseException("unsigned int must contain at least 1 bit");
-        }
-        if(bitLength > 16) {
-            throw new ParseException("unsigned int can only contain max 16 bits");
-        }
-        try {
-            if(!littleEndian) {
-                value = Integer.reverseBytes(value) >> 16;
-            }
-            bo.writeInt(true, bitLength, value);
-        } catch (IOException e) {
-            throw new ParseException("Error reading", e);
-        }
-    }
-
-    public void writeUnsignedLong(int bitLength, long value) throws ParseException {
-        if(bitLength <= 0) {
-            throw new ParseException("unsigned long must contain at least 1 bit");
-        }
-        if(bitLength > 32) {
-            throw new ParseException("unsigned long can only contain max 32 bits");
-        }
-        try {
-            if(!littleEndian) {
-                value = Long.reverseBytes(value) >> 32;
-            }
-            bo.writeLong(true, bitLength, value);
-        } catch (IOException e) {
-            throw new ParseException("Error reading", e);
-        }
-    }
-
-    public void writeUnsignedBigInteger(int bitLength, BigInteger value) throws ParseException {
-        throw new UnsupportedOperationException("not implemented yet");
-    }
-
-    public void writeByte(int bitLength, byte value) throws ParseException {
-        if(bitLength <= 0) {
-            throw new ParseException("byte must contain at least 1 bit");
-        }
-        if(bitLength > 8) {
-            throw new ParseException("byte can only contain max 8 bits");
-        }
-        try {
-            bo.writeByte(false, bitLength, value);
-        } catch (IOException e) {
-            throw new ParseException("Error reading", e);
-        }
-    }
-
-    public void writeShort(int bitLength, short value) throws ParseException {
-        if(bitLength <= 0) {
-            throw new ParseException("short must contain at least 1 bit");
-        }
-        if(bitLength > 16) {
-            throw new ParseException("short can only contain max 16 bits");
-        }
-        try {
-            if(!littleEndian) {
-                value = Short.reverseBytes(value);
-            }
-            bo.writeShort(false, bitLength, value);
-        } catch (IOException e) {
-            throw new ParseException("Error reading", e);
-        }
-    }
-
-    public void writeInt(int bitLength, int value) throws ParseException {
-        if(bitLength <= 0) {
-            throw new ParseException("int must contain at least 1 bit");
-        }
-        if(bitLength > 32) {
-            throw new ParseException("int can only contain max 32 bits");
-        }
-        try {
-            if(!littleEndian) {
-                value = Integer.reverseBytes(value);
-            }
-            bo.writeInt(false, bitLength, value);
-        } catch (IOException e) {
-            throw new ParseException("Error reading", e);
-        }
-    }
-
-    public void writeLong(int bitLength, long value) throws ParseException {
-        if(bitLength <= 0) {
-            throw new ParseException("long must contain at least 1 bit");
-        }
-        if(bitLength > 64) {
-            throw new ParseException("long can only contain max 64 bits");
-        }
-        try {
-            if(!littleEndian) {
-                value = Long.reverseBytes(value);
-            }
-            bo.writeLong(false, bitLength, value);
-        } catch (IOException e) {
-            throw new ParseException("Error reading", e);
-        }
-    }
-
-    public void writeBigInteger(int bitLength, BigInteger value) throws ParseException {
-        throw new UnsupportedOperationException("not implemented yet");
-    }
-
-    public void writeFloat(int bitLength, float value) throws ParseException {
-        throw new UnsupportedOperationException("not implemented yet");
-    }
-
-    public void writeDouble(int bitLength, double value) throws ParseException {
-        throw new UnsupportedOperationException("not implemented yet");
-    }
-
-    public void writeBigDecimal(int bitLength, BigDecimal value) throws ParseException {
-        throw new UnsupportedOperationException("not implemented yet");
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.utils;
+
+import com.github.jinahya.bit.io.BitOutput;
+import com.github.jinahya.bit.io.BufferByteOutput;
+import com.github.jinahya.bit.io.DefaultBitOutput;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+
+public class WriteBuffer {
+
+    private final ByteBuffer bb;
+    private final BufferByteOutput bbo;
+    private final BitOutput bo;
+    private final boolean littleEndian;
+
+    public WriteBuffer(int size) {
+        this(size, true);
+    }
+
+    public WriteBuffer(int size, boolean littleEndian) {
+        bb = ByteBuffer.allocate(size);
+        bbo = new BufferByteOutput<>(bb);
+        bo = new DefaultBitOutput<>(bbo);
+        this.littleEndian = littleEndian;
+    }
+
+    public byte[] getData() {
+        return bb.array();
+    }
+
+    public void writeBit(boolean value) throws ParseException {
+        try {
+            bo.writeBoolean(value);
+        } catch (IOException e) {
+            throw new ParseException("Error reading", e);
+        }
+    }
+
+    public void writeUnsignedByte(int bitLength, byte value) throws ParseException {
+        if(bitLength <= 0) {
+            throw new ParseException("unsigned byte must contain at least 1 bit");
+        }
+        if(bitLength > 4) {
+            throw new ParseException("unsigned byte can only contain max 4 bits");
+        }
+        try {
+            bo.writeByte(true, bitLength, value);
+        } catch (IOException e) {
+            throw new ParseException("Error reading", e);
+        }
+    }
+
+    public void writeUnsignedShort(int bitLength, short value) throws ParseException {
+        if(bitLength <= 0) {
+            throw new ParseException("unsigned short must contain at least 1 bit");
+        }
+        if(bitLength > 8) {
+            throw new ParseException("unsigned short can only contain max 8 bits");
+        }
+        try {
+            bo.writeShort(true, bitLength, value);
+        } catch (IOException e) {
+            throw new ParseException("Error reading", e);
+        }
+    }
+
+    public void writeUnsignedInt(int bitLength, int value) throws ParseException {
+        if(bitLength <= 0) {
+            throw new ParseException("unsigned int must contain at least 1 bit");
+        }
+        if(bitLength > 16) {
+            throw new ParseException("unsigned int can only contain max 16 bits");
+        }
+        try {
+            if(!littleEndian) {
+                value = Integer.reverseBytes(value) >> 16;
+            }
+            bo.writeInt(true, bitLength, value);
+        } catch (IOException e) {
+            throw new ParseException("Error reading", e);
+        }
+    }
+
+    public void writeUnsignedLong(int bitLength, long value) throws ParseException {
+        if(bitLength <= 0) {
+            throw new ParseException("unsigned long must contain at least 1 bit");
+        }
+        if(bitLength > 32) {
+            throw new ParseException("unsigned long can only contain max 32 bits");
+        }
+        try {
+            if(!littleEndian) {
+                value = Long.reverseBytes(value) >> 32;
+            }
+            bo.writeLong(true, bitLength, value);
+        } catch (IOException e) {
+            throw new ParseException("Error reading", e);
+        }
+    }
+
+    public void writeUnsignedBigInteger(int bitLength, BigInteger value) throws ParseException {
+        throw new UnsupportedOperationException("not implemented yet");
+    }
+
+    public void writeByte(int bitLength, byte value) throws ParseException {
+        if(bitLength <= 0) {
+            throw new ParseException("byte must contain at least 1 bit");
+        }
+        if(bitLength > 8) {
+            throw new ParseException("byte can only contain max 8 bits");
+        }
+        try {
+            bo.writeByte(false, bitLength, value);
+        } catch (IOException e) {
+            throw new ParseException("Error reading", e);
+        }
+    }
+
+    public void writeShort(int bitLength, short value) throws ParseException {
+        if(bitLength <= 0) {
+            throw new ParseException("short must contain at least 1 bit");
+        }
+        if(bitLength > 16) {
+            throw new ParseException("short can only contain max 16 bits");
+        }
+        try {
+            if(!littleEndian) {
+                value = Short.reverseBytes(value);
+            }
+            bo.writeShort(false, bitLength, value);
+        } catch (IOException e) {
+            throw new ParseException("Error reading", e);
+        }
+    }
+
+    public void writeInt(int bitLength, int value) throws ParseException {
+        if(bitLength <= 0) {
+            throw new ParseException("int must contain at least 1 bit");
+        }
+        if(bitLength > 32) {
+            throw new ParseException("int can only contain max 32 bits");
+        }
+        try {
+            if(!littleEndian) {
+                value = Integer.reverseBytes(value);
+            }
+            bo.writeInt(false, bitLength, value);
+        } catch (IOException e) {
+            throw new ParseException("Error reading", e);
+        }
+    }
+
+    public void writeLong(int bitLength, long value) throws ParseException {
+        if(bitLength <= 0) {
+            throw new ParseException("long must contain at least 1 bit");
+        }
+        if(bitLength > 64) {
+            throw new ParseException("long can only contain max 64 bits");
+        }
+        try {
+            if(!littleEndian) {
+                value = Long.reverseBytes(value);
+            }
+            bo.writeLong(false, bitLength, value);
+        } catch (IOException e) {
+            throw new ParseException("Error reading", e);
+        }
+    }
+
+    public void writeBigInteger(int bitLength, BigInteger value) throws ParseException {
+        throw new UnsupportedOperationException("not implemented yet");
+    }
+
+    public void writeFloat(int bitLength, float value) throws ParseException {
+        throw new UnsupportedOperationException("not implemented yet");
+    }
+
+    public void writeDouble(int bitLength, double value) throws ParseException {
+        throw new UnsupportedOperationException("not implemented yet");
+    }
+
+    public void writeBigDecimal(int bitLength, BigDecimal value) throws ParseException {
+        throw new UnsupportedOperationException("not implemented yet");
+    }
+
+}
diff --git a/plc4j/utils/interop/pom.xml b/plc4j/utils/interop/pom.xml
index ab3f76c21da..d5179cf3baa 100644
--- a/plc4j/utils/interop/pom.xml
+++ b/plc4j/utils/interop/pom.xml
@@ -1,216 +1,216 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-utils</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>interop-server</artifactId>
-  <name>PLC4J: Utils: Interop-Server</name>
-
-  <build>
-    <plugins>
-      <!-- Unpack the protocol spec -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.1.1</version>
-        <executions>
-          <execution>
-            <id>unpack-protocol-spec</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.apache.plc4x</groupId>
-                  <artifactId>plc4x-protocols-proxy</artifactId>
-                  <type>jar</type>
-                  <overWrite>true</overWrite>
-                  <outputDirectory>${project.build.directory}/protocol-spec</outputDirectory>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.apache.plc4x</groupId>
-                  <artifactId>plc4x-tools-thrift</artifactId>
-                  <type>zip</type>
-                  <classifier>compiler-${os.classifier}</classifier>
-                  <overWrite>true</overWrite>
-                  <outputDirectory>${project.build.directory}/thrift-compiler</outputDirectory>
-                  <destFileName>${thrift.compiler.executable}</destFileName>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-          <execution>
-            <id>check-dependencies</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>analyze-only</goal>
-            </goals>
-            <configuration>
-              <failOnWarning>true</failOnWarning>
-              <usedDependencies combine.children="append">
-                <usedDependency>org.apache.plc4x:plc4x-tools-thrift</usedDependency>
-                <usedDependency>org.apache.plc4x:plc4x-protocols-proxy</usedDependency>
-                <usedDependency>javax.annotation:jsr250-api</usedDependency>
-              </usedDependencies>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- Generate the sources from the spec -->
-      <plugin>
-        <groupId>org.apache.thrift.tools</groupId>
-        <artifactId>maven-thrift-plugin</artifactId>
-        <version>0.1.11</version>
-        <configuration>
-          <thriftExecutable>${project.build.directory}/thrift-compiler/${thrift.compiler.executable}</thriftExecutable>
-          <thriftSourceRoot>${project.build.directory}/protocol-spec</thriftSourceRoot>
-          <includes>
-            <include>**/interop.thrift</include>
-          </includes>
-          <generator>java</generator>
-        </configuration>
-        <executions>
-          <execution>
-            <id>thrift-sources</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>thrift-test-sources</id>
-            <phase>generate-test-sources</phase>
-            <goals>
-              <goal>testCompile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- Create a fat jar -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>3.1.1</version>
-        <configuration>
-          <!-- get all project dependencies -->
-          <!--          <descriptorRefs>-->
-          <!--            <descriptorRef>jar-with-dependencies</descriptorRef>-->
-          <!--            <descriptorRef>metaInf-services</descriptorRef>-->
-          <!--          </descriptorRefs>-->
-          <descriptors>src/assembly/assembly.xml</descriptors>
-          <!-- MainClass in mainfest make a executable jar -->
-          <archive>
-            <manifest>
-              <mainClass>org.apache.plc4x.interop.impl.Server</mainClass>
-            </manifest>
-          </archive>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <!-- bind to the packaging phase -->
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-      <version>1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.thrift</groupId>
-      <artifactId>libthrift</artifactId>
-      <version>0.12.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base-test</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>20030203.000129</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <!-- Make sure this is built before this module -->
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-protocols-proxy</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-tools-thrift</artifactId>
-      <type>zip</type>
-      <classifier>compiler-${os.classifier}</classifier>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.plc4x</groupId>
-        <artifactId>plc4x-protocols-proxy</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.plc4x</groupId>
-        <artifactId>plc4x-tools-thrift</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
-        <type>zip</type>
-        <classifier>compiler-${os.classifier}</classifier>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-utils</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>interop-server</artifactId>
+  <name>PLC4J: Utils: Interop-Server</name>
+
+  <build>
+    <plugins>
+      <!-- Unpack the protocol spec -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>3.1.1</version>
+        <executions>
+          <execution>
+            <id>unpack-protocol-spec</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.apache.plc4x</groupId>
+                  <artifactId>plc4x-protocols-proxy</artifactId>
+                  <type>jar</type>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/protocol-spec</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.plc4x</groupId>
+                  <artifactId>plc4x-tools-thrift</artifactId>
+                  <type>zip</type>
+                  <classifier>compiler-${os.classifier}</classifier>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/thrift-compiler</outputDirectory>
+                  <destFileName>${thrift.compiler.executable}</destFileName>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>check-dependencies</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>analyze-only</goal>
+            </goals>
+            <configuration>
+              <failOnWarning>true</failOnWarning>
+              <usedDependencies combine.children="append">
+                <usedDependency>org.apache.plc4x:plc4x-tools-thrift</usedDependency>
+                <usedDependency>org.apache.plc4x:plc4x-protocols-proxy</usedDependency>
+                <usedDependency>javax.annotation:jsr250-api</usedDependency>
+              </usedDependencies>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- Generate the sources from the spec -->
+      <plugin>
+        <groupId>org.apache.thrift.tools</groupId>
+        <artifactId>maven-thrift-plugin</artifactId>
+        <version>0.1.11</version>
+        <configuration>
+          <thriftExecutable>${project.build.directory}/thrift-compiler/${thrift.compiler.executable}</thriftExecutable>
+          <thriftSourceRoot>${project.build.directory}/protocol-spec</thriftSourceRoot>
+          <includes>
+            <include>**/interop.thrift</include>
+          </includes>
+          <generator>java</generator>
+        </configuration>
+        <executions>
+          <execution>
+            <id>thrift-sources</id>
+            <phase>process-sources</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>thrift-test-sources</id>
+            <phase>generate-test-sources</phase>
+            <goals>
+              <goal>testCompile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- Create a fat jar -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>3.1.1</version>
+        <configuration>
+          <!-- get all project dependencies -->
+          <!--          <descriptorRefs>-->
+          <!--            <descriptorRef>jar-with-dependencies</descriptorRef>-->
+          <!--            <descriptorRef>metaInf-services</descriptorRef>-->
+          <!--          </descriptorRefs>-->
+          <descriptors>src/assembly/assembly.xml</descriptors>
+          <!-- MainClass in mainfest make a executable jar -->
+          <archive>
+            <manifest>
+              <mainClass>org.apache.plc4x.interop.impl.Server</mainClass>
+            </manifest>
+          </archive>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <!-- bind to the packaging phase -->
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>jsr250-api</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.thrift</groupId>
+      <artifactId>libthrift</artifactId>
+      <version>0.12.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base-test</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>20030203.000129</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <!-- Make sure this is built before this module -->
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-protocols-proxy</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-tools-thrift</artifactId>
+      <type>zip</type>
+      <classifier>compiler-${os.classifier}</classifier>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.plc4x</groupId>
+        <artifactId>plc4x-protocols-proxy</artifactId>
+        <version>0.6.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.plc4x</groupId>
+        <artifactId>plc4x-tools-thrift</artifactId>
+        <version>0.6.0-SNAPSHOT</version>
+        <type>zip</type>
+        <classifier>compiler-${os.classifier}</classifier>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/utils/interop/src/assembly/assembly.xml b/plc4j/utils/interop/src/assembly/assembly.xml
index 27c0421e490..ef0d3460956 100644
--- a/plc4j/utils/interop/src/assembly/assembly.xml
+++ b/plc4j/utils/interop/src/assembly/assembly.xml
@@ -1,41 +1,41 @@
-<!--
-
-  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
-
-      http://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.
-
--->
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-  <!-- TODO: a jarjar format would be better -->
-  <id>jar-with-dependencies</id>
-  <formats>
-    <format>jar</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>/</outputDirectory>
-      <useProjectArtifact>true</useProjectArtifact>
-      <unpack>true</unpack>
-      <scope>runtime</scope>
-    </dependencySet>
-  </dependencySets>
-  <containerDescriptorHandlers>
-    <containerDescriptorHandler>
-      <handlerName>metaInf-services</handlerName>
-    </containerDescriptorHandler>
-  </containerDescriptorHandlers>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+  <!-- TODO: a jarjar format would be better -->
+  <id>jar-with-dependencies</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <useProjectArtifact>true</useProjectArtifact>
+      <unpack>true</unpack>
+      <scope>runtime</scope>
+    </dependencySet>
+  </dependencySets>
+  <containerDescriptorHandlers>
+    <containerDescriptorHandler>
+      <handlerName>metaInf-services</handlerName>
+    </containerDescriptorHandler>
+  </containerDescriptorHandlers>
 </assembly>
\ No newline at end of file
diff --git a/plc4j/utils/interop/src/main/java/org/apache/plc4x/interop/impl/Client.java b/plc4j/utils/interop/src/main/java/org/apache/plc4x/interop/impl/Client.java
index 6fc5b38d1fa..e5f7fa8a9d0 100644
--- a/plc4j/utils/interop/src/main/java/org/apache/plc4x/interop/impl/Client.java
+++ b/plc4j/utils/interop/src/main/java/org/apache/plc4x/interop/impl/Client.java
@@ -1,60 +1,60 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.interop.impl;
-
-import org.apache.plc4x.interop.ConnectionHandle;
-import org.apache.plc4x.interop.InteropServer;
-import org.apache.plc4x.interop.Request;
-import org.apache.plc4x.interop.Response;
-import org.apache.thrift.TException;
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.transport.TSocket;
-import org.apache.thrift.transport.TTransport;
-
-import java.util.Collections;
-
-public class Client {
-
-    public static void main(String[] args) throws TException {
-        try (TTransport transport = new TSocket("localhost", 9090)) {
-
-            transport.open();
-
-            TProtocol protocol = new TBinaryProtocol(transport);
-
-            final InteropServer.Client client = new InteropServer.Client(protocol);
-
-//            final ConnectionHandle connection = client.connect("mock:a");
-//            final Response result = client.execute(connection, new Request(Collections.singletonMap("field_1", "DB.field.qry")));
-//            System.out.println("Got response: " + result);
-
-            for (int i = 1; i <= 100; i++) {
-                final ConnectionHandle connection = client.connect("s7://192.168.167.210/0/1");
-                final Response result = client.execute(connection, new Request(Collections.singletonMap("field_1", "%M0:USINT")));
-                System.out.println("Got response: " + result);
-
-                client.close(connection);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.interop.impl;
+
+import org.apache.plc4x.interop.ConnectionHandle;
+import org.apache.plc4x.interop.InteropServer;
+import org.apache.plc4x.interop.Request;
+import org.apache.plc4x.interop.Response;
+import org.apache.thrift.TException;
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.protocol.TProtocol;
+import org.apache.thrift.transport.TSocket;
+import org.apache.thrift.transport.TTransport;
+
+import java.util.Collections;
+
+public class Client {
+
+    public static void main(String[] args) throws TException {
+        try (TTransport transport = new TSocket("localhost", 9090)) {
+
+            transport.open();
+
+            TProtocol protocol = new TBinaryProtocol(transport);
+
+            final InteropServer.Client client = new InteropServer.Client(protocol);
+
+//            final ConnectionHandle connection = client.connect("mock:a");
+//            final Response result = client.execute(connection, new Request(Collections.singletonMap("field_1", "DB.field.qry")));
+//            System.out.println("Got response: " + result);
+
+            for (int i = 1; i <= 100; i++) {
+                final ConnectionHandle connection = client.connect("s7://192.168.167.210/0/1");
+                final Response result = client.execute(connection, new Request(Collections.singletonMap("field_1", "%M0:USINT")));
+                System.out.println("Got response: " + result);
+
+                client.close(connection);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/plc4j/utils/interop/src/main/java/org/apache/plc4x/interop/impl/Handler.java b/plc4j/utils/interop/src/main/java/org/apache/plc4x/interop/impl/Handler.java
index a77898de48d..c9e39f8976d 100644
--- a/plc4j/utils/interop/src/main/java/org/apache/plc4x/interop/impl/Handler.java
+++ b/plc4j/utils/interop/src/main/java/org/apache/plc4x/interop/impl/Handler.java
@@ -1,160 +1,160 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.interop.impl;
-
-import org.apache.commons.lang.exception.ExceptionUtils;
-import org.apache.commons.lang3.NotImplementedException;
-import org.apache.plc4x.interop.*;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.thrift.TException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
-
-public class Handler implements InteropServer.Iface {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(Handler.class);
-
-    private final AtomicLong connectionCounter = new AtomicLong(0);
-
-    private final PlcDriverManager driverManager;
-    private final Map<Long, String> connectionStrings;
-    private final Map<Long, PlcConnection> connections;
-
-    public Handler(PlcDriverManager driverManager) {
-        this.driverManager = driverManager;
-        this.connections = new ConcurrentHashMap<>();
-        this.connectionStrings = new ConcurrentHashMap<>();
-    }
-
-
-    @Override public ConnectionHandle connect(String connectionString) throws TException {
-        LOGGER.debug("Receiving new connect request to '{}'", connectionString);
-        try {
-            long id = connectionCounter.getAndIncrement();
-
-            final PlcConnection connection = driverManager.getConnection(connectionString);
-            connection.connect();
-
-            LOGGER.debug("Established connection to '{}' with handle {}", connectionString, id);
-
-            this.connections.put(id, connection);
-            this.connectionStrings.put(id, connectionString);
-            return new ConnectionHandle(id);
-        } catch (PlcConnectionException e) {
-            LOGGER.warn("Unable to start a connection to url '" + connectionString + "'", e);
-            throw new PlcException(connectionString, e.getMessage());
-        }
-    }
-
-    @Override public void close(ConnectionHandle handle) throws TException {
-        LOGGER.debug("Receiving new close request for handle {}", handle.getConnectionId());
-        if (!connections.containsKey(handle)) {
-            LOGGER.warn("Handle for close request {} does not exist. Perhaps already closed?", handle.getConnectionId());
-            return;
-        }
-        try {
-            connections.get(handle).close();
-            connections.remove(handle);
-        } catch (Exception e) {
-            LOGGER.warn("Unable to close the conn / remove the handle", e);
-        }
-
-    }
-
-
-    @Override public Response execute(ConnectionHandle handle, Request request) throws TException {
-        LOGGER.debug("Executing " + request);
-        if (request.getFields() == null) {
-            throw new PlcException(
-                connectionStrings.get(handle.getConnectionId()),
-                "No fields given in the request!");
-        }
-        try {
-            final PlcReadRequest.Builder builder = connections.get(handle.getConnectionId()).readRequestBuilder();
-            for (Map.Entry<String, String> entry : request.getFields().entrySet()) {
-                builder.addItem(entry.getKey(), entry.getValue());
-            }
-            final PlcReadResponse response = builder.build().execute().get(1_000L, TimeUnit.MILLISECONDS);
-
-            final HashMap<String, FieldResponse> resultMap = new HashMap<>();
-            for (String key : request.getFields().keySet()) {
-                final PlcResponseCode responseCode = response.getResponseCode(key);
-
-                final FieldResponse fieldResponse = new FieldResponse(convertResponseCode(responseCode));
-
-                if (PlcResponseCode.OK.equals(responseCode)) {
-                    if (response.isValidBoolean(key)) {
-                        fieldResponse.setBoolValue(response.getBoolean(key));
-                    }
-                    if (response.isValidLong(key)) {
-                        fieldResponse.setLongValue(response.getLong(key));
-                    }
-                    if (response.isValidDouble(key)) {
-                        fieldResponse.setDoubleValue(response.getDouble(key));
-                    }
-                    if (response.isValidString(key)) {
-                        fieldResponse.setStringValue(response.getString(key));
-                    }
-                }
-
-                resultMap.put(key, fieldResponse);
-            }
-            return new Response(resultMap);
-        } catch (Exception e) {
-            LOGGER.warn("Exception during execution of request '" + request + "' for handle " + handle.getConnectionId(), e);
-            throw new PlcException(
-                connectionStrings.get(handle.getConnectionId()),
-                ExceptionUtils.getStackTrace(e));
-        }
-    }
-
-    private RESPONSE_CODE convertResponseCode(PlcResponseCode responseCode) {
-        switch (responseCode) {
-            case OK:
-                return RESPONSE_CODE.OK;
-            case NOT_FOUND:
-                return RESPONSE_CODE.NOT_FOUND;
-            case ACCESS_DENIED:
-                return RESPONSE_CODE.ACCESS_DENIED;
-            case INTERNAL_ERROR:
-                return RESPONSE_CODE.INTERNAL_ERROR;
-            case INVALID_ADDRESS:
-                return RESPONSE_CODE.INVALID_ADDRESS;
-            case INVALID_DATATYPE:
-                return RESPONSE_CODE.INVALID_DATATYPE;
-            case RESPONSE_PENDING:
-                return RESPONSE_CODE.RESPONSE_PENDING;
-            default:
-                throw new NotImplementedException("This response code is not implemented!");
-        }
-    }
-
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.interop.impl;
+
+import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.NotImplementedException;
+import org.apache.plc4x.interop.*;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.thrift.TException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+
+public class Handler implements InteropServer.Iface {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(Handler.class);
+
+    private final AtomicLong connectionCounter = new AtomicLong(0);
+
+    private final PlcDriverManager driverManager;
+    private final Map<Long, String> connectionStrings;
+    private final Map<Long, PlcConnection> connections;
+
+    public Handler(PlcDriverManager driverManager) {
+        this.driverManager = driverManager;
+        this.connections = new ConcurrentHashMap<>();
+        this.connectionStrings = new ConcurrentHashMap<>();
+    }
+
+
+    @Override public ConnectionHandle connect(String connectionString) throws TException {
+        LOGGER.debug("Receiving new connect request to '{}'", connectionString);
+        try {
+            long id = connectionCounter.getAndIncrement();
+
+            final PlcConnection connection = driverManager.getConnection(connectionString);
+            connection.connect();
+
+            LOGGER.debug("Established connection to '{}' with handle {}", connectionString, id);
+
+            this.connections.put(id, connection);
+            this.connectionStrings.put(id, connectionString);
+            return new ConnectionHandle(id);
+        } catch (PlcConnectionException e) {
+            LOGGER.warn("Unable to start a connection to url '" + connectionString + "'", e);
+            throw new PlcException(connectionString, e.getMessage());
+        }
+    }
+
+    @Override public void close(ConnectionHandle handle) throws TException {
+        LOGGER.debug("Receiving new close request for handle {}", handle.getConnectionId());
+        if (!connections.containsKey(handle)) {
+            LOGGER.warn("Handle for close request {} does not exist. Perhaps already closed?", handle.getConnectionId());
+            return;
+        }
+        try {
+            connections.get(handle).close();
+            connections.remove(handle);
+        } catch (Exception e) {
+            LOGGER.warn("Unable to close the conn / remove the handle", e);
+        }
+
+    }
+
+
+    @Override public Response execute(ConnectionHandle handle, Request request) throws TException {
+        LOGGER.debug("Executing " + request);
+        if (request.getFields() == null) {
+            throw new PlcException(
+                connectionStrings.get(handle.getConnectionId()),
+                "No fields given in the request!");
+        }
+        try {
+            final PlcReadRequest.Builder builder = connections.get(handle.getConnectionId()).readRequestBuilder();
+            for (Map.Entry<String, String> entry : request.getFields().entrySet()) {
+                builder.addItem(entry.getKey(), entry.getValue());
+            }
+            final PlcReadResponse response = builder.build().execute().get(1_000L, TimeUnit.MILLISECONDS);
+
+            final HashMap<String, FieldResponse> resultMap = new HashMap<>();
+            for (String key : request.getFields().keySet()) {
+                final PlcResponseCode responseCode = response.getResponseCode(key);
+
+                final FieldResponse fieldResponse = new FieldResponse(convertResponseCode(responseCode));
+
+                if (PlcResponseCode.OK.equals(responseCode)) {
+                    if (response.isValidBoolean(key)) {
+                        fieldResponse.setBoolValue(response.getBoolean(key));
+                    }
+                    if (response.isValidLong(key)) {
+                        fieldResponse.setLongValue(response.getLong(key));
+                    }
+                    if (response.isValidDouble(key)) {
+                        fieldResponse.setDoubleValue(response.getDouble(key));
+                    }
+                    if (response.isValidString(key)) {
+                        fieldResponse.setStringValue(response.getString(key));
+                    }
+                }
+
+                resultMap.put(key, fieldResponse);
+            }
+            return new Response(resultMap);
+        } catch (Exception e) {
+            LOGGER.warn("Exception during execution of request '" + request + "' for handle " + handle.getConnectionId(), e);
+            throw new PlcException(
+                connectionStrings.get(handle.getConnectionId()),
+                ExceptionUtils.getStackTrace(e));
+        }
+    }
+
+    private RESPONSE_CODE convertResponseCode(PlcResponseCode responseCode) {
+        switch (responseCode) {
+            case OK:
+                return RESPONSE_CODE.OK;
+            case NOT_FOUND:
+                return RESPONSE_CODE.NOT_FOUND;
+            case ACCESS_DENIED:
+                return RESPONSE_CODE.ACCESS_DENIED;
+            case INTERNAL_ERROR:
+                return RESPONSE_CODE.INTERNAL_ERROR;
+            case INVALID_ADDRESS:
+                return RESPONSE_CODE.INVALID_ADDRESS;
+            case INVALID_DATATYPE:
+                return RESPONSE_CODE.INVALID_DATATYPE;
+            case RESPONSE_PENDING:
+                return RESPONSE_CODE.RESPONSE_PENDING;
+            default:
+                throw new NotImplementedException("This response code is not implemented!");
+        }
+    }
+
+}
diff --git a/plc4j/utils/interop/src/main/java/org/apache/plc4x/interop/impl/Server.java b/plc4j/utils/interop/src/main/java/org/apache/plc4x/interop/impl/Server.java
index 6850cb49278..09243c4e01e 100644
--- a/plc4j/utils/interop/src/main/java/org/apache/plc4x/interop/impl/Server.java
+++ b/plc4j/utils/interop/src/main/java/org/apache/plc4x/interop/impl/Server.java
@@ -1,91 +1,91 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.interop.impl;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.interop.InteropServer;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
-import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
-import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-import org.apache.plc4x.java.base.messages.items.DefaultLongFieldItem;
-import org.apache.plc4x.java.mock.MockDevice;
-import org.apache.plc4x.java.mock.PlcMockConnection;
-import org.apache.thrift.server.TServer;
-import org.apache.thrift.server.TSimpleServer;
-import org.apache.thrift.transport.TServerSocket;
-import org.apache.thrift.transport.TServerTransport;
-
-import java.util.Collection;
-import java.util.function.Consumer;
-
-public class Server {
-
-    public static void main(String[] args) throws PlcConnectionException {
-        final PlcDriverManager driverManager = new PlcDriverManager();
-
-        // Do some mocking
-        final PlcMockConnection mockConnection = (PlcMockConnection) driverManager.getConnection("mock:a");
-
-        mockConnection.setDevice(new MyMockDevice());
-
-        final Handler handler = new Handler(driverManager);
-        final InteropServer.Processor<Handler> processor = new InteropServer.Processor<>(handler);
-
-        try {
-            TServerTransport serverTransport = new TServerSocket(9090);
-            TServer server = new TSimpleServer(new TServer.Args(serverTransport).processor(processor));
-
-            System.out.println("Starting the simple server...");
-            server.serve();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private static class MyMockDevice implements MockDevice {
-        @Override public Pair<PlcResponseCode, BaseDefaultFieldItem> read(String fieldQuery) {
-            return Pair.of(PlcResponseCode.OK, new DefaultLongFieldItem(100L));
-        }
-
-        @Override public PlcResponseCode write(String fieldQuery, Object value) {
-            return null;
-        }
-
-        @Override public Pair<PlcResponseCode, PlcSubscriptionHandle> subscribe(String fieldQuery) {
-            return null;
-        }
-
-        @Override public void unsubscribe() {
-
-        }
-
-        @Override public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer, Collection<PlcSubscriptionHandle> handles) {
-            return null;
-        }
-
-        @Override public void unregister(PlcConsumerRegistration registration) {
-
-        }
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.interop.impl;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.interop.InteropServer;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
+import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+import org.apache.plc4x.java.base.messages.items.DefaultLongFieldItem;
+import org.apache.plc4x.java.mock.MockDevice;
+import org.apache.plc4x.java.mock.PlcMockConnection;
+import org.apache.thrift.server.TServer;
+import org.apache.thrift.server.TSimpleServer;
+import org.apache.thrift.transport.TServerSocket;
+import org.apache.thrift.transport.TServerTransport;
+
+import java.util.Collection;
+import java.util.function.Consumer;
+
+public class Server {
+
+    public static void main(String[] args) throws PlcConnectionException {
+        final PlcDriverManager driverManager = new PlcDriverManager();
+
+        // Do some mocking
+        final PlcMockConnection mockConnection = (PlcMockConnection) driverManager.getConnection("mock:a");
+
+        mockConnection.setDevice(new MyMockDevice());
+
+        final Handler handler = new Handler(driverManager);
+        final InteropServer.Processor<Handler> processor = new InteropServer.Processor<>(handler);
+
+        try {
+            TServerTransport serverTransport = new TServerSocket(9090);
+            TServer server = new TSimpleServer(new TServer.Args(serverTransport).processor(processor));
+
+            System.out.println("Starting the simple server...");
+            server.serve();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static class MyMockDevice implements MockDevice {
+        @Override public Pair<PlcResponseCode, BaseDefaultFieldItem> read(String fieldQuery) {
+            return Pair.of(PlcResponseCode.OK, new DefaultLongFieldItem(100L));
+        }
+
+        @Override public PlcResponseCode write(String fieldQuery, Object value) {
+            return null;
+        }
+
+        @Override public Pair<PlcResponseCode, PlcSubscriptionHandle> subscribe(String fieldQuery) {
+            return null;
+        }
+
+        @Override public void unsubscribe() {
+
+        }
+
+        @Override public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer, Collection<PlcSubscriptionHandle> handles) {
+            return null;
+        }
+
+        @Override public void unregister(PlcConsumerRegistration registration) {
+
+        }
+    }
+}
diff --git a/plc4j/utils/opm/pom.xml b/plc4j/utils/opm/pom.xml
index 454b3a67428..2cce6de60b4 100644
--- a/plc4j/utils/opm/pom.xml
+++ b/plc4j/utils/opm/pom.xml
@@ -1,103 +1,103 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-    http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <artifactId>plc4j-utils</artifactId>
-    <groupId>org.apache.plc4x</groupId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-opm</artifactId>
-  <packaging>jar</packaging>
-
-  <name>PLC4J: Utils: Object PLC Mapping</name>
-  <description>Layer on top of Plc4X that enables mapping between Objects and PLCs.</description>
-
-  <dependencies>
-    <!--Internal Dependencies-->
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <!-- Utils -->
-    <dependency>
-      <groupId>net.bytebuddy</groupId>
-      <artifactId>byte-buddy</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-configuration2</artifactId>
-    </dependency>
-
-    <!--Testing-->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base-test</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-simulated</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <usedDependencies combine.children="append">
-            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
-          </usedDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+    http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <artifactId>plc4j-utils</artifactId>
+    <groupId>org.apache.plc4x</groupId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-opm</artifactId>
+  <packaging>jar</packaging>
+
+  <name>PLC4J: Utils: Object PLC Mapping</name>
+  <description>Layer on top of Plc4X that enables mapping between Objects and PLCs.</description>
+
+  <dependencies>
+    <!--Internal Dependencies-->
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <!-- Utils -->
+    <dependency>
+      <groupId>net.bytebuddy</groupId>
+      <artifactId>byte-buddy</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-configuration2</artifactId>
+    </dependency>
+
+    <!--Testing-->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base-test</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-simulated</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <usedDependencies combine.children="append">
+            <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
+          </usedDependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/AliasRegistry.java b/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/AliasRegistry.java
index b980fb10473..bf248902197 100644
--- a/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/AliasRegistry.java
+++ b/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/AliasRegistry.java
@@ -1,49 +1,49 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.opm;
-
-/**
- * This interface can be used to give "aliases" for field names in {@link PlcEntity}s {@link PlcField} strings.
- * These are then resolved.
- */
-public interface AliasRegistry {
-
-    /**
-     * Checks if this registry can resolve this alias
-     */
-    boolean canResolve(String alias);
-
-    /**
-     * Checks if this registry can resolve this alias for the given connection.
-     */
-    boolean canResolve(String connection, String alias);
-
-    /**
-     * Resolves an alias to a valid PLC Field Address
-     */
-    String resolve(String alias);
-
-    /**
-     * Resolves an alias to a valid PLC Field based on the connection.
-     * This means that the same alias could be resolved to different Addresses for different connections.
-     */
-    String resolve(String connection, String alias);
-
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.opm;
+
+/**
+ * This interface can be used to give "aliases" for field names in {@link PlcEntity}s {@link PlcField} strings.
+ * These are then resolved.
+ */
+public interface AliasRegistry {
+
+    /**
+     * Checks if this registry can resolve this alias
+     */
+    boolean canResolve(String alias);
+
+    /**
+     * Checks if this registry can resolve this alias for the given connection.
+     */
+    boolean canResolve(String connection, String alias);
+
+    /**
+     * Resolves an alias to a valid PLC Field Address
+     */
+    String resolve(String alias);
+
+    /**
+     * Resolves an alias to a valid PLC Field based on the connection.
+     * This means that the same alias could be resolved to different Addresses for different connections.
+     */
+    String resolve(String connection, String alias);
+
+}
diff --git a/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/OPMException.java b/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/OPMException.java
index f66eb1c176e..b8d95cd9ae9 100644
--- a/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/OPMException.java
+++ b/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/OPMException.java
@@ -1,37 +1,37 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.opm;
-
-import org.apache.plc4x.java.api.exceptions.PlcException;
-
-/**
- * Default Exception.
- */
-public class OPMException extends PlcException {
-
-    public OPMException(String message) {
-        super(message);
-    }
-
-    public OPMException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.opm;
+
+import org.apache.plc4x.java.api.exceptions.PlcException;
+
+/**
+ * Default Exception.
+ */
+public class OPMException extends PlcException {
+
+    public OPMException(String message) {
+        super(message);
+    }
+
+    public OPMException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+}
diff --git a/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/OpmUtils.java b/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/OpmUtils.java
index 4ff45269316..8b86a24f47e 100644
--- a/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/OpmUtils.java
+++ b/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/OpmUtils.java
@@ -1,92 +1,92 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.opm;
-
-import org.apache.commons.lang3.Validate;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Utility methods for usage with OPM.
- */
-final class OpmUtils {
-
-    private static final String ADDRESS = "address";
-    static final Pattern pattern = Pattern.compile("^\\$\\{(?<" + ADDRESS + ">.*)}$");
-
-    private OpmUtils() {
-        // Util class
-    }
-
-    static <T> PlcEntity getPlcEntityAndCheckPreconditions(Class<T> clazz) {
-        PlcEntity annotation = clazz.getAnnotation(PlcEntity.class);
-        if (annotation == null) {
-            throw new IllegalArgumentException("Given Class is no Plc Entity, i.e., not annotated with @PlcEntity");
-        }
-        // Check if default constructor exists
-        try {
-            clazz.getConstructor();
-        } catch (NoSuchMethodException e) {
-            throw new IllegalArgumentException("Cannot use PlcEntity without default constructor", e);
-        }
-        return annotation;
-    }
-
-    static String getOrResolveAddress(AliasRegistry registry, String addressString) {
-        if (!isValidExpression(addressString)) {
-            throw new IllegalArgumentException("Invalid Syntax, either use field address (no starting $) " +
-                "or an alias with Syntax ${xxx}. But given was '" + addressString + "'");
-        }
-        if (!isAlias(addressString)) {
-            return addressString;
-        }
-        String alias = getAlias(addressString);
-        if (registry.canResolve(alias)) {
-            return registry.resolve(alias);
-        } else {
-            throw new IllegalArgumentException("Unable to resolve Alias '" + alias + "' in Schema Registry");
-        }
-
-    }
-
-    /**
-     * Checks whether a given String is a valid OPM Expression, this means
-     * either an Address or an alias ${xxx}.
-     */
-    static boolean isValidExpression(String s) {
-        Validate.notNull(s);
-        return !s.startsWith("$") || pattern.matcher(s).matches();
-    }
-
-    static boolean isAlias(String s) {
-        Validate.notNull(s);
-        return s.startsWith("$") && pattern.matcher(s).matches();
-    }
-
-    static String getAlias(String s) {
-        Matcher matcher = pattern.matcher(s);
-        if (!matcher.matches()) {
-            throw new IllegalArgumentException("Invalid Syntax, no Alias found in String '" + s + "'. Syntax is ${xxx}");
-        }
-        return matcher.group(ADDRESS);
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.opm;
+
+import org.apache.commons.lang3.Validate;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Utility methods for usage with OPM.
+ */
+final class OpmUtils {
+
+    private static final String ADDRESS = "address";
+    static final Pattern pattern = Pattern.compile("^\\$\\{(?<" + ADDRESS + ">.*)}$");
+
+    private OpmUtils() {
+        // Util class
+    }
+
+    static <T> PlcEntity getPlcEntityAndCheckPreconditions(Class<T> clazz) {
+        PlcEntity annotation = clazz.getAnnotation(PlcEntity.class);
+        if (annotation == null) {
+            throw new IllegalArgumentException("Given Class is no Plc Entity, i.e., not annotated with @PlcEntity");
+        }
+        // Check if default constructor exists
+        try {
+            clazz.getConstructor();
+        } catch (NoSuchMethodException e) {
+            throw new IllegalArgumentException("Cannot use PlcEntity without default constructor", e);
+        }
+        return annotation;
+    }
+
+    static String getOrResolveAddress(AliasRegistry registry, String addressString) {
+        if (!isValidExpression(addressString)) {
+            throw new IllegalArgumentException("Invalid Syntax, either use field address (no starting $) " +
+                "or an alias with Syntax ${xxx}. But given was '" + addressString + "'");
+        }
+        if (!isAlias(addressString)) {
+            return addressString;
+        }
+        String alias = getAlias(addressString);
+        if (registry.canResolve(alias)) {
+            return registry.resolve(alias);
+        } else {
+            throw new IllegalArgumentException("Unable to resolve Alias '" + alias + "' in Schema Registry");
+        }
+
+    }
+
+    /**
+     * Checks whether a given String is a valid OPM Expression, this means
+     * either an Address or an alias ${xxx}.
+     */
+    static boolean isValidExpression(String s) {
+        Validate.notNull(s);
+        return !s.startsWith("$") || pattern.matcher(s).matches();
+    }
+
+    static boolean isAlias(String s) {
+        Validate.notNull(s);
+        return s.startsWith("$") && pattern.matcher(s).matches();
+    }
+
+    static String getAlias(String s) {
+        Matcher matcher = pattern.matcher(s);
+        if (!matcher.matches()) {
+            throw new IllegalArgumentException("Invalid Syntax, no Alias found in String '" + s + "'. Syntax is ${xxx}");
+        }
+        return matcher.group(ADDRESS);
+    }
+
+}
diff --git a/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcEntity.java b/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcEntity.java
index 479f0a5f615..a07cca57ba5 100644
--- a/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcEntity.java
+++ b/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcEntity.java
@@ -1,33 +1,33 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.opm;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marks a class as plc entity.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface PlcEntity {
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.opm;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Marks a class as plc entity.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface PlcEntity {
+}
diff --git a/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcEntityInterceptor.java b/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcEntityInterceptor.java
index 26f121cd9a2..d6ba913451f 100644
--- a/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcEntityInterceptor.java
+++ b/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcEntityInterceptor.java
@@ -1,569 +1,569 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.opm;
-
-import net.bytebuddy.implementation.bind.annotation.*;
-import org.apache.commons.configuration2.Configuration;
-import org.apache.commons.configuration2.SystemConfiguration;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.messages.*;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.temporal.ChronoUnit;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-/**
- * Interceptor for dynamic functionality of @{@link PlcEntity}.
- * Basically, its {@link #interceptGetter(Object, Method, Callable, String, PlcDriverManager, AliasRegistry, Map, Map)} method is called for each
- * invocation of a method on a connected @{@link PlcEntity} and does then the dynamic part.
- * <p>
- * For those not too familiar with the JVM's dispatch on can roughly imagine the intercept method being a "regular"
- * method on the "proxied" entity and all parameters of the intercept method could then be access to local fields.
- *
- * @author julian
- */
-@SuppressWarnings({"common-java:DuplicatedBlocks", "Duplicates"})
-public class PlcEntityInterceptor {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(PlcEntityInterceptor.class);
-
-    private static final Configuration CONF = new SystemConfiguration();
-    private static final long READ_TIMEOUT = CONF.getLong("org.apache.plc4x.java.opm.entity_manager.read_timeout", 1_000);
-
-    private PlcEntityInterceptor() {
-        throw new UnsupportedOperationException("This class is not to be instantiated");
-    }
-
-    /**
-     * Basic Intersector for all methods on the proxy object.
-     * It checks if the invoked method is a getter and if so, only retrieves the requested field, forwarding to
-     * the {@link #fetchAndSetValueForGetter(Object, Method, PlcDriverManager, String, AliasRegistry, Map)} method.
-     * <p>
-     * If the field is no getter, then all fields are refreshed by calling {@link #refetchAllFields(Object, PlcDriverManager, String, AliasRegistry, Map)}
-     * and then, the method is invoked.
-     *
-     * @param proxy         Object to intercept
-     * @param method        Method that was intercepted
-     * @param callable      Callable to call the method after fetching the values
-     * @param address       Address of the plc (injected from private field)
-     * @param driverManager DriverManager instance to use (injected from private field)
-     * @return possible result of the original methods invocation
-     * @throws OPMException Problems with plc / proxying
-     */
-    @SuppressWarnings({"unused", "squid:S00107"})
-    @RuntimeType
-    public static Object interceptGetter(@This Object proxy, @Origin Method method, @SuperCall Callable<?> callable,
-                                         @FieldValue(PlcEntityManager.PLC_ADDRESS_FIELD_NAME) String address,
-                                         @FieldValue(PlcEntityManager.DRIVER_MANAGER_FIELD_NAME) PlcDriverManager driverManager,
-                                         @FieldValue(PlcEntityManager.ALIAS_REGISTRY) AliasRegistry registry,
-                                         @FieldValue(PlcEntityManager.LAST_FETCHED) Map<String, Instant> lastFetched,
-                                         @FieldValue(PlcEntityManager.LAST_WRITTEN) Map<String, Instant> lastWritten) throws OPMException {
-        LOGGER.trace("Invoked method {} on connected PlcEntity {}", method.getName(), method.getDeclaringClass().getName());
-
-        // If "detached" (i.e. _driverManager is null) simply forward the call
-        if (driverManager == null) {
-            LOGGER.trace("Entity not connected, simply fowarding call");
-            try {
-                return callable.call();
-            } catch (Exception e) {
-                throw new OPMException("Exception during forwarding call", e);
-            }
-        }
-
-        if (method.getName().startsWith("get")) {
-            if (method.getParameterCount() > 0) {
-                throw new OPMException("Only getter with no arguments are supported");
-            }
-            // Fetch single value
-            LOGGER.trace("Invoked method {} is getter, trying to find annotated field and return requested value",
-                method.getName());
-
-            fetchAndSetValueForGetter(proxy, method, driverManager, address, registry, lastFetched);
-            try {
-                return callable.call();
-            } catch (Exception e) {
-                throw new OPMException("Unable to forward invocation " + method.getName() + " on connected PlcEntity", e);
-            }
-        }
-
-        if (method.getName().startsWith("is") && (method.getReturnType() == boolean.class || method.getReturnType() == Boolean.class)) {
-            if (method.getParameterCount() > 0) {
-                throw new OPMException("Only getter with no arguments are supported");
-            }
-            // Fetch single value
-            LOGGER.trace("Invoked method {} is boolean flag method, trying to find annotated field and return requested value",
-                method.getName());
-            fetchAndSetValueForIsGetter(proxy, method, driverManager, address, registry, lastFetched);
-            try {
-                return callable.call();
-            } catch (Exception e) {
-                throw new OPMException("Unable to forward invocation " + method.getName() + " on connected PlcEntity", e);
-            }
-        }
-
-        // Fetch all values, than invoke method
-        try {
-            LOGGER.trace("Invoked method is no getter, refetch all fields and invoke method {} then", method.getName());
-            refetchAllFields(proxy, driverManager, address, registry, lastFetched);
-            Object call = callable.call();
-            // We write back
-            writeAllFields(proxy, driverManager, address, registry, lastWritten);
-            return call;
-        } catch (Exception e) {
-            throw new OPMException("Unable to forward invocation " + method.getName() + " on connected PlcEntity", e);
-        }
-    }
-
-    @SuppressWarnings({"unused", "squid:S00107"})
-    @RuntimeType
-    public static Object interceptSetter(@This Object proxy, @Origin Method method, @SuperCall Callable<?> callable,
-                                         @FieldValue(PlcEntityManager.PLC_ADDRESS_FIELD_NAME) String address,
-                                         @FieldValue(PlcEntityManager.DRIVER_MANAGER_FIELD_NAME) PlcDriverManager driverManager,
-                                         @FieldValue(PlcEntityManager.ALIAS_REGISTRY) AliasRegistry registry,
-                                         @FieldValue(PlcEntityManager.LAST_FETCHED) Map<String, Instant> lastFetched,
-                                         @Argument(0) Object argument) throws OPMException {
-        LOGGER.trace("Invoked method {} on connected PlcEntity {}", method.getName(), method.getDeclaringClass().getName());
-
-        // If "detached" (i.e. _driverManager is null) simply forward the call
-        if (driverManager == null) {
-            LOGGER.trace("Entity not connected, simply fowarding call");
-            try {
-                return callable.call();
-            } catch (Exception e) {
-                throw new OPMException("Exception during forwarding call", e);
-            }
-        }
-
-        if (method.getName().startsWith("set")) {
-            if (method.getParameterCount() != 1) {
-                throw new OPMException("Only setter with one arguments are supported");
-            }
-            // Set single value
-            LOGGER.trace("Invoked method {} is setter, trying to find annotated field and return requested value",
-                method.getName());
-
-            return setValueForSetter(proxy, method, callable, driverManager, address, registry, lastFetched, argument);
-        }
-
-        // Fetch all values, than invoke method
-        try {
-            LOGGER.trace("Invoked method is no getter, refetch all fields and invoke method {} then", method.getName());
-            refetchAllFields(proxy, driverManager, address, registry, lastFetched);
-            return callable.call();
-        } catch (Exception e) {
-            throw new OPMException("Unable to forward invocation " + method.getName() + " on connected PlcEntity", e);
-        }
-    }
-
-    /**
-     * Renews all values of all Fields that are annotated with {@link PlcEntity}.
-     *
-     * @param proxy         Object to refresh the fields on.
-     * @param driverManager Driver Manager to use
-     * @param registry      AliasRegistry to use
-     * @param lastFetched
-     * @throws OPMException on various errors.
-     */
-    @SuppressWarnings("squid:S1141") // Nested try blocks readability is okay, move to other method makes it imho worse
-    static void refetchAllFields(Object proxy, PlcDriverManager driverManager, String address, AliasRegistry registry, Map<String, Instant> lastFetched) throws OPMException {
-        // Don't log o here as this would cause a second request against a plc so don't touch it, or if you log be aware of that
-        Class<?> entityClass = proxy.getClass().getSuperclass();
-        LOGGER.trace("Refetching all fields on proxy object of class {}", entityClass);
-        PlcEntity plcEntity = entityClass.getAnnotation(PlcEntity.class);
-        if (plcEntity == null) {
-            throw new OPMException("Non PlcEntity supplied");
-        }
-
-        // Check if all fields are valid
-        for (Field field : entityClass.getDeclaredFields()) {
-            if (field.isAnnotationPresent(PlcField.class)) {
-                OpmUtils.getOrResolveAddress(registry, field.getAnnotation(PlcField.class).value());
-            }
-        }
-        try (PlcConnection connection = driverManager.getConnection(address)) {
-            // Catch the exception, if no reader present (see below)
-            // Build the query
-            PlcReadRequest.Builder requestBuilder = connection.readRequestBuilder();
-
-            Arrays.stream(entityClass.getDeclaredFields())
-                .filter(field -> field.isAnnotationPresent(PlcField.class))
-                .filter(field -> needsToBeSynced(lastFetched, field))
-                .forEach(field ->
-                    requestBuilder.addItem(
-                        getFqn(field),
-                        OpmUtils.getOrResolveAddress(registry, field.getAnnotation(PlcField.class).value())
-                    )
-                );
-
-            PlcReadRequest request = requestBuilder.build();
-
-            LOGGER.trace("Request for refetch of {} was build and is {}", entityClass, request);
-
-            PlcReadResponse response = getPlcReadResponse(request);
-
-            // Fill all requested fields
-            for (String fieldName : response.getFieldNames()) {
-                // Fill into Cache
-                lastFetched.put(fieldName, Instant.now());
-
-                LOGGER.trace("Value for field {}  is {}", fieldName, response.getObject(fieldName));
-                String clazzFieldName = StringUtils.substringAfterLast(fieldName, ".");
-                try {
-                    setField(entityClass, proxy, response, clazzFieldName, fieldName);
-                } catch (NoSuchFieldException | IllegalAccessException e) {
-                    throw new PlcRuntimeException(e);
-                }
-            }
-        } catch (PlcConnectionException e) {
-            throw new OPMException("Problem during processing", e);
-        } catch (Exception e) {
-            throw new OPMException("Unexpected error during processing", e);
-        }
-    }
-
-    static void writeAllFields(Object proxy, PlcDriverManager driverManager, String address, AliasRegistry registry, Map<String, Instant> lastWritten) throws OPMException {
-        // Don't log o here as this would cause a second request against a plc so don't touch it, or if you log be aware of that
-        Class<?> entityClass = proxy.getClass().getSuperclass();
-        LOGGER.trace("Writing all fields on proxy object of class {}", entityClass);
-        PlcEntity plcEntity = entityClass.getAnnotation(PlcEntity.class);
-        if (plcEntity == null) {
-            throw new OPMException("Non PlcEntity supplied");
-        }
-
-        // Check if all fields are valid
-        for (Field field : entityClass.getDeclaredFields()) {
-            if (field.isAnnotationPresent(PlcField.class)) {
-                OpmUtils.getOrResolveAddress(registry, field.getAnnotation(PlcField.class).value());
-            }
-        }
-        try (PlcConnection connection = driverManager.getConnection(address)) {
-            // Catch the exception, if no reader present (see below)
-            // Build the query
-            PlcWriteRequest.Builder requestBuilder = connection.writeRequestBuilder();
-
-            Arrays.stream(entityClass.getDeclaredFields())
-                .filter(field -> field.isAnnotationPresent(PlcField.class))
-                .filter(field -> needsToBeSynced(lastWritten, field))
-                .forEach(field ->
-                    requestBuilder.addItem(
-                        getFqn(field),
-                        OpmUtils.getOrResolveAddress(registry, field.getAnnotation(PlcField.class).value()),
-                        getFromField(field, proxy)
-                    )
-                );
-
-            PlcWriteRequest request = requestBuilder.build();
-
-            LOGGER.trace("Request for write of {} was build and is {}", entityClass, request);
-
-            PlcWriteResponse response = getPlcWriteResponse(request);
-
-            // Fill all requested fields
-            for (String fieldName : response.getFieldNames()) {
-                // Fill into Cache
-                lastWritten.put(fieldName, Instant.now());
-            }
-        } catch (PlcConnectionException e) {
-            throw new OPMException("Problem during processing", e);
-        } catch (Exception e) {
-            throw new OPMException("Unexpected error during processing", e);
-        }
-    }
-
-    private static Object getFromField(Field field, Object object) {
-        try {
-            field.setAccessible(true);
-            return field.get(object);
-        } catch (IllegalAccessException e) {
-            throw new PlcRuntimeException(e);
-        }
-    }
-
-    private static String getFqn(Field field) {
-        return field.getDeclaringClass().getName() + "." + field.getName();
-    }
-
-    /**
-     * Checks if a field needs to be refetched/rewritten, i.e., the cached values are too old.
-     */
-    private static boolean needsToBeSynced(Map<String, Instant> lastSynced, Field field) {
-        Validate.notNull(field);
-        long cacheDurationMillis = field.getAnnotation(PlcField.class).cacheDurationMillis();
-        if (cacheDurationMillis < 0) {
-            return true;
-        }
-        String fqn = getFqn(field);
-        if (lastSynced.containsKey(fqn)) {
-            Instant last = lastSynced.get(fqn);
-            return Instant.now().minus(cacheDurationMillis, ChronoUnit.MILLIS).isAfter(last);
-        }
-        return true;
-    }
-
-    private static void fetchAndSetValueForIsGetter(Object proxy, Method m, PlcDriverManager driverManager, String address, AliasRegistry registry, Map<String, Instant> lastFetched) throws OPMException {
-        fetchAndSetValueForGetter(proxy, m, 2, driverManager, address, registry, lastFetched);
-    }
-
-    private static void fetchAndSetValueForGetter(Object proxy, Method m, PlcDriverManager driverManager, String address, AliasRegistry registry, Map<String, Instant> lastFetched) throws OPMException {
-        fetchAndSetValueForGetter(proxy, m, 3, driverManager, address, registry, lastFetched);
-    }
-
-    private static void fetchAndSetValueForGetter(Object proxy, Method m, int prefixLength, PlcDriverManager driverManager,
-                                                  String address, AliasRegistry registry, Map<String, Instant> lastFetched) throws OPMException {
-        String s = m.getName().substring(prefixLength);
-        // First char to lower
-        String variable = s.substring(0, 1).toLowerCase().concat(s.substring(1));
-        LOGGER.trace("Looking for field with name {} after invokation of getter {}", variable, m.getName());
-        PlcField annotation;
-        Field field;
-        try {
-            field = m.getDeclaringClass().getDeclaredField(variable);
-            annotation = field.getDeclaredAnnotation(PlcField.class);
-        } catch (NoSuchFieldException e) {
-            throw new OPMException("Unable to identify field with name '" + variable + "' for call to '" + m.getName() + "'", e);
-        }
-
-        // Use Fully qualified Name as field index
-        String fqn = getFqn(field);
-
-        // Check if cache is still active
-        if (!needsToBeSynced(lastFetched, field)) {
-            return;
-        }
-        try (PlcConnection connection = driverManager.getConnection(address)) {
-            // Catch the exception, if no reader present (see below)
-
-            PlcReadRequest request = connection.readRequestBuilder()
-                .addItem(fqn, OpmUtils.getOrResolveAddress(registry, annotation.value()))
-                .build();
-
-            PlcReadResponse response = getPlcReadResponse(request);
-
-            // Fill into Cache
-            lastFetched.put(field.getName(), Instant.now());
-
-            Object value = getTyped(m.getReturnType(), response, fqn);
-            setForField(field, proxy, value);
-        } catch (ClassCastException e) {
-            throw new OPMException("Unable to return response as suitable type", e);
-        } catch (Exception e) {
-            throw new OPMException("Problem during processing", e);
-        }
-    }
-
-    private static void setForField(Field field, Object proxy, Object value) {
-        try {
-            field.setAccessible(true);
-            field.set(proxy, value);
-        } catch (IllegalAccessException e) {
-            throw new PlcRuntimeException(e);
-        }
-    }
-
-    private static Object setValueForSetter(Object proxy, Method m, Callable<?> callable, PlcDriverManager driverManager,
-                                            String address, AliasRegistry registry, Map<String, Instant> lastFetched, Object object) throws OPMException {
-        String s = m.getName().substring(3);
-        // First char to lower
-        String variable = s.substring(0, 1).toLowerCase().concat(s.substring(1));
-        LOGGER.trace("Looking for field with name {} after invokation of getter {}", variable, m.getName());
-        PlcField annotation;
-        Field field;
-        try {
-            field = m.getDeclaringClass().getDeclaredField(variable);
-            annotation = field.getDeclaredAnnotation(PlcField.class);
-        } catch (NoSuchFieldException e) {
-            throw new OPMException("Unable to identify field with name '" + variable + "' for call to '" + m.getName() + "'", e);
-        }
-
-        // Use Fully qualified Name as field index
-        String fqn = getFqn(field);
-
-        try (PlcConnection connection = driverManager.getConnection(address)) {
-            // Catch the exception, if no reader present (see below)
-
-            PlcWriteRequest request = connection.writeRequestBuilder()
-                .addItem(fqn, OpmUtils.getOrResolveAddress(registry, annotation.value()), object)
-                .build();
-
-            PlcWriteResponse response = getPlcWriteResponse(request);
-
-            // Fill into Cache
-            lastFetched.put(field.getName(), Instant.now());
-
-            LOGGER.debug("getTyped clazz: {}, response: {}, fieldName: {}", m.getParameters()[0].getType(), response, fqn);
-            if (response.getResponseCode(fqn) != PlcResponseCode.OK) {
-                throw new PlcRuntimeException(String.format("Unable to read specified field '%s', response code was '%s'",
-                    fqn, response.getResponseCode(fqn)));
-            }
-            callable.call();
-            return null;
-        } catch (ClassCastException e) {
-            throw new OPMException("Unable to return response as suitable type", e);
-        } catch (Exception e) {
-            throw new OPMException("Problem during processing", e);
-        }
-    }
-
-
-    /**
-     * Tries to set a response Item to a field in the given object.
-     * This is one by looking for a field in the class and a response item
-     * which is equal to the given fieldName parameter.
-     *
-     * @param o               Object to set the value on
-     * @param response        Response to fetch the response from
-     * @param targetFieldName Name of the field in the object
-     * @param sourceFieldName Name of the field in the response
-     * @throws NoSuchFieldException   If a field is not present in entity
-     * @throws IllegalAccessException If a field in the entity cannot be accessed
-     */
-    static void setField(Class<?> clazz, Object o, PlcReadResponse response, String targetFieldName, String sourceFieldName) throws NoSuchFieldException, IllegalAccessException {
-        LOGGER.debug("setField on clazz: {}, Object: {}, response: {}, targetFieldName: {}, sourceFieldName:{} ", clazz, o, response, targetFieldName, sourceFieldName);
-        Field field = clazz.getDeclaredField(targetFieldName);
-        field.setAccessible(true);
-        try {
-            field.set(o, getTyped(field.getType(), response, sourceFieldName));
-        } catch (ClassCastException e) {
-            throw new PlcRuntimeException(String.format("Unable to assign return value %s to field %s with type %s",
-                response.getObject(sourceFieldName), targetFieldName, field.getType()), e);
-        }
-    }
-
-    @SuppressWarnings({"squid:S3776", "squid:MethodCyclomaticComplexity"})
-    // Cognitive Complexity not too high, as highly structured
-    static Object getTyped(Class<?> clazz, PlcReadResponse response, String sourceFieldName) {
-        LOGGER.debug("getTyped clazz: {}, response: {}, fieldName: {}", clazz, response, sourceFieldName);
-        if (response.getResponseCode(sourceFieldName) != PlcResponseCode.OK) {
-            throw new PlcRuntimeException(String.format("Unable to read specified field '%s', response code was '%s'",
-                sourceFieldName, response.getResponseCode(sourceFieldName)));
-        }
-        if (clazz.isPrimitive()) {
-            if (clazz == boolean.class) {
-                return response.getBoolean(sourceFieldName);
-            } else if (clazz == byte.class) {
-                return response.getByte(sourceFieldName);
-            } else if (clazz == short.class) {
-                return response.getShort(sourceFieldName);
-            } else if (clazz == int.class) {
-                return response.getInteger(sourceFieldName);
-            } else if (clazz == long.class) {
-                return response.getLong(sourceFieldName);
-            }
-        }
-
-        if (clazz == Boolean.class) {
-            return response.getBoolean(sourceFieldName);
-        } else if (clazz == Byte.class) {
-            return response.getByte(sourceFieldName);
-        } else if (clazz == Short.class) {
-            return response.getShort(sourceFieldName);
-        } else if (clazz == Integer.class) {
-            return response.getInteger(sourceFieldName);
-        } else if (clazz == Long.class) {
-            return response.getLong(sourceFieldName);
-        } else if (clazz == BigInteger.class) {
-            return response.getBigInteger(sourceFieldName);
-        } else if (clazz == Float.class) {
-            return response.getFloat(sourceFieldName);
-        } else if (clazz == Double.class) {
-            return response.getDouble(sourceFieldName);
-        } else if (clazz == BigDecimal.class) {
-            return response.getBigDecimal(sourceFieldName);
-        } else if (clazz == String.class) {
-            return response.getString(sourceFieldName);
-        } else if (clazz == LocalTime.class) {
-            return response.getTime(sourceFieldName);
-        } else if (clazz == LocalDate.class) {
-            return response.getDate(sourceFieldName);
-        } else if (clazz == LocalDateTime.class) {
-            return response.getDateTime(sourceFieldName);
-        } else if (clazz == byte[].class) {
-            return ArrayUtils.toPrimitive(response.getByteArray(sourceFieldName));
-        } else if (clazz == Byte[].class) {
-            return response.getByteArray(sourceFieldName);
-        }
-
-        // Fallback
-        Object responseObject = response.getObject(sourceFieldName);
-        if (clazz.isAssignableFrom(responseObject.getClass())) {
-            return responseObject;
-        }
-
-        // If nothing matched, throw
-        throw new ClassCastException("Unable to return response item " + responseObject + "(" + responseObject.getClass() + ") as instance of " + clazz);
-    }
-
-    /**
-     * Fetch the request and do appropriate error handling
-     *
-     * @param request the request to get the exception from
-     * @return the response from the exception.
-     * @throws OPMException on {@link InterruptedException} or {@link ExecutionException} or {@link TimeoutException}
-     */
-    static PlcReadResponse getPlcReadResponse(PlcReadRequest request) throws OPMException {
-        return getFromFuture(request);
-    }
-
-    /**
-     * Fetch the request and do appropriate error handling
-     *
-     * @param request the request to get the exception from
-     * @return the response from the exception.
-     * @throws OPMException on {@link InterruptedException} or {@link ExecutionException} or {@link TimeoutException}
-     */
-    public static PlcWriteResponse getPlcWriteResponse(PlcWriteRequest request) throws OPMException {
-        return getFromFuture(request);
-    }
-
-    @SuppressWarnings("unchecked")
-    private static <REQ extends PlcRequest, RES extends PlcResponse> RES getFromFuture(REQ request) throws OPMException {
-        try {
-            return (RES) request.execute().get(READ_TIMEOUT, TimeUnit.MILLISECONDS);
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new OPMException("Exception during execution", e);
-        } catch (ExecutionException e) {
-            throw new OPMException("Exception during execution", e);
-        } catch (TimeoutException e) {
-            throw new OPMException("Timeout during fetching values", e);
-        }
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.opm;
+
+import net.bytebuddy.implementation.bind.annotation.*;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.SystemConfiguration;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Validate;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.messages.*;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.temporal.ChronoUnit;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+/**
+ * Interceptor for dynamic functionality of @{@link PlcEntity}.
+ * Basically, its {@link #interceptGetter(Object, Method, Callable, String, PlcDriverManager, AliasRegistry, Map, Map)} method is called for each
+ * invocation of a method on a connected @{@link PlcEntity} and does then the dynamic part.
+ * <p>
+ * For those not too familiar with the JVM's dispatch on can roughly imagine the intercept method being a "regular"
+ * method on the "proxied" entity and all parameters of the intercept method could then be access to local fields.
+ *
+ * @author julian
+ */
+@SuppressWarnings({"common-java:DuplicatedBlocks", "Duplicates"})
+public class PlcEntityInterceptor {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PlcEntityInterceptor.class);
+
+    private static final Configuration CONF = new SystemConfiguration();
+    private static final long READ_TIMEOUT = CONF.getLong("org.apache.plc4x.java.opm.entity_manager.read_timeout", 1_000);
+
+    private PlcEntityInterceptor() {
+        throw new UnsupportedOperationException("This class is not to be instantiated");
+    }
+
+    /**
+     * Basic Intersector for all methods on the proxy object.
+     * It checks if the invoked method is a getter and if so, only retrieves the requested field, forwarding to
+     * the {@link #fetchAndSetValueForGetter(Object, Method, PlcDriverManager, String, AliasRegistry, Map)} method.
+     * <p>
+     * If the field is no getter, then all fields are refreshed by calling {@link #refetchAllFields(Object, PlcDriverManager, String, AliasRegistry, Map)}
+     * and then, the method is invoked.
+     *
+     * @param proxy         Object to intercept
+     * @param method        Method that was intercepted
+     * @param callable      Callable to call the method after fetching the values
+     * @param address       Address of the plc (injected from private field)
+     * @param driverManager DriverManager instance to use (injected from private field)
+     * @return possible result of the original methods invocation
+     * @throws OPMException Problems with plc / proxying
+     */
+    @SuppressWarnings({"unused", "squid:S00107"})
+    @RuntimeType
+    public static Object interceptGetter(@This Object proxy, @Origin Method method, @SuperCall Callable<?> callable,
+                                         @FieldValue(PlcEntityManager.PLC_ADDRESS_FIELD_NAME) String address,
+                                         @FieldValue(PlcEntityManager.DRIVER_MANAGER_FIELD_NAME) PlcDriverManager driverManager,
+                                         @FieldValue(PlcEntityManager.ALIAS_REGISTRY) AliasRegistry registry,
+                                         @FieldValue(PlcEntityManager.LAST_FETCHED) Map<String, Instant> lastFetched,
+                                         @FieldValue(PlcEntityManager.LAST_WRITTEN) Map<String, Instant> lastWritten) throws OPMException {
+        LOGGER.trace("Invoked method {} on connected PlcEntity {}", method.getName(), method.getDeclaringClass().getName());
+
+        // If "detached" (i.e. _driverManager is null) simply forward the call
+        if (driverManager == null) {
+            LOGGER.trace("Entity not connected, simply fowarding call");
+            try {
+                return callable.call();
+            } catch (Exception e) {
+                throw new OPMException("Exception during forwarding call", e);
+            }
+        }
+
+        if (method.getName().startsWith("get")) {
+            if (method.getParameterCount() > 0) {
+                throw new OPMException("Only getter with no arguments are supported");
+            }
+            // Fetch single value
+            LOGGER.trace("Invoked method {} is getter, trying to find annotated field and return requested value",
+                method.getName());
+
+            fetchAndSetValueForGetter(proxy, method, driverManager, address, registry, lastFetched);
+            try {
+                return callable.call();
+            } catch (Exception e) {
+                throw new OPMException("Unable to forward invocation " + method.getName() + " on connected PlcEntity", e);
+            }
+        }
+
+        if (method.getName().startsWith("is") && (method.getReturnType() == boolean.class || method.getReturnType() == Boolean.class)) {
+            if (method.getParameterCount() > 0) {
+                throw new OPMException("Only getter with no arguments are supported");
+            }
+            // Fetch single value
+            LOGGER.trace("Invoked method {} is boolean flag method, trying to find annotated field and return requested value",
+                method.getName());
+            fetchAndSetValueForIsGetter(proxy, method, driverManager, address, registry, lastFetched);
+            try {
+                return callable.call();
+            } catch (Exception e) {
+                throw new OPMException("Unable to forward invocation " + method.getName() + " on connected PlcEntity", e);
+            }
+        }
+
+        // Fetch all values, than invoke method
+        try {
+            LOGGER.trace("Invoked method is no getter, refetch all fields and invoke method {} then", method.getName());
+            refetchAllFields(proxy, driverManager, address, registry, lastFetched);
+            Object call = callable.call();
+            // We write back
+            writeAllFields(proxy, driverManager, address, registry, lastWritten);
+            return call;
+        } catch (Exception e) {
+            throw new OPMException("Unable to forward invocation " + method.getName() + " on connected PlcEntity", e);
+        }
+    }
+
+    @SuppressWarnings({"unused", "squid:S00107"})
+    @RuntimeType
+    public static Object interceptSetter(@This Object proxy, @Origin Method method, @SuperCall Callable<?> callable,
+                                         @FieldValue(PlcEntityManager.PLC_ADDRESS_FIELD_NAME) String address,
+                                         @FieldValue(PlcEntityManager.DRIVER_MANAGER_FIELD_NAME) PlcDriverManager driverManager,
+                                         @FieldValue(PlcEntityManager.ALIAS_REGISTRY) AliasRegistry registry,
+                                         @FieldValue(PlcEntityManager.LAST_FETCHED) Map<String, Instant> lastFetched,
+                                         @Argument(0) Object argument) throws OPMException {
+        LOGGER.trace("Invoked method {} on connected PlcEntity {}", method.getName(), method.getDeclaringClass().getName());
+
+        // If "detached" (i.e. _driverManager is null) simply forward the call
+        if (driverManager == null) {
+            LOGGER.trace("Entity not connected, simply fowarding call");
+            try {
+                return callable.call();
+            } catch (Exception e) {
+                throw new OPMException("Exception during forwarding call", e);
+            }
+        }
+
+        if (method.getName().startsWith("set")) {
+            if (method.getParameterCount() != 1) {
+                throw new OPMException("Only setter with one arguments are supported");
+            }
+            // Set single value
+            LOGGER.trace("Invoked method {} is setter, trying to find annotated field and return requested value",
+                method.getName());
+
+            return setValueForSetter(proxy, method, callable, driverManager, address, registry, lastFetched, argument);
+        }
+
+        // Fetch all values, than invoke method
+        try {
+            LOGGER.trace("Invoked method is no getter, refetch all fields and invoke method {} then", method.getName());
+            refetchAllFields(proxy, driverManager, address, registry, lastFetched);
+            return callable.call();
+        } catch (Exception e) {
+            throw new OPMException("Unable to forward invocation " + method.getName() + " on connected PlcEntity", e);
+        }
+    }
+
+    /**
+     * Renews all values of all Fields that are annotated with {@link PlcEntity}.
+     *
+     * @param proxy         Object to refresh the fields on.
+     * @param driverManager Driver Manager to use
+     * @param registry      AliasRegistry to use
+     * @param lastFetched
+     * @throws OPMException on various errors.
+     */
+    @SuppressWarnings("squid:S1141") // Nested try blocks readability is okay, move to other method makes it imho worse
+    static void refetchAllFields(Object proxy, PlcDriverManager driverManager, String address, AliasRegistry registry, Map<String, Instant> lastFetched) throws OPMException {
+        // Don't log o here as this would cause a second request against a plc so don't touch it, or if you log be aware of that
+        Class<?> entityClass = proxy.getClass().getSuperclass();
+        LOGGER.trace("Refetching all fields on proxy object of class {}", entityClass);
+        PlcEntity plcEntity = entityClass.getAnnotation(PlcEntity.class);
+        if (plcEntity == null) {
+            throw new OPMException("Non PlcEntity supplied");
+        }
+
+        // Check if all fields are valid
+        for (Field field : entityClass.getDeclaredFields()) {
+            if (field.isAnnotationPresent(PlcField.class)) {
+                OpmUtils.getOrResolveAddress(registry, field.getAnnotation(PlcField.class).value());
+            }
+        }
+        try (PlcConnection connection = driverManager.getConnection(address)) {
+            // Catch the exception, if no reader present (see below)
+            // Build the query
+            PlcReadRequest.Builder requestBuilder = connection.readRequestBuilder();
+
+            Arrays.stream(entityClass.getDeclaredFields())
+                .filter(field -> field.isAnnotationPresent(PlcField.class))
+                .filter(field -> needsToBeSynced(lastFetched, field))
+                .forEach(field ->
+                    requestBuilder.addItem(
+                        getFqn(field),
+                        OpmUtils.getOrResolveAddress(registry, field.getAnnotation(PlcField.class).value())
+                    )
+                );
+
+            PlcReadRequest request = requestBuilder.build();
+
+            LOGGER.trace("Request for refetch of {} was build and is {}", entityClass, request);
+
+            PlcReadResponse response = getPlcReadResponse(request);
+
+            // Fill all requested fields
+            for (String fieldName : response.getFieldNames()) {
+                // Fill into Cache
+                lastFetched.put(fieldName, Instant.now());
+
+                LOGGER.trace("Value for field {}  is {}", fieldName, response.getObject(fieldName));
+                String clazzFieldName = StringUtils.substringAfterLast(fieldName, ".");
+                try {
+                    setField(entityClass, proxy, response, clazzFieldName, fieldName);
+                } catch (NoSuchFieldException | IllegalAccessException e) {
+                    throw new PlcRuntimeException(e);
+                }
+            }
+        } catch (PlcConnectionException e) {
+            throw new OPMException("Problem during processing", e);
+        } catch (Exception e) {
+            throw new OPMException("Unexpected error during processing", e);
+        }
+    }
+
+    static void writeAllFields(Object proxy, PlcDriverManager driverManager, String address, AliasRegistry registry, Map<String, Instant> lastWritten) throws OPMException {
+        // Don't log o here as this would cause a second request against a plc so don't touch it, or if you log be aware of that
+        Class<?> entityClass = proxy.getClass().getSuperclass();
+        LOGGER.trace("Writing all fields on proxy object of class {}", entityClass);
+        PlcEntity plcEntity = entityClass.getAnnotation(PlcEntity.class);
+        if (plcEntity == null) {
+            throw new OPMException("Non PlcEntity supplied");
+        }
+
+        // Check if all fields are valid
+        for (Field field : entityClass.getDeclaredFields()) {
+            if (field.isAnnotationPresent(PlcField.class)) {
+                OpmUtils.getOrResolveAddress(registry, field.getAnnotation(PlcField.class).value());
+            }
+        }
+        try (PlcConnection connection = driverManager.getConnection(address)) {
+            // Catch the exception, if no reader present (see below)
+            // Build the query
+            PlcWriteRequest.Builder requestBuilder = connection.writeRequestBuilder();
+
+            Arrays.stream(entityClass.getDeclaredFields())
+                .filter(field -> field.isAnnotationPresent(PlcField.class))
+                .filter(field -> needsToBeSynced(lastWritten, field))
+                .forEach(field ->
+                    requestBuilder.addItem(
+                        getFqn(field),
+                        OpmUtils.getOrResolveAddress(registry, field.getAnnotation(PlcField.class).value()),
+                        getFromField(field, proxy)
+                    )
+                );
+
+            PlcWriteRequest request = requestBuilder.build();
+
+            LOGGER.trace("Request for write of {} was build and is {}", entityClass, request);
+
+            PlcWriteResponse response = getPlcWriteResponse(request);
+
+            // Fill all requested fields
+            for (String fieldName : response.getFieldNames()) {
+                // Fill into Cache
+                lastWritten.put(fieldName, Instant.now());
+            }
+        } catch (PlcConnectionException e) {
+            throw new OPMException("Problem during processing", e);
+        } catch (Exception e) {
+            throw new OPMException("Unexpected error during processing", e);
+        }
+    }
+
+    private static Object getFromField(Field field, Object object) {
+        try {
+            field.setAccessible(true);
+            return field.get(object);
+        } catch (IllegalAccessException e) {
+            throw new PlcRuntimeException(e);
+        }
+    }
+
+    private static String getFqn(Field field) {
+        return field.getDeclaringClass().getName() + "." + field.getName();
+    }
+
+    /**
+     * Checks if a field needs to be refetched/rewritten, i.e., the cached values are too old.
+     */
+    private static boolean needsToBeSynced(Map<String, Instant> lastSynced, Field field) {
+        Validate.notNull(field);
+        long cacheDurationMillis = field.getAnnotation(PlcField.class).cacheDurationMillis();
+        if (cacheDurationMillis < 0) {
+            return true;
+        }
+        String fqn = getFqn(field);
+        if (lastSynced.containsKey(fqn)) {
+            Instant last = lastSynced.get(fqn);
+            return Instant.now().minus(cacheDurationMillis, ChronoUnit.MILLIS).isAfter(last);
+        }
+        return true;
+    }
+
+    private static void fetchAndSetValueForIsGetter(Object proxy, Method m, PlcDriverManager driverManager, String address, AliasRegistry registry, Map<String, Instant> lastFetched) throws OPMException {
+        fetchAndSetValueForGetter(proxy, m, 2, driverManager, address, registry, lastFetched);
+    }
+
+    private static void fetchAndSetValueForGetter(Object proxy, Method m, PlcDriverManager driverManager, String address, AliasRegistry registry, Map<String, Instant> lastFetched) throws OPMException {
+        fetchAndSetValueForGetter(proxy, m, 3, driverManager, address, registry, lastFetched);
+    }
+
+    private static void fetchAndSetValueForGetter(Object proxy, Method m, int prefixLength, PlcDriverManager driverManager,
+                                                  String address, AliasRegistry registry, Map<String, Instant> lastFetched) throws OPMException {
+        String s = m.getName().substring(prefixLength);
+        // First char to lower
+        String variable = s.substring(0, 1).toLowerCase().concat(s.substring(1));
+        LOGGER.trace("Looking for field with name {} after invokation of getter {}", variable, m.getName());
+        PlcField annotation;
+        Field field;
+        try {
+            field = m.getDeclaringClass().getDeclaredField(variable);
+            annotation = field.getDeclaredAnnotation(PlcField.class);
+        } catch (NoSuchFieldException e) {
+            throw new OPMException("Unable to identify field with name '" + variable + "' for call to '" + m.getName() + "'", e);
+        }
+
+        // Use Fully qualified Name as field index
+        String fqn = getFqn(field);
+
+        // Check if cache is still active
+        if (!needsToBeSynced(lastFetched, field)) {
+            return;
+        }
+        try (PlcConnection connection = driverManager.getConnection(address)) {
+            // Catch the exception, if no reader present (see below)
+
+            PlcReadRequest request = connection.readRequestBuilder()
+                .addItem(fqn, OpmUtils.getOrResolveAddress(registry, annotation.value()))
+                .build();
+
+            PlcReadResponse response = getPlcReadResponse(request);
+
+            // Fill into Cache
+            lastFetched.put(field.getName(), Instant.now());
+
+            Object value = getTyped(m.getReturnType(), response, fqn);
+            setForField(field, proxy, value);
+        } catch (ClassCastException e) {
+            throw new OPMException("Unable to return response as suitable type", e);
+        } catch (Exception e) {
+            throw new OPMException("Problem during processing", e);
+        }
+    }
+
+    private static void setForField(Field field, Object proxy, Object value) {
+        try {
+            field.setAccessible(true);
+            field.set(proxy, value);
+        } catch (IllegalAccessException e) {
+            throw new PlcRuntimeException(e);
+        }
+    }
+
+    private static Object setValueForSetter(Object proxy, Method m, Callable<?> callable, PlcDriverManager driverManager,
+                                            String address, AliasRegistry registry, Map<String, Instant> lastFetched, Object object) throws OPMException {
+        String s = m.getName().substring(3);
+        // First char to lower
+        String variable = s.substring(0, 1).toLowerCase().concat(s.substring(1));
+        LOGGER.trace("Looking for field with name {} after invokation of getter {}", variable, m.getName());
+        PlcField annotation;
+        Field field;
+        try {
+            field = m.getDeclaringClass().getDeclaredField(variable);
+            annotation = field.getDeclaredAnnotation(PlcField.class);
+        } catch (NoSuchFieldException e) {
+            throw new OPMException("Unable to identify field with name '" + variable + "' for call to '" + m.getName() + "'", e);
+        }
+
+        // Use Fully qualified Name as field index
+        String fqn = getFqn(field);
+
+        try (PlcConnection connection = driverManager.getConnection(address)) {
+            // Catch the exception, if no reader present (see below)
+
+            PlcWriteRequest request = connection.writeRequestBuilder()
+                .addItem(fqn, OpmUtils.getOrResolveAddress(registry, annotation.value()), object)
+                .build();
+
+            PlcWriteResponse response = getPlcWriteResponse(request);
+
+            // Fill into Cache
+            lastFetched.put(field.getName(), Instant.now());
+
+            LOGGER.debug("getTyped clazz: {}, response: {}, fieldName: {}", m.getParameters()[0].getType(), response, fqn);
+            if (response.getResponseCode(fqn) != PlcResponseCode.OK) {
+                throw new PlcRuntimeException(String.format("Unable to read specified field '%s', response code was '%s'",
+                    fqn, response.getResponseCode(fqn)));
+            }
+            callable.call();
+            return null;
+        } catch (ClassCastException e) {
+            throw new OPMException("Unable to return response as suitable type", e);
+        } catch (Exception e) {
+            throw new OPMException("Problem during processing", e);
+        }
+    }
+
+
+    /**
+     * Tries to set a response Item to a field in the given object.
+     * This is one by looking for a field in the class and a response item
+     * which is equal to the given fieldName parameter.
+     *
+     * @param o               Object to set the value on
+     * @param response        Response to fetch the response from
+     * @param targetFieldName Name of the field in the object
+     * @param sourceFieldName Name of the field in the response
+     * @throws NoSuchFieldException   If a field is not present in entity
+     * @throws IllegalAccessException If a field in the entity cannot be accessed
+     */
+    static void setField(Class<?> clazz, Object o, PlcReadResponse response, String targetFieldName, String sourceFieldName) throws NoSuchFieldException, IllegalAccessException {
+        LOGGER.debug("setField on clazz: {}, Object: {}, response: {}, targetFieldName: {}, sourceFieldName:{} ", clazz, o, response, targetFieldName, sourceFieldName);
+        Field field = clazz.getDeclaredField(targetFieldName);
+        field.setAccessible(true);
+        try {
+            field.set(o, getTyped(field.getType(), response, sourceFieldName));
+        } catch (ClassCastException e) {
+            throw new PlcRuntimeException(String.format("Unable to assign return value %s to field %s with type %s",
+                response.getObject(sourceFieldName), targetFieldName, field.getType()), e);
+        }
+    }
+
+    @SuppressWarnings({"squid:S3776", "squid:MethodCyclomaticComplexity"})
+    // Cognitive Complexity not too high, as highly structured
+    static Object getTyped(Class<?> clazz, PlcReadResponse response, String sourceFieldName) {
+        LOGGER.debug("getTyped clazz: {}, response: {}, fieldName: {}", clazz, response, sourceFieldName);
+        if (response.getResponseCode(sourceFieldName) != PlcResponseCode.OK) {
+            throw new PlcRuntimeException(String.format("Unable to read specified field '%s', response code was '%s'",
+                sourceFieldName, response.getResponseCode(sourceFieldName)));
+        }
+        if (clazz.isPrimitive()) {
+            if (clazz == boolean.class) {
+                return response.getBoolean(sourceFieldName);
+            } else if (clazz == byte.class) {
+                return response.getByte(sourceFieldName);
+            } else if (clazz == short.class) {
+                return response.getShort(sourceFieldName);
+            } else if (clazz == int.class) {
+                return response.getInteger(sourceFieldName);
+            } else if (clazz == long.class) {
+                return response.getLong(sourceFieldName);
+            }
+        }
+
+        if (clazz == Boolean.class) {
+            return response.getBoolean(sourceFieldName);
+        } else if (clazz == Byte.class) {
+            return response.getByte(sourceFieldName);
+        } else if (clazz == Short.class) {
+            return response.getShort(sourceFieldName);
+        } else if (clazz == Integer.class) {
+            return response.getInteger(sourceFieldName);
+        } else if (clazz == Long.class) {
+            return response.getLong(sourceFieldName);
+        } else if (clazz == BigInteger.class) {
+            return response.getBigInteger(sourceFieldName);
+        } else if (clazz == Float.class) {
+            return response.getFloat(sourceFieldName);
+        } else if (clazz == Double.class) {
+            return response.getDouble(sourceFieldName);
+        } else if (clazz == BigDecimal.class) {
+            return response.getBigDecimal(sourceFieldName);
+        } else if (clazz == String.class) {
+            return response.getString(sourceFieldName);
+        } else if (clazz == LocalTime.class) {
+            return response.getTime(sourceFieldName);
+        } else if (clazz == LocalDate.class) {
+            return response.getDate(sourceFieldName);
+        } else if (clazz == LocalDateTime.class) {
+            return response.getDateTime(sourceFieldName);
+        } else if (clazz == byte[].class) {
+            return ArrayUtils.toPrimitive(response.getByteArray(sourceFieldName));
+        } else if (clazz == Byte[].class) {
+            return response.getByteArray(sourceFieldName);
+        }
+
+        // Fallback
+        Object responseObject = response.getObject(sourceFieldName);
+        if (clazz.isAssignableFrom(responseObject.getClass())) {
+            return responseObject;
+        }
+
+        // If nothing matched, throw
+        throw new ClassCastException("Unable to return response item " + responseObject + "(" + responseObject.getClass() + ") as instance of " + clazz);
+    }
+
+    /**
+     * Fetch the request and do appropriate error handling
+     *
+     * @param request the request to get the exception from
+     * @return the response from the exception.
+     * @throws OPMException on {@link InterruptedException} or {@link ExecutionException} or {@link TimeoutException}
+     */
+    static PlcReadResponse getPlcReadResponse(PlcReadRequest request) throws OPMException {
+        return getFromFuture(request);
+    }
+
+    /**
+     * Fetch the request and do appropriate error handling
+     *
+     * @param request the request to get the exception from
+     * @return the response from the exception.
+     * @throws OPMException on {@link InterruptedException} or {@link ExecutionException} or {@link TimeoutException}
+     */
+    public static PlcWriteResponse getPlcWriteResponse(PlcWriteRequest request) throws OPMException {
+        return getFromFuture(request);
+    }
+
+    @SuppressWarnings("unchecked")
+    private static <REQ extends PlcRequest, RES extends PlcResponse> RES getFromFuture(REQ request) throws OPMException {
+        try {
+            return (RES) request.execute().get(READ_TIMEOUT, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new OPMException("Exception during execution", e);
+        } catch (ExecutionException e) {
+            throw new OPMException("Exception during execution", e);
+        } catch (TimeoutException e) {
+            throw new OPMException("Timeout during fetching values", e);
+        }
+    }
+}
diff --git a/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcEntityManager.java b/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcEntityManager.java
index af0d2c03de4..58bba215c72 100644
--- a/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcEntityManager.java
+++ b/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcEntityManager.java
@@ -1,225 +1,225 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.opm;
-
-import net.bytebuddy.ByteBuddy;
-import net.bytebuddy.description.modifier.Visibility;
-import net.bytebuddy.implementation.MethodDelegation;
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.time.Instant;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.Callable;
-
-import static net.bytebuddy.matcher.ElementMatchers.isDeclaredBy;
-import static net.bytebuddy.matcher.ElementMatchers.not;
-
-/**
- * Plc4x equivalent of Jpas EntityManager for implementing Object-Plc-Mapping.
- * This means that calls to a plc can be done by using plain POJOs with Annotations.
- * <p>
- * First, the necessary annotations are {@link PlcEntity} and {@link PlcField}.
- * For a class to be usable as PlcEntity it needs
- * <ul>
- * <li>be non-final (as proxiing has to be used in case of {@link #connect(Class, String)}</li>
- * <li>a public no args constructor for instanciation</li>
- * <li>Needs to be annotated with {@link PlcEntity} and has a valid value which is the connection string</li>
- * </ul>
- * <p>
- * Basically, the {@link PlcEntityManager} has to operation "modes" represented by the methods {@link #read(Class, String)} and
- * {@link #connect(Class, String)}.
- * <p>
- * For a field to get Values from the Plc Injected it needs to be annotated with the {@link PlcField} annotation.
- * The value has to be the plc fields string (which is inserted in the {@link PlcReadRequest}).
- * The connection string is taken from the value of the {@link PlcEntity} annotation on the class.
- * <p>
- * The {@link #read(Class, String)} method has no direkt equivalent in JPA (as far as I know) as it only returns a "detached"
- * entity. This means it fetches all values from the plc that are annotated wiht the {@link PlcField} annotations.
- * <p>
- * The {@link #connect(Class, String)} method is more JPA-like as it returns a "connected" entity. This means, that each
- * time one of the getters on the returned entity is called a call is made to the plc (and the field value is changed
- * for this specific field).
- * Furthermore, if a method which is no getter is called, then all {@link PlcField}s are refreshed before doing the call.
- * Thus, all operations on fields that are annotated with {@link PlcField} are always done against the "live" values
- * from the PLC.
- * <p>
- * A connected @{@link PlcEntity} can be disconnected calling {@link #disconnect(Object)}, then it behaves like the
- * regular Pojo it was before.
- * <p>
- * All invocations on the getters are forwarded to the
- * {@link PlcEntityInterceptor#interceptGetter(Object, Method, Callable, String, PlcDriverManager, AliasRegistry, Map, Map)}
- * method.
- */
-public class PlcEntityManager {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(PlcEntityManager.class);
-
-    public static final String PLC_ADDRESS_FIELD_NAME = "_plcAddress";
-    static final String DRIVER_MANAGER_FIELD_NAME = "_driverManager";
-    static final String ALIAS_REGISTRY = "_aliasRegistry";
-    public static final String LAST_FETCHED = "_lastFetched";
-    public static final String LAST_WRITTEN = "_lastWritten";
-
-    private final PlcDriverManager driverManager;
-    private final SimpleAliasRegistry registry;
-
-    public PlcEntityManager() {
-        this(new PlcDriverManager());
-    }
-
-    public PlcEntityManager(PlcDriverManager driverManager) {
-        this(driverManager, new SimpleAliasRegistry());
-    }
-
-    public PlcEntityManager(PlcDriverManager driverManager, SimpleAliasRegistry registry) {
-        this.driverManager = driverManager;
-        this.registry = registry;
-    }
-
-    public <T> T read(Class<T> clazz, String address) throws OPMException {
-        T connect = connect(clazz, address);
-        disconnect(connect);
-        return connect;
-    }
-
-    public <T> T write(Class<T> clazz, String address, T object) throws OPMException {
-        T merge = merge(clazz, address, object);
-        disconnect(merge);
-        return merge;
-    }
-
-    /**
-     * Returns a connected proxy.
-     *
-     * @param clazz clazz to be connected.
-     * @param <T>   type of param {@code clazz}.
-     * @return a connected entity.
-     * @throws OPMException when proxy can't be build.
-     */
-    public <T> T connect(Class<T> clazz, String address) throws OPMException {
-        return connect(clazz, address, null);
-    }
-
-
-    /**
-     * Returns a connected proxy.
-     *
-     * @param clazz clazz to be connected.
-     * @param <T>   type of param {@code clazz}.
-     * @return a connected entity.
-     * @throws OPMException when proxy can't be build.
-     */
-    public <T> T merge(Class<T> clazz, String address, T instance) throws OPMException {
-        return connect(clazz, address, instance);
-    }
-
-    private <T> T connect(Class<T> clazz, String address, T existingInstance) throws OPMException {
-        OpmUtils.getPlcEntityAndCheckPreconditions(clazz);
-        try {
-            // Use Byte Buddy to generate a subclassed proxy that delegates all PlcField Methods
-            // to the intercept method
-            T instance = new ByteBuddy()
-                .subclass(clazz)
-                .defineField(PLC_ADDRESS_FIELD_NAME, String.class, Visibility.PRIVATE)
-                .defineField(DRIVER_MANAGER_FIELD_NAME, PlcDriverManager.class, Visibility.PRIVATE)
-                .defineField(ALIAS_REGISTRY, AliasRegistry.class, Visibility.PRIVATE)
-                .defineField(LAST_FETCHED, Map.class, Visibility.PRIVATE)
-                .defineField(LAST_WRITTEN, Map.class, Visibility.PRIVATE)
-                .method(not(isDeclaredBy(Object.class))).intercept(MethodDelegation.to(PlcEntityInterceptor.class))
-                .make()
-                .load(Thread.currentThread().getContextClassLoader())
-                .getLoaded()
-                .getConstructor()
-                .newInstance();
-            // Set connection value into the private field
-            FieldUtils.writeDeclaredField(instance, PLC_ADDRESS_FIELD_NAME, address, true);
-            FieldUtils.writeDeclaredField(instance, DRIVER_MANAGER_FIELD_NAME, driverManager, true);
-            FieldUtils.writeDeclaredField(instance, ALIAS_REGISTRY, registry, true);
-            Map<String, Instant> lastFetched = new HashMap<>();
-            FieldUtils.writeDeclaredField(instance, LAST_FETCHED, lastFetched, true);
-            Map<String, Instant> lastWritten = new HashMap<>();
-            FieldUtils.writeDeclaredField(instance, LAST_WRITTEN, lastWritten, true);
-
-            // Initially fetch all values
-            if (existingInstance == null) {
-                PlcEntityInterceptor.refetchAllFields(instance, driverManager, address, registry, lastFetched);
-            } else {
-                FieldUtils.getAllFieldsList(clazz).stream()
-                    .peek(field -> field.setAccessible(true))
-                    .forEach(field -> setValueToField(field, instance, getValueFromField(field, existingInstance)));
-
-                PlcEntityInterceptor.writeAllFields(instance, driverManager, address, registry, lastWritten);
-            }
-
-            return instance;
-        } catch (NoSuchMethodException | InvocationTargetException | InstantiationException | IllegalAccessException | IllegalAccessError e) {
-            throw new OPMException("Unable to instantiate Proxy", e);
-        }
-    }
-
-    private Object getValueFromField(Field field, Object object) {
-        try {
-            return field.get(object);
-        } catch (IllegalAccessException e) {
-            throw new PlcRuntimeException(e);
-        }
-    }
-
-    private void setValueToField(Field field, Object object, Object value) {
-        try {
-            field.set(object, value);
-        } catch (IllegalAccessException e) {
-            throw new PlcRuntimeException(e);
-        }
-    }
-
-    /**
-     * Disconnects the given instance.
-     *
-     * @param entity Instance of a PlcEntity.
-     * @throws OPMException Is thrown when the plc is already disconnected or no entity.
-     */
-    public void disconnect(Object entity) throws OPMException {
-        // Check if this is an entity
-        PlcEntity annotation = entity.getClass().getSuperclass().getAnnotation(PlcEntity.class);
-        if (annotation == null) {
-            throw new OPMException("Unable to disconnect Object, is no entity!");
-        }
-        try {
-            Object manager = FieldUtils.readDeclaredField(entity, DRIVER_MANAGER_FIELD_NAME, true);
-            if (manager == null) {
-                throw new OPMException("Instance is already disconnected!");
-            }
-            FieldUtils.writeDeclaredField(entity, DRIVER_MANAGER_FIELD_NAME, null, true);
-        } catch (IllegalAccessException e) {
-            throw new OPMException("Unable to fetch driverManager instance on entity instance", e);
-        }
-    }
-
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.opm;
+
+import net.bytebuddy.ByteBuddy;
+import net.bytebuddy.description.modifier.Visibility;
+import net.bytebuddy.implementation.MethodDelegation;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.Callable;
+
+import static net.bytebuddy.matcher.ElementMatchers.isDeclaredBy;
+import static net.bytebuddy.matcher.ElementMatchers.not;
+
+/**
+ * Plc4x equivalent of Jpas EntityManager for implementing Object-Plc-Mapping.
+ * This means that calls to a plc can be done by using plain POJOs with Annotations.
+ * <p>
+ * First, the necessary annotations are {@link PlcEntity} and {@link PlcField}.
+ * For a class to be usable as PlcEntity it needs
+ * <ul>
+ * <li>be non-final (as proxiing has to be used in case of {@link #connect(Class, String)}</li>
+ * <li>a public no args constructor for instanciation</li>
+ * <li>Needs to be annotated with {@link PlcEntity} and has a valid value which is the connection string</li>
+ * </ul>
+ * <p>
+ * Basically, the {@link PlcEntityManager} has to operation "modes" represented by the methods {@link #read(Class, String)} and
+ * {@link #connect(Class, String)}.
+ * <p>
+ * For a field to get Values from the Plc Injected it needs to be annotated with the {@link PlcField} annotation.
+ * The value has to be the plc fields string (which is inserted in the {@link PlcReadRequest}).
+ * The connection string is taken from the value of the {@link PlcEntity} annotation on the class.
+ * <p>
+ * The {@link #read(Class, String)} method has no direkt equivalent in JPA (as far as I know) as it only returns a "detached"
+ * entity. This means it fetches all values from the plc that are annotated wiht the {@link PlcField} annotations.
+ * <p>
+ * The {@link #connect(Class, String)} method is more JPA-like as it returns a "connected" entity. This means, that each
+ * time one of the getters on the returned entity is called a call is made to the plc (and the field value is changed
+ * for this specific field).
+ * Furthermore, if a method which is no getter is called, then all {@link PlcField}s are refreshed before doing the call.
+ * Thus, all operations on fields that are annotated with {@link PlcField} are always done against the "live" values
+ * from the PLC.
+ * <p>
+ * A connected @{@link PlcEntity} can be disconnected calling {@link #disconnect(Object)}, then it behaves like the
+ * regular Pojo it was before.
+ * <p>
+ * All invocations on the getters are forwarded to the
+ * {@link PlcEntityInterceptor#interceptGetter(Object, Method, Callable, String, PlcDriverManager, AliasRegistry, Map, Map)}
+ * method.
+ */
+public class PlcEntityManager {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PlcEntityManager.class);
+
+    public static final String PLC_ADDRESS_FIELD_NAME = "_plcAddress";
+    static final String DRIVER_MANAGER_FIELD_NAME = "_driverManager";
+    static final String ALIAS_REGISTRY = "_aliasRegistry";
+    public static final String LAST_FETCHED = "_lastFetched";
+    public static final String LAST_WRITTEN = "_lastWritten";
+
+    private final PlcDriverManager driverManager;
+    private final SimpleAliasRegistry registry;
+
+    public PlcEntityManager() {
+        this(new PlcDriverManager());
+    }
+
+    public PlcEntityManager(PlcDriverManager driverManager) {
+        this(driverManager, new SimpleAliasRegistry());
+    }
+
+    public PlcEntityManager(PlcDriverManager driverManager, SimpleAliasRegistry registry) {
+        this.driverManager = driverManager;
+        this.registry = registry;
+    }
+
+    public <T> T read(Class<T> clazz, String address) throws OPMException {
+        T connect = connect(clazz, address);
+        disconnect(connect);
+        return connect;
+    }
+
+    public <T> T write(Class<T> clazz, String address, T object) throws OPMException {
+        T merge = merge(clazz, address, object);
+        disconnect(merge);
+        return merge;
+    }
+
+    /**
+     * Returns a connected proxy.
+     *
+     * @param clazz clazz to be connected.
+     * @param <T>   type of param {@code clazz}.
+     * @return a connected entity.
+     * @throws OPMException when proxy can't be build.
+     */
+    public <T> T connect(Class<T> clazz, String address) throws OPMException {
+        return connect(clazz, address, null);
+    }
+
+
+    /**
+     * Returns a connected proxy.
+     *
+     * @param clazz clazz to be connected.
+     * @param <T>   type of param {@code clazz}.
+     * @return a connected entity.
+     * @throws OPMException when proxy can't be build.
+     */
+    public <T> T merge(Class<T> clazz, String address, T instance) throws OPMException {
+        return connect(clazz, address, instance);
+    }
+
+    private <T> T connect(Class<T> clazz, String address, T existingInstance) throws OPMException {
+        OpmUtils.getPlcEntityAndCheckPreconditions(clazz);
+        try {
+            // Use Byte Buddy to generate a subclassed proxy that delegates all PlcField Methods
+            // to the intercept method
+            T instance = new ByteBuddy()
+                .subclass(clazz)
+                .defineField(PLC_ADDRESS_FIELD_NAME, String.class, Visibility.PRIVATE)
+                .defineField(DRIVER_MANAGER_FIELD_NAME, PlcDriverManager.class, Visibility.PRIVATE)
+                .defineField(ALIAS_REGISTRY, AliasRegistry.class, Visibility.PRIVATE)
+                .defineField(LAST_FETCHED, Map.class, Visibility.PRIVATE)
+                .defineField(LAST_WRITTEN, Map.class, Visibility.PRIVATE)
+                .method(not(isDeclaredBy(Object.class))).intercept(MethodDelegation.to(PlcEntityInterceptor.class))
+                .make()
+                .load(Thread.currentThread().getContextClassLoader())
+                .getLoaded()
+                .getConstructor()
+                .newInstance();
+            // Set connection value into the private field
+            FieldUtils.writeDeclaredField(instance, PLC_ADDRESS_FIELD_NAME, address, true);
+            FieldUtils.writeDeclaredField(instance, DRIVER_MANAGER_FIELD_NAME, driverManager, true);
+            FieldUtils.writeDeclaredField(instance, ALIAS_REGISTRY, registry, true);
+            Map<String, Instant> lastFetched = new HashMap<>();
+            FieldUtils.writeDeclaredField(instance, LAST_FETCHED, lastFetched, true);
+            Map<String, Instant> lastWritten = new HashMap<>();
+            FieldUtils.writeDeclaredField(instance, LAST_WRITTEN, lastWritten, true);
+
+            // Initially fetch all values
+            if (existingInstance == null) {
+                PlcEntityInterceptor.refetchAllFields(instance, driverManager, address, registry, lastFetched);
+            } else {
+                FieldUtils.getAllFieldsList(clazz).stream()
+                    .peek(field -> field.setAccessible(true))
+                    .forEach(field -> setValueToField(field, instance, getValueFromField(field, existingInstance)));
+
+                PlcEntityInterceptor.writeAllFields(instance, driverManager, address, registry, lastWritten);
+            }
+
+            return instance;
+        } catch (NoSuchMethodException | InvocationTargetException | InstantiationException | IllegalAccessException | IllegalAccessError e) {
+            throw new OPMException("Unable to instantiate Proxy", e);
+        }
+    }
+
+    private Object getValueFromField(Field field, Object object) {
+        try {
+            return field.get(object);
+        } catch (IllegalAccessException e) {
+            throw new PlcRuntimeException(e);
+        }
+    }
+
+    private void setValueToField(Field field, Object object, Object value) {
+        try {
+            field.set(object, value);
+        } catch (IllegalAccessException e) {
+            throw new PlcRuntimeException(e);
+        }
+    }
+
+    /**
+     * Disconnects the given instance.
+     *
+     * @param entity Instance of a PlcEntity.
+     * @throws OPMException Is thrown when the plc is already disconnected or no entity.
+     */
+    public void disconnect(Object entity) throws OPMException {
+        // Check if this is an entity
+        PlcEntity annotation = entity.getClass().getSuperclass().getAnnotation(PlcEntity.class);
+        if (annotation == null) {
+            throw new OPMException("Unable to disconnect Object, is no entity!");
+        }
+        try {
+            Object manager = FieldUtils.readDeclaredField(entity, DRIVER_MANAGER_FIELD_NAME, true);
+            if (manager == null) {
+                throw new OPMException("Instance is already disconnected!");
+            }
+            FieldUtils.writeDeclaredField(entity, DRIVER_MANAGER_FIELD_NAME, null, true);
+        } catch (IllegalAccessException e) {
+            throw new OPMException("Unable to fetch driverManager instance on entity instance", e);
+        }
+    }
+
+}
diff --git a/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcField.java b/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcField.java
index 5afbee737ae..7769ada64a9 100644
--- a/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcField.java
+++ b/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcField.java
@@ -1,35 +1,35 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.opm;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Field that is mapped
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD})
-public @interface PlcField {
-    String value();
-    long cacheDurationMillis() default -1;
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.opm;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Field that is mapped
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD})
+public @interface PlcField {
+    String value();
+    long cacheDurationMillis() default -1;
+}
diff --git a/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/SimpleAliasRegistry.java b/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/SimpleAliasRegistry.java
index 494e55b08a1..b6b304f6e80 100644
--- a/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/SimpleAliasRegistry.java
+++ b/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/SimpleAliasRegistry.java
@@ -1,75 +1,75 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.opm;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * Simple Map Based Implementation of {@link AliasRegistry}.
- * It is not connection specific and forwards connection aware methods to the "simple" methods.
- */
-public class SimpleAliasRegistry implements AliasRegistry {
-
-    /**
-     * Map from alias -> plc field address
-     */
-    private final Map<String, String> aliasMap;
-
-    public SimpleAliasRegistry() {
-        this(new ConcurrentHashMap<>());
-    }
-
-    public SimpleAliasRegistry(Map<String, String> aliasMap) {
-        this.aliasMap = aliasMap;
-    }
-
-    /**
-     * Register an Alias in the Registry.
-     */
-    public void register(String alias, String address) {
-        this.aliasMap.put(alias, address);
-    }
-
-    @Override
-    public boolean canResolve(String connection, String alias) {
-        return canResolve(alias);
-    }
-
-    @Override
-    public String resolve(String connection, String alias) {
-        return resolve(alias);
-    }
-
-    @Override
-    public boolean canResolve(String alias) {
-        return aliasMap.containsKey(alias);
-    }
-
-    @Override
-    public String resolve(String alias) {
-        if (!canResolve(alias)) {
-            throw new NoSuchElementException("Unable to resolve '" + alias + "'");
-        }
-        return aliasMap.get(alias);
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.opm;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Simple Map Based Implementation of {@link AliasRegistry}.
+ * It is not connection specific and forwards connection aware methods to the "simple" methods.
+ */
+public class SimpleAliasRegistry implements AliasRegistry {
+
+    /**
+     * Map from alias -> plc field address
+     */
+    private final Map<String, String> aliasMap;
+
+    public SimpleAliasRegistry() {
+        this(new ConcurrentHashMap<>());
+    }
+
+    public SimpleAliasRegistry(Map<String, String> aliasMap) {
+        this.aliasMap = aliasMap;
+    }
+
+    /**
+     * Register an Alias in the Registry.
+     */
+    public void register(String alias, String address) {
+        this.aliasMap.put(alias, address);
+    }
+
+    @Override
+    public boolean canResolve(String connection, String alias) {
+        return canResolve(alias);
+    }
+
+    @Override
+    public String resolve(String connection, String alias) {
+        return resolve(alias);
+    }
+
+    @Override
+    public boolean canResolve(String alias) {
+        return aliasMap.containsKey(alias);
+    }
+
+    @Override
+    public String resolve(String alias) {
+        if (!canResolve(alias)) {
+            throw new NoSuchElementException("Unable to resolve '" + alias + "'");
+        }
+        return aliasMap.get(alias);
+    }
+}
diff --git a/plc4j/utils/opm/src/site/asciidoc/opm/using-opm.adoc b/plc4j/utils/opm/src/site/asciidoc/opm/using-opm.adoc
index 1eb99201d87..88f1c129b89 100644
--- a/plc4j/utils/opm/src/site/asciidoc/opm/using-opm.adoc
+++ b/plc4j/utils/opm/src/site/asciidoc/opm/using-opm.adoc
@@ -1,61 +1,61 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== What is Object Plc Mapping (OPM)?
-
-ASDF:
-
-....
-    public class ModbusTcpPlcConnection extends BaseModbusPlcConnection {
-
-        private static final int MODBUS_TCP_PORT = 502;
-
-        public ModbusTcpPlcConnection(InetAddress address, String params) {
-            this(new TcpSocketChannelFactory(address, MODBUS_TCP_PORT), params);
-            logger.info("Configured ModbusTcpPlcConnection with: host-name {}", address.getHostAddress());
-        }
-
-        ModbusTcpPlcConnection(ChannelFactory channelFactory, String params) {
-            super(channelFactory, params);
-        }
-
-        @Override
-        protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
-            return new ChannelInitializer() {
-                @Override
-                protected void initChannel(Channel channel) {
-                    // Build the protocol stack for communicating with the modbus protocol.
-                    ChannelPipeline pipeline = channel.pipeline();
-                    pipeline.addLast(new ModbusTcpProtocol());
-                    pipeline.addLast(new ModbusProtocol());
-                    pipeline.addLast(new Plc4XModbusProtocol());
-                }
-            };
-        }
-
-    }
-....
-
-As you can see in above example there are two constructors.
-The first one is the default, which establishes a connection using the default connector.
-As the TCP variant of the `Modbus` protocol uses normal TCP, a `TcpSocketChannelFactory` instance is used.
-However in order to test the driver, a unit- or integration-test can use the second constructor to inject a different `ChannelFactory`.
-Notice that this constructor can be package-private if the test-case is in the same package.
-Here the `TestConnectionFactory` will allow creating tests without having to worry about the physical connection and all problems that come with it.
-
-The pipeline itself is created in the `getChannelHandler` method.
-Here you have to keep in mind that the layer that is closest to the connection has to be added first, the `PLC4X Layer` last.
+//
+//  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
+//
+//      http://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.
+//
+
+== What is Object Plc Mapping (OPM)?
+
+ASDF:
+
+....
+    public class ModbusTcpPlcConnection extends BaseModbusPlcConnection {
+
+        private static final int MODBUS_TCP_PORT = 502;
+
+        public ModbusTcpPlcConnection(InetAddress address, String params) {
+            this(new TcpSocketChannelFactory(address, MODBUS_TCP_PORT), params);
+            logger.info("Configured ModbusTcpPlcConnection with: host-name {}", address.getHostAddress());
+        }
+
+        ModbusTcpPlcConnection(ChannelFactory channelFactory, String params) {
+            super(channelFactory, params);
+        }
+
+        @Override
+        protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
+            return new ChannelInitializer() {
+                @Override
+                protected void initChannel(Channel channel) {
+                    // Build the protocol stack for communicating with the modbus protocol.
+                    ChannelPipeline pipeline = channel.pipeline();
+                    pipeline.addLast(new ModbusTcpProtocol());
+                    pipeline.addLast(new ModbusProtocol());
+                    pipeline.addLast(new Plc4XModbusProtocol());
+                }
+            };
+        }
+
+    }
+....
+
+As you can see in above example there are two constructors.
+The first one is the default, which establishes a connection using the default connector.
+As the TCP variant of the `Modbus` protocol uses normal TCP, a `TcpSocketChannelFactory` instance is used.
+However in order to test the driver, a unit- or integration-test can use the second constructor to inject a different `ChannelFactory`.
+Notice that this constructor can be package-private if the test-case is in the same package.
+Here the `TestConnectionFactory` will allow creating tests without having to worry about the physical connection and all problems that come with it.
+
+The pipeline itself is created in the `getChannelHandler` method.
+Here you have to keep in mind that the layer that is closest to the connection has to be added first, the `PLC4X Layer` last.
diff --git a/plc4j/utils/opm/src/site/site.xml b/plc4j/utils/opm/src/site/site.xml
index e2507303b11..04f93070df1 100644
--- a/plc4j/utils/opm/src/site/site.xml
+++ b/plc4j/utils/opm/src/site/site.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~ 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
-  ~
-  ~   http://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.
-  -->
-<project>
-
-  <body>
-    <menu name="Users">
-    </menu>
-    <menu name="Developers">
-      <item name="Object Plc Mapping (OPM)" href="opm/using-opm.html"/>
-    </menu>
-  </body>
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ 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
+  ~
+  ~   http://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.
+  -->
+<project>
+
+  <body>
+    <menu name="Users">
+    </menu>
+    <menu name="Developers">
+      <item name="Object Plc Mapping (OPM)" href="opm/using-opm.html"/>
+    </menu>
+  </body>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/ConnectedEntityTest.java b/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/ConnectedEntityTest.java
index b592fbf3ac1..717312c8abf 100644
--- a/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/ConnectedEntityTest.java
+++ b/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/ConnectedEntityTest.java
@@ -1,119 +1,119 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.opm;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.messages.items.DefaultStringFieldItem;
-import org.apache.plc4x.java.mock.MockDevice;
-import org.apache.plc4x.java.mock.PlcMockConnection;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.util.stream.IntStream;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
-
-/**
- * Tests for Connected Entities.
- */
-@ExtendWith(MockitoExtension.class)
-public class ConnectedEntityTest {
-
-    PlcDriverManager driverManager;
-
-    PlcMockConnection connection;
-
-    PlcEntityManager entityManager;
-
-    @Mock
-    MockDevice mockDevice;
-
-    @BeforeEach
-    void setUp() throws Exception {
-        driverManager = new PlcDriverManager();
-        connection = (PlcMockConnection) driverManager.getConnection("mock:cached");
-        when(mockDevice.read(any()))
-            .thenReturn(Pair.of(PlcResponseCode.OK, new DefaultStringFieldItem("hallo")));
-        connection.setDevice(mockDevice);
-        entityManager = new PlcEntityManager(driverManager);
-    }
-
-    @Test
-    void useCache() throws OPMException {
-        // Trigger a fetch
-        CachingEntity entity = entityManager.connect(CachingEntity.class, "mock:cached");
-        // Trigger second fetch
-        assertEquals("hallo", entity.getField());
-
-        verify(mockDevice, timeout(1_000).times(1)).read(any());
-    }
-
-    @Test
-    void useCache_timeout_refetches() throws OPMException, InterruptedException {
-        // Trigger a fetch
-        CachingEntity entity = entityManager.connect(CachingEntity.class, "mock:cached");
-        Thread.sleep(500);
-        // Trigger second fetch
-        assertEquals("hallo", entity.getField());
-
-        verify(mockDevice, timeout(1_000).times(2)).read(any());
-    }
-
-    @Test
-    void cache_manyRequests_onlyOneToPlc() throws OPMException {
-        // Mock
-        when(mockDevice.write(any(), any()))
-            .thenReturn(PlcResponseCode.OK);
-
-        // Trigger a fetch
-        CachingEntity entity = entityManager.connect(CachingEntity.class, "mock:cached");
-        // Trigger Many Fetches via getter
-        IntStream.range(1, 10).forEach(i -> entity.getField());
-        IntStream.range(1, 10).forEach(i -> entity.dummyMethod());
-
-        verify(mockDevice, timeout(1_000).times(1)).read(any());
-    }
-
-    @PlcEntity
-    public static class CachingEntity {
-
-        @PlcField(value = "address", cacheDurationMillis = 500)
-        private String field;
-
-        public CachingEntity() {
-            // For OPM
-        }
-
-        public String getField() {
-            return field;
-        }
-
-        public void dummyMethod() {
-            // do nothing
-        }
-    }
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.opm;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.messages.items.DefaultStringFieldItem;
+import org.apache.plc4x.java.mock.MockDevice;
+import org.apache.plc4x.java.mock.PlcMockConnection;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.stream.IntStream;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+/**
+ * Tests for Connected Entities.
+ */
+@ExtendWith(MockitoExtension.class)
+public class ConnectedEntityTest {
+
+    PlcDriverManager driverManager;
+
+    PlcMockConnection connection;
+
+    PlcEntityManager entityManager;
+
+    @Mock
+    MockDevice mockDevice;
+
+    @BeforeEach
+    void setUp() throws Exception {
+        driverManager = new PlcDriverManager();
+        connection = (PlcMockConnection) driverManager.getConnection("mock:cached");
+        when(mockDevice.read(any()))
+            .thenReturn(Pair.of(PlcResponseCode.OK, new DefaultStringFieldItem("hallo")));
+        connection.setDevice(mockDevice);
+        entityManager = new PlcEntityManager(driverManager);
+    }
+
+    @Test
+    void useCache() throws OPMException {
+        // Trigger a fetch
+        CachingEntity entity = entityManager.connect(CachingEntity.class, "mock:cached");
+        // Trigger second fetch
+        assertEquals("hallo", entity.getField());
+
+        verify(mockDevice, timeout(1_000).times(1)).read(any());
+    }
+
+    @Test
+    void useCache_timeout_refetches() throws OPMException, InterruptedException {
+        // Trigger a fetch
+        CachingEntity entity = entityManager.connect(CachingEntity.class, "mock:cached");
+        Thread.sleep(500);
+        // Trigger second fetch
+        assertEquals("hallo", entity.getField());
+
+        verify(mockDevice, timeout(1_000).times(2)).read(any());
+    }
+
+    @Test
+    void cache_manyRequests_onlyOneToPlc() throws OPMException {
+        // Mock
+        when(mockDevice.write(any(), any()))
+            .thenReturn(PlcResponseCode.OK);
+
+        // Trigger a fetch
+        CachingEntity entity = entityManager.connect(CachingEntity.class, "mock:cached");
+        // Trigger Many Fetches via getter
+        IntStream.range(1, 10).forEach(i -> entity.getField());
+        IntStream.range(1, 10).forEach(i -> entity.dummyMethod());
+
+        verify(mockDevice, timeout(1_000).times(1)).read(any());
+    }
+
+    @PlcEntity
+    public static class CachingEntity {
+
+        @PlcField(value = "address", cacheDurationMillis = 500)
+        private String field;
+
+        public CachingEntity() {
+            // For OPM
+        }
+
+        public String getField() {
+            return field;
+        }
+
+        public void dummyMethod() {
+            // do nothing
+        }
+    }
 }
\ No newline at end of file
diff --git a/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/OPMExceptionTest.java b/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/OPMExceptionTest.java
index 09c9585cadb..8292a4b0409 100644
--- a/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/OPMExceptionTest.java
+++ b/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/OPMExceptionTest.java
@@ -1,42 +1,42 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.opm;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-class OPMExceptionTest {
-
-    @Test
-    public void simpleStringConstructor() {
-        assertThrows(OPMException.class, () -> {
-            throw new OPMException("Foo");
-        });
-    }
-
-    @Test
-    public void simpleStringAndThrowableConstructor() {
-        assertThrows(OPMException.class, () -> {
-            throw new OPMException("foo", new IllegalArgumentException("bar"));
-        });
-    }
-
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.opm;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class OPMExceptionTest {
+
+    @Test
+    public void simpleStringConstructor() {
+        assertThrows(OPMException.class, () -> {
+            throw new OPMException("Foo");
+        });
+    }
+
+    @Test
+    public void simpleStringAndThrowableConstructor() {
+        assertThrows(OPMException.class, () -> {
+            throw new OPMException("foo", new IllegalArgumentException("bar"));
+        });
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/OpmUtilsTest.java b/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/OpmUtilsTest.java
index 1753f0be737..e8f0ddc8acd 100644
--- a/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/OpmUtilsTest.java
+++ b/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/OpmUtilsTest.java
@@ -1,66 +1,66 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.opm;
-
-import org.assertj.core.api.WithAssertions;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.Assert.*;
-
-public class OpmUtilsTest implements WithAssertions {
-
-    @Test
-    public void expression_matches() {
-        assertTrue(OpmUtils.pattern.matcher("${Hallo}").matches());
-        assertTrue(OpmUtils.pattern.matcher("${Hallo:Hallo}").matches());
-        // ...
-        assertTrue(OpmUtils.pattern.matcher("${Ha{}llo}").matches());
-    }
-
-    @Test
-    public void getAlias_matches() {
-        String alias = OpmUtils.getAlias("${hallo}");
-
-        assertEquals("hallo", alias);
-    }
-
-    @Test
-    public void isAlias_bothCases() {
-        // True
-        assertTrue(OpmUtils.isAlias("${hallo}"));
-        assertTrue(OpmUtils.isAlias("${hal{}lo}"));
-        assertTrue(OpmUtils.isAlias("${hallo:hallo}"));
-        // False
-        assertFalse(OpmUtils.isAlias("hallo"));
-        assertFalse(OpmUtils.isAlias("${hallo"));
-        assertFalse(OpmUtils.isAlias("${ha}llo"));
-    }
-
-    @Test
-    public void isValidExpression_startingDollar_false() {
-        assertFalse(OpmUtils.isValidExpression("${hallo"));
-    }
-
-    @Test
-    public void getAlias_illegalString_throws() {
-        assertThatThrownBy(() -> OpmUtils.getAlias("hallo"))
-            .isInstanceOf(IllegalArgumentException.class);
-    }
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.opm;
+
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.Assert.*;
+
+public class OpmUtilsTest implements WithAssertions {
+
+    @Test
+    public void expression_matches() {
+        assertTrue(OpmUtils.pattern.matcher("${Hallo}").matches());
+        assertTrue(OpmUtils.pattern.matcher("${Hallo:Hallo}").matches());
+        // ...
+        assertTrue(OpmUtils.pattern.matcher("${Ha{}llo}").matches());
+    }
+
+    @Test
+    public void getAlias_matches() {
+        String alias = OpmUtils.getAlias("${hallo}");
+
+        assertEquals("hallo", alias);
+    }
+
+    @Test
+    public void isAlias_bothCases() {
+        // True
+        assertTrue(OpmUtils.isAlias("${hallo}"));
+        assertTrue(OpmUtils.isAlias("${hal{}lo}"));
+        assertTrue(OpmUtils.isAlias("${hallo:hallo}"));
+        // False
+        assertFalse(OpmUtils.isAlias("hallo"));
+        assertFalse(OpmUtils.isAlias("${hallo"));
+        assertFalse(OpmUtils.isAlias("${ha}llo"));
+    }
+
+    @Test
+    public void isValidExpression_startingDollar_false() {
+        assertFalse(OpmUtils.isValidExpression("${hallo"));
+    }
+
+    @Test
+    public void getAlias_illegalString_throws() {
+        assertThatThrownBy(() -> OpmUtils.getAlias("hallo"))
+            .isInstanceOf(IllegalArgumentException.class);
+    }
 }
\ No newline at end of file
diff --git a/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityInterceptorTest.java b/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityInterceptorTest.java
index 685412363ee..37f2eaa6471 100644
--- a/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityInterceptorTest.java
+++ b/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityInterceptorTest.java
@@ -1,214 +1,214 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.opm;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.messages.DefaultPlcReadResponse;
-import org.assertj.core.api.WithAssertions;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.mockito.stubbing.Answer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.time.Instant;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-@ExtendWith(MockitoExtension.class)
-public class PlcEntityInterceptorTest implements WithAssertions {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(PlcEntityInterceptorTest.class);
-
-    @Test
-    public void getPlcReadResponse_catchesInterruptedException_rethrows() throws InterruptedException {
-        AtomicBoolean exceptionWasThrown = new AtomicBoolean(false);
-        // Run in different Thread
-        Thread thread = new Thread(() -> {
-            try {
-                runGetPlcResponseWIthException(invocation -> {
-                    throw new InterruptedException();
-                });
-            } catch (InterruptedException | ExecutionException | TimeoutException e) {
-                LOGGER.warn("Fetched exception", e);
-                Thread.currentThread().interrupt();
-            } catch (OPMException e) {
-                exceptionWasThrown.set(true);
-            }
-        });
-        thread.start();
-        thread.join();
-        assertTrue(exceptionWasThrown.get());
-    }
-
-    @Test
-    public void getPlcReadResponse_catchesExecutionException_rethrows() {
-        assertThatThrownBy(() -> runGetPlcResponseWIthException(invocation -> {
-            throw new ExecutionException(new Exception());
-        }))
-            .isInstanceOf(OPMException.class);
-    }
-
-    @Test
-    public void getPlcReadResponse_timeoutOnGet_rethrows() {
-        PlcReadRequest request = mock(PlcReadRequest.class);
-        when(request.execute()).thenReturn(new CompletableFuture<>());
-
-        assertThatThrownBy(() -> PlcEntityInterceptor.getPlcReadResponse(request))
-            .isInstanceOf(OPMException.class);
-    }
-
-    @Test
-    public void getTyped_notOkResponse_throws() {
-        DefaultPlcReadResponse response = new DefaultPlcReadResponse(null, Collections.singletonMap("field", Pair.of(PlcResponseCode.NOT_FOUND, null)));
-        assertThatThrownBy(() -> PlcEntityInterceptor.getTyped(Long.class, response, "field"))
-            .isInstanceOf(PlcRuntimeException.class)
-            .hasMessage("Unable to read specified field 'field', response code was 'NOT_FOUND'");
-    }
-
-    @Test
-    public void getterWithNoField() throws OPMException {
-        PlcEntityManager entityManager = new PlcEntityManager();
-        BadEntity entity = entityManager.connect(BadEntity.class, "test:test");
-
-        assertThatThrownBy(entity::getField1)
-            .isInstanceOf(OPMException.class)
-            .hasMessage("Unable to identify field with name 'field1' for call to 'getField1'");
-    }
-
-    @Nested
-    class Misc {
-
-        @Mock
-        Callable callable;
-
-        @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-        PlcDriverManager plcDriverManager;
-
-        class MiscEntity {
-
-            @PlcField("asd")
-            private String ok2;
-
-            public void getTest(String a) {
-            }
-
-            public String getOk() {
-                return "";
-            }
-
-            public String getOk2() {
-                return ok2;
-            }
-
-            public void setOk2(String ok) {
-            }
-
-            public void setOkOk(String ok, String ok2) {
-            }
-
-            public void someNotSetterMethod(String arg) {
-            }
-
-            public void something() {
-
-            }
-        }
-
-        @Test
-        void missingCases() throws Exception {
-            when(callable.call()).then(invocation -> {
-                throw new PlcRuntimeException("broken");
-            });
-            Map<String, Instant> lastFetched = new HashMap<>();
-            Map<String, Instant> lastWritten = new HashMap<>();
-            assertThatThrownBy(() -> PlcEntityInterceptor.interceptGetter(null, MiscEntity.class.getDeclaredMethod("something"), callable, null, null, null, lastFetched, lastWritten))
-                .isInstanceOf(OPMException.class)
-                .hasMessage("Exception during forwarding call");
-            assertThatThrownBy(() -> PlcEntityInterceptor.interceptGetter(null, MiscEntity.class.getDeclaredMethod("getTest", String.class), callable, null, plcDriverManager, null, lastFetched, lastWritten))
-                .isInstanceOf(OPMException.class)
-                .hasMessage("Only getter with no arguments are supported");
-            assertThatThrownBy(() -> PlcEntityInterceptor.interceptGetter(null, MiscEntity.class.getDeclaredMethod("getOk"), callable, null, plcDriverManager, null, lastFetched, lastWritten))
-                .isInstanceOf(OPMException.class)
-                .hasMessageMatching("Unable to identify field with name .*");
-            assertThatThrownBy(() -> PlcEntityInterceptor.interceptGetter(null, MiscEntity.class.getDeclaredMethod("getOk2"), callable, null, plcDriverManager, null, lastFetched, lastWritten))
-                .isInstanceOf(OPMException.class)
-                .hasMessage("Problem during processing");
-            assertThatThrownBy(() -> PlcEntityInterceptor.interceptGetter(null, MiscEntity.class.getDeclaredMethod("getOk2"), callable, null, plcDriverManager, null, lastFetched, lastWritten))
-                .isInstanceOf(OPMException.class)
-                .hasMessage("Problem during processing")
-                .hasStackTraceContaining(" Unable to read specified field 'org.apache.plc4x.java.opm.PlcEntityInterceptorTest$Misc$MiscEntity.ok2', response code was 'null'");
-            assertThatThrownBy(() -> PlcEntityInterceptor.interceptSetter(null, MiscEntity.class.getDeclaredMethod("setOk2", String.class), callable, null, plcDriverManager, null, lastFetched, lastWritten))
-                .isInstanceOf(OPMException.class)
-                .hasMessage("Problem during processing")
-                .hasStackTraceContaining(" Unable to read specified field 'org.apache.plc4x.java.opm.PlcEntityInterceptorTest$Misc$MiscEntity.ok2', response code was 'null'");
-            assertThatThrownBy(() -> PlcEntityInterceptor.interceptSetter(null, MiscEntity.class.getDeclaredMethod("setOkOk", String.class, String.class), callable, null, plcDriverManager, null, lastFetched, lastWritten))
-                .isInstanceOf(OPMException.class)
-                .hasMessage("Only setter with one arguments are supported");
-            assertThatThrownBy(() -> PlcEntityInterceptor.interceptSetter(null, MiscEntity.class.getDeclaredMethod("someNotSetterMethod", String.class), callable, null, plcDriverManager, null, lastFetched, lastWritten))
-                .isInstanceOf(OPMException.class)
-                .hasMessage("Unable to forward invocation someNotSetterMethod on connected PlcEntity");
-        }
-    }
-
-    private void runGetPlcResponseWIthException(Answer a) throws InterruptedException, ExecutionException, TimeoutException, OPMException {
-        PlcReadRequest request = mock(PlcReadRequest.class);
-        CompletableFuture future = mock(CompletableFuture.class);
-        when(future.get(anyLong(), any())).then(a);
-        when(request.execute()).thenReturn(future);
-
-        PlcEntityInterceptor.getPlcReadResponse(request);
-    }
-
-    @PlcEntity
-    public static class BadEntity {
-
-        public BadEntity() {
-            // For OPM
-        }
-
-        // Getter with no field
-        public String getField1() {
-            return "";
-        }
-
-    }
-
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.opm;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.messages.DefaultPlcReadResponse;
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.stubbing.Answer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.time.Instant;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+public class PlcEntityInterceptorTest implements WithAssertions {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PlcEntityInterceptorTest.class);
+
+    @Test
+    public void getPlcReadResponse_catchesInterruptedException_rethrows() throws InterruptedException {
+        AtomicBoolean exceptionWasThrown = new AtomicBoolean(false);
+        // Run in different Thread
+        Thread thread = new Thread(() -> {
+            try {
+                runGetPlcResponseWIthException(invocation -> {
+                    throw new InterruptedException();
+                });
+            } catch (InterruptedException | ExecutionException | TimeoutException e) {
+                LOGGER.warn("Fetched exception", e);
+                Thread.currentThread().interrupt();
+            } catch (OPMException e) {
+                exceptionWasThrown.set(true);
+            }
+        });
+        thread.start();
+        thread.join();
+        assertTrue(exceptionWasThrown.get());
+    }
+
+    @Test
+    public void getPlcReadResponse_catchesExecutionException_rethrows() {
+        assertThatThrownBy(() -> runGetPlcResponseWIthException(invocation -> {
+            throw new ExecutionException(new Exception());
+        }))
+            .isInstanceOf(OPMException.class);
+    }
+
+    @Test
+    public void getPlcReadResponse_timeoutOnGet_rethrows() {
+        PlcReadRequest request = mock(PlcReadRequest.class);
+        when(request.execute()).thenReturn(new CompletableFuture<>());
+
+        assertThatThrownBy(() -> PlcEntityInterceptor.getPlcReadResponse(request))
+            .isInstanceOf(OPMException.class);
+    }
+
+    @Test
+    public void getTyped_notOkResponse_throws() {
+        DefaultPlcReadResponse response = new DefaultPlcReadResponse(null, Collections.singletonMap("field", Pair.of(PlcResponseCode.NOT_FOUND, null)));
+        assertThatThrownBy(() -> PlcEntityInterceptor.getTyped(Long.class, response, "field"))
+            .isInstanceOf(PlcRuntimeException.class)
+            .hasMessage("Unable to read specified field 'field', response code was 'NOT_FOUND'");
+    }
+
+    @Test
+    public void getterWithNoField() throws OPMException {
+        PlcEntityManager entityManager = new PlcEntityManager();
+        BadEntity entity = entityManager.connect(BadEntity.class, "test:test");
+
+        assertThatThrownBy(entity::getField1)
+            .isInstanceOf(OPMException.class)
+            .hasMessage("Unable to identify field with name 'field1' for call to 'getField1'");
+    }
+
+    @Nested
+    class Misc {
+
+        @Mock
+        Callable callable;
+
+        @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+        PlcDriverManager plcDriverManager;
+
+        class MiscEntity {
+
+            @PlcField("asd")
+            private String ok2;
+
+            public void getTest(String a) {
+            }
+
+            public String getOk() {
+                return "";
+            }
+
+            public String getOk2() {
+                return ok2;
+            }
+
+            public void setOk2(String ok) {
+            }
+
+            public void setOkOk(String ok, String ok2) {
+            }
+
+            public void someNotSetterMethod(String arg) {
+            }
+
+            public void something() {
+
+            }
+        }
+
+        @Test
+        void missingCases() throws Exception {
+            when(callable.call()).then(invocation -> {
+                throw new PlcRuntimeException("broken");
+            });
+            Map<String, Instant> lastFetched = new HashMap<>();
+            Map<String, Instant> lastWritten = new HashMap<>();
+            assertThatThrownBy(() -> PlcEntityInterceptor.interceptGetter(null, MiscEntity.class.getDeclaredMethod("something"), callable, null, null, null, lastFetched, lastWritten))
+                .isInstanceOf(OPMException.class)
+                .hasMessage("Exception during forwarding call");
+            assertThatThrownBy(() -> PlcEntityInterceptor.interceptGetter(null, MiscEntity.class.getDeclaredMethod("getTest", String.class), callable, null, plcDriverManager, null, lastFetched, lastWritten))
+                .isInstanceOf(OPMException.class)
+                .hasMessage("Only getter with no arguments are supported");
+            assertThatThrownBy(() -> PlcEntityInterceptor.interceptGetter(null, MiscEntity.class.getDeclaredMethod("getOk"), callable, null, plcDriverManager, null, lastFetched, lastWritten))
+                .isInstanceOf(OPMException.class)
+                .hasMessageMatching("Unable to identify field with name .*");
+            assertThatThrownBy(() -> PlcEntityInterceptor.interceptGetter(null, MiscEntity.class.getDeclaredMethod("getOk2"), callable, null, plcDriverManager, null, lastFetched, lastWritten))
+                .isInstanceOf(OPMException.class)
+                .hasMessage("Problem during processing");
+            assertThatThrownBy(() -> PlcEntityInterceptor.interceptGetter(null, MiscEntity.class.getDeclaredMethod("getOk2"), callable, null, plcDriverManager, null, lastFetched, lastWritten))
+                .isInstanceOf(OPMException.class)
+                .hasMessage("Problem during processing")
+                .hasStackTraceContaining(" Unable to read specified field 'org.apache.plc4x.java.opm.PlcEntityInterceptorTest$Misc$MiscEntity.ok2', response code was 'null'");
+            assertThatThrownBy(() -> PlcEntityInterceptor.interceptSetter(null, MiscEntity.class.getDeclaredMethod("setOk2", String.class), callable, null, plcDriverManager, null, lastFetched, lastWritten))
+                .isInstanceOf(OPMException.class)
+                .hasMessage("Problem during processing")
+                .hasStackTraceContaining(" Unable to read specified field 'org.apache.plc4x.java.opm.PlcEntityInterceptorTest$Misc$MiscEntity.ok2', response code was 'null'");
+            assertThatThrownBy(() -> PlcEntityInterceptor.interceptSetter(null, MiscEntity.class.getDeclaredMethod("setOkOk", String.class, String.class), callable, null, plcDriverManager, null, lastFetched, lastWritten))
+                .isInstanceOf(OPMException.class)
+                .hasMessage("Only setter with one arguments are supported");
+            assertThatThrownBy(() -> PlcEntityInterceptor.interceptSetter(null, MiscEntity.class.getDeclaredMethod("someNotSetterMethod", String.class), callable, null, plcDriverManager, null, lastFetched, lastWritten))
+                .isInstanceOf(OPMException.class)
+                .hasMessage("Unable to forward invocation someNotSetterMethod on connected PlcEntity");
+        }
+    }
+
+    private void runGetPlcResponseWIthException(Answer a) throws InterruptedException, ExecutionException, TimeoutException, OPMException {
+        PlcReadRequest request = mock(PlcReadRequest.class);
+        CompletableFuture future = mock(CompletableFuture.class);
+        when(future.get(anyLong(), any())).then(a);
+        when(request.execute()).thenReturn(future);
+
+        PlcEntityInterceptor.getPlcReadResponse(request);
+    }
+
+    @PlcEntity
+    public static class BadEntity {
+
+        public BadEntity() {
+            // For OPM
+        }
+
+        // Getter with no field
+        public String getField1() {
+            return "";
+        }
+
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityManagerComplexTest.java b/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityManagerComplexTest.java
index 1a310e1cec1..35821b3d38c 100644
--- a/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityManagerComplexTest.java
+++ b/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityManagerComplexTest.java
@@ -1,460 +1,460 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.opm;
-
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.metadata.PlcConnectionMetadata;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.connection.PlcFieldHandler;
-import org.apache.plc4x.java.base.messages.*;
-import org.apache.plc4x.java.base.messages.items.*;
-import org.assertj.core.api.WithAssertions;
-import org.junit.Assert;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentMatchers;
-import org.mockito.Mockito;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.when;
-
-
-public class PlcEntityManagerComplexTest implements WithAssertions {
-
-    private PlcDriverManager driverManager;
-
-    @Test
-    public void noEntity_throws() {
-        PlcEntityManager manager = new PlcEntityManager();
-
-        assertThatThrownBy(() -> manager.read(NoEntity.class, "s7://localhost:5555/0/0"))
-            .isInstanceOf(IllegalArgumentException.class);
-    }
-
-    @Test
-    public void noValidConstructor_throws() {
-        PlcEntityManager manager = new PlcEntityManager();
-
-        assertThatThrownBy(() -> manager.read(EntityWithBadConstructor.class, "s7://localhost:5555/0/0"))
-            .isInstanceOf(IllegalArgumentException.class);
-    }
-
-    @Test
-    public void read() throws OPMException, PlcConnectionException {
-        Map<String, BaseDefaultFieldItem> results = new HashMap<>();
-        String prefix = MyEntity.class.getName() + ".";
-        results.put(prefix + "counter", new DefaultIntegerFieldItem(1));
-        results.put(prefix + "counter2", new DefaultLongFieldItem(1l));
-        PlcEntityManager manager = getPlcEntityManager(results);
-
-        MyEntity myEntity = manager.read(MyEntity.class, "s7://localhost:5555/0/0");
-
-        assertEquals(1, (long) myEntity.getCounter());
-        assertEquals(1, myEntity.getCounter2());
-    }
-
-    @Test
-    public void readComplexObject() throws PlcConnectionException, OPMException {
-        PlcEntityManager manager = getInitializedEntityManager();
-
-        ConnectedEntity connect = manager.read(ConnectedEntity.class, "s7://localhost:5555/0/0");
-
-        Assert.assertNotNull(connect);
-
-        // Call different method
-        String s = connect.toString();
-
-        assertEquals("ConnectedEntity{boolVar=true, byteVar=1, shortVar=1, intVar=1, longVar=1, boxedBoolVar=true, boxedByteVar=1, boxedShortVar=1, boxedIntegerVar=1, boxedLongVar=1, bigIntegerVar=1, floatVar=1.0, doubleVar=1.0, bigDecimalVar=1, localTimeVar=01:01, localDateVar=0001-01-01, localDateTimeVar=0001-01-01T01:01, byteArrayVar=[0, 1], bigByteArrayVar=[0, 1], stringVar='Hallo'}", s);
-    }
-
-    @Test
-    public void connect_callComplexMethod() throws PlcConnectionException, OPMException {
-        PlcEntityManager manager = getInitializedEntityManager();
-
-        ConnectedEntity connect = manager.connect(ConnectedEntity.class, "s7://localhost:5555/0/0");
-
-        Assert.assertNotNull(connect);
-
-        // Call different method
-        String s = connect.toString();
-
-        assertEquals("ConnectedEntity{boolVar=true, byteVar=1, shortVar=1, intVar=1, longVar=1, boxedBoolVar=true, boxedByteVar=1, boxedShortVar=1, boxedIntegerVar=1, boxedLongVar=1, bigIntegerVar=1, floatVar=1.0, doubleVar=1.0, bigDecimalVar=1, localTimeVar=01:01, localDateVar=0001-01-01, localDateTimeVar=0001-01-01T01:01, byteArrayVar=[0, 1], bigByteArrayVar=[0, 1], stringVar='Hallo'}", s);
-    }
-
-    private PlcEntityManager getInitializedEntityManager() throws PlcConnectionException {
-        Map<String, BaseDefaultFieldItem> map = new HashMap<>();
-        String prefix = ConnectedEntity.class.getName() + ".";
-        map.put(prefix + "boolVar", new DefaultBooleanFieldItem(true));
-        map.put(prefix + "byteVar", new DefaultByteFieldItem((byte) 1));
-        map.put(prefix + "shortVar", new DefaultShortFieldItem((short) 1));
-        map.put(prefix + "intVar", new DefaultIntegerFieldItem(1));
-        map.put(prefix + "longVar", new DefaultLongFieldItem(1l));
-        map.put(prefix + "boxedBoolVar", new DefaultLongFieldItem(1L));
-        map.put(prefix + "boxedByteVar", new DefaultByteFieldItem((byte) 1));
-        map.put(prefix + "boxedShortVar", new DefaultShortFieldItem((short) 1));
-        map.put(prefix + "boxedIntegerVar", new DefaultIntegerFieldItem(1));
-        map.put(prefix + "boxedLongVar", new DefaultLongFieldItem(1l));
-        map.put(prefix + "bigIntegerVar", new DefaultBigIntegerFieldItem(BigInteger.ONE));
-        map.put(prefix + "floatVar", new DefaultFloatFieldItem(1f));
-        map.put(prefix + "doubleVar", new DefaultDoubleFieldItem(1d));
-        map.put(prefix + "bigDecimalVar", new DefaultBigDecimalFieldItem(BigDecimal.ONE));
-        map.put(prefix + "localTimeVar", new DefaultLocalTimeFieldItem(LocalTime.of(1, 1)));
-        map.put(prefix + "localDateVar", new DefaultLocalDateFieldItem(LocalDate.of(1, 1, 1)));
-        map.put(prefix + "localDateTimeVar", new DefaultLocalDateTimeFieldItem(LocalDateTime.of(1, 1, 1, 1, 1)));
-        map.put(prefix + "byteArrayVar", new DefaultByteArrayFieldItem(new Byte[]{0x0, 0x1}));
-        map.put(prefix + "bigByteArrayVar", new DefaultByteArrayFieldItem(new Byte[]{0x0, 0x1}));
-        map.put(prefix + "stringVar", new DefaultStringFieldItem("Hallo"));
-        return getPlcEntityManager(map);
-    }
-
-    @Test
-    public void connect_callGetter() throws PlcConnectionException, OPMException {
-        PlcEntityManager manager = getInitializedEntityManager();
-
-        ConnectedEntity connect = manager.connect(ConnectedEntity.class, "s7://localhost:5555/0/0");
-
-        Assert.assertNotNull(connect);
-
-        // Call getter
-        assertEquals(1, connect.getIntVar());
-        assertEquals("Hallo", connect.getStringVar());
-        assertEquals(true, connect.isBoolVar());
-    }
-
-    @Test
-    public void disconnect() throws PlcConnectionException, OPMException, IllegalAccessException {
-        PlcEntityManager manager = getInitializedEntityManager();
-
-        ConnectedEntity connected = manager.connect(ConnectedEntity.class, "s7://localhost:5555/0/0");
-
-        manager.disconnect(connected);
-
-        // Assert disconnected
-        Object o = FieldUtils.readDeclaredField(connected, PlcEntityManager.DRIVER_MANAGER_FIELD_NAME, true);
-        assertNull(o);
-
-        // Call a method and receive the result
-        // We are ok if a result is received and no NPE is thrown, then everything works as expected
-        assertNotNull(connected.toString());
-        assertNotNull(connected.getByteVar());
-    }
-
-    @Test
-    public void disconnectTwice_throwsException() throws PlcConnectionException, OPMException {
-        PlcEntityManager manager = getInitializedEntityManager();
-
-        ConnectedEntity connected = manager.connect(ConnectedEntity.class, "s7://localhost:5555/0/0");
-
-        manager.disconnect(connected);
-        assertThatThrownBy(() -> manager.disconnect(connected))
-            .isInstanceOf(OPMException.class);
-    }
-
-    private PlcEntityManager getPlcEntityManager(final Map<String, BaseDefaultFieldItem> responses) throws PlcConnectionException {
-        driverManager = Mockito.mock(PlcDriverManager.class);
-        PlcDriverManager mock = driverManager;
-        PlcConnection connection = Mockito.mock(PlcConnection.class);
-        when(mock.getConnection(ArgumentMatchers.anyString())).thenReturn(connection);
-        when(connection.getMetadata()).thenReturn(new PlcConnectionMetadata() {
-
-            @Override
-            public boolean canRead() {
-                return true;
-            }
-
-            @Override
-            public boolean canWrite() {
-                return true;
-            }
-
-            @Override
-            public boolean canSubscribe() {
-                return true;
-            }
-        });
-
-        PlcReader reader = readRequest -> {
-            Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> map = readRequest.getFieldNames().stream()
-                .collect(Collectors.toMap(
-                    Function.identity(),
-                    s -> Pair.of(PlcResponseCode.OK, Objects.requireNonNull(responses.get(s), s + " not found"))
-                ));
-            return CompletableFuture.completedFuture(new DefaultPlcReadResponse((InternalPlcReadRequest) readRequest, map));
-        };
-        when(connection.readRequestBuilder()).then(invocation -> new DefaultPlcReadRequest.Builder(reader, getFieldHandler()));
-        PlcWriter writer = writeRequest -> {
-            Map<String, PlcResponseCode> map = writeRequest.getFieldNames().stream()
-                .collect(Collectors.toMap(
-                    Function.identity(),
-                    s -> PlcResponseCode.OK
-                ));
-            return CompletableFuture.completedFuture(new DefaultPlcWriteResponse((InternalPlcWriteRequest) writeRequest, map));
-        };
-        when(connection.writeRequestBuilder()).then(invocation -> new DefaultPlcWriteRequest.Builder(writer, getFieldHandler()));
-
-        return new PlcEntityManager(mock);
-    }
-
-    private PlcFieldHandler getFieldHandler() {
-        return new NoOpPlcFieldHandler();
-    }
-
-    private static class NoOpPlcFieldHandler implements PlcFieldHandler {
-        @Override
-        public org.apache.plc4x.java.api.model.PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
-            return new org.apache.plc4x.java.api.model.PlcField() {
-            };
-        }
-
-        @Override
-        public BaseDefaultFieldItem encodeBoolean(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
-            return null;
-        }
-
-        @Override
-        public BaseDefaultFieldItem encodeByte(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
-            return null;
-        }
-
-        @Override
-        public BaseDefaultFieldItem encodeShort(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
-            return null;
-        }
-
-        @Override
-        public BaseDefaultFieldItem encodeInteger(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
-            return null;
-        }
-
-        @Override
-        public BaseDefaultFieldItem encodeBigInteger(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
-            return null;
-        }
-
-        @Override
-        public BaseDefaultFieldItem encodeLong(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
-            return null;
-        }
-
-        @Override
-        public BaseDefaultFieldItem encodeFloat(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
-            return null;
-        }
-
-        @Override
-        public BaseDefaultFieldItem encodeBigDecimal(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
-            return null;
-        }
-
-        @Override
-        public BaseDefaultFieldItem encodeDouble(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
-            return null;
-        }
-
-        @Override
-        public BaseDefaultFieldItem encodeString(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
-            return null;
-        }
-
-        @Override
-        public BaseDefaultFieldItem encodeTime(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
-            return null;
-        }
-
-        @Override
-        public BaseDefaultFieldItem encodeDate(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
-            return null;
-        }
-
-        @Override
-        public BaseDefaultFieldItem encodeDateTime(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
-            return null;
-        }
-
-        @Override
-        public BaseDefaultFieldItem encodeByteArray(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
-            return null;
-        }
-    }
-
-    private static class NoEntity {
-
-    }
-
-    @PlcEntity()
-    public static class EntityWithBadConstructor {
-
-        @PlcField("asdf")
-        private long field;
-
-        public EntityWithBadConstructor(long field) {
-            this.field = field;
-        }
-
-        public long getField() {
-            return field;
-        }
-    }
-
-    @PlcEntity()
-    public static class MyEntity {
-
-        @PlcField("%DB3.DBW500")
-        private Long counter;
-
-        @PlcField("%DB3.DBW504")
-        private long counter2;
-
-        public Long getCounter() {
-            return counter;
-        }
-
-        public long getCounter2() {
-            return counter2;
-        }
-
-    }
-
-    @PlcEntity()
-    public static class ConnectedEntity {
-
-        @PlcField("%DB1.DW111:BOOL")
-        private boolean boolVar;
-        @PlcField("%DB1.DW111:BYTE")
-        private byte byteVar;
-        @PlcField("%DB1.DW111:SHORT")
-        private short shortVar;
-        @PlcField("%DB1.DW111:INT")
-        private int intVar;
-        @PlcField("%DB1.DW111:LONG")
-        private long longVar;
-        @PlcField("%DB1.DW111:BOOL")
-        private Boolean boxedBoolVar;
-        @PlcField("%DB1.DW111:BYTE")
-        private Byte boxedByteVar;
-        @PlcField("%DB1.DW111:SHORT")
-        private Short boxedShortVar;
-        @PlcField("%DB1.DW111:SHORT")
-        private Integer boxedIntegerVar;
-        @PlcField("%DB1.DW111:LONG")
-        private Long boxedLongVar;
-        @PlcField("%DB1.DW111:BIGINT")
-        private BigInteger bigIntegerVar;
-        @PlcField("%DB1.DW111:FLOAT")
-        private Float floatVar;
-        @PlcField("%DB1.DW111:DOUBLE")
-        private Double doubleVar;
-        @PlcField("%DB1.DW111:BIGDECIMAL")
-        private BigDecimal bigDecimalVar;
-        @PlcField("%DB1.DW111:LOCALTIME")
-        private LocalTime localTimeVar;
-        @PlcField("%DB1.DW111:LOCALDATE")
-        private LocalDate localDateVar;
-        @PlcField("%DB1.DW111:LOCALDATETIME")
-        private LocalDateTime localDateTimeVar;
-        @PlcField("%DB1.DW111:BYTEARRAY")
-        private byte[] byteArrayVar;
-        @PlcField("%DB1.DW111:BYTEARRAY")
-        private Byte[] bigByteArrayVar;
-
-        @PlcField("%DB1.DW111:STRING")
-        private String stringVar;
-
-        public ConnectedEntity() {
-            // Default
-        }
-
-        public boolean isBoolVar() {
-            return boolVar;
-        }
-
-        public byte getByteVar() {
-            return byteVar;
-        }
-
-
-        public short getShortVar() {
-            return shortVar;
-        }
-
-
-        public int getIntVar() {
-            return intVar;
-        }
-
-
-        public long getLongVar() {
-            return longVar;
-        }
-
-
-        public String getStringVar() {
-            return stringVar;
-        }
-
-        public void someMethod() {
-            System.out.println("I do nothing");
-        }
-
-        @Override
-        public String toString() {
-            return "ConnectedEntity{" +
-                "boolVar=" + boolVar +
-                ", byteVar=" + byteVar +
-                ", shortVar=" + shortVar +
-                ", intVar=" + intVar +
-                ", longVar=" + longVar +
-                ", boxedBoolVar=" + boxedBoolVar +
-                ", boxedByteVar=" + boxedByteVar +
-                ", boxedShortVar=" + boxedShortVar +
-                ", boxedIntegerVar=" + boxedIntegerVar +
-                ", boxedLongVar=" + boxedLongVar +
-                ", bigIntegerVar=" + bigIntegerVar +
-                ", floatVar=" + floatVar +
-                ", doubleVar=" + doubleVar +
-                ", bigDecimalVar=" + bigDecimalVar +
-                ", localTimeVar=" + localTimeVar +
-                ", localDateVar=" + localDateVar +
-                ", localDateTimeVar=" + localDateTimeVar +
-                ", byteArrayVar=" + Arrays.toString(byteArrayVar) +
-                ", bigByteArrayVar=" + Arrays.toString(bigByteArrayVar) +
-                ", stringVar='" + stringVar + '\'' +
-                '}';
-        }
-    }
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.opm;
+
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.metadata.PlcConnectionMetadata;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.connection.PlcFieldHandler;
+import org.apache.plc4x.java.base.messages.*;
+import org.apache.plc4x.java.base.messages.items.*;
+import org.assertj.core.api.WithAssertions;
+import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mockito;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.when;
+
+
+public class PlcEntityManagerComplexTest implements WithAssertions {
+
+    private PlcDriverManager driverManager;
+
+    @Test
+    public void noEntity_throws() {
+        PlcEntityManager manager = new PlcEntityManager();
+
+        assertThatThrownBy(() -> manager.read(NoEntity.class, "s7://localhost:5555/0/0"))
+            .isInstanceOf(IllegalArgumentException.class);
+    }
+
+    @Test
+    public void noValidConstructor_throws() {
+        PlcEntityManager manager = new PlcEntityManager();
+
+        assertThatThrownBy(() -> manager.read(EntityWithBadConstructor.class, "s7://localhost:5555/0/0"))
+            .isInstanceOf(IllegalArgumentException.class);
+    }
+
+    @Test
+    public void read() throws OPMException, PlcConnectionException {
+        Map<String, BaseDefaultFieldItem> results = new HashMap<>();
+        String prefix = MyEntity.class.getName() + ".";
+        results.put(prefix + "counter", new DefaultIntegerFieldItem(1));
+        results.put(prefix + "counter2", new DefaultLongFieldItem(1l));
+        PlcEntityManager manager = getPlcEntityManager(results);
+
+        MyEntity myEntity = manager.read(MyEntity.class, "s7://localhost:5555/0/0");
+
+        assertEquals(1, (long) myEntity.getCounter());
+        assertEquals(1, myEntity.getCounter2());
+    }
+
+    @Test
+    public void readComplexObject() throws PlcConnectionException, OPMException {
+        PlcEntityManager manager = getInitializedEntityManager();
+
+        ConnectedEntity connect = manager.read(ConnectedEntity.class, "s7://localhost:5555/0/0");
+
+        Assert.assertNotNull(connect);
+
+        // Call different method
+        String s = connect.toString();
+
+        assertEquals("ConnectedEntity{boolVar=true, byteVar=1, shortVar=1, intVar=1, longVar=1, boxedBoolVar=true, boxedByteVar=1, boxedShortVar=1, boxedIntegerVar=1, boxedLongVar=1, bigIntegerVar=1, floatVar=1.0, doubleVar=1.0, bigDecimalVar=1, localTimeVar=01:01, localDateVar=0001-01-01, localDateTimeVar=0001-01-01T01:01, byteArrayVar=[0, 1], bigByteArrayVar=[0, 1], stringVar='Hallo'}", s);
+    }
+
+    @Test
+    public void connect_callComplexMethod() throws PlcConnectionException, OPMException {
+        PlcEntityManager manager = getInitializedEntityManager();
+
+        ConnectedEntity connect = manager.connect(ConnectedEntity.class, "s7://localhost:5555/0/0");
+
+        Assert.assertNotNull(connect);
+
+        // Call different method
+        String s = connect.toString();
+
+        assertEquals("ConnectedEntity{boolVar=true, byteVar=1, shortVar=1, intVar=1, longVar=1, boxedBoolVar=true, boxedByteVar=1, boxedShortVar=1, boxedIntegerVar=1, boxedLongVar=1, bigIntegerVar=1, floatVar=1.0, doubleVar=1.0, bigDecimalVar=1, localTimeVar=01:01, localDateVar=0001-01-01, localDateTimeVar=0001-01-01T01:01, byteArrayVar=[0, 1], bigByteArrayVar=[0, 1], stringVar='Hallo'}", s);
+    }
+
+    private PlcEntityManager getInitializedEntityManager() throws PlcConnectionException {
+        Map<String, BaseDefaultFieldItem> map = new HashMap<>();
+        String prefix = ConnectedEntity.class.getName() + ".";
+        map.put(prefix + "boolVar", new DefaultBooleanFieldItem(true));
+        map.put(prefix + "byteVar", new DefaultByteFieldItem((byte) 1));
+        map.put(prefix + "shortVar", new DefaultShortFieldItem((short) 1));
+        map.put(prefix + "intVar", new DefaultIntegerFieldItem(1));
+        map.put(prefix + "longVar", new DefaultLongFieldItem(1l));
+        map.put(prefix + "boxedBoolVar", new DefaultLongFieldItem(1L));
+        map.put(prefix + "boxedByteVar", new DefaultByteFieldItem((byte) 1));
+        map.put(prefix + "boxedShortVar", new DefaultShortFieldItem((short) 1));
+        map.put(prefix + "boxedIntegerVar", new DefaultIntegerFieldItem(1));
+        map.put(prefix + "boxedLongVar", new DefaultLongFieldItem(1l));
+        map.put(prefix + "bigIntegerVar", new DefaultBigIntegerFieldItem(BigInteger.ONE));
+        map.put(prefix + "floatVar", new DefaultFloatFieldItem(1f));
+        map.put(prefix + "doubleVar", new DefaultDoubleFieldItem(1d));
+        map.put(prefix + "bigDecimalVar", new DefaultBigDecimalFieldItem(BigDecimal.ONE));
+        map.put(prefix + "localTimeVar", new DefaultLocalTimeFieldItem(LocalTime.of(1, 1)));
+        map.put(prefix + "localDateVar", new DefaultLocalDateFieldItem(LocalDate.of(1, 1, 1)));
+        map.put(prefix + "localDateTimeVar", new DefaultLocalDateTimeFieldItem(LocalDateTime.of(1, 1, 1, 1, 1)));
+        map.put(prefix + "byteArrayVar", new DefaultByteArrayFieldItem(new Byte[]{0x0, 0x1}));
+        map.put(prefix + "bigByteArrayVar", new DefaultByteArrayFieldItem(new Byte[]{0x0, 0x1}));
+        map.put(prefix + "stringVar", new DefaultStringFieldItem("Hallo"));
+        return getPlcEntityManager(map);
+    }
+
+    @Test
+    public void connect_callGetter() throws PlcConnectionException, OPMException {
+        PlcEntityManager manager = getInitializedEntityManager();
+
+        ConnectedEntity connect = manager.connect(ConnectedEntity.class, "s7://localhost:5555/0/0");
+
+        Assert.assertNotNull(connect);
+
+        // Call getter
+        assertEquals(1, connect.getIntVar());
+        assertEquals("Hallo", connect.getStringVar());
+        assertEquals(true, connect.isBoolVar());
+    }
+
+    @Test
+    public void disconnect() throws PlcConnectionException, OPMException, IllegalAccessException {
+        PlcEntityManager manager = getInitializedEntityManager();
+
+        ConnectedEntity connected = manager.connect(ConnectedEntity.class, "s7://localhost:5555/0/0");
+
+        manager.disconnect(connected);
+
+        // Assert disconnected
+        Object o = FieldUtils.readDeclaredField(connected, PlcEntityManager.DRIVER_MANAGER_FIELD_NAME, true);
+        assertNull(o);
+
+        // Call a method and receive the result
+        // We are ok if a result is received and no NPE is thrown, then everything works as expected
+        assertNotNull(connected.toString());
+        assertNotNull(connected.getByteVar());
+    }
+
+    @Test
+    public void disconnectTwice_throwsException() throws PlcConnectionException, OPMException {
+        PlcEntityManager manager = getInitializedEntityManager();
+
+        ConnectedEntity connected = manager.connect(ConnectedEntity.class, "s7://localhost:5555/0/0");
+
+        manager.disconnect(connected);
+        assertThatThrownBy(() -> manager.disconnect(connected))
+            .isInstanceOf(OPMException.class);
+    }
+
+    private PlcEntityManager getPlcEntityManager(final Map<String, BaseDefaultFieldItem> responses) throws PlcConnectionException {
+        driverManager = Mockito.mock(PlcDriverManager.class);
+        PlcDriverManager mock = driverManager;
+        PlcConnection connection = Mockito.mock(PlcConnection.class);
+        when(mock.getConnection(ArgumentMatchers.anyString())).thenReturn(connection);
+        when(connection.getMetadata()).thenReturn(new PlcConnectionMetadata() {
+
+            @Override
+            public boolean canRead() {
+                return true;
+            }
+
+            @Override
+            public boolean canWrite() {
+                return true;
+            }
+
+            @Override
+            public boolean canSubscribe() {
+                return true;
+            }
+        });
+
+        PlcReader reader = readRequest -> {
+            Map<String, Pair<PlcResponseCode, BaseDefaultFieldItem>> map = readRequest.getFieldNames().stream()
+                .collect(Collectors.toMap(
+                    Function.identity(),
+                    s -> Pair.of(PlcResponseCode.OK, Objects.requireNonNull(responses.get(s), s + " not found"))
+                ));
+            return CompletableFuture.completedFuture(new DefaultPlcReadResponse((InternalPlcReadRequest) readRequest, map));
+        };
+        when(connection.readRequestBuilder()).then(invocation -> new DefaultPlcReadRequest.Builder(reader, getFieldHandler()));
+        PlcWriter writer = writeRequest -> {
+            Map<String, PlcResponseCode> map = writeRequest.getFieldNames().stream()
+                .collect(Collectors.toMap(
+                    Function.identity(),
+                    s -> PlcResponseCode.OK
+                ));
+            return CompletableFuture.completedFuture(new DefaultPlcWriteResponse((InternalPlcWriteRequest) writeRequest, map));
+        };
+        when(connection.writeRequestBuilder()).then(invocation -> new DefaultPlcWriteRequest.Builder(writer, getFieldHandler()));
+
+        return new PlcEntityManager(mock);
+    }
+
+    private PlcFieldHandler getFieldHandler() {
+        return new NoOpPlcFieldHandler();
+    }
+
+    private static class NoOpPlcFieldHandler implements PlcFieldHandler {
+        @Override
+        public org.apache.plc4x.java.api.model.PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
+            return new org.apache.plc4x.java.api.model.PlcField() {
+            };
+        }
+
+        @Override
+        public BaseDefaultFieldItem encodeBoolean(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
+            return null;
+        }
+
+        @Override
+        public BaseDefaultFieldItem encodeByte(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
+            return null;
+        }
+
+        @Override
+        public BaseDefaultFieldItem encodeShort(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
+            return null;
+        }
+
+        @Override
+        public BaseDefaultFieldItem encodeInteger(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
+            return null;
+        }
+
+        @Override
+        public BaseDefaultFieldItem encodeBigInteger(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
+            return null;
+        }
+
+        @Override
+        public BaseDefaultFieldItem encodeLong(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
+            return null;
+        }
+
+        @Override
+        public BaseDefaultFieldItem encodeFloat(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
+            return null;
+        }
+
+        @Override
+        public BaseDefaultFieldItem encodeBigDecimal(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
+            return null;
+        }
+
+        @Override
+        public BaseDefaultFieldItem encodeDouble(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
+            return null;
+        }
+
+        @Override
+        public BaseDefaultFieldItem encodeString(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
+            return null;
+        }
+
+        @Override
+        public BaseDefaultFieldItem encodeTime(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
+            return null;
+        }
+
+        @Override
+        public BaseDefaultFieldItem encodeDate(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
+            return null;
+        }
+
+        @Override
+        public BaseDefaultFieldItem encodeDateTime(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
+            return null;
+        }
+
+        @Override
+        public BaseDefaultFieldItem encodeByteArray(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
+            return null;
+        }
+    }
+
+    private static class NoEntity {
+
+    }
+
+    @PlcEntity()
+    public static class EntityWithBadConstructor {
+
+        @PlcField("asdf")
+        private long field;
+
+        public EntityWithBadConstructor(long field) {
+            this.field = field;
+        }
+
+        public long getField() {
+            return field;
+        }
+    }
+
+    @PlcEntity()
+    public static class MyEntity {
+
+        @PlcField("%DB3.DBW500")
+        private Long counter;
+
+        @PlcField("%DB3.DBW504")
+        private long counter2;
+
+        public Long getCounter() {
+            return counter;
+        }
+
+        public long getCounter2() {
+            return counter2;
+        }
+
+    }
+
+    @PlcEntity()
+    public static class ConnectedEntity {
+
+        @PlcField("%DB1.DW111:BOOL")
+        private boolean boolVar;
+        @PlcField("%DB1.DW111:BYTE")
+        private byte byteVar;
+        @PlcField("%DB1.DW111:SHORT")
+        private short shortVar;
+        @PlcField("%DB1.DW111:INT")
+        private int intVar;
+        @PlcField("%DB1.DW111:LONG")
+        private long longVar;
+        @PlcField("%DB1.DW111:BOOL")
+        private Boolean boxedBoolVar;
+        @PlcField("%DB1.DW111:BYTE")
+        private Byte boxedByteVar;
+        @PlcField("%DB1.DW111:SHORT")
+        private Short boxedShortVar;
+        @PlcField("%DB1.DW111:SHORT")
+        private Integer boxedIntegerVar;
+        @PlcField("%DB1.DW111:LONG")
+        private Long boxedLongVar;
+        @PlcField("%DB1.DW111:BIGINT")
+        private BigInteger bigIntegerVar;
+        @PlcField("%DB1.DW111:FLOAT")
+        private Float floatVar;
+        @PlcField("%DB1.DW111:DOUBLE")
+        private Double doubleVar;
+        @PlcField("%DB1.DW111:BIGDECIMAL")
+        private BigDecimal bigDecimalVar;
+        @PlcField("%DB1.DW111:LOCALTIME")
+        private LocalTime localTimeVar;
+        @PlcField("%DB1.DW111:LOCALDATE")
+        private LocalDate localDateVar;
+        @PlcField("%DB1.DW111:LOCALDATETIME")
+        private LocalDateTime localDateTimeVar;
+        @PlcField("%DB1.DW111:BYTEARRAY")
+        private byte[] byteArrayVar;
+        @PlcField("%DB1.DW111:BYTEARRAY")
+        private Byte[] bigByteArrayVar;
+
+        @PlcField("%DB1.DW111:STRING")
+        private String stringVar;
+
+        public ConnectedEntity() {
+            // Default
+        }
+
+        public boolean isBoolVar() {
+            return boolVar;
+        }
+
+        public byte getByteVar() {
+            return byteVar;
+        }
+
+
+        public short getShortVar() {
+            return shortVar;
+        }
+
+
+        public int getIntVar() {
+            return intVar;
+        }
+
+
+        public long getLongVar() {
+            return longVar;
+        }
+
+
+        public String getStringVar() {
+            return stringVar;
+        }
+
+        public void someMethod() {
+            System.out.println("I do nothing");
+        }
+
+        @Override
+        public String toString() {
+            return "ConnectedEntity{" +
+                "boolVar=" + boolVar +
+                ", byteVar=" + byteVar +
+                ", shortVar=" + shortVar +
+                ", intVar=" + intVar +
+                ", longVar=" + longVar +
+                ", boxedBoolVar=" + boxedBoolVar +
+                ", boxedByteVar=" + boxedByteVar +
+                ", boxedShortVar=" + boxedShortVar +
+                ", boxedIntegerVar=" + boxedIntegerVar +
+                ", boxedLongVar=" + boxedLongVar +
+                ", bigIntegerVar=" + bigIntegerVar +
+                ", floatVar=" + floatVar +
+                ", doubleVar=" + doubleVar +
+                ", bigDecimalVar=" + bigDecimalVar +
+                ", localTimeVar=" + localTimeVar +
+                ", localDateVar=" + localDateVar +
+                ", localDateTimeVar=" + localDateTimeVar +
+                ", byteArrayVar=" + Arrays.toString(byteArrayVar) +
+                ", bigByteArrayVar=" + Arrays.toString(bigByteArrayVar) +
+                ", stringVar='" + stringVar + '\'' +
+                '}';
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityManagerTest.java b/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityManagerTest.java
index 95f672f809d..e29b00bf579 100644
--- a/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityManagerTest.java
+++ b/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityManagerTest.java
@@ -1,318 +1,318 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.opm;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.messages.items.DefaultStringFieldItem;
-import org.apache.plc4x.java.mock.MockDevice;
-import org.apache.plc4x.java.mock.PlcMockConnection;
-import org.assertj.core.api.WithAssertions;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.*;
-
-@ExtendWith(MockitoExtension.class)
-public class PlcEntityManagerTest implements WithAssertions {
-
-    @Nested
-    class Read {
-
-        @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-        PlcDriverManager driverManager;
-
-        @Test
-        public void throwsInvalidFieldException_rethrows() throws PlcConnectionException {
-            // Prepare the Mock
-            when(driverManager.getConnection(any()).readRequestBuilder().build())
-                .thenThrow(new PlcInvalidFieldException("field1"));
-
-            // Create Entity Manager
-            PlcEntityManager entityManager = new PlcEntityManager(driverManager);
-
-            // Issue Call to trigger interception
-            assertThatThrownBy(() -> entityManager.read(BadEntity.class, "mock:test"))
-                .hasCauseInstanceOf(PlcInvalidFieldException.class)
-                .hasStackTraceContaining("field1 invalid");
-        }
-
-        @Test
-        public void unableToConnect_rethrows() throws PlcConnectionException {
-            // Prepare the Mock
-            when(driverManager.getConnection(any()))
-                .thenThrow(new PlcConnectionException(""));
-
-            // Create Entity Manager
-            PlcEntityManager entityManager = new PlcEntityManager(driverManager);
-
-            // Issue Call to trigger interception
-            assertThatThrownBy(() -> entityManager.read(BadEntity.class, "mock:test"))
-                .hasCauseInstanceOf(PlcConnectionException.class)
-                .hasStackTraceContaining("Problem during processing");
-        }
-
-        @Test
-        public void timeoutOnGet_throwsException() throws PlcConnectionException {
-            // Prepare the Mock
-            MockDevice mockDevice = Mockito.mock(MockDevice.class);
-            PlcDriverManager driverManager = new PlcDriverManager();
-            PlcMockConnection connection = (PlcMockConnection) driverManager.getConnection("mock:test");
-            when(mockDevice.read(any())).thenAnswer(invocation -> {
-                // Sleep for 3s
-                Thread.sleep(3_000);
-                return Pair.of(PlcResponseCode.OK, new DefaultStringFieldItem("Hallo"));
-            });
-            connection.setDevice(mockDevice);
-
-            // Create Entity Manager
-            PlcEntityManager entityManager = new PlcEntityManager(driverManager);
-
-            // Issue Call which SHOULD timeout
-            assertThatThrownBy(() -> entityManager.read(BadEntity.class, "mock:test"))
-                .isInstanceOf(OPMException.class);
-        }
-
-        @Test
-        public void uninstantiableEntity_throws() {
-            PlcEntityManager entityManager = new PlcEntityManager();
-
-            assertThatThrownBy(() -> entityManager.read(UninstantiableEntity.class, "mock:test"))
-                .isInstanceOf(OPMException.class);
-        }
-
-        @Test
-        public void resolveAlias_works() throws OPMException, PlcConnectionException {
-            SimpleAliasRegistry registry = new SimpleAliasRegistry();
-            registry.register("alias", "real_field");
-
-            // Mock
-            PlcDriverManager driverManager = new PlcDriverManager();
-            PlcMockConnection connection = (PlcMockConnection) driverManager.getConnection("mock:test");
-            MockDevice mockDevice = Mockito.mock(MockDevice.class);
-            when(mockDevice.read(any())).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultStringFieldItem("value")));
-            connection.setDevice(mockDevice);
-
-            PlcEntityManager entityManager = new PlcEntityManager(driverManager, registry);
-            entityManager.read(AliasEntity.class, "mock:test");
-
-            // Assert that "field" was queried
-            verify(mockDevice).read(eq("real_field"));
-        }
-
-
-        @Test
-        public void unknownAlias_throws() {
-            PlcEntityManager entityManager = new PlcEntityManager();
-
-            assertThatThrownBy(() -> entityManager.read(AliasEntity.class, "mock:test"))
-                .isInstanceOf(IllegalArgumentException.class);
-        }
-
-        @Test
-        public void badAlias_throws() {
-            PlcEntityManager entityManager = new PlcEntityManager();
-
-            String message = null;
-            try {
-                entityManager.read(BadAliasEntity.class, "mock:test");
-            } catch (IllegalArgumentException e) {
-                message = e.getMessage();
-            } catch (OPMException e) {
-                fail("Unexpected Exception" + e);
-            }
-
-            assertNotNull(message);
-            assertTrue(message.contains("Invalid Syntax, either use field address (no starting $) or an alias with Syntax ${xxx}. But given was"));
-        }
-    }
-
-    @Nested
-    class Write {
-
-        @Test
-        void simpleWrite() throws Exception {
-            SimpleAliasRegistry registry = new SimpleAliasRegistry();
-            registry.register("alias", "real_field");
-
-            // Mock
-            PlcDriverManager driverManager = new PlcDriverManager();
-            PlcMockConnection connection = (PlcMockConnection) driverManager.getConnection("mock:test");
-            MockDevice mockDevice = Mockito.mock(MockDevice.class);
-            when(mockDevice.write(anyString(), any())).thenReturn(PlcResponseCode.OK);
-            when(mockDevice.read(any())).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultStringFieldItem("value")));
-            connection.setDevice(mockDevice);
-
-            PlcEntityManager entityManager = new PlcEntityManager(driverManager, registry);
-            AliasEntity object = new AliasEntity();
-            object.setAliasedField("changed");
-            AliasEntity connected = entityManager.write(AliasEntity.class, "mock:test", object);
-            connected.setAliasedField("changed2");
-            connected.getAliasedField();
-            verify(mockDevice, times(0)).read(eq("real_field"));
-            verify(mockDevice, times(1)).write(eq("real_field"), any());
-            AliasEntity merge = entityManager.merge(AliasEntity.class, "mock:test", connected);
-            merge.setAliasedField("changed2");
-            merge.getAliasedField();
-
-            // Assert that "field" was queried
-            verify(mockDevice, times(1)).read(eq("real_field"));
-            verify(mockDevice, times(3)).write(eq("real_field"), any());
-
-            entityManager.disconnect(merge);
-            assertThat(merge.getAliasedField()).isEqualTo("value");
-        }
-
-        @Test
-        void simpleWrite_uses_getter() throws Exception {
-            // Mock
-            PlcDriverManager driverManager = new PlcDriverManager();
-            PlcMockConnection connection = (PlcMockConnection) driverManager.getConnection("mock:test");
-            MockDevice mockDevice = Mockito.mock(MockDevice.class);
-            when(mockDevice.read(any())).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultStringFieldItem("value")));
-            connection.setDevice(mockDevice);
-
-            PlcEntityManager entityManager = new PlcEntityManager(driverManager);
-            CustomGetterEntity connect = entityManager.connect(CustomGetterEntity.class, "mock:test");
-            assertThat(connect.getAsd()).isEqualTo("value!");
-        }
-    }
-
-    @Nested
-    class Lifecycle {
-        /**
-         * Class is private, so EntityManager has no access to it
-         *
-         * @throws OPMException
-         */
-        @Test
-        public void connect_uninstantiableEntity_throws() {
-            PlcEntityManager entityManager = new PlcEntityManager();
-
-            assertThatThrownBy(() -> entityManager.connect(UninstantiableEntity.class, "mock:test"))
-                .isInstanceOf(OPMException.class);
-        }
-
-        @Test
-        public void connect_resolveAlias_works() throws PlcConnectionException, OPMException {
-            SimpleAliasRegistry registry = new SimpleAliasRegistry();
-            registry.register("alias", "real_field");
-
-            // Mock
-            PlcDriverManager driverManager = new PlcDriverManager();
-            PlcMockConnection connection = (PlcMockConnection) driverManager.getConnection("mock:test");
-            MockDevice mockDevice = Mockito.mock(MockDevice.class);
-            when(mockDevice.read(any())).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultStringFieldItem("value")));
-            connection.setDevice(mockDevice);
-
-            PlcEntityManager entityManager = new PlcEntityManager(driverManager, registry);
-            entityManager.connect(AliasEntity.class, "mock:test");
-
-            // Assert that "field" was queried
-            verify(mockDevice, times(1)).read(eq("real_field"));
-        }
-    }
-
-    @PlcEntity
-    private static class UninstantiableEntity {
-
-        public UninstantiableEntity() throws InstantiationException {
-            throw new InstantiationException("Do not instantiate");
-        }
-
-    }
-
-    @PlcEntity
-    public static class BadEntity {
-
-        @PlcField("field1")
-        private String field1;
-
-        public BadEntity() {
-            // for OPM
-        }
-
-        public String getField1() {
-            return field1;
-        }
-    }
-
-    @PlcEntity
-    public static class AliasEntity {
-
-        @PlcField("${alias}")
-        private String aliasedField;
-
-        public AliasEntity() {
-            // for OPM
-        }
-
-        public String getAliasedField() {
-            return aliasedField;
-        }
-
-        public void setAliasedField(String aliasedField) {
-            this.aliasedField = aliasedField;
-        }
-    }
-
-    @PlcEntity
-    public static class BadAliasEntity {
-
-        @PlcField("${alias")
-        private String aliasedField;
-
-        public BadAliasEntity() {
-            // for OPM
-        }
-
-        public String getAliasedField() {
-            return aliasedField;
-        }
-    }
-
-    @PlcEntity
-    public static class CustomGetterEntity {
-
-        @PlcField("asd")
-        private String asd;
-
-        public CustomGetterEntity() {
-            // for OPM
-        }
-
-        public String getAsd() {
-            return asd + "!";
-        }
-    }
-
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.opm;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.messages.items.DefaultStringFieldItem;
+import org.apache.plc4x.java.mock.MockDevice;
+import org.apache.plc4x.java.mock.PlcMockConnection;
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+public class PlcEntityManagerTest implements WithAssertions {
+
+    @Nested
+    class Read {
+
+        @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+        PlcDriverManager driverManager;
+
+        @Test
+        public void throwsInvalidFieldException_rethrows() throws PlcConnectionException {
+            // Prepare the Mock
+            when(driverManager.getConnection(any()).readRequestBuilder().build())
+                .thenThrow(new PlcInvalidFieldException("field1"));
+
+            // Create Entity Manager
+            PlcEntityManager entityManager = new PlcEntityManager(driverManager);
+
+            // Issue Call to trigger interception
+            assertThatThrownBy(() -> entityManager.read(BadEntity.class, "mock:test"))
+                .hasCauseInstanceOf(PlcInvalidFieldException.class)
+                .hasStackTraceContaining("field1 invalid");
+        }
+
+        @Test
+        public void unableToConnect_rethrows() throws PlcConnectionException {
+            // Prepare the Mock
+            when(driverManager.getConnection(any()))
+                .thenThrow(new PlcConnectionException(""));
+
+            // Create Entity Manager
+            PlcEntityManager entityManager = new PlcEntityManager(driverManager);
+
+            // Issue Call to trigger interception
+            assertThatThrownBy(() -> entityManager.read(BadEntity.class, "mock:test"))
+                .hasCauseInstanceOf(PlcConnectionException.class)
+                .hasStackTraceContaining("Problem during processing");
+        }
+
+        @Test
+        public void timeoutOnGet_throwsException() throws PlcConnectionException {
+            // Prepare the Mock
+            MockDevice mockDevice = Mockito.mock(MockDevice.class);
+            PlcDriverManager driverManager = new PlcDriverManager();
+            PlcMockConnection connection = (PlcMockConnection) driverManager.getConnection("mock:test");
+            when(mockDevice.read(any())).thenAnswer(invocation -> {
+                // Sleep for 3s
+                Thread.sleep(3_000);
+                return Pair.of(PlcResponseCode.OK, new DefaultStringFieldItem("Hallo"));
+            });
+            connection.setDevice(mockDevice);
+
+            // Create Entity Manager
+            PlcEntityManager entityManager = new PlcEntityManager(driverManager);
+
+            // Issue Call which SHOULD timeout
+            assertThatThrownBy(() -> entityManager.read(BadEntity.class, "mock:test"))
+                .isInstanceOf(OPMException.class);
+        }
+
+        @Test
+        public void uninstantiableEntity_throws() {
+            PlcEntityManager entityManager = new PlcEntityManager();
+
+            assertThatThrownBy(() -> entityManager.read(UninstantiableEntity.class, "mock:test"))
+                .isInstanceOf(OPMException.class);
+        }
+
+        @Test
+        public void resolveAlias_works() throws OPMException, PlcConnectionException {
+            SimpleAliasRegistry registry = new SimpleAliasRegistry();
+            registry.register("alias", "real_field");
+
+            // Mock
+            PlcDriverManager driverManager = new PlcDriverManager();
+            PlcMockConnection connection = (PlcMockConnection) driverManager.getConnection("mock:test");
+            MockDevice mockDevice = Mockito.mock(MockDevice.class);
+            when(mockDevice.read(any())).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultStringFieldItem("value")));
+            connection.setDevice(mockDevice);
+
+            PlcEntityManager entityManager = new PlcEntityManager(driverManager, registry);
+            entityManager.read(AliasEntity.class, "mock:test");
+
+            // Assert that "field" was queried
+            verify(mockDevice).read(eq("real_field"));
+        }
+
+
+        @Test
+        public void unknownAlias_throws() {
+            PlcEntityManager entityManager = new PlcEntityManager();
+
+            assertThatThrownBy(() -> entityManager.read(AliasEntity.class, "mock:test"))
+                .isInstanceOf(IllegalArgumentException.class);
+        }
+
+        @Test
+        public void badAlias_throws() {
+            PlcEntityManager entityManager = new PlcEntityManager();
+
+            String message = null;
+            try {
+                entityManager.read(BadAliasEntity.class, "mock:test");
+            } catch (IllegalArgumentException e) {
+                message = e.getMessage();
+            } catch (OPMException e) {
+                fail("Unexpected Exception" + e);
+            }
+
+            assertNotNull(message);
+            assertTrue(message.contains("Invalid Syntax, either use field address (no starting $) or an alias with Syntax ${xxx}. But given was"));
+        }
+    }
+
+    @Nested
+    class Write {
+
+        @Test
+        void simpleWrite() throws Exception {
+            SimpleAliasRegistry registry = new SimpleAliasRegistry();
+            registry.register("alias", "real_field");
+
+            // Mock
+            PlcDriverManager driverManager = new PlcDriverManager();
+            PlcMockConnection connection = (PlcMockConnection) driverManager.getConnection("mock:test");
+            MockDevice mockDevice = Mockito.mock(MockDevice.class);
+            when(mockDevice.write(anyString(), any())).thenReturn(PlcResponseCode.OK);
+            when(mockDevice.read(any())).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultStringFieldItem("value")));
+            connection.setDevice(mockDevice);
+
+            PlcEntityManager entityManager = new PlcEntityManager(driverManager, registry);
+            AliasEntity object = new AliasEntity();
+            object.setAliasedField("changed");
+            AliasEntity connected = entityManager.write(AliasEntity.class, "mock:test", object);
+            connected.setAliasedField("changed2");
+            connected.getAliasedField();
+            verify(mockDevice, times(0)).read(eq("real_field"));
+            verify(mockDevice, times(1)).write(eq("real_field"), any());
+            AliasEntity merge = entityManager.merge(AliasEntity.class, "mock:test", connected);
+            merge.setAliasedField("changed2");
+            merge.getAliasedField();
+
+            // Assert that "field" was queried
+            verify(mockDevice, times(1)).read(eq("real_field"));
+            verify(mockDevice, times(3)).write(eq("real_field"), any());
+
+            entityManager.disconnect(merge);
+            assertThat(merge.getAliasedField()).isEqualTo("value");
+        }
+
+        @Test
+        void simpleWrite_uses_getter() throws Exception {
+            // Mock
+            PlcDriverManager driverManager = new PlcDriverManager();
+            PlcMockConnection connection = (PlcMockConnection) driverManager.getConnection("mock:test");
+            MockDevice mockDevice = Mockito.mock(MockDevice.class);
+            when(mockDevice.read(any())).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultStringFieldItem("value")));
+            connection.setDevice(mockDevice);
+
+            PlcEntityManager entityManager = new PlcEntityManager(driverManager);
+            CustomGetterEntity connect = entityManager.connect(CustomGetterEntity.class, "mock:test");
+            assertThat(connect.getAsd()).isEqualTo("value!");
+        }
+    }
+
+    @Nested
+    class Lifecycle {
+        /**
+         * Class is private, so EntityManager has no access to it
+         *
+         * @throws OPMException
+         */
+        @Test
+        public void connect_uninstantiableEntity_throws() {
+            PlcEntityManager entityManager = new PlcEntityManager();
+
+            assertThatThrownBy(() -> entityManager.connect(UninstantiableEntity.class, "mock:test"))
+                .isInstanceOf(OPMException.class);
+        }
+
+        @Test
+        public void connect_resolveAlias_works() throws PlcConnectionException, OPMException {
+            SimpleAliasRegistry registry = new SimpleAliasRegistry();
+            registry.register("alias", "real_field");
+
+            // Mock
+            PlcDriverManager driverManager = new PlcDriverManager();
+            PlcMockConnection connection = (PlcMockConnection) driverManager.getConnection("mock:test");
+            MockDevice mockDevice = Mockito.mock(MockDevice.class);
+            when(mockDevice.read(any())).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultStringFieldItem("value")));
+            connection.setDevice(mockDevice);
+
+            PlcEntityManager entityManager = new PlcEntityManager(driverManager, registry);
+            entityManager.connect(AliasEntity.class, "mock:test");
+
+            // Assert that "field" was queried
+            verify(mockDevice, times(1)).read(eq("real_field"));
+        }
+    }
+
+    @PlcEntity
+    private static class UninstantiableEntity {
+
+        public UninstantiableEntity() throws InstantiationException {
+            throw new InstantiationException("Do not instantiate");
+        }
+
+    }
+
+    @PlcEntity
+    public static class BadEntity {
+
+        @PlcField("field1")
+        private String field1;
+
+        public BadEntity() {
+            // for OPM
+        }
+
+        public String getField1() {
+            return field1;
+        }
+    }
+
+    @PlcEntity
+    public static class AliasEntity {
+
+        @PlcField("${alias}")
+        private String aliasedField;
+
+        public AliasEntity() {
+            // for OPM
+        }
+
+        public String getAliasedField() {
+            return aliasedField;
+        }
+
+        public void setAliasedField(String aliasedField) {
+            this.aliasedField = aliasedField;
+        }
+    }
+
+    @PlcEntity
+    public static class BadAliasEntity {
+
+        @PlcField("${alias")
+        private String aliasedField;
+
+        public BadAliasEntity() {
+            // for OPM
+        }
+
+        public String getAliasedField() {
+            return aliasedField;
+        }
+    }
+
+    @PlcEntity
+    public static class CustomGetterEntity {
+
+        @PlcField("asd")
+        private String asd;
+
+        public CustomGetterEntity() {
+            // for OPM
+        }
+
+        public String getAsd() {
+            return asd + "!";
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/SimpleAliasRegistryTest.java b/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/SimpleAliasRegistryTest.java
index 5e64d58846f..459d47a1648 100644
--- a/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/SimpleAliasRegistryTest.java
+++ b/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/SimpleAliasRegistryTest.java
@@ -1,79 +1,79 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.opm;
-
-import org.assertj.core.api.WithAssertions;
-import org.junit.jupiter.api.Test;
-
-import java.util.HashMap;
-import java.util.NoSuchElementException;
-
-import static org.junit.Assert.*;
-
-public class SimpleAliasRegistryTest implements WithAssertions {
-
-    public static final String ADDRESS = "DB2:1234";
-    public static final String ALIAS = "some_field";
-
-    @Test
-    public void register_containsValue() {
-        SimpleAliasRegistry registry = new SimpleAliasRegistry();
-        registry.register(ALIAS, ADDRESS);
-
-        // Perform checks
-        checkMethods(registry);
-    }
-
-    @Test
-    public void defaultMap_containsValue() {
-        HashMap<String, String> map = new HashMap<>();
-        map.put(ALIAS, ADDRESS);
-        SimpleAliasRegistry registry = new SimpleAliasRegistry(map);
-
-        // Perform checks
-        checkMethods(registry);
-    }
-
-    @Test
-    public void canResolve_unknownAlias_returnFalse() {
-        SimpleAliasRegistry registry = new SimpleAliasRegistry();
-
-        assertFalse(registry.canResolve(ALIAS));
-    }
-
-    @Test
-    public void resolve_unknownAlias_throws() {
-        SimpleAliasRegistry registry = new SimpleAliasRegistry();
-
-        assertThatThrownBy(() -> registry.resolve(ALIAS))
-            .isInstanceOf(NoSuchElementException.class);
-
-    }
-
-    private void checkMethods(SimpleAliasRegistry registry) {
-        // Can Resolve
-        assertTrue(registry.canResolve(ALIAS));
-        assertTrue(registry.canResolve("unknown_connection", ALIAS));
-
-        // Resolve
-        assertEquals(ADDRESS, registry.resolve(ALIAS));
-        assertEquals(ADDRESS, registry.resolve("unknown_connection", ALIAS));
-    }
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.opm;
+
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashMap;
+import java.util.NoSuchElementException;
+
+import static org.junit.Assert.*;
+
+public class SimpleAliasRegistryTest implements WithAssertions {
+
+    public static final String ADDRESS = "DB2:1234";
+    public static final String ALIAS = "some_field";
+
+    @Test
+    public void register_containsValue() {
+        SimpleAliasRegistry registry = new SimpleAliasRegistry();
+        registry.register(ALIAS, ADDRESS);
+
+        // Perform checks
+        checkMethods(registry);
+    }
+
+    @Test
+    public void defaultMap_containsValue() {
+        HashMap<String, String> map = new HashMap<>();
+        map.put(ALIAS, ADDRESS);
+        SimpleAliasRegistry registry = new SimpleAliasRegistry(map);
+
+        // Perform checks
+        checkMethods(registry);
+    }
+
+    @Test
+    public void canResolve_unknownAlias_returnFalse() {
+        SimpleAliasRegistry registry = new SimpleAliasRegistry();
+
+        assertFalse(registry.canResolve(ALIAS));
+    }
+
+    @Test
+    public void resolve_unknownAlias_throws() {
+        SimpleAliasRegistry registry = new SimpleAliasRegistry();
+
+        assertThatThrownBy(() -> registry.resolve(ALIAS))
+            .isInstanceOf(NoSuchElementException.class);
+
+    }
+
+    private void checkMethods(SimpleAliasRegistry registry) {
+        // Can Resolve
+        assertTrue(registry.canResolve(ALIAS));
+        assertTrue(registry.canResolve("unknown_connection", ALIAS));
+
+        // Resolve
+        assertEquals(ADDRESS, registry.resolve(ALIAS));
+        assertEquals(ADDRESS, registry.resolve("unknown_connection", ALIAS));
+    }
 }
\ No newline at end of file
diff --git a/plc4j/utils/opm/src/test/resources/logback.xml b/plc4j/utils/opm/src/test/resources/logback.xml
index 8b499811e19..50533b02ef9 100644
--- a/plc4j/utils/opm/src/test/resources/logback.xml
+++ b/plc4j/utils/opm/src/test/resources/logback.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-    http://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.
-  -->
-<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoders are assigned the type
-         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="debug">
-    <appender-ref ref="STDOUT"/>
-  </root>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+    http://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.
+  -->
+<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="debug">
+    <appender-ref ref="STDOUT"/>
+  </root>
+
 </configuration>
\ No newline at end of file
diff --git a/plc4j/utils/pcap-sockets/pom.xml b/plc4j/utils/pcap-sockets/pom.xml
index 0b5e3ca9bfa..0bfc8d1c85f 100644
--- a/plc4j/utils/pcap-sockets/pom.xml
+++ b/plc4j/utils/pcap-sockets/pom.xml
@@ -1,90 +1,90 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-utils</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-utils-pcap-sockets</artifactId>
-
-  <name>PLC4J: Utils: Pcap-Sockets</name>
-  <description>An implementation of a Netty Channel that uses a PCAP packet dump as input and simulates a raw socket device by replaying the recorded traffic.</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-buffer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.pcap4j</groupId>
-      <artifactId>pcap4j-core</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.pcap4j</groupId>
-      <artifactId>pcap4j-packetfactory-static</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <usedDependencies>
-            <usedDependency>org.pcap4j:pcap4j-packetfactory-static</usedDependency>
-          </usedDependencies>
-        </configuration>
-      </plugin>
-
-      <!-- This is currently a work in progress ... skip this till it reaches a slightly more mature state -->
-      <plugin>
-        <groupId>org.sonarsource.scanner.maven</groupId>
-        <artifactId>sonar-maven-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-utils</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-utils-pcap-sockets</artifactId>
+
+  <name>PLC4J: Utils: Pcap-Sockets</name>
+  <description>An implementation of a Netty Channel that uses a PCAP packet dump as input and simulates a raw socket device by replaying the recorded traffic.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.pcap4j</groupId>
+      <artifactId>pcap4j-core</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.pcap4j</groupId>
+      <artifactId>pcap4j-packetfactory-static</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <usedDependencies>
+            <usedDependency>org.pcap4j:pcap4j-packetfactory-static</usedDependency>
+          </usedDependencies>
+        </configuration>
+      </plugin>
+
+      <!-- This is currently a work in progress ... skip this till it reaches a slightly more mature state -->
+      <plugin>
+        <groupId>org.sonarsource.scanner.maven</groupId>
+        <artifactId>sonar-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/PcapSocketException.java b/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/PcapSocketException.java
index 6806adf2460..16f31986df5 100644
--- a/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/PcapSocketException.java
+++ b/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/PcapSocketException.java
@@ -1,34 +1,34 @@
-/*
- * Copyright 2014 The Netty Project
- *
- * The Netty Project 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:
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.plc4x.java.utils.pcapsockets;
-
-public class PcapSocketException extends Exception {
-
-    private static final long serialVersionUID = 1L;
-
-    public PcapSocketException() {
-        super();
-    }
-
-    public PcapSocketException(String message) {
-        super(message);
-    }
-
-    public PcapSocketException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-}
+/*
+ * Copyright 2014 The Netty Project
+ *
+ * The Netty Project 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:
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.plc4x.java.utils.pcapsockets;
+
+public class PcapSocketException extends Exception {
+
+    private static final long serialVersionUID = 1L;
+
+    public PcapSocketException() {
+        super();
+    }
+
+    public PcapSocketException(String message) {
+        super(message);
+    }
+
+    public PcapSocketException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+}
diff --git a/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/PacketHandler.java b/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/PacketHandler.java
index 0aae4be44df..c074556731c 100644
--- a/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/PacketHandler.java
+++ b/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/PacketHandler.java
@@ -1,27 +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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.utils.pcapsockets.netty;
-
-import org.pcap4j.packet.Packet;
-
-public interface PacketHandler {
-
-    byte[] getData(Packet packet);
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.utils.pcapsockets.netty;
+
+import org.pcap4j.packet.Packet;
+
+public interface PacketHandler {
+
+    byte[] getData(Packet packet);
+
+}
diff --git a/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/PcapSocketAddress.java b/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/PcapSocketAddress.java
index 22cf7fa8596..daf95c63a94 100644
--- a/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/PcapSocketAddress.java
+++ b/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/PcapSocketAddress.java
@@ -1,60 +1,60 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.utils.pcapsockets.netty;
-
-import java.io.File;
-import java.net.InetAddress;
-import java.net.SocketAddress;
-
-public class PcapSocketAddress extends SocketAddress {
-
-    private static final long serialVersionUID = 1L;
-
-    public static final int ALL_PORTS = -1;
-    public static final int ALL_PROTOCOLS = -1;
-
-    private final File pcapFile;
-    private final InetAddress address;
-    private final int port;
-    private final int protocolId;
-
-    public PcapSocketAddress(File pcapFile, InetAddress address, int port, int protocolId) {
-        this.pcapFile = pcapFile;
-        this.address = address;
-        this.port = port;
-        this.protocolId = protocolId;
-    }
-
-    public File getPcapFile() {
-        return pcapFile;
-    }
-
-    public InetAddress getAddress() {
-        return address;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-    public int getProtocolId() {
-        return protocolId;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.utils.pcapsockets.netty;
+
+import java.io.File;
+import java.net.InetAddress;
+import java.net.SocketAddress;
+
+public class PcapSocketAddress extends SocketAddress {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final int ALL_PORTS = -1;
+    public static final int ALL_PROTOCOLS = -1;
+
+    private final File pcapFile;
+    private final InetAddress address;
+    private final int port;
+    private final int protocolId;
+
+    public PcapSocketAddress(File pcapFile, InetAddress address, int port, int protocolId) {
+        this.pcapFile = pcapFile;
+        this.address = address;
+        this.port = port;
+        this.protocolId = protocolId;
+    }
+
+    public File getPcapFile() {
+        return pcapFile;
+    }
+
+    public InetAddress getAddress() {
+        return address;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
+    public int getProtocolId() {
+        return protocolId;
+    }
+
+}
diff --git a/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/PcapSocketChannel.java b/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/PcapSocketChannel.java
index a1e83085637..24f75e72b28 100644
--- a/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/PcapSocketChannel.java
+++ b/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/PcapSocketChannel.java
@@ -1,301 +1,301 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.utils.pcapsockets.netty;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelConfig;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelPromise;
-import io.netty.channel.oio.OioByteStreamChannel;
-import org.apache.commons.lang3.NotImplementedException;
-import org.apache.plc4x.java.utils.pcapsockets.PcapSocketException;
-import org.pcap4j.core.*;
-import org.pcap4j.packet.Packet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.SocketAddress;
-import java.net.SocketTimeoutException;
-import java.sql.Timestamp;
-
-/**
- * @author julian
- * Created by julian on 2019-08-16
- */
-public class PcapSocketChannel extends OioByteStreamChannel {
-
-    private static final Logger logger = LoggerFactory.getLogger(PcapSocketChannel.class);
-
-    private final PcapSocketChannelConfig config;
-
-    private PcapSocketAddress remoteRawSocketAddress;
-    private SocketAddress localAddress;
-    private PcapHandle handle;
-    private Thread loopThread;
-
-    public PcapSocketChannel() {
-        super(null);
-        config = new PcapSocketChannelConfig(this);
-    }
-
-    @Override
-    protected boolean isInputShutdown() {
-        return false;
-    }
-
-    @Override
-    protected ChannelFuture shutdownInput() {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    protected void doConnect(SocketAddress remoteAddress, SocketAddress localAddress) throws Exception {
-        if(!(remoteAddress instanceof PcapSocketAddress)) {
-            logger.error("Expecting remote address of type PcapSocketAddress");
-            pipeline().fireExceptionCaught(
-                new PcapSocketException("Expecting remote address of type PcapSocketAddress"));
-            return;
-        }
-        this.localAddress = localAddress;
-        remoteRawSocketAddress = (PcapSocketAddress) remoteAddress;
-
-        // Get a handle to the network-device and open it.
-        File pcapFile = remoteRawSocketAddress.getPcapFile();
-        if(!pcapFile.exists()) {
-            logger.error(String.format("Couldn't find PCAP capture file at: %s", pcapFile.getAbsolutePath()));
-            pipeline().fireExceptionCaught(new PcapSocketException(String.format(
-                "Couldn't find PCAP capture file at: %s", pcapFile.getAbsolutePath())));
-            return;
-        }
-        if(logger.isDebugEnabled()) {
-            logger.debug(String.format("Opening PCAP capture file at: %s", pcapFile.getAbsolutePath()));
-        }
-
-        handle = Pcaps.openOffline(remoteRawSocketAddress.getPcapFile().getAbsolutePath(),
-            PcapHandle.TimestampPrecision.NANO);
-
-        // If the address allows fine tuning which packets to process, set a filter to reduce the load.
-        String filter = getFilter(remoteRawSocketAddress);
-        if(filter.length() > 0) {
-            handle.setFilter(filter, BpfProgram.BpfCompileMode.OPTIMIZE);
-        }
-
-        // Create a buffer where the raw socket worker can send data to.
-        ByteBuf buffer = Unpooled.buffer();
-
-        // Start a thread that processes the callbacks from the raw socket and simply
-        // forwards the bytes read to the buffer.
-        loopThread = new Thread(() -> {
-            try {
-                handle.loop(-1, new PacketListener() {
-                    private Timestamp lastPacketTime = null;
-
-                    @Override
-                    public void gotPacket(Packet packet) {
-                        Timestamp curPacketTime = handle.getTimestamp();
-
-                        // Only enable the throttling if it is not disabled.
-                        if(config.getSpeedFactor() != PcapSocketChannelConfig.SPEED_FAST_FULL) {
-                            // If last-time is not null, wait for the given number of nano-seconds.
-                            if (lastPacketTime != null) {
-                                int numMicrosecondsSleep = (int)
-                                    ((curPacketTime.getNanos() - lastPacketTime.getNanos()) / config.getSpeedFactor());
-                                nanoSecondSleep(numMicrosecondsSleep);
-                            }
-                        }
-
-                        // Send the bytes to the netty pipeline.
-                        buffer.writeBytes(config.getPacketHandler().getData(packet));
-
-                        // Remember the timestamp of the current packet.
-                        lastPacketTime = curPacketTime;
-                    }
-                });
-            } catch (PcapNativeException | NotOpenException e) {
-                logger.error("PCAP loop thread died!", e);
-                pipeline().fireExceptionCaught(e);
-            } catch (InterruptedException e) {
-                logger.warn("PCAP loop thread was interrupted (hopefully intentionally)", e);
-                Thread.currentThread().interrupt();
-            }
-        });
-        loopThread.start();
-
-        // Right now we're using an output stream that simply discards everything.
-        // This is ok while implementing passive drivers for protocols, however as
-        // soon as we start implementing ethernet layer protocols, we'll have to also
-        // be able to actually send data. The PcapInputStream simply acts as a
-        // breaking point if no packets are coming in and the read operation would
-        // simply block indefinitely.
-        activate(new PcapInputStream(buffer), new DiscardingOutputStream());
-    }
-
-    @Override
-    protected SocketAddress localAddress0() {
-        return localAddress;
-    }
-
-    @Override
-    protected SocketAddress remoteAddress0() {
-        return remoteRawSocketAddress;
-    }
-
-    @Override
-    protected void doBind(SocketAddress localAddress) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    protected void doDisconnect() {
-        this.loopThread.interrupt();
-        if (this.handle != null) {
-            this.handle.close();
-        }
-    }
-
-    @Override protected int doReadBytes(ByteBuf buf) throws Exception {
-        if (handle == null || !handle.isOpen()) {
-            return -1;
-        }
-        try {
-            return super.doReadBytes(buf);
-        } catch (SocketTimeoutException ignored) {
-            return 0;
-        }
-    }
-
-    @Override
-    public ChannelConfig config() {
-        return this.config;
-    }
-
-    @Override
-    public boolean isOpen() {
-        return true;
-    }
-
-    @Override
-    protected AbstractUnsafe newUnsafe() {
-        return new RawSocketUnsafe();
-    }
-
-    /**
-     * Use a busy wait loop for waiting. This should never be used in a
-     * production environment as it consumes 100% of one CPU core time to
-     * achieve, however it's the only accurate way to sleep for less than
-     * a millisecond.
-     *
-     * @param numNanos number of nano-seconds to wait.
-     */
-    private void nanoSecondSleep(long numNanos) {
-        long endTime = System.nanoTime() + numNanos;
-        while(endTime > System.nanoTime()) {
-            // Do Nothing ...
-        }
-    }
-
-    private String getFilter(PcapSocketAddress pcapSocketAddress) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("(ether proto \\ip)");
-        // Add a filter for source or target address.
-        if(pcapSocketAddress.getAddress() != null) {
-            sb.append(" and (host ").append(pcapSocketAddress.getAddress().getHostAddress()).append(")");
-        }
-        // Add a filter for TCP or UDP port.
-        if(pcapSocketAddress.getPort() != PcapSocketAddress.ALL_PORTS) {
-            sb.append(" and (port ").append(pcapSocketAddress.getPort()).append(")");
-        }
-        if(pcapSocketAddress.getProtocolId() != PcapSocketAddress.ALL_PROTOCOLS) {
-            sb.append("(ether proto ").append(pcapSocketAddress.getProtocolId()).append(")");
-        }
-        return sb.toString();
-    }
-
-
-    /**
-     * This output stream simply discards anything it should send.
-     */
-    private static class DiscardingOutputStream extends OutputStream {
-        @Override
-        public void write(int b) throws IOException {
-            // discard
-            logger.debug("Discarding {}", b);
-        }
-
-        @Override
-        public void write(byte[] b, int off, int len) {
-            logger.debug("Discarding {}", b);
-        }
-    }
-
-    /**
-     * InputStream that fulfills the contract of Netty for read operations to timeout.
-     * Without this the InputStream would simply block indefinitely which would block
-     * the entire IO module.
-     */
-    private static class PcapInputStream extends InputStream {
-        final ByteBuf buf;
-
-        private PcapInputStream(ByteBuf buf) {
-            this.buf = buf;
-        }
-
-        @Override
-        public int available() {
-            return buf.readableBytes();
-        }
-
-        @Override
-        public int read() throws IOException {
-            // Timeout 10 ms
-            final long timeout = System.nanoTime() + 10_000;
-            // Yes, this could make the thread go nuts in case of no data,
-            // but the Netty guys are doing it the same way and there probably
-            // is a reason for it ;-)
-            while (System.nanoTime() < timeout) {
-                if (buf.readableBytes() > 0) {
-                    return buf.readByte() & 0xFF;
-                }
-            }
-            throw new SocketTimeoutException();
-        }
-    }
-
-    /**
-     * Internal helper to wrap access to unsafe operations (Only used internally by netty)
-     */
-    private class RawSocketUnsafe extends AbstractUnsafe {
-        @Override
-        public void connect(SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise) {
-            try {
-                doConnect(remoteAddress, localAddress);
-                pipeline().fireChannelActive();
-                promise.setSuccess();
-            } catch (Exception e) {
-                promise.setFailure(e);
-            }
-        }
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.utils.pcapsockets.netty;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.oio.OioByteStreamChannel;
+import org.apache.commons.lang3.NotImplementedException;
+import org.apache.plc4x.java.utils.pcapsockets.PcapSocketException;
+import org.pcap4j.core.*;
+import org.pcap4j.packet.Packet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.SocketAddress;
+import java.net.SocketTimeoutException;
+import java.sql.Timestamp;
+
+/**
+ * @author julian
+ * Created by julian on 2019-08-16
+ */
+public class PcapSocketChannel extends OioByteStreamChannel {
+
+    private static final Logger logger = LoggerFactory.getLogger(PcapSocketChannel.class);
+
+    private final PcapSocketChannelConfig config;
+
+    private PcapSocketAddress remoteRawSocketAddress;
+    private SocketAddress localAddress;
+    private PcapHandle handle;
+    private Thread loopThread;
+
+    public PcapSocketChannel() {
+        super(null);
+        config = new PcapSocketChannelConfig(this);
+    }
+
+    @Override
+    protected boolean isInputShutdown() {
+        return false;
+    }
+
+    @Override
+    protected ChannelFuture shutdownInput() {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    protected void doConnect(SocketAddress remoteAddress, SocketAddress localAddress) throws Exception {
+        if(!(remoteAddress instanceof PcapSocketAddress)) {
+            logger.error("Expecting remote address of type PcapSocketAddress");
+            pipeline().fireExceptionCaught(
+                new PcapSocketException("Expecting remote address of type PcapSocketAddress"));
+            return;
+        }
+        this.localAddress = localAddress;
+        remoteRawSocketAddress = (PcapSocketAddress) remoteAddress;
+
+        // Get a handle to the network-device and open it.
+        File pcapFile = remoteRawSocketAddress.getPcapFile();
+        if(!pcapFile.exists()) {
+            logger.error(String.format("Couldn't find PCAP capture file at: %s", pcapFile.getAbsolutePath()));
+            pipeline().fireExceptionCaught(new PcapSocketException(String.format(
+                "Couldn't find PCAP capture file at: %s", pcapFile.getAbsolutePath())));
+            return;
+        }
+        if(logger.isDebugEnabled()) {
+            logger.debug(String.format("Opening PCAP capture file at: %s", pcapFile.getAbsolutePath()));
+        }
+
+        handle = Pcaps.openOffline(remoteRawSocketAddress.getPcapFile().getAbsolutePath(),
+            PcapHandle.TimestampPrecision.NANO);
+
+        // If the address allows fine tuning which packets to process, set a filter to reduce the load.
+        String filter = getFilter(remoteRawSocketAddress);
+        if(filter.length() > 0) {
+            handle.setFilter(filter, BpfProgram.BpfCompileMode.OPTIMIZE);
+        }
+
+        // Create a buffer where the raw socket worker can send data to.
+        ByteBuf buffer = Unpooled.buffer();
+
+        // Start a thread that processes the callbacks from the raw socket and simply
+        // forwards the bytes read to the buffer.
+        loopThread = new Thread(() -> {
+            try {
+                handle.loop(-1, new PacketListener() {
+                    private Timestamp lastPacketTime = null;
+
+                    @Override
+                    public void gotPacket(Packet packet) {
+                        Timestamp curPacketTime = handle.getTimestamp();
+
+                        // Only enable the throttling if it is not disabled.
+                        if(config.getSpeedFactor() != PcapSocketChannelConfig.SPEED_FAST_FULL) {
+                            // If last-time is not null, wait for the given number of nano-seconds.
+                            if (lastPacketTime != null) {
+                                int numMicrosecondsSleep = (int)
+                                    ((curPacketTime.getNanos() - lastPacketTime.getNanos()) / config.getSpeedFactor());
+                                nanoSecondSleep(numMicrosecondsSleep);
+                            }
+                        }
+
+                        // Send the bytes to the netty pipeline.
+                        buffer.writeBytes(config.getPacketHandler().getData(packet));
+
+                        // Remember the timestamp of the current packet.
+                        lastPacketTime = curPacketTime;
+                    }
+                });
+            } catch (PcapNativeException | NotOpenException e) {
+                logger.error("PCAP loop thread died!", e);
+                pipeline().fireExceptionCaught(e);
+            } catch (InterruptedException e) {
+                logger.warn("PCAP loop thread was interrupted (hopefully intentionally)", e);
+                Thread.currentThread().interrupt();
+            }
+        });
+        loopThread.start();
+
+        // Right now we're using an output stream that simply discards everything.
+        // This is ok while implementing passive drivers for protocols, however as
+        // soon as we start implementing ethernet layer protocols, we'll have to also
+        // be able to actually send data. The PcapInputStream simply acts as a
+        // breaking point if no packets are coming in and the read operation would
+        // simply block indefinitely.
+        activate(new PcapInputStream(buffer), new DiscardingOutputStream());
+    }
+
+    @Override
+    protected SocketAddress localAddress0() {
+        return localAddress;
+    }
+
+    @Override
+    protected SocketAddress remoteAddress0() {
+        return remoteRawSocketAddress;
+    }
+
+    @Override
+    protected void doBind(SocketAddress localAddress) {
+        throw new UnsupportedOperationException("Not implemented");
+    }
+
+    @Override
+    protected void doDisconnect() {
+        this.loopThread.interrupt();
+        if (this.handle != null) {
+            this.handle.close();
+        }
+    }
+
+    @Override protected int doReadBytes(ByteBuf buf) throws Exception {
+        if (handle == null || !handle.isOpen()) {
+            return -1;
+        }
+        try {
+            return super.doReadBytes(buf);
+        } catch (SocketTimeoutException ignored) {
+            return 0;
+        }
+    }
+
+    @Override
+    public ChannelConfig config() {
+        return this.config;
+    }
+
+    @Override
+    public boolean isOpen() {
+        return true;
+    }
+
+    @Override
+    protected AbstractUnsafe newUnsafe() {
+        return new RawSocketUnsafe();
+    }
+
+    /**
+     * Use a busy wait loop for waiting. This should never be used in a
+     * production environment as it consumes 100% of one CPU core time to
+     * achieve, however it's the only accurate way to sleep for less than
+     * a millisecond.
+     *
+     * @param numNanos number of nano-seconds to wait.
+     */
+    private void nanoSecondSleep(long numNanos) {
+        long endTime = System.nanoTime() + numNanos;
+        while(endTime > System.nanoTime()) {
+            // Do Nothing ...
+        }
+    }
+
+    private String getFilter(PcapSocketAddress pcapSocketAddress) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("(ether proto \\ip)");
+        // Add a filter for source or target address.
+        if(pcapSocketAddress.getAddress() != null) {
+            sb.append(" and (host ").append(pcapSocketAddress.getAddress().getHostAddress()).append(")");
+        }
+        // Add a filter for TCP or UDP port.
+        if(pcapSocketAddress.getPort() != PcapSocketAddress.ALL_PORTS) {
+            sb.append(" and (port ").append(pcapSocketAddress.getPort()).append(")");
+        }
+        if(pcapSocketAddress.getProtocolId() != PcapSocketAddress.ALL_PROTOCOLS) {
+            sb.append("(ether proto ").append(pcapSocketAddress.getProtocolId()).append(")");
+        }
+        return sb.toString();
+    }
+
+
+    /**
+     * This output stream simply discards anything it should send.
+     */
+    private static class DiscardingOutputStream extends OutputStream {
+        @Override
+        public void write(int b) throws IOException {
+            // discard
+            logger.debug("Discarding {}", b);
+        }
+
+        @Override
+        public void write(byte[] b, int off, int len) {
+            logger.debug("Discarding {}", b);
+        }
+    }
+
+    /**
+     * InputStream that fulfills the contract of Netty for read operations to timeout.
+     * Without this the InputStream would simply block indefinitely which would block
+     * the entire IO module.
+     */
+    private static class PcapInputStream extends InputStream {
+        final ByteBuf buf;
+
+        private PcapInputStream(ByteBuf buf) {
+            this.buf = buf;
+        }
+
+        @Override
+        public int available() {
+            return buf.readableBytes();
+        }
+
+        @Override
+        public int read() throws IOException {
+            // Timeout 10 ms
+            final long timeout = System.nanoTime() + 10_000;
+            // Yes, this could make the thread go nuts in case of no data,
+            // but the Netty guys are doing it the same way and there probably
+            // is a reason for it ;-)
+            while (System.nanoTime() < timeout) {
+                if (buf.readableBytes() > 0) {
+                    return buf.readByte() & 0xFF;
+                }
+            }
+            throw new SocketTimeoutException();
+        }
+    }
+
+    /**
+     * Internal helper to wrap access to unsafe operations (Only used internally by netty)
+     */
+    private class RawSocketUnsafe extends AbstractUnsafe {
+        @Override
+        public void connect(SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise) {
+            try {
+                doConnect(remoteAddress, localAddress);
+                pipeline().fireChannelActive();
+                promise.setSuccess();
+            } catch (Exception e) {
+                promise.setFailure(e);
+            }
+        }
+    }
+}
diff --git a/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/PcapSocketChannelConfig.java b/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/PcapSocketChannelConfig.java
index 2fcb6ab5286..310e1e8d31a 100644
--- a/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/PcapSocketChannelConfig.java
+++ b/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/PcapSocketChannelConfig.java
@@ -1,92 +1,92 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.utils.pcapsockets.netty;
-
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelConfig;
-import io.netty.channel.ChannelOption;
-import io.netty.channel.DefaultChannelConfig;
-import org.pcap4j.packet.Packet;
-
-import java.util.Map;
-
-public class PcapSocketChannelConfig extends DefaultChannelConfig implements ChannelConfig {
-
-    public static float SPEED_SLOW_HALF = 2f;
-    public static float SPEED_REALTIME = -1f;
-    public static float SPEED_FAST_DOUBLE = 0.5f;
-    public static float SPEED_FAST_FULL = 0f;
-
-    private PacketHandler packetHandler;
-    private float speedFactor;
-
-    public PcapSocketChannelConfig(Channel channel) {
-        super(channel);
-        packetHandler = new PacketHandler() {
-            @Override
-            public byte[] getData(Packet packet) {
-                return packet.getRawData();
-            }
-        };
-    }
-
-    @Override
-    public Map<ChannelOption<?>, Object> getOptions() {
-        return getOptions(super.getOptions(),
-            PcapSocketChannelOption.PACKET_HANDLER, PcapSocketChannelOption.SPEED_FACTOR);
-    }
-
-    @Override
-    public <T> boolean setOption(ChannelOption<T> option, T value) {
-        if(option == PcapSocketChannelOption.PACKET_HANDLER) {
-            if(value instanceof PacketHandler) {
-                packetHandler = (PacketHandler) value;
-                return true;
-            }
-            return false;
-        } else if(option == PcapSocketChannelOption.SPEED_FACTOR) {
-            if(value instanceof Float) {
-                speedFactor = (Float) value;
-                if(speedFactor > 0) {
-                    return true;
-                }
-            }
-            return false;
-        } else {
-            return super.setOption(option, value);
-        }
-    }
-
-    public void setPacketHandler(PacketHandler packetHandler) {
-        this.packetHandler = packetHandler;
-    }
-
-    public PacketHandler getPacketHandler() {
-        return packetHandler;
-    }
-
-    public float getSpeedFactor() {
-        return speedFactor;
-    }
-
-    public void setSpeedFactor(float speedFactor) {
-        this.speedFactor = speedFactor;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.utils.pcapsockets.netty;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.DefaultChannelConfig;
+import org.pcap4j.packet.Packet;
+
+import java.util.Map;
+
+public class PcapSocketChannelConfig extends DefaultChannelConfig implements ChannelConfig {
+
+    public static float SPEED_SLOW_HALF = 2f;
+    public static float SPEED_REALTIME = -1f;
+    public static float SPEED_FAST_DOUBLE = 0.5f;
+    public static float SPEED_FAST_FULL = 0f;
+
+    private PacketHandler packetHandler;
+    private float speedFactor;
+
+    public PcapSocketChannelConfig(Channel channel) {
+        super(channel);
+        packetHandler = new PacketHandler() {
+            @Override
+            public byte[] getData(Packet packet) {
+                return packet.getRawData();
+            }
+        };
+    }
+
+    @Override
+    public Map<ChannelOption<?>, Object> getOptions() {
+        return getOptions(super.getOptions(),
+            PcapSocketChannelOption.PACKET_HANDLER, PcapSocketChannelOption.SPEED_FACTOR);
+    }
+
+    @Override
+    public <T> boolean setOption(ChannelOption<T> option, T value) {
+        if(option == PcapSocketChannelOption.PACKET_HANDLER) {
+            if(value instanceof PacketHandler) {
+                packetHandler = (PacketHandler) value;
+                return true;
+            }
+            return false;
+        } else if(option == PcapSocketChannelOption.SPEED_FACTOR) {
+            if(value instanceof Float) {
+                speedFactor = (Float) value;
+                if(speedFactor > 0) {
+                    return true;
+                }
+            }
+            return false;
+        } else {
+            return super.setOption(option, value);
+        }
+    }
+
+    public void setPacketHandler(PacketHandler packetHandler) {
+        this.packetHandler = packetHandler;
+    }
+
+    public PacketHandler getPacketHandler() {
+        return packetHandler;
+    }
+
+    public float getSpeedFactor() {
+        return speedFactor;
+    }
+
+    public void setSpeedFactor(float speedFactor) {
+        this.speedFactor = speedFactor;
+    }
+
+}
diff --git a/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/PcapSocketChannelOption.java b/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/PcapSocketChannelOption.java
index 71ed72ea5a7..5ad62cbcc29 100644
--- a/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/PcapSocketChannelOption.java
+++ b/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/PcapSocketChannelOption.java
@@ -1,39 +1,39 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.utils.pcapsockets.netty;
-
-import io.netty.channel.ChannelOption;
-
-public class PcapSocketChannelOption<T> extends ChannelOption<T> {
-
-    public static final ChannelOption<PacketHandler> PACKET_HANDLER =
-        ChannelOption.valueOf(PacketHandler.class, "PACKET_HANDLER");
-
-    /**
-     * Option to increase/decrease the replay speed of the recording.
-     * 1.0 being real-time.
-     */
-    public static final ChannelOption<Float> SPEED_FACTOR =
-        ChannelOption.valueOf(Float.class, "SPEED_FACTOR");
-
-    protected PcapSocketChannelOption() {
-        super(null);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.utils.pcapsockets.netty;
+
+import io.netty.channel.ChannelOption;
+
+public class PcapSocketChannelOption<T> extends ChannelOption<T> {
+
+    public static final ChannelOption<PacketHandler> PACKET_HANDLER =
+        ChannelOption.valueOf(PacketHandler.class, "PACKET_HANDLER");
+
+    /**
+     * Option to increase/decrease the replay speed of the recording.
+     * 1.0 being real-time.
+     */
+    public static final ChannelOption<Float> SPEED_FACTOR =
+        ChannelOption.valueOf(Float.class, "SPEED_FACTOR");
+
+    protected PcapSocketChannelOption() {
+        super(null);
+    }
+
+}
diff --git a/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/TcpIpPacketHandler.java b/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/TcpIpPacketHandler.java
index 076c75eb9c5..a72e980b3bd 100644
--- a/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/TcpIpPacketHandler.java
+++ b/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/TcpIpPacketHandler.java
@@ -1,41 +1,41 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.utils.pcapsockets.netty;
-
-import org.pcap4j.packet.*;
-
-/**
- * Little helper to automatically unwrap TCP packets to only
- * pass along the payload and not the raw Ethernet packet.
- */
-public class TcpIpPacketHandler implements PacketHandler {
-
-    @Override
-    public byte[] getData(Packet packet) {
-        EthernetPacket ethernetPacket = (EthernetPacket) packet;
-        IpV4Packet ipv4Packet = (IpV4Packet) ethernetPacket.getPayload();
-        TcpPacket tcpPacket = (TcpPacket) ipv4Packet.getPayload();
-        if(tcpPacket.getPayload() instanceof UnknownPacket) {
-            UnknownPacket unknownPacket = (UnknownPacket) tcpPacket.getPayload();
-            return unknownPacket.getRawData();
-        }
-        return new byte[0];
-    }
-
-}
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.utils.pcapsockets.netty;
+
+import org.pcap4j.packet.*;
+
+/**
+ * Little helper to automatically unwrap TCP packets to only
+ * pass along the payload and not the raw Ethernet packet.
+ */
+public class TcpIpPacketHandler implements PacketHandler {
+
+    @Override
+    public byte[] getData(Packet packet) {
+        EthernetPacket ethernetPacket = (EthernetPacket) packet;
+        IpV4Packet ipv4Packet = (IpV4Packet) ethernetPacket.getPayload();
+        TcpPacket tcpPacket = (TcpPacket) ipv4Packet.getPayload();
+        if(tcpPacket.getPayload() instanceof UnknownPacket) {
+            UnknownPacket unknownPacket = (UnknownPacket) tcpPacket.getPayload();
+            return unknownPacket.getRawData();
+        }
+        return new byte[0];
+    }
+
+}
diff --git a/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/UdpIpPacketHandler.java b/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/UdpIpPacketHandler.java
index f18ff09a9f7..841e784161c 100644
--- a/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/UdpIpPacketHandler.java
+++ b/plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/UdpIpPacketHandler.java
@@ -1,41 +1,41 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.utils.pcapsockets.netty;
-
-import org.pcap4j.packet.*;
-
-/**
- * Little helper to automatically unwrap UDP packets to only
- * pass along the payload and not the raw Ethernet packet.
- */
-public class UdpIpPacketHandler implements PacketHandler {
-
-    @Override
-    public byte[] getData(Packet packet) {
-        EthernetPacket ethernetPacket = (EthernetPacket) packet;
-        IpV4Packet ipv4Packet = (IpV4Packet) ethernetPacket.getPayload();
-        UdpPacket udpPacket = (UdpPacket) ipv4Packet.getPayload();
-        if(udpPacket.getPayload() instanceof UnknownPacket) {
-            UnknownPacket unknownPacket = (UnknownPacket) udpPacket.getPayload();
-            return unknownPacket.getRawData();
-        }
-        return new byte[0];
-    }
-
-}
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.utils.pcapsockets.netty;
+
+import org.pcap4j.packet.*;
+
+/**
+ * Little helper to automatically unwrap UDP packets to only
+ * pass along the payload and not the raw Ethernet packet.
+ */
+public class UdpIpPacketHandler implements PacketHandler {
+
+    @Override
+    public byte[] getData(Packet packet) {
+        EthernetPacket ethernetPacket = (EthernetPacket) packet;
+        IpV4Packet ipv4Packet = (IpV4Packet) ethernetPacket.getPayload();
+        UdpPacket udpPacket = (UdpPacket) ipv4Packet.getPayload();
+        if(udpPacket.getPayload() instanceof UnknownPacket) {
+            UnknownPacket unknownPacket = (UnknownPacket) udpPacket.getPayload();
+            return unknownPacket.getRawData();
+        }
+        return new byte[0];
+    }
+
+}
diff --git a/plc4j/utils/pom.xml b/plc4j/utils/pom.xml
index 658966f7f91..be973f81444 100644
--- a/plc4j/utils/pom.xml
+++ b/plc4j/utils/pom.xml
@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-utils</artifactId>
-  <packaging>pom</packaging>
-
-  <name>PLC4J: Utils</name>
-  <description>A collection of utilities used in multiple modules.</description>
-
-  <modules>
-    <!-- Base module for all types of PLC4X drivers -->
-    <module>driver-base-java</module>
-    <!-- Non-default input options -->
-    <module>raw-sockets</module>
-    <module>pcap-sockets</module>
-    <!-- Utilities for building tests -->
-    <module>test-utils</module>
-    <module>protocol-test-utils</module>
-
-    <!-- Utilities used externally by users -->
-    <module>connection-pool</module>
-  </modules>
-
-  <profiles>
-    <profile>
-      <id>with-proxies</id>
-      <modules>
-        <module>interop</module>
-      </modules>
-    </profile>
-  </profiles>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-utils</artifactId>
+  <packaging>pom</packaging>
+
+  <name>PLC4J: Utils</name>
+  <description>A collection of utilities used in multiple modules.</description>
+
+  <modules>
+    <!-- Base module for all types of PLC4X drivers -->
+    <module>driver-base-java</module>
+    <!-- Non-default input options -->
+    <module>raw-sockets</module>
+    <module>pcap-sockets</module>
+    <!-- Utilities for building tests -->
+    <module>test-utils</module>
+    <module>protocol-test-utils</module>
+
+    <!-- Utilities used externally by users -->
+    <module>connection-pool</module>
+  </modules>
+
+  <profiles>
+    <profile>
+      <id>with-proxies</id>
+      <modules>
+        <module>interop</module>
+      </modules>
+    </profile>
+  </profiles>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/utils/protocol-test-utils/pom.xml b/plc4j/utils/protocol-test-utils/pom.xml
index 679bc5a8b9d..6f49ba332f7 100644
--- a/plc4j/utils/protocol-test-utils/pom.xml
+++ b/plc4j/utils/protocol-test-utils/pom.xml
@@ -1,72 +1,72 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-utils</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-utils-protocol-test-utils</artifactId>
-
-  <name>PLC4J: Utils: Protocol Test Utils</name>
-  <description>Set of utilities designed to help testing protocols.</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-utils-driver-base-java</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.dom4j</groupId>
-      <artifactId>dom4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
-      <artifactId>jackson-dataformat-xml</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.xmlunit</groupId>
-      <artifactId>xmlunit-core</artifactId>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-utils</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-utils-protocol-test-utils</artifactId>
+
+  <name>PLC4J: Utils: Protocol Test Utils</name>
+  <description>Set of utilities designed to help testing protocols.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-utils-driver-base-java</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.dom4j</groupId>
+      <artifactId>dom4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-xml</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.xmlunit</groupId>
+      <artifactId>xmlunit-core</artifactId>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/utils/protocol-test-utils/src/main/java/org/apache/plc4x/protocol/test/ProtocolTestsuiteRunner.java b/plc4j/utils/protocol-test-utils/src/main/java/org/apache/plc4x/protocol/test/ProtocolTestsuiteRunner.java
index 8fbf7f758f0..04557e2cb02 100644
--- a/plc4j/utils/protocol-test-utils/src/main/java/org/apache/plc4x/protocol/test/ProtocolTestsuiteRunner.java
+++ b/plc4j/utils/protocol-test-utils/src/main/java/org/apache/plc4x/protocol/test/ProtocolTestsuiteRunner.java
@@ -1,175 +1,175 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.protocol.test;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
-import org.apache.plc4x.java.utils.*;
-import org.apache.plc4x.protocol.test.exceptions.ProtocolTestsuiteException;
-import org.apache.plc4x.protocol.test.model.ProtocolTestsuite;
-import org.apache.plc4x.protocol.test.model.Testcase;
-import org.dom4j.*;
-import org.junit.jupiter.api.DynamicTest;
-import org.junit.jupiter.api.TestFactory;
-import org.dom4j.io.SAXReader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.xmlunit.builder.DiffBuilder;
-import org.xmlunit.diff.Diff;
-
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.*;
-
-public class ProtocolTestsuiteRunner {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ProtocolTestsuiteRunner.class);
-
-    private final String testsuiteDocument;
-
-    public ProtocolTestsuiteRunner(String testsuiteDocument) {
-        this.testsuiteDocument = testsuiteDocument;
-    }
-
-    @TestFactory
-    public Iterable<DynamicTest> getTestsuiteTests() throws ProtocolTestsuiteException {
-        ProtocolTestsuite testSuite = parseTestsuite(ProtocolTestsuiteRunner.class.getResourceAsStream(testsuiteDocument));
-        List<DynamicTest> dynamicTests = new LinkedList<>();
-        for(Testcase testcase : testSuite.getTestcases()) {
-            String testcaseName = testcase.getName();
-            String testcaseLabel = testSuite.getName() + ": " + testcaseName;
-            DynamicTest test = DynamicTest.dynamicTest(testcaseLabel, () ->
-                run(testSuite, testcase)
-            );
-            dynamicTests.add(test);
-        }
-        return dynamicTests;
-    }
-
-    private ProtocolTestsuite parseTestsuite(InputStream testsuiteDocumentXml) throws ProtocolTestsuiteException {
-        try {
-            SAXReader reader = new SAXReader();
-            Document document = reader.read(testsuiteDocumentXml);
-            Element testsuiteXml = document.getRootElement();
-            boolean littleEndian = !"true".equals(testsuiteXml.attributeValue("bigEndian"));
-            Element testsuiteName = testsuiteXml.element(new QName("name"));
-            List<Element> testcasesXml = testsuiteXml.elements(new QName("testcase"));
-            List<Testcase> testcases = new ArrayList<>(testcasesXml.size());
-            for(Element testcaseXml : testcasesXml) {
-                Element nameElement = testcaseXml.element(new QName("name"));
-                Element descriptionElement = testcaseXml.element(new QName("description"));
-                Element rawElement = testcaseXml.element(new QName("raw"));
-                Element rootTypeElement = testcaseXml.element(new QName("root-type"));
-                Element xmlElement = testcaseXml.element(new QName("xml"));
-
-                String name = nameElement.getTextTrim();
-                String description = (descriptionElement != null) ? descriptionElement.getTextTrim() : null;
-                byte[] raw = Hex.decodeHex(rawElement.getTextTrim());
-                String rootType = rootTypeElement.getTextTrim();
-
-                testcases.add(new Testcase(name, description, raw, rootType, xmlElement));
-            }
-            LOGGER.info(String.format("Found %d testcases.", testcases.size()));
-            return new ProtocolTestsuite(testsuiteName.getTextTrim(), testcases, littleEndian);
-        } catch (DocumentException e) {
-            throw new ProtocolTestsuiteException("Error parsing testsuite xml", e);
-        } catch (DecoderException e) {
-            throw new ProtocolTestsuiteException("Error parsing testcase raw data", e);
-        }
-    }
-
-    private void run(ProtocolTestsuite testSuite, Testcase testcase) throws ProtocolTestsuiteException {
-        ObjectMapper mapper = new XmlMapper().enableDefaultTyping();
-        ReadBuffer readBuffer = new ReadBuffer(testcase.getRaw(), testSuite.isLittleEndian());
-        String referenceXml = testcase.getXml().elements().get(0).asXML();
-
-        MessageIO messageIO = getMessageIOForTestcase(testcase);
-        try {
-            Object msg = messageIO.parse(readBuffer);
-            String xmlString = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(msg);
-            Diff diff = DiffBuilder.compare(referenceXml).withTest(xmlString).ignoreWhitespace().build();
-            if(diff.hasDifferences()) {
-                System.out.println(xmlString);
-                throw new ProtocolTestsuiteException("Differences were found after parsing.\n" + diff.toString());
-            }
-            WriteBuffer writeBuffer = new WriteBuffer(((Message) msg).getLengthInBytes(), testSuite.isLittleEndian());
-            messageIO.serialize(writeBuffer, msg);
-            byte[] data = writeBuffer.getData();
-            if(testcase.getRaw().length != data.length) {
-                LOGGER.info("Expected a byte array with a length of " + testcase.getRaw().length +
-                    " but got one with " + data.length);
-            }
-            if(!Arrays.equals(testcase.getRaw(), data)) {
-                int i;
-                for(i = 0; i < data.length; i++) {
-                    if(data[i] != testcase.getRaw()[i]) {
-                        break;
-                    }
-                }
-                throw new ProtocolTestsuiteException("Differences were found after serializing.\nExpected: " +
-                    Hex.encodeHexString(testcase.getRaw()) + "\nBut Got:  " + Hex.encodeHexString(data) +
-                    "\n          " + String.join("", Collections.nCopies(i, "--")) + "^");
-            }
-        } catch (ParseException e) {
-            throw new ProtocolTestsuiteException("Unable to parse message", e);
-        } catch (JsonProcessingException e) {
-            throw new ProtocolTestsuiteException("Unable to serialize parsed message as XML string", e);
-        }
-    }
-
-    private MessageIO getMessageIOForTestcase(Testcase testcase) throws ProtocolTestsuiteException {
-        String className = testcase.getXml().elements().get(0).attributeValue(new QName("className"));
-        String ioRootClassName = className.substring(0, className.lastIndexOf('.') + 1) + testcase.getRootType();
-        String ioClassName = className.substring(0, className.lastIndexOf('.') + 1) + "io." +
-            testcase.getRootType() + "IO";
-        try {
-            Class<?> ioRootClass = Class.forName(ioRootClassName);
-            Class<?> ioClass = Class.forName(ioClassName);
-            final Method parseMethod = ioClass.getMethod("parse", ReadBuffer.class);
-            final Method serializeMethod = ioClass.getMethod("serialize", WriteBuffer.class, ioRootClass);
-            return new MessageIO() {
-                @Override
-                public Object parse(ReadBuffer io) throws ParseException {
-                    try {
-                        return parseMethod.invoke(null, io);
-                    } catch (IllegalAccessException | InvocationTargetException e) {
-                        throw new ParseException("error parsing", e);
-                    }
-                }
-
-                @Override
-                public void serialize(WriteBuffer io, Object value) throws ParseException {
-                    try {
-                        serializeMethod.invoke(null, io, value);
-                    } catch (IllegalAccessException | InvocationTargetException e) {
-                        throw new ParseException("error serializing", e);
-                    }
-                }
-            };
-        } catch (NoSuchMethodException | ClassNotFoundException e) {
-            throw new ProtocolTestsuiteException("Unable to instantiate IO component", e);
-        }
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.protocol.test;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import org.apache.commons.codec.DecoderException;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.plc4x.java.utils.*;
+import org.apache.plc4x.protocol.test.exceptions.ProtocolTestsuiteException;
+import org.apache.plc4x.protocol.test.model.ProtocolTestsuite;
+import org.apache.plc4x.protocol.test.model.Testcase;
+import org.dom4j.*;
+import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.TestFactory;
+import org.dom4j.io.SAXReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.xmlunit.builder.DiffBuilder;
+import org.xmlunit.diff.Diff;
+
+import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.*;
+
+public class ProtocolTestsuiteRunner {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ProtocolTestsuiteRunner.class);
+
+    private final String testsuiteDocument;
+
+    public ProtocolTestsuiteRunner(String testsuiteDocument) {
+        this.testsuiteDocument = testsuiteDocument;
+    }
+
+    @TestFactory
+    public Iterable<DynamicTest> getTestsuiteTests() throws ProtocolTestsuiteException {
+        ProtocolTestsuite testSuite = parseTestsuite(ProtocolTestsuiteRunner.class.getResourceAsStream(testsuiteDocument));
+        List<DynamicTest> dynamicTests = new LinkedList<>();
+        for(Testcase testcase : testSuite.getTestcases()) {
+            String testcaseName = testcase.getName();
+            String testcaseLabel = testSuite.getName() + ": " + testcaseName;
+            DynamicTest test = DynamicTest.dynamicTest(testcaseLabel, () ->
+                run(testSuite, testcase)
+            );
+            dynamicTests.add(test);
+        }
+        return dynamicTests;
+    }
+
+    private ProtocolTestsuite parseTestsuite(InputStream testsuiteDocumentXml) throws ProtocolTestsuiteException {
+        try {
+            SAXReader reader = new SAXReader();
+            Document document = reader.read(testsuiteDocumentXml);
+            Element testsuiteXml = document.getRootElement();
+            boolean littleEndian = !"true".equals(testsuiteXml.attributeValue("bigEndian"));
+            Element testsuiteName = testsuiteXml.element(new QName("name"));
+            List<Element> testcasesXml = testsuiteXml.elements(new QName("testcase"));
+            List<Testcase> testcases = new ArrayList<>(testcasesXml.size());
+            for(Element testcaseXml : testcasesXml) {
+                Element nameElement = testcaseXml.element(new QName("name"));
+                Element descriptionElement = testcaseXml.element(new QName("description"));
+                Element rawElement = testcaseXml.element(new QName("raw"));
+                Element rootTypeElement = testcaseXml.element(new QName("root-type"));
+                Element xmlElement = testcaseXml.element(new QName("xml"));
+
+                String name = nameElement.getTextTrim();
+                String description = (descriptionElement != null) ? descriptionElement.getTextTrim() : null;
+                byte[] raw = Hex.decodeHex(rawElement.getTextTrim());
+                String rootType = rootTypeElement.getTextTrim();
+
+                testcases.add(new Testcase(name, description, raw, rootType, xmlElement));
+            }
+            LOGGER.info(String.format("Found %d testcases.", testcases.size()));
+            return new ProtocolTestsuite(testsuiteName.getTextTrim(), testcases, littleEndian);
+        } catch (DocumentException e) {
+            throw new ProtocolTestsuiteException("Error parsing testsuite xml", e);
+        } catch (DecoderException e) {
+            throw new ProtocolTestsuiteException("Error parsing testcase raw data", e);
+        }
+    }
+
+    private void run(ProtocolTestsuite testSuite, Testcase testcase) throws ProtocolTestsuiteException {
+        ObjectMapper mapper = new XmlMapper().enableDefaultTyping();
+        ReadBuffer readBuffer = new ReadBuffer(testcase.getRaw(), testSuite.isLittleEndian());
+        String referenceXml = testcase.getXml().elements().get(0).asXML();
+
+        MessageIO messageIO = getMessageIOForTestcase(testcase);
+        try {
+            Object msg = messageIO.parse(readBuffer);
+            String xmlString = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(msg);
+            Diff diff = DiffBuilder.compare(referenceXml).withTest(xmlString).ignoreWhitespace().build();
+            if(diff.hasDifferences()) {
+                System.out.println(xmlString);
+                throw new ProtocolTestsuiteException("Differences were found after parsing.\n" + diff.toString());
+            }
+            WriteBuffer writeBuffer = new WriteBuffer(((Message) msg).getLengthInBytes(), testSuite.isLittleEndian());
+            messageIO.serialize(writeBuffer, msg);
+            byte[] data = writeBuffer.getData();
+            if(testcase.getRaw().length != data.length) {
+                LOGGER.info("Expected a byte array with a length of " + testcase.getRaw().length +
+                    " but got one with " + data.length);
+            }
+            if(!Arrays.equals(testcase.getRaw(), data)) {
+                int i;
+                for(i = 0; i < data.length; i++) {
+                    if(data[i] != testcase.getRaw()[i]) {
+                        break;
+                    }
+                }
+                throw new ProtocolTestsuiteException("Differences were found after serializing.\nExpected: " +
+                    Hex.encodeHexString(testcase.getRaw()) + "\nBut Got:  " + Hex.encodeHexString(data) +
+                    "\n          " + String.join("", Collections.nCopies(i, "--")) + "^");
+            }
+        } catch (ParseException e) {
+            throw new ProtocolTestsuiteException("Unable to parse message", e);
+        } catch (JsonProcessingException e) {
+            throw new ProtocolTestsuiteException("Unable to serialize parsed message as XML string", e);
+        }
+    }
+
+    private MessageIO getMessageIOForTestcase(Testcase testcase) throws ProtocolTestsuiteException {
+        String className = testcase.getXml().elements().get(0).attributeValue(new QName("className"));
+        String ioRootClassName = className.substring(0, className.lastIndexOf('.') + 1) + testcase.getRootType();
+        String ioClassName = className.substring(0, className.lastIndexOf('.') + 1) + "io." +
+            testcase.getRootType() + "IO";
+        try {
+            Class<?> ioRootClass = Class.forName(ioRootClassName);
+            Class<?> ioClass = Class.forName(ioClassName);
+            final Method parseMethod = ioClass.getMethod("parse", ReadBuffer.class);
+            final Method serializeMethod = ioClass.getMethod("serialize", WriteBuffer.class, ioRootClass);
+            return new MessageIO() {
+                @Override
+                public Object parse(ReadBuffer io) throws ParseException {
+                    try {
+                        return parseMethod.invoke(null, io);
+                    } catch (IllegalAccessException | InvocationTargetException e) {
+                        throw new ParseException("error parsing", e);
+                    }
+                }
+
+                @Override
+                public void serialize(WriteBuffer io, Object value) throws ParseException {
+                    try {
+                        serializeMethod.invoke(null, io, value);
+                    } catch (IllegalAccessException | InvocationTargetException e) {
+                        throw new ParseException("error serializing", e);
+                    }
+                }
+            };
+        } catch (NoSuchMethodException | ClassNotFoundException e) {
+            throw new ProtocolTestsuiteException("Unable to instantiate IO component", e);
+        }
+    }
+
+}
diff --git a/plc4j/utils/protocol-test-utils/src/main/java/org/apache/plc4x/protocol/test/exceptions/ProtocolTestsuiteException.java b/plc4j/utils/protocol-test-utils/src/main/java/org/apache/plc4x/protocol/test/exceptions/ProtocolTestsuiteException.java
index 81500b55d16..b0c6ecf3fc5 100644
--- a/plc4j/utils/protocol-test-utils/src/main/java/org/apache/plc4x/protocol/test/exceptions/ProtocolTestsuiteException.java
+++ b/plc4j/utils/protocol-test-utils/src/main/java/org/apache/plc4x/protocol/test/exceptions/ProtocolTestsuiteException.java
@@ -1,32 +1,32 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.protocol.test.exceptions;
-
-public class ProtocolTestsuiteException extends Exception {
-
-    public ProtocolTestsuiteException(String message) {
-        super(message);
-    }
-
-    public ProtocolTestsuiteException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.protocol.test.exceptions;
+
+public class ProtocolTestsuiteException extends Exception {
+
+    public ProtocolTestsuiteException(String message) {
+        super(message);
+    }
+
+    public ProtocolTestsuiteException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+}
diff --git a/plc4j/utils/protocol-test-utils/src/main/java/org/apache/plc4x/protocol/test/model/ProtocolTestsuite.java b/plc4j/utils/protocol-test-utils/src/main/java/org/apache/plc4x/protocol/test/model/ProtocolTestsuite.java
index 83de706fde2..2ab677484ca 100644
--- a/plc4j/utils/protocol-test-utils/src/main/java/org/apache/plc4x/protocol/test/model/ProtocolTestsuite.java
+++ b/plc4j/utils/protocol-test-utils/src/main/java/org/apache/plc4x/protocol/test/model/ProtocolTestsuite.java
@@ -1,48 +1,48 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.protocol.test.model;
-
-import java.util.List;
-
-public class ProtocolTestsuite {
-
-    private final String name;
-    private final List<Testcase> testcases;
-    private final boolean littleEndian;
-
-    public ProtocolTestsuite(String name, List<Testcase> testcases, boolean littleEndian) {
-        this.name = name;
-        this.testcases = testcases;
-        this.littleEndian = littleEndian;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public List<Testcase> getTestcases() {
-        return testcases;
-    }
-
-    public boolean isLittleEndian() {
-        return littleEndian;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.protocol.test.model;
+
+import java.util.List;
+
+public class ProtocolTestsuite {
+
+    private final String name;
+    private final List<Testcase> testcases;
+    private final boolean littleEndian;
+
+    public ProtocolTestsuite(String name, List<Testcase> testcases, boolean littleEndian) {
+        this.name = name;
+        this.testcases = testcases;
+        this.littleEndian = littleEndian;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public List<Testcase> getTestcases() {
+        return testcases;
+    }
+
+    public boolean isLittleEndian() {
+        return littleEndian;
+    }
+
+}
diff --git a/plc4j/utils/protocol-test-utils/src/main/java/org/apache/plc4x/protocol/test/model/Testcase.java b/plc4j/utils/protocol-test-utils/src/main/java/org/apache/plc4x/protocol/test/model/Testcase.java
index 8df639bec36..d28f5d729c1 100644
--- a/plc4j/utils/protocol-test-utils/src/main/java/org/apache/plc4x/protocol/test/model/Testcase.java
+++ b/plc4j/utils/protocol-test-utils/src/main/java/org/apache/plc4x/protocol/test/model/Testcase.java
@@ -1,61 +1,61 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.protocol.test.model;
-
-import org.dom4j.Element;
-import org.w3c.dom.Document;
-
-public class Testcase {
-
-    private final String name;
-    private final String description;
-    private final byte[] raw;
-    private final String rootType;
-    private final Element xml;
-
-    public Testcase(String name, String description, byte[] raw, String rootType, Element xml) {
-        this.name = name;
-        this.description = description;
-        this.raw = raw;
-        this.rootType = rootType;
-        this.xml = xml;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public byte[] getRaw() {
-        return raw;
-    }
-
-    public String getRootType() {
-        return rootType;
-    }
-
-    public Element getXml() {
-        return xml;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.protocol.test.model;
+
+import org.dom4j.Element;
+import org.w3c.dom.Document;
+
+public class Testcase {
+
+    private final String name;
+    private final String description;
+    private final byte[] raw;
+    private final String rootType;
+    private final Element xml;
+
+    public Testcase(String name, String description, byte[] raw, String rootType, Element xml) {
+        this.name = name;
+        this.description = description;
+        this.raw = raw;
+        this.rootType = rootType;
+        this.xml = xml;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public byte[] getRaw() {
+        return raw;
+    }
+
+    public String getRootType() {
+        return rootType;
+    }
+
+    public Element getXml() {
+        return xml;
+    }
+
+}
diff --git a/plc4j/utils/protocol-test-utils/src/main/resources/schemas/testsuite.xsd b/plc4j/utils/protocol-test-utils/src/main/resources/schemas/testsuite.xsd
index 58c099b63bc..d167e65762d 100644
--- a/plc4j/utils/protocol-test-utils/src/main/resources/schemas/testsuite.xsd
+++ b/plc4j/utils/protocol-test-utils/src/main/resources/schemas/testsuite.xsd
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<xs:schema targetNamespace="https://plc4x.apache.org/schemas/testsuite.xsd"
-           xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-    <xs:element name="testsuite">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="name" type="xs:string"/>
-                <!--
-                    Each testcase is a set of hexadecimal input and expected output.
-                    A test will parse the binary input and compare the parsed result
-                    with the expected output. If that matches, it serializes the model
-                    back to it's binary representation and then compares the binary
-                    output with the original.
-                -->
-                <xs:element name="testcase" maxOccurs="unbounded">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <!-- The name of the test, as it is output by the test-runner -->
-                            <xs:element name="name" type="xs:string"/>
-                            <!-- Some optional description of what the test should do -->
-                            <xs:element name="description" type="xs:string" minOccurs="0"/>
-                            <!-- A hexadecimal representation of the input to the parser -->
-                            <xs:element name="raw" type="xs:hexBinary"/>
-                            <!-- The root type we should use for serializing and parsing -->
-                            <xs:element name="root-type" type="xs:string"/>
-                            <!-- An Xml serialized representation of the expected model -->
-                            <xs:element name="xml" type="xs:anyType"/>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-            </xs:sequence>
-            <xs:attribute name="bigEndian" type="xs:boolean"/>
-        </xs:complexType>
-    </xs:element>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<xs:schema targetNamespace="https://plc4x.apache.org/schemas/testsuite.xsd"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:element name="testsuite">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="name" type="xs:string"/>
+                <!--
+                    Each testcase is a set of hexadecimal input and expected output.
+                    A test will parse the binary input and compare the parsed result
+                    with the expected output. If that matches, it serializes the model
+                    back to it's binary representation and then compares the binary
+                    output with the original.
+                -->
+                <xs:element name="testcase" maxOccurs="unbounded">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <!-- The name of the test, as it is output by the test-runner -->
+                            <xs:element name="name" type="xs:string"/>
+                            <!-- Some optional description of what the test should do -->
+                            <xs:element name="description" type="xs:string" minOccurs="0"/>
+                            <!-- A hexadecimal representation of the input to the parser -->
+                            <xs:element name="raw" type="xs:hexBinary"/>
+                            <!-- The root type we should use for serializing and parsing -->
+                            <xs:element name="root-type" type="xs:string"/>
+                            <!-- An Xml serialized representation of the expected model -->
+                            <xs:element name="xml" type="xs:anyType"/>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+            <xs:attribute name="bigEndian" type="xs:boolean"/>
+        </xs:complexType>
+    </xs:element>
+
 </xs:schema>
\ No newline at end of file
diff --git a/plc4j/utils/raw-sockets/pom.xml b/plc4j/utils/raw-sockets/pom.xml
index e8318e76f85..805c7dd91f4 100644
--- a/plc4j/utils/raw-sockets/pom.xml
+++ b/plc4j/utils/raw-sockets/pom.xml
@@ -1,101 +1,101 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-utils</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-utils-raw-sockets</artifactId>
-
-  <name>PLC4J: Utils: Raw-Sockets</name>
-  <description>An implementation of a Netty Channel that allows implementing protocols below the TCP and UCP level.</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-buffer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.pcap4j</groupId>
-      <artifactId>pcap4j-core</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.pcap4j</groupId>
-      <artifactId>pcap4j-packetfactory-static</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-utils-test-utils</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <usedDependencies>
-            <usedDependency>org.pcap4j:pcap4j-packetfactory-static</usedDependency>
-          </usedDependencies>
-        </configuration>
-      </plugin>
-
-      <!-- This is currently a work in progress ... skip this till it reaches a slightly more mature state -->
-      <plugin>
-        <groupId>org.sonarsource.scanner.maven</groupId>
-        <artifactId>sonar-maven-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-utils</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-utils-raw-sockets</artifactId>
+
+  <name>PLC4J: Utils: Raw-Sockets</name>
+  <description>An implementation of a Netty Channel that allows implementing protocols below the TCP and UCP level.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.pcap4j</groupId>
+      <artifactId>pcap4j-core</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.pcap4j</groupId>
+      <artifactId>pcap4j-packetfactory-static</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-utils-test-utils</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <usedDependencies>
+            <usedDependency>org.pcap4j:pcap4j-packetfactory-static</usedDependency>
+          </usedDependencies>
+        </configuration>
+      </plugin>
+
+      <!-- This is currently a work in progress ... skip this till it reaches a slightly more mature state -->
+      <plugin>
+        <groupId>org.sonarsource.scanner.maven</groupId>
+        <artifactId>sonar-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/RawSocketException.java b/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/RawSocketException.java
index 5e93f23fe35..a0410793605 100644
--- a/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/RawSocketException.java
+++ b/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/RawSocketException.java
@@ -1,34 +1,34 @@
-/*
- * Copyright 2014 The Netty Project
- *
- * The Netty Project 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:
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.plc4x.java.utils.rawsockets;
-
-public class RawSocketException extends Exception {
-
-    private static final long serialVersionUID = 1L;
-
-    public RawSocketException() {
-        super();
-    }
-
-    public RawSocketException(String message) {
-        super(message);
-    }
-
-    public RawSocketException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-}
+/*
+ * Copyright 2014 The Netty Project
+ *
+ * The Netty Project 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:
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.plc4x.java.utils.rawsockets;
+
+public class RawSocketException extends Exception {
+
+    private static final long serialVersionUID = 1L;
+
+    public RawSocketException() {
+        super();
+    }
+
+    public RawSocketException(String message) {
+        super(message);
+    }
+
+    public RawSocketException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+}
diff --git a/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawEthernetSocket.java b/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawEthernetSocket.java
index d40eaa1b37e..8a838ca5429 100644
--- a/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawEthernetSocket.java
+++ b/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawEthernetSocket.java
@@ -1,150 +1,150 @@
-/*
- * Copyright 2014 The Netty Project
- *
- * The Netty Project 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:
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.plc4x.java.utils.rawsockets.attic;
-
-import org.apache.plc4x.java.utils.rawsockets.RawSocketException;
-import org.pcap4j.core.*;
-import org.pcap4j.packet.*;
-import org.pcap4j.packet.namednumber.*;
-import org.pcap4j.util.LinkLayerAddress;
-import org.pcap4j.util.MacAddress;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.*;
-
-/**
- * The raw ethernet socket relies on a layer 3 IP protocol implementation for finding the
- * Network device able to connect to a given mac address. In Contrast to the {@link RawIpSocket}
- * the Layer 2 protocol does not support gateways and routers, so we don't need the logic
- * for looking up the default gateway, which makes this implementation a lot simpler.
- */
-public class RawEthernetSocket {
-
-    private static final Logger logger = LoggerFactory.getLogger(RawEthernetSocket.class);
-
-    private static final int SNAPLEN = 65536;
-    private static final int READ_TIMEOUT = 10;
-
-    // The EtherType of the protocol we will be communicating in.
-    private final EtherType etherType;
-
-    private PcapNetworkInterface nif;
-    private MacAddress remoteMacAddress;
-    private MacAddress localMacAddress;
-    private ExecutorService pool = Executors.newSingleThreadExecutor();
-    private PcapHandle receiveHandle;
-
-    private final List<RawSocketListener> listeners = new LinkedList<>();
-
-    public RawEthernetSocket(EtherType etherType) {
-        this.etherType = etherType;
-    }
-
-    public void connect(String localMacAddress, String remoteMacAddress) throws RawSocketException {
-        try {
-            pool = Executors.newScheduledThreadPool(2);
-
-            this.localMacAddress = MacAddress.getByName(localMacAddress);
-            this.remoteMacAddress = MacAddress.getByName(remoteMacAddress);
-            // Find out which network device is able to connect to the given mac address.
-            nif = null;
-            for (PcapNetworkInterface dev : Pcaps.findAllDevs()) {
-                if(!dev.isLoopBack()) {
-                    for (LinkLayerAddress macAddress : dev.getLinkLayerAddresses()) {
-                        if(Arrays.equals(macAddress.getAddress(), this.localMacAddress.getAddress())) {
-                            nif = dev;
-                        }
-                    }
-                }
-            }
-            if(nif == null) {
-                throw new RawSocketException(
-                    "Unable to find local network device with mac address " + remoteMacAddress);
-            }
-
-            // Setup receiving of packets and redirecting them to the corresponding listeners.
-            // Filter packets to contain only the ip protocol number of the current protocol.
-            receiveHandle = nif.openLive(SNAPLEN, PcapNetworkInterface.PromiscuousMode.PROMISCUOUS, READ_TIMEOUT);
-
-            // Set the filter.
-            String filterString = "ether proto " + etherType.valueAsString() +
-                " and ether src " + this.remoteMacAddress.toString() +
-                " and ether dst " + this.localMacAddress.toString();
-
-            receiveHandle.setFilter(filterString, BpfProgram.BpfCompileMode.OPTIMIZE);
-            PacketListener packetListener = packet -> {
-                for (RawSocketListener listener : listeners) {
-                    listener.packetReceived(packet.getRawData());
-                }
-            };
-
-            pool.execute(() -> {
-                try {
-                    receiveHandle.loop(-1, packetListener);
-                } catch (PcapNativeException | InterruptedException | NotOpenException e) {
-                    logger.error("Error receiving packet for protocol {} from MAC address {}",
-                        etherType.valueAsString(), remoteMacAddress, e);
-                }
-            });
-        } catch (PcapNativeException | NotOpenException e) {
-            throw new RawSocketException("Error setting up RawSocket", e);
-        }
-    }
-
-    public void disconnect() throws RawSocketException {
-        // TODO: Terminate all the listeners and the thread pool.
-    }
-
-    public void write(byte[] rawData) throws RawSocketException {
-        try (PcapHandle sendHandle =
-                 nif.openLive(SNAPLEN, PcapNetworkInterface.PromiscuousMode.PROMISCUOUS, READ_TIMEOUT)) {
-            UnknownPacket.Builder packetBuilder = new UnknownPacket.Builder();
-            packetBuilder.rawData(rawData);
-
-            EthernetPacket.Builder etherBuilder = new EthernetPacket.Builder();
-            etherBuilder.dstAddr(remoteMacAddress)
-                .srcAddr(localMacAddress)
-                .type(etherType)
-                .paddingAtBuild(true);
-            etherBuilder.payloadBuilder(
-                new AbstractPacket.AbstractBuilder() {
-                    @Override
-                    public Packet build() {
-                        return packetBuilder.build();
-                    }
-                }
-            );
-
-            Packet p = etherBuilder.build();
-            sendHandle.sendPacket(p);
-        } catch (PcapNativeException | NotOpenException e) {
-            throw new RawSocketException("Error sending packet.", e);
-        }
-    }
-
-    public void addListener(RawSocketListener listener) {
-        listeners.add(listener);
-    }
-
-    public void removeListener(RawSocketListener listener) {
-        listeners.remove(listener);
-    }
-
-}
+/*
+ * Copyright 2014 The Netty Project
+ *
+ * The Netty Project 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:
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.plc4x.java.utils.rawsockets.attic;
+
+import org.apache.plc4x.java.utils.rawsockets.RawSocketException;
+import org.pcap4j.core.*;
+import org.pcap4j.packet.*;
+import org.pcap4j.packet.namednumber.*;
+import org.pcap4j.util.LinkLayerAddress;
+import org.pcap4j.util.MacAddress;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.*;
+
+/**
+ * The raw ethernet socket relies on a layer 3 IP protocol implementation for finding the
+ * Network device able to connect to a given mac address. In Contrast to the {@link RawIpSocket}
+ * the Layer 2 protocol does not support gateways and routers, so we don't need the logic
+ * for looking up the default gateway, which makes this implementation a lot simpler.
+ */
+public class RawEthernetSocket {
+
+    private static final Logger logger = LoggerFactory.getLogger(RawEthernetSocket.class);
+
+    private static final int SNAPLEN = 65536;
+    private static final int READ_TIMEOUT = 10;
+
+    // The EtherType of the protocol we will be communicating in.
+    private final EtherType etherType;
+
+    private PcapNetworkInterface nif;
+    private MacAddress remoteMacAddress;
+    private MacAddress localMacAddress;
+    private ExecutorService pool = Executors.newSingleThreadExecutor();
+    private PcapHandle receiveHandle;
+
+    private final List<RawSocketListener> listeners = new LinkedList<>();
+
+    public RawEthernetSocket(EtherType etherType) {
+        this.etherType = etherType;
+    }
+
+    public void connect(String localMacAddress, String remoteMacAddress) throws RawSocketException {
+        try {
+            pool = Executors.newScheduledThreadPool(2);
+
+            this.localMacAddress = MacAddress.getByName(localMacAddress);
+            this.remoteMacAddress = MacAddress.getByName(remoteMacAddress);
+            // Find out which network device is able to connect to the given mac address.
+            nif = null;
+            for (PcapNetworkInterface dev : Pcaps.findAllDevs()) {
+                if(!dev.isLoopBack()) {
+                    for (LinkLayerAddress macAddress : dev.getLinkLayerAddresses()) {
+                        if(Arrays.equals(macAddress.getAddress(), this.localMacAddress.getAddress())) {
+                            nif = dev;
+                        }
+                    }
+                }
+            }
+            if(nif == null) {
+                throw new RawSocketException(
+                    "Unable to find local network device with mac address " + remoteMacAddress);
+            }
+
+            // Setup receiving of packets and redirecting them to the corresponding listeners.
+            // Filter packets to contain only the ip protocol number of the current protocol.
+            receiveHandle = nif.openLive(SNAPLEN, PcapNetworkInterface.PromiscuousMode.PROMISCUOUS, READ_TIMEOUT);
+
+            // Set the filter.
+            String filterString = "ether proto " + etherType.valueAsString() +
+                " and ether src " + this.remoteMacAddress.toString() +
+                " and ether dst " + this.localMacAddress.toString();
+
+            receiveHandle.setFilter(filterString, BpfProgram.BpfCompileMode.OPTIMIZE);
+            PacketListener packetListener = packet -> {
+                for (RawSocketListener listener : listeners) {
+                    listener.packetReceived(packet.getRawData());
+                }
+            };
+
+            pool.execute(() -> {
+                try {
+                    receiveHandle.loop(-1, packetListener);
+                } catch (PcapNativeException | InterruptedException | NotOpenException e) {
+                    logger.error("Error receiving packet for protocol {} from MAC address {}",
+                        etherType.valueAsString(), remoteMacAddress, e);
+                }
+            });
+        } catch (PcapNativeException | NotOpenException e) {
+            throw new RawSocketException("Error setting up RawSocket", e);
+        }
+    }
+
+    public void disconnect() throws RawSocketException {
+        // TODO: Terminate all the listeners and the thread pool.
+    }
+
+    public void write(byte[] rawData) throws RawSocketException {
+        try (PcapHandle sendHandle =
+                 nif.openLive(SNAPLEN, PcapNetworkInterface.PromiscuousMode.PROMISCUOUS, READ_TIMEOUT)) {
+            UnknownPacket.Builder packetBuilder = new UnknownPacket.Builder();
+            packetBuilder.rawData(rawData);
+
+            EthernetPacket.Builder etherBuilder = new EthernetPacket.Builder();
+            etherBuilder.dstAddr(remoteMacAddress)
+                .srcAddr(localMacAddress)
+                .type(etherType)
+                .paddingAtBuild(true);
+            etherBuilder.payloadBuilder(
+                new AbstractPacket.AbstractBuilder() {
+                    @Override
+                    public Packet build() {
+                        return packetBuilder.build();
+                    }
+                }
+            );
+
+            Packet p = etherBuilder.build();
+            sendHandle.sendPacket(p);
+        } catch (PcapNativeException | NotOpenException e) {
+            throw new RawSocketException("Error sending packet.", e);
+        }
+    }
+
+    public void addListener(RawSocketListener listener) {
+        listeners.add(listener);
+    }
+
+    public void removeListener(RawSocketListener listener) {
+        listeners.remove(listener);
+    }
+
+}
diff --git a/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawIpSocket.java b/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawIpSocket.java
index b53efadd19b..2709a563fb4 100644
--- a/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawIpSocket.java
+++ b/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawIpSocket.java
@@ -1,629 +1,629 @@
-/*
- * Copyright 2014 The Netty Project
- *
- * The Netty Project 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:
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.plc4x.java.utils.rawsockets.attic;
-
-import org.apache.commons.lang3.SystemUtils;
-import org.apache.plc4x.java.utils.rawsockets.RawSocketException;
-import org.pcap4j.core.*;
-import org.pcap4j.packet.*;
-import org.pcap4j.packet.namednumber.*;
-import org.pcap4j.util.ByteArrays;
-import org.pcap4j.util.LinkLayerAddress;
-import org.pcap4j.util.MacAddress;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.Inet4Address;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.*;
-import java.util.concurrent.*;
-
-public class RawIpSocket {
-
-    private static final Logger logger = LoggerFactory.getLogger(RawIpSocket.class);
-
-    private static final int SNAPLEN = 65536;
-    private static final int READ_TIMEOUT = 10000;
-
-    private static final String GATEWAY_ONLY_NETMASK = "255.255.255.255";
-
-    private static final Map<InetAddress, MacAddress> arpCache = new HashMap<>();
-
-    // The id of the protocol we will be communicating in.
-    private final int protocolNumber;
-
-    private PcapNetworkInterface nif;
-    private InetAddress remoteIpAddress;
-    private MacAddress firstHopMacAddress;
-    private InetAddress localIpAddress;
-    private MacAddress localMacAddress;
-    private ExecutorService pool = Executors.newSingleThreadExecutor();
-    private PcapHandle receiveHandle;
-
-    private final List<RawSocketListener> listeners = new LinkedList<>();
-
-    public RawIpSocket(int protocolNumber) {
-        this.protocolNumber = protocolNumber;
-    }
-
-    public void connect(String remoteAddress) throws RawSocketException {
-        try {
-            pool = Executors.newScheduledThreadPool(2);
-
-            remoteIpAddress = InetAddress.getByName(remoteAddress);
-
-            // As we have to create the Ethernet packets ourselves, and
-            // in case of non local remote addresses we need to go through
-            // routers and gateways, we need do differentiate between the
-            // next ethernet node and the remote ip address.
-            //
-            // We therefore need to know the following information:
-            // 1. Can we connect to the remote directly (a) or do we
-            //    need a gateway (b)?
-            // 2. The local IP and Mac Address of our device
-            // 3a. The remote IP and Mac address of the target device
-            // 3b. The remote IP of the target device & the Mac address
-            //     of the gateway.
-
-            // Check if we can connect directly to the destination.
-            FirstHop firstHop = getFirstHop(remoteIpAddress);
-            if (firstHop == null) {
-                // If this wouldn't work, try to figure out the default
-                // gateway and use that as next hop.
-                InetAddress defaultGatewayAddress = getDefaultGatewayAddress();
-                if (defaultGatewayAddress != null) {
-                    firstHop = getFirstHop(defaultGatewayAddress);
-                    if (firstHop == null) {
-                        // If this didn't work, we simply can't reach the
-                        // destination and give up with an exception. Not
-                        // much we can do here.
-                        throw new RawSocketException("Unable to connect to " + remoteAddress);
-                    }
-                } else {
-                    throw new RawSocketException("Unable to connect to " + remoteAddress + " no default gateway");
-                }
-            }
-
-            nif = firstHop.networkInterface;
-
-            if (nif.isLoopBack()) {
-                throw new RawSocketException("Can't use RawSocket on loopback devices");
-            }
-
-            localMacAddress = MacAddress.getByAddress(firstHop.localMacAddress.getAddress());
-            localIpAddress = firstHop.localInetAddress;
-
-            firstHopMacAddress = MacAddress.getByAddress(firstHop.remoteMacAddress.getAddress());
-
-            // Setup receiving of packets and redirecting them to the corresponding listeners.
-            // Filter packets to contain only the ip protocol number of the current protocol.
-            receiveHandle = nif.openLive(SNAPLEN, PcapNetworkInterface.PromiscuousMode.PROMISCUOUS, READ_TIMEOUT);
-
-            // Set the filter.
-            String filterString = "ip protochain " + protocolNumber +
-                " and ether dst " + localMacAddress.toString() +
-                " and ip dst " + localIpAddress.getHostAddress() +
-                " and ether src " + firstHopMacAddress.toString() +
-                " and ip src " + remoteIpAddress.getHostAddress();
-
-            receiveHandle.setFilter(filterString, BpfProgram.BpfCompileMode.OPTIMIZE);
-            PacketListener packetListener = packet -> {
-                for (RawSocketListener listener : listeners) {
-                    listener.packetReceived(packet.getRawData());
-                }
-            };
-
-            pool.execute(() -> {
-                try {
-                    receiveHandle.loop(-1, packetListener);
-                } catch (PcapNativeException | InterruptedException | NotOpenException e) {
-                    logger.error("Error receiving packet for protocol {} from MAC address {}",
-                        protocolNumber, firstHopMacAddress, e);
-                }
-            });
-        } catch (PcapNativeException | NotOpenException | UnknownHostException e) {
-            throw new RawSocketException("Error setting up RawSocket", e);
-        }
-    }
-
-    public void disconnect() throws RawSocketException {
-        // TODO: Terminate all the listeners and the thread pool.
-    }
-
-    public void write(byte[] rawData) throws RawSocketException {
-        try (PcapHandle sendHandle =
-                 nif.openLive(SNAPLEN, PcapNetworkInterface.PromiscuousMode.PROMISCUOUS, READ_TIMEOUT)) {
-            UnknownPacket.Builder packetBuilder = new UnknownPacket.Builder();
-            packetBuilder.rawData(rawData);
-
-            IpV4Packet.Builder ipV4Builder = new IpV4Packet.Builder();
-            ipV4Builder
-                .version(IpVersion.IPV4)
-                .tos(IpV4Rfc791Tos.newInstance((byte) 0))
-                .ttl((byte) 100)
-                .protocol(new IpNumber((byte) protocolNumber, "plc4x"))
-                .srcAddr((Inet4Address) localIpAddress)
-                .dstAddr((Inet4Address) remoteIpAddress)
-                .payloadBuilder(packetBuilder)
-                .correctChecksumAtBuild(true)
-                .correctLengthAtBuild(true);
-            ipV4Builder.identification((short) 1);
-
-            EthernetPacket.Builder etherBuilder = new EthernetPacket.Builder();
-            etherBuilder.dstAddr(firstHopMacAddress)
-                .srcAddr(localMacAddress)
-                .type(EtherType.IPV4)
-                .paddingAtBuild(true);
-            etherBuilder.payloadBuilder(
-                new AbstractPacket.AbstractBuilder() {
-                    @Override
-                    public Packet build() {
-                        return ipV4Builder.build();
-                    }
-                }
-            );
-
-            Packet p = etherBuilder.build();
-            sendHandle.sendPacket(p);
-        } catch (PcapNativeException | NotOpenException e) {
-            throw new RawSocketException("Error sending packet.", e);
-        }
-    }
-
-    public void addListener(RawSocketListener listener) {
-        listeners.add(listener);
-    }
-
-    public void removeListener(RawSocketListener listener) {
-        listeners.remove(listener);
-    }
-
-    private MacAddress getMacAddress(PcapNetworkInterface dev, InetAddress localIpAddress, InetAddress remoteIpAddress) throws RawSocketException {
-        if (!arpCache.containsKey(remoteIpAddress)) {
-            MacAddress macAddress = lookupMacAddress(dev, localIpAddress, remoteIpAddress);
-            arpCache.put(remoteIpAddress, macAddress);
-            return macAddress;
-        }
-        return arpCache.get(remoteIpAddress);
-    }
-
-    private MacAddress lookupMacAddress(PcapNetworkInterface dev, InetAddress localIpAddress, InetAddress remoteIpAddress) throws RawSocketException {
-        try {
-            PcapHandle receiveHandle =
-                dev.openLive(SNAPLEN, PcapNetworkInterface.PromiscuousMode.PROMISCUOUS, READ_TIMEOUT);
-            PcapHandle sendHandle =
-                dev.openLive(SNAPLEN, PcapNetworkInterface.PromiscuousMode.PROMISCUOUS, READ_TIMEOUT);
-            try {
-                // Setup the filter to accept only the arp packets sent back to the current
-                // host from the address of the remote host we wanted to get the mac address
-                // from.
-                receiveHandle.setFilter(
-                    "arp and src host " + remoteIpAddress.getHostAddress()
-                        + " and dst host " + localIpAddress.getHostAddress(),
-                    BpfProgram.BpfCompileMode.OPTIMIZE
-                );
-
-                CompletableFuture<MacAddress> resolutionFuture = new CompletableFuture<>();
-                PacketListener listener
-                    = packet -> {
-                    if (packet.contains(ArpPacket.class)) {
-                        ArpPacket arp = packet.get(ArpPacket.class);
-                        if (arp.getHeader().getOperation().equals(ArpOperation.REPLY)) {
-                            resolutionFuture.complete(arp.getHeader().getSrcHardwareAddr());
-                        }
-                    }
-                };
-
-                pool.execute(() -> {
-                    try {
-                        receiveHandle.loop(-1, listener);
-                    } catch (PcapNativeException | NotOpenException e) {
-                        logger.error("Error receiving ARP lookup", e);
-                    } catch (InterruptedException e) {
-                        logger.error("Interrupted! Error receiving ARP lookup", e);
-                        Thread.currentThread().interrupt();
-                    }
-                });
-
-                MacAddress localMacAddress = MacAddress.getByAddress(
-                    dev.getLinkLayerAddresses().iterator().next().getAddress());
-                ArpPacket.Builder arpBuilder = new ArpPacket.Builder();
-                arpBuilder
-                    .hardwareType(ArpHardwareType.ETHERNET)
-                    .protocolType(EtherType.IPV4)
-                    .hardwareAddrLength((byte) MacAddress.SIZE_IN_BYTES)
-                    .protocolAddrLength((byte) ByteArrays.INET4_ADDRESS_SIZE_IN_BYTES)
-                    .operation(ArpOperation.REQUEST)
-                    .srcHardwareAddr(localMacAddress)
-                    .srcProtocolAddr(localIpAddress)
-                    .dstHardwareAddr(MacAddress.ETHER_BROADCAST_ADDRESS)
-                    .dstProtocolAddr(remoteIpAddress);
-
-                EthernetPacket.Builder etherBuilder = new EthernetPacket.Builder();
-                etherBuilder.dstAddr(MacAddress.ETHER_BROADCAST_ADDRESS)
-                    .srcAddr(localMacAddress)
-                    .type(EtherType.ARP)
-                    .payloadBuilder(arpBuilder)
-                    .paddingAtBuild(true);
-
-                Packet p = etherBuilder.build();
-                sendHandle.sendPacket(p);
-                try {
-                    return resolutionFuture.get(3000, TimeUnit.MILLISECONDS);
-                } catch (TimeoutException e) {
-                    logger.info("Couldn't resolve MAC address for ip address {}", remoteIpAddress.getHostAddress(), e);
-                    return null;
-                }
-            } finally {
-                if (sendHandle.isOpen()) {
-                    sendHandle.close();
-                }
-                if (receiveHandle.isOpen()) {
-                    // Terminate the receive loop first.
-                    receiveHandle.breakLoop();
-                    receiveHandle.close();
-                }
-            }
-        } catch (PcapNativeException | InterruptedException | ExecutionException | NotOpenException e) {
-            throw new RawSocketException("Error looking up MAC address for ip address " +
-                remoteIpAddress.getHostAddress() + " on device " + dev.getName(), e);
-        }
-    }
-
-    /**
-     * Iterate through all devices and find the first that would be able to connect to the given address
-     * because it's ip address and subnet mask would allow direct communication.
-     *
-     * @param remoteAddress address we want to connect to.
-     * @return PcapNetworkInterface interface that should be able to connect to the given address.
-     * @throws RawSocketException something went wrong.
-     */
-    private FirstHop getFirstHop(InetAddress remoteAddress) throws RawSocketException {
-        byte[] remoteIp = remoteAddress.getAddress();
-
-        // Iterate over all network interfaces.
-        try {
-            // First try if we can connect to the remote device directly.
-            for (PcapNetworkInterface dev : Pcaps.findAllDevs()) {
-                // Iterate over all addresses configured for this interface.
-                for (PcapAddress localAddress : dev.getAddresses()) {
-                    if(GATEWAY_ONLY_NETMASK.equals(localAddress.getNetmask().getHostAddress())) {
-                        return new FirstHop(dev, localAddress.getAddress(),
-                            dev.getLinkLayerAddresses().iterator().next(),
-                            getMacAddress(dev, localAddress.getAddress(), remoteAddress));
-                    }
-                    // Only check addresses matching the IP-version of the remote address.
-                    if (remoteAddress.getClass().equals(localAddress.getAddress().getClass())) {
-                        byte[] localIp = localAddress.getAddress().getAddress();
-                        byte[] netMask = localAddress.getNetmask().getAddress();
-                        boolean matches = true;
-                        // Iterate over all bytes of the address and see if they match
-                        // after applying the net mask filter.
-                        for (int i = 0; i < localIp.length; i++) {
-                            if ((localIp[i] & netMask[i]) != (remoteIp[i] & netMask[i])) {
-                                matches = false;
-                                break;
-                            }
-                        }
-                        // If the current address would be able to connect to the remote
-                        // address, return this device.
-                        if (matches) {
-                            if (dev.getLinkLayerAddresses().isEmpty()) {
-                                continue;
-                            }
-                            LinkLayerAddress localMacAddress = dev.getLinkLayerAddresses().iterator().next();
-                            return new FirstHop(dev, localAddress.getAddress(),
-                                localMacAddress,
-                                getMacAddress(dev, localAddress.getAddress(), remoteAddress));
-                        }
-                    }
-                }
-            }
-            return null;
-        } catch (PcapNativeException e) {
-            throw new RawSocketException("Error finding a device to communicate with remote address.", e);
-        }
-    }
-
-    /**
-     * Unfortunately there is no way to get the ip address of the default gateway the
-     * system uses to route traffic to remote networks. Luckily the 'netstat' command
-     * is available on all systems and the only difference is the output. So in this
-     * case we fallback to executing this command and parsing it's output depending on
-     * the system it is run on.
-     *
-     * @return InetAddress representing the address of the internet gateway.
-     */
-    @SuppressWarnings("squid:S1313")
-    private InetAddress getDefaultGatewayAddress() {
-        try {
-            Runtime rt = Runtime.getRuntime();
-            String[] commands = {"netstat", "-rn"};
-            Process proc = rt.exec(commands);
-
-            BufferedReader stdInput = new BufferedReader(new InputStreamReader(proc.getInputStream()));
-
-            String linePrefix;
-            int gatewayColumn;
-            if (SystemUtils.IS_OS_WINDOWS) {
-                linePrefix = "0.0.0.0";
-                gatewayColumn = 2;
-            } else if (SystemUtils.IS_OS_MAC_OSX) {
-                linePrefix = "default";
-                gatewayColumn = 1;
-            } else if (SystemUtils.IS_OS_LINUX) {
-                linePrefix = "0.0.0.0";
-                gatewayColumn = 1;
-            } else {
-                return null;
-            }
-
-            String s;
-            while ((s = stdInput.readLine()) != null) {
-                if (s.trim().startsWith(linePrefix)) {
-                    String[] columns = s.trim().split("\\s+");
-                    return InetAddress.getByName(columns[gatewayColumn]);
-                }
-            }
-        } catch (IOException e) {
-            logger.debug("error caught", e);
-            return null;
-        }
-
-        // Command on all platforms: "netstat -rn"
-
-        /* Windows 7: line.trim().startsWith("0.0.0.0")
-
-===========================================================================
-Schnittstellenliste
- 14...00 1c 42 98 16 7d ......Intel(R) PRO/1000 MT-Netzwerkverbindung #2
- 11...00 1c 42 2e f3 40 ......Intel(R) PRO/1000 MT-Netzwerkverbindung
-  1...........................Software Loopback Interface 1
- 13...00 00 00 00 00 00 00 e0 Microsoft-ISATAP-Adapter
- 12...00 00 00 00 00 00 00 e0 Teredo Tunneling Pseudo-Interface
- 15...00 00 00 00 00 00 00 e0 Microsoft-ISATAP-Adapter #2
-===========================================================================
-
-IPv4-Routentabelle
-===========================================================================
-Aktive Routen:
-     Netzwerkziel    Netzwerkmaske          Gateway    Schnittstelle Metrik
-          0.0.0.0          0.0.0.0      10.211.55.1      10.211.55.3     10
-      10.211.55.0    255.255.255.0   Auf Verbindung       10.211.55.3    266
-      10.211.55.3  255.255.255.255   Auf Verbindung       10.211.55.3    266
-    10.211.55.255  255.255.255.255   Auf Verbindung       10.211.55.3    266
-        127.0.0.0        255.0.0.0   Auf Verbindung         127.0.0.1    306
-        127.0.0.1  255.255.255.255   Auf Verbindung         127.0.0.1    306
-  127.255.255.255  255.255.255.255   Auf Verbindung         127.0.0.1    306
-      192.168.0.0      255.255.0.0   Auf Verbindung      192.168.0.43    266
-     192.168.0.43  255.255.255.255   Auf Verbindung      192.168.0.43    266
-  192.168.255.255  255.255.255.255   Auf Verbindung      192.168.0.43    266
-        224.0.0.0        240.0.0.0   Auf Verbindung         127.0.0.1    306
-        224.0.0.0        240.0.0.0   Auf Verbindung       10.211.55.3    266
-        224.0.0.0        240.0.0.0   Auf Verbindung      192.168.0.43    266
-  255.255.255.255  255.255.255.255   Auf Verbindung         127.0.0.1    306
-  255.255.255.255  255.255.255.255   Auf Verbindung       10.211.55.3    266
-  255.255.255.255  255.255.255.255   Auf Verbindung      192.168.0.43    266
-===========================================================================
-StƤndige Routen:
-  Keine
-
-IPv6-Routentabelle
-===========================================================================
-Aktive Routen:
- If Metrik Netzwerkziel             Gateway
- 11    266 ::/0                     fe80::21c:42ff:fe00:18
-  1    306 ::1/128                  Auf Verbindung
- 11     18 fdb2:2c26:f4e4::/64      Auf Verbindung
- 11    266 fdb2:2c26:f4e4:0:24b4:9398:1a69:664/128
-                                    Auf Verbindung
- 11    266 fdb2:2c26:f4e4:0:7147:34d4:e033:a879/128
-                                    Auf Verbindung
- 14     18 fdb2:2c26:f4e4:1::/64    Auf Verbindung
- 14    266 fdb2:2c26:f4e4:1:797d:18a9:3dd6:8105/128
-                                    Auf Verbindung
- 14    266 fdb2:2c26:f4e4:1:bcd1:eeb5:c8c1:cf05/128
-                                    Auf Verbindung
- 11    266 fe80::/64                Auf Verbindung
- 14    266 fe80::/64                Auf Verbindung
- 11    266 fe80::7147:34d4:e033:a879/128
-                                    Auf Verbindung
- 14    266 fe80::797d:18a9:3dd6:8105/128
-                                    Auf Verbindung
-  1    306 ff00::/8                 Auf Verbindung
- 11    266 ff00::/8                 Auf Verbindung
- 14    266 ff00::/8                 Auf Verbindung
-===========================================================================
-StƤndige Routen:
-  Keine
-
-
-        Windows 10
-
-===========================================================================
-Schnittstellenliste
- 14...00 1c 42 98 16 7d ......Intel(R) PRO/1000 MT-Netzwerkverbindung #2
- 11...00 1c 42 2e f3 40 ......Intel(R) PRO/1000 MT-Netzwerkverbindung
-  1...........................Software Loopback Interface 1
- 13...00 00 00 00 00 00 00 e0 Microsoft-ISATAP-Adapter
- 12...00 00 00 00 00 00 00 e0 Teredo Tunneling Pseudo-Interface
- 15...00 00 00 00 00 00 00 e0 Microsoft-ISATAP-Adapter #2
-===========================================================================
-
-IPv4-Routentabelle
-===========================================================================
-Aktive Routen:
-     Netzwerkziel    Netzwerkmaske          Gateway    Schnittstelle Metrik
-          0.0.0.0          0.0.0.0      10.211.55.1      10.211.55.3     10
-      10.211.55.0    255.255.255.0   Auf Verbindung       10.211.55.3    266
-      10.211.55.3  255.255.255.255   Auf Verbindung       10.211.55.3    266
-    10.211.55.255  255.255.255.255   Auf Verbindung       10.211.55.3    266
-        127.0.0.0        255.0.0.0   Auf Verbindung         127.0.0.1    306
-        127.0.0.1  255.255.255.255   Auf Verbindung         127.0.0.1    306
-  127.255.255.255  255.255.255.255   Auf Verbindung         127.0.0.1    306
-      192.168.0.0      255.255.0.0   Auf Verbindung      192.168.0.43    266
-     192.168.0.43  255.255.255.255   Auf Verbindung      192.168.0.43    266
-  192.168.255.255  255.255.255.255   Auf Verbindung      192.168.0.43    266
-        224.0.0.0        240.0.0.0   Auf Verbindung         127.0.0.1    306
-        224.0.0.0        240.0.0.0   Auf Verbindung       10.211.55.3    266
-        224.0.0.0        240.0.0.0   Auf Verbindung      192.168.0.43    266
-  255.255.255.255  255.255.255.255   Auf Verbindung         127.0.0.1    306
-  255.255.255.255  255.255.255.255   Auf Verbindung       10.211.55.3    266
-  255.255.255.255  255.255.255.255   Auf Verbindung      192.168.0.43    266
-===========================================================================
-StƤndige Routen:
-  Keine
-
-IPv6-Routentabelle
-===========================================================================
-Aktive Routen:
- If Metrik Netzwerkziel             Gateway
- 11    266 ::/0                     fe80::21c:42ff:fe00:18
-  1    306 ::1/128                  Auf Verbindung
- 11     18 fdb2:2c26:f4e4::/64      Auf Verbindung
- 11    266 fdb2:2c26:f4e4:0:24b4:9398:1a69:664/128
-                                    Auf Verbindung
- 11    266 fdb2:2c26:f4e4:0:7147:34d4:e033:a879/128
-                                    Auf Verbindung
- 14     18 fdb2:2c26:f4e4:1::/64    Auf Verbindung
- 14    266 fdb2:2c26:f4e4:1:797d:18a9:3dd6:8105/128
-                                    Auf Verbindung
- 14    266 fdb2:2c26:f4e4:1:bcd1:eeb5:c8c1:cf05/128
-                                    Auf Verbindung
- 11    266 fe80::/64                Auf Verbindung
- 14    266 fe80::/64                Auf Verbindung
- 11    266 fe80::7147:34d4:e033:a879/128
-                                    Auf Verbindung
- 14    266 fe80::797d:18a9:3dd6:8105/128
-                                    Auf Verbindung
-  1    306 ff00::/8                 Auf Verbindung
- 11    266 ff00::/8                 Auf Verbindung
- 14    266 ff00::/8                 Auf Verbindung
-===========================================================================
-StƤndige Routen:
-  Keine
-
-
-        Ubuntu: line.trim().startsWith("0.0.0.0")
-
-Kernel IP routing table
-Destination     Gateway         Genmask         Flags   MSS Window  irtt Iface
-0.0.0.0         10.211.55.1     0.0.0.0         UG        0 0          0 enp0s5
-10.211.55.0     0.0.0.0         255.255.255.0   U         0 0          0 enp0s5
-169.254.0.0     0.0.0.0         255.255.0.0     U         0 0          0 enp0s5
-
-        Mac: line.trim().startsWith("default")
-
-Routing tables
-
-Internet:
-Destination        Gateway            Flags        Refs      Use   Netif Expire
-default            10.10.56.1         UGSc          109     1893     en0
-10.10.56/24        link#9             UCS             0        0     en0
-10.10.56.1/32      link#9             UCS             3        0     en0
-10.10.56.1         0:90:7f:a2:7a:a3   UHLWIir        39       16     en0   1188
-10.10.56.8/32      link#9             UCS             1        0     en0
-10.10.56.8         8c:85:90:18:6f:a9  UHLWI           0        5     lo0
-10.37.129/24       link#22            UC              1        0   vnic1
-10.211.55/24       link#21            UC              2        0   vnic0
-10.211.55.3        0:1c:42:2e:f3:40   UHLWIi          1        0   vnic0   1120
-10.211.55.4        0:1c:42:ec:9d:4d   UHLWI           0        0   vnic0   1075
-127                127.0.0.1          UCS             0        0     lo0
-127.0.0.1          127.0.0.1          UH             26   320774     lo0
-169.254            link#9             UCS             1        0     en0
-169.254            link#7             UCSI            0        0     en7
-169.254            link#20            UCSI            1        0     en8
-169.254.233.80/32  link#20            UCS             0        0     en8
-169.254.255.255    link#9             UHLSW           6       30     en0
-192.168.0/16       link#7             UCS             1        0     en7
-192.168.0.99/32    link#7             UCS             1        0     en7
-192.168.42.1       link#7             UHLWIi          1       10     en7
-224.0.0/4          link#9             UmCS            3        0     en0
-224.0.0/4          link#7             UmCSI           1        0     en7
-224.0.0/4          link#20            UmCSI           1        0     en8
-224.0.0.251        1:0:5e:0:0:fb      UHmLWI          0      106     en0
-224.0.0.252        1:0:5e:0:0:fc      UHmLWI          0       32     en0
-239.255.255.250    1:0:5e:7f:ff:fa    UHmLWI          0      124     en7
-239.255.255.250    1:0:5e:7f:ff:fa    UHmLWI          0      682     en0
-239.255.255.250    1:0:5e:7f:ff:fa    UHmLWI          0       64     en8
-255.255.255.255/32 link#9             UCS             0        0     en0
-255.255.255.255/32 link#7             UCSI            0        0     en7
-255.255.255.255/32 link#20            UCSI            0        0     en8
-
-Internet6:
-Destination                             Gateway                         Flags         Netif Expire
-default                                 fe80::%utun0                    UGcI          utun0
-default                                 fe80::%utun1                    UGcI          utun1
-::1                                     ::1                             UHL             lo0
-fe80::%lo0/64                           fe80::1%lo0                     UcI             lo0
-fe80::1%lo0                             link#1                          UHLI            lo0
-fe80::%en7/64                           link#7                          UCI             en7
-fe80::4a8:61b9:6131:3848%en7            48:65:ee:12:d2:c7               UHLI            lo0
-fe80::%en5/64                           link#8                          UCI             en5
-fe80::aede:48ff:fe00:1122%en5           ac:de:48:0:11:22                UHLI            lo0
-fe80::aede:48ff:fe33:4455%en5           ac:de:48:33:44:55               UHLWIi          en5
-fe80::%en0/64                           link#9                          UCI             en0
-fe80::10cf:c2ea:7baa:626b%en0           8c:85:90:18:6f:a9               UHLI            lo0
-fe80::%awdl0/64                         link#11                         UCI           awdl0
-fe80::cbd:62ff:fe3e:406c%awdl0          e:bd:62:3e:40:6c                UHLI            lo0
-fe80::%utun0/64                         fe80::3a17:f866:7728:6e8d%utun0 UcI           utun0
-fe80::3a17:f866:7728:6e8d%utun0         link#17                         UHLI            lo0
-fe80::%utun1/64                         fe80::eb7a:3ecf:562c:167b%utun1 UcI           utun1
-fe80::eb7a:3ecf:562c:167b%utun1         link#18                         UHLI            lo0
-fe80::%en8/64                           link#20                         UCI             en8
-fe80::415:f342:498d:14d2%en8            42:4d:7f:8a:b3:83               UHLI            lo0
-ff01::%lo0/32                           ::1                             UmCI            lo0
-ff01::%en7/32                           link#7                          UmCI            en7
-ff01::%en5/32                           link#8                          UmCI            en5
-ff01::%en0/32                           link#9                          UmCI            en0
-ff01::%awdl0/32                         link#11                         UmCI          awdl0
-ff01::%utun0/32                         fe80::3a17:f866:7728:6e8d%utun0 UmCI          utun0
-ff01::%utun1/32                         fe80::eb7a:3ecf:562c:167b%utun1 UmCI          utun1
-ff01::%en8/32                           link#20                         UmCI            en8
-ff02::%lo0/32                           ::1                             UmCI            lo0
-ff02::%en7/32                           link#7                          UmCI            en7
-ff02::%en5/32                           link#8                          UmCI            en5
-ff02::%en0/32                           link#9                          UmCI            en0
-ff02::%awdl0/32                         link#11                         UmCI          awdl0
-ff02::%utun0/32                         fe80::3a17:f866:7728:6e8d%utun0 UmCI          utun0
-ff02::%utun1/32                         fe80::eb7a:3ecf:562c:167b%utun1 UmCI          utun1
-ff02::%en8/32                           link#20                         UmCI            en8
-
-
-         */
-        return null;
-    }
-
-    private static class FirstHop {
-        private final PcapNetworkInterface networkInterface;
-        private final InetAddress localInetAddress;
-        private final LinkLayerAddress localMacAddress;
-        private final LinkLayerAddress remoteMacAddress;
-
-        private FirstHop(PcapNetworkInterface networkInterface, InetAddress localInetAddress, LinkLayerAddress localMacAddress,
-                         LinkLayerAddress remoteMacAddress) {
-            this.networkInterface = networkInterface;
-            this.localInetAddress = localInetAddress;
-            this.localMacAddress = localMacAddress;
-            this.remoteMacAddress = remoteMacAddress;
-        }
-    }
-
-}
+/*
+ * Copyright 2014 The Netty Project
+ *
+ * The Netty Project 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:
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.plc4x.java.utils.rawsockets.attic;
+
+import org.apache.commons.lang3.SystemUtils;
+import org.apache.plc4x.java.utils.rawsockets.RawSocketException;
+import org.pcap4j.core.*;
+import org.pcap4j.packet.*;
+import org.pcap4j.packet.namednumber.*;
+import org.pcap4j.util.ByteArrays;
+import org.pcap4j.util.LinkLayerAddress;
+import org.pcap4j.util.MacAddress;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.*;
+import java.util.concurrent.*;
+
+public class RawIpSocket {
+
+    private static final Logger logger = LoggerFactory.getLogger(RawIpSocket.class);
+
+    private static final int SNAPLEN = 65536;
+    private static final int READ_TIMEOUT = 10000;
+
+    private static final String GATEWAY_ONLY_NETMASK = "255.255.255.255";
+
+    private static final Map<InetAddress, MacAddress> arpCache = new HashMap<>();
+
+    // The id of the protocol we will be communicating in.
+    private final int protocolNumber;
+
+    private PcapNetworkInterface nif;
+    private InetAddress remoteIpAddress;
+    private MacAddress firstHopMacAddress;
+    private InetAddress localIpAddress;
+    private MacAddress localMacAddress;
+    private ExecutorService pool = Executors.newSingleThreadExecutor();
+    private PcapHandle receiveHandle;
+
+    private final List<RawSocketListener> listeners = new LinkedList<>();
+
+    public RawIpSocket(int protocolNumber) {
+        this.protocolNumber = protocolNumber;
+    }
+
+    public void connect(String remoteAddress) throws RawSocketException {
+        try {
+            pool = Executors.newScheduledThreadPool(2);
+
+            remoteIpAddress = InetAddress.getByName(remoteAddress);
+
+            // As we have to create the Ethernet packets ourselves, and
+            // in case of non local remote addresses we need to go through
+            // routers and gateways, we need do differentiate between the
+            // next ethernet node and the remote ip address.
+            //
+            // We therefore need to know the following information:
+            // 1. Can we connect to the remote directly (a) or do we
+            //    need a gateway (b)?
+            // 2. The local IP and Mac Address of our device
+            // 3a. The remote IP and Mac address of the target device
+            // 3b. The remote IP of the target device & the Mac address
+            //     of the gateway.
+
+            // Check if we can connect directly to the destination.
+            FirstHop firstHop = getFirstHop(remoteIpAddress);
+            if (firstHop == null) {
+                // If this wouldn't work, try to figure out the default
+                // gateway and use that as next hop.
+                InetAddress defaultGatewayAddress = getDefaultGatewayAddress();
+                if (defaultGatewayAddress != null) {
+                    firstHop = getFirstHop(defaultGatewayAddress);
+                    if (firstHop == null) {
+                        // If this didn't work, we simply can't reach the
+                        // destination and give up with an exception. Not
+                        // much we can do here.
+                        throw new RawSocketException("Unable to connect to " + remoteAddress);
+                    }
+                } else {
+                    throw new RawSocketException("Unable to connect to " + remoteAddress + " no default gateway");
+                }
+            }
+
+            nif = firstHop.networkInterface;
+
+            if (nif.isLoopBack()) {
+                throw new RawSocketException("Can't use RawSocket on loopback devices");
+            }
+
+            localMacAddress = MacAddress.getByAddress(firstHop.localMacAddress.getAddress());
+            localIpAddress = firstHop.localInetAddress;
+
+            firstHopMacAddress = MacAddress.getByAddress(firstHop.remoteMacAddress.getAddress());
+
+            // Setup receiving of packets and redirecting them to the corresponding listeners.
+            // Filter packets to contain only the ip protocol number of the current protocol.
+            receiveHandle = nif.openLive(SNAPLEN, PcapNetworkInterface.PromiscuousMode.PROMISCUOUS, READ_TIMEOUT);
+
+            // Set the filter.
+            String filterString = "ip protochain " + protocolNumber +
+                " and ether dst " + localMacAddress.toString() +
+                " and ip dst " + localIpAddress.getHostAddress() +
+                " and ether src " + firstHopMacAddress.toString() +
+                " and ip src " + remoteIpAddress.getHostAddress();
+
+            receiveHandle.setFilter(filterString, BpfProgram.BpfCompileMode.OPTIMIZE);
+            PacketListener packetListener = packet -> {
+                for (RawSocketListener listener : listeners) {
+                    listener.packetReceived(packet.getRawData());
+                }
+            };
+
+            pool.execute(() -> {
+                try {
+                    receiveHandle.loop(-1, packetListener);
+                } catch (PcapNativeException | InterruptedException | NotOpenException e) {
+                    logger.error("Error receiving packet for protocol {} from MAC address {}",
+                        protocolNumber, firstHopMacAddress, e);
+                }
+            });
+        } catch (PcapNativeException | NotOpenException | UnknownHostException e) {
+            throw new RawSocketException("Error setting up RawSocket", e);
+        }
+    }
+
+    public void disconnect() throws RawSocketException {
+        // TODO: Terminate all the listeners and the thread pool.
+    }
+
+    public void write(byte[] rawData) throws RawSocketException {
+        try (PcapHandle sendHandle =
+                 nif.openLive(SNAPLEN, PcapNetworkInterface.PromiscuousMode.PROMISCUOUS, READ_TIMEOUT)) {
+            UnknownPacket.Builder packetBuilder = new UnknownPacket.Builder();
+            packetBuilder.rawData(rawData);
+
+            IpV4Packet.Builder ipV4Builder = new IpV4Packet.Builder();
+            ipV4Builder
+                .version(IpVersion.IPV4)
+                .tos(IpV4Rfc791Tos.newInstance((byte) 0))
+                .ttl((byte) 100)
+                .protocol(new IpNumber((byte) protocolNumber, "plc4x"))
+                .srcAddr((Inet4Address) localIpAddress)
+                .dstAddr((Inet4Address) remoteIpAddress)
+                .payloadBuilder(packetBuilder)
+                .correctChecksumAtBuild(true)
+                .correctLengthAtBuild(true);
+            ipV4Builder.identification((short) 1);
+
+            EthernetPacket.Builder etherBuilder = new EthernetPacket.Builder();
+            etherBuilder.dstAddr(firstHopMacAddress)
+                .srcAddr(localMacAddress)
+                .type(EtherType.IPV4)
+                .paddingAtBuild(true);
+            etherBuilder.payloadBuilder(
+                new AbstractPacket.AbstractBuilder() {
+                    @Override
+                    public Packet build() {
+                        return ipV4Builder.build();
+                    }
+                }
+            );
+
+            Packet p = etherBuilder.build();
+            sendHandle.sendPacket(p);
+        } catch (PcapNativeException | NotOpenException e) {
+            throw new RawSocketException("Error sending packet.", e);
+        }
+    }
+
+    public void addListener(RawSocketListener listener) {
+        listeners.add(listener);
+    }
+
+    public void removeListener(RawSocketListener listener) {
+        listeners.remove(listener);
+    }
+
+    private MacAddress getMacAddress(PcapNetworkInterface dev, InetAddress localIpAddress, InetAddress remoteIpAddress) throws RawSocketException {
+        if (!arpCache.containsKey(remoteIpAddress)) {
+            MacAddress macAddress = lookupMacAddress(dev, localIpAddress, remoteIpAddress);
+            arpCache.put(remoteIpAddress, macAddress);
+            return macAddress;
+        }
+        return arpCache.get(remoteIpAddress);
+    }
+
+    private MacAddress lookupMacAddress(PcapNetworkInterface dev, InetAddress localIpAddress, InetAddress remoteIpAddress) throws RawSocketException {
+        try {
+            PcapHandle receiveHandle =
+                dev.openLive(SNAPLEN, PcapNetworkInterface.PromiscuousMode.PROMISCUOUS, READ_TIMEOUT);
+            PcapHandle sendHandle =
+                dev.openLive(SNAPLEN, PcapNetworkInterface.PromiscuousMode.PROMISCUOUS, READ_TIMEOUT);
+            try {
+                // Setup the filter to accept only the arp packets sent back to the current
+                // host from the address of the remote host we wanted to get the mac address
+                // from.
+                receiveHandle.setFilter(
+                    "arp and src host " + remoteIpAddress.getHostAddress()
+                        + " and dst host " + localIpAddress.getHostAddress(),
+                    BpfProgram.BpfCompileMode.OPTIMIZE
+                );
+
+                CompletableFuture<MacAddress> resolutionFuture = new CompletableFuture<>();
+                PacketListener listener
+                    = packet -> {
+                    if (packet.contains(ArpPacket.class)) {
+                        ArpPacket arp = packet.get(ArpPacket.class);
+                        if (arp.getHeader().getOperation().equals(ArpOperation.REPLY)) {
+                            resolutionFuture.complete(arp.getHeader().getSrcHardwareAddr());
+                        }
+                    }
+                };
+
+                pool.execute(() -> {
+                    try {
+                        receiveHandle.loop(-1, listener);
+                    } catch (PcapNativeException | NotOpenException e) {
+                        logger.error("Error receiving ARP lookup", e);
+                    } catch (InterruptedException e) {
+                        logger.error("Interrupted! Error receiving ARP lookup", e);
+                        Thread.currentThread().interrupt();
+                    }
+                });
+
+                MacAddress localMacAddress = MacAddress.getByAddress(
+                    dev.getLinkLayerAddresses().iterator().next().getAddress());
+                ArpPacket.Builder arpBuilder = new ArpPacket.Builder();
+                arpBuilder
+                    .hardwareType(ArpHardwareType.ETHERNET)
+                    .protocolType(EtherType.IPV4)
+                    .hardwareAddrLength((byte) MacAddress.SIZE_IN_BYTES)
+                    .protocolAddrLength((byte) ByteArrays.INET4_ADDRESS_SIZE_IN_BYTES)
+                    .operation(ArpOperation.REQUEST)
+                    .srcHardwareAddr(localMacAddress)
+                    .srcProtocolAddr(localIpAddress)
+                    .dstHardwareAddr(MacAddress.ETHER_BROADCAST_ADDRESS)
+                    .dstProtocolAddr(remoteIpAddress);
+
+                EthernetPacket.Builder etherBuilder = new EthernetPacket.Builder();
+                etherBuilder.dstAddr(MacAddress.ETHER_BROADCAST_ADDRESS)
+                    .srcAddr(localMacAddress)
+                    .type(EtherType.ARP)
+                    .payloadBuilder(arpBuilder)
+                    .paddingAtBuild(true);
+
+                Packet p = etherBuilder.build();
+                sendHandle.sendPacket(p);
+                try {
+                    return resolutionFuture.get(3000, TimeUnit.MILLISECONDS);
+                } catch (TimeoutException e) {
+                    logger.info("Couldn't resolve MAC address for ip address {}", remoteIpAddress.getHostAddress(), e);
+                    return null;
+                }
+            } finally {
+                if (sendHandle.isOpen()) {
+                    sendHandle.close();
+                }
+                if (receiveHandle.isOpen()) {
+                    // Terminate the receive loop first.
+                    receiveHandle.breakLoop();
+                    receiveHandle.close();
+                }
+            }
+        } catch (PcapNativeException | InterruptedException | ExecutionException | NotOpenException e) {
+            throw new RawSocketException("Error looking up MAC address for ip address " +
+                remoteIpAddress.getHostAddress() + " on device " + dev.getName(), e);
+        }
+    }
+
+    /**
+     * Iterate through all devices and find the first that would be able to connect to the given address
+     * because it's ip address and subnet mask would allow direct communication.
+     *
+     * @param remoteAddress address we want to connect to.
+     * @return PcapNetworkInterface interface that should be able to connect to the given address.
+     * @throws RawSocketException something went wrong.
+     */
+    private FirstHop getFirstHop(InetAddress remoteAddress) throws RawSocketException {
+        byte[] remoteIp = remoteAddress.getAddress();
+
+        // Iterate over all network interfaces.
+        try {
+            // First try if we can connect to the remote device directly.
+            for (PcapNetworkInterface dev : Pcaps.findAllDevs()) {
+                // Iterate over all addresses configured for this interface.
+                for (PcapAddress localAddress : dev.getAddresses()) {
+                    if(GATEWAY_ONLY_NETMASK.equals(localAddress.getNetmask().getHostAddress())) {
+                        return new FirstHop(dev, localAddress.getAddress(),
+                            dev.getLinkLayerAddresses().iterator().next(),
+                            getMacAddress(dev, localAddress.getAddress(), remoteAddress));
+                    }
+                    // Only check addresses matching the IP-version of the remote address.
+                    if (remoteAddress.getClass().equals(localAddress.getAddress().getClass())) {
+                        byte[] localIp = localAddress.getAddress().getAddress();
+                        byte[] netMask = localAddress.getNetmask().getAddress();
+                        boolean matches = true;
+                        // Iterate over all bytes of the address and see if they match
+                        // after applying the net mask filter.
+                        for (int i = 0; i < localIp.length; i++) {
+                            if ((localIp[i] & netMask[i]) != (remoteIp[i] & netMask[i])) {
+                                matches = false;
+                                break;
+                            }
+                        }
+                        // If the current address would be able to connect to the remote
+                        // address, return this device.
+                        if (matches) {
+                            if (dev.getLinkLayerAddresses().isEmpty()) {
+                                continue;
+                            }
+                            LinkLayerAddress localMacAddress = dev.getLinkLayerAddresses().iterator().next();
+                            return new FirstHop(dev, localAddress.getAddress(),
+                                localMacAddress,
+                                getMacAddress(dev, localAddress.getAddress(), remoteAddress));
+                        }
+                    }
+                }
+            }
+            return null;
+        } catch (PcapNativeException e) {
+            throw new RawSocketException("Error finding a device to communicate with remote address.", e);
+        }
+    }
+
+    /**
+     * Unfortunately there is no way to get the ip address of the default gateway the
+     * system uses to route traffic to remote networks. Luckily the 'netstat' command
+     * is available on all systems and the only difference is the output. So in this
+     * case we fallback to executing this command and parsing it's output depending on
+     * the system it is run on.
+     *
+     * @return InetAddress representing the address of the internet gateway.
+     */
+    @SuppressWarnings("squid:S1313")
+    private InetAddress getDefaultGatewayAddress() {
+        try {
+            Runtime rt = Runtime.getRuntime();
+            String[] commands = {"netstat", "-rn"};
+            Process proc = rt.exec(commands);
+
+            BufferedReader stdInput = new BufferedReader(new InputStreamReader(proc.getInputStream()));
+
+            String linePrefix;
+            int gatewayColumn;
+            if (SystemUtils.IS_OS_WINDOWS) {
+                linePrefix = "0.0.0.0";
+                gatewayColumn = 2;
+            } else if (SystemUtils.IS_OS_MAC_OSX) {
+                linePrefix = "default";
+                gatewayColumn = 1;
+            } else if (SystemUtils.IS_OS_LINUX) {
+                linePrefix = "0.0.0.0";
+                gatewayColumn = 1;
+            } else {
+                return null;
+            }
+
+            String s;
+            while ((s = stdInput.readLine()) != null) {
+                if (s.trim().startsWith(linePrefix)) {
+                    String[] columns = s.trim().split("\\s+");
+                    return InetAddress.getByName(columns[gatewayColumn]);
+                }
+            }
+        } catch (IOException e) {
+            logger.debug("error caught", e);
+            return null;
+        }
+
+        // Command on all platforms: "netstat -rn"
+
+        /* Windows 7: line.trim().startsWith("0.0.0.0")
+
+===========================================================================
+Schnittstellenliste
+ 14...00 1c 42 98 16 7d ......Intel(R) PRO/1000 MT-Netzwerkverbindung #2
+ 11...00 1c 42 2e f3 40 ......Intel(R) PRO/1000 MT-Netzwerkverbindung
+  1...........................Software Loopback Interface 1
+ 13...00 00 00 00 00 00 00 e0 Microsoft-ISATAP-Adapter
+ 12...00 00 00 00 00 00 00 e0 Teredo Tunneling Pseudo-Interface
+ 15...00 00 00 00 00 00 00 e0 Microsoft-ISATAP-Adapter #2
+===========================================================================
+
+IPv4-Routentabelle
+===========================================================================
+Aktive Routen:
+     Netzwerkziel    Netzwerkmaske          Gateway    Schnittstelle Metrik
+          0.0.0.0          0.0.0.0      10.211.55.1      10.211.55.3     10
+      10.211.55.0    255.255.255.0   Auf Verbindung       10.211.55.3    266
+      10.211.55.3  255.255.255.255   Auf Verbindung       10.211.55.3    266
+    10.211.55.255  255.255.255.255   Auf Verbindung       10.211.55.3    266
+        127.0.0.0        255.0.0.0   Auf Verbindung         127.0.0.1    306
+        127.0.0.1  255.255.255.255   Auf Verbindung         127.0.0.1    306
+  127.255.255.255  255.255.255.255   Auf Verbindung         127.0.0.1    306
+      192.168.0.0      255.255.0.0   Auf Verbindung      192.168.0.43    266
+     192.168.0.43  255.255.255.255   Auf Verbindung      192.168.0.43    266
+  192.168.255.255  255.255.255.255   Auf Verbindung      192.168.0.43    266
+        224.0.0.0        240.0.0.0   Auf Verbindung         127.0.0.1    306
+        224.0.0.0        240.0.0.0   Auf Verbindung       10.211.55.3    266
+        224.0.0.0        240.0.0.0   Auf Verbindung      192.168.0.43    266
+  255.255.255.255  255.255.255.255   Auf Verbindung         127.0.0.1    306
+  255.255.255.255  255.255.255.255   Auf Verbindung       10.211.55.3    266
+  255.255.255.255  255.255.255.255   Auf Verbindung      192.168.0.43    266
+===========================================================================
+StƤndige Routen:
+  Keine
+
+IPv6-Routentabelle
+===========================================================================
+Aktive Routen:
+ If Metrik Netzwerkziel             Gateway
+ 11    266 ::/0                     fe80::21c:42ff:fe00:18
+  1    306 ::1/128                  Auf Verbindung
+ 11     18 fdb2:2c26:f4e4::/64      Auf Verbindung
+ 11    266 fdb2:2c26:f4e4:0:24b4:9398:1a69:664/128
+                                    Auf Verbindung
+ 11    266 fdb2:2c26:f4e4:0:7147:34d4:e033:a879/128
+                                    Auf Verbindung
+ 14     18 fdb2:2c26:f4e4:1::/64    Auf Verbindung
+ 14    266 fdb2:2c26:f4e4:1:797d:18a9:3dd6:8105/128
+                                    Auf Verbindung
+ 14    266 fdb2:2c26:f4e4:1:bcd1:eeb5:c8c1:cf05/128
+                                    Auf Verbindung
+ 11    266 fe80::/64                Auf Verbindung
+ 14    266 fe80::/64                Auf Verbindung
+ 11    266 fe80::7147:34d4:e033:a879/128
+                                    Auf Verbindung
+ 14    266 fe80::797d:18a9:3dd6:8105/128
+                                    Auf Verbindung
+  1    306 ff00::/8                 Auf Verbindung
+ 11    266 ff00::/8                 Auf Verbindung
+ 14    266 ff00::/8                 Auf Verbindung
+===========================================================================
+StƤndige Routen:
+  Keine
+
+
+        Windows 10
+
+===========================================================================
+Schnittstellenliste
+ 14...00 1c 42 98 16 7d ......Intel(R) PRO/1000 MT-Netzwerkverbindung #2
+ 11...00 1c 42 2e f3 40 ......Intel(R) PRO/1000 MT-Netzwerkverbindung
+  1...........................Software Loopback Interface 1
+ 13...00 00 00 00 00 00 00 e0 Microsoft-ISATAP-Adapter
+ 12...00 00 00 00 00 00 00 e0 Teredo Tunneling Pseudo-Interface
+ 15...00 00 00 00 00 00 00 e0 Microsoft-ISATAP-Adapter #2
+===========================================================================
+
+IPv4-Routentabelle
+===========================================================================
+Aktive Routen:
+     Netzwerkziel    Netzwerkmaske          Gateway    Schnittstelle Metrik
+          0.0.0.0          0.0.0.0      10.211.55.1      10.211.55.3     10
+      10.211.55.0    255.255.255.0   Auf Verbindung       10.211.55.3    266
+      10.211.55.3  255.255.255.255   Auf Verbindung       10.211.55.3    266
+    10.211.55.255  255.255.255.255   Auf Verbindung       10.211.55.3    266
+        127.0.0.0        255.0.0.0   Auf Verbindung         127.0.0.1    306
+        127.0.0.1  255.255.255.255   Auf Verbindung         127.0.0.1    306
+  127.255.255.255  255.255.255.255   Auf Verbindung         127.0.0.1    306
+      192.168.0.0      255.255.0.0   Auf Verbindung      192.168.0.43    266
+     192.168.0.43  255.255.255.255   Auf Verbindung      192.168.0.43    266
+  192.168.255.255  255.255.255.255   Auf Verbindung      192.168.0.43    266
+        224.0.0.0        240.0.0.0   Auf Verbindung         127.0.0.1    306
+        224.0.0.0        240.0.0.0   Auf Verbindung       10.211.55.3    266
+        224.0.0.0        240.0.0.0   Auf Verbindung      192.168.0.43    266
+  255.255.255.255  255.255.255.255   Auf Verbindung         127.0.0.1    306
+  255.255.255.255  255.255.255.255   Auf Verbindung       10.211.55.3    266
+  255.255.255.255  255.255.255.255   Auf Verbindung      192.168.0.43    266
+===========================================================================
+StƤndige Routen:
+  Keine
+
+IPv6-Routentabelle
+===========================================================================
+Aktive Routen:
+ If Metrik Netzwerkziel             Gateway
+ 11    266 ::/0                     fe80::21c:42ff:fe00:18
+  1    306 ::1/128                  Auf Verbindung
+ 11     18 fdb2:2c26:f4e4::/64      Auf Verbindung
+ 11    266 fdb2:2c26:f4e4:0:24b4:9398:1a69:664/128
+                                    Auf Verbindung
+ 11    266 fdb2:2c26:f4e4:0:7147:34d4:e033:a879/128
+                                    Auf Verbindung
+ 14     18 fdb2:2c26:f4e4:1::/64    Auf Verbindung
+ 14    266 fdb2:2c26:f4e4:1:797d:18a9:3dd6:8105/128
+                                    Auf Verbindung
+ 14    266 fdb2:2c26:f4e4:1:bcd1:eeb5:c8c1:cf05/128
+                                    Auf Verbindung
+ 11    266 fe80::/64                Auf Verbindung
+ 14    266 fe80::/64                Auf Verbindung
+ 11    266 fe80::7147:34d4:e033:a879/128
+                                    Auf Verbindung
+ 14    266 fe80::797d:18a9:3dd6:8105/128
+                                    Auf Verbindung
+  1    306 ff00::/8                 Auf Verbindung
+ 11    266 ff00::/8                 Auf Verbindung
+ 14    266 ff00::/8                 Auf Verbindung
+===========================================================================
+StƤndige Routen:
+  Keine
+
+
+        Ubuntu: line.trim().startsWith("0.0.0.0")
+
+Kernel IP routing table
+Destination     Gateway         Genmask         Flags   MSS Window  irtt Iface
+0.0.0.0         10.211.55.1     0.0.0.0         UG        0 0          0 enp0s5
+10.211.55.0     0.0.0.0         255.255.255.0   U         0 0          0 enp0s5
+169.254.0.0     0.0.0.0         255.255.0.0     U         0 0          0 enp0s5
+
+        Mac: line.trim().startsWith("default")
+
+Routing tables
+
+Internet:
+Destination        Gateway            Flags        Refs      Use   Netif Expire
+default            10.10.56.1         UGSc          109     1893     en0
+10.10.56/24        link#9             UCS             0        0     en0
+10.10.56.1/32      link#9             UCS             3        0     en0
+10.10.56.1         0:90:7f:a2:7a:a3   UHLWIir        39       16     en0   1188
+10.10.56.8/32      link#9             UCS             1        0     en0
+10.10.56.8         8c:85:90:18:6f:a9  UHLWI           0        5     lo0
+10.37.129/24       link#22            UC              1        0   vnic1
+10.211.55/24       link#21            UC              2        0   vnic0
+10.211.55.3        0:1c:42:2e:f3:40   UHLWIi          1        0   vnic0   1120
+10.211.55.4        0:1c:42:ec:9d:4d   UHLWI           0        0   vnic0   1075
+127                127.0.0.1          UCS             0        0     lo0
+127.0.0.1          127.0.0.1          UH             26   320774     lo0
+169.254            link#9             UCS             1        0     en0
+169.254            link#7             UCSI            0        0     en7
+169.254            link#20            UCSI            1        0     en8
+169.254.233.80/32  link#20            UCS             0        0     en8
+169.254.255.255    link#9             UHLSW           6       30     en0
+192.168.0/16       link#7             UCS             1        0     en7
+192.168.0.99/32    link#7             UCS             1        0     en7
+192.168.42.1       link#7             UHLWIi          1       10     en7
+224.0.0/4          link#9             UmCS            3        0     en0
+224.0.0/4          link#7             UmCSI           1        0     en7
+224.0.0/4          link#20            UmCSI           1        0     en8
+224.0.0.251        1:0:5e:0:0:fb      UHmLWI          0      106     en0
+224.0.0.252        1:0:5e:0:0:fc      UHmLWI          0       32     en0
+239.255.255.250    1:0:5e:7f:ff:fa    UHmLWI          0      124     en7
+239.255.255.250    1:0:5e:7f:ff:fa    UHmLWI          0      682     en0
+239.255.255.250    1:0:5e:7f:ff:fa    UHmLWI          0       64     en8
+255.255.255.255/32 link#9             UCS             0        0     en0
+255.255.255.255/32 link#7             UCSI            0        0     en7
+255.255.255.255/32 link#20            UCSI            0        0     en8
+
+Internet6:
+Destination                             Gateway                         Flags         Netif Expire
+default                                 fe80::%utun0                    UGcI          utun0
+default                                 fe80::%utun1                    UGcI          utun1
+::1                                     ::1                             UHL             lo0
+fe80::%lo0/64                           fe80::1%lo0                     UcI             lo0
+fe80::1%lo0                             link#1                          UHLI            lo0
+fe80::%en7/64                           link#7                          UCI             en7
+fe80::4a8:61b9:6131:3848%en7            48:65:ee:12:d2:c7               UHLI            lo0
+fe80::%en5/64                           link#8                          UCI             en5
+fe80::aede:48ff:fe00:1122%en5           ac:de:48:0:11:22                UHLI            lo0
+fe80::aede:48ff:fe33:4455%en5           ac:de:48:33:44:55               UHLWIi          en5
+fe80::%en0/64                           link#9                          UCI             en0
+fe80::10cf:c2ea:7baa:626b%en0           8c:85:90:18:6f:a9               UHLI            lo0
+fe80::%awdl0/64                         link#11                         UCI           awdl0
+fe80::cbd:62ff:fe3e:406c%awdl0          e:bd:62:3e:40:6c                UHLI            lo0
+fe80::%utun0/64                         fe80::3a17:f866:7728:6e8d%utun0 UcI           utun0
+fe80::3a17:f866:7728:6e8d%utun0         link#17                         UHLI            lo0
+fe80::%utun1/64                         fe80::eb7a:3ecf:562c:167b%utun1 UcI           utun1
+fe80::eb7a:3ecf:562c:167b%utun1         link#18                         UHLI            lo0
+fe80::%en8/64                           link#20                         UCI             en8
+fe80::415:f342:498d:14d2%en8            42:4d:7f:8a:b3:83               UHLI            lo0
+ff01::%lo0/32                           ::1                             UmCI            lo0
+ff01::%en7/32                           link#7                          UmCI            en7
+ff01::%en5/32                           link#8                          UmCI            en5
+ff01::%en0/32                           link#9                          UmCI            en0
+ff01::%awdl0/32                         link#11                         UmCI          awdl0
+ff01::%utun0/32                         fe80::3a17:f866:7728:6e8d%utun0 UmCI          utun0
+ff01::%utun1/32                         fe80::eb7a:3ecf:562c:167b%utun1 UmCI          utun1
+ff01::%en8/32                           link#20                         UmCI            en8
+ff02::%lo0/32                           ::1                             UmCI            lo0
+ff02::%en7/32                           link#7                          UmCI            en7
+ff02::%en5/32                           link#8                          UmCI            en5
+ff02::%en0/32                           link#9                          UmCI            en0
+ff02::%awdl0/32                         link#11                         UmCI          awdl0
+ff02::%utun0/32                         fe80::3a17:f866:7728:6e8d%utun0 UmCI          utun0
+ff02::%utun1/32                         fe80::eb7a:3ecf:562c:167b%utun1 UmCI          utun1
+ff02::%en8/32                           link#20                         UmCI            en8
+
+
+         */
+        return null;
+    }
+
+    private static class FirstHop {
+        private final PcapNetworkInterface networkInterface;
+        private final InetAddress localInetAddress;
+        private final LinkLayerAddress localMacAddress;
+        private final LinkLayerAddress remoteMacAddress;
+
+        private FirstHop(PcapNetworkInterface networkInterface, InetAddress localInetAddress, LinkLayerAddress localMacAddress,
+                         LinkLayerAddress remoteMacAddress) {
+            this.networkInterface = networkInterface;
+            this.localInetAddress = localInetAddress;
+            this.localMacAddress = localMacAddress;
+            this.remoteMacAddress = remoteMacAddress;
+        }
+    }
+
+}
diff --git a/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawSocketListener.java b/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawSocketListener.java
index ffad78e06cb..1262042e5ce 100644
--- a/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawSocketListener.java
+++ b/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawSocketListener.java
@@ -1,22 +1,22 @@
-/*
- * Copyright 2014 The Netty Project
- *
- * The Netty Project 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:
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.plc4x.java.utils.rawsockets.attic;
-
-public interface RawSocketListener {
-
-    void packetReceived(byte[] rawData);
-
-}
+/*
+ * Copyright 2014 The Netty Project
+ *
+ * The Netty Project 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:
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.plc4x.java.utils.rawsockets.attic;
+
+public interface RawSocketListener {
+
+    void packetReceived(byte[] rawData);
+
+}
diff --git a/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/PacketHandler.java b/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/PacketHandler.java
index 6afcc3a10b0..e56c0fea956 100644
--- a/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/PacketHandler.java
+++ b/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/PacketHandler.java
@@ -1,27 +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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.utils.rawsockets.netty;
-
-import org.pcap4j.packet.Packet;
-
-public interface PacketHandler {
-
-    byte[] getData(Packet packet);
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.utils.rawsockets.netty;
+
+import org.pcap4j.packet.Packet;
+
+public interface PacketHandler {
+
+    byte[] getData(Packet packet);
+
+}
diff --git a/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketAddress.java b/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketAddress.java
index ceb85f5798e..dfe8c7b5361 100644
--- a/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketAddress.java
+++ b/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketAddress.java
@@ -1,45 +1,45 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.utils.rawsockets.netty;
-
-import java.net.SocketAddress;
-
-public class RawSocketAddress extends SocketAddress {
-    private static final long serialVersionUID = 1L;
-
-    public static final int ALL_PROTOCOLS = -1;
-
-    private final String deviceName;
-
-    private final int protocolId;
-
-    public RawSocketAddress(String deviceName, int protocolId) {
-        this.deviceName = deviceName;
-        this.protocolId = protocolId;
-    }
-
-    public String getDeviceName() {
-        return deviceName;
-    }
-
-    public int getProtocolId() {
-        return protocolId;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.utils.rawsockets.netty;
+
+import java.net.SocketAddress;
+
+public class RawSocketAddress extends SocketAddress {
+    private static final long serialVersionUID = 1L;
+
+    public static final int ALL_PROTOCOLS = -1;
+
+    private final String deviceName;
+
+    private final int protocolId;
+
+    public RawSocketAddress(String deviceName, int protocolId) {
+        this.deviceName = deviceName;
+        this.protocolId = protocolId;
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public int getProtocolId() {
+        return protocolId;
+    }
+
+}
diff --git a/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannel.java b/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannel.java
index a83cb968e63..b650d554078 100644
--- a/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannel.java
+++ b/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannel.java
@@ -1,281 +1,281 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.utils.rawsockets.netty;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelConfig;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelPromise;
-import io.netty.channel.oio.OioByteStreamChannel;
-import org.apache.commons.lang3.NotImplementedException;
-import org.apache.plc4x.java.utils.rawsockets.RawSocketException;
-import org.pcap4j.core.*;
-import org.pcap4j.packet.Packet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.SocketAddress;
-import java.net.SocketTimeoutException;
-
-/**
- * TODO write comment
- *
- * @author julian
- * Created by julian on 2019-08-16
- */
-public class RawSocketChannel extends OioByteStreamChannel {
-
-    private static final Logger logger = LoggerFactory.getLogger(RawSocketChannel.class);
-
-    private final RawSocketChannelConfig config;
-
-    private RawSocketAddress remoteRawSocketAddress;
-    private SocketAddress localAddress;
-    private PcapHandle handle;
-    private Thread loopThread;
-
-    public RawSocketChannel() {
-        super(null);
-        config = new RawSocketChannelConfig(this);
-    }
-
-    @Override
-    protected boolean isInputShutdown() {
-        return false;
-    }
-
-    @Override
-    protected ChannelFuture shutdownInput() {
-        throw new NotImplementedException("");
-    }
-
-    @Override
-    protected void doConnect(SocketAddress remoteAddress, SocketAddress localAddress) throws Exception {
-        if(!(remoteAddress instanceof RawSocketAddress)) {
-            logger.error("Expecting remote address of type RawSocketAddress");
-            pipeline().fireExceptionCaught(
-                new RawSocketException("Expecting remote address of type RawSocketAddress"));
-            return;
-        }
-        this.localAddress = localAddress;
-        remoteRawSocketAddress = (RawSocketAddress) remoteAddress;
-
-        // Try to get the device name of the network interface that we want to open.
-        String deviceName = getDeviceName(remoteRawSocketAddress);
-        if(deviceName == null) {
-            logger.error("Network device not specified and coudln't detect it automatically");
-            pipeline().fireExceptionCaught(
-                new RawSocketException("Network device not specified and coudln't detect it automatically"));
-            return;
-        }
-
-        // Get a handle to the network-device and open it.
-        PcapNetworkInterface nif = Pcaps.getDevByName(deviceName);
-        handle = nif.openLive(65535, PcapNetworkInterface.PromiscuousMode.PROMISCUOUS, 10);
-        if(logger.isDebugEnabled()) {
-            logger.debug(String.format("Listening on device %s", deviceName));
-        }
-
-        // If the address allows fine tuning which packets to process, set a filter to reduce the load.
-        String filter = getFilter(remoteRawSocketAddress);
-        if(filter.length() > 0) {
-            handle.setFilter(filter, BpfProgram.BpfCompileMode.OPTIMIZE);
-        }
-
-        // Create a buffer where the raw socket worker can send data to.
-        ByteBuf buffer = Unpooled.buffer();
-
-        // Start a thread that processes the callbacks from the raw socket and simply
-        // forwards the bytes read to the buffer.
-        loopThread = new Thread(() -> {
-            try {
-                handle.loop(-1, new PacketListener() {
-                    @Override
-                    public void gotPacket(Packet packet) {
-                        buffer.writeBytes(config.getPacketHandler().getData(packet));
-                    }
-                });
-            } catch (PcapNativeException | NotOpenException e) {
-                // TODO this should close everything automatically
-                logger.error("Pcap4j loop thread died!", e);
-                pipeline().fireExceptionCaught(e);
-            } catch (InterruptedException e) {
-                logger.warn("PCAP Loop Thread was interrupted (hopefully intentionally)", e);
-                Thread.currentThread().interrupt();
-            }
-        });
-        loopThread.start();
-
-        // Right now we're using an output stream that simply discards everything.
-        // This is ok while implementing passive drivers for protocols, however as
-        // soon as we start implementing ethernet layer protocols, we'll have to also
-        // be able to actually send data. The PcapInputStream simply acts as a
-        // breaking point if no packets are coming in and the read operation would
-        // simply block indefinitely.
-        activate(new PcapInputStream(buffer), new DiscardingOutputStream());
-    }
-
-    @Override
-    protected SocketAddress localAddress0() {
-        return localAddress;
-    }
-
-    @Override
-    protected SocketAddress remoteAddress0() {
-        return remoteRawSocketAddress;
-    }
-
-    @Override
-    protected void doBind(SocketAddress localAddress) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    protected void doDisconnect() {
-        this.loopThread.interrupt();
-        if (this.handle != null) {
-            this.handle.close();
-        }
-    }
-
-    @Override protected int doReadBytes(ByteBuf buf) throws Exception {
-        if (handle == null || !handle.isOpen()) {
-            return -1;
-        }
-        try {
-            return super.doReadBytes(buf);
-        } catch (SocketTimeoutException ignored) {
-            return 0;
-        }
-    }
-
-    @Override
-    public ChannelConfig config() {
-        return this.config;
-    }
-
-    @Override
-    public boolean isOpen() {
-        return true;
-    }
-
-    @Override
-    protected AbstractUnsafe newUnsafe() {
-        return new RawSocketUnsafe();
-    }
-
-    private String getDeviceName(RawSocketAddress rawSocketAddress) {
-        // If the device name is provided, simply use this.
-        if(rawSocketAddress.getDeviceName() != null) {
-            return rawSocketAddress.getDeviceName();
-        }
-
-        // TODO: Implement this ...
-        return null;
-    }
-
-    private String getFilter(RawSocketAddress rawSocketAddress) {
-        StringBuilder sb = new StringBuilder();
-        if(rawSocketAddress instanceof RawSocketIpAddress) {
-            sb.append("(ether proto \\ip)");
-            RawSocketIpAddress rawSocketIpAddress = (RawSocketIpAddress) rawSocketAddress;
-            // Add a filter for source or target address.
-            if(rawSocketIpAddress.getAddress() != null) {
-                sb.append(" and (host ").append(rawSocketIpAddress.getAddress().getHostAddress()).append(")");
-            }
-            // Add a filter for TCP or UDP port.
-            if(rawSocketIpAddress.getPort() != RawSocketIpAddress.ALL_PORTS) {
-                sb.append(" and (port ").append(rawSocketIpAddress.getPort()).append(")");
-            }
-        } else if(rawSocketAddress.getProtocolId() != RawSocketAddress.ALL_PROTOCOLS) {
-            sb.append("(ether proto ").append(rawSocketAddress.getProtocolId()).append(")");
-        }
-        return sb.toString();
-    }
-
-    /**
-     * This output stream simply discards anything it should send.
-     */
-    private static class DiscardingOutputStream extends OutputStream {
-        @Override
-        public void write(int b) throws IOException {
-            // discard
-            logger.debug("Discarding {}", b);
-        }
-
-        @Override
-        public void write(byte[] b, int off, int len) {
-            logger.debug("Discarding {}", b);
-        }
-    }
-
-    /**
-     * InputStream that fulfills the contract of Netty for read operations to timeout.
-     * Without this the InputStream would simply block indefinitely which would block
-     * the entire IO module.
-     */
-    private static class PcapInputStream extends InputStream {
-        final ByteBuf buf;
-
-        private PcapInputStream(ByteBuf buf) {
-            this.buf = buf;
-        }
-
-        @Override
-        public int available() {
-            return buf.readableBytes();
-        }
-
-        @Override
-        public int read() throws IOException {
-            // Timeout 10 ms
-            final long timeout = System.nanoTime() + 10_000;
-            // Yes, this could make the thread go nuts in case of no data,
-            // but the Netty guys are doing it the same way and there probably
-            // is a reason for it ;-)
-            while (System.nanoTime() < timeout) {
-                if (buf.readableBytes() > 0) {
-                    return buf.readByte() & 0xFF;
-                }
-            }
-            throw new SocketTimeoutException();
-        }
-    }
-
-    /**
-     * Internal helper to wrap access to unsafe operations (Only used internally by netty)
-     */
-    private class RawSocketUnsafe extends AbstractUnsafe {
-        @Override
-        public void connect(SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise) {
-            try {
-                doConnect(remoteAddress, localAddress);
-                pipeline().fireChannelActive();
-                promise.setSuccess();
-            } catch (Exception e) {
-                promise.setFailure(e);
-            }
-        }
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.utils.rawsockets.netty;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.oio.OioByteStreamChannel;
+import org.apache.commons.lang3.NotImplementedException;
+import org.apache.plc4x.java.utils.rawsockets.RawSocketException;
+import org.pcap4j.core.*;
+import org.pcap4j.packet.Packet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.SocketAddress;
+import java.net.SocketTimeoutException;
+
+/**
+ * TODO write comment
+ *
+ * @author julian
+ * Created by julian on 2019-08-16
+ */
+public class RawSocketChannel extends OioByteStreamChannel {
+
+    private static final Logger logger = LoggerFactory.getLogger(RawSocketChannel.class);
+
+    private final RawSocketChannelConfig config;
+
+    private RawSocketAddress remoteRawSocketAddress;
+    private SocketAddress localAddress;
+    private PcapHandle handle;
+    private Thread loopThread;
+
+    public RawSocketChannel() {
+        super(null);
+        config = new RawSocketChannelConfig(this);
+    }
+
+    @Override
+    protected boolean isInputShutdown() {
+        return false;
+    }
+
+    @Override
+    protected ChannelFuture shutdownInput() {
+        throw new NotImplementedException("");
+    }
+
+    @Override
+    protected void doConnect(SocketAddress remoteAddress, SocketAddress localAddress) throws Exception {
+        if(!(remoteAddress instanceof RawSocketAddress)) {
+            logger.error("Expecting remote address of type RawSocketAddress");
+            pipeline().fireExceptionCaught(
+                new RawSocketException("Expecting remote address of type RawSocketAddress"));
+            return;
+        }
+        this.localAddress = localAddress;
+        remoteRawSocketAddress = (RawSocketAddress) remoteAddress;
+
+        // Try to get the device name of the network interface that we want to open.
+        String deviceName = getDeviceName(remoteRawSocketAddress);
+        if(deviceName == null) {
+            logger.error("Network device not specified and coudln't detect it automatically");
+            pipeline().fireExceptionCaught(
+                new RawSocketException("Network device not specified and coudln't detect it automatically"));
+            return;
+        }
+
+        // Get a handle to the network-device and open it.
+        PcapNetworkInterface nif = Pcaps.getDevByName(deviceName);
+        handle = nif.openLive(65535, PcapNetworkInterface.PromiscuousMode.PROMISCUOUS, 10);
+        if(logger.isDebugEnabled()) {
+            logger.debug(String.format("Listening on device %s", deviceName));
+        }
+
+        // If the address allows fine tuning which packets to process, set a filter to reduce the load.
+        String filter = getFilter(remoteRawSocketAddress);
+        if(filter.length() > 0) {
+            handle.setFilter(filter, BpfProgram.BpfCompileMode.OPTIMIZE);
+        }
+
+        // Create a buffer where the raw socket worker can send data to.
+        ByteBuf buffer = Unpooled.buffer();
+
+        // Start a thread that processes the callbacks from the raw socket and simply
+        // forwards the bytes read to the buffer.
+        loopThread = new Thread(() -> {
+            try {
+                handle.loop(-1, new PacketListener() {
+                    @Override
+                    public void gotPacket(Packet packet) {
+                        buffer.writeBytes(config.getPacketHandler().getData(packet));
+                    }
+                });
+            } catch (PcapNativeException | NotOpenException e) {
+                // TODO this should close everything automatically
+                logger.error("Pcap4j loop thread died!", e);
+                pipeline().fireExceptionCaught(e);
+            } catch (InterruptedException e) {
+                logger.warn("PCAP Loop Thread was interrupted (hopefully intentionally)", e);
+                Thread.currentThread().interrupt();
+            }
+        });
+        loopThread.start();
+
+        // Right now we're using an output stream that simply discards everything.
+        // This is ok while implementing passive drivers for protocols, however as
+        // soon as we start implementing ethernet layer protocols, we'll have to also
+        // be able to actually send data. The PcapInputStream simply acts as a
+        // breaking point if no packets are coming in and the read operation would
+        // simply block indefinitely.
+        activate(new PcapInputStream(buffer), new DiscardingOutputStream());
+    }
+
+    @Override
+    protected SocketAddress localAddress0() {
+        return localAddress;
+    }
+
+    @Override
+    protected SocketAddress remoteAddress0() {
+        return remoteRawSocketAddress;
+    }
+
+    @Override
+    protected void doBind(SocketAddress localAddress) {
+        throw new UnsupportedOperationException("Not implemented");
+    }
+
+    @Override
+    protected void doDisconnect() {
+        this.loopThread.interrupt();
+        if (this.handle != null) {
+            this.handle.close();
+        }
+    }
+
+    @Override protected int doReadBytes(ByteBuf buf) throws Exception {
+        if (handle == null || !handle.isOpen()) {
+            return -1;
+        }
+        try {
+            return super.doReadBytes(buf);
+        } catch (SocketTimeoutException ignored) {
+            return 0;
+        }
+    }
+
+    @Override
+    public ChannelConfig config() {
+        return this.config;
+    }
+
+    @Override
+    public boolean isOpen() {
+        return true;
+    }
+
+    @Override
+    protected AbstractUnsafe newUnsafe() {
+        return new RawSocketUnsafe();
+    }
+
+    private String getDeviceName(RawSocketAddress rawSocketAddress) {
+        // If the device name is provided, simply use this.
+        if(rawSocketAddress.getDeviceName() != null) {
+            return rawSocketAddress.getDeviceName();
+        }
+
+        // TODO: Implement this ...
+        return null;
+    }
+
+    private String getFilter(RawSocketAddress rawSocketAddress) {
+        StringBuilder sb = new StringBuilder();
+        if(rawSocketAddress instanceof RawSocketIpAddress) {
+            sb.append("(ether proto \\ip)");
+            RawSocketIpAddress rawSocketIpAddress = (RawSocketIpAddress) rawSocketAddress;
+            // Add a filter for source or target address.
+            if(rawSocketIpAddress.getAddress() != null) {
+                sb.append(" and (host ").append(rawSocketIpAddress.getAddress().getHostAddress()).append(")");
+            }
+            // Add a filter for TCP or UDP port.
+            if(rawSocketIpAddress.getPort() != RawSocketIpAddress.ALL_PORTS) {
+                sb.append(" and (port ").append(rawSocketIpAddress.getPort()).append(")");
+            }
+        } else if(rawSocketAddress.getProtocolId() != RawSocketAddress.ALL_PROTOCOLS) {
+            sb.append("(ether proto ").append(rawSocketAddress.getProtocolId()).append(")");
+        }
+        return sb.toString();
+    }
+
+    /**
+     * This output stream simply discards anything it should send.
+     */
+    private static class DiscardingOutputStream extends OutputStream {
+        @Override
+        public void write(int b) throws IOException {
+            // discard
+            logger.debug("Discarding {}", b);
+        }
+
+        @Override
+        public void write(byte[] b, int off, int len) {
+            logger.debug("Discarding {}", b);
+        }
+    }
+
+    /**
+     * InputStream that fulfills the contract of Netty for read operations to timeout.
+     * Without this the InputStream would simply block indefinitely which would block
+     * the entire IO module.
+     */
+    private static class PcapInputStream extends InputStream {
+        final ByteBuf buf;
+
+        private PcapInputStream(ByteBuf buf) {
+            this.buf = buf;
+        }
+
+        @Override
+        public int available() {
+            return buf.readableBytes();
+        }
+
+        @Override
+        public int read() throws IOException {
+            // Timeout 10 ms
+            final long timeout = System.nanoTime() + 10_000;
+            // Yes, this could make the thread go nuts in case of no data,
+            // but the Netty guys are doing it the same way and there probably
+            // is a reason for it ;-)
+            while (System.nanoTime() < timeout) {
+                if (buf.readableBytes() > 0) {
+                    return buf.readByte() & 0xFF;
+                }
+            }
+            throw new SocketTimeoutException();
+        }
+    }
+
+    /**
+     * Internal helper to wrap access to unsafe operations (Only used internally by netty)
+     */
+    private class RawSocketUnsafe extends AbstractUnsafe {
+        @Override
+        public void connect(SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise) {
+            try {
+                doConnect(remoteAddress, localAddress);
+                pipeline().fireChannelActive();
+                promise.setSuccess();
+            } catch (Exception e) {
+                promise.setFailure(e);
+            }
+        }
+    }
+}
diff --git a/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannelConfig.java b/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannelConfig.java
index 8b2b4013b6d..6df49737eaa 100644
--- a/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannelConfig.java
+++ b/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannelConfig.java
@@ -1,66 +1,66 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.utils.rawsockets.netty;
-
-import io.netty.channel.*;
-import org.pcap4j.packet.Packet;
-
-import java.util.Map;
-
-public class RawSocketChannelConfig extends DefaultChannelConfig implements ChannelConfig {
-
-    private PacketHandler packetHandler;
-
-    public RawSocketChannelConfig(Channel channel) {
-        super(channel);
-        packetHandler = new PacketHandler() {
-            @Override
-            public byte[] getData(Packet packet) {
-                return packet.getRawData();
-            }
-        };
-    }
-
-    @Override
-    public Map<ChannelOption<?>, Object> getOptions() {
-        return getOptions(super.getOptions(), RawSocketChannelOption.PACKET_HANDLER);
-    }
-
-    @Override
-    public <T> boolean setOption(ChannelOption<T> option, T value) {
-        if(option == RawSocketChannelOption.PACKET_HANDLER) {
-            if(value instanceof PacketHandler) {
-                packetHandler = (PacketHandler) value;
-                return true;
-            }
-            return false;
-        } else {
-            return super.setOption(option, value);
-        }
-    }
-
-    public void setPacketHandler(PacketHandler packetHandler) {
-        this.packetHandler = packetHandler;
-    }
-
-    public PacketHandler getPacketHandler() {
-        return packetHandler;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.utils.rawsockets.netty;
+
+import io.netty.channel.*;
+import org.pcap4j.packet.Packet;
+
+import java.util.Map;
+
+public class RawSocketChannelConfig extends DefaultChannelConfig implements ChannelConfig {
+
+    private PacketHandler packetHandler;
+
+    public RawSocketChannelConfig(Channel channel) {
+        super(channel);
+        packetHandler = new PacketHandler() {
+            @Override
+            public byte[] getData(Packet packet) {
+                return packet.getRawData();
+            }
+        };
+    }
+
+    @Override
+    public Map<ChannelOption<?>, Object> getOptions() {
+        return getOptions(super.getOptions(), RawSocketChannelOption.PACKET_HANDLER);
+    }
+
+    @Override
+    public <T> boolean setOption(ChannelOption<T> option, T value) {
+        if(option == RawSocketChannelOption.PACKET_HANDLER) {
+            if(value instanceof PacketHandler) {
+                packetHandler = (PacketHandler) value;
+                return true;
+            }
+            return false;
+        } else {
+            return super.setOption(option, value);
+        }
+    }
+
+    public void setPacketHandler(PacketHandler packetHandler) {
+        this.packetHandler = packetHandler;
+    }
+
+    public PacketHandler getPacketHandler() {
+        return packetHandler;
+    }
+
+}
diff --git a/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannelOption.java b/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannelOption.java
index 004f0ca5ccb..1024e17f793 100644
--- a/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannelOption.java
+++ b/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannelOption.java
@@ -1,32 +1,32 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.utils.rawsockets.netty;
-
-import io.netty.channel.ChannelOption;
-
-public class RawSocketChannelOption<T> extends ChannelOption<T> {
-
-    public static final ChannelOption<PacketHandler> PACKET_HANDLER =
-        ChannelOption.valueOf(PacketHandler.class, "PACKET_HANDLER");
-
-    protected RawSocketChannelOption() {
-        super(null);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.utils.rawsockets.netty;
+
+import io.netty.channel.ChannelOption;
+
+public class RawSocketChannelOption<T> extends ChannelOption<T> {
+
+    public static final ChannelOption<PacketHandler> PACKET_HANDLER =
+        ChannelOption.valueOf(PacketHandler.class, "PACKET_HANDLER");
+
+    protected RawSocketChannelOption() {
+        super(null);
+    }
+
+}
diff --git a/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketIpAddress.java b/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketIpAddress.java
index f7b4c3fb6b3..897797dba1c 100644
--- a/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketIpAddress.java
+++ b/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketIpAddress.java
@@ -1,46 +1,46 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.utils.rawsockets.netty;
-
-import java.net.InetAddress;
-
-public class RawSocketIpAddress extends RawSocketAddress {
-    private static final long serialVersionUID = 1L;
-
-    public static final int ALL_PORTS = -1;
-
-    private final InetAddress address;
-
-    private final int port;
-
-    public RawSocketIpAddress(String deviceName, int protocolId, InetAddress address, int port) {
-        super(deviceName, protocolId);
-        this.address = address;
-        this.port = port;
-    }
-
-    public InetAddress getAddress() {
-        return address;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.utils.rawsockets.netty;
+
+import java.net.InetAddress;
+
+public class RawSocketIpAddress extends RawSocketAddress {
+    private static final long serialVersionUID = 1L;
+
+    public static final int ALL_PORTS = -1;
+
+    private final InetAddress address;
+
+    private final int port;
+
+    public RawSocketIpAddress(String deviceName, int protocolId, InetAddress address, int port) {
+        super(deviceName, protocolId);
+        this.address = address;
+        this.port = port;
+    }
+
+    public InetAddress getAddress() {
+        return address;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
+}
diff --git a/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/TcpIpPacketHandler.java b/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/TcpIpPacketHandler.java
index b5be16490cd..e764929688e 100644
--- a/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/TcpIpPacketHandler.java
+++ b/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/TcpIpPacketHandler.java
@@ -1,41 +1,41 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.utils.rawsockets.netty;
-
-import org.pcap4j.packet.*;
-
-/**
- * Little helper to automatically unwrap TCP packets to only
- * pass along the payload and not the raw Ethernet packet.
- */
-public class TcpIpPacketHandler implements PacketHandler {
-
-    @Override
-    public byte[] getData(Packet packet) {
-        EthernetPacket ethernetPacket = (EthernetPacket) packet;
-        IpV4Packet ipv4Packet = (IpV4Packet) ethernetPacket.getPayload();
-        TcpPacket tcpPacket = (TcpPacket) ipv4Packet.getPayload();
-        if(tcpPacket.getPayload() instanceof UnknownPacket) {
-            UnknownPacket unknownPacket = (UnknownPacket) tcpPacket.getPayload();
-            return unknownPacket.getRawData();
-        }
-        return new byte[0];
-    }
-
-}
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.utils.rawsockets.netty;
+
+import org.pcap4j.packet.*;
+
+/**
+ * Little helper to automatically unwrap TCP packets to only
+ * pass along the payload and not the raw Ethernet packet.
+ */
+public class TcpIpPacketHandler implements PacketHandler {
+
+    @Override
+    public byte[] getData(Packet packet) {
+        EthernetPacket ethernetPacket = (EthernetPacket) packet;
+        IpV4Packet ipv4Packet = (IpV4Packet) ethernetPacket.getPayload();
+        TcpPacket tcpPacket = (TcpPacket) ipv4Packet.getPayload();
+        if(tcpPacket.getPayload() instanceof UnknownPacket) {
+            UnknownPacket unknownPacket = (UnknownPacket) tcpPacket.getPayload();
+            return unknownPacket.getRawData();
+        }
+        return new byte[0];
+    }
+
+}
diff --git a/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/UdpIpPacketHandler.java b/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/UdpIpPacketHandler.java
index 1b030df048f..b1e2298bcd3 100644
--- a/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/UdpIpPacketHandler.java
+++ b/plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/UdpIpPacketHandler.java
@@ -1,41 +1,41 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.utils.rawsockets.netty;
-
-import org.pcap4j.packet.*;
-
-/**
- * Little helper to automatically unwrap TCP packets to only
- * pass along the payload and not the raw Ethernet packet.
- */
-public class UdpIpPacketHandler implements PacketHandler {
-
-    @Override
-    public byte[] getData(Packet packet) {
-        EthernetPacket ethernetPacket = (EthernetPacket) packet;
-        IpV4Packet ipv4Packet = (IpV4Packet) ethernetPacket.getPayload();
-        UdpPacket udpPacket = (UdpPacket) ipv4Packet.getPayload();
-        if(udpPacket.getPayload() instanceof UnknownPacket) {
-            UnknownPacket unknownPacket = (UnknownPacket) udpPacket.getPayload();
-            return unknownPacket.getRawData();
-        }
-        return new byte[0];
-    }
-
-}
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.utils.rawsockets.netty;
+
+import org.pcap4j.packet.*;
+
+/**
+ * Little helper to automatically unwrap TCP packets to only
+ * pass along the payload and not the raw Ethernet packet.
+ */
+public class UdpIpPacketHandler implements PacketHandler {
+
+    @Override
+    public byte[] getData(Packet packet) {
+        EthernetPacket ethernetPacket = (EthernetPacket) packet;
+        IpV4Packet ipv4Packet = (IpV4Packet) ethernetPacket.getPayload();
+        UdpPacket udpPacket = (UdpPacket) ipv4Packet.getPayload();
+        if(udpPacket.getPayload() instanceof UnknownPacket) {
+            UnknownPacket unknownPacket = (UnknownPacket) udpPacket.getPayload();
+            return unknownPacket.getRawData();
+        }
+        return new byte[0];
+    }
+
+}
diff --git a/plc4j/utils/raw-sockets/src/remote-resources/META-INF/LICENSE b/plc4j/utils/raw-sockets/src/remote-resources/META-INF/LICENSE
index ec7b65cd85c..2c1922bafa4 100644
--- a/plc4j/utils/raw-sockets/src/remote-resources/META-INF/LICENSE
+++ b/plc4j/utils/raw-sockets/src/remote-resources/META-INF/LICENSE
@@ -1,8 +1,8 @@
-
-----------------------------------------------
-
-The Files:
-src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawEthernetSocket.java
-src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawIpSocket.java
-src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawSocketListener.java
-Are copyrighted by the The Netty Project which is distributed under the Apache 2.0 license.
+
+----------------------------------------------
+
+The Files:
+src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawEthernetSocket.java
+src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawIpSocket.java
+src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawSocketListener.java
+Are copyrighted by the The Netty Project which is distributed under the Apache 2.0 license.
diff --git a/plc4j/utils/raw-sockets/src/remote-resources/META-INF/NOTICE b/plc4j/utils/raw-sockets/src/remote-resources/META-INF/NOTICE
index ccad4c46b77..075b7b30e29 100644
--- a/plc4j/utils/raw-sockets/src/remote-resources/META-INF/NOTICE
+++ b/plc4j/utils/raw-sockets/src/remote-resources/META-INF/NOTICE
@@ -1,4 +1,4 @@
-----------------------------------------------
-
-This product includes software developed at
-The Netty project (https://netty.io/).
+----------------------------------------------
+
+This product includes software developed at
+The Netty project (https://netty.io/).
diff --git a/plc4j/utils/raw-sockets/src/test/java/org/apache/plc4x/java/utils/rawsockets/attic/RawIpSocketTest.java b/plc4j/utils/raw-sockets/src/test/java/org/apache/plc4x/java/utils/rawsockets/attic/RawIpSocketTest.java
index 15cbb68ecd9..2e7345bcec8 100644
--- a/plc4j/utils/raw-sockets/src/test/java/org/apache/plc4x/java/utils/rawsockets/attic/RawIpSocketTest.java
+++ b/plc4j/utils/raw-sockets/src/test/java/org/apache/plc4x/java/utils/rawsockets/attic/RawIpSocketTest.java
@@ -1,98 +1,98 @@
-/*
- * Copyright 2014 The Netty Project
- *
- * The Netty Project 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:
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.plc4x.java.utils.rawsockets.attic;
-
-import org.apache.plc4x.java.utils.rawsockets.attic.RawIpSocket;
-import org.apache.plc4x.test.RequirePcap;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.pcap4j.core.PcapAddress;
-import org.pcap4j.core.PcapNetworkInterface;
-import org.pcap4j.core.Pcaps;
-
-import java.net.Inet4Address;
-import java.util.Arrays;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeThat;
-
-public class RawIpSocketTest {
-
-    @Test
-    @Ignore("Need to make tests run in Docker container first as this test requires libpcap or the entrie application to be run as 'root'")
-    @RequirePcap
-    public void testPingPacket() throws Exception {
-        // Protocol number 1 = ICMP (Ping)
-        RawIpSocket rawIpSocket = new RawIpSocket(1);
-
-        CompletableFuture<Boolean> result = new CompletableFuture<>();
-        // Simply print the result to the console
-        rawIpSocket.addListener(rawData -> {
-            System.out.println("Got response:");
-            System.out.println(Arrays.toString(rawData));
-            result.complete(true);
-        });
-
-        // Connect to the remote address
-        // This doesn't really connect in the usual sense, it
-        // does the ARP MAC address lookup and sets up the listener
-        // to accept packets sent from that mac address to the
-        // current machines with the given IP protocol id.
-        // In this test we simply look for a real network device
-        // (The loopback device doesn't have a MAC address)
-        // and ping itself.
-        for (PcapNetworkInterface dev : Pcaps.findAllDevs()) {
-            System.out.println("Trying to read on device " + dev);
-            if (!dev.getLinkLayerAddresses().isEmpty()) {
-                for (PcapAddress pcapAddress : dev.getAddresses()) {
-                    if (pcapAddress.getAddress() instanceof Inet4Address) {
-                        System.out.println("Trying to connect on PcapAddress " + pcapAddress);
-                        rawIpSocket.connect("plc4x.apache.org");
-                    }
-                }
-            }
-        }
-        // On travis we won't have any interface at all so we don't need to run there
-        assumeThat(rawIpSocket, notNullValue());
-
-        // Simple ICMP (Ping packet)
-        byte[] rawData = new byte[]{
-            // Type (ICMP Ping Request) & Code (just 0)
-            (byte) 0x08, (byte) 0x00,
-            // Checksum
-            (byte) 0xe3, (byte) 0xe5,
-            // Identifier
-            (byte) 0x00, (byte) 0x01,
-            // Sequence Number
-            (byte) 0x00, (byte) 0x00,
-            // Payload (Just random data that was used to fit to the checksum)
-            (byte) 0x00, (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04, (byte) 0x05, (byte) 0x06, (byte) 0x07, (byte) 0x08, (byte) 0x09};
-
-        // Write the raw packet to the remote host.
-        rawIpSocket.write(rawData);
-
-        try {
-            result.get(3, TimeUnit.SECONDS);
-        } catch (TimeoutException e) {
-            fail("Request timed out.");
-        }
-    }
-
-}
+/*
+ * Copyright 2014 The Netty Project
+ *
+ * The Netty Project 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:
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.plc4x.java.utils.rawsockets.attic;
+
+import org.apache.plc4x.java.utils.rawsockets.attic.RawIpSocket;
+import org.apache.plc4x.test.RequirePcap;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.pcap4j.core.PcapAddress;
+import org.pcap4j.core.PcapNetworkInterface;
+import org.pcap4j.core.Pcaps;
+
+import java.net.Inet4Address;
+import java.util.Arrays;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeThat;
+
+public class RawIpSocketTest {
+
+    @Test
+    @Ignore("Need to make tests run in Docker container first as this test requires libpcap or the entrie application to be run as 'root'")
+    @RequirePcap
+    public void testPingPacket() throws Exception {
+        // Protocol number 1 = ICMP (Ping)
+        RawIpSocket rawIpSocket = new RawIpSocket(1);
+
+        CompletableFuture<Boolean> result = new CompletableFuture<>();
+        // Simply print the result to the console
+        rawIpSocket.addListener(rawData -> {
+            System.out.println("Got response:");
+            System.out.println(Arrays.toString(rawData));
+            result.complete(true);
+        });
+
+        // Connect to the remote address
+        // This doesn't really connect in the usual sense, it
+        // does the ARP MAC address lookup and sets up the listener
+        // to accept packets sent from that mac address to the
+        // current machines with the given IP protocol id.
+        // In this test we simply look for a real network device
+        // (The loopback device doesn't have a MAC address)
+        // and ping itself.
+        for (PcapNetworkInterface dev : Pcaps.findAllDevs()) {
+            System.out.println("Trying to read on device " + dev);
+            if (!dev.getLinkLayerAddresses().isEmpty()) {
+                for (PcapAddress pcapAddress : dev.getAddresses()) {
+                    if (pcapAddress.getAddress() instanceof Inet4Address) {
+                        System.out.println("Trying to connect on PcapAddress " + pcapAddress);
+                        rawIpSocket.connect("plc4x.apache.org");
+                    }
+                }
+            }
+        }
+        // On travis we won't have any interface at all so we don't need to run there
+        assumeThat(rawIpSocket, notNullValue());
+
+        // Simple ICMP (Ping packet)
+        byte[] rawData = new byte[]{
+            // Type (ICMP Ping Request) & Code (just 0)
+            (byte) 0x08, (byte) 0x00,
+            // Checksum
+            (byte) 0xe3, (byte) 0xe5,
+            // Identifier
+            (byte) 0x00, (byte) 0x01,
+            // Sequence Number
+            (byte) 0x00, (byte) 0x00,
+            // Payload (Just random data that was used to fit to the checksum)
+            (byte) 0x00, (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04, (byte) 0x05, (byte) 0x06, (byte) 0x07, (byte) 0x08, (byte) 0x09};
+
+        // Write the raw packet to the remote host.
+        rawIpSocket.write(rawData);
+
+        try {
+            result.get(3, TimeUnit.SECONDS);
+        } catch (TimeoutException e) {
+            fail("Request timed out.");
+        }
+    }
+
+}
diff --git a/plc4j/utils/raw-sockets/src/test/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannelTest.java b/plc4j/utils/raw-sockets/src/test/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannelTest.java
index e7566b8f59a..d5db95d3f5c 100644
--- a/plc4j/utils/raw-sockets/src/test/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannelTest.java
+++ b/plc4j/utils/raw-sockets/src/test/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannelTest.java
@@ -1,102 +1,102 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.utils.rawsockets.netty;
-
-import io.netty.bootstrap.Bootstrap;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufUtil;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.*;
-import io.netty.channel.oio.OioEventLoopGroup;
-import org.junit.Assert;
-import org.junit.Test;
-import org.pcap4j.core.PcapNetworkInterface;
-import org.pcap4j.core.Pcaps;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.InetAddress;
-
-/**
- * TODO write comment
- *
- * @author julian
- * Created by julian on 2019-08-16
- */
-public class RawSocketChannelTest {
-
-    private static final Logger logger = LoggerFactory.getLogger(RawSocketChannelTest.class);
-
-    @Test
-    public void doConnect() throws Exception {
-        Channel channel = null;
-        final EventLoopGroup workerGroup = new OioEventLoopGroup();
-        try {
-            Bootstrap bootstrap = new Bootstrap();
-            bootstrap.group(workerGroup);
-            bootstrap.channel(RawSocketChannel.class);
-            // TODO we should use an explicit (configurable?) timeout here
-            // bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 1000);
-            bootstrap.handler(new ChannelInitializer<RawSocketChannel>() {
-                @Override
-                protected void initChannel(RawSocketChannel ch) throws Exception {
-                    System.out.println("Initialize Buffer!");
-                    ch.pipeline().addLast(new ChannelInboundHandlerAdapter(){
-                        @Override
-                        public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-                            System.out.println(ByteBufUtil.prettyHexDump(((ByteBuf) msg)));
-                        }
-                    });
-                    ch.pipeline().addLast(new ChannelHandlerAdapter() {
-                        @Override
-                        public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-                            cause.printStackTrace();
-                        }
-                    });
-                }
-            });
-            // Start the client.
-            PcapNetworkInterface loopbackDevice = Pcaps.findAllDevs().stream().filter(
-                PcapNetworkInterface::isLoopBack).findFirst().orElse(null);
-            Assert.assertNotNull("Couldn't find loopback device", loopbackDevice);
-            final ChannelFuture f = bootstrap.connect(
-                new RawSocketIpAddress(loopbackDevice.getName(), RawSocketAddress.ALL_PROTOCOLS,
-                    InetAddress.getByName("127.0.0.1"), 1234));
-            // Wait for sync
-            f.sync();
-            // Wait till the session is finished initializing.
-            channel = f.channel();
-
-            System.out.println("Channel is connected and ready to use...");
-
-
-            channel.writeAndFlush(Unpooled.wrappedBuffer("Hallo".getBytes()));
-
-            // Prepare something to read
-            Thread.sleep(10_000);
-
-        } finally {
-            if (channel != null) {
-                channel.close().sync();
-            }
-            workerGroup.shutdownGracefully().sync();
-        }
-    }
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.utils.rawsockets.netty;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.*;
+import io.netty.channel.oio.OioEventLoopGroup;
+import org.junit.Assert;
+import org.junit.Test;
+import org.pcap4j.core.PcapNetworkInterface;
+import org.pcap4j.core.Pcaps;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.InetAddress;
+
+/**
+ * TODO write comment
+ *
+ * @author julian
+ * Created by julian on 2019-08-16
+ */
+public class RawSocketChannelTest {
+
+    private static final Logger logger = LoggerFactory.getLogger(RawSocketChannelTest.class);
+
+    @Test
+    public void doConnect() throws Exception {
+        Channel channel = null;
+        final EventLoopGroup workerGroup = new OioEventLoopGroup();
+        try {
+            Bootstrap bootstrap = new Bootstrap();
+            bootstrap.group(workerGroup);
+            bootstrap.channel(RawSocketChannel.class);
+            // TODO we should use an explicit (configurable?) timeout here
+            // bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 1000);
+            bootstrap.handler(new ChannelInitializer<RawSocketChannel>() {
+                @Override
+                protected void initChannel(RawSocketChannel ch) throws Exception {
+                    System.out.println("Initialize Buffer!");
+                    ch.pipeline().addLast(new ChannelInboundHandlerAdapter(){
+                        @Override
+                        public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+                            System.out.println(ByteBufUtil.prettyHexDump(((ByteBuf) msg)));
+                        }
+                    });
+                    ch.pipeline().addLast(new ChannelHandlerAdapter() {
+                        @Override
+                        public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+                            cause.printStackTrace();
+                        }
+                    });
+                }
+            });
+            // Start the client.
+            PcapNetworkInterface loopbackDevice = Pcaps.findAllDevs().stream().filter(
+                PcapNetworkInterface::isLoopBack).findFirst().orElse(null);
+            Assert.assertNotNull("Couldn't find loopback device", loopbackDevice);
+            final ChannelFuture f = bootstrap.connect(
+                new RawSocketIpAddress(loopbackDevice.getName(), RawSocketAddress.ALL_PROTOCOLS,
+                    InetAddress.getByName("127.0.0.1"), 1234));
+            // Wait for sync
+            f.sync();
+            // Wait till the session is finished initializing.
+            channel = f.channel();
+
+            System.out.println("Channel is connected and ready to use...");
+
+
+            channel.writeAndFlush(Unpooled.wrappedBuffer("Hallo".getBytes()));
+
+            // Prepare something to read
+            Thread.sleep(10_000);
+
+        } finally {
+            if (channel != null) {
+                channel.close().sync();
+            }
+            workerGroup.shutdownGracefully().sync();
+        }
+    }
 }
\ No newline at end of file
diff --git a/plc4j/utils/scraper/README.md b/plc4j/utils/scraper/README.md
index 1c75f333c55..e5498f49a4e 100644
--- a/plc4j/utils/scraper/README.md
+++ b/plc4j/utils/scraper/README.md
@@ -1,21 +1,21 @@
-<!--
-
-  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
-
-      http://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.
-
--->
-# Usage of (Triggered) Scraper
-
+<!--
+
+  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
+
+      http://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.
+
+-->
+# Usage of (Triggered) Scraper
+
 ToDo: Write this!
\ No newline at end of file
diff --git a/plc4j/utils/scraper/pom.xml b/plc4j/utils/scraper/pom.xml
index dbe485d2806..5986cc430ba 100644
--- a/plc4j/utils/scraper/pom.xml
+++ b/plc4j/utils/scraper/pom.xml
@@ -1,145 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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
-  ~
-  ~   http://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.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <artifactId>plc4j-utils</artifactId>
-    <groupId>org.apache.plc4x</groupId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-scraper</artifactId>
-
-  <name>PLC4J: Utils: Scraper</name>
-  <description>Utility to efficiently collect a large number of items on multiple devices by different triggers.</description>
-
-  <dependencies>
-    <!--Jackson-->
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
-      <artifactId>jackson-dataformat-yaml</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>
-
-    <!-- Apache Commons -->
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-math3</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-pool2</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-collections4</artifactId>
-    </dependency>
-
-    <!-- PLC4X dependencies -->
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-connection-pool</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-s7</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-s7</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base-test</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-
-
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-utils-test-utils</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-driver-modbus</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-
-
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <usedDependencies combine.children="append">
-            <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
-          </usedDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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
+  ~
+  ~   http://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.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <artifactId>plc4j-utils</artifactId>
+    <groupId>org.apache.plc4x</groupId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-scraper</artifactId>
+
+  <name>PLC4J: Utils: Scraper</name>
+  <description>Utility to efficiently collect a large number of items on multiple devices by different triggers.</description>
+
+  <dependencies>
+    <!--Jackson-->
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-yaml</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+
+    <!-- Apache Commons -->
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-math3</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-pool2</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
+    </dependency>
+
+    <!-- PLC4X dependencies -->
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-connection-pool</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-s7</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-s7</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base-test</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+
+
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-utils-test-utils</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-driver-modbus</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+
+
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <usedDependencies combine.children="append">
+            <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
+          </usedDependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/ResultHandler.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/ResultHandler.java
index f6ad53c3f82..b7ccffec178 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/ResultHandler.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/ResultHandler.java
@@ -1,38 +1,38 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper;
-
-import java.util.Map;
-
-/**
- * Callback interface to handle results of one run of a {@link ScraperTask}.
- */
-@FunctionalInterface
-public interface ResultHandler {
-
-    /**
-     * Callback handler.
-     * @param job name of the job (from config)
-     * @param alias alias of the connection (<b>not</b> connection String)
-     * @param results Results in the form alias to result value
-     */
-    void handle(String job, String alias, Map<String, Object> results);
-
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper;
+
+import java.util.Map;
+
+/**
+ * Callback interface to handle results of one run of a {@link ScraperTask}.
+ */
+@FunctionalInterface
+public interface ResultHandler {
+
+    /**
+     * Callback handler.
+     * @param job name of the job (from config)
+     * @param alias alias of the connection (<b>not</b> connection String)
+     * @param results Results in the form alias to result value
+     */
+    void handle(String job, String alias, Map<String, Object> results);
+
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/ScrapeJob.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/ScrapeJob.java
index 20a99ed3e54..492f81420f2 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/ScrapeJob.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/ScrapeJob.java
@@ -1,48 +1,48 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper;
-
-import org.apache.plc4x.java.scraper.config.JobConfigurationClassicImpl;
-import org.apache.plc4x.java.scraper.config.ScraperConfigurationClassicImpl;
-
-import java.util.Map;
-
-/**
- * POJO Object to transport all Job information.
- * Is generated from {@link ScraperConfigurationClassicImpl} by
- * merging the sources and the {@link JobConfigurationClassicImpl}.
- */
-public interface ScrapeJob {
-    String getJobName();
-
-    long getScrapeRate();
-
-    /**
-     * alias -&gt; connection-string
-     * @return something...
-     */
-    Map<String, String> getSourceConnections();
-
-    /**
-     * alias -&gt; field-query
-     * @return something...
-     */
-    Map<String, String> getFields();
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper;
+
+import org.apache.plc4x.java.scraper.config.JobConfigurationClassicImpl;
+import org.apache.plc4x.java.scraper.config.ScraperConfigurationClassicImpl;
+
+import java.util.Map;
+
+/**
+ * POJO Object to transport all Job information.
+ * Is generated from {@link ScraperConfigurationClassicImpl} by
+ * merging the sources and the {@link JobConfigurationClassicImpl}.
+ */
+public interface ScrapeJob {
+    String getJobName();
+
+    long getScrapeRate();
+
+    /**
+     * alias -&gt; connection-string
+     * @return something...
+     */
+    Map<String, String> getSourceConnections();
+
+    /**
+     * alias -&gt; field-query
+     * @return something...
+     */
+    Map<String, String> getFields();
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/ScrapeJobImpl.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/ScrapeJobImpl.java
index 9b0c181a2f5..6106068e2a5 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/ScrapeJobImpl.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/ScrapeJobImpl.java
@@ -1,68 +1,68 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper;
-
-import org.apache.plc4x.java.scraper.config.JobConfigurationClassicImpl;
-import org.apache.plc4x.java.scraper.config.ScraperConfigurationClassicImpl;
-
-import java.util.Map;
-
-/**
- * POJO Object to transport all Job information.
- * Is generated from {@link ScraperConfigurationClassicImpl} by
- * merging the sources and the {@link JobConfigurationClassicImpl}.
- *
- * @deprecated Scraper is deprecated please use {@link org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScrapeJobImpl} instead all functions are supplied as well see java-doc of {@link org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl}
- */
-@Deprecated
-public class ScrapeJobImpl implements ScrapeJob {
-
-    private final String name;
-    private final long scrapeRate;
-    private final Map<String, String> connections;
-    private final Map<String, String> fields;
-
-    public ScrapeJobImpl(String name, long scrapeRate, Map<String, String> connections, Map<String, String> fields) {
-        this.name = name;
-        this.scrapeRate = scrapeRate;
-        this.connections = connections;
-        this.fields = fields;
-    }
-
-    @Override
-    public String getJobName() {
-        return name;
-    }
-
-    @Override
-    public long getScrapeRate() {
-        return scrapeRate;
-    }
-
-    @Override
-    public Map<String, String> getSourceConnections() {
-        return connections;
-    }
-
-    @Override
-    public Map<String, String> getFields() {
-        return fields;
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper;
+
+import org.apache.plc4x.java.scraper.config.JobConfigurationClassicImpl;
+import org.apache.plc4x.java.scraper.config.ScraperConfigurationClassicImpl;
+
+import java.util.Map;
+
+/**
+ * POJO Object to transport all Job information.
+ * Is generated from {@link ScraperConfigurationClassicImpl} by
+ * merging the sources and the {@link JobConfigurationClassicImpl}.
+ *
+ * @deprecated Scraper is deprecated please use {@link org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScrapeJobImpl} instead all functions are supplied as well see java-doc of {@link org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl}
+ */
+@Deprecated
+public class ScrapeJobImpl implements ScrapeJob {
+
+    private final String name;
+    private final long scrapeRate;
+    private final Map<String, String> connections;
+    private final Map<String, String> fields;
+
+    public ScrapeJobImpl(String name, long scrapeRate, Map<String, String> connections, Map<String, String> fields) {
+        this.name = name;
+        this.scrapeRate = scrapeRate;
+        this.connections = connections;
+        this.fields = fields;
+    }
+
+    @Override
+    public String getJobName() {
+        return name;
+    }
+
+    @Override
+    public long getScrapeRate() {
+        return scrapeRate;
+    }
+
+    @Override
+    public Map<String, String> getSourceConnections() {
+        return connections;
+    }
+
+    @Override
+    public Map<String, String> getFields() {
+        return fields;
+    }
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/Scraper.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/Scraper.java
index 0fd7a2a7709..7e20f30e745 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/Scraper.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/Scraper.java
@@ -1,41 +1,41 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper;
-
-/**
- * Main interface that orchestrates scraping.
- */
-public interface Scraper{
-    /**
-     * Start the scraping.
-     */
-    void start();
-
-    /**
-     * retrieves active tasks used for scraping
-     * @return number of active tasks
-     */
-    int getNumberOfActiveTasks();
-
-    /**
-     * stops active scraping processes
-     */
-    void stop();
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper;
+
+/**
+ * Main interface that orchestrates scraping.
+ */
+public interface Scraper{
+    /**
+     * Start the scraping.
+     */
+    void start();
+
+    /**
+     * retrieves active tasks used for scraping
+     * @return number of active tasks
+     */
+    int getNumberOfActiveTasks();
+
+    /**
+     * stops active scraping processes
+     */
+    void stop();
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/ScraperImpl.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/ScraperImpl.java
index d484a2568d1..e41759e2cee 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/ScraperImpl.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/ScraperImpl.java
@@ -1,181 +1,181 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper;
-
-import org.apache.commons.collections4.MultiValuedMap;
-import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
-import org.apache.commons.lang3.Validate;
-import org.apache.commons.lang3.concurrent.BasicThreadFactory;
-import org.apache.commons.lang3.tuple.Triple;
-import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
-import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
-import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.scraper.config.ScraperConfiguration;
-import org.apache.plc4x.java.scraper.exception.ScraperException;
-import org.apache.plc4x.java.scraper.util.PercentageAboveThreshold;
-import org.apache.plc4x.java.utils.connectionpool.PooledPlcDriverManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.concurrent.*;
-
-/**
- * Main class that orchestrates scraping.
- *
- * @deprecated Scraper is deprecated please use {@link org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl} instead all functions are supplied as well
- */
-@Deprecated
-public class ScraperImpl implements Scraper {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ScraperImpl.class);
-
-    private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(10,
-        new BasicThreadFactory.Builder()
-            .namingPattern("scheduler-thread-%d")
-            .daemon(false)
-            .build()
-    );
-    private final ExecutorService handlerPool = Executors.newFixedThreadPool(4,
-        new BasicThreadFactory.Builder()
-            .namingPattern("handler-thread-%d")
-            .daemon(true)
-            .build()
-    );
-
-    private final ResultHandler resultHandler;
-
-    private final MultiValuedMap<ScrapeJob, ScraperTask> tasks = new ArrayListValuedHashMap<>();
-    private final MultiValuedMap<ScraperTask, ScheduledFuture<?>> futures = new ArrayListValuedHashMap<>();
-    private final PlcDriverManager driverManager;
-    private final List<ScrapeJob> jobs;
-
-    /**
-     * default constructor
-     * @param resultHandler handler for acquired data
-     * @param driverManager handler for Plc connection
-     * @param jobs list of scrapings jobs to be executed
-     */
-    public ScraperImpl(ResultHandler resultHandler, PlcDriverManager driverManager, List<ScrapeJob> jobs) {
-        this.resultHandler = resultHandler;
-        Validate.notEmpty(jobs);
-        this.driverManager = driverManager;
-        this.jobs = jobs;
-    }
-
-    /**
-     * Creates a Scraper instance from a configuration.
-     * By default a {@link PooledPlcDriverManager} is used.
-     * @param config Configuration to use.
-     * @param resultHandler handler for acquired data
-     * @throws ScraperException something went wrong ...
-     */
-    public ScraperImpl(ScraperConfiguration config, ResultHandler resultHandler) throws ScraperException {
-        this(resultHandler, createPooledDriverManager(), config.getJobs());
-    }
-
-    /**
-     * Min Idle per Key is set to 1 for situations where the network is broken.
-     * Then, on reconnect we can fail all getConnection calls (in the ScraperTask) fast until
-     * (in the background) the idle connection is created and the getConnection call returns fast.
-     */
-    private static PooledPlcDriverManager createPooledDriverManager() {
-        return new PooledPlcDriverManager(pooledPlcConnectionFactory -> {
-            GenericKeyedObjectPoolConfig<PlcConnection> poolConfig = new GenericKeyedObjectPoolConfig<>();
-            poolConfig.setMinIdlePerKey(1);  // This should avoid problems with long running connect attempts??
-            poolConfig.setTestOnBorrow(true);
-            poolConfig.setTestOnReturn(true);
-            return new GenericKeyedObjectPool<>(pooledPlcConnectionFactory, poolConfig);
-        });
-    }
-
-
-
-    @Override
-    public void start() {
-        // Schedule all jobs
-        LOGGER.info("Starting jobs...");
-        jobs.stream()
-            .flatMap(job -> job.getSourceConnections().entrySet().stream()
-                .map(entry -> Triple.of(job, entry.getKey(), entry.getValue()))
-            )
-            .forEach(
-                tuple -> {
-                    LOGGER.debug("Register task for job {} for conn {} ({}) at rate {} ms",
-                        tuple.getLeft().getJobName(), tuple.getMiddle(), tuple.getRight(), tuple.getLeft().getScrapeRate());
-                    ScraperTask task = new ScraperTaskImpl(driverManager,
-                        tuple.getLeft().getJobName(), tuple.getMiddle(), tuple.getRight(),
-                        tuple.getLeft().getFields(),
-                        1_000,
-                        handlerPool, resultHandler);
-                    // Add task to internal list
-                    tasks.put(tuple.getLeft(), task);
-                    ScheduledFuture<?> future = scheduler.scheduleAtFixedRate(task,
-                        0, tuple.getLeft().getScrapeRate(), TimeUnit.MILLISECONDS);
-
-                    // Store the handle for stopping, etc.
-                    futures.put(task, future);
-                }
-            );
-
-        // Add statistics tracker
-        scheduler.scheduleAtFixedRate(() -> {
-            for (Map.Entry<ScrapeJob, ScraperTask> entry : tasks.entries()) {
-                DescriptiveStatistics statistics = entry.getValue().getLatencyStatistics();
-                String msg = String.format(Locale.ENGLISH, "Job statistics (%s, %s) number of requests: %d (%d success, %.1f %% failed, %.1f %% too slow), min latency: %.2f ms, mean latency: %.2f ms, median: %.2f ms",
-                    entry.getValue().getJobName(), entry.getValue().getConnectionAlias(),
-                    entry.getValue().getRequestCounter(), entry.getValue().getSuccessfullRequestCounter(),
-                    entry.getValue().getPercentageFailed(),
-                    statistics.apply(new PercentageAboveThreshold(entry.getKey().getScrapeRate() * 1e6)),
-                    statistics.getMin() * 1e-6, statistics.getMean() * 1e-6, statistics.getPercentile(50) * 1e-6);
-                LOGGER.debug(msg);
-            }
-        }, 1_000, 1_000, TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * For testing.
-     */
-    ScheduledExecutorService getScheduler() {
-        return scheduler;
-    }
-
-    @Override
-    public int getNumberOfActiveTasks() {
-        return (int) futures.entries().stream().filter(entry -> !entry.getValue().isDone()).count();
-    }
-
-    @Override
-    public void stop() {
-        // Stop all futures
-        LOGGER.info("Stopping scraper...");
-        for (Map.Entry<ScraperTask, ScheduledFuture<?>> entry : futures.entries()) {
-            LOGGER.debug("Stopping task {}...", entry.getKey());
-            entry.getValue().cancel(true);
-        }
-        // Clear the map
-        futures.clear();
-    }
-
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper;
+
+import org.apache.commons.collections4.MultiValuedMap;
+import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
+import org.apache.commons.lang3.Validate;
+import org.apache.commons.lang3.concurrent.BasicThreadFactory;
+import org.apache.commons.lang3.tuple.Triple;
+import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
+import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
+import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.scraper.config.ScraperConfiguration;
+import org.apache.plc4x.java.scraper.exception.ScraperException;
+import org.apache.plc4x.java.scraper.util.PercentageAboveThreshold;
+import org.apache.plc4x.java.utils.connectionpool.PooledPlcDriverManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.concurrent.*;
+
+/**
+ * Main class that orchestrates scraping.
+ *
+ * @deprecated Scraper is deprecated please use {@link org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl} instead all functions are supplied as well
+ */
+@Deprecated
+public class ScraperImpl implements Scraper {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ScraperImpl.class);
+
+    private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(10,
+        new BasicThreadFactory.Builder()
+            .namingPattern("scheduler-thread-%d")
+            .daemon(false)
+            .build()
+    );
+    private final ExecutorService handlerPool = Executors.newFixedThreadPool(4,
+        new BasicThreadFactory.Builder()
+            .namingPattern("handler-thread-%d")
+            .daemon(true)
+            .build()
+    );
+
+    private final ResultHandler resultHandler;
+
+    private final MultiValuedMap<ScrapeJob, ScraperTask> tasks = new ArrayListValuedHashMap<>();
+    private final MultiValuedMap<ScraperTask, ScheduledFuture<?>> futures = new ArrayListValuedHashMap<>();
+    private final PlcDriverManager driverManager;
+    private final List<ScrapeJob> jobs;
+
+    /**
+     * default constructor
+     * @param resultHandler handler for acquired data
+     * @param driverManager handler for Plc connection
+     * @param jobs list of scrapings jobs to be executed
+     */
+    public ScraperImpl(ResultHandler resultHandler, PlcDriverManager driverManager, List<ScrapeJob> jobs) {
+        this.resultHandler = resultHandler;
+        Validate.notEmpty(jobs);
+        this.driverManager = driverManager;
+        this.jobs = jobs;
+    }
+
+    /**
+     * Creates a Scraper instance from a configuration.
+     * By default a {@link PooledPlcDriverManager} is used.
+     * @param config Configuration to use.
+     * @param resultHandler handler for acquired data
+     * @throws ScraperException something went wrong ...
+     */
+    public ScraperImpl(ScraperConfiguration config, ResultHandler resultHandler) throws ScraperException {
+        this(resultHandler, createPooledDriverManager(), config.getJobs());
+    }
+
+    /**
+     * Min Idle per Key is set to 1 for situations where the network is broken.
+     * Then, on reconnect we can fail all getConnection calls (in the ScraperTask) fast until
+     * (in the background) the idle connection is created and the getConnection call returns fast.
+     */
+    private static PooledPlcDriverManager createPooledDriverManager() {
+        return new PooledPlcDriverManager(pooledPlcConnectionFactory -> {
+            GenericKeyedObjectPoolConfig<PlcConnection> poolConfig = new GenericKeyedObjectPoolConfig<>();
+            poolConfig.setMinIdlePerKey(1);  // This should avoid problems with long running connect attempts??
+            poolConfig.setTestOnBorrow(true);
+            poolConfig.setTestOnReturn(true);
+            return new GenericKeyedObjectPool<>(pooledPlcConnectionFactory, poolConfig);
+        });
+    }
+
+
+
+    @Override
+    public void start() {
+        // Schedule all jobs
+        LOGGER.info("Starting jobs...");
+        jobs.stream()
+            .flatMap(job -> job.getSourceConnections().entrySet().stream()
+                .map(entry -> Triple.of(job, entry.getKey(), entry.getValue()))
+            )
+            .forEach(
+                tuple -> {
+                    LOGGER.debug("Register task for job {} for conn {} ({}) at rate {} ms",
+                        tuple.getLeft().getJobName(), tuple.getMiddle(), tuple.getRight(), tuple.getLeft().getScrapeRate());
+                    ScraperTask task = new ScraperTaskImpl(driverManager,
+                        tuple.getLeft().getJobName(), tuple.getMiddle(), tuple.getRight(),
+                        tuple.getLeft().getFields(),
+                        1_000,
+                        handlerPool, resultHandler);
+                    // Add task to internal list
+                    tasks.put(tuple.getLeft(), task);
+                    ScheduledFuture<?> future = scheduler.scheduleAtFixedRate(task,
+                        0, tuple.getLeft().getScrapeRate(), TimeUnit.MILLISECONDS);
+
+                    // Store the handle for stopping, etc.
+                    futures.put(task, future);
+                }
+            );
+
+        // Add statistics tracker
+        scheduler.scheduleAtFixedRate(() -> {
+            for (Map.Entry<ScrapeJob, ScraperTask> entry : tasks.entries()) {
+                DescriptiveStatistics statistics = entry.getValue().getLatencyStatistics();
+                String msg = String.format(Locale.ENGLISH, "Job statistics (%s, %s) number of requests: %d (%d success, %.1f %% failed, %.1f %% too slow), min latency: %.2f ms, mean latency: %.2f ms, median: %.2f ms",
+                    entry.getValue().getJobName(), entry.getValue().getConnectionAlias(),
+                    entry.getValue().getRequestCounter(), entry.getValue().getSuccessfullRequestCounter(),
+                    entry.getValue().getPercentageFailed(),
+                    statistics.apply(new PercentageAboveThreshold(entry.getKey().getScrapeRate() * 1e6)),
+                    statistics.getMin() * 1e-6, statistics.getMean() * 1e-6, statistics.getPercentile(50) * 1e-6);
+                LOGGER.debug(msg);
+            }
+        }, 1_000, 1_000, TimeUnit.MILLISECONDS);
+    }
+
+    /**
+     * For testing.
+     */
+    ScheduledExecutorService getScheduler() {
+        return scheduler;
+    }
+
+    @Override
+    public int getNumberOfActiveTasks() {
+        return (int) futures.entries().stream().filter(entry -> !entry.getValue().isDone()).count();
+    }
+
+    @Override
+    public void stop() {
+        // Stop all futures
+        LOGGER.info("Stopping scraper...");
+        for (Map.Entry<ScraperTask, ScheduledFuture<?>> entry : futures.entries()) {
+            LOGGER.debug("Stopping task {}...", entry.getKey());
+            entry.getValue().cancel(true);
+        }
+        // Clear the map
+        futures.clear();
+    }
+
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/ScraperTask.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/ScraperTask.java
index d6e4baab449..96c8538ce98 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/ScraperTask.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/ScraperTask.java
@@ -1,49 +1,49 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper;
-
-import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-
-import java.util.Map;
-
-/**
- * Created by timbo on 2019-03-04
- */
-public interface ScraperTask extends Runnable {
-    @Override
-    void run();
-
-    String getJobName();
-
-    String getConnectionAlias();
-
-    long getRequestCounter();
-
-    long getSuccessfullRequestCounter();
-
-    DescriptiveStatistics getLatencyStatistics();
-
-    double getPercentageFailed();
-
-    void handleException(Exception e);
-
-    void handleErrorResponse(Map<String, PlcResponseCode> failed);
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper;
+
+import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+
+import java.util.Map;
+
+/**
+ * Created by timbo on 2019-03-04
+ */
+public interface ScraperTask extends Runnable {
+    @Override
+    void run();
+
+    String getJobName();
+
+    String getConnectionAlias();
+
+    long getRequestCounter();
+
+    long getSuccessfullRequestCounter();
+
+    DescriptiveStatistics getLatencyStatistics();
+
+    double getPercentageFailed();
+
+    void handleException(Exception e);
+
+    void handleErrorResponse(Map<String, PlcResponseCode> failed);
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/ScraperTaskImpl.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/ScraperTaskImpl.java
index 4c5a270f779..a28584b5676 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/ScraperTaskImpl.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/ScraperTaskImpl.java
@@ -1,234 +1,234 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper;
-
-import org.apache.commons.lang3.Validate;
-import org.apache.commons.lang3.time.StopWatch;
-import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.scraper.config.JobConfigurationClassicImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * Plc Scraper Task that scrapes one source.
- * One {@link ScrapeJobImpl} gets split into multiple tasks.
- * One task for each source that is defined in the {@link JobConfigurationClassicImpl}.
- *
- * @deprecated Scraper is deprecated please use {@link org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScrapeJobImpl} instead all functions are supplied as well see java-doc of {@link org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl}
- */
-@Deprecated
-public class ScraperTaskImpl implements ScraperTask {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ScraperTaskImpl.class);
-
-    private final PlcDriverManager driverManager;
-    private final String jobName;
-    private final String connectionAlias;
-    private final String connectionString;
-    private final Map<String, String> fields;
-    private final long requestTimeoutMs;
-    private final ExecutorService handlerService;
-    private final ResultHandler resultHandler;
-
-    private final AtomicLong requestCounter = new AtomicLong(0);
-    private final AtomicLong successCounter = new AtomicLong(0);
-    private final DescriptiveStatistics latencyStatistics = new DescriptiveStatistics(1000);
-    private final DescriptiveStatistics failedStatistics = new DescriptiveStatistics(1000);
-
-    public ScraperTaskImpl(PlcDriverManager driverManager,
-                           String jobName,
-                           String connectionAlias,
-                           String connectionString,
-                           Map<String, String> fields,
-                           long requestTimeoutMs,
-                           ExecutorService handlerService,
-                           ResultHandler resultHandler) {
-        Validate.notNull(driverManager);
-        Validate.notBlank(jobName);
-        Validate.notBlank(connectionAlias);
-        Validate.notBlank(connectionString);
-        Validate.notEmpty(fields);
-        Validate.isTrue(requestTimeoutMs > 0);
-        Validate.notNull(resultHandler);
-        this.driverManager = driverManager;
-        this.jobName = jobName;
-        this.connectionAlias = connectionAlias;
-        this.connectionString = connectionString;
-        this.fields = fields;
-        this.requestTimeoutMs = requestTimeoutMs;
-        this.handlerService = handlerService;
-        this.resultHandler = resultHandler;
-    }
-
-
-    @Override
-    public void run() {
-        // Does a single fetch
-        if(LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Start new scrape of task of job {} for connection {}", jobName, connectionAlias);
-        }
-        requestCounter.incrementAndGet();
-        StopWatch stopWatch = new StopWatch();
-        stopWatch.start();
-        PlcConnection connection = null;
-        try {
-            CompletableFuture<PlcConnection> future = CompletableFuture.supplyAsync(() -> {
-                try {
-                    return driverManager.getConnection(connectionString);
-                } catch (PlcConnectionException e) {
-                    LOGGER.warn("Unable to instantiate connection to " + connectionString, e);
-                    throw new PlcRuntimeException(e);
-                }
-            }, handlerService);
-            connection = future.get(10*requestTimeoutMs, TimeUnit.MILLISECONDS);
-            LOGGER.debug("Connection to {} established: {}", connectionString, connection);
-            PlcReadResponse plcReadResponse;
-            try {
-                //build read request
-                PlcReadRequest.Builder readRequestBuilder = connection.readRequestBuilder();
-                //add fields to be acquired to builder
-                fields.forEach((alias, qry) -> {
-                    LOGGER.trace("Requesting: {} -> {}", alias, qry);
-                    readRequestBuilder.addItem(alias, qry);
-                });
-                plcReadResponse = readRequestBuilder
-                    .build()
-                    .execute()
-                    .get(requestTimeoutMs, TimeUnit.MILLISECONDS);
-            } catch (ExecutionException e) {
-                // Handle execution exception
-                handleException(e);
-                return;
-            }
-
-            LOGGER.debug("Performing statistics");
-            // Add some statistics
-            stopWatch.stop();
-            latencyStatistics.addValue(stopWatch.getNanoTime());
-            failedStatistics.addValue(0.0);
-            successCounter.incrementAndGet();
-            // Validate response
-            validateResponse(plcReadResponse);
-
-            // Handle response (Async)
-            CompletableFuture.runAsync(() -> resultHandler.handle(jobName, connectionAlias, transformResponseToMap(plcReadResponse)), handlerService);
-        } catch (Exception e) {
-            LOGGER.warn("Exception during scraping of Job {}, Connection-Alias {}: Error-message: {} - for stack-trace change logging to DEBUG", jobName,connectionAlias,e.getMessage());
-            handleException(e);
-        } finally {
-            if (connection != null) {
-                try {
-                    connection.close();
-                } catch (Exception e) {
-                    LOGGER.warn("Error on closing connection",e);
-                }
-            }
-        }
-    }
-
-    /**
-     * validate read response due to failed fields
-     * @param response acquired response
-     */
-    private void validateResponse(PlcReadResponse response) {
-        Map<String, PlcResponseCode> failedFields = response.getFieldNames().stream()
-            .filter(name -> !PlcResponseCode.OK.equals(response.getResponseCode(name)))
-            .collect(Collectors.toMap(
-                Function.identity(),
-                response::getResponseCode
-            ));
-        if (failedFields.size() > 0) {
-            handleErrorResponse(failedFields);
-        }
-    }
-
-    /**
-     * transforms the read-response to a Map of String (Key) and Object(Value)
-     * @param response response from PLC
-     * @return transformed Map
-     */
-    private Map<String, Object> transformResponseToMap(PlcReadResponse response) {
-        return response.getFieldNames().stream()
-            .collect(Collectors.toMap(
-                name -> name,
-                response::getObject
-            ));
-    }
-
-    @Override
-    public String getJobName() {
-        return jobName;
-    }
-
-    @Override
-    public String getConnectionAlias() {
-        return connectionAlias;
-    }
-
-    @Override
-    public long getRequestCounter() {
-        return requestCounter.get();
-    }
-
-    @Override
-    public long getSuccessfullRequestCounter() {
-        return successCounter.get();
-    }
-
-    @Override
-    public DescriptiveStatistics getLatencyStatistics() {
-        return latencyStatistics;
-    }
-
-    @Override
-    public double getPercentageFailed() {
-        return 100.0*failedStatistics.getMean();
-    }
-
-    @Override
-    public void handleException(Exception e) {
-        if(LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Detailed exception occurred at scraping", e);
-        }
-        failedStatistics.addValue(1.0);
-    }
-
-    @Override
-    public void handleErrorResponse(Map<String, PlcResponseCode> failed) {
-        LOGGER.warn("Handling error responses: {}", failed);
-    }
-
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper;
+
+import org.apache.commons.lang3.Validate;
+import org.apache.commons.lang3.time.StopWatch;
+import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.scraper.config.JobConfigurationClassicImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * Plc Scraper Task that scrapes one source.
+ * One {@link ScrapeJobImpl} gets split into multiple tasks.
+ * One task for each source that is defined in the {@link JobConfigurationClassicImpl}.
+ *
+ * @deprecated Scraper is deprecated please use {@link org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScrapeJobImpl} instead all functions are supplied as well see java-doc of {@link org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl}
+ */
+@Deprecated
+public class ScraperTaskImpl implements ScraperTask {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ScraperTaskImpl.class);
+
+    private final PlcDriverManager driverManager;
+    private final String jobName;
+    private final String connectionAlias;
+    private final String connectionString;
+    private final Map<String, String> fields;
+    private final long requestTimeoutMs;
+    private final ExecutorService handlerService;
+    private final ResultHandler resultHandler;
+
+    private final AtomicLong requestCounter = new AtomicLong(0);
+    private final AtomicLong successCounter = new AtomicLong(0);
+    private final DescriptiveStatistics latencyStatistics = new DescriptiveStatistics(1000);
+    private final DescriptiveStatistics failedStatistics = new DescriptiveStatistics(1000);
+
+    public ScraperTaskImpl(PlcDriverManager driverManager,
+                           String jobName,
+                           String connectionAlias,
+                           String connectionString,
+                           Map<String, String> fields,
+                           long requestTimeoutMs,
+                           ExecutorService handlerService,
+                           ResultHandler resultHandler) {
+        Validate.notNull(driverManager);
+        Validate.notBlank(jobName);
+        Validate.notBlank(connectionAlias);
+        Validate.notBlank(connectionString);
+        Validate.notEmpty(fields);
+        Validate.isTrue(requestTimeoutMs > 0);
+        Validate.notNull(resultHandler);
+        this.driverManager = driverManager;
+        this.jobName = jobName;
+        this.connectionAlias = connectionAlias;
+        this.connectionString = connectionString;
+        this.fields = fields;
+        this.requestTimeoutMs = requestTimeoutMs;
+        this.handlerService = handlerService;
+        this.resultHandler = resultHandler;
+    }
+
+
+    @Override
+    public void run() {
+        // Does a single fetch
+        if(LOGGER.isDebugEnabled()) {
+            LOGGER.debug("Start new scrape of task of job {} for connection {}", jobName, connectionAlias);
+        }
+        requestCounter.incrementAndGet();
+        StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+        PlcConnection connection = null;
+        try {
+            CompletableFuture<PlcConnection> future = CompletableFuture.supplyAsync(() -> {
+                try {
+                    return driverManager.getConnection(connectionString);
+                } catch (PlcConnectionException e) {
+                    LOGGER.warn("Unable to instantiate connection to " + connectionString, e);
+                    throw new PlcRuntimeException(e);
+                }
+            }, handlerService);
+            connection = future.get(10*requestTimeoutMs, TimeUnit.MILLISECONDS);
+            LOGGER.debug("Connection to {} established: {}", connectionString, connection);
+            PlcReadResponse plcReadResponse;
+            try {
+                //build read request
+                PlcReadRequest.Builder readRequestBuilder = connection.readRequestBuilder();
+                //add fields to be acquired to builder
+                fields.forEach((alias, qry) -> {
+                    LOGGER.trace("Requesting: {} -> {}", alias, qry);
+                    readRequestBuilder.addItem(alias, qry);
+                });
+                plcReadResponse = readRequestBuilder
+                    .build()
+                    .execute()
+                    .get(requestTimeoutMs, TimeUnit.MILLISECONDS);
+            } catch (ExecutionException e) {
+                // Handle execution exception
+                handleException(e);
+                return;
+            }
+
+            LOGGER.debug("Performing statistics");
+            // Add some statistics
+            stopWatch.stop();
+            latencyStatistics.addValue(stopWatch.getNanoTime());
+            failedStatistics.addValue(0.0);
+            successCounter.incrementAndGet();
+            // Validate response
+            validateResponse(plcReadResponse);
+
+            // Handle response (Async)
+            CompletableFuture.runAsync(() -> resultHandler.handle(jobName, connectionAlias, transformResponseToMap(plcReadResponse)), handlerService);
+        } catch (Exception e) {
+            LOGGER.warn("Exception during scraping of Job {}, Connection-Alias {}: Error-message: {} - for stack-trace change logging to DEBUG", jobName,connectionAlias,e.getMessage());
+            handleException(e);
+        } finally {
+            if (connection != null) {
+                try {
+                    connection.close();
+                } catch (Exception e) {
+                    LOGGER.warn("Error on closing connection",e);
+                }
+            }
+        }
+    }
+
+    /**
+     * validate read response due to failed fields
+     * @param response acquired response
+     */
+    private void validateResponse(PlcReadResponse response) {
+        Map<String, PlcResponseCode> failedFields = response.getFieldNames().stream()
+            .filter(name -> !PlcResponseCode.OK.equals(response.getResponseCode(name)))
+            .collect(Collectors.toMap(
+                Function.identity(),
+                response::getResponseCode
+            ));
+        if (failedFields.size() > 0) {
+            handleErrorResponse(failedFields);
+        }
+    }
+
+    /**
+     * transforms the read-response to a Map of String (Key) and Object(Value)
+     * @param response response from PLC
+     * @return transformed Map
+     */
+    private Map<String, Object> transformResponseToMap(PlcReadResponse response) {
+        return response.getFieldNames().stream()
+            .collect(Collectors.toMap(
+                name -> name,
+                response::getObject
+            ));
+    }
+
+    @Override
+    public String getJobName() {
+        return jobName;
+    }
+
+    @Override
+    public String getConnectionAlias() {
+        return connectionAlias;
+    }
+
+    @Override
+    public long getRequestCounter() {
+        return requestCounter.get();
+    }
+
+    @Override
+    public long getSuccessfullRequestCounter() {
+        return successCounter.get();
+    }
+
+    @Override
+    public DescriptiveStatistics getLatencyStatistics() {
+        return latencyStatistics;
+    }
+
+    @Override
+    public double getPercentageFailed() {
+        return 100.0*failedStatistics.getMean();
+    }
+
+    @Override
+    public void handleException(Exception e) {
+        if(LOGGER.isDebugEnabled()) {
+            LOGGER.debug("Detailed exception occurred at scraping", e);
+        }
+        failedStatistics.addValue(1.0);
+    }
+
+    @Override
+    public void handleErrorResponse(Map<String, PlcResponseCode> failed) {
+        LOGGER.warn("Handling error responses: {}", failed);
+    }
+
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/JobConfiguration.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/JobConfiguration.java
index 9c84b0b5237..6a5b496abb7 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/JobConfiguration.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/JobConfiguration.java
@@ -1,39 +1,39 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper.config;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * basic interface for the configuration of a scrape job
- */
-public interface JobConfiguration {
-    String getName();
-
-    String getTriggerConfig();
-
-    @Deprecated
-    Integer getScrapeRate();
-
-    List<String> getSources();
-
-    Map<String, String> getFields();
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper.config;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * basic interface for the configuration of a scrape job
+ */
+public interface JobConfiguration {
+    String getName();
+
+    String getTriggerConfig();
+
+    @Deprecated
+    Integer getScrapeRate();
+
+    List<String> getSources();
+
+    Map<String, String> getFields();
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/JobConfigurationClassicImpl.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/JobConfigurationClassicImpl.java
index 3ceb8e54c28..8e7d36eb3f5 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/JobConfigurationClassicImpl.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/JobConfigurationClassicImpl.java
@@ -1,49 +1,49 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper.config;
-
-import org.apache.plc4x.java.scraper.ScrapeJobImpl;
-import org.apache.plc4x.java.scraper.config.triggeredscraper.JobConfigurationTriggeredImplBuilder;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Configuration for one {@link ScrapeJobImpl} in the @{@link ScraperConfigurationClassicImpl}.
- *
- * @deprecated Scraper is deprecated please use {@link JobConfigurationTriggeredImplBuilder} instead all functions are supplied as well see java-doc of {@link org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl}
- */
-@Deprecated
-public class JobConfigurationClassicImpl extends JobConfigurationImpl {
-
-
-    /**
-     * Default constructor
-     *
-     * @param name          Job Name / identifier
-     * @param triggerConfig configuration string for triggered jobs
-     * @param scrapeRate    rate in which the data should be acquired
-     * @param sources       source alias (<b>not</b> connection string but the alias (from @{@link ScraperConfigurationClassicImpl}).
-     * @param fields        Map from field alias (how it is named in the result map) to plc4x field query
-     */
-    public JobConfigurationClassicImpl(String name, String triggerConfig, Integer scrapeRate, List<String> sources, Map<String, String> fields) {
-        super(name, triggerConfig, scrapeRate, sources, fields);
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper.config;
+
+import org.apache.plc4x.java.scraper.ScrapeJobImpl;
+import org.apache.plc4x.java.scraper.config.triggeredscraper.JobConfigurationTriggeredImplBuilder;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Configuration for one {@link ScrapeJobImpl} in the @{@link ScraperConfigurationClassicImpl}.
+ *
+ * @deprecated Scraper is deprecated please use {@link JobConfigurationTriggeredImplBuilder} instead all functions are supplied as well see java-doc of {@link org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl}
+ */
+@Deprecated
+public class JobConfigurationClassicImpl extends JobConfigurationImpl {
+
+
+    /**
+     * Default constructor
+     *
+     * @param name          Job Name / identifier
+     * @param triggerConfig configuration string for triggered jobs
+     * @param scrapeRate    rate in which the data should be acquired
+     * @param sources       source alias (<b>not</b> connection string but the alias (from @{@link ScraperConfigurationClassicImpl}).
+     * @param fields        Map from field alias (how it is named in the result map) to plc4x field query
+     */
+    public JobConfigurationClassicImpl(String name, String triggerConfig, Integer scrapeRate, List<String> sources, Map<String, String> fields) {
+        super(name, triggerConfig, scrapeRate, sources, fields);
+    }
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/JobConfigurationClassicImplBuilder.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/JobConfigurationClassicImplBuilder.java
index bbbcb2a040a..2f208347a24 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/JobConfigurationClassicImplBuilder.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/JobConfigurationClassicImplBuilder.java
@@ -1,66 +1,66 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper.config;
-
-import org.apache.plc4x.java.scraper.config.triggeredscraper.JobConfigurationTriggeredImpl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @deprecated Scraper is deprecated please use {@link JobConfigurationTriggeredImpl} instead all functions are supplied as well see java-doc of {@link org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl}
- */
-@Deprecated
-public class JobConfigurationClassicImplBuilder {
-
-    private final ScraperConfigurationClassicImplBuilder parent;
-    private final String name;
-    private final int scrapeRateMs;
-
-    private final List<String> sources = new ArrayList<>();
-    private final Map<String, String> fields = new HashMap<>();
-
-    public JobConfigurationClassicImplBuilder(ScraperConfigurationClassicImplBuilder parent, String name, int scrapeRateMs) {
-        this.parent = parent;
-        this.name = name;
-        this.scrapeRateMs = scrapeRateMs;
-    }
-
-    public JobConfigurationClassicImplBuilder source(String alias) {
-        this.sources.add(alias);
-        return this;
-    }
-
-    public JobConfigurationClassicImplBuilder field(String alias, String fieldQuery) {
-        this.fields.put(alias, fieldQuery);
-        return this;
-    }
-
-    private JobConfigurationClassicImpl buildInternal() {
-        return new JobConfigurationClassicImpl(name,null, scrapeRateMs, sources, fields);
-    }
-
-    public ScraperConfigurationClassicImplBuilder build() {
-        parent.addJobConfiguration(this.buildInternal());
-        return this.parent;
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper.config;
+
+import org.apache.plc4x.java.scraper.config.triggeredscraper.JobConfigurationTriggeredImpl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @deprecated Scraper is deprecated please use {@link JobConfigurationTriggeredImpl} instead all functions are supplied as well see java-doc of {@link org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl}
+ */
+@Deprecated
+public class JobConfigurationClassicImplBuilder {
+
+    private final ScraperConfigurationClassicImplBuilder parent;
+    private final String name;
+    private final int scrapeRateMs;
+
+    private final List<String> sources = new ArrayList<>();
+    private final Map<String, String> fields = new HashMap<>();
+
+    public JobConfigurationClassicImplBuilder(ScraperConfigurationClassicImplBuilder parent, String name, int scrapeRateMs) {
+        this.parent = parent;
+        this.name = name;
+        this.scrapeRateMs = scrapeRateMs;
+    }
+
+    public JobConfigurationClassicImplBuilder source(String alias) {
+        this.sources.add(alias);
+        return this;
+    }
+
+    public JobConfigurationClassicImplBuilder field(String alias, String fieldQuery) {
+        this.fields.put(alias, fieldQuery);
+        return this;
+    }
+
+    private JobConfigurationClassicImpl buildInternal() {
+        return new JobConfigurationClassicImpl(name,null, scrapeRateMs, sources, fields);
+    }
+
+    public ScraperConfigurationClassicImplBuilder build() {
+        parent.addJobConfiguration(this.buildInternal());
+        return this.parent;
+    }
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/JobConfigurationImpl.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/JobConfigurationImpl.java
index 9fbec9ca46a..1ad9772e68d 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/JobConfigurationImpl.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/JobConfigurationImpl.java
@@ -1,84 +1,84 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper.config;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.plc4x.java.api.exceptions.PlcNotImplementedException;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * abstract configuration for scrape-job configuration
- */
-public class JobConfigurationImpl implements JobConfiguration {
-    protected final String name;
-    protected final String triggerConfig;
-    protected final Integer scrapeRate;
-    protected final List<String> sources;
-    protected final Map<String, String> fields;
-
-    /**
-     * Default constructor
-     * @param name Job Name / identifier
-     * @param triggerConfig configuration string for triggered jobs
-     * @param scrapeRate    rate in which the data should be acquired
-     * @param sources source alias (<b>not</b> connection string but the alias (from @{@link ScraperConfigurationClassicImpl}).
-     * @param fields Map from field alias (how it is named in the result map) to plc4x field query
-     */
-    @JsonCreator
-    public JobConfigurationImpl(@JsonProperty(value = "name", required = true) String name,
-                                @JsonProperty(value = "triggerConfig") String triggerConfig,
-                                @JsonProperty(value = "scrapeRate") Integer scrapeRate,
-                                @JsonProperty(value = "sources", required = true) List<String> sources,
-                                @JsonProperty(value = "fields", required = true) Map<String, String> fields) {
-        this.name = name;
-        this.triggerConfig = triggerConfig;
-        this.scrapeRate = scrapeRate;
-        this.sources = sources;
-        this.fields = fields;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public String getTriggerConfig() {
-        return triggerConfig;
-    }
-
-    @Override
-    public List<String> getSources() {
-        return sources;
-    }
-
-    @Override
-    public Map<String, String> getFields() {
-        return fields;
-    }
-
-    @Override
-    public Integer getScrapeRate() {
-        return scrapeRate;
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper.config;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.plc4x.java.api.exceptions.PlcNotImplementedException;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * abstract configuration for scrape-job configuration
+ */
+public class JobConfigurationImpl implements JobConfiguration {
+    protected final String name;
+    protected final String triggerConfig;
+    protected final Integer scrapeRate;
+    protected final List<String> sources;
+    protected final Map<String, String> fields;
+
+    /**
+     * Default constructor
+     * @param name Job Name / identifier
+     * @param triggerConfig configuration string for triggered jobs
+     * @param scrapeRate    rate in which the data should be acquired
+     * @param sources source alias (<b>not</b> connection string but the alias (from @{@link ScraperConfigurationClassicImpl}).
+     * @param fields Map from field alias (how it is named in the result map) to plc4x field query
+     */
+    @JsonCreator
+    public JobConfigurationImpl(@JsonProperty(value = "name", required = true) String name,
+                                @JsonProperty(value = "triggerConfig") String triggerConfig,
+                                @JsonProperty(value = "scrapeRate") Integer scrapeRate,
+                                @JsonProperty(value = "sources", required = true) List<String> sources,
+                                @JsonProperty(value = "fields", required = true) Map<String, String> fields) {
+        this.name = name;
+        this.triggerConfig = triggerConfig;
+        this.scrapeRate = scrapeRate;
+        this.sources = sources;
+        this.fields = fields;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getTriggerConfig() {
+        return triggerConfig;
+    }
+
+    @Override
+    public List<String> getSources() {
+        return sources;
+    }
+
+    @Override
+    public Map<String, String> getFields() {
+        return fields;
+    }
+
+    @Override
+    public Integer getScrapeRate() {
+        return scrapeRate;
+    }
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/ScraperConfiguration.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/ScraperConfiguration.java
index c3cb2daf8cf..2a231a4bf8c 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/ScraperConfiguration.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/ScraperConfiguration.java
@@ -1,81 +1,81 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper.config;
-
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.exc.MismatchedInputException;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import org.apache.plc4x.java.scraper.ScrapeJob;
-import org.apache.plc4x.java.scraper.exception.ScraperConfigurationException;
-import org.apache.plc4x.java.scraper.exception.ScraperException;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-/**
- * interface for basic configuration of scraper
- */
-public interface ScraperConfiguration {
-    static <T>T fromYaml(String yaml, Class<T> clazz) {
-        ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
-        try {
-            return mapper.readValue(yaml, clazz);
-        } catch (IOException e) {
-            throw new ScraperConfigurationException("Unable to parse given yaml configuration!", e);
-        }
-    }
-
-    static <T>T fromJson(String json, Class<T> clazz) {
-        ObjectMapper mapper = new ObjectMapper(new JsonFactory());
-        try {
-            return mapper.readValue(json, clazz);
-        } catch (IOException e) {
-            throw new ScraperConfigurationException("Unable to parse given json configuration!", e);
-        }
-    }
-
-    static <T>T fromFile(String path, Class<T> clazz) throws IOException {
-        ObjectMapper mapper;
-        if (path.endsWith("json")) {
-            mapper = new ObjectMapper(new JsonFactory());
-        } else if (path.endsWith("yml") || path.endsWith("yaml")) {
-            mapper = new ObjectMapper(new YAMLFactory());
-        } else {
-            throw new ScraperConfigurationException("Only files with extensions json, yml or yaml can be read");
-        }
-        try {
-            return mapper.readValue(new File(path), clazz);
-        } catch (FileNotFoundException e) {
-            throw new ScraperConfigurationException("Unable to find configuration given configuration file at '" + path + "'", e);
-        } catch (MismatchedInputException e) {
-            throw new ScraperConfigurationException("Given configuration is in wrong format!", e);
-        }
-    }
-
-    Map<String, String> getSources();
-
-    List<JobConfigurationImpl> getJobConfigurations();
-
-    List<ScrapeJob> getJobs() throws ScraperException;
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper.config;
+
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.exc.MismatchedInputException;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import org.apache.plc4x.java.scraper.ScrapeJob;
+import org.apache.plc4x.java.scraper.exception.ScraperConfigurationException;
+import org.apache.plc4x.java.scraper.exception.ScraperException;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * interface for basic configuration of scraper
+ */
+public interface ScraperConfiguration {
+    static <T>T fromYaml(String yaml, Class<T> clazz) {
+        ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
+        try {
+            return mapper.readValue(yaml, clazz);
+        } catch (IOException e) {
+            throw new ScraperConfigurationException("Unable to parse given yaml configuration!", e);
+        }
+    }
+
+    static <T>T fromJson(String json, Class<T> clazz) {
+        ObjectMapper mapper = new ObjectMapper(new JsonFactory());
+        try {
+            return mapper.readValue(json, clazz);
+        } catch (IOException e) {
+            throw new ScraperConfigurationException("Unable to parse given json configuration!", e);
+        }
+    }
+
+    static <T>T fromFile(String path, Class<T> clazz) throws IOException {
+        ObjectMapper mapper;
+        if (path.endsWith("json")) {
+            mapper = new ObjectMapper(new JsonFactory());
+        } else if (path.endsWith("yml") || path.endsWith("yaml")) {
+            mapper = new ObjectMapper(new YAMLFactory());
+        } else {
+            throw new ScraperConfigurationException("Only files with extensions json, yml or yaml can be read");
+        }
+        try {
+            return mapper.readValue(new File(path), clazz);
+        } catch (FileNotFoundException e) {
+            throw new ScraperConfigurationException("Unable to find configuration given configuration file at '" + path + "'", e);
+        } catch (MismatchedInputException e) {
+            throw new ScraperConfigurationException("Given configuration is in wrong format!", e);
+        }
+    }
+
+    Map<String, String> getSources();
+
+    List<JobConfigurationImpl> getJobConfigurations();
+
+    List<ScrapeJob> getJobs() throws ScraperException;
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/ScraperConfigurationClassicImpl.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/ScraperConfigurationClassicImpl.java
index aafa373990b..0ccaa631c3a 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/ScraperConfigurationClassicImpl.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/ScraperConfigurationClassicImpl.java
@@ -1,86 +1,86 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper.config;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.plc4x.java.scraper.ScrapeJob;
-import org.apache.plc4x.java.scraper.config.triggeredscraper.ScraperConfigurationTriggeredImpl;
-import org.apache.plc4x.java.scraper.exception.ScraperConfigurationException;
-import org.apache.plc4x.java.scraper.exception.ScraperException;
-import org.apache.plc4x.java.scraper.ScraperImpl;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/**
- * Configuration class for {@link ScraperImpl}.
- *
- * @deprecated Scraper is deprecated please use {@link ScraperConfigurationTriggeredImpl} instead all functions are supplied as well see java-doc of {@link org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl}
- */
-@Deprecated
-public class ScraperConfigurationClassicImpl implements ScraperConfiguration {
-
-    private final Map<String, String> sources;
-    private final List<JobConfigurationImpl> jobConfigurations;
-
-    /**
-     * Default constructor.
-     *
-     * @param sources           Map from connection alias to connection string
-     * @param jobConfigurations List of configurations one for each Job
-     */
-    @JsonCreator
-    public ScraperConfigurationClassicImpl(@JsonProperty(value = "sources", required = true) Map<String, String> sources,
-                                           @JsonProperty(value = "jobs", required = true) List<JobConfigurationImpl> jobConfigurations) {
-        checkNoUnreferencedSources(sources, jobConfigurations);
-        this.sources = sources;
-        this.jobConfigurations = jobConfigurations;
-    }
-
-    private void checkNoUnreferencedSources(Map<String, String> sources, List<JobConfigurationImpl> jobConfigurations) {
-        Set<String> unreferencedSources = jobConfigurations.stream()
-            .flatMap(job -> job.getSources().stream())
-            .filter(source -> !sources.containsKey(source))
-            .collect(Collectors.toSet());
-        if (!unreferencedSources.isEmpty()) {
-            throw new ScraperConfigurationException("There are the following unreferenced sources: " + unreferencedSources);
-        }
-    }
-
-    @Override
-    public Map<String, String> getSources() {
-        return sources;
-    }
-
-    @Override
-    public List<JobConfigurationImpl> getJobConfigurations() {
-        return jobConfigurations;
-    }
-
-    @Override
-    public List<ScrapeJob> getJobs() throws ScraperException {
-        return ScraperConfigurationTriggeredImpl.getJobs(jobConfigurations,sources);
-    }
-
-
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper.config;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.plc4x.java.scraper.ScrapeJob;
+import org.apache.plc4x.java.scraper.config.triggeredscraper.ScraperConfigurationTriggeredImpl;
+import org.apache.plc4x.java.scraper.exception.ScraperConfigurationException;
+import org.apache.plc4x.java.scraper.exception.ScraperException;
+import org.apache.plc4x.java.scraper.ScraperImpl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Configuration class for {@link ScraperImpl}.
+ *
+ * @deprecated Scraper is deprecated please use {@link ScraperConfigurationTriggeredImpl} instead all functions are supplied as well see java-doc of {@link org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl}
+ */
+@Deprecated
+public class ScraperConfigurationClassicImpl implements ScraperConfiguration {
+
+    private final Map<String, String> sources;
+    private final List<JobConfigurationImpl> jobConfigurations;
+
+    /**
+     * Default constructor.
+     *
+     * @param sources           Map from connection alias to connection string
+     * @param jobConfigurations List of configurations one for each Job
+     */
+    @JsonCreator
+    public ScraperConfigurationClassicImpl(@JsonProperty(value = "sources", required = true) Map<String, String> sources,
+                                           @JsonProperty(value = "jobs", required = true) List<JobConfigurationImpl> jobConfigurations) {
+        checkNoUnreferencedSources(sources, jobConfigurations);
+        this.sources = sources;
+        this.jobConfigurations = jobConfigurations;
+    }
+
+    private void checkNoUnreferencedSources(Map<String, String> sources, List<JobConfigurationImpl> jobConfigurations) {
+        Set<String> unreferencedSources = jobConfigurations.stream()
+            .flatMap(job -> job.getSources().stream())
+            .filter(source -> !sources.containsKey(source))
+            .collect(Collectors.toSet());
+        if (!unreferencedSources.isEmpty()) {
+            throw new ScraperConfigurationException("There are the following unreferenced sources: " + unreferencedSources);
+        }
+    }
+
+    @Override
+    public Map<String, String> getSources() {
+        return sources;
+    }
+
+    @Override
+    public List<JobConfigurationImpl> getJobConfigurations() {
+        return jobConfigurations;
+    }
+
+    @Override
+    public List<ScrapeJob> getJobs() throws ScraperException {
+        return ScraperConfigurationTriggeredImpl.getJobs(jobConfigurations,sources);
+    }
+
+
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/ScraperConfigurationClassicImplBuilder.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/ScraperConfigurationClassicImplBuilder.java
index e64a0093418..319564cc82e 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/ScraperConfigurationClassicImplBuilder.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/ScraperConfigurationClassicImplBuilder.java
@@ -1,54 +1,54 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper.config;
-
-import org.apache.plc4x.java.scraper.config.triggeredscraper.ScraperConfigurationTriggeredImplBuilder;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @deprecated Scraper is deprecated please use {@link ScraperConfigurationTriggeredImplBuilder} instead all functions are supplied as well see java-doc of {@link org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl}
- */
-@Deprecated
-public class ScraperConfigurationClassicImplBuilder {
-
-    private final Map<String, String> sources = new HashMap<>();
-    private final List<JobConfigurationImpl> jobConfigurations = new ArrayList<>();
-
-    public ScraperConfigurationClassicImplBuilder addSource(String alias, String connectionString) {
-        sources.put(alias, connectionString);
-        return this;
-    }
-
-    public JobConfigurationClassicImplBuilder job(String name, int scrapeRateMs) {
-        return new JobConfigurationClassicImplBuilder(this, name, scrapeRateMs);
-    }
-
-    public ScraperConfiguration build() {
-        return new ScraperConfigurationClassicImpl(sources, jobConfigurations);
-    }
-
-    public void addJobConfiguration(JobConfigurationClassicImpl configuration) {
-        this.jobConfigurations.add(configuration);
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper.config;
+
+import org.apache.plc4x.java.scraper.config.triggeredscraper.ScraperConfigurationTriggeredImplBuilder;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @deprecated Scraper is deprecated please use {@link ScraperConfigurationTriggeredImplBuilder} instead all functions are supplied as well see java-doc of {@link org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl}
+ */
+@Deprecated
+public class ScraperConfigurationClassicImplBuilder {
+
+    private final Map<String, String> sources = new HashMap<>();
+    private final List<JobConfigurationImpl> jobConfigurations = new ArrayList<>();
+
+    public ScraperConfigurationClassicImplBuilder addSource(String alias, String connectionString) {
+        sources.put(alias, connectionString);
+        return this;
+    }
+
+    public JobConfigurationClassicImplBuilder job(String name, int scrapeRateMs) {
+        return new JobConfigurationClassicImplBuilder(this, name, scrapeRateMs);
+    }
+
+    public ScraperConfiguration build() {
+        return new ScraperConfigurationClassicImpl(sources, jobConfigurations);
+    }
+
+    public void addJobConfiguration(JobConfigurationClassicImpl configuration) {
+        this.jobConfigurations.add(configuration);
+    }
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/triggeredscraper/JobConfigurationTriggeredImpl.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/triggeredscraper/JobConfigurationTriggeredImpl.java
index 2ae13905e7d..491d3de3118 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/triggeredscraper/JobConfigurationTriggeredImpl.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/triggeredscraper/JobConfigurationTriggeredImpl.java
@@ -1,47 +1,47 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper.config.triggeredscraper;
-
-
-import org.apache.plc4x.java.scraper.config.JobConfigurationImpl;
-import org.apache.plc4x.java.scraper.config.ScraperConfigurationClassicImpl;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Configuration for one {@link org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScrapeJobImpl} in the {@link ScraperConfigurationTriggeredImpl}.
- */
-public class JobConfigurationTriggeredImpl extends JobConfigurationImpl {
-
-
-    /**
-     * Default constructor
-     *
-     * @param name          Job Name / identifier
-     * @param triggerConfig configuration string for triggered jobs
-     * @param scrapeRate    rate in which the data should be acquired
-     * @param sources       source alias (<b>not</b> connection string but the alias (from @{@link ScraperConfigurationClassicImpl}).
-     * @param fields        Map from field alias (how it is named in the result map) to plc4x field query
-     */
-    public JobConfigurationTriggeredImpl(String name, String triggerConfig, Integer scrapeRate, List<String> sources, Map<String, String> fields) {
-        super(name, triggerConfig, scrapeRate, sources, fields);
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper.config.triggeredscraper;
+
+
+import org.apache.plc4x.java.scraper.config.JobConfigurationImpl;
+import org.apache.plc4x.java.scraper.config.ScraperConfigurationClassicImpl;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Configuration for one {@link org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScrapeJobImpl} in the {@link ScraperConfigurationTriggeredImpl}.
+ */
+public class JobConfigurationTriggeredImpl extends JobConfigurationImpl {
+
+
+    /**
+     * Default constructor
+     *
+     * @param name          Job Name / identifier
+     * @param triggerConfig configuration string for triggered jobs
+     * @param scrapeRate    rate in which the data should be acquired
+     * @param sources       source alias (<b>not</b> connection string but the alias (from @{@link ScraperConfigurationClassicImpl}).
+     * @param fields        Map from field alias (how it is named in the result map) to plc4x field query
+     */
+    public JobConfigurationTriggeredImpl(String name, String triggerConfig, Integer scrapeRate, List<String> sources, Map<String, String> fields) {
+        super(name, triggerConfig, scrapeRate, sources, fields);
+    }
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/triggeredscraper/JobConfigurationTriggeredImplBuilder.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/triggeredscraper/JobConfigurationTriggeredImplBuilder.java
index 502e9957114..9e063e93a7a 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/triggeredscraper/JobConfigurationTriggeredImplBuilder.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/triggeredscraper/JobConfigurationTriggeredImplBuilder.java
@@ -1,71 +1,71 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper.config.triggeredscraper;
-
-import org.apache.plc4x.java.scraper.exception.ScraperConfigurationException;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class JobConfigurationTriggeredImplBuilder {
-
-    private final ScraperConfigurationTriggeredImplBuilder parent;
-    private final String name;
-    private final String triggerConfig;
-
-    private final List<String> sources = new ArrayList<>();
-    private final Map<String, String> fields = new HashMap<>();
-
-    public JobConfigurationTriggeredImplBuilder(ScraperConfigurationTriggeredImplBuilder parent, String name, String triggerConfig) {
-        if(parent==null){
-            throw new ScraperConfigurationException("parent builder cannot be null");
-        }
-        if (name == null || name.isEmpty()) {
-            throw new ScraperConfigurationException("Job name must not be null or empty");
-        }
-        this.parent = parent;
-        this.name = name;
-        this.triggerConfig = triggerConfig;
-    }
-
-    public JobConfigurationTriggeredImplBuilder source(String alias) {
-        if(alias==null || alias.isEmpty()){
-            throw new ScraperConfigurationException("source alias cannot be null or empty");
-        }
-        this.sources.add(alias);
-        return this;
-    }
-
-    public JobConfigurationTriggeredImplBuilder field(String alias, String fieldQuery) {
-        this.fields.put(alias, fieldQuery);
-        return this;
-    }
-
-    private JobConfigurationTriggeredImpl buildInternal() {
-        return new JobConfigurationTriggeredImpl(name, triggerConfig, null, sources, fields);
-    }
-
-    public ScraperConfigurationTriggeredImplBuilder build() {
-        parent.addJobConfiguration(this.buildInternal());
-        return this.parent;
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper.config.triggeredscraper;
+
+import org.apache.plc4x.java.scraper.exception.ScraperConfigurationException;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class JobConfigurationTriggeredImplBuilder {
+
+    private final ScraperConfigurationTriggeredImplBuilder parent;
+    private final String name;
+    private final String triggerConfig;
+
+    private final List<String> sources = new ArrayList<>();
+    private final Map<String, String> fields = new HashMap<>();
+
+    public JobConfigurationTriggeredImplBuilder(ScraperConfigurationTriggeredImplBuilder parent, String name, String triggerConfig) {
+        if(parent==null){
+            throw new ScraperConfigurationException("parent builder cannot be null");
+        }
+        if (name == null || name.isEmpty()) {
+            throw new ScraperConfigurationException("Job name must not be null or empty");
+        }
+        this.parent = parent;
+        this.name = name;
+        this.triggerConfig = triggerConfig;
+    }
+
+    public JobConfigurationTriggeredImplBuilder source(String alias) {
+        if(alias==null || alias.isEmpty()){
+            throw new ScraperConfigurationException("source alias cannot be null or empty");
+        }
+        this.sources.add(alias);
+        return this;
+    }
+
+    public JobConfigurationTriggeredImplBuilder field(String alias, String fieldQuery) {
+        this.fields.put(alias, fieldQuery);
+        return this;
+    }
+
+    private JobConfigurationTriggeredImpl buildInternal() {
+        return new JobConfigurationTriggeredImpl(name, triggerConfig, null, sources, fields);
+    }
+
+    public ScraperConfigurationTriggeredImplBuilder build() {
+        parent.addJobConfiguration(this.buildInternal());
+        return this.parent;
+    }
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/triggeredscraper/ScraperConfigurationTriggeredImpl.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/triggeredscraper/ScraperConfigurationTriggeredImpl.java
index af552a33976..551d0c61f4f 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/triggeredscraper/ScraperConfigurationTriggeredImpl.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/triggeredscraper/ScraperConfigurationTriggeredImpl.java
@@ -1,127 +1,127 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper.config.triggeredscraper;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.plc4x.java.scraper.ScrapeJob;
-import org.apache.plc4x.java.scraper.ScrapeJobImpl;
-import org.apache.plc4x.java.scraper.config.JobConfigurationImpl;
-import org.apache.plc4x.java.scraper.config.ScraperConfiguration;
-import org.apache.plc4x.java.scraper.exception.ScraperException;
-import org.apache.plc4x.java.scraper.config.JobConfiguration;
-import org.apache.plc4x.java.scraper.config.JobConfigurationClassicImpl;
-import org.apache.plc4x.java.scraper.exception.ScraperConfigurationException;
-import org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScrapeJobImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * Configuration class for {@link org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl}.
- */
-public class ScraperConfigurationTriggeredImpl implements ScraperConfiguration {
-    private static final Logger logger = LoggerFactory.getLogger( ScraperConfigurationTriggeredImpl.class );
-
-    private final Map<String, String> sources;
-    private final List<JobConfigurationImpl> jobConfigurations;
-
-    /**
-     * Default constructor.
-     *
-     * @param sources           Map from connection alias to connection string
-     * @param jobConfigurations List of configurations one for each Job
-     */
-    @JsonCreator
-    public ScraperConfigurationTriggeredImpl(@JsonProperty(value = "sources", required = true) Map<String, String> sources,
-                                             @JsonProperty(value = "jobs", required = true) List<JobConfigurationImpl> jobConfigurations) {
-        checkNoUnreferencedSources(sources, jobConfigurations);
-        this.sources = sources;
-        this.jobConfigurations = jobConfigurations;
-    }
-
-    private void checkNoUnreferencedSources(Map<String, String> sources, List<JobConfigurationImpl> jobConfigurations) {
-        Set<String> unreferencedSources = jobConfigurations.stream()
-            .flatMap(job -> job.getSources().stream())
-            .filter(source -> !sources.containsKey(source))
-            .collect(Collectors.toSet());
-        if (!unreferencedSources.isEmpty()) {
-            throw new ScraperConfigurationException("There are the following unreferenced sources: " + unreferencedSources);
-        }
-    }
-
-    @Override
-    public Map<String, String> getSources() {
-        return sources;
-    }
-
-    @Override
-    public List<JobConfigurationImpl> getJobConfigurations() {
-        return jobConfigurations;
-    }
-
-    @Override
-    public List<ScrapeJob> getJobs() throws ScraperException {
-        return getJobs(jobConfigurations,sources);
-    }
-
-    public static List<ScrapeJob> getJobs(List<JobConfigurationImpl> jobConfigurations, Map<String, String> sources) throws ScraperConfigurationException {
-        List<ScrapeJob> scrapeJobs = new ArrayList<>();
-        for(JobConfiguration jobConfiguration:jobConfigurations){
-            if(jobConfiguration.getTriggerConfig()!=null){
-                logger.info("Assuming job as triggered job because triggerConfig has been set");
-                scrapeJobs.add(new TriggeredScrapeJobImpl(jobConfiguration.getName(),
-                    jobConfiguration.getTriggerConfig(),
-                    getSourcesForAliases(jobConfiguration.getSources(),sources),
-                    jobConfiguration.getFields()));
-            }
-            else {
-                if(jobConfiguration.getScrapeRate()!=null){
-                    logger.info("Assuming job as classic job because triggerConfig has NOT been set but scrapeRate has.");
-                    scrapeJobs.add(new ScrapeJobImpl(
-                        jobConfiguration.getName(),
-                        jobConfiguration.getScrapeRate(),
-                        getSourcesForAliases(jobConfiguration.getSources(),sources),
-                        jobConfiguration.getFields()));
-                }
-                else {
-                    logger.info("Job has lack of trigger/scheduled config");
-                    throw new ScraperConfigurationException(
-                        String.format("Job %s was intended to be o triggered annotation, but no triggerConfig-Field could be found. Canceling!",jobConfiguration.getName()));
-                }
-            }
-        }
-        return scrapeJobs;
-    }
-
-    private static Map<String, String> getSourcesForAliases(List<String> aliases, Map<String, String> sources) {
-        return aliases.stream()
-            .collect(Collectors.toMap(
-                Function.identity(),
-                sources::get
-            ));
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper.config.triggeredscraper;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.plc4x.java.scraper.ScrapeJob;
+import org.apache.plc4x.java.scraper.ScrapeJobImpl;
+import org.apache.plc4x.java.scraper.config.JobConfigurationImpl;
+import org.apache.plc4x.java.scraper.config.ScraperConfiguration;
+import org.apache.plc4x.java.scraper.exception.ScraperException;
+import org.apache.plc4x.java.scraper.config.JobConfiguration;
+import org.apache.plc4x.java.scraper.config.JobConfigurationClassicImpl;
+import org.apache.plc4x.java.scraper.exception.ScraperConfigurationException;
+import org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScrapeJobImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * Configuration class for {@link org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl}.
+ */
+public class ScraperConfigurationTriggeredImpl implements ScraperConfiguration {
+    private static final Logger logger = LoggerFactory.getLogger( ScraperConfigurationTriggeredImpl.class );
+
+    private final Map<String, String> sources;
+    private final List<JobConfigurationImpl> jobConfigurations;
+
+    /**
+     * Default constructor.
+     *
+     * @param sources           Map from connection alias to connection string
+     * @param jobConfigurations List of configurations one for each Job
+     */
+    @JsonCreator
+    public ScraperConfigurationTriggeredImpl(@JsonProperty(value = "sources", required = true) Map<String, String> sources,
+                                             @JsonProperty(value = "jobs", required = true) List<JobConfigurationImpl> jobConfigurations) {
+        checkNoUnreferencedSources(sources, jobConfigurations);
+        this.sources = sources;
+        this.jobConfigurations = jobConfigurations;
+    }
+
+    private void checkNoUnreferencedSources(Map<String, String> sources, List<JobConfigurationImpl> jobConfigurations) {
+        Set<String> unreferencedSources = jobConfigurations.stream()
+            .flatMap(job -> job.getSources().stream())
+            .filter(source -> !sources.containsKey(source))
+            .collect(Collectors.toSet());
+        if (!unreferencedSources.isEmpty()) {
+            throw new ScraperConfigurationException("There are the following unreferenced sources: " + unreferencedSources);
+        }
+    }
+
+    @Override
+    public Map<String, String> getSources() {
+        return sources;
+    }
+
+    @Override
+    public List<JobConfigurationImpl> getJobConfigurations() {
+        return jobConfigurations;
+    }
+
+    @Override
+    public List<ScrapeJob> getJobs() throws ScraperException {
+        return getJobs(jobConfigurations,sources);
+    }
+
+    public static List<ScrapeJob> getJobs(List<JobConfigurationImpl> jobConfigurations, Map<String, String> sources) throws ScraperConfigurationException {
+        List<ScrapeJob> scrapeJobs = new ArrayList<>();
+        for(JobConfiguration jobConfiguration:jobConfigurations){
+            if(jobConfiguration.getTriggerConfig()!=null){
+                logger.info("Assuming job as triggered job because triggerConfig has been set");
+                scrapeJobs.add(new TriggeredScrapeJobImpl(jobConfiguration.getName(),
+                    jobConfiguration.getTriggerConfig(),
+                    getSourcesForAliases(jobConfiguration.getSources(),sources),
+                    jobConfiguration.getFields()));
+            }
+            else {
+                if(jobConfiguration.getScrapeRate()!=null){
+                    logger.info("Assuming job as classic job because triggerConfig has NOT been set but scrapeRate has.");
+                    scrapeJobs.add(new ScrapeJobImpl(
+                        jobConfiguration.getName(),
+                        jobConfiguration.getScrapeRate(),
+                        getSourcesForAliases(jobConfiguration.getSources(),sources),
+                        jobConfiguration.getFields()));
+                }
+                else {
+                    logger.info("Job has lack of trigger/scheduled config");
+                    throw new ScraperConfigurationException(
+                        String.format("Job %s was intended to be o triggered annotation, but no triggerConfig-Field could be found. Canceling!",jobConfiguration.getName()));
+                }
+            }
+        }
+        return scrapeJobs;
+    }
+
+    private static Map<String, String> getSourcesForAliases(List<String> aliases, Map<String, String> sources) {
+        return aliases.stream()
+            .collect(Collectors.toMap(
+                Function.identity(),
+                sources::get
+            ));
+    }
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/triggeredscraper/ScraperConfigurationTriggeredImplBuilder.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/triggeredscraper/ScraperConfigurationTriggeredImplBuilder.java
index 6c1dc642301..ec01e6a12ba 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/triggeredscraper/ScraperConfigurationTriggeredImplBuilder.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/triggeredscraper/ScraperConfigurationTriggeredImplBuilder.java
@@ -1,50 +1,50 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper.config.triggeredscraper;
-
-import org.apache.plc4x.java.scraper.config.JobConfigurationImpl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class ScraperConfigurationTriggeredImplBuilder {
-
-    private final Map<String, String> sources = new HashMap<>();
-    private final List<JobConfigurationImpl> jobConfigurations = new ArrayList<>();
-
-    public ScraperConfigurationTriggeredImplBuilder addSource(String alias, String connectionString) {
-        sources.put(alias, connectionString);
-        return this;
-    }
-
-    public JobConfigurationTriggeredImplBuilder job(String name, String triggerConfig) {
-        return new JobConfigurationTriggeredImplBuilder(this, name, triggerConfig);
-    }
-
-    public ScraperConfigurationTriggeredImpl build() {
-        return new ScraperConfigurationTriggeredImpl(sources, jobConfigurations);
-    }
-
-    public void addJobConfiguration(JobConfigurationTriggeredImpl configuration) {
-        this.jobConfigurations.add(configuration);
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper.config.triggeredscraper;
+
+import org.apache.plc4x.java.scraper.config.JobConfigurationImpl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ScraperConfigurationTriggeredImplBuilder {
+
+    private final Map<String, String> sources = new HashMap<>();
+    private final List<JobConfigurationImpl> jobConfigurations = new ArrayList<>();
+
+    public ScraperConfigurationTriggeredImplBuilder addSource(String alias, String connectionString) {
+        sources.put(alias, connectionString);
+        return this;
+    }
+
+    public JobConfigurationTriggeredImplBuilder job(String name, String triggerConfig) {
+        return new JobConfigurationTriggeredImplBuilder(this, name, triggerConfig);
+    }
+
+    public ScraperConfigurationTriggeredImpl build() {
+        return new ScraperConfigurationTriggeredImpl(sources, jobConfigurations);
+    }
+
+    public void addJobConfiguration(JobConfigurationTriggeredImpl configuration) {
+        this.jobConfigurations.add(configuration);
+    }
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/exception/ScraperConfigurationException.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/exception/ScraperConfigurationException.java
index d065711462d..e2ae4b990bf 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/exception/ScraperConfigurationException.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/exception/ScraperConfigurationException.java
@@ -1,43 +1,43 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper.exception;
-
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-
-/**
- * Is thrown when there is a problem with the Configuration.
- */
-public class ScraperConfigurationException extends PlcRuntimeException {
-    public ScraperConfigurationException(String message) {
-        super(message);
-    }
-
-    public ScraperConfigurationException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public ScraperConfigurationException(Throwable cause) {
-        super(cause);
-    }
-
-    public ScraperConfigurationException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper.exception;
+
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+
+/**
+ * Is thrown when there is a problem with the Configuration.
+ */
+public class ScraperConfigurationException extends PlcRuntimeException {
+    public ScraperConfigurationException(String message) {
+        super(message);
+    }
+
+    public ScraperConfigurationException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public ScraperConfigurationException(Throwable cause) {
+        super(cause);
+    }
+
+    public ScraperConfigurationException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/exception/ScraperException.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/exception/ScraperException.java
index 296f42b28d6..b423ce272a0 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/exception/ScraperException.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/exception/ScraperException.java
@@ -1,37 +1,37 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper.exception;
-
-/**
- * Created by timbo on 2019-03-04
- */
-public class ScraperException extends Exception {
-    /**
-     * Constructs a new exception with the specified detail message.  The
-     * cause is not initialized, and may subsequently be initialized by
-     * a call to {@link #initCause}.
-     *
-     * @param message the detail message. The detail message is saved for
-     *                later retrieval by the {@link #getMessage()} method.
-     */
-    public ScraperException(String message) {
-        super(message);
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper.exception;
+
+/**
+ * Created by timbo on 2019-03-04
+ */
+public class ScraperException extends Exception {
+    /**
+     * Constructs a new exception with the specified detail message.  The
+     * cause is not initialized, and may subsequently be initialized by
+     * a call to {@link #initCause}.
+     *
+     * @param message the detail message. The detail message is saved for
+     *                later retrieval by the {@link #getMessage()} method.
+     */
+    public ScraperException(String message) {
+        super(message);
+    }
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScrapeJobImpl.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScrapeJobImpl.java
index b9f50cc8f5e..15487fc6a4d 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScrapeJobImpl.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScrapeJobImpl.java
@@ -1,74 +1,74 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper.triggeredscraper;
-
-import org.apache.plc4x.java.scraper.ScrapeJob;
-import org.apache.plc4x.java.scraper.exception.ScraperConfigurationException;
-import org.apache.plc4x.java.scraper.exception.ScraperException;
-import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.TriggerConfiguration;
-
-import java.util.Map;
-
-public class TriggeredScrapeJobImpl implements ScrapeJob {
-    private final String jobName;
-    private final Map<String, String> sourceConnections;
-    private final Map<String, String> fields;
-    private final String triggerConfig;
-    private final TriggerConfiguration triggerConfiguration;
-
-
-    public TriggeredScrapeJobImpl(String jobName, String triggerConfig, Map<String, String> connections, Map<String, String> fields) throws ScraperConfigurationException {
-        this.jobName = jobName;
-        this.triggerConfig = triggerConfig;
-        this.sourceConnections = connections;
-        this.fields = fields;
-        this.triggerConfiguration = TriggerConfiguration.createConfiguration(triggerConfig,this);
-    }
-
-    @Override
-    public String getJobName() {
-        return this.jobName;
-    }
-
-    @Override
-    public long getScrapeRate() {
-        return triggerConfiguration.getScrapeInterval();
-    }
-
-    /**
-     * alias -&gt; connection-string
-     */
-    @Override
-    public Map<String, String> getSourceConnections() {
-        return this.sourceConnections;
-    }
-
-    /**
-     * alias -&gt; field-query
-     */
-    @Override
-    public Map<String, String> getFields() {
-        return fields;
-    }
-
-    public String getTriggerConfig() {
-        return triggerConfig;
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper.triggeredscraper;
+
+import org.apache.plc4x.java.scraper.ScrapeJob;
+import org.apache.plc4x.java.scraper.exception.ScraperConfigurationException;
+import org.apache.plc4x.java.scraper.exception.ScraperException;
+import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.TriggerConfiguration;
+
+import java.util.Map;
+
+public class TriggeredScrapeJobImpl implements ScrapeJob {
+    private final String jobName;
+    private final Map<String, String> sourceConnections;
+    private final Map<String, String> fields;
+    private final String triggerConfig;
+    private final TriggerConfiguration triggerConfiguration;
+
+
+    public TriggeredScrapeJobImpl(String jobName, String triggerConfig, Map<String, String> connections, Map<String, String> fields) throws ScraperConfigurationException {
+        this.jobName = jobName;
+        this.triggerConfig = triggerConfig;
+        this.sourceConnections = connections;
+        this.fields = fields;
+        this.triggerConfiguration = TriggerConfiguration.createConfiguration(triggerConfig,this);
+    }
+
+    @Override
+    public String getJobName() {
+        return this.jobName;
+    }
+
+    @Override
+    public long getScrapeRate() {
+        return triggerConfiguration.getScrapeInterval();
+    }
+
+    /**
+     * alias -&gt; connection-string
+     */
+    @Override
+    public Map<String, String> getSourceConnections() {
+        return this.sourceConnections;
+    }
+
+    /**
+     * alias -&gt; field-query
+     */
+    @Override
+    public Map<String, String> getFields() {
+        return fields;
+    }
+
+    public String getTriggerConfig() {
+        return triggerConfig;
+    }
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImpl.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImpl.java
index 7120369fc3f..07077682414 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImpl.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImpl.java
@@ -1,367 +1,367 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper.triggeredscraper;
-
-import org.apache.commons.collections4.MultiValuedMap;
-import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
-import org.apache.commons.lang3.Validate;
-import org.apache.commons.lang3.concurrent.BasicThreadFactory;
-import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
-import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
-import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.scraper.*;
-import org.apache.plc4x.java.scraper.config.ScraperConfiguration;
-import org.apache.plc4x.java.scraper.exception.ScraperException;
-import org.apache.plc4x.java.scraper.config.triggeredscraper.ScraperConfigurationTriggeredImpl;
-import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollector;
-import org.apache.plc4x.java.scraper.util.PercentageAboveThreshold;
-import org.apache.plc4x.java.spi.PlcDriver;
-import org.apache.plc4x.java.utils.connectionpool.PooledPlcDriverManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.management.*;
-import java.lang.management.ManagementFactory;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.concurrent.*;
-import java.util.stream.Collectors;
-
-/**
- * replaces the old Scraper that only could do scheduled scraping jobs
- * Triggers have been introduced, so that in configuration "scrapeTime" has been exchanged by "triggerConfig"
- *
- * Some example:
- *   - 200ms scheduling is now performed by "triggerConfig: (SCHEDULED,200)" in scraper-configuration
- *   - a triggered S7 variable can be used as follows:
- *     "triggerConfig: (S7_TRIGGER_VAR,10,(%M0.3:BOOL)==(true))" meaning that Boolean in Marker-Block in Byte-Offset 0, Bit-Offset 3 is scanned every 10ms, when trigger has a rising-edge the acquirement of data-block is triggered
- *     the trigger variable must be a valid address as defined with PLC4X-S7-Driver
- *     right now boolean variables as well as numeric variables could be used as data-types
- *     available comparators are ==,!= for all data-types and &gt;,&gt;=,&lt;,&lt;= for numeric data-types
- */
-public class TriggeredScraperImpl implements Scraper, TriggeredScraperMBean {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(TriggeredScraperImpl.class);
-    private static final String MX_DOMAIN = "org.apache.plc4x.java";
-
-    private static final int DEFAULT_FUTURE_TIME_OUT = 2000;
-
-    private final ScheduledExecutorService scheduler;
-    private final ExecutorService executorService;
-
-    private final ResultHandler resultHandler;
-
-    private final MultiValuedMap<ScrapeJob, ScraperTask> tasks = new ArrayListValuedHashMap<>();
-    private final MultiValuedMap<ScraperTask, ScheduledFuture<?>> scraperTaskMap = new ArrayListValuedHashMap<>();
-    private final PlcDriverManager driverManager;
-    private final List<ScrapeJob> jobs;
-    private MBeanServer mBeanServer;
-
-    private long futureTimeOut;
-
-    private final TriggerCollector triggerCollector;
-
-    /**
-     * Creates a Scraper instance from a configuration.
-     * By default a {@link PooledPlcDriverManager} is used.
-     * @param config Configuration to use.
-     * @param resultHandler handler the defines the processing of acquired data
-     * @param triggerCollector the trigger collector
-     * @throws ScraperException something went wrong
-     */
-    public TriggeredScraperImpl(ScraperConfiguration config, ResultHandler resultHandler, TriggerCollector triggerCollector) throws ScraperException {
-        this(resultHandler, createPooledDriverManager(), config.getJobs(),triggerCollector,DEFAULT_FUTURE_TIME_OUT);
-    }
-
-    /**
-     * Creates a Scraper instance from a configuration.
-     * @param config Configuration to use.
-     * @param plcDriverManager external DriverManager
-     * @param resultHandler handler the defines the processing of acquired data
-     * @param triggerCollector the trigger collector
-     * @throws ScraperException something went wrong
-     */
-    public TriggeredScraperImpl(ScraperConfiguration config, PlcDriverManager plcDriverManager, ResultHandler resultHandler,TriggerCollector triggerCollector) throws ScraperException {
-        this(resultHandler, plcDriverManager, config.getJobs(),triggerCollector,DEFAULT_FUTURE_TIME_OUT);
-    }
-
-    /**
-     * Creates a Scraper instance from a configuration.
-     * @param config Configuration to use.
-     * @param plcDriverManager external DriverManager
-     * @param resultHandler handler the defines the processing of acquired data
-     * @param triggerCollector the trigger collector
-     * @param poolSizeExecutor the pool size of the executor
-     * @param poolSizeScheduler the pool size of the scheduler
-     * @throws ScraperException something went wrong
-     */
-    public TriggeredScraperImpl(ScraperConfigurationTriggeredImpl config, PlcDriverManager plcDriverManager, ResultHandler resultHandler, TriggerCollector triggerCollector, int poolSizeScheduler, int poolSizeExecutor) throws ScraperException {
-        this(resultHandler, plcDriverManager, config.getJobs(),triggerCollector,DEFAULT_FUTURE_TIME_OUT,poolSizeScheduler,poolSizeExecutor);
-    }
-
-    /**
-     * Creates a Scraper instance from a configuration.
-     * @param plcDriverManager external DriverManager
-     * @param resultHandler handler the defines the processing of acquired data
-     * @param jobs list of jobs that scraper shall handle
-     * @param triggerCollector a collection that centralizes the trigger requests and joins them to grouped plc requests
-     * @param futureTimeOut max duration of future to return a result
-     */
-    public TriggeredScraperImpl(ResultHandler resultHandler, PlcDriverManager plcDriverManager, List<ScrapeJob> jobs,TriggerCollector triggerCollector, long futureTimeOut) {
-        this(resultHandler,plcDriverManager,jobs,triggerCollector,futureTimeOut,20,5);
-    }
-
-    public TriggeredScraperImpl(ResultHandler resultHandler, PlcDriverManager plcDriverManager, List<ScrapeJob> jobs,TriggerCollector triggerCollector, long futureTimeOut, int poolSizeScheduler, int poolSizeExecutor) {
-        this.resultHandler = resultHandler;
-        Validate.notEmpty(jobs);
-        this.driverManager = plcDriverManager;
-        this.jobs = jobs;
-        this.triggerCollector = triggerCollector;
-        this.futureTimeOut = futureTimeOut;
-
-        this.scheduler = Executors.newScheduledThreadPool(poolSizeScheduler,
-            new BasicThreadFactory.Builder()
-                .namingPattern("triggeredscraper-scheduling-thread-%d")
-                .daemon(false)
-                .build()
-        );
-
-        this.executorService = Executors.newFixedThreadPool(poolSizeExecutor,
-            new BasicThreadFactory.Builder()
-                .namingPattern("triggeredscraper-executor-thread-%d")
-                .daemon(true)
-                .build()
-        );
-
-
-        // Register MBean
-        /*mBeanServer = ManagementFactory.getPlatformMBeanServer();
-        try {
-            mBeanServer.registerMBean(this, new ObjectName(MX_DOMAIN, "scraper", "scraper"));
-        } catch (InstanceAlreadyExistsException | MBeanRegistrationException | NotCompliantMBeanException | MalformedObjectNameException e) {
-            LOGGER.debug("Unable to register Scraper as MBean", e);
-        }*/
-    }
-
-
-    /**
-     * Min Idle per Key is set to 1 for situations where the network is broken.
-     * Then, on reconnect we can fail all getConnection calls (in the ScraperTask) fast until
-     * (in the background) the idle connection is created and the getConnection call returns fast.
-     */
-    private static PooledPlcDriverManager createPooledDriverManager() {
-        return new PooledPlcDriverManager(pooledPlcConnectionFactory -> {
-            GenericKeyedObjectPoolConfig<PlcConnection> poolConfig = new GenericKeyedObjectPoolConfig<>();
-            poolConfig.setMinIdlePerKey(1);
-            poolConfig.setTestOnBorrow(true);
-            poolConfig.setTestOnReturn(true);
-            return new GenericKeyedObjectPool<>(pooledPlcConnectionFactory, poolConfig);
-        });
-    }
-
-    /**
-     * Start the scraping.
-     */
-    //ToDo code-refactoring and improved testing --> PLC4X-90
-    @Override
-    public void start() {
-        // Schedule all jobs
-        LOGGER.info("Starting jobs...");
-        //start iterating over all available jobs
-        for(ScrapeJob job:jobs){
-            //iterate over all source the jobs shall performed on
-            for(Map.Entry<String,String> sourceEntry:job.getSourceConnections().entrySet()){
-                if(LOGGER.isDebugEnabled()) {
-                    LOGGER.debug("Register task for job {} for conn {} ({}) at rate {} ms",
-                        job.getJobName(),
-                        sourceEntry.getKey(),
-                        sourceEntry.getValue(),
-                        job.getScrapeRate());
-                }
-
-                //create the regarding triggered scraper task
-                TriggeredScraperTask triggeredScraperTask;
-                try {
-                    triggeredScraperTask = new TriggeredScraperTask(
-                        driverManager,
-                        job.getJobName(),
-                        sourceEntry.getKey(),
-                        sourceEntry.getValue(),
-                        job.getFields(),
-                        futureTimeOut,
-                        executorService,
-                        resultHandler,
-                        (TriggeredScrapeJobImpl) job,
-                        triggerCollector);
-
-                    // Add task to internal list
-                    if(LOGGER.isInfoEnabled()) {
-                        LOGGER.info("Task {} added to scheduling", triggeredScraperTask);
-                    }
-                    registerTaskMBean(triggeredScraperTask);
-                    tasks.put(job, triggeredScraperTask);
-                    ScheduledFuture<?> future = scheduler.scheduleAtFixedRate(triggeredScraperTask, 0, job.getScrapeRate(), TimeUnit.MILLISECONDS);
-
-                    // Store the handle for stopping, etc.
-                    scraperTaskMap.put(triggeredScraperTask, future);
-                } catch (ScraperException e) {
-                    LOGGER.warn("Error executing the job {} for conn {} ({}) at rate {} ms",job.getJobName(), sourceEntry.getKey(), sourceEntry.getValue(), job.getScrapeRate(),e);
-                }
-            }
-
-        }
-
-        // Add statistics tracker
-        scheduler.scheduleAtFixedRate(() -> {
-            for (Map.Entry<ScrapeJob, ScraperTask> entry : tasks.entries()) {
-                DescriptiveStatistics statistics = entry.getValue().getLatencyStatistics();
-                String msg = String.format(Locale.ENGLISH, "Job statistics (%s, %s) number of requests: %d (%d success, %.1f %% failed, %.1f %% too slow), min latency: %.2f ms, mean latency: %.2f ms, median: %.2f ms",
-                    entry.getValue().getJobName(), entry.getValue().getConnectionAlias(),
-                    entry.getValue().getRequestCounter(), entry.getValue().getSuccessfullRequestCounter(),
-                    entry.getValue().getPercentageFailed(),
-                    statistics.apply(new PercentageAboveThreshold(entry.getKey().getScrapeRate() * 1e6)),
-                    statistics.getMin() * 1e-6, statistics.getMean() * 1e-6, statistics.getPercentile(50) * 1e-6);
-                if(LOGGER.isDebugEnabled()) {
-                    LOGGER.debug(msg);
-                }
-            }
-        }, 1_000, 1_000, TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * Register a task as MBean
-     * @param task task to register
-     */
-    private void registerTaskMBean(ScraperTask task) {
-        /*try {
-            mBeanServer.registerMBean(task, new ObjectName(MX_DOMAIN + ":type=ScrapeTask,name=" + task.getJobName() + "-" + task.getConnectionAlias()));
-        } catch (InstanceAlreadyExistsException | MBeanRegistrationException | NotCompliantMBeanException | MalformedObjectNameException e) {
-            LOGGER.debug("Unable to register Task as MBean", e);
-        }*/
-    }
-
-    @Override
-    public void stop() {
-        // Stop all futures
-        LOGGER.info("Stopping scraper...");
-        for (Map.Entry<ScraperTask, ScheduledFuture<?>> entry : scraperTaskMap.entries()) {
-            LOGGER.debug("Stopping task {}...", entry.getKey());
-            entry.getValue().cancel(true);
-        }
-        // Clear the map
-        scraperTaskMap.clear();
-    }
-
-    /**
-     * acquires a plc connection from connection pool
-     * @param plcDriverManager  Driver manager handling connection and pools
-     * @param connectionString  Connection string as defined in the regarding implementation of {@link PlcDriver}
-     * @param executorService   ExecuterService holding a pool as threads handling requests and stuff
-     * @param requestTimeoutMs  maximum awaiting for the the future to return a result
-     * @param info              additional info for trace reasons
-     * @return the {@link PlcConnection} used for acquiring data from PLC endpoint
-     * @throws InterruptedException something went wrong
-     * @throws ExecutionException something went wrong
-     * @throws TimeoutException something went wrong
-     */
-    public static PlcConnection getPlcConnection(PlcDriverManager plcDriverManager,
-                                                 String connectionString,
-                                                 ExecutorService executorService,
-                                                 long requestTimeoutMs,
-                                                 String info) throws InterruptedException, ExecutionException, TimeoutException {
-        if(!info.isEmpty() && LOGGER.isTraceEnabled()){
-            LOGGER.trace("Additional Info from caller {}", info);
-        }
-        CompletableFuture<PlcConnection> future = CompletableFuture.supplyAsync(() -> {
-            try {
-                return plcDriverManager.getConnection(connectionString);
-            } catch (PlcConnectionException e) {
-                LOGGER.warn("Unable to instantiate connection to " + connectionString, e);
-                throw new PlcRuntimeException(e);
-            }
-            catch (Exception e){
-                LOGGER.warn("Unable to instantiate connection to " + connectionString, e);
-                throw new PlcRuntimeException(e);
-            }
-        }, executorService);
-        if(LOGGER.isTraceEnabled()){
-            LOGGER.trace("try to get a connection to {}", connectionString);
-        }
-        PlcConnection plcConnection=null;
-        try {
-            plcConnection = future.get(requestTimeoutMs, TimeUnit.MILLISECONDS);
-        }
-        catch (Exception e){
-            LOGGER.trace("Additional Info from caller {}", info,e);
-            throw e;
-        }
-        return plcConnection;
-    }
-
-    /**
-     * acquires a plc connection from connection pool
-     * @param plcDriverManager  Driver manager handling connection and pools
-     * @param connectionString  Connection string as defined in the regarding implementation of {@link PlcDriver}
-     * @param executorService   ExecuterService holding a pool as threads handling requests and stuff
-     * @param requestTimeoutMs  maximum awaiting for the the future to return a result
-     * @return the {@link PlcConnection} used for acquiring data from PLC endpoint
-     * @throws InterruptedException something went wrong
-     * @throws ExecutionException something went wrong
-     * @throws TimeoutException something went wrong
-     */
-    public static PlcConnection getPlcConnection(PlcDriverManager plcDriverManager,
-                                                 String connectionString,
-                                                 ExecutorService executorService,
-                                                 long requestTimeoutMs) throws InterruptedException, ExecutionException, TimeoutException {
-        return getPlcConnection(plcDriverManager,connectionString,executorService,requestTimeoutMs,"");
-    }
-
-    /**
-     * transforms the results from a {@link PlcReadResponse} into a map
-     * @param plcReadResponse response that shall be converted to map for further processing
-     * @return the converted map
-     */
-    public static Map<String, Object> convertPlcResponseToMap(PlcReadResponse plcReadResponse) {
-        return plcReadResponse.getFieldNames().stream()
-            .collect(Collectors.toMap(
-                name -> name,
-                plcReadResponse::getObject
-            ));
-    }
-
-
-    // MBean methods
-    @Override
-    public boolean isRunning() {
-        // TODO is this okay so?
-        return !scraperTaskMap.isEmpty();
-    }
-
-    @Override
-    public int getNumberOfActiveTasks() {
-        return (int) scraperTaskMap.entries().stream().filter(entry -> !entry.getValue().isDone()).count();
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper.triggeredscraper;
+
+import org.apache.commons.collections4.MultiValuedMap;
+import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
+import org.apache.commons.lang3.Validate;
+import org.apache.commons.lang3.concurrent.BasicThreadFactory;
+import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
+import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
+import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.scraper.*;
+import org.apache.plc4x.java.scraper.config.ScraperConfiguration;
+import org.apache.plc4x.java.scraper.exception.ScraperException;
+import org.apache.plc4x.java.scraper.config.triggeredscraper.ScraperConfigurationTriggeredImpl;
+import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollector;
+import org.apache.plc4x.java.scraper.util.PercentageAboveThreshold;
+import org.apache.plc4x.java.spi.PlcDriver;
+import org.apache.plc4x.java.utils.connectionpool.PooledPlcDriverManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.management.*;
+import java.lang.management.ManagementFactory;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.concurrent.*;
+import java.util.stream.Collectors;
+
+/**
+ * replaces the old Scraper that only could do scheduled scraping jobs
+ * Triggers have been introduced, so that in configuration "scrapeTime" has been exchanged by "triggerConfig"
+ *
+ * Some example:
+ *   - 200ms scheduling is now performed by "triggerConfig: (SCHEDULED,200)" in scraper-configuration
+ *   - a triggered S7 variable can be used as follows:
+ *     "triggerConfig: (S7_TRIGGER_VAR,10,(%M0.3:BOOL)==(true))" meaning that Boolean in Marker-Block in Byte-Offset 0, Bit-Offset 3 is scanned every 10ms, when trigger has a rising-edge the acquirement of data-block is triggered
+ *     the trigger variable must be a valid address as defined with PLC4X-S7-Driver
+ *     right now boolean variables as well as numeric variables could be used as data-types
+ *     available comparators are ==,!= for all data-types and &gt;,&gt;=,&lt;,&lt;= for numeric data-types
+ */
+public class TriggeredScraperImpl implements Scraper, TriggeredScraperMBean {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(TriggeredScraperImpl.class);
+    private static final String MX_DOMAIN = "org.apache.plc4x.java";
+
+    private static final int DEFAULT_FUTURE_TIME_OUT = 2000;
+
+    private final ScheduledExecutorService scheduler;
+    private final ExecutorService executorService;
+
+    private final ResultHandler resultHandler;
+
+    private final MultiValuedMap<ScrapeJob, ScraperTask> tasks = new ArrayListValuedHashMap<>();
+    private final MultiValuedMap<ScraperTask, ScheduledFuture<?>> scraperTaskMap = new ArrayListValuedHashMap<>();
+    private final PlcDriverManager driverManager;
+    private final List<ScrapeJob> jobs;
+    private MBeanServer mBeanServer;
+
+    private long futureTimeOut;
+
+    private final TriggerCollector triggerCollector;
+
+    /**
+     * Creates a Scraper instance from a configuration.
+     * By default a {@link PooledPlcDriverManager} is used.
+     * @param config Configuration to use.
+     * @param resultHandler handler the defines the processing of acquired data
+     * @param triggerCollector the trigger collector
+     * @throws ScraperException something went wrong
+     */
+    public TriggeredScraperImpl(ScraperConfiguration config, ResultHandler resultHandler, TriggerCollector triggerCollector) throws ScraperException {
+        this(resultHandler, createPooledDriverManager(), config.getJobs(),triggerCollector,DEFAULT_FUTURE_TIME_OUT);
+    }
+
+    /**
+     * Creates a Scraper instance from a configuration.
+     * @param config Configuration to use.
+     * @param plcDriverManager external DriverManager
+     * @param resultHandler handler the defines the processing of acquired data
+     * @param triggerCollector the trigger collector
+     * @throws ScraperException something went wrong
+     */
+    public TriggeredScraperImpl(ScraperConfiguration config, PlcDriverManager plcDriverManager, ResultHandler resultHandler,TriggerCollector triggerCollector) throws ScraperException {
+        this(resultHandler, plcDriverManager, config.getJobs(),triggerCollector,DEFAULT_FUTURE_TIME_OUT);
+    }
+
+    /**
+     * Creates a Scraper instance from a configuration.
+     * @param config Configuration to use.
+     * @param plcDriverManager external DriverManager
+     * @param resultHandler handler the defines the processing of acquired data
+     * @param triggerCollector the trigger collector
+     * @param poolSizeExecutor the pool size of the executor
+     * @param poolSizeScheduler the pool size of the scheduler
+     * @throws ScraperException something went wrong
+     */
+    public TriggeredScraperImpl(ScraperConfigurationTriggeredImpl config, PlcDriverManager plcDriverManager, ResultHandler resultHandler, TriggerCollector triggerCollector, int poolSizeScheduler, int poolSizeExecutor) throws ScraperException {
+        this(resultHandler, plcDriverManager, config.getJobs(),triggerCollector,DEFAULT_FUTURE_TIME_OUT,poolSizeScheduler,poolSizeExecutor);
+    }
+
+    /**
+     * Creates a Scraper instance from a configuration.
+     * @param plcDriverManager external DriverManager
+     * @param resultHandler handler the defines the processing of acquired data
+     * @param jobs list of jobs that scraper shall handle
+     * @param triggerCollector a collection that centralizes the trigger requests and joins them to grouped plc requests
+     * @param futureTimeOut max duration of future to return a result
+     */
+    public TriggeredScraperImpl(ResultHandler resultHandler, PlcDriverManager plcDriverManager, List<ScrapeJob> jobs,TriggerCollector triggerCollector, long futureTimeOut) {
+        this(resultHandler,plcDriverManager,jobs,triggerCollector,futureTimeOut,20,5);
+    }
+
+    public TriggeredScraperImpl(ResultHandler resultHandler, PlcDriverManager plcDriverManager, List<ScrapeJob> jobs,TriggerCollector triggerCollector, long futureTimeOut, int poolSizeScheduler, int poolSizeExecutor) {
+        this.resultHandler = resultHandler;
+        Validate.notEmpty(jobs);
+        this.driverManager = plcDriverManager;
+        this.jobs = jobs;
+        this.triggerCollector = triggerCollector;
+        this.futureTimeOut = futureTimeOut;
+
+        this.scheduler = Executors.newScheduledThreadPool(poolSizeScheduler,
+            new BasicThreadFactory.Builder()
+                .namingPattern("triggeredscraper-scheduling-thread-%d")
+                .daemon(false)
+                .build()
+        );
+
+        this.executorService = Executors.newFixedThreadPool(poolSizeExecutor,
+            new BasicThreadFactory.Builder()
+                .namingPattern("triggeredscraper-executor-thread-%d")
+                .daemon(true)
+                .build()
+        );
+
+
+        // Register MBean
+        /*mBeanServer = ManagementFactory.getPlatformMBeanServer();
+        try {
+            mBeanServer.registerMBean(this, new ObjectName(MX_DOMAIN, "scraper", "scraper"));
+        } catch (InstanceAlreadyExistsException | MBeanRegistrationException | NotCompliantMBeanException | MalformedObjectNameException e) {
+            LOGGER.debug("Unable to register Scraper as MBean", e);
+        }*/
+    }
+
+
+    /**
+     * Min Idle per Key is set to 1 for situations where the network is broken.
+     * Then, on reconnect we can fail all getConnection calls (in the ScraperTask) fast until
+     * (in the background) the idle connection is created and the getConnection call returns fast.
+     */
+    private static PooledPlcDriverManager createPooledDriverManager() {
+        return new PooledPlcDriverManager(pooledPlcConnectionFactory -> {
+            GenericKeyedObjectPoolConfig<PlcConnection> poolConfig = new GenericKeyedObjectPoolConfig<>();
+            poolConfig.setMinIdlePerKey(1);
+            poolConfig.setTestOnBorrow(true);
+            poolConfig.setTestOnReturn(true);
+            return new GenericKeyedObjectPool<>(pooledPlcConnectionFactory, poolConfig);
+        });
+    }
+
+    /**
+     * Start the scraping.
+     */
+    //ToDo code-refactoring and improved testing --> PLC4X-90
+    @Override
+    public void start() {
+        // Schedule all jobs
+        LOGGER.info("Starting jobs...");
+        //start iterating over all available jobs
+        for(ScrapeJob job:jobs){
+            //iterate over all source the jobs shall performed on
+            for(Map.Entry<String,String> sourceEntry:job.getSourceConnections().entrySet()){
+                if(LOGGER.isDebugEnabled()) {
+                    LOGGER.debug("Register task for job {} for conn {} ({}) at rate {} ms",
+                        job.getJobName(),
+                        sourceEntry.getKey(),
+                        sourceEntry.getValue(),
+                        job.getScrapeRate());
+                }
+
+                //create the regarding triggered scraper task
+                TriggeredScraperTask triggeredScraperTask;
+                try {
+                    triggeredScraperTask = new TriggeredScraperTask(
+                        driverManager,
+                        job.getJobName(),
+                        sourceEntry.getKey(),
+                        sourceEntry.getValue(),
+                        job.getFields(),
+                        futureTimeOut,
+                        executorService,
+                        resultHandler,
+                        (TriggeredScrapeJobImpl) job,
+                        triggerCollector);
+
+                    // Add task to internal list
+                    if(LOGGER.isInfoEnabled()) {
+                        LOGGER.info("Task {} added to scheduling", triggeredScraperTask);
+                    }
+                    registerTaskMBean(triggeredScraperTask);
+                    tasks.put(job, triggeredScraperTask);
+                    ScheduledFuture<?> future = scheduler.scheduleAtFixedRate(triggeredScraperTask, 0, job.getScrapeRate(), TimeUnit.MILLISECONDS);
+
+                    // Store the handle for stopping, etc.
+                    scraperTaskMap.put(triggeredScraperTask, future);
+                } catch (ScraperException e) {
+                    LOGGER.warn("Error executing the job {} for conn {} ({}) at rate {} ms",job.getJobName(), sourceEntry.getKey(), sourceEntry.getValue(), job.getScrapeRate(),e);
+                }
+            }
+
+        }
+
+        // Add statistics tracker
+        scheduler.scheduleAtFixedRate(() -> {
+            for (Map.Entry<ScrapeJob, ScraperTask> entry : tasks.entries()) {
+                DescriptiveStatistics statistics = entry.getValue().getLatencyStatistics();
+                String msg = String.format(Locale.ENGLISH, "Job statistics (%s, %s) number of requests: %d (%d success, %.1f %% failed, %.1f %% too slow), min latency: %.2f ms, mean latency: %.2f ms, median: %.2f ms",
+                    entry.getValue().getJobName(), entry.getValue().getConnectionAlias(),
+                    entry.getValue().getRequestCounter(), entry.getValue().getSuccessfullRequestCounter(),
+                    entry.getValue().getPercentageFailed(),
+                    statistics.apply(new PercentageAboveThreshold(entry.getKey().getScrapeRate() * 1e6)),
+                    statistics.getMin() * 1e-6, statistics.getMean() * 1e-6, statistics.getPercentile(50) * 1e-6);
+                if(LOGGER.isDebugEnabled()) {
+                    LOGGER.debug(msg);
+                }
+            }
+        }, 1_000, 1_000, TimeUnit.MILLISECONDS);
+    }
+
+    /**
+     * Register a task as MBean
+     * @param task task to register
+     */
+    private void registerTaskMBean(ScraperTask task) {
+        /*try {
+            mBeanServer.registerMBean(task, new ObjectName(MX_DOMAIN + ":type=ScrapeTask,name=" + task.getJobName() + "-" + task.getConnectionAlias()));
+        } catch (InstanceAlreadyExistsException | MBeanRegistrationException | NotCompliantMBeanException | MalformedObjectNameException e) {
+            LOGGER.debug("Unable to register Task as MBean", e);
+        }*/
+    }
+
+    @Override
+    public void stop() {
+        // Stop all futures
+        LOGGER.info("Stopping scraper...");
+        for (Map.Entry<ScraperTask, ScheduledFuture<?>> entry : scraperTaskMap.entries()) {
+            LOGGER.debug("Stopping task {}...", entry.getKey());
+            entry.getValue().cancel(true);
+        }
+        // Clear the map
+        scraperTaskMap.clear();
+    }
+
+    /**
+     * acquires a plc connection from connection pool
+     * @param plcDriverManager  Driver manager handling connection and pools
+     * @param connectionString  Connection string as defined in the regarding implementation of {@link PlcDriver}
+     * @param executorService   ExecuterService holding a pool as threads handling requests and stuff
+     * @param requestTimeoutMs  maximum awaiting for the the future to return a result
+     * @param info              additional info for trace reasons
+     * @return the {@link PlcConnection} used for acquiring data from PLC endpoint
+     * @throws InterruptedException something went wrong
+     * @throws ExecutionException something went wrong
+     * @throws TimeoutException something went wrong
+     */
+    public static PlcConnection getPlcConnection(PlcDriverManager plcDriverManager,
+                                                 String connectionString,
+                                                 ExecutorService executorService,
+                                                 long requestTimeoutMs,
+                                                 String info) throws InterruptedException, ExecutionException, TimeoutException {
+        if(!info.isEmpty() && LOGGER.isTraceEnabled()){
+            LOGGER.trace("Additional Info from caller {}", info);
+        }
+        CompletableFuture<PlcConnection> future = CompletableFuture.supplyAsync(() -> {
+            try {
+                return plcDriverManager.getConnection(connectionString);
+            } catch (PlcConnectionException e) {
+                LOGGER.warn("Unable to instantiate connection to " + connectionString, e);
+                throw new PlcRuntimeException(e);
+            }
+            catch (Exception e){
+                LOGGER.warn("Unable to instantiate connection to " + connectionString, e);
+                throw new PlcRuntimeException(e);
+            }
+        }, executorService);
+        if(LOGGER.isTraceEnabled()){
+            LOGGER.trace("try to get a connection to {}", connectionString);
+        }
+        PlcConnection plcConnection=null;
+        try {
+            plcConnection = future.get(requestTimeoutMs, TimeUnit.MILLISECONDS);
+        }
+        catch (Exception e){
+            LOGGER.trace("Additional Info from caller {}", info,e);
+            throw e;
+        }
+        return plcConnection;
+    }
+
+    /**
+     * acquires a plc connection from connection pool
+     * @param plcDriverManager  Driver manager handling connection and pools
+     * @param connectionString  Connection string as defined in the regarding implementation of {@link PlcDriver}
+     * @param executorService   ExecuterService holding a pool as threads handling requests and stuff
+     * @param requestTimeoutMs  maximum awaiting for the the future to return a result
+     * @return the {@link PlcConnection} used for acquiring data from PLC endpoint
+     * @throws InterruptedException something went wrong
+     * @throws ExecutionException something went wrong
+     * @throws TimeoutException something went wrong
+     */
+    public static PlcConnection getPlcConnection(PlcDriverManager plcDriverManager,
+                                                 String connectionString,
+                                                 ExecutorService executorService,
+                                                 long requestTimeoutMs) throws InterruptedException, ExecutionException, TimeoutException {
+        return getPlcConnection(plcDriverManager,connectionString,executorService,requestTimeoutMs,"");
+    }
+
+    /**
+     * transforms the results from a {@link PlcReadResponse} into a map
+     * @param plcReadResponse response that shall be converted to map for further processing
+     * @return the converted map
+     */
+    public static Map<String, Object> convertPlcResponseToMap(PlcReadResponse plcReadResponse) {
+        return plcReadResponse.getFieldNames().stream()
+            .collect(Collectors.toMap(
+                name -> name,
+                plcReadResponse::getObject
+            ));
+    }
+
+
+    // MBean methods
+    @Override
+    public boolean isRunning() {
+        // TODO is this okay so?
+        return !scraperTaskMap.isEmpty();
+    }
+
+    @Override
+    public int getNumberOfActiveTasks() {
+        return (int) scraperTaskMap.entries().stream().filter(entry -> !entry.getValue().isDone()).count();
+    }
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperMBean.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperMBean.java
index b8e52324320..cf09cb40638 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperMBean.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperMBean.java
@@ -1,33 +1,33 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper.triggeredscraper;
-
-import org.apache.plc4x.java.scraper.Scraper;
-
-/**
- * MBean for {@link Scraper}
- */
-public interface TriggeredScraperMBean {
-
-    boolean isRunning();
-
-    int getNumberOfActiveTasks();
-
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper.triggeredscraper;
+
+import org.apache.plc4x.java.scraper.Scraper;
+
+/**
+ * MBean for {@link Scraper}
+ */
+public interface TriggeredScraperMBean {
+
+    boolean isRunning();
+
+    int getNumberOfActiveTasks();
+
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperTask.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperTask.java
index 30a765554c3..6b1e4c39b6a 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperTask.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperTask.java
@@ -1,273 +1,273 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper.triggeredscraper;
-
-import org.apache.commons.lang3.time.StopWatch;
-import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.scraper.ResultHandler;
-import org.apache.plc4x.java.scraper.ScraperTask;
-import org.apache.plc4x.java.scraper.exception.ScraperException;
-import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.TriggerHandler;
-import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.TriggerHandlerImpl;
-import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollector;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * performs the triggered task from a job for one device based on the TriggerHandler as defined in Configuration
- */
-public class TriggeredScraperTask implements ScraperTask, TriggeredScraperTaskMBean {
-    private static final Logger LOGGER = LoggerFactory.getLogger(TriggeredScraperTask.class);
-
-    private final PlcDriverManager driverManager;
-    private final String jobName;
-    private final String connectionAlias;
-    private final String connectionString;
-    private final Map<String, String> fields;
-    private final long requestTimeoutMs;
-    private final ExecutorService executorService;
-    private final ResultHandler resultHandler;
-    private final TriggerHandler triggerHandler;
-
-    private final AtomicLong requestCounter = new AtomicLong(0);
-    private final AtomicLong successCounter = new AtomicLong(0);
-    private final DescriptiveStatistics latencyStatistics = new DescriptiveStatistics(1000);
-    private final DescriptiveStatistics failedStatistics = new DescriptiveStatistics(1000);
-
-
-    public TriggeredScraperTask(PlcDriverManager driverManager,
-                                String jobName,
-                                String connectionAlias,
-                                String connectionString,
-                                Map<String, String> fields,
-                                long requestTimeoutMs,
-                                ExecutorService executorService,
-                                ResultHandler resultHandler,
-                                TriggeredScrapeJobImpl triggeredScrapeJob,
-                                TriggerCollector triggerCollector) throws ScraperException {
-        this.driverManager = driverManager;
-        this.jobName = jobName;
-        this.connectionAlias = connectionAlias;
-        this.connectionString = connectionString;
-        this.fields = fields;
-        this.requestTimeoutMs = requestTimeoutMs;
-        this.executorService = executorService;
-        this.resultHandler = resultHandler;
-        this.triggerHandler = new TriggerHandlerImpl(triggeredScrapeJob.getTriggerConfig(),triggeredScrapeJob,this,triggerCollector);
-    }
-
-    @Override
-    public void run() {
-        if(LOGGER.isTraceEnabled()) {
-            LOGGER.trace("Check condition for task of job {} for connection {}", jobName, connectionAlias);
-        }
-        if(this.triggerHandler.checkTrigger()) {
-            // Does a single fetch only when trigger is valid
-            if(LOGGER.isDebugEnabled()) {
-                LOGGER.debug("Trigger for job {} and device {} is met ... scraping desired data", jobName, connectionAlias);
-            }
-            if(LOGGER.isTraceEnabled()) {
-                LOGGER.trace("Start new scrape of task of job {} for connection {}", jobName, connectionAlias);
-            }
-            requestCounter.incrementAndGet();
-            StopWatch stopWatch = new StopWatch();
-            stopWatch.start();
-            PlcConnection connection = null;
-            try {
-                String info = "";
-                if(LOGGER.isTraceEnabled()) {
-                    info = String.format("acquiring data collecting connection to (%s,%s)", connectionAlias,jobName);
-                    LOGGER.trace("acquiring data collecting connection to ({},{})", connectionAlias,jobName);
-                }
-                connection = TriggeredScraperImpl.getPlcConnection(driverManager,connectionString,executorService,requestTimeoutMs,info);
-                if(LOGGER.isTraceEnabled()) {
-                    LOGGER.trace("Connection to {} established: {}", connectionString, connection);
-                }
-
-                PlcReadResponse plcReadResponse;
-                try {
-                    PlcReadRequest.Builder readRequestBuilder = connection.readRequestBuilder();
-                    for(Map.Entry<String,String> entry:fields.entrySet()){
-                        if(LOGGER.isTraceEnabled()) {
-                            LOGGER.trace("Requesting: {} -> {}", entry.getKey(), entry.getValue());
-                        }
-                        readRequestBuilder.addItem(entry.getKey(),entry.getValue());
-                    }
-                    //build and send request and store result in read response
-                    plcReadResponse = readRequestBuilder
-                        .build()
-                        .execute()
-                        .get(requestTimeoutMs, TimeUnit.MILLISECONDS);
-                } catch (ExecutionException e) {
-                    // Handle execution exception
-                    handleException(e);
-                    return;
-                }
-
-                // Add statistics
-                LOGGER.debug("Performing statistics");
-                stopWatch.stop();
-                latencyStatistics.addValue(stopWatch.getNanoTime());
-                failedStatistics.addValue(0.0);
-                successCounter.incrementAndGet();
-                // Validate response
-                validateResponse(plcReadResponse);
-                // Handle response (Async)
-                CompletableFuture.runAsync(() -> resultHandler.handle(jobName, connectionAlias, TriggeredScraperImpl.convertPlcResponseToMap(plcReadResponse)), executorService);
-            } catch (Exception e) {
-                LOGGER.warn("Exception during scraping of Job {}, Connection-Alias {}: Error-message: {} - for stack-trace change logging to DEBUG", jobName,connectionAlias,e.getCause());
-                handleException(e);
-            } finally {
-                if (connection != null) {
-                    try {
-                        connection.close();
-                    } catch (Exception e) {
-                        LOGGER.warn("Error on closing connection",e);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * detects if {@link PlcReadResponse} is valid
-     * @param response the {@link PlcReadResponse} that should be validated
-     */
-    private void validateResponse(PlcReadResponse response) {
-        Map<String, PlcResponseCode> failedFields = response.getFieldNames().stream()
-            .filter(name -> !PlcResponseCode.OK.equals(response.getResponseCode(name)))
-            .collect(Collectors.toMap(
-                Function.identity(),
-                response::getResponseCode
-            ));
-        if (failedFields.size() > 0) {
-            handleErrorResponse(failedFields);
-        }
-    }
-
-    @Override
-    public String getJobName() {
-        return this.jobName;
-    }
-
-    @Override
-    public String getConnectionAlias() {
-        return this.connectionAlias;
-    }
-
-    @Override
-    public long getRequestCounter() {
-        return this.requestCounter.get();
-    }
-
-    @Override
-    public long getSuccessfullRequestCounter() {
-        return this.successCounter.get();
-    }
-
-    @Override
-    public DescriptiveStatistics getLatencyStatistics() {
-        return this.latencyStatistics;
-    }
-
-    @Override
-    public void handleException(Exception e) {
-        if(LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Detailed exception occurred at scraping", e);
-        }
-        failedStatistics.addValue(1.0);
-    }
-
-    @Override
-    public void handleErrorResponse(Map<String, PlcResponseCode> failed) {
-        LOGGER.warn("Handling error responses: {}", failed);
-    }
-
-    public PlcDriverManager getDriverManager() {
-        return driverManager;
-    }
-
-    public String getConnectionString() {
-        return connectionString;
-    }
-
-    public ExecutorService getExecutorService() {
-        return executorService;
-    }
-
-    public long getRequestTimeoutMs() {
-        return requestTimeoutMs;
-    }
-
-    @Override
-    public String toString() {
-        return "TriggeredScraperTask{" +
-            "driverManager=" + driverManager +
-            ", jobName='" + jobName + '\'' +
-            ", connectionAlias='" + connectionAlias + '\'' +
-            ", connectionString='" + connectionString + '\'' +
-            ", requestTimeoutMs=" + requestTimeoutMs +
-            ", executorService=" + executorService +
-            ", resultHandler=" + resultHandler +
-            ", triggerHandler=" + triggerHandler +
-            '}';
-    }
-
-    //---------------------------------
-    // JMX Monitoring
-    //---------------------------------
-    @Override
-    public long getScrapesTotal() {
-        return requestCounter.get();
-    }
-
-    @Override
-    public long getScrapesSuccess() {
-        return successCounter.get();
-    }
-
-    @Override
-    public double getPercentageFailed() {
-        return 100.0 - (double)this.getScrapesSuccess()/this.getScrapesTotal() * 100.0;
-    }
-
-    @Override
-    public String[] getPercentiles() {
-        String[] percentiles = new String[10];
-        for (int i = 1; i <= 10; i += 1) {
-            percentiles[i - 1] = String.format("%d%%: %s ms", 10 * i, latencyStatistics.getPercentile(10.0 * i) * 1e-6);
-        }
-        return percentiles;
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper.triggeredscraper;
+
+import org.apache.commons.lang3.time.StopWatch;
+import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.scraper.ResultHandler;
+import org.apache.plc4x.java.scraper.ScraperTask;
+import org.apache.plc4x.java.scraper.exception.ScraperException;
+import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.TriggerHandler;
+import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.TriggerHandlerImpl;
+import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * performs the triggered task from a job for one device based on the TriggerHandler as defined in Configuration
+ */
+public class TriggeredScraperTask implements ScraperTask, TriggeredScraperTaskMBean {
+    private static final Logger LOGGER = LoggerFactory.getLogger(TriggeredScraperTask.class);
+
+    private final PlcDriverManager driverManager;
+    private final String jobName;
+    private final String connectionAlias;
+    private final String connectionString;
+    private final Map<String, String> fields;
+    private final long requestTimeoutMs;
+    private final ExecutorService executorService;
+    private final ResultHandler resultHandler;
+    private final TriggerHandler triggerHandler;
+
+    private final AtomicLong requestCounter = new AtomicLong(0);
+    private final AtomicLong successCounter = new AtomicLong(0);
+    private final DescriptiveStatistics latencyStatistics = new DescriptiveStatistics(1000);
+    private final DescriptiveStatistics failedStatistics = new DescriptiveStatistics(1000);
+
+
+    public TriggeredScraperTask(PlcDriverManager driverManager,
+                                String jobName,
+                                String connectionAlias,
+                                String connectionString,
+                                Map<String, String> fields,
+                                long requestTimeoutMs,
+                                ExecutorService executorService,
+                                ResultHandler resultHandler,
+                                TriggeredScrapeJobImpl triggeredScrapeJob,
+                                TriggerCollector triggerCollector) throws ScraperException {
+        this.driverManager = driverManager;
+        this.jobName = jobName;
+        this.connectionAlias = connectionAlias;
+        this.connectionString = connectionString;
+        this.fields = fields;
+        this.requestTimeoutMs = requestTimeoutMs;
+        this.executorService = executorService;
+        this.resultHandler = resultHandler;
+        this.triggerHandler = new TriggerHandlerImpl(triggeredScrapeJob.getTriggerConfig(),triggeredScrapeJob,this,triggerCollector);
+    }
+
+    @Override
+    public void run() {
+        if(LOGGER.isTraceEnabled()) {
+            LOGGER.trace("Check condition for task of job {} for connection {}", jobName, connectionAlias);
+        }
+        if(this.triggerHandler.checkTrigger()) {
+            // Does a single fetch only when trigger is valid
+            if(LOGGER.isDebugEnabled()) {
+                LOGGER.debug("Trigger for job {} and device {} is met ... scraping desired data", jobName, connectionAlias);
+            }
+            if(LOGGER.isTraceEnabled()) {
+                LOGGER.trace("Start new scrape of task of job {} for connection {}", jobName, connectionAlias);
+            }
+            requestCounter.incrementAndGet();
+            StopWatch stopWatch = new StopWatch();
+            stopWatch.start();
+            PlcConnection connection = null;
+            try {
+                String info = "";
+                if(LOGGER.isTraceEnabled()) {
+                    info = String.format("acquiring data collecting connection to (%s,%s)", connectionAlias,jobName);
+                    LOGGER.trace("acquiring data collecting connection to ({},{})", connectionAlias,jobName);
+                }
+                connection = TriggeredScraperImpl.getPlcConnection(driverManager,connectionString,executorService,requestTimeoutMs,info);
+                if(LOGGER.isTraceEnabled()) {
+                    LOGGER.trace("Connection to {} established: {}", connectionString, connection);
+                }
+
+                PlcReadResponse plcReadResponse;
+                try {
+                    PlcReadRequest.Builder readRequestBuilder = connection.readRequestBuilder();
+                    for(Map.Entry<String,String> entry:fields.entrySet()){
+                        if(LOGGER.isTraceEnabled()) {
+                            LOGGER.trace("Requesting: {} -> {}", entry.getKey(), entry.getValue());
+                        }
+                        readRequestBuilder.addItem(entry.getKey(),entry.getValue());
+                    }
+                    //build and send request and store result in read response
+                    plcReadResponse = readRequestBuilder
+                        .build()
+                        .execute()
+                        .get(requestTimeoutMs, TimeUnit.MILLISECONDS);
+                } catch (ExecutionException e) {
+                    // Handle execution exception
+                    handleException(e);
+                    return;
+                }
+
+                // Add statistics
+                LOGGER.debug("Performing statistics");
+                stopWatch.stop();
+                latencyStatistics.addValue(stopWatch.getNanoTime());
+                failedStatistics.addValue(0.0);
+                successCounter.incrementAndGet();
+                // Validate response
+                validateResponse(plcReadResponse);
+                // Handle response (Async)
+                CompletableFuture.runAsync(() -> resultHandler.handle(jobName, connectionAlias, TriggeredScraperImpl.convertPlcResponseToMap(plcReadResponse)), executorService);
+            } catch (Exception e) {
+                LOGGER.warn("Exception during scraping of Job {}, Connection-Alias {}: Error-message: {} - for stack-trace change logging to DEBUG", jobName,connectionAlias,e.getCause());
+                handleException(e);
+            } finally {
+                if (connection != null) {
+                    try {
+                        connection.close();
+                    } catch (Exception e) {
+                        LOGGER.warn("Error on closing connection",e);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * detects if {@link PlcReadResponse} is valid
+     * @param response the {@link PlcReadResponse} that should be validated
+     */
+    private void validateResponse(PlcReadResponse response) {
+        Map<String, PlcResponseCode> failedFields = response.getFieldNames().stream()
+            .filter(name -> !PlcResponseCode.OK.equals(response.getResponseCode(name)))
+            .collect(Collectors.toMap(
+                Function.identity(),
+                response::getResponseCode
+            ));
+        if (failedFields.size() > 0) {
+            handleErrorResponse(failedFields);
+        }
+    }
+
+    @Override
+    public String getJobName() {
+        return this.jobName;
+    }
+
+    @Override
+    public String getConnectionAlias() {
+        return this.connectionAlias;
+    }
+
+    @Override
+    public long getRequestCounter() {
+        return this.requestCounter.get();
+    }
+
+    @Override
+    public long getSuccessfullRequestCounter() {
+        return this.successCounter.get();
+    }
+
+    @Override
+    public DescriptiveStatistics getLatencyStatistics() {
+        return this.latencyStatistics;
+    }
+
+    @Override
+    public void handleException(Exception e) {
+        if(LOGGER.isDebugEnabled()) {
+            LOGGER.debug("Detailed exception occurred at scraping", e);
+        }
+        failedStatistics.addValue(1.0);
+    }
+
+    @Override
+    public void handleErrorResponse(Map<String, PlcResponseCode> failed) {
+        LOGGER.warn("Handling error responses: {}", failed);
+    }
+
+    public PlcDriverManager getDriverManager() {
+        return driverManager;
+    }
+
+    public String getConnectionString() {
+        return connectionString;
+    }
+
+    public ExecutorService getExecutorService() {
+        return executorService;
+    }
+
+    public long getRequestTimeoutMs() {
+        return requestTimeoutMs;
+    }
+
+    @Override
+    public String toString() {
+        return "TriggeredScraperTask{" +
+            "driverManager=" + driverManager +
+            ", jobName='" + jobName + '\'' +
+            ", connectionAlias='" + connectionAlias + '\'' +
+            ", connectionString='" + connectionString + '\'' +
+            ", requestTimeoutMs=" + requestTimeoutMs +
+            ", executorService=" + executorService +
+            ", resultHandler=" + resultHandler +
+            ", triggerHandler=" + triggerHandler +
+            '}';
+    }
+
+    //---------------------------------
+    // JMX Monitoring
+    //---------------------------------
+    @Override
+    public long getScrapesTotal() {
+        return requestCounter.get();
+    }
+
+    @Override
+    public long getScrapesSuccess() {
+        return successCounter.get();
+    }
+
+    @Override
+    public double getPercentageFailed() {
+        return 100.0 - (double)this.getScrapesSuccess()/this.getScrapesTotal() * 100.0;
+    }
+
+    @Override
+    public String[] getPercentiles() {
+        String[] percentiles = new String[10];
+        for (int i = 1; i <= 10; i += 1) {
+            percentiles[i - 1] = String.format("%d%%: %s ms", 10 * i, latencyStatistics.getPercentile(10.0 * i) * 1e-6);
+        }
+        return percentiles;
+    }
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperTaskMBean.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperTaskMBean.java
index 33c1e987c8b..e5dfab8f6f0 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperTaskMBean.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperTaskMBean.java
@@ -1,35 +1,35 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper.triggeredscraper;
-
-/**
- * MBean for a scrape job.
- */
-public interface TriggeredScraperTaskMBean {
-
-    long getScrapesTotal();
-
-    long getScrapesSuccess();
-
-    double getPercentageFailed();
-
-    String[] getPercentiles();
-
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper.triggeredscraper;
+
+/**
+ * MBean for a scrape job.
+ */
+public interface TriggeredScraperTaskMBean {
+
+    long getScrapesTotal();
+
+    long getScrapesSuccess();
+
+    double getPercentageFailed();
+
+    String[] getPercentiles();
+
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerConfiguration.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerConfiguration.java
index 9f975a8e022..e49a6cd23e8 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerConfiguration.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerConfiguration.java
@@ -1,722 +1,722 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler;
-
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.s7.model.S7Field;
-import org.apache.plc4x.java.scraper.exception.ScraperConfigurationException;
-import org.apache.plc4x.java.scraper.exception.ScraperException;
-import org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScrapeJobImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * basic configuration for all available triggers and handling of regarding condition
- */
-public class TriggerConfiguration{
-    private static final Logger logger = LoggerFactory.getLogger(TriggerConfiguration.class);
-
-    private static final String S_7_TRIGGER_VAR = "S7_TRIGGER_VAR";
-    private static final String SCHEDULED       = "SCHEDULED";
-    private static final String PREVIOUS_DEF    = "PREV";
-
-    private static final double TOLERANCE_FLOATING_EQUALITY = 1e-6;
-
-    private static final Pattern TRIGGER_STRATEGY_PATTERN =
-        Pattern.compile("\\((?<strategy>[A-Z_0-9]+),(?<scheduledInterval>\\d+)(,(\\((?<triggerVar>[^!=<>()]+)\\))((?<comp>[!=<>]{1,2}))(\\((?<compVar>[PREVa-z0-9.\\-]+)\\))((?<concatConn>[ANDOR]{2,3})(\\((?<triggerVar2>[^!=<>()]+)\\))((?<comp2>[!=<>]{1,2}))(\\((?<compVar2>[PREVa-z0-9.\\-]+)\\)))?)?\\)");
-
-    private final TriggerType triggerType;
-    private final Long scrapeInterval;
-    private TriggeredScrapeJobImpl triggeredScrapeJobImpl;
-    private List<TriggerElement> triggerElementList;
-
-    /**
-     * default constructor when an S7Field should be used for triggering
-     * @param triggerType type of trigger from enum
-     * @param scrapeInterval scrape interval of triggered variable
-     * @param triggerElementList list of triggerElemts with concat that combined is used as triger
-     * @param triggeredScrapeJobImpl the job which is valid for the configuration
-     * @throws ScraperConfigurationException when something goes wrong with configuration
-     */
-    public TriggerConfiguration(TriggerType triggerType,
-                                String scrapeInterval,
-                                List<TriggerElement> triggerElementList,
-                                TriggeredScrapeJobImpl triggeredScrapeJobImpl)
-                                throws ScraperConfigurationException {
-        this.triggerElementList = triggerElementList;
-        this.triggerType = triggerType;
-        this.triggeredScrapeJobImpl = triggeredScrapeJobImpl;
-        this.scrapeInterval = parseScrapeInterval(scrapeInterval);
-
-        String exceptionMessage;
-
-        if(this.triggerType.equals(TriggerType.S7_TRIGGER_VAR)) {
-            //test for valid field-connection string, on exception quit job and return message to user
-            if(this.triggerElementList.isEmpty()){
-                exceptionMessage = String.format("No items in trigger List for trigger-type S7_TRIGGER_VAR for Job %s!", triggeredScrapeJobImpl.getJobName());
-                throw new ScraperConfigurationException(exceptionMessage);
-            }
-            checkTriggerVarList();
-
-            //ToDo add more and other trigger
-        }
-        else{
-            exceptionMessage = String.format("TriggerType %s is not yet implemented", this.triggerType);
-            throw new ScraperConfigurationException(exceptionMessage);
-        }
-
-    }
-
-    /**
-     * default constructor when scheduled trigger shall be performed
-     * @param triggerType type of trigger from enum
-     * @param scrapeInterval scrape interval of data from block
-     * @throws ScraperConfigurationException when something goes wrong with configuration
-     */
-    public TriggerConfiguration(TriggerType triggerType, String scrapeInterval) throws ScraperConfigurationException {
-        this.triggerType = triggerType;
-        this.scrapeInterval = parseScrapeInterval(scrapeInterval);
-        this.triggerElementList = new ArrayList<>();
-    }
-
-    /**
-     * checks the trigger list for correct syntax
-     * @throws ScraperConfigurationException if syntax isn't correct an exception is thrown
-     */
-    private void checkTriggerVarList() throws ScraperConfigurationException {
-        boolean first = true;
-        for(TriggerElement triggerElement:this.triggerElementList){
-            if(!first && triggerElement.getConcatType()==null){
-                throw new ScraperConfigurationException("A concat for the second and following trigger must be given!");
-            }
-            first = false;
-        }
-    }
-
-    /**
-     * parses String of scrape interval
-     * @param scrapeInterval string extracted from RegEx
-     * @return converted value
-     * @throws ScraperConfigurationException if parsing could not be performed
-     */
-    private long parseScrapeInterval(String scrapeInterval) throws ScraperConfigurationException {
-        try {
-            return Long.parseLong(scrapeInterval);
-        }
-        catch (Exception e){
-            handleException(e);
-            String exceptionMessage = String.format("No valid numeric for scrapeInterval for Job %s: %s",triggeredScrapeJobImpl.getJobName(),scrapeInterval);
-            throw new ScraperConfigurationException(exceptionMessage);
-        }
-    }
-
-    /**
-     * evaluates the trigger dependent of base type and converts acquired respectively ref-value to the needed datatype
-     * @param acquiredValues acquired value
-     * @return true when condition is matched, false otherwise
-     * @throws ScraperException when something goes wrong
-     */
-    boolean evaluateTrigger(List<Object> acquiredValues) throws ScraperException {
-        TriggerEvaluation triggerEvaluation = new TriggerEvaluation(acquiredValues,triggerElementList);
-        return triggerEvaluation.evaluateTrigger();
-    }
-
-
-    /**
-     * defines the used base type for comparison
-     * @return the detected base type
-     * @throws ScraperException when an unsupported S7-Type is chosen,which is not (yet) implemented for comparison
-     * ToDo check how to handle time-variables if needed
-     */
-    private static Class<?> validateDataType(PlcField plcField) throws ScraperConfigurationException {
-        if(plcField!=null){
-            Class<?> javaDataType = plcField.getDefaultJavaType();
-            if(!javaDataType.equals(Boolean.class)
-                && !javaDataType.equals(Integer.class)
-                && !javaDataType.equals(Long.class)
-                && !javaDataType.equals(Double.class)
-            ){
-                String exceptionMessage = String.format("Unsupported plc-trigger variable %s with converted data-type %s used",plcField,plcField.getDefaultJavaType());
-                throw new ScraperConfigurationException(exceptionMessage);
-            }
-            return javaDataType;
-        }
-        else{
-            String exceptionMessage = String.format("Unsupported plc-trigger variable %s with converted data-type %s used",plcField,plcField.getDefaultJavaType());
-            throw new ScraperConfigurationException(exceptionMessage);
-        }
-
-    }
-
-    /**
-     * nested class performing the trigger evaluation
-     */
-    class TriggerEvaluation{
-        private List<Object> acquiredValuesList;
-        private List<TriggerElement> triggerElementList;
-
-        TriggerEvaluation(List<Object> acquiredValuesList, List<TriggerElement> triggerElementList) {
-            this.acquiredValuesList = acquiredValuesList;
-            this.triggerElementList = triggerElementList;
-        }
-
-        /**
-         * does the evaluation of the trigger conditions are met
-         * //ToDo refactor this to improve readability
-         * @return true if trigger conditions are met, false otherwise
-         * @throws ScraperException if something went wrong
-         */
-        boolean evaluateTrigger() throws ScraperException {
-            List<Boolean> triggerResultList = new ArrayList<>();
-            if(logger.isTraceEnabled()){
-                String connString = "empty";
-                if(!triggerElementList.isEmpty()) {
-                    connString = triggerElementList.get(0).getPlcConnectionString();
-                }
-                logger.trace("eval values for job {} and {}: {}",triggeredScrapeJobImpl.getJobName(),connString,acquiredValuesList);
-            }
-            //iterate through all items of acquirement-list
-            for(int countElements=0; countElements<acquiredValuesList.size();countElements++){
-                TriggerElement triggerElement = triggerElementList.get(countElements);
-                Object acquiredObject = acquiredValuesList.get(countElements);
-                if(validateDataType(triggerElement.getPlcField()).equals(Boolean.class)){
-                    //if given type is Boolean
-                    boolean currentValue;
-                    boolean refValue;
-                    try{
-                        currentValue = (boolean) acquiredObject;
-                        refValue = (boolean) triggerElement.getCompareValue();
-                    }
-                    catch (Exception e){
-                        handleException(e);
-                        return false;
-                    }
-                    if(triggerElement.getComparatorType().equals(Comparator.EQUAL)){
-                        triggerResultList.add(currentValue == refValue);
-                    }
-                    else {
-                        triggerResultList.add(currentValue != refValue);
-                    }
-                }
-                if(validateDataType(triggerElement.getPlcField()).equals(Double.class)
-                    || validateDataType(triggerElement.getPlcField()).equals(Integer.class)
-                    || validateDataType(triggerElement.getPlcField()).equals(Long.class)) {
-                    //if given type is numerical
-                    boolean skipComparison = false; //comparison shall be skipped if previous values was null
-                    double currentValue;
-                    double refValue = 0;
-                    try{
-
-                        if(acquiredObject instanceof Short){
-                            currentValue = ((Short) acquiredObject).doubleValue();
-                        }
-                        else {
-                            if (acquiredObject instanceof Integer) {
-                                currentValue = ((Integer) acquiredObject).doubleValue();
-                            }
-                            else {
-                                if (acquiredObject instanceof Long) {
-                                    currentValue = ((Long) acquiredObject).doubleValue();
-                                }
-                                else{
-                                    if (acquiredObject instanceof Double) {
-                                        currentValue = (Double) acquiredObject;
-                                    }else {
-                                        currentValue = (double) acquiredObject;
-                                    }
-                                }
-                            }
-
-                        }
-                        if(triggerElement.getPreviousMode()){
-                            if(triggerElement.getCompareValue()==null){
-                                triggerElement.setCompareValue(currentValue);
-                                triggerElement.setReservedCompareValue(currentValue);
-                                triggerResultList.add(true);
-                                if(logger.isTraceEnabled()) {
-                                    logger.trace("Initially set compare value to {}", currentValue);
-                                }
-                                skipComparison=true;
-                            }
-                            else{
-                                refValue = (double) triggerElement.getCompareValue();
-                            }
-                        }
-                        else {
-                            refValue = (double) triggerElement.getCompareValue();
-                        }
-
-                    }
-                    catch (Exception e){
-                        handleException(e);
-                        return false;
-                    }
-
-                    boolean triggerResult = false;
-                    if(!skipComparison) {
-                        switch (triggerElement.getComparatorType()) {
-                            case EQUAL:
-                                triggerResult = isApproximately(currentValue, refValue, TOLERANCE_FLOATING_EQUALITY);
-                                break;
-                            case UNEQUAL:
-                                triggerResult = !isApproximately(currentValue, refValue, TOLERANCE_FLOATING_EQUALITY);
-                                break;
-                            case SMALLER:
-                                triggerResult = currentValue < refValue;
-                                break;
-                            case SMALLER_EQUAL:
-                                triggerResult = currentValue <= refValue;
-                                break;
-                            case GREATER:
-                                triggerResult = currentValue > refValue;
-                                break;
-                            case GREATER_EQUAL:
-                                triggerResult = currentValue >= refValue;
-                                break;
-                            default:
-                                triggerResult = false;
-                        }
-                    }
-
-                    if(triggerResult && triggerElement.getPreviousMode()){
-                        triggerElement.setReservedCompareValue(currentValue);
-                        if(logger.isTraceEnabled()) {
-                            logger.trace("Subcondition matched. Previous value: {}, current compare value {} for Job {}",
-                                triggerElement.getReservedCompareValue(),
-                                triggerElement.getCompareValue(),
-                                triggerElement.getTriggerJob());
-                        }
-                    }
-                    triggerResultList.add(triggerResult);
-
-                }
-
-            }
-            if(triggerResultList.isEmpty()){
-                if(logger.isDebugEnabled()) {
-                    logger.debug("No results could be acquired - setting trigger to false");
-                }
-                return false;
-            }
-            //check if there is more then one condition for trigger
-            if(triggerResultList.size()>1) {
-                if(logger.isTraceEnabled()) {
-                    logger.trace("{}", triggerResultList);
-                }
-                boolean combinedResult=triggerResultList.get(0);
-                for (int countElements = 1; countElements < acquiredValuesList.size(); countElements++) {
-                    switch (triggerElementList.get(countElements).getConcatType()){
-                        case AND:
-                            combinedResult = combinedResult && triggerResultList.get(countElements);
-                            break;
-                        case OR:
-                            combinedResult = combinedResult || triggerResultList.get(countElements);
-                            break;
-                        default:
-                            //should not happen
-                            combinedResult = false;
-                    }
-                }
-                if(combinedResult) {
-                    triggerElementList.forEach(TriggerElement::overrideCompareValue);
-                }
-                return combinedResult;
-            }
-            else{
-                if(triggerResultList.get(0)) {
-                    triggerElementList.forEach(TriggerElement::overrideCompareValue);
-                }
-                //return first result because its the only one
-                return triggerResultList.get(0);
-            }
-        }
-    }
-
-    /**
-     * creates the TriggerConfiguration for a given ScrapeJob from triggerConfig-String
-     * @param jobTriggerStrategy config-string from file
-     * @param triggeredScrapeJob job belonging to the config
-     * @return created TriggerConfiguration
-     * @throws ScraperConfigurationException when something goes wrong
-     */
-    public static TriggerConfiguration createConfiguration(String jobTriggerStrategy,TriggeredScrapeJobImpl triggeredScrapeJob) throws ScraperConfigurationException {
-        Matcher matcher = TRIGGER_STRATEGY_PATTERN.matcher(jobTriggerStrategy);
-
-        if(matcher.matches()){
-            String triggerStrategy = matcher.group("strategy");
-            String scheduledMs = matcher.group("scheduledInterval");
-            if(logger.isDebugEnabled()) {
-                logger.debug("Strategy: {}, scheduled ms: {}", triggerStrategy, scheduledMs);
-            }
-
-            String triggerVar = matcher.group("triggerVar");
-            String comparatorString = matcher.group("comp");
-            String comparatorVariable = matcher.group("compVar");
-
-            switch (triggerStrategy){
-                case S_7_TRIGGER_VAR:
-
-                    if(triggerVar ==null || comparatorString==null || comparatorVariable==null){
-                        throw new ScraperConfigurationException("S7_TRIGGER_VAR trigger strategy needs the trigger-condition - information missing! given configString: "+jobTriggerStrategy);
-                    }
-
-                    List<TriggerElement> triggerElements = new ArrayList<>();
-
-                    TriggerElement triggerElement = new TriggerElement(
-                        comparatorString,
-                        null,
-                        comparatorVariable,
-                        triggerVar,
-                        triggerStrategy);
-
-                    triggerElement.setTriggerJob(triggeredScrapeJob.getJobName());
-
-                    triggerElements.add(triggerElement);
-
-                    String concatConn = matcher.group("concatConn");
-                    String triggerVar2 = matcher.group("triggerVar2");
-                    String comparatorString2 = matcher.group("comp2");
-                    String comparatorVariable2 = matcher.group("compVar2");
-
-                    if(triggerVar2 != null && comparatorString2 != null && comparatorVariable2 != null && concatConn != null){
-                        TriggerElement triggerElement2 = new TriggerElement(
-                            comparatorString2,
-                            concatConn,
-                            comparatorVariable2,
-                            triggerVar2,
-                            triggerStrategy);
-
-
-                        triggerElement2.setTriggerJob(triggeredScrapeJob.getJobName());
-                        triggerElements.add(triggerElement2);
-
-                    }
-
-                    //ToDo add clever Strategy to concat more than two conditions if needed
-                    return new TriggerConfiguration(TriggerType.S7_TRIGGER_VAR,scheduledMs,triggerElements,triggeredScrapeJob);
-                case SCHEDULED:
-                    if(triggerVar !=null || comparatorString!=null || comparatorVariable!=null){
-                        throw new ScraperConfigurationException("SCHEDULED trigger strategy must only be used with scheduled interval - nothing more!  given configString: "+jobTriggerStrategy);
-                    }
-                    return new TriggerConfiguration(TriggerType.SCHEDULED,scheduledMs);
-                default:
-                    throw new ScraperConfigurationException("Unknown Trigger Strategy "+triggerStrategy);
-            }
-
-
-        }
-        throw new ScraperConfigurationException("Invalid trigger strategy string description: "+jobTriggerStrategy);
-    }
-
-    private void handleException(Exception e){
-        //push up if needed
-        if(logger.isDebugEnabled()) {
-            logger.debug("Exception: ", e);
-        }
-    }
-
-    TriggerType getTriggerType() {
-        return triggerType;
-    }
-
-    public long getScrapeInterval() {
-        return scrapeInterval;
-    }
-
-    public List<TriggerElement> getTriggerElementList() {
-        return triggerElementList;
-    }
-
-    /**
-     * check for approximate equality to avoid "Floating-point expressions shall not be tested for equality or inequality." Sonar-Bug
-     * @param self current value
-     * @param other reference value
-     * @param within tolerance band
-     * @return if approximate equal, false otherwise
-     */
-    private static boolean isApproximately(double self, double other, double within)
-    {
-        return Math.abs(self - other) <= within;
-    }
-
-    public enum Comparator {
-        EQUAL,
-        UNEQUAL,
-        GREATER,
-        GREATER_EQUAL,
-        SMALLER,
-        SMALLER_EQUAL
-    }
-
-    //ToDo replace constant TriggerType by more generic ones --> PLC4X-89
-    public enum TriggerType {
-        SCHEDULED,
-        S7_TRIGGER_VAR
-    }
-
-    public enum ConcatType {
-        AND,
-        OR
-    }
-
-    public static class TriggerElement{
-        private Comparator comparatorType;
-        private ConcatType concatType;
-        //if trigger should be compared to previous value
-        private Boolean previousMode;
-        private Object compareValue;
-        private PlcField plcField;
-        private String plcFieldString;
-
-        private String plcConnectionString;
-
-        private String uuid;
-
-        private String triggerJob;
-
-        //storage for overwrite if condition matched
-        private Object reservedCompareValue;
-
-        public TriggerElement() {
-            this.comparatorType = null;
-            this.concatType = null;
-            this.previousMode = false;
-            this.compareValue = null;
-            this.plcField = null;
-            this.plcFieldString = null;
-            this.reservedCompareValue = null;
-            this.plcConnectionString="not defined";
-            this.triggerJob = "Not yet defined";
-            this.uuid = "";
-        }
-
-        public TriggerElement(Comparator comparatorType, ConcatType concatType, Boolean previousMode, Object compareValue, PlcField plcField, String plcFieldString) {
-            this.comparatorType = comparatorType;
-            this.concatType = concatType;
-            this.previousMode = previousMode;
-            this.compareValue = compareValue;
-            this.plcField = plcField;
-            this.plcFieldString = plcFieldString;
-        }
-
-        public TriggerElement(Comparator comparatorType, Object compareValue, PlcField plcField) {
-            this();
-            this.comparatorType = comparatorType;
-            this.compareValue = compareValue;
-            this.plcField = plcField;
-        }
-
-        TriggerElement(String comparator, String concatType, String compareValue, String plcField, String triggerStrategy) throws ScraperConfigurationException {
-            this();
-            this.plcFieldString = plcField;
-            this.plcConnectionString = plcConnectionString;
-            if(triggerStrategy.equals(S_7_TRIGGER_VAR)){
-                try {
-                    this.plcField = S7Field.of(this.plcFieldString);
-                }
-                catch (Exception e){
-                    if(logger.isDebugEnabled()) {
-                        logger.debug("Exception occurred parsing a S7Field");
-                    }
-                    throw new ScraperConfigurationException("Exception on parsing S7Field (" + plcField + "): " + e.getMessage());
-                }
-                this.compareValue = convertCompareValue(compareValue,this.plcField);
-                this.comparatorType = detectComparatorType(comparator);
-                matchTypeAndComparator();
-            }
-
-            this.concatType = detectConcatType(concatType);
-
-        }
-
-
-        /**
-         * parses the ref-value to a given value, as well as checking if ref-value matches to the given data-type
-         * @param compareValue compare-value extracted by regex
-         * @return converted object to needed data-type
-         * @throws ScraperException when something does not match or parsing fails
-         */
-        private Object convertCompareValue(String compareValue, PlcField plcField) throws ScraperConfigurationException {
-            Class<?> javaDataType = validateDataType(plcField);
-            if(javaDataType.equals(Boolean.class)){
-                switch (compareValue){
-                    case "1":
-                    case "true":
-                        return true;
-                    case "0":
-                    case "false":
-                        return false;
-                    default:
-                        String exceptionMessage = String.format("No valid compare Value at DataType Boolean for trigger: %s",compareValue);
-                        throw new ScraperConfigurationException(exceptionMessage);
-                }
-            }
-            if(javaDataType.equals(Double.class)
-                || javaDataType.equals(Integer.class)
-                || javaDataType.equals(Long.class)){
-                try {
-                    //everything fits to Double for conversion ... so for first step use only double
-                    //ToDo if different handling dependent on specific datatype is needed then differ
-                    if(PREVIOUS_DEF.equals(compareValue)){
-                        this.previousMode=true;
-                        return null;
-                    }
-                    return Double.parseDouble(compareValue);
-                }
-                catch (Exception e){
-                    logger.debug(e.getMessage(), e);
-                    String exceptionMessage = String.format("No valid compare Value at DataType Numeric for trigger: %s",compareValue);
-                    throw new ScraperConfigurationException(exceptionMessage);
-                }
-            }
-            String exceptionMessage = "Invalid Datatype detected ... should not happen and be catcht earlier - please report";
-            throw new ScraperConfigurationException(exceptionMessage);
-        }
-
-        /**
-         * converts parsed comparator from regex to ComparatorType
-         * @throws ScraperException when no valid comparator has been used
-         */
-        private Comparator detectComparatorType(String comparator) throws ScraperConfigurationException {
-            switch (comparator){
-                case "==":
-                    return Comparator.EQUAL;
-                case "!=":
-                    return Comparator.UNEQUAL;
-                case "<=":
-                    return Comparator.SMALLER_EQUAL;
-                case "<":
-                    return Comparator.SMALLER;
-                case ">=":
-                    return Comparator.GREATER_EQUAL;
-                case ">":
-                    return Comparator.GREATER;
-                default:
-                    throw new ScraperConfigurationException("Invalid comparator detected!");
-            }
-        }
-
-        /**
-         * convertes parsed comparator from regex to ComparatorType
-         * @throws ScraperException when no valid comparator has been used
-         */
-        private ConcatType detectConcatType(String concat) throws ScraperConfigurationException {
-            //concat is not necessary in every case, correct usage is checked later on
-            if(concat==null){
-                return null;
-            }
-            switch (concat){
-                case "AND":
-                    return ConcatType.AND;
-                case "OR":
-                    return ConcatType.OR;
-                default:
-                    throw new ScraperConfigurationException("Invalid concat between triggerVars detected: "+concat);
-            }
-        }
-
-        /**
-         * matches data-type and comparator for a valid combination
-         * @throws ScraperException when invalid combination is detected
-         */
-        private void matchTypeAndComparator() throws ScraperConfigurationException {
-            if(validateDataType(this.plcField).equals(Boolean.class)
-                && !(this.comparatorType.equals(Comparator.EQUAL) || this.comparatorType.equals(Comparator.UNEQUAL))){
-                String exceptionMessage = String.format("Trigger-Data-Type (%s) and Comparator (%s) do not match",this.plcField.getDefaultJavaType(),this.comparatorType);
-                throw new ScraperConfigurationException(exceptionMessage);
-            }
-            //all other combinations are valid
-        }
-
-        Comparator getComparatorType() {
-            return comparatorType;
-        }
-
-        ConcatType getConcatType() {
-            return concatType;
-        }
-
-        Boolean getPreviousMode() {
-            return previousMode;
-        }
-
-        Object getCompareValue() {
-            return compareValue;
-        }
-
-        PlcField getPlcField() {
-            return plcField;
-        }
-
-        String getPlcFieldString() {
-            return plcFieldString;
-        }
-
-        void setCompareValue(Object compareValue) {
-            this.compareValue = compareValue;
-        }
-
-        Object getReservedCompareValue() {
-            return reservedCompareValue;
-        }
-
-        void setReservedCompareValue(Object reservedCompareValue) {
-            this.reservedCompareValue = reservedCompareValue;
-        }
-
-        String getTriggerJob() {
-            return triggerJob;
-        }
-
-        void setTriggerJob(String triggerJob) {
-            this.triggerJob = triggerJob;
-        }
-
-        void overrideCompareValue(){
-            if(this.previousMode && this.reservedCompareValue!=null){
-                if(logger.isDebugEnabled()) {
-                    logger.debug("Compare value overridden, before: {}, now: {}; for Trigger {}", this.compareValue, this.reservedCompareValue, this.triggerJob);
-                }
-                this.compareValue = this.reservedCompareValue;
-            }
-        }
-
-        public String getPlcConnectionString() {
-            return plcConnectionString;
-        }
-
-        public void setPlcConnectionString(String plcConnectionString) {
-            this.plcConnectionString = plcConnectionString;
-        }
-
-        public String getUuid() {
-            return uuid;
-        }
-
-        public void setUuid(String uuid) {
-            this.uuid = uuid;
-        }
-    }
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler;
+
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.s7.model.S7Field;
+import org.apache.plc4x.java.scraper.exception.ScraperConfigurationException;
+import org.apache.plc4x.java.scraper.exception.ScraperException;
+import org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScrapeJobImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * basic configuration for all available triggers and handling of regarding condition
+ */
+public class TriggerConfiguration{
+    private static final Logger logger = LoggerFactory.getLogger(TriggerConfiguration.class);
+
+    private static final String S_7_TRIGGER_VAR = "S7_TRIGGER_VAR";
+    private static final String SCHEDULED       = "SCHEDULED";
+    private static final String PREVIOUS_DEF    = "PREV";
+
+    private static final double TOLERANCE_FLOATING_EQUALITY = 1e-6;
+
+    private static final Pattern TRIGGER_STRATEGY_PATTERN =
+        Pattern.compile("\\((?<strategy>[A-Z_0-9]+),(?<scheduledInterval>\\d+)(,(\\((?<triggerVar>[^!=<>()]+)\\))((?<comp>[!=<>]{1,2}))(\\((?<compVar>[PREVa-z0-9.\\-]+)\\))((?<concatConn>[ANDOR]{2,3})(\\((?<triggerVar2>[^!=<>()]+)\\))((?<comp2>[!=<>]{1,2}))(\\((?<compVar2>[PREVa-z0-9.\\-]+)\\)))?)?\\)");
+
+    private final TriggerType triggerType;
+    private final Long scrapeInterval;
+    private TriggeredScrapeJobImpl triggeredScrapeJobImpl;
+    private List<TriggerElement> triggerElementList;
+
+    /**
+     * default constructor when an S7Field should be used for triggering
+     * @param triggerType type of trigger from enum
+     * @param scrapeInterval scrape interval of triggered variable
+     * @param triggerElementList list of triggerElemts with concat that combined is used as triger
+     * @param triggeredScrapeJobImpl the job which is valid for the configuration
+     * @throws ScraperConfigurationException when something goes wrong with configuration
+     */
+    public TriggerConfiguration(TriggerType triggerType,
+                                String scrapeInterval,
+                                List<TriggerElement> triggerElementList,
+                                TriggeredScrapeJobImpl triggeredScrapeJobImpl)
+                                throws ScraperConfigurationException {
+        this.triggerElementList = triggerElementList;
+        this.triggerType = triggerType;
+        this.triggeredScrapeJobImpl = triggeredScrapeJobImpl;
+        this.scrapeInterval = parseScrapeInterval(scrapeInterval);
+
+        String exceptionMessage;
+
+        if(this.triggerType.equals(TriggerType.S7_TRIGGER_VAR)) {
+            //test for valid field-connection string, on exception quit job and return message to user
+            if(this.triggerElementList.isEmpty()){
+                exceptionMessage = String.format("No items in trigger List for trigger-type S7_TRIGGER_VAR for Job %s!", triggeredScrapeJobImpl.getJobName());
+                throw new ScraperConfigurationException(exceptionMessage);
+            }
+            checkTriggerVarList();
+
+            //ToDo add more and other trigger
+        }
+        else{
+            exceptionMessage = String.format("TriggerType %s is not yet implemented", this.triggerType);
+            throw new ScraperConfigurationException(exceptionMessage);
+        }
+
+    }
+
+    /**
+     * default constructor when scheduled trigger shall be performed
+     * @param triggerType type of trigger from enum
+     * @param scrapeInterval scrape interval of data from block
+     * @throws ScraperConfigurationException when something goes wrong with configuration
+     */
+    public TriggerConfiguration(TriggerType triggerType, String scrapeInterval) throws ScraperConfigurationException {
+        this.triggerType = triggerType;
+        this.scrapeInterval = parseScrapeInterval(scrapeInterval);
+        this.triggerElementList = new ArrayList<>();
+    }
+
+    /**
+     * checks the trigger list for correct syntax
+     * @throws ScraperConfigurationException if syntax isn't correct an exception is thrown
+     */
+    private void checkTriggerVarList() throws ScraperConfigurationException {
+        boolean first = true;
+        for(TriggerElement triggerElement:this.triggerElementList){
+            if(!first && triggerElement.getConcatType()==null){
+                throw new ScraperConfigurationException("A concat for the second and following trigger must be given!");
+            }
+            first = false;
+        }
+    }
+
+    /**
+     * parses String of scrape interval
+     * @param scrapeInterval string extracted from RegEx
+     * @return converted value
+     * @throws ScraperConfigurationException if parsing could not be performed
+     */
+    private long parseScrapeInterval(String scrapeInterval) throws ScraperConfigurationException {
+        try {
+            return Long.parseLong(scrapeInterval);
+        }
+        catch (Exception e){
+            handleException(e);
+            String exceptionMessage = String.format("No valid numeric for scrapeInterval for Job %s: %s",triggeredScrapeJobImpl.getJobName(),scrapeInterval);
+            throw new ScraperConfigurationException(exceptionMessage);
+        }
+    }
+
+    /**
+     * evaluates the trigger dependent of base type and converts acquired respectively ref-value to the needed datatype
+     * @param acquiredValues acquired value
+     * @return true when condition is matched, false otherwise
+     * @throws ScraperException when something goes wrong
+     */
+    boolean evaluateTrigger(List<Object> acquiredValues) throws ScraperException {
+        TriggerEvaluation triggerEvaluation = new TriggerEvaluation(acquiredValues,triggerElementList);
+        return triggerEvaluation.evaluateTrigger();
+    }
+
+
+    /**
+     * defines the used base type for comparison
+     * @return the detected base type
+     * @throws ScraperException when an unsupported S7-Type is chosen,which is not (yet) implemented for comparison
+     * ToDo check how to handle time-variables if needed
+     */
+    private static Class<?> validateDataType(PlcField plcField) throws ScraperConfigurationException {
+        if(plcField!=null){
+            Class<?> javaDataType = plcField.getDefaultJavaType();
+            if(!javaDataType.equals(Boolean.class)
+                && !javaDataType.equals(Integer.class)
+                && !javaDataType.equals(Long.class)
+                && !javaDataType.equals(Double.class)
+            ){
+                String exceptionMessage = String.format("Unsupported plc-trigger variable %s with converted data-type %s used",plcField,plcField.getDefaultJavaType());
+                throw new ScraperConfigurationException(exceptionMessage);
+            }
+            return javaDataType;
+        }
+        else{
+            String exceptionMessage = String.format("Unsupported plc-trigger variable %s with converted data-type %s used",plcField,plcField.getDefaultJavaType());
+            throw new ScraperConfigurationException(exceptionMessage);
+        }
+
+    }
+
+    /**
+     * nested class performing the trigger evaluation
+     */
+    class TriggerEvaluation{
+        private List<Object> acquiredValuesList;
+        private List<TriggerElement> triggerElementList;
+
+        TriggerEvaluation(List<Object> acquiredValuesList, List<TriggerElement> triggerElementList) {
+            this.acquiredValuesList = acquiredValuesList;
+            this.triggerElementList = triggerElementList;
+        }
+
+        /**
+         * does the evaluation of the trigger conditions are met
+         * //ToDo refactor this to improve readability
+         * @return true if trigger conditions are met, false otherwise
+         * @throws ScraperException if something went wrong
+         */
+        boolean evaluateTrigger() throws ScraperException {
+            List<Boolean> triggerResultList = new ArrayList<>();
+            if(logger.isTraceEnabled()){
+                String connString = "empty";
+                if(!triggerElementList.isEmpty()) {
+                    connString = triggerElementList.get(0).getPlcConnectionString();
+                }
+                logger.trace("eval values for job {} and {}: {}",triggeredScrapeJobImpl.getJobName(),connString,acquiredValuesList);
+            }
+            //iterate through all items of acquirement-list
+            for(int countElements=0; countElements<acquiredValuesList.size();countElements++){
+                TriggerElement triggerElement = triggerElementList.get(countElements);
+                Object acquiredObject = acquiredValuesList.get(countElements);
+                if(validateDataType(triggerElement.getPlcField()).equals(Boolean.class)){
+                    //if given type is Boolean
+                    boolean currentValue;
+                    boolean refValue;
+                    try{
+                        currentValue = (boolean) acquiredObject;
+                        refValue = (boolean) triggerElement.getCompareValue();
+                    }
+                    catch (Exception e){
+                        handleException(e);
+                        return false;
+                    }
+                    if(triggerElement.getComparatorType().equals(Comparator.EQUAL)){
+                        triggerResultList.add(currentValue == refValue);
+                    }
+                    else {
+                        triggerResultList.add(currentValue != refValue);
+                    }
+                }
+                if(validateDataType(triggerElement.getPlcField()).equals(Double.class)
+                    || validateDataType(triggerElement.getPlcField()).equals(Integer.class)
+                    || validateDataType(triggerElement.getPlcField()).equals(Long.class)) {
+                    //if given type is numerical
+                    boolean skipComparison = false; //comparison shall be skipped if previous values was null
+                    double currentValue;
+                    double refValue = 0;
+                    try{
+
+                        if(acquiredObject instanceof Short){
+                            currentValue = ((Short) acquiredObject).doubleValue();
+                        }
+                        else {
+                            if (acquiredObject instanceof Integer) {
+                                currentValue = ((Integer) acquiredObject).doubleValue();
+                            }
+                            else {
+                                if (acquiredObject instanceof Long) {
+                                    currentValue = ((Long) acquiredObject).doubleValue();
+                                }
+                                else{
+                                    if (acquiredObject instanceof Double) {
+                                        currentValue = (Double) acquiredObject;
+                                    }else {
+                                        currentValue = (double) acquiredObject;
+                                    }
+                                }
+                            }
+
+                        }
+                        if(triggerElement.getPreviousMode()){
+                            if(triggerElement.getCompareValue()==null){
+                                triggerElement.setCompareValue(currentValue);
+                                triggerElement.setReservedCompareValue(currentValue);
+                                triggerResultList.add(true);
+                                if(logger.isTraceEnabled()) {
+                                    logger.trace("Initially set compare value to {}", currentValue);
+                                }
+                                skipComparison=true;
+                            }
+                            else{
+                                refValue = (double) triggerElement.getCompareValue();
+                            }
+                        }
+                        else {
+                            refValue = (double) triggerElement.getCompareValue();
+                        }
+
+                    }
+                    catch (Exception e){
+                        handleException(e);
+                        return false;
+                    }
+
+                    boolean triggerResult = false;
+                    if(!skipComparison) {
+                        switch (triggerElement.getComparatorType()) {
+                            case EQUAL:
+                                triggerResult = isApproximately(currentValue, refValue, TOLERANCE_FLOATING_EQUALITY);
+                                break;
+                            case UNEQUAL:
+                                triggerResult = !isApproximately(currentValue, refValue, TOLERANCE_FLOATING_EQUALITY);
+                                break;
+                            case SMALLER:
+                                triggerResult = currentValue < refValue;
+                                break;
+                            case SMALLER_EQUAL:
+                                triggerResult = currentValue <= refValue;
+                                break;
+                            case GREATER:
+                                triggerResult = currentValue > refValue;
+                                break;
+                            case GREATER_EQUAL:
+                                triggerResult = currentValue >= refValue;
+                                break;
+                            default:
+                                triggerResult = false;
+                        }
+                    }
+
+                    if(triggerResult && triggerElement.getPreviousMode()){
+                        triggerElement.setReservedCompareValue(currentValue);
+                        if(logger.isTraceEnabled()) {
+                            logger.trace("Subcondition matched. Previous value: {}, current compare value {} for Job {}",
+                                triggerElement.getReservedCompareValue(),
+                                triggerElement.getCompareValue(),
+                                triggerElement.getTriggerJob());
+                        }
+                    }
+                    triggerResultList.add(triggerResult);
+
+                }
+
+            }
+            if(triggerResultList.isEmpty()){
+                if(logger.isDebugEnabled()) {
+                    logger.debug("No results could be acquired - setting trigger to false");
+                }
+                return false;
+            }
+            //check if there is more then one condition for trigger
+            if(triggerResultList.size()>1) {
+                if(logger.isTraceEnabled()) {
+                    logger.trace("{}", triggerResultList);
+                }
+                boolean combinedResult=triggerResultList.get(0);
+                for (int countElements = 1; countElements < acquiredValuesList.size(); countElements++) {
+                    switch (triggerElementList.get(countElements).getConcatType()){
+                        case AND:
+                            combinedResult = combinedResult && triggerResultList.get(countElements);
+                            break;
+                        case OR:
+                            combinedResult = combinedResult || triggerResultList.get(countElements);
+                            break;
+                        default:
+                            //should not happen
+                            combinedResult = false;
+                    }
+                }
+                if(combinedResult) {
+                    triggerElementList.forEach(TriggerElement::overrideCompareValue);
+                }
+                return combinedResult;
+            }
+            else{
+                if(triggerResultList.get(0)) {
+                    triggerElementList.forEach(TriggerElement::overrideCompareValue);
+                }
+                //return first result because its the only one
+                return triggerResultList.get(0);
+            }
+        }
+    }
+
+    /**
+     * creates the TriggerConfiguration for a given ScrapeJob from triggerConfig-String
+     * @param jobTriggerStrategy config-string from file
+     * @param triggeredScrapeJob job belonging to the config
+     * @return created TriggerConfiguration
+     * @throws ScraperConfigurationException when something goes wrong
+     */
+    public static TriggerConfiguration createConfiguration(String jobTriggerStrategy,TriggeredScrapeJobImpl triggeredScrapeJob) throws ScraperConfigurationException {
+        Matcher matcher = TRIGGER_STRATEGY_PATTERN.matcher(jobTriggerStrategy);
+
+        if(matcher.matches()){
+            String triggerStrategy = matcher.group("strategy");
+            String scheduledMs = matcher.group("scheduledInterval");
+            if(logger.isDebugEnabled()) {
+                logger.debug("Strategy: {}, scheduled ms: {}", triggerStrategy, scheduledMs);
+            }
+
+            String triggerVar = matcher.group("triggerVar");
+            String comparatorString = matcher.group("comp");
+            String comparatorVariable = matcher.group("compVar");
+
+            switch (triggerStrategy){
+                case S_7_TRIGGER_VAR:
+
+                    if(triggerVar ==null || comparatorString==null || comparatorVariable==null){
+                        throw new ScraperConfigurationException("S7_TRIGGER_VAR trigger strategy needs the trigger-condition - information missing! given configString: "+jobTriggerStrategy);
+                    }
+
+                    List<TriggerElement> triggerElements = new ArrayList<>();
+
+                    TriggerElement triggerElement = new TriggerElement(
+                        comparatorString,
+                        null,
+                        comparatorVariable,
+                        triggerVar,
+                        triggerStrategy);
+
+                    triggerElement.setTriggerJob(triggeredScrapeJob.getJobName());
+
+                    triggerElements.add(triggerElement);
+
+                    String concatConn = matcher.group("concatConn");
+                    String triggerVar2 = matcher.group("triggerVar2");
+                    String comparatorString2 = matcher.group("comp2");
+                    String comparatorVariable2 = matcher.group("compVar2");
+
+                    if(triggerVar2 != null && comparatorString2 != null && comparatorVariable2 != null && concatConn != null){
+                        TriggerElement triggerElement2 = new TriggerElement(
+                            comparatorString2,
+                            concatConn,
+                            comparatorVariable2,
+                            triggerVar2,
+                            triggerStrategy);
+
+
+                        triggerElement2.setTriggerJob(triggeredScrapeJob.getJobName());
+                        triggerElements.add(triggerElement2);
+
+                    }
+
+                    //ToDo add clever Strategy to concat more than two conditions if needed
+                    return new TriggerConfiguration(TriggerType.S7_TRIGGER_VAR,scheduledMs,triggerElements,triggeredScrapeJob);
+                case SCHEDULED:
+                    if(triggerVar !=null || comparatorString!=null || comparatorVariable!=null){
+                        throw new ScraperConfigurationException("SCHEDULED trigger strategy must only be used with scheduled interval - nothing more!  given configString: "+jobTriggerStrategy);
+                    }
+                    return new TriggerConfiguration(TriggerType.SCHEDULED,scheduledMs);
+                default:
+                    throw new ScraperConfigurationException("Unknown Trigger Strategy "+triggerStrategy);
+            }
+
+
+        }
+        throw new ScraperConfigurationException("Invalid trigger strategy string description: "+jobTriggerStrategy);
+    }
+
+    private void handleException(Exception e){
+        //push up if needed
+        if(logger.isDebugEnabled()) {
+            logger.debug("Exception: ", e);
+        }
+    }
+
+    TriggerType getTriggerType() {
+        return triggerType;
+    }
+
+    public long getScrapeInterval() {
+        return scrapeInterval;
+    }
+
+    public List<TriggerElement> getTriggerElementList() {
+        return triggerElementList;
+    }
+
+    /**
+     * check for approximate equality to avoid "Floating-point expressions shall not be tested for equality or inequality." Sonar-Bug
+     * @param self current value
+     * @param other reference value
+     * @param within tolerance band
+     * @return if approximate equal, false otherwise
+     */
+    private static boolean isApproximately(double self, double other, double within)
+    {
+        return Math.abs(self - other) <= within;
+    }
+
+    public enum Comparator {
+        EQUAL,
+        UNEQUAL,
+        GREATER,
+        GREATER_EQUAL,
+        SMALLER,
+        SMALLER_EQUAL
+    }
+
+    //ToDo replace constant TriggerType by more generic ones --> PLC4X-89
+    public enum TriggerType {
+        SCHEDULED,
+        S7_TRIGGER_VAR
+    }
+
+    public enum ConcatType {
+        AND,
+        OR
+    }
+
+    public static class TriggerElement{
+        private Comparator comparatorType;
+        private ConcatType concatType;
+        //if trigger should be compared to previous value
+        private Boolean previousMode;
+        private Object compareValue;
+        private PlcField plcField;
+        private String plcFieldString;
+
+        private String plcConnectionString;
+
+        private String uuid;
+
+        private String triggerJob;
+
+        //storage for overwrite if condition matched
+        private Object reservedCompareValue;
+
+        public TriggerElement() {
+            this.comparatorType = null;
+            this.concatType = null;
+            this.previousMode = false;
+            this.compareValue = null;
+            this.plcField = null;
+            this.plcFieldString = null;
+            this.reservedCompareValue = null;
+            this.plcConnectionString="not defined";
+            this.triggerJob = "Not yet defined";
+            this.uuid = "";
+        }
+
+        public TriggerElement(Comparator comparatorType, ConcatType concatType, Boolean previousMode, Object compareValue, PlcField plcField, String plcFieldString) {
+            this.comparatorType = comparatorType;
+            this.concatType = concatType;
+            this.previousMode = previousMode;
+            this.compareValue = compareValue;
+            this.plcField = plcField;
+            this.plcFieldString = plcFieldString;
+        }
+
+        public TriggerElement(Comparator comparatorType, Object compareValue, PlcField plcField) {
+            this();
+            this.comparatorType = comparatorType;
+            this.compareValue = compareValue;
+            this.plcField = plcField;
+        }
+
+        TriggerElement(String comparator, String concatType, String compareValue, String plcField, String triggerStrategy) throws ScraperConfigurationException {
+            this();
+            this.plcFieldString = plcField;
+            this.plcConnectionString = plcConnectionString;
+            if(triggerStrategy.equals(S_7_TRIGGER_VAR)){
+                try {
+                    this.plcField = S7Field.of(this.plcFieldString);
+                }
+                catch (Exception e){
+                    if(logger.isDebugEnabled()) {
+                        logger.debug("Exception occurred parsing a S7Field");
+                    }
+                    throw new ScraperConfigurationException("Exception on parsing S7Field (" + plcField + "): " + e.getMessage());
+                }
+                this.compareValue = convertCompareValue(compareValue,this.plcField);
+                this.comparatorType = detectComparatorType(comparator);
+                matchTypeAndComparator();
+            }
+
+            this.concatType = detectConcatType(concatType);
+
+        }
+
+
+        /**
+         * parses the ref-value to a given value, as well as checking if ref-value matches to the given data-type
+         * @param compareValue compare-value extracted by regex
+         * @return converted object to needed data-type
+         * @throws ScraperException when something does not match or parsing fails
+         */
+        private Object convertCompareValue(String compareValue, PlcField plcField) throws ScraperConfigurationException {
+            Class<?> javaDataType = validateDataType(plcField);
+            if(javaDataType.equals(Boolean.class)){
+                switch (compareValue){
+                    case "1":
+                    case "true":
+                        return true;
+                    case "0":
+                    case "false":
+                        return false;
+                    default:
+                        String exceptionMessage = String.format("No valid compare Value at DataType Boolean for trigger: %s",compareValue);
+                        throw new ScraperConfigurationException(exceptionMessage);
+                }
+            }
+            if(javaDataType.equals(Double.class)
+                || javaDataType.equals(Integer.class)
+                || javaDataType.equals(Long.class)){
+                try {
+                    //everything fits to Double for conversion ... so for first step use only double
+                    //ToDo if different handling dependent on specific datatype is needed then differ
+                    if(PREVIOUS_DEF.equals(compareValue)){
+                        this.previousMode=true;
+                        return null;
+                    }
+                    return Double.parseDouble(compareValue);
+                }
+                catch (Exception e){
+                    logger.debug(e.getMessage(), e);
+                    String exceptionMessage = String.format("No valid compare Value at DataType Numeric for trigger: %s",compareValue);
+                    throw new ScraperConfigurationException(exceptionMessage);
+                }
+            }
+            String exceptionMessage = "Invalid Datatype detected ... should not happen and be catcht earlier - please report";
+            throw new ScraperConfigurationException(exceptionMessage);
+        }
+
+        /**
+         * converts parsed comparator from regex to ComparatorType
+         * @throws ScraperException when no valid comparator has been used
+         */
+        private Comparator detectComparatorType(String comparator) throws ScraperConfigurationException {
+            switch (comparator){
+                case "==":
+                    return Comparator.EQUAL;
+                case "!=":
+                    return Comparator.UNEQUAL;
+                case "<=":
+                    return Comparator.SMALLER_EQUAL;
+                case "<":
+                    return Comparator.SMALLER;
+                case ">=":
+                    return Comparator.GREATER_EQUAL;
+                case ">":
+                    return Comparator.GREATER;
+                default:
+                    throw new ScraperConfigurationException("Invalid comparator detected!");
+            }
+        }
+
+        /**
+         * convertes parsed comparator from regex to ComparatorType
+         * @throws ScraperException when no valid comparator has been used
+         */
+        private ConcatType detectConcatType(String concat) throws ScraperConfigurationException {
+            //concat is not necessary in every case, correct usage is checked later on
+            if(concat==null){
+                return null;
+            }
+            switch (concat){
+                case "AND":
+                    return ConcatType.AND;
+                case "OR":
+                    return ConcatType.OR;
+                default:
+                    throw new ScraperConfigurationException("Invalid concat between triggerVars detected: "+concat);
+            }
+        }
+
+        /**
+         * matches data-type and comparator for a valid combination
+         * @throws ScraperException when invalid combination is detected
+         */
+        private void matchTypeAndComparator() throws ScraperConfigurationException {
+            if(validateDataType(this.plcField).equals(Boolean.class)
+                && !(this.comparatorType.equals(Comparator.EQUAL) || this.comparatorType.equals(Comparator.UNEQUAL))){
+                String exceptionMessage = String.format("Trigger-Data-Type (%s) and Comparator (%s) do not match",this.plcField.getDefaultJavaType(),this.comparatorType);
+                throw new ScraperConfigurationException(exceptionMessage);
+            }
+            //all other combinations are valid
+        }
+
+        Comparator getComparatorType() {
+            return comparatorType;
+        }
+
+        ConcatType getConcatType() {
+            return concatType;
+        }
+
+        Boolean getPreviousMode() {
+            return previousMode;
+        }
+
+        Object getCompareValue() {
+            return compareValue;
+        }
+
+        PlcField getPlcField() {
+            return plcField;
+        }
+
+        String getPlcFieldString() {
+            return plcFieldString;
+        }
+
+        void setCompareValue(Object compareValue) {
+            this.compareValue = compareValue;
+        }
+
+        Object getReservedCompareValue() {
+            return reservedCompareValue;
+        }
+
+        void setReservedCompareValue(Object reservedCompareValue) {
+            this.reservedCompareValue = reservedCompareValue;
+        }
+
+        String getTriggerJob() {
+            return triggerJob;
+        }
+
+        void setTriggerJob(String triggerJob) {
+            this.triggerJob = triggerJob;
+        }
+
+        void overrideCompareValue(){
+            if(this.previousMode && this.reservedCompareValue!=null){
+                if(logger.isDebugEnabled()) {
+                    logger.debug("Compare value overridden, before: {}, now: {}; for Trigger {}", this.compareValue, this.reservedCompareValue, this.triggerJob);
+                }
+                this.compareValue = this.reservedCompareValue;
+            }
+        }
+
+        public String getPlcConnectionString() {
+            return plcConnectionString;
+        }
+
+        public void setPlcConnectionString(String plcConnectionString) {
+            this.plcConnectionString = plcConnectionString;
+        }
+
+        public String getUuid() {
+            return uuid;
+        }
+
+        public void setUuid(String uuid) {
+            this.uuid = uuid;
+        }
+    }
 }
\ No newline at end of file
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerHandler.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerHandler.java
index 98582e0a649..a9feb7e488e 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerHandler.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerHandler.java
@@ -1,23 +1,23 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler;
-
-public interface TriggerHandler {
-    boolean checkTrigger();
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler;
+
+public interface TriggerHandler {
+    boolean checkTrigger();
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerHandlerImpl.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerHandlerImpl.java
index 6a2c551b002..8ecdcb3aa99 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerHandlerImpl.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerHandlerImpl.java
@@ -1,113 +1,113 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler;
-
-import org.apache.plc4x.java.scraper.exception.ScraperException;
-import org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScrapeJobImpl;
-import org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperTask;
-import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollector;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.*;
-
-/**
- * holds the handler for the regarding trigger-scraper on rising-trigger edge
- */
-public class TriggerHandlerImpl implements TriggerHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(TriggerHandlerImpl.class);
-
-    private final TriggerConfiguration triggerConfiguration;
-
-    private final TriggerCollector triggerCollector;
-
-    //used to enable trigger only on rising edge
-    private boolean lastTriggerState;
-
-    public TriggerHandlerImpl(String triggerStrategy, TriggeredScrapeJobImpl triggeredScrapeJob, TriggeredScraperTask parentScraperTask, TriggerCollector triggerCollector) throws ScraperException {
-        this.triggerConfiguration = TriggerConfiguration.createConfiguration(triggerStrategy,triggeredScrapeJob);
-
-        //transmit needed trigger to triggerCollection
-        for(TriggerConfiguration.TriggerElement triggerElement:triggerConfiguration.getTriggerElementList()){
-            triggerElement.setPlcConnectionString(parentScraperTask.getConnectionString());
-            triggerElement.setUuid(triggerCollector.submitTrigger(triggerElement.getPlcFieldString(),parentScraperTask.getConnectionString(),this.triggerConfiguration.getScrapeInterval()));
-        }
-
-        this.lastTriggerState = false;
-        this.triggerCollector = triggerCollector;
-    }
-
-    /**
-     * checks rising edge of trigger event
-     * @return true on detection of rising edge, false otherwise
-     */
-    @Override
-    public boolean checkTrigger(){
-        switch (this.triggerConfiguration.getTriggerType()){
-            case SCHEDULED:
-                //used base scheduling -> trigger is always true
-                return true;
-            case S7_TRIGGER_VAR:
-                return checkS7TriggerVariable();
-            default:
-                //should not happen
-                return false;
-        }
-    }
-
-    /**
-     * acquires the given S7Field from S7 and evaluates if trigger is released
-     * @return true if rising-edge of trigger is detected, false otherwise
-     */
-    private boolean checkS7TriggerVariable(){
-
-        List<Object> acquiredValuesList = new ArrayList<>();
-        for(TriggerConfiguration.TriggerElement triggerElement:triggerConfiguration.getTriggerElementList()){
-            try {
-                Object result = triggerCollector.requestResult(triggerElement.getUuid());
-                if(result==null){
-                    return false;
-                }
-                acquiredValuesList.add(result);
-            } catch (ScraperException e) {
-                LOGGER.warn("Went wrong",e);
-            }
-        }
-
-        //check if trigger condition from TriggerConfiguration is fulfilled
-        boolean trigger = false;
-        try {
-            trigger = triggerConfiguration.evaluateTrigger(acquiredValuesList);
-        } catch (ScraperException e) {
-            LOGGER.warn("Could not evaluate trigger");
-        }
-
-        //only trigger scraping of data on rising edge of trigger
-        if(trigger && !this.lastTriggerState){
-            this.lastTriggerState = true;
-            return true;
-        }
-        else{
-            this.lastTriggerState = trigger;
-            return false;
-        }
-
-    }
-
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler;
+
+import org.apache.plc4x.java.scraper.exception.ScraperException;
+import org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScrapeJobImpl;
+import org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperTask;
+import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.*;
+
+/**
+ * holds the handler for the regarding trigger-scraper on rising-trigger edge
+ */
+public class TriggerHandlerImpl implements TriggerHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(TriggerHandlerImpl.class);
+
+    private final TriggerConfiguration triggerConfiguration;
+
+    private final TriggerCollector triggerCollector;
+
+    //used to enable trigger only on rising edge
+    private boolean lastTriggerState;
+
+    public TriggerHandlerImpl(String triggerStrategy, TriggeredScrapeJobImpl triggeredScrapeJob, TriggeredScraperTask parentScraperTask, TriggerCollector triggerCollector) throws ScraperException {
+        this.triggerConfiguration = TriggerConfiguration.createConfiguration(triggerStrategy,triggeredScrapeJob);
+
+        //transmit needed trigger to triggerCollection
+        for(TriggerConfiguration.TriggerElement triggerElement:triggerConfiguration.getTriggerElementList()){
+            triggerElement.setPlcConnectionString(parentScraperTask.getConnectionString());
+            triggerElement.setUuid(triggerCollector.submitTrigger(triggerElement.getPlcFieldString(),parentScraperTask.getConnectionString(),this.triggerConfiguration.getScrapeInterval()));
+        }
+
+        this.lastTriggerState = false;
+        this.triggerCollector = triggerCollector;
+    }
+
+    /**
+     * checks rising edge of trigger event
+     * @return true on detection of rising edge, false otherwise
+     */
+    @Override
+    public boolean checkTrigger(){
+        switch (this.triggerConfiguration.getTriggerType()){
+            case SCHEDULED:
+                //used base scheduling -> trigger is always true
+                return true;
+            case S7_TRIGGER_VAR:
+                return checkS7TriggerVariable();
+            default:
+                //should not happen
+                return false;
+        }
+    }
+
+    /**
+     * acquires the given S7Field from S7 and evaluates if trigger is released
+     * @return true if rising-edge of trigger is detected, false otherwise
+     */
+    private boolean checkS7TriggerVariable(){
+
+        List<Object> acquiredValuesList = new ArrayList<>();
+        for(TriggerConfiguration.TriggerElement triggerElement:triggerConfiguration.getTriggerElementList()){
+            try {
+                Object result = triggerCollector.requestResult(triggerElement.getUuid());
+                if(result==null){
+                    return false;
+                }
+                acquiredValuesList.add(result);
+            } catch (ScraperException e) {
+                LOGGER.warn("Went wrong",e);
+            }
+        }
+
+        //check if trigger condition from TriggerConfiguration is fulfilled
+        boolean trigger = false;
+        try {
+            trigger = triggerConfiguration.evaluateTrigger(acquiredValuesList);
+        } catch (ScraperException e) {
+            LOGGER.warn("Could not evaluate trigger");
+        }
+
+        //only trigger scraping of data on rising edge of trigger
+        if(trigger && !this.lastTriggerState){
+            this.lastTriggerState = true;
+            return true;
+        }
+        else{
+            this.lastTriggerState = trigger;
+            return false;
+        }
+
+    }
+
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/collector/TriggerCollector.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/collector/TriggerCollector.java
index 380ea9ab34c..ebf8767594a 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/collector/TriggerCollector.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/collector/TriggerCollector.java
@@ -1,65 +1,65 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector;
-
-import org.apache.plc4x.java.scraper.exception.ScraperException;
-
-/**
- * defines the interface for implementing a TriggerCollector
- * that handles and acquires all triggerRequests at once that needs a PlcConnection
- */
-public interface TriggerCollector {
-
-    /**
-     * submits a trigger request to TriggerCollector
-     * @param plcField a (plc) field that is used for triggering procedure
-     * @param plcConnectionString the connection string to the regarding source
-     * @param maxAwaitingTime max awaiting time until request shall be submitted
-     * @return a uuid under that the request is handled internally
-     * @throws ScraperException something went wrong
-     */
-    String submitTrigger(String plcField, String plcConnectionString, long maxAwaitingTime) throws ScraperException;
-
-    /**
-     * requests the result of submitted plc request with default timeout
-     * @param uuid uuid that represents the request
-     * @return the object acquired by requesting plc instance
-     * @throws ScraperException something went wrong
-     */
-    Object requestResult(String uuid) throws ScraperException;
-
-    /**
-     * requests the result of submitted plc request
-     * @param uuid uuid that represents the request
-     * @param timeout timeout until response shall be acquired
-     * @return the object acquired by requesting plc instance
-     * @throws ScraperException something went wrong
-     */
-    Object requestResult(String uuid, long timeout) throws ScraperException;
-
-    /**
-     * starts the acquirement of triggers
-     */
-    void start();
-
-    /**
-     * stops acquirement of triggers
-     */
-    void stop();
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector;
+
+import org.apache.plc4x.java.scraper.exception.ScraperException;
+
+/**
+ * defines the interface for implementing a TriggerCollector
+ * that handles and acquires all triggerRequests at once that needs a PlcConnection
+ */
+public interface TriggerCollector {
+
+    /**
+     * submits a trigger request to TriggerCollector
+     * @param plcField a (plc) field that is used for triggering procedure
+     * @param plcConnectionString the connection string to the regarding source
+     * @param maxAwaitingTime max awaiting time until request shall be submitted
+     * @return a uuid under that the request is handled internally
+     * @throws ScraperException something went wrong
+     */
+    String submitTrigger(String plcField, String plcConnectionString, long maxAwaitingTime) throws ScraperException;
+
+    /**
+     * requests the result of submitted plc request with default timeout
+     * @param uuid uuid that represents the request
+     * @return the object acquired by requesting plc instance
+     * @throws ScraperException something went wrong
+     */
+    Object requestResult(String uuid) throws ScraperException;
+
+    /**
+     * requests the result of submitted plc request
+     * @param uuid uuid that represents the request
+     * @param timeout timeout until response shall be acquired
+     * @return the object acquired by requesting plc instance
+     * @throws ScraperException something went wrong
+     */
+    Object requestResult(String uuid, long timeout) throws ScraperException;
+
+    /**
+     * starts the acquirement of triggers
+     */
+    void start();
+
+    /**
+     * stops acquirement of triggers
+     */
+    void stop();
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/collector/TriggerCollectorImpl.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/collector/TriggerCollectorImpl.java
index a87cc7315e8..65428caea89 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/collector/TriggerCollectorImpl.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/collector/TriggerCollectorImpl.java
@@ -1,323 +1,323 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector;
-
-import org.apache.commons.lang3.concurrent.BasicThreadFactory;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.scraper.exception.ScraperException;
-import org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.time.LocalDateTime;
-import java.time.temporal.ChronoUnit;
-import java.util.*;
-import java.util.concurrent.*;
-
-/**
- * default implementation for TriggerCollector
- */
-public class TriggerCollectorImpl implements TriggerCollector {
-    private static final Logger logger = LoggerFactory.getLogger( TriggerCollectorImpl.class );
-
-    private static final int DEFAULT_SCHEDULED_TRIGGER_INTERVAL = 1000;
-    private static final int FUTURE_TIMEOUT                     = 2000;
-    private static final int READ_REQUEST_TIMEOUT               = 2000;
-
-    private final PlcDriverManager plcDriverManager;
-    private final Map<String,RequestElement> currentRequestElements;
-    private long schedulerInterval;
-    private final long futureTimeout;
-
-    private final ScheduledExecutorService scheduledExecutorService;
-    private final ExecutorService executorService;
-
-    public TriggerCollectorImpl(PlcDriverManager plcDriverManager, long schedulerInterval, long futureTimeout, int poolSizeScheduler, int poolSizeExecutor) {
-        this.plcDriverManager = plcDriverManager;
-        this.currentRequestElements = new ConcurrentHashMap<>();
-        this.schedulerInterval = schedulerInterval;
-        this.futureTimeout = futureTimeout;
-
-        this.scheduledExecutorService = Executors.newScheduledThreadPool(poolSizeScheduler,
-            new BasicThreadFactory.Builder()
-                .namingPattern("triggercollector-scheduledExecutorService-thread-%d")
-                .daemon(false)
-                .build()
-        );
-        this.executorService = Executors.newFixedThreadPool(poolSizeExecutor,
-            new BasicThreadFactory.Builder()
-                .namingPattern("triggercollector-executerService-thread-%d")
-                .daemon(true)
-                .build()
-        );
-
-    }
-
-    public TriggerCollectorImpl(PlcDriverManager plcDriverManager, long schedulerInterval, long futureTimeout) {
-        this(plcDriverManager,schedulerInterval,futureTimeout,10,20);
-    }
-
-    public TriggerCollectorImpl(PlcDriverManager plcDriverManager) {
-        this(plcDriverManager,DEFAULT_SCHEDULED_TRIGGER_INTERVAL, FUTURE_TIMEOUT);
-    }
-
-    /**
-     * submits a trigger request to TriggerCollector
-     *
-     * @param plcField              a (plc) field that is used for triggering procedure
-     * @param plcConnectionString   the connection string to the regarding source
-     * @param interval              max awaiting time until request shall be submitted
-     * @return a uuid under that the request is handled internally
-     */
-    @Override
-    public String submitTrigger(String plcField, String plcConnectionString, long interval) throws ScraperException {
-        String uuid = UUID.randomUUID().toString();
-
-        if(this.schedulerInterval>interval){
-            this.schedulerInterval=interval;
-        }
-
-        RequestElement requestElement = new RequestElement(plcConnectionString,plcField,interval, uuid);
-        if(!currentRequestElements.containsValue(requestElement)){
-            currentRequestElements.put(uuid,requestElement);
-            if(logger.isDebugEnabled()) {
-                logger.debug("Received request to: {} for PLC: {}", plcField, plcConnectionString);
-            }
-            return uuid;
-        }
-        else{
-            if(logger.isTraceEnabled()) {
-                logger.trace("Received a placed trigger");
-            }
-            for(RequestElement requestElementFromMap:currentRequestElements.values()){
-                if(requestElementFromMap.equals(requestElement)){
-                    //detect shortest interval if trigger used more than once
-                    if(requestElementFromMap.getScanIntervalMs()>interval){
-                        requestElementFromMap.setScanIntervalMs(interval);
-                    }
-                    return requestElementFromMap.getUuid();
-                }
-            }
-
-            //should not happen
-            throw new ScraperException(String.format("Could not evaluate UUID for given trigger (%s,%s). Should not happen please report!",plcField,plcConnectionString));
-        }
-
-    }
-
-    /**
-     * acquire all triggers within given interval from definition
-     */
-    private void processActiveTrigger(){
-        LocalDateTime currentTimestamp = LocalDateTime.now();
-        Map<String, PlcReadRequest.Builder> plcReadRequestBuilderMap = new HashMap<>();
-        Map<String, PlcReadResponse> plcReadResponseMap = new HashMap<>();
-        List<RequestElement> activeRequestElements = new ArrayList<>();
-        List<PlcConnection> plcConnectionList = new ArrayList<>();
-        PlcConnection plcConnection=null;
-        for(Map.Entry<String,RequestElement> entry:currentRequestElements.entrySet()){
-            if(entry.getValue().getLastAcquirement().isBefore(
-                currentTimestamp
-                    .minus(entry.getValue().scanIntervalMs,ChronoUnit.MILLIS))
-            ){
-                String plcConnectionString = entry.getValue().plcConnectionString;
-                if(!plcReadRequestBuilderMap.containsKey(plcConnectionString)){
-                    try {
-                        String info = "";
-                        if(logger.isTraceEnabled()) {
-                            info = String.format("acquiring trigger connection to (%s)", plcConnectionString);
-                            logger.trace("acquiring trigger connection to ({})", plcConnectionString);
-                        }
-                        plcConnection = TriggeredScraperImpl.getPlcConnection(plcDriverManager,plcConnectionString,executorService,futureTimeout,info);
-                        plcConnectionList.add(plcConnection);
-                        plcReadRequestBuilderMap.put(plcConnectionString,plcConnection.readRequestBuilder());
-                        plcReadRequestBuilderMap.get(plcConnectionString).addItem(entry.getKey(),entry.getValue().getPlcField());
-                        activeRequestElements.add(entry.getValue());
-                    } catch (InterruptedException e) {
-                        logger.warn("Acquirement of PLC-Connection was interrupted",e);
-                        Thread.currentThread().interrupt();
-                    } catch (ExecutionException e) {
-                        logger.warn("Acquirement of PLC-Connection could not be executed",e);
-                    } catch (TimeoutException e) {
-                        logger.warn("Acquirement of PLC-Connection was timeouted",e);
-                    }
-                }
-                else{
-                    plcReadRequestBuilderMap.get(plcConnectionString).addItem(entry.getKey(),entry.getValue().getPlcField());
-                    activeRequestElements.add(entry.getValue());
-                }
-            }
-        }
-
-        for(Map.Entry<String,PlcReadRequest.Builder> entry: plcReadRequestBuilderMap.entrySet()){
-            try {
-                PlcReadResponse plcReadResponse = entry.getValue().build().execute().get(futureTimeout, TimeUnit.MILLISECONDS);
-                plcReadResponseMap.put(entry.getKey(), plcReadResponse);
-            } catch (InterruptedException e) {
-                logger.warn("Extraction of PlcResponse was interrupted",e);
-                Thread.currentThread().interrupt();
-            } catch (ExecutionException e) {
-                logger.warn("Extraction of PlcResponse could not be executed",e);
-            } catch (TimeoutException e) {
-                logger.warn("Extraction of PlcResponse was timeouted",e);
-            }
-        }
-
-        LocalDateTime currentTime = LocalDateTime.now();
-        for(RequestElement requestElement:activeRequestElements){
-            requestElement.setResult(plcReadResponseMap.get(requestElement.getPlcConnectionString()).getObject(requestElement.getUuid()));
-            requestElement.setLastAcquirement(currentTime);
-        }
-        for(PlcConnection plcConnectionFromList:plcConnectionList){
-            if(plcConnectionFromList!=null){
-                try {
-                    plcConnectionFromList.close();
-                } catch (Exception e) {
-                    logger.warn("Could not close connection ...");
-                }
-            }
-        }
-
-    }
-
-    /**
-     * requests the result of submitted plc request with default timeout
-     *
-     * @param uuid uuid that represents the request
-     * @return the object acquired by requesting plc instance
-     */
-    @Override
-    public Object requestResult(String uuid) throws ScraperException {
-        return requestResult(uuid, READ_REQUEST_TIMEOUT);
-    }
-
-    /**
-     * requests the result of submitted plc request
-     *
-     * @param uuid uuid that represents the request
-     * @return the object acquired by requesting plc instance
-     */
-    @Override
-    public Object requestResult(String uuid, long timeout){
-        return currentRequestElements.get(uuid).getResult();
-    }
-
-    /**
-     * starts the acquirement of triggers
-     */
-    @Override
-    public void start() {
-        this.scheduledExecutorService.scheduleAtFixedRate(this::processActiveTrigger, 1_000, this.schedulerInterval, TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * stops acquirement of triggers
-     */
-    @Override
-    public void stop() {
-        this.scheduledExecutorService.shutdown();
-        this.executorService.shutdown();
-    }
-
-
-    class RequestElement{
-        private String plcConnectionString;
-        private String plcField;
-        private LocalDateTime lastAcquirement;
-        private Object result;
-        private String uuid;
-        private long scanIntervalMs;
-
-
-        RequestElement(String plcConnectionString, String plcField, long scanIntervalMs, String uuid) {
-            this.plcConnectionString = plcConnectionString;
-            this.plcField = plcField;
-            this.uuid = uuid;
-            this.scanIntervalMs = scanIntervalMs;
-            //set initial acquirement to a long time ago
-            this.lastAcquirement = LocalDateTime.of(1,1,1,1,1,1);
-        }
-
-        String getPlcConnectionString() {
-            return plcConnectionString;
-        }
-
-        String getPlcField() {
-            return plcField;
-        }
-
-        public Object getResult() {
-            return result;
-        }
-
-        public void setResult(Object result) {
-            this.result = result;
-        }
-
-        String getUuid() {
-            return uuid;
-        }
-
-        long getScanIntervalMs() {
-            return scanIntervalMs;
-        }
-
-        void setScanIntervalMs(long scanIntervalMs) {
-            this.scanIntervalMs = scanIntervalMs;
-        }
-
-        LocalDateTime getLastAcquirement() {
-            return lastAcquirement;
-        }
-
-        void setLastAcquirement(LocalDateTime lastAcquirement) {
-            this.lastAcquirement = lastAcquirement;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            RequestElement that = (RequestElement) o;
-            return Objects.equals(plcConnectionString, that.plcConnectionString) &&
-                Objects.equals(plcField, that.plcField);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(plcConnectionString, plcField);
-        }
-
-        @Override
-        public String toString() {
-            return "RequestElement{" +
-                "plcConnectionString='" + plcConnectionString + '\'' +
-                ", plcField='" + plcField + '\'' +
-                ", lastAcquirement=" + lastAcquirement +
-                ", result=" + result +
-                ", uuid='" + uuid + '\'' +
-                ", scanIntervalMs=" + scanIntervalMs +
-                '}';
-        }
-    }
-
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector;
+
+import org.apache.commons.lang3.concurrent.BasicThreadFactory;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.scraper.exception.ScraperException;
+import org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.concurrent.*;
+
+/**
+ * default implementation for TriggerCollector
+ */
+public class TriggerCollectorImpl implements TriggerCollector {
+    private static final Logger logger = LoggerFactory.getLogger( TriggerCollectorImpl.class );
+
+    private static final int DEFAULT_SCHEDULED_TRIGGER_INTERVAL = 1000;
+    private static final int FUTURE_TIMEOUT                     = 2000;
+    private static final int READ_REQUEST_TIMEOUT               = 2000;
+
+    private final PlcDriverManager plcDriverManager;
+    private final Map<String,RequestElement> currentRequestElements;
+    private long schedulerInterval;
+    private final long futureTimeout;
+
+    private final ScheduledExecutorService scheduledExecutorService;
+    private final ExecutorService executorService;
+
+    public TriggerCollectorImpl(PlcDriverManager plcDriverManager, long schedulerInterval, long futureTimeout, int poolSizeScheduler, int poolSizeExecutor) {
+        this.plcDriverManager = plcDriverManager;
+        this.currentRequestElements = new ConcurrentHashMap<>();
+        this.schedulerInterval = schedulerInterval;
+        this.futureTimeout = futureTimeout;
+
+        this.scheduledExecutorService = Executors.newScheduledThreadPool(poolSizeScheduler,
+            new BasicThreadFactory.Builder()
+                .namingPattern("triggercollector-scheduledExecutorService-thread-%d")
+                .daemon(false)
+                .build()
+        );
+        this.executorService = Executors.newFixedThreadPool(poolSizeExecutor,
+            new BasicThreadFactory.Builder()
+                .namingPattern("triggercollector-executerService-thread-%d")
+                .daemon(true)
+                .build()
+        );
+
+    }
+
+    public TriggerCollectorImpl(PlcDriverManager plcDriverManager, long schedulerInterval, long futureTimeout) {
+        this(plcDriverManager,schedulerInterval,futureTimeout,10,20);
+    }
+
+    public TriggerCollectorImpl(PlcDriverManager plcDriverManager) {
+        this(plcDriverManager,DEFAULT_SCHEDULED_TRIGGER_INTERVAL, FUTURE_TIMEOUT);
+    }
+
+    /**
+     * submits a trigger request to TriggerCollector
+     *
+     * @param plcField              a (plc) field that is used for triggering procedure
+     * @param plcConnectionString   the connection string to the regarding source
+     * @param interval              max awaiting time until request shall be submitted
+     * @return a uuid under that the request is handled internally
+     */
+    @Override
+    public String submitTrigger(String plcField, String plcConnectionString, long interval) throws ScraperException {
+        String uuid = UUID.randomUUID().toString();
+
+        if(this.schedulerInterval>interval){
+            this.schedulerInterval=interval;
+        }
+
+        RequestElement requestElement = new RequestElement(plcConnectionString,plcField,interval, uuid);
+        if(!currentRequestElements.containsValue(requestElement)){
+            currentRequestElements.put(uuid,requestElement);
+            if(logger.isDebugEnabled()) {
+                logger.debug("Received request to: {} for PLC: {}", plcField, plcConnectionString);
+            }
+            return uuid;
+        }
+        else{
+            if(logger.isTraceEnabled()) {
+                logger.trace("Received a placed trigger");
+            }
+            for(RequestElement requestElementFromMap:currentRequestElements.values()){
+                if(requestElementFromMap.equals(requestElement)){
+                    //detect shortest interval if trigger used more than once
+                    if(requestElementFromMap.getScanIntervalMs()>interval){
+                        requestElementFromMap.setScanIntervalMs(interval);
+                    }
+                    return requestElementFromMap.getUuid();
+                }
+            }
+
+            //should not happen
+            throw new ScraperException(String.format("Could not evaluate UUID for given trigger (%s,%s). Should not happen please report!",plcField,plcConnectionString));
+        }
+
+    }
+
+    /**
+     * acquire all triggers within given interval from definition
+     */
+    private void processActiveTrigger(){
+        LocalDateTime currentTimestamp = LocalDateTime.now();
+        Map<String, PlcReadRequest.Builder> plcReadRequestBuilderMap = new HashMap<>();
+        Map<String, PlcReadResponse> plcReadResponseMap = new HashMap<>();
+        List<RequestElement> activeRequestElements = new ArrayList<>();
+        List<PlcConnection> plcConnectionList = new ArrayList<>();
+        PlcConnection plcConnection=null;
+        for(Map.Entry<String,RequestElement> entry:currentRequestElements.entrySet()){
+            if(entry.getValue().getLastAcquirement().isBefore(
+                currentTimestamp
+                    .minus(entry.getValue().scanIntervalMs,ChronoUnit.MILLIS))
+            ){
+                String plcConnectionString = entry.getValue().plcConnectionString;
+                if(!plcReadRequestBuilderMap.containsKey(plcConnectionString)){
+                    try {
+                        String info = "";
+                        if(logger.isTraceEnabled()) {
+                            info = String.format("acquiring trigger connection to (%s)", plcConnectionString);
+                            logger.trace("acquiring trigger connection to ({})", plcConnectionString);
+                        }
+                        plcConnection = TriggeredScraperImpl.getPlcConnection(plcDriverManager,plcConnectionString,executorService,futureTimeout,info);
+                        plcConnectionList.add(plcConnection);
+                        plcReadRequestBuilderMap.put(plcConnectionString,plcConnection.readRequestBuilder());
+                        plcReadRequestBuilderMap.get(plcConnectionString).addItem(entry.getKey(),entry.getValue().getPlcField());
+                        activeRequestElements.add(entry.getValue());
+                    } catch (InterruptedException e) {
+                        logger.warn("Acquirement of PLC-Connection was interrupted",e);
+                        Thread.currentThread().interrupt();
+                    } catch (ExecutionException e) {
+                        logger.warn("Acquirement of PLC-Connection could not be executed",e);
+                    } catch (TimeoutException e) {
+                        logger.warn("Acquirement of PLC-Connection was timeouted",e);
+                    }
+                }
+                else{
+                    plcReadRequestBuilderMap.get(plcConnectionString).addItem(entry.getKey(),entry.getValue().getPlcField());
+                    activeRequestElements.add(entry.getValue());
+                }
+            }
+        }
+
+        for(Map.Entry<String,PlcReadRequest.Builder> entry: plcReadRequestBuilderMap.entrySet()){
+            try {
+                PlcReadResponse plcReadResponse = entry.getValue().build().execute().get(futureTimeout, TimeUnit.MILLISECONDS);
+                plcReadResponseMap.put(entry.getKey(), plcReadResponse);
+            } catch (InterruptedException e) {
+                logger.warn("Extraction of PlcResponse was interrupted",e);
+                Thread.currentThread().interrupt();
+            } catch (ExecutionException e) {
+                logger.warn("Extraction of PlcResponse could not be executed",e);
+            } catch (TimeoutException e) {
+                logger.warn("Extraction of PlcResponse was timeouted",e);
+            }
+        }
+
+        LocalDateTime currentTime = LocalDateTime.now();
+        for(RequestElement requestElement:activeRequestElements){
+            requestElement.setResult(plcReadResponseMap.get(requestElement.getPlcConnectionString()).getObject(requestElement.getUuid()));
+            requestElement.setLastAcquirement(currentTime);
+        }
+        for(PlcConnection plcConnectionFromList:plcConnectionList){
+            if(plcConnectionFromList!=null){
+                try {
+                    plcConnectionFromList.close();
+                } catch (Exception e) {
+                    logger.warn("Could not close connection ...");
+                }
+            }
+        }
+
+    }
+
+    /**
+     * requests the result of submitted plc request with default timeout
+     *
+     * @param uuid uuid that represents the request
+     * @return the object acquired by requesting plc instance
+     */
+    @Override
+    public Object requestResult(String uuid) throws ScraperException {
+        return requestResult(uuid, READ_REQUEST_TIMEOUT);
+    }
+
+    /**
+     * requests the result of submitted plc request
+     *
+     * @param uuid uuid that represents the request
+     * @return the object acquired by requesting plc instance
+     */
+    @Override
+    public Object requestResult(String uuid, long timeout){
+        return currentRequestElements.get(uuid).getResult();
+    }
+
+    /**
+     * starts the acquirement of triggers
+     */
+    @Override
+    public void start() {
+        this.scheduledExecutorService.scheduleAtFixedRate(this::processActiveTrigger, 1_000, this.schedulerInterval, TimeUnit.MILLISECONDS);
+    }
+
+    /**
+     * stops acquirement of triggers
+     */
+    @Override
+    public void stop() {
+        this.scheduledExecutorService.shutdown();
+        this.executorService.shutdown();
+    }
+
+
+    class RequestElement{
+        private String plcConnectionString;
+        private String plcField;
+        private LocalDateTime lastAcquirement;
+        private Object result;
+        private String uuid;
+        private long scanIntervalMs;
+
+
+        RequestElement(String plcConnectionString, String plcField, long scanIntervalMs, String uuid) {
+            this.plcConnectionString = plcConnectionString;
+            this.plcField = plcField;
+            this.uuid = uuid;
+            this.scanIntervalMs = scanIntervalMs;
+            //set initial acquirement to a long time ago
+            this.lastAcquirement = LocalDateTime.of(1,1,1,1,1,1);
+        }
+
+        String getPlcConnectionString() {
+            return plcConnectionString;
+        }
+
+        String getPlcField() {
+            return plcField;
+        }
+
+        public Object getResult() {
+            return result;
+        }
+
+        public void setResult(Object result) {
+            this.result = result;
+        }
+
+        String getUuid() {
+            return uuid;
+        }
+
+        long getScanIntervalMs() {
+            return scanIntervalMs;
+        }
+
+        void setScanIntervalMs(long scanIntervalMs) {
+            this.scanIntervalMs = scanIntervalMs;
+        }
+
+        LocalDateTime getLastAcquirement() {
+            return lastAcquirement;
+        }
+
+        void setLastAcquirement(LocalDateTime lastAcquirement) {
+            this.lastAcquirement = lastAcquirement;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            RequestElement that = (RequestElement) o;
+            return Objects.equals(plcConnectionString, that.plcConnectionString) &&
+                Objects.equals(plcField, that.plcField);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(plcConnectionString, plcField);
+        }
+
+        @Override
+        public String toString() {
+            return "RequestElement{" +
+                "plcConnectionString='" + plcConnectionString + '\'' +
+                ", plcField='" + plcField + '\'' +
+                ", lastAcquirement=" + lastAcquirement +
+                ", result=" + result +
+                ", uuid='" + uuid + '\'' +
+                ", scanIntervalMs=" + scanIntervalMs +
+                '}';
+        }
+    }
+
+}
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/util/PercentageAboveThreshold.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/util/PercentageAboveThreshold.java
index 1cafea1cdb7..b0dc5ba9ef6 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/util/PercentageAboveThreshold.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/util/PercentageAboveThreshold.java
@@ -1,58 +1,58 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper.util;
-
-import org.apache.commons.math3.exception.MathIllegalArgumentException;
-import org.apache.commons.math3.stat.descriptive.UnivariateStatistic;
-import org.apache.plc4x.java.scraper.Scraper;
-
-import java.util.Arrays;
-import java.util.stream.IntStream;
-
-public class PercentageAboveThreshold implements UnivariateStatistic {
-
-    private final double threshold;
-
-    public PercentageAboveThreshold(double threshold) {
-        this.threshold = threshold;
-    }
-
-    @Override
-    public double evaluate(double[] values) throws MathIllegalArgumentException {
-        long below = Arrays.stream(values)
-            .filter(val -> val <= threshold)
-            .count();
-        return (double) below / values.length;
-    }
-
-    @Override
-    public double evaluate(double[] values, int begin, int length) throws MathIllegalArgumentException {
-        long below = IntStream.range(begin, length)
-            .mapToDouble(i -> values[i])
-            .filter(val -> val > threshold)
-            .count();
-        return 100.0 * below / length;
-    }
-
-    @Override
-    public UnivariateStatistic copy() {
-        return new PercentageAboveThreshold(threshold);
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper.util;
+
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.stat.descriptive.UnivariateStatistic;
+import org.apache.plc4x.java.scraper.Scraper;
+
+import java.util.Arrays;
+import java.util.stream.IntStream;
+
+public class PercentageAboveThreshold implements UnivariateStatistic {
+
+    private final double threshold;
+
+    public PercentageAboveThreshold(double threshold) {
+        this.threshold = threshold;
+    }
+
+    @Override
+    public double evaluate(double[] values) throws MathIllegalArgumentException {
+        long below = Arrays.stream(values)
+            .filter(val -> val <= threshold)
+            .count();
+        return (double) below / values.length;
+    }
+
+    @Override
+    public double evaluate(double[] values, int begin, int length) throws MathIllegalArgumentException {
+        long below = IntStream.range(begin, length)
+            .mapToDouble(i -> values[i])
+            .filter(val -> val > threshold)
+            .count();
+        return 100.0 * below / length;
+    }
+
+    @Override
+    public UnivariateStatistic copy() {
+        return new PercentageAboveThreshold(threshold);
+    }
+}
diff --git a/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/s7/ManualS7PlcDriverMT.java b/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/s7/ManualS7PlcDriverMT.java
index 88225455cd1..22c881c5fa3 100644
--- a/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/s7/ManualS7PlcDriverMT.java
+++ b/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/s7/ManualS7PlcDriverMT.java
@@ -1,205 +1,205 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.s7;
-
-import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.utils.connectionpool.PooledPlcDriverManager;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.junit.jupiter.params.provider.ValueSource;
-
-import java.util.Locale;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Stream;
-
-/**
- * Manual Test.
- */
-@Disabled
-public class ManualS7PlcDriverMT {
-
-    public static final String CONN_STRING = "s7://10.10.64.22/0/1";
-    public static final String FIELD_STRING = "%DB225:DBW0:INT";
-
-    //    public static final String CONN_STRING = "s7://10.10.64.20/0/1";
-//    public static final String FIELD_STRING = "%DB3:DBD32:DINT";
-
-    @Test
-    public void simpleLoop() {
-        PlcDriverManager plcDriverManager = new PooledPlcDriverManager();
-
-        DescriptiveStatistics statistics = new DescriptiveStatistics();
-        for (int i = 1; i <= 1000; i++) {
-            double timeNs = runSingleRequest(plcDriverManager);
-            statistics.addValue(timeNs);
-        }
-
-        printStatistics(statistics);
-    }
-
-    @ParameterizedTest
-    @ValueSource(ints = {1, 5, 10, 20})
-    public void scheduledLoop(int period) throws InterruptedException {
-        PlcDriverManager plcDriverManager = new PooledPlcDriverManager();
-        ScheduledExecutorService executorService = Executors.newScheduledThreadPool(10);
-        DescriptiveStatistics statistics = new DescriptiveStatistics();
-
-        int numberOfRuns = 1000;
-        AtomicInteger counter = new AtomicInteger(0);
-        executorService.scheduleAtFixedRate(() -> {
-            // System.out.println("Run: " + counter.get());
-            double timeNs = runSingleRequest(plcDriverManager);
-            statistics.addValue(timeNs);
-            if (counter.getAndIncrement() >= numberOfRuns) {
-                executorService.shutdown();
-                printStatistics(statistics);
-            }
-        }, 0, period, TimeUnit.MILLISECONDS);
-
-        executorService.awaitTermination(100, TimeUnit.SECONDS);
-    }
-
-    @Test
-    public void parallelScheduledLoop() throws InterruptedException {
-        int period = 5;
-        PlcDriverManager plcDriverManager = new PooledPlcDriverManager();
-        ScheduledExecutorService executorService = Executors.newScheduledThreadPool(10);
-        DescriptiveStatistics statistics1 = new DescriptiveStatistics();
-        DescriptiveStatistics statistics2 = new DescriptiveStatistics();
-
-        int numberOfRuns = 1000;
-        AtomicInteger counter1 = new AtomicInteger(0);
-        AtomicInteger counter2 = new AtomicInteger(0);
-        executorService.scheduleAtFixedRate(() -> {
-            // System.out.println("Run: " + counter.get());
-            double timeNs = runSingleRequest(plcDriverManager);
-            statistics1.addValue(timeNs);
-            if (counter1.getAndIncrement() >= numberOfRuns) {
-                executorService.shutdown();
-            }
-        }, 0, period, TimeUnit.MILLISECONDS);
-        executorService.scheduleAtFixedRate(() -> {
-            // System.out.println("Run: " + counter.get());
-            double timeNs = runSingleRequest(plcDriverManager);
-            statistics2.addValue(timeNs);
-            if (counter2.getAndIncrement() >= numberOfRuns) {
-                executorService.shutdown();
-            }
-        }, 0, period, TimeUnit.MILLISECONDS);
-
-        executorService.awaitTermination(100, TimeUnit.SECONDS);
-        System.out.println("Statistics 1");
-        printStatistics(statistics1);
-        System.out.println("Statistics 2");
-        printStatistics(statistics2);
-    }
-
-    private static Stream<Arguments> periodAndRus() {
-        return Stream.of(
-            Arguments.of(10, 100),
-            Arguments.of(10, 1000),
-            Arguments.of(100, 100),
-            Arguments.of(100, 1000)
-        );
-    }
-
-    @ParameterizedTest
-    @MethodSource("periodAndRus")
-    public void scheduledCancellingLoop(int period, int numberOfRuns) throws InterruptedException, PlcConnectionException {
-        System.out.println("Starting iteration with period " + period + " and " + numberOfRuns + " runs.");
-        PlcDriverManager plcDriverManager = new PooledPlcDriverManager();
-        ScheduledExecutorService executorService = Executors.newScheduledThreadPool(10);
-        DescriptiveStatistics statistics = new DescriptiveStatistics();
-
-        AtomicInteger counter = new AtomicInteger(0);
-
-        // Warmup
-        plcDriverManager.getConnection(CONN_STRING);
-
-        Runnable iteration = new Runnable() {
-            @Override
-            public void run() {
-//                System.out.println("Setting a request / guard...");
-                CompletableFuture<Double> requestFuture = CompletableFuture.supplyAsync(
-                    () -> ManualS7PlcDriverMT.this.runSingleRequest(plcDriverManager)
-                );
-                executorService.schedule(() -> {
-                    if (!requestFuture.isDone()) {
-                        requestFuture.cancel(true);
-                        System.out.print("!");
-                    } else {
-                        System.out.print(".");
-                        try {
-                            statistics.addValue(requestFuture.get());
-                        } catch (InterruptedException | ExecutionException e) {
-                            // do nothing...
-                        }
-                    }
-                    if (counter.getAndIncrement() >= numberOfRuns) {
-                        executorService.shutdown();
-                    }
-                }, period, TimeUnit.MILLISECONDS);
-            }
-        };
-
-        executorService.scheduleAtFixedRate(iteration, 0, period, TimeUnit.MILLISECONDS);
-        executorService.awaitTermination(100, TimeUnit.SECONDS);
-        // Print statistics
-        ManualS7PlcDriverMT.this.printStatistics(statistics);
-    }
-
-    private double runSingleRequest(PlcDriverManager plcDriverManager) {
-        long start = System.nanoTime();
-        try (PlcConnection connection = plcDriverManager.getConnection(CONN_STRING)) {
-            System.out.println("Connection: " + connection);
-            CompletableFuture<? extends PlcReadResponse> future = connection.readRequestBuilder()
-                .addItem("distance", FIELD_STRING)
-                .build()
-                .execute();
-
-            PlcReadResponse response = future.get(10, TimeUnit.SECONDS);
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        long end = System.nanoTime();
-        return (double) end - start;
-    }
-
-    private void printStatistics(DescriptiveStatistics statistics) {
-        System.out.println("Number of responses: " + statistics.getN());
-        System.out.println("Mean response time: " + TimeUnit.NANOSECONDS.toMillis((long) statistics.getMean()) + " ms");
-        System.out.println("Median response time: " + TimeUnit.NANOSECONDS.toMillis((long) statistics.getPercentile(50)) + " ms");
-        for (int i = 10; i <= 90; i += 10) {
-            System.out.println(String.format(Locale.ENGLISH, "Percentile %3d %%: %5d ms", i, TimeUnit.NANOSECONDS.toMillis((long) statistics.getPercentile(i))));
-        }
-        for (int i = 91; i <= 100; i++) {
-            System.out.println(String.format(Locale.ENGLISH, "Percentile %3d %%: %5d ms", i, TimeUnit.NANOSECONDS.toMillis((long) statistics.getPercentile(i))));
-        }
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.s7;
+
+import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.utils.connectionpool.PooledPlcDriverManager;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.util.Locale;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
+
+/**
+ * Manual Test.
+ */
+@Disabled
+public class ManualS7PlcDriverMT {
+
+    public static final String CONN_STRING = "s7://10.10.64.22/0/1";
+    public static final String FIELD_STRING = "%DB225:DBW0:INT";
+
+    //    public static final String CONN_STRING = "s7://10.10.64.20/0/1";
+//    public static final String FIELD_STRING = "%DB3:DBD32:DINT";
+
+    @Test
+    public void simpleLoop() {
+        PlcDriverManager plcDriverManager = new PooledPlcDriverManager();
+
+        DescriptiveStatistics statistics = new DescriptiveStatistics();
+        for (int i = 1; i <= 1000; i++) {
+            double timeNs = runSingleRequest(plcDriverManager);
+            statistics.addValue(timeNs);
+        }
+
+        printStatistics(statistics);
+    }
+
+    @ParameterizedTest
+    @ValueSource(ints = {1, 5, 10, 20})
+    public void scheduledLoop(int period) throws InterruptedException {
+        PlcDriverManager plcDriverManager = new PooledPlcDriverManager();
+        ScheduledExecutorService executorService = Executors.newScheduledThreadPool(10);
+        DescriptiveStatistics statistics = new DescriptiveStatistics();
+
+        int numberOfRuns = 1000;
+        AtomicInteger counter = new AtomicInteger(0);
+        executorService.scheduleAtFixedRate(() -> {
+            // System.out.println("Run: " + counter.get());
+            double timeNs = runSingleRequest(plcDriverManager);
+            statistics.addValue(timeNs);
+            if (counter.getAndIncrement() >= numberOfRuns) {
+                executorService.shutdown();
+                printStatistics(statistics);
+            }
+        }, 0, period, TimeUnit.MILLISECONDS);
+
+        executorService.awaitTermination(100, TimeUnit.SECONDS);
+    }
+
+    @Test
+    public void parallelScheduledLoop() throws InterruptedException {
+        int period = 5;
+        PlcDriverManager plcDriverManager = new PooledPlcDriverManager();
+        ScheduledExecutorService executorService = Executors.newScheduledThreadPool(10);
+        DescriptiveStatistics statistics1 = new DescriptiveStatistics();
+        DescriptiveStatistics statistics2 = new DescriptiveStatistics();
+
+        int numberOfRuns = 1000;
+        AtomicInteger counter1 = new AtomicInteger(0);
+        AtomicInteger counter2 = new AtomicInteger(0);
+        executorService.scheduleAtFixedRate(() -> {
+            // System.out.println("Run: " + counter.get());
+            double timeNs = runSingleRequest(plcDriverManager);
+            statistics1.addValue(timeNs);
+            if (counter1.getAndIncrement() >= numberOfRuns) {
+                executorService.shutdown();
+            }
+        }, 0, period, TimeUnit.MILLISECONDS);
+        executorService.scheduleAtFixedRate(() -> {
+            // System.out.println("Run: " + counter.get());
+            double timeNs = runSingleRequest(plcDriverManager);
+            statistics2.addValue(timeNs);
+            if (counter2.getAndIncrement() >= numberOfRuns) {
+                executorService.shutdown();
+            }
+        }, 0, period, TimeUnit.MILLISECONDS);
+
+        executorService.awaitTermination(100, TimeUnit.SECONDS);
+        System.out.println("Statistics 1");
+        printStatistics(statistics1);
+        System.out.println("Statistics 2");
+        printStatistics(statistics2);
+    }
+
+    private static Stream<Arguments> periodAndRus() {
+        return Stream.of(
+            Arguments.of(10, 100),
+            Arguments.of(10, 1000),
+            Arguments.of(100, 100),
+            Arguments.of(100, 1000)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("periodAndRus")
+    public void scheduledCancellingLoop(int period, int numberOfRuns) throws InterruptedException, PlcConnectionException {
+        System.out.println("Starting iteration with period " + period + " and " + numberOfRuns + " runs.");
+        PlcDriverManager plcDriverManager = new PooledPlcDriverManager();
+        ScheduledExecutorService executorService = Executors.newScheduledThreadPool(10);
+        DescriptiveStatistics statistics = new DescriptiveStatistics();
+
+        AtomicInteger counter = new AtomicInteger(0);
+
+        // Warmup
+        plcDriverManager.getConnection(CONN_STRING);
+
+        Runnable iteration = new Runnable() {
+            @Override
+            public void run() {
+//                System.out.println("Setting a request / guard...");
+                CompletableFuture<Double> requestFuture = CompletableFuture.supplyAsync(
+                    () -> ManualS7PlcDriverMT.this.runSingleRequest(plcDriverManager)
+                );
+                executorService.schedule(() -> {
+                    if (!requestFuture.isDone()) {
+                        requestFuture.cancel(true);
+                        System.out.print("!");
+                    } else {
+                        System.out.print(".");
+                        try {
+                            statistics.addValue(requestFuture.get());
+                        } catch (InterruptedException | ExecutionException e) {
+                            // do nothing...
+                        }
+                    }
+                    if (counter.getAndIncrement() >= numberOfRuns) {
+                        executorService.shutdown();
+                    }
+                }, period, TimeUnit.MILLISECONDS);
+            }
+        };
+
+        executorService.scheduleAtFixedRate(iteration, 0, period, TimeUnit.MILLISECONDS);
+        executorService.awaitTermination(100, TimeUnit.SECONDS);
+        // Print statistics
+        ManualS7PlcDriverMT.this.printStatistics(statistics);
+    }
+
+    private double runSingleRequest(PlcDriverManager plcDriverManager) {
+        long start = System.nanoTime();
+        try (PlcConnection connection = plcDriverManager.getConnection(CONN_STRING)) {
+            System.out.println("Connection: " + connection);
+            CompletableFuture<? extends PlcReadResponse> future = connection.readRequestBuilder()
+                .addItem("distance", FIELD_STRING)
+                .build()
+                .execute();
+
+            PlcReadResponse response = future.get(10, TimeUnit.SECONDS);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        long end = System.nanoTime();
+        return (double) end - start;
+    }
+
+    private void printStatistics(DescriptiveStatistics statistics) {
+        System.out.println("Number of responses: " + statistics.getN());
+        System.out.println("Mean response time: " + TimeUnit.NANOSECONDS.toMillis((long) statistics.getMean()) + " ms");
+        System.out.println("Median response time: " + TimeUnit.NANOSECONDS.toMillis((long) statistics.getPercentile(50)) + " ms");
+        for (int i = 10; i <= 90; i += 10) {
+            System.out.println(String.format(Locale.ENGLISH, "Percentile %3d %%: %5d ms", i, TimeUnit.NANOSECONDS.toMillis((long) statistics.getPercentile(i))));
+        }
+        for (int i = 91; i <= 100; i++) {
+            System.out.println(String.format(Locale.ENGLISH, "Percentile %3d %%: %5d ms", i, TimeUnit.NANOSECONDS.toMillis((long) statistics.getPercentile(i))));
+        }
+    }
+}
diff --git a/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperConfigurationTest.java b/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperConfigurationTest.java
index 129c8345b72..2b5c35527b3 100644
--- a/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperConfigurationTest.java
+++ b/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperConfigurationTest.java
@@ -1,205 +1,205 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.exc.MismatchedInputException;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.scraper.config.JobConfiguration;
-import org.apache.plc4x.java.scraper.config.JobConfigurationClassicImpl;
-import org.apache.plc4x.java.scraper.config.ScraperConfiguration;
-import org.apache.plc4x.java.scraper.config.ScraperConfigurationClassicImpl;
-import org.apache.plc4x.java.scraper.exception.ScraperException;
-import org.assertj.core.api.WithAssertions;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.io.IOException;
-import java.util.List;
-
-@ExtendWith(MockitoExtension.class)
-class ScraperConfigurationTest implements WithAssertions {
-
-    ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
-
-    @Test
-    void parseJobs_fromString() throws IOException {
-        String yaml =   "sources:\n" +
-                        "    a1: b\n" +
-                        "    a2: b\n" +
-                        "    a3: b\n" +
-                        "jobs:\n" +
-                        "    - name: job1\n" +
-                        "      scrapeRate: 10\n" +
-                        "      sources:\n" +
-                        "        - a1\n" +
-                        "        - a2\n" +
-                        "        - a3\n" +
-                        "      fields:\n" +
-                        "        a: DBasdf\n" +
-                        "        b: DBbsdf\n";
-
-        ScraperConfiguration configuration = mapper.readValue(yaml, ScraperConfigurationClassicImpl.class);
-
-        assertThat(configuration.getJobConfigurations()).hasSize(1);
-        JobConfiguration conf = configuration.getJobConfigurations().get(0);
-
-        assertThat(configuration.getSources())
-            .isNotEmpty()
-            .hasSize(3)
-            .containsEntry("a1", "b")
-            .containsEntry("a2", "b")
-            .containsEntry("a3", "b");
-
-        assertThat(conf.getName()).isEqualTo("job1");
-        assertThat(conf.getScrapeRate()).isEqualTo(10);
-        assertThat(conf.getSources())
-            .hasSize(3);
-
-        assertThat(conf.getFields())
-            .hasSize(2)
-            .containsEntry("a", "DBasdf")
-            .containsEntry("b", "DBbsdf");
-    }
-
-    @Test
-    void parseJobs_missingEntries_fails() {
-        String jobs =   "sources:\n" +
-                        "    a: b\n" +
-                        "jobs:\n" +
-                        "    - name: job1\n" +
-                        "      scrapeRate: 10\n" +
-                        "      sources:\n" +
-                        "        - a1\n";
-
-        assertThatThrownBy(() -> mapper.readValue(jobs, ScraperConfigurationClassicImpl.class))
-            .isInstanceOf(MismatchedInputException.class);
-    }
-
-    @Test
-    void fromYaml_loads() {
-        String yaml =   "sources:\n" +
-                        "  a1: b\n" +
-                        "  a2: b\n" +
-                        "  a3: b\n" +
-                        "jobs:\n" +
-                        "  - name: job1\n" +
-                        "    scrapeRate: 10\n" +
-                        "    sources:\n" +
-                        "      - a1\n" +
-                        "      - a2\n" +
-                        "      - a3\n" +
-                        "    fields:\n" +
-                        "      a: DBasdf\n" +
-                        "      b: DBbsdf\n";
-
-        assertThatCode(() -> ScraperConfiguration.fromYaml(yaml, ScraperConfigurationClassicImpl.class))
-            .doesNotThrowAnyException();
-    }
-
-    @Test
-    void fromString_loads() {
-        String json =   "{\n" +
-                        "    \"sources\": {\n" +
-                        "        \"a1\": \"b\",\n" +
-                        "        \"a2\": \"b\",\n" +
-                        "        \"a3\": \"b\"\n" +
-                        "    },\n" +
-                        "    \"jobs\": [\n" +
-                        "        {\n" +
-                        "            \"name\": \"job1\",\n" +
-                        "            \"scrapeRate\": 10,\n" +
-                        "            \"sources\": [\n" +
-                        "                \"a1\",\n" +
-                        "                \"a2\",\n" +
-                        "                \"a3\"\n" +
-                        "            ],\n" +
-                        "            \"fields\": {\n" +
-                        "                \"a\": \"DBasdf\",\n" +
-                        "                \"b\": \"DBbsdf\"\n" +
-                        "            }\n" +
-                        "        }\n" +
-                        "    ]\n" +
-                        "}";
-
-        assertThatCode(() -> ScraperConfiguration.fromJson(json, ScraperConfigurationClassicImpl.class))
-            .doesNotThrowAnyException();
-    }
-
-    @Test
-    void new_notAllSourceAliasesAreResolvable_throws() {
-        String yaml =   "sources:\n" +
-                        "  b: c\n" +
-                        "jobs:\n" +
-                        "  - name: job1\n" +
-                        "    scrapeRate: 10\n" +
-                        "    sources:\n" +
-                        "      - s1\n" +
-                        "    fields:\n";
-
-        assertThatThrownBy(() -> ScraperConfiguration.fromYaml(yaml, ScraperConfigurationClassicImpl.class))
-            .isInstanceOf(PlcRuntimeException.class)
-            .hasStackTraceContaining("unreferenced sources: [s1]");
-    }
-
-    @Test
-    void generateScrapeJobs_fromConfig() throws ScraperException {
-        String yaml =   "sources:\n" +
-                        "  source1: 'connection string'\n" +
-                        "jobs:\n" +
-                        "  - name: job1\n" +
-                        "    scrapeRate: 10\n" +
-                        "    sources:\n" +
-                        "      - source1\n" +
-                        "    fields:\n" +
-                        "      field1: 'DB1 Field 1'\n";
-
-        List<ScrapeJob> jobs = ScraperConfiguration.fromYaml(yaml, ScraperConfigurationClassicImpl.class).getJobs();
-        assertThat(jobs).hasSize(1);
-
-        ScrapeJob job = jobs.get(0);
-
-        assertThat(job.getJobName()).isEqualTo("job1");
-        assertThat(job.getScrapeRate()).isEqualTo(10);
-        assertThat(job.getSourceConnections())
-            .hasSize(1)
-            .containsEntry("source1", "connection string");
-        assertThat(job.getFields())
-            .hasSize(1)
-            .containsEntry("field1", "DB1 Field 1");
-    }
-
-    @Nested
-    class Files {
-
-        @Test
-        void json() throws IOException {
-            ScraperConfiguration conf = ScraperConfiguration.fromFile("src/test/resources/config.json", ScraperConfigurationClassicImpl.class);
-        }
-
-        @Test
-        void yaml() throws IOException {
-            ScraperConfiguration conf = ScraperConfiguration.fromFile("src/test/resources/config.yml", ScraperConfigurationClassicImpl.class);
-        }
-    }
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.exc.MismatchedInputException;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.scraper.config.JobConfiguration;
+import org.apache.plc4x.java.scraper.config.JobConfigurationClassicImpl;
+import org.apache.plc4x.java.scraper.config.ScraperConfiguration;
+import org.apache.plc4x.java.scraper.config.ScraperConfigurationClassicImpl;
+import org.apache.plc4x.java.scraper.exception.ScraperException;
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.io.IOException;
+import java.util.List;
+
+@ExtendWith(MockitoExtension.class)
+class ScraperConfigurationTest implements WithAssertions {
+
+    ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
+
+    @Test
+    void parseJobs_fromString() throws IOException {
+        String yaml =   "sources:\n" +
+                        "    a1: b\n" +
+                        "    a2: b\n" +
+                        "    a3: b\n" +
+                        "jobs:\n" +
+                        "    - name: job1\n" +
+                        "      scrapeRate: 10\n" +
+                        "      sources:\n" +
+                        "        - a1\n" +
+                        "        - a2\n" +
+                        "        - a3\n" +
+                        "      fields:\n" +
+                        "        a: DBasdf\n" +
+                        "        b: DBbsdf\n";
+
+        ScraperConfiguration configuration = mapper.readValue(yaml, ScraperConfigurationClassicImpl.class);
+
+        assertThat(configuration.getJobConfigurations()).hasSize(1);
+        JobConfiguration conf = configuration.getJobConfigurations().get(0);
+
+        assertThat(configuration.getSources())
+            .isNotEmpty()
+            .hasSize(3)
+            .containsEntry("a1", "b")
+            .containsEntry("a2", "b")
+            .containsEntry("a3", "b");
+
+        assertThat(conf.getName()).isEqualTo("job1");
+        assertThat(conf.getScrapeRate()).isEqualTo(10);
+        assertThat(conf.getSources())
+            .hasSize(3);
+
+        assertThat(conf.getFields())
+            .hasSize(2)
+            .containsEntry("a", "DBasdf")
+            .containsEntry("b", "DBbsdf");
+    }
+
+    @Test
+    void parseJobs_missingEntries_fails() {
+        String jobs =   "sources:\n" +
+                        "    a: b\n" +
+                        "jobs:\n" +
+                        "    - name: job1\n" +
+                        "      scrapeRate: 10\n" +
+                        "      sources:\n" +
+                        "        - a1\n";
+
+        assertThatThrownBy(() -> mapper.readValue(jobs, ScraperConfigurationClassicImpl.class))
+            .isInstanceOf(MismatchedInputException.class);
+    }
+
+    @Test
+    void fromYaml_loads() {
+        String yaml =   "sources:\n" +
+                        "  a1: b\n" +
+                        "  a2: b\n" +
+                        "  a3: b\n" +
+                        "jobs:\n" +
+                        "  - name: job1\n" +
+                        "    scrapeRate: 10\n" +
+                        "    sources:\n" +
+                        "      - a1\n" +
+                        "      - a2\n" +
+                        "      - a3\n" +
+                        "    fields:\n" +
+                        "      a: DBasdf\n" +
+                        "      b: DBbsdf\n";
+
+        assertThatCode(() -> ScraperConfiguration.fromYaml(yaml, ScraperConfigurationClassicImpl.class))
+            .doesNotThrowAnyException();
+    }
+
+    @Test
+    void fromString_loads() {
+        String json =   "{\n" +
+                        "    \"sources\": {\n" +
+                        "        \"a1\": \"b\",\n" +
+                        "        \"a2\": \"b\",\n" +
+                        "        \"a3\": \"b\"\n" +
+                        "    },\n" +
+                        "    \"jobs\": [\n" +
+                        "        {\n" +
+                        "            \"name\": \"job1\",\n" +
+                        "            \"scrapeRate\": 10,\n" +
+                        "            \"sources\": [\n" +
+                        "                \"a1\",\n" +
+                        "                \"a2\",\n" +
+                        "                \"a3\"\n" +
+                        "            ],\n" +
+                        "            \"fields\": {\n" +
+                        "                \"a\": \"DBasdf\",\n" +
+                        "                \"b\": \"DBbsdf\"\n" +
+                        "            }\n" +
+                        "        }\n" +
+                        "    ]\n" +
+                        "}";
+
+        assertThatCode(() -> ScraperConfiguration.fromJson(json, ScraperConfigurationClassicImpl.class))
+            .doesNotThrowAnyException();
+    }
+
+    @Test
+    void new_notAllSourceAliasesAreResolvable_throws() {
+        String yaml =   "sources:\n" +
+                        "  b: c\n" +
+                        "jobs:\n" +
+                        "  - name: job1\n" +
+                        "    scrapeRate: 10\n" +
+                        "    sources:\n" +
+                        "      - s1\n" +
+                        "    fields:\n";
+
+        assertThatThrownBy(() -> ScraperConfiguration.fromYaml(yaml, ScraperConfigurationClassicImpl.class))
+            .isInstanceOf(PlcRuntimeException.class)
+            .hasStackTraceContaining("unreferenced sources: [s1]");
+    }
+
+    @Test
+    void generateScrapeJobs_fromConfig() throws ScraperException {
+        String yaml =   "sources:\n" +
+                        "  source1: 'connection string'\n" +
+                        "jobs:\n" +
+                        "  - name: job1\n" +
+                        "    scrapeRate: 10\n" +
+                        "    sources:\n" +
+                        "      - source1\n" +
+                        "    fields:\n" +
+                        "      field1: 'DB1 Field 1'\n";
+
+        List<ScrapeJob> jobs = ScraperConfiguration.fromYaml(yaml, ScraperConfigurationClassicImpl.class).getJobs();
+        assertThat(jobs).hasSize(1);
+
+        ScrapeJob job = jobs.get(0);
+
+        assertThat(job.getJobName()).isEqualTo("job1");
+        assertThat(job.getScrapeRate()).isEqualTo(10);
+        assertThat(job.getSourceConnections())
+            .hasSize(1)
+            .containsEntry("source1", "connection string");
+        assertThat(job.getFields())
+            .hasSize(1)
+            .containsEntry("field1", "DB1 Field 1");
+    }
+
+    @Nested
+    class Files {
+
+        @Test
+        void json() throws IOException {
+            ScraperConfiguration conf = ScraperConfiguration.fromFile("src/test/resources/config.json", ScraperConfigurationClassicImpl.class);
+        }
+
+        @Test
+        void yaml() throws IOException {
+            ScraperConfiguration conf = ScraperConfiguration.fromFile("src/test/resources/config.yml", ScraperConfigurationClassicImpl.class);
+        }
+    }
 }
\ No newline at end of file
diff --git a/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperRunner.java b/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperRunner.java
index 3a6f54334fe..567e67a6521 100644
--- a/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperRunner.java
+++ b/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperRunner.java
@@ -1,40 +1,40 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper;
-
-import org.apache.plc4x.java.scraper.config.ScraperConfiguration;
-import org.apache.plc4x.java.scraper.config.ScraperConfigurationClassicImpl;
-import org.apache.plc4x.java.scraper.exception.ScraperException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-
-public class ScraperRunner {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ScraperRunner.class);
-
-    public static void main(String[] args) throws IOException, ScraperException {
-        ScraperConfiguration configuration = ScraperConfiguration.fromFile("plc4j/utils/scraper/src/test/resources/example.yml", ScraperConfigurationClassicImpl.class);
-        Scraper scraper = new ScraperImpl(configuration, (j, a, m) -> LOGGER.info("Results from {}/{}: {}", j, a, m));
-
-        scraper.start();
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper;
+
+import org.apache.plc4x.java.scraper.config.ScraperConfiguration;
+import org.apache.plc4x.java.scraper.config.ScraperConfigurationClassicImpl;
+import org.apache.plc4x.java.scraper.exception.ScraperException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+
+public class ScraperRunner {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ScraperRunner.class);
+
+    public static void main(String[] args) throws IOException, ScraperException {
+        ScraperConfiguration configuration = ScraperConfiguration.fromFile("plc4j/utils/scraper/src/test/resources/example.yml", ScraperConfigurationClassicImpl.class);
+        Scraper scraper = new ScraperImpl(configuration, (j, a, m) -> LOGGER.info("Results from {}/{}: {}", j, a, m));
+
+        scraper.start();
+    }
+}
diff --git a/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperTaskTest.java b/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperTaskTest.java
index 9309af30d99..f49411a82cc 100644
--- a/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperTaskTest.java
+++ b/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperTaskTest.java
@@ -1,113 +1,113 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.messages.items.DefaultStringFieldItem;
-import org.apache.plc4x.java.mock.MockDevice;
-import org.apache.plc4x.java.mock.PlcMockConnection;
-import org.assertj.core.api.WithAssertions;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.mockito.junit.jupiter.MockitoSettings;
-import org.mockito.quality.Strictness;
-
-import java.util.Collections;
-import java.util.concurrent.*;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.*;
-
-@ExtendWith(MockitoExtension.class)
-@MockitoSettings(strictness = Strictness.LENIENT)
-public class ScraperTaskTest implements WithAssertions {
-
-    @Mock
-    MockDevice mockDevice;
-
-    @Test
-    public void scrape() throws PlcConnectionException {
-        PlcDriverManager driverManager = new PlcDriverManager();
-        PlcMockConnection connection = (PlcMockConnection) driverManager.getConnection("mock:scraper");
-        connection.setDevice(mockDevice);
-        when(mockDevice.read(any())).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultStringFieldItem("hallo")));
-
-        ScraperTask scraperTask = new ScraperTaskImpl(driverManager, "job1", "m1", "mock:scraper", Collections.singletonMap("a", "b"),
-            1_000, ForkJoinPool.commonPool(), (j,a,m) -> {});
-
-        scraperTask.run();
-    }
-
-    @Nested
-    class Exceptions {
-
-        @Test
-        public void badResponseCode_shouldHandleException() throws PlcConnectionException {
-            // Given
-            PlcDriverManager driverManager = new PlcDriverManager();
-            PlcMockConnection connection = (PlcMockConnection) driverManager.getConnection("mock:scraper");
-            connection.setDevice(mockDevice);
-            when(mockDevice.read(any())).thenReturn(Pair.of(PlcResponseCode.NOT_FOUND, new DefaultStringFieldItem("hallo")));
-
-            ScraperTask scraperTask = new ScraperTaskImpl(driverManager, "job1", "m1",
-                "mock:scraper", Collections.singletonMap("a", "b"), 1_000, ForkJoinPool.commonPool(), (j,a,m) -> {});
-
-            // When
-            scraperTask.run();
-        }
-
-        @Mock
-        PlcDriverManager driverManager;
-
-        @Test
-        public void handleConnectionException() throws PlcConnectionException {
-            // Given
-            when(driverManager.getConnection(anyString())).thenThrow(new PlcConnectionException("stfu"));
-
-            ScraperTask scraperTask = new ScraperTaskImpl(driverManager, "job1", "m1", "mock:scraper", Collections.singletonMap("a", "b"),
-                1_000, ForkJoinPool.commonPool(), (j,a,m) -> {});
-
-            ScraperTask spy = spy(scraperTask);
-            spy.run();
-
-            verify(spy).handleException(any());
-        }
-
-        @Test
-        void runByScheduler_handledGracefully() throws PlcConnectionException {
-            when(driverManager.getConnection(anyString())).thenThrow(new PlcConnectionException("stfu"));
-            ScheduledExecutorService pool = Executors.newScheduledThreadPool(1);
-            ScraperTask scraperTask = new ScraperTaskImpl(driverManager, "job1", "m1", "mock:scraper", Collections.singletonMap("a", "b"),
-                1_000, ForkJoinPool.commonPool(), (j,a,m) -> {});
-
-            Future<?> future = pool.scheduleAtFixedRate(scraperTask, 0, 10, TimeUnit.MILLISECONDS);
-
-            assertThat(future).isNotDone();
-        }
-
-    }
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.messages.items.DefaultStringFieldItem;
+import org.apache.plc4x.java.mock.MockDevice;
+import org.apache.plc4x.java.mock.PlcMockConnection;
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+import java.util.Collections;
+import java.util.concurrent.*;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+public class ScraperTaskTest implements WithAssertions {
+
+    @Mock
+    MockDevice mockDevice;
+
+    @Test
+    public void scrape() throws PlcConnectionException {
+        PlcDriverManager driverManager = new PlcDriverManager();
+        PlcMockConnection connection = (PlcMockConnection) driverManager.getConnection("mock:scraper");
+        connection.setDevice(mockDevice);
+        when(mockDevice.read(any())).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultStringFieldItem("hallo")));
+
+        ScraperTask scraperTask = new ScraperTaskImpl(driverManager, "job1", "m1", "mock:scraper", Collections.singletonMap("a", "b"),
+            1_000, ForkJoinPool.commonPool(), (j,a,m) -> {});
+
+        scraperTask.run();
+    }
+
+    @Nested
+    class Exceptions {
+
+        @Test
+        public void badResponseCode_shouldHandleException() throws PlcConnectionException {
+            // Given
+            PlcDriverManager driverManager = new PlcDriverManager();
+            PlcMockConnection connection = (PlcMockConnection) driverManager.getConnection("mock:scraper");
+            connection.setDevice(mockDevice);
+            when(mockDevice.read(any())).thenReturn(Pair.of(PlcResponseCode.NOT_FOUND, new DefaultStringFieldItem("hallo")));
+
+            ScraperTask scraperTask = new ScraperTaskImpl(driverManager, "job1", "m1",
+                "mock:scraper", Collections.singletonMap("a", "b"), 1_000, ForkJoinPool.commonPool(), (j,a,m) -> {});
+
+            // When
+            scraperTask.run();
+        }
+
+        @Mock
+        PlcDriverManager driverManager;
+
+        @Test
+        public void handleConnectionException() throws PlcConnectionException {
+            // Given
+            when(driverManager.getConnection(anyString())).thenThrow(new PlcConnectionException("stfu"));
+
+            ScraperTask scraperTask = new ScraperTaskImpl(driverManager, "job1", "m1", "mock:scraper", Collections.singletonMap("a", "b"),
+                1_000, ForkJoinPool.commonPool(), (j,a,m) -> {});
+
+            ScraperTask spy = spy(scraperTask);
+            spy.run();
+
+            verify(spy).handleException(any());
+        }
+
+        @Test
+        void runByScheduler_handledGracefully() throws PlcConnectionException {
+            when(driverManager.getConnection(anyString())).thenThrow(new PlcConnectionException("stfu"));
+            ScheduledExecutorService pool = Executors.newScheduledThreadPool(1);
+            ScraperTask scraperTask = new ScraperTaskImpl(driverManager, "job1", "m1", "mock:scraper", Collections.singletonMap("a", "b"),
+                1_000, ForkJoinPool.commonPool(), (j,a,m) -> {});
+
+            Future<?> future = pool.scheduleAtFixedRate(scraperTask, 0, 10, TimeUnit.MILLISECONDS);
+
+            assertThat(future).isNotDone();
+        }
+
+    }
 }
\ No newline at end of file
diff --git a/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperTest.java b/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperTest.java
index c9ab74b66ab..56372a826ba 100644
--- a/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperTest.java
+++ b/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperTest.java
@@ -1,175 +1,175 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
-import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.messages.items.DefaultIntegerFieldItem;
-import org.apache.plc4x.java.mock.MockDevice;
-import org.apache.plc4x.java.mock.PlcMockConnection;
-import org.apache.plc4x.java.utils.connectionpool.PooledPlcDriverManager;
-import org.assertj.core.api.WithAssertions;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.mockito.junit.jupiter.MockitoSettings;
-import org.mockito.quality.Strictness;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
-
-@ExtendWith(MockitoExtension.class)
-@MockitoSettings(strictness = Strictness.LENIENT)
-class ScraperTest implements WithAssertions {
-
-    @Mock
-    MockDevice mockDevice;
-
-    public static final String CONN_STRING_TIM = "s7://10.10.64.22/0/1";
-    public static final String FIELD_STRING_TIM = "%DB225:DBW0:INT";
-
-    public static final String CONN_STRING_CH = "s7://10.10.64.20/0/1";
-    public static final String FIELD_STRING_CH = "%DB3:DBD32:DINT";
-
-    @Test
-    @Disabled
-    void real_stuff() throws InterruptedException {
-        PlcDriverManager driverManager = new PooledPlcDriverManager(pooledPlcConnectionFactory -> {
-            GenericKeyedObjectPoolConfig<PlcConnection> config = new GenericKeyedObjectPoolConfig<>();
-            config.setJmxEnabled(true);
-            config.setMaxWaitMillis(-1);
-            config.setMaxTotal(3);
-            config.setMinIdlePerKey(0);
-            config.setBlockWhenExhausted(true);
-            config.setTestOnBorrow(true);
-            config.setTestOnReturn(true);
-            return new GenericKeyedObjectPool<>(pooledPlcConnectionFactory, config);
-        });
-
-        Scraper scraper = new ScraperImpl((j, a, m) -> {}, driverManager, Arrays.asList(
-            new ScrapeJobImpl("job1",
-                10,
-                Collections.singletonMap("tim", CONN_STRING_TIM),
-                Collections.singletonMap("distance", FIELD_STRING_TIM)
-            ),
-            new ScrapeJobImpl("job2",
-                10,
-                Collections.singletonMap("chris", CONN_STRING_CH),
-                Collections.singletonMap("counter", FIELD_STRING_CH)
-            )
-        ));
-
-        Thread.sleep(30_000_000);
-    }
-
-    @Test
-    void scraper_schedulesJob() throws InterruptedException, PlcConnectionException {
-        PlcDriverManager driverManager = new PlcDriverManager();
-        PlcMockConnection connection = (PlcMockConnection) driverManager.getConnection("mock:m1");
-        connection.setDevice(mockDevice);
-
-        when(mockDevice.read(any())).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultIntegerFieldItem(1)));
-
-        ScraperImpl scraper = new ScraperImpl((j, a, m) -> {}, driverManager, Collections.singletonList(
-            new ScrapeJobImpl("job1",
-                10,
-                Collections.singletonMap("m1", "mock:m1"),
-                Collections.singletonMap("field1", "qry1")
-            )
-        ));
-
-        scraper.start();
-
-        Thread.sleep(1_000);
-
-        // Assert that tasks got done.
-        assertThat(scraper.getScheduler()).isInstanceOf(ScheduledThreadPoolExecutor.class);
-        assertThat(scraper.getNumberOfActiveTasks())
-            .isEqualTo(1);
-        assertThat(((ScheduledThreadPoolExecutor) scraper.getScheduler()).getCompletedTaskCount())
-            .isGreaterThan(10);
-    }
-
-    @Test
-    void stop_stopsAllJobs() {
-        PlcDriverManager driverManager = new PlcDriverManager();
-
-        Scraper scraper = new ScraperImpl((j, a, m) -> {}, driverManager, Collections.singletonList(
-            new ScrapeJobImpl("job1",
-                1,
-                Collections.singletonMap("m1", "mock:m1"),
-                Collections.singletonMap("field1", "qry1")
-            )
-        ));
-
-        scraper.start();
-
-        assertThat(scraper.getNumberOfActiveTasks())
-            .isEqualTo(1);
-
-        scraper.stop();
-
-        assertThat(scraper.getNumberOfActiveTasks())
-            .isZero();
-    }
-
-    @Test
-    void restart_works() throws PlcConnectionException {
-        PlcDriverManager driverManager = new PlcDriverManager();
-        PlcMockConnection connection = (PlcMockConnection) driverManager.getConnection("mock:m1");
-        connection.setDevice(mockDevice);
-
-        when(mockDevice.read(any())).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultIntegerFieldItem(1)));
-
-        Scraper scraper = new ScraperImpl((j, a, m) -> {}, driverManager, Collections.singletonList(
-            new ScrapeJobImpl("job1",
-                1,
-                Collections.singletonMap("m1", "mock:m1"),
-                Collections.singletonMap("field1", "qry1")
-            )
-        ));
-
-        scraper.start();
-
-        assertThat(scraper.getNumberOfActiveTasks())
-            .isEqualTo(1);
-
-        scraper.stop();
-
-        assertThat(scraper.getNumberOfActiveTasks())
-            .isZero();
-
-        scraper.start();
-
-        assertThat(scraper.getNumberOfActiveTasks())
-            .isEqualTo(1);
-    }
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
+import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.messages.items.DefaultIntegerFieldItem;
+import org.apache.plc4x.java.mock.MockDevice;
+import org.apache.plc4x.java.mock.PlcMockConnection;
+import org.apache.plc4x.java.utils.connectionpool.PooledPlcDriverManager;
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class ScraperTest implements WithAssertions {
+
+    @Mock
+    MockDevice mockDevice;
+
+    public static final String CONN_STRING_TIM = "s7://10.10.64.22/0/1";
+    public static final String FIELD_STRING_TIM = "%DB225:DBW0:INT";
+
+    public static final String CONN_STRING_CH = "s7://10.10.64.20/0/1";
+    public static final String FIELD_STRING_CH = "%DB3:DBD32:DINT";
+
+    @Test
+    @Disabled
+    void real_stuff() throws InterruptedException {
+        PlcDriverManager driverManager = new PooledPlcDriverManager(pooledPlcConnectionFactory -> {
+            GenericKeyedObjectPoolConfig<PlcConnection> config = new GenericKeyedObjectPoolConfig<>();
+            config.setJmxEnabled(true);
+            config.setMaxWaitMillis(-1);
+            config.setMaxTotal(3);
+            config.setMinIdlePerKey(0);
+            config.setBlockWhenExhausted(true);
+            config.setTestOnBorrow(true);
+            config.setTestOnReturn(true);
+            return new GenericKeyedObjectPool<>(pooledPlcConnectionFactory, config);
+        });
+
+        Scraper scraper = new ScraperImpl((j, a, m) -> {}, driverManager, Arrays.asList(
+            new ScrapeJobImpl("job1",
+                10,
+                Collections.singletonMap("tim", CONN_STRING_TIM),
+                Collections.singletonMap("distance", FIELD_STRING_TIM)
+            ),
+            new ScrapeJobImpl("job2",
+                10,
+                Collections.singletonMap("chris", CONN_STRING_CH),
+                Collections.singletonMap("counter", FIELD_STRING_CH)
+            )
+        ));
+
+        Thread.sleep(30_000_000);
+    }
+
+    @Test
+    void scraper_schedulesJob() throws InterruptedException, PlcConnectionException {
+        PlcDriverManager driverManager = new PlcDriverManager();
+        PlcMockConnection connection = (PlcMockConnection) driverManager.getConnection("mock:m1");
+        connection.setDevice(mockDevice);
+
+        when(mockDevice.read(any())).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultIntegerFieldItem(1)));
+
+        ScraperImpl scraper = new ScraperImpl((j, a, m) -> {}, driverManager, Collections.singletonList(
+            new ScrapeJobImpl("job1",
+                10,
+                Collections.singletonMap("m1", "mock:m1"),
+                Collections.singletonMap("field1", "qry1")
+            )
+        ));
+
+        scraper.start();
+
+        Thread.sleep(1_000);
+
+        // Assert that tasks got done.
+        assertThat(scraper.getScheduler()).isInstanceOf(ScheduledThreadPoolExecutor.class);
+        assertThat(scraper.getNumberOfActiveTasks())
+            .isEqualTo(1);
+        assertThat(((ScheduledThreadPoolExecutor) scraper.getScheduler()).getCompletedTaskCount())
+            .isGreaterThan(10);
+    }
+
+    @Test
+    void stop_stopsAllJobs() {
+        PlcDriverManager driverManager = new PlcDriverManager();
+
+        Scraper scraper = new ScraperImpl((j, a, m) -> {}, driverManager, Collections.singletonList(
+            new ScrapeJobImpl("job1",
+                1,
+                Collections.singletonMap("m1", "mock:m1"),
+                Collections.singletonMap("field1", "qry1")
+            )
+        ));
+
+        scraper.start();
+
+        assertThat(scraper.getNumberOfActiveTasks())
+            .isEqualTo(1);
+
+        scraper.stop();
+
+        assertThat(scraper.getNumberOfActiveTasks())
+            .isZero();
+    }
+
+    @Test
+    void restart_works() throws PlcConnectionException {
+        PlcDriverManager driverManager = new PlcDriverManager();
+        PlcMockConnection connection = (PlcMockConnection) driverManager.getConnection("mock:m1");
+        connection.setDevice(mockDevice);
+
+        when(mockDevice.read(any())).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultIntegerFieldItem(1)));
+
+        Scraper scraper = new ScraperImpl((j, a, m) -> {}, driverManager, Collections.singletonList(
+            new ScrapeJobImpl("job1",
+                1,
+                Collections.singletonMap("m1", "mock:m1"),
+                Collections.singletonMap("field1", "qry1")
+            )
+        ));
+
+        scraper.start();
+
+        assertThat(scraper.getNumberOfActiveTasks())
+            .isEqualTo(1);
+
+        scraper.stop();
+
+        assertThat(scraper.getNumberOfActiveTasks())
+            .isZero();
+
+        scraper.start();
+
+        assertThat(scraper.getNumberOfActiveTasks())
+            .isEqualTo(1);
+    }
 }
\ No newline at end of file
diff --git a/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/TriggeredScraperRunner.java b/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/TriggeredScraperRunner.java
index 381df5a0700..718aee9d95d 100644
--- a/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/TriggeredScraperRunner.java
+++ b/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/TriggeredScraperRunner.java
@@ -1,55 +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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper;
-
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.scraper.config.ScraperConfiguration;
-import org.apache.plc4x.java.scraper.config.triggeredscraper.ScraperConfigurationTriggeredImpl;
-import org.apache.plc4x.java.scraper.exception.ScraperException;
-
-
-import org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl;
-import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollector;
-import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollectorImpl;
-import org.apache.plc4x.java.utils.connectionpool.PooledPlcDriverManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-
-public class TriggeredScraperRunner {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(TriggeredScraperRunner.class);
-
-    /**
-     * testing of TriggeredScraper vs real device
-     */
-    public static void main(String[] args) throws IOException, ScraperException {
-
-        ScraperConfiguration configuration = ScraperConfiguration.fromFile("plc4j/utils/scraper/src/test/resources/example_triggered_scraper.yml", ScraperConfigurationTriggeredImpl.class);
-
-        PlcDriverManager plcDriverManager = new PooledPlcDriverManager();
-        TriggerCollector triggerCollector = new TriggerCollectorImpl(plcDriverManager);
-        TriggeredScraperImpl scraper = new TriggeredScraperImpl(configuration, (j, a, m) -> LOGGER.info("Results from {}/{}: {}", j, a, m),triggerCollector);
-
-        scraper.start();
-        triggerCollector.start();
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper;
+
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.scraper.config.ScraperConfiguration;
+import org.apache.plc4x.java.scraper.config.triggeredscraper.ScraperConfigurationTriggeredImpl;
+import org.apache.plc4x.java.scraper.exception.ScraperException;
+
+
+import org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl;
+import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollector;
+import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollectorImpl;
+import org.apache.plc4x.java.utils.connectionpool.PooledPlcDriverManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+
+public class TriggeredScraperRunner {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(TriggeredScraperRunner.class);
+
+    /**
+     * testing of TriggeredScraper vs real device
+     */
+    public static void main(String[] args) throws IOException, ScraperException {
+
+        ScraperConfiguration configuration = ScraperConfiguration.fromFile("plc4j/utils/scraper/src/test/resources/example_triggered_scraper.yml", ScraperConfigurationTriggeredImpl.class);
+
+        PlcDriverManager plcDriverManager = new PooledPlcDriverManager();
+        TriggerCollector triggerCollector = new TriggerCollectorImpl(plcDriverManager);
+        TriggeredScraperImpl scraper = new TriggeredScraperImpl(configuration, (j, a, m) -> LOGGER.info("Results from {}/{}: {}", j, a, m),triggerCollector);
+
+        scraper.start();
+        triggerCollector.start();
+    }
+}
diff --git a/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/TriggeredScraperRunnerModbus.java b/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/TriggeredScraperRunnerModbus.java
index fd3fe3a4f35..56297229c2a 100644
--- a/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/TriggeredScraperRunnerModbus.java
+++ b/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/TriggeredScraperRunnerModbus.java
@@ -1,69 +1,69 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper;
-
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.modbus.connection.ModbusConnectionFactory;
-import org.apache.plc4x.java.scraper.config.ScraperConfiguration;
-import org.apache.plc4x.java.scraper.config.triggeredscraper.ScraperConfigurationTriggeredImpl;
-import org.apache.plc4x.java.scraper.exception.ScraperException;
-import org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl;
-import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollectorImpl;
-import org.apache.plc4x.java.utils.connectionpool.PooledPlcDriverManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-public class TriggeredScraperRunnerModbus {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(TriggeredScraperRunnerModbus.class);
-
-    /**
-     * testing of TriggeredScraper vs real device (Modbus)
-     */
-    public static void main(String[] args) throws IOException, ScraperException {
-        ScraperConfiguration configuration = ScraperConfiguration.fromFile("plc4j/utils/scraper/src/test/resources/example_triggered_scraper_modbus.yml", ScraperConfigurationTriggeredImpl.class);
-        PlcDriverManager plcDriverManager = new PooledPlcDriverManager();
-        TriggeredScraperImpl scraper = new TriggeredScraperImpl(
-            configuration,
-            plcDriverManager,
-            (j, a, m) -> {
-            LOGGER.info("Results from {}/{}: {}", j, a, m);
-            for(Map.Entry<String, Object> entry:m.entrySet()){
-                for(Object object:(List<Object>)entry.getValue()){
-                    LOGGER.info("{}",object);
-                }
-            }
-            },
-            new TriggerCollectorImpl(plcDriverManager));
-
-        scraper.start();
-    }
-
-    /**
-     * dummy function to have Modbus Driver available in DriverManager
-     */
-    private void dummy(){
-        ModbusConnectionFactory modbusConnectionFactory = new ModbusConnectionFactory();
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper;
+
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.modbus.connection.ModbusConnectionFactory;
+import org.apache.plc4x.java.scraper.config.ScraperConfiguration;
+import org.apache.plc4x.java.scraper.config.triggeredscraper.ScraperConfigurationTriggeredImpl;
+import org.apache.plc4x.java.scraper.exception.ScraperException;
+import org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl;
+import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollectorImpl;
+import org.apache.plc4x.java.utils.connectionpool.PooledPlcDriverManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+public class TriggeredScraperRunnerModbus {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(TriggeredScraperRunnerModbus.class);
+
+    /**
+     * testing of TriggeredScraper vs real device (Modbus)
+     */
+    public static void main(String[] args) throws IOException, ScraperException {
+        ScraperConfiguration configuration = ScraperConfiguration.fromFile("plc4j/utils/scraper/src/test/resources/example_triggered_scraper_modbus.yml", ScraperConfigurationTriggeredImpl.class);
+        PlcDriverManager plcDriverManager = new PooledPlcDriverManager();
+        TriggeredScraperImpl scraper = new TriggeredScraperImpl(
+            configuration,
+            plcDriverManager,
+            (j, a, m) -> {
+            LOGGER.info("Results from {}/{}: {}", j, a, m);
+            for(Map.Entry<String, Object> entry:m.entrySet()){
+                for(Object object:(List<Object>)entry.getValue()){
+                    LOGGER.info("{}",object);
+                }
+            }
+            },
+            new TriggerCollectorImpl(plcDriverManager));
+
+        scraper.start();
+    }
+
+    /**
+     * dummy function to have Modbus Driver available in DriverManager
+     */
+    private void dummy(){
+        ModbusConnectionFactory modbusConnectionFactory = new ModbusConnectionFactory();
+    }
+}
diff --git a/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/config/ScraperConfigurationBuilderTest.java b/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/config/ScraperConfigurationBuilderTest.java
index 5ce58ebb75f..0981475b70e 100644
--- a/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/config/ScraperConfigurationBuilderTest.java
+++ b/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/config/ScraperConfigurationBuilderTest.java
@@ -1,69 +1,69 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper.config;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import org.assertj.core.api.WithAssertions;
-
-import java.util.Arrays;
-import java.util.List;
-
-class ScraperConfigurationBuilderTest implements WithAssertions {
-
-    //ToDo test is failing idon't know why (Tim)
-    void builder_usage_example() throws JsonProcessingException {
-        ScraperConfigurationClassicImplBuilder builder = new ScraperConfigurationClassicImplBuilder();
-        List<String> sources = Arrays.asList("s1", "s2");
-        List<String> jobs = Arrays.asList("j1", "j2");
-
-        sources.forEach(source -> builder.addSource(source, source));
-        for (String job : jobs) {
-            JobConfigurationClassicImplBuilder jobConfigurationClassicImplBuilder = builder.job(job, 10);
-            sources.forEach(jobConfigurationClassicImplBuilder::source);
-            for (int i = 1; i <= 10; i++) {
-                jobConfigurationClassicImplBuilder.field("f" + i, "qry" + i);
-            }
-            jobConfigurationClassicImplBuilder.build();
-        }
-
-        ScraperConfiguration configuration = builder.build();
-
-        ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
-        String s = mapper.writeValueAsString(configuration);
-
-        assertThat(configuration.getJobConfigurations())
-            .hasSize(2);
-        assertThat(configuration.getSources())
-            .hasSize(2);
-        assertThat(s).contains("sources:\n" +
-                                "  s1: \"s1\"\n" +
-                                "  s2: \"s2\"\n" +
-                                "jobs:\n" +
-                                "- name: \"j1\"\n" +
-                                "  scrapeRate: 10\n" +
-                                "  connections:\n" +
-                                "    s1: \"s1\"\n" +
-                                "    s2: \"s2\"\n" +
-                                "  fields:");
-
-    }
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper.config;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import org.assertj.core.api.WithAssertions;
+
+import java.util.Arrays;
+import java.util.List;
+
+class ScraperConfigurationBuilderTest implements WithAssertions {
+
+    //ToDo test is failing idon't know why (Tim)
+    void builder_usage_example() throws JsonProcessingException {
+        ScraperConfigurationClassicImplBuilder builder = new ScraperConfigurationClassicImplBuilder();
+        List<String> sources = Arrays.asList("s1", "s2");
+        List<String> jobs = Arrays.asList("j1", "j2");
+
+        sources.forEach(source -> builder.addSource(source, source));
+        for (String job : jobs) {
+            JobConfigurationClassicImplBuilder jobConfigurationClassicImplBuilder = builder.job(job, 10);
+            sources.forEach(jobConfigurationClassicImplBuilder::source);
+            for (int i = 1; i <= 10; i++) {
+                jobConfigurationClassicImplBuilder.field("f" + i, "qry" + i);
+            }
+            jobConfigurationClassicImplBuilder.build();
+        }
+
+        ScraperConfiguration configuration = builder.build();
+
+        ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
+        String s = mapper.writeValueAsString(configuration);
+
+        assertThat(configuration.getJobConfigurations())
+            .hasSize(2);
+        assertThat(configuration.getSources())
+            .hasSize(2);
+        assertThat(s).contains("sources:\n" +
+                                "  s1: \"s1\"\n" +
+                                "  s2: \"s2\"\n" +
+                                "jobs:\n" +
+                                "- name: \"j1\"\n" +
+                                "  scrapeRate: 10\n" +
+                                "  connections:\n" +
+                                "    s1: \"s1\"\n" +
+                                "    s2: \"s2\"\n" +
+                                "  fields:");
+
+    }
 }
\ No newline at end of file
diff --git a/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImplTest.java b/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImplTest.java
index d1bbefad4b1..d9dc8f19ede 100644
--- a/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImplTest.java
+++ b/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImplTest.java
@@ -1,118 +1,118 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper.triggeredscraper;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.messages.items.DefaultBooleanFieldItem;
-import org.apache.plc4x.java.base.messages.items.DefaultLongFieldItem;
-import org.apache.plc4x.java.mock.MockDevice;
-import org.apache.plc4x.java.mock.PlcMockConnection;
-import org.apache.plc4x.java.scraper.config.ScraperConfiguration;
-import org.apache.plc4x.java.scraper.config.ScraperConfigurationClassicImpl;
-import org.apache.plc4x.java.scraper.exception.ScraperException;
-import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollector;
-import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollectorImpl;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.util.Random;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- *
- * @author julian
- * Created by julian on 2019-05-08
- */
-public class TriggeredScraperImplTest {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(TriggeredScraperImplTest.class);
-    private PlcDriverManager driverManager;
-    private MockDevice mockDevice1;
-    private MockDevice mockDevice2;
-
-    @Before
-    public void setUp() throws Exception {
-        driverManager = new PlcDriverManager();
-        PlcMockConnection mock1Connection = ((PlcMockConnection) driverManager.getConnection("mock:1"));
-        PlcMockConnection mock2Connection = ((PlcMockConnection) driverManager.getConnection("mock:2"));
-
-        // Create Mocks
-        mockDevice1 = Mockito.mock(MockDevice.class);
-        mockDevice2 = Mockito.mock(MockDevice.class);
-        // Assign to Connections
-        mock1Connection.setDevice(mockDevice1);
-        mock2Connection.setDevice(mockDevice2);
-    }
-
-    /**
-     * Test is added because we assume some strange behavior.
-     */
-    @Test
-    public void scrapeMultipleTargets() throws ScraperException, IOException, InterruptedException {
-        // Prepare the Mocking
-        // Scrate Jobs 1 and 2
-        when(mockDevice1.read(eq("%DB810:DBB0:USINT"))).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultLongFieldItem(1L)));
-        when(mockDevice2.read(eq("%DB810:DBB0:USINT"))).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultLongFieldItem(2L)));
-        // Trigger Jobs
-        // Trigger var
-        Random rand = new Random();
-        when(mockDevice1.read(eq("%M0.3:BOOL"))).thenAnswer(new Answer<Object>() {
-            @Override
-            public Object answer(InvocationOnMock invocationOnMock) throws Throwable {
-                boolean trigger = rand.nextBoolean();
-                System.out.println(trigger);
-                return Pair.of(PlcResponseCode.OK, new DefaultBooleanFieldItem(trigger));
-            }
-        });
-        when(mockDevice2.read(eq("%M0.3:BOOL"))).thenAnswer(new Answer<Object>() {
-            @Override
-            public Object answer(InvocationOnMock invocationOnMock) throws Throwable {
-                boolean trigger = rand.nextBoolean();
-                System.out.println("\t\t" + trigger);
-                return Pair.of(PlcResponseCode.OK, new DefaultBooleanFieldItem(trigger));
-            }
-        });
-        // Read var
-        when(mockDevice1.read(eq("%DB810:DBW0:INT"))).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultLongFieldItem(3L)));
-        when(mockDevice2.read(eq("%DB810:DBW0:INT"))).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultLongFieldItem(4L)));
-
-        ScraperConfiguration configuration = ScraperConfiguration.fromFile("src/test/resources/mock-scraper-config.yml", ScraperConfigurationClassicImpl.class);
-        TriggerCollector triggerCollector = new TriggerCollectorImpl(driverManager);
-        TriggeredScraperImpl scraper = new TriggeredScraperImpl((j, a, m) -> System.out.println(String.format("Results from %s/%s: %s", j, a, m)), driverManager, configuration.getJobs(),triggerCollector,1000);
-
-        scraper.start();
-
-        Thread.sleep(2_000);
-
-        scraper.stop();
-    }
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper.triggeredscraper;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.messages.items.DefaultBooleanFieldItem;
+import org.apache.plc4x.java.base.messages.items.DefaultLongFieldItem;
+import org.apache.plc4x.java.mock.MockDevice;
+import org.apache.plc4x.java.mock.PlcMockConnection;
+import org.apache.plc4x.java.scraper.config.ScraperConfiguration;
+import org.apache.plc4x.java.scraper.config.ScraperConfigurationClassicImpl;
+import org.apache.plc4x.java.scraper.exception.ScraperException;
+import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollector;
+import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollectorImpl;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.Random;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ *
+ * @author julian
+ * Created by julian on 2019-05-08
+ */
+public class TriggeredScraperImplTest {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(TriggeredScraperImplTest.class);
+    private PlcDriverManager driverManager;
+    private MockDevice mockDevice1;
+    private MockDevice mockDevice2;
+
+    @Before
+    public void setUp() throws Exception {
+        driverManager = new PlcDriverManager();
+        PlcMockConnection mock1Connection = ((PlcMockConnection) driverManager.getConnection("mock:1"));
+        PlcMockConnection mock2Connection = ((PlcMockConnection) driverManager.getConnection("mock:2"));
+
+        // Create Mocks
+        mockDevice1 = Mockito.mock(MockDevice.class);
+        mockDevice2 = Mockito.mock(MockDevice.class);
+        // Assign to Connections
+        mock1Connection.setDevice(mockDevice1);
+        mock2Connection.setDevice(mockDevice2);
+    }
+
+    /**
+     * Test is added because we assume some strange behavior.
+     */
+    @Test
+    public void scrapeMultipleTargets() throws ScraperException, IOException, InterruptedException {
+        // Prepare the Mocking
+        // Scrate Jobs 1 and 2
+        when(mockDevice1.read(eq("%DB810:DBB0:USINT"))).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultLongFieldItem(1L)));
+        when(mockDevice2.read(eq("%DB810:DBB0:USINT"))).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultLongFieldItem(2L)));
+        // Trigger Jobs
+        // Trigger var
+        Random rand = new Random();
+        when(mockDevice1.read(eq("%M0.3:BOOL"))).thenAnswer(new Answer<Object>() {
+            @Override
+            public Object answer(InvocationOnMock invocationOnMock) throws Throwable {
+                boolean trigger = rand.nextBoolean();
+                System.out.println(trigger);
+                return Pair.of(PlcResponseCode.OK, new DefaultBooleanFieldItem(trigger));
+            }
+        });
+        when(mockDevice2.read(eq("%M0.3:BOOL"))).thenAnswer(new Answer<Object>() {
+            @Override
+            public Object answer(InvocationOnMock invocationOnMock) throws Throwable {
+                boolean trigger = rand.nextBoolean();
+                System.out.println("\t\t" + trigger);
+                return Pair.of(PlcResponseCode.OK, new DefaultBooleanFieldItem(trigger));
+            }
+        });
+        // Read var
+        when(mockDevice1.read(eq("%DB810:DBW0:INT"))).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultLongFieldItem(3L)));
+        when(mockDevice2.read(eq("%DB810:DBW0:INT"))).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultLongFieldItem(4L)));
+
+        ScraperConfiguration configuration = ScraperConfiguration.fromFile("src/test/resources/mock-scraper-config.yml", ScraperConfigurationClassicImpl.class);
+        TriggerCollector triggerCollector = new TriggerCollectorImpl(driverManager);
+        TriggeredScraperImpl scraper = new TriggeredScraperImpl((j, a, m) -> System.out.println(String.format("Results from %s/%s: %s", j, a, m)), driverManager, configuration.getJobs(),triggerCollector,1000);
+
+        scraper.start();
+
+        Thread.sleep(2_000);
+
+        scraper.stop();
+    }
 }
\ No newline at end of file
diff --git a/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerConfigurationTest.java b/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerConfigurationTest.java
index f2c1810f722..24f0afd28c4 100644
--- a/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerConfigurationTest.java
+++ b/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerConfigurationTest.java
@@ -1,151 +1,151 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler;
-
-import org.apache.plc4x.java.scraper.exception.ScraperConfigurationException;
-import org.apache.plc4x.java.scraper.exception.ScraperException;
-import org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScrapeJobImpl;
-import org.apache.plc4x.test.FastTests;
-import org.junit.experimental.categories.Category;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.mockito.Mockito;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.stream.Stream;
-
-import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.junit.Assert.assertThat;
-
-/**
- * testing valid and invalid triggerConfigStrings
- */
-class TriggerConfigurationTest {
-    private static final Logger LOGGER = LoggerFactory.getLogger(TriggerConfigurationTest.class);
-
-    private static Stream<Arguments> validTriggerPattern() {
-        return Stream.of(
-
-            Arguments.of("(S7_TRIGGER_VAR,50,(%I0.1:BOOL)==(true))",TriggerConfiguration.TriggerType.S7_TRIGGER_VAR, 50, TriggerConfiguration.Comparator.EQUAL, true,false,null,null,null,null),
-            Arguments.of("(S7_TRIGGER_VAR,50,(%I0.1:BOOL)!=(0))",TriggerConfiguration.TriggerType.S7_TRIGGER_VAR, 50, TriggerConfiguration.Comparator.UNEQUAL, false,false,null,null,null,null),
-            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBW10:INT)<=(33))",TriggerConfiguration.TriggerType.S7_TRIGGER_VAR, 50, TriggerConfiguration.Comparator.SMALLER_EQUAL, 33.0,false,null,null,null,null),
-            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBB10:USINT)>=(33))",TriggerConfiguration.TriggerType.S7_TRIGGER_VAR, 50, TriggerConfiguration.Comparator.GREATER_EQUAL, 33.0,false,null,null,null,null),
-            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBD10:DINT)<(33))",TriggerConfiguration.TriggerType.S7_TRIGGER_VAR, 50, TriggerConfiguration.Comparator.SMALLER, 33.0,false,null,null,null,null),
-            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBD10:REAL)>(33.3))",TriggerConfiguration.TriggerType.S7_TRIGGER_VAR, 50, TriggerConfiguration.Comparator.GREATER, 33.3,false,null,null,null,null),
-            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBD10:REAL)>(33.3))",TriggerConfiguration.TriggerType.S7_TRIGGER_VAR, 50, TriggerConfiguration.Comparator.GREATER, 33.3,false,null,null,null,null),
-            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBD10:REAL)>(-1))",TriggerConfiguration.TriggerType.S7_TRIGGER_VAR, 50, TriggerConfiguration.Comparator.GREATER, -1.0,false,null,null,null,null),
-            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBD10:REAL)>(PREV))",TriggerConfiguration.TriggerType.S7_TRIGGER_VAR, 50, TriggerConfiguration.Comparator.GREATER, null,true,null,null,null,null),
-            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBD10:REAL)>(PREV))",TriggerConfiguration.TriggerType.S7_TRIGGER_VAR, 50, TriggerConfiguration.Comparator.GREATER, null,true,null,null,null,null),
-            Arguments.of("(SCHEDULED,1000)",TriggerConfiguration.TriggerType.SCHEDULED, 1000, null, null,null,null,null,null,null),
-            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBD10:REAL)>(PREV)AND(%DB111:DBD20:REAL)>(PREV))",TriggerConfiguration.TriggerType.S7_TRIGGER_VAR, 50,
-                TriggerConfiguration.Comparator.GREATER, null,true,
-                TriggerConfiguration.Comparator.GREATER, null,true,
-                TriggerConfiguration.ConcatType.AND),
-            Arguments.of("(S7_TRIGGER_VAR,200,(%DB111:DBD10:REAL)>(PREV)OR(%DB111:DBD20:REAL)>(PREV))",TriggerConfiguration.TriggerType.S7_TRIGGER_VAR, 200,
-                TriggerConfiguration.Comparator.GREATER, null,true,
-                TriggerConfiguration.Comparator.GREATER, null,true,
-                TriggerConfiguration.ConcatType.OR)
-        );
-    }
-
-    private static Stream<Arguments> invalidTriggerPattern() {
-        return Stream.of(
-            Arguments.of("(S7_TRIGGER_VAR,50,(%I0.1:BOOL)(==)(true))"),
-            Arguments.of("(SCHEDULED,50,(%I0.1:BOOL)==(true))"),
-            Arguments.of("(S7_TRIGGER_VAR,50)"),
-            Arguments.of("(S7_TRIGGER_VAR)"),
-            Arguments.of("(S7_TRIGGER_VAR,50,(%I0.1:BOOL)==(0.1))"),
-            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBW10:BOOL)==(33))"),
-            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBX10:BOOL)==(33))"),
-            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBX10.1:BOOL)==(33))"),
-            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBX10.1:BOOL)<=(true))"),
-            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBW10:INT)<=(true))"),
-            Arguments.of("(MODBUS_TRIGGER_VAR,50)"),
-            Arguments.of("(MODBUS_TRIGGER_VAR,50,(%DB111:DBW10:INT)<=(11))"),
-            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBD10:REAL)>(prev))"),
-            Arguments.of("(S7_TRIGGER_VAR,200,(%DB111:DBD10:REAL)>(PREV)OR(%DB111:DBD20:INT)>(17))"),
-            Arguments.of("(S7_TRIGGER_VAR,200,(%DB111:DBD10:REAL)>(PREV)AND)")
-        );
-    }
-
-    @ParameterizedTest
-    @Category(FastTests.class)
-    @MethodSource("validTriggerPattern")
-    void testValidFieldQueryParsing(String triggerConfig,
-                                    TriggerConfiguration.TriggerType triggerType,
-                                    long scrapeInterval,
-                                    TriggerConfiguration.Comparator comparator1,
-                                    Object refValue1,
-                                    Boolean previousMode1,
-                                    TriggerConfiguration.Comparator comparator2,
-                                    Object refValue2,
-                                    Boolean previousMode2,
-                                    TriggerConfiguration.ConcatType concatType
-                                    ) {
-        TriggeredScrapeJobImpl triggeredScrapeJob = Mockito.mock(TriggeredScrapeJobImpl.class);
-        TriggerConfiguration triggerConfiguration = null;
-        try {
-            triggerConfiguration = TriggerConfiguration.createConfiguration(triggerConfig,triggeredScrapeJob);
-        } catch (ScraperConfigurationException e) {
-            //should not happen
-        }
-
-        assertThat(triggerConfiguration, notNullValue());
-        assertThat(triggerConfiguration.getScrapeInterval(), equalTo(scrapeInterval));
-        assertThat(triggerConfiguration.getTriggerType(), equalTo(triggerType));
-        if(!triggerConfiguration.getTriggerElementList().isEmpty()) {
-            assertThat(triggerConfiguration.getTriggerElementList().get(0).getComparatorType(), equalTo(comparator1));
-            assertThat(triggerConfiguration.getTriggerElementList().get(0).getCompareValue(), equalTo(refValue1));
-            assertThat(triggerConfiguration.getTriggerElementList().get(0).getPreviousMode(), equalTo(previousMode1));
-            assertThat(triggerConfiguration.getTriggerElementList().get(0).getConcatType(), nullValue());
-
-            if (triggerConfiguration.getTriggerElementList().size() > 1) {
-                assertThat(triggerConfiguration.getTriggerElementList().get(1).getComparatorType(), equalTo(comparator2));
-                assertThat(triggerConfiguration.getTriggerElementList().get(1).getCompareValue(), equalTo(refValue2));
-                assertThat(triggerConfiguration.getTriggerElementList().get(1).getPreviousMode(), equalTo(previousMode2));
-                assertThat(triggerConfiguration.getTriggerElementList().get(1).getConcatType(), equalTo(concatType));
-            }
-        }
-    }
-
-
-    @ParameterizedTest
-    @Category(FastTests.class)
-    @MethodSource("invalidTriggerPattern")
-    void testInvalidFieldQueryParsing(String triggerConfig) {
-        TriggeredScrapeJobImpl triggeredScrapeJob = Mockito.mock(TriggeredScrapeJobImpl.class);
-        TriggerConfiguration triggerConfiguration = null;
-        try {
-            triggerConfiguration = TriggerConfiguration.createConfiguration(triggerConfig,triggeredScrapeJob);
-            assertThat(triggerConfiguration,null);
-            //NPE should happen when test fails!
-        } catch (ScraperConfigurationException e) {
-            LOGGER.info("Exception as expected for positive test result: {}",e.getMessage());
-            //should happen
-        }
-
-
-    }
-
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler;
+
+import org.apache.plc4x.java.scraper.exception.ScraperConfigurationException;
+import org.apache.plc4x.java.scraper.exception.ScraperException;
+import org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScrapeJobImpl;
+import org.apache.plc4x.test.FastTests;
+import org.junit.experimental.categories.Category;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.Mockito;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.stream.Stream;
+
+import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.junit.Assert.assertThat;
+
+/**
+ * testing valid and invalid triggerConfigStrings
+ */
+class TriggerConfigurationTest {
+    private static final Logger LOGGER = LoggerFactory.getLogger(TriggerConfigurationTest.class);
+
+    private static Stream<Arguments> validTriggerPattern() {
+        return Stream.of(
+
+            Arguments.of("(S7_TRIGGER_VAR,50,(%I0.1:BOOL)==(true))",TriggerConfiguration.TriggerType.S7_TRIGGER_VAR, 50, TriggerConfiguration.Comparator.EQUAL, true,false,null,null,null,null),
+            Arguments.of("(S7_TRIGGER_VAR,50,(%I0.1:BOOL)!=(0))",TriggerConfiguration.TriggerType.S7_TRIGGER_VAR, 50, TriggerConfiguration.Comparator.UNEQUAL, false,false,null,null,null,null),
+            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBW10:INT)<=(33))",TriggerConfiguration.TriggerType.S7_TRIGGER_VAR, 50, TriggerConfiguration.Comparator.SMALLER_EQUAL, 33.0,false,null,null,null,null),
+            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBB10:USINT)>=(33))",TriggerConfiguration.TriggerType.S7_TRIGGER_VAR, 50, TriggerConfiguration.Comparator.GREATER_EQUAL, 33.0,false,null,null,null,null),
+            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBD10:DINT)<(33))",TriggerConfiguration.TriggerType.S7_TRIGGER_VAR, 50, TriggerConfiguration.Comparator.SMALLER, 33.0,false,null,null,null,null),
+            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBD10:REAL)>(33.3))",TriggerConfiguration.TriggerType.S7_TRIGGER_VAR, 50, TriggerConfiguration.Comparator.GREATER, 33.3,false,null,null,null,null),
+            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBD10:REAL)>(33.3))",TriggerConfiguration.TriggerType.S7_TRIGGER_VAR, 50, TriggerConfiguration.Comparator.GREATER, 33.3,false,null,null,null,null),
+            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBD10:REAL)>(-1))",TriggerConfiguration.TriggerType.S7_TRIGGER_VAR, 50, TriggerConfiguration.Comparator.GREATER, -1.0,false,null,null,null,null),
+            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBD10:REAL)>(PREV))",TriggerConfiguration.TriggerType.S7_TRIGGER_VAR, 50, TriggerConfiguration.Comparator.GREATER, null,true,null,null,null,null),
+            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBD10:REAL)>(PREV))",TriggerConfiguration.TriggerType.S7_TRIGGER_VAR, 50, TriggerConfiguration.Comparator.GREATER, null,true,null,null,null,null),
+            Arguments.of("(SCHEDULED,1000)",TriggerConfiguration.TriggerType.SCHEDULED, 1000, null, null,null,null,null,null,null),
+            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBD10:REAL)>(PREV)AND(%DB111:DBD20:REAL)>(PREV))",TriggerConfiguration.TriggerType.S7_TRIGGER_VAR, 50,
+                TriggerConfiguration.Comparator.GREATER, null,true,
+                TriggerConfiguration.Comparator.GREATER, null,true,
+                TriggerConfiguration.ConcatType.AND),
+            Arguments.of("(S7_TRIGGER_VAR,200,(%DB111:DBD10:REAL)>(PREV)OR(%DB111:DBD20:REAL)>(PREV))",TriggerConfiguration.TriggerType.S7_TRIGGER_VAR, 200,
+                TriggerConfiguration.Comparator.GREATER, null,true,
+                TriggerConfiguration.Comparator.GREATER, null,true,
+                TriggerConfiguration.ConcatType.OR)
+        );
+    }
+
+    private static Stream<Arguments> invalidTriggerPattern() {
+        return Stream.of(
+            Arguments.of("(S7_TRIGGER_VAR,50,(%I0.1:BOOL)(==)(true))"),
+            Arguments.of("(SCHEDULED,50,(%I0.1:BOOL)==(true))"),
+            Arguments.of("(S7_TRIGGER_VAR,50)"),
+            Arguments.of("(S7_TRIGGER_VAR)"),
+            Arguments.of("(S7_TRIGGER_VAR,50,(%I0.1:BOOL)==(0.1))"),
+            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBW10:BOOL)==(33))"),
+            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBX10:BOOL)==(33))"),
+            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBX10.1:BOOL)==(33))"),
+            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBX10.1:BOOL)<=(true))"),
+            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBW10:INT)<=(true))"),
+            Arguments.of("(MODBUS_TRIGGER_VAR,50)"),
+            Arguments.of("(MODBUS_TRIGGER_VAR,50,(%DB111:DBW10:INT)<=(11))"),
+            Arguments.of("(S7_TRIGGER_VAR,50,(%DB111:DBD10:REAL)>(prev))"),
+            Arguments.of("(S7_TRIGGER_VAR,200,(%DB111:DBD10:REAL)>(PREV)OR(%DB111:DBD20:INT)>(17))"),
+            Arguments.of("(S7_TRIGGER_VAR,200,(%DB111:DBD10:REAL)>(PREV)AND)")
+        );
+    }
+
+    @ParameterizedTest
+    @Category(FastTests.class)
+    @MethodSource("validTriggerPattern")
+    void testValidFieldQueryParsing(String triggerConfig,
+                                    TriggerConfiguration.TriggerType triggerType,
+                                    long scrapeInterval,
+                                    TriggerConfiguration.Comparator comparator1,
+                                    Object refValue1,
+                                    Boolean previousMode1,
+                                    TriggerConfiguration.Comparator comparator2,
+                                    Object refValue2,
+                                    Boolean previousMode2,
+                                    TriggerConfiguration.ConcatType concatType
+                                    ) {
+        TriggeredScrapeJobImpl triggeredScrapeJob = Mockito.mock(TriggeredScrapeJobImpl.class);
+        TriggerConfiguration triggerConfiguration = null;
+        try {
+            triggerConfiguration = TriggerConfiguration.createConfiguration(triggerConfig,triggeredScrapeJob);
+        } catch (ScraperConfigurationException e) {
+            //should not happen
+        }
+
+        assertThat(triggerConfiguration, notNullValue());
+        assertThat(triggerConfiguration.getScrapeInterval(), equalTo(scrapeInterval));
+        assertThat(triggerConfiguration.getTriggerType(), equalTo(triggerType));
+        if(!triggerConfiguration.getTriggerElementList().isEmpty()) {
+            assertThat(triggerConfiguration.getTriggerElementList().get(0).getComparatorType(), equalTo(comparator1));
+            assertThat(triggerConfiguration.getTriggerElementList().get(0).getCompareValue(), equalTo(refValue1));
+            assertThat(triggerConfiguration.getTriggerElementList().get(0).getPreviousMode(), equalTo(previousMode1));
+            assertThat(triggerConfiguration.getTriggerElementList().get(0).getConcatType(), nullValue());
+
+            if (triggerConfiguration.getTriggerElementList().size() > 1) {
+                assertThat(triggerConfiguration.getTriggerElementList().get(1).getComparatorType(), equalTo(comparator2));
+                assertThat(triggerConfiguration.getTriggerElementList().get(1).getCompareValue(), equalTo(refValue2));
+                assertThat(triggerConfiguration.getTriggerElementList().get(1).getPreviousMode(), equalTo(previousMode2));
+                assertThat(triggerConfiguration.getTriggerElementList().get(1).getConcatType(), equalTo(concatType));
+            }
+        }
+    }
+
+
+    @ParameterizedTest
+    @Category(FastTests.class)
+    @MethodSource("invalidTriggerPattern")
+    void testInvalidFieldQueryParsing(String triggerConfig) {
+        TriggeredScrapeJobImpl triggeredScrapeJob = Mockito.mock(TriggeredScrapeJobImpl.class);
+        TriggerConfiguration triggerConfiguration = null;
+        try {
+            triggerConfiguration = TriggerConfiguration.createConfiguration(triggerConfig,triggeredScrapeJob);
+            assertThat(triggerConfiguration,null);
+            //NPE should happen when test fails!
+        } catch (ScraperConfigurationException e) {
+            LOGGER.info("Exception as expected for positive test result: {}",e.getMessage());
+            //should happen
+        }
+
+
+    }
+
 }
\ No newline at end of file
diff --git a/plc4j/utils/scraper/src/test/resources/config.json b/plc4j/utils/scraper/src/test/resources/config.json
index c77d17a551b..3ebc1707d52 100644
--- a/plc4j/utils/scraper/src/test/resources/config.json
+++ b/plc4j/utils/scraper/src/test/resources/config.json
@@ -1,18 +1,18 @@
-{
-    "sources": {
-        "a": "b"
-    },
-    "jobs": [
-        {
-            "name": "job1",
-            "scrapeRate": 10,
-            "sources": [
-                "a"
-            ],
-            "fields": {
-                "a": "DBasdf",
-                "b": "DBbsdf"
-            }
-        }
-    ]
+{
+    "sources": {
+        "a": "b"
+    },
+    "jobs": [
+        {
+            "name": "job1",
+            "scrapeRate": 10,
+            "sources": [
+                "a"
+            ],
+            "fields": {
+                "a": "DBasdf",
+                "b": "DBbsdf"
+            }
+        }
+    ]
 }
\ No newline at end of file
diff --git a/plc4j/utils/scraper/src/test/resources/config.yml b/plc4j/utils/scraper/src/test/resources/config.yml
index 194434b15f3..c630b219bc8 100644
--- a/plc4j/utils/scraper/src/test/resources/config.yml
+++ b/plc4j/utils/scraper/src/test/resources/config.yml
@@ -1,29 +1,29 @@
-# ----------------------------------------------------------------------------
-# 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
-#
-#    http://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.
-# ----------------------------------------------------------------------------
----
-sources:
-  a: b
-jobs:
-  - name: job1
-    scrapeRate: 10
-    sources:
-      - a
-    fields:
-      a: DBasdf
+# ----------------------------------------------------------------------------
+# 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
+#
+#    http://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.
+# ----------------------------------------------------------------------------
+---
+sources:
+  a: b
+jobs:
+  - name: job1
+    scrapeRate: 10
+    sources:
+      - a
+    fields:
+      a: DBasdf
       b: DBbsdf
\ No newline at end of file
diff --git a/plc4j/utils/scraper/src/test/resources/example.yml b/plc4j/utils/scraper/src/test/resources/example.yml
index 9e5b9115af7..364ef6743a7 100644
--- a/plc4j/utils/scraper/src/test/resources/example.yml
+++ b/plc4j/utils/scraper/src/test/resources/example.yml
@@ -1,44 +1,44 @@
-# ----------------------------------------------------------------------------
-# 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
-#
-#    http://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.
-# ----------------------------------------------------------------------------
----
-sources:
-  S7_TIM: s7://10.10.64.22/0/1
-  S7_CHRIS: s7://10.10.64.20/0/1
-
-jobs:
-  - name: pressure-job
-    scrapeRate: 10
-    sources:
-    - S7_TIM
-    fields:
-      pressure: '%DB225:DBW0:INT'
-
-  - name: another-job
-    scrapeRate: 100
-    sources:
-    - S7_TIM
-    fields:
-      temperature: '%DB225:DBW0:INT'
-
-  - name: counter-job
-    scrapeRate: 100
-    sources:
-    - S7_CHRIS
-    fields:
+# ----------------------------------------------------------------------------
+# 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
+#
+#    http://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.
+# ----------------------------------------------------------------------------
+---
+sources:
+  S7_TIM: s7://10.10.64.22/0/1
+  S7_CHRIS: s7://10.10.64.20/0/1
+
+jobs:
+  - name: pressure-job
+    scrapeRate: 10
+    sources:
+    - S7_TIM
+    fields:
+      pressure: '%DB225:DBW0:INT'
+
+  - name: another-job
+    scrapeRate: 100
+    sources:
+    - S7_TIM
+    fields:
+      temperature: '%DB225:DBW0:INT'
+
+  - name: counter-job
+    scrapeRate: 100
+    sources:
+    - S7_CHRIS
+    fields:
       counter: '%DB3:DBD32:DINT'
\ No newline at end of file
diff --git a/plc4j/utils/scraper/src/test/resources/example_triggered_scraper.yml b/plc4j/utils/scraper/src/test/resources/example_triggered_scraper.yml
index ec79e17b528..72453361e47 100644
--- a/plc4j/utils/scraper/src/test/resources/example_triggered_scraper.yml
+++ b/plc4j/utils/scraper/src/test/resources/example_triggered_scraper.yml
@@ -1,74 +1,74 @@
-# ----------------------------------------------------------------------------
-# 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
-#
-#    http://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.
-# ----------------------------------------------------------------------------
----
-sources:
-  S7_PI: s7://192.168.167.210/1/1
-
-jobs:
-  - name: scheduled-demo-job1
-    triggerConfig: (SCHEDULED,10000)
-    sources:
-      - S7_PI
-    fields:
-      test1: '%DB810:DBB0:USINT'
-
-  - name: triggered-demo-job1
-    triggerConfig: (S7_TRIGGER_VAR,10,(%M0.3:BOOL)==(true))
-    sources:
-      - S7_PI
-    fields:
-      test1: '%DB810:DBW0:INT'
-
-  - name: triggered-demo-job2
-    triggerConfig: (S7_TRIGGER_VAR,1000,(%M0.7:BOOL)==(true))
-    sources:
-      - S7_PI
-    fields:
-      test1: '%DB810:DBW0:INT'
-      test2: '%DB810:DBX6:STRING'
-      test3: '%DB810:DBX266:STRING'
-      test4: '%DB810:DBX526:STRING'
-      test5: '%DB810:DBX786:STRING'
-      test7: '%DB810:DBD2:REAL'
-      test8: '%DB811:DBB1000:BYTE[8]'
-      test9: '%DB811:DBX268.3:BOOL'
-      test10: '%DB811:DBB270:BYTE[8]'
-
-  - name: scheduled-string-job3
-    triggerConfig: (SCHEDULED,2000)
-    sources:
-      - S7_PI
-    fields:
-      test3_8: '%DB811:DBX14:STRING'
-      test3_9: '%DB811:DBX282:STRING'
-
-
-  - name: triggered-demo-job3-prev_value
-    triggerConfig: (S7_TRIGGER_VAR,500,(%M0:USINT)>=(PREV))
-    sources:
-      - S7_PI
-    fields:
-      test1: '%DB810:DBW0:INT'
-
-  - name: triggered-demo-job4-combinded-condition
-    triggerConfig: (S7_TRIGGER_VAR,5,(%M0.1:BOOL)==(true)OR(%M0.2:BOOL)==(true))
-    sources:
-      - S7_PI
-    fields:
+# ----------------------------------------------------------------------------
+# 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
+#
+#    http://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.
+# ----------------------------------------------------------------------------
+---
+sources:
+  S7_PI: s7://192.168.167.210/1/1
+
+jobs:
+  - name: scheduled-demo-job1
+    triggerConfig: (SCHEDULED,10000)
+    sources:
+      - S7_PI
+    fields:
+      test1: '%DB810:DBB0:USINT'
+
+  - name: triggered-demo-job1
+    triggerConfig: (S7_TRIGGER_VAR,10,(%M0.3:BOOL)==(true))
+    sources:
+      - S7_PI
+    fields:
+      test1: '%DB810:DBW0:INT'
+
+  - name: triggered-demo-job2
+    triggerConfig: (S7_TRIGGER_VAR,1000,(%M0.7:BOOL)==(true))
+    sources:
+      - S7_PI
+    fields:
+      test1: '%DB810:DBW0:INT'
+      test2: '%DB810:DBX6:STRING'
+      test3: '%DB810:DBX266:STRING'
+      test4: '%DB810:DBX526:STRING'
+      test5: '%DB810:DBX786:STRING'
+      test7: '%DB810:DBD2:REAL'
+      test8: '%DB811:DBB1000:BYTE[8]'
+      test9: '%DB811:DBX268.3:BOOL'
+      test10: '%DB811:DBB270:BYTE[8]'
+
+  - name: scheduled-string-job3
+    triggerConfig: (SCHEDULED,2000)
+    sources:
+      - S7_PI
+    fields:
+      test3_8: '%DB811:DBX14:STRING'
+      test3_9: '%DB811:DBX282:STRING'
+
+
+  - name: triggered-demo-job3-prev_value
+    triggerConfig: (S7_TRIGGER_VAR,500,(%M0:USINT)>=(PREV))
+    sources:
+      - S7_PI
+    fields:
+      test1: '%DB810:DBW0:INT'
+
+  - name: triggered-demo-job4-combinded-condition
+    triggerConfig: (S7_TRIGGER_VAR,5,(%M0.1:BOOL)==(true)OR(%M0.2:BOOL)==(true))
+    sources:
+      - S7_PI
+    fields:
       test1: '%M0:USINT'
\ No newline at end of file
diff --git a/plc4j/utils/scraper/src/test/resources/example_triggered_scraper_modbus.yml b/plc4j/utils/scraper/src/test/resources/example_triggered_scraper_modbus.yml
index 6122ae9d573..56da05ed7f3 100644
--- a/plc4j/utils/scraper/src/test/resources/example_triggered_scraper_modbus.yml
+++ b/plc4j/utils/scraper/src/test/resources/example_triggered_scraper_modbus.yml
@@ -1,30 +1,30 @@
-# ----------------------------------------------------------------------------
-# 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
-#
-#    http://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.
-# ----------------------------------------------------------------------------
----
-sources:
-  LABJACK_PI: modbus:tcp://192.168.167.149:502
-
-jobs:
-  - name: scheduled-demo-job1
-    triggerConfig: (SCHEDULED,100)
-    sources:
-      - LABJACK_PI
-    fields:
-      test1: 'readholdingregisters:49100[2]'
-
+# ----------------------------------------------------------------------------
+# 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
+#
+#    http://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.
+# ----------------------------------------------------------------------------
+---
+sources:
+  LABJACK_PI: modbus:tcp://192.168.167.149:502
+
+jobs:
+  - name: scheduled-demo-job1
+    triggerConfig: (SCHEDULED,100)
+    sources:
+      - LABJACK_PI
+    fields:
+      test1: 'readholdingregisters:49100[2]'
+
diff --git a/plc4j/utils/scraper/src/test/resources/example_with_strings.yml b/plc4j/utils/scraper/src/test/resources/example_with_strings.yml
index dce108aaa8b..92a1cc07fa2 100644
--- a/plc4j/utils/scraper/src/test/resources/example_with_strings.yml
+++ b/plc4j/utils/scraper/src/test/resources/example_with_strings.yml
@@ -1,41 +1,41 @@
-# ----------------------------------------------------------------------------
-# 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
-#
-#    http://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.
-# ----------------------------------------------------------------------------
----
-sources:
-  S7_TIM: s7://192.168.167.210/0/1
-
-jobs:
-  - name: pressure-job
-    scrapeRate: 1000
-    sources:
-    - S7_TIM
-    fields:
-      test1: '%DB810:DBW0:INT'
-      test2: '%DB810:DBX6:STRING'
-      test3: '%DB810:DBX266:STRING'
-      test4: '%DB810:DBX526:STRING'
-      test5: '%DB810:DBX786:STRING'
-      test6: '%DB810:DBX46806:STRING'
-      test7: '%DB810:DBD2:REAL'
-      test8: '%DB811:DBX12:STRING'
-      test9: '%DB811:DBX280:STRING'
-      test10: '%DB811:DBB1000:BYTE[8]'
-      test11: '%DB811:DBX268.3:BOOL'
-      test12: '%DB811:DBB270:BYTE[8]'
-
+# ----------------------------------------------------------------------------
+# 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
+#
+#    http://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.
+# ----------------------------------------------------------------------------
+---
+sources:
+  S7_TIM: s7://192.168.167.210/0/1
+
+jobs:
+  - name: pressure-job
+    scrapeRate: 1000
+    sources:
+    - S7_TIM
+    fields:
+      test1: '%DB810:DBW0:INT'
+      test2: '%DB810:DBX6:STRING'
+      test3: '%DB810:DBX266:STRING'
+      test4: '%DB810:DBX526:STRING'
+      test5: '%DB810:DBX786:STRING'
+      test6: '%DB810:DBX46806:STRING'
+      test7: '%DB810:DBD2:REAL'
+      test8: '%DB811:DBX12:STRING'
+      test9: '%DB811:DBX280:STRING'
+      test10: '%DB811:DBB1000:BYTE[8]'
+      test11: '%DB811:DBX268.3:BOOL'
+      test12: '%DB811:DBB270:BYTE[8]'
+
diff --git a/plc4j/utils/scraper/src/test/resources/logback-test.xml b/plc4j/utils/scraper/src/test/resources/logback-test.xml
index 3da2de800f2..c6f96249921 100644
--- a/plc4j/utils/scraper/src/test/resources/logback-test.xml
+++ b/plc4j/utils/scraper/src/test/resources/logback-test.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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
-  ~
-  ~   http://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.
-  -->
-<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoders are assigned the type
-         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="WARN">
-    <appender-ref ref="STDOUT"/>
-  </root>
-
-  <logger name="org.apache.plc4x.java.scraper.triggeredscraper" level="WARN" additivity="false">
-    <appender-ref ref="STDOUT"/>
-  </logger>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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
+  ~
+  ~   http://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.
+  -->
+<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="WARN">
+    <appender-ref ref="STDOUT"/>
+  </root>
+
+  <logger name="org.apache.plc4x.java.scraper.triggeredscraper" level="WARN" additivity="false">
+    <appender-ref ref="STDOUT"/>
+  </logger>
 </configuration>
\ No newline at end of file
diff --git a/plc4j/utils/scraper/src/test/resources/logback.xml b/plc4j/utils/scraper/src/test/resources/logback.xml
index c562020553c..275cd640223 100644
--- a/plc4j/utils/scraper/src/test/resources/logback.xml
+++ b/plc4j/utils/scraper/src/test/resources/logback.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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
-  ~
-  ~   http://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.
-  -->
-<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoders are assigned the type
-         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="INFO">
-    <appender-ref ref="STDOUT"/>
-  </root>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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
+  ~
+  ~   http://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.
+  -->
+<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="STDOUT"/>
+  </root>
+
 </configuration>
\ No newline at end of file
diff --git a/plc4j/utils/scraper/src/test/resources/mock-scraper-config.yml b/plc4j/utils/scraper/src/test/resources/mock-scraper-config.yml
index face23522ca..e8ce6e2b080 100644
--- a/plc4j/utils/scraper/src/test/resources/mock-scraper-config.yml
+++ b/plc4j/utils/scraper/src/test/resources/mock-scraper-config.yml
@@ -1,57 +1,57 @@
-# ----------------------------------------------------------------------------
-# 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
-#
-#    http://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.
-# ----------------------------------------------------------------------------
----
-sources:
-  MOCK_1: mock:1
-  MOCK_2: mock:2
-
-jobs:
-  - name: scheduled-demo-job1
-    triggerConfig: (SCHEDULED,100)
-    sources:
-      - MOCK_1
-      - MOCK_2
-    fields:
-      test1: '%DB810:DBB0:USINT'
-
-  - name: scheduled-demo-job2
-    triggerConfig: (SCHEDULED,100)
-    sources:
-      - MOCK_1
-      - MOCK_2
-    fields:
-      test1: '%DB810:DBB0:USINT'
-
-
-  - name: triggered-demo-job1
-    triggerConfig: (S7_TRIGGER_VAR,10,(%M0.3:BOOL)==(true))
-    sources:
-      - MOCK_1
-      - MOCK_2
-    fields:
-      test1: '%DB810:DBW0:INT'
-
-
-  - name: triggered-demo-job2
-    triggerConfig: (S7_TRIGGER_VAR,10,(%M0.7:BOOL)==(true))
-    sources:
-      - MOCK_1
-      - MOCK_2
-    fields:
+# ----------------------------------------------------------------------------
+# 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
+#
+#    http://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.
+# ----------------------------------------------------------------------------
+---
+sources:
+  MOCK_1: mock:1
+  MOCK_2: mock:2
+
+jobs:
+  - name: scheduled-demo-job1
+    triggerConfig: (SCHEDULED,100)
+    sources:
+      - MOCK_1
+      - MOCK_2
+    fields:
+      test1: '%DB810:DBB0:USINT'
+
+  - name: scheduled-demo-job2
+    triggerConfig: (SCHEDULED,100)
+    sources:
+      - MOCK_1
+      - MOCK_2
+    fields:
+      test1: '%DB810:DBB0:USINT'
+
+
+  - name: triggered-demo-job1
+    triggerConfig: (S7_TRIGGER_VAR,10,(%M0.3:BOOL)==(true))
+    sources:
+      - MOCK_1
+      - MOCK_2
+    fields:
+      test1: '%DB810:DBW0:INT'
+
+
+  - name: triggered-demo-job2
+    triggerConfig: (S7_TRIGGER_VAR,10,(%M0.7:BOOL)==(true))
+    sources:
+      - MOCK_1
+      - MOCK_2
+    fields:
       test1: '%DB810:DBW0:INT'
\ No newline at end of file
diff --git a/plc4j/utils/test-utils/pom.xml b/plc4j/utils/test-utils/pom.xml
index 9267686b54f..2f53e17e41d 100644
--- a/plc4j/utils/test-utils/pom.xml
+++ b/plc4j/utils/test-utils/pom.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4j-utils</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4j-utils-test-utils</artifactId>
-
-  <name>PLC4J: Utils: Test Utils</name>
-  <description>A set of test utils. Especially defining the test-categories used to categorize tests.</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.pcap4j</groupId>
-      <artifactId>pcap4j-core</artifactId>
-    </dependency>
-
-    <!-- Needed for the version comparison -->
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4j-utils</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4j-utils-test-utils</artifactId>
+
+  <name>PLC4J: Utils: Test Utils</name>
+  <description>A set of test utils. Especially defining the test-categories used to categorize tests.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.pcap4j</groupId>
+      <artifactId>pcap4j-core</artifactId>
+    </dependency>
+
+    <!-- Needed for the version comparison -->
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/FastTests.java b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/FastTests.java
index 6c37401b5b9..191efccee77 100644
--- a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/FastTests.java
+++ b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/FastTests.java
@@ -1,22 +1,22 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.test;
-
-public interface FastTests {
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.test;
+
+public interface FastTests {
+}
diff --git a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequireInternetConnection.java b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequireInternetConnection.java
index 583129af565..5c8f12eccc7 100644
--- a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequireInternetConnection.java
+++ b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequireInternetConnection.java
@@ -1,33 +1,33 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.test;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target({ ElementType.TYPE, ElementType.METHOD })
-@Retention(RetentionPolicy.RUNTIME)
-@ExtendWith(RequireInternetConnectionCondition.class)
-public @interface RequireInternetConnection {
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.test;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@ExtendWith(RequireInternetConnectionCondition.class)
+public @interface RequireInternetConnection {
+}
diff --git a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequireInternetConnectionCondition.java b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequireInternetConnectionCondition.java
index 7881876b635..bed6269e186 100644
--- a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequireInternetConnectionCondition.java
+++ b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequireInternetConnectionCondition.java
@@ -1,45 +1,45 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.test;
-
-import org.junit.jupiter.api.extension.ConditionEvaluationResult;
-import org.junit.jupiter.api.extension.ExecutionCondition;
-import org.junit.jupiter.api.extension.ExtensionContext;
-
-import java.net.InetAddress;
-
-public class RequireInternetConnectionCondition implements ExecutionCondition {
-
-    @Override
-    public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext extensionContext) {
-        try {
-            InetAddress[] address = InetAddress.getAllByName("apache.org");
-            for (InetAddress inetAddress : address) {
-                if(inetAddress.isReachable(3000)) {
-                    return ConditionEvaluationResult.enabled("Internet connection detected.");
-                }
-            }
-        } catch(Exception e) {
-            // Ignore ...
-        }
-        return ConditionEvaluationResult.disabled("No Internet connection detected.");
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.test;
+
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
+import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+import java.net.InetAddress;
+
+public class RequireInternetConnectionCondition implements ExecutionCondition {
+
+    @Override
+    public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext extensionContext) {
+        try {
+            InetAddress[] address = InetAddress.getAllByName("apache.org");
+            for (InetAddress inetAddress : address) {
+                if(inetAddress.isReachable(3000)) {
+                    return ConditionEvaluationResult.enabled("Internet connection detected.");
+                }
+            }
+        } catch(Exception e) {
+            // Ignore ...
+        }
+        return ConditionEvaluationResult.disabled("No Internet connection detected.");
+    }
+
+}
diff --git a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequireNonCaptureAllDns.java b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequireNonCaptureAllDns.java
index b393c3d36f2..d2a1b0a66dd 100644
--- a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequireNonCaptureAllDns.java
+++ b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequireNonCaptureAllDns.java
@@ -1,33 +1,33 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.test;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target({ ElementType.TYPE, ElementType.METHOD })
-@Retention(RetentionPolicy.RUNTIME)
-@ExtendWith(RequireNonCaptureAllDnsCondition.class)
-public @interface RequireNonCaptureAllDns {
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.test;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@ExtendWith(RequireNonCaptureAllDnsCondition.class)
+public @interface RequireNonCaptureAllDns {
+}
diff --git a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequireNonCaptureAllDnsCondition.java b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequireNonCaptureAllDnsCondition.java
index 6dd7e9d47a6..89fbb0366b4 100644
--- a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequireNonCaptureAllDnsCondition.java
+++ b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequireNonCaptureAllDnsCondition.java
@@ -1,40 +1,40 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.test;
-
-import org.junit.jupiter.api.extension.ConditionEvaluationResult;
-import org.junit.jupiter.api.extension.ExecutionCondition;
-import org.junit.jupiter.api.extension.ExtensionContext;
-
-import java.net.InetAddress;
-
-public class RequireNonCaptureAllDnsCondition implements ExecutionCondition {
-
-    @Override
-    public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext extensionContext) {
-        try {
-            InetAddress.getByName("somedomainhopefullynoonewilleverhaveeli8vyh347l7bafiy3tbkry3wr");
-            return ConditionEvaluationResult.disabled("DNS Server returned an address: Capture-All DNS Server detected.");
-        } catch(Exception e) {
-            return ConditionEvaluationResult.enabled("No Capture-All DNS Server found.");
-        }
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.test;
+
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
+import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+import java.net.InetAddress;
+
+public class RequireNonCaptureAllDnsCondition implements ExecutionCondition {
+
+    @Override
+    public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext extensionContext) {
+        try {
+            InetAddress.getByName("somedomainhopefullynoonewilleverhaveeli8vyh347l7bafiy3tbkry3wr");
+            return ConditionEvaluationResult.disabled("DNS Server returned an address: Capture-All DNS Server detected.");
+        } catch(Exception e) {
+            return ConditionEvaluationResult.enabled("No Capture-All DNS Server found.");
+        }
+    }
+
+}
diff --git a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcap.java b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcap.java
index 095a80fa7f6..fd5f562205b 100644
--- a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcap.java
+++ b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcap.java
@@ -1,33 +1,33 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.test;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target({ ElementType.TYPE, ElementType.METHOD })
-@Retention(RetentionPolicy.RUNTIME)
-@ExtendWith(RequirePcapCondition.class)
-public @interface RequirePcap {
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.test;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@ExtendWith(RequirePcapCondition.class)
+public @interface RequirePcap {
+}
diff --git a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcapCondition.java b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcapCondition.java
index e76606f92bb..6c9062debda 100644
--- a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcapCondition.java
+++ b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcapCondition.java
@@ -1,57 +1,57 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.test;
-
-import org.apache.commons.lang3.SystemUtils;
-import org.junit.jupiter.api.extension.ConditionEvaluationResult;
-import org.junit.jupiter.api.extension.ExecutionCondition;
-import org.junit.jupiter.api.extension.ExtensionContext;
-import org.pcap4j.core.Pcaps;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class RequirePcapCondition implements ExecutionCondition {
-
-    private static final Logger logger = LoggerFactory.getLogger(RequirePcapCondition.class);
-
-    @Override
-    public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext extensionContext) {
-        try {
-            String libVersion = Pcaps.libVersion();
-            Pattern pattern = Pattern.compile("^libpcap version (?<version>\\d+\\.\\d+(\\.\\d+)?).*$");
-            Matcher matcher = pattern.matcher(libVersion);
-            if (matcher.matches()) {
-                String versionString = matcher.group("version");
-                return ConditionEvaluationResult.enabled("Found libpcap version " + versionString);
-            }
-        } catch(Exception e) {
-            logger.info("Error detecting libpcap version.", e);
-        }
-        if(SystemUtils.IS_OS_WINDOWS) {
-            return ConditionEvaluationResult.disabled("Test disabled due to missing or invalid WinPcap version. Please install from here: https://sourceforge.net/projects/winpcap413-176/ as this version supports all needed freatures.");
-        } else {
-            return ConditionEvaluationResult.disabled("Test disabled due to missing or invalid libpcap version. Please install at least version 1.1.0 to support all features.");
-        }
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.test;
+
+import org.apache.commons.lang3.SystemUtils;
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
+import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.pcap4j.core.Pcaps;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class RequirePcapCondition implements ExecutionCondition {
+
+    private static final Logger logger = LoggerFactory.getLogger(RequirePcapCondition.class);
+
+    @Override
+    public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext extensionContext) {
+        try {
+            String libVersion = Pcaps.libVersion();
+            Pattern pattern = Pattern.compile("^libpcap version (?<version>\\d+\\.\\d+(\\.\\d+)?).*$");
+            Matcher matcher = pattern.matcher(libVersion);
+            if (matcher.matches()) {
+                String versionString = matcher.group("version");
+                return ConditionEvaluationResult.enabled("Found libpcap version " + versionString);
+            }
+        } catch(Exception e) {
+            logger.info("Error detecting libpcap version.", e);
+        }
+        if(SystemUtils.IS_OS_WINDOWS) {
+            return ConditionEvaluationResult.disabled("Test disabled due to missing or invalid WinPcap version. Please install from here: https://sourceforge.net/projects/winpcap413-176/ as this version supports all needed freatures.");
+        } else {
+            return ConditionEvaluationResult.disabled("Test disabled due to missing or invalid libpcap version. Please install at least version 1.1.0 to support all features.");
+        }
+    }
+
+}
diff --git a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcapNg.java b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcapNg.java
index 35e1f8911e6..5d3463f66bb 100644
--- a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcapNg.java
+++ b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcapNg.java
@@ -1,33 +1,33 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.test;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target({ ElementType.TYPE, ElementType.METHOD })
-@Retention(RetentionPolicy.RUNTIME)
-@ExtendWith(RequirePcapNgCondition.class)
-public @interface RequirePcapNg {
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.test;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@ExtendWith(RequirePcapNgCondition.class)
+public @interface RequirePcapNg {
+}
diff --git a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcapNgCondition.java b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcapNgCondition.java
index 62522e42134..1ede5504242 100644
--- a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcapNgCondition.java
+++ b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcapNgCondition.java
@@ -1,69 +1,69 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.test;
-
-import org.apache.commons.lang3.SystemUtils;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
-import org.junit.jupiter.api.extension.ConditionEvaluationResult;
-import org.junit.jupiter.api.extension.ExecutionCondition;
-import org.junit.jupiter.api.extension.ExtensionContext;
-import org.pcap4j.core.Pcaps;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class RequirePcapNgCondition implements ExecutionCondition {
-
-    private static final Logger logger = LoggerFactory.getLogger(RequirePcapCondition.class);
-
-    @Override
-    public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext extensionContext) {
-        // Mac:     libpcap version 1.8.1 -- Apple version 79.200.4
-        // Linux:
-        // Windows: WinPcap version 4.1.3 (packet.dll version 4.1.0.2980), based on libpcap version 1.0 branch 1_0_rel0b (20091008)
-        try {
-            String libVersion = Pcaps.libVersion();
-            Pattern pattern = Pattern.compile("^libpcap version (?<version>\\d+\\.\\d+(\\.\\d+)?).*$");
-            Matcher matcher = pattern.matcher(libVersion);
-            if (matcher.matches()) {
-                String versionString = matcher.group("version");
-                DefaultArtifactVersion curVersion = new DefaultArtifactVersion(versionString);
-                DefaultArtifactVersion minVersion = new DefaultArtifactVersion("1.1.0");
-                if (curVersion.compareTo(minVersion) >= 0) {
-                    return ConditionEvaluationResult.enabled("Found libpcap version " + versionString);
-                } else if (SystemUtils.IS_OS_WINDOWS) {
-                    return ConditionEvaluationResult.disabled("Test disabled due to too old WinPcap version. Please install at least version 1.1.0 to support all features. Please install from here: https://sourceforge.net/projects/winpcap413-176/ as this version supports all needed freatures.");
-                } else {
-                    return ConditionEvaluationResult.disabled("Test disabled due to too old libpcap version. Please install at least version 1.1.0 to support all features.");
-                }
-            }
-        } catch(Exception e) {
-            logger.info("Error detecting libpcap version.", e);
-        }
-        if(SystemUtils.IS_OS_WINDOWS) {
-            return ConditionEvaluationResult.disabled("Test disabled due to missing or invalid WinPcap version. Please install from here: https://sourceforge.net/projects/winpcap413-176/ as this version supports all needed freatures.");
-        } else {
-            return ConditionEvaluationResult.disabled("Test disabled due to missing or invalid libpcap version. Please install at least version 1.1.0 to support all features.");
-        }
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.test;
+
+import org.apache.commons.lang3.SystemUtils;
+import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
+import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.pcap4j.core.Pcaps;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class RequirePcapNgCondition implements ExecutionCondition {
+
+    private static final Logger logger = LoggerFactory.getLogger(RequirePcapCondition.class);
+
+    @Override
+    public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext extensionContext) {
+        // Mac:     libpcap version 1.8.1 -- Apple version 79.200.4
+        // Linux:
+        // Windows: WinPcap version 4.1.3 (packet.dll version 4.1.0.2980), based on libpcap version 1.0 branch 1_0_rel0b (20091008)
+        try {
+            String libVersion = Pcaps.libVersion();
+            Pattern pattern = Pattern.compile("^libpcap version (?<version>\\d+\\.\\d+(\\.\\d+)?).*$");
+            Matcher matcher = pattern.matcher(libVersion);
+            if (matcher.matches()) {
+                String versionString = matcher.group("version");
+                DefaultArtifactVersion curVersion = new DefaultArtifactVersion(versionString);
+                DefaultArtifactVersion minVersion = new DefaultArtifactVersion("1.1.0");
+                if (curVersion.compareTo(minVersion) >= 0) {
+                    return ConditionEvaluationResult.enabled("Found libpcap version " + versionString);
+                } else if (SystemUtils.IS_OS_WINDOWS) {
+                    return ConditionEvaluationResult.disabled("Test disabled due to too old WinPcap version. Please install at least version 1.1.0 to support all features. Please install from here: https://sourceforge.net/projects/winpcap413-176/ as this version supports all needed freatures.");
+                } else {
+                    return ConditionEvaluationResult.disabled("Test disabled due to too old libpcap version. Please install at least version 1.1.0 to support all features.");
+                }
+            }
+        } catch(Exception e) {
+            logger.info("Error detecting libpcap version.", e);
+        }
+        if(SystemUtils.IS_OS_WINDOWS) {
+            return ConditionEvaluationResult.disabled("Test disabled due to missing or invalid WinPcap version. Please install from here: https://sourceforge.net/projects/winpcap413-176/ as this version supports all needed freatures.");
+        } else {
+            return ConditionEvaluationResult.disabled("Test disabled due to missing or invalid libpcap version. Please install at least version 1.1.0 to support all features.");
+        }
+    }
+
+}
diff --git a/plc4j/utils/test-utils/src/main/resources/logback.xml b/plc4j/utils/test-utils/src/main/resources/logback.xml
index a8ddebbe5ba..3e761eafa34 100644
--- a/plc4j/utils/test-utils/src/main/resources/logback.xml
+++ b/plc4j/utils/test-utils/src/main/resources/logback.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoders are assigned the type
-         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="trace">
-    <appender-ref ref="STDOUT" />
-  </root>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="trace">
+    <appender-ref ref="STDOUT" />
+  </root>
+
 </configuration>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2eb505c4833..d5435e18b97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,1940 +1,1940 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache</groupId>
-    <artifactId>apache</artifactId>
-    <version>21</version>
-  </parent>
-
-  <groupId>org.apache.plc4x</groupId>
-  <artifactId>plc4x-parent</artifactId>
-  <version>0.6.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <name>PLC4X</name>
-  <description>
-    PLC4X is an effort to create a universal library for accessing industrial programmable logic controllers
-    using a variety of protocols using a uniform API.
-  </description>
-  <url>https://plc4x.apache.org</url>
-  <inceptionYear>2017</inceptionYear>
-
-  <scm>
-    <connection>scm:git:https://gitbox.apache.org/repos/asf/plc4x.git</connection>
-    <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/plc4x.git</developerConnection>
-    <url>https://github.com/apache/plc4x</url>
-    <tag>HEAD</tag>
-  </scm>
-
-  <!-- Only configure the site distribution as the rest is handled by the apache parent -->
-  <distributionManagement>
-    <site>
-      <id>apache.website</id>
-      <url>scm:git:https://gitbox.apache.org/repos/asf/plc4x-website.git</url>
-    </site>
-  </distributionManagement>
-
-  <issueManagement>
-    <system>Jira</system>
-    <url>https://issues.apache.org/jira/browse/PLC4X</url>
-  </issueManagement>
-
-  <mailingLists>
-    <mailingList>
-      <name>Apache PLC4X Developer List</name>
-      <subscribe>mailto:dev-subscribe@plc4x.apache.org</subscribe>
-      <unsubscribe>mailto:dev-unsubscribe@plc4x.apache.org</unsubscribe>
-      <post>mailto:dev@plc4x.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/plc4x-dev/</archive>
-    </mailingList>
-    <mailingList>
-      <name>PLC4X Commits List</name>
-      <subscribe>mailto:commit-subscribe@plc4x.apache.org</subscribe>
-      <unsubscribe>mailto:commits-unsubscribe@plc4x.apache.org</unsubscribe>
-      <post>mailto:commits@plc4x.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/plc4x-commits/</archive>
-    </mailingList>
-    <mailingList>
-      <name>PLC4X Jira Notifications List</name>
-      <subscribe>mailto:issues-subscribe@plc4x.apache.org</subscribe>
-      <unsubscribe>mailto:issues-unsubscribe@plc4x.apache.org</unsubscribe>
-      <post>mailto:issues@plc4x.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/plc4x-issues/</archive>
-    </mailingList>
-  </mailingLists>
-
-  <properties>
-    <!--
-      At least 3.3.3 required for camel-package-maven-plugin
-    -->
-    <maven.version>3.3.3</maven.version>
-
-    <java.version>1.8</java.version>
-
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputencoding>UTF-8</project.reporting.outputencoding>
-
-    <!-- Timestamp for the reproducible builds -->
-    <project.build.outputTimestamp>2019-11-01T10:30:00Z</project.build.outputTimestamp>
-
-    <!-- URL of the ASF SonarQube server -->
-    <sonar.host.url>https://builds.apache.org/analysis</sonar.host.url>
-    <!-- Exclude all generated code -->
-    <sonar.exclusions>**/generated-sources</sonar.exclusions>
-
-    <plc4x-code-generation.version>1.0.0</plc4x-code-generation.version>
-
-    <antlr.version>4.7.2</antlr.version>
-    <asm.version>5.0.4</asm.version>
-    <assertj.version>3.11.1</assertj.version>
-    <bouncycastle.version>1.60</bouncycastle.version>
-    <boost.version>1.71.0</boost.version>
-    <boost.version.underline-short>1_71</boost.version.underline-short>
-    <boost.version.underline>${boost.version.underline-short}_0</boost.version.underline>
-    <byte-buddy.version>1.9.10</byte-buddy.version>
-    <cmake-version>3.16.0</cmake-version>
-    <commons-codec.version>1.12</commons-codec.version>
-    <commons-collections4.version>4.1</commons-collections4.version>
-    <commons-configuration2.version>2.6</commons-configuration2.version>
-    <commons-io.version>2.6</commons-io.version>
-    <commons-lang.version>2.6</commons-lang.version>
-    <commons-lang3.version>3.7</commons-lang3.version>
-    <commons-logging.version>1.2</commons-logging.version>
-    <commons-math3.version>3.5</commons-math3.version>
-    <commons-pool2.version>2.6.0</commons-pool2.version>
-    <commons-text.version>1.8</commons-text.version>
-    <crc.version>1.0.1</crc.version>
-    <elasticsearch.version>7.4.0</elasticsearch.version>
-    <equalsverifier.version>3.0.2</equalsverifier.version>
-    <findbugs.version>3.0.1</findbugs.version>
-    <freemarker.version>2.3.28</freemarker.version>
-    <groovy.version>2.5.8</groovy.version>
-    <gson.version>2.8.5</gson.version>
-    <guava.version>27.0.1-jre</guava.version>
-    <hamcrest.version>1.3</hamcrest.version>
-    <httpclient.version>4.5.10</httpclient.version>
-    <jackson.version>2.10.0</jackson.version>
-    <jmh.version>1.21</jmh.version>
-    <jna.version>5.3.1</jna.version>
-    <joda-time.version>2.10.5</joda-time.version>
-    <jopt-simple.version>5.0.2</jopt-simple.version>
-    <jserialcom.version>2.5.1</jserialcom.version>
-    <junit.jupiter.version>5.5.0</junit.jupiter.version>
-    <junit.platform.version>1.3.2</junit.platform.version>
-    <junit.version>4.12</junit.version>
-    <log4j.version>2.11.1</log4j.version>
-    <logback.version>1.2.3</logback.version>
-    <logstash.version>7.4.0</logstash.version>
-    <lucene.version>8.2.0</lucene.version>
-    <metrics-core.version>3.1.2</metrics-core.version>
-    <mockito.version>2.24.5</mockito.version>
-    <netty.version>4.1.39.Final</netty.version>
-    <owasp-dependency-check.version>5.0.0-M1</owasp-dependency-check.version>
-    <pcap4j.version>1.8.2</pcap4j.version>
-    <scala.version>2.12.6</scala.version>
-    <slf4j.version>1.7.25</slf4j.version>
-    <snakeyaml.version>1.23</snakeyaml.version>
-    <spock-reports.version>1.6.1</spock-reports.version>
-    <spock.version>1.2-groovy-2.5</spock.version>
-    <t-digest.version>3.2</t-digest.version>
-    <thrift.version>0.13.0</thrift.version>
-    <xmlunit.version>2.6.3</xmlunit.version>
-
-    <!-- Site properties -->
-    <asciidoctor.maven.plugin.version>2.0.0-RC.1</asciidoctor.maven.plugin.version>
-    <asciidoctorj.version>2.0.0</asciidoctorj.version>
-    <asciidoctorj.diagram.version>1.5.16</asciidoctorj.diagram.version>
-    <reflow.skin.version>1.5.0</reflow.skin.version>
-    <bootstrap.version>3.3.7</bootstrap.version>
-    <jquery.version>3.3.1</jquery.version>
-    <anchorjs.version>3.2.2</anchorjs.version>
-    <fontawesome.version>5.2.0</fontawesome.version>
-  </properties>
-
-  <modules>
-    <module>build-utils</module>
-
-    <!-- Definition of the protocol message formats -->
-    <module>protocols</module>
-
-    <!-- Build the Java part of plc4x -->
-    <module>plc4j</module>
-
-    <!-- Tools needed throughout the build -->
-    <module>tools</module>
-  </modules>
-
-  <dependencyManagement>
-    <dependencies>
-      <!--
-        Set to provided to ensure that these jars are never automatically
-        included. If required the used still can override it if it is needed. -->
-      <dependency>
-        <groupId>ch.qos.logback</groupId>
-        <artifactId>logback-classic</artifactId>
-        <version>${logback.version}</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>ch.qos.logback</groupId>
-        <artifactId>logback-core</artifactId>
-        <version>${logback.version}</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>com.athaydes</groupId>
-        <artifactId>spock-reports</artifactId>
-        <version>${spock-reports.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.fazecast</groupId>
-        <artifactId>jSerialComm</artifactId>
-        <version>${jserialcom.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-annotations</artifactId>
-        <version>${jackson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-core</artifactId>
-        <version>${jackson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-databind</artifactId>
-        <version>${jackson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.dataformat</groupId>
-        <artifactId>jackson-dataformat-cbor</artifactId>
-        <version>${jackson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.dataformat</groupId>
-        <artifactId>jackson-dataformat-smile</artifactId>
-        <version>${jackson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.dataformat</groupId>
-        <artifactId>jackson-dataformat-xml</artifactId>
-        <version>${jackson.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>jakarta.xml.bind</groupId>
-            <artifactId>jakarta.xml.bind-api</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.dataformat</groupId>
-        <artifactId>jackson-dataformat-yaml</artifactId>
-        <version>${jackson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.code.findbugs</groupId>
-        <artifactId>jsr305</artifactId>
-        <version>${findbugs.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.code.gson</groupId>
-        <artifactId>gson</artifactId>
-        <version>${gson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <version>${guava.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.tdunning</groupId>
-        <artifactId>t-digest</artifactId>
-        <version>${t-digest.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-codec</groupId>
-        <artifactId>commons-codec</artifactId>
-        <version>${commons-codec.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>${commons-io.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>${commons-logging.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.dropwizard</groupId>
-        <artifactId>metrics-core</artifactId>
-        <version>${metrics-core.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-buffer</artifactId>
-        <version>${netty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-codec</artifactId>
-        <version>${netty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-codec-http</artifactId>
-        <version>${netty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-common</artifactId>
-        <version>${netty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-handler</artifactId>
-        <version>${netty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-resolver</artifactId>
-        <version>${netty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-transport</artifactId>
-        <version>${netty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-transport-rxtx</artifactId>
-        <version>${netty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>javax.annotation</groupId>
-        <artifactId>javax.annotation-api</artifactId>
-        <version>1.3.2</version>
-      </dependency>
-      <dependency>
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jaxb-api</artifactId>
-        <version>2.3.1</version>
-      </dependency>
-      <dependency>
-        <groupId>jaxen</groupId>
-        <artifactId>jaxen</artifactId>
-        <version>1.1.6</version>
-      </dependency>
-      <dependency>
-        <groupId>joda-time</groupId>
-        <artifactId>joda-time</artifactId>
-        <version>${joda-time.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>${junit.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>net.bytebuddy</groupId>
-        <artifactId>byte-buddy</artifactId>
-        <version>${byte-buddy.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>net.bytebuddy</groupId>
-        <artifactId>byte-buddy-agent</artifactId>
-        <version>${byte-buddy.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>net.java.dev.jna</groupId>
-        <artifactId>jna</artifactId>
-        <version>${jna.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>net.sf.jopt-simple</groupId>
-        <artifactId>jopt-simple</artifactId>
-        <version>${jopt-simple.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>nl.jqno.equalsverifier</groupId>
-        <artifactId>equalsverifier</artifactId>
-        <version>${equalsverifier.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.antlr</groupId>
-        <artifactId>antlr4-runtime</artifactId>
-        <version>${antlr.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-collections4</artifactId>
-        <version>${commons-collections4.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-configuration2</artifactId>
-        <version>${commons-configuration2.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-jexl3</artifactId>
-        <version>3.1</version>
-        <exclusions>
-          <exclusion>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-lang3</artifactId>
-        <version>${commons-lang3.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-math3</artifactId>
-        <version>${commons-math3.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-pool2</artifactId>
-        <version>${commons-pool2.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-text</artifactId>
-        <version>${commons-text.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>httpcore</artifactId>
-        <version>4.4.12</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-api</artifactId>
-        <version>${log4j.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.lucene</groupId>
-        <artifactId>lucene-analyzers-common</artifactId>
-        <version>${lucene.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.lucene</groupId>
-        <artifactId>lucene-backward-codecs</artifactId>
-        <version>${lucene.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.lucene</groupId>
-        <artifactId>lucene-core</artifactId>
-        <version>${lucene.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.lucene</groupId>
-        <artifactId>lucene-grouping</artifactId>
-        <version>${lucene.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.lucene</groupId>
-        <artifactId>lucene-highlighter</artifactId>
-        <version>${lucene.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.lucene</groupId>
-        <artifactId>lucene-join</artifactId>
-        <version>${lucene.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.lucene</groupId>
-        <artifactId>lucene-memory</artifactId>
-        <version>${lucene.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.lucene</groupId>
-        <artifactId>lucene-misc</artifactId>
-        <version>${lucene.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.lucene</groupId>
-        <artifactId>lucene-queries</artifactId>
-        <version>${lucene.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.lucene</groupId>
-        <artifactId>lucene-queryparser</artifactId>
-        <version>${lucene.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.lucene</groupId>
-        <artifactId>lucene-sandbox</artifactId>
-        <version>${lucene.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.lucene</groupId>
-        <artifactId>lucene-spatial3d</artifactId>
-        <version>${lucene.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.lucene</groupId>
-        <artifactId>lucene-spatial</artifactId>
-        <version>${lucene.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.lucene</groupId>
-        <artifactId>lucene-spatial-extras</artifactId>
-        <version>${lucene.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.lucene</groupId>
-        <artifactId>lucene-suggest</artifactId>
-        <version>${lucene.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-artifact</artifactId>
-        <version>${maven.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-utils</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.plc4x.plugins</groupId>
-        <artifactId>plc4x-code-generation-types-base</artifactId>
-        <version>${plc4x-code-generation.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.plc4x.plugins</groupId>
-        <artifactId>plc4x-code-generation-language-base</artifactId>
-        <version>${plc4x-code-generation.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.plc4x.plugins</groupId>
-        <artifactId>plc4x-code-generation-protocol-base</artifactId>
-        <version>${plc4x-code-generation.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.assertj</groupId>
-        <artifactId>assertj-core</artifactId>
-        <version>${assertj.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.bouncycastle</groupId>
-        <artifactId>bcmail-jdk15on</artifactId>
-        <version>${bouncycastle.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.bouncycastle</groupId>
-        <artifactId>bcpkix-jdk15on</artifactId>
-        <version>${bouncycastle.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.bouncycastle</groupId>
-        <artifactId>bcprov-jdk15on</artifactId>
-        <version>${bouncycastle.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.groovy</groupId>
-        <artifactId>groovy</artifactId>
-        <version>${groovy.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.groovy</groupId>
-        <artifactId>groovy-json</artifactId>
-        <version>${groovy.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.groovy</groupId>
-        <artifactId>groovy-templates</artifactId>
-        <version>${groovy.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.groovy</groupId>
-        <artifactId>groovy-test-junit5</artifactId>
-        <version>${groovy.version}</version>
-        <!-- Ensure we only use this in test -->
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.groovy</groupId>
-        <artifactId>groovy-xml</artifactId>
-        <version>${groovy.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.woodstox</groupId>
-        <artifactId>stax2-api</artifactId>
-        <version>4.1</version>
-      </dependency>
-      <dependency>
-        <groupId>org.dom4j</groupId>
-        <artifactId>dom4j</artifactId>
-        <version>2.1.1</version>
-      </dependency>
-      <dependency>
-        <groupId>org.elasticsearch</groupId>
-        <artifactId>elasticsearch</artifactId>
-        <version>${elasticsearch.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.elasticsearch</groupId>
-        <artifactId>elasticsearch-x-content</artifactId>
-        <version>${elasticsearch.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>transport-netty4-client</artifactId>
-        <version>${elasticsearch.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.freemarker</groupId>
-        <artifactId>freemarker</artifactId>
-        <version>${freemarker.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.github.jinahya</groupId>
-        <artifactId>bit-io</artifactId>
-        <version>1.4.3</version>
-      </dependency>
-      <dependency>
-        <groupId>com.github.snksoft</groupId>
-        <artifactId>crc</artifactId>
-        <version>${crc.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest-core</artifactId>
-        <version>${hamcrest.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest-library</artifactId>
-        <version>${hamcrest.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jdom</groupId>
-        <artifactId>jdom2</artifactId>
-        <version>2.0.6</version>
-      </dependency>
-      <dependency>
-        <groupId>org.junit.jupiter</groupId>
-        <artifactId>junit-jupiter-api</artifactId>
-        <version>${junit.jupiter.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.junit.jupiter</groupId>
-        <artifactId>junit-jupiter-engine</artifactId>
-        <version>${junit.jupiter.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.junit.jupiter</groupId>
-        <artifactId>junit-jupiter-params</artifactId>
-        <version>${junit.jupiter.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.junit.vintage</groupId>
-        <artifactId>junit-vintage-engine</artifactId>
-        <version>${junit.jupiter.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.junit.platform</groupId>
-        <artifactId>junit-platform-launcher</artifactId>
-        <version>1.5.0</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-core</artifactId>
-        <version>${mockito.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-junit-jupiter</artifactId>
-        <version>${mockito.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.openjdk.jmh</groupId>
-        <artifactId>jmh-core</artifactId>
-        <version>${jmh.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.openjdk.jmh</groupId>
-        <artifactId>jmh-generator-annprocess</artifactId>
-        <version>${jmh.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.ow2.asm</groupId>
-        <artifactId>asm</artifactId>
-        <version>${asm.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.pcap4j</groupId>
-        <artifactId>pcap4j-core</artifactId>
-        <version>${pcap4j.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.pcap4j</groupId>
-        <artifactId>pcap4j-packetfactory-static</artifactId>
-        <version>${pcap4j.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.scala-lang</groupId>
-        <artifactId>scala-library</artifactId>
-        <version>${scala.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>${slf4j.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-simple</artifactId>
-        <version>${slf4j.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.spockframework</groupId>
-        <artifactId>spock-core</artifactId>
-        <version>${spock.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.xmlunit</groupId>
-        <artifactId>xmlunit-core</artifactId>
-        <version>${xmlunit.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.xmlunit</groupId>
-        <artifactId>xmlunit-matchers</artifactId>
-        <version>${xmlunit.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.yaml</groupId>
-        <artifactId>snakeyaml</artifactId>
-        <version>${snakeyaml.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>xml-apis</groupId>
-        <artifactId>xml-apis</artifactId>
-        <version>1.4.01</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <build>
-    <plugins>
-      <!-- Make some additional properties available to simplify keeping some content up to date -->
-      <plugin>
-        <groupId>org.codehaus.gmaven</groupId>
-        <artifactId>groovy-maven-plugin</artifactId>
-        <executions>
-          <!-- Do some pre-build checks and report any findings to the user -->
-          <execution>
-            <id>prerequisite-check</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>execute</goal>
-            </goals>
-            <inherited>false</inherited>
-            <configuration>
-              <source>${project.basedir}/src/main/script/prerequisiteCheck.groovy</source>
-            </configuration>
-          </execution>
-          <!-- Set some dynamic variables which are useful for the site generation -->
-          <execution>
-            <id>provide-custom-properties</id>
-            <phase>pre-site</phase>
-            <goals>
-              <goal>execute</goal>
-            </goals>
-            <configuration>
-              <source>
-                print "\nCalculating some additional properties:"
-                // Get the current year
-                def currentYear = Calendar.getInstance().get(Calendar.YEAR) as String
-                print "\nCurrent year:                     " + currentYear
-                project.properties['current-year'] = currentYear
-
-                // Calculate some version related stuff
-                def currentVersion = project.version as String
-                def match = (currentVersion =~ /(\d+)\.(\d+)\.(\d+)(-SNAPSHOT)?/)
-                print "\nCurrent version:                  " + currentVersion
-                if(match.count &gt;= 1) {
-                  def majorVersion = match[0][1] as Integer
-                  def minorVersion = match[0][2] as Integer
-                  def bugfixVersion = match[0][3] as Integer
-
-                  def currentFullVersion = majorVersion + "." + minorVersion + "." + bugfixVersion
-                  def currentShortVersion = majorVersion + "." + minorVersion
-                  def currentNextIncrementalVersion = majorVersion + "." + minorVersion + "." + (bugfixVersion + 1)
-                  def currentNextMinorVersion = majorVersion + "." + (minorVersion + 1) + ".0"
-
-                  print "\nCurrent full version:             " + currentFullVersion + " (current-full-version)"
-                  project.properties['current-full-version'] = currentFullVersion
-                  print "\nCurrent short version:            " + currentShortVersion + "   (current-short-version)"
-                  project.properties['current-short-version'] = currentShortVersion
-                  print "\nCurrent next incremental version: " + currentNextIncrementalVersion + " (current-next-incremental-version)"
-                  project.properties['current-next-incremental-version'] = currentNextIncrementalVersion
-                  print "\nCurrent next minor version:       " + currentNextMinorVersion + " (current-next-minor-version)"
-                  project.properties['current-next-minor-version'] = currentNextMinorVersion
-                }
-                print "\n"
-              </source>
-            </configuration>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>2.10.5</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-
-      <!-- Write all the properties into a file so we can access them from asciidoctor -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>properties-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>pre-site</phase>
-            <goals>
-              <goal>write-project-properties</goal>
-            </goals>
-            <configuration>
-              <outputFile>${project.build.directory}/pom.adoc</outputFile>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- Check if all source files have the required apache license headers -->
-      <plugin>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>license-check</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
-          <excludes>
-            <!-- Git related files -->
-            <exclude>**/.git/**</exclude>
-            <exclude>**/.gitignore</exclude>
-
-            <!-- License Files for other licenses -->
-            <exclude>**/UNLICENSE</exclude>
-            <!--
-              Explicitly exclude this file as I was unable
-              to add a new license to the configuration.
-            -->
-            <exclude>**/Expression.g4</exclude>
-
-            <!-- Maven related files -->
-            <exclude>**/target/**</exclude>
-            <exclude>target/**</exclude>
-
-            <!-- Eclipse related files -->
-            <exclude>**/.project</exclude>
-            <exclude>**/.settings/**</exclude>
-            <exclude>**/.classpath</exclude>
-            <exclude>**/.factorypath</exclude>
-
-            <!-- IntelliJ related files -->
-            <exclude>**/.idea/**</exclude>
-            <exclude>**/*.iml</exclude>
-
-            <!-- Wireshark Captures -->
-            <exclude>**/*.pcap</exclude>
-
-            <!-- Asciidoctor generated files -->
-            <exclude>**/.asciidoctor/**</exclude>
-
-            <!-- Jenkins build related files -->
-            <exclude>.repository/**</exclude>
-            <exclude>local-snapshots-dir/**</exclude>
-
-            <!-- Data files created by examples running an embedded elasticsearch -->
-            <exclude>elasticsearch-data/**</exclude>
-
-            <!-- JSON doesn't like comments -->
-            <exclude>**/*.json</exclude>
-
-            <!-- Output of the profiler maven extension -->
-            <exclude>**/.profiler/**</exclude>
-
-            <!-- CLion stuff (C++ IDE) -->
-            <exclude>**/cmake-build-debug/**</exclude>
-
-            <!-- Stuff created during a plc4net build -->
-            <exclude>**/obj/**</exclude>
-
-            <!-- Temporarily exclude generated code from thrift in python modules -->
-            <exclude>generated/**</exclude>
-
-            <!-- Temporary Python virtualenv files-->
-            <exclude>**/venv/**</exclude>
-
-            <!-- Exclude a temp file needed by Docker -->
-            <exclude>project_version</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>integration-test</goal>
-              <goal>verify</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- Generate the legally required text files in the jars -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-remote-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>process-resource-bundles</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>process</goal>
-            </goals>
-            <configuration>
-              <!-- TODO: For some reason the build seems to fail in conjunction with the dependency-plugin unpack goal, if enabled -->
-              <skip>true</skip>
-              <resourceBundles>
-                <!-- Will generate META-INF/{DEPENDENCIES,LICENSE,NOTICE} -->
-                <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
-              </resourceBundles>
-              <!-- Content in this directory will be appended to generated resources -->
-              <appendedResourcesDirectory>${basedir}/src/remote-resources</appendedResourcesDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!--
-        ===================================
-        ==                               ==
-        ==    SITE GENERATION PLUGINS    ==
-        ==                               ==
-        ===================================
-
-        Starting here the following plugins are used for generating the projects website.
-
-        Most of the complexity is due to the fact that we selected "localResouces" in the site.xml
-        This causes the generated output not to rely on external resources. Therefore we have to
-        manually take care of fetching and packaging these external resources with the generated site.
-      -->
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack</id>
-            <!-- Only execute this for the parent module -->
-            <inherited>false</inherited>
-            <phase>pre-site</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>io.github.devacfr.maven.skins</groupId>
-                  <artifactId>reflow-default-webdeps</artifactId>
-                  <version>${reflow.skin.version}</version>
-                  <type>jar</type>
-                  <overWrite>false</overWrite>
-                  <includes>
-                    **/css/bootstrap.min.css,
-                    **/css/fontawesome/*,
-                    **/js/*.js,
-                    **/js/languages/*,
-                    **/js/styles/default.min.css
-                  </includes>
-                </artifactItem>
-              </artifactItems>
-              <outputDirectory>${project.build.directory}/site</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!--
-        Replace the bootstrap css with the version of the theme
-      -->
-      <plugin>
-        <groupId>com.googlecode.maven-download-plugin</groupId>
-        <artifactId>download-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>get-fontawesome</id>
-            <!-- Only execute this for the parent module -->
-            <inherited>false</inherited>
-            <phase>pre-site</phase>
-            <goals>
-              <goal>wget</goal>
-            </goals>
-            <configuration>
-              <url>https://use.fontawesome.com/releases/v${fontawesome.version}/fontawesome-free-${fontawesome.version}-web.zip</url>
-              <unpack>true</unpack>
-              <outputDirectory>${project.build.directory}/dependency/fontawesome</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-site-resources</id>
-            <!-- Only execute this for the parent module -->
-            <inherited>false</inherited>
-            <phase>pre-site</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/site</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>
-                    ${project.build.directory}/dependency/fontawesome/fontawesome-free-${fontawesome.version}-web
-                  </directory>
-                  <includes>
-                    <include>css/all.min.css</include>
-                  </includes>
-                </resource>
-                <resource>
-                  <directory>
-                    ${project.build.directory}/dependency/fontawesome/fontawesome-free-${fontawesome.version}-web/webfonts
-                  </directory>
-                  <targetPath>${project.build.directory}/site/fonts</targetPath>
-                </resource>
-                <resource>
-                  <directory>${project.basedir}/src/site/resources-filtered</directory>
-                  <filtering>true</filtering>
-                  <targetPath>${project.build.directory}/site</targetPath>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!--
-        The bootstrap uses "fonts" as directory for locating fonts and fontawesome uses "webfonts".
-        This plugin updates the css to also use "fonts".
-      -->
-      <plugin>
-        <groupId>com.google.code.maven-replacer-plugin</groupId>
-        <artifactId>replacer</artifactId>
-        <executions>
-          <execution>
-            <id>streamline-font-urls</id>
-            <!-- Only execute this for the parent module -->
-            <inherited>false</inherited>
-            <phase>pre-site</phase>
-            <goals>
-              <goal>replace</goal>
-            </goals>
-            <configuration>
-              <file>${project.build.directory}/site/css/all.min.css</file>
-              <replacements>
-                <replacement>
-                  <token>../webfonts/</token>
-                  <value>../fonts/</value>
-                </replacement>
-              </replacements>
-            </configuration>
-          </execution>
-          <execution>
-            <id>convert-property-to-adoc</id>
-            <!-- Only execute this for the parent module -->
-            <inherited>false</inherited>
-            <phase>pre-site</phase>
-            <goals>
-              <goal>replace</goal>
-            </goals>
-            <configuration>
-              <file>${project.build.directory}/pom.adoc</file>
-              <replacements>
-                <replacement>
-                  <token>(.*)=(.*)</token>
-                  <value>\:$1\: $2</value>
-                </replacement>
-                <replacement>
-                  <token>#(.*)</token>
-                  <value>// $1</value>
-                </replacement>
-              </replacements>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!--
-        Make the maven-site-plugin stage the output in the "asf-site" branch
-      -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-scm-publish-plugin</artifactId>
-        <configuration>
-          <!-- mono-module doesn't require site:stage -->
-          <content>${project.build.directory}/staging</content>
-          <!-- branch where to deploy -->
-          <scmBranch>asf-site</scmBranch>
-        </configuration>
-      </plugin>
-    </plugins>
-
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <version>0.13</version>
-          <configuration>
-            <!--
-                Make rat output the files with missing licensed directly into the
-                build output (This way we don't have to look into the rat.txt to find
-                out which ones)
-            -->
-            <consoleOutput>true</consoleOutput>
-          </configuration>
-        </plugin>
-
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>properties-maven-plugin</artifactId>
-          <version>1.0.0</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.antlr</groupId>
-          <artifactId>antlr4-maven-plugin</artifactId>
-          <version>${antlr.version}</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.plc4x.plugins</groupId>
-          <artifactId>plc4x-maven-plugin</artifactId>
-          <version>${plc4x-code-generation.version}</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>buildnumber-maven-plugin</artifactId>
-          <version>1.4</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.codehaus.gmaven</groupId>
-          <artifactId>groovy-maven-plugin</artifactId>
-          <version>2.1.1</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <version>4.2.1</version>
-        </plugin>
-
-        <plugin>
-          <groupId>com.google.code.maven-replacer-plugin</groupId>
-          <artifactId>replacer</artifactId>
-          <version>1.5.3</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-remote-resources-plugin</artifactId>
-          <version>1.6.0</version>
-        </plugin>
-
-        <plugin>
-          <groupId>com.googlecode.maven-download-plugin</groupId>
-          <artifactId>download-maven-plugin</artifactId>
-          <version>1.4.2</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.jacoco</groupId>
-          <artifactId>jacoco-maven-plugin</artifactId>
-          <version>0.8.5</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <configuration>
-            <source>${java.version}</source>
-            <target>${java.version}</target>
-            <testSource>${java.version}</testSource>
-            <testTarget>${java.version}</testTarget>
-          </configuration>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.22.2</version>
-          <dependencies>
-            <dependency>
-              <groupId>org.junit.jupiter</groupId>
-              <artifactId>junit-jupiter-engine</artifactId>
-              <version>${junit.jupiter.version}</version>
-            </dependency>
-          </dependencies>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-failsafe-plugin</artifactId>
-          <version>2.22.2</version>
-          <dependencies>
-            <dependency>
-              <groupId>org.junit.platform</groupId>
-              <artifactId>junit-platform-surefire-provider</artifactId>
-              <version>${junit.platform.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>org.junit.jupiter</groupId>
-              <artifactId>junit-jupiter-engine</artifactId>
-              <version>${junit.jupiter.version}</version>
-            </dependency>
-          </dependencies>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>3.2.0</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-source-plugin</artifactId>
-          <version>3.2.0</version>
-          <executions>
-            <execution>
-              <id>attach-sources</id>
-              <phase>verify</phase>
-              <goals>
-                <goal>jar-no-fork</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <version>3.2.0</version>
-          <configuration>
-            <finalName>apache-plc4x-${project.version}</finalName>
-          </configuration>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-shade-plugin</artifactId>
-          <version>3.2.1</version>
-          <configuration>
-            <outputFile>${project.build.directory}/${project.artifactId}-${project.version}-uber-jar.${project.packaging}</outputFile>
-            <transformers>
-              <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-            </transformers>
-            <filters>
-              <filter>
-                <!--
-                  These files contain signatures for classes, omit them as in
-                  shaded archives this has cause quite some problems in the past.
-                -->
-                <artifact>*:*</artifact>
-                <excludes>
-                  <exclude>META-INF/*.SF</exclude>
-                  <exclude>META-INF/*.DSA</exclude>
-                  <exclude>META-INF/*.RSA</exclude>
-                </excludes>
-              </filter>
-            </filters>
-            <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
-          </configuration>
-        </plugin>
-
-        <!-- Configure the Site generation -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>3.8.2</version>
-          <configuration>
-            <!--templateFile>${session.executionRootDirectory}/src/site/template/site.vm</templateFile-->
-            <generateReports>true</generateReports>
-            <generateSitemap>true</generateSitemap>
-            <relativizeDecorationLinks>false</relativizeDecorationLinks>
-            <locales>en</locales>
-            <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
-            <outputEncoding>${project.reporting.outputencoding}</outputEncoding>
-            <!--
-              IntelliJ can't find the asciidoc config option in the site plugin, which is correct.
-              However this config section is used by the asciidoctor site plugin extension. So plead
-              ignore this error, it's actually ok.
-            -->
-            <asciidoc>
-              <attributes>
-                <source-highlighter>prettify</source-highlighter>
-                <imagesoutdir>${project.build.directory}/site/images</imagesoutdir>
-                <pom-adoc>${project.build.directory}/pom.adoc</pom-adoc>
-              </attributes>
-              <requires>
-                <require>asciidoctor-diagram</require>
-              </requires>
-            </asciidoc>
-          </configuration>
-          <dependencies>
-            <!-- All dependencies needed by the reflow skin -->
-            <dependency>
-              <groupId>io.github.devacfr.maven.skins</groupId>
-              <artifactId>reflow-velocity-tools</artifactId>
-              <version>${reflow.skin.version}</version>
-            </dependency>
-
-            <!-- add support for scm/git site deployment -->
-            <dependency>
-              <groupId>org.apache.maven.wagon</groupId>
-              <artifactId>wagon-scm</artifactId>
-              <version>2.12</version>
-            </dependency>
-            <dependency>
-              <groupId>org.apache.maven.scm</groupId>
-              <artifactId>maven-scm-api</artifactId>
-              <version>1.9.5</version>
-            </dependency>
-            <dependency>
-              <groupId>org.apache.maven.scm</groupId>
-              <artifactId>maven-scm-manager-plexus</artifactId>
-              <version>1.9.5</version>
-            </dependency>
-            <dependency>
-              <groupId>org.apache.maven.scm</groupId>
-              <artifactId>maven-scm-provider-gitexe</artifactId>
-              <version>1.9.5</version>
-            </dependency>
-
-            <!-- Add support for asciidoctor -->
-            <dependency>
-              <groupId>org.asciidoctor</groupId>
-              <artifactId>asciidoctor-maven-plugin</artifactId>
-              <version>${asciidoctor.maven.plugin.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>org.asciidoctor</groupId>
-              <artifactId>asciidoctorj</artifactId>
-              <version>${asciidoctorj.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>org.asciidoctor</groupId>
-              <artifactId>asciidoctorj-diagram</artifactId>
-              <version>${asciidoctorj.diagram.version}</version>
-            </dependency>
-          </dependencies>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.1.1</version>
-          <configuration>
-            <!--
-              This will suppress the generation of a hidden timestamp at the top of each generated html page
-              and hopefully let the site generation nod to too big updates every time.
-            -->
-            <notimestamp>true</notimestamp>
-            <!--
-              Set the source level to 8 as otherwise with newer JDKs we're getting trouble.
-            -->
-            <source>8</source>
-            <!--
-              Disable the detection of links as we have some artifacts without api-docs and
-              the errors were polluting the build output.
-            -->
-            <detectLinks>false</detectLinks>
-            <validateLinks>false</validateLinks>
-          </configuration>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-changelog-plugin</artifactId>
-          <version>2.3</version>
-        </plugin>
-
-        <plugin>
-          <groupId>com.buschmais.jqassistant</groupId>
-          <artifactId>jqassistant-maven-plugin</artifactId>
-          <version>1.6.0</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.owasp</groupId>
-          <artifactId>dependency-check-maven</artifactId>
-          <version>${owasp-dependency-check.version}</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-  <reporting>
-    <plugins>
-      <!-- Generate the unit- and integration-test reports -->
-      <!--plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>report-only</report>
-              <report>failsafe-report-only</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin-->
-
-      <!-- Generate a code coverage report -->
-      <!--plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>report</report>
-              <report>report-integration</report>
-            </reports>
-          </reportSet>
-          <reportSet>
-            <id>aggregate</id>
-            <inherited>false</inherited>
-            <reports>
-              <report>report-aggregate</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin-->
-
-      <!-- Add html friendly version of source files with line-numbers -->
-      <!--plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>3.0.0</version>
-      </plugin-->
-
-      <!-- Generate javadoc documentation -->
-      <!--plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>javadoc-no-fork</report>
-              <report>test-javadoc-no-fork</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-        <configuration>
-          <failOnError>true</failOnError>
-        </configuration>
-      </plugin-->
-
-      <!-- Generates a changelog report from GIT commits -->
-      <!--plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-changelog-plugin</artifactId>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>changelog</report>
-              <report>file-activity</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-        <configuration>
-          <!- Automatically link Jira issues ->
-          <issueLinkUrl>https://issues.apache.org/jira/browse/%ISSUE%</issueLinkUrl>
-        </configuration>
-      </plugin-->
-
-      <!-- Generates a dependency vulnerability -->
-      <!--plugin>
-        <groupId>org.owasp</groupId>
-        <artifactId>dependency-check-maven</artifactId>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>aggregate</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin-->
-    </plugins>
-  </reporting>
-
-  <!-- Make Snapshots of Apache projects available -->
-  <repositories>
-    <repository>
-      <id>apache-snapshots</id>
-      <url>https://repository.apache.org/content/repositories/snapshots</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-  <!-- Make Snapshots of Apache plugins available -->
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache-snapshots</id>
-      <url>https://repository.apache.org/content/repositories/snapshots</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
-
-  <profiles>
-    <!-- Allows skipping of the pre-flight-check as needed when deploying on jenkins -->
-    <profile>
-      <id>skip-prerequisite-check</id>
-      <activation>
-      </activation>
-      <build>
-        <plugins>
-          <!-- Make some additional properties available to simplify keeping some content up to date -->
-          <plugin>
-            <groupId>org.codehaus.gmaven</groupId>
-            <artifactId>groovy-maven-plugin</artifactId>
-            <version>2.1.1</version>
-            <executions>
-              <!-- Do some pre-build checks and report any findings to the user -->
-              <execution>
-                <id>prerequisite-check</id>
-                <phase>validate</phase>
-                <goals>
-                  <goal>execute</goal>
-                </goals>
-                <inherited>false</inherited>
-                <configuration>
-                  <source>
-                    print "\nSkipping prerequisite-check\n\n"
-                  </source>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <!-- Build PLC4X including the Sandbox modules -->
-    <profile>
-      <id>with-sandbox</id>
-      <modules>
-        <module>sandbox</module>
-      </modules>
-    </profile>
-
-    <!-- Profile for linux (Self-Enabling) -->
-    <profile>
-      <id>os-unix</id>
-      <activation>
-        <os>
-          <family>unix</family>
-        </os>
-      </activation>
-      <properties>
-        <os.suffix>linux</os.suffix>
-        <os.classifier>linux-x86_64</os.classifier>
-        <cmake.url>https://github.com/Kitware/CMake/releases/download/v${cmake-version}/cmake-${cmake-version}-Linux-x86_64.tar.gz</cmake.url>
-        <cmake.root-dir>${project.build.directory}/cmake-${cmake-version}-Linux-x86_64</cmake.root-dir>
-        <cmake.child-dir>bin/cmake</cmake.child-dir>
-        <cmake.generator>Unix Makefiles</cmake.generator>
-        <boost.url>https://dl.bintray.com/boostorg/release/${boost.version}/source/boost_${boost.version.underline}.tar.gz</boost.url>
-        <boost.bootstrap.executable>./bootstrap.sh</boost.bootstrap.executable>
-        <boost.build.executable>./b2</boost.build.executable>
-        <thrift.bootstrap.executable>./bootstrap.sh</thrift.bootstrap.executable>
-        <thrift.configure.executable>./configure</thrift.configure.executable>
-        <thrift.make.executable>make</thrift.make.executable>
-        <thrift.compiler.executable>thrift</thrift.compiler.executable>
-        <gradlew.executable>./gradlew</gradlew.executable>
-      </properties>
-    </profile>
-    <!-- Profile for mac (Self-Enabling) -->
-    <profile>
-      <id>os-mac</id>
-      <activation>
-        <os>
-          <family>mac</family>
-        </os>
-      </activation>
-      <properties>
-        <os.suffix>mac</os.suffix>
-        <os.classifier>mac-x86_64</os.classifier>
-        <cmake.url>https://github.com/Kitware/CMake/releases/download/v${cmake-version}/cmake-${cmake-version}-Darwin-x86_64.tar.gz</cmake.url>
-        <cmake.root-dir>${project.build.directory}/cmake-${cmake-version}-Darwin-x86_64</cmake.root-dir>
-        <cmake.child-dir>CMake.app/Contents/BIN/cmake</cmake.child-dir>
-        <cmake.generator>Unix Makefiles</cmake.generator>
-        <boost.url>https://dl.bintray.com/boostorg/release/${boost.version}/source/boost_${boost.version.underline}.tar.gz</boost.url>
-        <boost.bootstrap.executable>./bootstrap.sh</boost.bootstrap.executable>
-        <boost.build.executable>./b2</boost.build.executable>
-        <thrift.bootstrap.executable>./bootstrap.sh</thrift.bootstrap.executable>
-        <thrift.configure.executable>./configure</thrift.configure.executable>
-        <thrift.make.executable>make</thrift.make.executable>
-        <thrift.compiler.executable>thrift</thrift.compiler.executable>
-        <gradlew.executable>./gradlew</gradlew.executable>
-      </properties>
-    </profile>
-    <!-- profile for windows (Self-Enabling) -->
-    <profile>
-      <id>os-windows</id>
-      <activation>
-        <os>
-          <family>windows</family>
-        </os>
-      </activation>
-      <properties>
-        <os.suffix>win</os.suffix>
-        <os.classifier>windows-x86_64</os.classifier>
-        <cmake.url>https://github.com/Kitware/CMake/releases/download/v${cmake-version}/cmake-${cmake-version}-win64-x64.zip</cmake.url>
-        <cmake.root-dir>${project.build.directory}/cmake-${cmake-version}-win64-x64</cmake.root-dir>
-        <cmake.child-dir>bin/cmake.exe</cmake.child-dir>
-        <cmake.generator>MinGW Makefiles</cmake.generator>
-        <boost.url>https://dl.bintray.com/boostorg/release/${boost.version}/source/boost_${boost.version.underline}.zip</boost.url>
-        <boost.bootstrap.executable>bootstrap.bat</boost.bootstrap.executable>
-        <boost.build.executable>b2</boost.build.executable>
-        <boost.include-directory>libs/libs/boost/include/boost-${boost.version.underline-short}</boost.include-directory>
-        <thrift.bootstrap.executable>bootstrap.sh</thrift.bootstrap.executable>
-        <thrift.configure.executable>configure</thrift.configure.executable>
-        <thrift.make.executable>make</thrift.make.executable>
-        <thrift.compiler.executable>thrift.exe</thrift.compiler.executable>
-        <gradlew.executable>gradlew.bat</gradlew.executable>
-      </properties>
-    </profile>
-
-    <!--
-      This profile is intended to help when having problems with Maven.
-      When enabled, it automatically generates an "effective.pom" in the target directory.
-      This version is the fully expanded version where all inherited configuration is in
-      place and all variables are resolved and profile configuration is included.
-    -->
-    <profile>
-      <id>debug-pom</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-help-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>generate-effective-pom</id>
-                <phase>compile</phase>
-                <goals>
-                  <goal>effective-pom</goal>
-                </goals>
-                <configuration>
-                  <output>${project.build.directory}/effective.pom</output>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <!--
-      This profile adds some additional configuration that should only be applied when running on jenkins.
-    -->
-    <profile>
-      <id>jenkins-build</id>
-    </profile>
-
-    <!--
-      This profile adds some additional checks and settings that should apply during development,
-      but could cause problems after that. As an example it would be impossible to build a released
-      version, if after the release CVEs were reported for one of its dependencies.
-    -->
-    <profile>
-      <id>development</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-enforcer-plugin</artifactId>
-            <version>3.0.0-M2</version> <!--$NO-MVN-MAN-VER$-->
-            <executions>
-              <execution>
-                <id>check-at-least-java-8</id>
-                <phase>validate</phase>
-                <goals>
-                  <goal>enforce</goal>
-                </goals>
-                <configuration>
-                  <rules>
-                    <requireJavaVersion>
-                      <version>1.8.0</version>
-                    </requireJavaVersion>
-                  </rules>
-                </configuration>
-              </execution>
-              <!-- Ensure we're not mixing dependency versions -->
-              <execution>
-                <id>enforce-version-convergence</id>
-                <phase>validate</phase>
-                <goals>
-                  <goal>enforce</goal>
-                </goals>
-                <configuration>
-                  <rules>
-                    <dependencyConvergence />
-                  </rules>
-                </configuration>
-              </execution>
-              <!--
-                  Fails the build if classes are included from multiple
-                  artifacts and these are not identical.
-              -->
-              <execution>
-                <id>enforce-ban-duplicate-classes</id>
-                <phase>validate</phase>
-                <goals>
-                  <goal>enforce</goal>
-                </goals>
-                <configuration>
-                  <rules>
-                    <banDuplicateClasses>
-                      <scopes>
-                        <scope>compile</scope>
-                        <scope>provided</scope>
-                      </scopes>
-                      <findAllDuplicates>true</findAllDuplicates>
-                      <ignoreWhenIdentical>true</ignoreWhenIdentical>
-                    </banDuplicateClasses>
-                  </rules>
-                  <fail>true</fail>
-                </configuration>
-              </execution>
-            </executions>
-            <dependencies>
-              <dependency>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>extra-enforcer-rules</artifactId>
-                <version>1.2</version>
-              </dependency>
-            </dependencies>
-          </plugin>
-
-          <!--plugin>
-            <groupId>org.owasp</groupId>
-            <artifactId>dependency-check-maven</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>check</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <failBuildOnCVSS>8</failBuildOnCVSS>
-            </configuration>
-          </plugin-->
-        </plugins>
-      </build>
-    </profile>
-
-    <profile>
-      <id>with-jqassistant</id>
-      <build>
-        <plugins>
-          <!-- Plugin for analysing the project based on neo4j queries -->
-          <plugin>
-            <groupId>com.buschmais.jqassistant</groupId>
-            <artifactId>jqassistant-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>scan</goal>
-                  <goal>analyze</goal>
-                </goals>
-                <configuration>
-                  <rulesDirectory>${project.basedir}/src/jqassistant</rulesDirectory>
-                  <failOnSeverity>MAJOR</failOnSeverity>
-                  <warnOnSeverity>MINOR</warnOnSeverity>
-                  <scanIncludes>
-                    <scanInclude>
-                      <path>${project.basedir}/.git</path>
-                    </scanInclude>
-                  </scanIncludes>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-      <reporting>
-        <plugins>
-          <plugin>
-            <groupId>com.buschmais.jqassistant</groupId>
-            <artifactId>jqassistant-maven-plugin</artifactId>
-            <reportSets>
-              <reportSet>
-                <reports>
-                  <report>report</report>
-                </reports>
-              </reportSet>
-            </reportSets>
-          </plugin>
-        </plugins>
-      </reporting>
-    </profile>
-
-    <!--
-      Self enabling fake-plugin configuration to help Eclipse use Maven right
-    -->
-    <profile>
-      <id>only-eclipse</id>
-      <activation>
-        <property>
-          <name>m2e.version</name>
-        </property>
-      </activation>
-      <build>
-        <pluginManagement>
-          <plugins>
-            <!--
-              This is a fake plugin which is used to tell m2e (Eclipse) how
-              to process this maven project.
-            -->
-            <plugin>
-              <groupId>org.eclipse.m2e</groupId>
-              <artifactId>lifecycle-mapping</artifactId>
-              <version>1.0.0</version>
-              <configuration>
-                <lifecycleMappingMetadata>
-                  <pluginExecutions>
-                    <pluginExecution>
-                      <pluginExecutionFilter>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-remote-resources-plugin</artifactId>
-                        <versionRange>[1.0.0,)</versionRange>
-                        <goals>
-                          <goal>process</goal>
-                        </goals>
-                      </pluginExecutionFilter>
-                      <action>
-                        <ignore />
-                      </action>
-                    </pluginExecution>
-                  </pluginExecutions>
-                </lifecycleMappingMetadata>
-              </configuration>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-      </build>
-    </profile>
-
-    <!--
-      This profile extends the default "apache-release" configuration with automatic checksum-
-      generation for the release source artifact. It is automatically activated during the
-      release build and only needed there.
-    -->
-    <profile>
-      <id>apache-release</id>
-      <build>
-        <plugins>
-          <!--
-            Create MD5 and SHA512 checksum files for the release artifacts.
-          -->
-          <plugin>
-            <groupId>net.nicoulaj.maven.plugins</groupId>
-            <artifactId>checksum-maven-plugin</artifactId>
-            <version>1.8</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>files</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <algorithms>
-                <algorithm>SHA-512</algorithm>
-              </algorithms>
-              <fileSets>
-                <fileSet>
-                  <directory>${project.build.directory}</directory>
-                  <includes>
-                    <include>apache-plc4x-${project.version}-source-release.zip</include>
-                  </includes>
-                </fileSet>
-              </fileSets>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>21</version>
+  </parent>
+
+  <groupId>org.apache.plc4x</groupId>
+  <artifactId>plc4x-parent</artifactId>
+  <version>0.6.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <name>PLC4X</name>
+  <description>
+    PLC4X is an effort to create a universal library for accessing industrial programmable logic controllers
+    using a variety of protocols using a uniform API.
+  </description>
+  <url>https://plc4x.apache.org</url>
+  <inceptionYear>2017</inceptionYear>
+
+  <scm>
+    <connection>scm:git:https://gitbox.apache.org/repos/asf/plc4x.git</connection>
+    <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/plc4x.git</developerConnection>
+    <url>https://github.com/apache/plc4x</url>
+    <tag>HEAD</tag>
+  </scm>
+
+  <!-- Only configure the site distribution as the rest is handled by the apache parent -->
+  <distributionManagement>
+    <site>
+      <id>apache.website</id>
+      <url>scm:git:https://gitbox.apache.org/repos/asf/plc4x-website.git</url>
+    </site>
+  </distributionManagement>
+
+  <issueManagement>
+    <system>Jira</system>
+    <url>https://issues.apache.org/jira/browse/PLC4X</url>
+  </issueManagement>
+
+  <mailingLists>
+    <mailingList>
+      <name>Apache PLC4X Developer List</name>
+      <subscribe>mailto:dev-subscribe@plc4x.apache.org</subscribe>
+      <unsubscribe>mailto:dev-unsubscribe@plc4x.apache.org</unsubscribe>
+      <post>mailto:dev@plc4x.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/plc4x-dev/</archive>
+    </mailingList>
+    <mailingList>
+      <name>PLC4X Commits List</name>
+      <subscribe>mailto:commit-subscribe@plc4x.apache.org</subscribe>
+      <unsubscribe>mailto:commits-unsubscribe@plc4x.apache.org</unsubscribe>
+      <post>mailto:commits@plc4x.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/plc4x-commits/</archive>
+    </mailingList>
+    <mailingList>
+      <name>PLC4X Jira Notifications List</name>
+      <subscribe>mailto:issues-subscribe@plc4x.apache.org</subscribe>
+      <unsubscribe>mailto:issues-unsubscribe@plc4x.apache.org</unsubscribe>
+      <post>mailto:issues@plc4x.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/plc4x-issues/</archive>
+    </mailingList>
+  </mailingLists>
+
+  <properties>
+    <!--
+      At least 3.3.3 required for camel-package-maven-plugin
+    -->
+    <maven.version>3.3.3</maven.version>
+
+    <java.version>1.8</java.version>
+
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputencoding>UTF-8</project.reporting.outputencoding>
+
+    <!-- Timestamp for the reproducible builds -->
+    <project.build.outputTimestamp>2019-11-01T10:30:00Z</project.build.outputTimestamp>
+
+    <!-- URL of the ASF SonarQube server -->
+    <sonar.host.url>https://builds.apache.org/analysis</sonar.host.url>
+    <!-- Exclude all generated code -->
+    <sonar.exclusions>**/generated-sources</sonar.exclusions>
+
+    <plc4x-code-generation.version>1.0.0</plc4x-code-generation.version>
+
+    <antlr.version>4.7.2</antlr.version>
+    <asm.version>5.0.4</asm.version>
+    <assertj.version>3.11.1</assertj.version>
+    <bouncycastle.version>1.60</bouncycastle.version>
+    <boost.version>1.71.0</boost.version>
+    <boost.version.underline-short>1_71</boost.version.underline-short>
+    <boost.version.underline>${boost.version.underline-short}_0</boost.version.underline>
+    <byte-buddy.version>1.9.10</byte-buddy.version>
+    <cmake-version>3.16.0</cmake-version>
+    <commons-codec.version>1.12</commons-codec.version>
+    <commons-collections4.version>4.1</commons-collections4.version>
+    <commons-configuration2.version>2.6</commons-configuration2.version>
+    <commons-io.version>2.6</commons-io.version>
+    <commons-lang.version>2.6</commons-lang.version>
+    <commons-lang3.version>3.7</commons-lang3.version>
+    <commons-logging.version>1.2</commons-logging.version>
+    <commons-math3.version>3.5</commons-math3.version>
+    <commons-pool2.version>2.6.0</commons-pool2.version>
+    <commons-text.version>1.8</commons-text.version>
+    <crc.version>1.0.1</crc.version>
+    <elasticsearch.version>7.4.0</elasticsearch.version>
+    <equalsverifier.version>3.0.2</equalsverifier.version>
+    <findbugs.version>3.0.1</findbugs.version>
+    <freemarker.version>2.3.28</freemarker.version>
+    <groovy.version>2.5.8</groovy.version>
+    <gson.version>2.8.5</gson.version>
+    <guava.version>27.0.1-jre</guava.version>
+    <hamcrest.version>1.3</hamcrest.version>
+    <httpclient.version>4.5.10</httpclient.version>
+    <jackson.version>2.10.0</jackson.version>
+    <jmh.version>1.21</jmh.version>
+    <jna.version>5.3.1</jna.version>
+    <joda-time.version>2.10.5</joda-time.version>
+    <jopt-simple.version>5.0.2</jopt-simple.version>
+    <jserialcom.version>2.5.1</jserialcom.version>
+    <junit.jupiter.version>5.5.0</junit.jupiter.version>
+    <junit.platform.version>1.3.2</junit.platform.version>
+    <junit.version>4.12</junit.version>
+    <log4j.version>2.11.1</log4j.version>
+    <logback.version>1.2.3</logback.version>
+    <logstash.version>7.4.0</logstash.version>
+    <lucene.version>8.2.0</lucene.version>
+    <metrics-core.version>3.1.2</metrics-core.version>
+    <mockito.version>2.24.5</mockito.version>
+    <netty.version>4.1.39.Final</netty.version>
+    <owasp-dependency-check.version>5.0.0-M1</owasp-dependency-check.version>
+    <pcap4j.version>1.8.2</pcap4j.version>
+    <scala.version>2.12.6</scala.version>
+    <slf4j.version>1.7.25</slf4j.version>
+    <snakeyaml.version>1.23</snakeyaml.version>
+    <spock-reports.version>1.6.1</spock-reports.version>
+    <spock.version>1.2-groovy-2.5</spock.version>
+    <t-digest.version>3.2</t-digest.version>
+    <thrift.version>0.13.0</thrift.version>
+    <xmlunit.version>2.6.3</xmlunit.version>
+
+    <!-- Site properties -->
+    <asciidoctor.maven.plugin.version>2.0.0-RC.1</asciidoctor.maven.plugin.version>
+    <asciidoctorj.version>2.0.0</asciidoctorj.version>
+    <asciidoctorj.diagram.version>1.5.16</asciidoctorj.diagram.version>
+    <reflow.skin.version>1.5.0</reflow.skin.version>
+    <bootstrap.version>3.3.7</bootstrap.version>
+    <jquery.version>3.3.1</jquery.version>
+    <anchorjs.version>3.2.2</anchorjs.version>
+    <fontawesome.version>5.2.0</fontawesome.version>
+  </properties>
+
+  <modules>
+    <module>build-utils</module>
+
+    <!-- Definition of the protocol message formats -->
+    <module>protocols</module>
+
+    <!-- Build the Java part of plc4x -->
+    <module>plc4j</module>
+
+    <!-- Tools needed throughout the build -->
+    <module>tools</module>
+  </modules>
+
+  <dependencyManagement>
+    <dependencies>
+      <!--
+        Set to provided to ensure that these jars are never automatically
+        included. If required the used still can override it if it is needed. -->
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-classic</artifactId>
+        <version>${logback.version}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-core</artifactId>
+        <version>${logback.version}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>com.athaydes</groupId>
+        <artifactId>spock-reports</artifactId>
+        <version>${spock-reports.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.fazecast</groupId>
+        <artifactId>jSerialComm</artifactId>
+        <version>${jserialcom.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-annotations</artifactId>
+        <version>${jackson.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-core</artifactId>
+        <version>${jackson.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-databind</artifactId>
+        <version>${jackson.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson.dataformat</groupId>
+        <artifactId>jackson-dataformat-cbor</artifactId>
+        <version>${jackson.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson.dataformat</groupId>
+        <artifactId>jackson-dataformat-smile</artifactId>
+        <version>${jackson.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson.dataformat</groupId>
+        <artifactId>jackson-dataformat-xml</artifactId>
+        <version>${jackson.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson.dataformat</groupId>
+        <artifactId>jackson-dataformat-yaml</artifactId>
+        <version>${jackson.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.code.findbugs</groupId>
+        <artifactId>jsr305</artifactId>
+        <version>${findbugs.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.code.gson</groupId>
+        <artifactId>gson</artifactId>
+        <version>${gson.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>${guava.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.tdunning</groupId>
+        <artifactId>t-digest</artifactId>
+        <version>${t-digest.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-codec</groupId>
+        <artifactId>commons-codec</artifactId>
+        <version>${commons-codec.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>${commons-io.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>${commons-logging.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.dropwizard</groupId>
+        <artifactId>metrics-core</artifactId>
+        <version>${metrics-core.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-buffer</artifactId>
+        <version>${netty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-codec</artifactId>
+        <version>${netty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-codec-http</artifactId>
+        <version>${netty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-common</artifactId>
+        <version>${netty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-handler</artifactId>
+        <version>${netty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-resolver</artifactId>
+        <version>${netty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-transport</artifactId>
+        <version>${netty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-transport-rxtx</artifactId>
+        <version>${netty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.annotation</groupId>
+        <artifactId>javax.annotation-api</artifactId>
+        <version>1.3.2</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.xml.bind</groupId>
+        <artifactId>jaxb-api</artifactId>
+        <version>2.3.1</version>
+      </dependency>
+      <dependency>
+        <groupId>jaxen</groupId>
+        <artifactId>jaxen</artifactId>
+        <version>1.1.6</version>
+      </dependency>
+      <dependency>
+        <groupId>joda-time</groupId>
+        <artifactId>joda-time</artifactId>
+        <version>${joda-time.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>${junit.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>net.bytebuddy</groupId>
+        <artifactId>byte-buddy</artifactId>
+        <version>${byte-buddy.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>net.bytebuddy</groupId>
+        <artifactId>byte-buddy-agent</artifactId>
+        <version>${byte-buddy.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>net.java.dev.jna</groupId>
+        <artifactId>jna</artifactId>
+        <version>${jna.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>net.sf.jopt-simple</groupId>
+        <artifactId>jopt-simple</artifactId>
+        <version>${jopt-simple.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>nl.jqno.equalsverifier</groupId>
+        <artifactId>equalsverifier</artifactId>
+        <version>${equalsverifier.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.antlr</groupId>
+        <artifactId>antlr4-runtime</artifactId>
+        <version>${antlr.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-collections4</artifactId>
+        <version>${commons-collections4.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-configuration2</artifactId>
+        <version>${commons-configuration2.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-jexl3</artifactId>
+        <version>3.1</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
+        <version>${commons-lang3.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-math3</artifactId>
+        <version>${commons-math3.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-pool2</artifactId>
+        <version>${commons-pool2.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-text</artifactId>
+        <version>${commons-text.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpcore</artifactId>
+        <version>4.4.12</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-api</artifactId>
+        <version>${log4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-analyzers-common</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-backward-codecs</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-core</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-grouping</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-highlighter</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-join</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-memory</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-misc</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-queries</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-queryparser</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-sandbox</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-spatial3d</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-spatial</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-spatial-extras</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-suggest</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-artifact</artifactId>
+        <version>${maven.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-utils</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.plc4x.plugins</groupId>
+        <artifactId>plc4x-code-generation-types-base</artifactId>
+        <version>${plc4x-code-generation.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.plc4x.plugins</groupId>
+        <artifactId>plc4x-code-generation-language-base</artifactId>
+        <version>${plc4x-code-generation.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.plc4x.plugins</groupId>
+        <artifactId>plc4x-code-generation-protocol-base</artifactId>
+        <version>${plc4x-code-generation.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.assertj</groupId>
+        <artifactId>assertj-core</artifactId>
+        <version>${assertj.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.bouncycastle</groupId>
+        <artifactId>bcmail-jdk15on</artifactId>
+        <version>${bouncycastle.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.bouncycastle</groupId>
+        <artifactId>bcpkix-jdk15on</artifactId>
+        <version>${bouncycastle.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.bouncycastle</groupId>
+        <artifactId>bcprov-jdk15on</artifactId>
+        <version>${bouncycastle.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.groovy</groupId>
+        <artifactId>groovy</artifactId>
+        <version>${groovy.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.groovy</groupId>
+        <artifactId>groovy-json</artifactId>
+        <version>${groovy.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.groovy</groupId>
+        <artifactId>groovy-templates</artifactId>
+        <version>${groovy.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.groovy</groupId>
+        <artifactId>groovy-test-junit5</artifactId>
+        <version>${groovy.version}</version>
+        <!-- Ensure we only use this in test -->
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.groovy</groupId>
+        <artifactId>groovy-xml</artifactId>
+        <version>${groovy.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.woodstox</groupId>
+        <artifactId>stax2-api</artifactId>
+        <version>4.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.dom4j</groupId>
+        <artifactId>dom4j</artifactId>
+        <version>2.1.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.elasticsearch</groupId>
+        <artifactId>elasticsearch</artifactId>
+        <version>${elasticsearch.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.elasticsearch</groupId>
+        <artifactId>elasticsearch-x-content</artifactId>
+        <version>${elasticsearch.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.elasticsearch.plugin</groupId>
+        <artifactId>transport-netty4-client</artifactId>
+        <version>${elasticsearch.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.freemarker</groupId>
+        <artifactId>freemarker</artifactId>
+        <version>${freemarker.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.github.jinahya</groupId>
+        <artifactId>bit-io</artifactId>
+        <version>1.4.3</version>
+      </dependency>
+      <dependency>
+        <groupId>com.github.snksoft</groupId>
+        <artifactId>crc</artifactId>
+        <version>${crc.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest-core</artifactId>
+        <version>${hamcrest.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest-library</artifactId>
+        <version>${hamcrest.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jdom</groupId>
+        <artifactId>jdom2</artifactId>
+        <version>2.0.6</version>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-api</artifactId>
+        <version>${junit.jupiter.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-engine</artifactId>
+        <version>${junit.jupiter.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-params</artifactId>
+        <version>${junit.jupiter.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.vintage</groupId>
+        <artifactId>junit-vintage-engine</artifactId>
+        <version>${junit.jupiter.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.platform</groupId>
+        <artifactId>junit-platform-launcher</artifactId>
+        <version>1.5.0</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-core</artifactId>
+        <version>${mockito.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-junit-jupiter</artifactId>
+        <version>${mockito.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.openjdk.jmh</groupId>
+        <artifactId>jmh-core</artifactId>
+        <version>${jmh.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.openjdk.jmh</groupId>
+        <artifactId>jmh-generator-annprocess</artifactId>
+        <version>${jmh.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.ow2.asm</groupId>
+        <artifactId>asm</artifactId>
+        <version>${asm.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.pcap4j</groupId>
+        <artifactId>pcap4j-core</artifactId>
+        <version>${pcap4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.pcap4j</groupId>
+        <artifactId>pcap4j-packetfactory-static</artifactId>
+        <version>${pcap4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.scala-lang</groupId>
+        <artifactId>scala-library</artifactId>
+        <version>${scala.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-simple</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.spockframework</groupId>
+        <artifactId>spock-core</artifactId>
+        <version>${spock.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.xmlunit</groupId>
+        <artifactId>xmlunit-core</artifactId>
+        <version>${xmlunit.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.xmlunit</groupId>
+        <artifactId>xmlunit-matchers</artifactId>
+        <version>${xmlunit.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.yaml</groupId>
+        <artifactId>snakeyaml</artifactId>
+        <version>${snakeyaml.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>xml-apis</groupId>
+        <artifactId>xml-apis</artifactId>
+        <version>1.4.01</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <build>
+    <plugins>
+      <!-- Make some additional properties available to simplify keeping some content up to date -->
+      <plugin>
+        <groupId>org.codehaus.gmaven</groupId>
+        <artifactId>groovy-maven-plugin</artifactId>
+        <executions>
+          <!-- Do some pre-build checks and report any findings to the user -->
+          <execution>
+            <id>prerequisite-check</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>execute</goal>
+            </goals>
+            <inherited>false</inherited>
+            <configuration>
+              <source>${project.basedir}/src/main/script/prerequisiteCheck.groovy</source>
+            </configuration>
+          </execution>
+          <!-- Set some dynamic variables which are useful for the site generation -->
+          <execution>
+            <id>provide-custom-properties</id>
+            <phase>pre-site</phase>
+            <goals>
+              <goal>execute</goal>
+            </goals>
+            <configuration>
+              <source>
+                print "\nCalculating some additional properties:"
+                // Get the current year
+                def currentYear = Calendar.getInstance().get(Calendar.YEAR) as String
+                print "\nCurrent year:                     " + currentYear
+                project.properties['current-year'] = currentYear
+
+                // Calculate some version related stuff
+                def currentVersion = project.version as String
+                def match = (currentVersion =~ /(\d+)\.(\d+)\.(\d+)(-SNAPSHOT)?/)
+                print "\nCurrent version:                  " + currentVersion
+                if(match.count &gt;= 1) {
+                  def majorVersion = match[0][1] as Integer
+                  def minorVersion = match[0][2] as Integer
+                  def bugfixVersion = match[0][3] as Integer
+
+                  def currentFullVersion = majorVersion + "." + minorVersion + "." + bugfixVersion
+                  def currentShortVersion = majorVersion + "." + minorVersion
+                  def currentNextIncrementalVersion = majorVersion + "." + minorVersion + "." + (bugfixVersion + 1)
+                  def currentNextMinorVersion = majorVersion + "." + (minorVersion + 1) + ".0"
+
+                  print "\nCurrent full version:             " + currentFullVersion + " (current-full-version)"
+                  project.properties['current-full-version'] = currentFullVersion
+                  print "\nCurrent short version:            " + currentShortVersion + "   (current-short-version)"
+                  project.properties['current-short-version'] = currentShortVersion
+                  print "\nCurrent next incremental version: " + currentNextIncrementalVersion + " (current-next-incremental-version)"
+                  project.properties['current-next-incremental-version'] = currentNextIncrementalVersion
+                  print "\nCurrent next minor version:       " + currentNextMinorVersion + " (current-next-minor-version)"
+                  project.properties['current-next-minor-version'] = currentNextMinorVersion
+                }
+                print "\n"
+              </source>
+            </configuration>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>2.10.5</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+
+      <!-- Write all the properties into a file so we can access them from asciidoctor -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>properties-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>pre-site</phase>
+            <goals>
+              <goal>write-project-properties</goal>
+            </goals>
+            <configuration>
+              <outputFile>${project.build.directory}/pom.adoc</outputFile>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!-- Check if all source files have the required apache license headers -->
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>license-check</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
+          <excludes>
+            <!-- Git related files -->
+            <exclude>**/.git/**</exclude>
+            <exclude>**/.gitignore</exclude>
+
+            <!-- License Files for other licenses -->
+            <exclude>**/UNLICENSE</exclude>
+            <!--
+              Explicitly exclude this file as I was unable
+              to add a new license to the configuration.
+            -->
+            <exclude>**/Expression.g4</exclude>
+
+            <!-- Maven related files -->
+            <exclude>**/target/**</exclude>
+            <exclude>target/**</exclude>
+
+            <!-- Eclipse related files -->
+            <exclude>**/.project</exclude>
+            <exclude>**/.settings/**</exclude>
+            <exclude>**/.classpath</exclude>
+            <exclude>**/.factorypath</exclude>
+
+            <!-- IntelliJ related files -->
+            <exclude>**/.idea/**</exclude>
+            <exclude>**/*.iml</exclude>
+
+            <!-- Wireshark Captures -->
+            <exclude>**/*.pcap</exclude>
+
+            <!-- Asciidoctor generated files -->
+            <exclude>**/.asciidoctor/**</exclude>
+
+            <!-- Jenkins build related files -->
+            <exclude>.repository/**</exclude>
+            <exclude>local-snapshots-dir/**</exclude>
+
+            <!-- Data files created by examples running an embedded elasticsearch -->
+            <exclude>elasticsearch-data/**</exclude>
+
+            <!-- JSON doesn't like comments -->
+            <exclude>**/*.json</exclude>
+
+            <!-- Output of the profiler maven extension -->
+            <exclude>**/.profiler/**</exclude>
+
+            <!-- CLion stuff (C++ IDE) -->
+            <exclude>**/cmake-build-debug/**</exclude>
+
+            <!-- Stuff created during a plc4net build -->
+            <exclude>**/obj/**</exclude>
+
+            <!-- Temporarily exclude generated code from thrift in python modules -->
+            <exclude>generated/**</exclude>
+
+            <!-- Temporary Python virtualenv files-->
+            <exclude>**/venv/**</exclude>
+
+            <!-- Exclude a temp file needed by Docker -->
+            <exclude>project_version</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!-- Generate the legally required text files in the jars -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>process-resource-bundles</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <!-- TODO: For some reason the build seems to fail in conjunction with the dependency-plugin unpack goal, if enabled -->
+              <skip>true</skip>
+              <resourceBundles>
+                <!-- Will generate META-INF/{DEPENDENCIES,LICENSE,NOTICE} -->
+                <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+              </resourceBundles>
+              <!-- Content in this directory will be appended to generated resources -->
+              <appendedResourcesDirectory>${basedir}/src/remote-resources</appendedResourcesDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!--
+        ===================================
+        ==                               ==
+        ==    SITE GENERATION PLUGINS    ==
+        ==                               ==
+        ===================================
+
+        Starting here the following plugins are used for generating the projects website.
+
+        Most of the complexity is due to the fact that we selected "localResouces" in the site.xml
+        This causes the generated output not to rely on external resources. Therefore we have to
+        manually take care of fetching and packaging these external resources with the generated site.
+      -->
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>unpack</id>
+            <!-- Only execute this for the parent module -->
+            <inherited>false</inherited>
+            <phase>pre-site</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>io.github.devacfr.maven.skins</groupId>
+                  <artifactId>reflow-default-webdeps</artifactId>
+                  <version>${reflow.skin.version}</version>
+                  <type>jar</type>
+                  <overWrite>false</overWrite>
+                  <includes>
+                    **/css/bootstrap.min.css,
+                    **/css/fontawesome/*,
+                    **/js/*.js,
+                    **/js/languages/*,
+                    **/js/styles/default.min.css
+                  </includes>
+                </artifactItem>
+              </artifactItems>
+              <outputDirectory>${project.build.directory}/site</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!--
+        Replace the bootstrap css with the version of the theme
+      -->
+      <plugin>
+        <groupId>com.googlecode.maven-download-plugin</groupId>
+        <artifactId>download-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>get-fontawesome</id>
+            <!-- Only execute this for the parent module -->
+            <inherited>false</inherited>
+            <phase>pre-site</phase>
+            <goals>
+              <goal>wget</goal>
+            </goals>
+            <configuration>
+              <url>https://use.fontawesome.com/releases/v${fontawesome.version}/fontawesome-free-${fontawesome.version}-web.zip</url>
+              <unpack>true</unpack>
+              <outputDirectory>${project.build.directory}/dependency/fontawesome</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-site-resources</id>
+            <!-- Only execute this for the parent module -->
+            <inherited>false</inherited>
+            <phase>pre-site</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/site</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>
+                    ${project.build.directory}/dependency/fontawesome/fontawesome-free-${fontawesome.version}-web
+                  </directory>
+                  <includes>
+                    <include>css/all.min.css</include>
+                  </includes>
+                </resource>
+                <resource>
+                  <directory>
+                    ${project.build.directory}/dependency/fontawesome/fontawesome-free-${fontawesome.version}-web/webfonts
+                  </directory>
+                  <targetPath>${project.build.directory}/site/fonts</targetPath>
+                </resource>
+                <resource>
+                  <directory>${project.basedir}/src/site/resources-filtered</directory>
+                  <filtering>true</filtering>
+                  <targetPath>${project.build.directory}/site</targetPath>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!--
+        The bootstrap uses "fonts" as directory for locating fonts and fontawesome uses "webfonts".
+        This plugin updates the css to also use "fonts".
+      -->
+      <plugin>
+        <groupId>com.google.code.maven-replacer-plugin</groupId>
+        <artifactId>replacer</artifactId>
+        <executions>
+          <execution>
+            <id>streamline-font-urls</id>
+            <!-- Only execute this for the parent module -->
+            <inherited>false</inherited>
+            <phase>pre-site</phase>
+            <goals>
+              <goal>replace</goal>
+            </goals>
+            <configuration>
+              <file>${project.build.directory}/site/css/all.min.css</file>
+              <replacements>
+                <replacement>
+                  <token>../webfonts/</token>
+                  <value>../fonts/</value>
+                </replacement>
+              </replacements>
+            </configuration>
+          </execution>
+          <execution>
+            <id>convert-property-to-adoc</id>
+            <!-- Only execute this for the parent module -->
+            <inherited>false</inherited>
+            <phase>pre-site</phase>
+            <goals>
+              <goal>replace</goal>
+            </goals>
+            <configuration>
+              <file>${project.build.directory}/pom.adoc</file>
+              <replacements>
+                <replacement>
+                  <token>(.*)=(.*)</token>
+                  <value>\:$1\: $2</value>
+                </replacement>
+                <replacement>
+                  <token>#(.*)</token>
+                  <value>// $1</value>
+                </replacement>
+              </replacements>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!--
+        Make the maven-site-plugin stage the output in the "asf-site" branch
+      -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-scm-publish-plugin</artifactId>
+        <configuration>
+          <!-- mono-module doesn't require site:stage -->
+          <content>${project.build.directory}/staging</content>
+          <!-- branch where to deploy -->
+          <scmBranch>asf-site</scmBranch>
+        </configuration>
+      </plugin>
+    </plugins>
+
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
+          <version>0.13</version>
+          <configuration>
+            <!--
+                Make rat output the files with missing licensed directly into the
+                build output (This way we don't have to look into the rat.txt to find
+                out which ones)
+            -->
+            <consoleOutput>true</consoleOutput>
+          </configuration>
+        </plugin>
+
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>properties-maven-plugin</artifactId>
+          <version>1.0.0</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.antlr</groupId>
+          <artifactId>antlr4-maven-plugin</artifactId>
+          <version>${antlr.version}</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.plc4x.plugins</groupId>
+          <artifactId>plc4x-maven-plugin</artifactId>
+          <version>${plc4x-code-generation.version}</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>buildnumber-maven-plugin</artifactId>
+          <version>1.4</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.codehaus.gmaven</groupId>
+          <artifactId>groovy-maven-plugin</artifactId>
+          <version>2.1.1</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <version>4.2.1</version>
+        </plugin>
+
+        <plugin>
+          <groupId>com.google.code.maven-replacer-plugin</groupId>
+          <artifactId>replacer</artifactId>
+          <version>1.5.3</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-remote-resources-plugin</artifactId>
+          <version>1.6.0</version>
+        </plugin>
+
+        <plugin>
+          <groupId>com.googlecode.maven-download-plugin</groupId>
+          <artifactId>download-maven-plugin</artifactId>
+          <version>1.4.2</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.jacoco</groupId>
+          <artifactId>jacoco-maven-plugin</artifactId>
+          <version>0.8.5</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <configuration>
+            <source>${java.version}</source>
+            <target>${java.version}</target>
+            <testSource>${java.version}</testSource>
+            <testTarget>${java.version}</testTarget>
+          </configuration>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.22.2</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.junit.jupiter</groupId>
+              <artifactId>junit-jupiter-engine</artifactId>
+              <version>${junit.jupiter.version}</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-failsafe-plugin</artifactId>
+          <version>2.22.2</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.junit.platform</groupId>
+              <artifactId>junit-platform-surefire-provider</artifactId>
+              <version>${junit.platform.version}</version>
+            </dependency>
+            <dependency>
+              <groupId>org.junit.jupiter</groupId>
+              <artifactId>junit-jupiter-engine</artifactId>
+              <version>${junit.jupiter.version}</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.2.0</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>3.2.0</version>
+          <executions>
+            <execution>
+              <id>attach-sources</id>
+              <phase>verify</phase>
+              <goals>
+                <goal>jar-no-fork</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>3.2.0</version>
+          <configuration>
+            <finalName>apache-plc4x-${project.version}</finalName>
+          </configuration>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-shade-plugin</artifactId>
+          <version>3.2.1</version>
+          <configuration>
+            <outputFile>${project.build.directory}/${project.artifactId}-${project.version}-uber-jar.${project.packaging}</outputFile>
+            <transformers>
+              <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+            </transformers>
+            <filters>
+              <filter>
+                <!--
+                  These files contain signatures for classes, omit them as in
+                  shaded archives this has cause quite some problems in the past.
+                -->
+                <artifact>*:*</artifact>
+                <excludes>
+                  <exclude>META-INF/*.SF</exclude>
+                  <exclude>META-INF/*.DSA</exclude>
+                  <exclude>META-INF/*.RSA</exclude>
+                </excludes>
+              </filter>
+            </filters>
+            <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
+          </configuration>
+        </plugin>
+
+        <!-- Configure the Site generation -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.8.2</version>
+          <configuration>
+            <!--templateFile>${session.executionRootDirectory}/src/site/template/site.vm</templateFile-->
+            <generateReports>true</generateReports>
+            <generateSitemap>true</generateSitemap>
+            <relativizeDecorationLinks>false</relativizeDecorationLinks>
+            <locales>en</locales>
+            <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
+            <outputEncoding>${project.reporting.outputencoding}</outputEncoding>
+            <!--
+              IntelliJ can't find the asciidoc config option in the site plugin, which is correct.
+              However this config section is used by the asciidoctor site plugin extension. So plead
+              ignore this error, it's actually ok.
+            -->
+            <asciidoc>
+              <attributes>
+                <source-highlighter>prettify</source-highlighter>
+                <imagesoutdir>${project.build.directory}/site/images</imagesoutdir>
+                <pom-adoc>${project.build.directory}/pom.adoc</pom-adoc>
+              </attributes>
+              <requires>
+                <require>asciidoctor-diagram</require>
+              </requires>
+            </asciidoc>
+          </configuration>
+          <dependencies>
+            <!-- All dependencies needed by the reflow skin -->
+            <dependency>
+              <groupId>io.github.devacfr.maven.skins</groupId>
+              <artifactId>reflow-velocity-tools</artifactId>
+              <version>${reflow.skin.version}</version>
+            </dependency>
+
+            <!-- add support for scm/git site deployment -->
+            <dependency>
+              <groupId>org.apache.maven.wagon</groupId>
+              <artifactId>wagon-scm</artifactId>
+              <version>2.12</version>
+            </dependency>
+            <dependency>
+              <groupId>org.apache.maven.scm</groupId>
+              <artifactId>maven-scm-api</artifactId>
+              <version>1.9.5</version>
+            </dependency>
+            <dependency>
+              <groupId>org.apache.maven.scm</groupId>
+              <artifactId>maven-scm-manager-plexus</artifactId>
+              <version>1.9.5</version>
+            </dependency>
+            <dependency>
+              <groupId>org.apache.maven.scm</groupId>
+              <artifactId>maven-scm-provider-gitexe</artifactId>
+              <version>1.9.5</version>
+            </dependency>
+
+            <!-- Add support for asciidoctor -->
+            <dependency>
+              <groupId>org.asciidoctor</groupId>
+              <artifactId>asciidoctor-maven-plugin</artifactId>
+              <version>${asciidoctor.maven.plugin.version}</version>
+            </dependency>
+            <dependency>
+              <groupId>org.asciidoctor</groupId>
+              <artifactId>asciidoctorj</artifactId>
+              <version>${asciidoctorj.version}</version>
+            </dependency>
+            <dependency>
+              <groupId>org.asciidoctor</groupId>
+              <artifactId>asciidoctorj-diagram</artifactId>
+              <version>${asciidoctorj.diagram.version}</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>3.1.1</version>
+          <configuration>
+            <!--
+              This will suppress the generation of a hidden timestamp at the top of each generated html page
+              and hopefully let the site generation nod to too big updates every time.
+            -->
+            <notimestamp>true</notimestamp>
+            <!--
+              Set the source level to 8 as otherwise with newer JDKs we're getting trouble.
+            -->
+            <source>8</source>
+            <!--
+              Disable the detection of links as we have some artifacts without api-docs and
+              the errors were polluting the build output.
+            -->
+            <detectLinks>false</detectLinks>
+            <validateLinks>false</validateLinks>
+          </configuration>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-changelog-plugin</artifactId>
+          <version>2.3</version>
+        </plugin>
+
+        <plugin>
+          <groupId>com.buschmais.jqassistant</groupId>
+          <artifactId>jqassistant-maven-plugin</artifactId>
+          <version>1.6.0</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.owasp</groupId>
+          <artifactId>dependency-check-maven</artifactId>
+          <version>${owasp-dependency-check.version}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+  <reporting>
+    <plugins>
+      <!-- Generate the unit- and integration-test reports -->
+      <!--plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-report-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>report-only</report>
+              <report>failsafe-report-only</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin-->
+
+      <!-- Generate a code coverage report -->
+      <!--plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>report</report>
+              <report>report-integration</report>
+            </reports>
+          </reportSet>
+          <reportSet>
+            <id>aggregate</id>
+            <inherited>false</inherited>
+            <reports>
+              <report>report-aggregate</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin-->
+
+      <!-- Add html friendly version of source files with line-numbers -->
+      <!--plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jxr-plugin</artifactId>
+        <version>3.0.0</version>
+      </plugin-->
+
+      <!-- Generate javadoc documentation -->
+      <!--plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>javadoc-no-fork</report>
+              <report>test-javadoc-no-fork</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+        <configuration>
+          <failOnError>true</failOnError>
+        </configuration>
+      </plugin-->
+
+      <!-- Generates a changelog report from GIT commits -->
+      <!--plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-changelog-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>changelog</report>
+              <report>file-activity</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+        <configuration>
+          <!- Automatically link Jira issues ->
+          <issueLinkUrl>https://issues.apache.org/jira/browse/%ISSUE%</issueLinkUrl>
+        </configuration>
+      </plugin-->
+
+      <!-- Generates a dependency vulnerability -->
+      <!--plugin>
+        <groupId>org.owasp</groupId>
+        <artifactId>dependency-check-maven</artifactId>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>aggregate</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin-->
+    </plugins>
+  </reporting>
+
+  <!-- Make Snapshots of Apache projects available -->
+  <repositories>
+    <repository>
+      <id>apache-snapshots</id>
+      <url>https://repository.apache.org/content/repositories/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
+  <!-- Make Snapshots of Apache plugins available -->
+  <pluginRepositories>
+    <pluginRepository>
+      <id>apache-snapshots</id>
+      <url>https://repository.apache.org/content/repositories/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
+  <profiles>
+    <!-- Allows skipping of the pre-flight-check as needed when deploying on jenkins -->
+    <profile>
+      <id>skip-prerequisite-check</id>
+      <activation>
+      </activation>
+      <build>
+        <plugins>
+          <!-- Make some additional properties available to simplify keeping some content up to date -->
+          <plugin>
+            <groupId>org.codehaus.gmaven</groupId>
+            <artifactId>groovy-maven-plugin</artifactId>
+            <version>2.1.1</version>
+            <executions>
+              <!-- Do some pre-build checks and report any findings to the user -->
+              <execution>
+                <id>prerequisite-check</id>
+                <phase>validate</phase>
+                <goals>
+                  <goal>execute</goal>
+                </goals>
+                <inherited>false</inherited>
+                <configuration>
+                  <source>
+                    print "\nSkipping prerequisite-check\n\n"
+                  </source>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <!-- Build PLC4X including the Sandbox modules -->
+    <profile>
+      <id>with-sandbox</id>
+      <modules>
+        <module>sandbox</module>
+      </modules>
+    </profile>
+
+    <!-- Profile for linux (Self-Enabling) -->
+    <profile>
+      <id>os-unix</id>
+      <activation>
+        <os>
+          <family>unix</family>
+        </os>
+      </activation>
+      <properties>
+        <os.suffix>linux</os.suffix>
+        <os.classifier>linux-x86_64</os.classifier>
+        <cmake.url>https://github.com/Kitware/CMake/releases/download/v${cmake-version}/cmake-${cmake-version}-Linux-x86_64.tar.gz</cmake.url>
+        <cmake.root-dir>${project.build.directory}/cmake-${cmake-version}-Linux-x86_64</cmake.root-dir>
+        <cmake.child-dir>bin/cmake</cmake.child-dir>
+        <cmake.generator>Unix Makefiles</cmake.generator>
+        <boost.url>https://dl.bintray.com/boostorg/release/${boost.version}/source/boost_${boost.version.underline}.tar.gz</boost.url>
+        <boost.bootstrap.executable>./bootstrap.sh</boost.bootstrap.executable>
+        <boost.build.executable>./b2</boost.build.executable>
+        <thrift.bootstrap.executable>./bootstrap.sh</thrift.bootstrap.executable>
+        <thrift.configure.executable>./configure</thrift.configure.executable>
+        <thrift.make.executable>make</thrift.make.executable>
+        <thrift.compiler.executable>thrift</thrift.compiler.executable>
+        <gradlew.executable>./gradlew</gradlew.executable>
+      </properties>
+    </profile>
+    <!-- Profile for mac (Self-Enabling) -->
+    <profile>
+      <id>os-mac</id>
+      <activation>
+        <os>
+          <family>mac</family>
+        </os>
+      </activation>
+      <properties>
+        <os.suffix>mac</os.suffix>
+        <os.classifier>mac-x86_64</os.classifier>
+        <cmake.url>https://github.com/Kitware/CMake/releases/download/v${cmake-version}/cmake-${cmake-version}-Darwin-x86_64.tar.gz</cmake.url>
+        <cmake.root-dir>${project.build.directory}/cmake-${cmake-version}-Darwin-x86_64</cmake.root-dir>
+        <cmake.child-dir>CMake.app/Contents/BIN/cmake</cmake.child-dir>
+        <cmake.generator>Unix Makefiles</cmake.generator>
+        <boost.url>https://dl.bintray.com/boostorg/release/${boost.version}/source/boost_${boost.version.underline}.tar.gz</boost.url>
+        <boost.bootstrap.executable>./bootstrap.sh</boost.bootstrap.executable>
+        <boost.build.executable>./b2</boost.build.executable>
+        <thrift.bootstrap.executable>./bootstrap.sh</thrift.bootstrap.executable>
+        <thrift.configure.executable>./configure</thrift.configure.executable>
+        <thrift.make.executable>make</thrift.make.executable>
+        <thrift.compiler.executable>thrift</thrift.compiler.executable>
+        <gradlew.executable>./gradlew</gradlew.executable>
+      </properties>
+    </profile>
+    <!-- profile for windows (Self-Enabling) -->
+    <profile>
+      <id>os-windows</id>
+      <activation>
+        <os>
+          <family>windows</family>
+        </os>
+      </activation>
+      <properties>
+        <os.suffix>win</os.suffix>
+        <os.classifier>windows-x86_64</os.classifier>
+        <cmake.url>https://github.com/Kitware/CMake/releases/download/v${cmake-version}/cmake-${cmake-version}-win64-x64.zip</cmake.url>
+        <cmake.root-dir>${project.build.directory}/cmake-${cmake-version}-win64-x64</cmake.root-dir>
+        <cmake.child-dir>bin/cmake.exe</cmake.child-dir>
+        <cmake.generator>MinGW Makefiles</cmake.generator>
+        <boost.url>https://dl.bintray.com/boostorg/release/${boost.version}/source/boost_${boost.version.underline}.zip</boost.url>
+        <boost.bootstrap.executable>bootstrap.bat</boost.bootstrap.executable>
+        <boost.build.executable>b2</boost.build.executable>
+        <boost.include-directory>libs/libs/boost/include/boost-${boost.version.underline-short}</boost.include-directory>
+        <thrift.bootstrap.executable>bootstrap.sh</thrift.bootstrap.executable>
+        <thrift.configure.executable>configure</thrift.configure.executable>
+        <thrift.make.executable>make</thrift.make.executable>
+        <thrift.compiler.executable>thrift.exe</thrift.compiler.executable>
+        <gradlew.executable>gradlew.bat</gradlew.executable>
+      </properties>
+    </profile>
+
+    <!--
+      This profile is intended to help when having problems with Maven.
+      When enabled, it automatically generates an "effective.pom" in the target directory.
+      This version is the fully expanded version where all inherited configuration is in
+      place and all variables are resolved and profile configuration is included.
+    -->
+    <profile>
+      <id>debug-pom</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-help-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>generate-effective-pom</id>
+                <phase>compile</phase>
+                <goals>
+                  <goal>effective-pom</goal>
+                </goals>
+                <configuration>
+                  <output>${project.build.directory}/effective.pom</output>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <!--
+      This profile adds some additional configuration that should only be applied when running on jenkins.
+    -->
+    <profile>
+      <id>jenkins-build</id>
+    </profile>
+
+    <!--
+      This profile adds some additional checks and settings that should apply during development,
+      but could cause problems after that. As an example it would be impossible to build a released
+      version, if after the release CVEs were reported for one of its dependencies.
+    -->
+    <profile>
+      <id>development</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-enforcer-plugin</artifactId>
+            <version>3.0.0-M2</version> <!--$NO-MVN-MAN-VER$-->
+            <executions>
+              <execution>
+                <id>check-at-least-java-8</id>
+                <phase>validate</phase>
+                <goals>
+                  <goal>enforce</goal>
+                </goals>
+                <configuration>
+                  <rules>
+                    <requireJavaVersion>
+                      <version>1.8.0</version>
+                    </requireJavaVersion>
+                  </rules>
+                </configuration>
+              </execution>
+              <!-- Ensure we're not mixing dependency versions -->
+              <execution>
+                <id>enforce-version-convergence</id>
+                <phase>validate</phase>
+                <goals>
+                  <goal>enforce</goal>
+                </goals>
+                <configuration>
+                  <rules>
+                    <dependencyConvergence />
+                  </rules>
+                </configuration>
+              </execution>
+              <!--
+                  Fails the build if classes are included from multiple
+                  artifacts and these are not identical.
+              -->
+              <execution>
+                <id>enforce-ban-duplicate-classes</id>
+                <phase>validate</phase>
+                <goals>
+                  <goal>enforce</goal>
+                </goals>
+                <configuration>
+                  <rules>
+                    <banDuplicateClasses>
+                      <scopes>
+                        <scope>compile</scope>
+                        <scope>provided</scope>
+                      </scopes>
+                      <findAllDuplicates>true</findAllDuplicates>
+                      <ignoreWhenIdentical>true</ignoreWhenIdentical>
+                    </banDuplicateClasses>
+                  </rules>
+                  <fail>true</fail>
+                </configuration>
+              </execution>
+            </executions>
+            <dependencies>
+              <dependency>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>extra-enforcer-rules</artifactId>
+                <version>1.2</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+
+          <!--plugin>
+            <groupId>org.owasp</groupId>
+            <artifactId>dependency-check-maven</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <failBuildOnCVSS>8</failBuildOnCVSS>
+            </configuration>
+          </plugin-->
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>with-jqassistant</id>
+      <build>
+        <plugins>
+          <!-- Plugin for analysing the project based on neo4j queries -->
+          <plugin>
+            <groupId>com.buschmais.jqassistant</groupId>
+            <artifactId>jqassistant-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>scan</goal>
+                  <goal>analyze</goal>
+                </goals>
+                <configuration>
+                  <rulesDirectory>${project.basedir}/src/jqassistant</rulesDirectory>
+                  <failOnSeverity>MAJOR</failOnSeverity>
+                  <warnOnSeverity>MINOR</warnOnSeverity>
+                  <scanIncludes>
+                    <scanInclude>
+                      <path>${project.basedir}/.git</path>
+                    </scanInclude>
+                  </scanIncludes>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+      <reporting>
+        <plugins>
+          <plugin>
+            <groupId>com.buschmais.jqassistant</groupId>
+            <artifactId>jqassistant-maven-plugin</artifactId>
+            <reportSets>
+              <reportSet>
+                <reports>
+                  <report>report</report>
+                </reports>
+              </reportSet>
+            </reportSets>
+          </plugin>
+        </plugins>
+      </reporting>
+    </profile>
+
+    <!--
+      Self enabling fake-plugin configuration to help Eclipse use Maven right
+    -->
+    <profile>
+      <id>only-eclipse</id>
+      <activation>
+        <property>
+          <name>m2e.version</name>
+        </property>
+      </activation>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <!--
+              This is a fake plugin which is used to tell m2e (Eclipse) how
+              to process this maven project.
+            -->
+            <plugin>
+              <groupId>org.eclipse.m2e</groupId>
+              <artifactId>lifecycle-mapping</artifactId>
+              <version>1.0.0</version>
+              <configuration>
+                <lifecycleMappingMetadata>
+                  <pluginExecutions>
+                    <pluginExecution>
+                      <pluginExecutionFilter>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-remote-resources-plugin</artifactId>
+                        <versionRange>[1.0.0,)</versionRange>
+                        <goals>
+                          <goal>process</goal>
+                        </goals>
+                      </pluginExecutionFilter>
+                      <action>
+                        <ignore />
+                      </action>
+                    </pluginExecution>
+                  </pluginExecutions>
+                </lifecycleMappingMetadata>
+              </configuration>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
+    </profile>
+
+    <!--
+      This profile extends the default "apache-release" configuration with automatic checksum-
+      generation for the release source artifact. It is automatically activated during the
+      release build and only needed there.
+    -->
+    <profile>
+      <id>apache-release</id>
+      <build>
+        <plugins>
+          <!--
+            Create MD5 and SHA512 checksum files for the release artifacts.
+          -->
+          <plugin>
+            <groupId>net.nicoulaj.maven.plugins</groupId>
+            <artifactId>checksum-maven-plugin</artifactId>
+            <version>1.8</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>files</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <algorithms>
+                <algorithm>SHA-512</algorithm>
+              </algorithms>
+              <fileSets>
+                <fileSet>
+                  <directory>${project.build.directory}</directory>
+                  <includes>
+                    <include>apache-plc4x-${project.version}-source-release.zip</include>
+                  </includes>
+                </fileSet>
+              </fileSets>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>
\ No newline at end of file
diff --git a/protocols/ab-eth/pom.xml b/protocols/ab-eth/pom.xml
index b78407e12c1..1eabed36271 100644
--- a/protocols/ab-eth/pom.xml
+++ b/protocols/ab-eth/pom.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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
-  ~
-  ~   http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4x-protocols</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4x-protocols-ab-eth</artifactId>
-
-  <name>Protocols: AB-ETH</name>
-  <description>Base protocol specifications for the AB ETH protocol</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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
+  ~
+  ~   http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4x-protocols</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4x-protocols-ab-eth</artifactId>
+
+  <name>Protocols: AB-ETH</name>
+  <description>Base protocol specifications for the AB ETH protocol</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/protocols/ab-eth/src/main/java/org/apache/plc4x/protocol/abeth/ABETHProtocol.java b/protocols/ab-eth/src/main/java/org/apache/plc4x/protocol/abeth/ABETHProtocol.java
index 1d821c3241c..7786eb73807 100644
--- a/protocols/ab-eth/src/main/java/org/apache/plc4x/protocol/abeth/ABETHProtocol.java
+++ b/protocols/ab-eth/src/main/java/org/apache/plc4x/protocol/abeth/ABETHProtocol.java
@@ -1,46 +1,46 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.protocol.abeth;
-
-import org.apache.plc4x.plugins.codegenerator.language.mspec.parser.MessageFormatParser;
-import org.apache.plc4x.plugins.codegenerator.protocol.Protocol;
-import org.apache.plc4x.plugins.codegenerator.types.definitions.TypeDefinition;
-import org.apache.plc4x.plugins.codegenerator.types.exceptions.GenerationException;
-
-import java.io.InputStream;
-import java.util.Map;
-
-public class ABETHProtocol implements Protocol {
-
-    @Override
-    public String getName() {
-        return "ab-eth";
-    }
-
-    @Override
-    public Map<String, TypeDefinition> getTypeDefinitions() throws GenerationException {
-        InputStream schemaInputStream = ABETHProtocol.class.getResourceAsStream("/protocols/abeth/ab-eth.mspec");
-        if(schemaInputStream == null) {
-            throw new GenerationException("Error loading message-format schema for protocol '" + getName() + "'");
-        }
-        return new MessageFormatParser().parse(schemaInputStream);
-    }
-
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.protocol.abeth;
+
+import org.apache.plc4x.plugins.codegenerator.language.mspec.parser.MessageFormatParser;
+import org.apache.plc4x.plugins.codegenerator.protocol.Protocol;
+import org.apache.plc4x.plugins.codegenerator.types.definitions.TypeDefinition;
+import org.apache.plc4x.plugins.codegenerator.types.exceptions.GenerationException;
+
+import java.io.InputStream;
+import java.util.Map;
+
+public class ABETHProtocol implements Protocol {
+
+    @Override
+    public String getName() {
+        return "ab-eth";
+    }
+
+    @Override
+    public Map<String, TypeDefinition> getTypeDefinitions() throws GenerationException {
+        InputStream schemaInputStream = ABETHProtocol.class.getResourceAsStream("/protocols/abeth/ab-eth.mspec");
+        if(schemaInputStream == null) {
+            throw new GenerationException("Error loading message-format schema for protocol '" + getName() + "'");
+        }
+        return new MessageFormatParser().parse(schemaInputStream);
+    }
+
+}
diff --git a/protocols/ab-eth/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol b/protocols/ab-eth/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol
index 6f20f62709e..a9288fae371 100644
--- a/protocols/ab-eth/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol
+++ b/protocols/ab-eth/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol
@@ -1,19 +1,19 @@
-#
-# 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
-#
-#   http://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.
-#
+#
+# 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
+#
+#   http://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.
+#
 org.apache.plc4x.protocol.abeth.ABETHProtocol
\ No newline at end of file
diff --git a/protocols/ab-eth/src/main/resources/protocols/abeth/ab-eth.mspec b/protocols/ab-eth/src/main/resources/protocols/abeth/ab-eth.mspec
index 851a0725a2e..54860e91a15 100644
--- a/protocols/ab-eth/src/main/resources/protocols/abeth/ab-eth.mspec
+++ b/protocols/ab-eth/src/main/resources/protocols/abeth/ab-eth.mspec
@@ -1,84 +1,84 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//     http://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.
-//
-
-[discriminatedType 'CIPEncapsulationPacket'
-    [discriminator uint 16 'commandType']
-    [implicit      uint 16 'len' 'lengthInBytes - 28']
-    [simple        uint 32 'sessionHandle']
-    [simple        uint 32 'status']
-    [array         uint 8  'senderContext' count '8']
-    [simple        uint 32 'options']
-    [reserved      uint 32 '0x00000000']
-    [typeSwitch 'commandType'
-        ['0x0101' CIPEncapsulationConnectionRequest
-        ]
-        ['0x0201' CIPEncapsulationConnectionResponse
-        ]
-        ['0x0107' CIPEncapsulationReadRequest
-            [simple   DF1RequestMessage  'request']
-        ]
-        ['0x0207' CIPEncapsulationReadResponse [uint 16 'len']
-            [simple   DF1ResponseMessage 'response' ['len']]
-        ]
-    ]
-]
-
-[discriminatedType 'DF1RequestMessage'
-    [simple        uint 8  'destinationAddress']
-    [simple        uint 8  'sourceAddress']
-    [reserved      uint 16 '0x0000']
-    [discriminator uint 8  'commandCode']
-    [simple        uint 8  'status']
-    [simple        uint 16 'transactionCounter']
-    [typeSwitch 'commandCode'
-        ['0x0F' DF1CommandRequestMessage
-            [simple DF1RequestCommand 'command']
-        ]
-    ]
-]
-
-[discriminatedType 'DF1ResponseMessage' [uint 16 'payloadLength']
-    [reserved      uint 8  '0x00']
-    [simple        uint 8  'destinationAddress']
-    [simple        uint 8  'sourceAddress']
-    [reserved      uint 8  '0x00']
-    [discriminator uint 8  'commandCode']
-    [simple        uint 8  'status']
-    [simple        uint 16 'transactionCounter']
-    [typeSwitch 'commandCode'
-        ['0x4F' DF1CommandResponseMessageProtectedTypedLogicalRead [uint 8 'status']
-            [array    uint 8 'data' length 'payloadLength - 8']
-        ]
-    ]
-]
-
-[discriminatedType 'DF1RequestCommand'
-    [discriminator    uint 8 'functionCode']
-    [typeSwitch 'functionCode'
-        ['0xA2' DF1RequestProtectedTypedLogicalRead
-            [simple uint 8 'byteSize']
-            [simple uint 8 'fileNumber']
-            [simple uint 8 'fileType']
-            [simple uint 8 'elementNumber']
-            [simple uint 8 'subElementNumber']
-        ]
-    ]
-]
-
-
+//
+// 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
+//
+//     http://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.
+//
+
+[discriminatedType 'CIPEncapsulationPacket'
+    [discriminator uint 16 'commandType']
+    [implicit      uint 16 'len' 'lengthInBytes - 28']
+    [simple        uint 32 'sessionHandle']
+    [simple        uint 32 'status']
+    [array         uint 8  'senderContext' count '8']
+    [simple        uint 32 'options']
+    [reserved      uint 32 '0x00000000']
+    [typeSwitch 'commandType'
+        ['0x0101' CIPEncapsulationConnectionRequest
+        ]
+        ['0x0201' CIPEncapsulationConnectionResponse
+        ]
+        ['0x0107' CIPEncapsulationReadRequest
+            [simple   DF1RequestMessage  'request']
+        ]
+        ['0x0207' CIPEncapsulationReadResponse [uint 16 'len']
+            [simple   DF1ResponseMessage 'response' ['len']]
+        ]
+    ]
+]
+
+[discriminatedType 'DF1RequestMessage'
+    [simple        uint 8  'destinationAddress']
+    [simple        uint 8  'sourceAddress']
+    [reserved      uint 16 '0x0000']
+    [discriminator uint 8  'commandCode']
+    [simple        uint 8  'status']
+    [simple        uint 16 'transactionCounter']
+    [typeSwitch 'commandCode'
+        ['0x0F' DF1CommandRequestMessage
+            [simple DF1RequestCommand 'command']
+        ]
+    ]
+]
+
+[discriminatedType 'DF1ResponseMessage' [uint 16 'payloadLength']
+    [reserved      uint 8  '0x00']
+    [simple        uint 8  'destinationAddress']
+    [simple        uint 8  'sourceAddress']
+    [reserved      uint 8  '0x00']
+    [discriminator uint 8  'commandCode']
+    [simple        uint 8  'status']
+    [simple        uint 16 'transactionCounter']
+    [typeSwitch 'commandCode'
+        ['0x4F' DF1CommandResponseMessageProtectedTypedLogicalRead [uint 8 'status']
+            [array    uint 8 'data' length 'payloadLength - 8']
+        ]
+    ]
+]
+
+[discriminatedType 'DF1RequestCommand'
+    [discriminator    uint 8 'functionCode']
+    [typeSwitch 'functionCode'
+        ['0xA2' DF1RequestProtectedTypedLogicalRead
+            [simple uint 8 'byteSize']
+            [simple uint 8 'fileNumber']
+            [simple uint 8 'fileType']
+            [simple uint 8 'elementNumber']
+            [simple uint 8 'subElementNumber']
+        ]
+    ]
+]
+
+
diff --git a/protocols/bacnetip/pom.xml b/protocols/bacnetip/pom.xml
index 92b05a591d3..84c4bce00f6 100644
--- a/protocols/bacnetip/pom.xml
+++ b/protocols/bacnetip/pom.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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
-  ~
-  ~   http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4x-protocols</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4x-protocols-bacnetip</artifactId>
-
-  <name>Protocols: BACNet/IP</name>
-  <description>Base protocol specifications for the BACNet/IP protocol</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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
+  ~
+  ~   http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4x-protocols</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4x-protocols-bacnetip</artifactId>
+
+  <name>Protocols: BACNet/IP</name>
+  <description>Base protocol specifications for the BACNet/IP protocol</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/protocols/bacnetip/src/main/java/org/apache/plc4x/protocol/bacnetip/BacNetIpProtocol.java b/protocols/bacnetip/src/main/java/org/apache/plc4x/protocol/bacnetip/BacNetIpProtocol.java
index 5f69bdda887..2d7c0086c50 100644
--- a/protocols/bacnetip/src/main/java/org/apache/plc4x/protocol/bacnetip/BacNetIpProtocol.java
+++ b/protocols/bacnetip/src/main/java/org/apache/plc4x/protocol/bacnetip/BacNetIpProtocol.java
@@ -1,47 +1,47 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.protocol.bacnetip;
-
-import org.apache.plc4x.plugins.codegenerator.language.mspec.parser.MessageFormatParser;
-import org.apache.plc4x.plugins.codegenerator.protocol.Protocol;
-import org.apache.plc4x.plugins.codegenerator.types.definitions.ComplexTypeDefinition;
-import org.apache.plc4x.plugins.codegenerator.types.definitions.TypeDefinition;
-import org.apache.plc4x.plugins.codegenerator.types.exceptions.GenerationException;
-
-import java.io.InputStream;
-import java.util.Map;
-
-public class BacNetIpProtocol implements Protocol {
-
-    @Override
-    public String getName() {
-        return "bacnetip";
-    }
-
-    @Override
-    public Map<String, TypeDefinition> getTypeDefinitions() throws GenerationException {
-        InputStream schemaInputStream = BacNetIpProtocol.class.getResourceAsStream("/protocols/bacnetip/bacnetip.mspec");
-        if(schemaInputStream == null) {
-            throw new GenerationException("Error loading message-format schema for protocol '" + getName() + "'");
-        }
-        return new MessageFormatParser().parse(schemaInputStream);
-    }
-
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.protocol.bacnetip;
+
+import org.apache.plc4x.plugins.codegenerator.language.mspec.parser.MessageFormatParser;
+import org.apache.plc4x.plugins.codegenerator.protocol.Protocol;
+import org.apache.plc4x.plugins.codegenerator.types.definitions.ComplexTypeDefinition;
+import org.apache.plc4x.plugins.codegenerator.types.definitions.TypeDefinition;
+import org.apache.plc4x.plugins.codegenerator.types.exceptions.GenerationException;
+
+import java.io.InputStream;
+import java.util.Map;
+
+public class BacNetIpProtocol implements Protocol {
+
+    @Override
+    public String getName() {
+        return "bacnetip";
+    }
+
+    @Override
+    public Map<String, TypeDefinition> getTypeDefinitions() throws GenerationException {
+        InputStream schemaInputStream = BacNetIpProtocol.class.getResourceAsStream("/protocols/bacnetip/bacnetip.mspec");
+        if(schemaInputStream == null) {
+            throw new GenerationException("Error loading message-format schema for protocol '" + getName() + "'");
+        }
+        return new MessageFormatParser().parse(schemaInputStream);
+    }
+
+}
diff --git a/protocols/bacnetip/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol b/protocols/bacnetip/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol
index 3f0b40c941e..32b3266efa9 100644
--- a/protocols/bacnetip/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol
+++ b/protocols/bacnetip/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol
@@ -1,19 +1,19 @@
-#
-# 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
-#
-#   http://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.
-#
+#
+# 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
+#
+#   http://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.
+#
 org.apache.plc4x.protocol.bacnetip.BacNetIpProtocol
\ No newline at end of file
diff --git a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
index f94e776399e..fd3abb29b65 100644
--- a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
+++ b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
@@ -1,677 +1,677 @@
-//
-// 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
-//
-//     http://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.
-//
-
-[discriminatedType 'BVLC'
-    [const         uint 8 'bacnetType' '0x81']
-    [discriminator uint 8 'bvlcFunction']
-    [implicit      uint 16 'bvlcLength' 'lengthInBytes']
-    [typeSwitch 'bvlcFunction'
-        ['0x00' BVLCResult
-        ]
-        ['0x01' BVLCWideBroadcastDistributionTable
-        ]
-        ['0x02' BVLCReadBroadcastDistributionTable
-        ]
-        ['0x03' BVLCReadBroadcastDistributionTableAck
-        ]
-        ['0x04' BVLCForwardedNPDU [uint 16 'bvlcLength']
-            [array  uint 8  'ip' count '4']
-            [simple uint 16 'port']
-            [simple NPDU    'npdu' ['bvlcLength - 10']]
-        ]
-        ['0x05' BVLCRegisterForeignDevice
-        ]
-        ['0x06' BVLCReadForeignDeviceTable
-        ]
-        ['0x07' BVLCReadForeignDeviceTableAck
-        ]
-        ['0x08' BVLCDeleteForeignDeviceTableEntry
-        ]
-        ['0x09' BVLCDistributeBroadcastToNetwork
-        ]
-        ['0x0A' BVLCOriginalUnicastNPDU [uint 16 'bvlcLength']
-            [simple NPDU 'npdu' ['bvlcLength - 4']]
-        ]
-        ['0x0B' BVLCOriginalBroadcastNPDU [uint 16 'bvlcLength']
-            [simple NPDU 'npdu' ['bvlcLength - 4']]
-        ]
-        ['0x0C' BVLCSecureBVLL
-        ]
-    ]
-]
-
-[type 'NPDU' [uint 16 'npduLength']
-    [simple   uint 8        'protocolVersionNumber']
-    [simple   bit           'messageTypeFieldPresent']
-    [reserved uint 1        '0']
-    [simple   bit           'destinationSpecified']
-    [reserved uint 1        '0']
-    [simple   bit           'sourceSpecified']
-    [simple   bit           'expectingReply']
-    [simple   uint 2        'networkPriority']
-    [optional uint 16       'destinationNetworkAddress' 'destinationSpecified']
-    [optional uint 8        'destinationLength'         'destinationSpecified']
-    [array    uint 8        'destinationAddress' count  'destinationSpecified ? destinationLength : 0']
-    [optional uint 16       'sourceNetworkAddress'      'sourceSpecified']
-    [optional uint 8        'sourceLength'              'sourceSpecified']
-    [array    uint 8        'sourceAddress' count       'sourceSpecified ? sourceLength : 0']
-    [optional uint 8        'hopCount'                  'destinationSpecified']
-    [optional NLM           'nlm'                       'messageTypeFieldPresent' ['npduLength - (2 + (sourceSpecified ? 3 + sourceLength : 0) + (destinationSpecified ? 3 + destinationLength: 0) + ((destinationSpecified || sourceSpecified) ? 1 : 0))']]
-    [optional APDU          'apdu'                      '!messageTypeFieldPresent' ['npduLength - (2 + (sourceSpecified ? 3 + sourceLength : 0) + (destinationSpecified ? 3 + destinationLength: 0) + ((destinationSpecified || sourceSpecified) ? 1 : 0))']]
-]
-
-[discriminatedType 'NLM' [uint 16 'apduLength']
-    [discriminator uint 8  'messageType']
-    [optional      uint 16 'vendorId' '(messageType >= 128) && (messageType <= 255)']
-    [typeSwitch 'messageType'
-        ['0x0' NLMWhoIsRouterToNetwork [uint 8  'messageType']
-            [array uint 16 'destinationNetworkAddress' length 'apduLength - (((messageType >= 128) && (messageType <= 255)) ? 3 : 1)']
-        ]
-        ['0x1' NLMIAmRouterToNetwork [uint 8  'messageType']
-            [array uint 16 'destinationNetworkAddress' length 'apduLength - (((messageType >= 128) && (messageType <= 255)) ? 3 : 1)']
-        ]
-    ]
-]
-
-[discriminatedType 'APDU' [uint 16 'apduLength']
-    [discriminator uint 4 'apduType']
-    [typeSwitch 'apduType'
-        ['0x0' APDUConfirmedRequest
-            [simple   bit    'segmentedMessage']
-            [simple   bit    'moreFollows']
-            [simple   bit    'segmentedResponseAccepted']
-            [reserved uint 2 '0']
-            [simple   uint 3 'maxSegmentsAccepted']
-            [simple   uint 4 'maxApduLengthAccepted']
-            [simple   uint 8 'invokeId']
-            [optional uint 8 'sequenceNumber' 'segmentedMessage']
-            [optional uint 8 'proposedWindowSize' 'segmentedMessage']
-            [simple   BACnetConfirmedServiceRequest 'serviceRequest' ['apduLength - (3 + (segmentedMessage ? 2 : 0))']]
-        ]
-        ['0x1' APDUUnconfirmedRequest
-            [reserved uint 4 '0']
-            [simple   BACnetUnconfirmedServiceRequest 'serviceRequest' ['apduLength - 1']]
-        ]
-        ['0x2' APDUSimpleAck
-            [reserved uint 4 '0']
-            [simple   uint 8 'originalInvokeId']
-            [simple   uint 8 'serviceChoice']
-        ]
-        ['0x3' APDUComplexAck
-            [simple   bit    'segmentedMessage']
-            [simple   bit    'moreFollows']
-            [reserved uint 2 '0']
-            [simple   uint 8 'originalInvokeId']
-            [optional uint 8 'sequenceNumber'     'segmentedMessage']
-            [optional uint 8 'proposedWindowSize' 'segmentedMessage']
-            [simple   BACnetServiceAck 'serviceAck']
-        ]
-        ['0x4' APDUSegmentAck
-            [reserved uint 2 '0x00']
-            [simple   bit    'negativeAck']
-            [simple   bit    'server']
-            [simple   uint 8 'originalInvokeId']
-            [simple   uint 8 'sequenceNumber']
-            [simple   uint 8 'proposedWindowSize']
-        ]
-        ['0x5' APDUError
-            [reserved uint 4 '0x00']
-            [simple   uint 8 'originalInvokeId']
-            [simple   BACnetError  'error']
-        ]
-        ['0x6' APDUReject
-            [reserved uint 4 '0x00']
-            [simple   uint 8 'originalInvokeId']
-            [simple   uint 8 'rejectReason']
-        ]
-        ['0x7' APDUAbort
-            [reserved uint 3 '0x00']
-            [simple   bit    'server']
-            [simple   uint 8 'originalInvokeId']
-            [simple   uint 8 'abortReason']
-        ]
-    ]
-]
-
-[discriminatedType 'BACnetConfirmedServiceRequest' [uint 16 'len']
-    [discriminator uint 8 'serviceChoice']
-    [typeSwitch 'serviceChoice'
-        ['0x00' BACnetConfirmedServiceRequestAcknowledgeAlarm
-        ]
-        ['0x01' BACnetConfirmedServiceRequestConfirmedCOVNotification
-            [const uint 8 'subscriberProcessIdentifierHeader' '0x09']
-            [simple uint 8 'subscriberProcessIdentifier']
-            [const uint 8 'monitoredObjectIdentifierHeader' '0x1C']
-            [simple uint 10 'monitoredObjectType']
-            [simple uint 22 'monitoredObjectInstanceNumber']
-            [const uint 8 'issueConfirmedNotificationsHeader' '0x2C']
-            [simple uint 10 'issueConfirmedNotificationsType']
-            [simple uint 22 'issueConfirmedNotificationsInstanceNumber']
-            [const uint 5 'lifetimeHeader' '0x07']
-            [simple uint 3 'lifetimeLength']
-            [array int 8 'lifetimeSeconds' count 'lifetimeLength']
-            [const uint 8 'listOfValuesOpeningTag' '0x4E']
-            [array BACnetTagWithContent 'notifications' length 'len - 18']
-            [const uint 8 'listOfValuesClosingTag' '0x4F']
-        ]
-        ['0x1F' BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple
-        ]
-        ['0x02' BACnetConfirmedServiceRequestConfirmedEventNotification
-        ]
-
-        ['0x04' BACnetConfirmedServiceRequestGetEnrollmentSummary
-        ]
-        ['0x1D' BACnetConfirmedServiceRequestGetEventInformation
-        ]
-        ['0x1B' BACnetConfirmedServiceRequestLifeSafetyOperation
-        ]
-        ['0x05' BACnetConfirmedServiceRequestSubscribeCOV
-            [const uint 8 'subscriberProcessIdentifierHeader' '0x09']
-            [simple uint 8 'subscriberProcessIdentifier']
-            [const uint 8 'monitoredObjectIdentifierHeader' '0x1C']
-            [simple uint 10 'monitoredObjectType']
-            [simple uint 22 'monitoredObjectInstanceNumber']
-            [const uint 8 'issueConfirmedNotificationsHeader' '0x29']
-            [const uint 7 'issueConfirmedNotificationsSkipBits' '0x00']
-            [simple bit 'issueConfirmedNotifications']
-            [const uint 5 'lifetimeHeader' '0x07']
-            [simple uint 3 'lifetimeLength']
-            [array int 8 'lifetimeSeconds' count 'lifetimeLength']
-        ]
-        ['0x1C' BACnetConfirmedServiceRequestSubscribeCOVProperty
-        ]
-        ['0x1E' BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple
-        ]
-
-        ['0x06' BACnetConfirmedServiceRequestAtomicReadFile
-        ]
-        ['0x07' BACnetConfirmedServiceRequestAtomicWriteFile
-        ]
-
-        ['0x08' BACnetConfirmedServiceRequestAddListElement
-        ]
-        ['0x09' BACnetConfirmedServiceRequestRemoveListElement
-        ]
-        ['0x0A' BACnetConfirmedServiceRequestCreateObject
-        ]
-        ['0x0B' BACnetConfirmedServiceRequestDeleteObject
-        ]
-        ['0x0C' BACnetConfirmedServiceRequestReadProperty
-            [const uint 8 'objectIdentifierHeader' '0x0C']
-            [simple uint 10 'objectType']
-            [simple uint 22 'objectInstanceNumber']
-            [const uint 5 'propertyIdentifierHeader' '0x03']
-            [simple uint 3 'propertyIdentifierLength']
-            [array int 8 'propertyIdentifier' count 'propertyIdentifierLength']
-        ]
-        ['0x0E' BACnetConfirmedServiceRequestReadPropertyMultiple
-        ]
-        ['0x1A' BACnetConfirmedServiceRequestReadRange
-        ]
-        ['0x0F' BACnetConfirmedServiceRequestWriteProperty
-            [const uint 8 'objectIdentifierHeader' '0x0C']
-            [simple uint 10 'objectType']
-            [simple uint 22 'objectInstanceNumber']
-            [const uint 5 'propertyIdentifierHeader' '0x03']
-            [simple uint 3 'propertyIdentifierLength']
-            [array int 8 'propertyIdentifier' count 'propertyIdentifierLength']
-            [const uint 8 'openingTag' '0x3E']
-            [simple BACnetTag 'val']
-            [const uint 8 'closingTag' '0x3F']
-            [optional BACnetTag 'priority' 'curPos < (len - 1)']
-        ]
-        ['0x10' BACnetConfirmedServiceRequestWritePropertyMultiple
-        ]
-
-        ['0x11' BACnetConfirmedServiceRequestDeviceCommunicationControl
-        ]
-        ['0x12' BACnetConfirmedServiceRequestConfirmedPrivateTransfer
-        ]
-        ['0x13' BACnetConfirmedServiceRequestConfirmedTextMessage
-        ]
-        ['0x14' BACnetConfirmedServiceRequestReinitializeDevice
-        ]
-
-        ['0x15' BACnetConfirmedServiceRequestVTOpen
-        ]
-        ['0x16' BACnetConfirmedServiceRequestVTClose
-        ]
-        ['0x17' BACnetConfirmedServiceRequestVTData
-        ]
-
-        ['0x18' BACnetConfirmedServiceRequestRemovedAuthenticate
-        ]
-        ['0x19' BACnetConfirmedServiceRequestRemovedRequestKey
-        ]
-        ['0x0D' BACnetConfirmedServiceRequestRemovedReadPropertyConditional
-        ]
-
-        ['0x1A' BACnetConfirmedServiceRequestReadRange
-        ]
-        ['0x1B' BACnetConfirmedServiceRequestLifeSafetyOperation
-        ]
-        ['0x1C' BACnetConfirmedServiceRequestSubscribeCOVProperty
-
-        ]
-        ['0x1D' BACnetConfirmedServiceRequestGetEventInformation
-        ]
-
-        ['0x1E' BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple
-        ]
-        ['0x1F' BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple
-        ]
-    ]
-]
-
-[discriminatedType 'BACnetUnconfirmedServiceRequest' [uint 16 'len']
-    [discriminator uint 8 'serviceChoice']
-    [typeSwitch 'serviceChoice'
-        ['0x00' BACnetUnconfirmedServiceRequestIAm
-            [const uint 8 'objectIdentifierHeader' '0xC4']
-            [simple uint 10 'objectType']
-            [simple uint 22 'objectInstanceNumber']
-            [const uint 5 'maximumApduLengthAcceptedHeader' '0x04']
-            [simple uint 3 'maximumApduLengthAcceptedLength']
-            [array int 8 'maximumApduLengthAccepted' count 'maximumApduLengthAcceptedLength']
-            [const uint 8 'segmentationSupportedHeader' '0x91']
-            [simple uint 8 'segmentationSupported']
-            [const uint 8 'vendorIdHeader' '0x21']
-            [simple uint 8 'vendorId']
-        ]
-        ['0x01' BACnetUnconfirmedServiceRequestIHave
-        ]
-        ['0x02' BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification
-        ]
-        ['0x03' BACnetUnconfirmedServiceRequestUnconfirmedEventNotification
-        ]
-        ['0x04' BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer
-            [const uint 8 'vendorIdHeader' '0x09']
-            [simple uint 8 'vendorId']
-            [const uint 8 'serviceNumberHeader' '0x1A']
-            [simple uint 16 'serviceNumber']
-            [const uint 8 'listOfValuesOpeningTag' '0x2E']
-            [array int 8 'values' length 'len - 8']
-            [const uint 8 'listOfValuesClosingTag' '0x2F']
-        ]
-        ['0x05' BACnetUnconfirmedServiceRequestUnconfirmedTextMessage
-        ]
-        ['0x06' BACnetUnconfirmedServiceRequestTimeSynchronization
-        ]
-        ['0x07' BACnetUnconfirmedServiceRequestWhoHas
-            [const uint 8 'deviceInstanceLowLimitHeader' '0x0B']
-            [simple uint 24 'deviceInstanceLowLimit']
-            [const uint 8 'deviceInstanceHighLimitHeader' '0x1B']
-            [simple uint 24 'deviceInstanceHighLimit']
-            [const uint 8 'objectNameHeader' '0x3D']
-            [implicit uint 8 'objectNameLength' 'COUNT(objectName) + 1']
-            [simple uint 8 'objectNameCharacterSet']
-            [array int 8 'objectName' length 'objectNameLength - 1']
-        ]
-        ['0x08' BACnetUnconfirmedServiceRequestWhoIs
-            [const uint 5 'deviceInstanceRangeLowLimitHeader' '0x01']
-            [simple uint 3 'deviceInstanceRangeLowLimitLength']
-            [array int 8 'deviceInstanceRangeLowLimit' count 'deviceInstanceRangeLowLimitLength']
-            [const uint 5 'deviceInstanceRangeHighLimitHeader' '0x03']
-            [simple uint 3 'deviceInstanceRangeHighLimitLength']
-            [array int 8 'deviceInstanceRangeHighLimit' count 'deviceInstanceRangeHighLimitLength']
-        ]
-        ['0x09' BACnetUnconfirmedServiceRequestUTCTimeSynchronization
-        ]
-        ['0x0A' BACnetUnconfirmedServiceRequestWriteGroup
-        ]
-        ['0x0B' BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple
-        ]
-    ]
-]
-
-[discriminatedType 'BACnetServiceAck'
-    [discriminator   uint 8 'serviceChoice']
-    [typeSwitch 'serviceChoice'
-        ['0x03' BACnetServiceAckGetAlarmSummary
-
-        ]
-        ['0x04' BACnetServiceAckGetEnrollmentSummary
-
-        ]
-        ['0x1D' BACnetServiceAckGetEventInformation
-
-        ]
-
-        ['0x06' BACnetServiceAckAtomicReadFile
-
-        ]
-        ['0x07' BACnetServiceAckAtomicWriteFile
-
-        ]
-
-        ['0x0A' BACnetServiceAckCreateObject
-
-        ]
-        ['0x0C' BACnetServiceAckReadProperty
-            [const uint 8 'objectIdentifierHeader' '0x0C']
-            [simple uint 10 'objectType']
-            [simple uint 22 'objectInstanceNumber']
-            [const uint 5 'propertyIdentifierHeader' '0x03']
-            [simple uint 3 'propertyIdentifierLength']
-            [array int 8 'propertyIdentifier' count 'propertyIdentifierLength']
-            [const uint 8 'openingTag' '0x3E']
-            [simple BACnetTag 'val']
-            [const uint 8 'closingTag' '0x3F']
-        ]
-        ['0x0E' BACnetServiceAckReadPropertyMultiple
-
-        ]
-        ['0x1A' BACnetServiceAckReadRange
-
-        ]
-
-        ['0x12' BACnetServiceAckConfirmedPrivateTransfer
-
-        ]
-
-        ['0x15' BACnetServiceAckVTOpen
-
-        ]
-        ['0x17' BACnetServiceAckVTData
-
-        ]
-
-        ['0x18' BACnetServiceAckRemovedAuthenticate
-
-        ]
-        ['0x0D' BACnetServiceAckRemovedReadPropertyConditional
-
-        ]
-    ]
-]
-
-[discriminatedType 'BACnetConfirmedServiceACK'
-    [discriminator uint 8 'serviceChoice']
-    [typeSwitch 'serviceChoice'
-        ['0x03' BACnetConfirmedServiceACKGetAlarmSummary
-        ]
-        ['0x04' BACnetConfirmedServiceACKGetEnrollmentSummary
-        ]
-        ['0x1D' BACnetConfirmedServiceACKGetEventInformation
-        ]
-
-        ['0x06' BACnetConfirmedServiceACKAtomicReadFile
-        ]
-        ['0x07' BACnetConfirmedServiceACKAtomicWriteFile
-        ]
-
-        ['0x0A' BACnetConfirmedServiceACKCreateObject
-        ]
-        ['0x0C' BACnetConfirmedServiceACKReadProperty
-        ]
-        ['0x0E' BACnetConfirmedServiceACKReadPropertyMultiple
-        ]
-        ['0x1A' BACnetConfirmedServiceACKReadRange
-        ]
-
-        ['0x12' BACnetConfirmedServiceACKConfirmedPrivateTransfer
-        ]
-
-        ['0x15' BACnetConfirmedServiceACKVTOpen
-        ]
-        ['0x17' BACnetConfirmedServiceACKVTData
-        ]
-
-        ['0x18' BACnetConfirmedServiceACKRemovedAuthenticate
-        ]
-        ['0x0D' BACnetConfirmedServiceACKRemovedReadPropertyConditional
-        ]
-    ]
-]
-
-[discriminatedType 'BACnetError'
-    [discriminator uint 8 'serviceChoice']
-    [typeSwitch 'serviceChoice'
-        ['0x03' BACnetErrorGetAlarmSummary
-        ]
-        ['0x04' BACnetErrorGetEnrollmentSummary
-        ]
-        ['0x1D' BACnetErrorGetEventInformation
-        ]
-
-        ['0x06' BACnetErrorAtomicReadFile
-        ]
-        ['0x07' BACnetErrorAtomicWriteFile
-        ]
-
-        ['0x0A' BACnetErrorCreateObject
-        ]
-        ['0x0C' BACnetErrorReadProperty
-            [const uint 5 'errorClassHeader' '0x12']
-            [simple uint 3 'errorClassLength']
-            [array int 8 'errorClass' count 'errorClassLength']
-            [const uint 5 'errorCodeHeader' '0x12']
-            [simple uint 3 'errorCodeLength']
-            [array int 8 'errorCode' count 'errorCodeLength']
-        ]
-        ['0x0E' BACnetErrorReadPropertyMultiple
-        ]
-        ['0x1A' BACnetErrorReadRange
-        ]
-
-        ['0x12' BACnetErrorConfirmedPrivateTransfer
-        ]
-
-        ['0x15' BACnetErrorVTOpen
-        ]
-        ['0x17' BACnetErrorVTData
-        ]
-
-        ['0x18' BACnetErrorRemovedAuthenticate
-        ]
-        ['0x0D' BACnetErrorRemovedReadPropertyConditional
-        ]
-    ]
-]
-
-[type 'BACnetAddress'
-    [array  uint 8 'address' count '4']
-    [simple uint 16 'port']
-]
-
-[type 'BACnetTagWithContent'
-    [simple        uint 4 'typeOrTagNumber']
-    [simple        uint 1 'contextSpecificTag']
-    [simple        uint 3 'lengthValueType']
-    [optional      uint 8 'extTagNumber' 'typeOrTagNumber == 15']
-    [optional      uint 8 'extLength' 'lengthValueType == 5']
-    [array         uint 8 'propertyIdentifier' length '(lengthValueType == 5) ? extLength : lengthValueType']
-    [const         uint 8 'openTag' '0x2e']
-    [simple        BACnetTag 'val']
-    [const         uint 8 'closingTag' '0x2f']
-]
-
-[discriminatedType 'BACnetTag'
-    [simple        uint 4 'typeOrTagNumber']
-    [discriminator uint 1 'contextSpecificTag']
-    [simple        uint 3 'lengthValueType']
-    [optional      uint 8 'extTagNumber' 'typeOrTagNumber == 15']
-    [optional      uint 8 'extLength' 'lengthValueType == 5']
-    [typeSwitch 'contextSpecificTag','typeOrTagNumber'
-        ['0','0x0' BACnetTagApplicationNull
-        ]
-        ['0','0x1' BACnetTagApplicationBoolean
-        ]
-        ['0','0x2' BACnetTagApplicationUnsignedInteger [uint 3 'lengthValueType', uint 8 'extLength']
-            [array int 8 'data' length '(lengthValueType == 5) ? extLength : lengthValueType']
-        ]
-        ['0','0x3' BACnetTagApplicationSignedInteger [uint 3 'lengthValueType', uint 8 'extLength']
-            [array int 8 'data' length '(lengthValueType == 5) ? extLength : lengthValueType']
-        ]
-        ['0','0x4' BACnetTagApplicationReal [uint 3 'lengthValueType', uint 8 'extLength']
-            [array int 8 'data' length '(lengthValueType == 5) ? extLength : lengthValueType']
-        ]
-        ['0','0x5' BACnetTagApplicationDouble [uint 3 'lengthValueType', uint 8 'extLength']
-            [array int 8 'data' length '(lengthValueType == 5) ? extLength : lengthValueType']
-        ]
-        ['0','0x6' BACnetTagApplicationOctetString
-        ]
-        ['0','0x7' BACnetTagApplicationCharacterString
-        ]
-        ['0','0x8' BACnetTagApplicationBitString [uint 3 'lengthValueType', uint 8 'extLength']
-            [simple uint 8 'unusedBits']
-            [array int 8 'data' length '(lengthValueType == 5) ? (extLength - 1) : (lengthValueType - 1)']
-        ]
-        ['0','0x9' BACnetTagApplicationEnumerated [uint 3 'lengthValueType', uint 8 'extLength']
-            [array int 8 'data' length '(lengthValueType == 5) ? extLength : lengthValueType']
-        ]
-        ['0','0xA' BACnetTagApplicationDate
-        ]
-        ['0','0xB' BACnetTagApplicationTime
-        ]
-        ['0','0xC' BACnetTagApplicationObjectIdentifier
-        ]
-        ['1' BACnetTagContext [uint 4 'typeOrTagNumber', uint 8 'extTagNumber', uint 3 'lengthValueType', uint 8 'extLength']
-            [array int 8 'data' length '(lengthValueType == 5) ? extLength : lengthValueType']
-        ]
-    ]
-]
-
-[enum int 4 'ApplicationTag'
-    ['0x0' NULL]
-    ['0x1' BOOLEAN]
-    ['0x2' UNSIGNED_INTEGER]
-    ['0x3' SIGNED_INTEGER]
-    ['0x4' REAL]
-    ['0x5' DOUBLE]
-    ['0x6' OCTET_STRING]
-    ['0x7' CHARACTER_STRING]
-    ['0x8' BIT_STRING]
-    ['0x9' ENUMERATED]
-    ['0xA' DATE]
-    ['0xB' TIME]
-    ['0xC' BACNET_OBJECT_IDENTIFIER]
-]
-
-[enum uint 4 'BACnetNetworkType'
-    ['0x0' ETHERNET]
-    ['0x1' ARCNET]
-    ['0x2' MSTP]
-    ['0x3' PTP]
-    ['0x4' LONTALK]
-    ['0x5' IPV4]
-    ['0x6' ZIGBEE]
-    ['0x7' VIRTUAL]
-    ['0x8' REMOVED_NON_BACNET]
-    ['0x9' IPV6]
-    ['0xA' SERIAL]
-]
-
-[enum uint 8 'BACnetNodeType'
-    ['0x00' UNKNOWN]
-    ['0x01' SYSTEM]
-    ['0x02' NETWORK]
-    ['0x03' DEVICE]
-    ['0x04' ORGANIZATIONAL]
-    ['0x05' AREA]
-    ['0x06' EQUIPMENT]
-    ['0x07' POINT]
-    ['0x08' COLLECTION]
-    ['0x09' PROPERTY]
-    ['0x0A' FUNCTIONAL]
-    ['0x0B' OTHER]
-    ['0x0C' SUBSYSTEM]
-    ['0x0D' BUILDING]
-    ['0x0E' FLOOR]
-    ['0x0F' SECTION]
-    ['0x10' MODULE]
-    ['0x11' TREE]
-    ['0x12' MEMBER]
-    ['0x13' PROTOCOL]
-    ['0x14' ROOM]
-    ['0x15' ZONE]
-]
-
-[enum uint 4 'BACnetNotifyType'
-    ['0x0' ALARM]
-    ['0x1' EVENT]
-    ['0x2' ACK_NOTIFICATION]
-]
-
-[enum uint 10 'BACnetObjectType'
-    ['0x000' ANALOG_INPUT]
-    ['0x001' ANALOG_OUTPUT]
-    ['0x002' ANALOG_VALUE]
-
-    ['0x003' BINARY_INPUT]
-    ['0x004' BINARY_OUTPUT]
-    ['0x005' BINARY_VALUE]
-
-    ['0x00D' MULTISTATE_INPUT]
-    ['0x00E' MULTISTATE_OUTPUT]
-    ['0x013' MULTISTATE_VALUE]
-
-    ['0x011' SCHEDULE]
-
-    ['0x008' DEVICE]
-
-    ['0x006' CALENDAR]
-    ['0x007' COMMAND]
-    ['0x009' EVENT_ENROLLMENT]
-    ['0x00A' FILE]
-    ['0x00B' GROUP]
-    ['0x00C' LOOP]
-    ['0x00F' NOTIFICATION_CLASS]
-    ['0x010' PROGRAM]
-    ['0x012' AVERAGING]
-    ['0x014' TREND_LOG]
-    ['0x015' LIFE_SAFETY_POINT]
-    ['0x016' LIFE_SAFETY_ZONE]
-    ['0x017' ACCUMULATOR]
-    ['0x018' PULSE_CONVERTER]
-    ['0x019' EVENT_LOG]
-    ['0x01A' GLOBAL_GROUP]
-    ['0x01B' TREND_LOG_MULTIPLE]
-    ['0x01C' LOAD_CONTROL]
-    ['0x01D' STRUCTURED_VIEW]
-    ['0x01E' ACCESS_DOOR]
-    ['0x01F' TIMER]
-    ['0x020' ACCESS_CREDENTIAL]
-    ['0x021' ACCESS_POINT]
-    ['0x022' ACCESS_RIGHTS]
-    ['0x023' ACCESS_USER]
-    ['0x024' ACCESS_ZONE]
-    ['0x025' CREDENTIAL_DATA_INPUT]
-    ['0x026' NETWORK_SECURITY]
-    ['0x027' BITSTRING_VALUE]
-    ['0x028' CHARACTERSTRING_VALUE]
-    ['0x029' DATEPATTERN_VALUE]
-    ['0x02A' DATE_VALUE]
-    ['0x02B' DATETIMEPATTERN_VALUE]
-    ['0x02C' DATETIME_VALUE]
-    ['0x02D' INTEGER_VALUE]
-    ['0x02E' LARGE_ANALOG_VALUE]
-    ['0x02F' OCTETSTRING_VALUE]
-    ['0x030' POSITIVE_INTEGER_VALUE]
-    ['0x031' TIMEPATTERN_VALUE]
-    ['0x032' TIME_VALUE]
-    ['0x033' NOTIFICATION_FORWARDER]
-    ['0x034' ALERT_ENROLLMENT]
-    ['0x035' CHANNEL]
-    ['0x036' LIGHTING_OUTPUT]
-    ['0x037' BINARY_LIGHTING_OUTPUT]
-    ['0x038' NETWORK_PORT]
-    ['0x039' ELEVATOR_GROUP]
-    ['0x03A' ESCALATOR]
-]
+//
+// 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
+//
+//     http://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.
+//
+
+[discriminatedType 'BVLC'
+    [const         uint 8 'bacnetType' '0x81']
+    [discriminator uint 8 'bvlcFunction']
+    [implicit      uint 16 'bvlcLength' 'lengthInBytes']
+    [typeSwitch 'bvlcFunction'
+        ['0x00' BVLCResult
+        ]
+        ['0x01' BVLCWideBroadcastDistributionTable
+        ]
+        ['0x02' BVLCReadBroadcastDistributionTable
+        ]
+        ['0x03' BVLCReadBroadcastDistributionTableAck
+        ]
+        ['0x04' BVLCForwardedNPDU [uint 16 'bvlcLength']
+            [array  uint 8  'ip' count '4']
+            [simple uint 16 'port']
+            [simple NPDU    'npdu' ['bvlcLength - 10']]
+        ]
+        ['0x05' BVLCRegisterForeignDevice
+        ]
+        ['0x06' BVLCReadForeignDeviceTable
+        ]
+        ['0x07' BVLCReadForeignDeviceTableAck
+        ]
+        ['0x08' BVLCDeleteForeignDeviceTableEntry
+        ]
+        ['0x09' BVLCDistributeBroadcastToNetwork
+        ]
+        ['0x0A' BVLCOriginalUnicastNPDU [uint 16 'bvlcLength']
+            [simple NPDU 'npdu' ['bvlcLength - 4']]
+        ]
+        ['0x0B' BVLCOriginalBroadcastNPDU [uint 16 'bvlcLength']
+            [simple NPDU 'npdu' ['bvlcLength - 4']]
+        ]
+        ['0x0C' BVLCSecureBVLL
+        ]
+    ]
+]
+
+[type 'NPDU' [uint 16 'npduLength']
+    [simple   uint 8        'protocolVersionNumber']
+    [simple   bit           'messageTypeFieldPresent']
+    [reserved uint 1        '0']
+    [simple   bit           'destinationSpecified']
+    [reserved uint 1        '0']
+    [simple   bit           'sourceSpecified']
+    [simple   bit           'expectingReply']
+    [simple   uint 2        'networkPriority']
+    [optional uint 16       'destinationNetworkAddress' 'destinationSpecified']
+    [optional uint 8        'destinationLength'         'destinationSpecified']
+    [array    uint 8        'destinationAddress' count  'destinationSpecified ? destinationLength : 0']
+    [optional uint 16       'sourceNetworkAddress'      'sourceSpecified']
+    [optional uint 8        'sourceLength'              'sourceSpecified']
+    [array    uint 8        'sourceAddress' count       'sourceSpecified ? sourceLength : 0']
+    [optional uint 8        'hopCount'                  'destinationSpecified']
+    [optional NLM           'nlm'                       'messageTypeFieldPresent' ['npduLength - (2 + (sourceSpecified ? 3 + sourceLength : 0) + (destinationSpecified ? 3 + destinationLength: 0) + ((destinationSpecified || sourceSpecified) ? 1 : 0))']]
+    [optional APDU          'apdu'                      '!messageTypeFieldPresent' ['npduLength - (2 + (sourceSpecified ? 3 + sourceLength : 0) + (destinationSpecified ? 3 + destinationLength: 0) + ((destinationSpecified || sourceSpecified) ? 1 : 0))']]
+]
+
+[discriminatedType 'NLM' [uint 16 'apduLength']
+    [discriminator uint 8  'messageType']
+    [optional      uint 16 'vendorId' '(messageType >= 128) && (messageType <= 255)']
+    [typeSwitch 'messageType'
+        ['0x0' NLMWhoIsRouterToNetwork [uint 8  'messageType']
+            [array uint 16 'destinationNetworkAddress' length 'apduLength - (((messageType >= 128) && (messageType <= 255)) ? 3 : 1)']
+        ]
+        ['0x1' NLMIAmRouterToNetwork [uint 8  'messageType']
+            [array uint 16 'destinationNetworkAddress' length 'apduLength - (((messageType >= 128) && (messageType <= 255)) ? 3 : 1)']
+        ]
+    ]
+]
+
+[discriminatedType 'APDU' [uint 16 'apduLength']
+    [discriminator uint 4 'apduType']
+    [typeSwitch 'apduType'
+        ['0x0' APDUConfirmedRequest
+            [simple   bit    'segmentedMessage']
+            [simple   bit    'moreFollows']
+            [simple   bit    'segmentedResponseAccepted']
+            [reserved uint 2 '0']
+            [simple   uint 3 'maxSegmentsAccepted']
+            [simple   uint 4 'maxApduLengthAccepted']
+            [simple   uint 8 'invokeId']
+            [optional uint 8 'sequenceNumber' 'segmentedMessage']
+            [optional uint 8 'proposedWindowSize' 'segmentedMessage']
+            [simple   BACnetConfirmedServiceRequest 'serviceRequest' ['apduLength - (3 + (segmentedMessage ? 2 : 0))']]
+        ]
+        ['0x1' APDUUnconfirmedRequest
+            [reserved uint 4 '0']
+            [simple   BACnetUnconfirmedServiceRequest 'serviceRequest' ['apduLength - 1']]
+        ]
+        ['0x2' APDUSimpleAck
+            [reserved uint 4 '0']
+            [simple   uint 8 'originalInvokeId']
+            [simple   uint 8 'serviceChoice']
+        ]
+        ['0x3' APDUComplexAck
+            [simple   bit    'segmentedMessage']
+            [simple   bit    'moreFollows']
+            [reserved uint 2 '0']
+            [simple   uint 8 'originalInvokeId']
+            [optional uint 8 'sequenceNumber'     'segmentedMessage']
+            [optional uint 8 'proposedWindowSize' 'segmentedMessage']
+            [simple   BACnetServiceAck 'serviceAck']
+        ]
+        ['0x4' APDUSegmentAck
+            [reserved uint 2 '0x00']
+            [simple   bit    'negativeAck']
+            [simple   bit    'server']
+            [simple   uint 8 'originalInvokeId']
+            [simple   uint 8 'sequenceNumber']
+            [simple   uint 8 'proposedWindowSize']
+        ]
+        ['0x5' APDUError
+            [reserved uint 4 '0x00']
+            [simple   uint 8 'originalInvokeId']
+            [simple   BACnetError  'error']
+        ]
+        ['0x6' APDUReject
+            [reserved uint 4 '0x00']
+            [simple   uint 8 'originalInvokeId']
+            [simple   uint 8 'rejectReason']
+        ]
+        ['0x7' APDUAbort
+            [reserved uint 3 '0x00']
+            [simple   bit    'server']
+            [simple   uint 8 'originalInvokeId']
+            [simple   uint 8 'abortReason']
+        ]
+    ]
+]
+
+[discriminatedType 'BACnetConfirmedServiceRequest' [uint 16 'len']
+    [discriminator uint 8 'serviceChoice']
+    [typeSwitch 'serviceChoice'
+        ['0x00' BACnetConfirmedServiceRequestAcknowledgeAlarm
+        ]
+        ['0x01' BACnetConfirmedServiceRequestConfirmedCOVNotification
+            [const uint 8 'subscriberProcessIdentifierHeader' '0x09']
+            [simple uint 8 'subscriberProcessIdentifier']
+            [const uint 8 'monitoredObjectIdentifierHeader' '0x1C']
+            [simple uint 10 'monitoredObjectType']
+            [simple uint 22 'monitoredObjectInstanceNumber']
+            [const uint 8 'issueConfirmedNotificationsHeader' '0x2C']
+            [simple uint 10 'issueConfirmedNotificationsType']
+            [simple uint 22 'issueConfirmedNotificationsInstanceNumber']
+            [const uint 5 'lifetimeHeader' '0x07']
+            [simple uint 3 'lifetimeLength']
+            [array int 8 'lifetimeSeconds' count 'lifetimeLength']
+            [const uint 8 'listOfValuesOpeningTag' '0x4E']
+            [array BACnetTagWithContent 'notifications' length 'len - 18']
+            [const uint 8 'listOfValuesClosingTag' '0x4F']
+        ]
+        ['0x1F' BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple
+        ]
+        ['0x02' BACnetConfirmedServiceRequestConfirmedEventNotification
+        ]
+
+        ['0x04' BACnetConfirmedServiceRequestGetEnrollmentSummary
+        ]
+        ['0x1D' BACnetConfirmedServiceRequestGetEventInformation
+        ]
+        ['0x1B' BACnetConfirmedServiceRequestLifeSafetyOperation
+        ]
+        ['0x05' BACnetConfirmedServiceRequestSubscribeCOV
+            [const uint 8 'subscriberProcessIdentifierHeader' '0x09']
+            [simple uint 8 'subscriberProcessIdentifier']
+            [const uint 8 'monitoredObjectIdentifierHeader' '0x1C']
+            [simple uint 10 'monitoredObjectType']
+            [simple uint 22 'monitoredObjectInstanceNumber']
+            [const uint 8 'issueConfirmedNotificationsHeader' '0x29']
+            [const uint 7 'issueConfirmedNotificationsSkipBits' '0x00']
+            [simple bit 'issueConfirmedNotifications']
+            [const uint 5 'lifetimeHeader' '0x07']
+            [simple uint 3 'lifetimeLength']
+            [array int 8 'lifetimeSeconds' count 'lifetimeLength']
+        ]
+        ['0x1C' BACnetConfirmedServiceRequestSubscribeCOVProperty
+        ]
+        ['0x1E' BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple
+        ]
+
+        ['0x06' BACnetConfirmedServiceRequestAtomicReadFile
+        ]
+        ['0x07' BACnetConfirmedServiceRequestAtomicWriteFile
+        ]
+
+        ['0x08' BACnetConfirmedServiceRequestAddListElement
+        ]
+        ['0x09' BACnetConfirmedServiceRequestRemoveListElement
+        ]
+        ['0x0A' BACnetConfirmedServiceRequestCreateObject
+        ]
+        ['0x0B' BACnetConfirmedServiceRequestDeleteObject
+        ]
+        ['0x0C' BACnetConfirmedServiceRequestReadProperty
+            [const uint 8 'objectIdentifierHeader' '0x0C']
+            [simple uint 10 'objectType']
+            [simple uint 22 'objectInstanceNumber']
+            [const uint 5 'propertyIdentifierHeader' '0x03']
+            [simple uint 3 'propertyIdentifierLength']
+            [array int 8 'propertyIdentifier' count 'propertyIdentifierLength']
+        ]
+        ['0x0E' BACnetConfirmedServiceRequestReadPropertyMultiple
+        ]
+        ['0x1A' BACnetConfirmedServiceRequestReadRange
+        ]
+        ['0x0F' BACnetConfirmedServiceRequestWriteProperty
+            [const uint 8 'objectIdentifierHeader' '0x0C']
+            [simple uint 10 'objectType']
+            [simple uint 22 'objectInstanceNumber']
+            [const uint 5 'propertyIdentifierHeader' '0x03']
+            [simple uint 3 'propertyIdentifierLength']
+            [array int 8 'propertyIdentifier' count 'propertyIdentifierLength']
+            [const uint 8 'openingTag' '0x3E']
+            [simple BACnetTag 'val']
+            [const uint 8 'closingTag' '0x3F']
+            [optional BACnetTag 'priority' 'curPos < (len - 1)']
+        ]
+        ['0x10' BACnetConfirmedServiceRequestWritePropertyMultiple
+        ]
+
+        ['0x11' BACnetConfirmedServiceRequestDeviceCommunicationControl
+        ]
+        ['0x12' BACnetConfirmedServiceRequestConfirmedPrivateTransfer
+        ]
+        ['0x13' BACnetConfirmedServiceRequestConfirmedTextMessage
+        ]
+        ['0x14' BACnetConfirmedServiceRequestReinitializeDevice
+        ]
+
+        ['0x15' BACnetConfirmedServiceRequestVTOpen
+        ]
+        ['0x16' BACnetConfirmedServiceRequestVTClose
+        ]
+        ['0x17' BACnetConfirmedServiceRequestVTData
+        ]
+
+        ['0x18' BACnetConfirmedServiceRequestRemovedAuthenticate
+        ]
+        ['0x19' BACnetConfirmedServiceRequestRemovedRequestKey
+        ]
+        ['0x0D' BACnetConfirmedServiceRequestRemovedReadPropertyConditional
+        ]
+
+        ['0x1A' BACnetConfirmedServiceRequestReadRange
+        ]
+        ['0x1B' BACnetConfirmedServiceRequestLifeSafetyOperation
+        ]
+        ['0x1C' BACnetConfirmedServiceRequestSubscribeCOVProperty
+
+        ]
+        ['0x1D' BACnetConfirmedServiceRequestGetEventInformation
+        ]
+
+        ['0x1E' BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple
+        ]
+        ['0x1F' BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple
+        ]
+    ]
+]
+
+[discriminatedType 'BACnetUnconfirmedServiceRequest' [uint 16 'len']
+    [discriminator uint 8 'serviceChoice']
+    [typeSwitch 'serviceChoice'
+        ['0x00' BACnetUnconfirmedServiceRequestIAm
+            [const uint 8 'objectIdentifierHeader' '0xC4']
+            [simple uint 10 'objectType']
+            [simple uint 22 'objectInstanceNumber']
+            [const uint 5 'maximumApduLengthAcceptedHeader' '0x04']
+            [simple uint 3 'maximumApduLengthAcceptedLength']
+            [array int 8 'maximumApduLengthAccepted' count 'maximumApduLengthAcceptedLength']
+            [const uint 8 'segmentationSupportedHeader' '0x91']
+            [simple uint 8 'segmentationSupported']
+            [const uint 8 'vendorIdHeader' '0x21']
+            [simple uint 8 'vendorId']
+        ]
+        ['0x01' BACnetUnconfirmedServiceRequestIHave
+        ]
+        ['0x02' BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification
+        ]
+        ['0x03' BACnetUnconfirmedServiceRequestUnconfirmedEventNotification
+        ]
+        ['0x04' BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer
+            [const uint 8 'vendorIdHeader' '0x09']
+            [simple uint 8 'vendorId']
+            [const uint 8 'serviceNumberHeader' '0x1A']
+            [simple uint 16 'serviceNumber']
+            [const uint 8 'listOfValuesOpeningTag' '0x2E']
+            [array int 8 'values' length 'len - 8']
+            [const uint 8 'listOfValuesClosingTag' '0x2F']
+        ]
+        ['0x05' BACnetUnconfirmedServiceRequestUnconfirmedTextMessage
+        ]
+        ['0x06' BACnetUnconfirmedServiceRequestTimeSynchronization
+        ]
+        ['0x07' BACnetUnconfirmedServiceRequestWhoHas
+            [const uint 8 'deviceInstanceLowLimitHeader' '0x0B']
+            [simple uint 24 'deviceInstanceLowLimit']
+            [const uint 8 'deviceInstanceHighLimitHeader' '0x1B']
+            [simple uint 24 'deviceInstanceHighLimit']
+            [const uint 8 'objectNameHeader' '0x3D']
+            [implicit uint 8 'objectNameLength' 'COUNT(objectName) + 1']
+            [simple uint 8 'objectNameCharacterSet']
+            [array int 8 'objectName' length 'objectNameLength - 1']
+        ]
+        ['0x08' BACnetUnconfirmedServiceRequestWhoIs
+            [const uint 5 'deviceInstanceRangeLowLimitHeader' '0x01']
+            [simple uint 3 'deviceInstanceRangeLowLimitLength']
+            [array int 8 'deviceInstanceRangeLowLimit' count 'deviceInstanceRangeLowLimitLength']
+            [const uint 5 'deviceInstanceRangeHighLimitHeader' '0x03']
+            [simple uint 3 'deviceInstanceRangeHighLimitLength']
+            [array int 8 'deviceInstanceRangeHighLimit' count 'deviceInstanceRangeHighLimitLength']
+        ]
+        ['0x09' BACnetUnconfirmedServiceRequestUTCTimeSynchronization
+        ]
+        ['0x0A' BACnetUnconfirmedServiceRequestWriteGroup
+        ]
+        ['0x0B' BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple
+        ]
+    ]
+]
+
+[discriminatedType 'BACnetServiceAck'
+    [discriminator   uint 8 'serviceChoice']
+    [typeSwitch 'serviceChoice'
+        ['0x03' BACnetServiceAckGetAlarmSummary
+
+        ]
+        ['0x04' BACnetServiceAckGetEnrollmentSummary
+
+        ]
+        ['0x1D' BACnetServiceAckGetEventInformation
+
+        ]
+
+        ['0x06' BACnetServiceAckAtomicReadFile
+
+        ]
+        ['0x07' BACnetServiceAckAtomicWriteFile
+
+        ]
+
+        ['0x0A' BACnetServiceAckCreateObject
+
+        ]
+        ['0x0C' BACnetServiceAckReadProperty
+            [const uint 8 'objectIdentifierHeader' '0x0C']
+            [simple uint 10 'objectType']
+            [simple uint 22 'objectInstanceNumber']
+            [const uint 5 'propertyIdentifierHeader' '0x03']
+            [simple uint 3 'propertyIdentifierLength']
+            [array int 8 'propertyIdentifier' count 'propertyIdentifierLength']
+            [const uint 8 'openingTag' '0x3E']
+            [simple BACnetTag 'val']
+            [const uint 8 'closingTag' '0x3F']
+        ]
+        ['0x0E' BACnetServiceAckReadPropertyMultiple
+
+        ]
+        ['0x1A' BACnetServiceAckReadRange
+
+        ]
+
+        ['0x12' BACnetServiceAckConfirmedPrivateTransfer
+
+        ]
+
+        ['0x15' BACnetServiceAckVTOpen
+
+        ]
+        ['0x17' BACnetServiceAckVTData
+
+        ]
+
+        ['0x18' BACnetServiceAckRemovedAuthenticate
+
+        ]
+        ['0x0D' BACnetServiceAckRemovedReadPropertyConditional
+
+        ]
+    ]
+]
+
+[discriminatedType 'BACnetConfirmedServiceACK'
+    [discriminator uint 8 'serviceChoice']
+    [typeSwitch 'serviceChoice'
+        ['0x03' BACnetConfirmedServiceACKGetAlarmSummary
+        ]
+        ['0x04' BACnetConfirmedServiceACKGetEnrollmentSummary
+        ]
+        ['0x1D' BACnetConfirmedServiceACKGetEventInformation
+        ]
+
+        ['0x06' BACnetConfirmedServiceACKAtomicReadFile
+        ]
+        ['0x07' BACnetConfirmedServiceACKAtomicWriteFile
+        ]
+
+        ['0x0A' BACnetConfirmedServiceACKCreateObject
+        ]
+        ['0x0C' BACnetConfirmedServiceACKReadProperty
+        ]
+        ['0x0E' BACnetConfirmedServiceACKReadPropertyMultiple
+        ]
+        ['0x1A' BACnetConfirmedServiceACKReadRange
+        ]
+
+        ['0x12' BACnetConfirmedServiceACKConfirmedPrivateTransfer
+        ]
+
+        ['0x15' BACnetConfirmedServiceACKVTOpen
+        ]
+        ['0x17' BACnetConfirmedServiceACKVTData
+        ]
+
+        ['0x18' BACnetConfirmedServiceACKRemovedAuthenticate
+        ]
+        ['0x0D' BACnetConfirmedServiceACKRemovedReadPropertyConditional
+        ]
+    ]
+]
+
+[discriminatedType 'BACnetError'
+    [discriminator uint 8 'serviceChoice']
+    [typeSwitch 'serviceChoice'
+        ['0x03' BACnetErrorGetAlarmSummary
+        ]
+        ['0x04' BACnetErrorGetEnrollmentSummary
+        ]
+        ['0x1D' BACnetErrorGetEventInformation
+        ]
+
+        ['0x06' BACnetErrorAtomicReadFile
+        ]
+        ['0x07' BACnetErrorAtomicWriteFile
+        ]
+
+        ['0x0A' BACnetErrorCreateObject
+        ]
+        ['0x0C' BACnetErrorReadProperty
+            [const uint 5 'errorClassHeader' '0x12']
+            [simple uint 3 'errorClassLength']
+            [array int 8 'errorClass' count 'errorClassLength']
+            [const uint 5 'errorCodeHeader' '0x12']
+            [simple uint 3 'errorCodeLength']
+            [array int 8 'errorCode' count 'errorCodeLength']
+        ]
+        ['0x0E' BACnetErrorReadPropertyMultiple
+        ]
+        ['0x1A' BACnetErrorReadRange
+        ]
+
+        ['0x12' BACnetErrorConfirmedPrivateTransfer
+        ]
+
+        ['0x15' BACnetErrorVTOpen
+        ]
+        ['0x17' BACnetErrorVTData
+        ]
+
+        ['0x18' BACnetErrorRemovedAuthenticate
+        ]
+        ['0x0D' BACnetErrorRemovedReadPropertyConditional
+        ]
+    ]
+]
+
+[type 'BACnetAddress'
+    [array  uint 8 'address' count '4']
+    [simple uint 16 'port']
+]
+
+[type 'BACnetTagWithContent'
+    [simple        uint 4 'typeOrTagNumber']
+    [simple        uint 1 'contextSpecificTag']
+    [simple        uint 3 'lengthValueType']
+    [optional      uint 8 'extTagNumber' 'typeOrTagNumber == 15']
+    [optional      uint 8 'extLength' 'lengthValueType == 5']
+    [array         uint 8 'propertyIdentifier' length '(lengthValueType == 5) ? extLength : lengthValueType']
+    [const         uint 8 'openTag' '0x2e']
+    [simple        BACnetTag 'val']
+    [const         uint 8 'closingTag' '0x2f']
+]
+
+[discriminatedType 'BACnetTag'
+    [simple        uint 4 'typeOrTagNumber']
+    [discriminator uint 1 'contextSpecificTag']
+    [simple        uint 3 'lengthValueType']
+    [optional      uint 8 'extTagNumber' 'typeOrTagNumber == 15']
+    [optional      uint 8 'extLength' 'lengthValueType == 5']
+    [typeSwitch 'contextSpecificTag','typeOrTagNumber'
+        ['0','0x0' BACnetTagApplicationNull
+        ]
+        ['0','0x1' BACnetTagApplicationBoolean
+        ]
+        ['0','0x2' BACnetTagApplicationUnsignedInteger [uint 3 'lengthValueType', uint 8 'extLength']
+            [array int 8 'data' length '(lengthValueType == 5) ? extLength : lengthValueType']
+        ]
+        ['0','0x3' BACnetTagApplicationSignedInteger [uint 3 'lengthValueType', uint 8 'extLength']
+            [array int 8 'data' length '(lengthValueType == 5) ? extLength : lengthValueType']
+        ]
+        ['0','0x4' BACnetTagApplicationReal [uint 3 'lengthValueType', uint 8 'extLength']
+            [array int 8 'data' length '(lengthValueType == 5) ? extLength : lengthValueType']
+        ]
+        ['0','0x5' BACnetTagApplicationDouble [uint 3 'lengthValueType', uint 8 'extLength']
+            [array int 8 'data' length '(lengthValueType == 5) ? extLength : lengthValueType']
+        ]
+        ['0','0x6' BACnetTagApplicationOctetString
+        ]
+        ['0','0x7' BACnetTagApplicationCharacterString
+        ]
+        ['0','0x8' BACnetTagApplicationBitString [uint 3 'lengthValueType', uint 8 'extLength']
+            [simple uint 8 'unusedBits']
+            [array int 8 'data' length '(lengthValueType == 5) ? (extLength - 1) : (lengthValueType - 1)']
+        ]
+        ['0','0x9' BACnetTagApplicationEnumerated [uint 3 'lengthValueType', uint 8 'extLength']
+            [array int 8 'data' length '(lengthValueType == 5) ? extLength : lengthValueType']
+        ]
+        ['0','0xA' BACnetTagApplicationDate
+        ]
+        ['0','0xB' BACnetTagApplicationTime
+        ]
+        ['0','0xC' BACnetTagApplicationObjectIdentifier
+        ]
+        ['1' BACnetTagContext [uint 4 'typeOrTagNumber', uint 8 'extTagNumber', uint 3 'lengthValueType', uint 8 'extLength']
+            [array int 8 'data' length '(lengthValueType == 5) ? extLength : lengthValueType']
+        ]
+    ]
+]
+
+[enum int 4 'ApplicationTag'
+    ['0x0' NULL]
+    ['0x1' BOOLEAN]
+    ['0x2' UNSIGNED_INTEGER]
+    ['0x3' SIGNED_INTEGER]
+    ['0x4' REAL]
+    ['0x5' DOUBLE]
+    ['0x6' OCTET_STRING]
+    ['0x7' CHARACTER_STRING]
+    ['0x8' BIT_STRING]
+    ['0x9' ENUMERATED]
+    ['0xA' DATE]
+    ['0xB' TIME]
+    ['0xC' BACNET_OBJECT_IDENTIFIER]
+]
+
+[enum uint 4 'BACnetNetworkType'
+    ['0x0' ETHERNET]
+    ['0x1' ARCNET]
+    ['0x2' MSTP]
+    ['0x3' PTP]
+    ['0x4' LONTALK]
+    ['0x5' IPV4]
+    ['0x6' ZIGBEE]
+    ['0x7' VIRTUAL]
+    ['0x8' REMOVED_NON_BACNET]
+    ['0x9' IPV6]
+    ['0xA' SERIAL]
+]
+
+[enum uint 8 'BACnetNodeType'
+    ['0x00' UNKNOWN]
+    ['0x01' SYSTEM]
+    ['0x02' NETWORK]
+    ['0x03' DEVICE]
+    ['0x04' ORGANIZATIONAL]
+    ['0x05' AREA]
+    ['0x06' EQUIPMENT]
+    ['0x07' POINT]
+    ['0x08' COLLECTION]
+    ['0x09' PROPERTY]
+    ['0x0A' FUNCTIONAL]
+    ['0x0B' OTHER]
+    ['0x0C' SUBSYSTEM]
+    ['0x0D' BUILDING]
+    ['0x0E' FLOOR]
+    ['0x0F' SECTION]
+    ['0x10' MODULE]
+    ['0x11' TREE]
+    ['0x12' MEMBER]
+    ['0x13' PROTOCOL]
+    ['0x14' ROOM]
+    ['0x15' ZONE]
+]
+
+[enum uint 4 'BACnetNotifyType'
+    ['0x0' ALARM]
+    ['0x1' EVENT]
+    ['0x2' ACK_NOTIFICATION]
+]
+
+[enum uint 10 'BACnetObjectType'
+    ['0x000' ANALOG_INPUT]
+    ['0x001' ANALOG_OUTPUT]
+    ['0x002' ANALOG_VALUE]
+
+    ['0x003' BINARY_INPUT]
+    ['0x004' BINARY_OUTPUT]
+    ['0x005' BINARY_VALUE]
+
+    ['0x00D' MULTISTATE_INPUT]
+    ['0x00E' MULTISTATE_OUTPUT]
+    ['0x013' MULTISTATE_VALUE]
+
+    ['0x011' SCHEDULE]
+
+    ['0x008' DEVICE]
+
+    ['0x006' CALENDAR]
+    ['0x007' COMMAND]
+    ['0x009' EVENT_ENROLLMENT]
+    ['0x00A' FILE]
+    ['0x00B' GROUP]
+    ['0x00C' LOOP]
+    ['0x00F' NOTIFICATION_CLASS]
+    ['0x010' PROGRAM]
+    ['0x012' AVERAGING]
+    ['0x014' TREND_LOG]
+    ['0x015' LIFE_SAFETY_POINT]
+    ['0x016' LIFE_SAFETY_ZONE]
+    ['0x017' ACCUMULATOR]
+    ['0x018' PULSE_CONVERTER]
+    ['0x019' EVENT_LOG]
+    ['0x01A' GLOBAL_GROUP]
+    ['0x01B' TREND_LOG_MULTIPLE]
+    ['0x01C' LOAD_CONTROL]
+    ['0x01D' STRUCTURED_VIEW]
+    ['0x01E' ACCESS_DOOR]
+    ['0x01F' TIMER]
+    ['0x020' ACCESS_CREDENTIAL]
+    ['0x021' ACCESS_POINT]
+    ['0x022' ACCESS_RIGHTS]
+    ['0x023' ACCESS_USER]
+    ['0x024' ACCESS_ZONE]
+    ['0x025' CREDENTIAL_DATA_INPUT]
+    ['0x026' NETWORK_SECURITY]
+    ['0x027' BITSTRING_VALUE]
+    ['0x028' CHARACTERSTRING_VALUE]
+    ['0x029' DATEPATTERN_VALUE]
+    ['0x02A' DATE_VALUE]
+    ['0x02B' DATETIMEPATTERN_VALUE]
+    ['0x02C' DATETIME_VALUE]
+    ['0x02D' INTEGER_VALUE]
+    ['0x02E' LARGE_ANALOG_VALUE]
+    ['0x02F' OCTETSTRING_VALUE]
+    ['0x030' POSITIVE_INTEGER_VALUE]
+    ['0x031' TIMEPATTERN_VALUE]
+    ['0x032' TIME_VALUE]
+    ['0x033' NOTIFICATION_FORWARDER]
+    ['0x034' ALERT_ENROLLMENT]
+    ['0x035' CHANNEL]
+    ['0x036' LIGHTING_OUTPUT]
+    ['0x037' BINARY_LIGHTING_OUTPUT]
+    ['0x038' NETWORK_PORT]
+    ['0x039' ELEVATOR_GROUP]
+    ['0x03A' ESCALATOR]
+]
diff --git a/protocols/df1/pom.xml b/protocols/df1/pom.xml
index 34f823b0fa0..57056675da6 100644
--- a/protocols/df1/pom.xml
+++ b/protocols/df1/pom.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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
-  ~
-  ~   http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4x-protocols</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4x-protocols-df1</artifactId>
-
-  <name>Protocols: Df1</name>
-  <description>Base protocol specifications for the AB Df1 protocol</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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
+  ~
+  ~   http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4x-protocols</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4x-protocols-df1</artifactId>
+
+  <name>Protocols: Df1</name>
+  <description>Base protocol specifications for the AB Df1 protocol</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/protocols/df1/src/main/java/org/apache/plc4x/protocol/df1/Df1Protocol.java b/protocols/df1/src/main/java/org/apache/plc4x/protocol/df1/Df1Protocol.java
index 2eec0bcdf8c..36068efe2cd 100644
--- a/protocols/df1/src/main/java/org/apache/plc4x/protocol/df1/Df1Protocol.java
+++ b/protocols/df1/src/main/java/org/apache/plc4x/protocol/df1/Df1Protocol.java
@@ -1,46 +1,46 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.protocol.df1;
-
-import org.apache.plc4x.plugins.codegenerator.language.mspec.parser.MessageFormatParser;
-import org.apache.plc4x.plugins.codegenerator.protocol.Protocol;
-import org.apache.plc4x.plugins.codegenerator.types.definitions.TypeDefinition;
-import org.apache.plc4x.plugins.codegenerator.types.exceptions.GenerationException;
-
-import java.io.InputStream;
-import java.util.Map;
-
-public class Df1Protocol implements Protocol {
-
-    @Override
-    public String getName() {
-        return "df1";
-    }
-
-    @Override
-    public Map<String, TypeDefinition> getTypeDefinitions() throws GenerationException {
-        InputStream schemaInputStream = Df1Protocol.class.getResourceAsStream("/protocols/df1/df1.mspec");
-        if(schemaInputStream == null) {
-            throw new GenerationException("Error loading message-format schema for protocol '" + getName() + "'");
-        }
-        return new MessageFormatParser().parse(schemaInputStream);
-    }
-
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.protocol.df1;
+
+import org.apache.plc4x.plugins.codegenerator.language.mspec.parser.MessageFormatParser;
+import org.apache.plc4x.plugins.codegenerator.protocol.Protocol;
+import org.apache.plc4x.plugins.codegenerator.types.definitions.TypeDefinition;
+import org.apache.plc4x.plugins.codegenerator.types.exceptions.GenerationException;
+
+import java.io.InputStream;
+import java.util.Map;
+
+public class Df1Protocol implements Protocol {
+
+    @Override
+    public String getName() {
+        return "df1";
+    }
+
+    @Override
+    public Map<String, TypeDefinition> getTypeDefinitions() throws GenerationException {
+        InputStream schemaInputStream = Df1Protocol.class.getResourceAsStream("/protocols/df1/df1.mspec");
+        if(schemaInputStream == null) {
+            throw new GenerationException("Error loading message-format schema for protocol '" + getName() + "'");
+        }
+        return new MessageFormatParser().parse(schemaInputStream);
+    }
+
+}
diff --git a/protocols/df1/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol b/protocols/df1/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol
index 60e98eadbed..d26477e02a0 100644
--- a/protocols/df1/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol
+++ b/protocols/df1/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol
@@ -1,19 +1,19 @@
-#
-# 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
-#
-#   http://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.
-#
+#
+# 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
+#
+#   http://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.
+#
 org.apache.plc4x.protocol.df1.Df1Protocol
\ No newline at end of file
diff --git a/protocols/df1/src/main/resources/protocols/df1/df1.mspec b/protocols/df1/src/main/resources/protocols/df1/df1.mspec
index b035a1dd7d1..a93e90dc381 100644
--- a/protocols/df1/src/main/resources/protocols/df1/df1.mspec
+++ b/protocols/df1/src/main/resources/protocols/df1/df1.mspec
@@ -1,53 +1,53 @@
-//
-// 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
-//
-//     http://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.
-//
-
-[discriminatedType 'DF1Symbol'
-    [const            uint 8       'messageStart' '0x10']
-    [discriminator    uint 8       'symbolType']
-    [typeSwitch 'symbolType'
-        ['0x02' DF1SymbolMessageFrame
-            [simple   uint 8       'destinationAddress']
-            [simple   uint 8       'sourceAddress']
-            [simple   DF1Command   'command']
-            [const    uint 8       'messageEnd' '0x10']
-            [const    uint 8       'endTransaction' '0x03']
-            [checksum uint 16      'crc' 'STATIC_CALL("org.apache.plc4x.java.df1.util.DF1Utils.crcCheck", destinationAddress, sourceAddress, command)']
-        ]
-        ['0x06' DF1SymbolMessageFrameACK
-        ]
-        ['0x15' DF1SymbolMessageFrameNAK
-        ]
-    ]
-]
-
-[discriminatedType 'DF1Command'
-    [discriminator uint 8  'commandCode']
-    [simple    uint 8       'status']
-    [simple    uint 16      'transactionCounter']
-    [typeSwitch 'commandCode'
-        ['0x01' DF1UnprotectedReadRequest
-            [simple uint 16    'address']
-            [simple uint 8     'size']
-        ]
-        ['0x41' DF1UnprotectedReadResponse
-            [manualArray  uint 8 'data' terminated 'STATIC_CALL("org.apache.plc4x.java.df1.util.DF1Utils.dataTerminate", io)' 'STATIC_CALL("org.apache.plc4x.java.df1.util.DF1Utils.readData", io)' 'STATIC_CALL("org.apache.plc4x.java.df1.util.DF1Utils.writeData", io, element)' 'STATIC_CALL("org.apache.plc4x.java.df1.util.DF1Utils.dataLength", data)']
-        ]
-    ]
-]
-
+//
+// 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
+//
+//     http://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.
+//
+
+[discriminatedType 'DF1Symbol'
+    [const            uint 8       'messageStart' '0x10']
+    [discriminator    uint 8       'symbolType']
+    [typeSwitch 'symbolType'
+        ['0x02' DF1SymbolMessageFrame
+            [simple   uint 8       'destinationAddress']
+            [simple   uint 8       'sourceAddress']
+            [simple   DF1Command   'command']
+            [const    uint 8       'messageEnd' '0x10']
+            [const    uint 8       'endTransaction' '0x03']
+            [checksum uint 16      'crc' 'STATIC_CALL("org.apache.plc4x.java.df1.util.DF1Utils.crcCheck", destinationAddress, sourceAddress, command)']
+        ]
+        ['0x06' DF1SymbolMessageFrameACK
+        ]
+        ['0x15' DF1SymbolMessageFrameNAK
+        ]
+    ]
+]
+
+[discriminatedType 'DF1Command'
+    [discriminator uint 8  'commandCode']
+    [simple    uint 8       'status']
+    [simple    uint 16      'transactionCounter']
+    [typeSwitch 'commandCode'
+        ['0x01' DF1UnprotectedReadRequest
+            [simple uint 16    'address']
+            [simple uint 8     'size']
+        ]
+        ['0x41' DF1UnprotectedReadResponse
+            [manualArray  uint 8 'data' terminated 'STATIC_CALL("org.apache.plc4x.java.df1.util.DF1Utils.dataTerminate", io)' 'STATIC_CALL("org.apache.plc4x.java.df1.util.DF1Utils.readData", io)' 'STATIC_CALL("org.apache.plc4x.java.df1.util.DF1Utils.writeData", io, element)' 'STATIC_CALL("org.apache.plc4x.java.df1.util.DF1Utils.dataLength", data)']
+        ]
+    ]
+]
+
diff --git a/protocols/knxnetip/pom.xml b/protocols/knxnetip/pom.xml
index b84f2ad664e..1e91518a9c2 100644
--- a/protocols/knxnetip/pom.xml
+++ b/protocols/knxnetip/pom.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4x-protocols</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4x-protocols-knxnetip</artifactId>
-
-  <name>Protocols: KNXNet/IP</name>
-  <description>Base protocol specifications for the KNXNet/IP protocol</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4x-protocols</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4x-protocols-knxnetip</artifactId>
+
+  <name>Protocols: KNXNet/IP</name>
+  <description>Base protocol specifications for the KNXNet/IP protocol</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/protocols/knxnetip/src/main/java/org/apache/plc4x/protocol/knxnetip/KnxNetIpProtocol.java b/protocols/knxnetip/src/main/java/org/apache/plc4x/protocol/knxnetip/KnxNetIpProtocol.java
index af2ae77ba3c..5f48e59d098 100644
--- a/protocols/knxnetip/src/main/java/org/apache/plc4x/protocol/knxnetip/KnxNetIpProtocol.java
+++ b/protocols/knxnetip/src/main/java/org/apache/plc4x/protocol/knxnetip/KnxNetIpProtocol.java
@@ -1,46 +1,46 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.protocol.knxnetip;
-
-import org.apache.plc4x.plugins.codegenerator.language.mspec.parser.MessageFormatParser;
-import org.apache.plc4x.plugins.codegenerator.protocol.Protocol;
-import org.apache.plc4x.plugins.codegenerator.types.definitions.TypeDefinition;
-import org.apache.plc4x.plugins.codegenerator.types.exceptions.GenerationException;
-
-import java.io.InputStream;
-import java.util.Map;
-
-public class KnxNetIpProtocol implements Protocol {
-
-    @Override
-    public String getName() {
-        return "knxnetip";
-    }
-
-    @Override
-    public Map<String, TypeDefinition> getTypeDefinitions() throws GenerationException {
-        InputStream schemaInputStream = KnxNetIpProtocol.class.getResourceAsStream("/protocols/knxnetip/knxnetip.mspec");
-        if(schemaInputStream == null) {
-            throw new GenerationException("Error loading message-format schema for protocol '" + getName() + "'");
-        }
-        return new MessageFormatParser().parse(schemaInputStream);
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.protocol.knxnetip;
+
+import org.apache.plc4x.plugins.codegenerator.language.mspec.parser.MessageFormatParser;
+import org.apache.plc4x.plugins.codegenerator.protocol.Protocol;
+import org.apache.plc4x.plugins.codegenerator.types.definitions.TypeDefinition;
+import org.apache.plc4x.plugins.codegenerator.types.exceptions.GenerationException;
+
+import java.io.InputStream;
+import java.util.Map;
+
+public class KnxNetIpProtocol implements Protocol {
+
+    @Override
+    public String getName() {
+        return "knxnetip";
+    }
+
+    @Override
+    public Map<String, TypeDefinition> getTypeDefinitions() throws GenerationException {
+        InputStream schemaInputStream = KnxNetIpProtocol.class.getResourceAsStream("/protocols/knxnetip/knxnetip.mspec");
+        if(schemaInputStream == null) {
+            throw new GenerationException("Error loading message-format schema for protocol '" + getName() + "'");
+        }
+        return new MessageFormatParser().parse(schemaInputStream);
+    }
+
+}
diff --git a/protocols/knxnetip/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol b/protocols/knxnetip/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol
index 86b7da4a53c..c533f2b1236 100644
--- a/protocols/knxnetip/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol
+++ b/protocols/knxnetip/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol
@@ -1,19 +1,19 @@
-#
-# 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
-#
-#     http://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.
-#
+#
+# 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
+#
+#     http://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.
+#
 org.apache.plc4x.protocol.knxnetip.KnxNetIpProtocol
\ No newline at end of file
diff --git a/protocols/knxnetip/src/main/resources/protocols/knxnetip/knxnetip.mspec b/protocols/knxnetip/src/main/resources/protocols/knxnetip/knxnetip.mspec
index 23b5f0e0ee4..4f599b388de 100644
--- a/protocols/knxnetip/src/main/resources/protocols/knxnetip/knxnetip.mspec
+++ b/protocols/knxnetip/src/main/resources/protocols/knxnetip/knxnetip.mspec
@@ -1,301 +1,301 @@
-//
-// 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
-//
-//     http://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.
-//
-
-[discriminatedType 'KNXNetIPMessage'
-    [implicit      uint 8  'headerLength'    '6']
-    [const         uint 8  'protocolVersion' '0x10']
-    [discriminator uint 16 'msgType']
-    [implicit      uint 16 'totalLength' 'lengthInBytes']
-    [typeSwitch 'msgType'
-        ['0x0201' SearchRequest
-            [simple HPAIDiscoveryEndpoint 'hpaiIDiscoveryEndpoint']
-        ]
-        ['0x0202' SearchResponse
-            [simple HPAIControlEndpoint 'hpaiControlEndpoint']
-            [simple DIBDeviceInfo       'dibDeviceInfo']
-            [simple DIBSuppSvcFamilies  'dibSuppSvcFamilies']
-        ]
-        ['0x0203' DescriptionRequest
-            [simple HPAIControlEndpoint 'hpaiControlEndpoint']
-        ]
-        ['0x0204' DescriptionResponse
-            [simple DIBDeviceInfo       'dibDeviceInfo']
-            [simple DIBSuppSvcFamilies  'dibSuppSvcFamilies']
-        ]
-        ['0x0205' ConnectionRequest
-            [simple HPAIDiscoveryEndpoint        'hpaiDiscoveryEndpoint']
-            [simple HPAIDataEndpoint             'hpaiDataEndpoint']
-            [simple ConnectionRequestInformation 'connectionRequestInformation']
-        ]
-        ['0x0206' ConnectionResponse
-            [simple uint 8 'communicationChannelId']
-            [simple uint 8 'status']
-            [simple HPAIDataEndpoint            'hpaiDataEndpoint']
-            [simple ConnectionResponseDataBlock 'connectionResponseDataBlock']
-        ]
-        ['0x0207' ConnectionStateRequest
-            [simple   uint 8 'communicationChannelId']
-            [reserved uint 8 '0x00']
-            [simple   HPAIControlEndpoint 'hpaiControlEndpoint']
-        ]
-        ['0x0208' ConnectionStateResponse
-            [simple uint 8 'communicationChannelId']
-            [simple uint 8 'status']
-        ]
-        ['0x0209' DisconnectRequest
-            [simple   uint 8 'communicationChannelId']
-            [reserved uint 8 '0x00']
-            [simple   HPAIControlEndpoint 'hpaiControlEndpoint']
-        ]
-        ['0x020A' DisconnectResponse
-            [simple uint 8 'communicationChannelId']
-            [simple uint 8 'status']
-        ]
-        ['0x0310' DeviceConfigurationRequest [uint 16 'totalLength']
-            [simple DeviceConfigurationRequestDataBlock 'deviceConfigurationRequestDataBlock']
-            [simple CEMI                                'cemi' ['totalLength - (6 + deviceConfigurationRequestDataBlock.lengthInBytes)']]
-        ]
-        ['0x0311' DeviceConfigurationAck
-            [simple DeviceConfigurationAckDataBlock 'deviceConfigurationAckDataBlock']
-        ]
-        ['0x0420' TunnelingRequest [uint 16 'totalLength']
-            [simple TunnelingRequestDataBlock 'tunnelingRequestDataBlock']
-            [simple CEMI                      'cemi' ['totalLength - (6 + tunnelingRequestDataBlock.lengthInBytes)']]
-        ]
-        ['0x0421' TunnelingResponse
-            [simple TunnelingResponseDataBlock 'tunnelingResponseDataBlock']
-        ]
-        ['0x0530' RoutingIndication
-        ]
-    ]
-]
-
-[type 'HPAIDiscoveryEndpoint'
-    [implicit uint 8    'structureLength' 'lengthInBytes']
-    [simple   uint 8    'hostProtocolCode']
-    [simple   IPAddress 'ipAddress']
-    [simple   uint 16   'ipPort']
-]
-
-[type 'HPAIControlEndpoint'
-    [implicit uint 8    'structureLength' 'lengthInBytes']
-    [simple   uint 8    'hostProtocolCode']
-    [simple   IPAddress 'ipAddress']
-    [simple   uint 16   'ipPort']
-]
-
-[type 'DIBDeviceInfo'
-    [implicit uint 8       'structureLength' 'lengthInBytes']
-    [simple   uint 8       'descriptionType']
-    [simple   uint 8       'knxMedium']
-    [simple   DeviceStatus 'deviceStatus']
-    [simple   KNXAddress   'knxAddress']
-    [simple   ProjectInstallationIdentifier 'projectInstallationIdentifier']
-    [array    uint 8       'knxNetIpDeviceSerialNumber' count '6']
-    [simple   IPAddress    'knxNetIpDeviceMulticastAddress']
-    [simple   MACAddress   'knxNetIpDeviceMacAddress']
-    [array    uint 8       'deviceFriendlyName'         count '30']
-]
-
-[type 'DIBSuppSvcFamilies'
-    [implicit uint 8       'structureLength' 'lengthInBytes']
-    [simple   uint 8       'descriptionType']
-    [array    ServiceId    'serviceIds' count '3']
-]
-
-[type 'HPAIDataEndpoint'
-    [implicit uint 8    'structureLength' 'lengthInBytes']
-    [simple   uint 8    'hostProtocolCode']
-    [simple   IPAddress 'ipAddress']
-    [simple   uint 16   'ipPort']
-]
-
-[discriminatedType 'ConnectionRequestInformation'
-    [implicit      uint 8    'structureLength' 'lengthInBytes']
-    [discriminator uint 8    'connectionType']
-    [typeSwitch 'connectionType'
-        ['0x03' ConnectionRequestInformationDeviceManagement
-        ]
-        ['0x04' ConnectionRequestInformationTunnelConnection
-            [simple   uint 8    'knxLayer']
-            [reserved uint 8    '0x00']
-        ]
-    ]
-]
-
-[discriminatedType 'ConnectionResponseDataBlock'
-    [implicit      uint 8     'structureLength' 'lengthInBytes']
-    [discriminator uint 8     'connectionType']
-    [typeSwitch 'connectionType'
-        ['0x03' ConnectionResponseDataBlockDeviceManagement
-        ]
-        ['0x04' ConnectionResponseDataBlockTunnelConnection
-            [simple KNXAddress 'knxAddress']
-        ]
-    ]
-]
-
-[type 'DeviceConfigurationRequestDataBlock'
-    [implicit uint 8 'structureLength' 'lengthInBytes']
-    [simple   uint 8 'communicationChannelId']
-    [simple   uint 8 'sequenceCounter']
-    [reserved uint 8 '0x00']
-]
-
-[type 'DeviceConfigurationAckDataBlock'
-    [implicit uint 8 'structureLength' 'lengthInBytes']
-    [simple   uint 8 'communicationChannelId']
-    [simple   uint 8 'sequenceCounter']
-    [simple   uint 8 'status']
-]
-
-[type 'TunnelingRequestDataBlock'
-    [implicit uint 8 'structureLength' 'lengthInBytes']
-    [simple   uint 8 'communicationChannelId']
-    [simple   uint 8 'sequenceCounter']
-    [reserved uint 8 '0x00']
-]
-
-[type 'TunnelingResponseDataBlock'
-    [implicit uint 8 'structureLength' 'lengthInBytes']
-    [simple   uint 8 'communicationChannelId']
-    [simple   uint 8 'sequenceCounter']
-    [simple   uint 8 'status']
-]
-
-[type 'IPAddress'
-    [array uint 8 'addr' count '4']
-]
-
-[type 'MACAddress'
-    [array uint 8 'addr' count '6']
-]
-
-[type 'KNXAddress'
-    [simple uint 4 'mainGroup']
-    [simple uint 4 'middleGroup']
-    [simple uint 8 'subGroup']
-]
-
-[type 'DeviceStatus'
-    [reserved uint 7 '0x00']
-    [simple   bit    'programMode']
-]
-
-[type 'ProjectInstallationIdentifier'
-    [simple uint 8 'projectNumber']
-    [simple uint 8 'installationNumber']
-]
-
-[discriminatedType 'ServiceId'
-    [discriminator uint 8 'serviceType']
-    [typeSwitch 'serviceType'
-        ['0x02' KnxNetIpCore
-            [simple uint 8 'version']
-        ]
-        ['0x03' KnxNetIpDeviceManagement
-            [simple uint 8 'version']
-        ]
-        ['0x04' KnxNetIpTunneling
-            [simple uint 8 'version']
-        ]
-    ]
-]
-
-[discriminatedType 'CEMI' [uint 8 'size']
-    [discriminator uint 8 'messageCode']
-    [typeSwitch 'messageCode'
-        ['0x10' CEMILRawReq
-        ]
-        ['0x11' CEMILDataReq
-        ]
-        ['0x13' CEMILPollDataReq
-        ]
-
-        ['0x25' CEMILPollDataCon
-        ]
-        ['0x29' CEMILDataInd
-        ]
-        ['0x2B' CEMILBusmonInd
-            [simple uint 8                    'additionalInformationLength']
-            [array  CEMIAdditionalInformation 'additionalInformation' length 'additionalInformationLength']
-            [array  uint 8                    'rawFrame'              count  'size - (additionalInformationLength + 2)']
-        ]
-        ['0x2D' CEMILRawInd
-        ]
-        ['0x2E' CEMILDataCon
-        ]
-        ['0x2F' CEMILRawCon
-        ]
-
-        ['0xFC' CEMIMPropReadReq
-            [simple uint 16 'interfaceObjectType']
-            [simple uint  8 'objectInstance']
-            [simple uint  8 'propertyId']
-            [simple uint  4 'numberOfElements']
-            [simple uint 12 'startIndex']
-        ]
-        ['0xFB' CEMIMPropReadCon
-            [simple uint 16 'interfaceObjectType']
-            [simple uint  8 'objectInstance']
-            [simple uint  8 'propertyId']
-            [simple uint  4 'numberOfElements']
-            [simple uint 12 'startIndex']
-        ]
-    ]
-]
-
-[discriminatedType 'CEMIAdditionalInformation'
-    [discriminator uint 8 'additionalInformationType']
-    [typeSwitch 'additionalInformationType'
-        ['0x03' CEMIAdditionalInformationBusmonitorInfo
-            [implicit uint 8 'len' '1']
-            [simple    bit    'frameErrorFlag']
-            [simple    bit    'bitErrorFlag']
-            [simple    bit    'parityErrorFlag']
-            [simple    bit    'unknownFlag']
-            [simple    bit    'lostFlag']
-            [simple    uint 3 'sequenceNumber']
-        ]
-        ['0x04' CEMIAdditionalInformationRelativeTimestamp
-            [implicit uint 8  'len' '2']
-            [simple   RelativeTimestamp 'relativeTimestamp']
-        ]
-    ]
-]
-
-[type 'CEMIControlField1'
-    [simple   bit    'standardFrame']
-    [reserved uint 1 '0x00']
-    [simple   bit    'doNotRepeat']
-    [simple   bit    'broadcast']
-    [simple   uint 2 'priority']
-    [simple   bit    'ackRequested']
-    [simple   bit    'error']
-]
-
-[type 'CEMIControlField2'
-    [simple   bit    'groupAddress']
-    [simple   uint 3 'hopCount']
-    [simple   uint 3 'extendedFrameFormat']
-]
-
-[type 'RelativeTimestamp'
-    [simple   uint 16 'timestamp']
-]
+//
+// 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
+//
+//     http://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.
+//
+
+[discriminatedType 'KNXNetIPMessage'
+    [implicit      uint 8  'headerLength'    '6']
+    [const         uint 8  'protocolVersion' '0x10']
+    [discriminator uint 16 'msgType']
+    [implicit      uint 16 'totalLength' 'lengthInBytes']
+    [typeSwitch 'msgType'
+        ['0x0201' SearchRequest
+            [simple HPAIDiscoveryEndpoint 'hpaiIDiscoveryEndpoint']
+        ]
+        ['0x0202' SearchResponse
+            [simple HPAIControlEndpoint 'hpaiControlEndpoint']
+            [simple DIBDeviceInfo       'dibDeviceInfo']
+            [simple DIBSuppSvcFamilies  'dibSuppSvcFamilies']
+        ]
+        ['0x0203' DescriptionRequest
+            [simple HPAIControlEndpoint 'hpaiControlEndpoint']
+        ]
+        ['0x0204' DescriptionResponse
+            [simple DIBDeviceInfo       'dibDeviceInfo']
+            [simple DIBSuppSvcFamilies  'dibSuppSvcFamilies']
+        ]
+        ['0x0205' ConnectionRequest
+            [simple HPAIDiscoveryEndpoint        'hpaiDiscoveryEndpoint']
+            [simple HPAIDataEndpoint             'hpaiDataEndpoint']
+            [simple ConnectionRequestInformation 'connectionRequestInformation']
+        ]
+        ['0x0206' ConnectionResponse
+            [simple uint 8 'communicationChannelId']
+            [simple uint 8 'status']
+            [simple HPAIDataEndpoint            'hpaiDataEndpoint']
+            [simple ConnectionResponseDataBlock 'connectionResponseDataBlock']
+        ]
+        ['0x0207' ConnectionStateRequest
+            [simple   uint 8 'communicationChannelId']
+            [reserved uint 8 '0x00']
+            [simple   HPAIControlEndpoint 'hpaiControlEndpoint']
+        ]
+        ['0x0208' ConnectionStateResponse
+            [simple uint 8 'communicationChannelId']
+            [simple uint 8 'status']
+        ]
+        ['0x0209' DisconnectRequest
+            [simple   uint 8 'communicationChannelId']
+            [reserved uint 8 '0x00']
+            [simple   HPAIControlEndpoint 'hpaiControlEndpoint']
+        ]
+        ['0x020A' DisconnectResponse
+            [simple uint 8 'communicationChannelId']
+            [simple uint 8 'status']
+        ]
+        ['0x0310' DeviceConfigurationRequest [uint 16 'totalLength']
+            [simple DeviceConfigurationRequestDataBlock 'deviceConfigurationRequestDataBlock']
+            [simple CEMI                                'cemi' ['totalLength - (6 + deviceConfigurationRequestDataBlock.lengthInBytes)']]
+        ]
+        ['0x0311' DeviceConfigurationAck
+            [simple DeviceConfigurationAckDataBlock 'deviceConfigurationAckDataBlock']
+        ]
+        ['0x0420' TunnelingRequest [uint 16 'totalLength']
+            [simple TunnelingRequestDataBlock 'tunnelingRequestDataBlock']
+            [simple CEMI                      'cemi' ['totalLength - (6 + tunnelingRequestDataBlock.lengthInBytes)']]
+        ]
+        ['0x0421' TunnelingResponse
+            [simple TunnelingResponseDataBlock 'tunnelingResponseDataBlock']
+        ]
+        ['0x0530' RoutingIndication
+        ]
+    ]
+]
+
+[type 'HPAIDiscoveryEndpoint'
+    [implicit uint 8    'structureLength' 'lengthInBytes']
+    [simple   uint 8    'hostProtocolCode']
+    [simple   IPAddress 'ipAddress']
+    [simple   uint 16   'ipPort']
+]
+
+[type 'HPAIControlEndpoint'
+    [implicit uint 8    'structureLength' 'lengthInBytes']
+    [simple   uint 8    'hostProtocolCode']
+    [simple   IPAddress 'ipAddress']
+    [simple   uint 16   'ipPort']
+]
+
+[type 'DIBDeviceInfo'
+    [implicit uint 8       'structureLength' 'lengthInBytes']
+    [simple   uint 8       'descriptionType']
+    [simple   uint 8       'knxMedium']
+    [simple   DeviceStatus 'deviceStatus']
+    [simple   KNXAddress   'knxAddress']
+    [simple   ProjectInstallationIdentifier 'projectInstallationIdentifier']
+    [array    uint 8       'knxNetIpDeviceSerialNumber' count '6']
+    [simple   IPAddress    'knxNetIpDeviceMulticastAddress']
+    [simple   MACAddress   'knxNetIpDeviceMacAddress']
+    [array    uint 8       'deviceFriendlyName'         count '30']
+]
+
+[type 'DIBSuppSvcFamilies'
+    [implicit uint 8       'structureLength' 'lengthInBytes']
+    [simple   uint 8       'descriptionType']
+    [array    ServiceId    'serviceIds' count '3']
+]
+
+[type 'HPAIDataEndpoint'
+    [implicit uint 8    'structureLength' 'lengthInBytes']
+    [simple   uint 8    'hostProtocolCode']
+    [simple   IPAddress 'ipAddress']
+    [simple   uint 16   'ipPort']
+]
+
+[discriminatedType 'ConnectionRequestInformation'
+    [implicit      uint 8    'structureLength' 'lengthInBytes']
+    [discriminator uint 8    'connectionType']
+    [typeSwitch 'connectionType'
+        ['0x03' ConnectionRequestInformationDeviceManagement
+        ]
+        ['0x04' ConnectionRequestInformationTunnelConnection
+            [simple   uint 8    'knxLayer']
+            [reserved uint 8    '0x00']
+        ]
+    ]
+]
+
+[discriminatedType 'ConnectionResponseDataBlock'
+    [implicit      uint 8     'structureLength' 'lengthInBytes']
+    [discriminator uint 8     'connectionType']
+    [typeSwitch 'connectionType'
+        ['0x03' ConnectionResponseDataBlockDeviceManagement
+        ]
+        ['0x04' ConnectionResponseDataBlockTunnelConnection
+            [simple KNXAddress 'knxAddress']
+        ]
+    ]
+]
+
+[type 'DeviceConfigurationRequestDataBlock'
+    [implicit uint 8 'structureLength' 'lengthInBytes']
+    [simple   uint 8 'communicationChannelId']
+    [simple   uint 8 'sequenceCounter']
+    [reserved uint 8 '0x00']
+]
+
+[type 'DeviceConfigurationAckDataBlock'
+    [implicit uint 8 'structureLength' 'lengthInBytes']
+    [simple   uint 8 'communicationChannelId']
+    [simple   uint 8 'sequenceCounter']
+    [simple   uint 8 'status']
+]
+
+[type 'TunnelingRequestDataBlock'
+    [implicit uint 8 'structureLength' 'lengthInBytes']
+    [simple   uint 8 'communicationChannelId']
+    [simple   uint 8 'sequenceCounter']
+    [reserved uint 8 '0x00']
+]
+
+[type 'TunnelingResponseDataBlock'
+    [implicit uint 8 'structureLength' 'lengthInBytes']
+    [simple   uint 8 'communicationChannelId']
+    [simple   uint 8 'sequenceCounter']
+    [simple   uint 8 'status']
+]
+
+[type 'IPAddress'
+    [array uint 8 'addr' count '4']
+]
+
+[type 'MACAddress'
+    [array uint 8 'addr' count '6']
+]
+
+[type 'KNXAddress'
+    [simple uint 4 'mainGroup']
+    [simple uint 4 'middleGroup']
+    [simple uint 8 'subGroup']
+]
+
+[type 'DeviceStatus'
+    [reserved uint 7 '0x00']
+    [simple   bit    'programMode']
+]
+
+[type 'ProjectInstallationIdentifier'
+    [simple uint 8 'projectNumber']
+    [simple uint 8 'installationNumber']
+]
+
+[discriminatedType 'ServiceId'
+    [discriminator uint 8 'serviceType']
+    [typeSwitch 'serviceType'
+        ['0x02' KnxNetIpCore
+            [simple uint 8 'version']
+        ]
+        ['0x03' KnxNetIpDeviceManagement
+            [simple uint 8 'version']
+        ]
+        ['0x04' KnxNetIpTunneling
+            [simple uint 8 'version']
+        ]
+    ]
+]
+
+[discriminatedType 'CEMI' [uint 8 'size']
+    [discriminator uint 8 'messageCode']
+    [typeSwitch 'messageCode'
+        ['0x10' CEMILRawReq
+        ]
+        ['0x11' CEMILDataReq
+        ]
+        ['0x13' CEMILPollDataReq
+        ]
+
+        ['0x25' CEMILPollDataCon
+        ]
+        ['0x29' CEMILDataInd
+        ]
+        ['0x2B' CEMILBusmonInd
+            [simple uint 8                    'additionalInformationLength']
+            [array  CEMIAdditionalInformation 'additionalInformation' length 'additionalInformationLength']
+            [array  uint 8                    'rawFrame'              count  'size - (additionalInformationLength + 2)']
+        ]
+        ['0x2D' CEMILRawInd
+        ]
+        ['0x2E' CEMILDataCon
+        ]
+        ['0x2F' CEMILRawCon
+        ]
+
+        ['0xFC' CEMIMPropReadReq
+            [simple uint 16 'interfaceObjectType']
+            [simple uint  8 'objectInstance']
+            [simple uint  8 'propertyId']
+            [simple uint  4 'numberOfElements']
+            [simple uint 12 'startIndex']
+        ]
+        ['0xFB' CEMIMPropReadCon
+            [simple uint 16 'interfaceObjectType']
+            [simple uint  8 'objectInstance']
+            [simple uint  8 'propertyId']
+            [simple uint  4 'numberOfElements']
+            [simple uint 12 'startIndex']
+        ]
+    ]
+]
+
+[discriminatedType 'CEMIAdditionalInformation'
+    [discriminator uint 8 'additionalInformationType']
+    [typeSwitch 'additionalInformationType'
+        ['0x03' CEMIAdditionalInformationBusmonitorInfo
+            [implicit uint 8 'len' '1']
+            [simple    bit    'frameErrorFlag']
+            [simple    bit    'bitErrorFlag']
+            [simple    bit    'parityErrorFlag']
+            [simple    bit    'unknownFlag']
+            [simple    bit    'lostFlag']
+            [simple    uint 3 'sequenceNumber']
+        ]
+        ['0x04' CEMIAdditionalInformationRelativeTimestamp
+            [implicit uint 8  'len' '2']
+            [simple   RelativeTimestamp 'relativeTimestamp']
+        ]
+    ]
+]
+
+[type 'CEMIControlField1'
+    [simple   bit    'standardFrame']
+    [reserved uint 1 '0x00']
+    [simple   bit    'doNotRepeat']
+    [simple   bit    'broadcast']
+    [simple   uint 2 'priority']
+    [simple   bit    'ackRequested']
+    [simple   bit    'error']
+]
+
+[type 'CEMIControlField2'
+    [simple   bit    'groupAddress']
+    [simple   uint 3 'hopCount']
+    [simple   uint 3 'extendedFrameFormat']
+]
+
+[type 'RelativeTimestamp'
+    [simple   uint 16 'timestamp']
+]
diff --git a/protocols/knxnetip/src/site/asciidoc/index.adoc b/protocols/knxnetip/src/site/asciidoc/index.adoc
index dda216106db..606b4c3b444 100644
--- a/protocols/knxnetip/src/site/asciidoc/index.adoc
+++ b/protocols/knxnetip/src/site/asciidoc/index.adoc
@@ -1,57 +1,57 @@
-//
-//  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
-//
-//      http://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.
-//
-:imagesdir: images/
-:icons: font
-
-== KNXNet/IP
-
-=== Connection establishment
-
-
-[seqdiag,knx-connection]
-....
-{
-    === Connect ===
-
-    Client -> "KNX Group Address (224.0.23.12)" [label = "Search Request"]
-    Client <- "KNX Gateway" [label = "Search Response"]
-
-    Client -> "KNX Gateway" [label = "Description Request"]
-    Client <- "KNX Gateway" [label = "Description Response"]
-
-    Client -> "KNX Gateway" [label = "Connection Request"]
-    Client <- "KNX Gateway" [label = "Connection Response"]
-
-    === Periodic Confirmation (every 60 seconds) ===
-
-    Client -> "KNX Gateway" [label = "Connection State Request"]
-    Client <- "KNX Gateway" [label = "Connection State Response"]
-
-    === Data on the KNX Bus ===
-
-    Client <- "KNX Gateway" [label = "Tunneling Request"]
-    Client -> "KNX Gateway" [label = "Tunneling Response"]
-
-    === Disconnect ===
-
-    Client -> "KNX Gateway" [label = "Disconnect Request"]
-    Client <- "KNX Gateway" [label = "Disconnect Response"]
-
-}
-....
-
+//
+//  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
+//
+//      http://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.
+//
+:imagesdir: images/
+:icons: font
+
+== KNXNet/IP
+
+=== Connection establishment
+
+
+[seqdiag,knx-connection]
+....
+{
+    === Connect ===
+
+    Client -> "KNX Group Address (224.0.23.12)" [label = "Search Request"]
+    Client <- "KNX Gateway" [label = "Search Response"]
+
+    Client -> "KNX Gateway" [label = "Description Request"]
+    Client <- "KNX Gateway" [label = "Description Response"]
+
+    Client -> "KNX Gateway" [label = "Connection Request"]
+    Client <- "KNX Gateway" [label = "Connection Response"]
+
+    === Periodic Confirmation (every 60 seconds) ===
+
+    Client -> "KNX Gateway" [label = "Connection State Request"]
+    Client <- "KNX Gateway" [label = "Connection State Response"]
+
+    === Data on the KNX Bus ===
+
+    Client <- "KNX Gateway" [label = "Tunneling Request"]
+    Client -> "KNX Gateway" [label = "Tunneling Response"]
+
+    === Disconnect ===
+
+    Client -> "KNX Gateway" [label = "Disconnect Request"]
+    Client <- "KNX Gateway" [label = "Disconnect Response"]
+
+}
+....
+
 http://knxer.net/?p=78
\ No newline at end of file
diff --git a/protocols/knxnetip/src/test/resources/org/apache/plc4x/protocols/knxnetip/protocol.tdml b/protocols/knxnetip/src/test/resources/org/apache/plc4x/protocols/knxnetip/protocol.tdml
index 3453454294b..1a811564b6a 100644
--- a/protocols/knxnetip/src/test/resources/org/apache/plc4x/protocols/knxnetip/protocol.tdml
+++ b/protocols/knxnetip/src/test/resources/org/apache/plc4x/protocols/knxnetip/protocol.tdml
@@ -1,604 +1,604 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-
-<tdml:testSuite xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
-                xmlns:tdml="http://www.ibm.com/xmlns/dfdl/testData"
-                xmlns:knx="http://plc4x.apache.org/knxnet-ip"
-                xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                suiteName="KNXNet/IP protocol"
-                description="Testsuite for the KNXNet/IP protocol"
-                defaultRoundTrip="onePass">
-
-    <tdml:defineSchema name="knxNetIpSchema" elementFormDefault="unqualified">
-        <!-- Import the Schema -->
-        <xs:import namespace="http://plc4x.apache.org/knxnet-ip"
-                   schemaLocation="protocol.dfdl.xsd"/>
-
-        <!-- Import the format settings -->
-        <dfdl:format ref="knx:knxNetIpFullFormat"/>
-
-        <!-- Define the root element name and type -->
-        <!--xs:element name="TpktMessage" type="s7:TpktMessageType"/-->
-    </tdml:defineSchema>
-
-    <tdml:parserTestCase name="KNXNetIP-Search-Request"
-                         root="KNXNetIPMessage"
-                         model="knxNetIpSchema"
-                         description="KNXNet/IP Search-Request">
-        <tdml:document>
-            <tdml:documentPart type="byte">06100201000e0801c0a82a46ef8e</tdml:documentPart>
-        </tdml:document>
-
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <knx:KNXNetIPMessage>
-                    <header>
-                        <headerLength>6</headerLength>
-                        <protocolVersion>16</protocolVersion>
-                        <serviceTypeIdentifier>513</serviceTypeIdentifier>
-                        <totalLength>14</totalLength>
-                    </header>
-                    <SearchRequest>
-                        <HPAIDiscoveryEndpoint>
-                            <structureLength>8</structureLength>
-                            <hostProtocolCode>1</hostProtocolCode>
-                            <ipAddress>C0A82A46</ipAddress>
-                            <ipPort>61326</ipPort>
-                        </HPAIDiscoveryEndpoint>
-                    </SearchRequest>
-                </knx:KNXNetIPMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="KNXNetIP-Search-Response"
-                         root="KNXNetIPMessage"
-                         model="knxNetIpSchema"
-                         description="KNXNet/IP Search-Response">
-        <tdml:document>
-            <tdml:documentPart type="byte">
-                06100202004c0801c0a82a0b0e5736010200ffff000000082d409852e000170c000ab327553647697261204b4e582f49502d5363686e6974747374656c6c6500000000000802020103010401
-            </tdml:documentPart>
-        </tdml:document>
-
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <knx:KNXNetIPMessage>
-                    <header>
-                        <headerLength>6</headerLength>
-                        <protocolVersion>16</protocolVersion>
-                        <serviceTypeIdentifier>514</serviceTypeIdentifier>
-                        <totalLength>76</totalLength>
-                    </header>
-                    <SearchResponse>
-                        <HPAIControlEndpoint>
-                            <structureLength>8</structureLength>
-                            <hostProtocolCode>1</hostProtocolCode>
-                            <ipAddress>C0A82A0B</ipAddress>
-                            <ipPort>3671</ipPort>
-                        </HPAIControlEndpoint>
-                        <DIBDeviceInfo>
-                            <structureLength>54</structureLength>
-                            <descriptionType>1</descriptionType>
-                            <knxMedium>2</knxMedium>
-                            <deviceStatus>
-                                <reserved>0</reserved>
-                                <programMode>0</programMode>
-                            </deviceStatus>
-                            <knxAddress>
-                                <mainGroup>15</mainGroup>
-                                <middleGroup>15</middleGroup>
-                                <subGroup>255</subGroup>
-                            </knxAddress>
-                            <projectInstallationIdentifier>
-                                <projectNumber>0</projectNumber>
-                                <installationNumber>0</installationNumber>
-                            </projectInstallationIdentifier>
-                            <knxNetIpDeviceSerialNumber>00082D409852</knxNetIpDeviceSerialNumber>
-                            <knxNetIpDeviceMulticastAddress>E000170C</knxNetIpDeviceMulticastAddress>
-                            <knxNetIpDeviceMacAddress>000AB3275536</knxNetIpDeviceMacAddress>
-                            <deviceFriendlyName>Gira KNX/IP-Schnittstelleī€€ī€€ī€€ī€€ī€€</deviceFriendlyName>
-                        </DIBDeviceInfo>
-                        <DIBSuppSvcFamilies>
-                            <structureLength>8</structureLength>
-                            <descriptionType>2</descriptionType>
-                            <serviceIds>
-                                <serviceId>
-                                    <type>2</type>
-                                    <KnxNetIpCore>
-                                        <version>1</version>
-                                    </KnxNetIpCore>
-                                </serviceId>
-                                <serviceId>
-                                    <type>3</type>
-                                    <KnxNetIpDeviceManagement>
-                                        <version>1</version>
-                                    </KnxNetIpDeviceManagement>
-                                </serviceId>
-                                <serviceId>
-                                    <type>4</type>
-                                    <KnxNetIpTunneling>
-                                        <version>1</version>
-                                    </KnxNetIpTunneling>
-                                </serviceId>
-                            </serviceIds>
-                        </DIBSuppSvcFamilies>
-                    </SearchResponse>
-                </knx:KNXNetIPMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="KNXNetIP-Description-Request"
-                         root="KNXNetIPMessage"
-                         model="knxNetIpSchema"
-                         description="KNXNet/IP Description-Request">
-        <tdml:document>
-            <tdml:documentPart type="byte">06100203000e0801000000000000</tdml:documentPart>
-        </tdml:document>
-
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <knx:KNXNetIPMessage>
-                    <header>
-                        <headerLength>6</headerLength>
-                        <protocolVersion>16</protocolVersion>
-                        <serviceTypeIdentifier>515</serviceTypeIdentifier>
-                        <totalLength>14</totalLength>
-                    </header>
-                    <DescriptionRequest>
-                        <HPAIControlEndpoint>
-                            <structureLength>8</structureLength>
-                            <hostProtocolCode>1</hostProtocolCode>
-                            <ipAddress>00000000</ipAddress>
-                            <ipPort>0</ipPort>
-                        </HPAIControlEndpoint>
-                    </DescriptionRequest>
-                </knx:KNXNetIPMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="KNXNetIP-Description-Response"
-                         root="KNXNetIPMessage"
-                         model="knxNetIpSchema"
-                         description="KNXNet/IP Description-Response">
-        <tdml:document>
-            <tdml:documentPart type="byte">
-                06100204004436010200ffff000000082d409852e000170c000ab327553647697261204b4e582f49502d5363686e6974747374656c6c6500000000000802020103010401
-            </tdml:documentPart>
-        </tdml:document>
-
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <knx:KNXNetIPMessage>
-                    <header>
-                        <headerLength>6</headerLength>
-                        <protocolVersion>16</protocolVersion>
-                        <serviceTypeIdentifier>516</serviceTypeIdentifier>
-                        <totalLength>68</totalLength>
-                    </header>
-                    <DescriptionResponse>
-                        <DIBDeviceInfo>
-                            <structureLength>54</structureLength>
-                            <descriptionType>1</descriptionType>
-                            <knxMedium>2</knxMedium>
-                            <deviceStatus>
-                                <reserved>0</reserved>
-                                <programMode>0</programMode>
-                            </deviceStatus>
-                            <knxAddress>
-                                <mainGroup>15</mainGroup>
-                                <middleGroup>15</middleGroup>
-                                <subGroup>255</subGroup>
-                            </knxAddress>
-                            <projectInstallationIdentifier>
-                                <projectNumber>0</projectNumber>
-                                <installationNumber>0</installationNumber>
-                            </projectInstallationIdentifier>
-                            <knxNetIpDeviceSerialNumber>00082D409852</knxNetIpDeviceSerialNumber>
-                            <knxNetIpDeviceMulticastAddress>E000170C</knxNetIpDeviceMulticastAddress>
-                            <knxNetIpDeviceMacAddress>000AB3275536</knxNetIpDeviceMacAddress>
-                            <deviceFriendlyName>Gira KNX/IP-Schnittstelleī€€ī€€ī€€ī€€ī€€</deviceFriendlyName>
-                        </DIBDeviceInfo>
-                        <DIBSuppSvcFamilies>
-                            <structureLength>8</structureLength>
-                            <descriptionType>2</descriptionType>
-                            <serviceIds>
-                                <serviceId>
-                                    <type>2</type>
-                                    <KnxNetIpCore>
-                                        <version>1</version>
-                                    </KnxNetIpCore>
-                                </serviceId>
-                                <serviceId>
-                                    <type>3</type>
-                                    <KnxNetIpDeviceManagement>
-                                        <version>1</version>
-                                    </KnxNetIpDeviceManagement>
-                                </serviceId>
-                                <serviceId>
-                                    <type>4</type>
-                                    <KnxNetIpTunneling>
-                                        <version>1</version>
-                                    </KnxNetIpTunneling>
-                                </serviceId>
-                            </serviceIds>
-                        </DIBSuppSvcFamilies>
-                    </DescriptionResponse>
-                </knx:KNXNetIPMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="KNXNetIP-Connect-Request"
-                         root="KNXNetIPMessage"
-                         model="knxNetIpSchema"
-                         description="KNXNet/IP Connect-Request">
-        <tdml:document>
-            <tdml:documentPart type="byte">06100205001a0801c0a82a46f4310801c0a82a46f43204040200</tdml:documentPart>
-        </tdml:document>
-
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <knx:KNXNetIPMessage>
-                    <header>
-                        <headerLength>6</headerLength>
-                        <protocolVersion>16</protocolVersion>
-                        <serviceTypeIdentifier>517</serviceTypeIdentifier>
-                        <totalLength>26</totalLength>
-                    </header>
-                    <ConnectionRequest>
-                        <HPAIDiscoveryEndpoint>
-                            <structureLength>8</structureLength>
-                            <hostProtocolCode>1</hostProtocolCode>
-                            <ipAddress>C0A82A46</ipAddress>
-                            <ipPort>62513</ipPort>
-                        </HPAIDiscoveryEndpoint>
-                        <HPAIDataEndpoint>
-                            <structureLength>8</structureLength>
-                            <hostProtocolCode>1</hostProtocolCode>
-                            <ipAddress>C0A82A46</ipAddress>
-                            <ipPort>62514</ipPort>
-                        </HPAIDataEndpoint>
-                        <ConnectionRequestInformation>
-                            <structureLength>4</structureLength>
-                            <connectionType>4</connectionType>
-                            <knxLayer>2</knxLayer>
-                            <reserved>0</reserved>
-                        </ConnectionRequestInformation>
-                    </ConnectionRequest>
-                </knx:KNXNetIPMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="KNXNetIP-Connect-Response"
-                         root="KNXNetIPMessage"
-                         model="knxNetIpSchema"
-                         description="KNXNet/IP Connect-Response">
-        <tdml:document>
-            <tdml:documentPart type="byte">06100206001466000801c0a82a0b0e5704041101</tdml:documentPart>
-        </tdml:document>
-
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <knx:KNXNetIPMessage>
-                    <header>
-                        <headerLength>6</headerLength>
-                        <protocolVersion>16</protocolVersion>
-                        <serviceTypeIdentifier>518</serviceTypeIdentifier>
-                        <totalLength>20</totalLength>
-                    </header>
-                    <ConnectionResponse>
-                        <communicationChannelId>102</communicationChannelId>
-                        <status>0</status>
-                        <HPAIDataEndpoint>
-                            <structureLength>8</structureLength>
-                            <hostProtocolCode>1</hostProtocolCode>
-                            <ipAddress>C0A82A0B</ipAddress>
-                            <ipPort>3671</ipPort>
-                        </HPAIDataEndpoint>
-                        <ConnectionResponseDataBlock>
-                            <structureLength>4</structureLength>
-                            <connectionType>4</connectionType>
-                            <knxAddress>
-                                <mainGroup>1</mainGroup>
-                                <middleGroup>1</middleGroup>
-                                <subGroup>1</subGroup>
-                            </knxAddress>
-                        </ConnectionResponseDataBlock>
-                    </ConnectionResponse>
-                </knx:KNXNetIPMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="KNXNetIP-Connection-State-Request"
-                         root="KNXNetIPMessage"
-                         model="knxNetIpSchema"
-                         description="KNXNet/IP Connection-State-Request">
-        <tdml:document>
-            <tdml:documentPart type="byte">06100207001066000801c0a82a46f431</tdml:documentPart>
-        </tdml:document>
-
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <knx:KNXNetIPMessage>
-                    <header>
-                        <headerLength>6</headerLength>
-                        <protocolVersion>16</protocolVersion>
-                        <serviceTypeIdentifier>519</serviceTypeIdentifier>
-                        <totalLength>16</totalLength>
-                    </header>
-                    <ConnectionStateRequest>
-                        <communicationChannelId>102</communicationChannelId>
-                        <reserved>0</reserved>
-                        <HPAIControlEndpoint>
-                            <structureLength>8</structureLength>
-                            <hostProtocolCode>1</hostProtocolCode>
-                            <ipAddress>C0A82A46</ipAddress>
-                            <ipPort>62513</ipPort>
-                        </HPAIControlEndpoint>
-                    </ConnectionStateRequest>
-                </knx:KNXNetIPMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="KNXNetIP-Connection-State-Response"
-                         root="KNXNetIPMessage"
-                         model="knxNetIpSchema"
-                         description="KNXNet/IP Connection-State-Response">
-        <tdml:document>
-            <tdml:documentPart type="byte">0610020800086600</tdml:documentPart>
-        </tdml:document>
-
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <knx:KNXNetIPMessage>
-                    <header>
-                        <headerLength>6</headerLength>
-                        <protocolVersion>16</protocolVersion>
-                        <serviceTypeIdentifier>520</serviceTypeIdentifier>
-                        <totalLength>8</totalLength>
-                    </header>
-                    <ConnectionStateResponse>
-                        <communicationChannelId>102</communicationChannelId>
-                        <status>0</status>
-                    </ConnectionStateResponse>
-                </knx:KNXNetIPMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="KNXNetIP-Device-Configuration-Request"
-                         root="KNXNetIPMessage"
-                         model="knxNetIpSchema"
-                         description="KNXNet/IP Device-Configuration-Request">
-        <tdml:document>
-            <tdml:documentPart type="byte">06100310001104670000fc000001531001</tdml:documentPart>
-        </tdml:document>
-
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <knx:KNXNetIPMessage>
-                    <header>
-                        <headerLength>6</headerLength>
-                        <protocolVersion>16</protocolVersion>
-                        <serviceTypeIdentifier>784</serviceTypeIdentifier>
-                        <totalLength>17</totalLength>
-                    </header>
-                    <DeviceConfigurationRequest>
-                        <structureLength>4</structureLength>
-                        <communicationChannelId>103</communicationChannelId>
-                        <sequenceCounter>0</sequenceCounter>
-                        <reserved>0</reserved>
-                        <cEMI>
-                            <messageCode>252</messageCode>
-                            <MPropRead>
-                                <interfaceObjectType>0</interfaceObjectType>
-                                <objectInstance>1</objectInstance>
-                                <propertyIdentifyer>83</propertyIdentifyer>
-                                <numberOfElements>1</numberOfElements>
-                                <startIndex>1</startIndex>
-                            </MPropRead>
-                        </cEMI>
-                    </DeviceConfigurationRequest>
-                </knx:KNXNetIPMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="KNXNetIP-Device-Configuration-Response"
-                         root="KNXNetIPMessage"
-                         model="knxNetIpSchema"
-                         description="KNXNet/IP Device-Configuration-Response">
-        <tdml:document>
-            <tdml:documentPart type="byte">06100311000a04670000</tdml:documentPart>
-        </tdml:document>
-
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <knx:KNXNetIPMessage>
-                    <header>
-                        <headerLength>6</headerLength>
-                        <protocolVersion>16</protocolVersion>
-                        <serviceTypeIdentifier>785</serviceTypeIdentifier>
-                        <totalLength>10</totalLength>
-                    </header>
-                    <DeviceConfigurationResponse>
-                        <structureLength>4</structureLength>
-                        <communicationChannelId>103</communicationChannelId>
-                        <sequenceCounter>0</sequenceCounter>
-                        <status>0</status>
-                    </DeviceConfigurationResponse>
-                </knx:KNXNetIPMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="KNXNetIP-Disconnect-Request"
-                         root="KNXNetIPMessage"
-                         model="knxNetIpSchema"
-                         description="KNXNet/IP Disconnect-Request">
-        <tdml:document>
-            <tdml:documentPart type="byte">06100209001067000801c0a82a46f431</tdml:documentPart>
-        </tdml:document>
-
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <knx:KNXNetIPMessage>
-                    <header>
-                        <headerLength>6</headerLength>
-                        <protocolVersion>16</protocolVersion>
-                        <serviceTypeIdentifier>521</serviceTypeIdentifier>
-                        <totalLength>16</totalLength>
-                    </header>
-                    <DisconnectRequest>
-                        <communicationChannelId>103</communicationChannelId>
-                        <reserved>0</reserved>
-                        <HPAIControlEndpoint>
-                            <structureLength>8</structureLength>
-                            <hostProtocolCode>1</hostProtocolCode>
-                            <ipAddress>C0A82A46</ipAddress>
-                            <ipPort>62513</ipPort>
-                        </HPAIControlEndpoint>
-                    </DisconnectRequest>
-                </knx:KNXNetIPMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="KNXNetIP-Disconnect-Response"
-                         root="KNXNetIPMessage"
-                         model="knxNetIpSchema"
-                         description="KNXNet/IP Disconnect-Response">
-        <tdml:document>
-            <tdml:documentPart type="byte">0610020a00086700</tdml:documentPart>
-        </tdml:document>
-
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <knx:KNXNetIPMessage>
-                    <header>
-                        <headerLength>6</headerLength>
-                        <protocolVersion>16</protocolVersion>
-                        <serviceTypeIdentifier>522</serviceTypeIdentifier>
-                        <totalLength>8</totalLength>
-                    </header>
-                    <DisconnectResponse>
-                        <communicationChannelId>103</communicationChannelId>
-                        <status>0</status>
-                    </DisconnectResponse>
-                </knx:KNXNetIPMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="KNXNetIP-Tunneling-Request"
-                         root="KNXNetIPMessage"
-                         model="knxNetIpSchema"
-                         description="KNXNet/IP Tunneling-Request">
-        <tdml:document>
-            <tdml:documentPart type="byte">06100420001c046b00002b0703010504024502bc360a1e0ce100810d</tdml:documentPart>
-        </tdml:document>
-
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <knx:KNXNetIPMessage>
-                    <header>
-                        <headerLength>6</headerLength>
-                        <protocolVersion>16</protocolVersion>
-                        <serviceTypeIdentifier>1056</serviceTypeIdentifier>
-                        <totalLength>28</totalLength>
-                    </header>
-                    <TunnelingRequest>
-                        <structureLength>4</structureLength>
-                        <communicationChannelId>107</communicationChannelId>
-                        <sequenceCounter>0</sequenceCounter>
-                        <reserved>0</reserved>
-                        <cEMI>
-                            <messageCode>43</messageCode>
-                            <LBusmonInd>
-                                <additionalInformationLength>7</additionalInformationLength>
-                                <additionalInformation>
-                                    <additionalInformation>
-                                        <additionalInformationType>3</additionalInformationType>
-                                        <BusmonitorInfo>
-                                            <length>1</length>
-                                            <busmonitorErrorFlags>
-                                                <frameErrorFlag>false</frameErrorFlag>
-                                                <bitErrorFlag>false</bitErrorFlag>
-                                                <parityErrorFlag>false</parityErrorFlag>
-                                                <dontCare>false</dontCare>
-                                                <lostFlag>false</lostFlag>
-                                                <sequenceNumber>5</sequenceNumber>
-                                            </busmonitorErrorFlags>
-                                        </BusmonitorInfo>
-                                    </additionalInformation>
-                                    <additionalInformation>
-                                        <additionalInformationType>4</additionalInformationType>
-                                        <RelativeTimestamp>
-                                            <length>2</length>
-                                            <relativeTimestamp>17666</relativeTimestamp>
-                                        </RelativeTimestamp>
-                                    </additionalInformation>
-                                </additionalInformation>
-                                <rawFrame>BC360A1E0CE100810D</rawFrame>
-                            </LBusmonInd>
-                        </cEMI>
-                    </TunnelingRequest>
-                </knx:KNXNetIPMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="KNXNetIP-Tunneling-Response"
-                         root="KNXNetIPMessage"
-                         model="knxNetIpSchema"
-                         description="KNXNet/IP Tunneling-Response">
-        <tdml:document>
-            <tdml:documentPart type="byte">06100421000a046b0000</tdml:documentPart>
-        </tdml:document>
-
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <knx:KNXNetIPMessage>
-                    <header>
-                        <headerLength>6</headerLength>
-                        <protocolVersion>16</protocolVersion>
-                        <serviceTypeIdentifier>1057</serviceTypeIdentifier>
-                        <totalLength>10</totalLength>
-                    </header>
-                    <TunnelingResponse>
-                        <structureLength>4</structureLength>
-                        <communicationChannelId>107</communicationChannelId>
-                        <sequenceCounter>0</sequenceCounter>
-                        <status>0</status>
-                    </TunnelingResponse>
-                </knx:KNXNetIPMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-</tdml:testSuite>
-
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+
+<tdml:testSuite xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
+                xmlns:tdml="http://www.ibm.com/xmlns/dfdl/testData"
+                xmlns:knx="http://plc4x.apache.org/knxnet-ip"
+                xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                suiteName="KNXNet/IP protocol"
+                description="Testsuite for the KNXNet/IP protocol"
+                defaultRoundTrip="onePass">
+
+    <tdml:defineSchema name="knxNetIpSchema" elementFormDefault="unqualified">
+        <!-- Import the Schema -->
+        <xs:import namespace="http://plc4x.apache.org/knxnet-ip"
+                   schemaLocation="protocol.dfdl.xsd"/>
+
+        <!-- Import the format settings -->
+        <dfdl:format ref="knx:knxNetIpFullFormat"/>
+
+        <!-- Define the root element name and type -->
+        <!--xs:element name="TpktMessage" type="s7:TpktMessageType"/-->
+    </tdml:defineSchema>
+
+    <tdml:parserTestCase name="KNXNetIP-Search-Request"
+                         root="KNXNetIPMessage"
+                         model="knxNetIpSchema"
+                         description="KNXNet/IP Search-Request">
+        <tdml:document>
+            <tdml:documentPart type="byte">06100201000e0801c0a82a46ef8e</tdml:documentPart>
+        </tdml:document>
+
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <knx:KNXNetIPMessage>
+                    <header>
+                        <headerLength>6</headerLength>
+                        <protocolVersion>16</protocolVersion>
+                        <serviceTypeIdentifier>513</serviceTypeIdentifier>
+                        <totalLength>14</totalLength>
+                    </header>
+                    <SearchRequest>
+                        <HPAIDiscoveryEndpoint>
+                            <structureLength>8</structureLength>
+                            <hostProtocolCode>1</hostProtocolCode>
+                            <ipAddress>C0A82A46</ipAddress>
+                            <ipPort>61326</ipPort>
+                        </HPAIDiscoveryEndpoint>
+                    </SearchRequest>
+                </knx:KNXNetIPMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="KNXNetIP-Search-Response"
+                         root="KNXNetIPMessage"
+                         model="knxNetIpSchema"
+                         description="KNXNet/IP Search-Response">
+        <tdml:document>
+            <tdml:documentPart type="byte">
+                06100202004c0801c0a82a0b0e5736010200ffff000000082d409852e000170c000ab327553647697261204b4e582f49502d5363686e6974747374656c6c6500000000000802020103010401
+            </tdml:documentPart>
+        </tdml:document>
+
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <knx:KNXNetIPMessage>
+                    <header>
+                        <headerLength>6</headerLength>
+                        <protocolVersion>16</protocolVersion>
+                        <serviceTypeIdentifier>514</serviceTypeIdentifier>
+                        <totalLength>76</totalLength>
+                    </header>
+                    <SearchResponse>
+                        <HPAIControlEndpoint>
+                            <structureLength>8</structureLength>
+                            <hostProtocolCode>1</hostProtocolCode>
+                            <ipAddress>C0A82A0B</ipAddress>
+                            <ipPort>3671</ipPort>
+                        </HPAIControlEndpoint>
+                        <DIBDeviceInfo>
+                            <structureLength>54</structureLength>
+                            <descriptionType>1</descriptionType>
+                            <knxMedium>2</knxMedium>
+                            <deviceStatus>
+                                <reserved>0</reserved>
+                                <programMode>0</programMode>
+                            </deviceStatus>
+                            <knxAddress>
+                                <mainGroup>15</mainGroup>
+                                <middleGroup>15</middleGroup>
+                                <subGroup>255</subGroup>
+                            </knxAddress>
+                            <projectInstallationIdentifier>
+                                <projectNumber>0</projectNumber>
+                                <installationNumber>0</installationNumber>
+                            </projectInstallationIdentifier>
+                            <knxNetIpDeviceSerialNumber>00082D409852</knxNetIpDeviceSerialNumber>
+                            <knxNetIpDeviceMulticastAddress>E000170C</knxNetIpDeviceMulticastAddress>
+                            <knxNetIpDeviceMacAddress>000AB3275536</knxNetIpDeviceMacAddress>
+                            <deviceFriendlyName>Gira KNX/IP-Schnittstelleī€€ī€€ī€€ī€€ī€€</deviceFriendlyName>
+                        </DIBDeviceInfo>
+                        <DIBSuppSvcFamilies>
+                            <structureLength>8</structureLength>
+                            <descriptionType>2</descriptionType>
+                            <serviceIds>
+                                <serviceId>
+                                    <type>2</type>
+                                    <KnxNetIpCore>
+                                        <version>1</version>
+                                    </KnxNetIpCore>
+                                </serviceId>
+                                <serviceId>
+                                    <type>3</type>
+                                    <KnxNetIpDeviceManagement>
+                                        <version>1</version>
+                                    </KnxNetIpDeviceManagement>
+                                </serviceId>
+                                <serviceId>
+                                    <type>4</type>
+                                    <KnxNetIpTunneling>
+                                        <version>1</version>
+                                    </KnxNetIpTunneling>
+                                </serviceId>
+                            </serviceIds>
+                        </DIBSuppSvcFamilies>
+                    </SearchResponse>
+                </knx:KNXNetIPMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="KNXNetIP-Description-Request"
+                         root="KNXNetIPMessage"
+                         model="knxNetIpSchema"
+                         description="KNXNet/IP Description-Request">
+        <tdml:document>
+            <tdml:documentPart type="byte">06100203000e0801000000000000</tdml:documentPart>
+        </tdml:document>
+
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <knx:KNXNetIPMessage>
+                    <header>
+                        <headerLength>6</headerLength>
+                        <protocolVersion>16</protocolVersion>
+                        <serviceTypeIdentifier>515</serviceTypeIdentifier>
+                        <totalLength>14</totalLength>
+                    </header>
+                    <DescriptionRequest>
+                        <HPAIControlEndpoint>
+                            <structureLength>8</structureLength>
+                            <hostProtocolCode>1</hostProtocolCode>
+                            <ipAddress>00000000</ipAddress>
+                            <ipPort>0</ipPort>
+                        </HPAIControlEndpoint>
+                    </DescriptionRequest>
+                </knx:KNXNetIPMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="KNXNetIP-Description-Response"
+                         root="KNXNetIPMessage"
+                         model="knxNetIpSchema"
+                         description="KNXNet/IP Description-Response">
+        <tdml:document>
+            <tdml:documentPart type="byte">
+                06100204004436010200ffff000000082d409852e000170c000ab327553647697261204b4e582f49502d5363686e6974747374656c6c6500000000000802020103010401
+            </tdml:documentPart>
+        </tdml:document>
+
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <knx:KNXNetIPMessage>
+                    <header>
+                        <headerLength>6</headerLength>
+                        <protocolVersion>16</protocolVersion>
+                        <serviceTypeIdentifier>516</serviceTypeIdentifier>
+                        <totalLength>68</totalLength>
+                    </header>
+                    <DescriptionResponse>
+                        <DIBDeviceInfo>
+                            <structureLength>54</structureLength>
+                            <descriptionType>1</descriptionType>
+                            <knxMedium>2</knxMedium>
+                            <deviceStatus>
+                                <reserved>0</reserved>
+                                <programMode>0</programMode>
+                            </deviceStatus>
+                            <knxAddress>
+                                <mainGroup>15</mainGroup>
+                                <middleGroup>15</middleGroup>
+                                <subGroup>255</subGroup>
+                            </knxAddress>
+                            <projectInstallationIdentifier>
+                                <projectNumber>0</projectNumber>
+                                <installationNumber>0</installationNumber>
+                            </projectInstallationIdentifier>
+                            <knxNetIpDeviceSerialNumber>00082D409852</knxNetIpDeviceSerialNumber>
+                            <knxNetIpDeviceMulticastAddress>E000170C</knxNetIpDeviceMulticastAddress>
+                            <knxNetIpDeviceMacAddress>000AB3275536</knxNetIpDeviceMacAddress>
+                            <deviceFriendlyName>Gira KNX/IP-Schnittstelleī€€ī€€ī€€ī€€ī€€</deviceFriendlyName>
+                        </DIBDeviceInfo>
+                        <DIBSuppSvcFamilies>
+                            <structureLength>8</structureLength>
+                            <descriptionType>2</descriptionType>
+                            <serviceIds>
+                                <serviceId>
+                                    <type>2</type>
+                                    <KnxNetIpCore>
+                                        <version>1</version>
+                                    </KnxNetIpCore>
+                                </serviceId>
+                                <serviceId>
+                                    <type>3</type>
+                                    <KnxNetIpDeviceManagement>
+                                        <version>1</version>
+                                    </KnxNetIpDeviceManagement>
+                                </serviceId>
+                                <serviceId>
+                                    <type>4</type>
+                                    <KnxNetIpTunneling>
+                                        <version>1</version>
+                                    </KnxNetIpTunneling>
+                                </serviceId>
+                            </serviceIds>
+                        </DIBSuppSvcFamilies>
+                    </DescriptionResponse>
+                </knx:KNXNetIPMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="KNXNetIP-Connect-Request"
+                         root="KNXNetIPMessage"
+                         model="knxNetIpSchema"
+                         description="KNXNet/IP Connect-Request">
+        <tdml:document>
+            <tdml:documentPart type="byte">06100205001a0801c0a82a46f4310801c0a82a46f43204040200</tdml:documentPart>
+        </tdml:document>
+
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <knx:KNXNetIPMessage>
+                    <header>
+                        <headerLength>6</headerLength>
+                        <protocolVersion>16</protocolVersion>
+                        <serviceTypeIdentifier>517</serviceTypeIdentifier>
+                        <totalLength>26</totalLength>
+                    </header>
+                    <ConnectionRequest>
+                        <HPAIDiscoveryEndpoint>
+                            <structureLength>8</structureLength>
+                            <hostProtocolCode>1</hostProtocolCode>
+                            <ipAddress>C0A82A46</ipAddress>
+                            <ipPort>62513</ipPort>
+                        </HPAIDiscoveryEndpoint>
+                        <HPAIDataEndpoint>
+                            <structureLength>8</structureLength>
+                            <hostProtocolCode>1</hostProtocolCode>
+                            <ipAddress>C0A82A46</ipAddress>
+                            <ipPort>62514</ipPort>
+                        </HPAIDataEndpoint>
+                        <ConnectionRequestInformation>
+                            <structureLength>4</structureLength>
+                            <connectionType>4</connectionType>
+                            <knxLayer>2</knxLayer>
+                            <reserved>0</reserved>
+                        </ConnectionRequestInformation>
+                    </ConnectionRequest>
+                </knx:KNXNetIPMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="KNXNetIP-Connect-Response"
+                         root="KNXNetIPMessage"
+                         model="knxNetIpSchema"
+                         description="KNXNet/IP Connect-Response">
+        <tdml:document>
+            <tdml:documentPart type="byte">06100206001466000801c0a82a0b0e5704041101</tdml:documentPart>
+        </tdml:document>
+
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <knx:KNXNetIPMessage>
+                    <header>
+                        <headerLength>6</headerLength>
+                        <protocolVersion>16</protocolVersion>
+                        <serviceTypeIdentifier>518</serviceTypeIdentifier>
+                        <totalLength>20</totalLength>
+                    </header>
+                    <ConnectionResponse>
+                        <communicationChannelId>102</communicationChannelId>
+                        <status>0</status>
+                        <HPAIDataEndpoint>
+                            <structureLength>8</structureLength>
+                            <hostProtocolCode>1</hostProtocolCode>
+                            <ipAddress>C0A82A0B</ipAddress>
+                            <ipPort>3671</ipPort>
+                        </HPAIDataEndpoint>
+                        <ConnectionResponseDataBlock>
+                            <structureLength>4</structureLength>
+                            <connectionType>4</connectionType>
+                            <knxAddress>
+                                <mainGroup>1</mainGroup>
+                                <middleGroup>1</middleGroup>
+                                <subGroup>1</subGroup>
+                            </knxAddress>
+                        </ConnectionResponseDataBlock>
+                    </ConnectionResponse>
+                </knx:KNXNetIPMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="KNXNetIP-Connection-State-Request"
+                         root="KNXNetIPMessage"
+                         model="knxNetIpSchema"
+                         description="KNXNet/IP Connection-State-Request">
+        <tdml:document>
+            <tdml:documentPart type="byte">06100207001066000801c0a82a46f431</tdml:documentPart>
+        </tdml:document>
+
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <knx:KNXNetIPMessage>
+                    <header>
+                        <headerLength>6</headerLength>
+                        <protocolVersion>16</protocolVersion>
+                        <serviceTypeIdentifier>519</serviceTypeIdentifier>
+                        <totalLength>16</totalLength>
+                    </header>
+                    <ConnectionStateRequest>
+                        <communicationChannelId>102</communicationChannelId>
+                        <reserved>0</reserved>
+                        <HPAIControlEndpoint>
+                            <structureLength>8</structureLength>
+                            <hostProtocolCode>1</hostProtocolCode>
+                            <ipAddress>C0A82A46</ipAddress>
+                            <ipPort>62513</ipPort>
+                        </HPAIControlEndpoint>
+                    </ConnectionStateRequest>
+                </knx:KNXNetIPMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="KNXNetIP-Connection-State-Response"
+                         root="KNXNetIPMessage"
+                         model="knxNetIpSchema"
+                         description="KNXNet/IP Connection-State-Response">
+        <tdml:document>
+            <tdml:documentPart type="byte">0610020800086600</tdml:documentPart>
+        </tdml:document>
+
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <knx:KNXNetIPMessage>
+                    <header>
+                        <headerLength>6</headerLength>
+                        <protocolVersion>16</protocolVersion>
+                        <serviceTypeIdentifier>520</serviceTypeIdentifier>
+                        <totalLength>8</totalLength>
+                    </header>
+                    <ConnectionStateResponse>
+                        <communicationChannelId>102</communicationChannelId>
+                        <status>0</status>
+                    </ConnectionStateResponse>
+                </knx:KNXNetIPMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="KNXNetIP-Device-Configuration-Request"
+                         root="KNXNetIPMessage"
+                         model="knxNetIpSchema"
+                         description="KNXNet/IP Device-Configuration-Request">
+        <tdml:document>
+            <tdml:documentPart type="byte">06100310001104670000fc000001531001</tdml:documentPart>
+        </tdml:document>
+
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <knx:KNXNetIPMessage>
+                    <header>
+                        <headerLength>6</headerLength>
+                        <protocolVersion>16</protocolVersion>
+                        <serviceTypeIdentifier>784</serviceTypeIdentifier>
+                        <totalLength>17</totalLength>
+                    </header>
+                    <DeviceConfigurationRequest>
+                        <structureLength>4</structureLength>
+                        <communicationChannelId>103</communicationChannelId>
+                        <sequenceCounter>0</sequenceCounter>
+                        <reserved>0</reserved>
+                        <cEMI>
+                            <messageCode>252</messageCode>
+                            <MPropRead>
+                                <interfaceObjectType>0</interfaceObjectType>
+                                <objectInstance>1</objectInstance>
+                                <propertyIdentifyer>83</propertyIdentifyer>
+                                <numberOfElements>1</numberOfElements>
+                                <startIndex>1</startIndex>
+                            </MPropRead>
+                        </cEMI>
+                    </DeviceConfigurationRequest>
+                </knx:KNXNetIPMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="KNXNetIP-Device-Configuration-Response"
+                         root="KNXNetIPMessage"
+                         model="knxNetIpSchema"
+                         description="KNXNet/IP Device-Configuration-Response">
+        <tdml:document>
+            <tdml:documentPart type="byte">06100311000a04670000</tdml:documentPart>
+        </tdml:document>
+
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <knx:KNXNetIPMessage>
+                    <header>
+                        <headerLength>6</headerLength>
+                        <protocolVersion>16</protocolVersion>
+                        <serviceTypeIdentifier>785</serviceTypeIdentifier>
+                        <totalLength>10</totalLength>
+                    </header>
+                    <DeviceConfigurationResponse>
+                        <structureLength>4</structureLength>
+                        <communicationChannelId>103</communicationChannelId>
+                        <sequenceCounter>0</sequenceCounter>
+                        <status>0</status>
+                    </DeviceConfigurationResponse>
+                </knx:KNXNetIPMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="KNXNetIP-Disconnect-Request"
+                         root="KNXNetIPMessage"
+                         model="knxNetIpSchema"
+                         description="KNXNet/IP Disconnect-Request">
+        <tdml:document>
+            <tdml:documentPart type="byte">06100209001067000801c0a82a46f431</tdml:documentPart>
+        </tdml:document>
+
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <knx:KNXNetIPMessage>
+                    <header>
+                        <headerLength>6</headerLength>
+                        <protocolVersion>16</protocolVersion>
+                        <serviceTypeIdentifier>521</serviceTypeIdentifier>
+                        <totalLength>16</totalLength>
+                    </header>
+                    <DisconnectRequest>
+                        <communicationChannelId>103</communicationChannelId>
+                        <reserved>0</reserved>
+                        <HPAIControlEndpoint>
+                            <structureLength>8</structureLength>
+                            <hostProtocolCode>1</hostProtocolCode>
+                            <ipAddress>C0A82A46</ipAddress>
+                            <ipPort>62513</ipPort>
+                        </HPAIControlEndpoint>
+                    </DisconnectRequest>
+                </knx:KNXNetIPMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="KNXNetIP-Disconnect-Response"
+                         root="KNXNetIPMessage"
+                         model="knxNetIpSchema"
+                         description="KNXNet/IP Disconnect-Response">
+        <tdml:document>
+            <tdml:documentPart type="byte">0610020a00086700</tdml:documentPart>
+        </tdml:document>
+
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <knx:KNXNetIPMessage>
+                    <header>
+                        <headerLength>6</headerLength>
+                        <protocolVersion>16</protocolVersion>
+                        <serviceTypeIdentifier>522</serviceTypeIdentifier>
+                        <totalLength>8</totalLength>
+                    </header>
+                    <DisconnectResponse>
+                        <communicationChannelId>103</communicationChannelId>
+                        <status>0</status>
+                    </DisconnectResponse>
+                </knx:KNXNetIPMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="KNXNetIP-Tunneling-Request"
+                         root="KNXNetIPMessage"
+                         model="knxNetIpSchema"
+                         description="KNXNet/IP Tunneling-Request">
+        <tdml:document>
+            <tdml:documentPart type="byte">06100420001c046b00002b0703010504024502bc360a1e0ce100810d</tdml:documentPart>
+        </tdml:document>
+
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <knx:KNXNetIPMessage>
+                    <header>
+                        <headerLength>6</headerLength>
+                        <protocolVersion>16</protocolVersion>
+                        <serviceTypeIdentifier>1056</serviceTypeIdentifier>
+                        <totalLength>28</totalLength>
+                    </header>
+                    <TunnelingRequest>
+                        <structureLength>4</structureLength>
+                        <communicationChannelId>107</communicationChannelId>
+                        <sequenceCounter>0</sequenceCounter>
+                        <reserved>0</reserved>
+                        <cEMI>
+                            <messageCode>43</messageCode>
+                            <LBusmonInd>
+                                <additionalInformationLength>7</additionalInformationLength>
+                                <additionalInformation>
+                                    <additionalInformation>
+                                        <additionalInformationType>3</additionalInformationType>
+                                        <BusmonitorInfo>
+                                            <length>1</length>
+                                            <busmonitorErrorFlags>
+                                                <frameErrorFlag>false</frameErrorFlag>
+                                                <bitErrorFlag>false</bitErrorFlag>
+                                                <parityErrorFlag>false</parityErrorFlag>
+                                                <dontCare>false</dontCare>
+                                                <lostFlag>false</lostFlag>
+                                                <sequenceNumber>5</sequenceNumber>
+                                            </busmonitorErrorFlags>
+                                        </BusmonitorInfo>
+                                    </additionalInformation>
+                                    <additionalInformation>
+                                        <additionalInformationType>4</additionalInformationType>
+                                        <RelativeTimestamp>
+                                            <length>2</length>
+                                            <relativeTimestamp>17666</relativeTimestamp>
+                                        </RelativeTimestamp>
+                                    </additionalInformation>
+                                </additionalInformation>
+                                <rawFrame>BC360A1E0CE100810D</rawFrame>
+                            </LBusmonInd>
+                        </cEMI>
+                    </TunnelingRequest>
+                </knx:KNXNetIPMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="KNXNetIP-Tunneling-Response"
+                         root="KNXNetIPMessage"
+                         model="knxNetIpSchema"
+                         description="KNXNet/IP Tunneling-Response">
+        <tdml:document>
+            <tdml:documentPart type="byte">06100421000a046b0000</tdml:documentPart>
+        </tdml:document>
+
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <knx:KNXNetIPMessage>
+                    <header>
+                        <headerLength>6</headerLength>
+                        <protocolVersion>16</protocolVersion>
+                        <serviceTypeIdentifier>1057</serviceTypeIdentifier>
+                        <totalLength>10</totalLength>
+                    </header>
+                    <TunnelingResponse>
+                        <structureLength>4</structureLength>
+                        <communicationChannelId>107</communicationChannelId>
+                        <sequenceCounter>0</sequenceCounter>
+                        <status>0</status>
+                    </TunnelingResponse>
+                </knx:KNXNetIPMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+</tdml:testSuite>
+
+
diff --git a/protocols/pom.xml b/protocols/pom.xml
index 73d28746e4a..b5ba84ebdbd 100644
--- a/protocols/pom.xml
+++ b/protocols/pom.xml
@@ -1,210 +1,210 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4x-parent</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4x-protocols</artifactId>
-  <packaging>pom</packaging>
-
-  <name>Protocols</name>
-  <description>Base protocol specifications.</description>
-
-  <build>
-    <plugins>
-      <!--
-        This plugin doesn't really do much, it makes sure the jacoco agent
-        is downloaded and that the path to this is saved in an environment
-        variable so we can access this later on in the build.
-      -->
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <executions>
-          <!--
-              Prepares the property pointing to the JaCoCo runtime agent which
-              is passed as VM argument when Maven the Surefire plugin is executed.
-          -->
-          <execution>
-            <id>pre-unit-test</id>
-            <phase>generate-test-sources</phase>
-            <goals>
-              <goal>prepare-agent</goal>
-            </goals>
-            <configuration>
-              <!--
-                  Sets the name of the property containing the settings
-                  for JaCoCo runtime agent.
-              -->
-              <propertyName>surefireArgLine</propertyName>
-            </configuration>
-          </execution>
-          <!--
-              Prepares the property pointing to the JaCoCo runtime agent which
-              is passed as VM argument when Maven the Failsafe plugin is executed.
-          -->
-          <execution>
-            <id>pre-integration-test</id>
-            <phase>pre-integration-test</phase>
-            <goals>
-              <goal>prepare-agent-integration</goal>
-            </goals>
-            <configuration>
-              <!--
-                  Sets the name of the property containing the settings
-                  for JaCoCo runtime agent.
-              -->
-              <propertyName>failsafeArgLine</propertyName>
-            </configuration>
-          </execution>
-          <!--
-              Check if the unit-test-coverage is at least a certain minimum.
-          -->
-          <execution>
-            <id>check-coverage</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-            <configuration>
-              <!-- TODO: Turn this on as soon as possible. -->
-              <haltOnFailure>false</haltOnFailure>
-              <rules>
-                <rule implementation="org.jacoco.maven.RuleConfiguration">
-                  <element>BUNDLE</element>
-                  <limits>
-                    <!-- Fail the build if the instruction level coverage is below 80%. -->
-                    <limit implementation="org.jacoco.report.check.Limit">
-                      <counter>INSTRUCTION</counter>
-                      <value>COVEREDRATIO</value>
-                      <minimum>0.50</minimum>
-                    </limit>
-                    <!-- Fail the build if there are classes without any coverage. -->
-                    <limit implementation="org.jacoco.report.check.Limit">
-                      <counter>CLASS</counter>
-                      <value>MISSEDCOUNT</value>
-                      <maximum>0</maximum>
-                    </limit>
-                  </limits>
-                </rule>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!--
-        Make the surefire execute all unit-tests
-      -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <!--
-            We have to slightly increase the heap-size or some tests will fail.
-            Notice the @ instead of the $ as prefix? That's late evaluation.
-          -->
-          <argLine>-Xmx256m @{surefireArgLine}</argLine>
-          <includes>
-            <include>**/*Test.java</include>
-            <include>**/*Tests.java</include>
-            <include>**/*Spec.java</include>
-          </includes>
-        </configuration>
-      </plugin>
-
-      <!--
-        Generate an OSGI compatible MANIFEST file.
-      -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>bundle-manifest</id>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>manifest</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!--
-        Use the MANIFEST file generated by the maven-bundle-plugin.
-      -->
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-          </archive>
-        </configuration>
-      </plugin>
-
-      <!--
-        Make the failsafe execute all integration-tests
-      -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>integration-test</goal>
-              <goal>verify</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <!--
-                Notice the @ instead of the $ as prefix? That's late evaluation.
-          -->
-          <argLine>@{failsafeArgLine}</argLine>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <modules>
-    <module>ab-eth</module>
-    <module>bacnetip</module>
-    <module>df1</module>
-    <module>knxnetip</module>
-    <module>s7</module>
-  </modules>
-
-  <profiles>
-    <profile>
-      <id>with-proxies</id>
-      <modules>
-        <!-- Thrift based protocols -->
-        <module>proxy</module>
-      </modules>
-    </profile>
-  </profiles>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4x-parent</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4x-protocols</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Protocols</name>
+  <description>Base protocol specifications.</description>
+
+  <build>
+    <plugins>
+      <!--
+        This plugin doesn't really do much, it makes sure the jacoco agent
+        is downloaded and that the path to this is saved in an environment
+        variable so we can access this later on in the build.
+      -->
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <executions>
+          <!--
+              Prepares the property pointing to the JaCoCo runtime agent which
+              is passed as VM argument when Maven the Surefire plugin is executed.
+          -->
+          <execution>
+            <id>pre-unit-test</id>
+            <phase>generate-test-sources</phase>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+            <configuration>
+              <!--
+                  Sets the name of the property containing the settings
+                  for JaCoCo runtime agent.
+              -->
+              <propertyName>surefireArgLine</propertyName>
+            </configuration>
+          </execution>
+          <!--
+              Prepares the property pointing to the JaCoCo runtime agent which
+              is passed as VM argument when Maven the Failsafe plugin is executed.
+          -->
+          <execution>
+            <id>pre-integration-test</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>prepare-agent-integration</goal>
+            </goals>
+            <configuration>
+              <!--
+                  Sets the name of the property containing the settings
+                  for JaCoCo runtime agent.
+              -->
+              <propertyName>failsafeArgLine</propertyName>
+            </configuration>
+          </execution>
+          <!--
+              Check if the unit-test-coverage is at least a certain minimum.
+          -->
+          <execution>
+            <id>check-coverage</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <configuration>
+              <!-- TODO: Turn this on as soon as possible. -->
+              <haltOnFailure>false</haltOnFailure>
+              <rules>
+                <rule implementation="org.jacoco.maven.RuleConfiguration">
+                  <element>BUNDLE</element>
+                  <limits>
+                    <!-- Fail the build if the instruction level coverage is below 80%. -->
+                    <limit implementation="org.jacoco.report.check.Limit">
+                      <counter>INSTRUCTION</counter>
+                      <value>COVEREDRATIO</value>
+                      <minimum>0.50</minimum>
+                    </limit>
+                    <!-- Fail the build if there are classes without any coverage. -->
+                    <limit implementation="org.jacoco.report.check.Limit">
+                      <counter>CLASS</counter>
+                      <value>MISSEDCOUNT</value>
+                      <maximum>0</maximum>
+                    </limit>
+                  </limits>
+                </rule>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!--
+        Make the surefire execute all unit-tests
+      -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <!--
+            We have to slightly increase the heap-size or some tests will fail.
+            Notice the @ instead of the $ as prefix? That's late evaluation.
+          -->
+          <argLine>-Xmx256m @{surefireArgLine}</argLine>
+          <includes>
+            <include>**/*Test.java</include>
+            <include>**/*Tests.java</include>
+            <include>**/*Spec.java</include>
+          </includes>
+        </configuration>
+      </plugin>
+
+      <!--
+        Generate an OSGI compatible MANIFEST file.
+      -->
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!--
+        Use the MANIFEST file generated by the maven-bundle-plugin.
+      -->
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
+        </configuration>
+      </plugin>
+
+      <!--
+        Make the failsafe execute all integration-tests
+      -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <!--
+                Notice the @ instead of the $ as prefix? That's late evaluation.
+          -->
+          <argLine>@{failsafeArgLine}</argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <modules>
+    <module>ab-eth</module>
+    <module>bacnetip</module>
+    <module>df1</module>
+    <module>knxnetip</module>
+    <module>s7</module>
+  </modules>
+
+  <profiles>
+    <profile>
+      <id>with-proxies</id>
+      <modules>
+        <!-- Thrift based protocols -->
+        <module>proxy</module>
+      </modules>
+    </profile>
+  </profiles>
+
 </project>
\ No newline at end of file
diff --git a/protocols/proxy/pom.xml b/protocols/proxy/pom.xml
index 0b450d5956a..59c85e48929 100644
--- a/protocols/proxy/pom.xml
+++ b/protocols/proxy/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4x-protocols</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4x-protocols-proxy</artifactId>
-
-  <name>Protocols: Proxy</name>
-  <description>Base protocol specifications for the Thrift-based proxy protocol</description>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4x-protocols</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4x-protocols-proxy</artifactId>
+
+  <name>Protocols: Proxy</name>
+  <description>Base protocol specifications for the Thrift-based proxy protocol</description>
+
 </project>
\ No newline at end of file
diff --git a/protocols/proxy/src/main/java/.keepMe b/protocols/proxy/src/main/java/.keepMe
index 97c6314c971..29b0621fd17 100644
--- a/protocols/proxy/src/main/java/.keepMe
+++ b/protocols/proxy/src/main/java/.keepMe
@@ -1,20 +1,20 @@
-
-  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
-
-      http://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.
-
-This file is required to force the existence of the src/main/java directory
-which activates the "java-module" maven profile.
-
+
+  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
+
+      http://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.
+
+This file is required to force the existence of the src/main/java directory
+which activates the "java-module" maven profile.
+
 PLEASE DO NOT DELETE ... it will break the build.
\ No newline at end of file
diff --git a/protocols/proxy/src/main/resources/org/apache/plc4x/protocols/proxy/interop.thrift b/protocols/proxy/src/main/resources/org/apache/plc4x/protocols/proxy/interop.thrift
index 970a1831e41..f3850253c3c 100644
--- a/protocols/proxy/src/main/resources/org/apache/plc4x/protocols/proxy/interop.thrift
+++ b/protocols/proxy/src/main/resources/org/apache/plc4x/protocols/proxy/interop.thrift
@@ -1,93 +1,93 @@
-/*
- * 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
- *
- *   http://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.
- */
-
-# Thrift Definition for PLC4X Interop Server
-
-/**
- * The first thing to know about are types. The available types in Thrift are:
- *
- *  bool        Boolean, one byte
- *  i8 (byte)   Signed 8-bit integer
- *  i16         Signed 16-bit integer
- *  i32         Signed 32-bit integer
- *  i64         Signed 64-bit integer
- *  double      64-bit floating point value
- *  string      String
- *  binary      Blob (byte array)
- *  map<t1,t2>  Map from one type to another
- *  list<t1>    Ordered list of one type
- *  set<t1>     Set of unique elements of one type
- *
- * Did you also notice that Thrift supports C style comments?
- */
-
-/**
- * Thrift files can namespace, package, or prefix their output in various
- * target languages.
- */
-
-namespace java org.apache.plc4x.interop
-namespace py org.apache.plc4x.interop
-namespace csharp org.apache.plc4x.interop
-
-
-enum RESPONSE_CODE {
-  OK = 1,
-  NOT_FOUND = 2,
-  ACCESS_DENIED = 3,
-  INVALID_ADDRESS = 4,
-  INVALID_DATATYPE = 5,
-  INTERNAL_ERROR = 6,
-  RESPONSE_PENDING = 7
-}
-
-struct ConnectionHandle {
-  1: i64 connectionId
-}
-
-exception PlcException {
-  1: string url,
-  2: string exceptionString
-}
-
-struct Request {
-  1: map<string, string> fields
-}
-
-struct FieldResponse {
-  1: RESPONSE_CODE responseCode,
-  2: optional bool boolValue,
-  3: optional i64 longValue,
-  4: optional double doubleValue,
-  5: optional string stringValue
-}
-
-struct Response {
-  1: map<string, FieldResponse> fields
-}
-
-service InteropServer {
-
-   ConnectionHandle connect(1: string connectionString) throws (1: PlcException connectionException),
-
-   Response execute(1: ConnectionHandle handle, 2: Request request) throws (1: PlcException executionException),
-
-   void close(1: ConnectionHandle handle)
-
-}
+/*
+ * 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
+ *
+ *   http://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.
+ */
+
+# Thrift Definition for PLC4X Interop Server
+
+/**
+ * The first thing to know about are types. The available types in Thrift are:
+ *
+ *  bool        Boolean, one byte
+ *  i8 (byte)   Signed 8-bit integer
+ *  i16         Signed 16-bit integer
+ *  i32         Signed 32-bit integer
+ *  i64         Signed 64-bit integer
+ *  double      64-bit floating point value
+ *  string      String
+ *  binary      Blob (byte array)
+ *  map<t1,t2>  Map from one type to another
+ *  list<t1>    Ordered list of one type
+ *  set<t1>     Set of unique elements of one type
+ *
+ * Did you also notice that Thrift supports C style comments?
+ */
+
+/**
+ * Thrift files can namespace, package, or prefix their output in various
+ * target languages.
+ */
+
+namespace java org.apache.plc4x.interop
+namespace py org.apache.plc4x.interop
+namespace csharp org.apache.plc4x.interop
+
+
+enum RESPONSE_CODE {
+  OK = 1,
+  NOT_FOUND = 2,
+  ACCESS_DENIED = 3,
+  INVALID_ADDRESS = 4,
+  INVALID_DATATYPE = 5,
+  INTERNAL_ERROR = 6,
+  RESPONSE_PENDING = 7
+}
+
+struct ConnectionHandle {
+  1: i64 connectionId
+}
+
+exception PlcException {
+  1: string url,
+  2: string exceptionString
+}
+
+struct Request {
+  1: map<string, string> fields
+}
+
+struct FieldResponse {
+  1: RESPONSE_CODE responseCode,
+  2: optional bool boolValue,
+  3: optional i64 longValue,
+  4: optional double doubleValue,
+  5: optional string stringValue
+}
+
+struct Response {
+  1: map<string, FieldResponse> fields
+}
+
+service InteropServer {
+
+   ConnectionHandle connect(1: string connectionString) throws (1: PlcException connectionException),
+
+   Response execute(1: ConnectionHandle handle, 2: Request request) throws (1: PlcException executionException),
+
+   void close(1: ConnectionHandle handle)
+
+}
diff --git a/protocols/s7/pom.xml b/protocols/s7/pom.xml
index 80bb9ba279a..833b7ef23d9 100644
--- a/protocols/s7/pom.xml
+++ b/protocols/s7/pom.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4x-protocols</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4x-protocols-s7</artifactId>
-
-  <name>Protocols: S7</name>
-  <description>Base protocol specifications for the Siemens S7 protocol</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4x-protocols</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4x-protocols-s7</artifactId>
+
+  <name>Protocols: S7</name>
+  <description>Base protocol specifications for the Siemens S7 protocol</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/protocols/s7/src/main/java/org/apache/plc4x/protocol/s7/S7Protocol.java b/protocols/s7/src/main/java/org/apache/plc4x/protocol/s7/S7Protocol.java
index 414780f7960..707c57bca58 100644
--- a/protocols/s7/src/main/java/org/apache/plc4x/protocol/s7/S7Protocol.java
+++ b/protocols/s7/src/main/java/org/apache/plc4x/protocol/s7/S7Protocol.java
@@ -1,46 +1,46 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.protocol.s7;
-
-import org.apache.plc4x.plugins.codegenerator.language.mspec.parser.MessageFormatParser;
-import org.apache.plc4x.plugins.codegenerator.protocol.Protocol;
-import org.apache.plc4x.plugins.codegenerator.types.definitions.TypeDefinition;
-import org.apache.plc4x.plugins.codegenerator.types.exceptions.GenerationException;
-
-import java.io.InputStream;
-import java.util.Map;
-
-public class S7Protocol implements Protocol {
-
-    @Override
-    public String getName() {
-        return "s7";
-    }
-
-    @Override
-    public Map<String, TypeDefinition> getTypeDefinitions() throws GenerationException {
-        InputStream schemaInputStream = S7Protocol.class.getResourceAsStream("/protocols/s7/s7.mspec");
-        if(schemaInputStream == null) {
-            throw new GenerationException("Error loading message-format schema for protocol '" + getName() + "'");
-        }
-        return new MessageFormatParser().parse(schemaInputStream);
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.protocol.s7;
+
+import org.apache.plc4x.plugins.codegenerator.language.mspec.parser.MessageFormatParser;
+import org.apache.plc4x.plugins.codegenerator.protocol.Protocol;
+import org.apache.plc4x.plugins.codegenerator.types.definitions.TypeDefinition;
+import org.apache.plc4x.plugins.codegenerator.types.exceptions.GenerationException;
+
+import java.io.InputStream;
+import java.util.Map;
+
+public class S7Protocol implements Protocol {
+
+    @Override
+    public String getName() {
+        return "s7";
+    }
+
+    @Override
+    public Map<String, TypeDefinition> getTypeDefinitions() throws GenerationException {
+        InputStream schemaInputStream = S7Protocol.class.getResourceAsStream("/protocols/s7/s7.mspec");
+        if(schemaInputStream == null) {
+            throw new GenerationException("Error loading message-format schema for protocol '" + getName() + "'");
+        }
+        return new MessageFormatParser().parse(schemaInputStream);
+    }
+
+}
diff --git a/protocols/s7/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol b/protocols/s7/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol
index bd27e59bddd..5499eae5f73 100644
--- a/protocols/s7/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol
+++ b/protocols/s7/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol
@@ -1,19 +1,19 @@
-#
-# 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
-#
-#     http://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.
-#
+#
+# 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
+#
+#     http://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.
+#
 org.apache.plc4x.protocol.s7.S7Protocol
\ No newline at end of file
diff --git a/protocols/s7/src/main/resources/protocols/s7/s7.mspec b/protocols/s7/src/main/resources/protocols/s7/s7.mspec
index 31b588c1c87..b9683d30259 100644
--- a/protocols/s7/src/main/resources/protocols/s7/s7.mspec
+++ b/protocols/s7/src/main/resources/protocols/s7/s7.mspec
@@ -1,367 +1,367 @@
-//
-// 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
-//
-//     http://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.
-//
-
-////////////////////////////////////////////////////////////////
-// IsoOnTcp/TPKT
-////////////////////////////////////////////////////////////////
-
-[type 'TPKTPacket'
-    [const    uint 8     'protocolId' '0x03']
-    [reserved uint 8     '0x00']
-    [implicit uint 16    'len'        'payload.lengthInBytes + 4']
-    [simple   COTPPacket 'payload' ['len - 4']]
-]
-
-////////////////////////////////////////////////////////////////
-// COTP
-////////////////////////////////////////////////////////////////
-
-[discriminatedType 'COTPPacket' [uint 16 'cotpLen']
-    [implicit      uint 8 'headerLength' 'lengthInBytes - (((payload != null) ? payload.lengthInBytes : 0) + 1)']
-    [discriminator uint 8 'tpduCode']
-    [typeSwitch 'tpduCode'
-        ['0xF0' COTPPacketData
-            [simple bit    'eot']
-            [simple uint 7 'tpduRef']
-        ]
-        ['0xE0' COTPPacketConnectionRequest
-            [simple uint 16           'destinationReference']
-            [simple uint 16           'sourceReference']
-            [enum   COTPProtocolClass 'protocolClass']
-        ]
-        ['0xD0' COTPPacketConnectionResponse
-            [simple uint 16           'destinationReference']
-            [simple uint 16           'sourceReference']
-            [enum   COTPProtocolClass 'protocolClass']
-        ]
-        ['0x80' COTPPacketDisconnectRequest
-            [simple uint 16           'destinationReference']
-            [simple uint 16           'sourceReference']
-            [enum   COTPProtocolClass 'protocolClass']
-        ]
-        ['0xC0' COTPPacketDisconnectResponse
-            [simple uint 16 'destinationReference']
-            [simple uint 16 'sourceReference']
-        ]
-        ['0x70' COTPPacketTpduError
-            [simple uint 16 'destinationReference']
-            [simple uint 8  'rejectCause']
-        ]
-    ]
-    [array    COTPParameter 'parameters' length '(headerLength + 1) - curPos' ['(headerLength + 1) - curPos']]
-    [optional S7Message     'payload'    'curPos < cotpLen']
-]
-
-[discriminatedType 'COTPParameter' [uint 8 'rest']
-    [discriminator uint 8 'parameterType']
-    [implicit      uint 8 'parameterLength' 'lengthInBytes - 2']
-    [typeSwitch 'parameterType'
-        ['0xC0' COTPParameterTpduSize
-            [enum COTPTpduSize 'tpduSize']
-        ]
-        ['0xC1' COTPParameterCallingTsap
-            [simple uint 16 'tsapId']
-        ]
-        ['0xC2' COTPParameterCalledTsap
-            [simple uint 16 'tsapId']
-        ]
-        ['0xC3' COTPParameterChecksum
-            [simple uint 8 'crc']
-        ]
-        ['0xE0' COTPParameterDisconnectAdditionalInformation
-            [array  uint 8 'data' count 'rest']
-        ]
-    ]
-]
-
-////////////////////////////////////////////////////////////////
-// S7
-////////////////////////////////////////////////////////////////
-
-[discriminatedType 'S7Message'
-    [const         uint 8  'protocolId'      '0x32']
-    [discriminator uint 8  'messageType']
-    [reserved      uint 16 '0x0000']
-    [simple        uint 16 'tpduReference']
-    [implicit      uint 16 'parameterLength' 'parameter.lengthInBytes']
-    [implicit      uint 16 'payloadLength'   'payload.lengthInBytes']
-    [typeSwitch 'messageType'
-        ['0x01' S7MessageRequest
-        ]
-        ['0x03' S7MessageResponse
-            [simple uint 8 'errorClass']
-            [simple uint 8 'errorCode']
-        ]
-        ['0x07' S7MessageUserData
-        ]
-    ]
-    [simple S7Parameter 'parameter' ['messageType']]
-    [simple S7Payload   'payload'   ['messageType', 'parameter']]
-]
-
-////////////////////////////////////////////////////////////////
-// Parameters
-
-[discriminatedType 'S7Parameter' [uint 8 'messageType']
-    [discriminator uint 8 'parameterType']
-    [typeSwitch 'parameterType','messageType'
-        ['0xF0' S7ParameterSetupCommunication
-            [reserved uint 8  '0x00']
-            [simple   uint 16 'maxAmqCaller']
-            [simple   uint 16 'maxAmqCallee']
-            [simple   uint 16 'pduLength']
-        ]
-        ['0x04','0x01' S7ParameterReadVarRequest
-            [implicit uint 8                    'numItems' 'COUNT(items)']
-            [array    S7VarRequestParameterItem 'items'    count 'numItems']
-        ]
-        ['0x04','0x03' S7ParameterReadVarResponse
-            [simple uint 8 'numItems']
-        ]
-        ['0x05','0x01' S7ParameterWriteVarRequest
-            [implicit uint 8                    'numItems' 'COUNT(items)']
-            [array    S7VarRequestParameterItem 'items'    count 'numItems']
-        ]
-        ['0x05','0x03' S7ParameterWriteVarResponse
-            [simple uint 8 'numItems']
-        ]
-        ['0x00','0x07' S7ParameterUserData
-            [implicit uint 8                  'numItems' 'COUNT(items)']
-            [array    S7ParameterUserDataItem 'items' count 'numItems']
-        ]
-    ]
-]
-
-[discriminatedType 'S7VarRequestParameterItem'
-    [discriminator uint 8 'itemType']
-    [typeSwitch 'itemType'
-        ['0x12' S7VarRequestParameterItemAddress
-            [implicit uint 8    'itemLength' 'address.lengthInBytes']
-            [simple   S7Address 'address']
-        ]
-    ]
-]
-
-[discriminatedType 'S7Address'
-    [discriminator uint 8 'addressType']
-    [typeSwitch 'addressType'
-        ['0x10' S7AddressAny
-            [enum     TransportSize 'transportSize']
-            [simple   uint 16       'numberOfElements']
-            [simple   uint 16       'dbNumber']
-            [enum     MemoryArea    'area']
-            [reserved uint 5        '0x00']
-            [simple   uint 16       'byteAddress']
-            [simple   uint 3        'bitAddress']
-        ]
-    ]
-]
-
-[discriminatedType 'S7ParameterUserDataItem'
-    [discriminator uint 8 'itemType']
-    [typeSwitch 'itemType'
-        ['0x12' S7ParameterUserDataItemCPUFunctions
-            [implicit uint 8  'itemLength' 'lengthInBytes - 2']
-            [simple   uint 8  'method']
-            [simple   uint 4  'cpuFunctionType']
-            [simple   uint 4  'cpuFunctionGroup']
-            [simple   uint 8  'cpuSubfunction']
-            [simple   uint 8  'sequenceNumber']
-            [optional uint 8  'dataUnitReferenceNumber' 'cpuFunctionType == 8']
-            [optional uint 8  'lastDataUnit' 'cpuFunctionType == 8']
-            [optional uint 16 'errorCode' 'cpuFunctionType == 8']
-        ]
-    ]
-]
-
-[type 'SzlId'
-    [enum   SzlModuleTypeClass 'typeClass']
-    [simple uint 4             'sublistExtract']
-    [enum   SzlSublist         'sublistList']
-]
-
-[type 'SzlDataTreeItem'
-    [simple uint 16 'itemIndex']
-    [array  int 8   'mlfb' count '20']
-    [simple uint 16 'moduleTypeId']
-    [simple uint 16 'ausbg']
-    [simple uint 16 'ausbe']
-]
-
-////////////////////////////////////////////////////////////////
-// Payloads
-
-[discriminatedType 'S7Payload' [uint 8 'messageType', S7Parameter 'parameter']
-    [typeSwitch 'parameter.discriminatorValues[0]', 'messageType'
-        ['0xF0' S7PayloadSetupCommunication]
-        ['0x04','0x01' S7PayloadReadVarRequest]
-        ['0x04','0x03' S7PayloadReadVarResponse
-            [array S7VarPayloadDataItem 'items' count 'CAST(parameter, S7ParameterReadVarResponse).numItems']
-        ]
-        ['0x05','0x01' S7PayloadWriteVarRequest
-            [array S7VarPayloadDataItem 'items' count 'COUNT(CAST(parameter, S7ParameterWriteVarRequest).items)']
-        ]
-        ['0x05','0x03' S7PayloadWriteVarResponse
-            [array S7VarPayloadStatusItem 'items' count 'CAST(parameter, S7ParameterWriteVarResponse).numItems']
-        ]
-        ['0x00','0x07' S7PayloadUserData
-            [array S7PayloadUserDataItem 'items' count 'COUNT(CAST(parameter, S7ParameterUserData).items)' ['CAST(CAST(parameter, S7ParameterUserData).items[0], S7ParameterUserDataItemCPUFunctions).cpuFunctionType']]
-        ]
-    ]
-]
-
-// This is actually not quite correct as depending pon the transportSize the length is either defined in bits or bytes.
-[type 'S7VarPayloadDataItem'
-    [simple  uint 8             'returnCode']
-    [enum    DataTransportSize  'transportSize']
-    [simple  uint 16            'dataLength']
-    [array   uint 8             'data' count 'dataLength / 8']
-    [padding uint 8             'pad' '0x00' '(dataLength / 8) % 2 == 1']
-]
-
-[type 'S7VarPayloadStatusItem'
-    [simple uint 8 'returnCode']
-]
-
-[discriminatedType 'S7PayloadUserDataItem' [uint 4 'cpuFunctionType']
-    [simple   uint 8            'returnCode']
-    [enum     DataTransportSize 'transportSize']
-    [implicit uint 16           'dataLength' 'lengthInBytes - 4']
-    [simple   SzlId             'szlId']
-    [simple   uint 16           'szlIndex']
-    [typeSwitch 'cpuFunctionType'
-        ['0x04' S7PayloadUserDataItemCpuFunctionReadSzlRequest
-        ]
-        ['0x08' S7PayloadUserDataItemCpuFunctionReadSzlResponse
-            [const    uint 16 'szlItemLength' '28']
-            [implicit uint 16 'szlItemCount'  'COUNT(items)']
-            [array SzlDataTreeItem 'items' count 'szlItemCount']
-        ]
-    ]
-]
-
-
-[enum int 8 'COTPTpduSize' [uint 8 'sizeInBytes']
-    ['0x07' SIZE_128 ['128']]
-    ['0x08' SIZE_256 ['256']]
-    ['0x09' SIZE_512 ['512']]
-    ['0x0a' SIZE_1024 ['1024']]
-    ['0x0b' SIZE_2048 ['2048']]
-    ['0x0c' SIZE_4096 ['4096']]
-    ['0x0d' SIZE_8192 ['8192']]
-]
-
-[enum int 8 'COTPProtocolClass'
-    ['0x00' CLASS_0]
-    ['0x10' CLASS_1]
-    ['0x20' CLASS_2]
-    ['0x30' CLASS_3]
-    ['0x40' CLASS_4]
-]
-
-[enum int 8 'DataTransportSize' [bit 'sizeInBits']
-    ['0x00' NULL            ['false']]
-    ['0x03' BIT             ['true']]
-    ['0x04' BYTE_WORD_DWORD ['true']]
-    ['0x05' INTEGER         ['true']]
-    ['0x06' DINTEGER        ['false']]
-    ['0x07' REAL            ['false']]
-    ['0x09' OCTET_STRING    ['false']]
-]
-
-[enum int 8 'TransportSize'  [uint 8 'sizeCode', uint 8 'sizeInBytes', TransportSize 'baseType', DataTransportSize 'dataTransportSize']
-    ['0x01' BOOL             ['X'              , '1'                 , 'null'                  , 'DataTransportSize.BIT']]
-    ['0x02' BYTE             ['B'              , '1'                 , 'null'                  , 'DataTransportSize.BYTE_WORD_DWORD']]
-    ['0x04' WORD             ['W'              , '2'                 , 'null'                  , 'DataTransportSize.BYTE_WORD_DWORD']]
-    ['0x06' DWORD            ['D'              , '4'                 , 'WORD'                  , 'DataTransportSize.BYTE_WORD_DWORD']]
-    ['0x00' LWORD            ['X'              , '8'                 , 'null'                  , 'null']]
-    ['0x05' INT              ['W'              , '2'                 , 'null'                  , 'DataTransportSize.BYTE_WORD_DWORD']]
-    ['0x05' UINT             ['W'              , '2'                 , 'INT'                   , 'DataTransportSize.BYTE_WORD_DWORD']]
-    ['0x02' SINT             ['B'              , '1'                 , 'INT'                   , 'DataTransportSize.BYTE_WORD_DWORD']]
-    ['0x02' USINT            ['B'              , '1'                 , 'INT'                   , 'DataTransportSize.BYTE_WORD_DWORD']]
-    ['0x07' DINT             ['D'              , '4'                 , 'INT'                   , 'DataTransportSize.BYTE_WORD_DWORD']]
-    ['0x07' UDINT            ['D'              , '4'                 , 'INT'                   , 'DataTransportSize.BYTE_WORD_DWORD']]
-    ['0x00' LINT             ['X'              , '8'                 , 'INT'                   , 'null']]
-    ['0x00' ULINT            ['X'              , '16'                , 'INT'                   , 'null']]
-    ['0x08' REAL             ['D'              , '4'                 , 'null'                  , 'DataTransportSize.BYTE_WORD_DWORD']]
-    ['0x00' LREAL            ['X'              , '8'                 , 'REAL'                  , 'null']]
-    ['0x0B' TIME             ['X'              , '4'                 , 'null'                  , 'null']]
-    ['0x00' LTIME            ['X'              , '8'                 , 'TIME'                  , 'null']]
-    ['0x02' DATE             ['X'              , '2'                 , 'null'                  , 'DataTransportSize.BYTE_WORD_DWORD']]
-    ['0x02' TIME_OF_DAY      ['X'              , '4'                 , 'null'                  , 'DataTransportSize.BYTE_WORD_DWORD']]
-    ['0x02' DATE_AND_TIME    ['X'              , '8'                 , 'null'                  , 'null']]
-    ['0x03' CHAR             ['B'              , '1'                 , 'null'                  , 'DataTransportSize.BYTE_WORD_DWORD']]
-    ['0x13' WCHAR            ['X'              , '2'                 , 'null'                  , 'null']]
-    ['0x03' STRING           ['X'              , '1'                 , 'null'                  , 'DataTransportSize.BYTE_WORD_DWORD']]
-    ['0x00' WSTRING          ['X'              , '1'                 , 'null'                  , 'null']]
-]
-
-[enum int 8 'MemoryArea'             [string 'shortName']
-    ['0x1C' COUNTERS                 ['C']]
-    ['0x1D' TIMERS                   ['T']]
-    ['0x80' DIRECT_PERIPHERAL_ACCESS ['D']]
-    ['0x81' INPUTS                   ['I']]
-    ['0x82' OUTPUTS                  ['Q']]
-    ['0x83' FLAGS_MARKERS            ['M']]
-    ['0x84' DATA_BLOCKS              ['DB']]
-    ['0x85' INSTANCE_DATA_BLOCKS     ['DBI']]
-    ['0x86' LOCAL_DATA               ['LD']]
-]
-
-[enum int 8 'DataTransportSize' [bit 'sizeInBits']
-    ['0x00' NULL                ['false']]
-    ['0x03' BIT                 ['true']]
-    ['0x04' BYTE_WORD_DWORD     ['true']]
-    ['0x05' INTEGER             ['true']]
-    ['0x06' DINTEGER            ['false']]
-    ['0x07' REAL                ['false']]
-    ['0x09' OCTET_STRING        ['false']]
-]
-
-[enum int 4 'SzlModuleTypeClass'
-    ['0x0' CPU]
-    ['0x4' IM]
-    ['0x8' FM]
-    ['0xC' CP]
-]
-
-[enum int 8 'SzlSublist'
-    ['0x11' MODULE_IDENTIFICATION]
-    ['0x12' CPU_FEATURES]
-    ['0x13' USER_MEMORY_AREA]
-    ['0x14' SYSTEM_AREAS]
-    ['0x15' BLOCK_TYPES]
-    ['0x19' STATUS_MODULE_LEDS]
-    ['0x1C' COMPONENT_IDENTIFICATION]
-    ['0x22' INTERRUPT_STATUS]
-    ['0x25' ASSIGNMENT_BETWEEN_PROCESS_IMAGE_PARTITIONS_AND_OBS]
-    ['0x32' COMMUNICATION_STATUS_DATA]
-    ['0x74' STATUS_SINGLE_MODULE_LED]
-    ['0x90' DP_MASTER_SYSTEM_INFORMATION]
-    ['0x91' MODULE_STATUS_INFORMATION]
-    ['0x92' RACK_OR_STATION_STATUS_INFORMATION]
-    ['0x94' RACK_OR_STATION_STATUS_INFORMATION_2]
-    ['0x95' ADDITIONAL_DP_MASTER_SYSTEM_OR_PROFINET_IO_SYSTEM_INFORMATION]
-    ['0x96' MODULE_STATUS_INFORMATION_PROFINET_IO_AND_PROFIBUS_DP]
-    ['0xA0' DIAGNOSTIC_BUFFER]
-    ['0xB1' MODULE_DIAGNOSTIC_DATA]
-]
-
-
-
+//
+// 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
+//
+//     http://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.
+//
+
+////////////////////////////////////////////////////////////////
+// IsoOnTcp/TPKT
+////////////////////////////////////////////////////////////////
+
+[type 'TPKTPacket'
+    [const    uint 8     'protocolId' '0x03']
+    [reserved uint 8     '0x00']
+    [implicit uint 16    'len'        'payload.lengthInBytes + 4']
+    [simple   COTPPacket 'payload' ['len - 4']]
+]
+
+////////////////////////////////////////////////////////////////
+// COTP
+////////////////////////////////////////////////////////////////
+
+[discriminatedType 'COTPPacket' [uint 16 'cotpLen']
+    [implicit      uint 8 'headerLength' 'lengthInBytes - (((payload != null) ? payload.lengthInBytes : 0) + 1)']
+    [discriminator uint 8 'tpduCode']
+    [typeSwitch 'tpduCode'
+        ['0xF0' COTPPacketData
+            [simple bit    'eot']
+            [simple uint 7 'tpduRef']
+        ]
+        ['0xE0' COTPPacketConnectionRequest
+            [simple uint 16           'destinationReference']
+            [simple uint 16           'sourceReference']
+            [enum   COTPProtocolClass 'protocolClass']
+        ]
+        ['0xD0' COTPPacketConnectionResponse
+            [simple uint 16           'destinationReference']
+            [simple uint 16           'sourceReference']
+            [enum   COTPProtocolClass 'protocolClass']
+        ]
+        ['0x80' COTPPacketDisconnectRequest
+            [simple uint 16           'destinationReference']
+            [simple uint 16           'sourceReference']
+            [enum   COTPProtocolClass 'protocolClass']
+        ]
+        ['0xC0' COTPPacketDisconnectResponse
+            [simple uint 16 'destinationReference']
+            [simple uint 16 'sourceReference']
+        ]
+        ['0x70' COTPPacketTpduError
+            [simple uint 16 'destinationReference']
+            [simple uint 8  'rejectCause']
+        ]
+    ]
+    [array    COTPParameter 'parameters' length '(headerLength + 1) - curPos' ['(headerLength + 1) - curPos']]
+    [optional S7Message     'payload'    'curPos < cotpLen']
+]
+
+[discriminatedType 'COTPParameter' [uint 8 'rest']
+    [discriminator uint 8 'parameterType']
+    [implicit      uint 8 'parameterLength' 'lengthInBytes - 2']
+    [typeSwitch 'parameterType'
+        ['0xC0' COTPParameterTpduSize
+            [enum COTPTpduSize 'tpduSize']
+        ]
+        ['0xC1' COTPParameterCallingTsap
+            [simple uint 16 'tsapId']
+        ]
+        ['0xC2' COTPParameterCalledTsap
+            [simple uint 16 'tsapId']
+        ]
+        ['0xC3' COTPParameterChecksum
+            [simple uint 8 'crc']
+        ]
+        ['0xE0' COTPParameterDisconnectAdditionalInformation
+            [array  uint 8 'data' count 'rest']
+        ]
+    ]
+]
+
+////////////////////////////////////////////////////////////////
+// S7
+////////////////////////////////////////////////////////////////
+
+[discriminatedType 'S7Message'
+    [const         uint 8  'protocolId'      '0x32']
+    [discriminator uint 8  'messageType']
+    [reserved      uint 16 '0x0000']
+    [simple        uint 16 'tpduReference']
+    [implicit      uint 16 'parameterLength' 'parameter.lengthInBytes']
+    [implicit      uint 16 'payloadLength'   'payload.lengthInBytes']
+    [typeSwitch 'messageType'
+        ['0x01' S7MessageRequest
+        ]
+        ['0x03' S7MessageResponse
+            [simple uint 8 'errorClass']
+            [simple uint 8 'errorCode']
+        ]
+        ['0x07' S7MessageUserData
+        ]
+    ]
+    [simple S7Parameter 'parameter' ['messageType']]
+    [simple S7Payload   'payload'   ['messageType', 'parameter']]
+]
+
+////////////////////////////////////////////////////////////////
+// Parameters
+
+[discriminatedType 'S7Parameter' [uint 8 'messageType']
+    [discriminator uint 8 'parameterType']
+    [typeSwitch 'parameterType','messageType'
+        ['0xF0' S7ParameterSetupCommunication
+            [reserved uint 8  '0x00']
+            [simple   uint 16 'maxAmqCaller']
+            [simple   uint 16 'maxAmqCallee']
+            [simple   uint 16 'pduLength']
+        ]
+        ['0x04','0x01' S7ParameterReadVarRequest
+            [implicit uint 8                    'numItems' 'COUNT(items)']
+            [array    S7VarRequestParameterItem 'items'    count 'numItems']
+        ]
+        ['0x04','0x03' S7ParameterReadVarResponse
+            [simple uint 8 'numItems']
+        ]
+        ['0x05','0x01' S7ParameterWriteVarRequest
+            [implicit uint 8                    'numItems' 'COUNT(items)']
+            [array    S7VarRequestParameterItem 'items'    count 'numItems']
+        ]
+        ['0x05','0x03' S7ParameterWriteVarResponse
+            [simple uint 8 'numItems']
+        ]
+        ['0x00','0x07' S7ParameterUserData
+            [implicit uint 8                  'numItems' 'COUNT(items)']
+            [array    S7ParameterUserDataItem 'items' count 'numItems']
+        ]
+    ]
+]
+
+[discriminatedType 'S7VarRequestParameterItem'
+    [discriminator uint 8 'itemType']
+    [typeSwitch 'itemType'
+        ['0x12' S7VarRequestParameterItemAddress
+            [implicit uint 8    'itemLength' 'address.lengthInBytes']
+            [simple   S7Address 'address']
+        ]
+    ]
+]
+
+[discriminatedType 'S7Address'
+    [discriminator uint 8 'addressType']
+    [typeSwitch 'addressType'
+        ['0x10' S7AddressAny
+            [enum     TransportSize 'transportSize']
+            [simple   uint 16       'numberOfElements']
+            [simple   uint 16       'dbNumber']
+            [enum     MemoryArea    'area']
+            [reserved uint 5        '0x00']
+            [simple   uint 16       'byteAddress']
+            [simple   uint 3        'bitAddress']
+        ]
+    ]
+]
+
+[discriminatedType 'S7ParameterUserDataItem'
+    [discriminator uint 8 'itemType']
+    [typeSwitch 'itemType'
+        ['0x12' S7ParameterUserDataItemCPUFunctions
+            [implicit uint 8  'itemLength' 'lengthInBytes - 2']
+            [simple   uint 8  'method']
+            [simple   uint 4  'cpuFunctionType']
+            [simple   uint 4  'cpuFunctionGroup']
+            [simple   uint 8  'cpuSubfunction']
+            [simple   uint 8  'sequenceNumber']
+            [optional uint 8  'dataUnitReferenceNumber' 'cpuFunctionType == 8']
+            [optional uint 8  'lastDataUnit' 'cpuFunctionType == 8']
+            [optional uint 16 'errorCode' 'cpuFunctionType == 8']
+        ]
+    ]
+]
+
+[type 'SzlId'
+    [enum   SzlModuleTypeClass 'typeClass']
+    [simple uint 4             'sublistExtract']
+    [enum   SzlSublist         'sublistList']
+]
+
+[type 'SzlDataTreeItem'
+    [simple uint 16 'itemIndex']
+    [array  int 8   'mlfb' count '20']
+    [simple uint 16 'moduleTypeId']
+    [simple uint 16 'ausbg']
+    [simple uint 16 'ausbe']
+]
+
+////////////////////////////////////////////////////////////////
+// Payloads
+
+[discriminatedType 'S7Payload' [uint 8 'messageType', S7Parameter 'parameter']
+    [typeSwitch 'parameter.discriminatorValues[0]', 'messageType'
+        ['0xF0' S7PayloadSetupCommunication]
+        ['0x04','0x01' S7PayloadReadVarRequest]
+        ['0x04','0x03' S7PayloadReadVarResponse
+            [array S7VarPayloadDataItem 'items' count 'CAST(parameter, S7ParameterReadVarResponse).numItems']
+        ]
+        ['0x05','0x01' S7PayloadWriteVarRequest
+            [array S7VarPayloadDataItem 'items' count 'COUNT(CAST(parameter, S7ParameterWriteVarRequest).items)']
+        ]
+        ['0x05','0x03' S7PayloadWriteVarResponse
+            [array S7VarPayloadStatusItem 'items' count 'CAST(parameter, S7ParameterWriteVarResponse).numItems']
+        ]
+        ['0x00','0x07' S7PayloadUserData
+            [array S7PayloadUserDataItem 'items' count 'COUNT(CAST(parameter, S7ParameterUserData).items)' ['CAST(CAST(parameter, S7ParameterUserData).items[0], S7ParameterUserDataItemCPUFunctions).cpuFunctionType']]
+        ]
+    ]
+]
+
+// This is actually not quite correct as depending pon the transportSize the length is either defined in bits or bytes.
+[type 'S7VarPayloadDataItem'
+    [simple  uint 8             'returnCode']
+    [enum    DataTransportSize  'transportSize']
+    [simple  uint 16            'dataLength']
+    [array   uint 8             'data' count 'dataLength / 8']
+    [padding uint 8             'pad' '0x00' '(dataLength / 8) % 2 == 1']
+]
+
+[type 'S7VarPayloadStatusItem'
+    [simple uint 8 'returnCode']
+]
+
+[discriminatedType 'S7PayloadUserDataItem' [uint 4 'cpuFunctionType']
+    [simple   uint 8            'returnCode']
+    [enum     DataTransportSize 'transportSize']
+    [implicit uint 16           'dataLength' 'lengthInBytes - 4']
+    [simple   SzlId             'szlId']
+    [simple   uint 16           'szlIndex']
+    [typeSwitch 'cpuFunctionType'
+        ['0x04' S7PayloadUserDataItemCpuFunctionReadSzlRequest
+        ]
+        ['0x08' S7PayloadUserDataItemCpuFunctionReadSzlResponse
+            [const    uint 16 'szlItemLength' '28']
+            [implicit uint 16 'szlItemCount'  'COUNT(items)']
+            [array SzlDataTreeItem 'items' count 'szlItemCount']
+        ]
+    ]
+]
+
+
+[enum int 8 'COTPTpduSize' [uint 8 'sizeInBytes']
+    ['0x07' SIZE_128 ['128']]
+    ['0x08' SIZE_256 ['256']]
+    ['0x09' SIZE_512 ['512']]
+    ['0x0a' SIZE_1024 ['1024']]
+    ['0x0b' SIZE_2048 ['2048']]
+    ['0x0c' SIZE_4096 ['4096']]
+    ['0x0d' SIZE_8192 ['8192']]
+]
+
+[enum int 8 'COTPProtocolClass'
+    ['0x00' CLASS_0]
+    ['0x10' CLASS_1]
+    ['0x20' CLASS_2]
+    ['0x30' CLASS_3]
+    ['0x40' CLASS_4]
+]
+
+[enum int 8 'DataTransportSize' [bit 'sizeInBits']
+    ['0x00' NULL            ['false']]
+    ['0x03' BIT             ['true']]
+    ['0x04' BYTE_WORD_DWORD ['true']]
+    ['0x05' INTEGER         ['true']]
+    ['0x06' DINTEGER        ['false']]
+    ['0x07' REAL            ['false']]
+    ['0x09' OCTET_STRING    ['false']]
+]
+
+[enum int 8 'TransportSize'  [uint 8 'sizeCode', uint 8 'sizeInBytes', TransportSize 'baseType', DataTransportSize 'dataTransportSize']
+    ['0x01' BOOL             ['X'              , '1'                 , 'null'                  , 'DataTransportSize.BIT']]
+    ['0x02' BYTE             ['B'              , '1'                 , 'null'                  , 'DataTransportSize.BYTE_WORD_DWORD']]
+    ['0x04' WORD             ['W'              , '2'                 , 'null'                  , 'DataTransportSize.BYTE_WORD_DWORD']]
+    ['0x06' DWORD            ['D'              , '4'                 , 'WORD'                  , 'DataTransportSize.BYTE_WORD_DWORD']]
+    ['0x00' LWORD            ['X'              , '8'                 , 'null'                  , 'null']]
+    ['0x05' INT              ['W'              , '2'                 , 'null'                  , 'DataTransportSize.BYTE_WORD_DWORD']]
+    ['0x05' UINT             ['W'              , '2'                 , 'INT'                   , 'DataTransportSize.BYTE_WORD_DWORD']]
+    ['0x02' SINT             ['B'              , '1'                 , 'INT'                   , 'DataTransportSize.BYTE_WORD_DWORD']]
+    ['0x02' USINT            ['B'              , '1'                 , 'INT'                   , 'DataTransportSize.BYTE_WORD_DWORD']]
+    ['0x07' DINT             ['D'              , '4'                 , 'INT'                   , 'DataTransportSize.BYTE_WORD_DWORD']]
+    ['0x07' UDINT            ['D'              , '4'                 , 'INT'                   , 'DataTransportSize.BYTE_WORD_DWORD']]
+    ['0x00' LINT             ['X'              , '8'                 , 'INT'                   , 'null']]
+    ['0x00' ULINT            ['X'              , '16'                , 'INT'                   , 'null']]
+    ['0x08' REAL             ['D'              , '4'                 , 'null'                  , 'DataTransportSize.BYTE_WORD_DWORD']]
+    ['0x00' LREAL            ['X'              , '8'                 , 'REAL'                  , 'null']]
+    ['0x0B' TIME             ['X'              , '4'                 , 'null'                  , 'null']]
+    ['0x00' LTIME            ['X'              , '8'                 , 'TIME'                  , 'null']]
+    ['0x02' DATE             ['X'              , '2'                 , 'null'                  , 'DataTransportSize.BYTE_WORD_DWORD']]
+    ['0x02' TIME_OF_DAY      ['X'              , '4'                 , 'null'                  , 'DataTransportSize.BYTE_WORD_DWORD']]
+    ['0x02' DATE_AND_TIME    ['X'              , '8'                 , 'null'                  , 'null']]
+    ['0x03' CHAR             ['B'              , '1'                 , 'null'                  , 'DataTransportSize.BYTE_WORD_DWORD']]
+    ['0x13' WCHAR            ['X'              , '2'                 , 'null'                  , 'null']]
+    ['0x03' STRING           ['X'              , '1'                 , 'null'                  , 'DataTransportSize.BYTE_WORD_DWORD']]
+    ['0x00' WSTRING          ['X'              , '1'                 , 'null'                  , 'null']]
+]
+
+[enum int 8 'MemoryArea'             [string 'shortName']
+    ['0x1C' COUNTERS                 ['C']]
+    ['0x1D' TIMERS                   ['T']]
+    ['0x80' DIRECT_PERIPHERAL_ACCESS ['D']]
+    ['0x81' INPUTS                   ['I']]
+    ['0x82' OUTPUTS                  ['Q']]
+    ['0x83' FLAGS_MARKERS            ['M']]
+    ['0x84' DATA_BLOCKS              ['DB']]
+    ['0x85' INSTANCE_DATA_BLOCKS     ['DBI']]
+    ['0x86' LOCAL_DATA               ['LD']]
+]
+
+[enum int 8 'DataTransportSize' [bit 'sizeInBits']
+    ['0x00' NULL                ['false']]
+    ['0x03' BIT                 ['true']]
+    ['0x04' BYTE_WORD_DWORD     ['true']]
+    ['0x05' INTEGER             ['true']]
+    ['0x06' DINTEGER            ['false']]
+    ['0x07' REAL                ['false']]
+    ['0x09' OCTET_STRING        ['false']]
+]
+
+[enum int 4 'SzlModuleTypeClass'
+    ['0x0' CPU]
+    ['0x4' IM]
+    ['0x8' FM]
+    ['0xC' CP]
+]
+
+[enum int 8 'SzlSublist'
+    ['0x11' MODULE_IDENTIFICATION]
+    ['0x12' CPU_FEATURES]
+    ['0x13' USER_MEMORY_AREA]
+    ['0x14' SYSTEM_AREAS]
+    ['0x15' BLOCK_TYPES]
+    ['0x19' STATUS_MODULE_LEDS]
+    ['0x1C' COMPONENT_IDENTIFICATION]
+    ['0x22' INTERRUPT_STATUS]
+    ['0x25' ASSIGNMENT_BETWEEN_PROCESS_IMAGE_PARTITIONS_AND_OBS]
+    ['0x32' COMMUNICATION_STATUS_DATA]
+    ['0x74' STATUS_SINGLE_MODULE_LED]
+    ['0x90' DP_MASTER_SYSTEM_INFORMATION]
+    ['0x91' MODULE_STATUS_INFORMATION]
+    ['0x92' RACK_OR_STATION_STATUS_INFORMATION]
+    ['0x94' RACK_OR_STATION_STATUS_INFORMATION_2]
+    ['0x95' ADDITIONAL_DP_MASTER_SYSTEM_OR_PROFINET_IO_SYSTEM_INFORMATION]
+    ['0x96' MODULE_STATUS_INFORMATION_PROFINET_IO_AND_PROFIBUS_DP]
+    ['0xA0' DIAGNOSTIC_BUFFER]
+    ['0xB1' MODULE_DIAGNOSTIC_DATA]
+]
+
+
+
diff --git a/protocols/s7/src/test/resources/org/apache/plc4x/protocols/s7/protocol.tdml b/protocols/s7/src/test/resources/org/apache/plc4x/protocols/s7/protocol.tdml
index ac7a391fac2..1913b7750d1 100644
--- a/protocols/s7/src/test/resources/org/apache/plc4x/protocols/s7/protocol.tdml
+++ b/protocols/s7/src/test/resources/org/apache/plc4x/protocols/s7/protocol.tdml
@@ -1,2465 +1,2465 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-
-<tdml:testSuite xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
-                xmlns:tdml="http://www.ibm.com/xmlns/dfdl/testData"
-                xmlns:s7="http://plc4x.apache.org/s7"
-                xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                suiteName="S7 protocol (Full-Stack)"
-                description="Testsuite for the full stack of the S7 protocol"
-                defaultRoundTrip="onePass">
-
-    <tdml:defineSchema name="s7Schema" elementFormDefault="unqualified">
-        <!-- Import the Schema (location is defined by daffodil-built-in-catalog.xml) -->
-        <xs:import namespace="http://plc4x.apache.org/s7"/>
-
-        <!-- Import the format settings -->
-        <dfdl:format ref="s7:s7FullFormat"/>
-
-        <!-- Define the root element name and type -->
-        <xs:element name="TpktMessage" type="s7:TpktMessage"/>
-    </tdml:defineSchema>
-
-    <!--
-        In this test-case the data should be parsable to a valid result.
-        It's a TPKT package containing a COTP connection-response payload.
-    -->
-    <tdml:parserTestCase name="TPKT-tpktPacketContainingCotpConnectResponse"
-                         root="TpktMessage"
-                         model="s7Schema"
-                         description="Simple TKPT packet which contains a COTP Connection-Response as payload.">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">0300001611D00001000200C00109C1020100C2020102</tdml:documentPart>
-        </tdml:document>
-
-        <!-- Define the expected output -->
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <!-- Referencing what we defined as root element in the defineSchema section -->
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>22</length>
-                    <userData>
-                        <headerLength>17</headerLength>
-                        <type>208</type>
-                        <cotpTpduConnectionResponse>
-                            <destinationReference>1</destinationReference>
-                            <sourceReference>2</sourceReference>
-                            <protocolClass>0</protocolClass>
-                            <parameters>
-                                <parameter>
-                                    <type>192</type>
-                                    <parameterLength>1</parameterLength>
-                                    <cotpParameterTpduSize>
-                                        <tpduSize>9</tpduSize>
-                                    </cotpParameterTpduSize>
-                                </parameter>
-                                <parameter>
-                                    <type>193</type>
-                                    <parameterLength>2</parameterLength>
-                                    <cotpParameterCallingTsap>
-                                        <tsapId>256</tsapId>
-                                    </cotpParameterCallingTsap>
-                                </parameter>
-                                <parameter>
-                                    <type>194</type>
-                                    <parameterLength>2</parameterLength>
-                                    <cotpParameterCalledTsap>
-                                        <tsapId>258</tsapId>
-                                    </cotpParameterCalledTsap>
-                                </parameter>
-                            </parameters>
-                        </cotpTpduConnectionResponse>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <!--
-        In this test-case the packet doesn't start with the required magic byte 0x03.
-    -->
-    <tdml:parserTestCase name="TPKT-invalidMagicByte"
-                         root="TpktMessage"
-                         model="s7Schema">
-        <tdml:document>
-            <tdml:documentPart type="byte">0400001611D00001000200C00109C1020100C2020102</tdml:documentPart>
-        </tdml:document>
-
-        <tdml:errors>
-            <tdml:error>Parse Error</tdml:error>
-        </tdml:errors>
-    </tdml:parserTestCase>
-
-    <!--
-        In this test-case the payload of the packet doesn't match the
-        length provided in the packet header (Too short)
-    -->
-    <tdml:parserTestCase name="TPKT-tooShortPayload"
-                         root="TpktMessage"
-                         model="s7Schema">
-        <tdml:document>
-            <tdml:documentPart type="byte">0300001611D00001000200C00109C102010</tdml:documentPart>
-        </tdml:document>
-
-        <tdml:errors>
-            <tdml:error>Parse Error</tdml:error>
-        </tdml:errors>
-    </tdml:parserTestCase>
-
-    <!--
-        In this test-case the payload of the packet doesn't match the
-        length provided in the packet header (Too long)
-    -->
-    <tdml:parserTestCase name="TPKT-tooLongPayload"
-                         root="TpktMessage"
-                         model="s7Schema">
-        <tdml:document>
-            <tdml:documentPart type="byte">0300001611D00001000200C00109C1020100C20201021234567890</tdml:documentPart>
-        </tdml:document>
-
-        <tdml:errors>
-            <tdml:error>Left over data.</tdml:error>
-        </tdml:errors>
-    </tdml:parserTestCase>
-
-    <!--
-
-        Tests for the basic TPDU types (no parameters)
-
-    -->
-
-    <tdml:parserTestCase name="COTP-typeConnectionRequest"
-                         root="TpktMessage"
-                         model="s7Schema"
-                         description="Minimal valid COTP Connection Request TPDU">
-        <tdml:document>
-            <tdml:documentPart type="byte">0300000706E00001000200</tdml:documentPart>
-        </tdml:document>
-
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>7</length>
-                    <userData>
-                        <headerLength>6</headerLength>
-                        <type>224</type>
-                        <cotpTpduConnectionRequest>
-                            <destinationReference>1</destinationReference>
-                            <sourceReference>2</sourceReference>
-                            <protocolClass>0</protocolClass>
-                        </cotpTpduConnectionRequest>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="COTP-typeConnectionResponse"
-                         root="TpktMessage"
-                         model="s7Schema"
-                         description="Minimal valid COTP Connection Response TPDU">
-        <tdml:document>
-            <tdml:documentPart type="byte">0300000706D00001000200</tdml:documentPart>
-        </tdml:document>
-
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>7</length>
-                    <userData>
-                        <headerLength>6</headerLength>
-                        <type>208</type>
-                        <cotpTpduConnectionResponse>
-                            <destinationReference>1</destinationReference>
-                            <sourceReference>2</sourceReference>
-                            <protocolClass>0</protocolClass>
-                        </cotpTpduConnectionResponse>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="COTP-typeDisconnectionRequest"
-                         root="TpktMessage"
-                         model="s7Schema"
-                         description="Minimal valid COTP Disconnection Request TPDU">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">0300000706800001000200</tdml:documentPart>
-        </tdml:document>
-
-        <!-- Define the expected output -->
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>7</length>
-                    <userData>
-                        <headerLength>6</headerLength>
-                        <type>128</type>
-                        <cotpTpduDisconnectRequest>
-                            <destinationReference>1</destinationReference>
-                            <sourceReference>2</sourceReference>
-                            <disconnectReason>0</disconnectReason>
-                        </cotpTpduDisconnectRequest>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="COTP-typeDisconnectionResponse"
-                         root="TpktMessage"
-                         model="s7Schema"
-                         description="Minimal valid COTP Disconnection Response TPDU">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">0300000605C000010002</tdml:documentPart>
-        </tdml:document>
-
-        <!-- Define the expected output -->
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>6</length>
-                    <userData>
-                        <headerLength>5</headerLength>
-                        <type>192</type>
-                        <cotpTpduDisconnectResponse>
-                            <destinationReference>1</destinationReference>
-                            <sourceReference>2</sourceReference>
-                        </cotpTpduDisconnectResponse>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="COTP-typeError"
-                         root="TpktMessage"
-                         model="s7Schema"
-                         description="Minimal valid COTP Error TPDU">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">030000050470000102</tdml:documentPart>
-        </tdml:document>
-
-        <!-- Define the expected output -->
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>5</length>
-                    <userData>
-                        <headerLength>4</headerLength>
-                        <type>112</type>
-                        <cotpTpduError>
-                            <destinationReference>1</destinationReference>
-                            <rejectCause>2</rejectCause>
-                        </cotpTpduError>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="COTP-typeData"
-                         root="TpktMessage"
-                         model="s7Schema"
-                         description="Minimal valid COTP Data TPDU">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">0300000302F002</tdml:documentPart>
-        </tdml:document>
-
-        <!-- Define the expected output -->
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>3</length>
-                    <userData>
-                        <headerLength>2</headerLength>
-                        <type>240</type>
-                        <cotpTpduData>
-                            <endOfTransmission>false</endOfTransmission>
-                            <tpduRef>2</tpduRef>
-                        </cotpTpduData>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="COTP-typeDataEndOfTransmission"
-                         root="TpktMessage"
-                         model="s7Schema"
-                         description="Minimal valid COTP Data (End Of Transmission) TPDU">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">0300000302F082</tdml:documentPart>
-        </tdml:document>
-
-        <!-- Define the expected output -->
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>3</length>
-                    <userData>
-                        <headerLength>2</headerLength>
-                        <type>240</type>
-                        <cotpTpduData>
-                            <endOfTransmission>true</endOfTransmission>
-                            <tpduRef>2</tpduRef>
-                        </cotpTpduData>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="COTP-invalidType"
-                         root="TpktMessage"
-                         model="s7Schema"
-                         description="Invalid type code">
-        <tdml:document>
-            <tdml:documentPart type="byte">030000050420000102</tdml:documentPart>
-        </tdml:document>
-
-        <tdml:errors>
-            <tdml:error>Parse Error</tdml:error>
-        </tdml:errors>
-    </tdml:parserTestCase>
-
-    <!--
-
-        Tests for the parameter types.
-
-    -->
-
-    <tdml:parserTestCase name="COTP-parameterTpduSize"
-                         root="TpktMessage"
-                         model="s7Schema"
-                         description="parameterTpduSize">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">0300000A09E00001000200C00109</tdml:documentPart>
-        </tdml:document>
-
-        <!-- Define the expected output -->
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>10</length>
-                    <userData>
-                        <headerLength>9</headerLength>
-                        <type>224</type>
-                        <cotpTpduConnectionRequest>
-                            <destinationReference>1</destinationReference>
-                            <sourceReference>2</sourceReference>
-                            <protocolClass>0</protocolClass>
-                            <parameters>
-                                <parameter>
-                                    <type>192</type>
-                                    <parameterLength>1</parameterLength>
-                                    <cotpParameterTpduSize>
-                                        <tpduSize>9</tpduSize>
-                                    </cotpParameterTpduSize>
-                                </parameter>
-                            </parameters>
-                        </cotpTpduConnectionRequest>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="COTP-parameterCallingTsap"
-                         root="TpktMessage"
-                         model="s7Schema"
-                         description="parameterCallingTsap">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">0300000B0AE00001000200C1020009</tdml:documentPart>
-        </tdml:document>
-
-        <!-- Define the expected output -->
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>11</length>
-                    <userData>
-                        <headerLength>10</headerLength>
-                        <type>224</type>
-                        <cotpTpduConnectionRequest>
-                            <destinationReference>1</destinationReference>
-                            <sourceReference>2</sourceReference>
-                            <protocolClass>0</protocolClass>
-                            <parameters>
-                                <parameter>
-                                    <type>193</type>
-                                    <parameterLength>2</parameterLength>
-                                    <cotpParameterCallingTsap>
-                                        <tsapId>9</tsapId>
-                                    </cotpParameterCallingTsap>
-                                </parameter>
-                            </parameters>
-                        </cotpTpduConnectionRequest>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="COTP-parameterCalledTsap"
-                         root="TpktMessage"
-                         model="s7Schema"
-                         description="parameterCalledTsap">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">0300000B0AE00001000200C2020009</tdml:documentPart>
-        </tdml:document>
-
-        <!-- Define the expected output -->
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>11</length>
-                    <userData>
-                        <headerLength>10</headerLength>
-                        <type>224</type>
-                        <cotpTpduConnectionRequest>
-                            <destinationReference>1</destinationReference>
-                            <sourceReference>2</sourceReference>
-                            <protocolClass>0</protocolClass>
-                            <parameters>
-                                <parameter>
-                                    <type>194</type>
-                                    <parameterLength>2</parameterLength>
-                                    <cotpParameterCalledTsap>
-                                        <tsapId>9</tsapId>
-                                    </cotpParameterCalledTsap>
-                                </parameter>
-                            </parameters>
-                        </cotpTpduConnectionRequest>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="COTP-parameterChecksum"
-                         root="TpktMessage"
-                         model="s7Schema"
-                         description="parameterChecksum">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">0300000A09E00001000200C30109</tdml:documentPart>
-        </tdml:document>
-
-        <!-- Define the expected output -->
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>10</length>
-                    <userData>
-                        <headerLength>9</headerLength>
-                        <type>224</type>
-                        <cotpTpduConnectionRequest>
-                            <destinationReference>1</destinationReference>
-                            <sourceReference>2</sourceReference>
-                            <protocolClass>0</protocolClass>
-                            <parameters>
-                                <parameter>
-                                    <type>195</type>
-                                    <parameterLength>1</parameterLength>
-                                    <cotpParameterChecksum>
-                                        <checksum>9</checksum>
-                                    </cotpParameterChecksum>
-                                </parameter>
-                            </parameters>
-                        </cotpTpduConnectionRequest>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="COTP-parameterDisconnectAdditionalInformation"
-                         root="TpktMessage"
-                         model="s7Schema"
-                         description="parameterDisconnectAdditionalInformation">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">0300000F0EE00001000200E006010203040506</tdml:documentPart>
-        </tdml:document>
-
-        <!-- Define the expected output -->
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>15</length>
-                    <userData>
-                        <headerLength>14</headerLength>
-                        <type>224</type>
-                        <cotpTpduConnectionRequest>
-                            <destinationReference>1</destinationReference>
-                            <sourceReference>2</sourceReference>
-                            <protocolClass>0</protocolClass>
-                            <parameters>
-                                <parameter>
-                                    <type>224</type>
-                                    <parameterLength>6</parameterLength>
-                                    <cotpParameterDisconnectAdditionalInformation>
-                                        <data>010203040506</data>
-                                    </cotpParameterDisconnectAdditionalInformation>
-                                </parameter>
-                            </parameters>
-                        </cotpTpduConnectionRequest>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="COTP-invalidParameterType"
-                         root="TpktMessage"
-                         model="s7Schema"
-                         description="Invalid parameter type">
-        <tdml:document>
-            <tdml:documentPart type="byte">0300000F0EE00001000200A006010203040506</tdml:documentPart>
-        </tdml:document>
-
-        <tdml:errors>
-            <tdml:error>Parse Error</tdml:error>
-        </tdml:errors>
-    </tdml:parserTestCase>
-
-    <!--
-
-        Tests for typical packets used in PLC4X
-
-    -->
-
-    <tdml:parserTestCase name="COTP-scenarioConnectionRequest"
-                         root="TpktMessage"
-                         model="s7Schema"
-                         description="COTP Connection request used for initiating an S7 protocol connection.">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">0300001211E00001000200C1020100C2020102c0010a</tdml:documentPart>
-        </tdml:document>
-
-        <!-- Define the expected output -->
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>18</length>
-                    <userData>
-                        <headerLength>17</headerLength>
-                        <type>224</type>
-                        <cotpTpduConnectionRequest>
-                            <destinationReference>1</destinationReference>
-                            <sourceReference>2</sourceReference>
-                            <protocolClass>0</protocolClass>
-                            <parameters>
-                                <parameter>
-                                    <type>193</type>
-                                    <parameterLength>2</parameterLength>
-                                    <cotpParameterCallingTsap>
-                                        <tsapId>256</tsapId>
-                                    </cotpParameterCallingTsap>
-                                </parameter>
-                                <parameter>
-                                    <type>194</type>
-                                    <parameterLength>2</parameterLength>
-                                    <cotpParameterCalledTsap>
-                                        <tsapId>258</tsapId>
-                                    </cotpParameterCalledTsap>
-                                </parameter>
-                                <parameter>
-                                    <type>192</type>
-                                    <parameterLength>1</parameterLength>
-                                    <cotpParameterTpduSize>
-                                        <tpduSize>10</tpduSize>
-                                    </cotpParameterTpduSize>
-                                </parameter>
-                            </parameters>
-                        </cotpTpduConnectionRequest>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="COTP-scenarioConnectionResponse"
-                         root="TpktMessage"
-                         model="s7Schema"
-                         description="Minimal valid COTP Message">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">0300001211D00001000200C00109C1020100C2020102</tdml:documentPart>
-        </tdml:document>
-
-        <!-- Define the expected output -->
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>18</length>
-                    <userData>
-                        <headerLength>17</headerLength>
-                        <type>208</type>
-                        <cotpTpduConnectionResponse>
-                            <destinationReference>1</destinationReference>
-                            <sourceReference>2</sourceReference>
-                            <protocolClass>0</protocolClass>
-                            <parameters>
-                                <parameter>
-                                    <type>192</type>
-                                    <parameterLength>1</parameterLength>
-                                    <cotpParameterTpduSize>
-                                        <tpduSize>9</tpduSize>
-                                    </cotpParameterTpduSize>
-                                </parameter>
-                                <parameter>
-                                    <type>193</type>
-                                    <parameterLength>2</parameterLength>
-                                    <cotpParameterCallingTsap>
-                                        <tsapId>256</tsapId>
-                                    </cotpParameterCallingTsap>
-                                </parameter>
-                                <parameter>
-                                    <type>194</type>
-                                    <parameterLength>2</parameterLength>
-                                    <cotpParameterCalledTsap>
-                                        <tsapId>258</tsapId>
-                                    </cotpParameterCalledTsap>
-                                </parameter>
-                            </parameters>
-                        </cotpTpduConnectionResponse>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="COTP-scenarioDataTpdu"
-                         root="TpktMessage"
-                         model="s7Schema"
-                         description="Typical Data TPDU used for transferring S7 packets.">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">0300001f02f080320100000001000e00000401120a10010001000082000004
-            </tdml:documentPart>
-        </tdml:document>
-
-        <!-- Define the expected output -->
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>31</length>
-                    <userData>
-                        <headerLength>2</headerLength>
-                        <type>240</type>
-                        <cotpTpduData>
-                            <endOfTransmission>true</endOfTransmission>
-                            <tpduRef>0</tpduRef>
-                        </cotpTpduData>
-                        <userData>
-                            <magicByte>50</magicByte>
-                            <type>1</type>
-                            <s7RequestMessage>
-                                <reserved>0</reserved>
-                                <tpduReference>1</tpduReference>
-                                <parametersLength>14</parametersLength>
-                                <payloadsLength>0</payloadsLength>
-                                <parameters>
-                                    <parameter>
-                                        <type>4</type>
-                                        <s7RequestParameterReadVar>
-                                            <numItems>1</numItems>
-                                            <items>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterReadVarAnyItem>
-                                                        <paramLength>10</paramLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>1</dataType>
-                                                        <numElements>1</numElements>
-                                                        <dataBlockNumber>0</dataBlockNumber>
-                                                        <memoryArea>130</memoryArea>
-                                                        <byteOffset>0</byteOffset>
-                                                        <bitOffset>4</bitOffset>
-                                                    </s7RequestParameterReadVarAnyItem>
-                                                </item>
-                                            </items>
-                                        </s7RequestParameterReadVar>
-                                    </parameter>
-                                </parameters>
-                                <payloads>
-                                    <payload>
-                                        <s7RequestPayloadReadVar>
-                                            <data/>
-                                        </s7RequestPayloadReadVar>
-                                    </payload>
-                                </payloads>
-                            </s7RequestMessage>
-                        </userData>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="S7-Setup-Communication-Request"
-                         root="TpktMessage"
-                         model="s7Schema">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">0300001902f08032010000000000080000f0000001000101e0</tdml:documentPart>
-        </tdml:document>
-
-        <!-- Define the expected output -->
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>25</length>
-                    <userData>
-                        <headerLength>2</headerLength>
-                        <type>240</type>
-                        <cotpTpduData>
-                            <endOfTransmission>true</endOfTransmission>
-                            <tpduRef>0</tpduRef>
-                        </cotpTpduData>
-                        <userData>
-                            <magicByte>50</magicByte>
-                            <type>1</type>
-                            <s7RequestMessage>
-                                <reserved>0</reserved>
-                                <tpduReference>0</tpduReference>
-                                <parametersLength>8</parametersLength>
-                                <payloadsLength>0</payloadsLength>
-                                <parameters>
-                                    <parameter>
-                                        <type>240</type>
-                                        <s7GeneralParameterSetupCommunication>
-                                            <reserved>0</reserved>
-                                            <maxAmqCaller>1</maxAmqCaller>
-                                            <maxAmqCallee>1</maxAmqCallee>
-                                            <pduLength>480</pduLength>
-                                        </s7GeneralParameterSetupCommunication>
-                                    </parameter>
-                                </parameters>
-                                <payloads>
-                                    <payload>
-                                        <s7GeneralPayloadSetupCommunication>
-                                            <data/>
-                                        </s7GeneralPayloadSetupCommunication>
-                                    </payload>
-                                </payloads>
-                            </s7RequestMessage>
-                        </userData>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="S7-SetupCommunicationResponse"
-                         root="TpktMessage"
-                         model="s7Schema">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">0300001b02f080320300000000000800000000f0000001000100f0</tdml:documentPart>
-        </tdml:document>
-
-        <!-- Define the expected output -->
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>27</length>
-                    <userData>
-                        <headerLength>2</headerLength>
-                        <type>240</type>
-                        <cotpTpduData>
-                            <endOfTransmission>true</endOfTransmission>
-                            <tpduRef>0</tpduRef>
-                        </cotpTpduData>
-                        <userData>
-                            <magicByte>50</magicByte>
-                            <type>3</type>
-                            <s7ResponseMessage>
-                                <reserved>0</reserved>
-                                <tpduReference>0</tpduReference>
-                                <parametersLength>8</parametersLength>
-                                <payloadsLength>0</payloadsLength>
-                                <errorClass>0</errorClass>
-                                <errorCode>0</errorCode>
-                                <parameters>
-                                    <parameter>
-                                        <type>240</type>
-                                        <s7GeneralParameterSetupCommunication>
-                                            <reserved>0</reserved>
-                                            <maxAmqCaller>1</maxAmqCaller>
-                                            <maxAmqCallee>1</maxAmqCallee>
-                                            <pduLength>240</pduLength>
-                                        </s7GeneralParameterSetupCommunication>
-                                    </parameter>
-                                </parameters>
-                                <payloads>
-                                    <payload>
-                                        <s7GeneralPayloadSetupCommunication>
-                                            <data/>
-                                        </s7GeneralPayloadSetupCommunication>
-                                    </payload>
-                                </payloads>
-                            </s7ResponseMessage>
-                        </userData>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="S7-ReadSZLCPUFunctionRequest"
-                         root="TpktMessage"
-                         model="s7Schema">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">0300002102f080 320700000100000800080001120411440100ff09000400110000
-            </tdml:documentPart>
-        </tdml:document>
-
-        <!-- Define the expected output -->
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>33</length>
-                    <userData>
-                        <headerLength>2</headerLength>
-                        <type>240</type>
-                        <cotpTpduData>
-                            <endOfTransmission>true</endOfTransmission>
-                            <tpduRef>0</tpduRef>
-                        </cotpTpduData>
-                        <userData>
-                            <magicByte>50</magicByte>
-                            <type>7</type>
-                            <s7UserDataMessage>
-                                <reserved>0</reserved>
-                                <tpduReference>256</tpduReference>
-                                <parametersLength>8</parametersLength>
-                                <payloadsLength>8</payloadsLength>
-                                <parameters>
-                                    <parameter>
-                                        <type>0</type>
-                                        <s7UserDataParameterCPUService>
-                                            <header>274</header>
-                                            <paramLength>4</paramLength>
-                                            <typeCode>17</typeCode>
-                                            <type>4</type>
-                                            <functionGroup>4</functionGroup>
-                                            <subFunctionGroup>1</subFunctionGroup>
-                                            <sequenceNumber>0</sequenceNumber>
-                                        </s7UserDataParameterCPUService>
-                                    </parameter>
-                                </parameters>
-                                <payloads>
-                                    <payload>
-                                        <s7UserDataPayloadCpuServices>
-                                            <returnCode>255</returnCode>
-                                            <transportSize>9</transportSize>
-                                            <length>4</length>
-                                            <sslId>17</sslId>
-                                            <sslIndex>0</sslIndex>
-                                        </s7UserDataPayloadCpuServices>
-                                    </payload>
-                                </payloads>
-                            </s7UserDataMessage>
-                        </userData>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="S7-ReadSZLCPUFunctionResponse"
-                         root="TpktMessage"
-                         model="s7Schema">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">
-                0300009902f080320700000100000c007c000112081284010200000000ff09007800110000001c0004000136455337203331352d32454831342d304142302000c000030001000636455337203331352d32454831342d304142302000c0000300010007202020202020202020202020202020202020202000c0560302070081426f6f74204c6f61646572202020202020202020000041200909
-            </tdml:documentPart>
-        </tdml:document>
-
-        <!-- Define the expected output -->
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>153</length>
-                    <userData>
-                        <headerLength>2</headerLength>
-                        <type>240</type>
-                        <cotpTpduData>
-                            <endOfTransmission>true</endOfTransmission>
-                            <tpduRef>0</tpduRef>
-                        </cotpTpduData>
-                        <userData>
-                            <magicByte>50</magicByte>
-                            <type>7</type>
-                            <s7UserDataMessage>
-                                <reserved>0</reserved>
-                                <tpduReference>256</tpduReference>
-                                <parametersLength>12</parametersLength>
-                                <payloadsLength>124</payloadsLength>
-                                <parameters>
-                                    <parameter>
-                                        <type>0</type>
-                                        <s7UserDataParameterCPUService>
-                                            <header>274</header>
-                                            <paramLength>8</paramLength>
-                                            <typeCode>18</typeCode>
-                                            <type>8</type>
-                                            <functionGroup>4</functionGroup>
-                                            <subFunctionGroup>1</subFunctionGroup>
-                                            <sequenceNumber>2</sequenceNumber>
-                                            <dataUnitReferenceNumber>0</dataUnitReferenceNumber>
-                                            <lastDataUnit>0</lastDataUnit>
-                                            <errorCode>0</errorCode>
-                                        </s7UserDataParameterCPUService>
-                                    </parameter>
-                                </parameters>
-                                <payloads>
-                                    <payload>
-                                        <s7UserDataPayloadCpuServices>
-                                            <returnCode>255</returnCode>
-                                            <transportSize>9</transportSize>
-                                            <length>120</length>
-                                            <sslId>17</sslId>
-                                            <sslIndex>0</sslIndex>
-                                            <partialList>
-                                                <partialListLengthInBytes>28</partialListLengthInBytes>
-                                                <partialListCount>4</partialListCount>
-                                                <sslDataRecords>
-                                                    <sslDataRecord>
-                                                        <s7ResponsePayloadCpuServicesSslDataRecordModuleIdentification>
-                                                            <index>1</index>
-                                                            <articleNumber><![CDATA[6ES7 315-2EH14-0AB0 ]]></articleNumber>
-                                                            <bgType>192</bgType>
-                                                            <moduleOrOsVersion>3</moduleOrOsVersion>
-                                                            <pgDescriptionFileVersion>1</pgDescriptionFileVersion>
-                                                        </s7ResponsePayloadCpuServicesSslDataRecordModuleIdentification>
-                                                    </sslDataRecord>
-                                                    <sslDataRecord>
-                                                        <s7ResponsePayloadCpuServicesSslDataRecordModuleIdentification>
-                                                            <index>6</index>
-                                                            <articleNumber><![CDATA[6ES7 315-2EH14-0AB0 ]]></articleNumber>
-                                                            <bgType>192</bgType>
-                                                            <moduleOrOsVersion>3</moduleOrOsVersion>
-                                                            <pgDescriptionFileVersion>1</pgDescriptionFileVersion>
-                                                        </s7ResponsePayloadCpuServicesSslDataRecordModuleIdentification>
-                                                    </sslDataRecord>
-                                                    <sslDataRecord>
-                                                        <s7ResponsePayloadCpuServicesSslDataRecordModuleIdentification>
-                                                            <index>7</index>
-                                                            <articleNumber><![CDATA[                    ]]></articleNumber>
-                                                            <bgType>192</bgType>
-                                                            <moduleOrOsVersion>22019</moduleOrOsVersion>
-                                                            <pgDescriptionFileVersion>519</pgDescriptionFileVersion>
-                                                        </s7ResponsePayloadCpuServicesSslDataRecordModuleIdentification>
-                                                    </sslDataRecord>
-                                                    <sslDataRecord>
-                                                        <s7ResponsePayloadCpuServicesSslDataRecordModuleIdentification>
-                                                            <index>129</index>
-                                                            <articleNumber><![CDATA[Boot Loader         ]]></articleNumber>
-                                                            <bgType>0</bgType>
-                                                            <moduleOrOsVersion>16672</moduleOrOsVersion>
-                                                            <pgDescriptionFileVersion>2313</pgDescriptionFileVersion>
-                                                        </s7ResponsePayloadCpuServicesSslDataRecordModuleIdentification>
-                                                    </sslDataRecord>
-                                                </sslDataRecords>
-                                            </partialList>
-                                        </s7UserDataPayloadCpuServices>
-                                    </payload>
-                                </payloads>
-                            </s7UserDataMessage>
-                        </userData>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="S7-ReadVarRequestSingleItem"
-                         root="TpktMessage"
-                         model="s7Schema">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">0300001f02f080320100001900000e00000401120a10080001000083000080
-            </tdml:documentPart>
-        </tdml:document>
-
-        <!-- Define the expected output -->
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>31</length>
-                    <userData>
-                        <headerLength>2</headerLength>
-                        <type>240</type>
-                        <cotpTpduData>
-                            <endOfTransmission>true</endOfTransmission>
-                            <tpduRef>0</tpduRef>
-                        </cotpTpduData>
-                        <userData>
-                            <magicByte>50</magicByte>
-                            <type>1</type>
-                            <s7RequestMessage>
-                                <reserved>0</reserved>
-                                <tpduReference>6400</tpduReference>
-                                <parametersLength>14</parametersLength>
-                                <payloadsLength>0</payloadsLength>
-                                <parameters>
-                                    <parameter>
-                                        <type>4</type>
-                                        <s7RequestParameterReadVar>
-                                            <numItems>1</numItems>
-                                            <items>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterReadVarAnyItem>
-                                                        <paramLength>10</paramLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>8</dataType>
-                                                        <numElements>1</numElements>
-                                                        <dataBlockNumber>0</dataBlockNumber>
-                                                        <memoryArea>131</memoryArea>
-                                                        <byteOffset>16</byteOffset>
-                                                        <bitOffset>0</bitOffset>
-                                                    </s7RequestParameterReadVarAnyItem>
-                                                </item>
-                                            </items>
-                                        </s7RequestParameterReadVar>
-                                    </parameter>
-                                </parameters>
-                                <payloads>
-                                    <payload>
-                                        <s7RequestPayloadReadVar>
-                                            <data/>
-                                        </s7RequestPayloadReadVar>
-                                    </payload>
-                                </payloads>
-                            </s7RequestMessage>
-                        </userData>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="S7-ReadVarResponseSingleItem"
-                         root="TpktMessage"
-                         model="s7Schema">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">0300001d02f0803203000019000002000800000401ff07000400000000
-            </tdml:documentPart>
-        </tdml:document>
-
-        <!-- Define the expected output -->
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>29</length>
-                    <userData>
-                        <headerLength>2</headerLength>
-                        <type>240</type>
-                        <cotpTpduData>
-                            <endOfTransmission>true</endOfTransmission>
-                            <tpduRef>0</tpduRef>
-                        </cotpTpduData>
-                        <userData>
-                            <magicByte>50</magicByte>
-                            <type>3</type>
-                            <s7ResponseMessage>
-                                <reserved>0</reserved>
-                                <tpduReference>6400</tpduReference>
-                                <parametersLength>2</parametersLength>
-                                <payloadsLength>8</payloadsLength>
-                                <errorClass>0</errorClass>
-                                <errorCode>0</errorCode>
-                                <parameters>
-                                    <parameter>
-                                        <type>4</type>
-                                        <s7ResponseParameterReadVar>
-                                            <numItems>1</numItems>
-                                        </s7ResponseParameterReadVar>
-                                    </parameter>
-                                </parameters>
-                                <payloads>
-                                    <payload>
-                                        <s7ResponsePayloadReadVar>
-                                            <numItems>1</numItems>
-                                            <item>
-                                                <returnCode>255</returnCode>
-                                                <transportSize>7</transportSize>
-                                                <rawLength>4</rawLength>
-                                                <lengthInBytes>4</lengthInBytes>
-                                                <data>00000000</data>
-                                            </item>
-                                        </s7ResponsePayloadReadVar>
-                                    </payload>
-                                </payloads>
-                            </s7ResponseMessage>
-                        </userData>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="S7-ReadVarRequestMixedItems"
-                         root="TpktMessage"
-                         model="s7Schema">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">
-                0300006702f080320100000001005600000407120a10060001032b84000160120a10020001032b840001a0120a10010001032b840001a9120a10050001032b84000150120a10020001032b84000198120a10040001032b84000140120a10020001032b84000190
-            </tdml:documentPart>
-        </tdml:document>
-
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>103</length>
-                    <userData>
-                        <headerLength>2</headerLength>
-                        <type>240</type>
-                        <cotpTpduData>
-                            <endOfTransmission>true</endOfTransmission>
-                            <tpduRef>0</tpduRef>
-                        </cotpTpduData>
-                        <userData>
-                            <magicByte>50</magicByte>
-                            <type>1</type>
-                            <s7RequestMessage>
-                                <reserved>0</reserved>
-                                <tpduReference>1</tpduReference>
-                                <parametersLength>86</parametersLength>
-                                <payloadsLength>0</payloadsLength>
-                                <parameters>
-                                    <parameter>
-                                        <type>4</type>
-                                        <s7RequestParameterReadVar>
-                                            <numItems>7</numItems>
-                                            <items>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterReadVarAnyItem>
-                                                        <paramLength>10</paramLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>6</dataType>
-                                                        <numElements>1</numElements>
-                                                        <dataBlockNumber>811</dataBlockNumber>
-                                                        <memoryArea>132</memoryArea>
-                                                        <byteOffset>44</byteOffset>
-                                                        <bitOffset>0</bitOffset>
-                                                    </s7RequestParameterReadVarAnyItem>
-                                                </item>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterReadVarAnyItem>
-                                                        <paramLength>10</paramLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>2</dataType>
-                                                        <numElements>1</numElements>
-                                                        <dataBlockNumber>811</dataBlockNumber>
-                                                        <memoryArea>132</memoryArea>
-                                                        <byteOffset>52</byteOffset>
-                                                        <bitOffset>0</bitOffset>
-                                                    </s7RequestParameterReadVarAnyItem>
-                                                </item>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterReadVarAnyItem>
-                                                        <paramLength>10</paramLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>1</dataType>
-                                                        <numElements>1</numElements>
-                                                        <dataBlockNumber>811</dataBlockNumber>
-                                                        <memoryArea>132</memoryArea>
-                                                        <byteOffset>53</byteOffset>
-                                                        <bitOffset>1</bitOffset>
-                                                    </s7RequestParameterReadVarAnyItem>
-                                                </item>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterReadVarAnyItem>
-                                                        <paramLength>10</paramLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>5</dataType>
-                                                        <numElements>1</numElements>
-                                                        <dataBlockNumber>811</dataBlockNumber>
-                                                        <memoryArea>132</memoryArea>
-                                                        <byteOffset>42</byteOffset>
-                                                        <bitOffset>0</bitOffset>
-                                                    </s7RequestParameterReadVarAnyItem>
-                                                </item>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterReadVarAnyItem>
-                                                        <paramLength>10</paramLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>2</dataType>
-                                                        <numElements>1</numElements>
-                                                        <dataBlockNumber>811</dataBlockNumber>
-                                                        <memoryArea>132</memoryArea>
-                                                        <byteOffset>51</byteOffset>
-                                                        <bitOffset>0</bitOffset>
-                                                    </s7RequestParameterReadVarAnyItem>
-                                                </item>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterReadVarAnyItem>
-                                                        <paramLength>10</paramLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>4</dataType>
-                                                        <numElements>1</numElements>
-                                                        <dataBlockNumber>811</dataBlockNumber>
-                                                        <memoryArea>132</memoryArea>
-                                                        <byteOffset>40</byteOffset>
-                                                        <bitOffset>0</bitOffset>
-                                                    </s7RequestParameterReadVarAnyItem>
-                                                </item>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterReadVarAnyItem>
-                                                        <paramLength>10</paramLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>2</dataType>
-                                                        <numElements>1</numElements>
-                                                        <dataBlockNumber>811</dataBlockNumber>
-                                                        <memoryArea>132</memoryArea>
-                                                        <byteOffset>50</byteOffset>
-                                                        <bitOffset>0</bitOffset>
-                                                    </s7RequestParameterReadVarAnyItem>
-                                                </item>
-                                            </items>
-                                        </s7RequestParameterReadVar>
-                                    </parameter>
-                                </parameters>
-                                <payloads>
-                                    <payload>
-                                        <s7RequestPayloadReadVar>
-                                            <data/>
-                                        </s7RequestPayloadReadVar>
-                                    </payload>
-                                </payloads>
-                            </s7RequestMessage>
-                        </userData>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="S7-ReadVarResponseMixedItems"
-                         root="TpktMessage"
-                         model="s7Schema">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">
-                0300004002f0803203000000010002002b00000407ff04002000000000ff0400080000ff0300010000ff0500100000ff0400080000ff0400100000ff04000800
-            </tdml:documentPart>
-        </tdml:document>
-
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>64</length>
-                    <userData>
-                        <headerLength>2</headerLength>
-                        <type>240</type>
-                        <cotpTpduData>
-                            <endOfTransmission>true</endOfTransmission>
-                            <tpduRef>0</tpduRef>
-                        </cotpTpduData>
-                        <userData>
-                            <magicByte>50</magicByte>
-                            <type>3</type>
-                            <s7ResponseMessage>
-                                <reserved>0</reserved>
-                                <tpduReference>1</tpduReference>
-                                <parametersLength>2</parametersLength>
-                                <payloadsLength>43</payloadsLength>
-                                <errorClass>0</errorClass>
-                                <errorCode>0</errorCode>
-                                <parameters>
-                                    <parameter>
-                                        <type>4</type>
-                                        <s7ResponseParameterReadVar>
-                                            <numItems>7</numItems>
-                                        </s7ResponseParameterReadVar>
-                                    </parameter>
-                                </parameters>
-                                <payloads>
-                                    <payload>
-                                        <s7ResponsePayloadReadVar>
-                                            <numItems>7</numItems>
-                                            <item>
-                                                <returnCode>255</returnCode>
-                                                <transportSize>4</transportSize>
-                                                <rawLength>32</rawLength>
-                                                <lengthInBytes>4</lengthInBytes>
-                                                <data>00000000</data>
-                                            </item>
-                                            <item>
-                                                <returnCode>255</returnCode>
-                                                <transportSize>4</transportSize>
-                                                <rawLength>8</rawLength>
-                                                <lengthInBytes>1</lengthInBytes>
-                                                <data>00</data>
-                                                <fillByte>0</fillByte>
-                                            </item>
-                                            <item>
-                                                <returnCode>255</returnCode>
-                                                <transportSize>3</transportSize>
-                                                <rawLength>1</rawLength>
-                                                <lengthInBytes>1</lengthInBytes>
-                                                <data>00</data>
-                                                <fillByte>0</fillByte>
-                                            </item>
-                                            <item>
-                                                <returnCode>255</returnCode>
-                                                <transportSize>5</transportSize>
-                                                <rawLength>16</rawLength>
-                                                <lengthInBytes>2</lengthInBytes>
-                                                <data>0000</data>
-                                            </item>
-                                            <item>
-                                                <returnCode>255</returnCode>
-                                                <transportSize>4</transportSize>
-                                                <rawLength>8</rawLength>
-                                                <lengthInBytes>1</lengthInBytes>
-                                                <data>00</data>
-                                                <fillByte>0</fillByte>
-                                            </item>
-                                            <item>
-                                                <returnCode>255</returnCode>
-                                                <transportSize>4</transportSize>
-                                                <rawLength>16</rawLength>
-                                                <lengthInBytes>2</lengthInBytes>
-                                                <data>0000</data>
-                                            </item>
-                                            <item>
-                                                <returnCode>255</returnCode>
-                                                <transportSize>4</transportSize>
-                                                <rawLength>8</rawLength>
-                                                <lengthInBytes>1</lengthInBytes>
-                                                <data>00</data>
-                                            </item>
-                                        </s7ResponsePayloadReadVar>
-                                    </payload>
-                                </payloads>
-                            </s7ResponseMessage>
-                        </userData>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="S7-ReadVarResponseMixedItemsWithOddNumberOfBytes"
-                         root="TpktMessage"
-                         model="s7Schema">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">
-                0300002802f0803203000000010002001300000403ff040018AABBCC00ff0400080000ff03000100
-            </tdml:documentPart>
-        </tdml:document>
-
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>40</length>
-                    <userData>
-                        <headerLength>2</headerLength>
-                        <type>240</type>
-                        <cotpTpduData>
-                            <endOfTransmission>true</endOfTransmission>
-                            <tpduRef>0</tpduRef>
-                        </cotpTpduData>
-                        <userData>
-                            <magicByte>50</magicByte>
-                            <type>3</type>
-                            <s7ResponseMessage>
-                                <reserved>0</reserved>
-                                <tpduReference>1</tpduReference>
-                                <parametersLength>2</parametersLength>
-                                <payloadsLength>19</payloadsLength>
-                                <errorClass>0</errorClass>
-                                <errorCode>0</errorCode>
-                                <parameters>
-                                    <parameter>
-                                        <type>4</type>
-                                        <s7ResponseParameterReadVar>
-                                            <numItems>3</numItems>
-                                        </s7ResponseParameterReadVar>
-                                    </parameter>
-                                </parameters>
-                                <payloads>
-                                    <payload>
-                                        <s7ResponsePayloadReadVar>
-                                            <numItems>3</numItems>
-                                            <item>
-                                                <returnCode>255</returnCode>
-                                                <transportSize>4</transportSize>
-                                                <rawLength>24</rawLength>
-                                                <lengthInBytes>3</lengthInBytes>
-                                                <data>AABBCC</data>
-                                                <fillByte>0</fillByte>
-                                            </item>
-                                            <item>
-                                                <returnCode>255</returnCode>
-                                                <transportSize>4</transportSize>
-                                                <rawLength>8</rawLength>
-                                                <lengthInBytes>1</lengthInBytes>
-                                                <data>00</data>
-                                                <fillByte>0</fillByte>
-                                            </item>
-                                            <item>
-                                                <returnCode>255</returnCode>
-                                                <transportSize>3</transportSize>
-                                                <rawLength>1</rawLength>
-                                                <lengthInBytes>1</lengthInBytes>
-                                                <data>00</data>
-                                            </item>
-                                        </s7ResponsePayloadReadVar>
-                                    </payload>
-                                </payloads>
-                            </s7ResponseMessage>
-                        </userData>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="S7-ReadVarRequestNoFillingBytes"
-                         root="TpktMessage"
-                         model="s7Schema">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">
-                0300003702f080320100000001002600000403120a10060001032b84000160120a10050001032b84000150120a10040001032b84000140
-            </tdml:documentPart>
-        </tdml:document>
-
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>55</length>
-                    <userData>
-                        <headerLength>2</headerLength>
-                        <type>240</type>
-                        <cotpTpduData>
-                            <endOfTransmission>true</endOfTransmission>
-                            <tpduRef>0</tpduRef>
-                        </cotpTpduData>
-                        <userData>
-                            <magicByte>50</magicByte>
-                            <type>1</type>
-                            <s7RequestMessage>
-                                <reserved>0</reserved>
-                                <tpduReference>1</tpduReference>
-                                <parametersLength>38</parametersLength>
-                                <payloadsLength>0</payloadsLength>
-                                <parameters>
-                                    <parameter>
-                                        <type>4</type>
-                                        <s7RequestParameterReadVar>
-                                            <numItems>3</numItems>
-                                            <items>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterReadVarAnyItem>
-                                                        <paramLength>10</paramLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>6</dataType>
-                                                        <numElements>1</numElements>
-                                                        <dataBlockNumber>811</dataBlockNumber>
-                                                        <memoryArea>132</memoryArea>
-                                                        <byteOffset>44</byteOffset>
-                                                        <bitOffset>0</bitOffset>
-                                                    </s7RequestParameterReadVarAnyItem>
-                                                </item>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterReadVarAnyItem>
-                                                        <paramLength>10</paramLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>5</dataType>
-                                                        <numElements>1</numElements>
-                                                        <dataBlockNumber>811</dataBlockNumber>
-                                                        <memoryArea>132</memoryArea>
-                                                        <byteOffset>42</byteOffset>
-                                                        <bitOffset>0</bitOffset>
-                                                    </s7RequestParameterReadVarAnyItem>
-                                                </item>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterReadVarAnyItem>
-                                                        <paramLength>10</paramLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>4</dataType>
-                                                        <numElements>1</numElements>
-                                                        <dataBlockNumber>811</dataBlockNumber>
-                                                        <memoryArea>132</memoryArea>
-                                                        <byteOffset>40</byteOffset>
-                                                        <bitOffset>0</bitOffset>
-                                                    </s7RequestParameterReadVarAnyItem>
-                                                </item>
-                                            </items>
-                                        </s7RequestParameterReadVar>
-                                    </parameter>
-                                </parameters>
-                                <payloads>
-                                    <payload>
-                                        <s7RequestPayloadReadVar>
-                                            <data/>
-                                        </s7RequestPayloadReadVar>
-                                    </payload>
-                                </payloads>
-                            </s7RequestMessage>
-                        </userData>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="S7-ReadVarResponseNoFillingBytes"
-                         root="TpktMessage"
-                         model="s7Schema">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">
-                0300002902f0803203000000010002001400000403ff04002000000000ff0500100000ff0400100000
-            </tdml:documentPart>
-        </tdml:document>
-
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>41</length>
-                    <userData>
-                        <headerLength>2</headerLength>
-                        <type>240</type>
-                        <cotpTpduData>
-                            <endOfTransmission>true</endOfTransmission>
-                            <tpduRef>0</tpduRef>
-                        </cotpTpduData>
-                        <userData>
-                            <magicByte>50</magicByte>
-                            <type>3</type>
-                            <s7ResponseMessage>
-                                <reserved>0</reserved>
-                                <tpduReference>1</tpduReference>
-                                <parametersLength>2</parametersLength>
-                                <payloadsLength>20</payloadsLength>
-                                <errorClass>0</errorClass>
-                                <errorCode>0</errorCode>
-                                <parameters>
-                                    <parameter>
-                                        <type>4</type>
-                                        <s7ResponseParameterReadVar>
-                                            <numItems>3</numItems>
-                                        </s7ResponseParameterReadVar>
-                                    </parameter>
-                                </parameters>
-                                <payloads>
-                                    <payload>
-                                        <s7ResponsePayloadReadVar>
-                                            <numItems>3</numItems>
-                                            <item>
-                                                <returnCode>255</returnCode>
-                                                <transportSize>4</transportSize>
-                                                <rawLength>32</rawLength>
-                                                <lengthInBytes>4</lengthInBytes>
-                                                <data>00000000</data>
-                                            </item>
-                                            <item>
-                                                <returnCode>255</returnCode>
-                                                <transportSize>5</transportSize>
-                                                <rawLength>16</rawLength>
-                                                <lengthInBytes>2</lengthInBytes>
-                                                <data>0000</data>
-                                            </item>
-                                            <item>
-                                                <returnCode>255</returnCode>
-                                                <transportSize>4</transportSize>
-                                                <rawLength>16</rawLength>
-                                                <lengthInBytes>2</lengthInBytes>
-                                                <data>0000</data>
-                                            </item>
-                                        </s7ResponsePayloadReadVar>
-                                    </payload>
-                                </payloads>
-                            </s7ResponseMessage>
-                        </userData>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="S7-ReadVarRequestWithFillingBytes"
-                         root="TpktMessage"
-                         model="s7Schema">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">
-                0300004302f080320100000001003200000404120a10020001032b84000150120a10010001032b84000159120a10020001032b84000148120a10020001032b84000140
-            </tdml:documentPart>
-        </tdml:document>
-
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>67</length>
-                    <userData>
-                        <headerLength>2</headerLength>
-                        <type>240</type>
-                        <cotpTpduData>
-                            <endOfTransmission>true</endOfTransmission>
-                            <tpduRef>0</tpduRef>
-                        </cotpTpduData>
-                        <userData>
-                            <magicByte>50</magicByte>
-                            <type>1</type>
-                            <s7RequestMessage>
-                                <reserved>0</reserved>
-                                <tpduReference>1</tpduReference>
-                                <parametersLength>50</parametersLength>
-                                <payloadsLength>0</payloadsLength>
-                                <parameters>
-                                    <parameter>
-                                        <type>4</type>
-                                        <s7RequestParameterReadVar>
-                                            <numItems>4</numItems>
-                                            <items>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterReadVarAnyItem>
-                                                        <paramLength>10</paramLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>2</dataType>
-                                                        <numElements>1</numElements>
-                                                        <dataBlockNumber>811</dataBlockNumber>
-                                                        <memoryArea>132</memoryArea>
-                                                        <byteOffset>42</byteOffset>
-                                                        <bitOffset>0</bitOffset>
-                                                    </s7RequestParameterReadVarAnyItem>
-                                                </item>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterReadVarAnyItem>
-                                                        <paramLength>10</paramLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>1</dataType>
-                                                        <numElements>1</numElements>
-                                                        <dataBlockNumber>811</dataBlockNumber>
-                                                        <memoryArea>132</memoryArea>
-                                                        <byteOffset>43</byteOffset>
-                                                        <bitOffset>1</bitOffset>
-                                                    </s7RequestParameterReadVarAnyItem>
-                                                </item>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterReadVarAnyItem>
-                                                        <paramLength>10</paramLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>2</dataType>
-                                                        <numElements>1</numElements>
-                                                        <dataBlockNumber>811</dataBlockNumber>
-                                                        <memoryArea>132</memoryArea>
-                                                        <byteOffset>41</byteOffset>
-                                                        <bitOffset>0</bitOffset>
-                                                    </s7RequestParameterReadVarAnyItem>
-                                                </item>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterReadVarAnyItem>
-                                                        <paramLength>10</paramLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>2</dataType>
-                                                        <numElements>1</numElements>
-                                                        <dataBlockNumber>811</dataBlockNumber>
-                                                        <memoryArea>132</memoryArea>
-                                                        <byteOffset>40</byteOffset>
-                                                        <bitOffset>0</bitOffset>
-                                                    </s7RequestParameterReadVarAnyItem>
-                                                </item>
-                                            </items>
-                                        </s7RequestParameterReadVar>
-                                    </parameter>
-                                </parameters>
-                                <payloads>
-                                    <payload>
-                                        <s7RequestPayloadReadVar>
-                                            <data/>
-                                        </s7RequestPayloadReadVar>
-                                    </payload>
-                                </payloads>
-                            </s7RequestMessage>
-                        </userData>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="S7-ReadVarResponseWithFillingBytes"
-                         root="TpktMessage"
-                         model="s7Schema">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">
-                0300002c02f0803203000000010002001700000404ff0400080000ff0300010000ff0400080000ff04000800
-            </tdml:documentPart>
-        </tdml:document>
-
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>44</length>
-                    <userData>
-                        <headerLength>2</headerLength>
-                        <type>240</type>
-                        <cotpTpduData>
-                            <endOfTransmission>true</endOfTransmission>
-                            <tpduRef>0</tpduRef>
-                        </cotpTpduData>
-                        <userData>
-                            <magicByte>50</magicByte>
-                            <type>3</type>
-                            <s7ResponseMessage>
-                                <reserved>0</reserved>
-                                <tpduReference>1</tpduReference>
-                                <parametersLength>2</parametersLength>
-                                <payloadsLength>23</payloadsLength>
-                                <errorClass>0</errorClass>
-                                <errorCode>0</errorCode>
-                                <parameters>
-                                    <parameter>
-                                        <type>4</type>
-                                        <s7ResponseParameterReadVar>
-                                            <numItems>4</numItems>
-                                        </s7ResponseParameterReadVar>
-                                    </parameter>
-                                </parameters>
-                                <payloads>
-                                    <payload>
-                                        <s7ResponsePayloadReadVar>
-                                            <numItems>4</numItems>
-                                            <item>
-                                                <returnCode>255</returnCode>
-                                                <transportSize>4</transportSize>
-                                                <rawLength>8</rawLength>
-                                                <lengthInBytes>1</lengthInBytes>
-                                                <data>00</data>
-                                                <fillByte>0</fillByte>
-                                            </item>
-                                            <item>
-                                                <returnCode>255</returnCode>
-                                                <transportSize>3</transportSize>
-                                                <rawLength>1</rawLength>
-                                                <lengthInBytes>1</lengthInBytes>
-                                                <data>00</data>
-                                                <fillByte>0</fillByte>
-                                            </item>
-                                            <item>
-                                                <returnCode>255</returnCode>
-                                                <transportSize>4</transportSize>
-                                                <rawLength>8</rawLength>
-                                                <lengthInBytes>1</lengthInBytes>
-                                                <data>00</data>
-                                                <fillByte>0</fillByte>
-                                            </item>
-                                            <item>
-                                                <returnCode>255</returnCode>
-                                                <transportSize>4</transportSize>
-                                                <rawLength>8</rawLength>
-                                                <lengthInBytes>1</lengthInBytes>
-                                                <data>00</data>
-                                            </item>
-                                        </s7ResponsePayloadReadVar>
-                                    </payload>
-                                </payloads>
-                            </s7ResponseMessage>
-                        </userData>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="S7-WriteVarRequestSingleItem"
-                         root="TpktMessage"
-                         model="s7Schema">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">
-                0300002702f080320100001800000e00080501120a100800010000830000800007000479e9f642
-            </tdml:documentPart>
-        </tdml:document>
-
-        <!-- Define the expected output -->
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>39</length>
-                    <userData>
-                        <headerLength>2</headerLength>
-                        <type>240</type>
-                        <cotpTpduData>
-                            <endOfTransmission>true</endOfTransmission>
-                            <tpduRef>0</tpduRef>
-                        </cotpTpduData>
-                        <userData>
-                            <magicByte>50</magicByte>
-                            <type>1</type>
-                            <s7RequestMessage>
-                                <reserved>0</reserved>
-                                <tpduReference>6144</tpduReference>
-                                <parametersLength>14</parametersLength>
-                                <payloadsLength>8</payloadsLength>
-                                <parameters>
-                                    <parameter>
-                                        <type>5</type>
-                                        <s7RequestParameterWriteVar>
-                                            <numItems>1</numItems>
-                                            <items>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterWriteVarAnyItem>
-                                                        <itemLength>10</itemLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>8</dataType>
-                                                        <numElements>1</numElements>
-                                                        <dataBlockNumber>0</dataBlockNumber>
-                                                        <memoryArea>131</memoryArea>
-                                                        <byteOffset>16</byteOffset>
-                                                        <bitOffset>0</bitOffset>
-                                                    </s7RequestParameterWriteVarAnyItem>
-                                                </item>
-                                            </items>
-                                        </s7RequestParameterWriteVar>
-                                    </parameter>
-                                </parameters>
-                                <payloads>
-                                    <payload>
-                                        <s7RequestPayloadWriteVar>
-                                            <numItems>1</numItems>
-                                            <item>
-                                                <returnCode>0</returnCode>
-                                                <transportSize>7</transportSize>
-                                                <rawLength>4</rawLength>
-                                                <lengthInBytes>4</lengthInBytes>
-                                                <data>79E9F642</data>
-                                            </item>
-                                        </s7RequestPayloadWriteVar>
-                                    </payload>
-                                </payloads>
-                            </s7RequestMessage>
-                        </userData>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="S7-WriteVarResponseSingleItem"
-                         root="TpktMessage"
-                         model="s7Schema">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">0300001602f0803203000018000002000100000501ff</tdml:documentPart>
-        </tdml:document>
-
-        <!-- Define the expected output -->
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>22</length>
-                    <userData>
-                        <headerLength>2</headerLength>
-                        <type>240</type>
-                        <cotpTpduData>
-                            <endOfTransmission>true</endOfTransmission>
-                            <tpduRef>0</tpduRef>
-                        </cotpTpduData>
-                        <userData>
-                            <magicByte>50</magicByte>
-                            <type>3</type>
-                            <s7ResponseMessage>
-                                <reserved>0</reserved>
-                                <tpduReference>6144</tpduReference>
-                                <parametersLength>2</parametersLength>
-                                <payloadsLength>1</payloadsLength>
-                                <errorClass>0</errorClass>
-                                <errorCode>0</errorCode>
-                                <parameters>
-                                    <parameter>
-                                        <type>5</type>
-                                        <s7ResponseParameterWriteVar>
-                                            <numItems>1</numItems>
-                                        </s7ResponseParameterWriteVar>
-                                    </parameter>
-                                </parameters>
-                                <payloads>
-                                    <payload>
-                                        <s7ResponsePayloadWriteVar>
-                                            <numItems>1</numItems>
-                                            <items>
-                                                <item>
-                                                    <returnCode>255</returnCode>
-                                                </item>
-                                            </items>
-                                        </s7ResponsePayloadWriteVar>
-                                    </payload>
-                                </payloads>
-                            </s7ResponseMessage>
-                        </userData>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="S7-ReadVarRequestMultipleItems"
-                         root="TpktMessage"
-                         model="s7Schema">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">
-                0300004f02f080320100001b00003e00000405120a10020010000083000000120a10020010000081000000120a10020010000082000000120a101d000800001d000000120a101c000800001c000000
-            </tdml:documentPart>
-        </tdml:document>
-
-        <!-- Define the expected output -->
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>79</length>
-                    <userData>
-                        <headerLength>2</headerLength>
-                        <type>240</type>
-                        <cotpTpduData>
-                            <endOfTransmission>true</endOfTransmission>
-                            <tpduRef>0</tpduRef>
-                        </cotpTpduData>
-                        <userData>
-                            <magicByte>50</magicByte>
-                            <type>1</type>
-                            <s7RequestMessage>
-                                <reserved>0</reserved>
-                                <tpduReference>6912</tpduReference>
-                                <parametersLength>62</parametersLength>
-                                <payloadsLength>0</payloadsLength>
-                                <parameters>
-                                    <parameter>
-                                        <type>4</type>
-                                        <s7RequestParameterReadVar>
-                                            <numItems>5</numItems>
-                                            <items>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterReadVarAnyItem>
-                                                        <paramLength>10</paramLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>2</dataType>
-                                                        <numElements>16</numElements>
-                                                        <dataBlockNumber>0</dataBlockNumber>
-                                                        <memoryArea>131</memoryArea>
-                                                        <byteOffset>0</byteOffset>
-                                                        <bitOffset>0</bitOffset>
-                                                    </s7RequestParameterReadVarAnyItem>
-                                                </item>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterReadVarAnyItem>
-                                                        <paramLength>10</paramLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>2</dataType>
-                                                        <numElements>16</numElements>
-                                                        <dataBlockNumber>0</dataBlockNumber>
-                                                        <memoryArea>129</memoryArea>
-                                                        <byteOffset>0</byteOffset>
-                                                        <bitOffset>0</bitOffset>
-                                                    </s7RequestParameterReadVarAnyItem>
-                                                </item>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterReadVarAnyItem>
-                                                        <paramLength>10</paramLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>2</dataType>
-                                                        <numElements>16</numElements>
-                                                        <dataBlockNumber>0</dataBlockNumber>
-                                                        <memoryArea>130</memoryArea>
-                                                        <byteOffset>0</byteOffset>
-                                                        <bitOffset>0</bitOffset>
-                                                    </s7RequestParameterReadVarAnyItem>
-                                                </item>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterReadVarAnyItem>
-                                                        <paramLength>10</paramLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>29</dataType>
-                                                        <numElements>8</numElements>
-                                                        <dataBlockNumber>0</dataBlockNumber>
-                                                        <memoryArea>29</memoryArea>
-                                                        <byteOffset>0</byteOffset>
-                                                        <bitOffset>0</bitOffset>
-                                                    </s7RequestParameterReadVarAnyItem>
-                                                </item>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterReadVarAnyItem>
-                                                        <paramLength>10</paramLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>28</dataType>
-                                                        <numElements>8</numElements>
-                                                        <dataBlockNumber>0</dataBlockNumber>
-                                                        <memoryArea>28</memoryArea>
-                                                        <byteOffset>0</byteOffset>
-                                                        <bitOffset>0</bitOffset>
-                                                    </s7RequestParameterReadVarAnyItem>
-                                                </item>
-                                            </items>
-                                        </s7RequestParameterReadVar>
-                                    </parameter>
-                                </parameters>
-                                <payloads>
-                                    <payload>
-                                        <s7RequestPayloadReadVar>
-                                            <data/>
-                                        </s7RequestPayloadReadVar>
-                                    </payload>
-                                </payloads>
-                            </s7RequestMessage>
-                        </userData>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="S7-ReadVarResponseMultipleItems"
-                         root="TpktMessage"
-                         model="s7Schema">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">
-                0300007902f080320300001b000002006400000405ff040080acde000daddeaddeaddeaddeaddeaddeff040080aaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbff040080bbbbbbbbbbbbbbbbaddeaddeaddeaddeff09001000000000000000000000000000000000ff09001000110000000000000000000000000000
-            </tdml:documentPart>
-        </tdml:document>
-
-        <!-- Define the expected output -->
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>121</length>
-                    <userData>
-                        <headerLength>2</headerLength>
-                        <type>240</type>
-                        <cotpTpduData>
-                            <endOfTransmission>true</endOfTransmission>
-                            <tpduRef>0</tpduRef>
-                        </cotpTpduData>
-                        <userData>
-                            <magicByte>50</magicByte>
-                            <type>3</type>
-                            <s7ResponseMessage>
-                                <reserved>0</reserved>
-                                <tpduReference>6912</tpduReference>
-                                <parametersLength>2</parametersLength>
-                                <payloadsLength>100</payloadsLength>
-                                <errorClass>0</errorClass>
-                                <errorCode>0</errorCode>
-                                <parameters>
-                                    <parameter>
-                                        <type>4</type>
-                                        <s7ResponseParameterReadVar>
-                                            <numItems>5</numItems>
-                                        </s7ResponseParameterReadVar>
-                                    </parameter>
-                                </parameters>
-                                <payloads>
-                                    <payload>
-                                        <s7ResponsePayloadReadVar>
-                                            <numItems>5</numItems>
-                                            <item>
-                                                <returnCode>255</returnCode>
-                                                <transportSize>4</transportSize>
-                                                <rawLength>128</rawLength>
-                                                <lengthInBytes>16</lengthInBytes>
-                                                <data>ACDE000DADDEADDEADDEADDEADDEADDE</data>
-                                            </item>
-                                            <item>
-                                                <returnCode>255</returnCode>
-                                                <transportSize>4</transportSize>
-                                                <rawLength>128</rawLength>
-                                                <lengthInBytes>16</lengthInBytes>
-                                                <data>AAAAAAAAAAAAAAAABBBBBBBBBBBBBBBB</data>
-                                            </item>
-                                            <item>
-                                                <returnCode>255</returnCode>
-                                                <transportSize>4</transportSize>
-                                                <rawLength>128</rawLength>
-                                                <lengthInBytes>16</lengthInBytes>
-                                                <data>BBBBBBBBBBBBBBBBADDEADDEADDEADDE</data>
-                                            </item>
-                                            <item>
-                                                <returnCode>255</returnCode>
-                                                <transportSize>9</transportSize>
-                                                <rawLength>16</rawLength>
-                                                <lengthInBytes>16</lengthInBytes>
-                                                <data>00000000000000000000000000000000</data>
-                                            </item>
-                                            <item>
-                                                <returnCode>255</returnCode>
-                                                <transportSize>9</transportSize>
-                                                <rawLength>16</rawLength>
-                                                <lengthInBytes>16</lengthInBytes>
-                                                <data>00110000000000000000000000000000</data>
-                                            </item>
-                                        </s7ResponsePayloadReadVar>
-                                    </payload>
-                                </payloads>
-                            </s7ResponseMessage>
-                        </userData>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="S7-WriteVarRequestMultipleItems"
-                         root="TpktMessage"
-                         model="s7Schema">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">
-                030000c302f080320100001a00003e00740505120a10040010000083000000120a10020010000081000000120a10020010000082000000120a101d000800001d000000120a101c000800001c00000000040100addeaddeaddeaddeaddeaddeaddeaddeefbeefbeefbeefbeefbeefbeefbeefbe00040080aaaaaaaaaaaaaaaabbbbbbbbbbbbbbbb00040080bbbbbbbbbbbbbbbbaddeaddeaddeadde00090010efbeefbeefbeefbeefbeefbeefbeefbe00090010fecafecafecafecafecafecafecafeca
-            </tdml:documentPart>
-        </tdml:document>
-
-        <!-- Define the expected output -->
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>195</length>
-                    <userData>
-                        <headerLength>2</headerLength>
-                        <type>240</type>
-                        <cotpTpduData>
-                            <endOfTransmission>true</endOfTransmission>
-                            <tpduRef>0</tpduRef>
-                        </cotpTpduData>
-                        <userData>
-                            <magicByte>50</magicByte>
-                            <type>1</type>
-                            <s7RequestMessage>
-                                <reserved>0</reserved>
-                                <tpduReference>6656</tpduReference>
-                                <parametersLength>62</parametersLength>
-                                <payloadsLength>116</payloadsLength>
-                                <parameters>
-                                    <parameter>
-                                        <type>5</type>
-                                        <s7RequestParameterWriteVar>
-                                            <numItems>5</numItems>
-                                            <items>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterWriteVarAnyItem>
-                                                        <itemLength>10</itemLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>4</dataType>
-                                                        <numElements>16</numElements>
-                                                        <dataBlockNumber>0</dataBlockNumber>
-                                                        <memoryArea>131</memoryArea>
-                                                        <byteOffset>0</byteOffset>
-                                                        <bitOffset>0</bitOffset>
-                                                    </s7RequestParameterWriteVarAnyItem>
-                                                </item>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterWriteVarAnyItem>
-                                                        <itemLength>10</itemLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>2</dataType>
-                                                        <numElements>16</numElements>
-                                                        <dataBlockNumber>0</dataBlockNumber>
-                                                        <memoryArea>129</memoryArea>
-                                                        <byteOffset>0</byteOffset>
-                                                        <bitOffset>0</bitOffset>
-                                                    </s7RequestParameterWriteVarAnyItem>
-                                                </item>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterWriteVarAnyItem>
-                                                        <itemLength>10</itemLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>2</dataType>
-                                                        <numElements>16</numElements>
-                                                        <dataBlockNumber>0</dataBlockNumber>
-                                                        <memoryArea>130</memoryArea>
-                                                        <byteOffset>0</byteOffset>
-                                                        <bitOffset>0</bitOffset>
-                                                    </s7RequestParameterWriteVarAnyItem>
-                                                </item>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterWriteVarAnyItem>
-                                                        <itemLength>10</itemLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>29</dataType>
-                                                        <numElements>8</numElements>
-                                                        <dataBlockNumber>0</dataBlockNumber>
-                                                        <memoryArea>29</memoryArea>
-                                                        <byteOffset>0</byteOffset>
-                                                        <bitOffset>0</bitOffset>
-                                                    </s7RequestParameterWriteVarAnyItem>
-                                                </item>
-                                                <item>
-                                                    <type>18</type>
-                                                    <s7RequestParameterWriteVarAnyItem>
-                                                        <itemLength>10</itemLength>
-                                                        <addressingMode>16</addressingMode>
-                                                        <dataType>28</dataType>
-                                                        <numElements>8</numElements>
-                                                        <dataBlockNumber>0</dataBlockNumber>
-                                                        <memoryArea>28</memoryArea>
-                                                        <byteOffset>0</byteOffset>
-                                                        <bitOffset>0</bitOffset>
-                                                    </s7RequestParameterWriteVarAnyItem>
-                                                </item>
-                                            </items>
-                                        </s7RequestParameterWriteVar>
-                                    </parameter>
-                                </parameters>
-                                <payloads>
-                                    <payload>
-                                        <s7RequestPayloadWriteVar>
-                                            <numItems>5</numItems>
-                                            <item>
-                                                <returnCode>0</returnCode>
-                                                <transportSize>4</transportSize>
-                                                <rawLength>256</rawLength>
-                                                <lengthInBytes>32</lengthInBytes>
-                                                <data>ADDEADDEADDEADDEADDEADDEADDEADDEEFBEEFBEEFBEEFBEEFBEEFBEEFBEEFBE</data>
-                                            </item>
-                                            <item>
-                                                <returnCode>0</returnCode>
-                                                <transportSize>4</transportSize>
-                                                <rawLength>128</rawLength>
-                                                <lengthInBytes>16</lengthInBytes>
-                                                <data>AAAAAAAAAAAAAAAABBBBBBBBBBBBBBBB</data>
-                                            </item>
-                                            <item>
-                                                <returnCode>0</returnCode>
-                                                <transportSize>4</transportSize>
-                                                <rawLength>128</rawLength>
-                                                <lengthInBytes>16</lengthInBytes>
-                                                <data>BBBBBBBBBBBBBBBBADDEADDEADDEADDE</data>
-                                            </item>
-                                            <item>
-                                                <returnCode>0</returnCode>
-                                                <transportSize>9</transportSize>
-                                                <rawLength>16</rawLength>
-                                                <lengthInBytes>16</lengthInBytes>
-                                                <data>EFBEEFBEEFBEEFBEEFBEEFBEEFBEEFBE</data>
-                                            </item>
-                                            <item>
-                                                <returnCode>0</returnCode>
-                                                <transportSize>9</transportSize>
-                                                <rawLength>16</rawLength>
-                                                <lengthInBytes>16</lengthInBytes>
-                                                <data>FECAFECAFECAFECAFECAFECAFECAFECA</data>
-                                            </item>
-                                        </s7RequestPayloadWriteVar>
-                                    </payload>
-                                </payloads>
-                            </s7RequestMessage>
-                        </userData>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-    <tdml:parserTestCase name="S7-WriteVarResponseMultipleItems"
-                         root="TpktMessage"
-                         model="s7Schema">
-        <!-- Define the input -->
-        <tdml:document>
-            <tdml:documentPart type="byte">0300001a02f080320300001a000002000500000505ffffff0303</tdml:documentPart>
-        </tdml:document>
-
-        <!-- Define the expected output -->
-        <tdml:infoset>
-            <tdml:dfdlInfoset>
-                <s7:TpktMessage>
-                    <magicByte>3</magicByte>
-                    <reserved>0</reserved>
-                    <length>26</length>
-                    <userData>
-                        <headerLength>2</headerLength>
-                        <type>240</type>
-                        <cotpTpduData>
-                            <endOfTransmission>true</endOfTransmission>
-                            <tpduRef>0</tpduRef>
-                        </cotpTpduData>
-                        <userData>
-                            <magicByte>50</magicByte>
-                            <type>3</type>
-                            <s7ResponseMessage>
-                                <reserved>0</reserved>
-                                <tpduReference>6656</tpduReference>
-                                <parametersLength>2</parametersLength>
-                                <payloadsLength>5</payloadsLength>
-                                <errorClass>0</errorClass>
-                                <errorCode>0</errorCode>
-                                <parameters>
-                                    <parameter>
-                                        <type>5</type>
-                                        <s7ResponseParameterWriteVar>
-                                            <numItems>5</numItems>
-                                        </s7ResponseParameterWriteVar>
-                                    </parameter>
-                                </parameters>
-                                <payloads>
-                                    <payload>
-                                        <s7ResponsePayloadWriteVar>
-                                            <numItems>5</numItems>
-                                            <items>
-                                                <item>
-                                                    <returnCode>255</returnCode>
-                                                </item>
-                                                <item>
-                                                    <returnCode>255</returnCode>
-                                                </item>
-                                                <item>
-                                                    <returnCode>255</returnCode>
-                                                </item>
-                                                <item>
-                                                    <returnCode>3</returnCode>
-                                                </item>
-                                                <item>
-                                                    <returnCode>3</returnCode>
-                                                </item>
-                                            </items>
-                                        </s7ResponsePayloadWriteVar>
-                                    </payload>
-                                </payloads>
-                            </s7ResponseMessage>
-                        </userData>
-                    </userData>
-                </s7:TpktMessage>
-            </tdml:dfdlInfoset>
-        </tdml:infoset>
-    </tdml:parserTestCase>
-
-</tdml:testSuite>
-
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+
+<tdml:testSuite xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
+                xmlns:tdml="http://www.ibm.com/xmlns/dfdl/testData"
+                xmlns:s7="http://plc4x.apache.org/s7"
+                xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                suiteName="S7 protocol (Full-Stack)"
+                description="Testsuite for the full stack of the S7 protocol"
+                defaultRoundTrip="onePass">
+
+    <tdml:defineSchema name="s7Schema" elementFormDefault="unqualified">
+        <!-- Import the Schema (location is defined by daffodil-built-in-catalog.xml) -->
+        <xs:import namespace="http://plc4x.apache.org/s7"/>
+
+        <!-- Import the format settings -->
+        <dfdl:format ref="s7:s7FullFormat"/>
+
+        <!-- Define the root element name and type -->
+        <xs:element name="TpktMessage" type="s7:TpktMessage"/>
+    </tdml:defineSchema>
+
+    <!--
+        In this test-case the data should be parsable to a valid result.
+        It's a TPKT package containing a COTP connection-response payload.
+    -->
+    <tdml:parserTestCase name="TPKT-tpktPacketContainingCotpConnectResponse"
+                         root="TpktMessage"
+                         model="s7Schema"
+                         description="Simple TKPT packet which contains a COTP Connection-Response as payload.">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">0300001611D00001000200C00109C1020100C2020102</tdml:documentPart>
+        </tdml:document>
+
+        <!-- Define the expected output -->
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <!-- Referencing what we defined as root element in the defineSchema section -->
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>22</length>
+                    <userData>
+                        <headerLength>17</headerLength>
+                        <type>208</type>
+                        <cotpTpduConnectionResponse>
+                            <destinationReference>1</destinationReference>
+                            <sourceReference>2</sourceReference>
+                            <protocolClass>0</protocolClass>
+                            <parameters>
+                                <parameter>
+                                    <type>192</type>
+                                    <parameterLength>1</parameterLength>
+                                    <cotpParameterTpduSize>
+                                        <tpduSize>9</tpduSize>
+                                    </cotpParameterTpduSize>
+                                </parameter>
+                                <parameter>
+                                    <type>193</type>
+                                    <parameterLength>2</parameterLength>
+                                    <cotpParameterCallingTsap>
+                                        <tsapId>256</tsapId>
+                                    </cotpParameterCallingTsap>
+                                </parameter>
+                                <parameter>
+                                    <type>194</type>
+                                    <parameterLength>2</parameterLength>
+                                    <cotpParameterCalledTsap>
+                                        <tsapId>258</tsapId>
+                                    </cotpParameterCalledTsap>
+                                </parameter>
+                            </parameters>
+                        </cotpTpduConnectionResponse>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <!--
+        In this test-case the packet doesn't start with the required magic byte 0x03.
+    -->
+    <tdml:parserTestCase name="TPKT-invalidMagicByte"
+                         root="TpktMessage"
+                         model="s7Schema">
+        <tdml:document>
+            <tdml:documentPart type="byte">0400001611D00001000200C00109C1020100C2020102</tdml:documentPart>
+        </tdml:document>
+
+        <tdml:errors>
+            <tdml:error>Parse Error</tdml:error>
+        </tdml:errors>
+    </tdml:parserTestCase>
+
+    <!--
+        In this test-case the payload of the packet doesn't match the
+        length provided in the packet header (Too short)
+    -->
+    <tdml:parserTestCase name="TPKT-tooShortPayload"
+                         root="TpktMessage"
+                         model="s7Schema">
+        <tdml:document>
+            <tdml:documentPart type="byte">0300001611D00001000200C00109C102010</tdml:documentPart>
+        </tdml:document>
+
+        <tdml:errors>
+            <tdml:error>Parse Error</tdml:error>
+        </tdml:errors>
+    </tdml:parserTestCase>
+
+    <!--
+        In this test-case the payload of the packet doesn't match the
+        length provided in the packet header (Too long)
+    -->
+    <tdml:parserTestCase name="TPKT-tooLongPayload"
+                         root="TpktMessage"
+                         model="s7Schema">
+        <tdml:document>
+            <tdml:documentPart type="byte">0300001611D00001000200C00109C1020100C20201021234567890</tdml:documentPart>
+        </tdml:document>
+
+        <tdml:errors>
+            <tdml:error>Left over data.</tdml:error>
+        </tdml:errors>
+    </tdml:parserTestCase>
+
+    <!--
+
+        Tests for the basic TPDU types (no parameters)
+
+    -->
+
+    <tdml:parserTestCase name="COTP-typeConnectionRequest"
+                         root="TpktMessage"
+                         model="s7Schema"
+                         description="Minimal valid COTP Connection Request TPDU">
+        <tdml:document>
+            <tdml:documentPart type="byte">0300000706E00001000200</tdml:documentPart>
+        </tdml:document>
+
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>7</length>
+                    <userData>
+                        <headerLength>6</headerLength>
+                        <type>224</type>
+                        <cotpTpduConnectionRequest>
+                            <destinationReference>1</destinationReference>
+                            <sourceReference>2</sourceReference>
+                            <protocolClass>0</protocolClass>
+                        </cotpTpduConnectionRequest>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="COTP-typeConnectionResponse"
+                         root="TpktMessage"
+                         model="s7Schema"
+                         description="Minimal valid COTP Connection Response TPDU">
+        <tdml:document>
+            <tdml:documentPart type="byte">0300000706D00001000200</tdml:documentPart>
+        </tdml:document>
+
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>7</length>
+                    <userData>
+                        <headerLength>6</headerLength>
+                        <type>208</type>
+                        <cotpTpduConnectionResponse>
+                            <destinationReference>1</destinationReference>
+                            <sourceReference>2</sourceReference>
+                            <protocolClass>0</protocolClass>
+                        </cotpTpduConnectionResponse>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="COTP-typeDisconnectionRequest"
+                         root="TpktMessage"
+                         model="s7Schema"
+                         description="Minimal valid COTP Disconnection Request TPDU">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">0300000706800001000200</tdml:documentPart>
+        </tdml:document>
+
+        <!-- Define the expected output -->
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>7</length>
+                    <userData>
+                        <headerLength>6</headerLength>
+                        <type>128</type>
+                        <cotpTpduDisconnectRequest>
+                            <destinationReference>1</destinationReference>
+                            <sourceReference>2</sourceReference>
+                            <disconnectReason>0</disconnectReason>
+                        </cotpTpduDisconnectRequest>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="COTP-typeDisconnectionResponse"
+                         root="TpktMessage"
+                         model="s7Schema"
+                         description="Minimal valid COTP Disconnection Response TPDU">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">0300000605C000010002</tdml:documentPart>
+        </tdml:document>
+
+        <!-- Define the expected output -->
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>6</length>
+                    <userData>
+                        <headerLength>5</headerLength>
+                        <type>192</type>
+                        <cotpTpduDisconnectResponse>
+                            <destinationReference>1</destinationReference>
+                            <sourceReference>2</sourceReference>
+                        </cotpTpduDisconnectResponse>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="COTP-typeError"
+                         root="TpktMessage"
+                         model="s7Schema"
+                         description="Minimal valid COTP Error TPDU">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">030000050470000102</tdml:documentPart>
+        </tdml:document>
+
+        <!-- Define the expected output -->
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>5</length>
+                    <userData>
+                        <headerLength>4</headerLength>
+                        <type>112</type>
+                        <cotpTpduError>
+                            <destinationReference>1</destinationReference>
+                            <rejectCause>2</rejectCause>
+                        </cotpTpduError>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="COTP-typeData"
+                         root="TpktMessage"
+                         model="s7Schema"
+                         description="Minimal valid COTP Data TPDU">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">0300000302F002</tdml:documentPart>
+        </tdml:document>
+
+        <!-- Define the expected output -->
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>3</length>
+                    <userData>
+                        <headerLength>2</headerLength>
+                        <type>240</type>
+                        <cotpTpduData>
+                            <endOfTransmission>false</endOfTransmission>
+                            <tpduRef>2</tpduRef>
+                        </cotpTpduData>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="COTP-typeDataEndOfTransmission"
+                         root="TpktMessage"
+                         model="s7Schema"
+                         description="Minimal valid COTP Data (End Of Transmission) TPDU">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">0300000302F082</tdml:documentPart>
+        </tdml:document>
+
+        <!-- Define the expected output -->
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>3</length>
+                    <userData>
+                        <headerLength>2</headerLength>
+                        <type>240</type>
+                        <cotpTpduData>
+                            <endOfTransmission>true</endOfTransmission>
+                            <tpduRef>2</tpduRef>
+                        </cotpTpduData>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="COTP-invalidType"
+                         root="TpktMessage"
+                         model="s7Schema"
+                         description="Invalid type code">
+        <tdml:document>
+            <tdml:documentPart type="byte">030000050420000102</tdml:documentPart>
+        </tdml:document>
+
+        <tdml:errors>
+            <tdml:error>Parse Error</tdml:error>
+        </tdml:errors>
+    </tdml:parserTestCase>
+
+    <!--
+
+        Tests for the parameter types.
+
+    -->
+
+    <tdml:parserTestCase name="COTP-parameterTpduSize"
+                         root="TpktMessage"
+                         model="s7Schema"
+                         description="parameterTpduSize">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">0300000A09E00001000200C00109</tdml:documentPart>
+        </tdml:document>
+
+        <!-- Define the expected output -->
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>10</length>
+                    <userData>
+                        <headerLength>9</headerLength>
+                        <type>224</type>
+                        <cotpTpduConnectionRequest>
+                            <destinationReference>1</destinationReference>
+                            <sourceReference>2</sourceReference>
+                            <protocolClass>0</protocolClass>
+                            <parameters>
+                                <parameter>
+                                    <type>192</type>
+                                    <parameterLength>1</parameterLength>
+                                    <cotpParameterTpduSize>
+                                        <tpduSize>9</tpduSize>
+                                    </cotpParameterTpduSize>
+                                </parameter>
+                            </parameters>
+                        </cotpTpduConnectionRequest>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="COTP-parameterCallingTsap"
+                         root="TpktMessage"
+                         model="s7Schema"
+                         description="parameterCallingTsap">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">0300000B0AE00001000200C1020009</tdml:documentPart>
+        </tdml:document>
+
+        <!-- Define the expected output -->
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>11</length>
+                    <userData>
+                        <headerLength>10</headerLength>
+                        <type>224</type>
+                        <cotpTpduConnectionRequest>
+                            <destinationReference>1</destinationReference>
+                            <sourceReference>2</sourceReference>
+                            <protocolClass>0</protocolClass>
+                            <parameters>
+                                <parameter>
+                                    <type>193</type>
+                                    <parameterLength>2</parameterLength>
+                                    <cotpParameterCallingTsap>
+                                        <tsapId>9</tsapId>
+                                    </cotpParameterCallingTsap>
+                                </parameter>
+                            </parameters>
+                        </cotpTpduConnectionRequest>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="COTP-parameterCalledTsap"
+                         root="TpktMessage"
+                         model="s7Schema"
+                         description="parameterCalledTsap">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">0300000B0AE00001000200C2020009</tdml:documentPart>
+        </tdml:document>
+
+        <!-- Define the expected output -->
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>11</length>
+                    <userData>
+                        <headerLength>10</headerLength>
+                        <type>224</type>
+                        <cotpTpduConnectionRequest>
+                            <destinationReference>1</destinationReference>
+                            <sourceReference>2</sourceReference>
+                            <protocolClass>0</protocolClass>
+                            <parameters>
+                                <parameter>
+                                    <type>194</type>
+                                    <parameterLength>2</parameterLength>
+                                    <cotpParameterCalledTsap>
+                                        <tsapId>9</tsapId>
+                                    </cotpParameterCalledTsap>
+                                </parameter>
+                            </parameters>
+                        </cotpTpduConnectionRequest>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="COTP-parameterChecksum"
+                         root="TpktMessage"
+                         model="s7Schema"
+                         description="parameterChecksum">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">0300000A09E00001000200C30109</tdml:documentPart>
+        </tdml:document>
+
+        <!-- Define the expected output -->
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>10</length>
+                    <userData>
+                        <headerLength>9</headerLength>
+                        <type>224</type>
+                        <cotpTpduConnectionRequest>
+                            <destinationReference>1</destinationReference>
+                            <sourceReference>2</sourceReference>
+                            <protocolClass>0</protocolClass>
+                            <parameters>
+                                <parameter>
+                                    <type>195</type>
+                                    <parameterLength>1</parameterLength>
+                                    <cotpParameterChecksum>
+                                        <checksum>9</checksum>
+                                    </cotpParameterChecksum>
+                                </parameter>
+                            </parameters>
+                        </cotpTpduConnectionRequest>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="COTP-parameterDisconnectAdditionalInformation"
+                         root="TpktMessage"
+                         model="s7Schema"
+                         description="parameterDisconnectAdditionalInformation">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">0300000F0EE00001000200E006010203040506</tdml:documentPart>
+        </tdml:document>
+
+        <!-- Define the expected output -->
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>15</length>
+                    <userData>
+                        <headerLength>14</headerLength>
+                        <type>224</type>
+                        <cotpTpduConnectionRequest>
+                            <destinationReference>1</destinationReference>
+                            <sourceReference>2</sourceReference>
+                            <protocolClass>0</protocolClass>
+                            <parameters>
+                                <parameter>
+                                    <type>224</type>
+                                    <parameterLength>6</parameterLength>
+                                    <cotpParameterDisconnectAdditionalInformation>
+                                        <data>010203040506</data>
+                                    </cotpParameterDisconnectAdditionalInformation>
+                                </parameter>
+                            </parameters>
+                        </cotpTpduConnectionRequest>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="COTP-invalidParameterType"
+                         root="TpktMessage"
+                         model="s7Schema"
+                         description="Invalid parameter type">
+        <tdml:document>
+            <tdml:documentPart type="byte">0300000F0EE00001000200A006010203040506</tdml:documentPart>
+        </tdml:document>
+
+        <tdml:errors>
+            <tdml:error>Parse Error</tdml:error>
+        </tdml:errors>
+    </tdml:parserTestCase>
+
+    <!--
+
+        Tests for typical packets used in PLC4X
+
+    -->
+
+    <tdml:parserTestCase name="COTP-scenarioConnectionRequest"
+                         root="TpktMessage"
+                         model="s7Schema"
+                         description="COTP Connection request used for initiating an S7 protocol connection.">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">0300001211E00001000200C1020100C2020102c0010a</tdml:documentPart>
+        </tdml:document>
+
+        <!-- Define the expected output -->
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>18</length>
+                    <userData>
+                        <headerLength>17</headerLength>
+                        <type>224</type>
+                        <cotpTpduConnectionRequest>
+                            <destinationReference>1</destinationReference>
+                            <sourceReference>2</sourceReference>
+                            <protocolClass>0</protocolClass>
+                            <parameters>
+                                <parameter>
+                                    <type>193</type>
+                                    <parameterLength>2</parameterLength>
+                                    <cotpParameterCallingTsap>
+                                        <tsapId>256</tsapId>
+                                    </cotpParameterCallingTsap>
+                                </parameter>
+                                <parameter>
+                                    <type>194</type>
+                                    <parameterLength>2</parameterLength>
+                                    <cotpParameterCalledTsap>
+                                        <tsapId>258</tsapId>
+                                    </cotpParameterCalledTsap>
+                                </parameter>
+                                <parameter>
+                                    <type>192</type>
+                                    <parameterLength>1</parameterLength>
+                                    <cotpParameterTpduSize>
+                                        <tpduSize>10</tpduSize>
+                                    </cotpParameterTpduSize>
+                                </parameter>
+                            </parameters>
+                        </cotpTpduConnectionRequest>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="COTP-scenarioConnectionResponse"
+                         root="TpktMessage"
+                         model="s7Schema"
+                         description="Minimal valid COTP Message">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">0300001211D00001000200C00109C1020100C2020102</tdml:documentPart>
+        </tdml:document>
+
+        <!-- Define the expected output -->
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>18</length>
+                    <userData>
+                        <headerLength>17</headerLength>
+                        <type>208</type>
+                        <cotpTpduConnectionResponse>
+                            <destinationReference>1</destinationReference>
+                            <sourceReference>2</sourceReference>
+                            <protocolClass>0</protocolClass>
+                            <parameters>
+                                <parameter>
+                                    <type>192</type>
+                                    <parameterLength>1</parameterLength>
+                                    <cotpParameterTpduSize>
+                                        <tpduSize>9</tpduSize>
+                                    </cotpParameterTpduSize>
+                                </parameter>
+                                <parameter>
+                                    <type>193</type>
+                                    <parameterLength>2</parameterLength>
+                                    <cotpParameterCallingTsap>
+                                        <tsapId>256</tsapId>
+                                    </cotpParameterCallingTsap>
+                                </parameter>
+                                <parameter>
+                                    <type>194</type>
+                                    <parameterLength>2</parameterLength>
+                                    <cotpParameterCalledTsap>
+                                        <tsapId>258</tsapId>
+                                    </cotpParameterCalledTsap>
+                                </parameter>
+                            </parameters>
+                        </cotpTpduConnectionResponse>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="COTP-scenarioDataTpdu"
+                         root="TpktMessage"
+                         model="s7Schema"
+                         description="Typical Data TPDU used for transferring S7 packets.">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">0300001f02f080320100000001000e00000401120a10010001000082000004
+            </tdml:documentPart>
+        </tdml:document>
+
+        <!-- Define the expected output -->
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>31</length>
+                    <userData>
+                        <headerLength>2</headerLength>
+                        <type>240</type>
+                        <cotpTpduData>
+                            <endOfTransmission>true</endOfTransmission>
+                            <tpduRef>0</tpduRef>
+                        </cotpTpduData>
+                        <userData>
+                            <magicByte>50</magicByte>
+                            <type>1</type>
+                            <s7RequestMessage>
+                                <reserved>0</reserved>
+                                <tpduReference>1</tpduReference>
+                                <parametersLength>14</parametersLength>
+                                <payloadsLength>0</payloadsLength>
+                                <parameters>
+                                    <parameter>
+                                        <type>4</type>
+                                        <s7RequestParameterReadVar>
+                                            <numItems>1</numItems>
+                                            <items>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterReadVarAnyItem>
+                                                        <paramLength>10</paramLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>1</dataType>
+                                                        <numElements>1</numElements>
+                                                        <dataBlockNumber>0</dataBlockNumber>
+                                                        <memoryArea>130</memoryArea>
+                                                        <byteOffset>0</byteOffset>
+                                                        <bitOffset>4</bitOffset>
+                                                    </s7RequestParameterReadVarAnyItem>
+                                                </item>
+                                            </items>
+                                        </s7RequestParameterReadVar>
+                                    </parameter>
+                                </parameters>
+                                <payloads>
+                                    <payload>
+                                        <s7RequestPayloadReadVar>
+                                            <data/>
+                                        </s7RequestPayloadReadVar>
+                                    </payload>
+                                </payloads>
+                            </s7RequestMessage>
+                        </userData>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="S7-Setup-Communication-Request"
+                         root="TpktMessage"
+                         model="s7Schema">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">0300001902f08032010000000000080000f0000001000101e0</tdml:documentPart>
+        </tdml:document>
+
+        <!-- Define the expected output -->
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>25</length>
+                    <userData>
+                        <headerLength>2</headerLength>
+                        <type>240</type>
+                        <cotpTpduData>
+                            <endOfTransmission>true</endOfTransmission>
+                            <tpduRef>0</tpduRef>
+                        </cotpTpduData>
+                        <userData>
+                            <magicByte>50</magicByte>
+                            <type>1</type>
+                            <s7RequestMessage>
+                                <reserved>0</reserved>
+                                <tpduReference>0</tpduReference>
+                                <parametersLength>8</parametersLength>
+                                <payloadsLength>0</payloadsLength>
+                                <parameters>
+                                    <parameter>
+                                        <type>240</type>
+                                        <s7GeneralParameterSetupCommunication>
+                                            <reserved>0</reserved>
+                                            <maxAmqCaller>1</maxAmqCaller>
+                                            <maxAmqCallee>1</maxAmqCallee>
+                                            <pduLength>480</pduLength>
+                                        </s7GeneralParameterSetupCommunication>
+                                    </parameter>
+                                </parameters>
+                                <payloads>
+                                    <payload>
+                                        <s7GeneralPayloadSetupCommunication>
+                                            <data/>
+                                        </s7GeneralPayloadSetupCommunication>
+                                    </payload>
+                                </payloads>
+                            </s7RequestMessage>
+                        </userData>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="S7-SetupCommunicationResponse"
+                         root="TpktMessage"
+                         model="s7Schema">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">0300001b02f080320300000000000800000000f0000001000100f0</tdml:documentPart>
+        </tdml:document>
+
+        <!-- Define the expected output -->
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>27</length>
+                    <userData>
+                        <headerLength>2</headerLength>
+                        <type>240</type>
+                        <cotpTpduData>
+                            <endOfTransmission>true</endOfTransmission>
+                            <tpduRef>0</tpduRef>
+                        </cotpTpduData>
+                        <userData>
+                            <magicByte>50</magicByte>
+                            <type>3</type>
+                            <s7ResponseMessage>
+                                <reserved>0</reserved>
+                                <tpduReference>0</tpduReference>
+                                <parametersLength>8</parametersLength>
+                                <payloadsLength>0</payloadsLength>
+                                <errorClass>0</errorClass>
+                                <errorCode>0</errorCode>
+                                <parameters>
+                                    <parameter>
+                                        <type>240</type>
+                                        <s7GeneralParameterSetupCommunication>
+                                            <reserved>0</reserved>
+                                            <maxAmqCaller>1</maxAmqCaller>
+                                            <maxAmqCallee>1</maxAmqCallee>
+                                            <pduLength>240</pduLength>
+                                        </s7GeneralParameterSetupCommunication>
+                                    </parameter>
+                                </parameters>
+                                <payloads>
+                                    <payload>
+                                        <s7GeneralPayloadSetupCommunication>
+                                            <data/>
+                                        </s7GeneralPayloadSetupCommunication>
+                                    </payload>
+                                </payloads>
+                            </s7ResponseMessage>
+                        </userData>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="S7-ReadSZLCPUFunctionRequest"
+                         root="TpktMessage"
+                         model="s7Schema">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">0300002102f080 320700000100000800080001120411440100ff09000400110000
+            </tdml:documentPart>
+        </tdml:document>
+
+        <!-- Define the expected output -->
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>33</length>
+                    <userData>
+                        <headerLength>2</headerLength>
+                        <type>240</type>
+                        <cotpTpduData>
+                            <endOfTransmission>true</endOfTransmission>
+                            <tpduRef>0</tpduRef>
+                        </cotpTpduData>
+                        <userData>
+                            <magicByte>50</magicByte>
+                            <type>7</type>
+                            <s7UserDataMessage>
+                                <reserved>0</reserved>
+                                <tpduReference>256</tpduReference>
+                                <parametersLength>8</parametersLength>
+                                <payloadsLength>8</payloadsLength>
+                                <parameters>
+                                    <parameter>
+                                        <type>0</type>
+                                        <s7UserDataParameterCPUService>
+                                            <header>274</header>
+                                            <paramLength>4</paramLength>
+                                            <typeCode>17</typeCode>
+                                            <type>4</type>
+                                            <functionGroup>4</functionGroup>
+                                            <subFunctionGroup>1</subFunctionGroup>
+                                            <sequenceNumber>0</sequenceNumber>
+                                        </s7UserDataParameterCPUService>
+                                    </parameter>
+                                </parameters>
+                                <payloads>
+                                    <payload>
+                                        <s7UserDataPayloadCpuServices>
+                                            <returnCode>255</returnCode>
+                                            <transportSize>9</transportSize>
+                                            <length>4</length>
+                                            <sslId>17</sslId>
+                                            <sslIndex>0</sslIndex>
+                                        </s7UserDataPayloadCpuServices>
+                                    </payload>
+                                </payloads>
+                            </s7UserDataMessage>
+                        </userData>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="S7-ReadSZLCPUFunctionResponse"
+                         root="TpktMessage"
+                         model="s7Schema">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">
+                0300009902f080320700000100000c007c000112081284010200000000ff09007800110000001c0004000136455337203331352d32454831342d304142302000c000030001000636455337203331352d32454831342d304142302000c0000300010007202020202020202020202020202020202020202000c0560302070081426f6f74204c6f61646572202020202020202020000041200909
+            </tdml:documentPart>
+        </tdml:document>
+
+        <!-- Define the expected output -->
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>153</length>
+                    <userData>
+                        <headerLength>2</headerLength>
+                        <type>240</type>
+                        <cotpTpduData>
+                            <endOfTransmission>true</endOfTransmission>
+                            <tpduRef>0</tpduRef>
+                        </cotpTpduData>
+                        <userData>
+                            <magicByte>50</magicByte>
+                            <type>7</type>
+                            <s7UserDataMessage>
+                                <reserved>0</reserved>
+                                <tpduReference>256</tpduReference>
+                                <parametersLength>12</parametersLength>
+                                <payloadsLength>124</payloadsLength>
+                                <parameters>
+                                    <parameter>
+                                        <type>0</type>
+                                        <s7UserDataParameterCPUService>
+                                            <header>274</header>
+                                            <paramLength>8</paramLength>
+                                            <typeCode>18</typeCode>
+                                            <type>8</type>
+                                            <functionGroup>4</functionGroup>
+                                            <subFunctionGroup>1</subFunctionGroup>
+                                            <sequenceNumber>2</sequenceNumber>
+                                            <dataUnitReferenceNumber>0</dataUnitReferenceNumber>
+                                            <lastDataUnit>0</lastDataUnit>
+                                            <errorCode>0</errorCode>
+                                        </s7UserDataParameterCPUService>
+                                    </parameter>
+                                </parameters>
+                                <payloads>
+                                    <payload>
+                                        <s7UserDataPayloadCpuServices>
+                                            <returnCode>255</returnCode>
+                                            <transportSize>9</transportSize>
+                                            <length>120</length>
+                                            <sslId>17</sslId>
+                                            <sslIndex>0</sslIndex>
+                                            <partialList>
+                                                <partialListLengthInBytes>28</partialListLengthInBytes>
+                                                <partialListCount>4</partialListCount>
+                                                <sslDataRecords>
+                                                    <sslDataRecord>
+                                                        <s7ResponsePayloadCpuServicesSslDataRecordModuleIdentification>
+                                                            <index>1</index>
+                                                            <articleNumber><![CDATA[6ES7 315-2EH14-0AB0 ]]></articleNumber>
+                                                            <bgType>192</bgType>
+                                                            <moduleOrOsVersion>3</moduleOrOsVersion>
+                                                            <pgDescriptionFileVersion>1</pgDescriptionFileVersion>
+                                                        </s7ResponsePayloadCpuServicesSslDataRecordModuleIdentification>
+                                                    </sslDataRecord>
+                                                    <sslDataRecord>
+                                                        <s7ResponsePayloadCpuServicesSslDataRecordModuleIdentification>
+                                                            <index>6</index>
+                                                            <articleNumber><![CDATA[6ES7 315-2EH14-0AB0 ]]></articleNumber>
+                                                            <bgType>192</bgType>
+                                                            <moduleOrOsVersion>3</moduleOrOsVersion>
+                                                            <pgDescriptionFileVersion>1</pgDescriptionFileVersion>
+                                                        </s7ResponsePayloadCpuServicesSslDataRecordModuleIdentification>
+                                                    </sslDataRecord>
+                                                    <sslDataRecord>
+                                                        <s7ResponsePayloadCpuServicesSslDataRecordModuleIdentification>
+                                                            <index>7</index>
+                                                            <articleNumber><![CDATA[                    ]]></articleNumber>
+                                                            <bgType>192</bgType>
+                                                            <moduleOrOsVersion>22019</moduleOrOsVersion>
+                                                            <pgDescriptionFileVersion>519</pgDescriptionFileVersion>
+                                                        </s7ResponsePayloadCpuServicesSslDataRecordModuleIdentification>
+                                                    </sslDataRecord>
+                                                    <sslDataRecord>
+                                                        <s7ResponsePayloadCpuServicesSslDataRecordModuleIdentification>
+                                                            <index>129</index>
+                                                            <articleNumber><![CDATA[Boot Loader         ]]></articleNumber>
+                                                            <bgType>0</bgType>
+                                                            <moduleOrOsVersion>16672</moduleOrOsVersion>
+                                                            <pgDescriptionFileVersion>2313</pgDescriptionFileVersion>
+                                                        </s7ResponsePayloadCpuServicesSslDataRecordModuleIdentification>
+                                                    </sslDataRecord>
+                                                </sslDataRecords>
+                                            </partialList>
+                                        </s7UserDataPayloadCpuServices>
+                                    </payload>
+                                </payloads>
+                            </s7UserDataMessage>
+                        </userData>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="S7-ReadVarRequestSingleItem"
+                         root="TpktMessage"
+                         model="s7Schema">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">0300001f02f080320100001900000e00000401120a10080001000083000080
+            </tdml:documentPart>
+        </tdml:document>
+
+        <!-- Define the expected output -->
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>31</length>
+                    <userData>
+                        <headerLength>2</headerLength>
+                        <type>240</type>
+                        <cotpTpduData>
+                            <endOfTransmission>true</endOfTransmission>
+                            <tpduRef>0</tpduRef>
+                        </cotpTpduData>
+                        <userData>
+                            <magicByte>50</magicByte>
+                            <type>1</type>
+                            <s7RequestMessage>
+                                <reserved>0</reserved>
+                                <tpduReference>6400</tpduReference>
+                                <parametersLength>14</parametersLength>
+                                <payloadsLength>0</payloadsLength>
+                                <parameters>
+                                    <parameter>
+                                        <type>4</type>
+                                        <s7RequestParameterReadVar>
+                                            <numItems>1</numItems>
+                                            <items>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterReadVarAnyItem>
+                                                        <paramLength>10</paramLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>8</dataType>
+                                                        <numElements>1</numElements>
+                                                        <dataBlockNumber>0</dataBlockNumber>
+                                                        <memoryArea>131</memoryArea>
+                                                        <byteOffset>16</byteOffset>
+                                                        <bitOffset>0</bitOffset>
+                                                    </s7RequestParameterReadVarAnyItem>
+                                                </item>
+                                            </items>
+                                        </s7RequestParameterReadVar>
+                                    </parameter>
+                                </parameters>
+                                <payloads>
+                                    <payload>
+                                        <s7RequestPayloadReadVar>
+                                            <data/>
+                                        </s7RequestPayloadReadVar>
+                                    </payload>
+                                </payloads>
+                            </s7RequestMessage>
+                        </userData>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="S7-ReadVarResponseSingleItem"
+                         root="TpktMessage"
+                         model="s7Schema">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">0300001d02f0803203000019000002000800000401ff07000400000000
+            </tdml:documentPart>
+        </tdml:document>
+
+        <!-- Define the expected output -->
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>29</length>
+                    <userData>
+                        <headerLength>2</headerLength>
+                        <type>240</type>
+                        <cotpTpduData>
+                            <endOfTransmission>true</endOfTransmission>
+                            <tpduRef>0</tpduRef>
+                        </cotpTpduData>
+                        <userData>
+                            <magicByte>50</magicByte>
+                            <type>3</type>
+                            <s7ResponseMessage>
+                                <reserved>0</reserved>
+                                <tpduReference>6400</tpduReference>
+                                <parametersLength>2</parametersLength>
+                                <payloadsLength>8</payloadsLength>
+                                <errorClass>0</errorClass>
+                                <errorCode>0</errorCode>
+                                <parameters>
+                                    <parameter>
+                                        <type>4</type>
+                                        <s7ResponseParameterReadVar>
+                                            <numItems>1</numItems>
+                                        </s7ResponseParameterReadVar>
+                                    </parameter>
+                                </parameters>
+                                <payloads>
+                                    <payload>
+                                        <s7ResponsePayloadReadVar>
+                                            <numItems>1</numItems>
+                                            <item>
+                                                <returnCode>255</returnCode>
+                                                <transportSize>7</transportSize>
+                                                <rawLength>4</rawLength>
+                                                <lengthInBytes>4</lengthInBytes>
+                                                <data>00000000</data>
+                                            </item>
+                                        </s7ResponsePayloadReadVar>
+                                    </payload>
+                                </payloads>
+                            </s7ResponseMessage>
+                        </userData>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="S7-ReadVarRequestMixedItems"
+                         root="TpktMessage"
+                         model="s7Schema">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">
+                0300006702f080320100000001005600000407120a10060001032b84000160120a10020001032b840001a0120a10010001032b840001a9120a10050001032b84000150120a10020001032b84000198120a10040001032b84000140120a10020001032b84000190
+            </tdml:documentPart>
+        </tdml:document>
+
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>103</length>
+                    <userData>
+                        <headerLength>2</headerLength>
+                        <type>240</type>
+                        <cotpTpduData>
+                            <endOfTransmission>true</endOfTransmission>
+                            <tpduRef>0</tpduRef>
+                        </cotpTpduData>
+                        <userData>
+                            <magicByte>50</magicByte>
+                            <type>1</type>
+                            <s7RequestMessage>
+                                <reserved>0</reserved>
+                                <tpduReference>1</tpduReference>
+                                <parametersLength>86</parametersLength>
+                                <payloadsLength>0</payloadsLength>
+                                <parameters>
+                                    <parameter>
+                                        <type>4</type>
+                                        <s7RequestParameterReadVar>
+                                            <numItems>7</numItems>
+                                            <items>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterReadVarAnyItem>
+                                                        <paramLength>10</paramLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>6</dataType>
+                                                        <numElements>1</numElements>
+                                                        <dataBlockNumber>811</dataBlockNumber>
+                                                        <memoryArea>132</memoryArea>
+                                                        <byteOffset>44</byteOffset>
+                                                        <bitOffset>0</bitOffset>
+                                                    </s7RequestParameterReadVarAnyItem>
+                                                </item>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterReadVarAnyItem>
+                                                        <paramLength>10</paramLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>2</dataType>
+                                                        <numElements>1</numElements>
+                                                        <dataBlockNumber>811</dataBlockNumber>
+                                                        <memoryArea>132</memoryArea>
+                                                        <byteOffset>52</byteOffset>
+                                                        <bitOffset>0</bitOffset>
+                                                    </s7RequestParameterReadVarAnyItem>
+                                                </item>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterReadVarAnyItem>
+                                                        <paramLength>10</paramLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>1</dataType>
+                                                        <numElements>1</numElements>
+                                                        <dataBlockNumber>811</dataBlockNumber>
+                                                        <memoryArea>132</memoryArea>
+                                                        <byteOffset>53</byteOffset>
+                                                        <bitOffset>1</bitOffset>
+                                                    </s7RequestParameterReadVarAnyItem>
+                                                </item>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterReadVarAnyItem>
+                                                        <paramLength>10</paramLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>5</dataType>
+                                                        <numElements>1</numElements>
+                                                        <dataBlockNumber>811</dataBlockNumber>
+                                                        <memoryArea>132</memoryArea>
+                                                        <byteOffset>42</byteOffset>
+                                                        <bitOffset>0</bitOffset>
+                                                    </s7RequestParameterReadVarAnyItem>
+                                                </item>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterReadVarAnyItem>
+                                                        <paramLength>10</paramLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>2</dataType>
+                                                        <numElements>1</numElements>
+                                                        <dataBlockNumber>811</dataBlockNumber>
+                                                        <memoryArea>132</memoryArea>
+                                                        <byteOffset>51</byteOffset>
+                                                        <bitOffset>0</bitOffset>
+                                                    </s7RequestParameterReadVarAnyItem>
+                                                </item>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterReadVarAnyItem>
+                                                        <paramLength>10</paramLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>4</dataType>
+                                                        <numElements>1</numElements>
+                                                        <dataBlockNumber>811</dataBlockNumber>
+                                                        <memoryArea>132</memoryArea>
+                                                        <byteOffset>40</byteOffset>
+                                                        <bitOffset>0</bitOffset>
+                                                    </s7RequestParameterReadVarAnyItem>
+                                                </item>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterReadVarAnyItem>
+                                                        <paramLength>10</paramLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>2</dataType>
+                                                        <numElements>1</numElements>
+                                                        <dataBlockNumber>811</dataBlockNumber>
+                                                        <memoryArea>132</memoryArea>
+                                                        <byteOffset>50</byteOffset>
+                                                        <bitOffset>0</bitOffset>
+                                                    </s7RequestParameterReadVarAnyItem>
+                                                </item>
+                                            </items>
+                                        </s7RequestParameterReadVar>
+                                    </parameter>
+                                </parameters>
+                                <payloads>
+                                    <payload>
+                                        <s7RequestPayloadReadVar>
+                                            <data/>
+                                        </s7RequestPayloadReadVar>
+                                    </payload>
+                                </payloads>
+                            </s7RequestMessage>
+                        </userData>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="S7-ReadVarResponseMixedItems"
+                         root="TpktMessage"
+                         model="s7Schema">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">
+                0300004002f0803203000000010002002b00000407ff04002000000000ff0400080000ff0300010000ff0500100000ff0400080000ff0400100000ff04000800
+            </tdml:documentPart>
+        </tdml:document>
+
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>64</length>
+                    <userData>
+                        <headerLength>2</headerLength>
+                        <type>240</type>
+                        <cotpTpduData>
+                            <endOfTransmission>true</endOfTransmission>
+                            <tpduRef>0</tpduRef>
+                        </cotpTpduData>
+                        <userData>
+                            <magicByte>50</magicByte>
+                            <type>3</type>
+                            <s7ResponseMessage>
+                                <reserved>0</reserved>
+                                <tpduReference>1</tpduReference>
+                                <parametersLength>2</parametersLength>
+                                <payloadsLength>43</payloadsLength>
+                                <errorClass>0</errorClass>
+                                <errorCode>0</errorCode>
+                                <parameters>
+                                    <parameter>
+                                        <type>4</type>
+                                        <s7ResponseParameterReadVar>
+                                            <numItems>7</numItems>
+                                        </s7ResponseParameterReadVar>
+                                    </parameter>
+                                </parameters>
+                                <payloads>
+                                    <payload>
+                                        <s7ResponsePayloadReadVar>
+                                            <numItems>7</numItems>
+                                            <item>
+                                                <returnCode>255</returnCode>
+                                                <transportSize>4</transportSize>
+                                                <rawLength>32</rawLength>
+                                                <lengthInBytes>4</lengthInBytes>
+                                                <data>00000000</data>
+                                            </item>
+                                            <item>
+                                                <returnCode>255</returnCode>
+                                                <transportSize>4</transportSize>
+                                                <rawLength>8</rawLength>
+                                                <lengthInBytes>1</lengthInBytes>
+                                                <data>00</data>
+                                                <fillByte>0</fillByte>
+                                            </item>
+                                            <item>
+                                                <returnCode>255</returnCode>
+                                                <transportSize>3</transportSize>
+                                                <rawLength>1</rawLength>
+                                                <lengthInBytes>1</lengthInBytes>
+                                                <data>00</data>
+                                                <fillByte>0</fillByte>
+                                            </item>
+                                            <item>
+                                                <returnCode>255</returnCode>
+                                                <transportSize>5</transportSize>
+                                                <rawLength>16</rawLength>
+                                                <lengthInBytes>2</lengthInBytes>
+                                                <data>0000</data>
+                                            </item>
+                                            <item>
+                                                <returnCode>255</returnCode>
+                                                <transportSize>4</transportSize>
+                                                <rawLength>8</rawLength>
+                                                <lengthInBytes>1</lengthInBytes>
+                                                <data>00</data>
+                                                <fillByte>0</fillByte>
+                                            </item>
+                                            <item>
+                                                <returnCode>255</returnCode>
+                                                <transportSize>4</transportSize>
+                                                <rawLength>16</rawLength>
+                                                <lengthInBytes>2</lengthInBytes>
+                                                <data>0000</data>
+                                            </item>
+                                            <item>
+                                                <returnCode>255</returnCode>
+                                                <transportSize>4</transportSize>
+                                                <rawLength>8</rawLength>
+                                                <lengthInBytes>1</lengthInBytes>
+                                                <data>00</data>
+                                            </item>
+                                        </s7ResponsePayloadReadVar>
+                                    </payload>
+                                </payloads>
+                            </s7ResponseMessage>
+                        </userData>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="S7-ReadVarResponseMixedItemsWithOddNumberOfBytes"
+                         root="TpktMessage"
+                         model="s7Schema">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">
+                0300002802f0803203000000010002001300000403ff040018AABBCC00ff0400080000ff03000100
+            </tdml:documentPart>
+        </tdml:document>
+
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>40</length>
+                    <userData>
+                        <headerLength>2</headerLength>
+                        <type>240</type>
+                        <cotpTpduData>
+                            <endOfTransmission>true</endOfTransmission>
+                            <tpduRef>0</tpduRef>
+                        </cotpTpduData>
+                        <userData>
+                            <magicByte>50</magicByte>
+                            <type>3</type>
+                            <s7ResponseMessage>
+                                <reserved>0</reserved>
+                                <tpduReference>1</tpduReference>
+                                <parametersLength>2</parametersLength>
+                                <payloadsLength>19</payloadsLength>
+                                <errorClass>0</errorClass>
+                                <errorCode>0</errorCode>
+                                <parameters>
+                                    <parameter>
+                                        <type>4</type>
+                                        <s7ResponseParameterReadVar>
+                                            <numItems>3</numItems>
+                                        </s7ResponseParameterReadVar>
+                                    </parameter>
+                                </parameters>
+                                <payloads>
+                                    <payload>
+                                        <s7ResponsePayloadReadVar>
+                                            <numItems>3</numItems>
+                                            <item>
+                                                <returnCode>255</returnCode>
+                                                <transportSize>4</transportSize>
+                                                <rawLength>24</rawLength>
+                                                <lengthInBytes>3</lengthInBytes>
+                                                <data>AABBCC</data>
+                                                <fillByte>0</fillByte>
+                                            </item>
+                                            <item>
+                                                <returnCode>255</returnCode>
+                                                <transportSize>4</transportSize>
+                                                <rawLength>8</rawLength>
+                                                <lengthInBytes>1</lengthInBytes>
+                                                <data>00</data>
+                                                <fillByte>0</fillByte>
+                                            </item>
+                                            <item>
+                                                <returnCode>255</returnCode>
+                                                <transportSize>3</transportSize>
+                                                <rawLength>1</rawLength>
+                                                <lengthInBytes>1</lengthInBytes>
+                                                <data>00</data>
+                                            </item>
+                                        </s7ResponsePayloadReadVar>
+                                    </payload>
+                                </payloads>
+                            </s7ResponseMessage>
+                        </userData>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="S7-ReadVarRequestNoFillingBytes"
+                         root="TpktMessage"
+                         model="s7Schema">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">
+                0300003702f080320100000001002600000403120a10060001032b84000160120a10050001032b84000150120a10040001032b84000140
+            </tdml:documentPart>
+        </tdml:document>
+
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>55</length>
+                    <userData>
+                        <headerLength>2</headerLength>
+                        <type>240</type>
+                        <cotpTpduData>
+                            <endOfTransmission>true</endOfTransmission>
+                            <tpduRef>0</tpduRef>
+                        </cotpTpduData>
+                        <userData>
+                            <magicByte>50</magicByte>
+                            <type>1</type>
+                            <s7RequestMessage>
+                                <reserved>0</reserved>
+                                <tpduReference>1</tpduReference>
+                                <parametersLength>38</parametersLength>
+                                <payloadsLength>0</payloadsLength>
+                                <parameters>
+                                    <parameter>
+                                        <type>4</type>
+                                        <s7RequestParameterReadVar>
+                                            <numItems>3</numItems>
+                                            <items>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterReadVarAnyItem>
+                                                        <paramLength>10</paramLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>6</dataType>
+                                                        <numElements>1</numElements>
+                                                        <dataBlockNumber>811</dataBlockNumber>
+                                                        <memoryArea>132</memoryArea>
+                                                        <byteOffset>44</byteOffset>
+                                                        <bitOffset>0</bitOffset>
+                                                    </s7RequestParameterReadVarAnyItem>
+                                                </item>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterReadVarAnyItem>
+                                                        <paramLength>10</paramLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>5</dataType>
+                                                        <numElements>1</numElements>
+                                                        <dataBlockNumber>811</dataBlockNumber>
+                                                        <memoryArea>132</memoryArea>
+                                                        <byteOffset>42</byteOffset>
+                                                        <bitOffset>0</bitOffset>
+                                                    </s7RequestParameterReadVarAnyItem>
+                                                </item>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterReadVarAnyItem>
+                                                        <paramLength>10</paramLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>4</dataType>
+                                                        <numElements>1</numElements>
+                                                        <dataBlockNumber>811</dataBlockNumber>
+                                                        <memoryArea>132</memoryArea>
+                                                        <byteOffset>40</byteOffset>
+                                                        <bitOffset>0</bitOffset>
+                                                    </s7RequestParameterReadVarAnyItem>
+                                                </item>
+                                            </items>
+                                        </s7RequestParameterReadVar>
+                                    </parameter>
+                                </parameters>
+                                <payloads>
+                                    <payload>
+                                        <s7RequestPayloadReadVar>
+                                            <data/>
+                                        </s7RequestPayloadReadVar>
+                                    </payload>
+                                </payloads>
+                            </s7RequestMessage>
+                        </userData>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="S7-ReadVarResponseNoFillingBytes"
+                         root="TpktMessage"
+                         model="s7Schema">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">
+                0300002902f0803203000000010002001400000403ff04002000000000ff0500100000ff0400100000
+            </tdml:documentPart>
+        </tdml:document>
+
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>41</length>
+                    <userData>
+                        <headerLength>2</headerLength>
+                        <type>240</type>
+                        <cotpTpduData>
+                            <endOfTransmission>true</endOfTransmission>
+                            <tpduRef>0</tpduRef>
+                        </cotpTpduData>
+                        <userData>
+                            <magicByte>50</magicByte>
+                            <type>3</type>
+                            <s7ResponseMessage>
+                                <reserved>0</reserved>
+                                <tpduReference>1</tpduReference>
+                                <parametersLength>2</parametersLength>
+                                <payloadsLength>20</payloadsLength>
+                                <errorClass>0</errorClass>
+                                <errorCode>0</errorCode>
+                                <parameters>
+                                    <parameter>
+                                        <type>4</type>
+                                        <s7ResponseParameterReadVar>
+                                            <numItems>3</numItems>
+                                        </s7ResponseParameterReadVar>
+                                    </parameter>
+                                </parameters>
+                                <payloads>
+                                    <payload>
+                                        <s7ResponsePayloadReadVar>
+                                            <numItems>3</numItems>
+                                            <item>
+                                                <returnCode>255</returnCode>
+                                                <transportSize>4</transportSize>
+                                                <rawLength>32</rawLength>
+                                                <lengthInBytes>4</lengthInBytes>
+                                                <data>00000000</data>
+                                            </item>
+                                            <item>
+                                                <returnCode>255</returnCode>
+                                                <transportSize>5</transportSize>
+                                                <rawLength>16</rawLength>
+                                                <lengthInBytes>2</lengthInBytes>
+                                                <data>0000</data>
+                                            </item>
+                                            <item>
+                                                <returnCode>255</returnCode>
+                                                <transportSize>4</transportSize>
+                                                <rawLength>16</rawLength>
+                                                <lengthInBytes>2</lengthInBytes>
+                                                <data>0000</data>
+                                            </item>
+                                        </s7ResponsePayloadReadVar>
+                                    </payload>
+                                </payloads>
+                            </s7ResponseMessage>
+                        </userData>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="S7-ReadVarRequestWithFillingBytes"
+                         root="TpktMessage"
+                         model="s7Schema">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">
+                0300004302f080320100000001003200000404120a10020001032b84000150120a10010001032b84000159120a10020001032b84000148120a10020001032b84000140
+            </tdml:documentPart>
+        </tdml:document>
+
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>67</length>
+                    <userData>
+                        <headerLength>2</headerLength>
+                        <type>240</type>
+                        <cotpTpduData>
+                            <endOfTransmission>true</endOfTransmission>
+                            <tpduRef>0</tpduRef>
+                        </cotpTpduData>
+                        <userData>
+                            <magicByte>50</magicByte>
+                            <type>1</type>
+                            <s7RequestMessage>
+                                <reserved>0</reserved>
+                                <tpduReference>1</tpduReference>
+                                <parametersLength>50</parametersLength>
+                                <payloadsLength>0</payloadsLength>
+                                <parameters>
+                                    <parameter>
+                                        <type>4</type>
+                                        <s7RequestParameterReadVar>
+                                            <numItems>4</numItems>
+                                            <items>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterReadVarAnyItem>
+                                                        <paramLength>10</paramLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>2</dataType>
+                                                        <numElements>1</numElements>
+                                                        <dataBlockNumber>811</dataBlockNumber>
+                                                        <memoryArea>132</memoryArea>
+                                                        <byteOffset>42</byteOffset>
+                                                        <bitOffset>0</bitOffset>
+                                                    </s7RequestParameterReadVarAnyItem>
+                                                </item>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterReadVarAnyItem>
+                                                        <paramLength>10</paramLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>1</dataType>
+                                                        <numElements>1</numElements>
+                                                        <dataBlockNumber>811</dataBlockNumber>
+                                                        <memoryArea>132</memoryArea>
+                                                        <byteOffset>43</byteOffset>
+                                                        <bitOffset>1</bitOffset>
+                                                    </s7RequestParameterReadVarAnyItem>
+                                                </item>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterReadVarAnyItem>
+                                                        <paramLength>10</paramLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>2</dataType>
+                                                        <numElements>1</numElements>
+                                                        <dataBlockNumber>811</dataBlockNumber>
+                                                        <memoryArea>132</memoryArea>
+                                                        <byteOffset>41</byteOffset>
+                                                        <bitOffset>0</bitOffset>
+                                                    </s7RequestParameterReadVarAnyItem>
+                                                </item>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterReadVarAnyItem>
+                                                        <paramLength>10</paramLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>2</dataType>
+                                                        <numElements>1</numElements>
+                                                        <dataBlockNumber>811</dataBlockNumber>
+                                                        <memoryArea>132</memoryArea>
+                                                        <byteOffset>40</byteOffset>
+                                                        <bitOffset>0</bitOffset>
+                                                    </s7RequestParameterReadVarAnyItem>
+                                                </item>
+                                            </items>
+                                        </s7RequestParameterReadVar>
+                                    </parameter>
+                                </parameters>
+                                <payloads>
+                                    <payload>
+                                        <s7RequestPayloadReadVar>
+                                            <data/>
+                                        </s7RequestPayloadReadVar>
+                                    </payload>
+                                </payloads>
+                            </s7RequestMessage>
+                        </userData>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="S7-ReadVarResponseWithFillingBytes"
+                         root="TpktMessage"
+                         model="s7Schema">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">
+                0300002c02f0803203000000010002001700000404ff0400080000ff0300010000ff0400080000ff04000800
+            </tdml:documentPart>
+        </tdml:document>
+
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>44</length>
+                    <userData>
+                        <headerLength>2</headerLength>
+                        <type>240</type>
+                        <cotpTpduData>
+                            <endOfTransmission>true</endOfTransmission>
+                            <tpduRef>0</tpduRef>
+                        </cotpTpduData>
+                        <userData>
+                            <magicByte>50</magicByte>
+                            <type>3</type>
+                            <s7ResponseMessage>
+                                <reserved>0</reserved>
+                                <tpduReference>1</tpduReference>
+                                <parametersLength>2</parametersLength>
+                                <payloadsLength>23</payloadsLength>
+                                <errorClass>0</errorClass>
+                                <errorCode>0</errorCode>
+                                <parameters>
+                                    <parameter>
+                                        <type>4</type>
+                                        <s7ResponseParameterReadVar>
+                                            <numItems>4</numItems>
+                                        </s7ResponseParameterReadVar>
+                                    </parameter>
+                                </parameters>
+                                <payloads>
+                                    <payload>
+                                        <s7ResponsePayloadReadVar>
+                                            <numItems>4</numItems>
+                                            <item>
+                                                <returnCode>255</returnCode>
+                                                <transportSize>4</transportSize>
+                                                <rawLength>8</rawLength>
+                                                <lengthInBytes>1</lengthInBytes>
+                                                <data>00</data>
+                                                <fillByte>0</fillByte>
+                                            </item>
+                                            <item>
+                                                <returnCode>255</returnCode>
+                                                <transportSize>3</transportSize>
+                                                <rawLength>1</rawLength>
+                                                <lengthInBytes>1</lengthInBytes>
+                                                <data>00</data>
+                                                <fillByte>0</fillByte>
+                                            </item>
+                                            <item>
+                                                <returnCode>255</returnCode>
+                                                <transportSize>4</transportSize>
+                                                <rawLength>8</rawLength>
+                                                <lengthInBytes>1</lengthInBytes>
+                                                <data>00</data>
+                                                <fillByte>0</fillByte>
+                                            </item>
+                                            <item>
+                                                <returnCode>255</returnCode>
+                                                <transportSize>4</transportSize>
+                                                <rawLength>8</rawLength>
+                                                <lengthInBytes>1</lengthInBytes>
+                                                <data>00</data>
+                                            </item>
+                                        </s7ResponsePayloadReadVar>
+                                    </payload>
+                                </payloads>
+                            </s7ResponseMessage>
+                        </userData>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="S7-WriteVarRequestSingleItem"
+                         root="TpktMessage"
+                         model="s7Schema">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">
+                0300002702f080320100001800000e00080501120a100800010000830000800007000479e9f642
+            </tdml:documentPart>
+        </tdml:document>
+
+        <!-- Define the expected output -->
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>39</length>
+                    <userData>
+                        <headerLength>2</headerLength>
+                        <type>240</type>
+                        <cotpTpduData>
+                            <endOfTransmission>true</endOfTransmission>
+                            <tpduRef>0</tpduRef>
+                        </cotpTpduData>
+                        <userData>
+                            <magicByte>50</magicByte>
+                            <type>1</type>
+                            <s7RequestMessage>
+                                <reserved>0</reserved>
+                                <tpduReference>6144</tpduReference>
+                                <parametersLength>14</parametersLength>
+                                <payloadsLength>8</payloadsLength>
+                                <parameters>
+                                    <parameter>
+                                        <type>5</type>
+                                        <s7RequestParameterWriteVar>
+                                            <numItems>1</numItems>
+                                            <items>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterWriteVarAnyItem>
+                                                        <itemLength>10</itemLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>8</dataType>
+                                                        <numElements>1</numElements>
+                                                        <dataBlockNumber>0</dataBlockNumber>
+                                                        <memoryArea>131</memoryArea>
+                                                        <byteOffset>16</byteOffset>
+                                                        <bitOffset>0</bitOffset>
+                                                    </s7RequestParameterWriteVarAnyItem>
+                                                </item>
+                                            </items>
+                                        </s7RequestParameterWriteVar>
+                                    </parameter>
+                                </parameters>
+                                <payloads>
+                                    <payload>
+                                        <s7RequestPayloadWriteVar>
+                                            <numItems>1</numItems>
+                                            <item>
+                                                <returnCode>0</returnCode>
+                                                <transportSize>7</transportSize>
+                                                <rawLength>4</rawLength>
+                                                <lengthInBytes>4</lengthInBytes>
+                                                <data>79E9F642</data>
+                                            </item>
+                                        </s7RequestPayloadWriteVar>
+                                    </payload>
+                                </payloads>
+                            </s7RequestMessage>
+                        </userData>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="S7-WriteVarResponseSingleItem"
+                         root="TpktMessage"
+                         model="s7Schema">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">0300001602f0803203000018000002000100000501ff</tdml:documentPart>
+        </tdml:document>
+
+        <!-- Define the expected output -->
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>22</length>
+                    <userData>
+                        <headerLength>2</headerLength>
+                        <type>240</type>
+                        <cotpTpduData>
+                            <endOfTransmission>true</endOfTransmission>
+                            <tpduRef>0</tpduRef>
+                        </cotpTpduData>
+                        <userData>
+                            <magicByte>50</magicByte>
+                            <type>3</type>
+                            <s7ResponseMessage>
+                                <reserved>0</reserved>
+                                <tpduReference>6144</tpduReference>
+                                <parametersLength>2</parametersLength>
+                                <payloadsLength>1</payloadsLength>
+                                <errorClass>0</errorClass>
+                                <errorCode>0</errorCode>
+                                <parameters>
+                                    <parameter>
+                                        <type>5</type>
+                                        <s7ResponseParameterWriteVar>
+                                            <numItems>1</numItems>
+                                        </s7ResponseParameterWriteVar>
+                                    </parameter>
+                                </parameters>
+                                <payloads>
+                                    <payload>
+                                        <s7ResponsePayloadWriteVar>
+                                            <numItems>1</numItems>
+                                            <items>
+                                                <item>
+                                                    <returnCode>255</returnCode>
+                                                </item>
+                                            </items>
+                                        </s7ResponsePayloadWriteVar>
+                                    </payload>
+                                </payloads>
+                            </s7ResponseMessage>
+                        </userData>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="S7-ReadVarRequestMultipleItems"
+                         root="TpktMessage"
+                         model="s7Schema">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">
+                0300004f02f080320100001b00003e00000405120a10020010000083000000120a10020010000081000000120a10020010000082000000120a101d000800001d000000120a101c000800001c000000
+            </tdml:documentPart>
+        </tdml:document>
+
+        <!-- Define the expected output -->
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>79</length>
+                    <userData>
+                        <headerLength>2</headerLength>
+                        <type>240</type>
+                        <cotpTpduData>
+                            <endOfTransmission>true</endOfTransmission>
+                            <tpduRef>0</tpduRef>
+                        </cotpTpduData>
+                        <userData>
+                            <magicByte>50</magicByte>
+                            <type>1</type>
+                            <s7RequestMessage>
+                                <reserved>0</reserved>
+                                <tpduReference>6912</tpduReference>
+                                <parametersLength>62</parametersLength>
+                                <payloadsLength>0</payloadsLength>
+                                <parameters>
+                                    <parameter>
+                                        <type>4</type>
+                                        <s7RequestParameterReadVar>
+                                            <numItems>5</numItems>
+                                            <items>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterReadVarAnyItem>
+                                                        <paramLength>10</paramLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>2</dataType>
+                                                        <numElements>16</numElements>
+                                                        <dataBlockNumber>0</dataBlockNumber>
+                                                        <memoryArea>131</memoryArea>
+                                                        <byteOffset>0</byteOffset>
+                                                        <bitOffset>0</bitOffset>
+                                                    </s7RequestParameterReadVarAnyItem>
+                                                </item>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterReadVarAnyItem>
+                                                        <paramLength>10</paramLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>2</dataType>
+                                                        <numElements>16</numElements>
+                                                        <dataBlockNumber>0</dataBlockNumber>
+                                                        <memoryArea>129</memoryArea>
+                                                        <byteOffset>0</byteOffset>
+                                                        <bitOffset>0</bitOffset>
+                                                    </s7RequestParameterReadVarAnyItem>
+                                                </item>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterReadVarAnyItem>
+                                                        <paramLength>10</paramLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>2</dataType>
+                                                        <numElements>16</numElements>
+                                                        <dataBlockNumber>0</dataBlockNumber>
+                                                        <memoryArea>130</memoryArea>
+                                                        <byteOffset>0</byteOffset>
+                                                        <bitOffset>0</bitOffset>
+                                                    </s7RequestParameterReadVarAnyItem>
+                                                </item>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterReadVarAnyItem>
+                                                        <paramLength>10</paramLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>29</dataType>
+                                                        <numElements>8</numElements>
+                                                        <dataBlockNumber>0</dataBlockNumber>
+                                                        <memoryArea>29</memoryArea>
+                                                        <byteOffset>0</byteOffset>
+                                                        <bitOffset>0</bitOffset>
+                                                    </s7RequestParameterReadVarAnyItem>
+                                                </item>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterReadVarAnyItem>
+                                                        <paramLength>10</paramLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>28</dataType>
+                                                        <numElements>8</numElements>
+                                                        <dataBlockNumber>0</dataBlockNumber>
+                                                        <memoryArea>28</memoryArea>
+                                                        <byteOffset>0</byteOffset>
+                                                        <bitOffset>0</bitOffset>
+                                                    </s7RequestParameterReadVarAnyItem>
+                                                </item>
+                                            </items>
+                                        </s7RequestParameterReadVar>
+                                    </parameter>
+                                </parameters>
+                                <payloads>
+                                    <payload>
+                                        <s7RequestPayloadReadVar>
+                                            <data/>
+                                        </s7RequestPayloadReadVar>
+                                    </payload>
+                                </payloads>
+                            </s7RequestMessage>
+                        </userData>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="S7-ReadVarResponseMultipleItems"
+                         root="TpktMessage"
+                         model="s7Schema">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">
+                0300007902f080320300001b000002006400000405ff040080acde000daddeaddeaddeaddeaddeaddeff040080aaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbff040080bbbbbbbbbbbbbbbbaddeaddeaddeaddeff09001000000000000000000000000000000000ff09001000110000000000000000000000000000
+            </tdml:documentPart>
+        </tdml:document>
+
+        <!-- Define the expected output -->
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>121</length>
+                    <userData>
+                        <headerLength>2</headerLength>
+                        <type>240</type>
+                        <cotpTpduData>
+                            <endOfTransmission>true</endOfTransmission>
+                            <tpduRef>0</tpduRef>
+                        </cotpTpduData>
+                        <userData>
+                            <magicByte>50</magicByte>
+                            <type>3</type>
+                            <s7ResponseMessage>
+                                <reserved>0</reserved>
+                                <tpduReference>6912</tpduReference>
+                                <parametersLength>2</parametersLength>
+                                <payloadsLength>100</payloadsLength>
+                                <errorClass>0</errorClass>
+                                <errorCode>0</errorCode>
+                                <parameters>
+                                    <parameter>
+                                        <type>4</type>
+                                        <s7ResponseParameterReadVar>
+                                            <numItems>5</numItems>
+                                        </s7ResponseParameterReadVar>
+                                    </parameter>
+                                </parameters>
+                                <payloads>
+                                    <payload>
+                                        <s7ResponsePayloadReadVar>
+                                            <numItems>5</numItems>
+                                            <item>
+                                                <returnCode>255</returnCode>
+                                                <transportSize>4</transportSize>
+                                                <rawLength>128</rawLength>
+                                                <lengthInBytes>16</lengthInBytes>
+                                                <data>ACDE000DADDEADDEADDEADDEADDEADDE</data>
+                                            </item>
+                                            <item>
+                                                <returnCode>255</returnCode>
+                                                <transportSize>4</transportSize>
+                                                <rawLength>128</rawLength>
+                                                <lengthInBytes>16</lengthInBytes>
+                                                <data>AAAAAAAAAAAAAAAABBBBBBBBBBBBBBBB</data>
+                                            </item>
+                                            <item>
+                                                <returnCode>255</returnCode>
+                                                <transportSize>4</transportSize>
+                                                <rawLength>128</rawLength>
+                                                <lengthInBytes>16</lengthInBytes>
+                                                <data>BBBBBBBBBBBBBBBBADDEADDEADDEADDE</data>
+                                            </item>
+                                            <item>
+                                                <returnCode>255</returnCode>
+                                                <transportSize>9</transportSize>
+                                                <rawLength>16</rawLength>
+                                                <lengthInBytes>16</lengthInBytes>
+                                                <data>00000000000000000000000000000000</data>
+                                            </item>
+                                            <item>
+                                                <returnCode>255</returnCode>
+                                                <transportSize>9</transportSize>
+                                                <rawLength>16</rawLength>
+                                                <lengthInBytes>16</lengthInBytes>
+                                                <data>00110000000000000000000000000000</data>
+                                            </item>
+                                        </s7ResponsePayloadReadVar>
+                                    </payload>
+                                </payloads>
+                            </s7ResponseMessage>
+                        </userData>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="S7-WriteVarRequestMultipleItems"
+                         root="TpktMessage"
+                         model="s7Schema">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">
+                030000c302f080320100001a00003e00740505120a10040010000083000000120a10020010000081000000120a10020010000082000000120a101d000800001d000000120a101c000800001c00000000040100addeaddeaddeaddeaddeaddeaddeaddeefbeefbeefbeefbeefbeefbeefbeefbe00040080aaaaaaaaaaaaaaaabbbbbbbbbbbbbbbb00040080bbbbbbbbbbbbbbbbaddeaddeaddeadde00090010efbeefbeefbeefbeefbeefbeefbeefbe00090010fecafecafecafecafecafecafecafeca
+            </tdml:documentPart>
+        </tdml:document>
+
+        <!-- Define the expected output -->
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>195</length>
+                    <userData>
+                        <headerLength>2</headerLength>
+                        <type>240</type>
+                        <cotpTpduData>
+                            <endOfTransmission>true</endOfTransmission>
+                            <tpduRef>0</tpduRef>
+                        </cotpTpduData>
+                        <userData>
+                            <magicByte>50</magicByte>
+                            <type>1</type>
+                            <s7RequestMessage>
+                                <reserved>0</reserved>
+                                <tpduReference>6656</tpduReference>
+                                <parametersLength>62</parametersLength>
+                                <payloadsLength>116</payloadsLength>
+                                <parameters>
+                                    <parameter>
+                                        <type>5</type>
+                                        <s7RequestParameterWriteVar>
+                                            <numItems>5</numItems>
+                                            <items>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterWriteVarAnyItem>
+                                                        <itemLength>10</itemLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>4</dataType>
+                                                        <numElements>16</numElements>
+                                                        <dataBlockNumber>0</dataBlockNumber>
+                                                        <memoryArea>131</memoryArea>
+                                                        <byteOffset>0</byteOffset>
+                                                        <bitOffset>0</bitOffset>
+                                                    </s7RequestParameterWriteVarAnyItem>
+                                                </item>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterWriteVarAnyItem>
+                                                        <itemLength>10</itemLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>2</dataType>
+                                                        <numElements>16</numElements>
+                                                        <dataBlockNumber>0</dataBlockNumber>
+                                                        <memoryArea>129</memoryArea>
+                                                        <byteOffset>0</byteOffset>
+                                                        <bitOffset>0</bitOffset>
+                                                    </s7RequestParameterWriteVarAnyItem>
+                                                </item>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterWriteVarAnyItem>
+                                                        <itemLength>10</itemLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>2</dataType>
+                                                        <numElements>16</numElements>
+                                                        <dataBlockNumber>0</dataBlockNumber>
+                                                        <memoryArea>130</memoryArea>
+                                                        <byteOffset>0</byteOffset>
+                                                        <bitOffset>0</bitOffset>
+                                                    </s7RequestParameterWriteVarAnyItem>
+                                                </item>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterWriteVarAnyItem>
+                                                        <itemLength>10</itemLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>29</dataType>
+                                                        <numElements>8</numElements>
+                                                        <dataBlockNumber>0</dataBlockNumber>
+                                                        <memoryArea>29</memoryArea>
+                                                        <byteOffset>0</byteOffset>
+                                                        <bitOffset>0</bitOffset>
+                                                    </s7RequestParameterWriteVarAnyItem>
+                                                </item>
+                                                <item>
+                                                    <type>18</type>
+                                                    <s7RequestParameterWriteVarAnyItem>
+                                                        <itemLength>10</itemLength>
+                                                        <addressingMode>16</addressingMode>
+                                                        <dataType>28</dataType>
+                                                        <numElements>8</numElements>
+                                                        <dataBlockNumber>0</dataBlockNumber>
+                                                        <memoryArea>28</memoryArea>
+                                                        <byteOffset>0</byteOffset>
+                                                        <bitOffset>0</bitOffset>
+                                                    </s7RequestParameterWriteVarAnyItem>
+                                                </item>
+                                            </items>
+                                        </s7RequestParameterWriteVar>
+                                    </parameter>
+                                </parameters>
+                                <payloads>
+                                    <payload>
+                                        <s7RequestPayloadWriteVar>
+                                            <numItems>5</numItems>
+                                            <item>
+                                                <returnCode>0</returnCode>
+                                                <transportSize>4</transportSize>
+                                                <rawLength>256</rawLength>
+                                                <lengthInBytes>32</lengthInBytes>
+                                                <data>ADDEADDEADDEADDEADDEADDEADDEADDEEFBEEFBEEFBEEFBEEFBEEFBEEFBEEFBE</data>
+                                            </item>
+                                            <item>
+                                                <returnCode>0</returnCode>
+                                                <transportSize>4</transportSize>
+                                                <rawLength>128</rawLength>
+                                                <lengthInBytes>16</lengthInBytes>
+                                                <data>AAAAAAAAAAAAAAAABBBBBBBBBBBBBBBB</data>
+                                            </item>
+                                            <item>
+                                                <returnCode>0</returnCode>
+                                                <transportSize>4</transportSize>
+                                                <rawLength>128</rawLength>
+                                                <lengthInBytes>16</lengthInBytes>
+                                                <data>BBBBBBBBBBBBBBBBADDEADDEADDEADDE</data>
+                                            </item>
+                                            <item>
+                                                <returnCode>0</returnCode>
+                                                <transportSize>9</transportSize>
+                                                <rawLength>16</rawLength>
+                                                <lengthInBytes>16</lengthInBytes>
+                                                <data>EFBEEFBEEFBEEFBEEFBEEFBEEFBEEFBE</data>
+                                            </item>
+                                            <item>
+                                                <returnCode>0</returnCode>
+                                                <transportSize>9</transportSize>
+                                                <rawLength>16</rawLength>
+                                                <lengthInBytes>16</lengthInBytes>
+                                                <data>FECAFECAFECAFECAFECAFECAFECAFECA</data>
+                                            </item>
+                                        </s7RequestPayloadWriteVar>
+                                    </payload>
+                                </payloads>
+                            </s7RequestMessage>
+                        </userData>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+    <tdml:parserTestCase name="S7-WriteVarResponseMultipleItems"
+                         root="TpktMessage"
+                         model="s7Schema">
+        <!-- Define the input -->
+        <tdml:document>
+            <tdml:documentPart type="byte">0300001a02f080320300001a000002000500000505ffffff0303</tdml:documentPart>
+        </tdml:document>
+
+        <!-- Define the expected output -->
+        <tdml:infoset>
+            <tdml:dfdlInfoset>
+                <s7:TpktMessage>
+                    <magicByte>3</magicByte>
+                    <reserved>0</reserved>
+                    <length>26</length>
+                    <userData>
+                        <headerLength>2</headerLength>
+                        <type>240</type>
+                        <cotpTpduData>
+                            <endOfTransmission>true</endOfTransmission>
+                            <tpduRef>0</tpduRef>
+                        </cotpTpduData>
+                        <userData>
+                            <magicByte>50</magicByte>
+                            <type>3</type>
+                            <s7ResponseMessage>
+                                <reserved>0</reserved>
+                                <tpduReference>6656</tpduReference>
+                                <parametersLength>2</parametersLength>
+                                <payloadsLength>5</payloadsLength>
+                                <errorClass>0</errorClass>
+                                <errorCode>0</errorCode>
+                                <parameters>
+                                    <parameter>
+                                        <type>5</type>
+                                        <s7ResponseParameterWriteVar>
+                                            <numItems>5</numItems>
+                                        </s7ResponseParameterWriteVar>
+                                    </parameter>
+                                </parameters>
+                                <payloads>
+                                    <payload>
+                                        <s7ResponsePayloadWriteVar>
+                                            <numItems>5</numItems>
+                                            <items>
+                                                <item>
+                                                    <returnCode>255</returnCode>
+                                                </item>
+                                                <item>
+                                                    <returnCode>255</returnCode>
+                                                </item>
+                                                <item>
+                                                    <returnCode>255</returnCode>
+                                                </item>
+                                                <item>
+                                                    <returnCode>3</returnCode>
+                                                </item>
+                                                <item>
+                                                    <returnCode>3</returnCode>
+                                                </item>
+                                            </items>
+                                        </s7ResponsePayloadWriteVar>
+                                    </payload>
+                                </payloads>
+                            </s7ResponseMessage>
+                        </userData>
+                    </userData>
+                </s7:TpktMessage>
+            </tdml:dfdlInfoset>
+        </tdml:infoset>
+    </tdml:parserTestCase>
+
+</tdml:testSuite>
+
+
diff --git a/sandbox/code-gen/pom.xml b/sandbox/code-gen/pom.xml
index ad1debfb91c..a4dca15fce0 100644
--- a/sandbox/code-gen/pom.xml
+++ b/sandbox/code-gen/pom.xml
@@ -1,71 +1,71 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <artifactId>plc4x-sandbox</artifactId>
-    <groupId>org.apache.plc4x.sandbox</groupId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>code-gen</artifactId>
-
-  <name>Sandbox: Code-Gen</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.dom4j</groupId>
-      <artifactId>dom4j</artifactId>
-      <version>2.1.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-launcher</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <artifactId>plc4x-sandbox</artifactId>
+    <groupId>org.apache.plc4x.sandbox</groupId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>code-gen</artifactId>
+
+  <name>Sandbox: Code-Gen</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.dom4j</groupId>
+      <artifactId>dom4j</artifactId>
+      <version>2.1.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-launcher</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+
 </project>
\ No newline at end of file
diff --git a/sandbox/code-gen/src/main/antlr4/imaginary.g4 b/sandbox/code-gen/src/main/antlr4/imaginary.g4
index bebf54887eb..b25e27c8fe9 100644
--- a/sandbox/code-gen/src/main/antlr4/imaginary.g4
+++ b/sandbox/code-gen/src/main/antlr4/imaginary.g4
@@ -1,149 +1,149 @@
-grammar imaginary;
-/*
- 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
-
-     http://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.
-*/
-
-file
- : statement*
- ;
-
-statement
- : COMMENT
- | typeDefinition
- ;
-
-typeDefinition
- : LBRACKET K_TYPE IDENTIFIER COMMENT? (fieldDefinition COMMENT?)+ RBRACKET
- | LBRACKET K_DISCRIMINATED_TYPE IDENTIFIER '[length]'? COMMENT? (fieldDefinition COMMENT?)+ RBRACKET
- ;
-
-
-fieldDefinition
- : LBRACKET simpleField RBRACKET
- | typeSwitch
- ;
-
-simpleField
- : K_CONST dataType IDENTIFIER expression
- | K_RESERVED dataType expression
- | K_IMPLICIT dataType IDENTIFIER expression
- | K_EMBEDDED IDENTIFIER LCBRACKET context RCBRACKET
- | K_DISCRIMINATOR dataType IDENTIFIER
- | 'context' (dataType | IDENTIFIER) expression
- | 'optionalField' (dataType | IDENTIFIER) expression
- | 'field' dataType IDENTIFIER
- | arrayField
- ;
-
-typeSwitch
- : LBRACKET 'typeSwitch' IDENTIFIER COMMENT? caseStatement* RBRACKET
- ;
-
-caseStatement
- : LBRACKET expression IDENTIFIER COMMENT? (fieldDefinition COMMENT?)+ RBRACKET
- ;
-
-arrayField
- : 'arrayField' (IDENTIFIER | dataType) IDENTIFIER IDENTIFIER expression COMMENT*
- ;
-
-dataType
- : 'bit'
- | 'uint7'
- | K_UINT8
- | K_UINT16
- ;
-
-expression
- : TICK innerExpression TICK
- ;
-
-innerExpression
- : HEX_LITERAL
- | INTEGER_LITERAL
- | IDENTIFIER   // Variable reference
- | innerExpression '.' IDENTIFIER // Field Reference
- | innerExpression BinaryOperator innerExpression  // Addition
- | '(' innerExpression ')'
- ;
-
-context
- : IDENTIFIER ':' expression (',' IDENTIFIER ':' expression)*
- ;
-
-COMMENT
- : K_COMMENT [a-zA-Z0-9,.'":()/ \t\r\n\u000C-]*
- | '//' [a-zA-Z0-9,.'":()/ \t-]*
- ;
-
-INTEGER_LITERAL
- : [0-9]+
- ;
-
-HEX_LITERAL
- : HexNumeral
- ;
-
-fragment HexNumeral
- : '0' [xX] HexDigit HexDigit?;
-
-fragment HexDigit
- : [0-9a-fA-F]
-;
-
-modifier
- : K_CONST
- | K_RESERVED
- | K_IMPLICIT
- | K_EMBEDDED
- ;
-
-fragment K_COMMENT : '<--';
-K_CONST : 'const';
-K_RESERVED : 'reserved';
-K_IMPLICIT : 'implicit';
-K_EMBEDDED : 'embedded';
-K_DISCRIMINATOR : 'discriminator';
-K_TYPE : 'type';
-K_DISCRIMINATED_TYPE : 'discriminatedType';
-
-K_UINT8 : 'uint8';
-K_UINT16 : 'uint16';
-
-TICK : '\'';
-TIMES : 'x';
-LBRACKET : '[';
-RBRACKET : ']';
-LCBRACKET : '{';
-RCBRACKET : '}';
-
-BinaryOperator
- : '+'
- | '-'
- | '=='
- ;
-
-ZERO : '0';
-HEX_VALUE : [0-9A-F];
-
-IDENTIFIER
- : [A-Za-z0-9_-]+
- ;
-
-WS  :  [ \t\r\n\u000C]+ -> skip
+grammar imaginary;
+/*
+ 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
+
+     http://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.
+*/
+
+file
+ : statement*
+ ;
+
+statement
+ : COMMENT
+ | typeDefinition
+ ;
+
+typeDefinition
+ : LBRACKET K_TYPE IDENTIFIER COMMENT? (fieldDefinition COMMENT?)+ RBRACKET
+ | LBRACKET K_DISCRIMINATED_TYPE IDENTIFIER '[length]'? COMMENT? (fieldDefinition COMMENT?)+ RBRACKET
+ ;
+
+
+fieldDefinition
+ : LBRACKET simpleField RBRACKET
+ | typeSwitch
+ ;
+
+simpleField
+ : K_CONST dataType IDENTIFIER expression
+ | K_RESERVED dataType expression
+ | K_IMPLICIT dataType IDENTIFIER expression
+ | K_EMBEDDED IDENTIFIER LCBRACKET context RCBRACKET
+ | K_DISCRIMINATOR dataType IDENTIFIER
+ | 'context' (dataType | IDENTIFIER) expression
+ | 'optionalField' (dataType | IDENTIFIER) expression
+ | 'field' dataType IDENTIFIER
+ | arrayField
+ ;
+
+typeSwitch
+ : LBRACKET 'typeSwitch' IDENTIFIER COMMENT? caseStatement* RBRACKET
+ ;
+
+caseStatement
+ : LBRACKET expression IDENTIFIER COMMENT? (fieldDefinition COMMENT?)+ RBRACKET
+ ;
+
+arrayField
+ : 'arrayField' (IDENTIFIER | dataType) IDENTIFIER IDENTIFIER expression COMMENT*
+ ;
+
+dataType
+ : 'bit'
+ | 'uint7'
+ | K_UINT8
+ | K_UINT16
+ ;
+
+expression
+ : TICK innerExpression TICK
+ ;
+
+innerExpression
+ : HEX_LITERAL
+ | INTEGER_LITERAL
+ | IDENTIFIER   // Variable reference
+ | innerExpression '.' IDENTIFIER // Field Reference
+ | innerExpression BinaryOperator innerExpression  // Addition
+ | '(' innerExpression ')'
+ ;
+
+context
+ : IDENTIFIER ':' expression (',' IDENTIFIER ':' expression)*
+ ;
+
+COMMENT
+ : K_COMMENT [a-zA-Z0-9,.'":()/ \t\r\n\u000C-]*
+ | '//' [a-zA-Z0-9,.'":()/ \t-]*
+ ;
+
+INTEGER_LITERAL
+ : [0-9]+
+ ;
+
+HEX_LITERAL
+ : HexNumeral
+ ;
+
+fragment HexNumeral
+ : '0' [xX] HexDigit HexDigit?;
+
+fragment HexDigit
+ : [0-9a-fA-F]
+;
+
+modifier
+ : K_CONST
+ | K_RESERVED
+ | K_IMPLICIT
+ | K_EMBEDDED
+ ;
+
+fragment K_COMMENT : '<--';
+K_CONST : 'const';
+K_RESERVED : 'reserved';
+K_IMPLICIT : 'implicit';
+K_EMBEDDED : 'embedded';
+K_DISCRIMINATOR : 'discriminator';
+K_TYPE : 'type';
+K_DISCRIMINATED_TYPE : 'discriminatedType';
+
+K_UINT8 : 'uint8';
+K_UINT16 : 'uint16';
+
+TICK : '\'';
+TIMES : 'x';
+LBRACKET : '[';
+RBRACKET : ']';
+LCBRACKET : '{';
+RCBRACKET : '}';
+
+BinaryOperator
+ : '+'
+ | '-'
+ | '=='
+ ;
+
+ZERO : '0';
+HEX_VALUE : [0-9A-F];
+
+IDENTIFIER
+ : [A-Za-z0-9_-]+
+ ;
+
+WS  :  [ \t\r\n\u000C]+ -> skip
 ;
\ No newline at end of file
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/DFDLUtil.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/DFDLUtil.java
index b6c67c4d8d4..961825a6d80 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/DFDLUtil.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/DFDLUtil.java
@@ -1,96 +1,96 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen;
-
-import org.apache.plc4x.codegen.ast.*;
-import org.apache.plc4x.codegen.util.PojoFactory;
-import org.dom4j.*;
-import org.dom4j.io.SAXReader;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-/**
- * Util to create a POJO from a DFDL file.
- */
-public class DFDLUtil {
-
-    private static final Namespace xsNamespace = new Namespace("xs", "http://www.w3.org/2001/XMLSchema");
-    private static final QName complexType = new QName("complexType", xsNamespace);
-    private static final QName sequence = new QName("sequence", xsNamespace);
-    private static final QName ELEMENT = new QName("element", xsNamespace);
-
-    public void transform(File dfdlSchemaFile, File outputDir) {
-        assert outputDir.exists();
-        assert outputDir.isDirectory();
-
-        final Document schema = parseDFDLSchema(dfdlSchemaFile);
-
-        final Iterator<Element> iterator = getMainTypes(schema);
-
-        final PojoFactory factory = new PojoFactory();
-        while (iterator.hasNext()) {
-            final Element element = iterator.next();
-            final Iterator<Element> sequenceIterator = element.elementIterator(sequence);
-            final Element sequence = getSequence(sequenceIterator);
-
-            // Now make a POJO with all "elements" as fields
-            final ArrayList<PojoFactory.Field> fields = new ArrayList<>();
-            final Iterator<Element> elementIterator = sequence.elementIterator(ELEMENT);
-            while (elementIterator.hasNext()) {
-                final Element elem = elementIterator.next();
-                fields.add(new PojoFactory.Field(Expressions.typeOf(elem.attributeValue("type")), elem.attributeValue("name")));
-            }
-            final PojoFactory.PojoDescription desc = new PojoFactory.PojoDescription(element.attributeValue("name"), fields);
-            final ClassDeclaration classDeclaration = factory.create(desc);
-
-            // Now generate the code for that
-            final CodeWriter writer = new CodeWriter(4);
-            final Generator generator = new JavaGenerator(writer);
-            classDeclaration.write(generator);
-
-            System.out.println("Class Definition");
-            System.out.println("----------------------------");
-            System.out.println(writer.getCode());
-        }
-    }
-
-    private Element getSequence(Iterator<Element> sequenceIterator) {
-        assert sequenceIterator.hasNext();
-        final Element sequence = sequenceIterator.next();
-        assert sequenceIterator.hasNext() == false;
-        return sequence;
-    }
-
-    private Document parseDFDLSchema(File schemaFile) {
-        try {
-            SAXReader reader = new SAXReader();
-            return reader.read(schemaFile);
-        } catch (DocumentException e) {
-            // Do something
-            throw new RuntimeException("Unable to read DFDL Schema File", e);
-        }
-    }
-
-    private Iterator<Element> getMainTypes(Document dfdlSchema) {
-        Element rootElement = dfdlSchema.getRootElement();
-        return rootElement.elementIterator(complexType);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen;
+
+import org.apache.plc4x.codegen.ast.*;
+import org.apache.plc4x.codegen.util.PojoFactory;
+import org.dom4j.*;
+import org.dom4j.io.SAXReader;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+/**
+ * Util to create a POJO from a DFDL file.
+ */
+public class DFDLUtil {
+
+    private static final Namespace xsNamespace = new Namespace("xs", "http://www.w3.org/2001/XMLSchema");
+    private static final QName complexType = new QName("complexType", xsNamespace);
+    private static final QName sequence = new QName("sequence", xsNamespace);
+    private static final QName ELEMENT = new QName("element", xsNamespace);
+
+    public void transform(File dfdlSchemaFile, File outputDir) {
+        assert outputDir.exists();
+        assert outputDir.isDirectory();
+
+        final Document schema = parseDFDLSchema(dfdlSchemaFile);
+
+        final Iterator<Element> iterator = getMainTypes(schema);
+
+        final PojoFactory factory = new PojoFactory();
+        while (iterator.hasNext()) {
+            final Element element = iterator.next();
+            final Iterator<Element> sequenceIterator = element.elementIterator(sequence);
+            final Element sequence = getSequence(sequenceIterator);
+
+            // Now make a POJO with all "elements" as fields
+            final ArrayList<PojoFactory.Field> fields = new ArrayList<>();
+            final Iterator<Element> elementIterator = sequence.elementIterator(ELEMENT);
+            while (elementIterator.hasNext()) {
+                final Element elem = elementIterator.next();
+                fields.add(new PojoFactory.Field(Expressions.typeOf(elem.attributeValue("type")), elem.attributeValue("name")));
+            }
+            final PojoFactory.PojoDescription desc = new PojoFactory.PojoDescription(element.attributeValue("name"), fields);
+            final ClassDeclaration classDeclaration = factory.create(desc);
+
+            // Now generate the code for that
+            final CodeWriter writer = new CodeWriter(4);
+            final Generator generator = new JavaGenerator(writer);
+            classDeclaration.write(generator);
+
+            System.out.println("Class Definition");
+            System.out.println("----------------------------");
+            System.out.println(writer.getCode());
+        }
+    }
+
+    private Element getSequence(Iterator<Element> sequenceIterator) {
+        assert sequenceIterator.hasNext();
+        final Element sequence = sequenceIterator.next();
+        assert sequenceIterator.hasNext() == false;
+        return sequence;
+    }
+
+    private Document parseDFDLSchema(File schemaFile) {
+        try {
+            SAXReader reader = new SAXReader();
+            return reader.read(schemaFile);
+        } catch (DocumentException e) {
+            // Do something
+            throw new RuntimeException("Unable to read DFDL Schema File", e);
+        }
+    }
+
+    private Iterator<Element> getMainTypes(Document dfdlSchema) {
+        Element rootElement = dfdlSchema.getRootElement();
+        return rootElement.elementIterator(complexType);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/api/Buffer.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/api/Buffer.java
index 3cbf6586185..171c6c1eb30 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/api/Buffer.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/api/Buffer.java
@@ -1,31 +1,31 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.api;
-
-/**
- * The Interface as described in {@link org.apache.plc4x.codegen.util.BufferUtil}.
- */
-public interface Buffer {
-
-    Integer readUint8();
-
-    Integer readUint16();
-
-    Long readUint32();
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.api;
+
+/**
+ * The Interface as described in {@link org.apache.plc4x.codegen.util.BufferUtil}.
+ */
+public interface Buffer {
+
+    Integer readUint8();
+
+    Integer readUint16();
+
+    Long readUint32();
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/AbstractNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/AbstractNode.java
index aa4177006f5..04c36d78df1 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/AbstractNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/AbstractNode.java
@@ -1,32 +1,32 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-public abstract class AbstractNode implements Node {
-
-    public final TypeDefinition type;
-
-    protected AbstractNode(TypeDefinition type) {
-        this.type = type;
-    }
-
-    public TypeDefinition getType() {
-        return this.type;
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+public abstract class AbstractNode implements Node {
+
+    public final TypeDefinition type;
+
+    protected AbstractNode(TypeDefinition type) {
+        this.type = type;
+    }
+
+    public TypeDefinition getType() {
+        return this.type;
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/AssignementExpression.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/AssignementExpression.java
index ece2723b88e..b8b29a3af0f 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/AssignementExpression.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/AssignementExpression.java
@@ -1,47 +1,47 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-public class AssignementExpression extends Expression {
-
-    private final Expression target;
-    private final Node value;
-
-    AssignementExpression(Expression target, Node value) {
-        super(target.getType());
-        this.target = target;
-        this.value = value;
-    }
-
-    public Node getTarget() {
-        return target;
-    }
-
-    public Node getValue() {
-        return value;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return null;
-    }
-
-    @Override public void write(Generator writer) {
-        writer.generate(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+public class AssignementExpression extends Expression {
+
+    private final Expression target;
+    private final Node value;
+
+    AssignementExpression(Expression target, Node value) {
+        super(target.getType());
+        this.target = target;
+        this.value = value;
+    }
+
+    public Node getTarget() {
+        return target;
+    }
+
+    public Node getValue() {
+        return value;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return null;
+    }
+
+    @Override public void write(Generator writer) {
+        writer.generate(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/BinaryExpression.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/BinaryExpression.java
index 4d03b2331d0..cb099772350 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/BinaryExpression.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/BinaryExpression.java
@@ -1,61 +1,61 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-public class BinaryExpression extends Expression {
-
-    private final Node left;
-    private final Node right;
-    private final Operation op;
-
-    BinaryExpression(TypeDefinition type, Node left, Node right, Operation op) {
-        super(type);
-        this.left = left;
-        this.right = right;
-        this.op = op;
-    }
-
-    public Node getLeft() {
-        return left;
-    }
-
-    public Node getRight() {
-        return right;
-    }
-
-    public Operation getOp() {
-        return op;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return null;
-    }
-
-    @Override public void write(Generator writer) {
-        writer.generate(this);
-    }
-
-    public enum Operation {
-        EQ,
-        NEQ,
-        GT,
-        LT,
-        PLUS;
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+public class BinaryExpression extends Expression {
+
+    private final Node left;
+    private final Node right;
+    private final Operation op;
+
+    BinaryExpression(TypeDefinition type, Node left, Node right, Operation op) {
+        super(type);
+        this.left = left;
+        this.right = right;
+        this.op = op;
+    }
+
+    public Node getLeft() {
+        return left;
+    }
+
+    public Node getRight() {
+        return right;
+    }
+
+    public Operation getOp() {
+        return op;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return null;
+    }
+
+    @Override public void write(Generator writer) {
+        writer.generate(this);
+    }
+
+    public enum Operation {
+        EQ,
+        NEQ,
+        GT,
+        LT,
+        PLUS;
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Block.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Block.java
index a6b41a016f6..ff3f5b13d52 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Block.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Block.java
@@ -1,53 +1,53 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class Block extends Statement {
-
-    public static final Block EMPTY_BLOCK = new Block();
-
-    private final List<Node> statements;
-
-    Block(List<Node> statements) {
-        this.statements = statements;
-    }
-
-    Block(Node... statements) {
-        this(Arrays.asList(statements));
-    }
-
-    public List<Node> getStatements() {
-        return statements;
-    }
-
-    public static BlockBuilder build() {
-        return new BlockBuilder();
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return null;
-    }
-
-    @Override public void write(Generator writer) {
-        writer.writeBlock(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class Block extends Statement {
+
+    public static final Block EMPTY_BLOCK = new Block();
+
+    private final List<Node> statements;
+
+    Block(List<Node> statements) {
+        this.statements = statements;
+    }
+
+    Block(Node... statements) {
+        this(Arrays.asList(statements));
+    }
+
+    public List<Node> getStatements() {
+        return statements;
+    }
+
+    public static BlockBuilder build() {
+        return new BlockBuilder();
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return null;
+    }
+
+    @Override public void write(Generator writer) {
+        writer.writeBlock(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/BlockBuilder.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/BlockBuilder.java
index 3007e5a5ad5..3a5fa07feb0 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/BlockBuilder.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/BlockBuilder.java
@@ -1,48 +1,48 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * Builds a Block.
- */
-public class BlockBuilder {
-
-    private final List<Node> statements = new ArrayList<>();
-
-    public BlockBuilder() {
-    }
-
-    public BlockBuilder add(Node statements) {
-        this.statements.add(statements);
-        return this;
-    }
-
-    public BlockBuilder add(Collection<Node> statements) {
-        this.statements.addAll(statements);
-        return this;
-    }
-
-    public Block toBlock() {
-        return new Block(this.statements);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * Builds a Block.
+ */
+public class BlockBuilder {
+
+    private final List<Node> statements = new ArrayList<>();
+
+    public BlockBuilder() {
+    }
+
+    public BlockBuilder add(Node statements) {
+        this.statements.add(statements);
+        return this;
+    }
+
+    public BlockBuilder add(Collection<Node> statements) {
+        this.statements.addAll(statements);
+        return this;
+    }
+
+    public Block toBlock() {
+        return new Block(this.statements);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/CallExpression.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/CallExpression.java
index d31972bb668..e354e13c084 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/CallExpression.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/CallExpression.java
@@ -1,62 +1,62 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class CallExpression extends Expression {
-
-    private final Method method;
-    private final Node target;
-    private final List<Node> arguments;
-
-    /**
-     * Static Method ==&gt; target == null
-     * @param method .
-     * @param target .
-     * @param arguments .
-     */
-    CallExpression(Method method, Node target, Node... arguments) {
-        super(method.getReturnType());
-        this.method = method;
-        this.target = target;
-        this.arguments = Arrays.asList(arguments);
-    }
-
-    public Method getMethod() {
-        return method;
-    }
-
-    public Node getTarget() {
-        return target;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return null;
-    }
-
-    @Override public void write(Generator writer) {
-        if (target == null) {
-            writer.generateStaticCall(method, arguments);
-        } else {
-            writer.generateCall(target, method, arguments);
-        }
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class CallExpression extends Expression {
+
+    private final Method method;
+    private final Node target;
+    private final List<Node> arguments;
+
+    /**
+     * Static Method ==&gt; target == null
+     * @param method .
+     * @param target .
+     * @param arguments .
+     */
+    CallExpression(Method method, Node target, Node... arguments) {
+        super(method.getReturnType());
+        this.method = method;
+        this.target = target;
+        this.arguments = Arrays.asList(arguments);
+    }
+
+    public Method getMethod() {
+        return method;
+    }
+
+    public Node getTarget() {
+        return target;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return null;
+    }
+
+    @Override public void write(Generator writer) {
+        if (target == null) {
+            writer.generateStaticCall(method, arguments);
+        } else {
+            writer.generateCall(target, method, arguments);
+        }
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/ClassDeclaration.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/ClassDeclaration.java
index 8c10a755af5..1a50053dace 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/ClassDeclaration.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/ClassDeclaration.java
@@ -1,73 +1,73 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-import java.util.List;
-
-public class ClassDeclaration implements Node {
-
-    private final String namespace;
-    private final String className;
-
-    private final List<FieldDeclaration> fields;
-    private final List<ConstructorDeclaration> constructors;
-    private final List<MethodDefinition> methods;
-    private final List<ClassDeclaration> innerClasses;
-
-    public ClassDeclaration(String namespace, String className, List<FieldDeclaration> fields, List<ConstructorDeclaration> constructors, List<MethodDefinition> methods, List<ClassDeclaration> innerClasses) {
-        this.namespace = namespace;
-        this.className = className;
-        this.fields = fields;
-        this.constructors = constructors;
-        this.methods = methods;
-        this.innerClasses = innerClasses;
-    }
-
-    public String getNamespace() {
-        return namespace;
-    }
-
-    public String getClassName() {
-        return className;
-    }
-
-    public List<FieldDeclaration> getFields() {
-        return fields;
-    }
-
-    public List<ConstructorDeclaration> getConstructors() {
-        return constructors;
-    }
-
-    public List<MethodDefinition> getMethods() {
-        return methods;
-    }
-
-    public List<ClassDeclaration> getInnerClasses() {
-        return innerClasses;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return null;
-    }
-
-    @Override public void write(Generator writer) {
-        writer.generateClass(this.namespace, this.className, this.fields, this.constructors, this.methods, innerClasses, true);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+import java.util.List;
+
+public class ClassDeclaration implements Node {
+
+    private final String namespace;
+    private final String className;
+
+    private final List<FieldDeclaration> fields;
+    private final List<ConstructorDeclaration> constructors;
+    private final List<MethodDefinition> methods;
+    private final List<ClassDeclaration> innerClasses;
+
+    public ClassDeclaration(String namespace, String className, List<FieldDeclaration> fields, List<ConstructorDeclaration> constructors, List<MethodDefinition> methods, List<ClassDeclaration> innerClasses) {
+        this.namespace = namespace;
+        this.className = className;
+        this.fields = fields;
+        this.constructors = constructors;
+        this.methods = methods;
+        this.innerClasses = innerClasses;
+    }
+
+    public String getNamespace() {
+        return namespace;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public List<FieldDeclaration> getFields() {
+        return fields;
+    }
+
+    public List<ConstructorDeclaration> getConstructors() {
+        return constructors;
+    }
+
+    public List<MethodDefinition> getMethods() {
+        return methods;
+    }
+
+    public List<ClassDeclaration> getInnerClasses() {
+        return innerClasses;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return null;
+    }
+
+    @Override public void write(Generator writer) {
+        writer.generateClass(this.namespace, this.className, this.fields, this.constructors, this.methods, innerClasses, true);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/CodeWriter.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/CodeWriter.java
index 955764d4d82..8bcb2a4f847 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/CodeWriter.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/CodeWriter.java
@@ -1,75 +1,75 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-import java.util.stream.IntStream;
-
-/**
- * Helper class to print code.
- */
-public class CodeWriter {
-
-    private StringBuffer buffer = new StringBuffer();
-    private int tabSize;
-
-    private int intendationLvl = 0;
-
-    public CodeWriter(int tabSize) {
-        this.tabSize = tabSize;
-    }
-
-    public void startBlock() {
-        this.intendationLvl += tabSize;
-    }
-
-    public void endBlock() {
-        if (intendationLvl < tabSize) {
-            throw new RuntimeException("Closing a Block which is not open!");
-        }
-        this.intendationLvl -= tabSize;
-    }
-
-    public void write(String s) {
-        buffer.append(s);
-    }
-
-    public void startLine(String s) {
-        writeIntendation();
-        write(s);
-    }
-
-    public void endLine() {
-        buffer.append("\n");
-    }
-
-    public void writeLine(String s) {
-        writeIntendation();
-        buffer.append(s);
-        buffer.append("\n");
-    }
-
-    private void writeIntendation() {
-        // Write the intendation
-        IntStream.range(0, intendationLvl).forEach(i -> buffer.append(" "));
-    }
-
-    public String getCode() {
-        return buffer.toString();
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+import java.util.stream.IntStream;
+
+/**
+ * Helper class to print code.
+ */
+public class CodeWriter {
+
+    private StringBuffer buffer = new StringBuffer();
+    private int tabSize;
+
+    private int intendationLvl = 0;
+
+    public CodeWriter(int tabSize) {
+        this.tabSize = tabSize;
+    }
+
+    public void startBlock() {
+        this.intendationLvl += tabSize;
+    }
+
+    public void endBlock() {
+        if (intendationLvl < tabSize) {
+            throw new RuntimeException("Closing a Block which is not open!");
+        }
+        this.intendationLvl -= tabSize;
+    }
+
+    public void write(String s) {
+        buffer.append(s);
+    }
+
+    public void startLine(String s) {
+        writeIntendation();
+        write(s);
+    }
+
+    public void endLine() {
+        buffer.append("\n");
+    }
+
+    public void writeLine(String s) {
+        writeIntendation();
+        buffer.append(s);
+        buffer.append("\n");
+    }
+
+    private void writeIntendation() {
+        // Write the intendation
+        IntStream.range(0, intendationLvl).forEach(i -> buffer.append(" "));
+    }
+
+    public String getCode() {
+        return buffer.toString();
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/ConstantExpression.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/ConstantExpression.java
index 36e9e026ebf..04a67931141 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/ConstantExpression.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/ConstantExpression.java
@@ -1,46 +1,46 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-public class ConstantExpression extends Expression {
-
-    private Object value;
-
-    ConstantExpression(TypeDefinition type, Object value) {
-        super(type);
-        this.value = value;
-    }
-
-    public ConstantExpression(Object value) {
-        this(TypeUtil.infer(value), value);
-    }
-
-    public Object getValue() {
-        return value;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-
-    @Override public void write(Generator generator) {
-        generator.generate(this);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+public class ConstantExpression extends Expression {
+
+    private Object value;
+
+    ConstantExpression(TypeDefinition type, Object value) {
+        super(type);
+        this.value = value;
+    }
+
+    public ConstantExpression(Object value) {
+        this(TypeUtil.infer(value), value);
+    }
+
+    public Object getValue() {
+        return value;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+
+    @Override public void write(Generator generator) {
+        generator.generate(this);
+    }
+
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/ConstructorDeclaration.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/ConstructorDeclaration.java
index fab7cccec43..38703dedbc5 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/ConstructorDeclaration.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/ConstructorDeclaration.java
@@ -1,41 +1,41 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-import java.util.List;
-import java.util.Set;
-
-public class ConstructorDeclaration extends MethodDefinition {
-
-    public ConstructorDeclaration(Set<Modifier> modifiers, List<ParameterExpression> parameters, Block body) {
-        super(modifiers, null, null, parameters, body);
-    }
-
-    public ConstructorDeclaration(List<ParameterExpression> parameters, Block body) {
-        super(null, null, parameters, body);
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return null;
-    }
-
-    @Override public void write(Generator writer) {
-        throw new UnsupportedOperationException("This should be called by the Class Implementor!");
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+import java.util.List;
+import java.util.Set;
+
+public class ConstructorDeclaration extends MethodDefinition {
+
+    public ConstructorDeclaration(Set<Modifier> modifiers, List<ParameterExpression> parameters, Block body) {
+        super(modifiers, null, null, parameters, body);
+    }
+
+    public ConstructorDeclaration(List<ParameterExpression> parameters, Block body) {
+        super(null, null, parameters, body);
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return null;
+    }
+
+    @Override public void write(Generator writer) {
+        throw new UnsupportedOperationException("This should be called by the Class Implementor!");
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/DeclarationStatement.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/DeclarationStatement.java
index 3ab9129d602..0f4b45eaccc 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/DeclarationStatement.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/DeclarationStatement.java
@@ -1,51 +1,51 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-public class DeclarationStatement extends Statement {
-
-    private final ParameterExpression parameterExpression;
-    private final Expression initializer;
-
-    DeclarationStatement(ParameterExpression parameterExpression, Expression initializer) {
-        this.parameterExpression = parameterExpression;
-        this.initializer = initializer;
-    }
-
-    public ParameterExpression getParameterExpression() {
-        return parameterExpression;
-    }
-
-    public Expression getInitializer() {
-        return initializer;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-
-    @Override public void write(Generator generator) {
-        if (initializer != null) {
-            generator.generateDeclarationWithInitializer(this);
-        } else {
-            generator.generateDeclaration(this);
-        }
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+public class DeclarationStatement extends Statement {
+
+    private final ParameterExpression parameterExpression;
+    private final Expression initializer;
+
+    DeclarationStatement(ParameterExpression parameterExpression, Expression initializer) {
+        this.parameterExpression = parameterExpression;
+        this.initializer = initializer;
+    }
+
+    public ParameterExpression getParameterExpression() {
+        return parameterExpression;
+    }
+
+    public Expression getInitializer() {
+        return initializer;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+
+    @Override public void write(Generator generator) {
+        if (initializer != null) {
+            generator.generateDeclarationWithInitializer(this);
+        } else {
+            generator.generateDeclaration(this);
+        }
+    }
+
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/ExceptionType.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/ExceptionType.java
index e0e43fb4d94..8d53a2889b4 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/ExceptionType.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/ExceptionType.java
@@ -1,40 +1,40 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-/**
- * Defines an Exception-Type.
- */
-public class ExceptionType extends TypeDefinition {
-
-    ExceptionType(String typeString) {
-        super(typeString);
-    }
-
-    @Override
-    public <T> T accept(NodeVisitor<T> visitor) {
-        return null;
-    }
-
-    @Override
-    public void write(Generator writer) {
-
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+/**
+ * Defines an Exception-Type.
+ */
+public class ExceptionType extends TypeDefinition {
+
+    ExceptionType(String typeString) {
+        super(typeString);
+    }
+
+    @Override
+    public <T> T accept(NodeVisitor<T> visitor) {
+        return null;
+    }
+
+    @Override
+    public void write(Generator writer) {
+
+    }
+
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Expression.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Expression.java
index 75ca2718eba..aeebb918243 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Expression.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Expression.java
@@ -1,27 +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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-public abstract class Expression extends AbstractNode {
-
-    protected Expression(TypeDefinition type) {
-        super(type);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+public abstract class Expression extends AbstractNode {
+
+    protected Expression(TypeDefinition type) {
+        super(type);
+    }
+
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Expressions.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Expressions.java
index cc9f50518f0..0acca890af1 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Expressions.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Expressions.java
@@ -1,324 +1,324 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * General Factory method to use for Code Generation.
- * Generally, the Structure which is generated by this class is a (incomplete) Abstact Syntax Tree
- * which covers a subset of things which is possible in many programming languages.
- * This tree is the basis for the generation of code in many languages which is performed by
- * the implementations of the {@link Generator} interface.
- *
- * In this sense the AST is Language Agnostic and should be seen as such. It is oriented at Java
- * as the whole thing is java based but is a bit more generic that it would need to be for java alone.
- * This is something to keep in mind.
- *
- * So some examples on how to implement some things with the AST.
- *
- * Variable Definition / Assignment
- * <code>
- *   Expressions.declaration("a", Primitive.DOUBLE)
- * </code>
- * is similar to
- * <code>
- *   Double a;
- * </code>
- * in java, or in Python
- * <code>
- *   a: float = None
- * </code>
- * (we use Type Hints) and Python cannot declare variables without initialization.
- *
- * Another thing is to initialize a variable with a constant value:
- * <code>
- *   Expressions.declaration("a", Expressions.constant(5.0))
- * </code>
- * this will lead (in Java) to
- * <code>
- *   Double a = 5.0;
- * </code>
- * The type is inferred for the constant expression from 5.0 and is then passed to the variable.
- * In Python this will become
- * <code>
- *   a: float = 5.0
- * </code>
- *
- * If Statement:
- * A more complex example with an if statement is
- * <code>
- *   Block.build()
- *      .add(Expressions.declaration("pi", Primitive.DOUBLE))
- *      .add(
- *          Expressions.ifElse(
- *             Expressions.binaryExpression(
- *                 Expressions.BOOLEAN,
- *                 Expressions.parameter("x", Primitive.DOUBLE),
- *                 Expressions.constant(5.0),
- *                 BinaryExpression.Operation.EQ
- *             ),
- *             Block.build().add(
- *                 Expressions.assignment(
- *                     Expressions.parameter("pi"),
- *                     Expressions.constant(3.141)
- *                 )
- *            )
- *      )
- *      .toBlock()
- * </code>
- * This could will transform to something like (in Java)
- * <code>
- *   Double pi;
- *   if (x == 5.0) {
- *     pi = 3.141;
- *   }
- * </code>
- *
- * More Examples of (complex) structures can be found, e.g., in the
- * {@link org.apache.plc4x.codegen.util.PojoFactory} or in the {@link org.apache.plc4x.codegen.util.EnumFactory}
- * which are "layers" on top of this AST whcih make it easier to create POJOs or ENUM-like constructs.
- * They define the class and all fields / methods / getters / setters and constructor and such stuff.
- *
- * @author julian
- */
-public class Expressions {
-
-    private Expressions() {
-        // do not instantiate
-    }
-
-    /**
-     * Assign a value to a target (field or parameter)
-     * @param target Where the value is assigned
-     * @param value What to assign
-     * @return Assignment Expression
-     */
-    public static Expression assignment(Expression target, Node value) {
-        return new AssignementExpression(target, value);
-    }
-
-    /**
-     * Base for all Binary Expression, i.e., Expressions which take
-     * two inputs and return one Output.
-     * Examples are Comparators, Math, ... .
-     * @param type Type of the returned expression
-     * @param left
-     * @param right
-     * @param op
-     * @return
-     */
-    public static Expression binaryExpression(TypeDefinition type, Node left, Node right, BinaryExpression.Operation op) {
-        return new BinaryExpression(type, left, right, op);
-    }
-
-    /**
-     * A Block of code.
-     * @param statements
-     * @return
-     */
-    public static Statement block(List<Node> statements) {
-        return new Block(statements);
-    }
-
-    /**
-     * A block of code.
-     * @param statements
-     * @return
-     */
-    public static Statement block(Node... statements) {
-        return new Block(statements);
-    }
-
-    /**
-     * Regular (dynamic) call.
-     * @param instance
-     * @param method
-     * @param arguments
-     */
-    public static Expression call(Node instance, Method method, Node... arguments) {
-        return new CallExpression(method, instance, arguments);
-    }
-
-    /**
-     * Static call (call to a static method)
-     * 
-     * TODO check if Method is static
-     * 
-     * @param method
-     * @param arguments
-     */
-    public static Expression staticCall(Method method, Node... arguments) {
-        return new CallExpression(method, null, arguments);
-    }
-
-    /**
-     * Simple if-then-else.
-     * If no else is needed, orElse can be null.
-     */
-    public static Statement ifElse(Expression condition, Block then, Block orElse) {
-        return new IfStatement(condition, then, orElse);
-    }
-
-    /**
-     * Simple if-then-else.
-     * If no else is needed, orElse can be null.
-     */
-    public static Statement ifElse(Expression condition, Block then) {
-        return new IfStatement(condition, then, null);
-    }
-
-    /**
-     * Conditional Statement of the form
-     * <code>
-     * if (cond1) {
-     *  ...
-     * } else if (cond2) {
-     *  ...
-     * } else {
-     *  ...
-     * }
-     * </code>
-     */
-    public static Statement conditionalStatement(List<Expression> condition, List<Block> blocks) {
-        return new IfStatement(condition, blocks);
-    }
-
-    /**
-     * Defines a compile time constant and infers the type based on what java would do.
-     */
-    public static Expression constant(Object value) {
-        return new ConstantExpression(value);
-    }
-
-    /**
-     * Define a compile time constant and also passes
-     * the expected type for usage in the code generation later.
-     */
-    public static Expression constant(TypeDefinition type, Object value) {
-        return new ConstantExpression(value);
-    }
-
-    /**
-     * Declares a constant (no field).
-     * Variable type is infered from the initializing expression.
-     */
-    public static Statement declaration(String variable, Expression initializer) {
-        return new DeclarationStatement(parameter(variable, initializer.getType()), initializer);
-    }
-
-    public static Statement declaration(ParameterExpression variable, Expression initializer) {
-        return new DeclarationStatement(variable, initializer);
-    }
-
-    /**
-     * Declares a constant (no field), which is not initialized.
-     */
-    public static Statement declaration(String variable, TypeDefinition type) {
-        return new DeclarationStatement(parameter(variable, type), null);
-    }
-
-    /**
-     * Reference to a field in the surrounding class.
-     */
-    public static Expression field(String name) {
-        return new FieldReference(UnknownType.INSTANCE, name);
-    }
-
-    /**
-     * Reference to a field on the given target
-     */
-    public static Expression field(Node target, String name) {
-        return new FieldReference(UnknownType.INSTANCE, name, target);
-    }
-
-    /**
-     * Adds a line of comment.
-     */
-    public static Node comment(String comment) {
-        return new LineComment(comment);
-    }
-
-    /**
-     * Simple call to a method which throws no exception and that stuff.
-     */
-    public static Expression call(Node target, String methodName, Node... arguments) {
-        return new CallExpression(
-            new Method(UnknownType.INSTANCE, methodName, UnknownType.INSTANCE,
-                Collections.<TypeDefinition>emptyList(), Collections.<ExceptionType>emptyList()),
-            target,
-            arguments
-        );
-    }
-
-    public static Expression call(Method method, Node target, Node... arguments) {
-        return new CallExpression(method, target, arguments);
-    }
-
-    /**
-     * Static call.
-     */
-    public static Expression call(Method method, Node... arguments) {
-        return new CallExpression(method, null, arguments);
-    }
-
-    /**
-     * Reference to a Method, similar than field-reference
-     * @return
-     */
-    public static Method method(TypeDefinition definingClass, String name, TypeDefinition returnType, List<TypeDefinition> parameterTypes, List<ExceptionType> exceptions) {
-        return new Method(definingClass, name, returnType, parameterTypes, exceptions);
-    }
-
-    /**
-     * References a variable.
-     */
-    public static ParameterExpression parameter(String name, TypeDefinition type) {
-        return new ParameterExpression(type, name);
-    }
-
-    /**
-     * New Instance of Class / Type.
-     */
-    public static Expression new_(TypeDefinition type, Node... arguments) {
-        return new NewExpression(type, arguments);
-    }
-
-    /**
-     * New Instance of Class / Type.
-     */
-    public static Expression new_(TypeDefinition type, List<Node> arguments) {
-        return new NewExpression(type, arguments);
-    }
-
-    /**
-     * Return Statements.
-     */
-    public static ReturnStatement return_(Expression value) {
-        return new ReturnStatement(value);
-    }
-
-    /**
-     * Declares a Class as type.
-     */
-    public static TypeDefinition typeOf(String className) {
-        return new TypeDefinition(className);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * General Factory method to use for Code Generation.
+ * Generally, the Structure which is generated by this class is a (incomplete) Abstact Syntax Tree
+ * which covers a subset of things which is possible in many programming languages.
+ * This tree is the basis for the generation of code in many languages which is performed by
+ * the implementations of the {@link Generator} interface.
+ *
+ * In this sense the AST is Language Agnostic and should be seen as such. It is oriented at Java
+ * as the whole thing is java based but is a bit more generic that it would need to be for java alone.
+ * This is something to keep in mind.
+ *
+ * So some examples on how to implement some things with the AST.
+ *
+ * Variable Definition / Assignment
+ * <code>
+ *   Expressions.declaration("a", Primitive.DOUBLE)
+ * </code>
+ * is similar to
+ * <code>
+ *   Double a;
+ * </code>
+ * in java, or in Python
+ * <code>
+ *   a: float = None
+ * </code>
+ * (we use Type Hints) and Python cannot declare variables without initialization.
+ *
+ * Another thing is to initialize a variable with a constant value:
+ * <code>
+ *   Expressions.declaration("a", Expressions.constant(5.0))
+ * </code>
+ * this will lead (in Java) to
+ * <code>
+ *   Double a = 5.0;
+ * </code>
+ * The type is inferred for the constant expression from 5.0 and is then passed to the variable.
+ * In Python this will become
+ * <code>
+ *   a: float = 5.0
+ * </code>
+ *
+ * If Statement:
+ * A more complex example with an if statement is
+ * <code>
+ *   Block.build()
+ *      .add(Expressions.declaration("pi", Primitive.DOUBLE))
+ *      .add(
+ *          Expressions.ifElse(
+ *             Expressions.binaryExpression(
+ *                 Expressions.BOOLEAN,
+ *                 Expressions.parameter("x", Primitive.DOUBLE),
+ *                 Expressions.constant(5.0),
+ *                 BinaryExpression.Operation.EQ
+ *             ),
+ *             Block.build().add(
+ *                 Expressions.assignment(
+ *                     Expressions.parameter("pi"),
+ *                     Expressions.constant(3.141)
+ *                 )
+ *            )
+ *      )
+ *      .toBlock()
+ * </code>
+ * This could will transform to something like (in Java)
+ * <code>
+ *   Double pi;
+ *   if (x == 5.0) {
+ *     pi = 3.141;
+ *   }
+ * </code>
+ *
+ * More Examples of (complex) structures can be found, e.g., in the
+ * {@link org.apache.plc4x.codegen.util.PojoFactory} or in the {@link org.apache.plc4x.codegen.util.EnumFactory}
+ * which are "layers" on top of this AST whcih make it easier to create POJOs or ENUM-like constructs.
+ * They define the class and all fields / methods / getters / setters and constructor and such stuff.
+ *
+ * @author julian
+ */
+public class Expressions {
+
+    private Expressions() {
+        // do not instantiate
+    }
+
+    /**
+     * Assign a value to a target (field or parameter)
+     * @param target Where the value is assigned
+     * @param value What to assign
+     * @return Assignment Expression
+     */
+    public static Expression assignment(Expression target, Node value) {
+        return new AssignementExpression(target, value);
+    }
+
+    /**
+     * Base for all Binary Expression, i.e., Expressions which take
+     * two inputs and return one Output.
+     * Examples are Comparators, Math, ... .
+     * @param type Type of the returned expression
+     * @param left
+     * @param right
+     * @param op
+     * @return
+     */
+    public static Expression binaryExpression(TypeDefinition type, Node left, Node right, BinaryExpression.Operation op) {
+        return new BinaryExpression(type, left, right, op);
+    }
+
+    /**
+     * A Block of code.
+     * @param statements
+     * @return
+     */
+    public static Statement block(List<Node> statements) {
+        return new Block(statements);
+    }
+
+    /**
+     * A block of code.
+     * @param statements
+     * @return
+     */
+    public static Statement block(Node... statements) {
+        return new Block(statements);
+    }
+
+    /**
+     * Regular (dynamic) call.
+     * @param instance
+     * @param method
+     * @param arguments
+     */
+    public static Expression call(Node instance, Method method, Node... arguments) {
+        return new CallExpression(method, instance, arguments);
+    }
+
+    /**
+     * Static call (call to a static method)
+     * 
+     * TODO check if Method is static
+     * 
+     * @param method
+     * @param arguments
+     */
+    public static Expression staticCall(Method method, Node... arguments) {
+        return new CallExpression(method, null, arguments);
+    }
+
+    /**
+     * Simple if-then-else.
+     * If no else is needed, orElse can be null.
+     */
+    public static Statement ifElse(Expression condition, Block then, Block orElse) {
+        return new IfStatement(condition, then, orElse);
+    }
+
+    /**
+     * Simple if-then-else.
+     * If no else is needed, orElse can be null.
+     */
+    public static Statement ifElse(Expression condition, Block then) {
+        return new IfStatement(condition, then, null);
+    }
+
+    /**
+     * Conditional Statement of the form
+     * <code>
+     * if (cond1) {
+     *  ...
+     * } else if (cond2) {
+     *  ...
+     * } else {
+     *  ...
+     * }
+     * </code>
+     */
+    public static Statement conditionalStatement(List<Expression> condition, List<Block> blocks) {
+        return new IfStatement(condition, blocks);
+    }
+
+    /**
+     * Defines a compile time constant and infers the type based on what java would do.
+     */
+    public static Expression constant(Object value) {
+        return new ConstantExpression(value);
+    }
+
+    /**
+     * Define a compile time constant and also passes
+     * the expected type for usage in the code generation later.
+     */
+    public static Expression constant(TypeDefinition type, Object value) {
+        return new ConstantExpression(value);
+    }
+
+    /**
+     * Declares a constant (no field).
+     * Variable type is infered from the initializing expression.
+     */
+    public static Statement declaration(String variable, Expression initializer) {
+        return new DeclarationStatement(parameter(variable, initializer.getType()), initializer);
+    }
+
+    public static Statement declaration(ParameterExpression variable, Expression initializer) {
+        return new DeclarationStatement(variable, initializer);
+    }
+
+    /**
+     * Declares a constant (no field), which is not initialized.
+     */
+    public static Statement declaration(String variable, TypeDefinition type) {
+        return new DeclarationStatement(parameter(variable, type), null);
+    }
+
+    /**
+     * Reference to a field in the surrounding class.
+     */
+    public static Expression field(String name) {
+        return new FieldReference(UnknownType.INSTANCE, name);
+    }
+
+    /**
+     * Reference to a field on the given target
+     */
+    public static Expression field(Node target, String name) {
+        return new FieldReference(UnknownType.INSTANCE, name, target);
+    }
+
+    /**
+     * Adds a line of comment.
+     */
+    public static Node comment(String comment) {
+        return new LineComment(comment);
+    }
+
+    /**
+     * Simple call to a method which throws no exception and that stuff.
+     */
+    public static Expression call(Node target, String methodName, Node... arguments) {
+        return new CallExpression(
+            new Method(UnknownType.INSTANCE, methodName, UnknownType.INSTANCE,
+                Collections.<TypeDefinition>emptyList(), Collections.<ExceptionType>emptyList()),
+            target,
+            arguments
+        );
+    }
+
+    public static Expression call(Method method, Node target, Node... arguments) {
+        return new CallExpression(method, target, arguments);
+    }
+
+    /**
+     * Static call.
+     */
+    public static Expression call(Method method, Node... arguments) {
+        return new CallExpression(method, null, arguments);
+    }
+
+    /**
+     * Reference to a Method, similar than field-reference
+     * @return
+     */
+    public static Method method(TypeDefinition definingClass, String name, TypeDefinition returnType, List<TypeDefinition> parameterTypes, List<ExceptionType> exceptions) {
+        return new Method(definingClass, name, returnType, parameterTypes, exceptions);
+    }
+
+    /**
+     * References a variable.
+     */
+    public static ParameterExpression parameter(String name, TypeDefinition type) {
+        return new ParameterExpression(type, name);
+    }
+
+    /**
+     * New Instance of Class / Type.
+     */
+    public static Expression new_(TypeDefinition type, Node... arguments) {
+        return new NewExpression(type, arguments);
+    }
+
+    /**
+     * New Instance of Class / Type.
+     */
+    public static Expression new_(TypeDefinition type, List<Node> arguments) {
+        return new NewExpression(type, arguments);
+    }
+
+    /**
+     * Return Statements.
+     */
+    public static ReturnStatement return_(Expression value) {
+        return new ReturnStatement(value);
+    }
+
+    /**
+     * Declares a Class as type.
+     */
+    public static TypeDefinition typeOf(String className) {
+        return new TypeDefinition(className);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/FieldDeclaration.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/FieldDeclaration.java
index 426dabbacdd..988064db322 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/FieldDeclaration.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/FieldDeclaration.java
@@ -1,56 +1,56 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-public class FieldDeclaration implements Node {
-
-    private final Set<Modifier> modifiers;
-    private final TypeDefinition type;
-    private final String name;
-
-    private final Expression initializer;
-
-    public FieldDeclaration(Set<Modifier> modifiers, TypeDefinition type, String name, Expression initializer) {
-        this.modifiers = modifiers;
-        this.type = type;
-        this.name = name;
-        this.initializer = initializer;
-    }
-
-    public FieldDeclaration(TypeDefinition type, String name) {
-        this(Collections.emptySet(), type, name, null);
-    }
-
-    public FieldDeclaration(TypeDefinition type, String name, Modifier... modifiers) {
-        this(new HashSet<>(Arrays.asList(modifiers)), type, name, null);
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return null;
-    }
-
-    @Override public void write(Generator writer) {
-        writer.generateFieldDeclaration(modifiers, type, name, initializer);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+public class FieldDeclaration implements Node {
+
+    private final Set<Modifier> modifiers;
+    private final TypeDefinition type;
+    private final String name;
+
+    private final Expression initializer;
+
+    public FieldDeclaration(Set<Modifier> modifiers, TypeDefinition type, String name, Expression initializer) {
+        this.modifiers = modifiers;
+        this.type = type;
+        this.name = name;
+        this.initializer = initializer;
+    }
+
+    public FieldDeclaration(TypeDefinition type, String name) {
+        this(Collections.emptySet(), type, name, null);
+    }
+
+    public FieldDeclaration(TypeDefinition type, String name, Modifier... modifiers) {
+        this(new HashSet<>(Arrays.asList(modifiers)), type, name, null);
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return null;
+    }
+
+    @Override public void write(Generator writer) {
+        writer.generateFieldDeclaration(modifiers, type, name, initializer);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/FieldReference.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/FieldReference.java
index d96c37c0286..bc88501912a 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/FieldReference.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/FieldReference.java
@@ -1,44 +1,44 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-public class FieldReference extends ParameterExpression {
-
-    private final Node target;
-
-    /**
-     * if target == null, reference on a field in the surrounding class ("this")
-     */
-    FieldReference(TypeDefinition type, String name, Node target) {
-        super(type, name);
-        this.target = target;
-    }
-
-    FieldReference(TypeDefinition type, String name) {
-        this(type, name, null);
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return null;
-    }
-
-    @Override public void write(Generator writer) {
-        writer.generateFieldReference(type, getName());
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+public class FieldReference extends ParameterExpression {
+
+    private final Node target;
+
+    /**
+     * if target == null, reference on a field in the surrounding class ("this")
+     */
+    FieldReference(TypeDefinition type, String name, Node target) {
+        super(type, name);
+        this.target = target;
+    }
+
+    FieldReference(TypeDefinition type, String name) {
+        this(type, name, null);
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return null;
+    }
+
+    @Override public void write(Generator writer) {
+        writer.generateFieldReference(type, getName());
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/FileNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/FileNode.java
index 390697999f1..d503d4f4e23 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/FileNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/FileNode.java
@@ -1,43 +1,43 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-import java.util.List;
-
-/**
- * Defines a File in Java
- */
-public class FileNode implements Node {
-
-    private final ClassDeclaration mainClass;
-    private final List<ClassDeclaration> innerClasses;
-
-    public FileNode(ClassDeclaration mainClass, List<ClassDeclaration> innerClasses) {
-        this.mainClass = mainClass;
-        this.innerClasses = innerClasses;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return null;
-    }
-
-    @Override public void write(Generator writer) {
-        writer.generateFile(mainClass, innerClasses);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+import java.util.List;
+
+/**
+ * Defines a File in Java
+ */
+public class FileNode implements Node {
+
+    private final ClassDeclaration mainClass;
+    private final List<ClassDeclaration> innerClasses;
+
+    public FileNode(ClassDeclaration mainClass, List<ClassDeclaration> innerClasses) {
+        this.mainClass = mainClass;
+        this.innerClasses = innerClasses;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return null;
+    }
+
+    @Override public void write(Generator writer) {
+        writer.generateFile(mainClass, innerClasses);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Generator.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Generator.java
index d725c1be297..3be1c44ec43 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Generator.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Generator.java
@@ -1,76 +1,76 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-import java.util.List;
-import java.util.Set;
-
-public interface Generator {
-
-    /**
-     * Do preliminary stuff.
-     * @param root .
-     * @return .
-     */
-    Node prepare(Node root);
-
-    void generate(ConstantExpression constantExpression);
-
-    void generateDeclarationWithInitializer(DeclarationStatement declarationStatement);
-
-    void generateDeclaration(DeclarationStatement declarationStatement);
-
-    void generate(ParameterExpression parameterExpression);
-
-    void generatePrimitive(Primitive.DataType primitive);
-
-    void generate(IfStatement ifStatement);
-
-    void writeBlock(Block statements);
-
-    void generate(BinaryExpression binaryExpression);
-
-    void generate(AssignementExpression assignementExpression);
-
-    void generateStaticCall(Method method, List<Node> constantNode);
-
-    void generateCall(Node target, Method method, List<Node> constantNode);
-
-    void generate(NewExpression newExpression);
-
-    void generate(MethodDefinition methodDefinition);
-
-    void generateReturn(Expression value);
-
-    void generateClass(String namespace, String className, List<FieldDeclaration> fields, List<ConstructorDeclaration> constructors, List<MethodDefinition> methods, List<ClassDeclaration> innerClasses, boolean mainClass);
-
-    void generateFieldDeclaration(Set<Modifier> modifiers, TypeDefinition type, String name, Expression initializer);
-
-    void generateFieldReference(TypeDefinition type, String name);
-
-    void generateConstructor(Set<Modifier> modifiers, String className, List<ParameterExpression> parameters, Block body);
-
-    void generateFile(ClassDeclaration mainClass, List<ClassDeclaration> innerClasses);
-
-    void generateType(String typeString);
-
-    void generateComment(String comment);
-
-    void generateNoOp();
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+import java.util.List;
+import java.util.Set;
+
+public interface Generator {
+
+    /**
+     * Do preliminary stuff.
+     * @param root .
+     * @return .
+     */
+    Node prepare(Node root);
+
+    void generate(ConstantExpression constantExpression);
+
+    void generateDeclarationWithInitializer(DeclarationStatement declarationStatement);
+
+    void generateDeclaration(DeclarationStatement declarationStatement);
+
+    void generate(ParameterExpression parameterExpression);
+
+    void generatePrimitive(Primitive.DataType primitive);
+
+    void generate(IfStatement ifStatement);
+
+    void writeBlock(Block statements);
+
+    void generate(BinaryExpression binaryExpression);
+
+    void generate(AssignementExpression assignementExpression);
+
+    void generateStaticCall(Method method, List<Node> constantNode);
+
+    void generateCall(Node target, Method method, List<Node> constantNode);
+
+    void generate(NewExpression newExpression);
+
+    void generate(MethodDefinition methodDefinition);
+
+    void generateReturn(Expression value);
+
+    void generateClass(String namespace, String className, List<FieldDeclaration> fields, List<ConstructorDeclaration> constructors, List<MethodDefinition> methods, List<ClassDeclaration> innerClasses, boolean mainClass);
+
+    void generateFieldDeclaration(Set<Modifier> modifiers, TypeDefinition type, String name, Expression initializer);
+
+    void generateFieldReference(TypeDefinition type, String name);
+
+    void generateConstructor(Set<Modifier> modifiers, String className, List<ParameterExpression> parameters, Block body);
+
+    void generateFile(ClassDeclaration mainClass, List<ClassDeclaration> innerClasses);
+
+    void generateType(String typeString);
+
+    void generateComment(String comment);
+
+    void generateNoOp();
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/IfStatement.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/IfStatement.java
index 51e85e733e2..1fcb169a5cc 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/IfStatement.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/IfStatement.java
@@ -1,60 +1,60 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class IfStatement extends Statement {
-
-    private List<Expression> condition;
-    private List<Block> blocks;
-
-    IfStatement(Expression condition, Block body, Block orElse) {
-        this.condition = Arrays.asList(condition);
-        if (orElse == null) {
-            this.blocks = Arrays.asList(body);
-        } else {
-            this.blocks = Arrays.asList(body, orElse);
-        }
-    }
-
-    IfStatement(List<Expression> condition, List<Block> blocks) {
-        assert condition.size() == blocks.size() || condition.size() == (blocks.size() -1);
-        this.condition = condition;
-        this.blocks = blocks;
-    }
-
-    public List<Expression> getConditions() {
-        return condition;
-    }
-
-    public List<Block> getBlocks() {
-        return blocks;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return null;
-    }
-
-    @Override public void write(Generator writer) {
-        writer.generate(this);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class IfStatement extends Statement {
+
+    private List<Expression> condition;
+    private List<Block> blocks;
+
+    IfStatement(Expression condition, Block body, Block orElse) {
+        this.condition = Arrays.asList(condition);
+        if (orElse == null) {
+            this.blocks = Arrays.asList(body);
+        } else {
+            this.blocks = Arrays.asList(body, orElse);
+        }
+    }
+
+    IfStatement(List<Expression> condition, List<Block> blocks) {
+        assert condition.size() == blocks.size() || condition.size() == (blocks.size() -1);
+        this.condition = condition;
+        this.blocks = blocks;
+    }
+
+    public List<Expression> getConditions() {
+        return condition;
+    }
+
+    public List<Block> getBlocks() {
+        return blocks;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return null;
+    }
+
+    @Override public void write(Generator writer) {
+        writer.generate(this);
+    }
+
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/JavaGenerator.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/JavaGenerator.java
index da87f908049..71a90c3233f 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/JavaGenerator.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/JavaGenerator.java
@@ -1,328 +1,328 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-import java.util.List;
-import java.util.Set;
-
-public class JavaGenerator implements Generator {
-
-    public static final String PUBLIC_ = "public ";
-    public static final String STATIC_ = "static ";
-    private final CodeWriter writer;
-
-    public JavaGenerator(CodeWriter writer) {
-        this.writer = writer;
-    }
-
-    @Override public Node prepare(Node root) {
-        return root;
-    }
-
-    @Override public void generate(ConstantExpression constantExpression) {
-        writer.write(constantExpression.getValue().toString());
-    }
-
-    @Override public void generateDeclarationWithInitializer(DeclarationStatement declarationStatement) {
-        declarationStatement.getParameterExpression().getType().write(this);
-        writer.write(" ");
-        declarationStatement.getParameterExpression().write(this);
-        writer.write(" = ");
-        declarationStatement.getInitializer().write(this);
-    }
-
-    @Override public void generateDeclaration(DeclarationStatement declarationStatement) {
-        declarationStatement.getParameterExpression().getType().write(this);
-        writer.write(" ");
-        declarationStatement.getParameterExpression().write(this);
-    }
-
-    @Override public void generate(ParameterExpression parameterExpression) {
-        writer.write(parameterExpression.getName());
-    }
-
-    @Override public void generatePrimitive(Primitive.DataType primitive) {
-        switch (primitive) {
-            case STRING:
-                writer.write("String");
-                break;
-            case DOUBLE:
-                writer.write("Double");
-                break;
-            case LONG:
-                writer.write("Long");
-                break;
-            case INTEGER:
-                writer.write("Integer");
-                break;
-            case BOOLEAN:
-                writer.write("Boolean");
-                break;
-            case VOID:
-                writer.write("Void");
-                break;
-            default:
-                throw new UnsupportedOperationException("The primitive type " + primitive + " is not implemented!");
-        }
-    }
-
-    @Override public void generate(IfStatement ifStatement) {
-        writer.startLine("if (");
-        ifStatement.getConditions().get(0).write(this);
-        writer.write(") {\n");
-        writeBlock(ifStatement.getBlocks().get(0));
-        // For each remaining condition to an else if
-        for (int i = 1; i < ifStatement.getConditions().size(); i++) {
-            writer.startLine("} else if (");
-            ifStatement.getConditions().get(i).write(this);
-            writer.write(") {\n");
-            writeBlock(ifStatement.getBlocks().get(i));
-        }
-        if (ifStatement.getBlocks().size() == ifStatement.getConditions().size() + 1) {
-            writer.writeLine("} else {");
-            writeBlock(ifStatement.getBlocks().get(ifStatement.getBlocks().size() - 1));
-        }
-        writer.writeLine("}");
-    }
-
-    @Override public void writeBlock(Block statements) {
-        if (statements == null) {
-            return;
-        }
-        writer.startBlock();
-        for (Node statement : statements.getStatements()) {
-            // Dont to the wrapping for If Statements
-            if (statement instanceof IfStatement) {
-                statement.write(this);
-            } else {
-                writer.startLine("");
-                statement.write(this);
-                writer.write(";");
-                writer.endLine();
-            }
-        }
-        writer.endBlock();
-    }
-
-    @Override public void generate(BinaryExpression binaryExpression) {
-        binaryExpression.getLeft().write(this);
-        writer.write(" ");
-        writer.write(getOperator(binaryExpression.getOp()));
-        writer.write(" ");
-        binaryExpression.getRight().write(this);
-    }
-
-    @Override public void generate(AssignementExpression assignementExpression) {
-        assignementExpression.getTarget().write(this);
-        writer.write(" = ");
-        assignementExpression.getValue().write(this);
-    }
-
-    @Override public void generateStaticCall(Method method, List<Node> arguments) {
-        writer.write(method.getType().getTypeString());
-        writer.write(".");
-        writer.write(method.getName());
-        writer.write("(");
-        generateArgumentList(arguments);
-        writer.write(")");
-    }
-
-    private void generateArgumentList(List<Node> arguments) {
-        for (int i = 0; i < arguments.size(); i++) {
-            arguments.get(i).write(this);
-            if (i < arguments.size() - 1) {
-                writer.write(", ");
-            }
-        }
-    }
-
-    @Override public void generateCall(Node target, Method method, List<Node> arguments) {
-        target.write(this);
-        writer.write(".");
-        writer.write(method.getName());
-        writer.write("(");
-        generateArgumentList(arguments);
-        writer.write(")");
-    }
-
-    @Override public void generate(NewExpression newExpression) {
-        writer.write("new ");
-        newExpression.getType().write(this);
-        writer.write("(");
-        generateArgumentList(newExpression.getArguments());
-        writer.write(")");
-    }
-
-    @Override public void generate(MethodDefinition methodDefinition) {
-        writer.startLine(PUBLIC_);
-        if (methodDefinition.getModifiers().contains(Modifier.STATIC)) {
-            writer.write(STATIC_);
-        }
-        // Special handling of VOID is necessary, to avoid having to return null in the end.
-        if (methodDefinition.getResultType() instanceof Primitive &&
-            ((Primitive) methodDefinition.getResultType()).getType() == Primitive.DataType.VOID) {
-            writer.write("void");
-        } else {
-            methodDefinition.getResultType().write(this);
-        }
-        writer.write(" ");
-        writer.write(methodDefinition.getName());
-        writer.write("(");
-        for (int i = 0; i < methodDefinition.getParameters().size(); i++) {
-            methodDefinition.getParameters().get(i).getType().write(this);
-            writer.write(" ");
-            methodDefinition.getParameters().get(i).write(this);
-            if (i < methodDefinition.getParameters().size() - 1) {
-                writer.write(", ");
-            }
-        }
-        writer.write(") {");
-        writer.endLine();
-        methodDefinition.getBody().write(this);
-        writer.writeLine("}");
-    }
-
-    @Override public void generateReturn(Expression value) {
-        writer.write("return ");
-        value.write(this);
-    }
-
-    @Override public void generateClass(String namespace, String className, List<FieldDeclaration> fields, List<ConstructorDeclaration> constructors, List<MethodDefinition> methods, List<ClassDeclaration> innerClasses, boolean mainClass) {
-        // Add static?!
-        // Own File?
-        writer.startLine(PUBLIC_);
-        if (!mainClass) {
-            writer.write(STATIC_);
-        }
-        writer.write("class ");
-        writer.write(className);
-        // TODO extends / implements
-        writer.write(" {");
-        writer.endLine();
-        writer.startBlock();
-
-        writer.writeLine("");
-        // Fields
-        for (FieldDeclaration field : fields) {
-            field.write(this);
-            writer.writeLine("");
-        }
-
-        // Constructors
-        if (constructors != null) {
-            for (ConstructorDeclaration constructor : constructors) {
-                this.generateConstructor(constructor.getModifiers(), className, constructor.getParameters(), constructor.getBody());
-                writer.writeLine("");
-            }
-        }
-
-        // Methods
-        for (MethodDefinition method : methods) {
-            method.write(this);
-            writer.writeLine("");
-        }
-
-        // If there are inner classes, implement them
-        if (innerClasses != null) {
-            for (ClassDeclaration innerClass : innerClasses) {
-                this.generateClass(innerClass.getNamespace(), innerClass.getClassName(), innerClass.getFields(), innerClass.getConstructors(), innerClass.getMethods(), innerClass.getInnerClasses(), false);
-            }
-        }
-
-        writer.endBlock();
-        writer.writeLine("}");
-    }
-
-    @Override public void generateFieldDeclaration(Set<Modifier> modifiers, TypeDefinition type, String name, Expression initializer) {
-        if (modifiers.contains(Modifier.PRIVATE)) {
-            writer.startLine("private ");
-        } else {
-            writer.startLine(PUBLIC_);
-        }
-        if (modifiers.contains(Modifier.STATIC)) {
-            writer.write(STATIC_);
-        }
-        if (modifiers.contains(Modifier.FINAL)) {
-            writer.write("final ");
-        }
-        type.write(this);
-        writer.write(" ");
-        writer.write(name);
-        // If it has an initializer, then do it here...
-        if (initializer != null) {
-            writer.write( " = ");
-            initializer.write(this);
-        }
-        writer.write(";");
-        writer.endLine();
-    }
-
-    @Override public void generateFieldReference(TypeDefinition type, String name) {
-        writer.write("this.");
-        writer.write(name);
-    }
-
-    @Override public void generateConstructor(Set<Modifier> modifiers, String className, List<ParameterExpression> parameters, Block body) {
-        if (modifiers.contains(Modifier.PRIVATE)) {
-            writer.startLine("private ");
-        } else {
-            writer.startLine(PUBLIC_);
-        }
-        writer.write(className);
-        writer.write("(");
-        for (int i = 0; i < parameters.size(); i++) {
-            parameters.get(i).getType().write(this);
-            writer.write(" ");
-            parameters.get(i).write(this);
-            if (i < parameters.size() - 1) {
-                writer.write(", ");
-            }
-        }
-        writer.write(") {");
-        writer.endLine();
-        body.write(this);
-        writer.writeLine("}");
-    }
-
-    @Override public void generateFile(ClassDeclaration mainClass, List<ClassDeclaration> innerClasses) {
-        generateClass(mainClass.getNamespace(), mainClass.getClassName(), mainClass.getFields(), mainClass.getConstructors(), mainClass.getMethods(), innerClasses, true);
-    }
-
-    @Override public void generateType(String typeString) {
-        writer.write(typeString);
-    }
-
-    @Override public void generateComment(String comment) {
-        writer.writeLine("// " + comment);
-    }
-
-    @Override public void generateNoOp() {
-        writer.write(";");
-    }
-
-    private String getOperator(BinaryExpression.Operation op) {
-        switch (op) {
-            case EQ:
-                return "==";
-            case PLUS:
-                return "+";
-        }
-        throw new UnsupportedOperationException("The Operator " + op + " is currently not implemented!");
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+import java.util.List;
+import java.util.Set;
+
+public class JavaGenerator implements Generator {
+
+    public static final String PUBLIC_ = "public ";
+    public static final String STATIC_ = "static ";
+    private final CodeWriter writer;
+
+    public JavaGenerator(CodeWriter writer) {
+        this.writer = writer;
+    }
+
+    @Override public Node prepare(Node root) {
+        return root;
+    }
+
+    @Override public void generate(ConstantExpression constantExpression) {
+        writer.write(constantExpression.getValue().toString());
+    }
+
+    @Override public void generateDeclarationWithInitializer(DeclarationStatement declarationStatement) {
+        declarationStatement.getParameterExpression().getType().write(this);
+        writer.write(" ");
+        declarationStatement.getParameterExpression().write(this);
+        writer.write(" = ");
+        declarationStatement.getInitializer().write(this);
+    }
+
+    @Override public void generateDeclaration(DeclarationStatement declarationStatement) {
+        declarationStatement.getParameterExpression().getType().write(this);
+        writer.write(" ");
+        declarationStatement.getParameterExpression().write(this);
+    }
+
+    @Override public void generate(ParameterExpression parameterExpression) {
+        writer.write(parameterExpression.getName());
+    }
+
+    @Override public void generatePrimitive(Primitive.DataType primitive) {
+        switch (primitive) {
+            case STRING:
+                writer.write("String");
+                break;
+            case DOUBLE:
+                writer.write("Double");
+                break;
+            case LONG:
+                writer.write("Long");
+                break;
+            case INTEGER:
+                writer.write("Integer");
+                break;
+            case BOOLEAN:
+                writer.write("Boolean");
+                break;
+            case VOID:
+                writer.write("Void");
+                break;
+            default:
+                throw new UnsupportedOperationException("The primitive type " + primitive + " is not implemented!");
+        }
+    }
+
+    @Override public void generate(IfStatement ifStatement) {
+        writer.startLine("if (");
+        ifStatement.getConditions().get(0).write(this);
+        writer.write(") {\n");
+        writeBlock(ifStatement.getBlocks().get(0));
+        // For each remaining condition to an else if
+        for (int i = 1; i < ifStatement.getConditions().size(); i++) {
+            writer.startLine("} else if (");
+            ifStatement.getConditions().get(i).write(this);
+            writer.write(") {\n");
+            writeBlock(ifStatement.getBlocks().get(i));
+        }
+        if (ifStatement.getBlocks().size() == ifStatement.getConditions().size() + 1) {
+            writer.writeLine("} else {");
+            writeBlock(ifStatement.getBlocks().get(ifStatement.getBlocks().size() - 1));
+        }
+        writer.writeLine("}");
+    }
+
+    @Override public void writeBlock(Block statements) {
+        if (statements == null) {
+            return;
+        }
+        writer.startBlock();
+        for (Node statement : statements.getStatements()) {
+            // Dont to the wrapping for If Statements
+            if (statement instanceof IfStatement) {
+                statement.write(this);
+            } else {
+                writer.startLine("");
+                statement.write(this);
+                writer.write(";");
+                writer.endLine();
+            }
+        }
+        writer.endBlock();
+    }
+
+    @Override public void generate(BinaryExpression binaryExpression) {
+        binaryExpression.getLeft().write(this);
+        writer.write(" ");
+        writer.write(getOperator(binaryExpression.getOp()));
+        writer.write(" ");
+        binaryExpression.getRight().write(this);
+    }
+
+    @Override public void generate(AssignementExpression assignementExpression) {
+        assignementExpression.getTarget().write(this);
+        writer.write(" = ");
+        assignementExpression.getValue().write(this);
+    }
+
+    @Override public void generateStaticCall(Method method, List<Node> arguments) {
+        writer.write(method.getType().getTypeString());
+        writer.write(".");
+        writer.write(method.getName());
+        writer.write("(");
+        generateArgumentList(arguments);
+        writer.write(")");
+    }
+
+    private void generateArgumentList(List<Node> arguments) {
+        for (int i = 0; i < arguments.size(); i++) {
+            arguments.get(i).write(this);
+            if (i < arguments.size() - 1) {
+                writer.write(", ");
+            }
+        }
+    }
+
+    @Override public void generateCall(Node target, Method method, List<Node> arguments) {
+        target.write(this);
+        writer.write(".");
+        writer.write(method.getName());
+        writer.write("(");
+        generateArgumentList(arguments);
+        writer.write(")");
+    }
+
+    @Override public void generate(NewExpression newExpression) {
+        writer.write("new ");
+        newExpression.getType().write(this);
+        writer.write("(");
+        generateArgumentList(newExpression.getArguments());
+        writer.write(")");
+    }
+
+    @Override public void generate(MethodDefinition methodDefinition) {
+        writer.startLine(PUBLIC_);
+        if (methodDefinition.getModifiers().contains(Modifier.STATIC)) {
+            writer.write(STATIC_);
+        }
+        // Special handling of VOID is necessary, to avoid having to return null in the end.
+        if (methodDefinition.getResultType() instanceof Primitive &&
+            ((Primitive) methodDefinition.getResultType()).getType() == Primitive.DataType.VOID) {
+            writer.write("void");
+        } else {
+            methodDefinition.getResultType().write(this);
+        }
+        writer.write(" ");
+        writer.write(methodDefinition.getName());
+        writer.write("(");
+        for (int i = 0; i < methodDefinition.getParameters().size(); i++) {
+            methodDefinition.getParameters().get(i).getType().write(this);
+            writer.write(" ");
+            methodDefinition.getParameters().get(i).write(this);
+            if (i < methodDefinition.getParameters().size() - 1) {
+                writer.write(", ");
+            }
+        }
+        writer.write(") {");
+        writer.endLine();
+        methodDefinition.getBody().write(this);
+        writer.writeLine("}");
+    }
+
+    @Override public void generateReturn(Expression value) {
+        writer.write("return ");
+        value.write(this);
+    }
+
+    @Override public void generateClass(String namespace, String className, List<FieldDeclaration> fields, List<ConstructorDeclaration> constructors, List<MethodDefinition> methods, List<ClassDeclaration> innerClasses, boolean mainClass) {
+        // Add static?!
+        // Own File?
+        writer.startLine(PUBLIC_);
+        if (!mainClass) {
+            writer.write(STATIC_);
+        }
+        writer.write("class ");
+        writer.write(className);
+        // TODO extends / implements
+        writer.write(" {");
+        writer.endLine();
+        writer.startBlock();
+
+        writer.writeLine("");
+        // Fields
+        for (FieldDeclaration field : fields) {
+            field.write(this);
+            writer.writeLine("");
+        }
+
+        // Constructors
+        if (constructors != null) {
+            for (ConstructorDeclaration constructor : constructors) {
+                this.generateConstructor(constructor.getModifiers(), className, constructor.getParameters(), constructor.getBody());
+                writer.writeLine("");
+            }
+        }
+
+        // Methods
+        for (MethodDefinition method : methods) {
+            method.write(this);
+            writer.writeLine("");
+        }
+
+        // If there are inner classes, implement them
+        if (innerClasses != null) {
+            for (ClassDeclaration innerClass : innerClasses) {
+                this.generateClass(innerClass.getNamespace(), innerClass.getClassName(), innerClass.getFields(), innerClass.getConstructors(), innerClass.getMethods(), innerClass.getInnerClasses(), false);
+            }
+        }
+
+        writer.endBlock();
+        writer.writeLine("}");
+    }
+
+    @Override public void generateFieldDeclaration(Set<Modifier> modifiers, TypeDefinition type, String name, Expression initializer) {
+        if (modifiers.contains(Modifier.PRIVATE)) {
+            writer.startLine("private ");
+        } else {
+            writer.startLine(PUBLIC_);
+        }
+        if (modifiers.contains(Modifier.STATIC)) {
+            writer.write(STATIC_);
+        }
+        if (modifiers.contains(Modifier.FINAL)) {
+            writer.write("final ");
+        }
+        type.write(this);
+        writer.write(" ");
+        writer.write(name);
+        // If it has an initializer, then do it here...
+        if (initializer != null) {
+            writer.write( " = ");
+            initializer.write(this);
+        }
+        writer.write(";");
+        writer.endLine();
+    }
+
+    @Override public void generateFieldReference(TypeDefinition type, String name) {
+        writer.write("this.");
+        writer.write(name);
+    }
+
+    @Override public void generateConstructor(Set<Modifier> modifiers, String className, List<ParameterExpression> parameters, Block body) {
+        if (modifiers.contains(Modifier.PRIVATE)) {
+            writer.startLine("private ");
+        } else {
+            writer.startLine(PUBLIC_);
+        }
+        writer.write(className);
+        writer.write("(");
+        for (int i = 0; i < parameters.size(); i++) {
+            parameters.get(i).getType().write(this);
+            writer.write(" ");
+            parameters.get(i).write(this);
+            if (i < parameters.size() - 1) {
+                writer.write(", ");
+            }
+        }
+        writer.write(") {");
+        writer.endLine();
+        body.write(this);
+        writer.writeLine("}");
+    }
+
+    @Override public void generateFile(ClassDeclaration mainClass, List<ClassDeclaration> innerClasses) {
+        generateClass(mainClass.getNamespace(), mainClass.getClassName(), mainClass.getFields(), mainClass.getConstructors(), mainClass.getMethods(), innerClasses, true);
+    }
+
+    @Override public void generateType(String typeString) {
+        writer.write(typeString);
+    }
+
+    @Override public void generateComment(String comment) {
+        writer.writeLine("// " + comment);
+    }
+
+    @Override public void generateNoOp() {
+        writer.write(";");
+    }
+
+    private String getOperator(BinaryExpression.Operation op) {
+        switch (op) {
+            case EQ:
+                return "==";
+            case PLUS:
+                return "+";
+        }
+        throw new UnsupportedOperationException("The Operator " + op + " is currently not implemented!");
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/LineComment.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/LineComment.java
index bf7d548df5a..ec15fc38f01 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/LineComment.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/LineComment.java
@@ -1,43 +1,43 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-/**
- * Comment over one Line
- */
-public class LineComment implements Node {
-
-    private final String comment;
-
-    LineComment(String comment) {
-        this.comment = comment;
-    }
-
-    public String getComment() {
-        return comment;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return null;
-    }
-
-    @Override public void write(Generator writer) {
-        writer.generateComment(comment);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+/**
+ * Comment over one Line
+ */
+public class LineComment implements Node {
+
+    private final String comment;
+
+    LineComment(String comment) {
+        this.comment = comment;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return null;
+    }
+
+    @Override public void write(Generator writer) {
+        writer.generateComment(comment);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Method.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Method.java
index 1e44fe1b834..696d7f3e5d4 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Method.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Method.java
@@ -1,71 +1,71 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-import java.util.List;
-
-/**
- * Method Declaration
- * 
- * TODO is this duplicate to something???
- */
-public class Method implements Node {
-
-    private final TypeDefinition type;    // Type where this thing is defined on
-    private final String name;
-    private final TypeDefinition returnType;
-    private final List<TypeDefinition> parameterTypes;
-    private final List<ExceptionType> expressionTypes;
-
-    public Method(TypeDefinition type, String name, TypeDefinition returnType, List<TypeDefinition> parameterTypes, List<ExceptionType> expressionTypes) {
-        this.type = type;
-        this.name = name;
-        this.returnType = returnType;
-        this.parameterTypes = parameterTypes;
-        this.expressionTypes = expressionTypes;
-    }
-
-    public TypeDefinition getType() {
-        return type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public TypeDefinition getReturnType() {
-        return returnType;
-    }
-
-    public List<TypeDefinition> getParameterTypes() {
-        return parameterTypes;
-    }
-
-    public List<ExceptionType> getExpressionTypes() {
-        return expressionTypes;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return null;
-    }
-
-    @Override public void write(Generator writer) {
-
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+import java.util.List;
+
+/**
+ * Method Declaration
+ * 
+ * TODO is this duplicate to something???
+ */
+public class Method implements Node {
+
+    private final TypeDefinition type;    // Type where this thing is defined on
+    private final String name;
+    private final TypeDefinition returnType;
+    private final List<TypeDefinition> parameterTypes;
+    private final List<ExceptionType> expressionTypes;
+
+    public Method(TypeDefinition type, String name, TypeDefinition returnType, List<TypeDefinition> parameterTypes, List<ExceptionType> expressionTypes) {
+        this.type = type;
+        this.name = name;
+        this.returnType = returnType;
+        this.parameterTypes = parameterTypes;
+        this.expressionTypes = expressionTypes;
+    }
+
+    public TypeDefinition getType() {
+        return type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public TypeDefinition getReturnType() {
+        return returnType;
+    }
+
+    public List<TypeDefinition> getParameterTypes() {
+        return parameterTypes;
+    }
+
+    public List<ExceptionType> getExpressionTypes() {
+        return expressionTypes;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return null;
+    }
+
+    @Override public void write(Generator writer) {
+
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/MethodDefinition.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/MethodDefinition.java
index 999fd4414eb..dca7b8a9072 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/MethodDefinition.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/MethodDefinition.java
@@ -1,73 +1,73 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-public class MethodDefinition implements Node {
-
-    private final Set<Modifier> modifiers;
-    private final String name;
-    private final TypeDefinition resultType;
-    private final List<ParameterExpression> parameters;
-    private final Block body;
-
-    public MethodDefinition(Set<Modifier> modifiers, String name, TypeDefinition resultType, List<ParameterExpression> parameters, Block body) {
-        this.modifiers = modifiers;
-        this.name = name;
-        this.resultType = resultType;
-        this.parameters = parameters;
-        this.body = body;
-    }
-
-    public MethodDefinition(String name, TypeDefinition resultType, List<ParameterExpression> parameters, Block body) {
-        this(Collections.<Modifier>emptySet(), name, resultType, parameters, body);
-    }
-
-    public Set<Modifier> getModifiers() {
-        return modifiers;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public TypeDefinition getResultType() {
-        return resultType;
-    }
-
-    public List<ParameterExpression> getParameters() {
-        return parameters;
-    }
-
-    public Block getBody() {
-        return body;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return null;
-    }
-
-    @Override public void write(Generator writer) {
-        writer.generate(this);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+public class MethodDefinition implements Node {
+
+    private final Set<Modifier> modifiers;
+    private final String name;
+    private final TypeDefinition resultType;
+    private final List<ParameterExpression> parameters;
+    private final Block body;
+
+    public MethodDefinition(Set<Modifier> modifiers, String name, TypeDefinition resultType, List<ParameterExpression> parameters, Block body) {
+        this.modifiers = modifiers;
+        this.name = name;
+        this.resultType = resultType;
+        this.parameters = parameters;
+        this.body = body;
+    }
+
+    public MethodDefinition(String name, TypeDefinition resultType, List<ParameterExpression> parameters, Block body) {
+        this(Collections.<Modifier>emptySet(), name, resultType, parameters, body);
+    }
+
+    public Set<Modifier> getModifiers() {
+        return modifiers;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public TypeDefinition getResultType() {
+        return resultType;
+    }
+
+    public List<ParameterExpression> getParameters() {
+        return parameters;
+    }
+
+    public Block getBody() {
+        return body;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return null;
+    }
+
+    @Override public void write(Generator writer) {
+        writer.generate(this);
+    }
+
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Modifier.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Modifier.java
index 5fb08d27afc..eb2acf37408 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Modifier.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Modifier.java
@@ -1,25 +1,25 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-public enum Modifier {
-    STATIC,
-    PRIVATE,
-    FINAL
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+public enum Modifier {
+    STATIC,
+    PRIVATE,
+    FINAL
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/NewExpression.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/NewExpression.java
index b7181c84428..c2231f1800d 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/NewExpression.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/NewExpression.java
@@ -1,48 +1,48 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class NewExpression extends Expression {
-
-    private List<Node> arguments;
-
-    NewExpression(TypeDefinition myClazz, List<Node> arguments) {
-        super(myClazz);
-        this.arguments = arguments;
-    }
-
-    NewExpression(TypeDefinition myClazz, Node... arguments) {
-        this(myClazz, Arrays.asList(arguments));
-    }
-
-    public List<Node> getArguments() {
-        return arguments;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return null;
-    }
-
-    @Override public void write(Generator writer) {
-        writer.generate(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class NewExpression extends Expression {
+
+    private List<Node> arguments;
+
+    NewExpression(TypeDefinition myClazz, List<Node> arguments) {
+        super(myClazz);
+        this.arguments = arguments;
+    }
+
+    NewExpression(TypeDefinition myClazz, Node... arguments) {
+        this(myClazz, Arrays.asList(arguments));
+    }
+
+    public List<Node> getArguments() {
+        return arguments;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return null;
+    }
+
+    @Override public void write(Generator writer) {
+        writer.generate(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Node.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Node.java
index fa42bb5f91a..1d13594a9a7 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Node.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Node.java
@@ -1,27 +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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-public interface Node {
-
-    <T> T accept(NodeVisitor<T> visitor);
-
-    void write(Generator writer);
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+public interface Node {
+
+    <T> T accept(NodeVisitor<T> visitor);
+
+    void write(Generator writer);
+
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/NodeVisitor.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/NodeVisitor.java
index 508a1a2cbcc..2d4518f4f23 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/NodeVisitor.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/NodeVisitor.java
@@ -1,28 +1,28 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-public interface NodeVisitor<T> {
-
-    T visit(ConstantExpression constantExpression);
-
-    T visit(DeclarationStatement declarationStatement);
-
-    T visit(ParameterExpression parameterExpression);
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+public interface NodeVisitor<T> {
+
+    T visit(ConstantExpression constantExpression);
+
+    T visit(DeclarationStatement declarationStatement);
+
+    T visit(ParameterExpression parameterExpression);
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/ParameterExpression.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/ParameterExpression.java
index 5d5a2c63e04..ce80bf2bca3 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/ParameterExpression.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/ParameterExpression.java
@@ -1,41 +1,41 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-public class ParameterExpression extends Expression {
-
-    private final String name;
-
-    ParameterExpression(TypeDefinition type, String name) {
-        super(type);
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-
-    @Override public void write(Generator generator) {
-        generator.generate(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+public class ParameterExpression extends Expression {
+
+    private final String name;
+
+    ParameterExpression(TypeDefinition type, String name) {
+        super(type);
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+
+    @Override public void write(Generator generator) {
+        generator.generate(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Primitive.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Primitive.java
index 4d6ecb7fdf5..945f181fbbf 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Primitive.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Primitive.java
@@ -1,58 +1,58 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-public class Primitive extends TypeDefinition {
-
-    // Shorthands
-    public static final Primitive VOID = new Primitive(DataType.VOID);
-    public static final Primitive BOOLEAN = new Primitive(DataType.BOOLEAN);
-    public static final Primitive INTEGER = new Primitive(DataType.INTEGER);
-    public static final Primitive LONG = new Primitive(DataType.LONG);
-    public static final Primitive DOUBLE = new Primitive(DataType.DOUBLE);
-    public static final Primitive STRING = new Primitive(DataType.STRING);
-
-    private final DataType type;
-
-    public Primitive(DataType dataType) {
-        super(dataType.toString());
-        this.type = dataType;
-    }
-
-    public DataType getType() {
-        return type;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return null;
-    }
-
-    @Override public void write(Generator generator) {
-        generator.generatePrimitive(this.getType());
-    }
-
-    public enum DataType {
-        VOID,
-        BOOLEAN,
-        INTEGER,
-        LONG,
-        DOUBLE,
-        STRING
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+public class Primitive extends TypeDefinition {
+
+    // Shorthands
+    public static final Primitive VOID = new Primitive(DataType.VOID);
+    public static final Primitive BOOLEAN = new Primitive(DataType.BOOLEAN);
+    public static final Primitive INTEGER = new Primitive(DataType.INTEGER);
+    public static final Primitive LONG = new Primitive(DataType.LONG);
+    public static final Primitive DOUBLE = new Primitive(DataType.DOUBLE);
+    public static final Primitive STRING = new Primitive(DataType.STRING);
+
+    private final DataType type;
+
+    public Primitive(DataType dataType) {
+        super(dataType.toString());
+        this.type = dataType;
+    }
+
+    public DataType getType() {
+        return type;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return null;
+    }
+
+    @Override public void write(Generator generator) {
+        generator.generatePrimitive(this.getType());
+    }
+
+    public enum DataType {
+        VOID,
+        BOOLEAN,
+        INTEGER,
+        LONG,
+        DOUBLE,
+        STRING
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/PythonGenerator.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/PythonGenerator.java
index 9e4b17e8ce0..40cb936a121 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/PythonGenerator.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/PythonGenerator.java
@@ -1,318 +1,318 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-import java.util.List;
-import java.util.Set;
-
-public class PythonGenerator implements Generator {
-
-    private final CodeWriter writer;
-
-    public PythonGenerator(CodeWriter writer) {
-        this.writer = writer;
-    }
-
-    @Override public Node prepare(Node root) {
-        return null;
-    }
-
-    @Override public void generate(ConstantExpression constantExpression) {
-        writer.write(constantExpression.getValue().toString());
-    }
-
-    @Override public void generateDeclarationWithInitializer(DeclarationStatement declarationStatement) {
-        declarationStatement.getParameterExpression().write(this);
-        writer.write(": ");
-        declarationStatement.getParameterExpression().getType().write(this);
-        writer.write(" = ");
-        declarationStatement.getInitializer().write(this);
-    }
-
-    @Override public void generateDeclaration(DeclarationStatement declarationStatement) {
-        declarationStatement.getParameterExpression().write(this);
-        writer.write(": ");
-        declarationStatement.getParameterExpression().getType().write(this);
-        writer.write(" = None");
-    }
-
-    @Override public void generate(ParameterExpression parameterExpression) {
-        writer.write(parameterExpression.getName());
-    }
-
-    @Override public void generatePrimitive(Primitive.DataType primitive) {
-        switch (primitive) {
-            case STRING:
-                writer.write("string");
-                break;
-            case LONG:
-            case INTEGER:
-                writer.write("long");
-                break;
-            case DOUBLE:
-                writer.write("float");
-                break;
-            case BOOLEAN:
-                writer.write("bool");
-                break;
-            case VOID:
-                default:
-                    throw new UnsupportedOperationException("Primitive type " + primitive + " is not implemented!");
-        }
-    }
-
-    @Override public void generate(IfStatement ifStatement) {
-        writer.startLine("if ");
-        ifStatement.getConditions().get(0).write(this);
-        writer.write(":\n");
-        writeBlock(ifStatement.getBlocks().get(0));
-        // For each remaining condition to an else if
-        for (int i = 1; i < ifStatement.getConditions().size(); i++) {
-            writer.startLine("elif ");
-            ifStatement.getConditions().get(i).write(this);
-            writer.write(":\n");
-            writeBlock(ifStatement.getBlocks().get(i));
-        }
-        if (ifStatement.getBlocks().size() == ifStatement.getConditions().size() + 1) {
-            writer.writeLine("else:");
-            writeBlock(ifStatement.getBlocks().get(ifStatement.getBlocks().size() - 1));
-        }
-
-
-
-//        writer.startLine("if ");
-//        ifStatement.getConditions().get(0).write(this);
-//        writer.write(":\n");
-//        writeBlock(ifStatement.getBlocks().get(0));
-//        if (ifStatement.getBlocks().size() == 2 && ifStatement.getBlocks().get(1) != null) {
-//            writer.writeLine("else:");
-//            writeBlock(ifStatement.getBlocks().get(1));
-//        }
-    }
-
-    @Override public void writeBlock(Block statements) {
-        writer.startBlock();
-        if (statements.getStatements().isEmpty()) {
-            writer.writeLine("pass");
-        }
-        for (Node statement : statements.getStatements()) {
-            // Dont to the wrapping for If Statements
-            if (statement instanceof IfStatement) {
-                statement.write(this);
-            } else {
-                writer.startLine("");
-                statement.write(this);
-                writer.endLine();
-            }
-        }
-        writer.endBlock();
-    }
-
-    @Override public void generate(BinaryExpression binaryExpression) {
-        binaryExpression.getLeft().write(this);
-        writer.write(" ");
-        writer.write(getOperator(binaryExpression.getOp()));
-        writer.write(" ");
-        binaryExpression.getRight().write(this);
-    }
-
-    @Override public void generate(AssignementExpression assignementExpression) {
-        assignementExpression.getTarget().write(this);
-        writer.write(" = ");
-        assignementExpression.getValue().write(this);
-    }
-
-    @Override public void generateStaticCall(Method method, List<Node> arguments) {
-        writer.write(method.getType().getTypeString());
-        writer.write(".");
-        writer.write(method.getName());
-        writer.write("(");
-        generateArgumentList(arguments);
-        writer.write(")");
-    }
-
-    private void generateArgumentList(List<Node> arguments) {
-        for (int i = 0; i < arguments.size(); i++) {
-            arguments.get(i).write(this);
-            if (i < arguments.size() - 1) {
-                writer.write(", ");
-            }
-        }
-    }
-
-    @Override public void generateCall(Node target, Method method, List<Node> arguments) {
-        target.write(this);
-        writer.write(".");
-        writer.write(method.getName());
-        writer.write("(");
-        generateArgumentList(arguments);
-        writer.write(")");
-    }
-
-    @Override public void generate(NewExpression newExpression) {
-        newExpression.getType().write(this);
-        writer.write("(");
-        generateArgumentList(newExpression.getArguments());
-        writer.write(")");
-    }
-
-    @Override public void generate(MethodDefinition methodDefinition) {
-        if (methodDefinition.getModifiers().contains(Modifier.STATIC)) {
-            writer.writeLine("@classmethod");
-        }
-        writer.startLine("def ");
-        writer.write(methodDefinition.getName());
-        writer.write("(");
-        writer.write("self");
-        if (!methodDefinition.getParameters().isEmpty()) {
-            writer.write(", ");
-        }
-        for (int i = 0; i < methodDefinition.getParameters().size(); i++) {
-            methodDefinition.getParameters().get(i).write(this);
-            writer.write(": ");
-            methodDefinition.getParameters().get(i).getType().write(this);
-            if (i < methodDefinition.getParameters().size() - 1) {
-                writer.write(", ");
-            }
-        }
-        writer.write(") -> ");
-        // Special handling of VOID is necessary
-        if (methodDefinition.getResultType() == Primitive.VOID) {
-            writer.write("None");
-        } else {
-            methodDefinition.getResultType().write(this);
-        }
-        writer.write(":");
-        writer.endLine();
-        methodDefinition.getBody().write(this);
-    }
-
-    @Override public void generateReturn(Expression value) {
-        writer.write("return ");
-        value.write(this);
-    }
-
-    @Override public void generateClass(String namespace, String className, List<FieldDeclaration> fields, List<ConstructorDeclaration> constructors, List<MethodDefinition> methods, List<ClassDeclaration> innerClasses, boolean mainClass) {
-        // Add static?!
-        // Own File?
-        writer.startLine("class ");
-        writer.write(className);
-        // TODO extends / implements
-        writer.write(":");
-        writer.endLine();
-        writer.startBlock();
-
-        // Insert a pass if there are no fields or methods
-        if (fields.size() == 0 && methods.size() == 0) {
-            writer.writeLine("pass");
-        }
-
-        writer.writeLine("");
-
-        // Fields
-        for (FieldDeclaration field : fields) {
-            field.write(this);
-            writer.writeLine("");
-        }
-
-        // Constructors
-        if (constructors != null) {
-            for (ConstructorDeclaration constructor : constructors) {
-                this.generateConstructor(constructor.getModifiers(), className, constructor.getParameters(), constructor.getBody());
-                writer.writeLine("");
-            }
-        }
-
-        // Methods
-        for (MethodDefinition method : methods) {
-            method.write(this);
-            writer.writeLine("");
-        }
-
-        // If there are inner classes, implement them
-        if (innerClasses != null) {
-            for (ClassDeclaration innerClass : innerClasses) {
-                this.generateClass(innerClass.getNamespace(), innerClass.getClassName(), innerClass.getFields(), innerClass.getConstructors(), innerClass.getMethods(), innerClass.getInnerClasses(), false);
-            }
-        }
-
-        writer.endBlock();
-    }
-
-    @Override public void generateFieldDeclaration(Set<Modifier> modifiers, TypeDefinition type, String name, Expression initializer) {
-        writer.startLine("");
-        writer.write(name);
-        writer.write(": ");
-        type.write(this);
-        // If its static, assign here
-        if (initializer != null) {
-            assert modifiers.contains(Modifier.STATIC);
-            // TODO Python cannot self reference
-            writer.write(" = ");
-            initializer.write(this);
-        }
-        writer.endLine();
-    }
-
-    @Override public void generateFieldReference(TypeDefinition type, String name) {
-        writer.write("self.");
-        writer.write(name);
-    }
-
-    @Override public void generateConstructor(Set<Modifier> modifiers, String className, List<ParameterExpression> parameters, Block body) {
-        writer.startLine("def __init__(");
-        for (int i = 0; i < parameters.size(); i++) {
-            parameters.get(i).getType().write(this);
-            writer.write(" ");
-            parameters.get(i).write(this);
-            if (i < parameters.size() - 1) {
-                writer.write(", ");
-            }
-        }
-        writer.write("):");
-        writer.endLine();
-        body.write(this);
-    }
-
-    @Override public void generateFile(ClassDeclaration mainClass, List<ClassDeclaration> innerClasses) {
-        generateClass(mainClass.getNamespace(), mainClass.getClassName(), mainClass.getFields(), mainClass.getConstructors(), mainClass.getMethods(), innerClasses, true);
-    }
-
-    @Override public void generateType(String typeString) {
-        writer.write(typeString);
-    }
-
-    @Override public void generateComment(String comment) {
-        writer.writeLine("# " + comment);
-    }
-
-    @Override public void generateNoOp() {
-        writer.write("pass");
-    }
-
-    private String getOperator(BinaryExpression.Operation op) {
-        switch (op) {
-            case EQ:
-                return "==";
-            case PLUS:
-                return "+";
-        }
-        throw new UnsupportedOperationException("The Operator " + op + " is currently not implemented!");
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+import java.util.List;
+import java.util.Set;
+
+public class PythonGenerator implements Generator {
+
+    private final CodeWriter writer;
+
+    public PythonGenerator(CodeWriter writer) {
+        this.writer = writer;
+    }
+
+    @Override public Node prepare(Node root) {
+        return null;
+    }
+
+    @Override public void generate(ConstantExpression constantExpression) {
+        writer.write(constantExpression.getValue().toString());
+    }
+
+    @Override public void generateDeclarationWithInitializer(DeclarationStatement declarationStatement) {
+        declarationStatement.getParameterExpression().write(this);
+        writer.write(": ");
+        declarationStatement.getParameterExpression().getType().write(this);
+        writer.write(" = ");
+        declarationStatement.getInitializer().write(this);
+    }
+
+    @Override public void generateDeclaration(DeclarationStatement declarationStatement) {
+        declarationStatement.getParameterExpression().write(this);
+        writer.write(": ");
+        declarationStatement.getParameterExpression().getType().write(this);
+        writer.write(" = None");
+    }
+
+    @Override public void generate(ParameterExpression parameterExpression) {
+        writer.write(parameterExpression.getName());
+    }
+
+    @Override public void generatePrimitive(Primitive.DataType primitive) {
+        switch (primitive) {
+            case STRING:
+                writer.write("string");
+                break;
+            case LONG:
+            case INTEGER:
+                writer.write("long");
+                break;
+            case DOUBLE:
+                writer.write("float");
+                break;
+            case BOOLEAN:
+                writer.write("bool");
+                break;
+            case VOID:
+                default:
+                    throw new UnsupportedOperationException("Primitive type " + primitive + " is not implemented!");
+        }
+    }
+
+    @Override public void generate(IfStatement ifStatement) {
+        writer.startLine("if ");
+        ifStatement.getConditions().get(0).write(this);
+        writer.write(":\n");
+        writeBlock(ifStatement.getBlocks().get(0));
+        // For each remaining condition to an else if
+        for (int i = 1; i < ifStatement.getConditions().size(); i++) {
+            writer.startLine("elif ");
+            ifStatement.getConditions().get(i).write(this);
+            writer.write(":\n");
+            writeBlock(ifStatement.getBlocks().get(i));
+        }
+        if (ifStatement.getBlocks().size() == ifStatement.getConditions().size() + 1) {
+            writer.writeLine("else:");
+            writeBlock(ifStatement.getBlocks().get(ifStatement.getBlocks().size() - 1));
+        }
+
+
+
+//        writer.startLine("if ");
+//        ifStatement.getConditions().get(0).write(this);
+//        writer.write(":\n");
+//        writeBlock(ifStatement.getBlocks().get(0));
+//        if (ifStatement.getBlocks().size() == 2 && ifStatement.getBlocks().get(1) != null) {
+//            writer.writeLine("else:");
+//            writeBlock(ifStatement.getBlocks().get(1));
+//        }
+    }
+
+    @Override public void writeBlock(Block statements) {
+        writer.startBlock();
+        if (statements.getStatements().isEmpty()) {
+            writer.writeLine("pass");
+        }
+        for (Node statement : statements.getStatements()) {
+            // Dont to the wrapping for If Statements
+            if (statement instanceof IfStatement) {
+                statement.write(this);
+            } else {
+                writer.startLine("");
+                statement.write(this);
+                writer.endLine();
+            }
+        }
+        writer.endBlock();
+    }
+
+    @Override public void generate(BinaryExpression binaryExpression) {
+        binaryExpression.getLeft().write(this);
+        writer.write(" ");
+        writer.write(getOperator(binaryExpression.getOp()));
+        writer.write(" ");
+        binaryExpression.getRight().write(this);
+    }
+
+    @Override public void generate(AssignementExpression assignementExpression) {
+        assignementExpression.getTarget().write(this);
+        writer.write(" = ");
+        assignementExpression.getValue().write(this);
+    }
+
+    @Override public void generateStaticCall(Method method, List<Node> arguments) {
+        writer.write(method.getType().getTypeString());
+        writer.write(".");
+        writer.write(method.getName());
+        writer.write("(");
+        generateArgumentList(arguments);
+        writer.write(")");
+    }
+
+    private void generateArgumentList(List<Node> arguments) {
+        for (int i = 0; i < arguments.size(); i++) {
+            arguments.get(i).write(this);
+            if (i < arguments.size() - 1) {
+                writer.write(", ");
+            }
+        }
+    }
+
+    @Override public void generateCall(Node target, Method method, List<Node> arguments) {
+        target.write(this);
+        writer.write(".");
+        writer.write(method.getName());
+        writer.write("(");
+        generateArgumentList(arguments);
+        writer.write(")");
+    }
+
+    @Override public void generate(NewExpression newExpression) {
+        newExpression.getType().write(this);
+        writer.write("(");
+        generateArgumentList(newExpression.getArguments());
+        writer.write(")");
+    }
+
+    @Override public void generate(MethodDefinition methodDefinition) {
+        if (methodDefinition.getModifiers().contains(Modifier.STATIC)) {
+            writer.writeLine("@classmethod");
+        }
+        writer.startLine("def ");
+        writer.write(methodDefinition.getName());
+        writer.write("(");
+        writer.write("self");
+        if (!methodDefinition.getParameters().isEmpty()) {
+            writer.write(", ");
+        }
+        for (int i = 0; i < methodDefinition.getParameters().size(); i++) {
+            methodDefinition.getParameters().get(i).write(this);
+            writer.write(": ");
+            methodDefinition.getParameters().get(i).getType().write(this);
+            if (i < methodDefinition.getParameters().size() - 1) {
+                writer.write(", ");
+            }
+        }
+        writer.write(") -> ");
+        // Special handling of VOID is necessary
+        if (methodDefinition.getResultType() == Primitive.VOID) {
+            writer.write("None");
+        } else {
+            methodDefinition.getResultType().write(this);
+        }
+        writer.write(":");
+        writer.endLine();
+        methodDefinition.getBody().write(this);
+    }
+
+    @Override public void generateReturn(Expression value) {
+        writer.write("return ");
+        value.write(this);
+    }
+
+    @Override public void generateClass(String namespace, String className, List<FieldDeclaration> fields, List<ConstructorDeclaration> constructors, List<MethodDefinition> methods, List<ClassDeclaration> innerClasses, boolean mainClass) {
+        // Add static?!
+        // Own File?
+        writer.startLine("class ");
+        writer.write(className);
+        // TODO extends / implements
+        writer.write(":");
+        writer.endLine();
+        writer.startBlock();
+
+        // Insert a pass if there are no fields or methods
+        if (fields.size() == 0 && methods.size() == 0) {
+            writer.writeLine("pass");
+        }
+
+        writer.writeLine("");
+
+        // Fields
+        for (FieldDeclaration field : fields) {
+            field.write(this);
+            writer.writeLine("");
+        }
+
+        // Constructors
+        if (constructors != null) {
+            for (ConstructorDeclaration constructor : constructors) {
+                this.generateConstructor(constructor.getModifiers(), className, constructor.getParameters(), constructor.getBody());
+                writer.writeLine("");
+            }
+        }
+
+        // Methods
+        for (MethodDefinition method : methods) {
+            method.write(this);
+            writer.writeLine("");
+        }
+
+        // If there are inner classes, implement them
+        if (innerClasses != null) {
+            for (ClassDeclaration innerClass : innerClasses) {
+                this.generateClass(innerClass.getNamespace(), innerClass.getClassName(), innerClass.getFields(), innerClass.getConstructors(), innerClass.getMethods(), innerClass.getInnerClasses(), false);
+            }
+        }
+
+        writer.endBlock();
+    }
+
+    @Override public void generateFieldDeclaration(Set<Modifier> modifiers, TypeDefinition type, String name, Expression initializer) {
+        writer.startLine("");
+        writer.write(name);
+        writer.write(": ");
+        type.write(this);
+        // If its static, assign here
+        if (initializer != null) {
+            assert modifiers.contains(Modifier.STATIC);
+            // TODO Python cannot self reference
+            writer.write(" = ");
+            initializer.write(this);
+        }
+        writer.endLine();
+    }
+
+    @Override public void generateFieldReference(TypeDefinition type, String name) {
+        writer.write("self.");
+        writer.write(name);
+    }
+
+    @Override public void generateConstructor(Set<Modifier> modifiers, String className, List<ParameterExpression> parameters, Block body) {
+        writer.startLine("def __init__(");
+        for (int i = 0; i < parameters.size(); i++) {
+            parameters.get(i).getType().write(this);
+            writer.write(" ");
+            parameters.get(i).write(this);
+            if (i < parameters.size() - 1) {
+                writer.write(", ");
+            }
+        }
+        writer.write("):");
+        writer.endLine();
+        body.write(this);
+    }
+
+    @Override public void generateFile(ClassDeclaration mainClass, List<ClassDeclaration> innerClasses) {
+        generateClass(mainClass.getNamespace(), mainClass.getClassName(), mainClass.getFields(), mainClass.getConstructors(), mainClass.getMethods(), innerClasses, true);
+    }
+
+    @Override public void generateType(String typeString) {
+        writer.write(typeString);
+    }
+
+    @Override public void generateComment(String comment) {
+        writer.writeLine("# " + comment);
+    }
+
+    @Override public void generateNoOp() {
+        writer.write("pass");
+    }
+
+    private String getOperator(BinaryExpression.Operation op) {
+        switch (op) {
+            case EQ:
+                return "==";
+            case PLUS:
+                return "+";
+        }
+        throw new UnsupportedOperationException("The Operator " + op + " is currently not implemented!");
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/ReturnStatement.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/ReturnStatement.java
index 64beb65d2bd..f03d160ee29 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/ReturnStatement.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/ReturnStatement.java
@@ -1,40 +1,40 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-public class ReturnStatement extends Statement {
-
-    private final Expression value;
-
-    ReturnStatement(Expression value) {
-        this.value = value;
-    }
-
-    public Expression getValue() {
-        return value;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return null;
-    }
-
-    @Override public void write(Generator writer) {
-        writer.generateReturn(this.getValue());
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+public class ReturnStatement extends Statement {
+
+    private final Expression value;
+
+    ReturnStatement(Expression value) {
+        this.value = value;
+    }
+
+    public Expression getValue() {
+        return value;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return null;
+    }
+
+    @Override public void write(Generator writer) {
+        writer.generateReturn(this.getValue());
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Statement.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Statement.java
index db6cba377d6..4268ca5f9f7 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Statement.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Statement.java
@@ -1,22 +1,22 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-public abstract class Statement implements Node {
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+public abstract class Statement implements Node {
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/TypeDefinition.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/TypeDefinition.java
index 6dd97cecff8..61dcd38a416 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/TypeDefinition.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/TypeDefinition.java
@@ -1,43 +1,43 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-/**
- * Definition of a Type / Class.
- */
-public class TypeDefinition implements Node {
-
-    private final String typeString;
-
-    TypeDefinition(String typeString) {
-        this.typeString = typeString;
-    }
-
-    String getTypeString() {
-        return this.typeString;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return null;
-    }
-
-    @Override public void write(Generator writer) {
-        writer.generateType(typeString);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+/**
+ * Definition of a Type / Class.
+ */
+public class TypeDefinition implements Node {
+
+    private final String typeString;
+
+    TypeDefinition(String typeString) {
+        this.typeString = typeString;
+    }
+
+    String getTypeString() {
+        return this.typeString;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return null;
+    }
+
+    @Override public void write(Generator writer) {
+        writer.generateType(typeString);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/TypeUtil.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/TypeUtil.java
index e27d2aaa3f4..a8e70abd493 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/TypeUtil.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/TypeUtil.java
@@ -1,29 +1,29 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-public class TypeUtil {
-
-    public static TypeDefinition infer(Object o) {
-        if (o instanceof Double) {
-            return Primitive.DOUBLE;
-        }
-        throw new UnsupportedOperationException("No type available for object " + o);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+public class TypeUtil {
+
+    public static TypeDefinition infer(Object o) {
+        if (o instanceof Double) {
+            return Primitive.DOUBLE;
+        }
+        throw new UnsupportedOperationException("No type available for object " + o);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/UnknownType.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/UnknownType.java
index 82c81cc3de0..ae0f5f19701 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/UnknownType.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/UnknownType.java
@@ -1,46 +1,46 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-/**
- * Represents an Unknown Type.
- */
-public class UnknownType extends TypeDefinition {
-
-    public static final UnknownType INSTANCE = new UnknownType();
-
-    private UnknownType() {
-        super("");
-    }
-
-    @Override
-    String getTypeString() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public <T> T accept(NodeVisitor<T> visitor) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void write(Generator writer) {
-        throw new UnsupportedOperationException();
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+/**
+ * Represents an Unknown Type.
+ */
+public class UnknownType extends TypeDefinition {
+
+    public static final UnknownType INSTANCE = new UnknownType();
+
+    private UnknownType() {
+        super("");
+    }
+
+    @Override
+    String getTypeString() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public <T> T accept(NodeVisitor<T> visitor) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void write(Generator writer) {
+        throw new UnsupportedOperationException();
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AbstractNodeVisitor.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AbstractNodeVisitor.java
index 8d80118bad2..4104c068124 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AbstractNodeVisitor.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AbstractNodeVisitor.java
@@ -1,227 +1,227 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-
-public class AbstractNodeVisitor<T> implements NodeVisitor<T> {
-
-    @Override public T visit(AugAssignNode augAssignNode) {
-        augAssignNode.getOp().accept(this);
-        augAssignNode.getTarget().accept(this);
-        augAssignNode.getValue().accept(this);
-        return null;
-    }
-
-    @Override public T visit(AddNode addNode) {
-        return null;
-    }
-
-    @Override public T visit(EqNode eqNode) {
-        return null;
-    }
-
-    @Override public T visit(IfNode ifNode) {
-        for (Node node : ifNode.getBody()) {
-            node.accept(this);
-        }
-        for (Node node : ifNode.getOrelse()) {
-            node.accept(this);
-        }
-        ifNode.getTest().accept(this);
-        return null;
-    }
-
-    @Override public T visit(WhileNode whileNode) {
-        for (Node node : whileNode.getBody()) {
-            node.accept(this);
-        }
-        for (Node node : whileNode.getOrelse()) {
-            node.accept(this);
-        }
-        whileNode.getTest().accept(this);
-        return null;
-    }
-
-    @Override public T visit(NotEqNode notEqNode) {
-        return null;
-    }
-
-    @Override public T visit(NumNode numNode) {
-        return null;
-    }
-
-    @Override public T visit(PassNode passNode) {
-        return null;
-    }
-
-    @Override public T visit(ReturnNode returnNode) {
-        returnNode.getValue().accept(this);
-        return null;
-    }
-
-    @Override public T visit(StoreNode storeNode) {
-        return null;
-    }
-
-    @Override public T visit(StrNode strNode) {
-        return null;
-    }
-
-    @Override public T visit(TupleNode tupleNode) {
-        for (Node elt : tupleNode.getElts()) {
-            elt.accept(this);
-        }
-        return null;
-    }
-
-    @Override public T visit(NameNode nameNode) {
-        return null;
-    }
-
-    @Override public T visit(NameConstantNode nameConstantNode) {
-        return null;
-    }
-
-    @Override public T visit(MultNode multNode) {
-        return null;
-    }
-
-    @Override public T visit(ModuleNode moduleNode) {
-        for (Node node : moduleNode.getBody()) {
-            node.accept(this);
-        }
-        return null;
-    }
-
-    @Override public T visit(LoadNode loadNode) {
-        return null;
-    }
-
-    @Override public T visit(ListNode listNode) {
-        for (Node elt : listNode.getElts()) {
-            elt.accept(this);
-        }
-        return null;
-    }
-
-    @Override public T visit(KeywordNode keywordNode) {
-        keywordNode.getValue().accept(this);
-        return null;
-    }
-
-    @Override public T visit(ImportFromNode importFromNode) {
-        for (Node name : importFromNode.getNames()) {
-            name.accept(this);
-        }
-        return null;
-    }
-
-    @Override public T visit(FunctionDefNode functionDefNode) {
-        functionDefNode.getArgs().accept(this);
-        for (Node node : functionDefNode.getBody()) {
-            node.accept(this);
-        }
-        if (functionDefNode.getReturns() != null) {
-            functionDefNode.getReturns().accept(this);
-        }
-        return null;
-    }
-
-    @Override public T visit(ExprNode exprNode) {
-        return exprNode.getValue().accept(this);
-    }
-
-    @Override public T visit(CompareNode compareNode) {
-        for (Node comparator : compareNode.getComparators()) {
-            comparator.accept(this);
-        }
-        compareNode.getLeft().accept(this);
-        for (Node op : compareNode.getOps()) {
-            op.accept(this);
-        }
-        return null;
-    }
-
-    @Override public T visit(AliasNode aliasNode) {
-        return null;
-    }
-
-    @Override public T visit(AnnAssignerNode annAssignerNode) {
-        annAssignerNode.getAnnotation().accept(this);
-        annAssignerNode.getTarget().accept(this);
-        if (annAssignerNode.getValue() != null) {
-            return annAssignerNode.getValue().accept(this);
-        } else {
-            return null;
-        }
-    }
-
-    @Override public T visit(ArgNode argNode) {
-        if (argNode.getAnnotation() != null) {
-            return argNode.getAnnotation().accept(this);
-        } else {
-            return null;
-        }
-    }
-
-    @Override public T visit(ClassDefNode classDefNode) {
-        for (Node basis : classDefNode.getBases()) {
-            basis.accept(this);
-        }
-        for (Node node : classDefNode.getBody()) {
-            node.accept(this);
-        }
-        return null;
-    }
-
-    @Override public T visit(CallNode callNode) {
-        for (Node arg : callNode.getArgs()) {
-            arg.accept(this);
-        }
-        for (Node keyword : callNode.getKeywords()) {
-            keyword.accept(this);
-        }
-        return callNode.getFunc().accept(this);
-    }
-
-    @Override public T visit(BinOpNode binOpNode) {
-        binOpNode.getLeft().accept(this);
-        binOpNode.getOp().accept(this);
-        binOpNode.getRight().accept(this);
-        return null;
-    }
-
-    @Override public T visit(AttributeNode attributeNode) {
-        return attributeNode.getValue().accept(this);
-    }
-
-    @Override public T visit(AssignNode assignNode) {
-        for (Node target : assignNode.getTargets()) {
-            target.accept(this);
-        }
-        return assignNode.getValue().accept(this);
-    }
-
-    @Override public T visit(ArgumentsNode argumentsNode) {
-        for (Node arg : argumentsNode.getArgs()) {
-            arg.accept(this);
-        }
-        return null;
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+
+public class AbstractNodeVisitor<T> implements NodeVisitor<T> {
+
+    @Override public T visit(AugAssignNode augAssignNode) {
+        augAssignNode.getOp().accept(this);
+        augAssignNode.getTarget().accept(this);
+        augAssignNode.getValue().accept(this);
+        return null;
+    }
+
+    @Override public T visit(AddNode addNode) {
+        return null;
+    }
+
+    @Override public T visit(EqNode eqNode) {
+        return null;
+    }
+
+    @Override public T visit(IfNode ifNode) {
+        for (Node node : ifNode.getBody()) {
+            node.accept(this);
+        }
+        for (Node node : ifNode.getOrelse()) {
+            node.accept(this);
+        }
+        ifNode.getTest().accept(this);
+        return null;
+    }
+
+    @Override public T visit(WhileNode whileNode) {
+        for (Node node : whileNode.getBody()) {
+            node.accept(this);
+        }
+        for (Node node : whileNode.getOrelse()) {
+            node.accept(this);
+        }
+        whileNode.getTest().accept(this);
+        return null;
+    }
+
+    @Override public T visit(NotEqNode notEqNode) {
+        return null;
+    }
+
+    @Override public T visit(NumNode numNode) {
+        return null;
+    }
+
+    @Override public T visit(PassNode passNode) {
+        return null;
+    }
+
+    @Override public T visit(ReturnNode returnNode) {
+        returnNode.getValue().accept(this);
+        return null;
+    }
+
+    @Override public T visit(StoreNode storeNode) {
+        return null;
+    }
+
+    @Override public T visit(StrNode strNode) {
+        return null;
+    }
+
+    @Override public T visit(TupleNode tupleNode) {
+        for (Node elt : tupleNode.getElts()) {
+            elt.accept(this);
+        }
+        return null;
+    }
+
+    @Override public T visit(NameNode nameNode) {
+        return null;
+    }
+
+    @Override public T visit(NameConstantNode nameConstantNode) {
+        return null;
+    }
+
+    @Override public T visit(MultNode multNode) {
+        return null;
+    }
+
+    @Override public T visit(ModuleNode moduleNode) {
+        for (Node node : moduleNode.getBody()) {
+            node.accept(this);
+        }
+        return null;
+    }
+
+    @Override public T visit(LoadNode loadNode) {
+        return null;
+    }
+
+    @Override public T visit(ListNode listNode) {
+        for (Node elt : listNode.getElts()) {
+            elt.accept(this);
+        }
+        return null;
+    }
+
+    @Override public T visit(KeywordNode keywordNode) {
+        keywordNode.getValue().accept(this);
+        return null;
+    }
+
+    @Override public T visit(ImportFromNode importFromNode) {
+        for (Node name : importFromNode.getNames()) {
+            name.accept(this);
+        }
+        return null;
+    }
+
+    @Override public T visit(FunctionDefNode functionDefNode) {
+        functionDefNode.getArgs().accept(this);
+        for (Node node : functionDefNode.getBody()) {
+            node.accept(this);
+        }
+        if (functionDefNode.getReturns() != null) {
+            functionDefNode.getReturns().accept(this);
+        }
+        return null;
+    }
+
+    @Override public T visit(ExprNode exprNode) {
+        return exprNode.getValue().accept(this);
+    }
+
+    @Override public T visit(CompareNode compareNode) {
+        for (Node comparator : compareNode.getComparators()) {
+            comparator.accept(this);
+        }
+        compareNode.getLeft().accept(this);
+        for (Node op : compareNode.getOps()) {
+            op.accept(this);
+        }
+        return null;
+    }
+
+    @Override public T visit(AliasNode aliasNode) {
+        return null;
+    }
+
+    @Override public T visit(AnnAssignerNode annAssignerNode) {
+        annAssignerNode.getAnnotation().accept(this);
+        annAssignerNode.getTarget().accept(this);
+        if (annAssignerNode.getValue() != null) {
+            return annAssignerNode.getValue().accept(this);
+        } else {
+            return null;
+        }
+    }
+
+    @Override public T visit(ArgNode argNode) {
+        if (argNode.getAnnotation() != null) {
+            return argNode.getAnnotation().accept(this);
+        } else {
+            return null;
+        }
+    }
+
+    @Override public T visit(ClassDefNode classDefNode) {
+        for (Node basis : classDefNode.getBases()) {
+            basis.accept(this);
+        }
+        for (Node node : classDefNode.getBody()) {
+            node.accept(this);
+        }
+        return null;
+    }
+
+    @Override public T visit(CallNode callNode) {
+        for (Node arg : callNode.getArgs()) {
+            arg.accept(this);
+        }
+        for (Node keyword : callNode.getKeywords()) {
+            keyword.accept(this);
+        }
+        return callNode.getFunc().accept(this);
+    }
+
+    @Override public T visit(BinOpNode binOpNode) {
+        binOpNode.getLeft().accept(this);
+        binOpNode.getOp().accept(this);
+        binOpNode.getRight().accept(this);
+        return null;
+    }
+
+    @Override public T visit(AttributeNode attributeNode) {
+        return attributeNode.getValue().accept(this);
+    }
+
+    @Override public T visit(AssignNode assignNode) {
+        for (Node target : assignNode.getTargets()) {
+            target.accept(this);
+        }
+        return assignNode.getValue().accept(this);
+    }
+
+    @Override public T visit(ArgumentsNode argumentsNode) {
+        for (Node arg : argumentsNode.getArgs()) {
+            arg.accept(this);
+        }
+        return null;
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AddNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AddNode.java
index 50a004ad02e..f39f4296077 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AddNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AddNode.java
@@ -1,30 +1,30 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-@JsonTypeName("Add")
-public class AddNode extends Node {
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+@JsonTypeName("Add")
+public class AddNode extends Node {
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AliasNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AliasNode.java
index 6a66300bbd6..f2de7fe087b 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AliasNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AliasNode.java
@@ -1,52 +1,52 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-@JsonTypeName("alias")
-public class AliasNode extends Node {
-
-    @JsonProperty("asname")
-    private String asname;
-
-    @JsonProperty("name")
-    private String name;
-
-    public String getAsname() {
-        return asname;
-    }
-
-    public void setAsname(String asname) {
-        this.asname = asname;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+@JsonTypeName("alias")
+public class AliasNode extends Node {
+
+    @JsonProperty("asname")
+    private String asname;
+
+    @JsonProperty("name")
+    private String name;
+
+    public String getAsname() {
+        return asname;
+    }
+
+    public void setAsname(String asname) {
+        this.asname = asname;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AnnAssignerNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AnnAssignerNode.java
index c47356c2e9b..4d6ee337910 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AnnAssignerNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AnnAssignerNode.java
@@ -1,74 +1,74 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-@JsonTypeName("AnnAssign")
-public class AnnAssignerNode extends LineEntryNode {
-
-    @JsonProperty("annotation")
-    private Node annotation;
-
-    @JsonProperty("simple")
-    private int simple;
-
-    @JsonProperty("target")
-    private Node target;
-
-    @JsonProperty("value")
-    private Node value;
-
-    public Node getAnnotation() {
-        return annotation;
-    }
-
-    public void setAnnotation(Node annotation) {
-        this.annotation = annotation;
-    }
-
-    public int getSimple() {
-        return simple;
-    }
-
-    public void setSimple(int simple) {
-        this.simple = simple;
-    }
-
-    public Node getTarget() {
-        return target;
-    }
-
-    public void setTarget(Node target) {
-        this.target = target;
-    }
-
-    public Node getValue() {
-        return value;
-    }
-
-    public void setValue(Node value) {
-        this.value = value;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+@JsonTypeName("AnnAssign")
+public class AnnAssignerNode extends LineEntryNode {
+
+    @JsonProperty("annotation")
+    private Node annotation;
+
+    @JsonProperty("simple")
+    private int simple;
+
+    @JsonProperty("target")
+    private Node target;
+
+    @JsonProperty("value")
+    private Node value;
+
+    public Node getAnnotation() {
+        return annotation;
+    }
+
+    public void setAnnotation(Node annotation) {
+        this.annotation = annotation;
+    }
+
+    public int getSimple() {
+        return simple;
+    }
+
+    public void setSimple(int simple) {
+        this.simple = simple;
+    }
+
+    public Node getTarget() {
+        return target;
+    }
+
+    public void setTarget(Node target) {
+        this.target = target;
+    }
+
+    public Node getValue() {
+        return value;
+    }
+
+    public void setValue(Node value) {
+        this.value = value;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ArgNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ArgNode.java
index 29757e2c40c..4190f937fc0 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ArgNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ArgNode.java
@@ -1,52 +1,52 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-@JsonTypeName("arg")
-public class ArgNode extends LineEntryNode {
-
-    @JsonProperty("annotation")
-    private Node annotation;
-
-    @JsonProperty("arg")
-    private String arg;
-
-    public Node getAnnotation() {
-        return annotation;
-    }
-
-    public void setAnnotation(Node annotation) {
-        this.annotation = annotation;
-    }
-
-    public String getArg() {
-        return arg;
-    }
-
-    public void setArg(String arg) {
-        this.arg = arg;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+@JsonTypeName("arg")
+public class ArgNode extends LineEntryNode {
+
+    @JsonProperty("annotation")
+    private Node annotation;
+
+    @JsonProperty("arg")
+    private String arg;
+
+    public Node getAnnotation() {
+        return annotation;
+    }
+
+    public void setAnnotation(Node annotation) {
+        this.annotation = annotation;
+    }
+
+    public String getArg() {
+        return arg;
+    }
+
+    public void setArg(String arg) {
+        this.arg = arg;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ArgumentsNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ArgumentsNode.java
index aeb366d08be..79346e621f1 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ArgumentsNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ArgumentsNode.java
@@ -1,46 +1,46 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonTypeName("arguments")
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class ArgumentsNode extends Node {
-
-    @JsonProperty("args")
-    private List<Node> args = new ArrayList<>();
-
-    public List<Node> getArgs() {
-        return args;
-    }
-
-    public void setArgs(List<Node> args) {
-        this.args = args;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@JsonTypeName("arguments")
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ArgumentsNode extends Node {
+
+    @JsonProperty("args")
+    private List<Node> args = new ArrayList<>();
+
+    public List<Node> getArgs() {
+        return args;
+    }
+
+    public void setArgs(List<Node> args) {
+        this.args = args;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AssignNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AssignNode.java
index da036c55320..e14fb28cb8d 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AssignNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AssignNode.java
@@ -1,55 +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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonTypeName("Assign")
-public class AssignNode extends LineEntryNode {
-
-    @JsonProperty("targets")
-    private List<Node> targets = new ArrayList<>();
-
-    @JsonProperty("value")
-    private Node value;
-
-    public List<Node> getTargets() {
-        return targets;
-    }
-
-    public void setTargets(List<Node> targets) {
-        this.targets = targets;
-    }
-
-    public Node getValue() {
-        return value;
-    }
-
-    public void setValue(Node value) {
-        this.value = value;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@JsonTypeName("Assign")
+public class AssignNode extends LineEntryNode {
+
+    @JsonProperty("targets")
+    private List<Node> targets = new ArrayList<>();
+
+    @JsonProperty("value")
+    private Node value;
+
+    public List<Node> getTargets() {
+        return targets;
+    }
+
+    public void setTargets(List<Node> targets) {
+        this.targets = targets;
+    }
+
+    public Node getValue() {
+        return value;
+    }
+
+    public void setValue(Node value) {
+        this.value = value;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AttributeNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AttributeNode.java
index b9665ebc997..cb86870d55e 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AttributeNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AttributeNode.java
@@ -1,63 +1,63 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-@JsonTypeName("Attribute")
-public class AttributeNode extends LineEntryNode {
-
-    @JsonProperty("attr")
-    private String attr;
-
-    @JsonProperty("ctx")
-    private ContextNode ctx;
-
-    @JsonProperty("value")
-    private Node value;
-
-    public String getAttr() {
-        return attr;
-    }
-
-    public void setAttr(String attr) {
-        this.attr = attr;
-    }
-
-    public ContextNode getCtx() {
-        return ctx;
-    }
-
-    public void setCtx(ContextNode ctx) {
-        this.ctx = ctx;
-    }
-
-    public Node getValue() {
-        return value;
-    }
-
-    public void setValue(Node value) {
-        this.value = value;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+@JsonTypeName("Attribute")
+public class AttributeNode extends LineEntryNode {
+
+    @JsonProperty("attr")
+    private String attr;
+
+    @JsonProperty("ctx")
+    private ContextNode ctx;
+
+    @JsonProperty("value")
+    private Node value;
+
+    public String getAttr() {
+        return attr;
+    }
+
+    public void setAttr(String attr) {
+        this.attr = attr;
+    }
+
+    public ContextNode getCtx() {
+        return ctx;
+    }
+
+    public void setCtx(ContextNode ctx) {
+        this.ctx = ctx;
+    }
+
+    public Node getValue() {
+        return value;
+    }
+
+    public void setValue(Node value) {
+        this.value = value;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AugAssignNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AugAssignNode.java
index 330f2138e7b..c9e5ea5bc0e 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AugAssignNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/AugAssignNode.java
@@ -1,63 +1,63 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-@JsonTypeName("AugAssign")
-public class AugAssignNode extends LineEntryNode {
-
-    @JsonProperty("op")
-    private Node op;
-
-    @JsonProperty("target")
-    private Node target;
-
-    @JsonProperty("value")
-    private Node value;
-
-    public Node getOp() {
-        return op;
-    }
-
-    public void setOp(Node op) {
-        this.op = op;
-    }
-
-    public Node getTarget() {
-        return target;
-    }
-
-    public void setTarget(Node target) {
-        this.target = target;
-    }
-
-    public Node getValue() {
-        return value;
-    }
-
-    public void setValue(Node value) {
-        this.value = value;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+@JsonTypeName("AugAssign")
+public class AugAssignNode extends LineEntryNode {
+
+    @JsonProperty("op")
+    private Node op;
+
+    @JsonProperty("target")
+    private Node target;
+
+    @JsonProperty("value")
+    private Node value;
+
+    public Node getOp() {
+        return op;
+    }
+
+    public void setOp(Node op) {
+        this.op = op;
+    }
+
+    public Node getTarget() {
+        return target;
+    }
+
+    public void setTarget(Node target) {
+        this.target = target;
+    }
+
+    public Node getValue() {
+        return value;
+    }
+
+    public void setValue(Node value) {
+        this.value = value;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/BinOpNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/BinOpNode.java
index 5c624b94165..be527a9d7ba 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/BinOpNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/BinOpNode.java
@@ -1,63 +1,63 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-@JsonTypeName("BinOp")
-public class BinOpNode extends LineEntryNode {
-
-    @JsonProperty("left")
-    private Node left;
-
-    @JsonProperty("op")
-    private Node op;
-
-    @JsonProperty("right")
-    private Node right;
-
-    public Node getLeft() {
-        return left;
-    }
-
-    public void setLeft(Node left) {
-        this.left = left;
-    }
-
-    public Node getOp() {
-        return op;
-    }
-
-    public void setOp(Node op) {
-        this.op = op;
-    }
-
-    public Node getRight() {
-        return right;
-    }
-
-    public void setRight(Node right) {
-        this.right = right;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+@JsonTypeName("BinOp")
+public class BinOpNode extends LineEntryNode {
+
+    @JsonProperty("left")
+    private Node left;
+
+    @JsonProperty("op")
+    private Node op;
+
+    @JsonProperty("right")
+    private Node right;
+
+    public Node getLeft() {
+        return left;
+    }
+
+    public void setLeft(Node left) {
+        this.left = left;
+    }
+
+    public Node getOp() {
+        return op;
+    }
+
+    public void setOp(Node op) {
+        this.op = op;
+    }
+
+    public Node getRight() {
+        return right;
+    }
+
+    public void setRight(Node right) {
+        this.right = right;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/CallNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/CallNode.java
index 60974d376f7..6053ba15842 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/CallNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/CallNode.java
@@ -1,66 +1,66 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonTypeName("Call")
-public class CallNode extends LineEntryNode {
-
-    @JsonProperty("args")
-    private List<Node> args = new ArrayList<>();
-
-    @JsonProperty("func")
-    private Node func;
-
-    @JsonProperty("keywords")
-    private List<Node> keywords = new ArrayList<>();
-
-    public List<Node> getArgs() {
-        return args;
-    }
-
-    public void setArgs(List<Node> args) {
-        this.args = args;
-    }
-
-    public Node getFunc() {
-        return func;
-    }
-
-    public void setFunc(Node func) {
-        this.func = func;
-    }
-
-    public List<Node> getKeywords() {
-        return keywords;
-    }
-
-    public void setKeywords(List<Node> keywords) {
-        this.keywords = keywords;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@JsonTypeName("Call")
+public class CallNode extends LineEntryNode {
+
+    @JsonProperty("args")
+    private List<Node> args = new ArrayList<>();
+
+    @JsonProperty("func")
+    private Node func;
+
+    @JsonProperty("keywords")
+    private List<Node> keywords = new ArrayList<>();
+
+    public List<Node> getArgs() {
+        return args;
+    }
+
+    public void setArgs(List<Node> args) {
+        this.args = args;
+    }
+
+    public Node getFunc() {
+        return func;
+    }
+
+    public void setFunc(Node func) {
+        this.func = func;
+    }
+
+    public List<Node> getKeywords() {
+        return keywords;
+    }
+
+    public void setKeywords(List<Node> keywords) {
+        this.keywords = keywords;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ClassDefNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ClassDefNode.java
index 579364aa686..9c2dfeb49c1 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ClassDefNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ClassDefNode.java
@@ -1,73 +1,73 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonTypeName("ClassDef")
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class ClassDefNode extends LineEntryNode {
-
-    @JsonProperty("bases")
-    private List<Node> bases = new ArrayList<>();
-
-    @JsonProperty("body")
-    private List<Node> body = new ArrayList<>();
-
-    @JsonProperty("name")
-    private String name;
-
-    @JsonCreator
-    public ClassDefNode() {
-    }
-
-    public List<Node> getBases() {
-        return bases;
-    }
-
-    public void setBases(List<Node> bases) {
-        this.bases = bases;
-    }
-
-    public List<Node> getBody() {
-        return body;
-    }
-
-    public void setBody(List<Node> body) {
-        this.body = body;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@JsonTypeName("ClassDef")
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ClassDefNode extends LineEntryNode {
+
+    @JsonProperty("bases")
+    private List<Node> bases = new ArrayList<>();
+
+    @JsonProperty("body")
+    private List<Node> body = new ArrayList<>();
+
+    @JsonProperty("name")
+    private String name;
+
+    @JsonCreator
+    public ClassDefNode() {
+    }
+
+    public List<Node> getBases() {
+        return bases;
+    }
+
+    public void setBases(List<Node> bases) {
+        this.bases = bases;
+    }
+
+    public List<Node> getBody() {
+        return body;
+    }
+
+    public void setBody(List<Node> body) {
+        this.body = body;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/CodePrinter.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/CodePrinter.java
index 187ebbbe3cb..03693167a5d 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/CodePrinter.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/CodePrinter.java
@@ -1,74 +1,74 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import java.util.stream.IntStream;
-
-/**
- * Helper class to print code.
- */
-public class CodePrinter {
-
-    private StringBuffer buffer = new StringBuffer();
-    private int tabSize;
-
-    private int intendationLvl = 0;
-
-    public CodePrinter(int tabSize) {
-        this.tabSize = tabSize;
-    }
-
-    public void startBlock() {
-        this.intendationLvl += tabSize;
-    }
-
-    public void endBlock() {
-        if (intendationLvl < tabSize) {
-            throw new RuntimeException("Closing a Block which is not open!");
-        }
-        this.intendationLvl -= tabSize;
-    }
-
-    public void write(String s) {
-        buffer.append(s);
-    }
-
-    public void startLine(String s) {
-        writeIntendation();
-    }
-
-    public void endLine() {
-        buffer.append("\n");
-    }
-
-    public void writeLine(String s) {
-        writeIntendation();
-        buffer.append(s);
-        buffer.append("\n");
-    }
-
-    private void writeIntendation() {
-        // Write the intendation
-        IntStream.range(0, intendationLvl).forEach(i -> buffer.append(" "));
-    }
-
-    public String getCode() {
-        return buffer.toString();
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import java.util.stream.IntStream;
+
+/**
+ * Helper class to print code.
+ */
+public class CodePrinter {
+
+    private StringBuffer buffer = new StringBuffer();
+    private int tabSize;
+
+    private int intendationLvl = 0;
+
+    public CodePrinter(int tabSize) {
+        this.tabSize = tabSize;
+    }
+
+    public void startBlock() {
+        this.intendationLvl += tabSize;
+    }
+
+    public void endBlock() {
+        if (intendationLvl < tabSize) {
+            throw new RuntimeException("Closing a Block which is not open!");
+        }
+        this.intendationLvl -= tabSize;
+    }
+
+    public void write(String s) {
+        buffer.append(s);
+    }
+
+    public void startLine(String s) {
+        writeIntendation();
+    }
+
+    public void endLine() {
+        buffer.append("\n");
+    }
+
+    public void writeLine(String s) {
+        writeIntendation();
+        buffer.append(s);
+        buffer.append("\n");
+    }
+
+    private void writeIntendation() {
+        // Write the intendation
+        IntStream.range(0, intendationLvl).forEach(i -> buffer.append(" "));
+    }
+
+    public String getCode() {
+        return buffer.toString();
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/CompareNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/CompareNode.java
index b238ab45821..0068824b3d4 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/CompareNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/CompareNode.java
@@ -1,66 +1,66 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonTypeName("Compare")
-public class CompareNode extends LineEntryNode {
-
-    @JsonProperty("comparators")
-    private List<Node> comparators = new ArrayList<>();
-
-    @JsonProperty("left")
-    private Node left;
-
-    @JsonProperty("ops")
-    private List<Node> ops;
-
-    public List<Node> getComparators() {
-        return comparators;
-    }
-
-    public void setComparators(List<Node> comparators) {
-        this.comparators = comparators;
-    }
-
-    public Node getLeft() {
-        return left;
-    }
-
-    public void setLeft(Node left) {
-        this.left = left;
-    }
-
-    public List<Node> getOps() {
-        return ops;
-    }
-
-    public void setOps(List<Node> ops) {
-        this.ops = ops;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@JsonTypeName("Compare")
+public class CompareNode extends LineEntryNode {
+
+    @JsonProperty("comparators")
+    private List<Node> comparators = new ArrayList<>();
+
+    @JsonProperty("left")
+    private Node left;
+
+    @JsonProperty("ops")
+    private List<Node> ops;
+
+    public List<Node> getComparators() {
+        return comparators;
+    }
+
+    public void setComparators(List<Node> comparators) {
+        this.comparators = comparators;
+    }
+
+    public Node getLeft() {
+        return left;
+    }
+
+    public void setLeft(Node left) {
+        this.left = left;
+    }
+
+    public List<Node> getOps() {
+        return ops;
+    }
+
+    public void setOps(List<Node> ops) {
+        this.ops = ops;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ContextNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ContextNode.java
index 03c15f298ab..f6c77972360 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ContextNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ContextNode.java
@@ -1,22 +1,22 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-public abstract class ContextNode extends Node {
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+public abstract class ContextNode extends Node {
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/EqNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/EqNode.java
index ae0b65bc7c1..c89c2ad8c6a 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/EqNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/EqNode.java
@@ -1,28 +1,28 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-@JsonTypeName("Eq")
-public class EqNode extends Node {
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+@JsonTypeName("Eq")
+public class EqNode extends Node {
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ExprNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ExprNode.java
index 39f8a7b8d9a..81317bd1898 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ExprNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ExprNode.java
@@ -1,41 +1,41 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-@JsonTypeName("Expr")
-public class ExprNode extends LineEntryNode {
-
-    @JsonProperty("value")
-    private Node value;
-
-    public Node getValue() {
-        return value;
-    }
-
-    public void setValue(Node value) {
-        this.value = value;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+@JsonTypeName("Expr")
+public class ExprNode extends LineEntryNode {
+
+    @JsonProperty("value")
+    private Node value;
+
+    public Node getValue() {
+        return value;
+    }
+
+    public void setValue(Node value) {
+        this.value = value;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/FunctionDefNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/FunctionDefNode.java
index 33e6c9aa2c3..b023251834a 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/FunctionDefNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/FunctionDefNode.java
@@ -1,79 +1,79 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonTypeName("FunctionDef")
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class FunctionDefNode extends LineEntryNode {
-
-    @JsonProperty("args")
-    private ArgumentsNode args;
-
-    @JsonProperty("body")
-    private List<Node> body = new ArrayList<>();
-
-    @JsonProperty("name")
-    private String name;
-
-    @JsonProperty("returns")
-    private Node returns;
-
-    public ArgumentsNode getArgs() {
-        return args;
-    }
-
-    public void setArgs(ArgumentsNode args) {
-        this.args = args;
-    }
-
-    public List<Node> getBody() {
-        return body;
-    }
-
-    public void setBody(List<Node> body) {
-        this.body = body;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Node getReturns() {
-        return returns;
-    }
-
-    public void setReturns(Node returns) {
-        this.returns = returns;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@JsonTypeName("FunctionDef")
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class FunctionDefNode extends LineEntryNode {
+
+    @JsonProperty("args")
+    private ArgumentsNode args;
+
+    @JsonProperty("body")
+    private List<Node> body = new ArrayList<>();
+
+    @JsonProperty("name")
+    private String name;
+
+    @JsonProperty("returns")
+    private Node returns;
+
+    public ArgumentsNode getArgs() {
+        return args;
+    }
+
+    public void setArgs(ArgumentsNode args) {
+        this.args = args;
+    }
+
+    public List<Node> getBody() {
+        return body;
+    }
+
+    public void setBody(List<Node> body) {
+        this.body = body;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Node getReturns() {
+        return returns;
+    }
+
+    public void setReturns(Node returns) {
+        this.returns = returns;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/IfNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/IfNode.java
index c9185ba0420..ef28b719029 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/IfNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/IfNode.java
@@ -1,66 +1,66 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonTypeName("If")
-public class IfNode extends LineEntryNode {
-
-    @JsonProperty("body")
-    private List<Node> body = new ArrayList<>();
-
-    @JsonProperty("orelse")
-    private List<Node> orelse = new ArrayList<>();
-
-    @JsonProperty("test")
-    private Node test;
-
-    public List<Node> getBody() {
-        return body;
-    }
-
-    public void setBody(List<Node> body) {
-        this.body = body;
-    }
-
-    public List<Node> getOrelse() {
-        return orelse;
-    }
-
-    public void setOrelse(List<Node> orelse) {
-        this.orelse = orelse;
-    }
-
-    public Node getTest() {
-        return test;
-    }
-
-    public void setTest(Node test) {
-        this.test = test;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@JsonTypeName("If")
+public class IfNode extends LineEntryNode {
+
+    @JsonProperty("body")
+    private List<Node> body = new ArrayList<>();
+
+    @JsonProperty("orelse")
+    private List<Node> orelse = new ArrayList<>();
+
+    @JsonProperty("test")
+    private Node test;
+
+    public List<Node> getBody() {
+        return body;
+    }
+
+    public void setBody(List<Node> body) {
+        this.body = body;
+    }
+
+    public List<Node> getOrelse() {
+        return orelse;
+    }
+
+    public void setOrelse(List<Node> orelse) {
+        this.orelse = orelse;
+    }
+
+    public Node getTest() {
+        return test;
+    }
+
+    public void setTest(Node test) {
+        this.test = test;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ImportFromNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ImportFromNode.java
index ab61026a64b..88d3e09f6c5 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ImportFromNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ImportFromNode.java
@@ -1,66 +1,66 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonTypeName("ImportFrom")
-public class ImportFromNode extends LineEntryNode {
-
-    @JsonProperty("level")
-    private long level;
-
-    @JsonProperty("module")
-    private String module;
-
-    @JsonProperty("names")
-    private List<Node> names = new ArrayList<>();
-
-    public long getLevel() {
-        return level;
-    }
-
-    public void setLevel(long level) {
-        this.level = level;
-    }
-
-    public String getModule() {
-        return module;
-    }
-
-    public void setModule(String module) {
-        this.module = module;
-    }
-
-    public List<Node> getNames() {
-        return names;
-    }
-
-    public void setNames(List<Node> names) {
-        this.names = names;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@JsonTypeName("ImportFrom")
+public class ImportFromNode extends LineEntryNode {
+
+    @JsonProperty("level")
+    private long level;
+
+    @JsonProperty("module")
+    private String module;
+
+    @JsonProperty("names")
+    private List<Node> names = new ArrayList<>();
+
+    public long getLevel() {
+        return level;
+    }
+
+    public void setLevel(long level) {
+        this.level = level;
+    }
+
+    public String getModule() {
+        return module;
+    }
+
+    public void setModule(String module) {
+        this.module = module;
+    }
+
+    public List<Node> getNames() {
+        return names;
+    }
+
+    public void setNames(List<Node> names) {
+        this.names = names;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/KeywordNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/KeywordNode.java
index f352d21b842..48303a21a02 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/KeywordNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/KeywordNode.java
@@ -1,52 +1,52 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-@JsonTypeName("keyword")
-public class KeywordNode extends Node {
-
-    @JsonProperty("arg")
-    private String arg;
-
-    @JsonProperty("value")
-    private Node value;
-
-    public String getArg() {
-        return arg;
-    }
-
-    public void setArg(String arg) {
-        this.arg = arg;
-    }
-
-    public Node getValue() {
-        return value;
-    }
-
-    public void setValue(Node value) {
-        this.value = value;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+@JsonTypeName("keyword")
+public class KeywordNode extends Node {
+
+    @JsonProperty("arg")
+    private String arg;
+
+    @JsonProperty("value")
+    private Node value;
+
+    public String getArg() {
+        return arg;
+    }
+
+    public void setArg(String arg) {
+        this.arg = arg;
+    }
+
+    public Node getValue() {
+        return value;
+    }
+
+    public void setValue(Node value) {
+        this.value = value;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/LineEntryNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/LineEntryNode.java
index 227fa2c2f99..36e1315ca4a 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/LineEntryNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/LineEntryNode.java
@@ -1,46 +1,46 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public abstract class LineEntryNode extends Node {
-
-    @JsonProperty("col_offset")
-    private long colOffset;
-
-    @JsonProperty("lineno")
-    private long lineno;
-
-    public long getColOffset() {
-        return colOffset;
-    }
-
-    public void setColOffset(long colOffset) {
-        this.colOffset = colOffset;
-    }
-
-    public long getLineno() {
-        return lineno;
-    }
-
-    public void setLineno(long lineno) {
-        this.lineno = lineno;
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public abstract class LineEntryNode extends Node {
+
+    @JsonProperty("col_offset")
+    private long colOffset;
+
+    @JsonProperty("lineno")
+    private long lineno;
+
+    public long getColOffset() {
+        return colOffset;
+    }
+
+    public void setColOffset(long colOffset) {
+        this.colOffset = colOffset;
+    }
+
+    public long getLineno() {
+        return lineno;
+    }
+
+    public void setLineno(long lineno) {
+        this.lineno = lineno;
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ListNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ListNode.java
index 59f851103f6..4e63cc76b28 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ListNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ListNode.java
@@ -1,55 +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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonTypeName("List")
-public class ListNode extends LineEntryNode {
-
-    @JsonProperty("ctx")
-    private ContextNode ctx;
-
-    @JsonProperty("elts")
-    private List<Node> elts = new ArrayList<>();
-
-    public ContextNode getCtx() {
-        return ctx;
-    }
-
-    public void setCtx(ContextNode ctx) {
-        this.ctx = ctx;
-    }
-
-    public List<Node> getElts() {
-        return elts;
-    }
-
-    public void setElts(List<Node> elts) {
-        this.elts = elts;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@JsonTypeName("List")
+public class ListNode extends LineEntryNode {
+
+    @JsonProperty("ctx")
+    private ContextNode ctx;
+
+    @JsonProperty("elts")
+    private List<Node> elts = new ArrayList<>();
+
+    public ContextNode getCtx() {
+        return ctx;
+    }
+
+    public void setCtx(ContextNode ctx) {
+        this.ctx = ctx;
+    }
+
+    public List<Node> getElts() {
+        return elts;
+    }
+
+    public void setElts(List<Node> elts) {
+        this.elts = elts;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/LoadNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/LoadNode.java
index 1aeca83f433..64d7e9bea6d 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/LoadNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/LoadNode.java
@@ -1,28 +1,28 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-@JsonTypeName("Load")
-public class LoadNode extends ContextNode {
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+@JsonTypeName("Load")
+public class LoadNode extends ContextNode {
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ModuleNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ModuleNode.java
index 9a4eb37e34f..e4ae53a567e 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ModuleNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ModuleNode.java
@@ -1,44 +1,44 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonTypeName("Module")
-public class ModuleNode extends Node {
-
-    @JsonProperty
-    private List<Node> body = new ArrayList<>();
-
-    public List<Node> getBody() {
-        return body;
-    }
-
-    public void setBody(List<Node> body) {
-        this.body = body;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@JsonTypeName("Module")
+public class ModuleNode extends Node {
+
+    @JsonProperty
+    private List<Node> body = new ArrayList<>();
+
+    public List<Node> getBody() {
+        return body;
+    }
+
+    public void setBody(List<Node> body) {
+        this.body = body;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
 }
\ No newline at end of file
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/MultNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/MultNode.java
index 4c64135e867..78517502fd1 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/MultNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/MultNode.java
@@ -1,28 +1,28 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-@JsonTypeName("Mult")
-public class MultNode extends LineEntryNode {
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+@JsonTypeName("Mult")
+public class MultNode extends LineEntryNode {
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/NameConstantNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/NameConstantNode.java
index 11a812d29ca..03ba3990ab1 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/NameConstantNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/NameConstantNode.java
@@ -1,41 +1,41 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-@JsonTypeName("NameConstant")
-public class NameConstantNode extends LineEntryNode {
-
-    @JsonProperty("value")
-    private boolean value;
-
-    public boolean isValue() {
-        return value;
-    }
-
-    public void setValue(boolean value) {
-        this.value = value;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+@JsonTypeName("NameConstant")
+public class NameConstantNode extends LineEntryNode {
+
+    @JsonProperty("value")
+    private boolean value;
+
+    public boolean isValue() {
+        return value;
+    }
+
+    public void setValue(boolean value) {
+        this.value = value;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/NameNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/NameNode.java
index 1d1b6090f68..f279daae254 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/NameNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/NameNode.java
@@ -1,52 +1,52 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-@JsonTypeName("Name")
-public class NameNode extends LineEntryNode {
-
-    @JsonProperty("ctx")
-    private ContextNode ctx;
-
-    @JsonProperty("id")
-    private String id;
-
-    public ContextNode getCtx() {
-        return ctx;
-    }
-
-    public void setCtx(ContextNode ctx) {
-        this.ctx = ctx;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+@JsonTypeName("Name")
+public class NameNode extends LineEntryNode {
+
+    @JsonProperty("ctx")
+    private ContextNode ctx;
+
+    @JsonProperty("id")
+    private String id;
+
+    public ContextNode getCtx() {
+        return ctx;
+    }
+
+    public void setCtx(ContextNode ctx) {
+        this.ctx = ctx;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/Node.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/Node.java
index aa9641b2342..f9910e008fb 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/Node.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/Node.java
@@ -1,29 +1,29 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
-@JsonTypeInfo(
-    use = JsonTypeInfo.Id.NAME,
-    property = "_type")
-public abstract class Node {
-
-    public abstract <T> T accept(NodeVisitor<T> visitor);
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+
+@JsonTypeInfo(
+    use = JsonTypeInfo.Id.NAME,
+    property = "_type")
+public abstract class Node {
+
+    public abstract <T> T accept(NodeVisitor<T> visitor);
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/NodeVisitor.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/NodeVisitor.java
index 18913f1b1ec..a7400a71327 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/NodeVisitor.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/NodeVisitor.java
@@ -1,86 +1,86 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-public interface NodeVisitor<T> {
-
-    T visit(AugAssignNode augAssignNode);
-
-    T visit(AddNode addNode);
-
-    T visit(EqNode eqNode);
-
-    T visit(IfNode ifNode);
-
-    T visit(WhileNode whileNode);
-
-    T visit(NotEqNode notEqNode);
-
-    T visit(NumNode numNode);
-
-    T visit(PassNode passNode);
-
-    T visit(ReturnNode returnNode);
-
-    T visit(StoreNode storeNode);
-
-    T visit(StrNode strNode);
-
-    T visit(TupleNode tupleNode);
-
-    T visit(NameNode nameNode);
-
-    T visit(NameConstantNode nameConstantNode);
-
-    T visit(MultNode multNode);
-
-    T visit(ModuleNode moduleNode);
-
-    T visit(LoadNode loadNode);
-
-    T visit(ListNode listNode);
-
-    T visit(KeywordNode keywordNode);
-
-    T visit(ImportFromNode importFromNode);
-
-    T visit(FunctionDefNode functionDefNode);
-
-    T visit(ExprNode exprNode);
-
-    T visit(CompareNode compareNode);
-
-    T visit(AliasNode aliasNode);
-
-    T visit(AnnAssignerNode annAssignerNode);
-
-    T visit(ArgNode argNode);
-
-    T visit(ClassDefNode classDefNode);
-
-    T visit(CallNode callNode);
-
-    T visit(BinOpNode binOpNode);
-
-    T visit(AttributeNode attributeNode);
-
-    T visit(AssignNode assignNode);
-
-    T visit(ArgumentsNode argumentsNode);
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+public interface NodeVisitor<T> {
+
+    T visit(AugAssignNode augAssignNode);
+
+    T visit(AddNode addNode);
+
+    T visit(EqNode eqNode);
+
+    T visit(IfNode ifNode);
+
+    T visit(WhileNode whileNode);
+
+    T visit(NotEqNode notEqNode);
+
+    T visit(NumNode numNode);
+
+    T visit(PassNode passNode);
+
+    T visit(ReturnNode returnNode);
+
+    T visit(StoreNode storeNode);
+
+    T visit(StrNode strNode);
+
+    T visit(TupleNode tupleNode);
+
+    T visit(NameNode nameNode);
+
+    T visit(NameConstantNode nameConstantNode);
+
+    T visit(MultNode multNode);
+
+    T visit(ModuleNode moduleNode);
+
+    T visit(LoadNode loadNode);
+
+    T visit(ListNode listNode);
+
+    T visit(KeywordNode keywordNode);
+
+    T visit(ImportFromNode importFromNode);
+
+    T visit(FunctionDefNode functionDefNode);
+
+    T visit(ExprNode exprNode);
+
+    T visit(CompareNode compareNode);
+
+    T visit(AliasNode aliasNode);
+
+    T visit(AnnAssignerNode annAssignerNode);
+
+    T visit(ArgNode argNode);
+
+    T visit(ClassDefNode classDefNode);
+
+    T visit(CallNode callNode);
+
+    T visit(BinOpNode binOpNode);
+
+    T visit(AttributeNode attributeNode);
+
+    T visit(AssignNode assignNode);
+
+    T visit(ArgumentsNode argumentsNode);
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/NotEqNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/NotEqNode.java
index 7591c2f723a..54d561a1d05 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/NotEqNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/NotEqNode.java
@@ -1,28 +1,28 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-@JsonTypeName("NotEq")
-public class NotEqNode extends Node {
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+@JsonTypeName("NotEq")
+public class NotEqNode extends Node {
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/NumNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/NumNode.java
index b002a6f6ed6..977ea6ba9ad 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/NumNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/NumNode.java
@@ -1,41 +1,41 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-@JsonTypeName("Num")
-public class NumNode extends LineEntryNode {
-
-    @JsonProperty("n")
-    private double n;
-
-    public double getN() {
-        return n;
-    }
-
-    public void setN(double n) {
-        this.n = n;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+@JsonTypeName("Num")
+public class NumNode extends LineEntryNode {
+
+    @JsonProperty("n")
+    private double n;
+
+    public double getN() {
+        return n;
+    }
+
+    public void setN(double n) {
+        this.n = n;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/PassNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/PassNode.java
index e81ba83711c..fd2a1a3e9e7 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/PassNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/PassNode.java
@@ -1,28 +1,28 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-@JsonTypeName("Pass")
-public class PassNode extends LineEntryNode {
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+@JsonTypeName("Pass")
+public class PassNode extends LineEntryNode {
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ReturnNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ReturnNode.java
index 3b0b0573a19..31e053249b8 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ReturnNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/ReturnNode.java
@@ -1,41 +1,41 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-@JsonTypeName("Return")
-public class ReturnNode extends LineEntryNode {
-
-    @JsonProperty("value")
-    private Node value;
-
-    public Node getValue() {
-        return value;
-    }
-
-    public void setValue(Node value) {
-        this.value = value;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+@JsonTypeName("Return")
+public class ReturnNode extends LineEntryNode {
+
+    @JsonProperty("value")
+    private Node value;
+
+    public Node getValue() {
+        return value;
+    }
+
+    public void setValue(Node value) {
+        this.value = value;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/StoreNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/StoreNode.java
index 36772870a15..1600d7b500f 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/StoreNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/StoreNode.java
@@ -1,28 +1,28 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-@JsonTypeName("Store")
-public class StoreNode extends ContextNode {
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+@JsonTypeName("Store")
+public class StoreNode extends ContextNode {
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/StrNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/StrNode.java
index d60f39a8bb6..1a01bfe7118 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/StrNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/StrNode.java
@@ -1,41 +1,41 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-@JsonTypeName("Str")
-public class StrNode extends LineEntryNode {
-
-    @JsonProperty("s")
-    private String s;
-
-    public String getS() {
-        return s;
-    }
-
-    public void setS(String s) {
-        this.s = s;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+@JsonTypeName("Str")
+public class StrNode extends LineEntryNode {
+
+    @JsonProperty("s")
+    private String s;
+
+    public String getS() {
+        return s;
+    }
+
+    public void setS(String s) {
+        this.s = s;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/TupleNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/TupleNode.java
index 3f93738124e..778310718f7 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/TupleNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/TupleNode.java
@@ -1,55 +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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonTypeName("Tuple")
-public class TupleNode extends LineEntryNode {
-
-    @JsonProperty("ctx")
-    private ContextNode ctx;
-
-    @JsonProperty("elts")
-    private List<Node> elts = new ArrayList<>();
-
-    public ContextNode getCtx() {
-        return ctx;
-    }
-
-    public void setCtx(ContextNode ctx) {
-        this.ctx = ctx;
-    }
-
-    public List<Node> getElts() {
-        return elts;
-    }
-
-    public void setElts(List<Node> elts) {
-        this.elts = elts;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@JsonTypeName("Tuple")
+public class TupleNode extends LineEntryNode {
+
+    @JsonProperty("ctx")
+    private ContextNode ctx;
+
+    @JsonProperty("elts")
+    private List<Node> elts = new ArrayList<>();
+
+    public ContextNode getCtx() {
+        return ctx;
+    }
+
+    public void setCtx(ContextNode ctx) {
+        this.ctx = ctx;
+    }
+
+    public List<Node> getElts() {
+        return elts;
+    }
+
+    public void setElts(List<Node> elts) {
+        this.elts = elts;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/WhileNode.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/WhileNode.java
index a4d4dd550fd..1e1db947db9 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/WhileNode.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/python/WhileNode.java
@@ -1,66 +1,66 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.python;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonTypeName("While")
-public class WhileNode extends LineEntryNode {
-
-    @JsonProperty("body")
-    private List<Node> body = new ArrayList<>();
-
-    @JsonProperty("orelse")
-    private List<Node> orelse = new ArrayList<>();
-
-    @JsonProperty("test")
-    private Node test;
-
-    public List<Node> getBody() {
-        return body;
-    }
-
-    public void setBody(List<Node> body) {
-        this.body = body;
-    }
-
-    public List<Node> getOrelse() {
-        return orelse;
-    }
-
-    public void setOrelse(List<Node> orelse) {
-        this.orelse = orelse;
-    }
-
-    public Node getTest() {
-        return test;
-    }
-
-    public void setTest(Node test) {
-        this.test = test;
-    }
-
-    @Override public <T> T accept(NodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.python;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@JsonTypeName("While")
+public class WhileNode extends LineEntryNode {
+
+    @JsonProperty("body")
+    private List<Node> body = new ArrayList<>();
+
+    @JsonProperty("orelse")
+    private List<Node> orelse = new ArrayList<>();
+
+    @JsonProperty("test")
+    private Node test;
+
+    public List<Node> getBody() {
+        return body;
+    }
+
+    public void setBody(List<Node> body) {
+        this.body = body;
+    }
+
+    public List<Node> getOrelse() {
+        return orelse;
+    }
+
+    public void setOrelse(List<Node> orelse) {
+        this.orelse = orelse;
+    }
+
+    public Node getTest() {
+        return test;
+    }
+
+    public void setTest(Node test) {
+        this.test = test;
+    }
+
+    @Override public <T> T accept(NodeVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/util/BufferUtil.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/util/BufferUtil.java
index 8ade65829b2..44e544c6436 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/util/BufferUtil.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/util/BufferUtil.java
@@ -1,45 +1,45 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.util;
-
-import org.apache.plc4x.codegen.ast.Expressions;
-import org.apache.plc4x.codegen.ast.Method;
-import org.apache.plc4x.codegen.ast.Primitive;
-import org.apache.plc4x.codegen.ast.TypeDefinition;
-
-import java.util.Collections;
-
-/**
- * This class defines constants necessary for the code generation related to the
- * "Buffer API" which has to be implemented natively.
- */
-public class BufferUtil {
-
-    static final TypeDefinition BUFFER_TYPE = Expressions.typeOf("org.apache.plc4x.codegen.api.Buffer");
-
-    // Read Methods
-    static final Method READ_UINT8 = new Method(BUFFER_TYPE, "readUint8", Primitive.INTEGER, Collections.emptyList(), Collections.emptyList());
-    static final Method READ_UINT16 = new Method(BUFFER_TYPE, "readUint16", Primitive.INTEGER, Collections.emptyList(), Collections.emptyList());
-    static final Method READ_UINT32 = new Method(BUFFER_TYPE, "readUint32", Primitive.LONG, Collections.emptyList(), Collections.emptyList());
-
-    private BufferUtil() {
-    }
-
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.util;
+
+import org.apache.plc4x.codegen.ast.Expressions;
+import org.apache.plc4x.codegen.ast.Method;
+import org.apache.plc4x.codegen.ast.Primitive;
+import org.apache.plc4x.codegen.ast.TypeDefinition;
+
+import java.util.Collections;
+
+/**
+ * This class defines constants necessary for the code generation related to the
+ * "Buffer API" which has to be implemented natively.
+ */
+public class BufferUtil {
+
+    static final TypeDefinition BUFFER_TYPE = Expressions.typeOf("org.apache.plc4x.codegen.api.Buffer");
+
+    // Read Methods
+    static final Method READ_UINT8 = new Method(BUFFER_TYPE, "readUint8", Primitive.INTEGER, Collections.emptyList(), Collections.emptyList());
+    static final Method READ_UINT16 = new Method(BUFFER_TYPE, "readUint16", Primitive.INTEGER, Collections.emptyList(), Collections.emptyList());
+    static final Method READ_UINT32 = new Method(BUFFER_TYPE, "readUint32", Primitive.LONG, Collections.emptyList(), Collections.emptyList());
+
+    private BufferUtil() {
+    }
+
+
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/util/EnumFactory.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/util/EnumFactory.java
index c5866e04506..917a852e51f 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/util/EnumFactory.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/util/EnumFactory.java
@@ -1,153 +1,153 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.util;
-
-import org.apache.plc4x.codegen.ast.*;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * Creates Enum Like things...
- */
-public class EnumFactory {
-
-    public ClassDeclaration create(PojoDescription desc, List<EnumEntry> enumEntries) {
-        // Create all Fields first
-        final List<Node> constructorStatements = new ArrayList<>();
-        final List<FieldDeclaration> fields = new ArrayList<>();
-        for (Field field1 : desc.fields) {
-            FieldDeclaration fieldDeclaration = new FieldDeclaration(field1.getType(), field1.getName(), Modifier.PRIVATE, Modifier.FINAL);
-            fields.add(fieldDeclaration);
-            constructorStatements.add(Expressions.assignment(
-                Expressions.field(field1.getName()),
-                Expressions.parameter(field1.getName(), field1.getType())
-            ));
-        }
-
-        // Create the Getters
-        final List<MethodDefinition> getters = desc.fields.stream()
-            .map(field -> getGetterDefinition(field.getName(), field.getType()))
-            .collect(Collectors.toList());
-
-        // Now add all these getters
-        final List<MethodDefinition> methods = new ArrayList<>(getters);
-
-        final ArrayList<FieldDeclaration> finalFields = new ArrayList<>();
-
-        // Now add all these static methods on top
-        for (EnumEntry enumEntry : enumEntries) {
-            final TypeDefinition clazzType = Expressions.typeOf(desc.getName());
-            final String fieldName = enumEntry.getName().toUpperCase();
-            finalFields.add(new FieldDeclaration(
-                new HashSet<>(Arrays.asList(Modifier.STATIC, Modifier.FINAL)),
-                clazzType,
-                fieldName,
-                Expressions.new_(clazzType, enumEntry.getArguments())
-            ));
-        }
-
-        finalFields.addAll(fields);
-
-        // Add constructor
-        final ConstructorDeclaration constructor = new ConstructorDeclaration(Collections.singleton(Modifier.PRIVATE),
-            desc.fields.stream()
-                .map(field -> Expressions.parameter(field.getName(), field.getType())).collect(Collectors.toList()),
-            Block.build().add(constructorStatements).toBlock());
-
-
-        return new ClassDeclaration("", desc.getName(), finalFields, Arrays.asList(constructor), methods, null);
-    }
-
-    static MethodDefinition getGetterDefinition(String name, TypeDefinition type) {
-        String getter = "get" + name.substring(0, 1).toUpperCase() + name.substring(1);
-        Block body = Block.build().add(Expressions.return_(Expressions.field(name))).toBlock();
-        return new MethodDefinition(getter, type, Collections.emptyList(), body);
-    }
-
-    static MethodDefinition getSetterDefinition(String name, TypeDefinition type) {
-        String getter = "set" + name.substring(0, 1).toUpperCase() + name.substring(1);
-        final ParameterExpression param = Expressions.parameter(name, type);
-        Block body = Block.build().add(Expressions.assignment(Expressions.field(name), param)).toBlock();
-        return new MethodDefinition(getter, Primitive.VOID, Collections.singletonList(param), body);
-    }
-
-    public static class EnumEntry {
-
-        private final String name;
-        private final List<Node> arguments;
-
-        public EnumEntry(String name, List<Node> arguments) {
-            this.name = name;
-            this.arguments = arguments;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public List<Node> getArguments() {
-            return arguments;
-        }
-    }
-
-    public static class PojoDescription {
-
-        private final String name;
-        private final List<Field> fields;
-
-        public PojoDescription(String name, Field... fields) {
-            this.name = name;
-            this.fields = Arrays.asList(fields);
-        }
-
-        public PojoDescription(String name, List<Field> fields) {
-            this.name = name;
-            this.fields = fields;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public List<Field> getFields() {
-            return fields;
-        }
-    }
-
-    public static class Field {
-
-        private final TypeDefinition type;
-        private final String name;
-
-        public Field(TypeDefinition type, String name) {
-            this.type = type;
-            this.name = name;
-        }
-
-        public TypeDefinition getType() {
-            return type;
-        }
-
-        public String getName() {
-            return name;
-        }
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.util;
+
+import org.apache.plc4x.codegen.ast.*;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * Creates Enum Like things...
+ */
+public class EnumFactory {
+
+    public ClassDeclaration create(PojoDescription desc, List<EnumEntry> enumEntries) {
+        // Create all Fields first
+        final List<Node> constructorStatements = new ArrayList<>();
+        final List<FieldDeclaration> fields = new ArrayList<>();
+        for (Field field1 : desc.fields) {
+            FieldDeclaration fieldDeclaration = new FieldDeclaration(field1.getType(), field1.getName(), Modifier.PRIVATE, Modifier.FINAL);
+            fields.add(fieldDeclaration);
+            constructorStatements.add(Expressions.assignment(
+                Expressions.field(field1.getName()),
+                Expressions.parameter(field1.getName(), field1.getType())
+            ));
+        }
+
+        // Create the Getters
+        final List<MethodDefinition> getters = desc.fields.stream()
+            .map(field -> getGetterDefinition(field.getName(), field.getType()))
+            .collect(Collectors.toList());
+
+        // Now add all these getters
+        final List<MethodDefinition> methods = new ArrayList<>(getters);
+
+        final ArrayList<FieldDeclaration> finalFields = new ArrayList<>();
+
+        // Now add all these static methods on top
+        for (EnumEntry enumEntry : enumEntries) {
+            final TypeDefinition clazzType = Expressions.typeOf(desc.getName());
+            final String fieldName = enumEntry.getName().toUpperCase();
+            finalFields.add(new FieldDeclaration(
+                new HashSet<>(Arrays.asList(Modifier.STATIC, Modifier.FINAL)),
+                clazzType,
+                fieldName,
+                Expressions.new_(clazzType, enumEntry.getArguments())
+            ));
+        }
+
+        finalFields.addAll(fields);
+
+        // Add constructor
+        final ConstructorDeclaration constructor = new ConstructorDeclaration(Collections.singleton(Modifier.PRIVATE),
+            desc.fields.stream()
+                .map(field -> Expressions.parameter(field.getName(), field.getType())).collect(Collectors.toList()),
+            Block.build().add(constructorStatements).toBlock());
+
+
+        return new ClassDeclaration("", desc.getName(), finalFields, Arrays.asList(constructor), methods, null);
+    }
+
+    static MethodDefinition getGetterDefinition(String name, TypeDefinition type) {
+        String getter = "get" + name.substring(0, 1).toUpperCase() + name.substring(1);
+        Block body = Block.build().add(Expressions.return_(Expressions.field(name))).toBlock();
+        return new MethodDefinition(getter, type, Collections.emptyList(), body);
+    }
+
+    static MethodDefinition getSetterDefinition(String name, TypeDefinition type) {
+        String getter = "set" + name.substring(0, 1).toUpperCase() + name.substring(1);
+        final ParameterExpression param = Expressions.parameter(name, type);
+        Block body = Block.build().add(Expressions.assignment(Expressions.field(name), param)).toBlock();
+        return new MethodDefinition(getter, Primitive.VOID, Collections.singletonList(param), body);
+    }
+
+    public static class EnumEntry {
+
+        private final String name;
+        private final List<Node> arguments;
+
+        public EnumEntry(String name, List<Node> arguments) {
+            this.name = name;
+            this.arguments = arguments;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public List<Node> getArguments() {
+            return arguments;
+        }
+    }
+
+    public static class PojoDescription {
+
+        private final String name;
+        private final List<Field> fields;
+
+        public PojoDescription(String name, Field... fields) {
+            this.name = name;
+            this.fields = Arrays.asList(fields);
+        }
+
+        public PojoDescription(String name, List<Field> fields) {
+            this.name = name;
+            this.fields = fields;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public List<Field> getFields() {
+            return fields;
+        }
+    }
+
+    public static class Field {
+
+        private final TypeDefinition type;
+        private final String name;
+
+        public Field(TypeDefinition type, String name) {
+            this.type = type;
+            this.name = name;
+        }
+
+        public TypeDefinition getType() {
+            return type;
+        }
+
+        public String getName() {
+            return name;
+        }
+    }
+
+}
diff --git a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/util/PojoFactory.java b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/util/PojoFactory.java
index c7a1fac17c1..65a4e60d3c9 100644
--- a/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/util/PojoFactory.java
+++ b/sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/util/PojoFactory.java
@@ -1,120 +1,120 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.util;
-
-import org.apache.plc4x.codegen.ast.*;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static org.apache.plc4x.codegen.util.EnumFactory.getGetterDefinition;
-import static org.apache.plc4x.codegen.util.EnumFactory.getSetterDefinition;
-
-public class PojoFactory {
-
-    public ClassDeclaration create(PojoDescription desc) {
-        // Create all Fields first
-        final List<FieldDeclaration> fields = desc.fields.stream()
-            .map(field -> new FieldDeclaration(field.getType(), field.getName(), Modifier.PRIVATE))
-            .collect(Collectors.toList());
-
-        // Create the Getters
-        final List<MethodDefinition> getters = desc.fields.stream()
-            .map(field -> getGetterDefinition(field.getName(), field.getType()))
-            .collect(Collectors.toList());
-
-        // Create the Setters
-        final List<MethodDefinition> setters = desc.fields.stream()
-            .map(field -> getSetterDefinition(field.getName(), field.getType()))
-            .collect(Collectors.toList());
-
-        final List<MethodDefinition> methods = new ArrayList<>();
-
-        methods.addAll(getters);
-        methods.addAll(setters);
-
-        // Encode Method
-        methods.add(new MethodDefinition("encode", Primitive.VOID, Collections.singletonList(
-            Expressions.parameter("buffer", BufferUtil.BUFFER_TYPE)
-        ), Block.build().toBlock()));
-
-        // Decode Method
-        final ParameterExpression buffer = Expressions.parameter("buffer", BufferUtil.BUFFER_TYPE);
-        final TypeDefinition clazz = Expressions.typeOf(desc.getName());
-        final ParameterExpression instance = Expressions.parameter("instance", clazz);
-        methods.add(new MethodDefinition(Collections.singleton(Modifier.STATIC), "decode", clazz, Collections.singletonList(
-            buffer
-        ), Block.build()
-            .add(Expressions.declaration(instance, Expressions.new_(clazz)))
-            .add(Expressions.call(buffer, BufferUtil.READ_UINT8))
-            .add(Expressions.return_(instance))
-            .toBlock()
-        ));
-
-
-        return new ClassDeclaration("", desc.getName(), fields, Arrays.asList(new ConstructorDeclaration(Collections.emptyList(), Block.EMPTY_BLOCK)), methods, null);
-    }
-
-    public static class PojoDescription {
-
-        private final String name;
-        private final List<Field> fields;
-
-        public PojoDescription(String name, Field... fields) {
-            this.name = name;
-            this.fields = Arrays.asList(fields);
-        }
-
-        public PojoDescription(String name, List<Field> fields) {
-            this.name = name;
-            this.fields = fields;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public List<Field> getFields() {
-            return fields;
-        }
-    }
-
-    public static class Field {
-
-        private final TypeDefinition type;
-        private final String name;
-
-        public Field(TypeDefinition type, String name) {
-            this.type = type;
-            this.name = name;
-        }
-
-        public TypeDefinition getType() {
-            return type;
-        }
-
-        public String getName() {
-            return name;
-        }
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.util;
+
+import org.apache.plc4x.codegen.ast.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.apache.plc4x.codegen.util.EnumFactory.getGetterDefinition;
+import static org.apache.plc4x.codegen.util.EnumFactory.getSetterDefinition;
+
+public class PojoFactory {
+
+    public ClassDeclaration create(PojoDescription desc) {
+        // Create all Fields first
+        final List<FieldDeclaration> fields = desc.fields.stream()
+            .map(field -> new FieldDeclaration(field.getType(), field.getName(), Modifier.PRIVATE))
+            .collect(Collectors.toList());
+
+        // Create the Getters
+        final List<MethodDefinition> getters = desc.fields.stream()
+            .map(field -> getGetterDefinition(field.getName(), field.getType()))
+            .collect(Collectors.toList());
+
+        // Create the Setters
+        final List<MethodDefinition> setters = desc.fields.stream()
+            .map(field -> getSetterDefinition(field.getName(), field.getType()))
+            .collect(Collectors.toList());
+
+        final List<MethodDefinition> methods = new ArrayList<>();
+
+        methods.addAll(getters);
+        methods.addAll(setters);
+
+        // Encode Method
+        methods.add(new MethodDefinition("encode", Primitive.VOID, Collections.singletonList(
+            Expressions.parameter("buffer", BufferUtil.BUFFER_TYPE)
+        ), Block.build().toBlock()));
+
+        // Decode Method
+        final ParameterExpression buffer = Expressions.parameter("buffer", BufferUtil.BUFFER_TYPE);
+        final TypeDefinition clazz = Expressions.typeOf(desc.getName());
+        final ParameterExpression instance = Expressions.parameter("instance", clazz);
+        methods.add(new MethodDefinition(Collections.singleton(Modifier.STATIC), "decode", clazz, Collections.singletonList(
+            buffer
+        ), Block.build()
+            .add(Expressions.declaration(instance, Expressions.new_(clazz)))
+            .add(Expressions.call(buffer, BufferUtil.READ_UINT8))
+            .add(Expressions.return_(instance))
+            .toBlock()
+        ));
+
+
+        return new ClassDeclaration("", desc.getName(), fields, Arrays.asList(new ConstructorDeclaration(Collections.emptyList(), Block.EMPTY_BLOCK)), methods, null);
+    }
+
+    public static class PojoDescription {
+
+        private final String name;
+        private final List<Field> fields;
+
+        public PojoDescription(String name, Field... fields) {
+            this.name = name;
+            this.fields = Arrays.asList(fields);
+        }
+
+        public PojoDescription(String name, List<Field> fields) {
+            this.name = name;
+            this.fields = fields;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public List<Field> getFields() {
+            return fields;
+        }
+    }
+
+    public static class Field {
+
+        private final TypeDefinition type;
+        private final String name;
+
+        public Field(TypeDefinition type, String name) {
+            this.type = type;
+            this.name = name;
+        }
+
+        public TypeDefinition getType() {
+            return type;
+        }
+
+        public String getName() {
+            return name;
+        }
+    }
+
+}
diff --git a/sandbox/code-gen/src/main/resources/example.json b/sandbox/code-gen/src/main/resources/example.json
index 8faa3d9cb48..0b4d298883c 100644
--- a/sandbox/code-gen/src/main/resources/example.json
+++ b/sandbox/code-gen/src/main/resources/example.json
@@ -1,142 +1,142 @@
-{
-    "_type": "Module",
-    "body": [
-        {
-            "_type": "ClassDef",
-            "bases": [],
-            "body": [
-                {
-                    "_type": "Pass",
-                    "col_offset": 4,
-                    "lineno": 5
-                }
-            ],
-            "col_offset": 0,
-            "decorator_list": [],
-            "keywords": [],
-            "lineno": 4,
-            "name": "MyClass"
-        },
-        {
-            "_type": "FunctionDef",
-            "args": {
-                "_type": "arguments",
-                "args": [],
-                "defaults": [],
-                "kw_defaults": [],
-                "kwarg": null,
-                "kwonlyargs": [],
-                "vararg": null
-            },
-            "body": [
-                {
-                    "_type": "Expr",
-                    "col_offset": 4,
-                    "lineno": 8,
-                    "value": {
-                        "_type": "Call",
-                        "args": [
-                            {
-                                "_type": "Str",
-                                "col_offset": 10,
-                                "lineno": 8,
-                                "s": "Hallo"
-                            }
-                        ],
-                        "col_offset": 4,
-                        "func": {
-                            "_type": "Name",
-                            "col_offset": 4,
-                            "ctx": {
-                                "_type": "Load"
-                            },
-                            "id": "print",
-                            "lineno": 8
-                        },
-                        "keywords": [],
-                        "lineno": 8
-                    }
-                }
-            ],
-            "col_offset": 0,
-            "decorator_list": [],
-            "lineno": 7,
-            "name": "myMethod",
-            "returns": null
-        },
-        {
-            "_type": "Expr",
-            "col_offset": 0,
-            "lineno": 10,
-            "value": {
-                "_type": "Call",
-                "args": [],
-                "col_offset": 0,
-                "func": {
-                    "_type": "Name",
-                    "col_offset": 0,
-                    "ctx": {
-                        "_type": "Load"
-                    },
-                    "id": "myMethod",
-                    "lineno": 10
-                },
-                "keywords": [],
-                "lineno": 10
-            }
-        },
-        {
-            "_type": "AnnAssign",
-            "annotation": {
-                "_type": "Name",
-                "col_offset": 3,
-                "ctx": {
-                    "_type": "Load"
-                },
-                "id": "Integer",
-                "lineno": 12
-            },
-            "col_offset": 0,
-            "lineno": 12,
-            "simple": 1,
-            "target": {
-                "_type": "Name",
-                "col_offset": 0,
-                "ctx": {
-                    "_type": "Store"
-                },
-                "id": "a",
-                "lineno": 12
-            },
-            "value": {
-                "_type": "Num",
-                "col_offset": 13,
-                "lineno": 12,
-                "n": 5
-            }
-        },
-        {
-            "_type": "AugAssign",
-            "col_offset": 0,
-            "lineno": 14,
-            "op": {
-                "_type": "Add"
-            },
-            "target": {
-                "_type": "Name",
-                "col_offset": 0,
-                "ctx": {
-                    "_type": "Store"
-                },
-                "id": "a",
-                "lineno": 14
-            },
-            "value": {
-                "_type": "Num",
-                "col_offset": 5,
-                "lineno": 14,
-                "n": 1
-            }
-        }
-    ]
+{
+    "_type": "Module",
+    "body": [
+        {
+            "_type": "ClassDef",
+            "bases": [],
+            "body": [
+                {
+                    "_type": "Pass",
+                    "col_offset": 4,
+                    "lineno": 5
+                }
+            ],
+            "col_offset": 0,
+            "decorator_list": [],
+            "keywords": [],
+            "lineno": 4,
+            "name": "MyClass"
+        },
+        {
+            "_type": "FunctionDef",
+            "args": {
+                "_type": "arguments",
+                "args": [],
+                "defaults": [],
+                "kw_defaults": [],
+                "kwarg": null,
+                "kwonlyargs": [],
+                "vararg": null
+            },
+            "body": [
+                {
+                    "_type": "Expr",
+                    "col_offset": 4,
+                    "lineno": 8,
+                    "value": {
+                        "_type": "Call",
+                        "args": [
+                            {
+                                "_type": "Str",
+                                "col_offset": 10,
+                                "lineno": 8,
+                                "s": "Hallo"
+                            }
+                        ],
+                        "col_offset": 4,
+                        "func": {
+                            "_type": "Name",
+                            "col_offset": 4,
+                            "ctx": {
+                                "_type": "Load"
+                            },
+                            "id": "print",
+                            "lineno": 8
+                        },
+                        "keywords": [],
+                        "lineno": 8
+                    }
+                }
+            ],
+            "col_offset": 0,
+            "decorator_list": [],
+            "lineno": 7,
+            "name": "myMethod",
+            "returns": null
+        },
+        {
+            "_type": "Expr",
+            "col_offset": 0,
+            "lineno": 10,
+            "value": {
+                "_type": "Call",
+                "args": [],
+                "col_offset": 0,
+                "func": {
+                    "_type": "Name",
+                    "col_offset": 0,
+                    "ctx": {
+                        "_type": "Load"
+                    },
+                    "id": "myMethod",
+                    "lineno": 10
+                },
+                "keywords": [],
+                "lineno": 10
+            }
+        },
+        {
+            "_type": "AnnAssign",
+            "annotation": {
+                "_type": "Name",
+                "col_offset": 3,
+                "ctx": {
+                    "_type": "Load"
+                },
+                "id": "Integer",
+                "lineno": 12
+            },
+            "col_offset": 0,
+            "lineno": 12,
+            "simple": 1,
+            "target": {
+                "_type": "Name",
+                "col_offset": 0,
+                "ctx": {
+                    "_type": "Store"
+                },
+                "id": "a",
+                "lineno": 12
+            },
+            "value": {
+                "_type": "Num",
+                "col_offset": 13,
+                "lineno": 12,
+                "n": 5
+            }
+        },
+        {
+            "_type": "AugAssign",
+            "col_offset": 0,
+            "lineno": 14,
+            "op": {
+                "_type": "Add"
+            },
+            "target": {
+                "_type": "Name",
+                "col_offset": 0,
+                "ctx": {
+                    "_type": "Store"
+                },
+                "id": "a",
+                "lineno": 14
+            },
+            "value": {
+                "_type": "Num",
+                "col_offset": 5,
+                "lineno": 14,
+                "n": 1
+            }
+        }
+    ]
 }
\ No newline at end of file
diff --git a/sandbox/code-gen/src/main/resources/example2.json b/sandbox/code-gen/src/main/resources/example2.json
index ea0f37061c4..1963d2f3e46 100644
--- a/sandbox/code-gen/src/main/resources/example2.json
+++ b/sandbox/code-gen/src/main/resources/example2.json
@@ -1,2129 +1,2129 @@
-{
-    "_type": "Module",
-    "body": [
-        {
-            "_type": "ImportFrom",
-            "col_offset": 0,
-            "level": 0,
-            "lineno": 1,
-            "module": "pymodbus.datastore",
-            "names": [
-                {
-                    "_type": "alias",
-                    "asname": null,
-                    "name": "ModbusSlaveContext"
-                },
-                {
-                    "_type": "alias",
-                    "asname": null,
-                    "name": "ModbusSequentialDataBlock"
-                },
-                {
-                    "_type": "alias",
-                    "asname": null,
-                    "name": "ModbusServerContext"
-                }
-            ]
-        },
-        {
-            "_type": "ImportFrom",
-            "col_offset": 0,
-            "level": 0,
-            "lineno": 2,
-            "module": "pymodbus.device",
-            "names": [
-                {
-                    "_type": "alias",
-                    "asname": null,
-                    "name": "ModbusDeviceIdentification"
-                }
-            ]
-        },
-        {
-            "_type": "ImportFrom",
-            "col_offset": 0,
-            "level": 0,
-            "lineno": 3,
-            "module": "pymodbus.server.sync",
-            "names": [
-                {
-                    "_type": "alias",
-                    "asname": null,
-                    "name": "ModbusTcpServer"
-                },
-                {
-                    "_type": "alias",
-                    "asname": null,
-                    "name": "StartTcpServer"
-                }
-            ]
-        },
-        {
-            "_type": "ImportFrom",
-            "col_offset": 0,
-            "level": 0,
-            "lineno": 5,
-            "module": "Api",
-            "names": [
-                {
-                    "_type": "alias",
-                    "asname": null,
-                    "name": "Message"
-                },
-                {
-                    "_type": "alias",
-                    "asname": null,
-                    "name": "Protocol"
-                },
-                {
-                    "_type": "alias",
-                    "asname": null,
-                    "name": "Buffer"
-                }
-            ]
-        },
-        {
-            "_type": "ClassDef",
-            "bases": [
-                {
-                    "_type": "Name",
-                    "col_offset": 17,
-                    "ctx": {
-                        "_type": "Load"
-                    },
-                    "id": "object",
-                    "lineno": 8
-                }
-            ],
-            "body": [
-                {
-                    "_type": "FunctionDef",
-                    "args": {
-                        "_type": "arguments",
-                        "args": [
-                            {
-                                "_type": "arg",
-                                "annotation": null,
-                                "arg": "self",
-                                "col_offset": 17,
-                                "lineno": 10
-                            },
-                            {
-                                "_type": "arg",
-                                "annotation": {
-                                    "_type": "Name",
-                                    "col_offset": 33,
-                                    "ctx": {
-                                        "_type": "Load"
-                                    },
-                                    "id": "Protocol",
-                                    "lineno": 10
-                                },
-                                "arg": "protocol",
-                                "col_offset": 23,
-                                "lineno": 10
-                            }
-                        ],
-                        "defaults": [],
-                        "kw_defaults": [],
-                        "kwarg": null,
-                        "kwonlyargs": [],
-                        "vararg": null
-                    },
-                    "body": [
-                        {
-                            "_type": "Assign",
-                            "col_offset": 8,
-                            "lineno": 11,
-                            "targets": [
-                                {
-                                    "_type": "Attribute",
-                                    "attr": "protocol",
-                                    "col_offset": 8,
-                                    "ctx": {
-                                        "_type": "Store"
-                                    },
-                                    "lineno": 11,
-                                    "value": {
-                                        "_type": "Name",
-                                        "col_offset": 8,
-                                        "ctx": {
-                                            "_type": "Load"
-                                        },
-                                        "id": "self",
-                                        "lineno": 11
-                                    }
-                                }
-                            ],
-                            "value": {
-                                "_type": "Name",
-                                "col_offset": 24,
-                                "ctx": {
-                                    "_type": "Load"
-                                },
-                                "id": "protocol",
-                                "lineno": 11
-                            }
-                        }
-                    ],
-                    "col_offset": 4,
-                    "decorator_list": [],
-                    "lineno": 10,
-                    "name": "__init__",
-                    "returns": null
-                },
-                {
-                    "_type": "FunctionDef",
-                    "args": {
-                        "_type": "arguments",
-                        "args": [
-                            {
-                                "_type": "arg",
-                                "annotation": null,
-                                "arg": "self",
-                                "col_offset": 16,
-                                "lineno": 13
-                            }
-                        ],
-                        "defaults": [],
-                        "kw_defaults": [],
-                        "kwarg": null,
-                        "kwonlyargs": [],
-                        "vararg": null
-                    },
-                    "body": [
-                        {
-                            "_type": "Pass",
-                            "col_offset": 8,
-                            "lineno": 14
-                        }
-                    ],
-                    "col_offset": 4,
-                    "decorator_list": [],
-                    "lineno": 13,
-                    "name": "connect",
-                    "returns": null
-                }
-            ],
-            "col_offset": 0,
-            "decorator_list": [],
-            "keywords": [],
-            "lineno": 8,
-            "name": "DriverBase"
-        },
-        {
-            "_type": "ClassDef",
-            "bases": [
-                {
-                    "_type": "Name",
-                    "col_offset": 14,
-                    "ctx": {
-                        "_type": "Load"
-                    },
-                    "id": "Message",
-                    "lineno": 17
-                }
-            ],
-            "body": [
-                {
-                    "_type": "FunctionDef",
-                    "args": {
-                        "_type": "arguments",
-                        "args": [
-                            {
-                                "_type": "arg",
-                                "annotation": null,
-                                "arg": "self",
-                                "col_offset": 15,
-                                "lineno": 19
-                            },
-                            {
-                                "_type": "arg",
-                                "annotation": {
-                                    "_type": "Name",
-                                    "col_offset": 29,
-                                    "ctx": {
-                                        "_type": "Load"
-                                    },
-                                    "id": "Buffer",
-                                    "lineno": 19
-                                },
-                                "arg": "buffer",
-                                "col_offset": 21,
-                                "lineno": 19
-                            }
-                        ],
-                        "defaults": [],
-                        "kw_defaults": [],
-                        "kwarg": null,
-                        "kwonlyargs": [],
-                        "vararg": null
-                    },
-                    "body": [
-                        {
-                            "_type": "Expr",
-                            "col_offset": 8,
-                            "lineno": 20,
-                            "value": {
-                                "_type": "Call",
-                                "args": [
-                                    {
-                                        "_type": "Call",
-                                        "args": [
-                                            {
-                                                "_type": "Str",
-                                                "col_offset": 30,
-                                                "lineno": 20,
-                                                "s": "Hallo I'm a  Request"
-                                            },
-                                            {
-                                                "_type": "Str",
-                                                "col_offset": 54,
-                                                "lineno": 20,
-                                                "s": "utf-8"
-                                            }
-                                        ],
-                                        "col_offset": 20,
-                                        "func": {
-                                            "_type": "Name",
-                                            "col_offset": 20,
-                                            "ctx": {
-                                                "_type": "Load"
-                                            },
-                                            "id": "bytearray",
-                                            "lineno": 20
-                                        },
-                                        "keywords": [],
-                                        "lineno": 20
-                                    }
-                                ],
-                                "col_offset": 8,
-                                "func": {
-                                    "_type": "Attribute",
-                                    "attr": "send",
-                                    "col_offset": 8,
-                                    "ctx": {
-                                        "_type": "Load"
-                                    },
-                                    "lineno": 20,
-                                    "value": {
-                                        "_type": "Name",
-                                        "col_offset": 8,
-                                        "ctx": {
-                                            "_type": "Load"
-                                        },
-                                        "id": "buffer",
-                                        "lineno": 20
-                                    }
-                                },
-                                "keywords": [],
-                                "lineno": 20
-                            }
-                        }
-                    ],
-                    "col_offset": 4,
-                    "decorator_list": [],
-                    "lineno": 19,
-                    "name": "encode",
-                    "returns": null
-                }
-            ],
-            "col_offset": 0,
-            "decorator_list": [],
-            "keywords": [],
-            "lineno": 17,
-            "name": "Request"
-        },
-        {
-            "_type": "ClassDef",
-            "bases": [
-                {
-                    "_type": "Name",
-                    "col_offset": 15,
-                    "ctx": {
-                        "_type": "Load"
-                    },
-                    "id": "Message",
-                    "lineno": 23
-                }
-            ],
-            "body": [
-                {
-                    "_type": "FunctionDef",
-                    "args": {
-                        "_type": "arguments",
-                        "args": [
-                            {
-                                "_type": "arg",
-                                "annotation": null,
-                                "arg": "self",
-                                "col_offset": 15,
-                                "lineno": 26
-                            },
-                            {
-                                "_type": "arg",
-                                "annotation": {
-                                    "_type": "Name",
-                                    "col_offset": 29,
-                                    "ctx": {
-                                        "_type": "Load"
-                                    },
-                                    "id": "Buffer",
-                                    "lineno": 26
-                                },
-                                "arg": "buffer",
-                                "col_offset": 21,
-                                "lineno": 26
-                            }
-                        ],
-                        "defaults": [],
-                        "kw_defaults": [],
-                        "kwarg": null,
-                        "kwonlyargs": [],
-                        "vararg": null
-                    },
-                    "body": [
-                        {
-                            "_type": "Assign",
-                            "col_offset": 8,
-                            "lineno": 27,
-                            "targets": [
-                                {
-                                    "_type": "Name",
-                                    "col_offset": 8,
-                                    "ctx": {
-                                        "_type": "Store"
-                                    },
-                                    "id": "bytes",
-                                    "lineno": 27
-                                }
-                            ],
-                            "value": {
-                                "_type": "Call",
-                                "args": [],
-                                "col_offset": 16,
-                                "func": {
-                                    "_type": "Name",
-                                    "col_offset": 16,
-                                    "ctx": {
-                                        "_type": "Load"
-                                    },
-                                    "id": "bytearray",
-                                    "lineno": 27
-                                },
-                                "keywords": [],
-                                "lineno": 27
-                            }
-                        },
-                        {
-                            "_type": "Assign",
-                            "col_offset": 8,
-                            "lineno": 28,
-                            "targets": [
-                                {
-                                    "_type": "Name",
-                                    "col_offset": 8,
-                                    "ctx": {
-                                        "_type": "Store"
-                                    },
-                                    "id": "b",
-                                    "lineno": 28
-                                }
-                            ],
-                            "value": {
-                                "_type": "Call",
-                                "args": [],
-                                "col_offset": 12,
-                                "func": {
-                                    "_type": "Attribute",
-                                    "attr": "readByte",
-                                    "col_offset": 12,
-                                    "ctx": {
-                                        "_type": "Load"
-                                    },
-                                    "lineno": 28,
-                                    "value": {
-                                        "_type": "Name",
-                                        "col_offset": 12,
-                                        "ctx": {
-                                            "_type": "Load"
-                                        },
-                                        "id": "buffer",
-                                        "lineno": 28
-                                    }
-                                },
-                                "keywords": [],
-                                "lineno": 28
-                            }
-                        },
-                        {
-                            "_type": "While",
-                            "body": [
-                                {
-                                    "_type": "Expr",
-                                    "col_offset": 12,
-                                    "lineno": 30,
-                                    "value": {
-                                        "_type": "Call",
-                                        "args": [
-                                            {
-                                                "_type": "Name",
-                                                "col_offset": 25,
-                                                "ctx": {
-                                                    "_type": "Load"
-                                                },
-                                                "id": "b",
-                                                "lineno": 30
-                                            }
-                                        ],
-                                        "col_offset": 12,
-                                        "func": {
-                                            "_type": "Attribute",
-                                            "attr": "append",
-                                            "col_offset": 12,
-                                            "ctx": {
-                                                "_type": "Load"
-                                            },
-                                            "lineno": 30,
-                                            "value": {
-                                                "_type": "Name",
-                                                "col_offset": 12,
-                                                "ctx": {
-                                                    "_type": "Load"
-                                                },
-                                                "id": "bytes",
-                                                "lineno": 30
-                                            }
-                                        },
-                                        "keywords": [],
-                                        "lineno": 30
-                                    }
-                                },
-                                {
-                                    "_type": "Assign",
-                                    "col_offset": 12,
-                                    "lineno": 31,
-                                    "targets": [
-                                        {
-                                            "_type": "Name",
-                                            "col_offset": 12,
-                                            "ctx": {
-                                                "_type": "Store"
-                                            },
-                                            "id": "b",
-                                            "lineno": 31
-                                        }
-                                    ],
-                                    "value": {
-                                        "_type": "Call",
-                                        "args": [],
-                                        "col_offset": 16,
-                                        "func": {
-                                            "_type": "Attribute",
-                                            "attr": "readByte",
-                                            "col_offset": 16,
-                                            "ctx": {
-                                                "_type": "Load"
-                                            },
-                                            "lineno": 31,
-                                            "value": {
-                                                "_type": "Name",
-                                                "col_offset": 16,
-                                                "ctx": {
-                                                    "_type": "Load"
-                                                },
-                                                "id": "buffer",
-                                                "lineno": 31
-                                            }
-                                        },
-                                        "keywords": [],
-                                        "lineno": 31
-                                    }
-                                }
-                            ],
-                            "col_offset": 8,
-                            "lineno": 29,
-                            "orelse": [],
-                            "test": {
-                                "_type": "Compare",
-                                "col_offset": 14,
-                                "comparators": [
-                                    {
-                                        "_type": "Num",
-                                        "col_offset": 19,
-                                        "lineno": 29,
-                                        "n": 0
-                                    }
-                                ],
-                                "left": {
-                                    "_type": "Name",
-                                    "col_offset": 14,
-                                    "ctx": {
-                                        "_type": "Load"
-                                    },
-                                    "id": "b",
-                                    "lineno": 29
-                                },
-                                "lineno": 29,
-                                "ops": [
-                                    {
-                                        "_type": "NotEq"
-                                    }
-                                ]
-                            }
-                        },
-                        {
-                            "_type": "Expr",
-                            "col_offset": 8,
-                            "lineno": 32,
-                            "value": {
-                                "_type": "Call",
-                                "args": [
-                                    {
-                                        "_type": "Call",
-                                        "args": [
-                                            {
-                                                "_type": "Name",
-                                                "col_offset": 18,
-                                                "ctx": {
-                                                    "_type": "Load"
-                                                },
-                                                "id": "bytearray",
-                                                "lineno": 32
-                                            }
-                                        ],
-                                        "col_offset": 14,
-                                        "func": {
-                                            "_type": "Name",
-                                            "col_offset": 14,
-                                            "ctx": {
-                                                "_type": "Load"
-                                            },
-                                            "id": "str",
-                                            "lineno": 32
-                                        },
-                                        "keywords": [],
-                                        "lineno": 32
-                                    }
-                                ],
-                                "col_offset": 8,
-                                "func": {
-                                    "_type": "Name",
-                                    "col_offset": 8,
-                                    "ctx": {
-                                        "_type": "Load"
-                                    },
-                                    "id": "print",
-                                    "lineno": 32
-                                },
-                                "keywords": [],
-                                "lineno": 32
-                            }
-                        },
-                        {
-                            "_type": "Return",
-                            "col_offset": 8,
-                            "lineno": 33,
-                            "value": {
-                                "_type": "Call",
-                                "args": [],
-                                "col_offset": 15,
-                                "func": {
-                                    "_type": "Name",
-                                    "col_offset": 15,
-                                    "ctx": {
-                                        "_type": "Load"
-                                    },
-                                    "id": "Response",
-                                    "lineno": 33
-                                },
-                                "keywords": [],
-                                "lineno": 33
-                            }
-                        }
-                    ],
-                    "col_offset": 4,
-                    "decorator_list": [
-                        {
-                            "_type": "Name",
-                            "col_offset": 5,
-                            "ctx": {
-                                "_type": "Load"
-                            },
-                            "id": "classmethod",
-                            "lineno": 25
-                        }
-                    ],
-                    "lineno": 25,
-                    "name": "decode",
-                    "returns": null
-                }
-            ],
-            "col_offset": 0,
-            "decorator_list": [],
-            "keywords": [],
-            "lineno": 23,
-            "name": "Response"
-        },
-        {
-            "_type": "ClassDef",
-            "bases": [
-                {
-                    "_type": "Name",
-                    "col_offset": 20,
-                    "ctx": {
-                        "_type": "Load"
-                    },
-                    "id": "DriverBase",
-                    "lineno": 36
-                }
-            ],
-            "body": [
-                {
-                    "_type": "AnnAssign",
-                    "annotation": {
-                        "_type": "Name",
-                        "col_offset": 12,
-                        "ctx": {
-                            "_type": "Load"
-                        },
-                        "id": "Buffer",
-                        "lineno": 37
-                    },
-                    "col_offset": 4,
-                    "lineno": 37,
-                    "simple": 1,
-                    "target": {
-                        "_type": "Name",
-                        "col_offset": 4,
-                        "ctx": {
-                            "_type": "Store"
-                        },
-                        "id": "buffer",
-                        "lineno": 37
-                    },
-                    "value": null
-                },
-                {
-                    "_type": "FunctionDef",
-                    "args": {
-                        "_type": "arguments",
-                        "args": [
-                            {
-                                "_type": "arg",
-                                "annotation": null,
-                                "arg": "self",
-                                "col_offset": 17,
-                                "lineno": 39
-                            },
-                            {
-                                "_type": "arg",
-                                "annotation": {
-                                    "_type": "Name",
-                                    "col_offset": 33,
-                                    "ctx": {
-                                        "_type": "Load"
-                                    },
-                                    "id": "Protocol",
-                                    "lineno": 39
-                                },
-                                "arg": "protocol",
-                                "col_offset": 23,
-                                "lineno": 39
-                            }
-                        ],
-                        "defaults": [],
-                        "kw_defaults": [],
-                        "kwarg": null,
-                        "kwonlyargs": [],
-                        "vararg": null
-                    },
-                    "body": [
-                        {
-                            "_type": "Expr",
-                            "col_offset": 8,
-                            "lineno": 40,
-                            "value": {
-                                "_type": "Call",
-                                "args": [
-                                    {
-                                        "_type": "Name",
-                                        "col_offset": 25,
-                                        "ctx": {
-                                            "_type": "Load"
-                                        },
-                                        "id": "protocol",
-                                        "lineno": 40
-                                    }
-                                ],
-                                "col_offset": 8,
-                                "func": {
-                                    "_type": "Attribute",
-                                    "attr": "__init__",
-                                    "col_offset": 8,
-                                    "ctx": {
-                                        "_type": "Load"
-                                    },
-                                    "lineno": 40,
-                                    "value": {
-                                        "_type": "Call",
-                                        "args": [],
-                                        "col_offset": 8,
-                                        "func": {
-                                            "_type": "Name",
-                                            "col_offset": 8,
-                                            "ctx": {
-                                                "_type": "Load"
-                                            },
-                                            "id": "super",
-                                            "lineno": 40
-                                        },
-                                        "keywords": [],
-                                        "lineno": 40
-                                    }
-                                },
-                                "keywords": [],
-                                "lineno": 40
-                            }
-                        }
-                    ],
-                    "col_offset": 4,
-                    "decorator_list": [],
-                    "lineno": 39,
-                    "name": "__init__",
-                    "returns": null
-                },
-                {
-                    "_type": "FunctionDef",
-                    "args": {
-                        "_type": "arguments",
-                        "args": [
-                            {
-                                "_type": "arg",
-                                "annotation": null,
-                                "arg": "self",
-                                "col_offset": 16,
-                                "lineno": 42
-                            }
-                        ],
-                        "defaults": [],
-                        "kw_defaults": [],
-                        "kwarg": null,
-                        "kwonlyargs": [],
-                        "vararg": null
-                    },
-                    "body": [
-                        {
-                            "_type": "Assign",
-                            "col_offset": 8,
-                            "lineno": 44,
-                            "targets": [
-                                {
-                                    "_type": "Attribute",
-                                    "attr": "buffer",
-                                    "col_offset": 8,
-                                    "ctx": {
-                                        "_type": "Store"
-                                    },
-                                    "lineno": 44,
-                                    "value": {
-                                        "_type": "Name",
-                                        "col_offset": 8,
-                                        "ctx": {
-                                            "_type": "Load"
-                                        },
-                                        "id": "self",
-                                        "lineno": 44
-                                    }
-                                }
-                            ],
-                            "value": {
-                                "_type": "Call",
-                                "args": [],
-                                "col_offset": 22,
-                                "func": {
-                                    "_type": "Attribute",
-                                    "attr": "connect",
-                                    "col_offset": 22,
-                                    "ctx": {
-                                        "_type": "Load"
-                                    },
-                                    "lineno": 44,
-                                    "value": {
-                                        "_type": "Attribute",
-                                        "attr": "protocol",
-                                        "col_offset": 22,
-                                        "ctx": {
-                                            "_type": "Load"
-                                        },
-                                        "lineno": 44,
-                                        "value": {
-                                            "_type": "Name",
-                                            "col_offset": 22,
-                                            "ctx": {
-                                                "_type": "Load"
-                                            },
-                                            "id": "self",
-                                            "lineno": 44
-                                        }
-                                    }
-                                },
-                                "keywords": [],
-                                "lineno": 44
-                            }
-                        },
-                        {
-                            "_type": "AnnAssign",
-                            "annotation": {
-                                "_type": "Name",
-                                "col_offset": 17,
-                                "ctx": {
-                                    "_type": "Load"
-                                },
-                                "id": "Request",
-                                "lineno": 46
-                            },
-                            "col_offset": 8,
-                            "lineno": 46,
-                            "simple": 1,
-                            "target": {
-                                "_type": "Name",
-                                "col_offset": 8,
-                                "ctx": {
-                                    "_type": "Store"
-                                },
-                                "id": "request",
-                                "lineno": 46
-                            },
-                            "value": {
-                                "_type": "Call",
-                                "args": [],
-                                "col_offset": 27,
-                                "func": {
-                                    "_type": "Name",
-                                    "col_offset": 27,
-                                    "ctx": {
-                                        "_type": "Load"
-                                    },
-                                    "id": "Request",
-                                    "lineno": 46
-                                },
-                                "keywords": [],
-                                "lineno": 46
-                            }
-                        },
-                        {
-                            "_type": "Expr",
-                            "col_offset": 8,
-                            "lineno": 48,
-                            "value": {
-                                "_type": "Call",
-                                "args": [
-                                    {
-                                        "_type": "Attribute",
-                                        "attr": "buffer",
-                                        "col_offset": 23,
-                                        "ctx": {
-                                            "_type": "Load"
-                                        },
-                                        "lineno": 48,
-                                        "value": {
-                                            "_type": "Name",
-                                            "col_offset": 23,
-                                            "ctx": {
-                                                "_type": "Load"
-                                            },
-                                            "id": "self",
-                                            "lineno": 48
-                                        }
-                                    }
-                                ],
-                                "col_offset": 8,
-                                "func": {
-                                    "_type": "Attribute",
-                                    "attr": "encode",
-                                    "col_offset": 8,
-                                    "ctx": {
-                                        "_type": "Load"
-                                    },
-                                    "lineno": 48,
-                                    "value": {
-                                        "_type": "Name",
-                                        "col_offset": 8,
-                                        "ctx": {
-                                            "_type": "Load"
-                                        },
-                                        "id": "request",
-                                        "lineno": 48
-                                    }
-                                },
-                                "keywords": [],
-                                "lineno": 48
-                            }
-                        },
-                        {
-                            "_type": "Expr",
-                            "col_offset": 8,
-                            "lineno": 51,
-                            "value": {
-                                "_type": "Call",
-                                "args": [
-                                    {
-                                        "_type": "Name",
-                                        "col_offset": 28,
-                                        "ctx": {
-                                            "_type": "Load"
-                                        },
-                                        "id": "Response",
-                                        "lineno": 51
-                                    }
-                                ],
-                                "col_offset": 8,
-                                "func": {
-                                    "_type": "Attribute",
-                                    "attr": "receive",
-                                    "col_offset": 8,
-                                    "ctx": {
-                                        "_type": "Load"
-                                    },
-                                    "lineno": 51,
-                                    "value": {
-                                        "_type": "Attribute",
-                                        "attr": "buffer",
-                                        "col_offset": 8,
-                                        "ctx": {
-                                            "_type": "Load"
-                                        },
-                                        "lineno": 51,
-                                        "value": {
-                                            "_type": "Name",
-                                            "col_offset": 8,
-                                            "ctx": {
-                                                "_type": "Load"
-                                            },
-                                            "id": "self",
-                                            "lineno": 51
-                                        }
-                                    }
-                                },
-                                "keywords": [],
-                                "lineno": 51
-                            }
-                        }
-                    ],
-                    "col_offset": 4,
-                    "decorator_list": [],
-                    "lineno": 42,
-                    "name": "connect",
-                    "returns": null
-                }
-            ],
-            "col_offset": 0,
-            "decorator_list": [],
-            "keywords": [],
-            "lineno": 36,
-            "name": "ExampleDriver"
-        },
-        {
-            "_type": "ClassDef",
-            "bases": [
-                {
-                    "_type": "Name",
-                    "col_offset": 18,
-                    "ctx": {
-                        "_type": "Load"
-                    },
-                    "id": "Buffer",
-                    "lineno": 54
-                }
-            ],
-            "body": [
-                {
-                    "_type": "FunctionDef",
-                    "args": {
-                        "_type": "arguments",
-                        "args": [
-                            {
-                                "_type": "arg",
-                                "annotation": null,
-                                "arg": "self",
-                                "col_offset": 17,
-                                "lineno": 56
-                            }
-                        ],
-                        "defaults": [],
-                        "kw_defaults": [],
-                        "kwarg": null,
-                        "kwonlyargs": [],
-                        "vararg": null
-                    },
-                    "body": [
-                        {
-                            "_type": "Return",
-                            "col_offset": 8,
-                            "lineno": 57,
-                            "value": {
-                                "_type": "Num",
-                                "col_offset": 15,
-                                "lineno": 57,
-                                "n": 0
-                            }
-                        }
-                    ],
-                    "col_offset": 4,
-                    "decorator_list": [],
-                    "lineno": 56,
-                    "name": "readByte",
-                    "returns": null
-                },
-                {
-                    "_type": "FunctionDef",
-                    "args": {
-                        "_type": "arguments",
-                        "args": [
-                            {
-                                "_type": "arg",
-                                "annotation": null,
-                                "arg": "self",
-                                "col_offset": 13,
-                                "lineno": 59
-                            },
-                            {
-                                "_type": "arg",
-                                "annotation": {
-                                    "_type": "Name",
-                                    "col_offset": 26,
-                                    "ctx": {
-                                        "_type": "Load"
-                                    },
-                                    "id": "bytearray",
-                                    "lineno": 59
-                                },
-                                "arg": "bytes",
-                                "col_offset": 19,
-                                "lineno": 59
-                            }
-                        ],
-                        "defaults": [],
-                        "kw_defaults": [],
-                        "kwarg": null,
-                        "kwonlyargs": [],
-                        "vararg": null
-                    },
-                    "body": [
-                        {
-                            "_type": "Expr",
-                            "col_offset": 8,
-                            "lineno": 60,
-                            "value": {
-                                "_type": "Call",
-                                "args": [
-                                    {
-                                        "_type": "Call",
-                                        "args": [
-                                            {
-                                                "_type": "Name",
-                                                "col_offset": 18,
-                                                "ctx": {
-                                                    "_type": "Load"
-                                                },
-                                                "id": "bytes",
-                                                "lineno": 60
-                                            }
-                                        ],
-                                        "col_offset": 14,
-                                        "func": {
-                                            "_type": "Name",
-                                            "col_offset": 14,
-                                            "ctx": {
-                                                "_type": "Load"
-                                            },
-                                            "id": "str",
-                                            "lineno": 60
-                                        },
-                                        "keywords": [],
-                                        "lineno": 60
-                                    }
-                                ],
-                                "col_offset": 8,
-                                "func": {
-                                    "_type": "Name",
-                                    "col_offset": 8,
-                                    "ctx": {
-                                        "_type": "Load"
-                                    },
-                                    "id": "print",
-                                    "lineno": 60
-                                },
-                                "keywords": [],
-                                "lineno": 60
-                            }
-                        }
-                    ],
-                    "col_offset": 4,
-                    "decorator_list": [],
-                    "lineno": 59,
-                    "name": "send",
-                    "returns": null
-                },
-                {
-                    "_type": "FunctionDef",
-                    "args": {
-                        "_type": "arguments",
-                        "args": [
-                            {
-                                "_type": "arg",
-                                "annotation": null,
-                                "arg": "self",
-                                "col_offset": 16,
-                                "lineno": 62
-                            },
-                            {
-                                "_type": "arg",
-                                "annotation": {
-                                    "_type": "Name",
-                                    "col_offset": 32,
-                                    "ctx": {
-                                        "_type": "Load"
-                                    },
-                                    "id": "type",
-                                    "lineno": 62
-                                },
-                                "arg": "response",
-                                "col_offset": 22,
-                                "lineno": 62
-                            }
-                        ],
-                        "defaults": [],
-                        "kw_defaults": [],
-                        "kwarg": null,
-                        "kwonlyargs": [],
-                        "vararg": null
-                    },
-                    "body": [
-                        {
-                            "_type": "Return",
-                            "col_offset": 8,
-                            "lineno": 63,
-                            "value": {
-                                "_type": "Call",
-                                "args": [
-                                    {
-                                        "_type": "Name",
-                                        "col_offset": 31,
-                                        "ctx": {
-                                            "_type": "Load"
-                                        },
-                                        "id": "self",
-                                        "lineno": 63
-                                    }
-                                ],
-                                "col_offset": 15,
-                                "func": {
-                                    "_type": "Attribute",
-                                    "attr": "decode",
-                                    "col_offset": 15,
-                                    "ctx": {
-                                        "_type": "Load"
-                                    },
-                                    "lineno": 63,
-                                    "value": {
-                                        "_type": "Name",
-                                        "col_offset": 15,
-                                        "ctx": {
-                                            "_type": "Load"
-                                        },
-                                        "id": "response",
-                                        "lineno": 63
-                                    }
-                                },
-                                "keywords": [],
-                                "lineno": 63
-                            }
-                        }
-                    ],
-                    "col_offset": 4,
-                    "decorator_list": [],
-                    "lineno": 62,
-                    "name": "receive",
-                    "returns": null
-                }
-            ],
-            "col_offset": 0,
-            "decorator_list": [],
-            "keywords": [],
-            "lineno": 54,
-            "name": "DummyBuffer"
-        },
-        {
-            "_type": "ClassDef",
-            "bases": [
-                {
-                    "_type": "Name",
-                    "col_offset": 20,
-                    "ctx": {
-                        "_type": "Load"
-                    },
-                    "id": "Protocol",
-                    "lineno": 66
-                }
-            ],
-            "body": [
-                {
-                    "_type": "FunctionDef",
-                    "args": {
-                        "_type": "arguments",
-                        "args": [
-                            {
-                                "_type": "arg",
-                                "annotation": null,
-                                "arg": "self",
-                                "col_offset": 16,
-                                "lineno": 68
-                            }
-                        ],
-                        "defaults": [],
-                        "kw_defaults": [],
-                        "kwarg": null,
-                        "kwonlyargs": [],
-                        "vararg": null
-                    },
-                    "body": [
-                        {
-                            "_type": "Return",
-                            "col_offset": 8,
-                            "lineno": 69,
-                            "value": {
-                                "_type": "Call",
-                                "args": [],
-                                "col_offset": 15,
-                                "func": {
-                                    "_type": "Name",
-                                    "col_offset": 15,
-                                    "ctx": {
-                                        "_type": "Load"
-                                    },
-                                    "id": "DummyBuffer",
-                                    "lineno": 69
-                                },
-                                "keywords": [],
-                                "lineno": 69
-                            }
-                        }
-                    ],
-                    "col_offset": 4,
-                    "decorator_list": [],
-                    "lineno": 68,
-                    "name": "connect",
-                    "returns": {
-                        "_type": "Name",
-                        "col_offset": 25,
-                        "ctx": {
-                            "_type": "Load"
-                        },
-                        "id": "Buffer",
-                        "lineno": 68
-                    }
-                },
-                {
-                    "_type": "FunctionDef",
-                    "args": {
-                        "_type": "arguments",
-                        "args": [
-                            {
-                                "_type": "arg",
-                                "annotation": null,
-                                "arg": "self",
-                                "col_offset": 14,
-                                "lineno": 71
-                            }
-                        ],
-                        "defaults": [],
-                        "kw_defaults": [],
-                        "kwarg": null,
-                        "kwonlyargs": [],
-                        "vararg": null
-                    },
-                    "body": [
-                        {
-                            "_type": "Pass",
-                            "col_offset": 8,
-                            "lineno": 72
-                        }
-                    ],
-                    "col_offset": 4,
-                    "decorator_list": [],
-                    "lineno": 71,
-                    "name": "close",
-                    "returns": null
-                }
-            ],
-            "col_offset": 0,
-            "decorator_list": [],
-            "keywords": [],
-            "lineno": 66,
-            "name": "DummyProtocol"
-        },
-        {
-            "_type": "If",
-            "body": [
-                {
-                    "_type": "Assign",
-                    "col_offset": 4,
-                    "lineno": 77,
-                    "targets": [
-                        {
-                            "_type": "Name",
-                            "col_offset": 4,
-                            "ctx": {
-                                "_type": "Store"
-                            },
-                            "id": "store",
-                            "lineno": 77
-                        }
-                    ],
-                    "value": {
-                        "_type": "Call",
-                        "args": [],
-                        "col_offset": 12,
-                        "func": {
-                            "_type": "Name",
-                            "col_offset": 12,
-                            "ctx": {
-                                "_type": "Load"
-                            },
-                            "id": "ModbusSlaveContext",
-                            "lineno": 77
-                        },
-                        "keywords": [
-                            {
-                                "_type": "keyword",
-                                "arg": "di",
-                                "value": {
-                                    "_type": "Call",
-                                    "args": [
-                                        {
-                                            "_type": "Num",
-                                            "col_offset": 37,
-                                            "lineno": 78,
-                                            "n": 0
-                                        },
-                                        {
-                                            "_type": "BinOp",
-                                            "col_offset": 40,
-                                            "left": {
-                                                "_type": "List",
-                                                "col_offset": 40,
-                                                "ctx": {
-                                                    "_type": "Load"
-                                                },
-                                                "elts": [
-                                                    {
-                                                        "_type": "Num",
-                                                        "col_offset": 41,
-                                                        "lineno": 78,
-                                                        "n": 17
-                                                    }
-                                                ],
-                                                "lineno": 78
-                                            },
-                                            "lineno": 78,
-                                            "op": {
-                                                "_type": "Mult"
-                                            },
-                                            "right": {
-                                                "_type": "Num",
-                                                "col_offset": 47,
-                                                "lineno": 78,
-                                                "n": 100
-                                            }
-                                        }
-                                    ],
-                                    "col_offset": 11,
-                                    "func": {
-                                        "_type": "Name",
-                                        "col_offset": 11,
-                                        "ctx": {
-                                            "_type": "Load"
-                                        },
-                                        "id": "ModbusSequentialDataBlock",
-                                        "lineno": 78
-                                    },
-                                    "keywords": [],
-                                    "lineno": 78
-                                }
-                            },
-                            {
-                                "_type": "keyword",
-                                "arg": "co",
-                                "value": {
-                                    "_type": "Call",
-                                    "args": [
-                                        {
-                                            "_type": "Num",
-                                            "col_offset": 37,
-                                            "lineno": 79,
-                                            "n": 0
-                                        },
-                                        {
-                                            "_type": "BinOp",
-                                            "col_offset": 40,
-                                            "left": {
-                                                "_type": "List",
-                                                "col_offset": 40,
-                                                "ctx": {
-                                                    "_type": "Load"
-                                                },
-                                                "elts": [
-                                                    {
-                                                        "_type": "Num",
-                                                        "col_offset": 41,
-                                                        "lineno": 79,
-                                                        "n": 17
-                                                    }
-                                                ],
-                                                "lineno": 79
-                                            },
-                                            "lineno": 79,
-                                            "op": {
-                                                "_type": "Mult"
-                                            },
-                                            "right": {
-                                                "_type": "Num",
-                                                "col_offset": 47,
-                                                "lineno": 79,
-                                                "n": 100
-                                            }
-                                        }
-                                    ],
-                                    "col_offset": 11,
-                                    "func": {
-                                        "_type": "Name",
-                                        "col_offset": 11,
-                                        "ctx": {
-                                            "_type": "Load"
-                                        },
-                                        "id": "ModbusSequentialDataBlock",
-                                        "lineno": 79
-                                    },
-                                    "keywords": [],
-                                    "lineno": 79
-                                }
-                            },
-                            {
-                                "_type": "keyword",
-                                "arg": "hr",
-                                "value": {
-                                    "_type": "Call",
-                                    "args": [
-                                        {
-                                            "_type": "Num",
-                                            "col_offset": 37,
-                                            "lineno": 80,
-                                            "n": 0
-                                        },
-                                        {
-                                            "_type": "BinOp",
-                                            "col_offset": 40,
-                                            "left": {
-                                                "_type": "List",
-                                                "col_offset": 40,
-                                                "ctx": {
-                                                    "_type": "Load"
-                                                },
-                                                "elts": [
-                                                    {
-                                                        "_type": "Num",
-                                                        "col_offset": 41,
-                                                        "lineno": 80,
-                                                        "n": 17
-                                                    }
-                                                ],
-                                                "lineno": 80
-                                            },
-                                            "lineno": 80,
-                                            "op": {
-                                                "_type": "Mult"
-                                            },
-                                            "right": {
-                                                "_type": "Num",
-                                                "col_offset": 47,
-                                                "lineno": 80,
-                                                "n": 100
-                                            }
-                                        }
-                                    ],
-                                    "col_offset": 11,
-                                    "func": {
-                                        "_type": "Name",
-                                        "col_offset": 11,
-                                        "ctx": {
-                                            "_type": "Load"
-                                        },
-                                        "id": "ModbusSequentialDataBlock",
-                                        "lineno": 80
-                                    },
-                                    "keywords": [],
-                                    "lineno": 80
-                                }
-                            },
-                            {
-                                "_type": "keyword",
-                                "arg": "ir",
-                                "value": {
-                                    "_type": "Call",
-                                    "args": [
-                                        {
-                                            "_type": "Num",
-                                            "col_offset": 37,
-                                            "lineno": 81,
-                                            "n": 0
-                                        },
-                                        {
-                                            "_type": "BinOp",
-                                            "col_offset": 40,
-                                            "left": {
-                                                "_type": "List",
-                                                "col_offset": 40,
-                                                "ctx": {
-                                                    "_type": "Load"
-                                                },
-                                                "elts": [
-                                                    {
-                                                        "_type": "Num",
-                                                        "col_offset": 41,
-                                                        "lineno": 81,
-                                                        "n": 17
-                                                    }
-                                                ],
-                                                "lineno": 81
-                                            },
-                                            "lineno": 81,
-                                            "op": {
-                                                "_type": "Mult"
-                                            },
-                                            "right": {
-                                                "_type": "Num",
-                                                "col_offset": 47,
-                                                "lineno": 81,
-                                                "n": 100
-                                            }
-                                        }
-                                    ],
-                                    "col_offset": 11,
-                                    "func": {
-                                        "_type": "Name",
-                                        "col_offset": 11,
-                                        "ctx": {
-                                            "_type": "Load"
-                                        },
-                                        "id": "ModbusSequentialDataBlock",
-                                        "lineno": 81
-                                    },
-                                    "keywords": [],
-                                    "lineno": 81
-                                }
-                            }
-                        ],
-                        "lineno": 77
-                    }
-                },
-                {
-                    "_type": "Assign",
-                    "col_offset": 4,
-                    "lineno": 83,
-                    "targets": [
-                        {
-                            "_type": "Name",
-                            "col_offset": 4,
-                            "ctx": {
-                                "_type": "Store"
-                            },
-                            "id": "context",
-                            "lineno": 83
-                        }
-                    ],
-                    "value": {
-                        "_type": "Call",
-                        "args": [],
-                        "col_offset": 14,
-                        "func": {
-                            "_type": "Name",
-                            "col_offset": 14,
-                            "ctx": {
-                                "_type": "Load"
-                            },
-                            "id": "ModbusServerContext",
-                            "lineno": 83
-                        },
-                        "keywords": [
-                            {
-                                "_type": "keyword",
-                                "arg": "slaves",
-                                "value": {
-                                    "_type": "Name",
-                                    "col_offset": 41,
-                                    "ctx": {
-                                        "_type": "Load"
-                                    },
-                                    "id": "store",
-                                    "lineno": 83
-                                }
-                            },
-                            {
-                                "_type": "keyword",
-                                "arg": "single",
-                                "value": {
-                                    "_type": "NameConstant",
-                                    "col_offset": 55,
-                                    "lineno": 83,
-                                    "value": true
-                                }
-                            }
-                        ],
-                        "lineno": 83
-                    }
-                },
-                {
-                    "_type": "Assign",
-                    "col_offset": 4,
-                    "lineno": 90,
-                    "targets": [
-                        {
-                            "_type": "Name",
-                            "col_offset": 4,
-                            "ctx": {
-                                "_type": "Store"
-                            },
-                            "id": "identity",
-                            "lineno": 90
-                        }
-                    ],
-                    "value": {
-                        "_type": "Call",
-                        "args": [],
-                        "col_offset": 15,
-                        "func": {
-                            "_type": "Name",
-                            "col_offset": 15,
-                            "ctx": {
-                                "_type": "Load"
-                            },
-                            "id": "ModbusDeviceIdentification",
-                            "lineno": 90
-                        },
-                        "keywords": [],
-                        "lineno": 90
-                    }
-                },
-                {
-                    "_type": "Assign",
-                    "col_offset": 4,
-                    "lineno": 91,
-                    "targets": [
-                        {
-                            "_type": "Attribute",
-                            "attr": "VendorName",
-                            "col_offset": 4,
-                            "ctx": {
-                                "_type": "Store"
-                            },
-                            "lineno": 91,
-                            "value": {
-                                "_type": "Name",
-                                "col_offset": 4,
-                                "ctx": {
-                                    "_type": "Load"
-                                },
-                                "id": "identity",
-                                "lineno": 91
-                            }
-                        }
-                    ],
-                    "value": {
-                        "_type": "Str",
-                        "col_offset": 26,
-                        "lineno": 91,
-                        "s": "Pymodbus"
-                    }
-                },
-                {
-                    "_type": "Assign",
-                    "col_offset": 4,
-                    "lineno": 92,
-                    "targets": [
-                        {
-                            "_type": "Attribute",
-                            "attr": "ProductCode",
-                            "col_offset": 4,
-                            "ctx": {
-                                "_type": "Store"
-                            },
-                            "lineno": 92,
-                            "value": {
-                                "_type": "Name",
-                                "col_offset": 4,
-                                "ctx": {
-                                    "_type": "Load"
-                                },
-                                "id": "identity",
-                                "lineno": 92
-                            }
-                        }
-                    ],
-                    "value": {
-                        "_type": "Str",
-                        "col_offset": 27,
-                        "lineno": 92,
-                        "s": "PM"
-                    }
-                },
-                {
-                    "_type": "Assign",
-                    "col_offset": 4,
-                    "lineno": 93,
-                    "targets": [
-                        {
-                            "_type": "Attribute",
-                            "attr": "VendorUrl",
-                            "col_offset": 4,
-                            "ctx": {
-                                "_type": "Store"
-                            },
-                            "lineno": 93,
-                            "value": {
-                                "_type": "Name",
-                                "col_offset": 4,
-                                "ctx": {
-                                    "_type": "Load"
-                                },
-                                "id": "identity",
-                                "lineno": 93
-                            }
-                        }
-                    ],
-                    "value": {
-                        "_type": "Str",
-                        "col_offset": 25,
-                        "lineno": 93,
-                        "s": "http://github.com/riptideio/pymodbus/"
-                    }
-                },
-                {
-                    "_type": "Assign",
-                    "col_offset": 4,
-                    "lineno": 94,
-                    "targets": [
-                        {
-                            "_type": "Attribute",
-                            "attr": "ProductName",
-                            "col_offset": 4,
-                            "ctx": {
-                                "_type": "Store"
-                            },
-                            "lineno": 94,
-                            "value": {
-                                "_type": "Name",
-                                "col_offset": 4,
-                                "ctx": {
-                                    "_type": "Load"
-                                },
-                                "id": "identity",
-                                "lineno": 94
-                            }
-                        }
-                    ],
-                    "value": {
-                        "_type": "Str",
-                        "col_offset": 27,
-                        "lineno": 94,
-                        "s": "Pymodbus Server"
-                    }
-                },
-                {
-                    "_type": "Assign",
-                    "col_offset": 4,
-                    "lineno": 95,
-                    "targets": [
-                        {
-                            "_type": "Attribute",
-                            "attr": "ModelName",
-                            "col_offset": 4,
-                            "ctx": {
-                                "_type": "Store"
-                            },
-                            "lineno": 95,
-                            "value": {
-                                "_type": "Name",
-                                "col_offset": 4,
-                                "ctx": {
-                                    "_type": "Load"
-                                },
-                                "id": "identity",
-                                "lineno": 95
-                            }
-                        }
-                    ],
-                    "value": {
-                        "_type": "Str",
-                        "col_offset": 25,
-                        "lineno": 95,
-                        "s": "Pymodbus Server"
-                    }
-                },
-                {
-                    "_type": "Assign",
-                    "col_offset": 4,
-                    "lineno": 96,
-                    "targets": [
-                        {
-                            "_type": "Attribute",
-                            "attr": "MajorMinorRevision",
-                            "col_offset": 4,
-                            "ctx": {
-                                "_type": "Store"
-                            },
-                            "lineno": 96,
-                            "value": {
-                                "_type": "Name",
-                                "col_offset": 4,
-                                "ctx": {
-                                    "_type": "Load"
-                                },
-                                "id": "identity",
-                                "lineno": 96
-                            }
-                        }
-                    ],
-                    "value": {
-                        "_type": "Str",
-                        "col_offset": 34,
-                        "lineno": 96,
-                        "s": "2.1.0"
-                    }
-                },
-                {
-                    "_type": "Assign",
-                    "col_offset": 4,
-                    "lineno": 102,
-                    "targets": [
-                        {
-                            "_type": "Name",
-                            "col_offset": 4,
-                            "ctx": {
-                                "_type": "Store"
-                            },
-                            "id": "server",
-                            "lineno": 102
-                        }
-                    ],
-                    "value": {
-                        "_type": "Call",
-                        "args": [
-                            {
-                                "_type": "Name",
-                                "col_offset": 29,
-                                "ctx": {
-                                    "_type": "Load"
-                                },
-                                "id": "context",
-                                "lineno": 102
-                            }
-                        ],
-                        "col_offset": 13,
-                        "func": {
-                            "_type": "Name",
-                            "col_offset": 13,
-                            "ctx": {
-                                "_type": "Load"
-                            },
-                            "id": "ModbusTcpServer",
-                            "lineno": 102
-                        },
-                        "keywords": [
-                            {
-                                "_type": "keyword",
-                                "arg": "identity",
-                                "value": {
-                                    "_type": "Name",
-                                    "col_offset": 47,
-                                    "ctx": {
-                                        "_type": "Load"
-                                    },
-                                    "id": "identity",
-                                    "lineno": 102
-                                }
-                            },
-                            {
-                                "_type": "keyword",
-                                "arg": "address",
-                                "value": {
-                                    "_type": "Tuple",
-                                    "col_offset": 66,
-                                    "ctx": {
-                                        "_type": "Load"
-                                    },
-                                    "elts": [
-                                        {
-                                            "_type": "Str",
-                                            "col_offset": 66,
-                                            "lineno": 102,
-                                            "s": "localhost"
-                                        },
-                                        {
-                                            "_type": "Num",
-                                            "col_offset": 79,
-                                            "lineno": 102,
-                                            "n": 5020
-                                        }
-                                    ],
-                                    "lineno": 102
-                                }
-                            }
-                        ],
-                        "lineno": 102
-                    }
-                },
-                {
-                    "_type": "Assign",
-                    "col_offset": 4,
-                    "lineno": 104,
-                    "targets": [
-                        {
-                            "_type": "Name",
-                            "col_offset": 4,
-                            "ctx": {
-                                "_type": "Store"
-                            },
-                            "id": "drv",
-                            "lineno": 104
-                        }
-                    ],
-                    "value": {
-                        "_type": "Call",
-                        "args": [
-                            {
-                                "_type": "Call",
-                                "args": [],
-                                "col_offset": 24,
-                                "func": {
-                                    "_type": "Name",
-                                    "col_offset": 24,
-                                    "ctx": {
-                                        "_type": "Load"
-                                    },
-                                    "id": "DummyProtocol",
-                                    "lineno": 104
-                                },
-                                "keywords": [],
-                                "lineno": 104
-                            }
-                        ],
-                        "col_offset": 10,
-                        "func": {
-                            "_type": "Name",
-                            "col_offset": 10,
-                            "ctx": {
-                                "_type": "Load"
-                            },
-                            "id": "ExampleDriver",
-                            "lineno": 104
-                        },
-                        "keywords": [],
-                        "lineno": 104
-                    }
-                },
-                {
-                    "_type": "Expr",
-                    "col_offset": 4,
-                    "lineno": 105,
-                    "value": {
-                        "_type": "Call",
-                        "args": [],
-                        "col_offset": 4,
-                        "func": {
-                            "_type": "Attribute",
-                            "attr": "connect",
-                            "col_offset": 4,
-                            "ctx": {
-                                "_type": "Load"
-                            },
-                            "lineno": 105,
-                            "value": {
-                                "_type": "Name",
-                                "col_offset": 4,
-                                "ctx": {
-                                    "_type": "Load"
-                                },
-                                "id": "drv",
-                                "lineno": 105
-                            }
-                        },
-                        "keywords": [],
-                        "lineno": 105
-                    }
-                },
-                {
-                    "_type": "Expr",
-                    "col_offset": 4,
-                    "lineno": 107,
-                    "value": {
-                        "_type": "Call",
-                        "args": [],
-                        "col_offset": 4,
-                        "func": {
-                            "_type": "Attribute",
-                            "attr": "server_close",
-                            "col_offset": 4,
-                            "ctx": {
-                                "_type": "Load"
-                            },
-                            "lineno": 107,
-                            "value": {
-                                "_type": "Name",
-                                "col_offset": 4,
-                                "ctx": {
-                                    "_type": "Load"
-                                },
-                                "id": "server",
-                                "lineno": 107
-                            }
-                        },
-                        "keywords": [],
-                        "lineno": 107
-                    }
-                }
-            ],
-            "col_offset": 0,
-            "lineno": 75,
-            "orelse": [],
-            "test": {
-                "_type": "Compare",
-                "col_offset": 3,
-                "comparators": [
-                    {
-                        "_type": "Str",
-                        "col_offset": 15,
-                        "lineno": 75,
-                        "s": "__main__"
-                    }
-                ],
-                "left": {
-                    "_type": "Name",
-                    "col_offset": 3,
-                    "ctx": {
-                        "_type": "Load"
-                    },
-                    "id": "__name__",
-                    "lineno": 75
-                },
-                "lineno": 75,
-                "ops": [
-                    {
-                        "_type": "Eq"
-                    }
-                ]
-            }
-        }
-    ]
+{
+    "_type": "Module",
+    "body": [
+        {
+            "_type": "ImportFrom",
+            "col_offset": 0,
+            "level": 0,
+            "lineno": 1,
+            "module": "pymodbus.datastore",
+            "names": [
+                {
+                    "_type": "alias",
+                    "asname": null,
+                    "name": "ModbusSlaveContext"
+                },
+                {
+                    "_type": "alias",
+                    "asname": null,
+                    "name": "ModbusSequentialDataBlock"
+                },
+                {
+                    "_type": "alias",
+                    "asname": null,
+                    "name": "ModbusServerContext"
+                }
+            ]
+        },
+        {
+            "_type": "ImportFrom",
+            "col_offset": 0,
+            "level": 0,
+            "lineno": 2,
+            "module": "pymodbus.device",
+            "names": [
+                {
+                    "_type": "alias",
+                    "asname": null,
+                    "name": "ModbusDeviceIdentification"
+                }
+            ]
+        },
+        {
+            "_type": "ImportFrom",
+            "col_offset": 0,
+            "level": 0,
+            "lineno": 3,
+            "module": "pymodbus.server.sync",
+            "names": [
+                {
+                    "_type": "alias",
+                    "asname": null,
+                    "name": "ModbusTcpServer"
+                },
+                {
+                    "_type": "alias",
+                    "asname": null,
+                    "name": "StartTcpServer"
+                }
+            ]
+        },
+        {
+            "_type": "ImportFrom",
+            "col_offset": 0,
+            "level": 0,
+            "lineno": 5,
+            "module": "Api",
+            "names": [
+                {
+                    "_type": "alias",
+                    "asname": null,
+                    "name": "Message"
+                },
+                {
+                    "_type": "alias",
+                    "asname": null,
+                    "name": "Protocol"
+                },
+                {
+                    "_type": "alias",
+                    "asname": null,
+                    "name": "Buffer"
+                }
+            ]
+        },
+        {
+            "_type": "ClassDef",
+            "bases": [
+                {
+                    "_type": "Name",
+                    "col_offset": 17,
+                    "ctx": {
+                        "_type": "Load"
+                    },
+                    "id": "object",
+                    "lineno": 8
+                }
+            ],
+            "body": [
+                {
+                    "_type": "FunctionDef",
+                    "args": {
+                        "_type": "arguments",
+                        "args": [
+                            {
+                                "_type": "arg",
+                                "annotation": null,
+                                "arg": "self",
+                                "col_offset": 17,
+                                "lineno": 10
+                            },
+                            {
+                                "_type": "arg",
+                                "annotation": {
+                                    "_type": "Name",
+                                    "col_offset": 33,
+                                    "ctx": {
+                                        "_type": "Load"
+                                    },
+                                    "id": "Protocol",
+                                    "lineno": 10
+                                },
+                                "arg": "protocol",
+                                "col_offset": 23,
+                                "lineno": 10
+                            }
+                        ],
+                        "defaults": [],
+                        "kw_defaults": [],
+                        "kwarg": null,
+                        "kwonlyargs": [],
+                        "vararg": null
+                    },
+                    "body": [
+                        {
+                            "_type": "Assign",
+                            "col_offset": 8,
+                            "lineno": 11,
+                            "targets": [
+                                {
+                                    "_type": "Attribute",
+                                    "attr": "protocol",
+                                    "col_offset": 8,
+                                    "ctx": {
+                                        "_type": "Store"
+                                    },
+                                    "lineno": 11,
+                                    "value": {
+                                        "_type": "Name",
+                                        "col_offset": 8,
+                                        "ctx": {
+                                            "_type": "Load"
+                                        },
+                                        "id": "self",
+                                        "lineno": 11
+                                    }
+                                }
+                            ],
+                            "value": {
+                                "_type": "Name",
+                                "col_offset": 24,
+                                "ctx": {
+                                    "_type": "Load"
+                                },
+                                "id": "protocol",
+                                "lineno": 11
+                            }
+                        }
+                    ],
+                    "col_offset": 4,
+                    "decorator_list": [],
+                    "lineno": 10,
+                    "name": "__init__",
+                    "returns": null
+                },
+                {
+                    "_type": "FunctionDef",
+                    "args": {
+                        "_type": "arguments",
+                        "args": [
+                            {
+                                "_type": "arg",
+                                "annotation": null,
+                                "arg": "self",
+                                "col_offset": 16,
+                                "lineno": 13
+                            }
+                        ],
+                        "defaults": [],
+                        "kw_defaults": [],
+                        "kwarg": null,
+                        "kwonlyargs": [],
+                        "vararg": null
+                    },
+                    "body": [
+                        {
+                            "_type": "Pass",
+                            "col_offset": 8,
+                            "lineno": 14
+                        }
+                    ],
+                    "col_offset": 4,
+                    "decorator_list": [],
+                    "lineno": 13,
+                    "name": "connect",
+                    "returns": null
+                }
+            ],
+            "col_offset": 0,
+            "decorator_list": [],
+            "keywords": [],
+            "lineno": 8,
+            "name": "DriverBase"
+        },
+        {
+            "_type": "ClassDef",
+            "bases": [
+                {
+                    "_type": "Name",
+                    "col_offset": 14,
+                    "ctx": {
+                        "_type": "Load"
+                    },
+                    "id": "Message",
+                    "lineno": 17
+                }
+            ],
+            "body": [
+                {
+                    "_type": "FunctionDef",
+                    "args": {
+                        "_type": "arguments",
+                        "args": [
+                            {
+                                "_type": "arg",
+                                "annotation": null,
+                                "arg": "self",
+                                "col_offset": 15,
+                                "lineno": 19
+                            },
+                            {
+                                "_type": "arg",
+                                "annotation": {
+                                    "_type": "Name",
+                                    "col_offset": 29,
+                                    "ctx": {
+                                        "_type": "Load"
+                                    },
+                                    "id": "Buffer",
+                                    "lineno": 19
+                                },
+                                "arg": "buffer",
+                                "col_offset": 21,
+                                "lineno": 19
+                            }
+                        ],
+                        "defaults": [],
+                        "kw_defaults": [],
+                        "kwarg": null,
+                        "kwonlyargs": [],
+                        "vararg": null
+                    },
+                    "body": [
+                        {
+                            "_type": "Expr",
+                            "col_offset": 8,
+                            "lineno": 20,
+                            "value": {
+                                "_type": "Call",
+                                "args": [
+                                    {
+                                        "_type": "Call",
+                                        "args": [
+                                            {
+                                                "_type": "Str",
+                                                "col_offset": 30,
+                                                "lineno": 20,
+                                                "s": "Hallo I'm a  Request"
+                                            },
+                                            {
+                                                "_type": "Str",
+                                                "col_offset": 54,
+                                                "lineno": 20,
+                                                "s": "utf-8"
+                                            }
+                                        ],
+                                        "col_offset": 20,
+                                        "func": {
+                                            "_type": "Name",
+                                            "col_offset": 20,
+                                            "ctx": {
+                                                "_type": "Load"
+                                            },
+                                            "id": "bytearray",
+                                            "lineno": 20
+                                        },
+                                        "keywords": [],
+                                        "lineno": 20
+                                    }
+                                ],
+                                "col_offset": 8,
+                                "func": {
+                                    "_type": "Attribute",
+                                    "attr": "send",
+                                    "col_offset": 8,
+                                    "ctx": {
+                                        "_type": "Load"
+                                    },
+                                    "lineno": 20,
+                                    "value": {
+                                        "_type": "Name",
+                                        "col_offset": 8,
+                                        "ctx": {
+                                            "_type": "Load"
+                                        },
+                                        "id": "buffer",
+                                        "lineno": 20
+                                    }
+                                },
+                                "keywords": [],
+                                "lineno": 20
+                            }
+                        }
+                    ],
+                    "col_offset": 4,
+                    "decorator_list": [],
+                    "lineno": 19,
+                    "name": "encode",
+                    "returns": null
+                }
+            ],
+            "col_offset": 0,
+            "decorator_list": [],
+            "keywords": [],
+            "lineno": 17,
+            "name": "Request"
+        },
+        {
+            "_type": "ClassDef",
+            "bases": [
+                {
+                    "_type": "Name",
+                    "col_offset": 15,
+                    "ctx": {
+                        "_type": "Load"
+                    },
+                    "id": "Message",
+                    "lineno": 23
+                }
+            ],
+            "body": [
+                {
+                    "_type": "FunctionDef",
+                    "args": {
+                        "_type": "arguments",
+                        "args": [
+                            {
+                                "_type": "arg",
+                                "annotation": null,
+                                "arg": "self",
+                                "col_offset": 15,
+                                "lineno": 26
+                            },
+                            {
+                                "_type": "arg",
+                                "annotation": {
+                                    "_type": "Name",
+                                    "col_offset": 29,
+                                    "ctx": {
+                                        "_type": "Load"
+                                    },
+                                    "id": "Buffer",
+                                    "lineno": 26
+                                },
+                                "arg": "buffer",
+                                "col_offset": 21,
+                                "lineno": 26
+                            }
+                        ],
+                        "defaults": [],
+                        "kw_defaults": [],
+                        "kwarg": null,
+                        "kwonlyargs": [],
+                        "vararg": null
+                    },
+                    "body": [
+                        {
+                            "_type": "Assign",
+                            "col_offset": 8,
+                            "lineno": 27,
+                            "targets": [
+                                {
+                                    "_type": "Name",
+                                    "col_offset": 8,
+                                    "ctx": {
+                                        "_type": "Store"
+                                    },
+                                    "id": "bytes",
+                                    "lineno": 27
+                                }
+                            ],
+                            "value": {
+                                "_type": "Call",
+                                "args": [],
+                                "col_offset": 16,
+                                "func": {
+                                    "_type": "Name",
+                                    "col_offset": 16,
+                                    "ctx": {
+                                        "_type": "Load"
+                                    },
+                                    "id": "bytearray",
+                                    "lineno": 27
+                                },
+                                "keywords": [],
+                                "lineno": 27
+                            }
+                        },
+                        {
+                            "_type": "Assign",
+                            "col_offset": 8,
+                            "lineno": 28,
+                            "targets": [
+                                {
+                                    "_type": "Name",
+                                    "col_offset": 8,
+                                    "ctx": {
+                                        "_type": "Store"
+                                    },
+                                    "id": "b",
+                                    "lineno": 28
+                                }
+                            ],
+                            "value": {
+                                "_type": "Call",
+                                "args": [],
+                                "col_offset": 12,
+                                "func": {
+                                    "_type": "Attribute",
+                                    "attr": "readByte",
+                                    "col_offset": 12,
+                                    "ctx": {
+                                        "_type": "Load"
+                                    },
+                                    "lineno": 28,
+                                    "value": {
+                                        "_type": "Name",
+                                        "col_offset": 12,
+                                        "ctx": {
+                                            "_type": "Load"
+                                        },
+                                        "id": "buffer",
+                                        "lineno": 28
+                                    }
+                                },
+                                "keywords": [],
+                                "lineno": 28
+                            }
+                        },
+                        {
+                            "_type": "While",
+                            "body": [
+                                {
+                                    "_type": "Expr",
+                                    "col_offset": 12,
+                                    "lineno": 30,
+                                    "value": {
+                                        "_type": "Call",
+                                        "args": [
+                                            {
+                                                "_type": "Name",
+                                                "col_offset": 25,
+                                                "ctx": {
+                                                    "_type": "Load"
+                                                },
+                                                "id": "b",
+                                                "lineno": 30
+                                            }
+                                        ],
+                                        "col_offset": 12,
+                                        "func": {
+                                            "_type": "Attribute",
+                                            "attr": "append",
+                                            "col_offset": 12,
+                                            "ctx": {
+                                                "_type": "Load"
+                                            },
+                                            "lineno": 30,
+                                            "value": {
+                                                "_type": "Name",
+                                                "col_offset": 12,
+                                                "ctx": {
+                                                    "_type": "Load"
+                                                },
+                                                "id": "bytes",
+                                                "lineno": 30
+                                            }
+                                        },
+                                        "keywords": [],
+                                        "lineno": 30
+                                    }
+                                },
+                                {
+                                    "_type": "Assign",
+                                    "col_offset": 12,
+                                    "lineno": 31,
+                                    "targets": [
+                                        {
+                                            "_type": "Name",
+                                            "col_offset": 12,
+                                            "ctx": {
+                                                "_type": "Store"
+                                            },
+                                            "id": "b",
+                                            "lineno": 31
+                                        }
+                                    ],
+                                    "value": {
+                                        "_type": "Call",
+                                        "args": [],
+                                        "col_offset": 16,
+                                        "func": {
+                                            "_type": "Attribute",
+                                            "attr": "readByte",
+                                            "col_offset": 16,
+                                            "ctx": {
+                                                "_type": "Load"
+                                            },
+                                            "lineno": 31,
+                                            "value": {
+                                                "_type": "Name",
+                                                "col_offset": 16,
+                                                "ctx": {
+                                                    "_type": "Load"
+                                                },
+                                                "id": "buffer",
+                                                "lineno": 31
+                                            }
+                                        },
+                                        "keywords": [],
+                                        "lineno": 31
+                                    }
+                                }
+                            ],
+                            "col_offset": 8,
+                            "lineno": 29,
+                            "orelse": [],
+                            "test": {
+                                "_type": "Compare",
+                                "col_offset": 14,
+                                "comparators": [
+                                    {
+                                        "_type": "Num",
+                                        "col_offset": 19,
+                                        "lineno": 29,
+                                        "n": 0
+                                    }
+                                ],
+                                "left": {
+                                    "_type": "Name",
+                                    "col_offset": 14,
+                                    "ctx": {
+                                        "_type": "Load"
+                                    },
+                                    "id": "b",
+                                    "lineno": 29
+                                },
+                                "lineno": 29,
+                                "ops": [
+                                    {
+                                        "_type": "NotEq"
+                                    }
+                                ]
+                            }
+                        },
+                        {
+                            "_type": "Expr",
+                            "col_offset": 8,
+                            "lineno": 32,
+                            "value": {
+                                "_type": "Call",
+                                "args": [
+                                    {
+                                        "_type": "Call",
+                                        "args": [
+                                            {
+                                                "_type": "Name",
+                                                "col_offset": 18,
+                                                "ctx": {
+                                                    "_type": "Load"
+                                                },
+                                                "id": "bytearray",
+                                                "lineno": 32
+                                            }
+                                        ],
+                                        "col_offset": 14,
+                                        "func": {
+                                            "_type": "Name",
+                                            "col_offset": 14,
+                                            "ctx": {
+                                                "_type": "Load"
+                                            },
+                                            "id": "str",
+                                            "lineno": 32
+                                        },
+                                        "keywords": [],
+                                        "lineno": 32
+                                    }
+                                ],
+                                "col_offset": 8,
+                                "func": {
+                                    "_type": "Name",
+                                    "col_offset": 8,
+                                    "ctx": {
+                                        "_type": "Load"
+                                    },
+                                    "id": "print",
+                                    "lineno": 32
+                                },
+                                "keywords": [],
+                                "lineno": 32
+                            }
+                        },
+                        {
+                            "_type": "Return",
+                            "col_offset": 8,
+                            "lineno": 33,
+                            "value": {
+                                "_type": "Call",
+                                "args": [],
+                                "col_offset": 15,
+                                "func": {
+                                    "_type": "Name",
+                                    "col_offset": 15,
+                                    "ctx": {
+                                        "_type": "Load"
+                                    },
+                                    "id": "Response",
+                                    "lineno": 33
+                                },
+                                "keywords": [],
+                                "lineno": 33
+                            }
+                        }
+                    ],
+                    "col_offset": 4,
+                    "decorator_list": [
+                        {
+                            "_type": "Name",
+                            "col_offset": 5,
+                            "ctx": {
+                                "_type": "Load"
+                            },
+                            "id": "classmethod",
+                            "lineno": 25
+                        }
+                    ],
+                    "lineno": 25,
+                    "name": "decode",
+                    "returns": null
+                }
+            ],
+            "col_offset": 0,
+            "decorator_list": [],
+            "keywords": [],
+            "lineno": 23,
+            "name": "Response"
+        },
+        {
+            "_type": "ClassDef",
+            "bases": [
+                {
+                    "_type": "Name",
+                    "col_offset": 20,
+                    "ctx": {
+                        "_type": "Load"
+                    },
+                    "id": "DriverBase",
+                    "lineno": 36
+                }
+            ],
+            "body": [
+                {
+                    "_type": "AnnAssign",
+                    "annotation": {
+                        "_type": "Name",
+                        "col_offset": 12,
+                        "ctx": {
+                            "_type": "Load"
+                        },
+                        "id": "Buffer",
+                        "lineno": 37
+                    },
+                    "col_offset": 4,
+                    "lineno": 37,
+                    "simple": 1,
+                    "target": {
+                        "_type": "Name",
+                        "col_offset": 4,
+                        "ctx": {
+                            "_type": "Store"
+                        },
+                        "id": "buffer",
+                        "lineno": 37
+                    },
+                    "value": null
+                },
+                {
+                    "_type": "FunctionDef",
+                    "args": {
+                        "_type": "arguments",
+                        "args": [
+                            {
+                                "_type": "arg",
+                                "annotation": null,
+                                "arg": "self",
+                                "col_offset": 17,
+                                "lineno": 39
+                            },
+                            {
+                                "_type": "arg",
+                                "annotation": {
+                                    "_type": "Name",
+                                    "col_offset": 33,
+                                    "ctx": {
+                                        "_type": "Load"
+                                    },
+                                    "id": "Protocol",
+                                    "lineno": 39
+                                },
+                                "arg": "protocol",
+                                "col_offset": 23,
+                                "lineno": 39
+                            }
+                        ],
+                        "defaults": [],
+                        "kw_defaults": [],
+                        "kwarg": null,
+                        "kwonlyargs": [],
+                        "vararg": null
+                    },
+                    "body": [
+                        {
+                            "_type": "Expr",
+                            "col_offset": 8,
+                            "lineno": 40,
+                            "value": {
+                                "_type": "Call",
+                                "args": [
+                                    {
+                                        "_type": "Name",
+                                        "col_offset": 25,
+                                        "ctx": {
+                                            "_type": "Load"
+                                        },
+                                        "id": "protocol",
+                                        "lineno": 40
+                                    }
+                                ],
+                                "col_offset": 8,
+                                "func": {
+                                    "_type": "Attribute",
+                                    "attr": "__init__",
+                                    "col_offset": 8,
+                                    "ctx": {
+                                        "_type": "Load"
+                                    },
+                                    "lineno": 40,
+                                    "value": {
+                                        "_type": "Call",
+                                        "args": [],
+                                        "col_offset": 8,
+                                        "func": {
+                                            "_type": "Name",
+                                            "col_offset": 8,
+                                            "ctx": {
+                                                "_type": "Load"
+                                            },
+                                            "id": "super",
+                                            "lineno": 40
+                                        },
+                                        "keywords": [],
+                                        "lineno": 40
+                                    }
+                                },
+                                "keywords": [],
+                                "lineno": 40
+                            }
+                        }
+                    ],
+                    "col_offset": 4,
+                    "decorator_list": [],
+                    "lineno": 39,
+                    "name": "__init__",
+                    "returns": null
+                },
+                {
+                    "_type": "FunctionDef",
+                    "args": {
+                        "_type": "arguments",
+                        "args": [
+                            {
+                                "_type": "arg",
+                                "annotation": null,
+                                "arg": "self",
+                                "col_offset": 16,
+                                "lineno": 42
+                            }
+                        ],
+                        "defaults": [],
+                        "kw_defaults": [],
+                        "kwarg": null,
+                        "kwonlyargs": [],
+                        "vararg": null
+                    },
+                    "body": [
+                        {
+                            "_type": "Assign",
+                            "col_offset": 8,
+                            "lineno": 44,
+                            "targets": [
+                                {
+                                    "_type": "Attribute",
+                                    "attr": "buffer",
+                                    "col_offset": 8,
+                                    "ctx": {
+                                        "_type": "Store"
+                                    },
+                                    "lineno": 44,
+                                    "value": {
+                                        "_type": "Name",
+                                        "col_offset": 8,
+                                        "ctx": {
+                                            "_type": "Load"
+                                        },
+                                        "id": "self",
+                                        "lineno": 44
+                                    }
+                                }
+                            ],
+                            "value": {
+                                "_type": "Call",
+                                "args": [],
+                                "col_offset": 22,
+                                "func": {
+                                    "_type": "Attribute",
+                                    "attr": "connect",
+                                    "col_offset": 22,
+                                    "ctx": {
+                                        "_type": "Load"
+                                    },
+                                    "lineno": 44,
+                                    "value": {
+                                        "_type": "Attribute",
+                                        "attr": "protocol",
+                                        "col_offset": 22,
+                                        "ctx": {
+                                            "_type": "Load"
+                                        },
+                                        "lineno": 44,
+                                        "value": {
+                                            "_type": "Name",
+                                            "col_offset": 22,
+                                            "ctx": {
+                                                "_type": "Load"
+                                            },
+                                            "id": "self",
+                                            "lineno": 44
+                                        }
+                                    }
+                                },
+                                "keywords": [],
+                                "lineno": 44
+                            }
+                        },
+                        {
+                            "_type": "AnnAssign",
+                            "annotation": {
+                                "_type": "Name",
+                                "col_offset": 17,
+                                "ctx": {
+                                    "_type": "Load"
+                                },
+                                "id": "Request",
+                                "lineno": 46
+                            },
+                            "col_offset": 8,
+                            "lineno": 46,
+                            "simple": 1,
+                            "target": {
+                                "_type": "Name",
+                                "col_offset": 8,
+                                "ctx": {
+                                    "_type": "Store"
+                                },
+                                "id": "request",
+                                "lineno": 46
+                            },
+                            "value": {
+                                "_type": "Call",
+                                "args": [],
+                                "col_offset": 27,
+                                "func": {
+                                    "_type": "Name",
+                                    "col_offset": 27,
+                                    "ctx": {
+                                        "_type": "Load"
+                                    },
+                                    "id": "Request",
+                                    "lineno": 46
+                                },
+                                "keywords": [],
+                                "lineno": 46
+                            }
+                        },
+                        {
+                            "_type": "Expr",
+                            "col_offset": 8,
+                            "lineno": 48,
+                            "value": {
+                                "_type": "Call",
+                                "args": [
+                                    {
+                                        "_type": "Attribute",
+                                        "attr": "buffer",
+                                        "col_offset": 23,
+                                        "ctx": {
+                                            "_type": "Load"
+                                        },
+                                        "lineno": 48,
+                                        "value": {
+                                            "_type": "Name",
+                                            "col_offset": 23,
+                                            "ctx": {
+                                                "_type": "Load"
+                                            },
+                                            "id": "self",
+                                            "lineno": 48
+                                        }
+                                    }
+                                ],
+                                "col_offset": 8,
+                                "func": {
+                                    "_type": "Attribute",
+                                    "attr": "encode",
+                                    "col_offset": 8,
+                                    "ctx": {
+                                        "_type": "Load"
+                                    },
+                                    "lineno": 48,
+                                    "value": {
+                                        "_type": "Name",
+                                        "col_offset": 8,
+                                        "ctx": {
+                                            "_type": "Load"
+                                        },
+                                        "id": "request",
+                                        "lineno": 48
+                                    }
+                                },
+                                "keywords": [],
+                                "lineno": 48
+                            }
+                        },
+                        {
+                            "_type": "Expr",
+                            "col_offset": 8,
+                            "lineno": 51,
+                            "value": {
+                                "_type": "Call",
+                                "args": [
+                                    {
+                                        "_type": "Name",
+                                        "col_offset": 28,
+                                        "ctx": {
+                                            "_type": "Load"
+                                        },
+                                        "id": "Response",
+                                        "lineno": 51
+                                    }
+                                ],
+                                "col_offset": 8,
+                                "func": {
+                                    "_type": "Attribute",
+                                    "attr": "receive",
+                                    "col_offset": 8,
+                                    "ctx": {
+                                        "_type": "Load"
+                                    },
+                                    "lineno": 51,
+                                    "value": {
+                                        "_type": "Attribute",
+                                        "attr": "buffer",
+                                        "col_offset": 8,
+                                        "ctx": {
+                                            "_type": "Load"
+                                        },
+                                        "lineno": 51,
+                                        "value": {
+                                            "_type": "Name",
+                                            "col_offset": 8,
+                                            "ctx": {
+                                                "_type": "Load"
+                                            },
+                                            "id": "self",
+                                            "lineno": 51
+                                        }
+                                    }
+                                },
+                                "keywords": [],
+                                "lineno": 51
+                            }
+                        }
+                    ],
+                    "col_offset": 4,
+                    "decorator_list": [],
+                    "lineno": 42,
+                    "name": "connect",
+                    "returns": null
+                }
+            ],
+            "col_offset": 0,
+            "decorator_list": [],
+            "keywords": [],
+            "lineno": 36,
+            "name": "ExampleDriver"
+        },
+        {
+            "_type": "ClassDef",
+            "bases": [
+                {
+                    "_type": "Name",
+                    "col_offset": 18,
+                    "ctx": {
+                        "_type": "Load"
+                    },
+                    "id": "Buffer",
+                    "lineno": 54
+                }
+            ],
+            "body": [
+                {
+                    "_type": "FunctionDef",
+                    "args": {
+                        "_type": "arguments",
+                        "args": [
+                            {
+                                "_type": "arg",
+                                "annotation": null,
+                                "arg": "self",
+                                "col_offset": 17,
+                                "lineno": 56
+                            }
+                        ],
+                        "defaults": [],
+                        "kw_defaults": [],
+                        "kwarg": null,
+                        "kwonlyargs": [],
+                        "vararg": null
+                    },
+                    "body": [
+                        {
+                            "_type": "Return",
+                            "col_offset": 8,
+                            "lineno": 57,
+                            "value": {
+                                "_type": "Num",
+                                "col_offset": 15,
+                                "lineno": 57,
+                                "n": 0
+                            }
+                        }
+                    ],
+                    "col_offset": 4,
+                    "decorator_list": [],
+                    "lineno": 56,
+                    "name": "readByte",
+                    "returns": null
+                },
+                {
+                    "_type": "FunctionDef",
+                    "args": {
+                        "_type": "arguments",
+                        "args": [
+                            {
+                                "_type": "arg",
+                                "annotation": null,
+                                "arg": "self",
+                                "col_offset": 13,
+                                "lineno": 59
+                            },
+                            {
+                                "_type": "arg",
+                                "annotation": {
+                                    "_type": "Name",
+                                    "col_offset": 26,
+                                    "ctx": {
+                                        "_type": "Load"
+                                    },
+                                    "id": "bytearray",
+                                    "lineno": 59
+                                },
+                                "arg": "bytes",
+                                "col_offset": 19,
+                                "lineno": 59
+                            }
+                        ],
+                        "defaults": [],
+                        "kw_defaults": [],
+                        "kwarg": null,
+                        "kwonlyargs": [],
+                        "vararg": null
+                    },
+                    "body": [
+                        {
+                            "_type": "Expr",
+                            "col_offset": 8,
+                            "lineno": 60,
+                            "value": {
+                                "_type": "Call",
+                                "args": [
+                                    {
+                                        "_type": "Call",
+                                        "args": [
+                                            {
+                                                "_type": "Name",
+                                                "col_offset": 18,
+                                                "ctx": {
+                                                    "_type": "Load"
+                                                },
+                                                "id": "bytes",
+                                                "lineno": 60
+                                            }
+                                        ],
+                                        "col_offset": 14,
+                                        "func": {
+                                            "_type": "Name",
+                                            "col_offset": 14,
+                                            "ctx": {
+                                                "_type": "Load"
+                                            },
+                                            "id": "str",
+                                            "lineno": 60
+                                        },
+                                        "keywords": [],
+                                        "lineno": 60
+                                    }
+                                ],
+                                "col_offset": 8,
+                                "func": {
+                                    "_type": "Name",
+                                    "col_offset": 8,
+                                    "ctx": {
+                                        "_type": "Load"
+                                    },
+                                    "id": "print",
+                                    "lineno": 60
+                                },
+                                "keywords": [],
+                                "lineno": 60
+                            }
+                        }
+                    ],
+                    "col_offset": 4,
+                    "decorator_list": [],
+                    "lineno": 59,
+                    "name": "send",
+                    "returns": null
+                },
+                {
+                    "_type": "FunctionDef",
+                    "args": {
+                        "_type": "arguments",
+                        "args": [
+                            {
+                                "_type": "arg",
+                                "annotation": null,
+                                "arg": "self",
+                                "col_offset": 16,
+                                "lineno": 62
+                            },
+                            {
+                                "_type": "arg",
+                                "annotation": {
+                                    "_type": "Name",
+                                    "col_offset": 32,
+                                    "ctx": {
+                                        "_type": "Load"
+                                    },
+                                    "id": "type",
+                                    "lineno": 62
+                                },
+                                "arg": "response",
+                                "col_offset": 22,
+                                "lineno": 62
+                            }
+                        ],
+                        "defaults": [],
+                        "kw_defaults": [],
+                        "kwarg": null,
+                        "kwonlyargs": [],
+                        "vararg": null
+                    },
+                    "body": [
+                        {
+                            "_type": "Return",
+                            "col_offset": 8,
+                            "lineno": 63,
+                            "value": {
+                                "_type": "Call",
+                                "args": [
+                                    {
+                                        "_type": "Name",
+                                        "col_offset": 31,
+                                        "ctx": {
+                                            "_type": "Load"
+                                        },
+                                        "id": "self",
+                                        "lineno": 63
+                                    }
+                                ],
+                                "col_offset": 15,
+                                "func": {
+                                    "_type": "Attribute",
+                                    "attr": "decode",
+                                    "col_offset": 15,
+                                    "ctx": {
+                                        "_type": "Load"
+                                    },
+                                    "lineno": 63,
+                                    "value": {
+                                        "_type": "Name",
+                                        "col_offset": 15,
+                                        "ctx": {
+                                            "_type": "Load"
+                                        },
+                                        "id": "response",
+                                        "lineno": 63
+                                    }
+                                },
+                                "keywords": [],
+                                "lineno": 63
+                            }
+                        }
+                    ],
+                    "col_offset": 4,
+                    "decorator_list": [],
+                    "lineno": 62,
+                    "name": "receive",
+                    "returns": null
+                }
+            ],
+            "col_offset": 0,
+            "decorator_list": [],
+            "keywords": [],
+            "lineno": 54,
+            "name": "DummyBuffer"
+        },
+        {
+            "_type": "ClassDef",
+            "bases": [
+                {
+                    "_type": "Name",
+                    "col_offset": 20,
+                    "ctx": {
+                        "_type": "Load"
+                    },
+                    "id": "Protocol",
+                    "lineno": 66
+                }
+            ],
+            "body": [
+                {
+                    "_type": "FunctionDef",
+                    "args": {
+                        "_type": "arguments",
+                        "args": [
+                            {
+                                "_type": "arg",
+                                "annotation": null,
+                                "arg": "self",
+                                "col_offset": 16,
+                                "lineno": 68
+                            }
+                        ],
+                        "defaults": [],
+                        "kw_defaults": [],
+                        "kwarg": null,
+                        "kwonlyargs": [],
+                        "vararg": null
+                    },
+                    "body": [
+                        {
+                            "_type": "Return",
+                            "col_offset": 8,
+                            "lineno": 69,
+                            "value": {
+                                "_type": "Call",
+                                "args": [],
+                                "col_offset": 15,
+                                "func": {
+                                    "_type": "Name",
+                                    "col_offset": 15,
+                                    "ctx": {
+                                        "_type": "Load"
+                                    },
+                                    "id": "DummyBuffer",
+                                    "lineno": 69
+                                },
+                                "keywords": [],
+                                "lineno": 69
+                            }
+                        }
+                    ],
+                    "col_offset": 4,
+                    "decorator_list": [],
+                    "lineno": 68,
+                    "name": "connect",
+                    "returns": {
+                        "_type": "Name",
+                        "col_offset": 25,
+                        "ctx": {
+                            "_type": "Load"
+                        },
+                        "id": "Buffer",
+                        "lineno": 68
+                    }
+                },
+                {
+                    "_type": "FunctionDef",
+                    "args": {
+                        "_type": "arguments",
+                        "args": [
+                            {
+                                "_type": "arg",
+                                "annotation": null,
+                                "arg": "self",
+                                "col_offset": 14,
+                                "lineno": 71
+                            }
+                        ],
+                        "defaults": [],
+                        "kw_defaults": [],
+                        "kwarg": null,
+                        "kwonlyargs": [],
+                        "vararg": null
+                    },
+                    "body": [
+                        {
+                            "_type": "Pass",
+                            "col_offset": 8,
+                            "lineno": 72
+                        }
+                    ],
+                    "col_offset": 4,
+                    "decorator_list": [],
+                    "lineno": 71,
+                    "name": "close",
+                    "returns": null
+                }
+            ],
+            "col_offset": 0,
+            "decorator_list": [],
+            "keywords": [],
+            "lineno": 66,
+            "name": "DummyProtocol"
+        },
+        {
+            "_type": "If",
+            "body": [
+                {
+                    "_type": "Assign",
+                    "col_offset": 4,
+                    "lineno": 77,
+                    "targets": [
+                        {
+                            "_type": "Name",
+                            "col_offset": 4,
+                            "ctx": {
+                                "_type": "Store"
+                            },
+                            "id": "store",
+                            "lineno": 77
+                        }
+                    ],
+                    "value": {
+                        "_type": "Call",
+                        "args": [],
+                        "col_offset": 12,
+                        "func": {
+                            "_type": "Name",
+                            "col_offset": 12,
+                            "ctx": {
+                                "_type": "Load"
+                            },
+                            "id": "ModbusSlaveContext",
+                            "lineno": 77
+                        },
+                        "keywords": [
+                            {
+                                "_type": "keyword",
+                                "arg": "di",
+                                "value": {
+                                    "_type": "Call",
+                                    "args": [
+                                        {
+                                            "_type": "Num",
+                                            "col_offset": 37,
+                                            "lineno": 78,
+                                            "n": 0
+                                        },
+                                        {
+                                            "_type": "BinOp",
+                                            "col_offset": 40,
+                                            "left": {
+                                                "_type": "List",
+                                                "col_offset": 40,
+                                                "ctx": {
+                                                    "_type": "Load"
+                                                },
+                                                "elts": [
+                                                    {
+                                                        "_type": "Num",
+                                                        "col_offset": 41,
+                                                        "lineno": 78,
+                                                        "n": 17
+                                                    }
+                                                ],
+                                                "lineno": 78
+                                            },
+                                            "lineno": 78,
+                                            "op": {
+                                                "_type": "Mult"
+                                            },
+                                            "right": {
+                                                "_type": "Num",
+                                                "col_offset": 47,
+                                                "lineno": 78,
+                                                "n": 100
+                                            }
+                                        }
+                                    ],
+                                    "col_offset": 11,
+                                    "func": {
+                                        "_type": "Name",
+                                        "col_offset": 11,
+                                        "ctx": {
+                                            "_type": "Load"
+                                        },
+                                        "id": "ModbusSequentialDataBlock",
+                                        "lineno": 78
+                                    },
+                                    "keywords": [],
+                                    "lineno": 78
+                                }
+                            },
+                            {
+                                "_type": "keyword",
+                                "arg": "co",
+                                "value": {
+                                    "_type": "Call",
+                                    "args": [
+                                        {
+                                            "_type": "Num",
+                                            "col_offset": 37,
+                                            "lineno": 79,
+                                            "n": 0
+                                        },
+                                        {
+                                            "_type": "BinOp",
+                                            "col_offset": 40,
+                                            "left": {
+                                                "_type": "List",
+                                                "col_offset": 40,
+                                                "ctx": {
+                                                    "_type": "Load"
+                                                },
+                                                "elts": [
+                                                    {
+                                                        "_type": "Num",
+                                                        "col_offset": 41,
+                                                        "lineno": 79,
+                                                        "n": 17
+                                                    }
+                                                ],
+                                                "lineno": 79
+                                            },
+                                            "lineno": 79,
+                                            "op": {
+                                                "_type": "Mult"
+                                            },
+                                            "right": {
+                                                "_type": "Num",
+                                                "col_offset": 47,
+                                                "lineno": 79,
+                                                "n": 100
+                                            }
+                                        }
+                                    ],
+                                    "col_offset": 11,
+                                    "func": {
+                                        "_type": "Name",
+                                        "col_offset": 11,
+                                        "ctx": {
+                                            "_type": "Load"
+                                        },
+                                        "id": "ModbusSequentialDataBlock",
+                                        "lineno": 79
+                                    },
+                                    "keywords": [],
+                                    "lineno": 79
+                                }
+                            },
+                            {
+                                "_type": "keyword",
+                                "arg": "hr",
+                                "value": {
+                                    "_type": "Call",
+                                    "args": [
+                                        {
+                                            "_type": "Num",
+                                            "col_offset": 37,
+                                            "lineno": 80,
+                                            "n": 0
+                                        },
+                                        {
+                                            "_type": "BinOp",
+                                            "col_offset": 40,
+                                            "left": {
+                                                "_type": "List",
+                                                "col_offset": 40,
+                                                "ctx": {
+                                                    "_type": "Load"
+                                                },
+                                                "elts": [
+                                                    {
+                                                        "_type": "Num",
+                                                        "col_offset": 41,
+                                                        "lineno": 80,
+                                                        "n": 17
+                                                    }
+                                                ],
+                                                "lineno": 80
+                                            },
+                                            "lineno": 80,
+                                            "op": {
+                                                "_type": "Mult"
+                                            },
+                                            "right": {
+                                                "_type": "Num",
+                                                "col_offset": 47,
+                                                "lineno": 80,
+                                                "n": 100
+                                            }
+                                        }
+                                    ],
+                                    "col_offset": 11,
+                                    "func": {
+                                        "_type": "Name",
+                                        "col_offset": 11,
+                                        "ctx": {
+                                            "_type": "Load"
+                                        },
+                                        "id": "ModbusSequentialDataBlock",
+                                        "lineno": 80
+                                    },
+                                    "keywords": [],
+                                    "lineno": 80
+                                }
+                            },
+                            {
+                                "_type": "keyword",
+                                "arg": "ir",
+                                "value": {
+                                    "_type": "Call",
+                                    "args": [
+                                        {
+                                            "_type": "Num",
+                                            "col_offset": 37,
+                                            "lineno": 81,
+                                            "n": 0
+                                        },
+                                        {
+                                            "_type": "BinOp",
+                                            "col_offset": 40,
+                                            "left": {
+                                                "_type": "List",
+                                                "col_offset": 40,
+                                                "ctx": {
+                                                    "_type": "Load"
+                                                },
+                                                "elts": [
+                                                    {
+                                                        "_type": "Num",
+                                                        "col_offset": 41,
+                                                        "lineno": 81,
+                                                        "n": 17
+                                                    }
+                                                ],
+                                                "lineno": 81
+                                            },
+                                            "lineno": 81,
+                                            "op": {
+                                                "_type": "Mult"
+                                            },
+                                            "right": {
+                                                "_type": "Num",
+                                                "col_offset": 47,
+                                                "lineno": 81,
+                                                "n": 100
+                                            }
+                                        }
+                                    ],
+                                    "col_offset": 11,
+                                    "func": {
+                                        "_type": "Name",
+                                        "col_offset": 11,
+                                        "ctx": {
+                                            "_type": "Load"
+                                        },
+                                        "id": "ModbusSequentialDataBlock",
+                                        "lineno": 81
+                                    },
+                                    "keywords": [],
+                                    "lineno": 81
+                                }
+                            }
+                        ],
+                        "lineno": 77
+                    }
+                },
+                {
+                    "_type": "Assign",
+                    "col_offset": 4,
+                    "lineno": 83,
+                    "targets": [
+                        {
+                            "_type": "Name",
+                            "col_offset": 4,
+                            "ctx": {
+                                "_type": "Store"
+                            },
+                            "id": "context",
+                            "lineno": 83
+                        }
+                    ],
+                    "value": {
+                        "_type": "Call",
+                        "args": [],
+                        "col_offset": 14,
+                        "func": {
+                            "_type": "Name",
+                            "col_offset": 14,
+                            "ctx": {
+                                "_type": "Load"
+                            },
+                            "id": "ModbusServerContext",
+                            "lineno": 83
+                        },
+                        "keywords": [
+                            {
+                                "_type": "keyword",
+                                "arg": "slaves",
+                                "value": {
+                                    "_type": "Name",
+                                    "col_offset": 41,
+                                    "ctx": {
+                                        "_type": "Load"
+                                    },
+                                    "id": "store",
+                                    "lineno": 83
+                                }
+                            },
+                            {
+                                "_type": "keyword",
+                                "arg": "single",
+                                "value": {
+                                    "_type": "NameConstant",
+                                    "col_offset": 55,
+                                    "lineno": 83,
+                                    "value": true
+                                }
+                            }
+                        ],
+                        "lineno": 83
+                    }
+                },
+                {
+                    "_type": "Assign",
+                    "col_offset": 4,
+                    "lineno": 90,
+                    "targets": [
+                        {
+                            "_type": "Name",
+                            "col_offset": 4,
+                            "ctx": {
+                                "_type": "Store"
+                            },
+                            "id": "identity",
+                            "lineno": 90
+                        }
+                    ],
+                    "value": {
+                        "_type": "Call",
+                        "args": [],
+                        "col_offset": 15,
+                        "func": {
+                            "_type": "Name",
+                            "col_offset": 15,
+                            "ctx": {
+                                "_type": "Load"
+                            },
+                            "id": "ModbusDeviceIdentification",
+                            "lineno": 90
+                        },
+                        "keywords": [],
+                        "lineno": 90
+                    }
+                },
+                {
+                    "_type": "Assign",
+                    "col_offset": 4,
+                    "lineno": 91,
+                    "targets": [
+                        {
+                            "_type": "Attribute",
+                            "attr": "VendorName",
+                            "col_offset": 4,
+                            "ctx": {
+                                "_type": "Store"
+                            },
+                            "lineno": 91,
+                            "value": {
+                                "_type": "Name",
+                                "col_offset": 4,
+                                "ctx": {
+                                    "_type": "Load"
+                                },
+                                "id": "identity",
+                                "lineno": 91
+                            }
+                        }
+                    ],
+                    "value": {
+                        "_type": "Str",
+                        "col_offset": 26,
+                        "lineno": 91,
+                        "s": "Pymodbus"
+                    }
+                },
+                {
+                    "_type": "Assign",
+                    "col_offset": 4,
+                    "lineno": 92,
+                    "targets": [
+                        {
+                            "_type": "Attribute",
+                            "attr": "ProductCode",
+                            "col_offset": 4,
+                            "ctx": {
+                                "_type": "Store"
+                            },
+                            "lineno": 92,
+                            "value": {
+                                "_type": "Name",
+                                "col_offset": 4,
+                                "ctx": {
+                                    "_type": "Load"
+                                },
+                                "id": "identity",
+                                "lineno": 92
+                            }
+                        }
+                    ],
+                    "value": {
+                        "_type": "Str",
+                        "col_offset": 27,
+                        "lineno": 92,
+                        "s": "PM"
+                    }
+                },
+                {
+                    "_type": "Assign",
+                    "col_offset": 4,
+                    "lineno": 93,
+                    "targets": [
+                        {
+                            "_type": "Attribute",
+                            "attr": "VendorUrl",
+                            "col_offset": 4,
+                            "ctx": {
+                                "_type": "Store"
+                            },
+                            "lineno": 93,
+                            "value": {
+                                "_type": "Name",
+                                "col_offset": 4,
+                                "ctx": {
+                                    "_type": "Load"
+                                },
+                                "id": "identity",
+                                "lineno": 93
+                            }
+                        }
+                    ],
+                    "value": {
+                        "_type": "Str",
+                        "col_offset": 25,
+                        "lineno": 93,
+                        "s": "http://github.com/riptideio/pymodbus/"
+                    }
+                },
+                {
+                    "_type": "Assign",
+                    "col_offset": 4,
+                    "lineno": 94,
+                    "targets": [
+                        {
+                            "_type": "Attribute",
+                            "attr": "ProductName",
+                            "col_offset": 4,
+                            "ctx": {
+                                "_type": "Store"
+                            },
+                            "lineno": 94,
+                            "value": {
+                                "_type": "Name",
+                                "col_offset": 4,
+                                "ctx": {
+                                    "_type": "Load"
+                                },
+                                "id": "identity",
+                                "lineno": 94
+                            }
+                        }
+                    ],
+                    "value": {
+                        "_type": "Str",
+                        "col_offset": 27,
+                        "lineno": 94,
+                        "s": "Pymodbus Server"
+                    }
+                },
+                {
+                    "_type": "Assign",
+                    "col_offset": 4,
+                    "lineno": 95,
+                    "targets": [
+                        {
+                            "_type": "Attribute",
+                            "attr": "ModelName",
+                            "col_offset": 4,
+                            "ctx": {
+                                "_type": "Store"
+                            },
+                            "lineno": 95,
+                            "value": {
+                                "_type": "Name",
+                                "col_offset": 4,
+                                "ctx": {
+                                    "_type": "Load"
+                                },
+                                "id": "identity",
+                                "lineno": 95
+                            }
+                        }
+                    ],
+                    "value": {
+                        "_type": "Str",
+                        "col_offset": 25,
+                        "lineno": 95,
+                        "s": "Pymodbus Server"
+                    }
+                },
+                {
+                    "_type": "Assign",
+                    "col_offset": 4,
+                    "lineno": 96,
+                    "targets": [
+                        {
+                            "_type": "Attribute",
+                            "attr": "MajorMinorRevision",
+                            "col_offset": 4,
+                            "ctx": {
+                                "_type": "Store"
+                            },
+                            "lineno": 96,
+                            "value": {
+                                "_type": "Name",
+                                "col_offset": 4,
+                                "ctx": {
+                                    "_type": "Load"
+                                },
+                                "id": "identity",
+                                "lineno": 96
+                            }
+                        }
+                    ],
+                    "value": {
+                        "_type": "Str",
+                        "col_offset": 34,
+                        "lineno": 96,
+                        "s": "2.1.0"
+                    }
+                },
+                {
+                    "_type": "Assign",
+                    "col_offset": 4,
+                    "lineno": 102,
+                    "targets": [
+                        {
+                            "_type": "Name",
+                            "col_offset": 4,
+                            "ctx": {
+                                "_type": "Store"
+                            },
+                            "id": "server",
+                            "lineno": 102
+                        }
+                    ],
+                    "value": {
+                        "_type": "Call",
+                        "args": [
+                            {
+                                "_type": "Name",
+                                "col_offset": 29,
+                                "ctx": {
+                                    "_type": "Load"
+                                },
+                                "id": "context",
+                                "lineno": 102
+                            }
+                        ],
+                        "col_offset": 13,
+                        "func": {
+                            "_type": "Name",
+                            "col_offset": 13,
+                            "ctx": {
+                                "_type": "Load"
+                            },
+                            "id": "ModbusTcpServer",
+                            "lineno": 102
+                        },
+                        "keywords": [
+                            {
+                                "_type": "keyword",
+                                "arg": "identity",
+                                "value": {
+                                    "_type": "Name",
+                                    "col_offset": 47,
+                                    "ctx": {
+                                        "_type": "Load"
+                                    },
+                                    "id": "identity",
+                                    "lineno": 102
+                                }
+                            },
+                            {
+                                "_type": "keyword",
+                                "arg": "address",
+                                "value": {
+                                    "_type": "Tuple",
+                                    "col_offset": 66,
+                                    "ctx": {
+                                        "_type": "Load"
+                                    },
+                                    "elts": [
+                                        {
+                                            "_type": "Str",
+                                            "col_offset": 66,
+                                            "lineno": 102,
+                                            "s": "localhost"
+                                        },
+                                        {
+                                            "_type": "Num",
+                                            "col_offset": 79,
+                                            "lineno": 102,
+                                            "n": 5020
+                                        }
+                                    ],
+                                    "lineno": 102
+                                }
+                            }
+                        ],
+                        "lineno": 102
+                    }
+                },
+                {
+                    "_type": "Assign",
+                    "col_offset": 4,
+                    "lineno": 104,
+                    "targets": [
+                        {
+                            "_type": "Name",
+                            "col_offset": 4,
+                            "ctx": {
+                                "_type": "Store"
+                            },
+                            "id": "drv",
+                            "lineno": 104
+                        }
+                    ],
+                    "value": {
+                        "_type": "Call",
+                        "args": [
+                            {
+                                "_type": "Call",
+                                "args": [],
+                                "col_offset": 24,
+                                "func": {
+                                    "_type": "Name",
+                                    "col_offset": 24,
+                                    "ctx": {
+                                        "_type": "Load"
+                                    },
+                                    "id": "DummyProtocol",
+                                    "lineno": 104
+                                },
+                                "keywords": [],
+                                "lineno": 104
+                            }
+                        ],
+                        "col_offset": 10,
+                        "func": {
+                            "_type": "Name",
+                            "col_offset": 10,
+                            "ctx": {
+                                "_type": "Load"
+                            },
+                            "id": "ExampleDriver",
+                            "lineno": 104
+                        },
+                        "keywords": [],
+                        "lineno": 104
+                    }
+                },
+                {
+                    "_type": "Expr",
+                    "col_offset": 4,
+                    "lineno": 105,
+                    "value": {
+                        "_type": "Call",
+                        "args": [],
+                        "col_offset": 4,
+                        "func": {
+                            "_type": "Attribute",
+                            "attr": "connect",
+                            "col_offset": 4,
+                            "ctx": {
+                                "_type": "Load"
+                            },
+                            "lineno": 105,
+                            "value": {
+                                "_type": "Name",
+                                "col_offset": 4,
+                                "ctx": {
+                                    "_type": "Load"
+                                },
+                                "id": "drv",
+                                "lineno": 105
+                            }
+                        },
+                        "keywords": [],
+                        "lineno": 105
+                    }
+                },
+                {
+                    "_type": "Expr",
+                    "col_offset": 4,
+                    "lineno": 107,
+                    "value": {
+                        "_type": "Call",
+                        "args": [],
+                        "col_offset": 4,
+                        "func": {
+                            "_type": "Attribute",
+                            "attr": "server_close",
+                            "col_offset": 4,
+                            "ctx": {
+                                "_type": "Load"
+                            },
+                            "lineno": 107,
+                            "value": {
+                                "_type": "Name",
+                                "col_offset": 4,
+                                "ctx": {
+                                    "_type": "Load"
+                                },
+                                "id": "server",
+                                "lineno": 107
+                            }
+                        },
+                        "keywords": [],
+                        "lineno": 107
+                    }
+                }
+            ],
+            "col_offset": 0,
+            "lineno": 75,
+            "orelse": [],
+            "test": {
+                "_type": "Compare",
+                "col_offset": 3,
+                "comparators": [
+                    {
+                        "_type": "Str",
+                        "col_offset": 15,
+                        "lineno": 75,
+                        "s": "__main__"
+                    }
+                ],
+                "left": {
+                    "_type": "Name",
+                    "col_offset": 3,
+                    "ctx": {
+                        "_type": "Load"
+                    },
+                    "id": "__name__",
+                    "lineno": 75
+                },
+                "lineno": 75,
+                "ops": [
+                    {
+                        "_type": "Eq"
+                    }
+                ]
+            }
+        }
+    ]
 }
\ No newline at end of file
diff --git a/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/DFDLUtilTest.java b/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/DFDLUtilTest.java
index d46cce582fa..c446ad44fe9 100644
--- a/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/DFDLUtilTest.java
+++ b/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/DFDLUtilTest.java
@@ -1,38 +1,38 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen;
-
-import org.junit.Test;
-
-import java.io.File;
-
-public class DFDLUtilTest {
-
-    @Test
-    public void loadDFDL() {
-        final File schema = new File("src/test/resources/protocol.dfdl.xsd");
-        final File outDir = new File("/tmp/");
-
-        System.out.println(schema.getAbsolutePath().toString());
-
-        final DFDLUtil util = new DFDLUtil();
-
-        util.transform(schema, outDir);
-    }
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen;
+
+import org.junit.Test;
+
+import java.io.File;
+
+public class DFDLUtilTest {
+
+    @Test
+    public void loadDFDL() {
+        final File schema = new File("src/test/resources/protocol.dfdl.xsd");
+        final File outDir = new File("/tmp/");
+
+        System.out.println(schema.getAbsolutePath().toString());
+
+        final DFDLUtil util = new DFDLUtil();
+
+        util.transform(schema, outDir);
+    }
 }
\ No newline at end of file
diff --git a/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/ModuleNodeTest.java b/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/ModuleNodeTest.java
index 9c95a86cf05..bbd1b5684a6 100644
--- a/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/ModuleNodeTest.java
+++ b/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/ModuleNodeTest.java
@@ -1,188 +1,188 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.plc4x.codegen.python.*;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-
-import static org.junit.Assert.assertTrue;
-
-class ModuleNodeTest {
-
-    private ObjectMapper mapper;
-
-    @BeforeEach
-    void setUp() {
-        mapper = new ObjectMapper();
-        mapper.registerSubtypes(ModuleNode.class);
-        mapper.registerSubtypes(ClassDefNode.class);
-        mapper.registerSubtypes(PassNode.class);
-        mapper.registerSubtypes(FunctionDefNode.class);
-        mapper.registerSubtypes(ArgumentsNode.class);
-        mapper.registerSubtypes(ExprNode.class);
-        mapper.registerSubtypes(CallNode.class);
-        mapper.registerSubtypes(StrNode.class);
-        mapper.registerSubtypes(NameNode.class);
-        mapper.registerSubtypes(LoadNode.class);
-        mapper.registerSubtypes(AnnAssignerNode.class);
-        mapper.registerSubtypes(StoreNode.class);
-        mapper.registerSubtypes(NumNode.class);
-        mapper.registerSubtypes(AugAssignNode.class);
-        mapper.registerSubtypes(AddNode.class);
-        mapper.registerSubtypes(ImportFromNode.class);
-        mapper.registerSubtypes(AliasNode.class);
-        mapper.registerSubtypes(ArgNode.class);
-        mapper.registerSubtypes(AssignNode.class);
-        mapper.registerSubtypes(AttributeNode.class);
-        mapper.registerSubtypes(WhileNode.class);
-        mapper.registerSubtypes(CompareNode.class);
-        mapper.registerSubtypes(NotEqNode.class);
-        mapper.registerSubtypes(ReturnNode.class);
-        mapper.registerSubtypes(IfNode.class);
-        mapper.registerSubtypes(KeywordNode.class);
-        mapper.registerSubtypes(BinOpNode.class);
-        mapper.registerSubtypes(ListNode.class);
-        mapper.registerSubtypes(MultNode.class);
-        mapper.registerSubtypes(NameConstantNode.class);
-        mapper.registerSubtypes(TupleNode.class);
-        mapper.registerSubtypes(EqNode.class);
-    }
-
-    @Test
-    void serialize() throws IOException {
-        final ModuleNode node = new ModuleNode();
-        node.setBody(Collections.singletonList(new ClassDefNode()));
-
-        final String s = mapper.writeValueAsString(node);
-
-        System.out.println(s);
-
-        // Reread
-        final Node root = mapper.readValue(s, Node.class);
-
-        System.out.println(root);
-    }
-
-    @Test
-    void deserializeExample() throws IOException {
-        final Node root = mapper.readValue(new File("src/main/resources/example.json"), Node.class);
-
-        assertTrue(root instanceof ModuleNode);
-        assertTrue(((ModuleNode) root).getBody().get(0) instanceof ClassDefNode);
-
-        // Print the node again
-        System.out.println(mapper.writeValueAsString(root));
-    }
-
-    @Test
-    void deserializeExample2() throws IOException {
-        final Node root = mapper.readValue(new File("src/main/resources/example2.json"), Node.class);
-
-        assertTrue(root instanceof ModuleNode);
-
-        // Print the node again
-        System.out.println(mapper.writeValueAsString(root));
-    }
-
-    @Test
-    void visitMinimalTree() throws IOException {
-        final Node root = mapper.readValue(new File("src/main/resources/example2.json"), Node.class);
-
-        CodePrinter printer = new CodePrinter(4);
-
-        NodeVisitor<String> toString = new AbstractNodeVisitor<String>() {
-
-
-            @Override public String visit(CompareNode compareNode) {
-                assert compareNode.getComparators().size() == 1;
-                return compareNode.getLeft().accept(this) + " " + compareNode.getOps().get(0).accept(this) + " " + compareNode.getComparators().get(0).accept(this);
-            }
-
-            @Override public String visit(EqNode eqNode) {
-                return "==";
-            }
-
-            @Override public String visit(NotEqNode notEqNode) {
-                return "!=";
-            }
-
-            @Override public String visit(NumNode numNode) {
-                return Double.toString(numNode.getN());
-            }
-
-            @Override public String visit(StrNode strNode) {
-                return strNode.getS();
-            }
-
-            @Override public String visit(NameNode nameNode) {
-                return nameNode.getId();
-            }
-
-            @Override public String visit(AttributeNode attributeNode) {
-                return attributeNode.getAttr();
-            }
-
-            @Override public String visit(CallNode callNode) {
-                final String function = callNode.getFunc().accept(this);
-
-                String s = function + "(";
-                for (Node arg : callNode.getArgs()) {
-                    s += arg.accept(this) + ", ";
-                }
-                for (Node keyword : callNode.getKeywords()) {
-                    s += keyword.accept(this);
-                }
-                s += ")";
-                return s;
-            }
-
-            @Override public String visit(KeywordNode keywordNode) {
-                return keywordNode.getArg() + " = " + keywordNode.getValue().accept(this);
-            }
-
-            @Override public String visit(AssignNode assignNode) {
-                assert assignNode.getTargets().size() == 1;
-                printer.writeLine(String.format("%s = %s;", assignNode.getTargets().get(0).accept(this), assignNode.getValue().accept(this))); ;
-                return super.visit(assignNode);
-            }
-
-            @Override public String visit(IfNode ifNode) {
-                printer.writeLine(String.format("If (%s) {", ifNode.getTest().accept(this)));
-                printer.startBlock();
-                for (Node node : ifNode.getBody()) {
-                    node.accept(this);
-                }
-                printer.endBlock();
-                printer.writeLine("}");
-                return null;
-            }
-        };
-
-
-        root.accept(toString);
-
-        System.out.println(printer.getCode());
-    }
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.plc4x.codegen.python.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+
+import static org.junit.Assert.assertTrue;
+
+class ModuleNodeTest {
+
+    private ObjectMapper mapper;
+
+    @BeforeEach
+    void setUp() {
+        mapper = new ObjectMapper();
+        mapper.registerSubtypes(ModuleNode.class);
+        mapper.registerSubtypes(ClassDefNode.class);
+        mapper.registerSubtypes(PassNode.class);
+        mapper.registerSubtypes(FunctionDefNode.class);
+        mapper.registerSubtypes(ArgumentsNode.class);
+        mapper.registerSubtypes(ExprNode.class);
+        mapper.registerSubtypes(CallNode.class);
+        mapper.registerSubtypes(StrNode.class);
+        mapper.registerSubtypes(NameNode.class);
+        mapper.registerSubtypes(LoadNode.class);
+        mapper.registerSubtypes(AnnAssignerNode.class);
+        mapper.registerSubtypes(StoreNode.class);
+        mapper.registerSubtypes(NumNode.class);
+        mapper.registerSubtypes(AugAssignNode.class);
+        mapper.registerSubtypes(AddNode.class);
+        mapper.registerSubtypes(ImportFromNode.class);
+        mapper.registerSubtypes(AliasNode.class);
+        mapper.registerSubtypes(ArgNode.class);
+        mapper.registerSubtypes(AssignNode.class);
+        mapper.registerSubtypes(AttributeNode.class);
+        mapper.registerSubtypes(WhileNode.class);
+        mapper.registerSubtypes(CompareNode.class);
+        mapper.registerSubtypes(NotEqNode.class);
+        mapper.registerSubtypes(ReturnNode.class);
+        mapper.registerSubtypes(IfNode.class);
+        mapper.registerSubtypes(KeywordNode.class);
+        mapper.registerSubtypes(BinOpNode.class);
+        mapper.registerSubtypes(ListNode.class);
+        mapper.registerSubtypes(MultNode.class);
+        mapper.registerSubtypes(NameConstantNode.class);
+        mapper.registerSubtypes(TupleNode.class);
+        mapper.registerSubtypes(EqNode.class);
+    }
+
+    @Test
+    void serialize() throws IOException {
+        final ModuleNode node = new ModuleNode();
+        node.setBody(Collections.singletonList(new ClassDefNode()));
+
+        final String s = mapper.writeValueAsString(node);
+
+        System.out.println(s);
+
+        // Reread
+        final Node root = mapper.readValue(s, Node.class);
+
+        System.out.println(root);
+    }
+
+    @Test
+    void deserializeExample() throws IOException {
+        final Node root = mapper.readValue(new File("src/main/resources/example.json"), Node.class);
+
+        assertTrue(root instanceof ModuleNode);
+        assertTrue(((ModuleNode) root).getBody().get(0) instanceof ClassDefNode);
+
+        // Print the node again
+        System.out.println(mapper.writeValueAsString(root));
+    }
+
+    @Test
+    void deserializeExample2() throws IOException {
+        final Node root = mapper.readValue(new File("src/main/resources/example2.json"), Node.class);
+
+        assertTrue(root instanceof ModuleNode);
+
+        // Print the node again
+        System.out.println(mapper.writeValueAsString(root));
+    }
+
+    @Test
+    void visitMinimalTree() throws IOException {
+        final Node root = mapper.readValue(new File("src/main/resources/example2.json"), Node.class);
+
+        CodePrinter printer = new CodePrinter(4);
+
+        NodeVisitor<String> toString = new AbstractNodeVisitor<String>() {
+
+
+            @Override public String visit(CompareNode compareNode) {
+                assert compareNode.getComparators().size() == 1;
+                return compareNode.getLeft().accept(this) + " " + compareNode.getOps().get(0).accept(this) + " " + compareNode.getComparators().get(0).accept(this);
+            }
+
+            @Override public String visit(EqNode eqNode) {
+                return "==";
+            }
+
+            @Override public String visit(NotEqNode notEqNode) {
+                return "!=";
+            }
+
+            @Override public String visit(NumNode numNode) {
+                return Double.toString(numNode.getN());
+            }
+
+            @Override public String visit(StrNode strNode) {
+                return strNode.getS();
+            }
+
+            @Override public String visit(NameNode nameNode) {
+                return nameNode.getId();
+            }
+
+            @Override public String visit(AttributeNode attributeNode) {
+                return attributeNode.getAttr();
+            }
+
+            @Override public String visit(CallNode callNode) {
+                final String function = callNode.getFunc().accept(this);
+
+                String s = function + "(";
+                for (Node arg : callNode.getArgs()) {
+                    s += arg.accept(this) + ", ";
+                }
+                for (Node keyword : callNode.getKeywords()) {
+                    s += keyword.accept(this);
+                }
+                s += ")";
+                return s;
+            }
+
+            @Override public String visit(KeywordNode keywordNode) {
+                return keywordNode.getArg() + " = " + keywordNode.getValue().accept(this);
+            }
+
+            @Override public String visit(AssignNode assignNode) {
+                assert assignNode.getTargets().size() == 1;
+                printer.writeLine(String.format("%s = %s;", assignNode.getTargets().get(0).accept(this), assignNode.getValue().accept(this))); ;
+                return super.visit(assignNode);
+            }
+
+            @Override public String visit(IfNode ifNode) {
+                printer.writeLine(String.format("If (%s) {", ifNode.getTest().accept(this)));
+                printer.startBlock();
+                for (Node node : ifNode.getBody()) {
+                    node.accept(this);
+                }
+                printer.endBlock();
+                printer.writeLine("}");
+                return null;
+            }
+        };
+
+
+        root.accept(toString);
+
+        System.out.println(printer.getCode());
+    }
 }
\ No newline at end of file
diff --git a/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/PojoBuilder.java b/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/PojoBuilder.java
index fa2670e9eda..868818a0b3c 100644
--- a/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/PojoBuilder.java
+++ b/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/PojoBuilder.java
@@ -1,35 +1,35 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen;
-
-/**
- * Build POJOs (awesome)
- */
-public class PojoBuilder {
-
-    private final String namespace;
-    private final String className;
-
-    public PojoBuilder(String namespace, String className) {
-        this.namespace = namespace;
-        this.className = className;
-    }
-
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen;
+
+/**
+ * Build POJOs (awesome)
+ */
+public class PojoBuilder {
+
+    private final String namespace;
+    private final String className;
+
+    public PojoBuilder(String namespace, String className) {
+        this.namespace = namespace;
+        this.className = className;
+    }
+
+
+}
diff --git a/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/ast/JavaGeneratorTest.java b/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/ast/JavaGeneratorTest.java
index 93e642f3646..1a31403b356 100644
--- a/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/ast/JavaGeneratorTest.java
+++ b/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/ast/JavaGeneratorTest.java
@@ -1,314 +1,314 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.Collections;
-
-import static org.junit.Assert.assertEquals;
-
-public class JavaGeneratorTest {
-
-    private CodeWriter writer;
-    private JavaGenerator generator;
-
-    @Before
-    public void setUp() throws Exception {
-        writer = new CodeWriter(4);
-        generator = new JavaGenerator(writer);
-    }
-
-    @Test
-    public void writeDeclaration() {
-        final DeclarationStatement stmt = new DeclarationStatement(new ParameterExpression(Primitive.DOUBLE, "a"), new ConstantExpression(5.0));
-        stmt.write(generator);
-
-        final String code = writer.getCode();
-
-        assertEquals("Double a = 5.0", code);
-    }
-
-    @Test
-    public void ifStatement() {
-        final Statement stmt = new IfStatement(
-            new BinaryExpression(Primitive.DOUBLE, new ParameterExpression(Primitive.DOUBLE, "a"),
-                new ConstantExpression(10.0),
-                BinaryExpression.Operation.EQ),
-            new Block(new DeclarationStatement(new ParameterExpression(Primitive.DOUBLE, "b"), new ConstantExpression(5.0))),
-            new Block(new DeclarationStatement(new ParameterExpression(Primitive.DOUBLE, "b"), new ConstantExpression(3.0)))
-        );
-
-        stmt.write(generator);
-
-        final String code = writer.getCode();
-
-        assertEquals("if (a == 10.0) {\n" +
-            "    Double b = 5.0;\n" +
-            "} else {\n" +
-            "    Double b = 3.0;\n" +
-            "}\n", code);
-    }
-
-    @Test
-    public void IfIf() {
-        final Statement stmt = new Block(Arrays.asList(
-            new DeclarationStatement(new ParameterExpression(Primitive.DOUBLE, "c"), null),
-            new IfStatement(
-                new BinaryExpression(Primitive.DOUBLE, new ParameterExpression(Primitive.DOUBLE, "a"),
-                    new ConstantExpression(10.0),
-                    BinaryExpression.Operation.EQ),
-                new Block(
-                    new IfStatement(
-                        new BinaryExpression(Primitive.DOUBLE, new ParameterExpression(Primitive.DOUBLE, "b"),
-                            new ConstantExpression(10.0),
-                            BinaryExpression.Operation.EQ),
-                        new Block(
-                            new AssignementExpression(new ParameterExpression(Primitive.DOUBLE, "c"), new ConstantExpression(5.0)),
-                            new DeclarationStatement(new ParameterExpression(Primitive.DOUBLE, "d"), new ConstantExpression(100.0))
-                        ),
-                        null
-                    )
-                ),
-                null
-            )));
-
-        stmt.write(generator);
-
-        final String code = writer.getCode();
-
-        assertEquals("    Double c;\n" +
-            "    if (a == 10.0) {\n" +
-            "        if (b == 10.0) {\n" +
-            "            c = 5.0;\n" +
-            "            Double d = 100.0;\n" +
-            "        }\n" +
-            "    }\n", code);
-    }
-
-    @Test
-    public void callStaticMethod() {
-        final TypeDefinition myClazz = new TypeDefinition("MyClazz");
-        Expression expr = new CallExpression(new Method(myClazz, "toString", Primitive.VOID, Collections.singletonList(Primitive.DOUBLE), Collections.EMPTY_LIST), null, new ConstantExpression(5.0));
-
-        expr.write(generator);
-
-        final String code = writer.getCode();
-
-        assertEquals("MyClazz.toString(5.0)", code);
-    }
-
-    @Test
-    public void callMethod() {
-        final TypeDefinition myClazz = new TypeDefinition("MyClazz");
-        Expression expr = new CallExpression(new Method(myClazz, "toString", Primitive.VOID, Collections.singletonList(Primitive.DOUBLE), Collections.EMPTY_LIST), new ParameterExpression(myClazz, "a"), new ConstantExpression(5.0));
-
-        expr.write(generator);
-
-        final String code = writer.getCode();
-
-        assertEquals("a.toString(5.0)", code);
-    }
-
-    @Test
-    public void complexCallAssignment() {
-        final TypeDefinition myClazz = new TypeDefinition("MyClazz");
-        final ParameterExpression instance = new ParameterExpression(myClazz, "instance");
-        final Method getNumberMethod = new Method(myClazz, "getNumber", Primitive.DOUBLE, Collections.emptyList(), Collections.emptyList());
-        final Method staticMethod = new Method(myClazz, "staticMethod", Primitive.DOUBLE, Collections.emptyList(), Collections.emptyList());
-        Statement stmt = new Block(Arrays.asList(
-            new DeclarationStatement(instance, null),
-            new AssignementExpression(instance, new NewExpression(myClazz)),
-            new AssignementExpression(instance, new NewExpression(myClazz, new NewExpression(myClazz))),
-            new DeclarationStatement(new ParameterExpression(Primitive.DOUBLE, "a"), new CallExpression(getNumberMethod, instance)),
-            new DeclarationStatement(new ParameterExpression(Primitive.DOUBLE, "b"), new CallExpression(staticMethod, null))
-        ));
-
-        stmt.write(generator);
-        final String code = writer.getCode();
-        assertEquals("    MyClazz instance;\n" +
-            "    instance = new MyClazz();\n" +
-            "    instance = new MyClazz(new MyClazz());\n" +
-            "    Double a = instance.getNumber();\n" +
-            "    Double b = MyClazz.staticMethod();\n", code);
-    }
-
-    @Test
-    public void writeMethodDefinition() {
-        final ParameterExpression a = new ParameterExpression(Primitive.DOUBLE, "a");
-        final ParameterExpression b = new ParameterExpression(Primitive.DOUBLE, "b");
-        final MethodDefinition decl = new MethodDefinition("add", Primitive.DOUBLE,
-            Arrays.asList(
-                a,
-                b
-            ),
-            new Block(
-                new ReturnStatement(
-                    new BinaryExpression(a.getType(), a, b, BinaryExpression.Operation.PLUS)
-                )
-            )
-        );
-
-        decl.write(generator);
-        final String code = writer.getCode();
-        assertEquals("public Double add(Double a, Double b) {\n" +
-            "    return a + b;\n" +
-            "}\n", code);
-    }
-
-    @Test
-    public void defineClass() {
-        final FieldDeclaration current = new FieldDeclaration(Primitive.DOUBLE, "current");
-        final FieldReference currentRef = new FieldReference(Primitive.DOUBLE, "current");
-
-        final ParameterExpression a = new ParameterExpression(Primitive.DOUBLE, "a");
-        final ParameterExpression b = new ParameterExpression(Primitive.DOUBLE, "b");
-        final MethodDefinition decl = new MethodDefinition("add", Primitive.DOUBLE,
-            Arrays.asList(
-                a,
-                b
-            ),
-            new Block(
-                new ReturnStatement(
-                    new BinaryExpression(a.getType(), a, b, BinaryExpression.Operation.PLUS)
-                )
-            )
-        );
-        final MethodDefinition inc = new MethodDefinition("inc", Primitive.VOID,
-            Collections.EMPTY_LIST,
-            new Block(
-                new AssignementExpression(
-                    currentRef,
-                    new BinaryExpression(currentRef.getType(), currentRef, new ConstantExpression(1.0), BinaryExpression.Operation.PLUS)
-                )
-            )
-        );
-
-        final ClassDeclaration clazz = new ClassDeclaration("org.apache.plc4x", "MyClazz", Arrays.asList(current), Collections.emptyList(), Arrays.asList(inc, decl), null);
-
-        clazz.write(generator);
-        final String code = writer.getCode();
-        assertEquals("public class MyClazz {\n" +
-            "    \n" +
-            "    public Double current;\n" +
-            "    \n" +
-            "    public void inc() {\n" +
-            "        this.current = this.current + 1.0;\n" +
-            "    }\n" +
-            "    \n" +
-            "    public Double add(Double a, Double b) {\n" +
-            "        return a + b;\n" +
-            "    }\n" +
-            "    \n" +
-            "}\n", code);
-    }
-
-    @Test
-    public void defineClassWithConstructor() {
-        final FieldDeclaration current = new FieldDeclaration(Primitive.DOUBLE, "current");
-
-        final FieldReference currentRef = new FieldReference(Primitive.DOUBLE, "current");
-
-        final ParameterExpression value = new ParameterExpression(Primitive.DOUBLE, "value");
-        final ClassDeclaration clazz = new ClassDeclaration("org.apache.plc4x",
-            "MyClazz",
-            Arrays.asList(current),
-            Arrays.asList(
-                new ConstructorDeclaration(
-                    Collections.singletonList(value),
-                    new Block(new AssignementExpression(currentRef, value))
-                )
-            ),
-            Collections.emptyList(), null);
-
-        clazz.write(generator);
-        final String code = writer.getCode();
-        assertEquals("public class MyClazz {\n" +
-            "    \n" +
-            "    public Double current;\n" +
-            "    \n" +
-            "    public MyClazz(Double value) {\n" +
-            "        this.current = value;\n" +
-            "    }\n" +
-            "    \n" +
-            "}\n", code);
-    }
-
-    @Test
-    public void defineClassWithInnerClass() {
-        final FieldDeclaration current = new FieldDeclaration(Primitive.DOUBLE, "current");
-
-        final FieldReference currentRef = new FieldReference(Primitive.DOUBLE, "current");
-
-        final ParameterExpression value = new ParameterExpression(Primitive.DOUBLE, "value");
-
-        // Define Inner Class
-        final ClassDeclaration innerClass = new ClassDeclaration("", "MyInnerClazz", Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), null);
-
-        final ClassDeclaration clazz = new ClassDeclaration("org.apache.plc4x",
-            "MyClazz",
-            Arrays.asList(current),
-            Arrays.asList(
-                new ConstructorDeclaration(
-                    Collections.singletonList(value),
-                    new Block(new AssignementExpression(currentRef, value))
-                )
-            ),
-            Collections.emptyList(),
-            Collections.singletonList(innerClass));
-
-        clazz.write(generator);
-        final String code = writer.getCode();
-        assertEquals("public class MyClazz {\n" +
-            "    \n" +
-            "    public Double current;\n" +
-            "    \n" +
-            "    public MyClazz(Double value) {\n" +
-            "        this.current = value;\n" +
-            "    }\n" +
-            "    \n" +
-            "    public static class MyInnerClazz {\n" +
-            "        \n" +
-            "    }\n" +
-            "}\n", code);
-    }
-
-    @Test
-    public void ifMultipleElse() {
-        final IfStatement stmt = new IfStatement(
-            Arrays.asList(
-                new BinaryExpression(Primitive.DOUBLE, new ParameterExpression(Primitive.DOUBLE, "a"), new ConstantExpression(10.0), BinaryExpression.Operation.EQ),
-                new BinaryExpression(Primitive.DOUBLE, new ParameterExpression(Primitive.DOUBLE, "a"), new ConstantExpression(5.0), BinaryExpression.Operation.EQ)
-            ),
-            Arrays.asList(
-                new Block(),
-                new Block(),
-                new Block()
-            ));
-
-        stmt.write(generator);
-        final String code = writer.getCode();
-        assertEquals("if (a == 10.0) {\n" +
-            "} else if (a == 5.0) {\n" +
-            "} else {\n" +
-            "}\n", code);
-    }
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import static org.junit.Assert.assertEquals;
+
+public class JavaGeneratorTest {
+
+    private CodeWriter writer;
+    private JavaGenerator generator;
+
+    @Before
+    public void setUp() throws Exception {
+        writer = new CodeWriter(4);
+        generator = new JavaGenerator(writer);
+    }
+
+    @Test
+    public void writeDeclaration() {
+        final DeclarationStatement stmt = new DeclarationStatement(new ParameterExpression(Primitive.DOUBLE, "a"), new ConstantExpression(5.0));
+        stmt.write(generator);
+
+        final String code = writer.getCode();
+
+        assertEquals("Double a = 5.0", code);
+    }
+
+    @Test
+    public void ifStatement() {
+        final Statement stmt = new IfStatement(
+            new BinaryExpression(Primitive.DOUBLE, new ParameterExpression(Primitive.DOUBLE, "a"),
+                new ConstantExpression(10.0),
+                BinaryExpression.Operation.EQ),
+            new Block(new DeclarationStatement(new ParameterExpression(Primitive.DOUBLE, "b"), new ConstantExpression(5.0))),
+            new Block(new DeclarationStatement(new ParameterExpression(Primitive.DOUBLE, "b"), new ConstantExpression(3.0)))
+        );
+
+        stmt.write(generator);
+
+        final String code = writer.getCode();
+
+        assertEquals("if (a == 10.0) {\n" +
+            "    Double b = 5.0;\n" +
+            "} else {\n" +
+            "    Double b = 3.0;\n" +
+            "}\n", code);
+    }
+
+    @Test
+    public void IfIf() {
+        final Statement stmt = new Block(Arrays.asList(
+            new DeclarationStatement(new ParameterExpression(Primitive.DOUBLE, "c"), null),
+            new IfStatement(
+                new BinaryExpression(Primitive.DOUBLE, new ParameterExpression(Primitive.DOUBLE, "a"),
+                    new ConstantExpression(10.0),
+                    BinaryExpression.Operation.EQ),
+                new Block(
+                    new IfStatement(
+                        new BinaryExpression(Primitive.DOUBLE, new ParameterExpression(Primitive.DOUBLE, "b"),
+                            new ConstantExpression(10.0),
+                            BinaryExpression.Operation.EQ),
+                        new Block(
+                            new AssignementExpression(new ParameterExpression(Primitive.DOUBLE, "c"), new ConstantExpression(5.0)),
+                            new DeclarationStatement(new ParameterExpression(Primitive.DOUBLE, "d"), new ConstantExpression(100.0))
+                        ),
+                        null
+                    )
+                ),
+                null
+            )));
+
+        stmt.write(generator);
+
+        final String code = writer.getCode();
+
+        assertEquals("    Double c;\n" +
+            "    if (a == 10.0) {\n" +
+            "        if (b == 10.0) {\n" +
+            "            c = 5.0;\n" +
+            "            Double d = 100.0;\n" +
+            "        }\n" +
+            "    }\n", code);
+    }
+
+    @Test
+    public void callStaticMethod() {
+        final TypeDefinition myClazz = new TypeDefinition("MyClazz");
+        Expression expr = new CallExpression(new Method(myClazz, "toString", Primitive.VOID, Collections.singletonList(Primitive.DOUBLE), Collections.EMPTY_LIST), null, new ConstantExpression(5.0));
+
+        expr.write(generator);
+
+        final String code = writer.getCode();
+
+        assertEquals("MyClazz.toString(5.0)", code);
+    }
+
+    @Test
+    public void callMethod() {
+        final TypeDefinition myClazz = new TypeDefinition("MyClazz");
+        Expression expr = new CallExpression(new Method(myClazz, "toString", Primitive.VOID, Collections.singletonList(Primitive.DOUBLE), Collections.EMPTY_LIST), new ParameterExpression(myClazz, "a"), new ConstantExpression(5.0));
+
+        expr.write(generator);
+
+        final String code = writer.getCode();
+
+        assertEquals("a.toString(5.0)", code);
+    }
+
+    @Test
+    public void complexCallAssignment() {
+        final TypeDefinition myClazz = new TypeDefinition("MyClazz");
+        final ParameterExpression instance = new ParameterExpression(myClazz, "instance");
+        final Method getNumberMethod = new Method(myClazz, "getNumber", Primitive.DOUBLE, Collections.emptyList(), Collections.emptyList());
+        final Method staticMethod = new Method(myClazz, "staticMethod", Primitive.DOUBLE, Collections.emptyList(), Collections.emptyList());
+        Statement stmt = new Block(Arrays.asList(
+            new DeclarationStatement(instance, null),
+            new AssignementExpression(instance, new NewExpression(myClazz)),
+            new AssignementExpression(instance, new NewExpression(myClazz, new NewExpression(myClazz))),
+            new DeclarationStatement(new ParameterExpression(Primitive.DOUBLE, "a"), new CallExpression(getNumberMethod, instance)),
+            new DeclarationStatement(new ParameterExpression(Primitive.DOUBLE, "b"), new CallExpression(staticMethod, null))
+        ));
+
+        stmt.write(generator);
+        final String code = writer.getCode();
+        assertEquals("    MyClazz instance;\n" +
+            "    instance = new MyClazz();\n" +
+            "    instance = new MyClazz(new MyClazz());\n" +
+            "    Double a = instance.getNumber();\n" +
+            "    Double b = MyClazz.staticMethod();\n", code);
+    }
+
+    @Test
+    public void writeMethodDefinition() {
+        final ParameterExpression a = new ParameterExpression(Primitive.DOUBLE, "a");
+        final ParameterExpression b = new ParameterExpression(Primitive.DOUBLE, "b");
+        final MethodDefinition decl = new MethodDefinition("add", Primitive.DOUBLE,
+            Arrays.asList(
+                a,
+                b
+            ),
+            new Block(
+                new ReturnStatement(
+                    new BinaryExpression(a.getType(), a, b, BinaryExpression.Operation.PLUS)
+                )
+            )
+        );
+
+        decl.write(generator);
+        final String code = writer.getCode();
+        assertEquals("public Double add(Double a, Double b) {\n" +
+            "    return a + b;\n" +
+            "}\n", code);
+    }
+
+    @Test
+    public void defineClass() {
+        final FieldDeclaration current = new FieldDeclaration(Primitive.DOUBLE, "current");
+        final FieldReference currentRef = new FieldReference(Primitive.DOUBLE, "current");
+
+        final ParameterExpression a = new ParameterExpression(Primitive.DOUBLE, "a");
+        final ParameterExpression b = new ParameterExpression(Primitive.DOUBLE, "b");
+        final MethodDefinition decl = new MethodDefinition("add", Primitive.DOUBLE,
+            Arrays.asList(
+                a,
+                b
+            ),
+            new Block(
+                new ReturnStatement(
+                    new BinaryExpression(a.getType(), a, b, BinaryExpression.Operation.PLUS)
+                )
+            )
+        );
+        final MethodDefinition inc = new MethodDefinition("inc", Primitive.VOID,
+            Collections.EMPTY_LIST,
+            new Block(
+                new AssignementExpression(
+                    currentRef,
+                    new BinaryExpression(currentRef.getType(), currentRef, new ConstantExpression(1.0), BinaryExpression.Operation.PLUS)
+                )
+            )
+        );
+
+        final ClassDeclaration clazz = new ClassDeclaration("org.apache.plc4x", "MyClazz", Arrays.asList(current), Collections.emptyList(), Arrays.asList(inc, decl), null);
+
+        clazz.write(generator);
+        final String code = writer.getCode();
+        assertEquals("public class MyClazz {\n" +
+            "    \n" +
+            "    public Double current;\n" +
+            "    \n" +
+            "    public void inc() {\n" +
+            "        this.current = this.current + 1.0;\n" +
+            "    }\n" +
+            "    \n" +
+            "    public Double add(Double a, Double b) {\n" +
+            "        return a + b;\n" +
+            "    }\n" +
+            "    \n" +
+            "}\n", code);
+    }
+
+    @Test
+    public void defineClassWithConstructor() {
+        final FieldDeclaration current = new FieldDeclaration(Primitive.DOUBLE, "current");
+
+        final FieldReference currentRef = new FieldReference(Primitive.DOUBLE, "current");
+
+        final ParameterExpression value = new ParameterExpression(Primitive.DOUBLE, "value");
+        final ClassDeclaration clazz = new ClassDeclaration("org.apache.plc4x",
+            "MyClazz",
+            Arrays.asList(current),
+            Arrays.asList(
+                new ConstructorDeclaration(
+                    Collections.singletonList(value),
+                    new Block(new AssignementExpression(currentRef, value))
+                )
+            ),
+            Collections.emptyList(), null);
+
+        clazz.write(generator);
+        final String code = writer.getCode();
+        assertEquals("public class MyClazz {\n" +
+            "    \n" +
+            "    public Double current;\n" +
+            "    \n" +
+            "    public MyClazz(Double value) {\n" +
+            "        this.current = value;\n" +
+            "    }\n" +
+            "    \n" +
+            "}\n", code);
+    }
+
+    @Test
+    public void defineClassWithInnerClass() {
+        final FieldDeclaration current = new FieldDeclaration(Primitive.DOUBLE, "current");
+
+        final FieldReference currentRef = new FieldReference(Primitive.DOUBLE, "current");
+
+        final ParameterExpression value = new ParameterExpression(Primitive.DOUBLE, "value");
+
+        // Define Inner Class
+        final ClassDeclaration innerClass = new ClassDeclaration("", "MyInnerClazz", Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), null);
+
+        final ClassDeclaration clazz = new ClassDeclaration("org.apache.plc4x",
+            "MyClazz",
+            Arrays.asList(current),
+            Arrays.asList(
+                new ConstructorDeclaration(
+                    Collections.singletonList(value),
+                    new Block(new AssignementExpression(currentRef, value))
+                )
+            ),
+            Collections.emptyList(),
+            Collections.singletonList(innerClass));
+
+        clazz.write(generator);
+        final String code = writer.getCode();
+        assertEquals("public class MyClazz {\n" +
+            "    \n" +
+            "    public Double current;\n" +
+            "    \n" +
+            "    public MyClazz(Double value) {\n" +
+            "        this.current = value;\n" +
+            "    }\n" +
+            "    \n" +
+            "    public static class MyInnerClazz {\n" +
+            "        \n" +
+            "    }\n" +
+            "}\n", code);
+    }
+
+    @Test
+    public void ifMultipleElse() {
+        final IfStatement stmt = new IfStatement(
+            Arrays.asList(
+                new BinaryExpression(Primitive.DOUBLE, new ParameterExpression(Primitive.DOUBLE, "a"), new ConstantExpression(10.0), BinaryExpression.Operation.EQ),
+                new BinaryExpression(Primitive.DOUBLE, new ParameterExpression(Primitive.DOUBLE, "a"), new ConstantExpression(5.0), BinaryExpression.Operation.EQ)
+            ),
+            Arrays.asList(
+                new Block(),
+                new Block(),
+                new Block()
+            ));
+
+        stmt.write(generator);
+        final String code = writer.getCode();
+        assertEquals("if (a == 10.0) {\n" +
+            "} else if (a == 5.0) {\n" +
+            "} else {\n" +
+            "}\n", code);
+    }
 }
\ No newline at end of file
diff --git a/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/ast/PythonGeneratorTest.java b/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/ast/PythonGeneratorTest.java
index c66b9342481..64621f66879 100644
--- a/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/ast/PythonGeneratorTest.java
+++ b/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/ast/PythonGeneratorTest.java
@@ -1,99 +1,99 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.ast;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.Collections;
-
-import static org.junit.Assert.assertEquals;
-
-public class PythonGeneratorTest {
-
-    public Generator generator;
-    public CodeWriter writer;
-
-    @Before
-    public void setUp() throws Exception {
-        this.writer = new CodeWriter(4);
-        this.generator = new PythonGenerator(writer);
-    }
-
-    @Test
-    public void generateCode() {
-        final FieldDeclaration current = new FieldDeclaration(Primitive.DOUBLE, "current");
-
-        final FieldReference currentRef = new FieldReference(Primitive.DOUBLE, "current");
-
-        final ParameterExpression value = new ParameterExpression(Primitive.DOUBLE, "value");
-
-        // Define Inner Class
-        final ClassDeclaration innerClass = new ClassDeclaration("", "MyInnerClazz", Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), null);
-
-        final ClassDeclaration clazz = new ClassDeclaration("org.apache.plc4x",
-            "MyClazz",
-            Arrays.asList(current),
-            Arrays.asList(
-                new ConstructorDeclaration(
-                    Collections.singletonList(value),
-                    new Block(new AssignementExpression(currentRef, value))
-                )
-            ),
-            Collections.emptyList(),
-            Collections.singletonList(innerClass));
-
-        clazz.write(generator);
-        final String code = writer.getCode();
-        assertEquals("class MyClazz:\n" +
-            "    \n" +
-            "    current: float\n" +
-            "    \n" +
-            "    def __init__(float value):\n" +
-            "        self.current = value\n" +
-            "    \n" +
-            "    class MyInnerClazz:\n" +
-            "        pass\n" +
-            "        \n", code);
-    }
-
-    @Test
-    public void ifMultipleElse() {
-        final IfStatement stmt = new IfStatement(
-            Arrays.asList(
-                new BinaryExpression(Primitive.DOUBLE, new ParameterExpression(Primitive.DOUBLE, "a"), new ConstantExpression(10.0), BinaryExpression.Operation.EQ),
-                new BinaryExpression(Primitive.DOUBLE, new ParameterExpression(Primitive.DOUBLE, "a"), new ConstantExpression(5.0), BinaryExpression.Operation.EQ)
-            ),
-            Arrays.asList(
-                new Block(),
-                new Block(),
-                new Block()
-            ));
-
-        stmt.write(generator);
-        final String code = writer.getCode();
-        assertEquals("if a == 10.0:\n" +
-            "    pass\n" +
-            "elif a == 5.0:\n" +
-            "    pass\n" +
-            "else:\n" +
-            "    pass\n", code);
-    }
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.ast;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import static org.junit.Assert.assertEquals;
+
+public class PythonGeneratorTest {
+
+    public Generator generator;
+    public CodeWriter writer;
+
+    @Before
+    public void setUp() throws Exception {
+        this.writer = new CodeWriter(4);
+        this.generator = new PythonGenerator(writer);
+    }
+
+    @Test
+    public void generateCode() {
+        final FieldDeclaration current = new FieldDeclaration(Primitive.DOUBLE, "current");
+
+        final FieldReference currentRef = new FieldReference(Primitive.DOUBLE, "current");
+
+        final ParameterExpression value = new ParameterExpression(Primitive.DOUBLE, "value");
+
+        // Define Inner Class
+        final ClassDeclaration innerClass = new ClassDeclaration("", "MyInnerClazz", Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), null);
+
+        final ClassDeclaration clazz = new ClassDeclaration("org.apache.plc4x",
+            "MyClazz",
+            Arrays.asList(current),
+            Arrays.asList(
+                new ConstructorDeclaration(
+                    Collections.singletonList(value),
+                    new Block(new AssignementExpression(currentRef, value))
+                )
+            ),
+            Collections.emptyList(),
+            Collections.singletonList(innerClass));
+
+        clazz.write(generator);
+        final String code = writer.getCode();
+        assertEquals("class MyClazz:\n" +
+            "    \n" +
+            "    current: float\n" +
+            "    \n" +
+            "    def __init__(float value):\n" +
+            "        self.current = value\n" +
+            "    \n" +
+            "    class MyInnerClazz:\n" +
+            "        pass\n" +
+            "        \n", code);
+    }
+
+    @Test
+    public void ifMultipleElse() {
+        final IfStatement stmt = new IfStatement(
+            Arrays.asList(
+                new BinaryExpression(Primitive.DOUBLE, new ParameterExpression(Primitive.DOUBLE, "a"), new ConstantExpression(10.0), BinaryExpression.Operation.EQ),
+                new BinaryExpression(Primitive.DOUBLE, new ParameterExpression(Primitive.DOUBLE, "a"), new ConstantExpression(5.0), BinaryExpression.Operation.EQ)
+            ),
+            Arrays.asList(
+                new Block(),
+                new Block(),
+                new Block()
+            ));
+
+        stmt.write(generator);
+        final String code = writer.getCode();
+        assertEquals("if a == 10.0:\n" +
+            "    pass\n" +
+            "elif a == 5.0:\n" +
+            "    pass\n" +
+            "else:\n" +
+            "    pass\n", code);
+    }
 }
\ No newline at end of file
diff --git a/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/util/EnumFactoryTest.java b/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/util/EnumFactoryTest.java
index 245438d53a9..8400be2ae15 100644
--- a/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/util/EnumFactoryTest.java
+++ b/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/util/EnumFactoryTest.java
@@ -1,90 +1,90 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.util;
-
-import org.apache.plc4x.codegen.ast.*;
-import org.apache.plc4x.codegen.util.EnumFactory;
-import org.junit.Test;
-
-import java.util.Arrays;
-
-public class EnumFactoryTest {
-
-    @Test
-    public void createEnums() {
-        System.out.println("Java:");
-        System.out.println("----------");
-        final ClassDeclaration MyEnum = newEnum();
-
-        final CodeWriter writer = new CodeWriter(4);
-        final JavaGenerator generator = new JavaGenerator(writer);
-
-        MyEnum.write(generator);
-
-        System.out.println(writer.getCode());
-    }
-
-    @Test
-    public void createEnumsInPython() {
-        System.out.println("Python:");
-        System.out.println("----------");
-        final ClassDeclaration MyEnum = newEnum();
-
-        final CodeWriter writer = new CodeWriter(4);
-        final PythonGenerator generator = new PythonGenerator(writer);
-
-        MyEnum.write(generator);
-
-        System.out.println(writer.getCode());
-    }
-
-    private ClassDeclaration newEnum() {
-        final EnumFactory factory = new EnumFactory();
-        final EnumFactory.PojoDescription description = new EnumFactory.PojoDescription("MyPojo",
-            new EnumFactory.Field(Primitive.DOUBLE, "field1"),
-            new EnumFactory.Field(Primitive.DOUBLE, "field2"),
-            new EnumFactory.Field(Primitive.DOUBLE, "field3")
-        );
-        return factory.create(description,
-            Arrays.asList(
-                new EnumFactory.EnumEntry("alternative1", Arrays.asList(
-                    new ConstantExpression(1.0),
-                    new ConstantExpression(2.0),
-                    new ConstantExpression(3.0)
-                )),
-                new EnumFactory.EnumEntry("alternative2", Arrays.asList(
-                    new ConstantExpression(1.0),
-                    new ConstantExpression(2.0),
-                    new ConstantExpression(3.0)
-                )),
-                new EnumFactory.EnumEntry("alternative3", Arrays.asList(
-                    new ConstantExpression(1.0),
-                    new ConstantExpression(2.0),
-                    new ConstantExpression(3.0)
-                )),
-                new EnumFactory.EnumEntry("alternative4", Arrays.asList(
-                    new ConstantExpression(1.0),
-                    new ConstantExpression(2.0),
-                    new ConstantExpression(3.0)
-                ))
-            )
-        );
-    }
-
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.util;
+
+import org.apache.plc4x.codegen.ast.*;
+import org.apache.plc4x.codegen.util.EnumFactory;
+import org.junit.Test;
+
+import java.util.Arrays;
+
+public class EnumFactoryTest {
+
+    @Test
+    public void createEnums() {
+        System.out.println("Java:");
+        System.out.println("----------");
+        final ClassDeclaration MyEnum = newEnum();
+
+        final CodeWriter writer = new CodeWriter(4);
+        final JavaGenerator generator = new JavaGenerator(writer);
+
+        MyEnum.write(generator);
+
+        System.out.println(writer.getCode());
+    }
+
+    @Test
+    public void createEnumsInPython() {
+        System.out.println("Python:");
+        System.out.println("----------");
+        final ClassDeclaration MyEnum = newEnum();
+
+        final CodeWriter writer = new CodeWriter(4);
+        final PythonGenerator generator = new PythonGenerator(writer);
+
+        MyEnum.write(generator);
+
+        System.out.println(writer.getCode());
+    }
+
+    private ClassDeclaration newEnum() {
+        final EnumFactory factory = new EnumFactory();
+        final EnumFactory.PojoDescription description = new EnumFactory.PojoDescription("MyPojo",
+            new EnumFactory.Field(Primitive.DOUBLE, "field1"),
+            new EnumFactory.Field(Primitive.DOUBLE, "field2"),
+            new EnumFactory.Field(Primitive.DOUBLE, "field3")
+        );
+        return factory.create(description,
+            Arrays.asList(
+                new EnumFactory.EnumEntry("alternative1", Arrays.asList(
+                    new ConstantExpression(1.0),
+                    new ConstantExpression(2.0),
+                    new ConstantExpression(3.0)
+                )),
+                new EnumFactory.EnumEntry("alternative2", Arrays.asList(
+                    new ConstantExpression(1.0),
+                    new ConstantExpression(2.0),
+                    new ConstantExpression(3.0)
+                )),
+                new EnumFactory.EnumEntry("alternative3", Arrays.asList(
+                    new ConstantExpression(1.0),
+                    new ConstantExpression(2.0),
+                    new ConstantExpression(3.0)
+                )),
+                new EnumFactory.EnumEntry("alternative4", Arrays.asList(
+                    new ConstantExpression(1.0),
+                    new ConstantExpression(2.0),
+                    new ConstantExpression(3.0)
+                ))
+            )
+        );
+    }
+
 }
\ No newline at end of file
diff --git a/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/util/MyPojo.java b/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/util/MyPojo.java
index c537de0254d..f93caba8d59 100644
--- a/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/util/MyPojo.java
+++ b/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/util/MyPojo.java
@@ -1,65 +1,65 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.util;
-
-public class MyPojo {
-
-    private Double field1;
-
-    private Double field2;
-
-    private Double field3;
-
-    public MyPojo() {
-    }
-
-    public Double getField1() {
-        return this.field1;
-    }
-
-    public Double getField2() {
-        return this.field2;
-    }
-
-    public Double getField3() {
-        return this.field3;
-    }
-
-    public void setField1(Double field1) {
-        this.field1 = field1;
-    }
-
-    public void setField2(Double field2) {
-        this.field2 = field2;
-    }
-
-    public void setField3(Double field3) {
-        this.field3 = field3;
-    }
-
-    public void encode(org.apache.plc4x.codegen.api.Buffer buffer) {
-    }
-
-    public static MyPojo decode(org.apache.plc4x.codegen.api.Buffer buffer) {
-        MyPojo instance = new MyPojo();
-        buffer.readUint8();
-        return instance;
-    }
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.util;
+
+public class MyPojo {
+
+    private Double field1;
+
+    private Double field2;
+
+    private Double field3;
+
+    public MyPojo() {
+    }
+
+    public Double getField1() {
+        return this.field1;
+    }
+
+    public Double getField2() {
+        return this.field2;
+    }
+
+    public Double getField3() {
+        return this.field3;
+    }
+
+    public void setField1(Double field1) {
+        this.field1 = field1;
+    }
+
+    public void setField2(Double field2) {
+        this.field2 = field2;
+    }
+
+    public void setField3(Double field3) {
+        this.field3 = field3;
+    }
+
+    public void encode(org.apache.plc4x.codegen.api.Buffer buffer) {
+    }
+
+    public static MyPojo decode(org.apache.plc4x.codegen.api.Buffer buffer) {
+        MyPojo instance = new MyPojo();
+        buffer.readUint8();
+        return instance;
+    }
+
 }
\ No newline at end of file
diff --git a/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/util/PojoFactoryTest.java b/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/util/PojoFactoryTest.java
index b04ae77a58a..36dfaf59a90 100644
--- a/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/util/PojoFactoryTest.java
+++ b/sandbox/code-gen/src/test/java/org/apache/plc4x/codegen/util/PojoFactoryTest.java
@@ -1,64 +1,64 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.codegen.util;
-
-import org.apache.plc4x.codegen.ast.*;
-
-import org.junit.Test;
-
-public class PojoFactoryTest {
-
-    @Test
-    public void createPojoJava() {
-        System.out.println("Java:");
-        System.out.println("----------");
-        final ClassDeclaration pojo = newPojo();
-
-        final CodeWriter writer = new CodeWriter(4);
-        final JavaGenerator generator = new JavaGenerator(writer);
-
-        pojo.write(generator);
-
-        System.out.println(writer.getCode());
-    }
-
-    @Test
-    public void createPojoPython() {
-        System.out.println("Python:");
-        System.out.println("----------");
-        final ClassDeclaration pojo = newPojo();
-
-        final CodeWriter writer = new CodeWriter(4);
-        final PythonGenerator generator = new PythonGenerator(writer);
-
-        pojo.write(generator);
-
-        System.out.println(writer.getCode());
-    }
-
-    private ClassDeclaration newPojo() {
-        final PojoFactory factory = new PojoFactory();
-        final PojoFactory.PojoDescription description = new PojoFactory.PojoDescription("MyPojo",
-            new PojoFactory.Field(Primitive.DOUBLE, "field1"),
-            new PojoFactory.Field(Primitive.DOUBLE, "field2"),
-            new PojoFactory.Field(Primitive.DOUBLE, "field3")
-        );
-        return factory.create(description);
-    }
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.codegen.util;
+
+import org.apache.plc4x.codegen.ast.*;
+
+import org.junit.Test;
+
+public class PojoFactoryTest {
+
+    @Test
+    public void createPojoJava() {
+        System.out.println("Java:");
+        System.out.println("----------");
+        final ClassDeclaration pojo = newPojo();
+
+        final CodeWriter writer = new CodeWriter(4);
+        final JavaGenerator generator = new JavaGenerator(writer);
+
+        pojo.write(generator);
+
+        System.out.println(writer.getCode());
+    }
+
+    @Test
+    public void createPojoPython() {
+        System.out.println("Python:");
+        System.out.println("----------");
+        final ClassDeclaration pojo = newPojo();
+
+        final CodeWriter writer = new CodeWriter(4);
+        final PythonGenerator generator = new PythonGenerator(writer);
+
+        pojo.write(generator);
+
+        System.out.println(writer.getCode());
+    }
+
+    private ClassDeclaration newPojo() {
+        final PojoFactory factory = new PojoFactory();
+        final PojoFactory.PojoDescription description = new PojoFactory.PojoDescription("MyPojo",
+            new PojoFactory.Field(Primitive.DOUBLE, "field1"),
+            new PojoFactory.Field(Primitive.DOUBLE, "field2"),
+            new PojoFactory.Field(Primitive.DOUBLE, "field3")
+        );
+        return factory.create(description);
+    }
 }
\ No newline at end of file
diff --git a/sandbox/code-gen/src/test/resources/protocol.dfdl.xsd b/sandbox/code-gen/src/test/resources/protocol.dfdl.xsd
index 1cb292216ea..39d3d0986ef 100644
--- a/sandbox/code-gen/src/test/resources/protocol.dfdl.xsd
+++ b/sandbox/code-gen/src/test/resources/protocol.dfdl.xsd
@@ -1,909 +1,909 @@
-<!--
-  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
-
-      http://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.
-  -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
-           xmlns:s7="http://plc4x.apache.org/s7"
-           xmlns:fn="http://www.w3.org/2005/xpath-functions"
-           targetNamespace="http://plc4x.apache.org/s7">
-
-    <xs:annotation>
-        <xs:appinfo source="http://www.ogf.org/dfdl/">
-            <dfdl:defineVariable name="messageType" type="xs:string"/>
-            <dfdl:defineFormat name="s7FullFormat">
-                <dfdl:format representation="binary"
-                             binaryNumberRep="binary"
-                             byteOrder="bigEndian"
-                             lengthKind="implicit" lengthUnits="bytes" length="0"
-                             occursCountKind="implicit"
-                             textOutputMinLength="0"
-                             alignment="1" alignmentUnits="bits"
-                             leadingSkip="0" trailingSkip="0"
-                             textPadKind="none" ignoreCase="no"
-                             textBidi="no" floating="no"
-                             encoding="utf-8" truncateSpecifiedLengthString="no"
-                             initiator="" terminator=""
-                             sequenceKind="ordered" separator=""
-                             escapeSchemeRef="" initiatedContent="no"
-                             encodingErrorPolicy="replace"/>
-            </dfdl:defineFormat>
-            <dfdl:format ref="s7:s7FullFormat"/>
-        </xs:appinfo>
-    </xs:annotation>
-
-    <!--
-
-        Simple type definition.
-
-    -->
-
-    <xs:simpleType name="bit" dfdl:lengthUnits="bits" dfdl:length="1" dfdl:lengthKind="explicit">
-        <xs:restriction base="xs:boolean"/>
-    </xs:simpleType>
-
-    <xs:simpleType name="byte" dfdl:lengthUnits="bytes" dfdl:length="1" dfdl:lengthKind="explicit">
-        <xs:restriction base="xs:unsignedByte"/>
-    </xs:simpleType>
-
-    <xs:simpleType name="short" dfdl:lengthUnits="bytes" dfdl:length="2" dfdl:lengthKind="explicit">
-        <xs:restriction base="xs:unsignedShort"/>
-    </xs:simpleType>
-
-    <xs:simpleType name="hexByte" dfdl:lengthUnits="bytes" dfdl:length="1" dfdl:lengthKind="explicit">
-        <xs:restriction base="xs:hexBinary"/>
-    </xs:simpleType>
-
-    <!--
-
-        TPKT - Iso-On-TCP
-
-    -->
-
-    <xs:element name="TpktMessage" type="s7:TpktMessageType"/>
-
-    <xs:complexType name="TpktMessageType">
-        <xs:sequence>
-            <!-- TPKT Magic Byte always 0x03 -->
-            <xs:element name="magicByte" type="s7:byte">
-                <xs:annotation>
-                    <xs:appinfo source="http://www.ogf.org/dfdl/">
-                        <dfdl:assert message="Magic number was not 0x03."
-                                     test="{. eq 3}"/>
-                    </xs:appinfo>
-                </xs:annotation>
-            </xs:element>
-            <xs:element name="reserved" type="s7:byte"/>
-            <xs:element name="length" type="s7:short"/>
-            <xs:element name="userData" type="s7:CotpMessageType"/>
-        </xs:sequence>
-    </xs:complexType>
-
-    <!--
-
-        ISO 8073/X.224 - ISO-TP - COTP - Connection-Oriented Transport Protocol Messages
-
-    -->
-
-    <xs:simpleType name="CotpTpduType">
-        <xs:restriction base="xs:unsignedByte">
-            <xs:enumeration id="tpduTypeConnectionRequest" value="224">
-                <xs:annotation>
-                    <xs:appinfo source="http://plc4x.apache.org/">ConnectionRequest</xs:appinfo>
-                </xs:annotation>
-            </xs:enumeration>
-            <xs:enumeration id="tpduTypeConnectionResponse" value="208">
-                <xs:annotation>
-                    <xs:appinfo source="http://plc4x.apache.org/">ConnectionResponse</xs:appinfo>
-                </xs:annotation>
-            </xs:enumeration>
-            <xs:enumeration value="128">
-                <xs:annotation>
-                    <xs:appinfo source="http://plc4x.apache.org/">DisconnectRequest</xs:appinfo>
-                </xs:annotation>
-            </xs:enumeration>
-            <xs:enumeration value="192">
-                <xs:annotation>
-                    <xs:appinfo source="http://plc4x.apache.org/">DisconnectResponse</xs:appinfo>
-                </xs:annotation>
-            </xs:enumeration>
-            <xs:enumeration value="112">
-                <xs:annotation>
-                    <xs:appinfo source="http://plc4x.apache.org/">Error</xs:appinfo>
-                </xs:annotation>
-            </xs:enumeration>
-            <xs:enumeration value="240">
-                <xs:annotation>
-                    <xs:appinfo source="http://plc4x.apache.org/">Data</xs:appinfo>
-                </xs:annotation>
-            </xs:enumeration>
-        </xs:restriction>
-    </xs:simpleType>
-
-    <xs:simpleType name="CotpParameterType">
-        <xs:restriction base="xs:unsignedByte">
-            <xs:enumeration value="192">
-                <xs:annotation>
-                    <xs:appinfo source="http://plc4x.apache.org/">TpduSize</xs:appinfo>
-                </xs:annotation>
-            </xs:enumeration>
-            <xs:enumeration value="193">
-                <xs:annotation>
-                    <xs:appinfo source="http://plc4x.apache.org/">CallingTsap</xs:appinfo>
-                </xs:annotation>
-            </xs:enumeration>
-            <xs:enumeration value="194">
-                <xs:annotation>
-                    <xs:appinfo source="http://plc4x.apache.org/">CalledTsap</xs:appinfo>
-                </xs:annotation>
-            </xs:enumeration>
-            <xs:enumeration value="195">
-                <xs:annotation>
-                    <xs:appinfo source="http://plc4x.apache.org/">Checksum</xs:appinfo>
-                </xs:annotation>
-            </xs:enumeration>
-            <xs:enumeration value="224">
-                <xs:annotation>
-                    <xs:appinfo source="http://plc4x.apache.org/">DisconnectAdditionalInformation</xs:appinfo>
-                </xs:annotation>
-            </xs:enumeration>
-        </xs:restriction>
-    </xs:simpleType>
-
-    <xs:complexType name="CotpMessageType">
-        <xs:sequence>
-            <!-- Length of the COTP header data -->
-            <xs:element name="headerLength" type="s7:byte"/>
-            <xs:element name="type" type="s7:CotpTpduType"/>
-            <xs:choice dfdl:choiceDispatchKey="{xs:string(type)}">
-                <xs:element dfdl:choiceBranchKey="224" ref="s7:CotpTpduConnectionRequest"/>
-                <xs:element dfdl:choiceBranchKey="208" ref="s7:CotpTpduConnectionResponse"/>
-                <xs:element dfdl:choiceBranchKey="128" ref="s7:CotpTpduDisconnectRequest"/>
-                <xs:element dfdl:choiceBranchKey="192" ref="s7:CotpTpduDisconnectResponse"/>
-                <xs:element dfdl:choiceBranchKey="112" ref="s7:CotpTpduError"/>
-                <xs:element dfdl:choiceBranchKey="240" ref="s7:CotpTpduData"/>
-            </xs:choice>
-            <xs:element name="userData" type="s7:S7MessageType" minOccurs="0"
-                        dfdl:occursCountKind="expression"
-                        dfdl:occursCount="{if((../../length - (../headerLength + 5)) gt 0) then 1 else 0}"/>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:element name="CotpTpduConnectionRequest">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="destinationReference" type="s7:short"/>
-                <xs:element name="sourceReference" type="s7:short"/>
-                <xs:element name="protocolClass" type="s7:byte"/>
-                <xs:element ref="s7:parameters" minOccurs="0"
-                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="{../../headerLength - 6}"
-                            dfdl:occursCountKind="expression"
-                            dfdl:occursCount="{if(../../headerLength gt 6) then 1 else 0}"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="CotpTpduConnectionResponse">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="destinationReference" type="s7:short"/>
-                <xs:element name="sourceReference" type="s7:short"/>
-                <xs:element name="protocolClass" type="s7:byte"/>
-                <xs:element ref="s7:parameters" minOccurs="0"
-                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="{../../headerLength - 6}"
-                            dfdl:occursCountKind="expression"
-                            dfdl:occursCount="{if(../../headerLength gt 6) then 1 else 0}"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="CotpTpduDisconnectRequest">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="destinationReference" type="s7:short"/>
-                <xs:element name="sourceReference" type="s7:short"/>
-                <xs:element name="disconnectReason" type="s7:byte"/>
-                <xs:element ref="s7:parameters" minOccurs="0"
-                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="{../../headerLength - 6}"
-                            dfdl:occursCountKind="expression"
-                            dfdl:occursCount="{if(../../headerLength gt 6) then 1 else 0}"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="CotpTpduDisconnectResponse">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="destinationReference" type="s7:short"/>
-                <xs:element name="sourceReference" type="s7:short"/>
-                <xs:element ref="s7:parameters" minOccurs="0"
-                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="{../../headerLength - 5}"
-                            dfdl:occursCountKind="expression"
-                            dfdl:occursCount="{if(../../headerLength gt 5) then 1 else 0}"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="CotpTpduError">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="destinationReference" type="s7:short"/>
-                <xs:element name="rejectCause" type="s7:byte"/>
-                <xs:element ref="s7:parameters" minOccurs="0"
-                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="{../../headerLength - 4}"
-                            dfdl:occursCountKind="expression"
-                            dfdl:occursCount="{if(../../headerLength gt 4) then 1 else 0}"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="CotpTpduData">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="endOfTransmission" type="xs:unsignedInt"
-                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bits" dfdl:length="1"/>
-                <xs:element name="tpduRef" type="xs:unsignedInt"
-                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bits" dfdl:length="7"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="parameters">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="parameter" maxOccurs="unbounded">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element name="type" type="s7:CotpParameterType"/>
-                            <xs:element name="parameterLength" type="s7:byte"/>
-                            <xs:choice dfdl:choiceDispatchKey="{xs:string(type)}">
-                                <xs:element dfdl:choiceBranchKey="192" ref="s7:CotpParameterTpduSize"/>
-                                <xs:element dfdl:choiceBranchKey="193" ref="s7:CotpParameterCallingTsap"/>
-                                <xs:element dfdl:choiceBranchKey="194" ref="s7:CotpParameterCalledTsap"/>
-                                <xs:element dfdl:choiceBranchKey="195" ref="s7:CotpParameterChecksum"/>
-                                <xs:element dfdl:choiceBranchKey="224"
-                                            ref="s7:CotpParameterDisconnectAdditionalInformation"/>
-                            </xs:choice>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="CotpParameterTpduSize">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="tpduSize" type="s7:byte"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="CotpParameterCallingTsap">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="tsapId" type="s7:short"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="CotpParameterCalledTsap">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="tsapId" type="s7:short"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="CotpParameterChecksum">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="checksum" type="s7:byte"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="CotpParameterDisconnectAdditionalInformation">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="data" type="xs:hexBinary"
-                            dfdl:byteOrder="bigEndian" dfdl:lengthUnits="bytes" dfdl:lengthKind="explicit"
-                            dfdl:length="{../../parameterLength}"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <!--
-
-        S7 Types
-
-    -->
-
-    <xs:complexType name="S7MessageType">
-        <xs:sequence>
-            <!-- S7 Magic Byte always 0x32 -->
-            <xs:element name="magicByte" type="s7:byte">
-                <xs:annotation>
-                    <xs:appinfo source="http://www.ogf.org/dfdl/">
-                        <dfdl:assert message="Magic number was not 0x32."
-                                     test="{. eq 50}"/>
-                    </xs:appinfo>
-                </xs:annotation>
-            </xs:element>
-            <xs:element name="type" type="s7:byte"/>
-            <!--
-                Unfortunately the response for a CPU Functions request follows the rules of a
-                response, however has the header structure of a request
-                (no error code or error class). As mapping to the same type is not allowed,
-                we map to strings and use that as choice-key.
-            -->
-            <xs:choice dfdl:choiceDispatchKey="{xs:string(type)}">
-                <xs:element dfdl:choiceBranchKey="1" ref="s7:S7RequestMessage"/>
-                <xs:element dfdl:choiceBranchKey="3" ref="s7:S7ResponseMessage"/>
-                <xs:element dfdl:choiceBranchKey="7" ref="s7:S7UserDataMessage"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:element name="S7RequestMessage">
-        <xs:complexType>
-            <xs:sequence>
-                <!-- Reserved value always 0x0000 -->
-                <xs:element name="reserved" type="s7:short" fixed="0"/>
-                <xs:element name="tpduReference" type="s7:short"/>
-                <xs:element name="parametersLength" type="s7:short"/>
-                <xs:element name="payloadsLength" type="s7:short"/>
-                <xs:element name="parameters" minOccurs="0"
-                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="{../parametersLength}"
-                            dfdl:occursCountKind="expression"
-                            dfdl:occursCount="{if(../parametersLength gt 0) then 1 else 0}">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element name="parameter" maxOccurs="unbounded">
-                                <xs:complexType>
-                                    <xs:sequence>
-                                        <xs:element name="type" type="s7:byte"/>
-                                        <xs:choice dfdl:choiceDispatchKey="{xs:string(type)}">
-                                            <xs:element dfdl:choiceBranchKey="240"
-                                                        ref="s7:S7GeneralParameterSetupCommunication"/>
-                                            <xs:element dfdl:choiceBranchKey="4" ref="s7:S7RequestParameterReadVar"/>
-                                            <xs:element dfdl:choiceBranchKey="5" ref="s7:S7RequestParameterWriteVar"/>
-                                        </xs:choice>
-                                    </xs:sequence>
-                                </xs:complexType>
-                            </xs:element>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-                <!--
-                   As we might be outputting an empty payload block for a parameter that might not have a payload,
-                   we have to output this element if the parameters are not empty. The case that the payloads are
-                   not empty but the parameters are can't happen during normal operation.
-               -->
-                <xs:element name="payloads" minOccurs="0"
-                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="{../payloadsLength}"
-                            dfdl:occursCountKind="expression"
-                            dfdl:occursCount="{if(../parametersLength gt 0) then 1 else 0}">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <!--
-                                For every parameter we'll be outputting a payload block, even if this might be empty.
-                                This is required in order to find the matching parameter for every payload we might
-                                be having. We need to match these as otherwise we couldn't determine the type of a
-                                payload as this has no type information and we need to be able to access the number
-                                of items for a read/write request in order to process the correct number of items in
-                                the payload.
-                            -->
-                            <xs:element name="payload" maxOccurs="unbounded"
-                                        dfdl:occursCountKind="expression"
-                                        dfdl:occursCount="{fn:count(../../parameters[1]/parameter)}">
-                                <xs:complexType>
-                                    <xs:sequence>
-                                        <xs:choice
-                                            dfdl:choiceDispatchKey="{xs:string(../../parameters[1]/parameter[dfdl:occursIndex()]/type)}">
-                                            <xs:element dfdl:choiceBranchKey="240"
-                                                        ref="s7:S7GeneralPayloadSetupCommunication"/>
-                                            <xs:element dfdl:choiceBranchKey="4" ref="s7:S7RequestPayloadReadVar"/>
-                                            <xs:element dfdl:choiceBranchKey="5" ref="s7:S7RequestPayloadWriteVar"/>
-                                        </xs:choice>
-                                    </xs:sequence>
-                                </xs:complexType>
-                            </xs:element>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="S7ResponseMessage">
-        <xs:complexType>
-            <xs:sequence>
-                <!-- Reserved value always 0x0000 -->
-                <xs:element name="reserved" type="s7:short" fixed="0"/>
-                <xs:element name="tpduReference" type="s7:short"/>
-                <xs:element name="parametersLength" type="s7:short"/>
-                <xs:element name="payloadsLength" type="s7:short"/>
-                <!-- UserData (type 7) responses don't have the error class and code -->
-                <xs:element name="errorClass" type="s7:byte" minOccurs="0"
-                            dfdl:occursCountKind="expression" dfdl:occursCount="{if(../../type eq 3) then 1 else 0}"/>
-                <xs:element name="errorCode" type="s7:byte" minOccurs="0"
-                            dfdl:occursCountKind="expression" dfdl:occursCount="{if(../../type eq 3) then 1 else 0}"/>
-                <xs:element name="parameters" minOccurs="0"
-                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="{../parametersLength}"
-                            dfdl:occursCountKind="expression"
-                            dfdl:occursCount="{if(../parametersLength gt 0) then 1 else 0}">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element name="parameter" maxOccurs="unbounded">
-                                <xs:complexType>
-                                    <xs:sequence>
-                                        <xs:element name="type" type="s7:byte"/>
-                                        <xs:choice dfdl:choiceDispatchKey="{xs:string(type)}">
-                                            <xs:element dfdl:choiceBranchKey="240"
-                                                        ref="s7:S7GeneralParameterSetupCommunication"/>
-                                            <xs:element dfdl:choiceBranchKey="4" ref="s7:S7ResponseParameterReadVar"/>
-                                            <xs:element dfdl:choiceBranchKey="5" ref="s7:S7ResponseParameterWriteVar"/>
-                                        </xs:choice>
-                                    </xs:sequence>
-                                </xs:complexType>
-                            </xs:element>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-                <!--
-                    As we might be outputting an empty payload block for a parameter that might not have a payload,
-                    we have to output this element if the parameters are not empty. The case that the payloads are
-                    not empty but the parameters are can't happen during normal operation.
-                -->
-                <xs:element name="payloads" minOccurs="0"
-                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="{../payloadsLength}"
-                            dfdl:occursCountKind="expression"
-                            dfdl:occursCount="{if(../parametersLength gt 0) then 1 else 0}">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <!--
-                                For every parameter we'll be outputting a payload block, even if this might be empty.
-                                This is required in order to find the matching parameter for every payload we might
-                                be having. We need to match these as otherwise we couldn't determin the type of a
-                                payload as this has no type information and we need to be able to access the number
-                                of items for a read/write request in order to process the correct number of items in
-                                the payload.
-                            -->
-                            <xs:element name="payload" maxOccurs="unbounded"
-                                        dfdl:occursCountKind="expression"
-                                        dfdl:occursCount="{fn:count(../../parameters[1]/parameter)}">
-                                <xs:complexType>
-                                    <xs:sequence>
-                                        <xs:choice
-                                            dfdl:choiceDispatchKey="{xs:string(../../parameters[1]/parameter[dfdl:occursIndex()]/type)}">
-                                            <xs:element dfdl:choiceBranchKey="240"
-                                                        ref="s7:S7GeneralPayloadSetupCommunication"/>
-                                            <xs:element dfdl:choiceBranchKey="4" ref="s7:S7ResponsePayloadReadVar"/>
-                                            <xs:element dfdl:choiceBranchKey="5" ref="s7:S7ResponsePayloadWriteVar"/>
-                                        </xs:choice>
-                                    </xs:sequence>
-                                </xs:complexType>
-                            </xs:element>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-
-    <xs:element name="S7UserDataMessage">
-        <xs:complexType>
-            <xs:sequence>
-                <!-- Reserved value always 0x0000 -->
-                <xs:element name="reserved" type="s7:short" fixed="0"/>
-                <xs:element name="tpduReference" type="s7:short"/>
-                <xs:element name="parametersLength" type="s7:short"/>
-                <xs:element name="payloadsLength" type="s7:short"/>
-                <xs:element name="parameters" minOccurs="0"
-                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="{../parametersLength}"
-                            dfdl:occursCountKind="expression"
-                            dfdl:occursCount="{if(../parametersLength gt 0) then 1 else 0}">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element name="parameter" maxOccurs="unbounded">
-                                <xs:complexType>
-                                    <xs:sequence>
-                                        <xs:element name="type" type="s7:byte"/>
-                                        <xs:choice dfdl:choiceDispatchKey="{xs:string(type)}">
-                                            <xs:element dfdl:choiceBranchKey="0"
-                                                        ref="s7:S7UserDataParameterCPUService"/>
-                                        </xs:choice>
-                                    </xs:sequence>
-                                </xs:complexType>
-                            </xs:element>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-                <!--
-                   As we might be outputting an empty payload block for a parameter that might not have a payload,
-                   we have to output this element if the parameters are not empty. The case that the payloads are
-                   not empty but the parameters are can't happen during normal operation.
-               -->
-                <xs:element name="payloads" minOccurs="0"
-                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="{../payloadsLength}"
-                            dfdl:occursCountKind="expression"
-                            dfdl:occursCount="{if(../parametersLength gt 0) then 1 else 0}">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <!--
-                                For every parameter we'll be outputting a payload block, even if this might be empty.
-                                This is required in order to find the matching parameter for every payload we might
-                                be having. We need to match these as otherwise we couldn't determine the type of a
-                                payload as this has no type information and we need to be able to access the number
-                                of items for a read/write request in order to process the correct number of items in
-                                the payload.
-                            -->
-                            <xs:element name="payload" maxOccurs="unbounded"
-                                        dfdl:occursCountKind="expression"
-                                        dfdl:occursCount="{fn:count(../../parameters[1]/parameter)}">
-                                <xs:complexType>
-                                    <xs:sequence>
-                                        <xs:choice
-                                            dfdl:choiceDispatchKey="{xs:string(../../parameters[1]/parameter[dfdl:occursIndex()]/type)}">
-                                            <xs:element dfdl:choiceBranchKey="0"
-                                                        ref="s7:S7UserDataPayloadCpuServices"/>
-                                        </xs:choice>
-                                    </xs:sequence>
-                                </xs:complexType>
-                            </xs:element>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <!--
-
-        Parameters.
-
-    -->
-
-    <xs:element name="S7GeneralParameterSetupCommunication">
-        <xs:complexType>
-            <xs:sequence>
-                <!-- Reserved value always 0x00 -->
-                <xs:element name="reserved" type="s7:byte" fixed="0"/>
-                <xs:element name="maxAmqCaller" type="s7:short"/>
-                <xs:element name="maxAmqCallee" type="s7:short"/>
-                <xs:element name="pduLength" type="s7:short"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="S7UserDataParameterCPUService">
-        <xs:complexType>
-            <xs:sequence>
-                <!-- Fixed header 0x0112 274 -> -->
-                <xs:element name="header" type="s7:short"/><!-- fixed="274"-->
-                <xs:element name="paramLength" type="s7:byte"/><!-- fixed="4"-->
-                <!-- Request: 0x11 -> 17 -->
-                <xs:element name="typeCode" type="s7:byte"/><!-- fixed="17"-->
-                <xs:element name="type" type="xs:unsignedByte" dfdl:lengthKind="explicit" dfdl:lengthUnits="bits"
-                            dfdl:length="4"/>
-                <!-- First 4 bits: Request 0x40, last 4 bits: Function Group 0x04 = 0x44 -> 68 -->
-                <xs:element name="functionGroup" type="xs:unsignedByte" dfdl:lengthKind="explicit"
-                            dfdl:lengthUnits="bits" dfdl:length="4"/><!-- fixed="68"-->
-                <!-- READ SSL = 0x01 -->
-                <xs:element name="subFunctionGroup" type="s7:byte"/><!-- fixed="1"-->
-                <xs:element name="sequenceNumber" type="s7:byte"/>
-                <xs:element name="dataUnitReferenceNumber" type="s7:byte" minOccurs="0"
-                            dfdl:occursCountKind="expression"
-                            dfdl:occursCount="{if(../sequenceNumber eq 2) then 1 else 0}"/>
-                <xs:element name="lastDataUnit" type="s7:byte" minOccurs="0"
-                            dfdl:occursCountKind="expression"
-                            dfdl:occursCount="{if(../sequenceNumber eq 2) then 1 else 0}"/>
-                <xs:element name="errorCode" type="s7:short" minOccurs="0"
-                            dfdl:occursCountKind="expression"
-                            dfdl:occursCount="{if(../sequenceNumber eq 2) then 1 else 0}"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="S7RequestParameterReadVar">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="numItems" type="s7:byte"/>
-                <xs:element name="items" minOccurs="0"
-                            dfdl:occursCountKind="expression" dfdl:occursCount="{if(../numItems gt 0) then 1 else 0}">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element name="item" minOccurs="0" maxOccurs="unbounded"
-                                        dfdl:occursCountKind="expression" dfdl:occursCount="{../../numItems}">
-                                <xs:complexType>
-                                    <xs:sequence>
-                                        <xs:element name="type" type="s7:byte"/>
-                                        <xs:choice dfdl:choiceDispatchKey="{xs:string(type)}">
-                                            <xs:element dfdl:choiceBranchKey="18"
-                                                        ref="s7:S7RequestParameterReadVarAnyItem"/>
-                                        </xs:choice>
-                                    </xs:sequence>
-                                </xs:complexType>
-                            </xs:element>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="S7RequestParameterReadVarAnyItem">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="paramLength" type="s7:byte"/><!-- fixed="10"-->
-                <!-- Addressing Mode: Any 0x10 -> 16 -->
-                <xs:element name="addressingMode" type="s7:byte"/><!-- fixed="16"-->
-                <xs:element name="dataType" type="s7:byte"/>
-                <xs:element name="numElements" type="s7:short"/>
-                <xs:element name="dataBlockNumber" type="s7:short"/>
-                <xs:element name="memoryArea" type="s7:byte"/>
-                <!--
-                 The next 3 bytes (24 bits) contain the byte- and bit-offset,
-                 were the last byte contains the bit-offset in the last 3 bits
-                 and the byteOffset is encoded in the higher level 21 bits
-                -->
-                <xs:element name="byteOffset" type="xs:unsignedInt"
-                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bits" dfdl:length="21"/>
-                <xs:element name="bitOffset" type="xs:unsignedInt"
-                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bits" dfdl:length="3"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="S7ResponseParameterReadVar">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="numItems" type="s7:byte"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="S7RequestParameterWriteVar">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="numItems" type="s7:byte"/>
-                <xs:element name="items" minOccurs="0"
-                            dfdl:occursCountKind="expression" dfdl:occursCount="{if(../numItems gt 0) then 1 else 0}">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element name="item" minOccurs="0" maxOccurs="unbounded"
-                                        dfdl:occursCountKind="expression" dfdl:occursCount="{../../numItems}">
-                                <xs:complexType>
-                                    <xs:sequence>
-                                        <xs:element name="type" type="s7:byte"/>
-                                        <xs:choice dfdl:choiceDispatchKey="{xs:string(type)}">
-                                            <xs:element dfdl:choiceBranchKey="18"
-                                                        ref="s7:S7RequestParameterWriteVarAnyItem"/>
-                                        </xs:choice>
-                                    </xs:sequence>
-                                </xs:complexType>
-                            </xs:element>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="S7RequestParameterWriteVarAnyItem">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="itemLength" type="s7:byte"/><!-- fixed="10"-->
-                <!-- Addressing Mode: Any 0x10 -> 16 -->
-                <xs:element name="addressingMode" type="s7:byte"/><!-- fixed="16"-->
-                <xs:element name="dataType" type="s7:byte"/>
-                <xs:element name="numElements" type="s7:short"/>
-                <xs:element name="dataBlockNumber" type="s7:short"/>
-                <xs:element name="memoryArea" type="s7:byte"/>
-                <!--
-                 The next 3 bytes (24 bits) contain the byte- and bit-offset,
-                 were the last byte contains the bit-offset in the last 3 bits
-                 and the byteOffset is encoded in the higher level 21 bits
-                -->
-                <xs:element name="byteOffset" type="xs:unsignedInt"
-                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bits" dfdl:length="21"/>
-                <xs:element name="bitOffset" type="xs:unsignedInt"
-                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bits" dfdl:length="3"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="S7ResponseParameterWriteVar">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="numItems" type="s7:byte"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <!--
-
-        Payloads.
-
-    -->
-
-    <xs:element name="S7GeneralPayloadSetupCommunication"
-                type="xs:hexBinary" dfdl:lengthKind="explicit" dfdl:length="0"/>
-
-    <xs:element name="S7UserDataPayloadCpuServices">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="returnCode" type="s7:byte"/>
-                <xs:element name="transportSize" type="s7:byte"/><!-- fixed="9"-->
-                <xs:element name="length" type="s7:short"/>
-                <xs:element name="sslId" type="s7:short" minOccurs="0"
-                            dfdl:occursCountKind="expression"
-                            dfdl:occursCount="{if(../returnCode eq 255) then 1 else 0}"/>
-                <xs:element name="sslIndex" type="s7:short" minOccurs="0"
-                            dfdl:occursCountKind="expression"
-                            dfdl:occursCount="{if(../returnCode eq 255) then 1 else 0}"/>
-                <xs:element name="partialList" minOccurs="0"
-                            dfdl:occursCountKind="expression" dfdl:occursCount="{if((../returnCode eq 255) and (../length gt 4)) then 1 else 0}">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element name="partialListLengthInBytes" type="s7:short"/>
-                            <xs:element name="partialListCount" type="s7:short"/>
-                            <xs:element name="sslDataRecords">
-                                <xs:complexType>
-                                    <xs:sequence>
-                                        <xs:element name="sslDataRecord" maxOccurs="unbounded"
-                                                    dfdl:occursCountKind="expression" dfdl:occursCount="{../../partialListCount}">
-                                            <xs:complexType>
-                                                <xs:sequence>
-                                                    <xs:choice dfdl:choiceDispatchKey="{xs:string(../../../sslId[1])}">
-                                                        <xs:element dfdl:choiceBranchKey="17"
-                                                                    ref="s7:S7ResponsePayloadCpuServicesSslDataRecordModuleIdentification"/>
-                                                    </xs:choice>
-                                                </xs:sequence>
-                                            </xs:complexType>
-                                        </xs:element>
-                                    </xs:sequence>
-                                </xs:complexType>
-                            </xs:element>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="S7ResponsePayloadCpuServicesSslDataRecordModuleIdentification">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="index" type="s7:short"/>
-                <xs:element name="articleNumber" type="xs:string" dfdl:textTrimKind="none" dfdl:alignmentUnits="bytes"
-                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="20"/>
-                <xs:element name="bgType" type="s7:short"/>
-                <xs:element name="moduleOrOsVersion" type="s7:short"/>
-                <xs:element name="pgDescriptionFileVersion" type="s7:short"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="S7RequestPayloadReadVar"
-                type="xs:hexBinary" dfdl:lengthKind="explicit" dfdl:length="0"/>
-
-    <xs:element name="S7ResponsePayloadReadVar">
-        <xs:complexType>
-            <xs:sequence>
-                <!-- The number of items which should be read is transmitted in the matching parameter -->
-                <xs:element name="numItems" type="s7:byte"
-                            dfdl:inputValueCalc="{
-                                ../../../../parameters[1]/parameter[dfdl:occursIndex()]/s7:S7ResponseParameterReadVar/numItems
-                            }"/>
-                <xs:element name="item" minOccurs="0" maxOccurs="unbounded"
-                            dfdl:occursCountKind="expression" dfdl:occursCount="{../numItems}">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element name="returnCode" type="s7:byte"/>
-                            <xs:element name="transportSize" type="s7:byte"/>
-                            <xs:element name="rawLength" type="s7:short"/>
-                            <!--
-                                For some reason the types BIT, BYTE_WORD_DWORD and INTEGER are transferred in "bits",
-                                the rest is transferred in "bytes"
-                            -->
-                            <xs:element name="lengthInBytes" type="s7:short" dfdl:inputValueCalc="{
-                                    xs:unsignedShort(if((../transportSize eq 3) or (../transportSize eq 4) or (../transportSize eq 5))
-                                            then fn:ceiling(xs:double(../rawLength div 8))
-                                            else ../rawLength)}"/>
-                            <xs:element name="data" type="xs:hexBinary"
-                                        dfdl:byteOrder="bigEndian" dfdl:lengthUnits="bytes" dfdl:lengthKind="explicit"
-                                        dfdl:length="{../lengthInBytes}"/>
-                            <!--
-                                Transport sizes: BIT, BYTE_WORD_DWORD and OCTET_STRING require a blank byte.
-                                However only if this is not the last item in the result.
-                            -->
-                            <xs:element name="fillByte" type="s7:byte" minOccurs="0"
-                                        dfdl:occursCountKind="expression" dfdl:occursCount="{
-                                            if(((../lengthInBytes mod 2) eq 1) and
-                                                (dfdl:occursIndex() ne ../../numItems)) then 1 else 0}"/>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="S7RequestPayloadWriteVar">
-        <xs:complexType>
-            <xs:sequence>
-                <!-- The number of items which should be read is transmitted in the matching parameter -->
-                <xs:element name="numItems" type="s7:byte"
-                            dfdl:inputValueCalc="{
-                                ../../../../parameters[1]/parameter[dfdl:occursIndex()]/s7:S7RequestParameterWriteVar/numItems
-                            }"/>
-                <xs:element name="item" minOccurs="0" maxOccurs="unbounded"
-                            dfdl:occursCountKind="expression" dfdl:occursCount="{../numItems}">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element name="returnCode" type="s7:byte"/>
-                            <xs:element name="transportSize" type="s7:byte"/>
-                            <xs:element name="rawLength" type="s7:short"/>
-                            <!--
-                                For some reason the types BIT, BYTE_WORD_DWORD and INTEGER are transferred in "bits",
-                                the rest is transferred in "bytes"
-                            -->
-                            <xs:element name="lengthInBytes" type="s7:short" dfdl:inputValueCalc="{
-                                    xs:unsignedShort(if((../transportSize eq 3) or (../transportSize eq 4) or (../transportSize eq 5))
-                                            then fn:ceiling(../rawLength div 8)
-                                            else ../rawLength)}"/>
-                            <xs:element name="data" type="xs:hexBinary"
-                                        dfdl:byteOrder="bigEndian" dfdl:lengthUnits="bytes" dfdl:lengthKind="explicit"
-                                        dfdl:length="{../lengthInBytes}"/>
-                            <!--
-                                It seems that the item payload must always be an even number of bytes. So if it's
-                                not an even number, add a fill byte.
-                            -->
-                            <xs:element name="fillByte" type="s7:byte" minOccurs="0"
-                                        dfdl:occursCountKind="expression" dfdl:occursCount="{
-                                            if(((../lengthInBytes mod 2) eq 1) and
-                                                (dfdl:occursIndex() ne ../../numItems)) then 1 else 0}"/>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="S7ResponsePayloadWriteVar">
-        <xs:complexType>
-            <xs:sequence>
-                <!-- The number of items which should be read is transmitted in the matching parameter -->
-                <xs:element name="numItems" type="s7:byte"
-                            dfdl:inputValueCalc="{
-                                ../../../../parameters[1]/parameter[dfdl:occursIndex()]/s7:S7ResponseParameterWriteVar/numItems
-                            }"/>
-                <xs:element name="item" minOccurs="0" maxOccurs="unbounded"
-                            dfdl:occursCountKind="expression" dfdl:occursCount="{../numItems}">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element name="returnCode" type="s7:byte"/>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
+<!--
+  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
+
+      http://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.
+  -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
+           xmlns:s7="http://plc4x.apache.org/s7"
+           xmlns:fn="http://www.w3.org/2005/xpath-functions"
+           targetNamespace="http://plc4x.apache.org/s7">
+
+    <xs:annotation>
+        <xs:appinfo source="http://www.ogf.org/dfdl/">
+            <dfdl:defineVariable name="messageType" type="xs:string"/>
+            <dfdl:defineFormat name="s7FullFormat">
+                <dfdl:format representation="binary"
+                             binaryNumberRep="binary"
+                             byteOrder="bigEndian"
+                             lengthKind="implicit" lengthUnits="bytes" length="0"
+                             occursCountKind="implicit"
+                             textOutputMinLength="0"
+                             alignment="1" alignmentUnits="bits"
+                             leadingSkip="0" trailingSkip="0"
+                             textPadKind="none" ignoreCase="no"
+                             textBidi="no" floating="no"
+                             encoding="utf-8" truncateSpecifiedLengthString="no"
+                             initiator="" terminator=""
+                             sequenceKind="ordered" separator=""
+                             escapeSchemeRef="" initiatedContent="no"
+                             encodingErrorPolicy="replace"/>
+            </dfdl:defineFormat>
+            <dfdl:format ref="s7:s7FullFormat"/>
+        </xs:appinfo>
+    </xs:annotation>
+
+    <!--
+
+        Simple type definition.
+
+    -->
+
+    <xs:simpleType name="bit" dfdl:lengthUnits="bits" dfdl:length="1" dfdl:lengthKind="explicit">
+        <xs:restriction base="xs:boolean"/>
+    </xs:simpleType>
+
+    <xs:simpleType name="byte" dfdl:lengthUnits="bytes" dfdl:length="1" dfdl:lengthKind="explicit">
+        <xs:restriction base="xs:unsignedByte"/>
+    </xs:simpleType>
+
+    <xs:simpleType name="short" dfdl:lengthUnits="bytes" dfdl:length="2" dfdl:lengthKind="explicit">
+        <xs:restriction base="xs:unsignedShort"/>
+    </xs:simpleType>
+
+    <xs:simpleType name="hexByte" dfdl:lengthUnits="bytes" dfdl:length="1" dfdl:lengthKind="explicit">
+        <xs:restriction base="xs:hexBinary"/>
+    </xs:simpleType>
+
+    <!--
+
+        TPKT - Iso-On-TCP
+
+    -->
+
+    <xs:element name="TpktMessage" type="s7:TpktMessageType"/>
+
+    <xs:complexType name="TpktMessageType">
+        <xs:sequence>
+            <!-- TPKT Magic Byte always 0x03 -->
+            <xs:element name="magicByte" type="s7:byte">
+                <xs:annotation>
+                    <xs:appinfo source="http://www.ogf.org/dfdl/">
+                        <dfdl:assert message="Magic number was not 0x03."
+                                     test="{. eq 3}"/>
+                    </xs:appinfo>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="reserved" type="s7:byte"/>
+            <xs:element name="length" type="s7:short"/>
+            <xs:element name="userData" type="s7:CotpMessageType"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <!--
+
+        ISO 8073/X.224 - ISO-TP - COTP - Connection-Oriented Transport Protocol Messages
+
+    -->
+
+    <xs:simpleType name="CotpTpduType">
+        <xs:restriction base="xs:unsignedByte">
+            <xs:enumeration id="tpduTypeConnectionRequest" value="224">
+                <xs:annotation>
+                    <xs:appinfo source="http://plc4x.apache.org/">ConnectionRequest</xs:appinfo>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration id="tpduTypeConnectionResponse" value="208">
+                <xs:annotation>
+                    <xs:appinfo source="http://plc4x.apache.org/">ConnectionResponse</xs:appinfo>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="128">
+                <xs:annotation>
+                    <xs:appinfo source="http://plc4x.apache.org/">DisconnectRequest</xs:appinfo>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="192">
+                <xs:annotation>
+                    <xs:appinfo source="http://plc4x.apache.org/">DisconnectResponse</xs:appinfo>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="112">
+                <xs:annotation>
+                    <xs:appinfo source="http://plc4x.apache.org/">Error</xs:appinfo>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="240">
+                <xs:annotation>
+                    <xs:appinfo source="http://plc4x.apache.org/">Data</xs:appinfo>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="CotpParameterType">
+        <xs:restriction base="xs:unsignedByte">
+            <xs:enumeration value="192">
+                <xs:annotation>
+                    <xs:appinfo source="http://plc4x.apache.org/">TpduSize</xs:appinfo>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="193">
+                <xs:annotation>
+                    <xs:appinfo source="http://plc4x.apache.org/">CallingTsap</xs:appinfo>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="194">
+                <xs:annotation>
+                    <xs:appinfo source="http://plc4x.apache.org/">CalledTsap</xs:appinfo>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="195">
+                <xs:annotation>
+                    <xs:appinfo source="http://plc4x.apache.org/">Checksum</xs:appinfo>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="224">
+                <xs:annotation>
+                    <xs:appinfo source="http://plc4x.apache.org/">DisconnectAdditionalInformation</xs:appinfo>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:complexType name="CotpMessageType">
+        <xs:sequence>
+            <!-- Length of the COTP header data -->
+            <xs:element name="headerLength" type="s7:byte"/>
+            <xs:element name="type" type="s7:CotpTpduType"/>
+            <xs:choice dfdl:choiceDispatchKey="{xs:string(type)}">
+                <xs:element dfdl:choiceBranchKey="224" ref="s7:CotpTpduConnectionRequest"/>
+                <xs:element dfdl:choiceBranchKey="208" ref="s7:CotpTpduConnectionResponse"/>
+                <xs:element dfdl:choiceBranchKey="128" ref="s7:CotpTpduDisconnectRequest"/>
+                <xs:element dfdl:choiceBranchKey="192" ref="s7:CotpTpduDisconnectResponse"/>
+                <xs:element dfdl:choiceBranchKey="112" ref="s7:CotpTpduError"/>
+                <xs:element dfdl:choiceBranchKey="240" ref="s7:CotpTpduData"/>
+            </xs:choice>
+            <xs:element name="userData" type="s7:S7MessageType" minOccurs="0"
+                        dfdl:occursCountKind="expression"
+                        dfdl:occursCount="{if((../../length - (../headerLength + 5)) gt 0) then 1 else 0}"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:element name="CotpTpduConnectionRequest">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="destinationReference" type="s7:short"/>
+                <xs:element name="sourceReference" type="s7:short"/>
+                <xs:element name="protocolClass" type="s7:byte"/>
+                <xs:element ref="s7:parameters" minOccurs="0"
+                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="{../../headerLength - 6}"
+                            dfdl:occursCountKind="expression"
+                            dfdl:occursCount="{if(../../headerLength gt 6) then 1 else 0}"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="CotpTpduConnectionResponse">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="destinationReference" type="s7:short"/>
+                <xs:element name="sourceReference" type="s7:short"/>
+                <xs:element name="protocolClass" type="s7:byte"/>
+                <xs:element ref="s7:parameters" minOccurs="0"
+                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="{../../headerLength - 6}"
+                            dfdl:occursCountKind="expression"
+                            dfdl:occursCount="{if(../../headerLength gt 6) then 1 else 0}"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="CotpTpduDisconnectRequest">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="destinationReference" type="s7:short"/>
+                <xs:element name="sourceReference" type="s7:short"/>
+                <xs:element name="disconnectReason" type="s7:byte"/>
+                <xs:element ref="s7:parameters" minOccurs="0"
+                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="{../../headerLength - 6}"
+                            dfdl:occursCountKind="expression"
+                            dfdl:occursCount="{if(../../headerLength gt 6) then 1 else 0}"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="CotpTpduDisconnectResponse">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="destinationReference" type="s7:short"/>
+                <xs:element name="sourceReference" type="s7:short"/>
+                <xs:element ref="s7:parameters" minOccurs="0"
+                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="{../../headerLength - 5}"
+                            dfdl:occursCountKind="expression"
+                            dfdl:occursCount="{if(../../headerLength gt 5) then 1 else 0}"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="CotpTpduError">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="destinationReference" type="s7:short"/>
+                <xs:element name="rejectCause" type="s7:byte"/>
+                <xs:element ref="s7:parameters" minOccurs="0"
+                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="{../../headerLength - 4}"
+                            dfdl:occursCountKind="expression"
+                            dfdl:occursCount="{if(../../headerLength gt 4) then 1 else 0}"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="CotpTpduData">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="endOfTransmission" type="xs:unsignedInt"
+                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bits" dfdl:length="1"/>
+                <xs:element name="tpduRef" type="xs:unsignedInt"
+                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bits" dfdl:length="7"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="parameters">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="parameter" maxOccurs="unbounded">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="type" type="s7:CotpParameterType"/>
+                            <xs:element name="parameterLength" type="s7:byte"/>
+                            <xs:choice dfdl:choiceDispatchKey="{xs:string(type)}">
+                                <xs:element dfdl:choiceBranchKey="192" ref="s7:CotpParameterTpduSize"/>
+                                <xs:element dfdl:choiceBranchKey="193" ref="s7:CotpParameterCallingTsap"/>
+                                <xs:element dfdl:choiceBranchKey="194" ref="s7:CotpParameterCalledTsap"/>
+                                <xs:element dfdl:choiceBranchKey="195" ref="s7:CotpParameterChecksum"/>
+                                <xs:element dfdl:choiceBranchKey="224"
+                                            ref="s7:CotpParameterDisconnectAdditionalInformation"/>
+                            </xs:choice>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="CotpParameterTpduSize">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="tpduSize" type="s7:byte"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="CotpParameterCallingTsap">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="tsapId" type="s7:short"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="CotpParameterCalledTsap">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="tsapId" type="s7:short"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="CotpParameterChecksum">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="checksum" type="s7:byte"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="CotpParameterDisconnectAdditionalInformation">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="data" type="xs:hexBinary"
+                            dfdl:byteOrder="bigEndian" dfdl:lengthUnits="bytes" dfdl:lengthKind="explicit"
+                            dfdl:length="{../../parameterLength}"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <!--
+
+        S7 Types
+
+    -->
+
+    <xs:complexType name="S7MessageType">
+        <xs:sequence>
+            <!-- S7 Magic Byte always 0x32 -->
+            <xs:element name="magicByte" type="s7:byte">
+                <xs:annotation>
+                    <xs:appinfo source="http://www.ogf.org/dfdl/">
+                        <dfdl:assert message="Magic number was not 0x32."
+                                     test="{. eq 50}"/>
+                    </xs:appinfo>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="type" type="s7:byte"/>
+            <!--
+                Unfortunately the response for a CPU Functions request follows the rules of a
+                response, however has the header structure of a request
+                (no error code or error class). As mapping to the same type is not allowed,
+                we map to strings and use that as choice-key.
+            -->
+            <xs:choice dfdl:choiceDispatchKey="{xs:string(type)}">
+                <xs:element dfdl:choiceBranchKey="1" ref="s7:S7RequestMessage"/>
+                <xs:element dfdl:choiceBranchKey="3" ref="s7:S7ResponseMessage"/>
+                <xs:element dfdl:choiceBranchKey="7" ref="s7:S7UserDataMessage"/>
+            </xs:choice>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:element name="S7RequestMessage">
+        <xs:complexType>
+            <xs:sequence>
+                <!-- Reserved value always 0x0000 -->
+                <xs:element name="reserved" type="s7:short" fixed="0"/>
+                <xs:element name="tpduReference" type="s7:short"/>
+                <xs:element name="parametersLength" type="s7:short"/>
+                <xs:element name="payloadsLength" type="s7:short"/>
+                <xs:element name="parameters" minOccurs="0"
+                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="{../parametersLength}"
+                            dfdl:occursCountKind="expression"
+                            dfdl:occursCount="{if(../parametersLength gt 0) then 1 else 0}">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="parameter" maxOccurs="unbounded">
+                                <xs:complexType>
+                                    <xs:sequence>
+                                        <xs:element name="type" type="s7:byte"/>
+                                        <xs:choice dfdl:choiceDispatchKey="{xs:string(type)}">
+                                            <xs:element dfdl:choiceBranchKey="240"
+                                                        ref="s7:S7GeneralParameterSetupCommunication"/>
+                                            <xs:element dfdl:choiceBranchKey="4" ref="s7:S7RequestParameterReadVar"/>
+                                            <xs:element dfdl:choiceBranchKey="5" ref="s7:S7RequestParameterWriteVar"/>
+                                        </xs:choice>
+                                    </xs:sequence>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+                <!--
+                   As we might be outputting an empty payload block for a parameter that might not have a payload,
+                   we have to output this element if the parameters are not empty. The case that the payloads are
+                   not empty but the parameters are can't happen during normal operation.
+               -->
+                <xs:element name="payloads" minOccurs="0"
+                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="{../payloadsLength}"
+                            dfdl:occursCountKind="expression"
+                            dfdl:occursCount="{if(../parametersLength gt 0) then 1 else 0}">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <!--
+                                For every parameter we'll be outputting a payload block, even if this might be empty.
+                                This is required in order to find the matching parameter for every payload we might
+                                be having. We need to match these as otherwise we couldn't determine the type of a
+                                payload as this has no type information and we need to be able to access the number
+                                of items for a read/write request in order to process the correct number of items in
+                                the payload.
+                            -->
+                            <xs:element name="payload" maxOccurs="unbounded"
+                                        dfdl:occursCountKind="expression"
+                                        dfdl:occursCount="{fn:count(../../parameters[1]/parameter)}">
+                                <xs:complexType>
+                                    <xs:sequence>
+                                        <xs:choice
+                                            dfdl:choiceDispatchKey="{xs:string(../../parameters[1]/parameter[dfdl:occursIndex()]/type)}">
+                                            <xs:element dfdl:choiceBranchKey="240"
+                                                        ref="s7:S7GeneralPayloadSetupCommunication"/>
+                                            <xs:element dfdl:choiceBranchKey="4" ref="s7:S7RequestPayloadReadVar"/>
+                                            <xs:element dfdl:choiceBranchKey="5" ref="s7:S7RequestPayloadWriteVar"/>
+                                        </xs:choice>
+                                    </xs:sequence>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="S7ResponseMessage">
+        <xs:complexType>
+            <xs:sequence>
+                <!-- Reserved value always 0x0000 -->
+                <xs:element name="reserved" type="s7:short" fixed="0"/>
+                <xs:element name="tpduReference" type="s7:short"/>
+                <xs:element name="parametersLength" type="s7:short"/>
+                <xs:element name="payloadsLength" type="s7:short"/>
+                <!-- UserData (type 7) responses don't have the error class and code -->
+                <xs:element name="errorClass" type="s7:byte" minOccurs="0"
+                            dfdl:occursCountKind="expression" dfdl:occursCount="{if(../../type eq 3) then 1 else 0}"/>
+                <xs:element name="errorCode" type="s7:byte" minOccurs="0"
+                            dfdl:occursCountKind="expression" dfdl:occursCount="{if(../../type eq 3) then 1 else 0}"/>
+                <xs:element name="parameters" minOccurs="0"
+                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="{../parametersLength}"
+                            dfdl:occursCountKind="expression"
+                            dfdl:occursCount="{if(../parametersLength gt 0) then 1 else 0}">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="parameter" maxOccurs="unbounded">
+                                <xs:complexType>
+                                    <xs:sequence>
+                                        <xs:element name="type" type="s7:byte"/>
+                                        <xs:choice dfdl:choiceDispatchKey="{xs:string(type)}">
+                                            <xs:element dfdl:choiceBranchKey="240"
+                                                        ref="s7:S7GeneralParameterSetupCommunication"/>
+                                            <xs:element dfdl:choiceBranchKey="4" ref="s7:S7ResponseParameterReadVar"/>
+                                            <xs:element dfdl:choiceBranchKey="5" ref="s7:S7ResponseParameterWriteVar"/>
+                                        </xs:choice>
+                                    </xs:sequence>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+                <!--
+                    As we might be outputting an empty payload block for a parameter that might not have a payload,
+                    we have to output this element if the parameters are not empty. The case that the payloads are
+                    not empty but the parameters are can't happen during normal operation.
+                -->
+                <xs:element name="payloads" minOccurs="0"
+                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="{../payloadsLength}"
+                            dfdl:occursCountKind="expression"
+                            dfdl:occursCount="{if(../parametersLength gt 0) then 1 else 0}">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <!--
+                                For every parameter we'll be outputting a payload block, even if this might be empty.
+                                This is required in order to find the matching parameter for every payload we might
+                                be having. We need to match these as otherwise we couldn't determin the type of a
+                                payload as this has no type information and we need to be able to access the number
+                                of items for a read/write request in order to process the correct number of items in
+                                the payload.
+                            -->
+                            <xs:element name="payload" maxOccurs="unbounded"
+                                        dfdl:occursCountKind="expression"
+                                        dfdl:occursCount="{fn:count(../../parameters[1]/parameter)}">
+                                <xs:complexType>
+                                    <xs:sequence>
+                                        <xs:choice
+                                            dfdl:choiceDispatchKey="{xs:string(../../parameters[1]/parameter[dfdl:occursIndex()]/type)}">
+                                            <xs:element dfdl:choiceBranchKey="240"
+                                                        ref="s7:S7GeneralPayloadSetupCommunication"/>
+                                            <xs:element dfdl:choiceBranchKey="4" ref="s7:S7ResponsePayloadReadVar"/>
+                                            <xs:element dfdl:choiceBranchKey="5" ref="s7:S7ResponsePayloadWriteVar"/>
+                                        </xs:choice>
+                                    </xs:sequence>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+
+    <xs:element name="S7UserDataMessage">
+        <xs:complexType>
+            <xs:sequence>
+                <!-- Reserved value always 0x0000 -->
+                <xs:element name="reserved" type="s7:short" fixed="0"/>
+                <xs:element name="tpduReference" type="s7:short"/>
+                <xs:element name="parametersLength" type="s7:short"/>
+                <xs:element name="payloadsLength" type="s7:short"/>
+                <xs:element name="parameters" minOccurs="0"
+                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="{../parametersLength}"
+                            dfdl:occursCountKind="expression"
+                            dfdl:occursCount="{if(../parametersLength gt 0) then 1 else 0}">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="parameter" maxOccurs="unbounded">
+                                <xs:complexType>
+                                    <xs:sequence>
+                                        <xs:element name="type" type="s7:byte"/>
+                                        <xs:choice dfdl:choiceDispatchKey="{xs:string(type)}">
+                                            <xs:element dfdl:choiceBranchKey="0"
+                                                        ref="s7:S7UserDataParameterCPUService"/>
+                                        </xs:choice>
+                                    </xs:sequence>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+                <!--
+                   As we might be outputting an empty payload block for a parameter that might not have a payload,
+                   we have to output this element if the parameters are not empty. The case that the payloads are
+                   not empty but the parameters are can't happen during normal operation.
+               -->
+                <xs:element name="payloads" minOccurs="0"
+                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="{../payloadsLength}"
+                            dfdl:occursCountKind="expression"
+                            dfdl:occursCount="{if(../parametersLength gt 0) then 1 else 0}">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <!--
+                                For every parameter we'll be outputting a payload block, even if this might be empty.
+                                This is required in order to find the matching parameter for every payload we might
+                                be having. We need to match these as otherwise we couldn't determine the type of a
+                                payload as this has no type information and we need to be able to access the number
+                                of items for a read/write request in order to process the correct number of items in
+                                the payload.
+                            -->
+                            <xs:element name="payload" maxOccurs="unbounded"
+                                        dfdl:occursCountKind="expression"
+                                        dfdl:occursCount="{fn:count(../../parameters[1]/parameter)}">
+                                <xs:complexType>
+                                    <xs:sequence>
+                                        <xs:choice
+                                            dfdl:choiceDispatchKey="{xs:string(../../parameters[1]/parameter[dfdl:occursIndex()]/type)}">
+                                            <xs:element dfdl:choiceBranchKey="0"
+                                                        ref="s7:S7UserDataPayloadCpuServices"/>
+                                        </xs:choice>
+                                    </xs:sequence>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <!--
+
+        Parameters.
+
+    -->
+
+    <xs:element name="S7GeneralParameterSetupCommunication">
+        <xs:complexType>
+            <xs:sequence>
+                <!-- Reserved value always 0x00 -->
+                <xs:element name="reserved" type="s7:byte" fixed="0"/>
+                <xs:element name="maxAmqCaller" type="s7:short"/>
+                <xs:element name="maxAmqCallee" type="s7:short"/>
+                <xs:element name="pduLength" type="s7:short"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="S7UserDataParameterCPUService">
+        <xs:complexType>
+            <xs:sequence>
+                <!-- Fixed header 0x0112 274 -> -->
+                <xs:element name="header" type="s7:short"/><!-- fixed="274"-->
+                <xs:element name="paramLength" type="s7:byte"/><!-- fixed="4"-->
+                <!-- Request: 0x11 -> 17 -->
+                <xs:element name="typeCode" type="s7:byte"/><!-- fixed="17"-->
+                <xs:element name="type" type="xs:unsignedByte" dfdl:lengthKind="explicit" dfdl:lengthUnits="bits"
+                            dfdl:length="4"/>
+                <!-- First 4 bits: Request 0x40, last 4 bits: Function Group 0x04 = 0x44 -> 68 -->
+                <xs:element name="functionGroup" type="xs:unsignedByte" dfdl:lengthKind="explicit"
+                            dfdl:lengthUnits="bits" dfdl:length="4"/><!-- fixed="68"-->
+                <!-- READ SSL = 0x01 -->
+                <xs:element name="subFunctionGroup" type="s7:byte"/><!-- fixed="1"-->
+                <xs:element name="sequenceNumber" type="s7:byte"/>
+                <xs:element name="dataUnitReferenceNumber" type="s7:byte" minOccurs="0"
+                            dfdl:occursCountKind="expression"
+                            dfdl:occursCount="{if(../sequenceNumber eq 2) then 1 else 0}"/>
+                <xs:element name="lastDataUnit" type="s7:byte" minOccurs="0"
+                            dfdl:occursCountKind="expression"
+                            dfdl:occursCount="{if(../sequenceNumber eq 2) then 1 else 0}"/>
+                <xs:element name="errorCode" type="s7:short" minOccurs="0"
+                            dfdl:occursCountKind="expression"
+                            dfdl:occursCount="{if(../sequenceNumber eq 2) then 1 else 0}"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="S7RequestParameterReadVar">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="numItems" type="s7:byte"/>
+                <xs:element name="items" minOccurs="0"
+                            dfdl:occursCountKind="expression" dfdl:occursCount="{if(../numItems gt 0) then 1 else 0}">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="item" minOccurs="0" maxOccurs="unbounded"
+                                        dfdl:occursCountKind="expression" dfdl:occursCount="{../../numItems}">
+                                <xs:complexType>
+                                    <xs:sequence>
+                                        <xs:element name="type" type="s7:byte"/>
+                                        <xs:choice dfdl:choiceDispatchKey="{xs:string(type)}">
+                                            <xs:element dfdl:choiceBranchKey="18"
+                                                        ref="s7:S7RequestParameterReadVarAnyItem"/>
+                                        </xs:choice>
+                                    </xs:sequence>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="S7RequestParameterReadVarAnyItem">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="paramLength" type="s7:byte"/><!-- fixed="10"-->
+                <!-- Addressing Mode: Any 0x10 -> 16 -->
+                <xs:element name="addressingMode" type="s7:byte"/><!-- fixed="16"-->
+                <xs:element name="dataType" type="s7:byte"/>
+                <xs:element name="numElements" type="s7:short"/>
+                <xs:element name="dataBlockNumber" type="s7:short"/>
+                <xs:element name="memoryArea" type="s7:byte"/>
+                <!--
+                 The next 3 bytes (24 bits) contain the byte- and bit-offset,
+                 were the last byte contains the bit-offset in the last 3 bits
+                 and the byteOffset is encoded in the higher level 21 bits
+                -->
+                <xs:element name="byteOffset" type="xs:unsignedInt"
+                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bits" dfdl:length="21"/>
+                <xs:element name="bitOffset" type="xs:unsignedInt"
+                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bits" dfdl:length="3"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="S7ResponseParameterReadVar">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="numItems" type="s7:byte"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="S7RequestParameterWriteVar">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="numItems" type="s7:byte"/>
+                <xs:element name="items" minOccurs="0"
+                            dfdl:occursCountKind="expression" dfdl:occursCount="{if(../numItems gt 0) then 1 else 0}">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="item" minOccurs="0" maxOccurs="unbounded"
+                                        dfdl:occursCountKind="expression" dfdl:occursCount="{../../numItems}">
+                                <xs:complexType>
+                                    <xs:sequence>
+                                        <xs:element name="type" type="s7:byte"/>
+                                        <xs:choice dfdl:choiceDispatchKey="{xs:string(type)}">
+                                            <xs:element dfdl:choiceBranchKey="18"
+                                                        ref="s7:S7RequestParameterWriteVarAnyItem"/>
+                                        </xs:choice>
+                                    </xs:sequence>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="S7RequestParameterWriteVarAnyItem">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="itemLength" type="s7:byte"/><!-- fixed="10"-->
+                <!-- Addressing Mode: Any 0x10 -> 16 -->
+                <xs:element name="addressingMode" type="s7:byte"/><!-- fixed="16"-->
+                <xs:element name="dataType" type="s7:byte"/>
+                <xs:element name="numElements" type="s7:short"/>
+                <xs:element name="dataBlockNumber" type="s7:short"/>
+                <xs:element name="memoryArea" type="s7:byte"/>
+                <!--
+                 The next 3 bytes (24 bits) contain the byte- and bit-offset,
+                 were the last byte contains the bit-offset in the last 3 bits
+                 and the byteOffset is encoded in the higher level 21 bits
+                -->
+                <xs:element name="byteOffset" type="xs:unsignedInt"
+                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bits" dfdl:length="21"/>
+                <xs:element name="bitOffset" type="xs:unsignedInt"
+                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bits" dfdl:length="3"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="S7ResponseParameterWriteVar">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="numItems" type="s7:byte"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <!--
+
+        Payloads.
+
+    -->
+
+    <xs:element name="S7GeneralPayloadSetupCommunication"
+                type="xs:hexBinary" dfdl:lengthKind="explicit" dfdl:length="0"/>
+
+    <xs:element name="S7UserDataPayloadCpuServices">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="returnCode" type="s7:byte"/>
+                <xs:element name="transportSize" type="s7:byte"/><!-- fixed="9"-->
+                <xs:element name="length" type="s7:short"/>
+                <xs:element name="sslId" type="s7:short" minOccurs="0"
+                            dfdl:occursCountKind="expression"
+                            dfdl:occursCount="{if(../returnCode eq 255) then 1 else 0}"/>
+                <xs:element name="sslIndex" type="s7:short" minOccurs="0"
+                            dfdl:occursCountKind="expression"
+                            dfdl:occursCount="{if(../returnCode eq 255) then 1 else 0}"/>
+                <xs:element name="partialList" minOccurs="0"
+                            dfdl:occursCountKind="expression" dfdl:occursCount="{if((../returnCode eq 255) and (../length gt 4)) then 1 else 0}">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="partialListLengthInBytes" type="s7:short"/>
+                            <xs:element name="partialListCount" type="s7:short"/>
+                            <xs:element name="sslDataRecords">
+                                <xs:complexType>
+                                    <xs:sequence>
+                                        <xs:element name="sslDataRecord" maxOccurs="unbounded"
+                                                    dfdl:occursCountKind="expression" dfdl:occursCount="{../../partialListCount}">
+                                            <xs:complexType>
+                                                <xs:sequence>
+                                                    <xs:choice dfdl:choiceDispatchKey="{xs:string(../../../sslId[1])}">
+                                                        <xs:element dfdl:choiceBranchKey="17"
+                                                                    ref="s7:S7ResponsePayloadCpuServicesSslDataRecordModuleIdentification"/>
+                                                    </xs:choice>
+                                                </xs:sequence>
+                                            </xs:complexType>
+                                        </xs:element>
+                                    </xs:sequence>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="S7ResponsePayloadCpuServicesSslDataRecordModuleIdentification">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="index" type="s7:short"/>
+                <xs:element name="articleNumber" type="xs:string" dfdl:textTrimKind="none" dfdl:alignmentUnits="bytes"
+                            dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="20"/>
+                <xs:element name="bgType" type="s7:short"/>
+                <xs:element name="moduleOrOsVersion" type="s7:short"/>
+                <xs:element name="pgDescriptionFileVersion" type="s7:short"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="S7RequestPayloadReadVar"
+                type="xs:hexBinary" dfdl:lengthKind="explicit" dfdl:length="0"/>
+
+    <xs:element name="S7ResponsePayloadReadVar">
+        <xs:complexType>
+            <xs:sequence>
+                <!-- The number of items which should be read is transmitted in the matching parameter -->
+                <xs:element name="numItems" type="s7:byte"
+                            dfdl:inputValueCalc="{
+                                ../../../../parameters[1]/parameter[dfdl:occursIndex()]/s7:S7ResponseParameterReadVar/numItems
+                            }"/>
+                <xs:element name="item" minOccurs="0" maxOccurs="unbounded"
+                            dfdl:occursCountKind="expression" dfdl:occursCount="{../numItems}">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="returnCode" type="s7:byte"/>
+                            <xs:element name="transportSize" type="s7:byte"/>
+                            <xs:element name="rawLength" type="s7:short"/>
+                            <!--
+                                For some reason the types BIT, BYTE_WORD_DWORD and INTEGER are transferred in "bits",
+                                the rest is transferred in "bytes"
+                            -->
+                            <xs:element name="lengthInBytes" type="s7:short" dfdl:inputValueCalc="{
+                                    xs:unsignedShort(if((../transportSize eq 3) or (../transportSize eq 4) or (../transportSize eq 5))
+                                            then fn:ceiling(xs:double(../rawLength div 8))
+                                            else ../rawLength)}"/>
+                            <xs:element name="data" type="xs:hexBinary"
+                                        dfdl:byteOrder="bigEndian" dfdl:lengthUnits="bytes" dfdl:lengthKind="explicit"
+                                        dfdl:length="{../lengthInBytes}"/>
+                            <!--
+                                Transport sizes: BIT, BYTE_WORD_DWORD and OCTET_STRING require a blank byte.
+                                However only if this is not the last item in the result.
+                            -->
+                            <xs:element name="fillByte" type="s7:byte" minOccurs="0"
+                                        dfdl:occursCountKind="expression" dfdl:occursCount="{
+                                            if(((../lengthInBytes mod 2) eq 1) and
+                                                (dfdl:occursIndex() ne ../../numItems)) then 1 else 0}"/>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="S7RequestPayloadWriteVar">
+        <xs:complexType>
+            <xs:sequence>
+                <!-- The number of items which should be read is transmitted in the matching parameter -->
+                <xs:element name="numItems" type="s7:byte"
+                            dfdl:inputValueCalc="{
+                                ../../../../parameters[1]/parameter[dfdl:occursIndex()]/s7:S7RequestParameterWriteVar/numItems
+                            }"/>
+                <xs:element name="item" minOccurs="0" maxOccurs="unbounded"
+                            dfdl:occursCountKind="expression" dfdl:occursCount="{../numItems}">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="returnCode" type="s7:byte"/>
+                            <xs:element name="transportSize" type="s7:byte"/>
+                            <xs:element name="rawLength" type="s7:short"/>
+                            <!--
+                                For some reason the types BIT, BYTE_WORD_DWORD and INTEGER are transferred in "bits",
+                                the rest is transferred in "bytes"
+                            -->
+                            <xs:element name="lengthInBytes" type="s7:short" dfdl:inputValueCalc="{
+                                    xs:unsignedShort(if((../transportSize eq 3) or (../transportSize eq 4) or (../transportSize eq 5))
+                                            then fn:ceiling(../rawLength div 8)
+                                            else ../rawLength)}"/>
+                            <xs:element name="data" type="xs:hexBinary"
+                                        dfdl:byteOrder="bigEndian" dfdl:lengthUnits="bytes" dfdl:lengthKind="explicit"
+                                        dfdl:length="{../lengthInBytes}"/>
+                            <!--
+                                It seems that the item payload must always be an even number of bytes. So if it's
+                                not an even number, add a fill byte.
+                            -->
+                            <xs:element name="fillByte" type="s7:byte" minOccurs="0"
+                                        dfdl:occursCountKind="expression" dfdl:occursCount="{
+                                            if(((../lengthInBytes mod 2) eq 1) and
+                                                (dfdl:occursIndex() ne ../../numItems)) then 1 else 0}"/>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="S7ResponsePayloadWriteVar">
+        <xs:complexType>
+            <xs:sequence>
+                <!-- The number of items which should be read is transmitted in the matching parameter -->
+                <xs:element name="numItems" type="s7:byte"
+                            dfdl:inputValueCalc="{
+                                ../../../../parameters[1]/parameter[dfdl:occursIndex()]/s7:S7ResponseParameterWriteVar/numItems
+                            }"/>
+                <xs:element name="item" minOccurs="0" maxOccurs="unbounded"
+                            dfdl:occursCountKind="expression" dfdl:occursCount="{../numItems}">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="returnCode" type="s7:byte"/>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
 </xs:schema>
\ No newline at end of file
diff --git a/sandbox/plc-simulator/pom.xml b/sandbox/plc-simulator/pom.xml
index 3ad173126b2..7340e5dec9a 100644
--- a/sandbox/plc-simulator/pom.xml
+++ b/sandbox/plc-simulator/pom.xml
@@ -1,127 +1,127 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.sandbox</groupId>
-    <artifactId>plc4x-sandbox</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc-simulator</artifactId>
-
-  <name>Sandbox: PLC-Simulator</name>
-
-  <build>
-    <plugins>
-      <!-- Generate the code for parsing and serializing S7 packets -->
-      <plugin>
-        <groupId>org.apache.plc4x.plugins</groupId>
-        <artifactId>plc4x-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>generate-driver</goal>
-            </goals>
-            <configuration>
-              <protocolName>s7</protocolName>
-              <languageName>java</languageName>
-              <outputFlavor>read-write</outputFlavor>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- Build a fat jar containing all dependencies -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.1</version>
-        <executions>
-          <execution>
-            <id>generate-uber-jar</id>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <transformers combine.children="append">
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                  <mainClass>org.apache.plc4x.simulator.PlcSimulator</mainClass>
-                </transformer>
-              </transformers>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-utils-driver-base-java</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-all</artifactId>
-      <version>${netty.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-core</artifactId>
-      <scope>compile</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-build-utils-language-java</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-protocols-s7</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.sandbox</groupId>
+    <artifactId>plc4x-sandbox</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc-simulator</artifactId>
+
+  <name>Sandbox: PLC-Simulator</name>
+
+  <build>
+    <plugins>
+      <!-- Generate the code for parsing and serializing S7 packets -->
+      <plugin>
+        <groupId>org.apache.plc4x.plugins</groupId>
+        <artifactId>plc4x-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>generate-driver</goal>
+            </goals>
+            <configuration>
+              <protocolName>s7</protocolName>
+              <languageName>java</languageName>
+              <outputFlavor>read-write</outputFlavor>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- Build a fat jar containing all dependencies -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.2.1</version>
+        <executions>
+          <execution>
+            <id>generate-uber-jar</id>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers combine.children="append">
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>org.apache.plc4x.simulator.PlcSimulator</mainClass>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-utils-driver-base-java</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-all</artifactId>
+      <version>${netty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-build-utils-language-java</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-protocols-s7</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/PlcSimulator.java b/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/PlcSimulator.java
index aa556089532..f44a156338b 100644
--- a/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/PlcSimulator.java
+++ b/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/PlcSimulator.java
@@ -1,118 +1,118 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.simulator;
-
-import org.apache.plc4x.simulator.server.ServerModule;
-import org.apache.plc4x.simulator.simulation.SimulationModule;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Map;
-import java.util.ServiceLoader;
-import java.util.TreeMap;
-import java.util.concurrent.TimeUnit;
-
-public class PlcSimulator {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(PlcSimulator.class);
-
-    private boolean running;
-    private final Map<String, ServerModule> serverModules;
-    private final Map<String, SimulationModule> simulationModules;
-
-    private PlcSimulator() {
-        this(Thread.currentThread().getContextClassLoader());
-    }
-
-    private PlcSimulator(ClassLoader classLoader) {
-
-        // Initialize all the server modules.
-        LOGGER.info("Initializing Server Modules:");
-        serverModules = new TreeMap<>();
-        ServiceLoader<ServerModule> serverModuleLoader = ServiceLoader.load(ServerModule.class, classLoader);
-        for (ServerModule serverModule : serverModuleLoader) {
-            LOGGER.info(String.format("Initializing server module: %s ...", serverModule.getName()));
-            serverModules.put(serverModule.getName(), serverModule);
-            LOGGER.info("Initialized");
-        }
-        LOGGER.info("Finished Initializing Server Modules\n");
-
-        // Initialize all the simulation modules.
-        LOGGER.info("Initializing Simulation Modules:");
-        simulationModules = new TreeMap<>();
-        ServiceLoader<SimulationModule> simulationModuleLoader = ServiceLoader.load(SimulationModule.class, classLoader);
-        for (SimulationModule simulationModule : simulationModuleLoader) {
-            LOGGER.info(String.format("Initializing simulation module: %s ...", simulationModule.getName()));
-            simulationModules.put(simulationModule.getName(), simulationModule);
-            LOGGER.info("Initialized");
-        }
-        LOGGER.info("Finished Initializing Simulation Modules\n");
-
-        running = true;
-    }
-
-    private void stop() {
-        running = false;
-    }
-
-    private void run() throws Exception {
-        // Start all server modules.
-        LOGGER.info("Starting Server Modules:");
-        for (ServerModule serverModule : serverModules.values()) {
-            LOGGER.info(String.format("Starting server module: %s ...", serverModule.getName()));
-            serverModule.start();
-            LOGGER.info("Started");
-        }
-        LOGGER.info("Finished Starting Server Modules\n");
-
-        try {
-            LOGGER.info("Starting simulations ...");
-            while (running) {
-                // Give all the simulation modules the chance to do something.
-                for (SimulationModule simulationModule : simulationModules.values()) {
-                    try {
-                        simulationModule.loop();
-                    } catch(Exception e) {
-                        LOGGER.error("Caught error while executing loop() method of " + simulationModule.getName() +
-                            " simulation.", e);
-                    }
-                }
-                // Sleep 100 ms to not run the simulation too eagerly.
-                TimeUnit.MILLISECONDS.sleep(100);
-            }
-        } finally {
-            LOGGER.info("Simulations ended");
-            // Start all server modules.
-            for (ServerModule serverModule : serverModules.values()) {
-                LOGGER.info(String.format("Stopping server module %s ...", serverModule.getName()));
-                serverModule.stop();
-                LOGGER.info("Stopped");
-            }
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        final PlcSimulator simulator = new PlcSimulator();
-        // Make sure we stop everything correctly.
-        Runtime.getRuntime().addShutdownHook(new Thread(simulator::stop));
-        // Start the simulator.
-        simulator.run();
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.simulator;
+
+import org.apache.plc4x.simulator.server.ServerModule;
+import org.apache.plc4x.simulator.simulation.SimulationModule;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+import java.util.ServiceLoader;
+import java.util.TreeMap;
+import java.util.concurrent.TimeUnit;
+
+public class PlcSimulator {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PlcSimulator.class);
+
+    private boolean running;
+    private final Map<String, ServerModule> serverModules;
+    private final Map<String, SimulationModule> simulationModules;
+
+    private PlcSimulator() {
+        this(Thread.currentThread().getContextClassLoader());
+    }
+
+    private PlcSimulator(ClassLoader classLoader) {
+
+        // Initialize all the server modules.
+        LOGGER.info("Initializing Server Modules:");
+        serverModules = new TreeMap<>();
+        ServiceLoader<ServerModule> serverModuleLoader = ServiceLoader.load(ServerModule.class, classLoader);
+        for (ServerModule serverModule : serverModuleLoader) {
+            LOGGER.info(String.format("Initializing server module: %s ...", serverModule.getName()));
+            serverModules.put(serverModule.getName(), serverModule);
+            LOGGER.info("Initialized");
+        }
+        LOGGER.info("Finished Initializing Server Modules\n");
+
+        // Initialize all the simulation modules.
+        LOGGER.info("Initializing Simulation Modules:");
+        simulationModules = new TreeMap<>();
+        ServiceLoader<SimulationModule> simulationModuleLoader = ServiceLoader.load(SimulationModule.class, classLoader);
+        for (SimulationModule simulationModule : simulationModuleLoader) {
+            LOGGER.info(String.format("Initializing simulation module: %s ...", simulationModule.getName()));
+            simulationModules.put(simulationModule.getName(), simulationModule);
+            LOGGER.info("Initialized");
+        }
+        LOGGER.info("Finished Initializing Simulation Modules\n");
+
+        running = true;
+    }
+
+    private void stop() {
+        running = false;
+    }
+
+    private void run() throws Exception {
+        // Start all server modules.
+        LOGGER.info("Starting Server Modules:");
+        for (ServerModule serverModule : serverModules.values()) {
+            LOGGER.info(String.format("Starting server module: %s ...", serverModule.getName()));
+            serverModule.start();
+            LOGGER.info("Started");
+        }
+        LOGGER.info("Finished Starting Server Modules\n");
+
+        try {
+            LOGGER.info("Starting simulations ...");
+            while (running) {
+                // Give all the simulation modules the chance to do something.
+                for (SimulationModule simulationModule : simulationModules.values()) {
+                    try {
+                        simulationModule.loop();
+                    } catch(Exception e) {
+                        LOGGER.error("Caught error while executing loop() method of " + simulationModule.getName() +
+                            " simulation.", e);
+                    }
+                }
+                // Sleep 100 ms to not run the simulation too eagerly.
+                TimeUnit.MILLISECONDS.sleep(100);
+            }
+        } finally {
+            LOGGER.info("Simulations ended");
+            // Start all server modules.
+            for (ServerModule serverModule : serverModules.values()) {
+                LOGGER.info(String.format("Stopping server module %s ...", serverModule.getName()));
+                serverModule.stop();
+                LOGGER.info("Stopped");
+            }
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        final PlcSimulator simulator = new PlcSimulator();
+        // Make sure we stop everything correctly.
+        Runtime.getRuntime().addShutdownHook(new Thread(simulator::stop));
+        // Start the simulator.
+        simulator.run();
+    }
+
+}
diff --git a/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/ServerModule.java b/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/ServerModule.java
index 41aecac2f95..ad0a8690623 100644
--- a/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/ServerModule.java
+++ b/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/ServerModule.java
@@ -1,32 +1,32 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.simulator.server;
-
-public interface ServerModule {
-
-    /**
-     * @return the name of the server module
-     */
-    String getName();
-
-    void start();
-
-    void stop();
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.simulator.server;
+
+public interface ServerModule {
+
+    /**
+     * @return the name of the server module
+     */
+    String getName();
+
+    void start();
+
+    void stop();
+
+}
diff --git a/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/S7Server.java b/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/S7Server.java
index ca7d8e4c3b2..f4f36755ec3 100644
--- a/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/S7Server.java
+++ b/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/S7Server.java
@@ -1,69 +1,69 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.simulator.server.s7;
-
-import io.netty.bootstrap.ServerBootstrap;
-import io.netty.channel.*;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.channel.socket.nio.NioServerSocketChannel;
-import org.apache.plc4x.simulator.server.s7.protocol.S7Step7Protocol;
-import org.apache.plc4x.simulator.server.s7.protocol.S7Step7ServerProtocol;
-
-public class S7Server {
-
-    private static final int ISO_ON_TCP_PORT = 102;
-
-    private EventLoopGroup loopGroup;
-    private EventLoopGroup workerGroup;
-
-    public void start() throws Exception {
-        if(loopGroup != null) {
-            return;
-        }
-
-        loopGroup = new NioEventLoopGroup();
-        workerGroup = new NioEventLoopGroup();
-
-        ServerBootstrap bootstrap = new ServerBootstrap();
-        bootstrap.group(loopGroup, workerGroup)
-            .channel(NioServerSocketChannel.class)
-            .childHandler(new ChannelInitializer<SocketChannel>() {
-                @Override
-                public void initChannel(SocketChannel channel) {
-                    ChannelPipeline pipeline = channel.pipeline();
-                    pipeline.addLast(new S7Step7Protocol());
-                    pipeline.addLast(new S7Step7ServerProtocol());
-                }
-            }).option(ChannelOption.SO_BACKLOG, 128)
-            .childOption(ChannelOption.SO_KEEPALIVE, true);
-
-        bootstrap.bind(ISO_ON_TCP_PORT).sync();
-    }
-
-    public void stop() {
-        if(workerGroup == null) {
-            return;
-        }
-
-        workerGroup.shutdownGracefully();
-        loopGroup.shutdownGracefully();
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.simulator.server.s7;
+
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.*;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import org.apache.plc4x.simulator.server.s7.protocol.S7Step7Protocol;
+import org.apache.plc4x.simulator.server.s7.protocol.S7Step7ServerProtocol;
+
+public class S7Server {
+
+    private static final int ISO_ON_TCP_PORT = 102;
+
+    private EventLoopGroup loopGroup;
+    private EventLoopGroup workerGroup;
+
+    public void start() throws Exception {
+        if(loopGroup != null) {
+            return;
+        }
+
+        loopGroup = new NioEventLoopGroup();
+        workerGroup = new NioEventLoopGroup();
+
+        ServerBootstrap bootstrap = new ServerBootstrap();
+        bootstrap.group(loopGroup, workerGroup)
+            .channel(NioServerSocketChannel.class)
+            .childHandler(new ChannelInitializer<SocketChannel>() {
+                @Override
+                public void initChannel(SocketChannel channel) {
+                    ChannelPipeline pipeline = channel.pipeline();
+                    pipeline.addLast(new S7Step7Protocol());
+                    pipeline.addLast(new S7Step7ServerProtocol());
+                }
+            }).option(ChannelOption.SO_BACKLOG, 128)
+            .childOption(ChannelOption.SO_KEEPALIVE, true);
+
+        bootstrap.bind(ISO_ON_TCP_PORT).sync();
+    }
+
+    public void stop() {
+        if(workerGroup == null) {
+            return;
+        }
+
+        workerGroup.shutdownGracefully();
+        loopGroup.shutdownGracefully();
+    }
+
+}
diff --git a/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/S7ServerModule.java b/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/S7ServerModule.java
index b06730552a0..a426279cae3 100644
--- a/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/S7ServerModule.java
+++ b/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/S7ServerModule.java
@@ -1,55 +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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.simulator.server.s7;
-
-import org.apache.plc4x.simulator.server.ServerModule;
-
-public class S7ServerModule implements ServerModule {
-
-    private S7Server server;
-
-    public S7ServerModule() {
-        this.server = new S7Server();
-    }
-
-    @Override
-    public String getName() {
-        return "S7-STEP7";
-    }
-
-    @Override
-    public void start() {
-
-        try {
-            server.start();
-        } catch(Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public void stop() {
-        try {
-            server.stop();
-        } catch(Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.simulator.server.s7;
+
+import org.apache.plc4x.simulator.server.ServerModule;
+
+public class S7ServerModule implements ServerModule {
+
+    private S7Server server;
+
+    public S7ServerModule() {
+        this.server = new S7Server();
+    }
+
+    @Override
+    public String getName() {
+        return "S7-STEP7";
+    }
+
+    @Override
+    public void start() {
+
+        try {
+            server.start();
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void stop() {
+        try {
+            server.stop();
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}
diff --git a/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/protocol/S7Step7Protocol.java b/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/protocol/S7Step7Protocol.java
index f79b3bd580d..206ce0fd19b 100644
--- a/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/protocol/S7Step7Protocol.java
+++ b/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/protocol/S7Step7Protocol.java
@@ -1,76 +1,76 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.simulator.server.s7.protocol;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.base.GeneratedDriverByteToMessageCodec;
-import org.apache.plc4x.java.s7.readwrite.TPKTPacket;
-import org.apache.plc4x.java.s7.readwrite.io.TPKTPacketIO;
-import org.apache.plc4x.java.utils.MessageIO;
-import org.apache.plc4x.java.utils.ParseException;
-import org.apache.plc4x.java.utils.ReadBuffer;
-import org.apache.plc4x.java.utils.WriteBuffer;
-
-public class S7Step7Protocol extends GeneratedDriverByteToMessageCodec<TPKTPacket> {
-
-    public S7Step7Protocol() {
-        super(new MessageIO<TPKTPacket, TPKTPacket>() {
-            @Override
-            public TPKTPacket parse(ReadBuffer io) throws ParseException {
-                try {
-                    return TPKTPacketIO.parse(io);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    throw new ParseException("Error parsing message", e);
-                }
-            }
-
-            @Override
-            public void serialize(WriteBuffer io, TPKTPacket value) throws ParseException {
-                try {
-                    TPKTPacketIO.serialize(io, value);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    throw new ParseException("Error serializing message", e);
-                }
-            }
-        });
-    }
-
-    @Override
-    protected int getPacketSize(ByteBuf byteBuf) {
-        if(byteBuf.readableBytes() >= 4) {
-            if (byteBuf.getByte(0) != TPKTPacket.PROTOCOLID) {
-                return -1;
-            }
-            // Byte 1 is a reserved byte set to 0x00
-            return byteBuf.getShort(2);
-        }
-        return -1;
-    }
-
-    @Override
-    protected void removeRestOfCorruptPackage(ByteBuf byteBuf) {
-        while (byteBuf.getUnsignedByte(0) != TPKTPacket.PROTOCOLID) {
-            // Just consume the bytes till the next possible start position.
-            byteBuf.readByte();
-        }
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.simulator.server.s7.protocol;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.base.GeneratedDriverByteToMessageCodec;
+import org.apache.plc4x.java.s7.readwrite.TPKTPacket;
+import org.apache.plc4x.java.s7.readwrite.io.TPKTPacketIO;
+import org.apache.plc4x.java.utils.MessageIO;
+import org.apache.plc4x.java.utils.ParseException;
+import org.apache.plc4x.java.utils.ReadBuffer;
+import org.apache.plc4x.java.utils.WriteBuffer;
+
+public class S7Step7Protocol extends GeneratedDriverByteToMessageCodec<TPKTPacket> {
+
+    public S7Step7Protocol() {
+        super(new MessageIO<TPKTPacket, TPKTPacket>() {
+            @Override
+            public TPKTPacket parse(ReadBuffer io) throws ParseException {
+                try {
+                    return TPKTPacketIO.parse(io);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    throw new ParseException("Error parsing message", e);
+                }
+            }
+
+            @Override
+            public void serialize(WriteBuffer io, TPKTPacket value) throws ParseException {
+                try {
+                    TPKTPacketIO.serialize(io, value);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    throw new ParseException("Error serializing message", e);
+                }
+            }
+        });
+    }
+
+    @Override
+    protected int getPacketSize(ByteBuf byteBuf) {
+        if(byteBuf.readableBytes() >= 4) {
+            if (byteBuf.getByte(0) != TPKTPacket.PROTOCOLID) {
+                return -1;
+            }
+            // Byte 1 is a reserved byte set to 0x00
+            return byteBuf.getShort(2);
+        }
+        return -1;
+    }
+
+    @Override
+    protected void removeRestOfCorruptPackage(ByteBuf byteBuf) {
+        while (byteBuf.getUnsignedByte(0) != TPKTPacket.PROTOCOLID) {
+            // Just consume the bytes till the next possible start position.
+            byteBuf.readByte();
+        }
+    }
+
+}
diff --git a/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/protocol/S7Step7ServerProtocol.java b/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/protocol/S7Step7ServerProtocol.java
index a166538b3d9..4bf5f5b740c 100644
--- a/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/protocol/S7Step7ServerProtocol.java
+++ b/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/protocol/S7Step7ServerProtocol.java
@@ -1,228 +1,228 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.simulator.server.s7.protocol;
-
-import io.netty.channel.*;
-import org.apache.plc4x.java.s7.readwrite.*;
-import org.apache.plc4x.java.s7.readwrite.types.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class S7Step7ServerProtocol extends ChannelInboundHandlerAdapter {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(S7Step7ServerProtocol.class);
-
-    private State state = State.INITIAL;
-
-    // COTP parameters
-    private static final int localReference = 42;
-    private int remoteReference = -1;
-    private COTPProtocolClass protocolClass;
-    private static final int localTsapId = 1;
-    private int remoteTsapId = -1;
-    private static final COTPTpduSize maxTpduSize = COTPTpduSize.SIZE_256;
-    private COTPTpduSize tpduSize;
-    // S7 parameters
-    // Set this to 1 as we don't want to handle stuff in parallel
-    private static final int maxAmqCaller = 1;
-    private int amqCaller;
-    // Set this to 1 as we don't want to handle stuff in parallel
-    private static final int maxAmqCallee = 1;
-    private int amqCallee;
-    private static final int maxPduLength = 240;
-    private int pduLength;
-
-    @Override
-    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-        if(msg instanceof TPKTPacket) {
-            TPKTPacket packet = (TPKTPacket) msg;
-            switch (state) {
-                case INITIAL: {
-                    final COTPPacket cotpPacket = packet.getPayload();
-                    if (!(cotpPacket instanceof COTPPacketConnectionRequest)) {
-                        LOGGER.error("Expecting COTP Connection-Request");
-                        return;
-                    }
-
-                    COTPTpduSize proposedTpduSize = null;
-                    COTPPacketConnectionRequest cotpConnectionRequest = (COTPPacketConnectionRequest) cotpPacket;
-                    for (COTPParameter parameter : cotpConnectionRequest.getParameters()) {
-                        if (parameter instanceof COTPParameterCalledTsap) {
-                            COTPParameterCalledTsap calledTsapParameter = (COTPParameterCalledTsap) parameter;
-                        } else if (parameter instanceof COTPParameterCallingTsap) {
-                            COTPParameterCallingTsap callingTsapParameter = (COTPParameterCallingTsap) parameter;
-                            remoteTsapId = callingTsapParameter.getTsapId();
-                        } else if (parameter instanceof COTPParameterTpduSize) {
-                            COTPParameterTpduSize tpduSizeParameter = (COTPParameterTpduSize) parameter;
-                            proposedTpduSize = tpduSizeParameter.getTpduSize();
-                        } else {
-                            LOGGER.error(
-                                "Unexpected COTP Connection-Request Parameter " + parameter.getClass().getName());
-                            return;
-                        }
-                    }
-
-                    remoteReference = cotpConnectionRequest.getSourceReference();
-                    protocolClass = cotpConnectionRequest.getProtocolClass();
-                    tpduSize = (proposedTpduSize.getSizeInBytes() > maxTpduSize.getSizeInBytes()) ? maxTpduSize : proposedTpduSize;
-
-                    // Prepare a response and send it back to the remote.
-                    COTPParameter[] parameters = new COTPParameter[3];
-                    parameters[0] = new COTPParameterCalledTsap(remoteTsapId);
-                    parameters[1] = new COTPParameterCallingTsap(localTsapId);
-                    parameters[2] = new COTPParameterTpduSize(tpduSize);
-                    COTPPacketConnectionResponse response = new COTPPacketConnectionResponse(
-                        parameters, null, remoteReference, localReference, protocolClass);
-                    ctx.writeAndFlush(new TPKTPacket(response));
-
-                    state = State.COTP_CONNECTED;
-                    break;
-                }
-                case COTP_CONNECTED: {
-                    final COTPPacket cotpPacket = packet.getPayload();
-                    if (!(cotpPacket instanceof COTPPacketData)) {
-                        LOGGER.error("Expecting COTP Data packet");
-                        return;
-                    }
-
-                    COTPPacketData packetData = (COTPPacketData) cotpPacket;
-                    final short cotpTpduRef = packetData.getTpduRef();
-                    final S7Message payload = packetData.getPayload();
-                    if(!(payload instanceof S7MessageRequest)) {
-                        LOGGER.error("Expecting S7 Message Request");
-                        return;
-                    }
-                    S7MessageRequest s7MessageRequest = (S7MessageRequest) payload;
-                    final int s7TpduReference = s7MessageRequest.getTpduReference();
-                    final S7Parameter s7Parameter = s7MessageRequest.getParameter();
-                    if(!(s7Parameter instanceof S7ParameterSetupCommunication)) {
-                        LOGGER.error("Expecting S7 Message Request containing a S7 Setup Communication Parameter");
-                        return;
-                    }
-                    S7ParameterSetupCommunication s7ParameterSetupCommunication =
-                        (S7ParameterSetupCommunication) s7Parameter;
-
-                    amqCaller = Math.min(s7ParameterSetupCommunication.getMaxAmqCaller(), maxAmqCaller);
-                    amqCallee = Math.min(s7ParameterSetupCommunication.getMaxAmqCallee(), maxAmqCallee);
-                    pduLength = Math.min(s7ParameterSetupCommunication.getPduLength(), maxPduLength);
-
-                    S7ParameterSetupCommunication s7ParameterSetupCommunicationResponse =
-                        new S7ParameterSetupCommunication(amqCaller, amqCallee, pduLength);
-                    S7MessageResponse s7MessageResponse = new S7MessageResponse(
-                        s7TpduReference, s7ParameterSetupCommunicationResponse, new S7PayloadSetupCommunication(),
-                        (short) 0, (short) 0);
-                    ctx.writeAndFlush(new TPKTPacket(new COTPPacketData(null, s7MessageResponse, true, cotpTpduRef)));
-
-                    state = State.S7_CONNECTED;
-                    break;
-                }
-                case S7_CONNECTED: {
-                    final COTPPacket cotpPacket = packet.getPayload();
-                    if (!(cotpPacket instanceof COTPPacketData)) {
-                        LOGGER.error("Expecting COTP Data packet");
-                        return;
-                    }
-
-                    COTPPacketData packetData = (COTPPacketData) cotpPacket;
-                    final short cotpTpduRef = packetData.getTpduRef();
-                    final S7Message payload = packetData.getPayload();
-                    if(payload instanceof S7MessageUserData) {
-                        S7MessageUserData s7MessageUserData = (S7MessageUserData) payload;
-                        final int s7TpduReference = s7MessageUserData.getTpduReference();
-                        final S7Parameter s7Parameter = s7MessageUserData.getParameter();
-                        if(s7Parameter instanceof S7ParameterUserData) {
-                            S7ParameterUserData userDataParameter = (S7ParameterUserData) s7Parameter;
-                            for (S7ParameterUserDataItem item : userDataParameter.getItems()) {
-                                if(item instanceof S7ParameterUserDataItemCPUFunctions) {
-                                    S7ParameterUserDataItemCPUFunctions function =
-                                        (S7ParameterUserDataItemCPUFunctions) item;
-                                    final S7PayloadUserData userDataPayload =
-                                        (S7PayloadUserData) s7MessageUserData.getPayload();
-
-                                    for (S7PayloadUserDataItem userDataPayloadItem : userDataPayload.getItems()) {
-                                        if(userDataPayloadItem instanceof S7PayloadUserDataItemCpuFunctionReadSzlRequest) {
-                                            S7PayloadUserDataItemCpuFunctionReadSzlRequest readSzlRequestPayload =
-                                                (S7PayloadUserDataItemCpuFunctionReadSzlRequest) userDataPayloadItem;
-
-                                            final SzlId szlId = readSzlRequestPayload.getSzlId();
-                                            // This is a request to list the type of device
-                                            if((szlId.getTypeClass() == SzlModuleTypeClass.CPU) &&
-                                                (szlId.getSublistList() == SzlSublist.MODULE_IDENTIFICATION)) {
-
-                                                S7ParameterUserDataItemCPUFunctions readSzlResponseParameter =
-                                                    new S7ParameterUserDataItemCPUFunctions((short) 0x12,
-                                                        (byte) 0x08, function.getCpuFunctionGroup(),
-                                                        function.getCpuSubfunction(), (short) 1,
-                                                        (short) 0, (short) 0, 0);
-
-                                                SzlDataTreeItem[] items = new SzlDataTreeItem[1];
-                                                items[0] = new SzlDataTreeItem((short) 0x0001,
-                                                    "6ES7 212-1BD30-0XB0 ".getBytes(), 0x2020, 0x0001, 0x2020);
-
-                                                S7PayloadUserDataItemCpuFunctionReadSzlResponse readSzlResponsePayload =
-                                                    new S7PayloadUserDataItemCpuFunctionReadSzlResponse(
-                                                        (short) 0xFF, DataTransportSize.OCTET_STRING, szlId,
-                                                        readSzlRequestPayload.getSzlIndex(), items);
-
-                                                S7ParameterUserDataItem[] responseParameterItems =
-                                                    new S7ParameterUserDataItem[1];
-                                                responseParameterItems[0] = readSzlResponseParameter;
-                                                S7ParameterUserData responseParameterUserData =
-                                                    new S7ParameterUserData(responseParameterItems);
-
-                                                S7PayloadUserDataItem[] responsePayloadItems =
-                                                    new S7PayloadUserDataItem[1];
-                                                responsePayloadItems[0] = readSzlResponsePayload;
-                                                S7PayloadUserData responsePayloadUserData =
-                                                    new S7PayloadUserData(responsePayloadItems);
-
-                                                S7Message s7ResponseMessage = new S7MessageUserData(s7TpduReference,
-                                                    responseParameterUserData, responsePayloadUserData);
-                                                ctx.writeAndFlush(new TPKTPacket(new COTPPacketData(null, s7ResponseMessage, true, cotpTpduRef)));
-                                            } else {
-                                                LOGGER.error("Not able to respond to the given request Read SZL with SZL type class " +
-                                                    szlId.getTypeClass().name() + " and SZL sublise " + szlId.getSublistList().name());
-                                            }
-
-                                        }
-                                    }
-                                }
-                            }
-                        } else {
-                            LOGGER.error("Unsupported type of S7MessageUserData parameter " +
-                                s7Parameter.getClass().getName());
-                            return;
-                        }
-                    } else {
-                        LOGGER.error("Unsupported type of message " + payload.getClass().getName());
-                        return;
-                    }
-                    break;
-                }
-            }
-        }
-    }
-
-    private enum State {
-        INITIAL,
-        COTP_CONNECTED,
-        S7_CONNECTED
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.simulator.server.s7.protocol;
+
+import io.netty.channel.*;
+import org.apache.plc4x.java.s7.readwrite.*;
+import org.apache.plc4x.java.s7.readwrite.types.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class S7Step7ServerProtocol extends ChannelInboundHandlerAdapter {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(S7Step7ServerProtocol.class);
+
+    private State state = State.INITIAL;
+
+    // COTP parameters
+    private static final int localReference = 42;
+    private int remoteReference = -1;
+    private COTPProtocolClass protocolClass;
+    private static final int localTsapId = 1;
+    private int remoteTsapId = -1;
+    private static final COTPTpduSize maxTpduSize = COTPTpduSize.SIZE_256;
+    private COTPTpduSize tpduSize;
+    // S7 parameters
+    // Set this to 1 as we don't want to handle stuff in parallel
+    private static final int maxAmqCaller = 1;
+    private int amqCaller;
+    // Set this to 1 as we don't want to handle stuff in parallel
+    private static final int maxAmqCallee = 1;
+    private int amqCallee;
+    private static final int maxPduLength = 240;
+    private int pduLength;
+
+    @Override
+    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+        if(msg instanceof TPKTPacket) {
+            TPKTPacket packet = (TPKTPacket) msg;
+            switch (state) {
+                case INITIAL: {
+                    final COTPPacket cotpPacket = packet.getPayload();
+                    if (!(cotpPacket instanceof COTPPacketConnectionRequest)) {
+                        LOGGER.error("Expecting COTP Connection-Request");
+                        return;
+                    }
+
+                    COTPTpduSize proposedTpduSize = null;
+                    COTPPacketConnectionRequest cotpConnectionRequest = (COTPPacketConnectionRequest) cotpPacket;
+                    for (COTPParameter parameter : cotpConnectionRequest.getParameters()) {
+                        if (parameter instanceof COTPParameterCalledTsap) {
+                            COTPParameterCalledTsap calledTsapParameter = (COTPParameterCalledTsap) parameter;
+                        } else if (parameter instanceof COTPParameterCallingTsap) {
+                            COTPParameterCallingTsap callingTsapParameter = (COTPParameterCallingTsap) parameter;
+                            remoteTsapId = callingTsapParameter.getTsapId();
+                        } else if (parameter instanceof COTPParameterTpduSize) {
+                            COTPParameterTpduSize tpduSizeParameter = (COTPParameterTpduSize) parameter;
+                            proposedTpduSize = tpduSizeParameter.getTpduSize();
+                        } else {
+                            LOGGER.error(
+                                "Unexpected COTP Connection-Request Parameter " + parameter.getClass().getName());
+                            return;
+                        }
+                    }
+
+                    remoteReference = cotpConnectionRequest.getSourceReference();
+                    protocolClass = cotpConnectionRequest.getProtocolClass();
+                    tpduSize = (proposedTpduSize.getSizeInBytes() > maxTpduSize.getSizeInBytes()) ? maxTpduSize : proposedTpduSize;
+
+                    // Prepare a response and send it back to the remote.
+                    COTPParameter[] parameters = new COTPParameter[3];
+                    parameters[0] = new COTPParameterCalledTsap(remoteTsapId);
+                    parameters[1] = new COTPParameterCallingTsap(localTsapId);
+                    parameters[2] = new COTPParameterTpduSize(tpduSize);
+                    COTPPacketConnectionResponse response = new COTPPacketConnectionResponse(
+                        parameters, null, remoteReference, localReference, protocolClass);
+                    ctx.writeAndFlush(new TPKTPacket(response));
+
+                    state = State.COTP_CONNECTED;
+                    break;
+                }
+                case COTP_CONNECTED: {
+                    final COTPPacket cotpPacket = packet.getPayload();
+                    if (!(cotpPacket instanceof COTPPacketData)) {
+                        LOGGER.error("Expecting COTP Data packet");
+                        return;
+                    }
+
+                    COTPPacketData packetData = (COTPPacketData) cotpPacket;
+                    final short cotpTpduRef = packetData.getTpduRef();
+                    final S7Message payload = packetData.getPayload();
+                    if(!(payload instanceof S7MessageRequest)) {
+                        LOGGER.error("Expecting S7 Message Request");
+                        return;
+                    }
+                    S7MessageRequest s7MessageRequest = (S7MessageRequest) payload;
+                    final int s7TpduReference = s7MessageRequest.getTpduReference();
+                    final S7Parameter s7Parameter = s7MessageRequest.getParameter();
+                    if(!(s7Parameter instanceof S7ParameterSetupCommunication)) {
+                        LOGGER.error("Expecting S7 Message Request containing a S7 Setup Communication Parameter");
+                        return;
+                    }
+                    S7ParameterSetupCommunication s7ParameterSetupCommunication =
+                        (S7ParameterSetupCommunication) s7Parameter;
+
+                    amqCaller = Math.min(s7ParameterSetupCommunication.getMaxAmqCaller(), maxAmqCaller);
+                    amqCallee = Math.min(s7ParameterSetupCommunication.getMaxAmqCallee(), maxAmqCallee);
+                    pduLength = Math.min(s7ParameterSetupCommunication.getPduLength(), maxPduLength);
+
+                    S7ParameterSetupCommunication s7ParameterSetupCommunicationResponse =
+                        new S7ParameterSetupCommunication(amqCaller, amqCallee, pduLength);
+                    S7MessageResponse s7MessageResponse = new S7MessageResponse(
+                        s7TpduReference, s7ParameterSetupCommunicationResponse, new S7PayloadSetupCommunication(),
+                        (short) 0, (short) 0);
+                    ctx.writeAndFlush(new TPKTPacket(new COTPPacketData(null, s7MessageResponse, true, cotpTpduRef)));
+
+                    state = State.S7_CONNECTED;
+                    break;
+                }
+                case S7_CONNECTED: {
+                    final COTPPacket cotpPacket = packet.getPayload();
+                    if (!(cotpPacket instanceof COTPPacketData)) {
+                        LOGGER.error("Expecting COTP Data packet");
+                        return;
+                    }
+
+                    COTPPacketData packetData = (COTPPacketData) cotpPacket;
+                    final short cotpTpduRef = packetData.getTpduRef();
+                    final S7Message payload = packetData.getPayload();
+                    if(payload instanceof S7MessageUserData) {
+                        S7MessageUserData s7MessageUserData = (S7MessageUserData) payload;
+                        final int s7TpduReference = s7MessageUserData.getTpduReference();
+                        final S7Parameter s7Parameter = s7MessageUserData.getParameter();
+                        if(s7Parameter instanceof S7ParameterUserData) {
+                            S7ParameterUserData userDataParameter = (S7ParameterUserData) s7Parameter;
+                            for (S7ParameterUserDataItem item : userDataParameter.getItems()) {
+                                if(item instanceof S7ParameterUserDataItemCPUFunctions) {
+                                    S7ParameterUserDataItemCPUFunctions function =
+                                        (S7ParameterUserDataItemCPUFunctions) item;
+                                    final S7PayloadUserData userDataPayload =
+                                        (S7PayloadUserData) s7MessageUserData.getPayload();
+
+                                    for (S7PayloadUserDataItem userDataPayloadItem : userDataPayload.getItems()) {
+                                        if(userDataPayloadItem instanceof S7PayloadUserDataItemCpuFunctionReadSzlRequest) {
+                                            S7PayloadUserDataItemCpuFunctionReadSzlRequest readSzlRequestPayload =
+                                                (S7PayloadUserDataItemCpuFunctionReadSzlRequest) userDataPayloadItem;
+
+                                            final SzlId szlId = readSzlRequestPayload.getSzlId();
+                                            // This is a request to list the type of device
+                                            if((szlId.getTypeClass() == SzlModuleTypeClass.CPU) &&
+                                                (szlId.getSublistList() == SzlSublist.MODULE_IDENTIFICATION)) {
+
+                                                S7ParameterUserDataItemCPUFunctions readSzlResponseParameter =
+                                                    new S7ParameterUserDataItemCPUFunctions((short) 0x12,
+                                                        (byte) 0x08, function.getCpuFunctionGroup(),
+                                                        function.getCpuSubfunction(), (short) 1,
+                                                        (short) 0, (short) 0, 0);
+
+                                                SzlDataTreeItem[] items = new SzlDataTreeItem[1];
+                                                items[0] = new SzlDataTreeItem((short) 0x0001,
+                                                    "6ES7 212-1BD30-0XB0 ".getBytes(), 0x2020, 0x0001, 0x2020);
+
+                                                S7PayloadUserDataItemCpuFunctionReadSzlResponse readSzlResponsePayload =
+                                                    new S7PayloadUserDataItemCpuFunctionReadSzlResponse(
+                                                        (short) 0xFF, DataTransportSize.OCTET_STRING, szlId,
+                                                        readSzlRequestPayload.getSzlIndex(), items);
+
+                                                S7ParameterUserDataItem[] responseParameterItems =
+                                                    new S7ParameterUserDataItem[1];
+                                                responseParameterItems[0] = readSzlResponseParameter;
+                                                S7ParameterUserData responseParameterUserData =
+                                                    new S7ParameterUserData(responseParameterItems);
+
+                                                S7PayloadUserDataItem[] responsePayloadItems =
+                                                    new S7PayloadUserDataItem[1];
+                                                responsePayloadItems[0] = readSzlResponsePayload;
+                                                S7PayloadUserData responsePayloadUserData =
+                                                    new S7PayloadUserData(responsePayloadItems);
+
+                                                S7Message s7ResponseMessage = new S7MessageUserData(s7TpduReference,
+                                                    responseParameterUserData, responsePayloadUserData);
+                                                ctx.writeAndFlush(new TPKTPacket(new COTPPacketData(null, s7ResponseMessage, true, cotpTpduRef)));
+                                            } else {
+                                                LOGGER.error("Not able to respond to the given request Read SZL with SZL type class " +
+                                                    szlId.getTypeClass().name() + " and SZL sublise " + szlId.getSublistList().name());
+                                            }
+
+                                        }
+                                    }
+                                }
+                            }
+                        } else {
+                            LOGGER.error("Unsupported type of S7MessageUserData parameter " +
+                                s7Parameter.getClass().getName());
+                            return;
+                        }
+                    } else {
+                        LOGGER.error("Unsupported type of message " + payload.getClass().getName());
+                        return;
+                    }
+                    break;
+                }
+            }
+        }
+    }
+
+    private enum State {
+        INITIAL,
+        COTP_CONNECTED,
+        S7_CONNECTED
+    }
+
+}
diff --git a/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/simulation/SimulationModule.java b/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/simulation/SimulationModule.java
index f08b08240c6..d70eb96f171 100644
--- a/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/simulation/SimulationModule.java
+++ b/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/simulation/SimulationModule.java
@@ -1,43 +1,43 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.simulator.simulation;
-
-import java.util.Map;
-
-public interface SimulationModule {
-
-    /**
-     * @return the name of the simulation module
-     */
-    String getName();
-
-    /**
-     * Gives access to the internal simulations context.
-     * This is an immutable map of named properties that should contain only simple data-types.
-     * @return reference to the simulations context
-     */
-    Map<String, Object> getContext();
-
-    /**
-     * Method for doing the actual processing inside the simulation.
-     * In this method the simulation can do calculations and update it's context variables.
-     */
-    void loop();
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.simulator.simulation;
+
+import java.util.Map;
+
+public interface SimulationModule {
+
+    /**
+     * @return the name of the simulation module
+     */
+    String getName();
+
+    /**
+     * Gives access to the internal simulations context.
+     * This is an immutable map of named properties that should contain only simple data-types.
+     * @return reference to the simulations context
+     */
+    Map<String, Object> getContext();
+
+    /**
+     * Method for doing the actual processing inside the simulation.
+     * In this method the simulation can do calculations and update it's context variables.
+     */
+    void loop();
+
+}
diff --git a/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/simulation/watertank/WaterTankSimulationModule.java b/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/simulation/watertank/WaterTankSimulationModule.java
index 8b5ba9c7817..a88f5c24217 100644
--- a/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/simulation/watertank/WaterTankSimulationModule.java
+++ b/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/simulation/watertank/WaterTankSimulationModule.java
@@ -1,60 +1,60 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.simulator.simulation.watertank;
-
-import org.apache.plc4x.simulator.simulation.SimulationModule;
-
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.concurrent.TimeUnit;
-
-public class WaterTankSimulationModule implements SimulationModule {
-
-    private static final String PROP_WATER_LEVEL = "waterLevel";
-
-    private final Map<String, Object> context;
-
-    public WaterTankSimulationModule() {
-        context = new TreeMap<>();
-        context.put(PROP_WATER_LEVEL, 0);
-    }
-
-    @Override
-    public String getName() {
-        return "Water Tank";
-    }
-
-    @Override
-    public Map<String, Object> getContext() {
-        return context;
-    }
-
-    @Override
-    public void loop() {
-        // TODO: Do something sensible ;-)
-        try {
-            // Just increase the level by 1 (Whatever this means ...
-            context.put(PROP_WATER_LEVEL, ((Integer) context.get(PROP_WATER_LEVEL)) + 1);
-            TimeUnit.MILLISECONDS.sleep(100);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.simulator.simulation.watertank;
+
+import org.apache.plc4x.simulator.simulation.SimulationModule;
+
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.concurrent.TimeUnit;
+
+public class WaterTankSimulationModule implements SimulationModule {
+
+    private static final String PROP_WATER_LEVEL = "waterLevel";
+
+    private final Map<String, Object> context;
+
+    public WaterTankSimulationModule() {
+        context = new TreeMap<>();
+        context.put(PROP_WATER_LEVEL, 0);
+    }
+
+    @Override
+    public String getName() {
+        return "Water Tank";
+    }
+
+    @Override
+    public Map<String, Object> getContext() {
+        return context;
+    }
+
+    @Override
+    public void loop() {
+        // TODO: Do something sensible ;-)
+        try {
+            // Just increase the level by 1 (Whatever this means ...
+            context.put(PROP_WATER_LEVEL, ((Integer) context.get(PROP_WATER_LEVEL)) + 1);
+            TimeUnit.MILLISECONDS.sleep(100);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
+}
diff --git a/sandbox/plc-simulator/src/main/resources/META-INF/services/org.apache.plc4x.simulator.server.ServerModule b/sandbox/plc-simulator/src/main/resources/META-INF/services/org.apache.plc4x.simulator.server.ServerModule
index 9392a75fa21..efbd37760e5 100644
--- a/sandbox/plc-simulator/src/main/resources/META-INF/services/org.apache.plc4x.simulator.server.ServerModule
+++ b/sandbox/plc-simulator/src/main/resources/META-INF/services/org.apache.plc4x.simulator.server.ServerModule
@@ -1,20 +1,20 @@
-#
-# 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
-#
-#   http://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.
-#
-
+#
+# 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
+#
+#   http://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.
+#
+
 org.apache.plc4x.simulator.server.s7.S7ServerModule
\ No newline at end of file
diff --git a/sandbox/plc-simulator/src/main/resources/META-INF/services/org.apache.plc4x.simulator.simulation.SimulationModule b/sandbox/plc-simulator/src/main/resources/META-INF/services/org.apache.plc4x.simulator.simulation.SimulationModule
index bb5db94b69e..c384d78c060 100644
--- a/sandbox/plc-simulator/src/main/resources/META-INF/services/org.apache.plc4x.simulator.simulation.SimulationModule
+++ b/sandbox/plc-simulator/src/main/resources/META-INF/services/org.apache.plc4x.simulator.simulation.SimulationModule
@@ -1,20 +1,20 @@
-#
-# 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
-#
-#   http://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.
-#
-
+#
+# 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
+#
+#   http://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.
+#
+
 org.apache.plc4x.simulator.simulation.watertank.WaterTankSimulationModule
\ No newline at end of file
diff --git a/sandbox/plc-simulator/src/main/resources/logback.xml b/sandbox/plc-simulator/src/main/resources/logback.xml
index 27d40c0c608..514ad8a176b 100644
--- a/sandbox/plc-simulator/src/main/resources/logback.xml
+++ b/sandbox/plc-simulator/src/main/resources/logback.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-      http://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.
-
--->
-<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoders are assigned the type
-         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="info">
-    <appender-ref ref="STDOUT" />
-  </root>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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
+
+      http://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.
+
+-->
+<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="http://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="info">
+    <appender-ref ref="STDOUT" />
+  </root>
+
 </configuration>
\ No newline at end of file
diff --git a/sandbox/plc4cpp/CMakeLists.txt b/sandbox/plc4cpp/CMakeLists.txt
index 938bd68655a..ef080021a99 100644
--- a/sandbox/plc4cpp/CMakeLists.txt
+++ b/sandbox/plc4cpp/CMakeLists.txt
@@ -1,60 +1,60 @@
-#[[
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://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.
-]]
-
-cmake_minimum_required(VERSION 3.7)
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-
-# Save the root directory
-set(PLC4CPP_ROOT_DIR ${CMAKE_SOURCE_DIR})
-# Define some user-defined profiles
-set(WITH_PROXIES OFF CACHE BOOL "Enable building Thrift based proxy driver")
-
-# Tell the tooling where to find our Boost installation
-set(BOOST_INCLUDEDIR "${PLC4CPP_ROOT_DIR}/target/lib/boost/include")
-set(BOOST_LIBRARYDIR "${PLC4CPP_ROOT_DIR}/target/lib/boost/lib")
-
-# Disable usage of Boost-CMake
-set(Boost_NO_BOOST_CMAKE ON)
-# Force CMake to use the boost version provided in BOOST_ROOT
-set(Boost_NO_SYSTEM_PATHS ON)
-set(Boost_USE_STATIC_LIBS ON)
-set(Boost_USE_MULTITHREADED ON)
-set(Boost_ARCHITECTURE "-x64")
-
-# Ensure the listed modules are found and environment variables for boost are set.
-find_package(Boost COMPONENTS thread date_time system regex log)
-
-# Trace all CMAKE Variables
-get_cmake_property(_variableNames VARIABLES)
-list (SORT _variableNames)
-foreach (_variableName ${_variableNames})
-    message(STATUS "${_variableName}=${${_variableName}}")
-endforeach()
-
-#[[
-    Build all the modules of PLC4Cpp
-]]
-add_subdirectory(api)
-add_subdirectory(protocols)
-add_subdirectory(drivers)
-add_subdirectory(utils)
+#[[
+  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
+
+      http://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.
+]]
+
+cmake_minimum_required(VERSION 3.7)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+# Save the root directory
+set(PLC4CPP_ROOT_DIR ${CMAKE_SOURCE_DIR})
+# Define some user-defined profiles
+set(WITH_PROXIES OFF CACHE BOOL "Enable building Thrift based proxy driver")
+
+# Tell the tooling where to find our Boost installation
+set(BOOST_INCLUDEDIR "${PLC4CPP_ROOT_DIR}/target/lib/boost/include")
+set(BOOST_LIBRARYDIR "${PLC4CPP_ROOT_DIR}/target/lib/boost/lib")
+
+# Disable usage of Boost-CMake
+set(Boost_NO_BOOST_CMAKE ON)
+# Force CMake to use the boost version provided in BOOST_ROOT
+set(Boost_NO_SYSTEM_PATHS ON)
+set(Boost_USE_STATIC_LIBS ON)
+set(Boost_USE_MULTITHREADED ON)
+set(Boost_ARCHITECTURE "-x64")
+
+# Ensure the listed modules are found and environment variables for boost are set.
+find_package(Boost COMPONENTS thread date_time system regex log)
+
+# Trace all CMAKE Variables
+get_cmake_property(_variableNames VARIABLES)
+list (SORT _variableNames)
+foreach (_variableName ${_variableNames})
+    message(STATUS "${_variableName}=${${_variableName}}")
+endforeach()
+
+#[[
+    Build all the modules of PLC4Cpp
+]]
+add_subdirectory(api)
+add_subdirectory(protocols)
+add_subdirectory(drivers)
+add_subdirectory(utils)
 add_subdirectory(examples)
\ No newline at end of file
diff --git a/sandbox/plc4cpp/README.md b/sandbox/plc4cpp/README.md
index 3a9c0002096..eeaeb946f57 100644
--- a/sandbox/plc4cpp/README.md
+++ b/sandbox/plc4cpp/README.md
@@ -1,47 +1,47 @@
-<!--
-
-  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
-
-      http://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.
-
--->
-# Building PLC4CPP
-
-On mac and linux machines there should not be a requirement to install any prerequisites.
-In general the build requires `gcc` being installed.
-
-On Windows machines, you might need to install it manually.
-He have tested everything with the bundle of 
-http://win-builds.org/doku.php/download_and_installation_from_windows
-When running the installer, make sure to select the options:
-- Native Windows
-- x86_64
-Not quite sure which elements are really needed, better just install all of them.
-Make sure the `bin` directory containing the executable `mingw32-make.exe` is on your systems `PATH`.
-
-## Building PLC4CPP in Visual Studio
-
-1. Open Visual Studio (Tested with 2017 and 2019)
-2. Open Local Directory
-3. Select the `plc4cpp` subdirectory
-4. Wait till the IDE is ready (little icon in the lower left corner)
-5. Build everything by selecting the menu `Build/Build All` (or similar)
-
-## Building PLC4CPP in CLion
-
-1. Open CLion
-2. Open Local Directory
-3. Select the `plc4cpp` subdirectory
-4. Wait till the IDE is ready (little icon in the lower center)
+<!--
+
+  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
+
+      http://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.
+
+-->
+# Building PLC4CPP
+
+On mac and linux machines there should not be a requirement to install any prerequisites.
+In general the build requires `gcc` being installed.
+
+On Windows machines, you might need to install it manually.
+He have tested everything with the bundle of 
+http://win-builds.org/doku.php/download_and_installation_from_windows
+When running the installer, make sure to select the options:
+- Native Windows
+- x86_64
+Not quite sure which elements are really needed, better just install all of them.
+Make sure the `bin` directory containing the executable `mingw32-make.exe` is on your systems `PATH`.
+
+## Building PLC4CPP in Visual Studio
+
+1. Open Visual Studio (Tested with 2017 and 2019)
+2. Open Local Directory
+3. Select the `plc4cpp` subdirectory
+4. Wait till the IDE is ready (little icon in the lower left corner)
+5. Build everything by selecting the menu `Build/Build All` (or similar)
+
+## Building PLC4CPP in CLion
+
+1. Open CLion
+2. Open Local Directory
+3. Select the `plc4cpp` subdirectory
+4. Wait till the IDE is ready (little icon in the lower center)
 5. Build everything by selecting the menu `Build/Build All in Debug` (or similar)
\ No newline at end of file
diff --git a/sandbox/plc4cpp/api/CMakeLists.txt b/sandbox/plc4cpp/api/CMakeLists.txt
index a3260ab3d68..8bb217fa6cd 100644
--- a/sandbox/plc4cpp/api/CMakeLists.txt
+++ b/sandbox/plc4cpp/api/CMakeLists.txt
@@ -1,71 +1,71 @@
-#[[
-  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
-
-      http://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.
-]]
-
-add_library(plc4cpp-api
-        src/main/cpp/org/apache/plc4x/cpp/PlcDriverManager.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/PlcConnection.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcAuthentication.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcUsernamePasswordAuthentication.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcConnectionException.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcException.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcFieldRangeException.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIncompatibleDatatypeException.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcInvalidFieldException.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIoException.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcNotImplementedException.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolException.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolPayloadTooBigException.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcRuntimeException.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcTimeoutException.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedDataTypeException.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedOperationException.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcFieldRequest.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcFieldResponse.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcMessage.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequest.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadResponse.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcRequest.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcRequestBuilder.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcResponse.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionEvent.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionRequest.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionResponse.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcUnsubscriptionRequest.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcUnsubscriptionResponse.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcWriteRequest.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcWriteResponse.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/messages/REQUEST.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/messages/RequestTemplate.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/messages/RESPONSE.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/messages/ResponseTemplate.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/metadata/PlcConnectionMetadata.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/model/Consumer.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/model/PlcConsumerRegistration.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/model/PlcField.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/model/PlcSubscriptionHandle.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/types/PlcClientDataType.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/types/PlcResponseCode.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/types/PlcSubscriptionType.cpp
-        src/main/cpp/org/apache/plc4x/cpp/api/types/ValueTypeObject.cpp
-        )
-
-target_include_directories (plc4cpp-api PUBLIC ${Boost_INCLUDE_DIRS})
-target_include_directories (plc4cpp-api PUBLIC ../utils/logger/src/main/cpp)
-
+#[[
+  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
+
+      http://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.
+]]
+
+add_library(plc4cpp-api
+        src/main/cpp/org/apache/plc4x/cpp/PlcDriverManager.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/PlcConnection.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcAuthentication.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcUsernamePasswordAuthentication.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcConnectionException.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcException.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcFieldRangeException.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIncompatibleDatatypeException.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcInvalidFieldException.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIoException.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcNotImplementedException.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolException.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolPayloadTooBigException.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcRuntimeException.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcTimeoutException.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedDataTypeException.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedOperationException.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcFieldRequest.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcFieldResponse.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcMessage.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequest.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadResponse.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcRequest.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcRequestBuilder.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcResponse.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionEvent.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionRequest.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionResponse.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcUnsubscriptionRequest.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcUnsubscriptionResponse.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcWriteRequest.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcWriteResponse.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/messages/REQUEST.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/messages/RequestTemplate.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/messages/RESPONSE.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/messages/ResponseTemplate.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/metadata/PlcConnectionMetadata.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/model/Consumer.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/model/PlcConsumerRegistration.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/model/PlcField.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/model/PlcSubscriptionHandle.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/types/PlcClientDataType.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/types/PlcResponseCode.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/types/PlcSubscriptionType.cpp
+        src/main/cpp/org/apache/plc4x/cpp/api/types/ValueTypeObject.cpp
+        )
+
+target_include_directories (plc4cpp-api PUBLIC ${Boost_INCLUDE_DIRS})
+target_include_directories (plc4cpp-api PUBLIC ../utils/logger/src/main/cpp)
+
 target_link_libraries (plc4cpp-api ${CMAKE_DL_LIBS})
\ No newline at end of file
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/PlcConnection.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/PlcConnection.cpp
index 1c9380fda59..b26b336e220 100644
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/PlcConnection.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/PlcConnection.cpp
@@ -1,82 +1,82 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
- 
-#include "PlcConnection.h"
-#include "Logger.h"
-
-org.apache.plc4x.java.api
-
-namespace org
-{
-  namespace apache
-  {
-    namespace plc4x
-    {
-	    namespace cpp
-	    {
-			namespace api
-			{
-
-				PlcConnection::PlcConnection() :
-					_bOpen(false),
-					_pSendBuffer(NULL),
-					_pRecvBuffer(NULL),
-					_iSendBufferSize(0),
-					_iRecvBufferSize(0),
-				{
-					setSendBufferSize(DEFAULT_BUFFER_SIZE);
-					setRecvBufferSize(DEFAULT_BUFFER_SIZE);
-					_strErrorMessage = "";
-				}
-
-				PlcConnection::~PlcConnection()
-				{
-					if (_pSendBuffer != NULL) delete[] _pSendBuffer;
-					if (_pRecvBuffer != NULL) delete[] _pRecvBuffer;
-				}
-
-				PlcField PlcConnection::prepareField(String fieldQuery) throws PlcInvalidFieldException 
-				{
-						BOOST_THROW_EXCEPTION(PlcRuntimeException("Parse method is not implemented for this connection / driver"));
-				}
-				
-				void PlcConnection::setSendBufferSize(int iBufferSize)
-				{
-					if (iBlockSize != _iSendBufferSize)
-					{
-						_iSendBufferSize = iBlockSize;
-						if (_pSendBuffer != NULL) delete[] _pSendBuffer;
-						_pSendBuffer = new unsigned char[_iBlockSizeSend];
-					}
-				}
-
-				void PlcConnection::setRecvBufferSize(int iBufferSize)
-				{
-					if (iBlockSize != _iRecvBufferSize)
-					{
-						_iRecvBufferSize = iBufferSize;
-						if (_pRecvBuffer != NULL) delete[] _pRecvBuffer;
-						_pRecvBuffer = new unsigned char[_iBlockSizeReceive];
-					}
-				}
-			}
-	    }
-    }
-  }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+ 
+#include "PlcConnection.h"
+#include "Logger.h"
+
+org.apache.plc4x.java.api
+
+namespace org
+{
+  namespace apache
+  {
+    namespace plc4x
+    {
+	    namespace cpp
+	    {
+			namespace api
+			{
+
+				PlcConnection::PlcConnection() :
+					_bOpen(false),
+					_pSendBuffer(NULL),
+					_pRecvBuffer(NULL),
+					_iSendBufferSize(0),
+					_iRecvBufferSize(0),
+				{
+					setSendBufferSize(DEFAULT_BUFFER_SIZE);
+					setRecvBufferSize(DEFAULT_BUFFER_SIZE);
+					_strErrorMessage = "";
+				}
+
+				PlcConnection::~PlcConnection()
+				{
+					if (_pSendBuffer != NULL) delete[] _pSendBuffer;
+					if (_pRecvBuffer != NULL) delete[] _pRecvBuffer;
+				}
+
+				PlcField PlcConnection::prepareField(String fieldQuery) throws PlcInvalidFieldException 
+				{
+						BOOST_THROW_EXCEPTION(PlcRuntimeException("Parse method is not implemented for this connection / driver"));
+				}
+				
+				void PlcConnection::setSendBufferSize(int iBufferSize)
+				{
+					if (iBlockSize != _iSendBufferSize)
+					{
+						_iSendBufferSize = iBlockSize;
+						if (_pSendBuffer != NULL) delete[] _pSendBuffer;
+						_pSendBuffer = new unsigned char[_iBlockSizeSend];
+					}
+				}
+
+				void PlcConnection::setRecvBufferSize(int iBufferSize)
+				{
+					if (iBlockSize != _iRecvBufferSize)
+					{
+						_iRecvBufferSize = iBufferSize;
+						if (_pRecvBuffer != NULL) delete[] _pRecvBuffer;
+						_pRecvBuffer = new unsigned char[_iBlockSizeReceive];
+					}
+				}
+			}
+	    }
+    }
+  }
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/PlcConnection.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/PlcConnection.h
index 26d6c793556..b2b8a9946f9 100644
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/PlcConnection.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/PlcConnection.h
@@ -1,169 +1,169 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-#ifndef _PLC_CONNECTION
-#define _PLC_CONNECTION
-
-#include <org/apache/plc4x/cpp/api/metadata/PlcConnectionMetadata.h>
-#include <org/apache/plc4x/cpp/api/messages/PlcReadRequest.h>
-#include <org/apache/plc4x/cpp/api/messages/PlcWriteRequest.h>
-#include <org/apache/plc4x/cpp/api/messages/PlcSubscriptionRequest.h>
-#include <org/apache/plc4x/cpp/api/messages/PlcUnsubscriptionRequest.h>
-
-#include <org/apache/plc4x/cpp/utils/logger/DatDmp.h>
-
-#include <boost/signals2.hpp>
-#include <memory>
-
-#define DEFAULT_BUFFER_SIZE	16384
-
-namespace org
-{
-  namespace apache
-  {
-    namespace plc4x
-    {
-	    namespace cpp
-	    {
-			namespace api
-			{
-                using namespace org::apache::plc4x::cpp::api::metadata;
-                using namespace org::apache::plc4x::cpp::api::messages;
-                using namespace org::apache::plc4x::cpp::utils;
-
-				/**
-				* Interface defining the most basic methods a PLC4X connection should support.
-				* This generally handles the connection establishment itself and the parsing of
-				* field address strings to the platform dependent PlcField instances.
-				*/
-                class Message
-                {
-                public:
-                    vector<char> vecBuffer;
-                };
-
-                typedef shared_ptr<Message> type_shpMessage;
-
-                typedef  boost::signals2::signal<void(type_shpMessage)>    type_sigConMessage;
-                typedef  boost::signals2::signal<void(std::exception&)>     type_sigConEventException;
-
-				
-				class PlcConnection
-				{
-				public:
-
-					PlcConnection();
-					~PlcConnection();
-					
-					
-					/**
-					* Establishes the connection to the remote PLC.
-					* @throws PlcConnectionException if the connection attempt failed
-					*/
-					virtual void connect() = 0;
-					
-					/**
-					* Indicates if the connection is established to a remote PLC.
-					* @return {@code true} if connected, {@code false} otherwise
-					*/
-					
-					inline bool isConnected() const { return _bConnected; }
-					
-					/**
-					 * Closes the connection to the remote PLC.
-					 * @throws Exception if shutting down the connection failed
-					 */
-					virtual void close() = 0;
-
-					/**
-					 * Parse a fieldQuery for the given connection type.
-					 *
-					 * @throws PlcRuntimeException If the string cannot be parsed
-					 */
-                    PlcField prepareField(std::string fieldQuery);
-
-					/**
-					 * Provides connection metadata.
-					 */
-					virtual PlcConnectionMetadata* getMetadata() = 0;
-
-					/**
-					 * Execute a ping query against a remote device to check the availability of the connection.
-					 *
-					 * @return CompletableFuture that is completed successfully (Void) or unsuccessfully with an PlcException.
-					 */
-					virtual void ping() = 0;
-
-					/**
-					 * Obtain read request builder.
-					 * @throws PlcUnsupportedOperationException if the connection does not support reading
-					 */
-					virtual PlcReadRequest::Builder* readRequestBuilder() = 0;
-
-					/**
-					 * Obtain write request builder.
-					 * @throws PlcUnsupportedOperationException if the connection does not support writing
-					 */
-					//virtual Builder* writeRequestBuilder() = 0;
-
-					/**
-					 * Obtain subscription request builder.
-					 * @throws PlcUnsupportedOperationException if the connection does not support subscription
-					 */
-					//virtual Builder* subscriptionRequestBuilder() = 0;
-
-					/**
-					 * Obtain unsubscription request builder.
-					 * @throws PlcUnsupportedOperationException if the connection does not support subscription
-					 */
-					//virtual Builder* unsubscriptionRequestBuilder() = 0;
-
-					
-					virtual bool send(unsigned char* pBytesToSend, int iNumBytesToSend) = 0;
-					
-					inline int getSendBufferSize() const { return _iSendBufferSize; }
-					void setSendBufferSize(int iBufferSize);
-				
-					inline int getRecvBufferSize() const { return _iRecvBufferSize; }
-					void setRecvBufferSize(int iBlockSize);
-
-				protected:
-
-					virtual void onReceive(const boost::system::error_code& errorCode, std::size_t szRecvBytes) = 0;
-
-				protected:
-					bool            _bConnected;
-					unsigned char*  _pSendBuffer;
-					int             _iSendBufferSize;
-					unsigned char*  _pRecvBuffer;
-					int             _iRecvBufferSize;
-					std::string     _strErrorMessage;
-
-					boost::mutex              _mtxComLock;
-					boost::condition_variable _condComHandler;
-
-					DatDmp _dump;
-
-				};
-			}
-		}
-    }
-  }
-}
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+#ifndef _PLC_CONNECTION
+#define _PLC_CONNECTION
+
+#include <org/apache/plc4x/cpp/api/metadata/PlcConnectionMetadata.h>
+#include <org/apache/plc4x/cpp/api/messages/PlcReadRequest.h>
+#include <org/apache/plc4x/cpp/api/messages/PlcWriteRequest.h>
+#include <org/apache/plc4x/cpp/api/messages/PlcSubscriptionRequest.h>
+#include <org/apache/plc4x/cpp/api/messages/PlcUnsubscriptionRequest.h>
+
+#include <org/apache/plc4x/cpp/utils/logger/DatDmp.h>
+
+#include <boost/signals2.hpp>
+#include <memory>
+
+#define DEFAULT_BUFFER_SIZE	16384
+
+namespace org
+{
+  namespace apache
+  {
+    namespace plc4x
+    {
+	    namespace cpp
+	    {
+			namespace api
+			{
+                using namespace org::apache::plc4x::cpp::api::metadata;
+                using namespace org::apache::plc4x::cpp::api::messages;
+                using namespace org::apache::plc4x::cpp::utils;
+
+				/**
+				* Interface defining the most basic methods a PLC4X connection should support.
+				* This generally handles the connection establishment itself and the parsing of
+				* field address strings to the platform dependent PlcField instances.
+				*/
+                class Message
+                {
+                public:
+                    vector<char> vecBuffer;
+                };
+
+                typedef shared_ptr<Message> type_shpMessage;
+
+                typedef  boost::signals2::signal<void(type_shpMessage)>    type_sigConMessage;
+                typedef  boost::signals2::signal<void(std::exception&)>     type_sigConEventException;
+
+				
+				class PlcConnection
+				{
+				public:
+
+					PlcConnection();
+					~PlcConnection();
+					
+					
+					/**
+					* Establishes the connection to the remote PLC.
+					* @throws PlcConnectionException if the connection attempt failed
+					*/
+					virtual void connect() = 0;
+					
+					/**
+					* Indicates if the connection is established to a remote PLC.
+					* @return {@code true} if connected, {@code false} otherwise
+					*/
+					
+					inline bool isConnected() const { return _bConnected; }
+					
+					/**
+					 * Closes the connection to the remote PLC.
+					 * @throws Exception if shutting down the connection failed
+					 */
+					virtual void close() = 0;
+
+					/**
+					 * Parse a fieldQuery for the given connection type.
+					 *
+					 * @throws PlcRuntimeException If the string cannot be parsed
+					 */
+                    PlcField prepareField(std::string fieldQuery);
+
+					/**
+					 * Provides connection metadata.
+					 */
+					virtual PlcConnectionMetadata* getMetadata() = 0;
+
+					/**
+					 * Execute a ping query against a remote device to check the availability of the connection.
+					 *
+					 * @return CompletableFuture that is completed successfully (Void) or unsuccessfully with an PlcException.
+					 */
+					virtual void ping() = 0;
+
+					/**
+					 * Obtain read request builder.
+					 * @throws PlcUnsupportedOperationException if the connection does not support reading
+					 */
+					virtual PlcReadRequest::Builder* readRequestBuilder() = 0;
+
+					/**
+					 * Obtain write request builder.
+					 * @throws PlcUnsupportedOperationException if the connection does not support writing
+					 */
+					//virtual Builder* writeRequestBuilder() = 0;
+
+					/**
+					 * Obtain subscription request builder.
+					 * @throws PlcUnsupportedOperationException if the connection does not support subscription
+					 */
+					//virtual Builder* subscriptionRequestBuilder() = 0;
+
+					/**
+					 * Obtain unsubscription request builder.
+					 * @throws PlcUnsupportedOperationException if the connection does not support subscription
+					 */
+					//virtual Builder* unsubscriptionRequestBuilder() = 0;
+
+					
+					virtual bool send(unsigned char* pBytesToSend, int iNumBytesToSend) = 0;
+					
+					inline int getSendBufferSize() const { return _iSendBufferSize; }
+					void setSendBufferSize(int iBufferSize);
+				
+					inline int getRecvBufferSize() const { return _iRecvBufferSize; }
+					void setRecvBufferSize(int iBlockSize);
+
+				protected:
+
+					virtual void onReceive(const boost::system::error_code& errorCode, std::size_t szRecvBytes) = 0;
+
+				protected:
+					bool            _bConnected;
+					unsigned char*  _pSendBuffer;
+					int             _iSendBufferSize;
+					unsigned char*  _pRecvBuffer;
+					int             _iRecvBufferSize;
+					std::string     _strErrorMessage;
+
+					boost::mutex              _mtxComLock;
+					boost::condition_variable _condComHandler;
+
+					DatDmp _dump;
+
+				};
+			}
+		}
+    }
+  }
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/PlcDriverManager.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/PlcDriverManager.cpp
index a3152989082..020e1df871d 100644
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/PlcDriverManager.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/PlcDriverManager.cpp
@@ -1,187 +1,187 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcDriverManager.h"
-#if defined (_WIN32)
-    #include <windows.h>
-#elif (__linux__) || (defined (__APPLE__) && defined (__MACH__))
-    #include <dlfcn.h>
-#endif
-
-#include <boost/filesystem.hpp>
-#include <boost/regex.hpp>
-#include <iostream>
-
-namespace fs = boost::filesystem;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-            namespace cpp
-            {
-                PlcDriverManager::PlcDriverManager()
-                {
-                    findDrivers();
-                }
-            
-                PlcDriverManager::~PlcDriverManager()
-				{
-				}
-
-				/**
-					* Connects to a PLC using the given plc connection string.
-					*
-					* @param url plc connection string.
-					* @return PlcConnection object.
-					* @throws PlcConnectionException an exception if the connection attempt failed.
-					*/
-				PlcConnection* PlcDriverManager::getConnection(std::string url)
-				{
-                    PlcDriver* pPlcDriver = NULL;
-                    PlcConnection* pPlcConnection = NULL;
-                    
-                    pPlcDriver = getDriver(url);
-                    if (pPlcDriver != NULL)
-                    { 
-                        pPlcConnection = pPlcDriver->connect(url);
-                    }
-                    
-					return pPlcConnection;
-				}
-
-				/**
-					* Connects to a PLC using the given plc connection string using given authentication credentials.
-					*
-					* @param url            plc connection string.
-					* @param authentication authentication credentials.
-					* @return PlcConnection object.
-					* @throws PlcConnectionException an exception if the connection attempt failed.					
-					**/
-				PlcConnection* PlcDriverManager::getConnection(std::string url, PlcAuthentication& authentication)
-				{
-                    PlcDriver* pPlcDriver = NULL;
-                    PlcConnection* pPlcConnection = NULL;
-                    
-                    pPlcDriver = getDriver(url);
-                    if (pPlcDriver != NULL)
-                    {
-                        pPlcConnection = pPlcDriver->connect(url, authentication);
-                    }
-					
-					return pPlcConnection;
-				}
-
-                PlcDriver* PlcDriverManager::getDriver(std::string url)
-                {
-                    PlcDriver* pPlcDriver = NULL;
-                    std::string strProtocol = "";
-                    
-                    try
-                    {
-                        boost::regex exFilter(REGEX_PROTOCOL.c_str());
-                        boost::smatch what;
-
-                        if (boost::regex_search(url, what, exFilter))
-                        {
-                            if (what.size() > 1)
-                            {
-                                strProtocol = what[1].str();
-                                pPlcDriver = _mapDrivers[strProtocol];
-                            }
-                        }
-
-                        if (pPlcDriver == NULL)
-                        {
-                            BOOST_THROW_EXCEPTION(PlcConnectionException("Unable to find driver for protocol '" + strProtocol + "'"));
-                        }
-                    }
-                    catch (std::exception& ex)
-                    {
-                        BOOST_THROW_EXCEPTION(PlcConnectionException("Invalid plc4; connection string '" + url + "'", ex));
-                    }
-
-                    return pPlcDriver;
-                }
-
-                void PlcDriverManager::findDrivers()
-                {
-                    typedef PlcDriver* (*pfCreatePlcDriver)();
-                    pfCreatePlcDriver CreatePlcDriver;
-                        
-                    boost::regex exFilter(PLC_DRIVER_TEMPLATE);
-                    boost::smatch what;
-                        
-                    for (fs::recursive_directory_iterator itDirFiles("./"); itDirFiles != fs::recursive_directory_iterator(); itDirFiles++)
-                    {
-                        if (boost::filesystem::is_regular_file(*itDirFiles))
-                        {
-                            std::string strFilename = itDirFiles->path().filename().string();
-
-                            if (boost::regex_search(strFilename, what, exFilter))
-                            {
-                                std::string strDriverName = what[1].str();                                    
-                                    
-                                try
-                                {
-#if defined (_WIN32)
-                                    HINSTANCE hdll = NULL;
-                                    hdll = LoadLibrary((itDirFiles->path().string().c_str()));
-                                    if (hdll != NULL)
-                                    {
-                                        CreatePlcDriver = (pfCreatePlcDriver)GetProcAddress(hdll, PLC_CREATE_DRIVER_INSTANCE.c_str());
-#elif defined (__linux__) || (defined (__APPLE__) && defined (__MACH__))
-                                    void *hdll = NULL;
-                                    hdll = dlopen((itDirFiles->path().string().c_str()),RTLD_NOW);
-                                    if (hdll != NULL)
-                                    {
-                                        CreatePlcDriver = (pfCreatePlcDriver)dlsym(hdll, PLC_CREATE_DRIVER_INSTANCE.c_str());
-#endif
-                                        if (CreatePlcDriver != NULL)
-                                        {
-                                            PlcDriver* pPlcDriver = NULL;
-
-                                            pPlcDriver = CreatePlcDriver();
-                                            if (pPlcDriver != NULL)
-                                            {
-                                                _mapDrivers.insert(std::pair<std::string, PlcDriver*>(pPlcDriver->getProtocolCode(), pPlcDriver));
-                                            }
-                                        }
-                                    }
-                                }
-                                catch (...)
-                                {
-                                }
-                            }
-                        }
-                    }
-
-                    if (_mapDrivers.size() == 0)
-                    {
-                        BOOST_THROW_EXCEPTION(PlcConnectionException("Unable to find drivers"));
-                    }
-                   
-                    return;
-                }                
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcDriverManager.h"
+#if defined (_WIN32)
+    #include <windows.h>
+#elif (__linux__) || (defined (__APPLE__) && defined (__MACH__))
+    #include <dlfcn.h>
+#endif
+
+#include <boost/filesystem.hpp>
+#include <boost/regex.hpp>
+#include <iostream>
+
+namespace fs = boost::filesystem;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+            namespace cpp
+            {
+                PlcDriverManager::PlcDriverManager()
+                {
+                    findDrivers();
+                }
+            
+                PlcDriverManager::~PlcDriverManager()
+				{
+				}
+
+				/**
+					* Connects to a PLC using the given plc connection string.
+					*
+					* @param url plc connection string.
+					* @return PlcConnection object.
+					* @throws PlcConnectionException an exception if the connection attempt failed.
+					*/
+				PlcConnection* PlcDriverManager::getConnection(std::string url)
+				{
+                    PlcDriver* pPlcDriver = NULL;
+                    PlcConnection* pPlcConnection = NULL;
+                    
+                    pPlcDriver = getDriver(url);
+                    if (pPlcDriver != NULL)
+                    { 
+                        pPlcConnection = pPlcDriver->connect(url);
+                    }
+                    
+					return pPlcConnection;
+				}
+
+				/**
+					* Connects to a PLC using the given plc connection string using given authentication credentials.
+					*
+					* @param url            plc connection string.
+					* @param authentication authentication credentials.
+					* @return PlcConnection object.
+					* @throws PlcConnectionException an exception if the connection attempt failed.					
+					**/
+				PlcConnection* PlcDriverManager::getConnection(std::string url, PlcAuthentication& authentication)
+				{
+                    PlcDriver* pPlcDriver = NULL;
+                    PlcConnection* pPlcConnection = NULL;
+                    
+                    pPlcDriver = getDriver(url);
+                    if (pPlcDriver != NULL)
+                    {
+                        pPlcConnection = pPlcDriver->connect(url, authentication);
+                    }
+					
+					return pPlcConnection;
+				}
+
+                PlcDriver* PlcDriverManager::getDriver(std::string url)
+                {
+                    PlcDriver* pPlcDriver = NULL;
+                    std::string strProtocol = "";
+                    
+                    try
+                    {
+                        boost::regex exFilter(REGEX_PROTOCOL.c_str());
+                        boost::smatch what;
+
+                        if (boost::regex_search(url, what, exFilter))
+                        {
+                            if (what.size() > 1)
+                            {
+                                strProtocol = what[1].str();
+                                pPlcDriver = _mapDrivers[strProtocol];
+                            }
+                        }
+
+                        if (pPlcDriver == NULL)
+                        {
+                            BOOST_THROW_EXCEPTION(PlcConnectionException("Unable to find driver for protocol '" + strProtocol + "'"));
+                        }
+                    }
+                    catch (std::exception& ex)
+                    {
+                        BOOST_THROW_EXCEPTION(PlcConnectionException("Invalid plc4; connection string '" + url + "'", ex));
+                    }
+
+                    return pPlcDriver;
+                }
+
+                void PlcDriverManager::findDrivers()
+                {
+                    typedef PlcDriver* (*pfCreatePlcDriver)();
+                    pfCreatePlcDriver CreatePlcDriver;
+                        
+                    boost::regex exFilter(PLC_DRIVER_TEMPLATE);
+                    boost::smatch what;
+                        
+                    for (fs::recursive_directory_iterator itDirFiles("./"); itDirFiles != fs::recursive_directory_iterator(); itDirFiles++)
+                    {
+                        if (boost::filesystem::is_regular_file(*itDirFiles))
+                        {
+                            std::string strFilename = itDirFiles->path().filename().string();
+
+                            if (boost::regex_search(strFilename, what, exFilter))
+                            {
+                                std::string strDriverName = what[1].str();                                    
+                                    
+                                try
+                                {
+#if defined (_WIN32)
+                                    HINSTANCE hdll = NULL;
+                                    hdll = LoadLibrary((itDirFiles->path().string().c_str()));
+                                    if (hdll != NULL)
+                                    {
+                                        CreatePlcDriver = (pfCreatePlcDriver)GetProcAddress(hdll, PLC_CREATE_DRIVER_INSTANCE.c_str());
+#elif defined (__linux__) || (defined (__APPLE__) && defined (__MACH__))
+                                    void *hdll = NULL;
+                                    hdll = dlopen((itDirFiles->path().string().c_str()),RTLD_NOW);
+                                    if (hdll != NULL)
+                                    {
+                                        CreatePlcDriver = (pfCreatePlcDriver)dlsym(hdll, PLC_CREATE_DRIVER_INSTANCE.c_str());
+#endif
+                                        if (CreatePlcDriver != NULL)
+                                        {
+                                            PlcDriver* pPlcDriver = NULL;
+
+                                            pPlcDriver = CreatePlcDriver();
+                                            if (pPlcDriver != NULL)
+                                            {
+                                                _mapDrivers.insert(std::pair<std::string, PlcDriver*>(pPlcDriver->getProtocolCode(), pPlcDriver));
+                                            }
+                                        }
+                                    }
+                                }
+                                catch (...)
+                                {
+                                }
+                            }
+                        }
+                    }
+
+                    if (_mapDrivers.size() == 0)
+                    {
+                        BOOST_THROW_EXCEPTION(PlcConnectionException("Unable to find drivers"));
+                    }
+                   
+                    return;
+                }                
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/PlcDriverManager.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/PlcDriverManager.h
index 227310f3d2b..d961811abbf 100644
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/PlcDriverManager.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/PlcDriverManager.h
@@ -1,71 +1,71 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_DRIVER_MANAGER
-#define _PLC_DRIVER_MANAGER
-#include <vector>
-#include <map>
-#include <string>
-#include <iostream>
-#include "./api/PlcConnection.h"
-#include "./spi/PlcDriver.h"
-#include "./api/exceptions/PlcConnectionException.h"
-
-using namespace org::apache::plc4x::cpp::api::exceptions;
-using namespace org::apache::plc4x::cpp::spi;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				class PlcDriverManager
-				{				
-
-					public:
-						PlcDriverManager();
-
-						~PlcDriverManager();
-
-						PlcConnection* getConnection(std::string url);
-						PlcConnection* getConnection(std::string url, PlcAuthentication& authentication);
-
-					protected:
-						
-					private:
-						std::map<std::string, PlcDriver*> _mapDrivers;
-						PlcDriver* getDriver(std::string url);
-
-                        void findDrivers();
-
-                        const std::string PLC_DRIVER_TEMPLATE = "plc4cpp-driver-(.*)(.dll|.so)";
-                        const std::string PLC_CREATE_DRIVER_INSTANCE = "_CreatePlcDriverInstance";
-                        const std::string REGEX_PROTOCOL = "^(?<proto>.*)://";
-                        
-
-				};
-			}
-		}
-	}
-}
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_DRIVER_MANAGER
+#define _PLC_DRIVER_MANAGER
+#include <vector>
+#include <map>
+#include <string>
+#include <iostream>
+#include "./api/PlcConnection.h"
+#include "./spi/PlcDriver.h"
+#include "./api/exceptions/PlcConnectionException.h"
+
+using namespace org::apache::plc4x::cpp::api::exceptions;
+using namespace org::apache::plc4x::cpp::spi;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				class PlcDriverManager
+				{				
+
+					public:
+						PlcDriverManager();
+
+						~PlcDriverManager();
+
+						PlcConnection* getConnection(std::string url);
+						PlcConnection* getConnection(std::string url, PlcAuthentication& authentication);
+
+					protected:
+						
+					private:
+						std::map<std::string, PlcDriver*> _mapDrivers;
+						PlcDriver* getDriver(std::string url);
+
+                        void findDrivers();
+
+                        const std::string PLC_DRIVER_TEMPLATE = "plc4cpp-driver-(.*)(.dll|.so)";
+                        const std::string PLC_CREATE_DRIVER_INSTANCE = "_CreatePlcDriverInstance";
+                        const std::string REGEX_PROTOCOL = "^(?<proto>.*)://";
+                        
+
+				};
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/PlcConnection.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/PlcConnection.cpp
index 1b4479c8ebe..59d616c1030 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/PlcConnection.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/PlcConnection.cpp
@@ -1,81 +1,81 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
- 
-#include "PlcConnection.h"
-#include "exceptions/PlcRuntimeException.h"
-
-namespace org
-{
-  namespace apache
-  {
-    namespace plc4x
-    {
-	    namespace cpp
-	    {
-			namespace api
-			{
-                using namespace org::apache::plc4x::cpp::api::exceptions;
-
-				PlcConnection::PlcConnection() :
-                    _bConnected(false),
-					_pSendBuffer(nullptr),
-					_pRecvBuffer(nullptr),
-					_iSendBufferSize(0),
-					_iRecvBufferSize(0)
-				{
-					setSendBufferSize(DEFAULT_BUFFER_SIZE);
-					setRecvBufferSize(DEFAULT_BUFFER_SIZE);
-					_strErrorMessage = "";
-				}
-
-				PlcConnection::~PlcConnection()
-				{
-					if (_pSendBuffer != NULL) delete[] _pSendBuffer;
-					if (_pRecvBuffer != NULL) delete[] _pRecvBuffer;
-				}
-
-				PlcField* PlcConnection::prepareField(std::string strFieldQuery)
-				{
-						BOOST_THROW_EXCEPTION(PlcRuntimeException("Parse method is not implemented for this connection / driver"));
-				}
-				
-				void PlcConnection::setSendBufferSize(int iBufferSize)
-				{
-					if (iBufferSize != _iSendBufferSize)
-					{
-						_iSendBufferSize = iBufferSize;
-						if (_pSendBuffer != NULL) delete[] _pSendBuffer;
-						_pSendBuffer = new unsigned char[_iSendBufferSize];
-					}
-				}
-
-				void PlcConnection::setRecvBufferSize(int iBufferSize)
-				{
-					if (iBufferSize != _iRecvBufferSize)
-					{
-						_iRecvBufferSize = iBufferSize;
-						if (_pRecvBuffer != NULL) delete[] _pRecvBuffer;
-						_pRecvBuffer = new unsigned char[_iRecvBufferSize];
-					}
-				}
-			}
-	    }
-    }
-  }
-}
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+ 
+#include "PlcConnection.h"
+#include "exceptions/PlcRuntimeException.h"
+
+namespace org
+{
+  namespace apache
+  {
+    namespace plc4x
+    {
+	    namespace cpp
+	    {
+			namespace api
+			{
+                using namespace org::apache::plc4x::cpp::api::exceptions;
+
+				PlcConnection::PlcConnection() :
+                    _bConnected(false),
+					_pSendBuffer(nullptr),
+					_pRecvBuffer(nullptr),
+					_iSendBufferSize(0),
+					_iRecvBufferSize(0)
+				{
+					setSendBufferSize(DEFAULT_BUFFER_SIZE);
+					setRecvBufferSize(DEFAULT_BUFFER_SIZE);
+					_strErrorMessage = "";
+				}
+
+				PlcConnection::~PlcConnection()
+				{
+					if (_pSendBuffer != NULL) delete[] _pSendBuffer;
+					if (_pRecvBuffer != NULL) delete[] _pRecvBuffer;
+				}
+
+				PlcField* PlcConnection::prepareField(std::string strFieldQuery)
+				{
+						BOOST_THROW_EXCEPTION(PlcRuntimeException("Parse method is not implemented for this connection / driver"));
+				}
+				
+				void PlcConnection::setSendBufferSize(int iBufferSize)
+				{
+					if (iBufferSize != _iSendBufferSize)
+					{
+						_iSendBufferSize = iBufferSize;
+						if (_pSendBuffer != NULL) delete[] _pSendBuffer;
+						_pSendBuffer = new unsigned char[_iSendBufferSize];
+					}
+				}
+
+				void PlcConnection::setRecvBufferSize(int iBufferSize)
+				{
+					if (iBufferSize != _iRecvBufferSize)
+					{
+						_iRecvBufferSize = iBufferSize;
+						if (_pRecvBuffer != NULL) delete[] _pRecvBuffer;
+						_pRecvBuffer = new unsigned char[_iRecvBufferSize];
+					}
+				}
+			}
+	    }
+    }
+  }
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/PlcConnection.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/PlcConnection.h
index 0dc37624680..5edc382163e 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/PlcConnection.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/PlcConnection.h
@@ -1,160 +1,160 @@
-/*
- 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
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-#ifndef _PLC_CONNECTION
-#define _PLC_CONNECTION
-
-#include "metadata/PlcConnectionMetadata.h"
-#include "../api/messages/PlcReadRequest.h"
-#include "../api/messages/PlcWriteRequest.h"
-#include "../api/messages/PlcSubscriptionRequest.h"
-#include "../api/messages/PlcUnsubscriptionRequest.h"
-
-#include <org/apache/plc4x/cpp/utils/logger/DatDmp.h>
-#include <boost/signals2.hpp>
-#include <boost/thread.hpp>
-
-#define DEFAULT_BUFFER_SIZE	16384
-
-namespace org
-{
-  namespace apache
-  {
-    namespace plc4x
-    {
-	    namespace cpp
-	    {
-			namespace api
-			{
-
-				using namespace boost::signals2;
-                using namespace org::apache::plc4x::cpp::api::metadata;
-                using namespace org::apache::plc4x::cpp::api::messages;
-                using namespace org::apache::plc4x::cpp::utils;
-
-				/**
-				* Interface defining the most basic methods a PLC4X connection should support.
-				* This generally handles the connection establishment itself and the parsing of
-				* field address strings to the platform dependent PlcField instances.
-				*/
-				
-				class PlcConnection
-				{
-				public:
-
-					PlcConnection();
-					~PlcConnection();
-					
-					
-					/**
-					* Establishes the connection to the remote PLC.
-					* @throws PlcConnectionException if the connection attempt failed
-					*/
-					virtual void connect() = 0;
-					
-					/**
-					* Indicates if the connection is established to a remote PLC.
-					* @return {@code true} if connected, {@code false} otherwise
-					*/
-					
-					inline bool isConnected() const { return _bConnected; }
-					
-					/**
-					 * Closes the connection to the remote PLC.
-					 * @throws Exception if shutting down the connection failed
-					 */
-					virtual void close() = 0;
-
-					/**
-					 * Parse a fieldQuery for the given connection type.
-					 *
-					 * @throws PlcRuntimeException If the string cannot be parsed
-					 */
-                    PlcField* prepareField(std::string strFieldQuery);
-
-					/**
-					 * Provides connection metadata.
-					 */
-					virtual PlcConnectionMetadata* getMetadata() = 0;
-
-					/**
-					 * Execute a ping query against a remote device to check the availability of the connection.
-					 *
-					 * @return CompletableFuture that is completed successfully (Void) or unsuccessfully with an PlcException.
-					 */
-					virtual void ping() = 0;
-
-					/**
-					 * Obtain read request builder.
-					 * @throws PlcUnsupportedOperationException if the connection does not support reading
-					 */
-					virtual PlcReadRequest::Builder* readRequestBuilder() = 0;
-
-					/**
-					 * Obtain write request builder.
-					 * @throws PlcUnsupportedOperationException if the connection does not support writing
-					 */
-					//virtual void Builder* writeRequestBuilder() = 0;
-
-					/**
-					 * Obtain subscription request builder.
-					 * @throws PlcUnsupportedOperationException if the connection does not support subscription
-					 */
-					//virtual void Builder* subscriptionRequestBuilder() = 0;
-
-					/**
-					 * Obtain unsubscription request builder.
-					 * @throws PlcUnsupportedOperationException if the connection does not support subscription
-					 */
-					//virtual void Builder* unsubscriptionRequestBuilder() = 0;
-
-					
-					virtual bool send(unsigned char* pBytesToSend, int iNumBytesToSend) = 0;
-					
-
-					inline int getSendBufferSize() const { return _iSendBufferSize; }
-					void setSendBufferSize(int iBufferSize);
-				
-					inline int getRecvBufferSize() const { return _iRecvBufferSize; }
-					void setRecvBufferSize(int iBlockSize);
-
-				protected:
-
-					virtual void onReceive(const boost::system::error_code& errorCode, std::size_t szRecvBytes) = 0;
-
-				protected:
-					bool            _bConnected;
-					unsigned char*  _pSendBuffer;
-					int             _iSendBufferSize;
-					unsigned char*  _pRecvBuffer;
-					int             _iRecvBufferSize;
-					std::string     _strErrorMessage;
-
-					boost::mutex              _mtxComLock;
-					boost::condition_variable _condComHandler;
-
-                    DatDmp _dump;
-
-				};
-			}
-		}
-    }
-  }
-}
-
+/*
+ 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
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+#ifndef _PLC_CONNECTION
+#define _PLC_CONNECTION
+
+#include "metadata/PlcConnectionMetadata.h"
+#include "../api/messages/PlcReadRequest.h"
+#include "../api/messages/PlcWriteRequest.h"
+#include "../api/messages/PlcSubscriptionRequest.h"
+#include "../api/messages/PlcUnsubscriptionRequest.h"
+
+#include <org/apache/plc4x/cpp/utils/logger/DatDmp.h>
+#include <boost/signals2.hpp>
+#include <boost/thread.hpp>
+
+#define DEFAULT_BUFFER_SIZE	16384
+
+namespace org
+{
+  namespace apache
+  {
+    namespace plc4x
+    {
+	    namespace cpp
+	    {
+			namespace api
+			{
+
+				using namespace boost::signals2;
+                using namespace org::apache::plc4x::cpp::api::metadata;
+                using namespace org::apache::plc4x::cpp::api::messages;
+                using namespace org::apache::plc4x::cpp::utils;
+
+				/**
+				* Interface defining the most basic methods a PLC4X connection should support.
+				* This generally handles the connection establishment itself and the parsing of
+				* field address strings to the platform dependent PlcField instances.
+				*/
+				
+				class PlcConnection
+				{
+				public:
+
+					PlcConnection();
+					~PlcConnection();
+					
+					
+					/**
+					* Establishes the connection to the remote PLC.
+					* @throws PlcConnectionException if the connection attempt failed
+					*/
+					virtual void connect() = 0;
+					
+					/**
+					* Indicates if the connection is established to a remote PLC.
+					* @return {@code true} if connected, {@code false} otherwise
+					*/
+					
+					inline bool isConnected() const { return _bConnected; }
+					
+					/**
+					 * Closes the connection to the remote PLC.
+					 * @throws Exception if shutting down the connection failed
+					 */
+					virtual void close() = 0;
+
+					/**
+					 * Parse a fieldQuery for the given connection type.
+					 *
+					 * @throws PlcRuntimeException If the string cannot be parsed
+					 */
+                    PlcField* prepareField(std::string strFieldQuery);
+
+					/**
+					 * Provides connection metadata.
+					 */
+					virtual PlcConnectionMetadata* getMetadata() = 0;
+
+					/**
+					 * Execute a ping query against a remote device to check the availability of the connection.
+					 *
+					 * @return CompletableFuture that is completed successfully (Void) or unsuccessfully with an PlcException.
+					 */
+					virtual void ping() = 0;
+
+					/**
+					 * Obtain read request builder.
+					 * @throws PlcUnsupportedOperationException if the connection does not support reading
+					 */
+					virtual PlcReadRequest::Builder* readRequestBuilder() = 0;
+
+					/**
+					 * Obtain write request builder.
+					 * @throws PlcUnsupportedOperationException if the connection does not support writing
+					 */
+					//virtual void Builder* writeRequestBuilder() = 0;
+
+					/**
+					 * Obtain subscription request builder.
+					 * @throws PlcUnsupportedOperationException if the connection does not support subscription
+					 */
+					//virtual void Builder* subscriptionRequestBuilder() = 0;
+
+					/**
+					 * Obtain unsubscription request builder.
+					 * @throws PlcUnsupportedOperationException if the connection does not support subscription
+					 */
+					//virtual void Builder* unsubscriptionRequestBuilder() = 0;
+
+					
+					virtual bool send(unsigned char* pBytesToSend, int iNumBytesToSend) = 0;
+					
+
+					inline int getSendBufferSize() const { return _iSendBufferSize; }
+					void setSendBufferSize(int iBufferSize);
+				
+					inline int getRecvBufferSize() const { return _iRecvBufferSize; }
+					void setRecvBufferSize(int iBlockSize);
+
+				protected:
+
+					virtual void onReceive(const boost::system::error_code& errorCode, std::size_t szRecvBytes) = 0;
+
+				protected:
+					bool            _bConnected;
+					unsigned char*  _pSendBuffer;
+					int             _iSendBufferSize;
+					unsigned char*  _pRecvBuffer;
+					int             _iRecvBufferSize;
+					std::string     _strErrorMessage;
+
+					boost::mutex              _mtxComLock;
+					boost::condition_variable _condComHandler;
+
+                    DatDmp _dump;
+
+				};
+			}
+		}
+    }
+  }
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcAuthentication.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcAuthentication.cpp
index bd489eaa266..adace45a0f3 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcAuthentication.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcAuthentication.cpp
@@ -1,51 +1,51 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcAuthentication.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace authentication
-					{
-
-						/**---------------------------------------------------------------------
-						* ctor
-						*---------------------------------------------------------------------*/
-						PlcAuthentication::PlcAuthentication()
-						{
-						}
-
-						PlcAuthentication::~PlcAuthentication()
-						{
-							// do nothing
-						}
-					}
-				}
-			}
-		}
-	}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcAuthentication.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace authentication
+					{
+
+						/**---------------------------------------------------------------------
+						* ctor
+						*---------------------------------------------------------------------*/
+						PlcAuthentication::PlcAuthentication()
+						{
+						}
+
+						PlcAuthentication::~PlcAuthentication()
+						{
+							// do nothing
+						}
+					}
+				}
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcAuthentication.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcAuthentication.h
index 5b61fa9db19..418c723ac45 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcAuthentication.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcAuthentication.h
@@ -1,48 +1,48 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_AUTHENTICATION
-#define _PLC_AUTHENTICATION
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace authentication
-					{
-						class PlcAuthentication
-						{
-							public:
-								PlcAuthentication();
-								~PlcAuthentication();
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_AUTHENTICATION
+#define _PLC_AUTHENTICATION
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace authentication
+					{
+						class PlcAuthentication
+						{
+							public:
+								PlcAuthentication();
+								~PlcAuthentication();
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcUsernamePasswordAuthentication.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcUsernamePasswordAuthentication.cpp
index 0c48616f85f..6d7454e4984 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcUsernamePasswordAuthentication.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcUsernamePasswordAuthentication.cpp
@@ -1,97 +1,97 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include <boost/functional/hash.hpp>
-#include "PlcUsernamePasswordAuthentication.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace authentication
-					{
-						/**---------------------------------------------------------------------
-						* ctor
-						*---------------------------------------------------------------------*/
-						PlcUsernamePasswordAuthentication::PlcUsernamePasswordAuthentication(std::string username, std::string password)
-						{																					
-							// Check isNull (Java) not required, is every time a valid string
-							this->_strUsername = username;
-							this->_strPassword = password;
-						}
-						PlcUsernamePasswordAuthentication::~PlcUsernamePasswordAuthentication()
-						{
-							// do nothing
-						}
-						/**---------------------------------------------------------------------
-						* returns username
-						*---------------------------------------------------------------------*/
-						std::string PlcUsernamePasswordAuthentication::getUsername()
-						{
-							return _strUsername;
-						}
-
-						/**---------------------------------------------------------------------
-						* returns password
-						*---------------------------------------------------------------------*/
-						std::string PlcUsernamePasswordAuthentication::getPassword()
-						{
-							return _strPassword;
-						}
-						/**---------------------------------------------------------------------
-						* Check for equality (identical object or identical values)
-						*---------------------------------------------------------------------*/						
-						bool PlcUsernamePasswordAuthentication::equals(PlcUsernamePasswordAuthentication& auth)
-						{
-							bool bResult = false;
-							
-							if ( (this == &auth) || ( (_strUsername.compare(auth.getUsername()) == 0) && (_strPassword.compare(auth.getPassword()) == 0) ))
-							{
-								return true;
-							}
-
-							return bResult;
-						}
-
-						std::string PlcUsernamePasswordAuthentication::toString()
-						{
-							return "PlcUsernamePasswordAuthentication{ username='" + _strUsername + '\'' +
-								", password='" + "*****************" + '\'' +
-								'}';
-						}
-
-						int PlcUsernamePasswordAuthentication::hashCode()
-						{
-							boost::hash<std::string> string_hash;
-
-							return string_hash(_strUsername + _strPassword);
-						}
-
-					}
-				}
-			}
-		}
-	}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include <boost/functional/hash.hpp>
+#include "PlcUsernamePasswordAuthentication.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace authentication
+					{
+						/**---------------------------------------------------------------------
+						* ctor
+						*---------------------------------------------------------------------*/
+						PlcUsernamePasswordAuthentication::PlcUsernamePasswordAuthentication(std::string username, std::string password)
+						{																					
+							// Check isNull (Java) not required, is every time a valid string
+							this->_strUsername = username;
+							this->_strPassword = password;
+						}
+						PlcUsernamePasswordAuthentication::~PlcUsernamePasswordAuthentication()
+						{
+							// do nothing
+						}
+						/**---------------------------------------------------------------------
+						* returns username
+						*---------------------------------------------------------------------*/
+						std::string PlcUsernamePasswordAuthentication::getUsername()
+						{
+							return _strUsername;
+						}
+
+						/**---------------------------------------------------------------------
+						* returns password
+						*---------------------------------------------------------------------*/
+						std::string PlcUsernamePasswordAuthentication::getPassword()
+						{
+							return _strPassword;
+						}
+						/**---------------------------------------------------------------------
+						* Check for equality (identical object or identical values)
+						*---------------------------------------------------------------------*/						
+						bool PlcUsernamePasswordAuthentication::equals(PlcUsernamePasswordAuthentication& auth)
+						{
+							bool bResult = false;
+							
+							if ( (this == &auth) || ( (_strUsername.compare(auth.getUsername()) == 0) && (_strPassword.compare(auth.getPassword()) == 0) ))
+							{
+								return true;
+							}
+
+							return bResult;
+						}
+
+						std::string PlcUsernamePasswordAuthentication::toString()
+						{
+							return "PlcUsernamePasswordAuthentication{ username='" + _strUsername + '\'' +
+								", password='" + "*****************" + '\'' +
+								'}';
+						}
+
+						int PlcUsernamePasswordAuthentication::hashCode()
+						{
+							boost::hash<std::string> string_hash;
+
+							return string_hash(_strUsername + _strPassword);
+						}
+
+					}
+				}
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcUsernamePasswordAuthentication.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcUsernamePasswordAuthentication.h
index 0795dc23140..ced5463bfb8 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcUsernamePasswordAuthentication.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcUsernamePasswordAuthentication.h
@@ -1,65 +1,65 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_USERNAME_PASSWORD_AUTHENTICATION
-#define _PLC_USERNAME_PASSWORD_AUTHENTICATION
-
-#include <string>
-
-#include "PlcAuthentication.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace authentication
-					{
-
-						class PlcUsernamePasswordAuthentication : public PlcAuthentication
-						{
-							public:
-								PlcUsernamePasswordAuthentication(std::string, std::string);
-								~PlcUsernamePasswordAuthentication();
-
-								std::string getUsername();
-								std::string getPassword();
-
-								bool equals(PlcUsernamePasswordAuthentication&);
-								std::string toString();
-								int hashCode();
-							
-
-							protected:
-								std::string _strUsername;
-								std::string _strPassword;
-						};
-					}
-				}
-			}
-		}
-	}	
-}
-
-#endif
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_USERNAME_PASSWORD_AUTHENTICATION
+#define _PLC_USERNAME_PASSWORD_AUTHENTICATION
+
+#include <string>
+
+#include "PlcAuthentication.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace authentication
+					{
+
+						class PlcUsernamePasswordAuthentication : public PlcAuthentication
+						{
+							public:
+								PlcUsernamePasswordAuthentication(std::string, std::string);
+								~PlcUsernamePasswordAuthentication();
+
+								std::string getUsername();
+								std::string getPassword();
+
+								bool equals(PlcUsernamePasswordAuthentication&);
+								std::string toString();
+								int hashCode();
+							
+
+							protected:
+								std::string _strUsername;
+								std::string _strPassword;
+						};
+					}
+				}
+			}
+		}
+	}	
+}
+
+#endif
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcConnectionException.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcConnectionException.cpp
index 8a95116630f..8a92074270c 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcConnectionException.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcConnectionException.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcConnectionException.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace exceptions
-					{
-
-					}
-				}
-			}
-		}
-	}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcConnectionException.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace exceptions
+					{
+
+					}
+				}
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcConnectionException.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcConnectionException.h
index 20625e74743..59b5adbc082 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcConnectionException.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcConnectionException.h
@@ -1,53 +1,53 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_CONNECTION_EXCEPTION
-#define _PLC_CONNECTION_EXCEPTION
-
-#include "PlcException.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace exceptions
-					{
-						class PlcConnectionException : public PlcException
-						{
-							public:
-								PlcConnectionException(): PlcException() {}
-                                explicit PlcConnectionException(const std::string& strMessage): PlcException(strMessage){}
-								PlcConnectionException(const std::string& strMessage, const std::exception& exException): PlcException(strMessage, exException){}
-                                explicit PlcConnectionException(const std::exception& exException): PlcException(exException){}
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_CONNECTION_EXCEPTION
+#define _PLC_CONNECTION_EXCEPTION
+
+#include "PlcException.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace exceptions
+					{
+						class PlcConnectionException : public PlcException
+						{
+							public:
+								PlcConnectionException(): PlcException() {}
+                                explicit PlcConnectionException(const std::string& strMessage): PlcException(strMessage){}
+								PlcConnectionException(const std::string& strMessage, const std::exception& exException): PlcException(strMessage, exException){}
+                                explicit PlcConnectionException(const std::exception& exException): PlcException(exException){}
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcException.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcException.cpp
index e27c6e2d2a9..2b0779db28a 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcException.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcException.cpp
@@ -1,56 +1,56 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcException.h"
-#include "PlcNotImplementedException.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace exceptions
-					{
-
-						PlcException::PlcException() :
-								logic_error("error")
-						{
-						}
-
-						PlcException::PlcException(const std::string& strMessage, const std::exception& exException) :
-								logic_error(strMessage) // message suppressed, as no matching constructor is available
-						{
-						}
-
-						PlcException::PlcException(const std::exception& ex) :
-								logic_error("error")
-						{
-						}
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcException.h"
+#include "PlcNotImplementedException.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace exceptions
+					{
+
+						PlcException::PlcException() :
+								logic_error("error")
+						{
+						}
+
+						PlcException::PlcException(const std::string& strMessage, const std::exception& exException) :
+								logic_error(strMessage) // message suppressed, as no matching constructor is available
+						{
+						}
+
+						PlcException::PlcException(const std::exception& ex) :
+								logic_error("error")
+						{
+						}
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcException.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcException.h
index 60bda17aa9a..68e2b63637e 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcException.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcException.h
@@ -1,58 +1,58 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_EXCEPTION
-#define _PLC_EXCEPTION
-
-#include <string>
-#include <stdexcept>
-#include <iostream>
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace exceptions
-					{
-						/**
-						 * Most generic type of plc4x exception. All plc4x exceptions are derived from
-						 * PlcException.
-						 */
-						class PlcException : public std::logic_error
-						{
-							public:
-								PlcException();
-								explicit PlcException(const std::string& strMessage): std::logic_error(strMessage.c_str()) {}
-								PlcException(const std::string& strMessage, const std::exception& exException);
-								explicit PlcException(const std::exception& exException);
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_EXCEPTION
+#define _PLC_EXCEPTION
+
+#include <string>
+#include <stdexcept>
+#include <iostream>
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace exceptions
+					{
+						/**
+						 * Most generic type of plc4x exception. All plc4x exceptions are derived from
+						 * PlcException.
+						 */
+						class PlcException : public std::logic_error
+						{
+							public:
+								PlcException();
+								explicit PlcException(const std::string& strMessage): std::logic_error(strMessage.c_str()) {}
+								PlcException(const std::string& strMessage, const std::exception& exException);
+								explicit PlcException(const std::exception& exException);
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcFieldRangeException.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcFieldRangeException.cpp
index 16a5348a269..67ee086c65b 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcFieldRangeException.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcFieldRangeException.cpp
@@ -1,45 +1,45 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcFieldRangeException.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace exceptions
-					{
-
-						PlcFieldRangeException::PlcFieldRangeException(int iMaxIndex, int iRequestedIndex) : 
-							PlcRuntimeException("requested index of " + std::to_string(iRequestedIndex) + " is outside the valid range of 0 -" + std::to_string(iMaxIndex))
-						{
-						}
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcFieldRangeException.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace exceptions
+					{
+
+						PlcFieldRangeException::PlcFieldRangeException(int iMaxIndex, int iRequestedIndex) : 
+							PlcRuntimeException("requested index of " + std::to_string(iRequestedIndex) + " is outside the valid range of 0 -" + std::to_string(iMaxIndex))
+						{
+						}
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcFieldRangeException.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcFieldRangeException.h
index e93e7d04e08..c6dafd709a8 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcFieldRangeException.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcFieldRangeException.h
@@ -1,49 +1,49 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_FIELD_RANGE_EXCEPTION
-#define _PLC_FIELD_RANGE_EXCEPTION
-
-#include "PlcRuntimeException.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace exceptions
-					{
-						class PlcFieldRangeException : public PlcRuntimeException
-						{
-							public:
-								PlcFieldRangeException(int, int);
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_FIELD_RANGE_EXCEPTION
+#define _PLC_FIELD_RANGE_EXCEPTION
+
+#include "PlcRuntimeException.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace exceptions
+					{
+						class PlcFieldRangeException : public PlcRuntimeException
+						{
+							public:
+								PlcFieldRangeException(int, int);
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIncompatibleDatatypeException.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIncompatibleDatatypeException.cpp
index a62e9686ff9..8fa60ce484e 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIncompatibleDatatypeException.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIncompatibleDatatypeException.cpp
@@ -1,45 +1,45 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcIncompatibleDatatypeException.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace exceptions
-					{
-
-						PlcIncompatibleDatatypeException::PlcIncompatibleDatatypeException(const std::string& strDataTypeName, int iIndex) :
-							PlcRuntimeException("Incompatible Datatype" + strDataTypeName + " at index " + std::to_string(iIndex))
-						{
-						}
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcIncompatibleDatatypeException.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace exceptions
+					{
+
+						PlcIncompatibleDatatypeException::PlcIncompatibleDatatypeException(const std::string& strDataTypeName, int iIndex) :
+							PlcRuntimeException("Incompatible Datatype" + strDataTypeName + " at index " + std::to_string(iIndex))
+						{
+						}
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIncompatibleDatatypeException.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIncompatibleDatatypeException.h
index 96e9a000edf..ea2871af117 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIncompatibleDatatypeException.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIncompatibleDatatypeException.h
@@ -1,50 +1,50 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_INCOMPATIBLE_DATATYPE_EXCEPTION
-#define _PLC_INCOMPATIBLE_DATATYPE_EXCEPTION
-
-#include "PlcRuntimeException.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace exceptions
-					{
-						class PlcIncompatibleDatatypeException : public PlcRuntimeException
-						{
-							public:
-								PlcIncompatibleDatatypeException(const std::string&, int);
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_INCOMPATIBLE_DATATYPE_EXCEPTION
+#define _PLC_INCOMPATIBLE_DATATYPE_EXCEPTION
+
+#include "PlcRuntimeException.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace exceptions
+					{
+						class PlcIncompatibleDatatypeException : public PlcRuntimeException
+						{
+							public:
+								PlcIncompatibleDatatypeException(const std::string&, int);
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcInvalidFieldException.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcInvalidFieldException.cpp
index 0d6574009ca..e903b9031e6 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcInvalidFieldException.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcInvalidFieldException.cpp
@@ -1,63 +1,63 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcInvalidFieldException.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace exceptions
-					{
-
-						PlcInvalidFieldException::PlcInvalidFieldException(const std::string& strFieldToBeParsed) :
-							PlcRuntimeException(strFieldToBeParsed + " invalid")
-						{
-                            _strFieldToBeParsed = strFieldToBeParsed;
-						}
-
-						PlcInvalidFieldException::PlcInvalidFieldException(const std::string& strFieldToBeParsed, const std::string& strPattern) :
-							PlcRuntimeException(strFieldToBeParsed + " doesn't match " + strPattern)
-						{
-                            _strFieldToBeParsed = strFieldToBeParsed;
-						}
-
-						PlcInvalidFieldException::PlcInvalidFieldException(const std::string& strFieldToBeParsed, const std::string& strPattern, const std::string& strReadablePattern) :
-							PlcRuntimeException(strFieldToBeParsed + " doesn't match " + strReadablePattern + '(' + strPattern + ')')
-						{							
-                            _strFieldToBeParsed = strFieldToBeParsed;
-						}
-
-						std::string PlcInvalidFieldException::getFieldToBeParsed()
-						{ 
-							return _strFieldToBeParsed;
-						}
-
-					}
-				}			
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcInvalidFieldException.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace exceptions
+					{
+
+						PlcInvalidFieldException::PlcInvalidFieldException(const std::string& strFieldToBeParsed) :
+							PlcRuntimeException(strFieldToBeParsed + " invalid")
+						{
+                            _strFieldToBeParsed = strFieldToBeParsed;
+						}
+
+						PlcInvalidFieldException::PlcInvalidFieldException(const std::string& strFieldToBeParsed, const std::string& strPattern) :
+							PlcRuntimeException(strFieldToBeParsed + " doesn't match " + strPattern)
+						{
+                            _strFieldToBeParsed = strFieldToBeParsed;
+						}
+
+						PlcInvalidFieldException::PlcInvalidFieldException(const std::string& strFieldToBeParsed, const std::string& strPattern, const std::string& strReadablePattern) :
+							PlcRuntimeException(strFieldToBeParsed + " doesn't match " + strReadablePattern + '(' + strPattern + ')')
+						{							
+                            _strFieldToBeParsed = strFieldToBeParsed;
+						}
+
+						std::string PlcInvalidFieldException::getFieldToBeParsed()
+						{ 
+							return _strFieldToBeParsed;
+						}
+
+					}
+				}			
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcInvalidFieldException.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcInvalidFieldException.h
index b9eab8e8fa4..6478d882129 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcInvalidFieldException.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcInvalidFieldException.h
@@ -1,57 +1,57 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_INVALID_FIELD_EXCEPTION
-#define _PLC_INVALID_FIELD_EXCEPTION
-
-#include "PlcRuntimeException.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace exceptions
-					{
-						class PlcInvalidFieldException : public PlcRuntimeException
-						{
-							public:
-                                explicit PlcInvalidFieldException(const std::string& strFieldToBeParsed);
-								PlcInvalidFieldException(const std::string& strFieldToBeParsed, const std::string& strPattern);
-								PlcInvalidFieldException(const std::string& strFieldToBeParsed, const std::string& strPattern, const std::string &strReadablePattern);
-
-								std::string getFieldToBeParsed();
-
-							private:
-								std::string _strFieldToBeParsed;
-						};
-
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_INVALID_FIELD_EXCEPTION
+#define _PLC_INVALID_FIELD_EXCEPTION
+
+#include "PlcRuntimeException.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace exceptions
+					{
+						class PlcInvalidFieldException : public PlcRuntimeException
+						{
+							public:
+                                explicit PlcInvalidFieldException(const std::string& strFieldToBeParsed);
+								PlcInvalidFieldException(const std::string& strFieldToBeParsed, const std::string& strPattern);
+								PlcInvalidFieldException(const std::string& strFieldToBeParsed, const std::string& strPattern, const std::string &strReadablePattern);
+
+								std::string getFieldToBeParsed();
+
+							private:
+								std::string _strFieldToBeParsed;
+						};
+
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIoException.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIoException.cpp
index f402aa7e77d..e3b8070b126 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIoException.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIoException.cpp
@@ -1,41 +1,41 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcIoException.h"
-#include "PlcNotImplementedException.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace exceptions
-					{
-
-					}
-				}
-			}
-		}
-	}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcIoException.h"
+#include "PlcNotImplementedException.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace exceptions
+					{
+
+					}
+				}
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIoException.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIoException.h
index d797d131e33..5d56094f288 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIoException.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIoException.h
@@ -1,55 +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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_IO_EXCEPTION
-#define _PLC_IO_EXCEPTION
-
-#include "PlcException.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace exceptions
-					{
-						/**
-						 * Base exception for all IO related exceptions.
-						 */
-						class PlcIoException : public PlcException
-						{
-							public:
-								explicit PlcIoException(const std::string& strMessage): PlcException(strMessage) {}
-								PlcIoException(const std::string& strMessage, const std::exception &exException): PlcException(strMessage, exException){}
-								explicit PlcIoException(const std::exception& exException): PlcException(exException){}
-						};
-
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_IO_EXCEPTION
+#define _PLC_IO_EXCEPTION
+
+#include "PlcException.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace exceptions
+					{
+						/**
+						 * Base exception for all IO related exceptions.
+						 */
+						class PlcIoException : public PlcException
+						{
+							public:
+								explicit PlcIoException(const std::string& strMessage): PlcException(strMessage) {}
+								PlcIoException(const std::string& strMessage, const std::exception &exException): PlcException(strMessage, exException){}
+								explicit PlcIoException(const std::exception& exException): PlcException(exException){}
+						};
+
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcNotImplementedException.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcNotImplementedException.cpp
index 6eefe528c01..dc34329d263 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcNotImplementedException.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcNotImplementedException.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcNotImplementedException.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace exceptions
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcNotImplementedException.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace exceptions
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcNotImplementedException.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcNotImplementedException.h
index 1ceae5edf6a..88579515c8d 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcNotImplementedException.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcNotImplementedException.h
@@ -1,53 +1,53 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_NOT_IMPLEMENTED_EXCEPTION
-#define _PLC_NOT_IMPLEMENTED_EXCEPTION
-
-#include "PlcRuntimeException.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace exceptions
-					{
-
-						/**
-						 * indicates that a functionality is not implemented yet.
-						 */
-						class PlcNotImplementedException : public PlcRuntimeException
-						{
-							public:
-								explicit PlcNotImplementedException(const std::string& strMessage): PlcRuntimeException(strMessage){}
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_NOT_IMPLEMENTED_EXCEPTION
+#define _PLC_NOT_IMPLEMENTED_EXCEPTION
+
+#include "PlcRuntimeException.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace exceptions
+					{
+
+						/**
+						 * indicates that a functionality is not implemented yet.
+						 */
+						class PlcNotImplementedException : public PlcRuntimeException
+						{
+							public:
+								explicit PlcNotImplementedException(const std::string& strMessage): PlcRuntimeException(strMessage){}
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolException.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolException.cpp
index 028fb6fbee4..67bb8892adb 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolException.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolException.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcProtocolException.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace exceptions
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcProtocolException.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace exceptions
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolException.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolException.h
index 57b7346f115..abcb952b09c 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolException.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolException.h
@@ -1,58 +1,58 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_PROTOCOL_EXCEPTION
-#define _PLC_PROTOCOL_EXCEPTION
-
-#include "PlcException.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace exceptions
-					{
-
-						/**
-						 * Base exception for all protocol related exceptions.
-						 * This is usually if the messages themselves are malformed, contain incorrect information or
-						 * any other problems occur which are related to the protocol being implemented.
-						 */
-						class PlcProtocolException : public PlcException
-						{
-							public:
-								explicit PlcProtocolException(const std::string& strMessage): PlcException(strMessage){}
-								PlcProtocolException(const std::string& strMessage, const std::exception& exException): PlcException(strMessage, exException){};
-								explicit PlcProtocolException(const std::exception& exException): PlcException(exException){}
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_PROTOCOL_EXCEPTION
+#define _PLC_PROTOCOL_EXCEPTION
+
+#include "PlcException.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace exceptions
+					{
+
+						/**
+						 * Base exception for all protocol related exceptions.
+						 * This is usually if the messages themselves are malformed, contain incorrect information or
+						 * any other problems occur which are related to the protocol being implemented.
+						 */
+						class PlcProtocolException : public PlcException
+						{
+							public:
+								explicit PlcProtocolException(const std::string& strMessage): PlcException(strMessage){}
+								PlcProtocolException(const std::string& strMessage, const std::exception& exException): PlcException(strMessage, exException){};
+								explicit PlcProtocolException(const std::exception& exException): PlcException(exException){}
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolPayloadTooBigException.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolPayloadTooBigException.cpp
index a23ca8df1c4..210f3747da3 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolPayloadTooBigException.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolPayloadTooBigException.cpp
@@ -1,69 +1,69 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcProtocolPayloadTooBigException.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace exceptions
-					{
-
-						PlcProtocolPayloadTooBigException::PlcProtocolPayloadTooBigException(const std::string& strProtocolName, int iMaxSize, int iActualSize, std::vector<char> vecPayload) :
-							PlcProtocolException("Payload for protocol '" + strProtocolName + "' with size " + std::to_string(iActualSize) + " exceeded allowed maximum of " + std::to_string(iMaxSize))
-						{
-							_strProtocolName = strProtocolName;
-							_iMaxSize = iMaxSize;
-							_iActualSize = iActualSize;
-							_vecPayload = vecPayload;
-						}
-
-						std::string PlcProtocolPayloadTooBigException::getProtocolName() 
-						{ 
-							return _strProtocolName;
-						}
-						
-						int PlcProtocolPayloadTooBigException::getMaxSize() 
-						{ 
-							return _iMaxSize;
-						}
-
-						int PlcProtocolPayloadTooBigException::getActualSize() 
-						{ 
-							return _iActualSize;
-						}
-
-						std::vector<char> PlcProtocolPayloadTooBigException::getPayload() 
-						{ 
-							return _vecPayload;
-						}
-
-					}
-				}			
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcProtocolPayloadTooBigException.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace exceptions
+					{
+
+						PlcProtocolPayloadTooBigException::PlcProtocolPayloadTooBigException(const std::string& strProtocolName, int iMaxSize, int iActualSize, std::vector<char> vecPayload) :
+							PlcProtocolException("Payload for protocol '" + strProtocolName + "' with size " + std::to_string(iActualSize) + " exceeded allowed maximum of " + std::to_string(iMaxSize))
+						{
+							_strProtocolName = strProtocolName;
+							_iMaxSize = iMaxSize;
+							_iActualSize = iActualSize;
+							_vecPayload = vecPayload;
+						}
+
+						std::string PlcProtocolPayloadTooBigException::getProtocolName() 
+						{ 
+							return _strProtocolName;
+						}
+						
+						int PlcProtocolPayloadTooBigException::getMaxSize() 
+						{ 
+							return _iMaxSize;
+						}
+
+						int PlcProtocolPayloadTooBigException::getActualSize() 
+						{ 
+							return _iActualSize;
+						}
+
+						std::vector<char> PlcProtocolPayloadTooBigException::getPayload() 
+						{ 
+							return _vecPayload;
+						}
+
+					}
+				}			
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolPayloadTooBigException.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolPayloadTooBigException.h
index 6811134a99d..5d8dff7348d 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolPayloadTooBigException.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolPayloadTooBigException.h
@@ -1,64 +1,64 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_PROTOCOL_PAYLOAD_TOO_BIG_EXCEPTION
-#define _PLC_PROTOCOL_PAYLOAD_TOO_BIG_EXCEPTION
-
-#include <string>
-#include <vector>
-
-#include "PlcProtocolException.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace exceptions
-					{
-						class PlcProtocolPayloadTooBigException : public PlcProtocolException
-						{
-							public:
-								PlcProtocolPayloadTooBigException(const std::string& strProtocolName, int iMaxSize, int iActualSize, std::vector<char> vecPayload);
-
-								std::string getProtocolName();
-								int getMaxSize();
-								int getActualSize();
-								std::vector<char> getPayload();
-
-							private:
-								std::string _strProtocolName;
-								int _iMaxSize;
-								int _iActualSize;
-								std::vector<char> _vecPayload;
-						};
-
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_PROTOCOL_PAYLOAD_TOO_BIG_EXCEPTION
+#define _PLC_PROTOCOL_PAYLOAD_TOO_BIG_EXCEPTION
+
+#include <string>
+#include <vector>
+
+#include "PlcProtocolException.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace exceptions
+					{
+						class PlcProtocolPayloadTooBigException : public PlcProtocolException
+						{
+							public:
+								PlcProtocolPayloadTooBigException(const std::string& strProtocolName, int iMaxSize, int iActualSize, std::vector<char> vecPayload);
+
+								std::string getProtocolName();
+								int getMaxSize();
+								int getActualSize();
+								std::vector<char> getPayload();
+
+							private:
+								std::string _strProtocolName;
+								int _iMaxSize;
+								int _iActualSize;
+								std::vector<char> _vecPayload;
+						};
+
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcRuntimeException.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcRuntimeException.cpp
index be12a6ab0f6..1509f2c7a4e 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcRuntimeException.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcRuntimeException.cpp
@@ -1,51 +1,51 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcRuntimeException.h"
-#include "PlcNotImplementedException.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace exceptions
-					{
-
-						PlcRuntimeException::PlcRuntimeException(const std::string& strMessage, const std::exception& exException) :
-							runtime_error(strMessage) // message suppressed, as no matching constructor is available
-						{
-						}
-
-						PlcRuntimeException::PlcRuntimeException(const std::exception& exException) :
-						    runtime_error("error")
-						{
-						}
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcRuntimeException.h"
+#include "PlcNotImplementedException.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace exceptions
+					{
+
+						PlcRuntimeException::PlcRuntimeException(const std::string& strMessage, const std::exception& exException) :
+							runtime_error(strMessage) // message suppressed, as no matching constructor is available
+						{
+						}
+
+						PlcRuntimeException::PlcRuntimeException(const std::exception& exException) :
+						    runtime_error("error")
+						{
+						}
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcRuntimeException.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcRuntimeException.h
index 784b5353425..e9da29c3cef 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcRuntimeException.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcRuntimeException.h
@@ -1,59 +1,59 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_RUNTIME_EXCEPTION
-#define _PLC_RUNTIME_EXCEPTION
-
-#include <string>
-#include <stdexcept>
-#include <iostream>
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace exceptions
-					{
-
-						/**
-						 * Most generic type of plc4x runtime exception. All plc4x exceptions are derived from
-						 * PlcException.
-						 */
-						class PlcRuntimeException : public std::runtime_error
-						{
-							public:
-                                explicit PlcRuntimeException(const std::string& strMessage): std::runtime_error(strMessage.c_str()){}
-								PlcRuntimeException(const std::string& strMessage, const std::exception &exException);
-                                explicit PlcRuntimeException(const std::exception& exException);
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_RUNTIME_EXCEPTION
+#define _PLC_RUNTIME_EXCEPTION
+
+#include <string>
+#include <stdexcept>
+#include <iostream>
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace exceptions
+					{
+
+						/**
+						 * Most generic type of plc4x runtime exception. All plc4x exceptions are derived from
+						 * PlcException.
+						 */
+						class PlcRuntimeException : public std::runtime_error
+						{
+							public:
+                                explicit PlcRuntimeException(const std::string& strMessage): std::runtime_error(strMessage.c_str()){}
+								PlcRuntimeException(const std::string& strMessage, const std::exception &exException);
+                                explicit PlcRuntimeException(const std::exception& exException);
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcTimeoutException.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcTimeoutException.cpp
index 558113a8e41..e4b647e05d5 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcTimeoutException.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcTimeoutException.cpp
@@ -1,51 +1,51 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcTimeoutException.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace exceptions
-					{
-
-						PlcTimeoutException::PlcTimeoutException(long lTimeout) :
-							PlcRuntimeException("Timeout reached after " + std::to_string(lTimeout) + "ns")
-						{
-							_lTimeout = lTimeout;
-						}
-
-						long PlcTimeoutException::getTimeout() 
-						{
-							return _lTimeout; 
-						}
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcTimeoutException.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace exceptions
+					{
+
+						PlcTimeoutException::PlcTimeoutException(long lTimeout) :
+							PlcRuntimeException("Timeout reached after " + std::to_string(lTimeout) + "ns")
+						{
+							_lTimeout = lTimeout;
+						}
+
+						long PlcTimeoutException::getTimeout() 
+						{
+							return _lTimeout; 
+						}
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcTimeoutException.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcTimeoutException.h
index 44e0be430f2..545e4edcf5d 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcTimeoutException.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcTimeoutException.h
@@ -1,69 +1,69 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_TIMEOUT_EXCEPTION
-#define _PLC_TIMEOUT_EXCEPTION
-
-#include <string>
-#include <chrono>
-
-#include "PlcRuntimeException.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace exceptions
-					{
-						/**
-						 * Can be thrown when something times out.
-						 */
-						class PlcTimeoutException : public PlcRuntimeException
-						{
-							public:
-								/**
-								* Indicates something timed out.
-								*
-								* @param timeout in nanoseconds.
-								*/
-								explicit PlcTimeoutException(long lTimeout);
-
-								long getTimeout();
-
-							private:
-								/**
-								* @return the timeout in nanoseconds.
-								*/
-								long _lTimeout;
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_TIMEOUT_EXCEPTION
+#define _PLC_TIMEOUT_EXCEPTION
+
+#include <string>
+#include <chrono>
+
+#include "PlcRuntimeException.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace exceptions
+					{
+						/**
+						 * Can be thrown when something times out.
+						 */
+						class PlcTimeoutException : public PlcRuntimeException
+						{
+							public:
+								/**
+								* Indicates something timed out.
+								*
+								* @param timeout in nanoseconds.
+								*/
+								explicit PlcTimeoutException(long lTimeout);
+
+								long getTimeout();
+
+							private:
+								/**
+								* @return the timeout in nanoseconds.
+								*/
+								long _lTimeout;
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedDataTypeException.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedDataTypeException.cpp
index 518e165607a..74764903094 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedDataTypeException.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedDataTypeException.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcUnsupportedDataTypeException.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace exceptions
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcUnsupportedDataTypeException.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace exceptions
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedDataTypeException.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedDataTypeException.h
index 9910997b10f..c5d6d4c94d7 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedDataTypeException.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedDataTypeException.h
@@ -1,54 +1,54 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_UNSUPPORTED_DATATYPE_EXCEPTION
-#define _PLC_UNSUPPORTED_DATATYPE_EXCEPTION
-
-#include "PlcRuntimeException.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace exceptions
-					{
-						/**
-						 * Indicate that a data type ({@link Class}) is not supported by Plc4x.
-						 */
-						class PlcUnsupportedDataTypeException : public PlcRuntimeException
-						{
-							public:
-								explicit PlcUnsupportedDataTypeException(const std::string& strMessage): PlcRuntimeException(strMessage){}
-								PlcUnsupportedDataTypeException(const std::string& strMessage, const std::exception &exException): PlcRuntimeException(strMessage, exException){}
-								explicit PlcUnsupportedDataTypeException(const std::exception &exException): PlcRuntimeException(exException){}
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_UNSUPPORTED_DATATYPE_EXCEPTION
+#define _PLC_UNSUPPORTED_DATATYPE_EXCEPTION
+
+#include "PlcRuntimeException.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace exceptions
+					{
+						/**
+						 * Indicate that a data type ({@link Class}) is not supported by Plc4x.
+						 */
+						class PlcUnsupportedDataTypeException : public PlcRuntimeException
+						{
+							public:
+								explicit PlcUnsupportedDataTypeException(const std::string& strMessage): PlcRuntimeException(strMessage){}
+								PlcUnsupportedDataTypeException(const std::string& strMessage, const std::exception &exException): PlcRuntimeException(strMessage, exException){}
+								explicit PlcUnsupportedDataTypeException(const std::exception &exException): PlcRuntimeException(exException){}
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedOperationException.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedOperationException.cpp
index 652e7bac5d5..c5e388369ec 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedOperationException.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedOperationException.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcUnsupportedOperationException.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace exceptions
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcUnsupportedOperationException.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace exceptions
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedOperationException.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedOperationException.h
index 8c631bb3f37..9366de0d04a 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedOperationException.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedOperationException.h
@@ -1,55 +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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_UNSUPPORTED_OPERATION_EXCEPTION
-#define _PLC_UNSUPPORTED_OPERATION_EXCEPTION
-
-#include "PlcRuntimeException.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace exceptions
-					{
-						/**
-						 * Indicate that a data type ({@link Class}) is not supported by Plc4x.
-						 */
-						class PlcUnsupportedOperationException : public PlcRuntimeException
-						{
-							public:
-								explicit PlcUnsupportedOperationException(const std::string& strMessage): PlcRuntimeException(strMessage) {}
-								PlcUnsupportedOperationException(const std::string& strMessage, const std::exception& exException): PlcRuntimeException(strMessage, exException){}
-								explicit PlcUnsupportedOperationException(const std::exception& exException): PlcRuntimeException(exException){}
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_UNSUPPORTED_OPERATION_EXCEPTION
+#define _PLC_UNSUPPORTED_OPERATION_EXCEPTION
+
+#include "PlcRuntimeException.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace exceptions
+					{
+						/**
+						 * Indicate that a data type ({@link Class}) is not supported by Plc4x.
+						 */
+						class PlcUnsupportedOperationException : public PlcRuntimeException
+						{
+							public:
+								explicit PlcUnsupportedOperationException(const std::string& strMessage): PlcRuntimeException(strMessage) {}
+								PlcUnsupportedOperationException(const std::string& strMessage, const std::exception& exException): PlcRuntimeException(strMessage, exException){}
+								explicit PlcUnsupportedOperationException(const std::exception& exException): PlcRuntimeException(exException){}
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcFieldRequest.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcFieldRequest.cpp
index 274319d556f..7366e64f7dc 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcFieldRequest.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcFieldRequest.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcFieldRequest.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcFieldRequest.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcFieldRequest.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcFieldRequest.h
index 1b4d302ebb5..09e3f668c9f 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcFieldRequest.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcFieldRequest.h
@@ -1,63 +1,63 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_FIELD_REQUEST
-#define _PLC_FIELD_REQUEST
-
-#include "../model/PlcField.h"
-#include "PlcFieldResponse.h"
-
-#include <string>
-#include <map>
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-						/**
-						 * Base type for all messages sent from the plc4x system to a connected plc.
-						 */
-						class PlcFieldRequest : public PlcRequest
-						{
-							public:	
-								virtual int getNumberOfFields() = 0;
-                                virtual std::vector<std::string> getFieldNames();
-								virtual PlcField* getField(std::string) = 0;
-								virtual std::vector<PlcField*> getFields() = 0;
-                                virtual std::map<std::string, PlcField*> getNamedFields() = 0;
-
-							private:
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_FIELD_REQUEST
+#define _PLC_FIELD_REQUEST
+
+#include "../model/PlcField.h"
+#include "PlcFieldResponse.h"
+
+#include <string>
+#include <map>
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+						/**
+						 * Base type for all messages sent from the plc4x system to a connected plc.
+						 */
+						class PlcFieldRequest : public PlcRequest
+						{
+							public:	
+								virtual int getNumberOfFields() = 0;
+                                virtual std::vector<std::string> getFieldNames();
+								virtual PlcField* getField(std::string) = 0;
+								virtual std::vector<PlcField*> getFields() = 0;
+                                virtual std::map<std::string, PlcField*> getNamedFields() = 0;
+
+							private:
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcFieldResponse.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcFieldResponse.cpp
index 05721f981a0..da7092cec8b 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcFieldResponse.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcFieldResponse.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcFieldResponse.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages					
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcFieldResponse.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages					
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcFieldResponse.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcFieldResponse.h
index a436415e006..1195f3ae684 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcFieldResponse.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcFieldResponse.h
@@ -1,67 +1,67 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_FIELD_RESPONSE
-#define _PLC_FIELD_RESPONSE
-
-#include "PlcResponse.h"
-#include "../types/PlcResponseCode.h"
-#include "../model/PlcField.h"
-
-#include <string>
-#include <vector>
-
-using namespace org::apache::plc4x::cpp::api::model;
-using namespace org::apache::plc4x::cpp::api::types;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-						/**
-						 * Base type for all response messages sent as response for a prior request
-						 * from a plc to the plc4x system.
-						 */
-						class PlcFieldResponse : public PlcResponse
-						{
-							public:	
-								virtual std::vector<std::string>* getFieldNames() = 0;
-								virtual PlcField* getField(std::string& strName) = 0;
-								virtual PlcResponseCode* getresponseCode(std::string& strName) = 0;
-								virtual PlcRequest* getRequest() = 0;
-
-							private:
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_FIELD_RESPONSE
+#define _PLC_FIELD_RESPONSE
+
+#include "PlcResponse.h"
+#include "../types/PlcResponseCode.h"
+#include "../model/PlcField.h"
+
+#include <string>
+#include <vector>
+
+using namespace org::apache::plc4x::cpp::api::model;
+using namespace org::apache::plc4x::cpp::api::types;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+						/**
+						 * Base type for all response messages sent as response for a prior request
+						 * from a plc to the plc4x system.
+						 */
+						class PlcFieldResponse : public PlcResponse
+						{
+							public:	
+								virtual std::vector<std::string>* getFieldNames() = 0;
+								virtual PlcField* getField(std::string& strName) = 0;
+								virtual PlcResponseCode* getresponseCode(std::string& strName) = 0;
+								virtual PlcRequest* getRequest() = 0;
+
+							private:
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcMessage.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcMessage.cpp
index 1e6f711b0c5..fdabdb240a1 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcMessage.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcMessage.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcMessage.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcMessage.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcMessage.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcMessage.h
index e091da499aa..c8de98fb506 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcMessage.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcMessage.h
@@ -1,52 +1,52 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_MESSAGE
-#define _PLC_MESSAGE
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-						/**
-						 * Base type for all forms of messages passed between plc and plc4x system.
-						 */
-						class PlcMessage
-						{
-							public:	
-
-							private:
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_MESSAGE
+#define _PLC_MESSAGE
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+						/**
+						 * Base type for all forms of messages passed between plc and plc4x system.
+						 */
+						class PlcMessage
+						{
+							public:	
+
+							private:
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequest.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequest.cpp
index 9b9f9a051a9..a0c5e6b5462 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequest.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequest.cpp
@@ -1,47 +1,47 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcReadRequest.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-						PlcReadRequest::PlcReadRequest()
-						{
-						}
-
-						PlcReadRequest::~PlcReadRequest()
-						{
-							 // TODO Free Pointer eg. use Smartpointer ?
-						}
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcReadRequest.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+						PlcReadRequest::PlcReadRequest()
+						{
+						}
+
+						PlcReadRequest::~PlcReadRequest()
+						{
+							 // TODO Free Pointer eg. use Smartpointer ?
+						}
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequest.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequest.h
index afcdbe551e4..b68e856d7c2 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequest.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequest.h
@@ -1,67 +1,67 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_READ_REQUEST
-#define _PLC_READ_REQUEST
-
-#include "PlcFieldRequest.h"
-#include "PlcRequestBuilder.h"
-
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-						/**
-						 * Request to read one or more values from a plc.
-						 */
-						class PlcReadRequest : public PlcFieldRequest
-						{
-						public:	
-							PlcReadRequest();
-							~PlcReadRequest();
-
-                            class Builder : public PlcRequestBuilder
-                            {
-                            public:
-                                virtual PlcReadRequest* build() = 0;
-                                virtual Builder* addItem(std::string& strName, std::string& strFieldQuery) = 0;
-                            };
-
-						private:
-							
-						};
-												
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_READ_REQUEST
+#define _PLC_READ_REQUEST
+
+#include "PlcFieldRequest.h"
+#include "PlcRequestBuilder.h"
+
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+						/**
+						 * Request to read one or more values from a plc.
+						 */
+						class PlcReadRequest : public PlcFieldRequest
+						{
+						public:	
+							PlcReadRequest();
+							~PlcReadRequest();
+
+                            class Builder : public PlcRequestBuilder
+                            {
+                            public:
+                                virtual PlcReadRequest* build() = 0;
+                                virtual Builder* addItem(std::string& strName, std::string& strFieldQuery) = 0;
+                            };
+
+						private:
+							
+						};
+												
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequestBuilder.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequestBuilder.cpp
index 45f2ced6cb2..a5df7685544 100644
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequestBuilder.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequestBuilder.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcReadRequestBuilder.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcReadRequestBuilder.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequestBuilder.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequestBuilder.h
index cdb16a7b613..e438098ba0c 100644
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequestBuilder.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequestBuilder.h
@@ -1,57 +1,57 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_READ_REQUEST_BUILDER
-#define _PLC_READ_REQUEST_BUILDER
-
-#include "PlcRequestBuilder.h"
-
-#include <string>
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-						/**
-						 * Base type for all forms of messages passed between plc and plc4x system.
-						 */
-						class PlcReadRequestBuilder : public PlcRequestBuilder
-						{
-							public:
-								virtual PlcReadRequestBuilder* addItem(std::string& strName, std::string& strFieldQuery) = 0;
-
-						};
-						
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_READ_REQUEST_BUILDER
+#define _PLC_READ_REQUEST_BUILDER
+
+#include "PlcRequestBuilder.h"
+
+#include <string>
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+						/**
+						 * Base type for all forms of messages passed between plc and plc4x system.
+						 */
+						class PlcReadRequestBuilder : public PlcRequestBuilder
+						{
+							public:
+								virtual PlcReadRequestBuilder* addItem(std::string& strName, std::string& strFieldQuery) = 0;
+
+						};
+						
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadResponse.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadResponse.cpp
index 1188ca53d86..8b47571e88f 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadResponse.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadResponse.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcReadResponse.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcReadResponse.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadResponse.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadResponse.h
index 1ce53702245..e5ab2b33965 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadResponse.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadResponse.h
@@ -1,136 +1,136 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_READ_RESPONSE
-#define _PLC_READ_RESPONSE
-
-#include "PlcFieldResponse.h"
-#include "PlcReadRequest.h"
-
-#include <boost/multiprecision/cpp_dec_float.hpp>
-#include "../types/ValueTypeObject.h"
-#include <ctime>
-
-using namespace boost::multiprecision;
-using namespace org::apache::plc4x::cpp::api::types;
-
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-						/**
-						 * Response to a {@link PlcReadRequest}.
-						 */
-						class PlcReadResponse : PlcFieldResponse
-						{
-							public:	
-								virtual PlcRequest* getRequest() = 0;
-								virtual int getNumberOfValues(std::string& strName) = 0;
-								virtual ValueTypeObject* getObject(std::string& strName) = 0;
-								virtual ValueTypeObject* getObject(std::string& strName, int& iIndex) = 0;
-								virtual std::vector<ValueTypeObject*>* getAllObjects(std::string& strName) = 0;
-								virtual bool isValidBoolean(std::string& strName) = 0;
-								virtual bool isValidBoolean(std::string& strName, int& iIndex) = 0;
-								virtual bool getBoolean(std::string& strName) = 0;
-								virtual bool getBoolean(std::string& strName, int iIndex) = 0;
-								virtual std::vector<bool>* getAllBooleans(std::string& strName) = 0;
-								virtual bool isValidByte(std::string& strName) = 0;
-								virtual bool isValidByte(std::string& strName, int iIndex) = 0;
-								virtual char getByte(std::string& strName) = 0;
-								virtual char getByte(std::string& strName, int& iIndex) = 0;
-								virtual std::vector<char>* getAllBytes(std::string& strName) = 0;
-								virtual bool isValidShort(std::string& strName) =  0;
-								virtual bool isValidShort(std::string& strName, int iIndex) = 0;
-								virtual short getShort(std::string& strName) = 0;
-								virtual short getShort(std::string& strName, int& iIndex) = 0;
-								virtual std::vector<short>* getAllShorts(std::string& strName) = 0;
-								virtual bool isValidInteger(std::string& strName) = 0;
-								virtual bool isValidInteger(std::string& strName, int& iIndex) = 0;
-								virtual int getInteger(std::string& strName) = 0;
-								virtual int getInteger(std::string& strName, int& iIndex) = 0;
-								virtual std::vector<int>* getAllIntegers(std::string& strName) = 0;
-								virtual bool isValidBigInteger(std::string& strName) = 0;
-								virtual bool isValidBigInteger(std::string& strName, int& iIndex) = 0;
-								virtual long long* getBigInteger(std::string& strName) = 0;
-								virtual long long* getBigInteger(std::string& strName, int& iIndex) = 0;
-								virtual std::vector<long long>* getAllBigIntegers(std::string& strName) = 0;
-								virtual bool isValidLong(std::string& strName) = 0;
-								virtual bool isValidLong(std::string& strName, int& iIndex) = 0;
-								virtual long getLong(std::string& strName) = 0;
-								virtual long getLong(std::string& strName, int& iIndex) = 0;
-								virtual std::vector<long>* getAllLongs(std::string& strName) = 0;
-								virtual bool isValidFloat(std::string& strName) = 0;
-								virtual bool isValidFloat(std::string& strName, int& iIndex) = 0;
-								virtual float getFloat(std::string& strName) = 0;
-								virtual float getFloat(std::string& strName, int& iIndex) = 0;
-								virtual std::vector<float>* getAllFloats(std::string& strName) = 0;
-								virtual bool isValidDouble(std::string& strName) = 0;
-								virtual double getDouble(std::string& strName) = 0;
-								virtual double getDouble(std::string& strName, int& iIndex) = 0;
-								virtual std::vector<double>* getAllDoubles(std::string& strName) = 0;
-								virtual bool isValidBigDecimal(std::string& strName) = 0;
-								virtual cpp_dec_float_100 getBigDecimal(std::string& strName) = 0;
-								virtual cpp_dec_float_100 getBigDecimal(std::string& strName, int& iIndex) = 0;
-								virtual std::vector<cpp_dec_float_100>* getAllBigDecimals(std::string& strName) = 0;
-								virtual bool isValidString(std::string& strName) = 0;
-								virtual bool isValidString(std::string& strName, int& iIndex) = 0;
-								virtual std::string getString(std::string& strName) =  0;
-								virtual std::string getString(std::string& strName, int& iIndex) = 0;
-								virtual std::vector<std::string>* getAllStrings(std::string& strName) = 0;
-								virtual bool isValidTime(std::string& strName) = 0;
-								virtual bool isValidTime(std::string& strName, int& iIndex) = 0;
-								virtual std::time_t getTime(std::string& strName) = 0;
-								virtual std::time_t getTime(std::string& strName, int& iIndex) = 0;
-								virtual std::vector<std::time_t>* getAllTimes(std::string& strName) = 0;
-								virtual bool isValidDate(std::string& strName) = 0;
-								virtual bool isValidDate(std::string& strName, int& iIndex) = 0;
-								virtual tm& getDate(std::string& strName) = 0;
-								virtual tm& getDate(std::string& strName, int& iIndex) = 0;
-								virtual std::vector<tm>* getAllDates(std::string& strName)= 0;
-								virtual bool isValidDateTime(std::string& strName) = 0;
-								virtual bool isValidDateTime(std::string& strName, int& iIndex) = 0;
-								virtual tm* getDateTime(std::string& strName) = 0;
-								virtual tm*  getDateTime(std::string& strName, int& iIndex) = 0;
-								virtual std::vector<tm>* getAllDateTimes(std::string& strName) = 0;
-								virtual bool isValidByteArray(std::string& strName) = 0;
-								virtual bool isValidByteArray(std::string& strName, int& iIndex) = 0;
-								virtual std::vector<char>* getByteArray(std::string& strName) = 0; // Todo: Pointer to byte-array ???
-								virtual std::vector<char>* getByteArray(std::string& strName, int& iIndex) = 0;  // Todo: Pointer to byte-array ???
-								virtual std::vector<std::vector<char>*>* getAllByteArrays(std::string& strName) = 0;
-
-							private:
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_READ_RESPONSE
+#define _PLC_READ_RESPONSE
+
+#include "PlcFieldResponse.h"
+#include "PlcReadRequest.h"
+
+#include <boost/multiprecision/cpp_dec_float.hpp>
+#include "../types/ValueTypeObject.h"
+#include <ctime>
+
+using namespace boost::multiprecision;
+using namespace org::apache::plc4x::cpp::api::types;
+
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+						/**
+						 * Response to a {@link PlcReadRequest}.
+						 */
+						class PlcReadResponse : PlcFieldResponse
+						{
+							public:	
+								virtual PlcRequest* getRequest() = 0;
+								virtual int getNumberOfValues(std::string& strName) = 0;
+								virtual ValueTypeObject* getObject(std::string& strName) = 0;
+								virtual ValueTypeObject* getObject(std::string& strName, int& iIndex) = 0;
+								virtual std::vector<ValueTypeObject*>* getAllObjects(std::string& strName) = 0;
+								virtual bool isValidBoolean(std::string& strName) = 0;
+								virtual bool isValidBoolean(std::string& strName, int& iIndex) = 0;
+								virtual bool getBoolean(std::string& strName) = 0;
+								virtual bool getBoolean(std::string& strName, int iIndex) = 0;
+								virtual std::vector<bool>* getAllBooleans(std::string& strName) = 0;
+								virtual bool isValidByte(std::string& strName) = 0;
+								virtual bool isValidByte(std::string& strName, int iIndex) = 0;
+								virtual char getByte(std::string& strName) = 0;
+								virtual char getByte(std::string& strName, int& iIndex) = 0;
+								virtual std::vector<char>* getAllBytes(std::string& strName) = 0;
+								virtual bool isValidShort(std::string& strName) =  0;
+								virtual bool isValidShort(std::string& strName, int iIndex) = 0;
+								virtual short getShort(std::string& strName) = 0;
+								virtual short getShort(std::string& strName, int& iIndex) = 0;
+								virtual std::vector<short>* getAllShorts(std::string& strName) = 0;
+								virtual bool isValidInteger(std::string& strName) = 0;
+								virtual bool isValidInteger(std::string& strName, int& iIndex) = 0;
+								virtual int getInteger(std::string& strName) = 0;
+								virtual int getInteger(std::string& strName, int& iIndex) = 0;
+								virtual std::vector<int>* getAllIntegers(std::string& strName) = 0;
+								virtual bool isValidBigInteger(std::string& strName) = 0;
+								virtual bool isValidBigInteger(std::string& strName, int& iIndex) = 0;
+								virtual long long* getBigInteger(std::string& strName) = 0;
+								virtual long long* getBigInteger(std::string& strName, int& iIndex) = 0;
+								virtual std::vector<long long>* getAllBigIntegers(std::string& strName) = 0;
+								virtual bool isValidLong(std::string& strName) = 0;
+								virtual bool isValidLong(std::string& strName, int& iIndex) = 0;
+								virtual long getLong(std::string& strName) = 0;
+								virtual long getLong(std::string& strName, int& iIndex) = 0;
+								virtual std::vector<long>* getAllLongs(std::string& strName) = 0;
+								virtual bool isValidFloat(std::string& strName) = 0;
+								virtual bool isValidFloat(std::string& strName, int& iIndex) = 0;
+								virtual float getFloat(std::string& strName) = 0;
+								virtual float getFloat(std::string& strName, int& iIndex) = 0;
+								virtual std::vector<float>* getAllFloats(std::string& strName) = 0;
+								virtual bool isValidDouble(std::string& strName) = 0;
+								virtual double getDouble(std::string& strName) = 0;
+								virtual double getDouble(std::string& strName, int& iIndex) = 0;
+								virtual std::vector<double>* getAllDoubles(std::string& strName) = 0;
+								virtual bool isValidBigDecimal(std::string& strName) = 0;
+								virtual cpp_dec_float_100 getBigDecimal(std::string& strName) = 0;
+								virtual cpp_dec_float_100 getBigDecimal(std::string& strName, int& iIndex) = 0;
+								virtual std::vector<cpp_dec_float_100>* getAllBigDecimals(std::string& strName) = 0;
+								virtual bool isValidString(std::string& strName) = 0;
+								virtual bool isValidString(std::string& strName, int& iIndex) = 0;
+								virtual std::string getString(std::string& strName) =  0;
+								virtual std::string getString(std::string& strName, int& iIndex) = 0;
+								virtual std::vector<std::string>* getAllStrings(std::string& strName) = 0;
+								virtual bool isValidTime(std::string& strName) = 0;
+								virtual bool isValidTime(std::string& strName, int& iIndex) = 0;
+								virtual std::time_t getTime(std::string& strName) = 0;
+								virtual std::time_t getTime(std::string& strName, int& iIndex) = 0;
+								virtual std::vector<std::time_t>* getAllTimes(std::string& strName) = 0;
+								virtual bool isValidDate(std::string& strName) = 0;
+								virtual bool isValidDate(std::string& strName, int& iIndex) = 0;
+								virtual tm& getDate(std::string& strName) = 0;
+								virtual tm& getDate(std::string& strName, int& iIndex) = 0;
+								virtual std::vector<tm>* getAllDates(std::string& strName)= 0;
+								virtual bool isValidDateTime(std::string& strName) = 0;
+								virtual bool isValidDateTime(std::string& strName, int& iIndex) = 0;
+								virtual tm* getDateTime(std::string& strName) = 0;
+								virtual tm*  getDateTime(std::string& strName, int& iIndex) = 0;
+								virtual std::vector<tm>* getAllDateTimes(std::string& strName) = 0;
+								virtual bool isValidByteArray(std::string& strName) = 0;
+								virtual bool isValidByteArray(std::string& strName, int& iIndex) = 0;
+								virtual std::vector<char>* getByteArray(std::string& strName) = 0; // Todo: Pointer to byte-array ???
+								virtual std::vector<char>* getByteArray(std::string& strName, int& iIndex) = 0;  // Todo: Pointer to byte-array ???
+								virtual std::vector<std::vector<char>*>* getAllByteArrays(std::string& strName) = 0;
+
+							private:
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcRequest.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcRequest.cpp
index 2587a3011ed..08c29710b85 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcRequest.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcRequest.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcRequest.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcRequest.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcRequest.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcRequest.h
index e259e01166e..c24a177a3ef 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcRequest.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcRequest.h
@@ -1,55 +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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_REQUEST
-#define _PLC_REQUEST
-
-#include "PlcMessage.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-						/**
-						 * Base type for all messages sent from the plc4x system to a connected plc.
-						 */
-						
-						class PlcRequest : PlcMessage 
-						{
-							public:	
-
-							private:
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_REQUEST
+#define _PLC_REQUEST
+
+#include "PlcMessage.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+						/**
+						 * Base type for all messages sent from the plc4x system to a connected plc.
+						 */
+						
+						class PlcRequest : PlcMessage 
+						{
+							public:	
+
+							private:
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcRequestBuilder.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcRequestBuilder.cpp
index 3d9874354a1..554ae7796c3 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcRequestBuilder.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcRequestBuilder.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcRequestBuilder.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcRequestBuilder.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcRequestBuilder.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcRequestBuilder.h
index 6b80d19ec18..89987b09eda 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcRequestBuilder.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcRequestBuilder.h
@@ -1,54 +1,54 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_REQUEST_BUILDER
-#define _PLC_REQUEST_BUILDER
-
-#include "PlcRequest.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-						/**
-						 * Base type for all forms of messages passed between plc and plc4x system.
-						 */
-						class PlcRequestBuilder
-						{
-							public:	
-
-							private:
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_REQUEST_BUILDER
+#define _PLC_REQUEST_BUILDER
+
+#include "PlcRequest.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+						/**
+						 * Base type for all forms of messages passed between plc and plc4x system.
+						 */
+						class PlcRequestBuilder
+						{
+							public:	
+
+							private:
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcResponse.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcResponse.cpp
index b80f0b03df4..e4b3df49f16 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcResponse.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcResponse.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcResponse.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcResponse.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcResponse.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcResponse.h
index 3980da237d6..edbef642ccf 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcResponse.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcResponse.h
@@ -1,56 +1,56 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_RESPONSE
-#define _PLC_RESPONSE
-
-#include "PlcMessage.h"
-#include "PlcRequest.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-						/**
-						 * Base type for all response messages sent as response for a prior request
-						 * from a plc to the plc4x system.
-						 */
-						class PlcResponse : PlcMessage 
-						{							
-							public:	
-								virtual PlcRequest* getRequest() = 0;
-
-							private:
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_RESPONSE
+#define _PLC_RESPONSE
+
+#include "PlcMessage.h"
+#include "PlcRequest.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+						/**
+						 * Base type for all response messages sent as response for a prior request
+						 * from a plc to the plc4x system.
+						 */
+						class PlcResponse : PlcMessage 
+						{							
+							public:	
+								virtual PlcRequest* getRequest() = 0;
+
+							private:
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionEvent.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionEvent.cpp
index 5aa3737859c..29eb28b7d16 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionEvent.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionEvent.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcSubscriptionEvent.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcSubscriptionEvent.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionEvent.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionEvent.h
index 1bf8b3e475d..e87d4fff37c 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionEvent.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionEvent.h
@@ -1,58 +1,58 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_SUBSCRIPTION_EVENT
-#define _PLC_SUBSCRIPTION_EVENT
-
-#include "PlcReadResponse.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-						/**
-						 * @return the timestamp at which this event occurred.
-						 */
-						class PlcSubscriptionEvent : public PlcReadResponse
-						{
-							public:	
-								/**
-								 * @return the timestamp at which this event occurred.
-								 */
-								virtual tm* getTimestamp() const = 0;
-
-							private:
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_SUBSCRIPTION_EVENT
+#define _PLC_SUBSCRIPTION_EVENT
+
+#include "PlcReadResponse.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+						/**
+						 * @return the timestamp at which this event occurred.
+						 */
+						class PlcSubscriptionEvent : public PlcReadResponse
+						{
+							public:	
+								/**
+								 * @return the timestamp at which this event occurred.
+								 */
+								virtual tm* getTimestamp() const = 0;
+
+							private:
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionRequest.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionRequest.cpp
index 62bdf772e08..2d96cf5c39d 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionRequest.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionRequest.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcSubscriptionRequest.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcSubscriptionRequest.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionRequest.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionRequest.h
index 65dee23a53f..41ebc8f10eb 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionRequest.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionRequest.h
@@ -1,88 +1,88 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_SUBSCRIPTION_REQUEST
-#define _PLC_SUBSCRIPTION_REQUEST
-
-#include "PlcReadResponse.h"
-#include <chrono>
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-						/**
-						 * @return the timestamp at which this event occurred.
-						 */
-						class PlcSubscriptionRequest : public PlcRequestBuilder
-						{
-							public:								
-								virtual PlcRequest* build() = 0;
-
-								/**
-								 * Adds a new field to the to be constructed request which should be polled cyclically.
-								 *
-								 * @param name            alias of the field.
-								 * @param fieldQuery      field query string for accessing the field.
-								 * @param pollingInterval interval, in which the field should be polled.
-								 * @return builder.
-								 */
-								virtual void addCyclicField(std::string name, std::string fieldQuery, std::chrono::milliseconds pollingInterval) = 0; // Todo: check translation: Duration pollingInterval
-
-								 /**
-								 * Adds a new field to the to be constructed request which should be updated as soon as
-								 * a value changes in the PLC.
-								 *
-								 * @param name       alias of the field.
-								 * @param fieldQuery field query string for accessing the field.
-								 * @return builder.
-								 */
-								virtual void addChangeOfStateField(std::string name, std::string fieldQuery) = 0;
-
-								/**
-								 * Adds a new subscription to the to be constructed request which should be updated
-								 * as soon as an event occurs.
-								 * <p>
-								 * REMARK: We will have to see if this signature is correct as soon as we start using this type of subscription.
-								 *
-								 * @param name       alias of the field.
-								 * @param fieldQuery field query string for accessing the field.
-								 * @return builder.
-								 */
-								virtual void addEventField(std::string, std::string fieldQuery) = 0;
-						
-							private:
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_SUBSCRIPTION_REQUEST
+#define _PLC_SUBSCRIPTION_REQUEST
+
+#include "PlcReadResponse.h"
+#include <chrono>
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+						/**
+						 * @return the timestamp at which this event occurred.
+						 */
+						class PlcSubscriptionRequest : public PlcRequestBuilder
+						{
+							public:								
+								virtual PlcRequest* build() = 0;
+
+								/**
+								 * Adds a new field to the to be constructed request which should be polled cyclically.
+								 *
+								 * @param name            alias of the field.
+								 * @param fieldQuery      field query string for accessing the field.
+								 * @param pollingInterval interval, in which the field should be polled.
+								 * @return builder.
+								 */
+								virtual void addCyclicField(std::string name, std::string fieldQuery, std::chrono::milliseconds pollingInterval) = 0; // Todo: check translation: Duration pollingInterval
+
+								 /**
+								 * Adds a new field to the to be constructed request which should be updated as soon as
+								 * a value changes in the PLC.
+								 *
+								 * @param name       alias of the field.
+								 * @param fieldQuery field query string for accessing the field.
+								 * @return builder.
+								 */
+								virtual void addChangeOfStateField(std::string name, std::string fieldQuery) = 0;
+
+								/**
+								 * Adds a new subscription to the to be constructed request which should be updated
+								 * as soon as an event occurs.
+								 * <p>
+								 * REMARK: We will have to see if this signature is correct as soon as we start using this type of subscription.
+								 *
+								 * @param name       alias of the field.
+								 * @param fieldQuery field query string for accessing the field.
+								 * @return builder.
+								 */
+								virtual void addEventField(std::string, std::string fieldQuery) = 0;
+						
+							private:
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionResponse.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionResponse.cpp
index 97d2cff3072..dc436c219d1 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionResponse.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionResponse.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcSubscriptionResponse.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcSubscriptionResponse.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionResponse.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionResponse.h
index 7b6cd28774e..7f64b7bd584 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionResponse.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcSubscriptionResponse.h
@@ -1,62 +1,62 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_SUBSCRIPTION_RESPONSE
-#define _PLC_SUBSCRIPTION_RESPONSE
-
-#include "PlcReadResponse.h"
-#include "PlcSubscriptionRequest.h"
-#include "../model/PlcSubscriptionHandle.h"
-#include <vector>
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-						/**
-						 * @return the timestamp at which this event occurred.
-						 */
-						class PlcSubscriptionResponse : public PlcReadResponse
-						{
-							public:	
-								virtual PlcSubscriptionRequest* getRequest() const = 0;
-
-								virtual PlcSubscriptionHandle* getSubscriptionHandle(std::string name) const = 0;
-
-								virtual std::vector<PlcSubscriptionHandle*>* getSubscriptionHandles() const = 0;
-
-							private:
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_SUBSCRIPTION_RESPONSE
+#define _PLC_SUBSCRIPTION_RESPONSE
+
+#include "PlcReadResponse.h"
+#include "PlcSubscriptionRequest.h"
+#include "../model/PlcSubscriptionHandle.h"
+#include <vector>
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+						/**
+						 * @return the timestamp at which this event occurred.
+						 */
+						class PlcSubscriptionResponse : public PlcReadResponse
+						{
+							public:	
+								virtual PlcSubscriptionRequest* getRequest() const = 0;
+
+								virtual PlcSubscriptionHandle* getSubscriptionHandle(std::string name) const = 0;
+
+								virtual std::vector<PlcSubscriptionHandle*>* getSubscriptionHandles() const = 0;
+
+							private:
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcUnsubscriptionRequest.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcUnsubscriptionRequest.cpp
index bf5ee45248f..2050e07f404 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcUnsubscriptionRequest.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcUnsubscriptionRequest.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcUnsubscriptionRequest.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcUnsubscriptionRequest.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcUnsubscriptionRequest.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcUnsubscriptionRequest.h
index afb9be7f83b..5e2bcac66cc 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcUnsubscriptionRequest.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcUnsubscriptionRequest.h
@@ -1,61 +1,61 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_UNSUBSCRIPTION_REQUEST
-#define _PLC_UNSUBSCRIPTION_REQUEST
-
-#include <vector>
-#include "PlcRequest.h"
-#include "../model/PlcSubscriptionHandle.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{						
-						class PlcUnsubscriptionRequest : public PlcRequest
-						{
-								
-							public:			
-								virtual PlcRequest* build() = 0;
-								
-								// 1st approach to migrate builder pattern: Instead of Builder-object simple methods are used to handle inside the given parameters.
-								virtual void addHandles(PlcSubscriptionHandle* plcSubscriptionHandle) = 0;
-							
-								virtual void addHandles(PlcSubscriptionHandle* plcSubscriptionHandle1, std::vector<PlcSubscriptionHandle*> plcSubscriptionHandles) = 0;
-
-								virtual void addHandles(std::vector<PlcSubscriptionHandle*> plcSubscriptionHandle) = 0;
-						
-							private:
-						};
-					}
-				}
-			}
-		}
-	}
-}
-#endif
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_UNSUBSCRIPTION_REQUEST
+#define _PLC_UNSUBSCRIPTION_REQUEST
+
+#include <vector>
+#include "PlcRequest.h"
+#include "../model/PlcSubscriptionHandle.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{						
+						class PlcUnsubscriptionRequest : public PlcRequest
+						{
+								
+							public:			
+								virtual PlcRequest* build() = 0;
+								
+								// 1st approach to migrate builder pattern: Instead of Builder-object simple methods are used to handle inside the given parameters.
+								virtual void addHandles(PlcSubscriptionHandle* plcSubscriptionHandle) = 0;
+							
+								virtual void addHandles(PlcSubscriptionHandle* plcSubscriptionHandle1, std::vector<PlcSubscriptionHandle*> plcSubscriptionHandles) = 0;
+
+								virtual void addHandles(std::vector<PlcSubscriptionHandle*> plcSubscriptionHandle) = 0;
+						
+							private:
+						};
+					}
+				}
+			}
+		}
+	}
+}
+#endif
+
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcUnsubscriptionResponse.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcUnsubscriptionResponse.cpp
index 23bce1684c2..644b75b452f 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcUnsubscriptionResponse.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcUnsubscriptionResponse.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcUnsubscriptionResponse.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcUnsubscriptionResponse.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcUnsubscriptionResponse.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcUnsubscriptionResponse.h
index 6eb73671ebd..f1c7c7ae128 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcUnsubscriptionResponse.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcUnsubscriptionResponse.h
@@ -1,54 +1,54 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_UNSUBSCRIPTION_RESPONSE
-#define _PLC_UNSUBSCRIPTION_RESPONSE
-
-#include "PlcUnsubscriptionRequest.h"
-#include "PlcRequestBuilder.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{						
-						class PlcUnsubscriptionResponse : public PlcRequestBuilder
-						{
-							public:		
-
-								virtual PlcUnsubscriptionRequest* getRequest() const = 0;
-
-							private:
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_UNSUBSCRIPTION_RESPONSE
+#define _PLC_UNSUBSCRIPTION_RESPONSE
+
+#include "PlcUnsubscriptionRequest.h"
+#include "PlcRequestBuilder.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{						
+						class PlcUnsubscriptionResponse : public PlcRequestBuilder
+						{
+							public:		
+
+								virtual PlcUnsubscriptionRequest* getRequest() const = 0;
+
+							private:
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcWriteRequest.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcWriteRequest.cpp
index b468cb39724..38aea8e1336 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcWriteRequest.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcWriteRequest.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcWriteRequest.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcWriteRequest.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcWriteRequest.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcWriteRequest.h
index 64b99c6dd4f..260fbb34c5e 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcWriteRequest.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcWriteRequest.h
@@ -1,86 +1,86 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_WRITE_REQUEST
-#define _PLC_WRITE_REQUEST
-
-#include "PlcFieldRequest.h"
-#include <vector>
-#include <boost/multiprecision/cpp_dec_float.hpp>
-#include <ctime>
-
-using namespace boost::multiprecision;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{						
-						class PlcWriteRequest : public PlcFieldRequest
-						{
-							// Todo: @override CompletableFuture<? extends PlcWriteResponse> execute();
-						public:							
-							virtual PlcWriteRequest* build() = 0;
-
-							virtual void addItem(std::string name, std::string fieldQuery, std::vector<bool> values) = 0;
-
-							virtual void addItem(std::string name, std::string fieldQuery, std::vector<char> values) = 0;
-
-							virtual void addItem(std::string name, std::string fieldQuery, std::vector<short> values) =  0;
-
-							virtual void addItem(std::string name, std::string fieldQuery, std::vector<int> values)  = 0;
-
-							virtual void  addItem(std::string name, std::string fieldQuery, std::vector<long long> values) = 0;
-
-							virtual void addItem(std::string name, std::string fieldQuery, std::vector<long> values) = 0;
-
-							virtual void addItem(std::string name, std::string fieldQuery, std::vector<float> values) = 0;
-
-							virtual void addItem(std::string name, std::string fieldQuery, std::vector<double> values) = 0;
-
-							virtual void addItem(std::string name, std::string fieldQuery, std::vector<cpp_dec_float_100> values) = 0;
-
-							virtual void addItem(std::string name, std::string fieldQuery, std::vector<std::string> values) = 0;
-
-							virtual void addItem(std::string name, std::string fieldQuery, std::vector<std::tm> values) = 0;
-
-							virtual void addItem(std::string name, std::string fieldQuery, std::vector<std::vector<char> > values) = 0;
-
-							//Todo: <T> PlcWriteRequest.Builder addItem(String name, String fieldQuery, T... values);
-							/*template<class T>
-							virtual void addItem(std::string name, std::string fieldQuery, std::vector<T> values) = 0; */
-
-						private:
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_WRITE_REQUEST
+#define _PLC_WRITE_REQUEST
+
+#include "PlcFieldRequest.h"
+#include <vector>
+#include <boost/multiprecision/cpp_dec_float.hpp>
+#include <ctime>
+
+using namespace boost::multiprecision;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{						
+						class PlcWriteRequest : public PlcFieldRequest
+						{
+							// Todo: @override CompletableFuture<? extends PlcWriteResponse> execute();
+						public:							
+							virtual PlcWriteRequest* build() = 0;
+
+							virtual void addItem(std::string name, std::string fieldQuery, std::vector<bool> values) = 0;
+
+							virtual void addItem(std::string name, std::string fieldQuery, std::vector<char> values) = 0;
+
+							virtual void addItem(std::string name, std::string fieldQuery, std::vector<short> values) =  0;
+
+							virtual void addItem(std::string name, std::string fieldQuery, std::vector<int> values)  = 0;
+
+							virtual void  addItem(std::string name, std::string fieldQuery, std::vector<long long> values) = 0;
+
+							virtual void addItem(std::string name, std::string fieldQuery, std::vector<long> values) = 0;
+
+							virtual void addItem(std::string name, std::string fieldQuery, std::vector<float> values) = 0;
+
+							virtual void addItem(std::string name, std::string fieldQuery, std::vector<double> values) = 0;
+
+							virtual void addItem(std::string name, std::string fieldQuery, std::vector<cpp_dec_float_100> values) = 0;
+
+							virtual void addItem(std::string name, std::string fieldQuery, std::vector<std::string> values) = 0;
+
+							virtual void addItem(std::string name, std::string fieldQuery, std::vector<std::tm> values) = 0;
+
+							virtual void addItem(std::string name, std::string fieldQuery, std::vector<std::vector<char> > values) = 0;
+
+							//Todo: <T> PlcWriteRequest.Builder addItem(String name, String fieldQuery, T... values);
+							/*template<class T>
+							virtual void addItem(std::string name, std::string fieldQuery, std::vector<T> values) = 0; */
+
+						private:
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcWriteResponse.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcWriteResponse.cpp
index a8502f00ced..59a2da59245 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcWriteResponse.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcWriteResponse.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcWriteResponse.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcWriteResponse.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcWriteResponse.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcWriteResponse.h
index fc1a2a061bf..d39bfbebe84 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcWriteResponse.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcWriteResponse.h
@@ -1,53 +1,53 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_WRITE_RESPONSE
-#define _PLC_WRITE_RESPONSE
-
-#include "PlcFieldResponse.h"
-#include "PlcWriteRequest.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-						
-						class PlcWriteResponse : PlcFieldResponse 
-						{
-							public:	
-								virtual PlcRequest* getRequest() = 0;
-
-							private:
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_WRITE_RESPONSE
+#define _PLC_WRITE_RESPONSE
+
+#include "PlcFieldResponse.h"
+#include "PlcWriteRequest.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+						
+						class PlcWriteResponse : PlcFieldResponse 
+						{
+							public:	
+								virtual PlcRequest* getRequest() = 0;
+
+							private:
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/REQUEST.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/REQUEST.cpp
index a0d7b96d83f..b88d09d83a4 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/REQUEST.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/REQUEST.cpp
@@ -1,39 +1,39 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "REQUEST.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "REQUEST.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/REQUEST.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/REQUEST.h
index ad8e0cdb16b..4e076b47cec 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/REQUEST.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/REQUEST.h
@@ -1,49 +1,49 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _GENERIC_REQUEST
-#define _GENERIC_REQUEST
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-						
-						class REQUEST 
-						{
-							public:
-
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _GENERIC_REQUEST
+#define _GENERIC_REQUEST
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+						
+						class REQUEST 
+						{
+							public:
+
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/RESPONSE.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/RESPONSE.cpp
index 5dd7927b778..cab7267f30c 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/RESPONSE.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/RESPONSE.cpp
@@ -1,39 +1,39 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "RESPONSE.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "RESPONSE.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/RESPONSE.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/RESPONSE.h
index f6260763a51..1ce386555e9 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/RESPONSE.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/RESPONSE.h
@@ -1,48 +1,48 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _GENERIC_RESPONSE
-#define _GENERIC_RESPONSE
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-						
-						class RESPONSE 
-						{
-							public:
-							
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _GENERIC_RESPONSE
+#define _GENERIC_RESPONSE
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+						
+						class RESPONSE 
+						{
+							public:
+							
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/RequestTemplate.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/RequestTemplate.cpp
index 4c6b6dc2226..c951c045650 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/RequestTemplate.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/RequestTemplate.cpp
@@ -1,39 +1,39 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "RequestTemplate.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "RequestTemplate.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/RequestTemplate.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/RequestTemplate.h
index 2f8a9b8cd98..e9ff916e29d 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/RequestTemplate.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/RequestTemplate.h
@@ -1,48 +1,48 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_REQUEST_TEMPLATE
-#define _PLC_REQUEST_TEMPLATE
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-						template<typename T> class RequestTemplate 
-						{
-							public:
-							
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_REQUEST_TEMPLATE
+#define _PLC_REQUEST_TEMPLATE
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+						template<typename T> class RequestTemplate 
+						{
+							public:
+							
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/ResponseTemplate.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/ResponseTemplate.cpp
index fca85602635..bd1ce217cb1 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/ResponseTemplate.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/ResponseTemplate.cpp
@@ -1,39 +1,39 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "ResponseTemplate.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "ResponseTemplate.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/ResponseTemplate.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/ResponseTemplate.h
index 3e0b6e625de..f6647bf0b86 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/ResponseTemplate.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/ResponseTemplate.h
@@ -1,47 +1,47 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_RESPONSE_TEMPLATE
-#define _PLC_RESPONSE_TEMPLATE
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace messages
-					{
-						template<typename T> class ResponseTemplate
-						{
-							public:
-							
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_RESPONSE_TEMPLATE
+#define _PLC_RESPONSE_TEMPLATE
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace messages
+					{
+						template<typename T> class ResponseTemplate
+						{
+							public:
+							
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/metadata/PlcConnectionMetadata.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/metadata/PlcConnectionMetadata.cpp
index f0faf64d978..a74458dfc5f 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/metadata/PlcConnectionMetadata.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/metadata/PlcConnectionMetadata.cpp
@@ -1,39 +1,39 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcConnectionMetadata.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace metadata
-					{
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcConnectionMetadata.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace metadata
+					{
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/metadata/PlcConnectionMetadata.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/metadata/PlcConnectionMetadata.h
index b2c13b38f9e..6e990dff300 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/metadata/PlcConnectionMetadata.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/metadata/PlcConnectionMetadata.h
@@ -1,66 +1,66 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_CONNECTION_META_DATA
-#define _PLC_CONNECTION_META_DATA
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace metadata
-					{
-
-						/**
-						* Information about connection capabilities.
-						* This includes connection and driver specific metadata.
-						*/
-						class PlcConnectionMetadata
-						{
-							public:
-								/**
-								 * Indicates that the connection supports reading.
-								 */
-								virtual bool canRead() = 0;
-
-								/**
-								 * Indicates that the connection supports writing.
-								 */
-								virtual bool canWrite() = 0;
-
-								/**
-								 * Indicates that the connection supports subscription.
-								 */
-								virtual bool canSubscribe() = 0;
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_CONNECTION_META_DATA
+#define _PLC_CONNECTION_META_DATA
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace metadata
+					{
+
+						/**
+						* Information about connection capabilities.
+						* This includes connection and driver specific metadata.
+						*/
+						class PlcConnectionMetadata
+						{
+							public:
+								/**
+								 * Indicates that the connection supports reading.
+								 */
+								virtual bool canRead() = 0;
+
+								/**
+								 * Indicates that the connection supports writing.
+								 */
+								virtual bool canWrite() = 0;
+
+								/**
+								 * Indicates that the connection supports subscription.
+								 */
+								virtual bool canSubscribe() = 0;
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/Consumer.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/Consumer.cpp
index c63b5dde3bf..af9c3d6ad30 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/Consumer.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/Consumer.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "Consumer.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace model
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "Consumer.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace model
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/Consumer.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/Consumer.h
index db4a032419f..dd8946d480a 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/Consumer.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/Consumer.h
@@ -1,62 +1,62 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_CONSUMER
-#define _PLC_CONSUMER
-
-#include <functional>
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace model
-					{						
-						/**
-						 * helper class that implements java.util.function.Consumer
-						 */
-						template<typename T> class Consumer
-						{
-							
-							public:									
-								template<class consumer>
-								Consumer<T>(consumer consume) : consume_(consume) {};
-																					
-								inline void Accept(T t) { consume_(t); };
-								//inline void andthen(consumer c) {c.Accept(T)}; //TODO
-							private:
-								T innerType;
-								std::function<void(T)> consume_;
-
-						};
-						
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_CONSUMER
+#define _PLC_CONSUMER
+
+#include <functional>
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace model
+					{						
+						/**
+						 * helper class that implements java.util.function.Consumer
+						 */
+						template<typename T> class Consumer
+						{
+							
+							public:									
+								template<class consumer>
+								Consumer<T>(consumer consume) : consume_(consume) {};
+																					
+								inline void Accept(T t) { consume_(t); };
+								//inline void andthen(consumer c) {c.Accept(T)}; //TODO
+							private:
+								T innerType;
+								std::function<void(T)> consume_;
+
+						};
+						
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/PlcConsumerRegistration.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/PlcConsumerRegistration.cpp
index bd19ca66c15..44b3087c2a6 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/PlcConsumerRegistration.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/PlcConsumerRegistration.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcConsumerRegistration.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace model
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcConsumerRegistration.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace model
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/PlcConsumerRegistration.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/PlcConsumerRegistration.h
index 858967adf24..3a7c7fbd8de 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/PlcConsumerRegistration.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/PlcConsumerRegistration.h
@@ -1,49 +1,49 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_CONSUMER_REGISTRATION
-#define _PLC_CONSUMER_REGISTRATION
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace model
-					{						
-						class PlcConsumerRegistration
-						{
-							public:	
-								virtual void unregister() = 0;
-
-							private:
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_CONSUMER_REGISTRATION
+#define _PLC_CONSUMER_REGISTRATION
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace model
+					{						
+						class PlcConsumerRegistration
+						{
+							public:	
+								virtual void unregister() = 0;
+
+							private:
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/PlcField.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/PlcField.cpp
index 316eca800a1..e889dfaf077 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/PlcField.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/PlcField.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcField.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace model
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcField.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace model
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/PlcField.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/PlcField.h
index a26a733acb8..24c92fe4073 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/PlcField.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/PlcField.h
@@ -1,60 +1,60 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_FIELD
-#define _PLC_FIELD
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace model
-					{
-						/**
-						 * Base type for all field types.
-						 * Typically every driver provides an implementation of this interface in order
-						 * to be able to describe the fields of a resource. As this is completely tied to
-						 * the implemented protocol, this base interface makes absolutely no assumption to
-						 * any information it should provide.
-						 *
-						 * In order to stay platform and protocol independent every driver connection implementation
-						 * provides a prepareField(String) method that is able to parse a string representation of
-						 * a resource into it's individual field type. Manually constructing PlcField objects
-						 * manually makes the solution less independent from the protocol, but might be faster.
-						 */
-						class PlcField
-						{
-							public:	
-
-							private:
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_FIELD
+#define _PLC_FIELD
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace model
+					{
+						/**
+						 * Base type for all field types.
+						 * Typically every driver provides an implementation of this interface in order
+						 * to be able to describe the fields of a resource. As this is completely tied to
+						 * the implemented protocol, this base interface makes absolutely no assumption to
+						 * any information it should provide.
+						 *
+						 * In order to stay platform and protocol independent every driver connection implementation
+						 * provides a prepareField(String) method that is able to parse a string representation of
+						 * a resource into it's individual field type. Manually constructing PlcField objects
+						 * manually makes the solution less independent from the protocol, but might be faster.
+						 */
+						class PlcField
+						{
+							public:	
+
+							private:
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/PlcSubscriptionHandle.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/PlcSubscriptionHandle.cpp
index 2bdaea26608..d1d6e06f313 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/PlcSubscriptionHandle.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/PlcSubscriptionHandle.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcSubscriptionHandle.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace model
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcSubscriptionHandle.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace model
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/PlcSubscriptionHandle.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/PlcSubscriptionHandle.h
index 1852de6ebaa..1c9c888134a 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/PlcSubscriptionHandle.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/model/PlcSubscriptionHandle.h
@@ -1,62 +1,62 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_SUBSCRIPTION_HANDLE
-#define _PLC_SUBSCRIPTION_HANDLE
-
-#include "PlcConsumerRegistration.h"
-#include "../messages/PlcSubscriptionEvent.h"
-#include "Consumer.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace model
-					{
-						/**
-						 * When subscribing to remote resources, depending on the used protocol
-						 * different data is used to identify a subscription. This interface is
-						 * to be implemented in the individual Driver implementations to contain
-						 * all information needed to pull or unsubscribe any form of subscription.
-						 * <p>
-						 * For every subscribed item, a separate {@link PlcSubscriptionHandle} object is
-						 * returned in order to allow fine granular unsubscriptions.
-						 */
-						class PlcSubscriptionHandle
-						{
-							public:	
-								virtual PlcConsumerRegistration* Register(Consumer <org::apache::plc4x::cpp::api::messages::PlcSubscriptionEvent> consumer) = 0;
-
-							private:
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_SUBSCRIPTION_HANDLE
+#define _PLC_SUBSCRIPTION_HANDLE
+
+#include "PlcConsumerRegistration.h"
+#include "../messages/PlcSubscriptionEvent.h"
+#include "Consumer.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace model
+					{
+						/**
+						 * When subscribing to remote resources, depending on the used protocol
+						 * different data is used to identify a subscription. This interface is
+						 * to be implemented in the individual Driver implementations to contain
+						 * all information needed to pull or unsubscribe any form of subscription.
+						 * <p>
+						 * For every subscribed item, a separate {@link PlcSubscriptionHandle} object is
+						 * returned in order to allow fine granular unsubscriptions.
+						 */
+						class PlcSubscriptionHandle
+						{
+							public:	
+								virtual PlcConsumerRegistration* Register(Consumer <org::apache::plc4x::cpp::api::messages::PlcSubscriptionEvent> consumer) = 0;
+
+							private:
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/PlcClientDataType.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/PlcClientDataType.cpp
index 69e5d0e1e78..0f21bdf20db 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/PlcClientDataType.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/PlcClientDataType.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcClientDataType.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace types
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcClientDataType.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace types
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/PlcClientDataType.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/PlcClientDataType.h
index 5bf26b25b0a..1682e3c15bb 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/PlcClientDataType.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/PlcClientDataType.h
@@ -1,56 +1,56 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_CLIENT_DATA_TYPE
-#define _PLC_CLIENT_DATA_TYPE
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace types
-					{
-						enum PlcClientDataType
-						{
-							BOOLEAN,
-							BYTE,
-							SHORT,
-							INTEGER,
-							LONG,
-							FLOAT,
-							DOUBLE,
-							STRING,
-							TIME,
-							DATE,
-							DATE_TIME
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_CLIENT_DATA_TYPE
+#define _PLC_CLIENT_DATA_TYPE
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace types
+					{
+						enum PlcClientDataType
+						{
+							BOOLEAN,
+							BYTE,
+							SHORT,
+							INTEGER,
+							LONG,
+							FLOAT,
+							DOUBLE,
+							STRING,
+							TIME,
+							DATE,
+							DATE_TIME
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/PlcResponseCode.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/PlcResponseCode.cpp
index d0fe4130abb..1169ce32731 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/PlcResponseCode.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/PlcResponseCode.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcResponseCode.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace types
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcResponseCode.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace types
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/PlcResponseCode.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/PlcResponseCode.h
index d1a0386ad77..88606a4c130 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/PlcResponseCode.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/PlcResponseCode.h
@@ -1,51 +1,51 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_RESPONSE_CODE
-#define _PLC_RESPONSE_CODE
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace types
-					{
-						enum PlcResponseCode
-						{
-							OK,
-							NOT_FOUND,
-							INVALID_ADDRESS,
-							INVALID_DATATYPE,
-							INTERNAL_ERROR,
-							RESPONSE_PENDING
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_RESPONSE_CODE
+#define _PLC_RESPONSE_CODE
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace types
+					{
+						enum PlcResponseCode
+						{
+							OK,
+							NOT_FOUND,
+							INVALID_ADDRESS,
+							INVALID_DATATYPE,
+							INTERNAL_ERROR,
+							RESPONSE_PENDING
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/PlcSubscriptionType.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/PlcSubscriptionType.cpp
index 56ef1606bcc..b656090b7fd 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/PlcSubscriptionType.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/PlcSubscriptionType.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcSubscriptionType.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace types
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcSubscriptionType.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace types
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/PlcSubscriptionType.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/PlcSubscriptionType.h
index 5670348acab..03704fb3960 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/PlcSubscriptionType.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/PlcSubscriptionType.h
@@ -1,59 +1,59 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_SUBSCRIPTION_TYPE
-#define _PLC_SUBSCRIPTION_TYPE
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-					namespace types
-					{
-						enum PlcSubscriptionType
-						{
-							/**
-							 * A cyclic subscription where a value is sent no matter if it's value changed in a given interval.
-							 */
-							CYCLIC,
-
-							/**
-							 * Only send data, if a value in the PLC changed.
-							 */
-							CHANGE_OF_STATE,
-
-							/**
-							 * Subscribe to events created by the PLC which usually are defined in the PLCs application (Alarms).
-							 */
-							EVENT
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_SUBSCRIPTION_TYPE
+#define _PLC_SUBSCRIPTION_TYPE
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+					namespace types
+					{
+						enum PlcSubscriptionType
+						{
+							/**
+							 * A cyclic subscription where a value is sent no matter if it's value changed in a given interval.
+							 */
+							CYCLIC,
+
+							/**
+							 * Only send data, if a value in the PLC changed.
+							 */
+							CHANGE_OF_STATE,
+
+							/**
+							 * Subscribe to events created by the PLC which usually are defined in the PLCs application (Alarms).
+							 */
+							EVENT
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/ValueTypeObject.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/ValueTypeObject.cpp
index cb68517ff55..abf5fc543d0 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/ValueTypeObject.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/ValueTypeObject.cpp
@@ -1,41 +1,41 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "ValueTypeObject.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{
-				
-					namespace types
-					{
-					}
-					
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "ValueTypeObject.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{
+				
+					namespace types
+					{
+					}
+					
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/ValueTypeObject.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/ValueTypeObject.h
index 29c1a22a8fb..d4c614c5af1 100755
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/ValueTypeObject.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/types/ValueTypeObject.h
@@ -1,50 +1,50 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_VALUE_TYPE_OBJECT
-#define _PLC_VALUE_TYPE_OBJECT
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace api
-				{					
-					namespace types
-					{
-						// Base class vor value type objects
-						class ValueTypeObject
-						{
-
-							public:						
-															
-						};
-					}
-					
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_VALUE_TYPE_OBJECT
+#define _PLC_VALUE_TYPE_OBJECT
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace api
+				{					
+					namespace types
+					{
+						// Base class vor value type objects
+						class ValueTypeObject
+						{
+
+							public:						
+															
+						};
+					}
+					
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/spi/PlcDriver.cpp b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/spi/PlcDriver.cpp
index 086ce155922..afe4b154344 100644
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/spi/PlcDriver.cpp
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/spi/PlcDriver.cpp
@@ -1,36 +1,36 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcDriver.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace spi
-				{
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcDriver.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace spi
+				{
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/spi/PlcDriver.h b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/spi/PlcDriver.h
index f434912bc78..6744d03fa99 100644
--- a/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/spi/PlcDriver.h
+++ b/sandbox/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/spi/PlcDriver.h
@@ -1,85 +1,85 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_DRIVER
-#define _PLC_DRIVER
-
-#include "../api/PlcConnection.h"
-#include "../api/authentication/PlcAuthentication.h"
-#include <string>
-
-using namespace org::apache::plc4x::cpp::api::authentication;
-using namespace org::apache::plc4x::cpp::api;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace spi
-				{
-					/**
-					* Interface defining the most basic methods a PLC4X connection should support.
-					* This generally handles the connection establishment itself and the parsing of
-					* field address strings to the platform dependent PlcField instances.
-					*/
-					class PlcDriver
-					{
-
-					public:
-						/**
-						 * @return code of the implemented protocol. This is usually a lot shorter than the String returned by @seeĀ #getProtocolName().
-						 */
-						virtual std::string getProtocolCode() = 0;
-
-						/**
-						 * @return name of the implemented protocol.
-						 */
-						virtual std::string getProtocolName() = 0;
-
-						/**
-						 * Connects to a PLC using the given plc connection string.
-						 * @param url plc connection string.
-						 * @return PlcConnection object.
-						 * @throws PlcConnectionException an exception if the connection attempt failed.
-						 */
-						virtual PlcConnection* connect(std::string url) = 0;
-
-						/**
-						 * Connects to a PLC using the given plc connection string using given authentication credentials.
-						 * @param url plc connection string.
-						 * @param authentication authentication credentials.
-						 * @return PlcConnection object.
-						 * @throws PlcConnectionException an exception if the connection attempt failed.
-						 */
-						virtual PlcConnection* connect(std::string url, PlcAuthentication authentication) = 0;
-
-					private:
-					};
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_DRIVER
+#define _PLC_DRIVER
+
+#include "../api/PlcConnection.h"
+#include "../api/authentication/PlcAuthentication.h"
+#include <string>
+
+using namespace org::apache::plc4x::cpp::api::authentication;
+using namespace org::apache::plc4x::cpp::api;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace spi
+				{
+					/**
+					* Interface defining the most basic methods a PLC4X connection should support.
+					* This generally handles the connection establishment itself and the parsing of
+					* field address strings to the platform dependent PlcField instances.
+					*/
+					class PlcDriver
+					{
+
+					public:
+						/**
+						 * @return code of the implemented protocol. This is usually a lot shorter than the String returned by @seeĀ #getProtocolName().
+						 */
+						virtual std::string getProtocolCode() = 0;
+
+						/**
+						 * @return name of the implemented protocol.
+						 */
+						virtual std::string getProtocolName() = 0;
+
+						/**
+						 * Connects to a PLC using the given plc connection string.
+						 * @param url plc connection string.
+						 * @return PlcConnection object.
+						 * @throws PlcConnectionException an exception if the connection attempt failed.
+						 */
+						virtual PlcConnection* connect(std::string url) = 0;
+
+						/**
+						 * Connects to a PLC using the given plc connection string using given authentication credentials.
+						 * @param url plc connection string.
+						 * @param authentication authentication credentials.
+						 * @return PlcConnection object.
+						 * @throws PlcConnectionException an exception if the connection attempt failed.
+						 */
+						virtual PlcConnection* connect(std::string url, PlcAuthentication authentication) = 0;
+
+					private:
+					};
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/drivers/CMakeLists.txt b/sandbox/plc4cpp/drivers/CMakeLists.txt
index 667b6fa2a5e..9b8ba6bdf80 100644
--- a/sandbox/plc4cpp/drivers/CMakeLists.txt
+++ b/sandbox/plc4cpp/drivers/CMakeLists.txt
@@ -1,26 +1,26 @@
-#[[
-  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
-
-      http://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.
-]]
-
-# Only build the proxy module, if the "with-proxies" profile is enabled.
-message(STATUS "With proxy = ${WITH_PROXIES}")
-if(WITH_PROXIES)
-    add_subdirectory(proxy)
-endif()
-
-add_subdirectory(s7)
+#[[
+  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
+
+      http://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.
+]]
+
+# Only build the proxy module, if the "with-proxies" profile is enabled.
+message(STATUS "With proxy = ${WITH_PROXIES}")
+if(WITH_PROXIES)
+    add_subdirectory(proxy)
+endif()
+
+add_subdirectory(s7)
diff --git a/sandbox/plc4cpp/drivers/proxy/CMakeLists.txt b/sandbox/plc4cpp/drivers/proxy/CMakeLists.txt
index e5c214f650b..4365983e097 100644
--- a/sandbox/plc4cpp/drivers/proxy/CMakeLists.txt
+++ b/sandbox/plc4cpp/drivers/proxy/CMakeLists.txt
@@ -1,47 +1,47 @@
-#[[
-  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
-
-      http://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.
-]]
-
-# Collect all the generated files
-aux_source_directory(../../target/generated-sources/drivers/proxy PROXY_GENERATED_SOURCES)
-
-message(STATUS "Found generated sources: ${PROXY_GENERATED_SOURCES}")
-
-add_library(plc4cpp-driver-proxy SHARED
-        src/main/cpp/org/apache/plc4x/cpp/proxy/dllexports.cpp
-        src/main/cpp/org/apache/plc4x/cpp/proxy/ProxyDriver.cpp
-		src/main/cpp/org/apache/plc4x/cpp/proxy/connection/ProxyConnection.cpp
-        ${PROXY_GENERATED_SOURCES}
-            )
-
-target_include_directories (plc4cpp-driver-proxy PUBLIC ${Boost_INCLUDE_DIRS})
-target_include_directories (plc4cpp-driver-proxy PUBLIC ${PLC4CPP_ROOT_DIR}/target/lib/thrift/include/)
-target_include_directories (plc4cpp-driver-proxy PUBLIC ../../api/src/main/cpp)
-target_include_directories (plc4cpp-driver-proxy PUBLIC ../../protocols/driver-bases/base/src/main/cpp)
-target_include_directories (plc4cpp-driver-proxy PUBLIC ../../protocols/s7/src/main/cpp)
-target_include_directories (plc4cpp-driver-proxy PUBLIC ../../utils/logger/src/main/cpp)
-target_include_directories (plc4cpp-driver-proxy PUBLIC ../../utils/systemconfig/src/main/cpp)
-
-target_link_libraries (plc4cpp-driver-proxy
-                        ${Boost_LIBRARIES}
-                        ${PLC4CPP_ROOT_DIR}/target/lib/thrift/lib/libparse.a ${PLC4CPP_ROOT_DIR}/target/lib/thrift/lib/libthrift.a ${PLC4CPP_ROOT_DIR}/target/lib/thrift/lib/libthriftz.a ${PLC4CPP_ROOT_DIR}/target/lib/thrift/lib/libtutorialgencpp.a
-                        plc4cpp-utils-logger 
-                        plc4cpp-api 
-                        plc4cpp-protocols-driver-base-base
-                        plc4cpp-utils-systemconfig
-                      )
+#[[
+  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
+
+      http://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.
+]]
+
+# Collect all the generated files
+aux_source_directory(../../target/generated-sources/drivers/proxy PROXY_GENERATED_SOURCES)
+
+message(STATUS "Found generated sources: ${PROXY_GENERATED_SOURCES}")
+
+add_library(plc4cpp-driver-proxy SHARED
+        src/main/cpp/org/apache/plc4x/cpp/proxy/dllexports.cpp
+        src/main/cpp/org/apache/plc4x/cpp/proxy/ProxyDriver.cpp
+		src/main/cpp/org/apache/plc4x/cpp/proxy/connection/ProxyConnection.cpp
+        ${PROXY_GENERATED_SOURCES}
+            )
+
+target_include_directories (plc4cpp-driver-proxy PUBLIC ${Boost_INCLUDE_DIRS})
+target_include_directories (plc4cpp-driver-proxy PUBLIC ${PLC4CPP_ROOT_DIR}/target/lib/thrift/include/)
+target_include_directories (plc4cpp-driver-proxy PUBLIC ../../api/src/main/cpp)
+target_include_directories (plc4cpp-driver-proxy PUBLIC ../../protocols/driver-bases/base/src/main/cpp)
+target_include_directories (plc4cpp-driver-proxy PUBLIC ../../protocols/s7/src/main/cpp)
+target_include_directories (plc4cpp-driver-proxy PUBLIC ../../utils/logger/src/main/cpp)
+target_include_directories (plc4cpp-driver-proxy PUBLIC ../../utils/systemconfig/src/main/cpp)
+
+target_link_libraries (plc4cpp-driver-proxy
+                        ${Boost_LIBRARIES}
+                        ${PLC4CPP_ROOT_DIR}/target/lib/thrift/lib/libparse.a ${PLC4CPP_ROOT_DIR}/target/lib/thrift/lib/libthrift.a ${PLC4CPP_ROOT_DIR}/target/lib/thrift/lib/libthriftz.a ${PLC4CPP_ROOT_DIR}/target/lib/thrift/lib/libtutorialgencpp.a
+                        plc4cpp-utils-logger 
+                        plc4cpp-api 
+                        plc4cpp-protocols-driver-base-base
+                        plc4cpp-utils-systemconfig
+                      )
diff --git a/sandbox/plc4cpp/drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/ProxyDriver.cpp b/sandbox/plc4cpp/drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/ProxyDriver.cpp
index 35717013c54..3685f9c4d4c 100644
--- a/sandbox/plc4cpp/drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/ProxyDriver.cpp
+++ b/sandbox/plc4cpp/drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/ProxyDriver.cpp
@@ -1,89 +1,89 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "ProxyDriver.h"
-#include "connection/ProxyConnection.h"
-#include <org/apache/plc4x/cpp/api/exceptions/PlcConnectionException.h>
-#include <boost/regex.hpp>
-
-using namespace std;
-using namespace org::apache::plc4x::cpp::api::exceptions;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace proxy
-				{
-                    string ProxyDriver::getProtocolCode()
-                    {
-                        return std::string("proxy");
-                    }
-
-                    
-                    string ProxyDriver::getProtocolName() {
-                        return "Proxy";
-                    }
-
-                    PlcConnection* ProxyDriver::connect(std::string url)
-                    {
-                        boost::regex exFilter(PROXY_URI_PATTERN.c_str());
-                        boost::smatch what;                       
-
-                        std::string strHost = "";
-                        std::string strParams = "";
-                        ProxyConnection* pProxyConnection = NULL;
-
-                        try
-                        {
-                            if (!boost::regex_search(url, what, exFilter))
-                            {
-                                BOOST_THROW_EXCEPTION(PlcConnectionException("Connection url doesn't match the format 'proxy://{host|ip}'"));
-                            }                       
-
-                            strHost = what[1].str(); // Host
-                            strParams = what[2].str(); // Params
-
-                            // Resolve from Hostname to implements PlcConnection
-                            pProxyConnection = new ProxyConnection(strHost, strParams);
-                        }
-                        catch (exception ex) 
-                        {
-                            BOOST_THROW_EXCEPTION(PlcConnectionException("Error connecting to host", ex));
-                        }
-
-                        return pProxyConnection;
-                    }
-
-                    
-                    PlcConnection* ProxyDriver::connect(std::string url, PlcAuthentication authentication)
-                    {
-                        BOOST_THROW_EXCEPTION(PlcConnectionException("Proxy connections don't support authentication."));
-                    }
-
-
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "ProxyDriver.h"
+#include "connection/ProxyConnection.h"
+#include <org/apache/plc4x/cpp/api/exceptions/PlcConnectionException.h>
+#include <boost/regex.hpp>
+
+using namespace std;
+using namespace org::apache::plc4x::cpp::api::exceptions;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace proxy
+				{
+                    string ProxyDriver::getProtocolCode()
+                    {
+                        return std::string("proxy");
+                    }
+
+                    
+                    string ProxyDriver::getProtocolName() {
+                        return "Proxy";
+                    }
+
+                    PlcConnection* ProxyDriver::connect(std::string url)
+                    {
+                        boost::regex exFilter(PROXY_URI_PATTERN.c_str());
+                        boost::smatch what;                       
+
+                        std::string strHost = "";
+                        std::string strParams = "";
+                        ProxyConnection* pProxyConnection = NULL;
+
+                        try
+                        {
+                            if (!boost::regex_search(url, what, exFilter))
+                            {
+                                BOOST_THROW_EXCEPTION(PlcConnectionException("Connection url doesn't match the format 'proxy://{host|ip}'"));
+                            }                       
+
+                            strHost = what[1].str(); // Host
+                            strParams = what[2].str(); // Params
+
+                            // Resolve from Hostname to implements PlcConnection
+                            pProxyConnection = new ProxyConnection(strHost, strParams);
+                        }
+                        catch (exception ex) 
+                        {
+                            BOOST_THROW_EXCEPTION(PlcConnectionException("Error connecting to host", ex));
+                        }
+
+                        return pProxyConnection;
+                    }
+
+                    
+                    PlcConnection* ProxyDriver::connect(std::string url, PlcAuthentication authentication)
+                    {
+                        BOOST_THROW_EXCEPTION(PlcConnectionException("Proxy connections don't support authentication."));
+                    }
+
+
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/ProxyDriver.h b/sandbox/plc4cpp/drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/ProxyDriver.h
index 355ac499213..61afe126284 100644
--- a/sandbox/plc4cpp/drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/ProxyDriver.h
+++ b/sandbox/plc4cpp/drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/ProxyDriver.h
@@ -1,87 +1,87 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PROXY_DRIVER
-#define _PROXY_DRIVER
-
-#include <org/apache/plc4x/cpp/spi/PlcDriver.h>
-#include <org/apache/plc4x/cpp/api/authentication/PlcAuthentication.h>
-#include <string>
-
-using namespace org::apache::plc4x::cpp::spi;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace proxy
-				{
-					/**
-					* Interface defining the most basic methods a PLC4X connection should support.
-					* This generally handles the connection establishment itself and the parsing of
-					* field address strings to the platform dependent PlcField instances.
-					*/
-					class ProxyDriver : public PlcDriver
-					{
-
-					public:
-						/**
-						 * @return code of the implemented protocol. This is usually a lot shorter than the String returned by @seeĀ #getProtocolName().
-						 */
-						virtual std::string getProtocolCode();
-
-						/**
-						 * @return name of the implemented protocol.
-						 */
-						virtual std::string getProtocolName();
-
-						/**
-						 * Connects to a PLC using the given plc connection string.
-						 * @param url plc connection string.
-						 * @return PlcConnection object.
-						 * @throws PlcConnectionException an exception if the connection attempt failed.
-						 */
-						virtual PlcConnection* connect(std::string url);
-
-						/**
-						 * Connects to a PLC using the given plc connection string using given authentication credentials.
-						 * @param url plc connection string.
-						 * @param authentication authentication credentials.
-						 * @return PlcConnection object.
-						 * @throws PlcConnectionException an exception if the connection attempt failed.
-						 */
-						virtual PlcConnection* connect(std::string url, PlcAuthentication authentication);
-
-					private:
-
-                        const std::string PROXY_URI_PATTERN="proxy://(?<host>.*)(?<params>\\?.*)?";
-                  
-					};
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PROXY_DRIVER
+#define _PROXY_DRIVER
+
+#include <org/apache/plc4x/cpp/spi/PlcDriver.h>
+#include <org/apache/plc4x/cpp/api/authentication/PlcAuthentication.h>
+#include <string>
+
+using namespace org::apache::plc4x::cpp::spi;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace proxy
+				{
+					/**
+					* Interface defining the most basic methods a PLC4X connection should support.
+					* This generally handles the connection establishment itself and the parsing of
+					* field address strings to the platform dependent PlcField instances.
+					*/
+					class ProxyDriver : public PlcDriver
+					{
+
+					public:
+						/**
+						 * @return code of the implemented protocol. This is usually a lot shorter than the String returned by @seeĀ #getProtocolName().
+						 */
+						virtual std::string getProtocolCode();
+
+						/**
+						 * @return name of the implemented protocol.
+						 */
+						virtual std::string getProtocolName();
+
+						/**
+						 * Connects to a PLC using the given plc connection string.
+						 * @param url plc connection string.
+						 * @return PlcConnection object.
+						 * @throws PlcConnectionException an exception if the connection attempt failed.
+						 */
+						virtual PlcConnection* connect(std::string url);
+
+						/**
+						 * Connects to a PLC using the given plc connection string using given authentication credentials.
+						 * @param url plc connection string.
+						 * @param authentication authentication credentials.
+						 * @return PlcConnection object.
+						 * @throws PlcConnectionException an exception if the connection attempt failed.
+						 */
+						virtual PlcConnection* connect(std::string url, PlcAuthentication authentication);
+
+					private:
+
+                        const std::string PROXY_URI_PATTERN="proxy://(?<host>.*)(?<params>\\?.*)?";
+                  
+					};
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/connection/ProxyConnection.cpp b/sandbox/plc4cpp/drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/connection/ProxyConnection.cpp
index 85355abc07c..7bc9853179c 100644
--- a/sandbox/plc4cpp/drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/connection/ProxyConnection.cpp
+++ b/sandbox/plc4cpp/drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/connection/ProxyConnection.cpp
@@ -1,59 +1,59 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "ProxyConnection.h"
-#include <boost/algorithm/string.hpp>
-#include <boost/lexical_cast.hpp>
-
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace proxy
-				{
-                    ProxyConnection::ProxyConnection()
-                    {
-                        _lCloseDeviceTimeoutMS = CONF.getLong("plc4x.s7connection.close.device,timeout", 1000);
-                    };
-
-                    ProxyConnection::~ProxyConnection()
-                    {
-                    
-                    };
-
-                    ProxyConnection::ProxyConnection(std::string strHost, string strParams)
-                    {
-                        setIPAddress(strHost);
-
-                        string strMessage = "Setting up ProxyConnection with: host-name " + strHost;
-                        LOG_INFO(strMessage);
-
-                        return;
-                    }
-
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "ProxyConnection.h"
+#include <boost/algorithm/string.hpp>
+#include <boost/lexical_cast.hpp>
+
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace proxy
+				{
+                    ProxyConnection::ProxyConnection()
+                    {
+                        _lCloseDeviceTimeoutMS = CONF.getLong("plc4x.s7connection.close.device,timeout", 1000);
+                    };
+
+                    ProxyConnection::~ProxyConnection()
+                    {
+                    
+                    };
+
+                    ProxyConnection::ProxyConnection(std::string strHost, string strParams)
+                    {
+                        setIPAddress(strHost);
+
+                        string strMessage = "Setting up ProxyConnection with: host-name " + strHost;
+                        LOG_INFO(strMessage);
+
+                        return;
+                    }
+
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/connection/ProxyConnection.h b/sandbox/plc4cpp/drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/connection/ProxyConnection.h
index 3e437169d37..b0e0f3a7fb4 100644
--- a/sandbox/plc4cpp/drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/connection/ProxyConnection.h
+++ b/sandbox/plc4cpp/drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/connection/ProxyConnection.h
@@ -1,137 +1,137 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PROXY_CONNECTION
-#define _PROXY_CONNECTION
-
-#include <org/apache/plc4x/cpp/api/metadata/PlcConnectionMetadata.h>
-#include <org/apache/plc4x/cpp/api/messages/PlcReadRequest.h>
-#include <org/apache/plc4x/cpp/api/messages/PlcWriteRequest.h>
-#include <org/apache/plc4x/cpp/api/messages/PlcSubscriptionRequest.h>
-#include <org/apache/plc4x/cpp/api/messages/PlcUnsubscriptionRequest.h>
-#include <org/apache/plc4x/cpp/base/connection/BoostConnection.h>
-#include <org/apache/plc4x/cpp/base/connection/ChannelFactory.h>
-#include <org/apache/plc4x/cpp/utils/logger/BLogger.h>
-#include <org/apache/plc4x/cpp/utils/systemconfig/SystemConfiguration.h>
-
-
-/**
- * Class implementing the Connection handling for Siemens S7.
- * The adressing of Values in S7 works as follows:
- * <p>
- * For adressing values from Datablocks the following syntax is used:
- * <pre>
- *     DATA_BLOCKS/{blockNumer}/{byteOffset}
- * </pre>
- * <p>
- * For adressing data from other memory segments like I/O, Markers, ...
- * <pre>
- *     {memory area}/{byte offset}
- *     or
- *     {memory area}/{byte offset}/{bit offset}
- * </pre>
- * where the {bit-offset} is optional.
- * All Available Memory Areas for this mode are defined in the {@link MemoryArea} enum.
- */
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace proxy
-				{
-   
-                    using namespace org::apache::plc4x::cpp::api::metadata;
-                    using namespace org::apache::plc4x::cpp::api::messages;
-                    using namespace org::apache::plc4x::cpp::api;
-                    using namespace org::apache::plc4x::cpp::base::connection;
-                    using namespace org::apache::plc4x::cpp::utils;
-
-                    /**
-					* Interface defining the most basic methods a PLC4X connection should support.
-					* This generally handles the connection establishment itself and the parsing of
-					* field address strings to the platform dependent PlcField instances.
-					*/
-                    class ProxyConnection : public BoostConnection
-                    {
-                    public:
-
-                        ProxyConnection();
-                        ProxyConnection(std::string strHost, string strParams);
-                        
-                        ~ProxyConnection();
-
-                        void connect() {};
-
-                        /**
-                            * Provides connection metadata.
-                            */
-                        PlcConnectionMetadata* getMetadata() { return NULL; };
-
-                        /**
-                            * Obtain read request builder.
-                            * @throws PlcUnsupportedOperationException if the connection does not support reading
-                            * Todo: implement pendant for java Builder pattern
-                            */
-                        PlcReadRequest::Builder* readRequestBuilder() { return NULL; };
-
-                        /**
-                            * Obtain write request builder.
-                            * @throws PlcUnsupportedOperationException if the connection does not support writing
-                            * Todo: implement pendant for java Builder pattern (PlcWriteRequest.Builder)
-                            */
-                        PlcWriteRequest* writeRequestBuilder() { return NULL; };
-
-                        /**
-                            * Obtain subscription request builder.
-                            * @throws PlcUnsupportedOperationException if the connection does not support subscription
-                            * Todo: implement pendant for java Builder pattern (PlcSubscriptionRequest.Builder)
-                            */
-                        PlcSubscriptionRequest* subscriptionRequestBuilder() { return NULL; };
-
-                        /**
-                            * Obtain unsubscription request builder.
-                            * @throws PlcUnsupportedOperationException if the connection does not support subscription
-                            * Todo: implement pendant for java Builder pattern (PlcSubscriptionRequest.Builder)
-
-                            */
-                        PlcUnsubscriptionRequest* unsubscriptionRequestBuilder() { return NULL; };
-
-                        void ping() {};
-
-                        bool send(unsigned char* pBytesToSend, int iNumBytesToSend) { return true;};
-
-                        void onReceive(const boost::system::error_code& errorCode, std::size_t szRecvBytes) {};
-                        
-						private:
-
-                            SystemConfiguration CONF;
-
-					};
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PROXY_CONNECTION
+#define _PROXY_CONNECTION
+
+#include <org/apache/plc4x/cpp/api/metadata/PlcConnectionMetadata.h>
+#include <org/apache/plc4x/cpp/api/messages/PlcReadRequest.h>
+#include <org/apache/plc4x/cpp/api/messages/PlcWriteRequest.h>
+#include <org/apache/plc4x/cpp/api/messages/PlcSubscriptionRequest.h>
+#include <org/apache/plc4x/cpp/api/messages/PlcUnsubscriptionRequest.h>
+#include <org/apache/plc4x/cpp/base/connection/BoostConnection.h>
+#include <org/apache/plc4x/cpp/base/connection/ChannelFactory.h>
+#include <org/apache/plc4x/cpp/utils/logger/BLogger.h>
+#include <org/apache/plc4x/cpp/utils/systemconfig/SystemConfiguration.h>
+
+
+/**
+ * Class implementing the Connection handling for Siemens S7.
+ * The adressing of Values in S7 works as follows:
+ * <p>
+ * For adressing values from Datablocks the following syntax is used:
+ * <pre>
+ *     DATA_BLOCKS/{blockNumer}/{byteOffset}
+ * </pre>
+ * <p>
+ * For adressing data from other memory segments like I/O, Markers, ...
+ * <pre>
+ *     {memory area}/{byte offset}
+ *     or
+ *     {memory area}/{byte offset}/{bit offset}
+ * </pre>
+ * where the {bit-offset} is optional.
+ * All Available Memory Areas for this mode are defined in the {@link MemoryArea} enum.
+ */
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace proxy
+				{
+   
+                    using namespace org::apache::plc4x::cpp::api::metadata;
+                    using namespace org::apache::plc4x::cpp::api::messages;
+                    using namespace org::apache::plc4x::cpp::api;
+                    using namespace org::apache::plc4x::cpp::base::connection;
+                    using namespace org::apache::plc4x::cpp::utils;
+
+                    /**
+					* Interface defining the most basic methods a PLC4X connection should support.
+					* This generally handles the connection establishment itself and the parsing of
+					* field address strings to the platform dependent PlcField instances.
+					*/
+                    class ProxyConnection : public BoostConnection
+                    {
+                    public:
+
+                        ProxyConnection();
+                        ProxyConnection(std::string strHost, string strParams);
+                        
+                        ~ProxyConnection();
+
+                        void connect() {};
+
+                        /**
+                            * Provides connection metadata.
+                            */
+                        PlcConnectionMetadata* getMetadata() { return NULL; };
+
+                        /**
+                            * Obtain read request builder.
+                            * @throws PlcUnsupportedOperationException if the connection does not support reading
+                            * Todo: implement pendant for java Builder pattern
+                            */
+                        PlcReadRequest::Builder* readRequestBuilder() { return NULL; };
+
+                        /**
+                            * Obtain write request builder.
+                            * @throws PlcUnsupportedOperationException if the connection does not support writing
+                            * Todo: implement pendant for java Builder pattern (PlcWriteRequest.Builder)
+                            */
+                        PlcWriteRequest* writeRequestBuilder() { return NULL; };
+
+                        /**
+                            * Obtain subscription request builder.
+                            * @throws PlcUnsupportedOperationException if the connection does not support subscription
+                            * Todo: implement pendant for java Builder pattern (PlcSubscriptionRequest.Builder)
+                            */
+                        PlcSubscriptionRequest* subscriptionRequestBuilder() { return NULL; };
+
+                        /**
+                            * Obtain unsubscription request builder.
+                            * @throws PlcUnsupportedOperationException if the connection does not support subscription
+                            * Todo: implement pendant for java Builder pattern (PlcSubscriptionRequest.Builder)
+
+                            */
+                        PlcUnsubscriptionRequest* unsubscriptionRequestBuilder() { return NULL; };
+
+                        void ping() {};
+
+                        bool send(unsigned char* pBytesToSend, int iNumBytesToSend) { return true;};
+
+                        void onReceive(const boost::system::error_code& errorCode, std::size_t szRecvBytes) {};
+                        
+						private:
+
+                            SystemConfiguration CONF;
+
+					};
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/dllexports.cpp b/sandbox/plc4cpp/drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/dllexports.cpp
index ad72d07677e..9958f09fef7 100644
--- a/sandbox/plc4cpp/drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/dllexports.cpp
+++ b/sandbox/plc4cpp/drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/dllexports.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://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.
-*/
-
-//-------- DllMain.cpp --------//
-#include "dllexports.h"
-#include "ProxyDriver.h"
-#if defined (_WIN32)
-    #include <windows.h>
-#endif
-
-using namespace org::apache::plc4x::cpp::proxy;
-using namespace org::apache::plc4x::cpp::spi;
-
-#if defined (_WIN32)
-int WINAPI DllEntryPoint(HINSTANCE hinst, unsigned long reason, void*)
-{
-    return 1;
-}
-#endif
-
-extern "C" PlcDriver* _CreatePlcDriverInstance()
-{
-    return new ProxyDriver;
+/*
+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
+
+http://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.
+*/
+
+//-------- DllMain.cpp --------//
+#include "dllexports.h"
+#include "ProxyDriver.h"
+#if defined (_WIN32)
+    #include <windows.h>
+#endif
+
+using namespace org::apache::plc4x::cpp::proxy;
+using namespace org::apache::plc4x::cpp::spi;
+
+#if defined (_WIN32)
+int WINAPI DllEntryPoint(HINSTANCE hinst, unsigned long reason, void*)
+{
+    return 1;
+}
+#endif
+
+extern "C" PlcDriver* _CreatePlcDriverInstance()
+{
+    return new ProxyDriver;
 }
\ No newline at end of file
diff --git a/sandbox/plc4cpp/drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/dllexports.h b/sandbox/plc4cpp/drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/dllexports.h
index 9e8295d7dec..cd7211add8f 100644
--- a/sandbox/plc4cpp/drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/dllexports.h
+++ b/sandbox/plc4cpp/drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/dllexports.h
@@ -1,29 +1,29 @@
-/*
-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
-
-http://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.
-*/
-
-//-------- DllExports.h --------//
-#ifndef _DLLEXPORTS_H
-#define _DLLEXPORTS_H
-
-#include <org/apache/plc4x/cpp/spi/PlcDriver.h>
-
-extern "C" /*__declspec(dllexport)*/ org::apache::plc4x::cpp::spi::PlcDriver* _CreatePlcDriverInstance();
-
-
+/*
+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
+
+http://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.
+*/
+
+//-------- DllExports.h --------//
+#ifndef _DLLEXPORTS_H
+#define _DLLEXPORTS_H
+
+#include <org/apache/plc4x/cpp/spi/PlcDriver.h>
+
+extern "C" /*__declspec(dllexport)*/ org::apache::plc4x::cpp::spi::PlcDriver* _CreatePlcDriverInstance();
+
+
 #endif	// DLLEXPORTS_H
\ No newline at end of file
diff --git a/sandbox/plc4cpp/drivers/s7/CMakeLists.txt b/sandbox/plc4cpp/drivers/s7/CMakeLists.txt
index c1dd75a257b..ca75799f5ff 100644
--- a/sandbox/plc4cpp/drivers/s7/CMakeLists.txt
+++ b/sandbox/plc4cpp/drivers/s7/CMakeLists.txt
@@ -1,43 +1,43 @@
-#[[
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://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.
-]]
-
-add_library(plc4cpp-driver-s7 SHARED
-        src/main/cpp/org/apache/plc4x/cpp/s7/dllexports.cpp
-        src/main/cpp/org/apache/plc4x/cpp/s7/S7PlcDriver.cpp
-		src/main/cpp/org/apache/plc4x/cpp/s7/connection/S7PlcConnection.cpp
-            )
-
-target_include_directories (plc4cpp-driver-s7 PUBLIC ${Boost_INCLUDE_DIRS})
-target_include_directories (plc4cpp-driver-s7 PUBLIC ../../api/src/main/cpp)
-target_include_directories (plc4cpp-driver-s7 PUBLIC ../../protocols/driver-bases/base/src/main/cpp)
-target_include_directories (plc4cpp-driver-s7 PUBLIC ../../protocols/s7/src/main/cpp)
-target_include_directories (plc4cpp-driver-s7 PUBLIC ../../utils/logger/src/main/cpp)
-target_include_directories (plc4cpp-driver-s7 PUBLIC ../../utils/systemconfig/src/main/cpp)
-
-target_link_libraries (plc4cpp-driver-s7
-                        ${Boost_LIBRARIES}
-                        plc4cpp-utils-logger 
-                        plc4cpp-api 
-                        plc4cpp-protocols-driver-base-base
-                        plc4cpp-utils-systemconfig
-                      )
-
-if(MINGW)
-    target_link_libraries (plc4cpp-driver-s7 ws2_32)
-endif()
+#[[
+  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
+
+      http://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.
+]]
+
+add_library(plc4cpp-driver-s7 SHARED
+        src/main/cpp/org/apache/plc4x/cpp/s7/dllexports.cpp
+        src/main/cpp/org/apache/plc4x/cpp/s7/S7PlcDriver.cpp
+		src/main/cpp/org/apache/plc4x/cpp/s7/connection/S7PlcConnection.cpp
+            )
+
+target_include_directories (plc4cpp-driver-s7 PUBLIC ${Boost_INCLUDE_DIRS})
+target_include_directories (plc4cpp-driver-s7 PUBLIC ../../api/src/main/cpp)
+target_include_directories (plc4cpp-driver-s7 PUBLIC ../../protocols/driver-bases/base/src/main/cpp)
+target_include_directories (plc4cpp-driver-s7 PUBLIC ../../protocols/s7/src/main/cpp)
+target_include_directories (plc4cpp-driver-s7 PUBLIC ../../utils/logger/src/main/cpp)
+target_include_directories (plc4cpp-driver-s7 PUBLIC ../../utils/systemconfig/src/main/cpp)
+
+target_link_libraries (plc4cpp-driver-s7
+                        ${Boost_LIBRARIES}
+                        plc4cpp-utils-logger 
+                        plc4cpp-api 
+                        plc4cpp-protocols-driver-base-base
+                        plc4cpp-utils-systemconfig
+                      )
+
+if(MINGW)
+    target_link_libraries (plc4cpp-driver-s7 ws2_32)
+endif()
diff --git a/sandbox/plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/S7PlcDriver.cpp b/sandbox/plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/S7PlcDriver.cpp
index e1a8f575369..43929144789 100644
--- a/sandbox/plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/S7PlcDriver.cpp
+++ b/sandbox/plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/S7PlcDriver.cpp
@@ -1,93 +1,93 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "S7PlcDriver.h"
-#include "connection/S7PlcConnection.h"
-#include <org/apache/plc4x/cpp/api/exceptions/PlcConnectionException.h>
-#include <boost/regex.hpp>
-
-using namespace std;
-using namespace org::apache::plc4x::cpp::api::exceptions;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace s7
-				{
-                    string S7PlcDriver::getProtocolCode() 
-                    {
-                        return std::string("s7");
-                    }
-
-                    
-                    string S7PlcDriver::getProtocolName() {
-                        return "Siemens S7 (Basic)";
-                    }
-
-                    PlcConnection* S7PlcDriver::connect(std::string url)
-                    {
-                        boost::regex exFilter(S7_URI_PATTERN.c_str());
-                        boost::smatch what;                       
-
-                        std::string strHost = "";
-                        int iRack = -1;
-                        int iSlot = -1; 
-                        std::string strParams = "";
-                        S7PlcConnection* pS7PlcConnection = NULL;
-
-                        try
-                        {
-                            if (!boost::regex_search(url, what, exFilter))
-                            {
-                                BOOST_THROW_EXCEPTION(PlcConnectionException("Connection url doesn't match the format 's7://{host|ip}/{rack}/{slot}'"));
-                            }                       
-
-                            strHost = what[1].str(); // Host
-                            iRack = std::stoi(what[2].str()); // Rack
-                            iSlot = std::stoi(what[3].str()); // Slot
-                            strParams = what[4].str(); // Params
-
-                            // Resolve from Hostname to implements PlcConnection
-                            pS7PlcConnection = new S7PlcConnection(strHost, iRack, iSlot, strParams);
-                        }
-                        catch (exception ex) 
-                        {
-                            BOOST_THROW_EXCEPTION(PlcConnectionException("Error connecting to host", ex));
-                        }
-
-                        return pS7PlcConnection;
-                    }
-
-                    
-                    PlcConnection* S7PlcDriver::connect(std::string url, PlcAuthentication authentication)
-                    {
-                        BOOST_THROW_EXCEPTION(PlcConnectionException("Basic S7 connections don't support authentication."));
-                    }
-
-
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "S7PlcDriver.h"
+#include "connection/S7PlcConnection.h"
+#include <org/apache/plc4x/cpp/api/exceptions/PlcConnectionException.h>
+#include <boost/regex.hpp>
+
+using namespace std;
+using namespace org::apache::plc4x::cpp::api::exceptions;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace s7
+				{
+                    string S7PlcDriver::getProtocolCode() 
+                    {
+                        return std::string("s7");
+                    }
+
+                    
+                    string S7PlcDriver::getProtocolName() {
+                        return "Siemens S7 (Basic)";
+                    }
+
+                    PlcConnection* S7PlcDriver::connect(std::string url)
+                    {
+                        boost::regex exFilter(S7_URI_PATTERN.c_str());
+                        boost::smatch what;                       
+
+                        std::string strHost = "";
+                        int iRack = -1;
+                        int iSlot = -1; 
+                        std::string strParams = "";
+                        S7PlcConnection* pS7PlcConnection = NULL;
+
+                        try
+                        {
+                            if (!boost::regex_search(url, what, exFilter))
+                            {
+                                BOOST_THROW_EXCEPTION(PlcConnectionException("Connection url doesn't match the format 's7://{host|ip}/{rack}/{slot}'"));
+                            }                       
+
+                            strHost = what[1].str(); // Host
+                            iRack = std::stoi(what[2].str()); // Rack
+                            iSlot = std::stoi(what[3].str()); // Slot
+                            strParams = what[4].str(); // Params
+
+                            // Resolve from Hostname to implements PlcConnection
+                            pS7PlcConnection = new S7PlcConnection(strHost, iRack, iSlot, strParams);
+                        }
+                        catch (exception ex) 
+                        {
+                            BOOST_THROW_EXCEPTION(PlcConnectionException("Error connecting to host", ex));
+                        }
+
+                        return pS7PlcConnection;
+                    }
+
+                    
+                    PlcConnection* S7PlcDriver::connect(std::string url, PlcAuthentication authentication)
+                    {
+                        BOOST_THROW_EXCEPTION(PlcConnectionException("Basic S7 connections don't support authentication."));
+                    }
+
+
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/S7PlcDriver.h b/sandbox/plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/S7PlcDriver.h
index 53950a92b70..cfdf2bed475 100644
--- a/sandbox/plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/S7PlcDriver.h
+++ b/sandbox/plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/S7PlcDriver.h
@@ -1,87 +1,87 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _S7_PLC_DRIVER
-#define _S7_PLC_DRIVER
-
-#include <org/apache/plc4x/cpp/spi/PlcDriver.h>
-#include <org/apache/plc4x/cpp/api/authentication/PlcAuthentication.h>
-#include <string>
-
-using namespace org::apache::plc4x::cpp::spi;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace s7
-				{
-					/**
-					* Interface defining the most basic methods a PLC4X connection should support.
-					* This generally handles the connection establishment itself and the parsing of
-					* field address strings to the platform dependent PlcField instances.
-					*/
-					class S7PlcDriver : public PlcDriver
-					{
-
-					public:
-						/**
-						 * @return code of the implemented protocol. This is usually a lot shorter than the String returned by @seeĀ #getProtocolName().
-						 */
-						virtual std::string getProtocolCode();
-
-						/**
-						 * @return name of the implemented protocol.
-						 */
-						virtual std::string getProtocolName();
-
-						/**
-						 * Connects to a PLC using the given plc connection string.
-						 * @param url plc connection string.
-						 * @return PlcConnection object.
-						 * @throws PlcConnectionException an exception if the connection attempt failed.
-						 */
-						virtual PlcConnection* connect(std::string url);
-
-						/**
-						 * Connects to a PLC using the given plc connection string using given authentication credentials.
-						 * @param url plc connection string.
-						 * @param authentication authentication credentials.
-						 * @return PlcConnection object.
-						 * @throws PlcConnectionException an exception if the connection attempt failed.
-						 */
-						virtual PlcConnection* connect(std::string url, PlcAuthentication authentication);
-
-					private:
-
-                        const std::string S7_URI_PATTERN="s7://(?<host>.*)/(?<rack>\\d{1,4})/(?<slot>\\d{1,4})(?<params>\\?.*)?";
-                  
-					};
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _S7_PLC_DRIVER
+#define _S7_PLC_DRIVER
+
+#include <org/apache/plc4x/cpp/spi/PlcDriver.h>
+#include <org/apache/plc4x/cpp/api/authentication/PlcAuthentication.h>
+#include <string>
+
+using namespace org::apache::plc4x::cpp::spi;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace s7
+				{
+					/**
+					* Interface defining the most basic methods a PLC4X connection should support.
+					* This generally handles the connection establishment itself and the parsing of
+					* field address strings to the platform dependent PlcField instances.
+					*/
+					class S7PlcDriver : public PlcDriver
+					{
+
+					public:
+						/**
+						 * @return code of the implemented protocol. This is usually a lot shorter than the String returned by @seeĀ #getProtocolName().
+						 */
+						virtual std::string getProtocolCode();
+
+						/**
+						 * @return name of the implemented protocol.
+						 */
+						virtual std::string getProtocolName();
+
+						/**
+						 * Connects to a PLC using the given plc connection string.
+						 * @param url plc connection string.
+						 * @return PlcConnection object.
+						 * @throws PlcConnectionException an exception if the connection attempt failed.
+						 */
+						virtual PlcConnection* connect(std::string url);
+
+						/**
+						 * Connects to a PLC using the given plc connection string using given authentication credentials.
+						 * @param url plc connection string.
+						 * @param authentication authentication credentials.
+						 * @return PlcConnection object.
+						 * @throws PlcConnectionException an exception if the connection attempt failed.
+						 */
+						virtual PlcConnection* connect(std::string url, PlcAuthentication authentication);
+
+					private:
+
+                        const std::string S7_URI_PATTERN="s7://(?<host>.*)/(?<rack>\\d{1,4})/(?<slot>\\d{1,4})(?<params>\\?.*)?";
+                  
+					};
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/connection/S7PlcConnection.cpp b/sandbox/plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/connection/S7PlcConnection.cpp
index b13dd117aea..3b335567b7b 100644
--- a/sandbox/plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/connection/S7PlcConnection.cpp
+++ b/sandbox/plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/connection/S7PlcConnection.cpp
@@ -1,133 +1,133 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "S7PlcConnection.h"
-#include <boost/algorithm/string.hpp>
-#include <boost/lexical_cast.hpp>
-
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace s7
-				{
-                    S7PlcConnection::S7PlcConnection() 
-                    {
-                        _lCloseDeviceTimeoutMS = CONF.getLong("plc4x.s7connection.close.device,timeout", 1000);
-                    };
-
-                    S7PlcConnection::~S7PlcConnection() 
-                    {
-                    
-                    };
-
-                    S7PlcConnection::S7PlcConnection(std::string strHost, int iRack, int iSlot, string strParams)
-                    {
-                        setIPAddress(strHost);
-                        setPort(_ISO_ON_TCP_PORT);
-   
-                        _iRack = iRack;
-                        _iSlot = iSlot;
-
-                        short sCurParamPduSize = 1024;
-                        short sCurParamMaxAmqCaller = 8;
-                        short sCurParamMaxAmqCallee = 8;
-                        S7ControllerType curParamControllerType = S7ControllerType::ANY;
-
-                        if (strParams.length() > 0)
-                        {
-                            vector<string> vecParams;
-                            boost::split(vecParams, strParams, boost::is_any_of("&"), boost::token_compress_on);
-                            for (vector<string>::iterator itParams= vecParams.begin(); itParams < vecParams.end(); itParams++)
-                            {
-                                vector<string> vecParamElements;
-                                boost::split(vecParamElements, *itParams, boost::is_any_of("="), boost::token_compress_on);
-                                string strParamName = vecParamElements[0];
-                                if (vecParamElements.size() == 2)
-                                {
-                                    string strParamValue = vecParamElements[1];
-                                    boost::algorithm::to_lower(strParamValue);
-                                    
-                                    if (strParamValue == "pdu-size")
-                                    {
-                                        sCurParamPduSize = boost::lexical_cast<short>(strParamValue);
-                                    }
-                                    else if (strParamValue == "max-amq-caller")
-                                    {
-                                        sCurParamMaxAmqCaller = boost::lexical_cast<short>(strParamValue);
-                                    }
-                                    else if (strParamValue == "max-amq-callee")
-                                    {
-                                        sCurParamMaxAmqCallee = boost::lexical_cast<short>(strParamValue);
-                                    }
-                                    else if (strParamValue == "controller-type")
-                                    {
-                                        S7ControllerTypeMap s7ControllerTypeMap;
-                                        curParamControllerType = s7ControllerTypeMap[strParamValue];
-                                    }
-                                    else
-                                    {
-                                        string strMessage = "Unknown parameter " + strParamName + " with value " + strParamValue;
-                                        LOG_DEBUG(strMessage);
-                                    }
-                                }
-                                else {
-                                    string strMessage = "Unknown no-value parameter " + strParamName;
-                                    LOG_DEBUG(strMessage);
-                                }
-                            }
-                        }
-
-                        // It seems that the LOGO devices are a little picky about the pdu-size.
-                        // Instead of handling this out, they just hang up without any error message.
-                        // So in case of a LOGO controller, set this to a known working value.
-                        if (curParamControllerType == S7ControllerType::LOGO && sCurParamPduSize == 1024) 
-                        {
-                            sCurParamPduSize = 480;
-                        }
-
-                        // IsoTP uses pre defined sizes. Find the smallest box,
-                        // that would be able to contain the requested pdu size.
-                        _sParamPduSize = sCurParamPduSize;
-                        _sParamMaxAmqCaller = sCurParamMaxAmqCaller;
-                        _sParamMaxAmqCallee = sCurParamMaxAmqCallee;
-                        paramControllerType = curParamControllerType;
-
-                        string strMessage = "Setting up S7cConnection with: host-name " + strHost +
-                            " rack " + std::to_string(_iRack) + " slot " + std::to_string(_iSlot) +
-                            " pdu-size " + std::to_string(_sParamPduSize) + " slot " + std::to_string(_iSlot) +
-                            " max-amq-caller " + std::to_string(_sParamMaxAmqCaller) +
-                            " max-amq-callee " + std::to_string(_sParamMaxAmqCallee);
-                        LOG_INFO(strMessage);
-
-                        return;
-                    }
-
-                   
-
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "S7PlcConnection.h"
+#include <boost/algorithm/string.hpp>
+#include <boost/lexical_cast.hpp>
+
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace s7
+				{
+                    S7PlcConnection::S7PlcConnection() 
+                    {
+                        _lCloseDeviceTimeoutMS = CONF.getLong("plc4x.s7connection.close.device,timeout", 1000);
+                    };
+
+                    S7PlcConnection::~S7PlcConnection() 
+                    {
+                    
+                    };
+
+                    S7PlcConnection::S7PlcConnection(std::string strHost, int iRack, int iSlot, string strParams)
+                    {
+                        setIPAddress(strHost);
+                        setPort(_ISO_ON_TCP_PORT);
+   
+                        _iRack = iRack;
+                        _iSlot = iSlot;
+
+                        short sCurParamPduSize = 1024;
+                        short sCurParamMaxAmqCaller = 8;
+                        short sCurParamMaxAmqCallee = 8;
+                        S7ControllerType curParamControllerType = S7ControllerType::ANY;
+
+                        if (strParams.length() > 0)
+                        {
+                            vector<string> vecParams;
+                            boost::split(vecParams, strParams, boost::is_any_of("&"), boost::token_compress_on);
+                            for (vector<string>::iterator itParams= vecParams.begin(); itParams < vecParams.end(); itParams++)
+                            {
+                                vector<string> vecParamElements;
+                                boost::split(vecParamElements, *itParams, boost::is_any_of("="), boost::token_compress_on);
+                                string strParamName = vecParamElements[0];
+                                if (vecParamElements.size() == 2)
+                                {
+                                    string strParamValue = vecParamElements[1];
+                                    boost::algorithm::to_lower(strParamValue);
+                                    
+                                    if (strParamValue == "pdu-size")
+                                    {
+                                        sCurParamPduSize = boost::lexical_cast<short>(strParamValue);
+                                    }
+                                    else if (strParamValue == "max-amq-caller")
+                                    {
+                                        sCurParamMaxAmqCaller = boost::lexical_cast<short>(strParamValue);
+                                    }
+                                    else if (strParamValue == "max-amq-callee")
+                                    {
+                                        sCurParamMaxAmqCallee = boost::lexical_cast<short>(strParamValue);
+                                    }
+                                    else if (strParamValue == "controller-type")
+                                    {
+                                        S7ControllerTypeMap s7ControllerTypeMap;
+                                        curParamControllerType = s7ControllerTypeMap[strParamValue];
+                                    }
+                                    else
+                                    {
+                                        string strMessage = "Unknown parameter " + strParamName + " with value " + strParamValue;
+                                        LOG_DEBUG(strMessage);
+                                    }
+                                }
+                                else {
+                                    string strMessage = "Unknown no-value parameter " + strParamName;
+                                    LOG_DEBUG(strMessage);
+                                }
+                            }
+                        }
+
+                        // It seems that the LOGO devices are a little picky about the pdu-size.
+                        // Instead of handling this out, they just hang up without any error message.
+                        // So in case of a LOGO controller, set this to a known working value.
+                        if (curParamControllerType == S7ControllerType::LOGO && sCurParamPduSize == 1024) 
+                        {
+                            sCurParamPduSize = 480;
+                        }
+
+                        // IsoTP uses pre defined sizes. Find the smallest box,
+                        // that would be able to contain the requested pdu size.
+                        _sParamPduSize = sCurParamPduSize;
+                        _sParamMaxAmqCaller = sCurParamMaxAmqCaller;
+                        _sParamMaxAmqCallee = sCurParamMaxAmqCallee;
+                        paramControllerType = curParamControllerType;
+
+                        string strMessage = "Setting up S7cConnection with: host-name " + strHost +
+                            " rack " + std::to_string(_iRack) + " slot " + std::to_string(_iSlot) +
+                            " pdu-size " + std::to_string(_sParamPduSize) + " slot " + std::to_string(_iSlot) +
+                            " max-amq-caller " + std::to_string(_sParamMaxAmqCaller) +
+                            " max-amq-callee " + std::to_string(_sParamMaxAmqCallee);
+                        LOG_INFO(strMessage);
+
+                        return;
+                    }
+
+                   
+
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/connection/S7PlcConnection.h b/sandbox/plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/connection/S7PlcConnection.h
index 856251b7bcc..7132586baa2 100644
--- a/sandbox/plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/connection/S7PlcConnection.h
+++ b/sandbox/plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/connection/S7PlcConnection.h
@@ -1,149 +1,149 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _S7_PLC_CONNECTION
-#define _S7_PLC_CONNECTION
-
-#include <org/apache/plc4x/cpp/api/metadata/PlcConnectionMetadata.h>
-#include <org/apache/plc4x/cpp/api/messages/PlcReadRequest.h>
-#include <org/apache/plc4x/cpp/api/messages/PlcWriteRequest.h>
-#include <org/apache/plc4x/cpp/api/messages/PlcSubscriptionRequest.h>
-#include <org/apache/plc4x/cpp/api/messages/PlcUnsubscriptionRequest.h>
-#include <org/apache/plc4x/cpp/base/connection/BoostConnection.h>
-#include <org/apache/plc4x/cpp/base/connection/ChannelFactory.h>
-#include <org/apache/plc4x/cpp/s7/types/S7ControllerType.h>
-#include <org/apache/plc4x/cpp/utils/logger/BLogger.h>
-#include <org/apache/plc4x/cpp/utils/systemconfig/SystemConfiguration.h>
-
-
-/**
- * Class implementing the Connection handling for Siemens S7.
- * The adressing of Values in S7 works as follows:
- * <p>
- * For adressing values from Datablocks the following syntax is used:
- * <pre>
- *     DATA_BLOCKS/{blockNumer}/{byteOffset}
- * </pre>
- * <p>
- * For adressing data from other memory segments like I/O, Markers, ...
- * <pre>
- *     {memory area}/{byte offset}
- *     or
- *     {memory area}/{byte offset}/{bit offset}
- * </pre>
- * where the {bit-offset} is optional.
- * All Available Memory Areas for this mode are defined in the {@link MemoryArea} enum.
- */
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace s7
-				{
-   
-                    using namespace org::apache::plc4x::cpp::api::metadata;
-                    using namespace org::apache::plc4x::cpp::api::messages;
-                    using namespace org::apache::plc4x::cpp::api;
-                    using namespace org::apache::plc4x::cpp::base::connection;
-                    using namespace org::apache::plc4x::cpp::s7::types;
-                    using namespace org::apache::plc4x::cpp::utils;
-
-                    /**
-					* Interface defining the most basic methods a PLC4X connection should support.
-					* This generally handles the connection establishment itself and the parsing of
-					* field address strings to the platform dependent PlcField instances.
-					*/
-                    class S7PlcConnection : public BoostConnection
-                    {
-                    public:
-
-                        S7PlcConnection();
-                        S7PlcConnection(std::string strHost, int iRack, int iSlot, string strParams);
-                        
-                        ~S7PlcConnection();
-
-                        void connect() {};
-
-                        /**
-                            * Provides connection metadata.
-                            */
-                        PlcConnectionMetadata* getMetadata() { return NULL; };
-
-                        /**
-                            * Obtain read request builder.
-                            * @throws PlcUnsupportedOperationException if the connection does not support reading
-                            * Todo: implement pendant for java Builder pattern
-                            */
-                        PlcReadRequest::Builder* readRequestBuilder() { return NULL; };
-
-                        /**
-                            * Obtain write request builder.
-                            * @throws PlcUnsupportedOperationException if the connection does not support writing
-                            * Todo: implement pendant for java Builder pattern (PlcWriteRequest.Builder)
-                            */
-                        PlcWriteRequest* writeRequestBuilder() { return NULL; };
-
-                        /**
-                            * Obtain subscription request builder.
-                            * @throws PlcUnsupportedOperationException if the connection does not support subscription
-                            * Todo: implement pendant for java Builder pattern (PlcSubscriptionRequest.Builder)
-                            */
-                        PlcSubscriptionRequest* subscriptionRequestBuilder() { return NULL; };
-
-                        /**
-                            * Obtain unsubscription request builder.
-                            * @throws PlcUnsupportedOperationException if the connection does not support subscription
-                            * Todo: implement pendant for java Builder pattern (PlcSubscriptionRequest.Builder)
-
-                            */
-                        PlcUnsubscriptionRequest* unsubscriptionRequestBuilder() { return NULL; };
-
-                        void ping() {};
-
-                        bool send(unsigned char* pBytesToSend, int iNumBytesToSend) { return true;};
-
-                        void onReceive(const boost::system::error_code& errorCode, std::size_t szRecvBytes) {};
-                        
-						private:
-
-                            const int _ISO_ON_TCP_PORT = 102;
-
-                            SystemConfiguration CONF;
-
-                            int _iRack;
-                            int _iSlot;
-
-                            short _sParamPduSize;
-                            short _sParamMaxAmqCaller;
-                            short _sParamMaxAmqCallee;
-                            S7ControllerType paramControllerType;
-
-					};
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _S7_PLC_CONNECTION
+#define _S7_PLC_CONNECTION
+
+#include <org/apache/plc4x/cpp/api/metadata/PlcConnectionMetadata.h>
+#include <org/apache/plc4x/cpp/api/messages/PlcReadRequest.h>
+#include <org/apache/plc4x/cpp/api/messages/PlcWriteRequest.h>
+#include <org/apache/plc4x/cpp/api/messages/PlcSubscriptionRequest.h>
+#include <org/apache/plc4x/cpp/api/messages/PlcUnsubscriptionRequest.h>
+#include <org/apache/plc4x/cpp/base/connection/BoostConnection.h>
+#include <org/apache/plc4x/cpp/base/connection/ChannelFactory.h>
+#include <org/apache/plc4x/cpp/s7/types/S7ControllerType.h>
+#include <org/apache/plc4x/cpp/utils/logger/BLogger.h>
+#include <org/apache/plc4x/cpp/utils/systemconfig/SystemConfiguration.h>
+
+
+/**
+ * Class implementing the Connection handling for Siemens S7.
+ * The adressing of Values in S7 works as follows:
+ * <p>
+ * For adressing values from Datablocks the following syntax is used:
+ * <pre>
+ *     DATA_BLOCKS/{blockNumer}/{byteOffset}
+ * </pre>
+ * <p>
+ * For adressing data from other memory segments like I/O, Markers, ...
+ * <pre>
+ *     {memory area}/{byte offset}
+ *     or
+ *     {memory area}/{byte offset}/{bit offset}
+ * </pre>
+ * where the {bit-offset} is optional.
+ * All Available Memory Areas for this mode are defined in the {@link MemoryArea} enum.
+ */
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace s7
+				{
+   
+                    using namespace org::apache::plc4x::cpp::api::metadata;
+                    using namespace org::apache::plc4x::cpp::api::messages;
+                    using namespace org::apache::plc4x::cpp::api;
+                    using namespace org::apache::plc4x::cpp::base::connection;
+                    using namespace org::apache::plc4x::cpp::s7::types;
+                    using namespace org::apache::plc4x::cpp::utils;
+
+                    /**
+					* Interface defining the most basic methods a PLC4X connection should support.
+					* This generally handles the connection establishment itself and the parsing of
+					* field address strings to the platform dependent PlcField instances.
+					*/
+                    class S7PlcConnection : public BoostConnection
+                    {
+                    public:
+
+                        S7PlcConnection();
+                        S7PlcConnection(std::string strHost, int iRack, int iSlot, string strParams);
+                        
+                        ~S7PlcConnection();
+
+                        void connect() {};
+
+                        /**
+                            * Provides connection metadata.
+                            */
+                        PlcConnectionMetadata* getMetadata() { return NULL; };
+
+                        /**
+                            * Obtain read request builder.
+                            * @throws PlcUnsupportedOperationException if the connection does not support reading
+                            * Todo: implement pendant for java Builder pattern
+                            */
+                        PlcReadRequest::Builder* readRequestBuilder() { return NULL; };
+
+                        /**
+                            * Obtain write request builder.
+                            * @throws PlcUnsupportedOperationException if the connection does not support writing
+                            * Todo: implement pendant for java Builder pattern (PlcWriteRequest.Builder)
+                            */
+                        PlcWriteRequest* writeRequestBuilder() { return NULL; };
+
+                        /**
+                            * Obtain subscription request builder.
+                            * @throws PlcUnsupportedOperationException if the connection does not support subscription
+                            * Todo: implement pendant for java Builder pattern (PlcSubscriptionRequest.Builder)
+                            */
+                        PlcSubscriptionRequest* subscriptionRequestBuilder() { return NULL; };
+
+                        /**
+                            * Obtain unsubscription request builder.
+                            * @throws PlcUnsupportedOperationException if the connection does not support subscription
+                            * Todo: implement pendant for java Builder pattern (PlcSubscriptionRequest.Builder)
+
+                            */
+                        PlcUnsubscriptionRequest* unsubscriptionRequestBuilder() { return NULL; };
+
+                        void ping() {};
+
+                        bool send(unsigned char* pBytesToSend, int iNumBytesToSend) { return true;};
+
+                        void onReceive(const boost::system::error_code& errorCode, std::size_t szRecvBytes) {};
+                        
+						private:
+
+                            const int _ISO_ON_TCP_PORT = 102;
+
+                            SystemConfiguration CONF;
+
+                            int _iRack;
+                            int _iSlot;
+
+                            short _sParamPduSize;
+                            short _sParamMaxAmqCaller;
+                            short _sParamMaxAmqCallee;
+                            S7ControllerType paramControllerType;
+
+					};
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/dllexports.cpp b/sandbox/plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/dllexports.cpp
index 7a549ce97de..3ff1a1d9b0c 100644
--- a/sandbox/plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/dllexports.cpp
+++ b/sandbox/plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/dllexports.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-http://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.
-*/
-
-//-------- DllMain.cpp --------//
-#include "dllexports.h"
-#include "S7PlcDriver.h"
-#if defined (_WIN32)
-    #include <windows.h>
-#endif
-
-using namespace org::apache::plc4x::cpp::s7;
-using namespace org::apache::plc4x::cpp::spi;
-
-#if defined (_WIN32)
-int WINAPI DllEntryPoint(HINSTANCE hinst, unsigned long reason, void*)
-{
-    return 1;
-}
-#endif
-
-extern "C" PlcDriver* _CreatePlcDriverInstance()
-{
-    return new S7PlcDriver;
+/*
+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
+
+http://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.
+*/
+
+//-------- DllMain.cpp --------//
+#include "dllexports.h"
+#include "S7PlcDriver.h"
+#if defined (_WIN32)
+    #include <windows.h>
+#endif
+
+using namespace org::apache::plc4x::cpp::s7;
+using namespace org::apache::plc4x::cpp::spi;
+
+#if defined (_WIN32)
+int WINAPI DllEntryPoint(HINSTANCE hinst, unsigned long reason, void*)
+{
+    return 1;
+}
+#endif
+
+extern "C" PlcDriver* _CreatePlcDriverInstance()
+{
+    return new S7PlcDriver;
 }
\ No newline at end of file
diff --git a/sandbox/plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/dllexports.h b/sandbox/plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/dllexports.h
index 9e8295d7dec..cd7211add8f 100644
--- a/sandbox/plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/dllexports.h
+++ b/sandbox/plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/dllexports.h
@@ -1,29 +1,29 @@
-/*
-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
-
-http://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.
-*/
-
-//-------- DllExports.h --------//
-#ifndef _DLLEXPORTS_H
-#define _DLLEXPORTS_H
-
-#include <org/apache/plc4x/cpp/spi/PlcDriver.h>
-
-extern "C" /*__declspec(dllexport)*/ org::apache::plc4x::cpp::spi::PlcDriver* _CreatePlcDriverInstance();
-
-
+/*
+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
+
+http://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.
+*/
+
+//-------- DllExports.h --------//
+#ifndef _DLLEXPORTS_H
+#define _DLLEXPORTS_H
+
+#include <org/apache/plc4x/cpp/spi/PlcDriver.h>
+
+extern "C" /*__declspec(dllexport)*/ org::apache::plc4x::cpp::spi::PlcDriver* _CreatePlcDriverInstance();
+
+
 #endif	// DLLEXPORTS_H
\ No newline at end of file
diff --git a/sandbox/plc4cpp/examples/CMakeLists.txt b/sandbox/plc4cpp/examples/CMakeLists.txt
index e720a1fb21e..f02f09f9e9e 100644
--- a/sandbox/plc4cpp/examples/CMakeLists.txt
+++ b/sandbox/plc4cpp/examples/CMakeLists.txt
@@ -1,20 +1,20 @@
-#[[
-  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
-
-      http://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.
-]]
-
-add_subdirectory(hello-world-plc4x)
+#[[
+  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
+
+      http://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.
+]]
+
+add_subdirectory(hello-world-plc4x)
diff --git a/sandbox/plc4cpp/examples/hello-world-plc4x/CMakeLists.txt b/sandbox/plc4cpp/examples/hello-world-plc4x/CMakeLists.txt
index aec06a9f052..4eb92fe303f 100644
--- a/sandbox/plc4cpp/examples/hello-world-plc4x/CMakeLists.txt
+++ b/sandbox/plc4cpp/examples/hello-world-plc4x/CMakeLists.txt
@@ -1,27 +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
-
-      http://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.
-]]
-
-add_executable(helloplc4x
-                src/main/cpp/org/apache/plc4x/cpp/examples/helloplc4x/helloplc4x.cpp)
-
-target_include_directories (helloplc4x PUBLIC ${Boost_INCLUDE_DIRS})
-target_include_directories (helloplc4x PUBLIC ../../api/src/main/cpp)
-target_include_directories (helloplc4x PUBLIC ../../utils/logger/src/main/cpp)
-
-target_link_libraries (helloplc4x ${Boost_LIBRARIES} plc4cpp-driver-s7 plc4cpp-utils-logger plc4cpp-api)
+#[[
+  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
+
+      http://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.
+]]
+
+add_executable(helloplc4x
+                src/main/cpp/org/apache/plc4x/cpp/examples/helloplc4x/helloplc4x.cpp)
+
+target_include_directories (helloplc4x PUBLIC ${Boost_INCLUDE_DIRS})
+target_include_directories (helloplc4x PUBLIC ../../api/src/main/cpp)
+target_include_directories (helloplc4x PUBLIC ../../utils/logger/src/main/cpp)
+
+target_link_libraries (helloplc4x ${Boost_LIBRARIES} plc4cpp-driver-s7 plc4cpp-utils-logger plc4cpp-api)
diff --git a/sandbox/plc4cpp/examples/hello-world-plc4x/src/main/cpp/org/apache/plc4x/cpp/examples/helloplc4x/helloplc4x.cpp b/sandbox/plc4cpp/examples/hello-world-plc4x/src/main/cpp/org/apache/plc4x/cpp/examples/helloplc4x/helloplc4x.cpp
index 3568fdc6a15..faef38706d2 100644
--- a/sandbox/plc4cpp/examples/hello-world-plc4x/src/main/cpp/org/apache/plc4x/cpp/examples/helloplc4x/helloplc4x.cpp
+++ b/sandbox/plc4cpp/examples/hello-world-plc4x/src/main/cpp/org/apache/plc4x/cpp/examples/helloplc4x/helloplc4x.cpp
@@ -1,122 +1,122 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-//package org.apache.plc4x.java.examples.helloplc4x;
-#include <iostream>
-
-#include <org/apache/plc4x/cpp/PlcDriverManager.h>
-#include <org/apache/plc4x/cpp/api/PlcConnection.h>
-#include <org/apache/plc4x/cpp/api/messages/PlcReadRequest.h>
-#include <org/apache/plc4x/cpp/api/messages/PlcReadResponse.h>
-#include <org/apache/plc4x/cpp/api/types/PlcResponseCode.h>
-#include <org/apache/plc4x/cpp/utils/logger/BLogger.h>
-
-using namespace std;
-using namespace org::apache::plc4x::cpp;
-
-/**
-    * Example code do demonstrate using PLC4X.
-    *
-    * @param args ignored.
-    */
-int main(int argc, char *argv[]) 
-{
-    /* CliOptions options = CliOptions.fromArgs(args);
-    if (options == null) {
-        CliOptions.printHelp();
-        // Could not parse.
-        System.exit(1);
-    }*/
-
-    // Establish a connection to the plc using the url provided as first argument
-    try 
-    {
-
-        PlcDriverManager plcDriverManager;
-        //options.getConnectionString()
-
-        PlcConnection* plcConnection = plcDriverManager.getConnection("s7://10.10.64.20/0/1");
-
-        // Check if this connection support reading of data.
-        /*if (!plcConnection.getMetadata().canRead()) {
-            logger.error("This connection doesn't support reading.");
-            return;
-        }*/
-
-        // Create a new read request:
-        // - Give the single item requested the alias name "value"
-        /*PlcReadRequest::Builder builder = plcConnection.readRequestBuilder();
-        for (int i = 0; i < options.getFieldAddress().length; i++) {
-            builder.addItem("value-" + i, options.getFieldAddress()[i]);
-        }
-        PlcReadRequest readRequest = builder.build();*/
-
-        //////////////////////////////////////////////////////////
-        // Read synchronously ...
-        // NOTICE: the ".get()" immediately lets this thread pause until
-        // the response is processed and available.*/
-        LOG_INFO("Synchronous request ...");
-        /*PlcReadResponse syncResponse = readRequest.execute().get();
-        // Simply iterating over the field names returned in the response.
-        printResponse(syncResponse);
-
-        //////////////////////////////////////////////////////////
-        // Read asynchronously ...
-        // Register a callback executed as soon as a response arrives.
-        logger.info("Asynchronous request ...");
-        CompletableFuture<? extends PlcReadResponse> asyncResponse = readRequest.execute();
-        asyncResponse.whenComplete((readResponse, throwable) -> {
-            if (readResponse != null) {
-                printResponse(readResponse);
-            } else {
-                logger.error("An error occurred: " + throwable.getMessage(), throwable);
-            }
-        }*/
-    }
-    catch (...)
-    {
-
-    }
-
-    return 0;
-}
-
-/*private static void printResponse(PlcReadResponse response) {
-    for (String fieldName : response.getFieldNames()) {
-        if(response.getResponseCode(fieldName) == PlcResponseCode.OK) {
-            int numValues = response.getNumberOfValues(fieldName);
-            // If it's just one element, output just one single line.
-            if(numValues == 1) {
-                logger.info("Value[" + fieldName + "]: " + response.getObject(fieldName));
-            }
-            // If it's more than one element, output each in a single row.
-            else {
-                logger.info("Value[" + fieldName + "]:");
-                for(int i = 0; i < numValues; i++) {
-                    logger.info(" - " + response.getObject(fieldName, i));
-                }
-            }
-        }
-        // Something went wrong, to output an error message instead.
-        else {
-            logger.error("Error[" + fieldName + "]: " + response.getResponseCode(fieldName).name());
-        }
-    }
-}*/
-
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+//package org.apache.plc4x.java.examples.helloplc4x;
+#include <iostream>
+
+#include <org/apache/plc4x/cpp/PlcDriverManager.h>
+#include <org/apache/plc4x/cpp/api/PlcConnection.h>
+#include <org/apache/plc4x/cpp/api/messages/PlcReadRequest.h>
+#include <org/apache/plc4x/cpp/api/messages/PlcReadResponse.h>
+#include <org/apache/plc4x/cpp/api/types/PlcResponseCode.h>
+#include <org/apache/plc4x/cpp/utils/logger/BLogger.h>
+
+using namespace std;
+using namespace org::apache::plc4x::cpp;
+
+/**
+    * Example code do demonstrate using PLC4X.
+    *
+    * @param args ignored.
+    */
+int main(int argc, char *argv[]) 
+{
+    /* CliOptions options = CliOptions.fromArgs(args);
+    if (options == null) {
+        CliOptions.printHelp();
+        // Could not parse.
+        System.exit(1);
+    }*/
+
+    // Establish a connection to the plc using the url provided as first argument
+    try 
+    {
+
+        PlcDriverManager plcDriverManager;
+        //options.getConnectionString()
+
+        PlcConnection* plcConnection = plcDriverManager.getConnection("s7://10.10.64.20/0/1");
+
+        // Check if this connection support reading of data.
+        /*if (!plcConnection.getMetadata().canRead()) {
+            logger.error("This connection doesn't support reading.");
+            return;
+        }*/
+
+        // Create a new read request:
+        // - Give the single item requested the alias name "value"
+        /*PlcReadRequest::Builder builder = plcConnection.readRequestBuilder();
+        for (int i = 0; i < options.getFieldAddress().length; i++) {
+            builder.addItem("value-" + i, options.getFieldAddress()[i]);
+        }
+        PlcReadRequest readRequest = builder.build();*/
+
+        //////////////////////////////////////////////////////////
+        // Read synchronously ...
+        // NOTICE: the ".get()" immediately lets this thread pause until
+        // the response is processed and available.*/
+        LOG_INFO("Synchronous request ...");
+        /*PlcReadResponse syncResponse = readRequest.execute().get();
+        // Simply iterating over the field names returned in the response.
+        printResponse(syncResponse);
+
+        //////////////////////////////////////////////////////////
+        // Read asynchronously ...
+        // Register a callback executed as soon as a response arrives.
+        logger.info("Asynchronous request ...");
+        CompletableFuture<? extends PlcReadResponse> asyncResponse = readRequest.execute();
+        asyncResponse.whenComplete((readResponse, throwable) -> {
+            if (readResponse != null) {
+                printResponse(readResponse);
+            } else {
+                logger.error("An error occurred: " + throwable.getMessage(), throwable);
+            }
+        }*/
+    }
+    catch (...)
+    {
+
+    }
+
+    return 0;
+}
+
+/*private static void printResponse(PlcReadResponse response) {
+    for (String fieldName : response.getFieldNames()) {
+        if(response.getResponseCode(fieldName) == PlcResponseCode.OK) {
+            int numValues = response.getNumberOfValues(fieldName);
+            // If it's just one element, output just one single line.
+            if(numValues == 1) {
+                logger.info("Value[" + fieldName + "]: " + response.getObject(fieldName));
+            }
+            // If it's more than one element, output each in a single row.
+            else {
+                logger.info("Value[" + fieldName + "]:");
+                for(int i = 0; i < numValues; i++) {
+                    logger.info(" - " + response.getObject(fieldName, i));
+                }
+            }
+        }
+        // Something went wrong, to output an error message instead.
+        else {
+            logger.error("Error[" + fieldName + "]: " + response.getResponseCode(fieldName).name());
+        }
+    }
+}*/
+
+
diff --git a/sandbox/plc4cpp/integrations/CMakeLists.txt b/sandbox/plc4cpp/integrations/CMakeLists.txt
index 7086afa7c29..312557f8ece 100644
--- a/sandbox/plc4cpp/integrations/CMakeLists.txt
+++ b/sandbox/plc4cpp/integrations/CMakeLists.txt
@@ -1,21 +1,21 @@
-#[[
-  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
-
-      http://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.
-]]
-
-add_subdirectory(apache-mynewt)
+#[[
+  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
+
+      http://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.
+]]
+
+add_subdirectory(apache-mynewt)
 add_subdirectory(edgex-foundry)
\ No newline at end of file
diff --git a/sandbox/plc4cpp/integrations/apache-mynewt/CMakeLists.txt b/sandbox/plc4cpp/integrations/apache-mynewt/CMakeLists.txt
index 4875af112ef..d149135f94b 100644
--- a/sandbox/plc4cpp/integrations/apache-mynewt/CMakeLists.txt
+++ b/sandbox/plc4cpp/integrations/apache-mynewt/CMakeLists.txt
@@ -1,20 +1,20 @@
-#[[
-  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
-
-      http://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.
-]]
-
-# [[add_subdirectory(module-name) ]]
+#[[
+  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
+
+      http://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.
+]]
+
+# [[add_subdirectory(module-name) ]]
diff --git a/sandbox/plc4cpp/integrations/edgex-foundry/CMakeLists.txt b/sandbox/plc4cpp/integrations/edgex-foundry/CMakeLists.txt
index 4875af112ef..d149135f94b 100644
--- a/sandbox/plc4cpp/integrations/edgex-foundry/CMakeLists.txt
+++ b/sandbox/plc4cpp/integrations/edgex-foundry/CMakeLists.txt
@@ -1,20 +1,20 @@
-#[[
-  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
-
-      http://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.
-]]
-
-# [[add_subdirectory(module-name) ]]
+#[[
+  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
+
+      http://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.
+]]
+
+# [[add_subdirectory(module-name) ]]
diff --git a/sandbox/plc4cpp/pom.xml b/sandbox/plc4cpp/pom.xml
index ba2f4be496e..146cec5f692 100644
--- a/sandbox/plc4cpp/pom.xml
+++ b/sandbox/plc4cpp/pom.xml
@@ -1,345 +1,345 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.sandbox</groupId>
-    <artifactId>plc4x-sandbox</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4cpp</artifactId>
-  <packaging>pom</packaging>
-
-  <name>Sandbox: PLC4Cpp</name>
-  <description>Implementation of the protocol adapters for usage as C++ library.</description>
-
-  <properties>
-    <!-- Tell Sonar where to find the c++ sources -->
-    <sonar.sources>api/src/main/cpp,drivers/proxy/src/main/cpp,drivers/s7/src/main/cpp,protocols/driver-bases/base/src/main/cpp,protocols/s7/src/main/cpp,utils/logger/src/main/cpp,utils/systemconfig/src/main/cpp</sonar.sources>
-    <option.with-proxies>OFF</option.with-proxies>
-  </properties>
-
-  <!--
-    Notes:
-    - It turns out that the default version of CMake the cmake-maven-plugin uses is too
-    old to detect the recent boost version. So we need to manually download a newer version
-    and tell the plugin to use that instead.
-    - As downloading and building boost takes quite some time, we only do this, if no
-    target/lib/boost is found.
-  -->
-
-  <profiles>
-    <!-- Profile for linux -->
-    <profile>
-      <id>os-unix</id>
-      <activation>
-        <os>
-          <family>unix</family>
-        </os>
-      </activation>
-      <!-- Make the cmake executable executable -->
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>exec-maven-plugin</artifactId>
-            <version>1.6.0</version>
-            <executions>
-              <execution>
-                <id>make-cmake-executable</id>
-                <phase>process-sources</phase>
-                <goals>
-                  <goal>exec</goal>
-                </goals>
-                <configuration>
-                  <basedir>${cmake.root-dir}</basedir>
-                  <executable>chmod</executable>
-                  <arguments>
-                    <argument>+x</argument>
-                    <argument>${cmake.child-dir}</argument>
-                  </arguments>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <!-- Profile for mac -->
-    <profile>
-      <id>os-mac</id>
-      <activation>
-        <os>
-          <family>mac</family>
-        </os>
-      </activation>
-      <!-- Make the cmake executable executable -->
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>exec-maven-plugin</artifactId>
-            <version>1.6.0</version>
-            <executions>
-              <execution>
-                <id>make-cmake-executable</id>
-                <phase>process-sources</phase>
-                <goals>
-                  <goal>exec</goal>
-                </goals>
-                <configuration>
-                  <basedir>${cmake.root-dir}</basedir>
-                  <executable>chmod</executable>
-                  <arguments>
-                    <argument>+x</argument>
-                    <argument>${cmake.child-dir}</argument>
-                  </arguments>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>with-proxies</id>
-      <properties>
-        <!-- Disabled for now as the thrift code seems to have issues with boost 1.70 -->
-        <!--option.with-proxies>ON</option.with-proxies-->
-      </properties>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>get-boost</id>
-                <phase>generate-sources</phase>
-                <goals>
-                  <goal>unpack</goal>
-                </goals>
-                <configuration>
-                  <artifactItems combine.children="append">
-                    <!-- Get the pre-packaged boost library -->
-                    <artifactItem>
-                      <groupId>org.apache.plc4x</groupId>
-                      <artifactId>plc4x-tools-thrift</artifactId>
-                      <version>${project.version}</version>
-                      <type>zip</type>
-                      <classifier>cpp-${os.classifier}</classifier>
-                      <outputDirectory>${project.build.directory}/lib/thrift</outputDirectory>
-                    </artifactItem>
-                  </artifactItems>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-  <build>
-    <plugins>
-      <!-- First download the cmake binaries -->
-      <plugin>
-        <groupId>com.googlecode.maven-download-plugin</groupId>
-        <artifactId>download-maven-plugin</artifactId>
-        <version>1.4.0</version>
-        <executions>
-          <execution>
-            <id>get-cmake</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>wget</goal>
-            </goals>
-            <configuration>
-              <url>${cmake.url}</url>
-              <unpack>true</unpack>
-              <outputDirectory>${project.build.directory}</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!--
-        Get additional stuff we need for the build.
-      -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>get-boost</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <!-- Get the pre-packaged boost library -->
-                <artifactItem>
-                  <groupId>org.apache.plc4x</groupId>
-                  <artifactId>plc4x-tools-boost</artifactId>
-                  <version>${project.version}</version>
-                  <type>zip</type>
-                  <classifier>lib-${os.classifier}</classifier>
-                  <outputDirectory>${project.build.directory}/lib/boost</outputDirectory>
-                </artifactItem>
-                <!-- Unpack the protocol spec for the proxy driver -->
-                <artifactItem>
-                  <groupId>org.apache.plc4x</groupId>
-                  <artifactId>plc4x-protocols-proxy</artifactId>
-                  <version>${project.version}</version>
-                  <type>jar</type>
-                  <overWrite>true</overWrite>
-                  <outputDirectory>${project.build.directory}/protocol-spec</outputDirectory>
-                </artifactItem>
-                <!-- Unpack the thrift compiler -->
-                <artifactItem>
-                  <groupId>org.apache.plc4x</groupId>
-                  <artifactId>plc4x-tools-thrift</artifactId>
-                  <version>${project.version}</version>
-                  <type>zip</type>
-                  <classifier>compiler-${os.classifier}</classifier>
-                  <overWrite>true</overWrite>
-                  <outputDirectory>${project.build.directory}/thrift-compiler</outputDirectory>
-                  <destFileName>${thrift.compiler.executable}</destFileName>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <!--
-        Generate the code for the Thrift-based interop server
-      -->
-      <plugin>
-        <groupId>org.apache.thrift.tools</groupId>
-        <artifactId>maven-thrift-plugin</artifactId>
-        <version>0.1.11</version>
-        <configuration>
-          <thriftExecutable>${project.build.directory}/thrift-compiler/${thrift.compiler.executable}</thriftExecutable>
-          <thriftSourceRoot>${project.build.directory}/protocol-spec</thriftSourceRoot>
-          <includes>
-            <include>**/interop.thrift</include>
-          </includes>
-          <generator>cpp</generator>
-          <outputDirectory>${project.build.directory}/generated-sources/drivers/proxy</outputDirectory>
-        </configuration>
-        <executions>
-          <execution>
-            <id>thrift-sources</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <!--
-        Do the actual build.
-      -->
-      <plugin>
-        <groupId>com.googlecode.cmake-maven-project</groupId>
-        <artifactId>cmake-maven-plugin</artifactId>
-        <version>3.7.2-b1</version>
-        <executions>
-          <!-- Uses a CMake generator to generate the build using the build tool of choice -->
-          <execution>
-            <id>cmake-generate</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-            <configuration>
-              <!--
-                We need to use a newer version of cmake, so disable downloading
-                and tell the plugin where to find that version.
-              -->
-              <downloadBinaries>false</downloadBinaries>
-              <cmakeRootDir>${cmake.root-dir}</cmakeRootDir>
-              <cmakeChildDir>${cmake.child-dir}</cmakeChildDir>
-              <!--
-                Actually the path to the CMakeList.txt file which then again
-                tells to tool where to find the sources.
-              -->
-              <sourcePath>${project.basedir}</sourcePath>
-              <!--
-                Path to where the build configuration is generated
-                (This directory is then used in the compile step to actually perform the build)
-              -->
-              <targetPath>${project.build.directory}/build</targetPath>
-              <!--
-                Name of the generator the compile step will be executing.
-              -->
-              <generator>${cmake.generator}</generator>
-              <!--
-                The classifier of the current platform. One of
-                [windows-x86_32, windows-x86_64, linux-x86_32, linux-x86_64, linux-arm_32, mac-x86_64].
-                It defines the version and type of the cmake installation to download.
-              -->
-              <classifier>${os.classifier}</classifier>
-              <options>
-                <option>-DWITH_PROXIES:BOOL=${option.with-proxies}</option>
-              </options>
-            </configuration>
-          </execution>
-          <!-- Actually executes the build -->
-          <execution>
-            <id>cmake-compile</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-            <configuration>
-              <!--
-                We need to use a newer version of cmake, so disable downloading
-                and tell the plugin where to find that version.
-              -->
-              <downloadBinaries>false</downloadBinaries>
-              <cmakeRootDir>${cmake.root-dir}</cmakeRootDir>
-              <cmakeChildDir>${cmake.child-dir}</cmakeChildDir>
-              <!-- The directory where the "generate" step generated the build configuration -->
-              <projectDirectory>${project.build.directory}/build</projectDirectory>
-              <classifier>${os.classifier}</classifier>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <!-- This dependency is just to ensure boost is built first -->
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-tools-boost</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <type>pom</type>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.sandbox</groupId>
+    <artifactId>plc4x-sandbox</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4cpp</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Sandbox: PLC4Cpp</name>
+  <description>Implementation of the protocol adapters for usage as C++ library.</description>
+
+  <properties>
+    <!-- Tell Sonar where to find the c++ sources -->
+    <sonar.sources>api/src/main/cpp,drivers/proxy/src/main/cpp,drivers/s7/src/main/cpp,protocols/driver-bases/base/src/main/cpp,protocols/s7/src/main/cpp,utils/logger/src/main/cpp,utils/systemconfig/src/main/cpp</sonar.sources>
+    <option.with-proxies>OFF</option.with-proxies>
+  </properties>
+
+  <!--
+    Notes:
+    - It turns out that the default version of CMake the cmake-maven-plugin uses is too
+    old to detect the recent boost version. So we need to manually download a newer version
+    and tell the plugin to use that instead.
+    - As downloading and building boost takes quite some time, we only do this, if no
+    target/lib/boost is found.
+  -->
+
+  <profiles>
+    <!-- Profile for linux -->
+    <profile>
+      <id>os-unix</id>
+      <activation>
+        <os>
+          <family>unix</family>
+        </os>
+      </activation>
+      <!-- Make the cmake executable executable -->
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <version>1.6.0</version>
+            <executions>
+              <execution>
+                <id>make-cmake-executable</id>
+                <phase>process-sources</phase>
+                <goals>
+                  <goal>exec</goal>
+                </goals>
+                <configuration>
+                  <basedir>${cmake.root-dir}</basedir>
+                  <executable>chmod</executable>
+                  <arguments>
+                    <argument>+x</argument>
+                    <argument>${cmake.child-dir}</argument>
+                  </arguments>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <!-- Profile for mac -->
+    <profile>
+      <id>os-mac</id>
+      <activation>
+        <os>
+          <family>mac</family>
+        </os>
+      </activation>
+      <!-- Make the cmake executable executable -->
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <version>1.6.0</version>
+            <executions>
+              <execution>
+                <id>make-cmake-executable</id>
+                <phase>process-sources</phase>
+                <goals>
+                  <goal>exec</goal>
+                </goals>
+                <configuration>
+                  <basedir>${cmake.root-dir}</basedir>
+                  <executable>chmod</executable>
+                  <arguments>
+                    <argument>+x</argument>
+                    <argument>${cmake.child-dir}</argument>
+                  </arguments>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>with-proxies</id>
+      <properties>
+        <!-- Disabled for now as the thrift code seems to have issues with boost 1.70 -->
+        <!--option.with-proxies>ON</option.with-proxies-->
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>get-boost</id>
+                <phase>generate-sources</phase>
+                <goals>
+                  <goal>unpack</goal>
+                </goals>
+                <configuration>
+                  <artifactItems combine.children="append">
+                    <!-- Get the pre-packaged boost library -->
+                    <artifactItem>
+                      <groupId>org.apache.plc4x</groupId>
+                      <artifactId>plc4x-tools-thrift</artifactId>
+                      <version>${project.version}</version>
+                      <type>zip</type>
+                      <classifier>cpp-${os.classifier}</classifier>
+                      <outputDirectory>${project.build.directory}/lib/thrift</outputDirectory>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+  <build>
+    <plugins>
+      <!-- First download the cmake binaries -->
+      <plugin>
+        <groupId>com.googlecode.maven-download-plugin</groupId>
+        <artifactId>download-maven-plugin</artifactId>
+        <version>1.4.0</version>
+        <executions>
+          <execution>
+            <id>get-cmake</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>wget</goal>
+            </goals>
+            <configuration>
+              <url>${cmake.url}</url>
+              <unpack>true</unpack>
+              <outputDirectory>${project.build.directory}</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!--
+        Get additional stuff we need for the build.
+      -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>get-boost</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <!-- Get the pre-packaged boost library -->
+                <artifactItem>
+                  <groupId>org.apache.plc4x</groupId>
+                  <artifactId>plc4x-tools-boost</artifactId>
+                  <version>${project.version}</version>
+                  <type>zip</type>
+                  <classifier>lib-${os.classifier}</classifier>
+                  <outputDirectory>${project.build.directory}/lib/boost</outputDirectory>
+                </artifactItem>
+                <!-- Unpack the protocol spec for the proxy driver -->
+                <artifactItem>
+                  <groupId>org.apache.plc4x</groupId>
+                  <artifactId>plc4x-protocols-proxy</artifactId>
+                  <version>${project.version}</version>
+                  <type>jar</type>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/protocol-spec</outputDirectory>
+                </artifactItem>
+                <!-- Unpack the thrift compiler -->
+                <artifactItem>
+                  <groupId>org.apache.plc4x</groupId>
+                  <artifactId>plc4x-tools-thrift</artifactId>
+                  <version>${project.version}</version>
+                  <type>zip</type>
+                  <classifier>compiler-${os.classifier}</classifier>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/thrift-compiler</outputDirectory>
+                  <destFileName>${thrift.compiler.executable}</destFileName>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <!--
+        Generate the code for the Thrift-based interop server
+      -->
+      <plugin>
+        <groupId>org.apache.thrift.tools</groupId>
+        <artifactId>maven-thrift-plugin</artifactId>
+        <version>0.1.11</version>
+        <configuration>
+          <thriftExecutable>${project.build.directory}/thrift-compiler/${thrift.compiler.executable}</thriftExecutable>
+          <thriftSourceRoot>${project.build.directory}/protocol-spec</thriftSourceRoot>
+          <includes>
+            <include>**/interop.thrift</include>
+          </includes>
+          <generator>cpp</generator>
+          <outputDirectory>${project.build.directory}/generated-sources/drivers/proxy</outputDirectory>
+        </configuration>
+        <executions>
+          <execution>
+            <id>thrift-sources</id>
+            <phase>process-sources</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <!--
+        Do the actual build.
+      -->
+      <plugin>
+        <groupId>com.googlecode.cmake-maven-project</groupId>
+        <artifactId>cmake-maven-plugin</artifactId>
+        <version>3.7.2-b1</version>
+        <executions>
+          <!-- Uses a CMake generator to generate the build using the build tool of choice -->
+          <execution>
+            <id>cmake-generate</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+            <configuration>
+              <!--
+                We need to use a newer version of cmake, so disable downloading
+                and tell the plugin where to find that version.
+              -->
+              <downloadBinaries>false</downloadBinaries>
+              <cmakeRootDir>${cmake.root-dir}</cmakeRootDir>
+              <cmakeChildDir>${cmake.child-dir}</cmakeChildDir>
+              <!--
+                Actually the path to the CMakeList.txt file which then again
+                tells to tool where to find the sources.
+              -->
+              <sourcePath>${project.basedir}</sourcePath>
+              <!--
+                Path to where the build configuration is generated
+                (This directory is then used in the compile step to actually perform the build)
+              -->
+              <targetPath>${project.build.directory}/build</targetPath>
+              <!--
+                Name of the generator the compile step will be executing.
+              -->
+              <generator>${cmake.generator}</generator>
+              <!--
+                The classifier of the current platform. One of
+                [windows-x86_32, windows-x86_64, linux-x86_32, linux-x86_64, linux-arm_32, mac-x86_64].
+                It defines the version and type of the cmake installation to download.
+              -->
+              <classifier>${os.classifier}</classifier>
+              <options>
+                <option>-DWITH_PROXIES:BOOL=${option.with-proxies}</option>
+              </options>
+            </configuration>
+          </execution>
+          <!-- Actually executes the build -->
+          <execution>
+            <id>cmake-compile</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+            <configuration>
+              <!--
+                We need to use a newer version of cmake, so disable downloading
+                and tell the plugin where to find that version.
+              -->
+              <downloadBinaries>false</downloadBinaries>
+              <cmakeRootDir>${cmake.root-dir}</cmakeRootDir>
+              <cmakeChildDir>${cmake.child-dir}</cmakeChildDir>
+              <!-- The directory where the "generate" step generated the build configuration -->
+              <projectDirectory>${project.build.directory}/build</projectDirectory>
+              <classifier>${os.classifier}</classifier>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <!-- This dependency is just to ensure boost is built first -->
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-tools-boost</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <type>pom</type>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/CMakeLists.txt b/sandbox/plc4cpp/protocols/CMakeLists.txt
index 475ab5a7fff..2df34e0f009 100644
--- a/sandbox/plc4cpp/protocols/CMakeLists.txt
+++ b/sandbox/plc4cpp/protocols/CMakeLists.txt
@@ -1,20 +1,20 @@
-#[[
-  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
-
-      http://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.
-]]
-
-add_subdirectory(driver-bases)
+#[[
+  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
+
+      http://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.
+]]
+
+add_subdirectory(driver-bases)
diff --git a/sandbox/plc4cpp/protocols/driver-bases/CMakeLists.txt b/sandbox/plc4cpp/protocols/driver-bases/CMakeLists.txt
index eed5445cb15..658e1d6c0c5 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/CMakeLists.txt
+++ b/sandbox/plc4cpp/protocols/driver-bases/CMakeLists.txt
@@ -1,20 +1,20 @@
-#[[
-  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
-
-      http://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.
-]]
-
-add_subdirectory(base)
+#[[
+  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
+
+      http://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.
+]]
+
+add_subdirectory(base)
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/CMakeLists.txt b/sandbox/plc4cpp/protocols/driver-bases/base/CMakeLists.txt
index 55a02921258..478a7fd24a8 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/CMakeLists.txt
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/CMakeLists.txt
@@ -1,68 +1,68 @@
-#[[
-  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
-
-      http://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.
-]]
-
-add_library(plc4cpp-protocols-driver-base-base
-        src/main/cpp/org/apache/plc4x/cpp/base/connection/AbstractPlcConnection.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/connection/BoostConnection.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/connection/ChannelFactory.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/connection/DefaultPlcFieldHandler.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/connection/PlcFieldHandler.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/events/ConnectedEvent.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/events/ConnectEvent.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/BaseDefaultFieldItem.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBigDecimalFieldItem.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBigIntegerFieldItem.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBooleanFieldItem.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultByteArrayFieldItem.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultByteFieldItem.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultDoubleFieldItem.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultFloatFieldItem.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultIntegerFieldItem.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalDateFieldItem.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalDateTimeFieldItem.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalTimeFieldItem.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLongFieldItem.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultShortFieldItem.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultStringFieldItem.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/DefaultPlcReadRequest.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/DefaultPlcWriteRequest.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcFieldRequest.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcFieldResponse.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcProprietaryRequest.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcProprietaryResponse.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcReadRequest.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcRequest.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcResponse.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcWriteRequest.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcProprietaryRequest.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcProprietaryResponse.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcReader.cpp
-        src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcWriter.cpp
-        )
-
-target_include_directories (plc4cpp-protocols-driver-base-base PUBLIC ${Boost_INCLUDE_DIRS})
-target_include_directories (plc4cpp-protocols-driver-base-base PUBLIC ../../../api/src/main/cpp)
-target_include_directories (plc4cpp-protocols-driver-base-base PUBLIC ../../../protocols/driver-bases/base/src/main/cpp)
-target_include_directories (plc4cpp-protocols-driver-base-base PUBLIC ../../../utils/logger/src/main/cpp)
-
-target_link_libraries (plc4cpp-protocols-driver-base-base
-                        ${Boost_LIBRARIES}
-                        plc4cpp-utils-logger
-                        plc4cpp-api
-                      )
+#[[
+  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
+
+      http://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.
+]]
+
+add_library(plc4cpp-protocols-driver-base-base
+        src/main/cpp/org/apache/plc4x/cpp/base/connection/AbstractPlcConnection.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/connection/BoostConnection.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/connection/ChannelFactory.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/connection/DefaultPlcFieldHandler.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/connection/PlcFieldHandler.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/events/ConnectedEvent.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/events/ConnectEvent.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/BaseDefaultFieldItem.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBigDecimalFieldItem.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBigIntegerFieldItem.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBooleanFieldItem.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultByteArrayFieldItem.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultByteFieldItem.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultDoubleFieldItem.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultFloatFieldItem.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultIntegerFieldItem.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalDateFieldItem.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalDateTimeFieldItem.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalTimeFieldItem.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLongFieldItem.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultShortFieldItem.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultStringFieldItem.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/DefaultPlcReadRequest.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/DefaultPlcWriteRequest.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcFieldRequest.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcFieldResponse.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcProprietaryRequest.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcProprietaryResponse.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcReadRequest.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcRequest.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcResponse.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcWriteRequest.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcProprietaryRequest.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcProprietaryResponse.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcReader.cpp
+        src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcWriter.cpp
+        )
+
+target_include_directories (plc4cpp-protocols-driver-base-base PUBLIC ${Boost_INCLUDE_DIRS})
+target_include_directories (plc4cpp-protocols-driver-base-base PUBLIC ../../../api/src/main/cpp)
+target_include_directories (plc4cpp-protocols-driver-base-base PUBLIC ../../../protocols/driver-bases/base/src/main/cpp)
+target_include_directories (plc4cpp-protocols-driver-base-base PUBLIC ../../../utils/logger/src/main/cpp)
+
+target_link_libraries (plc4cpp-protocols-driver-base-base
+                        ${Boost_LIBRARIES}
+                        plc4cpp-utils-logger
+                        plc4cpp-api
+                      )
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/AbstractPlcConnection.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/AbstractPlcConnection.cpp
index 6a6eab03c6c..47fbcef84d0 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/AbstractPlcConnection.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/AbstractPlcConnection.cpp
@@ -1,82 +1,82 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "AbstractPlcConnection.h"
-#include <org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedOperationException.h>
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace connection
-					{
-                        using namespace org::apache::plc4x::cpp::api::exceptions;
-
-                        PlcConnectionMetadata* AbstractPlcConnection::getMetadata()
-						{
-							return this;
-						}
-						bool AbstractPlcConnection::canRead()
-						{
-							return false;
-						}
-						bool AbstractPlcConnection::canWrite()
-						{
-							return false;
-						}
-						bool AbstractPlcConnection::canSubscribe()
-						{
-							return false;
-						}
-
-                        PlcReadRequest::Builder* AbstractPlcConnection::readRequestBuilder()
-                        {
-                            BOOST_THROW_EXCEPTION(PlcUnsupportedOperationException("The connection does not support reading"));
-                        }
-
-                        
-
-                        /*@Override
-                            public PlcWriteRequest.Builder writeRequestBuilder() {
-                            throw new PlcUnsupportedOperationException("The connection does not support writing");
-                        }
-
-                        @Override
-                            public PlcSubscriptionRequest.Builder subscriptionRequestBuilder() {
-                            throw new PlcUnsupportedOperationException("The connection does not support subscription");
-                        }
-
-                        @Override
-                            public PlcUnsubscriptionRequest.Builder unsubscriptionRequestBuilder() {
-                            throw new PlcUnsupportedOperationException("The connection does not support subscription");
-                        }*/
-
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "AbstractPlcConnection.h"
+#include <org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedOperationException.h>
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace connection
+					{
+                        using namespace org::apache::plc4x::cpp::api::exceptions;
+
+                        PlcConnectionMetadata* AbstractPlcConnection::getMetadata()
+						{
+							return this;
+						}
+						bool AbstractPlcConnection::canRead()
+						{
+							return false;
+						}
+						bool AbstractPlcConnection::canWrite()
+						{
+							return false;
+						}
+						bool AbstractPlcConnection::canSubscribe()
+						{
+							return false;
+						}
+
+                        PlcReadRequest::Builder* AbstractPlcConnection::readRequestBuilder()
+                        {
+                            BOOST_THROW_EXCEPTION(PlcUnsupportedOperationException("The connection does not support reading"));
+                        }
+
+                        
+
+                        /*@Override
+                            public PlcWriteRequest.Builder writeRequestBuilder() {
+                            throw new PlcUnsupportedOperationException("The connection does not support writing");
+                        }
+
+                        @Override
+                            public PlcSubscriptionRequest.Builder subscriptionRequestBuilder() {
+                            throw new PlcUnsupportedOperationException("The connection does not support subscription");
+                        }
+
+                        @Override
+                            public PlcUnsubscriptionRequest.Builder unsubscriptionRequestBuilder() {
+                            throw new PlcUnsupportedOperationException("The connection does not support subscription");
+                        }*/
+
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/AbstractPlcConnection.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/AbstractPlcConnection.h
index c17e933f370..81e5af53134 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/AbstractPlcConnection.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/AbstractPlcConnection.h
@@ -1,78 +1,78 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _ABSTRCT_PLC_HANDLER
-#define _ABSTRCT_PLC_HANDLER
-
-#include <org/apache/plc4x/cpp/api/PlcConnection.h>
-#include <boost/system/error_code.hpp>
-#include <string>
-
-using namespace org::apache::plc4x::cpp::api;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace connection
-					{
-						/**
-						 * Base class for implementing connections.
-						 * Per default, all operations (read, write, subscribe) are unsupported.
-						 * Concrete implementations should override the methods indicating connection capabilities
-						 * and for obtaining respective request builders.
-						 */
-						class AbstractPlcConnection : public PlcConnection, PlcConnectionMetadata
-						{
-
-						public:
-							PlcConnectionMetadata* getMetadata();
-							bool canRead();
-							bool canWrite();
-							bool canSubscribe();
-
-							virtual void open() = 0;
-							virtual void close() = 0;
-							virtual bool send(unsigned char* pBytesToSend, int iNumBytesToSend) = 0;
-
-							PlcReadRequest::Builder* readRequestBuilder();
-							// PlcWriteRequest.Builder writeRequestBuilder();
-							// PlcSubscriptionRequest.Builder subscriptionRequestBuilder();
-							// PlcUnsubscriptionRequest.Builder nsubscriptionRequestBuilder();
-
-						protected:
-							virtual void onReceive(const boost::system::error_code& errorCode, std::size_t bytes_transferred) = 0;
-						private:
-
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _ABSTRCT_PLC_HANDLER
+#define _ABSTRCT_PLC_HANDLER
+
+#include <org/apache/plc4x/cpp/api/PlcConnection.h>
+#include <boost/system/error_code.hpp>
+#include <string>
+
+using namespace org::apache::plc4x::cpp::api;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace connection
+					{
+						/**
+						 * Base class for implementing connections.
+						 * Per default, all operations (read, write, subscribe) are unsupported.
+						 * Concrete implementations should override the methods indicating connection capabilities
+						 * and for obtaining respective request builders.
+						 */
+						class AbstractPlcConnection : public PlcConnection, PlcConnectionMetadata
+						{
+
+						public:
+							PlcConnectionMetadata* getMetadata();
+							bool canRead();
+							bool canWrite();
+							bool canSubscribe();
+
+							virtual void open() = 0;
+							virtual void close() = 0;
+							virtual bool send(unsigned char* pBytesToSend, int iNumBytesToSend) = 0;
+
+							PlcReadRequest::Builder* readRequestBuilder();
+							// PlcWriteRequest.Builder writeRequestBuilder();
+							// PlcSubscriptionRequest.Builder subscriptionRequestBuilder();
+							// PlcUnsubscriptionRequest.Builder nsubscriptionRequestBuilder();
+
+						protected:
+							virtual void onReceive(const boost::system::error_code& errorCode, std::size_t bytes_transferred) = 0;
+						private:
+
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/BoostConnection.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/BoostConnection.cpp
index f9bdaf4ad2b..6209e065dcc 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/BoostConnection.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/BoostConnection.cpp
@@ -1,504 +1,504 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "BoostConnection.h"
-#include <org/apache/plc4x/cpp/api/exceptions/PlcConnectionException.h>
-#include <org/apache/plc4x/cpp/utils/logger/DbgTrace.h>
-#include <org/apache/plc4x/cpp/utils/logger/BLogger.h>
-#include <org/apache/plc4x/cpp/utils/logger/ExLog.h>
-#include <boost/lexical_cast.hpp>
-#include <boost/format.hpp>
-
-#define CON_DEFAULT_IPADDRESS   "127.0.0.1"
-#define CON_DEFAULT_PORT_       0
-#define CON_DEFAULT_TIMEOUT     2000 // Milliseconds
-
-namespace org
-{
-    namespace apache
-    {
-        namespace plc4x
-        {
-            namespace cpp
-            {
-                namespace base
-                {
-                    namespace connection
-                    {
-
-                        using namespace boost;
-                        using namespace boost::signals2;
-                        using namespace org::apache::plc4x::cpp::utils;
-                        using namespace org::apache::plc4x::cpp::api::exceptions;
-
-                        BoostConnection::BoostConnection() :
-                            _pSocket(NULL),
-                            _pWorker(NULL),
-                            _pReceiveDispatcher_Thread(NULL),
-                            _isReceiving(false),
-                            _pClientThread(NULL),
-                            _uiConnectionTimeout(CON_DEFAULT_TIMEOUT)
-                        {
-                        }
-
-                        BoostConnection::~BoostConnection()
-                        {
-                            if (_pSocket != NULL)
-                            {
-                                try
-                                {
-                                    this->close();
-                                }
-                                catch (std::exception& ex)
-                                {
-                                    ExLog(1, ex, "BoostConnection::~BoostConnection() failed");
-                                }
-                            }
-                        }
-
-                        void BoostConnection::setIPAddress(string strIPAddress)
-                        {
-                            if (strIPAddress != _strIPAddress)
-                            {
-                                if (_bConnected)
-                                {
-                                    _strErrorMessage = "Attempt to change the IP-Address " + strIPAddress + "of an already open connection";
-                                    BOOST_THROW_EXCEPTION(PlcConnectionException(_strErrorMessage));
-                                }
-                                else
-                                {
-                                    try
-                                    {
-                                        if ((strIPAddress.length() >= 7) && (strIPAddress != _strIPAddress))
-                                        {
-                                            _strIPAddress = strIPAddress;
-                                            resolveEndpoint();
-
-                                            ip::tcp::endpoint ep(ip::address::from_string(strIPAddress), _usPort);
-                                            _endpoint = ep;
-                                        }
-                                    }
-                                    catch (std::exception& ex)
-                                    {
-                                        BOOST_THROW_EXCEPTION(ExLog(1, ex, "BoostConnection::setIP_Address(string strIP_Address) failed"));
-                                    }
-                                }
-                            }
-                        }
-
-                        void BoostConnection::setPort(unsigned short usPort)
-                        {
-                            if (_usPort != usPort)
-                            {
-                                if (_bConnected)
-                                {
-                                    BOOST_THROW_EXCEPTION(PlcConnectionException("Attempt to change the port of an already open communication"));
-                                }
-                                else
-                                {
-                                    try
-                                    {
-                                        _usPort = usPort;
-                                        resolveEndpoint();
-
-                                        ip::tcp::endpoint ep(ip::address::from_string(_strIPAddress), _usPort);
-                                        _endpoint = ep;
-                                    }
-                                    catch (std::exception& ex)
-                                    {
-                                        BOOST_THROW_EXCEPTION(ExLog(1, ex, "BoostConnection::setPort(unsigned short port) failed"));
-                                    }
-                                }
-                            }
-                        }
-
-                        void BoostConnection::setEndpoint(tcp::endpoint endpoint)
-                        {
-                            if (endpoint != _endpoint)
-                            {
-                                if (_bConnected)
-                                {
-                                    _strErrorMessage = "Attempt to change the endpoint of an already open communication";
-                                    _strErrorMessage = _strErrorMessage + "Setting Endpoint " + endpoint.address().to_string() + ":" + boost::lexical_cast<string>((unsigned int)endpoint.port()) + " for BoostConnection object failed";
-                                    BOOST_THROW_EXCEPTION(PlcConnectionException(_strErrorMessage));
-                                }
-                                else
-                                {
-                                    try
-                                    {
-                                        _endpoint = endpoint;
-                                        resolveEndpoint();
-                                    }
-                                    catch (std::exception& ex)
-                                    {
-                                        BOOST_THROW_EXCEPTION(ExLog(1, ex, "BoostConnection::setEndpoint(tcp::endpoint endpoint) failed"));
-                                    }
-                                }
-                            }
-                        }
-
-                        /**---------------------------------------------------------------------
-                            * Service Callback receive TCP Packets
-                            *---------------------------------------------------------------------*/
-                        void BoostConnection::dispatchReceive()
-                        {
-                            _strErrorMessage = "Attempt to use BoostConnection::dispatchReceive of BoostConnection";
-                            LOG_INFO(_strErrorMessage); DEBUG_TRACE1("%s\n", _strErrorMessage.c_str());
-                            BOOST_THROW_EXCEPTION(PlcConnectionException(_strErrorMessage));
-                        }
-
-                        /**---------------------------------------------------------------------
-                        Connect TCP Socket    
-                        *---------------------------------------------------------------------*/
-                        void BoostConnection::connect()
-                        {
-                            try
-                            {
-
-                                resolveEndpoint();
-
-                                _endpoint = *_iterEndPoint;
-
-                                BoostConnection::close();
-
-                                _io_service.reset();
-
-                                if (_pSocket == NULL) _pSocket = new tcp::socket(_io_service);
-
-                                _pSocket->async_connect(_endpoint, boost::bind(&BoostConnection::onConnect, this, asio::placeholders::error, _iterEndPoint));
-
-                                _pWorker = new io_service::work(_io_service);
-                                _pClientThread = new boost::thread(boost::bind(&asio::io_service::run, &_io_service));
-
-                                boost::mutex::scoped_lock lock(_mtxComLock);
-                                _condComHandler.timed_wait(lock, boost::posix_time::milliseconds(_uiConnectionTimeout));
-
-                                LOG_BOOL("Open BoostCommunication", _bConnected);
-
-                                if (_bConnected)
-                                {
-                                    _pReceiveDispatcher_Thread = new boost::thread(boost::bind(&BoostConnection::dispatchReceive, this));
-                                }
-                                else
-                                {
-                                    BOOST_THROW_EXCEPTION(PlcConnectionException("Timeout while opening BoostConnection"));
-                                }
-
-                            }
-                            catch (std::exception& ex)
-                            {
-                                BoostConnection::close();
-
-                                BOOST_THROW_EXCEPTION(ExLog(1, ex, "BoostConnection::connect() failed"));
-                            }
-                        }
-
-                        /**---------------------------------------------------------------------
-                          Close TCP Socket
-                        *---------------------------------------------------------------------*/
-                        void BoostConnection::close()
-                        {
-
-                            try
-                            {
-                                _bConnected = false;
-
-                                if ((_pClientThread != NULL) && (boost::this_thread::get_id() != _pClientThread->get_id()))
-                                {
-                                    if (_pSocket != NULL)
-                                    {
-                                        _io_service.post(boost::bind(&asio::ip::tcp::socket::close, _pSocket));
-                                    }
-                                    _io_service.post(boost::bind(&io_service::stop, &_io_service));
-
-                                }
-                                else
-                                {
-                                    if (_pSocket != NULL)
-                                    {
-                                        _pSocket->close();
-                                    }
-                                    _io_service.stop();
-                                }
-
-                                clearRessources();
-
-                            }
-                            catch (std::exception& ex)
-                            {
-                                clearRessources();
-
-                                _bConnected = false;
-
-                                BOOST_THROW_EXCEPTION(ExLog(1, ex, "BoostConnection::close() failed"));
-                            }
-
-                            return;
-                        }
-
-                        /**---------------------------------------------------------------------
-                        Send Bytes via TCP Socket
-                            *---------------------------------------------------------------------*/
-                        bool BoostConnection::send(unsigned char* pBytesToSend, int iBytesToSend)
-                        {
-                            bool bSuccess = false;
-
-                            boost::lock_guard<boost::mutex> lock(_mutexSend);
-
-                            if (_bConnected)
-                            {
-                                try
-                                {
-                                    _pSocket->async_send(asio::buffer(pBytesToSend, iBytesToSend),
-                                        boost::bind(&BoostConnection::onSend, this, boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred)
-                                    );
-
-                                    _dump.setLeadingNewLine(true);
-                                    std::string strTelegram = "\nBoostConnection TCP Telegram Send" + _dump.Show(pBytesToSend, iBytesToSend, "  ** ");
-                                    LOG_TRACE(strTelegram.c_str()); DEBUG_TRACE1("%s", strTelegram.c_str());
-
-                                    bSuccess = true;
-                                }
-                                catch (std::exception& ex)
-                                {
-                                    bSuccess = false;
-                                    BOOST_THROW_EXCEPTION(ExLog(1, ex, "BoostConnection::send() failed"));
-                                }
-                            }
-                            return bSuccess;
-                        }
-
-
-                        void BoostConnection::ping()
-                        {
-                           try 
-                           {
-                               /*(Socket s = new Socket())
-                               s.connect(address, PING_TIMEOUT_MS);
-                               // TODO keep the address for a (timely) next request???
-                               s.setReuseAddress(true);*/
-                           }
-                           catch (std::exception ex) 
-                           {
-                               BOOST_THROW_EXCEPTION(ExLog(1, ex, "Unable to ping remote host"));
-                           }
-                        }
-                        /**---------------------------------------------------------------------
-                        Free Ressources
-                        *---------------------------------------------------------------------*/
-                        void BoostConnection::clearRessources()
-                        {
-                            try
-                            {
-
-                                _io_service.reset();
-
-                                if (_pReceiveDispatcher_Thread != NULL)
-                                {
-                                    if (boost::this_thread::get_id() != _pReceiveDispatcher_Thread->get_id())
-                                    {
-                                        _pReceiveDispatcher_Thread->interrupt();
-                                        _pReceiveDispatcher_Thread->join();
-                                        delete _pReceiveDispatcher_Thread; _pReceiveDispatcher_Thread = NULL;
-                                    }
-                                }
-
-                                if (_pClientThread != NULL)
-                                {
-                                    if (boost::this_thread::get_id() != _pClientThread->get_id())
-                                    {
-                                        _pClientThread->interrupt();
-                                        _pClientThread->join();
-                                        delete _pClientThread; _pClientThread = NULL;
-                                    }
-                                }
-
-                                if (_pWorker != NULL)
-                                {
-                                    delete _pWorker; _pWorker = NULL;
-                                }
-
-                                if (_pSocket != NULL)
-                                {
-                                    delete _pSocket; _pSocket = NULL;
-                                }
-
-                            }
-                            catch (std::exception&)
-                            {
-
-                            }
-
-                            return;
-                        }
-
-                        /**---------------------------------------------------------------------
-                        Recieve next TCP Packets 
-                        *---------------------------------------------------------------------*/
-                        void BoostConnection::continueReceive()
-                        {
-                            _pSocket->async_receive(
-                                asio::buffer(_pRecvBuffer, _iRecvBufferSize),
-                                bind(&BoostConnection::onReceive, this, asio::placeholders::error, asio::placeholders::bytes_transferred)
-                            );
-                        }
-
-                        /**---------------------------------------------------------------------
-                            Convert endpoint to String
-                        *---------------------------------------------------------------------*/
-                        string BoostConnection::endPointToString(tcp::endpoint ep)
-                        {
-                            return string(ep.address().to_string() + ":" + boost::lexical_cast<std::string>((unsigned short)ep.port()));
-                        }
-
-                        /**---------------------------------------------------------------------
-                        Service Callback for Async-Send Result by OnSend
-                        *---------------------------------------------------------------------*/
-                        void BoostConnection::onSend(const system::error_code& errorCode, std::size_t bytes_transferred)
-                        {
-                            if (errorCode != system::errc::success)
-                            {
-                                int iErrCode = errorCode.value();
-                                /*if (iErrCode != NO_ERROR)
-                                {
-                                    // WSAECONNRESET = 10054, WSAECONNABORTED = 10053, EPIPE, ECONNABORTED indicates "broken Connection"
-                                    if (iErrCode == WSAECONNRESET || iErrCode == WSAECONNABORTED || iErrCode == EPIPE)
-                                    {
-                                        BoostConnection::close();
-                                    }
-
-                                    std::stringstream stm;
-                                    stm << boost::format("BoostConnection Send Error %i: %s") % iErrCode % errorCode.message();
-                                    _strErrorMessage = stm.str();
-                                    LOG_TRACE(_strErrorMessage.c_str()); DEBUG_TRACE1("%s", _strErrorMessage.c_str());
-                                    // TODO: Signal
-                                }*/
-                            }
-                        }
-
-                        /**---------------------------------------------------------------------
-                        Service Callback , Receive Data via TCP
-                       *---------------------------------------------------------------------*/
-                        void BoostConnection::onReceive(const system::error_code& errorCode, std::size_t bytes_transferred)
-                        {
-                            DEBUG_TRACE0("BoostConnection::onReceive() called\n");
-                            if (errorCode != system::errc::success && errorCode.value() != ENOENT)
-                            {
-                                int iErrCode = errorCode.value();
-                                /*if (iErrCode != NO_ERROR)
-                                {
-                                    // WSAECONNRESET = 10054, WSAECONNABORTED = 10053, EPIPE, ECONNABORTED indicates "broken Connection"
-                                    if (iErrCode == WSAECONNRESET || iErrCode == WSAECONNABORTED || iErrCode == EPIPE)
-                                    {
-                                        BoostConnection::close();
-                                    }
-
-                                    std::stringstream stm;
-                                    stm << boost::format("BoostConnection Receive Error %i: %s") % iErrCode % errorCode.message();
-                                    _strErrorMessage = stm.str();
-                                    LOG_TRACE(_strErrorMessage.c_str()); DEBUG_TRACE1("%s", _strErrorMessage.c_str());
-                                    // TODO: Signal
-                                }*/
-                            }
-                        }
-
-                        /**---------------------------------------------------------------------
-                        Resolve Endpoint
-                        *---------------------------------------------------------------------*/
-                        void BoostConnection::resolveEndpoint()
-                        {
-                            try
-                            {
-                                tcp::resolver Resolver(_io_service);
-                                tcp::resolver::query EndpointQuery(_strIPAddress, std::to_string(_usPort));
-                                _iterEndPoint = Resolver.resolve(EndpointQuery);
-                            }
-                            catch (std::exception& ex)
-                            {
-                                BOOST_THROW_EXCEPTION(ExLog(1, ex, "BoostConnection::resolveEndpoint() failed"));
-                            }
-                        }
-
-                        /**---------------------------------------------------------------------
-                        Service Callback open Connection Result
-                        *---------------------------------------------------------------------*/
-                        void BoostConnection::onConnect(const system::error_code& errorCode, tcp::resolver::iterator endpointIterator)
-                        {
-
-                            // Setzen des IsOpen auf true oder false 
-                            _bConnected = errorCode == system::errc::success;
-
-                            ++endpointIterator;
-
-                            if (!_bConnected && endpointIterator != tcp::resolver::iterator())	// connection failed, ..
-                            {
-                                try
-                                {
-                                    // .. try the next endpoint in the list.
-                                    _pSocket->close();
-                                    _endpoint = *endpointIterator;
-                                    _pSocket->async_connect(_endpoint, boost::bind(&BoostConnection::onConnect, this, asio::placeholders::error, endpointIterator));
-                                }
-                                catch (std::exception& ex)
-                                {
-                                    ExLog(1, ex, "BoostConnection::onConnect() Handler failed");
-                                }
-                            }
-                            else if (errorCode == system::errc::success)
-                            {
-                                bool bServiceStopped = _io_service.stopped();
-
-                                try
-                                {
-                                    _pSocket->async_receive(
-                                        asio::buffer(_pRecvBuffer, _iRecvBufferSize),
-                                        bind(&BoostConnection::onReceive, this, asio::placeholders::error, asio::placeholders::bytes_transferred)
-                                    );
-
-                                }
-                                catch (std::exception& ex)
-                                {
-                                    ExLog(1, ex, "BoostConnection::onConnect() async_receive failed");
-                                }
-
-                                if (bServiceStopped)
-                                {
-                                    LOG_INFO("Restarting Client Thread for BoostConnection OnConnect");
-
-                                    try
-                                    {
-                                        if (_pClientThread != NULL) delete _pClientThread;
-                                        _pClientThread = new boost::thread(bind(&asio::io_service::run, &_io_service));
-                                    }
-                                    catch (std::exception& ex)
-                                    {
-                                        ExLog(1, ex, "BoostConnection::onConnect() failed");
-                                    }
-                                }
-                            }
-
-                            _condComHandler.notify_all();
-
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "BoostConnection.h"
+#include <org/apache/plc4x/cpp/api/exceptions/PlcConnectionException.h>
+#include <org/apache/plc4x/cpp/utils/logger/DbgTrace.h>
+#include <org/apache/plc4x/cpp/utils/logger/BLogger.h>
+#include <org/apache/plc4x/cpp/utils/logger/ExLog.h>
+#include <boost/lexical_cast.hpp>
+#include <boost/format.hpp>
+
+#define CON_DEFAULT_IPADDRESS   "127.0.0.1"
+#define CON_DEFAULT_PORT_       0
+#define CON_DEFAULT_TIMEOUT     2000 // Milliseconds
+
+namespace org
+{
+    namespace apache
+    {
+        namespace plc4x
+        {
+            namespace cpp
+            {
+                namespace base
+                {
+                    namespace connection
+                    {
+
+                        using namespace boost;
+                        using namespace boost::signals2;
+                        using namespace org::apache::plc4x::cpp::utils;
+                        using namespace org::apache::plc4x::cpp::api::exceptions;
+
+                        BoostConnection::BoostConnection() :
+                            _pSocket(NULL),
+                            _pWorker(NULL),
+                            _pReceiveDispatcher_Thread(NULL),
+                            _isReceiving(false),
+                            _pClientThread(NULL),
+                            _uiConnectionTimeout(CON_DEFAULT_TIMEOUT)
+                        {
+                        }
+
+                        BoostConnection::~BoostConnection()
+                        {
+                            if (_pSocket != NULL)
+                            {
+                                try
+                                {
+                                    this->close();
+                                }
+                                catch (std::exception& ex)
+                                {
+                                    ExLog(1, ex, "BoostConnection::~BoostConnection() failed");
+                                }
+                            }
+                        }
+
+                        void BoostConnection::setIPAddress(string strIPAddress)
+                        {
+                            if (strIPAddress != _strIPAddress)
+                            {
+                                if (_bConnected)
+                                {
+                                    _strErrorMessage = "Attempt to change the IP-Address " + strIPAddress + "of an already open connection";
+                                    BOOST_THROW_EXCEPTION(PlcConnectionException(_strErrorMessage));
+                                }
+                                else
+                                {
+                                    try
+                                    {
+                                        if ((strIPAddress.length() >= 7) && (strIPAddress != _strIPAddress))
+                                        {
+                                            _strIPAddress = strIPAddress;
+                                            resolveEndpoint();
+
+                                            ip::tcp::endpoint ep(ip::address::from_string(strIPAddress), _usPort);
+                                            _endpoint = ep;
+                                        }
+                                    }
+                                    catch (std::exception& ex)
+                                    {
+                                        BOOST_THROW_EXCEPTION(ExLog(1, ex, "BoostConnection::setIP_Address(string strIP_Address) failed"));
+                                    }
+                                }
+                            }
+                        }
+
+                        void BoostConnection::setPort(unsigned short usPort)
+                        {
+                            if (_usPort != usPort)
+                            {
+                                if (_bConnected)
+                                {
+                                    BOOST_THROW_EXCEPTION(PlcConnectionException("Attempt to change the port of an already open communication"));
+                                }
+                                else
+                                {
+                                    try
+                                    {
+                                        _usPort = usPort;
+                                        resolveEndpoint();
+
+                                        ip::tcp::endpoint ep(ip::address::from_string(_strIPAddress), _usPort);
+                                        _endpoint = ep;
+                                    }
+                                    catch (std::exception& ex)
+                                    {
+                                        BOOST_THROW_EXCEPTION(ExLog(1, ex, "BoostConnection::setPort(unsigned short port) failed"));
+                                    }
+                                }
+                            }
+                        }
+
+                        void BoostConnection::setEndpoint(tcp::endpoint endpoint)
+                        {
+                            if (endpoint != _endpoint)
+                            {
+                                if (_bConnected)
+                                {
+                                    _strErrorMessage = "Attempt to change the endpoint of an already open communication";
+                                    _strErrorMessage = _strErrorMessage + "Setting Endpoint " + endpoint.address().to_string() + ":" + boost::lexical_cast<string>((unsigned int)endpoint.port()) + " for BoostConnection object failed";
+                                    BOOST_THROW_EXCEPTION(PlcConnectionException(_strErrorMessage));
+                                }
+                                else
+                                {
+                                    try
+                                    {
+                                        _endpoint = endpoint;
+                                        resolveEndpoint();
+                                    }
+                                    catch (std::exception& ex)
+                                    {
+                                        BOOST_THROW_EXCEPTION(ExLog(1, ex, "BoostConnection::setEndpoint(tcp::endpoint endpoint) failed"));
+                                    }
+                                }
+                            }
+                        }
+
+                        /**---------------------------------------------------------------------
+                            * Service Callback receive TCP Packets
+                            *---------------------------------------------------------------------*/
+                        void BoostConnection::dispatchReceive()
+                        {
+                            _strErrorMessage = "Attempt to use BoostConnection::dispatchReceive of BoostConnection";
+                            LOG_INFO(_strErrorMessage); DEBUG_TRACE1("%s\n", _strErrorMessage.c_str());
+                            BOOST_THROW_EXCEPTION(PlcConnectionException(_strErrorMessage));
+                        }
+
+                        /**---------------------------------------------------------------------
+                        Connect TCP Socket    
+                        *---------------------------------------------------------------------*/
+                        void BoostConnection::connect()
+                        {
+                            try
+                            {
+
+                                resolveEndpoint();
+
+                                _endpoint = *_iterEndPoint;
+
+                                BoostConnection::close();
+
+                                _io_service.reset();
+
+                                if (_pSocket == NULL) _pSocket = new tcp::socket(_io_service);
+
+                                _pSocket->async_connect(_endpoint, boost::bind(&BoostConnection::onConnect, this, asio::placeholders::error, _iterEndPoint));
+
+                                _pWorker = new io_service::work(_io_service);
+                                _pClientThread = new boost::thread(boost::bind(&asio::io_service::run, &_io_service));
+
+                                boost::mutex::scoped_lock lock(_mtxComLock);
+                                _condComHandler.timed_wait(lock, boost::posix_time::milliseconds(_uiConnectionTimeout));
+
+                                LOG_BOOL("Open BoostCommunication", _bConnected);
+
+                                if (_bConnected)
+                                {
+                                    _pReceiveDispatcher_Thread = new boost::thread(boost::bind(&BoostConnection::dispatchReceive, this));
+                                }
+                                else
+                                {
+                                    BOOST_THROW_EXCEPTION(PlcConnectionException("Timeout while opening BoostConnection"));
+                                }
+
+                            }
+                            catch (std::exception& ex)
+                            {
+                                BoostConnection::close();
+
+                                BOOST_THROW_EXCEPTION(ExLog(1, ex, "BoostConnection::connect() failed"));
+                            }
+                        }
+
+                        /**---------------------------------------------------------------------
+                          Close TCP Socket
+                        *---------------------------------------------------------------------*/
+                        void BoostConnection::close()
+                        {
+
+                            try
+                            {
+                                _bConnected = false;
+
+                                if ((_pClientThread != NULL) && (boost::this_thread::get_id() != _pClientThread->get_id()))
+                                {
+                                    if (_pSocket != NULL)
+                                    {
+                                        _io_service.post(boost::bind(&asio::ip::tcp::socket::close, _pSocket));
+                                    }
+                                    _io_service.post(boost::bind(&io_service::stop, &_io_service));
+
+                                }
+                                else
+                                {
+                                    if (_pSocket != NULL)
+                                    {
+                                        _pSocket->close();
+                                    }
+                                    _io_service.stop();
+                                }
+
+                                clearRessources();
+
+                            }
+                            catch (std::exception& ex)
+                            {
+                                clearRessources();
+
+                                _bConnected = false;
+
+                                BOOST_THROW_EXCEPTION(ExLog(1, ex, "BoostConnection::close() failed"));
+                            }
+
+                            return;
+                        }
+
+                        /**---------------------------------------------------------------------
+                        Send Bytes via TCP Socket
+                            *---------------------------------------------------------------------*/
+                        bool BoostConnection::send(unsigned char* pBytesToSend, int iBytesToSend)
+                        {
+                            bool bSuccess = false;
+
+                            boost::lock_guard<boost::mutex> lock(_mutexSend);
+
+                            if (_bConnected)
+                            {
+                                try
+                                {
+                                    _pSocket->async_send(asio::buffer(pBytesToSend, iBytesToSend),
+                                        boost::bind(&BoostConnection::onSend, this, boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred)
+                                    );
+
+                                    _dump.setLeadingNewLine(true);
+                                    std::string strTelegram = "\nBoostConnection TCP Telegram Send" + _dump.Show(pBytesToSend, iBytesToSend, "  ** ");
+                                    LOG_TRACE(strTelegram.c_str()); DEBUG_TRACE1("%s", strTelegram.c_str());
+
+                                    bSuccess = true;
+                                }
+                                catch (std::exception& ex)
+                                {
+                                    bSuccess = false;
+                                    BOOST_THROW_EXCEPTION(ExLog(1, ex, "BoostConnection::send() failed"));
+                                }
+                            }
+                            return bSuccess;
+                        }
+
+
+                        void BoostConnection::ping()
+                        {
+                           try 
+                           {
+                               /*(Socket s = new Socket())
+                               s.connect(address, PING_TIMEOUT_MS);
+                               // TODO keep the address for a (timely) next request???
+                               s.setReuseAddress(true);*/
+                           }
+                           catch (std::exception ex) 
+                           {
+                               BOOST_THROW_EXCEPTION(ExLog(1, ex, "Unable to ping remote host"));
+                           }
+                        }
+                        /**---------------------------------------------------------------------
+                        Free Ressources
+                        *---------------------------------------------------------------------*/
+                        void BoostConnection::clearRessources()
+                        {
+                            try
+                            {
+
+                                _io_service.reset();
+
+                                if (_pReceiveDispatcher_Thread != NULL)
+                                {
+                                    if (boost::this_thread::get_id() != _pReceiveDispatcher_Thread->get_id())
+                                    {
+                                        _pReceiveDispatcher_Thread->interrupt();
+                                        _pReceiveDispatcher_Thread->join();
+                                        delete _pReceiveDispatcher_Thread; _pReceiveDispatcher_Thread = NULL;
+                                    }
+                                }
+
+                                if (_pClientThread != NULL)
+                                {
+                                    if (boost::this_thread::get_id() != _pClientThread->get_id())
+                                    {
+                                        _pClientThread->interrupt();
+                                        _pClientThread->join();
+                                        delete _pClientThread; _pClientThread = NULL;
+                                    }
+                                }
+
+                                if (_pWorker != NULL)
+                                {
+                                    delete _pWorker; _pWorker = NULL;
+                                }
+
+                                if (_pSocket != NULL)
+                                {
+                                    delete _pSocket; _pSocket = NULL;
+                                }
+
+                            }
+                            catch (std::exception&)
+                            {
+
+                            }
+
+                            return;
+                        }
+
+                        /**---------------------------------------------------------------------
+                        Recieve next TCP Packets 
+                        *---------------------------------------------------------------------*/
+                        void BoostConnection::continueReceive()
+                        {
+                            _pSocket->async_receive(
+                                asio::buffer(_pRecvBuffer, _iRecvBufferSize),
+                                bind(&BoostConnection::onReceive, this, asio::placeholders::error, asio::placeholders::bytes_transferred)
+                            );
+                        }
+
+                        /**---------------------------------------------------------------------
+                            Convert endpoint to String
+                        *---------------------------------------------------------------------*/
+                        string BoostConnection::endPointToString(tcp::endpoint ep)
+                        {
+                            return string(ep.address().to_string() + ":" + boost::lexical_cast<std::string>((unsigned short)ep.port()));
+                        }
+
+                        /**---------------------------------------------------------------------
+                        Service Callback for Async-Send Result by OnSend
+                        *---------------------------------------------------------------------*/
+                        void BoostConnection::onSend(const system::error_code& errorCode, std::size_t bytes_transferred)
+                        {
+                            if (errorCode != system::errc::success)
+                            {
+                                int iErrCode = errorCode.value();
+                                /*if (iErrCode != NO_ERROR)
+                                {
+                                    // WSAECONNRESET = 10054, WSAECONNABORTED = 10053, EPIPE, ECONNABORTED indicates "broken Connection"
+                                    if (iErrCode == WSAECONNRESET || iErrCode == WSAECONNABORTED || iErrCode == EPIPE)
+                                    {
+                                        BoostConnection::close();
+                                    }
+
+                                    std::stringstream stm;
+                                    stm << boost::format("BoostConnection Send Error %i: %s") % iErrCode % errorCode.message();
+                                    _strErrorMessage = stm.str();
+                                    LOG_TRACE(_strErrorMessage.c_str()); DEBUG_TRACE1("%s", _strErrorMessage.c_str());
+                                    // TODO: Signal
+                                }*/
+                            }
+                        }
+
+                        /**---------------------------------------------------------------------
+                        Service Callback , Receive Data via TCP
+                       *---------------------------------------------------------------------*/
+                        void BoostConnection::onReceive(const system::error_code& errorCode, std::size_t bytes_transferred)
+                        {
+                            DEBUG_TRACE0("BoostConnection::onReceive() called\n");
+                            if (errorCode != system::errc::success && errorCode.value() != ENOENT)
+                            {
+                                int iErrCode = errorCode.value();
+                                /*if (iErrCode != NO_ERROR)
+                                {
+                                    // WSAECONNRESET = 10054, WSAECONNABORTED = 10053, EPIPE, ECONNABORTED indicates "broken Connection"
+                                    if (iErrCode == WSAECONNRESET || iErrCode == WSAECONNABORTED || iErrCode == EPIPE)
+                                    {
+                                        BoostConnection::close();
+                                    }
+
+                                    std::stringstream stm;
+                                    stm << boost::format("BoostConnection Receive Error %i: %s") % iErrCode % errorCode.message();
+                                    _strErrorMessage = stm.str();
+                                    LOG_TRACE(_strErrorMessage.c_str()); DEBUG_TRACE1("%s", _strErrorMessage.c_str());
+                                    // TODO: Signal
+                                }*/
+                            }
+                        }
+
+                        /**---------------------------------------------------------------------
+                        Resolve Endpoint
+                        *---------------------------------------------------------------------*/
+                        void BoostConnection::resolveEndpoint()
+                        {
+                            try
+                            {
+                                tcp::resolver Resolver(_io_service);
+                                tcp::resolver::query EndpointQuery(_strIPAddress, std::to_string(_usPort));
+                                _iterEndPoint = Resolver.resolve(EndpointQuery);
+                            }
+                            catch (std::exception& ex)
+                            {
+                                BOOST_THROW_EXCEPTION(ExLog(1, ex, "BoostConnection::resolveEndpoint() failed"));
+                            }
+                        }
+
+                        /**---------------------------------------------------------------------
+                        Service Callback open Connection Result
+                        *---------------------------------------------------------------------*/
+                        void BoostConnection::onConnect(const system::error_code& errorCode, tcp::resolver::iterator endpointIterator)
+                        {
+
+                            // Setzen des IsOpen auf true oder false 
+                            _bConnected = errorCode == system::errc::success;
+
+                            ++endpointIterator;
+
+                            if (!_bConnected && endpointIterator != tcp::resolver::iterator())	// connection failed, ..
+                            {
+                                try
+                                {
+                                    // .. try the next endpoint in the list.
+                                    _pSocket->close();
+                                    _endpoint = *endpointIterator;
+                                    _pSocket->async_connect(_endpoint, boost::bind(&BoostConnection::onConnect, this, asio::placeholders::error, endpointIterator));
+                                }
+                                catch (std::exception& ex)
+                                {
+                                    ExLog(1, ex, "BoostConnection::onConnect() Handler failed");
+                                }
+                            }
+                            else if (errorCode == system::errc::success)
+                            {
+                                bool bServiceStopped = _io_service.stopped();
+
+                                try
+                                {
+                                    _pSocket->async_receive(
+                                        asio::buffer(_pRecvBuffer, _iRecvBufferSize),
+                                        bind(&BoostConnection::onReceive, this, asio::placeholders::error, asio::placeholders::bytes_transferred)
+                                    );
+
+                                }
+                                catch (std::exception& ex)
+                                {
+                                    ExLog(1, ex, "BoostConnection::onConnect() async_receive failed");
+                                }
+
+                                if (bServiceStopped)
+                                {
+                                    LOG_INFO("Restarting Client Thread for BoostConnection OnConnect");
+
+                                    try
+                                    {
+                                        if (_pClientThread != NULL) delete _pClientThread;
+                                        _pClientThread = new boost::thread(bind(&asio::io_service::run, &_io_service));
+                                    }
+                                    catch (std::exception& ex)
+                                    {
+                                        ExLog(1, ex, "BoostConnection::onConnect() failed");
+                                    }
+                                }
+                            }
+
+                            _condComHandler.notify_all();
+
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/BoostConnection.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/BoostConnection.h
index bafe8d31f00..8a1b89908a8 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/BoostConnection.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/BoostConnection.h
@@ -1,120 +1,120 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _BOOST_COMMUNICATION
-#define _BOOST_COMMUNICATION
-
-#include <string>
-#include <boost/asio.hpp>
-#include <boost/thread/thread.hpp>
-#include <boost/atomic/atomic.hpp>
-#include <org/apache/plc4x/cpp/PlcConnection.h>
-
-
-namespace org
-{
-    namespace apache
-    {
-        namespace plc4x
-        {
-            namespace cpp
-            {
-                namespace base
-                {
-                    namespace connection
-                    {
-                        using namespace boost::asio;
-                        using namespace boost::asio::ip;
-                        using namespace org::apache::plc4x::cpp::api;
-
-                        class BoostConnection: public PlcConnection
-                        {
-                        public:
-
-                            BoostConnection();
-
-                            ~BoostConnection();
-
-                            inline unsigned short getPort() { return _endpoint.port(); }
-                            void setPort(unsigned short usPort);
-
-                            inline string getIPAddress() { return _strIPAddress; }
-                            void setIPAddress(string strIPAddress);
-
-                            inline int getConnectionTimeout() { return _uiConnectionTimeout; }
-                            void setConnectionTimeout(int uiConnectionTimeout) { _uiConnectionTimeout = uiConnectionTimeout; }
-
-                            inline tcp::endpoint getEndpoint() { return _endpoint; }
-                            void setEndpoint(tcp::endpoint endpoint);
-
-                            inline bool getIsReceiving() { return _isReceiving; }
-
-                            virtual void connect();
-                            virtual void close();
-                            virtual bool send(unsigned char* pBytesToSend, int iBytesToSend);
-
-                            void ping();
-
-                        protected:
-
-                            void clearRessources();
-
-                            void resolveEndpoint();
-
-                            virtual void onConnect(const boost::system::error_code& errorCode, tcp::resolver::iterator endpointIterator);
-                            virtual void onSend(const boost::system::error_code& ErrorCode, std::size_t bytes_transferred);
-                            virtual void onReceive(const boost::system::error_code& ErrorCode, std::size_t bytes_transferred);
-                            virtual void dispatchReceive();
-
-                            virtual void continueReceive();
-
-                            string endPointToString(tcp::endpoint ep);
-
-                        protected:
-                            io_service _io_service;
-                            io_service::work* _pWorker;
-                            boost::thread* _pReceiveDispatcher_Thread;
-
-                            tcp::endpoint _endpoint;
-                            tcp::resolver::iterator _iterEndPoint;
-                            tcp::socket* _pSocket;
-                            address _ipAddress;
-                            string  _strIPAddress;
-                            unsigned short  _usPort;
-                            unsigned int _uiConnectionTimeout;
-                            long _lCloseDeviceTimeoutMS;
-                            
-                            boost::mutex _mutexSend;
-                            boost::atomic<bool> _isReceiving;
-
-                            // General Properties
-                            bool            _bWriteInProgress;
-                            boost::thread*  _pClientThread;
-
-                        private:
-
-                        };
-                    }
-                }
-            }
-	    }
-    }
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _BOOST_COMMUNICATION
+#define _BOOST_COMMUNICATION
+
+#include <string>
+#include <boost/asio.hpp>
+#include <boost/thread/thread.hpp>
+#include <boost/atomic/atomic.hpp>
+#include <org/apache/plc4x/cpp/PlcConnection.h>
+
+
+namespace org
+{
+    namespace apache
+    {
+        namespace plc4x
+        {
+            namespace cpp
+            {
+                namespace base
+                {
+                    namespace connection
+                    {
+                        using namespace boost::asio;
+                        using namespace boost::asio::ip;
+                        using namespace org::apache::plc4x::cpp::api;
+
+                        class BoostConnection: public PlcConnection
+                        {
+                        public:
+
+                            BoostConnection();
+
+                            ~BoostConnection();
+
+                            inline unsigned short getPort() { return _endpoint.port(); }
+                            void setPort(unsigned short usPort);
+
+                            inline string getIPAddress() { return _strIPAddress; }
+                            void setIPAddress(string strIPAddress);
+
+                            inline int getConnectionTimeout() { return _uiConnectionTimeout; }
+                            void setConnectionTimeout(int uiConnectionTimeout) { _uiConnectionTimeout = uiConnectionTimeout; }
+
+                            inline tcp::endpoint getEndpoint() { return _endpoint; }
+                            void setEndpoint(tcp::endpoint endpoint);
+
+                            inline bool getIsReceiving() { return _isReceiving; }
+
+                            virtual void connect();
+                            virtual void close();
+                            virtual bool send(unsigned char* pBytesToSend, int iBytesToSend);
+
+                            void ping();
+
+                        protected:
+
+                            void clearRessources();
+
+                            void resolveEndpoint();
+
+                            virtual void onConnect(const boost::system::error_code& errorCode, tcp::resolver::iterator endpointIterator);
+                            virtual void onSend(const boost::system::error_code& ErrorCode, std::size_t bytes_transferred);
+                            virtual void onReceive(const boost::system::error_code& ErrorCode, std::size_t bytes_transferred);
+                            virtual void dispatchReceive();
+
+                            virtual void continueReceive();
+
+                            string endPointToString(tcp::endpoint ep);
+
+                        protected:
+                            io_service _io_service;
+                            io_service::work* _pWorker;
+                            boost::thread* _pReceiveDispatcher_Thread;
+
+                            tcp::endpoint _endpoint;
+                            tcp::resolver::iterator _iterEndPoint;
+                            tcp::socket* _pSocket;
+                            address _ipAddress;
+                            string  _strIPAddress;
+                            unsigned short  _usPort;
+                            unsigned int _uiConnectionTimeout;
+                            long _lCloseDeviceTimeoutMS;
+                            
+                            boost::mutex _mutexSend;
+                            boost::atomic<bool> _isReceiving;
+
+                            // General Properties
+                            bool            _bWriteInProgress;
+                            boost::thread*  _pClientThread;
+
+                        private:
+
+                        };
+                    }
+                }
+            }
+	    }
+    }
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/ChannelFactory.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/ChannelFactory.cpp
index 129dbb203b1..9fc93a6d022 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/ChannelFactory.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/ChannelFactory.cpp
@@ -1,39 +1,39 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "ChannelFactory.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace connection
-					{						
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "ChannelFactory.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace connection
+					{						
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/ChannelFactory.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/ChannelFactory.h
index b44fa0a4da4..57e4304d8cb 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/ChannelFactory.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/ChannelFactory.h
@@ -1,59 +1,59 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _CHANNEL_FACTORY
-#define _CHANNEL_FACTORY
-
-#include <boost/system/error_code.hpp>
-#include <boost/asio/ip/tcp.hpp>
-#include <boost/asio/io_service.hpp>
-#include <boost/asio/ip/tcp.hpp>
-
-#include <string>
-
-using namespace boost::asio;
-using namespace boost::asio::ip;
-using boost::asio::ip::address;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace connection
-					{						
-						class ChannelFactory 
-						{
-
-						public:							
-							virtual tcp::socket* createChannel() =  0;
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _CHANNEL_FACTORY
+#define _CHANNEL_FACTORY
+
+#include <boost/system/error_code.hpp>
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/asio/io_service.hpp>
+#include <boost/asio/ip/tcp.hpp>
+
+#include <string>
+
+using namespace boost::asio;
+using namespace boost::asio::ip;
+using boost::asio::ip::address;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace connection
+					{						
+						class ChannelFactory 
+						{
+
+						public:							
+							virtual tcp::socket* createChannel() =  0;
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/DefaultPlcFieldHandler.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/DefaultPlcFieldHandler.cpp
index af769a39952..1f62e1e6467 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/DefaultPlcFieldHandler.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/DefaultPlcFieldHandler.cpp
@@ -1,111 +1,111 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "DefaultPlcFieldHandler.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace connection						
-					{
-						BaseDefaultFieldItem<bool>* DefaultPlcFieldhandler::encodeBoolean(PlcField field, std::vector<void*> values)
-						{
-							throw new PlcRuntimeException("Invalid encoder for type "/*Todo:  +std::string((field)*/);
-						}
-
-						BaseDefaultFieldItem<char>* DefaultPlcFieldhandler::encodeByte(PlcField field, std::vector<void*>)
-						{
-							throw new PlcRuntimeException("Invalid encoder for type "/* Todo: + field*/);
-						}
-
-						BaseDefaultFieldItem<short>* DefaultPlcFieldhandler::encodeShort(PlcField field, std::vector<void*> values)
-						{
-							throw new PlcRuntimeException("Invalid encoder for type "/* + field*/);
-						}
-
-						BaseDefaultFieldItem<int>* DefaultPlcFieldhandler::encodeInteger(PlcField field, std::vector<void*> values)
-						{
-							throw new PlcRuntimeException("Invalid encoder for type "/* + field*/);
-						}
-
-						BaseDefaultFieldItem<long long>* DefaultPlcFieldhandler::encodeBigInteger(PlcField field, std::vector<void*>)
-						{
-							throw new PlcRuntimeException("Invalid encoder for type "/* + field*/);
-						}
-
-						BaseDefaultFieldItem<long>* DefaultPlcFieldhandler::encodeLong(PlcField field, std::vector<void*>)
-						{
-							throw new PlcRuntimeException("Invalid encoder for type "/* + field*/);
-						}
-
-						BaseDefaultFieldItem<float>* DefaultPlcFieldhandler::encodeFloat(PlcField field, std::vector<void*>)
-						{
-							throw new PlcRuntimeException("Invalid encoder for type " /*+ field*/);
-
-						}
-
-						BaseDefaultFieldItem<cpp_dec_float_100>* DefaultPlcFieldhandler::encodeBigDecimal(PlcField field, std::vector<void*> values)
-						{
-							throw new PlcRuntimeException("Invalid encoder for type "/* + field*/);
-						}
-
-						BaseDefaultFieldItem<double>* DefaultPlcFieldhandler::encodeDouble(PlcField field, std::vector<void*>)
-						{
-							throw new PlcRuntimeException("Invalid encoder for type "/* + field*/);
-						}
-
-						BaseDefaultFieldItem<std::string>* DefaultPlcFieldhandler::encodeString(PlcField field, std::vector<void*> values)
-						{
-							throw new PlcRuntimeException("Invalid encoder for type "/* + field*/);
-						}
-
-						BaseDefaultFieldItem<time_t>* DefaultPlcFieldhandler::encodeTime(PlcField field, std::vector<void*> values)
-						{
-							throw new PlcRuntimeException("Invalid encoder for type "/* + field*/);
-						}
-
-						BaseDefaultFieldItem<tm>* DefaultPlcFieldhandler::encodeDate(PlcField field, std::vector<void*> values)
-						{
-							throw new PlcRuntimeException("Invalid encoder for type "/* + field*/);
-						}
-
-						BaseDefaultFieldItem<tm>* DefaultPlcFieldhandler::encodeDateTime(PlcField field, std::vector<void*> values)
-						{
-							throw new PlcRuntimeException("Invalid encoder for type "/* + field*/);
-						}
-
-						BaseDefaultFieldItem<char*>* DefaultPlcFieldhandler::encodeByteArray(PlcField field, std::vector<void*> values)
-						{
-							throw new PlcRuntimeException("Invalid encoder for type "/* + field*/);
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "DefaultPlcFieldHandler.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace connection						
+					{
+						BaseDefaultFieldItem<bool>* DefaultPlcFieldhandler::encodeBoolean(PlcField field, std::vector<void*> values)
+						{
+							throw new PlcRuntimeException("Invalid encoder for type "/*Todo:  +std::string((field)*/);
+						}
+
+						BaseDefaultFieldItem<char>* DefaultPlcFieldhandler::encodeByte(PlcField field, std::vector<void*>)
+						{
+							throw new PlcRuntimeException("Invalid encoder for type "/* Todo: + field*/);
+						}
+
+						BaseDefaultFieldItem<short>* DefaultPlcFieldhandler::encodeShort(PlcField field, std::vector<void*> values)
+						{
+							throw new PlcRuntimeException("Invalid encoder for type "/* + field*/);
+						}
+
+						BaseDefaultFieldItem<int>* DefaultPlcFieldhandler::encodeInteger(PlcField field, std::vector<void*> values)
+						{
+							throw new PlcRuntimeException("Invalid encoder for type "/* + field*/);
+						}
+
+						BaseDefaultFieldItem<long long>* DefaultPlcFieldhandler::encodeBigInteger(PlcField field, std::vector<void*>)
+						{
+							throw new PlcRuntimeException("Invalid encoder for type "/* + field*/);
+						}
+
+						BaseDefaultFieldItem<long>* DefaultPlcFieldhandler::encodeLong(PlcField field, std::vector<void*>)
+						{
+							throw new PlcRuntimeException("Invalid encoder for type "/* + field*/);
+						}
+
+						BaseDefaultFieldItem<float>* DefaultPlcFieldhandler::encodeFloat(PlcField field, std::vector<void*>)
+						{
+							throw new PlcRuntimeException("Invalid encoder for type " /*+ field*/);
+
+						}
+
+						BaseDefaultFieldItem<cpp_dec_float_100>* DefaultPlcFieldhandler::encodeBigDecimal(PlcField field, std::vector<void*> values)
+						{
+							throw new PlcRuntimeException("Invalid encoder for type "/* + field*/);
+						}
+
+						BaseDefaultFieldItem<double>* DefaultPlcFieldhandler::encodeDouble(PlcField field, std::vector<void*>)
+						{
+							throw new PlcRuntimeException("Invalid encoder for type "/* + field*/);
+						}
+
+						BaseDefaultFieldItem<std::string>* DefaultPlcFieldhandler::encodeString(PlcField field, std::vector<void*> values)
+						{
+							throw new PlcRuntimeException("Invalid encoder for type "/* + field*/);
+						}
+
+						BaseDefaultFieldItem<time_t>* DefaultPlcFieldhandler::encodeTime(PlcField field, std::vector<void*> values)
+						{
+							throw new PlcRuntimeException("Invalid encoder for type "/* + field*/);
+						}
+
+						BaseDefaultFieldItem<tm>* DefaultPlcFieldhandler::encodeDate(PlcField field, std::vector<void*> values)
+						{
+							throw new PlcRuntimeException("Invalid encoder for type "/* + field*/);
+						}
+
+						BaseDefaultFieldItem<tm>* DefaultPlcFieldhandler::encodeDateTime(PlcField field, std::vector<void*> values)
+						{
+							throw new PlcRuntimeException("Invalid encoder for type "/* + field*/);
+						}
+
+						BaseDefaultFieldItem<char*>* DefaultPlcFieldhandler::encodeByteArray(PlcField field, std::vector<void*> values)
+						{
+							throw new PlcRuntimeException("Invalid encoder for type "/* + field*/);
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/DefaultPlcFieldHandler.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/DefaultPlcFieldHandler.h
index 33926b7e3f5..5c852b646ac 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/DefaultPlcFieldHandler.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/DefaultPlcFieldHandler.h
@@ -1,96 +1,96 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _DEFAULT_PLC_FIELD_HANDLER
-#define _DEFAULT_PLC_FIELD_HANDLER
-
-#include <boost/system/error_code.hpp>
-#include <org/apache/plc4x/cpp/api/PlcConnection.h>
-#include <string>
-#include <boost/multiprecision/cpp_dec_float.hpp>
-#include <boost/functional/hash.hpp>
-#include <ctime>
-#include <array>
-#include <vector>
-
-#include <org/apache/plc4x/cpp/api/model/PlcField.h>
-#include "PlcFieldHandler.h"
-#include "../messages/items/BaseDefaultFieldItem.h"
-
-using namespace org::apache::plc4x::cpp::api::model;
-using namespace org::apache::plc4x::cpp::base::messages::items;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace connection
-					{
-						/**
-					 * Base Implementation of {@link PlcFieldHandler} which throws a {@link PlcRuntimeException} for all
-					 * encodeXXX methods.
-						 */
-						class DefaultPlcFieldhandler : public PlcFieldHandler
-						{
-
-						public:
-							
-							BaseDefaultFieldItem<bool>* encodeBoolean(PlcField plcField, std::vector<void*> pValues) override;
-								
-							BaseDefaultFieldItem<char>* encodeByte(PlcField plcField, std::vector<void*> pValues) override;
-														
-							BaseDefaultFieldItem<short>* encodeShort(PlcField plcField, std::vector<void*> pValues) override;
-														
-							BaseDefaultFieldItem<int>* encodeInteger(PlcField plcField, std::vector<void*> pValues) override;
-					
-							BaseDefaultFieldItem<long long>* encodeBigInteger(PlcField plcField, std::vector<void*> pValues) override;
-								
-							BaseDefaultFieldItem<long>* encodeLong(PlcField plcField, std::vector<void*> pValues) override;
-													
-							BaseDefaultFieldItem<float>* encodeFloat(PlcField plcField, std::vector<void*> pValues) override;
-							
-							BaseDefaultFieldItem<cpp_dec_float_100>* encodeBigDecimal(PlcField plcField,std::vector<void*> pValues) override;
-							
-							BaseDefaultFieldItem<double>* encodeDouble(PlcField plcField, std::vector<void*> pValues) override;
-							
-							BaseDefaultFieldItem<std::string>* encodeString(PlcField plcField, std::vector<void*> pValues) override;
-						
-							BaseDefaultFieldItem<time_t>* encodeTime(PlcField plcField, std::vector<void*> pValues) override;
-						
-							BaseDefaultFieldItem<tm>* encodeDate(PlcField plcField, std::vector<void*> pValues) override;
-							
-							BaseDefaultFieldItem<tm>* encodeDateTime(PlcField plcField, std::vector<void*> pValues) override;
-								
-							BaseDefaultFieldItem<char*>* encodeByteArray(PlcField plcField, std::vector<void*> pValues) override;
-							
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _DEFAULT_PLC_FIELD_HANDLER
+#define _DEFAULT_PLC_FIELD_HANDLER
+
+#include <boost/system/error_code.hpp>
+#include <org/apache/plc4x/cpp/api/PlcConnection.h>
+#include <string>
+#include <boost/multiprecision/cpp_dec_float.hpp>
+#include <boost/functional/hash.hpp>
+#include <ctime>
+#include <array>
+#include <vector>
+
+#include <org/apache/plc4x/cpp/api/model/PlcField.h>
+#include "PlcFieldHandler.h"
+#include "../messages/items/BaseDefaultFieldItem.h"
+
+using namespace org::apache::plc4x::cpp::api::model;
+using namespace org::apache::plc4x::cpp::base::messages::items;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace connection
+					{
+						/**
+					 * Base Implementation of {@link PlcFieldHandler} which throws a {@link PlcRuntimeException} for all
+					 * encodeXXX methods.
+						 */
+						class DefaultPlcFieldhandler : public PlcFieldHandler
+						{
+
+						public:
+							
+							BaseDefaultFieldItem<bool>* encodeBoolean(PlcField plcField, std::vector<void*> pValues) override;
+								
+							BaseDefaultFieldItem<char>* encodeByte(PlcField plcField, std::vector<void*> pValues) override;
+														
+							BaseDefaultFieldItem<short>* encodeShort(PlcField plcField, std::vector<void*> pValues) override;
+														
+							BaseDefaultFieldItem<int>* encodeInteger(PlcField plcField, std::vector<void*> pValues) override;
+					
+							BaseDefaultFieldItem<long long>* encodeBigInteger(PlcField plcField, std::vector<void*> pValues) override;
+								
+							BaseDefaultFieldItem<long>* encodeLong(PlcField plcField, std::vector<void*> pValues) override;
+													
+							BaseDefaultFieldItem<float>* encodeFloat(PlcField plcField, std::vector<void*> pValues) override;
+							
+							BaseDefaultFieldItem<cpp_dec_float_100>* encodeBigDecimal(PlcField plcField,std::vector<void*> pValues) override;
+							
+							BaseDefaultFieldItem<double>* encodeDouble(PlcField plcField, std::vector<void*> pValues) override;
+							
+							BaseDefaultFieldItem<std::string>* encodeString(PlcField plcField, std::vector<void*> pValues) override;
+						
+							BaseDefaultFieldItem<time_t>* encodeTime(PlcField plcField, std::vector<void*> pValues) override;
+						
+							BaseDefaultFieldItem<tm>* encodeDate(PlcField plcField, std::vector<void*> pValues) override;
+							
+							BaseDefaultFieldItem<tm>* encodeDateTime(PlcField plcField, std::vector<void*> pValues) override;
+								
+							BaseDefaultFieldItem<char*>* encodeByteArray(PlcField plcField, std::vector<void*> pValues) override;
+							
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/PlcFieldHandler.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/PlcFieldHandler.cpp
index 71f739b47b2..cd86d0da6e2 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/PlcFieldHandler.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/PlcFieldHandler.cpp
@@ -1,39 +1,39 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcFieldHandler.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace connection
-					{
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcFieldHandler.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace connection
+					{
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/PlcFieldHandler.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/PlcFieldHandler.h
index 3ee2257fe40..6ee97d8e60b 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/PlcFieldHandler.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/PlcFieldHandler.h
@@ -1,99 +1,99 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_FIELD_HANDLER
-#define _PLC_FIELD_HANDLER
-
-#include <boost/system/error_code.hpp>
-#include <org/apache/plc4x/cpp/api/PlcConnection.h>
-#include <string>
-#include <vector>
-#include <ctime>
-
-#include <org/apache/plc4x/cpp/api/model/PlcField.h>
-#include "../messages/items/BaseDefaultFieldItem.h"
-
-using namespace org::apache::plc4x::cpp::api::model;
-using namespace org::apache::plc4x::cpp::base::messages;
-using namespace org::apache::plc4x::cpp::base::messages::items;
-using namespace boost::multiprecision;
-
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace connection
-					{
-						/**
-						 * Base class for implementing connections.
-						 * Per default, all operations (read, write, subscribe) are unsupported.
-						 * Concrete implementations should override the methods indicating connection capabilities
-						 * and for obtaining respective request builders.
-						 */
-						class PlcFieldHandler
-						{
-
-						public:
-
-							virtual PlcField* createField(std::string strFieldQuery) = 0;
-
-							virtual BaseDefaultFieldItem<bool>* encodeBoolean(PlcField plcField, std::vector<void*> pValues) = 0;
-
-							virtual BaseDefaultFieldItem<char>* encodeByte(PlcField plcField, std::vector<void*> pValues)= 0;
-
-							virtual BaseDefaultFieldItem<short>* encodeShort(PlcField plcField, std::vector<void*> pValues) = 0;
-
-							virtual BaseDefaultFieldItem<int>* encodeInteger(PlcField plcField, std::vector<void*> pValues) = 0;
-
-							virtual BaseDefaultFieldItem<long long>* encodeBigInteger(PlcField plcField,std::vector<void*> pValues) = 0;
-
-							virtual BaseDefaultFieldItem<long>* encodeLong(PlcField plcField, std::vector<void*> pValues) = 0;
-
-							virtual BaseDefaultFieldItem<float>* encodeFloat(PlcField plcField, std::vector<void*> pValues) = 0;
-
-							virtual BaseDefaultFieldItem< cpp_dec_float_100>* encodeBigDecimal(PlcField plcField, std::vector<void*> pValues) = 0;
-
-							virtual BaseDefaultFieldItem<double>* encodeDouble(PlcField plcField, std::vector<void*> pValues) = 0;
-
-							virtual BaseDefaultFieldItem<std::string>* encodeString(PlcField plcField, std::vector<void*> pValues) = 0;
-
-							virtual BaseDefaultFieldItem<time_t>* encodeTime(PlcField plcField, std::vector<void*> pValues) = 0;
-
-							virtual BaseDefaultFieldItem<tm>* encodeDate(PlcField plcField, std::vector<void*> pValues) = 0;
-
-							virtual BaseDefaultFieldItem<tm>* encodeDateTime(PlcField plcField, std::vector<void*> pValues)= 0;
-
-							virtual BaseDefaultFieldItem<char*>* encodeByteArray(PlcField fieplcFieldld,std::vector<void*> pValues) = 0;
-
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_FIELD_HANDLER
+#define _PLC_FIELD_HANDLER
+
+#include <boost/system/error_code.hpp>
+#include <org/apache/plc4x/cpp/api/PlcConnection.h>
+#include <string>
+#include <vector>
+#include <ctime>
+
+#include <org/apache/plc4x/cpp/api/model/PlcField.h>
+#include "../messages/items/BaseDefaultFieldItem.h"
+
+using namespace org::apache::plc4x::cpp::api::model;
+using namespace org::apache::plc4x::cpp::base::messages;
+using namespace org::apache::plc4x::cpp::base::messages::items;
+using namespace boost::multiprecision;
+
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace connection
+					{
+						/**
+						 * Base class for implementing connections.
+						 * Per default, all operations (read, write, subscribe) are unsupported.
+						 * Concrete implementations should override the methods indicating connection capabilities
+						 * and for obtaining respective request builders.
+						 */
+						class PlcFieldHandler
+						{
+
+						public:
+
+							virtual PlcField* createField(std::string strFieldQuery) = 0;
+
+							virtual BaseDefaultFieldItem<bool>* encodeBoolean(PlcField plcField, std::vector<void*> pValues) = 0;
+
+							virtual BaseDefaultFieldItem<char>* encodeByte(PlcField plcField, std::vector<void*> pValues)= 0;
+
+							virtual BaseDefaultFieldItem<short>* encodeShort(PlcField plcField, std::vector<void*> pValues) = 0;
+
+							virtual BaseDefaultFieldItem<int>* encodeInteger(PlcField plcField, std::vector<void*> pValues) = 0;
+
+							virtual BaseDefaultFieldItem<long long>* encodeBigInteger(PlcField plcField,std::vector<void*> pValues) = 0;
+
+							virtual BaseDefaultFieldItem<long>* encodeLong(PlcField plcField, std::vector<void*> pValues) = 0;
+
+							virtual BaseDefaultFieldItem<float>* encodeFloat(PlcField plcField, std::vector<void*> pValues) = 0;
+
+							virtual BaseDefaultFieldItem< cpp_dec_float_100>* encodeBigDecimal(PlcField plcField, std::vector<void*> pValues) = 0;
+
+							virtual BaseDefaultFieldItem<double>* encodeDouble(PlcField plcField, std::vector<void*> pValues) = 0;
+
+							virtual BaseDefaultFieldItem<std::string>* encodeString(PlcField plcField, std::vector<void*> pValues) = 0;
+
+							virtual BaseDefaultFieldItem<time_t>* encodeTime(PlcField plcField, std::vector<void*> pValues) = 0;
+
+							virtual BaseDefaultFieldItem<tm>* encodeDate(PlcField plcField, std::vector<void*> pValues) = 0;
+
+							virtual BaseDefaultFieldItem<tm>* encodeDateTime(PlcField plcField, std::vector<void*> pValues)= 0;
+
+							virtual BaseDefaultFieldItem<char*>* encodeByteArray(PlcField fieplcFieldld,std::vector<void*> pValues) = 0;
+
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/events/ConnectEvent.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/events/ConnectEvent.cpp
index 585eae38bb5..48304255085 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/events/ConnectEvent.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/events/ConnectEvent.cpp
@@ -1,39 +1,39 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "ConnectEvent.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace events
-					{
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "ConnectEvent.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace events
+					{
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/events/ConnectEvent.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/events/ConnectEvent.h
index 77732dd940c..10e1e713921 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/events/ConnectEvent.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/events/ConnectEvent.h
@@ -1,48 +1,48 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _CONNECT_EVENT
-#define _CONNECT_EVENT
-
-#include <string>
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace events
-					{
-						
-						class ConnectEvent
-						{
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _CONNECT_EVENT
+#define _CONNECT_EVENT
+
+#include <string>
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace events
+					{
+						
+						class ConnectEvent
+						{
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/events/ConnectedEvent.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/events/ConnectedEvent.cpp
index 84b5e4a6bf2..d097bda9c8a 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/events/ConnectedEvent.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/events/ConnectedEvent.cpp
@@ -1,39 +1,39 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "ConnectedEvent.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace events
-					{
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "ConnectedEvent.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace events
+					{
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/events/ConnectedEvent.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/events/ConnectedEvent.h
index 315b9c6286f..1dca1e12078 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/events/ConnectedEvent.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/events/ConnectedEvent.h
@@ -1,47 +1,47 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _CONNECTED_EVENT
-#define _CONNECTED_EVENT
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace events
-					{
-						
-						class ConnectedEvent
-						{
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _CONNECTED_EVENT
+#define _CONNECTED_EVENT
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace events
+					{
+						
+						class ConnectedEvent
+						{
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/DefaultPlcReadRequest.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/DefaultPlcReadRequest.cpp
index 82a53ade765..d186a22435a 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/DefaultPlcReadRequest.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/DefaultPlcReadRequest.cpp
@@ -1,144 +1,144 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "DefaultPlcReadRequest.h"
-
-using namespace org::apache::plc4x::cpp::api::model;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						// =========================================================
-						DefaultPlcReadRequest::DefaultPlcReadRequest()
-						{
-						}
-
-						// =========================================================
-						DefaultPlcReadRequest::DefaultPlcReadRequest(PlcReader* plcReader, std::map<std::string, PlcField*> mplcFields)
-						{
-                            _plcReader = plcReader;
-                            _mplcFields = mplcFields;
-						}
-
-                        // ====================================================
-                        PlcReader* DefaultPlcReadRequest::getReader()
-                        {
-                            return _plcReader;
-                        }
-
-						// ==========================================================
-						int DefaultPlcReadRequest::getNumberOfFields()
-						{
-							return _mplcFields.size();
-						}
-
-						// =========================================================
-						PlcField* DefaultPlcReadRequest::getField(std::string strName)
-						{
-                            PlcField* plcField = nullptr;
-                            
-                            std::map<std::string, PlcField*>::iterator iterator = _mplcFields.find(strName);
-
-							if (iterator != _mplcFields.end())
-							{
-                                plcField = iterator->second;
-							}
-
-							return plcField;							
-						}
-
-						// ======================================================
-						std::map<std::string, PlcField*> DefaultPlcReadRequest::getNamedFields()
-						{
-							return std::map<std::string, PlcField*>();
-						}
-
-						// =====================================================
-						std::vector<PlcField*> DefaultPlcReadRequest::getFields()
-						{
-							std::pair<std::string, PlcField*> me;
-							std::vector<PlcField*> vplcFields;
-
-							BOOST_FOREACH(me, _mplcFields)
-							{
-                                vplcFields.push_back(me.second);
-							}
-
-							return vplcFields;
-						}
-
-						// =========================================================
-						std::vector<std::string> DefaultPlcReadRequest::getFieldNames()
-						{							
-							// TODO: check if already exists...
-							std::pair<std::string, PlcField*> me;
-							std::vector<std::string> vstrNames;
-
-							BOOST_FOREACH(me, _mplcFields)
-							{
-                                vstrNames.push_back(me.first);
-							}
-
-							return vstrNames;
-						}
-
-                        DefaultPlcReadRequest::Builder::Builder(PlcReader* plcReader, PlcFieldHandler* plcFieldHandler)
-                        {
-                            _plcReader = plcReader;
-                            _plcFieldHandler = plcFieldHandler;
-                        }
-
-                        DefaultPlcReadRequest::Builder* DefaultPlcReadRequest::Builder::addItem(std::string strName, std::string strFieldQuery)
-                        {
-                            std::map<std::string, std::string>::iterator iterator = _mFields.find(strName);
-                            if (iterator != _mFields.end())
-                            {
-                                BOOST_THROW_EXCEPTION(PlcRuntimeException("Duplicate field definition '" + strName + "'"));
-                            }
-                            _mFields.insert(std::pair<std::string,std::string>(strName, strFieldQuery));
-                            return this;
-                        }
-
-                        PlcReadRequest* DefaultPlcReadRequest::Builder::build()
-                        {
-                            std::map<std::string, PlcField*> mParsedFields;
-                            std::pair<std::string, std::string> me;
-
-                            BOOST_FOREACH(me, _mFields)
-                            {
-                                PlcField* parsedField = _plcFieldHandler->createField(me.second);
-                                mParsedFields.insert(std::pair<std::string, PlcField*>(me.first, parsedField));
-                            }
-                            return new DefaultPlcReadRequest(_plcReader, mParsedFields);
-                        }
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "DefaultPlcReadRequest.h"
+
+using namespace org::apache::plc4x::cpp::api::model;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						// =========================================================
+						DefaultPlcReadRequest::DefaultPlcReadRequest()
+						{
+						}
+
+						// =========================================================
+						DefaultPlcReadRequest::DefaultPlcReadRequest(PlcReader* plcReader, std::map<std::string, PlcField*> mplcFields)
+						{
+                            _plcReader = plcReader;
+                            _mplcFields = mplcFields;
+						}
+
+                        // ====================================================
+                        PlcReader* DefaultPlcReadRequest::getReader()
+                        {
+                            return _plcReader;
+                        }
+
+						// ==========================================================
+						int DefaultPlcReadRequest::getNumberOfFields()
+						{
+							return _mplcFields.size();
+						}
+
+						// =========================================================
+						PlcField* DefaultPlcReadRequest::getField(std::string strName)
+						{
+                            PlcField* plcField = nullptr;
+                            
+                            std::map<std::string, PlcField*>::iterator iterator = _mplcFields.find(strName);
+
+							if (iterator != _mplcFields.end())
+							{
+                                plcField = iterator->second;
+							}
+
+							return plcField;							
+						}
+
+						// ======================================================
+						std::map<std::string, PlcField*> DefaultPlcReadRequest::getNamedFields()
+						{
+							return std::map<std::string, PlcField*>();
+						}
+
+						// =====================================================
+						std::vector<PlcField*> DefaultPlcReadRequest::getFields()
+						{
+							std::pair<std::string, PlcField*> me;
+							std::vector<PlcField*> vplcFields;
+
+							BOOST_FOREACH(me, _mplcFields)
+							{
+                                vplcFields.push_back(me.second);
+							}
+
+							return vplcFields;
+						}
+
+						// =========================================================
+						std::vector<std::string> DefaultPlcReadRequest::getFieldNames()
+						{							
+							// TODO: check if already exists...
+							std::pair<std::string, PlcField*> me;
+							std::vector<std::string> vstrNames;
+
+							BOOST_FOREACH(me, _mplcFields)
+							{
+                                vstrNames.push_back(me.first);
+							}
+
+							return vstrNames;
+						}
+
+                        DefaultPlcReadRequest::Builder::Builder(PlcReader* plcReader, PlcFieldHandler* plcFieldHandler)
+                        {
+                            _plcReader = plcReader;
+                            _plcFieldHandler = plcFieldHandler;
+                        }
+
+                        DefaultPlcReadRequest::Builder* DefaultPlcReadRequest::Builder::addItem(std::string strName, std::string strFieldQuery)
+                        {
+                            std::map<std::string, std::string>::iterator iterator = _mFields.find(strName);
+                            if (iterator != _mFields.end())
+                            {
+                                BOOST_THROW_EXCEPTION(PlcRuntimeException("Duplicate field definition '" + strName + "'"));
+                            }
+                            _mFields.insert(std::pair<std::string,std::string>(strName, strFieldQuery));
+                            return this;
+                        }
+
+                        PlcReadRequest* DefaultPlcReadRequest::Builder::build()
+                        {
+                            std::map<std::string, PlcField*> mParsedFields;
+                            std::pair<std::string, std::string> me;
+
+                            BOOST_FOREACH(me, _mFields)
+                            {
+                                PlcField* parsedField = _plcFieldHandler->createField(me.second);
+                                mParsedFields.insert(std::pair<std::string, PlcField*>(me.first, parsedField));
+                            }
+                            return new DefaultPlcReadRequest(_plcReader, mParsedFields);
+                        }
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/DefaultPlcReadRequest.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/DefaultPlcReadRequest.h
index 4ce2c9cd4d0..1d4acac6b87 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/DefaultPlcReadRequest.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/DefaultPlcReadRequest.h
@@ -1,100 +1,100 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _DEFAULT_PLC_READ_REQUEST
-#define _DEFAULT_PLC_READ_REQUEST
-
-#include "InternalPlcReadRequest.h"
-#include "InternalPlcFieldRequest.h"
-#include "PlcReader.h"
-#include <org/apache/plc4x/cpp/api/model/PlcField.h>
-#include "../connection/PlcFieldHandler.h"
-
-#include <map>
-#include <boost/foreach.hpp>
-
-
-
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-                        using namespace org::apache::plc4x::cpp::api::messages;
-                        using namespace org::apache::plc4x::cpp::base::connection;
-
-                        class DefaultPlcReadRequest : public InternalPlcReadRequest
-						{
-						public:
-							// Todo:
-							/*CompletableFuture<PlcReadResponse> execute() 
-							{
-								return reader.read(this);
-							}*/
-
-							// Todo: implement java Builder-pattern for C++							
-							
-							DefaultPlcReadRequest(PlcReader* plcReader, std::map<std::string, PlcField*> mplcFields);
-							int getNumberOfFields();						
-							std::vector<std::string> getFieldNames();			
-							PlcField* getField(std::string name);
-							std::vector<PlcField*> getFields();
-							std::map<std::string, PlcField*> getNamedFields();
-
-                            class Builder
-                            {
-                            public:
-                                Builder(PlcReader* plcReader, PlcFieldHandler* plcFieldHandler);
-                                Builder* addItem(std::string strName, std::string strFieldQuery);
-                                PlcReadRequest* build();
-
-                            private:
-                                PlcReader* _plcReader;
-                                PlcFieldHandler* _plcFieldHandler;
-                                std::map<std::string, std::string> _mFields;
-                            };
-
-
-						protected:
-
-							PlcReader* getReader();
-							
-
-						private:					
-
-							DefaultPlcReadRequest();
-							PlcReader* _plcReader;
-							std::map<std::string, PlcField*> _mplcFields;
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _DEFAULT_PLC_READ_REQUEST
+#define _DEFAULT_PLC_READ_REQUEST
+
+#include "InternalPlcReadRequest.h"
+#include "InternalPlcFieldRequest.h"
+#include "PlcReader.h"
+#include <org/apache/plc4x/cpp/api/model/PlcField.h>
+#include "../connection/PlcFieldHandler.h"
+
+#include <map>
+#include <boost/foreach.hpp>
+
+
+
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+                        using namespace org::apache::plc4x::cpp::api::messages;
+                        using namespace org::apache::plc4x::cpp::base::connection;
+
+                        class DefaultPlcReadRequest : public InternalPlcReadRequest
+						{
+						public:
+							// Todo:
+							/*CompletableFuture<PlcReadResponse> execute() 
+							{
+								return reader.read(this);
+							}*/
+
+							// Todo: implement java Builder-pattern for C++							
+							
+							DefaultPlcReadRequest(PlcReader* plcReader, std::map<std::string, PlcField*> mplcFields);
+							int getNumberOfFields();						
+							std::vector<std::string> getFieldNames();			
+							PlcField* getField(std::string name);
+							std::vector<PlcField*> getFields();
+							std::map<std::string, PlcField*> getNamedFields();
+
+                            class Builder
+                            {
+                            public:
+                                Builder(PlcReader* plcReader, PlcFieldHandler* plcFieldHandler);
+                                Builder* addItem(std::string strName, std::string strFieldQuery);
+                                PlcReadRequest* build();
+
+                            private:
+                                PlcReader* _plcReader;
+                                PlcFieldHandler* _plcFieldHandler;
+                                std::map<std::string, std::string> _mFields;
+                            };
+
+
+						protected:
+
+							PlcReader* getReader();
+							
+
+						private:					
+
+							DefaultPlcReadRequest();
+							PlcReader* _plcReader;
+							std::map<std::string, PlcField*> _mplcFields;
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/DefaultPlcWriteRequest.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/DefaultPlcWriteRequest.cpp
index e0d6f9d4ff5..1d7ae47d72d 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/DefaultPlcWriteRequest.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/DefaultPlcWriteRequest.cpp
@@ -1,117 +1,117 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "DefaultPlcWriteRequest.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						// =========================================================
-                        DefaultPlcWriteRequest::DefaultPlcWriteRequest()
-						{
-						}
-
-						// =========================================================
-						DefaultPlcWriteRequest::DefaultPlcWriteRequest(PlcWriter* plcWriter, std::map<std::string, PlcField*> mplcFields)
-						{
-							_plcWriter = plcWriter;
-                            _mplcFields = mplcFields;
-						}
-
-                        // ====================================================
-                        PlcWriter* DefaultPlcWriteRequest::getWriter()
-                        {
-                            return _plcWriter;
-                        }
-
-                        // ==========================================================
-                        int DefaultPlcWriteRequest::getNumberOfFields()
-                        {
-                            return _mplcFields.size();
-                        }
-
-                        // =========================================================
-                        PlcField* DefaultPlcWriteRequest::getField(std::string strName)
-                        {
-                            PlcField* plcField = nullptr;
-
-                            std::map<std::string, PlcField*>::iterator iterator = _mplcFields.find(strName);
-
-                            if (iterator != _mplcFields.end())
-                            {
-                                plcField = iterator->second;
-                            }
-
-                            return plcField;
-
-                        }
-
-                        // ======================================================
-                        std::map<std::string, PlcField*> DefaultPlcWriteRequest::getNamedFields()
-                        {
-                            return std::map<std::string, PlcField*>();
-                        }
-
-                        // =====================================================
-                        std::vector<PlcField*> DefaultPlcWriteRequest::getFields()
-                        {
-                            std::pair<std::string, PlcField*> me;
-                            std::vector<PlcField*> vplcFields;
-
-                            BOOST_FOREACH(me, _mplcFields)
-                            {
-                                vplcFields.push_back(me.second);
-                            }
-
-                            return vplcFields;
-                        }
-
-                        // =========================================================
-                        std::vector<std::string> DefaultPlcWriteRequest::getFieldNames()
-                        {
-                            // TODO: check if already exists...
-                            std::pair<std::string, PlcField*> me;
-                            std::vector<std::string> vstrNames;
-
-                            BOOST_FOREACH(me, _mplcFields)
-                            {
-                                vstrNames.push_back(me.first);
-                            }
-
-                            return vstrNames;
-                        }
-
-						
-
-											
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "DefaultPlcWriteRequest.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						// =========================================================
+                        DefaultPlcWriteRequest::DefaultPlcWriteRequest()
+						{
+						}
+
+						// =========================================================
+						DefaultPlcWriteRequest::DefaultPlcWriteRequest(PlcWriter* plcWriter, std::map<std::string, PlcField*> mplcFields)
+						{
+							_plcWriter = plcWriter;
+                            _mplcFields = mplcFields;
+						}
+
+                        // ====================================================
+                        PlcWriter* DefaultPlcWriteRequest::getWriter()
+                        {
+                            return _plcWriter;
+                        }
+
+                        // ==========================================================
+                        int DefaultPlcWriteRequest::getNumberOfFields()
+                        {
+                            return _mplcFields.size();
+                        }
+
+                        // =========================================================
+                        PlcField* DefaultPlcWriteRequest::getField(std::string strName)
+                        {
+                            PlcField* plcField = nullptr;
+
+                            std::map<std::string, PlcField*>::iterator iterator = _mplcFields.find(strName);
+
+                            if (iterator != _mplcFields.end())
+                            {
+                                plcField = iterator->second;
+                            }
+
+                            return plcField;
+
+                        }
+
+                        // ======================================================
+                        std::map<std::string, PlcField*> DefaultPlcWriteRequest::getNamedFields()
+                        {
+                            return std::map<std::string, PlcField*>();
+                        }
+
+                        // =====================================================
+                        std::vector<PlcField*> DefaultPlcWriteRequest::getFields()
+                        {
+                            std::pair<std::string, PlcField*> me;
+                            std::vector<PlcField*> vplcFields;
+
+                            BOOST_FOREACH(me, _mplcFields)
+                            {
+                                vplcFields.push_back(me.second);
+                            }
+
+                            return vplcFields;
+                        }
+
+                        // =========================================================
+                        std::vector<std::string> DefaultPlcWriteRequest::getFieldNames()
+                        {
+                            // TODO: check if already exists...
+                            std::pair<std::string, PlcField*> me;
+                            std::vector<std::string> vstrNames;
+
+                            BOOST_FOREACH(me, _mplcFields)
+                            {
+                                vstrNames.push_back(me.first);
+                            }
+
+                            return vstrNames;
+                        }
+
+						
+
+											
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/DefaultPlcWriteRequest.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/DefaultPlcWriteRequest.h
index a349dbeb313..6b93bb51793 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/DefaultPlcWriteRequest.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/DefaultPlcWriteRequest.h
@@ -1,80 +1,80 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _DEFAULT_PLC_WRITE_REQUEST
-#define _DEFAULT_PLC_WRITE_REQUEST
-
-#include "InternalPlcWriteRequest.h"
-#include "InternalPlcFieldRequest.h"
-#include "PlcWriter.h"
-
-#include <map>
-#include <boost/foreach.hpp>
-
-using namespace org::apache::plc4x::cpp::api::messages;
-
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						
-						class DefaultPlcWriteRequest : public InternalPlcWriteRequest 
-						{
-						public:
-							// Todo:
-							/*CompletableFuture<PlcReadResponse> execute() 
-							{
-								return reader.read(this);
-							}*/
-
-							// Todo: implement java Builder-pattern for C++							
-							
-							DefaultPlcWriteRequest(PlcWriter* writer, std::map<std::string, PlcField*> fields);
-							int getNumberOfFields();						
-							std::vector<std::string> getFieldNames();			
-							PlcField* getField(std::string name);
-							std::vector<PlcField*> getFields();
-							std::map<std::string, PlcField*> getNamedFields();
-							// Todo: implement callback to: execute() { _writer.write(this); }
-
-						protected:
-							PlcWriter* getWriter();
-							
-						private:					
-							DefaultPlcWriteRequest();
-							PlcWriter* _plcWriter;
-							std::map<std::string, PlcField*> _mplcFields;
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _DEFAULT_PLC_WRITE_REQUEST
+#define _DEFAULT_PLC_WRITE_REQUEST
+
+#include "InternalPlcWriteRequest.h"
+#include "InternalPlcFieldRequest.h"
+#include "PlcWriter.h"
+
+#include <map>
+#include <boost/foreach.hpp>
+
+using namespace org::apache::plc4x::cpp::api::messages;
+
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						
+						class DefaultPlcWriteRequest : public InternalPlcWriteRequest 
+						{
+						public:
+							// Todo:
+							/*CompletableFuture<PlcReadResponse> execute() 
+							{
+								return reader.read(this);
+							}*/
+
+							// Todo: implement java Builder-pattern for C++							
+							
+							DefaultPlcWriteRequest(PlcWriter* writer, std::map<std::string, PlcField*> fields);
+							int getNumberOfFields();						
+							std::vector<std::string> getFieldNames();			
+							PlcField* getField(std::string name);
+							std::vector<PlcField*> getFields();
+							std::map<std::string, PlcField*> getNamedFields();
+							// Todo: implement callback to: execute() { _writer.write(this); }
+
+						protected:
+							PlcWriter* getWriter();
+							
+						private:					
+							DefaultPlcWriteRequest();
+							PlcWriter* _plcWriter;
+							std::map<std::string, PlcField*> _mplcFields;
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcFieldRequest.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcFieldRequest.cpp
index 4ebe4efb5fc..ded12cd6810 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcFieldRequest.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcFieldRequest.cpp
@@ -1,42 +1,42 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "InternalPlcFieldRequest.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						InternalPlcFieldRequest::InternalPlcFieldRequest()
-						{
-						}
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "InternalPlcFieldRequest.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						InternalPlcFieldRequest::InternalPlcFieldRequest()
+						{
+						}
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcFieldRequest.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcFieldRequest.h
index 37415ca06fa..811dc539a97 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcFieldRequest.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcFieldRequest.h
@@ -1,54 +1,54 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _INTERNAL_PLC_FIELD_REQUEST
-#define _INTERNAL_PLC_FIELD_REQUEST
-
-#include "InternalPlcRequest.h"
-#include <org/apache/plc4x/cpp/api/messages/PlcFieldRequest.h>
-
-#include <map>
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						
-						class InternalPlcFieldRequest : public InternalPlcRequest, PlcFieldRequest
-						{
-						public:
-							virtual std::map<std::string, PlcField*> getNamedFields() = 0;
-							InternalPlcFieldRequest();
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _INTERNAL_PLC_FIELD_REQUEST
+#define _INTERNAL_PLC_FIELD_REQUEST
+
+#include "InternalPlcRequest.h"
+#include <org/apache/plc4x/cpp/api/messages/PlcFieldRequest.h>
+
+#include <map>
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						
+						class InternalPlcFieldRequest : public InternalPlcRequest, PlcFieldRequest
+						{
+						public:
+							virtual std::map<std::string, PlcField*> getNamedFields() = 0;
+							InternalPlcFieldRequest();
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcFieldResponse.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcFieldResponse.cpp
index 4aa84d7a8e8..1da1a752576 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcFieldResponse.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcFieldResponse.cpp
@@ -1,39 +1,39 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "InternalPlcFieldResponse.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "InternalPlcFieldResponse.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcFieldResponse.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcFieldResponse.h
index 3362d54dbe7..36ef652e9e9 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcFieldResponse.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcFieldResponse.h
@@ -1,53 +1,53 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _INTERNAL_PLC_FIELD_RESPONSE
-#define _INTERNAL_PLC_FIELD_RESPONSE
-
-#include <org/apache/plc4x/cpp/api/messages/PlcFieldResponse.h>
-
-using namespace org::apache::plc4x::cpp::api::messages;
-
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						
-						class InternalPlcFieldResponse : public PlcFieldResponse
-						{
-							public:
-							
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _INTERNAL_PLC_FIELD_RESPONSE
+#define _INTERNAL_PLC_FIELD_RESPONSE
+
+#include <org/apache/plc4x/cpp/api/messages/PlcFieldResponse.h>
+
+using namespace org::apache::plc4x::cpp::api::messages;
+
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						
+						class InternalPlcFieldResponse : public PlcFieldResponse
+						{
+							public:
+							
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcProprietaryRequest.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcProprietaryRequest.cpp
index 52e079509e6..92b6dc1573d 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcProprietaryRequest.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcProprietaryRequest.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "InternalPlcProprietaryRequest.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "InternalPlcProprietaryRequest.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcProprietaryRequest.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcProprietaryRequest.h
index cf31f8546ae..28fa4125d72 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcProprietaryRequest.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcProprietaryRequest.h
@@ -1,52 +1,52 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _INTERNAL_PLC_PROPRIETARY_REQUEST
-#define _INTERNAL_PLC_PROPRIETARY_REQUEST
-
-#include "PlcProprietaryRequest.h"
-#include "InternalPlcRequest.h"
-
-using namespace org::apache::plc4x::cpp::api::messages;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						//template<typename T>
-						class InternalPlcProprietaryRequest : public PlcProprietaryRequest, public InternalPlcRequest
-						{
-						public:						 
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _INTERNAL_PLC_PROPRIETARY_REQUEST
+#define _INTERNAL_PLC_PROPRIETARY_REQUEST
+
+#include "PlcProprietaryRequest.h"
+#include "InternalPlcRequest.h"
+
+using namespace org::apache::plc4x::cpp::api::messages;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						//template<typename T>
+						class InternalPlcProprietaryRequest : public PlcProprietaryRequest, public InternalPlcRequest
+						{
+						public:						 
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcProprietaryResponse.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcProprietaryResponse.cpp
index ce9c1da3380..495e7d41866 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcProprietaryResponse.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcProprietaryResponse.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "InternalPlcProprietaryResponse.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "InternalPlcProprietaryResponse.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcProprietaryResponse.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcProprietaryResponse.h
index 593c398c869..e494f4b1291 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcProprietaryResponse.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcProprietaryResponse.h
@@ -1,52 +1,52 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _INTERNAL_PLC_PROPRIETARY_RESPONSE
-#define _INTERNAL_PLC_PROPRIETARY_RESPONSE
-
-#include "PlcProprietaryResponse.h"
-#include "InternalPlcRequest.h"
-
-using namespace org::apache::plc4x::cpp::api::messages;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						//template<typename T>
-						class InternalPlcProprietaryResponse : public PlcProprietaryResponse, public InternalPlcRequest
-						{
-						public:						 
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _INTERNAL_PLC_PROPRIETARY_RESPONSE
+#define _INTERNAL_PLC_PROPRIETARY_RESPONSE
+
+#include "PlcProprietaryResponse.h"
+#include "InternalPlcRequest.h"
+
+using namespace org::apache::plc4x::cpp::api::messages;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						//template<typename T>
+						class InternalPlcProprietaryResponse : public PlcProprietaryResponse, public InternalPlcRequest
+						{
+						public:						 
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcReadRequest.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcReadRequest.cpp
index 22f3abb3ad4..21147e8543e 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcReadRequest.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcReadRequest.cpp
@@ -1,39 +1,39 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "InternalPlcReadRequest.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "InternalPlcReadRequest.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcReadRequest.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcReadRequest.h
index ef2eb0591f8..6e67ceee467 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcReadRequest.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcReadRequest.h
@@ -1,54 +1,54 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _INTERNAL_PLC_READ_REQUEST
-#define _INTERNAL_PLC_READ_REQUEST
-
-#include <org/apache/plc4x/cpp/api/messages/PlcReadRequest.h>
-#include "InternalPlcFieldRequest.h"
-
-using namespace org::apache::plc4x::cpp::api::messages;
-
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						
-						class InternalPlcReadRequest : public PlcReadRequest, public InternalPlcFieldRequest
-						{
-						public:
-							
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _INTERNAL_PLC_READ_REQUEST
+#define _INTERNAL_PLC_READ_REQUEST
+
+#include <org/apache/plc4x/cpp/api/messages/PlcReadRequest.h>
+#include "InternalPlcFieldRequest.h"
+
+using namespace org::apache::plc4x::cpp::api::messages;
+
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						
+						class InternalPlcReadRequest : public PlcReadRequest, public InternalPlcFieldRequest
+						{
+						public:
+							
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcRequest.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcRequest.cpp
index 836a78eadbc..e88e1b5df0e 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcRequest.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcRequest.cpp
@@ -1,39 +1,39 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "InternalPlcRequest.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "InternalPlcRequest.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcRequest.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcRequest.h
index 95f6e46a4be..9bfabe4a0d7 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcRequest.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcRequest.h
@@ -1,53 +1,53 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _INTERNAL_PLC_REQUEST
-#define _INTERNAL_PLC_REQUEST
-
-#include <org/apache/plc4x/cpp/api/messages/PlcRequest.h>
-
-using namespace org::apache::plc4x::cpp::api::messages;
-
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						
-						class InternalPlcRequest : public PlcRequest
-						{
-						public:
-							
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _INTERNAL_PLC_REQUEST
+#define _INTERNAL_PLC_REQUEST
+
+#include <org/apache/plc4x/cpp/api/messages/PlcRequest.h>
+
+using namespace org::apache::plc4x::cpp::api::messages;
+
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						
+						class InternalPlcRequest : public PlcRequest
+						{
+						public:
+							
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcResponse.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcResponse.cpp
index 4f5b49f717c..b0eddffeb4d 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcResponse.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcResponse.cpp
@@ -1,39 +1,39 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "InternalPlcResponse.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "InternalPlcResponse.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcResponse.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcResponse.h
index 25ce65338ab..895f32fd2c4 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcResponse.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcResponse.h
@@ -1,53 +1,53 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _INTERNAL_PLC_RESPONSE
-#define _INTERNAL_PLC_RESPONSE
-
-#include <org/apache/plc4x/cpp/api/messages/PlcResponse.h>
-
-using namespace org::apache::plc4x::cpp::api::messages;
-
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						
-						class InternalPlcResponse : public PlcResponse
-						{
-						public:
-							
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _INTERNAL_PLC_RESPONSE
+#define _INTERNAL_PLC_RESPONSE
+
+#include <org/apache/plc4x/cpp/api/messages/PlcResponse.h>
+
+using namespace org::apache::plc4x::cpp::api::messages;
+
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						
+						class InternalPlcResponse : public PlcResponse
+						{
+						public:
+							
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcWriteRequest.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcWriteRequest.cpp
index e0665cbca6b..743905916eb 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcWriteRequest.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcWriteRequest.cpp
@@ -1,39 +1,39 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "InternalPlcWriteRequest.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "InternalPlcWriteRequest.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcWriteRequest.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcWriteRequest.h
index bb6274f2e3c..8613a68be7f 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcWriteRequest.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcWriteRequest.h
@@ -1,60 +1,60 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _INTERNAL_PLC_WRITE_REQUEST
-#define _INTERNAL_PLC_WRITE_REQUEST
-
-#include <org/apache/plc4x/cpp/api/messages/PlcWriteRequest.h>
-#include "./items/BaseDefaultFieldItem.h"
-#include "InternalPlcFieldRequest.h"
-#include <vector>
-#include <tuple>
-
-using namespace org::apache::plc4x::cpp::api::messages;
-using namespace org::apache::plc4x::cpp::base::messages::items;
-
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						
-						class InternalPlcWriteRequest : public PlcWriteRequest, public InternalPlcFieldRequest
-						{
-						public:
-							virtual ValueTypeObject getFieldItem(std::string name) = 0;
-							virtual std::vector<ValueTypeObject> getFieldItems(std::string name)= 0;
-							virtual std::tuple<std::string, PlcField, ValueTypeObject> getNamedFieldTriples() = 0;
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _INTERNAL_PLC_WRITE_REQUEST
+#define _INTERNAL_PLC_WRITE_REQUEST
+
+#include <org/apache/plc4x/cpp/api/messages/PlcWriteRequest.h>
+#include "./items/BaseDefaultFieldItem.h"
+#include "InternalPlcFieldRequest.h"
+#include <vector>
+#include <tuple>
+
+using namespace org::apache::plc4x::cpp::api::messages;
+using namespace org::apache::plc4x::cpp::base::messages::items;
+
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						
+						class InternalPlcWriteRequest : public PlcWriteRequest, public InternalPlcFieldRequest
+						{
+						public:
+							virtual ValueTypeObject getFieldItem(std::string name) = 0;
+							virtual std::vector<ValueTypeObject> getFieldItems(std::string name)= 0;
+							virtual std::tuple<std::string, PlcField, ValueTypeObject> getNamedFieldTriples() = 0;
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcProprietaryRequest.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcProprietaryRequest.cpp
index abe5335ad3f..48cc4ba61c2 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcProprietaryRequest.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcProprietaryRequest.cpp
@@ -1,39 +1,39 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcProprietaryRequest.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcProprietaryRequest.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcProprietaryRequest.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcProprietaryRequest.h
index 8f877f429ff..d6fd5978e88 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcProprietaryRequest.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcProprietaryRequest.h
@@ -1,54 +1,54 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_PROPRIETARY_REQUEST
-#define _PLC_PROPRIETARY_REQUEST
-
-#include <org/apache/plc4x/cpp/api/messages/REQUEST.h>
-#include <org/apache/plc4x/cpp/api/messages/PlcRequest.h>
-#include <org/apache/plc4x/cpp/api//messages/RequestTemplate.h>
-
-using namespace org::apache::plc4x::cpp::api::messages;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						
-						class PlcProprietaryRequest : public PlcRequest, public RequestTemplate<REQUEST>
-						{
-						public:
-							virtual REQUEST getProprietaryRequest() = 0;
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_PROPRIETARY_REQUEST
+#define _PLC_PROPRIETARY_REQUEST
+
+#include <org/apache/plc4x/cpp/api/messages/REQUEST.h>
+#include <org/apache/plc4x/cpp/api/messages/PlcRequest.h>
+#include <org/apache/plc4x/cpp/api//messages/RequestTemplate.h>
+
+using namespace org::apache::plc4x::cpp::api::messages;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						
+						class PlcProprietaryRequest : public PlcRequest, public RequestTemplate<REQUEST>
+						{
+						public:
+							virtual REQUEST getProprietaryRequest() = 0;
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcProprietaryResponse.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcProprietaryResponse.cpp
index ce4074ed7fc..e3fcb5dbd96 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcProprietaryResponse.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcProprietaryResponse.cpp
@@ -1,40 +1,40 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcProprietaryResponse.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcProprietaryResponse.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcProprietaryResponse.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcProprietaryResponse.h
index d5d08b5fcf3..7a1d379a63f 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcProprietaryResponse.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcProprietaryResponse.h
@@ -1,53 +1,53 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_PROPRIETARY_RESPONSE
-#define _PLC_PROPRIETARY_RESPONSE
-
-#include <org/apache/plc4x/cpp/api/messages/RESPONSE.h>
-#include <org/apache/plc4x/cpp/api/messages/PlcResponse.h>
-#include <org/apache/plc4x/cpp/api/messages/ResponseTemplate.h>
-
-using namespace org::apache::plc4x::cpp::api::messages;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						//template<typename T>
-						class PlcProprietaryResponse : public PlcResponse, public ResponseTemplate<RESPONSE>
-						{
-						public:						 
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_PROPRIETARY_RESPONSE
+#define _PLC_PROPRIETARY_RESPONSE
+
+#include <org/apache/plc4x/cpp/api/messages/RESPONSE.h>
+#include <org/apache/plc4x/cpp/api/messages/PlcResponse.h>
+#include <org/apache/plc4x/cpp/api/messages/ResponseTemplate.h>
+
+using namespace org::apache::plc4x::cpp::api::messages;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						//template<typename T>
+						class PlcProprietaryResponse : public PlcResponse, public ResponseTemplate<RESPONSE>
+						{
+						public:						 
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcReader.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcReader.cpp
index c88119fb1ec..8b0c5b94b22 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcReader.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcReader.cpp
@@ -1,39 +1,39 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcReader.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcReader.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcReader.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcReader.h
index 298ae375976..707efc23a9d 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcReader.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcReader.h
@@ -1,49 +1,49 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_READER
-#define _PLC_READER
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						
-						class PlcReader
-						{
-							// Todo: implement java-CompletableFuture
-						public:
-							
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_READER
+#define _PLC_READER
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						
+						class PlcReader
+						{
+							// Todo: implement java-CompletableFuture
+						public:
+							
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcWriter.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcWriter.cpp
index 6d1d5373a48..3501636b0e5 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcWriter.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcWriter.cpp
@@ -1,39 +1,39 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "PlcWriter.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "PlcWriter.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcWriter.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcWriter.h
index a24e19afbd1..c1042b56dd8 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcWriter.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcWriter.h
@@ -1,55 +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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _PLC_WRITER
-#define _PLC_WRITER
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						
-						class PlcWriter
-						{
-							/**
-							* Writes a given value to a PLC.
-							*
-							* @param writeRequest object describing the type, location and value that whould be written.
-							* @return a {@link CompletableFuture} giving async access to the response of the write operation.
-							*/
-							// Todo: CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest);
-						public:
-							
-						};
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _PLC_WRITER
+#define _PLC_WRITER
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						
+						class PlcWriter
+						{
+							/**
+							* Writes a given value to a PLC.
+							*
+							* @param writeRequest object describing the type, location and value that whould be written.
+							* @return a {@link CompletableFuture} giving async access to the response of the write operation.
+							*/
+							// Todo: CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest);
+						public:
+							
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/BaseDefaultFieldItem.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/BaseDefaultFieldItem.cpp
index e90ddd0545e..bfa919a43cd 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/BaseDefaultFieldItem.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/BaseDefaultFieldItem.cpp
@@ -1,43 +1,43 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "BaseDefaultFieldItem.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						namespace items
-						{
-						}
-						
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "BaseDefaultFieldItem.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						namespace items
+						{
+						}
+						
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/BaseDefaultFieldItem.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/BaseDefaultFieldItem.h
index ddff4244b97..961999dc877 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/BaseDefaultFieldItem.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/BaseDefaultFieldItem.h
@@ -1,136 +1,136 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _BASE_DEFAULT_FIELD_ITEM
-#define _BASE_DEFAULT_FIELD_ITEM
-
-#include <boost/system/error_code.hpp>
-#include <boost/multiprecision/cpp_dec_float.hpp>
-#include <boost/functional/hash.hpp>
-#include <ctime>
-#include <array>
-
-#include <org/apache/plc4x/cpp/api/exceptions/PlcIncompatibleDatatypeException.h>
-#include <org/apache/plc4x/cpp/api/exceptions/PlcFieldRangeException.h>
-#include <org/apache/plc4x/cpp/api/types/ValueTypeObject.h>
-
-#include <string>
-
-using namespace org::apache::plc4x::cpp::api::exceptions;
-using namespace org::apache::plc4x::cpp::api::types;
-
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{					
-						namespace items
-						{
-							template<typename T> 
-							class BaseDefaultFieldItem : public ValueTypeObject
-							{
-
-							public:
-								inline int getNumberOfValues() { return _values.length; }
-								virtual T getObject(int index) = 0;
-								inline bool isValidBoolean(int index) { return false; }
-								inline bool getBoolean(int index) { throw new PlcIncompatibleDatatypeException("bool", index); }
-								inline bool isValidByte(int index) { return false; }
-								inline char getByte(int index) { throw new PlcIncompatibleDatatypeException("byte", index); }
-								inline bool isValidShort(int index) { return false; }
-								inline short getShort(int index) { throw new PlcIncompatibleDatatypeException("short", index); }
-								inline bool isValidInteger(int index) { return false; }
-								inline  int getInteger(int index) { throw new PlcIncompatibleDatatypeException("int", index); }
-								inline bool isValidLong(int index) { return false; }
-								inline long getLong(int index) { throw new PlcIncompatibleDatatypeException("long", index); }
-								inline bool isValidBigInteger(int index) { return false; }
-								inline long long getBigInteger(int index) { throw new PlcIncompatibleDatatypeException("long long", index); }
-								inline bool isValidFloat(int index) { return false; }
-								inline float getFloat(int index) { throw new PlcIncompatibleDatatypeException("float", index); }
-								inline bool isValidDouble(int index) { return false; }
-								inline double getDouble(int index) { throw new PlcIncompatibleDatatypeException("double", index); }
-								inline bool isValidBigDecimal(int index) { return false; }
-								inline long long getBigDecimal(int index) { throw new PlcIncompatibleDatatypeException("long long", index); }
-								inline bool isValidString(int index) { return false; }
-								inline std::string getString(int index) { throw new PlcIncompatibleDatatypeException("string", index); }
-								inline bool isValidTime(int index) { return false; }
-								inline tm* getTime(int index) { throw new PlcIncompatibleDatatypeException("tm*", index); }
-								inline bool isValidDate(int index) { return false; }
-								inline tm* getDate(int index) { throw new PlcIncompatibleDatatypeException("tm*", index); }
-								inline bool isValidDateTime(int index) { return false; }
-								inline tm* getDateTime(int index) { throw new PlcIncompatibleDatatypeException("tm*", index); }
-								inline bool isValidByteArray(int index) { return false; }
-								inline char* getByteArray(int index) { throw new PlcIncompatibleDatatypeException("char", index); }
-								inline std::vector<T>* getValues() { return &_values; }
-								inline  int hashCode() { return int_hash(_values); } // Todo: @Override
-								inline std::string toString() // Todo:  @Override								 
-								{									
-									return "BaseDefaultFielditem { values=" + std::string(_values) + "}";
-								};
-
-								// Todo: add methods for unsigned data types?
-
-								/* Todo:
-								@Override
-									bool equals(Object o)
-								{
-									if (this == o)
-									{
-										return true;
-									}
-									if (!(o instanceof BaseDefaultFieldItem))
-									{
-										return false;
-									}
-									BaseDefaultFieldItem< ? > fieldItem = (BaseDefaultFieldItem< ? >) o;
-									return Arrays.equals(values, fieldItem.values);
-								}*/
-
-							protected:
-								//BaseDefaultFieldItem() { this._values = new array<T>(0); }
-								inline BaseDefaultFieldItem(T* values) { _values = values; }
-								inline T getValue(unsigned int index)
-								{
-									if ((index < 0 || (index >= _values.size())))
-									{
-										throw new PlcFieldRangeException((_values.size() == 0) ? -1 : _values.size() - 1, index);
-									}
-									return _values[index];
-								}
-
-								std::vector<T> _values;
-							};
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _BASE_DEFAULT_FIELD_ITEM
+#define _BASE_DEFAULT_FIELD_ITEM
+
+#include <boost/system/error_code.hpp>
+#include <boost/multiprecision/cpp_dec_float.hpp>
+#include <boost/functional/hash.hpp>
+#include <ctime>
+#include <array>
+
+#include <org/apache/plc4x/cpp/api/exceptions/PlcIncompatibleDatatypeException.h>
+#include <org/apache/plc4x/cpp/api/exceptions/PlcFieldRangeException.h>
+#include <org/apache/plc4x/cpp/api/types/ValueTypeObject.h>
+
+#include <string>
+
+using namespace org::apache::plc4x::cpp::api::exceptions;
+using namespace org::apache::plc4x::cpp::api::types;
+
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{					
+						namespace items
+						{
+							template<typename T> 
+							class BaseDefaultFieldItem : public ValueTypeObject
+							{
+
+							public:
+								inline int getNumberOfValues() { return _values.length; }
+								virtual T getObject(int index) = 0;
+								inline bool isValidBoolean(int index) { return false; }
+								inline bool getBoolean(int index) { throw new PlcIncompatibleDatatypeException("bool", index); }
+								inline bool isValidByte(int index) { return false; }
+								inline char getByte(int index) { throw new PlcIncompatibleDatatypeException("byte", index); }
+								inline bool isValidShort(int index) { return false; }
+								inline short getShort(int index) { throw new PlcIncompatibleDatatypeException("short", index); }
+								inline bool isValidInteger(int index) { return false; }
+								inline  int getInteger(int index) { throw new PlcIncompatibleDatatypeException("int", index); }
+								inline bool isValidLong(int index) { return false; }
+								inline long getLong(int index) { throw new PlcIncompatibleDatatypeException("long", index); }
+								inline bool isValidBigInteger(int index) { return false; }
+								inline long long getBigInteger(int index) { throw new PlcIncompatibleDatatypeException("long long", index); }
+								inline bool isValidFloat(int index) { return false; }
+								inline float getFloat(int index) { throw new PlcIncompatibleDatatypeException("float", index); }
+								inline bool isValidDouble(int index) { return false; }
+								inline double getDouble(int index) { throw new PlcIncompatibleDatatypeException("double", index); }
+								inline bool isValidBigDecimal(int index) { return false; }
+								inline long long getBigDecimal(int index) { throw new PlcIncompatibleDatatypeException("long long", index); }
+								inline bool isValidString(int index) { return false; }
+								inline std::string getString(int index) { throw new PlcIncompatibleDatatypeException("string", index); }
+								inline bool isValidTime(int index) { return false; }
+								inline tm* getTime(int index) { throw new PlcIncompatibleDatatypeException("tm*", index); }
+								inline bool isValidDate(int index) { return false; }
+								inline tm* getDate(int index) { throw new PlcIncompatibleDatatypeException("tm*", index); }
+								inline bool isValidDateTime(int index) { return false; }
+								inline tm* getDateTime(int index) { throw new PlcIncompatibleDatatypeException("tm*", index); }
+								inline bool isValidByteArray(int index) { return false; }
+								inline char* getByteArray(int index) { throw new PlcIncompatibleDatatypeException("char", index); }
+								inline std::vector<T>* getValues() { return &_values; }
+								inline  int hashCode() { return int_hash(_values); } // Todo: @Override
+								inline std::string toString() // Todo:  @Override								 
+								{									
+									return "BaseDefaultFielditem { values=" + std::string(_values) + "}";
+								};
+
+								// Todo: add methods for unsigned data types?
+
+								/* Todo:
+								@Override
+									bool equals(Object o)
+								{
+									if (this == o)
+									{
+										return true;
+									}
+									if (!(o instanceof BaseDefaultFieldItem))
+									{
+										return false;
+									}
+									BaseDefaultFieldItem< ? > fieldItem = (BaseDefaultFieldItem< ? >) o;
+									return Arrays.equals(values, fieldItem.values);
+								}*/
+
+							protected:
+								//BaseDefaultFieldItem() { this._values = new array<T>(0); }
+								inline BaseDefaultFieldItem(T* values) { _values = values; }
+								inline T getValue(unsigned int index)
+								{
+									if ((index < 0 || (index >= _values.size())))
+									{
+										throw new PlcFieldRangeException((_values.size() == 0) ? -1 : _values.size() - 1, index);
+									}
+									return _values[index];
+								}
+
+								std::vector<T> _values;
+							};
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBigDecimalFieldItem.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBigDecimalFieldItem.cpp
index 996528282e9..72c58653831 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBigDecimalFieldItem.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBigDecimalFieldItem.cpp
@@ -1,196 +1,196 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "DefaultBigDecimalFieldItem.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						namespace items
-						{
-							// ==================================================
-							bool DefaultBigDecimalFieldItem::getBoolean(int index)
-							{
-								if (!isValidBoolean(index))
-								{
-									throw new PlcIncompatibleDatatypeException("bool", index);
-								}
-
-								return getValue(index) == 1;
-							}
-
-							// ===================================================
-							bool DefaultBigDecimalFieldItem::isValidByte(int index)
-							{
-								cpp_dec_float_100 value = getValue(index);
-								return value <= -127 && value >= -128;
-							}
-
-							// ===================================================
-							char DefaultBigDecimalFieldItem::getByte(int index)
-							{
-								if (!isValidByte(index)) 
-								{
-									throw new PlcIncompatibleDatatypeException("char", index);
-								}
-								return (char) getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultBigDecimalFieldItem::isValidShort(int index)
-							{
-								cpp_dec_float_100 value = getValue(index);
-								return value >= -32768 && value <= 32767;
-							}
-
-							// ===================================================
-							short DefaultBigDecimalFieldItem::getShort(int index)
-							{
-								if (!isValidShort(index))
-								{
-									throw new PlcIncompatibleDatatypeException("short", index);
-								}
-								
-								return (short)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultBigDecimalFieldItem::isValidInteger(int index)
-							{
-								cpp_dec_float_100 value = getValue(index);
-								return value >= 0 && value <= 2147483647;
-							}
-
-							// ===================================================
-							int DefaultBigDecimalFieldItem::getInteger(int index)
-							{
-								if (!isValidInteger(index))
-								{
-									throw new PlcIncompatibleDatatypeException("int", index);
-								}
-
-								return (int)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultBigDecimalFieldItem::isValidLong(int index)
-							{
-								cpp_dec_float_100 value = getValue(index);
-								return value >= -(2 ^ 63) && value <= (2 ^ 63) - 1;
-							}
-
-							// ===================================================
-							long DefaultBigDecimalFieldItem::getLong(int index)
-							{
-								if (!isValidLong(index))
-								{
-									throw new PlcIncompatibleDatatypeException("long", index);
-								}
-
-								return (long)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultBigDecimalFieldItem::isValidBigInteger(int index)
-							{
-								return true;
-							}
-
-							// ===================================================
-							long long DefaultBigDecimalFieldItem::getBigInteger(int index)
-							{
-								if (!isValidBigInteger(index))
-								{
-									throw new PlcIncompatibleDatatypeException("long long", index);
-								}
-								
-								// Todo: add conversion from cpp_dec_float_100 TO long long
-								return (long)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultBigDecimalFieldItem::isValidFloat(int index)
-							{
-								cpp_dec_float_100 value = getValue(index);
-								return value >= -3.4e38 && value <= 3.4e38;
-							}
-
-							// ===================================================
-							float DefaultBigDecimalFieldItem::getFloat(int index)
-							{
-								if (!isValidFloat(index))
-								{
-									throw new PlcIncompatibleDatatypeException("float", index);
-								}
-
-								return (float)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultBigDecimalFieldItem::isValidDouble(int index)
-							{
-								cpp_dec_float_100 value = getValue(index);
-								return value >= -1.7e308 && value <= 1.7e308;
-							}
-
-							// ===================================================
-							double DefaultBigDecimalFieldItem::getDouble(int index)
-							{
-								if (!isValidDouble(index))
-								{
-									throw new PlcIncompatibleDatatypeException("double", index);
-								}
-
-								return (double)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultBigDecimalFieldItem::isValidBigDecimal(int index)
-							{
-								// same limits but higher precision
-								return isValidDouble(index);
-							}
-
-							// ===================================================
-							cpp_dec_float_100 DefaultBigDecimalFieldItem::getBigDecimal(int index)
-							{
-								if (!isValidBigDecimal(index))
-								{
-									throw new PlcIncompatibleDatatypeException("cpp_dec_float_100", index);
-								}
-
-								return (cpp_dec_float_100)getValue(index);
-							}
-						}
-						
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "DefaultBigDecimalFieldItem.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						namespace items
+						{
+							// ==================================================
+							bool DefaultBigDecimalFieldItem::getBoolean(int index)
+							{
+								if (!isValidBoolean(index))
+								{
+									throw new PlcIncompatibleDatatypeException("bool", index);
+								}
+
+								return getValue(index) == 1;
+							}
+
+							// ===================================================
+							bool DefaultBigDecimalFieldItem::isValidByte(int index)
+							{
+								cpp_dec_float_100 value = getValue(index);
+								return value <= -127 && value >= -128;
+							}
+
+							// ===================================================
+							char DefaultBigDecimalFieldItem::getByte(int index)
+							{
+								if (!isValidByte(index)) 
+								{
+									throw new PlcIncompatibleDatatypeException("char", index);
+								}
+								return (char) getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultBigDecimalFieldItem::isValidShort(int index)
+							{
+								cpp_dec_float_100 value = getValue(index);
+								return value >= -32768 && value <= 32767;
+							}
+
+							// ===================================================
+							short DefaultBigDecimalFieldItem::getShort(int index)
+							{
+								if (!isValidShort(index))
+								{
+									throw new PlcIncompatibleDatatypeException("short", index);
+								}
+								
+								return (short)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultBigDecimalFieldItem::isValidInteger(int index)
+							{
+								cpp_dec_float_100 value = getValue(index);
+								return value >= 0 && value <= 2147483647;
+							}
+
+							// ===================================================
+							int DefaultBigDecimalFieldItem::getInteger(int index)
+							{
+								if (!isValidInteger(index))
+								{
+									throw new PlcIncompatibleDatatypeException("int", index);
+								}
+
+								return (int)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultBigDecimalFieldItem::isValidLong(int index)
+							{
+								cpp_dec_float_100 value = getValue(index);
+								return value >= -(2 ^ 63) && value <= (2 ^ 63) - 1;
+							}
+
+							// ===================================================
+							long DefaultBigDecimalFieldItem::getLong(int index)
+							{
+								if (!isValidLong(index))
+								{
+									throw new PlcIncompatibleDatatypeException("long", index);
+								}
+
+								return (long)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultBigDecimalFieldItem::isValidBigInteger(int index)
+							{
+								return true;
+							}
+
+							// ===================================================
+							long long DefaultBigDecimalFieldItem::getBigInteger(int index)
+							{
+								if (!isValidBigInteger(index))
+								{
+									throw new PlcIncompatibleDatatypeException("long long", index);
+								}
+								
+								// Todo: add conversion from cpp_dec_float_100 TO long long
+								return (long)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultBigDecimalFieldItem::isValidFloat(int index)
+							{
+								cpp_dec_float_100 value = getValue(index);
+								return value >= -3.4e38 && value <= 3.4e38;
+							}
+
+							// ===================================================
+							float DefaultBigDecimalFieldItem::getFloat(int index)
+							{
+								if (!isValidFloat(index))
+								{
+									throw new PlcIncompatibleDatatypeException("float", index);
+								}
+
+								return (float)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultBigDecimalFieldItem::isValidDouble(int index)
+							{
+								cpp_dec_float_100 value = getValue(index);
+								return value >= -1.7e308 && value <= 1.7e308;
+							}
+
+							// ===================================================
+							double DefaultBigDecimalFieldItem::getDouble(int index)
+							{
+								if (!isValidDouble(index))
+								{
+									throw new PlcIncompatibleDatatypeException("double", index);
+								}
+
+								return (double)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultBigDecimalFieldItem::isValidBigDecimal(int index)
+							{
+								// same limits but higher precision
+								return isValidDouble(index);
+							}
+
+							// ===================================================
+							cpp_dec_float_100 DefaultBigDecimalFieldItem::getBigDecimal(int index)
+							{
+								if (!isValidBigDecimal(index))
+								{
+									throw new PlcIncompatibleDatatypeException("cpp_dec_float_100", index);
+								}
+
+								return (cpp_dec_float_100)getValue(index);
+							}
+						}
+						
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBigDecimalFieldItem.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBigDecimalFieldItem.h
index 14bae84f086..d7f19868976 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBigDecimalFieldItem.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBigDecimalFieldItem.h
@@ -1,83 +1,83 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _DEFAULT_BIG_DECIMAL_FIELD_ITEM
-#define _DEFAULT_BIG_DECIMAL_FIELD_ITEM
-
-#include <boost/multiprecision/cpp_dec_float.hpp>
-#include "BaseDefaultFieldItem.h"
-
-using namespace org::apache::plc4x::cpp::api::exceptions;
-using namespace boost::multiprecision;
-
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{					
-						namespace items
-						{
-							
-							class DefaultBigDecimalFieldItem : public BaseDefaultFieldItem<cpp_dec_float_100>
-							{
-
-							public:
-								template<typename T>
-								DefaultBigDecimalFieldItem(std::vector<T> values);	
-
-								template<typename T>
-								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
-								inline bool isValidBoolean(int index) {	return getValue(index) <= 1 && getValue(index) >= 0;	}
-								bool getBoolean(int index);
-								bool isValidByte(int index);
-								char getByte(int index);
-								bool isValidShort(int index);
-								short getShort(int index);
-								bool isValidInteger(int index);
-								int getInteger(int index);
-								bool isValidLong(int index);
-								long getLong(int index);
-								bool isValidBigInteger(int index);
-								long long getBigInteger(int index);
-								bool isValidFloat(int index);
-								float getFloat(int index);
-								bool isValidDouble(int index);
-								double getDouble(int index);
-								bool isValidBigDecimal(int index);
-								cpp_dec_float_100 getBigDecimal(int index);
-
-							private:
-							};
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _DEFAULT_BIG_DECIMAL_FIELD_ITEM
+#define _DEFAULT_BIG_DECIMAL_FIELD_ITEM
+
+#include <boost/multiprecision/cpp_dec_float.hpp>
+#include "BaseDefaultFieldItem.h"
+
+using namespace org::apache::plc4x::cpp::api::exceptions;
+using namespace boost::multiprecision;
+
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{					
+						namespace items
+						{
+							
+							class DefaultBigDecimalFieldItem : public BaseDefaultFieldItem<cpp_dec_float_100>
+							{
+
+							public:
+								template<typename T>
+								DefaultBigDecimalFieldItem(std::vector<T> values);	
+
+								template<typename T>
+								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
+								inline bool isValidBoolean(int index) {	return getValue(index) <= 1 && getValue(index) >= 0;	}
+								bool getBoolean(int index);
+								bool isValidByte(int index);
+								char getByte(int index);
+								bool isValidShort(int index);
+								short getShort(int index);
+								bool isValidInteger(int index);
+								int getInteger(int index);
+								bool isValidLong(int index);
+								long getLong(int index);
+								bool isValidBigInteger(int index);
+								long long getBigInteger(int index);
+								bool isValidFloat(int index);
+								float getFloat(int index);
+								bool isValidDouble(int index);
+								double getDouble(int index);
+								bool isValidBigDecimal(int index);
+								cpp_dec_float_100 getBigDecimal(int index);
+
+							private:
+							};
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBigIntegerFieldItem.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBigIntegerFieldItem.cpp
index fb1266e355b..7275f0d4998 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBigIntegerFieldItem.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBigIntegerFieldItem.cpp
@@ -1,201 +1,201 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "DefaultBigIntegerFieldItem.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						namespace items
-						{
-							// ==================================================
-							bool DefaultBigIntegerFieldItem::getBoolean(int index)
-							{
-								if (!isValidBoolean(index))
-								{
-									throw new PlcIncompatibleDatatypeException("bool", index);
-								}
-
-								return getValue(index) == 1;
-							}
-
-							// ===================================================
-							bool DefaultBigIntegerFieldItem::isValidByte(int index)
-							{
-                                long long value = getValue(index);
-								return value <= -127 && value >= -128;
-							}
-
-							// ===================================================
-							char DefaultBigIntegerFieldItem::getByte(int index)
-							{
-								if (!isValidByte(index)) 
-								{
-									throw new PlcIncompatibleDatatypeException("char", index);
-								}
-
-                                long long value = getValue(index);
-								
-								return (char) getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultBigIntegerFieldItem::isValidShort(int index)
-							{
-                                long long value = getValue(index);
-
-								return value >= -32768 && value <= 32767;
-							}
-
-							// ===================================================
-							short DefaultBigIntegerFieldItem::getShort(int index)
-							{
-								if (!isValidShort(index))
-								{
-									throw new PlcIncompatibleDatatypeException("short", index);
-								}
-								
-								return (short)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultBigIntegerFieldItem::isValidInteger(int index)
-							{
-                                long long value = getValue(index);
-
-								return value >= 0 && value <= 2147483647;
-							}
-
-							// ===================================================
-							int DefaultBigIntegerFieldItem::getInteger(int index)
-							{
-								if (!isValidInteger(index))
-								{
-									throw new PlcIncompatibleDatatypeException("int", index);
-								}
-
-								return (int)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultBigIntegerFieldItem::isValidLong(int index)
-							{
-                                long long value = getValue(index);
-
-								return value >= -(2 ^ 63) && value <= (2 ^ 63) - 1;
-							}
-
-							// ===================================================
-							long DefaultBigIntegerFieldItem::getLong(int index)
-							{
-								if (!isValidLong(index))
-								{
-									throw new PlcIncompatibleDatatypeException("long", index);
-								}
-
-								return (long)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultBigIntegerFieldItem::isValidBigInteger(int index)
-							{
-								return true;
-							}
-
-							// ===================================================
-                            long long DefaultBigIntegerFieldItem::getBigInteger(int index)
-							{
-								if (!isValidBigInteger(index))
-								{
-									throw new PlcIncompatibleDatatypeException("long long", index);
-								}
-								
-								// Todo: add conversion from cpp_dec_float_100 TO InfInt
-								return (long)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultBigIntegerFieldItem::isValidFloat(int index)
-							{
-                                long long value = getValue(index);
-								return value >= -3.4e38 && value <= 3.4e38;
-							}
-
-							// ===================================================
-							float DefaultBigIntegerFieldItem::getFloat(int index)
-							{
-								if (!isValidFloat(index))
-								{
-									throw new PlcIncompatibleDatatypeException("float", index);
-								}
-
-								return (float)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultBigIntegerFieldItem::isValidDouble(int index)
-							{
-                                long long value = getValue(index);
-								return value >= -1.7e308 && value <= 1.7e308;
-							}
-
-							// ===================================================
-							double DefaultBigIntegerFieldItem::getDouble(int index)
-							{
-								if (!isValidDouble(index))
-								{
-									throw new PlcIncompatibleDatatypeException("double", index);
-								}
-
-								return (double)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultBigIntegerFieldItem::isValidBigDecimal(int index)
-							{
-								return true;
-							}
-
-							// ===================================================
-							cpp_dec_float_100 DefaultBigIntegerFieldItem::getBigDecimal(int index)
-							{
-								if (!isValidDouble(index))
-								{
-									throw new PlcIncompatibleDatatypeException("cpp_dec_float_100", index);
-								}
-
-								return (cpp_dec_float_100)getValue(index);
-							}
-						}
-						
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "DefaultBigIntegerFieldItem.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						namespace items
+						{
+							// ==================================================
+							bool DefaultBigIntegerFieldItem::getBoolean(int index)
+							{
+								if (!isValidBoolean(index))
+								{
+									throw new PlcIncompatibleDatatypeException("bool", index);
+								}
+
+								return getValue(index) == 1;
+							}
+
+							// ===================================================
+							bool DefaultBigIntegerFieldItem::isValidByte(int index)
+							{
+                                long long value = getValue(index);
+								return value <= -127 && value >= -128;
+							}
+
+							// ===================================================
+							char DefaultBigIntegerFieldItem::getByte(int index)
+							{
+								if (!isValidByte(index)) 
+								{
+									throw new PlcIncompatibleDatatypeException("char", index);
+								}
+
+                                long long value = getValue(index);
+								
+								return (char) getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultBigIntegerFieldItem::isValidShort(int index)
+							{
+                                long long value = getValue(index);
+
+								return value >= -32768 && value <= 32767;
+							}
+
+							// ===================================================
+							short DefaultBigIntegerFieldItem::getShort(int index)
+							{
+								if (!isValidShort(index))
+								{
+									throw new PlcIncompatibleDatatypeException("short", index);
+								}
+								
+								return (short)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultBigIntegerFieldItem::isValidInteger(int index)
+							{
+                                long long value = getValue(index);
+
+								return value >= 0 && value <= 2147483647;
+							}
+
+							// ===================================================
+							int DefaultBigIntegerFieldItem::getInteger(int index)
+							{
+								if (!isValidInteger(index))
+								{
+									throw new PlcIncompatibleDatatypeException("int", index);
+								}
+
+								return (int)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultBigIntegerFieldItem::isValidLong(int index)
+							{
+                                long long value = getValue(index);
+
+								return value >= -(2 ^ 63) && value <= (2 ^ 63) - 1;
+							}
+
+							// ===================================================
+							long DefaultBigIntegerFieldItem::getLong(int index)
+							{
+								if (!isValidLong(index))
+								{
+									throw new PlcIncompatibleDatatypeException("long", index);
+								}
+
+								return (long)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultBigIntegerFieldItem::isValidBigInteger(int index)
+							{
+								return true;
+							}
+
+							// ===================================================
+                            long long DefaultBigIntegerFieldItem::getBigInteger(int index)
+							{
+								if (!isValidBigInteger(index))
+								{
+									throw new PlcIncompatibleDatatypeException("long long", index);
+								}
+								
+								// Todo: add conversion from cpp_dec_float_100 TO InfInt
+								return (long)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultBigIntegerFieldItem::isValidFloat(int index)
+							{
+                                long long value = getValue(index);
+								return value >= -3.4e38 && value <= 3.4e38;
+							}
+
+							// ===================================================
+							float DefaultBigIntegerFieldItem::getFloat(int index)
+							{
+								if (!isValidFloat(index))
+								{
+									throw new PlcIncompatibleDatatypeException("float", index);
+								}
+
+								return (float)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultBigIntegerFieldItem::isValidDouble(int index)
+							{
+                                long long value = getValue(index);
+								return value >= -1.7e308 && value <= 1.7e308;
+							}
+
+							// ===================================================
+							double DefaultBigIntegerFieldItem::getDouble(int index)
+							{
+								if (!isValidDouble(index))
+								{
+									throw new PlcIncompatibleDatatypeException("double", index);
+								}
+
+								return (double)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultBigIntegerFieldItem::isValidBigDecimal(int index)
+							{
+								return true;
+							}
+
+							// ===================================================
+							cpp_dec_float_100 DefaultBigIntegerFieldItem::getBigDecimal(int index)
+							{
+								if (!isValidDouble(index))
+								{
+									throw new PlcIncompatibleDatatypeException("cpp_dec_float_100", index);
+								}
+
+								return (cpp_dec_float_100)getValue(index);
+							}
+						}
+						
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBigIntegerFieldItem.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBigIntegerFieldItem.h
index 817d5344cdf..a9c497788e5 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBigIntegerFieldItem.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBigIntegerFieldItem.h
@@ -1,84 +1,84 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _DEFAULT_BIG_INTEGER_FIELD_ITEM
-#define _DEFAULT_BIG_INTEGER_FIELD_ITEM
-
-#include <boost/multiprecision/cpp_dec_float.hpp>
-#include "BaseDefaultFieldItem.h"
-
-using namespace org::apache::plc4x::cpp::api::exceptions;
-using namespace boost::multiprecision;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{					
-						namespace items
-						{
-							
-							class DefaultBigIntegerFieldItem : public BaseDefaultFieldItem<long long>
-							{
-
-							public:
-								template<typename T>
-								DefaultBigIntegerFieldItem(std::vector<T> values);
-
-								template<typename T>
-								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
-
-								inline bool isValidBoolean(int index) {	return getValue(index) <= 1 && getValue(index) >= 0;	}
-								bool getBoolean(int index);
-								bool isValidByte(int index);
-								char getByte(int index);
-								bool isValidShort(int index);
-								short getShort(int index);
-								bool isValidInteger(int index);
-								int getInteger(int index);
-								bool isValidLong(int index);
-								long getLong(int index);
-								bool isValidBigInteger(int index);
-                                long long getBigInteger(int index);
-								bool isValidFloat(int index);
-								float getFloat(int index);
-								bool isValidDouble(int index);
-								double getDouble(int index);
-								bool isValidBigDecimal(int index);
-								cpp_dec_float_100 getBigDecimal(int index);
-
-							private:
-							};
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _DEFAULT_BIG_INTEGER_FIELD_ITEM
+#define _DEFAULT_BIG_INTEGER_FIELD_ITEM
+
+#include <boost/multiprecision/cpp_dec_float.hpp>
+#include "BaseDefaultFieldItem.h"
+
+using namespace org::apache::plc4x::cpp::api::exceptions;
+using namespace boost::multiprecision;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{					
+						namespace items
+						{
+							
+							class DefaultBigIntegerFieldItem : public BaseDefaultFieldItem<long long>
+							{
+
+							public:
+								template<typename T>
+								DefaultBigIntegerFieldItem(std::vector<T> values);
+
+								template<typename T>
+								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
+
+								inline bool isValidBoolean(int index) {	return getValue(index) <= 1 && getValue(index) >= 0;	}
+								bool getBoolean(int index);
+								bool isValidByte(int index);
+								char getByte(int index);
+								bool isValidShort(int index);
+								short getShort(int index);
+								bool isValidInteger(int index);
+								int getInteger(int index);
+								bool isValidLong(int index);
+								long getLong(int index);
+								bool isValidBigInteger(int index);
+                                long long getBigInteger(int index);
+								bool isValidFloat(int index);
+								float getFloat(int index);
+								bool isValidDouble(int index);
+								double getDouble(int index);
+								bool isValidBigDecimal(int index);
+								cpp_dec_float_100 getBigDecimal(int index);
+
+							private:
+							};
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBooleanFieldItem.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBooleanFieldItem.cpp
index 38c69b941b0..8a96dc870c4 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBooleanFieldItem.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBooleanFieldItem.cpp
@@ -1,189 +1,189 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "DefaultBooleanFieldItem.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						namespace items
-						{
-							// ==================================================
-							bool DefaultBooleanFieldItem::getBoolean(int index)
-							{
-								if (!isValidBoolean(index))
-								{
-									throw new PlcIncompatibleDatatypeException("bool", index);
-								}
-
-								return getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultBooleanFieldItem::isValidByte(int index)
-							{
-								return true;
-							}
-
-							// ===================================================
-							char DefaultBooleanFieldItem::getByte(int index)
-							{
-								if (!isValidByte(index)) 
-								{
-									throw new PlcIncompatibleDatatypeException("char", index);
-								}
-								return (char) getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultBooleanFieldItem::isValidShort(int index)
-							{
-								return true;
-							}
-
-							// ===================================================
-							short DefaultBooleanFieldItem::getShort(int index)
-							{
-								if (!isValidShort(index))
-								{
-									throw new PlcIncompatibleDatatypeException("short", index);
-								}
-								
-								return (short)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultBooleanFieldItem::isValidInteger(int index)
-							{
-								return true;
-							}
-
-							// ===================================================
-							int DefaultBooleanFieldItem::getInteger(int index)
-							{
-								if (!isValidInteger(index))
-								{
-									throw new PlcIncompatibleDatatypeException("int", index);
-								}
-
-								return (int)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultBooleanFieldItem::isValidLong(int index)
-							{
-								return true;
-							}
-
-							// ===================================================
-							long DefaultBooleanFieldItem::getLong(int index)
-							{
-								if (!isValidLong(index))
-								{
-									throw new PlcIncompatibleDatatypeException("long", index);
-								}
-
-								return (long)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultBooleanFieldItem::isValidBigInteger(int index)
-							{
-								return true;
-							}
-
-							// ===================================================
-							long long DefaultBooleanFieldItem::getBigInteger(int index)
-							{
-								if (!isValidBigInteger(index))
-								{
-									throw new PlcIncompatibleDatatypeException("long long", index);
-								}
-								
-								// Todo: add conversion from cpp_dec_float_100 TO long long
-								return (long)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultBooleanFieldItem::isValidFloat(int index)
-							{
-								return true;
-							}
-
-							// ===================================================
-							float DefaultBooleanFieldItem::getFloat(int index)
-							{
-								if (!isValidFloat(index))
-								{
-									throw new PlcIncompatibleDatatypeException("float", index);
-								}
-
-								return (float)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultBooleanFieldItem::isValidDouble(int index)
-							{
-								return true;
-							}
-
-							// ===================================================
-							double DefaultBooleanFieldItem::getDouble(int index)
-							{
-								if (!isValidDouble(index))
-								{
-									throw new PlcIncompatibleDatatypeException("double", index);
-								}
-
-								return (double)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultBooleanFieldItem::isValidBigDecimal(int index)
-							{
-								return true;
-							}
-
-							// ===================================================
-							cpp_dec_float_100 DefaultBooleanFieldItem::getBigDecimal(int index)
-							{
-								if (!isValidBigDecimal(index))
-								{
-									throw new PlcIncompatibleDatatypeException("cpp_dec_float_100", index);
-								}
-
-								return (cpp_dec_float_100)getValue(index);
-							}
-						}
-						
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "DefaultBooleanFieldItem.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						namespace items
+						{
+							// ==================================================
+							bool DefaultBooleanFieldItem::getBoolean(int index)
+							{
+								if (!isValidBoolean(index))
+								{
+									throw new PlcIncompatibleDatatypeException("bool", index);
+								}
+
+								return getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultBooleanFieldItem::isValidByte(int index)
+							{
+								return true;
+							}
+
+							// ===================================================
+							char DefaultBooleanFieldItem::getByte(int index)
+							{
+								if (!isValidByte(index)) 
+								{
+									throw new PlcIncompatibleDatatypeException("char", index);
+								}
+								return (char) getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultBooleanFieldItem::isValidShort(int index)
+							{
+								return true;
+							}
+
+							// ===================================================
+							short DefaultBooleanFieldItem::getShort(int index)
+							{
+								if (!isValidShort(index))
+								{
+									throw new PlcIncompatibleDatatypeException("short", index);
+								}
+								
+								return (short)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultBooleanFieldItem::isValidInteger(int index)
+							{
+								return true;
+							}
+
+							// ===================================================
+							int DefaultBooleanFieldItem::getInteger(int index)
+							{
+								if (!isValidInteger(index))
+								{
+									throw new PlcIncompatibleDatatypeException("int", index);
+								}
+
+								return (int)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultBooleanFieldItem::isValidLong(int index)
+							{
+								return true;
+							}
+
+							// ===================================================
+							long DefaultBooleanFieldItem::getLong(int index)
+							{
+								if (!isValidLong(index))
+								{
+									throw new PlcIncompatibleDatatypeException("long", index);
+								}
+
+								return (long)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultBooleanFieldItem::isValidBigInteger(int index)
+							{
+								return true;
+							}
+
+							// ===================================================
+							long long DefaultBooleanFieldItem::getBigInteger(int index)
+							{
+								if (!isValidBigInteger(index))
+								{
+									throw new PlcIncompatibleDatatypeException("long long", index);
+								}
+								
+								// Todo: add conversion from cpp_dec_float_100 TO long long
+								return (long)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultBooleanFieldItem::isValidFloat(int index)
+							{
+								return true;
+							}
+
+							// ===================================================
+							float DefaultBooleanFieldItem::getFloat(int index)
+							{
+								if (!isValidFloat(index))
+								{
+									throw new PlcIncompatibleDatatypeException("float", index);
+								}
+
+								return (float)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultBooleanFieldItem::isValidDouble(int index)
+							{
+								return true;
+							}
+
+							// ===================================================
+							double DefaultBooleanFieldItem::getDouble(int index)
+							{
+								if (!isValidDouble(index))
+								{
+									throw new PlcIncompatibleDatatypeException("double", index);
+								}
+
+								return (double)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultBooleanFieldItem::isValidBigDecimal(int index)
+							{
+								return true;
+							}
+
+							// ===================================================
+							cpp_dec_float_100 DefaultBooleanFieldItem::getBigDecimal(int index)
+							{
+								if (!isValidBigDecimal(index))
+								{
+									throw new PlcIncompatibleDatatypeException("cpp_dec_float_100", index);
+								}
+
+								return (cpp_dec_float_100)getValue(index);
+							}
+						}
+						
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBooleanFieldItem.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBooleanFieldItem.h
index eda13a3f963..cc2910f87b5 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBooleanFieldItem.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBooleanFieldItem.h
@@ -1,80 +1,80 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-#ifndef _DEFAULT_BIG_BOOLEAN_FIELD_ITEM
-#define _DEFAULT_BIG_BOOLEAN_FIELD_ITEM
-
-#include <boost/multiprecision/cpp_dec_float.hpp>
-#include "BaseDefaultFieldItem.h"
-
-using namespace org::apache::plc4x::cpp::api::exceptions;
-using namespace boost::multiprecision;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{					
-						namespace items
-						{							
-							class DefaultBooleanFieldItem : public BaseDefaultFieldItem<bool>
-							{
-
-							public:
-								template<typename T>
-								DefaultBooleanFieldItem(std::vector<T> values);
-
-								template<typename T>
-								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
-								inline bool isValidBoolean(int index) {	return true;	}
-								bool getBoolean(int index);
-								bool isValidByte(int index);
-								char getByte(int index);
-								bool isValidShort(int index);
-								short getShort(int index);
-								bool isValidInteger(int index);
-								int getInteger(int index);
-								bool isValidLong(int index);
-								long getLong(int index);
-								bool isValidBigInteger(int index);
-								long long getBigInteger(int index);
-								bool isValidFloat(int index);
-								float getFloat(int index);
-								bool isValidDouble(int index);
-								double getDouble(int index);
-								bool isValidBigDecimal(int index);
-								cpp_dec_float_100 getBigDecimal(int index);
-
-							private:
-							};
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
-#endif
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+#ifndef _DEFAULT_BIG_BOOLEAN_FIELD_ITEM
+#define _DEFAULT_BIG_BOOLEAN_FIELD_ITEM
+
+#include <boost/multiprecision/cpp_dec_float.hpp>
+#include "BaseDefaultFieldItem.h"
+
+using namespace org::apache::plc4x::cpp::api::exceptions;
+using namespace boost::multiprecision;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{					
+						namespace items
+						{							
+							class DefaultBooleanFieldItem : public BaseDefaultFieldItem<bool>
+							{
+
+							public:
+								template<typename T>
+								DefaultBooleanFieldItem(std::vector<T> values);
+
+								template<typename T>
+								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
+								inline bool isValidBoolean(int index) {	return true;	}
+								bool getBoolean(int index);
+								bool isValidByte(int index);
+								char getByte(int index);
+								bool isValidShort(int index);
+								short getShort(int index);
+								bool isValidInteger(int index);
+								int getInteger(int index);
+								bool isValidLong(int index);
+								long getLong(int index);
+								bool isValidBigInteger(int index);
+								long long getBigInteger(int index);
+								bool isValidFloat(int index);
+								float getFloat(int index);
+								bool isValidDouble(int index);
+								double getDouble(int index);
+								bool isValidBigDecimal(int index);
+								cpp_dec_float_100 getBigDecimal(int index);
+
+							private:
+							};
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultByteArrayFieldItem.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultByteArrayFieldItem.cpp
index e5957e6466e..ba122036a41 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultByteArrayFieldItem.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultByteArrayFieldItem.cpp
@@ -1,196 +1,196 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "DefaultByteArrayFieldItem.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						namespace items
-						{
-							// ==================================================
-							bool DefaultByteArrayFieldItem::getBoolean(int index)
-							{
-								if (!isValidBoolean(index))
-								{
-									throw new PlcIncompatibleDatatypeException("bool", index);
-								}
-
-								return getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultByteArrayFieldItem::isValidByte(int index)
-							{
-								char value = getValue(index);
-								return value <= -127 && value >= -128;
-							}
-
-							// ===================================================
-							char DefaultByteArrayFieldItem::getByte(int index)
-							{
-								if (!isValidByte(index)) 
-								{
-									throw new PlcIncompatibleDatatypeException("char", index);
-								}
-								return (char) getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultByteArrayFieldItem::isValidShort(int index)
-							{
-								char value = getValue(index);
-								return value >= -32768 && value <= 32767;
-							}
-
-							// ===================================================
-							short DefaultByteArrayFieldItem::getShort(int index)
-							{
-								if (!isValidShort(index))
-								{
-									throw new PlcIncompatibleDatatypeException("short", index);
-								}
-								
-								return (short)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultByteArrayFieldItem::isValidInteger(int index)
-							{
-								char value = getValue(index);
-								return value >= 0 && value <= 2147483647;
-							}
-
-							// ===================================================
-							int DefaultByteArrayFieldItem::getInteger(int index)
-							{
-								if (!isValidInteger(index))
-								{
-									throw new PlcIncompatibleDatatypeException("int", index);
-								}
-
-								return (int)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultByteArrayFieldItem::isValidLong(int index)
-							{
-								char value = getValue(index);
-								return value >= -(2 ^ 63) && value <= (2 ^ 63) - 1;
-							}
-
-							// ===================================================
-							long DefaultByteArrayFieldItem::getLong(int index)
-							{
-								if (!isValidLong(index))
-								{
-									throw new PlcIncompatibleDatatypeException("long", index);
-								}
-
-								return (long)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultByteArrayFieldItem::isValidBigInteger(int index)
-							{
-								return true;
-							}
-
-							// ===================================================
-                            long long DefaultByteArrayFieldItem::getBigInteger(int index)
-							{
-								if (!isValidBigInteger(index))
-								{
-									throw new PlcIncompatibleDatatypeException("long long", index);
-								}
-								
-								// Todo: add conversion from cpp_dec_float_100 TO InfInt
-								return (long)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultByteArrayFieldItem::isValidFloat(int index)
-							{
-								char value = getValue(index);
-								return value >= -3.4e38 && value <= 3.4e38;
-							}
-
-							// ===================================================
-							float DefaultByteArrayFieldItem::getFloat(int index)
-							{
-								if (!isValidFloat(index))
-								{
-									throw new PlcIncompatibleDatatypeException("float", index);
-								}
-
-								return (float)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultByteArrayFieldItem::isValidDouble(int index)
-							{
-								char value = getValue(index);
-								return value >= -1.7e308 && value <= 1.7e308;
-							}
-
-							// ===================================================
-							double DefaultByteArrayFieldItem::getDouble(int index)
-							{
-								if (!isValidDouble(index))
-								{
-									throw new PlcIncompatibleDatatypeException("double", index);
-								}
-
-								return (double)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultByteArrayFieldItem::isValidBigDecimal(int index)
-							{
-								// same limits but higher precision
-								return isValidDouble(index);
-							}
-
-							// ===================================================
-							cpp_dec_float_100 DefaultByteArrayFieldItem::getBigDecimal(int index)
-							{
-								if (!isValidBigDecimal(index))
-								{
-									throw new PlcIncompatibleDatatypeException("cpp_dec_float_100", index);
-								}
-
-								return (cpp_dec_float_100)getValue(index);
-							}
-						}
-						
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "DefaultByteArrayFieldItem.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						namespace items
+						{
+							// ==================================================
+							bool DefaultByteArrayFieldItem::getBoolean(int index)
+							{
+								if (!isValidBoolean(index))
+								{
+									throw new PlcIncompatibleDatatypeException("bool", index);
+								}
+
+								return getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultByteArrayFieldItem::isValidByte(int index)
+							{
+								char value = getValue(index);
+								return value <= -127 && value >= -128;
+							}
+
+							// ===================================================
+							char DefaultByteArrayFieldItem::getByte(int index)
+							{
+								if (!isValidByte(index)) 
+								{
+									throw new PlcIncompatibleDatatypeException("char", index);
+								}
+								return (char) getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultByteArrayFieldItem::isValidShort(int index)
+							{
+								char value = getValue(index);
+								return value >= -32768 && value <= 32767;
+							}
+
+							// ===================================================
+							short DefaultByteArrayFieldItem::getShort(int index)
+							{
+								if (!isValidShort(index))
+								{
+									throw new PlcIncompatibleDatatypeException("short", index);
+								}
+								
+								return (short)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultByteArrayFieldItem::isValidInteger(int index)
+							{
+								char value = getValue(index);
+								return value >= 0 && value <= 2147483647;
+							}
+
+							// ===================================================
+							int DefaultByteArrayFieldItem::getInteger(int index)
+							{
+								if (!isValidInteger(index))
+								{
+									throw new PlcIncompatibleDatatypeException("int", index);
+								}
+
+								return (int)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultByteArrayFieldItem::isValidLong(int index)
+							{
+								char value = getValue(index);
+								return value >= -(2 ^ 63) && value <= (2 ^ 63) - 1;
+							}
+
+							// ===================================================
+							long DefaultByteArrayFieldItem::getLong(int index)
+							{
+								if (!isValidLong(index))
+								{
+									throw new PlcIncompatibleDatatypeException("long", index);
+								}
+
+								return (long)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultByteArrayFieldItem::isValidBigInteger(int index)
+							{
+								return true;
+							}
+
+							// ===================================================
+                            long long DefaultByteArrayFieldItem::getBigInteger(int index)
+							{
+								if (!isValidBigInteger(index))
+								{
+									throw new PlcIncompatibleDatatypeException("long long", index);
+								}
+								
+								// Todo: add conversion from cpp_dec_float_100 TO InfInt
+								return (long)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultByteArrayFieldItem::isValidFloat(int index)
+							{
+								char value = getValue(index);
+								return value >= -3.4e38 && value <= 3.4e38;
+							}
+
+							// ===================================================
+							float DefaultByteArrayFieldItem::getFloat(int index)
+							{
+								if (!isValidFloat(index))
+								{
+									throw new PlcIncompatibleDatatypeException("float", index);
+								}
+
+								return (float)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultByteArrayFieldItem::isValidDouble(int index)
+							{
+								char value = getValue(index);
+								return value >= -1.7e308 && value <= 1.7e308;
+							}
+
+							// ===================================================
+							double DefaultByteArrayFieldItem::getDouble(int index)
+							{
+								if (!isValidDouble(index))
+								{
+									throw new PlcIncompatibleDatatypeException("double", index);
+								}
+
+								return (double)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultByteArrayFieldItem::isValidBigDecimal(int index)
+							{
+								// same limits but higher precision
+								return isValidDouble(index);
+							}
+
+							// ===================================================
+							cpp_dec_float_100 DefaultByteArrayFieldItem::getBigDecimal(int index)
+							{
+								if (!isValidBigDecimal(index))
+								{
+									throw new PlcIncompatibleDatatypeException("cpp_dec_float_100", index);
+								}
+
+								return (cpp_dec_float_100)getValue(index);
+							}
+						}
+						
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultByteArrayFieldItem.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultByteArrayFieldItem.h
index 9275f0142b4..3baec033c94 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultByteArrayFieldItem.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultByteArrayFieldItem.h
@@ -1,81 +1,81 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _DEFAULT_BYTE_ARRAY_FIELD_ITEM
-#define _DEFAULT_BYTE_ARRAY_FIELD_ITEM
-
-#include <boost/multiprecision/cpp_dec_float.hpp>
-#include "BaseDefaultFieldItem.h"
-
-using namespace org::apache::plc4x::cpp::api::exceptions;
-using namespace boost::multiprecision;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{					
-						namespace items
-						{							
-							class DefaultByteArrayFieldItem : public BaseDefaultFieldItem<char>
-							{
-
-							public:
-								template<typename T>
-								DefaultByteArrayFieldItem(std::vector<T> values);
-
-								template<typename T>
-								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
-								inline bool isValidBoolean(int index) {	return true;	}
-								bool getBoolean(int index);
-								bool isValidByte(int index);
-								char getByte(int index);
-								bool isValidShort(int index);
-								short getShort(int index);
-								bool isValidInteger(int index);
-								int getInteger(int index);
-								bool isValidLong(int index);
-								long getLong(int index);
-								bool isValidBigInteger(int index);
-                                long long getBigInteger(int index);
-								bool isValidFloat(int index);
-								float getFloat(int index);
-								bool isValidDouble(int index);
-								double getDouble(int index);
-								bool isValidBigDecimal(int index);
-								cpp_dec_float_100 getBigDecimal(int index);
-
-							private:
-							};
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _DEFAULT_BYTE_ARRAY_FIELD_ITEM
+#define _DEFAULT_BYTE_ARRAY_FIELD_ITEM
+
+#include <boost/multiprecision/cpp_dec_float.hpp>
+#include "BaseDefaultFieldItem.h"
+
+using namespace org::apache::plc4x::cpp::api::exceptions;
+using namespace boost::multiprecision;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{					
+						namespace items
+						{							
+							class DefaultByteArrayFieldItem : public BaseDefaultFieldItem<char>
+							{
+
+							public:
+								template<typename T>
+								DefaultByteArrayFieldItem(std::vector<T> values);
+
+								template<typename T>
+								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
+								inline bool isValidBoolean(int index) {	return true;	}
+								bool getBoolean(int index);
+								bool isValidByte(int index);
+								char getByte(int index);
+								bool isValidShort(int index);
+								short getShort(int index);
+								bool isValidInteger(int index);
+								int getInteger(int index);
+								bool isValidLong(int index);
+								long getLong(int index);
+								bool isValidBigInteger(int index);
+                                long long getBigInteger(int index);
+								bool isValidFloat(int index);
+								float getFloat(int index);
+								bool isValidDouble(int index);
+								double getDouble(int index);
+								bool isValidBigDecimal(int index);
+								cpp_dec_float_100 getBigDecimal(int index);
+
+							private:
+							};
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultByteFieldItem.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultByteFieldItem.cpp
index 0453ff0fb27..6240cf31791 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultByteFieldItem.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultByteFieldItem.cpp
@@ -1,195 +1,195 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "DefaultByteFieldItem.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						namespace items
-						{
-							// ==================================================
-							bool DefaultByteFieldItem::getBoolean(int index)
-							{
-								if (!isValidBoolean(index))
-								{
-									throw new PlcIncompatibleDatatypeException("bool", index);
-								}
-
-								return getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultByteFieldItem::isValidByte(int index)
-							{
-								char value = getValue(index);
-								return value <= -127 && value >= -128;
-							}
-
-							// ===================================================
-							char DefaultByteFieldItem::getByte(int index)
-							{
-								if (!isValidByte(index)) 
-								{
-									throw new PlcIncompatibleDatatypeException("char", index);
-								}
-								return (char) getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultByteFieldItem::isValidShort(int index)
-							{
-								return true;
-							}
-
-							// ===================================================
-							short DefaultByteFieldItem::getShort(int index)
-							{
-								if (!isValidShort(index))
-								{
-									throw new PlcIncompatibleDatatypeException("short", index);
-								}
-								
-								return (short)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultByteFieldItem::isValidInteger(int index)
-							{
-								char value = getValue(index);
-								return value >= 0;
-							}
-
-							// ===================================================
-							int DefaultByteFieldItem::getInteger(int index)
-							{
-								if (!isValidInteger(index))
-								{
-									throw new PlcIncompatibleDatatypeException("int", index);
-								}
-
-								return (int)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultByteFieldItem::isValidLong(int index)
-							{
-								char value = getValue(index);
-								return value >= -(2 ^ 63) && value <= (2 ^ 63) - 1;
-							}
-
-							// ===================================================
-							long DefaultByteFieldItem::getLong(int index)
-							{
-								if (!isValidLong(index))
-								{
-									throw new PlcIncompatibleDatatypeException("long", index);
-								}
-
-								return (long)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultByteFieldItem::isValidBigInteger(int index)
-							{
-								return true;
-							}
-
-							// ===================================================
-							long long DefaultByteFieldItem::getBigInteger(int index)
-							{
-								if (!isValidBigInteger(index))
-								{
-									throw new PlcIncompatibleDatatypeException("long long", index);
-								}
-								
-								// Todo: add conversion from cpp_dec_float_100 TO long long
-								return (long)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultByteFieldItem::isValidFloat(int index)
-							{
-								char value = getValue(index);
-								return value >= -3.4e38 && value <= 3.4e38;
-							}
-
-							// ===================================================
-							float DefaultByteFieldItem::getFloat(int index)
-							{
-								if (!isValidFloat(index))
-								{
-									throw new PlcIncompatibleDatatypeException("float", index);
-								}
-
-								return (float)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultByteFieldItem::isValidDouble(int index)
-							{
-								char value = getValue(index);
-								return value >= -1.7e308 && value <= 1.7e308;
-							}
-
-							// ===================================================
-							double DefaultByteFieldItem::getDouble(int index)
-							{
-								if (!isValidDouble(index))
-								{
-									throw new PlcIncompatibleDatatypeException("double", index);
-								}
-
-								return (double)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultByteFieldItem::isValidBigDecimal(int index)
-							{
-								// same limits but higher precision
-								return isValidDouble(index);
-							}
-
-							// ===================================================
-							cpp_dec_float_100 DefaultByteFieldItem::getBigDecimal(int index)
-							{
-								if (!isValidBigDecimal(index))
-								{
-									throw new PlcIncompatibleDatatypeException("cpp_dec_float_100", index);
-								}
-
-								return (cpp_dec_float_100)getValue(index);
-							}
-						}
-						
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "DefaultByteFieldItem.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						namespace items
+						{
+							// ==================================================
+							bool DefaultByteFieldItem::getBoolean(int index)
+							{
+								if (!isValidBoolean(index))
+								{
+									throw new PlcIncompatibleDatatypeException("bool", index);
+								}
+
+								return getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultByteFieldItem::isValidByte(int index)
+							{
+								char value = getValue(index);
+								return value <= -127 && value >= -128;
+							}
+
+							// ===================================================
+							char DefaultByteFieldItem::getByte(int index)
+							{
+								if (!isValidByte(index)) 
+								{
+									throw new PlcIncompatibleDatatypeException("char", index);
+								}
+								return (char) getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultByteFieldItem::isValidShort(int index)
+							{
+								return true;
+							}
+
+							// ===================================================
+							short DefaultByteFieldItem::getShort(int index)
+							{
+								if (!isValidShort(index))
+								{
+									throw new PlcIncompatibleDatatypeException("short", index);
+								}
+								
+								return (short)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultByteFieldItem::isValidInteger(int index)
+							{
+								char value = getValue(index);
+								return value >= 0;
+							}
+
+							// ===================================================
+							int DefaultByteFieldItem::getInteger(int index)
+							{
+								if (!isValidInteger(index))
+								{
+									throw new PlcIncompatibleDatatypeException("int", index);
+								}
+
+								return (int)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultByteFieldItem::isValidLong(int index)
+							{
+								char value = getValue(index);
+								return value >= -(2 ^ 63) && value <= (2 ^ 63) - 1;
+							}
+
+							// ===================================================
+							long DefaultByteFieldItem::getLong(int index)
+							{
+								if (!isValidLong(index))
+								{
+									throw new PlcIncompatibleDatatypeException("long", index);
+								}
+
+								return (long)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultByteFieldItem::isValidBigInteger(int index)
+							{
+								return true;
+							}
+
+							// ===================================================
+							long long DefaultByteFieldItem::getBigInteger(int index)
+							{
+								if (!isValidBigInteger(index))
+								{
+									throw new PlcIncompatibleDatatypeException("long long", index);
+								}
+								
+								// Todo: add conversion from cpp_dec_float_100 TO long long
+								return (long)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultByteFieldItem::isValidFloat(int index)
+							{
+								char value = getValue(index);
+								return value >= -3.4e38 && value <= 3.4e38;
+							}
+
+							// ===================================================
+							float DefaultByteFieldItem::getFloat(int index)
+							{
+								if (!isValidFloat(index))
+								{
+									throw new PlcIncompatibleDatatypeException("float", index);
+								}
+
+								return (float)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultByteFieldItem::isValidDouble(int index)
+							{
+								char value = getValue(index);
+								return value >= -1.7e308 && value <= 1.7e308;
+							}
+
+							// ===================================================
+							double DefaultByteFieldItem::getDouble(int index)
+							{
+								if (!isValidDouble(index))
+								{
+									throw new PlcIncompatibleDatatypeException("double", index);
+								}
+
+								return (double)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultByteFieldItem::isValidBigDecimal(int index)
+							{
+								// same limits but higher precision
+								return isValidDouble(index);
+							}
+
+							// ===================================================
+							cpp_dec_float_100 DefaultByteFieldItem::getBigDecimal(int index)
+							{
+								if (!isValidBigDecimal(index))
+								{
+									throw new PlcIncompatibleDatatypeException("cpp_dec_float_100", index);
+								}
+
+								return (cpp_dec_float_100)getValue(index);
+							}
+						}
+						
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultByteFieldItem.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultByteFieldItem.h
index 64715bb61e8..eb3cb527fff 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultByteFieldItem.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultByteFieldItem.h
@@ -1,81 +1,81 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _DEFAULT_BYTE_FIELD_ITEM
-#define _DEFAULT_BYTE_FIELD_ITEM
-
-#include <boost/multiprecision/cpp_dec_float.hpp>
-#include "BaseDefaultFieldItem.h"
-
-using namespace org::apache::plc4x::cpp::api::exceptions;
-using namespace boost::multiprecision;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{					
-						namespace items
-						{							
-							class DefaultByteFieldItem : public BaseDefaultFieldItem<char>
-							{
-
-							public:
-								template<typename T>
-								DefaultByteFieldItem(std::vector<T> values);
-
-								template<typename T>
-								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
-								inline bool isValidBoolean(int index) {	return true;	}
-								bool getBoolean(int index);
-								bool isValidByte(int index);
-								char getByte(int index);
-								bool isValidShort(int index);
-								short getShort(int index);
-								bool isValidInteger(int index);
-								int getInteger(int index);
-								bool isValidLong(int index);
-								long getLong(int index);
-								bool isValidBigInteger(int index);
-								long long getBigInteger(int index);
-								bool isValidFloat(int index);
-								float getFloat(int index);
-								bool isValidDouble(int index);
-								double getDouble(int index);
-								bool isValidBigDecimal(int index);
-								cpp_dec_float_100 getBigDecimal(int index);
-
-							private:
-							};
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _DEFAULT_BYTE_FIELD_ITEM
+#define _DEFAULT_BYTE_FIELD_ITEM
+
+#include <boost/multiprecision/cpp_dec_float.hpp>
+#include "BaseDefaultFieldItem.h"
+
+using namespace org::apache::plc4x::cpp::api::exceptions;
+using namespace boost::multiprecision;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{					
+						namespace items
+						{							
+							class DefaultByteFieldItem : public BaseDefaultFieldItem<char>
+							{
+
+							public:
+								template<typename T>
+								DefaultByteFieldItem(std::vector<T> values);
+
+								template<typename T>
+								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
+								inline bool isValidBoolean(int index) {	return true;	}
+								bool getBoolean(int index);
+								bool isValidByte(int index);
+								char getByte(int index);
+								bool isValidShort(int index);
+								short getShort(int index);
+								bool isValidInteger(int index);
+								int getInteger(int index);
+								bool isValidLong(int index);
+								long getLong(int index);
+								bool isValidBigInteger(int index);
+								long long getBigInteger(int index);
+								bool isValidFloat(int index);
+								float getFloat(int index);
+								bool isValidDouble(int index);
+								double getDouble(int index);
+								bool isValidBigDecimal(int index);
+								cpp_dec_float_100 getBigDecimal(int index);
+
+							private:
+							};
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultDoubleFieldItem.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultDoubleFieldItem.cpp
index aa094358e51..99f90d609ca 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultDoubleFieldItem.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultDoubleFieldItem.cpp
@@ -1,196 +1,196 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "DefaultDoubleFieldItem.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						namespace items
-						{
-							// ==================================================
-							bool DefaultDoubleFieldItem::getBoolean(int index)
-							{
-								if (!isValidBoolean(index))
-								{
-									throw new PlcIncompatibleDatatypeException("bool", index);
-								}
-
-								return getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultDoubleFieldItem::isValidByte(int index)
-							{
-								double value = getValue(index);
-								return value <= -127 && value >= -128;
-							}
-
-							// ===================================================
-							char DefaultDoubleFieldItem::getByte(int index)
-							{
-								if (!isValidByte(index)) 
-								{
-									throw new PlcIncompatibleDatatypeException("char", index);
-								}
-								return (char) getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultDoubleFieldItem::isValidShort(int index)
-							{
-								double value = getValue(index);
-								return value >= -32768 && value <= 32767;
-							}
-
-							// ===================================================
-							short DefaultDoubleFieldItem::getShort(int index)
-							{
-								if (!isValidShort(index))
-								{
-									throw new PlcIncompatibleDatatypeException("short", index);
-								}
-								
-								return (short)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultDoubleFieldItem::isValidInteger(int index)
-							{
-								double value = getValue(index);
-								return value >= 0 && value <= 2147483647;
-							}
-
-							// ===================================================
-							int DefaultDoubleFieldItem::getInteger(int index)
-							{
-								if (!isValidInteger(index))
-								{
-									throw new PlcIncompatibleDatatypeException("int", index);
-								}
-
-								return (int)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultDoubleFieldItem::isValidLong(int index)
-							{
-								double value = getValue(index);
-								return value >= -(2 ^ 63) && value <= (2 ^ 63) - 1;
-							}
-
-							// ===================================================
-							long DefaultDoubleFieldItem::getLong(int index)
-							{
-								if (!isValidLong(index))
-								{
-									throw new PlcIncompatibleDatatypeException("long", index);
-								}
-
-								return (long)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultDoubleFieldItem::isValidBigInteger(int index)
-							{
-								return true;
-							}
-
-							// ===================================================
-							long long DefaultDoubleFieldItem::getBigInteger(int index)
-							{
-								if (!isValidBigInteger(index))
-								{
-									throw new PlcIncompatibleDatatypeException("long long", index);
-								}
-								
-								// Todo: add conversion from cpp_dec_float_100 TO long long
-								return (long)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultDoubleFieldItem::isValidFloat(int index)
-							{
-								double value = getValue(index);
-								return value >= -3.4e38 && value <= 3.4e38;
-							}
-
-							// ===================================================
-							float DefaultDoubleFieldItem::getFloat(int index)
-							{
-								if (!isValidFloat(index))
-								{
-									throw new PlcIncompatibleDatatypeException("float", index);
-								}
-
-								return (float)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultDoubleFieldItem::isValidDouble(int index)
-							{
-								double value = getValue(index);
-								return value >= -1.7e308 && value <= 1.7e308;
-							}
-
-							// ===================================================
-							double DefaultDoubleFieldItem::getDouble(int index)
-							{
-								if (!isValidDouble(index))
-								{
-									throw new PlcIncompatibleDatatypeException("double", index);
-								}
-
-								return (double)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultDoubleFieldItem::isValidBigDecimal(int index)
-							{
-								// same limits but higher precision
-								return isValidDouble(index);
-							}
-
-							// ===================================================
-							cpp_dec_float_100 DefaultDoubleFieldItem::getBigDecimal(int index)
-							{
-								if (!isValidBigDecimal(index))
-								{
-									throw new PlcIncompatibleDatatypeException("cpp_dec_float_100", index);
-								}
-
-								return (cpp_dec_float_100)getValue(index);
-							}
-						}
-						
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "DefaultDoubleFieldItem.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						namespace items
+						{
+							// ==================================================
+							bool DefaultDoubleFieldItem::getBoolean(int index)
+							{
+								if (!isValidBoolean(index))
+								{
+									throw new PlcIncompatibleDatatypeException("bool", index);
+								}
+
+								return getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultDoubleFieldItem::isValidByte(int index)
+							{
+								double value = getValue(index);
+								return value <= -127 && value >= -128;
+							}
+
+							// ===================================================
+							char DefaultDoubleFieldItem::getByte(int index)
+							{
+								if (!isValidByte(index)) 
+								{
+									throw new PlcIncompatibleDatatypeException("char", index);
+								}
+								return (char) getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultDoubleFieldItem::isValidShort(int index)
+							{
+								double value = getValue(index);
+								return value >= -32768 && value <= 32767;
+							}
+
+							// ===================================================
+							short DefaultDoubleFieldItem::getShort(int index)
+							{
+								if (!isValidShort(index))
+								{
+									throw new PlcIncompatibleDatatypeException("short", index);
+								}
+								
+								return (short)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultDoubleFieldItem::isValidInteger(int index)
+							{
+								double value = getValue(index);
+								return value >= 0 && value <= 2147483647;
+							}
+
+							// ===================================================
+							int DefaultDoubleFieldItem::getInteger(int index)
+							{
+								if (!isValidInteger(index))
+								{
+									throw new PlcIncompatibleDatatypeException("int", index);
+								}
+
+								return (int)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultDoubleFieldItem::isValidLong(int index)
+							{
+								double value = getValue(index);
+								return value >= -(2 ^ 63) && value <= (2 ^ 63) - 1;
+							}
+
+							// ===================================================
+							long DefaultDoubleFieldItem::getLong(int index)
+							{
+								if (!isValidLong(index))
+								{
+									throw new PlcIncompatibleDatatypeException("long", index);
+								}
+
+								return (long)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultDoubleFieldItem::isValidBigInteger(int index)
+							{
+								return true;
+							}
+
+							// ===================================================
+							long long DefaultDoubleFieldItem::getBigInteger(int index)
+							{
+								if (!isValidBigInteger(index))
+								{
+									throw new PlcIncompatibleDatatypeException("long long", index);
+								}
+								
+								// Todo: add conversion from cpp_dec_float_100 TO long long
+								return (long)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultDoubleFieldItem::isValidFloat(int index)
+							{
+								double value = getValue(index);
+								return value >= -3.4e38 && value <= 3.4e38;
+							}
+
+							// ===================================================
+							float DefaultDoubleFieldItem::getFloat(int index)
+							{
+								if (!isValidFloat(index))
+								{
+									throw new PlcIncompatibleDatatypeException("float", index);
+								}
+
+								return (float)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultDoubleFieldItem::isValidDouble(int index)
+							{
+								double value = getValue(index);
+								return value >= -1.7e308 && value <= 1.7e308;
+							}
+
+							// ===================================================
+							double DefaultDoubleFieldItem::getDouble(int index)
+							{
+								if (!isValidDouble(index))
+								{
+									throw new PlcIncompatibleDatatypeException("double", index);
+								}
+
+								return (double)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultDoubleFieldItem::isValidBigDecimal(int index)
+							{
+								// same limits but higher precision
+								return isValidDouble(index);
+							}
+
+							// ===================================================
+							cpp_dec_float_100 DefaultDoubleFieldItem::getBigDecimal(int index)
+							{
+								if (!isValidBigDecimal(index))
+								{
+									throw new PlcIncompatibleDatatypeException("cpp_dec_float_100", index);
+								}
+
+								return (cpp_dec_float_100)getValue(index);
+							}
+						}
+						
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultDoubleFieldItem.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultDoubleFieldItem.h
index 2ee39d99a7a..002dafaa734 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultDoubleFieldItem.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultDoubleFieldItem.h
@@ -1,81 +1,81 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _DEFAULT_DOUBLE_FIELD_ITEM
-#define _DEFAULT_DOUBLE_FIELD_ITEM
-
-#include <boost/multiprecision/cpp_dec_float.hpp>
-#include "BaseDefaultFieldItem.h"
-
-using namespace org::apache::plc4x::cpp::api::exceptions;
-using namespace boost::multiprecision;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{					
-						namespace items
-						{							
-							class DefaultDoubleFieldItem : public BaseDefaultFieldItem<double>
-							{
-
-							public:
-								template<typename T>
-								DefaultDoubleFieldItem(std::vector<T> values);
-
-								template<typename T>
-								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
-								inline bool isValidBoolean(int index) {	return true;	}
-								bool getBoolean(int index);
-								bool isValidByte(int index);
-								char getByte(int index);
-								bool isValidShort(int index);
-								short getShort(int index);
-								bool isValidInteger(int index);
-								int getInteger(int index);
-								bool isValidLong(int index);
-								long getLong(int index);
-								bool isValidBigInteger(int index);
-								long long getBigInteger(int index);
-								bool isValidFloat(int index);
-								float getFloat(int index);
-								bool isValidDouble(int index);
-								double getDouble(int index);
-								bool isValidBigDecimal(int index);
-								cpp_dec_float_100 getBigDecimal(int index);
-
-							private:
-							};
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _DEFAULT_DOUBLE_FIELD_ITEM
+#define _DEFAULT_DOUBLE_FIELD_ITEM
+
+#include <boost/multiprecision/cpp_dec_float.hpp>
+#include "BaseDefaultFieldItem.h"
+
+using namespace org::apache::plc4x::cpp::api::exceptions;
+using namespace boost::multiprecision;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{					
+						namespace items
+						{							
+							class DefaultDoubleFieldItem : public BaseDefaultFieldItem<double>
+							{
+
+							public:
+								template<typename T>
+								DefaultDoubleFieldItem(std::vector<T> values);
+
+								template<typename T>
+								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
+								inline bool isValidBoolean(int index) {	return true;	}
+								bool getBoolean(int index);
+								bool isValidByte(int index);
+								char getByte(int index);
+								bool isValidShort(int index);
+								short getShort(int index);
+								bool isValidInteger(int index);
+								int getInteger(int index);
+								bool isValidLong(int index);
+								long getLong(int index);
+								bool isValidBigInteger(int index);
+								long long getBigInteger(int index);
+								bool isValidFloat(int index);
+								float getFloat(int index);
+								bool isValidDouble(int index);
+								double getDouble(int index);
+								bool isValidBigDecimal(int index);
+								cpp_dec_float_100 getBigDecimal(int index);
+
+							private:
+							};
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultFloatFieldItem.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultFloatFieldItem.cpp
index afabdbd6afd..791baf30050 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultFloatFieldItem.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultFloatFieldItem.cpp
@@ -1,196 +1,196 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "DefaultFloatFieldItem.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						namespace items
-						{
-							// ==================================================
-							bool DefaultFloatFieldItem::getBoolean(int index)
-							{
-								if (!isValidBoolean(index))
-								{
-									throw new PlcIncompatibleDatatypeException("bool", index);
-								}
-
-								return getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultFloatFieldItem::isValidByte(int index)
-							{
-								float value = getValue(index);
-								return value <= -127 && value >= -128;
-							}
-
-							// ===================================================
-							char DefaultFloatFieldItem::getByte(int index)
-							{
-								if (!isValidByte(index)) 
-								{
-									throw new PlcIncompatibleDatatypeException("char", index);
-								}
-								return (char) getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultFloatFieldItem::isValidShort(int index)
-							{
-								float value = getValue(index);
-								return value >= -32768 && value <= 32767;
-							}
-
-							// ===================================================
-							short DefaultFloatFieldItem::getShort(int index)
-							{
-								if (!isValidShort(index))
-								{
-									throw new PlcIncompatibleDatatypeException("short", index);
-								}
-								
-								return (short)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultFloatFieldItem::isValidInteger(int index)
-							{
-								float value = getValue(index);
-								return value >= 0 && value <= 2147483647;
-							}
-
-							// ===================================================
-							int DefaultFloatFieldItem::getInteger(int index)
-							{
-								if (!isValidInteger(index))
-								{
-									throw new PlcIncompatibleDatatypeException("int", index);
-								}
-
-								return (int)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultFloatFieldItem::isValidLong(int index)
-							{
-								float value = getValue(index);
-								return value >= -(2 ^ 63) && value <= (2 ^ 63) - 1;
-							}
-
-							// ===================================================
-							long DefaultFloatFieldItem::getLong(int index)
-							{
-								if (!isValidLong(index))
-								{
-									throw new PlcIncompatibleDatatypeException("long", index);
-								}
-
-								return (long)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultFloatFieldItem::isValidBigInteger(int index)
-							{
-								return true;
-							}
-
-							// ===================================================
-							long long DefaultFloatFieldItem::getBigInteger(int index)
-							{
-								if (!isValidBigInteger(index))
-								{
-									throw new PlcIncompatibleDatatypeException("long long", index);
-								}
-								
-								// Todo: add conversion from cpp_dec_float_100 TO long long
-								return (long)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultFloatFieldItem::isValidFloat(int index)
-							{
-								float value = getValue(index);
-								return value >= -3.4e38 && value <= 3.4e38;
-							}
-
-							// ===================================================
-							float DefaultFloatFieldItem::getFloat(int index)
-							{
-								if (!isValidFloat(index))
-								{
-									throw new PlcIncompatibleDatatypeException("float", index);
-								}
-
-								return (float)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultFloatFieldItem::isValidDouble(int index)
-							{
-								double value = getValue(index);
-								return value >= -1.7e308 && value <= 1.7e308;
-							}
-
-							// ===================================================
-							double DefaultFloatFieldItem::getDouble(int index)
-							{
-								if (!isValidDouble(index))
-								{
-									throw new PlcIncompatibleDatatypeException("double", index);
-								}
-
-								return (double)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultFloatFieldItem::isValidBigDecimal(int index)
-							{
-								// same limits but higher precision
-								return isValidDouble(index);
-							}
-
-							// ===================================================
-							cpp_dec_float_100 DefaultFloatFieldItem::getBigDecimal(int index)
-							{
-								if (!isValidBigDecimal(index))
-								{
-									throw new PlcIncompatibleDatatypeException("cpp_dec_float_100", index);
-								}
-
-								return (cpp_dec_float_100)getValue(index);
-							}
-						}
-						
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "DefaultFloatFieldItem.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						namespace items
+						{
+							// ==================================================
+							bool DefaultFloatFieldItem::getBoolean(int index)
+							{
+								if (!isValidBoolean(index))
+								{
+									throw new PlcIncompatibleDatatypeException("bool", index);
+								}
+
+								return getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultFloatFieldItem::isValidByte(int index)
+							{
+								float value = getValue(index);
+								return value <= -127 && value >= -128;
+							}
+
+							// ===================================================
+							char DefaultFloatFieldItem::getByte(int index)
+							{
+								if (!isValidByte(index)) 
+								{
+									throw new PlcIncompatibleDatatypeException("char", index);
+								}
+								return (char) getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultFloatFieldItem::isValidShort(int index)
+							{
+								float value = getValue(index);
+								return value >= -32768 && value <= 32767;
+							}
+
+							// ===================================================
+							short DefaultFloatFieldItem::getShort(int index)
+							{
+								if (!isValidShort(index))
+								{
+									throw new PlcIncompatibleDatatypeException("short", index);
+								}
+								
+								return (short)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultFloatFieldItem::isValidInteger(int index)
+							{
+								float value = getValue(index);
+								return value >= 0 && value <= 2147483647;
+							}
+
+							// ===================================================
+							int DefaultFloatFieldItem::getInteger(int index)
+							{
+								if (!isValidInteger(index))
+								{
+									throw new PlcIncompatibleDatatypeException("int", index);
+								}
+
+								return (int)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultFloatFieldItem::isValidLong(int index)
+							{
+								float value = getValue(index);
+								return value >= -(2 ^ 63) && value <= (2 ^ 63) - 1;
+							}
+
+							// ===================================================
+							long DefaultFloatFieldItem::getLong(int index)
+							{
+								if (!isValidLong(index))
+								{
+									throw new PlcIncompatibleDatatypeException("long", index);
+								}
+
+								return (long)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultFloatFieldItem::isValidBigInteger(int index)
+							{
+								return true;
+							}
+
+							// ===================================================
+							long long DefaultFloatFieldItem::getBigInteger(int index)
+							{
+								if (!isValidBigInteger(index))
+								{
+									throw new PlcIncompatibleDatatypeException("long long", index);
+								}
+								
+								// Todo: add conversion from cpp_dec_float_100 TO long long
+								return (long)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultFloatFieldItem::isValidFloat(int index)
+							{
+								float value = getValue(index);
+								return value >= -3.4e38 && value <= 3.4e38;
+							}
+
+							// ===================================================
+							float DefaultFloatFieldItem::getFloat(int index)
+							{
+								if (!isValidFloat(index))
+								{
+									throw new PlcIncompatibleDatatypeException("float", index);
+								}
+
+								return (float)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultFloatFieldItem::isValidDouble(int index)
+							{
+								double value = getValue(index);
+								return value >= -1.7e308 && value <= 1.7e308;
+							}
+
+							// ===================================================
+							double DefaultFloatFieldItem::getDouble(int index)
+							{
+								if (!isValidDouble(index))
+								{
+									throw new PlcIncompatibleDatatypeException("double", index);
+								}
+
+								return (double)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultFloatFieldItem::isValidBigDecimal(int index)
+							{
+								// same limits but higher precision
+								return isValidDouble(index);
+							}
+
+							// ===================================================
+							cpp_dec_float_100 DefaultFloatFieldItem::getBigDecimal(int index)
+							{
+								if (!isValidBigDecimal(index))
+								{
+									throw new PlcIncompatibleDatatypeException("cpp_dec_float_100", index);
+								}
+
+								return (cpp_dec_float_100)getValue(index);
+							}
+						}
+						
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultFloatFieldItem.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultFloatFieldItem.h
index f59a44c50d7..462917b4705 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultFloatFieldItem.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultFloatFieldItem.h
@@ -1,81 +1,81 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _DEFAULT_FLOAT_FIELD_ITEM
-#define _DEFAULT_FLOAT_FIELD_ITEM
-
-#include <boost/multiprecision/cpp_dec_float.hpp>
-#include "BaseDefaultFieldItem.h"
-
-using namespace org::apache::plc4x::cpp::api::exceptions;
-using namespace boost::multiprecision;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{					
-						namespace items
-						{							
-							class DefaultFloatFieldItem : public BaseDefaultFieldItem<float>
-							{
-
-							public:
-								template<typename T>
-								DefaultFloatFieldItem(std::vector<T> values);
-
-								template<typename T>
-								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
-								inline bool isValidBoolean(int index) {	return true;	}
-								bool getBoolean(int index);
-								bool isValidByte(int index);
-								char getByte(int index);
-								bool isValidShort(int index);
-								short getShort(int index);
-								bool isValidInteger(int index);
-								int getInteger(int index);
-								bool isValidLong(int index);
-								long getLong(int index);
-								bool isValidBigInteger(int index);
-								long long getBigInteger(int index);
-								bool isValidFloat(int index);
-								float getFloat(int index);
-								bool isValidDouble(int index);
-								double getDouble(int index);
-								bool isValidBigDecimal(int index);
-								cpp_dec_float_100 getBigDecimal(int index);
-
-							private:
-							};
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _DEFAULT_FLOAT_FIELD_ITEM
+#define _DEFAULT_FLOAT_FIELD_ITEM
+
+#include <boost/multiprecision/cpp_dec_float.hpp>
+#include "BaseDefaultFieldItem.h"
+
+using namespace org::apache::plc4x::cpp::api::exceptions;
+using namespace boost::multiprecision;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{					
+						namespace items
+						{							
+							class DefaultFloatFieldItem : public BaseDefaultFieldItem<float>
+							{
+
+							public:
+								template<typename T>
+								DefaultFloatFieldItem(std::vector<T> values);
+
+								template<typename T>
+								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
+								inline bool isValidBoolean(int index) {	return true;	}
+								bool getBoolean(int index);
+								bool isValidByte(int index);
+								char getByte(int index);
+								bool isValidShort(int index);
+								short getShort(int index);
+								bool isValidInteger(int index);
+								int getInteger(int index);
+								bool isValidLong(int index);
+								long getLong(int index);
+								bool isValidBigInteger(int index);
+								long long getBigInteger(int index);
+								bool isValidFloat(int index);
+								float getFloat(int index);
+								bool isValidDouble(int index);
+								double getDouble(int index);
+								bool isValidBigDecimal(int index);
+								cpp_dec_float_100 getBigDecimal(int index);
+
+							private:
+							};
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultIntegerFieldItem.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultIntegerFieldItem.cpp
index 3d34f67bcf8..6c725201f8d 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultIntegerFieldItem.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultIntegerFieldItem.cpp
@@ -1,196 +1,196 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "DefaultIntegerFieldItem.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						namespace items
-						{
-							// ==================================================
-							bool DefaultIntegerFieldItem::getBoolean(int index)
-							{
-								if (!isValidBoolean(index))
-								{
-									throw new PlcIncompatibleDatatypeException("bool", index);
-								}
-
-								return getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultIntegerFieldItem::isValidByte(int index)
-							{
-								int value = getValue(index);
-								return value <= -127 && value >= -128;
-							}
-
-							// ===================================================
-							char DefaultIntegerFieldItem::getByte(int index)
-							{
-								if (!isValidByte(index)) 
-								{
-									throw new PlcIncompatibleDatatypeException("char", index);
-								}
-								return (char) getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultIntegerFieldItem::isValidShort(int index)
-							{
-								int value = getValue(index);
-								return value >= -32768 && value <= 32767;
-							}
-
-							// ===================================================
-							short DefaultIntegerFieldItem::getShort(int index)
-							{
-								if (!isValidShort(index))
-								{
-									throw new PlcIncompatibleDatatypeException("short", index);
-								}
-								
-								return (short)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultIntegerFieldItem::isValidInteger(int index)
-							{
-								int value = getValue(index);
-								return value >= 0 && value <= 2147483647;
-							}
-
-							// ===================================================
-							int DefaultIntegerFieldItem::getInteger(int index)
-							{
-								if (!isValidInteger(index))
-								{
-									throw new PlcIncompatibleDatatypeException("int", index);
-								}
-
-								return (int)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultIntegerFieldItem::isValidLong(int index)
-							{
-								int value = getValue(index);
-								return value >= -(2 ^ 63) && value <= (2 ^ 63) - 1;
-							}
-
-							// ===================================================
-							long DefaultIntegerFieldItem::getLong(int index)
-							{
-								if (!isValidLong(index))
-								{
-									throw new PlcIncompatibleDatatypeException("long", index);
-								}
-
-								return (long)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultIntegerFieldItem::isValidBigInteger(int index)
-							{
-								return true;
-							}
-
-							// ===================================================
-							long long DefaultIntegerFieldItem::getBigInteger(int index)
-							{
-								if (!isValidBigInteger(index))
-								{
-									throw new PlcIncompatibleDatatypeException("long long", index);
-								}
-								
-								// Todo: add conversion from cpp_dec_float_100 TO long long
-								return (long)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultIntegerFieldItem::isValidFloat(int index)
-							{
-								int value = getValue(index);
-								return value >= -3.4e38 && value <= 3.4e38;
-							}
-
-							// ===================================================
-							float DefaultIntegerFieldItem::getFloat(int index)
-							{
-								if (!isValidFloat(index))
-								{
-									throw new PlcIncompatibleDatatypeException("float", index);
-								}
-
-								return (float)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultIntegerFieldItem::isValidDouble(int index)
-							{
-								int value = getValue(index);
-								return value >= -1.7e308 && value <= 1.7e308;
-							}
-
-							// ===================================================
-							double DefaultIntegerFieldItem::getDouble(int index)
-							{
-								if (!isValidDouble(index))
-								{
-									throw new PlcIncompatibleDatatypeException("double", index);
-								}
-
-								return (double)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultIntegerFieldItem::isValidBigDecimal(int index)
-							{
-								// same limits but higher precision
-								return isValidDouble(index);
-							}
-
-							// ===================================================
-							cpp_dec_float_100 DefaultIntegerFieldItem::getBigDecimal(int index)
-							{
-								if (!isValidBigDecimal(index))
-								{
-									throw new PlcIncompatibleDatatypeException("cpp_dec_float_100", index);
-								}
-
-								return (cpp_dec_float_100)getValue(index);
-							}
-						}
-						
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "DefaultIntegerFieldItem.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						namespace items
+						{
+							// ==================================================
+							bool DefaultIntegerFieldItem::getBoolean(int index)
+							{
+								if (!isValidBoolean(index))
+								{
+									throw new PlcIncompatibleDatatypeException("bool", index);
+								}
+
+								return getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultIntegerFieldItem::isValidByte(int index)
+							{
+								int value = getValue(index);
+								return value <= -127 && value >= -128;
+							}
+
+							// ===================================================
+							char DefaultIntegerFieldItem::getByte(int index)
+							{
+								if (!isValidByte(index)) 
+								{
+									throw new PlcIncompatibleDatatypeException("char", index);
+								}
+								return (char) getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultIntegerFieldItem::isValidShort(int index)
+							{
+								int value = getValue(index);
+								return value >= -32768 && value <= 32767;
+							}
+
+							// ===================================================
+							short DefaultIntegerFieldItem::getShort(int index)
+							{
+								if (!isValidShort(index))
+								{
+									throw new PlcIncompatibleDatatypeException("short", index);
+								}
+								
+								return (short)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultIntegerFieldItem::isValidInteger(int index)
+							{
+								int value = getValue(index);
+								return value >= 0 && value <= 2147483647;
+							}
+
+							// ===================================================
+							int DefaultIntegerFieldItem::getInteger(int index)
+							{
+								if (!isValidInteger(index))
+								{
+									throw new PlcIncompatibleDatatypeException("int", index);
+								}
+
+								return (int)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultIntegerFieldItem::isValidLong(int index)
+							{
+								int value = getValue(index);
+								return value >= -(2 ^ 63) && value <= (2 ^ 63) - 1;
+							}
+
+							// ===================================================
+							long DefaultIntegerFieldItem::getLong(int index)
+							{
+								if (!isValidLong(index))
+								{
+									throw new PlcIncompatibleDatatypeException("long", index);
+								}
+
+								return (long)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultIntegerFieldItem::isValidBigInteger(int index)
+							{
+								return true;
+							}
+
+							// ===================================================
+							long long DefaultIntegerFieldItem::getBigInteger(int index)
+							{
+								if (!isValidBigInteger(index))
+								{
+									throw new PlcIncompatibleDatatypeException("long long", index);
+								}
+								
+								// Todo: add conversion from cpp_dec_float_100 TO long long
+								return (long)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultIntegerFieldItem::isValidFloat(int index)
+							{
+								int value = getValue(index);
+								return value >= -3.4e38 && value <= 3.4e38;
+							}
+
+							// ===================================================
+							float DefaultIntegerFieldItem::getFloat(int index)
+							{
+								if (!isValidFloat(index))
+								{
+									throw new PlcIncompatibleDatatypeException("float", index);
+								}
+
+								return (float)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultIntegerFieldItem::isValidDouble(int index)
+							{
+								int value = getValue(index);
+								return value >= -1.7e308 && value <= 1.7e308;
+							}
+
+							// ===================================================
+							double DefaultIntegerFieldItem::getDouble(int index)
+							{
+								if (!isValidDouble(index))
+								{
+									throw new PlcIncompatibleDatatypeException("double", index);
+								}
+
+								return (double)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultIntegerFieldItem::isValidBigDecimal(int index)
+							{
+								// same limits but higher precision
+								return isValidDouble(index);
+							}
+
+							// ===================================================
+							cpp_dec_float_100 DefaultIntegerFieldItem::getBigDecimal(int index)
+							{
+								if (!isValidBigDecimal(index))
+								{
+									throw new PlcIncompatibleDatatypeException("cpp_dec_float_100", index);
+								}
+
+								return (cpp_dec_float_100)getValue(index);
+							}
+						}
+						
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultIntegerFieldItem.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultIntegerFieldItem.h
index c3325e97947..cf6bf4046ef 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultIntegerFieldItem.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultIntegerFieldItem.h
@@ -1,81 +1,81 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _DEFAULT_INTEGER_FIELD_ITEM
-#define _DEFAULT_INTEGER_FIELD_ITEM
-
-#include <boost/multiprecision/cpp_dec_float.hpp>
-#include "BaseDefaultFieldItem.h"
-
-using namespace org::apache::plc4x::cpp::api::exceptions;
-using namespace boost::multiprecision;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{					
-						namespace items
-						{							
-							class DefaultIntegerFieldItem : public BaseDefaultFieldItem<int>
-							{
-
-							public:
-								template<typename T>
-								DefaultIntegerFieldItem(std::vector<T> values);
-
-								template<typename T>
-								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
-								inline bool isValidBoolean(int index) {	return true;	}
-								bool getBoolean(int index);
-								bool isValidByte(int index);
-								char getByte(int index);
-								bool isValidShort(int index);
-								short getShort(int index);
-								bool isValidInteger(int index);
-								int getInteger(int index);
-								bool isValidLong(int index);
-								long getLong(int index);
-								bool isValidBigInteger(int index);
-								long long getBigInteger(int index);
-								bool isValidFloat(int index);
-								float getFloat(int index);
-								bool isValidDouble(int index);
-								double getDouble(int index);
-								bool isValidBigDecimal(int index);
-								cpp_dec_float_100 getBigDecimal(int index);
-
-							private:
-							};
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _DEFAULT_INTEGER_FIELD_ITEM
+#define _DEFAULT_INTEGER_FIELD_ITEM
+
+#include <boost/multiprecision/cpp_dec_float.hpp>
+#include "BaseDefaultFieldItem.h"
+
+using namespace org::apache::plc4x::cpp::api::exceptions;
+using namespace boost::multiprecision;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{					
+						namespace items
+						{							
+							class DefaultIntegerFieldItem : public BaseDefaultFieldItem<int>
+							{
+
+							public:
+								template<typename T>
+								DefaultIntegerFieldItem(std::vector<T> values);
+
+								template<typename T>
+								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
+								inline bool isValidBoolean(int index) {	return true;	}
+								bool getBoolean(int index);
+								bool isValidByte(int index);
+								char getByte(int index);
+								bool isValidShort(int index);
+								short getShort(int index);
+								bool isValidInteger(int index);
+								int getInteger(int index);
+								bool isValidLong(int index);
+								long getLong(int index);
+								bool isValidBigInteger(int index);
+								long long getBigInteger(int index);
+								bool isValidFloat(int index);
+								float getFloat(int index);
+								bool isValidDouble(int index);
+								double getDouble(int index);
+								bool isValidBigDecimal(int index);
+								cpp_dec_float_100 getBigDecimal(int index);
+
+							private:
+							};
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalDateFieldItem.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalDateFieldItem.cpp
index 6d3e97d1496..13e69620312 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalDateFieldItem.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalDateFieldItem.cpp
@@ -1,196 +1,196 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "DefaultLocalDateFieldItem.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						namespace items
-						{
-							// ==================================================
-							bool DefaultLocalDateFieldItem::getBoolean(int index)
-							{
-								if (!isValidBoolean(index))
-								{
-									throw new PlcIncompatibleDatatypeException("bool", index);
-								}
-
-								return getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultLocalDateFieldItem::isValidByte(int index)
-							{
-								data_type value = getValue(index);
-								return value <= -127 && value >= -128;
-							}
-
-							// ===================================================
-							char DefaultLocalDateFieldItem::getByte(int index)
-							{
-								if (!isValidByte(index)) 
-								{
-									throw new PlcIncompatibleDatatypeException("char", index);
-								}
-								return (char) getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultLocalDateFieldItem::isValidShort(int index)
-							{
-								data_type value = getValue(index);
-								return value >= -32768 && value <= 32767;
-							}
-
-							// ===================================================
-							short DefaultLocalDateFieldItem::getShort(int index)
-							{
-								if (!isValidShort(index))
-								{
-									throw new PlcIncompatibleDatatypeException("short", index);
-								}
-								
-								return (short)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultLocalDateFieldItem::isValidInteger(int index)
-							{
-								data_type value = getValue(index);
-								return value >= 0 && value <= 2147483647;
-							}
-
-							// ===================================================
-							int DefaultLocalDateFieldItem::getInteger(int index)
-							{
-								if (!isValidInteger(index))
-								{
-									throw new PlcIncompatibleDatatypeException("int", index);
-								}
-
-								return (int)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultLocalDateFieldItem::isValidLong(int index)
-							{
-								data_type value = getValue(index);
-								return value >= -(2 ^ 63) && value <= (2 ^ 63) - 1;
-							}
-
-							// ===================================================
-							long DefaultLocalDateFieldItem::getLong(int index)
-							{
-								if (!isValidLong(index))
-								{
-									throw new PlcIncompatibleDatatypeException("long", index);
-								}
-
-								return (long)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultLocalDateFieldItem::isValidBigInteger(int index)
-							{
-								return true;
-							}
-
-							// ===================================================
-							long long DefaultLocalDateFieldItem::getBigInteger(int index)
-							{
-								if (!isValidBigInteger(index))
-								{
-									throw new PlcIncompatibleDatatypeException("long long", index);
-								}
-								
-								// Todo: add conversion from cpp_dec_float_100 TO long long
-								return (long)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultLocalDateFieldItem::isValidFloat(int index)
-							{
-								data_type value = getValue(index);
-								return value >= -3.4e38 && value <= 3.4e38;
-							}
-
-							// ===================================================
-							float DefaultLocalDateFieldItem::getFloat(int index)
-							{
-								if (!isValidFloat(index))
-								{
-									throw new PlcIncompatibleDatatypeException("float", index);
-								}
-
-								return (float)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultLocalDateFieldItem::isValidDouble(int index)
-							{
-								data_type value = getValue(index);
-								return value >= -1.7e308 && value <= 1.7e308;
-							}
-
-							// ===================================================
-							double DefaultLocalDateFieldItem::getDouble(int index)
-							{
-								if (!isValidDouble(index))
-								{
-									throw new PlcIncompatibleDatatypeException("double", index);
-								}
-
-								return (double)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultLocalDateFieldItem::isValidBigDecimal(int index)
-							{
-								// same limits but higher precision
-								return isValidDouble(index);
-							}
-
-							// ===================================================
-							cpp_dec_float_100 DefaultLocalDateFieldItem::getBigDecimal(int index)
-							{
-								if (!isValidBigDecimal(index))
-								{
-									throw new PlcIncompatibleDatatypeException("cpp_dec_float_100", index);
-								}
-
-								return (cpp_dec_float_100)getValue(index);
-							}
-						}
-						
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "DefaultLocalDateFieldItem.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						namespace items
+						{
+							// ==================================================
+							bool DefaultLocalDateFieldItem::getBoolean(int index)
+							{
+								if (!isValidBoolean(index))
+								{
+									throw new PlcIncompatibleDatatypeException("bool", index);
+								}
+
+								return getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultLocalDateFieldItem::isValidByte(int index)
+							{
+								data_type value = getValue(index);
+								return value <= -127 && value >= -128;
+							}
+
+							// ===================================================
+							char DefaultLocalDateFieldItem::getByte(int index)
+							{
+								if (!isValidByte(index)) 
+								{
+									throw new PlcIncompatibleDatatypeException("char", index);
+								}
+								return (char) getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultLocalDateFieldItem::isValidShort(int index)
+							{
+								data_type value = getValue(index);
+								return value >= -32768 && value <= 32767;
+							}
+
+							// ===================================================
+							short DefaultLocalDateFieldItem::getShort(int index)
+							{
+								if (!isValidShort(index))
+								{
+									throw new PlcIncompatibleDatatypeException("short", index);
+								}
+								
+								return (short)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultLocalDateFieldItem::isValidInteger(int index)
+							{
+								data_type value = getValue(index);
+								return value >= 0 && value <= 2147483647;
+							}
+
+							// ===================================================
+							int DefaultLocalDateFieldItem::getInteger(int index)
+							{
+								if (!isValidInteger(index))
+								{
+									throw new PlcIncompatibleDatatypeException("int", index);
+								}
+
+								return (int)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultLocalDateFieldItem::isValidLong(int index)
+							{
+								data_type value = getValue(index);
+								return value >= -(2 ^ 63) && value <= (2 ^ 63) - 1;
+							}
+
+							// ===================================================
+							long DefaultLocalDateFieldItem::getLong(int index)
+							{
+								if (!isValidLong(index))
+								{
+									throw new PlcIncompatibleDatatypeException("long", index);
+								}
+
+								return (long)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultLocalDateFieldItem::isValidBigInteger(int index)
+							{
+								return true;
+							}
+
+							// ===================================================
+							long long DefaultLocalDateFieldItem::getBigInteger(int index)
+							{
+								if (!isValidBigInteger(index))
+								{
+									throw new PlcIncompatibleDatatypeException("long long", index);
+								}
+								
+								// Todo: add conversion from cpp_dec_float_100 TO long long
+								return (long)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultLocalDateFieldItem::isValidFloat(int index)
+							{
+								data_type value = getValue(index);
+								return value >= -3.4e38 && value <= 3.4e38;
+							}
+
+							// ===================================================
+							float DefaultLocalDateFieldItem::getFloat(int index)
+							{
+								if (!isValidFloat(index))
+								{
+									throw new PlcIncompatibleDatatypeException("float", index);
+								}
+
+								return (float)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultLocalDateFieldItem::isValidDouble(int index)
+							{
+								data_type value = getValue(index);
+								return value >= -1.7e308 && value <= 1.7e308;
+							}
+
+							// ===================================================
+							double DefaultLocalDateFieldItem::getDouble(int index)
+							{
+								if (!isValidDouble(index))
+								{
+									throw new PlcIncompatibleDatatypeException("double", index);
+								}
+
+								return (double)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultLocalDateFieldItem::isValidBigDecimal(int index)
+							{
+								// same limits but higher precision
+								return isValidDouble(index);
+							}
+
+							// ===================================================
+							cpp_dec_float_100 DefaultLocalDateFieldItem::getBigDecimal(int index)
+							{
+								if (!isValidBigDecimal(index))
+								{
+									throw new PlcIncompatibleDatatypeException("cpp_dec_float_100", index);
+								}
+
+								return (cpp_dec_float_100)getValue(index);
+							}
+						}
+						
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalDateFieldItem.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalDateFieldItem.h
index 1811c21a2a1..9683383c12b 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalDateFieldItem.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalDateFieldItem.h
@@ -1,81 +1,81 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _DEFAULT_LOCAL_DATE_FIELD_ITEM
-#define _DEFAULT_LOCAL_DATE_FIELD_ITEM
-
-#include <boost/multiprecision/cpp_dec_float.hpp>
-#include "BaseDefaultFieldItem.h"
-
-using namespace org::apache::plc4x::cpp::api::exceptions;
-using namespace boost::multiprecision;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{					
-						namespace items
-						{							
-							class DefaultLocalDateFieldItem : public BaseDefaultFieldItem<time_t>
-							{
-								typedef time_t data_type;
-							public:
-								template<typename T>
-								DefaultLocalDateFieldItem(std::vector<T> values);
-
-								template<typename T>
-								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
-								inline bool isValidBoolean(int index) {	return true;	}
-								bool getBoolean(int index);
-								bool isValidByte(int index);
-								char getByte(int index);
-								bool isValidShort(int index);
-								short getShort(int index);
-								bool isValidInteger(int index);
-								int getInteger(int index);
-								bool isValidLong(int index);
-								long getLong(int index);
-								bool isValidBigInteger(int index);
-								long long getBigInteger(int index);
-								bool isValidFloat(int index);
-								float getFloat(int index);
-								bool isValidDouble(int index);
-								double getDouble(int index);
-								bool isValidBigDecimal(int index);
-								cpp_dec_float_100 getBigDecimal(int index);
-
-							private:
-							};
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _DEFAULT_LOCAL_DATE_FIELD_ITEM
+#define _DEFAULT_LOCAL_DATE_FIELD_ITEM
+
+#include <boost/multiprecision/cpp_dec_float.hpp>
+#include "BaseDefaultFieldItem.h"
+
+using namespace org::apache::plc4x::cpp::api::exceptions;
+using namespace boost::multiprecision;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{					
+						namespace items
+						{							
+							class DefaultLocalDateFieldItem : public BaseDefaultFieldItem<time_t>
+							{
+								typedef time_t data_type;
+							public:
+								template<typename T>
+								DefaultLocalDateFieldItem(std::vector<T> values);
+
+								template<typename T>
+								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
+								inline bool isValidBoolean(int index) {	return true;	}
+								bool getBoolean(int index);
+								bool isValidByte(int index);
+								char getByte(int index);
+								bool isValidShort(int index);
+								short getShort(int index);
+								bool isValidInteger(int index);
+								int getInteger(int index);
+								bool isValidLong(int index);
+								long getLong(int index);
+								bool isValidBigInteger(int index);
+								long long getBigInteger(int index);
+								bool isValidFloat(int index);
+								float getFloat(int index);
+								bool isValidDouble(int index);
+								double getDouble(int index);
+								bool isValidBigDecimal(int index);
+								cpp_dec_float_100 getBigDecimal(int index);
+
+							private:
+							};
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalDateTimeFieldItem.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalDateTimeFieldItem.cpp
index 3b9e1c55491..618ed4b9c5e 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalDateTimeFieldItem.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalDateTimeFieldItem.cpp
@@ -1,95 +1,95 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "DefaultLocalDateTimeFieldItem.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						namespace items
-						{
-							// ==================================================
-							bool DefaultLocalDateTimeFieldItem::isValidTime(int index)
-							{
-								return true;
-							}
-
-							// ===================================================
-							time_t DefaultLocalDateTimeFieldItem::getTime(int index)
-							{								
-								return getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultLocalDateTimeFieldItem::isValidDateTime(int index)
-							{
-								return isValidTime(index);
-							}
-
-							// ===================================================
-							time_t  DefaultLocalDateTimeFieldItem::getDateTime(int index)
-							{
-								if (!isValidDateTime(index))
-								{
-									throw new PlcIncompatibleDatatypeException("time_t", index);
-								}
-
-								return getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultLocalDateTimeFieldItem::isValidDate(int index)
-							{
-								return true;
-							}
-
-							// ===================================================
-							tm DefaultLocalDateTimeFieldItem::getDate(int index)
-							{
-								if (!isValidDateTime(index))
-								{
-									throw new PlcIncompatibleDatatypeException("time_t", index);
-								}
-
-								time_t time = getValue(index);
-								
-								#pragma warning(suppress : 4996)
-								tm* date = gmtime(&time);
-
-								return *date;
-							}
-
-						
-						}
-						
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "DefaultLocalDateTimeFieldItem.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						namespace items
+						{
+							// ==================================================
+							bool DefaultLocalDateTimeFieldItem::isValidTime(int index)
+							{
+								return true;
+							}
+
+							// ===================================================
+							time_t DefaultLocalDateTimeFieldItem::getTime(int index)
+							{								
+								return getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultLocalDateTimeFieldItem::isValidDateTime(int index)
+							{
+								return isValidTime(index);
+							}
+
+							// ===================================================
+							time_t  DefaultLocalDateTimeFieldItem::getDateTime(int index)
+							{
+								if (!isValidDateTime(index))
+								{
+									throw new PlcIncompatibleDatatypeException("time_t", index);
+								}
+
+								return getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultLocalDateTimeFieldItem::isValidDate(int index)
+							{
+								return true;
+							}
+
+							// ===================================================
+							tm DefaultLocalDateTimeFieldItem::getDate(int index)
+							{
+								if (!isValidDateTime(index))
+								{
+									throw new PlcIncompatibleDatatypeException("time_t", index);
+								}
+
+								time_t time = getValue(index);
+								
+								#pragma warning(suppress : 4996)
+								tm* date = gmtime(&time);
+
+								return *date;
+							}
+
+						
+						}
+						
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalDateTimeFieldItem.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalDateTimeFieldItem.h
index efc0e7f7891..d9938759596 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalDateTimeFieldItem.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalDateTimeFieldItem.h
@@ -1,71 +1,71 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _DEFAULT_LOCAL_DATE_TIME_FIELD_ITEM
-#define _DEFAULT_LOCAL_DATE_TIME_FIELD_ITEM
-
-#include <boost/multiprecision/cpp_dec_float.hpp>
-#include <boost/date_time/posix_time/conversion.hpp>
-#include <ctime>
-#include "BaseDefaultFieldItem.h"
-
-using namespace org::apache::plc4x::cpp::api::exceptions;
-using namespace boost::multiprecision;
-using namespace boost::posix_time;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{					
-						namespace items
-						{							
-							class DefaultLocalDateTimeFieldItem : public BaseDefaultFieldItem<time_t>
-							{
-								typedef time_t data_type;
-							public:
-								template<typename T>
-								DefaultLocalDateTimeFieldItem(std::vector<T> values);
-
-								template<typename T>
-								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
-								bool isValidTime(int index);
-								time_t getTime(int index);
-								bool isValidDate(int index);
-								tm getDate(int index);
-								bool isValidDateTime(int index);
-								time_t getDateTime(int index);
-							private:
-							};
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _DEFAULT_LOCAL_DATE_TIME_FIELD_ITEM
+#define _DEFAULT_LOCAL_DATE_TIME_FIELD_ITEM
+
+#include <boost/multiprecision/cpp_dec_float.hpp>
+#include <boost/date_time/posix_time/conversion.hpp>
+#include <ctime>
+#include "BaseDefaultFieldItem.h"
+
+using namespace org::apache::plc4x::cpp::api::exceptions;
+using namespace boost::multiprecision;
+using namespace boost::posix_time;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{					
+						namespace items
+						{							
+							class DefaultLocalDateTimeFieldItem : public BaseDefaultFieldItem<time_t>
+							{
+								typedef time_t data_type;
+							public:
+								template<typename T>
+								DefaultLocalDateTimeFieldItem(std::vector<T> values);
+
+								template<typename T>
+								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
+								bool isValidTime(int index);
+								time_t getTime(int index);
+								bool isValidDate(int index);
+								tm getDate(int index);
+								bool isValidDateTime(int index);
+								time_t getDateTime(int index);
+							private:
+							};
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalTimeFieldItem.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalTimeFieldItem.cpp
index f688f0fd690..1b10af72862 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalTimeFieldItem.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalTimeFieldItem.cpp
@@ -1,95 +1,95 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "DefaultLocalTimeFieldItem.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						namespace items
-						{
-							// ==================================================
-							bool DefaultLocalTimeFieldItem::isValidTime(int index)
-							{
-								return true;
-							}
-
-							// ===================================================
-							time_t DefaultLocalTimeFieldItem::getTime(int index)
-							{								
-								return getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultLocalTimeFieldItem::isValidDateTime(int index)
-							{
-								return isValidTime(index);
-							}
-
-							// ===================================================
-							time_t  DefaultLocalTimeFieldItem::getDateTime(int index)
-							{
-								if (!isValidDateTime(index))
-								{
-									throw new PlcIncompatibleDatatypeException("time_t", index);
-								}
-
-								return getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultLocalTimeFieldItem::isValidDate(int index)
-							{
-								return true;
-							}
-
-							// ===================================================
-							tm DefaultLocalTimeFieldItem::getDate(int index)
-							{
-								if (!isValidDateTime(index))
-								{
-									throw new PlcIncompatibleDatatypeException("time_t", index);
-								}
-
-								time_t time = getValue(index);
-								
-								#pragma warning(suppress : 4996)
-								tm* date = gmtime(&time);
-
-								return *date;
-							}
-
-						
-						}
-						
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "DefaultLocalTimeFieldItem.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						namespace items
+						{
+							// ==================================================
+							bool DefaultLocalTimeFieldItem::isValidTime(int index)
+							{
+								return true;
+							}
+
+							// ===================================================
+							time_t DefaultLocalTimeFieldItem::getTime(int index)
+							{								
+								return getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultLocalTimeFieldItem::isValidDateTime(int index)
+							{
+								return isValidTime(index);
+							}
+
+							// ===================================================
+							time_t  DefaultLocalTimeFieldItem::getDateTime(int index)
+							{
+								if (!isValidDateTime(index))
+								{
+									throw new PlcIncompatibleDatatypeException("time_t", index);
+								}
+
+								return getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultLocalTimeFieldItem::isValidDate(int index)
+							{
+								return true;
+							}
+
+							// ===================================================
+							tm DefaultLocalTimeFieldItem::getDate(int index)
+							{
+								if (!isValidDateTime(index))
+								{
+									throw new PlcIncompatibleDatatypeException("time_t", index);
+								}
+
+								time_t time = getValue(index);
+								
+								#pragma warning(suppress : 4996)
+								tm* date = gmtime(&time);
+
+								return *date;
+							}
+
+						
+						}
+						
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalTimeFieldItem.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalTimeFieldItem.h
index cd5eb3dadb6..05f98fd0e89 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalTimeFieldItem.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLocalTimeFieldItem.h
@@ -1,71 +1,71 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _DEFAULT_LOCAL_TIME_FIELD_ITEM
-#define _DEFAULT_LOCAL_TIME_FIELD_ITEM
-
-#include <boost/multiprecision/cpp_dec_float.hpp>
-#include <boost/date_time/posix_time/conversion.hpp>
-#include <ctime>
-#include "BaseDefaultFieldItem.h"
-
-using namespace org::apache::plc4x::cpp::api::exceptions;
-using namespace boost::multiprecision;
-using namespace boost::posix_time;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{					
-						namespace items
-						{							
-							class DefaultLocalTimeFieldItem : public BaseDefaultFieldItem<time_t>
-							{
-								typedef time_t data_type;
-							public:
-								template<typename T>
-								DefaultLocalTimeFieldItem(std::vector<T> values);
-
-								template<typename T>
-								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
-								bool isValidTime(int index);
-								time_t getTime(int index);
-								bool isValidDate(int index);
-								tm getDate(int index);
-								bool isValidDateTime(int index);
-								time_t getDateTime(int index);
-							private:
-							};
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _DEFAULT_LOCAL_TIME_FIELD_ITEM
+#define _DEFAULT_LOCAL_TIME_FIELD_ITEM
+
+#include <boost/multiprecision/cpp_dec_float.hpp>
+#include <boost/date_time/posix_time/conversion.hpp>
+#include <ctime>
+#include "BaseDefaultFieldItem.h"
+
+using namespace org::apache::plc4x::cpp::api::exceptions;
+using namespace boost::multiprecision;
+using namespace boost::posix_time;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{					
+						namespace items
+						{							
+							class DefaultLocalTimeFieldItem : public BaseDefaultFieldItem<time_t>
+							{
+								typedef time_t data_type;
+							public:
+								template<typename T>
+								DefaultLocalTimeFieldItem(std::vector<T> values);
+
+								template<typename T>
+								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
+								bool isValidTime(int index);
+								time_t getTime(int index);
+								bool isValidDate(int index);
+								tm getDate(int index);
+								bool isValidDateTime(int index);
+								time_t getDateTime(int index);
+							private:
+							};
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLongFieldItem.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLongFieldItem.cpp
index e66678b4e5a..84033c5fb8f 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLongFieldItem.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLongFieldItem.cpp
@@ -1,196 +1,196 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "DefaultLongFieldItem.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						namespace items
-						{
-							// ==================================================
-							bool DefaultLongFieldItem::getBoolean(int index)
-							{
-								if (!isValidBoolean(index))
-								{
-									throw new PlcIncompatibleDatatypeException("bool", index);
-								}
-
-								return getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultLongFieldItem::isValidByte(int index)
-							{
-								data_type value = getValue(index);
-								return value <= -127 && value >= -128;
-							}
-
-							// ===================================================
-							char DefaultLongFieldItem::getByte(int index)
-							{
-								if (!isValidByte(index)) 
-								{
-									throw new PlcIncompatibleDatatypeException("char", index);
-								}
-								return (char) getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultLongFieldItem::isValidShort(int index)
-							{
-								data_type value = getValue(index);
-								return value >= -32768 && value <= 32767;
-							}
-
-							// ===================================================
-							short DefaultLongFieldItem::getShort(int index)
-							{
-								if (!isValidShort(index))
-								{
-									throw new PlcIncompatibleDatatypeException("short", index);
-								}
-								
-								return (short)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultLongFieldItem::isValidInteger(int index)
-							{
-								data_type value = getValue(index);
-								return value >= 0 && value <= 2147483647;
-							}
-
-							// ===================================================
-							int DefaultLongFieldItem::getInteger(int index)
-							{
-								if (!isValidInteger(index))
-								{
-									throw new PlcIncompatibleDatatypeException("int", index);
-								}
-
-								return (int)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultLongFieldItem::isValidLong(int index)
-							{
-								data_type value = getValue(index);
-								return value >= -(2 ^ 63) && value <= (2 ^ 63) - 1;
-							}
-
-							// ===================================================
-							long DefaultLongFieldItem::getLong(int index)
-							{
-								if (!isValidLong(index))
-								{
-									throw new PlcIncompatibleDatatypeException("long", index);
-								}
-
-								return (long)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultLongFieldItem::isValidBigInteger(int index)
-							{
-								return true;
-							}
-
-							// ===================================================
-							long long DefaultLongFieldItem::getBigInteger(int index)
-							{
-								if (!isValidBigInteger(index))
-								{
-									throw new PlcIncompatibleDatatypeException("long long", index);
-								}
-								
-								// Todo: add conversion from cpp_dec_float_100 TO long long
-								return (long)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultLongFieldItem::isValidFloat(int index)
-							{
-								data_type value = getValue(index);
-								return value >= -3.4e38 && value <= 3.4e38;
-							}
-
-							// ===================================================
-							float DefaultLongFieldItem::getFloat(int index)
-							{
-								if (!isValidFloat(index))
-								{
-									throw new PlcIncompatibleDatatypeException("float", index);
-								}
-
-								return (float)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultLongFieldItem::isValidDouble(int index)
-							{
-								data_type value = getValue(index);
-								return value >= -1.7e308 && value <= 1.7e308;
-							}
-
-							// ===================================================
-							double DefaultLongFieldItem::getDouble(int index)
-							{
-								if (!isValidDouble(index))
-								{
-									throw new PlcIncompatibleDatatypeException("double", index);
-								}
-
-								return (double)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultLongFieldItem::isValidBigDecimal(int index)
-							{
-								// same limits but higher precision
-								return isValidDouble(index);
-							}
-
-							// ===================================================
-							cpp_dec_float_100 DefaultLongFieldItem::getBigDecimal(int index)
-							{
-								if (!isValidBigDecimal(index))
-								{
-									throw new PlcIncompatibleDatatypeException("cpp_dec_float_100", index);
-								}
-
-								return (cpp_dec_float_100)getValue(index);
-							}
-						}
-						
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "DefaultLongFieldItem.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						namespace items
+						{
+							// ==================================================
+							bool DefaultLongFieldItem::getBoolean(int index)
+							{
+								if (!isValidBoolean(index))
+								{
+									throw new PlcIncompatibleDatatypeException("bool", index);
+								}
+
+								return getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultLongFieldItem::isValidByte(int index)
+							{
+								data_type value = getValue(index);
+								return value <= -127 && value >= -128;
+							}
+
+							// ===================================================
+							char DefaultLongFieldItem::getByte(int index)
+							{
+								if (!isValidByte(index)) 
+								{
+									throw new PlcIncompatibleDatatypeException("char", index);
+								}
+								return (char) getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultLongFieldItem::isValidShort(int index)
+							{
+								data_type value = getValue(index);
+								return value >= -32768 && value <= 32767;
+							}
+
+							// ===================================================
+							short DefaultLongFieldItem::getShort(int index)
+							{
+								if (!isValidShort(index))
+								{
+									throw new PlcIncompatibleDatatypeException("short", index);
+								}
+								
+								return (short)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultLongFieldItem::isValidInteger(int index)
+							{
+								data_type value = getValue(index);
+								return value >= 0 && value <= 2147483647;
+							}
+
+							// ===================================================
+							int DefaultLongFieldItem::getInteger(int index)
+							{
+								if (!isValidInteger(index))
+								{
+									throw new PlcIncompatibleDatatypeException("int", index);
+								}
+
+								return (int)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultLongFieldItem::isValidLong(int index)
+							{
+								data_type value = getValue(index);
+								return value >= -(2 ^ 63) && value <= (2 ^ 63) - 1;
+							}
+
+							// ===================================================
+							long DefaultLongFieldItem::getLong(int index)
+							{
+								if (!isValidLong(index))
+								{
+									throw new PlcIncompatibleDatatypeException("long", index);
+								}
+
+								return (long)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultLongFieldItem::isValidBigInteger(int index)
+							{
+								return true;
+							}
+
+							// ===================================================
+							long long DefaultLongFieldItem::getBigInteger(int index)
+							{
+								if (!isValidBigInteger(index))
+								{
+									throw new PlcIncompatibleDatatypeException("long long", index);
+								}
+								
+								// Todo: add conversion from cpp_dec_float_100 TO long long
+								return (long)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultLongFieldItem::isValidFloat(int index)
+							{
+								data_type value = getValue(index);
+								return value >= -3.4e38 && value <= 3.4e38;
+							}
+
+							// ===================================================
+							float DefaultLongFieldItem::getFloat(int index)
+							{
+								if (!isValidFloat(index))
+								{
+									throw new PlcIncompatibleDatatypeException("float", index);
+								}
+
+								return (float)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultLongFieldItem::isValidDouble(int index)
+							{
+								data_type value = getValue(index);
+								return value >= -1.7e308 && value <= 1.7e308;
+							}
+
+							// ===================================================
+							double DefaultLongFieldItem::getDouble(int index)
+							{
+								if (!isValidDouble(index))
+								{
+									throw new PlcIncompatibleDatatypeException("double", index);
+								}
+
+								return (double)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultLongFieldItem::isValidBigDecimal(int index)
+							{
+								// same limits but higher precision
+								return isValidDouble(index);
+							}
+
+							// ===================================================
+							cpp_dec_float_100 DefaultLongFieldItem::getBigDecimal(int index)
+							{
+								if (!isValidBigDecimal(index))
+								{
+									throw new PlcIncompatibleDatatypeException("cpp_dec_float_100", index);
+								}
+
+								return (cpp_dec_float_100)getValue(index);
+							}
+						}
+						
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLongFieldItem.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLongFieldItem.h
index e6d31fc7636..472861049cc 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLongFieldItem.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultLongFieldItem.h
@@ -1,82 +1,82 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _DEFAULT_LONG_FIELD_ITEM
-#define _DEFAULT_LONG_FIELD_ITEM
-
-#include <boost/multiprecision/cpp_dec_float.hpp>
-#include "BaseDefaultFieldItem.h"
-
-using namespace org::apache::plc4x::cpp::api::exceptions;
-using namespace boost::multiprecision;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{					
-						namespace items
-						{							
-							class DefaultLongFieldItem : public BaseDefaultFieldItem<short>
-							{
-								
-							public:
-								template<typename T>
-								DefaultLongFieldItem(std::vector<T> values);
-
-								template<typename T>
-								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
-								inline bool isValidBoolean(int index) {	return true;	}
-								bool getBoolean(int index);
-								bool isValidByte(int index);
-								char getByte(int index);
-								bool isValidShort(int index);
-								short getShort(int index);
-								bool isValidInteger(int index);
-								int getInteger(int index);
-								bool isValidLong(int index);
-								long getLong(int index);
-								bool isValidBigInteger(int index);
-								long long getBigInteger(int index);
-								bool isValidFloat(int index);
-								float getFloat(int index);
-								bool isValidDouble(int index);
-								double getDouble(int index);
-								bool isValidBigDecimal(int index);
-								cpp_dec_float_100 getBigDecimal(int index);
-
-							private:
-								typedef long data_type;
-							};
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _DEFAULT_LONG_FIELD_ITEM
+#define _DEFAULT_LONG_FIELD_ITEM
+
+#include <boost/multiprecision/cpp_dec_float.hpp>
+#include "BaseDefaultFieldItem.h"
+
+using namespace org::apache::plc4x::cpp::api::exceptions;
+using namespace boost::multiprecision;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{					
+						namespace items
+						{							
+							class DefaultLongFieldItem : public BaseDefaultFieldItem<short>
+							{
+								
+							public:
+								template<typename T>
+								DefaultLongFieldItem(std::vector<T> values);
+
+								template<typename T>
+								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
+								inline bool isValidBoolean(int index) {	return true;	}
+								bool getBoolean(int index);
+								bool isValidByte(int index);
+								char getByte(int index);
+								bool isValidShort(int index);
+								short getShort(int index);
+								bool isValidInteger(int index);
+								int getInteger(int index);
+								bool isValidLong(int index);
+								long getLong(int index);
+								bool isValidBigInteger(int index);
+								long long getBigInteger(int index);
+								bool isValidFloat(int index);
+								float getFloat(int index);
+								bool isValidDouble(int index);
+								double getDouble(int index);
+								bool isValidBigDecimal(int index);
+								cpp_dec_float_100 getBigDecimal(int index);
+
+							private:
+								typedef long data_type;
+							};
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultShortFieldItem.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultShortFieldItem.cpp
index c2a94dd6a11..c16735dfc41 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultShortFieldItem.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultShortFieldItem.cpp
@@ -1,196 +1,196 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "DefaultShortFieldItem.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						namespace items
-						{
-							// ==================================================
-							bool DefaultShortFieldItem::getBoolean(int index)
-							{
-								if (!isValidBoolean(index))
-								{
-									throw new PlcIncompatibleDatatypeException("bool", index);
-								}
-
-								return getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultShortFieldItem::isValidByte(int index)
-							{
-								data_type value = getValue(index);
-								return value <= -127 && value >= -128;
-							}
-
-							// ===================================================
-							char DefaultShortFieldItem::getByte(int index)
-							{
-								if (!isValidByte(index)) 
-								{
-									throw new PlcIncompatibleDatatypeException("char", index);
-								}
-								return (char) getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultShortFieldItem::isValidShort(int index)
-							{
-								data_type value = getValue(index);
-								return value >= -32768 && value <= 32767;
-							}
-
-							// ===================================================
-							short DefaultShortFieldItem::getShort(int index)
-							{
-								if (!isValidShort(index))
-								{
-									throw new PlcIncompatibleDatatypeException("short", index);
-								}
-								
-								return (short)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultShortFieldItem::isValidInteger(int index)
-							{
-								data_type value = getValue(index);
-								return value >= 0;
-							}
-
-							// ===================================================
-							int DefaultShortFieldItem::getInteger(int index)
-							{
-								if (!isValidInteger(index))
-								{
-									throw new PlcIncompatibleDatatypeException("int", index);
-								}
-
-								return (int)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultShortFieldItem::isValidLong(int index)
-							{
-								data_type value = getValue(index);
-								return value >= -(2 ^ 63) && value <= (2 ^ 63) - 1;
-							}
-
-							// ===================================================
-							long DefaultShortFieldItem::getLong(int index)
-							{
-								if (!isValidLong(index))
-								{
-									throw new PlcIncompatibleDatatypeException("long", index);
-								}
-
-								return (long)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultShortFieldItem::isValidBigInteger(int index)
-							{
-								return true;
-							}
-
-							// ===================================================
-							long long DefaultShortFieldItem::getBigInteger(int index)
-							{
-								if (!isValidBigInteger(index))
-								{
-									throw new PlcIncompatibleDatatypeException("long long", index);
-								}
-								
-								// Todo: add conversion from cpp_dec_float_100 TO long long
-								return (long)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultShortFieldItem::isValidFloat(int index)
-							{
-								data_type value = getValue(index);
-								return value >= -3.4e38 && value <= 3.4e38;
-							}
-
-							// ===================================================
-							float DefaultShortFieldItem::getFloat(int index)
-							{
-								if (!isValidFloat(index))
-								{
-									throw new PlcIncompatibleDatatypeException("float", index);
-								}
-
-								return (float)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultShortFieldItem::isValidDouble(int index)
-							{
-								data_type value = getValue(index);
-								return value >= -1.7e308 && value <= 1.7e308;
-							}
-
-							// ===================================================
-							double DefaultShortFieldItem::getDouble(int index)
-							{
-								if (!isValidDouble(index))
-								{
-									throw new PlcIncompatibleDatatypeException("double", index);
-								}
-
-								return (double)getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultShortFieldItem::isValidBigDecimal(int index)
-							{
-								// same limits but higher precision
-								return isValidDouble(index);
-							}
-
-							// ===================================================
-							cpp_dec_float_100 DefaultShortFieldItem::getBigDecimal(int index)
-							{
-								if (!isValidBigDecimal(index))
-								{
-									throw new PlcIncompatibleDatatypeException("cpp_dec_float_100", index);
-								}
-
-								return (cpp_dec_float_100)getValue(index);
-							}
-						}
-						
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "DefaultShortFieldItem.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						namespace items
+						{
+							// ==================================================
+							bool DefaultShortFieldItem::getBoolean(int index)
+							{
+								if (!isValidBoolean(index))
+								{
+									throw new PlcIncompatibleDatatypeException("bool", index);
+								}
+
+								return getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultShortFieldItem::isValidByte(int index)
+							{
+								data_type value = getValue(index);
+								return value <= -127 && value >= -128;
+							}
+
+							// ===================================================
+							char DefaultShortFieldItem::getByte(int index)
+							{
+								if (!isValidByte(index)) 
+								{
+									throw new PlcIncompatibleDatatypeException("char", index);
+								}
+								return (char) getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultShortFieldItem::isValidShort(int index)
+							{
+								data_type value = getValue(index);
+								return value >= -32768 && value <= 32767;
+							}
+
+							// ===================================================
+							short DefaultShortFieldItem::getShort(int index)
+							{
+								if (!isValidShort(index))
+								{
+									throw new PlcIncompatibleDatatypeException("short", index);
+								}
+								
+								return (short)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultShortFieldItem::isValidInteger(int index)
+							{
+								data_type value = getValue(index);
+								return value >= 0;
+							}
+
+							// ===================================================
+							int DefaultShortFieldItem::getInteger(int index)
+							{
+								if (!isValidInteger(index))
+								{
+									throw new PlcIncompatibleDatatypeException("int", index);
+								}
+
+								return (int)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultShortFieldItem::isValidLong(int index)
+							{
+								data_type value = getValue(index);
+								return value >= -(2 ^ 63) && value <= (2 ^ 63) - 1;
+							}
+
+							// ===================================================
+							long DefaultShortFieldItem::getLong(int index)
+							{
+								if (!isValidLong(index))
+								{
+									throw new PlcIncompatibleDatatypeException("long", index);
+								}
+
+								return (long)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultShortFieldItem::isValidBigInteger(int index)
+							{
+								return true;
+							}
+
+							// ===================================================
+							long long DefaultShortFieldItem::getBigInteger(int index)
+							{
+								if (!isValidBigInteger(index))
+								{
+									throw new PlcIncompatibleDatatypeException("long long", index);
+								}
+								
+								// Todo: add conversion from cpp_dec_float_100 TO long long
+								return (long)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultShortFieldItem::isValidFloat(int index)
+							{
+								data_type value = getValue(index);
+								return value >= -3.4e38 && value <= 3.4e38;
+							}
+
+							// ===================================================
+							float DefaultShortFieldItem::getFloat(int index)
+							{
+								if (!isValidFloat(index))
+								{
+									throw new PlcIncompatibleDatatypeException("float", index);
+								}
+
+								return (float)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultShortFieldItem::isValidDouble(int index)
+							{
+								data_type value = getValue(index);
+								return value >= -1.7e308 && value <= 1.7e308;
+							}
+
+							// ===================================================
+							double DefaultShortFieldItem::getDouble(int index)
+							{
+								if (!isValidDouble(index))
+								{
+									throw new PlcIncompatibleDatatypeException("double", index);
+								}
+
+								return (double)getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultShortFieldItem::isValidBigDecimal(int index)
+							{
+								// same limits but higher precision
+								return isValidDouble(index);
+							}
+
+							// ===================================================
+							cpp_dec_float_100 DefaultShortFieldItem::getBigDecimal(int index)
+							{
+								if (!isValidBigDecimal(index))
+								{
+									throw new PlcIncompatibleDatatypeException("cpp_dec_float_100", index);
+								}
+
+								return (cpp_dec_float_100)getValue(index);
+							}
+						}
+						
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultShortFieldItem.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultShortFieldItem.h
index 9a8ac2bada9..4154fe95a81 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultShortFieldItem.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultShortFieldItem.h
@@ -1,82 +1,82 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _DEFAULT_SHORT_FIELD_ITEM
-#define _DEFAULT_SHORT_FIELD_ITEM
-
-#include <boost/multiprecision/cpp_dec_float.hpp>
-#include "BaseDefaultFieldItem.h"
-
-using namespace org::apache::plc4x::cpp::api::exceptions;
-using namespace boost::multiprecision;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{					
-						namespace items
-						{							
-							class DefaultShortFieldItem : public BaseDefaultFieldItem<short>
-							{
-								
-							public:
-								template<typename T>
-								DefaultShortFieldItem(std::vector<T> values);
-
-								template<typename T>
-								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
-								inline bool isValidBoolean(int index) {	return true;	}
-								bool getBoolean(int index);
-								bool isValidByte(int index);
-								char getByte(int index);
-								bool isValidShort(int index);
-								short getShort(int index);
-								bool isValidInteger(int index);
-								int getInteger(int index);
-								bool isValidLong(int index);
-								long getLong(int index);
-								bool isValidBigInteger(int index);
-								long long getBigInteger(int index);
-								bool isValidFloat(int index);
-								float getFloat(int index);
-								bool isValidDouble(int index);
-								double getDouble(int index);
-								bool isValidBigDecimal(int index);
-								cpp_dec_float_100 getBigDecimal(int index);
-
-							private:
-								typedef short data_type;
-							};
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _DEFAULT_SHORT_FIELD_ITEM
+#define _DEFAULT_SHORT_FIELD_ITEM
+
+#include <boost/multiprecision/cpp_dec_float.hpp>
+#include "BaseDefaultFieldItem.h"
+
+using namespace org::apache::plc4x::cpp::api::exceptions;
+using namespace boost::multiprecision;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{					
+						namespace items
+						{							
+							class DefaultShortFieldItem : public BaseDefaultFieldItem<short>
+							{
+								
+							public:
+								template<typename T>
+								DefaultShortFieldItem(std::vector<T> values);
+
+								template<typename T>
+								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
+								inline bool isValidBoolean(int index) {	return true;	}
+								bool getBoolean(int index);
+								bool isValidByte(int index);
+								char getByte(int index);
+								bool isValidShort(int index);
+								short getShort(int index);
+								bool isValidInteger(int index);
+								int getInteger(int index);
+								bool isValidLong(int index);
+								long getLong(int index);
+								bool isValidBigInteger(int index);
+								long long getBigInteger(int index);
+								bool isValidFloat(int index);
+								float getFloat(int index);
+								bool isValidDouble(int index);
+								double getDouble(int index);
+								bool isValidBigDecimal(int index);
+								cpp_dec_float_100 getBigDecimal(int index);
+
+							private:
+								typedef short data_type;
+							};
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultStringFieldItem.cpp b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultStringFieldItem.cpp
index cc66fd0b5ea..98eb9c4055f 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultStringFieldItem.cpp
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultStringFieldItem.cpp
@@ -1,59 +1,59 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "DefaultStringFieldItem.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{
-						namespace items
-						{
-							// ==================================================
-							std::string DefaultStringFieldItem::getString(int index)
-							{
-								if (!isValidString(index))
-								{
-									throw new PlcIncompatibleDatatypeException("std::string", index);
-								}
-
-								return getValue(index);
-							}
-
-							// ===================================================
-							bool DefaultStringFieldItem::isValidString(int index)
-							{								
-								return true;
-							}							
-						}
-						
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "DefaultStringFieldItem.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{
+						namespace items
+						{
+							// ==================================================
+							std::string DefaultStringFieldItem::getString(int index)
+							{
+								if (!isValidString(index))
+								{
+									throw new PlcIncompatibleDatatypeException("std::string", index);
+								}
+
+								return getValue(index);
+							}
+
+							// ===================================================
+							bool DefaultStringFieldItem::isValidString(int index)
+							{								
+								return true;
+							}							
+						}
+						
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultStringFieldItem.h b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultStringFieldItem.h
index 4e97cdd811e..fa353a960dc 100644
--- a/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultStringFieldItem.h
+++ b/sandbox/plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultStringFieldItem.h
@@ -1,66 +1,66 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _DEFAULT_STRING_FIELD_ITEM
-#define _DEFAULT_STRING_FIELD_ITEM
-
-#include <boost/multiprecision/cpp_dec_float.hpp>
-#include "BaseDefaultFieldItem.h"
-
-using namespace org::apache::plc4x::cpp::api::exceptions;
-using namespace boost::multiprecision;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace base
-				{
-					namespace messages
-					{					
-						namespace items
-						{							
-							class DefaultStringFieldItem : public BaseDefaultFieldItem<std::string>
-							{
-								
-							public:
-								template<typename T>
-								DefaultStringFieldItem(std::vector<T> values);
-
-								template<typename T>
-								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
-								inline bool isValidString(int index);
-								std::string getString(int index);
-
-							private:
-								typedef std::string data_type;
-							};
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _DEFAULT_STRING_FIELD_ITEM
+#define _DEFAULT_STRING_FIELD_ITEM
+
+#include <boost/multiprecision/cpp_dec_float.hpp>
+#include "BaseDefaultFieldItem.h"
+
+using namespace org::apache::plc4x::cpp::api::exceptions;
+using namespace boost::multiprecision;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace messages
+					{					
+						namespace items
+						{							
+							class DefaultStringFieldItem : public BaseDefaultFieldItem<std::string>
+							{
+								
+							public:
+								template<typename T>
+								DefaultStringFieldItem(std::vector<T> values);
+
+								template<typename T>
+								inline T getObject(int index) { return BaseDefaultFieldItem::getValue(index); }
+								inline bool isValidString(int index);
+								std::string getString(int index);
+
+							private:
+								typedef std::string data_type;
+							};
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/protocols/s7/src/main/cpp/org/apache/plc4x/cpp/s7/types/S7ControllerType.h b/sandbox/plc4cpp/protocols/s7/src/main/cpp/org/apache/plc4x/cpp/s7/types/S7ControllerType.h
index 1a100300cf0..020f2558882 100644
--- a/sandbox/plc4cpp/protocols/s7/src/main/cpp/org/apache/plc4x/cpp/s7/types/S7ControllerType.h
+++ b/sandbox/plc4cpp/protocols/s7/src/main/cpp/org/apache/plc4x/cpp/s7/types/S7ControllerType.h
@@ -1,65 +1,65 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _S7_CONTROLLER_TYPE
-#define _S7_CONTROLLER_TYPE
-
-namespace org
-{
-    namespace apache
-    {
-        namespace plc4x
-        {
-            namespace cpp
-            {
-                namespace s7
-                {
-                    namespace types
-                    {
-                        enum S7ControllerType {
-
-                            ANY,
-                            S7_300,
-                            S7_400,
-                            S7_1200,
-                            S7_1500,
-                            LOGO
-                        };
-
-                        struct S7ControllerTypeMap : public std::map<std::string, S7ControllerType>
-                        {
-                            S7ControllerTypeMap()
-                            {
-                                this->operator[]("any") = S7ControllerType::ANY;
-                                this->operator[]("s7_300") = S7ControllerType::S7_300;
-                                this->operator[]("s7_400") = S7ControllerType::S7_400;
-                                this->operator[]("s7_1200") = S7ControllerType::S7_1200;
-                                this->operator[]("s7_1500") = S7ControllerType::S7_1500;
-                                this->operator[]("logo") = S7ControllerType::LOGO;
-                            };
-                            ~S7ControllerTypeMap() {}
-                        };
-                    }
-                }
-            }
-        }
-    }
-}
-
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _S7_CONTROLLER_TYPE
+#define _S7_CONTROLLER_TYPE
+
+namespace org
+{
+    namespace apache
+    {
+        namespace plc4x
+        {
+            namespace cpp
+            {
+                namespace s7
+                {
+                    namespace types
+                    {
+                        enum S7ControllerType {
+
+                            ANY,
+                            S7_300,
+                            S7_400,
+                            S7_1200,
+                            S7_1500,
+                            LOGO
+                        };
+
+                        struct S7ControllerTypeMap : public std::map<std::string, S7ControllerType>
+                        {
+                            S7ControllerTypeMap()
+                            {
+                                this->operator[]("any") = S7ControllerType::ANY;
+                                this->operator[]("s7_300") = S7ControllerType::S7_300;
+                                this->operator[]("s7_400") = S7ControllerType::S7_400;
+                                this->operator[]("s7_1200") = S7ControllerType::S7_1200;
+                                this->operator[]("s7_1500") = S7ControllerType::S7_1500;
+                                this->operator[]("logo") = S7ControllerType::LOGO;
+                            };
+                            ~S7ControllerTypeMap() {}
+                        };
+                    }
+                }
+            }
+        }
+    }
+}
+
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/utils/CMakeLists.txt b/sandbox/plc4cpp/utils/CMakeLists.txt
index be2e8f8dc11..879dbd46799 100644
--- a/sandbox/plc4cpp/utils/CMakeLists.txt
+++ b/sandbox/plc4cpp/utils/CMakeLists.txt
@@ -1,22 +1,22 @@
-#[[
-  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
-
-      http://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.
-]]
-
-add_subdirectory(logger)
-add_subdirectory(systemconfig)
-
+#[[
+  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
+
+      http://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.
+]]
+
+add_subdirectory(logger)
+add_subdirectory(systemconfig)
+
diff --git a/sandbox/plc4cpp/utils/logger/CMakeLists.txt b/sandbox/plc4cpp/utils/logger/CMakeLists.txt
index 3790cdc1ad4..28b7a9dcab2 100644
--- a/sandbox/plc4cpp/utils/logger/CMakeLists.txt
+++ b/sandbox/plc4cpp/utils/logger/CMakeLists.txt
@@ -1,31 +1,31 @@
-#[[
-  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
-
-      http://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.
-]]
-
-add_library(plc4cpp-utils-logger
-		src/main/cpp/org/apache/plc4x/cpp/utils/logger/BLogger.cpp
-        src/main/cpp/org/apache/plc4x/cpp/utils/logger/DatDmp.cpp
-		src/main/cpp/org/apache/plc4x/cpp/utils/logger/DbgTrace.cpp
-		src/main/cpp/org/apache/plc4x/cpp/utils/logger/ErrorCategory.cpp
-		src/main/cpp/org/apache/plc4x/cpp/utils/logger/ErrorInfoException.cpp
-		src/main/cpp/org/apache/plc4x/cpp/utils/logger/ExLog.cpp
-        )
-
-target_include_directories (plc4cpp-utils-logger PUBLIC ${Boost_INCLUDE_DIRS})
-
-target_link_libraries (plc4cpp-utils-logger ${Boost_LIBRARIES})
+#[[
+  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
+
+      http://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.
+]]
+
+add_library(plc4cpp-utils-logger
+		src/main/cpp/org/apache/plc4x/cpp/utils/logger/BLogger.cpp
+        src/main/cpp/org/apache/plc4x/cpp/utils/logger/DatDmp.cpp
+		src/main/cpp/org/apache/plc4x/cpp/utils/logger/DbgTrace.cpp
+		src/main/cpp/org/apache/plc4x/cpp/utils/logger/ErrorCategory.cpp
+		src/main/cpp/org/apache/plc4x/cpp/utils/logger/ErrorInfoException.cpp
+		src/main/cpp/org/apache/plc4x/cpp/utils/logger/ExLog.cpp
+        )
+
+target_include_directories (plc4cpp-utils-logger PUBLIC ${Boost_INCLUDE_DIRS})
+
+target_link_libraries (plc4cpp-utils-logger ${Boost_LIBRARIES})
diff --git a/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/BLogger.cpp b/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/BLogger.cpp
index 1eafef497a5..a313a5c5126 100644
--- a/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/BLogger.cpp
+++ b/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/BLogger.cpp
@@ -1,475 +1,475 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "BLogger.h"
-#include <boost/log/utility/setup/common_attributes.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/filesystem/fstream.hpp>
-#include <boost/regex.hpp>
-#include <boost/smart_ptr/shared_ptr.hpp>
-#include <boost/log/sinks/text_file_backend.hpp>
-#include <boost/log/core/core.hpp>
-#include <boost/log/attributes.hpp>
-#include <boost/log/attributes/scoped_attribute.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/thread.hpp>
-#include <boost/log/sinks/text_file_backend.hpp>
-#include <boost/log/utility/setup/file.hpp>
-#include <boost/log/sources/severity_logger.hpp>
-#include <boost/log/sources/record_ostream.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
-#include <boost/log/support/date_time.hpp>
-
-#include <ctime>
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace utils
-				{
-					namespace fs = boost::filesystem;
-					namespace logging = boost::log;
-					namespace attrs = boost::log::attributes;
-
-					const char* BLogger::_pDefaultFileTitle = "plc4x";
-					const char* BLogger::_pDefaultFileExtension = ".log";
-
-					BLogger* BLogger::m_pInstance = NULL;
-
-					BLogger* BLogger::Instance()
-					{
-						if (!m_pInstance)
-						{
-							m_pInstance = new BLogger;
-						}
-
-					return m_pInstance;
-					}
-
-					void BLogger::Release()
-					{
-						if (m_pInstance != NULL)
-						{
-							delete m_pInstance;
-							m_pInstance = NULL;
-						}
-
-					return;
-					}
-
-					BLogger::BLogger() :
-						_iMaxFileSize(10 * 1024 * 1024),			/* default max. filesize = 10 MB */
-						_uiMaxNumberOfFiles(5),
-						_strFileTitle(_pDefaultFileTitle),
-						_strFileExtension(_pDefaultFileExtension),
-						_logFilter (BoostLogger::trivial::severity >= BoostLogger::trivial::trace),
-						_severityLevel(BoostLogger::trivial::trace),
-						_uiFlushCounter(0)
-					{
-						_iSeverityLevelNumber=getNumberfromSeverityLevel(_severityLevel);
-
-						_uiMaxFlushEntrys[0] = 20 ; // trace
-						_uiMaxFlushEntrys[1] = 10 ; // debug
-						_uiMaxFlushEntrys[2] = 20 ; // info // 0 -> write once
-						_uiMaxFlushEntrys[3] = 0 ; // warning // 0 -> write once
-						_uiMaxFlushEntrys[4] = 0 ; // error // 0 -> write once
-						_uiMaxFlushEntrys[5] = 0 ; // fatal // 0 -> write once
-						
-                        Initialize();
-
-                        return;
-					}
-
-					BLogger::~BLogger()
-					{
-						_uiFlushCounter = _uiMaxFlushEntrys[_iSeverityLevelNumber];
-						FlushLog();
-
-                        return;
-					}
-
-					void BLogger::setFileTitle(string strFileTitle)
-					{
-						if (strFileTitle != _strFileTitle)
-						{
-							_strFileTitle = strFileTitle;
-                        }
-
-                        return;
-					}
-
-					void BLogger::setFileExtension(string strFileExtension)
-					{
-						if (strFileExtension != _strFileExtension)
-						{
-							_strFileExtension = strFileExtension;
-						}
-
-                        return;
-					}
-
-					void BLogger::setMaxFileSize(int iMaxFileSize)
-					{
-						if (iMaxFileSize != _iMaxFileSize)
-						{
-							_iMaxFileSize = iMaxFileSize; /* MB */
-						}
-
-                        return;
-					}
-
-					void BLogger::setMaxNumberOfFiles(unsigned int uiMaxNumberOfFiles)
-					{
-						if (uiMaxNumberOfFiles != _uiMaxNumberOfFiles)
-						{
-							_uiMaxNumberOfFiles = uiMaxNumberOfFiles;
-						}
-
-                        return;
-					}
-
-					void BLogger::setSeverityLogLevel(severity_level severityLevel)
-					{
-						_severityLevel = severityLevel;
-
-						_iSeverityLevelNumber = getNumberfromSeverityLevel(_severityLevel);
-
-						_logFilter = BoostLogger::trivial::severity >= severityLevel;
-
-						BoostLogger::core::get()->set_filter(_logFilter);
-
-                        return;
-					}
-
-					
-					void BLogger::clearLogDir()
-					{
-						const boost::regex logFilter( "(.*\\" + _strFileExtension + ")" );
-
-						fs::path phPathFile(_strFileTitle);
-						fs::path phDir = phPathFile.parent_path();
-						if (fs::exists(phDir))
-						{
-							fs::directory_iterator it{phDir};
-							while (it != boost::filesystem::directory_iterator{})
-							{
-								if (fs::is_regular_file(*it))
-								{
-									std::string logFilename = it->path().filename().string();
-
-									if( boost::regex_match( logFilename, logFilter ) )
-									{
-										boost::filesystem::remove(it->path());
-									}
-								}
-								it++;
-							}
-						}
-
-                        return;
-					}
-
-					void BLogger::Initialize()
-					{
-
-						if (_strFileTitle.length() == 0) _strFileTitle = _pDefaultFileTitle;
-						if (_strFileExtension.length() == 0) _strFileExtension = _pDefaultFileExtension;
-						string strLogFileName = _strFileTitle + "_%m%d%Y_%H%M%S_%N" + _strFileExtension;
-
-						boost::shared_ptr< logging::core > core = logging::core::get();
-						core->flush();
-						core->remove_all_sinks();
-						core->add_global_attribute("TimeStamp", attrs::local_clock());
-
-						boost::shared_ptr< sinks::text_file_backend > backend =
-								boost::make_shared< sinks::text_file_backend >
-						(
-								keywords::file_name = strLogFileName.c_str(),
-								keywords::rotation_size = _iMaxFileSize * 1024 * 1024,
-								keywords::time_based_rotation = sinks::file::rotation_at_time_point(0, 0, 0)
-						);
-
-						fs::path phDirPath(strLogFileName);
-
-						backend->set_file_collector(sinks::file::make_collector
-								(
-									keywords::target = phDirPath.parent_path().c_str(),
-									keywords::max_size = (_uiMaxNumberOfFiles - 1)  * _iMaxFileSize * 1024 * 1024,
-									keywords::min_free_space = 50 * 1024 * 1024
-								));
-
-						typedef sinks::synchronous_sink< sinks::text_file_backend > sink_t;
-						boost::shared_ptr< sink_t > sink(new sink_t(backend));
-
-						sink->set_formatter
-							(
-									expr::stream
-									<< expr::format_date_time< boost::posix_time::ptime >("TimeStamp", "[%d.%m. %H:%M:%S.%f] ")
-									<< " <" << BoostLogger::trivial::severity
-									<< "> : " << expr::message
-							);
-
-						core->add_sink(sink);
-
-                        return;
-					}
-
-					void  BLogger::Log(const char* pMessage, severity_level logLevel /*= info*/)
-					{
-						try
-						{
-							if (isLog(logLevel))
-							{
-								_mtxLock.lock();
-
-								BOOST_LOG_SEV(_lg, severity_level::info) << "ThreadID 0x" << boost::this_thread::get_id() << " " << pMessage;
-
-								if(logLevel == severity_level::fatal)
-									ForceFlushLog();
-								else
-									FlushLog();
-
-								_mtxLock.unlock();
-							}
-						}
-						catch(...)
-						{
-							_mtxLock.unlock();
-						}
-
-                        return;
-					}
-
-					void  BLogger::Log(string strMessage, severity_level logLevel /* = info */)
-					{
-						try
-						{
-							if (isLog(logLevel))
-							{
-								_mtxLock.lock();
-
-								BOOST_LOG_SEV(_lg, logLevel) << "ThreadID 0x" << boost::this_thread::get_id() << " " << strMessage;
-
-								if(logLevel == severity_level::fatal)
-									ForceFlushLog();
-								else
-									FlushLog();
-
-								_mtxLock.unlock();
-							}
-						}
-						catch(...)
-						{
-							_mtxLock.unlock();
-						}
-
-                        return;
-					}
-
-					void  BLogger::LogBool(bool b, severity_level logLevel /*= info*/)
-					{
-
-						try
-						{
-							if (isLog(logLevel))
-							{
-								_mtxLock.lock();
-
-								string strBoolMessage = b ? _strTrueMessage : _strFalseMessage;
-								BOOST_LOG_SEV(_lg, logLevel) << "ThreadID 0x" << boost::this_thread::get_id() << " " << strBoolMessage;
-
-								if(logLevel == severity_level::fatal)
-									ForceFlushLog();
-								else
-									FlushLog();
-
-								_mtxLock.unlock();
-							}
-						}
-						catch(...)
-						{
-							_mtxLock.unlock();
-						}
-
-                        return;
-					}
-
-					void  BLogger::LogBool(string strMessage, bool b, severity_level logLevel /*= info*/)
-					{
-						try
-						{
-							if (isLog(logLevel))
-							{
-								_mtxLock.lock();
-
-								string strBoolMessage = b ? _strTrueMessage : _strFalseMessage;
-								BOOST_LOG_SEV(_lg, logLevel) << "ThreadID 0x" << boost::this_thread::get_id() << " " << strMessage << ' ' << strBoolMessage;
-
-								if(logLevel == severity_level::fatal)
-									ForceFlushLog();
-								else
-									FlushLog();
-
-								_mtxLock.unlock();
-							}
-						}
-						catch(...)
-						{
-							_mtxLock.unlock();
-						}
-
-                        return;
-					}
-
-					void BLogger::LogHexDump(unsigned char* pBinaryData, unsigned int uiNumBytes, const char* pDumpPrefix /*= NULL*/, severity_level logLevel /*= info*/)
-					{
-						try
-						{
-							if (isLog(logLevel))
-							{
-								_mtxLock.lock();
-
-								DatDmp dump;
-								dump.setLeadingNewLine(true);
-								dump.setPrefix(pDumpPrefix);
-								string strDumpMessage = dump.Show(pBinaryData, uiNumBytes);
-								BOOST_LOG_SEV(_lg, logLevel) << "ThreadID 0x" << boost::this_thread::get_id() << " " << strDumpMessage;
-
-                                if (logLevel == severity_level::fatal)
-                                {
-                                    ForceFlushLog();
-                                }
-                                else
-                                {
-                                    FlushLog();
-                                }
-
-								_mtxLock.unlock();
-							}
-						}
-						catch(...)
-						{
-							_mtxLock.unlock();
-						}
-
-                        return;
-					}
-
-					void BLogger::FlushLog(void)
-					{
-						if(_uiFlushCounter >= _uiMaxFlushEntrys[_iSeverityLevelNumber])
-						{
-							BOOST_LOG_SEV(_lg, boost::log::trivial::severity_level::info) << "ThreadID 0x" << boost::this_thread::get_id() << " Flush LogEntries";
-							logging::core::get()->flush();
-							_uiFlushCounter = 0;
-						}
-						else
-						{
-							_uiFlushCounter++;
-						}
-
-                        return;
-					}
-
-					void BLogger::ForceFlushLog(void)
-					{
-						unsigned int ui = _uiMaxFlushEntrys[_iSeverityLevelNumber];
-						_uiMaxFlushEntrys[_iSeverityLevelNumber] = 0;
-						FlushLog();
-						_uiMaxFlushEntrys[_iSeverityLevelNumber] = ui;
-
-                        return;
-					}
-
-					void BLogger::setSeverityLogLevelNumber(int iSeverityLevelNumber)
-					{
-
-						_iSeverityLevelNumber = iSeverityLevelNumber;
-
-						_severityLevel = getSeverityLevelfromNumber(_iSeverityLevelNumber);
-
-						setSeverityLogLevel(_severityLevel);
-
-                        return;
-					}
-
-					bool BLogger::isLog(severity_level logLevel)
-					{
-						bool bResult = false;
-
-						try
-						{
-							int ilogLevel = getNumberfromSeverityLevel(logLevel);
-
-							if (_iSeverityLevelNumber <= ilogLevel)
-							{
-								bResult = true;
-							}
-						}
-						catch(...)
-						{
-						}
-
-						return bResult;
-					}
-
-					severity_level BLogger::getSeverityLevelfromNumber(int iSeverityLevelNumber)
-					{
-						severity_level logLevel = boost::log::trivial::severity_level::trace;
-
-						switch (iSeverityLevelNumber)
-						{
-							case 0: logLevel = boost::log::trivial::severity_level::trace; break;
-							case 1: logLevel = boost::log::trivial::severity_level::debug; break;
-							case 2: logLevel = boost::log::trivial::severity_level::info; break;
-							case 3: logLevel = boost::log::trivial::severity_level::warning; break;
-							case 4: logLevel = boost::log::trivial::severity_level::error; break;
-							case 5: logLevel = boost::log::trivial::severity_level::fatal; break;
-							default: logLevel = boost::log::trivial::severity_level::trace; break;
-						}
-
-						return logLevel;
-					}
-
-					int BLogger::getNumberfromSeverityLevel(severity_level severityLevel)
-					{
-						int iSeverityLevelNumber = 0;
-
-						switch (severityLevel)
-						{
-							case boost::log::trivial::severity_level::trace: iSeverityLevelNumber = 0; break;
-							case boost::log::trivial::severity_level::debug: iSeverityLevelNumber = 1; break;
-							case boost::log::trivial::severity_level::info: iSeverityLevelNumber = 2; break;
-							case boost::log::trivial::severity_level::warning: iSeverityLevelNumber = 3; break;
-							case boost::log::trivial::severity_level::error: iSeverityLevelNumber = 4; break;
-							case boost::log::trivial::severity_level::fatal: iSeverityLevelNumber = 5; break;
-						}
-
-						return iSeverityLevelNumber;
-					}
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "BLogger.h"
+#include <boost/log/utility/setup/common_attributes.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
+#include <boost/regex.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/log/sinks/text_file_backend.hpp>
+#include <boost/log/core/core.hpp>
+#include <boost/log/attributes.hpp>
+#include <boost/log/attributes/scoped_attribute.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/thread.hpp>
+#include <boost/log/sinks/text_file_backend.hpp>
+#include <boost/log/utility/setup/file.hpp>
+#include <boost/log/sources/severity_logger.hpp>
+#include <boost/log/sources/record_ostream.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/log/support/date_time.hpp>
+
+#include <ctime>
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace utils
+				{
+					namespace fs = boost::filesystem;
+					namespace logging = boost::log;
+					namespace attrs = boost::log::attributes;
+
+					const char* BLogger::_pDefaultFileTitle = "plc4x";
+					const char* BLogger::_pDefaultFileExtension = ".log";
+
+					BLogger* BLogger::m_pInstance = NULL;
+
+					BLogger* BLogger::Instance()
+					{
+						if (!m_pInstance)
+						{
+							m_pInstance = new BLogger;
+						}
+
+					return m_pInstance;
+					}
+
+					void BLogger::Release()
+					{
+						if (m_pInstance != NULL)
+						{
+							delete m_pInstance;
+							m_pInstance = NULL;
+						}
+
+					return;
+					}
+
+					BLogger::BLogger() :
+						_iMaxFileSize(10 * 1024 * 1024),			/* default max. filesize = 10 MB */
+						_uiMaxNumberOfFiles(5),
+						_strFileTitle(_pDefaultFileTitle),
+						_strFileExtension(_pDefaultFileExtension),
+						_logFilter (BoostLogger::trivial::severity >= BoostLogger::trivial::trace),
+						_severityLevel(BoostLogger::trivial::trace),
+						_uiFlushCounter(0)
+					{
+						_iSeverityLevelNumber=getNumberfromSeverityLevel(_severityLevel);
+
+						_uiMaxFlushEntrys[0] = 20 ; // trace
+						_uiMaxFlushEntrys[1] = 10 ; // debug
+						_uiMaxFlushEntrys[2] = 20 ; // info // 0 -> write once
+						_uiMaxFlushEntrys[3] = 0 ; // warning // 0 -> write once
+						_uiMaxFlushEntrys[4] = 0 ; // error // 0 -> write once
+						_uiMaxFlushEntrys[5] = 0 ; // fatal // 0 -> write once
+						
+                        Initialize();
+
+                        return;
+					}
+
+					BLogger::~BLogger()
+					{
+						_uiFlushCounter = _uiMaxFlushEntrys[_iSeverityLevelNumber];
+						FlushLog();
+
+                        return;
+					}
+
+					void BLogger::setFileTitle(string strFileTitle)
+					{
+						if (strFileTitle != _strFileTitle)
+						{
+							_strFileTitle = strFileTitle;
+                        }
+
+                        return;
+					}
+
+					void BLogger::setFileExtension(string strFileExtension)
+					{
+						if (strFileExtension != _strFileExtension)
+						{
+							_strFileExtension = strFileExtension;
+						}
+
+                        return;
+					}
+
+					void BLogger::setMaxFileSize(int iMaxFileSize)
+					{
+						if (iMaxFileSize != _iMaxFileSize)
+						{
+							_iMaxFileSize = iMaxFileSize; /* MB */
+						}
+
+                        return;
+					}
+
+					void BLogger::setMaxNumberOfFiles(unsigned int uiMaxNumberOfFiles)
+					{
+						if (uiMaxNumberOfFiles != _uiMaxNumberOfFiles)
+						{
+							_uiMaxNumberOfFiles = uiMaxNumberOfFiles;
+						}
+
+                        return;
+					}
+
+					void BLogger::setSeverityLogLevel(severity_level severityLevel)
+					{
+						_severityLevel = severityLevel;
+
+						_iSeverityLevelNumber = getNumberfromSeverityLevel(_severityLevel);
+
+						_logFilter = BoostLogger::trivial::severity >= severityLevel;
+
+						BoostLogger::core::get()->set_filter(_logFilter);
+
+                        return;
+					}
+
+					
+					void BLogger::clearLogDir()
+					{
+						const boost::regex logFilter( "(.*\\" + _strFileExtension + ")" );
+
+						fs::path phPathFile(_strFileTitle);
+						fs::path phDir = phPathFile.parent_path();
+						if (fs::exists(phDir))
+						{
+							fs::directory_iterator it{phDir};
+							while (it != boost::filesystem::directory_iterator{})
+							{
+								if (fs::is_regular_file(*it))
+								{
+									std::string logFilename = it->path().filename().string();
+
+									if( boost::regex_match( logFilename, logFilter ) )
+									{
+										boost::filesystem::remove(it->path());
+									}
+								}
+								it++;
+							}
+						}
+
+                        return;
+					}
+
+					void BLogger::Initialize()
+					{
+
+						if (_strFileTitle.length() == 0) _strFileTitle = _pDefaultFileTitle;
+						if (_strFileExtension.length() == 0) _strFileExtension = _pDefaultFileExtension;
+						string strLogFileName = _strFileTitle + "_%m%d%Y_%H%M%S_%N" + _strFileExtension;
+
+						boost::shared_ptr< logging::core > core = logging::core::get();
+						core->flush();
+						core->remove_all_sinks();
+						core->add_global_attribute("TimeStamp", attrs::local_clock());
+
+						boost::shared_ptr< sinks::text_file_backend > backend =
+								boost::make_shared< sinks::text_file_backend >
+						(
+								keywords::file_name = strLogFileName.c_str(),
+								keywords::rotation_size = _iMaxFileSize * 1024 * 1024,
+								keywords::time_based_rotation = sinks::file::rotation_at_time_point(0, 0, 0)
+						);
+
+						fs::path phDirPath(strLogFileName);
+
+						backend->set_file_collector(sinks::file::make_collector
+								(
+									keywords::target = phDirPath.parent_path().c_str(),
+									keywords::max_size = (_uiMaxNumberOfFiles - 1)  * _iMaxFileSize * 1024 * 1024,
+									keywords::min_free_space = 50 * 1024 * 1024
+								));
+
+						typedef sinks::synchronous_sink< sinks::text_file_backend > sink_t;
+						boost::shared_ptr< sink_t > sink(new sink_t(backend));
+
+						sink->set_formatter
+							(
+									expr::stream
+									<< expr::format_date_time< boost::posix_time::ptime >("TimeStamp", "[%d.%m. %H:%M:%S.%f] ")
+									<< " <" << BoostLogger::trivial::severity
+									<< "> : " << expr::message
+							);
+
+						core->add_sink(sink);
+
+                        return;
+					}
+
+					void  BLogger::Log(const char* pMessage, severity_level logLevel /*= info*/)
+					{
+						try
+						{
+							if (isLog(logLevel))
+							{
+								_mtxLock.lock();
+
+								BOOST_LOG_SEV(_lg, severity_level::info) << "ThreadID 0x" << boost::this_thread::get_id() << " " << pMessage;
+
+								if(logLevel == severity_level::fatal)
+									ForceFlushLog();
+								else
+									FlushLog();
+
+								_mtxLock.unlock();
+							}
+						}
+						catch(...)
+						{
+							_mtxLock.unlock();
+						}
+
+                        return;
+					}
+
+					void  BLogger::Log(string strMessage, severity_level logLevel /* = info */)
+					{
+						try
+						{
+							if (isLog(logLevel))
+							{
+								_mtxLock.lock();
+
+								BOOST_LOG_SEV(_lg, logLevel) << "ThreadID 0x" << boost::this_thread::get_id() << " " << strMessage;
+
+								if(logLevel == severity_level::fatal)
+									ForceFlushLog();
+								else
+									FlushLog();
+
+								_mtxLock.unlock();
+							}
+						}
+						catch(...)
+						{
+							_mtxLock.unlock();
+						}
+
+                        return;
+					}
+
+					void  BLogger::LogBool(bool b, severity_level logLevel /*= info*/)
+					{
+
+						try
+						{
+							if (isLog(logLevel))
+							{
+								_mtxLock.lock();
+
+								string strBoolMessage = b ? _strTrueMessage : _strFalseMessage;
+								BOOST_LOG_SEV(_lg, logLevel) << "ThreadID 0x" << boost::this_thread::get_id() << " " << strBoolMessage;
+
+								if(logLevel == severity_level::fatal)
+									ForceFlushLog();
+								else
+									FlushLog();
+
+								_mtxLock.unlock();
+							}
+						}
+						catch(...)
+						{
+							_mtxLock.unlock();
+						}
+
+                        return;
+					}
+
+					void  BLogger::LogBool(string strMessage, bool b, severity_level logLevel /*= info*/)
+					{
+						try
+						{
+							if (isLog(logLevel))
+							{
+								_mtxLock.lock();
+
+								string strBoolMessage = b ? _strTrueMessage : _strFalseMessage;
+								BOOST_LOG_SEV(_lg, logLevel) << "ThreadID 0x" << boost::this_thread::get_id() << " " << strMessage << ' ' << strBoolMessage;
+
+								if(logLevel == severity_level::fatal)
+									ForceFlushLog();
+								else
+									FlushLog();
+
+								_mtxLock.unlock();
+							}
+						}
+						catch(...)
+						{
+							_mtxLock.unlock();
+						}
+
+                        return;
+					}
+
+					void BLogger::LogHexDump(unsigned char* pBinaryData, unsigned int uiNumBytes, const char* pDumpPrefix /*= NULL*/, severity_level logLevel /*= info*/)
+					{
+						try
+						{
+							if (isLog(logLevel))
+							{
+								_mtxLock.lock();
+
+								DatDmp dump;
+								dump.setLeadingNewLine(true);
+								dump.setPrefix(pDumpPrefix);
+								string strDumpMessage = dump.Show(pBinaryData, uiNumBytes);
+								BOOST_LOG_SEV(_lg, logLevel) << "ThreadID 0x" << boost::this_thread::get_id() << " " << strDumpMessage;
+
+                                if (logLevel == severity_level::fatal)
+                                {
+                                    ForceFlushLog();
+                                }
+                                else
+                                {
+                                    FlushLog();
+                                }
+
+								_mtxLock.unlock();
+							}
+						}
+						catch(...)
+						{
+							_mtxLock.unlock();
+						}
+
+                        return;
+					}
+
+					void BLogger::FlushLog(void)
+					{
+						if(_uiFlushCounter >= _uiMaxFlushEntrys[_iSeverityLevelNumber])
+						{
+							BOOST_LOG_SEV(_lg, boost::log::trivial::severity_level::info) << "ThreadID 0x" << boost::this_thread::get_id() << " Flush LogEntries";
+							logging::core::get()->flush();
+							_uiFlushCounter = 0;
+						}
+						else
+						{
+							_uiFlushCounter++;
+						}
+
+                        return;
+					}
+
+					void BLogger::ForceFlushLog(void)
+					{
+						unsigned int ui = _uiMaxFlushEntrys[_iSeverityLevelNumber];
+						_uiMaxFlushEntrys[_iSeverityLevelNumber] = 0;
+						FlushLog();
+						_uiMaxFlushEntrys[_iSeverityLevelNumber] = ui;
+
+                        return;
+					}
+
+					void BLogger::setSeverityLogLevelNumber(int iSeverityLevelNumber)
+					{
+
+						_iSeverityLevelNumber = iSeverityLevelNumber;
+
+						_severityLevel = getSeverityLevelfromNumber(_iSeverityLevelNumber);
+
+						setSeverityLogLevel(_severityLevel);
+
+                        return;
+					}
+
+					bool BLogger::isLog(severity_level logLevel)
+					{
+						bool bResult = false;
+
+						try
+						{
+							int ilogLevel = getNumberfromSeverityLevel(logLevel);
+
+							if (_iSeverityLevelNumber <= ilogLevel)
+							{
+								bResult = true;
+							}
+						}
+						catch(...)
+						{
+						}
+
+						return bResult;
+					}
+
+					severity_level BLogger::getSeverityLevelfromNumber(int iSeverityLevelNumber)
+					{
+						severity_level logLevel = boost::log::trivial::severity_level::trace;
+
+						switch (iSeverityLevelNumber)
+						{
+							case 0: logLevel = boost::log::trivial::severity_level::trace; break;
+							case 1: logLevel = boost::log::trivial::severity_level::debug; break;
+							case 2: logLevel = boost::log::trivial::severity_level::info; break;
+							case 3: logLevel = boost::log::trivial::severity_level::warning; break;
+							case 4: logLevel = boost::log::trivial::severity_level::error; break;
+							case 5: logLevel = boost::log::trivial::severity_level::fatal; break;
+							default: logLevel = boost::log::trivial::severity_level::trace; break;
+						}
+
+						return logLevel;
+					}
+
+					int BLogger::getNumberfromSeverityLevel(severity_level severityLevel)
+					{
+						int iSeverityLevelNumber = 0;
+
+						switch (severityLevel)
+						{
+							case boost::log::trivial::severity_level::trace: iSeverityLevelNumber = 0; break;
+							case boost::log::trivial::severity_level::debug: iSeverityLevelNumber = 1; break;
+							case boost::log::trivial::severity_level::info: iSeverityLevelNumber = 2; break;
+							case boost::log::trivial::severity_level::warning: iSeverityLevelNumber = 3; break;
+							case boost::log::trivial::severity_level::error: iSeverityLevelNumber = 4; break;
+							case boost::log::trivial::severity_level::fatal: iSeverityLevelNumber = 5; break;
+						}
+
+						return iSeverityLevelNumber;
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/BLogger.h b/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/BLogger.h
index 57063e17be8..f63a9e71352 100644
--- a/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/BLogger.h
+++ b/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/BLogger.h
@@ -1,157 +1,157 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _B_LOGGER_H_
-#define _B_LOGGER_H_
-
-#include <boost/log/core.hpp>
-#include <boost/log/trivial.hpp>
-#include <boost/log/expressions.hpp>
-#include <boost/log/sources/severity_logger.hpp>
-#include <boost/thread/mutex.hpp>
-#include "ExLog.h"
-
-#include "DatDmp.h"
-
-#define LOG_TRACE(x)  	org::apache::plc4x::cpp::utils::BLogger::Instance()->Log(x,boost::log::trivial::severity_level::trace)
-#define LOG_DEBUG(x)  	org::apache::plc4x::cpp::utils::BLogger::Instance()->Log(x,boost::log::trivial::severity_level::debug)
-#define LOG_INFO(x)  	org::apache::plc4x::cpp::utils::BLogger::Instance()->Log(x,boost::log::trivial::severity_level::info)
-#define LOG_WARNING(x)  org::apache::plc4x::cpp::utils::BLogger::Instance()->Log(x, boost::log::trivial::severity_level::warning)
-#define LOG_ERROR(x)  	org::apache::plc4x::cpp::utils::BLogger::Instance()->Log(x, boost::log::trivial::severity_level::error)
-#define LOG_FATAL(x)  	org::apache::plc4x::cpp::utils::BLogger::Instance()->Log(x, boost::log::trivial::severity_level::fatal)
-#define LOG_BOOL(x,y)  	org::apache::plc4x::cpp::utils::BLogger::Instance()->LogBool(x,y)
-
-#define IS_LOG(x) 		org::apache::plc4x::cpp::utils::BLogger::Instance()->isLog(x)
-
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace utils
-				{
-					namespace src = boost::log::sources;
-					namespace expr = boost::log::expressions;
-					namespace sinks = boost::log::sinks;
-					namespace keywords = boost::log::keywords;
-					namespace BoostLogger = boost::log;
-
-					using namespace BoostLogger::trivial;
-					using namespace std;
-
-					
-					class BLogger
-					{
-
-					public:
-
-						static BLogger* Instance();
-						void Release();
-
-						~BLogger();
-
-						void Initialize();
-
-						void Log(const char* strMessage, severity_level logLevel = boost::log::trivial::severity_level::info);
-
-						void Log(string strMessage, severity_level logLevel = boost::log::trivial::severity_level::info);
-
-						void LogBool(bool b, severity_level logLevel = boost::log::trivial::severity_level::info);
-
-						void LogBool(string strMessage, bool b, severity_level logLevel = boost::log::trivial::severity_level::info);
-
-						void LogHexDump(unsigned char* pBinaryData, unsigned int nNumBytes, const char* szDumpPrefix = NULL, severity_level logLevel = boost::log::trivial::severity_level::info);
-
-						string getFileExtension() { return _strFileExtension; }
-						void setFileExtension(string strExtension);
-
-						string getFileTitle() { return _strFileTitle; }
-						void setFileTitle(string strFileTitle);
-
-						int getMaxFileSize() const { return _iMaxFileSize; }
-						void setMaxFileSize(int maxFileSize);
-
-						unsigned int getMaxNumberOfFiles() { return _uiMaxNumberOfFiles; }
-						void setMaxNumberOfFiles(unsigned int uiMaxNumberOfFiles);
-
-						severity_level getSeverityLogLevel() { return _severityLevel; }
-						void setSeverityLogLevel(severity_level severityLevel);
-
-						int getSeverityLogLevelNumber() { return getNumberfromSeverityLevel(_severityLevel); }
-						void setSeverityLogLevelNumber(int iSeverityLevelNumber);
-
-						bool isLog(severity_level logLevel);
-
-						string getTrueMessage() const { return _strTrueMessage; }
-						void setTrueMessage(string strTrueMessage) { _strTrueMessage = strTrueMessage; }
-
-						string getFalseMessage() const { return _strFalseMessage; }
-						void setFalseMessage(string strFalseMessage) { _strFalseMessage = strFalseMessage; }
-
-						void clearLogDir();
-						void ForceFlushLog(void);
-
-					private:
-
-						BLogger();  // Private so that it can  not be called
-						BLogger(BLogger const&){};             // copy constructor is private
-						BLogger& operator=(BLogger const&){ };  // assignment operator is private
-
-						int getNumberfromSeverityLevel(severity_level severityLevel);
-						severity_level getSeverityLevelfromNumber(int iSeverityLevelNumber);
-
-						void FlushLog(void);
-
-						static BLogger* m_pInstance;
-
-						int _iMaxFileSize;
-						unsigned int _uiMaxNumberOfFiles;
-
-						unsigned int _uiFlushCounter;
-
-						unsigned int _uiMaxFlushEntrys[6];
-
-						severity_level _severityLevel;
-						int 		   _iSeverityLevelNumber;
-
-						boost::log::filter _logFilter;
-
-						src::severity_logger_mt<severity_level> _lg;
-
-						boost::mutex         _mtxLock;
-
-						string _strFileTitle;
-						string _strFileExtension;
-
-						string _strTrueMessage;
-						string _strFalseMessage;
-
-						static const char* _pDefaultFileTitle;
-						static const char* _pDefaultFileExtension;
-					};
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _B_LOGGER_H_
+#define _B_LOGGER_H_
+
+#include <boost/log/core.hpp>
+#include <boost/log/trivial.hpp>
+#include <boost/log/expressions.hpp>
+#include <boost/log/sources/severity_logger.hpp>
+#include <boost/thread/mutex.hpp>
+#include "ExLog.h"
+
+#include "DatDmp.h"
+
+#define LOG_TRACE(x)  	org::apache::plc4x::cpp::utils::BLogger::Instance()->Log(x,boost::log::trivial::severity_level::trace)
+#define LOG_DEBUG(x)  	org::apache::plc4x::cpp::utils::BLogger::Instance()->Log(x,boost::log::trivial::severity_level::debug)
+#define LOG_INFO(x)  	org::apache::plc4x::cpp::utils::BLogger::Instance()->Log(x,boost::log::trivial::severity_level::info)
+#define LOG_WARNING(x)  org::apache::plc4x::cpp::utils::BLogger::Instance()->Log(x, boost::log::trivial::severity_level::warning)
+#define LOG_ERROR(x)  	org::apache::plc4x::cpp::utils::BLogger::Instance()->Log(x, boost::log::trivial::severity_level::error)
+#define LOG_FATAL(x)  	org::apache::plc4x::cpp::utils::BLogger::Instance()->Log(x, boost::log::trivial::severity_level::fatal)
+#define LOG_BOOL(x,y)  	org::apache::plc4x::cpp::utils::BLogger::Instance()->LogBool(x,y)
+
+#define IS_LOG(x) 		org::apache::plc4x::cpp::utils::BLogger::Instance()->isLog(x)
+
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace utils
+				{
+					namespace src = boost::log::sources;
+					namespace expr = boost::log::expressions;
+					namespace sinks = boost::log::sinks;
+					namespace keywords = boost::log::keywords;
+					namespace BoostLogger = boost::log;
+
+					using namespace BoostLogger::trivial;
+					using namespace std;
+
+					
+					class BLogger
+					{
+
+					public:
+
+						static BLogger* Instance();
+						void Release();
+
+						~BLogger();
+
+						void Initialize();
+
+						void Log(const char* strMessage, severity_level logLevel = boost::log::trivial::severity_level::info);
+
+						void Log(string strMessage, severity_level logLevel = boost::log::trivial::severity_level::info);
+
+						void LogBool(bool b, severity_level logLevel = boost::log::trivial::severity_level::info);
+
+						void LogBool(string strMessage, bool b, severity_level logLevel = boost::log::trivial::severity_level::info);
+
+						void LogHexDump(unsigned char* pBinaryData, unsigned int nNumBytes, const char* szDumpPrefix = NULL, severity_level logLevel = boost::log::trivial::severity_level::info);
+
+						string getFileExtension() { return _strFileExtension; }
+						void setFileExtension(string strExtension);
+
+						string getFileTitle() { return _strFileTitle; }
+						void setFileTitle(string strFileTitle);
+
+						int getMaxFileSize() const { return _iMaxFileSize; }
+						void setMaxFileSize(int maxFileSize);
+
+						unsigned int getMaxNumberOfFiles() { return _uiMaxNumberOfFiles; }
+						void setMaxNumberOfFiles(unsigned int uiMaxNumberOfFiles);
+
+						severity_level getSeverityLogLevel() { return _severityLevel; }
+						void setSeverityLogLevel(severity_level severityLevel);
+
+						int getSeverityLogLevelNumber() { return getNumberfromSeverityLevel(_severityLevel); }
+						void setSeverityLogLevelNumber(int iSeverityLevelNumber);
+
+						bool isLog(severity_level logLevel);
+
+						string getTrueMessage() const { return _strTrueMessage; }
+						void setTrueMessage(string strTrueMessage) { _strTrueMessage = strTrueMessage; }
+
+						string getFalseMessage() const { return _strFalseMessage; }
+						void setFalseMessage(string strFalseMessage) { _strFalseMessage = strFalseMessage; }
+
+						void clearLogDir();
+						void ForceFlushLog(void);
+
+					private:
+
+						BLogger();  // Private so that it can  not be called
+						BLogger(BLogger const&){};             // copy constructor is private
+						BLogger& operator=(BLogger const&){ };  // assignment operator is private
+
+						int getNumberfromSeverityLevel(severity_level severityLevel);
+						severity_level getSeverityLevelfromNumber(int iSeverityLevelNumber);
+
+						void FlushLog(void);
+
+						static BLogger* m_pInstance;
+
+						int _iMaxFileSize;
+						unsigned int _uiMaxNumberOfFiles;
+
+						unsigned int _uiFlushCounter;
+
+						unsigned int _uiMaxFlushEntrys[6];
+
+						severity_level _severityLevel;
+						int 		   _iSeverityLevelNumber;
+
+						boost::log::filter _logFilter;
+
+						src::severity_logger_mt<severity_level> _lg;
+
+						boost::mutex         _mtxLock;
+
+						string _strFileTitle;
+						string _strFileExtension;
+
+						string _strTrueMessage;
+						string _strFalseMessage;
+
+						static const char* _pDefaultFileTitle;
+						static const char* _pDefaultFileExtension;
+					};
+				}
+			}
+		}
+	}
+}
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/DatDmp.cpp b/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/DatDmp.cpp
index e92c2ef5c52..26f6d9266d4 100644
--- a/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/DatDmp.cpp
+++ b/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/DatDmp.cpp
@@ -1,143 +1,143 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "DatDmp.h"
-
-namespace org
-{
-    namespace apache
-    {
-        namespace plc4x
-        {
-            namespace cpp
-            {
-                namespace utils
-                {
-
-                    char DatDmp::achHex[3] = { '\0', '\0', '\0' };
-
-                    DatDmp::DatDmp() : 
-                        _strHexDump(""),
-                        _strPrefix(""),
-                        _uiBytesPerLine(16),
-                        _bLeadingNewLine(false)
-                    {
-                    }
-
-                    DatDmp::DatDmp(unsigned int uiBytesPerLine) : 
-                        _strHexDump(""),
-                        _strPrefix(""),
-                        _uiBytesPerLine(uiBytesPerLine),
-                        _bLeadingNewLine(false)
-                    {
-                    }
-
-                    string DatDmp::Show(unsigned char* pStream, unsigned int uiNumbersBytes, const char* pLinePrefix /*= NULL*/)
-                    {
-                        _strHexDump = "";
-                        if (_bLeadingNewLine)
-                        {
-                            _bLeadingNewLine = false;
-                            _strHexDump += '\n';
-                        }
-
-                        for (unsigned int uiByteCounter = 0, iStopByte = _uiBytesPerLine;
-                            uiByteCounter < uiNumbersBytes;
-                            uiByteCounter += _uiBytesPerLine, iStopByte += _uiBytesPerLine
-                            )
-                        {
-                            if (pLinePrefix != NULL) _strHexDump += pLinePrefix;
-                            _strHexDump += _strPrefix;
-
-                            int nBoundaryBytes = 0;
-                            if (iStopByte > uiNumbersBytes)
-                            {
-                                nBoundaryBytes = iStopByte - uiNumbersBytes;
-                                iStopByte = uiNumbersBytes;
-                            }
-
-                            for (unsigned int uiByteLine = uiByteCounter; uiByteLine < iStopByte; uiByteLine++)
-                            {
-                                unsigned char byte = pStream[uiByteLine];
-                                _strHexDump += Hex(byte);
-                                _strHexDump += ' ';
-                            }
-                            if (nBoundaryBytes > 0) _strHexDump += std::string(3 * nBoundaryBytes, ' ');
-                            _strHexDump += "| ";
-
-                            for (unsigned int uiByteLine = uiByteCounter; uiByteLine < iStopByte; uiByteLine++)
-                            {
-                                char ch = (char)pStream[uiByteCounter];
-                                if (ch >= 0)
-                                {
-                                    if (!isprint(ch)) ch = '.';
-                                }
-                                else
-                                {
-                                    ch = '.';
-                                }
-                                _strHexDump += ch;
-                            }
-                            _strHexDump += "\n";
-                        }
-                        return _strHexDump;
-                    }
-
-                    string DatDmp::HexByte(unsigned char ucByte) 
-                    {
-                        return string(Hex(ucByte));
-                    }
-                    
-                    string DatDmp::HexWord(unsigned short usWord) 
-                    {
-                        return string(Hex((unsigned char)(usWord >> 8))) + string(Hex((unsigned char)(usWord & 0xff)));
-                    }
-
-                    string DatDmp::HexDWord(unsigned int uiDWord)
-                    {
-                        return	string(Hex((unsigned char)((uiDWord & 0xff000000) >> 24)))
-                            + string(Hex((unsigned char)((uiDWord & 0x00ff0000) >> 16)))
-                            + string(Hex((unsigned char)((uiDWord & 0x0000ff00) >> 8)))
-                            + string(Hex((unsigned char)((uiDWord & 0x000000ff))));
-                    }
-
-                    const char* DatDmp::Hex(unsigned char ucByte)
-                    {
-                        achHex[0] = HexNibbleHigh(ucByte);
-                        achHex[1] = HexNibbleLow(ucByte);
-                        achHex[2] = '\0';
-                        return (const char*)achHex;
-                    }
-
-                    char DatDmp::HexNibbleHigh(unsigned char ucByte)
-                    {
-                        unsigned char btNibble = (unsigned char)(ucByte >> 4);
-                        return btNibble <= (unsigned char)9 ? '0' + btNibble : 'A' + btNibble - (unsigned char)10;
-                    }
-
-                    char DatDmp::HexNibbleLow(unsigned char ucByte)
-                    {
-                        unsigned char btNibble = (unsigned char)(ucByte & 0x0f);
-                        return btNibble <= (unsigned char)9 ? '0' + btNibble : 'A' + btNibble - (unsigned char)10;
-                    }
-                }
-            }
-        }
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "DatDmp.h"
+
+namespace org
+{
+    namespace apache
+    {
+        namespace plc4x
+        {
+            namespace cpp
+            {
+                namespace utils
+                {
+
+                    char DatDmp::achHex[3] = { '\0', '\0', '\0' };
+
+                    DatDmp::DatDmp() : 
+                        _strHexDump(""),
+                        _strPrefix(""),
+                        _uiBytesPerLine(16),
+                        _bLeadingNewLine(false)
+                    {
+                    }
+
+                    DatDmp::DatDmp(unsigned int uiBytesPerLine) : 
+                        _strHexDump(""),
+                        _strPrefix(""),
+                        _uiBytesPerLine(uiBytesPerLine),
+                        _bLeadingNewLine(false)
+                    {
+                    }
+
+                    string DatDmp::Show(unsigned char* pStream, unsigned int uiNumbersBytes, const char* pLinePrefix /*= NULL*/)
+                    {
+                        _strHexDump = "";
+                        if (_bLeadingNewLine)
+                        {
+                            _bLeadingNewLine = false;
+                            _strHexDump += '\n';
+                        }
+
+                        for (unsigned int uiByteCounter = 0, iStopByte = _uiBytesPerLine;
+                            uiByteCounter < uiNumbersBytes;
+                            uiByteCounter += _uiBytesPerLine, iStopByte += _uiBytesPerLine
+                            )
+                        {
+                            if (pLinePrefix != NULL) _strHexDump += pLinePrefix;
+                            _strHexDump += _strPrefix;
+
+                            int nBoundaryBytes = 0;
+                            if (iStopByte > uiNumbersBytes)
+                            {
+                                nBoundaryBytes = iStopByte - uiNumbersBytes;
+                                iStopByte = uiNumbersBytes;
+                            }
+
+                            for (unsigned int uiByteLine = uiByteCounter; uiByteLine < iStopByte; uiByteLine++)
+                            {
+                                unsigned char byte = pStream[uiByteLine];
+                                _strHexDump += Hex(byte);
+                                _strHexDump += ' ';
+                            }
+                            if (nBoundaryBytes > 0) _strHexDump += std::string(3 * nBoundaryBytes, ' ');
+                            _strHexDump += "| ";
+
+                            for (unsigned int uiByteLine = uiByteCounter; uiByteLine < iStopByte; uiByteLine++)
+                            {
+                                char ch = (char)pStream[uiByteCounter];
+                                if (ch >= 0)
+                                {
+                                    if (!isprint(ch)) ch = '.';
+                                }
+                                else
+                                {
+                                    ch = '.';
+                                }
+                                _strHexDump += ch;
+                            }
+                            _strHexDump += "\n";
+                        }
+                        return _strHexDump;
+                    }
+
+                    string DatDmp::HexByte(unsigned char ucByte) 
+                    {
+                        return string(Hex(ucByte));
+                    }
+                    
+                    string DatDmp::HexWord(unsigned short usWord) 
+                    {
+                        return string(Hex((unsigned char)(usWord >> 8))) + string(Hex((unsigned char)(usWord & 0xff)));
+                    }
+
+                    string DatDmp::HexDWord(unsigned int uiDWord)
+                    {
+                        return	string(Hex((unsigned char)((uiDWord & 0xff000000) >> 24)))
+                            + string(Hex((unsigned char)((uiDWord & 0x00ff0000) >> 16)))
+                            + string(Hex((unsigned char)((uiDWord & 0x0000ff00) >> 8)))
+                            + string(Hex((unsigned char)((uiDWord & 0x000000ff))));
+                    }
+
+                    const char* DatDmp::Hex(unsigned char ucByte)
+                    {
+                        achHex[0] = HexNibbleHigh(ucByte);
+                        achHex[1] = HexNibbleLow(ucByte);
+                        achHex[2] = '\0';
+                        return (const char*)achHex;
+                    }
+
+                    char DatDmp::HexNibbleHigh(unsigned char ucByte)
+                    {
+                        unsigned char btNibble = (unsigned char)(ucByte >> 4);
+                        return btNibble <= (unsigned char)9 ? '0' + btNibble : 'A' + btNibble - (unsigned char)10;
+                    }
+
+                    char DatDmp::HexNibbleLow(unsigned char ucByte)
+                    {
+                        unsigned char btNibble = (unsigned char)(ucByte & 0x0f);
+                        return btNibble <= (unsigned char)9 ? '0' + btNibble : 'A' + btNibble - (unsigned char)10;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/DatDmp.h b/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/DatDmp.h
index bf4006c5bfe..2f1c37779f3 100644
--- a/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/DatDmp.h
+++ b/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/DatDmp.h
@@ -1,88 +1,88 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _DATDMP_H_
-#define _DATDMP_H_
-
-#include <stdlib.h>
-#include <string>
-#include <iostream>
-
-using namespace std;
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace utils
-				{
-					class DatDmp
-					{
-					public:
-
-						DatDmp();
-						DatDmp(unsigned int uiBytesPerLine);
-
-						string Show(unsigned char* pStream, unsigned int uiNumbersBytes, const char* pLinePrefix = NULL);
-
-						string getPrefix() { return _strPrefix; }
-						void setPrefix(string strPrefix) { _strPrefix = strPrefix; }
-
-						void setPrefix(const char* pPrefix) {   _strPrefix.clear();
-                                                                if (pPrefix != NULL) { _strPrefix = pPrefix; };
-						                                    }
-
-						inline unsigned getBytesPerLine() const { return _uiBytesPerLine; }
-						void setBytesPerLine(unsigned int uiBytesPerLine) { _uiBytesPerLine = uiBytesPerLine; }
-
-						inline bool getLeadingNewLine() const { return _bLeadingNewLine; }
-						void setLeadingNewLine(bool bLeadingNewLine) { _bLeadingNewLine = bLeadingNewLine; }
-
-                        static string HexByte(unsigned char ucByte);
-                        static string HexWord(unsigned short usWord);
-                        static string HexDWord(unsigned int uiDword);
-
-					protected:
-
-						static const char* Hex(unsigned char ucByte);
-                        static char HexNibbleHigh(unsigned char ucByte);
-                        static char HexNibbleLow(unsigned char ucByte);
-
-					protected:
-
-						string          _strHexDump;
-						string          _strPrefix;
-						unsigned int    _uiBytesPerLine;
-						bool            _bLeadingNewLine;
-
-					private:
-
-						static char     achHex[3];
-					};
-				}
-			}
-		}
-	}
-}
-
-#endif
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _DATDMP_H_
+#define _DATDMP_H_
+
+#include <stdlib.h>
+#include <string>
+#include <iostream>
+
+using namespace std;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace utils
+				{
+					class DatDmp
+					{
+					public:
+
+						DatDmp();
+						DatDmp(unsigned int uiBytesPerLine);
+
+						string Show(unsigned char* pStream, unsigned int uiNumbersBytes, const char* pLinePrefix = NULL);
+
+						string getPrefix() { return _strPrefix; }
+						void setPrefix(string strPrefix) { _strPrefix = strPrefix; }
+
+						void setPrefix(const char* pPrefix) {   _strPrefix.clear();
+                                                                if (pPrefix != NULL) { _strPrefix = pPrefix; };
+						                                    }
+
+						inline unsigned getBytesPerLine() const { return _uiBytesPerLine; }
+						void setBytesPerLine(unsigned int uiBytesPerLine) { _uiBytesPerLine = uiBytesPerLine; }
+
+						inline bool getLeadingNewLine() const { return _bLeadingNewLine; }
+						void setLeadingNewLine(bool bLeadingNewLine) { _bLeadingNewLine = bLeadingNewLine; }
+
+                        static string HexByte(unsigned char ucByte);
+                        static string HexWord(unsigned short usWord);
+                        static string HexDWord(unsigned int uiDword);
+
+					protected:
+
+						static const char* Hex(unsigned char ucByte);
+                        static char HexNibbleHigh(unsigned char ucByte);
+                        static char HexNibbleLow(unsigned char ucByte);
+
+					protected:
+
+						string          _strHexDump;
+						string          _strPrefix;
+						unsigned int    _uiBytesPerLine;
+						bool            _bLeadingNewLine;
+
+					private:
+
+						static char     achHex[3];
+					};
+				}
+			}
+		}
+	}
+}
+
+#endif
diff --git a/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/DbgTrace.cpp b/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/DbgTrace.cpp
index 09c8e881b5a..03bd4d7f486 100644
--- a/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/DbgTrace.cpp
+++ b/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/DbgTrace.cpp
@@ -1,52 +1,52 @@
-/*
-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
-
-  http://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.
-*/
-
-#define TRACE_BUFFERSIZE	0x1000000
-
-#if defined(_DEBUG)
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <wtypes.h>
-#include <tchar.h>
-#include <windows.h>
-
-
-void TracerW(const wchar_t* formatStr, ...)
-{
-	static wchar_t arcBuffer[TRACE_BUFFERSIZE];
-	va_list args;
-	va_start(args, formatStr);
-    swprintf_s(arcBuffer, TRACE_BUFFERSIZE, formatStr, args);
-	va_end(args);
-	::OutputDebugStringW(arcBuffer);
-}
-
-
-void Tracer(const char* formatStr, ...)
-{
-	static char arcBuffer[TRACE_BUFFERSIZE];
-	va_list args;
-	va_start(args, formatStr);
-	vsprintf_s(arcBuffer, TRACE_BUFFERSIZE, formatStr, args);
-	va_end(args);
-	::OutputDebugStringA(arcBuffer);
-}
-
-#endif
+/*
+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
+
+  http://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.
+*/
+
+#define TRACE_BUFFERSIZE	0x1000000
+
+#if defined(_DEBUG)
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <wtypes.h>
+#include <tchar.h>
+#include <windows.h>
+
+
+void TracerW(const wchar_t* formatStr, ...)
+{
+	static wchar_t arcBuffer[TRACE_BUFFERSIZE];
+	va_list args;
+	va_start(args, formatStr);
+    swprintf_s(arcBuffer, TRACE_BUFFERSIZE, formatStr, args);
+	va_end(args);
+	::OutputDebugStringW(arcBuffer);
+}
+
+
+void Tracer(const char* formatStr, ...)
+{
+	static char arcBuffer[TRACE_BUFFERSIZE];
+	va_list args;
+	va_start(args, formatStr);
+	vsprintf_s(arcBuffer, TRACE_BUFFERSIZE, formatStr, args);
+	va_end(args);
+	::OutputDebugStringA(arcBuffer);
+}
+
+#endif
diff --git a/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/DbgTrace.h b/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/DbgTrace.h
index b27889f056a..b3a057acb66 100644
--- a/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/DbgTrace.h
+++ b/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/DbgTrace.h
@@ -1,54 +1,54 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _DBG_TRACE_H_
-#define _DBG_TRACE_H_
-
-#define TRACE_BUFFERSIZE	0x1000000
-
-// TRACE MACROS to main header file
-#if defined(_DEBUG)
-
-#define DEBUG_TRACE_0(f) TracerW(f)
-#define DEBUG_TRACE_1(f,a) TracerW(f,a)
-#define DEBUG_TRACE_2(f,a,b) TracerW(f,a,b)
-#define DEBUG_TRACE_3(f,a,b,c) TracerW(f,a,b,c)
-void TracerW(const wchar_t* formatStr, ...);
-
-#define DEBUG_TRACE0(f) Tracer(f)
-#define DEBUG_TRACE1(f,a) Tracer(f,a)
-#define DEBUG_TRACE2(f,a,b) Tracer(f,a,b)
-#define DEBUG_TRACE3(f,a,b,c) Tracer(f,a,b,c)
-void Tracer(const char* formatStr, ...);
-
-#else
-
-#define DEBUG_TRACE_0(f) ((void)NULL)
-#define DEBUG_TRACE_1(f,a) ((void)NULL)
-#define DEBUG_TRACE_2(f,a,b) ((void)NULL)
-#define DEBUG_TRACE_3(f,a,b,c) ((void)NULL)
-
-#define DEBUG_TRACE0(f) ((void)NULL)
-#define DEBUG_TRACE1(f,a) ((void)NULL)
-#define DEBUG_TRACE2(f,a,b) ((void)NULL)
-#define DEBUG_TRACE3(f,a,b,c) ((void)NULL)
-
-#endif
-
-#endif
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _DBG_TRACE_H_
+#define _DBG_TRACE_H_
+
+#define TRACE_BUFFERSIZE	0x1000000
+
+// TRACE MACROS to main header file
+#if defined(_DEBUG)
+
+#define DEBUG_TRACE_0(f) TracerW(f)
+#define DEBUG_TRACE_1(f,a) TracerW(f,a)
+#define DEBUG_TRACE_2(f,a,b) TracerW(f,a,b)
+#define DEBUG_TRACE_3(f,a,b,c) TracerW(f,a,b,c)
+void TracerW(const wchar_t* formatStr, ...);
+
+#define DEBUG_TRACE0(f) Tracer(f)
+#define DEBUG_TRACE1(f,a) Tracer(f,a)
+#define DEBUG_TRACE2(f,a,b) Tracer(f,a,b)
+#define DEBUG_TRACE3(f,a,b,c) Tracer(f,a,b,c)
+void Tracer(const char* formatStr, ...);
+
+#else
+
+#define DEBUG_TRACE_0(f) ((void)NULL)
+#define DEBUG_TRACE_1(f,a) ((void)NULL)
+#define DEBUG_TRACE_2(f,a,b) ((void)NULL)
+#define DEBUG_TRACE_3(f,a,b,c) ((void)NULL)
+
+#define DEBUG_TRACE0(f) ((void)NULL)
+#define DEBUG_TRACE1(f,a) ((void)NULL)
+#define DEBUG_TRACE2(f,a,b) ((void)NULL)
+#define DEBUG_TRACE3(f,a,b,c) ((void)NULL)
+
+#endif
+
+#endif
diff --git a/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/ErrorCategory.cpp b/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/ErrorCategory.cpp
index d40b7230757..730a4fd2cca 100644
--- a/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/ErrorCategory.cpp
+++ b/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/ErrorCategory.cpp
@@ -1,71 +1,71 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "ErrorCategory.h"
-
-namespace org
-{
-    namespace apache
-    {
-        namespace plc4x
-        {
-            namespace cpp
-            {
-                namespace utils
-                {
-
-                    const char* Error_Category::_paErrorMessage[] =
-                    {
-                        "success",
-                        "err0",
-                        "err1",
-                        "err2",
-                        "err3",
-                        "err4",
-                        "err5",
-                        "err6"
-                    };
-
-
-                    std::string Error_Category::message(int iEv) const
-                    {
-                        std::string strMessage = "";
-                        if (IsValidMessageIndex(iEv))
-                        {
-                            strMessage = _paErrorMessage[iEv];
-                        }
-                        else
-                        {
-                            strMessage = DefaultMessage(iEv);
-                        }
-
-                        return strMessage;
-                    }
-
-                    std::string Error_Category::DefaultMessage(int iEv) const
-                    {
-                        boost::system::error_code ecCode(iEv, boost::system::system_category());
-
-                        return ecCode.message();
-                    }
-                }
-            }
-        }
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "ErrorCategory.h"
+
+namespace org
+{
+    namespace apache
+    {
+        namespace plc4x
+        {
+            namespace cpp
+            {
+                namespace utils
+                {
+
+                    const char* Error_Category::_paErrorMessage[] =
+                    {
+                        "success",
+                        "err0",
+                        "err1",
+                        "err2",
+                        "err3",
+                        "err4",
+                        "err5",
+                        "err6"
+                    };
+
+
+                    std::string Error_Category::message(int iEv) const
+                    {
+                        std::string strMessage = "";
+                        if (IsValidMessageIndex(iEv))
+                        {
+                            strMessage = _paErrorMessage[iEv];
+                        }
+                        else
+                        {
+                            strMessage = DefaultMessage(iEv);
+                        }
+
+                        return strMessage;
+                    }
+
+                    std::string Error_Category::DefaultMessage(int iEv) const
+                    {
+                        boost::system::error_code ecCode(iEv, boost::system::system_category());
+
+                        return ecCode.message();
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/ErrorCategory.h b/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/ErrorCategory.h
index ae55c83436c..028ec8a0722 100644
--- a/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/ErrorCategory.h
+++ b/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/ErrorCategory.h
@@ -1,125 +1,125 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _ERRORCATEGORY_H_
-#define _ERRORCATEGORY_H_
-
-#include <boost/system/error_code.hpp>
-#include <string>
-
-namespace org
-{
-    namespace apache
-    {
-        namespace plc4x
-        {
-            namespace cpp
-            {
-                namespace utils
-                {
-                    class IError_Category
-                    {
-                    public:
-                 
-                        virtual const char* name() const = 0;
-                        virtual inline std::string getName() const = 0;
-
-                        virtual std::string message(int iEv) const = 0;
-
-                    protected:
-                        virtual bool IsValidMessageIndex(int iEv) const = 0;
-                    };
-
-
-                    class Error_Category : IError_Category
-                    {
-                    public:
-                        enum Category
-                        {
-                            System = 0,
-                            Application,
-                            max_category = Application,
-                            num_categories
-                        };
-
-                        Error_Category() :
-                            _Category(System),
-                            _strName("System"),
-                            _iMsgOffset(0)				
-                        {								
-                        }								
-
-                        virtual const char* name() const { return _strName.c_str(); }
-
-                        virtual std::string message(int ev) const;
-
-                        virtual inline std::string getName() const { return _strName; }
-
-                    protected:
-
-                        std::string DefaultMessage(int ev) const;
-
-                        virtual bool IsValidMessageIndex(int ev) const { return false; }
-
-                    protected:
-                        std::string _strName;
-                        Category _Category;
-                        int _iMsgOffset;
-
-                        static const char* _paErrorMessage[];
-                    };
-
-                    class Error_Category_Application : public Error_Category
-                    {
-                    public:
-
-                        enum errc_t						
-                        {
-                            success = 0,				
-                            err1,
-                            err2,
-                            err3,
-                            err4,
-                            err5,
-                            err6,
-                            max_err = err6,	
-                            num_codes
-                        };
-
-                        Error_Category_Application()
-                        {
-                            _Category = Application;
-                            _strName = "Application";
-                            _iMsgOffset = 0;			// Start-Offset to error message index, to be set ..
-                        }								// .. individually for each derivation of Error_Category!
-                                                        // Provide messages in array Error_Category::_aszErrorMessage[]!
-                    protected:
-
-                        virtual bool IsValidMessageIndex(int iEv) const
-                        {
-                            return iEv >= (int)success && iEv <= _iMsgOffset + (int)max_err;
-                        }
-
-                    };
-                }
-            }
-        }
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _ERRORCATEGORY_H_
+#define _ERRORCATEGORY_H_
+
+#include <boost/system/error_code.hpp>
+#include <string>
+
+namespace org
+{
+    namespace apache
+    {
+        namespace plc4x
+        {
+            namespace cpp
+            {
+                namespace utils
+                {
+                    class IError_Category
+                    {
+                    public:
+                 
+                        virtual const char* name() const = 0;
+                        virtual inline std::string getName() const = 0;
+
+                        virtual std::string message(int iEv) const = 0;
+
+                    protected:
+                        virtual bool IsValidMessageIndex(int iEv) const = 0;
+                    };
+
+
+                    class Error_Category : IError_Category
+                    {
+                    public:
+                        enum Category
+                        {
+                            System = 0,
+                            Application,
+                            max_category = Application,
+                            num_categories
+                        };
+
+                        Error_Category() :
+                            _Category(System),
+                            _strName("System"),
+                            _iMsgOffset(0)				
+                        {								
+                        }								
+
+                        virtual const char* name() const { return _strName.c_str(); }
+
+                        virtual std::string message(int ev) const;
+
+                        virtual inline std::string getName() const { return _strName; }
+
+                    protected:
+
+                        std::string DefaultMessage(int ev) const;
+
+                        virtual bool IsValidMessageIndex(int ev) const { return false; }
+
+                    protected:
+                        std::string _strName;
+                        Category _Category;
+                        int _iMsgOffset;
+
+                        static const char* _paErrorMessage[];
+                    };
+
+                    class Error_Category_Application : public Error_Category
+                    {
+                    public:
+
+                        enum errc_t						
+                        {
+                            success = 0,				
+                            err1,
+                            err2,
+                            err3,
+                            err4,
+                            err5,
+                            err6,
+                            max_err = err6,	
+                            num_codes
+                        };
+
+                        Error_Category_Application()
+                        {
+                            _Category = Application;
+                            _strName = "Application";
+                            _iMsgOffset = 0;			// Start-Offset to error message index, to be set ..
+                        }								// .. individually for each derivation of Error_Category!
+                                                        // Provide messages in array Error_Category::_aszErrorMessage[]!
+                    protected:
+
+                        virtual bool IsValidMessageIndex(int iEv) const
+                        {
+                            return iEv >= (int)success && iEv <= _iMsgOffset + (int)max_err;
+                        }
+
+                    };
+                }
+            }
+        }
+    }
+}
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/ErrorInfoException.cpp b/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/ErrorInfoException.cpp
index 0cbb1a3809c..bdb46971ac5 100644
--- a/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/ErrorInfoException.cpp
+++ b/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/ErrorInfoException.cpp
@@ -1,171 +1,171 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include <boost/exception/all.hpp>
-#include <exception>
-#include <boost/lexical_cast.hpp>
-#include "ErrorInfoException.h"
-#include "ExLog.h"
-#include "DbgTrace.h"
-#include "BLogger.h"
-
-namespace org
-{
-    namespace apache
-    {
-        namespace plc4x
-        {
-            namespace cpp
-            {
-                namespace utils
-                {
-
-                    ErrorInfoException::ErrorInfoException() :
-                        _uiUserMessageID(-1),
-                        pCategory(NULL),
-                        _iEv(-1)
-                    {
-                        std::string strErrorMessage = " ErrorInfoException no Message";
-                        LOG_ERROR(strErrorMessage);
-                        DEBUG_TRACE1("%s\n", strErrorMessage.c_str());
-
-                        return;
-                    }
-
-                    ErrorInfoException::ErrorInfoException(unsigned int uiUserMessageID, std::string strErrorInfo) :
-                        _uiUserMessageID(uiUserMessageID),
-                        _strWhat(strErrorInfo),
-                        pCategory(NULL),
-                        _iEv(-1)
-                    {
-                        LOG_ERROR(strErrorInfo);
-                        DEBUG_TRACE1("%s\n", strErrorInfo.c_str());
-
-                        return;
-                    }
-
-                    ErrorInfoException::ErrorInfoException(unsigned int uiUserMessageID, std::exception& ex) :
-                        _uiUserMessageID(uiUserMessageID),
-                        _strWhat(ex.what()),
-                        pCategory(NULL),
-                        _iEv(-1)
-                    {
-                        LOG_ERROR(ex.what());
-                        DEBUG_TRACE1("%s\n", ex.what());
-
-                        return;
-                    }
-
-                    ErrorInfoException::ErrorInfoException(unsigned int uiUserMessageID, boost::exception& ex) :
-                        _uiUserMessageID(uiUserMessageID),
-                        _strWhat(*boost::get_error_info<errmsg_info>(ex)),
-                        pCategory(NULL),
-                        _iEv(-1)
-                    {
-                        LOG_ERROR(*boost::get_error_info<errmsg_info>(ex));
-                        DEBUG_TRACE1("%s\n", _strWhat.c_str());
-
-                        return;
-                    }
-
-                    ErrorInfoException::ErrorInfoException(unsigned int uiUserMessageID, Error_Category::Category cat, int iErrorValue) :
-                        _uiUserMessageID(uiUserMessageID),
-                        pCategory(CreateErrorCategory(cat)),
-                        _iEv(iErrorValue)
-                    {
-                        std::string strMessage = boost::lexical_cast<std::string>(iErrorValue);
-                        LOG_ERROR(strMessage.c_str());
-                        DEBUG_TRACE1("ErrorValue:%i\n", iErrorValue);
-
-                        return;
-                    }
-
-                    ErrorInfoException::ErrorInfoException(unsigned int uiUserMessageID, Error_Category::Category cat, int iErrorValue, std::string strErrorInfo) :
-                        _uiUserMessageID(uiUserMessageID),
-                        _strWhat(strErrorInfo),
-                        pCategory(CreateErrorCategory(cat)),
-                        _iEv(iErrorValue)
-                    {
-                        LOG_ERROR(strErrorInfo);
-                        DEBUG_TRACE1("%s\n", strErrorInfo.c_str());
-
-                        return;
-                    }
-
-
-                    ErrorInfoException::ErrorInfoException(unsigned int uiUserMessageID, Error_Category::Category cat, int iErrorValue, std::exception& ex) :
-                        _uiUserMessageID(uiUserMessageID),
-                        _strWhat(ex.what()),
-                        pCategory(CreateErrorCategory(cat)),
-                        _iEv(iErrorValue)
-                    {
-                        LOG_ERROR(ex.what());
-                        DEBUG_TRACE1("%s\n", ex.what());
-
-                        return;
-                    }
-
-                    ErrorInfoException::ErrorInfoException(unsigned int uiUserMessageID, Error_Category::Category cat, int iErrorValue, boost::exception& ex) :
-                        _uiUserMessageID(uiUserMessageID),
-                        _strWhat(*boost::get_error_info<errmsg_info>(ex)),
-                        pCategory(CreateErrorCategory(cat)),
-                        _iEv(iErrorValue)
-                    {
-                        LOG_ERROR(*boost::get_error_info<errmsg_info>(ex));
-                        DEBUG_TRACE1("%s\n", _strWhat.c_str());
-
-                        return;
-                    }
-
-                    ErrorInfoException::~ErrorInfoException()
-                    {
-                        if (pCategory != NULL) { delete pCategory; };
-
-                        return;
-                    }
-
-                    Error_Category* ErrorInfoException::CreateErrorCategory(Error_Category::Category cat) throw()
-                    {
-                        Error_Category* pCat = NULL;
-                        try
-                        {
-                            switch (cat)
-                            {
-                            case Error_Category::Category::System:
-                            default:
-                                pCat = new Error_Category();
-                            break;
-
-                            case Error_Category::Category::Application:
-                                pCat = new Error_Category_Application();
-                            break;
-                            }
-                        }
-                        catch (...)
-                        {
-                            pCat = NULL;
-                        }
-
-                        return pCat;
-                    }
-                }
-            }
-        }
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include <boost/exception/all.hpp>
+#include <exception>
+#include <boost/lexical_cast.hpp>
+#include "ErrorInfoException.h"
+#include "ExLog.h"
+#include "DbgTrace.h"
+#include "BLogger.h"
+
+namespace org
+{
+    namespace apache
+    {
+        namespace plc4x
+        {
+            namespace cpp
+            {
+                namespace utils
+                {
+
+                    ErrorInfoException::ErrorInfoException() :
+                        _uiUserMessageID(-1),
+                        pCategory(NULL),
+                        _iEv(-1)
+                    {
+                        std::string strErrorMessage = " ErrorInfoException no Message";
+                        LOG_ERROR(strErrorMessage);
+                        DEBUG_TRACE1("%s\n", strErrorMessage.c_str());
+
+                        return;
+                    }
+
+                    ErrorInfoException::ErrorInfoException(unsigned int uiUserMessageID, std::string strErrorInfo) :
+                        _uiUserMessageID(uiUserMessageID),
+                        _strWhat(strErrorInfo),
+                        pCategory(NULL),
+                        _iEv(-1)
+                    {
+                        LOG_ERROR(strErrorInfo);
+                        DEBUG_TRACE1("%s\n", strErrorInfo.c_str());
+
+                        return;
+                    }
+
+                    ErrorInfoException::ErrorInfoException(unsigned int uiUserMessageID, std::exception& ex) :
+                        _uiUserMessageID(uiUserMessageID),
+                        _strWhat(ex.what()),
+                        pCategory(NULL),
+                        _iEv(-1)
+                    {
+                        LOG_ERROR(ex.what());
+                        DEBUG_TRACE1("%s\n", ex.what());
+
+                        return;
+                    }
+
+                    ErrorInfoException::ErrorInfoException(unsigned int uiUserMessageID, boost::exception& ex) :
+                        _uiUserMessageID(uiUserMessageID),
+                        _strWhat(*boost::get_error_info<errmsg_info>(ex)),
+                        pCategory(NULL),
+                        _iEv(-1)
+                    {
+                        LOG_ERROR(*boost::get_error_info<errmsg_info>(ex));
+                        DEBUG_TRACE1("%s\n", _strWhat.c_str());
+
+                        return;
+                    }
+
+                    ErrorInfoException::ErrorInfoException(unsigned int uiUserMessageID, Error_Category::Category cat, int iErrorValue) :
+                        _uiUserMessageID(uiUserMessageID),
+                        pCategory(CreateErrorCategory(cat)),
+                        _iEv(iErrorValue)
+                    {
+                        std::string strMessage = boost::lexical_cast<std::string>(iErrorValue);
+                        LOG_ERROR(strMessage.c_str());
+                        DEBUG_TRACE1("ErrorValue:%i\n", iErrorValue);
+
+                        return;
+                    }
+
+                    ErrorInfoException::ErrorInfoException(unsigned int uiUserMessageID, Error_Category::Category cat, int iErrorValue, std::string strErrorInfo) :
+                        _uiUserMessageID(uiUserMessageID),
+                        _strWhat(strErrorInfo),
+                        pCategory(CreateErrorCategory(cat)),
+                        _iEv(iErrorValue)
+                    {
+                        LOG_ERROR(strErrorInfo);
+                        DEBUG_TRACE1("%s\n", strErrorInfo.c_str());
+
+                        return;
+                    }
+
+
+                    ErrorInfoException::ErrorInfoException(unsigned int uiUserMessageID, Error_Category::Category cat, int iErrorValue, std::exception& ex) :
+                        _uiUserMessageID(uiUserMessageID),
+                        _strWhat(ex.what()),
+                        pCategory(CreateErrorCategory(cat)),
+                        _iEv(iErrorValue)
+                    {
+                        LOG_ERROR(ex.what());
+                        DEBUG_TRACE1("%s\n", ex.what());
+
+                        return;
+                    }
+
+                    ErrorInfoException::ErrorInfoException(unsigned int uiUserMessageID, Error_Category::Category cat, int iErrorValue, boost::exception& ex) :
+                        _uiUserMessageID(uiUserMessageID),
+                        _strWhat(*boost::get_error_info<errmsg_info>(ex)),
+                        pCategory(CreateErrorCategory(cat)),
+                        _iEv(iErrorValue)
+                    {
+                        LOG_ERROR(*boost::get_error_info<errmsg_info>(ex));
+                        DEBUG_TRACE1("%s\n", _strWhat.c_str());
+
+                        return;
+                    }
+
+                    ErrorInfoException::~ErrorInfoException()
+                    {
+                        if (pCategory != NULL) { delete pCategory; };
+
+                        return;
+                    }
+
+                    Error_Category* ErrorInfoException::CreateErrorCategory(Error_Category::Category cat) throw()
+                    {
+                        Error_Category* pCat = NULL;
+                        try
+                        {
+                            switch (cat)
+                            {
+                            case Error_Category::Category::System:
+                            default:
+                                pCat = new Error_Category();
+                            break;
+
+                            case Error_Category::Category::Application:
+                                pCat = new Error_Category_Application();
+                            break;
+                            }
+                        }
+                        catch (...)
+                        {
+                            pCat = NULL;
+                        }
+
+                        return pCat;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/ErrorInfoException.h b/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/ErrorInfoException.h
index ebaf0b6305b..4fcac069198 100644
--- a/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/ErrorInfoException.h
+++ b/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/ErrorInfoException.h
@@ -1,83 +1,83 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _ERROR_INFO_EXCEPTION_H_
-#define _ERROR_INFO_EXCEPTION_H_
-
-#include <exception>
-#include <boost/exception/exception.hpp>
-#include "ErrorCategory.h"
-
-namespace org
-{
-    namespace apache
-    {
-        namespace plc4x
-        {
-            namespace cpp
-            {
-                namespace utils
-                {
-
-                    class ErrorInfoException : public boost::exception, public std::exception
-                    {
-                    public:
-                        ErrorInfoException();
-
-                        virtual ~ErrorInfoException();
-
-                        ErrorInfoException(unsigned int uiUserMessageID, std::string strErrorInfo);
-
-                        ErrorInfoException(unsigned int uiUserMessageID, std::exception& ex);
-
-                        ErrorInfoException(unsigned int uiUserMessageID, boost::exception& ex);
-
-                        ErrorInfoException(unsigned int uiUserMessageID, Error_Category::Category cat, int iErrorValue);
-
-                        ErrorInfoException(unsigned int uiUserMessageID, Error_Category::Category cat, int iErrorValue, std::string strErrorInfo);
-
-                        ErrorInfoException(unsigned int uiUserMessageID, Error_Category::Category cat, int iErrorValue, std::exception& ex);
-
-                        ErrorInfoException(unsigned int uiUserMessageID, Error_Category::Category cat, int iErrorValue, boost::exception& ex);
-
-                        inline unsigned int getUserMessageID() const { return _uiUserMessageID; }
-
-                        virtual const char* what() const throw() { return _strWhat.c_str(); }
-
-                        Error_Category* pCategory;
-
-                        inline int getErrorValue() const { return _iEv; }                        
-
-                    protected:
-
-                        Error_Category* CreateErrorCategory(Error_Category::Category cat) throw();
-
-                    protected:
-
-                        std::string _strWhat;
-                        int _iEv;
-                        unsigned int _uiUserMessageID;
-
-                    };
-                }
-            }
-        }
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _ERROR_INFO_EXCEPTION_H_
+#define _ERROR_INFO_EXCEPTION_H_
+
+#include <exception>
+#include <boost/exception/exception.hpp>
+#include "ErrorCategory.h"
+
+namespace org
+{
+    namespace apache
+    {
+        namespace plc4x
+        {
+            namespace cpp
+            {
+                namespace utils
+                {
+
+                    class ErrorInfoException : public boost::exception, public std::exception
+                    {
+                    public:
+                        ErrorInfoException();
+
+                        virtual ~ErrorInfoException();
+
+                        ErrorInfoException(unsigned int uiUserMessageID, std::string strErrorInfo);
+
+                        ErrorInfoException(unsigned int uiUserMessageID, std::exception& ex);
+
+                        ErrorInfoException(unsigned int uiUserMessageID, boost::exception& ex);
+
+                        ErrorInfoException(unsigned int uiUserMessageID, Error_Category::Category cat, int iErrorValue);
+
+                        ErrorInfoException(unsigned int uiUserMessageID, Error_Category::Category cat, int iErrorValue, std::string strErrorInfo);
+
+                        ErrorInfoException(unsigned int uiUserMessageID, Error_Category::Category cat, int iErrorValue, std::exception& ex);
+
+                        ErrorInfoException(unsigned int uiUserMessageID, Error_Category::Category cat, int iErrorValue, boost::exception& ex);
+
+                        inline unsigned int getUserMessageID() const { return _uiUserMessageID; }
+
+                        virtual const char* what() const throw() { return _strWhat.c_str(); }
+
+                        Error_Category* pCategory;
+
+                        inline int getErrorValue() const { return _iEv; }                        
+
+                    protected:
+
+                        Error_Category* CreateErrorCategory(Error_Category::Category cat) throw();
+
+                    protected:
+
+                        std::string _strWhat;
+                        int _iEv;
+                        unsigned int _uiUserMessageID;
+
+                    };
+                }
+            }
+        }
+    }
+}
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/ExLog.cpp b/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/ExLog.cpp
index 6dae0f63f19..996e6e19e53 100644
--- a/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/ExLog.cpp
+++ b/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/ExLog.cpp
@@ -1,143 +1,143 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include <boost/exception/all.hpp>
-#include <exception>
-#include <boost/lexical_cast.hpp>
-#include <typeinfo>
-#include "ErrorInfoException.h"
-
-#include "DbgTrace.h"
-#include "BLogger.h"
-
-namespace org
-{
-    namespace apache
-    {
-        namespace plc4x
-        {
-            namespace cpp
-            {
-                namespace utils
-                {
-                    using namespace std;
-                    using namespace boost;
-
-                    ExLog::ExLog()
-                    {
-
-                    }
-
-                    ExLog::ExLog(unsigned int uiUserMessageID, std::exception& ex, const char* pError) :
-                        _strWhat(ex.what())
-                    {
-                        string strExceptionClassName = typeid(ex).name();
-
-                        if (strExceptionClassName.find(typeid(ExLog).name()) != std::string::npos)
-                        {
-                            _uiUserMessageID = (reinterpret_cast<ExLog&>(ex)).getUserMessageID();
-                        }
-                        else if (strExceptionClassName.find(typeid(ErrorInfoException).name()) != std::string::npos)
-                        {
-                            _uiUserMessageID = (reinterpret_cast<ErrorInfoException&>(ex)).getUserMessageID();
-                        }
-                        else
-                        {
-                            _uiUserMessageID = uiUserMessageID;
-                        }
-
-                        std::stringstream strStream;
-
-                        _strLastErrorMessage = std::string(pError) + '\n';
-
-                        _strLastErrorMessage = _strLastErrorMessage + std::string("MessageID: ") + lexical_cast<std::string>(_uiUserMessageID) + '\n';
-
-                        strStream << diagnostic_information(ex) << std::endl;
-                        _strLastErrorMessage = _strLastErrorMessage + strStream.str();
-
-                        _strLastErrorMessage = _strLastErrorMessage + printStackTrace();
-
-                        DEBUG_TRACE1("%s\n", _strLastErrorMessage.c_str());
-                        LOG_ERROR(_strLastErrorMessage);
-
-                        return;
-                    }
-
-                    ExLog::ExLog(unsigned int uiUserMessageID, boost::exception& ex, const char* pError) :
-                        _strWhat(*get_error_info<errmsg_info>(ex))
-                    {
-                        string strExceptionClassName = typeid(ex).name();
-
-                        if (strExceptionClassName.find(typeid(ExLog).name()) != std::string::npos)
-                        {
-                            _uiUserMessageID = (reinterpret_cast<ExLog&>(ex)).getUserMessageID();
-                        }
-                        else if (strExceptionClassName.find(typeid(ErrorInfoException).name()) != std::string::npos)
-                        {
-                            _uiUserMessageID = (reinterpret_cast<ErrorInfoException&>(ex)).getUserMessageID();
-                        }
-                        else
-                        {
-                            _uiUserMessageID = uiUserMessageID;
-                        }
-
-                        std::stringstream strStream;
-
-                        _strLastErrorMessage = std::string(pError) + '\n';
-
-                        _strLastErrorMessage = _strLastErrorMessage + std::string("MessageID: ") + lexical_cast<std::string>(_uiUserMessageID) + '\n';
-
-                        strStream << diagnostic_information(ex) << std::endl;
-                        _strLastErrorMessage = _strLastErrorMessage + strStream.str();
-
-                        _strLastErrorMessage = _strLastErrorMessage + printStackTrace();
-
-                        DEBUG_TRACE1("%s\n", _strLastErrorMessage.c_str());
-                        LOG_ERROR(_strLastErrorMessage);
-
-                        return;
-                    }
-
-                    ExLog::~ExLog()
-                    {
-                    }
-
-                    void ExLog::logInfo(std::string strInfo)
-                    {
-                        LOG_INFO(strInfo);
-                        DEBUG_TRACE1("%s\n", strInfo.c_str());
-
-                        return;
-                    }
-
-                    std::string ExLog::printStackTrace(unsigned int uiMaxFrame /* = 63 */)
-                    {
-                        /* TODO: Implement Stackwalker */
-
-                        std::string strTrace;
-
-                        strTrace = "Stack Trace\n";
-
-                        return strTrace;
-                    }
-                }
-            }
-        }
-    }
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include <boost/exception/all.hpp>
+#include <exception>
+#include <boost/lexical_cast.hpp>
+#include <typeinfo>
+#include "ErrorInfoException.h"
+
+#include "DbgTrace.h"
+#include "BLogger.h"
+
+namespace org
+{
+    namespace apache
+    {
+        namespace plc4x
+        {
+            namespace cpp
+            {
+                namespace utils
+                {
+                    using namespace std;
+                    using namespace boost;
+
+                    ExLog::ExLog()
+                    {
+
+                    }
+
+                    ExLog::ExLog(unsigned int uiUserMessageID, std::exception& ex, const char* pError) :
+                        _strWhat(ex.what())
+                    {
+                        string strExceptionClassName = typeid(ex).name();
+
+                        if (strExceptionClassName.find(typeid(ExLog).name()) != std::string::npos)
+                        {
+                            _uiUserMessageID = (reinterpret_cast<ExLog&>(ex)).getUserMessageID();
+                        }
+                        else if (strExceptionClassName.find(typeid(ErrorInfoException).name()) != std::string::npos)
+                        {
+                            _uiUserMessageID = (reinterpret_cast<ErrorInfoException&>(ex)).getUserMessageID();
+                        }
+                        else
+                        {
+                            _uiUserMessageID = uiUserMessageID;
+                        }
+
+                        std::stringstream strStream;
+
+                        _strLastErrorMessage = std::string(pError) + '\n';
+
+                        _strLastErrorMessage = _strLastErrorMessage + std::string("MessageID: ") + lexical_cast<std::string>(_uiUserMessageID) + '\n';
+
+                        strStream << diagnostic_information(ex) << std::endl;
+                        _strLastErrorMessage = _strLastErrorMessage + strStream.str();
+
+                        _strLastErrorMessage = _strLastErrorMessage + printStackTrace();
+
+                        DEBUG_TRACE1("%s\n", _strLastErrorMessage.c_str());
+                        LOG_ERROR(_strLastErrorMessage);
+
+                        return;
+                    }
+
+                    ExLog::ExLog(unsigned int uiUserMessageID, boost::exception& ex, const char* pError) :
+                        _strWhat(*get_error_info<errmsg_info>(ex))
+                    {
+                        string strExceptionClassName = typeid(ex).name();
+
+                        if (strExceptionClassName.find(typeid(ExLog).name()) != std::string::npos)
+                        {
+                            _uiUserMessageID = (reinterpret_cast<ExLog&>(ex)).getUserMessageID();
+                        }
+                        else if (strExceptionClassName.find(typeid(ErrorInfoException).name()) != std::string::npos)
+                        {
+                            _uiUserMessageID = (reinterpret_cast<ErrorInfoException&>(ex)).getUserMessageID();
+                        }
+                        else
+                        {
+                            _uiUserMessageID = uiUserMessageID;
+                        }
+
+                        std::stringstream strStream;
+
+                        _strLastErrorMessage = std::string(pError) + '\n';
+
+                        _strLastErrorMessage = _strLastErrorMessage + std::string("MessageID: ") + lexical_cast<std::string>(_uiUserMessageID) + '\n';
+
+                        strStream << diagnostic_information(ex) << std::endl;
+                        _strLastErrorMessage = _strLastErrorMessage + strStream.str();
+
+                        _strLastErrorMessage = _strLastErrorMessage + printStackTrace();
+
+                        DEBUG_TRACE1("%s\n", _strLastErrorMessage.c_str());
+                        LOG_ERROR(_strLastErrorMessage);
+
+                        return;
+                    }
+
+                    ExLog::~ExLog()
+                    {
+                    }
+
+                    void ExLog::logInfo(std::string strInfo)
+                    {
+                        LOG_INFO(strInfo);
+                        DEBUG_TRACE1("%s\n", strInfo.c_str());
+
+                        return;
+                    }
+
+                    std::string ExLog::printStackTrace(unsigned int uiMaxFrame /* = 63 */)
+                    {
+                        /* TODO: Implement Stackwalker */
+
+                        std::string strTrace;
+
+                        strTrace = "Stack Trace\n";
+
+                        return strTrace;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/ExLog.h b/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/ExLog.h
index 64c8d017d65..315ef4c2d0c 100644
--- a/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/ExLog.h
+++ b/sandbox/plc4cpp/utils/logger/src/main/cpp/org/apache/plc4x/cpp/utils/logger/ExLog.h
@@ -1,71 +1,71 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _EX_LOG_H_
-#define _EX_LOG_H_
-
-#include <boost/exception/exception.hpp>
-#include <exception>
-#include <string>
-
-namespace org
-{
-    namespace apache
-    {
-        namespace plc4x
-        {
-            namespace cpp
-            {
-                namespace utils
-                {
-                    typedef boost::error_info<struct tag_errmsg, std::string> errmsg_info;
-
-                    class ExLog : public boost::exception, public std::exception
-                    {
-
-                    public:
-                        ExLog();
-
-                        virtual ~ExLog() throw();
-
-                        ExLog(unsigned int uiUserMessageID, std::exception& ex, const char* pError);
-
-                        ExLog(unsigned int uiUserMessageID, boost::exception& ex, const char* pError);
-
-                        void logInfo(std::string strInfo);
-
-                        inline unsigned int getUserMessageID() const { return _uiUserMessageID; }
-                        virtual const char* what() const throw() { return _strWhat.c_str(); }
-
-                    protected:
-
-                        std::string printStackTrace(unsigned int max_frames = 63);
-
-                    protected:
-
-                        std::string _strWhat;
-                        std::string _strLastErrorMessage;
-                        unsigned int _uiUserMessageID;
-                    };
-                }
-            }
-        }
-    }
-}
-#endif
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _EX_LOG_H_
+#define _EX_LOG_H_
+
+#include <boost/exception/exception.hpp>
+#include <exception>
+#include <string>
+
+namespace org
+{
+    namespace apache
+    {
+        namespace plc4x
+        {
+            namespace cpp
+            {
+                namespace utils
+                {
+                    typedef boost::error_info<struct tag_errmsg, std::string> errmsg_info;
+
+                    class ExLog : public boost::exception, public std::exception
+                    {
+
+                    public:
+                        ExLog();
+
+                        virtual ~ExLog() throw();
+
+                        ExLog(unsigned int uiUserMessageID, std::exception& ex, const char* pError);
+
+                        ExLog(unsigned int uiUserMessageID, boost::exception& ex, const char* pError);
+
+                        void logInfo(std::string strInfo);
+
+                        inline unsigned int getUserMessageID() const { return _uiUserMessageID; }
+                        virtual const char* what() const throw() { return _strWhat.c_str(); }
+
+                    protected:
+
+                        std::string printStackTrace(unsigned int max_frames = 63);
+
+                    protected:
+
+                        std::string _strWhat;
+                        std::string _strLastErrorMessage;
+                        unsigned int _uiUserMessageID;
+                    };
+                }
+            }
+        }
+    }
+}
+#endif
diff --git a/sandbox/plc4cpp/utils/systemconfig/CMakeLists.txt b/sandbox/plc4cpp/utils/systemconfig/CMakeLists.txt
index 679c27401b2..69a442cdae6 100644
--- a/sandbox/plc4cpp/utils/systemconfig/CMakeLists.txt
+++ b/sandbox/plc4cpp/utils/systemconfig/CMakeLists.txt
@@ -1,24 +1,24 @@
-#[[
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://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.
-]]
-
-add_library(plc4cpp-utils-systemconfig
-		src/main/cpp/org/apache/plc4x/cpp/utils/systemconfig/SystemConfiguration.cpp
-        )
-
-target_include_directories (plc4cpp-utils-systemconfig PUBLIC ${Boost_INCLUDE_DIRS})
+#[[
+  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
+
+      http://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.
+]]
+
+add_library(plc4cpp-utils-systemconfig
+		src/main/cpp/org/apache/plc4x/cpp/utils/systemconfig/SystemConfiguration.cpp
+        )
+
+target_include_directories (plc4cpp-utils-systemconfig PUBLIC ${Boost_INCLUDE_DIRS})
diff --git a/sandbox/plc4cpp/utils/systemconfig/src/main/cpp/org/apache/plc4x/cpp/utils/systemconfig/SystemConfiguration.cpp b/sandbox/plc4cpp/utils/systemconfig/src/main/cpp/org/apache/plc4x/cpp/utils/systemconfig/SystemConfiguration.cpp
index bdfa38a74d6..850b8d5ba20 100644
--- a/sandbox/plc4cpp/utils/systemconfig/src/main/cpp/org/apache/plc4x/cpp/utils/systemconfig/SystemConfiguration.cpp
+++ b/sandbox/plc4cpp/utils/systemconfig/src/main/cpp/org/apache/plc4x/cpp/utils/systemconfig/SystemConfiguration.cpp
@@ -1,64 +1,64 @@
-/*
-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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#include "SystemConfiguration.h"
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace utils
-				{
-                    SystemConfiguration::SystemConfiguration()
-					{
-						Load();
-
-                        return;
-					}
-
-                    SystemConfiguration::~SystemConfiguration()
-					{
-						return;
-					}
-
-					void SystemConfiguration::Load()
-					{
-                        try
-                        {
-                            //pt::read_xml(CONFIGFILE.c_str(), initpTree);
-                        }
-                        catch(...)
-                        {
-                        }
-                        return;
-					}
-
-                    long SystemConfiguration::getLong(std::string strPath, long lDefaultValue)
-                    {
-                        return lDefaultValue;
-                    }
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "SystemConfiguration.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace utils
+				{
+                    SystemConfiguration::SystemConfiguration()
+					{
+						Load();
+
+                        return;
+					}
+
+                    SystemConfiguration::~SystemConfiguration()
+					{
+						return;
+					}
+
+					void SystemConfiguration::Load()
+					{
+                        try
+                        {
+                            //pt::read_xml(CONFIGFILE.c_str(), initpTree);
+                        }
+                        catch(...)
+                        {
+                        }
+                        return;
+					}
+
+                    long SystemConfiguration::getLong(std::string strPath, long lDefaultValue)
+                    {
+                        return lDefaultValue;
+                    }
+				}
+			}
+		}
+	}
+}
diff --git a/sandbox/plc4cpp/utils/systemconfig/src/main/cpp/org/apache/plc4x/cpp/utils/systemconfig/SystemConfiguration.h b/sandbox/plc4cpp/utils/systemconfig/src/main/cpp/org/apache/plc4x/cpp/utils/systemconfig/SystemConfiguration.h
index 555868c917a..a6370975033 100644
--- a/sandbox/plc4cpp/utils/systemconfig/src/main/cpp/org/apache/plc4x/cpp/utils/systemconfig/SystemConfiguration.h
+++ b/sandbox/plc4cpp/utils/systemconfig/src/main/cpp/org/apache/plc4x/cpp/utils/systemconfig/SystemConfiguration.h
@@ -1,70 +1,70 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-#ifndef _SYSTEMCONFIGURATION_H_
-#define _SYSTEMCONFIGURATION_H_
-
-#include <boost/property_tree/ptree.hpp>
-#include <boost/property_tree/xml_parser.hpp>
-#include <boost/foreach.hpp>
-#include <string>
-#include <set>
-#include <exception>
-#include <iostream>
-
-// TODO: Implementation SystemConfiguration
-
-namespace org
-{
-	namespace apache
-	{
-		namespace plc4x
-		{
-			namespace cpp
-			{
-				namespace utils
-				{
-                    namespace pt = boost::property_tree;
-
-					class SystemConfiguration : public pt::ptree
-					{
-
-					public:
-
-                        SystemConfiguration();
-
-						~SystemConfiguration();
-
-						void Load();
-
-                        long getLong(std::string strPath, long lDefaultValue);
-
-					private:
-
-                        const std::string CONFIGFILE = "./ Config/Config.xml";
-
-                        pt::ptree initpTree;
-
-					};
-				}
-			}
-		}
-	}
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _SYSTEMCONFIGURATION_H_
+#define _SYSTEMCONFIGURATION_H_
+
+#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/xml_parser.hpp>
+#include <boost/foreach.hpp>
+#include <string>
+#include <set>
+#include <exception>
+#include <iostream>
+
+// TODO: Implementation SystemConfiguration
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace utils
+				{
+                    namespace pt = boost::property_tree;
+
+					class SystemConfiguration : public pt::ptree
+					{
+
+					public:
+
+                        SystemConfiguration();
+
+						~SystemConfiguration();
+
+						void Load();
+
+                        long getLong(std::string strPath, long lDefaultValue);
+
+					private:
+
+                        const std::string CONFIGFILE = "./ Config/Config.xml";
+
+                        pt::ptree initpTree;
+
+					};
+				}
+			}
+		}
+	}
+}
 #endif
\ No newline at end of file
diff --git a/sandbox/plc4net/.gitignore b/sandbox/plc4net/.gitignore
index 912bc0a5edf..20624c6c781 100644
--- a/sandbox/plc4net/.gitignore
+++ b/sandbox/plc4net/.gitignore
@@ -1,344 +1,344 @@
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-##
-## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
-
-# User-specific files
-*.rsuser
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
-# Mono auto generated files
-mono_crash.*
-
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-[Aa][Rr][Mm]/
-[Aa][Rr][Mm]64/
-bld/
-[Bb]in/
-[Oo]bj/
-[Ll]og/
-
-# Visual Studio 2015/2017 cache/options directory
-.vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
-
-# Visual Studio 2017 auto generated files
-Generated\ Files/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# NUNIT
-*.VisualState.xml
-TestResult.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# Benchmark Results
-BenchmarkDotNet.Artifacts/
-
-# .NET Core
-project.lock.json
-project.fragment.lock.json
-artifacts/
-
-# StyleCop
-StyleCopReport.xml
-
-# Files built by Visual Studio
-*_i.c
-*_p.c
-*_h.h
-*.ilk
-*.meta
-*.obj
-*.iobj
-*.pch
-*.pdb
-*.ipdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*_wpftmp.csproj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opendb
-*.opensdf
-*.sdf
-*.cachefile
-*.VC.db
-*.VC.VC.opendb
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-*.sap
-
-# Visual Studio Trace Files
-*.e2e
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# JustCode is a .NET coding add-in
-.JustCode
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# AxoCover is a Code Coverage Tool
-.axoCover/*
-!.axoCover/settings.json
-
-# Visual Studio code coverage results
-*.coverage
-*.coveragexml
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-nCrunchTemp_*
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# Note: Comment the next line if you want to checkin your web deploy settings,
-# but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
-*.publishproj
-
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
-
-# NuGet Packages
-*.nupkg
-# The packages folder can be ignored because of Package Restore
-**/[Pp]ackages/*
-# except build/, which is used as an MSBuild target.
-!**/[Pp]ackages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/[Pp]ackages/repositories.config
-# NuGet v3's project.json files produces more ignorable files
-*.nuget.props
-*.nuget.targets
-
-# Microsoft Azure Build Output
-csx/
-*.build.csdef
-
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Windows Store app package directories and files
-AppPackages/
-BundleArtifacts/
-Package.StoreAssociation.xml
-_pkginfo.txt
-*.appx
-*.appxbundle
-*.appxupload
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!?*.[Cc]ache/
-
-# Others
-ClientBin/
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.jfm
-*.pfx
-*.publishsettings
-orleans.codegen.cs
-
-# Including strong name files can present a security risk
-# (https://github.com/github/gitignore/pull/2483#issue-259490424)
-#*.snk
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-ServiceFabricBackup/
-*.rptproj.bak
-
-# SQL Server files
-*.mdf
-*.ldf
-*.ndf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-*.rptproj.rsuser
-*- Backup*.rdl
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# GhostDoc plugin setting file
-*.GhostDoc.xml
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-node_modules/
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
-*.vbw
-
-# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
-_Pvt_Extensions
-
-# Paket dependency manager
-.paket/paket.exe
-paket-files/
-
-# FAKE - F# Make
-.fake/
-
-# CodeRush personal settings
-.cr/personal
-
-# Python Tools for Visual Studio (PTVS)
-__pycache__/
-*.pyc
-
-# Cake - Uncomment if you are using it
-# tools/**
-# !tools/packages.config
-
-# Tabs Studio
-*.tss
-
-# Telerik's JustMock configuration file
-*.jmconfig
-
-# BizTalk build output
-*.btp.cs
-*.btm.cs
-*.odx.cs
-*.xsd.cs
-
-# OpenCover UI analysis results
-OpenCover/
-
-# Azure Stream Analytics local run output
-ASALocalRun/
-
-# MSBuild Binary and Structured Log
-*.binlog
-
-# NVidia Nsight GPU debugger configuration file
-*.nvuser
-
-# MFractors (Xamarin productivity tool) working folder
-.mfractor/
-
-# Local History for Visual Studio
-.localhistory/
-
-# BeatPulse healthcheck temp database
-healthchecksdb
-
-# Backup folder for Package Reference Convert tool in Visual Studio 2017
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- Backup*.rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# CodeRush personal settings
+.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
 MigrationBackup/
\ No newline at end of file
diff --git a/sandbox/plc4net/api/PlcDriverManager.cs b/sandbox/plc4net/api/PlcDriverManager.cs
index 7597e3a2628..50433d8532d 100644
--- a/sandbox/plc4net/api/PlcDriverManager.cs
+++ b/sandbox/plc4net/api/PlcDriverManager.cs
@@ -1,104 +1,104 @@
-/*
-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
-
-  http://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.
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using org.apache.plc4net.api;
-using org.apache.plc4net.api.authentication;
-using org.apache.plc4net.exceptions;
-
-namespace org.apache.plc4net
-{
-    /// <summary>
-    /// Manages connections to PLCs
-    /// </summary>
-    public class PlcDriverManager
-    {
-        /// <summary>
-        /// Singleton instance of the manager
-        /// </summary>
-        private static PlcDriverManager _instance;
-
-        /// <summary>
-        /// Get the singleton instance
-        /// </summary>
-        public static PlcDriverManager Instance => _instance ?? (_instance = new PlcDriverManager());
-
-        /// <summary>
-        /// Dictionary for the drivers
-        /// </summary>
-        private readonly Dictionary<string, IPlcDriver> _drivers;
-
-        /// <summary>
-        /// Private constructor for the singleton driver manager.
-        /// </summary>
-        private PlcDriverManager()
-        {
-            _drivers = new Dictionary<string, IPlcDriver>();
-
-            /*
-             * TODO: Implement some mechanism to provide drivers -> MEF?
-             */
-        }
-
-        /// <summary>
-        /// Get the connection to the a PLC identified by the URL
-        /// </summary>
-        /// <param name="url">URL including the schema to connect to the PLC</param>
-        /// <param name="authentication">Authentication to use</param>
-        /// <returns>Created PLC connection</returns>
-        public async Task<IPlcConnection> GetConnection(string url, IPlcAuthentication authentication)
-        {
-            var plcDriver = GetDriver(url);
-            var connection = await plcDriver.ConnectAsync(url, authentication);
-            
-            //TODO: Does the driver method already connect or is a separate connect needed?
-            //TODO: Should we do it like this?
-            if (!connection.IsConnected)
-            {
-                await connection.ConnectAsync();
-            }
-
-            return connection;
-        }
-
-        public IPlcDriver GetDriver(string url)
-        {
-            try
-            {
-                Uri plcUri = new Uri(url);
-                var proto = plcUri.Scheme;
-
-                _drivers.TryGetValue(proto, out var plcDriver);
-
-                if (plcDriver == null)
-                {
-                    throw new PlcConnectionException($"Unknown driver for protocol '{proto}'");
-                }
-
-                return plcDriver;
-            }
-            catch (UriFormatException invalidUriException)
-            {
-                throw new PlcConnectionException($"Provided connection string '{url}' is invalid", invalidUriException);
-            }
-        }
-    }
+/*
+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
+
+  http://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.
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using org.apache.plc4net.api;
+using org.apache.plc4net.api.authentication;
+using org.apache.plc4net.exceptions;
+
+namespace org.apache.plc4net
+{
+    /// <summary>
+    /// Manages connections to PLCs
+    /// </summary>
+    public class PlcDriverManager
+    {
+        /// <summary>
+        /// Singleton instance of the manager
+        /// </summary>
+        private static PlcDriverManager _instance;
+
+        /// <summary>
+        /// Get the singleton instance
+        /// </summary>
+        public static PlcDriverManager Instance => _instance ?? (_instance = new PlcDriverManager());
+
+        /// <summary>
+        /// Dictionary for the drivers
+        /// </summary>
+        private readonly Dictionary<string, IPlcDriver> _drivers;
+
+        /// <summary>
+        /// Private constructor for the singleton driver manager.
+        /// </summary>
+        private PlcDriverManager()
+        {
+            _drivers = new Dictionary<string, IPlcDriver>();
+
+            /*
+             * TODO: Implement some mechanism to provide drivers -> MEF?
+             */
+        }
+
+        /// <summary>
+        /// Get the connection to the a PLC identified by the URL
+        /// </summary>
+        /// <param name="url">URL including the schema to connect to the PLC</param>
+        /// <param name="authentication">Authentication to use</param>
+        /// <returns>Created PLC connection</returns>
+        public async Task<IPlcConnection> GetConnection(string url, IPlcAuthentication authentication)
+        {
+            var plcDriver = GetDriver(url);
+            var connection = await plcDriver.ConnectAsync(url, authentication);
+            
+            //TODO: Does the driver method already connect or is a separate connect needed?
+            //TODO: Should we do it like this?
+            if (!connection.IsConnected)
+            {
+                await connection.ConnectAsync();
+            }
+
+            return connection;
+        }
+
+        public IPlcDriver GetDriver(string url)
+        {
+            try
+            {
+                Uri plcUri = new Uri(url);
+                var proto = plcUri.Scheme;
+
+                _drivers.TryGetValue(proto, out var plcDriver);
+
+                if (plcDriver == null)
+                {
+                    throw new PlcConnectionException($"Unknown driver for protocol '{proto}'");
+                }
+
+                return plcDriver;
+            }
+            catch (UriFormatException invalidUriException)
+            {
+                throw new PlcConnectionException($"Provided connection string '{url}' is invalid", invalidUriException);
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/api.csproj b/sandbox/plc4net/api/api.csproj
index eb0081284d2..0c0c64e1e88 100644
--- a/sandbox/plc4net/api/api.csproj
+++ b/sandbox/plc4net/api/api.csproj
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
--->
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>org.apache.plc4net</RootNamespace>
-  </PropertyGroup>
-
-</Project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+-->
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <RootNamespace>org.apache.plc4net</RootNamespace>
+  </PropertyGroup>
+
+</Project>
diff --git a/sandbox/plc4net/api/api/IPlcConnection.cs b/sandbox/plc4net/api/api/IPlcConnection.cs
index cc22990e8eb..94c51846bdb 100644
--- a/sandbox/plc4net/api/api/IPlcConnection.cs
+++ b/sandbox/plc4net/api/api/IPlcConnection.cs
@@ -1,89 +1,89 @@
-/*
-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
-
-  http://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.
-*/
-
-using System;
-using System.Threading.Tasks;
-using org.apache.plc4net.api.metadata;
-using org.apache.plc4net.messages;
-using org.apache.plc4net.model;
-
-namespace org.apache.plc4net.api
-{
-    /// <summary>
-    /// Interface for generalized PLC connections providing
-    /// functionality for basic operations like connect / disconnect etc.
-    /// </summary>
-    public interface IPlcConnection: IDisposable
-    {
-        /// <summary>
-        /// Connect to the PLC asynchronously
-        /// </summary>
-        /// <returns>Awaitable task</returns>
-        /// <exception cref="org.apache.plc4net.exceptions.PlcConnectionException">Thrown if the connection to the PLC fails</exception>
-        Task ConnectAsync();
-
-        /// <summary>
-        /// Indicates the connection state
-        /// </summary>
-        bool IsConnected { get; }
-
-        /// <summary>
-        /// Close the PLC connection asynchronously
-        /// </summary>
-        /// <returns>Awaitable task</returns>
-        Task CloseAsync();
-
-        /// <summary>
-        /// Get the metadata for the connection
-        /// </summary>
-        IPlcConnectionMetadata PlcConnectionMetadata { get; }
-
-        /// <summary>
-        /// Parse the given field query
-        /// </summary>
-        /// <param name="fieldQuery">Query for the field</param>
-        /// <returns>Field parsed from the query string</returns>
-        /// <exception cref="org.apache.plc4net.exceptions.PlcInvalidFieldException">Thrown when the query can not be parsed</exception>
-        IPlcField Parse(string fieldQuery);
-
-        /// <summary>
-        /// Request builder for constructing read requests
-        /// </summary>
-        /// <returns>null if the connection does not support reading</returns>
-        IPlcReadRequestBuilder ReadRequestBuilder { get; }
-
-        /// <summary>
-        /// Request builder for constructing write requests
-        /// </summary>
-        /// <returns>null if the connection does not support writing</returns>
-        IPlcWriteRequestBuilder WriteRequestBuilder { get; }
-
-        /// <summary>
-        /// Request builder for constructing subscription requests
-        /// </summary>
-        /// <returns>null if the connection does not support subscriptions</returns>
-        IPlcSubscriptionRequestBuilder SubscriptionRequestBuilder { get; }
-
-        /// <summary>
-        /// Request builder for unsubscribing
-        /// </summary>
-        /// <returns>null if the connection does not support subscriptions</returns>
-        IPlcUnsubscriptionRequestBuilder UnsubscriptionRequestBuilder { get; }
-    }
+/*
+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
+
+  http://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.
+*/
+
+using System;
+using System.Threading.Tasks;
+using org.apache.plc4net.api.metadata;
+using org.apache.plc4net.messages;
+using org.apache.plc4net.model;
+
+namespace org.apache.plc4net.api
+{
+    /// <summary>
+    /// Interface for generalized PLC connections providing
+    /// functionality for basic operations like connect / disconnect etc.
+    /// </summary>
+    public interface IPlcConnection: IDisposable
+    {
+        /// <summary>
+        /// Connect to the PLC asynchronously
+        /// </summary>
+        /// <returns>Awaitable task</returns>
+        /// <exception cref="org.apache.plc4net.exceptions.PlcConnectionException">Thrown if the connection to the PLC fails</exception>
+        Task ConnectAsync();
+
+        /// <summary>
+        /// Indicates the connection state
+        /// </summary>
+        bool IsConnected { get; }
+
+        /// <summary>
+        /// Close the PLC connection asynchronously
+        /// </summary>
+        /// <returns>Awaitable task</returns>
+        Task CloseAsync();
+
+        /// <summary>
+        /// Get the metadata for the connection
+        /// </summary>
+        IPlcConnectionMetadata PlcConnectionMetadata { get; }
+
+        /// <summary>
+        /// Parse the given field query
+        /// </summary>
+        /// <param name="fieldQuery">Query for the field</param>
+        /// <returns>Field parsed from the query string</returns>
+        /// <exception cref="org.apache.plc4net.exceptions.PlcInvalidFieldException">Thrown when the query can not be parsed</exception>
+        IPlcField Parse(string fieldQuery);
+
+        /// <summary>
+        /// Request builder for constructing read requests
+        /// </summary>
+        /// <returns>null if the connection does not support reading</returns>
+        IPlcReadRequestBuilder ReadRequestBuilder { get; }
+
+        /// <summary>
+        /// Request builder for constructing write requests
+        /// </summary>
+        /// <returns>null if the connection does not support writing</returns>
+        IPlcWriteRequestBuilder WriteRequestBuilder { get; }
+
+        /// <summary>
+        /// Request builder for constructing subscription requests
+        /// </summary>
+        /// <returns>null if the connection does not support subscriptions</returns>
+        IPlcSubscriptionRequestBuilder SubscriptionRequestBuilder { get; }
+
+        /// <summary>
+        /// Request builder for unsubscribing
+        /// </summary>
+        /// <returns>null if the connection does not support subscriptions</returns>
+        IPlcUnsubscriptionRequestBuilder UnsubscriptionRequestBuilder { get; }
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/api/IPlcDriver.cs b/sandbox/plc4net/api/api/IPlcDriver.cs
index 40aff40ae3d..f6a2055cac0 100644
--- a/sandbox/plc4net/api/api/IPlcDriver.cs
+++ b/sandbox/plc4net/api/api/IPlcDriver.cs
@@ -1,57 +1,57 @@
-/*
-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
-
-  http://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.
-*/
-
-using System.Threading.Tasks;
-using org.apache.plc4net.api.authentication;
-
-namespace org.apache.plc4net.api
-{
-    /// <summary>
-    /// Interface for PLC drivers to be implemented
-    /// </summary>
-    public interface IPlcDriver
-    {
-        /// <summary>
-        /// Get the code of the implemented protocol
-        /// </summary>
-        string ProtocolCode { get; }
-
-        /// <summary>
-        /// Full Name of the implemented protocol
-        /// </summary>
-        string ProtocolName { get; }
-
-        /// <summary>
-        /// Connects to the PLC identified by the connection string
-        /// </summary>
-        /// <param name="connectionString">Connection string identifying the PLC to connect to</param>
-        /// <returns>Awaitable task returning the <see cref="IPlcConnection"/> to which the connection was established</returns>
-        /// <exception cref="org.apache.plc4net.exceptions.PlcConnectionException">Thrown on connection failure</exception>
-        Task<IPlcConnection> ConnectAsync(string connectionString);
-
-        /// <summary>
-        /// Connects to the PLC identified by the connection string and using the 
-        /// </summary>
-        /// <param name="connectionString"></param>
-        /// <param name="authentication"></param>
-        /// <returns>Awaitable task returning the <see cref="IPlcConnection"/> to which the connection was established</returns>
-        /// <exception cref="org.apache.plc4net.exceptions.PlcConnectionException">Thrown on connection failure</exception>
-        Task<IPlcConnection> ConnectAsync(string connectionString, IPlcAuthentication authentication);
-    }
+/*
+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
+
+  http://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.
+*/
+
+using System.Threading.Tasks;
+using org.apache.plc4net.api.authentication;
+
+namespace org.apache.plc4net.api
+{
+    /// <summary>
+    /// Interface for PLC drivers to be implemented
+    /// </summary>
+    public interface IPlcDriver
+    {
+        /// <summary>
+        /// Get the code of the implemented protocol
+        /// </summary>
+        string ProtocolCode { get; }
+
+        /// <summary>
+        /// Full Name of the implemented protocol
+        /// </summary>
+        string ProtocolName { get; }
+
+        /// <summary>
+        /// Connects to the PLC identified by the connection string
+        /// </summary>
+        /// <param name="connectionString">Connection string identifying the PLC to connect to</param>
+        /// <returns>Awaitable task returning the <see cref="IPlcConnection"/> to which the connection was established</returns>
+        /// <exception cref="org.apache.plc4net.exceptions.PlcConnectionException">Thrown on connection failure</exception>
+        Task<IPlcConnection> ConnectAsync(string connectionString);
+
+        /// <summary>
+        /// Connects to the PLC identified by the connection string and using the 
+        /// </summary>
+        /// <param name="connectionString"></param>
+        /// <param name="authentication"></param>
+        /// <returns>Awaitable task returning the <see cref="IPlcConnection"/> to which the connection was established</returns>
+        /// <exception cref="org.apache.plc4net.exceptions.PlcConnectionException">Thrown on connection failure</exception>
+        Task<IPlcConnection> ConnectAsync(string connectionString, IPlcAuthentication authentication);
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/api/authentication/IPlcAuthentication.cs b/sandbox/plc4net/api/api/authentication/IPlcAuthentication.cs
index 4a9440307e9..46edb27cc3b 100644
--- a/sandbox/plc4net/api/api/authentication/IPlcAuthentication.cs
+++ b/sandbox/plc4net/api/api/authentication/IPlcAuthentication.cs
@@ -1,29 +1,29 @@
-/*
-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
-
-  http://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.
-*/
-
-namespace org.apache.plc4net.api.authentication
-{
-    /// <summary>
-    /// Base interface for possible authentication methods
-    /// used by the PLCs
-    /// </summary>
-    public interface IPlcAuthentication
-    {
-    }
+/*
+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
+
+  http://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.
+*/
+
+namespace org.apache.plc4net.api.authentication
+{
+    /// <summary>
+    /// Base interface for possible authentication methods
+    /// used by the PLCs
+    /// </summary>
+    public interface IPlcAuthentication
+    {
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/api/authentication/PlcUsernamePasswordAuthentication.cs b/sandbox/plc4net/api/api/authentication/PlcUsernamePasswordAuthentication.cs
index 2c7f52c73c6..a34d345a56b 100644
--- a/sandbox/plc4net/api/api/authentication/PlcUsernamePasswordAuthentication.cs
+++ b/sandbox/plc4net/api/api/authentication/PlcUsernamePasswordAuthentication.cs
@@ -1,48 +1,48 @@
-/*
-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
-
-  http://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.
-*/
-
-namespace org.apache.plc4net.api.authentication
-{
-    /// <summary>
-    /// Authentication using Username and Password
-    /// </summary>
-    public class PlcUsernamePasswordAuthentication : IPlcAuthentication
-    {
-        /// <summary>
-        /// Create a new instance using username and password
-        /// </summary>
-        /// <param name="username">Username to set</param>
-        /// <param name="password">Password to set</param>
-        public PlcUsernamePasswordAuthentication(string username, string password)
-        {
-            Username = username;
-            Password = password;
-        }
-
-        /// <summary>
-        /// Username
-        /// </summary>
-        public string Username { get; protected set; }
-
-        /// <summary>
-        /// Password
-        /// </summary>
-        public string Password { get; protected set; }
-    }
+/*
+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
+
+  http://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.
+*/
+
+namespace org.apache.plc4net.api.authentication
+{
+    /// <summary>
+    /// Authentication using Username and Password
+    /// </summary>
+    public class PlcUsernamePasswordAuthentication : IPlcAuthentication
+    {
+        /// <summary>
+        /// Create a new instance using username and password
+        /// </summary>
+        /// <param name="username">Username to set</param>
+        /// <param name="password">Password to set</param>
+        public PlcUsernamePasswordAuthentication(string username, string password)
+        {
+            Username = username;
+            Password = password;
+        }
+
+        /// <summary>
+        /// Username
+        /// </summary>
+        public string Username { get; protected set; }
+
+        /// <summary>
+        /// Password
+        /// </summary>
+        public string Password { get; protected set; }
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/api/metadata/IPlcConnectionMetadata.cs b/sandbox/plc4net/api/api/metadata/IPlcConnectionMetadata.cs
index 7504c91f63c..5086d7dc2d3 100644
--- a/sandbox/plc4net/api/api/metadata/IPlcConnectionMetadata.cs
+++ b/sandbox/plc4net/api/api/metadata/IPlcConnectionMetadata.cs
@@ -1,39 +1,39 @@
-/*
-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
-
-  http://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.
-*/
-
-namespace org.apache.plc4net.api.metadata
-{
-    public interface IPlcConnectionMetadata
-    {
-        /// <summary>
-        /// Indicates that the connection is able to read from the PLC
-        /// </summary>
-        bool CanRead { get; }
-
-        /// <summary>
-        /// Indicates that the connection is able to write to the PLC
-        /// </summary>
-        bool CanWrite { get; }
-
-        /// <summary>
-        /// Indicates that the connection is able to subscribe to PLC data
-        /// </summary>
-        bool CanSubscribe { get; }
-    }
+/*
+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
+
+  http://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.
+*/
+
+namespace org.apache.plc4net.api.metadata
+{
+    public interface IPlcConnectionMetadata
+    {
+        /// <summary>
+        /// Indicates that the connection is able to read from the PLC
+        /// </summary>
+        bool CanRead { get; }
+
+        /// <summary>
+        /// Indicates that the connection is able to write to the PLC
+        /// </summary>
+        bool CanWrite { get; }
+
+        /// <summary>
+        /// Indicates that the connection is able to subscribe to PLC data
+        /// </summary>
+        bool CanSubscribe { get; }
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/exceptions/PlcConnectionException.cs b/sandbox/plc4net/api/exceptions/PlcConnectionException.cs
index bc6af44b0a0..78a38d5946c 100644
--- a/sandbox/plc4net/api/exceptions/PlcConnectionException.cs
+++ b/sandbox/plc4net/api/exceptions/PlcConnectionException.cs
@@ -1,50 +1,50 @@
-/*
-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
-
-  http://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.
-*/
-
-using System;
-using System.Runtime.Serialization;
-
-namespace org.apache.plc4net.exceptions
-{
-    /// <summary>
-    /// Exception raised when the connection to a
-    /// PLC fails
-    /// </summary>
-    [Serializable]
-    public class PlcConnectionException : PlcException
-    {
-        public PlcConnectionException()
-        {
-        }
-
-        public PlcConnectionException(string message) : base(message)
-        {
-        }
-
-        public PlcConnectionException(string message, Exception inner) : base(message, inner)
-        {
-        }
-
-        protected PlcConnectionException(
-            SerializationInfo info,
-            StreamingContext context) : base(info, context)
-        {
-        }
-    }
+/*
+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
+
+  http://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.
+*/
+
+using System;
+using System.Runtime.Serialization;
+
+namespace org.apache.plc4net.exceptions
+{
+    /// <summary>
+    /// Exception raised when the connection to a
+    /// PLC fails
+    /// </summary>
+    [Serializable]
+    public class PlcConnectionException : PlcException
+    {
+        public PlcConnectionException()
+        {
+        }
+
+        public PlcConnectionException(string message) : base(message)
+        {
+        }
+
+        public PlcConnectionException(string message, Exception inner) : base(message, inner)
+        {
+        }
+
+        protected PlcConnectionException(
+            SerializationInfo info,
+            StreamingContext context) : base(info, context)
+        {
+        }
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/exceptions/PlcException.cs b/sandbox/plc4net/api/exceptions/PlcException.cs
index 63458547c27..ca6ceae740e 100644
--- a/sandbox/plc4net/api/exceptions/PlcException.cs
+++ b/sandbox/plc4net/api/exceptions/PlcException.cs
@@ -1,50 +1,50 @@
-/*
-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
-
-  http://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.
-*/
-
-using System;
-using System.Runtime.Serialization;
-
-namespace org.apache.plc4net.exceptions
-{
-    /// <summary>
-    /// General exception that gets thrown when errors while communicating
-    /// with PLC
-    /// </summary>
-    [Serializable]
-    public class PlcException : Exception
-    {        
-        public PlcException()
-        {
-        }
-
-        public PlcException(string message) : base(message)
-        {
-        }
-
-        public PlcException(string message, Exception inner) : base(message, inner)
-        {
-        }
-
-        protected PlcException(
-            SerializationInfo info,
-            StreamingContext context) : base(info, context)
-        {
-        }
-    }              
+/*
+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
+
+  http://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.
+*/
+
+using System;
+using System.Runtime.Serialization;
+
+namespace org.apache.plc4net.exceptions
+{
+    /// <summary>
+    /// General exception that gets thrown when errors while communicating
+    /// with PLC
+    /// </summary>
+    [Serializable]
+    public class PlcException : Exception
+    {        
+        public PlcException()
+        {
+        }
+
+        public PlcException(string message) : base(message)
+        {
+        }
+
+        public PlcException(string message, Exception inner) : base(message, inner)
+        {
+        }
+
+        protected PlcException(
+            SerializationInfo info,
+            StreamingContext context) : base(info, context)
+        {
+        }
+    }              
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/exceptions/PlcInvalidFieldException.cs b/sandbox/plc4net/api/exceptions/PlcInvalidFieldException.cs
index b3c4aa9f173..3997ddc85fb 100644
--- a/sandbox/plc4net/api/exceptions/PlcInvalidFieldException.cs
+++ b/sandbox/plc4net/api/exceptions/PlcInvalidFieldException.cs
@@ -1,46 +1,46 @@
-/*
-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
-
-  http://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.
-*/
-
-using System;
-using System.Runtime.Serialization;
-
-namespace org.apache.plc4net.exceptions
-{
-    [Serializable]
-    public class PlcInvalidFieldException : PlcException
-    {        
-        public PlcInvalidFieldException()
-        {
-        }
-
-        public PlcInvalidFieldException(string message) : base(message)
-        {
-        }
-
-        public PlcInvalidFieldException(string message, Exception inner) : base(message, inner)
-        {
-        }
-
-        protected PlcInvalidFieldException(
-            SerializationInfo info,
-            StreamingContext context) : base(info, context)
-        {
-        }
-    }
+/*
+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
+
+  http://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.
+*/
+
+using System;
+using System.Runtime.Serialization;
+
+namespace org.apache.plc4net.exceptions
+{
+    [Serializable]
+    public class PlcInvalidFieldException : PlcException
+    {        
+        public PlcInvalidFieldException()
+        {
+        }
+
+        public PlcInvalidFieldException(string message) : base(message)
+        {
+        }
+
+        public PlcInvalidFieldException(string message, Exception inner) : base(message, inner)
+        {
+        }
+
+        protected PlcInvalidFieldException(
+            SerializationInfo info,
+            StreamingContext context) : base(info, context)
+        {
+        }
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/messages/IPlcFieldRequest.cs b/sandbox/plc4net/api/messages/IPlcFieldRequest.cs
index d66b9b1d1a3..d4cb9e79707 100644
--- a/sandbox/plc4net/api/messages/IPlcFieldRequest.cs
+++ b/sandbox/plc4net/api/messages/IPlcFieldRequest.cs
@@ -1,52 +1,52 @@
-/*
-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
-
-  http://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.
-*/
-
-using System.Collections.Generic;
-using org.apache.plc4net.model;
-
-namespace org.apache.plc4net.messages
-{
-    /// <summary>
-    /// Request for certain fields inside the PLC
-    /// </summary>
-    public interface IPlcFieldRequest: IPlcRequest
-    {
-        /// <summary>
-        /// Number of fields in the request
-        /// </summary>
-        int FieldCount { get; }
-
-        /// <summary>
-        /// Enumeration of field names
-        /// </summary>
-        IEnumerable<string> FieldNames { get; }
-
-        /// <summary>
-        /// Get a field inside the request by its name
-        /// </summary>
-        /// <param name="name">Name of the PLC field to return</param>
-        /// <returns></returns>
-        IPlcField GetFieldByName(string name);
-
-        /// <summary>
-        /// Returns all fields inside the request
-        /// </summary>
-        IEnumerable<IPlcField> Fields { get; }
-    }
+/*
+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
+
+  http://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.
+*/
+
+using System.Collections.Generic;
+using org.apache.plc4net.model;
+
+namespace org.apache.plc4net.messages
+{
+    /// <summary>
+    /// Request for certain fields inside the PLC
+    /// </summary>
+    public interface IPlcFieldRequest: IPlcRequest
+    {
+        /// <summary>
+        /// Number of fields in the request
+        /// </summary>
+        int FieldCount { get; }
+
+        /// <summary>
+        /// Enumeration of field names
+        /// </summary>
+        IEnumerable<string> FieldNames { get; }
+
+        /// <summary>
+        /// Get a field inside the request by its name
+        /// </summary>
+        /// <param name="name">Name of the PLC field to return</param>
+        /// <returns></returns>
+        IPlcField GetFieldByName(string name);
+
+        /// <summary>
+        /// Returns all fields inside the request
+        /// </summary>
+        IEnumerable<IPlcField> Fields { get; }
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/messages/IPlcFieldResponse.cs b/sandbox/plc4net/api/messages/IPlcFieldResponse.cs
index b418ad8e238..7669e2948bb 100644
--- a/sandbox/plc4net/api/messages/IPlcFieldResponse.cs
+++ b/sandbox/plc4net/api/messages/IPlcFieldResponse.cs
@@ -1,49 +1,49 @@
-/*
-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
-
-  http://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.
-*/
-
-using System.Collections.Generic;
-using org.apache.plc4net.model;
-using org.apache.plc4net.types;
-
-namespace org.apache.plc4net.messages
-{
-    /// <summary>
-    /// Interface for responses to requests realted to
-    /// a specific PLC field
-    /// </summary>
-    public interface IPlcFieldResponse: IPlcResponse
-    {
-        /// <summary>
-        /// Enumeration of fields in the response
-        /// </summary>
-        IEnumerable<string> FieldNames { get; }
-
-        /// <summary>
-        /// Get a field by name
-        /// </summary>
-        /// <param name="name">Name of the field to retrieve</param>
-        /// <returns>Field with the given name</returns>
-        IPlcField GetFieldByName(string name);
-
-        /// <summary>
-        /// Get the response code from the PLC
-        /// </summary>
-        PlcResponseCode ResponseCode { get; }
-    }
+/*
+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
+
+  http://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.
+*/
+
+using System.Collections.Generic;
+using org.apache.plc4net.model;
+using org.apache.plc4net.types;
+
+namespace org.apache.plc4net.messages
+{
+    /// <summary>
+    /// Interface for responses to requests realted to
+    /// a specific PLC field
+    /// </summary>
+    public interface IPlcFieldResponse: IPlcResponse
+    {
+        /// <summary>
+        /// Enumeration of fields in the response
+        /// </summary>
+        IEnumerable<string> FieldNames { get; }
+
+        /// <summary>
+        /// Get a field by name
+        /// </summary>
+        /// <param name="name">Name of the field to retrieve</param>
+        /// <returns>Field with the given name</returns>
+        IPlcField GetFieldByName(string name);
+
+        /// <summary>
+        /// Get the response code from the PLC
+        /// </summary>
+        PlcResponseCode ResponseCode { get; }
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/messages/IPlcMessage.cs b/sandbox/plc4net/api/messages/IPlcMessage.cs
index e7af221bc12..1cc496829da 100644
--- a/sandbox/plc4net/api/messages/IPlcMessage.cs
+++ b/sandbox/plc4net/api/messages/IPlcMessage.cs
@@ -1,29 +1,29 @@
-/*
-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
-
-  http://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.
-*/
-
-namespace org.apache.plc4net.messages
-{
-    /// <summary>
-    /// Base interface for PLC messages
-    /// </summary>
-    public interface IPlcMessage
-    {
-        
-    }
+/*
+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
+
+  http://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.
+*/
+
+namespace org.apache.plc4net.messages
+{
+    /// <summary>
+    /// Base interface for PLC messages
+    /// </summary>
+    public interface IPlcMessage
+    {
+        
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/messages/IPlcReadRequest.cs b/sandbox/plc4net/api/messages/IPlcReadRequest.cs
index 17182ca273b..64b319a7ab8 100644
--- a/sandbox/plc4net/api/messages/IPlcReadRequest.cs
+++ b/sandbox/plc4net/api/messages/IPlcReadRequest.cs
@@ -1,29 +1,29 @@
-/*
-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
-
-  http://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.
-*/
-
-namespace org.apache.plc4net.messages
-{
-    /// <summary>
-    /// Interface for requests reading data from a PLC
-    /// </summary>
-    public interface IPlcReadRequest: IPlcRequest
-    {
-        
-    }
+/*
+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
+
+  http://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.
+*/
+
+namespace org.apache.plc4net.messages
+{
+    /// <summary>
+    /// Interface for requests reading data from a PLC
+    /// </summary>
+    public interface IPlcReadRequest: IPlcRequest
+    {
+        
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/messages/IPlcReadRequestBuilder.cs b/sandbox/plc4net/api/messages/IPlcReadRequestBuilder.cs
index 79ff7838f48..2f6800358f9 100644
--- a/sandbox/plc4net/api/messages/IPlcReadRequestBuilder.cs
+++ b/sandbox/plc4net/api/messages/IPlcReadRequestBuilder.cs
@@ -1,35 +1,35 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://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.
-*/
-
-namespace org.apache.plc4net.messages
-{
-    /// <summary>
-    /// Builds requests for reading values from a PLC
-    /// </summary>
-    public interface IPlcReadRequestBuilder: IPlcRequestBuilder<IPlcReadRequest>
-    {
-        /// <summary>
-        /// Add an item to the request
-        /// </summary>
-        /// <param name="name">Name of the field to add</param>
-        /// <param name="fieldQuery">Query string for the field parameter</param>
-        /// <returns>Request builder to allow fluent API calls</returns>
-        IPlcReadRequestBuilder AddItem(string name, string fieldQuery);
-    }
+/*
+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
+
+  http://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.
+*/
+
+namespace org.apache.plc4net.messages
+{
+    /// <summary>
+    /// Builds requests for reading values from a PLC
+    /// </summary>
+    public interface IPlcReadRequestBuilder: IPlcRequestBuilder<IPlcReadRequest>
+    {
+        /// <summary>
+        /// Add an item to the request
+        /// </summary>
+        /// <param name="name">Name of the field to add</param>
+        /// <param name="fieldQuery">Query string for the field parameter</param>
+        /// <returns>Request builder to allow fluent API calls</returns>
+        IPlcReadRequestBuilder AddItem(string name, string fieldQuery);
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/messages/IPlcReadResponse.cs b/sandbox/plc4net/api/messages/IPlcReadResponse.cs
index 66fc79be518..9066edd0830 100644
--- a/sandbox/plc4net/api/messages/IPlcReadResponse.cs
+++ b/sandbox/plc4net/api/messages/IPlcReadResponse.cs
@@ -1,29 +1,29 @@
-/*
-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
-
-  http://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.
-*/
-
-namespace org.apache.plc4net.messages
-{
-    /// <summary>
-    /// Response for read requests <see cref="IPlcReadRequest"/>
-    /// </summary>
-    public interface IPlcReadResponse : IPlcResponse
-    {
-
-    }
+/*
+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
+
+  http://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.
+*/
+
+namespace org.apache.plc4net.messages
+{
+    /// <summary>
+    /// Response for read requests <see cref="IPlcReadRequest"/>
+    /// </summary>
+    public interface IPlcReadResponse : IPlcResponse
+    {
+
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/messages/IPlcRequest.cs b/sandbox/plc4net/api/messages/IPlcRequest.cs
index 174d506b400..77cfe7c3a05 100644
--- a/sandbox/plc4net/api/messages/IPlcRequest.cs
+++ b/sandbox/plc4net/api/messages/IPlcRequest.cs
@@ -1,36 +1,36 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://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.
-*/
-
-using System.Threading.Tasks;
-
-namespace org.apache.plc4net.messages
-{
-    /// <summary>
-    /// Base interface for PLC requests that can be executed
-    /// and receive responses
-    /// </summary>
-    public interface IPlcRequest : IPlcMessage
-    {
-        /// <summary>
-        /// Execute the request asynchronously
-        /// </summary>
-        /// <returns>Awaitable task returning the response from the PLC</returns>
-        Task<IPlcResponse> ExecuteAsync();
-    }
+/*
+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
+
+  http://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.
+*/
+
+using System.Threading.Tasks;
+
+namespace org.apache.plc4net.messages
+{
+    /// <summary>
+    /// Base interface for PLC requests that can be executed
+    /// and receive responses
+    /// </summary>
+    public interface IPlcRequest : IPlcMessage
+    {
+        /// <summary>
+        /// Execute the request asynchronously
+        /// </summary>
+        /// <returns>Awaitable task returning the response from the PLC</returns>
+        Task<IPlcResponse> ExecuteAsync();
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/messages/IPlcRequestBuilder.cs b/sandbox/plc4net/api/messages/IPlcRequestBuilder.cs
index 44e25d9a0f0..4c2de2a5b5c 100644
--- a/sandbox/plc4net/api/messages/IPlcRequestBuilder.cs
+++ b/sandbox/plc4net/api/messages/IPlcRequestBuilder.cs
@@ -1,34 +1,34 @@
-/*
-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
-
-  http://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.
-*/
-
-namespace org.apache.plc4net.messages
-{
-    /// <summary>
-    /// Base interface for request builders
-    /// </summary>
-    /// <typeparam name="TRequest">Type of request returned when building the request</typeparam>
-    public interface IPlcRequestBuilder<out TRequest> where TRequest : IPlcRequest
-    {
-        /// <summary>
-        /// Builds the defined request
-        /// </summary>
-        /// <returns>Request built from the definition</returns>
-        TRequest Build();
-    }
+/*
+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
+
+  http://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.
+*/
+
+namespace org.apache.plc4net.messages
+{
+    /// <summary>
+    /// Base interface for request builders
+    /// </summary>
+    /// <typeparam name="TRequest">Type of request returned when building the request</typeparam>
+    public interface IPlcRequestBuilder<out TRequest> where TRequest : IPlcRequest
+    {
+        /// <summary>
+        /// Builds the defined request
+        /// </summary>
+        /// <returns>Request built from the definition</returns>
+        TRequest Build();
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/messages/IPlcResponse.cs b/sandbox/plc4net/api/messages/IPlcResponse.cs
index 616a380fb49..6e60651c568 100644
--- a/sandbox/plc4net/api/messages/IPlcResponse.cs
+++ b/sandbox/plc4net/api/messages/IPlcResponse.cs
@@ -1,33 +1,33 @@
-/*
-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
-
-  http://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.
-*/
-
-namespace org.apache.plc4net.messages
-{
-    /// <summary>
-    /// Interface for responses received from
-    /// PLCs
-    /// </summary>
-    public interface IPlcResponse: IPlcMessage 
-    {
-        /// <summary>
-        /// Get the request that generated the response
-        /// </summary>
-        IPlcRequest Request { get; }
-    }
+/*
+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
+
+  http://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.
+*/
+
+namespace org.apache.plc4net.messages
+{
+    /// <summary>
+    /// Interface for responses received from
+    /// PLCs
+    /// </summary>
+    public interface IPlcResponse: IPlcMessage 
+    {
+        /// <summary>
+        /// Get the request that generated the response
+        /// </summary>
+        IPlcRequest Request { get; }
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/messages/IPlcSubscriptionEventArgs.cs b/sandbox/plc4net/api/messages/IPlcSubscriptionEventArgs.cs
index 0b7c447180f..da5a417d919 100644
--- a/sandbox/plc4net/api/messages/IPlcSubscriptionEventArgs.cs
+++ b/sandbox/plc4net/api/messages/IPlcSubscriptionEventArgs.cs
@@ -1,35 +1,35 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://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.
-*/
-
-using System;
-
-namespace org.apache.plc4net.messages
-{
-    /// <summary>
-    /// Base interface for event data associated with
-    /// subscription events
-    /// </summary>
-    public interface IPlcSubscriptionEventArgs
-    {
-        /// <summary>
-        /// Timestamp of the event that occured
-        /// </summary>
-        DateTime Timestamp { get; }
-    }
+/*
+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
+
+  http://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.
+*/
+
+using System;
+
+namespace org.apache.plc4net.messages
+{
+    /// <summary>
+    /// Base interface for event data associated with
+    /// subscription events
+    /// </summary>
+    public interface IPlcSubscriptionEventArgs
+    {
+        /// <summary>
+        /// Timestamp of the event that occured
+        /// </summary>
+        DateTime Timestamp { get; }
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/messages/IPlcSubscriptionRequest.cs b/sandbox/plc4net/api/messages/IPlcSubscriptionRequest.cs
index 7fcaf3b230b..6a0a92bbe58 100644
--- a/sandbox/plc4net/api/messages/IPlcSubscriptionRequest.cs
+++ b/sandbox/plc4net/api/messages/IPlcSubscriptionRequest.cs
@@ -1,29 +1,29 @@
-/*
-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
-
-  http://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.
-*/
-
-namespace org.apache.plc4net.messages
-{
-    /// <summary>
-    /// Interface for requests to subscribe to value changes
-    /// </summary>
-    public interface IPlcSubscriptionRequest: IPlcFieldRequest
-    {
-
-    }
+/*
+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
+
+  http://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.
+*/
+
+namespace org.apache.plc4net.messages
+{
+    /// <summary>
+    /// Interface for requests to subscribe to value changes
+    /// </summary>
+    public interface IPlcSubscriptionRequest: IPlcFieldRequest
+    {
+
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/messages/IPlcSubscriptionRequestBuilder.cs b/sandbox/plc4net/api/messages/IPlcSubscriptionRequestBuilder.cs
index 773f8edf834..ae8483a9d4a 100644
--- a/sandbox/plc4net/api/messages/IPlcSubscriptionRequestBuilder.cs
+++ b/sandbox/plc4net/api/messages/IPlcSubscriptionRequestBuilder.cs
@@ -1,54 +1,54 @@
-/*
-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
-
-  http://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.
-*/
-
-using System;
-
-namespace org.apache.plc4net.messages
-{
-    /// <summary>
-    /// Interface for classes building requests for subscriptions
-    /// </summary>
-    public interface IPlcSubscriptionRequestBuilder: IPlcRequestBuilder<IPlcSubscriptionRequest>
-    {
-        /// <summary>
-        /// Add a field that gets polled cyclically
-        /// </summary>
-        /// <param name="name">Alias for the field</param>
-        /// <param name="fieldQuery">Query string for the field</param>
-        /// <param name="pollingInterval">Time Interval at which the field should be polled</param>
-        /// <returns>Builder instance for Fluid API requests</returns>
-        IPlcSubscriptionRequestBuilder AddCyclicField(string name, string fieldQuery, TimeSpan pollingInterval);
-
-        /// <summary>
-        /// Add a field that sends an update when its value is changed
-        /// </summary>
-        /// <param name="name">Alias for the field</param>
-        /// <param name="fieldQuery">Query string for the field</param>        
-        /// <returns>Builder instance for Fluid API requests</returns>
-        IPlcSubscriptionRequestBuilder AddChangeOfStateField(string name, string fieldQuery);
-
-        /// <summary>
-        /// Add a field that sends an update when an event occurs
-        /// </summary>
-        /// <param name="name">Alias for the field</param>
-        /// <param name="fieldQuery">Query string for the field</param>        
-        /// <returns>Builder instance for Fluid API requests</returns>
-        IPlcSubscriptionRequestBuilder AddEventField(string name, string fieldQuery);
-    }
+/*
+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
+
+  http://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.
+*/
+
+using System;
+
+namespace org.apache.plc4net.messages
+{
+    /// <summary>
+    /// Interface for classes building requests for subscriptions
+    /// </summary>
+    public interface IPlcSubscriptionRequestBuilder: IPlcRequestBuilder<IPlcSubscriptionRequest>
+    {
+        /// <summary>
+        /// Add a field that gets polled cyclically
+        /// </summary>
+        /// <param name="name">Alias for the field</param>
+        /// <param name="fieldQuery">Query string for the field</param>
+        /// <param name="pollingInterval">Time Interval at which the field should be polled</param>
+        /// <returns>Builder instance for Fluid API requests</returns>
+        IPlcSubscriptionRequestBuilder AddCyclicField(string name, string fieldQuery, TimeSpan pollingInterval);
+
+        /// <summary>
+        /// Add a field that sends an update when its value is changed
+        /// </summary>
+        /// <param name="name">Alias for the field</param>
+        /// <param name="fieldQuery">Query string for the field</param>        
+        /// <returns>Builder instance for Fluid API requests</returns>
+        IPlcSubscriptionRequestBuilder AddChangeOfStateField(string name, string fieldQuery);
+
+        /// <summary>
+        /// Add a field that sends an update when an event occurs
+        /// </summary>
+        /// <param name="name">Alias for the field</param>
+        /// <param name="fieldQuery">Query string for the field</param>        
+        /// <returns>Builder instance for Fluid API requests</returns>
+        IPlcSubscriptionRequestBuilder AddEventField(string name, string fieldQuery);
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/messages/IPlcSubscriptionResponse.cs b/sandbox/plc4net/api/messages/IPlcSubscriptionResponse.cs
index 25e0fcd7df3..53e24de0d0a 100644
--- a/sandbox/plc4net/api/messages/IPlcSubscriptionResponse.cs
+++ b/sandbox/plc4net/api/messages/IPlcSubscriptionResponse.cs
@@ -1,42 +1,42 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://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.
-*/
-
-using System.Collections.Generic;
-using org.apache.plc4net.model;
-
-namespace org.apache.plc4net.messages
-{
-    /// <summary>
-    /// Response to a <see cref="IPlcSubscriptionRequest"/>
-    /// </summary>
-    public interface IPlcSubscriptionResponse: IPlcFieldResponse
-    {
-        /// <summary>
-        /// Get the handle for the subscription with the given name
-        /// </summary>
-        /// <param name="name">Name of the subscription</param>
-        /// <returns>Subscription handle</returns>
-        IPlcSubscriptionHandle GetSubscriptionHandle(string name);
-
-        /// <summary>
-        /// Get all subscription handles
-        /// </summary>
-        IEnumerable<IPlcSubscriptionHandle> SubscriptionHandles { get; }
-    }
+/*
+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
+
+  http://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.
+*/
+
+using System.Collections.Generic;
+using org.apache.plc4net.model;
+
+namespace org.apache.plc4net.messages
+{
+    /// <summary>
+    /// Response to a <see cref="IPlcSubscriptionRequest"/>
+    /// </summary>
+    public interface IPlcSubscriptionResponse: IPlcFieldResponse
+    {
+        /// <summary>
+        /// Get the handle for the subscription with the given name
+        /// </summary>
+        /// <param name="name">Name of the subscription</param>
+        /// <returns>Subscription handle</returns>
+        IPlcSubscriptionHandle GetSubscriptionHandle(string name);
+
+        /// <summary>
+        /// Get all subscription handles
+        /// </summary>
+        IEnumerable<IPlcSubscriptionHandle> SubscriptionHandles { get; }
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/messages/IPlcUnsubscriptionRequest.cs b/sandbox/plc4net/api/messages/IPlcUnsubscriptionRequest.cs
index 0d0bd1fea40..c8af5d2540d 100644
--- a/sandbox/plc4net/api/messages/IPlcUnsubscriptionRequest.cs
+++ b/sandbox/plc4net/api/messages/IPlcUnsubscriptionRequest.cs
@@ -1,29 +1,29 @@
-/*
-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
-
-  http://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.
-*/
-
-namespace org.apache.plc4net.messages
-{
-    /// <summary>
-    /// Request for releasing a subscription
-    /// </summary>
-    public interface IPlcUnsubscriptionRequest: IPlcRequest
-    {
-        
-    }
+/*
+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
+
+  http://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.
+*/
+
+namespace org.apache.plc4net.messages
+{
+    /// <summary>
+    /// Request for releasing a subscription
+    /// </summary>
+    public interface IPlcUnsubscriptionRequest: IPlcRequest
+    {
+        
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/messages/IPlcUnsubscriptionRequestBuilder.cs b/sandbox/plc4net/api/messages/IPlcUnsubscriptionRequestBuilder.cs
index a5752f85d50..9137c2b4efc 100644
--- a/sandbox/plc4net/api/messages/IPlcUnsubscriptionRequestBuilder.cs
+++ b/sandbox/plc4net/api/messages/IPlcUnsubscriptionRequestBuilder.cs
@@ -1,45 +1,45 @@
-/*
-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
-
-  http://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.
-*/
-
-using System.Collections.Generic;
-using org.apache.plc4net.model;
-
-namespace org.apache.plc4net.messages
-{
-    /// <summary>
-    /// Constructs requests for unsubscribing from PLC fields
-    /// </summary>
-    public interface IPlcUnsubscriptionRequestBuilder: 
-        IPlcRequestBuilder<IPlcUnsubscriptionRequest>
-    {
-        /// <summary>
-        /// Add the given handles to the unsubscription request
-        /// </summary>      
-        /// <param name="subscriptionHandles">Handles to unsubscribe</param>
-        /// <returns>Builder for chaining requests as Fluid API</returns>
-        IPlcUnsubscriptionRequestBuilder AddHandles(params IPlcSubscriptionHandle[] subscriptionHandles);
-
-        /// <summary>
-        /// Add the given handles to the unsubscription request
-        /// </summary>      
-        /// <param name="subscriptionHandles">Handles to unsubscribe</param>
-        /// <returns>Builder for chaining requests as Fluid API</returns>
-        IPlcUnsubscriptionRequestBuilder AddHandles(IEnumerable<IPlcSubscriptionHandle> subscriptionHandles);
-    }
+/*
+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
+
+  http://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.
+*/
+
+using System.Collections.Generic;
+using org.apache.plc4net.model;
+
+namespace org.apache.plc4net.messages
+{
+    /// <summary>
+    /// Constructs requests for unsubscribing from PLC fields
+    /// </summary>
+    public interface IPlcUnsubscriptionRequestBuilder: 
+        IPlcRequestBuilder<IPlcUnsubscriptionRequest>
+    {
+        /// <summary>
+        /// Add the given handles to the unsubscription request
+        /// </summary>      
+        /// <param name="subscriptionHandles">Handles to unsubscribe</param>
+        /// <returns>Builder for chaining requests as Fluid API</returns>
+        IPlcUnsubscriptionRequestBuilder AddHandles(params IPlcSubscriptionHandle[] subscriptionHandles);
+
+        /// <summary>
+        /// Add the given handles to the unsubscription request
+        /// </summary>      
+        /// <param name="subscriptionHandles">Handles to unsubscribe</param>
+        /// <returns>Builder for chaining requests as Fluid API</returns>
+        IPlcUnsubscriptionRequestBuilder AddHandles(IEnumerable<IPlcSubscriptionHandle> subscriptionHandles);
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/messages/IPlcUnsubscriptionResponse.cs b/sandbox/plc4net/api/messages/IPlcUnsubscriptionResponse.cs
index 0b5e8f9b9e7..71c2a8da529 100644
--- a/sandbox/plc4net/api/messages/IPlcUnsubscriptionResponse.cs
+++ b/sandbox/plc4net/api/messages/IPlcUnsubscriptionResponse.cs
@@ -1,29 +1,29 @@
-/*
-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
-
-  http://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.
-*/
-
-namespace org.apache.plc4net.messages
-{
-    /// <summary>
-    /// Interface for requests to release a subscription
-    /// </summary>
-    public interface IPlcUnsubscriptionResponse: IPlcResponse
-    {
-        
-    }
+/*
+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
+
+  http://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.
+*/
+
+namespace org.apache.plc4net.messages
+{
+    /// <summary>
+    /// Interface for requests to release a subscription
+    /// </summary>
+    public interface IPlcUnsubscriptionResponse: IPlcResponse
+    {
+        
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/messages/IPlcWriteRequest.cs b/sandbox/plc4net/api/messages/IPlcWriteRequest.cs
index 13e617ac159..070928ebb04 100644
--- a/sandbox/plc4net/api/messages/IPlcWriteRequest.cs
+++ b/sandbox/plc4net/api/messages/IPlcWriteRequest.cs
@@ -1,32 +1,32 @@
-/*
-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
-
-  http://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.
-*/
-
-namespace org.apache.plc4net.messages
-{
-    /// <summary>
-    /// Interface for writing values to PLCs
-    /// </summary>
-    public interface IPlcWriteRequest: IPlcRequest
-    {
-        /// <summary>
-        /// Number of values in the request
-        /// </summary>
-        int NumberOfValues { get; }
-    }
+/*
+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
+
+  http://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.
+*/
+
+namespace org.apache.plc4net.messages
+{
+    /// <summary>
+    /// Interface for writing values to PLCs
+    /// </summary>
+    public interface IPlcWriteRequest: IPlcRequest
+    {
+        /// <summary>
+        /// Number of values in the request
+        /// </summary>
+        int NumberOfValues { get; }
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/messages/IPlcWriteRequestBuilder.cs b/sandbox/plc4net/api/messages/IPlcWriteRequestBuilder.cs
index 4e2455454d0..40b260145b5 100644
--- a/sandbox/plc4net/api/messages/IPlcWriteRequestBuilder.cs
+++ b/sandbox/plc4net/api/messages/IPlcWriteRequestBuilder.cs
@@ -1,134 +1,134 @@
-/*
-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
-
-  http://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.
-*/
-
-/*
- * TODO: Decide if distinguishment between date, time and datetime are needed (see plc4j)
- * TODO: Decide if implementation of byte[] and Byte[] as in plc4j are needed
- * TODO: Check type compatibility between Java BigDecimal and Decimal
- */
-
-using System;
-
-namespace org.apache.plc4net.messages
-{
-    /// <summary>
-    /// Interface for a builder that constructs write requests
-    /// </summary>
-    public interface IPlcWriteRequestBuilder: IPlcRequestBuilder<IPlcWriteRequest>
-    {
-        /// <summary>
-        /// Add item with bool value
-        /// </summary>
-        /// <param name="name">Identifying name of the field</param>
-        /// <param name="fieldQuery">Query string for the field</param>
-        /// <param name="values">Values to set</param>
-        /// <returns>Own instance to allow Fluid API calls</returns>
-        IPlcWriteRequestBuilder AddItem(string name, string fieldQuery, params bool[] values);
-        
-        /// <summary>
-        /// Add item with byte value
-        /// </summary>
-        /// <param name="name">Identifying name of the field</param>
-        /// <param name="fieldQuery">Query string for the field</param>
-        /// <param name="values">Values to set</param>
-        /// <returns>Own instance to allow Fluid API calls</returns>
-        IPlcWriteRequestBuilder AddItem(string name, string fieldQuery, params byte[] values);
-
-        /// <summary>
-        /// Add item with short value
-        /// </summary>
-        /// <param name="name">Identifying name of the field</param>
-        /// <param name="fieldQuery">Query string for the field</param>
-        /// <param name="values">Values to set</param>
-        /// <returns>Own instance to allow Fluid API calls</returns>
-        IPlcWriteRequestBuilder AddItem(string name, string fieldQuery, params short[] values);
-        
-        /// <summary>
-        /// Add item with int value
-        /// </summary>
-        /// <param name="name">Identifying name of the field</param>
-        /// <param name="fieldQuery">Query string for the field</param>
-        /// <param name="values">Values to set</param>
-        /// <returns>Own instance to allow Fluid API calls</returns>
-        IPlcWriteRequestBuilder AddItem(string name, string fieldQuery, params int[] values);
-
-        /// <summary>
-        /// Add item with long value
-        /// </summary>
-        /// <param name="name">Identifying name of the field</param>
-        /// <param name="fieldQuery">Query string for the field</param>
-        /// <param name="values">Values to set</param>
-        /// <returns>Own instance to allow Fluid API calls</returns>
-        IPlcWriteRequestBuilder AddItem(string name, string fieldQuery, params long[] values);
-
-        /// <summary>
-        /// Add item with float value
-        /// </summary>
-        /// <param name="name">Identifying name of the field</param>
-        /// <param name="fieldQuery">Query string for the field</param>
-        /// <param name="values">Values to set</param>
-        /// <returns>Own instance to allow Fluid API calls</returns>
-        IPlcWriteRequestBuilder AddItem(string name, string fieldQuery, params float[] values);
-
-        /// <summary>
-        /// Add item with double value
-        /// </summary>
-        /// <param name="name">Identifying name of the field</param>
-        /// <param name="fieldQuery">Query string for the field</param>
-        /// <param name="values">Values to set</param>
-        /// <returns>Own instance to allow Fluid API calls</returns>
-        IPlcWriteRequestBuilder AddItem(string name, string fieldQuery, params double[] values);
-
-        /// <summary>
-        /// Add item with Decimal value
-        /// </summary>
-        /// <param name="name">Identifying name of the field</param>
-        /// <param name="fieldQuery">Query string for the field</param>
-        /// <param name="values">Values to set</param>
-        /// <returns>Own instance to allow Fluid API calls</returns>
-        IPlcWriteRequestBuilder AddItem(string name, string fieldQuery, params Decimal[] values);
-
-        /// <summary>
-        /// Add item with string value
-        /// </summary>
-        /// <param name="name">Identifying name of the field</param>
-        /// <param name="fieldQuery">Query string for the field</param>
-        /// <param name="values">Values to set</param>
-        /// <returns>Own instance to allow Fluid API calls</returns>
-        IPlcWriteRequestBuilder AddItem(string name, string fieldQuery, params string[] values);
-
-        /// <summary>
-        /// Add item with DateTime value
-        /// </summary>
-        /// <param name="name">Identifying name of the field</param>
-        /// <param name="fieldQuery">Query string for the field</param>
-        /// <param name="values">Values to set</param>
-        /// <returns>Own instance to allow Fluid API calls</returns>
-        IPlcWriteRequestBuilder AddItem(string name, string fieldQuery, params DateTime[] values);
-
-        /// <summary>
-        /// Add item with value of generic type
-        /// </summary>
-        /// <param name="name">Identifying name of the field</param>
-        /// <param name="fieldQuery">Query string for the field</param>
-        /// <param name="values">Values to set</param>        
-        /// <returns>Own instance to allow Fluid API calls</returns>
-        IPlcWriteRequestBuilder AddItem<T>(string name, string fieldQuery, params T[] values);
-    }
+/*
+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
+
+  http://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.
+*/
+
+/*
+ * TODO: Decide if distinguishment between date, time and datetime are needed (see plc4j)
+ * TODO: Decide if implementation of byte[] and Byte[] as in plc4j are needed
+ * TODO: Check type compatibility between Java BigDecimal and Decimal
+ */
+
+using System;
+
+namespace org.apache.plc4net.messages
+{
+    /// <summary>
+    /// Interface for a builder that constructs write requests
+    /// </summary>
+    public interface IPlcWriteRequestBuilder: IPlcRequestBuilder<IPlcWriteRequest>
+    {
+        /// <summary>
+        /// Add item with bool value
+        /// </summary>
+        /// <param name="name">Identifying name of the field</param>
+        /// <param name="fieldQuery">Query string for the field</param>
+        /// <param name="values">Values to set</param>
+        /// <returns>Own instance to allow Fluid API calls</returns>
+        IPlcWriteRequestBuilder AddItem(string name, string fieldQuery, params bool[] values);
+        
+        /// <summary>
+        /// Add item with byte value
+        /// </summary>
+        /// <param name="name">Identifying name of the field</param>
+        /// <param name="fieldQuery">Query string for the field</param>
+        /// <param name="values">Values to set</param>
+        /// <returns>Own instance to allow Fluid API calls</returns>
+        IPlcWriteRequestBuilder AddItem(string name, string fieldQuery, params byte[] values);
+
+        /// <summary>
+        /// Add item with short value
+        /// </summary>
+        /// <param name="name">Identifying name of the field</param>
+        /// <param name="fieldQuery">Query string for the field</param>
+        /// <param name="values">Values to set</param>
+        /// <returns>Own instance to allow Fluid API calls</returns>
+        IPlcWriteRequestBuilder AddItem(string name, string fieldQuery, params short[] values);
+        
+        /// <summary>
+        /// Add item with int value
+        /// </summary>
+        /// <param name="name">Identifying name of the field</param>
+        /// <param name="fieldQuery">Query string for the field</param>
+        /// <param name="values">Values to set</param>
+        /// <returns>Own instance to allow Fluid API calls</returns>
+        IPlcWriteRequestBuilder AddItem(string name, string fieldQuery, params int[] values);
+
+        /// <summary>
+        /// Add item with long value
+        /// </summary>
+        /// <param name="name">Identifying name of the field</param>
+        /// <param name="fieldQuery">Query string for the field</param>
+        /// <param name="values">Values to set</param>
+        /// <returns>Own instance to allow Fluid API calls</returns>
+        IPlcWriteRequestBuilder AddItem(string name, string fieldQuery, params long[] values);
+
+        /// <summary>
+        /// Add item with float value
+        /// </summary>
+        /// <param name="name">Identifying name of the field</param>
+        /// <param name="fieldQuery">Query string for the field</param>
+        /// <param name="values">Values to set</param>
+        /// <returns>Own instance to allow Fluid API calls</returns>
+        IPlcWriteRequestBuilder AddItem(string name, string fieldQuery, params float[] values);
+
+        /// <summary>
+        /// Add item with double value
+        /// </summary>
+        /// <param name="name">Identifying name of the field</param>
+        /// <param name="fieldQuery">Query string for the field</param>
+        /// <param name="values">Values to set</param>
+        /// <returns>Own instance to allow Fluid API calls</returns>
+        IPlcWriteRequestBuilder AddItem(string name, string fieldQuery, params double[] values);
+
+        /// <summary>
+        /// Add item with Decimal value
+        /// </summary>
+        /// <param name="name">Identifying name of the field</param>
+        /// <param name="fieldQuery">Query string for the field</param>
+        /// <param name="values">Values to set</param>
+        /// <returns>Own instance to allow Fluid API calls</returns>
+        IPlcWriteRequestBuilder AddItem(string name, string fieldQuery, params Decimal[] values);
+
+        /// <summary>
+        /// Add item with string value
+        /// </summary>
+        /// <param name="name">Identifying name of the field</param>
+        /// <param name="fieldQuery">Query string for the field</param>
+        /// <param name="values">Values to set</param>
+        /// <returns>Own instance to allow Fluid API calls</returns>
+        IPlcWriteRequestBuilder AddItem(string name, string fieldQuery, params string[] values);
+
+        /// <summary>
+        /// Add item with DateTime value
+        /// </summary>
+        /// <param name="name">Identifying name of the field</param>
+        /// <param name="fieldQuery">Query string for the field</param>
+        /// <param name="values">Values to set</param>
+        /// <returns>Own instance to allow Fluid API calls</returns>
+        IPlcWriteRequestBuilder AddItem(string name, string fieldQuery, params DateTime[] values);
+
+        /// <summary>
+        /// Add item with value of generic type
+        /// </summary>
+        /// <param name="name">Identifying name of the field</param>
+        /// <param name="fieldQuery">Query string for the field</param>
+        /// <param name="values">Values to set</param>        
+        /// <returns>Own instance to allow Fluid API calls</returns>
+        IPlcWriteRequestBuilder AddItem<T>(string name, string fieldQuery, params T[] values);
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/model/IPlcField.cs b/sandbox/plc4net/api/model/IPlcField.cs
index 098baf39206..e449cf3dfd3 100644
--- a/sandbox/plc4net/api/model/IPlcField.cs
+++ b/sandbox/plc4net/api/model/IPlcField.cs
@@ -1,39 +1,39 @@
-/*
-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
-
-  http://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.
-*/
-
-
-namespace org.apache.plc4net.model
-{
-    /// <summary>
-    /// Base type for all field types.
-    /// Typically every driver provides an implementation of this interface in order
-    /// to be able to describe the fields of a resource.As this is completely tied to
-    /// the implemented protocol, this base interface makes absolutely no assumption to
-    /// any information it should provide.
-
-    /// In order to stay platform and protocol independent every driver connection implementation
-    /// provides a prepareField(String) method that is able to parse a string representation of
-    /// a resource into it's individual field type. Manually constructing PlcField objects
-    /// manually makes the solution less independent from the protocol, but might be faster.
-    /// </summary>
-    public interface IPlcField
-    {
-
-    }
+/*
+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
+
+  http://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.
+*/
+
+
+namespace org.apache.plc4net.model
+{
+    /// <summary>
+    /// Base type for all field types.
+    /// Typically every driver provides an implementation of this interface in order
+    /// to be able to describe the fields of a resource.As this is completely tied to
+    /// the implemented protocol, this base interface makes absolutely no assumption to
+    /// any information it should provide.
+
+    /// In order to stay platform and protocol independent every driver connection implementation
+    /// provides a prepareField(String) method that is able to parse a string representation of
+    /// a resource into it's individual field type. Manually constructing PlcField objects
+    /// manually makes the solution less independent from the protocol, but might be faster.
+    /// </summary>
+    public interface IPlcField
+    {
+
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/model/IPlcSubscriptionHandle.cs b/sandbox/plc4net/api/model/IPlcSubscriptionHandle.cs
index c2c1d54a965..901d9453805 100644
--- a/sandbox/plc4net/api/model/IPlcSubscriptionHandle.cs
+++ b/sandbox/plc4net/api/model/IPlcSubscriptionHandle.cs
@@ -1,35 +1,35 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://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.
-*/
-
-using System;
-using org.apache.plc4net.messages;
-
-namespace org.apache.plc4net.model
-{
-    /// <summary>
-    /// Handle to a subscription
-    /// </summary>
-    public interface IPlcSubscriptionHandle
-    {
-        /// <summary>
-        /// Event that can be subscribed to handle events raised by the subscription
-        /// </summary>
-        event EventHandler<IPlcSubscriptionEventArgs> PlcSubscriptionEvent;
-    }
+/*
+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
+
+  http://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.
+*/
+
+using System;
+using org.apache.plc4net.messages;
+
+namespace org.apache.plc4net.model
+{
+    /// <summary>
+    /// Handle to a subscription
+    /// </summary>
+    public interface IPlcSubscriptionHandle
+    {
+        /// <summary>
+        /// Event that can be subscribed to handle events raised by the subscription
+        /// </summary>
+        event EventHandler<IPlcSubscriptionEventArgs> PlcSubscriptionEvent;
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/api/pom.xml b/sandbox/plc4net/api/pom.xml
index cbc6d6a31f6..a4c77aaa2b6 100644
--- a/sandbox/plc4net/api/pom.xml
+++ b/sandbox/plc4net/api/pom.xml
@@ -1,72 +1,72 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.sandbox</groupId>
-    <artifactId>plc4net</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4net-api</artifactId>
-  <packaging>pom</packaging>
-
-  <name>PLC4Net: API</name>
-  <description>Implementation of the protocol adapters for usage as .Net module.</description>
-
-  <!-- Disabled for now as C# support is currently not installed in Apache SonarQube -->
-  <!--properties>
-    <sonar.language>c#</sonar.language>
-  </properties-->
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>1.6.0</version>
-        <executions>
-          <execution>
-            <id>dotnet-build</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>dotnet</executable>
-              <workingDirectory>${project.basedir}</workingDirectory>
-              <arguments>
-                <argument>build</argument>
-                <argument>api.csproj</argument>
-                <argument>--configuration=Debug</argument>
-                <argument>--framework=netstandard2.0</argument>
-                <argument>--output=${project.build.directory}/build</argument>
-                <argument>-p:Version=${project.version}</argument>
-              </arguments>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.sandbox</groupId>
+    <artifactId>plc4net</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4net-api</artifactId>
+  <packaging>pom</packaging>
+
+  <name>PLC4Net: API</name>
+  <description>Implementation of the protocol adapters for usage as .Net module.</description>
+
+  <!-- Disabled for now as C# support is currently not installed in Apache SonarQube -->
+  <!--properties>
+    <sonar.language>c#</sonar.language>
+  </properties-->
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.6.0</version>
+        <executions>
+          <execution>
+            <id>dotnet-build</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>dotnet</executable>
+              <workingDirectory>${project.basedir}</workingDirectory>
+              <arguments>
+                <argument>build</argument>
+                <argument>api.csproj</argument>
+                <argument>--configuration=Debug</argument>
+                <argument>--framework=netstandard2.0</argument>
+                <argument>--output=${project.build.directory}/build</argument>
+                <argument>-p:Version=${project.version}</argument>
+              </arguments>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
\ No newline at end of file
diff --git a/sandbox/plc4net/api/types/PlcResponseCode.cs b/sandbox/plc4net/api/types/PlcResponseCode.cs
index 7b9d0f86d7c..419cabdba53 100644
--- a/sandbox/plc4net/api/types/PlcResponseCode.cs
+++ b/sandbox/plc4net/api/types/PlcResponseCode.cs
@@ -1,35 +1,35 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://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.
-*/
-
-namespace org.apache.plc4net.types
-{
-    /// <summary>
-    /// Possible responses
-    /// </summary>
-    public enum PlcResponseCode
-    {
-        Ok,
-        NotFound,
-        AccessDenied,
-        InvalidAddress,
-        InvalidDatatype,
-        InternalError,
-        ResponsePending
-    }
+/*
+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
+
+  http://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.
+*/
+
+namespace org.apache.plc4net.types
+{
+    /// <summary>
+    /// Possible responses
+    /// </summary>
+    public enum PlcResponseCode
+    {
+        Ok,
+        NotFound,
+        AccessDenied,
+        InvalidAddress,
+        InvalidDatatype,
+        InternalError,
+        ResponsePending
+    }
 }
\ No newline at end of file
diff --git a/sandbox/plc4net/plc4net.driver/plc4net.driver.csproj b/sandbox/plc4net/plc4net.driver/plc4net.driver.csproj
index e54dfc430f0..a9bb069bc72 100644
--- a/sandbox/plc4net/plc4net.driver/plc4net.driver.csproj
+++ b/sandbox/plc4net/plc4net.driver/plc4net.driver.csproj
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
--->
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <BaseOutputPath>target/classes</BaseOutputPath>
-    <BaseIntermediateOutputPath>target/classes-intermediate</BaseIntermediateOutputPath>
-    <RestoreOutputPath>target/restore-output-path</RestoreOutputPath>
-  </PropertyGroup>
-
-</Project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+-->
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <BaseOutputPath>target/classes</BaseOutputPath>
+    <BaseIntermediateOutputPath>target/classes-intermediate</BaseIntermediateOutputPath>
+    <RestoreOutputPath>target/restore-output-path</RestoreOutputPath>
+  </PropertyGroup>
+
+</Project>
diff --git a/sandbox/plc4net/plc4net.driver/pom.xml b/sandbox/plc4net/plc4net.driver/pom.xml
index 7c9e1de1f8f..d88ebeb2316 100644
--- a/sandbox/plc4net/plc4net.driver/pom.xml
+++ b/sandbox/plc4net/plc4net.driver/pom.xml
@@ -1,68 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.sandbox</groupId>
-    <artifactId>plc4net</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4net-driver</artifactId>
-  <packaging>pom</packaging>
-
-  <name>PLC4Net: Driver</name>
-  <description>Implementation of the protocol adapters for usage as .Net module.</description>
-
-  <!-- Disabled for now as C# support is currently not installed in Apache SonarQube -->
-  <!--properties>
-    <sonar.language>c#</sonar.language>
-  </properties-->
-
-  <!--build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>1.6.0</version>
-        <executions>
-          <execution>
-            <id>dotnet-build</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>dotnet</executable>
-              <workingDirectory>${project.basedir}</workingDirectory>
-              <arguments>
-                <argument>build</argument>
-                <argument>plc4net.driver.csproj</argument>
-              </arguments>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build-->
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.sandbox</groupId>
+    <artifactId>plc4net</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4net-driver</artifactId>
+  <packaging>pom</packaging>
+
+  <name>PLC4Net: Driver</name>
+  <description>Implementation of the protocol adapters for usage as .Net module.</description>
+
+  <!-- Disabled for now as C# support is currently not installed in Apache SonarQube -->
+  <!--properties>
+    <sonar.language>c#</sonar.language>
+  </properties-->
+
+  <!--build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.6.0</version>
+        <executions>
+          <execution>
+            <id>dotnet-build</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>dotnet</executable>
+              <workingDirectory>${project.basedir}</workingDirectory>
+              <arguments>
+                <argument>build</argument>
+                <argument>plc4net.driver.csproj</argument>
+              </arguments>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build-->
+
 </project>
\ No newline at end of file
diff --git a/sandbox/plc4net/plc4net.sln b/sandbox/plc4net/plc4net.sln
index a872a2d6f4a..b54a99a6fa3 100644
--- a/sandbox/plc4net/plc4net.sln
+++ b/sandbox/plc4net/plc4net.sln
@@ -1,44 +1,44 @@
-ļ»æMicrosoft Visual Studio Solution File, Format Version 12.00
-
-#
-# 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
-#
-#     http://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.
-#
-
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28803.156
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "api", "plc4net\plc4net.csproj", "{343770DC-ECE5-4131-9066-A09C120BB3D9}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{343770DC-ECE5-4131-9066-A09C120BB3D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{343770DC-ECE5-4131-9066-A09C120BB3D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{343770DC-ECE5-4131-9066-A09C120BB3D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{343770DC-ECE5-4131-9066-A09C120BB3D9}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {DCB0DDB3-E6AA-4801-844E-5C71EB50CB1B}
-	EndGlobalSection
-EndGlobal
+ļ»æMicrosoft Visual Studio Solution File, Format Version 12.00
+
+#
+# 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
+#
+#     http://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.
+#
+
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28803.156
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "api", "plc4net\plc4net.csproj", "{343770DC-ECE5-4131-9066-A09C120BB3D9}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{343770DC-ECE5-4131-9066-A09C120BB3D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{343770DC-ECE5-4131-9066-A09C120BB3D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{343770DC-ECE5-4131-9066-A09C120BB3D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{343770DC-ECE5-4131-9066-A09C120BB3D9}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {DCB0DDB3-E6AA-4801-844E-5C71EB50CB1B}
+	EndGlobalSection
+EndGlobal
diff --git a/sandbox/plc4net/pom.xml b/sandbox/plc4net/pom.xml
index 6ed0b00ca9c..1312e4bc249 100644
--- a/sandbox/plc4net/pom.xml
+++ b/sandbox/plc4net/pom.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.sandbox</groupId>
-    <artifactId>plc4x-sandbox</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4net</artifactId>
-  <packaging>pom</packaging>
-
-  <name>Sandbox: PLC4Net</name>
-  <description>Implementation of the protocol adapters for usage as .Net module.</description>
-
-  <!-- Disabled for now as C# support is currently not installed in Apache SonarQube -->
-  <!--properties>
-    <sonar.language>c#</sonar.language>
-  </properties-->
-
-  <modules>
-    <module>api</module>
-    <module>plc4net.driver</module>
-  </modules>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.sandbox</groupId>
+    <artifactId>plc4x-sandbox</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4net</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Sandbox: PLC4Net</name>
+  <description>Implementation of the protocol adapters for usage as .Net module.</description>
+
+  <!-- Disabled for now as C# support is currently not installed in Apache SonarQube -->
+  <!--properties>
+    <sonar.language>c#</sonar.language>
+  </properties-->
+
+  <modules>
+    <module>api</module>
+    <module>plc4net.driver</module>
+  </modules>
+
 </project>
\ No newline at end of file
diff --git a/sandbox/plc4py/README.md b/sandbox/plc4py/README.md
index 41f55452f82..bb5fdb224b2 100644
--- a/sandbox/plc4py/README.md
+++ b/sandbox/plc4py/README.md
@@ -1,58 +1,58 @@
-<!--
-
-  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
-
-      http://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.
-
--->
-# Python binding for the interop server
-
-This module provides the (experimental) Python support for the interop server.
-Or, simpler, a python 3 binding for PLC4X.
-
-The only thing which needs to be done as _installation_ is to run the `initialize_interop_server.sh` script to build the interop server and copy it to `lib/`  forder.
-
-Then, you are good to go.
-
-Some tests can be found in `test/test_PlcDriverManager.py`.
-
-Here is some example code:
-
-```python
-try:
-    manager = PlcDriverManager()
-
-    connection = None
-    try:
-        connection = manager.get_connection("s7://192.168.167.210/0/1")
-        for _ in range(100):
-            result = connection.execute(Request(fields={"field1": "%M0:USINT"}))
-            print("Response Code is " + str(result.get_field("field1").get_response_code()))
-            # We now that we want to get an int...
-            print("Response Value is " + str(result.get_field("field1").get_int_value()))
-
-    except PlcException as e:
-        raise Exception(str(e.url))
-    finally:
-        if connection is not None:
-            connection.close()
-finally:
-    manager.close()
-```
-
-the `PlcDriverManager` spawns an interop server in the background, thus it is important to close it afterwards.
-Otherwise this process keeps alive and you have to kill by yourself.
-
-All generated files (from thrift) are in `org.apache.plc4x.interop`.
-I built a very simple Python API in `org.apache.plc4x`.
+<!--
+
+  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
+
+      http://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.
+
+-->
+# Python binding for the interop server
+
+This module provides the (experimental) Python support for the interop server.
+Or, simpler, a python 3 binding for PLC4X.
+
+The only thing which needs to be done as _installation_ is to run the `initialize_interop_server.sh` script to build the interop server and copy it to `lib/`  forder.
+
+Then, you are good to go.
+
+Some tests can be found in `test/test_PlcDriverManager.py`.
+
+Here is some example code:
+
+```python
+try:
+    manager = PlcDriverManager()
+
+    connection = None
+    try:
+        connection = manager.get_connection("s7://192.168.167.210/0/1")
+        for _ in range(100):
+            result = connection.execute(Request(fields={"field1": "%M0:USINT"}))
+            print("Response Code is " + str(result.get_field("field1").get_response_code()))
+            # We now that we want to get an int...
+            print("Response Value is " + str(result.get_field("field1").get_int_value()))
+
+    except PlcException as e:
+        raise Exception(str(e.url))
+    finally:
+        if connection is not None:
+            connection.close()
+finally:
+    manager.close()
+```
+
+the `PlcDriverManager` spawns an interop server in the background, thus it is important to close it afterwards.
+Otherwise this process keeps alive and you have to kill by yourself.
+
+All generated files (from thrift) are in `org.apache.plc4x.interop`.
+I built a very simple Python API in `org.apache.plc4x`.
diff --git a/sandbox/plc4py/pom.xml b/sandbox/plc4py/pom.xml
index 7f4b3a9ce71..ceeb70b9d5e 100644
--- a/sandbox/plc4py/pom.xml
+++ b/sandbox/plc4py/pom.xml
@@ -1,219 +1,219 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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
-  ~
-  ~   http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.sandbox</groupId>
-    <artifactId>plc4x-sandbox</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4py</artifactId>
-  <packaging>pom</packaging>
-
-  <name>Sandbox: PLC4PY</name>
-  <description>Implementation of the protocol adapters for usage as Python module.</description>
-
-  <!-- Disabled for now as Python support is currently not installed in Apache SonarQube -->
-  <!--properties>
-    <sonar.language>py</sonar.language>
-  </properties-->
-
-  <build>
-    <sourceDirectory>src/main/python</sourceDirectory>
-    <testSourceDirectory>src/test/python</testSourceDirectory>
-    <plugins>
-      <!-- Unpack the protocol spec -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-protocol-spec</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.apache.plc4x</groupId>
-                  <artifactId>plc4x-protocols-proxy</artifactId>
-                  <type>jar</type>
-                  <overWrite>true</overWrite>
-                  <outputDirectory>${project.build.directory}/protocol-spec</outputDirectory>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.apache.plc4x</groupId>
-                  <artifactId>plc4x-tools-thrift</artifactId>
-                  <type>zip</type>
-                  <classifier>compiler-${os.classifier}</classifier>
-                  <overWrite>true</overWrite>
-                  <outputDirectory>${project.build.directory}/thrift-compiler</outputDirectory>
-                  <destFileName>${thrift.compiler.executable}</destFileName>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-          <execution>
-            <id>copy-interop-server</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.apache.plc4x</groupId>
-                  <artifactId>interop-server</artifactId>
-                  <type>jar</type>
-                  <classifier>jar-with-dependencies</classifier>
-                  <overWrite>true</overWrite>
-                  <outputDirectory>${project.build.directory}/classes/lib</outputDirectory>
-                  <destFileName>interop-server.jar</destFileName>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-          <execution>
-            <id>check-dependencies</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>analyze-only</goal>
-            </goals>
-            <configuration>
-              <failOnWarning>true</failOnWarning>
-              <usedDependencies combine.children="append">
-                <usedDependency>org.apache.plc4x:plc4x-tools-thrift</usedDependency>
-                <usedDependency>javax.annotation:jsr250-api</usedDependency>
-              </usedDependencies>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.thrift.tools</groupId>
-        <artifactId>maven-thrift-plugin</artifactId>
-        <version>0.1.11</version>
-        <configuration>
-          <thriftExecutable>${project.build.directory}/thrift-compiler/${thrift.compiler.executable}</thriftExecutable>
-          <thriftSourceRoot>${project.build.directory}/protocol-spec</thriftSourceRoot>
-          <includes>
-            <include>**/interop.thrift</include>
-          </includes>
-          <generator>py</generator>
-        </configuration>
-        <executions>
-          <execution>
-            <id>thrift-sources</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-remote-resources-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>1.6.0</version>
-        <executions>
-          <execution>
-            <id>python-build</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>python</executable>
-              <workingDirectory>${project.build.directory}/python</workingDirectory>
-              <arguments>
-                <argument>${project.basedir}/setup.py</argument>
-                <argument>build</argument>
-                <argument>--build-base=${project.build.directory}/python</argument>
-              </arguments>
-            </configuration>
-          </execution>
-          <execution>
-            <id>python-package</id>
-            <phase>package</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>python</executable>
-              <workingDirectory>${project.build.directory}/python</workingDirectory>
-              <arguments>
-                <argument>${project.basedir}/setup.py</argument>
-                <argument>sdist</argument>
-                <argument>--dist-dir=${project.build.directory}/python</argument>
-              </arguments>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>interop-server</artifactId>
-      <classifier>jar-with-dependencies</classifier>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.plc4x</groupId>
-        <artifactId>plc4x-protocols-proxy</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.plc4x</groupId>
-        <artifactId>plc4x-tools-thrift</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
-        <type>zip</type>
-        <classifier>compiler-${os.classifier}</classifier>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.plc4x</groupId>
-        <artifactId>interop-server</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
-        <classifier>jar-with-dependencies</classifier>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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
+  ~
+  ~   http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.sandbox</groupId>
+    <artifactId>plc4x-sandbox</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4py</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Sandbox: PLC4PY</name>
+  <description>Implementation of the protocol adapters for usage as Python module.</description>
+
+  <!-- Disabled for now as Python support is currently not installed in Apache SonarQube -->
+  <!--properties>
+    <sonar.language>py</sonar.language>
+  </properties-->
+
+  <build>
+    <sourceDirectory>src/main/python</sourceDirectory>
+    <testSourceDirectory>src/test/python</testSourceDirectory>
+    <plugins>
+      <!-- Unpack the protocol spec -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>unpack-protocol-spec</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.apache.plc4x</groupId>
+                  <artifactId>plc4x-protocols-proxy</artifactId>
+                  <type>jar</type>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/protocol-spec</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.plc4x</groupId>
+                  <artifactId>plc4x-tools-thrift</artifactId>
+                  <type>zip</type>
+                  <classifier>compiler-${os.classifier}</classifier>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/thrift-compiler</outputDirectory>
+                  <destFileName>${thrift.compiler.executable}</destFileName>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-interop-server</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.apache.plc4x</groupId>
+                  <artifactId>interop-server</artifactId>
+                  <type>jar</type>
+                  <classifier>jar-with-dependencies</classifier>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/classes/lib</outputDirectory>
+                  <destFileName>interop-server.jar</destFileName>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>check-dependencies</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>analyze-only</goal>
+            </goals>
+            <configuration>
+              <failOnWarning>true</failOnWarning>
+              <usedDependencies combine.children="append">
+                <usedDependency>org.apache.plc4x:plc4x-tools-thrift</usedDependency>
+                <usedDependency>javax.annotation:jsr250-api</usedDependency>
+              </usedDependencies>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.thrift.tools</groupId>
+        <artifactId>maven-thrift-plugin</artifactId>
+        <version>0.1.11</version>
+        <configuration>
+          <thriftExecutable>${project.build.directory}/thrift-compiler/${thrift.compiler.executable}</thriftExecutable>
+          <thriftSourceRoot>${project.build.directory}/protocol-spec</thriftSourceRoot>
+          <includes>
+            <include>**/interop.thrift</include>
+          </includes>
+          <generator>py</generator>
+        </configuration>
+        <executions>
+          <execution>
+            <id>thrift-sources</id>
+            <phase>process-sources</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.6.0</version>
+        <executions>
+          <execution>
+            <id>python-build</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>python</executable>
+              <workingDirectory>${project.build.directory}/python</workingDirectory>
+              <arguments>
+                <argument>${project.basedir}/setup.py</argument>
+                <argument>build</argument>
+                <argument>--build-base=${project.build.directory}/python</argument>
+              </arguments>
+            </configuration>
+          </execution>
+          <execution>
+            <id>python-package</id>
+            <phase>package</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>python</executable>
+              <workingDirectory>${project.build.directory}/python</workingDirectory>
+              <arguments>
+                <argument>${project.basedir}/setup.py</argument>
+                <argument>sdist</argument>
+                <argument>--dist-dir=${project.build.directory}/python</argument>
+              </arguments>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>interop-server</artifactId>
+      <classifier>jar-with-dependencies</classifier>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.plc4x</groupId>
+        <artifactId>plc4x-protocols-proxy</artifactId>
+        <version>0.6.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.plc4x</groupId>
+        <artifactId>plc4x-tools-thrift</artifactId>
+        <version>0.6.0-SNAPSHOT</version>
+        <type>zip</type>
+        <classifier>compiler-${os.classifier}</classifier>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.plc4x</groupId>
+        <artifactId>interop-server</artifactId>
+        <version>0.6.0-SNAPSHOT</version>
+        <classifier>jar-with-dependencies</classifier>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
 </project>
\ No newline at end of file
diff --git a/sandbox/plc4py/setup.py b/sandbox/plc4py/setup.py
index 8e7f07a51e9..17496d32b15 100644
--- a/sandbox/plc4py/setup.py
+++ b/sandbox/plc4py/setup.py
@@ -1,67 +1,67 @@
-"""
-
-  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
-
-      http://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.
-
-"""
-
-import xml.etree.ElementTree as ET
-from io import open
-from os import path
-
-from setuptools import setup, find_packages
-
-# Remember the location of this file.
-here = path.abspath(path.dirname(__file__))
-
-# Read the entire README.md and save it's content in the "long_description" variable.
-with open(path.join(here, 'README.md'), encoding='utf-8') as f:
-    longDescription = f.read()
-
-# Register the maven namespace.
-ns = {'mvn': 'http://maven.apache.org/POM/4.0.0'}
-# Load the pom.xml and extract some of it's information from it.
-mavenPomRoot = ET.parse(path.join(here, 'pom.xml'))
-mvnArtifactId = mavenPomRoot.find("mvn:artifactId", ns).text
-mvnVersion = mavenPomRoot.find("mvn:parent/mvn:version", ns).text
-mvnDescription = mavenPomRoot.find("mvn:description", ns).text
-
-# Cut off the "-SNAPSHOT"
-if mvnVersion.endswith('-SNAPSHOT'):
-    mvnVersion = mvnVersion[:-9]
-
-print("ArtifactId", mvnArtifactId)
-print("Version", mvnVersion)
-
-setup(
-    name=mvnArtifactId,
-    version=mvnVersion,
-    description=mvnDescription,
-    long_description=longDescription,
-    long_description_content_type='text/markdown',
-    url='https://plc4x.apache.org',
-    author_email='dev@plc4x.apache.org',
-
-    packages=find_packages(exclude=['target', 'src/test']),
-
-    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4',
-
-    data_files=[('lib', ['src/main/resources/lib/log4j2.xml'])],
-
-    project_urls={
-        'Bug Reports': 'https://issues.apache.org/jira/projects/PLC4X',
-        'Source': 'https://gitbox.apache.org/repos/asf/plc4x.git',
-    },
+"""
+
+  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
+
+      http://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.
+
+"""
+
+import xml.etree.ElementTree as ET
+from io import open
+from os import path
+
+from setuptools import setup, find_packages
+
+# Remember the location of this file.
+here = path.abspath(path.dirname(__file__))
+
+# Read the entire README.md and save it's content in the "long_description" variable.
+with open(path.join(here, 'README.md'), encoding='utf-8') as f:
+    longDescription = f.read()
+
+# Register the maven namespace.
+ns = {'mvn': 'http://maven.apache.org/POM/4.0.0'}
+# Load the pom.xml and extract some of it's information from it.
+mavenPomRoot = ET.parse(path.join(here, 'pom.xml'))
+mvnArtifactId = mavenPomRoot.find("mvn:artifactId", ns).text
+mvnVersion = mavenPomRoot.find("mvn:parent/mvn:version", ns).text
+mvnDescription = mavenPomRoot.find("mvn:description", ns).text
+
+# Cut off the "-SNAPSHOT"
+if mvnVersion.endswith('-SNAPSHOT'):
+    mvnVersion = mvnVersion[:-9]
+
+print("ArtifactId", mvnArtifactId)
+print("Version", mvnVersion)
+
+setup(
+    name=mvnArtifactId,
+    version=mvnVersion,
+    description=mvnDescription,
+    long_description=longDescription,
+    long_description_content_type='text/markdown',
+    url='https://plc4x.apache.org',
+    author_email='dev@plc4x.apache.org',
+
+    packages=find_packages(exclude=['target', 'src/test']),
+
+    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4',
+
+    data_files=[('lib', ['src/main/resources/lib/log4j2.xml'])],
+
+    project_urls={
+        'Bug Reports': 'https://issues.apache.org/jira/projects/PLC4X',
+        'Source': 'https://gitbox.apache.org/repos/asf/plc4x.git',
+    },
 )
\ No newline at end of file
diff --git a/sandbox/plc4py/src/assembly/python.xml b/sandbox/plc4py/src/assembly/python.xml
index 706ca447966..ff01815cb45 100644
--- a/sandbox/plc4py/src/assembly/python.xml
+++ b/sandbox/plc4py/src/assembly/python.xml
@@ -1,47 +1,47 @@
-<!--
-  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
-
-      http://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.
-  -->
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-
-  <id>python</id>
-
-  <formats>
-    <format>zip</format>
-    <!-- Other formats Python seems to support (Should remove the not needed ones) -->
-    <format>tar</format>
-    <format>tar.gz</format>
-    <format>tar.bz2</format>
-    <format>tar.xz</format>
-    <!-- For testing (To see what's included in the archives without unpacking) -->
-    <format>dir</format>
-  </formats>
-
-  <includeBaseDirectory>false</includeBaseDirectory>
-
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.directory}/classes</directory>
-      <includes>
-        <include>**</include>
-      </includes>
-      <outputDirectory/>
-    </fileSet>
-  </fileSets>
+<!--
+  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
+
+      http://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.
+  -->
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+
+  <id>python</id>
+
+  <formats>
+    <format>zip</format>
+    <!-- Other formats Python seems to support (Should remove the not needed ones) -->
+    <format>tar</format>
+    <format>tar.gz</format>
+    <format>tar.bz2</format>
+    <format>tar.xz</format>
+    <!-- For testing (To see what's included in the archives without unpacking) -->
+    <format>dir</format>
+  </formats>
+
+  <includeBaseDirectory>false</includeBaseDirectory>
+
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.directory}/classes</directory>
+      <includes>
+        <include>**</include>
+      </includes>
+      <outputDirectory/>
+    </fileSet>
+  </fileSets>
 </assembly>
\ No newline at end of file
diff --git a/sandbox/plc4py/src/main/python/__init__.py b/sandbox/plc4py/src/main/python/__init__.py
index c3434ab60d0..5291ee51ea4 100644
--- a/sandbox/plc4py/src/main/python/__init__.py
+++ b/sandbox/plc4py/src/main/python/__init__.py
@@ -1,17 +1,17 @@
-#  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
-#
-#    http://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.
-
+#  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
+#
+#    http://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.
+
diff --git a/sandbox/plc4py/src/main/python/org/__init__.py b/sandbox/plc4py/src/main/python/org/__init__.py
index c3434ab60d0..5291ee51ea4 100644
--- a/sandbox/plc4py/src/main/python/org/__init__.py
+++ b/sandbox/plc4py/src/main/python/org/__init__.py
@@ -1,17 +1,17 @@
-#  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
-#
-#    http://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.
-
+#  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
+#
+#    http://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.
+
diff --git a/sandbox/plc4py/src/main/python/org/apache/__init__.py b/sandbox/plc4py/src/main/python/org/apache/__init__.py
index c3434ab60d0..5291ee51ea4 100644
--- a/sandbox/plc4py/src/main/python/org/apache/__init__.py
+++ b/sandbox/plc4py/src/main/python/org/apache/__init__.py
@@ -1,17 +1,17 @@
-#  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
-#
-#    http://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.
-
+#  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
+#
+#    http://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.
+
diff --git a/sandbox/plc4py/src/main/python/org/apache/plc4x/InteropClient.py b/sandbox/plc4py/src/main/python/org/apache/plc4x/InteropClient.py
index 8cfea802787..2f9304ce0bb 100644
--- a/sandbox/plc4py/src/main/python/org/apache/plc4x/InteropClient.py
+++ b/sandbox/plc4py/src/main/python/org/apache/plc4x/InteropClient.py
@@ -1,45 +1,45 @@
-#  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
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-
-from generated.org.apache.plc4x.interop.InteropServer import Client
-from generated.org.apache.plc4x.interop.ttypes import Request
-from thrift.protocol import TBinaryProtocol
-from thrift.transport import TSocket, TTransport
-from thrift.transport.TTransport import TTransportException
-
-transport = TSocket.TSocket('localhost', 9090)
-transport = TTransport.TBufferedTransport(transport)
-protocol = TBinaryProtocol.TBinaryProtocol(transport)
-
-client = Client(protocol)
-
-try:
-    transport.open()
-    connect = None
-    try:
-        connect = client.connect("mock:a")
-
-        res = client.execute(connect, Request(fields={"field1": "asdf"}))
-
-        print(res)
-    finally:
-        if connect is not None:
-            client.close(connect)
-except TTransportException:
-    print("Unable to connect to the Interop Server, is the Server really running???")
-finally:
-    transport.close()
+#  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
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+
+from generated.org.apache.plc4x.interop.InteropServer import Client
+from generated.org.apache.plc4x.interop.ttypes import Request
+from thrift.protocol import TBinaryProtocol
+from thrift.transport import TSocket, TTransport
+from thrift.transport.TTransport import TTransportException
+
+transport = TSocket.TSocket('localhost', 9090)
+transport = TTransport.TBufferedTransport(transport)
+protocol = TBinaryProtocol.TBinaryProtocol(transport)
+
+client = Client(protocol)
+
+try:
+    transport.open()
+    connect = None
+    try:
+        connect = client.connect("mock:a")
+
+        res = client.execute(connect, Request(fields={"field1": "asdf"}))
+
+        print(res)
+    finally:
+        if connect is not None:
+            client.close(connect)
+except TTransportException:
+    print("Unable to connect to the Interop Server, is the Server really running???")
+finally:
+    transport.close()
diff --git a/sandbox/plc4py/src/main/python/org/apache/plc4x/PlcConnection.py b/sandbox/plc4py/src/main/python/org/apache/plc4x/PlcConnection.py
index 7f27cc7725f..2f764d26979 100644
--- a/sandbox/plc4py/src/main/python/org/apache/plc4x/PlcConnection.py
+++ b/sandbox/plc4py/src/main/python/org/apache/plc4x/PlcConnection.py
@@ -1,75 +1,75 @@
-#  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
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-
-from generated.org.apache.plc4x.interop.ttypes import PlcException, FieldResponse
-
-
-class PlcConnection:
-
-    def __init__(self, client, url):
-        self.client = client
-        # Try to get a handle
-        try:
-            self.handle = self.client.connect(url)
-        except:
-            raise PlcException("Unable to connect to the given url " + url)
-
-    def execute(self, request):
-        response = self.client.execute(self.handle, request)
-        return PlcResponse(response)
-
-    def close(self):
-        self.client.close(self.handle)
-
-
-class PlcResponse:
-    fields: dict
-
-    def __init__(self, response):
-        self.fields = response.fields
-
-    def get_fields(self):
-        return list(self.fields.keys())
-
-    def get_field(self, field_name):
-        if field_name in self.fields:
-            return PlcResponseItem(self.fields.get(field_name))
-        else:
-            raise Exception("A field with name '" + field_name + "' is not contained in the response");
-
-
-class PlcResponseItem:
-
-    fieldResponse: FieldResponse
-
-    def __init__(self, fieldResponse):
-        self.fieldResponse = fieldResponse
-
-    def get_response_code(self):
-        return self.fieldResponse.responseCode
-
-    def get_int_value(self):
-        return self.fieldResponse.longValue
-
-    def get_bool_value(self):
-        return self.fieldResponse.boolValue
-
-    def get_double_value(self):
-        return self.fieldResponse.doubleValue
-
-    def get_string_value(self):
+#  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
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+
+from generated.org.apache.plc4x.interop.ttypes import PlcException, FieldResponse
+
+
+class PlcConnection:
+
+    def __init__(self, client, url):
+        self.client = client
+        # Try to get a handle
+        try:
+            self.handle = self.client.connect(url)
+        except:
+            raise PlcException("Unable to connect to the given url " + url)
+
+    def execute(self, request):
+        response = self.client.execute(self.handle, request)
+        return PlcResponse(response)
+
+    def close(self):
+        self.client.close(self.handle)
+
+
+class PlcResponse:
+    fields: dict
+
+    def __init__(self, response):
+        self.fields = response.fields
+
+    def get_fields(self):
+        return list(self.fields.keys())
+
+    def get_field(self, field_name):
+        if field_name in self.fields:
+            return PlcResponseItem(self.fields.get(field_name))
+        else:
+            raise Exception("A field with name '" + field_name + "' is not contained in the response");
+
+
+class PlcResponseItem:
+
+    fieldResponse: FieldResponse
+
+    def __init__(self, fieldResponse):
+        self.fieldResponse = fieldResponse
+
+    def get_response_code(self):
+        return self.fieldResponse.responseCode
+
+    def get_int_value(self):
+        return self.fieldResponse.longValue
+
+    def get_bool_value(self):
+        return self.fieldResponse.boolValue
+
+    def get_double_value(self):
+        return self.fieldResponse.doubleValue
+
+    def get_string_value(self):
         return self.fieldResponse.stringValue
\ No newline at end of file
diff --git a/sandbox/plc4py/src/main/python/org/apache/plc4x/PlcDriverManager.py b/sandbox/plc4py/src/main/python/org/apache/plc4x/PlcDriverManager.py
index aa684187fc7..110bef16f85 100644
--- a/sandbox/plc4py/src/main/python/org/apache/plc4x/PlcDriverManager.py
+++ b/sandbox/plc4py/src/main/python/org/apache/plc4x/PlcDriverManager.py
@@ -1,79 +1,79 @@
-#  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
-#
-#    http://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.
-
-import subprocess
-import time
-import warnings
-
-from generated.org.apache.plc4x.interop.InteropServer import Client, PlcException
-from thrift.protocol import TBinaryProtocol
-from thrift.transport import TSocket, TTransport
-from thrift.transport.TTransport import TTransportException
-
-from org.apache.plc4x.PlcConnection import PlcConnection
-
-
-class PlcDriverManager:
-
-    """
-    constructor, initialize the server
-    """
-    def __init__(self, embedded_server=True):
-        self.embedded_server = embedded_server
-        # Start the Server in the background
-        if embedded_server:
-            self.interop_proc = subprocess.Popen(
-                ["java", "-Dlog4j.configurationFile=../lib/log4j2.xml",
-                 "-jar", "../lib/interop-server.jar"])
-            try:
-                print("Started server under pid " + str(self.interop_proc.pid))
-            except:
-                print("Encountered an Exception while starting Interop Server")
-                raise PlcException("Unable to start the Interop Server!")
-
-            time.sleep(2)
-            poll = self.interop_proc.poll()
-            if poll is None:
-                print("Sucesfully started the Interop Server...")
-            else:
-                warnings.warn("Interop Server died after starting up...")
-                raise PlcException(
-                    "Unable to start the Interop Server. Is another Server still running under the same port?")
-
-        self.transport = TSocket.TSocket('localhost', 9090)
-        self.transport = TTransport.TBufferedTransport(self.transport)
-
-        self.protocol = TBinaryProtocol.TBinaryProtocol(self.transport)
-
-        try:
-            self.transport.open()
-        except TTransportException:
-            raise PlcException("Unable to connect to the Interop Server, is the Server really running???")
-
-    def _get_client(self):
-        return Client(self.protocol)
-
-    def get_connection(self, url):
-        return PlcConnection(self._get_client(), url)
-
-    def close(self):
-        print("Closing the Interop Server")
-        try:
-            self.transport.close()
-        finally:
-            if self.embedded_server:
-                self.interop_proc.terminate()
+#  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
+#
+#    http://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.
+
+import subprocess
+import time
+import warnings
+
+from generated.org.apache.plc4x.interop.InteropServer import Client, PlcException
+from thrift.protocol import TBinaryProtocol
+from thrift.transport import TSocket, TTransport
+from thrift.transport.TTransport import TTransportException
+
+from org.apache.plc4x.PlcConnection import PlcConnection
+
+
+class PlcDriverManager:
+
+    """
+    constructor, initialize the server
+    """
+    def __init__(self, embedded_server=True):
+        self.embedded_server = embedded_server
+        # Start the Server in the background
+        if embedded_server:
+            self.interop_proc = subprocess.Popen(
+                ["java", "-Dlog4j.configurationFile=../lib/log4j2.xml",
+                 "-jar", "../lib/interop-server.jar"])
+            try:
+                print("Started server under pid " + str(self.interop_proc.pid))
+            except:
+                print("Encountered an Exception while starting Interop Server")
+                raise PlcException("Unable to start the Interop Server!")
+
+            time.sleep(2)
+            poll = self.interop_proc.poll()
+            if poll is None:
+                print("Sucesfully started the Interop Server...")
+            else:
+                warnings.warn("Interop Server died after starting up...")
+                raise PlcException(
+                    "Unable to start the Interop Server. Is another Server still running under the same port?")
+
+        self.transport = TSocket.TSocket('localhost', 9090)
+        self.transport = TTransport.TBufferedTransport(self.transport)
+
+        self.protocol = TBinaryProtocol.TBinaryProtocol(self.transport)
+
+        try:
+            self.transport.open()
+        except TTransportException:
+            raise PlcException("Unable to connect to the Interop Server, is the Server really running???")
+
+    def _get_client(self):
+        return Client(self.protocol)
+
+    def get_connection(self, url):
+        return PlcConnection(self._get_client(), url)
+
+    def close(self):
+        print("Closing the Interop Server")
+        try:
+            self.transport.close()
+        finally:
+            if self.embedded_server:
+                self.interop_proc.terminate()
diff --git a/sandbox/plc4py/src/main/python/org/apache/plc4x/__init__.py b/sandbox/plc4py/src/main/python/org/apache/plc4x/__init__.py
index c3434ab60d0..5291ee51ea4 100644
--- a/sandbox/plc4py/src/main/python/org/apache/plc4x/__init__.py
+++ b/sandbox/plc4py/src/main/python/org/apache/plc4x/__init__.py
@@ -1,17 +1,17 @@
-#  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
-#
-#    http://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.
-
+#  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
+#
+#    http://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.
+
diff --git a/sandbox/plc4py/src/main/resources/lib/log4j2.xml b/sandbox/plc4py/src/main/resources/lib/log4j2.xml
index 7d33e70707a..965fcab379d 100644
--- a/sandbox/plc4py/src/main/resources/lib/log4j2.xml
+++ b/sandbox/plc4py/src/main/resources/lib/log4j2.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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
-  ~
-  ~   http://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.
-  -->
-
-<Configuration>
-    <Appenders>
-        <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
-        </Console>
-    </Appenders>
-    <Loggers>
-        <Root level="WARN">
-            <AppenderRef ref="Console"/>
-        </Root>
-    </Loggers>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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
+  ~
+  ~   http://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.
+  -->
+
+<Configuration>
+    <Appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
+        </Console>
+    </Appenders>
+    <Loggers>
+        <Root level="WARN">
+            <AppenderRef ref="Console"/>
+        </Root>
+    </Loggers>
 </Configuration>
\ No newline at end of file
diff --git a/sandbox/plc4py/src/test/python/__init__.py b/sandbox/plc4py/src/test/python/__init__.py
index 6fa4b09c843..e39e08d488f 100644
--- a/sandbox/plc4py/src/test/python/__init__.py
+++ b/sandbox/plc4py/src/test/python/__init__.py
@@ -1,26 +1,26 @@
-#  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
-#
-#    http://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.
-#
-#    http://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.
-
+#  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
+#
+#    http://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.
+#
+#    http://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.
+
diff --git a/sandbox/plc4py/src/test/python/org/__init__.py b/sandbox/plc4py/src/test/python/org/__init__.py
index 6fa4b09c843..e39e08d488f 100644
--- a/sandbox/plc4py/src/test/python/org/__init__.py
+++ b/sandbox/plc4py/src/test/python/org/__init__.py
@@ -1,26 +1,26 @@
-#  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
-#
-#    http://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.
-#
-#    http://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.
-
+#  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
+#
+#    http://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.
+#
+#    http://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.
+
diff --git a/sandbox/plc4py/src/test/python/org/apache/__init__.py b/sandbox/plc4py/src/test/python/org/apache/__init__.py
index 6fa4b09c843..e39e08d488f 100644
--- a/sandbox/plc4py/src/test/python/org/apache/__init__.py
+++ b/sandbox/plc4py/src/test/python/org/apache/__init__.py
@@ -1,26 +1,26 @@
-#  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
-#
-#    http://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.
-#
-#    http://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.
-
+#  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
+#
+#    http://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.
+#
+#    http://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.
+
diff --git a/sandbox/plc4py/src/test/python/org/apache/plc4x/__init__.py b/sandbox/plc4py/src/test/python/org/apache/plc4x/__init__.py
index c3434ab60d0..5291ee51ea4 100644
--- a/sandbox/plc4py/src/test/python/org/apache/plc4x/__init__.py
+++ b/sandbox/plc4py/src/test/python/org/apache/plc4x/__init__.py
@@ -1,17 +1,17 @@
-#  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
-#
-#    http://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.
-
+#  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
+#
+#    http://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.
+
diff --git a/sandbox/plc4py/src/test/python/org/apache/plc4x/test_PlcDriverManager.py b/sandbox/plc4py/src/test/python/org/apache/plc4x/test_PlcDriverManager.py
index 0373565a682..ddd961ed5a5 100644
--- a/sandbox/plc4py/src/test/python/org/apache/plc4x/test_PlcDriverManager.py
+++ b/sandbox/plc4py/src/test/python/org/apache/plc4x/test_PlcDriverManager.py
@@ -1,143 +1,143 @@
-#  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
-#
-#    http://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.
-
-import time
-import unittest
-from subprocess import Popen
-from unittest import TestCase
-
-from generated.org.apache.plc4x.interop.InteropServer import Request, PlcException
-
-from org.apache.plc4x.PlcDriverManager import PlcDriverManager
-
-if __name__ == '__main__':
-    unittest.main()
-
-
-class TestPlcDriverManager(TestCase):
-
-    def test_callLib(self):
-        try:
-            proc = Popen(["java", "-jar", "../lib/interop-server.jar"])
-            print("Started server under pid " + str(proc.pid))
-            time.sleep(5)
-            poll = proc.poll()
-            if poll is None:
-                print("Still running...")
-            else:
-                print("Unable to start the Interop Server...")
-        except:
-            print("Unable to start proces")
-        finally:
-            proc.terminate()
-            time.sleep(1)
-
-    def test_startAndStopServer(self):
-        try:
-            manager = PlcDriverManager()
-
-            ## Do some magic here
-            client = manager._get_client()
-            connection = client.connect("mock:a")
-
-            result = client.execute(connection, Request(fields={"field1": "asdf"}))
-
-            print(result)
-
-            client.close(connection)
-        finally:
-            manager.close()
-            time.sleep(1)
-
-    def test_withPlcConnection(self):
-        try:
-            manager = PlcDriverManager()
-
-            try:
-                connection = manager.get_connection("mock:a")
-                result = connection.execute(Request(fields={"field1": "asdf"}))
-                print(result)
-            finally:
-                connection.close()
-        finally:
-            manager.close()
-            time.sleep(1)
-
-    def test_withCompleteAPI(self):
-        try:
-            manager = PlcDriverManager()
-
-            connection = None
-            try:
-                connection = manager.get_connection("mock:a")
-
-                result = connection.execute(Request(fields={"field1": "asdf"}))
-                print("Response Code is " + str(result.get_field("field1").get_response_code()))
-                # We now that we want to get an int...
-                print("Response Value is " + str(result.get_field("field1").get_int_value()))
-
-                ## Assert the value
-                self.assertEqual(result.get_field("field1").get_int_value(), 100)
-
-            except PlcException as e:
-                raise Exception(str(e.url))
-            finally:
-                if connection is not None:
-                    connection.close()
-        finally:
-            manager.close()
-            time.sleep(1)
-
-    # This i a manual test, which needs a running server to work
-    def mt_withRealPLC_forDebug(self):
-        try:
-            manager = PlcDriverManager(embedded_server=False)
-
-            connection = None
-            try:
-                connection = manager.get_connection("s7://192.168.167.210/0/1")
-                result = connection.execute(Request(fields={"field1": "%M0:USINT"}))
-                print(result)
-            except PlcException as e:
-                raise Exception(str(e.url))
-            finally:
-                if connection is not None:
-                    connection.close()
-        finally:
-            manager.close()
-
-    # This is an integration test, which needs a S7 PLC
-    def it_withRealPLC(self):
-        try:
-            manager = PlcDriverManager()
-
-            connection = None
-            try:
-                connection = manager.get_connection("s7://192.168.167.210/0/1")
-                for _ in range(100):
-                    result = connection.execute(Request(fields={"field1": "%M0:USINT"}))
-                    print("Response Code is " + str(result.get_field("field1").get_response_code()))
-                    # We now that we want to get an int...
-                    print("Response Value is " + str(result.get_field("field1").get_int_value()))
-
-            except PlcException as e:
-                raise Exception(str(e.url))
-            finally:
-                if connection is not None:
-                    connection.close()
-        finally:
+#  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
+#
+#    http://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.
+
+import time
+import unittest
+from subprocess import Popen
+from unittest import TestCase
+
+from generated.org.apache.plc4x.interop.InteropServer import Request, PlcException
+
+from org.apache.plc4x.PlcDriverManager import PlcDriverManager
+
+if __name__ == '__main__':
+    unittest.main()
+
+
+class TestPlcDriverManager(TestCase):
+
+    def test_callLib(self):
+        try:
+            proc = Popen(["java", "-jar", "../lib/interop-server.jar"])
+            print("Started server under pid " + str(proc.pid))
+            time.sleep(5)
+            poll = proc.poll()
+            if poll is None:
+                print("Still running...")
+            else:
+                print("Unable to start the Interop Server...")
+        except:
+            print("Unable to start proces")
+        finally:
+            proc.terminate()
+            time.sleep(1)
+
+    def test_startAndStopServer(self):
+        try:
+            manager = PlcDriverManager()
+
+            ## Do some magic here
+            client = manager._get_client()
+            connection = client.connect("mock:a")
+
+            result = client.execute(connection, Request(fields={"field1": "asdf"}))
+
+            print(result)
+
+            client.close(connection)
+        finally:
+            manager.close()
+            time.sleep(1)
+
+    def test_withPlcConnection(self):
+        try:
+            manager = PlcDriverManager()
+
+            try:
+                connection = manager.get_connection("mock:a")
+                result = connection.execute(Request(fields={"field1": "asdf"}))
+                print(result)
+            finally:
+                connection.close()
+        finally:
+            manager.close()
+            time.sleep(1)
+
+    def test_withCompleteAPI(self):
+        try:
+            manager = PlcDriverManager()
+
+            connection = None
+            try:
+                connection = manager.get_connection("mock:a")
+
+                result = connection.execute(Request(fields={"field1": "asdf"}))
+                print("Response Code is " + str(result.get_field("field1").get_response_code()))
+                # We now that we want to get an int...
+                print("Response Value is " + str(result.get_field("field1").get_int_value()))
+
+                ## Assert the value
+                self.assertEqual(result.get_field("field1").get_int_value(), 100)
+
+            except PlcException as e:
+                raise Exception(str(e.url))
+            finally:
+                if connection is not None:
+                    connection.close()
+        finally:
+            manager.close()
+            time.sleep(1)
+
+    # This i a manual test, which needs a running server to work
+    def mt_withRealPLC_forDebug(self):
+        try:
+            manager = PlcDriverManager(embedded_server=False)
+
+            connection = None
+            try:
+                connection = manager.get_connection("s7://192.168.167.210/0/1")
+                result = connection.execute(Request(fields={"field1": "%M0:USINT"}))
+                print(result)
+            except PlcException as e:
+                raise Exception(str(e.url))
+            finally:
+                if connection is not None:
+                    connection.close()
+        finally:
+            manager.close()
+
+    # This is an integration test, which needs a S7 PLC
+    def it_withRealPLC(self):
+        try:
+            manager = PlcDriverManager()
+
+            connection = None
+            try:
+                connection = manager.get_connection("s7://192.168.167.210/0/1")
+                for _ in range(100):
+                    result = connection.execute(Request(fields={"field1": "%M0:USINT"}))
+                    print("Response Code is " + str(result.get_field("field1").get_response_code()))
+                    # We now that we want to get an int...
+                    print("Response Value is " + str(result.get_field("field1").get_int_value()))
+
+            except PlcException as e:
+                raise Exception(str(e.url))
+            finally:
+                if connection is not None:
+                    connection.close()
+        finally:
             manager.close()
\ No newline at end of file
diff --git a/sandbox/pom.xml b/sandbox/pom.xml
index 600d99c8d10..b9d5d7ced2f 100644
--- a/sandbox/pom.xml
+++ b/sandbox/pom.xml
@@ -1,76 +1,76 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4x-parent</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <groupId>org.apache.plc4x.sandbox</groupId>
-  <artifactId>plc4x-sandbox</artifactId>
-  <packaging>pom</packaging>
-
-  <name>Sandbox</name>
-  <description>Place where new stuff is located before it is regarded production-quality.</description>
-
-  <modules>
-    <module>code-gen</module>
-    <module>plc-simulator</module>
-    <module>streampipes-connectors</module>
-
-    <module>test-java-bacnetip-driver</module>
-    <module>test-java-knxnetip-driver</module>
-    <module>test-java-s7-driver</module>
-    <module>test-java-passive-s7-driver</module>
-    <module>test-java-df1-driver</module>
-  </modules>
-
-  <profiles>
-    <!-- Build PLC4X including the CPP modules -->
-    <profile>
-      <id>with-cpp</id>
-      <modules>
-        <module>plc4cpp</module>
-      </modules>
-    </profile>
-
-    <!-- Build PLC4X including the .Net modules -->
-    <profile>
-      <id>with-dotnet</id>
-      <modules>
-        <module>plc4net</module>
-      </modules>
-    </profile>
-
-    <!-- Build PLC4X including the Python modules -->
-    <profile>
-      <id>with-python</id>
-      <modules>
-        <module>plc4py</module>
-      </modules>
-    </profile>
-
-  </profiles>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4x-parent</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.apache.plc4x.sandbox</groupId>
+  <artifactId>plc4x-sandbox</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Sandbox</name>
+  <description>Place where new stuff is located before it is regarded production-quality.</description>
+
+  <modules>
+    <module>code-gen</module>
+    <module>plc-simulator</module>
+    <module>streampipes-connectors</module>
+
+    <module>test-java-bacnetip-driver</module>
+    <module>test-java-knxnetip-driver</module>
+    <module>test-java-s7-driver</module>
+    <module>test-java-passive-s7-driver</module>
+    <module>test-java-df1-driver</module>
+  </modules>
+
+  <profiles>
+    <!-- Build PLC4X including the CPP modules -->
+    <profile>
+      <id>with-cpp</id>
+      <modules>
+        <module>plc4cpp</module>
+      </modules>
+    </profile>
+
+    <!-- Build PLC4X including the .Net modules -->
+    <profile>
+      <id>with-dotnet</id>
+      <modules>
+        <module>plc4net</module>
+      </modules>
+    </profile>
+
+    <!-- Build PLC4X including the Python modules -->
+    <profile>
+      <id>with-python</id>
+      <modules>
+        <module>plc4py</module>
+      </modules>
+    </profile>
+
+  </profiles>
+
 </project>
\ No newline at end of file
diff --git a/sandbox/streampipes-connectors/READMME.adoc b/sandbox/streampipes-connectors/READMME.adoc
index fa94660201b..90615bdb6ef 100644
--- a/sandbox/streampipes-connectors/READMME.adoc
+++ b/sandbox/streampipes-connectors/READMME.adoc
@@ -1,49 +1,49 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== Setting up for development.
-
-1. Install StreamPipes (Using `./streampipes start` with the installer, choosing a real IP address)
-2. When asked for the IP address, enter: `host.docker.internal`
-3. Edit your `hosts` file (Mac: `/private/ect/hosts`) to direct `host.docker.internal` to `127.0.0.1_`
-
-== Setting up the Worker
-
-1. Make sure the `EnvFile` plugin is installed in IntelliJ
-2. Create a new `Application` run configuration targeting the `BacNetIpAdapter.BacNetIpAdapterInit` class
-3. Go to the run-configuration and select the `EnvFile` tab
-4. Check the `Enable EnvFile`
-5. Add the env file in `env/development`
-
-== Running the Worker
-
-1. Execute the new run configuration (This will fail with an error: `Web server failed to start. Port 8098 was already in use.`)
-2. Stop the running configuration.
-3. Go to the `Consul` configuration page on `http://localhost:8500`
-4. Select `Key/Value`
-5. Navigate to `sp/v1/{name of your worker}
-6. Change `SP_CONNECT_CONTAINER_WORKER_PORT` to an unused port: `8198`
-7. Change `SP_CONNECT_CONTAINER_WORKER_HOST` and `SP_KAFKA_HOST` from `localhost` to the fixed ip you told the setup to use
-8. Restart the run configuration
-
-== Using the Worker
-
-1. Go to the StreamPipes UI section `StreamPipes connect`
-2. Search for your Worker
-3. Give it a name
-4. Start it
+//
+//  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
+//
+//      http://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.
+//
+
+== Setting up for development.
+
+1. Install StreamPipes (Using `./streampipes start` with the installer, choosing a real IP address)
+2. When asked for the IP address, enter: `host.docker.internal`
+3. Edit your `hosts` file (Mac: `/private/ect/hosts`) to direct `host.docker.internal` to `127.0.0.1_`
+
+== Setting up the Worker
+
+1. Make sure the `EnvFile` plugin is installed in IntelliJ
+2. Create a new `Application` run configuration targeting the `BacNetIpAdapter.BacNetIpAdapterInit` class
+3. Go to the run-configuration and select the `EnvFile` tab
+4. Check the `Enable EnvFile`
+5. Add the env file in `env/development`
+
+== Running the Worker
+
+1. Execute the new run configuration (This will fail with an error: `Web server failed to start. Port 8098 was already in use.`)
+2. Stop the running configuration.
+3. Go to the `Consul` configuration page on `http://localhost:8500`
+4. Select `Key/Value`
+5. Navigate to `sp/v1/{name of your worker}
+6. Change `SP_CONNECT_CONTAINER_WORKER_PORT` to an unused port: `8198`
+7. Change `SP_CONNECT_CONTAINER_WORKER_HOST` and `SP_KAFKA_HOST` from `localhost` to the fixed ip you told the setup to use
+8. Restart the run configuration
+
+== Using the Worker
+
+1. Go to the StreamPipes UI section `StreamPipes connect`
+2. Search for your Worker
+3. Give it a name
+4. Start it
 5. Now it should appear in the `Data Streams` section of the pipeline editor
\ No newline at end of file
diff --git a/sandbox/streampipes-connectors/env/development b/sandbox/streampipes-connectors/env/development
index 8e062370a88..b6d0043311d 100644
--- a/sandbox/streampipes-connectors/env/development
+++ b/sandbox/streampipes-connectors/env/development
@@ -1,27 +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
-#
-#    http://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.
-# ----------------------------------------------------------------------------
-
-# Redirect some parameters for local development.
-SP_KAFKA_HOST=host.docker.internal
-SP_CONNECT_CONTAINER_HOST=localhost
-SP_CONNECT_CONTAINER_MASTER_HOST=localhost
-SP_CONNECT_CONTAINER_WORKER_HOST=host.docker.internal
-SP_CONNECT_CONTAINER_WORKER_PORT=8198
-SP_DATA_LOCATION=./test_data/
-
+# ----------------------------------------------------------------------------
+# 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
+#
+#    http://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.
+# ----------------------------------------------------------------------------
+
+# Redirect some parameters for local development.
+SP_KAFKA_HOST=host.docker.internal
+SP_CONNECT_CONTAINER_HOST=localhost
+SP_CONNECT_CONTAINER_MASTER_HOST=localhost
+SP_CONNECT_CONTAINER_WORKER_HOST=host.docker.internal
+SP_CONNECT_CONTAINER_WORKER_PORT=8198
+SP_DATA_LOCATION=./test_data/
+
diff --git a/sandbox/streampipes-connectors/pom.xml b/sandbox/streampipes-connectors/pom.xml
index 87a6e612426..eb024cb5aee 100644
--- a/sandbox/streampipes-connectors/pom.xml
+++ b/sandbox/streampipes-connectors/pom.xml
@@ -1,199 +1,199 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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
-  ~
-  ~   http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.sandbox</groupId>
-    <artifactId>plc4x-sandbox</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>test-streampipes-connectors</artifactId>
-
-  <name>Sandbox: StreamPipes Connectors</name>
-
-  <properties>
-    <streampipes.version>0.64.0</streampipes.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base-raw-socket</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base-pcap-socket</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <!--scope>test</scope-->
-    </dependency>
-
-    <dependency>
-      <groupId>org.streampipes</groupId>
-      <artifactId>streampipes-connect-container-worker</artifactId>
-      <version>${streampipes.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss.spec.javax.annotation</groupId>
-          <artifactId>jboss-annotations-api_1.2_spec</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.glassfish.hk2.external</groupId>
-          <artifactId>javax.inject</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.glassfish.hk2.external</groupId>
-          <artifactId>aopalliance-repackaged</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>aopalliance</groupId>
-          <artifactId>aopalliance</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.glassfish</groupId>
-          <artifactId>javax.el</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.ow2.spec.ee</groupId>
-          <artifactId>ow2-jpa-1.0-spec</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.google.code.findbugs</groupId>
-          <artifactId>jsr305</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x.sandbox</groupId>
-      <artifactId>test-java-bacnetip-driver</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.validation</groupId>
-      <artifactId>validation-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-core</artifactId>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>commons-beanutils</groupId>
-        <artifactId>commons-beanutils</artifactId>
-        <version>1.9.4</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.fasterxml.jackson.datatype</groupId>
-        <artifactId>jackson-datatype-jdk8</artifactId>
-        <version>2.9.9</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.squareup.okhttp3</groupId>
-        <artifactId>okhttp</artifactId>
-        <version>3.12.1</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>fluent-hc</artifactId>
-        <version>${httpclient.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>httpclient</artifactId>
-        <version>${httpclient.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.javassist</groupId>
-        <artifactId>javassist</artifactId>
-        <version>3.25.0-GA</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.jboss.logging</groupId>
-        <artifactId>jboss-logging</artifactId>
-        <version>3.3.2.Final</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.objenesis</groupId>
-        <artifactId>objenesis</artifactId>
-        <version>2.5.1</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-aop</artifactId>
-        <version>5.1.9.RELEASE</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-beans</artifactId>
-        <version>5.1.9.RELEASE</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-context</artifactId>
-        <version>5.1.9.RELEASE</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-core</artifactId>
-        <version>5.1.9.RELEASE</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-web</artifactId>
-        <version>5.1.9.RELEASE</version>
-      </dependency>
-
-      <dependency>
-        <groupId>javax.validation</groupId>
-        <artifactId>validation-api</artifactId>
-        <version>2.0.1.Final</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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
+  ~
+  ~   http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.sandbox</groupId>
+    <artifactId>plc4x-sandbox</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>test-streampipes-connectors</artifactId>
+
+  <name>Sandbox: StreamPipes Connectors</name>
+
+  <properties>
+    <streampipes.version>0.64.0</streampipes.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base-raw-socket</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base-pcap-socket</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <!--scope>test</scope-->
+    </dependency>
+
+    <dependency>
+      <groupId>org.streampipes</groupId>
+      <artifactId>streampipes-connect-container-worker</artifactId>
+      <version>${streampipes.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jboss.spec.javax.annotation</groupId>
+          <artifactId>jboss-annotations-api_1.2_spec</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.glassfish.hk2.external</groupId>
+          <artifactId>javax.inject</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.glassfish.hk2.external</groupId>
+          <artifactId>aopalliance-repackaged</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>aopalliance</groupId>
+          <artifactId>aopalliance</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.glassfish</groupId>
+          <artifactId>javax.el</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.ow2.spec.ee</groupId>
+          <artifactId>ow2-jpa-1.0-spec</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.google.code.findbugs</groupId>
+          <artifactId>jsr305</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x.sandbox</groupId>
+      <artifactId>test-java-bacnetip-driver</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>commons-beanutils</groupId>
+        <artifactId>commons-beanutils</artifactId>
+        <version>1.9.4</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.fasterxml.jackson.datatype</groupId>
+        <artifactId>jackson-datatype-jdk8</artifactId>
+        <version>2.9.9</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.squareup.okhttp3</groupId>
+        <artifactId>okhttp</artifactId>
+        <version>3.12.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>fluent-hc</artifactId>
+        <version>${httpclient.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient</artifactId>
+        <version>${httpclient.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.javassist</groupId>
+        <artifactId>javassist</artifactId>
+        <version>3.25.0-GA</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jboss.logging</groupId>
+        <artifactId>jboss-logging</artifactId>
+        <version>3.3.2.Final</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.objenesis</groupId>
+        <artifactId>objenesis</artifactId>
+        <version>2.5.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-aop</artifactId>
+        <version>5.1.9.RELEASE</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-beans</artifactId>
+        <version>5.1.9.RELEASE</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-context</artifactId>
+        <version>5.1.9.RELEASE</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-core</artifactId>
+        <version>5.1.9.RELEASE</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-web</artifactId>
+        <version>5.1.9.RELEASE</version>
+      </dependency>
+
+      <dependency>
+        <groupId>javax.validation</groupId>
+        <artifactId>validation-api</artifactId>
+        <version>2.0.1.Final</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+</project>
diff --git a/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/BacNetIpAdapter.java b/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/BacNetIpAdapter.java
index c2c6cbd90e4..9cc3b2ac870 100644
--- a/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/BacNetIpAdapter.java
+++ b/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/BacNetIpAdapter.java
@@ -1,372 +1,372 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.streampipes.bacnetip;
-
-import io.netty.channel.ChannelHandlerContext;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.bacnetip.PassiveBacNetIpDriver;
-import org.apache.plc4x.java.bacnetip.connection.PassiveBacNetIpPlcConnection;
-import org.apache.plc4x.java.bacnetip.readwrite.*;
-import org.apache.plc4x.java.base.PlcMessageToMessageCodec;
-import org.apache.plc4x.java.base.connection.NettyPlcConnection;
-import org.apache.plc4x.java.base.connection.PcapChannelFactory;
-import org.apache.plc4x.java.base.messages.PlcRequestContainer;
-import org.apache.plc4x.java.streampipes.bacnetip.config.ConnectWorkerConfig;
-import org.apache.plc4x.java.utils.pcapsockets.netty.PcapSocketAddress;
-import org.apache.plc4x.java.utils.pcapsockets.netty.PcapSocketChannelConfig;
-import org.apache.plc4x.java.utils.pcapsockets.netty.UdpIpPacketHandler;
-import org.pcap4j.core.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.streampipes.connect.adapter.Adapter;
-import org.streampipes.connect.adapter.exception.AdapterException;
-import org.streampipes.connect.adapter.exception.ParseException;
-import org.streampipes.connect.adapter.model.specific.SpecificDataStreamAdapter;
-import org.streampipes.connect.container.worker.init.AdapterWorkerContainer;
-import org.streampipes.connect.init.AdapterDeclarerSingleton;
-import org.streampipes.model.AdapterType;
-import org.streampipes.model.connect.adapter.SpecificAdapterStreamDescription;
-import org.streampipes.model.connect.guess.GuessSchema;
-import org.streampipes.model.schema.EventProperty;
-import org.streampipes.model.schema.EventSchema;
-import org.streampipes.model.staticproperty.FileStaticProperty;
-import org.streampipes.sdk.StaticProperties;
-import org.streampipes.sdk.builder.PrimitivePropertyBuilder;
-import org.streampipes.sdk.builder.adapter.SpecificDataStreamAdapterBuilder;
-import org.streampipes.sdk.helpers.*;
-import org.streampipes.sdk.utils.Datatypes;
-
-import java.io.File;
-import java.nio.ByteBuffer;
-import java.util.*;
-
-public class BacNetIpAdapter extends SpecificDataStreamAdapter {
-
-    public static final String ID = "http://plc4x.apache.org/streampipes/adapter/bacnetip";
-
-    private static final Logger logger = LoggerFactory.getLogger(BacNetIpAdapter.class);
-
-    private NettyPlcConnection connection;
-
-    public BacNetIpAdapter() {
-        super();
-    }
-
-    public BacNetIpAdapter(SpecificAdapterStreamDescription adapterDescription) {
-        super(adapterDescription);
-    }
-
-    @Override
-    public SpecificAdapterStreamDescription declareModel() {
-        Label fileLabel = Labels.from("pcap-file", "PCAP File", "File containing the network traffic recording");
-
-        Tuple2<String, String>[] deviceList = null;
-        try {
-            final List<PcapNetworkInterface> allDevs = Pcaps.findAllDevs();
-            deviceList = new Tuple2[allDevs.size()];
-            for (int i = 0; i < allDevs.size(); i++) {
-                final PcapNetworkInterface pcapNetworkInterface = allDevs.get(i);
-                StringBuilder deviceName = new StringBuilder((pcapNetworkInterface.getDescription() != null) ? pcapNetworkInterface.getDescription() : pcapNetworkInterface.getName());
-                deviceName.append(" (");
-                for (PcapAddress address : pcapNetworkInterface.getAddresses()) {
-                    if(address instanceof PcapIpV4Address) {
-                        deviceName.append(address.getAddress().toString()).append("/").append(address.getNetmask().toString()).append(", ");
-                    }
-                }
-                String name = deviceName.toString();
-                name = name.substring(0, name.length() - 2) + ((name.endsWith(", ")) ? ")": "");
-                deviceList[i] = new Tuple2<>(pcapNetworkInterface.getName(), name);
-            }
-        } catch (PcapNativeException e) {
-            logger.error("Error getting the list of installed network devices");
-        }
-
-        SpecificAdapterStreamDescription description = SpecificDataStreamAdapterBuilder.create(ID, "BACnet/IP", "")
-            .iconUrl("bacnetip.png")
-            .category(AdapterType.Manufacturing)
-            .requiredAlternatives(Labels.from("source", "Source", "Select the source, where the data is read from"),
-                Alternatives.from(Labels.from("device", "Network", "Capture data via network device"),
-                    StaticProperties.group(Labels.withId("device-group"),
-                        StaticProperties.singleValueSelection(Labels.from("network-device", "Network Device", "Network device used for capturing"),
-                            Options.from(deviceList)))),
-                Alternatives.from(Labels.from("file", "File", "Capture data from a PCAP network recording"),
-                    StaticProperties.group(Labels.withId("file-group"),
-                        new FileStaticProperty(fileLabel.getInternalId(), fileLabel.getLabel(), fileLabel.getDescription()))))
-            .build();
-        description.setAppId(ID);
-        return description;
-    }
-
-    @Override
-    public GuessSchema getSchema(SpecificAdapterStreamDescription specificAdapterStreamDescription) throws AdapterException, ParseException {
-        EventSchema eventSchema = new EventSchema();
-        List<EventProperty> allProperties = new ArrayList<>();
-
-        allProperties.add(
-            PrimitivePropertyBuilder
-                .create(Datatypes.Long, "time")
-                .label("Time")
-                .description("The time the event was processed in the BACnet adapter")
-                .build());
-
-        allProperties.add(
-            PrimitivePropertyBuilder
-                .create(Datatypes.Integer, "objectType")
-                .label("Object type")
-                .description("Type of BACnet object emitting the event (usually 'device')")
-                .build());
-
-        allProperties.add(
-            PrimitivePropertyBuilder
-                .create(Datatypes.Integer, "objectId")
-                .label("Object id")
-                .description("Id of the BACnet object emitting the event (usually 'device id')")
-                .build());
-
-        allProperties.add(
-            PrimitivePropertyBuilder
-                .create(Datatypes.Integer, "notificationType")
-                .label("Notification type")
-                .description("The type of notification this event resembles (usually some type of input)")
-                .build());
-
-        allProperties.add(
-            PrimitivePropertyBuilder
-                .create(Datatypes.Integer, "notificationInstanceNumber")
-                .label("Notification instance number")
-                .description("The instance number of the component emitting the event (usually the id of the property changed on a device)")
-                .build());
-
-        allProperties.add(
-            PrimitivePropertyBuilder
-                .create(Datatypes.Integer, "valueType")
-                .label("Value type")
-                .description("The type the value has (real, uint, int, bit-string, ...)")
-                .build());
-
-        allProperties.add(
-            PrimitivePropertyBuilder
-                .create(Datatypes.String, "value")
-                .label("Value")
-                .description("This is the actual payload of the event.")
-                .build());
-
-        allProperties.add(
-            PrimitivePropertyBuilder
-                .create(Datatypes.Sequence, "status")
-                .label("Status")
-                .description("Some times an array of status bits are passed along.")
-                .build());
-
-        eventSchema.setEventProperties(allProperties);
-
-        GuessSchema guessSchema = new GuessSchema();
-        guessSchema.setEventSchema(eventSchema);
-        guessSchema.setPropertyProbabilityList(new ArrayList<>());
-
-        return guessSchema;
-    }
-
-    @Override
-    public void startAdapter() throws AdapterException {
-        try {
-            connection = new PassiveBacNetIpPlcConnection(new PcapChannelFactory(
-                //new File("/Users/christofer.dutz/Projects/Apache/PLC4X-Documents/BacNET/Captures/Merck/BACnetWhoIsRouterToNetwork.pcapng"), null,
-                new File("/Users/christofer.dutz/Projects/Apache/PLC4X-Documents/BacNET/Captures/Merck/BACnet.pcapng"), null,
-                PassiveBacNetIpDriver.BACNET_IP_PORT, PcapSocketAddress.ALL_PROTOCOLS,
-                PcapSocketChannelConfig.SPEED_REALTIME, new UdpIpPacketHandler()), "",
-                new PlcMessageToMessageCodec<BVLC, PlcRequestContainer>() {
-
-                @Override
-                protected void decode(ChannelHandlerContext channelHandlerContext, BVLC packet, List<Object> list) throws Exception {
-                    NPDU npdu = null;
-                    if(packet instanceof BVLCOriginalUnicastNPDU) {
-                        npdu = ((BVLCOriginalUnicastNPDU) packet).getNpdu();
-                    } else if(packet instanceof BVLCForwardedNPDU) {
-                        npdu = ((BVLCForwardedNPDU) packet).getNpdu();
-                    } else if(packet instanceof BVLCOriginalBroadcastNPDU) {
-                        npdu = ((BVLCOriginalBroadcastNPDU) packet).getNpdu();
-                    } else {
-                        throw new RuntimeException("Unexpected type of packet");
-                    }
-                    final APDU apdu = npdu.getApdu();
-                    if(apdu instanceof APDUConfirmedRequest) {
-                        APDUConfirmedRequest request = (APDUConfirmedRequest) apdu;
-                        final BACnetConfirmedServiceRequest serviceRequest = request.getServiceRequest();
-                        if(serviceRequest instanceof BACnetConfirmedServiceRequestConfirmedCOVNotification) {
-                            BACnetConfirmedServiceRequestConfirmedCOVNotification covNotification = (BACnetConfirmedServiceRequestConfirmedCOVNotification) serviceRequest;
-                            final BACnetTagWithContent[] notifications = covNotification.getNotifications();
-
-                            String objectType = Integer.toString(covNotification.getMonitoredObjectType());
-                            String objectId = Long.toString(covNotification.getMonitoredObjectInstanceNumber());
-
-                            String notificationType = Integer.toString(covNotification.getIssueConfirmedNotificationsType());
-                            String notificationInstanceNumber = Long.toString(covNotification.getMonitoredObjectInstanceNumber());
-
-                            String type = null;
-                            Object value = null;
-                            boolean[] status = null;
-                            for (BACnetTagWithContent notification : notifications) {
-                                // Id of the property that changed
-                                short propertyId = notification.getPropertyIdentifier()[0];
-
-                                // Present-Value has the property id 85
-                                // (This is the actual value to which a given property has changed)
-                                if(propertyId == 85) {
-                                    // Depending on the type of object, parse the data accordingly.
-                                    if (notification.getVal() instanceof BACnetTagApplicationBoolean) {
-                                        type = "boolean";
-                                        final BACnetTagApplicationBoolean val = (BACnetTagApplicationBoolean) notification.getVal();
-
-                                    } else if (notification.getVal() instanceof BACnetTagApplicationUnsignedInteger) {
-                                        type = "uint";
-                                        final BACnetTagApplicationUnsignedInteger val = (BACnetTagApplicationUnsignedInteger) notification.getVal();
-                                        // Convert any number of bytes into an unsigned integer.
-                                        switch (val.getData().length) {
-                                            case 1:
-                                                value = Byte.toString(val.getData()[0]);
-                                                break;
-                                            case 2:
-                                                value = Short.toString(ByteBuffer.wrap(val.getData()).getShort());
-                                                break;
-                                            case 3:
-                                                byte[] extValues = new byte[4];
-                                                extValues[0] = 0x00;
-                                                for(int i = 0; i < 3; i++) {
-                                                    extValues[i+1] = val.getData()[i];
-                                                }
-                                                value = ByteBuffer.wrap(extValues).getInt();
-                                                break;
-                                            default:
-                                                value = "Hurz";
-                                                break;
-                                        }
-                                    } else if (notification.getVal() instanceof BACnetTagApplicationSignedInteger) {
-                                        type = "int";
-                                        final BACnetTagApplicationSignedInteger val = (BACnetTagApplicationSignedInteger) notification.getVal();
-
-                                    } else if (notification.getVal() instanceof BACnetTagApplicationReal) {
-                                        type = "real";
-                                        final BACnetTagApplicationReal val = (BACnetTagApplicationReal) notification.getVal();
-                                        value = Float.intBitsToFloat(ByteBuffer.wrap(val.getData()).getInt());
-                                    } else if (notification.getVal() instanceof BACnetTagApplicationDouble) {
-                                        type = "double";
-                                        final BACnetTagApplicationDouble val = (BACnetTagApplicationDouble) notification.getVal();
-
-                                    } else if (notification.getVal() instanceof BACnetTagApplicationBitString) {
-                                        type = "bit-string";
-                                        final BACnetTagApplicationBitString val = (BACnetTagApplicationBitString) notification.getVal();
-                                        int numBits = (val.getData().length * 8) - val.getUnusedBits();
-                                        BitSet bitSet = BitSet.valueOf(val.getData());
-                                        boolean[] bits = new boolean[numBits];
-                                        for (int i = 0; i < numBits; i++) {
-                                            bits[i] = bitSet.get(i);
-                                        }
-                                        value = bits;
-                                    } else if (notification.getVal() instanceof BACnetTagApplicationEnumerated) {
-                                        type = "enumeration";
-                                        final BACnetTagApplicationEnumerated val = (BACnetTagApplicationEnumerated) notification.getVal();
-
-                                    }
-                                }
-
-                                // Status-Flags have the property id 111
-                                // (This is some additional information passed along)
-                                else if(propertyId == 111) {
-                                    final BACnetTagApplicationBitString val = (BACnetTagApplicationBitString) notification.getVal();
-                                    int numBits = (val.getData().length * 8) - val.getUnusedBits();
-                                    BitSet bitSet = BitSet.valueOf(val.getData());
-                                    boolean[] bits = new boolean[numBits];
-                                    for (int i = 0; i < numBits; i++) {
-                                        bits[i] = bitSet.get(i);
-                                    }
-                                    status = bits;
-                                }
-                            }
-
-                            if(value != null) {
-                                // Create the event object.
-                                Map<String, Object> event = new HashMap<>();
-                                event.put("time", System.currentTimeMillis());
-
-                                event.put("objectType", objectType);
-                                event.put("objectId", objectId);
-                                event.put("notificationType", notificationType);
-                                event.put("notificationInstanceNumber", notificationInstanceNumber);
-
-                                event.put("valueType", type);
-                                event.put("value", value);
-                                event.put("status", status);
-
-                                // Send it to StreamPipes
-                                adapterPipeline.process(event);
-                            }
-                        }
-                    }
-                }
-
-                @Override
-                protected void encode(ChannelHandlerContext ctx, PlcRequestContainer msg, List<Object> out) throws Exception {
-                    // Ignore this as we don't send anything.
-                }
-            });
-            connection.connect();
-        } catch (PlcConnectionException e) {
-            logger.error("An error occurred starting the BACnet/IP driver", e);
-            throw new AdapterException("An error occurred starting the BACnet/IP driver");
-        }
-    }
-
-    @Override
-    public void stopAdapter() throws AdapterException {
-        if(connection != null) {
-            try {
-                connection.close();
-            } catch (PlcConnectionException e) {
-                logger.error("An error occurred stopping the BACnet/IP driver", e);
-                throw new AdapterException("An error occurred stopping the BACnet/IP driver");
-            }
-        }
-    }
-
-    @Override
-    public Adapter getInstance(SpecificAdapterStreamDescription specificAdapterStreamDescription) {
-        return new BacNetIpAdapter(specificAdapterStreamDescription);
-    }
-
-    @Override
-    public String getId() {
-        return ID;
-    }
-
-    public static class BacNetIpAdapterInit extends AdapterWorkerContainer {
-        public static void main(String[] args) {
-            AdapterDeclarerSingleton
-                .getInstance()
-                .add(new BacNetIpAdapter());
-
-            String workerUrl = ConnectWorkerConfig.INSTANCE.getConnectContainerWorkerUrl();
-            String masterUrl = ConnectWorkerConfig.INSTANCE.getConnectContainerMasterUrl();
-            Integer workerPort = ConnectWorkerConfig.INSTANCE.getConnectContainerWorkerPort();
-
-            new BacNetIpAdapterInit().init(workerUrl, masterUrl, workerPort);
-        }
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.streampipes.bacnetip;
+
+import io.netty.channel.ChannelHandlerContext;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.bacnetip.PassiveBacNetIpDriver;
+import org.apache.plc4x.java.bacnetip.connection.PassiveBacNetIpPlcConnection;
+import org.apache.plc4x.java.bacnetip.readwrite.*;
+import org.apache.plc4x.java.base.PlcMessageToMessageCodec;
+import org.apache.plc4x.java.base.connection.NettyPlcConnection;
+import org.apache.plc4x.java.base.connection.PcapChannelFactory;
+import org.apache.plc4x.java.base.messages.PlcRequestContainer;
+import org.apache.plc4x.java.streampipes.bacnetip.config.ConnectWorkerConfig;
+import org.apache.plc4x.java.utils.pcapsockets.netty.PcapSocketAddress;
+import org.apache.plc4x.java.utils.pcapsockets.netty.PcapSocketChannelConfig;
+import org.apache.plc4x.java.utils.pcapsockets.netty.UdpIpPacketHandler;
+import org.pcap4j.core.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.streampipes.connect.adapter.Adapter;
+import org.streampipes.connect.adapter.exception.AdapterException;
+import org.streampipes.connect.adapter.exception.ParseException;
+import org.streampipes.connect.adapter.model.specific.SpecificDataStreamAdapter;
+import org.streampipes.connect.container.worker.init.AdapterWorkerContainer;
+import org.streampipes.connect.init.AdapterDeclarerSingleton;
+import org.streampipes.model.AdapterType;
+import org.streampipes.model.connect.adapter.SpecificAdapterStreamDescription;
+import org.streampipes.model.connect.guess.GuessSchema;
+import org.streampipes.model.schema.EventProperty;
+import org.streampipes.model.schema.EventSchema;
+import org.streampipes.model.staticproperty.FileStaticProperty;
+import org.streampipes.sdk.StaticProperties;
+import org.streampipes.sdk.builder.PrimitivePropertyBuilder;
+import org.streampipes.sdk.builder.adapter.SpecificDataStreamAdapterBuilder;
+import org.streampipes.sdk.helpers.*;
+import org.streampipes.sdk.utils.Datatypes;
+
+import java.io.File;
+import java.nio.ByteBuffer;
+import java.util.*;
+
+public class BacNetIpAdapter extends SpecificDataStreamAdapter {
+
+    public static final String ID = "http://plc4x.apache.org/streampipes/adapter/bacnetip";
+
+    private static final Logger logger = LoggerFactory.getLogger(BacNetIpAdapter.class);
+
+    private NettyPlcConnection connection;
+
+    public BacNetIpAdapter() {
+        super();
+    }
+
+    public BacNetIpAdapter(SpecificAdapterStreamDescription adapterDescription) {
+        super(adapterDescription);
+    }
+
+    @Override
+    public SpecificAdapterStreamDescription declareModel() {
+        Label fileLabel = Labels.from("pcap-file", "PCAP File", "File containing the network traffic recording");
+
+        Tuple2<String, String>[] deviceList = null;
+        try {
+            final List<PcapNetworkInterface> allDevs = Pcaps.findAllDevs();
+            deviceList = new Tuple2[allDevs.size()];
+            for (int i = 0; i < allDevs.size(); i++) {
+                final PcapNetworkInterface pcapNetworkInterface = allDevs.get(i);
+                StringBuilder deviceName = new StringBuilder((pcapNetworkInterface.getDescription() != null) ? pcapNetworkInterface.getDescription() : pcapNetworkInterface.getName());
+                deviceName.append(" (");
+                for (PcapAddress address : pcapNetworkInterface.getAddresses()) {
+                    if(address instanceof PcapIpV4Address) {
+                        deviceName.append(address.getAddress().toString()).append("/").append(address.getNetmask().toString()).append(", ");
+                    }
+                }
+                String name = deviceName.toString();
+                name = name.substring(0, name.length() - 2) + ((name.endsWith(", ")) ? ")": "");
+                deviceList[i] = new Tuple2<>(pcapNetworkInterface.getName(), name);
+            }
+        } catch (PcapNativeException e) {
+            logger.error("Error getting the list of installed network devices");
+        }
+
+        SpecificAdapterStreamDescription description = SpecificDataStreamAdapterBuilder.create(ID, "BACnet/IP", "")
+            .iconUrl("bacnetip.png")
+            .category(AdapterType.Manufacturing)
+            .requiredAlternatives(Labels.from("source", "Source", "Select the source, where the data is read from"),
+                Alternatives.from(Labels.from("device", "Network", "Capture data via network device"),
+                    StaticProperties.group(Labels.withId("device-group"),
+                        StaticProperties.singleValueSelection(Labels.from("network-device", "Network Device", "Network device used for capturing"),
+                            Options.from(deviceList)))),
+                Alternatives.from(Labels.from("file", "File", "Capture data from a PCAP network recording"),
+                    StaticProperties.group(Labels.withId("file-group"),
+                        new FileStaticProperty(fileLabel.getInternalId(), fileLabel.getLabel(), fileLabel.getDescription()))))
+            .build();
+        description.setAppId(ID);
+        return description;
+    }
+
+    @Override
+    public GuessSchema getSchema(SpecificAdapterStreamDescription specificAdapterStreamDescription) throws AdapterException, ParseException {
+        EventSchema eventSchema = new EventSchema();
+        List<EventProperty> allProperties = new ArrayList<>();
+
+        allProperties.add(
+            PrimitivePropertyBuilder
+                .create(Datatypes.Long, "time")
+                .label("Time")
+                .description("The time the event was processed in the BACnet adapter")
+                .build());
+
+        allProperties.add(
+            PrimitivePropertyBuilder
+                .create(Datatypes.Integer, "objectType")
+                .label("Object type")
+                .description("Type of BACnet object emitting the event (usually 'device')")
+                .build());
+
+        allProperties.add(
+            PrimitivePropertyBuilder
+                .create(Datatypes.Integer, "objectId")
+                .label("Object id")
+                .description("Id of the BACnet object emitting the event (usually 'device id')")
+                .build());
+
+        allProperties.add(
+            PrimitivePropertyBuilder
+                .create(Datatypes.Integer, "notificationType")
+                .label("Notification type")
+                .description("The type of notification this event resembles (usually some type of input)")
+                .build());
+
+        allProperties.add(
+            PrimitivePropertyBuilder
+                .create(Datatypes.Integer, "notificationInstanceNumber")
+                .label("Notification instance number")
+                .description("The instance number of the component emitting the event (usually the id of the property changed on a device)")
+                .build());
+
+        allProperties.add(
+            PrimitivePropertyBuilder
+                .create(Datatypes.Integer, "valueType")
+                .label("Value type")
+                .description("The type the value has (real, uint, int, bit-string, ...)")
+                .build());
+
+        allProperties.add(
+            PrimitivePropertyBuilder
+                .create(Datatypes.String, "value")
+                .label("Value")
+                .description("This is the actual payload of the event.")
+                .build());
+
+        allProperties.add(
+            PrimitivePropertyBuilder
+                .create(Datatypes.Sequence, "status")
+                .label("Status")
+                .description("Some times an array of status bits are passed along.")
+                .build());
+
+        eventSchema.setEventProperties(allProperties);
+
+        GuessSchema guessSchema = new GuessSchema();
+        guessSchema.setEventSchema(eventSchema);
+        guessSchema.setPropertyProbabilityList(new ArrayList<>());
+
+        return guessSchema;
+    }
+
+    @Override
+    public void startAdapter() throws AdapterException {
+        try {
+            connection = new PassiveBacNetIpPlcConnection(new PcapChannelFactory(
+                //new File("/Users/christofer.dutz/Projects/Apache/PLC4X-Documents/BacNET/Captures/Merck/BACnetWhoIsRouterToNetwork.pcapng"), null,
+                new File("/Users/christofer.dutz/Projects/Apache/PLC4X-Documents/BacNET/Captures/Merck/BACnet.pcapng"), null,
+                PassiveBacNetIpDriver.BACNET_IP_PORT, PcapSocketAddress.ALL_PROTOCOLS,
+                PcapSocketChannelConfig.SPEED_REALTIME, new UdpIpPacketHandler()), "",
+                new PlcMessageToMessageCodec<BVLC, PlcRequestContainer>() {
+
+                @Override
+                protected void decode(ChannelHandlerContext channelHandlerContext, BVLC packet, List<Object> list) throws Exception {
+                    NPDU npdu = null;
+                    if(packet instanceof BVLCOriginalUnicastNPDU) {
+                        npdu = ((BVLCOriginalUnicastNPDU) packet).getNpdu();
+                    } else if(packet instanceof BVLCForwardedNPDU) {
+                        npdu = ((BVLCForwardedNPDU) packet).getNpdu();
+                    } else if(packet instanceof BVLCOriginalBroadcastNPDU) {
+                        npdu = ((BVLCOriginalBroadcastNPDU) packet).getNpdu();
+                    } else {
+                        throw new RuntimeException("Unexpected type of packet");
+                    }
+                    final APDU apdu = npdu.getApdu();
+                    if(apdu instanceof APDUConfirmedRequest) {
+                        APDUConfirmedRequest request = (APDUConfirmedRequest) apdu;
+                        final BACnetConfirmedServiceRequest serviceRequest = request.getServiceRequest();
+                        if(serviceRequest instanceof BACnetConfirmedServiceRequestConfirmedCOVNotification) {
+                            BACnetConfirmedServiceRequestConfirmedCOVNotification covNotification = (BACnetConfirmedServiceRequestConfirmedCOVNotification) serviceRequest;
+                            final BACnetTagWithContent[] notifications = covNotification.getNotifications();
+
+                            String objectType = Integer.toString(covNotification.getMonitoredObjectType());
+                            String objectId = Long.toString(covNotification.getMonitoredObjectInstanceNumber());
+
+                            String notificationType = Integer.toString(covNotification.getIssueConfirmedNotificationsType());
+                            String notificationInstanceNumber = Long.toString(covNotification.getMonitoredObjectInstanceNumber());
+
+                            String type = null;
+                            Object value = null;
+                            boolean[] status = null;
+                            for (BACnetTagWithContent notification : notifications) {
+                                // Id of the property that changed
+                                short propertyId = notification.getPropertyIdentifier()[0];
+
+                                // Present-Value has the property id 85
+                                // (This is the actual value to which a given property has changed)
+                                if(propertyId == 85) {
+                                    // Depending on the type of object, parse the data accordingly.
+                                    if (notification.getVal() instanceof BACnetTagApplicationBoolean) {
+                                        type = "boolean";
+                                        final BACnetTagApplicationBoolean val = (BACnetTagApplicationBoolean) notification.getVal();
+
+                                    } else if (notification.getVal() instanceof BACnetTagApplicationUnsignedInteger) {
+                                        type = "uint";
+                                        final BACnetTagApplicationUnsignedInteger val = (BACnetTagApplicationUnsignedInteger) notification.getVal();
+                                        // Convert any number of bytes into an unsigned integer.
+                                        switch (val.getData().length) {
+                                            case 1:
+                                                value = Byte.toString(val.getData()[0]);
+                                                break;
+                                            case 2:
+                                                value = Short.toString(ByteBuffer.wrap(val.getData()).getShort());
+                                                break;
+                                            case 3:
+                                                byte[] extValues = new byte[4];
+                                                extValues[0] = 0x00;
+                                                for(int i = 0; i < 3; i++) {
+                                                    extValues[i+1] = val.getData()[i];
+                                                }
+                                                value = ByteBuffer.wrap(extValues).getInt();
+                                                break;
+                                            default:
+                                                value = "Hurz";
+                                                break;
+                                        }
+                                    } else if (notification.getVal() instanceof BACnetTagApplicationSignedInteger) {
+                                        type = "int";
+                                        final BACnetTagApplicationSignedInteger val = (BACnetTagApplicationSignedInteger) notification.getVal();
+
+                                    } else if (notification.getVal() instanceof BACnetTagApplicationReal) {
+                                        type = "real";
+                                        final BACnetTagApplicationReal val = (BACnetTagApplicationReal) notification.getVal();
+                                        value = Float.intBitsToFloat(ByteBuffer.wrap(val.getData()).getInt());
+                                    } else if (notification.getVal() instanceof BACnetTagApplicationDouble) {
+                                        type = "double";
+                                        final BACnetTagApplicationDouble val = (BACnetTagApplicationDouble) notification.getVal();
+
+                                    } else if (notification.getVal() instanceof BACnetTagApplicationBitString) {
+                                        type = "bit-string";
+                                        final BACnetTagApplicationBitString val = (BACnetTagApplicationBitString) notification.getVal();
+                                        int numBits = (val.getData().length * 8) - val.getUnusedBits();
+                                        BitSet bitSet = BitSet.valueOf(val.getData());
+                                        boolean[] bits = new boolean[numBits];
+                                        for (int i = 0; i < numBits; i++) {
+                                            bits[i] = bitSet.get(i);
+                                        }
+                                        value = bits;
+                                    } else if (notification.getVal() instanceof BACnetTagApplicationEnumerated) {
+                                        type = "enumeration";
+                                        final BACnetTagApplicationEnumerated val = (BACnetTagApplicationEnumerated) notification.getVal();
+
+                                    }
+                                }
+
+                                // Status-Flags have the property id 111
+                                // (This is some additional information passed along)
+                                else if(propertyId == 111) {
+                                    final BACnetTagApplicationBitString val = (BACnetTagApplicationBitString) notification.getVal();
+                                    int numBits = (val.getData().length * 8) - val.getUnusedBits();
+                                    BitSet bitSet = BitSet.valueOf(val.getData());
+                                    boolean[] bits = new boolean[numBits];
+                                    for (int i = 0; i < numBits; i++) {
+                                        bits[i] = bitSet.get(i);
+                                    }
+                                    status = bits;
+                                }
+                            }
+
+                            if(value != null) {
+                                // Create the event object.
+                                Map<String, Object> event = new HashMap<>();
+                                event.put("time", System.currentTimeMillis());
+
+                                event.put("objectType", objectType);
+                                event.put("objectId", objectId);
+                                event.put("notificationType", notificationType);
+                                event.put("notificationInstanceNumber", notificationInstanceNumber);
+
+                                event.put("valueType", type);
+                                event.put("value", value);
+                                event.put("status", status);
+
+                                // Send it to StreamPipes
+                                adapterPipeline.process(event);
+                            }
+                        }
+                    }
+                }
+
+                @Override
+                protected void encode(ChannelHandlerContext ctx, PlcRequestContainer msg, List<Object> out) throws Exception {
+                    // Ignore this as we don't send anything.
+                }
+            });
+            connection.connect();
+        } catch (PlcConnectionException e) {
+            logger.error("An error occurred starting the BACnet/IP driver", e);
+            throw new AdapterException("An error occurred starting the BACnet/IP driver");
+        }
+    }
+
+    @Override
+    public void stopAdapter() throws AdapterException {
+        if(connection != null) {
+            try {
+                connection.close();
+            } catch (PlcConnectionException e) {
+                logger.error("An error occurred stopping the BACnet/IP driver", e);
+                throw new AdapterException("An error occurred stopping the BACnet/IP driver");
+            }
+        }
+    }
+
+    @Override
+    public Adapter getInstance(SpecificAdapterStreamDescription specificAdapterStreamDescription) {
+        return new BacNetIpAdapter(specificAdapterStreamDescription);
+    }
+
+    @Override
+    public String getId() {
+        return ID;
+    }
+
+    public static class BacNetIpAdapterInit extends AdapterWorkerContainer {
+        public static void main(String[] args) {
+            AdapterDeclarerSingleton
+                .getInstance()
+                .add(new BacNetIpAdapter());
+
+            String workerUrl = ConnectWorkerConfig.INSTANCE.getConnectContainerWorkerUrl();
+            String masterUrl = ConnectWorkerConfig.INSTANCE.getConnectContainerMasterUrl();
+            Integer workerPort = ConnectWorkerConfig.INSTANCE.getConnectContainerWorkerPort();
+
+            new BacNetIpAdapterInit().init(workerUrl, masterUrl, workerPort);
+        }
+    }
+
+}
diff --git a/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConfigKeys.java b/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConfigKeys.java
index ecce00839ac..fd70f9f8144 100644
--- a/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConfigKeys.java
+++ b/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConfigKeys.java
@@ -1,31 +1,31 @@
-/*
- * Copyright 2019 FZI Forschungszentrum Informatik
- *
- * Licensed 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.plc4x.java.streampipes.bacnetip.config;
-
-public class ConfigKeys {
-
-    final static String KAFKA_HOST = "SP_KAFKA_HOST";
-    final static String KAFKA_PORT = "SP_KAFKA_PORT";
-
-    final static String CONNECT_CONTAINER_WORKER_HOST = "SP_CONNECT_CONTAINER_WORKER_HOST";
-    final static String CONNECT_CONTAINER_WORKER_PORT = "SP_CONNECT_CONTAINER_WORKER_PORT";
-
-    final static String CONNECT_CONTAINER_MASTER_HOST = "SP_CONNECT_CONTAINER_MASTER_HOST";
-    final static String CONNECT_CONTAINER_MASTER_PORT = "SP_CONNECT_CONTAINER_MASTER_PORT";
-
-}
+/*
+ * Copyright 2019 FZI Forschungszentrum Informatik
+ *
+ * Licensed 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.plc4x.java.streampipes.bacnetip.config;
+
+public class ConfigKeys {
+
+    final static String KAFKA_HOST = "SP_KAFKA_HOST";
+    final static String KAFKA_PORT = "SP_KAFKA_PORT";
+
+    final static String CONNECT_CONTAINER_WORKER_HOST = "SP_CONNECT_CONTAINER_WORKER_HOST";
+    final static String CONNECT_CONTAINER_WORKER_PORT = "SP_CONNECT_CONTAINER_WORKER_PORT";
+
+    final static String CONNECT_CONTAINER_MASTER_HOST = "SP_CONNECT_CONTAINER_MASTER_HOST";
+    final static String CONNECT_CONTAINER_MASTER_PORT = "SP_CONNECT_CONTAINER_MASTER_PORT";
+
+}
diff --git a/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConnectWorkerConfig.java b/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConnectWorkerConfig.java
index 2892a942a04..3bfca9f9263 100644
--- a/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConnectWorkerConfig.java
+++ b/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConnectWorkerConfig.java
@@ -1,83 +1,83 @@
-/*
- * Copyright 2019 FZI Forschungszentrum Informatik
- *
- * Licensed 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.plc4x.java.streampipes.bacnetip.config;
-
-import org.streampipes.config.SpConfig;
-import org.streampipes.connect.init.Config;
-
-public enum ConnectWorkerConfig {
-
-    INSTANCE;
-
-    private SpConfig config;
-
-    ConnectWorkerConfig() {
-        String name = "bacnetip-connect-worker-main";
-        config = SpConfig.getSpConfig(name);
-
-        config.register(ConfigKeys.KAFKA_HOST, "kafka", "Hostname for backend service for kafka");
-        config.register(ConfigKeys.KAFKA_PORT, 9092, "Port for backend service for kafka");
-
-        config.register(ConfigKeys.CONNECT_CONTAINER_WORKER_PORT, Config.WORKER_PORT, "The port of the connect container");
-        config.register(ConfigKeys.CONNECT_CONTAINER_WORKER_HOST, name, "The hostname of the connect container");
-
-        config.register(ConfigKeys.CONNECT_CONTAINER_MASTER_PORT, Config.MASTER_PORT, "The port of the connect container");
-        config.register(ConfigKeys.CONNECT_CONTAINER_MASTER_HOST, Config.MASTER_HOST, "The hostname of the connect container");
-    }
-
-    public String getConnectContainerWorkerUrl() {
-        return "http://" + config.getString(ConfigKeys.CONNECT_CONTAINER_WORKER_HOST) + ":" + config.getInteger(ConfigKeys.CONNECT_CONTAINER_WORKER_PORT) + "/";
-    }
-
-    public String getConnectContainerMasterUrl() {
-        return "http://" + config.getString(ConfigKeys.CONNECT_CONTAINER_MASTER_HOST) + ":" + config.getInteger(ConfigKeys.CONNECT_CONTAINER_MASTER_PORT) + "/";
-    }
-
-    public String getKafkaHost() {
-        return config.getString(ConfigKeys.KAFKA_HOST);
-    }
-
-    public void setKafkaHost(String s) {
-        config.setString(ConfigKeys.KAFKA_HOST, s);
-    }
-
-    public int getKafkaPort() {
-        return config.getInteger(ConfigKeys.KAFKA_PORT);
-    }
-
-    public String getKafkaUrl() {
-        return getKafkaHost() + ":" + getKafkaPort();
-    }
-
-    public String getConnectContainerWorkerHost() {
-        return config.getString(ConfigKeys.CONNECT_CONTAINER_WORKER_HOST);
-    }
-
-    public Integer getConnectContainerWorkerPort() {
-        return config.getInteger(ConfigKeys.CONNECT_CONTAINER_WORKER_PORT);
-    }
-
-    public String getConnectContainerMasterHost() {
-        return config.getString(ConfigKeys.CONNECT_CONTAINER_MASTER_HOST);
-    }
-
-    public Integer getConnectContainerMasterPort() {
-        return config.getInteger(ConfigKeys.CONNECT_CONTAINER_MASTER_PORT);
-    }
-
-}
+/*
+ * Copyright 2019 FZI Forschungszentrum Informatik
+ *
+ * Licensed 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.plc4x.java.streampipes.bacnetip.config;
+
+import org.streampipes.config.SpConfig;
+import org.streampipes.connect.init.Config;
+
+public enum ConnectWorkerConfig {
+
+    INSTANCE;
+
+    private SpConfig config;
+
+    ConnectWorkerConfig() {
+        String name = "bacnetip-connect-worker-main";
+        config = SpConfig.getSpConfig(name);
+
+        config.register(ConfigKeys.KAFKA_HOST, "kafka", "Hostname for backend service for kafka");
+        config.register(ConfigKeys.KAFKA_PORT, 9092, "Port for backend service for kafka");
+
+        config.register(ConfigKeys.CONNECT_CONTAINER_WORKER_PORT, Config.WORKER_PORT, "The port of the connect container");
+        config.register(ConfigKeys.CONNECT_CONTAINER_WORKER_HOST, name, "The hostname of the connect container");
+
+        config.register(ConfigKeys.CONNECT_CONTAINER_MASTER_PORT, Config.MASTER_PORT, "The port of the connect container");
+        config.register(ConfigKeys.CONNECT_CONTAINER_MASTER_HOST, Config.MASTER_HOST, "The hostname of the connect container");
+    }
+
+    public String getConnectContainerWorkerUrl() {
+        return "http://" + config.getString(ConfigKeys.CONNECT_CONTAINER_WORKER_HOST) + ":" + config.getInteger(ConfigKeys.CONNECT_CONTAINER_WORKER_PORT) + "/";
+    }
+
+    public String getConnectContainerMasterUrl() {
+        return "http://" + config.getString(ConfigKeys.CONNECT_CONTAINER_MASTER_HOST) + ":" + config.getInteger(ConfigKeys.CONNECT_CONTAINER_MASTER_PORT) + "/";
+    }
+
+    public String getKafkaHost() {
+        return config.getString(ConfigKeys.KAFKA_HOST);
+    }
+
+    public void setKafkaHost(String s) {
+        config.setString(ConfigKeys.KAFKA_HOST, s);
+    }
+
+    public int getKafkaPort() {
+        return config.getInteger(ConfigKeys.KAFKA_PORT);
+    }
+
+    public String getKafkaUrl() {
+        return getKafkaHost() + ":" + getKafkaPort();
+    }
+
+    public String getConnectContainerWorkerHost() {
+        return config.getString(ConfigKeys.CONNECT_CONTAINER_WORKER_HOST);
+    }
+
+    public Integer getConnectContainerWorkerPort() {
+        return config.getInteger(ConfigKeys.CONNECT_CONTAINER_WORKER_PORT);
+    }
+
+    public String getConnectContainerMasterHost() {
+        return config.getString(ConfigKeys.CONNECT_CONTAINER_MASTER_HOST);
+    }
+
+    public Integer getConnectContainerMasterPort() {
+        return config.getInteger(ConfigKeys.CONNECT_CONTAINER_MASTER_PORT);
+    }
+
+}
diff --git a/sandbox/test-java-bacnetip-driver/pom.xml b/sandbox/test-java-bacnetip-driver/pom.xml
index 7585fe0539e..d59fd43d997 100644
--- a/sandbox/test-java-bacnetip-driver/pom.xml
+++ b/sandbox/test-java-bacnetip-driver/pom.xml
@@ -1,118 +1,118 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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
-  ~
-  ~   http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.sandbox</groupId>
-    <artifactId>plc4x-sandbox</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>test-java-bacnetip-driver</artifactId>
-
-  <name>Sandbox: Test Generated BACNet/IP Driver</name>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.plc4x.plugins</groupId>
-        <artifactId>plc4x-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>generate-driver</goal>
-            </goals>
-            <configuration>
-              <protocolName>bacnetip</protocolName>
-              <languageName>java</languageName>
-              <outputFlavor>read-write</outputFlavor>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-utils-driver-base-java</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base-raw-socket</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-utils-protocol-test-utils</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base-pcap-socket</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <!--scope>test</scope-->
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-build-utils-language-java</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-protocols-bacnetip</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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
+  ~
+  ~   http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.sandbox</groupId>
+    <artifactId>plc4x-sandbox</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>test-java-bacnetip-driver</artifactId>
+
+  <name>Sandbox: Test Generated BACNet/IP Driver</name>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.plc4x.plugins</groupId>
+        <artifactId>plc4x-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>generate-driver</goal>
+            </goals>
+            <configuration>
+              <protocolName>bacnetip</protocolName>
+              <languageName>java</languageName>
+              <outputFlavor>read-write</outputFlavor>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-utils-driver-base-java</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base-raw-socket</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-utils-protocol-test-utils</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base-pcap-socket</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <!--scope>test</scope-->
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-build-utils-language-java</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-protocols-bacnetip</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/PassiveBacNetIpDriver.java b/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/PassiveBacNetIpDriver.java
index 404164041ff..179a2dd8c7d 100644
--- a/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/PassiveBacNetIpDriver.java
+++ b/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/PassiveBacNetIpDriver.java
@@ -1,76 +1,76 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.bacnetip;
-
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.bacnetip.connection.PassiveBacNetIpPlcConnection;
-import org.apache.plc4x.java.bacnetip.protocol.HelloWorldProtocol;
-import org.apache.plc4x.java.spi.PlcDriver;
-import org.apache.plc4x.java.utils.rawsockets.netty.RawSocketIpAddress;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static org.apache.plc4x.java.utils.rawsockets.netty.RawSocketAddress.ALL_PROTOCOLS;
-
-public class PassiveBacNetIpDriver implements PlcDriver {
-
-    public static final int BACNET_IP_PORT = 47808;
-
-    private static final Pattern PASSIVE_BACNET_IP_URI_PATTERN =
-        Pattern.compile("^bachnet-ip-passive://(?<networkDevice>.*)(?<params>\\?.*)?");
-
-    @Override
-    public String getProtocolCode() {
-        return "bacnet-ip";
-    }
-
-    @Override
-    public String getProtocolName() {
-        return "BACnet/IP";
-    }
-
-    @Override
-    public PlcConnection connect(String url) throws PlcConnectionException {
-        Matcher matcher = PASSIVE_BACNET_IP_URI_PATTERN.matcher(url);
-        if (!matcher.matches()) {
-            throw new PlcConnectionException(
-                "Connection url doesn't match the format 'bacnet-ip://{host|ip}'");
-        }
-        String networkDevice = matcher.group("networkDevice");
-
-        String params = matcher.group("params") != null ? matcher.group("params").substring(1) : null;
-
-        try {
-            RawSocketIpAddress rawSocketAddress = new RawSocketIpAddress(
-                networkDevice, ALL_PROTOCOLS, null, BACNET_IP_PORT);
-            return new PassiveBacNetIpPlcConnection(rawSocketAddress, params, new HelloWorldProtocol());
-        } catch (Exception e) {
-            throw new PlcConnectionException("Error connecting to host", e);
-        }
-    }
-
-    @Override
-    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
-        throw new PlcConnectionException("BACnet/IP connections don't support authentication.");
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.bacnetip;
+
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.authentication.PlcAuthentication;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.bacnetip.connection.PassiveBacNetIpPlcConnection;
+import org.apache.plc4x.java.bacnetip.protocol.HelloWorldProtocol;
+import org.apache.plc4x.java.spi.PlcDriver;
+import org.apache.plc4x.java.utils.rawsockets.netty.RawSocketIpAddress;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static org.apache.plc4x.java.utils.rawsockets.netty.RawSocketAddress.ALL_PROTOCOLS;
+
+public class PassiveBacNetIpDriver implements PlcDriver {
+
+    public static final int BACNET_IP_PORT = 47808;
+
+    private static final Pattern PASSIVE_BACNET_IP_URI_PATTERN =
+        Pattern.compile("^bachnet-ip-passive://(?<networkDevice>.*)(?<params>\\?.*)?");
+
+    @Override
+    public String getProtocolCode() {
+        return "bacnet-ip";
+    }
+
+    @Override
+    public String getProtocolName() {
+        return "BACnet/IP";
+    }
+
+    @Override
+    public PlcConnection connect(String url) throws PlcConnectionException {
+        Matcher matcher = PASSIVE_BACNET_IP_URI_PATTERN.matcher(url);
+        if (!matcher.matches()) {
+            throw new PlcConnectionException(
+                "Connection url doesn't match the format 'bacnet-ip://{host|ip}'");
+        }
+        String networkDevice = matcher.group("networkDevice");
+
+        String params = matcher.group("params") != null ? matcher.group("params").substring(1) : null;
+
+        try {
+            RawSocketIpAddress rawSocketAddress = new RawSocketIpAddress(
+                networkDevice, ALL_PROTOCOLS, null, BACNET_IP_PORT);
+            return new PassiveBacNetIpPlcConnection(rawSocketAddress, params, new HelloWorldProtocol());
+        } catch (Exception e) {
+            throw new PlcConnectionException("Error connecting to host", e);
+        }
+    }
+
+    @Override
+    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
+        throw new PlcConnectionException("BACnet/IP connections don't support authentication.");
+    }
+
+}
diff --git a/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/connection/BacNetIpFieldHandler.java b/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/connection/BacNetIpFieldHandler.java
index d7f354d3902..8be3ab94667 100644
--- a/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/connection/BacNetIpFieldHandler.java
+++ b/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/connection/BacNetIpFieldHandler.java
@@ -1,36 +1,36 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.bacnetip.connection;
-
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.bacnetip.model.BacNetIpField;
-import org.apache.plc4x.java.base.connection.DefaultPlcFieldHandler;
-
-public class BacNetIpFieldHandler extends DefaultPlcFieldHandler {
-
-    @Override
-    public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
-        if (BacNetIpField.matches(fieldQuery)) {
-            return BacNetIpField.of(fieldQuery);
-        }
-        throw new PlcInvalidFieldException(fieldQuery);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.bacnetip.connection;
+
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.bacnetip.model.BacNetIpField;
+import org.apache.plc4x.java.base.connection.DefaultPlcFieldHandler;
+
+public class BacNetIpFieldHandler extends DefaultPlcFieldHandler {
+
+    @Override
+    public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
+        if (BacNetIpField.matches(fieldQuery)) {
+            return BacNetIpField.of(fieldQuery);
+        }
+        throw new PlcInvalidFieldException(fieldQuery);
+    }
+
+}
diff --git a/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/connection/PassiveBacNetIpPlcConnection.java b/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/connection/PassiveBacNetIpPlcConnection.java
index 38d8f933aab..72615694941 100644
--- a/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/connection/PassiveBacNetIpPlcConnection.java
+++ b/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/connection/PassiveBacNetIpPlcConnection.java
@@ -1,118 +1,118 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.bacnetip.connection;
-
-import io.netty.channel.*;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.bacnetip.model.BacNetIpField;
-import org.apache.plc4x.java.bacnetip.protocol.BacNetIpProtocol;
-import org.apache.plc4x.java.bacnetip.protocol.HelloWorldProtocol;
-import org.apache.plc4x.java.base.connection.ChannelFactory;
-import org.apache.plc4x.java.base.connection.NettyPlcConnection;
-import org.apache.plc4x.java.base.connection.RawSocketChannelFactory;
-import org.apache.plc4x.java.base.events.ConnectEvent;
-import org.apache.plc4x.java.base.events.ConnectedEvent;
-import org.apache.plc4x.java.base.messages.*;
-import org.apache.plc4x.java.utils.rawsockets.netty.RawSocketAddress;
-import org.apache.plc4x.java.utils.rawsockets.netty.RawSocketIpAddress;
-import org.apache.plc4x.java.utils.rawsockets.netty.UdpIpPacketHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.CompletableFuture;
-
-public class PassiveBacNetIpPlcConnection extends NettyPlcConnection implements PlcReader {
-
-    private static final Logger logger = LoggerFactory.getLogger(PassiveBacNetIpPlcConnection.class);
-
-    private final ChannelHandler handler;
-
-    public PassiveBacNetIpPlcConnection(RawSocketIpAddress address, String params, ChannelHandler handler) {
-        this(new RawSocketChannelFactory(address.getDeviceName(), null,
-            address.getPort(), RawSocketAddress.ALL_PROTOCOLS, new UdpIpPacketHandler()), params, handler);
-    }
-
-    public PassiveBacNetIpPlcConnection(ChannelFactory channelFactory, String params, ChannelHandler handler) {
-        super(channelFactory, true);
-        this.handler = handler;
-    }
-
-    @Override
-    protected void sendChannelCreatedEvent() {
-        // As this type of protocol doesn't require any form of connection, we just send the connected event.
-        channel.pipeline().fireUserEventTriggered(new ConnectedEvent());
-    }
-
-    @Override
-    public PlcField prepareField(String fieldQuery) throws PlcInvalidFieldException {
-        return BacNetIpField.of(fieldQuery);
-    }
-
-    @Override
-    protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
-        return new ChannelInitializer() {
-            @Override
-            protected void initChannel(Channel channel) {
-                // Build the protocol stack for communicating with the s7 protocol.
-                ChannelPipeline pipeline = channel.pipeline();
-                pipeline.addLast(new ChannelInboundHandlerAdapter() {
-                    @Override
-                    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
-                        if (evt instanceof ConnectedEvent) {
-                            sessionSetupCompleteFuture.complete(null);
-                        } else {
-                            super.userEventTriggered(ctx, evt);
-                        }
-                    }
-                });
-                pipeline.addLast(new BacNetIpProtocol());
-                pipeline.addLast(handler);
-            }
-        };
-    }
-
-    @Override
-    public boolean canRead() {
-        return true;
-    }
-
-    @Override
-    public PlcReadRequest.Builder readRequestBuilder() {
-        return new DefaultPlcReadRequest.Builder(this, new BacNetIpFieldHandler());
-    }
-
-    @Override
-    public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
-        InternalPlcReadRequest internalReadRequest = checkInternal(readRequest, InternalPlcReadRequest.class);
-        CompletableFuture<InternalPlcReadResponse> future = new CompletableFuture<>();
-        PlcRequestContainer<InternalPlcReadRequest, InternalPlcReadResponse> container =
-            new PlcRequestContainer<>(internalReadRequest, future);
-        channel.writeAndFlush(container).addListener(f -> {
-            if (!f.isSuccess()) {
-                future.completeExceptionally(f.cause());
-            }
-        });
-        return future
-            .thenApply(PlcReadResponse.class::cast);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.bacnetip.connection;
+
+import io.netty.channel.*;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.bacnetip.model.BacNetIpField;
+import org.apache.plc4x.java.bacnetip.protocol.BacNetIpProtocol;
+import org.apache.plc4x.java.bacnetip.protocol.HelloWorldProtocol;
+import org.apache.plc4x.java.base.connection.ChannelFactory;
+import org.apache.plc4x.java.base.connection.NettyPlcConnection;
+import org.apache.plc4x.java.base.connection.RawSocketChannelFactory;
+import org.apache.plc4x.java.base.events.ConnectEvent;
+import org.apache.plc4x.java.base.events.ConnectedEvent;
+import org.apache.plc4x.java.base.messages.*;
+import org.apache.plc4x.java.utils.rawsockets.netty.RawSocketAddress;
+import org.apache.plc4x.java.utils.rawsockets.netty.RawSocketIpAddress;
+import org.apache.plc4x.java.utils.rawsockets.netty.UdpIpPacketHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.CompletableFuture;
+
+public class PassiveBacNetIpPlcConnection extends NettyPlcConnection implements PlcReader {
+
+    private static final Logger logger = LoggerFactory.getLogger(PassiveBacNetIpPlcConnection.class);
+
+    private final ChannelHandler handler;
+
+    public PassiveBacNetIpPlcConnection(RawSocketIpAddress address, String params, ChannelHandler handler) {
+        this(new RawSocketChannelFactory(address.getDeviceName(), null,
+            address.getPort(), RawSocketAddress.ALL_PROTOCOLS, new UdpIpPacketHandler()), params, handler);
+    }
+
+    public PassiveBacNetIpPlcConnection(ChannelFactory channelFactory, String params, ChannelHandler handler) {
+        super(channelFactory, true);
+        this.handler = handler;
+    }
+
+    @Override
+    protected void sendChannelCreatedEvent() {
+        // As this type of protocol doesn't require any form of connection, we just send the connected event.
+        channel.pipeline().fireUserEventTriggered(new ConnectedEvent());
+    }
+
+    @Override
+    public PlcField prepareField(String fieldQuery) throws PlcInvalidFieldException {
+        return BacNetIpField.of(fieldQuery);
+    }
+
+    @Override
+    protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
+        return new ChannelInitializer() {
+            @Override
+            protected void initChannel(Channel channel) {
+                // Build the protocol stack for communicating with the s7 protocol.
+                ChannelPipeline pipeline = channel.pipeline();
+                pipeline.addLast(new ChannelInboundHandlerAdapter() {
+                    @Override
+                    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+                        if (evt instanceof ConnectedEvent) {
+                            sessionSetupCompleteFuture.complete(null);
+                        } else {
+                            super.userEventTriggered(ctx, evt);
+                        }
+                    }
+                });
+                pipeline.addLast(new BacNetIpProtocol());
+                pipeline.addLast(handler);
+            }
+        };
+    }
+
+    @Override
+    public boolean canRead() {
+        return true;
+    }
+
+    @Override
+    public PlcReadRequest.Builder readRequestBuilder() {
+        return new DefaultPlcReadRequest.Builder(this, new BacNetIpFieldHandler());
+    }
+
+    @Override
+    public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
+        InternalPlcReadRequest internalReadRequest = checkInternal(readRequest, InternalPlcReadRequest.class);
+        CompletableFuture<InternalPlcReadResponse> future = new CompletableFuture<>();
+        PlcRequestContainer<InternalPlcReadRequest, InternalPlcReadResponse> container =
+            new PlcRequestContainer<>(internalReadRequest, future);
+        channel.writeAndFlush(container).addListener(f -> {
+            if (!f.isSuccess()) {
+                future.completeExceptionally(f.cause());
+            }
+        });
+        return future
+            .thenApply(PlcReadResponse.class::cast);
+    }
+
+}
diff --git a/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/model/BacNetIpField.java b/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/model/BacNetIpField.java
index 49f51ea31d0..fb30950c9bd 100644
--- a/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/model/BacNetIpField.java
+++ b/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/model/BacNetIpField.java
@@ -1,47 +1,47 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.bacnetip.model;
-
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.model.PlcField;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class BacNetIpField implements PlcField {
-
-    private static final Pattern ADDRESS_PATTERN =
-        Pattern.compile("^N(?<fileNumber>\\d{1,7}):(?<elementNumber>\\d{1,7})(/(?<bitNumber>\\d{1,7}))?:(?<dataType>[a-zA-Z_]+)(\\[(?<size>\\d+)])?");
-
-    public BacNetIpField() {
-    }
-
-    public static boolean matches(String fieldString) {
-        return ADDRESS_PATTERN.matcher(fieldString).matches();
-    }
-
-    public static BacNetIpField of(String fieldString) {
-        Matcher matcher = ADDRESS_PATTERN.matcher(fieldString);
-        if(matcher.matches()) {
-            return new BacNetIpField();
-        }
-        throw new PlcInvalidFieldException("Unable to parse address: " + fieldString);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.bacnetip.model;
+
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.model.PlcField;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class BacNetIpField implements PlcField {
+
+    private static final Pattern ADDRESS_PATTERN =
+        Pattern.compile("^N(?<fileNumber>\\d{1,7}):(?<elementNumber>\\d{1,7})(/(?<bitNumber>\\d{1,7}))?:(?<dataType>[a-zA-Z_]+)(\\[(?<size>\\d+)])?");
+
+    public BacNetIpField() {
+    }
+
+    public static boolean matches(String fieldString) {
+        return ADDRESS_PATTERN.matcher(fieldString).matches();
+    }
+
+    public static BacNetIpField of(String fieldString) {
+        Matcher matcher = ADDRESS_PATTERN.matcher(fieldString);
+        if(matcher.matches()) {
+            return new BacNetIpField();
+        }
+        throw new PlcInvalidFieldException("Unable to parse address: " + fieldString);
+    }
+
+}
diff --git a/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/protocol/BacNetIpProtocol.java b/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/protocol/BacNetIpProtocol.java
index 34489bc70dd..10746334756 100644
--- a/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/protocol/BacNetIpProtocol.java
+++ b/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/protocol/BacNetIpProtocol.java
@@ -1,62 +1,62 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.bacnetip.protocol;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.bacnetip.readwrite.BVLC;
-import org.apache.plc4x.java.bacnetip.readwrite.io.BVLCIO;
-import org.apache.plc4x.java.base.GeneratedDriverByteToMessageCodec;
-import org.apache.plc4x.java.utils.MessageIO;
-import org.apache.plc4x.java.utils.ParseException;
-import org.apache.plc4x.java.utils.ReadBuffer;
-import org.apache.plc4x.java.utils.WriteBuffer;
-
-public class BacNetIpProtocol extends GeneratedDriverByteToMessageCodec<BVLC> {
-
-    public BacNetIpProtocol() {
-        super(new MessageIO<BVLC, BVLC>() {
-            @Override
-            public BVLC parse(ReadBuffer io) throws ParseException {
-                return BVLCIO.parse(io);
-            }
-
-            @Override
-            public void serialize(WriteBuffer io, BVLC value) throws ParseException {
-                BVLCIO.serialize(io, value);
-            }
-        });
-    }
-
-    @Override
-    protected int getPacketSize(ByteBuf byteBuf) {
-        if(byteBuf.readableBytes() >= 4) {
-            return byteBuf.getUnsignedShort(byteBuf.readerIndex() + 2);
-        }
-        return -1;
-    }
-
-    @Override
-    protected void removeRestOfCorruptPackage(ByteBuf byteBuf) {
-        while (byteBuf.getUnsignedByte(0) != BVLC.BACNETTYPE) {
-            // Just consume the bytes till the next possible start position.
-            byteBuf.readByte();
-        }
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.bacnetip.protocol;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.bacnetip.readwrite.BVLC;
+import org.apache.plc4x.java.bacnetip.readwrite.io.BVLCIO;
+import org.apache.plc4x.java.base.GeneratedDriverByteToMessageCodec;
+import org.apache.plc4x.java.utils.MessageIO;
+import org.apache.plc4x.java.utils.ParseException;
+import org.apache.plc4x.java.utils.ReadBuffer;
+import org.apache.plc4x.java.utils.WriteBuffer;
+
+public class BacNetIpProtocol extends GeneratedDriverByteToMessageCodec<BVLC> {
+
+    public BacNetIpProtocol() {
+        super(new MessageIO<BVLC, BVLC>() {
+            @Override
+            public BVLC parse(ReadBuffer io) throws ParseException {
+                return BVLCIO.parse(io);
+            }
+
+            @Override
+            public void serialize(WriteBuffer io, BVLC value) throws ParseException {
+                BVLCIO.serialize(io, value);
+            }
+        });
+    }
+
+    @Override
+    protected int getPacketSize(ByteBuf byteBuf) {
+        if(byteBuf.readableBytes() >= 4) {
+            return byteBuf.getUnsignedShort(byteBuf.readerIndex() + 2);
+        }
+        return -1;
+    }
+
+    @Override
+    protected void removeRestOfCorruptPackage(ByteBuf byteBuf) {
+        while (byteBuf.getUnsignedByte(0) != BVLC.BACNETTYPE) {
+            // Just consume the bytes till the next possible start position.
+            byteBuf.readByte();
+        }
+    }
+
+}
diff --git a/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/protocol/HelloWorldProtocol.java b/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/protocol/HelloWorldProtocol.java
index 50d4e1e8e5c..0e370800cff 100644
--- a/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/protocol/HelloWorldProtocol.java
+++ b/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/protocol/HelloWorldProtocol.java
@@ -1,72 +1,72 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.bacnetip.protocol;
-
-import io.netty.channel.ChannelHandlerContext;
-import org.apache.plc4x.java.bacnetip.readwrite.*;
-import org.apache.plc4x.java.base.PlcMessageToMessageCodec;
-import org.apache.plc4x.java.base.messages.PlcRequestContainer;
-
-import java.util.List;
-
-public class HelloWorldProtocol extends PlcMessageToMessageCodec<BVLC, PlcRequestContainer> {
-
-    private int packetCount = 0;
-    private long startTime = -1;
-
-    @Override
-    protected void encode(ChannelHandlerContext channelHandlerContext, PlcRequestContainer plcRequestContainer, List<Object> list) throws Exception {
-        System.out.println(plcRequestContainer);
-    }
-
-    @Override
-    protected void decode(ChannelHandlerContext channelHandlerContext, BVLC packet, List<Object> list) throws Exception {
-        if(startTime == -1) {
-            startTime = System.currentTimeMillis();
-        }
-        packetCount++;
-        if(packetCount % 10000 == 0) {
-            long curTime = System.currentTimeMillis();
-            System.out.println("Read " + packetCount + " packets in " + (curTime - startTime) + "ms");
-        }
-/*        if(packet instanceof BVLCOriginalUnicastNPDU) {
-            final NPDU npdu = ((BVLCOriginalUnicastNPDU) packet).getNpdu();
-            final APDU apdu = npdu.getApdu();
-            if(apdu instanceof APDUSimpleAck) {
-                APDUSimpleAck ack = (APDUSimpleAck) apdu;
-                System.out.println("Simple-ACK(" + ack.getOriginalInvokeId() + ")");
-            } else if(apdu instanceof APDUConfirmedRequest) {
-                APDUConfirmedRequest request = (APDUConfirmedRequest) apdu;
-                final BACnetConfirmedServiceRequest serviceRequest = request.getServiceRequest();
-                if(serviceRequest instanceof BACnetConfirmedServiceRequestConfirmedCOVNotification) {
-                    BACnetConfirmedServiceRequestConfirmedCOVNotification covNotification = (BACnetConfirmedServiceRequestConfirmedCOVNotification) serviceRequest;
-                    final BACnetTagWithContent[] notifications = covNotification.getNotifications();
-                    System.out.println("Simple-ACK(" + request.getInvokeId() + "): Confirmed COV Notification [" + notifications.length + "]");
-                } else {
-                    System.out.println("Simple-ACK(" + request.getInvokeId() + "): Other");
-                }
-            } else {
-                System.out.println("Other");
-            }
-        } else {
-            System.out.println("Other");
-        }*/
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.bacnetip.protocol;
+
+import io.netty.channel.ChannelHandlerContext;
+import org.apache.plc4x.java.bacnetip.readwrite.*;
+import org.apache.plc4x.java.base.PlcMessageToMessageCodec;
+import org.apache.plc4x.java.base.messages.PlcRequestContainer;
+
+import java.util.List;
+
+public class HelloWorldProtocol extends PlcMessageToMessageCodec<BVLC, PlcRequestContainer> {
+
+    private int packetCount = 0;
+    private long startTime = -1;
+
+    @Override
+    protected void encode(ChannelHandlerContext channelHandlerContext, PlcRequestContainer plcRequestContainer, List<Object> list) throws Exception {
+        System.out.println(plcRequestContainer);
+    }
+
+    @Override
+    protected void decode(ChannelHandlerContext channelHandlerContext, BVLC packet, List<Object> list) throws Exception {
+        if(startTime == -1) {
+            startTime = System.currentTimeMillis();
+        }
+        packetCount++;
+        if(packetCount % 10000 == 0) {
+            long curTime = System.currentTimeMillis();
+            System.out.println("Read " + packetCount + " packets in " + (curTime - startTime) + "ms");
+        }
+/*        if(packet instanceof BVLCOriginalUnicastNPDU) {
+            final NPDU npdu = ((BVLCOriginalUnicastNPDU) packet).getNpdu();
+            final APDU apdu = npdu.getApdu();
+            if(apdu instanceof APDUSimpleAck) {
+                APDUSimpleAck ack = (APDUSimpleAck) apdu;
+                System.out.println("Simple-ACK(" + ack.getOriginalInvokeId() + ")");
+            } else if(apdu instanceof APDUConfirmedRequest) {
+                APDUConfirmedRequest request = (APDUConfirmedRequest) apdu;
+                final BACnetConfirmedServiceRequest serviceRequest = request.getServiceRequest();
+                if(serviceRequest instanceof BACnetConfirmedServiceRequestConfirmedCOVNotification) {
+                    BACnetConfirmedServiceRequestConfirmedCOVNotification covNotification = (BACnetConfirmedServiceRequestConfirmedCOVNotification) serviceRequest;
+                    final BACnetTagWithContent[] notifications = covNotification.getNotifications();
+                    System.out.println("Simple-ACK(" + request.getInvokeId() + "): Confirmed COV Notification [" + notifications.length + "]");
+                } else {
+                    System.out.println("Simple-ACK(" + request.getInvokeId() + "): Other");
+                }
+            } else {
+                System.out.println("Other");
+            }
+        } else {
+            System.out.println("Other");
+        }*/
+    }
+
+}
diff --git a/sandbox/test-java-bacnetip-driver/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver b/sandbox/test-java-bacnetip-driver/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
index 9c311c9c209..e7c40c66fed 100644
--- a/sandbox/test-java-bacnetip-driver/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
+++ b/sandbox/test-java-bacnetip-driver/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
@@ -1,19 +1,19 @@
-#
-# 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
-#
-#   http://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.
-#
-org.apache.plc4x.java.bacnetip.PassiveBacNetIpDriver
+#
+# 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
+#
+#   http://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.
+#
+org.apache.plc4x.java.bacnetip.PassiveBacNetIpDriver
diff --git a/sandbox/test-java-bacnetip-driver/src/test/java/org/apache/plc4x/java/bacnetip/ManualBacNetDecoder.java b/sandbox/test-java-bacnetip-driver/src/test/java/org/apache/plc4x/java/bacnetip/ManualBacNetDecoder.java
index d7ca1c332c3..625e8c7856c 100644
--- a/sandbox/test-java-bacnetip-driver/src/test/java/org/apache/plc4x/java/bacnetip/ManualBacNetDecoder.java
+++ b/sandbox/test-java-bacnetip-driver/src/test/java/org/apache/plc4x/java/bacnetip/ManualBacNetDecoder.java
@@ -1,35 +1,35 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.bacnetip;
-
-import org.apache.commons.codec.binary.Hex;
-import org.apache.plc4x.java.bacnetip.readwrite.BVLC;
-import org.apache.plc4x.java.bacnetip.readwrite.io.BVLCIO;
-import org.apache.plc4x.java.utils.ReadBuffer;
-
-public class ManualBacNetDecoder {
-
-    public static void main(String[] args) throws Exception {
-        final byte[] bytes = Hex.decodeHex("810a002b01040205790109011c020000142c000002f93a06b24e09552e44434a00002f096f2e8204002f4f");
-        ReadBuffer readBuffer = new ReadBuffer(bytes);
-        final BVLC packet = BVLCIO.parse(readBuffer);
-        System.out.println(packet);
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.bacnetip;
+
+import org.apache.commons.codec.binary.Hex;
+import org.apache.plc4x.java.bacnetip.readwrite.BVLC;
+import org.apache.plc4x.java.bacnetip.readwrite.io.BVLCIO;
+import org.apache.plc4x.java.utils.ReadBuffer;
+
+public class ManualBacNetDecoder {
+
+    public static void main(String[] args) throws Exception {
+        final byte[] bytes = Hex.decodeHex("810a002b01040205790109011c020000142c000002f93a06b24e09552e44434a00002f096f2e8204002f4f");
+        ReadBuffer readBuffer = new ReadBuffer(bytes);
+        final BVLC packet = BVLCIO.parse(readBuffer);
+        System.out.println(packet);
+    }
+
+}
diff --git a/sandbox/test-java-bacnetip-driver/src/test/java/org/apache/plc4x/java/bacnetip/PassiveBacNetIpDriverManual.java b/sandbox/test-java-bacnetip-driver/src/test/java/org/apache/plc4x/java/bacnetip/PassiveBacNetIpDriverManual.java
index 5f803b6f29d..dfd1ca1bffa 100644
--- a/sandbox/test-java-bacnetip-driver/src/test/java/org/apache/plc4x/java/bacnetip/PassiveBacNetIpDriverManual.java
+++ b/sandbox/test-java-bacnetip-driver/src/test/java/org/apache/plc4x/java/bacnetip/PassiveBacNetIpDriverManual.java
@@ -1,42 +1,42 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.java.bacnetip;
-
-import org.apache.plc4x.java.bacnetip.connection.PassiveBacNetIpPlcConnection;
-import org.apache.plc4x.java.bacnetip.protocol.HelloWorldProtocol;
-import org.apache.plc4x.java.base.connection.NettyPlcConnection;
-import org.apache.plc4x.java.base.connection.PcapChannelFactory;
-import org.apache.plc4x.java.utils.pcapsockets.netty.PcapSocketAddress;
-import org.apache.plc4x.java.utils.pcapsockets.netty.PcapSocketChannelConfig;
-import org.apache.plc4x.java.utils.pcapsockets.netty.UdpIpPacketHandler;
-
-import java.io.File;
-
-public class PassiveBacNetIpDriverManual {
-
-    public static void main(String[] args) throws Exception {
-        NettyPlcConnection connection = new PassiveBacNetIpPlcConnection(new PcapChannelFactory(
-            //new File("/Users/christofer.dutz/Projects/Apache/PLC4X-Documents/BacNET/Captures/Merck/BACnetWhoIsRouterToNetwork.pcapng"), null,
-            new File("/Users/christofer.dutz/Downloads/20190906_udp.pcapng"), null,
-            PassiveBacNetIpDriver.BACNET_IP_PORT, PcapSocketAddress.ALL_PROTOCOLS,
-            PcapSocketChannelConfig.SPEED_FAST_DOUBLE, new UdpIpPacketHandler()), "", new HelloWorldProtocol());
-        connection.connect();
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.bacnetip;
+
+import org.apache.plc4x.java.bacnetip.connection.PassiveBacNetIpPlcConnection;
+import org.apache.plc4x.java.bacnetip.protocol.HelloWorldProtocol;
+import org.apache.plc4x.java.base.connection.NettyPlcConnection;
+import org.apache.plc4x.java.base.connection.PcapChannelFactory;
+import org.apache.plc4x.java.utils.pcapsockets.netty.PcapSocketAddress;
+import org.apache.plc4x.java.utils.pcapsockets.netty.PcapSocketChannelConfig;
+import org.apache.plc4x.java.utils.pcapsockets.netty.UdpIpPacketHandler;
+
+import java.io.File;
+
+public class PassiveBacNetIpDriverManual {
+
+    public static void main(String[] args) throws Exception {
+        NettyPlcConnection connection = new PassiveBacNetIpPlcConnection(new PcapChannelFactory(
+            //new File("/Users/christofer.dutz/Projects/Apache/PLC4X-Documents/BacNET/Captures/Merck/BACnetWhoIsRouterToNetwork.pcapng"), null,
+            new File("/Users/christofer.dutz/Downloads/20190906_udp.pcapng"), null,
+            PassiveBacNetIpDriver.BACNET_IP_PORT, PcapSocketAddress.ALL_PROTOCOLS,
+            PcapSocketChannelConfig.SPEED_FAST_DOUBLE, new UdpIpPacketHandler()), "", new HelloWorldProtocol());
+        connection.connect();
+    }
+
+}
diff --git a/sandbox/test-java-df1-driver/README.adoc b/sandbox/test-java-df1-driver/README.adoc
index 69c35090cab..a44c4a32ca6 100644
--- a/sandbox/test-java-df1-driver/README.adoc
+++ b/sandbox/test-java-df1-driver/README.adoc
@@ -1,35 +1,35 @@
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://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.
-//
-
-== Using the Driver in the hello-world example
-
-Add the driver to the pom.xml
-
-        <dependency>
-          <groupId>org.apache.plc4x.sandbox</groupId>
-          <artifactId>test-java-df1-driver</artifactId>
-          <version>0.6.0-SNAPSHOT</version>
-          <scope>runtime</scope>
-        </dependency>
-
-Then start the Hello world (Ideally in IntelliJ) with the following program arguments:
-
-    df1:serial///{com-port-name} {address}
-
-Currently the parsing of addresses is not implemented yet, so it will not work.
-
+//
+//  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
+//
+//      http://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.
+//
+
+== Using the Driver in the hello-world example
+
+Add the driver to the pom.xml
+
+        <dependency>
+          <groupId>org.apache.plc4x.sandbox</groupId>
+          <artifactId>test-java-df1-driver</artifactId>
+          <version>0.6.0-SNAPSHOT</version>
+          <scope>runtime</scope>
+        </dependency>
+
+Then start the Hello world (Ideally in IntelliJ) with the following program arguments:
+
+    df1:serial///{com-port-name} {address}
+
+Currently the parsing of addresses is not implemented yet, so it will not work.
+
 But as soon as that's done, this should work.
\ No newline at end of file
diff --git a/sandbox/test-java-df1-driver/pom.xml b/sandbox/test-java-df1-driver/pom.xml
index 7aff443e074..da551137899 100644
--- a/sandbox/test-java-df1-driver/pom.xml
+++ b/sandbox/test-java-df1-driver/pom.xml
@@ -1,169 +1,169 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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
-  ~
-  ~   http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.sandbox</groupId>
-    <artifactId>plc4x-sandbox</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>test-java-df1-driver</artifactId>
-
-  <name>Sandbox: Test Generated Df1 Driver</name>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.plc4x.plugins</groupId>
-        <artifactId>plc4x-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>generate-driver</goal>
-            </goals>
-            <configuration>
-              <protocolName>df1</protocolName>
-              <languageName>java</languageName>
-              <outputFlavor>read-write</outputFlavor>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base-tcp</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base-serial</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-utils-driver-base-java</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-buffer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-build-utils-language-java</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
-      <scope>provided</scope>
-    </dependency>
-
-  <!--  &lt;!&ndash; https://mvnrepository.com/artifact/org.rxtx/rxtx &ndash;&gt;
-    <dependency>
-      <groupId>org.rxtx</groupId>
-      <artifactId>rxtx</artifactId>
-      <version>2.1.7</version>
-    </dependency>-->
-
-    <dependency>
-      <groupId>com.github.purejavacomm</groupId>
-      <artifactId>purejavacomm</artifactId>
-      <version>1.0.2.RELEASE</version>
-    </dependency>
-
-    <!-- Logging -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>log4j-over-slf4j</artifactId>
-      <version>1.7.25</version>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-protocols-df1</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-utils-protocol-test-utils</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
-      <artifactId>jackson-dataformat-xml</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-launcher</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-  </dependencies>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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
+  ~
+  ~   http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.sandbox</groupId>
+    <artifactId>plc4x-sandbox</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>test-java-df1-driver</artifactId>
+
+  <name>Sandbox: Test Generated Df1 Driver</name>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.plc4x.plugins</groupId>
+        <artifactId>plc4x-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>generate-driver</goal>
+            </goals>
+            <configuration>
+              <protocolName>df1</protocolName>
+              <languageName>java</languageName>
+              <outputFlavor>read-write</outputFlavor>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base-tcp</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base-serial</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-utils-driver-base-java</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-build-utils-language-java</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
+      <scope>provided</scope>
+    </dependency>
+
+  <!--  &lt;!&ndash; https://mvnrepository.com/artifact/org.rxtx/rxtx &ndash;&gt;
+    <dependency>
+      <groupId>org.rxtx</groupId>
+      <artifactId>rxtx</artifactId>
+      <version>2.1.7</version>
+    </dependency>-->
+
+    <dependency>
+      <groupId>com.github.purejavacomm</groupId>
+      <artifactId>purejavacomm</artifactId>
+      <version>1.0.2.RELEASE</version>
+    </dependency>
+
+    <!-- Logging -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.25</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-protocols-df1</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-utils-protocol-test-utils</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-xml</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-launcher</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+
+</project>
diff --git a/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/DF1PlcDriver.java b/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/DF1PlcDriver.java
index c21b5384df8..b8c858e6af9 100644
--- a/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/DF1PlcDriver.java
+++ b/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/DF1PlcDriver.java
@@ -1,74 +1,74 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.df1;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.df1.connection.SerialDf1Connection;
-import org.apache.plc4x.java.spi.PlcDriver;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class DF1PlcDriver implements PlcDriver {
-
-    // TODO there is only serial, I guess?
-    public static final Pattern INET_ADDRESS_PATTERN = Pattern.compile("tcp://(?<host>[\\w.]+)(:(?<port>\\d*))?");
-    public static final Pattern SERIAL_PATTERN = Pattern.compile("serial://(?<serialDefinition>/?[a-zA-Z0-9/]*)");
-    public static final Pattern DF1_URI_PATTERN = Pattern.compile("^df1:(" + INET_ADDRESS_PATTERN + "|" + SERIAL_PATTERN + ")/?" + "(?<params>\\?.*)?");
-
-    @Override
-    public String getProtocolCode() {
-        return "df1";
-    }
-
-    @Override
-    public String getProtocolName() {
-        return "Allen-Bradley DF1";
-    }
-
-    @Override
-    public PlcConnection connect(String url) throws PlcConnectionException {
-        Matcher matcher = DF1_URI_PATTERN.matcher(url);
-        if (!matcher.matches()) {
-            throw new PlcConnectionException(
-                "Connection url doesn't match the format 'df1:{type}//{port|host}'");
-        }
-
-        String host = matcher.group("host");
-        String serialDefinition = matcher.group("serialDefinition");
-        String portString = matcher.group("port");
-        Integer port = StringUtils.isNotBlank(portString) ? Integer.parseInt(portString) : null;
-        String params = matcher.group("params") != null ? matcher.group("params").substring(1) : null;
-
-        if (serialDefinition != null) {
-            return new SerialDf1Connection(serialDefinition, params);
-        } else {
-            throw new PlcConnectionException("TCP DF1 connections not implemented yet.");
-        }
-    }
-
-    @Override
-    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
-        throw new PlcConnectionException("DF1 connections doesn't support authentication.");
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.df1;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.authentication.PlcAuthentication;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.df1.connection.SerialDf1Connection;
+import org.apache.plc4x.java.spi.PlcDriver;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class DF1PlcDriver implements PlcDriver {
+
+    // TODO there is only serial, I guess?
+    public static final Pattern INET_ADDRESS_PATTERN = Pattern.compile("tcp://(?<host>[\\w.]+)(:(?<port>\\d*))?");
+    public static final Pattern SERIAL_PATTERN = Pattern.compile("serial://(?<serialDefinition>/?[a-zA-Z0-9/]*)");
+    public static final Pattern DF1_URI_PATTERN = Pattern.compile("^df1:(" + INET_ADDRESS_PATTERN + "|" + SERIAL_PATTERN + ")/?" + "(?<params>\\?.*)?");
+
+    @Override
+    public String getProtocolCode() {
+        return "df1";
+    }
+
+    @Override
+    public String getProtocolName() {
+        return "Allen-Bradley DF1";
+    }
+
+    @Override
+    public PlcConnection connect(String url) throws PlcConnectionException {
+        Matcher matcher = DF1_URI_PATTERN.matcher(url);
+        if (!matcher.matches()) {
+            throw new PlcConnectionException(
+                "Connection url doesn't match the format 'df1:{type}//{port|host}'");
+        }
+
+        String host = matcher.group("host");
+        String serialDefinition = matcher.group("serialDefinition");
+        String portString = matcher.group("port");
+        Integer port = StringUtils.isNotBlank(portString) ? Integer.parseInt(portString) : null;
+        String params = matcher.group("params") != null ? matcher.group("params").substring(1) : null;
+
+        if (serialDefinition != null) {
+            return new SerialDf1Connection(serialDefinition, params);
+        } else {
+            throw new PlcConnectionException("TCP DF1 connections not implemented yet.");
+        }
+    }
+
+    @Override
+    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
+        throw new PlcConnectionException("DF1 connections doesn't support authentication.");
+    }
+
+}
diff --git a/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/Df1Field.java b/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/Df1Field.java
index 6e6cd6390df..32a9055cee9 100644
--- a/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/Df1Field.java
+++ b/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/Df1Field.java
@@ -1,62 +1,62 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.plc4x.java.df1;
-
-import com.sun.jna.StringArray;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.df1.fields.DataType;
-
-public class Df1Field implements PlcField {
-
-    private final int address;
-    private final int size;
-    private final DataType dataType;
-    private final addressType address_type;
-
-    public Df1Field(int address, int size, DataType dataType, addressType address_type) {
-        this.address = address;
-        this.size = size;
-        this.dataType = dataType;
-        this.address_type = address_type;
-    }
-
-    public int getAddress() {
-        return address;
-    }
-
-    public int getSize() {
-        return size;
-    }
-
-    public DataType getDataType() {
-        return dataType;
-    }
-
-    public addressType getAddress_type() { return address_type; }
-
-    public static PlcField of(String fieldQuery) {
-        String[] tmp = fieldQuery.split(":");
-        return new Df1Field(Integer.parseInt(tmp[0]), DataType.valueOf(tmp[1]).getLength(),DataType.valueOf(tmp[1]), addressType.OFFSET);
-    }
-
-    public enum addressType {
-        OFFSET,
-        LOGICAL
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.plc4x.java.df1;
+
+import com.sun.jna.StringArray;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.df1.fields.DataType;
+
+public class Df1Field implements PlcField {
+
+    private final int address;
+    private final int size;
+    private final DataType dataType;
+    private final addressType address_type;
+
+    public Df1Field(int address, int size, DataType dataType, addressType address_type) {
+        this.address = address;
+        this.size = size;
+        this.dataType = dataType;
+        this.address_type = address_type;
+    }
+
+    public int getAddress() {
+        return address;
+    }
+
+    public int getSize() {
+        return size;
+    }
+
+    public DataType getDataType() {
+        return dataType;
+    }
+
+    public addressType getAddress_type() { return address_type; }
+
+    public static PlcField of(String fieldQuery) {
+        String[] tmp = fieldQuery.split(":");
+        return new Df1Field(Integer.parseInt(tmp[0]), DataType.valueOf(tmp[1]).getLength(),DataType.valueOf(tmp[1]), addressType.OFFSET);
+    }
+
+    public enum addressType {
+        OFFSET,
+        LOGICAL
+    }
+}
diff --git a/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/connection/BaseDf1Connection.java b/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/connection/BaseDf1Connection.java
index 6f09c02aa3e..cca2783c3da 100644
--- a/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/connection/BaseDf1Connection.java
+++ b/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/connection/BaseDf1Connection.java
@@ -1,34 +1,34 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.df1.connection;
-
-import org.apache.plc4x.java.base.connection.ChannelFactory;
-import org.apache.plc4x.java.base.connection.NettyPlcConnection;
-
-public abstract class BaseDf1Connection extends NettyPlcConnection {
-
-    public BaseDf1Connection(ChannelFactory channelFactory) {
-        super(channelFactory);
-    }
-
-    public BaseDf1Connection(ChannelFactory channelFactory, boolean awaitSessionSetupComplete) {
-        super(channelFactory, awaitSessionSetupComplete);
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.df1.connection;
+
+import org.apache.plc4x.java.base.connection.ChannelFactory;
+import org.apache.plc4x.java.base.connection.NettyPlcConnection;
+
+public abstract class BaseDf1Connection extends NettyPlcConnection {
+
+    public BaseDf1Connection(ChannelFactory channelFactory) {
+        super(channelFactory);
+    }
+
+    public BaseDf1Connection(ChannelFactory channelFactory, boolean awaitSessionSetupComplete) {
+        super(channelFactory, awaitSessionSetupComplete);
+    }
+
+}
diff --git a/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/connection/SerialDf1Connection.java b/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/connection/SerialDf1Connection.java
index 6b738defd66..e1cf52eb70c 100644
--- a/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/connection/SerialDf1Connection.java
+++ b/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/connection/SerialDf1Connection.java
@@ -1,148 +1,148 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.df1.connection;
-
-import io.netty.channel.*;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.messages.PlcWriteResponse;
-import org.apache.plc4x.java.base.connection.ChannelFactory;
-import org.apache.plc4x.java.serial.connection.connection.SerialChannelFactory;
-import org.apache.plc4x.java.base.events.ConnectedEvent;
-import org.apache.plc4x.java.base.messages.*;
-import org.apache.plc4x.java.df1.protocol.Df1Protocol;
-import org.apache.plc4x.java.df1.protocol.Plc4XDf1Protocol;
-import org.apache.plc4x.java.df1.util.Df1FieldHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.CompletableFuture;
-
-public class SerialDf1Connection extends BaseDf1Connection implements PlcReader, PlcWriter {
-
-    private static final Logger logger = LoggerFactory.getLogger(SerialDf1Connection.class);
-
-    private short localAddr;
-    private short remoteAddr;
-
-    public SerialDf1Connection(String comPortName, String params) {
-        this(new SerialChannelFactory(comPortName), params);
-    }
-
-    public SerialDf1Connection(ChannelFactory channelFactory, String params) {
-        super(channelFactory, false);
-        this.localAddr = (short) 0x00;
-        this.remoteAddr = (short) 0x09;
-
-        // Override some of the settings, if they are asked for.
-        if (!StringUtils.isEmpty(params)) {
-            for (String param : params.split("&")) {
-                String[] paramElements = param.split("=");
-                String paramName = paramElements[0];
-                if (paramElements.length == 2) {
-                    String paramValue = paramElements[1];
-                    switch (paramName) {
-                        case "local-addr":
-                            this.localAddr = Short.parseShort(paramValue);
-                            break;
-                        case "remote-addr":
-                            this.remoteAddr = Short.parseShort(paramValue);
-                            break;
-                        default:
-                            logger.debug("Unknown parameter {} with value {}", paramName, paramValue);
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    public boolean canRead() {
-        return true;
-    }
-
-    @Override
-    public boolean canWrite() {
-        return true;
-    }
-
-    @Override
-    protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
-        return new ChannelInitializer() {
-            @Override
-            protected void initChannel(Channel channel) {
-                // Build the protocol stack for communicating with the s7 protocol.
-                ChannelPipeline pipeline = channel.pipeline();
-                pipeline.addLast(new ChannelInboundHandlerAdapter() {
-                    @Override
-                    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
-                        if (evt instanceof ConnectedEvent) {
-                            sessionSetupCompleteFuture.complete(null);
-                        } else {
-                            super.userEventTriggered(ctx, evt);
-                        }
-                    }
-                });
-                pipeline.addLast(new Df1Protocol(localAddr, remoteAddr));
-                pipeline.addLast(new Plc4XDf1Protocol());
-            }
-        };
-    }
-
-    @Override
-    public PlcReadRequest.Builder readRequestBuilder() {
-        return new DefaultPlcReadRequest.Builder(this, new Df1FieldHandler());
-    }
-
-    @Override
-    public PlcWriteRequest.Builder writeRequestBuilder() {
-        return new DefaultPlcWriteRequest.Builder(this, new Df1FieldHandler());
-    }
-
-    @Override
-    public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
-        CompletableFuture<InternalPlcReadResponse> future = new CompletableFuture<>();
-        PlcRequestContainer<InternalPlcReadRequest, InternalPlcReadResponse> container =
-            new PlcRequestContainer<>((InternalPlcReadRequest) readRequest, future);
-        channel.writeAndFlush(container).addListener(f -> {
-            if (!f.isSuccess()) {
-                future.completeExceptionally(f.cause());
-            }
-        });
-        return future
-            .thenApply(PlcReadResponse.class::cast);
-    }
-
-    @Override
-    public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
-        CompletableFuture<InternalPlcWriteResponse> future = new CompletableFuture<>();
-        PlcRequestContainer<InternalPlcWriteRequest, InternalPlcWriteResponse> container =
-            new PlcRequestContainer<>((InternalPlcWriteRequest) writeRequest, future);
-        channel.writeAndFlush(container).addListener(f -> {
-            if (!f.isSuccess()) {
-                future.completeExceptionally(f.cause());
-            }
-        });
-        return future
-            .thenApply(PlcWriteResponse.class::cast);
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.df1.connection;
+
+import io.netty.channel.*;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteResponse;
+import org.apache.plc4x.java.base.connection.ChannelFactory;
+import org.apache.plc4x.java.serial.connection.connection.SerialChannelFactory;
+import org.apache.plc4x.java.base.events.ConnectedEvent;
+import org.apache.plc4x.java.base.messages.*;
+import org.apache.plc4x.java.df1.protocol.Df1Protocol;
+import org.apache.plc4x.java.df1.protocol.Plc4XDf1Protocol;
+import org.apache.plc4x.java.df1.util.Df1FieldHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.CompletableFuture;
+
+public class SerialDf1Connection extends BaseDf1Connection implements PlcReader, PlcWriter {
+
+    private static final Logger logger = LoggerFactory.getLogger(SerialDf1Connection.class);
+
+    private short localAddr;
+    private short remoteAddr;
+
+    public SerialDf1Connection(String comPortName, String params) {
+        this(new SerialChannelFactory(comPortName), params);
+    }
+
+    public SerialDf1Connection(ChannelFactory channelFactory, String params) {
+        super(channelFactory, false);
+        this.localAddr = (short) 0x00;
+        this.remoteAddr = (short) 0x09;
+
+        // Override some of the settings, if they are asked for.
+        if (!StringUtils.isEmpty(params)) {
+            for (String param : params.split("&")) {
+                String[] paramElements = param.split("=");
+                String paramName = paramElements[0];
+                if (paramElements.length == 2) {
+                    String paramValue = paramElements[1];
+                    switch (paramName) {
+                        case "local-addr":
+                            this.localAddr = Short.parseShort(paramValue);
+                            break;
+                        case "remote-addr":
+                            this.remoteAddr = Short.parseShort(paramValue);
+                            break;
+                        default:
+                            logger.debug("Unknown parameter {} with value {}", paramName, paramValue);
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public boolean canRead() {
+        return true;
+    }
+
+    @Override
+    public boolean canWrite() {
+        return true;
+    }
+
+    @Override
+    protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
+        return new ChannelInitializer() {
+            @Override
+            protected void initChannel(Channel channel) {
+                // Build the protocol stack for communicating with the s7 protocol.
+                ChannelPipeline pipeline = channel.pipeline();
+                pipeline.addLast(new ChannelInboundHandlerAdapter() {
+                    @Override
+                    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+                        if (evt instanceof ConnectedEvent) {
+                            sessionSetupCompleteFuture.complete(null);
+                        } else {
+                            super.userEventTriggered(ctx, evt);
+                        }
+                    }
+                });
+                pipeline.addLast(new Df1Protocol(localAddr, remoteAddr));
+                pipeline.addLast(new Plc4XDf1Protocol());
+            }
+        };
+    }
+
+    @Override
+    public PlcReadRequest.Builder readRequestBuilder() {
+        return new DefaultPlcReadRequest.Builder(this, new Df1FieldHandler());
+    }
+
+    @Override
+    public PlcWriteRequest.Builder writeRequestBuilder() {
+        return new DefaultPlcWriteRequest.Builder(this, new Df1FieldHandler());
+    }
+
+    @Override
+    public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
+        CompletableFuture<InternalPlcReadResponse> future = new CompletableFuture<>();
+        PlcRequestContainer<InternalPlcReadRequest, InternalPlcReadResponse> container =
+            new PlcRequestContainer<>((InternalPlcReadRequest) readRequest, future);
+        channel.writeAndFlush(container).addListener(f -> {
+            if (!f.isSuccess()) {
+                future.completeExceptionally(f.cause());
+            }
+        });
+        return future
+            .thenApply(PlcReadResponse.class::cast);
+    }
+
+    @Override
+    public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
+        CompletableFuture<InternalPlcWriteResponse> future = new CompletableFuture<>();
+        PlcRequestContainer<InternalPlcWriteRequest, InternalPlcWriteResponse> container =
+            new PlcRequestContainer<>((InternalPlcWriteRequest) writeRequest, future);
+        channel.writeAndFlush(container).addListener(f -> {
+            if (!f.isSuccess()) {
+                future.completeExceptionally(f.cause());
+            }
+        });
+        return future
+            .thenApply(PlcWriteResponse.class::cast);
+    }
+
+}
diff --git a/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/fields/DataType.java b/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/fields/DataType.java
index 326597c6a5a..2af4c17b17f 100644
--- a/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/fields/DataType.java
+++ b/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/fields/DataType.java
@@ -1,44 +1,44 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.df1.fields;
-
-public enum DataType {
-    BIT((short)1),
-    BIT_STRING((short)-1),
-    BYTE_STRING((short)-1),
-    INTEGER((short)2),
-    TIMER((short)-1),
-    COUNTER((short)-1),
-    GENERAL_COUNT_STRUCTURE((short)-1),
-    FLOAT((short)-1),
-    ARRAY((short)-1),
-    ADDRESS((short)-1),
-    BINARY_CODED_DECIMAL((short)-1);
-
-    private final short length;
-
-    DataType(short length) {
-        this.length = length;
-    }
-
-    public short getLength() {
-        return length;
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.df1.fields;
+
+public enum DataType {
+    BIT((short)1),
+    BIT_STRING((short)-1),
+    BYTE_STRING((short)-1),
+    INTEGER((short)2),
+    TIMER((short)-1),
+    COUNTER((short)-1),
+    GENERAL_COUNT_STRUCTURE((short)-1),
+    FLOAT((short)-1),
+    ARRAY((short)-1),
+    ADDRESS((short)-1),
+    BINARY_CODED_DECIMAL((short)-1);
+
+    private final short length;
+
+    DataType(short length) {
+        this.length = length;
+    }
+
+    public short getLength() {
+        return length;
+    }
+
+}
diff --git a/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/protocol/Df1Protocol.java b/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/protocol/Df1Protocol.java
index 6ce72d24c1e..0686bc38ac3 100644
--- a/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/protocol/Df1Protocol.java
+++ b/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/protocol/Df1Protocol.java
@@ -1,157 +1,157 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.df1.protocol;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufUtil;
-import io.netty.channel.ChannelHandlerContext;
-import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
-import org.apache.plc4x.java.base.PlcByteToMessageCodec;
-import org.apache.plc4x.java.df1.readwrite.DF1Command;
-import org.apache.plc4x.java.df1.readwrite.DF1Symbol;
-import org.apache.plc4x.java.df1.readwrite.DF1SymbolMessageFrame;
-import org.apache.plc4x.java.df1.readwrite.io.DF1SymbolIO;
-import org.apache.plc4x.java.utils.ReadBuffer;
-import org.apache.plc4x.java.utils.WriteBuffer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-
-public class Df1Protocol extends PlcByteToMessageCodec<DF1Command> {
-
-    private static final Logger logger = LoggerFactory.getLogger(Df1Protocol.class);
-
-    private final short localAddr;
-    private final short remoteAddr;
-    private final DF1SymbolIO df1SymbolIO;
-
-    public Df1Protocol(short localAddr, short remoteAddr) {
-        this.localAddr = localAddr;
-        this.remoteAddr = remoteAddr;
-        df1SymbolIO = new DF1SymbolIO();
-    }
-
-    @Override
-    public void channelActive(ChannelHandlerContext ctx) throws Exception {
-    }
-
-    @Override
-    protected void encode(ChannelHandlerContext ctx, DF1Command msg, ByteBuf out) throws Exception {
-        // Create a new df1 frame for transmitting the command
-        DF1SymbolMessageFrame frame = new DF1SymbolMessageFrame(remoteAddr, localAddr, msg);
-
-        // Serialize the message
-        WriteBuffer writeBuffer = new WriteBuffer(frame.getLengthInBytes(), false);
-        df1SymbolIO.serialize(writeBuffer, frame);
-        byte[] data = writeBuffer.getData();
-
-        // Send the serialized data
-        // ctx.writeAndFlush(data);
-        out.writeBytes(data);
-    }
-
-    @Override
-    protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
-        DF1Symbol resp;
-
-//        do {
-
-            in.markReaderIndex();
-
-            short size = 0x00;
-
-            // Yes, it's a little complicated, but we need to find out if we've got enough data.
-            if (in.readableBytes() > 1) {
-                if (in.getUnsignedByte(0) != (short) 0x10) {
-                    logger.warn("Expecting DF1 magic number: {}", 0x10);
-                    if (logger.isDebugEnabled()) {
-                        logger.debug("Got Data: {}", ByteBufUtil.hexDump(in));
-                    }
-                    exceptionCaught(ctx, new PlcProtocolException(
-                        String.format("Expecting DF1 magic number: %02X", 0x10)));
-                    return;
-                }
-
-                short symbolType = in.getUnsignedByte(1);
-                switch (symbolType) {
-                    case (short) 0x02: {
-                        if (in.readableBytes() < 5) {
-                            return;
-                        }
-                        short commandType = in.getUnsignedByte(4);
-                        switch (commandType) {
-                            case (short) 0x01: {
-                                if (in.readableBytes() < 11) {
-                                    return;
-                                }
-                                break;
-                            }
-                            case (short) 0x41: {
-                            /*int transactionCounter = in.getUnsignedShort(6);
-                            if(!readRequestSizes.containsKey(transactionCounter)) {
-                                logger.warn("Unknown transaction counter: {}", transactionCounter);
-                                if (logger.isDebugEnabled()) {
-                                    logger.debug("Got Data: {}", ByteBufUtil.hexDump(in));
-                                }
-                                exceptionCaught(ctx, new PlcProtocolException(
-                                    String.format("Unknown transaction counte: %04X", transactionCounter)));
-                                return;
-                            }
-                            size = readRequestSizes.remove(transactionCounter);
-                            if(in.readableBytes() < 8 + size) {
-                                return;
-                            }*/
-                                // TODO: Let's just assume all is good for now ...
-                                break;
-                            }
-                        }
-                        break;
-                    }
-                    case (short) 0x03: {
-                        if (in.readableBytes() < 4) {
-                            return;
-                        }
-                        break;
-                    }
-                }
-            }
-
-            // Parse the message received from the DF1 device
-            byte[] data = new byte[in.readableBytes()];
-            in.readBytes(data);
-            ReadBuffer readBuffer = new ReadBuffer(data, false);
-
-            resp = df1SymbolIO.parse(readBuffer);
-
-//        } while (readWasSucessfull);
-//        // TODO if unableto read
-//        in.resetReaderIndex();
-
-        // Add the received message to the output
-        out.add(resp);
-    }
-
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        cause.printStackTrace();
-        ctx.close();
-        //super.exceptionCaught(ctx, cause);
-    }
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.df1.protocol;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.channel.ChannelHandlerContext;
+import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
+import org.apache.plc4x.java.base.PlcByteToMessageCodec;
+import org.apache.plc4x.java.df1.readwrite.DF1Command;
+import org.apache.plc4x.java.df1.readwrite.DF1Symbol;
+import org.apache.plc4x.java.df1.readwrite.DF1SymbolMessageFrame;
+import org.apache.plc4x.java.df1.readwrite.io.DF1SymbolIO;
+import org.apache.plc4x.java.utils.ReadBuffer;
+import org.apache.plc4x.java.utils.WriteBuffer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+public class Df1Protocol extends PlcByteToMessageCodec<DF1Command> {
+
+    private static final Logger logger = LoggerFactory.getLogger(Df1Protocol.class);
+
+    private final short localAddr;
+    private final short remoteAddr;
+    private final DF1SymbolIO df1SymbolIO;
+
+    public Df1Protocol(short localAddr, short remoteAddr) {
+        this.localAddr = localAddr;
+        this.remoteAddr = remoteAddr;
+        df1SymbolIO = new DF1SymbolIO();
+    }
+
+    @Override
+    public void channelActive(ChannelHandlerContext ctx) throws Exception {
+    }
+
+    @Override
+    protected void encode(ChannelHandlerContext ctx, DF1Command msg, ByteBuf out) throws Exception {
+        // Create a new df1 frame for transmitting the command
+        DF1SymbolMessageFrame frame = new DF1SymbolMessageFrame(remoteAddr, localAddr, msg);
+
+        // Serialize the message
+        WriteBuffer writeBuffer = new WriteBuffer(frame.getLengthInBytes(), false);
+        df1SymbolIO.serialize(writeBuffer, frame);
+        byte[] data = writeBuffer.getData();
+
+        // Send the serialized data
+        // ctx.writeAndFlush(data);
+        out.writeBytes(data);
+    }
+
+    @Override
+    protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
+        DF1Symbol resp;
+
+//        do {
+
+            in.markReaderIndex();
+
+            short size = 0x00;
+
+            // Yes, it's a little complicated, but we need to find out if we've got enough data.
+            if (in.readableBytes() > 1) {
+                if (in.getUnsignedByte(0) != (short) 0x10) {
+                    logger.warn("Expecting DF1 magic number: {}", 0x10);
+                    if (logger.isDebugEnabled()) {
+                        logger.debug("Got Data: {}", ByteBufUtil.hexDump(in));
+                    }
+                    exceptionCaught(ctx, new PlcProtocolException(
+                        String.format("Expecting DF1 magic number: %02X", 0x10)));
+                    return;
+                }
+
+                short symbolType = in.getUnsignedByte(1);
+                switch (symbolType) {
+                    case (short) 0x02: {
+                        if (in.readableBytes() < 5) {
+                            return;
+                        }
+                        short commandType = in.getUnsignedByte(4);
+                        switch (commandType) {
+                            case (short) 0x01: {
+                                if (in.readableBytes() < 11) {
+                                    return;
+                                }
+                                break;
+                            }
+                            case (short) 0x41: {
+                            /*int transactionCounter = in.getUnsignedShort(6);
+                            if(!readRequestSizes.containsKey(transactionCounter)) {
+                                logger.warn("Unknown transaction counter: {}", transactionCounter);
+                                if (logger.isDebugEnabled()) {
+                                    logger.debug("Got Data: {}", ByteBufUtil.hexDump(in));
+                                }
+                                exceptionCaught(ctx, new PlcProtocolException(
+                                    String.format("Unknown transaction counte: %04X", transactionCounter)));
+                                return;
+                            }
+                            size = readRequestSizes.remove(transactionCounter);
+                            if(in.readableBytes() < 8 + size) {
+                                return;
+                            }*/
+                                // TODO: Let's just assume all is good for now ...
+                                break;
+                            }
+                        }
+                        break;
+                    }
+                    case (short) 0x03: {
+                        if (in.readableBytes() < 4) {
+                            return;
+                        }
+                        break;
+                    }
+                }
+            }
+
+            // Parse the message received from the DF1 device
+            byte[] data = new byte[in.readableBytes()];
+            in.readBytes(data);
+            ReadBuffer readBuffer = new ReadBuffer(data, false);
+
+            resp = df1SymbolIO.parse(readBuffer);
+
+//        } while (readWasSucessfull);
+//        // TODO if unableto read
+//        in.resetReaderIndex();
+
+        // Add the received message to the output
+        out.add(resp);
+    }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+        cause.printStackTrace();
+        ctx.close();
+        //super.exceptionCaught(ctx, cause);
+    }
+}
diff --git a/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/protocol/Plc4XDf1Protocol.java b/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/protocol/Plc4XDf1Protocol.java
index d169dca4c79..729cdda2d38 100644
--- a/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/protocol/Plc4XDf1Protocol.java
+++ b/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/protocol/Plc4XDf1Protocol.java
@@ -1,172 +1,172 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.df1.protocol;
-
-import io.netty.channel.ChannelHandlerContext;
-import org.apache.commons.lang3.NotImplementedException;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcRequest;
-import org.apache.plc4x.java.api.messages.PlcResponse;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.base.PlcMessageToMessageCodec;
-import org.apache.plc4x.java.base.messages.DefaultPlcReadResponse;
-import org.apache.plc4x.java.base.messages.InternalPlcReadRequest;
-import org.apache.plc4x.java.base.messages.PlcRequestContainer;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-import org.apache.plc4x.java.base.messages.items.DefaultIntegerFieldItem;
-import org.apache.plc4x.java.df1.*;
-import org.apache.plc4x.java.df1.readwrite.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class Plc4XDf1Protocol extends PlcMessageToMessageCodec<DF1Symbol, PlcRequestContainer> {
-
-    private static final Logger logger = LoggerFactory.getLogger(Plc4XDf1Protocol.class);
-
-    private final AtomicInteger transactionId = new AtomicInteger(1);
-    private Map<Integer, PlcRequestContainer> requests = new ConcurrentHashMap<>();
-
-    @Override
-    protected void encode(ChannelHandlerContext ctx, PlcRequestContainer msg, List<Object> out) throws Exception {
-        logger.trace("Received Request {} to send out", msg);
-        if (msg.getRequest() instanceof PlcReadRequest) {
-            for (PlcField field : ((PlcReadRequest) msg.getRequest()).getFields()) {
-                if (!(field instanceof Df1Field)) {
-                    throw new IllegalArgumentException("Invalid field type found inside Df1 Request");
-                }
-                int address = ((Df1Field) field).getAddress();
-                short size = ((Df1Field) field).getDataType().getLength();
-                int transactionId = this.transactionId.getAndIncrement();
-                while (((transactionId & 0xFF) == 0x10) || (((transactionId >>> 8) & 0xFF) == 0x10)) {
-                    // prevent that one of the transactionID bytes is 0x10, which has to be escaped by double 0x10 and makes life a lot harder
-                    transactionId = this.transactionId.getAndIncrement();
-                }
-                logger.debug("Creating request for offset {}, with length {} and transaction id {}", address, size, transactionId);
-
-                requests.put(transactionId, msg);
-
-                switch (((Df1Field) field).getAddress_type()) {
-                    case OFFSET:
-                        out.add(new DF1UnprotectedReadRequest((short) 0x00, (short)transactionId, address, size));
-                        break;
-                    case LOGICAL:
-                        // TODO: add 'protected typed logical read' to mspec
-                        throw new NotImplementedException("not yet implemented in mspec");
-                }
-
-            }
-        } else {
-            throw new IllegalStateException("This should not happen!");
-        }
-    }
-
-    @Override
-    protected void decode(ChannelHandlerContext ctx, DF1Symbol msg, List<Object> out) throws Exception {
-        logger.debug("Received DF1 Command incoming {}", msg);
-
-        if (msg instanceof DF1SymbolMessageFrameNAK) {
-            logger.warn("Received a response NAK, notify all requests");
-            for (Map.Entry<Integer, PlcRequestContainer> entry : requests.entrySet()) {
-                entry.getValue().getResponseFuture().complete(
-                    new DefaultPlcReadResponse(
-                        ((InternalPlcReadRequest) entry.getValue().getRequest()),
-                        Collections.singletonMap("erster", Pair.of(PlcResponseCode.INTERNAL_ERROR, new DefaultIntegerFieldItem(-1)))
-                    ));
-            }
-            return;
-        } else if (msg instanceof DF1SymbolMessageFrameACK) {
-            logger.warn("Received a response ACK :D");
-            return;
-        }
-
-        assert msg instanceof DF1SymbolMessageFrame;
-
-        DF1Command command = ((DF1SymbolMessageFrame) msg).getCommand();
-        int transactionId = command.getTransactionCounter();
-        if (!requests.containsKey(transactionId)) {
-            logger.warn("Received a response to unknown transaction id {}", transactionId);
-            ctx.fireExceptionCaught(new RuntimeException("Received a response to unknown transaction id"));
-            ctx.close();
-            return;
-        }
-        // As every response has a matching request, get this request based on the tpdu.
-        PlcRequestContainer requestContainer = requests.remove(transactionId);
-        PlcRequest request = requestContainer.getRequest();
-
-        // Handle the response.
-        PlcResponse response = null;
-        if (request instanceof PlcReadRequest) {
-            /*
-            Things to do
-            - check response code (if there is something like that?
-            - cast the bytes to right datatype
-            - create Response
-             */
-            // We can do this as we have only one fieldName in DF1
-            final String fieldName = ((PlcReadRequest) request).getFieldNames().iterator().next();
-            // TODO can there be another code than ok?
-            final PlcResponseCode responseCode = PlcResponseCode.OK;
-            // TODO maybe check for different status bytes
-            final Df1Field field = (Df1Field) ((PlcReadRequest) request).getField(fieldName);
-            // Cast byte and create response item
-            BaseDefaultFieldItem responseItem = null;
-            short[] data = ((DF1UnprotectedReadResponse)command).getData();
-            switch (field.getDataType()) {
-                case BIT:
-                    break;
-                case INTEGER:
-                    // TODO: type conversion is untested
-                    responseItem = new DefaultIntegerFieldItem((int)data[0] + ((int) data[1] << 8));
-                    break;
-                case FLOAT:
-                    break;
-                case BIT_STRING:
-                    break;
-                case ARRAY:
-                    break;
-                // TODO add all other cases here...
-                default:
-                    throw new NotImplementedException("The DataType " + field.getDataType() + " is currently not implemented!");
-            }
-            response = new DefaultPlcReadResponse(((InternalPlcReadRequest) request),
-                Collections.singletonMap(fieldName,
-                    Pair.of(responseCode, responseItem)));
-        } else if (request instanceof PlcWriteRequest) {
-            logger.warn("Writing is currently not implemented but received a write response?!");
-            ctx.close();
-            throw new NotImplementedException("This is currently not implemented!");
-        }
-
-        // Confirm the response being handled.
-        if (response != null) {
-            requestContainer.getResponseFuture().complete(response);
-        }
-    }
-
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.df1.protocol;
+
+import io.netty.channel.ChannelHandlerContext;
+import org.apache.commons.lang3.NotImplementedException;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcRequest;
+import org.apache.plc4x.java.api.messages.PlcResponse;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.base.PlcMessageToMessageCodec;
+import org.apache.plc4x.java.base.messages.DefaultPlcReadResponse;
+import org.apache.plc4x.java.base.messages.InternalPlcReadRequest;
+import org.apache.plc4x.java.base.messages.PlcRequestContainer;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+import org.apache.plc4x.java.base.messages.items.DefaultIntegerFieldItem;
+import org.apache.plc4x.java.df1.*;
+import org.apache.plc4x.java.df1.readwrite.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class Plc4XDf1Protocol extends PlcMessageToMessageCodec<DF1Symbol, PlcRequestContainer> {
+
+    private static final Logger logger = LoggerFactory.getLogger(Plc4XDf1Protocol.class);
+
+    private final AtomicInteger transactionId = new AtomicInteger(1);
+    private Map<Integer, PlcRequestContainer> requests = new ConcurrentHashMap<>();
+
+    @Override
+    protected void encode(ChannelHandlerContext ctx, PlcRequestContainer msg, List<Object> out) throws Exception {
+        logger.trace("Received Request {} to send out", msg);
+        if (msg.getRequest() instanceof PlcReadRequest) {
+            for (PlcField field : ((PlcReadRequest) msg.getRequest()).getFields()) {
+                if (!(field instanceof Df1Field)) {
+                    throw new IllegalArgumentException("Invalid field type found inside Df1 Request");
+                }
+                int address = ((Df1Field) field).getAddress();
+                short size = ((Df1Field) field).getDataType().getLength();
+                int transactionId = this.transactionId.getAndIncrement();
+                while (((transactionId & 0xFF) == 0x10) || (((transactionId >>> 8) & 0xFF) == 0x10)) {
+                    // prevent that one of the transactionID bytes is 0x10, which has to be escaped by double 0x10 and makes life a lot harder
+                    transactionId = this.transactionId.getAndIncrement();
+                }
+                logger.debug("Creating request for offset {}, with length {} and transaction id {}", address, size, transactionId);
+
+                requests.put(transactionId, msg);
+
+                switch (((Df1Field) field).getAddress_type()) {
+                    case OFFSET:
+                        out.add(new DF1UnprotectedReadRequest((short) 0x00, (short)transactionId, address, size));
+                        break;
+                    case LOGICAL:
+                        // TODO: add 'protected typed logical read' to mspec
+                        throw new NotImplementedException("not yet implemented in mspec");
+                }
+
+            }
+        } else {
+            throw new IllegalStateException("This should not happen!");
+        }
+    }
+
+    @Override
+    protected void decode(ChannelHandlerContext ctx, DF1Symbol msg, List<Object> out) throws Exception {
+        logger.debug("Received DF1 Command incoming {}", msg);
+
+        if (msg instanceof DF1SymbolMessageFrameNAK) {
+            logger.warn("Received a response NAK, notify all requests");
+            for (Map.Entry<Integer, PlcRequestContainer> entry : requests.entrySet()) {
+                entry.getValue().getResponseFuture().complete(
+                    new DefaultPlcReadResponse(
+                        ((InternalPlcReadRequest) entry.getValue().getRequest()),
+                        Collections.singletonMap("erster", Pair.of(PlcResponseCode.INTERNAL_ERROR, new DefaultIntegerFieldItem(-1)))
+                    ));
+            }
+            return;
+        } else if (msg instanceof DF1SymbolMessageFrameACK) {
+            logger.warn("Received a response ACK :D");
+            return;
+        }
+
+        assert msg instanceof DF1SymbolMessageFrame;
+
+        DF1Command command = ((DF1SymbolMessageFrame) msg).getCommand();
+        int transactionId = command.getTransactionCounter();
+        if (!requests.containsKey(transactionId)) {
+            logger.warn("Received a response to unknown transaction id {}", transactionId);
+            ctx.fireExceptionCaught(new RuntimeException("Received a response to unknown transaction id"));
+            ctx.close();
+            return;
+        }
+        // As every response has a matching request, get this request based on the tpdu.
+        PlcRequestContainer requestContainer = requests.remove(transactionId);
+        PlcRequest request = requestContainer.getRequest();
+
+        // Handle the response.
+        PlcResponse response = null;
+        if (request instanceof PlcReadRequest) {
+            /*
+            Things to do
+            - check response code (if there is something like that?
+            - cast the bytes to right datatype
+            - create Response
+             */
+            // We can do this as we have only one fieldName in DF1
+            final String fieldName = ((PlcReadRequest) request).getFieldNames().iterator().next();
+            // TODO can there be another code than ok?
+            final PlcResponseCode responseCode = PlcResponseCode.OK;
+            // TODO maybe check for different status bytes
+            final Df1Field field = (Df1Field) ((PlcReadRequest) request).getField(fieldName);
+            // Cast byte and create response item
+            BaseDefaultFieldItem responseItem = null;
+            short[] data = ((DF1UnprotectedReadResponse)command).getData();
+            switch (field.getDataType()) {
+                case BIT:
+                    break;
+                case INTEGER:
+                    // TODO: type conversion is untested
+                    responseItem = new DefaultIntegerFieldItem((int)data[0] + ((int) data[1] << 8));
+                    break;
+                case FLOAT:
+                    break;
+                case BIT_STRING:
+                    break;
+                case ARRAY:
+                    break;
+                // TODO add all other cases here...
+                default:
+                    throw new NotImplementedException("The DataType " + field.getDataType() + " is currently not implemented!");
+            }
+            response = new DefaultPlcReadResponse(((InternalPlcReadRequest) request),
+                Collections.singletonMap(fieldName,
+                    Pair.of(responseCode, responseItem)));
+        } else if (request instanceof PlcWriteRequest) {
+            logger.warn("Writing is currently not implemented but received a write response?!");
+            ctx.close();
+            throw new NotImplementedException("This is currently not implemented!");
+        }
+
+        // Confirm the response being handled.
+        if (response != null) {
+            requestContainer.getResponseFuture().complete(response);
+        }
+    }
+
+
+}
diff --git a/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/util/DF1Utils.java b/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/util/DF1Utils.java
index df5f009ee6c..cc02c9435c7 100644
--- a/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/util/DF1Utils.java
+++ b/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/util/DF1Utils.java
@@ -1,158 +1,158 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.plc4x.java.df1.util;
-
-import org.apache.plc4x.java.df1.readwrite.DF1Command;
-import org.apache.plc4x.java.df1.readwrite.DF1UnprotectedReadRequest;
-import org.apache.plc4x.java.df1.readwrite.DF1UnprotectedReadResponse;
-import org.apache.plc4x.java.utils.ParseException;
-import org.apache.plc4x.java.utils.ReadBuffer;
-import org.apache.plc4x.java.utils.WriteBuffer;
-
-public class DF1Utils {
-
-    public static short crcCheck(Object... args) {
-        short destinationAddress = (short) args[0];
-        short sourceAddress = (short) args[1];
-        DF1Command command = (DF1Command) args[2];
-        short commandDiscriminatorValues = (short) command.getDiscriminatorValues()[0];
-        short status = command.getStatus();
-        int transactionCounter = command.getTransactionCounter();
-        if(command instanceof DF1UnprotectedReadRequest) {
-            try {
-                DF1UnprotectedReadRequest unprotectedReadRequest = (DF1UnprotectedReadRequest) command;
-                WriteBuffer writeBuffer = new WriteBuffer(10, false);
-                writeBuffer.writeUnsignedShort(8, destinationAddress);
-                writeBuffer.writeUnsignedShort(8, sourceAddress);
-                writeBuffer.writeUnsignedShort(8, commandDiscriminatorValues);
-                writeBuffer.writeUnsignedShort(8, status);
-                writeBuffer.writeUnsignedInt(16, (short) transactionCounter);
-                writeBuffer.writeUnsignedInt(16, (short) unprotectedReadRequest.getAddress());
-                writeBuffer.writeUnsignedShort(8, (byte) unprotectedReadRequest.getSize());
-                writeBuffer.writeUnsignedShort(8, (byte) 0x03);
-
-                byte[] data = writeBuffer.getData();
-                return calculateCRC(data);
-
-            } catch (ParseException e) {
-                throw new RuntimeException("Something went wrong during the CRC check", e);
-            }
-        } else if(command instanceof DF1UnprotectedReadResponse) {
-            DF1UnprotectedReadResponse unprotectedReadResponseCommand = (DF1UnprotectedReadResponse) command;
-            try {
-                // TODO: size has to be dependent on actual size requested
-                WriteBuffer writeBuffer = new WriteBuffer(10, false);
-                writeBuffer.writeUnsignedShort(8, destinationAddress);
-                writeBuffer.writeUnsignedShort(8, sourceAddress);
-                writeBuffer.writeUnsignedShort(8, commandDiscriminatorValues);
-                writeBuffer.writeUnsignedShort(8, status);
-                writeBuffer.writeUnsignedInt(16, (short) transactionCounter);
-                boolean escape10 = false;
-                for (short data : unprotectedReadResponseCommand.getData()) {
-//                    if (escape10 == true){
-//                        if (data == 0x10) {
-//
-//                        }
-//                    } else{
-//
-//                    }
-                    writeBuffer.writeUnsignedShort(8,  data);
-                }
-                writeBuffer.writeUnsignedShort(8, (byte) 0x03);
-
-                byte[] data = writeBuffer.getData();
-                return calculateCRC(data);
-
-            } catch (ParseException e) {
-                throw new RuntimeException("Something went wrong during the CRC check", e);
-            }
-        }
-
-        return 0;
-    }
-
-    public static boolean dataTerminate(ReadBuffer io) {
-        try {
-            // The byte sequence 0x10 followed by 0x03 indicates the end of the message,
-            // so if we would read this, we abort the loop and stop reading data.
-            if ((io.peekByte(0) == (byte) 0x10) && (io.peekByte(1) == (byte) 0x03)) {
-                return true;
-            }
-        } catch (ParseException e) {
-            // Just ignore and return false.
-        }
-        return false;
-    }
-
-    public static short readData(ReadBuffer io) {
-        try {
-            // If we read a 0x10, this has to be followed by another 0x10, which is how
-            // this value is escaped in DF1, so if we encounter two 0x10, we simply ignore the first.
-            if ((io.peekByte(0) == (byte) 0x10) && (io.peekByte(1) == 0x10)) {
-                io.readByte(8);
-            }
-            return io.readUnsignedShort(8);
-        } catch (ParseException e) {
-            throw new RuntimeException("Error parsing data", e);
-        }
-    }
-
-    public static void writeData(WriteBuffer io, short data) {
-        try {
-            // If a value is 0x10, this has to be duplicated in order to be escaped.
-            if ((data == (short) 0x10)) {
-                io.writeUnsignedShort(8, (short) 0x10);
-            }
-            io.writeUnsignedShort(8, data);
-        } catch (ParseException e) {
-            throw new RuntimeException("Error parsing data", e);
-        }
-    }
-
-    public static int dataLength(short[] data) {
-        int i = 0;
-        for(short dataByte : data) {
-            // If a value is 0x10, this has to be duplicated which increases the message size by one.
-            if(dataByte == 0x10) {
-                i++;
-            }
-            i++;
-        }
-        return i;
-    }
-
-    private static short calculateCRC(byte[] crcBytes) {
-        int tmp = 0;
-        int crcL, crcR;
-
-        for (int newByte : crcBytes) {
-            crcL = tmp >> 8;
-            crcR = tmp & 0xFF;
-            tmp = (crcL << 8) + (newByte ^ crcR);
-            for (int j = 0; j < 8; j++)
-                if (tmp % 2 == 1) {     // check if LSB shifted out is 1 or 0
-                    tmp = tmp >> 1;
-                    tmp = tmp ^ 0xA001;
-                } else {
-                    tmp = tmp >> 1;
-                }
-        }
-        return (short)tmp;
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.plc4x.java.df1.util;
+
+import org.apache.plc4x.java.df1.readwrite.DF1Command;
+import org.apache.plc4x.java.df1.readwrite.DF1UnprotectedReadRequest;
+import org.apache.plc4x.java.df1.readwrite.DF1UnprotectedReadResponse;
+import org.apache.plc4x.java.utils.ParseException;
+import org.apache.plc4x.java.utils.ReadBuffer;
+import org.apache.plc4x.java.utils.WriteBuffer;
+
+public class DF1Utils {
+
+    public static short crcCheck(Object... args) {
+        short destinationAddress = (short) args[0];
+        short sourceAddress = (short) args[1];
+        DF1Command command = (DF1Command) args[2];
+        short commandDiscriminatorValues = (short) command.getDiscriminatorValues()[0];
+        short status = command.getStatus();
+        int transactionCounter = command.getTransactionCounter();
+        if(command instanceof DF1UnprotectedReadRequest) {
+            try {
+                DF1UnprotectedReadRequest unprotectedReadRequest = (DF1UnprotectedReadRequest) command;
+                WriteBuffer writeBuffer = new WriteBuffer(10, false);
+                writeBuffer.writeUnsignedShort(8, destinationAddress);
+                writeBuffer.writeUnsignedShort(8, sourceAddress);
+                writeBuffer.writeUnsignedShort(8, commandDiscriminatorValues);
+                writeBuffer.writeUnsignedShort(8, status);
+                writeBuffer.writeUnsignedInt(16, (short) transactionCounter);
+                writeBuffer.writeUnsignedInt(16, (short) unprotectedReadRequest.getAddress());
+                writeBuffer.writeUnsignedShort(8, (byte) unprotectedReadRequest.getSize());
+                writeBuffer.writeUnsignedShort(8, (byte) 0x03);
+
+                byte[] data = writeBuffer.getData();
+                return calculateCRC(data);
+
+            } catch (ParseException e) {
+                throw new RuntimeException("Something went wrong during the CRC check", e);
+            }
+        } else if(command instanceof DF1UnprotectedReadResponse) {
+            DF1UnprotectedReadResponse unprotectedReadResponseCommand = (DF1UnprotectedReadResponse) command;
+            try {
+                // TODO: size has to be dependent on actual size requested
+                WriteBuffer writeBuffer = new WriteBuffer(10, false);
+                writeBuffer.writeUnsignedShort(8, destinationAddress);
+                writeBuffer.writeUnsignedShort(8, sourceAddress);
+                writeBuffer.writeUnsignedShort(8, commandDiscriminatorValues);
+                writeBuffer.writeUnsignedShort(8, status);
+                writeBuffer.writeUnsignedInt(16, (short) transactionCounter);
+                boolean escape10 = false;
+                for (short data : unprotectedReadResponseCommand.getData()) {
+//                    if (escape10 == true){
+//                        if (data == 0x10) {
+//
+//                        }
+//                    } else{
+//
+//                    }
+                    writeBuffer.writeUnsignedShort(8,  data);
+                }
+                writeBuffer.writeUnsignedShort(8, (byte) 0x03);
+
+                byte[] data = writeBuffer.getData();
+                return calculateCRC(data);
+
+            } catch (ParseException e) {
+                throw new RuntimeException("Something went wrong during the CRC check", e);
+            }
+        }
+
+        return 0;
+    }
+
+    public static boolean dataTerminate(ReadBuffer io) {
+        try {
+            // The byte sequence 0x10 followed by 0x03 indicates the end of the message,
+            // so if we would read this, we abort the loop and stop reading data.
+            if ((io.peekByte(0) == (byte) 0x10) && (io.peekByte(1) == (byte) 0x03)) {
+                return true;
+            }
+        } catch (ParseException e) {
+            // Just ignore and return false.
+        }
+        return false;
+    }
+
+    public static short readData(ReadBuffer io) {
+        try {
+            // If we read a 0x10, this has to be followed by another 0x10, which is how
+            // this value is escaped in DF1, so if we encounter two 0x10, we simply ignore the first.
+            if ((io.peekByte(0) == (byte) 0x10) && (io.peekByte(1) == 0x10)) {
+                io.readByte(8);
+            }
+            return io.readUnsignedShort(8);
+        } catch (ParseException e) {
+            throw new RuntimeException("Error parsing data", e);
+        }
+    }
+
+    public static void writeData(WriteBuffer io, short data) {
+        try {
+            // If a value is 0x10, this has to be duplicated in order to be escaped.
+            if ((data == (short) 0x10)) {
+                io.writeUnsignedShort(8, (short) 0x10);
+            }
+            io.writeUnsignedShort(8, data);
+        } catch (ParseException e) {
+            throw new RuntimeException("Error parsing data", e);
+        }
+    }
+
+    public static int dataLength(short[] data) {
+        int i = 0;
+        for(short dataByte : data) {
+            // If a value is 0x10, this has to be duplicated which increases the message size by one.
+            if(dataByte == 0x10) {
+                i++;
+            }
+            i++;
+        }
+        return i;
+    }
+
+    private static short calculateCRC(byte[] crcBytes) {
+        int tmp = 0;
+        int crcL, crcR;
+
+        for (int newByte : crcBytes) {
+            crcL = tmp >> 8;
+            crcR = tmp & 0xFF;
+            tmp = (crcL << 8) + (newByte ^ crcR);
+            for (int j = 0; j < 8; j++)
+                if (tmp % 2 == 1) {     // check if LSB shifted out is 1 or 0
+                    tmp = tmp >> 1;
+                    tmp = tmp ^ 0xA001;
+                } else {
+                    tmp = tmp >> 1;
+                }
+        }
+        return (short)tmp;
+    }
+}
diff --git a/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/util/Df1FieldHandler.java b/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/util/Df1FieldHandler.java
index 4b92194429b..c414ead0273 100644
--- a/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/util/Df1FieldHandler.java
+++ b/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/util/Df1FieldHandler.java
@@ -1,39 +1,39 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.df1.util;
-
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.connection.DefaultPlcFieldHandler;
-import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
-import org.apache.plc4x.java.df1.Df1Field;
-
-public class Df1FieldHandler extends DefaultPlcFieldHandler {
-
-    @Override
-    public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
-        return Df1Field.of(fieldQuery);
-    }
-
-    @Override
-    public BaseDefaultFieldItem encodeByte(PlcField field, Object[] values) {
-        return super.encodeByte(field, values);
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.df1.util;
+
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.connection.DefaultPlcFieldHandler;
+import org.apache.plc4x.java.base.messages.items.BaseDefaultFieldItem;
+import org.apache.plc4x.java.df1.Df1Field;
+
+public class Df1FieldHandler extends DefaultPlcFieldHandler {
+
+    @Override
+    public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
+        return Df1Field.of(fieldQuery);
+    }
+
+    @Override
+    public BaseDefaultFieldItem encodeByte(PlcField field, Object[] values) {
+        return super.encodeByte(field, values);
+    }
+
+}
diff --git a/sandbox/test-java-df1-driver/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver b/sandbox/test-java-df1-driver/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
index fddc33ddcf5..a243e5eb098 100644
--- a/sandbox/test-java-df1-driver/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
+++ b/sandbox/test-java-df1-driver/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
@@ -1,19 +1,19 @@
-#
-# 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
-#
-#   http://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.
-#
-org.apache.plc4x.java.df1.DF1PlcDriver
+#
+# 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
+#
+#   http://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.
+#
+org.apache.plc4x.java.df1.DF1PlcDriver
diff --git a/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/java/df1/DF1PlcDriverTest.java b/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/java/df1/DF1PlcDriverTest.java
index fa58a5e92d6..4c7cd52a2c4 100644
--- a/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/java/df1/DF1PlcDriverTest.java
+++ b/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/java/df1/DF1PlcDriverTest.java
@@ -1,44 +1,44 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.plc4x.java.df1;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import java.util.regex.Matcher;
-
-import static org.apache.plc4x.java.df1.DF1PlcDriver.DF1_URI_PATTERN;
-import static org.apache.plc4x.java.df1.DF1PlcDriver.SERIAL_PATTERN;
-
-public class DF1PlcDriverTest {
-
-    @Test
-    public void matchExpression() {
-        Matcher matcher = SERIAL_PATTERN.matcher("serial:///COM4");
-
-        Assertions.assertTrue(matcher.matches());
-    }
-
-    @Test
-    public void matchExpression2() {
-        Matcher matcher = DF1_URI_PATTERN.matcher("df1:serial:///COM4");
-
-        Assertions.assertTrue(matcher.matches());
-    }
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.plc4x.java.df1;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.regex.Matcher;
+
+import static org.apache.plc4x.java.df1.DF1PlcDriver.DF1_URI_PATTERN;
+import static org.apache.plc4x.java.df1.DF1PlcDriver.SERIAL_PATTERN;
+
+public class DF1PlcDriverTest {
+
+    @Test
+    public void matchExpression() {
+        Matcher matcher = SERIAL_PATTERN.matcher("serial:///COM4");
+
+        Assertions.assertTrue(matcher.matches());
+    }
+
+    @Test
+    public void matchExpression2() {
+        Matcher matcher = DF1_URI_PATTERN.matcher("df1:serial:///COM4");
+
+        Assertions.assertTrue(matcher.matches());
+    }
 }
\ No newline at end of file
diff --git a/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/BenchmarkGeneratedDf1.java b/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/BenchmarkGeneratedDf1.java
index 27c9be2bb62..61b75682646 100644
--- a/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/BenchmarkGeneratedDf1.java
+++ b/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/BenchmarkGeneratedDf1.java
@@ -1,81 +1,81 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.protocol.df1;
-
-import com.fazecast.jSerialComm.SerialPort;
-import org.apache.plc4x.java.df1.*;
-import org.apache.plc4x.java.utils.ReadBuffer;
-import org.apache.plc4x.java.utils.WriteBuffer;
-
-public class BenchmarkGeneratedDf1 {
-
-    public static void main(String[] args) throws Exception {
-        /*// Manually build a message
-        ReadRequest readRequest = new ReadRequest(new DF1SymbolMessageFrameStart((short) 0x09, (short) 0x00, new DF1ReadRequest((short) 0x00, 0x01, 0x0B, (short) 0x02)), new DF1SymbolMessageFrameEnd());
-
-        // Serialize the message
-        WriteBuffer writeBuffer = new WriteBuffer(100, false);
-        new ReadRequestIO().serialize(writeBuffer, readRequest);
-        byte[] data = writeBuffer.getData();
-
-        // Send the serialized message to the PLC via COM port
-        SerialPort comPort = SerialPort.getCommPort("/dev/cu.usbserial-AL065SUZ");
-        comPort.openPort();
-        comPort.setComPortParameters(19200, 8, SerialPort.ONE_STOP_BIT, SerialPort.NO_PARITY);
-        comPort.writeBytes(data, 20);
-
-        // Give the PLC some time to respond.
-        while (comPort.bytesAvailable() == 0) {
-            Thread.sleep(22);
-        }
-
-        // Read the response
-        byte[] readBytes = new byte[comPort.bytesAvailable()];
-        comPort.readBytes(readBytes, readBytes.length);
-
-        // Parse the ACK/NACK response
-        ReadBuffer readBuffer = new ReadBuffer(readBytes);
-        Result result = new ResultIO().parse(readBuffer);
-
-        // Check if the response was an ACK
-        if(result.getResult() instanceof DF1SymbolMessageFrameACK) {
-            // The actual result is sent with a little delay.
-            while (comPort.bytesAvailable() == 0) {
-                Thread.sleep(22);
-            }
-
-            // Read the actual response data
-            readBytes = new byte[comPort.bytesAvailable()];
-            comPort.readBytes(readBytes, readBytes.length);
-
-            // Parse the response
-            readBuffer = new ReadBuffer(readBytes);
-            ReadResponse readResponse = new ReadResponseIO().parse(readBuffer, (short) 0x02);
-
-            // So something senseless ;-)
-            System.out.println(readResponse);
-        } else {
-            System.out.println("Didn't get an ACK");
-        }
-
-        comPort.closePort();*/
-    }
-
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.protocol.df1;
+
+import com.fazecast.jSerialComm.SerialPort;
+import org.apache.plc4x.java.df1.*;
+import org.apache.plc4x.java.utils.ReadBuffer;
+import org.apache.plc4x.java.utils.WriteBuffer;
+
+public class BenchmarkGeneratedDf1 {
+
+    public static void main(String[] args) throws Exception {
+        /*// Manually build a message
+        ReadRequest readRequest = new ReadRequest(new DF1SymbolMessageFrameStart((short) 0x09, (short) 0x00, new DF1ReadRequest((short) 0x00, 0x01, 0x0B, (short) 0x02)), new DF1SymbolMessageFrameEnd());
+
+        // Serialize the message
+        WriteBuffer writeBuffer = new WriteBuffer(100, false);
+        new ReadRequestIO().serialize(writeBuffer, readRequest);
+        byte[] data = writeBuffer.getData();
+
+        // Send the serialized message to the PLC via COM port
+        SerialPort comPort = SerialPort.getCommPort("/dev/cu.usbserial-AL065SUZ");
+        comPort.openPort();
+        comPort.setComPortParameters(19200, 8, SerialPort.ONE_STOP_BIT, SerialPort.NO_PARITY);
+        comPort.writeBytes(data, 20);
+
+        // Give the PLC some time to respond.
+        while (comPort.bytesAvailable() == 0) {
+            Thread.sleep(22);
+        }
+
+        // Read the response
+        byte[] readBytes = new byte[comPort.bytesAvailable()];
+        comPort.readBytes(readBytes, readBytes.length);
+
+        // Parse the ACK/NACK response
+        ReadBuffer readBuffer = new ReadBuffer(readBytes);
+        Result result = new ResultIO().parse(readBuffer);
+
+        // Check if the response was an ACK
+        if(result.getResult() instanceof DF1SymbolMessageFrameACK) {
+            // The actual result is sent with a little delay.
+            while (comPort.bytesAvailable() == 0) {
+                Thread.sleep(22);
+            }
+
+            // Read the actual response data
+            readBytes = new byte[comPort.bytesAvailable()];
+            comPort.readBytes(readBytes, readBytes.length);
+
+            // Parse the response
+            readBuffer = new ReadBuffer(readBytes);
+            ReadResponse readResponse = new ReadResponseIO().parse(readBuffer, (short) 0x02);
+
+            // So something senseless ;-)
+            System.out.println(readResponse);
+        } else {
+            System.out.println("Didn't get an ACK");
+        }
+
+        comPort.closePort();*/
+    }
+
+}
diff --git a/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/BenchmarkManualDf1.java b/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/BenchmarkManualDf1.java
index 7e4141b1291..a08f9d5ebb9 100644
--- a/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/BenchmarkManualDf1.java
+++ b/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/BenchmarkManualDf1.java
@@ -1,239 +1,239 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.protocol.df1;
-
-import com.fazecast.jSerialComm.SerialPort;
-
-public class BenchmarkManualDf1 {
-
-    public static void main(String[] args) throws Exception {
-//        byte[] rData = Hex.decodeHex("0300006702f080320100000001005600000407120a10060001032b84000160120a10020001032b840001a0120a10010001032b840001a9120a10050001032b84000150120a10020001032b84000198120a10040001032b84000140120a10020001032b84000190");
-//        long start = System.currentTimeMillis();
-//        int numRunsParse = 2000000;
-//        TPKTPacketIO tpktPacketIO = new TPKTPacketIO();
-//
-//
-//        CommPortIdentifier id = CommPortIdentifier.getPortIdentifier("");
-//
-//
-//        // Benchmark the parsing code
-//        TPKTPacket packet = null;
-//        for(int i = 0; i < numRunsParse; i++) {
-//            ReadBuffer rBuf = new ReadBuffer(rData);
-//            packet = tpktPacketIO.parse(rBuf);
-//        }
-//        long endParsing = System.currentTimeMillis();
-//
-//        System.out.println("Parsed " + numRunsParse + " packets in " + (endParsing - start) + "ms");
-//        System.out.println("That's " + ((float) (endParsing - start) / numRunsParse) + "ms per packet");
-//
-//        // Benchmark the serializing code
-//        int numRunsSerialize = 2000000;
-//        byte[] oData = null;
-//        for(int i = 0; i < numRunsSerialize; i++) {
-//            WriteBuffer wBuf = new WriteBuffer(packet.getLengthInBytes());
-//            tpktPacketIO.serialize(wBuf, packet);
-//            oData = wBuf.getData();
-//        }
-//        long endSerializing = System.currentTimeMillis();
-//
-//        System.out.println("Serialized " + numRunsSerialize + " packets in " + (endSerializing - endParsing) + "ms");
-//        System.out.println("That's " + ((float) (endSerializing - endParsing) / numRunsSerialize) + "ms per packet");
-//        if(!Arrays.equals(rData, oData)) {
-//            for(int i = 0; i < rData.length; i++) {
-//                if(rData[i] != oData[i]) {
-//                    System.out.println("Difference in byte " + i);
-//                }
-//            }
-//            System.out.println("Not equals");
-//        } else {
-//            System.out.println("Bytes equal");
-//        }
-
-
-//        byte[] rData = {0x10, 0x02, 0x00, 0x09, 0x41, 0x00, 0x01, 0x00, 0x1F, 0x1F, 0x10, 0x03, 0x1A, 0x2B};
-//
-//        DF1SymbolIO df1SymbolIO = new DF1SymbolIO();
-//        DF1Symbol packet;
-//        ReadBuffer rBuf = new ReadBuffer(rData);
-//        int statusWord = (rData[7]<<8) + rData[6];
-//        DF1Command messageCommand = new DF1Command((short)rData[5]); //,(short)statusWord);
-//        DF1SymbolMessageFrameStart messageStart = new DF1SymbolMessageFrameStart((short)rData[3],(short)rData[2], messageCommand);
-//        packet = df1SymbolIO.parse(rBuf, (short) (rData.length-12), messageStart);
-//
-//        System.out.println("x: " + packet);
-//        System.exit(0);
-
-
-
-        SerialPort comPort = SerialPort.getCommPorts()[0];
-        comPort.openPort();
-
-        comPort.setComPortParameters(19200, 8, SerialPort.ONE_STOP_BIT, SerialPort.NO_PARITY);
-//        comPort.setComPortTimeouts(SerialPort.TIMEOUT_NONBLOCKING, 0, 0);
-
-        System.out.print(comPort.getSystemPortName() + " | ");
-        //System.out.print(comPort.getPortDescription() + " | ");
-        System.out.print(comPort.getDescriptivePortName() + " | Baud rate: ");
-        System.out.println(comPort.getBaudRate());
-//        System.out.println(comPort.getReadTimeout());
-//        System.out.println(comPort.getWriteTimeout());
-
-
-
-//        DF1SymbolIO df1message = new DF1SymbolIO();
-
-
-        byte[] c_STX = {0x02};
-        byte[] c_SOH = {0x01};
-        byte[] c_ETX = {0x03};
-        byte[] c_EOT = {0x04};
-        byte[] c_ENQ = {0x05};
-        byte[] c_ACK = {0x06};
-        byte[] c_DLE = {0x10};
-        byte[] c_NAK = {0x0f};
-
-        byte[] c_DST = {0x09};
-        byte[] c_SRC = {0x00};
-        byte[] c_CMD = {0x06};
-        byte[] c_FNC = {0x03};
-        byte[] c_STS = {0x00};
-        byte[] c_TNS = {0x01, 0x00};
-        byte[] c_ADR = {0x11, 0x00};
-        byte[] c_SZE = {0x02};
-//        byte[] c_BCC = {-30};
-
-//        byte[] c_STN = {0x11};
-//        byte[] c_DST = {0x01};
-//        byte[] c_SRC = {0x00};
-//        byte[] c_SZE = {0x0c};
-//        byte[] c_TNS = {0x41, 0x00};
-//        byte[] c_ADR = {0x12, 0x00};
-//        byte[] c_CRC = {-49, 0x40};
-
-
-//        byte[] message = {0x10, 0x01, 0x11, 0x10, 0x02, 0x09, 0x00, 0x01, 0x00, 0x41, 0x00, 0x12, 0x00, 0x0c, 0x10, 0x03}; // halfduplex msg
-//        comPort.writeBytes(message, message.length);
-
-//        byte[] message = {0x10, 0x05, 0x11, -17};         // halfduplex poll
-//        comPort.writeBytes(message, message.length);
-
-
-//        comPort.writeBytes(c_DLE, 1);     // fullduplex msg Seite 235
-//        comPort.writeBytes(c_STX, 1);
-//        comPort.writeBytes(c_DST, 1);
-//        comPort.writeBytes(c_SRC, 1);
-//        comPort.writeBytes(c_CMD, 1);
-//        comPort.writeBytes(c_STS, 1);
-//        comPort.writeBytes(c_TNS, 2);
-//        comPort.writeBytes(c_FNC, 1);
-//        comPort.writeBytes(c_ADR, 2);
-//        comPort.writeBytes(c_SZE, 1);
-//        comPort.writeBytes(c_DLE, 1);
-//        comPort.writeBytes(c_ETX, 1);
-
-        byte[] msg = {0x10, 0x02,   0x09, 0x00,   0x01, 0x00,   0x01, 0x00,   0x0b, 0x00,   0x02,   0x10, 0x03};
-        comPort.writeBytes(msg, 13);
-
-
-//        int[] crcmsg = {c_DST[0], c_SRC[0], c_CMD[0], c_STS[0], c_TNS[0], c_TNS[1], c_ADR[0], c_ADR[1], c_SZE[0], c_ETX[0]}; // fullduplex CRC
-//        int[] crcmsg = {c_DST[0], c_SRC[0], c_CMD[0], c_STS[0], c_TNS[0], c_TNS[1], c_FNC[0], c_ETX[0]};                       // diagnostic status request
-//        int[] crcmsg = {0x11, 0x02, 0x09, 0x00, 0x01, 0x00, 0x41, 0x00, 0x12, 0x00, 0x0c, 0x03}; // halfduplex CRC
-        int[] crcmsg = { 0x09, 0x00,   0x01, 0x00,   0x01, 0x00,   0x0b, 0x00,   0x02,   0x03};
-
-        int[] c_CRC = CalcCRC(crcmsg);
-        byte[] crc1 = {(byte)c_CRC[0]};
-        byte[] crc2 = {(byte)c_CRC[1]};
-        System.out.println("crc1: " + Integer.toHexString(crc1[0]));
-        System.out.println("crc2: " + Integer.toHexString(crc2[0]));
-        comPort.writeBytes(crc1, 1);
-        comPort.writeBytes(crc2, 1);
-
-
-        while (comPort.bytesAvailable() == 0) {
-            Thread.sleep(22); }
-
-        byte[] readBuffer = new byte[comPort.bytesAvailable()];
-        int numRead = comPort.readBytes(readBuffer, readBuffer.length);
-        System.out.println("Read " + numRead + " bytes.");
-
-        for (byte c_RCV : readBuffer) {
-            System.out.print(Integer.toHexString(c_RCV) + " | "); }
-        System.out.println("");
-
-//        if (numRead > 1) {
-//            if (readBuffer[1] != 0x15) {
-//                comPort.writeBytes(c_DLE, 1);
-//                comPort.writeBytes(c_ACK, 1);
-//            }
-//        }
-
-        while (comPort.bytesAvailable() == 0) {
-            Thread.sleep(22); }
-
-
-        byte[] readBuffer2 = new byte[comPort.bytesAvailable()];
-        int numRead2 = comPort.readBytes(readBuffer2, readBuffer2.length);
-        System.out.println("Read " + numRead2 + " bytes.");
-
-        for (byte c_RCV2 : readBuffer2) {
-            System.out.print(Integer.toHexString(c_RCV2) + " | "); }
-        System.out.println("");
-
-        comPort.closePort();
-
-    }
-
-        private static int[] CalcCRC(int[] crcBytes) {
-            int tmp = 0;
-            int crcL, crcR;
-
-            for (int newByte : crcBytes ) {
-                crcL = tmp >> 8;
-                crcR = tmp & 0xFF;
-                tmp = (crcL << 8) + (newByte ^ crcR);
-                for (int j=0; j<8; j++)
-                    if (tmp % 2 == 1) {     // check if LSB shifted out is 1 or 0
-                        tmp = tmp >> 1;
-                        tmp = tmp ^ 0xA001;
-                    } else {
-                        tmp = tmp >> 1;
-                    }
-            }
-
-//            return ((tmp & 0xFF) << 8) + (tmp >> 8);  // returns lowbyte|highbyte as one number, change return to non-array
-
-            int[] tmparray = {(tmp & 0xFF), (tmp >> 8)};
-            return tmparray;
-        }
-
-        private static int CalcBCC(int[] crcBytes) {
-            int tmp = 0;
-            int j = 0;
-
-            for (int newByte : crcBytes) {
-                tmp = tmp + newByte;
-                if (newByte == 0x10) {
-                    j = ++j; }
-            }
-            tmp = tmp - ((j/2) * 0x10);  // get rid of double DLE
-            return ((~tmp) & 0b11111111) + 1;
-        }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.protocol.df1;
+
+import com.fazecast.jSerialComm.SerialPort;
+
+public class BenchmarkManualDf1 {
+
+    public static void main(String[] args) throws Exception {
+//        byte[] rData = Hex.decodeHex("0300006702f080320100000001005600000407120a10060001032b84000160120a10020001032b840001a0120a10010001032b840001a9120a10050001032b84000150120a10020001032b84000198120a10040001032b84000140120a10020001032b84000190");
+//        long start = System.currentTimeMillis();
+//        int numRunsParse = 2000000;
+//        TPKTPacketIO tpktPacketIO = new TPKTPacketIO();
+//
+//
+//        CommPortIdentifier id = CommPortIdentifier.getPortIdentifier("");
+//
+//
+//        // Benchmark the parsing code
+//        TPKTPacket packet = null;
+//        for(int i = 0; i < numRunsParse; i++) {
+//            ReadBuffer rBuf = new ReadBuffer(rData);
+//            packet = tpktPacketIO.parse(rBuf);
+//        }
+//        long endParsing = System.currentTimeMillis();
+//
+//        System.out.println("Parsed " + numRunsParse + " packets in " + (endParsing - start) + "ms");
+//        System.out.println("That's " + ((float) (endParsing - start) / numRunsParse) + "ms per packet");
+//
+//        // Benchmark the serializing code
+//        int numRunsSerialize = 2000000;
+//        byte[] oData = null;
+//        for(int i = 0; i < numRunsSerialize; i++) {
+//            WriteBuffer wBuf = new WriteBuffer(packet.getLengthInBytes());
+//            tpktPacketIO.serialize(wBuf, packet);
+//            oData = wBuf.getData();
+//        }
+//        long endSerializing = System.currentTimeMillis();
+//
+//        System.out.println("Serialized " + numRunsSerialize + " packets in " + (endSerializing - endParsing) + "ms");
+//        System.out.println("That's " + ((float) (endSerializing - endParsing) / numRunsSerialize) + "ms per packet");
+//        if(!Arrays.equals(rData, oData)) {
+//            for(int i = 0; i < rData.length; i++) {
+//                if(rData[i] != oData[i]) {
+//                    System.out.println("Difference in byte " + i);
+//                }
+//            }
+//            System.out.println("Not equals");
+//        } else {
+//            System.out.println("Bytes equal");
+//        }
+
+
+//        byte[] rData = {0x10, 0x02, 0x00, 0x09, 0x41, 0x00, 0x01, 0x00, 0x1F, 0x1F, 0x10, 0x03, 0x1A, 0x2B};
+//
+//        DF1SymbolIO df1SymbolIO = new DF1SymbolIO();
+//        DF1Symbol packet;
+//        ReadBuffer rBuf = new ReadBuffer(rData);
+//        int statusWord = (rData[7]<<8) + rData[6];
+//        DF1Command messageCommand = new DF1Command((short)rData[5]); //,(short)statusWord);
+//        DF1SymbolMessageFrameStart messageStart = new DF1SymbolMessageFrameStart((short)rData[3],(short)rData[2], messageCommand);
+//        packet = df1SymbolIO.parse(rBuf, (short) (rData.length-12), messageStart);
+//
+//        System.out.println("x: " + packet);
+//        System.exit(0);
+
+
+
+        SerialPort comPort = SerialPort.getCommPorts()[0];
+        comPort.openPort();
+
+        comPort.setComPortParameters(19200, 8, SerialPort.ONE_STOP_BIT, SerialPort.NO_PARITY);
+//        comPort.setComPortTimeouts(SerialPort.TIMEOUT_NONBLOCKING, 0, 0);
+
+        System.out.print(comPort.getSystemPortName() + " | ");
+        //System.out.print(comPort.getPortDescription() + " | ");
+        System.out.print(comPort.getDescriptivePortName() + " | Baud rate: ");
+        System.out.println(comPort.getBaudRate());
+//        System.out.println(comPort.getReadTimeout());
+//        System.out.println(comPort.getWriteTimeout());
+
+
+
+//        DF1SymbolIO df1message = new DF1SymbolIO();
+
+
+        byte[] c_STX = {0x02};
+        byte[] c_SOH = {0x01};
+        byte[] c_ETX = {0x03};
+        byte[] c_EOT = {0x04};
+        byte[] c_ENQ = {0x05};
+        byte[] c_ACK = {0x06};
+        byte[] c_DLE = {0x10};
+        byte[] c_NAK = {0x0f};
+
+        byte[] c_DST = {0x09};
+        byte[] c_SRC = {0x00};
+        byte[] c_CMD = {0x06};
+        byte[] c_FNC = {0x03};
+        byte[] c_STS = {0x00};
+        byte[] c_TNS = {0x01, 0x00};
+        byte[] c_ADR = {0x11, 0x00};
+        byte[] c_SZE = {0x02};
+//        byte[] c_BCC = {-30};
+
+//        byte[] c_STN = {0x11};
+//        byte[] c_DST = {0x01};
+//        byte[] c_SRC = {0x00};
+//        byte[] c_SZE = {0x0c};
+//        byte[] c_TNS = {0x41, 0x00};
+//        byte[] c_ADR = {0x12, 0x00};
+//        byte[] c_CRC = {-49, 0x40};
+
+
+//        byte[] message = {0x10, 0x01, 0x11, 0x10, 0x02, 0x09, 0x00, 0x01, 0x00, 0x41, 0x00, 0x12, 0x00, 0x0c, 0x10, 0x03}; // halfduplex msg
+//        comPort.writeBytes(message, message.length);
+
+//        byte[] message = {0x10, 0x05, 0x11, -17};         // halfduplex poll
+//        comPort.writeBytes(message, message.length);
+
+
+//        comPort.writeBytes(c_DLE, 1);     // fullduplex msg Seite 235
+//        comPort.writeBytes(c_STX, 1);
+//        comPort.writeBytes(c_DST, 1);
+//        comPort.writeBytes(c_SRC, 1);
+//        comPort.writeBytes(c_CMD, 1);
+//        comPort.writeBytes(c_STS, 1);
+//        comPort.writeBytes(c_TNS, 2);
+//        comPort.writeBytes(c_FNC, 1);
+//        comPort.writeBytes(c_ADR, 2);
+//        comPort.writeBytes(c_SZE, 1);
+//        comPort.writeBytes(c_DLE, 1);
+//        comPort.writeBytes(c_ETX, 1);
+
+        byte[] msg = {0x10, 0x02,   0x09, 0x00,   0x01, 0x00,   0x01, 0x00,   0x0b, 0x00,   0x02,   0x10, 0x03};
+        comPort.writeBytes(msg, 13);
+
+
+//        int[] crcmsg = {c_DST[0], c_SRC[0], c_CMD[0], c_STS[0], c_TNS[0], c_TNS[1], c_ADR[0], c_ADR[1], c_SZE[0], c_ETX[0]}; // fullduplex CRC
+//        int[] crcmsg = {c_DST[0], c_SRC[0], c_CMD[0], c_STS[0], c_TNS[0], c_TNS[1], c_FNC[0], c_ETX[0]};                       // diagnostic status request
+//        int[] crcmsg = {0x11, 0x02, 0x09, 0x00, 0x01, 0x00, 0x41, 0x00, 0x12, 0x00, 0x0c, 0x03}; // halfduplex CRC
+        int[] crcmsg = { 0x09, 0x00,   0x01, 0x00,   0x01, 0x00,   0x0b, 0x00,   0x02,   0x03};
+
+        int[] c_CRC = CalcCRC(crcmsg);
+        byte[] crc1 = {(byte)c_CRC[0]};
+        byte[] crc2 = {(byte)c_CRC[1]};
+        System.out.println("crc1: " + Integer.toHexString(crc1[0]));
+        System.out.println("crc2: " + Integer.toHexString(crc2[0]));
+        comPort.writeBytes(crc1, 1);
+        comPort.writeBytes(crc2, 1);
+
+
+        while (comPort.bytesAvailable() == 0) {
+            Thread.sleep(22); }
+
+        byte[] readBuffer = new byte[comPort.bytesAvailable()];
+        int numRead = comPort.readBytes(readBuffer, readBuffer.length);
+        System.out.println("Read " + numRead + " bytes.");
+
+        for (byte c_RCV : readBuffer) {
+            System.out.print(Integer.toHexString(c_RCV) + " | "); }
+        System.out.println("");
+
+//        if (numRead > 1) {
+//            if (readBuffer[1] != 0x15) {
+//                comPort.writeBytes(c_DLE, 1);
+//                comPort.writeBytes(c_ACK, 1);
+//            }
+//        }
+
+        while (comPort.bytesAvailable() == 0) {
+            Thread.sleep(22); }
+
+
+        byte[] readBuffer2 = new byte[comPort.bytesAvailable()];
+        int numRead2 = comPort.readBytes(readBuffer2, readBuffer2.length);
+        System.out.println("Read " + numRead2 + " bytes.");
+
+        for (byte c_RCV2 : readBuffer2) {
+            System.out.print(Integer.toHexString(c_RCV2) + " | "); }
+        System.out.println("");
+
+        comPort.closePort();
+
+    }
+
+        private static int[] CalcCRC(int[] crcBytes) {
+            int tmp = 0;
+            int crcL, crcR;
+
+            for (int newByte : crcBytes ) {
+                crcL = tmp >> 8;
+                crcR = tmp & 0xFF;
+                tmp = (crcL << 8) + (newByte ^ crcR);
+                for (int j=0; j<8; j++)
+                    if (tmp % 2 == 1) {     // check if LSB shifted out is 1 or 0
+                        tmp = tmp >> 1;
+                        tmp = tmp ^ 0xA001;
+                    } else {
+                        tmp = tmp >> 1;
+                    }
+            }
+
+//            return ((tmp & 0xFF) << 8) + (tmp >> 8);  // returns lowbyte|highbyte as one number, change return to non-array
+
+            int[] tmparray = {(tmp & 0xFF), (tmp >> 8)};
+            return tmparray;
+        }
+
+        private static int CalcBCC(int[] crcBytes) {
+            int tmp = 0;
+            int j = 0;
+
+            for (int newByte : crcBytes) {
+                tmp = tmp + newByte;
+                if (newByte == 0x10) {
+                    j = ++j; }
+            }
+            tmp = tmp - ((j/2) * 0x10);  // get rid of double DLE
+            return ((~tmp) & 0b11111111) + 1;
+        }
+}
diff --git a/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/Df1Test.java b/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/Df1Test.java
index bcadf1aa0c5..bd26b4f3be8 100644
--- a/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/Df1Test.java
+++ b/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/Df1Test.java
@@ -1,30 +1,30 @@
-/*
-  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
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-*/
-
-package org.apache.plc4x.protocol.df1;
-
-import org.apache.plc4x.protocol.test.ProtocolTestsuiteRunner;
-
-public class Df1Test extends ProtocolTestsuiteRunner {
-
-    public Df1Test() {
-        super("/testsuite/Df1Testsuite.xml");
-    }
-
-}
+/*
+  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
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+*/
+
+package org.apache.plc4x.protocol.df1;
+
+import org.apache.plc4x.protocol.test.ProtocolTestsuiteRunner;
+
+public class Df1Test extends ProtocolTestsuiteRunner {
+
+    public Df1Test() {
+        super("/testsuite/Df1Testsuite.xml");
+    }
+
+}
diff --git a/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/EndToEndTest.java b/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/EndToEndTest.java
index 42e2635336d..43af97d85e4 100644
--- a/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/EndToEndTest.java
+++ b/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/EndToEndTest.java
@@ -1,56 +1,56 @@
-/*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.plc4x.protocol.df1;
-
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.junit.jupiter.api.Test;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * TODO write comment
- *
- * @author julian
- * Created by julian on 2019-08-07
- */
-public class EndToEndTest {
-
-    @Test
-    public void helloDf1() {
-        try (PlcConnection plcConnection = new PlcDriverManager().getConnection("df1:serial:///COM4")) {
-            PlcReadRequest request = plcConnection.readRequestBuilder()
-                .addItem("hurz", "5:INTEGER")
-                .build();
-
-            PlcReadResponse response = request.execute().get(100, TimeUnit.SECONDS);
-
-
-            // TODO: get the actual read bytes from the response
-            System.out.println(response);
-            System.out.println("Response code was " + response.getResponseCode("erster"));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}
+/*
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.plc4x.protocol.df1;
+
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.junit.jupiter.api.Test;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * TODO write comment
+ *
+ * @author julian
+ * Created by julian on 2019-08-07
+ */
+public class EndToEndTest {
+
+    @Test
+    public void helloDf1() {
+        try (PlcConnection plcConnection = new PlcDriverManager().getConnection("df1:serial:///COM4")) {
+            PlcReadRequest request = plcConnection.readRequestBuilder()
+                .addItem("hurz", "5:INTEGER")
+                .build();
+
+            PlcReadResponse response = request.execute().get(100, TimeUnit.SECONDS);
+
+
+            // TODO: get the actual read bytes from the response
+            System.out.println(response);
+            System.out.println("Response code was " + response.getResponseCode("erster"));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/IOTest.java b/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/IOTest.java
index 6179b7f5e40..d6f26e110c9 100644
--- a/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/IOTest.java
+++ b/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/IOTest.java
@@ -1,99 +1,99 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.protocol.df1;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-import org.apache.commons.codec.binary.Hex;
-import org.apache.plc4x.java.df1.readwrite.DF1Symbol;
-import org.apache.plc4x.java.df1.readwrite.io.DF1SymbolIO;
-import org.apache.plc4x.java.utils.ReadBuffer;
-import org.junit.jupiter.api.Test;
-
-public class IOTest {
-
-    @Test
-    public void testXml() throws Exception {
-        byte[] rData = Hex.decodeHex("10020900010001001100021003546F");
-        ObjectMapper mapper = new XmlMapper().enableDefaultTyping();
-        ReadBuffer rBuf = new ReadBuffer(rData, false);
-        DF1Symbol symbol = new DF1SymbolIO().parse(rBuf);
-        String xml = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(symbol);
-        System.out.println(xml);
-        DF1Symbol symbol2 = mapper.readValue(xml, DF1Symbol.class);
-        System.out.println(symbol2);
-    }
-
-    @Test
-    public void testJson() throws Exception {
-        byte[] rData = Hex.decodeHex("10020A0941000100FFFF1003DFB9");
-        ObjectMapper mapper = new ObjectMapper().enableDefaultTyping();
-        ReadBuffer rBuf = new ReadBuffer(rData, false);
-        DF1Symbol symbol = new DF1SymbolIO().parse(rBuf);
-        String json = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(symbol);
-        System.out.println(json);
-        DF1Symbol symbol2 = mapper.readValue(json, DF1Symbol.class);
-        System.out.println(symbol2);
-    }
-
-    /*@Test
-    public void testParser() throws Exception {
-        byte[] rData = Hex.decodeHex("0610020500180801c0a82a46c4090801c0a82a46c40a0203");
-        long start = System.currentTimeMillis();
-        int numRunsParse = 20000;
-
-        KNXNetIPMessageIO knxNetIPMessageIO = new KNXNetIPMessageIO();
-
-        // Benchmark the parsing code
-        KNXNetIPMessage packet = null;
-        for(int i = 0; i < numRunsParse; i++) {
-            ReadBuffer rBuf = new ReadBuffer(rData);
-            packet = knxNetIPMessageIO.parse(rBuf);
-        }
-        long endParsing = System.currentTimeMillis();
-
-        System.out.println("Parsed " + numRunsParse + " packets in " + (endParsing - start) + "ms");
-        System.out.println("That's " + ((float) (endParsing - start) / numRunsParse) + "ms per packet");
-
-        // Benchmark the serializing code
-        int numRunsSerialize = 20000;
-        byte[] oData = null;
-        for(int i = 0; i < numRunsSerialize; i++) {
-            WriteBuffer wBuf = new WriteBuffer(packet.getLengthInBytes());
-            knxNetIPMessageIO.serialize(wBuf, packet);
-            oData = wBuf.getData();
-        }
-        long endSerializing = System.currentTimeMillis();
-
-        System.out.println("Serialized " + numRunsSerialize + " packets in " + (endSerializing - endParsing) + "ms");
-        System.out.println("That's " + ((float) (endSerializing - endParsing) / numRunsSerialize) + "ms per packet");
-        if(!Arrays.equals(rData, oData)) {
-            for(int i = 0; i < rData.length; i++) {
-                if(rData[i] != oData[i]) {
-                    System.out.println("Difference in byte " + i);
-                }
-            }
-            System.out.println("Not equals");
-        } else {
-            System.out.println("Bytes equal");
-        }
-    }*/
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.protocol.df1;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.plc4x.java.df1.readwrite.DF1Symbol;
+import org.apache.plc4x.java.df1.readwrite.io.DF1SymbolIO;
+import org.apache.plc4x.java.utils.ReadBuffer;
+import org.junit.jupiter.api.Test;
+
+public class IOTest {
+
+    @Test
+    public void testXml() throws Exception {
+        byte[] rData = Hex.decodeHex("10020900010001001100021003546F");
+        ObjectMapper mapper = new XmlMapper().enableDefaultTyping();
+        ReadBuffer rBuf = new ReadBuffer(rData, false);
+        DF1Symbol symbol = new DF1SymbolIO().parse(rBuf);
+        String xml = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(symbol);
+        System.out.println(xml);
+        DF1Symbol symbol2 = mapper.readValue(xml, DF1Symbol.class);
+        System.out.println(symbol2);
+    }
+
+    @Test
+    public void testJson() throws Exception {
+        byte[] rData = Hex.decodeHex("10020A0941000100FFFF1003DFB9");
+        ObjectMapper mapper = new ObjectMapper().enableDefaultTyping();
+        ReadBuffer rBuf = new ReadBuffer(rData, false);
+        DF1Symbol symbol = new DF1SymbolIO().parse(rBuf);
+        String json = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(symbol);
+        System.out.println(json);
+        DF1Symbol symbol2 = mapper.readValue(json, DF1Symbol.class);
+        System.out.println(symbol2);
+    }
+
+    /*@Test
+    public void testParser() throws Exception {
+        byte[] rData = Hex.decodeHex("0610020500180801c0a82a46c4090801c0a82a46c40a0203");
+        long start = System.currentTimeMillis();
+        int numRunsParse = 20000;
+
+        KNXNetIPMessageIO knxNetIPMessageIO = new KNXNetIPMessageIO();
+
+        // Benchmark the parsing code
+        KNXNetIPMessage packet = null;
+        for(int i = 0; i < numRunsParse; i++) {
+            ReadBuffer rBuf = new ReadBuffer(rData);
+            packet = knxNetIPMessageIO.parse(rBuf);
+        }
+        long endParsing = System.currentTimeMillis();
+
+        System.out.println("Parsed " + numRunsParse + " packets in " + (endParsing - start) + "ms");
+        System.out.println("That's " + ((float) (endParsing - start) / numRunsParse) + "ms per packet");
+
+        // Benchmark the serializing code
+        int numRunsSerialize = 20000;
+        byte[] oData = null;
+        for(int i = 0; i < numRunsSerialize; i++) {
+            WriteBuffer wBuf = new WriteBuffer(packet.getLengthInBytes());
+            knxNetIPMessageIO.serialize(wBuf, packet);
+            oData = wBuf.getData();
+        }
+        long endSerializing = System.currentTimeMillis();
+
+        System.out.println("Serialized " + numRunsSerialize + " packets in " + (endSerializing - endParsing) + "ms");
+        System.out.println("That's " + ((float) (endSerializing - endParsing) / numRunsSerialize) + "ms per packet");
+        if(!Arrays.equals(rData, oData)) {
+            for(int i = 0; i < rData.length; i++) {
+                if(rData[i] != oData[i]) {
+                    System.out.println("Difference in byte " + i);
+                }
+            }
+            System.out.println("Not equals");
+        } else {
+            System.out.println("Bytes equal");
+        }
+    }*/
+
+}
diff --git a/sandbox/test-java-df1-driver/src/test/resources/testsuite/Df1Testsuite.xml b/sandbox/test-java-df1-driver/src/test/resources/testsuite/Df1Testsuite.xml
index 27dcbecae11..8a65d1faef4 100644
--- a/sandbox/test-java-df1-driver/src/test/resources/testsuite/Df1Testsuite.xml
+++ b/sandbox/test-java-df1-driver/src/test/resources/testsuite/Df1Testsuite.xml
@@ -1,101 +1,101 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<test:testsuite xmlns:test="https://plc4x.apache.org/schemas/testsuite.xsd"
-                bigEndian="true">
-
-  <name>Allen-Bradley DF1</name>
-
-  <testcase>
-    <name>Unprotected Read Address Request</name>
-    <raw>10020900010001001100021003546F</raw>
-    <root-type>DF1Symbol</root-type>
-    <xml>
-      <DF1SymbolMessageFrame className="org.apache.plc4x.java.df1.readwrite.DF1SymbolMessageFrame">
-        <destinationAddress>9</destinationAddress>
-        <sourceAddress>0</sourceAddress>
-        <command className="org.apache.plc4x.java.df1.readwrite.DF1UnprotectedReadRequest">
-          <status>0</status>
-          <transactionCounter>1</transactionCounter>
-          <address>17</address>
-          <size>2</size>
-        </command>
-      </DF1SymbolMessageFrame>
-    </xml>
-  </testcase>
-
-  <testcase>
-    <name>Unprotected Read Address Response</name>
-    <raw>10020A0941000100FFFF1003DFB9</raw>
-    <root-type>DF1Symbol</root-type>
-    <xml>
-      <DF1SymbolMessageFrame className="org.apache.plc4x.java.df1.readwrite.DF1SymbolMessageFrame">
-        <destinationAddress>10</destinationAddress>
-        <sourceAddress>9</sourceAddress>
-        <command className="org.apache.plc4x.java.df1.readwrite.DF1UnprotectedReadResponse">
-          <status>0</status>
-          <transactionCounter>1</transactionCounter>
-          <data>
-            <data>255</data>
-            <data>255</data>
-          </data>
-        </command>
-      </DF1SymbolMessageFrame>
-    </xml>
-  </testcase>
-
-  <testcase>
-    <name>Unprotected Read Address Response (Containing 0x10 in the data)</name>
-    <raw>10020A09410001001010FF1003BAAD</raw>
-    <root-type>DF1Symbol</root-type>
-    <xml>
-      <DF1SymbolMessageFrame className="org.apache.plc4x.java.df1.readwrite.DF1SymbolMessageFrame">
-        <destinationAddress>10</destinationAddress>
-        <sourceAddress>9</sourceAddress>
-        <command className="org.apache.plc4x.java.df1.readwrite.DF1UnprotectedReadResponse">
-          <status>0</status>
-          <transactionCounter>1</transactionCounter>
-          <data>
-            <data>16</data>
-            <data>255</data>
-          </data>
-        </command>
-      </DF1SymbolMessageFrame>
-    </xml>
-  </testcase>
-
-  <testcase>
-    <name>ACK Response</name>
-    <raw>1006</raw>
-    <root-type>DF1Symbol</root-type>
-    <xml>
-      <DF1SymbolMessageFrameACK className="org.apache.plc4x.java.df1.readwrite.DF1SymbolMessageFrameACK"/>
-    </xml>
-  </testcase>
-
-  <testcase>
-    <name>NACK Response</name>
-    <raw>1015</raw>
-    <root-type>DF1Symbol</root-type>
-    <xml>
-      <DF1SymbolMessageFrameNAK className="org.apache.plc4x.java.df1.readwrite.DF1SymbolMessageFrameNAK"/>
-    </xml>
-  </testcase>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<test:testsuite xmlns:test="https://plc4x.apache.org/schemas/testsuite.xsd"
+                bigEndian="true">
+
+  <name>Allen-Bradley DF1</name>
+
+  <testcase>
+    <name>Unprotected Read Address Request</name>
+    <raw>10020900010001001100021003546F</raw>
+    <root-type>DF1Symbol</root-type>
+    <xml>
+      <DF1SymbolMessageFrame className="org.apache.plc4x.java.df1.readwrite.DF1SymbolMessageFrame">
+        <destinationAddress>9</destinationAddress>
+        <sourceAddress>0</sourceAddress>
+        <command className="org.apache.plc4x.java.df1.readwrite.DF1UnprotectedReadRequest">
+          <status>0</status>
+          <transactionCounter>1</transactionCounter>
+          <address>17</address>
+          <size>2</size>
+        </command>
+      </DF1SymbolMessageFrame>
+    </xml>
+  </testcase>
+
+  <testcase>
+    <name>Unprotected Read Address Response</name>
+    <raw>10020A0941000100FFFF1003DFB9</raw>
+    <root-type>DF1Symbol</root-type>
+    <xml>
+      <DF1SymbolMessageFrame className="org.apache.plc4x.java.df1.readwrite.DF1SymbolMessageFrame">
+        <destinationAddress>10</destinationAddress>
+        <sourceAddress>9</sourceAddress>
+        <command className="org.apache.plc4x.java.df1.readwrite.DF1UnprotectedReadResponse">
+          <status>0</status>
+          <transactionCounter>1</transactionCounter>
+          <data>
+            <data>255</data>
+            <data>255</data>
+          </data>
+        </command>
+      </DF1SymbolMessageFrame>
+    </xml>
+  </testcase>
+
+  <testcase>
+    <name>Unprotected Read Address Response (Containing 0x10 in the data)</name>
+    <raw>10020A09410001001010FF1003BAAD</raw>
+    <root-type>DF1Symbol</root-type>
+    <xml>
+      <DF1SymbolMessageFrame className="org.apache.plc4x.java.df1.readwrite.DF1SymbolMessageFrame">
+        <destinationAddress>10</destinationAddress>
+        <sourceAddress>9</sourceAddress>
+        <command className="org.apache.plc4x.java.df1.readwrite.DF1UnprotectedReadResponse">
+          <status>0</status>
+          <transactionCounter>1</transactionCounter>
+          <data>
+            <data>16</data>
+            <data>255</data>
+          </data>
+        </command>
+      </DF1SymbolMessageFrame>
+    </xml>
+  </testcase>
+
+  <testcase>
+    <name>ACK Response</name>
+    <raw>1006</raw>
+    <root-type>DF1Symbol</root-type>
+    <xml>
+      <DF1SymbolMessageFrameACK className="org.apache.plc4x.java.df1.readwrite.DF1SymbolMessageFrameACK"/>
+    </xml>
+  </testcase>
+
+  <testcase>
+    <name>NACK Response</name>
+    <raw>1015</raw>
+    <root-type>DF1Symbol</root-type>
+    <xml>
+      <DF1SymbolMessageFrameNAK className="org.apache.plc4x.java.df1.readwrite.DF1SymbolMessageFrameNAK"/>
+    </xml>
+  </testcase>
+
 </test:testsuite>
\ No newline at end of file
diff --git a/sandbox/test-java-knxnetip-driver/pom.xml b/sandbox/test-java-knxnetip-driver/pom.xml
index f25c33ec2e8..72c5e4e9419 100644
--- a/sandbox/test-java-knxnetip-driver/pom.xml
+++ b/sandbox/test-java-knxnetip-driver/pom.xml
@@ -1,116 +1,116 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.sandbox</groupId>
-    <artifactId>plc4x-sandbox</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>test-java-knxnetip-driver</artifactId>
-
-  <name>Sandbox: Test Generated KNXNet/IP Driver</name>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.plc4x.plugins</groupId>
-        <artifactId>plc4x-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>generate-driver</goal>
-            </goals>
-            <configuration>
-              <protocolName>knxnetip</protocolName>
-              <languageName>java</languageName>
-              <outputFlavor>read-write</outputFlavor>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-utils-driver-base-java</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-utils-protocol-test-utils</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
-      <artifactId>jackson-dataformat-xml</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-launcher</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-build-utils-language-java</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-protocols-knxnetip</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.sandbox</groupId>
+    <artifactId>plc4x-sandbox</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>test-java-knxnetip-driver</artifactId>
+
+  <name>Sandbox: Test Generated KNXNet/IP Driver</name>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.plc4x.plugins</groupId>
+        <artifactId>plc4x-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>generate-driver</goal>
+            </goals>
+            <configuration>
+              <protocolName>knxnetip</protocolName>
+              <languageName>java</languageName>
+              <outputFlavor>read-write</outputFlavor>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-utils-driver-base-java</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-utils-protocol-test-utils</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-xml</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-launcher</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-build-utils-language-java</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-protocols-knxnetip</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/sandbox/test-java-knxnetip-driver/src/test/java/org/apache/plc4x/java/knxnetip/IOTest.java b/sandbox/test-java-knxnetip-driver/src/test/java/org/apache/plc4x/java/knxnetip/IOTest.java
index 711c1ae570d..c3a1077999b 100644
--- a/sandbox/test-java-knxnetip-driver/src/test/java/org/apache/plc4x/java/knxnetip/IOTest.java
+++ b/sandbox/test-java-knxnetip-driver/src/test/java/org/apache/plc4x/java/knxnetip/IOTest.java
@@ -1,102 +1,102 @@
-/*
- 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
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-package org.apache.plc4x.java.knxnetip;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-import org.apache.commons.codec.binary.Hex;
-import org.apache.plc4x.java.knxnetip.readwrite.KNXNetIPMessage;
-import org.apache.plc4x.java.knxnetip.readwrite.io.KNXNetIPMessageIO;
-import org.apache.plc4x.java.utils.ReadBuffer;
-import org.apache.plc4x.java.utils.WriteBuffer;
-import org.junit.jupiter.api.Test;
-
-import java.util.Arrays;
-
-public class IOTest {
-
-    @Test
-    public void testXml() throws Exception {
-        byte[] rData = Hex.decodeHex("06100420001c046b00002b0703010504024502bc360a1e0ce100810d");
-        ObjectMapper mapper = new XmlMapper().enableDefaultTyping();
-        ReadBuffer rBuf = new ReadBuffer(rData);
-        KNXNetIPMessage packet = new KNXNetIPMessageIO().parse(rBuf);
-        String xml = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(packet);
-        System.out.println(xml);
-        KNXNetIPMessage pack2 = mapper.readValue(xml, KNXNetIPMessage.class);
-        System.out.println(pack2);
-    }
-
-    @Test
-    public void testJson() throws Exception {
-        byte[] rData = Hex.decodeHex("0610020500180801c0a82a46c4090801c0a82a46c40a0203");
-        ObjectMapper mapper = new ObjectMapper().enableDefaultTyping();
-        ReadBuffer rBuf = new ReadBuffer(rData);
-        KNXNetIPMessage packet = new KNXNetIPMessageIO().parse(rBuf);
-        String json = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(packet);
-        System.out.println(json);
-        KNXNetIPMessage pack2 = mapper.readValue(json, KNXNetIPMessage.class);
-        System.out.println(pack2);
-    }
-
-    @Test
-    public void testParser() throws Exception {
-        byte[] rData = Hex.decodeHex("0610020500180801c0a82a46c4090801c0a82a46c40a0203");
-        long start = System.currentTimeMillis();
-        int numRunsParse = 20000;
-
-        KNXNetIPMessageIO knxNetIPMessageIO = new KNXNetIPMessageIO();
-
-        // Benchmark the parsing code
-        KNXNetIPMessage packet = null;
-        for(int i = 0; i < numRunsParse; i++) {
-            ReadBuffer rBuf = new ReadBuffer(rData);
-            packet = knxNetIPMessageIO.parse(rBuf);
-        }
-        long endParsing = System.currentTimeMillis();
-
-        System.out.println("Parsed " + numRunsParse + " packets in " + (endParsing - start) + "ms");
-        System.out.println("That's " + ((float) (endParsing - start) / numRunsParse) + "ms per packet");
-
-        // Benchmark the serializing code
-        int numRunsSerialize = 20000;
-        byte[] oData = null;
-        for(int i = 0; i < numRunsSerialize; i++) {
-            WriteBuffer wBuf = new WriteBuffer(packet.getLengthInBytes());
-            knxNetIPMessageIO.serialize(wBuf, packet);
-            oData = wBuf.getData();
-        }
-        long endSerializing = System.currentTimeMillis();
-
-        System.out.println("Serialized " + numRunsSerialize + " packets in " + (endSerializing - endParsing) + "ms");
-        System.out.println("That's " + ((float) (endSerializing - endParsing) / numRunsSerialize) + "ms per packet");
-        if(!Arrays.equals(rData, oData)) {
-            for(int i = 0; i < rData.length; i++) {
-                if(rData[i] != oData[i]) {
-                    System.out.println("Difference in byte " + i);
-                }
-            }
-            System.out.println("Not equals");
-        } else {
-            System.out.println("Bytes equal");
-        }
-    }
-
-}
+/*
+ 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
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package org.apache.plc4x.java.knxnetip;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.plc4x.java.knxnetip.readwrite.KNXNetIPMessage;
+import org.apache.plc4x.java.knxnetip.readwrite.io.KNXNetIPMessageIO;
+import org.apache.plc4x.java.utils.ReadBuffer;
+import org.apache.plc4x.java.utils.WriteBuffer;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+
+public class IOTest {
+
+    @Test
+    public void testXml() throws Exception {
+        byte[] rData = Hex.decodeHex("06100420001c046b00002b0703010504024502bc360a1e0ce100810d");
+        ObjectMapper mapper = new XmlMapper().enableDefaultTyping();
+        ReadBuffer rBuf = new ReadBuffer(rData);
+        KNXNetIPMessage packet = new KNXNetIPMessageIO().parse(rBuf);
+        String xml = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(packet);
+        System.out.println(xml);
+        KNXNetIPMessage pack2 = mapper.readValue(xml, KNXNetIPMessage.class);
+        System.out.println(pack2);
+    }
+
+    @Test
+    public void testJson() throws Exception {
+        byte[] rData = Hex.decodeHex("0610020500180801c0a82a46c4090801c0a82a46c40a0203");
+        ObjectMapper mapper = new ObjectMapper().enableDefaultTyping();
+        ReadBuffer rBuf = new ReadBuffer(rData);
+        KNXNetIPMessage packet = new KNXNetIPMessageIO().parse(rBuf);
+        String json = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(packet);
+        System.out.println(json);
+        KNXNetIPMessage pack2 = mapper.readValue(json, KNXNetIPMessage.class);
+        System.out.println(pack2);
+    }
+
+    @Test
+    public void testParser() throws Exception {
+        byte[] rData = Hex.decodeHex("0610020500180801c0a82a46c4090801c0a82a46c40a0203");
+        long start = System.currentTimeMillis();
+        int numRunsParse = 20000;
+
+        KNXNetIPMessageIO knxNetIPMessageIO = new KNXNetIPMessageIO();
+
+        // Benchmark the parsing code
+        KNXNetIPMessage packet = null;
+        for(int i = 0; i < numRunsParse; i++) {
+            ReadBuffer rBuf = new ReadBuffer(rData);
+            packet = knxNetIPMessageIO.parse(rBuf);
+        }
+        long endParsing = System.currentTimeMillis();
+
+        System.out.println("Parsed " + numRunsParse + " packets in " + (endParsing - start) + "ms");
+        System.out.println("That's " + ((float) (endParsing - start) / numRunsParse) + "ms per packet");
+
+        // Benchmark the serializing code
+        int numRunsSerialize = 20000;
+        byte[] oData = null;
+        for(int i = 0; i < numRunsSerialize; i++) {
+            WriteBuffer wBuf = new WriteBuffer(packet.getLengthInBytes());
+            knxNetIPMessageIO.serialize(wBuf, packet);
+            oData = wBuf.getData();
+        }
+        long endSerializing = System.currentTimeMillis();
+
+        System.out.println("Serialized " + numRunsSerialize + " packets in " + (endSerializing - endParsing) + "ms");
+        System.out.println("That's " + ((float) (endSerializing - endParsing) / numRunsSerialize) + "ms per packet");
+        if(!Arrays.equals(rData, oData)) {
+            for(int i = 0; i < rData.length; i++) {
+                if(rData[i] != oData[i]) {
+                    System.out.println("Difference in byte " + i);
+                }
+            }
+            System.out.println("Not equals");
+        } else {
+            System.out.println("Bytes equal");
+        }
+    }
+
+}
diff --git a/sandbox/test-java-knxnetip-driver/src/test/java/org/apache/plc4x/java/knxnetip/KNXNetIpTest.java b/sandbox/test-java-knxnetip-driver/src/test/java/org/apache/plc4x/java/knxnetip/KNXNetIpTest.java
index b968eebc6fc..28652b6d013 100644
--- a/sandbox/test-java-knxnetip-driver/src/test/java/org/apache/plc4x/java/knxnetip/KNXNetIpTest.java
+++ b/sandbox/test-java-knxnetip-driver/src/test/java/org/apache/plc4x/java/knxnetip/KNXNetIpTest.java
@@ -1,30 +1,30 @@
-/*
-  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
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-*/
-
-package org.apache.plc4x.java.knxnetip;
-
-import org.apache.plc4x.protocol.test.ProtocolTestsuiteRunner;
-
-public class KNXNetIpTest extends ProtocolTestsuiteRunner {
-
-    public KNXNetIpTest() {
-        super("/testsuite/KNXNetIPTestsuite.xml");
-    }
-
-}
+/*
+  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
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+*/
+
+package org.apache.plc4x.java.knxnetip;
+
+import org.apache.plc4x.protocol.test.ProtocolTestsuiteRunner;
+
+public class KNXNetIpTest extends ProtocolTestsuiteRunner {
+
+    public KNXNetIpTest() {
+        super("/testsuite/KNXNetIPTestsuite.xml");
+    }
+
+}
diff --git a/sandbox/test-java-knxnetip-driver/src/test/resources/testsuite/KNXNetIPTestsuite.xml b/sandbox/test-java-knxnetip-driver/src/test/resources/testsuite/KNXNetIPTestsuite.xml
index 10fb85c4fc7..fa77892991d 100644
--- a/sandbox/test-java-knxnetip-driver/src/test/resources/testsuite/KNXNetIPTestsuite.xml
+++ b/sandbox/test-java-knxnetip-driver/src/test/resources/testsuite/KNXNetIPTestsuite.xml
@@ -1,544 +1,544 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<test:testsuite xmlns:test="https://plc4x.apache.org/schemas/testsuite.xsd">
-
-  <name>KNXNet/IP</name>
-
-  <testcase>
-    <name>Search Request</name>
-    <raw>06100201000e0801c0a82a46ef8e</raw>
-    <root-type>KNXNetIPMessage</root-type>
-    <xml>
-      <SearchRequest className="org.apache.plc4x.java.knxnetip.readwrite.SearchRequest">
-        <hpaiIDiscoveryEndpoint>
-          <hostProtocolCode>1</hostProtocolCode>
-          <ipAddress>
-            <addr>
-              <addr>192</addr>
-              <addr>168</addr>
-              <addr>42</addr>
-              <addr>70</addr>
-            </addr>
-          </ipAddress>
-          <ipPort>61326</ipPort>
-        </hpaiIDiscoveryEndpoint>
-      </SearchRequest>
-    </xml>
-  </testcase>
-
-  <testcase>
-    <name>Search Response</name>
-    <raw>06100202004c0801c0a82a0b0e5736010200ffff000000082d409852e000170c000ab327553647697261204b4e582f49502d5363686e6974747374656c6c6500000000000802020103010401</raw>
-    <root-type>KNXNetIPMessage</root-type>
-    <xml>
-      <SearchResponse className="org.apache.plc4x.java.knxnetip.readwrite.SearchResponse">
-        <hpaiControlEndpoint>
-          <hostProtocolCode>1</hostProtocolCode>
-          <ipAddress>
-            <addr>
-              <addr>192</addr>
-              <addr>168</addr>
-              <addr>42</addr>
-              <addr>11</addr>
-            </addr>
-          </ipAddress>
-          <ipPort>3671</ipPort>
-        </hpaiControlEndpoint>
-        <dibDeviceInfo>
-          <descriptionType>1</descriptionType>
-          <knxMedium>2</knxMedium>
-          <deviceStatus>
-            <programMode>false</programMode>
-          </deviceStatus>
-          <knxAddress>
-            <mainGroup>15</mainGroup>
-            <middleGroup>15</middleGroup>
-            <subGroup>255</subGroup>
-          </knxAddress>
-          <projectInstallationIdentifier>
-            <projectNumber>0</projectNumber>
-            <installationNumber>0</installationNumber>
-          </projectInstallationIdentifier>
-          <knxNetIpDeviceSerialNumber>
-            <knxNetIpDeviceSerialNumber>0</knxNetIpDeviceSerialNumber>
-            <knxNetIpDeviceSerialNumber>8</knxNetIpDeviceSerialNumber>
-            <knxNetIpDeviceSerialNumber>45</knxNetIpDeviceSerialNumber>
-            <knxNetIpDeviceSerialNumber>64</knxNetIpDeviceSerialNumber>
-            <knxNetIpDeviceSerialNumber>152</knxNetIpDeviceSerialNumber>
-            <knxNetIpDeviceSerialNumber>82</knxNetIpDeviceSerialNumber>
-          </knxNetIpDeviceSerialNumber>
-          <knxNetIpDeviceMulticastAddress>
-            <addr>
-              <addr>224</addr>
-              <addr>0</addr>
-              <addr>23</addr>
-              <addr>12</addr>
-            </addr>
-          </knxNetIpDeviceMulticastAddress>
-          <knxNetIpDeviceMacAddress>
-            <addr>
-              <addr>0</addr>
-              <addr>10</addr>
-              <addr>179</addr>
-              <addr>39</addr>
-              <addr>85</addr>
-              <addr>54</addr>
-            </addr>
-          </knxNetIpDeviceMacAddress>
-          <deviceFriendlyName>
-            <deviceFriendlyName>71</deviceFriendlyName>
-            <deviceFriendlyName>105</deviceFriendlyName>
-            <deviceFriendlyName>114</deviceFriendlyName>
-            <deviceFriendlyName>97</deviceFriendlyName>
-            <deviceFriendlyName>32</deviceFriendlyName>
-            <deviceFriendlyName>75</deviceFriendlyName>
-            <deviceFriendlyName>78</deviceFriendlyName>
-            <deviceFriendlyName>88</deviceFriendlyName>
-            <deviceFriendlyName>47</deviceFriendlyName>
-            <deviceFriendlyName>73</deviceFriendlyName>
-            <deviceFriendlyName>80</deviceFriendlyName>
-            <deviceFriendlyName>45</deviceFriendlyName>
-            <deviceFriendlyName>83</deviceFriendlyName>
-            <deviceFriendlyName>99</deviceFriendlyName>
-            <deviceFriendlyName>104</deviceFriendlyName>
-            <deviceFriendlyName>110</deviceFriendlyName>
-            <deviceFriendlyName>105</deviceFriendlyName>
-            <deviceFriendlyName>116</deviceFriendlyName>
-            <deviceFriendlyName>116</deviceFriendlyName>
-            <deviceFriendlyName>115</deviceFriendlyName>
-            <deviceFriendlyName>116</deviceFriendlyName>
-            <deviceFriendlyName>101</deviceFriendlyName>
-            <deviceFriendlyName>108</deviceFriendlyName>
-            <deviceFriendlyName>108</deviceFriendlyName>
-            <deviceFriendlyName>101</deviceFriendlyName>
-            <deviceFriendlyName>0</deviceFriendlyName>
-            <deviceFriendlyName>0</deviceFriendlyName>
-            <deviceFriendlyName>0</deviceFriendlyName>
-            <deviceFriendlyName>0</deviceFriendlyName>
-            <deviceFriendlyName>0</deviceFriendlyName>
-          </deviceFriendlyName>
-        </dibDeviceInfo>
-        <dibSuppSvcFamilies>
-          <descriptionType>2</descriptionType>
-          <serviceIds>
-            <serviceIds className="org.apache.plc4x.java.knxnetip.readwrite.KnxNetIpCore">
-              <version>1</version>
-            </serviceIds>
-            <serviceIds className="org.apache.plc4x.java.knxnetip.readwrite.KnxNetIpDeviceManagement">
-              <version>1</version>
-            </serviceIds>
-            <serviceIds className="org.apache.plc4x.java.knxnetip.readwrite.KnxNetIpTunneling">
-              <version>1</version>
-            </serviceIds>
-          </serviceIds>
-        </dibSuppSvcFamilies>
-      </SearchResponse>
-    </xml>
-  </testcase>
-
-  <testcase>
-    <name>Description Request</name>
-    <raw>06100203000e0801000000000000</raw>
-    <root-type>KNXNetIPMessage</root-type>
-    <xml>
-      <DescriptionRequest className="org.apache.plc4x.java.knxnetip.readwrite.DescriptionRequest">
-        <hpaiControlEndpoint>
-          <hostProtocolCode>1</hostProtocolCode>
-          <ipAddress>
-            <addr>
-              <addr>0</addr>
-              <addr>0</addr>
-              <addr>0</addr>
-              <addr>0</addr>
-            </addr>
-          </ipAddress>
-          <ipPort>0</ipPort>
-        </hpaiControlEndpoint>
-      </DescriptionRequest>
-    </xml>
-  </testcase>
-
-  <testcase>
-    <name>Description Response</name>
-    <raw>06100204004436010200ffff000000082d409852e000170c000ab327553647697261204b4e582f49502d5363686e6974747374656c6c6500000000000802020103010401</raw>
-    <root-type>KNXNetIPMessage</root-type>
-    <xml>
-      <DescriptionResponse className="org.apache.plc4x.java.knxnetip.readwrite.DescriptionResponse">
-        <dibDeviceInfo>
-          <descriptionType>1</descriptionType>
-          <knxMedium>2</knxMedium>
-          <deviceStatus>
-            <programMode>false</programMode>
-          </deviceStatus>
-          <knxAddress>
-            <mainGroup>15</mainGroup>
-            <middleGroup>15</middleGroup>
-            <subGroup>255</subGroup>
-          </knxAddress>
-          <projectInstallationIdentifier>
-            <projectNumber>0</projectNumber>
-            <installationNumber>0</installationNumber>
-          </projectInstallationIdentifier>
-          <knxNetIpDeviceSerialNumber>
-            <knxNetIpDeviceSerialNumber>0</knxNetIpDeviceSerialNumber>
-            <knxNetIpDeviceSerialNumber>8</knxNetIpDeviceSerialNumber>
-            <knxNetIpDeviceSerialNumber>45</knxNetIpDeviceSerialNumber>
-            <knxNetIpDeviceSerialNumber>64</knxNetIpDeviceSerialNumber>
-            <knxNetIpDeviceSerialNumber>152</knxNetIpDeviceSerialNumber>
-            <knxNetIpDeviceSerialNumber>82</knxNetIpDeviceSerialNumber>
-          </knxNetIpDeviceSerialNumber>
-          <knxNetIpDeviceMulticastAddress>
-            <addr>
-              <addr>224</addr>
-              <addr>0</addr>
-              <addr>23</addr>
-              <addr>12</addr>
-            </addr>
-          </knxNetIpDeviceMulticastAddress>
-          <knxNetIpDeviceMacAddress>
-            <addr>
-              <addr>0</addr>
-              <addr>10</addr>
-              <addr>179</addr>
-              <addr>39</addr>
-              <addr>85</addr>
-              <addr>54</addr>
-            </addr>
-          </knxNetIpDeviceMacAddress>
-          <deviceFriendlyName>
-            <deviceFriendlyName>71</deviceFriendlyName>
-            <deviceFriendlyName>105</deviceFriendlyName>
-            <deviceFriendlyName>114</deviceFriendlyName>
-            <deviceFriendlyName>97</deviceFriendlyName>
-            <deviceFriendlyName>32</deviceFriendlyName>
-            <deviceFriendlyName>75</deviceFriendlyName>
-            <deviceFriendlyName>78</deviceFriendlyName>
-            <deviceFriendlyName>88</deviceFriendlyName>
-            <deviceFriendlyName>47</deviceFriendlyName>
-            <deviceFriendlyName>73</deviceFriendlyName>
-            <deviceFriendlyName>80</deviceFriendlyName>
-            <deviceFriendlyName>45</deviceFriendlyName>
-            <deviceFriendlyName>83</deviceFriendlyName>
-            <deviceFriendlyName>99</deviceFriendlyName>
-            <deviceFriendlyName>104</deviceFriendlyName>
-            <deviceFriendlyName>110</deviceFriendlyName>
-            <deviceFriendlyName>105</deviceFriendlyName>
-            <deviceFriendlyName>116</deviceFriendlyName>
-            <deviceFriendlyName>116</deviceFriendlyName>
-            <deviceFriendlyName>115</deviceFriendlyName>
-            <deviceFriendlyName>116</deviceFriendlyName>
-            <deviceFriendlyName>101</deviceFriendlyName>
-            <deviceFriendlyName>108</deviceFriendlyName>
-            <deviceFriendlyName>108</deviceFriendlyName>
-            <deviceFriendlyName>101</deviceFriendlyName>
-            <deviceFriendlyName>0</deviceFriendlyName>
-            <deviceFriendlyName>0</deviceFriendlyName>
-            <deviceFriendlyName>0</deviceFriendlyName>
-            <deviceFriendlyName>0</deviceFriendlyName>
-            <deviceFriendlyName>0</deviceFriendlyName>
-          </deviceFriendlyName>
-        </dibDeviceInfo>
-        <dibSuppSvcFamilies>
-          <descriptionType>2</descriptionType>
-          <serviceIds>
-            <serviceIds className="org.apache.plc4x.java.knxnetip.readwrite.KnxNetIpCore">
-              <version>1</version>
-            </serviceIds>
-            <serviceIds className="org.apache.plc4x.java.knxnetip.readwrite.KnxNetIpDeviceManagement">
-              <version>1</version>
-            </serviceIds>
-            <serviceIds className="org.apache.plc4x.java.knxnetip.readwrite.KnxNetIpTunneling">
-              <version>1</version>
-            </serviceIds>
-          </serviceIds>
-        </dibSuppSvcFamilies>
-      </DescriptionResponse>
-    </xml>
-  </testcase>
-
-  <testcase>
-    <name>Connect Request</name>
-    <raw>06100205001a0801c0a82a46f4310801c0a82a46f43204040200</raw>
-    <root-type>KNXNetIPMessage</root-type>
-    <xml>
-      <ConnectionRequest className="org.apache.plc4x.java.knxnetip.readwrite.ConnectionRequest">
-        <hpaiDiscoveryEndpoint>
-          <hostProtocolCode>1</hostProtocolCode>
-          <ipAddress>
-            <addr>
-              <addr>192</addr>
-              <addr>168</addr>
-              <addr>42</addr>
-              <addr>70</addr>
-            </addr>
-          </ipAddress>
-          <ipPort>62513</ipPort>
-        </hpaiDiscoveryEndpoint>
-        <hpaiDataEndpoint>
-          <hostProtocolCode>1</hostProtocolCode>
-          <ipAddress>
-            <addr>
-              <addr>192</addr>
-              <addr>168</addr>
-              <addr>42</addr>
-              <addr>70</addr>
-            </addr>
-          </ipAddress>
-          <ipPort>62514</ipPort>
-        </hpaiDataEndpoint>
-        <connectionRequestInformation className="org.apache.plc4x.java.knxnetip.readwrite.ConnectionRequestInformationTunnelConnection">
-          <knxLayer>2</knxLayer>
-        </connectionRequestInformation>
-      </ConnectionRequest>
-    </xml>
-  </testcase>
-
-  <testcase>
-    <name>Connect Response</name>
-    <raw>06100206001466000801c0a82a0b0e5704041101</raw>
-    <root-type>KNXNetIPMessage</root-type>
-    <xml>
-      <ConnectionResponse className="org.apache.plc4x.java.knxnetip.readwrite.ConnectionResponse">
-        <communicationChannelId>102</communicationChannelId>
-        <status>0</status>
-        <hpaiDataEndpoint>
-          <hostProtocolCode>1</hostProtocolCode>
-          <ipAddress>
-            <addr>
-              <addr>192</addr>
-              <addr>168</addr>
-              <addr>42</addr>
-              <addr>11</addr>
-            </addr>
-          </ipAddress>
-          <ipPort>3671</ipPort>
-        </hpaiDataEndpoint>
-        <connectionResponseDataBlock className="org.apache.plc4x.java.knxnetip.readwrite.ConnectionResponseDataBlockTunnelConnection">
-          <knxAddress>
-            <mainGroup>1</mainGroup>
-            <middleGroup>1</middleGroup>
-            <subGroup>1</subGroup>
-          </knxAddress>
-        </connectionResponseDataBlock>
-      </ConnectionResponse>
-    </xml>
-  </testcase>
-
-  <testcase>
-    <name>Connection State Request</name>
-    <raw>06100207001066000801c0a82a46f431</raw>
-    <root-type>KNXNetIPMessage</root-type>
-    <xml>
-      <ConnectionStateRequest className="org.apache.plc4x.java.knxnetip.readwrite.ConnectionStateRequest">
-        <communicationChannelId>102</communicationChannelId>
-        <hpaiControlEndpoint>
-          <hostProtocolCode>1</hostProtocolCode>
-          <ipAddress>
-            <addr>
-              <addr>192</addr>
-              <addr>168</addr>
-              <addr>42</addr>
-              <addr>70</addr>
-            </addr>
-          </ipAddress>
-          <ipPort>62513</ipPort>
-        </hpaiControlEndpoint>
-      </ConnectionStateRequest>
-    </xml>
-  </testcase>
-
-  <testcase>
-    <name>Connection State Response</name>
-    <raw>0610020800086600</raw>
-    <root-type>KNXNetIPMessage</root-type>
-    <xml>
-      <ConnectionStateResponse className="org.apache.plc4x.java.knxnetip.readwrite.ConnectionStateResponse">
-        <communicationChannelId>102</communicationChannelId>
-        <status>0</status>
-      </ConnectionStateResponse>
-    </xml>
-  </testcase>
-
-  <testcase>
-    <name>Device Configuration Request</name>
-    <raw>06100310001104670000fc000001531001</raw>
-    <root-type>KNXNetIPMessage</root-type>
-    <xml>
-      <DeviceConfigurationRequest className="org.apache.plc4x.java.knxnetip.readwrite.DeviceConfigurationRequest">
-        <deviceConfigurationRequestDataBlock>
-          <communicationChannelId>103</communicationChannelId>
-          <sequenceCounter>0</sequenceCounter>
-        </deviceConfigurationRequestDataBlock>
-        <cemi className="org.apache.plc4x.java.knxnetip.readwrite.CEMIMPropReadReq">
-          <interfaceObjectType>0</interfaceObjectType>
-          <objectInstance>1</objectInstance>
-          <propertyId>83</propertyId>
-          <numberOfElements>1</numberOfElements>
-          <startIndex>1</startIndex>
-        </cemi>
-      </DeviceConfigurationRequest>
-    </xml>
-  </testcase>
-
-  <testcase>
-    <name>Device Configuration Ack</name>
-    <raw>06100311000a04670000</raw>
-    <root-type>KNXNetIPMessage</root-type>
-    <xml>
-      <DeviceConfigurationAck className="org.apache.plc4x.java.knxnetip.readwrite.DeviceConfigurationAck">
-        <deviceConfigurationAckDataBlock>
-          <communicationChannelId>103</communicationChannelId>
-          <sequenceCounter>0</sequenceCounter>
-          <status>0</status>
-        </deviceConfigurationAckDataBlock>
-      </DeviceConfigurationAck>
-    </xml>
-  </testcase>
-
-  <testcase>
-    <name>Disconnect Request</name>
-    <raw>06100209001067000801c0a82a46f431</raw>
-    <root-type>KNXNetIPMessage</root-type>
-    <xml>
-      <DisconnectRequest className="org.apache.plc4x.java.knxnetip.readwrite.DisconnectRequest">
-        <communicationChannelId>103</communicationChannelId>
-        <hpaiControlEndpoint>
-          <hostProtocolCode>1</hostProtocolCode>
-          <ipAddress>
-            <addr>
-              <addr>192</addr>
-              <addr>168</addr>
-              <addr>42</addr>
-              <addr>70</addr>
-            </addr>
-          </ipAddress>
-          <ipPort>62513</ipPort>
-        </hpaiControlEndpoint>
-      </DisconnectRequest>
-    </xml>
-  </testcase>
-
-  <testcase>
-    <name>Disconnect Response</name>
-    <raw>0610020a00086600</raw>
-    <root-type>KNXNetIPMessage</root-type>
-    <xml>
-      <DisconnectResponse className="org.apache.plc4x.java.knxnetip.readwrite.DisconnectResponse">
-        <communicationChannelId>102</communicationChannelId>
-        <status>0</status>
-      </DisconnectResponse>
-    </xml>
-  </testcase>
-
-  <testcase>
-    <name>Tunneling Request</name>
-    <raw>06100420001c046b00002b0703010504024502bc360a1e0ce100810d</raw>
-    <root-type>KNXNetIPMessage</root-type>
-    <xml>
-      <TunnelingRequest className="org.apache.plc4x.java.knxnetip.readwrite.TunnelingRequest">
-        <tunnelingRequestDataBlock>
-          <communicationChannelId>107</communicationChannelId>
-          <sequenceCounter>0</sequenceCounter>
-        </tunnelingRequestDataBlock>
-        <cemi className="org.apache.plc4x.java.knxnetip.readwrite.CEMILBusmonInd">
-          <additionalInformationLength>7</additionalInformationLength>
-          <additionalInformation>
-            <additionalInformation className="org.apache.plc4x.java.knxnetip.readwrite.CEMIAdditionalInformationBusmonitorInfo">
-              <frameErrorFlag>false</frameErrorFlag>
-              <bitErrorFlag>false</bitErrorFlag>
-              <parityErrorFlag>false</parityErrorFlag>
-              <unknownFlag>false</unknownFlag>
-              <lostFlag>false</lostFlag>
-              <sequenceNumber>5</sequenceNumber>
-            </additionalInformation>
-            <additionalInformation className="org.apache.plc4x.java.knxnetip.readwrite.CEMIAdditionalInformationRelativeTimestamp">
-              <relativeTimestamp>
-                <timestamp>17666</timestamp>
-              </relativeTimestamp>
-            </additionalInformation>
-          </additionalInformation>
-          <rawFrame>
-            <rawFrame>188</rawFrame>
-            <rawFrame>54</rawFrame>
-            <rawFrame>10</rawFrame>
-            <rawFrame>30</rawFrame>
-            <rawFrame>12</rawFrame>
-            <rawFrame>225</rawFrame>
-            <rawFrame>0</rawFrame>
-            <rawFrame>129</rawFrame>
-            <rawFrame>13</rawFrame>
-          </rawFrame>
-        </cemi>
-      </TunnelingRequest>
-
-    </xml>
-  </testcase>
-
-  <testcase>
-    <name>Tunneling Response</name>
-    <raw>06100421000a046b0000</raw>
-    <root-type>KNXNetIPMessage</root-type>
-    <xml>
-      <TunnelingResponse className="org.apache.plc4x.java.knxnetip.readwrite.TunnelingResponse">
-        <tunnelingResponseDataBlock>
-          <communicationChannelId>107</communicationChannelId>
-          <sequenceCounter>0</sequenceCounter>
-          <status>0</status>
-        </tunnelingResponseDataBlock>
-      </TunnelingResponse>
-    </xml>
-  </testcase>
-
-  <testcase>
-    <name>Default</name>
-    <raw>0610020500180801c0a82a46c4090801c0a82a46c40a0203</raw>
-    <root-type>KNXNetIPMessage</root-type>
-    <xml>
-      <ConnectionRequest className="org.apache.plc4x.java.knxnetip.readwrite.ConnectionRequest">
-        <hpaiDiscoveryEndpoint>
-          <hostProtocolCode>1</hostProtocolCode>
-          <ipAddress>
-            <addr>
-              <addr>192</addr>
-              <addr>168</addr>
-              <addr>42</addr>
-              <addr>70</addr>
-            </addr>
-          </ipAddress>
-          <ipPort>50185</ipPort>
-        </hpaiDiscoveryEndpoint>
-        <hpaiDataEndpoint>
-          <hostProtocolCode>1</hostProtocolCode>
-          <ipAddress>
-            <addr>
-              <addr>192</addr>
-              <addr>168</addr>
-              <addr>42</addr>
-              <addr>70</addr>
-            </addr>
-          </ipAddress>
-          <ipPort>50186</ipPort>
-        </hpaiDataEndpoint>
-        <connectionRequestInformation className="org.apache.plc4x.java.knxnetip.readwrite.ConnectionRequestInformationDeviceManagement"/>
-      </ConnectionRequest>
-    </xml>
-  </testcase>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<test:testsuite xmlns:test="https://plc4x.apache.org/schemas/testsuite.xsd">
+
+  <name>KNXNet/IP</name>
+
+  <testcase>
+    <name>Search Request</name>
+    <raw>06100201000e0801c0a82a46ef8e</raw>
+    <root-type>KNXNetIPMessage</root-type>
+    <xml>
+      <SearchRequest className="org.apache.plc4x.java.knxnetip.readwrite.SearchRequest">
+        <hpaiIDiscoveryEndpoint>
+          <hostProtocolCode>1</hostProtocolCode>
+          <ipAddress>
+            <addr>
+              <addr>192</addr>
+              <addr>168</addr>
+              <addr>42</addr>
+              <addr>70</addr>
+            </addr>
+          </ipAddress>
+          <ipPort>61326</ipPort>
+        </hpaiIDiscoveryEndpoint>
+      </SearchRequest>
+    </xml>
+  </testcase>
+
+  <testcase>
+    <name>Search Response</name>
+    <raw>06100202004c0801c0a82a0b0e5736010200ffff000000082d409852e000170c000ab327553647697261204b4e582f49502d5363686e6974747374656c6c6500000000000802020103010401</raw>
+    <root-type>KNXNetIPMessage</root-type>
+    <xml>
+      <SearchResponse className="org.apache.plc4x.java.knxnetip.readwrite.SearchResponse">
+        <hpaiControlEndpoint>
+          <hostProtocolCode>1</hostProtocolCode>
+          <ipAddress>
+            <addr>
+              <addr>192</addr>
+              <addr>168</addr>
+              <addr>42</addr>
+              <addr>11</addr>
+            </addr>
+          </ipAddress>
+          <ipPort>3671</ipPort>
+        </hpaiControlEndpoint>
+        <dibDeviceInfo>
+          <descriptionType>1</descriptionType>
+          <knxMedium>2</knxMedium>
+          <deviceStatus>
+            <programMode>false</programMode>
+          </deviceStatus>
+          <knxAddress>
+            <mainGroup>15</mainGroup>
+            <middleGroup>15</middleGroup>
+            <subGroup>255</subGroup>
+          </knxAddress>
+          <projectInstallationIdentifier>
+            <projectNumber>0</projectNumber>
+            <installationNumber>0</installationNumber>
+          </projectInstallationIdentifier>
+          <knxNetIpDeviceSerialNumber>
+            <knxNetIpDeviceSerialNumber>0</knxNetIpDeviceSerialNumber>
+            <knxNetIpDeviceSerialNumber>8</knxNetIpDeviceSerialNumber>
+            <knxNetIpDeviceSerialNumber>45</knxNetIpDeviceSerialNumber>
+            <knxNetIpDeviceSerialNumber>64</knxNetIpDeviceSerialNumber>
+            <knxNetIpDeviceSerialNumber>152</knxNetIpDeviceSerialNumber>
+            <knxNetIpDeviceSerialNumber>82</knxNetIpDeviceSerialNumber>
+          </knxNetIpDeviceSerialNumber>
+          <knxNetIpDeviceMulticastAddress>
+            <addr>
+              <addr>224</addr>
+              <addr>0</addr>
+              <addr>23</addr>
+              <addr>12</addr>
+            </addr>
+          </knxNetIpDeviceMulticastAddress>
+          <knxNetIpDeviceMacAddress>
+            <addr>
+              <addr>0</addr>
+              <addr>10</addr>
+              <addr>179</addr>
+              <addr>39</addr>
+              <addr>85</addr>
+              <addr>54</addr>
+            </addr>
+          </knxNetIpDeviceMacAddress>
+          <deviceFriendlyName>
+            <deviceFriendlyName>71</deviceFriendlyName>
+            <deviceFriendlyName>105</deviceFriendlyName>
+            <deviceFriendlyName>114</deviceFriendlyName>
+            <deviceFriendlyName>97</deviceFriendlyName>
+            <deviceFriendlyName>32</deviceFriendlyName>
+            <deviceFriendlyName>75</deviceFriendlyName>
+            <deviceFriendlyName>78</deviceFriendlyName>
+            <deviceFriendlyName>88</deviceFriendlyName>
+            <deviceFriendlyName>47</deviceFriendlyName>
+            <deviceFriendlyName>73</deviceFriendlyName>
+            <deviceFriendlyName>80</deviceFriendlyName>
+            <deviceFriendlyName>45</deviceFriendlyName>
+            <deviceFriendlyName>83</deviceFriendlyName>
+            <deviceFriendlyName>99</deviceFriendlyName>
+            <deviceFriendlyName>104</deviceFriendlyName>
+            <deviceFriendlyName>110</deviceFriendlyName>
+            <deviceFriendlyName>105</deviceFriendlyName>
+            <deviceFriendlyName>116</deviceFriendlyName>
+            <deviceFriendlyName>116</deviceFriendlyName>
+            <deviceFriendlyName>115</deviceFriendlyName>
+            <deviceFriendlyName>116</deviceFriendlyName>
+            <deviceFriendlyName>101</deviceFriendlyName>
+            <deviceFriendlyName>108</deviceFriendlyName>
+            <deviceFriendlyName>108</deviceFriendlyName>
+            <deviceFriendlyName>101</deviceFriendlyName>
+            <deviceFriendlyName>0</deviceFriendlyName>
+            <deviceFriendlyName>0</deviceFriendlyName>
+            <deviceFriendlyName>0</deviceFriendlyName>
+            <deviceFriendlyName>0</deviceFriendlyName>
+            <deviceFriendlyName>0</deviceFriendlyName>
+          </deviceFriendlyName>
+        </dibDeviceInfo>
+        <dibSuppSvcFamilies>
+          <descriptionType>2</descriptionType>
+          <serviceIds>
+            <serviceIds className="org.apache.plc4x.java.knxnetip.readwrite.KnxNetIpCore">
+              <version>1</version>
+            </serviceIds>
+            <serviceIds className="org.apache.plc4x.java.knxnetip.readwrite.KnxNetIpDeviceManagement">
+              <version>1</version>
+            </serviceIds>
+            <serviceIds className="org.apache.plc4x.java.knxnetip.readwrite.KnxNetIpTunneling">
+              <version>1</version>
+            </serviceIds>
+          </serviceIds>
+        </dibSuppSvcFamilies>
+      </SearchResponse>
+    </xml>
+  </testcase>
+
+  <testcase>
+    <name>Description Request</name>
+    <raw>06100203000e0801000000000000</raw>
+    <root-type>KNXNetIPMessage</root-type>
+    <xml>
+      <DescriptionRequest className="org.apache.plc4x.java.knxnetip.readwrite.DescriptionRequest">
+        <hpaiControlEndpoint>
+          <hostProtocolCode>1</hostProtocolCode>
+          <ipAddress>
+            <addr>
+              <addr>0</addr>
+              <addr>0</addr>
+              <addr>0</addr>
+              <addr>0</addr>
+            </addr>
+          </ipAddress>
+          <ipPort>0</ipPort>
+        </hpaiControlEndpoint>
+      </DescriptionRequest>
+    </xml>
+  </testcase>
+
+  <testcase>
+    <name>Description Response</name>
+    <raw>06100204004436010200ffff000000082d409852e000170c000ab327553647697261204b4e582f49502d5363686e6974747374656c6c6500000000000802020103010401</raw>
+    <root-type>KNXNetIPMessage</root-type>
+    <xml>
+      <DescriptionResponse className="org.apache.plc4x.java.knxnetip.readwrite.DescriptionResponse">
+        <dibDeviceInfo>
+          <descriptionType>1</descriptionType>
+          <knxMedium>2</knxMedium>
+          <deviceStatus>
+            <programMode>false</programMode>
+          </deviceStatus>
+          <knxAddress>
+            <mainGroup>15</mainGroup>
+            <middleGroup>15</middleGroup>
+            <subGroup>255</subGroup>
+          </knxAddress>
+          <projectInstallationIdentifier>
+            <projectNumber>0</projectNumber>
+            <installationNumber>0</installationNumber>
+          </projectInstallationIdentifier>
+          <knxNetIpDeviceSerialNumber>
+            <knxNetIpDeviceSerialNumber>0</knxNetIpDeviceSerialNumber>
+            <knxNetIpDeviceSerialNumber>8</knxNetIpDeviceSerialNumber>
+            <knxNetIpDeviceSerialNumber>45</knxNetIpDeviceSerialNumber>
+            <knxNetIpDeviceSerialNumber>64</knxNetIpDeviceSerialNumber>
+            <knxNetIpDeviceSerialNumber>152</knxNetIpDeviceSerialNumber>
+            <knxNetIpDeviceSerialNumber>82</knxNetIpDeviceSerialNumber>
+          </knxNetIpDeviceSerialNumber>
+          <knxNetIpDeviceMulticastAddress>
+            <addr>
+              <addr>224</addr>
+              <addr>0</addr>
+              <addr>23</addr>
+              <addr>12</addr>
+            </addr>
+          </knxNetIpDeviceMulticastAddress>
+          <knxNetIpDeviceMacAddress>
+            <addr>
+              <addr>0</addr>
+              <addr>10</addr>
+              <addr>179</addr>
+              <addr>39</addr>
+              <addr>85</addr>
+              <addr>54</addr>
+            </addr>
+          </knxNetIpDeviceMacAddress>
+          <deviceFriendlyName>
+            <deviceFriendlyName>71</deviceFriendlyName>
+            <deviceFriendlyName>105</deviceFriendlyName>
+            <deviceFriendlyName>114</deviceFriendlyName>
+            <deviceFriendlyName>97</deviceFriendlyName>
+            <deviceFriendlyName>32</deviceFriendlyName>
+            <deviceFriendlyName>75</deviceFriendlyName>
+            <deviceFriendlyName>78</deviceFriendlyName>
+            <deviceFriendlyName>88</deviceFriendlyName>
+            <deviceFriendlyName>47</deviceFriendlyName>
+            <deviceFriendlyName>73</deviceFriendlyName>
+            <deviceFriendlyName>80</deviceFriendlyName>
+            <deviceFriendlyName>45</deviceFriendlyName>
+            <deviceFriendlyName>83</deviceFriendlyName>
+            <deviceFriendlyName>99</deviceFriendlyName>
+            <deviceFriendlyName>104</deviceFriendlyName>
+            <deviceFriendlyName>110</deviceFriendlyName>
+            <deviceFriendlyName>105</deviceFriendlyName>
+            <deviceFriendlyName>116</deviceFriendlyName>
+            <deviceFriendlyName>116</deviceFriendlyName>
+            <deviceFriendlyName>115</deviceFriendlyName>
+            <deviceFriendlyName>116</deviceFriendlyName>
+            <deviceFriendlyName>101</deviceFriendlyName>
+            <deviceFriendlyName>108</deviceFriendlyName>
+            <deviceFriendlyName>108</deviceFriendlyName>
+            <deviceFriendlyName>101</deviceFriendlyName>
+            <deviceFriendlyName>0</deviceFriendlyName>
+            <deviceFriendlyName>0</deviceFriendlyName>
+            <deviceFriendlyName>0</deviceFriendlyName>
+            <deviceFriendlyName>0</deviceFriendlyName>
+            <deviceFriendlyName>0</deviceFriendlyName>
+          </deviceFriendlyName>
+        </dibDeviceInfo>
+        <dibSuppSvcFamilies>
+          <descriptionType>2</descriptionType>
+          <serviceIds>
+            <serviceIds className="org.apache.plc4x.java.knxnetip.readwrite.KnxNetIpCore">
+              <version>1</version>
+            </serviceIds>
+            <serviceIds className="org.apache.plc4x.java.knxnetip.readwrite.KnxNetIpDeviceManagement">
+              <version>1</version>
+            </serviceIds>
+            <serviceIds className="org.apache.plc4x.java.knxnetip.readwrite.KnxNetIpTunneling">
+              <version>1</version>
+            </serviceIds>
+          </serviceIds>
+        </dibSuppSvcFamilies>
+      </DescriptionResponse>
+    </xml>
+  </testcase>
+
+  <testcase>
+    <name>Connect Request</name>
+    <raw>06100205001a0801c0a82a46f4310801c0a82a46f43204040200</raw>
+    <root-type>KNXNetIPMessage</root-type>
+    <xml>
+      <ConnectionRequest className="org.apache.plc4x.java.knxnetip.readwrite.ConnectionRequest">
+        <hpaiDiscoveryEndpoint>
+          <hostProtocolCode>1</hostProtocolCode>
+          <ipAddress>
+            <addr>
+              <addr>192</addr>
+              <addr>168</addr>
+              <addr>42</addr>
+              <addr>70</addr>
+            </addr>
+          </ipAddress>
+          <ipPort>62513</ipPort>
+        </hpaiDiscoveryEndpoint>
+        <hpaiDataEndpoint>
+          <hostProtocolCode>1</hostProtocolCode>
+          <ipAddress>
+            <addr>
+              <addr>192</addr>
+              <addr>168</addr>
+              <addr>42</addr>
+              <addr>70</addr>
+            </addr>
+          </ipAddress>
+          <ipPort>62514</ipPort>
+        </hpaiDataEndpoint>
+        <connectionRequestInformation className="org.apache.plc4x.java.knxnetip.readwrite.ConnectionRequestInformationTunnelConnection">
+          <knxLayer>2</knxLayer>
+        </connectionRequestInformation>
+      </ConnectionRequest>
+    </xml>
+  </testcase>
+
+  <testcase>
+    <name>Connect Response</name>
+    <raw>06100206001466000801c0a82a0b0e5704041101</raw>
+    <root-type>KNXNetIPMessage</root-type>
+    <xml>
+      <ConnectionResponse className="org.apache.plc4x.java.knxnetip.readwrite.ConnectionResponse">
+        <communicationChannelId>102</communicationChannelId>
+        <status>0</status>
+        <hpaiDataEndpoint>
+          <hostProtocolCode>1</hostProtocolCode>
+          <ipAddress>
+            <addr>
+              <addr>192</addr>
+              <addr>168</addr>
+              <addr>42</addr>
+              <addr>11</addr>
+            </addr>
+          </ipAddress>
+          <ipPort>3671</ipPort>
+        </hpaiDataEndpoint>
+        <connectionResponseDataBlock className="org.apache.plc4x.java.knxnetip.readwrite.ConnectionResponseDataBlockTunnelConnection">
+          <knxAddress>
+            <mainGroup>1</mainGroup>
+            <middleGroup>1</middleGroup>
+            <subGroup>1</subGroup>
+          </knxAddress>
+        </connectionResponseDataBlock>
+      </ConnectionResponse>
+    </xml>
+  </testcase>
+
+  <testcase>
+    <name>Connection State Request</name>
+    <raw>06100207001066000801c0a82a46f431</raw>
+    <root-type>KNXNetIPMessage</root-type>
+    <xml>
+      <ConnectionStateRequest className="org.apache.plc4x.java.knxnetip.readwrite.ConnectionStateRequest">
+        <communicationChannelId>102</communicationChannelId>
+        <hpaiControlEndpoint>
+          <hostProtocolCode>1</hostProtocolCode>
+          <ipAddress>
+            <addr>
+              <addr>192</addr>
+              <addr>168</addr>
+              <addr>42</addr>
+              <addr>70</addr>
+            </addr>
+          </ipAddress>
+          <ipPort>62513</ipPort>
+        </hpaiControlEndpoint>
+      </ConnectionStateRequest>
+    </xml>
+  </testcase>
+
+  <testcase>
+    <name>Connection State Response</name>
+    <raw>0610020800086600</raw>
+    <root-type>KNXNetIPMessage</root-type>
+    <xml>
+      <ConnectionStateResponse className="org.apache.plc4x.java.knxnetip.readwrite.ConnectionStateResponse">
+        <communicationChannelId>102</communicationChannelId>
+        <status>0</status>
+      </ConnectionStateResponse>
+    </xml>
+  </testcase>
+
+  <testcase>
+    <name>Device Configuration Request</name>
+    <raw>06100310001104670000fc000001531001</raw>
+    <root-type>KNXNetIPMessage</root-type>
+    <xml>
+      <DeviceConfigurationRequest className="org.apache.plc4x.java.knxnetip.readwrite.DeviceConfigurationRequest">
+        <deviceConfigurationRequestDataBlock>
+          <communicationChannelId>103</communicationChannelId>
+          <sequenceCounter>0</sequenceCounter>
+        </deviceConfigurationRequestDataBlock>
+        <cemi className="org.apache.plc4x.java.knxnetip.readwrite.CEMIMPropReadReq">
+          <interfaceObjectType>0</interfaceObjectType>
+          <objectInstance>1</objectInstance>
+          <propertyId>83</propertyId>
+          <numberOfElements>1</numberOfElements>
+          <startIndex>1</startIndex>
+        </cemi>
+      </DeviceConfigurationRequest>
+    </xml>
+  </testcase>
+
+  <testcase>
+    <name>Device Configuration Ack</name>
+    <raw>06100311000a04670000</raw>
+    <root-type>KNXNetIPMessage</root-type>
+    <xml>
+      <DeviceConfigurationAck className="org.apache.plc4x.java.knxnetip.readwrite.DeviceConfigurationAck">
+        <deviceConfigurationAckDataBlock>
+          <communicationChannelId>103</communicationChannelId>
+          <sequenceCounter>0</sequenceCounter>
+          <status>0</status>
+        </deviceConfigurationAckDataBlock>
+      </DeviceConfigurationAck>
+    </xml>
+  </testcase>
+
+  <testcase>
+    <name>Disconnect Request</name>
+    <raw>06100209001067000801c0a82a46f431</raw>
+    <root-type>KNXNetIPMessage</root-type>
+    <xml>
+      <DisconnectRequest className="org.apache.plc4x.java.knxnetip.readwrite.DisconnectRequest">
+        <communicationChannelId>103</communicationChannelId>
+        <hpaiControlEndpoint>
+          <hostProtocolCode>1</hostProtocolCode>
+          <ipAddress>
+            <addr>
+              <addr>192</addr>
+              <addr>168</addr>
+              <addr>42</addr>
+              <addr>70</addr>
+            </addr>
+          </ipAddress>
+          <ipPort>62513</ipPort>
+        </hpaiControlEndpoint>
+      </DisconnectRequest>
+    </xml>
+  </testcase>
+
+  <testcase>
+    <name>Disconnect Response</name>
+    <raw>0610020a00086600</raw>
+    <root-type>KNXNetIPMessage</root-type>
+    <xml>
+      <DisconnectResponse className="org.apache.plc4x.java.knxnetip.readwrite.DisconnectResponse">
+        <communicationChannelId>102</communicationChannelId>
+        <status>0</status>
+      </DisconnectResponse>
+    </xml>
+  </testcase>
+
+  <testcase>
+    <name>Tunneling Request</name>
+    <raw>06100420001c046b00002b0703010504024502bc360a1e0ce100810d</raw>
+    <root-type>KNXNetIPMessage</root-type>
+    <xml>
+      <TunnelingRequest className="org.apache.plc4x.java.knxnetip.readwrite.TunnelingRequest">
+        <tunnelingRequestDataBlock>
+          <communicationChannelId>107</communicationChannelId>
+          <sequenceCounter>0</sequenceCounter>
+        </tunnelingRequestDataBlock>
+        <cemi className="org.apache.plc4x.java.knxnetip.readwrite.CEMILBusmonInd">
+          <additionalInformationLength>7</additionalInformationLength>
+          <additionalInformation>
+            <additionalInformation className="org.apache.plc4x.java.knxnetip.readwrite.CEMIAdditionalInformationBusmonitorInfo">
+              <frameErrorFlag>false</frameErrorFlag>
+              <bitErrorFlag>false</bitErrorFlag>
+              <parityErrorFlag>false</parityErrorFlag>
+              <unknownFlag>false</unknownFlag>
+              <lostFlag>false</lostFlag>
+              <sequenceNumber>5</sequenceNumber>
+            </additionalInformation>
+            <additionalInformation className="org.apache.plc4x.java.knxnetip.readwrite.CEMIAdditionalInformationRelativeTimestamp">
+              <relativeTimestamp>
+                <timestamp>17666</timestamp>
+              </relativeTimestamp>
+            </additionalInformation>
+          </additionalInformation>
+          <rawFrame>
+            <rawFrame>188</rawFrame>
+            <rawFrame>54</rawFrame>
+            <rawFrame>10</rawFrame>
+            <rawFrame>30</rawFrame>
+            <rawFrame>12</rawFrame>
+            <rawFrame>225</rawFrame>
+            <rawFrame>0</rawFrame>
+            <rawFrame>129</rawFrame>
+            <rawFrame>13</rawFrame>
+          </rawFrame>
+        </cemi>
+      </TunnelingRequest>
+
+    </xml>
+  </testcase>
+
+  <testcase>
+    <name>Tunneling Response</name>
+    <raw>06100421000a046b0000</raw>
+    <root-type>KNXNetIPMessage</root-type>
+    <xml>
+      <TunnelingResponse className="org.apache.plc4x.java.knxnetip.readwrite.TunnelingResponse">
+        <tunnelingResponseDataBlock>
+          <communicationChannelId>107</communicationChannelId>
+          <sequenceCounter>0</sequenceCounter>
+          <status>0</status>
+        </tunnelingResponseDataBlock>
+      </TunnelingResponse>
+    </xml>
+  </testcase>
+
+  <testcase>
+    <name>Default</name>
+    <raw>0610020500180801c0a82a46c4090801c0a82a46c40a0203</raw>
+    <root-type>KNXNetIPMessage</root-type>
+    <xml>
+      <ConnectionRequest className="org.apache.plc4x.java.knxnetip.readwrite.ConnectionRequest">
+        <hpaiDiscoveryEndpoint>
+          <hostProtocolCode>1</hostProtocolCode>
+          <ipAddress>
+            <addr>
+              <addr>192</addr>
+              <addr>168</addr>
+              <addr>42</addr>
+              <addr>70</addr>
+            </addr>
+          </ipAddress>
+          <ipPort>50185</ipPort>
+        </hpaiDiscoveryEndpoint>
+        <hpaiDataEndpoint>
+          <hostProtocolCode>1</hostProtocolCode>
+          <ipAddress>
+            <addr>
+              <addr>192</addr>
+              <addr>168</addr>
+              <addr>42</addr>
+              <addr>70</addr>
+            </addr>
+          </ipAddress>
+          <ipPort>50186</ipPort>
+        </hpaiDataEndpoint>
+        <connectionRequestInformation className="org.apache.plc4x.java.knxnetip.readwrite.ConnectionRequestInformationDeviceManagement"/>
+      </ConnectionRequest>
+    </xml>
+  </testcase>
+
 </test:testsuite>
\ No newline at end of file
diff --git a/sandbox/test-java-passive-s7-driver/pom.xml b/sandbox/test-java-passive-s7-driver/pom.xml
index 123d77900a2..9f9a55e8ea4 100644
--- a/sandbox/test-java-passive-s7-driver/pom.xml
+++ b/sandbox/test-java-passive-s7-driver/pom.xml
@@ -1,100 +1,100 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.sandbox</groupId>
-    <artifactId>plc4x-sandbox</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>test-java-passive-s7-driver</artifactId>
-
-  <name>Sandbox: Test Generated S7 Driver (Passive)</name>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.plc4x.plugins</groupId>
-        <artifactId>plc4x-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>generate-driver</goal>
-            </goals>
-            <configuration>
-              <protocolName>s7</protocolName>
-              <languageName>java</languageName>
-              <outputFlavor>passive</outputFlavor>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-utils-driver-base-java</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-protocol-driver-base-raw-socket</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-build-utils-language-java</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-protocols-s7</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.sandbox</groupId>
+    <artifactId>plc4x-sandbox</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>test-java-passive-s7-driver</artifactId>
+
+  <name>Sandbox: Test Generated S7 Driver (Passive)</name>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.plc4x.plugins</groupId>
+        <artifactId>plc4x-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>generate-driver</goal>
+            </goals>
+            <configuration>
+              <protocolName>s7</protocolName>
+              <languageName>java</languageName>
+              <outputFlavor>passive</outputFlavor>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-utils-driver-base-java</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-protocol-driver-base-raw-socket</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-build-utils-language-java</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-protocols-s7</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/sandbox/test-java-passive-s7-driver/src/main/java/org/apache/plc4x/javapassive/s7/PassiveS7PlcDriver.java b/sandbox/test-java-passive-s7-driver/src/main/java/org/apache/plc4x/javapassive/s7/PassiveS7PlcDriver.java
index 1c08af07c08..6524b0f8c21 100644
--- a/sandbox/test-java-passive-s7-driver/src/main/java/org/apache/plc4x/javapassive/s7/PassiveS7PlcDriver.java
+++ b/sandbox/test-java-passive-s7-driver/src/main/java/org/apache/plc4x/javapassive/s7/PassiveS7PlcDriver.java
@@ -1,90 +1,90 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.javapassive.s7;
-
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.spi.PlcDriver;
-import org.apache.plc4x.java.utils.rawsockets.netty.RawSocketIpAddress;
-import org.apache.plc4x.javapassive.s7.connection.PassiveS7PlcConnection;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static org.apache.plc4x.java.utils.rawsockets.netty.RawSocketAddress.ALL_PROTOCOLS;
-
-/**
- * Implementation of the S7 protocol, based on:
- * - S7 Protocol
- * - ISO Transport Protocol (Class 0) (https://tools.ietf.org/html/rfc905)
- * - ISO on TCP (https://tools.ietf.org/html/rfc1006)
- * - TCP
- */
-public class PassiveS7PlcDriver implements PlcDriver {
-
-    private static final int ISO_ON_TCP_PORT = 102;
-
-    private static final Pattern S7_URI_PATTERN = Pattern.compile("^s7-passive://(?<networkDevice>.*)(?<params>\\?.*)?");
-
-    @Override
-    public String getProtocolCode() {
-        return "s7-passive";
-    }
-
-    @Override
-    public String getProtocolName() {
-        return "Siemens S7 (Passive-Mode)";
-    }
-
-    @Override
-    public PlcConnection connect(String url) throws PlcConnectionException {
-        Matcher matcher = S7_URI_PATTERN.matcher(url);
-        if (!matcher.matches()) {
-            throw new PlcConnectionException(
-                "Connection url doesn't match the format 's7-passive://{network-device}'");
-        }
-        String networkDevice = matcher.group("networkDevice");
-
-        String params = matcher.group("params") != null ? matcher.group("params").substring(1) : null;
-
-        try {
-            RawSocketIpAddress rawSocketAddress = new RawSocketIpAddress(
-                networkDevice, ALL_PROTOCOLS, null, ISO_ON_TCP_PORT);
-            return new PassiveS7PlcConnection(rawSocketAddress, params);
-        } catch (Exception e) {
-            throw new PlcConnectionException("Error connecting to host", e);
-        }
-    }
-
-    @Override
-    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
-        throw new PlcConnectionException("Basic S7 connections don't support authentication.");
-    }
-
-    public static void main(String[] args) throws Exception {
-        try (PlcConnection connection = new PlcDriverManager().getConnection("s7-passive://en10")) {
-            PlcReadRequest readRequest = connection.readRequestBuilder().addItem("hurz", "lalala").build();
-            readRequest.execute().get();
-        }
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.javapassive.s7;
+
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.authentication.PlcAuthentication;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.spi.PlcDriver;
+import org.apache.plc4x.java.utils.rawsockets.netty.RawSocketIpAddress;
+import org.apache.plc4x.javapassive.s7.connection.PassiveS7PlcConnection;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static org.apache.plc4x.java.utils.rawsockets.netty.RawSocketAddress.ALL_PROTOCOLS;
+
+/**
+ * Implementation of the S7 protocol, based on:
+ * - S7 Protocol
+ * - ISO Transport Protocol (Class 0) (https://tools.ietf.org/html/rfc905)
+ * - ISO on TCP (https://tools.ietf.org/html/rfc1006)
+ * - TCP
+ */
+public class PassiveS7PlcDriver implements PlcDriver {
+
+    private static final int ISO_ON_TCP_PORT = 102;
+
+    private static final Pattern S7_URI_PATTERN = Pattern.compile("^s7-passive://(?<networkDevice>.*)(?<params>\\?.*)?");
+
+    @Override
+    public String getProtocolCode() {
+        return "s7-passive";
+    }
+
+    @Override
+    public String getProtocolName() {
+        return "Siemens S7 (Passive-Mode)";
+    }
+
+    @Override
+    public PlcConnection connect(String url) throws PlcConnectionException {
+        Matcher matcher = S7_URI_PATTERN.matcher(url);
+        if (!matcher.matches()) {
+            throw new PlcConnectionException(
+                "Connection url doesn't match the format 's7-passive://{network-device}'");
+        }
+        String networkDevice = matcher.group("networkDevice");
+
+        String params = matcher.group("params") != null ? matcher.group("params").substring(1) : null;
+
+        try {
+            RawSocketIpAddress rawSocketAddress = new RawSocketIpAddress(
+                networkDevice, ALL_PROTOCOLS, null, ISO_ON_TCP_PORT);
+            return new PassiveS7PlcConnection(rawSocketAddress, params);
+        } catch (Exception e) {
+            throw new PlcConnectionException("Error connecting to host", e);
+        }
+    }
+
+    @Override
+    public PlcConnection connect(String url, PlcAuthentication authentication) throws PlcConnectionException {
+        throw new PlcConnectionException("Basic S7 connections don't support authentication.");
+    }
+
+    public static void main(String[] args) throws Exception {
+        try (PlcConnection connection = new PlcDriverManager().getConnection("s7-passive://en10")) {
+            PlcReadRequest readRequest = connection.readRequestBuilder().addItem("hurz", "lalala").build();
+            readRequest.execute().get();
+        }
+    }
+
+}
diff --git a/sandbox/test-java-passive-s7-driver/src/main/java/org/apache/plc4x/javapassive/s7/connection/PassiveS7PlcConnection.java b/sandbox/test-java-passive-s7-driver/src/main/java/org/apache/plc4x/javapassive/s7/connection/PassiveS7PlcConnection.java
index a56b437df4d..b1b628fbc16 100644
--- a/sandbox/test-java-passive-s7-driver/src/main/java/org/apache/plc4x/javapassive/s7/connection/PassiveS7PlcConnection.java
+++ b/sandbox/test-java-passive-s7-driver/src/main/java/org/apache/plc4x/javapassive/s7/connection/PassiveS7PlcConnection.java
@@ -1,99 +1,99 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.javapassive.s7.connection;
-
-import io.netty.channel.*;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.connection.ChannelFactory;
-import org.apache.plc4x.java.base.connection.DefaultPlcFieldHandler;
-import org.apache.plc4x.java.base.connection.NettyPlcConnection;
-import org.apache.plc4x.java.base.connection.RawSocketChannelFactory;
-import org.apache.plc4x.java.base.events.ConnectedEvent;
-import org.apache.plc4x.java.base.messages.DefaultPlcReadRequest;
-import org.apache.plc4x.java.base.messages.PlcReader;
-import org.apache.plc4x.java.utils.rawsockets.netty.RawSocketIpAddress;
-import org.apache.plc4x.java.utils.rawsockets.netty.TcpIpPacketHandler;
-import org.apache.plc4x.javapassive.s7.protocol.HelloWorldProtocol;
-import org.apache.plc4x.javapassive.s7.protocol.PassiveS7Protocol;
-
-import java.util.concurrent.CompletableFuture;
-
-public class PassiveS7PlcConnection extends NettyPlcConnection implements PlcReader {
-
-    public PassiveS7PlcConnection(RawSocketIpAddress address, String params) {
-        this(new RawSocketChannelFactory(address.getDeviceName(), null,
-            address.getPort(), -1, new TcpIpPacketHandler()), params);
-    }
-
-    public PassiveS7PlcConnection(ChannelFactory channelFactory, String param) {
-        super(channelFactory, false);
-    }
-
-    @Override
-    protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
-        return new ChannelInitializer() {
-            @Override
-            protected void initChannel(Channel channel) {
-                // Build the protocol stack for communicating with the s7 protocol.
-                ChannelPipeline pipeline = channel.pipeline();
-                pipeline.addLast(new ChannelInboundHandlerAdapter() {
-                    @Override
-                    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
-                        if (evt instanceof ConnectedEvent) {
-                            sessionSetupCompleteFuture.complete(null);
-                        } else {
-                            super.userEventTriggered(ctx, evt);
-                        }
-                    }
-                });
-                pipeline.addLast(new PassiveS7Protocol());
-                pipeline.addLast(new HelloWorldProtocol());
-            }
-        };
-    }
-
-    @Override
-    public boolean canRead() {
-        return true;
-    }
-
-    @Override
-    public PlcReadRequest.Builder readRequestBuilder() {
-        return new DefaultPlcReadRequest.Builder(this, new DefaultPlcFieldHandler() {
-            @Override
-            public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
-                return new PlcField() {
-                    @Override
-                    public Class<?> getDefaultJavaType() {
-                        return String.class;
-                    }
-                };
-            }
-        });
-    }
-
-    @Override
-    public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
-        return new CompletableFuture<>();
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.javapassive.s7.connection;
+
+import io.netty.channel.*;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.connection.ChannelFactory;
+import org.apache.plc4x.java.base.connection.DefaultPlcFieldHandler;
+import org.apache.plc4x.java.base.connection.NettyPlcConnection;
+import org.apache.plc4x.java.base.connection.RawSocketChannelFactory;
+import org.apache.plc4x.java.base.events.ConnectedEvent;
+import org.apache.plc4x.java.base.messages.DefaultPlcReadRequest;
+import org.apache.plc4x.java.base.messages.PlcReader;
+import org.apache.plc4x.java.utils.rawsockets.netty.RawSocketIpAddress;
+import org.apache.plc4x.java.utils.rawsockets.netty.TcpIpPacketHandler;
+import org.apache.plc4x.javapassive.s7.protocol.HelloWorldProtocol;
+import org.apache.plc4x.javapassive.s7.protocol.PassiveS7Protocol;
+
+import java.util.concurrent.CompletableFuture;
+
+public class PassiveS7PlcConnection extends NettyPlcConnection implements PlcReader {
+
+    public PassiveS7PlcConnection(RawSocketIpAddress address, String params) {
+        this(new RawSocketChannelFactory(address.getDeviceName(), null,
+            address.getPort(), -1, new TcpIpPacketHandler()), params);
+    }
+
+    public PassiveS7PlcConnection(ChannelFactory channelFactory, String param) {
+        super(channelFactory, false);
+    }
+
+    @Override
+    protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
+        return new ChannelInitializer() {
+            @Override
+            protected void initChannel(Channel channel) {
+                // Build the protocol stack for communicating with the s7 protocol.
+                ChannelPipeline pipeline = channel.pipeline();
+                pipeline.addLast(new ChannelInboundHandlerAdapter() {
+                    @Override
+                    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+                        if (evt instanceof ConnectedEvent) {
+                            sessionSetupCompleteFuture.complete(null);
+                        } else {
+                            super.userEventTriggered(ctx, evt);
+                        }
+                    }
+                });
+                pipeline.addLast(new PassiveS7Protocol());
+                pipeline.addLast(new HelloWorldProtocol());
+            }
+        };
+    }
+
+    @Override
+    public boolean canRead() {
+        return true;
+    }
+
+    @Override
+    public PlcReadRequest.Builder readRequestBuilder() {
+        return new DefaultPlcReadRequest.Builder(this, new DefaultPlcFieldHandler() {
+            @Override
+            public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
+                return new PlcField() {
+                    @Override
+                    public Class<?> getDefaultJavaType() {
+                        return String.class;
+                    }
+                };
+            }
+        });
+    }
+
+    @Override
+    public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
+        return new CompletableFuture<>();
+    }
+
+}
diff --git a/sandbox/test-java-passive-s7-driver/src/main/java/org/apache/plc4x/javapassive/s7/protocol/HelloWorldProtocol.java b/sandbox/test-java-passive-s7-driver/src/main/java/org/apache/plc4x/javapassive/s7/protocol/HelloWorldProtocol.java
index 8f6f455fce8..517c9654559 100644
--- a/sandbox/test-java-passive-s7-driver/src/main/java/org/apache/plc4x/javapassive/s7/protocol/HelloWorldProtocol.java
+++ b/sandbox/test-java-passive-s7-driver/src/main/java/org/apache/plc4x/javapassive/s7/protocol/HelloWorldProtocol.java
@@ -1,48 +1,48 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.javapassive.s7.protocol;
-
-import io.netty.channel.ChannelHandlerContext;
-import org.apache.plc4x.java.base.PlcMessageToMessageCodec;
-import org.apache.plc4x.java.base.messages.PlcRequestContainer;
-import org.apache.plc4x.java.s7.passive.S7Message;
-import org.apache.plc4x.java.s7.passive.TPKTPacket;
-
-import java.util.List;
-
-public class HelloWorldProtocol extends PlcMessageToMessageCodec<TPKTPacket, PlcRequestContainer> {
-
-    @Override
-    protected void encode(ChannelHandlerContext channelHandlerContext, PlcRequestContainer plcRequestContainer, List<Object> list) throws Exception {
-        System.out.println(plcRequestContainer);
-    }
-
-    @Override
-    protected void decode(ChannelHandlerContext channelHandlerContext, TPKTPacket tpktPacket, List<Object> list) throws Exception {
-        StringBuilder sb = new StringBuilder();
-        sb.append("[").append(tpktPacket.getPayload().getClass().getName());
-        if(tpktPacket.getPayload().getPayload() != null) {
-            S7Message s7Message = tpktPacket.getPayload().getPayload();
-            sb.append(" \n  [").append(s7Message.getClass()).append("]\n");
-        }
-        sb.append("]");
-        System.out.println(sb.toString());
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.javapassive.s7.protocol;
+
+import io.netty.channel.ChannelHandlerContext;
+import org.apache.plc4x.java.base.PlcMessageToMessageCodec;
+import org.apache.plc4x.java.base.messages.PlcRequestContainer;
+import org.apache.plc4x.java.s7.passive.S7Message;
+import org.apache.plc4x.java.s7.passive.TPKTPacket;
+
+import java.util.List;
+
+public class HelloWorldProtocol extends PlcMessageToMessageCodec<TPKTPacket, PlcRequestContainer> {
+
+    @Override
+    protected void encode(ChannelHandlerContext channelHandlerContext, PlcRequestContainer plcRequestContainer, List<Object> list) throws Exception {
+        System.out.println(plcRequestContainer);
+    }
+
+    @Override
+    protected void decode(ChannelHandlerContext channelHandlerContext, TPKTPacket tpktPacket, List<Object> list) throws Exception {
+        StringBuilder sb = new StringBuilder();
+        sb.append("[").append(tpktPacket.getPayload().getClass().getName());
+        if(tpktPacket.getPayload().getPayload() != null) {
+            S7Message s7Message = tpktPacket.getPayload().getPayload();
+            sb.append(" \n  [").append(s7Message.getClass()).append("]\n");
+        }
+        sb.append("]");
+        System.out.println(sb.toString());
+    }
+
+}
diff --git a/sandbox/test-java-passive-s7-driver/src/main/java/org/apache/plc4x/javapassive/s7/protocol/PassiveS7Protocol.java b/sandbox/test-java-passive-s7-driver/src/main/java/org/apache/plc4x/javapassive/s7/protocol/PassiveS7Protocol.java
index 038f84a041b..e61d7322241 100644
--- a/sandbox/test-java-passive-s7-driver/src/main/java/org/apache/plc4x/javapassive/s7/protocol/PassiveS7Protocol.java
+++ b/sandbox/test-java-passive-s7-driver/src/main/java/org/apache/plc4x/javapassive/s7/protocol/PassiveS7Protocol.java
@@ -1,62 +1,62 @@
-/*
-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
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.plc4x.javapassive.s7.protocol;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import org.apache.plc4x.java.base.PlcByteToMessageCodec;
-import org.apache.plc4x.java.s7.passive.TPKTPacket;
-import org.apache.plc4x.java.s7.passive.io.TPKTPacketIO;
-import org.apache.plc4x.java.utils.ReadBuffer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-
-public class PassiveS7Protocol extends PlcByteToMessageCodec<TPKTPacket> {
-
-    private static final Logger logger = LoggerFactory.getLogger(PassiveS7Protocol.class);
-
-    private TPKTPacketIO io;
-
-    public PassiveS7Protocol() {
-        io = new TPKTPacketIO();
-    }
-
-    @Override
-    protected void encode(ChannelHandlerContext channelHandlerContext, TPKTPacket tpktPacket, ByteBuf byteBuf) throws Exception {
-        System.out.println(tpktPacket);
-    }
-
-    @Override
-    protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List<Object> out) throws Exception {
-        byte[] bytes = new byte[byteBuf.readableBytes()];
-        byteBuf.readBytes(bytes);
-        ReadBuffer readBuffer = new ReadBuffer(bytes);
-        while(readBuffer.getPos() < bytes.length) {
-            try {
-                TPKTPacket packet = io.parse(readBuffer);
-                out.add(packet);
-            } catch(Exception e) {
-                logger.warn("Error decoding package: " + e.getMessage());
-            }
-        }
-    }
-
-}
+/*
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.javapassive.s7.protocol;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import org.apache.plc4x.java.base.PlcByteToMessageCodec;
+import org.apache.plc4x.java.s7.passive.TPKTPacket;
+import org.apache.plc4x.java.s7.passive.io.TPKTPacketIO;
+import org.apache.plc4x.java.utils.ReadBuffer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+public class PassiveS7Protocol extends PlcByteToMessageCodec<TPKTPacket> {
+
+    private static final Logger logger = LoggerFactory.getLogger(PassiveS7Protocol.class);
+
+    private TPKTPacketIO io;
+
+    public PassiveS7Protocol() {
+        io = new TPKTPacketIO();
+    }
+
+    @Override
+    protected void encode(ChannelHandlerContext channelHandlerContext, TPKTPacket tpktPacket, ByteBuf byteBuf) throws Exception {
+        System.out.println(tpktPacket);
+    }
+
+    @Override
+    protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List<Object> out) throws Exception {
+        byte[] bytes = new byte[byteBuf.readableBytes()];
+        byteBuf.readBytes(bytes);
+        ReadBuffer readBuffer = new ReadBuffer(bytes);
+        while(readBuffer.getPos() < bytes.length) {
+            try {
+                TPKTPacket packet = io.parse(readBuffer);
+                out.add(packet);
+            } catch(Exception e) {
+                logger.warn("Error decoding package: " + e.getMessage());
+            }
+        }
+    }
+
+}
diff --git a/sandbox/test-java-passive-s7-driver/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver b/sandbox/test-java-passive-s7-driver/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
index df3c9a7fef6..a2185fb507e 100644
--- a/sandbox/test-java-passive-s7-driver/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
+++ b/sandbox/test-java-passive-s7-driver/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
@@ -1,19 +1,19 @@
-#
-# 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
-#
-#   http://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.
-#
-org.apache.plc4x.javapassive.s7.PassiveS7PlcDriver
+#
+# 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
+#
+#   http://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.
+#
+org.apache.plc4x.javapassive.s7.PassiveS7PlcDriver
diff --git a/sandbox/test-java-passive-s7-driver/src/test/java/BenchmarkGeneratedPassiveS7.java b/sandbox/test-java-passive-s7-driver/src/test/java/BenchmarkGeneratedPassiveS7.java
index a9ecd7aab00..d6c0ba35d84 100644
--- a/sandbox/test-java-passive-s7-driver/src/test/java/BenchmarkGeneratedPassiveS7.java
+++ b/sandbox/test-java-passive-s7-driver/src/test/java/BenchmarkGeneratedPassiveS7.java
@@ -1,45 +1,45 @@
-/*
- 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
-
-     http://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.
- */
-
-import org.apache.commons.codec.binary.Hex;
-import org.apache.plc4x.java.s7.passive.TPKTPacket;
-import org.apache.plc4x.java.s7.passive.io.TPKTPacketIO;
-import org.apache.plc4x.java.utils.ReadBuffer;
-
-public class BenchmarkGeneratedPassiveS7 {
-
-    public static void main(String[] args) throws Exception {
-        byte[] rData = Hex.decodeHex("0300006702f080320100000001005600000407120a10060001032b84000160120a10020001032b840001a0120a10010001032b840001a9120a10050001032b84000150120a10020001032b84000198120a10040001032b84000140120a10020001032b84000190");
-        long start = System.currentTimeMillis();
-        int numRunsParse = 2000000;
-        TPKTPacketIO tpktPacketIO = new TPKTPacketIO();
-
-        // Benchmark the parsing code
-        TPKTPacket packet = null;
-        for(int i = 0; i < numRunsParse; i++) {
-            ReadBuffer rBuf = new ReadBuffer(rData);
-            packet = tpktPacketIO.parse(rBuf);
-        }
-        long endParsing = System.currentTimeMillis();
-
-        System.out.println("Parsed " + numRunsParse + " packets in " + (endParsing - start) + "ms");
-        System.out.println("That's " + ((float) (endParsing - start) / numRunsParse) + "ms per packet");
-    }
-
-}
+/*
+ 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
+
+     http://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.
+ */
+
+import org.apache.commons.codec.binary.Hex;
+import org.apache.plc4x.java.s7.passive.TPKTPacket;
+import org.apache.plc4x.java.s7.passive.io.TPKTPacketIO;
+import org.apache.plc4x.java.utils.ReadBuffer;
+
+public class BenchmarkGeneratedPassiveS7 {
+
+    public static void main(String[] args) throws Exception {
+        byte[] rData = Hex.decodeHex("0300006702f080320100000001005600000407120a10060001032b84000160120a10020001032b840001a0120a10010001032b840001a9120a10050001032b84000150120a10020001032b84000198120a10040001032b84000140120a10020001032b84000190");
+        long start = System.currentTimeMillis();
+        int numRunsParse = 2000000;
+        TPKTPacketIO tpktPacketIO = new TPKTPacketIO();
+
+        // Benchmark the parsing code
+        TPKTPacket packet = null;
+        for(int i = 0; i < numRunsParse; i++) {
+            ReadBuffer rBuf = new ReadBuffer(rData);
+            packet = tpktPacketIO.parse(rBuf);
+        }
+        long endParsing = System.currentTimeMillis();
+
+        System.out.println("Parsed " + numRunsParse + " packets in " + (endParsing - start) + "ms");
+        System.out.println("That's " + ((float) (endParsing - start) / numRunsParse) + "ms per packet");
+    }
+
+}
diff --git a/sandbox/test-java-s7-driver/pom.xml b/sandbox/test-java-s7-driver/pom.xml
index 1cf991106b4..7a1c2052cb0 100644
--- a/sandbox/test-java-s7-driver/pom.xml
+++ b/sandbox/test-java-s7-driver/pom.xml
@@ -1,90 +1,90 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.sandbox</groupId>
-    <artifactId>plc4x-sandbox</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>test-java-s7-driver</artifactId>
-
-  <name>Sandbox: Test Generated S7 Driver</name>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.plc4x.plugins</groupId>
-        <artifactId>plc4x-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>generate-driver</goal>
-            </goals>
-            <configuration>
-              <protocolName>s7</protocolName>
-              <languageName>java</languageName>
-              <outputFlavor>read-write</outputFlavor>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-utils-driver-base-java</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-build-utils-language-java</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-protocols-s7</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.sandbox</groupId>
+    <artifactId>plc4x-sandbox</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>test-java-s7-driver</artifactId>
+
+  <name>Sandbox: Test Generated S7 Driver</name>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.plc4x.plugins</groupId>
+        <artifactId>plc4x-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>generate-driver</goal>
+            </goals>
+            <configuration>
+              <protocolName>s7</protocolName>
+              <languageName>java</languageName>
+              <outputFlavor>read-write</outputFlavor>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-utils-driver-base-java</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-build-utils-language-java</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-protocols-s7</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/sandbox/test-java-s7-driver/src/test/java/BenchmarkGeneratedS7.java b/sandbox/test-java-s7-driver/src/test/java/BenchmarkGeneratedS7.java
index 67cbe2f3e2e..2dcc24e542f 100644
--- a/sandbox/test-java-s7-driver/src/test/java/BenchmarkGeneratedS7.java
+++ b/sandbox/test-java-s7-driver/src/test/java/BenchmarkGeneratedS7.java
@@ -1,71 +1,71 @@
-/*
- 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
-
-     http://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.
- */
-
-import org.apache.commons.codec.binary.Hex;
-import org.apache.plc4x.java.s7.readwrite.TPKTPacket;
-import org.apache.plc4x.java.s7.readwrite.io.TPKTPacketIO;
-import org.apache.plc4x.java.utils.ReadBuffer;
-import org.apache.plc4x.java.utils.WriteBuffer;
-
-import java.util.Arrays;
-
-public class BenchmarkGeneratedS7 {
-
-    public static void main(String[] args) throws Exception {
-        byte[] rData = Hex.decodeHex("0300006702f080320100000001005600000407120a10060001032b84000160120a10020001032b840001a0120a10010001032b840001a9120a10050001032b84000150120a10020001032b84000198120a10040001032b84000140120a10020001032b84000190");
-        long start = System.currentTimeMillis();
-        int numRunsParse = 2000000;
-        TPKTPacketIO tpktPacketIO = new TPKTPacketIO();
-
-        // Benchmark the parsing code
-        TPKTPacket packet = null;
-        for(int i = 0; i < numRunsParse; i++) {
-            ReadBuffer rBuf = new ReadBuffer(rData);
-            packet = tpktPacketIO.parse(rBuf);
-        }
-        long endParsing = System.currentTimeMillis();
-
-        System.out.println("Parsed " + numRunsParse + " packets in " + (endParsing - start) + "ms");
-        System.out.println("That's " + ((float) (endParsing - start) / numRunsParse) + "ms per packet");
-
-        // Benchmark the serializing code
-        int numRunsSerialize = 2000000;
-        byte[] oData = null;
-        for(int i = 0; i < numRunsSerialize; i++) {
-            WriteBuffer wBuf = new WriteBuffer(packet.getLengthInBytes());
-            tpktPacketIO.serialize(wBuf, packet);
-            oData = wBuf.getData();
-        }
-        long endSerializing = System.currentTimeMillis();
-
-        System.out.println("Serialized " + numRunsSerialize + " packets in " + (endSerializing - endParsing) + "ms");
-        System.out.println("That's " + ((float) (endSerializing - endParsing) / numRunsSerialize) + "ms per packet");
-        if(!Arrays.equals(rData, oData)) {
-            for(int i = 0; i < rData.length; i++) {
-                if(rData[i] != oData[i]) {
-                    System.out.println("Difference in byte " + i);
-                }
-            }
-            System.out.println("Not equals");
-        } else {
-            System.out.println("Bytes equal");
-        }
-    }
-
-}
+/*
+ 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
+
+     http://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.
+ */
+
+import org.apache.commons.codec.binary.Hex;
+import org.apache.plc4x.java.s7.readwrite.TPKTPacket;
+import org.apache.plc4x.java.s7.readwrite.io.TPKTPacketIO;
+import org.apache.plc4x.java.utils.ReadBuffer;
+import org.apache.plc4x.java.utils.WriteBuffer;
+
+import java.util.Arrays;
+
+public class BenchmarkGeneratedS7 {
+
+    public static void main(String[] args) throws Exception {
+        byte[] rData = Hex.decodeHex("0300006702f080320100000001005600000407120a10060001032b84000160120a10020001032b840001a0120a10010001032b840001a9120a10050001032b84000150120a10020001032b84000198120a10040001032b84000140120a10020001032b84000190");
+        long start = System.currentTimeMillis();
+        int numRunsParse = 2000000;
+        TPKTPacketIO tpktPacketIO = new TPKTPacketIO();
+
+        // Benchmark the parsing code
+        TPKTPacket packet = null;
+        for(int i = 0; i < numRunsParse; i++) {
+            ReadBuffer rBuf = new ReadBuffer(rData);
+            packet = tpktPacketIO.parse(rBuf);
+        }
+        long endParsing = System.currentTimeMillis();
+
+        System.out.println("Parsed " + numRunsParse + " packets in " + (endParsing - start) + "ms");
+        System.out.println("That's " + ((float) (endParsing - start) / numRunsParse) + "ms per packet");
+
+        // Benchmark the serializing code
+        int numRunsSerialize = 2000000;
+        byte[] oData = null;
+        for(int i = 0; i < numRunsSerialize; i++) {
+            WriteBuffer wBuf = new WriteBuffer(packet.getLengthInBytes());
+            tpktPacketIO.serialize(wBuf, packet);
+            oData = wBuf.getData();
+        }
+        long endSerializing = System.currentTimeMillis();
+
+        System.out.println("Serialized " + numRunsSerialize + " packets in " + (endSerializing - endParsing) + "ms");
+        System.out.println("That's " + ((float) (endSerializing - endParsing) / numRunsSerialize) + "ms per packet");
+        if(!Arrays.equals(rData, oData)) {
+            for(int i = 0; i < rData.length; i++) {
+                if(rData[i] != oData[i]) {
+                    System.out.println("Difference in byte " + i);
+                }
+            }
+            System.out.println("Not equals");
+        } else {
+            System.out.println("Bytes equal");
+        }
+    }
+
+}
diff --git a/src/main/script/prerequisiteCheck.groovy b/src/main/script/prerequisiteCheck.groovy
index 23c168dfa83..14ba55bf9f2 100644
--- a/src/main/script/prerequisiteCheck.groovy
+++ b/src/main/script/prerequisiteCheck.groovy
@@ -1,365 +1,365 @@
-import java.util.regex.Matcher
-
-/*
- 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
-
-     http://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.
- */
-
-allConditionsMet = true
-
-baseDirectory = project.model.pomFile.parent
-
-/*
- Checks if a given version number is at least as high as a given reference version.
-*/
-def checkVersionAtLeast(String current, String minimum) {
-    def currentSegments = current.tokenize('.')
-    def minimumSegments = minimum.tokenize('.')
-    def numSegments = Math.min(currentSegments.size(), minimumSegments.size())
-    for (int i = 0; i < numSegments; ++i) {
-        def currentSegment = currentSegments[i].toInteger()
-        def minimumSegment = minimumSegments[i].toInteger()
-        if(currentSegment < minimumSegment) {
-            println current.padRight(14) + "FAILED (required " + minimum + ")"
-            return false
-        } else if(currentSegment > minimumSegment) {
-            println current.padRight(14) + "OK"
-            return true
-        }
-    }
-    def curNotShorter = currentSegments.size() >= minimumSegments.size()
-    if(curNotShorter) {
-        println current.padRight(14) + " OK"
-    } else {
-        println current.padRight(14) + " (required " + minimum + ")"
-    }
-    curNotShorter
-}
-
-def checkBison() {
-    print "Detecting Bison version:   "
-    def output = "bison --version".execute().text
-    Matcher matcher = extractVersion(output)
-    if(matcher.size() > 0) {
-        def curVersion = matcher[0][1]
-        def result = checkVersionAtLeast(curVersion, "2.4.0")
-        if(!result) {
-            allConditionsMet = false
-        }
-    } else {
-        println "missing"
-        allConditionsMet = false
-    }
-}
-
-def checkDotnet() {
-    print "Detecting Dotnet version:  "
-    def output = "dotnet --version".execute().text
-    Matcher matcher = extractVersion(output)
-    if(matcher.size() > 0) {
-        def curVersion = matcher[0][1]
-        def result = checkVersionAtLeast(curVersion, "2.0.0")
-        if(!result) {
-            allConditionsMet = false
-        }
-    } else {
-        println "missing"
-        allConditionsMet = false
-    }
-}
-
-def checkFlex() {
-    print "Detecting Flex version:    "
-    def output = "flex --version".execute().text
-    Matcher matcher = extractVersion(output)
-    if(matcher.size() > 0) {
-        def curVersion = matcher[0][1]
-        def result = checkVersionAtLeast(curVersion, "2.0.0")
-        if(!result) {
-            allConditionsMet = false
-        }
-    } else {
-        println "missing"
-        allConditionsMet = false
-    }
-}
-
-def checkGcc() {
-    print "Detecting Gcc version:     "
-    def output = "gcc --version".execute().text
-    Matcher matcher = extractVersion(output)
-    if(matcher.size() > 0) {
-        def curVersion = matcher[0][1]
-        def result = checkVersionAtLeast(curVersion, "1.0.0")
-        if(!result) {
-            allConditionsMet = false
-        }
-    } else {
-        println "missing"
-        allConditionsMet = false
-    }
-}
-
-def checkGit() {
-    print "Detecting Git version:     "
-    def output = "git --version".execute().text
-    Matcher matcher = extractVersion(output)
-    if(matcher.size() > 0) {
-        def curVersion = matcher[0][1]
-        def result = checkVersionAtLeast(curVersion, "1.0.0")
-        if(!result) {
-            allConditionsMet = false
-        }
-    } else {
-        println "missing"
-        allConditionsMet = false
-    }
-}
-
-def checkGpp() {
-    print "Detecting G++ version:     "
-    def output = "g++ --version".execute().text
-    Matcher matcher = extractVersion(output)
-    if(matcher.size() > 0) {
-        def curVersion = matcher[0][1]
-        def result = checkVersionAtLeast(curVersion, "1.0.0")
-        if(!result) {
-            allConditionsMet = false
-        }
-    } else {
-        println "missing"
-        allConditionsMet = false
-    }
-}
-
-def checkClang() {
-    print "Detecting clang version:   "
-    def output = "clang --version".execute().text
-    Matcher matcher = extractVersion(output)
-    if(matcher.size() > 0) {
-        def curVersion = matcher[0][1]
-        def result = checkVersionAtLeast(curVersion, "1.0.0")
-        if(!result) {
-            allConditionsMet = false
-        }
-    } else {
-        println "missing"
-        allConditionsMet = false
-    }
-}
-
-def checkPython() {
-    print "Detecting Python version:  "
-    def process = ("python --version").execute()
-    def stdOut = new StringBuilder()
-    def stdErr = new StringBuilder()
-    process.consumeProcessOutput(stdOut, stdErr)
-    process.waitForOrKill(500)
-    Matcher matcher = extractVersion(stdErr)
-    if(matcher.size() > 0) {
-        def curVersion = matcher[0][1]
-        def result = checkVersionAtLeast(curVersion, "2.7.0")
-        if(!result) {
-            allConditionsMet = false
-        }
-    } else {
-        println "missing"
-        // For debugging regular build failures on our build vm
-        println "StdOut: " + stdOut
-        println "StrErr: " + stdErr
-        println "matcher size: " + matcher.size()
-        for(int i = 0; i < matcher.size(); i++) {
-            println "matcher[" + i + "]=" + matcher[i]
-        }
-        // Example for a failed python detection:
-        //
-        //Detecting Python version: missing
-        //StdOut:
-        //StrErr: Python 2.7.12
-        // Example of a successful detection
-        //StrErr:
-        //2.7.15        OK
-        allConditionsMet = false
-    }
-}
-
-/*
- * This check does an extremely simple check, if the boost library exists in the maven local repo.
- * We're not checking if it could be resolved.
- */
-def checkBoost() {
-    print "Detecting Boost library:   "
-    def localRepoBaseDir = session.getLocalRepository().getBasedir()
-    def expectedFile = new File(localRepoBaseDir, "org/apache/plc4x/plc4x-tools-boost/" + project.version +
-        "/plc4x-tools-boost-" + project.version + "-lib-" + project.properties["os.classifier"] + ".zip")
-    if(!expectedFile.exists()) {
-        println "              missing"
-        println ""
-        println "Missing the Boost library. This has to be built by activating the Maven profile 'with-boost'. This only has to be built once."
-        println ""
-        allConditionsMet = false
-    } else {
-        println "              OK"
-    }
-}
-
-def checkOpenSSL() {
-    print "Detecting OpenSSL version: "
-    def output = "openssl version".execute().text
-    Matcher matcher = extractVersion(output)
-    if(matcher.size() > 0) {
-        def curVersion = matcher[0][1]
-        def result = checkVersionAtLeast(curVersion, "1.0.0")
-        if(!result) {
-            allConditionsMet = false
-        }
-    } else {
-        println "missing"
-        allConditionsMet = false
-    }
-}
-
-/**
- * Version extraction function/macro. It looks for occurrence of x.y or x.y.z
- * in passed input text (likely output from `program --version` command if found).
- *
- * @param input
- * @return
- */
-private Matcher extractVersion(input) {
-    def matcher = input =~ /(\d+\.\d+(\.\d+)?).*/
-    matcher
-}
-
-/////////////////////////////////////////////////////
-// Find out which OS and arch are bring used.
-/////////////////////////////////////////////////////
-
-def osString = project.properties['os.classifier']
-def osMatcher = osString =~ /(.*)-(.*)/
-if(osMatcher.size() == 0) {
-    throw new RuntimeException("Currently unsupported OS")
-}
-def os = osMatcher[0][1]
-def arch = osMatcher[0][2]
-println "Detected OS:   " + os
-println "Detected Arch: " + arch
-
-/////////////////////////////////////////////////////
-// Find out which profiles are enabled.
-/////////////////////////////////////////////////////
-
-println "Enabled profiles:"
-def boostEnabled = false
-def cppEnabled = false
-def dotnetEnabled = false
-def javaEnabled = true
-def pythonEnabled = false
-def proxiesEnabled = false
-def sandboxEnabled = false
-def activeProfiles = session.request.activeProfiles
-for (def activeProfile : activeProfiles) {
-    if(activeProfile == "with-boost") {
-        boostEnabled = true
-        println "boost"
-    } else if(activeProfile == "with-cpp") {
-        cppEnabled = true
-        println "cpp"
-    } else if(activeProfile == "with-dotnet") {
-        dotnetEnabled = true
-        println "dotnet"
-    } else if(activeProfile == "with-python") {
-        pythonEnabled = true
-        println "python"
-    } else if(activeProfile == "with-proxies") {
-        proxiesEnabled = true
-        println "proxies"
-    } else if(activeProfile == "with-sandbox") {
-        sandboxEnabled = true
-        println "sandbox"
-    }
-}
-println ""
-
-// - Windows:
-//     - Check the length of the path of the base dir as we're having issues with the length of paths being too long.
-if(os == "win") {
-    File pomFile = project.model.pomFile
-    if(pomFile.absolutePath.length() > 100) {
-        println "On Windows we encounter problems with maximum path lengths. " +
-            "Please move the project to a place it has a shorter base path " +
-            "and run the build again."
-        allConditionsMet = false;
-    }
-}
-
-if(pythonEnabled && !proxiesEnabled) {
-    println "Currently the build of the python modules require the `with-proxies` profile to be enabled tpo."
-    allConditionsMet = false;
-}
-
-/////////////////////////////////////////////////////
-// Do the actual checks depending on the enabled
-// profiles.
-/////////////////////////////////////////////////////
-
-if(proxiesEnabled) {
-    checkBison()
-}
-
-if(dotnetEnabled) {
-    checkDotnet()
-}
-
-if(proxiesEnabled) {
-    checkFlex()
-    checkOpenSSL()
-}
-
-if(proxiesEnabled || cppEnabled) {
-    checkClang()
-    checkGcc()
-}
-
-if(javaEnabled) {
-    checkGit()
-}
-
-if(proxiesEnabled || cppEnabled) {
-    checkGpp()
-}
-
-if(pythonEnabled) {
-    checkPython()
-}
-
-// We only need this check, if boost is not enabled but we're enabling cpp.
-if(!boostEnabled && cppEnabled) {
-    checkBoost()
-}
-
-if(!allConditionsMet) {
-    throw new RuntimeException("Not all conditions met, see log for details.")
-}
-println ""
-println "All known conditions met successfully."
-println ""
-
-// Things we could possibly check:
-// - DNS Providers that return a default ip on unknown host-names
-// - Availability and version of LibPCAP/WinPCAP
-
+import java.util.regex.Matcher
+
+/*
+ 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
+
+     http://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.
+ */
+
+allConditionsMet = true
+
+baseDirectory = project.model.pomFile.parent
+
+/*
+ Checks if a given version number is at least as high as a given reference version.
+*/
+def checkVersionAtLeast(String current, String minimum) {
+    def currentSegments = current.tokenize('.')
+    def minimumSegments = minimum.tokenize('.')
+    def numSegments = Math.min(currentSegments.size(), minimumSegments.size())
+    for (int i = 0; i < numSegments; ++i) {
+        def currentSegment = currentSegments[i].toInteger()
+        def minimumSegment = minimumSegments[i].toInteger()
+        if(currentSegment < minimumSegment) {
+            println current.padRight(14) + "FAILED (required " + minimum + ")"
+            return false
+        } else if(currentSegment > minimumSegment) {
+            println current.padRight(14) + "OK"
+            return true
+        }
+    }
+    def curNotShorter = currentSegments.size() >= minimumSegments.size()
+    if(curNotShorter) {
+        println current.padRight(14) + " OK"
+    } else {
+        println current.padRight(14) + " (required " + minimum + ")"
+    }
+    curNotShorter
+}
+
+def checkBison() {
+    print "Detecting Bison version:   "
+    def output = "bison --version".execute().text
+    Matcher matcher = extractVersion(output)
+    if(matcher.size() > 0) {
+        def curVersion = matcher[0][1]
+        def result = checkVersionAtLeast(curVersion, "2.4.0")
+        if(!result) {
+            allConditionsMet = false
+        }
+    } else {
+        println "missing"
+        allConditionsMet = false
+    }
+}
+
+def checkDotnet() {
+    print "Detecting Dotnet version:  "
+    def output = "dotnet --version".execute().text
+    Matcher matcher = extractVersion(output)
+    if(matcher.size() > 0) {
+        def curVersion = matcher[0][1]
+        def result = checkVersionAtLeast(curVersion, "2.0.0")
+        if(!result) {
+            allConditionsMet = false
+        }
+    } else {
+        println "missing"
+        allConditionsMet = false
+    }
+}
+
+def checkFlex() {
+    print "Detecting Flex version:    "
+    def output = "flex --version".execute().text
+    Matcher matcher = extractVersion(output)
+    if(matcher.size() > 0) {
+        def curVersion = matcher[0][1]
+        def result = checkVersionAtLeast(curVersion, "2.0.0")
+        if(!result) {
+            allConditionsMet = false
+        }
+    } else {
+        println "missing"
+        allConditionsMet = false
+    }
+}
+
+def checkGcc() {
+    print "Detecting Gcc version:     "
+    def output = "gcc --version".execute().text
+    Matcher matcher = extractVersion(output)
+    if(matcher.size() > 0) {
+        def curVersion = matcher[0][1]
+        def result = checkVersionAtLeast(curVersion, "1.0.0")
+        if(!result) {
+            allConditionsMet = false
+        }
+    } else {
+        println "missing"
+        allConditionsMet = false
+    }
+}
+
+def checkGit() {
+    print "Detecting Git version:     "
+    def output = "git --version".execute().text
+    Matcher matcher = extractVersion(output)
+    if(matcher.size() > 0) {
+        def curVersion = matcher[0][1]
+        def result = checkVersionAtLeast(curVersion, "1.0.0")
+        if(!result) {
+            allConditionsMet = false
+        }
+    } else {
+        println "missing"
+        allConditionsMet = false
+    }
+}
+
+def checkGpp() {
+    print "Detecting G++ version:     "
+    def output = "g++ --version".execute().text
+    Matcher matcher = extractVersion(output)
+    if(matcher.size() > 0) {
+        def curVersion = matcher[0][1]
+        def result = checkVersionAtLeast(curVersion, "1.0.0")
+        if(!result) {
+            allConditionsMet = false
+        }
+    } else {
+        println "missing"
+        allConditionsMet = false
+    }
+}
+
+def checkClang() {
+    print "Detecting clang version:   "
+    def output = "clang --version".execute().text
+    Matcher matcher = extractVersion(output)
+    if(matcher.size() > 0) {
+        def curVersion = matcher[0][1]
+        def result = checkVersionAtLeast(curVersion, "1.0.0")
+        if(!result) {
+            allConditionsMet = false
+        }
+    } else {
+        println "missing"
+        allConditionsMet = false
+    }
+}
+
+def checkPython() {
+    print "Detecting Python version:  "
+    def process = ("python --version").execute()
+    def stdOut = new StringBuilder()
+    def stdErr = new StringBuilder()
+    process.consumeProcessOutput(stdOut, stdErr)
+    process.waitForOrKill(500)
+    Matcher matcher = extractVersion(stdErr)
+    if(matcher.size() > 0) {
+        def curVersion = matcher[0][1]
+        def result = checkVersionAtLeast(curVersion, "2.7.0")
+        if(!result) {
+            allConditionsMet = false
+        }
+    } else {
+        println "missing"
+        // For debugging regular build failures on our build vm
+        println "StdOut: " + stdOut
+        println "StrErr: " + stdErr
+        println "matcher size: " + matcher.size()
+        for(int i = 0; i < matcher.size(); i++) {
+            println "matcher[" + i + "]=" + matcher[i]
+        }
+        // Example for a failed python detection:
+        //
+        //Detecting Python version: missing
+        //StdOut:
+        //StrErr: Python 2.7.12
+        // Example of a successful detection
+        //StrErr:
+        //2.7.15        OK
+        allConditionsMet = false
+    }
+}
+
+/*
+ * This check does an extremely simple check, if the boost library exists in the maven local repo.
+ * We're not checking if it could be resolved.
+ */
+def checkBoost() {
+    print "Detecting Boost library:   "
+    def localRepoBaseDir = session.getLocalRepository().getBasedir()
+    def expectedFile = new File(localRepoBaseDir, "org/apache/plc4x/plc4x-tools-boost/" + project.version +
+        "/plc4x-tools-boost-" + project.version + "-lib-" + project.properties["os.classifier"] + ".zip")
+    if(!expectedFile.exists()) {
+        println "              missing"
+        println ""
+        println "Missing the Boost library. This has to be built by activating the Maven profile 'with-boost'. This only has to be built once."
+        println ""
+        allConditionsMet = false
+    } else {
+        println "              OK"
+    }
+}
+
+def checkOpenSSL() {
+    print "Detecting OpenSSL version: "
+    def output = "openssl version".execute().text
+    Matcher matcher = extractVersion(output)
+    if(matcher.size() > 0) {
+        def curVersion = matcher[0][1]
+        def result = checkVersionAtLeast(curVersion, "1.0.0")
+        if(!result) {
+            allConditionsMet = false
+        }
+    } else {
+        println "missing"
+        allConditionsMet = false
+    }
+}
+
+/**
+ * Version extraction function/macro. It looks for occurrence of x.y or x.y.z
+ * in passed input text (likely output from `program --version` command if found).
+ *
+ * @param input
+ * @return
+ */
+private Matcher extractVersion(input) {
+    def matcher = input =~ /(\d+\.\d+(\.\d+)?).*/
+    matcher
+}
+
+/////////////////////////////////////////////////////
+// Find out which OS and arch are bring used.
+/////////////////////////////////////////////////////
+
+def osString = project.properties['os.classifier']
+def osMatcher = osString =~ /(.*)-(.*)/
+if(osMatcher.size() == 0) {
+    throw new RuntimeException("Currently unsupported OS")
+}
+def os = osMatcher[0][1]
+def arch = osMatcher[0][2]
+println "Detected OS:   " + os
+println "Detected Arch: " + arch
+
+/////////////////////////////////////////////////////
+// Find out which profiles are enabled.
+/////////////////////////////////////////////////////
+
+println "Enabled profiles:"
+def boostEnabled = false
+def cppEnabled = false
+def dotnetEnabled = false
+def javaEnabled = true
+def pythonEnabled = false
+def proxiesEnabled = false
+def sandboxEnabled = false
+def activeProfiles = session.request.activeProfiles
+for (def activeProfile : activeProfiles) {
+    if(activeProfile == "with-boost") {
+        boostEnabled = true
+        println "boost"
+    } else if(activeProfile == "with-cpp") {
+        cppEnabled = true
+        println "cpp"
+    } else if(activeProfile == "with-dotnet") {
+        dotnetEnabled = true
+        println "dotnet"
+    } else if(activeProfile == "with-python") {
+        pythonEnabled = true
+        println "python"
+    } else if(activeProfile == "with-proxies") {
+        proxiesEnabled = true
+        println "proxies"
+    } else if(activeProfile == "with-sandbox") {
+        sandboxEnabled = true
+        println "sandbox"
+    }
+}
+println ""
+
+// - Windows:
+//     - Check the length of the path of the base dir as we're having issues with the length of paths being too long.
+if(os == "win") {
+    File pomFile = project.model.pomFile
+    if(pomFile.absolutePath.length() > 100) {
+        println "On Windows we encounter problems with maximum path lengths. " +
+            "Please move the project to a place it has a shorter base path " +
+            "and run the build again."
+        allConditionsMet = false;
+    }
+}
+
+if(pythonEnabled && !proxiesEnabled) {
+    println "Currently the build of the python modules require the `with-proxies` profile to be enabled tpo."
+    allConditionsMet = false;
+}
+
+/////////////////////////////////////////////////////
+// Do the actual checks depending on the enabled
+// profiles.
+/////////////////////////////////////////////////////
+
+if(proxiesEnabled) {
+    checkBison()
+}
+
+if(dotnetEnabled) {
+    checkDotnet()
+}
+
+if(proxiesEnabled) {
+    checkFlex()
+    checkOpenSSL()
+}
+
+if(proxiesEnabled || cppEnabled) {
+    checkClang()
+    checkGcc()
+}
+
+if(javaEnabled) {
+    checkGit()
+}
+
+if(proxiesEnabled || cppEnabled) {
+    checkGpp()
+}
+
+if(pythonEnabled) {
+    checkPython()
+}
+
+// We only need this check, if boost is not enabled but we're enabling cpp.
+if(!boostEnabled && cppEnabled) {
+    checkBoost()
+}
+
+if(!allConditionsMet) {
+    throw new RuntimeException("Not all conditions met, see log for details.")
+}
+println ""
+println "All known conditions met successfully."
+println ""
+
+// Things we could possibly check:
+// - DNS Providers that return a default ip on unknown host-names
+// - Availability and version of LibPCAP/WinPCAP
+
diff --git a/src/remote-resources/NOTICE b/src/remote-resources/NOTICE
index 5c0ba21cca5..cc2e89dda25 100644
--- a/src/remote-resources/NOTICE
+++ b/src/remote-resources/NOTICE
@@ -1,26 +1,26 @@
-===============================================================
-= For site generation only
-===============================================================
-
-Reflow Maven skin and Velocity tools
-Copyright 2012 Andrius Velykis
-
-Twitter Bootstrap - licensed under the Apache License v2.0.
-This product includes software developed by
-Twitter (http://twitter.github.com/bootstrap).
-
-Glyphicons Halflings (part of Bootstrap by Twitter) - licensed under the Creative Commons Attribution 3.0 Unported (CC BY 3.0).
-This product includes software developed by
-Jan KovaÅ™Ć­k (http://glyphicons.com)
-
-jQuery - licensed under the MIT License.
-This product includes software developed by
-jQuery (http://jquery.org)
-
-Lightbox2 - licensed under the Creative Commons Attribution 2.5 License (CC BY 2.5)
-This product includes software developed by
-Lokesh Dhakar (http://lokeshdhakar.com/projects/lightbox2)
-
-FontAwesome by Dave Gandy - http://fontawesome.io.
-Font files licensed under the SIL OFL 1.1 (http://scripts.sil.org/OFL)
+===============================================================
+= For site generation only
+===============================================================
+
+Reflow Maven skin and Velocity tools
+Copyright 2012 Andrius Velykis
+
+Twitter Bootstrap - licensed under the Apache License v2.0.
+This product includes software developed by
+Twitter (http://twitter.github.com/bootstrap).
+
+Glyphicons Halflings (part of Bootstrap by Twitter) - licensed under the Creative Commons Attribution 3.0 Unported (CC BY 3.0).
+This product includes software developed by
+Jan KovaÅ™Ć­k (http://glyphicons.com)
+
+jQuery - licensed under the MIT License.
+This product includes software developed by
+jQuery (http://jquery.org)
+
+Lightbox2 - licensed under the Creative Commons Attribution 2.5 License (CC BY 2.5)
+This product includes software developed by
+Lokesh Dhakar (http://lokeshdhakar.com/projects/lightbox2)
+
+FontAwesome by Dave Gandy - http://fontawesome.io.
+Font files licensed under the SIL OFL 1.1 (http://scripts.sil.org/OFL)
 CSS files licensed under the MIT License
\ No newline at end of file
diff --git a/src/site/asciidoc/developers/building.adoc b/src/site/asciidoc/developers/building.adoc
index 28f414392b6..1553c208163 100644
--- a/src/site/asciidoc/developers/building.adoc
+++ b/src/site/asciidoc/developers/building.adoc
@@ -1,129 +1,129 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== Building PLC4X
-
-PLC4X is built with `Apache Maven` and we have tried to make the build as simple as possible.
-
-However PLC4X aims at providing means to communicate with PLCs of multiple vendors using a shared API but also in a variety of different languages.
-
-We have partitioned the build to allow selecting the parts that are of interest.
-This is done by selecting so-called `Maven profiles`.
-More about these later down in this manual.
-
-For your convenience we also have provided a `Maven-Wrapper`, that should allow building of PLC4X with only `Java 8` or greater as requirement.
-
-=== Requirements
-
-The only requirements to building PLC4X should be:
-
-* Java 8 JDK (or newer - latest tested version: Java 12)
-* Git (Even if you are building the source distribution, the Kafka plugin seems to require a `git` executable being available on the systems `PATH`)
-* Apache Maven (3.1.0 or newer) *(Optional)* (See next chapter)
-
-=== Using the Maven-Wrapper
-
-The so-called `Maven-Wrapper` is used by calling the Maven-Wrapper scripts `mvnw` (Mac & Linux) or `mvnw.cmd` (Windows) instead of the default Maven commands `mvn` and `mvn.cmd`.
-
-These helpers ensure Maven is available in at least the version defined in `.mvn/maven-wrapper.properties`.
-If no suitable version can be found, it is automatically downloaded and installed alongside the project (So it doesn't have to be downloaded every time and every project can have it's own Maven version)
-
-After the script has ensured a suitable Maven version is available, this is used and all arguments and parameters are transparently forwarded to this.
-So simply adding the additional `w` to each of the Maven commands, there should be no difference to using a pre-installed Maven version.
-
-=== Using Maven
-
-This document can't provide you with all the details needed to get started with `Maven` itself.
-But there is a lot of good documentation out there.
-
-Justin McLean and Christofer Dutz even recorded a not quite 2 hour Maven training Video some time ago for another Apache project.
-
-It should handle all the details needed to get a general understanding of Maven and how it works.
-
-.Recording of a Maven Training for Apache Flex from 2016
-video::167857327[vimeo,width=640,height=420]
-
-=== Building PLC4X with Maven
-
-In general all modules which are not considered production-ready are located in the `sandbox` section of the project.
-
-They are not built per default and are enabled by enabling the `with-sandbox` Maven profile.
-
-As especially building the C++, and C# drivers requires building of some third party artifacts and increases build-time dramatically and requires setting up some additional third party tools, we have excluded these parts form the default Maven build.
-
-The following profiles are available (*They have to be enabled additionally to the `with-sandbox` profile*):
-
-- `with-cpp`: Builds all C++ related modules, integrations and examples
-- `with-dotnet`: Builds all C# and .Net related modules, integrations and examples
-- `with-python`: Builds all Python related modules, integrations and examples
-
-WARNING: As these profiles typically require some preparation and setup on your development machine, please read the link:preparing.html[Preparing your Computer] guide for a detailed description on this.
-
-Beyond that there is an additional profile `with-proxies` which will enable additional modules in each of the activated languages.
-This `proxies` module, uses `Apache Thrift` to generate modules for forwarding requests to an `interop server` which runs somewhere else or on the same machine.
-
-WARNING: Currently when enabling the `with-python` module, you are required to also enable the `with-proxies` profile too as this is currently required there but will probably change in the near future.
-
-PLC4X is built by executing the following command (Example for building all modules):
-
-    mvn -P with-sandbox,with-cpp,with-dotnet,with-python,with-proxies install
-
-This not only builds the artifacts and creates the jar files, but also runs all unit- and integration-tests.
-
-If you want to skip the running of tests (even if this is not encouraged) you can skip them all together.
-
-    mvn -P with-sandbox,with-cpp,with-dotnet,with-python,with-proxies install -DskipTests
-
-This will not skip the compilation of tests however.
-
-=== Building the PLC4X Website with Maven
-
-The PLC4X Website is also part of the same GIT repository that contains the code and it is built by Maven as well.
-
-In order to build the website the following command should be sufficient:
-
-    mvn site
-
-However this will generate the website for each module inside it's `target/site` directory.
-Opening this in a browser and navigating from pages of one module to another will not work as these links expect a different directory structure.
-In order to create a fully navigatable version of the Website, the following command should be sufficient:
-
-    mvn site site:stage
-
-This will generate an additional `target/staging` directory which contains the fully functional version.
-
-A lot of documentation on Maven suggests to use the `site:site` goal directly instead of calling the `site` phase, but in case of PLC4X there is more than just the site generation that has to be executed.
-
-This is just a quick-start version of the site generation, for a fully detailed documentation please read the http://plc4x.apache.org/developers/website.html[Website] documentation page.
-
-=== Some special Maven profiles
-
-Maven supports so-called `profiles` for customizing the build in special cases.
-We have tried to keep the number of profiles as low as possible.
-So far there is only one profile.
-
-==== debug-pom profile
-
-Especially for Maven beginners, it might be difficult to understand why a module builds the way it does.
-Maven contains a lot of concepts to inherit and override settings.
-
-The `debug-pom` profile will generate the so-called `effective pom` in the modules `target` directory.
-
-This file contains 100% of the settings Maven uses to execute. All settings are inherited and overridden.
-All Properties are expanded to the value Maven uses.
-
+//
+//  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
+//
+//      http://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.
+//
+
+== Building PLC4X
+
+PLC4X is built with `Apache Maven` and we have tried to make the build as simple as possible.
+
+However PLC4X aims at providing means to communicate with PLCs of multiple vendors using a shared API but also in a variety of different languages.
+
+We have partitioned the build to allow selecting the parts that are of interest.
+This is done by selecting so-called `Maven profiles`.
+More about these later down in this manual.
+
+For your convenience we also have provided a `Maven-Wrapper`, that should allow building of PLC4X with only `Java 8` or greater as requirement.
+
+=== Requirements
+
+The only requirements to building PLC4X should be:
+
+* Java 8 JDK (or newer - latest tested version: Java 12)
+* Git (Even if you are building the source distribution, the Kafka plugin seems to require a `git` executable being available on the systems `PATH`)
+* Apache Maven (3.1.0 or newer) *(Optional)* (See next chapter)
+
+=== Using the Maven-Wrapper
+
+The so-called `Maven-Wrapper` is used by calling the Maven-Wrapper scripts `mvnw` (Mac & Linux) or `mvnw.cmd` (Windows) instead of the default Maven commands `mvn` and `mvn.cmd`.
+
+These helpers ensure Maven is available in at least the version defined in `.mvn/maven-wrapper.properties`.
+If no suitable version can be found, it is automatically downloaded and installed alongside the project (So it doesn't have to be downloaded every time and every project can have it's own Maven version)
+
+After the script has ensured a suitable Maven version is available, this is used and all arguments and parameters are transparently forwarded to this.
+So simply adding the additional `w` to each of the Maven commands, there should be no difference to using a pre-installed Maven version.
+
+=== Using Maven
+
+This document can't provide you with all the details needed to get started with `Maven` itself.
+But there is a lot of good documentation out there.
+
+Justin McLean and Christofer Dutz even recorded a not quite 2 hour Maven training Video some time ago for another Apache project.
+
+It should handle all the details needed to get a general understanding of Maven and how it works.
+
+.Recording of a Maven Training for Apache Flex from 2016
+video::167857327[vimeo,width=640,height=420]
+
+=== Building PLC4X with Maven
+
+In general all modules which are not considered production-ready are located in the `sandbox` section of the project.
+
+They are not built per default and are enabled by enabling the `with-sandbox` Maven profile.
+
+As especially building the C++, and C# drivers requires building of some third party artifacts and increases build-time dramatically and requires setting up some additional third party tools, we have excluded these parts form the default Maven build.
+
+The following profiles are available (*They have to be enabled additionally to the `with-sandbox` profile*):
+
+- `with-cpp`: Builds all C++ related modules, integrations and examples
+- `with-dotnet`: Builds all C# and .Net related modules, integrations and examples
+- `with-python`: Builds all Python related modules, integrations and examples
+
+WARNING: As these profiles typically require some preparation and setup on your development machine, please read the link:preparing.html[Preparing your Computer] guide for a detailed description on this.
+
+Beyond that there is an additional profile `with-proxies` which will enable additional modules in each of the activated languages.
+This `proxies` module, uses `Apache Thrift` to generate modules for forwarding requests to an `interop server` which runs somewhere else or on the same machine.
+
+WARNING: Currently when enabling the `with-python` module, you are required to also enable the `with-proxies` profile too as this is currently required there but will probably change in the near future.
+
+PLC4X is built by executing the following command (Example for building all modules):
+
+    mvn -P with-sandbox,with-cpp,with-dotnet,with-python,with-proxies install
+
+This not only builds the artifacts and creates the jar files, but also runs all unit- and integration-tests.
+
+If you want to skip the running of tests (even if this is not encouraged) you can skip them all together.
+
+    mvn -P with-sandbox,with-cpp,with-dotnet,with-python,with-proxies install -DskipTests
+
+This will not skip the compilation of tests however.
+
+=== Building the PLC4X Website with Maven
+
+The PLC4X Website is also part of the same GIT repository that contains the code and it is built by Maven as well.
+
+In order to build the website the following command should be sufficient:
+
+    mvn site
+
+However this will generate the website for each module inside it's `target/site` directory.
+Opening this in a browser and navigating from pages of one module to another will not work as these links expect a different directory structure.
+In order to create a fully navigatable version of the Website, the following command should be sufficient:
+
+    mvn site site:stage
+
+This will generate an additional `target/staging` directory which contains the fully functional version.
+
+A lot of documentation on Maven suggests to use the `site:site` goal directly instead of calling the `site` phase, but in case of PLC4X there is more than just the site generation that has to be executed.
+
+This is just a quick-start version of the site generation, for a fully detailed documentation please read the http://plc4x.apache.org/developers/website.html[Website] documentation page.
+
+=== Some special Maven profiles
+
+Maven supports so-called `profiles` for customizing the build in special cases.
+We have tried to keep the number of profiles as low as possible.
+So far there is only one profile.
+
+==== debug-pom profile
+
+Especially for Maven beginners, it might be difficult to understand why a module builds the way it does.
+Maven contains a lot of concepts to inherit and override settings.
+
+The `debug-pom` profile will generate the so-called `effective pom` in the modules `target` directory.
+
+This file contains 100% of the settings Maven uses to execute. All settings are inherited and overridden.
+All Properties are expanded to the value Maven uses.
+
 So whenever Maven doesn't behave the way you expect it to, just enable this profile and it should help you find out, what's going on.
\ No newline at end of file
diff --git a/src/site/asciidoc/developers/ci.adoc b/src/site/asciidoc/developers/ci.adoc
index 8c768fcc775..80007ed9823 100644
--- a/src/site/asciidoc/developers/ci.adoc
+++ b/src/site/asciidoc/developers/ci.adoc
@@ -1,63 +1,63 @@
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://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.
-//
-:imagesdir: ../images/
-
-== Continuous Integration
-
-We are currently using Apache's `Jenkins` as single CI system.
-
-- Apache's Jenkins at: https://builds.apache.org/view/M-R/job/PLC4X/
-
-However we might add Travis for automatically building and testing Pull-Requests in the near future.
-
-Hereby Apache Jenkins' clearly is responsible for running the full testsuite with all integration-tests.
-Also only jobs on Apache Jenkins are allowed to publish SNAPSHOT versions of the Maven artifacts to `Apaches Nexus` at: https://repository.apache.org.
-
-=== Structure of the Jenkins Pipeline build
-
-We are using the Jenkins `multi-branch pipeline plugin` to automatically setup build for branches based upon the build definition in the `Jenkinsfile` in the root of the project.
-
-In general it builds the `develop` branch and all branches starting with the prefix `feature/`.
-However when building the `develop` branch some additional steps are performed.
-
-When building `develop` the build not only builds the project itself and runs all tests, it also runs the `sonarcloud` analysis, deploys the artifacts built to the `Apache Nexus` as well as generates and deploys the website.
-
-The general structure of the build is as follows:
-
-[blockdiag,developers-ci-pipeline,svg]
-....
-{
-  Start [shape = beginpoint];
-  Initialization [label = "Initialization"];
-  Cleanup [label = "Cleanup"];
-  Checkout [color = "#068D9D", textcolor="#FFFFFF"];
-  Build [label = "Build"];
-  BuildDevelop [label = "Build develop"];
-  CodeQuality [label = "Code Quality"];
-  Deploy [label = "Deploy"];
-  BuildSite [label = "Build Site"];
-  StageSite [label = "Stage site"];
-  DeploySite [label = "Deploy site"];
-  Finish [shape = endpoint];
-
-  Start -> Initialization -> Cleanup -> Checkout;
-  Checkout -> Build [label = "feature branch"];
-  Build -> Finish;
-  Checkout -> BuildDevelop [label = "develop"];
-  BuildDevelop -> CodeQuality -> Deploy -> BuildSite -> StageSite -> DeploySite; -> Finish;
-}
+//
+//  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
+//
+//      http://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.
+//
+:imagesdir: ../images/
+
+== Continuous Integration
+
+We are currently using Apache's `Jenkins` as single CI system.
+
+- Apache's Jenkins at: https://builds.apache.org/view/M-R/job/PLC4X/
+
+However we might add Travis for automatically building and testing Pull-Requests in the near future.
+
+Hereby Apache Jenkins' clearly is responsible for running the full testsuite with all integration-tests.
+Also only jobs on Apache Jenkins are allowed to publish SNAPSHOT versions of the Maven artifacts to `Apaches Nexus` at: https://repository.apache.org.
+
+=== Structure of the Jenkins Pipeline build
+
+We are using the Jenkins `multi-branch pipeline plugin` to automatically setup build for branches based upon the build definition in the `Jenkinsfile` in the root of the project.
+
+In general it builds the `develop` branch and all branches starting with the prefix `feature/`.
+However when building the `develop` branch some additional steps are performed.
+
+When building `develop` the build not only builds the project itself and runs all tests, it also runs the `sonarcloud` analysis, deploys the artifacts built to the `Apache Nexus` as well as generates and deploys the website.
+
+The general structure of the build is as follows:
+
+[blockdiag,developers-ci-pipeline,svg]
+....
+{
+  Start [shape = beginpoint];
+  Initialization [label = "Initialization"];
+  Cleanup [label = "Cleanup"];
+  Checkout [color = "#068D9D", textcolor="#FFFFFF"];
+  Build [label = "Build"];
+  BuildDevelop [label = "Build develop"];
+  CodeQuality [label = "Code Quality"];
+  Deploy [label = "Deploy"];
+  BuildSite [label = "Build Site"];
+  StageSite [label = "Stage site"];
+  DeploySite [label = "Deploy site"];
+  Finish [shape = endpoint];
+
+  Start -> Initialization -> Cleanup -> Checkout;
+  Checkout -> Build [label = "feature branch"];
+  Build -> Finish;
+  Checkout -> BuildDevelop [label = "develop"];
+  BuildDevelop -> CodeQuality -> Deploy -> BuildSite -> StageSite -> DeploySite; -> Finish;
+}
 ....
\ No newline at end of file
diff --git a/src/site/asciidoc/developers/code-gen/index.adoc b/src/site/asciidoc/developers/code-gen/index.adoc
index c6ad2929945..81338d072ee 100644
--- a/src/site/asciidoc/developers/code-gen/index.adoc
+++ b/src/site/asciidoc/developers/code-gen/index.adoc
@@ -1,396 +1,396 @@
-//
-//  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
-//
-//      http://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.
-//
-:imagesdir: ../../images/
-
-== Code Generation
-
-As hand-writing code for a lot of drivers in multiple languages would be quite a nightmare, we have invested a very large amount of time into finding a way to automate this.
-
-So in the end we need 3 parts:
-
-1. Protocol definition
-2. Language template
-3. A maven plugin which generates the code
-
-This maven plugin uses a given protocol definition as well as a language template and generates code for reading/writing data in that protocol with the given language.
-
-[ditaa,code-generation-intro]
-....
-                  +------------+
-                  |c05A        |
-                  |  Language  |
-       +--------->|    Base    |------------+
-       |          |            |            |
-       |          +------------+            v
-+------------+                       +------------+      +------------+
-|c05A        |                       |c05A        |      |            |
-|   Types    |                       |   PLC4X    |      |            |
-|    Base    |                       |   Maven    |----->|    Code    |
-|            |                       |   Plugin   |      |            |
-+------------+                       +------------+      +------------+
-       |          +------------+            ^
-       |          |c05A        |            |
-       |          |  Protocol  |            |
-       +--------->|    Base    |------------+
-                  |            |
-                  +------------+
-....
-
-The `Types Base` module provides all the structures the `Protocol` modules output which are then used in the `Language` templates to generate code.
-
-`Protocol Base` and `Language Base` hereby just provide the interfaces that reference these types and provide the API for the `plc4x-maven-plugin` to use.
-
-These modules are also maintained in a repository which is separate from the rest of the PLC4X code.
-
-This is due to some restrictions in the Maven build system. If you are interested in understanding the reasons - please read the chapter on `Problems with Maven` near the end of this page.
-
-Concrete protocol spec parsers and templates that actually generate code are implemented in derived modules.
-
-Also didn't we want to tie ourselves to only one way to specify protocols and to generate code.
-
-This adds another layer to the hierarchy.
-
-So for example in case of generating a Siemens S7 Driver for Java this would look like this:
-
-[ditaa,code-generation-intro-s7-java]
-....
-               +------------+
-               |c05A        |
-               |   Types    |
-       +-------|    Base    |--------+
-       |       |            |        |
-       |       +------------+        |
-       v                             v
-+------------+                +------------+
-|c05A        |                |c05A        |
-|  Protocol  |                |  Language  |
-|    Base    |                |    Base    |
-|            |                |            |
-+------------+                +------------+
-       |                             |
-       |                             |
-       v                             v
-+------------+                +------------+
-|c0BA        |                |c0BA        |
-|  Protocol  |                |  Language  |
-|    Base    |                |    Base    |
-|   MSpec    |                | Freemarker |
-+------------+                +------------+
-       |                             |
-       |                             |
-       v                             v
-+------------+                +------------+
-|c0BA        |                |c0BA        |
-|     S7     |                |    Java    |
-|  Protocol  |                |  Language  |
-|            |                |            |
-+------------+                +------------+
-       |                             |
-       |                             |
-       |       +------------+        |
-       |       |c05A        |        |
-       |       |   PLC4X    |        |
-       +------>|   Maven    |<-------+
-               |   Plugin   |
-               +------------+
-                      |
-                      |
-                      v
-               +------------+
-               |c0BA        |
-               |     S7     |
-               |    Java    |
-               |    Code    |
-               +------------+
-....
-
-The dark blue parts are the ones released externally, the turquoise ones are part of the main PLC4X repo.
-
-=== Introduction
-
-The maven plugin is built up very modular.
-
-So in general it is possible to add new forms of providing protocol definitions as well as language templates.
-
-For the formats of specifying a protocol we have tried out numerous tools and frameworks, however the results were never quite satisfying.
-
-Usually using them required a large amount of workarounds, which made the solution quite complicated.
-
-In the end only DFDL and the corresponding Apache project https://daffodil.apache.org[Apache Daffodil (incubating)] seemed to provide what we were looking for.
-
-With this we were able to provide first driver versions fully specified in XML.
-
-The downside was, that the PLC4X community regarded this XML format as pretty complicated and when implementing an experimental code generator we quickly noticed that generating a nice object model would not be possible, due to the lack ability to model the inheritance of types in DFDL.
-
-In the end we came up with our own solution which we called `MSpec` and is described in the link:protocol/mspec.html[MSpec Format description].
-
-=== Configuration
-
-The `plc4x-maven-plugin` has a very limited set of configuration options.
-
-In general all you need to specify, is the `protocolName` and the `languageName`.
-
-There is also an additional parameter: `outputDir`, which defaults to `${project.build.directory}/generated-sources/plc4x/` and usually shouldn't require being changed.
-
-Here's an example of a driver pom for building a `S7` driver for `java`:
-
-....
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x.plugins</groupId>
-    <artifactId>plc4x-code-generaton</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>test-java-s7-driver</artifactId>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.plc4x.plugins</groupId>
-        <artifactId>plc4x-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>generate-driver</goal>
-            </goals>
-            <configuration>
-              <protocolName>s7</protocolName>
-              <languageName>java</languageName>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x.plugins</groupId>
-      <artifactId>plc4x-code-generation-driver-base-java</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x.plugins</groupId>
-      <artifactId>plc4x-code-generation-language-java</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x.plugins</groupId>
-      <artifactId>plc4x-code-generation-protocol-s7</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-</project>
-....
-
-So the plugin configuration is pretty straight forward, all that is specified, is the `protocolName` and the `languageName`.
-
-The dependency:
-
-    <dependency>
-      <groupId>org.apache.plc4x.plugins</groupId>
-      <artifactId>plc4x-code-generation-driver-base-java</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-For example contains all classes the generated code relies on.
-
-The definitions of both the `s7` protocol as well as the `java` language are provided by the two dependencies:
-
-    <dependency>
-      <groupId>org.apache.plc4x.plugins</groupId>
-      <artifactId>plc4x-code-generation-language-java</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
-      <scope>provided</scope>
-    </dependency>
-
-and:
-
-    <dependency>
-      <groupId>org.apache.plc4x.plugins</groupId>
-      <artifactId>plc4x-code-generation-protocol-s7</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
-      <scope>provided</scope>
-    </dependency>
-
-The reason for why the dependencies are added as code-dependencies and why the scope is set the way it is is described in the <<Why are the protocol and language dependencies done so strangely?>> section.
-
-=== Custom Modules
-
-The plugin uses the https://docs.oracle.com/javase/7/docs/api/java/util/ServiceLoader.html[Java Serviceloader] mechanism to find modules.
-
-==== Protocol Modules
-
-In order to provide a new protocol module, all that is required, it so create a module containing a `META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol` file referencing an implementation of the `org.apache.plc4x.plugins.codegenerator.protocol.Protocol` interface.
-
-This interface is located in the `org.apache.plc4x.plugins:plc4x-code-generation-protocol-base` module and generally only defines two methods:
-
-....
-package org.apache.plc4x.plugins.codegenerator.protocol;
-
-import org.apache.plc4x.plugins.codegenerator.types.definitions.ComplexTypeDefinition;
-import org.apache.plc4x.plugins.codegenerator.types.exceptions.GenerationException;
-
-import java.util.Map;
-
-public interface Protocol {
-
-    /**
-     * The name of the protocol what the plugin will use to select the correct protocol module.
-     *
-     * @return the name of the protocol.
-     */
-    String getName();
-
-    /**
-     * Returns a map of complex type definitions for which code has to be generated.
-     *
-     * @return the Map of types that need to be generated.
-     * @throws GenerationException if anything goes wrong parsing.
-     */
-    Map<String, ComplexTypeDefinition> getTypeDefinitions() throws GenerationException;
-
-}
-....
-
-These implementations could use any form of way to generate the Map of `ComplexTypeDefinition`'s.
-They could even be hard coded.
-
-However we have currently implemented utilities for universally providing input:
-
-- link:protocol/mspec.html[MSpec Format] PLC4X proprietary format.
-
-==== Language Modules
-
-Analog to the <<Protocol Modules>> the Language modules are constructed equally.
-
-The `Language` interface is very simplistic too and is located in the `org.apache.plc4x.plugins:plc4x-code-generation-language-base` module and generally only defines two methods:
-
-....
-package org.apache.plc4x.plugins.codegenerator.language;
-
-import org.apache.plc4x.plugins.codegenerator.types.definitions.ComplexTypeDefinition;
-import org.apache.plc4x.plugins.codegenerator.types.exceptions.GenerationException;
-
-import java.io.File;
-import java.util.Map;
-
-public interface LanguageOutput {
-
-    /**
-     * The name of the template is what the plugin will use to select the correct language module.
-     *
-     * @return the name of the template.
-     */
-    String getName();
-
-    void generate(File outputDir, String packageName, Map<String, ComplexTypeDefinition> types)
-        throws GenerationException;
-
-}
-....
-
-The file for registering Language modules is located at: `META-INF/services/org.apache.plc4x.plugins.codegenerator.language.LanguageOutput`
-
-Same as with the protocol modules, the language modules could too be implemented in any thinkable way, however we have already implemented some helpers for using:
-
-- link:language/freemarker.html[Apache Freemarker Format] Generate output using https://freemarker.apache.org[Apache Freemarker] Project.
-
-=== Problems with Maven
-
-==== Why are the 4 modules released separately?
-
-We mentioned in the introduction, that the first 4 modules are maintained and released from outside the main PLC4X repository.
-
-This is due to some restrictions in Maven, which result from the way Maven generally works.
-
-The main problem is that when starting a build, in the `validate` phase, Maven goes through the configuration, downloads the plugins and configures these.
-This means that Maven also tries to download the dependencies of the plugins too.
-
-In case of using a Maven plugin in a project which also produces the maven plugin, this is guaranteed to fail - Especially during releases.
-While during normal development, Maven will probably just download the latest `SNAPSHOT` from our Maven repository and be happy with this and not complain that this version will be overwritten later on in the build.
-It will just use the new version as soon as it has to.
-
-During releases however the release plugin changes the version to a release version and then spawns a build.
-In this case the build will fail because there is no Plugin with that version to download.
-In this case the only option would be to manually build and install the plugin in the release version and to re-start the release (Which is not a nice thing for the release manager).
-
-For this reason we have stripped down the plugin and it's dependencies to an absolute minimum and have released (or will release) that separately from the rest, hoping due to the minimality of the dependencies that we will not have to do it very often.
-
-As soon as the tooling is released, the version is updated in the PLC4X build and the release version is used without any complications.
-
-==== Why are the protocol and language dependencies done so strangely?
-
-It would certainly be a lot cleaner, if we provided the modules as plugin dependencies.
-
-However, as we mentioned in the previous sub-chapter, Maven tries to download and configure the plugins prior to running the build.
-So during a release the new versions of the modules wouldn't exist, this would cause the build to fail.
-
-We could release the protocol- and the language modules separately too, but we want the language and protocol modules to be part of the project, to not over-complicate things - especially during a release.
-
-So the Maven plugin is built in a way, that it uses the modules dependencies and creates it's own Classloader to contain all of these modules at runtime.
-
-This brings the benefit of being able to utilize Maven's capability of determining the build order and dynamically creating the modules build classpath.
-
-Adding a normal dependency however would make Maven deploy the artifacts with the rest of the modules.
-
-We don't want that as the modules are useless as soon as they have been used to generate the code.
-
-So we use a trick that is usually used in Web applications, for example:
-Here the vendor of a Servlet engine is expected to provide an implementation of the `Servlet API`.
-It is forbidden for an application to bring this along, but it is required to build the application.
-
-For this the Maven scope `provided`, which tells Maven to provide it during the build, but to exclude it from any applications it builds because it will be provided by the system running the application.
-
-This is not quite true, but it does the trick.
-
-
+//
+//  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
+//
+//      http://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.
+//
+:imagesdir: ../../images/
+
+== Code Generation
+
+As hand-writing code for a lot of drivers in multiple languages would be quite a nightmare, we have invested a very large amount of time into finding a way to automate this.
+
+So in the end we need 3 parts:
+
+1. Protocol definition
+2. Language template
+3. A maven plugin which generates the code
+
+This maven plugin uses a given protocol definition as well as a language template and generates code for reading/writing data in that protocol with the given language.
+
+[ditaa,code-generation-intro]
+....
+                  +------------+
+                  |c05A        |
+                  |  Language  |
+       +--------->|    Base    |------------+
+       |          |            |            |
+       |          +------------+            v
++------------+                       +------------+      +------------+
+|c05A        |                       |c05A        |      |            |
+|   Types    |                       |   PLC4X    |      |            |
+|    Base    |                       |   Maven    |----->|    Code    |
+|            |                       |   Plugin   |      |            |
++------------+                       +------------+      +------------+
+       |          +------------+            ^
+       |          |c05A        |            |
+       |          |  Protocol  |            |
+       +--------->|    Base    |------------+
+                  |            |
+                  +------------+
+....
+
+The `Types Base` module provides all the structures the `Protocol` modules output which are then used in the `Language` templates to generate code.
+
+`Protocol Base` and `Language Base` hereby just provide the interfaces that reference these types and provide the API for the `plc4x-maven-plugin` to use.
+
+These modules are also maintained in a repository which is separate from the rest of the PLC4X code.
+
+This is due to some restrictions in the Maven build system. If you are interested in understanding the reasons - please read the chapter on `Problems with Maven` near the end of this page.
+
+Concrete protocol spec parsers and templates that actually generate code are implemented in derived modules.
+
+Also didn't we want to tie ourselves to only one way to specify protocols and to generate code.
+
+This adds another layer to the hierarchy.
+
+So for example in case of generating a Siemens S7 Driver for Java this would look like this:
+
+[ditaa,code-generation-intro-s7-java]
+....
+               +------------+
+               |c05A        |
+               |   Types    |
+       +-------|    Base    |--------+
+       |       |            |        |
+       |       +------------+        |
+       v                             v
++------------+                +------------+
+|c05A        |                |c05A        |
+|  Protocol  |                |  Language  |
+|    Base    |                |    Base    |
+|            |                |            |
++------------+                +------------+
+       |                             |
+       |                             |
+       v                             v
++------------+                +------------+
+|c0BA        |                |c0BA        |
+|  Protocol  |                |  Language  |
+|    Base    |                |    Base    |
+|   MSpec    |                | Freemarker |
++------------+                +------------+
+       |                             |
+       |                             |
+       v                             v
++------------+                +------------+
+|c0BA        |                |c0BA        |
+|     S7     |                |    Java    |
+|  Protocol  |                |  Language  |
+|            |                |            |
++------------+                +------------+
+       |                             |
+       |                             |
+       |       +------------+        |
+       |       |c05A        |        |
+       |       |   PLC4X    |        |
+       +------>|   Maven    |<-------+
+               |   Plugin   |
+               +------------+
+                      |
+                      |
+                      v
+               +------------+
+               |c0BA        |
+               |     S7     |
+               |    Java    |
+               |    Code    |
+               +------------+
+....
+
+The dark blue parts are the ones released externally, the turquoise ones are part of the main PLC4X repo.
+
+=== Introduction
+
+The maven plugin is built up very modular.
+
+So in general it is possible to add new forms of providing protocol definitions as well as language templates.
+
+For the formats of specifying a protocol we have tried out numerous tools and frameworks, however the results were never quite satisfying.
+
+Usually using them required a large amount of workarounds, which made the solution quite complicated.
+
+In the end only DFDL and the corresponding Apache project https://daffodil.apache.org[Apache Daffodil (incubating)] seemed to provide what we were looking for.
+
+With this we were able to provide first driver versions fully specified in XML.
+
+The downside was, that the PLC4X community regarded this XML format as pretty complicated and when implementing an experimental code generator we quickly noticed that generating a nice object model would not be possible, due to the lack ability to model the inheritance of types in DFDL.
+
+In the end we came up with our own solution which we called `MSpec` and is described in the link:protocol/mspec.html[MSpec Format description].
+
+=== Configuration
+
+The `plc4x-maven-plugin` has a very limited set of configuration options.
+
+In general all you need to specify, is the `protocolName` and the `languageName`.
+
+There is also an additional parameter: `outputDir`, which defaults to `${project.build.directory}/generated-sources/plc4x/` and usually shouldn't require being changed.
+
+Here's an example of a driver pom for building a `S7` driver for `java`:
+
+....
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x.plugins</groupId>
+    <artifactId>plc4x-code-generaton</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>test-java-s7-driver</artifactId>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.plc4x.plugins</groupId>
+        <artifactId>plc4x-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>generate-driver</goal>
+            </goals>
+            <configuration>
+              <protocolName>s7</protocolName>
+              <languageName>java</languageName>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x.plugins</groupId>
+      <artifactId>plc4x-code-generation-driver-base-java</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x.plugins</groupId>
+      <artifactId>plc4x-code-generation-language-java</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x.plugins</groupId>
+      <artifactId>plc4x-code-generation-protocol-s7</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+</project>
+....
+
+So the plugin configuration is pretty straight forward, all that is specified, is the `protocolName` and the `languageName`.
+
+The dependency:
+
+    <dependency>
+      <groupId>org.apache.plc4x.plugins</groupId>
+      <artifactId>plc4x-code-generation-driver-base-java</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+
+For example contains all classes the generated code relies on.
+
+The definitions of both the `s7` protocol as well as the `java` language are provided by the two dependencies:
+
+    <dependency>
+      <groupId>org.apache.plc4x.plugins</groupId>
+      <artifactId>plc4x-code-generation-language-java</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
+      <scope>provided</scope>
+    </dependency>
+
+and:
+
+    <dependency>
+      <groupId>org.apache.plc4x.plugins</groupId>
+      <artifactId>plc4x-code-generation-protocol-s7</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <!-- Scope is 'provided' as this way it's not shipped with the driver -->
+      <scope>provided</scope>
+    </dependency>
+
+The reason for why the dependencies are added as code-dependencies and why the scope is set the way it is is described in the <<Why are the protocol and language dependencies done so strangely?>> section.
+
+=== Custom Modules
+
+The plugin uses the https://docs.oracle.com/javase/7/docs/api/java/util/ServiceLoader.html[Java Serviceloader] mechanism to find modules.
+
+==== Protocol Modules
+
+In order to provide a new protocol module, all that is required, it so create a module containing a `META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol` file referencing an implementation of the `org.apache.plc4x.plugins.codegenerator.protocol.Protocol` interface.
+
+This interface is located in the `org.apache.plc4x.plugins:plc4x-code-generation-protocol-base` module and generally only defines two methods:
+
+....
+package org.apache.plc4x.plugins.codegenerator.protocol;
+
+import org.apache.plc4x.plugins.codegenerator.types.definitions.ComplexTypeDefinition;
+import org.apache.plc4x.plugins.codegenerator.types.exceptions.GenerationException;
+
+import java.util.Map;
+
+public interface Protocol {
+
+    /**
+     * The name of the protocol what the plugin will use to select the correct protocol module.
+     *
+     * @return the name of the protocol.
+     */
+    String getName();
+
+    /**
+     * Returns a map of complex type definitions for which code has to be generated.
+     *
+     * @return the Map of types that need to be generated.
+     * @throws GenerationException if anything goes wrong parsing.
+     */
+    Map<String, ComplexTypeDefinition> getTypeDefinitions() throws GenerationException;
+
+}
+....
+
+These implementations could use any form of way to generate the Map of `ComplexTypeDefinition`'s.
+They could even be hard coded.
+
+However we have currently implemented utilities for universally providing input:
+
+- link:protocol/mspec.html[MSpec Format] PLC4X proprietary format.
+
+==== Language Modules
+
+Analog to the <<Protocol Modules>> the Language modules are constructed equally.
+
+The `Language` interface is very simplistic too and is located in the `org.apache.plc4x.plugins:plc4x-code-generation-language-base` module and generally only defines two methods:
+
+....
+package org.apache.plc4x.plugins.codegenerator.language;
+
+import org.apache.plc4x.plugins.codegenerator.types.definitions.ComplexTypeDefinition;
+import org.apache.plc4x.plugins.codegenerator.types.exceptions.GenerationException;
+
+import java.io.File;
+import java.util.Map;
+
+public interface LanguageOutput {
+
+    /**
+     * The name of the template is what the plugin will use to select the correct language module.
+     *
+     * @return the name of the template.
+     */
+    String getName();
+
+    void generate(File outputDir, String packageName, Map<String, ComplexTypeDefinition> types)
+        throws GenerationException;
+
+}
+....
+
+The file for registering Language modules is located at: `META-INF/services/org.apache.plc4x.plugins.codegenerator.language.LanguageOutput`
+
+Same as with the protocol modules, the language modules could too be implemented in any thinkable way, however we have already implemented some helpers for using:
+
+- link:language/freemarker.html[Apache Freemarker Format] Generate output using https://freemarker.apache.org[Apache Freemarker] Project.
+
+=== Problems with Maven
+
+==== Why are the 4 modules released separately?
+
+We mentioned in the introduction, that the first 4 modules are maintained and released from outside the main PLC4X repository.
+
+This is due to some restrictions in Maven, which result from the way Maven generally works.
+
+The main problem is that when starting a build, in the `validate` phase, Maven goes through the configuration, downloads the plugins and configures these.
+This means that Maven also tries to download the dependencies of the plugins too.
+
+In case of using a Maven plugin in a project which also produces the maven plugin, this is guaranteed to fail - Especially during releases.
+While during normal development, Maven will probably just download the latest `SNAPSHOT` from our Maven repository and be happy with this and not complain that this version will be overwritten later on in the build.
+It will just use the new version as soon as it has to.
+
+During releases however the release plugin changes the version to a release version and then spawns a build.
+In this case the build will fail because there is no Plugin with that version to download.
+In this case the only option would be to manually build and install the plugin in the release version and to re-start the release (Which is not a nice thing for the release manager).
+
+For this reason we have stripped down the plugin and it's dependencies to an absolute minimum and have released (or will release) that separately from the rest, hoping due to the minimality of the dependencies that we will not have to do it very often.
+
+As soon as the tooling is released, the version is updated in the PLC4X build and the release version is used without any complications.
+
+==== Why are the protocol and language dependencies done so strangely?
+
+It would certainly be a lot cleaner, if we provided the modules as plugin dependencies.
+
+However, as we mentioned in the previous sub-chapter, Maven tries to download and configure the plugins prior to running the build.
+So during a release the new versions of the modules wouldn't exist, this would cause the build to fail.
+
+We could release the protocol- and the language modules separately too, but we want the language and protocol modules to be part of the project, to not over-complicate things - especially during a release.
+
+So the Maven plugin is built in a way, that it uses the modules dependencies and creates it's own Classloader to contain all of these modules at runtime.
+
+This brings the benefit of being able to utilize Maven's capability of determining the build order and dynamically creating the modules build classpath.
+
+Adding a normal dependency however would make Maven deploy the artifacts with the rest of the modules.
+
+We don't want that as the modules are useless as soon as they have been used to generate the code.
+
+So we use a trick that is usually used in Web applications, for example:
+Here the vendor of a Servlet engine is expected to provide an implementation of the `Servlet API`.
+It is forbidden for an application to bring this along, but it is required to build the application.
+
+For this the Maven scope `provided`, which tells Maven to provide it during the build, but to exclude it from any applications it builds because it will be provided by the system running the application.
+
+This is not quite true, but it does the trick.
+
+
diff --git a/src/site/asciidoc/developers/code-gen/language/freemarker.adoc b/src/site/asciidoc/developers/code-gen/language/freemarker.adoc
index 2fd324b7ae1..88cb6b3a27e 100644
--- a/src/site/asciidoc/developers/code-gen/language/freemarker.adoc
+++ b/src/site/asciidoc/developers/code-gen/language/freemarker.adoc
@@ -1,117 +1,117 @@
-//
-//  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
-//
-//      http://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.
-//
-:imagesdir: ../../../images/
-
-== Apache Freemarker
-
-For the Freemarker language output we are using an unmodified version of https://freemarker.apache.org[Apache Freemarker] to generate output.
-
-The boilerplate code for providing a PLC4X language module is located in the `org.apache.plc4x.plugins:plc4x-code-generation-language-base-freemarker` maven module, inside the `FreemarkerLanguageOutput` class.
-
-This class configures a Freemarker context and provides standardized attributes inside this:
-
-- packageName: Java style package name which can be used to create some form of directory structure.
-- typeName: Simple string type name
-- type: `ComplexTypeDefinition` instance containing all the information for the type that code should be generated for.
-- helper: As some times it is pretty complicated to create all the output in Freemarker, the helper allows to provide code that is used by the template that help with generating output.
-
-A Freemarker-based output module, has to provide a list of `Template` instances as well as provide a `FreemarkerLanguageTemplateHelper` instance.
-
-What the `FreemarkerLanguageOutput` then does, is iterate over all complex types provided by the protocol module, and then iterates over all templates the current language defines.
-
-The only convention used in this utility, is that the first line of output a template generates will be treated as the path relative to the base output directory.
-
-It will automatically create all needed intermediate directories and generate the rest of the input to the file specified by the first line.
-
-If this line is empty, the output is skipped for this instance.
-
-=== Example `Java` output
-
-....
-package org.apache.plc4x.language.java;
-
-import freemarker.template.*;
-import org.apache.plc4x.plugins.codegenerator.protocol.freemarker.FreemarkerLanguageOutput;
-import org.apache.plc4x.plugins.codegenerator.protocol.freemarker.FreemarkerLanguageTemplateHelper;
-import org.apache.plc4x.plugins.codegenerator.types.definitions.ComplexTypeDefinition;
-
-import java.io.*;
-import java.util.*;
-
-public class JavaLanguageOutput extends FreemarkerLanguageOutput {
-
-    @Override
-    public String getName() {
-        return "Java";
-    }
-
-    protected List<Template> getTemplates(Configuration freemarkerConfiguration) throws IOException {
-        return Arrays.asList(
-            freemarkerConfiguration.getTemplate("templates/java/pojo-template.ftlh"),
-            freemarkerConfiguration.getTemplate("templates/java/io-template.ftlh"));
-    }
-
-    protected FreemarkerLanguageTemplateHelper getHelper(Map<String, ComplexTypeDefinition> types) {
-        return new JavaLanguageTemplateHelper(types);
-    }
-
-}
-....
-
-As you can see, this output generates up to two files for every complex type.
-
-This is one file, providing the code for the POJO itself.
-The second one generates the IO-component, which contains all the code for parsing and serializing the corresponding POJO.
-
-In other languages, for example `C++` it's possible to use a third one to generate Header files or for `Python` perhaps only one in total.
-
-Here an example for a part of a template for generating Java POJOs:
-
-....
-${packageName?replace(".", "/")}/${typeName}.java
-/*
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://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 ${packageName};
-
-import org.apache.plc4x.java.utils.SizeAware;
-
-public<#if type.abstract> abstract</#if> class ${typeName}<#if type.parentType??> extends ${type.parentType.name}</#if> implements SizeAware {
-
-    ... SNIP ...
-
-}
-....
-
-So as you can see, the first line will generate the file-path of the to be generated output.
+//
+//  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
+//
+//      http://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.
+//
+:imagesdir: ../../../images/
+
+== Apache Freemarker
+
+For the Freemarker language output we are using an unmodified version of https://freemarker.apache.org[Apache Freemarker] to generate output.
+
+The boilerplate code for providing a PLC4X language module is located in the `org.apache.plc4x.plugins:plc4x-code-generation-language-base-freemarker` maven module, inside the `FreemarkerLanguageOutput` class.
+
+This class configures a Freemarker context and provides standardized attributes inside this:
+
+- packageName: Java style package name which can be used to create some form of directory structure.
+- typeName: Simple string type name
+- type: `ComplexTypeDefinition` instance containing all the information for the type that code should be generated for.
+- helper: As some times it is pretty complicated to create all the output in Freemarker, the helper allows to provide code that is used by the template that help with generating output.
+
+A Freemarker-based output module, has to provide a list of `Template` instances as well as provide a `FreemarkerLanguageTemplateHelper` instance.
+
+What the `FreemarkerLanguageOutput` then does, is iterate over all complex types provided by the protocol module, and then iterates over all templates the current language defines.
+
+The only convention used in this utility, is that the first line of output a template generates will be treated as the path relative to the base output directory.
+
+It will automatically create all needed intermediate directories and generate the rest of the input to the file specified by the first line.
+
+If this line is empty, the output is skipped for this instance.
+
+=== Example `Java` output
+
+....
+package org.apache.plc4x.language.java;
+
+import freemarker.template.*;
+import org.apache.plc4x.plugins.codegenerator.protocol.freemarker.FreemarkerLanguageOutput;
+import org.apache.plc4x.plugins.codegenerator.protocol.freemarker.FreemarkerLanguageTemplateHelper;
+import org.apache.plc4x.plugins.codegenerator.types.definitions.ComplexTypeDefinition;
+
+import java.io.*;
+import java.util.*;
+
+public class JavaLanguageOutput extends FreemarkerLanguageOutput {
+
+    @Override
+    public String getName() {
+        return "Java";
+    }
+
+    protected List<Template> getTemplates(Configuration freemarkerConfiguration) throws IOException {
+        return Arrays.asList(
+            freemarkerConfiguration.getTemplate("templates/java/pojo-template.ftlh"),
+            freemarkerConfiguration.getTemplate("templates/java/io-template.ftlh"));
+    }
+
+    protected FreemarkerLanguageTemplateHelper getHelper(Map<String, ComplexTypeDefinition> types) {
+        return new JavaLanguageTemplateHelper(types);
+    }
+
+}
+....
+
+As you can see, this output generates up to two files for every complex type.
+
+This is one file, providing the code for the POJO itself.
+The second one generates the IO-component, which contains all the code for parsing and serializing the corresponding POJO.
+
+In other languages, for example `C++` it's possible to use a third one to generate Header files or for `Python` perhaps only one in total.
+
+Here an example for a part of a template for generating Java POJOs:
+
+....
+${packageName?replace(".", "/")}/${typeName}.java
+/*
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+      http://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 ${packageName};
+
+import org.apache.plc4x.java.utils.SizeAware;
+
+public<#if type.abstract> abstract</#if> class ${typeName}<#if type.parentType??> extends ${type.parentType.name}</#if> implements SizeAware {
+
+    ... SNIP ...
+
+}
+....
+
+So as you can see, the first line will generate the file-path of the to be generated output.
 Which is followed
\ No newline at end of file
diff --git a/src/site/asciidoc/developers/code-gen/protocol/df1.adoc b/src/site/asciidoc/developers/code-gen/protocol/df1.adoc
index a598cad2760..67a4c12c2bc 100644
--- a/src/site/asciidoc/developers/code-gen/protocol/df1.adoc
+++ b/src/site/asciidoc/developers/code-gen/protocol/df1.adoc
@@ -1,94 +1,94 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== Example: DF1 MSpec
-
-The DF1 protocol has three basic messages: a command message, acknowledge and not acknowledge.
-A `0x10` is used as delimiter to differentiate between the messages and parts of the command message.
-
-[width="25%",cols="^,^"]
-|============
-|ACK | NAK
-
-|10 06 |10 15
-|============
-
-
-This is what a read command message looks like in full-duplex mode using CRC as checksum:
-[cols="^,^,^,^,^,^,^,^,^,^,^,^,^"]
-|===
-|Name | DLE | STX | DST | SRC | CMD | STS | TNS | ADDR | SIZE | DLE | ETX | CRC
-
-|Value | 10 | 02 | XX | XX | 01 | 00 | XX XX | XX XX | 02 | 10 | 03 | XX XX
-|===
-
-The according response with the requested byte data:
-[cols="^,^,^,^,^,^,^,^,^,^,^,^,^"]
-|===
-|Name | DLE | STX | DST | SRC | CMD | STS | TNS | DATA | SIZE | DLE | ETX | CRC
-
-|Value | 10 | 02 | XX | XX | 41 | 00 | XX XX | XX XX | 02 | 10 | 03 | XX XX
-|===
-
-Every message starts with a `DLE = 0x10`. The second byte is used to differentiate what type of message will follow.
-In the case of a command message it is `0x02`. DST and SRC specify the target and source of the message.
-`CMD = 0x01` means an unprotected read is requested, the command response code is always attained with the addition of `0x40`. STS is a status byte,
-TNS is the transaction counter that is incremented by the master and used to recognize the specific message response.
-ADDR is the memory address being requested, size specifies how many bytes are to be read.
-DLE + ETX mark the end of the message, the last two bytes are the CRC that is calculated using the previously sent bytes.
-
-Here is the MSpec to model the behaviour:
-
-....
-[discriminatedType 'DF1Symbol'
-    [const            uint 8       'messageStart' '0x10']
-    [discriminator    uint 8       'symbolType']
-    [typeSwitch 'symbolType'
-        ['0x02' DF1SymbolMessageFrame
-            [simple   uint 8       'destinationAddress']
-            [simple   uint 8       'sourceAddress']
-            [simple   DF1Command   'command']
-            [const    uint 8       'messageEnd' '0x10']
-            [const    uint 8       'endTransaction' '0x03']
-            [checksum uint 16      'crc' 'STATIC_CALL("org.apache.plc4x.java.df1.util.DF1Utils.crcCheck", destinationAddress, sourceAddress, command)']
-        ]
-        ['0x06' DF1SymbolMessageFrameACK
-        ]
-        ['0x15' DF1SymbolMessageFrameNAK
-        ]
-    ]
-]
-
-[discriminatedType 'DF1Command'
-    [discriminator uint 8  'commandCode']
-    [simple    uint 8       'status']
-    [simple    uint 16      'transactionCounter']
-    [typeSwitch 'commandCode'
-        ['0x01' DF1UnprotectedReadRequest
-            [simple uint 16    'address']
-            [simple uint 8     'size']
-        ]
-        ['0x41' DF1UnprotectedReadResponse
-            [manualArray  uint 8 'data' terminated 'STATIC_CALL("org.apache.plc4x.java.df1.util.DF1Utils.dataTerminate", io)' 'STATIC_CALL("org.apache.plc4x.java.df1.util.DF1Utils.readData", io)' 'STATIC_CALL("org.apache.plc4x.java.df1.util.DF1Utils.writeData", io, element)' 'STATIC_CALL("org.apache.plc4x.java.df1.util.DF1Utils.dataLength", data)']
-        ]
-    ]
-]
-....
-
-The basic object is the DF1Symbol, where the second byte is used to distinguish between the different message types using a typeSwitch.
-In the case of a command message, the message frame contains the DF1Command to further differentiate between the command types.
+//
+//  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
+//
+//      http://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.
+//
+
+== Example: DF1 MSpec
+
+The DF1 protocol has three basic messages: a command message, acknowledge and not acknowledge.
+A `0x10` is used as delimiter to differentiate between the messages and parts of the command message.
+
+[width="25%",cols="^,^"]
+|============
+|ACK | NAK
+
+|10 06 |10 15
+|============
+
+
+This is what a read command message looks like in full-duplex mode using CRC as checksum:
+[cols="^,^,^,^,^,^,^,^,^,^,^,^,^"]
+|===
+|Name | DLE | STX | DST | SRC | CMD | STS | TNS | ADDR | SIZE | DLE | ETX | CRC
+
+|Value | 10 | 02 | XX | XX | 01 | 00 | XX XX | XX XX | 02 | 10 | 03 | XX XX
+|===
+
+The according response with the requested byte data:
+[cols="^,^,^,^,^,^,^,^,^,^,^,^,^"]
+|===
+|Name | DLE | STX | DST | SRC | CMD | STS | TNS | DATA | SIZE | DLE | ETX | CRC
+
+|Value | 10 | 02 | XX | XX | 41 | 00 | XX XX | XX XX | 02 | 10 | 03 | XX XX
+|===
+
+Every message starts with a `DLE = 0x10`. The second byte is used to differentiate what type of message will follow.
+In the case of a command message it is `0x02`. DST and SRC specify the target and source of the message.
+`CMD = 0x01` means an unprotected read is requested, the command response code is always attained with the addition of `0x40`. STS is a status byte,
+TNS is the transaction counter that is incremented by the master and used to recognize the specific message response.
+ADDR is the memory address being requested, size specifies how many bytes are to be read.
+DLE + ETX mark the end of the message, the last two bytes are the CRC that is calculated using the previously sent bytes.
+
+Here is the MSpec to model the behaviour:
+
+....
+[discriminatedType 'DF1Symbol'
+    [const            uint 8       'messageStart' '0x10']
+    [discriminator    uint 8       'symbolType']
+    [typeSwitch 'symbolType'
+        ['0x02' DF1SymbolMessageFrame
+            [simple   uint 8       'destinationAddress']
+            [simple   uint 8       'sourceAddress']
+            [simple   DF1Command   'command']
+            [const    uint 8       'messageEnd' '0x10']
+            [const    uint 8       'endTransaction' '0x03']
+            [checksum uint 16      'crc' 'STATIC_CALL("org.apache.plc4x.java.df1.util.DF1Utils.crcCheck", destinationAddress, sourceAddress, command)']
+        ]
+        ['0x06' DF1SymbolMessageFrameACK
+        ]
+        ['0x15' DF1SymbolMessageFrameNAK
+        ]
+    ]
+]
+
+[discriminatedType 'DF1Command'
+    [discriminator uint 8  'commandCode']
+    [simple    uint 8       'status']
+    [simple    uint 16      'transactionCounter']
+    [typeSwitch 'commandCode'
+        ['0x01' DF1UnprotectedReadRequest
+            [simple uint 16    'address']
+            [simple uint 8     'size']
+        ]
+        ['0x41' DF1UnprotectedReadResponse
+            [manualArray  uint 8 'data' terminated 'STATIC_CALL("org.apache.plc4x.java.df1.util.DF1Utils.dataTerminate", io)' 'STATIC_CALL("org.apache.plc4x.java.df1.util.DF1Utils.readData", io)' 'STATIC_CALL("org.apache.plc4x.java.df1.util.DF1Utils.writeData", io, element)' 'STATIC_CALL("org.apache.plc4x.java.df1.util.DF1Utils.dataLength", data)']
+        ]
+    ]
+]
+....
+
+The basic object is the DF1Symbol, where the second byte is used to distinguish between the different message types using a typeSwitch.
+In the case of a command message, the message frame contains the DF1Command to further differentiate between the command types.
 Currently only the unprotected read and its response are implemented.
\ No newline at end of file
diff --git a/src/site/asciidoc/developers/code-gen/protocol/mspec.adoc b/src/site/asciidoc/developers/code-gen/protocol/mspec.adoc
index 357beda60fe..04bfd7e0ac0 100644
--- a/src/site/asciidoc/developers/code-gen/protocol/mspec.adoc
+++ b/src/site/asciidoc/developers/code-gen/protocol/mspec.adoc
@@ -1,351 +1,351 @@
-//
-//  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
-//
-//      http://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.
-//
-:imagesdir: ../../../images/
-
-== The MSpec format
-
-The `MSpec` format (Message Specification) was a result of a brainstorming session after evaluating a lot of other options.
-
-We simply sat down and started to write some imaginary format (`imaginary` was even the initial Name we used) and created parses for this afterwards and fine tuned spec and parsers as part of the process of implementing first protocols and language templates.
-
-It's a text-based format.
-
-At the root level of these specs are a set of `type` or `discriminatedType` blocks.
-
-`type` elements are objects that are independent from the input.
-
-An example would be the `TPKTPacket` of the S7 format:
-
-....
-[type 'TPKTPacket'
-    [const    uint 8     'protocolId' '0x03']
-    [reserved uint 8     '0x00']
-    [implicit uint 16    'len'        'payload.lengthInBytes + 4']
-    [field    COTPPacket 'payload']
-]
-....
-
-A `discriminatedType` type is in contrast an object who's content is dependent in the input.
-
-Every discriminated type can contain at most one `discriminator` field and exactly one `typeSwitch` element.
-
-For example part of the spec for the S7 format looks like this:
-
-....
-[discriminatedType 'S7Message'
-    [const         uint 8  'protocolId'      '0x32']
-    [discriminator uint 8  'messageType']
-    [reserved      uint 16 '0x0000']
-    [field         uint 16 'tpduReference']
-    [implicit      uint 16 'parameterLength' 'parameter.lengthInBytes']
-    [implicit      uint 16 'payloadLength'   'payload.lengthInBytes']
-    [typeSwitch 'messageType'
-        ['0x01' S7MessageRequest
-        ]
-        ['0x03' S7MessageResponse
-            [field uint 8 'errorClass']
-            [field uint 8 'errorCode']
-        ]
-        ['0x07' S7MessageUserData
-        ]
-    ]
-    [field S7Parameter 'parameter' ['messageType']]
-    [field S7Payload   'payload'   ['messageType', 'parameter']]
-]
-....
-
-An types start is declared by an opening square bracket `[` and ended with a closing one `]`.
-
-Also to both provide a name as first argument.
-
-Every type definition contains a list of fields that can have different types.
-
-The list of available types are:
-
-- const: expects a given value
-- reserved: expects a given value, but only warns if condition is not meet
-- field: simple or complex typed object
-- array: array of simple or complex typed objects
-- optional: simple or complex typed object, that is only present in some conditions
-- implicit: a field required for parsing, but is usually defined though other data
-- discriminator: special type of simple typed field which is used to determine the concrete type of an object (max one per type and always has to be accompanied with a `switch` field) (reserved for `discriminatedType`)
-- typeSwitch: not a real field, but indicates the existence of sub-types, which are declared inline (reserved for `discriminatedType`)
-
-The full syntax and explanations of these type follow in the following chapters.
-
-Another thing we have to explain are how types are specified.
-
-In general we distinguish between two types of types used in field definitions:
-
-- simple types
-- complex types
-
-=== Simple Types
-
-Simple types are usually raw data the format is:
-
-    {base-type} {size}
-
-The base types available are currently:
-
-- *bit*: Simple boolean value
-- *uint*: The input is treated as unsigned integer value
-- *int*: The input is treated as signed integer value
-- *float*: The input is treated as floating point number
-- *string*: The input is treated as string
-
-The size value then provides how many `bits` should be read.
-
-In case of `string` types, it refers to the number of characters.
-
-So reading an unsigned byte would be: `uint 8`.
-
-=== Complex Types
-
-In contrast to simple types, complex type reference other complex types (Root elements of the spec document).
-
-How the parser should interpret them is defined in the referenced types definition.
-
-In the example above, for example the `S7Parameter` is defined in another part of the spec.
-
-=== Field Types and their Syntax
-
-==== array Field
-
-An `array` field is exactly what you expect.
-It generates an field which is not a single-value element but an array or list of elements.
-
-    [array {simple-type} {size} '{name}' {'count', 'length', 'terminated'} '{expression}']
-
-    [array {complex-type} '{name}' {'count', 'length', 'terminated'} '{expression}']
-
-Array types can be both simple and complex typed and have a name.
-An array field must specify the way it's length is determined as well as an expression defining it's length.
-Possible values are:
-- `count`: This means that exactly the number of elements are parsed as the `expression` specifies.
-- `length`: In this case a given number of bytes are being read. So if an element has been parsed and there are still bytes left, another element is parsed.
-- `terminated`: In this case the parser will continue reading elements until it encounters a termination sequence.
-
-==== checksum Field
-
-A checksum field can only operate on simple types.
-
-    [checksum {simple-type} {size} '{name}' '{checksum-expression}']
-
-When parsing a given simple type is parsed and then the result is compared to the value the `checksum-expression` provides.
-If they don't match an exception is thrown.
-
-When serializing, the `checksum-expression` is evaluated and the result is then output.
-
-This field doesn't keep any data in memory.
-
-See also:
-- implicit field: A checksum field is similar to an implicit field, however the `checksum-expression` is evaluated are parsing time and throws an exception if the values don't match.
-
-==== const Field
-
-A const field simply reads a given simple type and compares to a given reference value.
-
-    [const {simple-type} {size} '{name}' '{reference}']
-
-When parsing it makes the parser throw an Exception if the parsed value does not match.
-
-When serializing is simply outputs the expected constant.
-
-This field doesn't keep any data in memory.
-
-See also:
-- implicit field: A const field is similar to an implicit field, however it compares the parsed input to the reference value and throws an exception if the values don't match.
-
-==== discriminator Field
-
-Discriminator fields are only used in `discriminatedType`s.
-
-    [discriminator {simple-type} {size} '{name}']
-
-When parsing a discriminator fields result just in being a locally available variable.
-
-When serializing is accesses the discriminated types constants and uses these as output.
-
-See also:
-- implicit field: A discriminator field is similar to an implicit field, however doesn't provide a serialization expression as it uses the discrimination constants of the type it is.
-- discriminated types
-
-==== implicit Field
-
-Implicit types are fields that get their value implicitly from the data they contain.
-
-    [implicit {simple-type} {size} '{name}' '{serialization-expression}']
-
-When parsing an implicit type is available as a local variable and can be used by other expressions.
-
-When serializing the serialization-expression is executed and the resulting value is output.
-
-This type of field is generally used for fields that handle numbers of elements or length values as these can be implicitly calculated at serialization time.
-
-This field doesn't keep any data in memory.
-
-==== manualArray Field
-
-    [manualArray {simple-type} {size} '{name}' {'count', 'length', 'terminated'} '{loop-expression}' '{serialization-expression}' '{deserialization-expression}' '{length-expression}']
-
-    [manualArray {complex-type} '{name}' {'count', 'length', 'terminated'} '{loop-expression}' '{serialization-expression}' '{deserialization-expression}' '{length-expression}']
-
-==== manual Field
-
-    [manual {simple-type} {size} '{name}' '{serialization-expression}' '{deserialization-expression}' '{length-expression}']
-
-    [manual {complex-type} '{name}' '{serialization-expression}' '{deserialization-expression}' '{length-expression}']
-
-==== optional Field
-
-An optional field is a type of field that can also be `null`.
-
-    [optional {simple-type} {size} '{name}' '{optional-expression}']
-
-    [optional {complex-type} '{name}' '{optional-expression}']
-
-When parsing the `optional-expression` is evaluated. If this results in`false` nothing is output, if it evaluates to `true` it is serialized as a `simple` field.
-
-When serializing, if the field is `null` nothing is output, if it is not `null` it is serialized normally.
-
-See also:
-- simple field: In general `optional` fields are identical to `simple` fields except the ability to be `null` or be skipped.
-
-==== padding Field
-
-A padding field outputs additional padding data, if an expression evaluates to `true`.
-
-    [padding {simple-type} {size} '{pading-value}' '{padding-expression}']
-
-When parsing a `padding` field is just consumed without being made available as property or local valiable if the `padding-expression` evaluates to true.
-If it doesn't, it is just skipped.
-
-This field doesn't keep any data in memory.
-
-==== reserved Field
-
-Reserved fields are very similar to `const` fields, however they don't throw exceptions, but instead log messages if the values don't match.
-
-The reason for this is that in general reserved fields have the given value until they start to be used.
-
-If the field starts to be used this shouldn't break existing applications, but it should raise a flag as it might make sense to update the drivers.
-
-    [reserved {simple-type} {size} '{name}' '{reference}']
-
-When parsing the values is parsed and the result is compared to the reference value.
-If the values don't match, a log message is sent.
-
-This field doesn't keep any data in memory.
-
-See also:
-- `const` field
-
-==== simple Field
-
-Simple fields are the most common types of fields.
-A `simple` field directly mapped to a normally typed field.
-
-    [simple {simple-type} {size} '{name}']
-
-    [simple {complex-type} '{name}']
-
-When parsing, the given type is parsed (can't be `null`) and saved in the corresponding model instance's property field.
-
-When serializing it is serialized normally.
-
-==== virtual Field
-
-Virtual fields have no impact on the input or output.
-They simply result in creating artificial get-methods in the generated model classes.
-
-    [virtual {simple-type} {size} '{name}' '{value-expression}']
-
-    [virtual {complex-type} '{name}' '{value-expression}']
-
-Instead of being bound to a property, the return value of a `virtual` property is created by evaluating the `value-expression`.
-
-==== typeSwitch Field
-
-These types of fields can only occur in discriminated types.
-
-A `discriminatedType` must contain *exactly one* `typeSwitch` field, as it defines the sub-types.
-
-    [typeSwitch '{arument-1}', '{arument-2}', ...
-        ['{argument-1-value-1}' {subtype-1-name}
-            ... Fields ...
-        ]
-        ['{vargument-1-value-2}', '{argument-2-value-1}' {subtype-2-name}
-            ... Fields ...
-        ]
-        ['{vargument-1-value-3}', '{argument-2-value-2}' {subtype-2-name} [uint 8 'existing-attribute-1', uint 16 'existing-attribute-2']
-            ... Fields ...
-        ]
-
-A type switch element must contain a list of at least one argument expression.
-Only the last option can stay empty, which results in a default type.
-
-Each sub-type declares a comma-separated list of concrete values.
-
-It must contain at most as many elements as arguments are declared for the type switch.
-
-The matching type is found during parsing by starting with the first argument.
-
-If it matches and there are no more values, the type is found, if more values are provided, they are compared to the other argument values.
-
-If no type is found, an exception is thrown.
-
-Inside each sub-type can declare fields using a subset of the types (`discriminator` and `typeSwitch` can't be used here)
-
-The third case in above code-snippet also passes a named attribute to the sub-type.
-The name must be identical to any argument or named field parsed before the switchType.
-These arguments are then available for expressions or passing on in the subtypes.
-
-See also:
-- `discriminatedType`
-
-==== Parameters
-
-Some times it is necessary to pass along additional parameters.
-
-If a complex type requires parameters, these are declared in the header of that type.
-
-....
-[discriminatedType 'S7Payload' [uint 8 'messageType', S7Parameter 'parameter']
-    [typeSwitch 'parameter.discriminatorValues[0]', 'messageType'
-        ['0xF0' S7PayloadSetupCommunication]
-        ['0x04','0x01' S7PayloadReadVarRequest]
-        ['0x04','0x03' S7PayloadReadVarResponse
-            [arrayField S7VarPayloadDataItem 'items' count 'CAST(parameter, S7ParameterReadVarResponse).numItems']
-        ]
-        ['0x05','0x01' S7PayloadWriteVarRequest
-            [arrayField S7VarPayloadDataItem 'items' count 'COUNT(CAST(parameter, S7ParameterWriteVarRequest).items)']
-        ]
-        ['0x05','0x03' S7PayloadWriteVarResponse
-            [arrayField S7VarPayloadStatusItem 'items' count 'CAST(parameter, S7ParameterWriteVarResponse).numItems']
-        ]
-        ['0x00','0x07' S7PayloadUserData
-        ]
-    ]
-]
-....
-
-Therefore wherever a complex type is referenced an additional list of parameters can be passed to the next type.
-
-Here comes an example of this in above snippet:
-
-    [field S7Payload   'payload'   ['messageType', 'parameter']]
+//
+//  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
+//
+//      http://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.
+//
+:imagesdir: ../../../images/
+
+== The MSpec format
+
+The `MSpec` format (Message Specification) was a result of a brainstorming session after evaluating a lot of other options.
+
+We simply sat down and started to write some imaginary format (`imaginary` was even the initial Name we used) and created parses for this afterwards and fine tuned spec and parsers as part of the process of implementing first protocols and language templates.
+
+It's a text-based format.
+
+At the root level of these specs are a set of `type` or `discriminatedType` blocks.
+
+`type` elements are objects that are independent from the input.
+
+An example would be the `TPKTPacket` of the S7 format:
+
+....
+[type 'TPKTPacket'
+    [const    uint 8     'protocolId' '0x03']
+    [reserved uint 8     '0x00']
+    [implicit uint 16    'len'        'payload.lengthInBytes + 4']
+    [field    COTPPacket 'payload']
+]
+....
+
+A `discriminatedType` type is in contrast an object who's content is dependent in the input.
+
+Every discriminated type can contain at most one `discriminator` field and exactly one `typeSwitch` element.
+
+For example part of the spec for the S7 format looks like this:
+
+....
+[discriminatedType 'S7Message'
+    [const         uint 8  'protocolId'      '0x32']
+    [discriminator uint 8  'messageType']
+    [reserved      uint 16 '0x0000']
+    [field         uint 16 'tpduReference']
+    [implicit      uint 16 'parameterLength' 'parameter.lengthInBytes']
+    [implicit      uint 16 'payloadLength'   'payload.lengthInBytes']
+    [typeSwitch 'messageType'
+        ['0x01' S7MessageRequest
+        ]
+        ['0x03' S7MessageResponse
+            [field uint 8 'errorClass']
+            [field uint 8 'errorCode']
+        ]
+        ['0x07' S7MessageUserData
+        ]
+    ]
+    [field S7Parameter 'parameter' ['messageType']]
+    [field S7Payload   'payload'   ['messageType', 'parameter']]
+]
+....
+
+An types start is declared by an opening square bracket `[` and ended with a closing one `]`.
+
+Also to both provide a name as first argument.
+
+Every type definition contains a list of fields that can have different types.
+
+The list of available types are:
+
+- const: expects a given value
+- reserved: expects a given value, but only warns if condition is not meet
+- field: simple or complex typed object
+- array: array of simple or complex typed objects
+- optional: simple or complex typed object, that is only present in some conditions
+- implicit: a field required for parsing, but is usually defined though other data
+- discriminator: special type of simple typed field which is used to determine the concrete type of an object (max one per type and always has to be accompanied with a `switch` field) (reserved for `discriminatedType`)
+- typeSwitch: not a real field, but indicates the existence of sub-types, which are declared inline (reserved for `discriminatedType`)
+
+The full syntax and explanations of these type follow in the following chapters.
+
+Another thing we have to explain are how types are specified.
+
+In general we distinguish between two types of types used in field definitions:
+
+- simple types
+- complex types
+
+=== Simple Types
+
+Simple types are usually raw data the format is:
+
+    {base-type} {size}
+
+The base types available are currently:
+
+- *bit*: Simple boolean value
+- *uint*: The input is treated as unsigned integer value
+- *int*: The input is treated as signed integer value
+- *float*: The input is treated as floating point number
+- *string*: The input is treated as string
+
+The size value then provides how many `bits` should be read.
+
+In case of `string` types, it refers to the number of characters.
+
+So reading an unsigned byte would be: `uint 8`.
+
+=== Complex Types
+
+In contrast to simple types, complex type reference other complex types (Root elements of the spec document).
+
+How the parser should interpret them is defined in the referenced types definition.
+
+In the example above, for example the `S7Parameter` is defined in another part of the spec.
+
+=== Field Types and their Syntax
+
+==== array Field
+
+An `array` field is exactly what you expect.
+It generates an field which is not a single-value element but an array or list of elements.
+
+    [array {simple-type} {size} '{name}' {'count', 'length', 'terminated'} '{expression}']
+
+    [array {complex-type} '{name}' {'count', 'length', 'terminated'} '{expression}']
+
+Array types can be both simple and complex typed and have a name.
+An array field must specify the way it's length is determined as well as an expression defining it's length.
+Possible values are:
+- `count`: This means that exactly the number of elements are parsed as the `expression` specifies.
+- `length`: In this case a given number of bytes are being read. So if an element has been parsed and there are still bytes left, another element is parsed.
+- `terminated`: In this case the parser will continue reading elements until it encounters a termination sequence.
+
+==== checksum Field
+
+A checksum field can only operate on simple types.
+
+    [checksum {simple-type} {size} '{name}' '{checksum-expression}']
+
+When parsing a given simple type is parsed and then the result is compared to the value the `checksum-expression` provides.
+If they don't match an exception is thrown.
+
+When serializing, the `checksum-expression` is evaluated and the result is then output.
+
+This field doesn't keep any data in memory.
+
+See also:
+- implicit field: A checksum field is similar to an implicit field, however the `checksum-expression` is evaluated are parsing time and throws an exception if the values don't match.
+
+==== const Field
+
+A const field simply reads a given simple type and compares to a given reference value.
+
+    [const {simple-type} {size} '{name}' '{reference}']
+
+When parsing it makes the parser throw an Exception if the parsed value does not match.
+
+When serializing is simply outputs the expected constant.
+
+This field doesn't keep any data in memory.
+
+See also:
+- implicit field: A const field is similar to an implicit field, however it compares the parsed input to the reference value and throws an exception if the values don't match.
+
+==== discriminator Field
+
+Discriminator fields are only used in `discriminatedType`s.
+
+    [discriminator {simple-type} {size} '{name}']
+
+When parsing a discriminator fields result just in being a locally available variable.
+
+When serializing is accesses the discriminated types constants and uses these as output.
+
+See also:
+- implicit field: A discriminator field is similar to an implicit field, however doesn't provide a serialization expression as it uses the discrimination constants of the type it is.
+- discriminated types
+
+==== implicit Field
+
+Implicit types are fields that get their value implicitly from the data they contain.
+
+    [implicit {simple-type} {size} '{name}' '{serialization-expression}']
+
+When parsing an implicit type is available as a local variable and can be used by other expressions.
+
+When serializing the serialization-expression is executed and the resulting value is output.
+
+This type of field is generally used for fields that handle numbers of elements or length values as these can be implicitly calculated at serialization time.
+
+This field doesn't keep any data in memory.
+
+==== manualArray Field
+
+    [manualArray {simple-type} {size} '{name}' {'count', 'length', 'terminated'} '{loop-expression}' '{serialization-expression}' '{deserialization-expression}' '{length-expression}']
+
+    [manualArray {complex-type} '{name}' {'count', 'length', 'terminated'} '{loop-expression}' '{serialization-expression}' '{deserialization-expression}' '{length-expression}']
+
+==== manual Field
+
+    [manual {simple-type} {size} '{name}' '{serialization-expression}' '{deserialization-expression}' '{length-expression}']
+
+    [manual {complex-type} '{name}' '{serialization-expression}' '{deserialization-expression}' '{length-expression}']
+
+==== optional Field
+
+An optional field is a type of field that can also be `null`.
+
+    [optional {simple-type} {size} '{name}' '{optional-expression}']
+
+    [optional {complex-type} '{name}' '{optional-expression}']
+
+When parsing the `optional-expression` is evaluated. If this results in`false` nothing is output, if it evaluates to `true` it is serialized as a `simple` field.
+
+When serializing, if the field is `null` nothing is output, if it is not `null` it is serialized normally.
+
+See also:
+- simple field: In general `optional` fields are identical to `simple` fields except the ability to be `null` or be skipped.
+
+==== padding Field
+
+A padding field outputs additional padding data, if an expression evaluates to `true`.
+
+    [padding {simple-type} {size} '{pading-value}' '{padding-expression}']
+
+When parsing a `padding` field is just consumed without being made available as property or local valiable if the `padding-expression` evaluates to true.
+If it doesn't, it is just skipped.
+
+This field doesn't keep any data in memory.
+
+==== reserved Field
+
+Reserved fields are very similar to `const` fields, however they don't throw exceptions, but instead log messages if the values don't match.
+
+The reason for this is that in general reserved fields have the given value until they start to be used.
+
+If the field starts to be used this shouldn't break existing applications, but it should raise a flag as it might make sense to update the drivers.
+
+    [reserved {simple-type} {size} '{name}' '{reference}']
+
+When parsing the values is parsed and the result is compared to the reference value.
+If the values don't match, a log message is sent.
+
+This field doesn't keep any data in memory.
+
+See also:
+- `const` field
+
+==== simple Field
+
+Simple fields are the most common types of fields.
+A `simple` field directly mapped to a normally typed field.
+
+    [simple {simple-type} {size} '{name}']
+
+    [simple {complex-type} '{name}']
+
+When parsing, the given type is parsed (can't be `null`) and saved in the corresponding model instance's property field.
+
+When serializing it is serialized normally.
+
+==== virtual Field
+
+Virtual fields have no impact on the input or output.
+They simply result in creating artificial get-methods in the generated model classes.
+
+    [virtual {simple-type} {size} '{name}' '{value-expression}']
+
+    [virtual {complex-type} '{name}' '{value-expression}']
+
+Instead of being bound to a property, the return value of a `virtual` property is created by evaluating the `value-expression`.
+
+==== typeSwitch Field
+
+These types of fields can only occur in discriminated types.
+
+A `discriminatedType` must contain *exactly one* `typeSwitch` field, as it defines the sub-types.
+
+    [typeSwitch '{arument-1}', '{arument-2}', ...
+        ['{argument-1-value-1}' {subtype-1-name}
+            ... Fields ...
+        ]
+        ['{vargument-1-value-2}', '{argument-2-value-1}' {subtype-2-name}
+            ... Fields ...
+        ]
+        ['{vargument-1-value-3}', '{argument-2-value-2}' {subtype-2-name} [uint 8 'existing-attribute-1', uint 16 'existing-attribute-2']
+            ... Fields ...
+        ]
+
+A type switch element must contain a list of at least one argument expression.
+Only the last option can stay empty, which results in a default type.
+
+Each sub-type declares a comma-separated list of concrete values.
+
+It must contain at most as many elements as arguments are declared for the type switch.
+
+The matching type is found during parsing by starting with the first argument.
+
+If it matches and there are no more values, the type is found, if more values are provided, they are compared to the other argument values.
+
+If no type is found, an exception is thrown.
+
+Inside each sub-type can declare fields using a subset of the types (`discriminator` and `typeSwitch` can't be used here)
+
+The third case in above code-snippet also passes a named attribute to the sub-type.
+The name must be identical to any argument or named field parsed before the switchType.
+These arguments are then available for expressions or passing on in the subtypes.
+
+See also:
+- `discriminatedType`
+
+==== Parameters
+
+Some times it is necessary to pass along additional parameters.
+
+If a complex type requires parameters, these are declared in the header of that type.
+
+....
+[discriminatedType 'S7Payload' [uint 8 'messageType', S7Parameter 'parameter']
+    [typeSwitch 'parameter.discriminatorValues[0]', 'messageType'
+        ['0xF0' S7PayloadSetupCommunication]
+        ['0x04','0x01' S7PayloadReadVarRequest]
+        ['0x04','0x03' S7PayloadReadVarResponse
+            [arrayField S7VarPayloadDataItem 'items' count 'CAST(parameter, S7ParameterReadVarResponse).numItems']
+        ]
+        ['0x05','0x01' S7PayloadWriteVarRequest
+            [arrayField S7VarPayloadDataItem 'items' count 'COUNT(CAST(parameter, S7ParameterWriteVarRequest).items)']
+        ]
+        ['0x05','0x03' S7PayloadWriteVarResponse
+            [arrayField S7VarPayloadStatusItem 'items' count 'CAST(parameter, S7ParameterWriteVarResponse).numItems']
+        ]
+        ['0x00','0x07' S7PayloadUserData
+        ]
+    ]
+]
+....
+
+Therefore wherever a complex type is referenced an additional list of parameters can be passed to the next type.
+
+Here comes an example of this in above snippet:
+
+    [field S7Payload   'payload'   ['messageType', 'parameter']]
diff --git a/src/site/asciidoc/developers/conferences.adoc b/src/site/asciidoc/developers/conferences.adoc
index 9224a0011be..930d93ec0d8 100644
--- a/src/site/asciidoc/developers/conferences.adoc
+++ b/src/site/asciidoc/developers/conferences.adoc
@@ -1,49 +1,49 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== Conferences & Events
-
-On this page we are listing options to attend talks and events around PLC4X.
-
-[width="100%",cols="2,^2,2,^2,^3",options="header"]
-|=========================================================
-|Date |Location |Type |Event | Title
-|18th June 2019 |Erfurt (GER) |Meetup |https://www.meetup.com/de-DE/iothde/events/260140057/[IoT ThĆ¼ringen] |Industrie & IoT: Die perfekte Verbindung mit Flexibus & Apache PLC4X
-|24th May 2019  |Frankfurt (GER) |Meetup |https://www.meetup.com/de-DE/IoT-Hessen/events/261422034/[IoT Hessen] |Industrial IoT goes Open Source: Apache PLC4X Talks & Party
-|3th April 2019 |Cologne (GER) |Conference |https://www.buildingiot.de[Building IoT] |Apache PLC4X: Industry 4.0 done our way
-|8th March 2019 |Solingen (GER) |Conference |https://www.codecentric.de/2019/02/05/industrial-iot-day-solingen[Industrial IoT Day] |Apache PLC4X: Industry 4.0 done our way
-|21th February 2019 |Aachen (GER) |Meetup | http://www.euregjug.eu/2019/01/29/episode-iv-a-new-hope-industry-40-done-our-way[EURegJUG Maas-Rhine] |Episode IV - A New Hope: Industry 4.0 Done Our Way
-|15th February 2019 |NĆ¼rtingen (GER) |Meetup |Ā PLC4X Meetup |Special Hackathon looking deeper into some new Protocols
-|15th November 2018 |DĆ¼sseldorf (GER) |Meetup |RheinJUG |http://www.rheinjug.de/rheinjug/event/2018/11/15/wie-wir-mit-apache-plc4x-die-silos-in-der-automatisierungsindustrie-aufbrechen.html[Wie wir mit Apache PLC4X die Silos in der Automatisierungsindustrie aufbrechen]
-|12th-13th November 2018 |Berlin (GER) |Conference |https://www.sv-veranstaltungen.de/fachbereiche/big-data-3/[3. Fachkonferenz: Industrial Analytics & Big Data in der Industrie] |Kommunikation mit Industrieanlagen ohne Umbau- und Lizenzkosten
-|22th-24th October 2018 |Edinburgh (GB) |Conference |https://events.linuxfoundation.org/events/open-source-summit-europe-2018/[Open-Source Summit Europe] |Revolutionizing the production industry with Apache PLC4X
-|24th-19th September 2018 |Montreal (CAN) |Conference |http://apachecon.com/acna18/?ref=apachecon.com[ApacheCon NA 2018] |https://apachecon.dukecon.org/acna/2018/#/scheduledEvent/51feeb6f55f250c39[Revolutionizing the Production Industry with Apache PLC4X (incubating)]
-|20th September 2018 |NĆ¼rtingen (GER) |Meetup |PLC4X Meetup |First general committer meetup
-|13th-14th June 2018 |Berlin (GER) |Conference |http://www.apachecon.com/euroadshow18/#[Apache EU Roadshow] |https://foss-backstage.de/session/revolutionizing-production-industry-apache-plc4x[Revolutionizing the production industry with Apache PLC4X]
-|4th June 2018 |Cologne (GER) |Conference |https://www.buildingiot.de/[Building IoT] |https://www.buildingiot.de/veranstaltung-6815-industrial-iot-und-edge-computing-mit-apache-plc4x-und-apache-edgent-%5Bsponsored-talk%5D.html?id=6815[Industrial IoT und Edge Computing mit Apache PLC4X und Apache Edgent]
-|5th April 2018 |Hamburg (GER) |Conference |https://techcamp.hamburg/[TechCamp Hamburg] |https://techcamp.hamburg/events/revolutionizing-industrial-iot-with-apache-plc4x/[Revolutionizing Industrial IoT with Apache PLC4X]
-|21th January 2018 |Hamburg (GER) |Conference |https://www.nortec-hamburg.de/[Nortec] |Mehr fĆ¼r Weniger? Aber Sicher!
-|4th-5th May 2019 |Brussels (BE) |Hackathon |https://eufossahackathon.bemyapp.com[EU FOSSA Apache Hackathon] | Co-creating the future of open source
-|=========================================================
-
-Looking forward to meeting you.
-
-If you've got or found any events or talks we might be missing, please inform us on dev@plc4x.apache.org.
-
-== Additional Material
-
-link:/images/PLC4X_rollup_83x237cm-final.pdf[PLC4X Banner]
+//
+//  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
+//
+//      http://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.
+//
+
+== Conferences & Events
+
+On this page we are listing options to attend talks and events around PLC4X.
+
+[width="100%",cols="2,^2,2,^2,^3",options="header"]
+|=========================================================
+|Date |Location |Type |Event | Title
+|18th June 2019 |Erfurt (GER) |Meetup |https://www.meetup.com/de-DE/iothde/events/260140057/[IoT ThĆ¼ringen] |Industrie & IoT: Die perfekte Verbindung mit Flexibus & Apache PLC4X
+|24th May 2019  |Frankfurt (GER) |Meetup |https://www.meetup.com/de-DE/IoT-Hessen/events/261422034/[IoT Hessen] |Industrial IoT goes Open Source: Apache PLC4X Talks & Party
+|3th April 2019 |Cologne (GER) |Conference |https://www.buildingiot.de[Building IoT] |Apache PLC4X: Industry 4.0 done our way
+|8th March 2019 |Solingen (GER) |Conference |https://www.codecentric.de/2019/02/05/industrial-iot-day-solingen[Industrial IoT Day] |Apache PLC4X: Industry 4.0 done our way
+|21th February 2019 |Aachen (GER) |Meetup | http://www.euregjug.eu/2019/01/29/episode-iv-a-new-hope-industry-40-done-our-way[EURegJUG Maas-Rhine] |Episode IV - A New Hope: Industry 4.0 Done Our Way
+|15th February 2019 |NĆ¼rtingen (GER) |Meetup |Ā PLC4X Meetup |Special Hackathon looking deeper into some new Protocols
+|15th November 2018 |DĆ¼sseldorf (GER) |Meetup |RheinJUG |http://www.rheinjug.de/rheinjug/event/2018/11/15/wie-wir-mit-apache-plc4x-die-silos-in-der-automatisierungsindustrie-aufbrechen.html[Wie wir mit Apache PLC4X die Silos in der Automatisierungsindustrie aufbrechen]
+|12th-13th November 2018 |Berlin (GER) |Conference |https://www.sv-veranstaltungen.de/fachbereiche/big-data-3/[3. Fachkonferenz: Industrial Analytics & Big Data in der Industrie] |Kommunikation mit Industrieanlagen ohne Umbau- und Lizenzkosten
+|22th-24th October 2018 |Edinburgh (GB) |Conference |https://events.linuxfoundation.org/events/open-source-summit-europe-2018/[Open-Source Summit Europe] |Revolutionizing the production industry with Apache PLC4X
+|24th-19th September 2018 |Montreal (CAN) |Conference |http://apachecon.com/acna18/?ref=apachecon.com[ApacheCon NA 2018] |https://apachecon.dukecon.org/acna/2018/#/scheduledEvent/51feeb6f55f250c39[Revolutionizing the Production Industry with Apache PLC4X (incubating)]
+|20th September 2018 |NĆ¼rtingen (GER) |Meetup |PLC4X Meetup |First general committer meetup
+|13th-14th June 2018 |Berlin (GER) |Conference |http://www.apachecon.com/euroadshow18/#[Apache EU Roadshow] |https://foss-backstage.de/session/revolutionizing-production-industry-apache-plc4x[Revolutionizing the production industry with Apache PLC4X]
+|4th June 2018 |Cologne (GER) |Conference |https://www.buildingiot.de/[Building IoT] |https://www.buildingiot.de/veranstaltung-6815-industrial-iot-und-edge-computing-mit-apache-plc4x-und-apache-edgent-%5Bsponsored-talk%5D.html?id=6815[Industrial IoT und Edge Computing mit Apache PLC4X und Apache Edgent]
+|5th April 2018 |Hamburg (GER) |Conference |https://techcamp.hamburg/[TechCamp Hamburg] |https://techcamp.hamburg/events/revolutionizing-industrial-iot-with-apache-plc4x/[Revolutionizing Industrial IoT with Apache PLC4X]
+|21th January 2018 |Hamburg (GER) |Conference |https://www.nortec-hamburg.de/[Nortec] |Mehr fĆ¼r Weniger? Aber Sicher!
+|4th-5th May 2019 |Brussels (BE) |Hackathon |https://eufossahackathon.bemyapp.com[EU FOSSA Apache Hackathon] | Co-creating the future of open source
+|=========================================================
+
+Looking forward to meeting you.
+
+If you've got or found any events or talks we might be missing, please inform us on dev@plc4x.apache.org.
+
+== Additional Material
+
+link:/images/PLC4X_rollup_83x237cm-final.pdf[PLC4X Banner]
diff --git a/src/site/asciidoc/developers/contributing.adoc b/src/site/asciidoc/developers/contributing.adoc
index 78a1f9d2460..461591d82af 100644
--- a/src/site/asciidoc/developers/contributing.adoc
+++ b/src/site/asciidoc/developers/contributing.adoc
@@ -1,202 +1,202 @@
-//
-//  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
-//
-//      http://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.
-//
-:imagesdir: ../images/
-
-== Contributing
-
-=== Forms of contribution
-
-There are multiple forms in which you can become involved with the PLC4X project.
-
-These usually are, but are not limited to:
-
-- Submitting Pull Requests
-- Filing Bug-Reports
-- Active communication on our mailing lists
-- Promoting the project (articles, blog posts, talks at conferences)
-- Documentation
-
-We are a very friendly bunch and don't be afraid to step forward.
-
-=== Pull-Requests
-
-The simplest way to submit code changes, is via a GitHub pull-request.
-
-In order to do this first create a GitHub account and sign into you account.
-
-After that's done, please to to our https://github.com/apache/plc4x[GitHub site] and create a so-called `Fork`.
-
-image::contributing-github-fork.png[]
-
-What happens now, is that GitHub creates a full copy of the PLC4X repo in your account. Only you can commit to this.
-
-Now ideally you check-out your cloned repository:
-
-    git clone https://github.com/{your-user-id}/plc4x.git
-
-Now you have a copy of PLC4X on your computer and you can change whatever you want and as it's your copy, you can even commit these changes without any danger of breaking things.
-
-As soon as you're finished with your changes and want us to have a look, it's time to create a so-called `Pull-Request`.
-
-You do that by going to your forked repository page on GitHub.
-
-Every forked repository has an additional button called "New Pull Request":
-
-image::contributing-github-create-pull-request.png[]
-
-If you click on this, we will receive a notification on your changes and can review them.
-We also can discuss your changes and have you perfect your pull request before we accept and merge it into PLC4X.
-
-==== Keeping your fork up to date
-
-As we are continuously working on PLC4X and you created a copy of our repo, this will become out-of-date pretty soon.
-
-In order get the changes we introduced in the official repo you have to tell git about that.
-
-You do this locally by adding a new so-called `remote`.
-Per default the remote you cloned from is called `origin`.
-
-Usually you will call the second remote `upstream` but in general you can call it whatever you like.
-
-Add the remote on the commandline (or your git gui of choice):
-
-    git remote add upstream https://github.com/apache/plc4x.git
-
-If you list all your remotes, with the following command:
-
-    git remote -v
-
-It should output something like this:
-
-    origin    https://github.com/{your-user-id}/plc4x.git (fetch)
-    origin    https://github.com/{your-user-id}/plc4x.git (push)
-    upstream    https://github.com/apache/plc4x.git (fetch)
-    upstream    https://github.com/apache/plc4x.git (push)
-
-If that's so, you're fine to continue, if not ... well you could ask for assistance on our dev-list.
-
-In order to get all changes of our upstream-repository, just execute the following command:
-
-    git pull upstream
-
-This will get all changed from upstream and merge them locally. In order to update your GitHub version, you have to push things back to `origin`.
-You can do this by executing the following command:
-
-    git push
-
-(If no remote is provided, git will use `origin` per default)
-
-===  Bug Reports
-
-We use https://issues.apache.org/jira/projects/PLC4X[JIRA] as our Bug & Issue Tracker.
-
-Feel free to submit `feature requests`, `bug reports`, `patches`, `comment on issues`, ...
-
-In order to be able to do so, you need to create an account first.
-
-Currently Apache has a separate login system for JIRA and all other services, this might change in the future, but right now it's the way things are.
-
-So if you are considering to contribute more than just a one-time-patch, please choose a username that hasn't been used by an existing http://people.apache.org/committer-index.html[Apache committer] as this will simplify things if we invite you to become part of the team.
-
-If you want to be assigned to an issue because you want to work on it, please request to be added to the JIRA groups on our http://plc4x.apache.org/mailing-lists.html[developers mailing list]
-
-=== Documentation
-
-As our documentation and website are generated as a side-product of our build, contributing to this technically the same as contributing to the code.
-
-All our content is written in Asciidoctor and is located in `src/site/asciidoc` directories.
-For a reference of the Asciidoctor syntax please have a look at the https://asciidoctor.org/docs/user-manual/#introduction-to-asciidoctor[Asciidoctor documentation].
-
-=== Branching model
-
-The PLC4X project uses the following branching model.
-
-The same model is used for a wide variety of other projects, so it should be pretty straight forward.
-
-- `master` contains the latest released state.
-- Development is performed on the `develop` branch.
-- Features are developed in Feature-Branches with a prefix `feature/`
-- Each minor release has a corresponding release branch `rel/{major-version}.{minor-version}`
-- A release branch is spawned from `develop` only
-- Bugfix releases don't have a dedicated release branch, they are just performed on the corresponding minor versions release branch
-
-// Use http://www.webgraphviz.com/ for online editiing this ...
-[graphviz, plc4x-branching-model, png]
-----
-digraph g{
-    rankdir="LR";
-    pad=0.5;
-    nodesep=0.6;
-    ranksep=0.5;
-    forcelabels=true;
-
-    node [fixedsize=true,
-        shape=circle, style=empty, color="#909090", height=0.5
-        fontcolor="deepskyblue", font="Arial bold", fontsize="14pt" ];
-    edge [color="#909090", penwidth=3];
-
-    node  [group="master"];
-    m1    [label="master", width=0.9];
-    m2   [label="0.2.0", width=0.9];
-    m3   [label="0.2.1", width=0.9];
-    m4   [label="", shape=circle, color="#b0b0b0"];
-    m1 -> m2 -> m3
-    m3 -> m4 [color="#b0b0b0", style=dashed];
-
-    node  [group="rel/0.1", Ylabel="hurz"];
-    r11   [label="rel/0.1", width=2, shape=box];
-    r12   [label="0.1.0-SNAPSHOT", width=2, shape=box];
-    r13   [label="0.1.0", width=0.9];
-    r14   [label="0.1.1-SNAPSHOT", width=2, shape=box];
-    r15   [label="", shape=circle, color="#b0b0b0"];
-    r11 -> r12 -> r13 -> r14;
-    r14 -> r15 [color="#b0b0b0", style=dashed];
-    r13 -> m1
-
-    node  [group="rel/0.2", Ylabel="hurz"];
-    r21   [label="rel/0.2", width=2, shape=box];
-    r22   [label="0.2.0-SNAPSHOT", width=2, shape=box];
-    r23   [label="0.2.0", width=0.9];
-    r24   [label="0.2.1-SNAPSHOT", width=2, shape=box];
-    r25   [label="0.2.1", width=0.9];
-    r26   [label="0.2.2-SNAPSHOT", width=2, shape=box];
-    r27   [label="", shape=circle, color="#b0b0b0"];
-    r21 -> r22 -> r23 -> r24 -> r25 -> r26;
-    r26 -> r27 [color="#b0b0b0", style=dashed];
-    r23 -> m2
-    r25 -> m3
-
-    node  [group="develop"];
-    d1    [label="develop", width=2, shape=box];
-    d2    [label="0.1.0-SNAPSHOT", width=2, shape=box];
-    d3    [label="0.1.0-SNAPSHOT", width=2, shape=box];
-    d4    [label="0.2.0-SNAPSHOT", width=2, shape=box];
-    d5    [label="0.2.0-SNAPSHOT", width=2, shape=box];
-    d6    [label="0.2.0-SNAPSHOT", width=2, shape=box];
-    d7    [label="0.3.0-SNAPSHOT", width=2, shape=box];
-    d8    [label="0.3.0-SNAPSHOT", width=2, shape=box];
-    d9    [label="0.3.0-SNAPSHOT", width=2, shape=box];
-    d10    [label="", shape=circle, color="#b0b0b0"];
-    d1 -> d2 -> d3 -> d4 -> d5 -> d6 -> d7 -> d8 -> d9;
-    d9 -> d10 [color="#b0b0b0", style=dashed];
-
-    d3 -> r11
-    d6 -> r21
-}
-----
-
-
+//
+//  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
+//
+//      http://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.
+//
+:imagesdir: ../images/
+
+== Contributing
+
+=== Forms of contribution
+
+There are multiple forms in which you can become involved with the PLC4X project.
+
+These usually are, but are not limited to:
+
+- Submitting Pull Requests
+- Filing Bug-Reports
+- Active communication on our mailing lists
+- Promoting the project (articles, blog posts, talks at conferences)
+- Documentation
+
+We are a very friendly bunch and don't be afraid to step forward.
+
+=== Pull-Requests
+
+The simplest way to submit code changes, is via a GitHub pull-request.
+
+In order to do this first create a GitHub account and sign into you account.
+
+After that's done, please to to our https://github.com/apache/plc4x[GitHub site] and create a so-called `Fork`.
+
+image::contributing-github-fork.png[]
+
+What happens now, is that GitHub creates a full copy of the PLC4X repo in your account. Only you can commit to this.
+
+Now ideally you check-out your cloned repository:
+
+    git clone https://github.com/{your-user-id}/plc4x.git
+
+Now you have a copy of PLC4X on your computer and you can change whatever you want and as it's your copy, you can even commit these changes without any danger of breaking things.
+
+As soon as you're finished with your changes and want us to have a look, it's time to create a so-called `Pull-Request`.
+
+You do that by going to your forked repository page on GitHub.
+
+Every forked repository has an additional button called "New Pull Request":
+
+image::contributing-github-create-pull-request.png[]
+
+If you click on this, we will receive a notification on your changes and can review them.
+We also can discuss your changes and have you perfect your pull request before we accept and merge it into PLC4X.
+
+==== Keeping your fork up to date
+
+As we are continuously working on PLC4X and you created a copy of our repo, this will become out-of-date pretty soon.
+
+In order get the changes we introduced in the official repo you have to tell git about that.
+
+You do this locally by adding a new so-called `remote`.
+Per default the remote you cloned from is called `origin`.
+
+Usually you will call the second remote `upstream` but in general you can call it whatever you like.
+
+Add the remote on the commandline (or your git gui of choice):
+
+    git remote add upstream https://github.com/apache/plc4x.git
+
+If you list all your remotes, with the following command:
+
+    git remote -v
+
+It should output something like this:
+
+    origin    https://github.com/{your-user-id}/plc4x.git (fetch)
+    origin    https://github.com/{your-user-id}/plc4x.git (push)
+    upstream    https://github.com/apache/plc4x.git (fetch)
+    upstream    https://github.com/apache/plc4x.git (push)
+
+If that's so, you're fine to continue, if not ... well you could ask for assistance on our dev-list.
+
+In order to get all changes of our upstream-repository, just execute the following command:
+
+    git pull upstream
+
+This will get all changed from upstream and merge them locally. In order to update your GitHub version, you have to push things back to `origin`.
+You can do this by executing the following command:
+
+    git push
+
+(If no remote is provided, git will use `origin` per default)
+
+===  Bug Reports
+
+We use https://issues.apache.org/jira/projects/PLC4X[JIRA] as our Bug & Issue Tracker.
+
+Feel free to submit `feature requests`, `bug reports`, `patches`, `comment on issues`, ...
+
+In order to be able to do so, you need to create an account first.
+
+Currently Apache has a separate login system for JIRA and all other services, this might change in the future, but right now it's the way things are.
+
+So if you are considering to contribute more than just a one-time-patch, please choose a username that hasn't been used by an existing http://people.apache.org/committer-index.html[Apache committer] as this will simplify things if we invite you to become part of the team.
+
+If you want to be assigned to an issue because you want to work on it, please request to be added to the JIRA groups on our http://plc4x.apache.org/mailing-lists.html[developers mailing list]
+
+=== Documentation
+
+As our documentation and website are generated as a side-product of our build, contributing to this technically the same as contributing to the code.
+
+All our content is written in Asciidoctor and is located in `src/site/asciidoc` directories.
+For a reference of the Asciidoctor syntax please have a look at the https://asciidoctor.org/docs/user-manual/#introduction-to-asciidoctor[Asciidoctor documentation].
+
+=== Branching model
+
+The PLC4X project uses the following branching model.
+
+The same model is used for a wide variety of other projects, so it should be pretty straight forward.
+
+- `master` contains the latest released state.
+- Development is performed on the `develop` branch.
+- Features are developed in Feature-Branches with a prefix `feature/`
+- Each minor release has a corresponding release branch `rel/{major-version}.{minor-version}`
+- A release branch is spawned from `develop` only
+- Bugfix releases don't have a dedicated release branch, they are just performed on the corresponding minor versions release branch
+
+// Use http://www.webgraphviz.com/ for online editiing this ...
+[graphviz, plc4x-branching-model, png]
+----
+digraph g{
+    rankdir="LR";
+    pad=0.5;
+    nodesep=0.6;
+    ranksep=0.5;
+    forcelabels=true;
+
+    node [fixedsize=true,
+        shape=circle, style=empty, color="#909090", height=0.5
+        fontcolor="deepskyblue", font="Arial bold", fontsize="14pt" ];
+    edge [color="#909090", penwidth=3];
+
+    node  [group="master"];
+    m1    [label="master", width=0.9];
+    m2   [label="0.2.0", width=0.9];
+    m3   [label="0.2.1", width=0.9];
+    m4   [label="", shape=circle, color="#b0b0b0"];
+    m1 -> m2 -> m3
+    m3 -> m4 [color="#b0b0b0", style=dashed];
+
+    node  [group="rel/0.1", Ylabel="hurz"];
+    r11   [label="rel/0.1", width=2, shape=box];
+    r12   [label="0.1.0-SNAPSHOT", width=2, shape=box];
+    r13   [label="0.1.0", width=0.9];
+    r14   [label="0.1.1-SNAPSHOT", width=2, shape=box];
+    r15   [label="", shape=circle, color="#b0b0b0"];
+    r11 -> r12 -> r13 -> r14;
+    r14 -> r15 [color="#b0b0b0", style=dashed];
+    r13 -> m1
+
+    node  [group="rel/0.2", Ylabel="hurz"];
+    r21   [label="rel/0.2", width=2, shape=box];
+    r22   [label="0.2.0-SNAPSHOT", width=2, shape=box];
+    r23   [label="0.2.0", width=0.9];
+    r24   [label="0.2.1-SNAPSHOT", width=2, shape=box];
+    r25   [label="0.2.1", width=0.9];
+    r26   [label="0.2.2-SNAPSHOT", width=2, shape=box];
+    r27   [label="", shape=circle, color="#b0b0b0"];
+    r21 -> r22 -> r23 -> r24 -> r25 -> r26;
+    r26 -> r27 [color="#b0b0b0", style=dashed];
+    r23 -> m2
+    r25 -> m3
+
+    node  [group="develop"];
+    d1    [label="develop", width=2, shape=box];
+    d2    [label="0.1.0-SNAPSHOT", width=2, shape=box];
+    d3    [label="0.1.0-SNAPSHOT", width=2, shape=box];
+    d4    [label="0.2.0-SNAPSHOT", width=2, shape=box];
+    d5    [label="0.2.0-SNAPSHOT", width=2, shape=box];
+    d6    [label="0.2.0-SNAPSHOT", width=2, shape=box];
+    d7    [label="0.3.0-SNAPSHOT", width=2, shape=box];
+    d8    [label="0.3.0-SNAPSHOT", width=2, shape=box];
+    d9    [label="0.3.0-SNAPSHOT", width=2, shape=box];
+    d10    [label="", shape=circle, color="#b0b0b0"];
+    d1 -> d2 -> d3 -> d4 -> d5 -> d6 -> d7 -> d8 -> d9;
+    d9 -> d10 [color="#b0b0b0", style=dashed];
+
+    d3 -> r11
+    d6 -> r21
+}
+----
+
+
diff --git a/src/site/asciidoc/developers/decisions.adoc b/src/site/asciidoc/developers/decisions.adoc
index bdb6f8966a0..344050359f0 100644
--- a/src/site/asciidoc/developers/decisions.adoc
+++ b/src/site/asciidoc/developers/decisions.adoc
@@ -1,66 +1,66 @@
-//
-//  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
-//
-//      http://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.
-//
-:imagesdir: ../images/
-
-== Decision Making
-
-=== Introduction
-
-This document describes the roles and responsibilities of the project, who may vote, how voting works, how conflicts are resolved, etc.
-
-The https://www.apache.org/foundation/faq[Apache Foundation FAQ] and http://www.apache.org/foundation/faq.html[How-It-Works] explain the operation and background of the foundation. Terms used are defined in the https://www.apache.org/foundation/glossary[ASF glossary].
-
-Apache has a http://www.apache.org/foundation/policies/conduct.html[code of conduct] that it expects its members to follow.
-
-=== Roles and Responsibilities
-
-Apache projects define a set of https://www.apache.org/foundation/how-it-works.html#roles[roles] with associated rights and responsibilities.
-
-==== Project Management Committee
-
-The http://www.apache.org/dev/pmc.html#what-is-a-pmc[PMC] has many https://www.apache.org/foundation/how-it-works.html#pmc[responsibilities] including complying with http://www.apache.org/dev/pmc.html#policy[ASF policies], https://www.apache.org/foundation/board/reporting[reporting to the board], https://www.apache.org/foundation/voting.html[approving releases] and adding new http://www.apache.org/dev/pmc.html#newcommitter[committers] and http://www.apache.org/dev/pmc.html#newpmc[PMC members].
-
-==== The Chair
-
-The http://www.apache.org/dev/pmc.html#chair[chair] ensures board reports are submitted and that the project's roster is up to date.
-
-=== Decision Making
-
-Different decisions require different forms of approval but community consensus is always the goal. Voting when needed should be open for http://www.apache.org/legal/release-policy.html#release-approval[at least 72 hours].
-
-- https://www.apache.org/foundation/glossary.html#ConsensusApproval[Consensus Approval] ā€“ Consensus approval requires 3 https://www.apache.org/foundation/voting.html#binding-votes[binding] +1 votes and no -1 votes (https://www.apache.org/foundation/glossary.html#Veto[vetoes]).
-- https://www.apache.org/foundation/glossary.html#MajorityApproval[Majority Approval] ā€“ requires at least 3 https://www.apache.org/foundation/voting.html#binding-votes[binding] +1 votes more +1 votes than -1 votes.
-- https://www.apache.org/foundation/glossary.html#LazyConsensus[Lazy Consensus] ā€“ consensus no objections (ā€˜silence gives assentā€™).
-
-|===
-|Action                     |Who can vote |Approval           |Where to vote             |Board approval required
-|Code change                |Committer    |Lazy Consensus     |public dev or commit list |
-|Release                    |PMC          |Majority Approval  |public dev list           |
-|New committer              |PMC          |Consensus Approval |private list              |
-|New PMC member             |PMC          |Consensus Approval |private listĀ              |Yes 1)
-|Existing committer removal |PMC          |Consensus Approval |private list              |
-|Existing PMC removal       |PMC          |Consensus Approval |private list              |Yes 2)
-|Change chair               |PMC          |Consensus Approval |private list              |Yes 3)
-|===
-
-1. http://www.apache.org/dev/pmc.html#notice_period[Notice] must be given to board.
-2. Except PMC member in question. Only the board can http://www.apache.org/dev/pmc.html#pmc-removal[remove PMC members].
-3. Need to be http://www.apache.org/dev/pmc.html#newchair[approved by the board] at the next board meeting.
-
-
-
-
+//
+//  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
+//
+//      http://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.
+//
+:imagesdir: ../images/
+
+== Decision Making
+
+=== Introduction
+
+This document describes the roles and responsibilities of the project, who may vote, how voting works, how conflicts are resolved, etc.
+
+The https://www.apache.org/foundation/faq[Apache Foundation FAQ] and http://www.apache.org/foundation/faq.html[How-It-Works] explain the operation and background of the foundation. Terms used are defined in the https://www.apache.org/foundation/glossary[ASF glossary].
+
+Apache has a http://www.apache.org/foundation/policies/conduct.html[code of conduct] that it expects its members to follow.
+
+=== Roles and Responsibilities
+
+Apache projects define a set of https://www.apache.org/foundation/how-it-works.html#roles[roles] with associated rights and responsibilities.
+
+==== Project Management Committee
+
+The http://www.apache.org/dev/pmc.html#what-is-a-pmc[PMC] has many https://www.apache.org/foundation/how-it-works.html#pmc[responsibilities] including complying with http://www.apache.org/dev/pmc.html#policy[ASF policies], https://www.apache.org/foundation/board/reporting[reporting to the board], https://www.apache.org/foundation/voting.html[approving releases] and adding new http://www.apache.org/dev/pmc.html#newcommitter[committers] and http://www.apache.org/dev/pmc.html#newpmc[PMC members].
+
+==== The Chair
+
+The http://www.apache.org/dev/pmc.html#chair[chair] ensures board reports are submitted and that the project's roster is up to date.
+
+=== Decision Making
+
+Different decisions require different forms of approval but community consensus is always the goal. Voting when needed should be open for http://www.apache.org/legal/release-policy.html#release-approval[at least 72 hours].
+
+- https://www.apache.org/foundation/glossary.html#ConsensusApproval[Consensus Approval] ā€“ Consensus approval requires 3 https://www.apache.org/foundation/voting.html#binding-votes[binding] +1 votes and no -1 votes (https://www.apache.org/foundation/glossary.html#Veto[vetoes]).
+- https://www.apache.org/foundation/glossary.html#MajorityApproval[Majority Approval] ā€“ requires at least 3 https://www.apache.org/foundation/voting.html#binding-votes[binding] +1 votes more +1 votes than -1 votes.
+- https://www.apache.org/foundation/glossary.html#LazyConsensus[Lazy Consensus] ā€“ consensus no objections (ā€˜silence gives assentā€™).
+
+|===
+|Action                     |Who can vote |Approval           |Where to vote             |Board approval required
+|Code change                |Committer    |Lazy Consensus     |public dev or commit list |
+|Release                    |PMC          |Majority Approval  |public dev list           |
+|New committer              |PMC          |Consensus Approval |private list              |
+|New PMC member             |PMC          |Consensus Approval |private listĀ              |Yes 1)
+|Existing committer removal |PMC          |Consensus Approval |private list              |
+|Existing PMC removal       |PMC          |Consensus Approval |private list              |Yes 2)
+|Change chair               |PMC          |Consensus Approval |private list              |Yes 3)
+|===
+
+1. http://www.apache.org/dev/pmc.html#notice_period[Notice] must be given to board.
+2. Except PMC member in question. Only the board can http://www.apache.org/dev/pmc.html#pmc-removal[remove PMC members].
+3. Need to be http://www.apache.org/dev/pmc.html#newchair[approved by the board] at the next board meeting.
+
+
+
+
diff --git a/src/site/asciidoc/developers/issues.adoc b/src/site/asciidoc/developers/issues.adoc
index f8133302afd..016e9687857 100644
--- a/src/site/asciidoc/developers/issues.adoc
+++ b/src/site/asciidoc/developers/issues.adoc
@@ -1,20 +1,20 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== Bug & Issue Tracker
-
+//
+//  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
+//
+//      http://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.
+//
+
+== Bug & Issue Tracker
+
 https://issues.apache.org/jira/projects/PLC4X
\ No newline at end of file
diff --git a/src/site/asciidoc/developers/jqassistant.adoc b/src/site/asciidoc/developers/jqassistant.adoc
index 0bbbde5425d..15033d84c1c 100644
--- a/src/site/asciidoc/developers/jqassistant.adoc
+++ b/src/site/asciidoc/developers/jqassistant.adoc
@@ -1,126 +1,126 @@
-//
-//  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
-//
-//      http://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.
-//
-:imagesdir: ../images/
-
-== Using JQAssistant
-
-In PLC4X we are using a tool called `https://jqassistant.org/[JQAssistant]` for enforcing quality assurance rules.
-
-`JQAssistant` can be thought of as a set of two components:
-
-- A set of scanners that analyse a project and stores the gathered information in for of linked graphs in a Neo4j database.
-- An engine that executes defined rules against the graph created during the scan phase of the build
-
-These rules can produce either reports and tables or they are used to enforce rules.
-
-If a pre-defined rule is violated the failed checks can be marked as `warning` or `error` that breaks the build.
-
-In contrast to using the `maven-enforcer-plugin` doing cross-domain checks is really simple as all information is available in one big graph.
-
-Currently the following scanners are active:
-
-- CDI
-- Common
-- Common Test
-- Core Analysis
-- EJB3
-- GraphML
-- JAX-RS
-- JPA 2
-- JSON
-- JUnit
-- Java
-- Java 8
-- Java EE 6
-- Maven 3
-- OSGi
-- RDBMS
-- TestNG
-- Tycho
-- XML
-- YAML
-
-These rules that are automatically checked during the build are defined in `src/jjqassistant`.
-If defined in a reactor project, the rules apply to all modules of that (sub-)reactor.
-So if they are defined in the root module of the project, it applies to all modules.
-
-=== Defining JQAssistant rules
-
-TODO: Finish this "little detail" ...
-
-=== Using the Web-UI
-
-The scan and analysis is automatically performed during a normal Maven build.
-In order to do ad-hoc queries against the project or develop new rules, the Web-UI is very helpful.
-
-To start the Web-UI, all you need to do, is run the following command (after a build):
-
-   mvn jqassistant:server
-
-This will start a Neo4j server with web console.
-
-   [INFO] --- jqassistant-maven-plugin:1.3.0:server (default-cli) @ plclogger ---
-   [INFO] Connecting to store at 'file:/Users/christofer.dutz/Projects/Apache/PLC4X/target/jqassistant/store/'
-   2018-04-05 19:11:14.369+0200 INFO  [o.n.s.CommunityNeoServer] No SSL certificate found, generating a self-signed certificate..
-   2018-04-05 19:11:14.683+0200 INFO  [o.n.s.CommunityNeoServer] Starting HTTP on port 7474 (8 threads available)
-   2018-04-05 19:11:14.859+0200 INFO  [o.n.s.w.Jetty9WebServer] Mounting static content at /webadmin
-   2018-04-05 19:11:14.892+0200 INFO  [o.n.s.w.Jetty9WebServer] Mounting static content at /browser
-   Apr 05, 2018 7:11:15 PM com.sun.jersey.server.impl.application.WebApplicationImpl _initiate
-   INFORMATION: Initiating Jersey application, version 'Jersey: 1.19 02/11/2015 03:25 AM'
-   Apr 05, 2018 7:11:15 PM com.sun.jersey.server.impl.application.WebApplicationImpl _initiate
-   INFORMATION: Initiating Jersey application, version 'Jersey: 1.19 02/11/2015 03:25 AM'
-   Apr 05, 2018 7:11:15 PM com.sun.jersey.server.impl.application.WebApplicationImpl _initiate
-   INFORMATION: Initiating Jersey application, version 'Jersey: 1.19 02/11/2015 03:25 AM'
-   2018-04-05 19:11:15.396+0200 INFO  [o.n.s.CommunityNeoServer] Remote interface ready and available at http://localhost:7474/
-   [INFO] Running server for module org.apache.plc4x:plc4x-parent:0.0.1-SNAPSHOT
-   [INFO] Press <Enter> to finish.
-
-So when visiting the anounced url with a browser, you can use the pretty useful neo4j web console.
-
-image::neo4j-web-console.png[Neo4j Web Console]
-
-=== Using IntelliJ Idea
-
-IntelliJ comes with some interesting Neo4J support. Unfortunately this only supports `Neo4j 3`.
-
-Unfortunately the process of enabling this toolset is a little less comfortable than the Web-UI version.
-
-Even if JQAssistant uses `Neo4j 2` per default, we can force it to use `Neo4j 3` by providing an additional commandline parameter.
-
-    mvn -Djqassistant.neo4jVersion=3 clean install
-
-JQAssistant uses Neo4j 3 and the resulting data directory is then in Neo4j 3 format.
-
-In this case the server has to be started with the same parameter:
-
-   mvn -Djqassistant.neo4jVersion=3 jqassistant:server
-
-As soon as the server is started, we can connect from the IntelliJ plugin.
-
-Note: The connection settings also contain a username and a password.
-
-image::neo4j-intellij-settings.png[width=800]
-
-It appears that this can simply be left empty of can contain random values.
-
-After creating the connection, the `Graph Neo4j` view should list the new connection.
-
-image::neo4j-intellij-database-connections-view.png[width=300]
-
-You can now use this to perform queries
-
-image::neo4j-intellij-query-results.png[width=800]
+//
+//  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
+//
+//      http://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.
+//
+:imagesdir: ../images/
+
+== Using JQAssistant
+
+In PLC4X we are using a tool called `https://jqassistant.org/[JQAssistant]` for enforcing quality assurance rules.
+
+`JQAssistant` can be thought of as a set of two components:
+
+- A set of scanners that analyse a project and stores the gathered information in for of linked graphs in a Neo4j database.
+- An engine that executes defined rules against the graph created during the scan phase of the build
+
+These rules can produce either reports and tables or they are used to enforce rules.
+
+If a pre-defined rule is violated the failed checks can be marked as `warning` or `error` that breaks the build.
+
+In contrast to using the `maven-enforcer-plugin` doing cross-domain checks is really simple as all information is available in one big graph.
+
+Currently the following scanners are active:
+
+- CDI
+- Common
+- Common Test
+- Core Analysis
+- EJB3
+- GraphML
+- JAX-RS
+- JPA 2
+- JSON
+- JUnit
+- Java
+- Java 8
+- Java EE 6
+- Maven 3
+- OSGi
+- RDBMS
+- TestNG
+- Tycho
+- XML
+- YAML
+
+These rules that are automatically checked during the build are defined in `src/jjqassistant`.
+If defined in a reactor project, the rules apply to all modules of that (sub-)reactor.
+So if they are defined in the root module of the project, it applies to all modules.
+
+=== Defining JQAssistant rules
+
+TODO: Finish this "little detail" ...
+
+=== Using the Web-UI
+
+The scan and analysis is automatically performed during a normal Maven build.
+In order to do ad-hoc queries against the project or develop new rules, the Web-UI is very helpful.
+
+To start the Web-UI, all you need to do, is run the following command (after a build):
+
+   mvn jqassistant:server
+
+This will start a Neo4j server with web console.
+
+   [INFO] --- jqassistant-maven-plugin:1.3.0:server (default-cli) @ plclogger ---
+   [INFO] Connecting to store at 'file:/Users/christofer.dutz/Projects/Apache/PLC4X/target/jqassistant/store/'
+   2018-04-05 19:11:14.369+0200 INFO  [o.n.s.CommunityNeoServer] No SSL certificate found, generating a self-signed certificate..
+   2018-04-05 19:11:14.683+0200 INFO  [o.n.s.CommunityNeoServer] Starting HTTP on port 7474 (8 threads available)
+   2018-04-05 19:11:14.859+0200 INFO  [o.n.s.w.Jetty9WebServer] Mounting static content at /webadmin
+   2018-04-05 19:11:14.892+0200 INFO  [o.n.s.w.Jetty9WebServer] Mounting static content at /browser
+   Apr 05, 2018 7:11:15 PM com.sun.jersey.server.impl.application.WebApplicationImpl _initiate
+   INFORMATION: Initiating Jersey application, version 'Jersey: 1.19 02/11/2015 03:25 AM'
+   Apr 05, 2018 7:11:15 PM com.sun.jersey.server.impl.application.WebApplicationImpl _initiate
+   INFORMATION: Initiating Jersey application, version 'Jersey: 1.19 02/11/2015 03:25 AM'
+   Apr 05, 2018 7:11:15 PM com.sun.jersey.server.impl.application.WebApplicationImpl _initiate
+   INFORMATION: Initiating Jersey application, version 'Jersey: 1.19 02/11/2015 03:25 AM'
+   2018-04-05 19:11:15.396+0200 INFO  [o.n.s.CommunityNeoServer] Remote interface ready and available at http://localhost:7474/
+   [INFO] Running server for module org.apache.plc4x:plc4x-parent:0.0.1-SNAPSHOT
+   [INFO] Press <Enter> to finish.
+
+So when visiting the anounced url with a browser, you can use the pretty useful neo4j web console.
+
+image::neo4j-web-console.png[Neo4j Web Console]
+
+=== Using IntelliJ Idea
+
+IntelliJ comes with some interesting Neo4J support. Unfortunately this only supports `Neo4j 3`.
+
+Unfortunately the process of enabling this toolset is a little less comfortable than the Web-UI version.
+
+Even if JQAssistant uses `Neo4j 2` per default, we can force it to use `Neo4j 3` by providing an additional commandline parameter.
+
+    mvn -Djqassistant.neo4jVersion=3 clean install
+
+JQAssistant uses Neo4j 3 and the resulting data directory is then in Neo4j 3 format.
+
+In this case the server has to be started with the same parameter:
+
+   mvn -Djqassistant.neo4jVersion=3 jqassistant:server
+
+As soon as the server is started, we can connect from the IntelliJ plugin.
+
+Note: The connection settings also contain a username and a password.
+
+image::neo4j-intellij-settings.png[width=800]
+
+It appears that this can simply be left empty of can contain random values.
+
+After creating the connection, the `Graph Neo4j` view should list the new connection.
+
+image::neo4j-intellij-database-connections-view.png[width=300]
+
+You can now use this to perform queries
+
+image::neo4j-intellij-query-results.png[width=800]
diff --git a/src/site/asciidoc/developers/maturity.adoc b/src/site/asciidoc/developers/maturity.adoc
index 51ae0c988d6..d3e8735c44f 100644
--- a/src/site/asciidoc/developers/maturity.adoc
+++ b/src/site/asciidoc/developers/maturity.adoc
@@ -1,76 +1,76 @@
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://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.
-//
-
-:icons: font
-
-== Apache Maturity Model Assessment for PLC4X
-
-=== Overview
-
-This is an assessment of the PLC4X podlingā€™s maturity, meant to help inform the decision (of the mentors, community, Incubator PMC and ASF Board of Directors) to graduate it as a top-level Apache project.
-
-It is based on the ASF project maturity model at https://community.apache.org/apache-way/apache-project-maturity-model.html
-
-=== Maturity model assessment
-
-Mentors and community members are encouraged to contribute to this page and comment on it, the following table summarizes projectā€™s self-assessment against the Apache Maturity Model.
-
-[width="100%",options="header"]
-|=========================================================
-|ID |Description |Status
-|*Code* 2+|icon:check[role=green]
-|CD10 |The project produces Open Source software, for distribution to the public at no charge. |icon:check[role=green] The project source code is licensed under the Apache License, version 2.0.
-|CD20 |The project's code is easily discoverable and publicly accessible. |icon:check[role=green] Our sourcecode is available at https://gitbox.apache.org/repos/asf/incubator-plc4x.git[Apache GitBox] and https://github.com/apache/incubator-plc4x[GitHub] and linked to from our https://plc4x.apache.org/scm.html[website]
-|CD30 |The code can be built in a reproducible way using widely available standard tools. |icon:check[role=green] our https://maven.apache.org[Maven] build has been tested on Linux, MacOS and Windows and build description is available on our https://plc4x.apache.org/developers/building.html[website]
-|CD40 |The full history of the project's code is available via a source code control system, in a way that allows any released version to be recreated. |icon:check[role=green] The entire commit history is available from the https://gitbox.apache.org/repos/asf?p=incubator-plc4x.git;a=commit;h=dd1fcf4649107762e91f7c494a10e55319a18785[beginning].
-|CD50 |The provenance of each line of code is established via the source code control system, in a reliable way based on strong authentication of the committer. When third-party contributions are committed, commit messages provide reliable information about the code provenance. |icon:check[role=green] The project uses the git repository, managed by Apache Infra, ensuring provenance of each line of code to a committer, each line committed before entering incubation was equally configured.
-|*Licenses and Copyright* 2+|icon:check[role=green]
-|LC10 |The code is released under the Apache License, version 2.0. |icon:check[role=green] Both the source distribution as well as the convenience binary artifacts clearly declare that they are licensed under the Apache 2.0 license
-|LC20 |Libraries that are mandatory dependencies of the project's code do not create more restrictions than the Apache License does. |icon:check[role=green] The list of mandatory dependencies have been reviewed to contain approved licenses only.
-|LC30 |The libraries mentioned in LC20 are available as Open Source software. |icon:check[role=green] All mandatory dependencies are available as open source software.
-|LC40 |Committers are bound by an Individual Contributor Agreement (the http://www.apache.org/licenses/icla.txt["Apache iCLA"]) that defines which code they are allowed to commit and how they need to identify code that is not their own. |icon:check[role=green] The project uses a repository managed by Apache Gitbox -- write access requires an Apache account, which requires an ICLA on file.
-|LC50 |The copyright ownership of everything that the project produces is clearly defined and documented. |All files in the source repository have appropriate headers which is enforced by tooling included in the build. ICLAs from all initial committers have been documented. CCLAs from all companies involved have been documented. SGA is on file for the initial contribution.
-|*Releases* 2+|icon:wrench[role=yellow]
-|RE10 |Releases consist of source code, distributed using standard and open archive formats that are expected to stay readable in the long term. |icon:check[role=green] https://dist.apache.org/repos/dist/release/incubator/plc4x/[Current source releases] are distributed via dist.apache.org and http://archive.apache.org/dist/incubator/plc4x/[Older source releases] are available from archive.apache.org. Both are linked from the http://plc4x.apache.org/users/download.html[website].
-|RE20 |Releases are approved by the project's PMC (see CS10), in order to make them an act of the Foundation. |icon:check[role=green] All incubating releases have been unanimously approved by the PLC4X community and the Incubator, all with at least 3 (P)PMC votes and more +1 than -1.
-|RE30 |Releases are signed and/or distributed along with digests that can be reliably used to validate the downloaded archives. |icon:check[role=green] All releases are signed, and the https://dist.apache.org/repos/dist/release/incubator/plc4x/KEYS[KEYS] file is provided on dist.apache.org
-|RE40 |Convenience binaries can be distributed alongside source code but they are not Apache Releases -- they are just a convenience provided with no guarantee. |icon:wrench[role=yellow] Convenience binaries are distributed via Maven Central Repository only. Currently due to the platform-dependency of C++ libraries, these are not distributed currently.
-|RE50 |The release process is documented and repeatable to the extent that someone new to the project is able to independently generate the complete set of artifacts required for a release. |icon:check[role=green] We have a guide for release managers, that has been tested by multiple release managers available on our http://plc4x.apache.org/developers/release.html[website].
-|*Quality* 2+|icon:check[role=green]
-|QU10 |The project is open and honest about the quality of its code. Various levels of quality and maturity for various modules are natural and acceptable as long as they are clearly communicated. |icon:check[role=green] All issues are documented in our https://issues.apache.org/jira/projects/PLC4X[JIRA] instance, which is our primary bug and issue tracker.
-|QU20 |The project puts a very high priority on producing secure software. |icon:check[role=green] even if we haven't received any security issues targeted at PLC4X yet, we pro-actively monitor our dependencies and if reported would treat them with the highest priority, according to the https://www.apache.org/security/committers.html[CVE/Security Advisory procedure].
-|QU30 |The project provides a well-documented, secure and private channel to report security issues, along with a documented way of responding to them. |icon:check[role=green] We are using Apaches default way to submit security related information, which is described on our http://plc4x.apache.org/users/security.html[website]
-|QU40 |The project puts a high priority on backwards compatibility and aims to document any incompatible changes and provide tools and documentation to help users transition to new features. |icon:check[role=green] We try to keep everything as backward compatible as possible. If we are forced to introduce incompatible changes, these is documented in a `Incompatible changes` section as part of our release notes.
-|QU50 |The project strives to respond to documented bug reports in a timely manner. |icon:check[role=green] Bug reports are treated with priority and are automatically posted to our developer mailing list https://lists.apache.org/list.html?dev@plc4x.apache.org so they are prominently recognised.
-|*Community* 2+|icon:check[role=green]
-|CO10 |The project has a well-known homepage that points to all the information required to operate according to this maturity model. |icon:check[role=green] The project website has a http://plc4x.apache.org/[description of the project] with technical details, http://plc4x.apache.org/developers/contributing.html[how to contribute], http://plc4x.apache.org/developers/team.html[team].
-|CO20 |The community welcomes contributions from anyone who acts in good faith and in a respectful manner and adds value to the project. |icon:check[role=green] So far we have recognized any form of contribution and every contributor with the desire to become part of the team has been invited to join.
-|CO30 |Contributions include not only source code, but also documentation, constructive bug reports, constructive discussions, marketing and generally anything that adds value to the project. |icon:check[role=green] Itā€™s part of the http://plc4x.apache.org/developers/contributing.html[contribution guide] and the current committers are really keen to welcome contributions.
-|CO40 |The community is meritocratic and over time aims to give more rights and responsibilities to contributors who add value to the project. |icon:check[role=green] So far the community has elected 4 committers, all of them also being added to the PPMC.
-|CO50 |The way in which contributors can be granted more rights such as commit access or decision power is clearly documented and is the same for all contributors. |icon:check[role=green] The criteria is documented in the http://plc4x.apache.org/developers/contributing.html[contribution guide].
-|CO60 |The community operates based on consensus of its members (see CS10) who have decision power. Dictators, benevolent or not, are not welcome in Apache projects. |icon:check[role=green] The project works to build consensus. All votes have been unanimous so far.
-|CO70 |The project strives to answer user questions in a timely manner. |icon:check[role=green] Responses to reported issues or asked questions typically are handled by the community withing a matter of a few hours (Responses being faster during typical European time-zone business-hours).
-|*Consensus Building* 2+|icon:times[role=red]
-|CS10 |The project maintains a public list of its contributors who have decision power -- the project's PMC (Project Management Committee) consists of those contributors. |icon:wrench[role=yellow] We're currently working on filling the http://plc4x.apache.org/developers/team.html[team page].
-|CS20 |Decisions are made by consensus among PMC members 9 and are documented on the project's main communications channel. Community opinions are taken into account but the PMC has the final word if needed. |icon:check[role=green] All decisions are made on one of our mailing lists. Every decision discussed off-list has been taken back to the list for final discussion and we'll keep on doing that.
-|CS30 |Documented voting rules are used to build consensus when discussion is not sufficient. |icon:check[role=green] We have documented our decision making rule on our http://plc4x.apache.org/developers/decisions.html[website].
-|CS40 |In Apache projects, vetoes are only valid for code commits and are justified by a technical explanation, as per the Apache voting rules defined in CS30. |icon:times[role=red] This part actively contradicts the voting rules of the Apache Incubator. This project follows the voting rules of the Apache Incubator which we documented on our http://plc4x.apache.org/developers/decisions.html[website].
-|CS50 |All "important" discussions happen asynchronously in written form on the project's main communications channel. Offline, face-to-face or private discussions 11 that affect the project are also documented on that channel. |icon:check[role=green] As mentioned in CS20 it is impossible to prevent off-list discussions when meeting in person. But we have always handled things in a way that we always write up summaries of important discussions and post them to the mailing lists.
-|*Independence* 2+|icon:check[role=green]
-|IN10 |The project is independent from any corporate or organizational influence. |icon:check[role=green] The group of active committers and PPMCs consists of members of more than independent 4 companies.
-|IN20 |Contributors act as themselves as opposed to representatives of a corporation or organization. |icon:check[role=green] While there are several cases where committers and PPMC members utilize corporate infrastructure or these companies, no case has been found where any of these committers and PPMCs have represented corporate interests.
-|=========================================================
+//
+//  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
+//
+//      http://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.
+//
+
+:icons: font
+
+== Apache Maturity Model Assessment for PLC4X
+
+=== Overview
+
+This is an assessment of the PLC4X podlingā€™s maturity, meant to help inform the decision (of the mentors, community, Incubator PMC and ASF Board of Directors) to graduate it as a top-level Apache project.
+
+It is based on the ASF project maturity model at https://community.apache.org/apache-way/apache-project-maturity-model.html
+
+=== Maturity model assessment
+
+Mentors and community members are encouraged to contribute to this page and comment on it, the following table summarizes projectā€™s self-assessment against the Apache Maturity Model.
+
+[width="100%",options="header"]
+|=========================================================
+|ID |Description |Status
+|*Code* 2+|icon:check[role=green]
+|CD10 |The project produces Open Source software, for distribution to the public at no charge. |icon:check[role=green] The project source code is licensed under the Apache License, version 2.0.
+|CD20 |The project's code is easily discoverable and publicly accessible. |icon:check[role=green] Our sourcecode is available at https://gitbox.apache.org/repos/asf/incubator-plc4x.git[Apache GitBox] and https://github.com/apache/incubator-plc4x[GitHub] and linked to from our https://plc4x.apache.org/scm.html[website]
+|CD30 |The code can be built in a reproducible way using widely available standard tools. |icon:check[role=green] our https://maven.apache.org[Maven] build has been tested on Linux, MacOS and Windows and build description is available on our https://plc4x.apache.org/developers/building.html[website]
+|CD40 |The full history of the project's code is available via a source code control system, in a way that allows any released version to be recreated. |icon:check[role=green] The entire commit history is available from the https://gitbox.apache.org/repos/asf?p=incubator-plc4x.git;a=commit;h=dd1fcf4649107762e91f7c494a10e55319a18785[beginning].
+|CD50 |The provenance of each line of code is established via the source code control system, in a reliable way based on strong authentication of the committer. When third-party contributions are committed, commit messages provide reliable information about the code provenance. |icon:check[role=green] The project uses the git repository, managed by Apache Infra, ensuring provenance of each line of code to a committer, each line committed before entering incubation was equally configured.
+|*Licenses and Copyright* 2+|icon:check[role=green]
+|LC10 |The code is released under the Apache License, version 2.0. |icon:check[role=green] Both the source distribution as well as the convenience binary artifacts clearly declare that they are licensed under the Apache 2.0 license
+|LC20 |Libraries that are mandatory dependencies of the project's code do not create more restrictions than the Apache License does. |icon:check[role=green] The list of mandatory dependencies have been reviewed to contain approved licenses only.
+|LC30 |The libraries mentioned in LC20 are available as Open Source software. |icon:check[role=green] All mandatory dependencies are available as open source software.
+|LC40 |Committers are bound by an Individual Contributor Agreement (the http://www.apache.org/licenses/icla.txt["Apache iCLA"]) that defines which code they are allowed to commit and how they need to identify code that is not their own. |icon:check[role=green] The project uses a repository managed by Apache Gitbox -- write access requires an Apache account, which requires an ICLA on file.
+|LC50 |The copyright ownership of everything that the project produces is clearly defined and documented. |All files in the source repository have appropriate headers which is enforced by tooling included in the build. ICLAs from all initial committers have been documented. CCLAs from all companies involved have been documented. SGA is on file for the initial contribution.
+|*Releases* 2+|icon:wrench[role=yellow]
+|RE10 |Releases consist of source code, distributed using standard and open archive formats that are expected to stay readable in the long term. |icon:check[role=green] https://dist.apache.org/repos/dist/release/incubator/plc4x/[Current source releases] are distributed via dist.apache.org and http://archive.apache.org/dist/incubator/plc4x/[Older source releases] are available from archive.apache.org. Both are linked from the http://plc4x.apache.org/users/download.html[website].
+|RE20 |Releases are approved by the project's PMC (see CS10), in order to make them an act of the Foundation. |icon:check[role=green] All incubating releases have been unanimously approved by the PLC4X community and the Incubator, all with at least 3 (P)PMC votes and more +1 than -1.
+|RE30 |Releases are signed and/or distributed along with digests that can be reliably used to validate the downloaded archives. |icon:check[role=green] All releases are signed, and the https://dist.apache.org/repos/dist/release/incubator/plc4x/KEYS[KEYS] file is provided on dist.apache.org
+|RE40 |Convenience binaries can be distributed alongside source code but they are not Apache Releases -- they are just a convenience provided with no guarantee. |icon:wrench[role=yellow] Convenience binaries are distributed via Maven Central Repository only. Currently due to the platform-dependency of C++ libraries, these are not distributed currently.
+|RE50 |The release process is documented and repeatable to the extent that someone new to the project is able to independently generate the complete set of artifacts required for a release. |icon:check[role=green] We have a guide for release managers, that has been tested by multiple release managers available on our http://plc4x.apache.org/developers/release.html[website].
+|*Quality* 2+|icon:check[role=green]
+|QU10 |The project is open and honest about the quality of its code. Various levels of quality and maturity for various modules are natural and acceptable as long as they are clearly communicated. |icon:check[role=green] All issues are documented in our https://issues.apache.org/jira/projects/PLC4X[JIRA] instance, which is our primary bug and issue tracker.
+|QU20 |The project puts a very high priority on producing secure software. |icon:check[role=green] even if we haven't received any security issues targeted at PLC4X yet, we pro-actively monitor our dependencies and if reported would treat them with the highest priority, according to the https://www.apache.org/security/committers.html[CVE/Security Advisory procedure].
+|QU30 |The project provides a well-documented, secure and private channel to report security issues, along with a documented way of responding to them. |icon:check[role=green] We are using Apaches default way to submit security related information, which is described on our http://plc4x.apache.org/users/security.html[website]
+|QU40 |The project puts a high priority on backwards compatibility and aims to document any incompatible changes and provide tools and documentation to help users transition to new features. |icon:check[role=green] We try to keep everything as backward compatible as possible. If we are forced to introduce incompatible changes, these is documented in a `Incompatible changes` section as part of our release notes.
+|QU50 |The project strives to respond to documented bug reports in a timely manner. |icon:check[role=green] Bug reports are treated with priority and are automatically posted to our developer mailing list https://lists.apache.org/list.html?dev@plc4x.apache.org so they are prominently recognised.
+|*Community* 2+|icon:check[role=green]
+|CO10 |The project has a well-known homepage that points to all the information required to operate according to this maturity model. |icon:check[role=green] The project website has a http://plc4x.apache.org/[description of the project] with technical details, http://plc4x.apache.org/developers/contributing.html[how to contribute], http://plc4x.apache.org/developers/team.html[team].
+|CO20 |The community welcomes contributions from anyone who acts in good faith and in a respectful manner and adds value to the project. |icon:check[role=green] So far we have recognized any form of contribution and every contributor with the desire to become part of the team has been invited to join.
+|CO30 |Contributions include not only source code, but also documentation, constructive bug reports, constructive discussions, marketing and generally anything that adds value to the project. |icon:check[role=green] Itā€™s part of the http://plc4x.apache.org/developers/contributing.html[contribution guide] and the current committers are really keen to welcome contributions.
+|CO40 |The community is meritocratic and over time aims to give more rights and responsibilities to contributors who add value to the project. |icon:check[role=green] So far the community has elected 4 committers, all of them also being added to the PPMC.
+|CO50 |The way in which contributors can be granted more rights such as commit access or decision power is clearly documented and is the same for all contributors. |icon:check[role=green] The criteria is documented in the http://plc4x.apache.org/developers/contributing.html[contribution guide].
+|CO60 |The community operates based on consensus of its members (see CS10) who have decision power. Dictators, benevolent or not, are not welcome in Apache projects. |icon:check[role=green] The project works to build consensus. All votes have been unanimous so far.
+|CO70 |The project strives to answer user questions in a timely manner. |icon:check[role=green] Responses to reported issues or asked questions typically are handled by the community withing a matter of a few hours (Responses being faster during typical European time-zone business-hours).
+|*Consensus Building* 2+|icon:times[role=red]
+|CS10 |The project maintains a public list of its contributors who have decision power -- the project's PMC (Project Management Committee) consists of those contributors. |icon:wrench[role=yellow] We're currently working on filling the http://plc4x.apache.org/developers/team.html[team page].
+|CS20 |Decisions are made by consensus among PMC members 9 and are documented on the project's main communications channel. Community opinions are taken into account but the PMC has the final word if needed. |icon:check[role=green] All decisions are made on one of our mailing lists. Every decision discussed off-list has been taken back to the list for final discussion and we'll keep on doing that.
+|CS30 |Documented voting rules are used to build consensus when discussion is not sufficient. |icon:check[role=green] We have documented our decision making rule on our http://plc4x.apache.org/developers/decisions.html[website].
+|CS40 |In Apache projects, vetoes are only valid for code commits and are justified by a technical explanation, as per the Apache voting rules defined in CS30. |icon:times[role=red] This part actively contradicts the voting rules of the Apache Incubator. This project follows the voting rules of the Apache Incubator which we documented on our http://plc4x.apache.org/developers/decisions.html[website].
+|CS50 |All "important" discussions happen asynchronously in written form on the project's main communications channel. Offline, face-to-face or private discussions 11 that affect the project are also documented on that channel. |icon:check[role=green] As mentioned in CS20 it is impossible to prevent off-list discussions when meeting in person. But we have always handled things in a way that we always write up summaries of important discussions and post them to the mailing lists.
+|*Independence* 2+|icon:check[role=green]
+|IN10 |The project is independent from any corporate or organizational influence. |icon:check[role=green] The group of active committers and PPMCs consists of members of more than independent 4 companies.
+|IN20 |Contributors act as themselves as opposed to representatives of a corporation or organization. |icon:check[role=green] While there are several cases where committers and PPMC members utilize corporate infrastructure or these companies, no case has been found where any of these committers and PPMCs have represented corporate interests.
+|=========================================================
diff --git a/src/site/asciidoc/developers/preparing.adoc b/src/site/asciidoc/developers/preparing.adoc
index 7ab93c9448f..e408fb7ed4b 100644
--- a/src/site/asciidoc/developers/preparing.adoc
+++ b/src/site/asciidoc/developers/preparing.adoc
@@ -1,394 +1,394 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== Preparing your Computer
-
-Building a project like Apache PLC4X on multiple target operating-systems is quite a challenge, but I think we managed to make it as simple as possible.
-
-However when building any of the parts of PLC4X there are some requirements the build is expecting you to have provided.
-
-In order to build at all you are required to have `Java 8` installed on your machine.
-We have tested the build with Java 8 up to Java 13.
-If a new version comes out, please give us a little time to handle any related issues, but we'll probably fix them as soon as possible.
-However in the past with Oracle's new release strategy, there have been a few bumps on the road.
-
-[width=100%]
-|===
-| Profile        | Description                                              | Requirements
-|                | Builds Java API, drivers, integrations, examples        a|
-* Git
-* LibPCAP (Optional)
-| `with-cpp`     | Builds C++ API, drivers, integrations, examples         a|
-* gcc
-* g++
-| `with-dotnet`  | Builds C# and .Net API, drivers, integrations, examples a|
-* dotnet
-| `with-python`  | Builds Python API, drivers, integrations, examples      a|
-* python (2.7)
-| `with-proxies` | Adds proxy modules to each enabled language             a|
-* bison
-* flex
-* python
-|===
-
-The following chapters will describe how to provide these requirements sorted by operating system.
-
-=== Linux
-
-==== Git
-
-Checking:
-
- git --version
-
-If you get any successful output, you probably don't need to do anything.
-
-Apt-based systems:
-
- sudo apt-get install git
-
-Yum based systems:
-
- sudo yum install git
-
-==== LibPCAP
-
-Apt-based systems:
-
- sudo apt-get install libpcap-dev
-
-Yum based systems:
-
- sudo yum install libpcap-devel
-
-==== gcc
-
-Checking:
-
- gcc --version
-
-If you get any successful output, you probably don't need to do anything.
-
-Apt-based systems:
-
- sudo apt-get install gcc
-
-Yum based systems:
-
- sudo yum install gcc
-
-==== g++
-
-Checking:
-
- g++ --version
-
-If you get any successful output, you probably don't need to do anything.
-
-Apt-based systems:
-
- sudo apt-get install g++
-
-Yum based systems:
-
- sudo yum install g++
-
-==== dotnet
-
-Checking:
-
- dotnet --version
-
-If you get any successful output, you probably don't need to do anything.
-
-Microsoft has documented what is needed to install `.Net SDK` https://dotnet.microsoft.com/download/linux-package-manager/rhel/sdk-2.2.203[here]
-
-For Ubuntu this would be:
-
- wget -q https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb
- sudo dpkg -i packages-microsoft-prod.deb
-
- sudo apt-get install apt-transport-https
- sudo apt-get update
- sudo apt-get install dotnet-sdk-2.2
-
-For other distributions, please select the distribution in the drop-down menu and follow the instructions there.
-
-==== python
-
-Checking:
-
- python --version
-
-If you get a version of 2.7 or higher reported, you probably don't need to do anything.
-
-Apt-based systems:
-
- sudo apt-get install python-dev
-
-Yum based systems:
-
- yum install gcc
- cd /usr/src
- wget https://www.python.org/ftp/python/2.7.10/Python-2.7.10.tgz
- tar xzf Python-2.7.10.tgz
- cd Python-2.7.10
- ./configure
- make altinstall
-
-==== bison
-
-Checking:
-
- bison --version
-
-If you get a version above 2.3 output, you don't need to do anything.
-
-Apt-based systems:
-
- sudo apt-get install bison
-
-Yum based systems:
-
- sudo yum install bison-devel
-
-==== flex
-
-Checking:
-
- flex --version
-
-If you get any successful output, you probably don't need to do anything.
-
-Apt-based systems:
-
- sudo apt-get install flex
-
-Yum based systems:
-
- sudo yum install flex
-
-=== macOS
-
-Most libraries on Mac are installed using `Homebrew`.
-
-Make sure `Homebrew` ist installed in order to install most of these.
-
-    /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-
-==== Git
-
-Checking:
-
- git --version
-
-If you get any successful output, you probably don't need to do anything.
-
-In order to install it, please execute the following command:
-
- brew install git
-
-==== LibPCAP
-
-==== gcc
-
-Checking:
-
- gcc --version
-
-If you get any successful output, you probably don't need to do anything.
-
-It seems macOS comes with a version of gcc which is good enough for our usecases.
-
-==== g++
-
-Checking:
-
- g++ --version
-
-If you get any successful output, you probably don't need to do anything.
-
-It seems macOS comes with a version of g++ which is good enough for our usecases.
-
-==== dotnet
-
-Checking:
-
- dotnet --version
-
-If you get any successful output, you probably don't need to do anything.
-
-Microsoft is offering an installer for MacOS which is available from https://dotnet.microsoft.com/download/dotnet-core/2.2[here].
-
-==== python
-
-Checking:
-
- python --version
-
-If you get a version of 2.7 or higher reported, you probably don't need to do anything.
-
-In order to install it, please execute the following command:
-
- brew install python@2
-
-==== bison
-
-Checking:
-
- python --version
-
-If you get a version above 2.3 output, you don't need to do anything.
-
-macOS comes with a pre-installed version of bison, however this version is 2.3 and hereby too old.
-So you need to update to a more recent version:
-
- brew install bison
- brew link bison --force
- echo 'export PATH="/usr/local/opt/bison/bin:$PATH"' >> ~/.bash_profile
-
-Be sure to reboot or at least restart your IDE or commandline in order for the changes to become effective.
-
-==== flex
-
-Checking:
-
- flex --version
-
-If you get any successful output, you probably don't need to do anything.
-
-It seems macOS comes with a version of flex which is good enough for our usecases.
-
-=== Windows
-
-==== Git
-
-Checking:
-
- git --version
-
-If you get any successful output, you probably don't need to do anything.
-
-In order to install it, please download end execute the installer from https://git-scm.com/download/win[here] and make sure to have it add the git executable to your systems `PATH`.
-
-==== LibPCAP
-
-A special version of LibPCAP is available for Windows, which is called WinPCAP.
-It is available from https://www.winpcap.org/[here].
-
-However this is a based on a very old version (1.0) of LibPCAP and in order to read PCAPNG files we require a libpcap version 1.1.0 or greater.
-A patched windows version can be found here: https://sourceforge.net/projects/winpcap413-176/
-(At this location is a patched version based on libpcap 1.7.4)
-
-So in order to install things correctly:
-
-1. install the version WinPCP from above location.
-2. Then download the patched version from the sourceforge link and unpack it somewhere.
-3. After that copy bin\x64\wpcap.dll from archive to \Windows\System32
-4. Copy bin\wpcap.dll from archive to \Windows\SysWOW64
-
-After this all should be working.
-
-==== gcc
-
-Checking:
-
- gcc --version
-
-If you get any successful output, you probably don't need to do anything.
-
-On windows we will be using something called WinBuilds, which is sort of a package consisting of a typical build environment consisting of multiple build tools. So please look at the WinBuilds chapter at the end of the Windows section.
-
-==== g++
-
-Checking:
-
- g++ --version
-
-If you get any successful output, you probably don't need to do anything.
-
-On windows we will be using something called WinBuilds, which is sort of a package consisting of a typical build environment consisting of multiple build tools. So please look at the WinBuilds chapter at the end of the Windows section.
-
-==== dotnet
-
-Checking:
-
- dotnet --version
-
-If you get any successful output, you probably don't need to do anything.
-
-Usually this is already installed on Windows machines.
-
-==== python
-
-Checking:
-
- python --version
-
-If you get any successful output, you probably don't need to do anything.
-
-You can get Python from https://www.python.org/downloads/release/python-2716/[here].
-
-Make sure directory containing `python.exe` is added to your systems `PATH`.
-Also make sure you restarted your IDE and or console window after changing the `PATH` settings for the changes to take effect.
-
-==== bison
-
-Checking:
-
- bison --version
-
-If you get any successful output, you probably don't need to do anything.
-
-For Bison, please download the Setup installer version from http://gnuwin32.sourceforge.net/packages/bison.htm[here] (When using the zip version the bison.exe couldn't find some DLL files)
-It seems the official 2.4.1 version has issues when installed in a directory which's path contains spaces. Please make sure you replace the exe with a patched version form http://marin.jb.free.fr/bison/bison-2.4.1-modified.zip[here]
-(More infos on this issue https://sourceforge.net/p/gnuwin32/bugs/473/[here])
-
-It seems there are issues if these tools are installed in paths with spaces.
-So if it is for example installed in the 32 bit `Programs (x86)` directory, the build will probably fail.
-
-Make sure all tools `bin` directories are added to your systems `PATH`.
-For tools like OpenSSL be sure to add the directory containing the `openssl.exe` (Usually the root directory).
-Also make sure you restarted your IDE and or console window after changing the `PATH` settings for the changes to take effect.
-
-==== flex
-
-Checking:
-
- flex --version
-
-If you get any successful output, you probably don't need to do anything.
-
-Please download the Flex compiler from http://gnuwin32.sourceforge.net/packages/flex.htm[here] (Ideally download the binary zip distribution)
-
-Make sure it's `bin` directory is added to your systems `PATH`.
-Also make sure you restarted your IDE and or console window after changing the `PATH` settings for the changes to take effect.
-
-==== WinBuilds
-
-He have tested WinBuilds with the bundle found http://win-builds.org/doku.php/download_and_installation_from_windows[here].
-
-WARNING: Please use the installer. When using the zip distribution and manually adding that to the `PATH` the build will fail without a log output as some binaries can't find some of the DLL files.
-
-When running the installer, make sure to select the options:
-- Native Windows
-- x86_64
-Not quite sure which elements are really needed, better just install all of them.
-
-Make sure it's `bin` directory is added to your systems `PATH`, however the installer should have taken care of this.
-Also make sure you restarted your IDE and or console window after changing the `PATH` settings for the changes to take effect.
-
+//
+//  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
+//
+//      http://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.
+//
+
+== Preparing your Computer
+
+Building a project like Apache PLC4X on multiple target operating-systems is quite a challenge, but I think we managed to make it as simple as possible.
+
+However when building any of the parts of PLC4X there are some requirements the build is expecting you to have provided.
+
+In order to build at all you are required to have `Java 8` installed on your machine.
+We have tested the build with Java 8 up to Java 13.
+If a new version comes out, please give us a little time to handle any related issues, but we'll probably fix them as soon as possible.
+However in the past with Oracle's new release strategy, there have been a few bumps on the road.
+
+[width=100%]
+|===
+| Profile        | Description                                              | Requirements
+|                | Builds Java API, drivers, integrations, examples        a|
+* Git
+* LibPCAP (Optional)
+| `with-cpp`     | Builds C++ API, drivers, integrations, examples         a|
+* gcc
+* g++
+| `with-dotnet`  | Builds C# and .Net API, drivers, integrations, examples a|
+* dotnet
+| `with-python`  | Builds Python API, drivers, integrations, examples      a|
+* python (2.7)
+| `with-proxies` | Adds proxy modules to each enabled language             a|
+* bison
+* flex
+* python
+|===
+
+The following chapters will describe how to provide these requirements sorted by operating system.
+
+=== Linux
+
+==== Git
+
+Checking:
+
+ git --version
+
+If you get any successful output, you probably don't need to do anything.
+
+Apt-based systems:
+
+ sudo apt-get install git
+
+Yum based systems:
+
+ sudo yum install git
+
+==== LibPCAP
+
+Apt-based systems:
+
+ sudo apt-get install libpcap-dev
+
+Yum based systems:
+
+ sudo yum install libpcap-devel
+
+==== gcc
+
+Checking:
+
+ gcc --version
+
+If you get any successful output, you probably don't need to do anything.
+
+Apt-based systems:
+
+ sudo apt-get install gcc
+
+Yum based systems:
+
+ sudo yum install gcc
+
+==== g++
+
+Checking:
+
+ g++ --version
+
+If you get any successful output, you probably don't need to do anything.
+
+Apt-based systems:
+
+ sudo apt-get install g++
+
+Yum based systems:
+
+ sudo yum install g++
+
+==== dotnet
+
+Checking:
+
+ dotnet --version
+
+If you get any successful output, you probably don't need to do anything.
+
+Microsoft has documented what is needed to install `.Net SDK` https://dotnet.microsoft.com/download/linux-package-manager/rhel/sdk-2.2.203[here]
+
+For Ubuntu this would be:
+
+ wget -q https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb
+ sudo dpkg -i packages-microsoft-prod.deb
+
+ sudo apt-get install apt-transport-https
+ sudo apt-get update
+ sudo apt-get install dotnet-sdk-2.2
+
+For other distributions, please select the distribution in the drop-down menu and follow the instructions there.
+
+==== python
+
+Checking:
+
+ python --version
+
+If you get a version of 2.7 or higher reported, you probably don't need to do anything.
+
+Apt-based systems:
+
+ sudo apt-get install python-dev
+
+Yum based systems:
+
+ yum install gcc
+ cd /usr/src
+ wget https://www.python.org/ftp/python/2.7.10/Python-2.7.10.tgz
+ tar xzf Python-2.7.10.tgz
+ cd Python-2.7.10
+ ./configure
+ make altinstall
+
+==== bison
+
+Checking:
+
+ bison --version
+
+If you get a version above 2.3 output, you don't need to do anything.
+
+Apt-based systems:
+
+ sudo apt-get install bison
+
+Yum based systems:
+
+ sudo yum install bison-devel
+
+==== flex
+
+Checking:
+
+ flex --version
+
+If you get any successful output, you probably don't need to do anything.
+
+Apt-based systems:
+
+ sudo apt-get install flex
+
+Yum based systems:
+
+ sudo yum install flex
+
+=== macOS
+
+Most libraries on Mac are installed using `Homebrew`.
+
+Make sure `Homebrew` ist installed in order to install most of these.
+
+    /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+
+==== Git
+
+Checking:
+
+ git --version
+
+If you get any successful output, you probably don't need to do anything.
+
+In order to install it, please execute the following command:
+
+ brew install git
+
+==== LibPCAP
+
+==== gcc
+
+Checking:
+
+ gcc --version
+
+If you get any successful output, you probably don't need to do anything.
+
+It seems macOS comes with a version of gcc which is good enough for our usecases.
+
+==== g++
+
+Checking:
+
+ g++ --version
+
+If you get any successful output, you probably don't need to do anything.
+
+It seems macOS comes with a version of g++ which is good enough for our usecases.
+
+==== dotnet
+
+Checking:
+
+ dotnet --version
+
+If you get any successful output, you probably don't need to do anything.
+
+Microsoft is offering an installer for MacOS which is available from https://dotnet.microsoft.com/download/dotnet-core/2.2[here].
+
+==== python
+
+Checking:
+
+ python --version
+
+If you get a version of 2.7 or higher reported, you probably don't need to do anything.
+
+In order to install it, please execute the following command:
+
+ brew install python@2
+
+==== bison
+
+Checking:
+
+ python --version
+
+If you get a version above 2.3 output, you don't need to do anything.
+
+macOS comes with a pre-installed version of bison, however this version is 2.3 and hereby too old.
+So you need to update to a more recent version:
+
+ brew install bison
+ brew link bison --force
+ echo 'export PATH="/usr/local/opt/bison/bin:$PATH"' >> ~/.bash_profile
+
+Be sure to reboot or at least restart your IDE or commandline in order for the changes to become effective.
+
+==== flex
+
+Checking:
+
+ flex --version
+
+If you get any successful output, you probably don't need to do anything.
+
+It seems macOS comes with a version of flex which is good enough for our usecases.
+
+=== Windows
+
+==== Git
+
+Checking:
+
+ git --version
+
+If you get any successful output, you probably don't need to do anything.
+
+In order to install it, please download end execute the installer from https://git-scm.com/download/win[here] and make sure to have it add the git executable to your systems `PATH`.
+
+==== LibPCAP
+
+A special version of LibPCAP is available for Windows, which is called WinPCAP.
+It is available from https://www.winpcap.org/[here].
+
+However this is a based on a very old version (1.0) of LibPCAP and in order to read PCAPNG files we require a libpcap version 1.1.0 or greater.
+A patched windows version can be found here: https://sourceforge.net/projects/winpcap413-176/
+(At this location is a patched version based on libpcap 1.7.4)
+
+So in order to install things correctly:
+
+1. install the version WinPCP from above location.
+2. Then download the patched version from the sourceforge link and unpack it somewhere.
+3. After that copy bin\x64\wpcap.dll from archive to \Windows\System32
+4. Copy bin\wpcap.dll from archive to \Windows\SysWOW64
+
+After this all should be working.
+
+==== gcc
+
+Checking:
+
+ gcc --version
+
+If you get any successful output, you probably don't need to do anything.
+
+On windows we will be using something called WinBuilds, which is sort of a package consisting of a typical build environment consisting of multiple build tools. So please look at the WinBuilds chapter at the end of the Windows section.
+
+==== g++
+
+Checking:
+
+ g++ --version
+
+If you get any successful output, you probably don't need to do anything.
+
+On windows we will be using something called WinBuilds, which is sort of a package consisting of a typical build environment consisting of multiple build tools. So please look at the WinBuilds chapter at the end of the Windows section.
+
+==== dotnet
+
+Checking:
+
+ dotnet --version
+
+If you get any successful output, you probably don't need to do anything.
+
+Usually this is already installed on Windows machines.
+
+==== python
+
+Checking:
+
+ python --version
+
+If you get any successful output, you probably don't need to do anything.
+
+You can get Python from https://www.python.org/downloads/release/python-2716/[here].
+
+Make sure directory containing `python.exe` is added to your systems `PATH`.
+Also make sure you restarted your IDE and or console window after changing the `PATH` settings for the changes to take effect.
+
+==== bison
+
+Checking:
+
+ bison --version
+
+If you get any successful output, you probably don't need to do anything.
+
+For Bison, please download the Setup installer version from http://gnuwin32.sourceforge.net/packages/bison.htm[here] (When using the zip version the bison.exe couldn't find some DLL files)
+It seems the official 2.4.1 version has issues when installed in a directory which's path contains spaces. Please make sure you replace the exe with a patched version form http://marin.jb.free.fr/bison/bison-2.4.1-modified.zip[here]
+(More infos on this issue https://sourceforge.net/p/gnuwin32/bugs/473/[here])
+
+It seems there are issues if these tools are installed in paths with spaces.
+So if it is for example installed in the 32 bit `Programs (x86)` directory, the build will probably fail.
+
+Make sure all tools `bin` directories are added to your systems `PATH`.
+For tools like OpenSSL be sure to add the directory containing the `openssl.exe` (Usually the root directory).
+Also make sure you restarted your IDE and or console window after changing the `PATH` settings for the changes to take effect.
+
+==== flex
+
+Checking:
+
+ flex --version
+
+If you get any successful output, you probably don't need to do anything.
+
+Please download the Flex compiler from http://gnuwin32.sourceforge.net/packages/flex.htm[here] (Ideally download the binary zip distribution)
+
+Make sure it's `bin` directory is added to your systems `PATH`.
+Also make sure you restarted your IDE and or console window after changing the `PATH` settings for the changes to take effect.
+
+==== WinBuilds
+
+He have tested WinBuilds with the bundle found http://win-builds.org/doku.php/download_and_installation_from_windows[here].
+
+WARNING: Please use the installer. When using the zip distribution and manually adding that to the `PATH` the build will fail without a log output as some binaries can't find some of the DLL files.
+
+When running the installer, make sure to select the options:
+- Native Windows
+- x86_64
+Not quite sure which elements are really needed, better just install all of them.
+
+Make sure it's `bin` directory is added to your systems `PATH`, however the installer should have taken care of this.
+Also make sure you restarted your IDE and or console window after changing the `PATH` settings for the changes to take effect.
+
diff --git a/src/site/asciidoc/developers/release-build-tools.adoc b/src/site/asciidoc/developers/release-build-tools.adoc
index fe6a6d69ec1..4d7482c4fee 100644
--- a/src/site/asciidoc/developers/release-build-tools.adoc
+++ b/src/site/asciidoc/developers/release-build-tools.adoc
@@ -1,461 +1,461 @@
-//
-//  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
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-include::{pom-adoc}[]
-:imagesdir: ../images/
-:icons: font
-
-== Releasing PLC4X Build-Tools
-
-In contrast to the main project, the `plc4x-build-tools` repository contains a loose collection of sub-projects.
-
-The main `pom.xml` in the root directory is mainly for allowing to import all modules into an IDE and shouldn't be used for releases.
-
-If you want to release a part of the build-tools, please execute the following release steps in the parts sub-directory.
-
-In general the preparation steps for releasing a build-tool is equal to those of the main project.
-So please check link:release.html[here] (Chapters: `Preparing your system for being able to release` and `Preparing the codebase for a release`)
-
-The rest of the steps are a lot simpler than those of the main project as there aren't any profiles involved.
-
-=== Creating a release branch (For the code-generation module)
-
-According to SemVer, we have: Major, Minor and Bugfix releases.
-
-For each new Major and Minor release we create a new branch at the beginning of a code-freeze phase.
-
-So if currently the project version in develop is `{current-full-version}-SNAPSHOT`, we create a branch `rel/{current-short-version}`.
-
-When creating the branch is exactly the moment in which the version in `develop` is incremented to the next minor version.
-
-This can and should be automated by the `maven-release-plugin`.
-
-Per default the plugin will ask for the working copy version during the build execution.
-This is the version the `develop` branch will be changed to.
-
-The parameter `autoVersionSubmodules` will tell the release plugin to release all modules with the same version.
-Otherwise we would have to define the working copy version for each module.
-
-   mvn release:branch -DbranchName=rel/code-generation/{minor-version} -DautoVersionSubmodules=true
-
-Per default the plugin suggests the next bugfix version as working version, however we want it to use the next minor version.
-So in case of preparing the release branch for `{project.version}` the command would be the following:
-
-[subs="verbatim,attributes"]
-----
-   mvn release:branch -DbranchName=rel/code-generation/{current-short-version} -DautoVersionSubmodules=true
-----
-
-The plugin will then aks for the version:
-
-[subs="verbatim,attributes"]
-----
-   What is the new working copy version for "PLC4X Build Tools: Code Generation"? (org.apache.plc4x.plugins:plc4x-code-generaton) {current-next-incremental-version}-SNAPSHOT: : {current-next-minor-version}-SNAPSHOT
-----
-
-Where the suggested default is manually overridden.
-
-This step now should perform quite quickly as no build and no tests are involved.
-
-However in the end the versions of the `develop` branch are updated and a new `rel/code-generation/{current-short-version}` branch is created.
-
-=== Preparing `develop` for the next iteration
-
-Now is a good time to add a new section to the `RELEASE_NOTES` document for the new `SNAPSHOT` version.
-
-Here comes a template:
-
-[subs="verbatim,attributes"]
-----
-==============================================================
-(Unreleased) Apache PLC4X {current-next-minor-version}-SNAPSHOT
-==============================================================
-
-New Features
-------------
-
-Incompatible changes
---------------------
-
-Bug Fixes
----------
-
-// Rest of the file
-
-----
-
-Also be sure to do a quick full-text-search to check if the version was updated correctly everywhere.
-
-WARNING: If you find anything here, you will need to pay attention during the release.
-
-=== Release stabilization phase
-
-Now usually comes a phase in which last tests and checks should be performed.
-
-If any problems are found they have to be fixed in the release branch.
-
-Changes should either be re applied in `develop` or `cherry-picked`, however merging things back can cause a lot of problems ans we no longer have the same versions.
-
-=== Preparing a release
-
-Before you start preparing the release it is important to manually make the `RELEASE_NOTES` reflect the version we are planning on releasing.
-
-So be sure to remove the `(Unreleased)` and `SNAPSHOT` from the version.
-
-As especially when switching a lot between different branches, it is recommended to do a clean checkout of the repository.
-Otherwise a lot of directories can be left over, which would be included in the source-release zip.
-In order to prepare a release-candidate, the first step is switching to the corresponding release-branch.
-
-After that, the following command will to all preparation steps for the release:
-
-   mvn release:prepare -DautoVersionSubmodules=true
-
-In general the plugin will now ask you 3 questions:
-
-1. The version we want to release as (It will suggest the version you get by omitting the `-SNAPSHOT` suffix)
-2. The name of the tag the release commit will be tagged with in the SCM (Name it `release/code-generation/{release-version}` (`release/code-generation/{current-full-version}` in our case)
-3. The next development version (The version present in the pom after the release) (`{current-next-minor-version}` in our case)
-
-Usually for 1 and 3 the defaults are just fine, make sure the tag name is correct as this usually is different.
-
-However it is important to check that nowhere else SNAPSHOT versions are referenced.
-
-What the plugin now does, is automatically execute the following operations:
-
-1. Check we aren't referencing any `SNAPSHOT` dependencies.
-2. Update all pom versions to the release version.
-3. Run a build with all tests
-4. Commit the changes (commit message: `[maven-release-plugin] prepare release release/code-generation/{current-full-version}`)
-5. Push the commit
-6. Tag the commit
-7. Update all poms to the next development version.
-8. Commit the changes (commit message: `[maven-release-plugin] prepare for next development iteration`)
-9. Push the commit
-
-However this just prepared the git repository for the release, we have to perform the release to produce and stage the release artifacts.
-
-Please verify the git repository at: https://gitbox.apache.org/repos/asf?p=plc4x-build-tools.git
-is in the correct state. Please select the release branch and verify the commit log looks similar to this
-
-image::release-git-history.png[]
-
-It is important that the commit with the message "[maven-release-plugin] prepare release release/code-generation/{current-full-version}" is tagged with the release tag (in this case release/code-generation/{current-full-version})
-
-If you check the commit itself, it should mainly consist of version updates like this:
-
-image::release-git-diff-prepare-release.png[]
-
-The root pom has a few more changes, but in general this should be what you are seeing.
-
-After that should come a second commit:
-
-image::release-git-diff-next-development-iteration.png[]
-
-This now updates the versions again, but this time from the release version to the one we selected for the next development iteration (in this case `{current-next-minor-version}-SNAPSHOT`)
-
-NOTE: If the commit history doesn't look like this, something went wrong.
-
-== What if something goes wrong?
-
-If something goes wrong, you can always execute:
-
-   mvn release:rollback
-
-And it will change the versions back and commit and push things.
-
-However it will not delete the tag in GIT (locally and remotely). So you have to do that manually or use a different tag next time.
-
-=== Performing a release
-
-This is done by executing another goal of the `maven-release-plugin`:
-
-   mvn release:perform
-
-This executes automatically as all information it requires is located in the `release.properties` file the `prepare` goal prepared.
-
-The first step is that the `perform` goal checks out the previously tagged revision into the root modules `target/checkout` directory.
-Here it automatically executes a maven build (You don't have to do this, it's just that you know what's happening):
-
-   mvn clean deploy -P apache-release
-
-As the `apache-release` profile is activated, this builds and tests the project as well as creates the JavaDocs, Source packages and signs each of these with your PGP key.
-
-As this time the build is building with release versions, Maven will automatically choose the release url for deploying artifacts.
-
-The way things are setup in the apache parent pom, is that release artifacts are deployed to a so-called `staging repository`.
-
-You can think of a `staging repository` as a dedicated repository created on the fly as soon as the first artifact comes in.
-
-After the build you will have a nice and clean Maven repository at https://repository.apache.org/ that contains only artifacts from the current build.
-
-After the build it is important to log in to `Nexus` at https://repository.apache.org/, select `Staging Repositories` and find the repository with the name: `orgapacheplc4x-{somenumber}`.
-
-Select that and click on the `Close` button.
-
-Now Nexus will do some checks on the artifacts and check the signatures.
-
-As soon as it's finished, we are done on the Maven side and ready to continue with the rest of the release process.
-
-A release build also produces a so-called `source-assembly` zip.
-
-This contains all sources of the project and will be what's actually the release from an Apache point of view and will be the thing we will be voting on.
-
-This file will also be signed and `SHA512` hashes will be created.
-
-=== Staging a release
-
-Each new release and release-candidate has to be staged in the Apache SVN under:
-
-https://dist.apache.org/repos/dist/dev/plc4x/
-
-The directory structure of this directory is as follows:
-
-[subs="verbatim,attributes"]
-----
-   ./KEYS
-   ./{current-full-version}/build-tools/code-generation
-   ./{current-full-version}/build-tools/code-generation/rc1
-   ./{current-full-version}/build-tools/code-generation/rc1/README
-   ./{current-full-version}/build-tools/code-generation/rc1/RELEASE_NOTES
-   ./{current-full-version}/build-tools/code-generation/rc1/apache-plc4x-code-generation-{current-full-version}-source-release.zip
-   ./{current-full-version}/build-tools/code-generation/rc1/apache-plc4x-code-generation-{current-full-version}-source-release.zip.asc
-   ./{current-full-version}/build-tools/code-generation/rc1/apache-plc4x-code-generation-{current-full-version}-source-release.zip.sha512
-----
-
-The `KEYS` file contains the PGP public key which belongs to the private key used to sign the release artifacts.
-
-If this is your first release be sure to add your key to this file.
-For the format have a look at the file itself.
-It should contain all the information needed.
-
-Be sure to stage exactly the `README` and `RELEASE_NOTES` files contained in the root of your project.
-Ideally you just copy them there from there.
-
-All of the three `*-source-relese.zip*` artifacts should be located in the directory: `target/checkout/target`
-
-So after committing these files to SVN you are ready to start the vote.
-
-=== Starting a vote on the mailing list
-
-After staging the release candidate in the Apache SVN, it is time to actually call out the vote.
-
-For this we usually send two emails.
-The following would be the one used to do our first TLP release:
-
-[subs="verbatim,attributes"]
-----
-   E-Mail Topic:
-   [VOTE] Apache PLC4X Build-Tools Code-Generation {current-full-version RC1
-
-   Message:
-   Apache PLC4X Build-Tools Code-Generation {current-full-version} has been staged under [2]
-   and itā€™s time to vote on accepting it for release.
-
-   All Maven artifacts are available under [1]. Voting will be open for 72hr.
-
-   A minimum of 3 binding +1 votes and more binding +1 than binding -1
-   are required to pass.
-
-   Repository: https://gitbox.apache.org/repos/asf/plc4x-build-tools.git
-   Release tag: release/code-generation/{current-full-version}
-   Hash for the release tag: {replacethiswiththerealgitcommittag}
-
-   Per [3] "Before voting +1 PMC members are required to download
-   the signed source code package, compile it as provided, and test
-   the resulting executable on their own platform, along with also
-   verifying that the package meets the requirements of the ASF policy
-   on releases."
-
-   You can achieve the above by following [4].
-
-   [ ]  +1 accept (indicate what you validated - e.g. performed the non-RM items in [4])
-   [ ]  -1 reject (explanation required)
-
-
-   [1] https://repository.apache.org/content/repositories/orgapacheplc4x-{somefourdigitnumber}
-   [2] https://dist.apache.org/repos/dist/dev/plc4x/build-tools/code-generation/{current-full-version}/rc1/
-   [3] https://www.apache.org/dev/release.html#approving-a-release
-   [4] https://cwiki.apache.org/confluence/display/PLC4X/Validating+a+staged+Release
-----
-
-As it is sometimes to do the vote counting, if voting and discussions are going on in the same thread, we send a second email:
-
-
-[subs="verbatim,attributes"]
-----
-   E-Mail Topic:
-   [DISCUSS] Apache PLC4X {current-full-version} RC1
-
-   Message:
-   This is the discussion thread for the corresponding VOTE thread.
-
-   Please keep discussions in this thread to simplify the counting of votes.
-
-   If you have to vote -1 please mention a brief description on why and then take the details to this thread.
-----
-
-Now we have to wait 72 hours till we can announce the result of the vote.
-
-This is an Apache policy to make it possible for anyone to participate in the vote, no matter where that person lives and not matter what weekends or public holidays might currently be.
-
-The vote passes, if at least 3 `+1` votes are received and more `+1` are received than `-1`.
-
-After the 72 hour minimum wait period is over and we have fulfilled the requirement of at least 3 +1 votes and more +1 than -1, a final reply is sent to the vote thread with a prefix of `[RESULT]` in the title in which the summary of the vote is presented in an aggregated form.
-
-[subs="verbatim,attributes"]
-----
-    E-Mail Topic:
-    [RESULT] [VOTE] Apache PLC4X {current-full-version} RC1
-
-    Message:
-    So, the vote passes with 3 +1 votes by PMC members and one +1 vote by a non PMC member.
-
-    Chris
-----
-
-=== Releasing after a successful vote
-
-As soon as the votes are finished and the results were in favor of a release, the staged artifacts can be released.
-This is done by moving them inside the Apache SVN.
-
-[subs="verbatim,attributes"]
-----
-   svn move -m "Release Apache PLC4X {current-full-version}" \
-       https://dist.apache.org/repos/dist/dev/plc4x/{current-full-version}/rc1 \
-       https://dist.apache.org/repos/dist/release/plc4x/{current-full-version}
-----
-
-This will make the release artifacts available and will trigger them being copied to mirror sites.
-
-This is also the reason why you should wait at least 24 hours before sending out the release notification emails.
-
-=== Cleaning up older release versions
-
-As a lot of mirrors are serving our releases, it is the Apache policy to clean old releases from the repo if newer versions are released.
-
-This can be done like this:
-
-    svn delete https://dist.apache.org/repos/dist/release/plc4x/0.3.0/ -m"deleted version 0.3.0"
-
-After this https://dist.apache.org/repos/dist/release/plc4x should only contain the latest release directory.
-
-=== Releasing the Maven artifacts
-
-The probably simplest part is releasing the Maven artifacts.
-
-In order to do this, the release manager logs into Nexus at https://repository.apache.org/, selects the staging repository and clicks on the `Release` button.
-
-This will move all artifacts into the Apache release repository and delete the staging repository after that.
-
-All release artifacts released to the Apache release repo, will automatically be synced to Maven central.
-
-=== Merge back release version to master branch
-
-The master branch should always point to the last released version.
-This has to be done with git
-
-[subs="verbatim,attributes"]
-----
-git checkout master
-git merge release/{current-full-version}
-----
-
-When there are conflicts it could help to use the "theirs" merge strategy, i.e.,
-
-[subs="verbatim,attributes"]
-----
-git merge -X theirs release/{current-full-version}
-----
-
-Possibly a manual conflict resolution has to be done afterwards. After that, changes need to
-be pushed.
-
-=== Updating Jira
-
-1. Set the released version to "released" and set the "release-date"
-2. Add the next version to the versions.
-
-=== Update the download site
-
-The URL http://plc4x.apache.org/users/download.html has to be changed and the current release
-has to be listed there.
-This is done by changing the `download.adoc` under `src/site/users/` (**in the develop branch, as this is where the site is generated from!**)
-
-1. Copy the last release down to _Previous Releases_
-2. Point the download links of the last release to archive, e.g. `http://archive.apache.org/dist/plc4x/{current-full-version}/apache-plc4x-{current-full-version}-source-release.zip`
-3. Add the new Release under _Current Releases_ and change all links.
-_Note: Please add an anchor for the toc_
-4. Update the sections for the changes according to the _RELEASE_NOTES_ from the release
-_Note: Transfer all to ascii-doc notation to ensure correct rendering of the site_
-_Also remove the JIRA TICKET ids in Front_
-
-=== Notifying the world
-
-Make sure you have given the Apache mirrors time to fetch the release files by waiting at least 24 hours after moving the release candidate to the release part of the SVN.
-
-After that it is time to announce your release to the world:
-
-[subs="verbatim,attributes"]
-----
-    From:
-your apache email address
-    To:
-announce@apache.org
-
-    CC:
-dev@plc4x.apache.org
-
-    E-Mail Topic:
-[ANNOUNCE] Apache PLC4X {current-full-version} released
-
-    Message:
-The Apache PLC4X team is pleased to announce the release of Apache PLC4X {current-full-version}
-
-PLC4X is a set of libraries for communicating with industrial programmable
-logic controllers (PLCs) using a variety of protocols but with a shared API.
-
-The current release contains drivers able to communicate with industrial PLCs using one of the following protocols:
-
-  *   Siemens S7 (0x32)
-  *   Beckhoff ADS
-  *   Modbus
-  *   EtherNet/IP
-
-Beyond that we also provide integration modules for the following Apache projects and frameworks:
-
-  *   Apache Edgent (Incubating)
-  *   Apache Camel
-  *   Apache Kafka (Kafka Connect)
-
-Visit the Apache PLC4X website [1] for general information or
-the downloads page [2] for release notes and download information.
-
-Regards,
-The Apache PLC4X team
-
-[1] http://plc4x.apache.org
-[2] http://plc4x.apache.org/users/download.html
-----
-
-It is important to note that you have to send this email from your apache email address or it will be rejected.
-This wasn't very simple for me to setup.
-A general description can be found here:
-https://reference.apache.org/committer/email
-Here's what I did in google mail to allow sending of emails:
-https://gmail.googleblog.com/2009/07/send-mail-from-another-address-without.html
-Note ... you will be able to select the alternate sending address if you click into the recipients line of a new email (Not very intuitive).
-
+//
+//  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
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+include::{pom-adoc}[]
+:imagesdir: ../images/
+:icons: font
+
+== Releasing PLC4X Build-Tools
+
+In contrast to the main project, the `plc4x-build-tools` repository contains a loose collection of sub-projects.
+
+The main `pom.xml` in the root directory is mainly for allowing to import all modules into an IDE and shouldn't be used for releases.
+
+If you want to release a part of the build-tools, please execute the following release steps in the parts sub-directory.
+
+In general the preparation steps for releasing a build-tool is equal to those of the main project.
+So please check link:release.html[here] (Chapters: `Preparing your system for being able to release` and `Preparing the codebase for a release`)
+
+The rest of the steps are a lot simpler than those of the main project as there aren't any profiles involved.
+
+=== Creating a release branch (For the code-generation module)
+
+According to SemVer, we have: Major, Minor and Bugfix releases.
+
+For each new Major and Minor release we create a new branch at the beginning of a code-freeze phase.
+
+So if currently the project version in develop is `{current-full-version}-SNAPSHOT`, we create a branch `rel/{current-short-version}`.
+
+When creating the branch is exactly the moment in which the version in `develop` is incremented to the next minor version.
+
+This can and should be automated by the `maven-release-plugin`.
+
+Per default the plugin will ask for the working copy version during the build execution.
+This is the version the `develop` branch will be changed to.
+
+The parameter `autoVersionSubmodules` will tell the release plugin to release all modules with the same version.
+Otherwise we would have to define the working copy version for each module.
+
+   mvn release:branch -DbranchName=rel/code-generation/{minor-version} -DautoVersionSubmodules=true
+
+Per default the plugin suggests the next bugfix version as working version, however we want it to use the next minor version.
+So in case of preparing the release branch for `{project.version}` the command would be the following:
+
+[subs="verbatim,attributes"]
+----
+   mvn release:branch -DbranchName=rel/code-generation/{current-short-version} -DautoVersionSubmodules=true
+----
+
+The plugin will then aks for the version:
+
+[subs="verbatim,attributes"]
+----
+   What is the new working copy version for "PLC4X Build Tools: Code Generation"? (org.apache.plc4x.plugins:plc4x-code-generaton) {current-next-incremental-version}-SNAPSHOT: : {current-next-minor-version}-SNAPSHOT
+----
+
+Where the suggested default is manually overridden.
+
+This step now should perform quite quickly as no build and no tests are involved.
+
+However in the end the versions of the `develop` branch are updated and a new `rel/code-generation/{current-short-version}` branch is created.
+
+=== Preparing `develop` for the next iteration
+
+Now is a good time to add a new section to the `RELEASE_NOTES` document for the new `SNAPSHOT` version.
+
+Here comes a template:
+
+[subs="verbatim,attributes"]
+----
+==============================================================
+(Unreleased) Apache PLC4X {current-next-minor-version}-SNAPSHOT
+==============================================================
+
+New Features
+------------
+
+Incompatible changes
+--------------------
+
+Bug Fixes
+---------
+
+// Rest of the file
+
+----
+
+Also be sure to do a quick full-text-search to check if the version was updated correctly everywhere.
+
+WARNING: If you find anything here, you will need to pay attention during the release.
+
+=== Release stabilization phase
+
+Now usually comes a phase in which last tests and checks should be performed.
+
+If any problems are found they have to be fixed in the release branch.
+
+Changes should either be re applied in `develop` or `cherry-picked`, however merging things back can cause a lot of problems ans we no longer have the same versions.
+
+=== Preparing a release
+
+Before you start preparing the release it is important to manually make the `RELEASE_NOTES` reflect the version we are planning on releasing.
+
+So be sure to remove the `(Unreleased)` and `SNAPSHOT` from the version.
+
+As especially when switching a lot between different branches, it is recommended to do a clean checkout of the repository.
+Otherwise a lot of directories can be left over, which would be included in the source-release zip.
+In order to prepare a release-candidate, the first step is switching to the corresponding release-branch.
+
+After that, the following command will to all preparation steps for the release:
+
+   mvn release:prepare -DautoVersionSubmodules=true
+
+In general the plugin will now ask you 3 questions:
+
+1. The version we want to release as (It will suggest the version you get by omitting the `-SNAPSHOT` suffix)
+2. The name of the tag the release commit will be tagged with in the SCM (Name it `release/code-generation/{release-version}` (`release/code-generation/{current-full-version}` in our case)
+3. The next development version (The version present in the pom after the release) (`{current-next-minor-version}` in our case)
+
+Usually for 1 and 3 the defaults are just fine, make sure the tag name is correct as this usually is different.
+
+However it is important to check that nowhere else SNAPSHOT versions are referenced.
+
+What the plugin now does, is automatically execute the following operations:
+
+1. Check we aren't referencing any `SNAPSHOT` dependencies.
+2. Update all pom versions to the release version.
+3. Run a build with all tests
+4. Commit the changes (commit message: `[maven-release-plugin] prepare release release/code-generation/{current-full-version}`)
+5. Push the commit
+6. Tag the commit
+7. Update all poms to the next development version.
+8. Commit the changes (commit message: `[maven-release-plugin] prepare for next development iteration`)
+9. Push the commit
+
+However this just prepared the git repository for the release, we have to perform the release to produce and stage the release artifacts.
+
+Please verify the git repository at: https://gitbox.apache.org/repos/asf?p=plc4x-build-tools.git
+is in the correct state. Please select the release branch and verify the commit log looks similar to this
+
+image::release-git-history.png[]
+
+It is important that the commit with the message "[maven-release-plugin] prepare release release/code-generation/{current-full-version}" is tagged with the release tag (in this case release/code-generation/{current-full-version})
+
+If you check the commit itself, it should mainly consist of version updates like this:
+
+image::release-git-diff-prepare-release.png[]
+
+The root pom has a few more changes, but in general this should be what you are seeing.
+
+After that should come a second commit:
+
+image::release-git-diff-next-development-iteration.png[]
+
+This now updates the versions again, but this time from the release version to the one we selected for the next development iteration (in this case `{current-next-minor-version}-SNAPSHOT`)
+
+NOTE: If the commit history doesn't look like this, something went wrong.
+
+== What if something goes wrong?
+
+If something goes wrong, you can always execute:
+
+   mvn release:rollback
+
+And it will change the versions back and commit and push things.
+
+However it will not delete the tag in GIT (locally and remotely). So you have to do that manually or use a different tag next time.
+
+=== Performing a release
+
+This is done by executing another goal of the `maven-release-plugin`:
+
+   mvn release:perform
+
+This executes automatically as all information it requires is located in the `release.properties` file the `prepare` goal prepared.
+
+The first step is that the `perform` goal checks out the previously tagged revision into the root modules `target/checkout` directory.
+Here it automatically executes a maven build (You don't have to do this, it's just that you know what's happening):
+
+   mvn clean deploy -P apache-release
+
+As the `apache-release` profile is activated, this builds and tests the project as well as creates the JavaDocs, Source packages and signs each of these with your PGP key.
+
+As this time the build is building with release versions, Maven will automatically choose the release url for deploying artifacts.
+
+The way things are setup in the apache parent pom, is that release artifacts are deployed to a so-called `staging repository`.
+
+You can think of a `staging repository` as a dedicated repository created on the fly as soon as the first artifact comes in.
+
+After the build you will have a nice and clean Maven repository at https://repository.apache.org/ that contains only artifacts from the current build.
+
+After the build it is important to log in to `Nexus` at https://repository.apache.org/, select `Staging Repositories` and find the repository with the name: `orgapacheplc4x-{somenumber}`.
+
+Select that and click on the `Close` button.
+
+Now Nexus will do some checks on the artifacts and check the signatures.
+
+As soon as it's finished, we are done on the Maven side and ready to continue with the rest of the release process.
+
+A release build also produces a so-called `source-assembly` zip.
+
+This contains all sources of the project and will be what's actually the release from an Apache point of view and will be the thing we will be voting on.
+
+This file will also be signed and `SHA512` hashes will be created.
+
+=== Staging a release
+
+Each new release and release-candidate has to be staged in the Apache SVN under:
+
+https://dist.apache.org/repos/dist/dev/plc4x/
+
+The directory structure of this directory is as follows:
+
+[subs="verbatim,attributes"]
+----
+   ./KEYS
+   ./{current-full-version}/build-tools/code-generation
+   ./{current-full-version}/build-tools/code-generation/rc1
+   ./{current-full-version}/build-tools/code-generation/rc1/README
+   ./{current-full-version}/build-tools/code-generation/rc1/RELEASE_NOTES
+   ./{current-full-version}/build-tools/code-generation/rc1/apache-plc4x-code-generation-{current-full-version}-source-release.zip
+   ./{current-full-version}/build-tools/code-generation/rc1/apache-plc4x-code-generation-{current-full-version}-source-release.zip.asc
+   ./{current-full-version}/build-tools/code-generation/rc1/apache-plc4x-code-generation-{current-full-version}-source-release.zip.sha512
+----
+
+The `KEYS` file contains the PGP public key which belongs to the private key used to sign the release artifacts.
+
+If this is your first release be sure to add your key to this file.
+For the format have a look at the file itself.
+It should contain all the information needed.
+
+Be sure to stage exactly the `README` and `RELEASE_NOTES` files contained in the root of your project.
+Ideally you just copy them there from there.
+
+All of the three `*-source-relese.zip*` artifacts should be located in the directory: `target/checkout/target`
+
+So after committing these files to SVN you are ready to start the vote.
+
+=== Starting a vote on the mailing list
+
+After staging the release candidate in the Apache SVN, it is time to actually call out the vote.
+
+For this we usually send two emails.
+The following would be the one used to do our first TLP release:
+
+[subs="verbatim,attributes"]
+----
+   E-Mail Topic:
+   [VOTE] Apache PLC4X Build-Tools Code-Generation {current-full-version RC1
+
+   Message:
+   Apache PLC4X Build-Tools Code-Generation {current-full-version} has been staged under [2]
+   and itā€™s time to vote on accepting it for release.
+
+   All Maven artifacts are available under [1]. Voting will be open for 72hr.
+
+   A minimum of 3 binding +1 votes and more binding +1 than binding -1
+   are required to pass.
+
+   Repository: https://gitbox.apache.org/repos/asf/plc4x-build-tools.git
+   Release tag: release/code-generation/{current-full-version}
+   Hash for the release tag: {replacethiswiththerealgitcommittag}
+
+   Per [3] "Before voting +1 PMC members are required to download
+   the signed source code package, compile it as provided, and test
+   the resulting executable on their own platform, along with also
+   verifying that the package meets the requirements of the ASF policy
+   on releases."
+
+   You can achieve the above by following [4].
+
+   [ ]  +1 accept (indicate what you validated - e.g. performed the non-RM items in [4])
+   [ ]  -1 reject (explanation required)
+
+
+   [1] https://repository.apache.org/content/repositories/orgapacheplc4x-{somefourdigitnumber}
+   [2] https://dist.apache.org/repos/dist/dev/plc4x/build-tools/code-generation/{current-full-version}/rc1/
+   [3] https://www.apache.org/dev/release.html#approving-a-release
+   [4] https://cwiki.apache.org/confluence/display/PLC4X/Validating+a+staged+Release
+----
+
+As it is sometimes to do the vote counting, if voting and discussions are going on in the same thread, we send a second email:
+
+
+[subs="verbatim,attributes"]
+----
+   E-Mail Topic:
+   [DISCUSS] Apache PLC4X {current-full-version} RC1
+
+   Message:
+   This is the discussion thread for the corresponding VOTE thread.
+
+   Please keep discussions in this thread to simplify the counting of votes.
+
+   If you have to vote -1 please mention a brief description on why and then take the details to this thread.
+----
+
+Now we have to wait 72 hours till we can announce the result of the vote.
+
+This is an Apache policy to make it possible for anyone to participate in the vote, no matter where that person lives and not matter what weekends or public holidays might currently be.
+
+The vote passes, if at least 3 `+1` votes are received and more `+1` are received than `-1`.
+
+After the 72 hour minimum wait period is over and we have fulfilled the requirement of at least 3 +1 votes and more +1 than -1, a final reply is sent to the vote thread with a prefix of `[RESULT]` in the title in which the summary of the vote is presented in an aggregated form.
+
+[subs="verbatim,attributes"]
+----
+    E-Mail Topic:
+    [RESULT] [VOTE] Apache PLC4X {current-full-version} RC1
+
+    Message:
+    So, the vote passes with 3 +1 votes by PMC members and one +1 vote by a non PMC member.
+
+    Chris
+----
+
+=== Releasing after a successful vote
+
+As soon as the votes are finished and the results were in favor of a release, the staged artifacts can be released.
+This is done by moving them inside the Apache SVN.
+
+[subs="verbatim,attributes"]
+----
+   svn move -m "Release Apache PLC4X {current-full-version}" \
+       https://dist.apache.org/repos/dist/dev/plc4x/{current-full-version}/rc1 \
+       https://dist.apache.org/repos/dist/release/plc4x/{current-full-version}
+----
+
+This will make the release artifacts available and will trigger them being copied to mirror sites.
+
+This is also the reason why you should wait at least 24 hours before sending out the release notification emails.
+
+=== Cleaning up older release versions
+
+As a lot of mirrors are serving our releases, it is the Apache policy to clean old releases from the repo if newer versions are released.
+
+This can be done like this:
+
+    svn delete https://dist.apache.org/repos/dist/release/plc4x/0.3.0/ -m"deleted version 0.3.0"
+
+After this https://dist.apache.org/repos/dist/release/plc4x should only contain the latest release directory.
+
+=== Releasing the Maven artifacts
+
+The probably simplest part is releasing the Maven artifacts.
+
+In order to do this, the release manager logs into Nexus at https://repository.apache.org/, selects the staging repository and clicks on the `Release` button.
+
+This will move all artifacts into the Apache release repository and delete the staging repository after that.
+
+All release artifacts released to the Apache release repo, will automatically be synced to Maven central.
+
+=== Merge back release version to master branch
+
+The master branch should always point to the last released version.
+This has to be done with git
+
+[subs="verbatim,attributes"]
+----
+git checkout master
+git merge release/{current-full-version}
+----
+
+When there are conflicts it could help to use the "theirs" merge strategy, i.e.,
+
+[subs="verbatim,attributes"]
+----
+git merge -X theirs release/{current-full-version}
+----
+
+Possibly a manual conflict resolution has to be done afterwards. After that, changes need to
+be pushed.
+
+=== Updating Jira
+
+1. Set the released version to "released" and set the "release-date"
+2. Add the next version to the versions.
+
+=== Update the download site
+
+The URL http://plc4x.apache.org/users/download.html has to be changed and the current release
+has to be listed there.
+This is done by changing the `download.adoc` under `src/site/users/` (**in the develop branch, as this is where the site is generated from!**)
+
+1. Copy the last release down to _Previous Releases_
+2. Point the download links of the last release to archive, e.g. `http://archive.apache.org/dist/plc4x/{current-full-version}/apache-plc4x-{current-full-version}-source-release.zip`
+3. Add the new Release under _Current Releases_ and change all links.
+_Note: Please add an anchor for the toc_
+4. Update the sections for the changes according to the _RELEASE_NOTES_ from the release
+_Note: Transfer all to ascii-doc notation to ensure correct rendering of the site_
+_Also remove the JIRA TICKET ids in Front_
+
+=== Notifying the world
+
+Make sure you have given the Apache mirrors time to fetch the release files by waiting at least 24 hours after moving the release candidate to the release part of the SVN.
+
+After that it is time to announce your release to the world:
+
+[subs="verbatim,attributes"]
+----
+    From:
+your apache email address
+    To:
+announce@apache.org
+
+    CC:
+dev@plc4x.apache.org
+
+    E-Mail Topic:
+[ANNOUNCE] Apache PLC4X {current-full-version} released
+
+    Message:
+The Apache PLC4X team is pleased to announce the release of Apache PLC4X {current-full-version}
+
+PLC4X is a set of libraries for communicating with industrial programmable
+logic controllers (PLCs) using a variety of protocols but with a shared API.
+
+The current release contains drivers able to communicate with industrial PLCs using one of the following protocols:
+
+  *   Siemens S7 (0x32)
+  *   Beckhoff ADS
+  *   Modbus
+  *   EtherNet/IP
+
+Beyond that we also provide integration modules for the following Apache projects and frameworks:
+
+  *   Apache Edgent (Incubating)
+  *   Apache Camel
+  *   Apache Kafka (Kafka Connect)
+
+Visit the Apache PLC4X website [1] for general information or
+the downloads page [2] for release notes and download information.
+
+Regards,
+The Apache PLC4X team
+
+[1] http://plc4x.apache.org
+[2] http://plc4x.apache.org/users/download.html
+----
+
+It is important to note that you have to send this email from your apache email address or it will be rejected.
+This wasn't very simple for me to setup.
+A general description can be found here:
+https://reference.apache.org/committer/email
+Here's what I did in google mail to allow sending of emails:
+https://gmail.googleblog.com/2009/07/send-mail-from-another-address-without.html
+Note ... you will be able to select the alternate sending address if you click into the recipients line of a new email (Not very intuitive).
+
 After that email is out the door, you're done. Congrats!
\ No newline at end of file
diff --git a/src/site/asciidoc/developers/release.adoc b/src/site/asciidoc/developers/release.adoc
index 379a2487459..19134f118a0 100644
--- a/src/site/asciidoc/developers/release.adoc
+++ b/src/site/asciidoc/developers/release.adoc
@@ -1,519 +1,519 @@
-//
-//  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
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-include::{pom-adoc}[]
-:imagesdir: ../images/
-:icons: font
-
-== Releasing PLC4X
-
-=== Preparing your system for being able to release
-
-As part of the release process, Maven will upload maven release artifacts to a so-called staging repository.
-
-This can be thought of as an ad-hoc Maven repository that contains only the artifacts for one release.
-This helps reviewers to see what's in the convenience maven package and to release that to the public repos with one click.
-
-But in order to be allowed to upload artifacts, your account has to be enabled for this and you have to tell Maven about your credentials.
-
-:current-full-version:
-
-In order to do this, you should provide these credentials via `.m2/settings.xml`.
-
-So if you don't already have one, you should create a `.m2` directory in your user home and inside that create a `settings.xml` file with at least this content:
-
-   <?xml version="1.0" encoding="UTF-8"?>
-   <settings xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd" xmlns="http://maven.apache.org/SETTINGS/1.1.0"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-     <servers>
-       <!-- Apache Repo Settings -->
-       <server>
-           <id>apache.snapshots.https</id>
-           <username>{user-id}</username>
-           <password>{user-pass}</password>
-       </server>
-       <server>
-           <id>apache.releases.https</id>
-           <username>{user-id}</username>
-           <password>{user-pass}</password>
-       </server>
-     </servers>
-   </settings>
-
-This tells maven to use above credentials as soon as a repository with the id `apache.snapshots.https` or `apache.releases.https` is being used.
-For a release all you need is the `releases` repo, but it is good to have the other in place as it enables you to also deploy SNAPSHOTs from your system.
-There repos are defined in the `apache` parent pom and is identical for all Apache projects.
-
-Additionally all artifacts are automatically signed by the release build. In order to be able to do this you need to setup GPG.
-
-The key being used to sign the artifacts will have to be linked to your Apache E-Mail ({apache-id}@apache.org) and verified by at least one fellow Apache committer (Ideally more) that have trusted keys themselves.
-Usually for this you have to get in touch - in real life - with any Apache committer with a trusted key.
-Attending an `ApacheCon` is usually a great way to do this as usually every ApacheCon has a `Key Signing event` in it's schedule.
-He can then sign your key and hereby enable you to sign Apache release artifacts.
-
-There's a detailed description https://github.com/apache/incubator-pulsar/wiki/Create-GPG-keys-to-sign-release-artifacts[here].
-
-If you happen to have multiple keys, adding the following profile to your `settings.xml` should help:
-
-    <profile>
-      <id>apache-release</id>
-      <properties>
-        <gpg.keyname>5C60D6B9</gpg.keyname><!-- Your GPG Keyname here -->
-        <!-- Use an agent: Prevents being asked for the password during the build -->
-        <gpg.useagent>true</gpg.useagent>
-        <gpg.passphrase>topsecret-password</gpg.passphrase>
-      </properties>
-    </profile>
-
-=== Preparing the codebase for a release
-
-Usually you will have to update the RELEASE_NOTES document to the new version.
-I would suggest doing this prior to the branch as otherwise you will definitely have to port it back to `develop`.
-So remove the `SNAPSHOT` and `(Unreleased)` markers from the file and add missing parts.
-
-Also if you are doing the first release in a new year, it is advisable to search for the old year and check if any occurrences are ok the way they are.
-Usually the `NOTICE` file has to be adjusted.
-
-=== Creating a release branch
-
-According to SemVer, we have: Major, Minor and Bugfix releases.
-
-For each new Major and Minor release we create a new branch at the beginning of a code-freeze phase.
-
-So if currently the project version in develop is `{current-full-version}-SNAPSHOT`, we create a branch `rel/{current-short-version}`.
-
-When creating the branch is exactly the moment in which the version in `develop` is incremented to the next minor version.
-
-This can and should be automated by the `maven-release-plugin`.
-
-Per default the plugin will ask for the working copy version during the build execution.
-This is the version the `develop` branch will be changed to.
-
-The parameter `autoVersionSubmodules` will tell the release plugin to release all modules with the same version.
-Otherwise we would have to define the working copy version for each module.
-
-   mvn release:branch -P with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash -DbranchName=rel/{minor-version} -DautoVersionSubmodules=true
-
-Per default the plugin suggests the next bugfix version as working version, however we want it to use the next minor version.
-So in case of preparing the release branch for `0.6.0-SNAPSHOT` the command would be the following:
-
-[subs="verbatim,attributes"]
-----
-   mvn release:branch -P with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash -DbranchName=rel/{current-short-version} -DautoVersionSubmodules=true
-----
-
-The plugin will then aks for the version:
-
-[subs="verbatim,attributes"]
-----
-   What is the new working copy version for "PLC4X"? (org.apache.plc4x:plc4x-parent) {current-next-incremental-version}-SNAPSHOT: : {current-next-minor-version}-SNAPSHOT
-----
-
-Where the suggested default is manually overridden.
-
-This step now should perform quite quickly as no build and no tests are involved.
-
-However in the end the versions of the `develop` branch are updated and a new `rel/{current-short-version}` branch is created.
-
-=== Preparing `develop` for the next iteration
-
-Now is a good time to add a new section to the `RELEASE_NOTES` document for the new `SNAPSHOT` version.
-
-Here comes a template:
-
-[subs="verbatim,attributes"]
-----
-==============================================================
-(Unreleased) Apache PLC4X {current-next-minor-version}-SNAPSHOT
-==============================================================
-
-New Features
-------------
-
-Incompatible changes
---------------------
-
-Bug Fixes
----------
-
-// Rest of the file
-
-----
-
-Also be sure to do a quick full-text-search to check if the version was updated correctly everywhere.
-
-WARNING: If you find anything here, you will need to pay attention during the release.
-
-=== Release stabilization phase
-
-Now usually comes a phase in which last tests and checks should be performed.
-
-If any problems are found they have to be fixed in the release branch.
-
-Changes should either be re applied in `develop` or `cherry-picked`, however merging things back can cause a lot of problems ans we no longer have the same versions.
-
-=== Preparing a release
-
-As especially when switching a lot between different branches, it is recommended to do a clean checkout of the repository.
-Otherwise a lot of directories can be left over, which would be included in the source-release zip.
-In order to prepare a release-candidate, the first step is switching to the corresponding release-branch.
-
-After that, the following command will to all preparation steps for the release:
-
-   mvn release:prepare -P with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash -DautoVersionSubmodules=true
-
-(The `-P with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash` tells maven to activate the all profiles that partition the build and makes sure the versions of all modules are updated as part of the release)
-In general the plugin will now ask you 3 questions:
-
-1. The version we want to release as (It will suggest the version you get by omitting the `-SNAPSHOT` suffix)
-2. The name of the tag the release commit will be tagged with in the SCM (Name it `release/{release-version}` (`release/{current-full-version}` in our case)
-3. The next development version (The version present in the pom after the release) (`{current-next-bugfix-version}` in our case)
-
-Usually for 1 and 3 the defaults are just fine, make sure the tag name is correct as this usually is different.
-
-What the plugin now does, is automatically execute the following operations:
-
-1. Check we aren't referencing any `SNAPSHOT` dependencies.
-2. Update all pom versions to the release version.
-3. Run a build with all tests
-4. Commit the changes (commit message: `[maven-release-plugin] prepare release release/{current-full-version}`)
-5. Push the commit
-6. Tag the commit
-7. Update all poms to the next development version.
-8. Commit the changes (commit message: `[maven-release-plugin] prepare for next development iteration`)
-9. Push the commit
-
-However this just prepared the git repository for the release, we have to perform the release to produce and stage the release artifacts.
-
-Please verify the git repository at: https://gitbox.apache.org/repos/asf?p=plc4x.git
-is in the correct state. Please select the release branch and verify the commit log looks similar to this
-
-image::release-git-history.png[]
-
-It is important that the commit with the message "[maven-release-plugin] prepare release release/{current-full-version}" is tagged with the release tag (in this case release/0.3.0)
-
-If you check the commit itself, it should mainly consist of version updates like this:
-
-image::release-git-diff-prepare-release.png[]
-
-The root pom has a few more changes, but in general this should be what you are seeing.
-
-After that should come a second commit:
-
-image::release-git-diff-next-development-iteration.png[]
-
-This now updates the versions again, but this time from the release version to the one we selected for the next development iteration (in this case 0.3.1-SNAPSHOT)
-
-NOTE: If the commit history doesn't look like this, something went wrong.
-
-== What if something goes wrong?
-
-If something goes wrong, you can always execute:
-
-   mvn release:rollback
-
-And it will change the versions back and commit and push things.
-
-However it will not delete the tag in GIT (locally and remotely). So you have to do that manually or use a different tag next time.
-
-=== Performing a release
-
-This is done by executing another goal of the `maven-release-plugin`:
-
-   mvn release:perform -DreleaseProfiles=apache-release,with-proxies,with-logstash
-
-This executes automatically as all information it requires is located in the `release.properties` file the `prepare` goal prepared.
-
-The first step is that the `perform` goal checks out the previously tagged revision into the root modules `target/checkout` directory.
-Here it automatically executes a maven build (You don't have to do this, it's just that you know what's happening):
-
-   mvn clean deploy -P apache-release,with-proxies,with-logstash
-
-As the `apache-release` profile is also activated, this builds and tests the project as well as creates the JavaDocs, Source packages and signs each of these with your PGP key.
-
-We are intentionally not adding the other profiles, as these either produce binary artifacts that usually only work on the system they were compiled on (C++, .Net) or we haven't found a good way to distribute them via Maven yet (Python) or deployment is disabled anyway (sandbox).
-
-As this time the build is building with release versions, Maven will automatically choose the release url for deploying artifacts.
-
-The way things are setup in the apache parent pom, is that release artifacts are deployed to a so-called `staging repository`.
-
-You can think of a `staging repository` as a dedicated repository created on the fly as soon as the first artifact comes in.
-
-After the build you will have a nice and clean Maven repository at https://repository.apache.org/ that contains only artifacts from the current build.
-
-After the build it is important to log in to `Nexus` at https://repository.apache.org/, select `Staging Repositories` and find the repository with the name: `orgapacheplc4x-{somenumber}`.
-
-Select that and click on the `Close` button.
-
-Now Nexus will do some checks on the artifacts and check the signatures.
-
-As soon as it's finished, we are done on the Maven side and ready to continue with the rest of the release process.
-
-A release build also produces a so-called `source-assembly` zip.
-
-This contains all sources of the project and will be what's actually the release from an Apache point of view and will be the thing we will be voting on.
-
-This file will also be signed and `SHA512` hashes will be created.
-
-=== Staging a release
-
-Each new release and release-candidate has to be staged in the Apache SVN under:
-
-https://dist.apache.org/repos/dist/dev/plc4x/
-
-The directory structure of this directory is as follows:
-
-[subs="verbatim,attributes"]
-----
-   ./KEYS
-   ./{current-full-version}/
-   ./{current-full-version}/rc1
-   ./{current-full-version}/rc1/README
-   ./{current-full-version}/rc1/RELEASE_NOTES
-   ./{current-full-version}/rc1/apache-plc4x-{current-full-version}-source-release.zip
-   ./{current-full-version}/rc1/apache-plc4x-{current-full-version}-source-release.zip.asc
-   ./{current-full-version}/rc1/apache-plc4x-{current-full-version}-source-release.zip.sha512
-----
-
-You can generally import the stuff, by preparing a directory structure like above locally and then using `svn import` to do the importing:
-
-----
-cd ./{current-full-version}
-svn import rc1 https://dist.apache.org/repos/dist/dev/plc4x/{current-full-version}/rc1 -m"Staging of rc1 of PLC4X {current-full-version}"
-----
-
-The `KEYS` file contains the PGP public key which belongs to the private key used to sign the release artifacts.
-
-If this is your first release be sure to add your key to this file.
-For the format have a look at the file itself.
-It should contain all the information needed.
-
-Be sure to stage exactly the `README` and `RELEASE_NOTES` files contained in the root of your project.
-Ideally you just copy them there from there.
-
-All of the three `*-source-relese.zip*` artifacts should be located in the directory: `target/checkout/target`
-
-So after committing these files to SVN you are ready to start the vote.
-
-=== Starting a vote on the mailing list
-
-After staging the release candidate in the Apache SVN, it is time to actually call out the vote.
-
-For this we usually send two emails.
-The following would be the one used to do our first TLP release:
-
-[subs="verbatim,attributes"]
-----
-   E-Mail Topic:
-   [VOTE] Apache PLC4X {current-full-version} RC1
-
-   Message:
-   Apache PLC4X {current-full-version} has been staged under [2] and itā€™s time to vote
-   on accepting it for release. All Maven artifacts are available under [1].
-   Voting will be open for 72hr.
-
-   A minimum of 3 binding +1 votes and more binding +1 than binding -1
-   are required to pass.
-
-   Release tag: release/{current-full-version}
-   Hash for the release tag: {replacethiswiththerealgitcommittag}
-
-   Per [3] "Before voting +1 PMC members are required to download
-   the signed source code package, compile it as provided, and test
-   the resulting executable on their own platform, along with also
-   verifying that the package meets the requirements of the ASF policy
-   on releases."
-
-   You can achieve the above by following [4].
-
-   [ ]  +1 accept (indicate what you validated - e.g. performed the non-RM items in [4])
-   [ ]  -1 reject (explanation required)
-
-
-   [1] https://repository.apache.org/content/repositories/orgapacheplc4x-{somefourdigitnumber}
-   [2] https://dist.apache.org/repos/dist/dev/plc4x/{current-full-version}/rc1
-   [3] https://www.apache.org/dev/release.html#approving-a-release
-   [4] https://cwiki.apache.org/confluence/display/PLC4X/Validating+a+staged+Release
-----
-
-As it is sometimes to do the vote counting, if voting and discussions are going on in the same thread, we send a second email:
-
-
-[subs="verbatim,attributes"]
-----
-   E-Mail Topic:
-   [DISCUSS] Apache PLC4X {current-full-version} RC1
-
-   Message:
-   This is the discussion thread for the corresponding VOTE thread.
-
-   Please keep discussions in this thread to simplify the counting of votes.
-
-   If you have to vote -1 please mention a brief description on why and then take the details to this thread.
-----
-
-Now we have to wait 72 hours till we can announce the result of the vote.
-
-This is an Apache policy to make it possible for anyone to participate in the vote, no matter where that person lives and not matter what weekends or public holidays might currently be.
-
-The vote passes, if at least 3 `+1` votes are received and more `+1` are received than `-1`.
-
-After the 72 hour minimum wait period is over and we have fulfilled the requirement of at least 3 +1 votes and more +1 than -1, a final reply is sent to the vote thread with a prefix of `[RESULT]` in the title in which the summary of the vote is presented in an aggregated form.
-
-[subs="verbatim,attributes"]
-----
-    E-Mail Topic:
-    [RESULT] [VOTE] Apache PLC4X {current-full-version} RC1
-
-    Message:
-    So, the vote passes with 3 +1 votes by PMC members and one +1 vote by a non PMC member.
-
-    Chris
-----
-
-=== Releasing after a successful vote
-
-As soon as the votes are finished and the results were in favor of a release, the staged artifacts can be released.
-This is done by moving them inside the Apache SVN.
-
-[subs="verbatim,attributes"]
-----
-   svn move -m "Release Apache PLC4X {current-full-version}" \
-       https://dist.apache.org/repos/dist/dev/plc4x/{current-full-version}/rc1 \
-       https://dist.apache.org/repos/dist/release/plc4x/{current-full-version}
-----
-
-This will make the release artifacts available and will trigger them being copied to mirror sites.
-
-This is also the reason why you should wait at least 24 hours before sending out the release notification emails.
-
-=== Cleaning up older release versions
-
-As a lot of mirrors are serving our releases, it is the Apache policy to clean old releases from the repo if newer versions are released.
-
-This can be done like this:
-
-    svn delete https://dist.apache.org/repos/dist/release/plc4x/0.3.0/ -m"deleted version 0.3.0"
-
-After this https://dist.apache.org/repos/dist/release/plc4x should only contain the latest release directory.
-
-=== Releasing the Maven artifacts
-
-The probably simplest part is releasing the Maven artifacts.
-
-In order to do this, the release manager logs into Nexus at https://repository.apache.org/, selects the staging repository and clicks on the `Release` button.
-
-This will move all artifacts into the Apache release repository and delete the staging repository after that.
-
-All release artifacts released to the Apache release repo, will automatically be synced to Maven central.
-
-=== Merge back release version to master branch
-
-The master branch should always point to the last released version.
-This has to be done with git
-
-[subs="verbatim,attributes"]
-----
-git checkout master
-git merge release/{current-full-version}
-----
-
-When there are conflicts it could help to use the "theirs" merge strategy, i.e.,
-
-[subs="verbatim,attributes"]
-----
-git merge -X theirs release/{current-full-version}
-----
-
-Possibly a manual conflict resolution has to be done afterwards. After that, changes need to
-be pushed.
-
-=== Updating Jira
-
-1. Set the released version to "released" and set the "release-date"
-2. Add the next version to the versions.
-
-=== Update the download site
-
-The URL http://plc4x.apache.org/users/download.html has to be changed and the current release
-has to be listed there.
-This is done by changing the `download.adoc` under `src/site/users/` (**in the develop branch, as this is where the site is generated from!**)
-
-1. Copy the last release down to _Previous Releases_
-2. Point the download links of the last release to archive, e.g. `http://archive.apache.org/dist/plc4x/{current-full-version}/apache-plc4x-{current-full-version}-source-release.zip`
-3. Add the new Release under _Current Releases_ and change all links.
-_Note: Please add an anchor for the toc_
-4. Update the sections for the changes according to the _RELEASE_NOTES_ from the release
-_Note: Transfer all to ascii-doc notation to ensure correct rendering of the site_
-_Also remove the JIRA TICKET ids in Front_
-
-=== Notifying the world
-
-Make sure you have given the Apache mirrors time to fetch the release files by waiting at least 24 hours after moving the release candidate to the release part of the SVN.
-
-After that it is time to announce your release to the world:
-
-[subs="verbatim,attributes"]
-----
-    From:
-your apache email address
-    To:
-announce@apache.org
-
-    CC:
-dev@plc4x.apache.org
-
-    E-Mail Topic:
-[ANNOUNCE] Apache PLC4X {current-full-version} released
-
-    Message:
-The Apache PLC4X team is pleased to announce the release of Apache PLC4X {current-full-version}
-
-PLC4X is a set of libraries for communicating with industrial programmable
-logic controllers (PLCs) using a variety of protocols but with a shared API.
-
-The current release contains drivers able to communicate with industrial PLCs using one of the following protocols:
-
-  *   Siemens S7 (0x32)
-  *   Beckhoff ADS
-  *   Modbus
-  *   EtherNet/IP
-
-Beyond that we also provide integration modules for the following Apache projects and frameworks:
-
-  *   Apache Edgent (Incubating)
-  *   Apache Camel
-  *   Apache Kafka (Kafka Connect)
-
-Visit the Apache PLC4X website [1] for general information or
-the downloads page [2] for release notes and download information.
-
-Regards,
-The Apache PLC4X team
-
-[1] http://plc4x.apache.org
-[2] http://plc4x.apache.org/users/download.html
-----
-
-It is important to note that you have to send this email from your apache email address or it will be rejected.
-This wasn't very simple for me to setup.
-A general description can be found here:
-https://reference.apache.org/committer/email
-Here's what I did in google mail to allow sending of emails:
-https://gmail.googleblog.com/2009/07/send-mail-from-another-address-without.html
-Note ... you will be able to select the alternate sending address if you click into the recipients line of a new email (Not very intuitive).
-
+//
+//  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
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+include::{pom-adoc}[]
+:imagesdir: ../images/
+:icons: font
+
+== Releasing PLC4X
+
+=== Preparing your system for being able to release
+
+As part of the release process, Maven will upload maven release artifacts to a so-called staging repository.
+
+This can be thought of as an ad-hoc Maven repository that contains only the artifacts for one release.
+This helps reviewers to see what's in the convenience maven package and to release that to the public repos with one click.
+
+But in order to be allowed to upload artifacts, your account has to be enabled for this and you have to tell Maven about your credentials.
+
+:current-full-version:
+
+In order to do this, you should provide these credentials via `.m2/settings.xml`.
+
+So if you don't already have one, you should create a `.m2` directory in your user home and inside that create a `settings.xml` file with at least this content:
+
+   <?xml version="1.0" encoding="UTF-8"?>
+   <settings xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd" xmlns="http://maven.apache.org/SETTINGS/1.1.0"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+     <servers>
+       <!-- Apache Repo Settings -->
+       <server>
+           <id>apache.snapshots.https</id>
+           <username>{user-id}</username>
+           <password>{user-pass}</password>
+       </server>
+       <server>
+           <id>apache.releases.https</id>
+           <username>{user-id}</username>
+           <password>{user-pass}</password>
+       </server>
+     </servers>
+   </settings>
+
+This tells maven to use above credentials as soon as a repository with the id `apache.snapshots.https` or `apache.releases.https` is being used.
+For a release all you need is the `releases` repo, but it is good to have the other in place as it enables you to also deploy SNAPSHOTs from your system.
+There repos are defined in the `apache` parent pom and is identical for all Apache projects.
+
+Additionally all artifacts are automatically signed by the release build. In order to be able to do this you need to setup GPG.
+
+The key being used to sign the artifacts will have to be linked to your Apache E-Mail ({apache-id}@apache.org) and verified by at least one fellow Apache committer (Ideally more) that have trusted keys themselves.
+Usually for this you have to get in touch - in real life - with any Apache committer with a trusted key.
+Attending an `ApacheCon` is usually a great way to do this as usually every ApacheCon has a `Key Signing event` in it's schedule.
+He can then sign your key and hereby enable you to sign Apache release artifacts.
+
+There's a detailed description https://github.com/apache/incubator-pulsar/wiki/Create-GPG-keys-to-sign-release-artifacts[here].
+
+If you happen to have multiple keys, adding the following profile to your `settings.xml` should help:
+
+    <profile>
+      <id>apache-release</id>
+      <properties>
+        <gpg.keyname>5C60D6B9</gpg.keyname><!-- Your GPG Keyname here -->
+        <!-- Use an agent: Prevents being asked for the password during the build -->
+        <gpg.useagent>true</gpg.useagent>
+        <gpg.passphrase>topsecret-password</gpg.passphrase>
+      </properties>
+    </profile>
+
+=== Preparing the codebase for a release
+
+Usually you will have to update the RELEASE_NOTES document to the new version.
+I would suggest doing this prior to the branch as otherwise you will definitely have to port it back to `develop`.
+So remove the `SNAPSHOT` and `(Unreleased)` markers from the file and add missing parts.
+
+Also if you are doing the first release in a new year, it is advisable to search for the old year and check if any occurrences are ok the way they are.
+Usually the `NOTICE` file has to be adjusted.
+
+=== Creating a release branch
+
+According to SemVer, we have: Major, Minor and Bugfix releases.
+
+For each new Major and Minor release we create a new branch at the beginning of a code-freeze phase.
+
+So if currently the project version in develop is `{current-full-version}-SNAPSHOT`, we create a branch `rel/{current-short-version}`.
+
+When creating the branch is exactly the moment in which the version in `develop` is incremented to the next minor version.
+
+This can and should be automated by the `maven-release-plugin`.
+
+Per default the plugin will ask for the working copy version during the build execution.
+This is the version the `develop` branch will be changed to.
+
+The parameter `autoVersionSubmodules` will tell the release plugin to release all modules with the same version.
+Otherwise we would have to define the working copy version for each module.
+
+   mvn release:branch -P with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash -DbranchName=rel/{minor-version} -DautoVersionSubmodules=true
+
+Per default the plugin suggests the next bugfix version as working version, however we want it to use the next minor version.
+So in case of preparing the release branch for `0.6.0-SNAPSHOT` the command would be the following:
+
+[subs="verbatim,attributes"]
+----
+   mvn release:branch -P with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash -DbranchName=rel/{current-short-version} -DautoVersionSubmodules=true
+----
+
+The plugin will then aks for the version:
+
+[subs="verbatim,attributes"]
+----
+   What is the new working copy version for "PLC4X"? (org.apache.plc4x:plc4x-parent) {current-next-incremental-version}-SNAPSHOT: : {current-next-minor-version}-SNAPSHOT
+----
+
+Where the suggested default is manually overridden.
+
+This step now should perform quite quickly as no build and no tests are involved.
+
+However in the end the versions of the `develop` branch are updated and a new `rel/{current-short-version}` branch is created.
+
+=== Preparing `develop` for the next iteration
+
+Now is a good time to add a new section to the `RELEASE_NOTES` document for the new `SNAPSHOT` version.
+
+Here comes a template:
+
+[subs="verbatim,attributes"]
+----
+==============================================================
+(Unreleased) Apache PLC4X {current-next-minor-version}-SNAPSHOT
+==============================================================
+
+New Features
+------------
+
+Incompatible changes
+--------------------
+
+Bug Fixes
+---------
+
+// Rest of the file
+
+----
+
+Also be sure to do a quick full-text-search to check if the version was updated correctly everywhere.
+
+WARNING: If you find anything here, you will need to pay attention during the release.
+
+=== Release stabilization phase
+
+Now usually comes a phase in which last tests and checks should be performed.
+
+If any problems are found they have to be fixed in the release branch.
+
+Changes should either be re applied in `develop` or `cherry-picked`, however merging things back can cause a lot of problems ans we no longer have the same versions.
+
+=== Preparing a release
+
+As especially when switching a lot between different branches, it is recommended to do a clean checkout of the repository.
+Otherwise a lot of directories can be left over, which would be included in the source-release zip.
+In order to prepare a release-candidate, the first step is switching to the corresponding release-branch.
+
+After that, the following command will to all preparation steps for the release:
+
+   mvn release:prepare -P with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash -DautoVersionSubmodules=true
+
+(The `-P with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash` tells maven to activate the all profiles that partition the build and makes sure the versions of all modules are updated as part of the release)
+In general the plugin will now ask you 3 questions:
+
+1. The version we want to release as (It will suggest the version you get by omitting the `-SNAPSHOT` suffix)
+2. The name of the tag the release commit will be tagged with in the SCM (Name it `release/{release-version}` (`release/{current-full-version}` in our case)
+3. The next development version (The version present in the pom after the release) (`{current-next-bugfix-version}` in our case)
+
+Usually for 1 and 3 the defaults are just fine, make sure the tag name is correct as this usually is different.
+
+What the plugin now does, is automatically execute the following operations:
+
+1. Check we aren't referencing any `SNAPSHOT` dependencies.
+2. Update all pom versions to the release version.
+3. Run a build with all tests
+4. Commit the changes (commit message: `[maven-release-plugin] prepare release release/{current-full-version}`)
+5. Push the commit
+6. Tag the commit
+7. Update all poms to the next development version.
+8. Commit the changes (commit message: `[maven-release-plugin] prepare for next development iteration`)
+9. Push the commit
+
+However this just prepared the git repository for the release, we have to perform the release to produce and stage the release artifacts.
+
+Please verify the git repository at: https://gitbox.apache.org/repos/asf?p=plc4x.git
+is in the correct state. Please select the release branch and verify the commit log looks similar to this
+
+image::release-git-history.png[]
+
+It is important that the commit with the message "[maven-release-plugin] prepare release release/{current-full-version}" is tagged with the release tag (in this case release/0.3.0)
+
+If you check the commit itself, it should mainly consist of version updates like this:
+
+image::release-git-diff-prepare-release.png[]
+
+The root pom has a few more changes, but in general this should be what you are seeing.
+
+After that should come a second commit:
+
+image::release-git-diff-next-development-iteration.png[]
+
+This now updates the versions again, but this time from the release version to the one we selected for the next development iteration (in this case 0.3.1-SNAPSHOT)
+
+NOTE: If the commit history doesn't look like this, something went wrong.
+
+== What if something goes wrong?
+
+If something goes wrong, you can always execute:
+
+   mvn release:rollback
+
+And it will change the versions back and commit and push things.
+
+However it will not delete the tag in GIT (locally and remotely). So you have to do that manually or use a different tag next time.
+
+=== Performing a release
+
+This is done by executing another goal of the `maven-release-plugin`:
+
+   mvn release:perform -DreleaseProfiles=apache-release,with-proxies,with-logstash
+
+This executes automatically as all information it requires is located in the `release.properties` file the `prepare` goal prepared.
+
+The first step is that the `perform` goal checks out the previously tagged revision into the root modules `target/checkout` directory.
+Here it automatically executes a maven build (You don't have to do this, it's just that you know what's happening):
+
+   mvn clean deploy -P apache-release,with-proxies,with-logstash
+
+As the `apache-release` profile is also activated, this builds and tests the project as well as creates the JavaDocs, Source packages and signs each of these with your PGP key.
+
+We are intentionally not adding the other profiles, as these either produce binary artifacts that usually only work on the system they were compiled on (C++, .Net) or we haven't found a good way to distribute them via Maven yet (Python) or deployment is disabled anyway (sandbox).
+
+As this time the build is building with release versions, Maven will automatically choose the release url for deploying artifacts.
+
+The way things are setup in the apache parent pom, is that release artifacts are deployed to a so-called `staging repository`.
+
+You can think of a `staging repository` as a dedicated repository created on the fly as soon as the first artifact comes in.
+
+After the build you will have a nice and clean Maven repository at https://repository.apache.org/ that contains only artifacts from the current build.
+
+After the build it is important to log in to `Nexus` at https://repository.apache.org/, select `Staging Repositories` and find the repository with the name: `orgapacheplc4x-{somenumber}`.
+
+Select that and click on the `Close` button.
+
+Now Nexus will do some checks on the artifacts and check the signatures.
+
+As soon as it's finished, we are done on the Maven side and ready to continue with the rest of the release process.
+
+A release build also produces a so-called `source-assembly` zip.
+
+This contains all sources of the project and will be what's actually the release from an Apache point of view and will be the thing we will be voting on.
+
+This file will also be signed and `SHA512` hashes will be created.
+
+=== Staging a release
+
+Each new release and release-candidate has to be staged in the Apache SVN under:
+
+https://dist.apache.org/repos/dist/dev/plc4x/
+
+The directory structure of this directory is as follows:
+
+[subs="verbatim,attributes"]
+----
+   ./KEYS
+   ./{current-full-version}/
+   ./{current-full-version}/rc1
+   ./{current-full-version}/rc1/README
+   ./{current-full-version}/rc1/RELEASE_NOTES
+   ./{current-full-version}/rc1/apache-plc4x-{current-full-version}-source-release.zip
+   ./{current-full-version}/rc1/apache-plc4x-{current-full-version}-source-release.zip.asc
+   ./{current-full-version}/rc1/apache-plc4x-{current-full-version}-source-release.zip.sha512
+----
+
+You can generally import the stuff, by preparing a directory structure like above locally and then using `svn import` to do the importing:
+
+----
+cd ./{current-full-version}
+svn import rc1 https://dist.apache.org/repos/dist/dev/plc4x/{current-full-version}/rc1 -m"Staging of rc1 of PLC4X {current-full-version}"
+----
+
+The `KEYS` file contains the PGP public key which belongs to the private key used to sign the release artifacts.
+
+If this is your first release be sure to add your key to this file.
+For the format have a look at the file itself.
+It should contain all the information needed.
+
+Be sure to stage exactly the `README` and `RELEASE_NOTES` files contained in the root of your project.
+Ideally you just copy them there from there.
+
+All of the three `*-source-relese.zip*` artifacts should be located in the directory: `target/checkout/target`
+
+So after committing these files to SVN you are ready to start the vote.
+
+=== Starting a vote on the mailing list
+
+After staging the release candidate in the Apache SVN, it is time to actually call out the vote.
+
+For this we usually send two emails.
+The following would be the one used to do our first TLP release:
+
+[subs="verbatim,attributes"]
+----
+   E-Mail Topic:
+   [VOTE] Apache PLC4X {current-full-version} RC1
+
+   Message:
+   Apache PLC4X {current-full-version} has been staged under [2] and itā€™s time to vote
+   on accepting it for release. All Maven artifacts are available under [1].
+   Voting will be open for 72hr.
+
+   A minimum of 3 binding +1 votes and more binding +1 than binding -1
+   are required to pass.
+
+   Release tag: release/{current-full-version}
+   Hash for the release tag: {replacethiswiththerealgitcommittag}
+
+   Per [3] "Before voting +1 PMC members are required to download
+   the signed source code package, compile it as provided, and test
+   the resulting executable on their own platform, along with also
+   verifying that the package meets the requirements of the ASF policy
+   on releases."
+
+   You can achieve the above by following [4].
+
+   [ ]  +1 accept (indicate what you validated - e.g. performed the non-RM items in [4])
+   [ ]  -1 reject (explanation required)
+
+
+   [1] https://repository.apache.org/content/repositories/orgapacheplc4x-{somefourdigitnumber}
+   [2] https://dist.apache.org/repos/dist/dev/plc4x/{current-full-version}/rc1
+   [3] https://www.apache.org/dev/release.html#approving-a-release
+   [4] https://cwiki.apache.org/confluence/display/PLC4X/Validating+a+staged+Release
+----
+
+As it is sometimes to do the vote counting, if voting and discussions are going on in the same thread, we send a second email:
+
+
+[subs="verbatim,attributes"]
+----
+   E-Mail Topic:
+   [DISCUSS] Apache PLC4X {current-full-version} RC1
+
+   Message:
+   This is the discussion thread for the corresponding VOTE thread.
+
+   Please keep discussions in this thread to simplify the counting of votes.
+
+   If you have to vote -1 please mention a brief description on why and then take the details to this thread.
+----
+
+Now we have to wait 72 hours till we can announce the result of the vote.
+
+This is an Apache policy to make it possible for anyone to participate in the vote, no matter where that person lives and not matter what weekends or public holidays might currently be.
+
+The vote passes, if at least 3 `+1` votes are received and more `+1` are received than `-1`.
+
+After the 72 hour minimum wait period is over and we have fulfilled the requirement of at least 3 +1 votes and more +1 than -1, a final reply is sent to the vote thread with a prefix of `[RESULT]` in the title in which the summary of the vote is presented in an aggregated form.
+
+[subs="verbatim,attributes"]
+----
+    E-Mail Topic:
+    [RESULT] [VOTE] Apache PLC4X {current-full-version} RC1
+
+    Message:
+    So, the vote passes with 3 +1 votes by PMC members and one +1 vote by a non PMC member.
+
+    Chris
+----
+
+=== Releasing after a successful vote
+
+As soon as the votes are finished and the results were in favor of a release, the staged artifacts can be released.
+This is done by moving them inside the Apache SVN.
+
+[subs="verbatim,attributes"]
+----
+   svn move -m "Release Apache PLC4X {current-full-version}" \
+       https://dist.apache.org/repos/dist/dev/plc4x/{current-full-version}/rc1 \
+       https://dist.apache.org/repos/dist/release/plc4x/{current-full-version}
+----
+
+This will make the release artifacts available and will trigger them being copied to mirror sites.
+
+This is also the reason why you should wait at least 24 hours before sending out the release notification emails.
+
+=== Cleaning up older release versions
+
+As a lot of mirrors are serving our releases, it is the Apache policy to clean old releases from the repo if newer versions are released.
+
+This can be done like this:
+
+    svn delete https://dist.apache.org/repos/dist/release/plc4x/0.3.0/ -m"deleted version 0.3.0"
+
+After this https://dist.apache.org/repos/dist/release/plc4x should only contain the latest release directory.
+
+=== Releasing the Maven artifacts
+
+The probably simplest part is releasing the Maven artifacts.
+
+In order to do this, the release manager logs into Nexus at https://repository.apache.org/, selects the staging repository and clicks on the `Release` button.
+
+This will move all artifacts into the Apache release repository and delete the staging repository after that.
+
+All release artifacts released to the Apache release repo, will automatically be synced to Maven central.
+
+=== Merge back release version to master branch
+
+The master branch should always point to the last released version.
+This has to be done with git
+
+[subs="verbatim,attributes"]
+----
+git checkout master
+git merge release/{current-full-version}
+----
+
+When there are conflicts it could help to use the "theirs" merge strategy, i.e.,
+
+[subs="verbatim,attributes"]
+----
+git merge -X theirs release/{current-full-version}
+----
+
+Possibly a manual conflict resolution has to be done afterwards. After that, changes need to
+be pushed.
+
+=== Updating Jira
+
+1. Set the released version to "released" and set the "release-date"
+2. Add the next version to the versions.
+
+=== Update the download site
+
+The URL http://plc4x.apache.org/users/download.html has to be changed and the current release
+has to be listed there.
+This is done by changing the `download.adoc` under `src/site/users/` (**in the develop branch, as this is where the site is generated from!**)
+
+1. Copy the last release down to _Previous Releases_
+2. Point the download links of the last release to archive, e.g. `http://archive.apache.org/dist/plc4x/{current-full-version}/apache-plc4x-{current-full-version}-source-release.zip`
+3. Add the new Release under _Current Releases_ and change all links.
+_Note: Please add an anchor for the toc_
+4. Update the sections for the changes according to the _RELEASE_NOTES_ from the release
+_Note: Transfer all to ascii-doc notation to ensure correct rendering of the site_
+_Also remove the JIRA TICKET ids in Front_
+
+=== Notifying the world
+
+Make sure you have given the Apache mirrors time to fetch the release files by waiting at least 24 hours after moving the release candidate to the release part of the SVN.
+
+After that it is time to announce your release to the world:
+
+[subs="verbatim,attributes"]
+----
+    From:
+your apache email address
+    To:
+announce@apache.org
+
+    CC:
+dev@plc4x.apache.org
+
+    E-Mail Topic:
+[ANNOUNCE] Apache PLC4X {current-full-version} released
+
+    Message:
+The Apache PLC4X team is pleased to announce the release of Apache PLC4X {current-full-version}
+
+PLC4X is a set of libraries for communicating with industrial programmable
+logic controllers (PLCs) using a variety of protocols but with a shared API.
+
+The current release contains drivers able to communicate with industrial PLCs using one of the following protocols:
+
+  *   Siemens S7 (0x32)
+  *   Beckhoff ADS
+  *   Modbus
+  *   EtherNet/IP
+
+Beyond that we also provide integration modules for the following Apache projects and frameworks:
+
+  *   Apache Edgent (Incubating)
+  *   Apache Camel
+  *   Apache Kafka (Kafka Connect)
+
+Visit the Apache PLC4X website [1] for general information or
+the downloads page [2] for release notes and download information.
+
+Regards,
+The Apache PLC4X team
+
+[1] http://plc4x.apache.org
+[2] http://plc4x.apache.org/users/download.html
+----
+
+It is important to note that you have to send this email from your apache email address or it will be rejected.
+This wasn't very simple for me to setup.
+A general description can be found here:
+https://reference.apache.org/committer/email
+Here's what I did in google mail to allow sending of emails:
+https://gmail.googleblog.com/2009/07/send-mail-from-another-address-without.html
+Note ... you will be able to select the alternate sending address if you click into the recipients line of a new email (Not very intuitive).
+
 After that email is out the door, you're done. Congrats!
\ No newline at end of file
diff --git a/src/site/asciidoc/developers/sonar.adoc b/src/site/asciidoc/developers/sonar.adoc
index a84eed45c8a..4dfb0104c89 100644
--- a/src/site/asciidoc/developers/sonar.adoc
+++ b/src/site/asciidoc/developers/sonar.adoc
@@ -1,20 +1,20 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== Code Analysis
-
+//
+//  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
+//
+//      http://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.
+//
+
+== Code Analysis
+
 https://builds.apache.org/analysis/overview?id=55410
\ No newline at end of file
diff --git a/src/site/asciidoc/developers/team.adoc b/src/site/asciidoc/developers/team.adoc
index 04e83201c6e..e7ab2b65251 100644
--- a/src/site/asciidoc/developers/team.adoc
+++ b/src/site/asciidoc/developers/team.adoc
@@ -1,55 +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
-//
-//      http://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.
-//
-:imagesdir: ../images/
-:icons: font
-
-== Team
-
-Sorted by first name:
-
-[width="100%",cols="2,4,1,1",options="header"]
-|=========================================================
-|Name |Bio | |
-| *Christofer Dutz*
-
-IoT Consultant
-
-codecentric AG
-
-Frankfurt |Likes to swim outside the mainstream. He is really passionate about walking new paths. His first email to an Apache list on file was to the Cocoon project back in the year 2000. His direct involvement started in 2012 when he was elected to become an Apache Flex committer. Since then he became involved with a lot of Apache-internal groups and committees and was elected to become a Member of the Apache Software Foundation in 2015 and recently has taken up the role of mentoring several IoT podlings in the Apache Incubator. | a|image::team/cdutz.png[cdutz, 200, 200]
-| *Julian Feinauer*
-
-Founder / CEO
-
-pragmatic minds GmbH /
-pragmatic industries GmbH
-
-NĆ¼rtingen |Has studied mathematics in Stuttgart. Besides his interest in open source software and big data, he focuses on the analysis of time series and traces from testing or manufacturing. PLC4X was the first project where he was offered a position as (P)PMC but he is also engaged in other Apache projects like Edgent and IotDB. | a|image::team/jfeinauer.jpg[jfeinauer, 240, 320]
-| *Sebastian RĆ¼hl*
-
-IoT Consultant
-
-codecentric AG
-
-Frankfurt |Software engineer, member of the (P)PMC of PLC4X| a| image::team/sruehl.jpg[sruehl, 240, 320]
-| *Tim Mitsch*
-
-Engineer
-
-pragmatic industries GmbH
-
-NĆ¼rtingen |Electrical engineer (HW, SW and interface-stuff) from passion and very new to Apache projects. The more he is involved in open-source the more he likes it, focusing on PLC4X at first. | a|image::team/tmitsch.png[tmitsch, 240, 263]
+//
+//  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
+//
+//      http://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.
+//
+:imagesdir: ../images/
+:icons: font
+
+== Team
+
+Sorted by first name:
+
+[width="100%",cols="2,4,1,1",options="header"]
+|=========================================================
+|Name |Bio | |
+| *Christofer Dutz*
+
+IoT Consultant
+
+codecentric AG
+
+Frankfurt |Likes to swim outside the mainstream. He is really passionate about walking new paths. His first email to an Apache list on file was to the Cocoon project back in the year 2000. His direct involvement started in 2012 when he was elected to become an Apache Flex committer. Since then he became involved with a lot of Apache-internal groups and committees and was elected to become a Member of the Apache Software Foundation in 2015 and recently has taken up the role of mentoring several IoT podlings in the Apache Incubator. | a|image::team/cdutz.png[cdutz, 200, 200]
+| *Julian Feinauer*
+
+Founder / CEO
+
+pragmatic minds GmbH /
+pragmatic industries GmbH
+
+NĆ¼rtingen |Has studied mathematics in Stuttgart. Besides his interest in open source software and big data, he focuses on the analysis of time series and traces from testing or manufacturing. PLC4X was the first project where he was offered a position as (P)PMC but he is also engaged in other Apache projects like Edgent and IotDB. | a|image::team/jfeinauer.jpg[jfeinauer, 240, 320]
+| *Sebastian RĆ¼hl*
+
+IoT Consultant
+
+codecentric AG
+
+Frankfurt |Software engineer, member of the (P)PMC of PLC4X| a| image::team/sruehl.jpg[sruehl, 240, 320]
+| *Tim Mitsch*
+
+Engineer
+
+pragmatic industries GmbH
+
+NĆ¼rtingen |Electrical engineer (HW, SW and interface-stuff) from passion and very new to Apache projects. The more he is involved in open-source the more he likes it, focusing on PLC4X at first. | a|image::team/tmitsch.png[tmitsch, 240, 263]
diff --git a/src/site/asciidoc/developers/vm.adoc b/src/site/asciidoc/developers/vm.adoc
index 095bcc01ba8..c0b32bfeae9 100644
--- a/src/site/asciidoc/developers/vm.adoc
+++ b/src/site/asciidoc/developers/vm.adoc
@@ -1,95 +1,95 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== The PLC4X Project VM
-
-As, especially for the raw socket functionality of PLC4X, our project had higher demands on the infrastructure as other projects.
-Apache Infra kindly provided us with a dedicated VM.
-
-This is included as build agent into Apache's Jenkins with the label `plc4x1` and is marked for exclusive usage by our project.
-
-The host name of this machine is: `plc4x-vm.apache.org`
-
-On this machine we can even `sudo` to perform operations only available to `root`.
-
-Project members can request access to the machine.
-
-=== Requesting access
-
-In order to be able to login, users need to add their SSH public key to their Apache ID first.
-
-This is done under the following url: https://id.apache.org/
-
-Here just add the content in the follwoing format to one of the `SSH Key (authorized_keys line)` fields:
-
-    ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDd10ykYAZLxHJVTER71IrrVVpyR8OBdlJd1aVwb67Ts+ueJjzo8ofQKLASaQw9EQOSfprGZW0sfzhepeJvbX0n1IfsRexoyIGlD8WzyX/UoLiRLPHFv+eSGJVlN90x/l+zps+yo3lq6qfuIqkXQQvB4aJBYsYC/jifpMLvx06zaUBPfdWIaGiBgaWbX/59Q0QsSpX5r8tgdA+XLw/8Zg5AbKazuS2Cm/soJCfQQ7km4bd/WtF5R5xvakVbyILMT8Dk9Hs9OfVL/RFGLYqX4bjy5uCTwPBrwlWqFyq1u7JR39i870XNgn+bIeChaZU098BGyBH/cWMGt7bTJQSKxksF2SZAHjt8Ga2Pl+J6MTW6/EPzIYENgvfOBVSlVaz9SlM26nel1+SHDND9dK/4gRNbujbmzHZLfTjMk7oc4R+WPCBIw99CFeShTKHSxhJKz/3KmcmuEHhNRBdMy+xHecr/r/Pax58a9VHXQqHbwES6tvC1gvM2uFSMKoaKtNkME4V7bPLbQcEF8tKz7/gKp6vp1IL0BdDMwZPodFPmbiJzqjvC38A++B5k0GAgWKYPVsenamZviFhRNGjjum/qxBnAF1FjpIocsEA0zQBYvvOPDpKl9KPRZ32ALHztnRfCEwltgnM1Sjinn4zQjxQs5mJBz2rjMGlkSzVjLoSo7khiBQ== my@email-address.com
-
-(I just had to copy this line from my `~/.ssh/id_rsa.pub` file)
-
-TIP: Note, the Email Address in the end doesn't seem to matter, I simply added it for the sake of completeness. So if this doesn't match your Apache email, this is not a problem.
-
-As soon as that's done, access needs to be requested from Apache Infra.
-
-This is done using the Infra Jira at: https://issues.apache.org/jira
-
-Here make sure to select the Project `Infrastructure (INFRA)`.
-
-As soon as that's handled by the Infra team, you should be ready to log-in on the machine.
-
-=== Login to the machine
-
-Using SSH we should now be able to login to the VM.
-
-   ssh apacheId@plc4x-vm.apache.org
-
-Be sure to use the username matching your Apache ID or the login will fail.
-
-If all wen't well you should now be able to login to the machine using your apache user.
-
-=== Doing things as `root`
-
-Apache Infra is great at keeping things safe.
-Providing a sudo password directly would increase the danger of having this intercepted, therefore they are using a tool called `opiepasswd`.
-
-Instead of now entering a password, a challenge is displayed:
-
-    myid@plc4x-vm:~$ sudo apt-get update
-    otp-md5 496 pl8230
-    Password:
-
-If you now enter your normal password, you'll simply get `permission denied` errors.
-
-In order to execute operations as root on the machine, you need to use an opie client.
-As with the latest version of Mac Catalina the existing clients no longer work and using a public web service is a really bad idea, Apache has a service to calculate:
-https://reference.apache.org/pdf.lua?/committer/opie
-
-   otp-md5 496 pl8230
-
-into OPIE client's `challenge` field.
-
-In the `password` field you provide your Apache LDAP password.
-
-When hitting enter or clicking on `Compute` the tool should automatically generate a response.
-
-Now all you need to do is copy & paste that as password into your SSH client session.
-
-=== Required software
-
-For being able to build the charts and graphics as part of the site generation, we need to add some additional packages:
-
-   sudo apt-get install python-seqdiag
-   sudo apt-get install python-nwdiag
+//
+//  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
+//
+//      http://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.
+//
+
+== The PLC4X Project VM
+
+As, especially for the raw socket functionality of PLC4X, our project had higher demands on the infrastructure as other projects.
+Apache Infra kindly provided us with a dedicated VM.
+
+This is included as build agent into Apache's Jenkins with the label `plc4x1` and is marked for exclusive usage by our project.
+
+The host name of this machine is: `plc4x-vm.apache.org`
+
+On this machine we can even `sudo` to perform operations only available to `root`.
+
+Project members can request access to the machine.
+
+=== Requesting access
+
+In order to be able to login, users need to add their SSH public key to their Apache ID first.
+
+This is done under the following url: https://id.apache.org/
+
+Here just add the content in the follwoing format to one of the `SSH Key (authorized_keys line)` fields:
+
+    ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDd10ykYAZLxHJVTER71IrrVVpyR8OBdlJd1aVwb67Ts+ueJjzo8ofQKLASaQw9EQOSfprGZW0sfzhepeJvbX0n1IfsRexoyIGlD8WzyX/UoLiRLPHFv+eSGJVlN90x/l+zps+yo3lq6qfuIqkXQQvB4aJBYsYC/jifpMLvx06zaUBPfdWIaGiBgaWbX/59Q0QsSpX5r8tgdA+XLw/8Zg5AbKazuS2Cm/soJCfQQ7km4bd/WtF5R5xvakVbyILMT8Dk9Hs9OfVL/RFGLYqX4bjy5uCTwPBrwlWqFyq1u7JR39i870XNgn+bIeChaZU098BGyBH/cWMGt7bTJQSKxksF2SZAHjt8Ga2Pl+J6MTW6/EPzIYENgvfOBVSlVaz9SlM26nel1+SHDND9dK/4gRNbujbmzHZLfTjMk7oc4R+WPCBIw99CFeShTKHSxhJKz/3KmcmuEHhNRBdMy+xHecr/r/Pax58a9VHXQqHbwES6tvC1gvM2uFSMKoaKtNkME4V7bPLbQcEF8tKz7/gKp6vp1IL0BdDMwZPodFPmbiJzqjvC38A++B5k0GAgWKYPVsenamZviFhRNGjjum/qxBnAF1FjpIocsEA0zQBYvvOPDpKl9KPRZ32ALHztnRfCEwltgnM1Sjinn4zQjxQs5mJBz2rjMGlkSzVjLoSo7khiBQ== my@email-address.com
+
+(I just had to copy this line from my `~/.ssh/id_rsa.pub` file)
+
+TIP: Note, the Email Address in the end doesn't seem to matter, I simply added it for the sake of completeness. So if this doesn't match your Apache email, this is not a problem.
+
+As soon as that's done, access needs to be requested from Apache Infra.
+
+This is done using the Infra Jira at: https://issues.apache.org/jira
+
+Here make sure to select the Project `Infrastructure (INFRA)`.
+
+As soon as that's handled by the Infra team, you should be ready to log-in on the machine.
+
+=== Login to the machine
+
+Using SSH we should now be able to login to the VM.
+
+   ssh apacheId@plc4x-vm.apache.org
+
+Be sure to use the username matching your Apache ID or the login will fail.
+
+If all wen't well you should now be able to login to the machine using your apache user.
+
+=== Doing things as `root`
+
+Apache Infra is great at keeping things safe.
+Providing a sudo password directly would increase the danger of having this intercepted, therefore they are using a tool called `opiepasswd`.
+
+Instead of now entering a password, a challenge is displayed:
+
+    myid@plc4x-vm:~$ sudo apt-get update
+    otp-md5 496 pl8230
+    Password:
+
+If you now enter your normal password, you'll simply get `permission denied` errors.
+
+In order to execute operations as root on the machine, you need to use an opie client.
+As with the latest version of Mac Catalina the existing clients no longer work and using a public web service is a really bad idea, Apache has a service to calculate:
+https://reference.apache.org/pdf.lua?/committer/opie
+
+   otp-md5 496 pl8230
+
+into OPIE client's `challenge` field.
+
+In the `password` field you provide your Apache LDAP password.
+
+When hitting enter or clicking on `Compute` the tool should automatically generate a response.
+
+Now all you need to do is copy & paste that as password into your SSH client session.
+
+=== Required software
+
+For being able to build the charts and graphics as part of the site generation, we need to add some additional packages:
+
+   sudo apt-get install python-seqdiag
+   sudo apt-get install python-nwdiag
diff --git a/src/site/asciidoc/developers/vpn.adoc b/src/site/asciidoc/developers/vpn.adoc
index ba7f08e5b74..cdb7257ee8c 100644
--- a/src/site/asciidoc/developers/vpn.adoc
+++ b/src/site/asciidoc/developers/vpn.adoc
@@ -1,189 +1,189 @@
-//
-//  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
-//
-//      http://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.
-//
-:imagesdir: ../images/
-
-== The PLC4X PLC VPN
-
-As attaching physical PLC devices to a cloud infrastructure is challenging, we decided to setup a VPN in the IoT lab of codecentric Frankfurt and to grant committers of the Apache PLC4X project access to that.
-
-This document contains all the information needed to setup the VPN and to communicate with the different PLCs.
-
-=== Network
-
-All nodes of the IoT VPN are configured to use the IP range: '10.10.64.0/24'.
-
-In order to access the VPN from outside, a VPN gateway is configured to accept incoming connections.
-
-This VPN gateway is listening on port `vpn.plc4x.apache.org` on port `444` and should it should be possible to connect to it via OpenVPN.
-
-[nwdiag,plc4x-vpn-network,svg]
-....
-{
-      network internet {
-        address = "X.X.X.0/28"
-
-        vpn.plc4x.a.o [address = "217.110.130.19"];
-        plc4x-vm.a.o [address = "62.210.60.247"];
-        committer-a;
-        committer-b;
-      }
-
-      network plc4x-iot-lab {
-        address = "10.10.64.x/24"
-
-        vpn.plc4x.a.o [address = "10.10.64.1"];
-        F-FBs-40MC [address = "10.10.64.10"];
-        S-S7-1212 [address = "10.10.64.20"];
-        S-KTP-400 [address = "10.10.64.25"];
-        WG-750-352 [address = "10.10.64.30"];
-        BH-C6920-0030 [address = "10.10.64.40"];
-        committer-int [address = "10.10.64.200"];
-    }
-}
-....
-
-Note the PLC4X Project VM and Jenkins build node `plc4x-vm.apache.org` also dials in to the `plc4x-iot-lab` network.
-
-=== PLCs
-
-The following PLCs have been configured and should be available in the VPN.
-
-==== Fatek: FBs-40MC
-
-image::plc4x-vpn-fatek.jpg[float=right, width=200]
-
-This device is able to use the following protocols:
-
-- Modbus (Port `502`)
-- Fatek (Port `500`)
-
-It is configured to use the IP: `10.10.64.10`
-
-==== Siemens: S7-1212AC/DC
-
-image::plc4x-vpn-siemens-s7.jpg[float=right, width=200]
-
-This device is able to use the following protocols:
-
-- S7 (32 flavour) (Port `102`)
-- S7 (72 flavour) (Port `102`)
-- ProfiNet
-
-It is configured to use the IP: `10.10.64.20`
-
-==== Siemens: KTP 400 Basic Mono
-
-image::plc4x-vpn-siemens-hmi.jpg[float=right, width=200]
-
-This device is able to use the following protocols:
-
-- S7 (32 flavour) (Port `102`)
-- S7 (72 flavour) (Port `102`)
-- ProfiNet
-
-It is configured to use the IP: `10.10.64.25`
-
-==== WaGo: 750-352 Feldbuskoppler ETHERNET
-
-image::plc4x-vpn-wago.jpg[float=right, width=200]
-
-This device is not a typical PLC, but more a device making I/O values available via Ethernet protocols.
-
-For our job however it is exactly what we need as it allows testing the protocols without the need to develop a sophisticated PLC software in the first place.
-
-This device is able to use the following protocols:
-
-- Modbus (TCP port `502`, UDP port `502`)
-- EtherNet/IP (TCP port `44818`, UDP port `2222`)
-
-It is configured to use the IP: `10.10.64.30`
-The web-interface is available at http://10.10.64.30/webserv/index.ssi
-The login for this is user: 'admin' pass: 'wago'.
-
-==== Beckhoff: C6920-0030
-
-image::plc4x-vpn-beckhoff.jpg[float=right, width=200]
-
-This device is able to use the following protocols:
-
-- ADS (Port `48898`)
-- EtherNet/IP (Port `48181`)
-
-It is configured to use the IP: `10.10.64.40`
-
-Beckhoff PLCs are processes running on a host operating system.
-
-In this case, this host OS is `Windows 7 Professional`.
-
-These processes seem to communicate with an internal network, which isn't connected to the physical network of the host.
-
-In order to be able to communicate with the PLC from the outside world, a so-called `AMS Route` needs to be added.
-Unfortunately it seems that this route needs to be added individually for every clients ip.
-As the VPN gateway is automatically assigning IPs to the clients, this step eventually has to be done every time you log in.
-Right now we hope that as soon as routes have been added for quite some ips, eventually we won't have to do this anymore, but right now it looks as if we do.
-
-Adding a route is done by opening the ADS Route Editor on the Beckhoff machine:
-
-image::plc4x-vpn-beckhoff-route-1.png[]
-
-Here you click on add:
-
-image::plc4x-vpn-beckhoff-route-2.png[]
-
-And enter the details of the new route:
-
-image::plc4x-vpn-beckhoff-route-3.png[]
-
-Here it is important to give the route a name.
-The `AmsNetId` is sort of like a 6-segment ipv4-address. It could be chosen independently from the real ip address, however the default is to use the ip address for the first 4 segments and to append `.1.1` after this.
-So from an ip address: `10.10.57.104` the corresponding `AmsNetId` would be: `10.10.57.104.1.1`.
-`Transport Type` should be set to: `TCP_IP`.
-`Address Info` is where the clients ip address is added.
-Be sure to select the `IP Address` radio button below.
-Next thing, you should ensure, is that the type of `Remote Route` is set to `None`.
-
-When clicking on `Add Route`, don't be surprised that the window doesn't close, you have to click on `Close` after that and then you should see your new route in the route list screen.
-
-When planning on using the `EtherNet/IP` communication, the configuration of the TwinCAT device is described here:
-
-https://download.beckhoff.com/download/document/automation/twincat3/TF6280_EtherNet_IP_Slave_EN.pdf
-
-=== Requesting an account
-
-The PLC hardware in the `PLC4X IoT Lab` is hosted in the codecentric Frankfurt office.
-
-Even if we wanted to integrate our VPN Gateway with Apache's LDAP service, this is currently not possible.
-
-In order to get access to the hardware, please request an account on the `PLC4X Developer Mailinglist`: dev@plc4x.apache.org
-
-We'll try to create the account as quickly as possible.
-
-=== Setup
-
-By accessing the following URL with the `username` and `password`, provided by `codecentric`, you will be provided with links to download the VPN clients for different platforms.
-
-   https://vpn.plc4x.apache.org:444
-
-image::plc4x-vpn-client-download.png[float=right]
-
-However it is also possible to use other VPN clients based on `OpenVPN`.
-
-To do this, just download the option labeled: `Mobile VPN with SSL client profile`.
-
-It's a normal `tgz` file, so rename the file and unpack it.
-
-The archive contains a `client.ovpn` file which contains the configuration needed by `OpenVPN`.
+//
+//  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
+//
+//      http://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.
+//
+:imagesdir: ../images/
+
+== The PLC4X PLC VPN
+
+As attaching physical PLC devices to a cloud infrastructure is challenging, we decided to setup a VPN in the IoT lab of codecentric Frankfurt and to grant committers of the Apache PLC4X project access to that.
+
+This document contains all the information needed to setup the VPN and to communicate with the different PLCs.
+
+=== Network
+
+All nodes of the IoT VPN are configured to use the IP range: '10.10.64.0/24'.
+
+In order to access the VPN from outside, a VPN gateway is configured to accept incoming connections.
+
+This VPN gateway is listening on port `vpn.plc4x.apache.org` on port `444` and should it should be possible to connect to it via OpenVPN.
+
+[nwdiag,plc4x-vpn-network,svg]
+....
+{
+      network internet {
+        address = "X.X.X.0/28"
+
+        vpn.plc4x.a.o [address = "217.110.130.19"];
+        plc4x-vm.a.o [address = "62.210.60.247"];
+        committer-a;
+        committer-b;
+      }
+
+      network plc4x-iot-lab {
+        address = "10.10.64.x/24"
+
+        vpn.plc4x.a.o [address = "10.10.64.1"];
+        F-FBs-40MC [address = "10.10.64.10"];
+        S-S7-1212 [address = "10.10.64.20"];
+        S-KTP-400 [address = "10.10.64.25"];
+        WG-750-352 [address = "10.10.64.30"];
+        BH-C6920-0030 [address = "10.10.64.40"];
+        committer-int [address = "10.10.64.200"];
+    }
+}
+....
+
+Note the PLC4X Project VM and Jenkins build node `plc4x-vm.apache.org` also dials in to the `plc4x-iot-lab` network.
+
+=== PLCs
+
+The following PLCs have been configured and should be available in the VPN.
+
+==== Fatek: FBs-40MC
+
+image::plc4x-vpn-fatek.jpg[float=right, width=200]
+
+This device is able to use the following protocols:
+
+- Modbus (Port `502`)
+- Fatek (Port `500`)
+
+It is configured to use the IP: `10.10.64.10`
+
+==== Siemens: S7-1212AC/DC
+
+image::plc4x-vpn-siemens-s7.jpg[float=right, width=200]
+
+This device is able to use the following protocols:
+
+- S7 (32 flavour) (Port `102`)
+- S7 (72 flavour) (Port `102`)
+- ProfiNet
+
+It is configured to use the IP: `10.10.64.20`
+
+==== Siemens: KTP 400 Basic Mono
+
+image::plc4x-vpn-siemens-hmi.jpg[float=right, width=200]
+
+This device is able to use the following protocols:
+
+- S7 (32 flavour) (Port `102`)
+- S7 (72 flavour) (Port `102`)
+- ProfiNet
+
+It is configured to use the IP: `10.10.64.25`
+
+==== WaGo: 750-352 Feldbuskoppler ETHERNET
+
+image::plc4x-vpn-wago.jpg[float=right, width=200]
+
+This device is not a typical PLC, but more a device making I/O values available via Ethernet protocols.
+
+For our job however it is exactly what we need as it allows testing the protocols without the need to develop a sophisticated PLC software in the first place.
+
+This device is able to use the following protocols:
+
+- Modbus (TCP port `502`, UDP port `502`)
+- EtherNet/IP (TCP port `44818`, UDP port `2222`)
+
+It is configured to use the IP: `10.10.64.30`
+The web-interface is available at http://10.10.64.30/webserv/index.ssi
+The login for this is user: 'admin' pass: 'wago'.
+
+==== Beckhoff: C6920-0030
+
+image::plc4x-vpn-beckhoff.jpg[float=right, width=200]
+
+This device is able to use the following protocols:
+
+- ADS (Port `48898`)
+- EtherNet/IP (Port `48181`)
+
+It is configured to use the IP: `10.10.64.40`
+
+Beckhoff PLCs are processes running on a host operating system.
+
+In this case, this host OS is `Windows 7 Professional`.
+
+These processes seem to communicate with an internal network, which isn't connected to the physical network of the host.
+
+In order to be able to communicate with the PLC from the outside world, a so-called `AMS Route` needs to be added.
+Unfortunately it seems that this route needs to be added individually for every clients ip.
+As the VPN gateway is automatically assigning IPs to the clients, this step eventually has to be done every time you log in.
+Right now we hope that as soon as routes have been added for quite some ips, eventually we won't have to do this anymore, but right now it looks as if we do.
+
+Adding a route is done by opening the ADS Route Editor on the Beckhoff machine:
+
+image::plc4x-vpn-beckhoff-route-1.png[]
+
+Here you click on add:
+
+image::plc4x-vpn-beckhoff-route-2.png[]
+
+And enter the details of the new route:
+
+image::plc4x-vpn-beckhoff-route-3.png[]
+
+Here it is important to give the route a name.
+The `AmsNetId` is sort of like a 6-segment ipv4-address. It could be chosen independently from the real ip address, however the default is to use the ip address for the first 4 segments and to append `.1.1` after this.
+So from an ip address: `10.10.57.104` the corresponding `AmsNetId` would be: `10.10.57.104.1.1`.
+`Transport Type` should be set to: `TCP_IP`.
+`Address Info` is where the clients ip address is added.
+Be sure to select the `IP Address` radio button below.
+Next thing, you should ensure, is that the type of `Remote Route` is set to `None`.
+
+When clicking on `Add Route`, don't be surprised that the window doesn't close, you have to click on `Close` after that and then you should see your new route in the route list screen.
+
+When planning on using the `EtherNet/IP` communication, the configuration of the TwinCAT device is described here:
+
+https://download.beckhoff.com/download/document/automation/twincat3/TF6280_EtherNet_IP_Slave_EN.pdf
+
+=== Requesting an account
+
+The PLC hardware in the `PLC4X IoT Lab` is hosted in the codecentric Frankfurt office.
+
+Even if we wanted to integrate our VPN Gateway with Apache's LDAP service, this is currently not possible.
+
+In order to get access to the hardware, please request an account on the `PLC4X Developer Mailinglist`: dev@plc4x.apache.org
+
+We'll try to create the account as quickly as possible.
+
+=== Setup
+
+By accessing the following URL with the `username` and `password`, provided by `codecentric`, you will be provided with links to download the VPN clients for different platforms.
+
+   https://vpn.plc4x.apache.org:444
+
+image::plc4x-vpn-client-download.png[float=right]
+
+However it is also possible to use other VPN clients based on `OpenVPN`.
+
+To do this, just download the option labeled: `Mobile VPN with SSL client profile`.
+
+It's a normal `tgz` file, so rename the file and unpack it.
+
+The archive contains a `client.ovpn` file which contains the configuration needed by `OpenVPN`.
diff --git a/src/site/asciidoc/developers/website.adoc b/src/site/asciidoc/developers/website.adoc
index a73a4feb36c..2993a711d66 100644
--- a/src/site/asciidoc/developers/website.adoc
+++ b/src/site/asciidoc/developers/website.adoc
@@ -1,198 +1,198 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== Generating the Website
-
-We are currently using the normal `Maven` build to not only generate the project artifacts, but also the projects website.
-
-In order to provide content, every module can have a `src/site` directory. This content will be generated to that modules site-part.
-
-The `skin` being used to generate the site is none of the default `Maven` skins, but a more up-to-date looking skin using:
-
-- Bootstrap (For the CSS)
-- JQuery (For the JavaScript magic)
-- Fontawesome (For icons and symbols)
-
-But we don't have to worry about the details, all is configured to be used automatically.
-
-The site content itself is generated from `asciidoc` files (ending `.adoc`) which is a simple yet powerful markup language.
-(See http://asciidoctor.org/docs/asciidoc-syntax-quick-reference/[AsciiDoc Syntax Quick Reference] or https://powerman.name/doc/asciidoc[AsciiDoc cheatsheet] for details)
-
-Beyond the basic goodies, the build is also configured to generate images from ASCII data using the `asciidoctor-diagram` plugin.
-
-This allows us to generate images like the ones on the http://plc4x.apache.org/protocols/s7/index.html[S7 Protocol Description page]
-
-=== Providing new content
-
-Within the `src/site` directory there is a file `site.xml` which generally controls the menu and the look of the site.
-
-Most setting are inherited from the `plc4x-parent` module. That's also why this is more complicated than the others.
-
-The `site.xml` file is optional. Even if this is not available a site will be generated however no additional content will be linked from any of the navigation menus.
-
-So if we wanted to add a new page on some (hopefully non existent) `Wombat PLC Protocol`, we would create a file called:
-
-`index.adoc` in the `src/site/asciidoc/protocols/wombat` directory.
-
-For example with this content:
-
-```
-== Wombat PLC Protocol
-
-If you want to waste your money, brains and time, feel free to use a `Wombat PLC`.
-
-In order to help you waste even more of that, we'll skip documenting anything.
-
-```
-
-Notice the double equals sign? This is the site Title. It seems the level `One` with only one equals sign is only used for ebook output.
-
-So just keep in mind: Two equals signs is the top level title, all lower levels have more equals signs.
-
-In order to generate the content you need to execute the Maven `site` workflow.
-
-This is for example done by executing:
-
-    mvn site
-
-This will not build the artifact itself, but only it's website.
-
-After the build, you would find a file `target/site/protocols/wombat/index.html`
-
-However you can link to this page from any other page, but it is not added ot the navigation menu.
-
-=== Adding links to menus
-
-In order to add links to the menus, you have to create or modify the `site.xml` for the module you want to add content to.
-
-The simplest form would probably be something like this:
-
-```
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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
-
- http://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.
-
- -->
-<project name="PLC4J">
-
-  <body>
-    <menu name="Wombat">
-      <item name="lalala" href="https://plc4x.apache.org/somemodule/somedocument.html"/>
-    </menu>
-  </body>
-
-</project>
-```
-
-This will generate a `Wombat` menu at the end, and this has one link named `lalala`.
-
-Notice that the link has to have a file ending of `.html` and not `.adoc`.
-
-If you want to insert the menu somewhere else, you will have to re-define the entire menu.
-
-```
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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
-
- http://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.
-
- -->
-<project name="PLC4J">
-
-  <body>
-
-      <menu ref="reports" inherit="top"/>
-      <menu ref="parent" inherit="top"/>
-
-      <menu name="Wombat">
-        <item name="lalala" href="https://plc4x.apache.org/somemodule/"/>
-      </menu>
-
-      <menu ref="modules" inherit="top"/>
-
-  </body>
-
-</project>
-```
-
-The `menu ref` items hereby reference standard menus provided by the `Maven` build.
-
-=== Deploying the Website
-
-The PLC4X project uses Apache `gitpubsub` system for maintaining the website.
-
-In general all content in a repos `asf-site` branch is copied to the Webservers, if that repo is registered for it.
-
-The content in this branch is generated and maintained during the `Maven` build as part of the `site` generation if the `site-deploy` phase is executed.
-
-The build system needs to check-in content to the `asf-site` branch and usually ASF Jenkins nodes don't have the permissions to do that.
-
-In order to be able to push to the `asf-site` GIT branch, a dedicated build job is configured to build on nodes with the Jenkins label `git-websites`.
-
-Only on these machines are jobs allowed to push changes to a Git repo and here only to a branch named `asf-site`.
-
-See https://builds.apache.org/view/M-R/job/PLC4X/job/PLC4X%20Site/ for details on the PLC4X Jenkins Website build job.
-
-As soon as content is updated in the `asf-site` the `gitpubsub` mechanism will make those changes available at https://plc4x.apache.org
-
-== Bells and Whistles
-
-=== Making all pom properties available to asciidoctor
-
-While trying to automate keeping the content of the release documentation up-to-date, we added a groovy script to automatically calculate some version numbers.
-Unfortunately it wasn't possible to use these in asciidoctor using the normal `attributes` as the values aren't set as soon as Maven configures the plugin.
-
-We came up with an option to still achieve this:
-
-* The `groovy-maven-plugin` sets the dynamic properties in the `provide-custom-properties` execution.
-* Then we use the `properties-maven-plugin` to write all maven properties into a property file `target/pom.adoc`.
-* As Asciidoctor doesn't understand property files, we use the `replacer` to convert the content into an Asciidoctor property file in the `convert-property-to-adoc` execution.
-* Now we provide access to the location of this file by setting the `pom-adoc` attribute.
-* If we now need to access the properties, all we need to do, is to import the `pom.adoc` file with the following statement:
-
-   include::{pom-adoc}[]
-
-* After this all maven properties can be accessed via:
-
-   We are currently working on releasing ApachePLC4X {current-full-version}
+//
+//  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
+//
+//      http://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.
+//
+
+== Generating the Website
+
+We are currently using the normal `Maven` build to not only generate the project artifacts, but also the projects website.
+
+In order to provide content, every module can have a `src/site` directory. This content will be generated to that modules site-part.
+
+The `skin` being used to generate the site is none of the default `Maven` skins, but a more up-to-date looking skin using:
+
+- Bootstrap (For the CSS)
+- JQuery (For the JavaScript magic)
+- Fontawesome (For icons and symbols)
+
+But we don't have to worry about the details, all is configured to be used automatically.
+
+The site content itself is generated from `asciidoc` files (ending `.adoc`) which is a simple yet powerful markup language.
+(See http://asciidoctor.org/docs/asciidoc-syntax-quick-reference/[AsciiDoc Syntax Quick Reference] or https://powerman.name/doc/asciidoc[AsciiDoc cheatsheet] for details)
+
+Beyond the basic goodies, the build is also configured to generate images from ASCII data using the `asciidoctor-diagram` plugin.
+
+This allows us to generate images like the ones on the http://plc4x.apache.org/protocols/s7/index.html[S7 Protocol Description page]
+
+=== Providing new content
+
+Within the `src/site` directory there is a file `site.xml` which generally controls the menu and the look of the site.
+
+Most setting are inherited from the `plc4x-parent` module. That's also why this is more complicated than the others.
+
+The `site.xml` file is optional. Even if this is not available a site will be generated however no additional content will be linked from any of the navigation menus.
+
+So if we wanted to add a new page on some (hopefully non existent) `Wombat PLC Protocol`, we would create a file called:
+
+`index.adoc` in the `src/site/asciidoc/protocols/wombat` directory.
+
+For example with this content:
+
+```
+== Wombat PLC Protocol
+
+If you want to waste your money, brains and time, feel free to use a `Wombat PLC`.
+
+In order to help you waste even more of that, we'll skip documenting anything.
+
+```
+
+Notice the double equals sign? This is the site Title. It seems the level `One` with only one equals sign is only used for ebook output.
+
+So just keep in mind: Two equals signs is the top level title, all lower levels have more equals signs.
+
+In order to generate the content you need to execute the Maven `site` workflow.
+
+This is for example done by executing:
+
+    mvn site
+
+This will not build the artifact itself, but only it's website.
+
+After the build, you would find a file `target/site/protocols/wombat/index.html`
+
+However you can link to this page from any other page, but it is not added ot the navigation menu.
+
+=== Adding links to menus
+
+In order to add links to the menus, you have to create or modify the `site.xml` for the module you want to add content to.
+
+The simplest form would probably be something like this:
+
+```
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ 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
+
+ http://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.
+
+ -->
+<project name="PLC4J">
+
+  <body>
+    <menu name="Wombat">
+      <item name="lalala" href="https://plc4x.apache.org/somemodule/somedocument.html"/>
+    </menu>
+  </body>
+
+</project>
+```
+
+This will generate a `Wombat` menu at the end, and this has one link named `lalala`.
+
+Notice that the link has to have a file ending of `.html` and not `.adoc`.
+
+If you want to insert the menu somewhere else, you will have to re-define the entire menu.
+
+```
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ 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
+
+ http://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.
+
+ -->
+<project name="PLC4J">
+
+  <body>
+
+      <menu ref="reports" inherit="top"/>
+      <menu ref="parent" inherit="top"/>
+
+      <menu name="Wombat">
+        <item name="lalala" href="https://plc4x.apache.org/somemodule/"/>
+      </menu>
+
+      <menu ref="modules" inherit="top"/>
+
+  </body>
+
+</project>
+```
+
+The `menu ref` items hereby reference standard menus provided by the `Maven` build.
+
+=== Deploying the Website
+
+The PLC4X project uses Apache `gitpubsub` system for maintaining the website.
+
+In general all content in a repos `asf-site` branch is copied to the Webservers, if that repo is registered for it.
+
+The content in this branch is generated and maintained during the `Maven` build as part of the `site` generation if the `site-deploy` phase is executed.
+
+The build system needs to check-in content to the `asf-site` branch and usually ASF Jenkins nodes don't have the permissions to do that.
+
+In order to be able to push to the `asf-site` GIT branch, a dedicated build job is configured to build on nodes with the Jenkins label `git-websites`.
+
+Only on these machines are jobs allowed to push changes to a Git repo and here only to a branch named `asf-site`.
+
+See https://builds.apache.org/view/M-R/job/PLC4X/job/PLC4X%20Site/ for details on the PLC4X Jenkins Website build job.
+
+As soon as content is updated in the `asf-site` the `gitpubsub` mechanism will make those changes available at https://plc4x.apache.org
+
+== Bells and Whistles
+
+=== Making all pom properties available to asciidoctor
+
+While trying to automate keeping the content of the release documentation up-to-date, we added a groovy script to automatically calculate some version numbers.
+Unfortunately it wasn't possible to use these in asciidoctor using the normal `attributes` as the values aren't set as soon as Maven configures the plugin.
+
+We came up with an option to still achieve this:
+
+* The `groovy-maven-plugin` sets the dynamic properties in the `provide-custom-properties` execution.
+* Then we use the `properties-maven-plugin` to write all maven properties into a property file `target/pom.adoc`.
+* As Asciidoctor doesn't understand property files, we use the `replacer` to convert the content into an Asciidoctor property file in the `convert-property-to-adoc` execution.
+* Now we provide access to the location of this file by setting the `pom-adoc` attribute.
+* If we now need to access the properties, all we need to do, is to import the `pom.adoc` file with the following statement:
+
+   include::{pom-adoc}[]
+
+* After this all maven properties can be accessed via:
+
+   We are currently working on releasing ApachePLC4X {current-full-version}
diff --git a/src/site/asciidoc/developers/wiki.adoc b/src/site/asciidoc/developers/wiki.adoc
index 3e6d8598d67..e0431fa1304 100644
--- a/src/site/asciidoc/developers/wiki.adoc
+++ b/src/site/asciidoc/developers/wiki.adoc
@@ -1,20 +1,20 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== WIKI
-
+//
+//  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
+//
+//      http://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.
+//
+
+== WIKI
+
 https://cwiki.apache.org/confluence/display/PLC4X
\ No newline at end of file
diff --git a/src/site/asciidoc/developers/writing-driver/writing-driver.adoc b/src/site/asciidoc/developers/writing-driver/writing-driver.adoc
index f071fac921c..f545c657888 100644
--- a/src/site/asciidoc/developers/writing-driver/writing-driver.adoc
+++ b/src/site/asciidoc/developers/writing-driver/writing-driver.adoc
@@ -1,57 +1,57 @@
-//
-//  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
-//
-//      http://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.
-//
-:imagesdir: ../../images/
-
-== Basic Building Blocs of a Driver / Protocol
-
-The general pipeline for a Protocol looks like the following:
-
-[ditaa,driver-anatomy]
-....
-+-------------------------------------+
-|  Upstream (e.g. PLC4X API           :
-+-------------------------------------+
-                  |
-                  :
-                  v
-+-------------------------------------+
-|  PLC4X Optimizier                   :
-|  Possibly collapse requests         |
-+-------------------------------------+
-                  |
-                  :
-                  v
-+-------------------------------------+
-|  Protocol L1                        |
-|  Req. to (generated) Message Objects|
-+-------------------------------------+
-                  |
-                  |
-                  v
-+-------------------------------------+
-|  Protocol L2                        |
-|  Generated Objects to bytes         |
-+-------------------------------------+
-                  |
-                  |
-                  v
-+-------------------------------------+
-|  Downstream (e.g. Socket for I/O)   :
-+-------------------------------------+
-....
-
+//
+//  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
+//
+//      http://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.
+//
+:imagesdir: ../../images/
+
+== Basic Building Blocs of a Driver / Protocol
+
+The general pipeline for a Protocol looks like the following:
+
+[ditaa,driver-anatomy]
+....
++-------------------------------------+
+|  Upstream (e.g. PLC4X API           :
++-------------------------------------+
+                  |
+                  :
+                  v
++-------------------------------------+
+|  PLC4X Optimizier                   :
+|  Possibly collapse requests         |
++-------------------------------------+
+                  |
+                  :
+                  v
++-------------------------------------+
+|  Protocol L1                        |
+|  Req. to (generated) Message Objects|
++-------------------------------------+
+                  |
+                  |
+                  v
++-------------------------------------+
+|  Protocol L2                        |
+|  Generated Objects to bytes         |
++-------------------------------------+
+                  |
+                  |
+                  v
++-------------------------------------+
+|  Downstream (e.g. Socket for I/O)   :
++-------------------------------------+
+....
+
 A driver has the task to assemble the pipeline for the protocol(s).
\ No newline at end of file
diff --git a/src/site/asciidoc/index.adoc b/src/site/asciidoc/index.adoc
index 76492b2338e..02a5a33e908 100644
--- a/src/site/asciidoc/index.adoc
+++ b/src/site/asciidoc/index.adoc
@@ -1,101 +1,101 @@
-//
-//  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
-//
-//      http://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.
-//
-:imagesdir: images/
-:icons: font
-
-== Apache PLC4Xā„¢: Universal Protocol Adapter for Industrial IoT
-
-image::iot-lab.jpg[width=480, float=right]
-
-[.lead]
-Just like OPC-UA, but totally different.
-
-We are currently probably experiencing the greatest advances in the way we process information in human history.
-
-While these advances are taking over more and more parts of our world, it seems one large segment has continuously been missing out all the fun.
-
-As everyone is talking about IoT, virtualization, BigData, FastData and machine-learning, the manufacturing industry has seemed to been stuck in a closed-source proprietary world.
-
-Unfortunately the industry's Programmable Logic Controllers (PLCs) communicate with a large number of usually incompatible protocols.
-This has made it difficult to create applications that integrate these systems with the new world.
-
-This is where PLC4Xā„¢ comes in:
-
-*It is our goal to create a set of libraries, that allow unified access to any type of PLC*
-
-In general we are trying to achieve the same goal OPC-UA is trying to address, but we try to do this by going a completely different path.
-
-While with OPC-UA every device has to be retrofitted with the ability to speak a new protocol and use a common client to speak with these devices,
-PLC4X tries to provide a unified API by implementing drivers for communicating with most industrial controllers in the protocols they natively understand.
-
-Each of these drivers is being implemented from the specs or by reverse engineering protocols in order to be fully Apache 2.0 licensed.
-
-The major benefits of PLC4Xā„¢ over OPC-UA, from our point of view are:
-
-- No need to modify existing hardware
-- Activating OPC-UA support on existing PLCs greatly increases the load on the PLCs
-- No need to pay for licenses to activate OPC-UA support
-
-At first we will be concentrating on providing adapters for the most widely used protocols such as:
-
-- icon:pause-circle[role=light-gray] BACnet
-- icon:check[role=green] link:protocols/ads/index.html[Beckhoff ADS (TCP)]
-- icon:wrench[role=yellow] link:protocpls/delta-v/index.html[Emerson DeltaV (UDP)]
-- icon:wrench[role=yellow] link:protocols/ethernet-ip/index.html[EtherNet/IP (TCP)]
-- icon:wrench[role=yellow] KNXNet/IP (UDP)
-- icon:check[role=green] link:protocols/modbus/index.html[Modbus (TCP)]
-- icon:check[role=green] link:protocols/opc-ua/index.html[OPC-UA (TCP)]
-- icon:pause-circle[role=light-gray] Profinet
-- icon:check[role=green] link:protocols/s7/index.html[S7-STEP7 (TCP)]
-- icon:wrench[role=yellow] link:protocols/s7/index.html[S7-TIA (TCP)]
-
-We are planning on providing support for the following programming languages:
-
-- icon:wrench[role=yellow] C++
-- icon:wrench[role=yellow] C# (.Net)
-- icon:check[role=green] link:plc4j/index.html[Java]
-- icon:wrench[role=yellow] Python
-
-Beyond implementing the pure adapters we have already implemented some of the planned integration modules to popular projects in the Apache IoT world such as:
-
-[width=100%]
-|===
-a|image::apache_edgent_logo.png[width=80%,link=https://edgent.apache.org] a|image::apache_camel_logo.png[width=80%,link=https://camel.apache.org] a|image::apache_kafka_logo.png[width=80%,link=https://kafka.apache.org]
-|icon:check[role=green] https://edgent.apache.org[Apache Edgentā„¢ (Incubating)] |icon:check[role=green] https://camel.apache.org[Apache Camelā„¢] |icon:check[role=green] https://kafka.apache.org[Apache Kafkaā„¢]
-
-a|image::apache_nifi_logo.svg[width=80%,link=https://nifi.apache.org] a|image::apache_brooklyn_logo.png[width=80%,link=https://brooklyn.apache.org] a|image::apache_mynewt_logo.png[width=80%,link=https://mynewt.apache.org]
-|icon:wrench[role=yellow] https://nifi.apache.org[Apache Nifiā„¢] |icon:pause-circle[role=light-gray] https://brooklyn.apache.org[Apache Brooklynā„¢] |icon:pause-circle[role=light-gray] https://mynewt.apache.org[Apache Mynewtā„¢]
-|===
-
-This greatly reduces the barriers and the learning curve for creating industrial IoT applications.
-
-=== Upcoming Conferences & Meetups
-
-On this page we are listing options to attend talks and events around PLC4X.
-
-[width="100%",cols="2,^2,2,^2,^3",options="header"]
-|=========================================================
-|Date           |Location        |Type   |Event                                                                 |Title
-|24th May 2019  |Frankfurt (GER) |Meetup |https://www.meetup.com/de-DE/IoT-Hessen/events/261422034/[IoT Hessen] |Industrial IoT goes Open Source: Apache PLC4X Talks & Party
-|18th June 2019 |Erfurt (GER)    |Meetup |https://www.meetup.com/de-DE/iothde/events/260140057/[IoT ThĆ¼ringen]  |Industrie & IoT: Die perfekte Verbindung mit Flexibus & Apache PLC4X
-|=========================================================
-
-A full list containing also previous events can be found https://plc4x.apache.org/developers/conferences.html[here].
-
-Looking forward to meeting you.
-
-If you've got or found any events or talks we might be missing, please inform us on dev@plc4x.apache.org.
+//
+//  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
+//
+//      http://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.
+//
+:imagesdir: images/
+:icons: font
+
+== Apache PLC4Xā„¢: Universal Protocol Adapter for Industrial IoT
+
+image::iot-lab.jpg[width=480, float=right]
+
+[.lead]
+Just like OPC-UA, but totally different.
+
+We are currently probably experiencing the greatest advances in the way we process information in human history.
+
+While these advances are taking over more and more parts of our world, it seems one large segment has continuously been missing out all the fun.
+
+As everyone is talking about IoT, virtualization, BigData, FastData and machine-learning, the manufacturing industry has seemed to been stuck in a closed-source proprietary world.
+
+Unfortunately the industry's Programmable Logic Controllers (PLCs) communicate with a large number of usually incompatible protocols.
+This has made it difficult to create applications that integrate these systems with the new world.
+
+This is where PLC4Xā„¢ comes in:
+
+*It is our goal to create a set of libraries, that allow unified access to any type of PLC*
+
+In general we are trying to achieve the same goal OPC-UA is trying to address, but we try to do this by going a completely different path.
+
+While with OPC-UA every device has to be retrofitted with the ability to speak a new protocol and use a common client to speak with these devices,
+PLC4X tries to provide a unified API by implementing drivers for communicating with most industrial controllers in the protocols they natively understand.
+
+Each of these drivers is being implemented from the specs or by reverse engineering protocols in order to be fully Apache 2.0 licensed.
+
+The major benefits of PLC4Xā„¢ over OPC-UA, from our point of view are:
+
+- No need to modify existing hardware
+- Activating OPC-UA support on existing PLCs greatly increases the load on the PLCs
+- No need to pay for licenses to activate OPC-UA support
+
+At first we will be concentrating on providing adapters for the most widely used protocols such as:
+
+- icon:pause-circle[role=light-gray] BACnet
+- icon:check[role=green] link:protocols/ads/index.html[Beckhoff ADS (TCP)]
+- icon:wrench[role=yellow] link:protocpls/delta-v/index.html[Emerson DeltaV (UDP)]
+- icon:wrench[role=yellow] link:protocols/ethernet-ip/index.html[EtherNet/IP (TCP)]
+- icon:wrench[role=yellow] KNXNet/IP (UDP)
+- icon:check[role=green] link:protocols/modbus/index.html[Modbus (TCP)]
+- icon:check[role=green] link:protocols/opc-ua/index.html[OPC-UA (TCP)]
+- icon:pause-circle[role=light-gray] Profinet
+- icon:check[role=green] link:protocols/s7/index.html[S7-STEP7 (TCP)]
+- icon:wrench[role=yellow] link:protocols/s7/index.html[S7-TIA (TCP)]
+
+We are planning on providing support for the following programming languages:
+
+- icon:wrench[role=yellow] C++
+- icon:wrench[role=yellow] C# (.Net)
+- icon:check[role=green] link:plc4j/index.html[Java]
+- icon:wrench[role=yellow] Python
+
+Beyond implementing the pure adapters we have already implemented some of the planned integration modules to popular projects in the Apache IoT world such as:
+
+[width=100%]
+|===
+a|image::apache_edgent_logo.png[width=80%,link=https://edgent.apache.org] a|image::apache_camel_logo.png[width=80%,link=https://camel.apache.org] a|image::apache_kafka_logo.png[width=80%,link=https://kafka.apache.org]
+|icon:check[role=green] https://edgent.apache.org[Apache Edgentā„¢ (Incubating)] |icon:check[role=green] https://camel.apache.org[Apache Camelā„¢] |icon:check[role=green] https://kafka.apache.org[Apache Kafkaā„¢]
+
+a|image::apache_nifi_logo.svg[width=80%,link=https://nifi.apache.org] a|image::apache_brooklyn_logo.png[width=80%,link=https://brooklyn.apache.org] a|image::apache_mynewt_logo.png[width=80%,link=https://mynewt.apache.org]
+|icon:wrench[role=yellow] https://nifi.apache.org[Apache Nifiā„¢] |icon:pause-circle[role=light-gray] https://brooklyn.apache.org[Apache Brooklynā„¢] |icon:pause-circle[role=light-gray] https://mynewt.apache.org[Apache Mynewtā„¢]
+|===
+
+This greatly reduces the barriers and the learning curve for creating industrial IoT applications.
+
+=== Upcoming Conferences & Meetups
+
+On this page we are listing options to attend talks and events around PLC4X.
+
+[width="100%",cols="2,^2,2,^2,^3",options="header"]
+|=========================================================
+|Date           |Location        |Type   |Event                                                                 |Title
+|24th May 2019  |Frankfurt (GER) |Meetup |https://www.meetup.com/de-DE/IoT-Hessen/events/261422034/[IoT Hessen] |Industrial IoT goes Open Source: Apache PLC4X Talks & Party
+|18th June 2019 |Erfurt (GER)    |Meetup |https://www.meetup.com/de-DE/iothde/events/260140057/[IoT ThĆ¼ringen]  |Industrie & IoT: Die perfekte Verbindung mit Flexibus & Apache PLC4X
+|=========================================================
+
+A full list containing also previous events can be found https://plc4x.apache.org/developers/conferences.html[here].
+
+Looking forward to meeting you.
+
+If you've got or found any events or talks we might be missing, please inform us on dev@plc4x.apache.org.
diff --git a/src/site/asciidoc/protocols/ab-eth/index.adoc b/src/site/asciidoc/protocols/ab-eth/index.adoc
index 91eb78731bc..e6eb36bc7be 100644
--- a/src/site/asciidoc/protocols/ab-eth/index.adoc
+++ b/src/site/asciidoc/protocols/ab-eth/index.adoc
@@ -1,33 +1,33 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== Allen-Bradley Ethernet
-
-The Allen-Bradley Ethernet protocol encapsulates a DF1 protocol body to transfer data. The PLC4X driver currently only
-supports the protected typed logical read with a limited number of data types.
-
-=== Connection
-
-The connection string looks as follows: `ab-eth://<ip-address>/<station>`
-
-The field address: `N<file>:<offset></bitnumber>:<datatype>[<numberofbytes>]`. The following data types are available
-at the moment: SINBLEBIT (requires bitnumber to be set), WORD (2 byte integer), DWORD (4 byte integer), INTEGER (returns
-the number of bytes requested as an array, for other data types <numberofbytes> will be ignored).
-
-Example of a SINGLEBIT read: `N10:22/5:SINGLEBIT` (file 10, offset 22, bitnumber 5)
-
+//
+//  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
+//
+//      http://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.
+//
+
+== Allen-Bradley Ethernet
+
+The Allen-Bradley Ethernet protocol encapsulates a DF1 protocol body to transfer data. The PLC4X driver currently only
+supports the protected typed logical read with a limited number of data types.
+
+=== Connection
+
+The connection string looks as follows: `ab-eth://<ip-address>/<station>`
+
+The field address: `N<file>:<offset></bitnumber>:<datatype>[<numberofbytes>]`. The following data types are available
+at the moment: SINBLEBIT (requires bitnumber to be set), WORD (2 byte integer), DWORD (4 byte integer), INTEGER (returns
+the number of bytes requested as an array, for other data types <numberofbytes> will be ignored).
+
+Example of a SINGLEBIT read: `N10:22/5:SINGLEBIT` (file 10, offset 22, bitnumber 5)
+
 Example of a WORD read: `N10:84:WORD` (file 10, offset 84, 2 byte integer)
\ No newline at end of file
diff --git a/src/site/asciidoc/protocols/ads/index.adoc b/src/site/asciidoc/protocols/ads/index.adoc
index dd1736bfd69..a13cf6033d2 100644
--- a/src/site/asciidoc/protocols/ads/index.adoc
+++ b/src/site/asciidoc/protocols/ads/index.adoc
@@ -1,25 +1,25 @@
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://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.
-//
-
-== Beckhoff ADS
-
-Introduction
-
-=== Links
-
-
-
+//
+//  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
+//
+//      http://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.
+//
+
+== Beckhoff ADS
+
+Introduction
+
+=== Links
+
+
+
diff --git a/src/site/asciidoc/protocols/delta-v/index.adoc b/src/site/asciidoc/protocols/delta-v/index.adoc
index 613703277f0..452aea2eaec 100644
--- a/src/site/asciidoc/protocols/delta-v/index.adoc
+++ b/src/site/asciidoc/protocols/delta-v/index.adoc
@@ -1,197 +1,197 @@
-//
-//  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
-//
-//      http://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.
-//
-:imagesdir: ../../images/
-
-== DeltaV Industrial Ethernet Communication
-
-The DeltaV protocol is used in the Emerson DeltaV system.
-In contrast to most other systems, this is a combination of PLC and Control System.
-As Emerson seems to insist on the devices not being PLCs, but controllers, well call them this way in this document.
-Same with the Control System, these seem to be called OS (Operator System).
-
-=== Disclaimer
-
-As we had absolutely no information on the details of the protocol, we started by taking an existing DeltaV training system and replaced the network switch with a hub and used this to take network captures of the entire network traffic of the DeltaV network.
-
-These network captures and some knowledge of the normal system operation were all we had.
-
-All information we got, we got by inspecting these captures, building hypothesis and implementing tooling to verify these assumptions.
-
-Definitely we will not have interpreted everything correct and we'll probably do a lot of updating of this page.
-
-Due to this uncertainty we are only implementing a `promiscuous mode` driver, which will be able to read ongoing traffic without the ability to actively interact with the system.
-
-Read link:reverse-engineering.html[here] for a document on how we proceeded with reverse engineering this protocol.
-
-=== The Wrapper Protocol
-
-All communication seems to be done using the `UDP` protocol on port `18507`.
-
-When working with the dumps it seems that this version of the DeltaV protocol was implemented by wrapping another protocol within a thin wrapper protocol.
-We have seen this for almost all other industrial controller types.
-We are hereby assuming that the inner protocol is the version of the DeltaV protocol, which is used for serial communication.
-
-The general structure of such a wrapper packet seems to look like this:
-
-[packetdiag,deltav-wrapper-packet,svg]
-....
-{
-    colwidth = 32
-
-    * Header\n(Constant = 0xFACE) [len = 16]
-    * Payload Length [len = 16]
-    * Type [len = 16]
-    * Message Id [len = 16]
-    * Sender Id [len = 16]
-    * Timestamp [len = 24]
-    * 0x80/0x00 [len = 8]
-    * 0x04 [len = 8]
-    * 0x00 [len = 8]
-    * Payload [len = 64]
-    * Checksum [len = 16]
-}
-....
-
-After the fixed header of `0xFACE` comes a short value providing the `Payload Length`.
-
-After the payload probably comes the message type.
-Here we have observed the internal structure of packets with the same type to be very similar, so we're quite sure this is a type.
-
-The `Message Id` seems to be a counter existing for every communication between two partners, which is incremented for every packet sent to the other partner.
-
-We have observed every unit to have a unique `Sender Id`, however a controller has been seen to have a differing id when communicating with a different operator system.
-What we did notice however, was that controllers usually had numerical ids while the OSes had hexadecimal letters.
-So an id of `0x0002` would probably imply a controller and an id of `0x000d` would imply an operator system.
-But we could be wrong with this assumption and this just being a result of convention.
-
-The 3 bytes after the id seem to relate to a timestamp.
-Inspecting the packets and correlating this to the timestamps in our packet captures, lead us to the assumption that this timestamp uses the first 14 bits for encoding seconds and the last 10 bits for encoding the sub-second fraction.
-While a 3 byte timestamp is only able to measure a 10 minute time-slot and is probably not usable for absolute time measuring, it might be useful to measure transfer times.
-For this a 4 byte value would have been a waste of network capacity and a 2 byte value wouldn't be able to measure more than 60 seconds, which might be too short when taking into account packet resending and network timeouts.
-So for now we are assuming this format is used.
-
-The following 3 bytes seem to have a constant value of `0x800400` for most packets, except the ones with a type of `0x03` and `0x04`.
-For these two types the value seems to be `0x004400`. Here we currently can't make an assumption on the meaning of these fields.
-However as the `0x003` and `0x004` seem to be the first packets used for establishing the connection between the OS and the controller, these could somehow relate to the connection state.
-
-After these mysterious 3 bytes comes the actual payload of the packet.
-The details of these will be discussed later in this document.
-
-At the end comes a short value that seems to be a completely different value for every packet.
-As the message id and timestamp are different for every message, we are assuming this is a simple checksum.
-However we currently have no idea on how this is calculated and we haven't invested any time in finding this out.
-
-UDP being connectionless the DeltaV network protocol seems to require acknowledging.
-This is done by sending a packet back to the originator, but with a length of `0x0000` and the same `type` and mesasge-id` as the packet that is acknowledged.
-
-=== High Level View of the Protocol
-
-In this section we'll describe the general structure of how the communication looks like - which message types are sent when and in which sequence.
-
-==== Connecting an OS to a Controller
-
-[seqdiag,deltav-connect]
-....
-{
-    Controller; OS;
-
-    edge_length = 400;
-    span_height = 18;
-    default_fontsize = 12;
-    activation = none;
-
-    OS ->  Controller [label = "Type 0x0003 (Connection Request)"];
-    OS <-  Controller [label = "Type 0x0004 (Connection Response)"];
-
-    OS ->  Controller [label = "Type 0x0002 Subtype 0x0501 (Version Information)"];
-    OS <-- Controller [label = "Ack"];
-
-    OS <- Controller [label = "Type 0x0002 Subtype 0x0502 (Version Information)"];
-    OS --> Controller [label = "Ack"];
-}
-....
-
-==== Regular sync
-
-It seems that every 15 seconds two packets are exchanged.
-
-The type of these is always `0x0006`.
-
-One thing that is quite obvious, is that these are the only messages, for which the message id doesn't seem to be incremented.
-So these messages have the exact same id as the following request being sent out.
-
-We are assuming that these are sort of heartbeat messages and additionally sync the message ids so the remote could see if it lost messages in the last 15 seconds.
-
-But that is just an assumption.
-
-[seqdiag,deltav-sync]
-....
-{
-    Controller; OS;
-
-    edge_length = 400;
-    span_height = 18;
-    default_fontsize = 12;
-    activation = none;
-
-    OS -> Controller [label = "Type 0x0006 (Sync)"];
-    OS <-- Controller [label = "Type 0x0006 (Sync)"];
-}
-....
-
-==== Data changes in the Controller
-
-In general it seems as if all sub-types regarding normal data changes start with `0x04`.
-
-If the value of a subscribed value changes in the controller, a message type `0x0002` with sub-type `0x0403` is sent.
-
-[seqdiag,deltav-data]
-....
-{
-    Controller; OS;
-
-    edge_length = 400;
-    span_height = 18;
-    default_fontsize = 12;
-    activation = none;
-
-    OS <- Controller [label = "Type 0x0002 Subtype 0x0403 (...)"];
-    OS --> Controller [label = "Ack"];
-}
-....
-
-==== Alarms in the Controller
-
-In general it seems as if all sub-types regarding events and alarms start with `0x03`.
-
-[seqdiag,deltav-alarm]
-....
-{
-    Controller; OS;
-
-    edge_length = 400;
-    span_height = 18;
-    default_fontsize = 12;
-    activation = none;
-
-    OS <- Controller [label = "Type 0x0002 Subtype 0x030? (...)"];
-    OS --> Controller [label = "Ack"];
-}
-....
-
-
-
+//
+//  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
+//
+//      http://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.
+//
+:imagesdir: ../../images/
+
+== DeltaV Industrial Ethernet Communication
+
+The DeltaV protocol is used in the Emerson DeltaV system.
+In contrast to most other systems, this is a combination of PLC and Control System.
+As Emerson seems to insist on the devices not being PLCs, but controllers, well call them this way in this document.
+Same with the Control System, these seem to be called OS (Operator System).
+
+=== Disclaimer
+
+As we had absolutely no information on the details of the protocol, we started by taking an existing DeltaV training system and replaced the network switch with a hub and used this to take network captures of the entire network traffic of the DeltaV network.
+
+These network captures and some knowledge of the normal system operation were all we had.
+
+All information we got, we got by inspecting these captures, building hypothesis and implementing tooling to verify these assumptions.
+
+Definitely we will not have interpreted everything correct and we'll probably do a lot of updating of this page.
+
+Due to this uncertainty we are only implementing a `promiscuous mode` driver, which will be able to read ongoing traffic without the ability to actively interact with the system.
+
+Read link:reverse-engineering.html[here] for a document on how we proceeded with reverse engineering this protocol.
+
+=== The Wrapper Protocol
+
+All communication seems to be done using the `UDP` protocol on port `18507`.
+
+When working with the dumps it seems that this version of the DeltaV protocol was implemented by wrapping another protocol within a thin wrapper protocol.
+We have seen this for almost all other industrial controller types.
+We are hereby assuming that the inner protocol is the version of the DeltaV protocol, which is used for serial communication.
+
+The general structure of such a wrapper packet seems to look like this:
+
+[packetdiag,deltav-wrapper-packet,svg]
+....
+{
+    colwidth = 32
+
+    * Header\n(Constant = 0xFACE) [len = 16]
+    * Payload Length [len = 16]
+    * Type [len = 16]
+    * Message Id [len = 16]
+    * Sender Id [len = 16]
+    * Timestamp [len = 24]
+    * 0x80/0x00 [len = 8]
+    * 0x04 [len = 8]
+    * 0x00 [len = 8]
+    * Payload [len = 64]
+    * Checksum [len = 16]
+}
+....
+
+After the fixed header of `0xFACE` comes a short value providing the `Payload Length`.
+
+After the payload probably comes the message type.
+Here we have observed the internal structure of packets with the same type to be very similar, so we're quite sure this is a type.
+
+The `Message Id` seems to be a counter existing for every communication between two partners, which is incremented for every packet sent to the other partner.
+
+We have observed every unit to have a unique `Sender Id`, however a controller has been seen to have a differing id when communicating with a different operator system.
+What we did notice however, was that controllers usually had numerical ids while the OSes had hexadecimal letters.
+So an id of `0x0002` would probably imply a controller and an id of `0x000d` would imply an operator system.
+But we could be wrong with this assumption and this just being a result of convention.
+
+The 3 bytes after the id seem to relate to a timestamp.
+Inspecting the packets and correlating this to the timestamps in our packet captures, lead us to the assumption that this timestamp uses the first 14 bits for encoding seconds and the last 10 bits for encoding the sub-second fraction.
+While a 3 byte timestamp is only able to measure a 10 minute time-slot and is probably not usable for absolute time measuring, it might be useful to measure transfer times.
+For this a 4 byte value would have been a waste of network capacity and a 2 byte value wouldn't be able to measure more than 60 seconds, which might be too short when taking into account packet resending and network timeouts.
+So for now we are assuming this format is used.
+
+The following 3 bytes seem to have a constant value of `0x800400` for most packets, except the ones with a type of `0x03` and `0x04`.
+For these two types the value seems to be `0x004400`. Here we currently can't make an assumption on the meaning of these fields.
+However as the `0x003` and `0x004` seem to be the first packets used for establishing the connection between the OS and the controller, these could somehow relate to the connection state.
+
+After these mysterious 3 bytes comes the actual payload of the packet.
+The details of these will be discussed later in this document.
+
+At the end comes a short value that seems to be a completely different value for every packet.
+As the message id and timestamp are different for every message, we are assuming this is a simple checksum.
+However we currently have no idea on how this is calculated and we haven't invested any time in finding this out.
+
+UDP being connectionless the DeltaV network protocol seems to require acknowledging.
+This is done by sending a packet back to the originator, but with a length of `0x0000` and the same `type` and mesasge-id` as the packet that is acknowledged.
+
+=== High Level View of the Protocol
+
+In this section we'll describe the general structure of how the communication looks like - which message types are sent when and in which sequence.
+
+==== Connecting an OS to a Controller
+
+[seqdiag,deltav-connect]
+....
+{
+    Controller; OS;
+
+    edge_length = 400;
+    span_height = 18;
+    default_fontsize = 12;
+    activation = none;
+
+    OS ->  Controller [label = "Type 0x0003 (Connection Request)"];
+    OS <-  Controller [label = "Type 0x0004 (Connection Response)"];
+
+    OS ->  Controller [label = "Type 0x0002 Subtype 0x0501 (Version Information)"];
+    OS <-- Controller [label = "Ack"];
+
+    OS <- Controller [label = "Type 0x0002 Subtype 0x0502 (Version Information)"];
+    OS --> Controller [label = "Ack"];
+}
+....
+
+==== Regular sync
+
+It seems that every 15 seconds two packets are exchanged.
+
+The type of these is always `0x0006`.
+
+One thing that is quite obvious, is that these are the only messages, for which the message id doesn't seem to be incremented.
+So these messages have the exact same id as the following request being sent out.
+
+We are assuming that these are sort of heartbeat messages and additionally sync the message ids so the remote could see if it lost messages in the last 15 seconds.
+
+But that is just an assumption.
+
+[seqdiag,deltav-sync]
+....
+{
+    Controller; OS;
+
+    edge_length = 400;
+    span_height = 18;
+    default_fontsize = 12;
+    activation = none;
+
+    OS -> Controller [label = "Type 0x0006 (Sync)"];
+    OS <-- Controller [label = "Type 0x0006 (Sync)"];
+}
+....
+
+==== Data changes in the Controller
+
+In general it seems as if all sub-types regarding normal data changes start with `0x04`.
+
+If the value of a subscribed value changes in the controller, a message type `0x0002` with sub-type `0x0403` is sent.
+
+[seqdiag,deltav-data]
+....
+{
+    Controller; OS;
+
+    edge_length = 400;
+    span_height = 18;
+    default_fontsize = 12;
+    activation = none;
+
+    OS <- Controller [label = "Type 0x0002 Subtype 0x0403 (...)"];
+    OS --> Controller [label = "Ack"];
+}
+....
+
+==== Alarms in the Controller
+
+In general it seems as if all sub-types regarding events and alarms start with `0x03`.
+
+[seqdiag,deltav-alarm]
+....
+{
+    Controller; OS;
+
+    edge_length = 400;
+    span_height = 18;
+    default_fontsize = 12;
+    activation = none;
+
+    OS <- Controller [label = "Type 0x0002 Subtype 0x030? (...)"];
+    OS --> Controller [label = "Ack"];
+}
+....
+
+
+
diff --git a/src/site/asciidoc/protocols/delta-v/read-data.adoc b/src/site/asciidoc/protocols/delta-v/read-data.adoc
index 1be96cfccbf..28ee3736512 100644
--- a/src/site/asciidoc/protocols/delta-v/read-data.adoc
+++ b/src/site/asciidoc/protocols/delta-v/read-data.adoc
@@ -1,1655 +1,1655 @@
-//
-//  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
-//
-//      http://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.
-//
-:imagesdir: ../../images/
-
-== 0x0403 (before registration)
-
-Before a subscription is done, regularly (about once a minute) the following packets come in.
-
-```
-fa ce 00 32 00 02 33 46 00 0b 63 b8 54 80 04 00
-
-04 03 00 00 00 00 00 52 00 00 00 00 00 00 00 00
-00 04 00 00 00 08 00 01 00 00 00 00 04
-- 04 8f 17 b8 00 2f 01 36 04 8f 17 b8
-01 00 00 00 00 00 00
-00 00
-
-94 17
-```
-
-== 0x1B01
-
-The following packets are all reformatted to group parts that belong together into one line.
-Additionally above each line - in comments - the human readable interpretation of the block below.
-
-The general purpose of a `0xB101` packet seems to be to subscribe to individual variables on the controllers.
-A `0cB101` request is always responded to by a `0xB102` reply, which contains the current value of all requested variables.
-
-After this it is noticeable, that `0x0403` packets start coming in, which seem to contain updates to the variables.
-
-The structure of each 0x1B1 is identical:
-
-* First comes a fixed size header that seems to contain mostly `0x00` values.
-* The content starts with a `set context block`, which is terminated by a block of `0xFFFF`.
-* This context block seems to have the following structure:
-** Some sort of type indicator (Haven't seen anything besides `0x04` for `0xB101` packets)
-**
-* Inside a context block come a variable number of entries, each of them with the same format:
-** First comes a short counter value starting with `0x0000`, this will be replicated in the response.
-** The second short value is the length of the string that is to follow
-** For each character of the String two bytes have to be read (Decoding these as UTL-16 worked fine)
-** After the last character comes a constant `0x0000` block
-* After the last context block just comes a single `0x04` byte
-
-```
-fa ce 05 7d 00 02 af 09 00 01 15 e0 54 80 04 00
-
-1b 01 00 00 00 00 00 07 03 6c 01 96 00 04 05 04
-00 08 00 00 00 08 01 ae 00 08 03 5c 00 08 04 82
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00
-- 04 90 17 b9 00 32 01 39 00 00 03 e8
-// BESCH3
-00 00 00 06 00 42 00 45 00 53 00 43 00 48 00 33 00 00
-// SKAL1
-00 01 00 05 00 53 00 4b 00 41 00 4c 00 31 00 00
-// DYN_BESCH1
-00 02 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 31 00 00
-// ISTWERT3
-00 03 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 33 00 00
-// GF_STATUS
-00 04 00 09 00 47 00 46 00 5f 00 53 00 54 00 41 00 54 00 55 00 53 00 00
-// ALARMS
-00 05 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
-// DYN_BESCH3
-00 06 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 33 00 00
-// A/BA
-00 07 00 04 00 41 00 2f 00 42 00 41 00 00
-// A/BA_GFES_AUTO
-00 08 00 0e 00 41 00 2f 00 42 00 41 00 5f 00 47 00 46 00 45 00 53 00 5f 00 41 00 55 00 54 00 4f 00 00
-// DYN_BESCH2
-00 09 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 32 00 00
-// SKAL2
-00 0a 00 05 00 53 00 4b 00 41 00 4c 00 32 00 00
-// A/GFE_ALARM
-00 0b 00 0b 00 41 00 2f 00 47 00 46 00 45 00 5f 00 41 00 4c 00 41 00 52 00 4d 00 00
-// GF_NAME
-00 0c 00 07 00 47 00 46 00 5f 00 4e 00 41 00 4d 00 45 00 00
-// ISTWERT1
-00 0d 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 31 00 00
-// A/IST_FW_KURZ
-00 0e 00 0d 00 41 00 2f 00 49 00 53 00 54 00 5f 00 46 00 57 00 5f 00 4b 00 55 00 52 00 5a 00 00
-// ISTWERT2
-00 0f 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 32 00 00
-// BESCH1
-00 10 00 06 00 42 00 45 00 53 00 43 00 48 00 31 00 00
-// SKAL3
-00 11 00 05 00 53 00 4b 00 41 00 4c 00 33 00 00
-// BESCH2
-00 12 00 06 00 42 00 45 00 53 00 43 00 48 00 32 00 00
-ff ff
-- 04 91 17 ba 00 33 01 3a 00 00 03 e8
-// A/IST_FW_KURZ
-00 00 00 0d 00 41 00 2f 00 49 00 53 00 54 00 5f 00 46 00 57 00 5f 00 4b 00 55 00 52 00 5a 00 00
-// GF_STATUS
-00 01 00 09 00 47 00 46 00 5f 00 53 00 54 00 41 00 54 00 55 00 53 00 00
-// ISTWERT1
-00 02 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 31 00 00
-// DYN_BESCH3
-00 03 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 33 00 00
-// ALARMS
-00 04 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
-// SKAL2
-00 05 00 05 00 53 00 4b 00 41 00 4c 00 32 00 00
-// DYN_BESCH1
-00 06 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 31 00 00
-// BESCH3
-00 07 00 06 00 42 00 45 00 53 00 43 00 48 00 33 00 00
-// SKAL3
-00 08 00 05 00 53 00 4b 00 41 00 4c 00 33 00 00
-// SKAL1
-00 09 00 05 00 53 00 4b 00 41 00 4c 00 31 00 00
-// ISTWERT2
-00 0a 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 32 00 00
-// GF_NAME
-00 0b 00 07 00 47 00 46 00 5f 00 4e 00 41 00 4d 00 45 00 00
-// ISTWERT3
-00 0c 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 33 00 00
-// A/BA
-00 0d 00 04 00 41 00 2f 00 42 00 41 00 00
-// BESCH1
-00 0e 00 06 00 42 00 45 00 53 00 43 00 48 00 31 00 00
-// DYN_BESCH2
-00 0f 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 32 00 00
-// A/BA_GFES_AUTO
-00 10 00 0e 00 41 00 2f 00 42 00 41 00 5f 00 47 00 46 00 45 00 53 00 5f 00 41 00 55 00 54 00 4f 00 00
-// A/GFE_ALARM
-00 11 00 0b 00 41 00 2f 00 47 00 46 00 45 00 5f 00 41 00 4c 00 41 00 52 00 4d 00 00
-// BESCH2
-00 12 00 06 00 42 00 45 00 53 00 43 00 48 00 32 00 00
-ff ff
-- 04 92 17 bb 00 34 01 3b 00 00 03 e8
-// ISTWERT1
-00 00 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 31 00 00
-// A/GFE_ALARM
-00 01 00 0b 00 41 00 2f 00 47 00 46 00 45 00 5f 00 41 00 4c 00 41 00 52 00 4d 00 00
-// A/IST_FW_KURZ
-00 02 00 0d 00 41 00 2f 00 49 00 53 00 54 00 5f 00 46 00 57 00 5f 00 4b 00 55 00 52 00 5a 00 00
-// SKAL1
-00 03 00 05 00 53 00 4b 00 41 00 4c 00 31 00 00
-// ALARMS
-00 04 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
-// GF_STATUS
-00 05 00 09 00 47 00 46 00 5f 00 53 00 54 00 41 00 54 00 55 00 53 00 00
-// GF_NAME
-00 06 00 07 00 47 00 46 00 5f 00 4e 00 41 00 4d 00 45 00 00
-// DYN_BESCH1
-00 07 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 31 00 00
-// A/BA
-00 08 00 04 00 41 00 2f 00 42 00 41 00 00
-// A/A3
-00 09 00 04 00 41 00 2f 00 41 00 33 00 00
-// BESCH1
-00 0a 00 06 00 42 00 45 00 53 00 43 00 48 00 31 00 00
-// A/A2
-00 0b 00 04 00 41 00 2f 00 41 00 32 00 00
-// A/BA_GFES_AUTO
-00 0c 00 0e 00 41 00 2f 00 42 00 41 00 5f 00 47 00 46 00 45 00 53 00 5f 00 41 00 55 00 54 00 4f 00 00
-ff ff
-- 04 93 17 bc 00 35 01 3c 00 00 03 e8
-// ALARMS
-00 00 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
-// A/IST_FW_KURZ
-00 01 00 0d 00 41 00 2f 00 49 00 53 00 54 00 5f 00 46 00 57 00 5f 00 4b 00 55 00 52 00 5a 00 00
-// A/BA
-00 02 00 04 00 41 00 2f 00 42 00 41 00 00
-// A/A2
-00 03 00 04 00 41 00 2f 00 41 00 32 00 00
-// GF_STATUS
-00 04 00 09 00 47 00 46 00 5f 00 53 00 54 00 41 00 54 00 55 00 53 00 00
-// A/A1
-00 05 00 04 00 41 00 2f 00 41 00 31 00 00
-ff ff
-- 04
-
-76 37
-```
-
-== 0xB102
-
-```
-fa ce 04 f4 00 02 33 48 00 0b 63 ba 54 80 04 00
-
-1b 02 00 00 00 00 00 07 03 6c 01 96 00 04 00 00
-00 06 00
-01 00 06 01 61 00 06 02 b6 00 06 03 c4
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00
-- 04 00 00 00 00 00 32 01 39 04 90 17 b9
-// ID: 0x0000, Name: BESCH3, 47=Type: Label, Code: 0x000b, Length: 2, Text: DT
-02 00 00 47 00 0b 00 02 00 44 00 54 00 00
-// ID: 0x0001, Name: SKAL1, Type: 24=Skale, 934728, 49696, 1001, 01 (Probably 3 32bit Integers, followed by a flag byte)
-02 00 01 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
-// ID: 0x0002, Name: DYN_BESCH1, Type: 47=Label, Code: 0x000b, Length: 2, Text: VL
-02 00 02 47 00 0b 00 02 00 56 00 4c 00 00
-// ID: 0x0003, Name: ISTWERT3, Type: 08=Float (32 bit), Value: 0.0
-02 00 03 08 00 00 00 00
-// ID: 0x0004, Name: GF_STATUS, Type: 63=(Unknown)
-02 00 04 63 02 00 19 c4 2f
-// ID: 0x0005, Name: ALARMS, Type: 76=Alarms (Contains Data-Structure directly related to alarms)
-02 00 05 76 00 6a 05 01 01 00 00 00 08 00 53 00 54 00 4f 00 45 00 52 00 55 00 4e 00 47 00 00 00 39 00 39 00 0f 00 00 2a f1 c6 c4 75 63 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00
-// ID: 0x0006, Name: DYN_BESCH3, Type: 47=Label, Code: 0x0009, Length: 1, Text: T
-02 00 06 47 00 09 00 01 00 54 00 00
-// ID: 0x0007, Name: A/BA, Type: 05=(Boolean?), Value: False
-02 00 07 05 00
-// ID: 0x0008, Name: A/BA_GFES_AUTO, Type: 01=(Boolean?), Value: True
-02 00 08 01 01
-// ID: 0x0009, Name: DYN_BESCH2, Type: Label, Code: 0x0009, Length: 1, Text: T
-02 00 09 47 00 0b 00 02 00 49 00 54 00 00
-// ID: 0x000A, Name: SKAL2, Type: 24=Skale, 934728, 49696, 1001, 01 (Probably 3 32bit Integers, followed by a flag byte)
-02 00 0a 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
-// ID: 0x000B, Name: A/GFE_ALARM, Type: 05=(Boolean?), Value: True
-02 00 0b 05 01
-// ID: 0x000C, Name: GF_NAME, Type: 47=Label, Code: 0x0019, Length: 9, Text: PT09ALAC1
-02 00 0c 47 00 19 00 09 00 50 00 54 00 30 00 39 00 41 00 4c 00 41 00 43 00 31 00 00
-// ID: 0x000D, Name: ISTWERT1, Type: 08=Float, Value: 50.416664
-02 00 0d 08 42 49 aa aa
-// ID: 0x000E, Name: A/IST_FW_KURZ, Type: 47=Label, Code: 0x0015, Length: 7, Text: VORLAUF
-02 00 0e 47 00 15 00 07 00 56 00 4f 00 52 00 4c 00 41 00 55 00 46 00 00
-// ID: 0x000F, Name: ISTWERT2, Type: 21=Parametrized Float, Param: 0x80, Value: 50.416664
-02 00 0f 21 80 42 49 aa aa
-// ID: 0x0010, Name: BESCH1, Type: 47=Label, Code: 0x0009, Length: 1, Text: T
-02 00 10 47 00 09 00 01 00 54 00 00
-// ID: 0x0011, Name: SKAL3, Type: 24=Skale, 934560, 0, 1000, 0x01
-02 00 11 24 00 0e 42 a0 00 00 00 00 00 00 03 e8 01
-// ID: 0x0012, Name: BESCH2, Type: 47=Label, Code; 0x0009, Length: 1, Text: T
-02 00 12 47 00 09 00 01 00 54 00 00
-- 01 00 00 00 00 00 33 01 3a 04 91 17 ba
-// ID: 0x0000, Name: A/IST_FW_KURZ, Type: 47=Label, Code: 0x0017, Length: 8, Text: Keine FW
-02 00 00 47 00 17 00 08 00 4b 00 65 00 69 00 6e 00 65 00 20 00 46 00 57 00 00
-// ID: 0x0001, Name: GF_STATUS, Type: 63=(Unknown: Messstellen Status)
-02 00 01 63 00 00 19 c4 2f
-// ID: 0x0002, Name: ISTWERT1, Type: 08=Float (32 bit), Value: 8.923611
-02 00 02 08 41 0e c7 1c
-// ID: 0x0003, Name: DYN_BESCH3, Type: 47=Label, Code: 0x000D, Length: 3, Text: FLU
-02 00 03 47 00 0d 00 03 00 46 00 4c 00 55 00 00
-// ID: 0x0004, Name: ALARMS, Type: 76=Alarms (Contains Data-Structure directly related to alarms)
-02 00 04 76 00 58 05 01 01 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00
-// ID: 0x0005, Name: SKAL2, Type: 24=Skale, 934600, 0, 1088, 00 (Probably 3 32bit Integers, followed by a flag byte)
-02 00 05 24 00 0e 42 c8 00 00 00 00 00 00 04 40 00
-// ID: 0x0006, Name: DYN_BESCH1, Type: 47=Label, Code: 0x000D, Length: 3, Text: F01
-02 00 06 47 00 0d 00 03 00 46 00 30 00 31 00 00
-// ID: 0x0007, Name: BESCH3, Type: 47=Label, Code: 0x0009, Length: 1, Text: W
-02 00 07 47 00 09 00 01 00 57 00 00
-// ID: 0x0008, Name: SKAL3, Type: 24=Skale, 934600, 0, 1088, 00 (Probably 3 32bit Integers, followed by a flag byte)
-02 00 08 24 00 0e 42 c8 00 00 00 00 00 00 04 40 00
-// ID: 0x0009, Name: SKAL1, Type: 24=Skale, 934176, 0, 1349, 01 (Probably 3 32bit Integers, followed by a flag byte)
-02 00 09 24 00 0e 41 20 00 00 00 00 00 00 05 45 01
-// ID: 0x000A, Name: ISTWERT2, Type: 08=Float, Value: -0.000762939453125 (Sort of 0)
-02 00 0a 08 ba 48 00 00
-// ID: 0x000B, Name: GF_NAME, Type: 47=Label, Code: 0x0019, Length: 9, Text: PT09AAHR1
-02 00 0b 47 00 19 00 09 00 50 00 54 00 30 00 39 00 41 00 41 00 48 00 52 00 31 00 00
-// ID: 0x000C, Name: ISTWERT3, Type: 08=Float, Value: 0.0
-02 00 0c 08 00 00 00 00
-// ID: 0x000D, Name: A/BA, Type: 05=(Boolean?), Value: False
-02 00 0d 05 00
-// ID: 0x000E, Name: BESCH1, Type: 47=Label, Code: 0x0009, Length: 1, Text: F
-02 00 0e 47 00 09 00 01 00 46 00 00
-// ID: 0x000F, Name: DYN_BESCH2, Type: 47=Label, Code: 0x000D, Length: 3, Text: FST
-02 00 0f 47 00 0d 00 03 00 46 00 53 00 54 00 00
-// ID: 0x0010, Name: A/BA_GFES_AUTO, Type: 01=(Boolean?), Value: False
-02 00 10 01 00
-// ID: 0x0011, Name: A/GFE_ALARM, Type: 05=(Boolean?), Value: True
-02 00 11 05 01
-// ID: 0x0012, Name: BESCH2, Type: 47=Label, Code: 0x0009, Length: 1, Text: W
-02 00 12 47 00 09 00 01 00 57 00 00
-- 01 00 00 00 00 00 34 01 3b 04 92 17 bb
-// ID: 0x0000, Name: ISTWERT1, Type: 21=Parametrized Float, Param: 0x88, Value: 0.0025000572
-02 00 00 21 88 3b 23 d8 00
-// ID: 0x0001, Name: A/GFE_ALARM, Type: 05=(Boolean?), Value: True
-02 00 01 05 01
-// ID: 0x0002, Name: A/IST_FW_KURZ, Type: 47=Label, Code: 0x0017, Length: 8, Text: Keine FW
-02 00 02 47 00 17 00 08 00 4b 00 65 00 69 00 6e 00 65 00 20 00 46 00 57 00 00
-// ID: 0x0003, Name: SKAL1, Type: 24=Skale, 933760, 49024, 33503, 03 (Probably 3 32bit Integers, followed by a flag byte)
-02 00 03 24 00 0e 3f 80 00 00 bf 80 00 00 82 df 03
-// ID: 0x0004, Name: ALARMS, Type: 76=Alarms (Contains Data-Structure directly related to alarms)
-02 00 04 76 00 76 05 01 01 00 00 00 0e 00 47 00 46 00 45 00 5f 00 56 00 45 00 52 00 52 00 49 00 45 00 47 00 45 00 4c 00 54 00 00 00 54 00 54 01 07 00 00 2a f1 ca d4 71 f6 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00
-// ID: 0x0005, Name: GF_STATUS, Type: 63=(Unknown: Messstellen Status)
-02 00 05 63 00 00 19 c4 2f
-// ID: 0x0006, Name: GF_NAME, Type: 47=Label, Code: 0x0019, Length: 9, Text: PT09AMBM1
-02 00 06 47 00 19 00 09 00 50 00 54 00 30 00 39 00 41 00 4d 00 42 00 4d 00 31 00 00
-// ID: 0x0007, Name: DYN_BESCH1, Type: 47=Label, Code: 0x0007, Length: 0, Text:
-02 00 07 47 00 07 00 00 00 00
-// ID: 0x0008, Name: A/BA, Type: 05=(Boolean?), Value: False
-02 00 08 05 00
-// ID: 0x0009, Name: A/A3, Type: 05=(Boolean?), Value: True
-02 00 09 05 01
-// ID: 0x000a, Name: BESCH1, Type: 47=Label, Code: 0x0009, Length: 1, Text: P
-02 00 0a 47 00 09 00 01 00 50 00 00
-// ID: 0x000b, Name: A/A2, Type: 05=(Boolean?), Value: True
-02 00 0b 05 01
-// ID: 0x000c, Name: A/BA_GFES_AUTO, Type: 01=(Boolean?), Value: False
-02 00 0c 01 00
-- 01 00 00 00 00 00 35 01 3c 04 93 17 bc
-// ID: 0x0000, Name: ALARMS, Type: 76=Alarms (Contains Data-Structure directly related to alarms)
-02 00 00 76 00 76 05 01 01 00 00 00 0e 00 47 00 46 00 45 00 5f 00 56 00 45 00 52 00 52 00 49 00 45 00 47 00 45 00 4c 00 54 00 00 00 54 00 54 00 07 00 00 2a f1 c6 c5 46 ef ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00
-// ID: 0x0001, Name: A/IST_FW_KURZ, Type: 47=Label, Code: 0x0017, Length: 8, Text: Keine FW
-02 00 01 47 00 17 00 08 00 4b 00 65 00 69 00 6e 00 65 00 20 00 46 00 57 00 00
-// ID: 0x0002, Name: A/BA, Type: 05=(Boolean?), Value: False
-02 00 02 05 00
-// ID: 0x0003, Name: A/A2, Type: 05=(Boolean?), Value: False
-02 00 03 05 00
-// ID: 0x0004, Name: GF_STATUS, Type: 63=(Unknown: Messstellen Status)
-02 00 04 63 00 00 19 c4 2f
-// ID: 0x0005, Name: A/A1, Type: 05=(Boolean?), Value: False
-02 00 05 05 00
-- 01
-
-49 ad
-```
-
-== 0x1B01
-
-```
-fa ce 05 7d 00 02 af 0a 00 01 15 e1 54 80 04 00
-
-1b 01 00 00 00 00 00 07 03 6d 01 97 00 04 05 04
-00 08 00 00 00 08 01 78 00 08 02 90 00 08 03 fa
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00
-- 04 96 17 bf 00 38 01 3f 00 00 03 e8
-// A/IST_FW_KURZ
-00 00 00 0d 00 41 00 2f 00 49 00 53 00 54 00 5f 00 46 00 57 00 5f 00 4b 00 55 00 52 00 5a 00 00
-// SKAL1
-00 01 00 05 00 53 00 4b 00 41 00 4c 00 31 00 00
-// ALARMS
-00 02 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
-// SKAL2
-00 03 00 05 00 53 00 4b 00 41 00 4c 00 32 00 00
-// DYN_BESCH2
-00 04 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 32 00 00
-// AKT_SCHRITT
-00 05 00 0b 00 41 00 4b 00 54 00 5f 00 53 00 43 00 48 00 52 00 49 00 54 00 54 00 00
-// A/BA_GFES_AUTO
-00 06 00 0e 00 41 00 2f 00 42 00 41 00 5f 00 47 00 46 00 45 00 53 00 5f 00 41 00 55 00 54 00 4f 00 00
-// A/BA
-00 07 00 04 00 41 00 2f 00 42 00 41 00 00
-// GF_STATUS
-00 08 00 09 00 47 00 46 00 5f 00 53 00 54 00 41 00 54 00 55 00 53 00 00
-// ISTWERT2
-00 09 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 32 00 00
-// GF_NAME
-00 0a 00 07 00 47 00 46 00 5f 00 4e 00 41 00 4d 00 45 00 00
-// BESCH1
-00 0b 00 06 00 42 00 45 00 53 00 43 00 48 00 31 00 00
-// DYN_BESCH1
-00 0c 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 31 00 00
-// BESCH2
-00 0d 00 06 00 42 00 45 00 53 00 43 00 48 00 32 00 00
-// A/GFE_ALARM
-00 0e 00 0b 00 41 00 2f 00 47 00 46 00 45 00 5f 00 41 00 4c 00 41 00 52 00 4d 00 00
-// ISTWERT1
-00 0f 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 31 00 00
-ff ff
-- 04 97 17 c0 00 39 01 40 00 00 03 e8
-// ALARMS
-00 00 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
-// SKAL1
-00 01 00 05 00 53 00 4b 00 41 00 4c 00 31 00 00
-// GF_STATUS
-00 02 00 09 00 47 00 46 00 5f 00 53 00 54 00 41 00 54 00 55 00 53 00 00
-// BESCH1
-00 03 00 06 00 42 00 45 00 53 00 43 00 48 00 31 00 00
-// A/A1
-00 04 00 04 00 41 00 2f 00 41 00 31 00 00
-// A/IST_FW_KURZ
-00 05 00 0d 00 41 00 2f 00 49 00 53 00 54 00 5f 00 46 00 57 00 5f 00 4b 00 55 00 52 00 5a 00 00
-// DYN_BESCH1
-00 06 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 31 00 00
-// GF_NAME
-00 07 00 07 00 47 00 46 00 5f 00 4e 00 41 00 4d 00 45 00 00
-// A/BA
-00 08 00 04 00 41 00 2f 00 42 00 41 00 00
-// A/GFE_ALARM
-00 09 00 0b 00 41 00 2f 00 47 00 46 00 45 00 5f 00 41 00 4c 00 41 00 52 00 4d 00 00
-// A/BA_GFES_AUTO
-00 0a 00 0e 00 41 00 2f 00 42 00 41 00 5f 00 47 00 46 00 45 00 53 00 5f 00 41 00 55 00 54 00 4f 00 00
-// ISTWERT1
-00 0b 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 31 00 00
-ff ff
-- 04 98 17 c1 00 3a 01 41 00 00 03 e8
-// SKAL2
-00 00 00 05 00 53 00 4b 00 41 00 4c 00 32 00 00
-// ISTWERT1
-00 01 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 31 00 00
-// GF_STATUS
-00 02 00 09 00 47 00 46 00 5f 00 53 00 54 00 41 00 54 00 55 00 53 00 00
-// SKAL1
-00 03 00 05 00 53 00 4b 00 41 00 4c 00 31 00 00
-// A/A1
-00 04 00 04 00 41 00 2f 00 41 00 31 00 00
-// ALARMS
-00 05 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
-// A/GFE_ALARM
-00 06 00 0b 00 41 00 2f 00 47 00 46 00 45 00 5f 00 41 00 4c 00 41 00 52 00 4d 00 00
-// GF_NAME
-00 07 00 07 00 47 00 46 00 5f 00 4e 00 41 00 4d 00 45 00 00
-// A/BA
-00 08 00 04 00 41 00 2f 00 42 00 41 00 00
-// DYN_BESCH2
-00 09 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 32 00 00
-// BESCH2
-00 0a 00 06 00 42 00 45 00 53 00 43 00 48 00 32 00 00
-// BESCH1
-00 0b 00 06 00 42 00 45 00 53 00 43 00 48 00 31 00 00
-// ISTWERT2
-00 0c 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 32 00 00
-// A/BA_GFES_AUTO
-00 0d 00 0e 00 41 00 2f 00 42 00 41 00 5f 00 47 00 46 00 45 00 53 00 5f 00 41 00 55 00 54 00 4f 00 00
-// DYN_BESCH1
-00 0e 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 31 00 00
-// A/IST_FW_KURZ
-00 0f 00 0d 00 41 00 2f 00 49 00 53 00 54 00 5f 00 46 00 57 00 5f 00 4b 00 55 00 52 00 5a 00 00
-ff ff
-- 04 99 17 c2 00 3b 01 42 00 00 03 e8
-// BESCH1
-00 00 00 06 00 42 00 45 00 53 00 43 00 48 00 31 00 00
-// SKAL1
-00 01 00 05 00 53 00 4b 00 41 00 4c 00 31 00 00
-// A/BA_GFES_AUTO
-00 02 00 0e 00 41 00 2f 00 42 00 41 00 5f 00 47 00 46 00 45 00 53 00 5f 00 41 00 55 00 54 00 4f 00 00
-// GF_NAME
-00 03 00 07 00 47 00 46 00 5f 00 4e 00 41 00 4d 00 45 00 00
-// A/GFE_ALARM
-00 04 00 0b 00 41 00 2f 00 47 00 46 00 45 00 5f 00 41 00 4c 00 41 00 52 00 4d 00 00
-// A/IST_FW_KURZ
-00 05 00 0d 00 41 00 2f 00 49 00 53 00 54 00 5f 00 46 00 57 00 5f 00 4b 00 55 00 52 00 5a 00 00
-// ALARMS
-00 06 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
-// A/BA
-00 07 00 04 00 41 00 2f 00 42 00 41 00 00
-// GF_STATUS
-00 08 00 09 00 47 00 46 00 5f 00 53 00 54 00 41 00 54 00 55 00 53 00 00
-// DYN_BESCH1
-00 09 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 31 00 00
-// ISTWERT1
-00 0a 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 31 00 00
-ff ff
-- 04
-
-b2 c7
-```
-
-== 0xB102
-
-```
-fa ce 04 b6 00 02 33 49 00 0b 63 bb 54 80 04 00
-
-1b 02 00 00 00 00 00 07 03 6d 01 97 00 04 00 00
-00 06 00
-01 00 06 01 51 00 06 02 3c 00 06 03 59
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00
-- 04 00 00 00 00 00 38 01 3f 04 96 17 bf
-02 00 00 47 00 17 00 08 00 4b 00 65 00 69 00 6e 00 65 00 20 00 46 00 57 00 00
-02 00 01 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
-02 00 02 76 00 76 05 01 01 00 00 00 0e 00 47 00 46 00 45 00 5f 00 56 00 45 00 52 00 52 00 49 00 45 00 47 00 45 00 4c 00 54 00 00 00 54 00 54 01 07 00 00 2a f1 c7 82 e4 d8 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00
-02 00 03 24 00 0e 40 20 00 00 00 00 00 00 80 16 03
-02 00 04 47 00 11 00 05 00 4d 00 43 00 50 00 30 00 31 00 00
-02 00 05 47 00 07 00 00 00 00
-02 00 06 01 00
-02 00 07 05 00
-02 00 08 63 00 00 19 c4 2f
-02 00 09 08 3f 89 68 4c
-02 00 0a 47 00 19 00 09 00 50 00 54 00 30 00 39 00 41 00 4e 00 41 00 44 00 31 00 00
-02 00 0b 47 00 09 00 01 00 54 00 00
-02 00 0c 47 00 11 00 05 00 4d 00 43 00 54 00 30 00 31 00 00
-02 00 0d 47 00 09 00 01 00 50 00 00
-02 00 0e 05 01
-02 00 0f 08 42 49 aa aa
-- 01 00 00 00 00 00 39 01 40 04 97 17 c0
-02 00 00 76 00 58 05 01 01 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00
-02 00 01 24 00 0e 41 28 00 00 00 00 00 00 05 45 01
-02 00 02 63 00 00 19 c4 2f
-02 00 03 47 00 09 00 01 00 46 00 00
-02 00 04 05 01
-02 00 05 47 00 17 00 08 00 4b 00 65 00 69 00 6e 00 65 00 20 00 46 00 57 00 00
-02 00 06 47 00 07 00 00 00 00
-02 00 07 47 00 19 00 09 00 50 00 54 00 30 00 39 00 41 00 44 00 42 00 51 00 31 00 00
-02 00 08 05 00
-02 00 09 05 01
-02 00 0a 01 00
-02 00 0b 21 80 00 00 00 00
-- 01 00 00 00 00 00 3a 01 41 04 98 17 c1
-02 00 00 24 00 0e 42 c8 00 00 00 00 00 00 06 34 00
-02 00 01 08 3f 7f ff ff
-02 00 02 63 00 00 19 c4 2f
-02 00 03 24 00 0e 3f 99 99 9a 00 00 00 00 80 16 03
-02 00 04 05 01
-02 00 05 76 00 58 05 01 01 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00
-02 00 06 05 00
-02 00 07 47 00 19 00 09 00 50 00 54 00 30 00 39 00 41 00 44 00 48 00 4f 00 31 00 00
-02 00 08 05 00
-02 00 09 47 00 07 00 00 00 00
-02 00 0a 47 00 07 00 00 00 00
-02 00 0b 47 00 09 00 01 00 50 00 00
-02 00 0c 08 00 00 00 00
-02 00 0d 01 01
-02 00 0e 47 00 0d 00 03 00 56 00 41 00 4b 00 00
-02 00 0f 47 00 17 00 08 00 4b 00 65 00 69 00 6e 00 65 00 20 00 46 00 57 00 00
-- 01 00 00 00 00 00 3b 01 42 04 99 17 c2
-02 00 00 47 00 09 00 01 00 46 00 00
-02 00 01 24 00 0e 41 20 00 00 00 00 00 00 05 45 01
-02 00 02 01 00
-02 00 03 47 00 19 00 09 00 50 00 54 00 30 00 39 00 41 00 41 00 4e 00 4b 00 31 00 00
-02 00 04 05 01
-02 00 05 47 00 17 00 08 00 4b 00 65 00 69 00 6e 00 65 00 20 00 46 00 57 00 00
-02 00 06 76 00 58 05 01 01 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00
-02 00 07 05 00
-02 00 08 63 00 00 19 c4 2f
-02 00 09 47 00 07 00 00 00 00
-02 00 0a 08 00 00 00 00
-- 01
-
-b0 25
-```
-
-== 0xB101
-
-```
-fa ce 05 89 00 02 af 0c 00 01 15 e3 54 80 04 00
-
-1b 01 00 00 00 00 00 07 03 6e 01 98 00 04 05 10
-00 08 00 00 00 08 00 5a 00 08 01 e0 00 08 04 d8
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00
-- 04 93 17 bc 00 35 01 3c 00 00 03 e8
-// A/BA_GFES_AUTO
-00 06 00 0e 00 41 00 2f 00 42 00 41 00 5f 00 47 00 46 00 45 00 53 00 5f 00 41 00 55 00 54 00 4f 00 00
-// A/GFE_ALARM
-00 07 00 0b 00 41 00 2f 00 47 00 46 00 45 00 5f 00 41 00 4c 00 41 00 52 00 4d 00 00
-// A/A3
-00 08 00 04 00 41 00 2f 00 41 00 33 00 00
-ff ff
-- 04 94 17 bd 00 36 01 3d 00 00 03 e8
-// BESCH2
-00 00 00 06 00 42 00 45 00 53 00 43 00 48 00 32 00 00
-// SKAL1
-00 01 00 05 00 53 00 4b 00 41 00 4c 00 31 00 00
-// ALARMS
-00 02 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
-// A/BA_GFES_AUTO
-00 03 00 0e 00 41 00 2f 00 42 00 41 00 5f 00 47 00 46 00 45 00 53 00 5f 00 41 00 55 00 54 00 4f 00 00
-00 04 00 09 00 47 00 46 00 5f 00 53 00 54 00 41 00 54 00 55 00 53 00 00
-// SKAL2
-00 05 00 05 00 53 00 4b 00 41 00 4c 00 32 00 00
-// DYN_BESCH1
-00 06 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 31 00 00
-// A/GFE_ALARM
-00 07 00 0b 00 41 00 2f 00 47 00 46 00 45 00 5f 00 41 00 4c 00 41 00 52 00 4d 00 00
-// DYN_BESCH2
-00 08 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 32 00 00
-// ISTWERT2
-00 09 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 32 00 00
-// A/A1
-00 0a 00 04 00 41 00 2f 00 41 00 31 00 00
-// BESCH1
-00 0b 00 06 00 42 00 45 00 53 00 43 00 48 00 31 00 00
-// GF_NAME
-00 0c 00 07 00 47 00 46 00 5f 00 4e 00 41 00 4d 00 45 00 00
-// A/BA
-00 0d 00 04 00 41 00 2f 00 42 00 41 00 00
-// A/IST_FW_KURZ
-00 0e 00 0d 00 41 00 2f 00 49 00 53 00 54 00 5f 00 46 00 57 00 5f 00 4b 00 55 00 52 00 5a 00 00
-// AKT_SCHRITT
-00 0f 00 0b 00 41 00 4b 00 54 00 5f 00 53 00 43 00 48 00 52 00 49 00 54 00 54 00 00
-// ISTWERT1
-00 10 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 31 00 00
-ff ff
-- 04 95 17 be 00 37 01 3e 00 00 03 e8
-// DYN_ISTWERTE/OUT_FARBE1
-00 00 00 17 00 44 00 59 00 4e 00 5f 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 45 00 2f 00 4f 00 55 00 54 00 5f 00 46 00 41 00 52 00 42 00 45 00 31 00 00
-// DYN_ISTWERTE/OUT_ENABLED2
-00 01 00 19 00 44 00 59 00 4e 00 5f 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 45 00 2f 00 4f 00 55 00 54 00 5f 00 45 00 4e 00 41 00 42 00 4c 00 45 00 44 00 32 00 00
-// GFE_ALARM
-00 02 00 09 00 47 00 46 00 45 00 5f 00 41 00 4c 00 41 00 52 00 4d 00 00
-// DYN_ISTWERTE/BESCH1
-00 03 00 13 00 44 00 59 00 4e 00 5f 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 45 00 2f 00 42 00 45 00 53 00 43 00 48 00 31 00 00
-// GF_STATUS
-00 04 00 09 00 47 00 46 00 5f 00 53 00 54 00 41 00 54 00 55 00 53 00 00
-// DYN_ISTWERTE/BESCH2
-00 05 00 13 00 44 00 59 00 4e 00 5f 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 45 00 2f 00 42 00 45 00 53 00 43 00 48 00 32 00 00
-// IST_FW_KURZ
-00 06 00 0b 00 49 00 53 00 54 00 5f 00 46 00 57 00 5f 00 4b 00 55 00 52 00 5a 00 00
-// ALARMS
-00 07 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
-// DYN_ISTWERTE/DYN_BESCH2
-00 08 00 17 00 44 00 59 00 4e 00 5f 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 45 00 2f 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 32 00 00
-// DYN_ISTWERTE/OUT_FARBE2
-00 09 00 17 00 44 00 59 00 4e 00 5f 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 45 00 2f 00 4f 00 55 00 54 00 5f 00 46 00 41 00 52 00 42 00 45 00 32 00 00
-// DYN_ISTWERTE/OUT_SCALE1
-00 0a 00 17 00 44 00 59 00 4e 00 5f 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 45 00 2f 00 4f 00 55 00 54 00 5f 00 53 00 43 00 41 00 4c 00 45 00 31 00 00
-// BA_GFES_AUTO
-00 0b 00 0c 00 42 00 41 00 5f 00 47 00 46 00 45 00 53 00 5f 00 41 00 55 00 54 00 4f 00 00
-// BA
-00 0c 00 02 00 42 00 41 00 00
-// DYN_ISTWERTE/OUT2
-00 0d 00 11 00 44 00 59 00 4e 00 5f 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 45 00 2f 00 4f 00 55 00 54 00 32 00 00
-// DYN_ISTWERTE/OUT_SCALE2
-00 0e 00 17 00 44 00 59 00 4e 00 5f 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 45 00 2f 00 4f 00 55 00 54 00 5f 00 53 00 43 00 41 00 4c 00 45 00 32 00 00
-// DYN_ISTWERTE/OUT_ENABLED1
-00 0f 00 19 00 44 00 59 00 4e 00 5f 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 45 00 2f 00 4f 00 55 00 54 00 5f 00 45 00 4e 00 41 00 42 00 4c 00 45 00 44 00 31 00 00
-// DYN_BEZ
-00 10 00 07 00 44 00 59 00 4e 00 5f 00 42 00 45 00 5a 00 00
-// DYN_ISTWERTE/OUT1
-00 11 00 17 00 44 00 59 00 4e 00 5f 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 45 00 2f 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 31 00 00
-// DYN_ISTWERTE/OUT1
-00 12 00 11 00 44 00 59 00 4e 00 5f 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 45 00 2f 00 4f 00 55 00 54 00 31 00 00
-ff ff
-- 04 9a 17 c3 00 3c 01 43 00 00 03 e8
-// ALARMS
-00 00 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
-// GF_STATUS
-00 01 00 09 00 47 00 46 00 5f 00 53 00 54 00 41 00 54 00 55 00 53 00 00
-ff ff
-- 04
-
-ea 72
-```
-
-== 0xB102
-
-```
-fa ce 03 6c 00 02 33 4b 00 0b 63 bd 54 80 04 00
-1b 02 00 00 00 01 00 07 03 6e 01 98 00 04 00 00
-00 06 00 01 00 06 00 1d 00 06 01 52 00 06 02 83
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00
-- 04 00 00 00 00 00 35 01 3c 04 93 17 bc
-02 00 06 01 00
-02 00 07 05 01
-02 00 08 05 01
-- 01 00 00 00 00 00 36 01 3d 04 94 17 bd
-02 00 00 47 00 09 00 01 00 50 00 00
-02 00 01 24 00 0e 45 35 40 00 00 00 00 00 82 dc 00
-02 00 02 76 00 58 05 01 01 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00
-02 00 03 01 01
-02 00 04 63 00 00 19 c4 2f
-02 00 05 24 00 0e 43 c8 00 00 c2 c8 00 00 82 dd 01
-02 00 06 47 00 07 00 00 00 00
-02 00 07 05 01
-02 00 08 47 00 11 00 05 00 44 00 52 00 55 00 43 00 4b 00 00
-02 00 09 21 88 c2 20 00 00
-02 00 0a 05 01
-02 00 0b 47 00 09 00 01 00 53 00 00
-02 00 0c 47 00 19 00 09 00 50 00 54 00 30 00 39 00 41 00 44 00 47 00 4f 00 31 00 00
-02 00 0d 05 00
-02 00 0e 47 00 17 00 08 00 4b 00 65 00 69 00 6e 00 65 00 20 00 46 00 57 00 00
-02 00 0f 47 00 0d 00 03 00 41 00 75 00 73 00 00
-02 00 10 21 80 00 00 00 00
-- 01 00 00 00 00 00 37 01 3e 04 95 17 be
-02 00 00 05 00
-02 00 01 01 01
-02 00 02 05 00
-02 00 03 47 00 09 00 01 00 54 00 00
-02 00 04 63 00 00 19 c4 2f
-02 00 05 47 00 09 00 01 00 54 00 00
-02 00 06 63 64 00 19 b9 88
-02 00 07 76 00 6a 05 01 01 00 00 00 08 00 53 00 54 00 4f 00 45 00 52 00 55 00 4e 00 47 00 00 00 39 00 39 00 0f 00 00 2a f1 c6 c4 7a 4f ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00
-02 00 08 47 00 0b 00 02 00 52 00 4c 00 00
-02 00 09 05 00
-02 00 0a 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
-02 00 0b 01 00
-02 00 0c 05 00
-02 00 0d 08 41 a0 8e 39
-02 00 0e 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
-02 00 0f 01 01
-02 00 10 47 00 19 00 09 00 50 00 54 00 30 00 39 00 41 00 4c 00 42 00 43 00 31 00 00
-02 00 11 47 00 0b 00 02 00 56 00 4c 00 00
-02 00 12 08 41 a0 8e 39 01 00 00 00 00 00 3c 01 43 04 9a 17 c3 02 00 00 76 00 58 05 01 01 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 02 00 01 63 00 00 19 c4 2f
-- 01
-
-16 0b
-```
-
-== 0xB101
-
-```
-fa ce 02 a1 00 02 af 0e 00 01 15 e5 54 80 04 00
-
-1b 01 00 00 00 00 00 07 03 6f 01 99 00 04 02 28
-00 08 00 00 00 08 00 7a 00 08 01 84 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00
-- 04 9a 17 c3 00 3c 01 43 00 00 03 e8
-// A/IST_FW_KURZ
-00 02 00 0d 00 41 00 2f 00 49 00 53 00 54 00 5f 00 46 00 57 00 5f 00 4b 00 55 00 52 00 5a 00 00
-// A/BA
-00 03 00 04 00 41 00 2f 00 42 00 41 00 00
-// A/BA_GFES_AUTO
-00 04 00 0e 00 41 00 2f 00 42 00 41 00 5f 00 47 00 46 00 45 00 53 00 5f 00 41 00 55 00 54 00 4f 00 00
-// A/GFE_ALARM
-00 05 00 0b 00 41 00 2f 00 47 00 46 00 45 00 5f 00 41 00 4c 00 41 00 52 00 4d 00 00
-ff ff
-- 04 9b 17 c4 00 3d 01 44 00 00 03 e8
-// GF_STATUS
-00 00 00 09 00 47 00 46 00 5f 00 53 00 54 00 41 00 54 00 55 00 53 00 00
-// ALARMS
-00 01 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
-// BESCH1
-00 02 00 06 00 42 00 45 00 53 00 43 00 48 00 31 00 00
-// SKAL1
-00 03 00 05 00 53 00 4b 00 41 00 4c 00 31 00 00
-// DYN_BESCH1
-00 04 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 31 00 00
-// A/BA_GFES_AUTO
-00 05 00 0e 00 41 00 2f 00 42 00 41 00 5f 00 47 00 46 00 45 00 53 00 5f 00 41 00 55 00 54 00 4f 00 00
-// A/IST_FW_KURZ
-00 06 00 0d 00 41 00 2f 00 49 00 53 00 54 00 5f 00 46 00 57 00 5f 00 4b 00 55 00 52 00 5a 00 00
-// ISTWERT1
-00 07 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 31 00 00
-// A/BA
-00 08 00 04 00 41 00 2f 00 42 00 41 00 00
-// GF_NAME
-00 09 00 07 00 47 00 46 00 5f 00 4e 00 41 00 4d 00 45 00 00
-// A/GFE_ALARM
-00 0a 00 0b 00 41 00 2f 00 47 00 46 00 45 00 5f 00 41 00 4c 00 41 00 52 00 4d 00 00
-ff ff
-- 04 9c 17 c5 00 3e 01 45 00 00 03 e8
-// A/BA_GFES_AUTO
-00 00 00 0e 00 41 00 2f 00 42 00 41 00 5f 00 47 00 46 00 45 00 53 00 5f 00 41 00 55 00 54 00 4f 00 00
-// GF_STATUS
-00 01 00 09 00 47 00 46 00 5f 00 53 00 54 00 41 00 54 00 55 00 53 00 00
-// A/BA
-00 02 00 04 00 41 00 2f 00 42 00 41 00 00
-// ALARMS
-00 03 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
-// A/IST_FW_KURZ
-00 04 00 0d 00 41 00 2f 00 49 00 53 00 54 00 5f 00 46 00 57 00 5f 00 4b 00 55 00 52 00 5a 00 00
-// A/GFE_ALARM
-00 05 00 0b 00 41 00 2f 00 47 00 46 00 45 00 5f 00 41 00 4c 00 41 00 52 00 4d 00 00
-ff ff
-- 03
-
-7d 1c
-```
-
-== 0xB102
-
-```
-fa ce 02 4d 00 02 33 4e 00 0b 63 c0 54 80 04 00
-
-1b 02 00 00 00 00 00 07 03 6f 01 99 00 04 00 00
-00 06 00 01 00 06 00 37 00 06 01 3b 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00
-- 03 00 00 00 00 00 3c 01 43 04 9a 17 c3
-02 00 02 47 00 17 00 08 00 4b 00
-65 00 69 00 6e 00 65 00 20 00 46 00 57 00 00
-02 00 03 05 00
-02 00 04 01 00
-02 00 05 05 01
-- 01 00 00 00 00 00 3d 01 44 04 9b 17 c4
-02 00 00 63 00 00 19 c4 2f
-02 00 01 76 00 76 05 01 01 00 00 00 0e 00 47 00 46 00 45 00 5f 00 56 00 45 00 52 00 52 00 49 00 45 00 47 00 45 00 4c 00 54 00 00 00 54 00 54 00 07 00 00 2a f1 c6 c4 e1 1f ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00
-02 00 02 47 00 09 00 01 00 53 00 00
-02 00 03 24 00 0e 41 20 00 00 00 00 00 00 82 dc 02
-02 00 04 47 00 07 00 00 00 00
-02 00 05 01 00
-02 00 06 47 00 17 00 08 00 4b 00 65 00 69 00 6e 00 65 00 20 00 46 00 57 00 00
-02 00 07 21 80 00 00 00 00
-02 00 08 05 00
-02 00 09 47 00 19 00 09 00 50 00 54 00 30 00 39 00 41 00 48 00 45 00 44 00 31 00 00
-02 00 0a 05 01
-- 01 00 00 00 00 00 3e 01 45 04 9c 17 c5
-02 00 00 01 00
-02 00 01 63 00 00 19 c4 2f
-02 00 02 05 00
-02 00 03 76 00 58 05 01 01 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00
-02 00 04 47 00 17 00 08 00 4b 00 65 00 69 00 6e 00 65 00 20 00 46 00 57 00 00
-02 00 05 05 01
-- 01
-
-6d cc
-```
-
-== 0x0403 (after registration)
-
-```
-fa ce 02 a5 00 02 33 50 00 0b 63 cb 54 80 04 00
-
-04 03 00 00 00 01 00 52 00 00 00 00 00 00 00 00
-00 04 00 00 00 08 00 01 00 00 00 00
-- 05 04 8f 17 b8 00 32 01 39 04 90 17 b9
-02 00 01 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
-02 00 03 08 00 00 00 00
-02 00 0a 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
-02 00 0d 08 42 49 aa aa
-02 00 0f 21 80 42 49 aa aa
-02 00 11 24 00 0e 42 a0 00 00 00 00 00 00 03 e8 01
-- 01 00 33 01 3a 04 91 17 ba
-02 00 02 08 41 0e c7 1c
-02 00 05 24 00 0e 42 c8 00 00 00 00 00 00 04 40 00
-02 00 08 24 00 0e 42 c8 00 00 00 00 00 00 04 40 00
-02 00 09 24 00 0e 41 20 00 00 00 00 00 00 05 45 01
-02 00 0a 08 ba 48 00 00
-02 00 0c 08 00 00 00 00
-- 01 00 34 01 3b 04 92 17 bb
-02 00 00 21 88 3b 23 d8 00
-02 00 03 24 00 0e 3f 80 00 00 bf 80 00 00 82 df 03
-- 01 00 38 01 3f 04 96 17 bf
-02 00 01 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
-02 00 02 76 00 76 05 01 01 00 00 00 0e 00 47 00 46 00 45 00 5f 00 56 00 45 00 52 00 52 00 49 00 45 00 47 00 45 00 4c 00 54 00 00 00 54 00 54 01 07 00 00 2a f1 c7 82 e4 d8 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00
-02 00 03 24 00 0e 40 20 00 00 00 00 00 00 80 16 03
-02 00 09 08 3f 89 68 4c
-02 00 0f 08 42 49 aa aa
-- 01 00 39 01 40 04 97 17 c0
-02 00 01 24 00 0e 41 28 00 00 00 00 00 00 05 45 01
-02 00 0b 21 80 00 00 00 00
-- 01 00 3a 01 41 04 98 17 c1
-02 00 00 24 00 0e 42 c8 00 00 00 00 00 00 06 34 00
-02 00 01 08 3f 7f ff ff
-02 00 03 24 00 0e 3f 99 99 9a 00 00 00 00 80 16 03
-02 00 0c 08 00 00 00 00
-- 01 00 3b 01 42 04 99 17 c2
-02 00 01 24 00 0e 41 20 00 00 00 00 00 00 05 45 01
-02 00 0a 08 00 00 00 00
-- 01 00 36 01 3d 04 94 17 bd
-02 00 01 24 00 0e 45 35 40 00 00 00 00 00 82 dc 00
-02 00 05 24 00 0e 43 c8 00 00 c2 c8 00 00 82 dd 01
-02 00 07 05 01
-02 00 09 21 88 c2 20 00 00
-02 00 10 21 80 00 00 00 00
-- 01 00 37 01 3e 04 95 17 be
-02 00 06 63 64 00 19 b9 88
-02 00 0c 05 00
-- 01 00 3d 01 44 04 9b 17 c4
-02 00 03 24 00 0e 41 20 00 00 00 00 00 00 82 dc 02
-02 00 07 21 80 00 00 00 00
-- 01 00 00 00 00 00 00 00 00
-
-be ff
-```
-
-```
-fa ce 02 27 00 02 33 55 00 0b 63 df 54 80 04 00
-
-04 03 00 00 00 00 00 52 00 00 00 00 00 00 00 00
-00 04 00 00 00 08 00 01 00 00 00 00
-- 06 04 8f 17 b8 00 32 01 39 04 90 17 b9
-02 00 01 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
-02 00 03 08 00 00 00 00
-02 00 0a 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
-02 00 0d 08 42 49 aa aa
-02 00 0f 21 80 42 49 aa aa
-02 00 11 24 00 0e 42 a0 00 00 00 00 00 00 03 e8 01
-- 01 00 33 01 3a 04 91 17 ba
-02 00 02 08 41 0e c7 1c
-02 00 05 24 00 0e 42 c8 00 00 00 00 00 00 04 40 00
-02 00 08 24 00 0e 42 c8 00 00 00 00 00 00 04 40 00
-02 00 09 24 00 0e 41 20 00 00 00 00 00 00 05 45 01
-02 00 0a 08 ba 48 00 00
-02 00 0c 08 00 00 00 00
-- 01 00 34 01 3b 04 92 17 bb
-02 00 00 21 88 3b 23 d8 00
-02 00 03 24 00 0e 3f 80 00 00 bf 80 00 00 82 df 03
-- 01 00 38 01 3f 04 96 17 bf
-02 00 01 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
-02 00 03 24 00 0e 40 20 00 00 00 00 00 00 80 16 03
-02 00 09 08 3f 89 68 4c
-02 00 0f 08 42 49 aa aa
-- 01 00 39 01 40 04 97 17 c0
-02 00 01 24 00 0e 41 28 00 00 00 00 00 00 05 45 01
-02 00 0b 21 80 00 00 00 00 01 00 3a 01 41 04 98 17 c1
-02 00 00 24 00 0e 42 c8 00 00 00 00 00 00 06 34 00
-02 00 01 08 3f 7f ff ff
-02 00 03 24 00 0e 3f 99 99 9a 00 00 00 00 80 16 03
-02 00 0c 08 00 00 00 00
-- 01 00 3b 01 42 04 99 17 c2
-02 00 01 24 00 0e 41 20 00 00 00 00 00 00 05 45 01
-02 00 0a 08 00 00 00 00 01 00 36 01 3d 04 94 17 bd
-02 00 01 24 00 0e 45 35 40 00 00 00 00 00 82 dc 00
-02 00 05 24 00 0e 43 c8 00 00 c2 c8 00 00 82 dd 01
-02 00 09 21 88 c2 20 00 00
-02 00 10 21 80 00 00 00 00
-- 01 00 37 01 3e 04 95 17 be
-02 00 06 63 64 00 19 b9 88
-02 00 0c 05 00 01 00 3d 01 44 04 9b 17 c4
-02 00 03 24 00 0e 41 20 00 00 00 00 00 00 82 dc 02
-02 00 07 21 80 00 00 00 00
-- 01 00 00 00 00 00 00 00 00
-
-51 1a
-```
-
-```
-fa ce 02 27 00 02 33 5e 00 0b 63 f3 54 80 04 00
-04 03 00 00 00 00 00 52 00 00 00 00 00 00 00 00
-00 04 00 00 00 08 00 01 00 00 00 00 07 04 8f 17
-b8 00 32 01 39 04 90 17 b9 02 00 01 24 00 0e 43
-48 00 00 c2 20 00 00 03 e9 01 02 00 03 08 bd 8e
-38 00 02 00 0a 24 00 0e 43 48 00 00 c2 20 00 00
-03 e9 01 02 00 0d 08 42 49 63 8e 02 00 0f 21 80
-42 49 aa aa 02 00 11 24 00 0e 42 a0 00 00 00 00
-00 00 03 e8 01 01 00 33 01 3a 04 91 17 ba 02 00
-02 08 41 0e c7 1c 02 00 05 24 00 0e 42 c8 00 00
-00 00 00 00 04 40 00 02 00 08 24 00 0e 42 c8 00
-00 00 00 00 00 04 40 00 02 00 09 24 00 0e 41 20
-00 00 00 00 00 00 05 45 01 02 00 0a 08 ba 48 00
-00 02 00 0c 08 00 00 00 00 01 00 34 01 3b 04 92
-17 bb 02 00 00 21 88 3b 23 d8 00 02 00 03 24 00
-0e 3f 80 00 00 bf 80 00 00 82 df 03 01 00 38 01
-3f 04 96 17 bf 02 00 01 24 00 0e 43 48 00 00 c2
-20 00 00 03 e9 01 02 00 03 24 00 0e 40 20 00 00
-00 00 00 00 80 16 03 02 00 09 08 3f 89 68 4c 02
-00 0f 08 42 49 aa aa 01 00 39 01 40 04 97 17 c0
-02 00 01 24 00 0e 41 28 00 00 00 00 00 00 05 45
-01 02 00 0b 21 80 00 00 00 00 01 00 3a 01 41 04
-98 17 c1 02 00 00 24 00 0e 42 c8 00 00 00 00 00
-00 06 34 00 02 00 01 08 3f 7f ff ff 02 00 03 24
-00 0e 3f 99 99 9a 00 00 00 00 80 16 03 02 00 0c
-08 00 00 00 00 01 00 3b 01 42 04 99 17 c2 02 00
-01 24 00 0e 41 20 00 00 00 00 00 00 05 45 01 02
-00 0a 08 00 00 00 00 01 00 36 01 3d 04 94 17 bd
-02 00 01 24 00 0e 45 35 40 00 00 00 00 00 82 dc
-00 02 00 05 24 00 0e 43 c8 00 00 c2 c8 00 00 82
-dd 01 02 00 09 21 88 c2 20 00 00 02 00 10 21 80
-00 00 00 00 01 00 37 01 3e 04 95 17 be 02 00 06
-63 64 00 19 b9 88 02 00 0c 05 00 01 00 3d 01 44
-04 9b 17 c4 02 00 03 24 00 0e 41 20 00 00 00 00
-00 00 82 dc 02 02 00 07 21 80 00 00 00 00 01 00
-00 00 00 00 00 00 00 39 bd
-```
-
-
-== After opening a detail dialog
-
-== 0xB101
-
-```
-fa ce 01 3f 00 02 af b9 00 01 18 62 54 80 04 00
-
-1b 01 00 00 00 00 00 07 03 ac 01 d6 00 04 00 c6
-00 08 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00
-- 04 90 17 b9 00 32 01 39 00 00 03 e8
-// A/ALA_T9002_Y/SCHRITTTEXT_ALT
-00 13 00 1d 00 41 00 2f 00 41 00 4c 00 41 00 5f 00 54 00 39 00 30 00 30 00 32 00 5f 00 59 00 2f 00 53 00 43 00 48 00 52 00 49 00 54 00 54 00 54 00 45 00 58 00 54 00 5f 00 41 00 4c 00 54 00 00
-// DESC
-00 14 00 04 00 44 00 45 00 53 00 43 00 00
-// A/ALA_T9002_Y/RESTZEIT
-00 15 00 16 00 41 00 2f 00 41 00 4c 00 41 00 5f 00 54 00 39 00 30 00 30 00 32 00 5f 00 59 00 2f 00 52 00 45 00 53 00 54 00 5a 00 45 00 49 00 54 00 00
-// A/ALA_T9002_Y/SCHRITTTEXT
-00 16 00 19 00 41 00 2f 00 41 00 4c 00 41 00 5f 00 54 00 39 00 30 00 30 00 32 00 5f 00 59 00 2f 00 53 00 43 00 48 00 52 00 49 00 54 00 54 00 54 00 45 00 58 00 54 00 00
-ff ff
-- 01
-d8 bf
-```
-
-== 0xB102
-
-```
-fa ce 01 01 00 02 34 ae 00 0b 66 db 54 80 04 00
-
-1b 02 00 00 00 00 00 07 03 ac 01 d6 00 04 00 00
-00 06 00 01 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00
-- 01 00 00 00 00 00 32 01 39 04 90 17 b9
-02 00 13 47 00 4b 00 22 00 49 00 6e 00 69 00 74 00 69 00 61 00 6c 00 69 00 73 00 69 00 65 00 72 00 75 00 6e 00 67 00 20 00 2e 00 2e 00 2e 00 2e 00 2e 00 20 00 62 00 69 00 74 00 74 00 65 00 20 00 77 00 61 00 72 00 74 00 65 00 6e 00 00
-03 00 14 00 00 00 1f
-02 00 15 03 00 00
-02 00 16 47 00 1d 00 0b 00 57 00 41 00 52 00 54 00 45 00 4e 00 20 00 2e 00 2e 00 2e 00 20 00 00
-- 01
-
-e0 99
-```
-
-== 0xB101
-
-```
-fa ce 05 7d 00 02 af bb 00 01 18 66 54 80 04 00
-
-1b 01 00 00 00 00 00 07 03 ad 01 d7 00 04 05 04
-00 08 00 00 00 08 00 8c 00 08 01 38 00 08 01 e4
-00 08 03 64 00 08 04 10 00 08 04 b8 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00
-- 04 9d 17 c6 00 3f 01 46 00 00 03 e8
-// ALARMS
-00 00 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
-// C/DC1/PV_D
-00 01 00 0a 00 43 00 2f 00 44 00 43 00 31 00 2f 00 50 00 56 00 5f 00 44 00 00
-// SIM_AKT
-00 02 00 07 00 53 00 49 00 4d 00 5f 00 41 00 4b 00 54 00 00
-// C/BA
-00 03 00 04 00 43 00 2f 00 42 00 41 00 00
-// FREIGABE
-00 04 00 08 00 46 00 52 00 45 00 49 00 47 00 41 00 42 00 45 00 00
-// BAD_ACTIVE
-00 05 00 0a 00 42 00 4100 44 00 5f 00 41 00 43 00 54 00 49 00 56 00 45 00 00
-ff ff
-- 04 9e 17 c7 00 40 01 47 00 00 03 e8
-// C/IST
-00 00 00 05 00 43 00 2f 00 49 00 53 00 54 00 00
-// X_SCALE
-00 01 00 07 00 58 00 5f 00 53 00 43 00 41 00 4c 00 45 00 00
-// SIM_AKT
-00 02 00 07 00 53 00 49 00 4d 00 5f 00 41 00 4b 00 54 00 00
-// ALARMS
-00 03 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
-// BILD_TXT
-00 04 00 08 00 42 00 49 00 4c 00 44 00 5f 00 54 00 58 00 54 00 00
-// C/BA
-00 05 00 04 00 43 00 2f 00 42 00 41 00 00
-// BAD_ACTIVE
-00 06 00 0a 00 42 00 41 00 44 00 5f 00 41 00 43 00 54 00 49 00 56 00 45 00 00
-// C/PV_DYN
-00 07 00 08 00 43 00 2f 00 50 00 56 00 5f 00 44 00 59 00 4e 00 00
-ff ff
-- 04 9f 17 c8 00 41 01 48 00 00 03 e8
-// BAD_ACTIVE
-00 00 00 0a 00 42 00 41 00 44 00 5f 00 41 00 43 00 54 00 49 00 56 00 45 00 00
-// C/PV_DYN
-00 01 00 08 00 43 00 2f 00 50 00 56 00 5f 00 44 00 59 00 4e 00 00
-// C/IST
-00 02 00 05 00 43 00 2f 00 49 00 53 00 54 00 00
-// X_SCALE
-00 03 00 07 00 58 00 5f 00 53 00 43 00 41 00 4c 00 45 00 00
-// ALARMS
-00 04 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
-// SIM_AKT
-00 05 00 07 00 53 00 49 00 4d 00 5f 00 41 00 4b 00 54 00 00
-// BILD_TXT
-00 06 00 08 00 42 00 49 00 4c 00 44 00 5f 00 54 00 58 00 54 00 00
-// C/BA
-00 07 00 04 00 43 00 2f 00 42 00 41 00 00
-ff ff
-- 04 a0 17 c9 00 42 01 49 00 00 03 e8
-// ALARMS
-00 00 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
-// YAW_MAX
-00 01 00 07 00 59 00 41 00 57 00 5f 00 4d 00 41 00 58 00 00
-// C/AUT_MODUS
-00 02 00 0b 00 43 00 2f 00 41 00 55 00 54 00 5f 00 4d 00 4f 00 44 00 55 00 53 00 00
-// C/FREIGABE
-00 03 00 0a 00 43 00 2f 00 46 00 52 00 45 00 49 00 47 00 41 00 42 00 45 00 00
-// C/PV_DYN
-00 04 00 08 00 43 00 2f 00 50 00 56 00 5f 00 44 00 59 00 4e 00 00
-// X
-00 05 00 01 00 58 00 00
-// SIM_AKT
-00 06 00 07 00 53 00 49 00 4d 00 5f 00 41 00 4b 00 54 00 00
-// C/PI/PV_SCALE
-00 07 00 0d 00 43 00 2f 00 50 00 49 00 2f 00 50 00 56 00 5f 00 53 00 43 00 41 00 4c 00 45 00 00
-// BILD_TXT
-00 08 00 08 00 42 00 49 00 4c 00 44 00 5f 00 54 00 58 00 54 00 00
-// YAW_MIN
-00 09 00 07 00 59 00 41 00 57 00 5f 00 4d 00 49 00 4e 00 00
-// C/KASKMOD
-00 0a 00 09 00 43 00 2f 00 4b 00 41 00 53 00 4b 00 4d 00 4f 00 44 00 00
-// C/W_WORK
-00 0b 00 08 00 43 00 2f 00 57 00 5f 00 57 00 4f 00 52 00 4b 00 00
-// X_SCALE
-00 0c 00 07 00 58 00 5f 00 53 00 43 00 41 00 4c 00 45 00 00
-// C/PI/OUT
-00 0d 00 08 00 43 00 2f 00 50 00 49 00 2f 00 4f 00 55 00 54 00 00
-// C/OP_MODUS
-00 0e 00 0a 00 43 00 2f 00 4f 00 50 00 5f 00 4d 00 4f 00 44 00 55 00 53 00 00
-// BAD_ACTIVE
-00 0f 00 0a 00 42 00 41 00 44 00 5f 00 41 00 43 00 54 00 49 00 56 00 45 00 00
-// C/BA
-00 10 00 04 00 43 00 2f 00 42 00 41 00 00
-ff ff
-- 04 a1 17 ca 00 43 01 4a 00 00 03 e8
-// C/BA
-00 00 00 04 00 43 00 2f 00 42 00 41 00 00
-// ALARMS
-00 01 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
-// BAD_ACTIVE
-00 02 00 0a 00 42 00 41 00 44 00 5f 00 41 00 43 00 54 00 49 00 56 00 45 00 00
-// C/PV_DYN
-00 03 00 08 00 43 00 2f 00 50 00 56 00 5f 00 44 00 59 00 4e 00 00
-// C/PV_DYN
-00 04 00 05 00 43 00 2f 00 49 00 53 00 54 00 00
-// X_SCALE
-00 05 00 07 00 58 00 5f 00 53 00 43 00 41 00 4c 00 45 00 00
-// SIM_AKT
-00 06 00 07 00 53 00 49 00 4d 00 5f 00 41 00 4b 00 54 00 00
-// BILD_TXT
-00 07 00 08 00 42 00 49 00 4c 00 44 00 5f 00 54 00 58 00 54 00 00
-ff ff
-- 04 a2 17 cb 00 44 01 4b 00 00 03 e8
-// ALARMS
-00 00 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
-// C/RC_AUF
-00 01 00 08 00 43 00 2f 00 52 00 43 00 5f 00 41 00 55 00 46 00 00
-// Y
-00 02 00 01 00 59 00 00
-// BAD_ACTIVE
-00 03 00 0a 00 42 00 41 00 44 00 5f 00 41 00 43 00 54 00 49 00 56 00 45 00 00
-// C/BA
-00 04 00 04 00 43 00 2f 00 42 00 41 00 00
-// C/FREIGABE
-00 05 00 0a 00 43 00 2f 00 46 00 52 00 45 00 49 00 47 00 41 00 42 00 45 00 00
-// C/RC_ZU
-00 06 00 07 00 43 00 2f 00 52 00 43 00 5f 00 5a 00 55 00 00
-// SIM_AKT
-00 07 00 07 00 53 00 49 00 4d 00 5f 00 41 00 4b 00 54 00 00
-ff ff
-- 04 a3 17 cc 00 45 01 4c 00 00 03 e8
-// C/RC_AUF
-00 00 00 08 00 43 00 2f 00 52 00 43 00 5f 00 41 00 55 00 46 00 00
-// BAD_ACTIVE
-00 01 00 0a 00 42 00 41 00 44 00 5f 00 41 00 43 00 54 00 49 00 56 00 45 00 00
-// C/BA
-00 02 00 04 00 43 00 2f 00 42 00 41 00 00
-ff ff
-- 07
-
-22 05
-```
-
-== 0xB102
-
-```
-fa ce 04 e1 00 02 34 b0 00 0b 66 df 54 80 04 00
-1b 02 00 00 00 00 00 07 03 ad 01 d7 00 04 00 00
-00 06 00 01 00 06 00 94 00 06 01 37 00 06 02 00
-00 06 02 f5 00 06 03 98 00 06 04 4d 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 07 00 00 00 00 00 3f 01
-46 04 9d 17 c6 02 00 00 76 00 66 05 01 01 00 00
-00 06 00 46 00 45 00 48 00 4c 00 45 00 52 00 00
-00 3b 00 3b 01 0d 00 00 2a f2 70 c7 be 79 ff ff
-00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff
-00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff
-00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff
-00 00 00 00 00 ff 00 00 00 00 00 00 00 00 02 00
-01 63 00 7c 0d a6 a2 02 00 02 01 00 02 00 03 05
-01 02 00 04 01 01 02 00 05 01 00 01 00 00 00 00
-00 40 01 47 04 9e 17 c7 02 00 00 08 42 48 d5 53
-02 00 01 24 00 0e 43 48 00 00 c2 20 00 00 03 e9
-01 02 00 02 01 00 02 00 03 76 00 58 05 01 01 00
-00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00
-00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00
-00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00
-00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00
-00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00
-00 02 00 04 47 00 0b 00 02 00 54 00 49 00 00 02
-00 05 05 01 02 00 06 01 00 02 00 07 01 00 01 00
-00 00 00 00 41 01 48 04 9f 17 c8 02 00 00 01 00
-02 00 01 01 01 02 00 02 08 00 00 00 00 02 00 03
-24 00 0e 41 a0 00 00 00 00 00 00 05 45 01 02 00
-04 76 00 7e 05 01 01 00 00 00 07 00 4d 00 49 00
-4e 00 5f 00 41 00 4c 00 4d 00 00 00 32 00 32 01
-0d 00 00 2a f2 70 c7 21 f3 00 0a 00 4d 00 49 00
-4e 00 5f 00 53 00 43 00 48 00 41 00 4c 00 54 00
-00 00 36 00 36 00 03 00 00 2a f2 70 c7 21 f6 ff
-ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff
-ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff
-ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 02
-00 05 01 00 02 00 06 47 00 0b 00 02 00 46 00 49
-00 00 02 00 07 05 01 01 00 00 00 00 00 42 01 49
-04 a0 17 c9 02 00 00 76 00 58 05 01 01 00 00 ff
-ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff
-ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff
-ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff
-ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff
-ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 02
-00 01 08 42 c8 00 00 02 00 02 63 00 00 19 c9 9c
-02 00 03 48 80 01 02 00 04 01 00 02 00 05 21 80
-42 49 1c 72 02 00 06 01 00 02 00 07 24 00 0e 43
-48 00 00 c2 20 00 00 03 e9 01 02 00 08 47 00 0d
-00 03 00 54 00 49 00 43 00 00 02 00 09 08 00 00
-00 00 02 00 0a 01 00 02 00 0b 08 42 49 1c 72 02
-00 0c 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
-02 00 0d 21 c3 42 17 aa ab 02 00 0e 63 00 00 19
-9c 7b 02 00 0f 01 00 02 00 10 05 01 01 00 00 00
-00 00 43 01 4a 04 a1 17 ca 02 00 00 05 01 02 00
-01 76 00 58 05 01 01 00 00 ff ff 00 00 00 00 00
-ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00
-ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00
-ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00
-ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00
-ff 00 00 00 00 00 00 00 00 02 00 02 01 00 02 00
-03 01 00 02 00 04 08 42 49 1c 72 02 00 05 24 00
-0e 43 48 00 00 c2 20 00 00 03 e9 01 02 00 06 01
-00 02 00 07 47 00 0b 00 02 00 54 00 49 00 00 01
-00 00 00 00 00 44 01 4b 04 a2 17 cb 02 00 00 76
-00 7e 05 01 01 00 00 00 0a 00 4d 00 41 00 58 00
-5f 00 53 00 43 00 48 00 41 00 4c 00 54 00 00 00
-2e 00 2e 00 03 00 00 2a f2 71 9b 0f 2c 00 07 00
-4d 00 41 00 58 00 5f 00 41 00 4c 00 4d 00 00 00
-29 00 29 00 03 00 00 2a f2 71 9b 0f 2b ff ff 00
-00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00
-00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00
-00 00 00 00 ff 00 00 00 00 00 00 00 00 02 00 01
-01 00 02 00 02 21 80 3c ce e0 00 02 00 03 01 00
-02 00 04 05 01 02 00 05 01 01 02 00 06 01 01 02
-00 07 01 00 01 00 00 00 00 00 45 01 4c 04 a3 17
-cc 02 00 00 01 00 02 00 01 01 00 02 00 02 05 01
-01 42 c5
-```
-
-== 0xB101
-
-```
-fa ce 01 bb 00 02 af bc 00 01 18 67 54 80 04 00
-1b 01 00 00 00 00 00 07 03 ae 01 d8 00 04 01 42
-00 08 00 00 00 08 00 a8 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 04 a9 17 d2 00 4b 01 52
-00 00 03 e8 00 00 00 07 00 53 00 49 00 4d 00 5f
-00 41 00 4b 00 54 00 00 00 01 00 06 00 41 00 4c
-00 41 00 52 00 4d 00 53 00 00 00 02 00 08 00 43
-00 2f 00 52 00 43 00 5f 00 41 00 55 00 46 00 00
-00 03 00 0a 00 42 00 41 00 44 00 5f 00 41 00 43
-00 54 00 49 00 56 00 45 00 00 00 04 00 01 00 59
-00 00 00 05 00 04 00 43 00 2f 00 42 00 41 00 00
-00 06 00 0a 00 43 00 2f 00 46 00 52 00 45 00 49
-00 47 00 41 00 42 00 45 00 00 00 07 00 07 00 43
-00 2f 00 52 00 43 00 5f 00 5a 00 55 00 00 ff ff
-04 aa 17 d3 00 4c 01 53 00 00 03 e8 00 00 00 09
-00 47 00 5f 00 5a 00 55 00 53 00 54 00 41 00 4e
-00 44 00 00 00 01 00 04 00 43 00 2f 00 42 00 41
-00 00 00 02 00 06 00 41 00 4c 00 41 00 52 00 4d
-00 53 00 00 00 03 00 08 00 46 00 52 00 45 00 49
-00 47 00 41 00 42 00 45 00 00 00 04 00 08 00 43
-00 2f 00 52 00 43 00 5f 00 41 00 55 00 46 00 00
-00 05 00 07 00 53 00 49 00 4d 00 5f 00 41 00 4b
-00 54 00 00 00 06 00 07 00 43 00 2f 00 52 00 43
-00 5f 00 5a 00 55 00 00 ff ff 02 e7 95
-```
-
-== 0xB102
-
-```
-fa ce 01 bf 00 02 34 b2 00 0b 66 e0 54 80 04 00
-1b 02 00 00 00 00 00 07 03 ae 01 d8 00 04 00 00
-00 06 00 01 00 06 00 be 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 02 00 00 00 00 00 4b 01
-52 04 a9 17 d2 02 00 00 01 00 02 00 01 76 00 86
-05 01 01 00 00 00 0a 00 56 00 45 00 52 00 52 00
-49 00 45 00 47 00 45 00 4c 00 54 00 00 00 54 00
-54 00 04 00 00 2a f2 71 97 40 42 00 0b 00 4d 00
-49 00 4e 00 5f 00 41 00 5f 00 41 00 4c 00 4d 00
-5f 00 59 00 00 00 35 00 35 00 03 00 00 2a f2 71
-96 46 47 ff ff 00 00 00 00 00 ff 00 00 00 00 00
-00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00
-00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00
-00 00 00 02 00 02 01 00 02 00 03 01 00 02 00 04
-21 80 00 00 00 00 02 00 05 05 01 02 00 06 01 00
-02 00 07 01 01 01 00 00 00 00 00 4c 01 53 04 aa
-17 d3 02 00 00 07 00 00 00 00 02 00 01 05 01 02
-00 02 76 00 58 05 01 01 00 00 ff ff 00 00 00 00
-00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00
-00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00
-00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00
-00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00
-00 ff 00 00 00 00 00 00 00 00 02 00 03 01 01 02
-00 04 01 01 02 00 05 01 00 02 00 06 01 00 01 b2
-29
-```
-
-== 0xB101
-
-```
-fa ce 04 a9 00 02 af bd 00 01 18 68 54 80 04 00
-1b 01 00 00 00 00 00 07 03 af 01 d9 00 04 04 30
-00 08 00 00 00 08 00 6a 00 08 00 f0 00 08 02 7a
-00 08 03 00 00 08 03 86 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 04 a3 17 cc 00 45 01 4c
-00 00 03 e8 00 03 00 06 00 41 00 4c 00 41 00 52
-00 4d 00 53 00 00 00 04 00 0a 00 43 00 2f 00 46
-00 52 00 45 00 49 00 47 00 41 00 42 00 45 00 00
-00 05 00 07 00 43 00 2f 00 52 00 43 00 5f 00 5a
-00 55 00 00 00 06 00 01 00 59 00 00 00 07 00 07
-00 53 00 49 00 4d 00 5f 00 41 00 4b 00 54 00 00
-ff ff 04 a4 17 cd 00 46 01 4d 00 00 03 e8 00 00
-00 07 00 49 00 53 00 54 00 57 00 45 00 52 00 54
-00 00 00 01 00 0a 00 42 00 41 00 44 00 5f 00 41
-00 43 00 54 00 49 00 56 00 45 00 00 00 02 00 04
-00 43 00 2f 00 42 00 41 00 00 00 03 00 06 00 41
-00 4c 00 41 00 52 00 4d 00 53 00 00 00 04 00 08
-00 46 00 52 00 45 00 49 00 47 00 41 00 42 00 45
-00 00 00 05 00 07 00 53 00 49 00 4d 00 5f 00 41
-00 4b 00 54 00 00 ff ff 04 a5 17 ce 00 47 01 4e
-00 00 03 e8 00 00 00 07 00 53 00 49 00 4d 00 5f
-00 41 00 4b 00 54 00 00 00 01 00 08 00 42 00 49
-00 4c 00 44 00 5f 00 54 00 58 00 54 00 00 00 02
-00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
-00 03 00 09 00 43 00 2f 00 4b 00 41 00 53 00 4b
-00 4d 00 4f 00 44 00 00 00 04 00 0b 00 43 00 2f
-00 41 00 55 00 54 00 5f 00 4d 00 4f 00 44 00 55
-00 53 00 00 00 05 00 08 00 43 00 2f 00 57 00 5f
-00 57 00 4f 00 52 00 4b 00 00 00 06 00 07 00 58
-00 5f 00 53 00 43 00 41 00 4c 00 45 00 00 00 07
-00 08 00 43 00 2f 00 50 00 49 00 2f 00 4f 00 55
-00 54 00 00 00 08 00 06 00 59 00 2d 00 48 00 45
-00 4c 00 50 00 00 00 09 00 0a 00 42 00 41 00 44
-00 5f 00 41 00 43 00 54 00 49 00 56 00 45 00 00
-00 0a 00 04 00 43 00 2f 00 42 00 41 00 00 00 0b
-00 0a 00 43 00 2f 00 46 00 52 00 45 00 49 00 47
-00 41 00 42 00 45 00 00 00 0c 00 0a 00 43 00 2f
-00 4f 00 50 00 5f 00 4d 00 4f 00 44 00 55 00 53
-00 00 00 0d 00 08 00 43 00 2f 00 50 00 56 00 5f
-00 44 00 59 00 4e 00 00 00 0e 00 01 00 58 00 00
-00 0f 00 09 00 45 00 58 00 54 00 5f 00 54 00 52
-00 41 00 43 00 4b 00 00 00 10 00 0d 00 43 00 2f
-00 50 00 49 00 2f 00 50 00 56 00 5f 00 53 00 43
-00 41 00 4c 00 45 00 00 00 11 00 01 00 59 00 00
-ff ff 04 a6 17 cf 00 48 01 4f 00 00 03 e8 00 00
-00 0a 00 42 00 41 00 44 00 5f 00 41 00 43 00 54
-00 49 00 56 00 45 00 00 00 01 00 04 00 43 00 2f
-00 42 00 41 00 00 00 02 00 06 00 41 00 4c 00 41
-00 52 00 4d 00 53 00 00 00 03 00 08 00 46 00 52
-00 45 00 49 00 47 00 41 00 42 00 45 00 00 00 04
-00 07 00 53 00 49 00 4d 00 5f 00 41 00 4b 00 54
-00 00 00 05 00 07 00 49 00 53 00 54 00 57 00 45
-00 52 00 54 00 00 ff ff 04 a7 17 d0 00 49 01 50
-00 00 03 e8 00 00 00 07 00 53 00 49 00 4d 00 5f
-00 41 00 4b 00 54 00 00 00 01 00 06 00 41 00 4c
-00 41 00 52 00 4d 00 53 00 00 00 02 00 08 00 46
-00 52 00 45 00 49 00 47 00 41 00 42 00 45 00 00
-00 03 00 0a 00 42 00 41 00 44 00 5f 00 41 00 43
-00 54 00 49 00 56 00 45 00 00 00 04 00 04 00 43
-00 2f 00 42 00 41 00 00 00 05 00 07 00 49 00 53
-00 54 00 57 00 45 00 52 00 54 00 00 ff ff 04 a8
-17 d1 00 4a 01 51 00 00 03 e8 00 00 00 07 00 53
-00 49 00 4d 00 5f 00 41 00 4b 00 54 00 00 00 01
-00 07 00 58 00 5f 00 53 00 43 00 41 00 4c 00 45
-00 00 00 02 00 08 00 42 00 49 00 4c 00 44 00 5f
-00 54 00 58 00 54 00 00 00 03 00 04 00 43 00 2f
-00 42 00 41 00 00 00 04 00 06 00 41 00 4c 00 41
-00 52 00 4d 00 53 00 00 00 05 00 09 00 47 00 5f
-00 5a 00 55 00 53 00 54 00 41 00 4e 00 44 00 00
-00 06 00 08 00 43 00 2f 00 50 00 56 00 5f 00 44
-00 59 00 4e 00 00 00 07 00 05 00 43 00 2f 00 49
-00 53 00 54 00 00 ff ff 06 c1 f7
-```
-
-== 0xB102
-
-```
-fa ce 04 82 00 02 34 b3 00 0b 66 e2 54 80 04 00
-1b 02 00 00 00 00 00 07 03 af 01 d9 00 04 00 00
-00 06 00 01 00 06 00 af 00 06 01 42 00 06 02 3d
-00 06 02 d0 00 06 03 63 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 06 00 00 00 00 00 45 01
-4c 04 a3 17 cc 02 00 03 76 00 86 05 01 01 00 00
-00 0a 00 56 00 45 00 52 00 52 00 49 00 45 00 47
-00 45 00 4c 00 54 00 00 00 54 00 54 00 04 00 00
-2a f2 70 d0 7b d3 00 0b 00 4d 00 49 00 4e 00 5f
-00 41 00 5f 00 41 00 4c 00 4d 00 5f 00 59 00 00
-00 35 00 35 00 03 00 00 2a f1 c7 5e 3e a7 ff ff
-00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff
-00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff
-00 00 00 00 00 ff 00 00 00 00 00 00 00 00 02 00
-04 01 00 02 00 05 01 01 02 00 06 21 80 00 00 00
-00 02 00 07 01 00 01 00 00 00 00 00 46 01 4d 04
-a4 17 cd 02 00 00 63 01 7c 0d a6 d7 02 00 01 01
-00 02 00 02 05 01 02 00 03 76 00 66 05 01 01 00
-00 00 06 00 46 00 45 00 48 00 4c 00 45 00 52 00
-00 00 52 00 52 01 0d 00 00 2a f1 c7 f0 48 88 ff
-ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff
-ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff
-ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff
-ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 02
-00 04 01 01 02 00 05 01 00 01 00 00 00 00 00 47
-01 4e 04 a5 17 ce 02 00 00 01 00 02 00 01 47 00
-0d 00 03 00 54 00 49 00 43 00 00 02 00 02 76 00
-58 05 01 01 00 00 ff ff 00 00 00 00 00 ff 00 00
-00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00
-00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00
-00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00
-00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00
-00 00 00 00 00 00 02 00 03 01 00 02 00 04 63 01
-00 19 c9 9c 02 00 05 08 42 4c 00 00 02 00 06 24
-00 0e 43 48 00 00 c2 20 00 00 03 e9 01 02 00 07
-21 c0 42 95 fe c7 02 00 08 08 42 48 00 00 02 00
-09 01 00 02 00 0a 05 01 02 00 0b 48 80 01 02 00
-0c 63 01 00 19 9c 7b 02 00 0d 01 00 02 00 0e 21
-80 42 49 1c 72 02 00 0f 01 00 02 00 10 24 00 0e
-43 48 00 00 c2 20 00 00 03 e9 01 02 00 11 21 80
-42 95 fe c7 01 00 00 00 00 00 48 01 4f 04 a6 17
-cf 02 00 00 01 00 02 00 01 05 01 02 00 02 76 00
-66 05 01 01 00 00 00 06 00 46 00 45 00 48 00 4c
-00 45 00 52 00 00 00 52 00 52 01 0d 00 00 2a f2
-70 c7 30 06 ff ff 00 00 00 00 00 ff 00 00 00 00
-00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00
-00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00
-00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00
-00 00 00 00 02 00 03 01 00 02 00 04 01 00 02 00
-05 63 00 7c 0d a6 d7 01 00 00 00 00 00 49 01 50
-04 a7 17 d0 02 00 00 01 00 02 00 01 76 00 66 05
-01 01 00 00 00 06 00 46 00 45 00 48 00 4c 00 45
-00 52 00 00 00 52 00 52 01 0d 00 00 2a f1 c8 bc
-f6 68 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00
-00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00
-00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00
-00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00
-00 00 02 00 02 01 00 02 00 03 01 00 02 00 04 05
-01 02 00 05 63 00 7c 0d a6 d7 01 00 00 00 00 00
-4a 01 51 04 a8 17 d1 02 00 00 01 00 02 00 01 24
-00 0e 43 48 00 00 c2 20 00 00 03 e9 01 02 00 02
-47 00 0b 00 02 00 54 00 49 00 00 02 00 03 05 01
-02 00 04 76 00 58 05 01 01 00 00 ff ff 00 00 00
-00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00
-00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00
-00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00
-00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00
-00 00 ff 00 00 00 00 00 00 00 00 02 00 05 07 00
-00 00 00 02 00 06 01 00 02 00 07 21 80 42 48 00
-00 01 42 28
-```
-
-== After quite some time ...
-
-== 0xB101
-
-```
-fa ce 00 97 00 02 b0 5f 00 01 1a cd 54 80 04 00
-1b 01 00 00 00 00 00 07 01 ed 00 16 00 04 00 1e
-00 08 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 04 9e 17 c7 00 40 01 47
-00 00 03 e8 00 08 00 05 00 49 00 44 00 49 00 53
-00 50 00 00 ff ff 01 99 70
-```
-
-== 0xB102
-
-```
-fa ce 00 8d 00 02 36 02 00 0b 69 df 54 80 04 00
-1b 02 00 00 00 00 00 07 01 ed 00 16 00 04 00 00
-00 06 00 01 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 01 00 00 00 00 00 40 01
-47 04 9e 17 c7 03 00 08 00 00 00 1f 01 4a 60
-```
-
-== 0xB101
-
-```
-fa ce 00 a9 00 02 b0 66 00 01 1a e1 54 80 04 00
-1b 01 00 00 00 00 00 07 01 ee 00 17 00 04 00 30
-00 08 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 04 9e 17 c7 00 40 01 47
-00 00 03 e8 00 09 00 0e 00 43 00 2f 00 53 00 57
-00 5f 00 4d 00 41 00 58 00 5f 00 53 00 43 00 41
-00 4c 00 45 00 00 ff ff 01 cf 34
-```
-
-== 0xB102
-
-```
-fa ce 00 97 00 02 36 10 00 0b 69 f8 54 80 04 00
-1b 02 00 00 00 00 00 07 01 ee 00 17 00 04 00 00
-00 06 00 01 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 01 00 00 00 00 00 40 01
-47 04 9e 17 c7 02 00 09 24 00 0e 43 48 00 00 c2
-20 00 00 03 e9 01 01 74 11
-```
-
-
-
-
-
-
-
-```
-fa ce 05 14 00 02 9a 21 00 01 c8 96 54 80 04 00
-
-1b 02 00 00 00 00 00 07 03 bf 01 1b 00 04 00 00
-00 06 00 01 00 06 01 81 00 06 02 d6 00 06 03 e4
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00
-04 00 00 00 00 00 35 01 4b 08 ea 1c 13
-02 00 00 47 00 0b 00 02 00 44 00 54 00 00
-02 00 01 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
-02 00 02 47 00 0b 00 02 00 56 00 4c 00 00
-02 00 03 08 00 00 00 00
-02 00 04 63 00 00 19 c4 2f
-02 00 05 76 00 88 05 01 01 00 00 00 0e
-00 47 00 46 00 45 00 5f 00 56 00 45 00 52 00 52
-00 49 00 45 00 47 00 45 00 4c 00 54 00 00 00 54
-00 00 01 07 00 00 2a f5 b7 5d f8 ed 00 08 00 53
-00 54 00 4f 00 45 00 52 00 55 00 4e 00 47 00 00
-00 39 00 39 00 0f 00 00 2a f4 8e c3 64 22 ff ff
-00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff
-00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff
-00 00 00 00 00 ff 00 00 00 00 00 00 00 00
-02 00
-06 47 00 09 00 01 00 54 00 00
-02 00 07 05 00
-02 00 08 01 01
-02 00 09 47 00 0b 00 02 00 49 00 54 00 00
-02 00 0a 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
-02 00 0b 05 01
-02 00 0c 47 00 19 00 09 00 50 00 54 00 30 00 39 00 41 00 4c 00 41 00 43 00 31 00 00
-02 00 0d 08 c2 20 00 00
-02 00 0e 47 00 17 00 08 00 4b 00 65 00 69 00 6e 00 65 00 20 00 46 00 57 00 00
-02 00 0f 21 80 c2 20 00 00 02 00 10 47 00 09 00 01 00 54 00 00
-02 00 11 24 00 0e 42 a0 00 00 00 00 00 00 03 e8 01
-02 00 12 47 00 09 00 01 00 54 00 00
-- 01 00 00 00 00 00 36 01 4c 08 eb 1c 14
-02 00 00 47 00 17 00 08 00 4b 00 65 00 69 00 6e 00 65 00 20 00 46 00 57 00 00
-02 00 01 63 00 00 19 c4 2f
-02 00 02 08 41 0e c7 1c
-02 00 03 47 00 0d 00 03 00 46 00 4c 00 55 00 00
-02 00 04 76 00 58 05 01 01 00 00 ff ff 00 00 00
-00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00
-00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00
-00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00
-00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00
-00 00 ff 00 00 00 00 00 00 00 00
-02 00 05 24 00
-0e 42 c8 00 00 00 00 00 00 04 40 00 02 00 06 47
-00 0d 00 03 00 46 00 30 00 31 00 00 02 00 07 47
-00 09 00 01 00 57 00 00 02 00 08 24 00 0e 42 c8
-00 00 00 00 00 00 04 40 00 02 00 09 24 00 0e 41
-20 00 00 00 00 00 00 05 45 01 02 00 0a 08 ba 48
-00 00 02 00 0b 47 00 19 00 09 00 50 00 54 00 30
-00 39 00 41 00 41 00 48 00 52 00 31 00 00 02 00
-0c 08 00 00 00 00 02 00 0d 05 00 02 00 0e 47 00
-09 00 01 00 46 00 00 02 00 0f 47 00 0d 00 03 00
-46 00 53 00 54 00 00 02 00 10 01 00 02 00 11 05
-01 02 00 12 47 00 09 00 01 00 57 00 00 01 00 00
-00 00 00 37 01 4d 08 ec 1c 15 02 00 00 21 88 3b
-23 d8 00 02 00 01 05 01 02 00 02 47 00 17 00 08
-00 4b 00 65 00 69 00 6e 00 65 00 20 00 46 00 57
-00 00 02 00 03 24 00 0e 3f 80 00 00 bf 80 00 00
-82 df 03 02 00 04 76 00 76 05 01 01 00 00 00 0e
-00 47 00 46 00 45 00 5f 00 56 00 45 00 52 00 52
-00 49 00 45 00 47 00 45 00 4c 00 54 00 00 00 54
-00 54 01 07 00 00 2a f4 92 c2 4a 74 ff ff 00 00
-00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00
-00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00
-00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00
-00 00 00 ff 00 00 00 00 00 00 00 00 02 00 05 63
-00 00 19 c4 2f 02 00 06 47 00 19 00 09 00 50 00
-54 00 30 00 39 00 41 00 4d 00 42 00 4d 00 31 00
-00 02 00 07 47 00 07 00 00 00 00 02 00 08 05 00
-02 00 09 05 01 02 00 0a 47 00 09 00 01 00 50 00
-00 02 00 0b 05 01 02 00 0c 01 00 01 00 00 00 00
-00 38 01 4e 08 ed 1c 16 02 00 00 76 00 76 05 01
-01 00 00 00 0e 00 47 00 46 00 45 00 5f 00 56 00
-45 00 52 00 52 00 49 00 45 00 47 00 45 00 4c 00
-54 00 00 00 54 00 54 00 07 00 00 2a f4 8e c4 35
-ef ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00
-00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00
-00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00
-00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00
-00 02 00 01 47 00 17 00 08 00 4b 00 65 00 69 00
-6e 00 65 00 20 00 46 00 57 00 00 02 00 02 05 00
-02 00 03 05 00 02 00 04 63 00 00 19 c4 2f 02 00
-05 05 00
-01
-
-fa f9
-```
-
-
-
+//
+//  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
+//
+//      http://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.
+//
+:imagesdir: ../../images/
+
+== 0x0403 (before registration)
+
+Before a subscription is done, regularly (about once a minute) the following packets come in.
+
+```
+fa ce 00 32 00 02 33 46 00 0b 63 b8 54 80 04 00
+
+04 03 00 00 00 00 00 52 00 00 00 00 00 00 00 00
+00 04 00 00 00 08 00 01 00 00 00 00 04
+- 04 8f 17 b8 00 2f 01 36 04 8f 17 b8
+01 00 00 00 00 00 00
+00 00
+
+94 17
+```
+
+== 0x1B01
+
+The following packets are all reformatted to group parts that belong together into one line.
+Additionally above each line - in comments - the human readable interpretation of the block below.
+
+The general purpose of a `0xB101` packet seems to be to subscribe to individual variables on the controllers.
+A `0cB101` request is always responded to by a `0xB102` reply, which contains the current value of all requested variables.
+
+After this it is noticeable, that `0x0403` packets start coming in, which seem to contain updates to the variables.
+
+The structure of each 0x1B1 is identical:
+
+* First comes a fixed size header that seems to contain mostly `0x00` values.
+* The content starts with a `set context block`, which is terminated by a block of `0xFFFF`.
+* This context block seems to have the following structure:
+** Some sort of type indicator (Haven't seen anything besides `0x04` for `0xB101` packets)
+**
+* Inside a context block come a variable number of entries, each of them with the same format:
+** First comes a short counter value starting with `0x0000`, this will be replicated in the response.
+** The second short value is the length of the string that is to follow
+** For each character of the String two bytes have to be read (Decoding these as UTL-16 worked fine)
+** After the last character comes a constant `0x0000` block
+* After the last context block just comes a single `0x04` byte
+
+```
+fa ce 05 7d 00 02 af 09 00 01 15 e0 54 80 04 00
+
+1b 01 00 00 00 00 00 07 03 6c 01 96 00 04 05 04
+00 08 00 00 00 08 01 ae 00 08 03 5c 00 08 04 82
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00
+- 04 90 17 b9 00 32 01 39 00 00 03 e8
+// BESCH3
+00 00 00 06 00 42 00 45 00 53 00 43 00 48 00 33 00 00
+// SKAL1
+00 01 00 05 00 53 00 4b 00 41 00 4c 00 31 00 00
+// DYN_BESCH1
+00 02 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 31 00 00
+// ISTWERT3
+00 03 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 33 00 00
+// GF_STATUS
+00 04 00 09 00 47 00 46 00 5f 00 53 00 54 00 41 00 54 00 55 00 53 00 00
+// ALARMS
+00 05 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
+// DYN_BESCH3
+00 06 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 33 00 00
+// A/BA
+00 07 00 04 00 41 00 2f 00 42 00 41 00 00
+// A/BA_GFES_AUTO
+00 08 00 0e 00 41 00 2f 00 42 00 41 00 5f 00 47 00 46 00 45 00 53 00 5f 00 41 00 55 00 54 00 4f 00 00
+// DYN_BESCH2
+00 09 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 32 00 00
+// SKAL2
+00 0a 00 05 00 53 00 4b 00 41 00 4c 00 32 00 00
+// A/GFE_ALARM
+00 0b 00 0b 00 41 00 2f 00 47 00 46 00 45 00 5f 00 41 00 4c 00 41 00 52 00 4d 00 00
+// GF_NAME
+00 0c 00 07 00 47 00 46 00 5f 00 4e 00 41 00 4d 00 45 00 00
+// ISTWERT1
+00 0d 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 31 00 00
+// A/IST_FW_KURZ
+00 0e 00 0d 00 41 00 2f 00 49 00 53 00 54 00 5f 00 46 00 57 00 5f 00 4b 00 55 00 52 00 5a 00 00
+// ISTWERT2
+00 0f 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 32 00 00
+// BESCH1
+00 10 00 06 00 42 00 45 00 53 00 43 00 48 00 31 00 00
+// SKAL3
+00 11 00 05 00 53 00 4b 00 41 00 4c 00 33 00 00
+// BESCH2
+00 12 00 06 00 42 00 45 00 53 00 43 00 48 00 32 00 00
+ff ff
+- 04 91 17 ba 00 33 01 3a 00 00 03 e8
+// A/IST_FW_KURZ
+00 00 00 0d 00 41 00 2f 00 49 00 53 00 54 00 5f 00 46 00 57 00 5f 00 4b 00 55 00 52 00 5a 00 00
+// GF_STATUS
+00 01 00 09 00 47 00 46 00 5f 00 53 00 54 00 41 00 54 00 55 00 53 00 00
+// ISTWERT1
+00 02 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 31 00 00
+// DYN_BESCH3
+00 03 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 33 00 00
+// ALARMS
+00 04 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
+// SKAL2
+00 05 00 05 00 53 00 4b 00 41 00 4c 00 32 00 00
+// DYN_BESCH1
+00 06 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 31 00 00
+// BESCH3
+00 07 00 06 00 42 00 45 00 53 00 43 00 48 00 33 00 00
+// SKAL3
+00 08 00 05 00 53 00 4b 00 41 00 4c 00 33 00 00
+// SKAL1
+00 09 00 05 00 53 00 4b 00 41 00 4c 00 31 00 00
+// ISTWERT2
+00 0a 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 32 00 00
+// GF_NAME
+00 0b 00 07 00 47 00 46 00 5f 00 4e 00 41 00 4d 00 45 00 00
+// ISTWERT3
+00 0c 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 33 00 00
+// A/BA
+00 0d 00 04 00 41 00 2f 00 42 00 41 00 00
+// BESCH1
+00 0e 00 06 00 42 00 45 00 53 00 43 00 48 00 31 00 00
+// DYN_BESCH2
+00 0f 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 32 00 00
+// A/BA_GFES_AUTO
+00 10 00 0e 00 41 00 2f 00 42 00 41 00 5f 00 47 00 46 00 45 00 53 00 5f 00 41 00 55 00 54 00 4f 00 00
+// A/GFE_ALARM
+00 11 00 0b 00 41 00 2f 00 47 00 46 00 45 00 5f 00 41 00 4c 00 41 00 52 00 4d 00 00
+// BESCH2
+00 12 00 06 00 42 00 45 00 53 00 43 00 48 00 32 00 00
+ff ff
+- 04 92 17 bb 00 34 01 3b 00 00 03 e8
+// ISTWERT1
+00 00 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 31 00 00
+// A/GFE_ALARM
+00 01 00 0b 00 41 00 2f 00 47 00 46 00 45 00 5f 00 41 00 4c 00 41 00 52 00 4d 00 00
+// A/IST_FW_KURZ
+00 02 00 0d 00 41 00 2f 00 49 00 53 00 54 00 5f 00 46 00 57 00 5f 00 4b 00 55 00 52 00 5a 00 00
+// SKAL1
+00 03 00 05 00 53 00 4b 00 41 00 4c 00 31 00 00
+// ALARMS
+00 04 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
+// GF_STATUS
+00 05 00 09 00 47 00 46 00 5f 00 53 00 54 00 41 00 54 00 55 00 53 00 00
+// GF_NAME
+00 06 00 07 00 47 00 46 00 5f 00 4e 00 41 00 4d 00 45 00 00
+// DYN_BESCH1
+00 07 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 31 00 00
+// A/BA
+00 08 00 04 00 41 00 2f 00 42 00 41 00 00
+// A/A3
+00 09 00 04 00 41 00 2f 00 41 00 33 00 00
+// BESCH1
+00 0a 00 06 00 42 00 45 00 53 00 43 00 48 00 31 00 00
+// A/A2
+00 0b 00 04 00 41 00 2f 00 41 00 32 00 00
+// A/BA_GFES_AUTO
+00 0c 00 0e 00 41 00 2f 00 42 00 41 00 5f 00 47 00 46 00 45 00 53 00 5f 00 41 00 55 00 54 00 4f 00 00
+ff ff
+- 04 93 17 bc 00 35 01 3c 00 00 03 e8
+// ALARMS
+00 00 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
+// A/IST_FW_KURZ
+00 01 00 0d 00 41 00 2f 00 49 00 53 00 54 00 5f 00 46 00 57 00 5f 00 4b 00 55 00 52 00 5a 00 00
+// A/BA
+00 02 00 04 00 41 00 2f 00 42 00 41 00 00
+// A/A2
+00 03 00 04 00 41 00 2f 00 41 00 32 00 00
+// GF_STATUS
+00 04 00 09 00 47 00 46 00 5f 00 53 00 54 00 41 00 54 00 55 00 53 00 00
+// A/A1
+00 05 00 04 00 41 00 2f 00 41 00 31 00 00
+ff ff
+- 04
+
+76 37
+```
+
+== 0xB102
+
+```
+fa ce 04 f4 00 02 33 48 00 0b 63 ba 54 80 04 00
+
+1b 02 00 00 00 00 00 07 03 6c 01 96 00 04 00 00
+00 06 00
+01 00 06 01 61 00 06 02 b6 00 06 03 c4
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00
+- 04 00 00 00 00 00 32 01 39 04 90 17 b9
+// ID: 0x0000, Name: BESCH3, 47=Type: Label, Code: 0x000b, Length: 2, Text: DT
+02 00 00 47 00 0b 00 02 00 44 00 54 00 00
+// ID: 0x0001, Name: SKAL1, Type: 24=Skale, 934728, 49696, 1001, 01 (Probably 3 32bit Integers, followed by a flag byte)
+02 00 01 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
+// ID: 0x0002, Name: DYN_BESCH1, Type: 47=Label, Code: 0x000b, Length: 2, Text: VL
+02 00 02 47 00 0b 00 02 00 56 00 4c 00 00
+// ID: 0x0003, Name: ISTWERT3, Type: 08=Float (32 bit), Value: 0.0
+02 00 03 08 00 00 00 00
+// ID: 0x0004, Name: GF_STATUS, Type: 63=(Unknown)
+02 00 04 63 02 00 19 c4 2f
+// ID: 0x0005, Name: ALARMS, Type: 76=Alarms (Contains Data-Structure directly related to alarms)
+02 00 05 76 00 6a 05 01 01 00 00 00 08 00 53 00 54 00 4f 00 45 00 52 00 55 00 4e 00 47 00 00 00 39 00 39 00 0f 00 00 2a f1 c6 c4 75 63 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00
+// ID: 0x0006, Name: DYN_BESCH3, Type: 47=Label, Code: 0x0009, Length: 1, Text: T
+02 00 06 47 00 09 00 01 00 54 00 00
+// ID: 0x0007, Name: A/BA, Type: 05=(Boolean?), Value: False
+02 00 07 05 00
+// ID: 0x0008, Name: A/BA_GFES_AUTO, Type: 01=(Boolean?), Value: True
+02 00 08 01 01
+// ID: 0x0009, Name: DYN_BESCH2, Type: Label, Code: 0x0009, Length: 1, Text: T
+02 00 09 47 00 0b 00 02 00 49 00 54 00 00
+// ID: 0x000A, Name: SKAL2, Type: 24=Skale, 934728, 49696, 1001, 01 (Probably 3 32bit Integers, followed by a flag byte)
+02 00 0a 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
+// ID: 0x000B, Name: A/GFE_ALARM, Type: 05=(Boolean?), Value: True
+02 00 0b 05 01
+// ID: 0x000C, Name: GF_NAME, Type: 47=Label, Code: 0x0019, Length: 9, Text: PT09ALAC1
+02 00 0c 47 00 19 00 09 00 50 00 54 00 30 00 39 00 41 00 4c 00 41 00 43 00 31 00 00
+// ID: 0x000D, Name: ISTWERT1, Type: 08=Float, Value: 50.416664
+02 00 0d 08 42 49 aa aa
+// ID: 0x000E, Name: A/IST_FW_KURZ, Type: 47=Label, Code: 0x0015, Length: 7, Text: VORLAUF
+02 00 0e 47 00 15 00 07 00 56 00 4f 00 52 00 4c 00 41 00 55 00 46 00 00
+// ID: 0x000F, Name: ISTWERT2, Type: 21=Parametrized Float, Param: 0x80, Value: 50.416664
+02 00 0f 21 80 42 49 aa aa
+// ID: 0x0010, Name: BESCH1, Type: 47=Label, Code: 0x0009, Length: 1, Text: T
+02 00 10 47 00 09 00 01 00 54 00 00
+// ID: 0x0011, Name: SKAL3, Type: 24=Skale, 934560, 0, 1000, 0x01
+02 00 11 24 00 0e 42 a0 00 00 00 00 00 00 03 e8 01
+// ID: 0x0012, Name: BESCH2, Type: 47=Label, Code; 0x0009, Length: 1, Text: T
+02 00 12 47 00 09 00 01 00 54 00 00
+- 01 00 00 00 00 00 33 01 3a 04 91 17 ba
+// ID: 0x0000, Name: A/IST_FW_KURZ, Type: 47=Label, Code: 0x0017, Length: 8, Text: Keine FW
+02 00 00 47 00 17 00 08 00 4b 00 65 00 69 00 6e 00 65 00 20 00 46 00 57 00 00
+// ID: 0x0001, Name: GF_STATUS, Type: 63=(Unknown: Messstellen Status)
+02 00 01 63 00 00 19 c4 2f
+// ID: 0x0002, Name: ISTWERT1, Type: 08=Float (32 bit), Value: 8.923611
+02 00 02 08 41 0e c7 1c
+// ID: 0x0003, Name: DYN_BESCH3, Type: 47=Label, Code: 0x000D, Length: 3, Text: FLU
+02 00 03 47 00 0d 00 03 00 46 00 4c 00 55 00 00
+// ID: 0x0004, Name: ALARMS, Type: 76=Alarms (Contains Data-Structure directly related to alarms)
+02 00 04 76 00 58 05 01 01 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00
+// ID: 0x0005, Name: SKAL2, Type: 24=Skale, 934600, 0, 1088, 00 (Probably 3 32bit Integers, followed by a flag byte)
+02 00 05 24 00 0e 42 c8 00 00 00 00 00 00 04 40 00
+// ID: 0x0006, Name: DYN_BESCH1, Type: 47=Label, Code: 0x000D, Length: 3, Text: F01
+02 00 06 47 00 0d 00 03 00 46 00 30 00 31 00 00
+// ID: 0x0007, Name: BESCH3, Type: 47=Label, Code: 0x0009, Length: 1, Text: W
+02 00 07 47 00 09 00 01 00 57 00 00
+// ID: 0x0008, Name: SKAL3, Type: 24=Skale, 934600, 0, 1088, 00 (Probably 3 32bit Integers, followed by a flag byte)
+02 00 08 24 00 0e 42 c8 00 00 00 00 00 00 04 40 00
+// ID: 0x0009, Name: SKAL1, Type: 24=Skale, 934176, 0, 1349, 01 (Probably 3 32bit Integers, followed by a flag byte)
+02 00 09 24 00 0e 41 20 00 00 00 00 00 00 05 45 01
+// ID: 0x000A, Name: ISTWERT2, Type: 08=Float, Value: -0.000762939453125 (Sort of 0)
+02 00 0a 08 ba 48 00 00
+// ID: 0x000B, Name: GF_NAME, Type: 47=Label, Code: 0x0019, Length: 9, Text: PT09AAHR1
+02 00 0b 47 00 19 00 09 00 50 00 54 00 30 00 39 00 41 00 41 00 48 00 52 00 31 00 00
+// ID: 0x000C, Name: ISTWERT3, Type: 08=Float, Value: 0.0
+02 00 0c 08 00 00 00 00
+// ID: 0x000D, Name: A/BA, Type: 05=(Boolean?), Value: False
+02 00 0d 05 00
+// ID: 0x000E, Name: BESCH1, Type: 47=Label, Code: 0x0009, Length: 1, Text: F
+02 00 0e 47 00 09 00 01 00 46 00 00
+// ID: 0x000F, Name: DYN_BESCH2, Type: 47=Label, Code: 0x000D, Length: 3, Text: FST
+02 00 0f 47 00 0d 00 03 00 46 00 53 00 54 00 00
+// ID: 0x0010, Name: A/BA_GFES_AUTO, Type: 01=(Boolean?), Value: False
+02 00 10 01 00
+// ID: 0x0011, Name: A/GFE_ALARM, Type: 05=(Boolean?), Value: True
+02 00 11 05 01
+// ID: 0x0012, Name: BESCH2, Type: 47=Label, Code: 0x0009, Length: 1, Text: W
+02 00 12 47 00 09 00 01 00 57 00 00
+- 01 00 00 00 00 00 34 01 3b 04 92 17 bb
+// ID: 0x0000, Name: ISTWERT1, Type: 21=Parametrized Float, Param: 0x88, Value: 0.0025000572
+02 00 00 21 88 3b 23 d8 00
+// ID: 0x0001, Name: A/GFE_ALARM, Type: 05=(Boolean?), Value: True
+02 00 01 05 01
+// ID: 0x0002, Name: A/IST_FW_KURZ, Type: 47=Label, Code: 0x0017, Length: 8, Text: Keine FW
+02 00 02 47 00 17 00 08 00 4b 00 65 00 69 00 6e 00 65 00 20 00 46 00 57 00 00
+// ID: 0x0003, Name: SKAL1, Type: 24=Skale, 933760, 49024, 33503, 03 (Probably 3 32bit Integers, followed by a flag byte)
+02 00 03 24 00 0e 3f 80 00 00 bf 80 00 00 82 df 03
+// ID: 0x0004, Name: ALARMS, Type: 76=Alarms (Contains Data-Structure directly related to alarms)
+02 00 04 76 00 76 05 01 01 00 00 00 0e 00 47 00 46 00 45 00 5f 00 56 00 45 00 52 00 52 00 49 00 45 00 47 00 45 00 4c 00 54 00 00 00 54 00 54 01 07 00 00 2a f1 ca d4 71 f6 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00
+// ID: 0x0005, Name: GF_STATUS, Type: 63=(Unknown: Messstellen Status)
+02 00 05 63 00 00 19 c4 2f
+// ID: 0x0006, Name: GF_NAME, Type: 47=Label, Code: 0x0019, Length: 9, Text: PT09AMBM1
+02 00 06 47 00 19 00 09 00 50 00 54 00 30 00 39 00 41 00 4d 00 42 00 4d 00 31 00 00
+// ID: 0x0007, Name: DYN_BESCH1, Type: 47=Label, Code: 0x0007, Length: 0, Text:
+02 00 07 47 00 07 00 00 00 00
+// ID: 0x0008, Name: A/BA, Type: 05=(Boolean?), Value: False
+02 00 08 05 00
+// ID: 0x0009, Name: A/A3, Type: 05=(Boolean?), Value: True
+02 00 09 05 01
+// ID: 0x000a, Name: BESCH1, Type: 47=Label, Code: 0x0009, Length: 1, Text: P
+02 00 0a 47 00 09 00 01 00 50 00 00
+// ID: 0x000b, Name: A/A2, Type: 05=(Boolean?), Value: True
+02 00 0b 05 01
+// ID: 0x000c, Name: A/BA_GFES_AUTO, Type: 01=(Boolean?), Value: False
+02 00 0c 01 00
+- 01 00 00 00 00 00 35 01 3c 04 93 17 bc
+// ID: 0x0000, Name: ALARMS, Type: 76=Alarms (Contains Data-Structure directly related to alarms)
+02 00 00 76 00 76 05 01 01 00 00 00 0e 00 47 00 46 00 45 00 5f 00 56 00 45 00 52 00 52 00 49 00 45 00 47 00 45 00 4c 00 54 00 00 00 54 00 54 00 07 00 00 2a f1 c6 c5 46 ef ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00
+// ID: 0x0001, Name: A/IST_FW_KURZ, Type: 47=Label, Code: 0x0017, Length: 8, Text: Keine FW
+02 00 01 47 00 17 00 08 00 4b 00 65 00 69 00 6e 00 65 00 20 00 46 00 57 00 00
+// ID: 0x0002, Name: A/BA, Type: 05=(Boolean?), Value: False
+02 00 02 05 00
+// ID: 0x0003, Name: A/A2, Type: 05=(Boolean?), Value: False
+02 00 03 05 00
+// ID: 0x0004, Name: GF_STATUS, Type: 63=(Unknown: Messstellen Status)
+02 00 04 63 00 00 19 c4 2f
+// ID: 0x0005, Name: A/A1, Type: 05=(Boolean?), Value: False
+02 00 05 05 00
+- 01
+
+49 ad
+```
+
+== 0x1B01
+
+```
+fa ce 05 7d 00 02 af 0a 00 01 15 e1 54 80 04 00
+
+1b 01 00 00 00 00 00 07 03 6d 01 97 00 04 05 04
+00 08 00 00 00 08 01 78 00 08 02 90 00 08 03 fa
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00
+- 04 96 17 bf 00 38 01 3f 00 00 03 e8
+// A/IST_FW_KURZ
+00 00 00 0d 00 41 00 2f 00 49 00 53 00 54 00 5f 00 46 00 57 00 5f 00 4b 00 55 00 52 00 5a 00 00
+// SKAL1
+00 01 00 05 00 53 00 4b 00 41 00 4c 00 31 00 00
+// ALARMS
+00 02 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
+// SKAL2
+00 03 00 05 00 53 00 4b 00 41 00 4c 00 32 00 00
+// DYN_BESCH2
+00 04 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 32 00 00
+// AKT_SCHRITT
+00 05 00 0b 00 41 00 4b 00 54 00 5f 00 53 00 43 00 48 00 52 00 49 00 54 00 54 00 00
+// A/BA_GFES_AUTO
+00 06 00 0e 00 41 00 2f 00 42 00 41 00 5f 00 47 00 46 00 45 00 53 00 5f 00 41 00 55 00 54 00 4f 00 00
+// A/BA
+00 07 00 04 00 41 00 2f 00 42 00 41 00 00
+// GF_STATUS
+00 08 00 09 00 47 00 46 00 5f 00 53 00 54 00 41 00 54 00 55 00 53 00 00
+// ISTWERT2
+00 09 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 32 00 00
+// GF_NAME
+00 0a 00 07 00 47 00 46 00 5f 00 4e 00 41 00 4d 00 45 00 00
+// BESCH1
+00 0b 00 06 00 42 00 45 00 53 00 43 00 48 00 31 00 00
+// DYN_BESCH1
+00 0c 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 31 00 00
+// BESCH2
+00 0d 00 06 00 42 00 45 00 53 00 43 00 48 00 32 00 00
+// A/GFE_ALARM
+00 0e 00 0b 00 41 00 2f 00 47 00 46 00 45 00 5f 00 41 00 4c 00 41 00 52 00 4d 00 00
+// ISTWERT1
+00 0f 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 31 00 00
+ff ff
+- 04 97 17 c0 00 39 01 40 00 00 03 e8
+// ALARMS
+00 00 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
+// SKAL1
+00 01 00 05 00 53 00 4b 00 41 00 4c 00 31 00 00
+// GF_STATUS
+00 02 00 09 00 47 00 46 00 5f 00 53 00 54 00 41 00 54 00 55 00 53 00 00
+// BESCH1
+00 03 00 06 00 42 00 45 00 53 00 43 00 48 00 31 00 00
+// A/A1
+00 04 00 04 00 41 00 2f 00 41 00 31 00 00
+// A/IST_FW_KURZ
+00 05 00 0d 00 41 00 2f 00 49 00 53 00 54 00 5f 00 46 00 57 00 5f 00 4b 00 55 00 52 00 5a 00 00
+// DYN_BESCH1
+00 06 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 31 00 00
+// GF_NAME
+00 07 00 07 00 47 00 46 00 5f 00 4e 00 41 00 4d 00 45 00 00
+// A/BA
+00 08 00 04 00 41 00 2f 00 42 00 41 00 00
+// A/GFE_ALARM
+00 09 00 0b 00 41 00 2f 00 47 00 46 00 45 00 5f 00 41 00 4c 00 41 00 52 00 4d 00 00
+// A/BA_GFES_AUTO
+00 0a 00 0e 00 41 00 2f 00 42 00 41 00 5f 00 47 00 46 00 45 00 53 00 5f 00 41 00 55 00 54 00 4f 00 00
+// ISTWERT1
+00 0b 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 31 00 00
+ff ff
+- 04 98 17 c1 00 3a 01 41 00 00 03 e8
+// SKAL2
+00 00 00 05 00 53 00 4b 00 41 00 4c 00 32 00 00
+// ISTWERT1
+00 01 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 31 00 00
+// GF_STATUS
+00 02 00 09 00 47 00 46 00 5f 00 53 00 54 00 41 00 54 00 55 00 53 00 00
+// SKAL1
+00 03 00 05 00 53 00 4b 00 41 00 4c 00 31 00 00
+// A/A1
+00 04 00 04 00 41 00 2f 00 41 00 31 00 00
+// ALARMS
+00 05 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
+// A/GFE_ALARM
+00 06 00 0b 00 41 00 2f 00 47 00 46 00 45 00 5f 00 41 00 4c 00 41 00 52 00 4d 00 00
+// GF_NAME
+00 07 00 07 00 47 00 46 00 5f 00 4e 00 41 00 4d 00 45 00 00
+// A/BA
+00 08 00 04 00 41 00 2f 00 42 00 41 00 00
+// DYN_BESCH2
+00 09 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 32 00 00
+// BESCH2
+00 0a 00 06 00 42 00 45 00 53 00 43 00 48 00 32 00 00
+// BESCH1
+00 0b 00 06 00 42 00 45 00 53 00 43 00 48 00 31 00 00
+// ISTWERT2
+00 0c 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 32 00 00
+// A/BA_GFES_AUTO
+00 0d 00 0e 00 41 00 2f 00 42 00 41 00 5f 00 47 00 46 00 45 00 53 00 5f 00 41 00 55 00 54 00 4f 00 00
+// DYN_BESCH1
+00 0e 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 31 00 00
+// A/IST_FW_KURZ
+00 0f 00 0d 00 41 00 2f 00 49 00 53 00 54 00 5f 00 46 00 57 00 5f 00 4b 00 55 00 52 00 5a 00 00
+ff ff
+- 04 99 17 c2 00 3b 01 42 00 00 03 e8
+// BESCH1
+00 00 00 06 00 42 00 45 00 53 00 43 00 48 00 31 00 00
+// SKAL1
+00 01 00 05 00 53 00 4b 00 41 00 4c 00 31 00 00
+// A/BA_GFES_AUTO
+00 02 00 0e 00 41 00 2f 00 42 00 41 00 5f 00 47 00 46 00 45 00 53 00 5f 00 41 00 55 00 54 00 4f 00 00
+// GF_NAME
+00 03 00 07 00 47 00 46 00 5f 00 4e 00 41 00 4d 00 45 00 00
+// A/GFE_ALARM
+00 04 00 0b 00 41 00 2f 00 47 00 46 00 45 00 5f 00 41 00 4c 00 41 00 52 00 4d 00 00
+// A/IST_FW_KURZ
+00 05 00 0d 00 41 00 2f 00 49 00 53 00 54 00 5f 00 46 00 57 00 5f 00 4b 00 55 00 52 00 5a 00 00
+// ALARMS
+00 06 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
+// A/BA
+00 07 00 04 00 41 00 2f 00 42 00 41 00 00
+// GF_STATUS
+00 08 00 09 00 47 00 46 00 5f 00 53 00 54 00 41 00 54 00 55 00 53 00 00
+// DYN_BESCH1
+00 09 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 31 00 00
+// ISTWERT1
+00 0a 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 31 00 00
+ff ff
+- 04
+
+b2 c7
+```
+
+== 0xB102
+
+```
+fa ce 04 b6 00 02 33 49 00 0b 63 bb 54 80 04 00
+
+1b 02 00 00 00 00 00 07 03 6d 01 97 00 04 00 00
+00 06 00
+01 00 06 01 51 00 06 02 3c 00 06 03 59
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00
+- 04 00 00 00 00 00 38 01 3f 04 96 17 bf
+02 00 00 47 00 17 00 08 00 4b 00 65 00 69 00 6e 00 65 00 20 00 46 00 57 00 00
+02 00 01 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
+02 00 02 76 00 76 05 01 01 00 00 00 0e 00 47 00 46 00 45 00 5f 00 56 00 45 00 52 00 52 00 49 00 45 00 47 00 45 00 4c 00 54 00 00 00 54 00 54 01 07 00 00 2a f1 c7 82 e4 d8 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00
+02 00 03 24 00 0e 40 20 00 00 00 00 00 00 80 16 03
+02 00 04 47 00 11 00 05 00 4d 00 43 00 50 00 30 00 31 00 00
+02 00 05 47 00 07 00 00 00 00
+02 00 06 01 00
+02 00 07 05 00
+02 00 08 63 00 00 19 c4 2f
+02 00 09 08 3f 89 68 4c
+02 00 0a 47 00 19 00 09 00 50 00 54 00 30 00 39 00 41 00 4e 00 41 00 44 00 31 00 00
+02 00 0b 47 00 09 00 01 00 54 00 00
+02 00 0c 47 00 11 00 05 00 4d 00 43 00 54 00 30 00 31 00 00
+02 00 0d 47 00 09 00 01 00 50 00 00
+02 00 0e 05 01
+02 00 0f 08 42 49 aa aa
+- 01 00 00 00 00 00 39 01 40 04 97 17 c0
+02 00 00 76 00 58 05 01 01 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00
+02 00 01 24 00 0e 41 28 00 00 00 00 00 00 05 45 01
+02 00 02 63 00 00 19 c4 2f
+02 00 03 47 00 09 00 01 00 46 00 00
+02 00 04 05 01
+02 00 05 47 00 17 00 08 00 4b 00 65 00 69 00 6e 00 65 00 20 00 46 00 57 00 00
+02 00 06 47 00 07 00 00 00 00
+02 00 07 47 00 19 00 09 00 50 00 54 00 30 00 39 00 41 00 44 00 42 00 51 00 31 00 00
+02 00 08 05 00
+02 00 09 05 01
+02 00 0a 01 00
+02 00 0b 21 80 00 00 00 00
+- 01 00 00 00 00 00 3a 01 41 04 98 17 c1
+02 00 00 24 00 0e 42 c8 00 00 00 00 00 00 06 34 00
+02 00 01 08 3f 7f ff ff
+02 00 02 63 00 00 19 c4 2f
+02 00 03 24 00 0e 3f 99 99 9a 00 00 00 00 80 16 03
+02 00 04 05 01
+02 00 05 76 00 58 05 01 01 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00
+02 00 06 05 00
+02 00 07 47 00 19 00 09 00 50 00 54 00 30 00 39 00 41 00 44 00 48 00 4f 00 31 00 00
+02 00 08 05 00
+02 00 09 47 00 07 00 00 00 00
+02 00 0a 47 00 07 00 00 00 00
+02 00 0b 47 00 09 00 01 00 50 00 00
+02 00 0c 08 00 00 00 00
+02 00 0d 01 01
+02 00 0e 47 00 0d 00 03 00 56 00 41 00 4b 00 00
+02 00 0f 47 00 17 00 08 00 4b 00 65 00 69 00 6e 00 65 00 20 00 46 00 57 00 00
+- 01 00 00 00 00 00 3b 01 42 04 99 17 c2
+02 00 00 47 00 09 00 01 00 46 00 00
+02 00 01 24 00 0e 41 20 00 00 00 00 00 00 05 45 01
+02 00 02 01 00
+02 00 03 47 00 19 00 09 00 50 00 54 00 30 00 39 00 41 00 41 00 4e 00 4b 00 31 00 00
+02 00 04 05 01
+02 00 05 47 00 17 00 08 00 4b 00 65 00 69 00 6e 00 65 00 20 00 46 00 57 00 00
+02 00 06 76 00 58 05 01 01 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00
+02 00 07 05 00
+02 00 08 63 00 00 19 c4 2f
+02 00 09 47 00 07 00 00 00 00
+02 00 0a 08 00 00 00 00
+- 01
+
+b0 25
+```
+
+== 0xB101
+
+```
+fa ce 05 89 00 02 af 0c 00 01 15 e3 54 80 04 00
+
+1b 01 00 00 00 00 00 07 03 6e 01 98 00 04 05 10
+00 08 00 00 00 08 00 5a 00 08 01 e0 00 08 04 d8
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00
+- 04 93 17 bc 00 35 01 3c 00 00 03 e8
+// A/BA_GFES_AUTO
+00 06 00 0e 00 41 00 2f 00 42 00 41 00 5f 00 47 00 46 00 45 00 53 00 5f 00 41 00 55 00 54 00 4f 00 00
+// A/GFE_ALARM
+00 07 00 0b 00 41 00 2f 00 47 00 46 00 45 00 5f 00 41 00 4c 00 41 00 52 00 4d 00 00
+// A/A3
+00 08 00 04 00 41 00 2f 00 41 00 33 00 00
+ff ff
+- 04 94 17 bd 00 36 01 3d 00 00 03 e8
+// BESCH2
+00 00 00 06 00 42 00 45 00 53 00 43 00 48 00 32 00 00
+// SKAL1
+00 01 00 05 00 53 00 4b 00 41 00 4c 00 31 00 00
+// ALARMS
+00 02 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
+// A/BA_GFES_AUTO
+00 03 00 0e 00 41 00 2f 00 42 00 41 00 5f 00 47 00 46 00 45 00 53 00 5f 00 41 00 55 00 54 00 4f 00 00
+00 04 00 09 00 47 00 46 00 5f 00 53 00 54 00 41 00 54 00 55 00 53 00 00
+// SKAL2
+00 05 00 05 00 53 00 4b 00 41 00 4c 00 32 00 00
+// DYN_BESCH1
+00 06 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 31 00 00
+// A/GFE_ALARM
+00 07 00 0b 00 41 00 2f 00 47 00 46 00 45 00 5f 00 41 00 4c 00 41 00 52 00 4d 00 00
+// DYN_BESCH2
+00 08 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 32 00 00
+// ISTWERT2
+00 09 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 32 00 00
+// A/A1
+00 0a 00 04 00 41 00 2f 00 41 00 31 00 00
+// BESCH1
+00 0b 00 06 00 42 00 45 00 53 00 43 00 48 00 31 00 00
+// GF_NAME
+00 0c 00 07 00 47 00 46 00 5f 00 4e 00 41 00 4d 00 45 00 00
+// A/BA
+00 0d 00 04 00 41 00 2f 00 42 00 41 00 00
+// A/IST_FW_KURZ
+00 0e 00 0d 00 41 00 2f 00 49 00 53 00 54 00 5f 00 46 00 57 00 5f 00 4b 00 55 00 52 00 5a 00 00
+// AKT_SCHRITT
+00 0f 00 0b 00 41 00 4b 00 54 00 5f 00 53 00 43 00 48 00 52 00 49 00 54 00 54 00 00
+// ISTWERT1
+00 10 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 31 00 00
+ff ff
+- 04 95 17 be 00 37 01 3e 00 00 03 e8
+// DYN_ISTWERTE/OUT_FARBE1
+00 00 00 17 00 44 00 59 00 4e 00 5f 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 45 00 2f 00 4f 00 55 00 54 00 5f 00 46 00 41 00 52 00 42 00 45 00 31 00 00
+// DYN_ISTWERTE/OUT_ENABLED2
+00 01 00 19 00 44 00 59 00 4e 00 5f 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 45 00 2f 00 4f 00 55 00 54 00 5f 00 45 00 4e 00 41 00 42 00 4c 00 45 00 44 00 32 00 00
+// GFE_ALARM
+00 02 00 09 00 47 00 46 00 45 00 5f 00 41 00 4c 00 41 00 52 00 4d 00 00
+// DYN_ISTWERTE/BESCH1
+00 03 00 13 00 44 00 59 00 4e 00 5f 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 45 00 2f 00 42 00 45 00 53 00 43 00 48 00 31 00 00
+// GF_STATUS
+00 04 00 09 00 47 00 46 00 5f 00 53 00 54 00 41 00 54 00 55 00 53 00 00
+// DYN_ISTWERTE/BESCH2
+00 05 00 13 00 44 00 59 00 4e 00 5f 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 45 00 2f 00 42 00 45 00 53 00 43 00 48 00 32 00 00
+// IST_FW_KURZ
+00 06 00 0b 00 49 00 53 00 54 00 5f 00 46 00 57 00 5f 00 4b 00 55 00 52 00 5a 00 00
+// ALARMS
+00 07 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
+// DYN_ISTWERTE/DYN_BESCH2
+00 08 00 17 00 44 00 59 00 4e 00 5f 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 45 00 2f 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 32 00 00
+// DYN_ISTWERTE/OUT_FARBE2
+00 09 00 17 00 44 00 59 00 4e 00 5f 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 45 00 2f 00 4f 00 55 00 54 00 5f 00 46 00 41 00 52 00 42 00 45 00 32 00 00
+// DYN_ISTWERTE/OUT_SCALE1
+00 0a 00 17 00 44 00 59 00 4e 00 5f 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 45 00 2f 00 4f 00 55 00 54 00 5f 00 53 00 43 00 41 00 4c 00 45 00 31 00 00
+// BA_GFES_AUTO
+00 0b 00 0c 00 42 00 41 00 5f 00 47 00 46 00 45 00 53 00 5f 00 41 00 55 00 54 00 4f 00 00
+// BA
+00 0c 00 02 00 42 00 41 00 00
+// DYN_ISTWERTE/OUT2
+00 0d 00 11 00 44 00 59 00 4e 00 5f 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 45 00 2f 00 4f 00 55 00 54 00 32 00 00
+// DYN_ISTWERTE/OUT_SCALE2
+00 0e 00 17 00 44 00 59 00 4e 00 5f 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 45 00 2f 00 4f 00 55 00 54 00 5f 00 53 00 43 00 41 00 4c 00 45 00 32 00 00
+// DYN_ISTWERTE/OUT_ENABLED1
+00 0f 00 19 00 44 00 59 00 4e 00 5f 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 45 00 2f 00 4f 00 55 00 54 00 5f 00 45 00 4e 00 41 00 42 00 4c 00 45 00 44 00 31 00 00
+// DYN_BEZ
+00 10 00 07 00 44 00 59 00 4e 00 5f 00 42 00 45 00 5a 00 00
+// DYN_ISTWERTE/OUT1
+00 11 00 17 00 44 00 59 00 4e 00 5f 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 45 00 2f 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 31 00 00
+// DYN_ISTWERTE/OUT1
+00 12 00 11 00 44 00 59 00 4e 00 5f 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 45 00 2f 00 4f 00 55 00 54 00 31 00 00
+ff ff
+- 04 9a 17 c3 00 3c 01 43 00 00 03 e8
+// ALARMS
+00 00 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
+// GF_STATUS
+00 01 00 09 00 47 00 46 00 5f 00 53 00 54 00 41 00 54 00 55 00 53 00 00
+ff ff
+- 04
+
+ea 72
+```
+
+== 0xB102
+
+```
+fa ce 03 6c 00 02 33 4b 00 0b 63 bd 54 80 04 00
+1b 02 00 00 00 01 00 07 03 6e 01 98 00 04 00 00
+00 06 00 01 00 06 00 1d 00 06 01 52 00 06 02 83
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00
+- 04 00 00 00 00 00 35 01 3c 04 93 17 bc
+02 00 06 01 00
+02 00 07 05 01
+02 00 08 05 01
+- 01 00 00 00 00 00 36 01 3d 04 94 17 bd
+02 00 00 47 00 09 00 01 00 50 00 00
+02 00 01 24 00 0e 45 35 40 00 00 00 00 00 82 dc 00
+02 00 02 76 00 58 05 01 01 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00
+02 00 03 01 01
+02 00 04 63 00 00 19 c4 2f
+02 00 05 24 00 0e 43 c8 00 00 c2 c8 00 00 82 dd 01
+02 00 06 47 00 07 00 00 00 00
+02 00 07 05 01
+02 00 08 47 00 11 00 05 00 44 00 52 00 55 00 43 00 4b 00 00
+02 00 09 21 88 c2 20 00 00
+02 00 0a 05 01
+02 00 0b 47 00 09 00 01 00 53 00 00
+02 00 0c 47 00 19 00 09 00 50 00 54 00 30 00 39 00 41 00 44 00 47 00 4f 00 31 00 00
+02 00 0d 05 00
+02 00 0e 47 00 17 00 08 00 4b 00 65 00 69 00 6e 00 65 00 20 00 46 00 57 00 00
+02 00 0f 47 00 0d 00 03 00 41 00 75 00 73 00 00
+02 00 10 21 80 00 00 00 00
+- 01 00 00 00 00 00 37 01 3e 04 95 17 be
+02 00 00 05 00
+02 00 01 01 01
+02 00 02 05 00
+02 00 03 47 00 09 00 01 00 54 00 00
+02 00 04 63 00 00 19 c4 2f
+02 00 05 47 00 09 00 01 00 54 00 00
+02 00 06 63 64 00 19 b9 88
+02 00 07 76 00 6a 05 01 01 00 00 00 08 00 53 00 54 00 4f 00 45 00 52 00 55 00 4e 00 47 00 00 00 39 00 39 00 0f 00 00 2a f1 c6 c4 7a 4f ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00
+02 00 08 47 00 0b 00 02 00 52 00 4c 00 00
+02 00 09 05 00
+02 00 0a 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
+02 00 0b 01 00
+02 00 0c 05 00
+02 00 0d 08 41 a0 8e 39
+02 00 0e 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
+02 00 0f 01 01
+02 00 10 47 00 19 00 09 00 50 00 54 00 30 00 39 00 41 00 4c 00 42 00 43 00 31 00 00
+02 00 11 47 00 0b 00 02 00 56 00 4c 00 00
+02 00 12 08 41 a0 8e 39 01 00 00 00 00 00 3c 01 43 04 9a 17 c3 02 00 00 76 00 58 05 01 01 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 02 00 01 63 00 00 19 c4 2f
+- 01
+
+16 0b
+```
+
+== 0xB101
+
+```
+fa ce 02 a1 00 02 af 0e 00 01 15 e5 54 80 04 00
+
+1b 01 00 00 00 00 00 07 03 6f 01 99 00 04 02 28
+00 08 00 00 00 08 00 7a 00 08 01 84 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00
+- 04 9a 17 c3 00 3c 01 43 00 00 03 e8
+// A/IST_FW_KURZ
+00 02 00 0d 00 41 00 2f 00 49 00 53 00 54 00 5f 00 46 00 57 00 5f 00 4b 00 55 00 52 00 5a 00 00
+// A/BA
+00 03 00 04 00 41 00 2f 00 42 00 41 00 00
+// A/BA_GFES_AUTO
+00 04 00 0e 00 41 00 2f 00 42 00 41 00 5f 00 47 00 46 00 45 00 53 00 5f 00 41 00 55 00 54 00 4f 00 00
+// A/GFE_ALARM
+00 05 00 0b 00 41 00 2f 00 47 00 46 00 45 00 5f 00 41 00 4c 00 41 00 52 00 4d 00 00
+ff ff
+- 04 9b 17 c4 00 3d 01 44 00 00 03 e8
+// GF_STATUS
+00 00 00 09 00 47 00 46 00 5f 00 53 00 54 00 41 00 54 00 55 00 53 00 00
+// ALARMS
+00 01 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
+// BESCH1
+00 02 00 06 00 42 00 45 00 53 00 43 00 48 00 31 00 00
+// SKAL1
+00 03 00 05 00 53 00 4b 00 41 00 4c 00 31 00 00
+// DYN_BESCH1
+00 04 00 0a 00 44 00 59 00 4e 00 5f 00 42 00 45 00 53 00 43 00 48 00 31 00 00
+// A/BA_GFES_AUTO
+00 05 00 0e 00 41 00 2f 00 42 00 41 00 5f 00 47 00 46 00 45 00 53 00 5f 00 41 00 55 00 54 00 4f 00 00
+// A/IST_FW_KURZ
+00 06 00 0d 00 41 00 2f 00 49 00 53 00 54 00 5f 00 46 00 57 00 5f 00 4b 00 55 00 52 00 5a 00 00
+// ISTWERT1
+00 07 00 08 00 49 00 53 00 54 00 57 00 45 00 52 00 54 00 31 00 00
+// A/BA
+00 08 00 04 00 41 00 2f 00 42 00 41 00 00
+// GF_NAME
+00 09 00 07 00 47 00 46 00 5f 00 4e 00 41 00 4d 00 45 00 00
+// A/GFE_ALARM
+00 0a 00 0b 00 41 00 2f 00 47 00 46 00 45 00 5f 00 41 00 4c 00 41 00 52 00 4d 00 00
+ff ff
+- 04 9c 17 c5 00 3e 01 45 00 00 03 e8
+// A/BA_GFES_AUTO
+00 00 00 0e 00 41 00 2f 00 42 00 41 00 5f 00 47 00 46 00 45 00 53 00 5f 00 41 00 55 00 54 00 4f 00 00
+// GF_STATUS
+00 01 00 09 00 47 00 46 00 5f 00 53 00 54 00 41 00 54 00 55 00 53 00 00
+// A/BA
+00 02 00 04 00 41 00 2f 00 42 00 41 00 00
+// ALARMS
+00 03 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
+// A/IST_FW_KURZ
+00 04 00 0d 00 41 00 2f 00 49 00 53 00 54 00 5f 00 46 00 57 00 5f 00 4b 00 55 00 52 00 5a 00 00
+// A/GFE_ALARM
+00 05 00 0b 00 41 00 2f 00 47 00 46 00 45 00 5f 00 41 00 4c 00 41 00 52 00 4d 00 00
+ff ff
+- 03
+
+7d 1c
+```
+
+== 0xB102
+
+```
+fa ce 02 4d 00 02 33 4e 00 0b 63 c0 54 80 04 00
+
+1b 02 00 00 00 00 00 07 03 6f 01 99 00 04 00 00
+00 06 00 01 00 06 00 37 00 06 01 3b 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00
+- 03 00 00 00 00 00 3c 01 43 04 9a 17 c3
+02 00 02 47 00 17 00 08 00 4b 00
+65 00 69 00 6e 00 65 00 20 00 46 00 57 00 00
+02 00 03 05 00
+02 00 04 01 00
+02 00 05 05 01
+- 01 00 00 00 00 00 3d 01 44 04 9b 17 c4
+02 00 00 63 00 00 19 c4 2f
+02 00 01 76 00 76 05 01 01 00 00 00 0e 00 47 00 46 00 45 00 5f 00 56 00 45 00 52 00 52 00 49 00 45 00 47 00 45 00 4c 00 54 00 00 00 54 00 54 00 07 00 00 2a f1 c6 c4 e1 1f ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00
+02 00 02 47 00 09 00 01 00 53 00 00
+02 00 03 24 00 0e 41 20 00 00 00 00 00 00 82 dc 02
+02 00 04 47 00 07 00 00 00 00
+02 00 05 01 00
+02 00 06 47 00 17 00 08 00 4b 00 65 00 69 00 6e 00 65 00 20 00 46 00 57 00 00
+02 00 07 21 80 00 00 00 00
+02 00 08 05 00
+02 00 09 47 00 19 00 09 00 50 00 54 00 30 00 39 00 41 00 48 00 45 00 44 00 31 00 00
+02 00 0a 05 01
+- 01 00 00 00 00 00 3e 01 45 04 9c 17 c5
+02 00 00 01 00
+02 00 01 63 00 00 19 c4 2f
+02 00 02 05 00
+02 00 03 76 00 58 05 01 01 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00
+02 00 04 47 00 17 00 08 00 4b 00 65 00 69 00 6e 00 65 00 20 00 46 00 57 00 00
+02 00 05 05 01
+- 01
+
+6d cc
+```
+
+== 0x0403 (after registration)
+
+```
+fa ce 02 a5 00 02 33 50 00 0b 63 cb 54 80 04 00
+
+04 03 00 00 00 01 00 52 00 00 00 00 00 00 00 00
+00 04 00 00 00 08 00 01 00 00 00 00
+- 05 04 8f 17 b8 00 32 01 39 04 90 17 b9
+02 00 01 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
+02 00 03 08 00 00 00 00
+02 00 0a 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
+02 00 0d 08 42 49 aa aa
+02 00 0f 21 80 42 49 aa aa
+02 00 11 24 00 0e 42 a0 00 00 00 00 00 00 03 e8 01
+- 01 00 33 01 3a 04 91 17 ba
+02 00 02 08 41 0e c7 1c
+02 00 05 24 00 0e 42 c8 00 00 00 00 00 00 04 40 00
+02 00 08 24 00 0e 42 c8 00 00 00 00 00 00 04 40 00
+02 00 09 24 00 0e 41 20 00 00 00 00 00 00 05 45 01
+02 00 0a 08 ba 48 00 00
+02 00 0c 08 00 00 00 00
+- 01 00 34 01 3b 04 92 17 bb
+02 00 00 21 88 3b 23 d8 00
+02 00 03 24 00 0e 3f 80 00 00 bf 80 00 00 82 df 03
+- 01 00 38 01 3f 04 96 17 bf
+02 00 01 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
+02 00 02 76 00 76 05 01 01 00 00 00 0e 00 47 00 46 00 45 00 5f 00 56 00 45 00 52 00 52 00 49 00 45 00 47 00 45 00 4c 00 54 00 00 00 54 00 54 01 07 00 00 2a f1 c7 82 e4 d8 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00
+02 00 03 24 00 0e 40 20 00 00 00 00 00 00 80 16 03
+02 00 09 08 3f 89 68 4c
+02 00 0f 08 42 49 aa aa
+- 01 00 39 01 40 04 97 17 c0
+02 00 01 24 00 0e 41 28 00 00 00 00 00 00 05 45 01
+02 00 0b 21 80 00 00 00 00
+- 01 00 3a 01 41 04 98 17 c1
+02 00 00 24 00 0e 42 c8 00 00 00 00 00 00 06 34 00
+02 00 01 08 3f 7f ff ff
+02 00 03 24 00 0e 3f 99 99 9a 00 00 00 00 80 16 03
+02 00 0c 08 00 00 00 00
+- 01 00 3b 01 42 04 99 17 c2
+02 00 01 24 00 0e 41 20 00 00 00 00 00 00 05 45 01
+02 00 0a 08 00 00 00 00
+- 01 00 36 01 3d 04 94 17 bd
+02 00 01 24 00 0e 45 35 40 00 00 00 00 00 82 dc 00
+02 00 05 24 00 0e 43 c8 00 00 c2 c8 00 00 82 dd 01
+02 00 07 05 01
+02 00 09 21 88 c2 20 00 00
+02 00 10 21 80 00 00 00 00
+- 01 00 37 01 3e 04 95 17 be
+02 00 06 63 64 00 19 b9 88
+02 00 0c 05 00
+- 01 00 3d 01 44 04 9b 17 c4
+02 00 03 24 00 0e 41 20 00 00 00 00 00 00 82 dc 02
+02 00 07 21 80 00 00 00 00
+- 01 00 00 00 00 00 00 00 00
+
+be ff
+```
+
+```
+fa ce 02 27 00 02 33 55 00 0b 63 df 54 80 04 00
+
+04 03 00 00 00 00 00 52 00 00 00 00 00 00 00 00
+00 04 00 00 00 08 00 01 00 00 00 00
+- 06 04 8f 17 b8 00 32 01 39 04 90 17 b9
+02 00 01 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
+02 00 03 08 00 00 00 00
+02 00 0a 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
+02 00 0d 08 42 49 aa aa
+02 00 0f 21 80 42 49 aa aa
+02 00 11 24 00 0e 42 a0 00 00 00 00 00 00 03 e8 01
+- 01 00 33 01 3a 04 91 17 ba
+02 00 02 08 41 0e c7 1c
+02 00 05 24 00 0e 42 c8 00 00 00 00 00 00 04 40 00
+02 00 08 24 00 0e 42 c8 00 00 00 00 00 00 04 40 00
+02 00 09 24 00 0e 41 20 00 00 00 00 00 00 05 45 01
+02 00 0a 08 ba 48 00 00
+02 00 0c 08 00 00 00 00
+- 01 00 34 01 3b 04 92 17 bb
+02 00 00 21 88 3b 23 d8 00
+02 00 03 24 00 0e 3f 80 00 00 bf 80 00 00 82 df 03
+- 01 00 38 01 3f 04 96 17 bf
+02 00 01 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
+02 00 03 24 00 0e 40 20 00 00 00 00 00 00 80 16 03
+02 00 09 08 3f 89 68 4c
+02 00 0f 08 42 49 aa aa
+- 01 00 39 01 40 04 97 17 c0
+02 00 01 24 00 0e 41 28 00 00 00 00 00 00 05 45 01
+02 00 0b 21 80 00 00 00 00 01 00 3a 01 41 04 98 17 c1
+02 00 00 24 00 0e 42 c8 00 00 00 00 00 00 06 34 00
+02 00 01 08 3f 7f ff ff
+02 00 03 24 00 0e 3f 99 99 9a 00 00 00 00 80 16 03
+02 00 0c 08 00 00 00 00
+- 01 00 3b 01 42 04 99 17 c2
+02 00 01 24 00 0e 41 20 00 00 00 00 00 00 05 45 01
+02 00 0a 08 00 00 00 00 01 00 36 01 3d 04 94 17 bd
+02 00 01 24 00 0e 45 35 40 00 00 00 00 00 82 dc 00
+02 00 05 24 00 0e 43 c8 00 00 c2 c8 00 00 82 dd 01
+02 00 09 21 88 c2 20 00 00
+02 00 10 21 80 00 00 00 00
+- 01 00 37 01 3e 04 95 17 be
+02 00 06 63 64 00 19 b9 88
+02 00 0c 05 00 01 00 3d 01 44 04 9b 17 c4
+02 00 03 24 00 0e 41 20 00 00 00 00 00 00 82 dc 02
+02 00 07 21 80 00 00 00 00
+- 01 00 00 00 00 00 00 00 00
+
+51 1a
+```
+
+```
+fa ce 02 27 00 02 33 5e 00 0b 63 f3 54 80 04 00
+04 03 00 00 00 00 00 52 00 00 00 00 00 00 00 00
+00 04 00 00 00 08 00 01 00 00 00 00 07 04 8f 17
+b8 00 32 01 39 04 90 17 b9 02 00 01 24 00 0e 43
+48 00 00 c2 20 00 00 03 e9 01 02 00 03 08 bd 8e
+38 00 02 00 0a 24 00 0e 43 48 00 00 c2 20 00 00
+03 e9 01 02 00 0d 08 42 49 63 8e 02 00 0f 21 80
+42 49 aa aa 02 00 11 24 00 0e 42 a0 00 00 00 00
+00 00 03 e8 01 01 00 33 01 3a 04 91 17 ba 02 00
+02 08 41 0e c7 1c 02 00 05 24 00 0e 42 c8 00 00
+00 00 00 00 04 40 00 02 00 08 24 00 0e 42 c8 00
+00 00 00 00 00 04 40 00 02 00 09 24 00 0e 41 20
+00 00 00 00 00 00 05 45 01 02 00 0a 08 ba 48 00
+00 02 00 0c 08 00 00 00 00 01 00 34 01 3b 04 92
+17 bb 02 00 00 21 88 3b 23 d8 00 02 00 03 24 00
+0e 3f 80 00 00 bf 80 00 00 82 df 03 01 00 38 01
+3f 04 96 17 bf 02 00 01 24 00 0e 43 48 00 00 c2
+20 00 00 03 e9 01 02 00 03 24 00 0e 40 20 00 00
+00 00 00 00 80 16 03 02 00 09 08 3f 89 68 4c 02
+00 0f 08 42 49 aa aa 01 00 39 01 40 04 97 17 c0
+02 00 01 24 00 0e 41 28 00 00 00 00 00 00 05 45
+01 02 00 0b 21 80 00 00 00 00 01 00 3a 01 41 04
+98 17 c1 02 00 00 24 00 0e 42 c8 00 00 00 00 00
+00 06 34 00 02 00 01 08 3f 7f ff ff 02 00 03 24
+00 0e 3f 99 99 9a 00 00 00 00 80 16 03 02 00 0c
+08 00 00 00 00 01 00 3b 01 42 04 99 17 c2 02 00
+01 24 00 0e 41 20 00 00 00 00 00 00 05 45 01 02
+00 0a 08 00 00 00 00 01 00 36 01 3d 04 94 17 bd
+02 00 01 24 00 0e 45 35 40 00 00 00 00 00 82 dc
+00 02 00 05 24 00 0e 43 c8 00 00 c2 c8 00 00 82
+dd 01 02 00 09 21 88 c2 20 00 00 02 00 10 21 80
+00 00 00 00 01 00 37 01 3e 04 95 17 be 02 00 06
+63 64 00 19 b9 88 02 00 0c 05 00 01 00 3d 01 44
+04 9b 17 c4 02 00 03 24 00 0e 41 20 00 00 00 00
+00 00 82 dc 02 02 00 07 21 80 00 00 00 00 01 00
+00 00 00 00 00 00 00 39 bd
+```
+
+
+== After opening a detail dialog
+
+== 0xB101
+
+```
+fa ce 01 3f 00 02 af b9 00 01 18 62 54 80 04 00
+
+1b 01 00 00 00 00 00 07 03 ac 01 d6 00 04 00 c6
+00 08 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00
+- 04 90 17 b9 00 32 01 39 00 00 03 e8
+// A/ALA_T9002_Y/SCHRITTTEXT_ALT
+00 13 00 1d 00 41 00 2f 00 41 00 4c 00 41 00 5f 00 54 00 39 00 30 00 30 00 32 00 5f 00 59 00 2f 00 53 00 43 00 48 00 52 00 49 00 54 00 54 00 54 00 45 00 58 00 54 00 5f 00 41 00 4c 00 54 00 00
+// DESC
+00 14 00 04 00 44 00 45 00 53 00 43 00 00
+// A/ALA_T9002_Y/RESTZEIT
+00 15 00 16 00 41 00 2f 00 41 00 4c 00 41 00 5f 00 54 00 39 00 30 00 30 00 32 00 5f 00 59 00 2f 00 52 00 45 00 53 00 54 00 5a 00 45 00 49 00 54 00 00
+// A/ALA_T9002_Y/SCHRITTTEXT
+00 16 00 19 00 41 00 2f 00 41 00 4c 00 41 00 5f 00 54 00 39 00 30 00 30 00 32 00 5f 00 59 00 2f 00 53 00 43 00 48 00 52 00 49 00 54 00 54 00 54 00 45 00 58 00 54 00 00
+ff ff
+- 01
+d8 bf
+```
+
+== 0xB102
+
+```
+fa ce 01 01 00 02 34 ae 00 0b 66 db 54 80 04 00
+
+1b 02 00 00 00 00 00 07 03 ac 01 d6 00 04 00 00
+00 06 00 01 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00
+- 01 00 00 00 00 00 32 01 39 04 90 17 b9
+02 00 13 47 00 4b 00 22 00 49 00 6e 00 69 00 74 00 69 00 61 00 6c 00 69 00 73 00 69 00 65 00 72 00 75 00 6e 00 67 00 20 00 2e 00 2e 00 2e 00 2e 00 2e 00 20 00 62 00 69 00 74 00 74 00 65 00 20 00 77 00 61 00 72 00 74 00 65 00 6e 00 00
+03 00 14 00 00 00 1f
+02 00 15 03 00 00
+02 00 16 47 00 1d 00 0b 00 57 00 41 00 52 00 54 00 45 00 4e 00 20 00 2e 00 2e 00 2e 00 20 00 00
+- 01
+
+e0 99
+```
+
+== 0xB101
+
+```
+fa ce 05 7d 00 02 af bb 00 01 18 66 54 80 04 00
+
+1b 01 00 00 00 00 00 07 03 ad 01 d7 00 04 05 04
+00 08 00 00 00 08 00 8c 00 08 01 38 00 08 01 e4
+00 08 03 64 00 08 04 10 00 08 04 b8 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00
+- 04 9d 17 c6 00 3f 01 46 00 00 03 e8
+// ALARMS
+00 00 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
+// C/DC1/PV_D
+00 01 00 0a 00 43 00 2f 00 44 00 43 00 31 00 2f 00 50 00 56 00 5f 00 44 00 00
+// SIM_AKT
+00 02 00 07 00 53 00 49 00 4d 00 5f 00 41 00 4b 00 54 00 00
+// C/BA
+00 03 00 04 00 43 00 2f 00 42 00 41 00 00
+// FREIGABE
+00 04 00 08 00 46 00 52 00 45 00 49 00 47 00 41 00 42 00 45 00 00
+// BAD_ACTIVE
+00 05 00 0a 00 42 00 4100 44 00 5f 00 41 00 43 00 54 00 49 00 56 00 45 00 00
+ff ff
+- 04 9e 17 c7 00 40 01 47 00 00 03 e8
+// C/IST
+00 00 00 05 00 43 00 2f 00 49 00 53 00 54 00 00
+// X_SCALE
+00 01 00 07 00 58 00 5f 00 53 00 43 00 41 00 4c 00 45 00 00
+// SIM_AKT
+00 02 00 07 00 53 00 49 00 4d 00 5f 00 41 00 4b 00 54 00 00
+// ALARMS
+00 03 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
+// BILD_TXT
+00 04 00 08 00 42 00 49 00 4c 00 44 00 5f 00 54 00 58 00 54 00 00
+// C/BA
+00 05 00 04 00 43 00 2f 00 42 00 41 00 00
+// BAD_ACTIVE
+00 06 00 0a 00 42 00 41 00 44 00 5f 00 41 00 43 00 54 00 49 00 56 00 45 00 00
+// C/PV_DYN
+00 07 00 08 00 43 00 2f 00 50 00 56 00 5f 00 44 00 59 00 4e 00 00
+ff ff
+- 04 9f 17 c8 00 41 01 48 00 00 03 e8
+// BAD_ACTIVE
+00 00 00 0a 00 42 00 41 00 44 00 5f 00 41 00 43 00 54 00 49 00 56 00 45 00 00
+// C/PV_DYN
+00 01 00 08 00 43 00 2f 00 50 00 56 00 5f 00 44 00 59 00 4e 00 00
+// C/IST
+00 02 00 05 00 43 00 2f 00 49 00 53 00 54 00 00
+// X_SCALE
+00 03 00 07 00 58 00 5f 00 53 00 43 00 41 00 4c 00 45 00 00
+// ALARMS
+00 04 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
+// SIM_AKT
+00 05 00 07 00 53 00 49 00 4d 00 5f 00 41 00 4b 00 54 00 00
+// BILD_TXT
+00 06 00 08 00 42 00 49 00 4c 00 44 00 5f 00 54 00 58 00 54 00 00
+// C/BA
+00 07 00 04 00 43 00 2f 00 42 00 41 00 00
+ff ff
+- 04 a0 17 c9 00 42 01 49 00 00 03 e8
+// ALARMS
+00 00 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
+// YAW_MAX
+00 01 00 07 00 59 00 41 00 57 00 5f 00 4d 00 41 00 58 00 00
+// C/AUT_MODUS
+00 02 00 0b 00 43 00 2f 00 41 00 55 00 54 00 5f 00 4d 00 4f 00 44 00 55 00 53 00 00
+// C/FREIGABE
+00 03 00 0a 00 43 00 2f 00 46 00 52 00 45 00 49 00 47 00 41 00 42 00 45 00 00
+// C/PV_DYN
+00 04 00 08 00 43 00 2f 00 50 00 56 00 5f 00 44 00 59 00 4e 00 00
+// X
+00 05 00 01 00 58 00 00
+// SIM_AKT
+00 06 00 07 00 53 00 49 00 4d 00 5f 00 41 00 4b 00 54 00 00
+// C/PI/PV_SCALE
+00 07 00 0d 00 43 00 2f 00 50 00 49 00 2f 00 50 00 56 00 5f 00 53 00 43 00 41 00 4c 00 45 00 00
+// BILD_TXT
+00 08 00 08 00 42 00 49 00 4c 00 44 00 5f 00 54 00 58 00 54 00 00
+// YAW_MIN
+00 09 00 07 00 59 00 41 00 57 00 5f 00 4d 00 49 00 4e 00 00
+// C/KASKMOD
+00 0a 00 09 00 43 00 2f 00 4b 00 41 00 53 00 4b 00 4d 00 4f 00 44 00 00
+// C/W_WORK
+00 0b 00 08 00 43 00 2f 00 57 00 5f 00 57 00 4f 00 52 00 4b 00 00
+// X_SCALE
+00 0c 00 07 00 58 00 5f 00 53 00 43 00 41 00 4c 00 45 00 00
+// C/PI/OUT
+00 0d 00 08 00 43 00 2f 00 50 00 49 00 2f 00 4f 00 55 00 54 00 00
+// C/OP_MODUS
+00 0e 00 0a 00 43 00 2f 00 4f 00 50 00 5f 00 4d 00 4f 00 44 00 55 00 53 00 00
+// BAD_ACTIVE
+00 0f 00 0a 00 42 00 41 00 44 00 5f 00 41 00 43 00 54 00 49 00 56 00 45 00 00
+// C/BA
+00 10 00 04 00 43 00 2f 00 42 00 41 00 00
+ff ff
+- 04 a1 17 ca 00 43 01 4a 00 00 03 e8
+// C/BA
+00 00 00 04 00 43 00 2f 00 42 00 41 00 00
+// ALARMS
+00 01 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
+// BAD_ACTIVE
+00 02 00 0a 00 42 00 41 00 44 00 5f 00 41 00 43 00 54 00 49 00 56 00 45 00 00
+// C/PV_DYN
+00 03 00 08 00 43 00 2f 00 50 00 56 00 5f 00 44 00 59 00 4e 00 00
+// C/PV_DYN
+00 04 00 05 00 43 00 2f 00 49 00 53 00 54 00 00
+// X_SCALE
+00 05 00 07 00 58 00 5f 00 53 00 43 00 41 00 4c 00 45 00 00
+// SIM_AKT
+00 06 00 07 00 53 00 49 00 4d 00 5f 00 41 00 4b 00 54 00 00
+// BILD_TXT
+00 07 00 08 00 42 00 49 00 4c 00 44 00 5f 00 54 00 58 00 54 00 00
+ff ff
+- 04 a2 17 cb 00 44 01 4b 00 00 03 e8
+// ALARMS
+00 00 00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
+// C/RC_AUF
+00 01 00 08 00 43 00 2f 00 52 00 43 00 5f 00 41 00 55 00 46 00 00
+// Y
+00 02 00 01 00 59 00 00
+// BAD_ACTIVE
+00 03 00 0a 00 42 00 41 00 44 00 5f 00 41 00 43 00 54 00 49 00 56 00 45 00 00
+// C/BA
+00 04 00 04 00 43 00 2f 00 42 00 41 00 00
+// C/FREIGABE
+00 05 00 0a 00 43 00 2f 00 46 00 52 00 45 00 49 00 47 00 41 00 42 00 45 00 00
+// C/RC_ZU
+00 06 00 07 00 43 00 2f 00 52 00 43 00 5f 00 5a 00 55 00 00
+// SIM_AKT
+00 07 00 07 00 53 00 49 00 4d 00 5f 00 41 00 4b 00 54 00 00
+ff ff
+- 04 a3 17 cc 00 45 01 4c 00 00 03 e8
+// C/RC_AUF
+00 00 00 08 00 43 00 2f 00 52 00 43 00 5f 00 41 00 55 00 46 00 00
+// BAD_ACTIVE
+00 01 00 0a 00 42 00 41 00 44 00 5f 00 41 00 43 00 54 00 49 00 56 00 45 00 00
+// C/BA
+00 02 00 04 00 43 00 2f 00 42 00 41 00 00
+ff ff
+- 07
+
+22 05
+```
+
+== 0xB102
+
+```
+fa ce 04 e1 00 02 34 b0 00 0b 66 df 54 80 04 00
+1b 02 00 00 00 00 00 07 03 ad 01 d7 00 04 00 00
+00 06 00 01 00 06 00 94 00 06 01 37 00 06 02 00
+00 06 02 f5 00 06 03 98 00 06 04 4d 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 07 00 00 00 00 00 3f 01
+46 04 9d 17 c6 02 00 00 76 00 66 05 01 01 00 00
+00 06 00 46 00 45 00 48 00 4c 00 45 00 52 00 00
+00 3b 00 3b 01 0d 00 00 2a f2 70 c7 be 79 ff ff
+00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff
+00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff
+00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff
+00 00 00 00 00 ff 00 00 00 00 00 00 00 00 02 00
+01 63 00 7c 0d a6 a2 02 00 02 01 00 02 00 03 05
+01 02 00 04 01 01 02 00 05 01 00 01 00 00 00 00
+00 40 01 47 04 9e 17 c7 02 00 00 08 42 48 d5 53
+02 00 01 24 00 0e 43 48 00 00 c2 20 00 00 03 e9
+01 02 00 02 01 00 02 00 03 76 00 58 05 01 01 00
+00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00
+00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00
+00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00
+00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00
+00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00
+00 02 00 04 47 00 0b 00 02 00 54 00 49 00 00 02
+00 05 05 01 02 00 06 01 00 02 00 07 01 00 01 00
+00 00 00 00 41 01 48 04 9f 17 c8 02 00 00 01 00
+02 00 01 01 01 02 00 02 08 00 00 00 00 02 00 03
+24 00 0e 41 a0 00 00 00 00 00 00 05 45 01 02 00
+04 76 00 7e 05 01 01 00 00 00 07 00 4d 00 49 00
+4e 00 5f 00 41 00 4c 00 4d 00 00 00 32 00 32 01
+0d 00 00 2a f2 70 c7 21 f3 00 0a 00 4d 00 49 00
+4e 00 5f 00 53 00 43 00 48 00 41 00 4c 00 54 00
+00 00 36 00 36 00 03 00 00 2a f2 70 c7 21 f6 ff
+ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff
+ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff
+ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 02
+00 05 01 00 02 00 06 47 00 0b 00 02 00 46 00 49
+00 00 02 00 07 05 01 01 00 00 00 00 00 42 01 49
+04 a0 17 c9 02 00 00 76 00 58 05 01 01 00 00 ff
+ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff
+ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff
+ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff
+ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff
+ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 02
+00 01 08 42 c8 00 00 02 00 02 63 00 00 19 c9 9c
+02 00 03 48 80 01 02 00 04 01 00 02 00 05 21 80
+42 49 1c 72 02 00 06 01 00 02 00 07 24 00 0e 43
+48 00 00 c2 20 00 00 03 e9 01 02 00 08 47 00 0d
+00 03 00 54 00 49 00 43 00 00 02 00 09 08 00 00
+00 00 02 00 0a 01 00 02 00 0b 08 42 49 1c 72 02
+00 0c 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
+02 00 0d 21 c3 42 17 aa ab 02 00 0e 63 00 00 19
+9c 7b 02 00 0f 01 00 02 00 10 05 01 01 00 00 00
+00 00 43 01 4a 04 a1 17 ca 02 00 00 05 01 02 00
+01 76 00 58 05 01 01 00 00 ff ff 00 00 00 00 00
+ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00
+ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00
+ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00
+ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00 00
+ff 00 00 00 00 00 00 00 00 02 00 02 01 00 02 00
+03 01 00 02 00 04 08 42 49 1c 72 02 00 05 24 00
+0e 43 48 00 00 c2 20 00 00 03 e9 01 02 00 06 01
+00 02 00 07 47 00 0b 00 02 00 54 00 49 00 00 01
+00 00 00 00 00 44 01 4b 04 a2 17 cb 02 00 00 76
+00 7e 05 01 01 00 00 00 0a 00 4d 00 41 00 58 00
+5f 00 53 00 43 00 48 00 41 00 4c 00 54 00 00 00
+2e 00 2e 00 03 00 00 2a f2 71 9b 0f 2c 00 07 00
+4d 00 41 00 58 00 5f 00 41 00 4c 00 4d 00 00 00
+29 00 29 00 03 00 00 2a f2 71 9b 0f 2b ff ff 00
+00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00
+00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00
+00 00 00 00 ff 00 00 00 00 00 00 00 00 02 00 01
+01 00 02 00 02 21 80 3c ce e0 00 02 00 03 01 00
+02 00 04 05 01 02 00 05 01 01 02 00 06 01 01 02
+00 07 01 00 01 00 00 00 00 00 45 01 4c 04 a3 17
+cc 02 00 00 01 00 02 00 01 01 00 02 00 02 05 01
+01 42 c5
+```
+
+== 0xB101
+
+```
+fa ce 01 bb 00 02 af bc 00 01 18 67 54 80 04 00
+1b 01 00 00 00 00 00 07 03 ae 01 d8 00 04 01 42
+00 08 00 00 00 08 00 a8 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 04 a9 17 d2 00 4b 01 52
+00 00 03 e8 00 00 00 07 00 53 00 49 00 4d 00 5f
+00 41 00 4b 00 54 00 00 00 01 00 06 00 41 00 4c
+00 41 00 52 00 4d 00 53 00 00 00 02 00 08 00 43
+00 2f 00 52 00 43 00 5f 00 41 00 55 00 46 00 00
+00 03 00 0a 00 42 00 41 00 44 00 5f 00 41 00 43
+00 54 00 49 00 56 00 45 00 00 00 04 00 01 00 59
+00 00 00 05 00 04 00 43 00 2f 00 42 00 41 00 00
+00 06 00 0a 00 43 00 2f 00 46 00 52 00 45 00 49
+00 47 00 41 00 42 00 45 00 00 00 07 00 07 00 43
+00 2f 00 52 00 43 00 5f 00 5a 00 55 00 00 ff ff
+04 aa 17 d3 00 4c 01 53 00 00 03 e8 00 00 00 09
+00 47 00 5f 00 5a 00 55 00 53 00 54 00 41 00 4e
+00 44 00 00 00 01 00 04 00 43 00 2f 00 42 00 41
+00 00 00 02 00 06 00 41 00 4c 00 41 00 52 00 4d
+00 53 00 00 00 03 00 08 00 46 00 52 00 45 00 49
+00 47 00 41 00 42 00 45 00 00 00 04 00 08 00 43
+00 2f 00 52 00 43 00 5f 00 41 00 55 00 46 00 00
+00 05 00 07 00 53 00 49 00 4d 00 5f 00 41 00 4b
+00 54 00 00 00 06 00 07 00 43 00 2f 00 52 00 43
+00 5f 00 5a 00 55 00 00 ff ff 02 e7 95
+```
+
+== 0xB102
+
+```
+fa ce 01 bf 00 02 34 b2 00 0b 66 e0 54 80 04 00
+1b 02 00 00 00 00 00 07 03 ae 01 d8 00 04 00 00
+00 06 00 01 00 06 00 be 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 02 00 00 00 00 00 4b 01
+52 04 a9 17 d2 02 00 00 01 00 02 00 01 76 00 86
+05 01 01 00 00 00 0a 00 56 00 45 00 52 00 52 00
+49 00 45 00 47 00 45 00 4c 00 54 00 00 00 54 00
+54 00 04 00 00 2a f2 71 97 40 42 00 0b 00 4d 00
+49 00 4e 00 5f 00 41 00 5f 00 41 00 4c 00 4d 00
+5f 00 59 00 00 00 35 00 35 00 03 00 00 2a f2 71
+96 46 47 ff ff 00 00 00 00 00 ff 00 00 00 00 00
+00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00
+00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00
+00 00 00 02 00 02 01 00 02 00 03 01 00 02 00 04
+21 80 00 00 00 00 02 00 05 05 01 02 00 06 01 00
+02 00 07 01 01 01 00 00 00 00 00 4c 01 53 04 aa
+17 d3 02 00 00 07 00 00 00 00 02 00 01 05 01 02
+00 02 76 00 58 05 01 01 00 00 ff ff 00 00 00 00
+00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00
+00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00
+00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00
+00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00 00
+00 ff 00 00 00 00 00 00 00 00 02 00 03 01 01 02
+00 04 01 01 02 00 05 01 00 02 00 06 01 00 01 b2
+29
+```
+
+== 0xB101
+
+```
+fa ce 04 a9 00 02 af bd 00 01 18 68 54 80 04 00
+1b 01 00 00 00 00 00 07 03 af 01 d9 00 04 04 30
+00 08 00 00 00 08 00 6a 00 08 00 f0 00 08 02 7a
+00 08 03 00 00 08 03 86 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 04 a3 17 cc 00 45 01 4c
+00 00 03 e8 00 03 00 06 00 41 00 4c 00 41 00 52
+00 4d 00 53 00 00 00 04 00 0a 00 43 00 2f 00 46
+00 52 00 45 00 49 00 47 00 41 00 42 00 45 00 00
+00 05 00 07 00 43 00 2f 00 52 00 43 00 5f 00 5a
+00 55 00 00 00 06 00 01 00 59 00 00 00 07 00 07
+00 53 00 49 00 4d 00 5f 00 41 00 4b 00 54 00 00
+ff ff 04 a4 17 cd 00 46 01 4d 00 00 03 e8 00 00
+00 07 00 49 00 53 00 54 00 57 00 45 00 52 00 54
+00 00 00 01 00 0a 00 42 00 41 00 44 00 5f 00 41
+00 43 00 54 00 49 00 56 00 45 00 00 00 02 00 04
+00 43 00 2f 00 42 00 41 00 00 00 03 00 06 00 41
+00 4c 00 41 00 52 00 4d 00 53 00 00 00 04 00 08
+00 46 00 52 00 45 00 49 00 47 00 41 00 42 00 45
+00 00 00 05 00 07 00 53 00 49 00 4d 00 5f 00 41
+00 4b 00 54 00 00 ff ff 04 a5 17 ce 00 47 01 4e
+00 00 03 e8 00 00 00 07 00 53 00 49 00 4d 00 5f
+00 41 00 4b 00 54 00 00 00 01 00 08 00 42 00 49
+00 4c 00 44 00 5f 00 54 00 58 00 54 00 00 00 02
+00 06 00 41 00 4c 00 41 00 52 00 4d 00 53 00 00
+00 03 00 09 00 43 00 2f 00 4b 00 41 00 53 00 4b
+00 4d 00 4f 00 44 00 00 00 04 00 0b 00 43 00 2f
+00 41 00 55 00 54 00 5f 00 4d 00 4f 00 44 00 55
+00 53 00 00 00 05 00 08 00 43 00 2f 00 57 00 5f
+00 57 00 4f 00 52 00 4b 00 00 00 06 00 07 00 58
+00 5f 00 53 00 43 00 41 00 4c 00 45 00 00 00 07
+00 08 00 43 00 2f 00 50 00 49 00 2f 00 4f 00 55
+00 54 00 00 00 08 00 06 00 59 00 2d 00 48 00 45
+00 4c 00 50 00 00 00 09 00 0a 00 42 00 41 00 44
+00 5f 00 41 00 43 00 54 00 49 00 56 00 45 00 00
+00 0a 00 04 00 43 00 2f 00 42 00 41 00 00 00 0b
+00 0a 00 43 00 2f 00 46 00 52 00 45 00 49 00 47
+00 41 00 42 00 45 00 00 00 0c 00 0a 00 43 00 2f
+00 4f 00 50 00 5f 00 4d 00 4f 00 44 00 55 00 53
+00 00 00 0d 00 08 00 43 00 2f 00 50 00 56 00 5f
+00 44 00 59 00 4e 00 00 00 0e 00 01 00 58 00 00
+00 0f 00 09 00 45 00 58 00 54 00 5f 00 54 00 52
+00 41 00 43 00 4b 00 00 00 10 00 0d 00 43 00 2f
+00 50 00 49 00 2f 00 50 00 56 00 5f 00 53 00 43
+00 41 00 4c 00 45 00 00 00 11 00 01 00 59 00 00
+ff ff 04 a6 17 cf 00 48 01 4f 00 00 03 e8 00 00
+00 0a 00 42 00 41 00 44 00 5f 00 41 00 43 00 54
+00 49 00 56 00 45 00 00 00 01 00 04 00 43 00 2f
+00 42 00 41 00 00 00 02 00 06 00 41 00 4c 00 41
+00 52 00 4d 00 53 00 00 00 03 00 08 00 46 00 52
+00 45 00 49 00 47 00 41 00 42 00 45 00 00 00 04
+00 07 00 53 00 49 00 4d 00 5f 00 41 00 4b 00 54
+00 00 00 05 00 07 00 49 00 53 00 54 00 57 00 45
+00 52 00 54 00 00 ff ff 04 a7 17 d0 00 49 01 50
+00 00 03 e8 00 00 00 07 00 53 00 49 00 4d 00 5f
+00 41 00 4b 00 54 00 00 00 01 00 06 00 41 00 4c
+00 41 00 52 00 4d 00 53 00 00 00 02 00 08 00 46
+00 52 00 45 00 49 00 47 00 41 00 42 00 45 00 00
+00 03 00 0a 00 42 00 41 00 44 00 5f 00 41 00 43
+00 54 00 49 00 56 00 45 00 00 00 04 00 04 00 43
+00 2f 00 42 00 41 00 00 00 05 00 07 00 49 00 53
+00 54 00 57 00 45 00 52 00 54 00 00 ff ff 04 a8
+17 d1 00 4a 01 51 00 00 03 e8 00 00 00 07 00 53
+00 49 00 4d 00 5f 00 41 00 4b 00 54 00 00 00 01
+00 07 00 58 00 5f 00 53 00 43 00 41 00 4c 00 45
+00 00 00 02 00 08 00 42 00 49 00 4c 00 44 00 5f
+00 54 00 58 00 54 00 00 00 03 00 04 00 43 00 2f
+00 42 00 41 00 00 00 04 00 06 00 41 00 4c 00 41
+00 52 00 4d 00 53 00 00 00 05 00 09 00 47 00 5f
+00 5a 00 55 00 53 00 54 00 41 00 4e 00 44 00 00
+00 06 00 08 00 43 00 2f 00 50 00 56 00 5f 00 44
+00 59 00 4e 00 00 00 07 00 05 00 43 00 2f 00 49
+00 53 00 54 00 00 ff ff 06 c1 f7
+```
+
+== 0xB102
+
+```
+fa ce 04 82 00 02 34 b3 00 0b 66 e2 54 80 04 00
+1b 02 00 00 00 00 00 07 03 af 01 d9 00 04 00 00
+00 06 00 01 00 06 00 af 00 06 01 42 00 06 02 3d
+00 06 02 d0 00 06 03 63 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 06 00 00 00 00 00 45 01
+4c 04 a3 17 cc 02 00 03 76 00 86 05 01 01 00 00
+00 0a 00 56 00 45 00 52 00 52 00 49 00 45 00 47
+00 45 00 4c 00 54 00 00 00 54 00 54 00 04 00 00
+2a f2 70 d0 7b d3 00 0b 00 4d 00 49 00 4e 00 5f
+00 41 00 5f 00 41 00 4c 00 4d 00 5f 00 59 00 00
+00 35 00 35 00 03 00 00 2a f1 c7 5e 3e a7 ff ff
+00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff
+00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff
+00 00 00 00 00 ff 00 00 00 00 00 00 00 00 02 00
+04 01 00 02 00 05 01 01 02 00 06 21 80 00 00 00
+00 02 00 07 01 00 01 00 00 00 00 00 46 01 4d 04
+a4 17 cd 02 00 00 63 01 7c 0d a6 d7 02 00 01 01
+00 02 00 02 05 01 02 00 03 76 00 66 05 01 01 00
+00 00 06 00 46 00 45 00 48 00 4c 00 45 00 52 00
+00 00 52 00 52 01 0d 00 00 2a f1 c7 f0 48 88 ff
+ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff
+ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff
+ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff
+ff 00 00 00 00 00 ff 00 00 00 00 00 00 00 00 02
+00 04 01 01 02 00 05 01 00 01 00 00 00 00 00 47
+01 4e 04 a5 17 ce 02 00 00 01 00 02 00 01 47 00
+0d 00 03 00 54 00 49 00 43 00 00 02 00 02 76 00
+58 05 01 01 00 00 ff ff 00 00 00 00 00 ff 00 00
+00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00
+00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00
+00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00
+00 00 00 00 00 00 ff ff 00 00 00 00 00 ff 00 00
+00 00 00 00 00 00 02 00 03 01 00 02 00 04 63 01
+00 19 c9 9c 02 00 05 08 42 4c 00 00 02 00 06 24
+00 0e 43 48 00 00 c2 20 00 00 03 e9 01 02 00 07
+21 c0 42 95 fe c7 02 00 08 08 42 48 00 00 02 00
+09 01 00 02 00 0a 05 01 02 00 0b 48 80 01 02 00
+0c 63 01 00 19 9c 7b 02 00 0d 01 00 02 00 0e 21
+80 42 49 1c 72 02 00 0f 01 00 02 00 10 24 00 0e
+43 48 00 00 c2 20 00 00 03 e9 01 02 00 11 21 80
+42 95 fe c7 01 00 00 00 00 00 48 01 4f 04 a6 17
+cf 02 00 00 01 00 02 00 01 05 01 02 00 02 76 00
+66 05 01 01 00 00 00 06 00 46 00 45 00 48 00 4c
+00 45 00 52 00 00 00 52 00 52 01 0d 00 00 2a f2
+70 c7 30 06 ff ff 00 00 00 00 00 ff 00 00 00 00
+00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00
+00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00
+00 00 00 00 ff ff 00 00 00 00 00 ff 00 00 00 00
+00 00 00 00 02 00 03 01 00 02 00 04 01 00 02 00
+05 63 00 7c 0d a6 d7 01 00 00 00 00 00 49 01 50
+04 a7 17 d0 02 00 00 01 00 02 00 01 76 00 66 05
+01 01 00 00 00 06 00 46 00 45 00 48 00 4c 00 45
+00 52 00 00 00 52 00 52 01 0d 00 00 2a f1 c8 bc
+f6 68 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00
+00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00
+00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00
+00 00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00
+00 00 02 00 02 01 00 02 00 03 01 00 02 00 04 05
+01 02 00 05 63 00 7c 0d a6 d7 01 00 00 00 00 00
+4a 01 51 04 a8 17 d1 02 00 00 01 00 02 00 01 24
+00 0e 43 48 00 00 c2 20 00 00 03 e9 01 02 00 02
+47 00 0b 00 02 00 54 00 49 00 00 02 00 03 05 01
+02 00 04 76 00 58 05 01 01 00 00 ff ff 00 00 00
+00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00
+00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00
+00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00
+00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00
+00 00 ff 00 00 00 00 00 00 00 00 02 00 05 07 00
+00 00 00 02 00 06 01 00 02 00 07 21 80 42 48 00
+00 01 42 28
+```
+
+== After quite some time ...
+
+== 0xB101
+
+```
+fa ce 00 97 00 02 b0 5f 00 01 1a cd 54 80 04 00
+1b 01 00 00 00 00 00 07 01 ed 00 16 00 04 00 1e
+00 08 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 04 9e 17 c7 00 40 01 47
+00 00 03 e8 00 08 00 05 00 49 00 44 00 49 00 53
+00 50 00 00 ff ff 01 99 70
+```
+
+== 0xB102
+
+```
+fa ce 00 8d 00 02 36 02 00 0b 69 df 54 80 04 00
+1b 02 00 00 00 00 00 07 01 ed 00 16 00 04 00 00
+00 06 00 01 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 01 00 00 00 00 00 40 01
+47 04 9e 17 c7 03 00 08 00 00 00 1f 01 4a 60
+```
+
+== 0xB101
+
+```
+fa ce 00 a9 00 02 b0 66 00 01 1a e1 54 80 04 00
+1b 01 00 00 00 00 00 07 01 ee 00 17 00 04 00 30
+00 08 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 04 9e 17 c7 00 40 01 47
+00 00 03 e8 00 09 00 0e 00 43 00 2f 00 53 00 57
+00 5f 00 4d 00 41 00 58 00 5f 00 53 00 43 00 41
+00 4c 00 45 00 00 ff ff 01 cf 34
+```
+
+== 0xB102
+
+```
+fa ce 00 97 00 02 36 10 00 0b 69 f8 54 80 04 00
+1b 02 00 00 00 00 00 07 01 ee 00 17 00 04 00 00
+00 06 00 01 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 01 00 00 00 00 00 40 01
+47 04 9e 17 c7 02 00 09 24 00 0e 43 48 00 00 c2
+20 00 00 03 e9 01 01 74 11
+```
+
+
+
+
+
+
+
+```
+fa ce 05 14 00 02 9a 21 00 01 c8 96 54 80 04 00
+
+1b 02 00 00 00 00 00 07 03 bf 01 1b 00 04 00 00
+00 06 00 01 00 06 01 81 00 06 02 d6 00 06 03 e4
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00
+04 00 00 00 00 00 35 01 4b 08 ea 1c 13
+02 00 00 47 00 0b 00 02 00 44 00 54 00 00
+02 00 01 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
+02 00 02 47 00 0b 00 02 00 56 00 4c 00 00
+02 00 03 08 00 00 00 00
+02 00 04 63 00 00 19 c4 2f
+02 00 05 76 00 88 05 01 01 00 00 00 0e
+00 47 00 46 00 45 00 5f 00 56 00 45 00 52 00 52
+00 49 00 45 00 47 00 45 00 4c 00 54 00 00 00 54
+00 00 01 07 00 00 2a f5 b7 5d f8 ed 00 08 00 53
+00 54 00 4f 00 45 00 52 00 55 00 4e 00 47 00 00
+00 39 00 39 00 0f 00 00 2a f4 8e c3 64 22 ff ff
+00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff
+00 00 00 00 00 ff 00 00 00 00 00 00 00 00 ff ff
+00 00 00 00 00 ff 00 00 00 00 00 00 00 00
+02 00
+06 47 00 09 00 01 00 54 00 00
+02 00 07 05 00
+02 00 08 01 01
+02 00 09 47 00 0b 00 02 00 49 00 54 00 00
+02 00 0a 24 00 0e 43 48 00 00 c2 20 00 00 03 e9 01
+02 00 0b 05 01
+02 00 0c 47 00 19 00 09 00 50 00 54 00 30 00 39 00 41 00 4c 00 41 00 43 00 31 00 00
+02 00 0d 08 c2 20 00 00
+02 00 0e 47 00 17 00 08 00 4b 00 65 00 69 00 6e 00 65 00 20 00 46 00 57 00 00
+02 00 0f 21 80 c2 20 00 00 02 00 10 47 00 09 00 01 00 54 00 00
+02 00 11 24 00 0e 42 a0 00 00 00 00 00 00 03 e8 01
+02 00 12 47 00 09 00 01 00 54 00 00
+- 01 00 00 00 00 00 36 01 4c 08 eb 1c 14
+02 00 00 47 00 17 00 08 00 4b 00 65 00 69 00 6e 00 65 00 20 00 46 00 57 00 00
+02 00 01 63 00 00 19 c4 2f
+02 00 02 08 41 0e c7 1c
+02 00 03 47 00 0d 00 03 00 46 00 4c 00 55 00 00
+02 00 04 76 00 58 05 01 01 00 00 ff ff 00 00 00
+00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00
+00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00
+00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00
+00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00 00
+00 00 ff 00 00 00 00 00 00 00 00
+02 00 05 24 00
+0e 42 c8 00 00 00 00 00 00 04 40 00 02 00 06 47
+00 0d 00 03 00 46 00 30 00 31 00 00 02 00 07 47
+00 09 00 01 00 57 00 00 02 00 08 24 00 0e 42 c8
+00 00 00 00 00 00 04 40 00 02 00 09 24 00 0e 41
+20 00 00 00 00 00 00 05 45 01 02 00 0a 08 ba 48
+00 00 02 00 0b 47 00 19 00 09 00 50 00 54 00 30
+00 39 00 41 00 41 00 48 00 52 00 31 00 00 02 00
+0c 08 00 00 00 00 02 00 0d 05 00 02 00 0e 47 00
+09 00 01 00 46 00 00 02 00 0f 47 00 0d 00 03 00
+46 00 53 00 54 00 00 02 00 10 01 00 02 00 11 05
+01 02 00 12 47 00 09 00 01 00 57 00 00 01 00 00
+00 00 00 37 01 4d 08 ec 1c 15 02 00 00 21 88 3b
+23 d8 00 02 00 01 05 01 02 00 02 47 00 17 00 08
+00 4b 00 65 00 69 00 6e 00 65 00 20 00 46 00 57
+00 00 02 00 03 24 00 0e 3f 80 00 00 bf 80 00 00
+82 df 03 02 00 04 76 00 76 05 01 01 00 00 00 0e
+00 47 00 46 00 45 00 5f 00 56 00 45 00 52 00 52
+00 49 00 45 00 47 00 45 00 4c 00 54 00 00 00 54
+00 54 01 07 00 00 2a f4 92 c2 4a 74 ff ff 00 00
+00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00
+00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00
+00 00 00 ff 00 00 00 00 00 00 00 00 ff ff 00 00
+00 00 00 ff 00 00 00 00 00 00 00 00 02 00 05 63
+00 00 19 c4 2f 02 00 06 47 00 19 00 09 00 50 00
+54 00 30 00 39 00 41 00 4d 00 42 00 4d 00 31 00
+00 02 00 07 47 00 07 00 00 00 00 02 00 08 05 00
+02 00 09 05 01 02 00 0a 47 00 09 00 01 00 50 00
+00 02 00 0b 05 01 02 00 0c 01 00 01 00 00 00 00
+00 38 01 4e 08 ed 1c 16 02 00 00 76 00 76 05 01
+01 00 00 00 0e 00 47 00 46 00 45 00 5f 00 56 00
+45 00 52 00 52 00 49 00 45 00 47 00 45 00 4c 00
+54 00 00 00 54 00 54 00 07 00 00 2a f4 8e c4 35
+ef ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00
+00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00
+00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00
+00 ff ff 00 00 00 00 00 ff 00 00 00 00 00 00 00
+00 02 00 01 47 00 17 00 08 00 4b 00 65 00 69 00
+6e 00 65 00 20 00 46 00 57 00 00 02 00 02 05 00
+02 00 03 05 00 02 00 04 63 00 00 19 c4 2f 02 00
+05 05 00
+01
+
+fa f9
+```
+
+
+
diff --git a/src/site/asciidoc/protocols/delta-v/reverse-engineering.adoc b/src/site/asciidoc/protocols/delta-v/reverse-engineering.adoc
index 558da7dbe1f..69e2466652b 100644
--- a/src/site/asciidoc/protocols/delta-v/reverse-engineering.adoc
+++ b/src/site/asciidoc/protocols/delta-v/reverse-engineering.adoc
@@ -1,252 +1,252 @@
-//
-//  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
-//
-//      http://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.
-//
-:imagesdir: ../../images/
-
-== Reverse Engineering the DeltaV protocol
-
-This document should describe what we did in order to reverse-engineer the DeltaV protocol.
-
-The sole purpose of this document, is to write document our path in order to eventually protect ourselves against accusation of using illegal measures in gaining the information we got.
-
-=== Starting point
-
-We kindly were provided with access to a DeltaV system used for training.
-
-Therefore we were able to change a few things without fearing to break anything important.
-
-This system consisted of three DeltaV controllers, two Operator-System instances
-So in general there were three types of systems involved:
-
-1. DeltaV Controller
-2. DeltaV Operator-System
-3. Laptop running WireShark
-
-The first change here, was to replace the network switch with a network hub, so we could capture the entire network traffic.
-(By the way ... if you happen to still have a working Hub, don't give that away. It turns out it's really hard to get you hands on hubs these days)
-
-With this we let the system run and did a pretty long network capture.
-
-This 29MB WireShark capture was what we started working with.
-
-=== Identifying the protocol
-
-As WireShark didn't have a DeltaV disector, we had to trace it down ourselves.
-
-When looking at the capture, we very quickly filtered out the usual network protocols and the Windows communication and found a lot of binary `UDP` traffic running on port `18507`.
-
-Special with all of these was that they all started with a payload of `0xFACE`.
-
-=== First steps in understanding the protocol
-
-Here it appeared that `UDP` packets are sent with some sort of payload, which are obviously responded to by packets with a fixed and very small size (64 bytes).
-
-So we are assuming these short messages, that seem to partially repeat some of the information of the first packet (but not all), are probably acknowledge packets.
-
-From looking at the nature of the traffic and knowing the IP addresses of the DeltaV controllers (PLC) and the Operator Systems (Controll-Software), we could see that this communication is probably subscription based as we could see a lot of the Controller sending packets to the OS, which the OS then acknowleges in regular intervals.
-
-When filtering only the `UDP` packets on port `18507` we could scroll though the byte representation, we could quickly identify some things.
-
-1. Directly after the `0xFACE` head, came two bytes (short) which was identical for similar packet content, so we at first thought it somehow correlates to a type.
-2. After this came another short value which also seemed identical for similar packets. However as there were differences, we assumed this was some sort of sub-type.
-3. This was followed by one byte that seemed identical for all messages sent from one node to another, but we did find up to 3 different values in the dumps. So we at first thought this was some sort of connection id
-4. The most obvious thing about the byte after that was, that it seemed to increment by one for messages with the same "connection id", so we assumed this was a message-id.
-5. There were 3 bytes between the message-id and an obviously constant sequence of 3 bytes which, at first we had no idea what they might be used for.
-
-In order to prove any assumption we made, we used little programs that used Pcap4J to programmatically check assumptions.
-
-=== Decoding the wrapper packet header
-
-As mentioned before, it appeared obvious that for almost identical packets the first two short values were very similar too, which led us to the assumption that these are `type` and `sub-type'.
-So we wrote a little program, that scanned all the packets and counted how many types we had.
-This was a very large number. Also did we output some additional information about packets on the console ... one of these pieces of information was the length of the packet.
-
-When outputting a sorted list of the type values (maybe it's strange, but I like data sorted) it seemed quite obvious, that for a larger presumed `type` value, also the length of the packet was larger.
-Especially when comparing the difference of these values also showed that of a `type` had a value that is larger than another packet, that also the length was exactly this number of bytes larger.
-
-So in the end it turned out that the first short value is not the `type`, but a packet length-related value.
-It even turned out that the number encoded here was constantly 2 bytes short the number of bytes after the 3 constant bytes of `0x800400`, ending leaving two bytes at the end.
-
-These two bytes seemed to be extremely jumpy.
-Here we could see that for every packet this value seemed to change quite dramatically, even if the payload was almost identical.
-We did see values repeated, but couldn't see any correlation between the content of the colliding packets.
-So in the end we assume this is some sort of checksum value.
-
-With this assumption, we now think that the first short value is the `payload-length` value.
-
-Knowing the first short value no longer is the type, upgraded the second short value to being a new candidate for being a full type.
-
-Scanning the communication, it pretty quickly became obvious that here most communication packets have a value of `0x0002` and some have `0x0006`.
-Only when starting a new OS instance while capturing, made some others pop up: `0x0003` and `0x0004`.
-
-So we are assuming the `0x0003` and `0x0004` packets are related to establishing a connection.
-Also we could see the node initiating a connection sends a `0x0003` packet, which is then replied to by a `0x0004` packet.
-
-Then most information is sent via `0x0002` packets.
-However every now and then there comes a pair of `0x0006` packets, who's length seems to prevent being used to transfer any data.
-We are therefore assuming these packets are used for syncing.
-
-As mentioned before we did a lot of automatically splitting up PCAPNG files into separate ones depending on different conditions, because this allowed to browse through similar packets using simple human pattern recognition for decoding.
-
-Pretty soon after starting to splitting up the streams, so the communication between two nodes was separated into one separate file, we did notice what we assumed to be a `connection-id` and a `mesasage-counter` instantly following the type.
-
-However when doing the statistical counting and listing of these values, we noticed that after the message-id `0xFF` came the `0x00`, as we would have expected, but the assumed connection-id was also incremented by one.
-So it turned out that the similarity of the first byte were not due to a connection-id, but rather the counter of just having the same first byte.
-After the `type` byte seems to come a `message-id` counter.
-It seems as if this initialized to some random value during the connection establishment and is then incremented with every message.
-
-However our little check did reveal, that this id is identical for a packet following a `0x0006` packet.
-Therefore we are assuming the `0x0006` packets are used to sync the connection between two nodes.
-
-The short value (or a byte value following a 0x00 byte), after this message id seems to be constant for every message sent from ine node to another, but we think to have seen one node use different values for communicating with different nodes.
-Also it seems that all Controllers seem to have values from `0x0000` to `0x0009` and OSes seem to have values from `0x000A` to `0x000F`.
-We are assuming this is some sort of `sender-id` value.
-
-The following 3 bytes were quite a mystery to us.
-We could see that it seems to be an ever increasing number stored here, however the increment was not linear.
-However when interpreting these 3 bytes as a number and filtering only packets initiated by the controller to one particular OS, filtering out Ack messages by accident, we did notice a certain pattern.
-When correlating that to the capture file, we could see that the pattern correlated to the pattern in the communication.
-We were told, that the OS is configured to update the values once a second and could see that pattern in the capture.
-Here was when we noticed that the numeric value in the 3 bytes followed this pattern.
-In the end it turns out that if we interpret this 3 byte number where the first 14 bits encoding seconds and the following 10 bits the sub-second part, the values in the timestamp matched the timestamps of the pacet capture.
-
-We have to admit that we were a little surprised about this.
-Currently we are assuming that this timestamp is used for tracking transmission times.
-4 bytes would allow quite a time-range, but would come at a cost of one additional byte per packet, that wouldn't be needed for simple run-time checking.
-Two bytes however only would allow to encode only about 63 seconds, which is probably too little when thinking about packet-losses and re-transmissions.
-So in the end we assume these 3 bytes are a simple timestamp.
-
-As mentioned before, the following byte is usually `0x80` except for the first packet every party exchanges with the other side.
-In this case the value is `0x00`.
-So we'll just keep that in mind an not worry about interpreting a meaning into this.
-The last two bytes of the wrapper packet header are simply constantly `0x8000` in every packet.
-Here too, we'll just live with knowing that and not wondering what it could mean.
-
-=== Decoding the internal packet
-
-After having decoded what we think is the wrapper-protocol packet structure, we knew decoding the internal protocol would be a bigger challenge.
-
-Therefore the test-setup was changed a little.
-
-The number of controllers and operator-systems were reduced to one each.
-The OS was changed to display only one single value of the controller.
-A simulator was introduced, which was connected to the controller and communicated to this via ProfiNet protocol.
-This simulator allowed us to provide values to the controller via the backend ProfiNet connection.
-
-With this setup we started working on the payload decoding.
-
-The first two bytes of the payload seem again to relate to a type as similar packets usually had identical values here.
-
-Especially we did a lot of separate captures for all sorts of different operations.
-During this we managed to reverse engineer the connection on the wrapper-protocol layer as well how the communication looks inside the internal protocol.
-
-==== Connecting
-
-When an OS is booted, the following communication could be observed:
-
-1. The OS sends a wrapper-protocol type `0x0003` to the controller.
-2. The controller responds with a `0x0004` message back to the controller.
-3. After receiving the `0x0004` message, the OS sends a type `0x0002` message with a wrapped type `0x0501`
-4. This packet is acknowledged by the controller
-5. The controller sends a very similar packet as the `0x0501` packet back to the OS
-6. The OS acknowledges this packet back to the controller
-
-From looking at the packet in WireShark's byte and ASCII view, we could see ASCII characters that seem to relate to test strings.
-A quick consultation of the guy in charge of these systems made us realize that these strings refer to parts of the controllers software.
-Digging even deeper made us realize that the 4 byte values relate to unix timestamps - at least we could decode the byte values to absolutely sensible dates.
-So it seems that In these packets each participant compares it's software state in order to know all are using compatible versions.
-
-This does make sense.
-When connecting to a remote system, checking the version compatibility is surely an important thing to do.
-
-==== Normal operation
-
-When just starting the system and not changing anything, we did notice those previously mentioned `0x0006` type messages we think are responsible for keeping the connections in sync.
-
-What is also noticeable when just starting a System and not logging in to Windows yet, is that the DeltaV Operator System seems to connect before a user logs in to Windows.
-After the connection is established, the Controller almost immediately starts sending alarm telegrams (0x03XX types), but no value telegrams (0x04xx).
-
-It also appears that there is some upper bound for the size of packets.
-As when seeing a lot of alarms being sent in 0x0304 messages, sometimes these are split up into multiple messages sent in very short intervals.
-The last of these usually being smaller than the rest.
-
-==== Changing values
-
-So now we started changing values.
-First we started changing valid values into other valid values.
-
-So whenever we changed a value immediately a packet with wrapper-type `0x0002` was written from the controller to the os with a payload-type `0x0403`.
-
-Whenever we changed values to values that raise alarms, we could see the same `0x0403` messages being sent, but the payload of these being a lot larger, but additionally packets with payload-types starting with `0x03` being sent.
-
-So after increasing a value to a value that raises alarms, we got a payload-type `0x0304` message containing a string-like representation of the Name of the alarm raised as well as probably a name of a user or role.
-Also did we notice the `0x0403` packets seem to contain String constants that relate exactly to the text displayed at the bottom of each screen window.
-
-We assume payload-types starting with `0x04` relate to normal data exchange and ones with `0x03` relating to events and alarms.
-
-==== Decoding value changes
-
-After coming to the conclusion that wrapper-type `0x0002` messages with a payload-type `0x0403` seem to relate to value changes, we started filtering for exactly these packages.
-
-Next we created some captures that contain all sorts of documented value changes.
-So we started with the value 0 and incremented that in steps of 1 till 20 and then in steps of 10 up to 200, going back to 0 and then down to the minimum value of -40.
-
-And we could see that there were certain parts of the packet that seem to change when changing values, most of the packet remaining constant.
-When changing a value back to the original value, the packets payload was identical in this part.
-As the packets didn't all have the same content and some times blocks were added and left away in regular intervals, lead us to the impression, that these packets too consist of a fixed packet header followed by blocks.
-In our case the changing blocks all had two indicator bytes `0x0b08` with the 4 bytes after that changing according to the input.
-Sometimes a block of bytes was added before this block, then the entire content was just pushed back.
-
-The last of such blocks would always be a sequence of 9 bytes: `0x01000000000000000000`, so we assume this is sort of the `terminating block` of such a packet.
-
-One thing quite obvious is that the header does again seem to contain a counter of one byte which is incremented for every `0x0403` packet.
-
-As we currently wanted to understand how the data is encoded we decided to ignore all other parts and concentrate on the block we identified as containing the information we were looking for.
-
-Now how should we interpret this information. At first I was told we were working with an unsigned 16 bit integer.
-Unfortunately we could see 4 bytes changing.
-It took us quite a while.
-As mentioned before we created a table containing the value we input and what we could see in the packet.
-Unfortunately we started seeing patterns, but couldn't quite get the meaning, however we did notice the "end" of the hex-values alternating around `0x00001` and `0xFFFFF`.
-This didn't help much, so we converted these 4 bytes into a numeric value.
-And we did notice the numbers being a lot bigger for negative values, which made us think, maybe the first bit is used for the sign.
-We could confirm that a value of +20 and -20 did produce a value that was equal, except for the first bit.
-Unfortunately still we didn't quite understand how to interpet the other 31 bits.
-So we converted the payload to it's binary representation and this is when we finally found out what it meant.
-So in reality this value was not a 16 bit integer, but a `IEEE-754 Floating Point` value.
-Here the first bit is interpreted as sign, the following an 8 bit exponent and a 23 bit mantisse.
-This explained the end of the value alternating around 0.
-
-With this we were able to write a simple console application that was able to instantly display value changes.
-
-However when using what we learnt on the old captures we did, it turned out that unfortunately we could no longer find these `0x0b08` sequences, however we did find a lot of `0x08` followed by a 32 bit floating point value.
-So it seems that `0x08` indicates the type of an `signed 32 bit IEE 754 floating point value`.
-Perhaps the `0x0b` part referred to some sort subscription-id.
-
-As we seem to be doing a subscription based communication, the OS has to tell the controller what information it is interested in.
-
-Right now we are assuming that in one of the other `0x04` packets a subscription is initiated and assigned with some sort of id and this id is used to identify which value is actually changed.
-
-We will hopefully be able to decode this addressing problem in one of our next reverse-engineering sessions.
-
-==== Decoding Strings
-
-As we mentioned before, that we could see content in the packages that were sometimes readable from just looking at the payload, we decided to have another look at these.
-
-After some time, we did notice, that it seems that Strings have a type of `0x00` and are followed by one byte or are a short value containing the length of the string value.
-This is then followed by each character being output using two bytes.
-We assume this is in order to allow transferring `UTF-16` (two byte) big characters, but never found any.
+//
+//  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
+//
+//      http://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.
+//
+:imagesdir: ../../images/
+
+== Reverse Engineering the DeltaV protocol
+
+This document should describe what we did in order to reverse-engineer the DeltaV protocol.
+
+The sole purpose of this document, is to write document our path in order to eventually protect ourselves against accusation of using illegal measures in gaining the information we got.
+
+=== Starting point
+
+We kindly were provided with access to a DeltaV system used for training.
+
+Therefore we were able to change a few things without fearing to break anything important.
+
+This system consisted of three DeltaV controllers, two Operator-System instances
+So in general there were three types of systems involved:
+
+1. DeltaV Controller
+2. DeltaV Operator-System
+3. Laptop running WireShark
+
+The first change here, was to replace the network switch with a network hub, so we could capture the entire network traffic.
+(By the way ... if you happen to still have a working Hub, don't give that away. It turns out it's really hard to get you hands on hubs these days)
+
+With this we let the system run and did a pretty long network capture.
+
+This 29MB WireShark capture was what we started working with.
+
+=== Identifying the protocol
+
+As WireShark didn't have a DeltaV disector, we had to trace it down ourselves.
+
+When looking at the capture, we very quickly filtered out the usual network protocols and the Windows communication and found a lot of binary `UDP` traffic running on port `18507`.
+
+Special with all of these was that they all started with a payload of `0xFACE`.
+
+=== First steps in understanding the protocol
+
+Here it appeared that `UDP` packets are sent with some sort of payload, which are obviously responded to by packets with a fixed and very small size (64 bytes).
+
+So we are assuming these short messages, that seem to partially repeat some of the information of the first packet (but not all), are probably acknowledge packets.
+
+From looking at the nature of the traffic and knowing the IP addresses of the DeltaV controllers (PLC) and the Operator Systems (Controll-Software), we could see that this communication is probably subscription based as we could see a lot of the Controller sending packets to the OS, which the OS then acknowleges in regular intervals.
+
+When filtering only the `UDP` packets on port `18507` we could scroll though the byte representation, we could quickly identify some things.
+
+1. Directly after the `0xFACE` head, came two bytes (short) which was identical for similar packet content, so we at first thought it somehow correlates to a type.
+2. After this came another short value which also seemed identical for similar packets. However as there were differences, we assumed this was some sort of sub-type.
+3. This was followed by one byte that seemed identical for all messages sent from one node to another, but we did find up to 3 different values in the dumps. So we at first thought this was some sort of connection id
+4. The most obvious thing about the byte after that was, that it seemed to increment by one for messages with the same "connection id", so we assumed this was a message-id.
+5. There were 3 bytes between the message-id and an obviously constant sequence of 3 bytes which, at first we had no idea what they might be used for.
+
+In order to prove any assumption we made, we used little programs that used Pcap4J to programmatically check assumptions.
+
+=== Decoding the wrapper packet header
+
+As mentioned before, it appeared obvious that for almost identical packets the first two short values were very similar too, which led us to the assumption that these are `type` and `sub-type'.
+So we wrote a little program, that scanned all the packets and counted how many types we had.
+This was a very large number. Also did we output some additional information about packets on the console ... one of these pieces of information was the length of the packet.
+
+When outputting a sorted list of the type values (maybe it's strange, but I like data sorted) it seemed quite obvious, that for a larger presumed `type` value, also the length of the packet was larger.
+Especially when comparing the difference of these values also showed that of a `type` had a value that is larger than another packet, that also the length was exactly this number of bytes larger.
+
+So in the end it turned out that the first short value is not the `type`, but a packet length-related value.
+It even turned out that the number encoded here was constantly 2 bytes short the number of bytes after the 3 constant bytes of `0x800400`, ending leaving two bytes at the end.
+
+These two bytes seemed to be extremely jumpy.
+Here we could see that for every packet this value seemed to change quite dramatically, even if the payload was almost identical.
+We did see values repeated, but couldn't see any correlation between the content of the colliding packets.
+So in the end we assume this is some sort of checksum value.
+
+With this assumption, we now think that the first short value is the `payload-length` value.
+
+Knowing the first short value no longer is the type, upgraded the second short value to being a new candidate for being a full type.
+
+Scanning the communication, it pretty quickly became obvious that here most communication packets have a value of `0x0002` and some have `0x0006`.
+Only when starting a new OS instance while capturing, made some others pop up: `0x0003` and `0x0004`.
+
+So we are assuming the `0x0003` and `0x0004` packets are related to establishing a connection.
+Also we could see the node initiating a connection sends a `0x0003` packet, which is then replied to by a `0x0004` packet.
+
+Then most information is sent via `0x0002` packets.
+However every now and then there comes a pair of `0x0006` packets, who's length seems to prevent being used to transfer any data.
+We are therefore assuming these packets are used for syncing.
+
+As mentioned before we did a lot of automatically splitting up PCAPNG files into separate ones depending on different conditions, because this allowed to browse through similar packets using simple human pattern recognition for decoding.
+
+Pretty soon after starting to splitting up the streams, so the communication between two nodes was separated into one separate file, we did notice what we assumed to be a `connection-id` and a `mesasage-counter` instantly following the type.
+
+However when doing the statistical counting and listing of these values, we noticed that after the message-id `0xFF` came the `0x00`, as we would have expected, but the assumed connection-id was also incremented by one.
+So it turned out that the similarity of the first byte were not due to a connection-id, but rather the counter of just having the same first byte.
+After the `type` byte seems to come a `message-id` counter.
+It seems as if this initialized to some random value during the connection establishment and is then incremented with every message.
+
+However our little check did reveal, that this id is identical for a packet following a `0x0006` packet.
+Therefore we are assuming the `0x0006` packets are used to sync the connection between two nodes.
+
+The short value (or a byte value following a 0x00 byte), after this message id seems to be constant for every message sent from ine node to another, but we think to have seen one node use different values for communicating with different nodes.
+Also it seems that all Controllers seem to have values from `0x0000` to `0x0009` and OSes seem to have values from `0x000A` to `0x000F`.
+We are assuming this is some sort of `sender-id` value.
+
+The following 3 bytes were quite a mystery to us.
+We could see that it seems to be an ever increasing number stored here, however the increment was not linear.
+However when interpreting these 3 bytes as a number and filtering only packets initiated by the controller to one particular OS, filtering out Ack messages by accident, we did notice a certain pattern.
+When correlating that to the capture file, we could see that the pattern correlated to the pattern in the communication.
+We were told, that the OS is configured to update the values once a second and could see that pattern in the capture.
+Here was when we noticed that the numeric value in the 3 bytes followed this pattern.
+In the end it turns out that if we interpret this 3 byte number where the first 14 bits encoding seconds and the following 10 bits the sub-second part, the values in the timestamp matched the timestamps of the pacet capture.
+
+We have to admit that we were a little surprised about this.
+Currently we are assuming that this timestamp is used for tracking transmission times.
+4 bytes would allow quite a time-range, but would come at a cost of one additional byte per packet, that wouldn't be needed for simple run-time checking.
+Two bytes however only would allow to encode only about 63 seconds, which is probably too little when thinking about packet-losses and re-transmissions.
+So in the end we assume these 3 bytes are a simple timestamp.
+
+As mentioned before, the following byte is usually `0x80` except for the first packet every party exchanges with the other side.
+In this case the value is `0x00`.
+So we'll just keep that in mind an not worry about interpreting a meaning into this.
+The last two bytes of the wrapper packet header are simply constantly `0x8000` in every packet.
+Here too, we'll just live with knowing that and not wondering what it could mean.
+
+=== Decoding the internal packet
+
+After having decoded what we think is the wrapper-protocol packet structure, we knew decoding the internal protocol would be a bigger challenge.
+
+Therefore the test-setup was changed a little.
+
+The number of controllers and operator-systems were reduced to one each.
+The OS was changed to display only one single value of the controller.
+A simulator was introduced, which was connected to the controller and communicated to this via ProfiNet protocol.
+This simulator allowed us to provide values to the controller via the backend ProfiNet connection.
+
+With this setup we started working on the payload decoding.
+
+The first two bytes of the payload seem again to relate to a type as similar packets usually had identical values here.
+
+Especially we did a lot of separate captures for all sorts of different operations.
+During this we managed to reverse engineer the connection on the wrapper-protocol layer as well how the communication looks inside the internal protocol.
+
+==== Connecting
+
+When an OS is booted, the following communication could be observed:
+
+1. The OS sends a wrapper-protocol type `0x0003` to the controller.
+2. The controller responds with a `0x0004` message back to the controller.
+3. After receiving the `0x0004` message, the OS sends a type `0x0002` message with a wrapped type `0x0501`
+4. This packet is acknowledged by the controller
+5. The controller sends a very similar packet as the `0x0501` packet back to the OS
+6. The OS acknowledges this packet back to the controller
+
+From looking at the packet in WireShark's byte and ASCII view, we could see ASCII characters that seem to relate to test strings.
+A quick consultation of the guy in charge of these systems made us realize that these strings refer to parts of the controllers software.
+Digging even deeper made us realize that the 4 byte values relate to unix timestamps - at least we could decode the byte values to absolutely sensible dates.
+So it seems that In these packets each participant compares it's software state in order to know all are using compatible versions.
+
+This does make sense.
+When connecting to a remote system, checking the version compatibility is surely an important thing to do.
+
+==== Normal operation
+
+When just starting the system and not changing anything, we did notice those previously mentioned `0x0006` type messages we think are responsible for keeping the connections in sync.
+
+What is also noticeable when just starting a System and not logging in to Windows yet, is that the DeltaV Operator System seems to connect before a user logs in to Windows.
+After the connection is established, the Controller almost immediately starts sending alarm telegrams (0x03XX types), but no value telegrams (0x04xx).
+
+It also appears that there is some upper bound for the size of packets.
+As when seeing a lot of alarms being sent in 0x0304 messages, sometimes these are split up into multiple messages sent in very short intervals.
+The last of these usually being smaller than the rest.
+
+==== Changing values
+
+So now we started changing values.
+First we started changing valid values into other valid values.
+
+So whenever we changed a value immediately a packet with wrapper-type `0x0002` was written from the controller to the os with a payload-type `0x0403`.
+
+Whenever we changed values to values that raise alarms, we could see the same `0x0403` messages being sent, but the payload of these being a lot larger, but additionally packets with payload-types starting with `0x03` being sent.
+
+So after increasing a value to a value that raises alarms, we got a payload-type `0x0304` message containing a string-like representation of the Name of the alarm raised as well as probably a name of a user or role.
+Also did we notice the `0x0403` packets seem to contain String constants that relate exactly to the text displayed at the bottom of each screen window.
+
+We assume payload-types starting with `0x04` relate to normal data exchange and ones with `0x03` relating to events and alarms.
+
+==== Decoding value changes
+
+After coming to the conclusion that wrapper-type `0x0002` messages with a payload-type `0x0403` seem to relate to value changes, we started filtering for exactly these packages.
+
+Next we created some captures that contain all sorts of documented value changes.
+So we started with the value 0 and incremented that in steps of 1 till 20 and then in steps of 10 up to 200, going back to 0 and then down to the minimum value of -40.
+
+And we could see that there were certain parts of the packet that seem to change when changing values, most of the packet remaining constant.
+When changing a value back to the original value, the packets payload was identical in this part.
+As the packets didn't all have the same content and some times blocks were added and left away in regular intervals, lead us to the impression, that these packets too consist of a fixed packet header followed by blocks.
+In our case the changing blocks all had two indicator bytes `0x0b08` with the 4 bytes after that changing according to the input.
+Sometimes a block of bytes was added before this block, then the entire content was just pushed back.
+
+The last of such blocks would always be a sequence of 9 bytes: `0x01000000000000000000`, so we assume this is sort of the `terminating block` of such a packet.
+
+One thing quite obvious is that the header does again seem to contain a counter of one byte which is incremented for every `0x0403` packet.
+
+As we currently wanted to understand how the data is encoded we decided to ignore all other parts and concentrate on the block we identified as containing the information we were looking for.
+
+Now how should we interpret this information. At first I was told we were working with an unsigned 16 bit integer.
+Unfortunately we could see 4 bytes changing.
+It took us quite a while.
+As mentioned before we created a table containing the value we input and what we could see in the packet.
+Unfortunately we started seeing patterns, but couldn't quite get the meaning, however we did notice the "end" of the hex-values alternating around `0x00001` and `0xFFFFF`.
+This didn't help much, so we converted these 4 bytes into a numeric value.
+And we did notice the numbers being a lot bigger for negative values, which made us think, maybe the first bit is used for the sign.
+We could confirm that a value of +20 and -20 did produce a value that was equal, except for the first bit.
+Unfortunately still we didn't quite understand how to interpet the other 31 bits.
+So we converted the payload to it's binary representation and this is when we finally found out what it meant.
+So in reality this value was not a 16 bit integer, but a `IEEE-754 Floating Point` value.
+Here the first bit is interpreted as sign, the following an 8 bit exponent and a 23 bit mantisse.
+This explained the end of the value alternating around 0.
+
+With this we were able to write a simple console application that was able to instantly display value changes.
+
+However when using what we learnt on the old captures we did, it turned out that unfortunately we could no longer find these `0x0b08` sequences, however we did find a lot of `0x08` followed by a 32 bit floating point value.
+So it seems that `0x08` indicates the type of an `signed 32 bit IEE 754 floating point value`.
+Perhaps the `0x0b` part referred to some sort subscription-id.
+
+As we seem to be doing a subscription based communication, the OS has to tell the controller what information it is interested in.
+
+Right now we are assuming that in one of the other `0x04` packets a subscription is initiated and assigned with some sort of id and this id is used to identify which value is actually changed.
+
+We will hopefully be able to decode this addressing problem in one of our next reverse-engineering sessions.
+
+==== Decoding Strings
+
+As we mentioned before, that we could see content in the packages that were sometimes readable from just looking at the payload, we decided to have another look at these.
+
+After some time, we did notice, that it seems that Strings have a type of `0x00` and are followed by one byte or are a short value containing the length of the string value.
+This is then followed by each character being output using two bytes.
+We assume this is in order to allow transferring `UTF-16` (two byte) big characters, but never found any.
 Right now the first byte of every block is simply `0x00` followed by the `UTF-8` character value.
\ No newline at end of file
diff --git a/src/site/asciidoc/protocols/ehtercat/index.adoc b/src/site/asciidoc/protocols/ehtercat/index.adoc
index 17272c386e2..49160244bc0 100644
--- a/src/site/asciidoc/protocols/ehtercat/index.adoc
+++ b/src/site/asciidoc/protocols/ehtercat/index.adoc
@@ -1,28 +1,28 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== EtherCAT
-
-Introduction
-
-=== Links
-
-https://www.ethercat.org/default.htm
-https://www.ethercat.org/download/documents/EtherCAT_EAP_EN.pdf
-https://www.ethercat.org/pdf/english/EtherCAT_Introduction_0905.pdf
-https://download.beckhoff.com/download/document/io/ethercat-terminals/ethercatsystem_en.pdf
-https://www.megatech.ro/doc/699/FZM1%20EtherCAT%20Communications%20Manual%20EN.pdf
+//
+//  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
+//
+//      http://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.
+//
+
+== EtherCAT
+
+Introduction
+
+=== Links
+
+https://www.ethercat.org/default.htm
+https://www.ethercat.org/download/documents/EtherCAT_EAP_EN.pdf
+https://www.ethercat.org/pdf/english/EtherCAT_Introduction_0905.pdf
+https://download.beckhoff.com/download/document/io/ethercat-terminals/ethercatsystem_en.pdf
+https://www.megatech.ro/doc/699/FZM1%20EtherCAT%20Communications%20Manual%20EN.pdf
diff --git a/src/site/asciidoc/protocols/ethernet-ip/index.adoc b/src/site/asciidoc/protocols/ethernet-ip/index.adoc
index f23ac6f54bf..5a14e46e981 100644
--- a/src/site/asciidoc/protocols/ethernet-ip/index.adoc
+++ b/src/site/asciidoc/protocols/ethernet-ip/index.adoc
@@ -1,30 +1,30 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== EtherNet/IP
-
-Introduction
-
-=== Links
-
-As of November 2008, The EtherNet/IP Specification consists of three parts: The Common Industrial
-Protocol (Volume 1 of the CIP Networks Library), the EtherNet/IP Adaptation of CIP (Volume 2), and the
-Integration of ModbusĀ® Devices into a CIP Architecture (Volume 7).
-
-Order Form for the SPEC ($1000) https://secure.odva.org/forms/spec-vendor-id-order-form.htm
-
-
+//
+//  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
+//
+//      http://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.
+//
+
+== EtherNet/IP
+
+Introduction
+
+=== Links
+
+As of November 2008, The EtherNet/IP Specification consists of three parts: The Common Industrial
+Protocol (Volume 1 of the CIP Networks Library), the EtherNet/IP Adaptation of CIP (Volume 2), and the
+Integration of ModbusĀ® Devices into a CIP Architecture (Volume 7).
+
+Order Form for the SPEC ($1000) https://secure.odva.org/forms/spec-vendor-id-order-form.htm
+
+
diff --git a/src/site/asciidoc/protocols/features.adoc b/src/site/asciidoc/protocols/features.adoc
index 43c1e9cfd77..6afcf71773f 100644
--- a/src/site/asciidoc/protocols/features.adoc
+++ b/src/site/asciidoc/protocols/features.adoc
@@ -1,87 +1,87 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== Features
-:icons: font
-
-The following table contains a list of operations and the protocols that support them:
-
-|===
-|Protocol |Read Single Address Value |Read Multiple Address Values |Write Single Address Value |Write Multiple Address Value|Subscribe to Value changes |Subscribe to PLC Events/Alarms
-
-|AB-Ethernet
-|icon:check[role="green"]
-|icon:check[role="red"]
-|icon:check[role="red"]
-|icon:check[role="red"]
-|icon:check[role="red"]
-|icon:question[role="red"]
-
-|ADS
-|icon:check[role="green"]
-|icon:check[role="green"]
-|icon:check[role="green"]
-|icon:check[role="green"]
-|icon:check[role="green"]
-|icon:question[role="red"]
-
-|DeltaV
-|icon:question[role="red"]
-|icon:question[role="red"]
-|icon:question[role="red"]
-|icon:question[role="red"]
-|icon:question[role="red"]
-|icon:question[role="red"]
-
-|EtherNet/IP
-|icon:question[role="red"]
-|icon:question[role="red"]
-|icon:question[role="red"]
-|icon:question[role="red"]
-|icon:question[role="red"]
-|icon:question[role="red"]
-
-|Modbus
-|icon:question[role="red"]
-|icon:question[role="red"]
-|icon:question[role="red"]
-|icon:question[role="red"]
-|icon:question[role="red"]
-|icon:question[role="red"]
-
-|OPC-UA
-|icon:question[role="red"]
-|icon:question[role="red"]
-|icon:question[role="red"]
-|icon:question[role="red"]
-|icon:question[role="red"]
-|icon:question[role="red"]
-
-|S7
-|icon:check[role="green"]
-|icon:check[role="green"]
-|icon:check[role="green"]
-|icon:exclamation[role="yellow"]
-|icon:question[role="red"]
-|icon:question[role="red"]
-|===
-
-Legend:
-
-- icon:check[role="green"] Implemented and fully supported
-- icon:exclamation[role="yellow"] Implemented and supported by simulation
+//
+//  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
+//
+//      http://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.
+//
+
+== Features
+:icons: font
+
+The following table contains a list of operations and the protocols that support them:
+
+|===
+|Protocol |Read Single Address Value |Read Multiple Address Values |Write Single Address Value |Write Multiple Address Value|Subscribe to Value changes |Subscribe to PLC Events/Alarms
+
+|AB-Ethernet
+|icon:check[role="green"]
+|icon:check[role="red"]
+|icon:check[role="red"]
+|icon:check[role="red"]
+|icon:check[role="red"]
+|icon:question[role="red"]
+
+|ADS
+|icon:check[role="green"]
+|icon:check[role="green"]
+|icon:check[role="green"]
+|icon:check[role="green"]
+|icon:check[role="green"]
+|icon:question[role="red"]
+
+|DeltaV
+|icon:question[role="red"]
+|icon:question[role="red"]
+|icon:question[role="red"]
+|icon:question[role="red"]
+|icon:question[role="red"]
+|icon:question[role="red"]
+
+|EtherNet/IP
+|icon:question[role="red"]
+|icon:question[role="red"]
+|icon:question[role="red"]
+|icon:question[role="red"]
+|icon:question[role="red"]
+|icon:question[role="red"]
+
+|Modbus
+|icon:question[role="red"]
+|icon:question[role="red"]
+|icon:question[role="red"]
+|icon:question[role="red"]
+|icon:question[role="red"]
+|icon:question[role="red"]
+
+|OPC-UA
+|icon:question[role="red"]
+|icon:question[role="red"]
+|icon:question[role="red"]
+|icon:question[role="red"]
+|icon:question[role="red"]
+|icon:question[role="red"]
+
+|S7
+|icon:check[role="green"]
+|icon:check[role="green"]
+|icon:check[role="green"]
+|icon:exclamation[role="yellow"]
+|icon:question[role="red"]
+|icon:question[role="red"]
+|===
+
+Legend:
+
+- icon:check[role="green"] Implemented and fully supported
+- icon:exclamation[role="yellow"] Implemented and supported by simulation
 - icon:question[role="red"] Not implemented yet
\ No newline at end of file
diff --git a/src/site/asciidoc/protocols/index.adoc b/src/site/asciidoc/protocols/index.adoc
index 3a42e2d48b0..f4e9b18def1 100644
--- a/src/site/asciidoc/protocols/index.adoc
+++ b/src/site/asciidoc/protocols/index.adoc
@@ -1,50 +1,50 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== Protocols
-
-- link:ab-eth/index.html[AB-Ethernet]
-- link:ads/index.html[DeltaV]
-- link:delta-v/index.html[DeltaV]
-- link:ethernet-ip/index.html[EtherNet/IP]
-- link:modbus/index.html[Modbus]
-- link:opc-ua/index.html[OPC-UA]
-- link:s7/index.html[S7]
-
-=== Links
-
-Apache 2.0 licensed JNI library for accessing raw IPv4 and IPv6 sockets. Might be the ideal starting point for implementing protocols below TCP & UDP.
-https://www.savarese.org/software/rocksaw/
-
-Links to different WireShark captures: https://github.com/automayt/ICS-pcap
-
-==== BACNet
-
-Used in the building automation sector.
-http://www.bacnet.org/Addenda/Add-135-2008t.pdf
-
-AKA: ISO 16484-5:
-The official specification can be purchased here: https://www.iso.org/standard/71935.html
-
-==== IEC 61850
-
-Used by the IDS SAS (station automation system)
-
-https://de.wikipedia.org/wiki/IEC_60870
-
-German norm: DIN EN 60870
+//
+//  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
+//
+//      http://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.
+//
+
+== Protocols
+
+- link:ab-eth/index.html[AB-Ethernet]
+- link:ads/index.html[DeltaV]
+- link:delta-v/index.html[DeltaV]
+- link:ethernet-ip/index.html[EtherNet/IP]
+- link:modbus/index.html[Modbus]
+- link:opc-ua/index.html[OPC-UA]
+- link:s7/index.html[S7]
+
+=== Links
+
+Apache 2.0 licensed JNI library for accessing raw IPv4 and IPv6 sockets. Might be the ideal starting point for implementing protocols below TCP & UDP.
+https://www.savarese.org/software/rocksaw/
+
+Links to different WireShark captures: https://github.com/automayt/ICS-pcap
+
+==== BACNet
+
+Used in the building automation sector.
+http://www.bacnet.org/Addenda/Add-135-2008t.pdf
+
+AKA: ISO 16484-5:
+The official specification can be purchased here: https://www.iso.org/standard/71935.html
+
+==== IEC 61850
+
+Used by the IDS SAS (station automation system)
+
+https://de.wikipedia.org/wiki/IEC_60870
+
+German norm: DIN EN 60870
 The official specification can be purchased here: https://www.beuth.de/de/norm/din-en-60870-5-104/100426613
\ No newline at end of file
diff --git a/src/site/asciidoc/protocols/modbus/index.adoc b/src/site/asciidoc/protocols/modbus/index.adoc
index c4c66f7e092..444a357c281 100644
--- a/src/site/asciidoc/protocols/modbus/index.adoc
+++ b/src/site/asciidoc/protocols/modbus/index.adoc
@@ -1,26 +1,26 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== Modbus
-
-Introduction
-
-=== Links
-
-- Main Landing Page: http://www.modbus.org/tech.php
-- Modbus Protocol Spec: http://www.modbus.org/docs/Modbus_Application_Protocol_V1_1b3.pdf
-- Modbus TCP Protocol Spec: http://www.modbus.org/docs/Modbus_Messaging_Implementation_Guide_V1_0b.pdf
+//
+//  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
+//
+//      http://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.
+//
+
+== Modbus
+
+Introduction
+
+=== Links
+
+- Main Landing Page: http://www.modbus.org/tech.php
+- Modbus Protocol Spec: http://www.modbus.org/docs/Modbus_Application_Protocol_V1_1b3.pdf
+- Modbus TCP Protocol Spec: http://www.modbus.org/docs/Modbus_Messaging_Implementation_Guide_V1_0b.pdf
diff --git a/src/site/asciidoc/protocols/opc-ua/index.adoc b/src/site/asciidoc/protocols/opc-ua/index.adoc
index f2683f85f34..4312143cf11 100644
--- a/src/site/asciidoc/protocols/opc-ua/index.adoc
+++ b/src/site/asciidoc/protocols/opc-ua/index.adoc
@@ -1,28 +1,28 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== OPC-UA
-
-Introduction
-
-=== Links
-
-https://opcfoundation.org/developer-tools/specifications-unified-architecture/part-1-overview-and-concepts
-
-https://opcfoundation.org/developer-tools/certification-specifications (Seems you have to become a OPC foundation member to access the Spec details)
-
-OPC-UA Membership: https://opcfoundation.org/membership/benefits/
+//
+//  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
+//
+//      http://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.
+//
+
+== OPC-UA
+
+Introduction
+
+=== Links
+
+https://opcfoundation.org/developer-tools/specifications-unified-architecture/part-1-overview-and-concepts
+
+https://opcfoundation.org/developer-tools/certification-specifications (Seems you have to become a OPC foundation member to access the Spec details)
+
+OPC-UA Membership: https://opcfoundation.org/membership/benefits/
diff --git a/src/site/asciidoc/protocols/s7/index.adoc b/src/site/asciidoc/protocols/s7/index.adoc
index 01bb4bd1575..14f73b2fa46 100644
--- a/src/site/asciidoc/protocols/s7/index.adoc
+++ b/src/site/asciidoc/protocols/s7/index.adoc
@@ -1,289 +1,289 @@
-//
-//  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
-//
-//      http://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.
-//
-:imagesdir: ../../images/
-
-== S7 Communication
-
-When communicating with S7 Devices there is a whole family of protocols, that can be used.
-In general you can divide them into `Profinet` protocols and `S7 Comm` protocols.
-The later are far simpler in structure, but also far less documented.
-The `S7 Comm` protocols are generally split up into two flavours: The classic `S7 Comm` and a newer version unofficially called `S7 Comm Plus`.
-
-=== Overview of the Protocols
-
-[ditaa,protocols-s7-osi]
-....
-                    :                                                       :             : implemented               :
-                    :                                                       :             :      |                    :
-                    :                       Profinet                        :             :      | S7 Protocol        :
-                    :                                                       :             :      V                    :
-- - - - - - - - - - +-------------+-------------+-------------+-------------+-------------+-------------+-------------+ - -
-                    |c0B0         |c0B0         |c0B0         |c0B0         |c05A         |c0BA         |c0BA         |
- Application        |             |             |             |             |             |             |             |
- Layer              |             |             |             |             |             |             |             |
-                    |             |             |             |             |             |             |             |
-                    | Profinet IO | Profinet IO | Profinet CBA| Profinet CBA|             |             |             |
-- - - - - - - - - - |   RT / IRT  |             |             |      RT     |             |             |             | - -
-                    |             |             |             |             |             |             |             |
- Presentation       |             |             |             |             |             |             |             |
- Layer              |             |             |             |             |     S7      |     S7      |     S7      |
-                    |             |             |             |             |    Comm     |    Comm     |    Comm     |
-                    |             |             |             |             |    Plus     |             |             |
-- - - - - - - - - - |             +-------------+-------------+             |             |             |             | - -
-                    |             |cAAA         |cAAA         |             |             |             |             |
- Session            |             |             |             |             |             |             |             |
- Layer              |             |     RPC     |    DCOM     |             |             |             |             |
-                    |             |             |             |             |             |             |             |
-                    |             |             |             |             |             |             |             |
-- - - - - - - - - - |             +-------------+-------------+             +-------------+-------------+-------------+ - -
-                    |             |cAAA         |cAAA         |             |cF6F                                     |
-                    |             |             |             |             |         ISO Transport Protocol          |
-                    |             |             |             |             |                 RFC 905                 |
-                    |             |             |             |             | (Class 0)                               |
-                    |             |             |             |             +---------------------------+             |
-                    |             |             |             |             |cFF6                       |             |
- Transport          |             |             |             |             | ISO on TCP                |             |
- Layer              |             |     UDP     |     TCP     |             |  RFC 1006                 |             |
-                    |             |             |             |             +---------------------------+             |
-                    |             |             |             |             |cAAA                       |             |
-                    |             |             |             |             |     TCP                   |             |
-                    |             |             |             |             |                           |     ISO     |
-- - - - - - - - - - |             +-------------+-------------+             +---------------------------+   Transport | - -
-                    |             | cAAA                      |             |cAAA                       |   Protocol  |
- Network            |             |                           |             |                           |   RFC 905   |
- Layer              |             |            IP             |             |     IP                    |   (Class 4) |
-                    |             |                           |             |                           |             |
-                    |             |                           |             |                           |             |
-- - - - - - - - - - +-------------+---------------------------+-------------+---------------------------+-------------+ - -
-                    |cAAA                                                                                             |
- Data Link          |                                                                                                 |
- Layer              |                                                                                                 |
-                    |                                                                                                 |
-                    |                       Industrial                                                                |
-- - - - - - - - - - |                        Ethernet                                                                 | - -
-                    |                                                                                                 |
- Physical           |                                                                                                 |
- Layer              |                                                                                                 |
-                    |                                                                                                 |
-                    |                                                                                                 |
-- - - - - - - - - - +-------------------------------------------------------------------------------------------------+ - -
-....
-
-=== Protocol Descriptions
-
-|===
-|Name |ISO |RFC |Link
-|Transmission Control Protocol (TCP) |- | RFC 793 |https://tools.ietf.org/html/rfc793
-|ISO on TCP |-Ā | RFC 1006| https://tools.ietf.org/html/rfc1006
-|ISO Transport Protocol (Class 4) |ISO DP 8073 | RFC 905 |https://tools.ietf.org/html/rfc905
-|S7 Comm (0x32) |-Ā |- |http://gmiru.com/article/s7comm/ http://gmiru.com/article/s7comm-part2/ https://www.eng.tau.ac.il/~yash/jdsfl2014.pdf
-|S7 Comm Plus (0x72) |- |- |(Information seems to be invalid or incorrect however) https://opensource-security.de/thesis/MA_Maik_Brueggemann.pdf
-|RPC |- | RFC 1057 & RFC 5531 |https://tools.ietf.org/html/rfc1057 https://tools.ietf.org/html/rfc5531
-|DCOM |- |- | https://msdn.microsoft.com/library/cc201989.aspx
-|===
-
-=== Interaction with an S7 PLC
-
-Currently we are concentrating on implementing the TCP-based variants of the `S7 Comm` and `S7 Comm Plus` protocols.
-Both are transferred using `ISO TP` which is wrapped by `ISO on TCP`.
-Both protocols require establishing a connection on the `ISO TP` level first.
-After the `ISO TP` connection is established, the higher level protocols then establish their connections.
-These are then handled by the individual protocol sub-pages:
-
-- link:s7comm.html[S7 Comm (0x32)]
-- link:s7comm-plus.html[S7 Comm Plus (0x72)]
-
-The hex-value behind each of these correlates to the first byte used in the protocols messages to indicate the type of protocol.
-
-[seqdiag,s7-interaction]
-....
-{
-    === Connect ===
-
-    Client -> "ISO TP" [label = "Connection Request"]
-    Client <- "ISO TP" [label = "Connection Response"]
-
-    === Higher Level Connect ===
-
-    === Higher Level Communication ===
-
-    === Disconnect ===
-
-    Client -> "ISO TP" [label = "Disconnect Request"]
-
-}
-....
-
-=== ISO TP Message Types
-
-Even if `ISO TP` defines more types of messages, the ones required for `S7 Comm` or `S7 Comm Plus` are only the following.
-Each message is called a `TPDU` (Transport Protocol Data Unit):
-
-- Connection Request TPDU
-- Connection Response TPDU
-- Data TPDU
-- Disconnect Request TPDU
-
-Notice: There is no `Disconnect Response` in `ISO TP: Class 0`.
-
-==== Connection Request TPDU
-
-// len (length of bits - use instead of explicit byte count - requires "*" as first element)
-// label
-// color / background
-// linecolor
-// rotate (degrees)
-// colheight
-// height
-// numbered
-// label_orientation (vertical, horizontal)
-// stacked (no value)
-// icon
-// shape (box, circle, ...)
-[packetdiag,s7-connect-request,svg]
-....
-{
-    colwidth = 32
-
-    // ISO on TCP
-    * ISO on TCP Magic Number (0x03) [len = 8, color = "#068D9D"]
-    * Reserved (0x00) [len = 8, color = "#068D9D"]
-    * Packet Length (including ISO on TCP header) [len = 16, color = "#068D9D"]
-
-    // ISO Transport Protocol
-    * ISO TP Header Length\n(excluding length byte) [len = 8, color = "#53599A"]
-    * TPDU-Code\n(CR = 0xE0) [len = 4, color = "#AEECEF"]
-    * Signal CDT\n(0x00) [len = 4, color = "#53599A"]
-    // ISO TP Header (Fixed Part)
-    * Destination Reference [len = 16, color = "#53599A"]
-    * Source Reference [len = 16, color = "#53599A"]
-    * Protocol Class\n(Class 0 = 0x00) [len = 8, color = "#53599A"]
-
-    // ISO TP Header (Variable Part / Parameters)
-    * Parameter Code\n(TPDU Size = 0xC0) [len = 8, color = "#53599A"]
-    * Parameter Length\n(1 = 0x01) [len = 8, color = "#53599A"]
-    * Parameter Value\n(TPDU Size 1024 = 0x0A) [len = 8, color = "#53599A"]
-
-    * Parameter Code\n(Calling TSAP = 0xC1) [len = 8, color = "#53599A"]
-    * Parameter Length (2 = 0x02) [len = 8, color = "#53599A"]
-    * Device Group\n(PG/PC = 0x01) [len = 8, color = "#53599A"]
-    * TSAP Id (0x00) [len = 8, color = "#53599A"]
-
-    * Parameter Code\n(Called TSAP = 0xC2) [len = 8, color = "#53599A"]
-    * Parameter Length (2 = 0x02) [len = 8, color = "#53599A"]
-    * Device Group\n(Others = 0x03) [len = 8, color = "#53599A"]
-    * Rack Number[len = 4, color = "#80DED9"]
-    * Slot Number[len = 4, color = "#80DED9"]
-}
-....
-
-Legend:
-
-- [protocolIsoOnTcp]#ISO on TCP Packet Header#
-- [protocolIsoTP]#ISO Transport Protocol Packet Header#
-- [protocolId]#Part of the packet that identifies the type of request#
-- [protocolParameter]#Variable Parts of the ISO Transport Protocol Packet Header#
-
-==== Connection Response TPDU
-
-The `Connection Response` is identical to the `Connection Request` with the only difference that the `TPDU-Code` has a code of `0xD0`.
-
-==== Data TPDU
-
-// len (length of bits - use instead of explicit byte count - requires "*" as first element)
-// label
-// color / background
-// linecolor
-// rotate (degrees)
-// colheight
-// height
-// numbered
-// label_orientation (vertical, horizontal)
-// stacked (no value)
-// icon
-// shape (box, circle, ...)
-[packetdiag,s7-data,svg]
-....
-{
-    colwidth = 32
-
-    // ISO on TCP
-    * ISO on TCP Magic Number (0x03) [len = 8, color = "#068D9D"]
-    * Reserved (0x00) [len = 8, color = "#068D9D"]
-    * Packet Length (including ISO on TCP header) [len = 16, color = "#068D9D"]
-
-    // ISO Transport Protocol
-    * ISO TP Header Length\n(excluding length byte) [len = 8, color = "#53599A"]
-    * TPDU-Code\n(DATA = 0xF0) [len = 4, color = "#AEECEF"]
-    * Signal CDT\n(0x00) [len = 4, color = "#53599A"]
-    * TPDU-NR/EOT [len = 8, color = "#53599A"]
-
-}
-....
-
-Legend:
-
-- [protocolIsoOnTcp]#ISO on TCP Packet Header#
-- [protocolIsoTP]#ISO Transport Protocol Packet Header#
-- [protocolId]#Part of the packet that identifies the type of request#
-
-==== Disconnect Request TPDU
-
-// len (length of bits - use instead of explicit byte count - requires "*" as first element)
-// label
-// color / background
-// linecolor
-// rotate (degrees)
-// colheight
-// height
-// numbered
-// label_orientation (vertical, horizontal)
-// stacked (no value)
-// icon
-// shape (box, circle, ...)
-[packetdiag,s7-disconnect-request,svg]
-....
-{
-    colwidth = 32
-
-    // ISO on TCP
-    * ISO on TCP Magic Number (0x03) [len = 8, color = "#068D9D"]
-    * Reserved (0x00) [len = 8, color = "#068D9D"]
-    * Packet Length (including ISO on TCP header) [len = 16, color = "#068D9D"]
-
-    // ISO Transport Protocol
-    * ISO TP Header Length\n(excluding length byte) [len = 8, color = "#53599A"]
-    * TPDU-Code\n(DR = 0x80) [len = 4, color = "#AEECEF"]
-    * Signal CDT\n(0x00) [len = 4, color = "#53599A"]
-    * Destination Reference [len = 16, color = "#53599A"]
-    * Source Reference [len = 16, color = "#53599A"]
-    * Reason [len = 8, color = "#53599A"]
-
-    // ISO TP Header (Variable Part / Parameters) (Optional)
-    * Parameter Code\n(Disconnect Additional Information = 0xE0) [len = 8, color = "#53599A"]
-    * Parameter Length\n(1 ... 128) [len = 8, color = "#53599A"]
-    * Parameter Data\n(Custom user data) [len = 24, color = "#53599A"]
-
-}
-....
-
-Legend:
-
-- [protocolIsoOnTcp]#ISO on TCP Packet Header#
-- [protocolIsoTP]#ISO Transport Protocol Packet Header#
-- [protocolId]#Part of the packet that identifies the type of request#
-- [protocolParameter]#Variable Parts of the ISO Transport Protocol Packet Header#
+//
+//  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
+//
+//      http://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.
+//
+:imagesdir: ../../images/
+
+== S7 Communication
+
+When communicating with S7 Devices there is a whole family of protocols, that can be used.
+In general you can divide them into `Profinet` protocols and `S7 Comm` protocols.
+The later are far simpler in structure, but also far less documented.
+The `S7 Comm` protocols are generally split up into two flavours: The classic `S7 Comm` and a newer version unofficially called `S7 Comm Plus`.
+
+=== Overview of the Protocols
+
+[ditaa,protocols-s7-osi]
+....
+                    :                                                       :             : implemented               :
+                    :                                                       :             :      |                    :
+                    :                       Profinet                        :             :      | S7 Protocol        :
+                    :                                                       :             :      V                    :
+- - - - - - - - - - +-------------+-------------+-------------+-------------+-------------+-------------+-------------+ - -
+                    |c0B0         |c0B0         |c0B0         |c0B0         |c05A         |c0BA         |c0BA         |
+ Application        |             |             |             |             |             |             |             |
+ Layer              |             |             |             |             |             |             |             |
+                    |             |             |             |             |             |             |             |
+                    | Profinet IO | Profinet IO | Profinet CBA| Profinet CBA|             |             |             |
+- - - - - - - - - - |   RT / IRT  |             |             |      RT     |             |             |             | - -
+                    |             |             |             |             |             |             |             |
+ Presentation       |             |             |             |             |             |             |             |
+ Layer              |             |             |             |             |     S7      |     S7      |     S7      |
+                    |             |             |             |             |    Comm     |    Comm     |    Comm     |
+                    |             |             |             |             |    Plus     |             |             |
+- - - - - - - - - - |             +-------------+-------------+             |             |             |             | - -
+                    |             |cAAA         |cAAA         |             |             |             |             |
+ Session            |             |             |             |             |             |             |             |
+ Layer              |             |     RPC     |    DCOM     |             |             |             |             |
+                    |             |             |             |             |             |             |             |
+                    |             |             |             |             |             |             |             |
+- - - - - - - - - - |             +-------------+-------------+             +-------------+-------------+-------------+ - -
+                    |             |cAAA         |cAAA         |             |cF6F                                     |
+                    |             |             |             |             |         ISO Transport Protocol          |
+                    |             |             |             |             |                 RFC 905                 |
+                    |             |             |             |             | (Class 0)                               |
+                    |             |             |             |             +---------------------------+             |
+                    |             |             |             |             |cFF6                       |             |
+ Transport          |             |             |             |             | ISO on TCP                |             |
+ Layer              |             |     UDP     |     TCP     |             |  RFC 1006                 |             |
+                    |             |             |             |             +---------------------------+             |
+                    |             |             |             |             |cAAA                       |             |
+                    |             |             |             |             |     TCP                   |             |
+                    |             |             |             |             |                           |     ISO     |
+- - - - - - - - - - |             +-------------+-------------+             +---------------------------+   Transport | - -
+                    |             | cAAA                      |             |cAAA                       |   Protocol  |
+ Network            |             |                           |             |                           |   RFC 905   |
+ Layer              |             |            IP             |             |     IP                    |   (Class 4) |
+                    |             |                           |             |                           |             |
+                    |             |                           |             |                           |             |
+- - - - - - - - - - +-------------+---------------------------+-------------+---------------------------+-------------+ - -
+                    |cAAA                                                                                             |
+ Data Link          |                                                                                                 |
+ Layer              |                                                                                                 |
+                    |                                                                                                 |
+                    |                       Industrial                                                                |
+- - - - - - - - - - |                        Ethernet                                                                 | - -
+                    |                                                                                                 |
+ Physical           |                                                                                                 |
+ Layer              |                                                                                                 |
+                    |                                                                                                 |
+                    |                                                                                                 |
+- - - - - - - - - - +-------------------------------------------------------------------------------------------------+ - -
+....
+
+=== Protocol Descriptions
+
+|===
+|Name |ISO |RFC |Link
+|Transmission Control Protocol (TCP) |- | RFC 793 |https://tools.ietf.org/html/rfc793
+|ISO on TCP |-Ā | RFC 1006| https://tools.ietf.org/html/rfc1006
+|ISO Transport Protocol (Class 4) |ISO DP 8073 | RFC 905 |https://tools.ietf.org/html/rfc905
+|S7 Comm (0x32) |-Ā |- |http://gmiru.com/article/s7comm/ http://gmiru.com/article/s7comm-part2/ https://www.eng.tau.ac.il/~yash/jdsfl2014.pdf
+|S7 Comm Plus (0x72) |- |- |(Information seems to be invalid or incorrect however) https://opensource-security.de/thesis/MA_Maik_Brueggemann.pdf
+|RPC |- | RFC 1057 & RFC 5531 |https://tools.ietf.org/html/rfc1057 https://tools.ietf.org/html/rfc5531
+|DCOM |- |- | https://msdn.microsoft.com/library/cc201989.aspx
+|===
+
+=== Interaction with an S7 PLC
+
+Currently we are concentrating on implementing the TCP-based variants of the `S7 Comm` and `S7 Comm Plus` protocols.
+Both are transferred using `ISO TP` which is wrapped by `ISO on TCP`.
+Both protocols require establishing a connection on the `ISO TP` level first.
+After the `ISO TP` connection is established, the higher level protocols then establish their connections.
+These are then handled by the individual protocol sub-pages:
+
+- link:s7comm.html[S7 Comm (0x32)]
+- link:s7comm-plus.html[S7 Comm Plus (0x72)]
+
+The hex-value behind each of these correlates to the first byte used in the protocols messages to indicate the type of protocol.
+
+[seqdiag,s7-interaction]
+....
+{
+    === Connect ===
+
+    Client -> "ISO TP" [label = "Connection Request"]
+    Client <- "ISO TP" [label = "Connection Response"]
+
+    === Higher Level Connect ===
+
+    === Higher Level Communication ===
+
+    === Disconnect ===
+
+    Client -> "ISO TP" [label = "Disconnect Request"]
+
+}
+....
+
+=== ISO TP Message Types
+
+Even if `ISO TP` defines more types of messages, the ones required for `S7 Comm` or `S7 Comm Plus` are only the following.
+Each message is called a `TPDU` (Transport Protocol Data Unit):
+
+- Connection Request TPDU
+- Connection Response TPDU
+- Data TPDU
+- Disconnect Request TPDU
+
+Notice: There is no `Disconnect Response` in `ISO TP: Class 0`.
+
+==== Connection Request TPDU
+
+// len (length of bits - use instead of explicit byte count - requires "*" as first element)
+// label
+// color / background
+// linecolor
+// rotate (degrees)
+// colheight
+// height
+// numbered
+// label_orientation (vertical, horizontal)
+// stacked (no value)
+// icon
+// shape (box, circle, ...)
+[packetdiag,s7-connect-request,svg]
+....
+{
+    colwidth = 32
+
+    // ISO on TCP
+    * ISO on TCP Magic Number (0x03) [len = 8, color = "#068D9D"]
+    * Reserved (0x00) [len = 8, color = "#068D9D"]
+    * Packet Length (including ISO on TCP header) [len = 16, color = "#068D9D"]
+
+    // ISO Transport Protocol
+    * ISO TP Header Length\n(excluding length byte) [len = 8, color = "#53599A"]
+    * TPDU-Code\n(CR = 0xE0) [len = 4, color = "#AEECEF"]
+    * Signal CDT\n(0x00) [len = 4, color = "#53599A"]
+    // ISO TP Header (Fixed Part)
+    * Destination Reference [len = 16, color = "#53599A"]
+    * Source Reference [len = 16, color = "#53599A"]
+    * Protocol Class\n(Class 0 = 0x00) [len = 8, color = "#53599A"]
+
+    // ISO TP Header (Variable Part / Parameters)
+    * Parameter Code\n(TPDU Size = 0xC0) [len = 8, color = "#53599A"]
+    * Parameter Length\n(1 = 0x01) [len = 8, color = "#53599A"]
+    * Parameter Value\n(TPDU Size 1024 = 0x0A) [len = 8, color = "#53599A"]
+
+    * Parameter Code\n(Calling TSAP = 0xC1) [len = 8, color = "#53599A"]
+    * Parameter Length (2 = 0x02) [len = 8, color = "#53599A"]
+    * Device Group\n(PG/PC = 0x01) [len = 8, color = "#53599A"]
+    * TSAP Id (0x00) [len = 8, color = "#53599A"]
+
+    * Parameter Code\n(Called TSAP = 0xC2) [len = 8, color = "#53599A"]
+    * Parameter Length (2 = 0x02) [len = 8, color = "#53599A"]
+    * Device Group\n(Others = 0x03) [len = 8, color = "#53599A"]
+    * Rack Number[len = 4, color = "#80DED9"]
+    * Slot Number[len = 4, color = "#80DED9"]
+}
+....
+
+Legend:
+
+- [protocolIsoOnTcp]#ISO on TCP Packet Header#
+- [protocolIsoTP]#ISO Transport Protocol Packet Header#
+- [protocolId]#Part of the packet that identifies the type of request#
+- [protocolParameter]#Variable Parts of the ISO Transport Protocol Packet Header#
+
+==== Connection Response TPDU
+
+The `Connection Response` is identical to the `Connection Request` with the only difference that the `TPDU-Code` has a code of `0xD0`.
+
+==== Data TPDU
+
+// len (length of bits - use instead of explicit byte count - requires "*" as first element)
+// label
+// color / background
+// linecolor
+// rotate (degrees)
+// colheight
+// height
+// numbered
+// label_orientation (vertical, horizontal)
+// stacked (no value)
+// icon
+// shape (box, circle, ...)
+[packetdiag,s7-data,svg]
+....
+{
+    colwidth = 32
+
+    // ISO on TCP
+    * ISO on TCP Magic Number (0x03) [len = 8, color = "#068D9D"]
+    * Reserved (0x00) [len = 8, color = "#068D9D"]
+    * Packet Length (including ISO on TCP header) [len = 16, color = "#068D9D"]
+
+    // ISO Transport Protocol
+    * ISO TP Header Length\n(excluding length byte) [len = 8, color = "#53599A"]
+    * TPDU-Code\n(DATA = 0xF0) [len = 4, color = "#AEECEF"]
+    * Signal CDT\n(0x00) [len = 4, color = "#53599A"]
+    * TPDU-NR/EOT [len = 8, color = "#53599A"]
+
+}
+....
+
+Legend:
+
+- [protocolIsoOnTcp]#ISO on TCP Packet Header#
+- [protocolIsoTP]#ISO Transport Protocol Packet Header#
+- [protocolId]#Part of the packet that identifies the type of request#
+
+==== Disconnect Request TPDU
+
+// len (length of bits - use instead of explicit byte count - requires "*" as first element)
+// label
+// color / background
+// linecolor
+// rotate (degrees)
+// colheight
+// height
+// numbered
+// label_orientation (vertical, horizontal)
+// stacked (no value)
+// icon
+// shape (box, circle, ...)
+[packetdiag,s7-disconnect-request,svg]
+....
+{
+    colwidth = 32
+
+    // ISO on TCP
+    * ISO on TCP Magic Number (0x03) [len = 8, color = "#068D9D"]
+    * Reserved (0x00) [len = 8, color = "#068D9D"]
+    * Packet Length (including ISO on TCP header) [len = 16, color = "#068D9D"]
+
+    // ISO Transport Protocol
+    * ISO TP Header Length\n(excluding length byte) [len = 8, color = "#53599A"]
+    * TPDU-Code\n(DR = 0x80) [len = 4, color = "#AEECEF"]
+    * Signal CDT\n(0x00) [len = 4, color = "#53599A"]
+    * Destination Reference [len = 16, color = "#53599A"]
+    * Source Reference [len = 16, color = "#53599A"]
+    * Reason [len = 8, color = "#53599A"]
+
+    // ISO TP Header (Variable Part / Parameters) (Optional)
+    * Parameter Code\n(Disconnect Additional Information = 0xE0) [len = 8, color = "#53599A"]
+    * Parameter Length\n(1 ... 128) [len = 8, color = "#53599A"]
+    * Parameter Data\n(Custom user data) [len = 24, color = "#53599A"]
+
+}
+....
+
+Legend:
+
+- [protocolIsoOnTcp]#ISO on TCP Packet Header#
+- [protocolIsoTP]#ISO Transport Protocol Packet Header#
+- [protocolId]#Part of the packet that identifies the type of request#
+- [protocolParameter]#Variable Parts of the ISO Transport Protocol Packet Header#
diff --git a/src/site/asciidoc/protocols/s7/s7comm-plus.adoc b/src/site/asciidoc/protocols/s7/s7comm-plus.adoc
index d3a9e19712c..96a5d2a2220 100644
--- a/src/site/asciidoc/protocols/s7/s7comm-plus.adoc
+++ b/src/site/asciidoc/protocols/s7/s7comm-plus.adoc
@@ -1,38 +1,38 @@
-//
-//  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
-//
-//      http://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.
-//
-:imagesdir: ../../images/
-
-== S7 Comm Plus (0x72)
-
-The `S7 Comm Plus` protocol is a new version of the original `S7 Comm` protocol.
-While a `S7 Comm` packet is identified, by the magic byte `0x32`, the `S7 Comm Plus` packet uses the magic byte `0x72`.
-The End of a packet is indicated by a frame end sequence of 6 bytes: 00 00 72 01 00 00
-
-The general structure of the protocols content however is completely different and far less documented.
-
-The biggest source for getting started in implementing this protocol was the https://os-s.de/thesis/MA_Maik_Brueggemann.pdf[Master Thesis of Maik BrĆ¼ggemann].
-However this only covered the basic structure of a `S7 Comm Plus` packet and it seems that this information is not quite correct as many assumptions hav turned out to not be correct.
-
-Beyond that, it seems that implementing this protocol would require knowledge of some shared keys which are contained in the bytecode of the PLCs as well as the official drivers.
-As we can't reverse-engineer these keys, the only way we could get them, would be by disassembling the existing code, which would not be allowed.
-
-Therefore we have currently stopped working on this protocol type.
-Probably things may change in the future, but for now we see no way we could finish this on a legally correct path.
-
-== Links
-
+//
+//  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
+//
+//      http://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.
+//
+:imagesdir: ../../images/
+
+== S7 Comm Plus (0x72)
+
+The `S7 Comm Plus` protocol is a new version of the original `S7 Comm` protocol.
+While a `S7 Comm` packet is identified, by the magic byte `0x32`, the `S7 Comm Plus` packet uses the magic byte `0x72`.
+The End of a packet is indicated by a frame end sequence of 6 bytes: 00 00 72 01 00 00
+
+The general structure of the protocols content however is completely different and far less documented.
+
+The biggest source for getting started in implementing this protocol was the https://os-s.de/thesis/MA_Maik_Brueggemann.pdf[Master Thesis of Maik BrĆ¼ggemann].
+However this only covered the basic structure of a `S7 Comm Plus` packet and it seems that this information is not quite correct as many assumptions hav turned out to not be correct.
+
+Beyond that, it seems that implementing this protocol would require knowledge of some shared keys which are contained in the bytecode of the PLCs as well as the official drivers.
+As we can't reverse-engineer these keys, the only way we could get them, would be by disassembling the existing code, which would not be allowed.
+
+Therefore we have currently stopped working on this protocol type.
+Probably things may change in the future, but for now we see no way we could finish this on a legally correct path.
+
+== Links
+
 https://www.blackhat.com/docs/eu-17/materials/eu-17-Lei-The-Spear-To-Break%20-The-Security-Wall-Of-S7CommPlus-wp.pdf
\ No newline at end of file
diff --git a/src/site/asciidoc/protocols/s7/s7comm.adoc b/src/site/asciidoc/protocols/s7/s7comm.adoc
index 793716f999d..843a4f8196a 100644
--- a/src/site/asciidoc/protocols/s7/s7comm.adoc
+++ b/src/site/asciidoc/protocols/s7/s7comm.adoc
@@ -1,144 +1,144 @@
-//
-//  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
-//
-//      http://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.
-//
-:imagesdir: ../../images/
-
-== S7 Comm (0x32)
-
-=== General
-
-While a lot of information was available on the general structure of S7 communication, only little information was available on the constant values this protocol uses.
-If information was available, this was mostly provided with a GPL license and therefore was disqualified for being used in this project.
-The information on the S7 constants in this project were therefore generated by a little tool that generates "pcap" files `WireShark` can process.
-The tool then generated 256 versions of a given template with the only difference being the one byte having all possible values.
-Using the `tshark` commandline tool, the generated packets were decoded to an XML format.
-For each examined byte an XPath expression was created to detect valid values.
-As soon as a valid value was found the tool then output the detected constant value to the console.
-
-The tool for generating this is located in the `plc4j/protocols/s7-utils` project.
-
-=== Structure of a Setup Communication Request
-
-[packetdiag,s7-setup-communication-request,svg]
-....
-{
-    colwidth = 32
-
-    // ISO on TCP
-    * ISO on TCP Magic Number (0x03) [len = 8, color = "#068D9D"]
-    * Reserved (0x00) [len = 8, color = "#068D9D"]
-    * Packet Length (including ISO on TCP header) [len = 16, color = "#068D9D"]
-
-    // ISO Transport Protocol
-    * ISO TP Header Length\n(excluding length byte) [len = 8, color = "#53599A"]
-    * TPDU-Code\n(Data = 0xF0) [len = 4, color = "#AEECEF"]
-    * Signal CDT\n(0x00) [len = 4, color = "#53599A"]
-    // ISO TP Header (Fixed Part)
-    * Destination Reference (0x??)[len = 16, color = "#53599A"]
-    * Source Reference (0x??)[len = 16, color = "#53599A"]
-    * Protocol Class\n(Class 0 = 0x00) [len = 8, color = "#53599A"]
-
-    // S7
-    96-103: S7 Protocol Magic Byte (0x32) [color = "#6D9DC5"]
-    * Message Type (JOB = 0x01) [len = 8, color = "#AEECEF"]
-    * Reserved (0x0000) [len = 16, color = "#6D9DC5"]
-    * PDU Reference (0x??)[len = 16, color = "#6D9DC5"]
-    * S7 Parameters Length  (8 = 0x08) [len = 16, color = "#6D9DC5"]
-    * S7 Data Length (0 = 0x00) [len = 16, color = "#6D9DC5"]
-
-    // S7 Parameters
-    * Function\n(Setup Communication = 0xF0) [len = 8, color = "#AEECEF"]
-    * Reserved (0x00) [len = 8, color = "#6D9DC5"]
-    * Max AMQ Caller [len = 16, color = "#80DED9"]
-    * Max AMQ Callee [len = 16, color = "#80DED9"]
-    * PDU Size [len = 16, color = "#80DED9"]
-
-    // S7 Data
-}
-....
-
-Legend:
-
-- [protocolIsoOnTcp]#ISO on TCP Packet Header#
-- [protocolIsoTP]#ISO Transport Protocol Packet Header#
-- [protocolS7]#S7 Protocol#
-- [protocolId]#Part of the packet that identifies the type of request#
-- [protocolParameter]#Variable Parts of the ISO Transport Protocol Packet Header#
-
-=== Structure of a Setup Communication Response
-
-The `Setup Communication Response` is identical to the `Setup Communication Request` with the only difference that the `Message Type` has an ACK_DATA code of `0x03`.
-
-Also does the response eventually provide different values for `Max AMQ Caller`, `Max AMQ Callee` and `PDU Size`.
-
-The values might be lower than in the request, but never higher.
-
-TIP: One thing about `Setup Communication Responses` which is kind of strange, is that usually S7 response messages have additional `error class` and `error code` fields, which this type of response doesn't seem to have.
-
-=== Sizes of requests
-
-During the connection to a S7 PLC the client and PLC agree on 3 important parameters:
-
-- PDU Size
-- Max AMQ Caller
-- Max AMQ Callee
-
-The PDU Size is the size of a data packet the PLC is willing to accept.
-Here note, that in reality there are two PDU sizes involved: On `ISO TP/COTP` protocol level (TPDU Size) and a second time on the `S7` protocol level (PDU Size).
-Most implementations treat them as somewhat equal, but this doesn't have to be the case.
-A PLC could accept a higher PDU size on `ISO TP` level than on `S7` level.
-
-The `Max AMQ` parameters define how many unacknowledged requests a PLC (Callee) is able to accept from a client (Caller).
-
-If the `ISO TP` TPDU size is bigger than the `S7` PDU size, then theoretically multiple `S7` PDUs can be contained in one `ISO TP` packet.
-But at max `Max AMQ` packets.
-Most drivers don't utilize this option however (We won't either).
-
-When issuing a read request there are other things that have to be taken into account:
-
-If on `ISO TP` level a max PDU size has been agreed on, the max PDU Size of the `S7` packet will be smaller.
-So if a TPDU size of 256 bytes has been agreed upon, then the ISO TP header takes 3 bytes and the header of the S7 packet takes 10 bytes.
-The header of a `Read Var` parameter takes 2 bytes.
-So if the TPDU size is 256 bytes, this leaves 256 - (3 + 10 + 2) bytes = 241 bytes
-
-An `S7ANY` type variable specification takes 12 bytes, so the maximum number of memory areas that can be accessed in one S7 request packet is: 241 / 12 = 20
-That's also the reason why most available drivers limit the number of addresses to 20 (Some go down to 18 because some devices seem to calculate the boundaries differently).
-
-To make things even more complicated, we have to ensure the data retrieved by a read request fits into a PDU.
-So if a block of data requested in a read request would would exceed the agreed upon PDU size, the PLC will respond with an `Access Violation` and not return any data.
-So the size limit for reading data with a 256 byte PDU size would be 241 - 12 = 229 bytes.
-
-Another example would be if you read different memory blocks, each smaller than the max PDU size, the read PDU could be quite small, but if these blocks are quite large, the read response could exceed the max PDU size.
-In this case the item responses that exceed the size will simply be responded with an `Access violation` by the PLC.
-
-The typical `Max AMQ` of `8` further complicates things as we can't simply split up the one message into multiple ones and blindly fire them at the PLC.
-If the number of messages exceeds this number, we have to queue the excess PDUs and wait till the PLC confirmed some and can then continue sending further fragments.
-
-Most commercial drivers reduce the stress by rearranging and changing the requests.
-If for example a request would read 8 consecutive bits, it would automatically change the 8 items into reading one byte.
-Also if the gap between addresses is smaller than the overhead for a new definition, it would extend the first to include the second memory area.
-Same should sometimes be possible in the other direction.
-So if we wanted to read 300 bytes with a 256 byte TPDU size, the driver would split this up into two smaller byte arrays and internally merge them. However when reading Real (Number) values there could be issues with this.
-However in this case the driver has to completely take care of this optimization.
-
-=== Links
-
-Providing some additional information without directly being used:
-
-- High Level description: http://snap7.sourceforge.net/siemens_comm.html
-- https://support.industry.siemens.com/cs/document/26483647/welche-eigenschaften-vorteile-und-besonderheiten-bietet-das-s7-protokoll-?dti=0&lc=de-WW
-- Interesting presentation mentioning a new protocol flavor 0x72 instead of the old 0x32: https://www.research.ibm.com/haifa/Workshops/security2014/present/Avishai_Wool_AccurateModelingoftheSiemensS7SCADAProtocol-v5.pdf
+//
+//  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
+//
+//      http://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.
+//
+:imagesdir: ../../images/
+
+== S7 Comm (0x32)
+
+=== General
+
+While a lot of information was available on the general structure of S7 communication, only little information was available on the constant values this protocol uses.
+If information was available, this was mostly provided with a GPL license and therefore was disqualified for being used in this project.
+The information on the S7 constants in this project were therefore generated by a little tool that generates "pcap" files `WireShark` can process.
+The tool then generated 256 versions of a given template with the only difference being the one byte having all possible values.
+Using the `tshark` commandline tool, the generated packets were decoded to an XML format.
+For each examined byte an XPath expression was created to detect valid values.
+As soon as a valid value was found the tool then output the detected constant value to the console.
+
+The tool for generating this is located in the `plc4j/protocols/s7-utils` project.
+
+=== Structure of a Setup Communication Request
+
+[packetdiag,s7-setup-communication-request,svg]
+....
+{
+    colwidth = 32
+
+    // ISO on TCP
+    * ISO on TCP Magic Number (0x03) [len = 8, color = "#068D9D"]
+    * Reserved (0x00) [len = 8, color = "#068D9D"]
+    * Packet Length (including ISO on TCP header) [len = 16, color = "#068D9D"]
+
+    // ISO Transport Protocol
+    * ISO TP Header Length\n(excluding length byte) [len = 8, color = "#53599A"]
+    * TPDU-Code\n(Data = 0xF0) [len = 4, color = "#AEECEF"]
+    * Signal CDT\n(0x00) [len = 4, color = "#53599A"]
+    // ISO TP Header (Fixed Part)
+    * Destination Reference (0x??)[len = 16, color = "#53599A"]
+    * Source Reference (0x??)[len = 16, color = "#53599A"]
+    * Protocol Class\n(Class 0 = 0x00) [len = 8, color = "#53599A"]
+
+    // S7
+    96-103: S7 Protocol Magic Byte (0x32) [color = "#6D9DC5"]
+    * Message Type (JOB = 0x01) [len = 8, color = "#AEECEF"]
+    * Reserved (0x0000) [len = 16, color = "#6D9DC5"]
+    * PDU Reference (0x??)[len = 16, color = "#6D9DC5"]
+    * S7 Parameters Length  (8 = 0x08) [len = 16, color = "#6D9DC5"]
+    * S7 Data Length (0 = 0x00) [len = 16, color = "#6D9DC5"]
+
+    // S7 Parameters
+    * Function\n(Setup Communication = 0xF0) [len = 8, color = "#AEECEF"]
+    * Reserved (0x00) [len = 8, color = "#6D9DC5"]
+    * Max AMQ Caller [len = 16, color = "#80DED9"]
+    * Max AMQ Callee [len = 16, color = "#80DED9"]
+    * PDU Size [len = 16, color = "#80DED9"]
+
+    // S7 Data
+}
+....
+
+Legend:
+
+- [protocolIsoOnTcp]#ISO on TCP Packet Header#
+- [protocolIsoTP]#ISO Transport Protocol Packet Header#
+- [protocolS7]#S7 Protocol#
+- [protocolId]#Part of the packet that identifies the type of request#
+- [protocolParameter]#Variable Parts of the ISO Transport Protocol Packet Header#
+
+=== Structure of a Setup Communication Response
+
+The `Setup Communication Response` is identical to the `Setup Communication Request` with the only difference that the `Message Type` has an ACK_DATA code of `0x03`.
+
+Also does the response eventually provide different values for `Max AMQ Caller`, `Max AMQ Callee` and `PDU Size`.
+
+The values might be lower than in the request, but never higher.
+
+TIP: One thing about `Setup Communication Responses` which is kind of strange, is that usually S7 response messages have additional `error class` and `error code` fields, which this type of response doesn't seem to have.
+
+=== Sizes of requests
+
+During the connection to a S7 PLC the client and PLC agree on 3 important parameters:
+
+- PDU Size
+- Max AMQ Caller
+- Max AMQ Callee
+
+The PDU Size is the size of a data packet the PLC is willing to accept.
+Here note, that in reality there are two PDU sizes involved: On `ISO TP/COTP` protocol level (TPDU Size) and a second time on the `S7` protocol level (PDU Size).
+Most implementations treat them as somewhat equal, but this doesn't have to be the case.
+A PLC could accept a higher PDU size on `ISO TP` level than on `S7` level.
+
+The `Max AMQ` parameters define how many unacknowledged requests a PLC (Callee) is able to accept from a client (Caller).
+
+If the `ISO TP` TPDU size is bigger than the `S7` PDU size, then theoretically multiple `S7` PDUs can be contained in one `ISO TP` packet.
+But at max `Max AMQ` packets.
+Most drivers don't utilize this option however (We won't either).
+
+When issuing a read request there are other things that have to be taken into account:
+
+If on `ISO TP` level a max PDU size has been agreed on, the max PDU Size of the `S7` packet will be smaller.
+So if a TPDU size of 256 bytes has been agreed upon, then the ISO TP header takes 3 bytes and the header of the S7 packet takes 10 bytes.
+The header of a `Read Var` parameter takes 2 bytes.
+So if the TPDU size is 256 bytes, this leaves 256 - (3 + 10 + 2) bytes = 241 bytes
+
+An `S7ANY` type variable specification takes 12 bytes, so the maximum number of memory areas that can be accessed in one S7 request packet is: 241 / 12 = 20
+That's also the reason why most available drivers limit the number of addresses to 20 (Some go down to 18 because some devices seem to calculate the boundaries differently).
+
+To make things even more complicated, we have to ensure the data retrieved by a read request fits into a PDU.
+So if a block of data requested in a read request would would exceed the agreed upon PDU size, the PLC will respond with an `Access Violation` and not return any data.
+So the size limit for reading data with a 256 byte PDU size would be 241 - 12 = 229 bytes.
+
+Another example would be if you read different memory blocks, each smaller than the max PDU size, the read PDU could be quite small, but if these blocks are quite large, the read response could exceed the max PDU size.
+In this case the item responses that exceed the size will simply be responded with an `Access violation` by the PLC.
+
+The typical `Max AMQ` of `8` further complicates things as we can't simply split up the one message into multiple ones and blindly fire them at the PLC.
+If the number of messages exceeds this number, we have to queue the excess PDUs and wait till the PLC confirmed some and can then continue sending further fragments.
+
+Most commercial drivers reduce the stress by rearranging and changing the requests.
+If for example a request would read 8 consecutive bits, it would automatically change the 8 items into reading one byte.
+Also if the gap between addresses is smaller than the overhead for a new definition, it would extend the first to include the second memory area.
+Same should sometimes be possible in the other direction.
+So if we wanted to read 300 bytes with a 256 byte TPDU size, the driver would split this up into two smaller byte arrays and internally merge them. However when reading Real (Number) values there could be issues with this.
+However in this case the driver has to completely take care of this optimization.
+
+=== Links
+
+Providing some additional information without directly being used:
+
+- High Level description: http://snap7.sourceforge.net/siemens_comm.html
+- https://support.industry.siemens.com/cs/document/26483647/welche-eigenschaften-vorteile-und-besonderheiten-bietet-das-s7-protokoll-?dti=0&lc=de-WW
+- Interesting presentation mentioning a new protocol flavor 0x72 instead of the old 0x32: https://www.research.ibm.com/haifa/Workshops/security2014/present/Avishai_Wool_AccurateModelingoftheSiemensS7SCADAProtocol-v5.pdf
 - Open Source SCADA System: https://www.eclipse.org/eclipsescada/
\ No newline at end of file
diff --git a/src/site/asciidoc/users/download.adoc b/src/site/asciidoc/users/download.adoc
index d5c8ac41dd1..ac83fd68887 100644
--- a/src/site/asciidoc/users/download.adoc
+++ b/src/site/asciidoc/users/download.adoc
@@ -1,133 +1,133 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== Download
-
-Be sure to verify your downloads by these https://www.apache.org/info/verification[procedures] using these https://www.apache.org/dist/plc4x/KEYS[KEYS] for any Apache release.
-
-=== Current Releases
-
-[#release-0.6.0]
-==== 0.6.0 Official https://www.apache.org/dyn/closer.lua/plc4x/0.6.0/apache-plc4x-0.6.0-source-release.zip[source release] [ https://www.apache.org/dist/plc4x/0.6.0/apache-plc4x-0.6.0-source-release.zip.sha512[SHA512] ] [ https://www.apache.org/dist/plc4x/0.6.0/apache-plc4x-0.6.0-source-release.zip.asc[ASC] ]
-
-This is the first release containing our new generaed drivers (AB-ETH)
-
-===== New Features
-
-- Implemented a new Apache Kafka Connect integration module
-- Implemented a new Apache NiFi integration module
-- Implemented a new Logstash integration module
-- Implemented a driver for the AB-ETH protocol
-- Implemented Apache Karaf features for S7 OSGI drivers
-- PLC4X-121	Develop Code Generation to allow Generated Drivers in multiple Languages
-
-Sandbox (Beta-Features)
-- Implemented a new BACnet/IP passive mode driver
-- Implemented a new Serial DF1 driver
-
-===== Incompatible changes
-
-===== Bug Fixes
-
-- PLC4X-104	S7 Driver Datatype TIME_OF_DAY causes ArrayOutOfBoundException
-- PLC4X-134	S7 is terminating the connection during handshake
-- PLC4X-139	PLC4X leaks sockets in case of connection problems
-- PLC4X-141	String with real length of greater 127 throw an exception
-- PLC4X-144	When requesting invalid addresses, the DefaultS7MessageProcessor produces errors
-
-=== Previous Releases
-
-[#release-0.4.0]
-==== 0.4.0 Official https://archive.apache.org/dist/plc4x/0.4.0/apache-plc4x-0.4.0-source-release.zip[source release] [ https://archive.apache.org/dist/plc4x/0.4.0/apache-plc4x-0.4.0-source-release.zip.sha512[SHA512] ] [ https://archive.apache.org/dist/plc4x/0.4.0/apache-plc4x-0.4.0-source-release.zip.asc[ASC] ]
-
-This is the first release of Apache PLC4X as top-level project.
-
-===== New Features
-
-- The PlcConnection now supports a `ping` method to allow checking if an existing connection is still alive.
-- Support of the OPC-UA protocol with the `opc-ua-driver`.
-- Other Languages Support:
--- Added first versions of a C# .Net PLC4X API (`plc4net`)
--- Added first versions of a Python PLC4X API (`plc4py`)
-- Added an Interop server which allows to relay requests from other languages to a Java Server
-
-===== Incompatible changes
-
-- ElasticSearch example was updated to use ElasticSearch 7.0.1, this might cause problems with older Kibana versions.
-
-===== Bug Fixes
-
-=== Incubating Releases
-
-==== 0.3.1 (incubating) Official https://archive.apache.org/dist/incubator/plc4x/0.3.1-incubating/apache-plc4x-incubating-0.3.1-source-release.zip[source release] [ https://archive.apache.org/dist/incubator/plc4x/0.3.1-incubating/apache-plc4x-incubating-0.3.1-source-release.zip.sha512[SHA512] ] [ https://archive.apache.org/dist/incubator/plc4x/0.3.1-incubating/apache-plc4x-incubating-0.3.1-source-release.zip.asc[ASC] ]
-
-===== New Features
-
-- No new features
-
-===== Incompatible changes
-
-- No incompatible changes.
-
-===== Bug Fixes
-
-- The S7 driver didn't correctly handle "fill-bytes" in multi-item read-responses and multi-item write-requests
-- Fixed NPE when reading odd-length array of one-byte base types
-- Renamed flags "F" to Siemens Standard "M" (Marker)
-- Fixed a bug in the DefaultS7MessageProcessor which didn't correctly merge together split up items
-
-[#release-0.3.0]
-==== 0.3.0 (incubating) Official https://archive.apache.org/dist/incubator/plc4x/0.3.0-incubating/apache-plc4x-incubating-0.3.0-source-release.zip[source release] [ https://archive.apache.org/dist/incubator/plc4x/0.3.0-incubating/apache-plc4x-incubating-0.3.0-source-release.zip.sha512[SHA512] ] [ https://archive.apache.org/dist/incubator/plc4x/0.3.0-incubating/apache-plc4x-incubating-0.3.0-source-release.zip.asc[ASC] ]
-
-===== New Features
-
-- Object PLC Mapping (OPM) now has a Alias Registry to allow
-  variable substitution at runtime and write support
-- New module `plc-scraper` for applications that have to
-  scrape a lot of sps fields with high frequency
-- New integration `apache-karaf` to enable plc4j in a karaf
-  runtime environment
-
-===== Incompatible changes
-
-- The 'plc4j-core' module has been merged into 'plc4j-api'.
-  So there is no 'plc4j-core' module anymore. Just remove that
-  dependency.
-- The driver artifact names have changed so if you were using
-  a `plc4j-protocol-{name}` you now need to change this to
-  `plc4j-driver-{name}`
-
-===== Bug Fixes
-
-- Fixing dependency to the wrap url-handler
-- When receiving responses with more than 512 byte, the IsoOnTcp protocol doesn't work
-- When the last item in a request is a DINT, the DefaultS7MessageProcessor dies
-- Write operations seem to fail
-- Fixed a Bug where S7 was not able to read arrays.
-
-[#release-0.2.0]
-==== 0.2.0 (incubating) Official https://archive.apache.org/dist/incubator/plc4x/0.2.0-incubating/apache-plc4x-incubating-0.2.0-source-release.zip[source release] [ https://archive.apache.org/dist/incubator/plc4x/0.2.0-incubating/apache-plc4x-incubating-0.2.0-source-release.zip.sha512[SHA512] ] [ https://archive.apache.org/dist/incubator/plc4x/0.2.0-incubating/apache-plc4x-incubating-0.2.0-source-release.zip.asc[ASC] ]
-
-===== Changes:
-
-* Changed API: instead of passing request object to `read({read-request})`, `write({write-request})` or `subscribe({subscribe-request})` methods now the `execute()` method is called on the request itself
-* New Connection Pool component
-* New OPM (Object PLC Mapping) component (JPA for PLCs)
-* Bug fixes
-
-[#release-0.1.0]
-==== 0.1.0 (incubating) Official https://archive.apache.org/dist/incubator/plc4x/0.1.0-incubating/apache-plc4x-incubating-0.1.0-source-release.zip[source release] [ https://archive.apache.org/dist/incubator/plc4x/0.1.0-incubating/apache-plc4x-incubating-0.1.0-source-release.zip.sha512[SHA512] ] [ https://archive.apache.org/dist/incubator/plc4x/0.1.0-incubating/apache-plc4x-incubating-0.1.0-source-release.zip.asc[ASC] ]
+//
+//  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
+//
+//      http://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.
+//
+
+== Download
+
+Be sure to verify your downloads by these https://www.apache.org/info/verification[procedures] using these https://www.apache.org/dist/plc4x/KEYS[KEYS] for any Apache release.
+
+=== Current Releases
+
+[#release-0.6.0]
+==== 0.6.0 Official https://www.apache.org/dyn/closer.lua/plc4x/0.6.0/apache-plc4x-0.6.0-source-release.zip[source release] [ https://www.apache.org/dist/plc4x/0.6.0/apache-plc4x-0.6.0-source-release.zip.sha512[SHA512] ] [ https://www.apache.org/dist/plc4x/0.6.0/apache-plc4x-0.6.0-source-release.zip.asc[ASC] ]
+
+This is the first release containing our new generaed drivers (AB-ETH)
+
+===== New Features
+
+- Implemented a new Apache Kafka Connect integration module
+- Implemented a new Apache NiFi integration module
+- Implemented a new Logstash integration module
+- Implemented a driver for the AB-ETH protocol
+- Implemented Apache Karaf features for S7 OSGI drivers
+- PLC4X-121	Develop Code Generation to allow Generated Drivers in multiple Languages
+
+Sandbox (Beta-Features)
+- Implemented a new BACnet/IP passive mode driver
+- Implemented a new Serial DF1 driver
+
+===== Incompatible changes
+
+===== Bug Fixes
+
+- PLC4X-104	S7 Driver Datatype TIME_OF_DAY causes ArrayOutOfBoundException
+- PLC4X-134	S7 is terminating the connection during handshake
+- PLC4X-139	PLC4X leaks sockets in case of connection problems
+- PLC4X-141	String with real length of greater 127 throw an exception
+- PLC4X-144	When requesting invalid addresses, the DefaultS7MessageProcessor produces errors
+
+=== Previous Releases
+
+[#release-0.4.0]
+==== 0.4.0 Official https://archive.apache.org/dist/plc4x/0.4.0/apache-plc4x-0.4.0-source-release.zip[source release] [ https://archive.apache.org/dist/plc4x/0.4.0/apache-plc4x-0.4.0-source-release.zip.sha512[SHA512] ] [ https://archive.apache.org/dist/plc4x/0.4.0/apache-plc4x-0.4.0-source-release.zip.asc[ASC] ]
+
+This is the first release of Apache PLC4X as top-level project.
+
+===== New Features
+
+- The PlcConnection now supports a `ping` method to allow checking if an existing connection is still alive.
+- Support of the OPC-UA protocol with the `opc-ua-driver`.
+- Other Languages Support:
+-- Added first versions of a C# .Net PLC4X API (`plc4net`)
+-- Added first versions of a Python PLC4X API (`plc4py`)
+- Added an Interop server which allows to relay requests from other languages to a Java Server
+
+===== Incompatible changes
+
+- ElasticSearch example was updated to use ElasticSearch 7.0.1, this might cause problems with older Kibana versions.
+
+===== Bug Fixes
+
+=== Incubating Releases
+
+==== 0.3.1 (incubating) Official https://archive.apache.org/dist/incubator/plc4x/0.3.1-incubating/apache-plc4x-incubating-0.3.1-source-release.zip[source release] [ https://archive.apache.org/dist/incubator/plc4x/0.3.1-incubating/apache-plc4x-incubating-0.3.1-source-release.zip.sha512[SHA512] ] [ https://archive.apache.org/dist/incubator/plc4x/0.3.1-incubating/apache-plc4x-incubating-0.3.1-source-release.zip.asc[ASC] ]
+
+===== New Features
+
+- No new features
+
+===== Incompatible changes
+
+- No incompatible changes.
+
+===== Bug Fixes
+
+- The S7 driver didn't correctly handle "fill-bytes" in multi-item read-responses and multi-item write-requests
+- Fixed NPE when reading odd-length array of one-byte base types
+- Renamed flags "F" to Siemens Standard "M" (Marker)
+- Fixed a bug in the DefaultS7MessageProcessor which didn't correctly merge together split up items
+
+[#release-0.3.0]
+==== 0.3.0 (incubating) Official https://archive.apache.org/dist/incubator/plc4x/0.3.0-incubating/apache-plc4x-incubating-0.3.0-source-release.zip[source release] [ https://archive.apache.org/dist/incubator/plc4x/0.3.0-incubating/apache-plc4x-incubating-0.3.0-source-release.zip.sha512[SHA512] ] [ https://archive.apache.org/dist/incubator/plc4x/0.3.0-incubating/apache-plc4x-incubating-0.3.0-source-release.zip.asc[ASC] ]
+
+===== New Features
+
+- Object PLC Mapping (OPM) now has a Alias Registry to allow
+  variable substitution at runtime and write support
+- New module `plc-scraper` for applications that have to
+  scrape a lot of sps fields with high frequency
+- New integration `apache-karaf` to enable plc4j in a karaf
+  runtime environment
+
+===== Incompatible changes
+
+- The 'plc4j-core' module has been merged into 'plc4j-api'.
+  So there is no 'plc4j-core' module anymore. Just remove that
+  dependency.
+- The driver artifact names have changed so if you were using
+  a `plc4j-protocol-{name}` you now need to change this to
+  `plc4j-driver-{name}`
+
+===== Bug Fixes
+
+- Fixing dependency to the wrap url-handler
+- When receiving responses with more than 512 byte, the IsoOnTcp protocol doesn't work
+- When the last item in a request is a DINT, the DefaultS7MessageProcessor dies
+- Write operations seem to fail
+- Fixed a Bug where S7 was not able to read arrays.
+
+[#release-0.2.0]
+==== 0.2.0 (incubating) Official https://archive.apache.org/dist/incubator/plc4x/0.2.0-incubating/apache-plc4x-incubating-0.2.0-source-release.zip[source release] [ https://archive.apache.org/dist/incubator/plc4x/0.2.0-incubating/apache-plc4x-incubating-0.2.0-source-release.zip.sha512[SHA512] ] [ https://archive.apache.org/dist/incubator/plc4x/0.2.0-incubating/apache-plc4x-incubating-0.2.0-source-release.zip.asc[ASC] ]
+
+===== Changes:
+
+* Changed API: instead of passing request object to `read({read-request})`, `write({write-request})` or `subscribe({subscribe-request})` methods now the `execute()` method is called on the request itself
+* New Connection Pool component
+* New OPM (Object PLC Mapping) component (JPA for PLCs)
+* Bug fixes
+
+[#release-0.1.0]
+==== 0.1.0 (incubating) Official https://archive.apache.org/dist/incubator/plc4x/0.1.0-incubating/apache-plc4x-incubating-0.1.0-source-release.zip[source release] [ https://archive.apache.org/dist/incubator/plc4x/0.1.0-incubating/apache-plc4x-incubating-0.1.0-source-release.zip.sha512[SHA512] ] [ https://archive.apache.org/dist/incubator/plc4x/0.1.0-incubating/apache-plc4x-incubating-0.1.0-source-release.zip.asc[ASC] ]
diff --git a/src/site/asciidoc/users/gettingstarted.adoc b/src/site/asciidoc/users/gettingstarted.adoc
index 6de1c6790bd..1f021517884 100644
--- a/src/site/asciidoc/users/gettingstarted.adoc
+++ b/src/site/asciidoc/users/gettingstarted.adoc
@@ -1,24 +1,24 @@
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://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.
-//
-
-== Getting Started
-
-Depending on the programming language, the usage will differ, therefore please go to the `Getting Started` version of the language of choice.
-
-=== Java
-
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://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.
+//
+
+== Getting Started
+
+Depending on the programming language, the usage will differ, therefore please go to the `Getting Started` version of the language of choice.
+
+=== Java
+
 For guides on how to write PLC4X applications with Java, please go to the link:../plc4j/users/gettingstarted.html[Java Getting Started]
\ No newline at end of file
diff --git a/src/site/asciidoc/users/industry40.adoc b/src/site/asciidoc/users/industry40.adoc
index e4cbecb4e72..d58ee3816bd 100644
--- a/src/site/asciidoc/users/industry40.adoc
+++ b/src/site/asciidoc/users/industry40.adoc
@@ -1,124 +1,124 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== Industry 4.0 with Apache
-
-Since the introduction of programmable logic controllers in the production industry in the early 80s, they have been the core of almost every piece of production machinery.
-
-While first PLCs were usually stand-alone controllers.
-These were soon extended by the ability to talk to other controllers of the same type via proprietary protocols.
-After that came first computer based control systems, which were able to monitor and parametrize these controllers.
-Usually however in order to do this, a company needed to use the control system that was provided by the PLC vendor.
-This has tied companies to stick to the company they decided to use the PLCs of.
-Making it almost impossible to switch to another vendor.
-
-In the last 20 years in the IT industry, the concept of Open-Source has come up and has more and more proven to be the engine of great innovation.
-Most of the biggest changes in how we create modern IT systems is a result of this.
-
-Unfortunately the production industry has been missing a lot of this innovation.
-Only a small number of companies today use Open-Source software in their production systems.
-
-=== Benefits of using Open-Source
-
-The benefit of using Open-Source could be huge:
-
-* Increased Flexibility
-* Increased Stability
-* Increased Extendability
-* Improved Security
-* Great Cost-Reduction
-
-==== Increased Flexibility
-
-If a company had decided to use PLCs and control systems of a certain vendor, it is almost impossible to change this decision.
-This reduces the options available when adding new machinery or replacing existing ones.
-
-Technologically speaking, also the company can only use the options and solution it's vendor is able to provide.
-
-==== Increased Stability
-
-Current control systems are usually based on the concept of "backup systems".
-If the main control system fails, all activity is switched to the standby system.
-
-When using modern public- or private cloud systems, there is no need for a backup system, because the cluster is designed in a way that it can live with the failure of most of its hosts before loosing the ability to function.
-
-==== Increased Extendability
-
-From the perspective of designing and scaling the IT infrastructure:
-If a control system was designed to handle the current size of plant, for cost reasons the IT infrastructure isn't designed to handle much more than that.
-Now if the plant should be extended in the future, extending it's control-systems IT infrastructure would probably result in replacing this with a bigger system.
-
-By utilizing modern virtualization frameworks, extending the existing cloud solution, would only require adding more compute resources, by adding more systems to the cluster and it should be possible to extend the existing system without problems.
-If the company decided to utilize a public cloud provider, it makes things even simpler, as it would only require booking more resources.
-
-==== Improved Security
-
-This is probably one of the most concerning aspects of modern production control systems.
-Right now, in order to run these systems, a lot of the most popular solutions require companies to run not up-to-date systems.
-If applying all updates, the company is risking either loss of commercial support or even loss of functionality.
-Therefore an attacker can probably be certain to be able to exploit certain vulnerabilities just by knowing the type and version of the used control-system.
-
-==== Cost-Reduction
-
-Well the probably biggest and most obvious cost-reduction factor is definitely, that if the software you are using is fee, you will not have to pay for it.
-
-Additionally, the ability to get the computing power of one insanely expensive system by using a cluster of cheap commodity systems, helps saving a lot of money.
-
-Being freed of the requirement to stick to the products of one vendor alonw anf to be able to choose the technology and the vendor of used systems freely will definitely also reduce costs.
-
-=== Options to communicating with PLCs
-
-In general there are two options for communicating with industrial PLCs:
-
-* Using a protocol converter
-** Hardware protocol converter
-** Software protocol converter
-* Using a driver for direct communication
-** Commercial drivers
-** Open-Source drivers
-
-Well protocol converters are all software in the end, but while a "hardware converter" is usually a closed hardware box that runs some sort of software, a "software converter" is usually an installable service or program that runs on a host system.
-
-In both cases the configuration of the protocol converter tells the system which information to get and how to make that available in another protocol.
-It usually doesn't allow full access to all information available in a PLC, but only the ones the adapter is configured to make available.
-Here, there is a big trade-off. If a system should be used in the most versatile way, also the most information has to be made available.
-Even if most of this information is never needed.
-Limiting the system only to the needed information, greatly reduces the systems versatility.
-
-Another disadvantage is a slightly increased latency when making information available.
-This is due to the fact that the protocol converter has to send a request to the PLC to get information and as soon as this information is returned to the converter this new information can only be passed on in the other protocol in the next request.
-
-The usage of a protocol converter is probably the ideal solution, if all a company wants to do, is integrate PLCs communicating in one protocol into an existing system using a different protocol.
-In case of integrating open-source software, this usually is a protocol converter that converts into one of the well established open source protocols.
-The most widely used protocol here currently will probably be `MQTT`.
-
-The option that provides the most possibilities is directly communicating with the PLCs.
-Here the system can always directly access only the exact information required and can do this without any detours that would add latency.
-
-There is a wide variety of drivers available, that generally would allow writing software that directly accesses PLCs.
-Unfortunately most of these are commercial drivers.
-
-While there is a number of open-source drivers, most of these have licenses that render them useless for commercial applications.
-Either they are licensed with restrictive licenses such as GPL or they are dual licensed with a restriction to non-commercial usage for the open-source version and the requirement to purchase a commercial license for commercial use-cases.
-
-The APIs of all drivers usually differs quite greatly from each one another. This makes it extremely difficult to create solutions that work with a variety of PLCs and protocols.
-
-This is where `Apache PLC4X` comes in. It is the goal of `PLC4X` to provide a suite of drivers for communicating with industrial PLCs using a variety of protocols, but with a shared API and a license model, that is suitable for creating commercial applications.
-
-Hereby `PLC4X` forms the missing link between the automation and the open-source world.
-Making it possible to use the entire stack of open-source technologies to create a new generation of open industrial control systems.
-
+//
+//  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
+//
+//      http://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.
+//
+
+== Industry 4.0 with Apache
+
+Since the introduction of programmable logic controllers in the production industry in the early 80s, they have been the core of almost every piece of production machinery.
+
+While first PLCs were usually stand-alone controllers.
+These were soon extended by the ability to talk to other controllers of the same type via proprietary protocols.
+After that came first computer based control systems, which were able to monitor and parametrize these controllers.
+Usually however in order to do this, a company needed to use the control system that was provided by the PLC vendor.
+This has tied companies to stick to the company they decided to use the PLCs of.
+Making it almost impossible to switch to another vendor.
+
+In the last 20 years in the IT industry, the concept of Open-Source has come up and has more and more proven to be the engine of great innovation.
+Most of the biggest changes in how we create modern IT systems is a result of this.
+
+Unfortunately the production industry has been missing a lot of this innovation.
+Only a small number of companies today use Open-Source software in their production systems.
+
+=== Benefits of using Open-Source
+
+The benefit of using Open-Source could be huge:
+
+* Increased Flexibility
+* Increased Stability
+* Increased Extendability
+* Improved Security
+* Great Cost-Reduction
+
+==== Increased Flexibility
+
+If a company had decided to use PLCs and control systems of a certain vendor, it is almost impossible to change this decision.
+This reduces the options available when adding new machinery or replacing existing ones.
+
+Technologically speaking, also the company can only use the options and solution it's vendor is able to provide.
+
+==== Increased Stability
+
+Current control systems are usually based on the concept of "backup systems".
+If the main control system fails, all activity is switched to the standby system.
+
+When using modern public- or private cloud systems, there is no need for a backup system, because the cluster is designed in a way that it can live with the failure of most of its hosts before loosing the ability to function.
+
+==== Increased Extendability
+
+From the perspective of designing and scaling the IT infrastructure:
+If a control system was designed to handle the current size of plant, for cost reasons the IT infrastructure isn't designed to handle much more than that.
+Now if the plant should be extended in the future, extending it's control-systems IT infrastructure would probably result in replacing this with a bigger system.
+
+By utilizing modern virtualization frameworks, extending the existing cloud solution, would only require adding more compute resources, by adding more systems to the cluster and it should be possible to extend the existing system without problems.
+If the company decided to utilize a public cloud provider, it makes things even simpler, as it would only require booking more resources.
+
+==== Improved Security
+
+This is probably one of the most concerning aspects of modern production control systems.
+Right now, in order to run these systems, a lot of the most popular solutions require companies to run not up-to-date systems.
+If applying all updates, the company is risking either loss of commercial support or even loss of functionality.
+Therefore an attacker can probably be certain to be able to exploit certain vulnerabilities just by knowing the type and version of the used control-system.
+
+==== Cost-Reduction
+
+Well the probably biggest and most obvious cost-reduction factor is definitely, that if the software you are using is fee, you will not have to pay for it.
+
+Additionally, the ability to get the computing power of one insanely expensive system by using a cluster of cheap commodity systems, helps saving a lot of money.
+
+Being freed of the requirement to stick to the products of one vendor alonw anf to be able to choose the technology and the vendor of used systems freely will definitely also reduce costs.
+
+=== Options to communicating with PLCs
+
+In general there are two options for communicating with industrial PLCs:
+
+* Using a protocol converter
+** Hardware protocol converter
+** Software protocol converter
+* Using a driver for direct communication
+** Commercial drivers
+** Open-Source drivers
+
+Well protocol converters are all software in the end, but while a "hardware converter" is usually a closed hardware box that runs some sort of software, a "software converter" is usually an installable service or program that runs on a host system.
+
+In both cases the configuration of the protocol converter tells the system which information to get and how to make that available in another protocol.
+It usually doesn't allow full access to all information available in a PLC, but only the ones the adapter is configured to make available.
+Here, there is a big trade-off. If a system should be used in the most versatile way, also the most information has to be made available.
+Even if most of this information is never needed.
+Limiting the system only to the needed information, greatly reduces the systems versatility.
+
+Another disadvantage is a slightly increased latency when making information available.
+This is due to the fact that the protocol converter has to send a request to the PLC to get information and as soon as this information is returned to the converter this new information can only be passed on in the other protocol in the next request.
+
+The usage of a protocol converter is probably the ideal solution, if all a company wants to do, is integrate PLCs communicating in one protocol into an existing system using a different protocol.
+In case of integrating open-source software, this usually is a protocol converter that converts into one of the well established open source protocols.
+The most widely used protocol here currently will probably be `MQTT`.
+
+The option that provides the most possibilities is directly communicating with the PLCs.
+Here the system can always directly access only the exact information required and can do this without any detours that would add latency.
+
+There is a wide variety of drivers available, that generally would allow writing software that directly accesses PLCs.
+Unfortunately most of these are commercial drivers.
+
+While there is a number of open-source drivers, most of these have licenses that render them useless for commercial applications.
+Either they are licensed with restrictive licenses such as GPL or they are dual licensed with a restriction to non-commercial usage for the open-source version and the requirement to purchase a commercial license for commercial use-cases.
+
+The APIs of all drivers usually differs quite greatly from each one another. This makes it extremely difficult to create solutions that work with a variety of PLCs and protocols.
+
+This is where `Apache PLC4X` comes in. It is the goal of `PLC4X` to provide a suite of drivers for communicating with industrial PLCs using a variety of protocols, but with a shared API and a license model, that is suitable for creating commercial applications.
+
+Hereby `PLC4X` forms the missing link between the automation and the open-source world.
+Making it possible to use the entire stack of open-source technologies to create a new generation of open industrial control systems.
+
diff --git a/src/site/asciidoc/users/opm.adoc b/src/site/asciidoc/users/opm.adoc
index e41c3c3524c..97761d6e034 100644
--- a/src/site/asciidoc/users/opm.adoc
+++ b/src/site/asciidoc/users/opm.adoc
@@ -1,73 +1,73 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== Object PLC Mapping
-
-
-=== What is Object PLC Mapping
-
-Object PLC Mapping (OPM) is heavily inspired by the Java Persistence API (JPA) [1].
-One of the main goal of the PLC4X Project is to make it easy to communicate with PLC devices to enable the development
-of applications that interact with PLCs.
-As many (or even most) of the application programmers are no experts in PLC Communication and protocols it should be as
-easy as possible to interact with PLCs without too much domain knowledge.
-This is exactly the reason why JPA was initialized many years ago to allow the interaction with a Database by simply
-calling methods on POJOs (Plain old Java Object).
-This is exactly what the OPM Module is for, to enable PLC communication by simply interacting with a POJO.
-
-=== Simple Example
-
-The following short code snippet shows how to read one value from a PLC via OPM.
-First, a _PlcEntityManager_ is instantiated, then a *connected* entity is fetched for a given PLC connection address.
-Connected means that all method calls of the entity are intersected and replaced by PLC calls.
-This is then used to print one value to the console.
-In the second snippet one can see how the Entity class looks. The address where to read the variable _pressure_ from is given
-in the _@PlcField_ annotation.
-[source,java]
-----
-public static void main(String[] args) {
-    PlcEntityManager em = new PlcEntityManager();
-    MyEntity entity = em.connect(MyEntity.class, "s7://...");
-    System.out.println(entity.getPressure());
-}
-----
-The class _MyEntity_ is given by
-[source,java]
-----
-@PlcEntity
-public class MyEntity {
-
-    @PlcField("DB01:DW01:LONG")
-    private double pressure;
-
-    public void MyEntity() {
-        // For OPM
-    }
-
-    public double getPressure() {
-        return pressure;
-    }
-}
-----
-
-=== Annotations
-
-=== More details
-
-=== References
-
+//
+//  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
+//
+//      http://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.
+//
+
+== Object PLC Mapping
+
+
+=== What is Object PLC Mapping
+
+Object PLC Mapping (OPM) is heavily inspired by the Java Persistence API (JPA) [1].
+One of the main goal of the PLC4X Project is to make it easy to communicate with PLC devices to enable the development
+of applications that interact with PLCs.
+As many (or even most) of the application programmers are no experts in PLC Communication and protocols it should be as
+easy as possible to interact with PLCs without too much domain knowledge.
+This is exactly the reason why JPA was initialized many years ago to allow the interaction with a Database by simply
+calling methods on POJOs (Plain old Java Object).
+This is exactly what the OPM Module is for, to enable PLC communication by simply interacting with a POJO.
+
+=== Simple Example
+
+The following short code snippet shows how to read one value from a PLC via OPM.
+First, a _PlcEntityManager_ is instantiated, then a *connected* entity is fetched for a given PLC connection address.
+Connected means that all method calls of the entity are intersected and replaced by PLC calls.
+This is then used to print one value to the console.
+In the second snippet one can see how the Entity class looks. The address where to read the variable _pressure_ from is given
+in the _@PlcField_ annotation.
+[source,java]
+----
+public static void main(String[] args) {
+    PlcEntityManager em = new PlcEntityManager();
+    MyEntity entity = em.connect(MyEntity.class, "s7://...");
+    System.out.println(entity.getPressure());
+}
+----
+The class _MyEntity_ is given by
+[source,java]
+----
+@PlcEntity
+public class MyEntity {
+
+    @PlcField("DB01:DW01:LONG")
+    private double pressure;
+
+    public void MyEntity() {
+        // For OPM
+    }
+
+    public double getPressure() {
+        return pressure;
+    }
+}
+----
+
+=== Annotations
+
+=== More details
+
+=== References
+
 [1] https://www.oracle.com/technetwork/java/javaee/tech/persistence-jsp-140049.html
\ No newline at end of file
diff --git a/src/site/asciidoc/users/security.adoc b/src/site/asciidoc/users/security.adoc
index f72e7ea69bd..813570c1b7c 100644
--- a/src/site/asciidoc/users/security.adoc
+++ b/src/site/asciidoc/users/security.adoc
@@ -1,26 +1,26 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== Security Vulnerabilities
-
-Please note that binary patches are not produced for individual vulnerabilities. To obtain the binary fix for a particular vulnerability you should upgrade to an Apache PLC4X version where that vulnerability has been fixed.
-
-For more information about reporting vulnerabilities, see the https://www.apache.org/security/[Apache Security Team] page.
-
-=== Known Vulnerabilities
-
+//
+//  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
+//
+//      http://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.
+//
+
+== Security Vulnerabilities
+
+Please note that binary patches are not produced for individual vulnerabilities. To obtain the binary fix for a particular vulnerability you should upgrade to an Apache PLC4X version where that vulnerability has been fixed.
+
+For more information about reporting vulnerabilities, see the https://www.apache.org/security/[Apache Security Team] page.
+
+=== Known Vulnerabilities
+
 No vulnerabilities have been reported.
\ No newline at end of file
diff --git a/src/site/asciidoc/users/testing.adoc b/src/site/asciidoc/users/testing.adoc
index 1cb98082b43..3a51cd6e1d7 100644
--- a/src/site/asciidoc/users/testing.adoc
+++ b/src/site/asciidoc/users/testing.adoc
@@ -1,165 +1,165 @@
-//
-//  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
-//
-//      http://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.
-//
-
-== Testing (or using PLC4X without a PLC)
-
-=== The Mock Driver
-
-PLC4X has a _Mock Driver_ which was initially implemented to be used for Unit Tests and this still is its main purpose.
-But this driver is also very suitable to play around a bit with the PLC4X API if no _Hardware_ PLC is available.
-The driver can be found in the Maven module
-
-```
-<dependency>
-  <groupId>org.apache.plc4x</groupId>
-  <artifactId>plc4j-protocol-driver-base-test</artifactId>
-  <version>${current.version}</version>
-  <scope>test</scope>
-</dependency>
-```
-
-The connection string Syntax for the mock driver is `mock:{name-of-the-connection}`. So you can use multiple Mock Devices at the same time.
-
-The Mock Driver does nothing else than forwarding all Requests to a _Virtual Device_ which we can provide to control all responses and also Monitor them, e.g. for unit tests.
-The Interface for the Mock Device is
-
-```
-public interface MockDevice {
-
-    Pair<PlcResponseCode, BaseDefaultFieldItem> read(String fieldQuery);
-
-    PlcResponseCode write(String fieldQuery, Object value);
-
-    Pair<PlcResponseCode, PlcSubscriptionHandle> subscribe(String fieldQuery);
-
-    void unsubscribe();
-
-    // ...
-
-}
-```
-
-=== Simple Example
-
-Imagine we have some Code which we cannot control or whose functionality we want to test.
-This can be done with the Mock Driver in the following way.
-
-First, a new Mock Connection is established (like any other connection also would be):
-```
-PlcDriverManager driverManager = new PlcDriverManager();
-PlcMockConnection connection = (PlcMockConnection) driverManager.getConnection("mock:my-mock-connection");
-```
-You see, that we directly cast the Connection to a `PlcMockConnection`. This is done, because we need to _connect_ a Device to this Mock Connection.
-
-This is done in the following Snippet
-```
-connection.setDevice(mockDevice);
-```
-Here, we pass it an instance of `MockDevice` which could be a simple Implementation of the interface like
-```
-MockDevice mockDevice = new MockDevice() {
-
-    Pair<PlcResponseCode, BaseDefaultFieldItem> read(String fieldQuery) {
-        System.out.println("I got a read to " + fieldQuery);
-        return Pair.of(PlcResponseCode.OK, new DefaultStringFieldItem("hello"));
-    }
-
-    PlcResponseCode write(String fieldQuery, Object value) {
-        System.out.println("I got a write to " + fieldQuery + " with the value " + value);
-        return PlcResponseCode.OK;
-    }
-
-    // ...
-
-}
-```
-This would just return a String Value `hello` for every request and print all read and write requests to the Console.
-
-=== Unit Testing with the Mock Driver
-
-To use the Mock driver in Unit Tests the easiest way is to generate the `MockDriver` instance as Mockito (or any other Framework) Mock.
-Like in the following Example
-
-```
-MockDevice mockDevice = Mockito.mock(MockDevice.class);
-
-PlcDriverManager driverManager = new PlcDriverManager();
-PlcMockConnection connection = (PlcMockConnection) driverManager.getConnection("mock:my-mock-connection");
-connection.setDevice(mockDevice);
-
-// Populate the Mock to avoid a NPE
-when(mockDevice).read(anyString()).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultStringFieldItem("hello")));
-
-// Some Demo code that uses the same Driver Manager and either the connection from above
-// or at least mock:my-mock-connection as connection string
-// Here: send a request to the field "MyAdress"
-connection
-    .readRequestBuilder
-    .addItem("station", "MyAdress")
-    .build()
-    .execute()
-    .get();
-
-// Check that the we really issued a Read request to the Field "MyAdress"
-verify(mockDevice).read(eq("MyAdress"));
-```
-
-But as the _MockDriver_ uses a static Mock Connection registry the following Code works also
-
-```
-MockDevice mockDevice = Mockito.mock(MockDevice.class);
-
-// Setup
-PlcDriverManager driverManager = new PlcDriverManager();
-PlcMockConnection connection = (PlcMockConnection) driverManager.getConnection("mock:my-mock-connection");
-connection.setDevice(mockDevice);
-// Populate the Mock to avoid a NPE
-when(mockDevice).read(anyString()).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultStringFieldItem("hello")));
-
-// Some Demo code that uses the same Driver Manager and either the connection from above
-// or at least mock:my-mock-connection as connection string
-// Here: send a request to the field "MyAdress"
-// and we build up a new Connection
-try (PlcConnection conn = driverManager.getConnection("mock:my-mock-connection")) {
-    conn
-        .readRequestBuilder
-        .addItem("station", "MyAdress")
-        .build()
-        .execute()
-        .get();
-} catch (Exception e) {
-    // do nothing
-}
-
-// Check that the we really issued a Read request to the Field "MyAdress"
-verify(mockDevice).read(eq("MyAdress"));
-```
-
-The Snippet above shows that the part under test really has to share nothing with the test code except for the connection string.
-
-=== Conclusion
-
-The above examples show that the `MockDriver` driver can not only be used to play around with the API but is also a powerful tool to
-do unit testing of Code which uses the PLC4X API.
-All that needs to be done is to either pass an instance of the Mocked Connection or just use the same Connection string (e.g. from a test configuration) that was used to Prepare a Mock Device.
-Some Examples of futher (more Complex) use cases can be found in the PLC4X Codebases, e.g. in the following classes
-
-* `org.apache.plc4x.java.opm.PlcEntityManagerTest`
-* `org.apache.plc4x.java.opm.PlcEntityManagerComplexTest`
-* `org.apache.plc4x.java.scraper.ScraperTest`
-
+//
+//  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
+//
+//      http://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.
+//
+
+== Testing (or using PLC4X without a PLC)
+
+=== The Mock Driver
+
+PLC4X has a _Mock Driver_ which was initially implemented to be used for Unit Tests and this still is its main purpose.
+But this driver is also very suitable to play around a bit with the PLC4X API if no _Hardware_ PLC is available.
+The driver can be found in the Maven module
+
+```
+<dependency>
+  <groupId>org.apache.plc4x</groupId>
+  <artifactId>plc4j-protocol-driver-base-test</artifactId>
+  <version>${current.version}</version>
+  <scope>test</scope>
+</dependency>
+```
+
+The connection string Syntax for the mock driver is `mock:{name-of-the-connection}`. So you can use multiple Mock Devices at the same time.
+
+The Mock Driver does nothing else than forwarding all Requests to a _Virtual Device_ which we can provide to control all responses and also Monitor them, e.g. for unit tests.
+The Interface for the Mock Device is
+
+```
+public interface MockDevice {
+
+    Pair<PlcResponseCode, BaseDefaultFieldItem> read(String fieldQuery);
+
+    PlcResponseCode write(String fieldQuery, Object value);
+
+    Pair<PlcResponseCode, PlcSubscriptionHandle> subscribe(String fieldQuery);
+
+    void unsubscribe();
+
+    // ...
+
+}
+```
+
+=== Simple Example
+
+Imagine we have some Code which we cannot control or whose functionality we want to test.
+This can be done with the Mock Driver in the following way.
+
+First, a new Mock Connection is established (like any other connection also would be):
+```
+PlcDriverManager driverManager = new PlcDriverManager();
+PlcMockConnection connection = (PlcMockConnection) driverManager.getConnection("mock:my-mock-connection");
+```
+You see, that we directly cast the Connection to a `PlcMockConnection`. This is done, because we need to _connect_ a Device to this Mock Connection.
+
+This is done in the following Snippet
+```
+connection.setDevice(mockDevice);
+```
+Here, we pass it an instance of `MockDevice` which could be a simple Implementation of the interface like
+```
+MockDevice mockDevice = new MockDevice() {
+
+    Pair<PlcResponseCode, BaseDefaultFieldItem> read(String fieldQuery) {
+        System.out.println("I got a read to " + fieldQuery);
+        return Pair.of(PlcResponseCode.OK, new DefaultStringFieldItem("hello"));
+    }
+
+    PlcResponseCode write(String fieldQuery, Object value) {
+        System.out.println("I got a write to " + fieldQuery + " with the value " + value);
+        return PlcResponseCode.OK;
+    }
+
+    // ...
+
+}
+```
+This would just return a String Value `hello` for every request and print all read and write requests to the Console.
+
+=== Unit Testing with the Mock Driver
+
+To use the Mock driver in Unit Tests the easiest way is to generate the `MockDriver` instance as Mockito (or any other Framework) Mock.
+Like in the following Example
+
+```
+MockDevice mockDevice = Mockito.mock(MockDevice.class);
+
+PlcDriverManager driverManager = new PlcDriverManager();
+PlcMockConnection connection = (PlcMockConnection) driverManager.getConnection("mock:my-mock-connection");
+connection.setDevice(mockDevice);
+
+// Populate the Mock to avoid a NPE
+when(mockDevice).read(anyString()).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultStringFieldItem("hello")));
+
+// Some Demo code that uses the same Driver Manager and either the connection from above
+// or at least mock:my-mock-connection as connection string
+// Here: send a request to the field "MyAdress"
+connection
+    .readRequestBuilder
+    .addItem("station", "MyAdress")
+    .build()
+    .execute()
+    .get();
+
+// Check that the we really issued a Read request to the Field "MyAdress"
+verify(mockDevice).read(eq("MyAdress"));
+```
+
+But as the _MockDriver_ uses a static Mock Connection registry the following Code works also
+
+```
+MockDevice mockDevice = Mockito.mock(MockDevice.class);
+
+// Setup
+PlcDriverManager driverManager = new PlcDriverManager();
+PlcMockConnection connection = (PlcMockConnection) driverManager.getConnection("mock:my-mock-connection");
+connection.setDevice(mockDevice);
+// Populate the Mock to avoid a NPE
+when(mockDevice).read(anyString()).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultStringFieldItem("hello")));
+
+// Some Demo code that uses the same Driver Manager and either the connection from above
+// or at least mock:my-mock-connection as connection string
+// Here: send a request to the field "MyAdress"
+// and we build up a new Connection
+try (PlcConnection conn = driverManager.getConnection("mock:my-mock-connection")) {
+    conn
+        .readRequestBuilder
+        .addItem("station", "MyAdress")
+        .build()
+        .execute()
+        .get();
+} catch (Exception e) {
+    // do nothing
+}
+
+// Check that the we really issued a Read request to the Field "MyAdress"
+verify(mockDevice).read(eq("MyAdress"));
+```
+
+The Snippet above shows that the part under test really has to share nothing with the test code except for the connection string.
+
+=== Conclusion
+
+The above examples show that the `MockDriver` driver can not only be used to play around with the API but is also a powerful tool to
+do unit testing of Code which uses the PLC4X API.
+All that needs to be done is to either pass an instance of the Mocked Connection or just use the same Connection string (e.g. from a test configuration) that was used to Prepare a Mock Device.
+Some Examples of futher (more Complex) use cases can be found in the PLC4X Codebases, e.g. in the following classes
+
+* `org.apache.plc4x.java.opm.PlcEntityManagerTest`
+* `org.apache.plc4x.java.opm.PlcEntityManagerComplexTest`
+* `org.apache.plc4x.java.scraper.ScraperTest`
+
 and many more Test classes, especially in the OPM and the Scraper Module.
\ No newline at end of file
diff --git a/src/site/resources-filtered/plc4x-doap.rdf b/src/site/resources-filtered/plc4x-doap.rdf
index 998da9becca..3c528522ac8 100644
--- a/src/site/resources-filtered/plc4x-doap.rdf
+++ b/src/site/resources-filtered/plc4x-doap.rdf
@@ -1,113 +1,113 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl"?>
-<!--
-  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
-
-      http://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.
-  -->
-<!--
-
-    This file contains information about the project itself.
-    It should be updated as soon as a new language is supported.
-    It also contains the information needed to populate the project
-    categories and languages referenced on the Apache project listing
-    page. It is referenced from here:
-    https://svn.apache.org/repos/asf/comdev/projects.apache.org/trunk/data/projects.xml
-
--->
-<rdf:RDF xml:lang="en"
-         xmlns="http://usefulinc.com/ns/doap#"
-         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:asfext="http://projects.apache.org/ns/asfext#"
-         xmlns:foaf="http://xmlns.com/foaf/0.1/">
-
-    <!--
-      =======================================================================
-
-       Copyright (c) ${current-year} The Apache Software Foundation.
-       All rights reserved.
-
-      =======================================================================
-    -->
-
-    <Project rdf:about="https://plc4x.apache.org">
-        <name>Apache PLC4X</name>
-        <created>2019-04-18</created>
-        <license rdf:resource="http://www.apache.org/licenses/LICENSE-2.0"/>
-        <homepage rdf:resource="https://plc4x.apache.org/"/>
-        <asfext:pmc rdf:resource="https://plc4x.apache.org/"/>
-        <shortdesc>Universal API for communicating with programmable logic controllers.</shortdesc>
-        <description>PLC4X is a set of libraries for communicating with industrial programmable logic controllers (PLCs) using a variety of protocols but with a shared API.</description>
-        <bug-database rdf:resource="https://issues.apache.org/jira/projects/PLC4X"/>
-        <download-page rdf:resource="https://plc4x.apache.org/users/download.html"/>
-        <mailing-list rdf:resource="https://plc4x.apache.org/mailing-lists.html"/>
-
-        <programming-language>Java</programming-language>
-        <programming-language>C++</programming-language>
-        <programming-language>Python</programming-language>
-
-        <category rdf:resource="http://projects.apache.org/category/c++"/>
-        <category rdf:resource="http://projects.apache.org/category/integration"/>
-        <category rdf:resource="http://projects.apache.org/category/iot"/>
-        <category rdf:resource="http://projects.apache.org/category/java"/>
-        <category rdf:resource="http://projects.apache.org/category/library"/>
-        <category rdf:resource="http://projects.apache.org/category/network-client"/>
-        <category rdf:resource="http://projects.apache.org/category/python"/>
-
-        <repository>
-            <GitRepository>
-                <browse rdf:resource="https://github.com/apache/plc4x.git"/>
-                <location rdf:resource="https://github.com/apache/plc4x.git"/>
-            </GitRepository>
-        </repository>
-
-        <maintainer>
-            <foaf:Person>
-                <foaf:name>PLC4X PMC</foaf:name>
-                <foaf:mbox rdf:resource="mailto:dev@plc4x.apache.org"/>
-            </foaf:Person>
-        </maintainer>
-
-        <release>
-            <Version>
-                <name>Latest 0.3.1 release</name>
-                <created>2017-03-13</created>
-                <revision>0.3.1</revision>
-            </Version>
-        </release>
-        <release>
-            <Version>
-                <name>Legacy 0.3.0 release</name>
-                <created>2019-02-05</created>
-                <revision>0.3.0</revision>
-            </Version>
-        </release>
-        <release>
-            <Version>
-                <name>Legacy 0.2.0 release</name>
-                <created>2018-12-02</created>
-                <revision>0.2.0</revision>
-            </Version>
-        </release>
-        <release>
-            <Version>
-                <name>Legacy 0.1.0 release</name>
-                <created>2018-10-05</created>
-                <revision>0.1.0</revision>
-            </Version>
-        </release>
-    </Project>
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl"?>
+<!--
+  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
+
+      http://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.
+  -->
+<!--
+
+    This file contains information about the project itself.
+    It should be updated as soon as a new language is supported.
+    It also contains the information needed to populate the project
+    categories and languages referenced on the Apache project listing
+    page. It is referenced from here:
+    https://svn.apache.org/repos/asf/comdev/projects.apache.org/trunk/data/projects.xml
+
+-->
+<rdf:RDF xml:lang="en"
+         xmlns="http://usefulinc.com/ns/doap#"
+         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:asfext="http://projects.apache.org/ns/asfext#"
+         xmlns:foaf="http://xmlns.com/foaf/0.1/">
+
+    <!--
+      =======================================================================
+
+       Copyright (c) ${current-year} The Apache Software Foundation.
+       All rights reserved.
+
+      =======================================================================
+    -->
+
+    <Project rdf:about="https://plc4x.apache.org">
+        <name>Apache PLC4X</name>
+        <created>2019-04-18</created>
+        <license rdf:resource="http://www.apache.org/licenses/LICENSE-2.0"/>
+        <homepage rdf:resource="https://plc4x.apache.org/"/>
+        <asfext:pmc rdf:resource="https://plc4x.apache.org/"/>
+        <shortdesc>Universal API for communicating with programmable logic controllers.</shortdesc>
+        <description>PLC4X is a set of libraries for communicating with industrial programmable logic controllers (PLCs) using a variety of protocols but with a shared API.</description>
+        <bug-database rdf:resource="https://issues.apache.org/jira/projects/PLC4X"/>
+        <download-page rdf:resource="https://plc4x.apache.org/users/download.html"/>
+        <mailing-list rdf:resource="https://plc4x.apache.org/mailing-lists.html"/>
+
+        <programming-language>Java</programming-language>
+        <programming-language>C++</programming-language>
+        <programming-language>Python</programming-language>
+
+        <category rdf:resource="http://projects.apache.org/category/c++"/>
+        <category rdf:resource="http://projects.apache.org/category/integration"/>
+        <category rdf:resource="http://projects.apache.org/category/iot"/>
+        <category rdf:resource="http://projects.apache.org/category/java"/>
+        <category rdf:resource="http://projects.apache.org/category/library"/>
+        <category rdf:resource="http://projects.apache.org/category/network-client"/>
+        <category rdf:resource="http://projects.apache.org/category/python"/>
+
+        <repository>
+            <GitRepository>
+                <browse rdf:resource="https://github.com/apache/plc4x.git"/>
+                <location rdf:resource="https://github.com/apache/plc4x.git"/>
+            </GitRepository>
+        </repository>
+
+        <maintainer>
+            <foaf:Person>
+                <foaf:name>PLC4X PMC</foaf:name>
+                <foaf:mbox rdf:resource="mailto:dev@plc4x.apache.org"/>
+            </foaf:Person>
+        </maintainer>
+
+        <release>
+            <Version>
+                <name>Latest 0.3.1 release</name>
+                <created>2017-03-13</created>
+                <revision>0.3.1</revision>
+            </Version>
+        </release>
+        <release>
+            <Version>
+                <name>Legacy 0.3.0 release</name>
+                <created>2019-02-05</created>
+                <revision>0.3.0</revision>
+            </Version>
+        </release>
+        <release>
+            <Version>
+                <name>Legacy 0.2.0 release</name>
+                <created>2018-12-02</created>
+                <revision>0.2.0</revision>
+            </Version>
+        </release>
+        <release>
+            <Version>
+                <name>Legacy 0.1.0 release</name>
+                <created>2018-10-05</created>
+                <revision>0.1.0</revision>
+            </Version>
+        </release>
+    </Project>
 </rdf:RDF>
\ No newline at end of file
diff --git a/src/site/resources/css/bootstrap-responsive.min.css b/src/site/resources/css/bootstrap-responsive.min.css
index 42b08d36d00..e32756f3093 100644
--- a/src/site/resources/css/bootstrap-responsive.min.css
+++ b/src/site/resources/css/bootstrap-responsive.min.css
@@ -1,20 +1,20 @@
-/*
-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
-
-  http://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.
-*/
-
+/*
+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
+
+  http://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.
+*/
+
 /* This is just a dummy as we are using local resources and that causes the skin to look for this file */
\ No newline at end of file
diff --git a/src/site/resources/css/site.css b/src/site/resources/css/site.css
index 537e2afdd61..80f4bccbdc7 100644
--- a/src/site/resources/css/site.css
+++ b/src/site/resources/css/site.css
@@ -1,93 +1,93 @@
-/*
-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
-
-  http://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.
-*/
-
-/* Import the fontawesome 5 css */
-@import url("all.min.css");
-
-.green {
-    color: #008000;
-}
-
-.yellow {
-    color: #ffa500;
-}
-
-.red {
-    color: #ff0000;
-}
-
-.protocolIsoOnTcp {
-    background-color: #068D9D;
-}
-
-.protocolIsoTP {
-    background-color: #53599A;
-}
-
-.protocolS7 {
-    background-color: #6D9DC5;
-}
-
-.protocolId {
-    background-color: #AEECEF;
-}
-
-.protocolParameter {
-    background-color: #80DED9;
-}
-
-.pull-right {
-    width: 400px;
-}
-
-#bannerRight > img {
-    margin-top: 20px;
-    margin-left: 120px;
-    margin-bottom: 20px;
-}
-
-#apacheEvents {
-    position: relative;
-    width: 234px;
-    top: 20px;
-    left: 83px
-}
-
-/* Set where the focus will be set when using anchor links */
-h2[id]:before {
-    display: block;
-    content: "";
-    height: 360px;
-    margin: -360px 0 0;
-}
-
-/* Set where the focus will be set when using anchor links */
-h3[id]:before, h4[id]:before, h5[id]:before, h6[id]:before, a[name]:before {
-    display: block;
-    content: "";
-    height: 106px;
-    margin: -106px 0 0;
-}
-
-/* Re-Format the position of the "to top" link */
-body > div.container.subfooter > div > div > p.pull-right {
-    width: 100px;
-    height: 60px;
-    text-align: right;
-}
+/*
+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
+
+  http://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.
+*/
+
+/* Import the fontawesome 5 css */
+@import url("all.min.css");
+
+.green {
+    color: #008000;
+}
+
+.yellow {
+    color: #ffa500;
+}
+
+.red {
+    color: #ff0000;
+}
+
+.protocolIsoOnTcp {
+    background-color: #068D9D;
+}
+
+.protocolIsoTP {
+    background-color: #53599A;
+}
+
+.protocolS7 {
+    background-color: #6D9DC5;
+}
+
+.protocolId {
+    background-color: #AEECEF;
+}
+
+.protocolParameter {
+    background-color: #80DED9;
+}
+
+.pull-right {
+    width: 400px;
+}
+
+#bannerRight > img {
+    margin-top: 20px;
+    margin-left: 120px;
+    margin-bottom: 20px;
+}
+
+#apacheEvents {
+    position: relative;
+    width: 234px;
+    top: 20px;
+    left: 83px
+}
+
+/* Set where the focus will be set when using anchor links */
+h2[id]:before {
+    display: block;
+    content: "";
+    height: 360px;
+    margin: -360px 0 0;
+}
+
+/* Set where the focus will be set when using anchor links */
+h3[id]:before, h4[id]:before, h5[id]:before, h6[id]:before, a[name]:before {
+    display: block;
+    content: "";
+    height: 106px;
+    margin: -106px 0 0;
+}
+
+/* Re-Format the position of the "to top" link */
+body > div.container.subfooter > div > div > p.pull-right {
+    width: 100px;
+    height: 60px;
+    text-align: right;
+}
diff --git a/src/site/resources/images/apache_nifi_logo.svg b/src/site/resources/images/apache_nifi_logo.svg
index 7e1f9a55679..579a9177d01 100644
--- a/src/site/resources/images/apache_nifi_logo.svg
+++ b/src/site/resources/images/apache_nifi_logo.svg
@@ -1,19 +1,19 @@
-<!--
-
- 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
-
- http://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.
-
- -->
+<!--
+
+ 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
+
+ http://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.
+
+ -->
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="1989 332.039 180.456 75.739"><defs><style>.a{fill:#728e9b;}.b{fill:#b9c6cd;}</style></defs><g transform="translate(1989 332.039)"><g transform="translate(1.299 0)"><g transform="translate(0 3.597)"><path class="a" d="M14.683,32.525v6.036h.192a13.416,13.416,0,0,1,5.461-5.6A16.158,16.158,0,0,1,28,31.183q6.323,0,9.724,3.449t3.4,11.209V84.068H27.9V48.524q0-4.024-1.341-5.6a5.361,5.361,0,0,0-4.312-1.581q-6.995,0-6.994,8.527v34.2H2.037V32.525Z" transform="translate(-2.037 -14.896)"/><rect class="a" width="13.222" height="11.305" transform="translate(47.972)"/><rect class="a" width="13.222" height="51.544" transform="translate(47.972 17.629)"/></g><g transform="translate(125.173)"><path class="a" d="M224.222,73.517A25.882,25.882,0,0,1,198.34,47.634c0-12.3,9.641-24.1,16.236-32.707A96.88,96.88,0,0,0,223.954.168a.3.3,0,0,1,.538,0,96.853,96.853,0,0,0,9.379,14.76c6.593,8.607,16.237,20.4,16.237,32.707H234.313a.608.608,0,0,0-.608.608v8.876h-8.874a.608.608,0,0,0-.608.608V73.517Z" transform="translate(-198.34 0)"/><path class="a" d="M249.991,100.636V92.185h-7.846a.608.608,0,0,0-.608.608v7.844Z" transform="translate(-213.993 -33.403)"/><path class="a" d="M241.538,115.337a25.24,25.24,0,0,0,8.453-1.625v-4.257h-7.846a.608.608,0,0,0-.608.608Z" transform="translate(-213.993 -39.661)"/><path class="a" d="M264.859,85.762V77.311h-7.844a.608.608,0,0,0-.608.608v7.843h8.451Z" transform="translate(-219.381 -28.013)"/><path class="a" d="M266.745,102.524l.01-.01a1.774,1.774,0,0,0,.508-1.254V94.581h-8.453v8.453h6.678A1.774,1.774,0,0,0,266.745,102.524Z" transform="translate(-220.251 -34.271)"/><path class="a" d="M259.711,116.6a25.274,25.274,0,0,0,6.249-3.841h-6.249Z" transform="translate(-220.578 -40.856)"/><path class="a" d="M277.934,85.762a25.17,25.17,0,0,0,1.627-8.451h-5.88v8.451Z" transform="translate(-225.639 -28.013)"/><path class="a" d="M276.979,101.731a25.244,25.244,0,0,0,3.839-6.25h-3.839Z" transform="translate(-226.835 -34.597)"/><path class="a" d="M276.979,101.731a25.244,25.244,0,0,0,3.839-6.25h-3.839Z" transform="translate(-226.835 -34.597)"/></g></g><g transform="translate(0 3.022)"><g transform="translate(0 1.629)"><path class="b" d="M4.626,7.57l2.382,9H5.117l-.416-1.9h-2.4l-.416,1.9H0l2.382-9Zm-.239,5.609-.87-4.046H3.492l-.87,4.046Z" transform="translate(0 -7.394)"/><path class="b" d="M15.808,7.57a2.617,2.617,0,0,1,1.166.233,2.125,2.125,0,0,1,.763.612,2.382,2.382,0,0,1,.416.863,3.914,3.914,0,0,1,.126.99,3.237,3.237,0,0,1-.208,1.21,2.19,2.19,0,0,1-.58.844,2.425,2.425,0,0,1-.9.492,3.964,3.964,0,0,1-1.173.163h-.971V16.57H12.631v-9Zm-.555,4.071a1.2,1.2,0,0,0,.876-.328,1.377,1.377,0,0,0,.334-1.021,1.6,1.6,0,0,0-.289-1.034,1.189,1.189,0,0,0-.97-.353h-.756v2.735Z" transform="translate(-4.577 -7.394)"/><path class="b" d="M25.9,7.57l2.382,9H26.389l-.416-1.9h-2.4l-.416,1.9H21.272l2.382-9Zm-.239,5.609-.87-4.046h-.025l-.87,4.046Z" transform="translate(-7.708 -7.394)"/><path class="b" d="M37.132,9.078a.872.872,0,0,0-.851-.448.851.851,0,0,0-.561.183,1.212,1.212,0,0,0-.347.592,5.052,5.052,0,0,0-.177,1.071q-.051.662-.05,1.62a15.647,15.647,0,0,0,.069,1.652,3.643,3.643,0,0,0,.214.977.9.9,0,0,0,.365.466,1.053,1.053,0,0,0,.511.12,1.221,1.221,0,0,0,.448-.082.76.76,0,0,0,.359-.328,2.143,2.143,0,0,0,.24-.693,6.334,6.334,0,0,0,.089-1.178h1.815a8.1,8.1,0,0,1-.114,1.386,3.144,3.144,0,0,1-.422,1.147,2.1,2.1,0,0,1-.87.769,3.294,3.294,0,0,1-1.456.277,3.424,3.424,0,0,1-1.626-.328,2.21,2.21,0,0,1-.927-.946,4.163,4.163,0,0,1-.416-1.475,17.308,17.308,0,0,1-.094-1.891,17.362,17.362,0,0,1,.094-1.884,4.18,4.18,0,0,1,.416-1.481,2.324,2.324,0,0,1,.927-.964,3.272,3.272,0,0,1,1.626-.347,3.143,3.143,0,0,1,1.532.315,2.145,2.145,0,0,1,.839.8,2.776,2.776,0,0,1,.347,1.046,8.668,8.668,0,0,1,.07,1.052H37.366A3.279,3.279,0,0,0,37.132,9.078Z" transform="translate(-12.078 -7.294)"/><path class="b" d="M46.709,7.57v3.441h2.118V7.57h1.815v9H48.827v-4H46.709v4H44.894v-9Z" transform="translate(-16.267 -7.394)"/><path class="b" d="M61.567,9.058H58.352v2.118h3.025v1.487H58.352v2.42h3.34V16.57H56.537v-9h5.029V9.058Z" transform="translate(-20.486 -7.394)"/></g><g transform="translate(68.91)"><path class="b" d="M108.068,31.949V22.943h6.706V17.1a15.765,15.765,0,0,1,.958-5.844,9.221,9.221,0,0,1,2.73-3.832,10.847,10.847,0,0,1,4.359-2.06,24.587,24.587,0,0,1,5.748-.622q3.543,0,7.089.287v9.389a7.3,7.3,0,0,0-1.341-.1h-1.246a6.212,6.212,0,0,0-3.928.958,3.9,3.9,0,0,0-1.15,3.161v4.5h7.665v9.007h-7.665V74.486H114.773V31.949Z" transform="translate(-108.068 -4.74)"/><rect class="b" width="13.221" height="11.305" transform="translate(35.451 0.575)"/><rect class="b" width="13.221" height="51.544" transform="translate(35.451 18.203)"/></g><g transform="translate(128.296 9.186)"><path class="b" d="M226.53,19.472c-.478.667-.948,1.339-1.428,2-1.516,2.092-3.113,4.123-4.676,6.18q.918.127,1.843.282c1.3-2.183,2.632-4.352,3.881-6.567.35-.62.693-1.246,1.039-1.87C227.463,19.008,226.827,19.057,226.53,19.472Z" transform="translate(-208.167 -19.146)"/><path class="b" d="M213.392,37.147c.23-.4.468-.8.7-1.207-.7-.136-1.4-.262-2.1-.374l-.007,0a86.66,86.66,0,0,0-6.06,9.3c-3.254,5.9-5.511,12.495-4.474,19.3a24.215,24.215,0,0,0,8.069,14.569,23.849,23.849,0,0,0,2.93,2.165.311.311,0,0,0,.381-.487,25.957,25.957,0,0,1-7-11.805c-1.937-7.144-.327-14.465,2.431-21.165A91.737,91.737,0,0,1,213.392,37.147Z" transform="translate(-201.2 -25.096)"/></g></g></g></svg>
\ No newline at end of file
diff --git a/src/site/resources/plc4x-pmc.rdf b/src/site/resources/plc4x-pmc.rdf
index 3988effdc05..0c681fa6788 100644
--- a/src/site/resources/plc4x-pmc.rdf
+++ b/src/site/resources/plc4x-pmc.rdf
@@ -1,79 +1,79 @@
-<?xml version="1.0"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://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.
--->
-<!--
-
-    This file contains information about the committee/PMC of the project.
-    It should be updated as soon as the PMC or the chair of the project changes.
-    It is referenced from https://svn.apache.org/repos/asf/comdev/projects.apache.org/trunk/data/committees.xml
-
--->
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:asfext="http://projects.apache.org/ns/asfext#"
-         xmlns:foaf="http://xmlns.com/foaf/0.1/"
-         xml:lang="en">
-    <asfext:pmc rdf:about="plc4x">
-        <asfext:name>Apache PLC4X</asfext:name>
-        <foaf:homepage rdf:resource="http://plc4x.apache.org/"/>
-        <asfext:charter>The mission of the Apache PLC4X project is creating
-            a set of libraries for communicating with industrial programmable logic
-            controllers (PLCs) using a variety of protocols but with a shared API.
-        </asfext:charter>
-
-        <asfext:chair>
-            <foaf:Person>
-                <foaf:name>Christofer Dutz</foaf:name>
-            </foaf:Person>
-        </asfext:chair>
-
-        <asfext:member>
-            <foaf:Person>
-                <foaf:name>Bjƶrn Hƶper</foaf:name>
-            </foaf:Person>
-        </asfext:member>
-        <asfext:member>
-            <foaf:Person>
-                <foaf:name>Christofer Dutz</foaf:name>
-            </foaf:Person>
-        </asfext:member>
-        <asfext:member>
-            <foaf:Person>
-                <foaf:name>Julian Feinauer</foaf:name>
-            </foaf:Person>
-        </asfext:member>
-        <asfext:member>
-            <foaf:Person>
-                <foaf:name>Justin Mclean</foaf:name>
-            </foaf:Person>
-        </asfext:member>
-        <asfext:member>
-            <foaf:Person>
-                <foaf:name>Markus Sommer</foaf:name>
-            </foaf:Person>
-        </asfext:member>
-        <asfext:member>
-            <foaf:Person>
-                <foaf:name>Sebastian RĆ¼hl</foaf:name>
-            </foaf:Person>
-        </asfext:member>
-        <asfext:member>
-            <foaf:Person>
-                <foaf:name>Tim Mitsch</foaf:name>
-            </foaf:Person>
-        </asfext:member>
-    </asfext:pmc>
+<?xml version="1.0"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         http://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.
+-->
+<!--
+
+    This file contains information about the committee/PMC of the project.
+    It should be updated as soon as the PMC or the chair of the project changes.
+    It is referenced from https://svn.apache.org/repos/asf/comdev/projects.apache.org/trunk/data/committees.xml
+
+-->
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:asfext="http://projects.apache.org/ns/asfext#"
+         xmlns:foaf="http://xmlns.com/foaf/0.1/"
+         xml:lang="en">
+    <asfext:pmc rdf:about="plc4x">
+        <asfext:name>Apache PLC4X</asfext:name>
+        <foaf:homepage rdf:resource="http://plc4x.apache.org/"/>
+        <asfext:charter>The mission of the Apache PLC4X project is creating
+            a set of libraries for communicating with industrial programmable logic
+            controllers (PLCs) using a variety of protocols but with a shared API.
+        </asfext:charter>
+
+        <asfext:chair>
+            <foaf:Person>
+                <foaf:name>Christofer Dutz</foaf:name>
+            </foaf:Person>
+        </asfext:chair>
+
+        <asfext:member>
+            <foaf:Person>
+                <foaf:name>Bjƶrn Hƶper</foaf:name>
+            </foaf:Person>
+        </asfext:member>
+        <asfext:member>
+            <foaf:Person>
+                <foaf:name>Christofer Dutz</foaf:name>
+            </foaf:Person>
+        </asfext:member>
+        <asfext:member>
+            <foaf:Person>
+                <foaf:name>Julian Feinauer</foaf:name>
+            </foaf:Person>
+        </asfext:member>
+        <asfext:member>
+            <foaf:Person>
+                <foaf:name>Justin Mclean</foaf:name>
+            </foaf:Person>
+        </asfext:member>
+        <asfext:member>
+            <foaf:Person>
+                <foaf:name>Markus Sommer</foaf:name>
+            </foaf:Person>
+        </asfext:member>
+        <asfext:member>
+            <foaf:Person>
+                <foaf:name>Sebastian RĆ¼hl</foaf:name>
+            </foaf:Person>
+        </asfext:member>
+        <asfext:member>
+            <foaf:Person>
+                <foaf:name>Tim Mitsch</foaf:name>
+            </foaf:Person>
+        </asfext:member>
+    </asfext:pmc>
 </rdf:RDF>
\ No newline at end of file
diff --git a/src/site/site.xml b/src/site/site.xml
index 4e721493a92..dc546ce5981 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,148 +1,148 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- 
- 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
- 
- http://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.
- 
- -->
-<project name="PLC4X">
-
-  <skin>
-    <groupId>io.github.devacfr.maven.skins</groupId>
-    <artifactId>reflow-maven-skin</artifactId>
-    <version>${reflow.skin.version}</version>
-  </skin>
-
-  <!-- Hide the publish date as this will cause changes on every generated page every day -->
-  <publishDate position="none"/>
-  <!-- Hide the version as we are usually deploying the develop version -->
-  <version position="none" />
-
-  <!--
-      Details on how to configure the reflow skin:
-      http://andriusvelykis.github.io/reflow-maven-skin/skin/
-  -->
-  <custom>
-    <reflowSkin>
-      <localResources>true</localResources>
-      <absoluteResourceURL>https://plc4x.apache.org/</absoluteResourceURL>
-      <titleTemplate>Apache PLC4X® - %2$s</titleTemplate>
-      <slogan position="bannerLeft">The industrial IoT adapter</slogan>
-      <showApacheEvents>true</showApacheEvents>
-      <toc>top</toc>
-      <bottomNav maxSpan="12">
-        <column>reports</column>
-        <column>Apache</column>
-        <column>modules</column>
-        <column>Protocols</column>
-      </bottomNav>
-      <brand>
-        <name>Apache PLC4X</name>
-        <href>https://plc4x.apache.org/</href>
-      </brand>
-      <breadcrumbs>true</breadcrumbs>
-      <highlightJs>true</highlightJs>
-      <pages>
-        <developer-info>
-          <toc>sidebar</toc>
-        </developer-info>
-      </pages>
-    </reflowSkin>
-  </custom>
-
-  <poweredBy>
-    <logo name="Apache Software Foundation" img="https://www.apache.org/images/asf_logo.png" href="https://www.apache.org/"/>
-  </poweredBy>
-
-  <bannerLeft>
-      <name>Apache PLC4X</name>
-      <src>https://plc4x.apache.org/images/apache_plc4x_logo.png</src>
-      <href>https://plc4x.apache.org/</href>
-  </bannerLeft>
-
-  <bannerRight>
-    <name>Apache Software Foundation</name>
-    <src>https://plc4x.apache.org/images/apache_logo.png</src>
-    <!--src>./images/apache_logo.png</src-->
-    <href>http://www.apache.org/</href>
-  </bannerRight>
-
-  <body>
-    <head>
-      <![CDATA[
-        <script>
-          document.addEventListener("DOMContentLoaded", function(event) {
-            /* Add an image for promoting Apache events below the right banner */
-            $("#bannerRight").append('<p id="apacheEvents"><a href="//www.apache.org/events/current-event.html"><img src="//www.apache.org/events/current-event-234x60.png"/></a></p>');
-            /* Append the trademarks info to the copyright section */
-            $(".copyright").append('<p>Apache PLC4X, PLC4X, Apache, the Apache feather logo, and the Apache PLC4X project logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>');
-          });
-        </script>
-      ]]>
-    </head>
-
-    <menu name="Users">
-      <item name="Download" href="users/download.html"/>
-      <item name="Getting Started" href="users/gettingstarted.html"/>
-      <item name="PLC4X without a PLC and Unit Testing" href="users/testing.html"/>
-      <item name="Object PLC Mapping (OPM)" href="users/opm.html"/>
-      <item name="Industry 4.0 with Apache" href="users/industry40.html"/>
-      <item name="Security" href="users/security.html"/>
-    </menu>
-    <menu name="Developers">
-      <item name="Bug &amp; Issue Tracker" href="developers/issues.html"/>
-      <item name="Building PLC4X" href="developers/building.html"/>
-      <item name="Code Analysis" href="developers/sonar.html"/>
-      <item name="Code Generation" href="developers/code-gen/index.html">
-        <item name="Protocol: MSpec Format" href="developers/code-gen/protocol/mspec.html"/>
-        <item name="Language: Apache Freemarker" href="developers/code-gen/language/freemarker.html"/>
-        <item name="Example: DF1 MSpec" href="developers/code-gen/protocol/df1.html"/>
-      </item>
-      <item name="Continuous Integration" href="developers/ci.html"/>
-      <item name="Contributing" href="developers/contributing.html"/>
-      <item name="Decision Making" href="developers/decisions.html"/>
-      <!--item name="JQassistant" href="developers/jqassistant.html"/-->
-      <item name="Maturity" href="developers/maturity.html"/>
-      <item name="Preparing your Computer" href="developers/preparing.html"/>
-      <item name="Releasing" href="developers/release.html"/>
-      <item name="Releasing Build-Tools" href="developers/release-build-tools.html"/>
-      <item name="Team" href="developers/team.html"/>
-      <item name="VM Access" href="developers/vm.html"/>
-      <item name="VPN Access" href="developers/vpn.html"/>
-      <item name="Website" href="developers/website.html"/>
-      <item name="Wiki" href="developers/wiki.html"/>
-    </menu>
-    <menu name="Protocols">
-      <item name="Features" href="protocols/features.html"/>
-      <item name="AB-Ethernet" href="protocols/ab-eth/index.html"/>
-      <item name="ADS" href="protocols/ads/index.html"/>
-      <item name="DeltaV" href="protocols/delta-v/index.html"/>
-      <item name="EtherNet/IP" href="protocols/ethernet-ip/index.html"/>
-      <item name="Modbus" href="protocols/modbus/index.html"/>
-      <item name="OPC-UA" href="protocols/opc-ua/index.html"/>
-      <item name="S7" href="protocols/s7/index.html"/>
-    </menu>
-    <menu name="Reports" ref="reports" inherit="bottom"/>
-    <menu name="Apache" inherit="bottom">
-      <item name="Apache Software Foundation" href="http://www.apache.org/"/>
-      <item name="How Apache Works" href="https://www.apache.org/foundation/how-it-works.html"/>
-      <item name="License" href="http://www.apache.org/licenses/"/>
-      <item name="Sponsoring Apache" href="http://www.apache.org/foundation/sponsorship.html"/>
-      <item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/>
-    </menu>
-    <menu ref="modules" inherit="bottom"/>
-  </body>
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 
+ 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
+ 
+ http://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.
+ 
+ -->
+<project name="PLC4X">
+
+  <skin>
+    <groupId>io.github.devacfr.maven.skins</groupId>
+    <artifactId>reflow-maven-skin</artifactId>
+    <version>${reflow.skin.version}</version>
+  </skin>
+
+  <!-- Hide the publish date as this will cause changes on every generated page every day -->
+  <publishDate position="none"/>
+  <!-- Hide the version as we are usually deploying the develop version -->
+  <version position="none" />
+
+  <!--
+      Details on how to configure the reflow skin:
+      http://andriusvelykis.github.io/reflow-maven-skin/skin/
+  -->
+  <custom>
+    <reflowSkin>
+      <localResources>true</localResources>
+      <absoluteResourceURL>https://plc4x.apache.org/</absoluteResourceURL>
+      <titleTemplate>Apache PLC4X® - %2$s</titleTemplate>
+      <slogan position="bannerLeft">The industrial IoT adapter</slogan>
+      <showApacheEvents>true</showApacheEvents>
+      <toc>top</toc>
+      <bottomNav maxSpan="12">
+        <column>reports</column>
+        <column>Apache</column>
+        <column>modules</column>
+        <column>Protocols</column>
+      </bottomNav>
+      <brand>
+        <name>Apache PLC4X</name>
+        <href>https://plc4x.apache.org/</href>
+      </brand>
+      <breadcrumbs>true</breadcrumbs>
+      <highlightJs>true</highlightJs>
+      <pages>
+        <developer-info>
+          <toc>sidebar</toc>
+        </developer-info>
+      </pages>
+    </reflowSkin>
+  </custom>
+
+  <poweredBy>
+    <logo name="Apache Software Foundation" img="https://www.apache.org/images/asf_logo.png" href="https://www.apache.org/"/>
+  </poweredBy>
+
+  <bannerLeft>
+      <name>Apache PLC4X</name>
+      <src>https://plc4x.apache.org/images/apache_plc4x_logo.png</src>
+      <href>https://plc4x.apache.org/</href>
+  </bannerLeft>
+
+  <bannerRight>
+    <name>Apache Software Foundation</name>
+    <src>https://plc4x.apache.org/images/apache_logo.png</src>
+    <!--src>./images/apache_logo.png</src-->
+    <href>http://www.apache.org/</href>
+  </bannerRight>
+
+  <body>
+    <head>
+      <![CDATA[
+        <script>
+          document.addEventListener("DOMContentLoaded", function(event) {
+            /* Add an image for promoting Apache events below the right banner */
+            $("#bannerRight").append('<p id="apacheEvents"><a href="//www.apache.org/events/current-event.html"><img src="//www.apache.org/events/current-event-234x60.png"/></a></p>');
+            /* Append the trademarks info to the copyright section */
+            $(".copyright").append('<p>Apache PLC4X, PLC4X, Apache, the Apache feather logo, and the Apache PLC4X project logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>');
+          });
+        </script>
+      ]]>
+    </head>
+
+    <menu name="Users">
+      <item name="Download" href="users/download.html"/>
+      <item name="Getting Started" href="users/gettingstarted.html"/>
+      <item name="PLC4X without a PLC and Unit Testing" href="users/testing.html"/>
+      <item name="Object PLC Mapping (OPM)" href="users/opm.html"/>
+      <item name="Industry 4.0 with Apache" href="users/industry40.html"/>
+      <item name="Security" href="users/security.html"/>
+    </menu>
+    <menu name="Developers">
+      <item name="Bug &amp; Issue Tracker" href="developers/issues.html"/>
+      <item name="Building PLC4X" href="developers/building.html"/>
+      <item name="Code Analysis" href="developers/sonar.html"/>
+      <item name="Code Generation" href="developers/code-gen/index.html">
+        <item name="Protocol: MSpec Format" href="developers/code-gen/protocol/mspec.html"/>
+        <item name="Language: Apache Freemarker" href="developers/code-gen/language/freemarker.html"/>
+        <item name="Example: DF1 MSpec" href="developers/code-gen/protocol/df1.html"/>
+      </item>
+      <item name="Continuous Integration" href="developers/ci.html"/>
+      <item name="Contributing" href="developers/contributing.html"/>
+      <item name="Decision Making" href="developers/decisions.html"/>
+      <!--item name="JQassistant" href="developers/jqassistant.html"/-->
+      <item name="Maturity" href="developers/maturity.html"/>
+      <item name="Preparing your Computer" href="developers/preparing.html"/>
+      <item name="Releasing" href="developers/release.html"/>
+      <item name="Releasing Build-Tools" href="developers/release-build-tools.html"/>
+      <item name="Team" href="developers/team.html"/>
+      <item name="VM Access" href="developers/vm.html"/>
+      <item name="VPN Access" href="developers/vpn.html"/>
+      <item name="Website" href="developers/website.html"/>
+      <item name="Wiki" href="developers/wiki.html"/>
+    </menu>
+    <menu name="Protocols">
+      <item name="Features" href="protocols/features.html"/>
+      <item name="AB-Ethernet" href="protocols/ab-eth/index.html"/>
+      <item name="ADS" href="protocols/ads/index.html"/>
+      <item name="DeltaV" href="protocols/delta-v/index.html"/>
+      <item name="EtherNet/IP" href="protocols/ethernet-ip/index.html"/>
+      <item name="Modbus" href="protocols/modbus/index.html"/>
+      <item name="OPC-UA" href="protocols/opc-ua/index.html"/>
+      <item name="S7" href="protocols/s7/index.html"/>
+    </menu>
+    <menu name="Reports" ref="reports" inherit="bottom"/>
+    <menu name="Apache" inherit="bottom">
+      <item name="Apache Software Foundation" href="http://www.apache.org/"/>
+      <item name="How Apache Works" href="https://www.apache.org/foundation/how-it-works.html"/>
+      <item name="License" href="http://www.apache.org/licenses/"/>
+      <item name="Sponsoring Apache" href="http://www.apache.org/foundation/sponsorship.html"/>
+      <item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/>
+    </menu>
+    <menu ref="modules" inherit="bottom"/>
+  </body>
+
 </project>
\ No newline at end of file
diff --git a/tools/README.md b/tools/README.md
index 279fac19a25..081e9dc1c20 100644
--- a/tools/README.md
+++ b/tools/README.md
@@ -1,72 +1,72 @@
-<!--
-
-  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
-
-      http://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.
-
--->
-# Linux
-
-On a clean Ubuntu 18.04 the following software needs to be installed:
-
-    sudo apt install bison flex python-dev
-
-If you're building a source-distribution and haven't installed git yet, be sure to do so:
-
-    sudo get install git
-         
-# MAC
-
-Make sure `Homebrew` ist installed in order to update `Bison` to a newer version (the version 2.3 installed per default is too old)
-    
-    /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-
-Then update `Bison`: 
-
-    brew install bison
-    brew link bison --force
-    echo 'export PATH="/usr/local/opt/bison/bin:$PATH"' >> ~/.bash_profile
-    
-Install `Python 2.7`:
-    
-    brew install python@2
-
-Be sure to re-open the command window or the changes will not apply.
-
-# Windows
-
-Some tools need to be installed before being able to build on Windows:
-
-- WinBuilds
-- Bison
-- Flex
-- Python 2.7
-
-He have tested WinBuilds with the bundle of: http://win-builds.org/doku.php/download_and_installation_from_windows
-When running the installer, make sure to select the options:
-- Native Windows
-- x86_64
-Not quite sure which elements are really needed, better just install all of them.
-
-For Bison, please download the Setup installer version from here: http://gnuwin32.sourceforge.net/packages/bison.htm (When using the zip version the bison.exe couldn't find some DLL files)
-It seems the official 2.4.1 version has issues when installed in a directory which's path contains spaces. Please make sure you replace the exe with a patched version form here: http://marin.jb.free.fr/bison/bison-2.4.1-modified.zip
-(More infos on this issue here: https://sourceforge.net/p/gnuwin32/bugs/473/)
-
-Please download the Flex compiler from here: http://gnuwin32.sourceforge.net/packages/flex.htm (Ideally download the binary zip distribution)  
-
-You can get Python from here: https://www.python.org/downloads/release/python-2716/
-
-Make sure the `bin` directories of containing the executables `mingw32-make.exe`, `bison.exe` and `flex.exe` are all on your systems `PATH`.
-
+<!--
+
+  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
+
+      http://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.
+
+-->
+# Linux
+
+On a clean Ubuntu 18.04 the following software needs to be installed:
+
+    sudo apt install bison flex python-dev
+
+If you're building a source-distribution and haven't installed git yet, be sure to do so:
+
+    sudo get install git
+         
+# MAC
+
+Make sure `Homebrew` ist installed in order to update `Bison` to a newer version (the version 2.3 installed per default is too old)
+    
+    /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+
+Then update `Bison`: 
+
+    brew install bison
+    brew link bison --force
+    echo 'export PATH="/usr/local/opt/bison/bin:$PATH"' >> ~/.bash_profile
+    
+Install `Python 2.7`:
+    
+    brew install python@2
+
+Be sure to re-open the command window or the changes will not apply.
+
+# Windows
+
+Some tools need to be installed before being able to build on Windows:
+
+- WinBuilds
+- Bison
+- Flex
+- Python 2.7
+
+He have tested WinBuilds with the bundle of: http://win-builds.org/doku.php/download_and_installation_from_windows
+When running the installer, make sure to select the options:
+- Native Windows
+- x86_64
+Not quite sure which elements are really needed, better just install all of them.
+
+For Bison, please download the Setup installer version from here: http://gnuwin32.sourceforge.net/packages/bison.htm (When using the zip version the bison.exe couldn't find some DLL files)
+It seems the official 2.4.1 version has issues when installed in a directory which's path contains spaces. Please make sure you replace the exe with a patched version form here: http://marin.jb.free.fr/bison/bison-2.4.1-modified.zip
+(More infos on this issue here: https://sourceforge.net/p/gnuwin32/bugs/473/)
+
+Please download the Flex compiler from here: http://gnuwin32.sourceforge.net/packages/flex.htm (Ideally download the binary zip distribution)  
+
+You can get Python from here: https://www.python.org/downloads/release/python-2716/
+
+Make sure the `bin` directories of containing the executables `mingw32-make.exe`, `bison.exe` and `flex.exe` are all on your systems `PATH`.
+
 If you're building a source-distribution and haven't installed git yet, be sure to do so.
\ No newline at end of file
diff --git a/tools/boost/pom.xml b/tools/boost/pom.xml
index 1175ee9fc8c..9e2ddaed591 100644
--- a/tools/boost/pom.xml
+++ b/tools/boost/pom.xml
@@ -1,143 +1,143 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4x-tools</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4x-tools-boost</artifactId>
-  <packaging>pom</packaging>
-
-  <name>Tools: Boost</name>
-  <description>Building of the Boost library.</description>
-
-  <!-- Disabled for now as C++ support is currently not installed in Apache SonarQube -->
-  <!--properties>
-    <sonar.language>c++</sonar.language>
-  </properties-->
-
-  <build>
-    <plugins>
-      <!-- First download the cmake binaries and sources for building the boost library -->
-      <plugin>
-        <groupId>com.googlecode.maven-download-plugin</groupId>
-        <artifactId>download-maven-plugin</artifactId>
-        <version>1.4.0</version>
-        <executions>
-          <execution>
-            <id>get-boost</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>wget</goal>
-            </goals>
-            <configuration>
-              <url>${boost.url}</url>
-              <unpack>true</unpack>
-              <outputDirectory>${project.build.directory}</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!--
-        Then execute two boost build phases:
-
-        1) bootstrap the boost build
-        2) Perform the actual boost build and install
-      -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>1.6.0</version>
-        <executions>
-          <execution>
-            <id>bootstrap-boost</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>${boost.bootstrap.executable}</executable>
-              <arguments>
-                <!-- Use clang instead of gcc as this requires far less memory -->
-                <argument>--with-toolset=clang</argument>
-              </arguments>
-              <workingDirectory>${project.build.directory}/boost_${boost.version.underline}</workingDirectory>
-            </configuration>
-          </execution>
-          <execution>
-            <id>compile-boost</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>${boost.build.executable}</executable>
-              <arguments>
-                <!-- Have the build install the built libraries -->
-                <argument>install</argument>
-                <!-- Tell it where to install the libraries and header files -->
-                <argument>--prefix=${project.build.directory}/lib/boost</argument>
-                <!-- List of modules to build -->
-                <argument>--with-system</argument>
-                <argument>--with-thread</argument>
-                <argument>--with-date_time</argument>
-                <argument>--with-regex</argument>
-                <argument>--with-log</argument>
-                <!-- On Windows machines the build failed, if this was not explicitly set -->
-                <argument>address-model=64</argument>
-                <!-- On Linux machines the build failed, if this is not set -->
-                <argument>cxxflags=-fPIC</argument>
-              </arguments>
-              <workingDirectory>${project.build.directory}/boost_${boost.version.underline}</workingDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- Build a zip artifact containing the boost library -->
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>3.1.1</version>
-        <executions>
-          <execution>
-            <id>package-boost-library</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <finalName>${project.artifactId}-${project.version}</finalName>
-              <descriptors>
-                <descriptor>src/assembly/bundle.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4x-tools</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4x-tools-boost</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Tools: Boost</name>
+  <description>Building of the Boost library.</description>
+
+  <!-- Disabled for now as C++ support is currently not installed in Apache SonarQube -->
+  <!--properties>
+    <sonar.language>c++</sonar.language>
+  </properties-->
+
+  <build>
+    <plugins>
+      <!-- First download the cmake binaries and sources for building the boost library -->
+      <plugin>
+        <groupId>com.googlecode.maven-download-plugin</groupId>
+        <artifactId>download-maven-plugin</artifactId>
+        <version>1.4.0</version>
+        <executions>
+          <execution>
+            <id>get-boost</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>wget</goal>
+            </goals>
+            <configuration>
+              <url>${boost.url}</url>
+              <unpack>true</unpack>
+              <outputDirectory>${project.build.directory}</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!--
+        Then execute two boost build phases:
+
+        1) bootstrap the boost build
+        2) Perform the actual boost build and install
+      -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.6.0</version>
+        <executions>
+          <execution>
+            <id>bootstrap-boost</id>
+            <phase>process-sources</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>${boost.bootstrap.executable}</executable>
+              <arguments>
+                <!-- Use clang instead of gcc as this requires far less memory -->
+                <argument>--with-toolset=clang</argument>
+              </arguments>
+              <workingDirectory>${project.build.directory}/boost_${boost.version.underline}</workingDirectory>
+            </configuration>
+          </execution>
+          <execution>
+            <id>compile-boost</id>
+            <phase>process-sources</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>${boost.build.executable}</executable>
+              <arguments>
+                <!-- Have the build install the built libraries -->
+                <argument>install</argument>
+                <!-- Tell it where to install the libraries and header files -->
+                <argument>--prefix=${project.build.directory}/lib/boost</argument>
+                <!-- List of modules to build -->
+                <argument>--with-system</argument>
+                <argument>--with-thread</argument>
+                <argument>--with-date_time</argument>
+                <argument>--with-regex</argument>
+                <argument>--with-log</argument>
+                <!-- On Windows machines the build failed, if this was not explicitly set -->
+                <argument>address-model=64</argument>
+                <!-- On Linux machines the build failed, if this is not set -->
+                <argument>cxxflags=-fPIC</argument>
+              </arguments>
+              <workingDirectory>${project.build.directory}/boost_${boost.version.underline}</workingDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!-- Build a zip artifact containing the boost library -->
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>3.1.1</version>
+        <executions>
+          <execution>
+            <id>package-boost-library</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <finalName>${project.artifactId}-${project.version}</finalName>
+              <descriptors>
+                <descriptor>src/assembly/bundle.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
\ No newline at end of file
diff --git a/tools/boost/src/assembly/bundle.xml b/tools/boost/src/assembly/bundle.xml
index a4b4b7e4b31..193b25f6b37 100644
--- a/tools/boost/src/assembly/bundle.xml
+++ b/tools/boost/src/assembly/bundle.xml
@@ -1,40 +1,40 @@
-<!--
-  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
-
-      http://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.
-  -->
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-
-  <id>lib-${os.classifier}</id>
-
-  <formats>
-    <format>zip</format>
-  </formats>
-
-  <includeBaseDirectory>false</includeBaseDirectory>
-
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.directory}/lib/boost</directory>
-      <includes>
-        <include>**</include>
-      </includes>
-      <outputDirectory/>
-    </fileSet>
-  </fileSets>
+<!--
+  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
+
+      http://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.
+  -->
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+
+  <id>lib-${os.classifier}</id>
+
+  <formats>
+    <format>zip</format>
+  </formats>
+
+  <includeBaseDirectory>false</includeBaseDirectory>
+
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.directory}/lib/boost</directory>
+      <includes>
+        <include>**</include>
+      </includes>
+      <outputDirectory/>
+    </fileSet>
+  </fileSets>
 </assembly>
\ No newline at end of file
diff --git a/tools/check_sigs.sh b/tools/check_sigs.sh
index 3cd874c310d..7423826ebcf 100755
--- a/tools/check_sigs.sh
+++ b/tools/check_sigs.sh
@@ -1,67 +1,67 @@
-#!/bin/sh
-
-################################################################################
-##
-##  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
-##
-##      http://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.
-##
-################################################################################
-
-set -e
-
-# Checks the signatures of all bundles in the build/release-edgent directory
-# Or checks the bundles in the specified directory
-
-. `dirname $0`/common.sh
-
-setUsage "`basename $0` [bundle-directory]"
-handleHelp "$@"
-
-if [ $# -ge 1 ]
-then
-    BUNDLE_DIR=$1; shift
-fi
-
-noExtraArgs "$@"
-
-[ -d ${BUNDLE_DIR} ] || die "Bundle directory \"${BUNDLE_DIR}\" does not exist"
-
-function checkFile() {
-    FILE="$1"
-    echo
-    echo "Checking $FILE..."
-
-    HASH=`shasum -a 512 "${FILE}" | awk '{print$1}'`
-    CHECK=`cat "${FILE}.sha512"`
-
-    if [ "$HASH" != "$CHECK" ]
-    then
-        echo "${FILE} SHA incorrect"
-        exit 1;
-    else
-       echo "${FILE} SHA OK";
-    fi
-
-    gpg --verify "${FILE}.asc"
-
-}
-
-for bundle in ${BUNDLE_DIR}/*.zip
-do
-    checkFile ${bundle}
-done
-
-echo
-echo "SUCCESS: all checksum and signature files OK"
+#!/bin/sh
+
+################################################################################
+##
+##  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
+##
+##      http://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.
+##
+################################################################################
+
+set -e
+
+# Checks the signatures of all bundles in the build/release-edgent directory
+# Or checks the bundles in the specified directory
+
+. `dirname $0`/common.sh
+
+setUsage "`basename $0` [bundle-directory]"
+handleHelp "$@"
+
+if [ $# -ge 1 ]
+then
+    BUNDLE_DIR=$1; shift
+fi
+
+noExtraArgs "$@"
+
+[ -d ${BUNDLE_DIR} ] || die "Bundle directory \"${BUNDLE_DIR}\" does not exist"
+
+function checkFile() {
+    FILE="$1"
+    echo
+    echo "Checking $FILE..."
+
+    HASH=`shasum -a 512 "${FILE}" | awk '{print$1}'`
+    CHECK=`cat "${FILE}.sha512"`
+
+    if [ "$HASH" != "$CHECK" ]
+    then
+        echo "${FILE} SHA incorrect"
+        exit 1;
+    else
+       echo "${FILE} SHA OK";
+    fi
+
+    gpg --verify "${FILE}.asc"
+
+}
+
+for bundle in ${BUNDLE_DIR}/*.zip
+do
+    checkFile ${bundle}
+done
+
+echo
+echo "SUCCESS: all checksum and signature files OK"
diff --git a/tools/clean-site.sh b/tools/clean-site.sh
index a8c933325cb..d4167c67530 100644
--- a/tools/clean-site.sh
+++ b/tools/clean-site.sh
@@ -1,35 +1,35 @@
-#!/usr/bin/env bash
-
-################################################################################
-##
-##  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
-##
-##      http://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.
-##
-################################################################################
-
-# Remove all the css and js directories except the ones in the root of the site.
-find target/staging -type d | grep 'target\/staging\/.*\/css$' | xargs rm -r
-find target/staging -type d | grep 'target\/staging\/.*\/js$' | xargs rm -r
-
-# Delete some individual images.
-find target/staging -type f | grep 'target\/staging\/.*/images/close\.png$' | xargs rm
-find target/staging -type f | grep 'target\/staging\/.*/images/close\.gif$' | xargs rm
-find target/staging -type f | grep 'target\/staging\/.*/images/loading\.png$' | xargs rm
-find target/staging -type f | grep 'target\/staging\/.*/images/loading\.gif$' | xargs rm
-find target/staging -type f | grep 'target\/staging\/.*/images/next\.png$' | xargs rm
-find target/staging -type f | grep 'target\/staging\/.*/images/prev\.png$' | xargs rm
-
-# Delete any now empty directories.
+#!/usr/bin/env bash
+
+################################################################################
+##
+##  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
+##
+##      http://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.
+##
+################################################################################
+
+# Remove all the css and js directories except the ones in the root of the site.
+find target/staging -type d | grep 'target\/staging\/.*\/css$' | xargs rm -r
+find target/staging -type d | grep 'target\/staging\/.*\/js$' | xargs rm -r
+
+# Delete some individual images.
+find target/staging -type f | grep 'target\/staging\/.*/images/close\.png$' | xargs rm
+find target/staging -type f | grep 'target\/staging\/.*/images/close\.gif$' | xargs rm
+find target/staging -type f | grep 'target\/staging\/.*/images/loading\.png$' | xargs rm
+find target/staging -type f | grep 'target\/staging\/.*/images/loading\.gif$' | xargs rm
+find target/staging -type f | grep 'target\/staging\/.*/images/next\.png$' | xargs rm
+find target/staging -type f | grep 'target\/staging\/.*/images/prev\.png$' | xargs rm
+
+# Delete any now empty directories.
 find target/staging -type d -empty | xargs rm -r
\ No newline at end of file
diff --git a/tools/common.sh b/tools/common.sh
index 4222bcfbb1b..631d910ad1c 100755
--- a/tools/common.sh
+++ b/tools/common.sh
@@ -1,202 +1,202 @@
-#!/bin/sh
-
-################################################################################
-##
-##  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
-##
-##      http://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.
-##
-################################################################################
-
-BUILDTOOLS_DIR=`dirname $0`
-
-PLC4X_ROOT_DIR=.
-# BUNDLE_DIR is results of maven release:perform's creation of release candidate
-BUNDLE_DIR=${PLC4X_ROOT_DIR}/target/checkout/target
-
-PLC4X_ASF_GIT_URL=https://git-wip-us.apache.org/repos/asf/plc4x.git
-PLC4X_ASF_DIST_URL=https://www.apache.org/dist/plc4x
-PLC4X_ASF_DIST_DYN_URL=https://www.apache.org/dyn/closer.cgi/plc4x
-PLC4X_ASF_SVN_RELEASE_URL=https://dist.apache.org/repos/dist/release/plc4x
-PLC4X_ASF_SVN_RC_URL=https://dist.apache.org/repos/dist/dev/plc4x
-
-USAGE=
-
-RELEASE_PROP_FILE=${PLC4X_ROOT_DIR}/plc4x.release.properties
-
-function die() {  # [$* msgs]
-  [ $# -gt 0 ] && echo "Error: $*"
-  exit 1
-}
-
-function setUsage() {  # $1: usage string
-  USAGE=$1
-}
-
-function usage() {  #  [$*: msgs]
-  [ $# -gt 0 ] && echo "Error: $*"
-  echo "Usage: ${USAGE}"
-  exit 1
-}
-
-function handleHelp() { # usage: handleHelp "$@"
-  if [ "$1" == "-?" -o "$1" == "--help" ]; then
-    usage
-  fi
-}
-
-function requireArg() {  # usage: requireArgs "$@"
-  if [ $# -lt 1 ] || [[ $1 =~ ^- ]]; then
-    usage "missing argument"
-  fi
-}
-
-function noExtraArgs() { # usage: noExtraArgs "$@"
-  [ $# = 0 ] || usage "extra arguments"
-}
-
-function getAbsPath() { # $1: rel-or-abs-path 
-    echo "$(cd "$(dirname "$1")"; pwd)/$(basename "$1")"
-}
-
-function confirm () {  # [$1: question]
-  while true; do
-    # call with a prompt string or use a default                                                                                                                                                   
-    /bin/echo -n "${1:-Are you sure?}"
-    read -r -p " [y/n] " response
-    case $response in
-      [yY]) return `true` ;;
-      [nN]) return `false` ;;
-      *) echo "illegal response '$response'" ;;
-    esac
-  done
-}
-
-function dieSuperceeded { # no args
-  die "This tool is superceeded with the new maven build tooling.  See src/site/asciidoc/releasing.adoc."
-}
-
-function checkPLC4XSourceRootGitDie { # no args; dies if !ok
-  [ -d "${PLC4X_ROOT_DIR}/.git" ] || die "Not an PLC4X source root git directory \"${PLC4X_ROOT_DIR}\""
-}
-
-function checkUsingMgmtCloneWarn() { # no args; warns if plc4x root isn't a mgmt clone
-  CLONE_DIR=`cd ${PLC4X_ROOT_DIR}; pwd`
-  CLONE_DIRNAME=`basename $CLONE_DIR`
-  if [ ! `echo $CLONE_DIRNAME | grep -o -E '^mgmt-plc4x'` ]; then
-    echo "Warning: the PLC4X root dir \"${PLC4X_ROOT_DIR}\" is not a release mgmt clone!"
-    return 1
-  else
-    return 0
-  fi 
-}
-
-function checkBundleDir() { # no args  returns true/false (0/1)
-  if [ -d ${BUNDLE_DIR} ]; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-function checkVerNum() {  #  $1: X.Y.Z  returns true/false (0/1)
-  if [ `echo $1 | grep -o -E '^\d+\.\d+\.\d+$'` ]; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-function checkVerNumDie() { #  $1: X.Y.Z  dies if not ok
-  checkVerNum $1 || die "Not a X.Y.Z version number \"$1\""
-}
-
-function checkRcNum() {  # $1: rc-num   returns true/false (0/1)
-  if [ `echo $1 | grep -o -E '^\d+$'` ] && [ $1 != 0 ]; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-function checkRcNumDie() {  # $1: rc-num dies if not ok
-  checkRcNum $1 || die "Not a release candidate number \"$1\""
-}
-
-function createReleaseProperties { # X.Y.Z
-  VER="$1"
-  checkVerNumDie ${VER}
-  echo "releaseNum=${VER}" > ${RELEASE_PROP_FILE}
-}
-
-function getReleaseProperty {  # <property-name>
-  PN=$1
-  PNVAL=`grep ${PN} ${RELEASE_PROP_FILE}`
-  VAL=`echo ${PNVAL} | sed -e "s/^${PN}=//"`
-  echo ${VAL}
-}
-
-function getPLC4XVer() {  # [$1 == "bundle"]
-  MSG="getPLC4XVer(): unknown mode \"$1\""
-  VER=""
-  if [ "$1" == "" ]; then
-    VER=`getReleaseProperty releaseNum`
-    MSG="Unable to identify the release version id from ${RELEASE_PROP_FILE}"
-  elif [ $1 == "gradle" ]; then
-    die "'getPLC4XVer() gradle' is no longer supported"
-    # Get the X.Y.Z version from gradle build info
-    PROPS=${PLC4X_ROOT_DIR}/gradle.properties
-    VER=`grep build_version ${PROPS} | grep -o -E '\d+\.\d+\.\d+'`
-    MSG="Unable to identify the version id from ${PROPS}"
-  elif [ $1 == "bundle" ]; then
-    # Get the X.Y.Z version from a build generated bundle's name
-    BUNDLE=`echo ${BUNDLE_DIR}/apache-plc4x-*-source-release.tar.gz`
-    VER=`echo ${BUNDLE} | grep -o -E '\d+\.\d+\.\d+'`
-    MSG="Unable to identify the version id from bundle ${BUNDLE}"
-  fi
-  [ "${VER}" ] || die "${MSG}"
-  echo $VER
-}
-
-function getMajMinVerNum() {  #  $1: X.Y.Z  returns X.Y
-  VER=$1; shift
-  checkVerNumDie ${VER}
-  MAJ_MIN_VER=`echo ${VER} | sed -e 's/\.[0-9][0-9]*$//'`
-  echo ${MAJ_MIN_VER}
-}
-
-function getReleaseBranch() { # $1: X.Y.Z version
-  MAJ_MIN_NUM=`getMajMinVerNum $1`
-  echo "release/${MAJ_MIN_NUM}"
-}
-
-function getReleaseTag() {  # $1: X.Y.Z  [$2: rc-num]
-  VER=$1; shift
-  checkVerNumDie ${VER}
-  RC_SFX=""
-  if [ $# -gt 0 ] && [ "$1" != "" ]; then
-    RC_SFX="-RC$1"
-  fi
-  echo "${VER}${RC_SFX}"
-}
-
-function getReleaseTagComment() {  # $1: X.Y.Z  [$2: rc-num]
-  VER=$1; shift
-  checkVerNumDie ${VER}
-  RC_SFX=""
-  if [ $# -gt 0 ] && [ "$1" != "" ]; then
-    RC_SFX=" RC$1"
-  fi
-  echo "Apache PLC4X ${VER}${RC_SFX}"
-}
+#!/bin/sh
+
+################################################################################
+##
+##  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
+##
+##      http://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.
+##
+################################################################################
+
+BUILDTOOLS_DIR=`dirname $0`
+
+PLC4X_ROOT_DIR=.
+# BUNDLE_DIR is results of maven release:perform's creation of release candidate
+BUNDLE_DIR=${PLC4X_ROOT_DIR}/target/checkout/target
+
+PLC4X_ASF_GIT_URL=https://git-wip-us.apache.org/repos/asf/plc4x.git
+PLC4X_ASF_DIST_URL=https://www.apache.org/dist/plc4x
+PLC4X_ASF_DIST_DYN_URL=https://www.apache.org/dyn/closer.cgi/plc4x
+PLC4X_ASF_SVN_RELEASE_URL=https://dist.apache.org/repos/dist/release/plc4x
+PLC4X_ASF_SVN_RC_URL=https://dist.apache.org/repos/dist/dev/plc4x
+
+USAGE=
+
+RELEASE_PROP_FILE=${PLC4X_ROOT_DIR}/plc4x.release.properties
+
+function die() {  # [$* msgs]
+  [ $# -gt 0 ] && echo "Error: $*"
+  exit 1
+}
+
+function setUsage() {  # $1: usage string
+  USAGE=$1
+}
+
+function usage() {  #  [$*: msgs]
+  [ $# -gt 0 ] && echo "Error: $*"
+  echo "Usage: ${USAGE}"
+  exit 1
+}
+
+function handleHelp() { # usage: handleHelp "$@"
+  if [ "$1" == "-?" -o "$1" == "--help" ]; then
+    usage
+  fi
+}
+
+function requireArg() {  # usage: requireArgs "$@"
+  if [ $# -lt 1 ] || [[ $1 =~ ^- ]]; then
+    usage "missing argument"
+  fi
+}
+
+function noExtraArgs() { # usage: noExtraArgs "$@"
+  [ $# = 0 ] || usage "extra arguments"
+}
+
+function getAbsPath() { # $1: rel-or-abs-path 
+    echo "$(cd "$(dirname "$1")"; pwd)/$(basename "$1")"
+}
+
+function confirm () {  # [$1: question]
+  while true; do
+    # call with a prompt string or use a default                                                                                                                                                   
+    /bin/echo -n "${1:-Are you sure?}"
+    read -r -p " [y/n] " response
+    case $response in
+      [yY]) return `true` ;;
+      [nN]) return `false` ;;
+      *) echo "illegal response '$response'" ;;
+    esac
+  done
+}
+
+function dieSuperceeded { # no args
+  die "This tool is superceeded with the new maven build tooling.  See src/site/asciidoc/releasing.adoc."
+}
+
+function checkPLC4XSourceRootGitDie { # no args; dies if !ok
+  [ -d "${PLC4X_ROOT_DIR}/.git" ] || die "Not an PLC4X source root git directory \"${PLC4X_ROOT_DIR}\""
+}
+
+function checkUsingMgmtCloneWarn() { # no args; warns if plc4x root isn't a mgmt clone
+  CLONE_DIR=`cd ${PLC4X_ROOT_DIR}; pwd`
+  CLONE_DIRNAME=`basename $CLONE_DIR`
+  if [ ! `echo $CLONE_DIRNAME | grep -o -E '^mgmt-plc4x'` ]; then
+    echo "Warning: the PLC4X root dir \"${PLC4X_ROOT_DIR}\" is not a release mgmt clone!"
+    return 1
+  else
+    return 0
+  fi 
+}
+
+function checkBundleDir() { # no args  returns true/false (0/1)
+  if [ -d ${BUNDLE_DIR} ]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+function checkVerNum() {  #  $1: X.Y.Z  returns true/false (0/1)
+  if [ `echo $1 | grep -o -E '^\d+\.\d+\.\d+$'` ]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+function checkVerNumDie() { #  $1: X.Y.Z  dies if not ok
+  checkVerNum $1 || die "Not a X.Y.Z version number \"$1\""
+}
+
+function checkRcNum() {  # $1: rc-num   returns true/false (0/1)
+  if [ `echo $1 | grep -o -E '^\d+$'` ] && [ $1 != 0 ]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+function checkRcNumDie() {  # $1: rc-num dies if not ok
+  checkRcNum $1 || die "Not a release candidate number \"$1\""
+}
+
+function createReleaseProperties { # X.Y.Z
+  VER="$1"
+  checkVerNumDie ${VER}
+  echo "releaseNum=${VER}" > ${RELEASE_PROP_FILE}
+}
+
+function getReleaseProperty {  # <property-name>
+  PN=$1
+  PNVAL=`grep ${PN} ${RELEASE_PROP_FILE}`
+  VAL=`echo ${PNVAL} | sed -e "s/^${PN}=//"`
+  echo ${VAL}
+}
+
+function getPLC4XVer() {  # [$1 == "bundle"]
+  MSG="getPLC4XVer(): unknown mode \"$1\""
+  VER=""
+  if [ "$1" == "" ]; then
+    VER=`getReleaseProperty releaseNum`
+    MSG="Unable to identify the release version id from ${RELEASE_PROP_FILE}"
+  elif [ $1 == "gradle" ]; then
+    die "'getPLC4XVer() gradle' is no longer supported"
+    # Get the X.Y.Z version from gradle build info
+    PROPS=${PLC4X_ROOT_DIR}/gradle.properties
+    VER=`grep build_version ${PROPS} | grep -o -E '\d+\.\d+\.\d+'`
+    MSG="Unable to identify the version id from ${PROPS}"
+  elif [ $1 == "bundle" ]; then
+    # Get the X.Y.Z version from a build generated bundle's name
+    BUNDLE=`echo ${BUNDLE_DIR}/apache-plc4x-*-source-release.tar.gz`
+    VER=`echo ${BUNDLE} | grep -o -E '\d+\.\d+\.\d+'`
+    MSG="Unable to identify the version id from bundle ${BUNDLE}"
+  fi
+  [ "${VER}" ] || die "${MSG}"
+  echo $VER
+}
+
+function getMajMinVerNum() {  #  $1: X.Y.Z  returns X.Y
+  VER=$1; shift
+  checkVerNumDie ${VER}
+  MAJ_MIN_VER=`echo ${VER} | sed -e 's/\.[0-9][0-9]*$//'`
+  echo ${MAJ_MIN_VER}
+}
+
+function getReleaseBranch() { # $1: X.Y.Z version
+  MAJ_MIN_NUM=`getMajMinVerNum $1`
+  echo "release/${MAJ_MIN_NUM}"
+}
+
+function getReleaseTag() {  # $1: X.Y.Z  [$2: rc-num]
+  VER=$1; shift
+  checkVerNumDie ${VER}
+  RC_SFX=""
+  if [ $# -gt 0 ] && [ "$1" != "" ]; then
+    RC_SFX="-RC$1"
+  fi
+  echo "${VER}${RC_SFX}"
+}
+
+function getReleaseTagComment() {  # $1: X.Y.Z  [$2: rc-num]
+  VER=$1; shift
+  checkVerNumDie ${VER}
+  RC_SFX=""
+  if [ $# -gt 0 ] && [ "$1" != "" ]; then
+    RC_SFX=" RC$1"
+  fi
+  echo "Apache PLC4X ${VER}${RC_SFX}"
+}
diff --git a/tools/download_staged_release.sh b/tools/download_staged_release.sh
index 4726c2f6e9a..8380f45b3a5 100755
--- a/tools/download_staged_release.sh
+++ b/tools/download_staged_release.sh
@@ -1,137 +1,137 @@
-#!/bin/sh
-
-################################################################################
-##
-##  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
-##
-##      http://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.
-##
-################################################################################
-
-set -e
-
-# Download the collection of files associated with an Apache PLC4X
-# Release or Release Candidate from the Apache Distribution area:
-# https://dist.apache.org/repos/dist/release/plc4x
-# or https://dist.apache.org/repos/dist/dev/plc4x
-# respectively.
-#
-# Prompts before taking actions unless "--nquery"
-# Prompts to perform signature validation (using buildTools/check_sigs.sh)
-# unless --nvalidate or --validate is specified.
-
-
-. `dirname $0`/common.sh
-
-
-
-setUsage "`basename $0` [--nquery] [--validate|--nvalidate] <version> [<rc-num>]"
-handleHelp "$@"
-
-BUILDTOOLS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-NQUERY=
-if [ "$1" == "--nquery" ]; then
-  NQUERY="--nquery"; shift
-fi
-
-VALIDATE=-1  # query
-if [ "$1" == "--validate" ]; then
-  VALIDATE=1; shift
-elif [ "$1" == "--nvalidate" ]; then
-  VALIDATE=0; shift
-fi
-
-requireArg "$@"
-VER=$1; shift
-checkVerNum $VER || usage "Not a X.Y.Z version number \"$VER\""
-
-RC_NUM=
-if [ $# -gt 0 ]; then
-  RC_NUM=$1; shift
-  checkRcNum ${RC_NUM} || usage "Not a release candidate number \"${RC_NUM}\""
-fi
-
-noExtraArgs "$@"
-
-# Release or Release Candidate mode
-IS_RC=
-if [ ${RC_NUM} ]; then
-  IS_RC=1
-fi
-
-BASE_URL=${PLC4X_ASF_SVN_RELEASE_URL}
-if [ ${IS_RC} ]; then
-  BASE_URL=${PLC4X_ASF_SVN_RC_URL}
-fi
-
-RC_SFX=
-if [ ${IS_RC} ]; then
-    RC_SFX=rc${RC_NUM}
-fi
-
-DST_BASE_DIR=downloaded-plc4x-${VER}${RC_SFX}
-[ -d ${DST_BASE_DIR} ] && die "${DST_BASE_DIR} already exists"
-
-[ ${NQUERY} ] || confirm "Proceed to download to ${DST_BASE_DIR} from ${BASE_URL}?" || exit
-
-echo Downloading to ${DST_BASE_DIR} ...
-
-function mywget() {
-  # OSX lacks wget by default
-  (set -x; curl -f -O $1)
-}
-
-function getSignedBundle() {
-  mywget ${1}
-  mywget ${1}.asc
-  mywget ${1}.sha512
-}
-
-mkdir -p ${DST_BASE_DIR}
-cd ${DST_BASE_DIR}
-ABS_BASE_DIR=`pwd`
-URL=${BASE_URL}
-mywget ${URL}/KEYS
-
-DST_VER_DIR=${VER}
-URL=${BASE_URL}/${VER}
-if [ ${IS_RC} ]; then
-  DST_VER_DIR=${DST_VER_DIR}/${RC_SFX}
-  URL=${URL}/${RC_SFX}
-fi
-
-mkdir -p ${DST_VER_DIR}
-cd ${DST_VER_DIR}
-mywget ${URL}/README.md
-mywget ${URL}/RELEASE_NOTES
-getSignedBundle ${URL}/apache-plc4x-${VER}-source-release.zip
-
-echo
-echo Done Downloading to ${DST_BASE_DIR}
-
-[ ${VALIDATE} == 0 ] && exit
-[ ${VALIDATE} == 1 ] || [ ${NQUERY} ] || confirm "Do you want to check the bundle signatures and compare source bundles?" || exit
-
-cd ${ABS_BASE_DIR}
-
-echo
-echo "If the following bundle gpg signature checks fail, you may need to"
-echo "import the project's list of signing keys to your keyring"
-echo "    $ gpg ${DST_BASE_DIR}/KEYS            # show the included keys"
-echo "    $ gpg --import ${DST_BASE_DIR}/KEYS"
-
-echo
-echo "Verifying the source bundle signatures..."
-(set -x; $BUILDTOOLS_DIR/check_sigs.sh ${DST_VER_DIR})
+#!/bin/sh
+
+################################################################################
+##
+##  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
+##
+##      http://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.
+##
+################################################################################
+
+set -e
+
+# Download the collection of files associated with an Apache PLC4X
+# Release or Release Candidate from the Apache Distribution area:
+# https://dist.apache.org/repos/dist/release/plc4x
+# or https://dist.apache.org/repos/dist/dev/plc4x
+# respectively.
+#
+# Prompts before taking actions unless "--nquery"
+# Prompts to perform signature validation (using buildTools/check_sigs.sh)
+# unless --nvalidate or --validate is specified.
+
+
+. `dirname $0`/common.sh
+
+
+
+setUsage "`basename $0` [--nquery] [--validate|--nvalidate] <version> [<rc-num>]"
+handleHelp "$@"
+
+BUILDTOOLS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+NQUERY=
+if [ "$1" == "--nquery" ]; then
+  NQUERY="--nquery"; shift
+fi
+
+VALIDATE=-1  # query
+if [ "$1" == "--validate" ]; then
+  VALIDATE=1; shift
+elif [ "$1" == "--nvalidate" ]; then
+  VALIDATE=0; shift
+fi
+
+requireArg "$@"
+VER=$1; shift
+checkVerNum $VER || usage "Not a X.Y.Z version number \"$VER\""
+
+RC_NUM=
+if [ $# -gt 0 ]; then
+  RC_NUM=$1; shift
+  checkRcNum ${RC_NUM} || usage "Not a release candidate number \"${RC_NUM}\""
+fi
+
+noExtraArgs "$@"
+
+# Release or Release Candidate mode
+IS_RC=
+if [ ${RC_NUM} ]; then
+  IS_RC=1
+fi
+
+BASE_URL=${PLC4X_ASF_SVN_RELEASE_URL}
+if [ ${IS_RC} ]; then
+  BASE_URL=${PLC4X_ASF_SVN_RC_URL}
+fi
+
+RC_SFX=
+if [ ${IS_RC} ]; then
+    RC_SFX=rc${RC_NUM}
+fi
+
+DST_BASE_DIR=downloaded-plc4x-${VER}${RC_SFX}
+[ -d ${DST_BASE_DIR} ] && die "${DST_BASE_DIR} already exists"
+
+[ ${NQUERY} ] || confirm "Proceed to download to ${DST_BASE_DIR} from ${BASE_URL}?" || exit
+
+echo Downloading to ${DST_BASE_DIR} ...
+
+function mywget() {
+  # OSX lacks wget by default
+  (set -x; curl -f -O $1)
+}
+
+function getSignedBundle() {
+  mywget ${1}
+  mywget ${1}.asc
+  mywget ${1}.sha512
+}
+
+mkdir -p ${DST_BASE_DIR}
+cd ${DST_BASE_DIR}
+ABS_BASE_DIR=`pwd`
+URL=${BASE_URL}
+mywget ${URL}/KEYS
+
+DST_VER_DIR=${VER}
+URL=${BASE_URL}/${VER}
+if [ ${IS_RC} ]; then
+  DST_VER_DIR=${DST_VER_DIR}/${RC_SFX}
+  URL=${URL}/${RC_SFX}
+fi
+
+mkdir -p ${DST_VER_DIR}
+cd ${DST_VER_DIR}
+mywget ${URL}/README.md
+mywget ${URL}/RELEASE_NOTES
+getSignedBundle ${URL}/apache-plc4x-${VER}-source-release.zip
+
+echo
+echo Done Downloading to ${DST_BASE_DIR}
+
+[ ${VALIDATE} == 0 ] && exit
+[ ${VALIDATE} == 1 ] || [ ${NQUERY} ] || confirm "Do you want to check the bundle signatures and compare source bundles?" || exit
+
+cd ${ABS_BASE_DIR}
+
+echo
+echo "If the following bundle gpg signature checks fail, you may need to"
+echo "import the project's list of signing keys to your keyring"
+echo "    $ gpg ${DST_BASE_DIR}/KEYS            # show the included keys"
+echo "    $ gpg --import ${DST_BASE_DIR}/KEYS"
+
+echo
+echo "Verifying the source bundle signatures..."
+(set -x; $BUILDTOOLS_DIR/check_sigs.sh ${DST_VER_DIR})
diff --git a/tools/logstash/pom.xml b/tools/logstash/pom.xml
index 4cebdd566b5..e7a6eb0b620 100644
--- a/tools/logstash/pom.xml
+++ b/tools/logstash/pom.xml
@@ -1,106 +1,106 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4x-tools</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4x-tools-logstash-core</artifactId>
-  <packaging>pom</packaging>
-
-  <name>Tools: Logstash-Core</name>
-  <description>Building of the Logstash-Core library.</description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>com.googlecode.maven-download-plugin</groupId>
-        <artifactId>download-maven-plugin</artifactId>
-        <version>1.4.0</version>
-        <executions>
-          <execution>
-            <id>get-logstash</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>wget</goal>
-            </goals>
-            <configuration>
-              <url>https://github.com/elastic/logstash/archive/v${logstash.version}.tar.gz</url>
-              <unpack>true</unpack>
-              <outputDirectory>${project.build.directory}</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>1.6.0</version>
-        <executions>
-          <execution>
-            <id>compile-logstash-core</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>${gradlew.executable}</executable>
-              <arguments>
-                <argument>:logstash-core:jar</argument>
-              </arguments>
-              <workingDirectory>${project.build.directory}/logstash-${logstash.version}</workingDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>3.0.0</version>
-        <executions>
-          <execution>
-            <id>attach-jars</id>
-            <phase>package</phase>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/logstash-${logstash.version}/logstash-core/build/libs/logstash-core-${logstash.version}.jar</file>
-                  <type>jar</type>
-                  <classifier>${logstash.version}</classifier>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4x-tools</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4x-tools-logstash-core</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Tools: Logstash-Core</name>
+  <description>Building of the Logstash-Core library.</description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.googlecode.maven-download-plugin</groupId>
+        <artifactId>download-maven-plugin</artifactId>
+        <version>1.4.0</version>
+        <executions>
+          <execution>
+            <id>get-logstash</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>wget</goal>
+            </goals>
+            <configuration>
+              <url>https://github.com/elastic/logstash/archive/v${logstash.version}.tar.gz</url>
+              <unpack>true</unpack>
+              <outputDirectory>${project.build.directory}</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.6.0</version>
+        <executions>
+          <execution>
+            <id>compile-logstash-core</id>
+            <phase>process-sources</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>${gradlew.executable}</executable>
+              <arguments>
+                <argument>:logstash-core:jar</argument>
+              </arguments>
+              <workingDirectory>${project.build.directory}/logstash-${logstash.version}</workingDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>3.0.0</version>
+        <executions>
+          <execution>
+            <id>attach-jars</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <file>${project.build.directory}/logstash-${logstash.version}/logstash-core/build/libs/logstash-core-${logstash.version}.jar</file>
+                  <type>jar</type>
+                  <classifier>${logstash.version}</classifier>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
\ No newline at end of file
diff --git a/tools/pom.xml b/tools/pom.xml
index 9b9d9ddadfa..cf0c07caac1 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4x-parent</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4x-tools</artifactId>
-  <packaging>pom</packaging>
-
-  <name>Tools</name>
-
-  <profiles>
-    <profile>
-      <id>with-boost</id>
-      <modules>
-        <module>boost</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>with-logstash</id>
-      <modules>
-        <module>logstash</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>with-proxies</id>
-      <modules>
-        <module>thrift</module>
-      </modules>
-    </profile>
-  </profiles>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4x-parent</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4x-tools</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Tools</name>
+
+  <profiles>
+    <profile>
+      <id>with-boost</id>
+      <modules>
+        <module>boost</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>with-logstash</id>
+      <modules>
+        <module>logstash</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>with-proxies</id>
+      <modules>
+        <module>thrift</module>
+      </modules>
+    </profile>
+  </profiles>
+
 </project>
\ No newline at end of file
diff --git a/tools/thrift/pom.xml b/tools/thrift/pom.xml
index d3b26ca1fe9..44315714350 100644
--- a/tools/thrift/pom.xml
+++ b/tools/thrift/pom.xml
@@ -1,339 +1,339 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
-
-      http://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.plc4x</groupId>
-    <artifactId>plc4x-tools</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>plc4x-tools-thrift</artifactId>
-  <packaging>pom</packaging>
-
-  <name>Tools: Thrift</name>
-  <description>Local build of the Apache Thrift compiler.</description>
-
-  <properties>
-    <thrift.with.cpp>OFF</thrift.with.cpp>
-    <thrift.with.python>OFF</thrift.with.python>
-  </properties>
-
-  <profiles>
-    <!-- Profile for linux -->
-    <profile>
-      <id>os-unix</id>
-      <activation>
-        <os>
-          <family>unix</family>
-        </os>
-      </activation>
-      <!-- Make the cmake executable executable (Seems not to be per default) -->
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>exec-maven-plugin</artifactId>
-            <version>1.6.0</version>
-            <executions>
-              <execution>
-                <id>make-cmake-executable</id>
-                <phase>process-sources</phase>
-                <goals>
-                  <goal>exec</goal>
-                </goals>
-                <configuration>
-                  <basedir>${cmake.root-dir}</basedir>
-                  <executable>chmod</executable>
-                  <arguments>
-                    <argument>+x</argument>
-                    <argument>${cmake.child-dir}</argument>
-                  </arguments>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <!-- Profile for mac -->
-    <profile>
-      <id>os-mac</id>
-      <activation>
-        <os>
-          <family>mac</family>
-        </os>
-      </activation>
-      <!-- Make the cmake executable executable (Seems not to be per default) -->
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>exec-maven-plugin</artifactId>
-            <version>1.6.0</version>
-            <executions>
-              <execution>
-                <id>make-cmake-executable</id>
-                <phase>process-sources</phase>
-                <goals>
-                  <goal>exec</goal>
-                </goals>
-                <configuration>
-                  <basedir>${cmake.root-dir}</basedir>
-                  <executable>chmod</executable>
-                  <arguments>
-                    <argument>+x</argument>
-                    <argument>${cmake.child-dir}</argument>
-                  </arguments>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <!-- If C++ is enabled, we need to add another assembly to the build to package the libraries -->
-    <profile>
-      <id>with-cpp</id>
-      <properties>
-        <thrift.with.cpp>ON</thrift.with.cpp>
-      </properties>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <version>3.1.1</version>
-            <executions>
-              <execution>
-                <id>package-thrift-cpp</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-                <configuration>
-                  <finalName>${project.artifactId}-${project.version}</finalName>
-                  <descriptors>
-                    <descriptor>src/assembly/cpp.xml</descriptor>
-                  </descriptors>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <!-- If Python is enabled, we need to add another assembly to the build to package the libraries -->
-    <profile>
-      <id>with-python</id>
-      <properties>
-        <thrift.with.python>ON</thrift.with.python>
-      </properties>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <version>3.1.1</version>
-            <executions>
-              <execution>
-                <id>package-thrift-python</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-                <configuration>
-                  <finalName>${project.artifactId}-${project.version}</finalName>
-                  <descriptors>
-                    <descriptor>src/assembly/python.xml</descriptor>
-                  </descriptors>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>com.googlecode.maven-download-plugin</groupId>
-        <artifactId>download-maven-plugin</artifactId>
-        <version>1.4.0</version>
-        <executions>
-          <!-- Download the CMake binary distribution for this platform. -->
-          <execution>
-            <id>get-cmake</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>wget</goal>
-            </goals>
-            <configuration>
-              <url>${cmake.url}</url>
-              <unpack>true</unpack>
-              <outputDirectory>${project.build.directory}</outputDirectory>
-              <overwrite>true</overwrite>
-            </configuration>
-          </execution>
-          <!-- Download the sources for building the thrift compiler -->
-          <execution>
-            <id>get-thrift</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>wget</goal>
-            </goals>
-            <configuration>
-              <url>http://www.apache.org/dyn/closer.lua?action=download&amp;filename=/thrift/${thrift.version}/thrift-${thrift.version}.tar.gz</url>
-              <unpack>true</unpack>
-              <outputDirectory>${project.build.directory}</outputDirectory>
-              <overwrite>true</overwrite>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-boost</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.apache.plc4x</groupId>
-                  <artifactId>plc4x-tools-boost</artifactId>
-                  <version>${project.version}</version>
-                  <type>zip</type>
-                  <classifier>lib-${os.classifier}</classifier>
-                  <overWrite>true</overWrite>
-                </artifactItem>
-              </artifactItems>
-              <outputDirectory>${project.build.directory}/boost</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>com.googlecode.cmake-maven-project</groupId>
-        <artifactId>cmake-maven-plugin</artifactId>
-        <version>3.7.2-b1</version>
-        <executions>
-          <!-- Uses a CMake generator to generate the build using the build tool of choice -->
-          <execution>
-            <id>cmake-generate</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-            <configuration>
-              <!--
-                We need to use a newer version of cmake, so disable downloading
-                and tell the plugin where to find that version.
-              -->
-              <downloadBinaries>false</downloadBinaries>
-              <cmakeRootDir>${cmake.root-dir}</cmakeRootDir>
-              <cmakeChildDir>${cmake.child-dir}</cmakeChildDir>
-
-              <sourcePath>${project.build.directory}/thrift-${thrift.version}</sourcePath>
-              <targetPath>${project.build.directory}/build</targetPath>
-              <generator>${cmake.generator}</generator>
-              <!--
-                The classifier of the current platform. One of
-                [windows-x86_32, windows-x86_64, linux-x86_32, linux-x86_64, linux-arm_32, mac-x86_64].
-                It defines the version and type of the cmake installation to download.
-              -->
-              <classifier>${os.classifier}</classifier>
-              <options>
-                <!-- Disable testing for now -->
-                <option>-DBUILD_TESTING=OFF</option>
-                <option>-DBUILD_C_GLIB=OFF</option>
-                <option>-DBUILD_CPP=${thrift.with.cpp}</option>
-                <!-- Don't build Java, as the libs are available via Maven -->
-                <option>-DBUILD_JAVA=OFF</option>
-                <option>-DBUILD_PYTHON=${thrift.with.python}</option>
-                <option>-DBUILD_HASKELL=OFF</option>
-                <!-- Tell CMake where our boost includes and libs are located -->
-                <option>-DBOOST_INCLUDEDIR=${project.build.directory}/boost/include</option>
-                <option>-DBOOST_LIBRARYDIR=${project.build.directory}/boost/lib</option>
-              </options>
-            </configuration>
-          </execution>
-          <!-- Actually executes the build -->
-          <execution>
-            <id>cmake-compile</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-            <configuration>
-              <!--
-                We need to use a newer version of cmake, so disable downloading
-                and tell the plugin where to find that version.
-              -->
-              <downloadBinaries>false</downloadBinaries>
-              <cmakeRootDir>${cmake.root-dir}</cmakeRootDir>
-              <cmakeChildDir>${cmake.child-dir}</cmakeChildDir>
-
-              <!-- The directory where the "generate" step generated the build configuration -->
-              <projectDirectory>${project.build.directory}/build</projectDirectory>
-              <classifier>${os.classifier}</classifier>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- Add the thrift compiler executable to the build -->
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>3.1.1</version>
-        <executions>
-          <execution>
-            <id>source-release-assembly</id>
-            <configuration>
-              <skip>true</skip>
-            </configuration>
-          </execution>
-          <execution>
-            <id>package-thrift-compiler</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <finalName>${project.artifactId}-${project.version}</finalName>
-              <descriptors>
-                <descriptor>src/assembly/compiler.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      http://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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4x-tools</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4x-tools-thrift</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Tools: Thrift</name>
+  <description>Local build of the Apache Thrift compiler.</description>
+
+  <properties>
+    <thrift.with.cpp>OFF</thrift.with.cpp>
+    <thrift.with.python>OFF</thrift.with.python>
+  </properties>
+
+  <profiles>
+    <!-- Profile for linux -->
+    <profile>
+      <id>os-unix</id>
+      <activation>
+        <os>
+          <family>unix</family>
+        </os>
+      </activation>
+      <!-- Make the cmake executable executable (Seems not to be per default) -->
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <version>1.6.0</version>
+            <executions>
+              <execution>
+                <id>make-cmake-executable</id>
+                <phase>process-sources</phase>
+                <goals>
+                  <goal>exec</goal>
+                </goals>
+                <configuration>
+                  <basedir>${cmake.root-dir}</basedir>
+                  <executable>chmod</executable>
+                  <arguments>
+                    <argument>+x</argument>
+                    <argument>${cmake.child-dir}</argument>
+                  </arguments>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <!-- Profile for mac -->
+    <profile>
+      <id>os-mac</id>
+      <activation>
+        <os>
+          <family>mac</family>
+        </os>
+      </activation>
+      <!-- Make the cmake executable executable (Seems not to be per default) -->
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <version>1.6.0</version>
+            <executions>
+              <execution>
+                <id>make-cmake-executable</id>
+                <phase>process-sources</phase>
+                <goals>
+                  <goal>exec</goal>
+                </goals>
+                <configuration>
+                  <basedir>${cmake.root-dir}</basedir>
+                  <executable>chmod</executable>
+                  <arguments>
+                    <argument>+x</argument>
+                    <argument>${cmake.child-dir}</argument>
+                  </arguments>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <!-- If C++ is enabled, we need to add another assembly to the build to package the libraries -->
+    <profile>
+      <id>with-cpp</id>
+      <properties>
+        <thrift.with.cpp>ON</thrift.with.cpp>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <version>3.1.1</version>
+            <executions>
+              <execution>
+                <id>package-thrift-cpp</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <finalName>${project.artifactId}-${project.version}</finalName>
+                  <descriptors>
+                    <descriptor>src/assembly/cpp.xml</descriptor>
+                  </descriptors>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <!-- If Python is enabled, we need to add another assembly to the build to package the libraries -->
+    <profile>
+      <id>with-python</id>
+      <properties>
+        <thrift.with.python>ON</thrift.with.python>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <version>3.1.1</version>
+            <executions>
+              <execution>
+                <id>package-thrift-python</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <finalName>${project.artifactId}-${project.version}</finalName>
+                  <descriptors>
+                    <descriptor>src/assembly/python.xml</descriptor>
+                  </descriptors>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.googlecode.maven-download-plugin</groupId>
+        <artifactId>download-maven-plugin</artifactId>
+        <version>1.4.0</version>
+        <executions>
+          <!-- Download the CMake binary distribution for this platform. -->
+          <execution>
+            <id>get-cmake</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>wget</goal>
+            </goals>
+            <configuration>
+              <url>${cmake.url}</url>
+              <unpack>true</unpack>
+              <outputDirectory>${project.build.directory}</outputDirectory>
+              <overwrite>true</overwrite>
+            </configuration>
+          </execution>
+          <!-- Download the sources for building the thrift compiler -->
+          <execution>
+            <id>get-thrift</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>wget</goal>
+            </goals>
+            <configuration>
+              <url>http://www.apache.org/dyn/closer.lua?action=download&amp;filename=/thrift/${thrift.version}/thrift-${thrift.version}.tar.gz</url>
+              <unpack>true</unpack>
+              <outputDirectory>${project.build.directory}</outputDirectory>
+              <overwrite>true</overwrite>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>unpack-boost</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.apache.plc4x</groupId>
+                  <artifactId>plc4x-tools-boost</artifactId>
+                  <version>${project.version}</version>
+                  <type>zip</type>
+                  <classifier>lib-${os.classifier}</classifier>
+                  <overWrite>true</overWrite>
+                </artifactItem>
+              </artifactItems>
+              <outputDirectory>${project.build.directory}/boost</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>com.googlecode.cmake-maven-project</groupId>
+        <artifactId>cmake-maven-plugin</artifactId>
+        <version>3.7.2-b1</version>
+        <executions>
+          <!-- Uses a CMake generator to generate the build using the build tool of choice -->
+          <execution>
+            <id>cmake-generate</id>
+            <phase>process-sources</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+            <configuration>
+              <!--
+                We need to use a newer version of cmake, so disable downloading
+                and tell the plugin where to find that version.
+              -->
+              <downloadBinaries>false</downloadBinaries>
+              <cmakeRootDir>${cmake.root-dir}</cmakeRootDir>
+              <cmakeChildDir>${cmake.child-dir}</cmakeChildDir>
+
+              <sourcePath>${project.build.directory}/thrift-${thrift.version}</sourcePath>
+              <targetPath>${project.build.directory}/build</targetPath>
+              <generator>${cmake.generator}</generator>
+              <!--
+                The classifier of the current platform. One of
+                [windows-x86_32, windows-x86_64, linux-x86_32, linux-x86_64, linux-arm_32, mac-x86_64].
+                It defines the version and type of the cmake installation to download.
+              -->
+              <classifier>${os.classifier}</classifier>
+              <options>
+                <!-- Disable testing for now -->
+                <option>-DBUILD_TESTING=OFF</option>
+                <option>-DBUILD_C_GLIB=OFF</option>
+                <option>-DBUILD_CPP=${thrift.with.cpp}</option>
+                <!-- Don't build Java, as the libs are available via Maven -->
+                <option>-DBUILD_JAVA=OFF</option>
+                <option>-DBUILD_PYTHON=${thrift.with.python}</option>
+                <option>-DBUILD_HASKELL=OFF</option>
+                <!-- Tell CMake where our boost includes and libs are located -->
+                <option>-DBOOST_INCLUDEDIR=${project.build.directory}/boost/include</option>
+                <option>-DBOOST_LIBRARYDIR=${project.build.directory}/boost/lib</option>
+              </options>
+            </configuration>
+          </execution>
+          <!-- Actually executes the build -->
+          <execution>
+            <id>cmake-compile</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+            <configuration>
+              <!--
+                We need to use a newer version of cmake, so disable downloading
+                and tell the plugin where to find that version.
+              -->
+              <downloadBinaries>false</downloadBinaries>
+              <cmakeRootDir>${cmake.root-dir}</cmakeRootDir>
+              <cmakeChildDir>${cmake.child-dir}</cmakeChildDir>
+
+              <!-- The directory where the "generate" step generated the build configuration -->
+              <projectDirectory>${project.build.directory}/build</projectDirectory>
+              <classifier>${os.classifier}</classifier>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!-- Add the thrift compiler executable to the build -->
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>3.1.1</version>
+        <executions>
+          <execution>
+            <id>source-release-assembly</id>
+            <configuration>
+              <skip>true</skip>
+            </configuration>
+          </execution>
+          <execution>
+            <id>package-thrift-compiler</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <finalName>${project.artifactId}-${project.version}</finalName>
+              <descriptors>
+                <descriptor>src/assembly/compiler.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
\ No newline at end of file
diff --git a/tools/thrift/src/assembly/compiler.xml b/tools/thrift/src/assembly/compiler.xml
index 10f2c8d654f..e92c1975c19 100644
--- a/tools/thrift/src/assembly/compiler.xml
+++ b/tools/thrift/src/assembly/compiler.xml
@@ -1,43 +1,43 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://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.
-  -->
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-
-  <id>compiler-${os.classifier}</id>
-
-  <formats>
-    <format>zip</format>
-  </formats>
-
-  <includeBaseDirectory>false</includeBaseDirectory>
-
-
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.directory}/build/compiler/cpp/bin</directory>
-      <includes>
-        <include>*</include>
-      </includes>
-      <outputDirectory/>
-      <!-- Make sure the files are executable. -->
-      <fileMode>755</fileMode>
-    </fileSet>
-  </fileSets>
+<!--
+  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
+
+      http://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.
+  -->
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+
+  <id>compiler-${os.classifier}</id>
+
+  <formats>
+    <format>zip</format>
+  </formats>
+
+  <includeBaseDirectory>false</includeBaseDirectory>
+
+
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.directory}/build/compiler/cpp/bin</directory>
+      <includes>
+        <include>*</include>
+      </includes>
+      <outputDirectory/>
+      <!-- Make sure the files are executable. -->
+      <fileMode>755</fileMode>
+    </fileSet>
+  </fileSets>
 </assembly>
\ No newline at end of file
diff --git a/tools/thrift/src/assembly/cpp.xml b/tools/thrift/src/assembly/cpp.xml
index b59e90af33a..1e9c97f603e 100644
--- a/tools/thrift/src/assembly/cpp.xml
+++ b/tools/thrift/src/assembly/cpp.xml
@@ -1,56 +1,56 @@
-<!--
-  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
-
-      http://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.
-  -->
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-
-  <id>cpp-${os.classifier}</id>
-
-  <formats>
-    <format>zip</format>
-  </formats>
-
-  <includeBaseDirectory>false</includeBaseDirectory>
-
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.directory}/thrift-${thrift.version}/lib/cpp/src</directory>
-      <includes>
-        <include>**/*.h</include>
-        <include>**/*.tcc</include>
-      </includes>
-      <outputDirectory>include</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}/build/thrift</directory>
-      <includes>
-        <include>**/*.h</include>
-      </includes>
-      <outputDirectory>include/thrift</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}/build/lib</directory>
-      <includes>
-        <include>*.a</include>
-        <include>*.dylib</include>
-      </includes>
-      <outputDirectory>lib</outputDirectory>
-    </fileSet>
-  </fileSets>
+<!--
+  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
+
+      http://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.
+  -->
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+
+  <id>cpp-${os.classifier}</id>
+
+  <formats>
+    <format>zip</format>
+  </formats>
+
+  <includeBaseDirectory>false</includeBaseDirectory>
+
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.directory}/thrift-${thrift.version}/lib/cpp/src</directory>
+      <includes>
+        <include>**/*.h</include>
+        <include>**/*.tcc</include>
+      </includes>
+      <outputDirectory>include</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>${project.build.directory}/build/thrift</directory>
+      <includes>
+        <include>**/*.h</include>
+      </includes>
+      <outputDirectory>include/thrift</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>${project.build.directory}/build/lib</directory>
+      <includes>
+        <include>*.a</include>
+        <include>*.dylib</include>
+      </includes>
+      <outputDirectory>lib</outputDirectory>
+    </fileSet>
+  </fileSets>
 </assembly>
\ No newline at end of file
diff --git a/tools/thrift/src/assembly/python.xml b/tools/thrift/src/assembly/python.xml
index 7eb2cde974f..d94212c6229 100644
--- a/tools/thrift/src/assembly/python.xml
+++ b/tools/thrift/src/assembly/python.xml
@@ -1,43 +1,43 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://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.
-  -->
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-
-  <id>python</id>
-
-  <formats>
-    <format>zip</format>
-  </formats>
-
-  <includeBaseDirectory>false</includeBaseDirectory>
-
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.directory}/thrift-${thrift.version}/lib/py/src</directory>
-      <includes>
-        <include>**</include>
-      </includes>
-      <excludes>
-        <exclude>ext/**</exclude>
-      </excludes>
-      <outputDirectory>thrift</outputDirectory>
-    </fileSet>
-  </fileSets>
+<!--
+  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
+
+      http://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.
+  -->
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+
+  <id>python</id>
+
+  <formats>
+    <format>zip</format>
+  </formats>
+
+  <includeBaseDirectory>false</includeBaseDirectory>
+
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.directory}/thrift-${thrift.version}/lib/py/src</directory>
+      <includes>
+        <include>**</include>
+      </includes>
+      <excludes>
+        <exclude>ext/**</exclude>
+      </excludes>
+      <outputDirectory>thrift</outputDirectory>
+    </fileSet>
+  </fileSets>
 </assembly>
\ No newline at end of file
diff --git a/vim.exe.stackdump b/vim.exe.stackdump
index 1eb2c6b7748..30d102bc488 100644
--- a/vim.exe.stackdump
+++ b/vim.exe.stackdump
@@ -1,19 +1,19 @@
-Stack trace:
-Frame        Function    Args
-00180000000  0018006137E (0018024DB99, 0018024E199, 000FFFFC530, 000FFFFB6C0)
-00180000000  00180049229 (CCCCCC00009CC1, FF783B00767676, D6D661000CC616, 0000152ACFC)
-00180000000  00180049262 (0018024DB76, 000FFFFC428, 000FFFFC530, 76767600CCCCCC)
-00180000000  00180045E73 (00000000000, 00180000000, 00000000000, 001800004F4)
-00180000000  0018006F6E1 (CCCCCC00009CC1, FF783B00767676, D6D661000CC616, 9E00B4005648E7)
-00180000000  0018007056E (00000000000, 0010067ED68, 00000000000, 00000000000)
-00180000000  00180072B34 (00000000000, 00000000008, 00000000000, 00000000000)
-00000000000  00180146933 (0010067ED60, 00000000008, 00000000000, 00000000000)
-00000000000  0018012C3DB (0010067ED60, 00000000008, 00000000000, 00000000000)
-00000000000  001004F2A94 (001005773A5, 00100685748, 00000000000, 0010068574C)
-00000000000  0010058A496 (00000000008, 00000000000, 00000000000, 00000000000)
-00000000000  001005783AE (00000000000, 006000BEAE0, 00000000000, 00100000000)
-00000000000  001005EAAF3 (0018021EFA0, 00000000000, 0018012C3DB, 00180339FA0)
-00000000000  001005F5FE4 (00000000020, 0018030FA20, 0018004A818, 001800497E0)
-000FFFFCCD0  0018004A884 (00000000000, 00000000000, 00000000000, 00000000000)
-00000000000  00180048343 (00000000000, 00000000000, 00000000000, 00000000000)
+Stack trace:
+Frame        Function    Args
+00180000000  0018006137E (0018024DB99, 0018024E199, 000FFFFC530, 000FFFFB6C0)
+00180000000  00180049229 (CCCCCC00009CC1, FF783B00767676, D6D661000CC616, 0000152ACFC)
+00180000000  00180049262 (0018024DB76, 000FFFFC428, 000FFFFC530, 76767600CCCCCC)
+00180000000  00180045E73 (00000000000, 00180000000, 00000000000, 001800004F4)
+00180000000  0018006F6E1 (CCCCCC00009CC1, FF783B00767676, D6D661000CC616, 9E00B4005648E7)
+00180000000  0018007056E (00000000000, 0010067ED68, 00000000000, 00000000000)
+00180000000  00180072B34 (00000000000, 00000000008, 00000000000, 00000000000)
+00000000000  00180146933 (0010067ED60, 00000000008, 00000000000, 00000000000)
+00000000000  0018012C3DB (0010067ED60, 00000000008, 00000000000, 00000000000)
+00000000000  001004F2A94 (001005773A5, 00100685748, 00000000000, 0010068574C)
+00000000000  0010058A496 (00000000008, 00000000000, 00000000000, 00000000000)
+00000000000  001005783AE (00000000000, 006000BEAE0, 00000000000, 00100000000)
+00000000000  001005EAAF3 (0018021EFA0, 00000000000, 0018012C3DB, 00180339FA0)
+00000000000  001005F5FE4 (00000000020, 0018030FA20, 0018004A818, 001800497E0)
+000FFFFCCD0  0018004A884 (00000000000, 00000000000, 00000000000, 00000000000)
+00000000000  00180048343 (00000000000, 00000000000, 00000000000, 00000000000)
 End of stack trace (more stack frames may be present)

From f30f6f3ef135f31b068e1e44ddf2027b64e12f84 Mon Sep 17 00:00:00 2001
From: Cesar Garcia <cesar.garcia@ceos.com.ve>
Date: Sat, 19 Dec 2020 12:35:16 -0400
Subject: [PATCH 17/17] Update

---
 plc4j/drivers/pom.xml                                        | 1 +
 .../plc4x/java/simulated/connection/TestFieldHandler.java    | 5 +++++
 .../java/org/apache/plc4x/edgent/mock/MockFieldHandler.java  | 5 +++++
 plc4j/pom.xml                                                | 1 +
 .../apache/plc4x/java/opm/PlcEntityManagerComplexTest.java   | 5 +++++
 plc4j/utils/pom.xml                                          | 1 +
 6 files changed, 18 insertions(+)

diff --git a/plc4j/drivers/pom.xml b/plc4j/drivers/pom.xml
index cf033c69baf..13b2b46fabe 100644
--- a/plc4j/drivers/pom.xml
+++ b/plc4j/drivers/pom.xml
@@ -40,6 +40,7 @@
     <module>modbus</module>
     <module>s7</module>
 	<module>opcua</module>
+    <module>simulated</module>
   </modules>
 
 </project>
diff --git a/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestFieldHandler.java b/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestFieldHandler.java
index 659ea6ecbdc..058169b26ec 100644
--- a/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestFieldHandler.java
+++ b/plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestFieldHandler.java
@@ -171,4 +171,9 @@ public BaseDefaultFieldItem encodeByteArray(PlcField field, Object[] values) {
         throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
     }
 
+    @Override
+    public BaseDefaultFieldItem encodeDuration(PlcField field, Object[] values) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
 }
diff --git a/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockFieldHandler.java b/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockFieldHandler.java
index 9293ff2fdfa..d2f353e20ca 100644
--- a/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockFieldHandler.java
+++ b/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockFieldHandler.java
@@ -101,4 +101,9 @@ public BaseDefaultFieldItem encodeByteArray(PlcField field, Object[] values) {
         return new MockFieldItem(values);
     }
 
+    @Override
+    public BaseDefaultFieldItem encodeDuration(PlcField field, Object[] values) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
 }
diff --git a/plc4j/pom.xml b/plc4j/pom.xml
index 759ba23734e..8150f3cd58b 100644
--- a/plc4j/pom.xml
+++ b/plc4j/pom.xml
@@ -41,6 +41,7 @@
 
     <module>examples</module>
     <module>karaf-features</module>
+    <module>integrations</module>
   </modules>
 
   <build>
diff --git a/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityManagerComplexTest.java b/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityManagerComplexTest.java
index 35821b3d38c..cea7a60e677 100644
--- a/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityManagerComplexTest.java
+++ b/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityManagerComplexTest.java
@@ -309,6 +309,11 @@ public BaseDefaultFieldItem encodeDateTime(org.apache.plc4x.java.api.model.PlcFi
         public BaseDefaultFieldItem encodeByteArray(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
             return null;
         }
+
+        @Override
+        public BaseDefaultFieldItem encodeDuration(org.apache.plc4x.java.api.model.PlcField field, Object[] values) {
+            throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        }
     }
 
     private static class NoEntity {
diff --git a/plc4j/utils/pom.xml b/plc4j/utils/pom.xml
index be973f81444..47ed7619976 100644
--- a/plc4j/utils/pom.xml
+++ b/plc4j/utils/pom.xml
@@ -45,6 +45,7 @@
 
     <!-- Utilities used externally by users -->
     <module>connection-pool</module>
+    <module>opm</module>
   </modules>
 
   <profiles>